September 2014 - Tutti-commits - mailman.cloud.codelutin.com

[tutti] branch develop updated (1837edc -> 8211d0d)
by codelutin.com scm 11 Sep '14

11 Sep '14

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 1837edc this should not have been commited new 1712338 refs #5139 [CAPTURE] répéter le champ "poids sous échantillon" dans la fenêtre de saisie des mensurations new 489d26b refs #5139 new 8211d0d fixes #5139 [CAPTURE] répéter le champ "poids sous échantillon" dans la fenêtre de saisie des mensurations 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 8211d0d15da9a17ae1cd29acec092789d7ce9c2c Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Sep 11 14:38:08 2014 +0200 fixes #5139 [CAPTURE] répéter le champ "poids sous échantillon" dans la fenêtre de saisie des mensurations commit 489d26b162f1b9e0d2520a80e3ee623449e006dc Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Sep 10 14:51:33 2014 +0200 refs #5139 commit 171233807a4fa12098eca464e5db9d29c232ab20 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Sep 10 14:01:19 2014 +0200 refs #5139 [CAPTURE] répéter le champ "poids sous échantillon" dans la fenêtre de saisie des mensurations Summary of changes: .../service/catches/WeightComputingService.java | 8 ++-- ...rvice.java => WeightComputingService.java.orig} | 8 +++- .../frequency/BenthosFrequencyCellComponent.java | 1 + .../benthos/frequency/BenthosFrequencyUI.css | 14 +++++-- .../benthos/frequency/BenthosFrequencyUI.jaxx | 5 ++- .../frequency/BenthosFrequencyUIHandler.java | 3 +- .../benthos/frequency/BenthosFrequencyUIModel.java | 46 +++++++++++++++++++--- .../frequency/SpeciesFrequencyCellComponent.java | 1 + .../species/frequency/SpeciesFrequencyUI.css | 14 +++++-- .../species/frequency/SpeciesFrequencyUI.jaxx | 5 ++- .../frequency/SpeciesFrequencyUIHandler.java | 26 ++---------- .../species/frequency/SpeciesFrequencyUIModel.java | 46 +++++++++++++++++++--- .../BenthosFrequencyUIModel-error-validation.xml | 11 ++++++ ...BenthosFrequencyUIModel-warning-validation.xml} | 9 ++--- .../SpeciesFrequencyUIModel-error-validation.xml | 11 ++++++ ...SpeciesFrequencyUIModel-warning-validation.xml} | 9 ++--- .../resources/i18n/tutti-ui-swing_en_GB.properties | 4 ++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 4 ++ 18 files changed, 166 insertions(+), 59 deletions(-) copy tutti-service/src/main/java/fr/ifremer/tutti/service/catches/{WeightComputingService.java => WeightComputingService.java.orig} (98%) copy tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/{cruise/EditCruiseUIModel-edit-warning-validation.xml => operation/catches/benthos/frequency/BenthosFrequencyUIModel-warning-validation.xml} (84%) copy tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/{cruise/EditCruiseUIModel-edit-warning-validation.xml => operation/catches/species/frequency/SpeciesFrequencyUIModel-warning-validation.xml} (84%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

[tutti] 01/03: refs #5139 [CAPTURE] répéter le champ "poids sous échantillon" dans la fenêtre de saisie des mensurations
by codelutin.com scm 11 Sep '14

11 Sep '14

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 171233807a4fa12098eca464e5db9d29c232ab20 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Sep 10 14:01:19 2014 +0200 refs #5139 [CAPTURE] répéter le champ "poids sous échantillon" dans la fenêtre de saisie des mensurations --- .../frequency/BenthosFrequencyCellComponent.java | 1 + .../benthos/frequency/BenthosFrequencyUI.css | 13 ++++++-- .../benthos/frequency/BenthosFrequencyUI.jaxx | 4 ++- .../frequency/BenthosFrequencyUIHandler.java | 3 +- .../benthos/frequency/BenthosFrequencyUIModel.java | 37 ++++++++++++++++++---- .../frequency/SpeciesFrequencyCellComponent.java | 1 + .../species/frequency/SpeciesFrequencyUI.css | 13 ++++++-- .../species/frequency/SpeciesFrequencyUI.jaxx | 4 ++- .../frequency/SpeciesFrequencyUIHandler.java | 26 ++------------- .../species/frequency/SpeciesFrequencyUIModel.java | 37 ++++++++++++++++++---- 10 files changed, 95 insertions(+), 44 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java index 6db5e8f..ec8b0b6 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java @@ -249,6 +249,7 @@ public class BenthosFrequencyCellComponent extends DefaultTableCellRenderer { // set frequencies to the incoming batch editRow.setFrequency(frequency); + editRow.setWeight(frequencyModel.getTotalWeight()); // update frequencies total ui.getHandler().updateTotalFromFrequencies(editRow); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css index 18f2634..a4c8f17 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css @@ -30,6 +30,14 @@ NumberEditor { showPopupButton: {handler.getConfig().isShowNumberEditorButton()}; } +ComputableDataEditor { + autoPopup: {handler.getConfig().isAutoPopupNumberEditor()}; + showPopupButton: {handler.getConfig().isShowNumberEditorButton()}; + showReset: true; + useFloat: true; + computedDataColor: {handler.getConfig().getColorComputedWeights()}; +} + #editBenthosFrequenciesTopPanel { _help: {"tutti.editBenthosFrequencies.help"}; } @@ -79,9 +87,8 @@ NumberEditor { } #totalWeightField { - text: {handler.getWeightStringValue(totalWeightLabel, model.getTotalWeight())}; - enabled: false; - _computed: true; + bean: {model.getTotalComputedOrNotWeight()}; + model: {model.getTotalWeight()}; _help: {"tutti.editBenthosFrequencies.field.totalWeight.help"}; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx index 4ada8b4..e943ecb 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx @@ -30,6 +30,7 @@ fr.ifremer.tutti.ui.swing.content.operation.catches.FrequencyConfigurationMode fr.ifremer.tutti.ui.swing.util.TuttiUI fr.ifremer.tutti.ui.swing.util.TuttiUIUtil + fr.ifremer.tutti.ui.swing.util.computable.ComputableDataEditor jaxx.runtime.swing.CardLayout2Ext jaxx.runtime.swing.editor.bean.BeanFilterableComboBox @@ -183,7 +184,8 @@ public BenthosFrequencyUI(TuttiUI parentUI) { <JLabel id='totalWeightLabel'/> </cell> <cell weightx='1.0'> - <JTextField id='totalWeightField'/> + <ComputableDataEditor id='totalWeightField' + genericType="Float" constructorParams='this'/> </cell> </row> </Table> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java index 8a9e897..74e93e7 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java @@ -524,7 +524,8 @@ public class BenthosFrequencyUIHandler extends AbstractTuttiTableUIHandler<Benth model.clearWithWeightRows(); model.setNextEditableRowIndex(editor.getNextEditableRowIndex()); model.setTotalNumber(null); - model.setTotalWeight(null); + model.setTotalComputedWeight(null); + model.setTotalWeight(speciesBatch.getWeight()); model.setSimpleCount(null); model.setMinStep(null); model.setMaxStep(null); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java index c107819..023b421 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIModel.java @@ -28,6 +28,7 @@ import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.ui.swing.content.operation.catches.FrequencyConfigurationMode; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchRowModel; +import fr.ifremer.tutti.ui.swing.util.computable.ComputableData; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIModel; import org.apache.commons.collections4.CollectionUtils; @@ -65,8 +66,12 @@ public class BenthosFrequencyUIModel extends AbstractTuttiTableUIModel<BenthosBa public static final String PROPERTY_TOTAL_NUMBER = "totalNumber"; + public static final String PROPERTY_TOTAL_COMPUTED_OR_NOT_WEIGHT = "totalComputedOrNotWeight"; + public static final String PROPERTY_TOTAL_WEIGHT = "totalWeight"; + public static final String PROPERTY_TOTAL_COMPUTED_WEIGHT = "totalComputedWeight"; + public static final String PROPERTY_EMPTY_ROWS = "emptyRows"; public static final String PROPERTY_NEXT_EDITABLE_ROW_INDEX = "nextEditableRowIndex"; @@ -128,11 +133,11 @@ public class BenthosFrequencyUIModel extends AbstractTuttiTableUIModel<BenthosBa protected Integer totalNumber; /** - * Sum of the weight of each valid row + * Sum of the weight of each valid row, or sample weight * - * @since 2.3 + * @since 3.8 */ - protected Float totalWeight; + protected ComputableData<Float> totalComputedOrNotWeight = new ComputableData<Float>(); /** * The index of the next editable row (null if none). @@ -302,16 +307,36 @@ public class BenthosFrequencyUIModel extends AbstractTuttiTableUIModel<BenthosBa firePropertyChange(PROPERTY_TOTAL_NUMBER, oldValue, totalNumber); } + public ComputableData<Float> getTotalComputedOrNotWeight() { + return totalComputedOrNotWeight; + } + + public void setTotalComputedOrNotWeight(ComputableData<Float> totalComputedOrNotWeight) { + Object oldValue = getTotalComputedOrNotWeight(); + this.totalComputedOrNotWeight = totalComputedOrNotWeight; + firePropertyChange(PROPERTY_TOTAL_COMPUTED_OR_NOT_WEIGHT, oldValue, totalComputedOrNotWeight); + } + public Float getTotalWeight() { - return totalWeight; + return totalComputedOrNotWeight.getData(); } public void setTotalWeight(Float totalWeight) { Object oldValue = getTotalWeight(); - this.totalWeight = totalWeight; + this.totalComputedOrNotWeight.setData(totalWeight); firePropertyChange(PROPERTY_TOTAL_WEIGHT, oldValue, totalWeight); } + public Float getTotalComputedWeight() { + return totalComputedOrNotWeight.getComputedData(); + } + + public void setTotalComputedWeight(Float totalComputedWeight) { + Object oldValue = getTotalComputedWeight(); + this.totalComputedOrNotWeight.setComputedData(totalComputedWeight); + firePropertyChange(PROPERTY_TOTAL_COMPUTED_WEIGHT, oldValue, totalComputedWeight); + } + public Set<BenthosFrequencyRowModel> getEmptyRows() { return emptyRows; } @@ -404,6 +429,6 @@ public class BenthosFrequencyUIModel extends AbstractTuttiTableUIModel<BenthosBa int totalNumber = computeTotalNumber(); Float totalWeight = computeTotalWeight(); setTotalNumber(totalNumber); - setTotalWeight(totalWeight); + setTotalComputedWeight(totalWeight); } } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java index eded534..8077762 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java @@ -249,6 +249,7 @@ public class SpeciesFrequencyCellComponent extends DefaultTableCellRenderer { // set frequencies to the incoming batch editRow.setFrequency(frequency); + editRow.setWeight(frequencyModel.getTotalWeight()); // update frequencies total ui.getHandler().updateTotalFromFrequencies(editRow); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css index 6278f48..ae14a4c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css @@ -30,6 +30,14 @@ NumberEditor { showPopupButton: {handler.getConfig().isShowNumberEditorButton()}; } +ComputableDataEditor { + autoPopup: {handler.getConfig().isAutoPopupNumberEditor()}; + showPopupButton: {handler.getConfig().isShowNumberEditorButton()}; + showReset: true; + useFloat: true; + computedDataColor: {handler.getConfig().getColorComputedWeights()}; +} + #editSpeciesFrequenciesTopPanel { _help: {"tutti.editSpeciesFrequencies.help"}; } @@ -79,9 +87,8 @@ NumberEditor { } #totalWeightField { - text: {handler.getWeightStringValue(totalWeightLabel, model.getTotalWeight())}; - enabled: false; - _computed: true; + bean: {model.getTotalComputedOrNotWeight()}; + model: {model.getTotalWeight()}; _help: {"tutti.editSpeciesFrequencies.field.totalWeight.help"}; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx index 3277e11..4c3f57d 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx @@ -30,6 +30,7 @@ fr.ifremer.tutti.ui.swing.content.operation.catches.FrequencyConfigurationMode fr.ifremer.tutti.ui.swing.util.TuttiUI fr.ifremer.tutti.ui.swing.util.TuttiUIUtil + fr.ifremer.tutti.ui.swing.util.computable.ComputableDataEditor jaxx.runtime.swing.CardLayout2Ext jaxx.runtime.swing.editor.bean.BeanFilterableComboBox @@ -183,7 +184,8 @@ public SpeciesFrequencyUI(TuttiUI parentUI) { <JLabel id='totalWeightLabel'/> </cell> <cell weightx='1.0'> - <JTextField id='totalWeightField'/> + <ComputableDataEditor id='totalWeightField' + genericType="Float" constructorParams='this'/> </cell> </row> </Table> 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 3dc2eee..9b8c044 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 @@ -196,7 +196,7 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci } } - recomputeTotalNumberAndWeight(); + model.recomputeTotalNumberAndWeight(); if (!recomputeAllRows) { if (log.isInfoEnabled()) { @@ -581,7 +581,8 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci model.clearWithWeightRows(); model.setNextEditableRowIndex(editor.getNextEditableRowIndex()); model.setTotalNumber(null); - model.setTotalWeight(null); + model.setTotalComputedWeight(null); + model.setTotalWeight(speciesBatch.getWeight()); model.setSimpleCount(null); model.setMinStep(null); model.setMaxStep(null); @@ -809,27 +810,6 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci getContext().getIchtyometerReader().addFeedModeReaderListener(feedReaderListener); } - protected void recomputeTotalNumberAndWeight() { - SpeciesFrequencyUIModel model = getModel(); - List<SpeciesFrequencyRowModel> rows = model.getRows(); - Integer totalNumber = 0; - Float totalWeight = 0f; - for (SpeciesFrequencyRowModel r : rows) { - if (r.isValid()) { - Integer number = r.getNumber(); - if (number != null) { - totalNumber += number; - } - Float weight = r.getWeight(); - if (weight != null) { - totalWeight += weight; - } - } - } - model.setTotalNumber(totalNumber); - model.setTotalWeight(totalWeight); - } - protected JComponent getComponentToFocus(FrequencyConfigurationMode mode) { JComponent componentToFocus = null; if (mode != null) { 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 4b6ceb9..91d0b09 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 @@ -28,6 +28,7 @@ import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; import fr.ifremer.tutti.persistence.entities.referential.Caracteristic; import fr.ifremer.tutti.ui.swing.content.operation.catches.FrequencyConfigurationMode; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchRowModel; +import fr.ifremer.tutti.ui.swing.util.computable.ComputableData; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIModel; import org.apache.commons.collections4.CollectionUtils; @@ -65,8 +66,12 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa public static final String PROPERTY_TOTAL_NUMBER = "totalNumber"; + public static final String PROPERTY_TOTAL_COMPUTED_OR_NOT_WEIGHT = "totalComputedOrNotWeight"; + public static final String PROPERTY_TOTAL_WEIGHT = "totalWeight"; + public static final String PROPERTY_TOTAL_COMPUTED_WEIGHT = "totalComputedWeight"; + public static final String PROPERTY_EMPTY_ROWS = "emptyRows"; public static final String PROPERTY_NEXT_EDITABLE_ROW_INDEX = "nextEditableRowIndex"; @@ -121,11 +126,11 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa protected Integer totalNumber; /** - * Sum of the weight of each valid row + * Sum of the weight of each valid row, or sample weight * - * @since 2.3 + * @since 3.8 */ - protected Float totalWeight; + protected ComputableData<Float> totalComputedOrNotWeight = new ComputableData<Float>(); /** * Number in case of simple counting mode @@ -310,16 +315,36 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa firePropertyChange(PROPERTY_TOTAL_NUMBER, oldValue, totalNumber); } + public ComputableData<Float> getTotalComputedOrNotWeight() { + return totalComputedOrNotWeight; + } + + public void setTotalComputedOrNotWeight(ComputableData<Float> totalComputedOrNotWeight) { + Object oldValue = getTotalComputedOrNotWeight(); + this.totalComputedOrNotWeight = totalComputedOrNotWeight; + firePropertyChange(PROPERTY_TOTAL_COMPUTED_OR_NOT_WEIGHT, oldValue, totalComputedOrNotWeight); + } + public Float getTotalWeight() { - return totalWeight; + return totalComputedOrNotWeight.getData(); } public void setTotalWeight(Float totalWeight) { Object oldValue = getTotalWeight(); - this.totalWeight = totalWeight; + this.totalComputedOrNotWeight.setData(totalWeight); firePropertyChange(PROPERTY_TOTAL_WEIGHT, oldValue, totalWeight); } + public Float getTotalComputedWeight() { + return totalComputedOrNotWeight.getComputedData(); + } + + public void setTotalComputedWeight(Float totalComputedWeight) { + Object oldValue = getTotalComputedWeight(); + this.totalComputedOrNotWeight.setComputedData(totalComputedWeight); + firePropertyChange(PROPERTY_TOTAL_COMPUTED_WEIGHT, oldValue, totalComputedWeight); + } + public Set<SpeciesFrequencyRowModel> getEmptyRows() { return emptyRows; } @@ -412,6 +437,6 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa int totalNumber = computeTotalNumber(); Float totalWeight = computeTotalWeight(); setTotalNumber(totalNumber); - setTotalWeight(totalWeight); + setTotalComputedWeight(totalWeight); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

[tutti] branch feature/sampleWeightInFrequencies updated (610d2a7 -> eaa52b2)
by codelutin.com scm 11 Sep '14

11 Sep '14

This is an automated email from the git hooks/post-receive script. New change to branch feature/sampleWeightInFrequencies in repository tutti. See http://git.codelutin.com/tutti.git from 610d2a7 refs #5139 new eaa52b2 fixes #5139 [CAPTURE] répéter le champ "poids sous échantillon" dans la fenêtre de saisie des mensurations 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 eaa52b22d348a860317129da2e8a32fd13c89b82 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Sep 11 14:38:08 2014 +0200 fixes #5139 [CAPTURE] répéter le champ "poids sous échantillon" dans la fenêtre de saisie des mensurations Summary of changes: .../ifremer/tutti/service/catches/WeightComputingService.java | 5 ++--- .../catches/benthos/frequency/BenthosFrequencyUI.css | 1 + .../catches/benthos/frequency/BenthosFrequencyUI.jaxx | 1 + .../catches/benthos/frequency/BenthosFrequencyUIModel.java | 9 +++++++++ .../catches/species/frequency/SpeciesFrequencyUI.css | 1 + .../catches/species/frequency/SpeciesFrequencyUI.jaxx | 1 + .../catches/species/frequency/SpeciesFrequencyUIModel.java | 9 +++++++++ .../frequency/BenthosFrequencyUIModel-error-validation.xml | 11 +++++++++++ .../frequency/BenthosFrequencyUIModel-warning-validation.xml} | 9 ++++----- .../frequency/SpeciesFrequencyUIModel-error-validation.xml | 11 +++++++++++ .../frequency/SpeciesFrequencyUIModel-warning-validation.xml} | 9 ++++----- .../src/main/resources/i18n/tutti-ui-swing_en_GB.properties | 4 ++++ .../src/main/resources/i18n/tutti-ui-swing_fr_FR.properties | 4 ++++ 13 files changed, 62 insertions(+), 13 deletions(-) copy tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/{cruise/EditCruiseUIModel-edit-warning-validation.xml => operation/catches/benthos/frequency/BenthosFrequencyUIModel-warning-validation.xml} (84%) copy tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/{cruise/EditCruiseUIModel-edit-warning-validation.xml => operation/catches/species/frequency/SpeciesFrequencyUIModel-warning-validation.xml} (84%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

[tutti] branch develop updated (d1cdb0f -> 1837edc)
by codelutin.com scm 11 Sep '14

11 Sep '14

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 d1cdb0f fixes #5733 [TRAIT] à la création d'un trait, activer le champ "trait valide" fixes #5740 [CAPTURE] mieux gérer poids total et poids non trié new 1837edc this should not have been commited 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 1837edcc51ba8a0d9417fd778194d0df99fe4307 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Sep 11 07:02:46 2014 +0200 this should not have been commited Summary of changes: .../catches/species/frequency/SpeciesFrequencyUIHandler.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

[tutti] branch develop updated (7a4bd15 -> d1cdb0f)
by codelutin.com scm 10 Sep '14

10 Sep '14

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 7a4bd15 fixes #5754: [EXPORT GENERIQUE] le benthos ne commence plus à 1001 mais à 1 dans la table catch/Num_Ordre_V_HV_H2 new d1cdb0f fixes #5733 [TRAIT] à la création d'un trait, activer le champ "trait valide" fixes #5740 [CAPTURE] mieux gérer poids total et poids non trié 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 d1cdb0f8a67100360825818bcff56cfa93a9e06d Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Sep 10 19:30:42 2014 +0200 fixes #5733 [TRAIT] à la création d'un trait, activer le champ "trait valide" fixes #5740 [CAPTURE] mieux gérer poids total et poids non trié Summary of changes: .../fr/ifremer/tutti/service/catches/WeightComputingService.java | 7 +++---- .../src/main/resources/i18n/tutti-service_en_GB.properties | 1 + .../src/main/resources/i18n/tutti-service_fr_FR.properties | 1 + .../ifremer/tutti/ui/swing/action/NewFishingOperationAction.java | 1 + .../catches/species/frequency/SpeciesFrequencyUIHandler.java | 5 +++-- 5 files changed, 9 insertions(+), 6 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

[tutti] branch feature/sampleWeightInFrequencies updated (bd5c94c -> 610d2a7)
by codelutin.com scm 10 Sep '14

10 Sep '14

This is an automated email from the git hooks/post-receive script. New change to branch feature/sampleWeightInFrequencies in repository tutti. See http://git.codelutin.com/tutti.git from bd5c94c refs #5139 [CAPTURE] répéter le champ "poids sous échantillon" dans la fenêtre de saisie des mensurations new 610d2a7 refs #5139 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 610d2a76f4a120edd576506fb1d121b5a3f29bdf Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Sep 10 14:51:33 2014 +0200 refs #5139 Summary of changes: .../catches/benthos/frequency/BenthosFrequencyCellComponent.java | 2 +- .../catches/species/frequency/SpeciesFrequencyCellComponent.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

[tutti] branch feature/sampleWeightInFrequencies created (now bd5c94c)
by codelutin.com scm 10 Sep '14

10 Sep '14

This is an automated email from the git hooks/post-receive script. New change to branch feature/sampleWeightInFrequencies in repository tutti. See http://git.codelutin.com/tutti.git at bd5c94c refs #5139 [CAPTURE] répéter le champ "poids sous échantillon" dans la fenêtre de saisie des mensurations This branch includes the following new commits: new bd5c94c refs #5139 [CAPTURE] répéter le champ "poids sous échantillon" dans la fenêtre de saisie des mensurations 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 bd5c94c54d0450492cc1394c717bebfb3961462c Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Sep 10 14:01:19 2014 +0200 refs #5139 [CAPTURE] répéter le champ "poids sous échantillon" dans la fenêtre de saisie des mensurations -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

[tutti] branch feature/importBigfin updated (44e4500 -> 483e0de)
by codelutin.com scm 09 Sep '14

09 Sep '14

This is an automated email from the git hooks/post-receive script. New change to branch feature/importBigfin in repository tutti. See http://git.codelutin.com/tutti.git from 44e4500 refs #5411 [CAPTURE] Import BIGFIN new 483e0de refs #5411 [CAPTURE] Import BIGFIN 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 483e0dedd4bc38bd18cbdd2af8de24cdd4db2bd6 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Sep 9 07:57:22 2014 +0200 refs #5411 [CAPTURE] Import BIGFIN Summary of changes: .../persistence/entities/data/SpeciesBatchs.java | 21 ++ .../i18n/tutti-persistence_en_GB.properties | 1 + .../i18n/tutti-persistence_fr_FR.properties | 1 + .../tutti/service/bigfin/BigfinImportResult.java | 32 +- .../tutti/service/bigfin/BigfinImportService.java | 405 ++++++++++++--------- .../fr/ifremer/tutti/service/bigfin/Signs.java | 44 +++ .../resources/i18n/tutti-service_en_GB.properties | 5 + .../resources/i18n/tutti-service_fr_FR.properties | 4 + .../service/bigfin/BigfinImportServiceTest.java | 91 +++-- .../tutti/ui/swing/action/ImportBigfinAction.java | 25 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 5 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 10 +- 12 files changed, 405 insertions(+), 239 deletions(-) create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SpeciesBatchs.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

[tutti] branch develop updated (156cb7c -> 7a4bd15)
by codelutin.com scm 08 Sep '14

08 Sep '14

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 156cb7c fixes #5748: [IMPORT] le message d'erreur sur import psion est a corriger new 7a4bd15 fixes #5754: [EXPORT GENERIQUE] le benthos ne commence plus à 1001 mais à 1 dans la table catch/Num_Ordre_V_HV_H2 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 7a4bd15b280fe5b92111c501f35c418d97b407d5 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Sep 8 15:30:44 2014 +0200 fixes #5754: [EXPORT GENERIQUE] le benthos ne commence plus à 1001 mais à 1 dans la table catch/Num_Ordre_V_HV_H2 Summary of changes: .../service/export/generic/CatchExportModel.java | 41 ++++++++-------------- 1 file changed, 15 insertions(+), 26 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

[tutti] branch feature/importBigfin created (now 44e4500)
by codelutin.com scm 05 Sep '14

05 Sep '14

This is an automated email from the git hooks/post-receive script. New change to branch feature/importBigfin in repository tutti. See http://git.codelutin.com/tutti.git at 44e4500 refs #5411 [CAPTURE] Import BIGFIN This branch includes the following new commits: new 6907a51 refs #5411 [CAPTURE] Import BIGFIN new 0d40dce refs #5411 [CAPTURE] Import BIGFIN new 7ea21c9 refs #5411 [CAPTURE] Import BIGFIN new 44e4500 refs #5411 [CAPTURE] Import BIGFIN The 4 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 44e4500599da24c67f7d8314b0104fb95883dfd0 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Sep 5 18:44:29 2014 +0200 refs #5411 [CAPTURE] Import BIGFIN commit 7ea21c96d06c6fd52dd139d9a901e7004dd8feaf Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Sep 3 17:49:38 2014 +0200 refs #5411 [CAPTURE] Import BIGFIN commit 0d40dce23ea7f07cc5b23b56d6aaf0838c53991b Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Sep 3 16:55:06 2014 +0200 refs #5411 [CAPTURE] Import BIGFIN commit 6907a51ec299fcfbd8207d209e22705479566674 Author: Kevin Morin <morin(a)codelutin.com> Date: Wed Sep 3 13:27:07 2014 +0200 refs #5411 [CAPTURE] Import BIGFIN -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 4