From sletellier@users.labs.libre-entreprise.org Mon Jun 15 00:25:56 2026
From: sletellier@users.labs.libre-entreprise.org
To: isis-fish-commits@list.isis-fish.org
Subject: [Isis-fish-commits] r1906 -
	isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator
Date: Tue, 03 Mar 2009 18:19:33 +0100
Message-ID: <20090303171933.A2193461BF0@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5676326801052620979=="

--===============5676326801052620979==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Author: sletellier
Date: 2009-03-03 17:19:33 +0000 (Tue, 03 Mar 2009)
New Revision: 1906

Modified:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.ja=
xx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulUI.jaxx
Log:
Ajout de la saisie des sensibilit?\195?\169s

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/Para=
msUI.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.j=
axx	2009-03-03 17:19:21 UTC (rev 1905)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.j=
axx	2009-03-03 17:19:33 UTC (rev 1906)
@@ -31,12 +31,17 @@
  */
  -->
 <Table>
+
+    <!-- ui state when editing -->
+    <Boolean id=3D'sensitivity' javaBean=3D'false'/>
+
     <script><![CDATA[
     import static org.codelutin.i18n.I18n._;
     import fr.ifremer.isisfish.ui.Common;
     import fr.ifremer.isisfish.datastore.RuleStorage;
     import fr.ifremer.isisfish.ui.WelcomeUI;
     import fr.ifremer.isisfish.ui.WelcomePanelUI;
+    import fr.ifremer.isisfish.ui.WelcomeTabUI;
     import fr.ifremer.isisfish.simulator.SimulationParameter;
     import fr.ifremer.isisfish.simulator.launcher.SimulatorLauncher;
     import fr.ifremer.isisfish.entities.Strategy;
@@ -58,6 +63,9 @@
     import org.dom4j.Element;
     import fr.ifremer.isisfish.simulator.launcher.SimulationService;
     import fr.ifremer.isisfish.simulator.launcher.SimulationJob;
+    import fr.ifremer.isisfish.ui.sensitivity.SensitivityUI;
+    import fr.ifremer.isisfish.entities.FisheryRegionImpl;
+    import fr.ifremer.isisfish.datastore.StorageException;
     import fr.ifremer.isisfish.simulator.launcher.SimulationServiceListener;
     SimulationServiceListener simulationListener;
=20
@@ -81,6 +89,7 @@
         setContextValue(action);
     }
     public void refresh(){
+        setSensitivity(getParentContainer(SensitivityUI.class) !=3D null);
         SimulationService.getService().removeSimulationServiceListener(simul=
ationListener);
         SimulationService.getService().addSimulationServiceListener(simulati=
onListener);
         if (getContextValue(SimulAction.class).getSimulationStorage() !=3D n=
ull){
@@ -117,6 +126,15 @@
                     public void run() {
                         getContextValue(SimulAction.class).regionChange(sele=
cted);
                         refresh();
+                        if (isSensitivity()){
+                            try {
+                                System.out.println("isSelectivity");
+                                getParentContainer(SensitivityUI.class).getS=
ensitivityTabUI().setRegion((FisheryRegionImpl) getContextValue(SimulAction.c=
lass).getSimulationParameter().getRegion().getFisheryRegion());
+                                getParentContainer(SensitivityUI.class).getS=
ensitivityTabUI().setTreeModel();
+                            } catch (StorageException ex) {
+                                log.debug(ex.getMessage(), ex);
+                            };
+                        }
                         getParentContainer(WelcomePanelUI.class).setInfoText=
(_("isisfish.message.region.loaded"));
                     }
                 });
@@ -156,8 +174,7 @@
     }
     protected void simul(){
         getContextValue(SimulAction.class).launchSimulation(fieldSimulParams=
Name.getText(), (SimulatorLauncher)comboSelLauncher.getSelectedItem());
-        SimulUI simul =3D getParentContainer(SimulUI.class);
-        simul.selTab(6);
+        getParentContainer(WelcomeTabUI.class).selTab(5);
     }
     protected void enablePreSimul(){
         if (fieldUseSimulPreScripts.isSelected()){

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/Simu=
lUI.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulUI.ja=
xx	2009-03-03 17:19:21 UTC (rev 1905)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulUI.ja=
xx	2009-03-03 17:19:33 UTC (rev 1906)
@@ -34,6 +34,11 @@
     <script><![CDATA[
     import org.dom4j.DocumentHelper;
     import org.dom4j.Element;
+    import jaxx.runtime.JAXXInitialContext;
+    import fr.ifremer.isisfish.ui.input.InputAction;
+    import fr.ifremer.isisfish.ui.input.InputSaveVerifier;
+    import fr.ifremer.isisfish.datastore.StorageException;
+    import fr.ifremer.isisfish.entities.FisheryRegionImpl;
=20
         public SimulUI(SimulAction action){        =20
             setContextValue(action);
@@ -56,7 +61,6 @@
             exportUI.refresh();
             resultChoiceUI.refresh();
             advencedParamsUI.refresh();
-            queueUI.refresh();
         }
         protected void importSimulation(){
             JFileChooser fc =3D new JFileChooser();
@@ -77,9 +81,6 @@
                 File file =3D fc.getSelectedFile();
                 //This is where a real application would open the file.
                   getContextValue(SimulAction.class).saveSimulation(file);
-//                Element result =3D DocumentHelper.createElement("simul");
-//                result.add(paramsUI.save());
-//                System.out.println(result.asXML());
             }
         }
     ]]>
@@ -109,8 +110,5 @@
         <tab id=3D"advancedParamsUITab" title=3D'isisfish.advancedParameters=
.title'>
             <AdvancedParamsUI id=3D"advencedParamsUI" constructorParams=3D'g=
etContextValue(SimulAction.class)'/>
         </tab>
-        <tab id=3D"queueUITab" title=3D'isisfish.queue.title'>
-            <QueueUI id=3D"queueUI" constructorParams=3D'getContextValue(Sim=
ulAction.class)'/>
-        </tab>
     </JTabbedPane>
 </JPanel>
\ No newline at end of file


--===============5676326801052620979==--