branch develop updated (8d9b896 -> 430f304)
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 8d9b896 fixes #6705: [CAPTURE] perte des boutons en bas d'écran capture new 6f3ec07 fixes #6800: [CAPTURE] ecran résumé mauvaise couleur espèces observées hors vrac : à mettre en bleu et écriture noire new 430f304 fix typo in action name (refs #6793) 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 430f304a28ade87ec9cda89dd4f9dddc644949c4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Mar 9 15:37:30 2015 +0100 fix typo in action name (refs #6793) commit 6f3ec07c037bf8fa98514d89dfba224e0bf6a202 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Mar 9 15:23:55 2015 +0100 fixes #6800: [CAPTURE] ecran résumé mauvaise couleur espèces observées hors vrac : à mettre en bleu et écriture noire Summary of changes: .../main/java/fr/ifremer/tutti/TuttiConfiguration.java | 4 ++++ .../fr/ifremer/tutti/TuttiConfigurationOption.java | 8 ++++++++ .../resources/i18n/tutti-persistence_en_GB.properties | 1 + .../resources/i18n/tutti-persistence_fr_FR.properties | 1 + .../ui/swing/content/config/TuttiConfigUIHandler.java | 3 +++ .../operation/catches/EditCatchesSvgHandler.java | 14 +++++++++++--- .../content/operation/catches/EditCatchesUIModel.java | 18 ++++++++++++++---- .../ui/swing/util/catches/EnterWeightUIHandler.java | 2 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 1 + 10 files changed, 45 insertions(+), 8 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 6f3ec07c037bf8fa98514d89dfba224e0bf6a202 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Mar 9 15:23:55 2015 +0100 fixes #6800: [CAPTURE] ecran résumé mauvaise couleur espèces observées hors vrac : à mettre en bleu et écriture noire --- .../main/java/fr/ifremer/tutti/TuttiConfiguration.java | 4 ++++ .../fr/ifremer/tutti/TuttiConfigurationOption.java | 8 ++++++++ .../resources/i18n/tutti-persistence_en_GB.properties | 1 + .../resources/i18n/tutti-persistence_fr_FR.properties | 1 + .../ui/swing/content/config/TuttiConfigUIHandler.java | 3 +++ .../operation/catches/EditCatchesSvgHandler.java | 14 +++++++++++--- .../content/operation/catches/EditCatchesUIModel.java | 18 ++++++++++++++---- .../resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 1 + 9 files changed, 44 insertions(+), 7 deletions(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java index e4d5c7e..78c5027 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java @@ -624,6 +624,10 @@ public class TuttiConfiguration extends ApplicationConfiguration { return applicationConfig.getOptionAsColor(TuttiConfigurationOption.COLOR_BENTHOS.getKey()); } + public Color getColorSpeciesOrBenthosUnsortedComputedWeightInWarning() { + return applicationConfig.getOptionAsColor(TuttiConfigurationOption.COLOR_SPECIES_OR_BENTHOS_UNSORTED_COMPUTED_WEIGHT_IN_WARNING.getKey()); + } + public Color getColorMarineLitter() { return applicationConfig.getOptionAsColor(TuttiConfigurationOption.COLOR_MARINE_LITTER.getKey()); } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java index 195405b..bdd105d 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java @@ -490,6 +490,14 @@ public enum TuttiConfigurationOption implements ConfigOptionDef { Color.class, false ), + COLOR_SPECIES_OR_BENTHOS_UNSORTED_COMPUTED_WEIGHT_IN_WARNING( + "tutti.ui.color.speciesOrBenthosUnsortedComputedWeightInWarning", + n("tutti.config.option.ui.color.speciesOrBenthosUnsortedComputedWeightInWarning.description"), + new Color(255, 57, 28).toString(), + Color.class, + false + ), + COLOR_MARINE_LITTER( "tutti.ui.color.marineLitter", n("tutti.config.option.ui.color.marineLitter.description"), diff --git a/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties b/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties index c991311..ed8f0fb 100644 --- a/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties +++ b/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties @@ -63,6 +63,7 @@ tutti.config.option.ui.color.rowReadOnly.description= tutti.config.option.ui.color.rowToConfirm.description= tutti.config.option.ui.color.selectedRow.description= tutti.config.option.ui.color.species.description= +tutti.config.option.ui.color.speciesOrBenthosUnsortedComputedWeightInWarning.description= tutti.config.option.ui.config.file.description= tutti.config.option.ui.coordinateEditorType.description= tutti.config.option.ui.dateFormat.description= diff --git a/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties b/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties index 8640af5..5e7214a 100644 --- a/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties +++ b/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties @@ -59,6 +59,7 @@ tutti.config.option.ui.color.rowReadOnly.description=Cellule non éditable tutti.config.option.ui.color.rowToConfirm.description=Ligne à confirmer tutti.config.option.ui.color.selectedRow.description=Couleur de fond d'une ligne sélectionnée dans un tableau tutti.config.option.ui.color.species.description=Couleur pour représenter les espèces dans l'écran de résumé des captures +tutti.config.option.ui.color.speciesOrBenthosUnsortedComputedWeightInWarning.description=Couleur pour représenter les espèces (ou benthos) observées en erreur dans l'écran de résumé des captures tutti.config.option.ui.config.file.description=Chemin du fichier de configuration des interfaces graphiques tutti.config.option.ui.coordinateEditorType.description=Type de l'éditeur de coordonnées tutti.config.option.ui.dateFormat.description=Format de dates diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java index 37835e2..3b0ab72 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java @@ -199,6 +199,9 @@ public class TuttiConfigUIHandler extends AbstractTuttiUIHandler<TuttiUIContext, .addOption(TuttiConfigurationOption.COLOR_BENTHOS) .setOptionShortLabel(t("tutti.config.option.ui.color.benthos.shortLabel")) + .addOption(TuttiConfigurationOption.COLOR_SPECIES_OR_BENTHOS_UNSORTED_COMPUTED_WEIGHT_IN_WARNING) + .setOptionShortLabel(t("tutti.config.option.ui.color.speciesOrBenthosUnsortedComputedWeightInWarning.shortLabel")) + .addOption(TuttiConfigurationOption.COLOR_MARINE_LITTER) .setOptionShortLabel(t("tutti.config.option.ui.color.marineLitter.shortLabel")) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesSvgHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesSvgHandler.java index a1f9fed..485a17f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesSvgHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesSvgHandler.java @@ -144,6 +144,7 @@ public class EditCatchesSvgHandler { final Color catchColor = config.getColorCatch(); final Color speciesColor = config.getColorSpecies(); final Color benthosColor = config.getColorBenthos(); + final Color speciesOrBenthosUnsortedComputedWeightInWarningColor = config.getColorSpeciesOrBenthosUnsortedComputedWeightInWarning(); final Color marineLitterColor = config.getColorMarineLitter(); canvas.addGVTTreeRendererListener(new GVTTreeRendererAdapter() { @@ -212,7 +213,7 @@ public class EditCatchesSvgHandler { @Override public Color apply(EditCatchesUIModel model) { boolean warning = model.isSpeciesTotalUnsortedComputedWeightInWarning(); - return warning ? Color.ORANGE : speciesColor; + return warning ? speciesOrBenthosUnsortedComputedWeightInWarningColor : speciesColor; } })); @@ -227,7 +228,7 @@ public class EditCatchesSvgHandler { @Override public Color apply(EditCatchesUIModel model) { boolean warning = model.isBenthosTotalUnsortedComputedWeightInWarning(); - return warning ? Color.ORANGE : benthosColor; + return warning ? speciesOrBenthosUnsortedComputedWeightInWarningColor : benthosColor; } })); @@ -707,9 +708,16 @@ public class EditCatchesSvgHandler { SVGStylable field = (SVGStylable) rectElement; CSSStyleDeclaration style = field.getStyle(); - final Color background = colorFunction.apply(model); + Color background = colorFunction.apply(model); String color = "#" + Integer.toHexString(background.getRGB()).substring(2); style.setProperty("fill", color, null); + + SVGOMTextElement labelElement = (SVGOMTextElement) svgDocument.getElementById(elementId + "Label"); + CSSStyleDeclaration labelStyle = labelElement.getStyle(); + + int colorBrightness = TuttiUIUtil.getColorBrightness(background); + String textColor = colorBrightness > 150 ? "#000000" : "#FFFFFF"; + labelStyle.setProperty("fill", textColor, null); } }); } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java index 6da2338..4f358b5 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java @@ -626,15 +626,20 @@ public class EditCatchesUIModel extends AbstractTuttiBeanUIModel<CatchBatch, Edi firePropertyChange(PROPERTY_SPECIES_TOTAL_LIVING_NOT_ITEMIZED_COMPUTED_WEIGHT, oldValue, speciesTotalLivingNotItemizedComputedWeight); } + /** + * Les espèces observées sont en warning lors qu'on a du Vrac non trié et que les espèces isolées sont + * exactement le vrac observé. + * + * @return {@code true} quand le les espèces observées sont en warning, {@code false} dans les autres cas. + */ public boolean isSpeciesTotalUnsortedComputedWeightInWarning() { Float catchTotalRejectedWeight = getCatchTotalRejectedComputedOrNotWeight().getDataOrComputedData(); Float speciesTotalSortedWeight = getSpeciesTotalSortedComputedOrNotWeight().getDataOrComputedData(); - Float speciesTotalSampleSortedComputedWeight = getSpeciesTotalSampleSortedComputedWeight(); boolean warning = catchTotalRejectedWeight != null && speciesTotalSortedWeight != null && speciesTotalSampleSortedComputedWeight != null - && Weights.isEqualWeight(catchTotalRejectedWeight, 0f) + && Weights.isGreaterWeight(catchTotalRejectedWeight, 0f) && Weights.isEqualWeight(speciesTotalSortedWeight, speciesTotalSampleSortedComputedWeight); @@ -765,15 +770,20 @@ public class EditCatchesUIModel extends AbstractTuttiBeanUIModel<CatchBatch, Edi firePropertyChange(PROPERTY_BENTHOS_TOTAL_LIVING_NOT_ITEMIZED_COMPUTED_WEIGHT, oldValue, benthosTotalLivingNotItemizedComputedWeight); } + /** + * Le benthos observé sont en warning lors qu'on a du Vrac non trié et que le benthos isolé vaut + * exactement le benthos vrac observé. + * + * @return {@code true} quand le le benthos est en warning, {@code false} dans les autres cas. + */ public boolean isBenthosTotalUnsortedComputedWeightInWarning() { Float catchTotalRejectedWeight = getCatchTotalRejectedComputedOrNotWeight().getDataOrComputedData(); Float benthosTotalSortedWeight = getBenthosTotalSortedComputedOrNotWeight().getDataOrComputedData(); - Float benthosTotalSampleSortedComputedWeight = getBenthosTotalSampleSortedComputedWeight(); boolean warning = catchTotalRejectedWeight != null && benthosTotalSortedWeight != null && benthosTotalSampleSortedComputedWeight != null - && Weights.isEqualWeight(catchTotalRejectedWeight, 0f) + && Weights.isGreaterWeight(catchTotalRejectedWeight, 0f) && Weights.isEqualWeight(benthosTotalSortedWeight, benthosTotalSampleSortedComputedWeight); 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 51dc853..cadb56e 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 @@ -162,6 +162,7 @@ tutti.config.option.ui.color.rowReadOnly.shortLabel= tutti.config.option.ui.color.rowToConfirm.shortLabel= tutti.config.option.ui.color.selectedRow.shortLabel= tutti.config.option.ui.color.species.shortLabel= +tutti.config.option.ui.color.speciesOrBenthosUnsortedComputedWeightInWarning.shortLabel= tutti.config.option.ui.config.file.shortLabel= tutti.config.option.ui.coordinateEditorType.shortLabel= tutti.config.option.ui.dateFormat.shortLabel= 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 7cca40a..870c766 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 @@ -144,6 +144,7 @@ tutti.config.option.ui.color.rowReadOnly.shortLabel=Couleur d'une cellule en lec tutti.config.option.ui.color.rowToConfirm.shortLabel=Couleur d'une espèce à confirmer tutti.config.option.ui.color.selectedRow.shortLabel=Couleur d'une ligne sélectionnée tutti.config.option.ui.color.species.shortLabel=Couleur des libellés d'espèces (Écran Capture > Résumé) +tutti.config.option.ui.color.speciesOrBenthosUnsortedComputedWeightInWarning.shortLabel=Couleur des libellés des espèces ou benthos observés en erreur (Écran Capture > Résumé) tutti.config.option.ui.config.file.shortLabel=Chemin du fichier de confirmation tutti.config.option.ui.coordinateEditorType.shortLabel=Formateur de coordonnées tutti.config.option.ui.dateFormat.shortLabel=Format des dates -- 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 430f304a28ade87ec9cda89dd4f9dddc644949c4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Mar 9 15:37:30 2015 +0100 fix typo in action name (refs #6793) --- .../fr/ifremer/tutti/ui/swing/util/catches/EnterWeightUIHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/catches/EnterWeightUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/catches/EnterWeightUIHandler.java index bc35897..7d45083 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/catches/EnterWeightUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/catches/EnterWeightUIHandler.java @@ -75,7 +75,7 @@ public class EnterWeightUIHandler extends AbstractTuttiUIHandler<TuttiUIContext, // add a auto-close action rootPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), VALIDATE_ACTION); - rootPane.getActionMap().put(CANCEL_ACTION, ui.getValidateButton().getAction()); + rootPane.getActionMap().put(VALIDATE_ACTION, ui.getValidateButton().getAction()); rootPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), CANCEL_ACTION); rootPane.getActionMap().put(CANCEL_ACTION, ui.getCancelButton().getAction()); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm