From sletellier@users.labs.libre-entreprise.org Mon Jun 15 00:25:58 2026
From: sletellier@users.labs.libre-entreprise.org
To: isis-fish-commits@list.isis-fish.org
Subject: [Isis-fish-commits] r1976 - in isis-fish/trunk/src/main:
	java/fr/ifremer/isisfish/ui/sensitivity	java/fr/ifremer/isisfish/ui/simulator
 resources/i18n
Date: Mon, 16 Mar 2009 17:12:33 +0100
Message-ID: <20090316161233.C1C58461708@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6983572933489471756=="

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

Author: sletellier
Date: 2009-03-16 16:12:33 +0000 (Mon, 16 Mar 2009)
New Revision: 1976

Modified:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/DefaultCo=
ntinuousPanel.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHel=
per.java
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorAct=
ion.java
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction=
.java
   isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties
   isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties
Log:
Some bugs fixed

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/De=
faultContinuousPanel.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
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/DefaultC=
ontinuousPanel.jaxx	2009-03-16 15:51:48 UTC (rev 1975)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/DefaultC=
ontinuousPanel.jaxx	2009-03-16 16:12:33 UTC (rev 1976)
@@ -64,7 +64,6 @@
     continueMax.setVisible(isContinuePossible());
     continueMin.setVisible(isContinuePossible());
=20
-    increment.setText(String.valueOf(inc));
     continueMaxPanel.add(continueMax, BorderLayout.CENTER);
     continueMinPanel.add(continueMin, BorderLayout.CENTER);
 }
@@ -74,9 +73,6 @@
 public String getMax(){
     return continueMax.getText();
 }
-public String getInc(){
-    return increment.getText();
-}
      ]]>
      </script>
     <Table id=3D'content' constraints=3D'BorderLayout.CENTER'>
@@ -94,13 +90,5 @@
                 <JPanel id=3D'continueMaxPanel' layout=3D'{new BorderLayout(=
)}'/>
             </cell>
         </row>
-        <row>
-            <cell fill=3D'horizontal'>
-                <JLabel text=3D'isisfish.factor.increment' visible=3D'{isCon=
tinuePossible()}' enabled=3D'{isContinueSelected()}'/>
-            </cell>
-            <cell fill=3D'horizontal' weightx=3D'1' columns=3D'3'>
-                <JTextField id=3D'increment' visible=3D'{isContinuePossible(=
)}' enabled=3D'{isContinueSelected()}'/>
-            </cell>
-        </row>
     </Table>
 </ContinuousPanelContainer>
\ No newline at end of file

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/Ed=
itorHelper.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
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHe=
lper.java	2009-03-16 15:51:48 UTC (rev 1975)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHe=
lper.java	2009-03-16 16:12:33 UTC (rev 1976)
@@ -362,10 +362,8 @@
   }
   public static boolean canBeContinue(JComponent c, Object o){
     if (c instanceof JTextComponent) {
-        if (Integer.class.isInstance(o)){
+        if (Double.class.isInstance(o)){
             return true;
-        } else if (Double.class.isInstance(o)){
-            return true;
         }  else if (Long.class.isInstance(o)){
             return true;
         }

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/Fa=
ctorAction.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
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorAc=
tion.java	2009-03-16 15:51:48 UTC (rev 1975)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorAc=
tion.java	2009-03-16 16:12:33 UTC (rev 1976)
@@ -38,11 +38,11 @@
             defaultPanel =3D matrixPanel.getDefaultContinuousPanel();
             MatrixND matrix =3D matrixPanel.getMatrix();
             String operateur =3D (String)matrixPanel.getOperator().getSelect=
edItem();
-            action.addContinuousMatrixFactor(name, path, getMin(defaultPanel=
), getMax(defaultPanel), getInc(defaultPanel), matrix, operateur, cOrigine, e=
xist);
+            action.addContinuousMatrixFactor(name, path, getMin(defaultPanel=
), getMax(defaultPanel), matrix, operateur, cOrigine, exist);
=20
         }else if (DefaultContinuousPanel.class.isInstance(panel)){
             defaultPanel =3D (DefaultContinuousPanel)panel;
-            action.addContinuousFactor(name, path, getMin(defaultPanel), get=
Max(defaultPanel), getInc(defaultPanel), cOrigine, exist);
+            action.addContinuousFactor(name, path, getMin(defaultPanel), get=
Max(defaultPanel), cOrigine, exist);
         }
     }
     protected static Serializable getMin(DefaultContinuousPanel defaultPanel=
){
@@ -51,9 +51,6 @@
     protected static Serializable getMax(DefaultContinuousPanel defaultPanel=
){
         return (Serializable)Double.parseDouble(defaultPanel.getMax());
     }
-    protected static int getInc(DefaultContinuousPanel defaultPanel){
-        return Integer.parseInt(defaultPanel.getInc());
-    }
     public static void saveDiscret(JComponent cOrigine, String name, String =
path, List<JComponent> components, SimulAction action, boolean exist){
         List<Serializable> values =3D new ArrayList<Serializable>();
         for(JComponent c: components){

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/Simu=
lAction.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
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulActio=
n.java	2009-03-16 15:51:48 UTC (rev 1975)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulActio=
n.java	2009-03-16 16:12:33 UTC (rev 1976)
@@ -675,12 +675,11 @@
     public Factor<? extends Serializable>  getFactor(String name){
         return factors.get(name);
     }
-    public void addContinuousFactor(String name, String path, Serializable m=
in, Serializable max, int inc, JComponent c, boolean exist){
+    public void addContinuousFactor(String name, String path, Serializable m=
in, Serializable max, JComponent c, boolean exist){
         Factor f =3D new Factor(name);
         ContinuousDomain<Serializable>  domain =3D new ContinuousDomain<Seri=
alizable>();
         domain.setMinBound(min);
         domain.setMaxBound(max);
-        domain.setCardinality(inc);
         f.setDomain(domain);
         f.setPath(path);
         if (exist)
@@ -704,12 +703,11 @@
             removeFactor(path);
         addFactor(path, f, c);
     }
-    public void addContinuousMatrixFactor(String name, String path, Serializ=
able min, Serializable max, int inc, MatrixND matrix, String operateur, JComp=
onent c, boolean exist){
+    public void addContinuousMatrixFactor(String name, String path, Serializ=
able min, Serializable max, MatrixND matrix, String operateur, JComponent c, =
boolean exist){
         Factor f =3D new Factor(name);
         MatrixContinuousDomain<Serializable> domain =3D new MatrixContinuous=
Domain<Serializable>();
         domain.setMatrix(matrix);
         domain.setOperator(operateur);
-        domain.setCardinality(inc);
         domain.setMaxBound(max);
         domain.setMinBound(min);
         f.setDomain(domain);
@@ -718,12 +716,11 @@
             removeFactor(path);
         addFactor(path, f, c);
     }
-    public void addContinuousEquationFactor(String name, String path, String=
 varName, Serializable min, Serializable max, int inc, MatrixND matrix, Strin=
g operateur, JComponent c, boolean exist){
+    public void addContinuousEquationFactor(String name, String path, String=
 varName, Serializable min, Serializable max, MatrixND matrix, String operate=
ur, JComponent c, boolean exist){
         Factor f =3D new Factor(name);
         EquationContinuousDomain<Serializable> domain =3D new EquationContin=
uousDomain<Serializable>();
         domain.setVariableName(varName);
         domain.setOperator(operateur);
-        domain.setCardinality(inc);
         domain.setMaxBound(max);
         domain.setMinBound(min);
         f.setDomain(domain);

Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.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
--- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties	2009-0=
3-16 15:51:48 UTC (rev 1975)
+++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties	2009-0=
3-16 16:12:33 UTC (rev 1976)
@@ -356,9 +356,9 @@
 isisfish.factor.discret=3DDiscret factor
 isisfish.factor.firstValue=3DFirst value
 isisfish.factor.increment=3DCardinality
-isisfish.factor.operateur=3DOperator
 isisfish.factor.lastValue=3DLast value
 isisfish.factor.name=3DFactor name
+isisfish.factor.operateur=3DOperator
 isisfish.factor.selectDiscretNumber=3DNumber of factors
 isisfish.factor.title=3DFactor input
 isisfish.factor.validDiscretNumber=3DOk

Modified: isis-fish/trunk/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
--- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties	2009-0=
3-16 15:51:48 UTC (rev 1975)
+++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties	2009-0=
3-16 16:12:33 UTC (rev 1976)
@@ -352,13 +352,13 @@
 isisfish.export.saved=3DExports des r\u00E9sultats sauvegard\u00E9s
 isisfish.export.title=3DExport des r\u00E9sultats
 isisfish.factor.comment=3DCommentaires
-isisfish.factor.continue=3DFacteur continue
+isisfish.factor.continue=3DFacteur continu
 isisfish.factor.discret=3DFacteur discret
 isisfish.factor.firstValue=3DPremi\u00E8re valeur
-isisfish.factor.increment=3DCardinalit\u00E9e
+isisfish.factor.increment=3DCardinalit\u00E9
+isisfish.factor.lastValue=3DDerni\u00E8re valeur
+isisfish.factor.name=3DNom du facteur
 isisfish.factor.operateur=3DOp\u00E9rateur
-isisfish.factor.lastValue=3DDerin\u00E8re valeur
-isisfish.factor.name=3DNom du facteur
 isisfish.factor.selectDiscretNumber=3DNombre de facteurs
 isisfish.factor.title=3DSaisie d'un facteur
 isisfish.factor.validDiscretNumber=3DValider
@@ -859,7 +859,7 @@
 isisfish.sensWizardPanels.values=3DValeurs
 isisfish.sensibilityWizard.title=3DSensibility Wizard
 isisfish.sensitivity.title=3DS\u00E9lection des facteurs
-isisfish.sensitivityChooser.title=3DParam\u00E8tres de la sensibilit\u00E9
+isisfish.sensitivityChooser.title=3DM\u00E9thode de la sensibilit\u00E9
 isisfish.server.ssh.generateKey.title=3DG\u00E9n\u00E9rer une cl\u00E9 SSH
 isisfish.setOfVessels.comments=3DCommentaires
 isisfish.setOfVessels.fixedCosts=3DCo\u00FBts fixes


--===============6983572933489471756==--