branch feature/7156 updated (da07ddb -> ee91454)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7156 in repository tutti. See http://git.codelutin.com/tutti.git from da07ddb ajouter saisie poids sous échantiollon si saisie d'un nombre sur les espèces (refs #7156) new ee91454 ajouter saisie poids sous échantiollon si saisie d'un nombre sur le benthos (fixes #7156) 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 ee914546015528ab967e2b0b6a436251db39792a Author: Kevin Morin <morin@codelutin.com> Date: Mon Dec 21 17:29:20 2015 +0100 ajouter saisie poids sous échantiollon si saisie d'un nombre sur le benthos (fixes #7156) Summary of changes: .../filtered-resources/tutti-help-fr.properties | 4 ++- .../frequency/BenthosFrequencyCellComponent.java | 4 ++- .../benthos/frequency/BenthosFrequencyUI.css | 30 +++++++++++++++++----- .../benthos/frequency/BenthosFrequencyUI.jaxx | 12 +++++++-- .../frequency/BenthosFrequencyUIHandler.java | 5 +++- .../resources/i18n/tutti-ui-swing_en_GB.properties | 4 +++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 6 +++-- 7 files changed, 51 insertions(+), 14 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 feature/7156 in repository tutti. See http://git.codelutin.com/tutti.git commit ee914546015528ab967e2b0b6a436251db39792a Author: Kevin Morin <morin@codelutin.com> Date: Mon Dec 21 17:29:20 2015 +0100 ajouter saisie poids sous échantiollon si saisie d'un nombre sur le benthos (fixes #7156) --- .../filtered-resources/tutti-help-fr.properties | 4 ++- .../frequency/BenthosFrequencyCellComponent.java | 4 ++- .../benthos/frequency/BenthosFrequencyUI.css | 30 +++++++++++++++++----- .../benthos/frequency/BenthosFrequencyUI.jaxx | 12 +++++++-- .../frequency/BenthosFrequencyUIHandler.java | 5 +++- .../resources/i18n/tutti-ui-swing_en_GB.properties | 4 +++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 6 +++-- 7 files changed, 51 insertions(+), 14 deletions(-) diff --git a/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties b/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties index d8ad99c..4e0c7a3 100644 --- a/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties +++ b/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties @@ -1,5 +1,5 @@ #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo -#Mon Dec 21 16:47:17 CET 2015 +#Mon Dec 21 17:19:49 CET 2015 tutti.config.help=config.html tutti.createAccidentalBatch.action.cancel.help=editFishingOperation.html\#captureCapturesAccidentellesActions tutti.createAccidentalBatch.action.saveAndClose.help=editFishingOperation.html\#captureCapturesAccidentellesActions @@ -112,6 +112,8 @@ tutti.editBenthosFrequencies.field.mode.simple.help=editFishingOperation.html\#c tutti.editBenthosFrequencies.field.mode.simpleCounting.help=editFishingOperation.html\#captureBenthosFields tutti.editBenthosFrequencies.field.rafaleStep.help=editFishingOperation.html\#captureBenthosFields tutti.editBenthosFrequencies.field.simpleCounting.help=editFishingOperation.html\#captureBenthosFields +tutti.editBenthosFrequencies.field.simpleCountingNumber.help= +tutti.editBenthosFrequencies.field.simpleCountingWeight.help= tutti.editBenthosFrequencies.field.step.help=editFishingOperation.html\#captureBenthosFields tutti.editBenthosFrequencies.field.totalNumber.help=editFishingOperation.html\#captureBenthosFields tutti.editBenthosFrequencies.field.totalWeight.help=editFishingOperation.html\#captureBenthosFields 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 dad0276..7c586c7 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 @@ -245,9 +245,11 @@ public class BenthosFrequencyCellComponent extends DefaultTableCellRenderer { // push back to batch editRow.setNumber(null); - editRow.setWeight(frequencyModel.getTotalWeight()); } + // set the weight + editRow.setWeight(frequencyModel.getTotalWeight()); + // set frequencies to the incoming batch editRow.setFrequency(frequency); 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 325f47c..45adafb 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 @@ -210,19 +210,35 @@ ComputableDataEditor { enabled: {model.getLengthStepCaracteristic() != null && model.getStep() > 0f}; } -#simpleCountingLabel { - text: "tutti.editBenthosFrequencies.field.simpleCounting"; - toolTipText: "tutti.editBenthosFrequencies.field.simpleCounting.tip"; - labelFor: {simpleCountingField}; - _help: {"tutti.editBenthosFrequencies.field.simpleCounting.help"}; +#simpleCountingNumberLabel { + text: "tutti.editBenthosFrequencies.field.simpleCountingNumber"; + toolTipText: "tutti.editBenthosFrequencies.field.simpleCountingNumber.tip"; + labelFor: {simpleCountingNumberField}; + _help: {"tutti.editBenthosFrequencies.field.simpleCountingNumber.help"}; } -#simpleCountingField { +#simpleCountingNumberField { property: simpleCount; numberValue: {model.getSimpleCount()}; numberPattern: {INT_6_DIGITS_PATTERN}; numberType: {Integer.class}; - _help: {"tutti.editBenthosFrequencies.field.simpleCounting.help"}; + _help: {"tutti.editBenthosFrequencies.field.simpleCountingNumber.help"}; +} + + +#simpleCountingWeightLabel { + text: "tutti.editBenthosFrequencies.field.simpleCountingWeight"; + toolTipText: "tutti.editBenthosFrequencies.field.simpleCountingWeight.tip"; + labelFor: {simpleCountingWeightField}; + _help: {"tutti.editBenthosFrequencies.field.simpleCountingWeight.help"}; + _addWeightUnit: {handler.getConfig().getBenthosWeightUnit()}; +} + +#simpleCountingWeightField { + bean: {model.getTotalComputedOrNotWeight()}; + property: data; + numberValue: {model.getTotalWeight()}; + _help: {"tutti.editBenthosFrequencies.field.simpleCountingWeight.help"}; } #dataInFrequenciesWarningContainer { 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 2f81bba..0297a97 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 @@ -212,10 +212,18 @@ public BenthosFrequencyUI(TuttiUI parentUI) { </row> <row> <cell> - <JLabel id='simpleCountingLabel'/> + <JLabel id='simpleCountingNumberLabel'/> </cell> <cell weightx='1'> - <NumberEditor id='simpleCountingField' constructorParams='this'/> + <NumberEditor id='simpleCountingNumberField' constructorParams='this'/> + </cell> + </row> + <row> + <cell> + <JLabel id='simpleCountingWeightLabel'/> + </cell> + <cell weightx='1'> + <NumberEditor id='simpleCountingWeightField' 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 63f95f0..8a4af5d 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 @@ -306,6 +306,9 @@ public class BenthosFrequencyUIHandler extends AbstractTuttiTableUIHandler<Benth } }); + // set the pattern to the weight in simple counting mode according to the weight unit + ui.getSimpleCountingWeightField().setNumberPattern(weightUnit.getNumberEditorPattern()); + // init histogram chart = ChartFactory.createXYBarChart(null, @@ -600,7 +603,7 @@ public class BenthosFrequencyUIHandler extends AbstractTuttiTableUIHandler<Benth break; case SIMPLE_COUNTING: - componentToFocus = ui.getSimpleCountingField(); + componentToFocus = ui.getSimpleCountingNumberField(); break; default: componentToFocus = null; diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties index cafe03a..5cc27a9 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties @@ -557,6 +557,10 @@ tutti.editBenthosFrequencies.field.rafaleStep.tip= tutti.editBenthosFrequencies.field.rows= tutti.editBenthosFrequencies.field.simpleCounting= tutti.editBenthosFrequencies.field.simpleCounting.tip= +tutti.editBenthosFrequencies.field.simpleCountingNumber= +tutti.editBenthosFrequencies.field.simpleCountingNumber.tip= +tutti.editBenthosFrequencies.field.simpleCountingWeight= +tutti.editBenthosFrequencies.field.simpleCountingWeight.tip= tutti.editBenthosFrequencies.field.step= tutti.editBenthosFrequencies.field.step.tip= tutti.editBenthosFrequencies.field.totalNumber= diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties index 4499664..419b881 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties @@ -536,8 +536,10 @@ tutti.editBenthosFrequencies.field.mode.simpleCounting.tip=Mode par défaut si l tutti.editBenthosFrequencies.field.rafaleStep=Classe de taille à incrémenter tutti.editBenthosFrequencies.field.rafaleStep.tip=Saisir à la suite les différentes tailles mesurées tutti.editBenthosFrequencies.field.rows=Classes de taille -tutti.editBenthosFrequencies.field.simpleCounting=Nombre -tutti.editBenthosFrequencies.field.simpleCounting.tip=Saisir le nombre d'individus dans le lot +tutti.editBenthosFrequencies.field.simpleCountingNumber=Nombre +tutti.editBenthosFrequencies.field.simpleCountingNumber.tip=Saisir le nombre d'individus dans le lot +tutti.editBenthosFrequencies.field.simpleCountingWeight=Poids de sous-échantillon +tutti.editBenthosFrequencies.field.simpleCountingWeight.tip=Poids de sous-échantillon du lot tutti.editBenthosFrequencies.field.step=Pas de la classe de taille tutti.editBenthosFrequencies.field.step.tip=Pas de la classe de taille pour cette espèce (ex. \: 1 cm, 0,5 cm, 1 mm etc.) tutti.editBenthosFrequencies.field.totalNumber=Nombre total -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm