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 c1f5ca10d24368ea392633398a1b5c28bae1d2cb Author: Kevin Morin <morin@codelutin.com> Date: Fri Feb 6 16:22:34 2015 +0100 refs #6538 ajout des couleurs + mise en page --- .../java/fr/ifremer/tutti/TuttiConfiguration.java | 12 + .../fr/ifremer/tutti/TuttiConfigurationOption.java | 25 +++ .../i18n/tutti-persistence_en_GB.properties | 3 + .../i18n/tutti-persistence_fr_FR.properties | 3 + .../swing/content/config/TuttiConfigUIHandler.java | 9 + .../operation/catches/EditCatchesUIHandler.java | 62 ++++-- .../ifremer/tutti/ui/swing/util/TuttiUIUtil.java | 21 +- tutti-ui-swing/src/main/resources/EcranResume.svg | 244 ++++++++++----------- .../resources/i18n/tutti-ui-swing_en_GB.properties | 3 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 3 + 10 files changed, 238 insertions(+), 147 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 284df7a..11cdffa 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java @@ -600,6 +600,18 @@ public class TuttiConfiguration extends ApplicationConfiguration { return applicationConfig.getOptionAsColor(TuttiConfigurationOption.COLOR_SELECTED_ROW.getKey()); } + public Color getColorCatch() { + return applicationConfig.getOptionAsColor(TuttiConfigurationOption.COLOR_CATCH.getKey()); + } + + public Color getColorSpecies() { + return applicationConfig.getOptionAsColor(TuttiConfigurationOption.COLOR_SPECIES.getKey()); + } + + public Color getColorBenthos() { + return applicationConfig.getOptionAsColor(TuttiConfigurationOption.COLOR_BENTHOS.getKey()); + } + @Override public KeyStroke getShortcutClosePopup() { return applicationConfig.getOptionAsKeyStroke(TuttiConfigurationOption.SHORTCUT_CLOSE_POPUP.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 4dafae8..c83c413 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java @@ -444,6 +444,7 @@ public enum TuttiConfigurationOption implements ConfigOptionDef { Color.class, false ), + COLOR_SELECTED_ROW( "tutti.ui.color.selectedRow", n("tutti.config.option.ui.color.selectedRow.description"), @@ -452,6 +453,30 @@ public enum TuttiConfigurationOption implements ConfigOptionDef { false ), + COLOR_CATCH( + "tutti.ui.color.catch", + n("tutti.config.option.ui.color.catch.description"), + Color.decode("#888888").toString(), + Color.class, + false + ), + + COLOR_SPECIES( + "tutti.ui.color.species", + n("tutti.config.option.ui.color.species.description"), + Color.decode("#006BBA").toString(), + Color.class, + false + ), + + COLOR_BENTHOS( + "tutti.ui.color.benthos", + n("tutti.config.option.ui.color.benthos.description"), + Color.decode("#FF7F2A").toString(), + Color.class, + false + ), + COLOR_BLOCKING_LAYER( "tutti.ui.color.blockingLayer", n("tutti.config.option.ui.color.blockingLayer.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 e520f38..3bc4920 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 @@ -50,13 +50,16 @@ tutti.config.option.tremieCarousselVessel.description= tutti.config.option.ui.adminPassword.description= tutti.config.option.ui.autoPopupNumberEditor.description= tutti.config.option.ui.color.alternateRow.description= +tutti.config.option.ui.color.benthos.description= tutti.config.option.ui.color.blockingLayer.description= +tutti.config.option.ui.color.catch.description= tutti.config.option.ui.color.cellWithValue.description= tutti.config.option.ui.color.computedWeights.description= tutti.config.option.ui.color.rowInvalid.description= 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.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 33939a2..22da3f4 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 @@ -46,13 +46,16 @@ tutti.config.option.tremieCarousselVessel.description=Navire ayant un carrousel tutti.config.option.ui.adminPassword.description=MD5 du mot de passe des zones sensibles tutti.config.option.ui.autoPopupNumberEditor.description=Toujours afficher le pavé numérique lors de l'édition d'un nombre tutti.config.option.ui.color.alternateRow.description=Couleur de fond des lignes paires (non sélectionnée) dans un tableau +tutti.config.option.ui.color.benthos.description= tutti.config.option.ui.color.blockingLayer.description=Couleur utilisée pour bloquer l'interface lors d'une action longue +tutti.config.option.ui.color.catch.description= tutti.config.option.ui.color.cellWithValue.description=Couleur d'une cellule avec des données tutti.config.option.ui.color.computedWeights.description=Couleur des données calculées tutti.config.option.ui.color.rowInvalid.description=Ligne invalide 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= 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 79b3565..066cc62 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 @@ -187,6 +187,15 @@ public class TuttiConfigUIHandler extends AbstractTuttiUIHandler<TuttiUIContext, .addOption(TuttiConfigurationOption.COLOR_BLOCKING_LAYER) .setOptionShortLabel(t("tutti.config.option.ui.color.blockingLayer.shortLabel")) + .addOption(TuttiConfigurationOption.COLOR_CATCH) + .setOptionShortLabel(t("tutti.config.option.ui.color.catch.shortLabel")) + + .addOption(TuttiConfigurationOption.COLOR_SPECIES) + .setOptionShortLabel(t("tutti.config.option.ui.color.species.shortLabel")) + + .addOption(TuttiConfigurationOption.COLOR_BENTHOS) + .setOptionShortLabel(t("tutti.config.option.ui.color.benthos.shortLabel")) + .addOption(TuttiConfigurationOption.DATE_FORMAT) .setOptionShortLabel(t("tutti.config.option.ui.dateFormat.shortLabel")) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java index dfafc77..9f9734c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java @@ -42,6 +42,7 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.species.split.SplitSp import fr.ifremer.tutti.ui.swing.util.AbstractTuttiTabContainerUIHandler; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.TuttiUI; +import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import fr.ifremer.tutti.ui.swing.util.catches.EnterWeightUI; import fr.ifremer.tutti.ui.swing.util.computable.ComputableData; import fr.ifremer.tutti.util.Weights; @@ -794,18 +795,24 @@ public class EditCatchesUIHandler extends AbstractTuttiTabContainerUIHandler<Edi // redefine user agent to avoid displaying errors about css canvas = new JSVGCanvas(ua, true, true); + canvas.setBackground(Color.decode("#d6d9df")); canvas.setSize(new Dimension(1, 1)); canvas.setMySize(new Dimension(1, 1)); canvas.setRecenterOnResize(true); + final TuttiConfiguration config = getConfig(); + + final Color catchColor = config.getColorCatch(); + final Color speciesColor = config.getColorSpecies(); + final Color benthosColor = config.getColorBenthos(); + canvas.addGVTTreeRendererListener(new GVTTreeRendererAdapter() { @Override public void gvtRenderingCompleted(GVTTreeRendererEvent gvtTreeRendererEvent) { if (log.isDebugEnabled()) { log.debug("gvtRenderingCompleted"); } - TuttiConfiguration config = getConfig(); WeightUnit catchWeightUnit = WeightUnit.KG; WeightUnit speciesWeightUnit = config.getSpeciesWeightUnit(); WeightUnit benthosWeightUnit = config.getBenthosWeightUnit(); @@ -815,30 +822,34 @@ public class EditCatchesUIHandler extends AbstractTuttiTabContainerUIHandler<Edi initSvgField(CatchBatch.PROPERTY_CATCH_TOTAL_WEIGHT, CatchBatch.PROPERTY_CATCH_TOTAL_COMPUTED_WEIGHT, model.getCatchTotalComputedOrNotWeight(), - catchWeightUnit); + catchWeightUnit, + catchColor); - initSvgField(CatchBatch.PROPERTY_CATCH_TOTAL_SORTED_COMPUTED_WEIGHT, catchWeightUnit); + initSvgField(CatchBatch.PROPERTY_CATCH_TOTAL_SORTED_COMPUTED_WEIGHT, catchWeightUnit, catchColor); initSvgField(CatchBatch.PROPERTY_CATCH_TOTAL_REJECTED_WEIGHT, CatchBatch.PROPERTY_CATCH_TOTAL_REJECTED_COMPUTED_WEIGHT, model.getCatchTotalRejectedComputedOrNotWeight(), - catchWeightUnit); - initSvgField(CatchBatch.PROPERTY_CATCH_TOTAL_SORTED_SORTED_COMPUTED_WEIGHT, catchWeightUnit); + catchWeightUnit, + catchColor); + initSvgField(CatchBatch.PROPERTY_CATCH_TOTAL_SORTED_SORTED_COMPUTED_WEIGHT, catchWeightUnit, catchColor); initSvgField(CatchBatch.PROPERTY_SPECIES_TOTAL_SORTED_WEIGHT, CatchBatch.PROPERTY_SPECIES_TOTAL_SORTED_COMPUTED_WEIGHT, model.getSpeciesTotalSortedComputedOrNotWeight(), - speciesWeightUnit); - initSvgField(CatchBatch.PROPERTY_SPECIES_TOTAL_SAMPLE_SORTED_COMPUTED_WEIGHT, speciesWeightUnit); + speciesWeightUnit, + speciesColor); + initSvgField(CatchBatch.PROPERTY_SPECIES_TOTAL_SAMPLE_SORTED_COMPUTED_WEIGHT, speciesWeightUnit, speciesColor); initSvgField(CatchBatch.PROPERTY_BENTHOS_TOTAL_SORTED_WEIGHT, CatchBatch.PROPERTY_BENTHOS_TOTAL_SORTED_COMPUTED_WEIGHT, model.getBenthosTotalSortedComputedOrNotWeight(), - benthosWeightUnit); - initSvgField(CatchBatch.PROPERTY_BENTHOS_TOTAL_SAMPLE_SORTED_COMPUTED_WEIGHT, benthosWeightUnit); + benthosWeightUnit, + benthosColor); + initSvgField(CatchBatch.PROPERTY_BENTHOS_TOTAL_SAMPLE_SORTED_COMPUTED_WEIGHT, benthosWeightUnit, benthosColor); - initSvgField(CatchBatch.PROPERTY_CATCH_TOTAL_UNSORTED_COMPUTED_WEIGHT, catchWeightUnit); - initSvgField(CatchBatch.PROPERTY_SPECIES_TOTAL_UNSORTED_COMPUTED_WEIGHT, speciesWeightUnit); - initSvgField(CatchBatch.PROPERTY_BENTHOS_TOTAL_UNSORTED_COMPUTED_WEIGHT, benthosWeightUnit); + initSvgField(CatchBatch.PROPERTY_CATCH_TOTAL_UNSORTED_COMPUTED_WEIGHT, catchWeightUnit, catchColor); + initSvgField(CatchBatch.PROPERTY_SPECIES_TOTAL_UNSORTED_COMPUTED_WEIGHT, speciesWeightUnit, speciesColor); + initSvgField(CatchBatch.PROPERTY_BENTHOS_TOTAL_UNSORTED_COMPUTED_WEIGHT, benthosWeightUnit, benthosColor); addSvgRelatedPropertyChangeListener(null, new ChangeElementBackgroundColorPropertyChangeListener( CatchBatch.PROPERTY_SPECIES_TOTAL_UNSORTED_COMPUTED_WEIGHT, @@ -851,7 +862,7 @@ public class EditCatchesUIHandler extends AbstractTuttiTabContainerUIHandler<Edi @Override public Color apply(EditCatchesUIModel model) { boolean warning = model.isSpeciesTotalUnsortedComputedWeightInWarning(); - return warning ? Color.ORANGE : Color.decode("#006bba"); + return warning ? Color.ORANGE : speciesColor; } })); @@ -866,22 +877,25 @@ public class EditCatchesUIHandler extends AbstractTuttiTabContainerUIHandler<Edi @Override public Color apply(EditCatchesUIModel model) { boolean warning = model.isBenthosTotalUnsortedComputedWeightInWarning(); - return warning ? Color.ORANGE : Color.decode("#006bba"); + return warning ? Color.ORANGE : benthosColor; } })); initSvgField(CatchBatch.PROPERTY_SPECIES_TOTAL_COMPUTED_WEIGHT, speciesWeightUnit, + speciesColor, CatchBatch.PROPERTY_BENTHOS_TOTAL_COMPUTED_WEIGHT, CatchBatch.PROPERTY_MARINE_LITTER_TOTAL_WEIGHT); initSvgField(CatchBatch.PROPERTY_BENTHOS_TOTAL_COMPUTED_WEIGHT, benthosWeightUnit, + benthosColor, CatchBatch.PROPERTY_SPECIES_TOTAL_COMPUTED_WEIGHT, CatchBatch.PROPERTY_MARINE_LITTER_TOTAL_WEIGHT); initSvgField(CatchBatch.PROPERTY_MARINE_LITTER_TOTAL_WEIGHT, CatchBatch.PROPERTY_MARINE_LITTER_TOTAL_COMPUTED_WEIGHT, model.getMarineLitterTotalComputedOrNotWeight(), marineLitterWeightUnit, + catchColor, CatchBatch.PROPERTY_SPECIES_TOTAL_COMPUTED_WEIGHT, CatchBatch.PROPERTY_BENTHOS_TOTAL_COMPUTED_WEIGHT); @@ -1009,14 +1023,15 @@ public class EditCatchesUIHandler extends AbstractTuttiTabContainerUIHandler<Edi } } - protected void initSvgField(String computedProperty, WeightUnit weightUnit, String... idsInGroup) { - initSvgField(null, computedProperty, null, weightUnit, idsInGroup); + protected void initSvgField(String computedProperty, WeightUnit weightUnit, Color bgColor, String... idsInGroup) { + initSvgField(null, computedProperty, null, weightUnit, bgColor, idsInGroup); } protected void initSvgField(String property, String computedProperty, final ComputableData<Float> computableData, final WeightUnit weightUnit, + final Color bgColor, final String... idsInGroup) { if (log.isDebugEnabled()) { @@ -1048,16 +1063,17 @@ public class EditCatchesUIHandler extends AbstractTuttiTabContainerUIHandler<Edi SVGRect bbox = rectElement.getBBox(); Float x = bbox.getX(); - Element labelElement = svgDocument.getElementById(notNullProperty + "Label"); + SVGOMTextElement labelElement = (SVGOMTextElement) svgDocument.getElementById(notNullProperty + "Label"); + CSSStyleDeclaration style = labelElement.getStyle(); if (computableData == null) { - SVGStylable field = (SVGStylable) labelElement; - CSSStyleDeclaration style = field.getStyle(); style.setProperty("font-style", "italic", null); } + int colorBrightness = TuttiUIUtil.getColorBrightness(bgColor); + String textColor = colorBrightness > 125 ? "#000000" : "#FFFFFF"; + style.setProperty("fill", textColor, null); - SVGOMTextElement labelTextElem = (SVGOMTextElement) labelElement; labelElement.setTextContent(weightUnit.decorateLabel(t("tutti.editCatchBatch.field." + notNullProperty))); - bbox = labelTextElem.getBBox(); + bbox = labelElement.getBBox(); float labelX = bbox.getX(); float width = Math.abs(x - labelX) + 10; @@ -1075,6 +1091,10 @@ public class EditCatchesUIHandler extends AbstractTuttiTabContainerUIHandler<Edi } } + style = labelRectElement.getStyle(); + String hexaColor = "#" + Integer.toHexString(bgColor.getRGB()).substring(2); + style.setProperty("fill", hexaColor, null); + Float value; boolean computed; if (computableData == null) { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java index 4da803c..e94ce78 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java @@ -34,9 +34,8 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.application.ApplicationBusinessException; import org.nuiton.jaxx.application.swing.util.ApplicationUIUtil; -import javax.swing.ImageIcon; -import javax.swing.JComponent; -import java.awt.Desktop; +import javax.swing.*; +import java.awt.*; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; @@ -151,4 +150,20 @@ public final class TuttiUIUtil extends ApplicationUIUtil { TuttiUIContext.getApplicationContext().getErrorHelper().showErrorDialog(t("swing.error.cannot.open.file")); } } + + /** + * Computes the brightness of a color. This can be useful to determine the text color according to the backgound. + * (e.g. if the backgound's brightness is over 125, the text could be written in black, otherwise in white) + * @param c the color + * @return the brightness of the color: 0 the darkest, 255 the brightest + */ + public static int getColorBrightness(Color c) { + int red = c.getRed(); + int green = c.getGreen(); + int blue = c.getBlue(); + + return (int) Math.sqrt(red * red * .241 + + green * green * .691 + + blue * blue * .068); + } } diff --git a/tutti-ui-swing/src/main/resources/EcranResume.svg b/tutti-ui-swing/src/main/resources/EcranResume.svg index 7e76b12..22ff9c4 100644 --- a/tutti-ui-swing/src/main/resources/EcranResume.svg +++ b/tutti-ui-swing/src/main/resources/EcranResume.svg @@ -16,8 +16,8 @@ y="0px" width="800" height="500" - viewport="0 0 800 500" - viewBox="0 0 800 500" + viewport="0 0 1000 500" + viewBox="0 0 1000 500" id="svg2985" preserveAspectRatio="xMidYMid"> <defs @@ -29,9 +29,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="2.8284273" - inkscape:cx="394.18449" - inkscape:cy="179.07834" + inkscape:zoom="11.313709" + inkscape:cx="321.48549" + inkscape:cy="389.21692" inkscape:current-layer="layer2" id="namedview2989" showgrid="true" @@ -82,7 +82,7 @@ <rect style="opacity:0.8;fill:#d6d9df;fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect3782" - width="800" + width="1000" height="500" x="254.46719" y="-246.05853" /> @@ -93,29 +93,28 @@ inkscape:label="Arbre" transform="translate(-254.46719,246.05856)"> <rect - style="fill:#006bba;fill-opacity:1;fill-rule:nonzero;stroke:none" + style="fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:none" id="rect4276" - width="1.2082677" + width="1.5988927" height="54.04163" - x="432.60135" - y="139.5844" /> + x="472.42056" + y="132.0522" /> <path - style="fill:none;stroke:#006bba;stroke-width:1.77165353;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - d="m 471.64546,-163.00283 -0.0122,-26.66861 122.31709,0.38377 -0.42569,-51.87718 0.482,51.8849 137.75486,0.29303 -0.071,26.06381" + style="fill:none;stroke:#666666;stroke-width:2.61584902;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + d="m 446.39162,-110.04153 -0.0269,-26.32879 270.09991,0.37888 -0.0561,-32.10216 0.18047,32.10978 304.18952,0.2893 -0.1568,25.73169" id="path3976" inkscape:connector-curvature="0" - sodipodi:nodetypes="ccccccc" - transform="matrix(1.4580208,0,0,0.99343887,-241.52824,52.133138)" /> + sodipodi:nodetypes="ccccccc" /> <g id="catchTotalWeight" - transform="translate(-12.727921,10.253048)"> + transform="translate(79.772074,10.565548)"> <rect y="-206.33543" x="480.88577" height="30.929434" width="228.42943" id="catchTotalWeightLabelRect" - style="fill:#006bba;fill-opacity:1;stroke:#444444;stroke-width:0.77922755;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> + style="fill:#006bba;fill-opacity:1;stroke:#666666;stroke-width:0.77922755;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> <text sodipodi:linespacing="125%" id="catchTotalWeightLabel" @@ -124,7 +123,7 @@ style="font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;text-anchor:end;fill:#ffffff;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial" xml:space="preserve">CAPTURE TOTALE</text> <rect - style="fill:#ffffff;fill-opacity:1;stroke:#444444;stroke-width:0.44218841;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + style="fill:#ffffff;fill-opacity:1;stroke:#666666;stroke-width:0.44218841;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" id="catchTotalWeightRect" width="72.766464" height="31.266474" @@ -136,7 +135,7 @@ y="-186.02356" id="catchTotalWeightValue" style="font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;text-anchor:start;fill:#000000;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial" - sodipodi:linespacing="125%">00.00kg</text> + sodipodi:linespacing="125%">123456.789 kg</text> </g> <g id="g4760" @@ -147,7 +146,7 @@ <g id="g4041"> <rect - style="fill:#006bba;fill-opacity:1;stroke:#444444;stroke-width:0.59367329;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + style="fill:#006bba;fill-opacity:1;stroke:#666666;stroke-width:0.59367329;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" id="catchTotalSortedComputedWeightLabelRect" width="154.08636" height="26.614988" @@ -165,26 +164,26 @@ height="26.829227" width="62.439663" id="catchTotalSortedComputedWeightRect" - style="fill:#ffffff;fill-opacity:1;stroke:#444444;stroke-width:0.37943435;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#666666;stroke-width:0.37943435;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> <text id="catchTotalSortedComputedWeightValue" y="-150.78915" x="507.67651" xml:space="preserve" - style="font-size:12.01316166px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;text-anchor:start;fill:#000000;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial">00.00kg</text> + style="font-size:12.01316166px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;text-anchor:start;fill:#000000;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial">123456.789 kg</text> </g> </g> </g> <g id="g4568" - transform="translate(24.748736,25.809397)"> + transform="translate(220.99873,25.809397)"> <rect y="-130.42822" x="708.43945" height="26.614988" width="154.08636" id="catchTotalUnsortedComputedWeightLabelRect" - style="fill:#006bba;fill-opacity:1;stroke:#444444;stroke-width:0.59367329;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> + style="fill:#006bba;fill-opacity:1;stroke:#666666;stroke-width:0.59367329;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> <text sodipodi:linespacing="125%" id="catchTotalUnsortedComputedWeightLabel" @@ -193,7 +192,7 @@ xml:space="preserve" style="font-size:12.01316166px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:125%;text-anchor:end;fill:#ffffff;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial">HORS VRAC</text> <rect - style="fill:#ffffff;fill-opacity:1;stroke:#444444;stroke-width:0.37943435;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + style="fill:#ffffff;fill-opacity:1;stroke:#666666;stroke-width:0.37943435;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" id="catchTotalUnsortedComputedWeightRect" width="62.439663" height="26.829227" @@ -204,11 +203,11 @@ x="806.42346" y="-112.25434" id="catchTotalUnsortedComputedWeightValue" - style="font-size:12.01316166px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;text-anchor:start;fill:#000000;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial">00.00 kg</text> + style="font-size:12.01316166px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;text-anchor:start;fill:#000000;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial">123456.789 kg</text> </g> <path sodipodi:type="star" - style="fill:#006bba;fill-opacity:1;fill-rule:nonzero;stroke:#004a81;stroke-width:0.70866144;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + style="fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:#004a81;stroke-width:0.70866144;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path4063" sodipodi:sides="3" sodipodi:cx="444.23984" @@ -225,7 +224,7 @@ inkscape:transform-center-y="1.6001575" /> <path inkscape:transform-center-y="1.6001575" - transform="translate(380.84078,-191.97031)" + transform="translate(577.09077,-191.97031)" d="m 444.23984,89.309863 c 0.14753,0 -5.47151,-9.732452 -5.54527,-9.604687 -0.0738,0.127765 11.1643,0.127765 11.09054,0 -0.0738,-0.127765 -5.6928,9.604687 -5.54527,9.604687 z" inkscape:randomized="0" inkscape:rounded="-0.013302361" @@ -238,11 +237,11 @@ sodipodi:cx="444.23984" sodipodi:sides="3" id="path4089" - style="fill:#006bba;fill-opacity:1;fill-rule:nonzero;stroke:#004a81;stroke-width:0.70866144;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;" + style="fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:#004a81;stroke-width:0.70866144;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" sodipodi:type="star" /> <g id="g4803" - transform="translate(171.93502,106.19417)"> + transform="translate(335.03938,136.55489)"> <g id="g3094" transform="matrix(0.84647606,0,0,0.84647606,135.37037,23.780278)"> @@ -252,7 +251,7 @@ height="26.614988" width="154.08636" id="speciesTotalUnsortedComputedWeightLabelRect" - style="fill:#006bba;fill-opacity:1;stroke:#444444;stroke-width:0.59367329;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> + style="fill:#006bba;fill-opacity:1;stroke:#666666;stroke-width:0.59367329;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> <text style="font-size:10.63231468px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;text-anchor:end;fill:#ffffff;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial" id="speciesTotalUnsortedComputedWeightLabel" @@ -265,18 +264,18 @@ height="26.829227" width="62.439663" id="speciesTotalUnsortedComputedWeightRect" - style="fill:#ffffff;fill-opacity:1;stroke:#444444;stroke-width:0.37943435;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#666666;stroke-width:0.37943435;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> <text style="font-size:12.01316166px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;text-anchor:start;fill:#000000;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial" id="speciesTotalUnsortedComputedWeightValue" y="-151.6066" x="509.46756" - xml:space="preserve">00.00 kg</text> + xml:space="preserve">123456.789 kg</text> </g> </g> <g id="g4588" - transform="translate(42.426405,84.651271)"> + transform="translate(269.66752,75.90666)"> <g transform="matrix(0.84647606,0,0,0.84647606,135.37037,23.780278)" id="g4154"> @@ -286,7 +285,7 @@ height="26.614988" width="154.08636" id="benthosTotalUnsortedComputedWeightLabelRect" - style="fill:#006bba;fill-opacity:1;stroke:#444444;stroke-width:0.59367329;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> + style="fill:#006bba;fill-opacity:1;stroke:#666666;stroke-width:0.59367329;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> <text id="benthosTotalUnsortedComputedWeightLabel" y="-79.496262" @@ -294,7 +293,7 @@ xml:space="preserve" style="font-size:10.63231468px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;text-anchor:end;fill:#ffffff;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial">Benthos observés</text> <rect - style="fill:#ffffff;fill-opacity:1;stroke:#444444;stroke-width:0.37943435;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + style="fill:#ffffff;fill-opacity:1;stroke:#666666;stroke-width:0.37943435;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" id="benthosTotalUnsortedComputedWeightRect" width="62.439663" height="26.829227" @@ -305,19 +304,18 @@ x="883.16284" y="-78.660912" id="benthosTotalUnsortedComputedWeightValue" - style="font-size:12.01316166px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;text-anchor:start;fill:#000000;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial">00.00 kg</text> + style="font-size:12.01316166px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;text-anchor:start;fill:#000000;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial">123456.789 kg</text> </g> </g> <path sodipodi:nodetypes="ccccccc" inkscape:connector-curvature="0" id="path4120" - d="m 600.09977,-84.857782 -0.49701,-41.547738 131.3125,0 -0.1875,-15 0.1875,14.98614 130.1875,-0.48614 0,83.17294" - style="fill:none;stroke:#006bba;stroke-width:1.77165353;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - transform="matrix(0.71136481,0,0,0.99776526,305.68075,64.079044)" /> + d="m 894.59312,10.56919 0.40681,-44.030973 126.20987,-0.03791 -0.1262,-44.073846 0.1262,43.89664 125.2372,-0.09886 0,44.514136" + style="fill:none;stroke:#666666;stroke-width:2.13421011;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> <path inkscape:transform-center-y="1.576596" - transform="matrix(1.045689,0,0,0.98527645,267.46628,-100.25551)" + transform="matrix(1.045689,0,0,0.98527645,430.57064,-69.894789)" d="m 444.23984,89.309863 c 0.14753,0 -5.47151,-9.732452 -5.54527,-9.604687 -0.0738,0.127765 11.1643,0.127765 11.09054,0 -0.0738,-0.127765 -5.6928,9.604687 -5.54527,9.604687 z" inkscape:randomized="0" inkscape:rounded="-0.013302361" @@ -330,12 +328,12 @@ sodipodi:cx="444.23984" sodipodi:sides="3" id="path4150" - style="fill:#006bba;fill-opacity:1;fill-rule:nonzero;stroke:#004a81;stroke-width:0.70866144;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + style="fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:#004a81;stroke-width:0.70866144;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" sodipodi:type="star" inkscape:transform-center-x="1.1708959e-05" /> <path sodipodi:type="star" - style="fill:#006bba;fill-opacity:1;fill-rule:nonzero;stroke:#004a81;stroke-width:0.70866144;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + style="fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:#004a81;stroke-width:0.70866144;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path4152" sodipodi:sides="3" sodipodi:cx="444.23984" @@ -348,17 +346,17 @@ inkscape:rounded="-0.013302361" inkscape:randomized="0" d="m 444.23984,89.309863 c 0.14753,0 -5.47151,-9.732452 -5.54527,-9.604687 -0.0738,0.127765 11.1643,0.127765 11.09054,0 -0.0738,-0.127765 -5.6928,9.604687 -5.54527,9.604687 z" - transform="matrix(1.045689,0,0,0.98527645,454.00609,-59.79841)" + transform="matrix(1.045689,0,0,0.98527645,681.2472,-68.543019)" inkscape:transform-center-y="1.576596" inkscape:transform-center-x="1.1708959e-05" /> <g id="g4738" - transform="translate(31.259144,45.913474)"> + transform="translate(30.375261,74.639685)"> <g transform="matrix(0.84647606,0,0,0.84647606,-86.984873,84.726553)" id="catchTotalRejectedWeight"> <rect - style="fill:#006bba;fill-opacity:1;stroke:#444444;stroke-width:0.59367329;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + style="fill:#006bba;fill-opacity:1;stroke:#666666;stroke-width:0.59367329;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" id="catchTotalRejectedWeightLabelRect" width="154.08636" height="26.614988" @@ -376,23 +374,23 @@ height="26.829227" width="62.439663" id="catchTotalRejectedWeightRect" - style="fill:#ffffff;fill-opacity:1;stroke:#444444;stroke-width:0.37943435;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#666666;stroke-width:0.37943435;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> <text xml:space="preserve" style="font-size:12.01316166px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;text-anchor:start;fill:#000000;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial" id="catchTotalRejectedWeightValue" y="-150.66092" - x="507.49289">00.00 kg</text> + x="507.49289">123456.789 kg</text> </g> </g> <g id="g4717" - transform="translate(51.618793,84.499261)"> + transform="translate(105.10991,74.935815)"> <g id="catchTotalSortedSortedComputedWeight" transform="matrix(0.84647606,0,0,0.84647606,-245.9198,23.780278)"> <rect - style="fill:#006bba;fill-opacity:1;stroke:#444444;stroke-width:0.59367329;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + style="fill:#006bba;fill-opacity:1;stroke:#666666;stroke-width:0.59367329;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" id="catchTotalSortedSortedComputedWeightLabelRect" width="154.08636" height="26.614988" @@ -410,25 +408,25 @@ height="26.829227" width="62.439663" id="catchTotalSortedSortedComputedWeightRect" - style="fill:#ffffff;fill-opacity:1;stroke:#444444;stroke-width:0.37943435;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#666666;stroke-width:0.37943435;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> <text y="-78.660904" x="881.90985" xml:space="preserve" style="font-size:12.01316166px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;text-anchor:start;fill:#000000;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial" - id="catchTotalSortedSortedComputedWeightValue">00.00 kg</text> + id="catchTotalSortedSortedComputedWeightValue">123456.789 kg</text> </g> </g> <path - style="fill:none;stroke:#006bba;stroke-width:1.84971476;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" - d="m 368.64941,-17.511056 -0.10355,-18.069823 78.02538,-0.5 -0.11177,-41.42989 -0.13823,41.404545 99.77508,0.23233 0.0858,57.502151" + style="fill:none;stroke:#666666;stroke-width:1.93729055;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + d="m 368.25126,11.018119 0.33826,-42.47349 77.99597,-0.548673 -0.11173,-45.462937 -0.13818,45.435124 153.63404,0.254947 0.0856,42.312836" id="path4200" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccc" /> <path inkscape:transform-center-x="1.1708959e-05" sodipodi:type="star" - style="fill:#006bba;fill-opacity:1;fill-rule:nonzero;stroke:#004a81;stroke-width:0.70866144;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + style="fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:#004a81;stroke-width:0.70866144;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path4202" sodipodi:sides="3" sodipodi:cx="444.23984" @@ -441,12 +439,12 @@ inkscape:rounded="-0.013302361" inkscape:randomized="0" d="m 444.23984,89.309863 c 0.14753,0 -5.47151,-9.732452 -5.54527,-9.604687 -0.0738,0.127765 11.1643,0.127765 11.09054,0 -0.0738,-0.127765 -5.6928,9.604687 -5.54527,9.604687 z" - transform="matrix(1.045689,0,0,0.98527645,-95.89623,-98.225548)" + transform="matrix(1.045689,0,0,0.98527645,-96.780113,-69.499337)" inkscape:transform-center-y="1.576596" /> <path inkscape:transform-center-x="1.1708959e-05" inkscape:transform-center-y="1.576596" - transform="matrix(1.045689,0,0,0.98527645,81.408316,-59.682658)" + transform="matrix(1.045689,0,0,0.98527645,134.89943,-69.246104)" d="m 444.23984,89.309863 c 0.14753,0 -5.47151,-9.732452 -5.54527,-9.604687 -0.0738,0.127765 11.1643,0.127765 11.09054,0 -0.0738,-0.127765 -5.6928,9.604687 -5.54527,9.604687 z" inkscape:randomized="0" inkscape:rounded="-0.013302361" @@ -459,11 +457,11 @@ sodipodi:cx="444.23984" sodipodi:sides="3" id="path4204" - style="fill:#006bba;fill-opacity:1;fill-rule:nonzero;stroke:#004a81;stroke-width:0.70866144;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + style="fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:#004a81;stroke-width:0.70866144;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" sodipodi:type="star" /> <g id="g4695" - transform="translate(17.92767,108.42997)"> + transform="translate(57.66879,100.74152)"> <g id="g4206" transform="matrix(0.84647606,0,0,0.84647606,-8.9848728,152.72655)"> @@ -475,7 +473,7 @@ height="26.614988" width="154.08636" id="speciesTotalSortedWeightLabelRect" - style="fill:#006bba;fill-opacity:1;stroke:#444444;stroke-width:0.59367329;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> + style="fill:#006bba;fill-opacity:1;stroke:#666666;stroke-width:0.59367329;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> <text xml:space="preserve" style="font-size:10.63231468px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;text-anchor:end;fill:#ffffff;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial" @@ -483,7 +481,7 @@ y="-151.49626" x="494.65033">Espèce trié</text> <rect - style="fill:#ffffff;fill-opacity:1;stroke:#444444;stroke-width:0.37943435;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + style="fill:#ffffff;fill-opacity:1;stroke:#666666;stroke-width:0.37943435;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" id="speciesTotalSortedWeightRect" width="62.439663" height="26.829227" @@ -494,20 +492,20 @@ x="508.32825" y="-150.6609" id="speciesTotalSortedWeightValue" - style="font-size:12.01316166px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;text-anchor:start;fill:#000000;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial">00.00 kg</text> + style="font-size:12.01316166px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;text-anchor:start;fill:#000000;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial">123456.789 kg</text> </g> </g> </g> <rect - y="139.64505" - x="657.08038" + y="132.5816" + x="725.88397" height="53.334522" - width="1.2082677" + width="1.6770178" id="rect4338" - style="fill:#006bba;fill-opacity:1;fill-rule:nonzero;stroke:none" /> + style="fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:none" /> <g id="g4652" - transform="translate(84.547725,108.19774)"> + transform="translate(153.66384,101.13429)"> <g transform="matrix(0.84647606,0,0,0.84647606,-167.9198,91.780282)" id="benthosTotalSortedWeight"> @@ -517,7 +515,7 @@ height="26.614988" width="154.08636" id="benthosTotalSortedWeightLabelRect" - style="fill:#006bba;fill-opacity:1;stroke:#444444;stroke-width:0.59367329;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> + style="fill:#006bba;fill-opacity:1;stroke:#666666;stroke-width:0.59367329;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> <text xml:space="preserve" style="font-size:10.63231468px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;text-anchor:end;fill:#ffffff;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial" @@ -525,7 +523,7 @@ y="-79.496262" x="867.30817">Benthos isolé</text> <rect - style="fill:#ffffff;fill-opacity:1;stroke:#444444;stroke-width:0.37943435;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + style="fill:#ffffff;fill-opacity:1;stroke:#666666;stroke-width:0.37943435;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" id="benthosTotalSortedWeightRect" width="62.439663" height="26.829227" @@ -536,18 +534,18 @@ x="883.16284" y="-78.660912" id="benthosTotalSortedWeightValue" - style="font-size:12.01316166px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;text-anchor:start;fill:#000000;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial">00.00 kg</text> + style="font-size:12.01316166px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;text-anchor:start;fill:#000000;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial">123456.789 kg</text> </g> </g> <path sodipodi:nodetypes="ccccccc" inkscape:connector-curvature="0" id="path4236" - d="m 433.03409,116.1977 0,-26.236661 112.89255,0.207107 -0.16119,-41.097592 0.16119,41.082961 111.92537,-0.513174 0,27.612969" - style="fill:none;stroke:#006bba;stroke-width:1.68775713;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> + d="m 472.82778,106.58332 0,-26.196209 127.59044,0.206787 -0.18217,-41.034229 0.18217,41.019621 126.49734,-0.512383 0,27.570393" + style="fill:none;stroke:#666666;stroke-width:1.79288054;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> <path inkscape:transform-center-y="1.576596" - transform="matrix(1.045689,0,0,0.98527645,-30.624143,32.248058)" + transform="matrix(1.045689,0,0,0.98527645,9.1169726,24.559611)" d="m 444.23984,89.309863 c 0.14753,0 -5.47151,-9.732452 -5.54527,-9.604687 -0.0738,0.127765 11.1643,0.127765 11.09054,0 -0.0738,-0.127765 -5.6928,9.604687 -5.54527,9.604687 z" inkscape:randomized="0" inkscape:rounded="-0.013302361" @@ -560,12 +558,12 @@ sodipodi:cx="444.23984" sodipodi:sides="3" id="path4238" - style="fill:#006bba;fill-opacity:1;fill-rule:nonzero;stroke:#004a81;stroke-width:0.70866144;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + style="fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:#004a81;stroke-width:0.70866144;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" sodipodi:type="star" inkscape:transform-center-x="1.1708959e-05" /> <path sodipodi:type="star" - style="fill:#006bba;fill-opacity:1;fill-rule:nonzero;stroke:#004a81;stroke-width:0.70866144;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + style="fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:#004a81;stroke-width:0.70866144;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path4240" sodipodi:sides="3" sodipodi:cx="444.23984" @@ -578,17 +576,17 @@ inkscape:rounded="-0.013302361" inkscape:randomized="0" d="m 444.23984,89.309863 c 0.14753,0 -5.47151,-9.732452 -5.54527,-9.604687 -0.0738,0.127765 11.1643,0.127765 11.09054,0 -0.0738,-0.127765 -5.6928,9.604687 -5.54527,9.604687 z" - transform="matrix(1.045689,0,0,0.98527645,192.79436,33.369365)" + transform="matrix(1.045689,0,0,0.98527645,261.91048,26.305918)" inkscape:transform-center-y="1.576596" inkscape:transform-center-x="1.1708959e-05" /> <g id="g4631" - transform="translate(84.340618,127.33251)"> + transform="translate(153.45673,120.26906)"> <g id="g4242" transform="matrix(0.84647606,0,0,0.84647606,-167.9198,151.78028)"> <rect - style="fill:#006bba;fill-opacity:1;stroke:#444444;stroke-width:0.59367329;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + style="fill:#006bba;fill-opacity:1;stroke:#666666;stroke-width:0.59367329;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" id="benthosTotalSampleSortedComputedWeightLabelRect" width="154.08636" height="26.614988" @@ -606,19 +604,19 @@ height="26.829227" width="62.439663" id="benthosTotalSampleSortedComputedWeightRect" - style="fill:#ffffff;fill-opacity:1;stroke:#444444;stroke-width:0.37943435;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#666666;stroke-width:0.37943435;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> <text xml:space="preserve" style="font-size:12.01316166px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;text-anchor:start;fill:#000000;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial" id="benthosTotalSampleSortedComputedWeightValue" y="-78.660912" - x="881.07446">00.00 kg</text> + x="881.07446">123456.789 kg</text> </g> </g> <path inkscape:transform-center-x="1.1708959e-05" inkscape:transform-center-y="1.576596" - transform="matrix(1.045689,0,0,0.98527645,192.79435,110.69348)" + transform="matrix(1.045689,0,0,0.98527645,261.91047,103.63003)" d="m 444.23984,89.309863 c 0.14753,0 -5.47151,-9.732452 -5.54527,-9.604687 -0.0738,0.127765 11.1643,0.127765 11.09054,0 -0.0738,-0.127765 -5.6928,9.604687 -5.54527,9.604687 z" inkscape:randomized="0" inkscape:rounded="-0.013302361" @@ -631,16 +629,16 @@ sodipodi:cx="444.23984" sodipodi:sides="3" id="path4256" - style="fill:#006bba;fill-opacity:1;fill-rule:nonzero;stroke:#004a81;stroke-width:0.70866144;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + style="fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:#004a81;stroke-width:0.70866144;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" sodipodi:type="star" /> <g id="g4673" - transform="translate(17.92767,126.81475)"> + transform="translate(57.66879,119.1263)"> <g transform="matrix(0.84647606,0,0,0.84647606,-8.9848728,212.72655)" id="g4258"> <rect - style="fill:#006bba;fill-opacity:1;stroke:#444444;stroke-width:0.59367329;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + style="fill:#006bba;fill-opacity:1;stroke:#666666;stroke-width:0.59367329;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" id="speciesTotalSampleSortedComputedWeightLabelRect" width="154.08636" height="26.614988" @@ -658,19 +656,19 @@ height="26.829227" width="62.439663" id="speciesTotalSampleSortedComputedWeightRect" - style="fill:#ffffff;fill-opacity:1;stroke:#444444;stroke-width:0.37943435;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#666666;stroke-width:0.37943435;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> <text xml:space="preserve" style="font-size:12.01316166px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;text-anchor:start;fill:#000000;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial" id="speciesTotalSampleSortedComputedWeightValue" y="-151.07858" - x="508.74591">00.00 kg</text> + x="508.74591">123456.789 kg</text> </g> </g> <path inkscape:transform-center-x="1.1708959e-05" sodipodi:type="star" - style="fill:#006bba;fill-opacity:1;fill-rule:nonzero;stroke:#004a81;stroke-width:0.70866144;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" + style="fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:#004a81;stroke-width:0.70866144;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="path4274" sodipodi:sides="3" sodipodi:cx="444.23984" @@ -683,18 +681,18 @@ inkscape:rounded="-0.013302361" inkscape:randomized="0" d="m 444.23984,89.309863 c 0.14753,0 -5.47151,-9.732452 -5.54527,-9.604687 -0.0738,0.127765 11.1643,0.127765 11.09054,0 -0.0738,-0.127765 -5.6928,9.604687 -5.54527,9.604687 z" - transform="matrix(1.045689,0,0,0.98527645,-31.33125,109.57216)" + transform="matrix(1.045689,0,0,0.98527645,8.4098653,101.88371)" inkscape:transform-center-y="1.576596" /> <g id="marineLitterTotalWeight" - transform="matrix(0.88820049,0,0,0.88820049,172.22087,32.796776)"> + transform="matrix(0.88820049,0,0,0.88820049,362.87188,28.636242)"> <rect y="-240.95483" x="765.68683" height="23.112495" width="170.6974" id="marineLitterTotalWeightLabelRect" - style="fill:#555555;fill-opacity:1;stroke:#444444;stroke-width:0.58228976;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> + style="fill:#555555;fill-opacity:1;stroke:#666666;stroke-width:0.58228976;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> <text style="font-size:10.4617157px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;text-anchor:end;fill:#ffffff;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial" id="marineLitterTotalWeightLabel" @@ -702,7 +700,7 @@ x="874.85834" xml:space="preserve">Total macrodéchets</text> <rect - style="fill:#ffffff;fill-opacity:1;stroke:#444444;stroke-width:0.33043209;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + style="fill:#ffffff;fill-opacity:1;stroke:#666666;stroke-width:0.33043209;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" id="marineLitterTotalWeightRect" width="54.375862" height="23.364353" @@ -713,13 +711,13 @@ y="-225.77646" id="marineLitterTotalWeightValue" style="font-size:10.4617157px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;text-anchor:start;fill:#000000;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial" - xml:space="preserve">00.00 kg</text> + xml:space="preserve">123456.789 kg</text> </g> <g id="benthosTotalComputedWeight" - transform="matrix(0.88820049,0,0,0.88820049,172.22087,26.167646)"> + transform="matrix(0.88820049,0,0,0.88820049,362.87188,22.007112)"> <rect - style="fill:#555555;fill-opacity:1;stroke:#444444;stroke-width:0.58228976;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + style="fill:#555555;fill-opacity:1;stroke:#666666;stroke-width:0.58228976;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" id="benthosTotalComputedWeightLabelRect" width="170.6974" height="23.112495" @@ -737,19 +735,19 @@ height="23.364353" width="54.375862" id="benthosTotalComputedWeightRect" - style="fill:#ffffff;fill-opacity:1;stroke:#444444;stroke-width:0.33043209;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#666666;stroke-width:0.33043209;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> <text style="font-size:10.4617157px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;text-anchor:start;fill:#000000;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial" id="benthosTotalComputedWeightValue" y="-247.47125" x="888.79388" - xml:space="preserve">00.00 kg</text> + xml:space="preserve">123456.789 kg</text> </g> <g id="speciesTotalComputedWeight" - transform="matrix(0.88820049,0,0,0.88820049,172.22087,19.273356)"> + transform="matrix(0.88820049,0,0,0.88820049,362.87188,15.112822)"> <rect - style="fill:#555555;fill-opacity:1;stroke:#444444;stroke-width:0.58228976;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" + style="fill:#555555;fill-opacity:1;stroke:#666666;stroke-width:0.58228976;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" id="speciesTotalComputedWeightLabelRect" width="170.6974" height="23.112495" @@ -767,48 +765,48 @@ height="23.364353" width="54.375862" id="speciesTotalComputedWeightRect" - style="fill:#ffffff;fill-opacity:1;stroke:#444444;stroke-width:0.33043209;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> + style="fill:#ffffff;fill-opacity:1;stroke:#666666;stroke-width:0.33043209;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /> <text style="font-size:10.4617157px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;text-anchor:start;fill:#000000;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial" id="speciesTotalComputedWeightValue" y="-269.16605" x="889.91974" - xml:space="preserve">00.00 kg</text> + xml:space="preserve">123456.789 kg</text> </g> <text xml:space="preserve" style="font-size:10px;font-style:italic;font-weight:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#0000ff;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Italic" - x="429.52365" - y="169.2132" + x="469.26474" + y="161.52475" id="ratioSpeciesSampleSortedOverSpeciesSortedWeightLabel" sodipodi:linespacing="125%" - inkscape:label="#text3186">123%</text> + inkscape:label="#text3186">100%</text> <text xml:space="preserve" style="font-size:10px;font-style:italic;font-weight:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#0000ff;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Italic" - x="653.52368" - y="169.2132" + x="721.14075" + y="160.8163" id="ratioBenthosSampleSortedOverBenthosSortedWeightLabel" - sodipodi:linespacing="125%" /> + sodipodi:linespacing="125%">100%</text> <text xml:space="preserve" style="font-size:10px;font-style:italic;font-weight:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#0000ff;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Italic" - x="539.77875" + x="590.1601" y="-7.440062" id="ratioSortedSortedOverSortedWeightLabel" - sodipodi:linespacing="125%"/> + sodipodi:linespacing="125%">100%</text> <text xml:space="preserve" style="font-size:9px;font-style:italic;font-weight:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - x="433.97971" - y="239.08372" + x="473.72079" + y="231.39528" id="speciesDistinctSortedSpeciesCountLabel" sodipodi:linespacing="125%">Nombre d'espèces :</text> <text xml:space="preserve" style="font-size:9px;font-style:italic;font-weight:normal;text-align:end;line-height:125%;letter-spacing:0px;word-spacing:0px;text-anchor:end;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans" - x="658.13806" - y="239.08372" + x="727.25415" + y="232.02028" id="benthosDistinctSortedSpeciesCountLabel" sodipodi:linespacing="125%" inkscape:transform-center-x="79.903062" @@ -816,17 +814,17 @@ <text xml:space="preserve" style="font-size:10px;font-style:italic;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#0000ff;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Italic" - x="438.71716" - y="239.08372" + x="477.60803" + y="231.57071" id="speciesDistinctSortedSpeciesCountValue" - sodipodi:linespacing="125%" /> + sodipodi:linespacing="125%">123465</text> <text xml:space="preserve" style="font-size:10px;font-style:italic;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#0000ff;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Sans Italic" - x="663.29871" - y="239.08372" + x="730.47382" + y="232.45459" id="benthosDistinctSortedSpeciesCountValue" - sodipodi:linespacing="125%" /> + sodipodi:linespacing="125%">123465</text> <text xml:space="preserve" x="454.94089" @@ -838,18 +836,18 @@ y="-47.188046" x="455.08459" xml:space="preserve" - style="font-size:11px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;text-anchor:start;fill:#0000ff;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial">00.00kg</text> + style="font-size:11px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;text-anchor:start;fill:#0000ff;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial">123456.789 kg</text> <text xml:space="preserve" - x="554.6106" - y="61.749084" + x="608.10168" + y="52.185638" id="catchTotalSortedCarousselWeightLabel" style="font-size:10px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;text-anchor:start;fill:#0000ff;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial">Carrousel</text> <text id="catchTotalSortedCarousselWeightValue" - y="76.741081" - x="553.41431" + y="67.177635" + x="606.9054" xml:space="preserve" - style="font-size:11px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;text-anchor:start;fill:#0000ff;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial">00.00kg</text> + style="font-size:11px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;text-anchor:start;fill:#0000ff;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial">123456.789 kg</text> </g> </svg> 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 d9182b5..d8a182f 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 @@ -148,13 +148,16 @@ tutti.config.option.site.url.shortLabel= tutti.config.option.tmp.directory.shortLabel= tutti.config.option.tremieCarousselVessel.shortLabel= tutti.config.option.ui.color.alternateRow.shortLabel= +tutti.config.option.ui.color.benthos.shortLabel= tutti.config.option.ui.color.blockingLayer.shortLabel= +tutti.config.option.ui.color.catch.shortLabel= tutti.config.option.ui.color.cellWithValue.shortLabel= tutti.config.option.ui.color.computedWeights.shortLabel= tutti.config.option.ui.color.rowInvalid.shortLabel= 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.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 c01ebb9..9fa26be 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 @@ -130,13 +130,16 @@ tutti.config.option.site.url.shortLabel=URL du site technique tutti.config.option.tmp.directory.shortLabel=Répertoire temporaire tutti.config.option.tremieCarousselVessel.shortLabel=Navire ayant un carrousel et une trémie tutti.config.option.ui.color.alternateRow.shortLabel=Couleur alternée +tutti.config.option.ui.color.benthos.shortLabel=Couleur des libellés de benthos tutti.config.option.ui.color.blockingLayer.shortLabel=Couleur d'attente +tutti.config.option.ui.color.catch.shortLabel=Couleur des libellés de capture tutti.config.option.ui.color.cellWithValue.shortLabel=Couleur cellule avec donnée tutti.config.option.ui.color.computedWeights.shortLabel=Couleur de valeur calculée tutti.config.option.ui.color.rowInvalid.shortLabel=Couleur d'une ligne invalide tutti.config.option.ui.color.rowReadOnly.shortLabel=Couleur d'une cellule en lecture seule 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 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>.