branch feature/ecran_obs_individuelles updated (3bd5e2e -> 3a3bdac)
This is an automated email from the git hooks/post-receive script. New change to branch feature/ecran_obs_individuelles in repository tutti. See http://git.codelutin.com/tutti.git from 3bd5e2e mise en page de l'écran refs #6926 new 3a3bdac - use jaxx 2.29-SNAPSHOT - correction du mode de config à l'ouverture de l'écran - ajout de useRTP dans le modele refs #6926 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 3a3bdac73077bdd48cd22bfc546a6c99643c7eb7 Author: Kevin Morin <morin@codelutin.com> Date: Mon Feb 22 10:32:05 2016 +0100 - use jaxx 2.29-SNAPSHOT - correction du mode de config à l'ouverture de l'écran - ajout de useRTP dans le modele refs #6926 Summary of changes: pom.xml | 3 ++- .../species/frequency/SpeciesFrequencyUIHandler.java | 8 ++++++-- .../species/frequency/SpeciesFrequencyUIModel.java | 19 +++++++++++++++++++ 3 files changed, 27 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 feature/ecran_obs_individuelles in repository tutti. See http://git.codelutin.com/tutti.git commit 3a3bdac73077bdd48cd22bfc546a6c99643c7eb7 Author: Kevin Morin <morin@codelutin.com> Date: Mon Feb 22 10:32:05 2016 +0100 - use jaxx 2.29-SNAPSHOT - correction du mode de config à l'ouverture de l'écran - ajout de useRTP dans le modele refs #6926 --- pom.xml | 3 ++- .../species/frequency/SpeciesFrequencyUIHandler.java | 8 ++++++-- .../species/frequency/SpeciesFrequencyUIModel.java | 19 +++++++++++++++++++ 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 389d671..2107e05 100644 --- a/pom.xml +++ b/pom.xml @@ -127,7 +127,8 @@ <nuitonI18nVersion>3.3</nuitonI18nVersion> <nuitonValidatorVersion>3.0</nuitonValidatorVersion> <eugenePluginVersion>2.14</eugenePluginVersion> - <jaxxVersion>2.28.2</jaxxVersion> + <!--<jaxxVersion>2.28.2</jaxxVersion>--> + <jaxxVersion>2.29-SNAPSHOT</jaxxVersion> <swingXVersion>1.6.4</swingXVersion> <slf4jVersion>1.7.13</slf4jVersion> <!-- Can't use now adagio previous to 3.9.1 after this version --> 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 f5da11e..8175a8b 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 @@ -613,7 +613,8 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci log.debug("Will edit batch row: " + speciesBatch + " with " + rows.size() + " frequency"); } - FrequencyConfigurationMode mode = FrequencyConfigurationMode.AUTO_GEN; + FrequencyConfigurationMode mode = FrequencyConfigurationMode.FREQUENCIES; + FrequencyConfigurationMode frequenciesMode = FrequencyConfigurationMode.AUTO_GEN; if (lengthStepCaracteristic == null) { String speciesLengthStepPmfmId = taxonCache.getLengthStepPmfmId(speciesBatch.getSpecies()); if (speciesLengthStepPmfmId == null) { @@ -625,10 +626,13 @@ public class SpeciesFrequencyUIHandler extends AbstractTuttiTableUIHandler<Speci mode = FrequencyConfigurationMode.SIMPLE_COUNTING; model.setSimpleCount(number); } - // make sure configuration mode will be rebind + // make sure configuration mode will be rebound model.setConfigurationMode(null); model.setConfigurationMode(mode); + model.setFrequenciesConfigurationMode(null); + model.setFrequenciesConfigurationMode(frequenciesMode); + // connect model to validator ui.getValidator().setBean(model); 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 eae208e..1fc9987 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 @@ -87,6 +87,8 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa public static final String PROPERTY_TOTAL_COMPUTED_WEIGHT = "totalComputedWeight"; + public static final String PROPERTY_USE_RTP = "useRTP"; + public static final String PROPERTY_EMPTY_ROWS = "emptyRows"; public static final String PROPERTY_NEXT_EDITABLE_ROW_INDEX = "nextEditableRowIndex"; @@ -157,6 +159,13 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa protected ComputableData<Float> totalComputedOrNotWeight = new ComputableData<Float>(); /** + * Use the RTPs of the protocol to compute the total weight + * + * @since 4.5 + */ + protected boolean useRTP; + + /** * Number in case of simple counting mode * * @since 1.0 @@ -480,6 +489,16 @@ public class SpeciesFrequencyUIModel extends AbstractTuttiTableUIModel<SpeciesBa && Weights.isEqualWeight(totalWeight, computedWeight); } + public boolean isUseRTP() { + return useRTP; + } + + public void setUseRTP(boolean useRTP) { + Object oldValue = isUseRTP(); + this.useRTP = useRTP; + firePropertyChange(PROPERTY_USE_RTP, oldValue, useRTP); + } + public Set<SpeciesFrequencyRowModel> getEmptyRows() { return emptyRows; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm