Author: chatellier Date: 2011-06-08 10:24:05 +0000 (Wed, 08 Jun 2011) New Revision: 3365 Log: Fix factor reloading Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java Modified: isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java =================================================================== --- isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2011-06-08 10:23:49 UTC (rev 3364) +++ isis-fish/branches/3.3.1/src/main/java/fr/ifremer/isisfish/ui/simulator/SimulAction.java 2011-06-08 10:24:05 UTC (rev 3365) @@ -287,7 +287,7 @@ // Chargement des facteurs // clear list even if mexico file doesn't exists - //factors.clear(); + factorGroup.clearFactors(); File f = SimulationStorage.getMexicoDesignPlan(SimulationStorage.getSimulationDirectory(simulName)); if (f != null && f.canRead()) { if (log.isInfoEnabled()) { @@ -300,6 +300,7 @@ log.debug("Find factor : " + factor.getName()); } //factors.put(factor.getPath() + factor.getName(), factor); + factorGroup = designPlan.getFactorGroup(); } } else { @@ -929,7 +930,7 @@ public void addContinuousPercentageFactor(String name, String comment, String path, Double referenceValue, Double coefficient, boolean exist) { Factor f = new Factor(name); - ContinuousDomain domain = new ContinuousDomain(); + ContinuousDomain domain = new ContinuousDomain(true); domain.setReferenceValue(referenceValue); domain.setCoefficient(coefficient); f.setDomain(domain); @@ -996,7 +997,7 @@ public void addContinuousMatrixFactor(String name, String comment, String path, MatrixND referenceValue, Double coef, boolean exist) { Factor f = new Factor(name); - MatrixContinuousDomain domain = new MatrixContinuousDomain(); + MatrixContinuousDomain domain = new MatrixContinuousDomain(true); domain.setReferenceValue(referenceValue); domain.setCoefficient(coef); f.setComment(comment);