Author: sletellier Date: 2009-03-20 15:26:49 +0000 (Fri, 20 Mar 2009) New Revision: 2020 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/FactorWizard.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanel.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java Log: Bug editing discret factor fixed 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-20 13:57:26 UTC (rev 2019) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java 2009-03-20 15:26:49 UTC (rev 2020) @@ -266,7 +266,7 @@ try { result = c.getClass().newInstance(); - if (result instanceof JTextField) { + if (result instanceof JTextComponent) { ((JTextComponent) result).setText(String.valueOf(value)); } else if (result instanceof JTable){ Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizard.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizard.jaxx 2009-03-20 13:57:26 UTC (rev 2019) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizard.jaxx 2009-03-20 15:26:49 UTC (rev 2020) @@ -153,7 +153,7 @@ cache = o; JComponent c = EditorHelper.getEditorWithValue(cOrigine, o); discretComponents.add(c); - tabPane.add(c, "Factor " + (i+1)); + tabPane.add(c, "Factor " + i); } setContinuePossible(EditorHelper.canBeContinue(cOrigine, cache)); @@ -195,7 +195,7 @@ this.dispose(); } protected void remove(){ - getSimulAction().removeFactor(path, factor); + getSimulAction().removeFactor(factor); getContextValue(InputSaveVerifier.class).getSensPanel().setFactorModel(); this.dispose(); } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanel.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanel.jaxx 2009-03-20 13:57:26 UTC (rev 2019) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanel.jaxx 2009-03-20 15:26:49 UTC (rev 2020) @@ -53,7 +53,7 @@ </cell> <cell fill='both' weightx='1' weighty='1'> <JScrollPane> - <MatrixPanelEditor id='componentPanel' matrix='{getMatrix()}'/> + <MatrixPanelEditor id='componentPanel' matrix='{getMatrix()}' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/> </JScrollPane> </cell> </row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx 2009-03-20 13:57:26 UTC (rev 2019) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx 2009-03-20 15:26:49 UTC (rev 2020) @@ -105,7 +105,7 @@ if (Factor.class.isInstance(o)){ Factor f = (Factor)o; FactorWizard wizard = new FactorWizard(this); - wizard.initExisting(getSimulAction().getFactorComponent(f.getPath()), f); + wizard.initExisting(getSimulAction().getFactorComponent(f), f); wizard.pack(); wizard.setVisible(true); } 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-20 13:57:26 UTC (rev 2019) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2009-03-20 15:26:49 UTC (rev 2020) @@ -845,7 +845,7 @@ f.setDomain(domain); f.setPath(path); if (exist) - removeFactor(path, f); + removeFactor(f); addFactor(path, f, c); } @@ -864,7 +864,7 @@ f.setDomain(domain); f.setPath(path); if (exist) - removeFactor(path, f); + removeFactor(f); addFactor(path, f, c); } @@ -874,9 +874,9 @@ Factor f = new Factor(name); f.setValue(equation); f.setDomain(domain); - f.setPath(path); + f.setPath(path + domain.getVariableName()); if (exist) - removeFactor(path, f); + removeFactor(f); addFactor(path, f, c); } @@ -893,17 +893,17 @@ f.setPath(path); f.setValue(matrix); if (exist) - removeFactor(path, f); + removeFactor(f); addFactor(path, f, c); } - public JComponent getFactorComponent(String path) { - return factorComponent.get(path); + public JComponent getFactorComponent(Factor f) { + return factorComponent.get(f.getPath() + f); } - public void removeFactor(String path, Factor f) { - factors.remove(path + f.getName()); - factorComponent.remove(path + f.getName()); + public void removeFactor(Factor f) { + factors.remove(f.getPath() + f.getName()); + factorComponent.remove(f.getPath() + f.getName()); designPlan.setFactors(getFactors()); }