branch feature/8081 created (now 0709343)
This is an automated email from the git hooks/post-receive script. New change to branch feature/8081 in repository tutti. See http://git.codelutin.com/tutti.git at 0709343 suppression des lignes de mensuration quand le nombre est à zéro (fices #8081) This branch includes the following new commits: new f54784e mauvais merge (refs #8081) new 2712b05 le poids n'etait pas supprimé des mensurations (refs #8081) new 0709343 suppression des lignes de mensuration quand le nombre est à zéro (fices #8081) The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 0709343d10086dcfb142a8bad4de96f2c9168042 Author: Kevin Morin <morin@codelutin.com> Date: Tue Mar 8 14:50:20 2016 +0100 suppression des lignes de mensuration quand le nombre est à zéro (fices #8081) commit 2712b05b1f9708c97b3a5a82b4470cea1e53ea12 Author: Kevin Morin <morin@codelutin.com> Date: Tue Mar 8 14:50:15 2016 +0100 le poids n'etait pas supprimé des mensurations (refs #8081) commit f54784e98ac00bba896e5e3b3043e8c945aabd16 Author: Kevin Morin <morin@codelutin.com> Date: Tue Mar 8 14:48:06 2016 +0100 mauvais merge (refs #8081) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/8081 in repository tutti. See http://git.codelutin.com/tutti.git commit f54784e98ac00bba896e5e3b3043e8c945aabd16 Author: Kevin Morin <morin@codelutin.com> Date: Tue Mar 8 14:48:06 2016 +0100 mauvais merge (refs #8081) --- .../operation/catches/species/frequency/SpeciesFrequencyUIModel.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java index c8624c0..3ddc475 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIModel.java @@ -651,12 +651,11 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa } public boolean mustCopyIndividualObservationSize() { - return getIndividualObservationRowsInError().isEmpty() - && (isCopyIndividualObservationAll() || isCopyIndividualObservationSize()); + return isCopyIndividualObservationAll() || isCopyIndividualObservationSize(); } public boolean mustCopyIndividualObservationWeight() { - return getIndividualObservationRowsInError().isEmpty() && isCopyIndividualObservationAll(); + return isCopyIndividualObservationAll(); } public boolean isCopyIndividualObservationAll() { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/8081 in repository tutti. See http://git.codelutin.com/tutti.git commit 2712b05b1f9708c97b3a5a82b4470cea1e53ea12 Author: Kevin Morin <morin@codelutin.com> Date: Tue Mar 8 14:50:15 2016 +0100 le poids n'etait pas supprimé des mensurations (refs #8081) --- .../catches/species/frequency/actions/RemoveObservationAction.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/RemoveObservationAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/RemoveObservationAction.java index 22b2ac9..f2835b7 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/RemoveObservationAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/RemoveObservationAction.java @@ -83,6 +83,9 @@ public class RemoveObservationAction extends SimpleActionSupport<SpeciesFrequenc if (model.mustCopyIndividualObservationSize()) { handler.updateFrequencyRowsNumbers(row.getSize(), null); } + if (model.mustCopyIndividualObservationWeight()) { + handler.updateFrequencyRowsWeights(row.getSize(), -row.getWeight()); + } model.removeIndividualObservationRowInError(row); }); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/8081 in repository tutti. See http://git.codelutin.com/tutti.git commit 0709343d10086dcfb142a8bad4de96f2c9168042 Author: Kevin Morin <morin@codelutin.com> Date: Tue Mar 8 14:50:20 2016 +0100 suppression des lignes de mensuration quand le nombre est à zéro (fices #8081) --- .../species/frequency/SpeciesFrequencyRowModel.java | 9 +++++++++ .../species/frequency/SpeciesFrequencyTableModel.java | 7 ++----- .../species/frequency/SpeciesFrequencyUIHandler.java | 19 +++++++++++-------- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyRowModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyRowModel.java index 0fdf044..5a8718f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyRowModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyRowModel.java @@ -191,6 +191,10 @@ public class SpeciesFrequencyRowModel extends AbstractTuttiBeanUIModel<SpeciesBa firePropertyChange(PROPERTY_NUMBER, oldValue, number); } + public boolean withNumber() { + return number != null && number > 0; + } + public void incNumber() { if (number == null) { number = 0; @@ -220,6 +224,11 @@ public class SpeciesFrequencyRowModel extends AbstractTuttiBeanUIModel<SpeciesBa firePropertyChange(PROPERTY_WEIGHT, oldValue, weight); } + public boolean withWeight() { + Float weight = getWeight(); + return weight != null && weight > 0; + } + /** * @param weightToAdd weight (can be negative) to add */ diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java index e52ea4b..c5316a6 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyTableModel.java @@ -296,13 +296,11 @@ public class SpeciesFrequencyTableModel extends AbstractApplicationTableModel<Sp // recompute the weight with the rtp uiModel.computeRowWeightWithRtp(row); - Integer newValue = (Integer) evt.getNewValue(); - Float lengthStep = row.getLengthStep(); if (lengthStep != null) { - if (newValue == null) { + if (row.withNumber()) { // remove the value for the lengthStep if (frequenciesSeries.indexOf(lengthStep) >= 0) { @@ -348,10 +346,9 @@ public class SpeciesFrequencyTableModel extends AbstractApplicationTableModel<Sp if (lengthStep != null) { - if (evt.getNewValue() == null) { + if (row.withWeight()) { // remove the value for the lengthStep - System.out.println("averageWeightsSeries.indexOf(lengthStep) " + averageWeightsSeries.indexOf(lengthStep)); if (averageWeightsSeries.indexOf(lengthStep) >= 0) { averageWeightsSeries.remove(lengthStep); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java index 485a7f8..6f84106 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java @@ -880,16 +880,19 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci if (lengthStepToDec != null) { lengthStepToDec = getModel().getLengthStep(lengthStepToDec); - SpeciesFrequencyRowModel row = getRowForLengthstep(lengthStepToDec); - row.decNumber(); + SpeciesFrequencyRowModel row = getModel().getRowCache().get(lengthStepToDec); - if (row.getNumber() == 0) { - int rowIndex = tableModel.getRowIndex(row); - tableModel.removeRow(rowIndex); - getModel().getRowCache().remove(lengthStepToDec); + if (row != null) { + row.decNumber(); - } else { - tableModel.updateRow(row); + if (!row.withNumber()) { + int rowIndex = tableModel.getRowIndex(row); + tableModel.removeRow(rowIndex); + getModel().getRowCache().remove(lengthStepToDec); + + } else { + tableModel.updateRow(row); + } } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm