branch support/3.13.x updated (c2616b6 -> 47afcfd)
This is an automated email from the git hooks/post-receive script. New change to branch support/3.13.x in repository tutti. See http://git.codelutin.com/tutti.git from c2616b6 fixes #6848: [IMPORT] mauvais fonctionnement de l'import BigFin, confusion code campagne et code rubin Merge branch 'feature/6848' into support/3.13.x new 35b5d4f refs #6826 Correction de la cinématique de modification d'une valeur de cellule de mensuration new 47afcfd fixes #6826: [CAPTURE] saisie des mensurations, touche entrée n'a pas le même comportement sur la colonne poids que sur les colonnes Taille et Nombre Merge branch 'feature/6826' into support/3.13.x The 2 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 47afcfd9883449dd06902cc9147277e74a88762b Merge: c2616b6 35b5d4f Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Mar 23 11:45:19 2015 +0100 fixes #6826: [CAPTURE] saisie des mensurations, touche entrée n'a pas le même comportement sur la colonne poids que sur les colonnes Taille et Nombre Merge branch 'feature/6826' into support/3.13.x commit 35b5d4f22c32949fd15fe3cc1d9caeffd77b9d27 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Mar 23 11:45:04 2015 +0100 refs #6826 Correction de la cinématique de modification d'une valeur de cellule de mensuration Summary of changes: .../benthos/frequency/BenthosFrequencyTableModel.java | 15 +++++++++------ .../species/frequency/SpeciesFrequencyTableModel.java | 15 +++++++++------ 2 files changed, 18 insertions(+), 12 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 support/3.13.x in repository tutti. See http://git.codelutin.com/tutti.git commit 35b5d4f22c32949fd15fe3cc1d9caeffd77b9d27 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Mar 23 11:45:04 2015 +0100 refs #6826 Correction de la cinématique de modification d'une valeur de cellule de mensuration --- .../benthos/frequency/BenthosFrequencyTableModel.java | 15 +++++++++------ .../species/frequency/SpeciesFrequencyTableModel.java | 15 +++++++++------ 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java index 246821b..b9e661f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyTableModel.java @@ -233,11 +233,13 @@ public class BenthosFrequencyTableModel extends AbstractApplicationTableModel<Be } - uiModel.recomputeTotalNumberAndWeight(); - uiModel.recomputeRowsValidateState(); uiModel.recomputeCanEditLengthStep(); + uiModel.recomputeRowsValidateState(); uiModel.updateEmptyRow(row); + // Can recompute total number and weight only after valid flag change + uiModel.recomputeTotalNumberAndWeight(); + fireTableDataChanged(); } @@ -275,11 +277,13 @@ public class BenthosFrequencyTableModel extends AbstractApplicationTableModel<Be } - uiModel.recomputeTotalNumberAndWeight(); uiModel.recomputeCanEditLengthStep(); uiModel.recomputeRowValidState(row); uiModel.updateEmptyRow(row); + // Can recompute total number and weight only after valid flag change + uiModel.recomputeTotalNumberAndWeight(); + } }; } @@ -295,12 +299,11 @@ public class BenthosFrequencyTableModel extends AbstractApplicationTableModel<Be BenthosFrequencyRowModel row = (BenthosFrequencyRowModel) evt.getSource(); modelCache.updateRowWithWeight(row); - uiModel.recomputeTotalNumberAndWeight(); uiModel.recomputeRowsValidateState(); - uiModel.updateEmptyRow(row); - fireTableDataChanged(); + // Can recompute total number and weight only after valid flag change + uiModel.recomputeTotalNumberAndWeight(); } }; 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 2abde8d..57898f7 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 @@ -233,11 +233,13 @@ public class SpeciesFrequencyTableModel extends AbstractApplicationTableModel<Sp } - uiModel.recomputeTotalNumberAndWeight(); - uiModel.recomputeRowsValidateState(); uiModel.recomputeCanEditLengthStep(); + uiModel.recomputeRowsValidateState(); uiModel.updateEmptyRow(row); + // Can recompute total number and weight only after valid flag change + uiModel.recomputeTotalNumberAndWeight(); + fireTableDataChanged(); } @@ -275,11 +277,13 @@ public class SpeciesFrequencyTableModel extends AbstractApplicationTableModel<Sp } - uiModel.recomputeTotalNumberAndWeight(); uiModel.recomputeCanEditLengthStep(); uiModel.recomputeRowValidState(row); uiModel.updateEmptyRow(row); + // Can recompute total number and weight only after valid flag change + uiModel.recomputeTotalNumberAndWeight(); + } }; } @@ -295,12 +299,11 @@ public class SpeciesFrequencyTableModel extends AbstractApplicationTableModel<Sp SpeciesFrequencyRowModel row = (SpeciesFrequencyRowModel) evt.getSource(); modelCache.updateRowWithWeight(row); - uiModel.recomputeTotalNumberAndWeight(); uiModel.recomputeRowsValidateState(); - uiModel.updateEmptyRow(row); - fireTableDataChanged(); + // Can recompute total number and weight only after valid flag change + uiModel.recomputeTotalNumberAndWeight(); } }; -- 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 support/3.13.x in repository tutti. See http://git.codelutin.com/tutti.git commit 47afcfd9883449dd06902cc9147277e74a88762b Merge: c2616b6 35b5d4f Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Mar 23 11:45:19 2015 +0100 fixes #6826: [CAPTURE] saisie des mensurations, touche entrée n'a pas le même comportement sur la colonne poids que sur les colonnes Taille et Nombre Merge branch 'feature/6826' into support/3.13.x .../benthos/frequency/BenthosFrequencyTableModel.java | 15 +++++++++------ .../species/frequency/SpeciesFrequencyTableModel.java | 15 +++++++++------ 2 files changed, 18 insertions(+), 12 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm