branch feature/7156 created (now da07ddb)
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 at da07ddb ajouter saisie poids sous échantiollon si saisie d'un nombre sur les espèces (refs #7156) This branch includes the following new commits: new da07ddb ajouter saisie poids sous échantiollon si saisie d'un nombre sur les espèces (refs #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 da07ddb974a2283eaecd3d4f5fb914d832cc39ef Author: Kevin Morin <morin@codelutin.com> Date: Mon Dec 21 17:14:53 2015 +0100 ajouter saisie poids sous échantiollon si saisie d'un nombre sur les espèces (refs #7156) -- 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 da07ddb974a2283eaecd3d4f5fb914d832cc39ef Author: Kevin Morin <morin@codelutin.com> Date: Mon Dec 21 17:14:53 2015 +0100 ajouter saisie poids sous échantiollon si saisie d'un nombre sur les espèces (refs #7156) --- .../filtered-resources/tutti-help-fr.properties | 27 +++----------------- .../frequency/SpeciesFrequencyCellComponent.java | 4 ++- .../species/frequency/SpeciesFrequencyUI.css | 29 ++++++++++++++++------ .../species/frequency/SpeciesFrequencyUI.jaxx | 12 +++++++-- .../frequency/SpeciesFrequencyUIHandler.java | 6 ++++- .../resources/i18n/tutti-ui-swing_en_GB.properties | 4 +++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 6 +++-- 7 files changed, 51 insertions(+), 37 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 0ac34f5..d8ad99c 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,28 +1,5 @@ -### -# #%L -# Tutti :: UI -# $Id:$ -# $HeadURL:$ -# %% -# Copyright (C) 2012 - 2015 Ifremer -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-3.0.html>. -# #L% -### #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo -#Tue Mar 31 13:19:15 CEST 2015 +#Mon Dec 21 16:47:17 CET 2015 tutti.config.help=config.html tutti.createAccidentalBatch.action.cancel.help=editFishingOperation.html\#captureCapturesAccidentellesActions tutti.createAccidentalBatch.action.saveAndClose.help=editFishingOperation.html\#captureCapturesAccidentellesActions @@ -326,6 +303,8 @@ tutti.editSpeciesFrequencies.field.mode.simple.help=editFishingOperation.html\#c tutti.editSpeciesFrequencies.field.mode.simpleCounting.help=editFishingOperation.html\#captureEspecesMensurationFields tutti.editSpeciesFrequencies.field.rafaleStep.help=editFishingOperation.html\#captureEspecesMensurationFields tutti.editSpeciesFrequencies.field.simpleCounting.help=editFishingOperation.html\#captureEspecesMensurationFields +tutti.editSpeciesFrequencies.field.simpleCountingNumber.help= +tutti.editSpeciesFrequencies.field.simpleCountingWeight.help= tutti.editSpeciesFrequencies.field.step.help=editFishingOperation.html\#captureEspecesMensurationFields tutti.editSpeciesFrequencies.field.totalNumber.help=editFishingOperation.html\#captureEspecesMensurationFields tutti.editSpeciesFrequencies.field.totalWeight.help=editFishingOperation.html\#captureEspecesMensurationFields 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 68e1212..27339dd 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 @@ -245,9 +245,11 @@ public class SpeciesFrequencyCellComponent extends DefaultTableCellRenderer { // push back to batch editRow.setNumber(null); - editRow.setWeight(frequencyModel.getTotalWeight()); } + // set the weigth + 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/species/frequency/SpeciesFrequencyUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css index fe60f63..0b0799a 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 @@ -210,19 +210,34 @@ ComputableDataEditor { enabled: {model.getLengthStepCaracteristic() != null && model.getStep() > 0f}; } -#simpleCountingLabel { - text: "tutti.editSpeciesFrequencies.field.simpleCounting"; - toolTipText: "tutti.editSpeciesFrequencies.field.simpleCounting.tip"; - labelFor: {simpleCountingField}; - _help: {"tutti.editSpeciesFrequencies.field.simpleCounting.help"}; +#simpleCountingNumberLabel { + text: "tutti.editSpeciesFrequencies.field.simpleCountingNumber"; + toolTipText: "tutti.editSpeciesFrequencies.field.simpleCountingNumber.tip"; + labelFor: {simpleCountingNumberField}; + _help: {"tutti.editSpeciesFrequencies.field.simpleCountingNumber.help"}; } -#simpleCountingField { +#simpleCountingNumberField { property: simpleCount; numberValue: {model.getSimpleCount()}; numberPattern: {INT_6_DIGITS_PATTERN}; numberType: {Integer.class}; - _help: {"tutti.editSpeciesFrequencies.field.simpleCounting.help"}; + _help: {"tutti.editSpeciesFrequencies.field.simpleCountingNumber.help"}; +} + +#simpleCountingWeightLabel { + text: "tutti.editSpeciesFrequencies.field.simpleCountingWeight"; + toolTipText: "tutti.editSpeciesFrequencies.field.simpleCountingWeight.tip"; + labelFor: {simpleCountingWeightField}; + _help: {"tutti.editSpeciesFrequencies.field.simpleCountingWeight.help"}; + _addWeightUnit: {handler.getConfig().getSpeciesWeightUnit()}; +} + +#simpleCountingWeightField { + bean: {model.getTotalComputedOrNotWeight()}; + property: data; + numberValue: {model.getTotalWeight()}; + _help: {"tutti.editSpeciesFrequencies.field.simpleCountingWeight.help"}; } #dataInFrequenciesWarningContainer { 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 42f0911..a9db8d9 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 @@ -212,10 +212,18 @@ public SpeciesFrequencyUI(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/species/frequency/SpeciesFrequencyUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java index 60c44cc..d4cc2da 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 @@ -361,6 +361,10 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci } }); + // 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, @@ -707,7 +711,7 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci 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 c41e934..cafe03a 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 @@ -1289,6 +1289,10 @@ tutti.editSpeciesFrequencies.field.rafaleStep.tip= tutti.editSpeciesFrequencies.field.rows= tutti.editSpeciesFrequencies.field.simpleCounting= tutti.editSpeciesFrequencies.field.simpleCounting.tip= +tutti.editSpeciesFrequencies.field.simpleCountingNumber= +tutti.editSpeciesFrequencies.field.simpleCountingNumber.tip= +tutti.editSpeciesFrequencies.field.simpleCountingWeight= +tutti.editSpeciesFrequencies.field.simpleCountingWeight.tip= tutti.editSpeciesFrequencies.field.step= tutti.editSpeciesFrequencies.field.step.tip= tutti.editSpeciesFrequencies.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 c3fe177..4499664 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 @@ -1246,8 +1246,10 @@ tutti.editSpeciesFrequencies.field.mode.simpleCounting.tip=Mode par défaut si l tutti.editSpeciesFrequencies.field.rafaleStep=Classe de taille à incrémenter tutti.editSpeciesFrequencies.field.rafaleStep.tip=Saisir à la suite les différentes tailles mesurées tutti.editSpeciesFrequencies.field.rows=Classes de taille -tutti.editSpeciesFrequencies.field.simpleCounting=Nombre -tutti.editSpeciesFrequencies.field.simpleCounting.tip=Saisir le nombre d'individus dans le lot +tutti.editSpeciesFrequencies.field.simpleCountingNumber=Nombre +tutti.editSpeciesFrequencies.field.simpleCountingNumber.tip=Saisir le nombre d'individus dans le lot +tutti.editSpeciesFrequencies.field.simpleCountingWeight=Poids de sous-échantillon +tutti.editSpeciesFrequencies.field.simpleCountingWeight.tip=Poids de sous-échantillon du lot tutti.editSpeciesFrequencies.field.step=Pas de la classe de taille tutti.editSpeciesFrequencies.field.step.tip=Pas de la classe de taille pour cette espèce (ex. \: 1 cm, 0,5 cm, 1 mm etc.) tutti.editSpeciesFrequencies.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