branch develop updated (610d59c -> a521622)
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 610d59c fixes #6297: [CAPTURE] si methode au 1/2 cm les mesures du bigfin sont enregistrées au cm new 832c93e fixes #6297: [CAPTURE] si methode au 1/2 cm les mesures du bigfin sont enregistrées au cm (ameliorer le code) new a521622 fixes #6375: La suppression dans l'historique des mensurations ne fonctionne pas tout le temps 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 a52162277e0b16d70861b3ed9f6b19a70d5c708f Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Jan 2 14:57:28 2015 +0100 fixes #6375: La suppression dans l'historique des mensurations ne fonctionne pas tout le temps commit 832c93e85fc6abe60710ceed58a2780e1779a0fc Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Jan 2 14:55:54 2015 +0100 fixes #6297: [CAPTURE] si methode au 1/2 cm les mesures du bigfin sont enregistrées au cm (ameliorer le code) Summary of changes: .../frequency/actions/DeleteBenthosFrequencyLogRowAction.java | 6 +++++- .../catches/species/frequency/SpeciesFrequencyUIHandler.java | 2 +- .../frequency/actions/DeleteSpeciesFrequencyLogRowAction.java | 7 ++++++- 3 files changed, 12 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 832c93e85fc6abe60710ceed58a2780e1779a0fc Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Jan 2 14:55:54 2015 +0100 fixes #6297: [CAPTURE] si methode au 1/2 cm les mesures du bigfin sont enregistrées au cm (ameliorer le code) --- .../operation/catches/species/frequency/SpeciesFrequencyUIHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 84ff6e4..4a4a574 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 @@ -681,7 +681,7 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci } else { // measurement in cm asked - length = (float) record.getMeasure() / 10; + length = record.getMeasure() / 10f; } -- 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 a52162277e0b16d70861b3ed9f6b19a70d5c708f Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Jan 2 14:57:28 2015 +0100 fixes #6375: La suppression dans l'historique des mensurations ne fonctionne pas tout le temps --- .../frequency/actions/DeleteBenthosFrequencyLogRowAction.java | 6 +++++- .../frequency/actions/DeleteSpeciesFrequencyLogRowAction.java | 7 ++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/DeleteBenthosFrequencyLogRowAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/DeleteBenthosFrequencyLogRowAction.java index 91e7b04..8e07d65 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/DeleteBenthosFrequencyLogRowAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/actions/DeleteBenthosFrequencyLogRowAction.java @@ -54,8 +54,12 @@ public class DeleteBenthosFrequencyLogRowAction extends AbstractAction { if (i == JOptionPane.YES_OPTION) { + Float lengthStep = row.getLengthStep(); + + float roundLengthStep = ui.getModel().getLengthStep(lengthStep); + BenthosFrequencyTableModel tableModel = handler.getTableModel(); - tableModel.decrementNumberForLengthStep(row.getLengthStep()); + tableModel.decrementNumberForLengthStep(roundLengthStep); BenthosFrequencyLogsTableModel logsTableModel = (BenthosFrequencyLogsTableModel) ui.getLogsTable().getModel(); int index = logsTableModel.getRowIndex(row); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/DeleteSpeciesFrequencyLogRowAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/DeleteSpeciesFrequencyLogRowAction.java index 4902b82..c65e463 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/DeleteSpeciesFrequencyLogRowAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/DeleteSpeciesFrequencyLogRowAction.java @@ -54,8 +54,13 @@ public class DeleteSpeciesFrequencyLogRowAction extends AbstractAction { if (i == JOptionPane.YES_OPTION) { + + Float lengthStep = row.getLengthStep(); + + float roundLengthStep = ui.getModel().getLengthStep(lengthStep); + SpeciesFrequencyTableModel tableModel = handler.getTableModel(); - tableModel.decrementNumberForLengthStep(row.getLengthStep()); + tableModel.decrementNumberForLengthStep(roundLengthStep); SpeciesFrequencyLogsTableModel logsTableModel = (SpeciesFrequencyLogsTableModel) ui.getLogsTable().getModel(); int index = logsTableModel.getRowIndex(row); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm