Author: tchemit Date: 2013-07-16 16:56:40 +0200 (Tue, 16 Jul 2013) New Revision: 1138 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1138 Log: fixes #2880: [MENSURATION] generation des classes avec un pas de 0.1 Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-07-16 14:33:14 UTC (rev 1137) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-07-16 14:56:40 UTC (rev 1138) @@ -61,6 +61,9 @@ import java.awt.event.KeyEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; +import java.math.BigDecimal; +import java.math.MathContext; +import java.math.RoundingMode; import java.util.Collections; import java.util.List; import java.util.Map; @@ -114,9 +117,9 @@ protected boolean isRowValid(SpeciesFrequencyRowModel row) { return row.getLengthStepCaracteristic() != null && row.getLengthStep() != null && - ((row.getNumber() == null && row.getWeight() == null) || - (row.getNumber() != null && row.getNumber() > 0 && - (withWeightRows.isEmpty() || row.getWeight() != null && row.getWeight() > 0))); + ((row.getNumber() == null && row.getWeight() == null) || + (row.getNumber() != null && row.getNumber() > 0 && + (withWeightRows.isEmpty() || row.getWeight() != null && row.getWeight() > 0))); } @Override @@ -398,7 +401,9 @@ Float maxStep = model.getLengthStep(model.getMaxStep()); Caracteristic lengthStepCaracteristic = model.getLengthStepCaracteristic(); - for (float i = minStep, step = model.getStep(); i <= maxStep; i += step) { + for (float i = minStep, step = model.getStep(); i <= maxStep; + i = model.getLengthStep(i+step)) { + if (!rowsByStep.containsKey(i)) { // add it