Author: sletellier Date: 2009-05-12 14:20:28 +0000 (Tue, 12 May 2009) New Revision: 2218 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/SimulAction.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulUI.jaxx Log: Loading PreScript when old simulation selected 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-05-12 13:15:49 UTC (rev 2217) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2009-05-12 14:20:28 UTC (rev 2218) @@ -82,16 +82,6 @@ setListSimulParamsPopulationsItems(); setRulesItems(); fieldSimulParamsRegion.setSelectedItem(getContextValue(SimulAction.class).getSimulationParameter().getRegionName()); - if (!isSensitivity()) { - if (getContextValue(SimulAction.class).getSimulationParameter().getUsePreScript()) { - SimulUI simul = getParentContainer(SimulUI.class); - simul.enablePreSimul(); - } - if (getContextValue(SimulAction.class).getSimulationParameter().getUseAnalysePlan()) { - SimulUI simul = getParentContainer(SimulUI.class); - simul.enableAnalysePlan(); - } - } } protected void regionChange(ItemEvent e) { if (e.getStateChange() == ItemEvent.SELECTED) { @@ -114,6 +104,13 @@ } } } +protected void setPreScript() { + if (!isSensitivity()){ + String preScript = getContextValue(SimulAction.class).getSimulationParameter().getPreScript(); + fieldUseSimulPreScripts.setSelected(preScript != null && !preScript.isEmpty()); + getParentContainer(SimulUI.class).getPreSciptUI().getFieldSimulPreScript().setText(preScript); + } +} protected void setFactorRegion() { if (isSensitivity()){ try { @@ -156,6 +153,7 @@ refresh(); // mise a jour des années fieldSimulParamsNbAnnees.setText(String.valueOf(getContextValue(SimulAction.class).getNumberOfYear())); + setPreScript(); setFactorRegion(); setExportSens(); setSensitivityCalculator(); @@ -188,18 +186,24 @@ } protected void enablePreSimul(){ getContextValue(SimulAction.class).getSimulationParameter().setUsePreScript(fieldUseSimulPreScripts.isSelected()); - if (fieldUseSimulPreScripts.isSelected() && !isSensitivity()){ + if (!isSensitivity()){ SimulUI simul = getParentContainer(SimulUI.class); - simul.enablePreSimul(); + simul.enablePreSimul(fieldUseSimulPreScripts.isSelected()); } } protected void enableAnalysePlan(){ getContextValue(SimulAction.class).getSimulationParameter().setUseAnalysePlan(fieldSimulUseAnalysePlan.isSelected()); - if (fieldSimulUseAnalysePlan.isSelected() && !isSensitivity()){ + if (!isSensitivity()){ SimulUI simul = getParentContainer(SimulUI.class); - simul.enableAnalysePlan(); + simul.enableAnalysePlan(fieldSimulUseAnalysePlan.isSelected()); } } +protected void selTab(MouseEvent e, int i){ + if (((JCheckBox)e.getSource()).isSelected()){ + SimulUI simul = getParentContainer(SimulUI.class); + simul.selTab(i); + } +} protected void enableOnlyExport(){ if (fieldSimulOnlyExport.isSelected()){ getContextValue(SimulAction.class).getSimulationParameter().setOnlyExport(true); @@ -618,10 +622,14 @@ <Table> <row> <cell fill="horizontal" weightx="0.3"> - <JCheckBox text="isisfish.params.usePreSimulationScript" id="fieldUseSimulPreScripts" visible='{!isSensitivity()}' onItemStateChanged='enablePreSimul()'/> + <JCheckBox text="isisfish.params.usePreSimulationScript" id="fieldUseSimulPreScripts" + selected='{getContextValue(SimulAction.class).getSimulationParameter().getUsePreScript()}' + visible='{!isSensitivity()}' onItemStateChanged='enablePreSimul()' onMouseReleased='selTab(event, 1)'/> </cell> <cell fill="horizontal" weightx="0.3"> - <JCheckBox text="isisfish.params.useAnalysePlan" id="fieldSimulUseAnalysePlan" visible='{!isSensitivity()}' onItemStateChanged='enableAnalysePlan()'/> + <JCheckBox text="isisfish.params.useAnalysePlan" id="fieldSimulUseAnalysePlan" + selected='{getContextValue(SimulAction.class).getSimulationParameter().getUseAnalysePlan()}' + visible='{!isSensitivity()}' onItemStateChanged='enableAnalysePlan()' onMouseReleased='selTab(event, 2)'/> </cell> <cell fill="horizontal" weightx="0.3"> <JCheckBox text="isisfish.params.onlyExportSimulation" id="fieldSimulOnlyExport" onItemStateChanged='enableOnlyExport()'/> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-05-12 13:15:49 UTC (rev 2217) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-05-12 14:20:28 UTC (rev 2218) @@ -303,7 +303,6 @@ // all time reset number after load param.setAnalysePlanNumber(-1); regionStorage = param.getRegion(); - // Chargement des sensibilites sensitivityCalculator = param.getSensitivityCalculator(); 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-05-12 13:15:49 UTC (rev 2217) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulUI.jaxx 2009-05-12 14:20:28 UTC (rev 2218) @@ -49,13 +49,11 @@ toolTipManager.setInitialDelay(0); toolTipManager.setDismissDelay(60000); } - protected void enablePreSimul() { - simulTabs.setEnabledAt(1,true); - selTab(1); + protected void enablePreSimul(boolean selected) { + simulTabs.setEnabledAt(1, selected); } - protected void enableAnalysePlan() { - simulTabs.setEnabledAt(2,true); - selTab(2); + protected void enableAnalysePlan(boolean selected) { + simulTabs.setEnabledAt(2, selected); } protected void selTab(int i) { simulTabs.setSelectedIndex(i);