r1918 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui: . input simulator - Isis-fish-commits

9 Mar 2009

Author: sletellier
Date: 2009-03-09 13:49:51 +0000 (Mon, 09 Mar 2009)
New Revision: 1918

Modified:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/QueueUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx
Log:
rowHeight is fixed and AdvancedParams saving work

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx
===================================================================

--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx	2009-03-09 10:29:53 UTC (rev 1917)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/WelcomeTabUI.jaxx	2009-03-09 13:49:51 UTC (rev 1918)
@@ -46,6 +46,9 @@
         ]]>
     </script>
     <JTabbedPane id="simulTabs" tabPlacement='{JTabbedPane.LEFT}' constraints="BorderLayout.CENTER">
+        <tab title=' ' icon='{new ImageIcon(getClass().getResource("/images/book.gif"))}'>
+            <fr.ifremer.isisfish.ui.input.InputUI constructorParams='new JAXXInitialContext().add(getContextValue(WelcomeSaveVerifier.class)).add(new InputAction()).add(new InputSaveVerifier()).add(this)'/>
+        </tab>
         <tab title=' ' icon='{new ImageIcon(getClass().getResource("/images/simulation.gif"))}'>
             <fr.ifremer.isisfish.ui.simulator.SimulUI id='simulUI' constructorParams='new SimulAction()'/>
         </tab>
@@ -55,9 +58,6 @@
         <tab title=' ' icon='{new ImageIcon(getClass().getResource("/images/calc.gif"))}'>
             <fr.ifremer.isisfish.ui.result.ResultView/>
         </tab>
-        <tab title=' ' icon='{new ImageIcon(getClass().getResource("/images/book.gif"))}'>
-            <fr.ifremer.isisfish.ui.input.InputUI constructorParams='new JAXXInitialContext().add(getContextValue(WelcomeSaveVerifier.class)).add(new InputAction()).add(new InputSaveVerifier()).add(this)'/>
-        </tab>
         <tab title=' ' icon='{new ImageIcon(getClass().getResource("/images/bookPage.gif"))}'>
             <fr.ifremer.isisfish.ui.script.ScriptUI/>
         </tab>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx	2009-03-09 10:29:53 UTC (rev 1917)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/MetierSeasonInfoSpeciesUI.jaxx	2009-03-09 13:49:51 UTC (rev 1918)
@@ -268,7 +268,7 @@
                     <row>
                         <cell columns='2' fill='both' weightx='1.0' weighty='1.0'>
                             <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'>
-                                <JTable id="tableTargetSpecies" enabled='{isActif()}'/>
+                                <JTable id="tableTargetSpecies" rowHeight='24' enabled='{isActif()}'/>
                             </JScrollPane>
                         </cell>
                     </row>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx	2009-03-09 10:29:53 UTC (rev 1917)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationBasicsUI.jaxx	2009-03-09 13:49:51 UTC (rev 1918)
@@ -184,7 +184,7 @@
                                 </row>
                                 <row>
                                     <cell columns='3' fill='both' weightx='1.0'>
-                                        <JTable id='tableAgeLength' enabled='{isActif()}'/>
+                                        <JTable id='tableAgeLength' rowHeight='24' enabled='{isActif()}'/>
                                     </cell>
                                 </row>
                                 <row>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx	2009-03-09 10:29:53 UTC (rev 1917)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/SelectivityUI.jaxx	2009-03-09 13:49:51 UTC (rev 1918)
@@ -204,7 +204,7 @@
                     <row>
                         <cell columns='2' fill='both'  weightx='1.0' weighty='1.0'>
                             <JScrollPane>
-                                <JTable id="selectivityTable" enabled='{isActif()}'/>
+                                <JTable id="selectivityTable" rowHeight='24' enabled='{isActif()}'/>
                             </JScrollPane>
                         </cell>
                     </row>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx	2009-03-09 10:29:53 UTC (rev 1917)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx	2009-03-09 13:49:51 UTC (rev 1918)
@@ -70,6 +70,7 @@
         getContextValue(SimulAction.class).addTagValue(fieldTag.getText(), fieldValue.getText());
         setTableTagValue();
         setRemove(true);
+        valueChanged(true);
     }
     protected void removeTagValue(){
         getContextValue(SimulAction.class).removeTagValue(tableTagValue.getValueAt(tableTagValue.getSelectedRow(),0).toString());
@@ -79,6 +80,7 @@
         if (fieldSimulAdvParamsSimulatorSelect.getSelectedIndex() != -1){
             getContextValue(SimulAction.class).saveTagValue(fieldSimulAdvParamsSimulatorSelect.getSelectedItem().toString());    
         }
+        valueChanged(false);
     }
     protected void setSimulName(){
         if (fieldSimulAdvParamsSimulatorSelect.getSelectedIndex() != -1){
@@ -111,65 +113,6 @@
             DefaultTableModel model = new DefaultTableModel(columnName, 0);
         }
     }
-    protected void simulationStatistiqueChanged(){
-        getContextValue(SimulAction.class).getSimulationParameter().setUseStatistic(fieldSimulationStatistique.isSelected());
-        valueChanged(true);
-    }
-    protected void simulationCacheChanged(){
-        getContextValue(SimulAction.class).getSimulationParameter().setUseOptimization(fieldSimulationCache.isSelected());
-        valueChanged(true);
-    }
-
-    protected void simulErrorChanged(){
-        getContextValue(SimulAction.class).getSimulationParameter().setSimulLogLevel("error");
-        valueChanged(true);
-    }
-    protected void simulWarnChanged(){
-        getContextValue(SimulAction.class).getSimulationParameter().setSimulLogLevel("warn");
-        valueChanged(true);
-    }
-    protected void simulInfoChanged(){
-        getContextValue(SimulAction.class).getSimulationParameter().setSimulLogLevel("info");
-        valueChanged(true);
-    }
-    protected void simulDebugChanged(){
-        getContextValue(SimulAction.class).getSimulationParameter().setSimulLogLevel("debug");
-        valueChanged(true);
-    }
-
-    protected void scriptErrorChanged(){
-        getContextValue(SimulAction.class).getSimulationParameter().setScriptLogLevel("error");
-        valueChanged(true);
-    }
-    protected void scriptWarnChanged(){
-        getContextValue(SimulAction.class).getSimulationParameter().setScriptLogLevel("warn");
-        valueChanged(true);
-    }
-    protected void scriptInfoChanged(){
-        getContextValue(SimulAction.class).getSimulationParameter().setScriptLogLevel("info");
-        valueChanged(true);
-    }
-    protected void scriptDebugChanged(){
-        getContextValue(SimulAction.class).getSimulationParameter().setScriptLogLevel("debug");
-        valueChanged(true);
-    }
-
-    protected void libErrorChanged(){
-        getContextValue(SimulAction.class).getSimulationParameter().setLibLogLevel("error");
-        valueChanged(true);
-    }
-    protected void libWarnChanged(){
-        getContextValue(SimulAction.class).getSimulationParameter().setLibLogLevel("warn");
-        valueChanged(true);
-    }
-    protected void libInfoChanged(){
-        getContextValue(SimulAction.class).getSimulationParameter().setLibLogLevel("info");
-        valueChanged(true);
-    }
-    protected void libDebugChanged(){
-        getContextValue(SimulAction.class).getSimulationParameter().setLibLogLevel("debug");
-        valueChanged(true);
-    }
     protected void valueChanged(boolean b){
          save.setEnabled(b);
          setChanged(b);
@@ -198,13 +141,13 @@
             <JPanel/>
         </cell>
         <cell  columns="2" fill="horizontal"  weightx="0.3">
-            <JCheckBox id="fieldSimulationStatistique" text="isisfish.advancedParams.simulationStatistique" onActionPerformed = 'simulationStatistiqueChanged()'/>
+            <JCheckBox id="fieldSimulationStatistique" text="isisfish.advancedParams.simulationStatistique" onActionPerformed = 'getContextValue(SimulAction.class).getSimulationParameter().setUseStatistic(fieldSimulationStatistique.isSelected())'/>
         </cell>
         <cell fill="horizontal"  weightx="0.2">
             <JPanel/>
         </cell>
         <cell  columns="2" fill="horizontal"  weightx="0.3">
-            <JCheckBox id="fieldSimulationCache" text="isisfish.advancedParams.simulationCache" onActionPerformed = 'simulationCacheChanged()'/>
+            <JCheckBox id="fieldSimulationCache" text="isisfish.advancedParams.simulationCache" onActionPerformed = 'getContextValue(SimulAction.class).getSimulationParameter().setUseOptimization(fieldSimulationCache.isSelected())'/>
         </cell>
     </row>
     <row>
@@ -212,16 +155,16 @@
             <JLabel text="isisfish.advancedParams.simulLevelLogger"/>
         </cell>
         <cell  fill="horizontal"  weightx="0.2">
-            <JRadioButton id="fieldSimulAdvParamsSimulLoggerError" text="isisfish.common.error" buttonGroup="fieldSimulAdvParamsSimulLoggerGroup" onActionPerformed = 'simulErrorChanged()'/>
+            <JRadioButton id="fieldSimulAdvParamsSimulLoggerError" text="isisfish.common.error" buttonGroup="fieldSimulAdvParamsSimulLoggerGroup" onActionPerformed = 'getContextValue(SimulAction.class).getSimulationParameter().setSimulLogLevel("error")'/>
         </cell>
         <cell  fill="horizontal"  weightx="0.2">
-            <JRadioButton id="fieldSimulAdvParamsSimulLoggerWarn" text="isisfish.common.warn" buttonGroup="fieldSimulAdvParamsSimulLoggerGroup" onActionPerformed = 'simulWarnChanged()'/>
+            <JRadioButton id="fieldSimulAdvParamsSimulLoggerWarn" text="isisfish.common.warn" buttonGroup="fieldSimulAdvParamsSimulLoggerGroup" onActionPerformed = 'getContextValue(SimulAction.class).getSimulationParameter().setSimulLogLevel("warn")'/>
         </cell>
         <cell  fill="horizontal"  weightx="0.2">
-            <JRadioButton id="fieldSimulAdvParamsSimulLoggerInfo" text="isisfish.common.info" buttonGroup="fieldSimulAdvParamsSimulLoggerGroup" onActionPerformed = 'simulInfoChanged()'/>
+            <JRadioButton id="fieldSimulAdvParamsSimulLoggerInfo" text="isisfish.common.info" buttonGroup="fieldSimulAdvParamsSimulLoggerGroup" onActionPerformed = 'getContextValue(SimulAction.class).getSimulationParameter().setSimulLogLevel("info")'/>
         </cell>
         <cell  fill="horizontal"  weightx="0.2">
-            <JRadioButton id="fieldSimulAdvParamsSimulLoggerDebug" text="isisfish.common.debug" buttonGroup="fieldSimulAdvParamsSimulLoggerGroup" onActionPerformed = 'simulDebugChanged()'/>
+            <JRadioButton id="fieldSimulAdvParamsSimulLoggerDebug" text="isisfish.common.debug" buttonGroup="fieldSimulAdvParamsSimulLoggerGroup" onActionPerformed = 'getContextValue(SimulAction.class).getSimulationParameter().setSimulLogLevel("debug")'/>
         </cell>
     </row>
     <row>
@@ -229,16 +172,16 @@
             <JLabel text="isisfish.advancedParams.scriptLevelLogger"/>
         </cell>
         <cell fill="horizontal"  weightx="0.2">
-            <JRadioButton id="fieldSimulAdvParamsScriptLoggerError" text="isisfish.common.error" buttonGroup="fieldSimulAdvParamsScriptLoggerGroup" onActionPerformed = 'scriptErrorChanged()'/>
+            <JRadioButton id="fieldSimulAdvParamsScriptLoggerError" text="isisfish.common.error" buttonGroup="fieldSimulAdvParamsScriptLoggerGroup" onActionPerformed = 'getContextValue(SimulAction.class).getSimulationParameter().setScriptLogLevel("error")'/>
         </cell>
         <cell fill="horizontal"  weightx="0.2">
-            <JRadioButton id="fieldSimulAdvParamsScriptLoggerWarn" text="isisfish.common.warn" buttonGroup="fieldSimulAdvParamsScriptLoggerGroup" onActionPerformed = 'scriptWarnChanged()'/>
+            <JRadioButton id="fieldSimulAdvParamsScriptLoggerWarn" text="isisfish.common.warn" buttonGroup="fieldSimulAdvParamsScriptLoggerGroup" onActionPerformed = 'getContextValue(SimulAction.class).getSimulationParameter().setScriptLogLevel("warn")'/>
         </cell>
         <cell fill="horizontal"  weightx="0.2">
-            <JRadioButton id="fieldSimulAdvParamsScriptLoggerInfo" text="isisfish.common.info" buttonGroup="fieldSimulAdvParamsScriptLoggerGroup" onActionPerformed = 'scriptInfoChanged()'/>
+            <JRadioButton id="fieldSimulAdvParamsScriptLoggerInfo" text="isisfish.common.info" buttonGroup="fieldSimulAdvParamsScriptLoggerGroup" onActionPerformed = 'getContextValue(SimulAction.class).getSimulationParameter().setScriptLogLevel("info")'/>
         </cell>
         <cell fill="horizontal"  weightx="0.2">
-            <JRadioButton id="fieldSimulAdvParamsScriptLoggerDebug" text="isisfish.common.debug" buttonGroup="fieldSimulAdvParamsScriptLoggerGroup" onActionPerformed = 'scriptDebugChanged()'/>
+            <JRadioButton id="fieldSimulAdvParamsScriptLoggerDebug" text="isisfish.common.debug" buttonGroup="fieldSimulAdvParamsScriptLoggerGroup" onActionPerformed = 'getContextValue(SimulAction.class).getSimulationParameter().setScriptLogLevel("debug")'/>
         </cell>
     </row>
     <row>
@@ -246,16 +189,16 @@
             <JLabel text="isisfish.advancedParams.libLevelLogger"/>
         </cell>
         <cell fill="horizontal"  weightx="0.2">
-            <JRadioButton id="fieldSimulAdvParamsLibLoggerError" text="isisfish.common.error" buttonGroup="fieldSimulAdvParamsLibLoggerGroup" onActionPerformed = 'libErrorChanged()'/>
+            <JRadioButton id="fieldSimulAdvParamsLibLoggerError" text="isisfish.common.error" buttonGroup="fieldSimulAdvParamsLibLoggerGroup" onActionPerformed = 'getContextValue(SimulAction.class).getSimulationParameter().setLibLogLevel("error")'/>
         </cell>
         <cell fill="horizontal"  weightx="0.2">
-            <JRadioButton id="fieldSimulAdvParamsLibLoggerWarn" text="isisfish.common.warn" buttonGroup="fieldSimulAdvParamsLibLoggerGroup" onActionPerformed = 'libWarnChanged()'/>
+            <JRadioButton id="fieldSimulAdvParamsLibLoggerWarn" text="isisfish.common.warn" buttonGroup="fieldSimulAdvParamsLibLoggerGroup" onActionPerformed = 'getContextValue(SimulAction.class).getSimulationParameter().setLibLogLevel("warn")'/>
         </cell>
         <cell fill="horizontal"  weightx="0.2">
-            <JRadioButton id="fieldSimulAdvParamsLibLoggerInfo" text="isisfish.common.info" buttonGroup="fieldSimulAdvParamsLibLoggerGroup" onActionPerformed = 'libInfoChanged()'/>
+            <JRadioButton id="fieldSimulAdvParamsLibLoggerInfo" text="isisfish.common.info" buttonGroup="fieldSimulAdvParamsLibLoggerGroup" onActionPerformed = 'getContextValue(SimulAction.class).getSimulationParameter().setLibLogLevel("info")'/>
         </cell>
         <cell fill="horizontal"  weightx="0.2">
-            <JRadioButton id="fieldSimulAdvParamsLibLoggerDebug" text="isisfish.common.debug" buttonGroup="fieldSimulAdvParamsLibLoggerGroup" onActionPerformed = 'libDebugChanged()'/>
+            <JRadioButton id="fieldSimulAdvParamsLibLoggerDebug" text="isisfish.common.debug" buttonGroup="fieldSimulAdvParamsLibLoggerGroup" onActionPerformed = 'getContextValue(SimulAction.class).getSimulationParameter().setLibLogLevel("debug")'/>
         </cell>
     </row>
     <row>

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-09 10:29:53 UTC (rev 1917)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx	2009-03-09 13:49:51 UTC (rev 1918)
@@ -567,7 +567,7 @@
                             </tab>
                             <tab title='{_("isisfish.params.ruleParameters")}'>
                                 <JScrollPane  minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'>
-                                    <JTable id="simulParamsRules" name="isisfish.params.ruleParameters"/>
+                                    <JTable id="simulParamsRules" rowHeight='24' name="isisfish.params.ruleParameters"/>
                                 </JScrollPane>
                             </tab>
                         </JTabbedPane>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/QueueUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/QueueUI.jaxx	2009-03-09 10:29:53 UTC (rev 1917)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/QueueUI.jaxx	2009-03-09 13:49:51 UTC (rev 1918)
@@ -112,7 +112,7 @@
     <row>
         <cell columns="4" fill="both" weightx="1.0" weighty="0.5">
             <JScrollPane>
-                <JTable id="queueTableDone" model='{getContextValue(SimulationServiceTableModel.class, "done")}'/>
+                <JTable id="queueTableDone" rowHeight='24' model='{getContextValue(SimulationServiceTableModel.class, "done")}'/>
             </JScrollPane>
         </cell>
     </row>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx	2009-03-09 10:29:53 UTC (rev 1917)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx	2009-03-09 13:49:51 UTC (rev 1918)
@@ -163,7 +163,7 @@
     <row>
         <cell columns="2" fill="both" weightx="1.0" weighty="1.0">
             <JScrollPane>
-                <JTable id="simulParamsAnalysePlans" name="isisfish.sens.planParameters"/>
+                <JTable id="simulParamsAnalysePlans" rowHeight='24' name="isisfish.sens.planParameters"/>
             </JScrollPane>
         </cell>
     </row>

    

r1918 - in isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui: . input simulator

sletellier＠users.labs.libre-entreprise.org

tags

participants (1)