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.jaxx 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/ParamsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2009-03-03 17:19:33 UTC (rev 1906) @@ -31,12 +31,17 @@ */ --> <Table> + + <!-- ui state when editing --> + <Boolean id='sensitivity' javaBean='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; @@ -81,6 +89,7 @@ setContextValue(action); } public void refresh(){ + setSensitivity(getParentContainer(SensitivityUI.class) != null); SimulationService.getService().removeSimulationServiceListener(simulationListener); SimulationService.getService().addSimulationServiceListener(simulationListener); if (getContextValue(SimulAction.class).getSimulationStorage() != null){ @@ -117,6 +126,15 @@ public void run() { getContextValue(SimulAction.class).regionChange(selected); refresh(); + if (isSensitivity()){ + try { + System.out.println("isSelectivity"); + getParentContainer(SensitivityUI.class).getSensitivityTabUI().setRegion((FisheryRegionImpl) getContextValue(SimulAction.class).getSimulationParameter().getRegion().getFisheryRegion()); + getParentContainer(SensitivityUI.class).getSensitivityTabUI().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(fieldSimulParamsName.getText(), (SimulatorLauncher)comboSelLauncher.getSelectedItem()); - SimulUI simul = 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/SimulUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulUI.jaxx 2009-03-03 17:19:21 UTC (rev 1905) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulUI.jaxx 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; public SimulUI(SimulAction action){ setContextValue(action); @@ -56,7 +61,6 @@ exportUI.refresh(); resultChoiceUI.refresh(); advencedParamsUI.refresh(); - queueUI.refresh(); } protected void importSimulation(){ JFileChooser fc = new JFileChooser(); @@ -77,9 +81,6 @@ File file = fc.getSelectedFile(); //This is where a real application would open the file. getContextValue(SimulAction.class).saveSimulation(file); -// Element result = DocumentHelper.createElement("simul"); -// result.add(paramsUI.save()); -// System.out.println(result.asXML()); } } ]]> @@ -109,8 +110,5 @@ <tab id="advancedParamsUITab" title='isisfish.advancedParameters.title'> <AdvancedParamsUI id="advencedParamsUI" constructorParams='getContextValue(SimulAction.class)'/> </tab> - <tab id="queueUITab" title='isisfish.queue.title'> - <QueueUI id="queueUI" constructorParams='getContextValue(SimulAction.class)'/> - </tab> </JTabbedPane> </JPanel> \ No newline at end of file