Author: tchemit Date: 2013-07-18 11:15:15 +0200 (Thu, 18 Jul 2013) New Revision: 1148 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1148 Log: fixes #2895: [MENSURATION] probl?\195?\168mes en mode g?\195?\169n?\195?\169ration de classe Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 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/util/TuttiUIUtil.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-07-16 17:52:28 UTC (rev 1147) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-07-18 09:15:15 UTC (rev 1148) @@ -113,9 +113,9 @@ protected boolean isRowValid(BenthosFrequencyRowModel 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 @@ -399,8 +399,8 @@ Caracteristic lengthStepCaracteristic = model.getLengthStepCaracteristic(); for (float i = minStep, step = model.getStep(); i <= maxStep; - i = model.getLengthStep(i+step)) { - + i = TuttiUIUtil.getRoundedLengthStep(i + step, true)) { + if (!rowsByStep.containsKey(i)) { // add it 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 17:52:28 UTC (rev 1147) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-07-18 09:15:15 UTC (rev 1148) @@ -61,9 +61,6 @@ 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; @@ -402,7 +399,7 @@ Caracteristic lengthStepCaracteristic = model.getLengthStepCaracteristic(); for (float i = minStep, step = model.getStep(); i <= maxStep; - i = model.getLengthStep(i+step)) { + i = TuttiUIUtil.getRoundedLengthStep(i + step, true)) { if (!rowsByStep.containsKey(i)) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java 2013-07-16 17:52:28 UTC (rev 1147) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java 2013-07-18 09:15:15 UTC (rev 1148) @@ -366,4 +366,10 @@ throw new TuttiBusinessException(_(i18nKey, url)); } } + + public static float getRoundedLengthStep(float lengthStep, boolean aroundUp) { + int intValue = (int) ((lengthStep + (aroundUp ? 0.001f : 0f)) * 10); + float result = intValue / 10f; + return result; + } }