From echatellier@users.forge.codelutin.com Tue Nov 26 23:07:07 2013
From: echatellier@users.forge.codelutin.com
To: isis-fish-commits@list.isis-fish.org
Subject: [Isis-fish-commits] r3846 - in branches/4.0.1/src/main:
	java/fr/ifremer/isisfish/ui/calibration resources/i18n
Date: Tue, 26 Nov 2013 23:07:07 +0100
Message-ID: <20131126220707.72DE4181EC4@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2634807204470118274=="

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

Author: echatellier
Date: 2013-11-26 23:07:07 +0100 (Tue, 26 Nov 2013)
New Revision: 3846

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

Log:
Ajout de donn?\195?\169es d'exemple

Modified:
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/calibration/Calibratio=
nHandler.java
   branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/calibration/Calibratio=
nMethodUI.jaxx
   branches/4.0.1/src/main/resources/i18n/isis-fish_fr_FR.properties

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/calibration/Cal=
ibrationHandler.java
=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
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/calibration/Calibrati=
onHandler.java	2013-11-26 21:38:18 UTC (rev 3845)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/calibration/Calibrati=
onHandler.java	2013-11-26 22:07:07 UTC (rev 3846)
@@ -22,8 +22,30 @@
  */
 package fr.ifremer.isisfish.ui.calibration;
=20
+import javax.swing.DefaultComboBoxModel;
+import javax.swing.DefaultListModel;
+
 import fr.ifremer.isisfish.ui.input.InputHandler;
=20
 public class CalibrationHandler extends InputHandler {
=20
+    public void init(CalibrationMethodUI view) {
+        DefaultComboBoxModel<String> methodModel =3D new DefaultComboBoxMode=
l<>();
+        methodModel.addElement("Simplex");
+        methodModel.addElement("ABC");
+        methodModel.addElement("G=C3=A9n=C3=A9tique");
+        view.getFieldCalibrationMethodSelect().setModel(methodModel);
+
+        DefaultListModel<String> objectiveModel =3D new DefaultListModel<>();
+        objectiveModel.addElement("Moindres carr=C3=A9s indice abondance");
+        objectiveModel.addElement("Moindres carr=C3=A9s debarquements par fl=
ottille");
+        view.getAvailableCalibrationObjectives().setModel(objectiveModel);
+
+        DefaultComboBoxModel<String> criteriaModel =3D new DefaultComboBoxMo=
del<>();
+        criteriaModel.addElement("Min");
+        criteriaModel.addElement("Max");
+        criteriaModel.addElement("Seuil =C3=A0 d=C3=A9passer");
+        criteriaModel.addElement("Epsilon");
+        view.getFieldCalibrationCriteriaSelect().setModel(criteriaModel);
+    }
 }

Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/calibration/Cal=
ibrationMethodUI.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
--- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/calibration/Calibrati=
onMethodUI.jaxx	2013-11-26 21:38:18 UTC (rev 3845)
+++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/calibration/Calibrati=
onMethodUI.jaxx	2013-11-26 22:07:07 UTC (rev 3846)
@@ -28,92 +28,93 @@
     javax.swing.ComboBoxModel
     javax.swing.table.DefaultTableModel
   </import>
- =20
+
   <script><![CDATA[
- =20
-
-    ]]></script>
-    <row>
-        <cell fill=3D"horizontal">
-            <JLabel text=3D"isisfish.calibration.select"/>
-        </cell>
-        <cell fill=3D"horizontal" weightx=3D"1.0">
-            <JComboBox id=3D"fieldCalibrationMethodSelect" />
-        </cell>
-    </row>
-    <row>
-        <cell columns=3D"2" fill=3D"both" weightx=3D"1.0" weighty=3D"1.0">
-            <JScrollPane>
-                <JTable id=3D"simulCalibrationMethodParam" rowHeight=3D'24'/>
-            </JScrollPane>
-        </cell>
-    </row>
-    <row>
-        <cell columns=3D"2" fill=3D"both" weightx=3D"1.0" weighty=3D"1.0">
-            <JPanel id=3D"factorCardinalityPanel" layout=3D"{new CardLayout(=
)}">
-                <JLabel text=3D"isisfish.calibration.methodfactorsupported" =
horizontalAlignment=3D"center"
-                    border=3D"{BorderFactory.createEtchedBorder()}" font-sty=
le=3D"italic" constraints=3D'"factorCardinalitySupported"'/>
-                <JScrollPane id=3D"factorCardinalityScrollPane" constraints=
=3D'"factorCardinalityNotSupported"'>
-                    <JTable id=3D"factorCardinality" rowHeight=3D'24' />
-                </JScrollPane>
-            </JPanel>
-        </cell>
-    </row>
-    <row>
-        <cell fill=3D"both" columns=3D'3' weightx=3D"1.0">
-           <JLabel text=3D"isisfish.calibration.objectives"/>
-        </cell>
-    </row>
-    <row>
-        <cell columns=3D'2' fill=3D"both" weightx=3D"1.0" weighty=3D"1.0">
-          <Table>
-            <row>
-               <cell fill=3D"both" weightx=3D"0.5" weighty=3D"1.0">
-                <JScrollPane>
-                    <JList id=3D"availableCalibrationObjectives" selectionMo=
de=3D"{javax.swing.ListSelectionModel.MULTIPLE_INTERVAL_SELECTION}" />
-                </JScrollPane>
-             </cell>
-             <cell fill=3D"both" weighty=3D"1.0">
-                <Table>
-                    <row>
-                       <cell fill=3D"both">
-                            <JButton id=3D"addObjectiveButton" text=3D"isisf=
ish.common.add" enabled=3D"false" />
-                       </cell>
-                    </row>
-                    <row>
-                       <cell fill=3D"both">
-                            <JButton id=3D"removeObjectiveButton" text=3D"is=
isfish.common.remove" enabled=3D"false" />
-                       </cell>
-                    </row>
-                    <row>
-                       <cell fill=3D"both">
-                            <JButton id=3D"clearObjectiveButton" text=3D"isi=
sfish.common.clear" enabled=3D"false" />
-                       </cell>
-                    </row>
-                 </Table>
-             </cell>
+    protected void $afterCompleteSetup() {
+      getContextValue(CalibrationHandler.class).init(this);
+    }
+  ]]></script>
+  <row>
+      <cell fill=3D"horizontal">
+          <JLabel text=3D"isisfish.calibration.select"/>
+      </cell>
+      <cell fill=3D"horizontal" weightx=3D"1.0">
+          <JComboBox id=3D"fieldCalibrationMethodSelect" />
+      </cell>
+  </row>
+  <row>
+      <cell columns=3D"2" fill=3D"both" weightx=3D"1.0" weighty=3D"1.0">
+          <JScrollPane>
+              <JTable id=3D"simulCalibrationMethodParam" rowHeight=3D'24' />
+          </JScrollPane>
+      </cell>
+  </row>
+  <row>
+      <cell columns=3D"2" fill=3D"both" weightx=3D"1.0" weighty=3D"1.0">
+          <JPanel id=3D"factorCardinalityPanel" layout=3D"{new CardLayout()}=
">
+              <JLabel text=3D"isisfish.calibration.methodfactorsupported" ho=
rizontalAlignment=3D"center"
+                  border=3D"{BorderFactory.createEtchedBorder()}" font-style=
=3D"italic" constraints=3D'"factorCardinalitySupported"'/>
+              <JScrollPane id=3D"factorCardinalityScrollPane" constraints=3D=
'"factorCardinalityNotSupported"'>
+                  <JTable id=3D"factorCardinality" rowHeight=3D'24' />
+              </JScrollPane>
+          </JPanel>
+      </cell>
+  </row>
+  <row>
+      <cell fill=3D"both" columns=3D'3' weightx=3D"1.0">
+         <JLabel text=3D"isisfish.calibration.objectives"/>
+      </cell>
+  </row>
+  <row>
+      <cell columns=3D'2' fill=3D"both" weightx=3D"1.0" weighty=3D"1.0">
+        <Table>
+          <row>
              <cell fill=3D"both" weightx=3D"0.5" weighty=3D"1.0">
-                <JScrollPane>
-                    <JList id=3D"selectedCalibrationObjectives" selectionMod=
e=3D"{javax.swing.ListSelectionModel.MULTIPLE_INTERVAL_SELECTION}" />
-                </JScrollPane>
-             </cell>
-          </row>
-         </Table>
-        </cell>
-     </row>
-     <row>
-         <cell fill=3D"both" columns=3D'2' weightx=3D"1.0" weighty=3D"1.0">
-            <JScrollPane>
-                <JTable id=3D"objectiveParamsTable" rowHeight=3D'24' />
-            </JScrollPane>
-         </cell>
-     </row>
-     <row>
-        <cell fill=3D"horizontal">
-            <JLabel text=3D"isisfish.calibration.optimization"/>
-        </cell>
-        <cell fill=3D"horizontal" weightx=3D"1.0">
-            <JComboBox id=3D"fieldCalibrationScriptSelect" />
-        </cell>
-    </row>
+              <JScrollPane>
+                  <JList id=3D"availableCalibrationObjectives" selectionMode=
=3D"{javax.swing.ListSelectionModel.MULTIPLE_INTERVAL_SELECTION}" />
+              </JScrollPane>
+           </cell>
+           <cell fill=3D"both" weighty=3D"1.0">
+              <Table>
+                  <row>
+                     <cell fill=3D"both">
+                          <JButton id=3D"addObjectiveButton" text=3D"isisfis=
h.common.add" enabled=3D"false" />
+                     </cell>
+                  </row>
+                  <row>
+                     <cell fill=3D"both">
+                          <JButton id=3D"removeObjectiveButton" text=3D"isis=
fish.common.remove" enabled=3D"false" />
+                     </cell>
+                  </row>
+                  <row>
+                     <cell fill=3D"both">
+                          <JButton id=3D"clearObjectiveButton" text=3D"isisf=
ish.common.clear" enabled=3D"false" />
+                     </cell>
+                  </row>
+               </Table>
+           </cell>
+           <cell fill=3D"both" weightx=3D"0.5" weighty=3D"1.0">
+              <JScrollPane>
+                  <JList id=3D"selectedCalibrationObjectives" selectionMode=
=3D"{javax.swing.ListSelectionModel.MULTIPLE_INTERVAL_SELECTION}" />
+              </JScrollPane>
+           </cell>
+        </row>
+       </Table>
+      </cell>
+   </row>
+   <row>
+       <cell fill=3D"both" columns=3D'2' weightx=3D"1.0" weighty=3D"1.0">
+          <JScrollPane>
+              <JTable id=3D"objectiveParamsTable" rowHeight=3D'24' />
+          </JScrollPane>
+       </cell>
+   </row>
+   <row>
+      <cell fill=3D"horizontal">
+          <JLabel text=3D"isisfish.calibration.optimization"/>
+      </cell>
+      <cell fill=3D"horizontal" weightx=3D"1.0">
+          <JComboBox id=3D"fieldCalibrationCriteriaSelect" />
+      </cell>
+  </row>
 </Table>

Modified: branches/4.0.1/src/main/resources/i18n/isis-fish_fr_FR.properties
=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
--- branches/4.0.1/src/main/resources/i18n/isis-fish_fr_FR.properties	2013-11=
-26 21:38:18 UTC (rev 3845)
+++ branches/4.0.1/src/main/resources/i18n/isis-fish_fr_FR.properties	2013-11=
-26 22:07:07 UTC (rev 3846)
@@ -99,7 +99,7 @@
 isisfish.advancedParams.simulatorUse=3DSimulateur =C3=A0 utiliser
 isisfish.calibration.methodfactorsupported=3DLa m=C3=A9thode de calibration =
choisie g=C3=A8re les cardinalit=C3=A9s des facteurs
 isisfish.calibration.objectives=3DFonctions d'objectif
-isisfish.calibration.optimization=3DScript d'optimisation
+isisfish.calibration.optimization=3DCrit=C3=A8re d'optimisation
 isisfish.calibration.select=3DM=C3=A9thode de calibration
 isisfish.calibration.title=3DCalibration
 isisfish.cell.comments=3DCommentaires


--===============2634807204470118274==--