branch develop updated (9ffb12d -> cd5e6d1)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 9ffb12d fixes #8063 Merge branch 'feature/8063' into develop new cd5e6d1 cinversion de condition The 1 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 cd5e6d115bf8ed64ca4ae6713836d4eb097fc921 Author: Kevin Morin <morin@codelutin.com> Date: Tue Mar 8 18:08:47 2016 +0100 cinversion de condition Summary of changes: .../catches/species/frequency/SpeciesFrequencyTableModel.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) -- 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 develop in repository tutti. See http://git.codelutin.com/tutti.git commit cd5e6d115bf8ed64ca4ae6713836d4eb097fc921 Author: Kevin Morin <morin@codelutin.com> Date: Tue Mar 8 18:08:47 2016 +0100 cinversion de condition --- .../catches/species/frequency/SpeciesFrequencyTableModel.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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 c5316a6..f544850 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 @@ -161,7 +161,9 @@ public class SpeciesFrequencyTableModel extends AbstractApplicationTableModel<Sp @Override protected void onRowAdded(int rowIndex, SpeciesFrequencyRowModel row) { + uiModel.recomputeCanEditLengthStep(); + } @Override @@ -261,7 +263,7 @@ public class SpeciesFrequencyTableModel extends AbstractApplicationTableModel<Sp modelCache.addLengthStep(row); - if (row.getNumber() != null) { + if (row.withNumber()) { frequenciesSeries.addOrUpdate(newValue, row.getNumber()); averageWeightsSeries.addOrUpdate(newValue, row.computeAverageWeight()); @@ -300,7 +302,7 @@ public class SpeciesFrequencyTableModel extends AbstractApplicationTableModel<Sp if (lengthStep != null) { - if (row.withNumber()) { + if (!row.withNumber()) { // remove the value for the lengthStep if (frequenciesSeries.indexOf(lengthStep) >= 0) { @@ -346,7 +348,7 @@ public class SpeciesFrequencyTableModel extends AbstractApplicationTableModel<Sp if (lengthStep != null) { - if (row.withWeight()) { + if (!row.withWeight()) { // remove the value for the lengthStep if (averageWeightsSeries.indexOf(lengthStep) >= 0) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm