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/DefaultContinuousPanel.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorAction.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/DefaultContinuousPanel.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/DefaultContinuousPanel.jaxx 2009-03-16 15:51:48 UTC (rev 1975) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/DefaultContinuousPanel.jaxx 2009-03-16 16:12:33 UTC (rev 1976) @@ -64,7 +64,6 @@ continueMax.setVisible(isContinuePossible()); continueMin.setVisible(isContinuePossible()); - 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='content' constraints='BorderLayout.CENTER'> @@ -94,13 +90,5 @@ <JPanel id='continueMaxPanel' layout='{new BorderLayout()}'/> </cell> </row> - <row> - <cell fill='horizontal'> - <JLabel text='isisfish.factor.increment' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> - </cell> - <cell fill='horizontal' weightx='1' columns='3'> - <JTextField id='increment' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> - </cell> - </row> </Table> </ContinuousPanelContainer> \ No newline at end of file Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java 2009-03-16 15:51:48 UTC (rev 1975) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.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/FactorAction.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorAction.java 2009-03-16 15:51:48 UTC (rev 1975) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorAction.java 2009-03-16 16:12:33 UTC (rev 1976) @@ -38,11 +38,11 @@ defaultPanel = matrixPanel.getDefaultContinuousPanel(); MatrixND matrix = matrixPanel.getMatrix(); String operateur = (String)matrixPanel.getOperator().getSelectedItem(); - action.addContinuousMatrixFactor(name, path, getMin(defaultPanel), getMax(defaultPanel), getInc(defaultPanel), matrix, operateur, cOrigine, exist); + action.addContinuousMatrixFactor(name, path, getMin(defaultPanel), getMax(defaultPanel), matrix, operateur, cOrigine, exist); }else if (DefaultContinuousPanel.class.isInstance(panel)){ defaultPanel = (DefaultContinuousPanel)panel; - action.addContinuousFactor(name, path, getMin(defaultPanel), getMax(defaultPanel), getInc(defaultPanel), cOrigine, exist); + action.addContinuousFactor(name, path, getMin(defaultPanel), getMax(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 = new ArrayList<Serializable>(); for(JComponent c: components){ 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-03-16 15:51:48 UTC (rev 1975) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.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 min, Serializable max, int inc, JComponent c, boolean exist){ + public void addContinuousFactor(String name, String path, Serializable min, Serializable max, JComponent c, boolean exist){ Factor f = new Factor(name); ContinuousDomain<Serializable> domain = new ContinuousDomain<Serializable>(); 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, Serializable min, Serializable max, int inc, MatrixND matrix, String operateur, JComponent c, boolean exist){ + public void addContinuousMatrixFactor(String name, String path, Serializable min, Serializable max, MatrixND matrix, String operateur, JComponent c, boolean exist){ Factor f = new Factor(name); MatrixContinuousDomain<Serializable> domain = new MatrixContinuousDomain<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, String operateur, JComponent c, boolean exist){ + public void addContinuousEquationFactor(String name, String path, String varName, Serializable min, Serializable max, MatrixND matrix, String operateur, JComponent c, boolean exist){ Factor f = new Factor(name); EquationContinuousDomain<Serializable> domain = new EquationContinuousDomain<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 =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-03-16 15:51:48 UTC (rev 1975) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-03-16 16:12:33 UTC (rev 1976) @@ -356,9 +356,9 @@ isisfish.factor.discret=Discret factor isisfish.factor.firstValue=First value isisfish.factor.increment=Cardinality -isisfish.factor.operateur=Operator isisfish.factor.lastValue=Last value isisfish.factor.name=Factor name +isisfish.factor.operateur=Operator isisfish.factor.selectDiscretNumber=Number of factors isisfish.factor.title=Factor input isisfish.factor.validDiscretNumber=Ok Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-03-16 15:51:48 UTC (rev 1975) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-03-16 16:12:33 UTC (rev 1976) @@ -352,13 +352,13 @@ isisfish.export.saved=Exports des r\u00E9sultats sauvegard\u00E9s isisfish.export.title=Export des r\u00E9sultats isisfish.factor.comment=Commentaires -isisfish.factor.continue=Facteur continue +isisfish.factor.continue=Facteur continu isisfish.factor.discret=Facteur discret isisfish.factor.firstValue=Premi\u00E8re valeur -isisfish.factor.increment=Cardinalit\u00E9e +isisfish.factor.increment=Cardinalit\u00E9 +isisfish.factor.lastValue=Derni\u00E8re valeur +isisfish.factor.name=Nom du facteur isisfish.factor.operateur=Op\u00E9rateur -isisfish.factor.lastValue=Derin\u00E8re valeur -isisfish.factor.name=Nom du facteur isisfish.factor.selectDiscretNumber=Nombre de facteurs isisfish.factor.title=Saisie d'un facteur isisfish.factor.validDiscretNumber=Valider @@ -859,7 +859,7 @@ isisfish.sensWizardPanels.values=Valeurs isisfish.sensibilityWizard.title=Sensibility Wizard isisfish.sensitivity.title=S\u00E9lection des facteurs -isisfish.sensitivityChooser.title=Param\u00E8tres de la sensibilit\u00E9 +isisfish.sensitivityChooser.title=M\u00E9thode de la sensibilit\u00E9 isisfish.server.ssh.generateKey.title=G\u00E9n\u00E9rer une cl\u00E9 SSH isisfish.setOfVessels.comments=Commentaires isisfish.setOfVessels.fixedCosts=Co\u00FBts fixes