r4022 - trunk/src/main/java/fr/ifremer/isisfish/ui/simulator - Isis-fish-commits

17 Jun 2014

Author: echatellier
Date: 2014-06-17 16:30:35 +0200 (Tue, 17 Jun 2014)
New Revision: 4022

Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/4022

Log:
fixes #3955: quand recharge ancienne simulation, isis ne garde pas le simulateur associ?\195?\169

Modified:
   trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx
   trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/OptimizationHandler.java
   trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/OptimizationUI.jaxx
   trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx
   trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/PreScriptsUI.jaxx
   trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx

Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx
===================================================================

--- trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx	2014-06-17 12:50:25 UTC (rev 4021)
+++ trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx	2014-06-17 14:30:35 UTC (rev 4022)
@@ -55,6 +55,25 @@
     }
     
     public void refresh() {
+        fieldSimulAdvParamsSimulatorSelect.setSelectedItem(getContextValue(SimulAction.class).getSimulationParameter().getSimulatorName());
+        fieldSimulationStatistique.setSelected(getContextValue(SimulAction.class).getSimulationParameter().getUseStatistic());
+        fieldSimulationCache.setSelected(getContextValue(SimulAction.class).getSimulationParameter().getUseCache());
+
+        fieldSimulAdvParamsSimulLoggerError.setSelected(getContextValue(SimulAction.class).getSimulationParameter().isSimulErrorLevel());
+        fieldSimulAdvParamsSimulLoggerWarn.setSelected(getContextValue(SimulAction.class).getSimulationParameter().isSimulWarnLevel());
+        fieldSimulAdvParamsSimulLoggerInfo.setSelected(getContextValue(SimulAction.class).getSimulationParameter().isSimulInfoLevel());
+        fieldSimulAdvParamsSimulLoggerDebug.setSelected(getContextValue(SimulAction.class).getSimulationParameter().isSimulDebugLevel());
+
+        fieldSimulAdvParamsScriptLoggerError.setSelected(getContextValue(SimulAction.class).getSimulationParameter().isScriptErrorLevel());
+        fieldSimulAdvParamsScriptLoggerWarn.setSelected(getContextValue(SimulAction.class).getSimulationParameter().isScriptWarnLevel());
+        fieldSimulAdvParamsScriptLoggerInfo.setSelected(getContextValue(SimulAction.class).getSimulationParameter().isScriptInfoLevel());
+        fieldSimulAdvParamsScriptLoggerDebug.setSelected(getContextValue(SimulAction.class).getSimulationParameter().isScriptDebugLevel());
+
+        fieldSimulAdvParamsLibLoggerError.setSelected(getContextValue(SimulAction.class).getSimulationParameter().isLibErrorLevel());
+        fieldSimulAdvParamsLibLoggerWarn.setSelected(getContextValue(SimulAction.class).getSimulationParameter().isLibWarnLevel());
+        fieldSimulAdvParamsLibLoggerInfo.setSelected(getContextValue(SimulAction.class).getSimulationParameter().isLibInfoLevel());
+        fieldSimulAdvParamsLibLoggerDebug.setSelected(getContextValue(SimulAction.class).getSimulationParameter().isLibDebugLevel());
+
         setTableTagValues();
     }
     
@@ -123,7 +142,8 @@
             <JLabel text="isisfish.advancedParams.simulatorUse"/>
         </cell>
         <cell columns="4" fill="horizontal">
-            <JComboBox id="fieldSimulAdvParamsSimulatorSelect" model='{new DefaultComboBoxModel(getContextValue(SimulAction.class).getSimulatorNames().toArray())}' onActionPerformed='setSimulatorName()'/>
+            <JComboBox id="fieldSimulAdvParamsSimulatorSelect" model='{new DefaultComboBoxModel(getContextValue(SimulAction.class).getSimulatorNames().toArray())}'
+                onActionPerformed='setSimulatorName()'/>
         </cell>
     </row>
     <row>

Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/OptimizationHandler.java
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/OptimizationHandler.java	2014-06-17 12:50:25 UTC (rev 4021)
+++ trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/OptimizationHandler.java	2014-06-17 14:30:35 UTC (rev 4022)
@@ -64,14 +64,17 @@
 import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabUI;
 import fr.ifremer.isisfish.ui.widget.editor.FactorEditorListener;
 
-
 public class OptimizationHandler {
 
     private static final Log log = LogFactory.getLog(OptimizationHandler.class);
 
     protected FactorEditorListener factorEditorListener;
 
-    public void init(OptimizationUI view) {
+    public void init(final OptimizationUI view) {
+        
+    }
+
+    public void refresh(OptimizationUI view) {
         // get info
         SimulAction simulAction = view.getContextValue(SimulAction.class);
         SimulationParameter param = simulAction.getSimulationParameter();

Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/OptimizationUI.jaxx
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/OptimizationUI.jaxx	2014-06-17 12:50:25 UTC (rev 4021)
+++ trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/OptimizationUI.jaxx	2014-06-17 14:30:35 UTC (rev 4022)
@@ -24,17 +24,17 @@
   -->
 <Table>
   <script><![CDATA[
-      /*protected void $afterCompleteSetup() {
+      protected void $afterCompleteSetup() {
         handler.init(this);
-      }*/
+      }
 
       // application will be refreshed by regionStorage change
       protected void regionStorageChanged() {
-          handler.init(this);
+          //handler.refresh(this);
       }
 
       public void refresh() {
-        //handler.refresh(this);
+        handler.refresh(this);
       }
   ]]></script>
 

Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx	2014-06-17 12:50:25 UTC (rev 4021)
+++ trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx	2014-06-17 14:30:35 UTC (rev 4022)
@@ -120,7 +120,7 @@
             @Override
             public void run() {
                 simulAction.regionChange(ParamsUI.this, selected);
-                refresh();
+                getParentContainer(SimulUI.class).refresh();
                 setSensitivityTabRegion();
                 getParentContainer(WelcomePanelUI.class).setStatusMessage(t("isisfish.message.region.loaded"));
             }
@@ -188,8 +188,10 @@
             @Override
             public void run() {
                 simulAction.loadOldSimulation(selected);
-                //refresh();
                 fieldSimulParamsRegion.setSelectedItem(getContextValue(SimulAction.class).getSimulationParameter().getRegionName());
+
+                getParentContainer(SimulUI.class).refresh();
+
                 // mise a jour des années
                 fieldSimulParamsNbAnnees.setText(String.valueOf(simulAction.getNumberOfYear()));
                 initSimulationParams();

Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/PreScriptsUI.jaxx
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/PreScriptsUI.jaxx	2014-06-17 12:50:25 UTC (rev 4021)
+++ trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/PreScriptsUI.jaxx	2014-06-17 14:30:35 UTC (rev 4022)
@@ -42,7 +42,8 @@
         }*/
     ]]></script>
     <org.fife.ui.rtextarea.RTextScrollPane constraints='BorderLayout.CENTER'>
-        <org.fife.ui.rsyntaxtextarea.RSyntaxTextArea id="fieldSimulPreScript" syntaxEditingStyle="{org.fife.ui.rsyntaxtextarea.SyntaxConstants.SYNTAX_STYLE_JAVA}" />
+        <org.fife.ui.rsyntaxtextarea.RSyntaxTextArea id="fieldSimulPreScript" onFocusLost='save()'
+        syntaxEditingStyle="{org.fife.ui.rsyntaxtextarea.SyntaxConstants.SYNTAX_STYLE_JAVA}" />
     </org.fife.ui.rtextarea.RTextScrollPane>
     <JButton constraints='BorderLayout.SOUTH' text="isisfish.preScript.backParameter"
         onActionPerformed='getParentContainer(fr.ifremer.isisfish.ui.SimulationUI.class).selectParametersTab()'/>

Modified: trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx
===================================================================
--- trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx	2014-06-17 12:50:25 UTC (rev 4021)
+++ trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx	2014-06-17 14:30:35 UTC (rev 4022)
@@ -47,10 +47,10 @@
         return getContextValue(SimulAction.class);
     }
 
-    protected void setListSimulResultChooseModel(){
+    protected void setListSimulResultChooseModel() {
 
-        java.util.List<String> availableResults = getSimulAction().getResultNames();
-        java.util.List<String> userResults = getSimulAction().getDefaultResultNames();
+        List<String> availableResults = getSimulAction().getResultNames();
+        List<String> userResults = getSimulAction().getDefaultResultNames();
         // userResults = intersection(userResults,availableResult)
         userResults.retainAll(availableResults);

    

r4022 - trunk/src/main/java/fr/ifremer/isisfish/ui/simulator

echatellier＠users.forge.codelutin.com

tags

participants (1)