[Tutti-commits] 01/01: resize text boxes dynamically

16 Jan 2015

This is an automated email from the git hooks/post-receive script.

New commit to branch feature/5823 in repository tutti.

See http://git.codelutin.com/tutti.git

commit a000b7ec0b38dd8eec7c5af781281bc851ab7430
Author: Kevin Morin <morin@codelutin.com>
Date:   Fri Jan 16 16:26:36 2015 +0100

    resize text boxes dynamically
---
 .../operation/catches/EditCatchesUIHandler.java    |  56 +-
 tutti-ui-swing/src/main/resources/EcranResume.svg  | 561 ++++++++-------------
 .../resources/i18n/tutti-ui-swing_fr_FR.properties |   4 +-
 3 files changed, 249 insertions(+), 372 deletions(-)

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 3e6aaeb..f649c4b 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
@@ -44,8 +44,16 @@ import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor;
 import fr.ifremer.tutti.ui.swing.util.TuttiUI;
 import jaxx.runtime.swing.CardLayout2Ext;
 import jaxx.runtime.validator.swing.SwingValidator;
+import org.apache.batik.bridge.BridgeContext;
+import org.apache.batik.bridge.DocumentLoader;
+import org.apache.batik.bridge.GVTBuilder;
 import org.apache.batik.bridge.UpdateManagerAdapter;
+import org.apache.batik.bridge.UserAgent;
+import org.apache.batik.bridge.UserAgentAdapter;
 import org.apache.batik.dom.svg.SAXSVGDocumentFactory;
+import org.apache.batik.dom.svg.SVGOMRectElement;
+import org.apache.batik.dom.svg.SVGOMTextElement;
+import org.apache.batik.gvt.GraphicsNode;
 import org.apache.batik.swing.JSVGCanvas;
 import org.apache.batik.swing.svg.SVGDocumentLoaderAdapter;
 import org.apache.batik.swing.svg.SVGDocumentLoaderEvent;
@@ -60,6 +68,8 @@ import org.w3c.dom.Element;
 import org.w3c.dom.css.CSSStyleDeclaration;
 import org.w3c.dom.events.EventListener;
 import org.w3c.dom.events.EventTarget;
+import org.w3c.dom.svg.SVGDocument;
+import org.w3c.dom.svg.SVGRect;
 import org.w3c.dom.svg.SVGStylable;
 
 import javax.swing.*;
@@ -227,6 +237,13 @@ public class EditCatchesUIHandler extends AbstractTuttiTabContainerUIHandler<Edi
             URL url = Resource.getURL("EcranResume.svg");
             svgDocument = f.createDocument(url.toString());
 
+            canvas = new JSVGCanvas();
+            ui.getSvgCanvasPanel().add(canvas, BorderLayout.CENTER);
+            canvas.setRecenterOnResize(true);
+
+            canvas.setDocumentState(JSVGCanvas.ALWAYS_DYNAMIC);
+            canvas.setDocument(svgDocument);
+
             initSvgField(CatchBatch.PROPERTY_CATCH_TOTAL_WEIGHT, getModel().getCatchTotalComputedOrNotWeight(), catchWeightUnit);
             initSvgField(CatchBatch.PROPERTY_CATCH_TOTAL_REJECTED_WEIGHT, getModel().getCatchTotalRejectedComputedOrNotWeight(), catchWeightUnit);
             initSvgField(CatchBatch.PROPERTY_SPECIES_TOTAL_SORTED_WEIGHT, getModel().getSpeciesTotalSortedComputedOrNotWeight(), speciesWeightUnit);
@@ -234,7 +251,7 @@ public class EditCatchesUIHandler extends AbstractTuttiTabContainerUIHandler<Edi
             initSvgField(CatchBatch.PROPERTY_MARINE_LITTER_TOTAL_WEIGHT, getModel().getMarineLitterTotalComputedOrNotWeight(), marineLitterWeightUnit);
 
             initSvgField(CatchBatch.PROPERTY_CATCH_TOTAL_SORTED_COMPUTED_WEIGHT, catchWeightUnit);
-    //        initSvgField("value_vrac_trie", getModel().getCatchTotalComputedOrNotWeight());
+            //        initSvgField("value_vrac_trie", getModel().getCatchTotalComputedOrNotWeight());
             initSvgField(CatchBatch.PROPERTY_CATCH_TOTAL_UNSORTED_COMPUTED_WEIGHT, catchWeightUnit);
 
             initSvgField(CatchBatch.PROPERTY_SPECIES_TOTAL_COMPUTED_WEIGHT, speciesWeightUnit);
@@ -245,13 +262,6 @@ public class EditCatchesUIHandler extends AbstractTuttiTabContainerUIHandler<Edi
             initSvgField(CatchBatch.PROPERTY_BENTHOS_TOTAL_UNSORTED_COMPUTED_WEIGHT, benthosWeightUnit);
             initSvgField(CatchBatch.PROPERTY_BENTHOS_TOTAL_SAMPLE_SORTED_COMPUTED_WEIGHT, benthosWeightUnit);
 
-            canvas = new JSVGCanvas();
-            ui.getSvgCanvasPanel().add(canvas, BorderLayout.CENTER);
-            canvas.setRecenterOnResize(true);
-
-            canvas.setDocumentState(JSVGCanvas.ALWAYS_DYNAMIC);
-            canvas.setDocument(svgDocument);
-
         } catch (Exception e) {
             if (log.isErrorEnabled()) {
                 log.error("error while initializing the resume background", e);
@@ -268,7 +278,7 @@ public class EditCatchesUIHandler extends AbstractTuttiTabContainerUIHandler<Edi
                                 final ComputableData<Float> computableData,
                                 final WeightUnit weightUnit) {
 
-
+        log.info("init " + property + " field");
         Element labelElement = svgDocument.getElementById(property + "Label");
         labelElement.setTextContent(t("tutti.editCatchBatch.field." + property));
 
@@ -316,16 +326,24 @@ public class EditCatchesUIHandler extends AbstractTuttiTabContainerUIHandler<Edi
         canvas.getUpdateManager().getUpdateRunnableQueue().invokeLater
                 (new Runnable() {
                     public void run() {
+                        log.info("update " + id + " field");
+
                         Element element = svgDocument.getElementById(id + "Value");
                         if (element == null) {
                             return;
                         }
+
+                        Element rectElement = svgDocument.getElementById(id + "Rect");
+                        SVGOMRectElement rectElem = (SVGOMRectElement) rectElement;
+                        SVGRect bbox = rectElem.getBBox();
+                        Float x = Float.valueOf(bbox.getX());
+
                         //TODO i18n ?
                         String textContent;
                         if (value != null) {
                             textContent = Weights.getWeightStringValue(value) + " " + unit.getShortLabel();
                         } else {
-                            textContent = "";
+                            textContent = null;
                         }
                         element.setTextContent(textContent);
 
@@ -336,6 +354,23 @@ public class EditCatchesUIHandler extends AbstractTuttiTabContainerUIHandler<Edi
                         String computedColor = "#"+Integer.toHexString(colorComputedWeights.getRGB()).substring(2);
                         style.setProperty("fill", computed ? computedColor : "#000000", null);
                         style.setProperty("font-style", computed ? "italic" : "normal", null);
+
+                        SVGOMTextElement textElem = (SVGOMTextElement) element;
+                        bbox = textElem.getBBox();
+                        if (bbox != null) {
+                            float width = bbox.getWidth() + 20;
+                            rectElement.setAttribute("width", new Float(width).toString());
+                            element.setAttribute("x", String.valueOf(x + width / 2));
+                        }
+
+                        Element labelElement = svgDocument.getElementById(id + "Label");
+                        Element labelRectElement = svgDocument.getElementById(id + "LabelRect");
+                        SVGOMTextElement labelTextElem = (SVGOMTextElement) labelElement;
+                        bbox = labelTextElem.getBBox();
+                        float width = bbox.getWidth() + 20;
+                        labelRectElement.setAttribute("width", new Float(width).toString());
+                        labelRectElement.setAttribute("x", String.valueOf(x - width));
+                        labelElement.setAttribute("x", String.valueOf(x - width / 2));
                     }
                 });
     }
@@ -352,6 +387,7 @@ public class EditCatchesUIHandler extends AbstractTuttiTabContainerUIHandler<Edi
     @Override
     protected JComponent getComponentToFocus() {
         JComponent result;
+        //TODO remove when svg resume is done?
         if (getModel().getCatchTotalComputedWeight() != null) {
             // if there is a computed value, never focus inside the component
             // see http://forge.codelutin.com/issues/4151
diff --git a/tutti-ui-swing/src/main/resources/EcranResume.svg b/tutti-ui-swing/src/main/resources/EcranResume.svg
index 8db5f77..bd63ad6 100644
--- a/tutti-ui-swing/src/main/resources/EcranResume.svg
+++ b/tutti-ui-swing/src/main/resources/EcranResume.svg
@@ -11,7 +11,7 @@
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="700"
    height="350"
-   viewport="0 0 700 350"
+   viewport="0 0 20 10"
    id="svg2985"
    preserveAspectRatio="xMidYMid"
    version="1.1"
@@ -536,16 +536,16 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.4142136"
-     inkscape:cx="362.42753"
-     inkscape:cy="189.00224"
-     inkscape:current-layer="svg2985"
+     inkscape:zoom="2.8284272"
+     inkscape:cx="318.06599"
+     inkscape:cy="160.32352"
+     inkscape:current-layer="layer2"
      id="namedview2989"
      showgrid="false"
-     inkscape:window-width="1280"
-     inkscape:window-height="741"
-     inkscape:window-x="0"
-     inkscape:window-y="307"
+     inkscape:window-width="1920"
+     inkscape:window-height="1048"
+     inkscape:window-x="1280"
+     inkscape:window-y="0"
      inkscape:window-maximized="1"
      units="px"
      showguides="false"
@@ -571,7 +571,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -600,37 +600,33 @@
        id="rect4276"
        width="1.2082677"
        height="31.414213"
-       x="403.35995"
-       y="32.215076" />
+       x="406.18842"
+       y="6.759233" />
     <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;filter:url(#filter4077)"
        d="m 469.25,-168.90552 0,-29.5 131.3125,0 -0.1875,-15 0.1875,14.98614 130.1875,-0.48614 0,31"
        id="path3976"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccccc"
-       transform="matrix(1.4580208,0,0,0.99343887,-279.712,37.283896)" />
+       transform="matrix(1.4580208,0,0,0.99343887,-262.74144,13.949373)" />
     <g
        id="catchTotalWeight"
-       style="filter:url(#filter4556)">
+       style="filter:url(#filter4556)"
+       transform="translate(-23.334523,-23.688076)">
       <rect
          y="-206.33543"
          x="480.88577"
          height="30.929434"
          width="228.42943"
-         id="rect4007"
+         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" />
       <text
          sodipodi:linespacing="125%"
-         id=""
+         id="catchTotalWeightLabel"
          y="-186.02356"
          x="556.13354"
-         style="font-size:13.53369236px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
-         xml:space="preserve"><tspan
-           style="font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial"
-           id="catchTotalWeightLabel"
-           y="-186.02356"
-           x="556.13354"
-           sodipodi:role="line">CAPTURE TOTALE</tspan></text>
+         style="font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;text-anchor:middle;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"
          id="catchTotalWeightRect"
@@ -640,20 +636,16 @@
          y="-206.50395" />
       <text
          xml:space="preserve"
-         style="font-size:14.31538868px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Arial"
          x="671.99567"
          y="-186.02356"
-         id="text3822"
-         sodipodi:linespacing="125%"><tspan
-           sodipodi:role="line"
-           x="671.99567"
-           y="-186.02356"
-           id="catchTotalWeightValue"
-           style="font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial">00.00 kg</tspan></text>
+         id="catchTotalWeightValue"
+         style="font-size:14px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;text-anchor:middle;fill:#000000;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial"
+         sodipodi:linespacing="125%" />
     </g>
     <g
        id="g4760"
-       style="filter:url(#filter4770)">
+       style="filter:url(#filter4770)"
+       transform="translate(3.1819804,-21.213203)">
       <g
          transform="translate(-82.899508,38.534812)"
          id="g4095">
@@ -668,16 +660,10 @@
              y="-168.96303" />
           <text
              xml:space="preserve"
-             style="font-size:11.61303043px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
              x="453.71802"
              y="-151.49626"
-             id="text4025"
-             sodipodi:linespacing="125%"><tspan
-               sodipodi:role="line"
-               x="453.71802"
-               y="-151.49626"
-               id="catchTotalSortedComputedWeightLabel"
-               style="font-size:12.01316166px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial">VRAC</tspan></text>
+             id="catchTotalSortedComputedWeightLabel"
+             style="font-size:12.01316166px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial">VRAC</text>
           <rect
              y="-169.07013"
              x="501.44632"
@@ -686,61 +672,45 @@
              id="rect4029"
              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" />
           <text
-             sodipodi:linespacing="125%"
-             id="text4031"
+             id="49626"
              y="-151.49626"
              x="531.71814"
-             style="font-size:12.28379059px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Arial"
-             xml:space="preserve"><tspan
-               style="font-size:12.01316166px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial"
-               id="catchTotalSortedComputedWeightValue"
-               y="-151.49626"
-               x="531.71814"
-               sodipodi:role="line">00.00 kg</tspan></text>
+             xml:space="preserve"
+             style="font-size:12.01316166px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial" />
         </g>
       </g>
     </g>
     <g
        id="g4568"
-       style="filter:url(#filter4576)">
+       style="filter:url(#filter4576)"
+       transform="translate(2.1213203,-22.273863)">
       <rect
          y="-130.42822"
          x="708.43945"
          height="26.614988"
          width="154.08636"
-         id="rect4051"
+         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" />
       <text
          sodipodi:linespacing="125%"
-         id="text4053"
+         id="catchTotalUnsortedComputedWeightLabel"
          y="-112.96145"
          x="754.46497"
-         style="font-size:11.61303043px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
-         xml:space="preserve"><tspan
-           style="font-size:12.01316166px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial"
-           id="catchTotalUnsortedComputedWeightLabel"
-           y="-112.96145"
-           x="754.46497"
-           sodipodi:role="line">HORS VRAC</tspan></text>
+         xml:space="preserve"
+         style="font-size:12.01316166px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:125%;text-anchor:middle;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"
-         id="rect4057"
+         id="catchTotalUnsortedComputedWeightRect"
          width="62.439663"
          height="26.829227"
          x="800.19324"
          y="-130.53532" />
       <text
          xml:space="preserve"
-         style="font-size:12.28379059px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Arial"
          x="830.46509"
          y="-112.96145"
-         id="text4059"
-         sodipodi:linespacing="125%"><tspan
-           sodipodi:role="line"
-           x="830.46509"
-           y="-112.96145"
-           id="catchTotalUnsortedComputedWeightValue"
-           style="font-size:12.01316166px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial">00.00 kg</tspan></text>
+         id="catchTotalUnsortedComputedWeightValue"
+         style="font-size:12.01316166px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial">00.00 kg</text>
     </g>
     <path
        sodipodi:type="star"
@@ -757,11 +727,11 @@
        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="translate(-40.015625,-216.71906)"
+       transform="translate(-23.045062,-240.05358)"
        inkscape:transform-center-y="1.6001575" />
     <path
        inkscape:transform-center-y="1.6001575"
-       transform="translate(341.2428,-216.71906)"
+       transform="translate(358.21336,-240.05358)"
        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"
@@ -776,44 +746,28 @@
        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;filter:url(#filter4065)"
        sodipodi:type="star" />
-    <text
-       xml:space="preserve"
-       style="font-size:20px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
-       x="772.21082"
-       y="-146.5679"
-       id="text4116"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan4118"
-         x="772.21082"
-         y="-146.5679" /></text>
-    <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;filter:url(#filter4619)"
-       id="rect4126"
-       width="154.08636"
-       height="26.614988"
-       x="409.6925"
-       y="-168.96303"
-       transform="matrix(0.87388867,0,0,0.84621998,278.48772,84.686693)" />
     <g
-       id="g4803">
+       id="g4803"
+       transform="translate(-9.1923873,-21.920309)">
+      <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;filter:url(#filter4619)"
+         id="speciesTotalUnsortedComputedWeightLabelRect"
+         width="154.08636"
+         height="26.614988"
+         x="409.6925"
+         y="-168.96303"
+         transform="matrix(0.87388867,0,0,0.84621998,278.48772,84.686693)" />
       <text
          transform="matrix(0.84647606,0,0,0.84647606,294.30529,84.726553)"
-         sodipodi:linespacing="125%"
-         id="text4128"
          y="-151.49626"
          x="453.71802"
-         style="font-size:11.61303043px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter4619);font-family:Sans"
-         xml:space="preserve"><tspan
-           style="font-size:10.63231468px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial"
-           id="speciesTotalUnsortedComputedWeightLabel"
-           y="-151.49626"
-           x="453.71802"
-           sodipodi:role="line">Espèces observées</tspan></text>
+         xml:space="preserve"
+         id="speciesTotalUnsortedComputedWeightLabel"
+         style="font-size:10.63231468px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial">Espèces observées</text>
       <rect
          transform="matrix(0.84647606,0,0,0.84647606,294.30529,84.726553)"
          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;filter:url(#filter4619)"
-         id="rect4132"
+         id="speciesTotalUnsortedComputedWeightRect"
          width="62.439663"
          height="26.829227"
          x="501.44632"
@@ -821,20 +775,15 @@
       <text
          transform="matrix(0.84647606,0,0,0.84647606,294.30529,84.726553)"
          xml:space="preserve"
-         style="font-size:12.28379059px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter4619);font-family:Sans;-inkscape-font-specification:Arial"
          x="531.71814"
          y="-151.49626"
-         id="text4134"
-         sodipodi:linespacing="125%"><tspan
-           sodipodi:role="line"
-           x="531.71814"
-           y="-151.49626"
-           id="speciesTotalUnsortedComputedWeightValue"
-           style="font-size:12.01316166px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial">00.00 kg</tspan></text>
+         id="speciesTotalUnsortedComputedWeightValue"
+         style="font-size:12.01316166px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial">00.00 kg</text>
     </g>
     <g
        id="g4588"
-       style="filter:url(#filter4597)">
+       style="filter:url(#filter4597)"
+       transform="translate(18.384776,-21.920309)">
       <g
          transform="matrix(0.84647606,0,0,0.84647606,135.37037,23.780278)"
          id="g4154">
@@ -843,39 +792,27 @@
            x="783.69177"
            height="26.614988"
            width="154.08636"
-           id="rect4138"
+           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" />
         <text
-           sodipodi:linespacing="125%"
-           id="text4140"
+           id="benthosTotalUnsortedComputedWeightLabel"
            y="-79.496262"
            x="829.71729"
-           style="font-size:11.61303043px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
-           xml:space="preserve"><tspan
-             style="font-size:10.63231468px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial"
-             id="benthosTotalUnsortedComputedWeightLabel"
-             y="-79.496262"
-             x="829.71729"
-             sodipodi:role="line">Benthos observés</tspan></text>
+           xml:space="preserve"
+           style="font-size:10.63231468px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;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"
-           id="rect4144"
+           id="benthosTotalUnsortedComputedWeightRect"
            width="62.439663"
            height="26.829227"
            x="875.44556"
            y="-97.070129" />
         <text
            xml:space="preserve"
-           style="font-size:12.28379059px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Arial"
            x="905.71741"
            y="-79.496262"
-           id="text4146"
-           sodipodi:linespacing="125%"><tspan
-             sodipodi:role="line"
-             x="905.71741"
-             y="-79.496262"
-             id="benthosTotalUnsortedComputedWeightValue"
-             style="font-size:12.01316166px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial">00.00 kg</tspan></text>
+           id="benthosTotalUnsortedComputedWeightValue"
+           style="font-size:12.01316166px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial">00.00 kg</text>
       </g>
     </g>
     <path
@@ -884,10 +821,10 @@
        id="path4120"
        d="m 599.60276,-96.90552 0,-29.5 131.3125,0 -0.1875,-15 0.1875,14.98614 130.1875,-0.48614 0,31"
        style="fill:none;stroke:#006bba;stroke-width:1.77165353;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4077)"
-       transform="matrix(0.59793466,0,0,1,348.75002,38.534812)" />
+       transform="matrix(0.71136481,0,0,0.99776526,283.05333,15.995784)" />
     <path
        inkscape:transform-center-y="1.576596"
-       transform="matrix(1.045689,0,0,0.98527645,242.71754,-143.47482)"
+       transform="matrix(1.045689,0,0,0.98527645,244.83886,-167.87)"
        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"
@@ -918,34 +855,29 @@
        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,399.05887,-143.47482)"
+       transform="matrix(1.045689,0,0,0.98527645,430.87867,-167.1629)"
        inkscape:transform-center-y="1.576596"
        inkscape:transform-center-x="1.1708959e-05" />
     <g
        id="g4738"
-       style="filter:url(#filter4748)">
+       style="filter:url(#filter4748)"
+       transform="translate(5.3033007,-21.920309)">
       <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"
-           id="rect4174"
+           id="catchTotalRejectedWeightLabelRect"
            width="154.08636"
            height="26.614988"
            x="409.6925"
            y="-168.96303" />
         <text
            xml:space="preserve"
-           style="font-size:11.61303043px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
            x="453.71802"
            y="-151.49626"
-           id="text4176"
-           sodipodi:linespacing="125%"><tspan
-             sodipodi:role="line"
-             x="453.71802"
-             y="-151.49626"
-             id="catchTotalRejectedWeightLabel"
-             style="font-size:10.63231468px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial">Vrac non trié</tspan></text>
+           id="catchTotalRejectedWeightLabel"
+           style="font-size:10.63231468px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial">Vrac non trié</text>
         <rect
            y="-169.07013"
            x="501.44632"
@@ -954,22 +886,17 @@
            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" />
         <text
-           sodipodi:linespacing="125%"
-           id="text4182"
+           xml:space="preserve"
+           style="font-size:12.01316166px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial"
+           id="catchTotalRejectedWeightValue"
            y="-151.49626"
-           x="531.71814"
-           style="font-size:12.28379059px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Arial"
-           xml:space="preserve"><tspan
-             style="font-size:12.01316166px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial"
-             id="catchTotalRejectedWeightValue"
-             y="-151.49626"
-             x="531.71814"
-             sodipodi:role="line">00.00 kg</tspan></text>
+           x="531.71814">00.00 kg</text>
       </g>
     </g>
     <g
        id="g4717"
-       style="filter:url(#filter4726)">
+       style="filter:url(#filter4726)"
+       transform="translate(4.9497475,-22.627416)">
       <g
          id="g4186"
          transform="matrix(0.84647606,0,0,0.84647606,-245.9198,23.780278)">
@@ -982,16 +909,10 @@
            y="-96.963028" />
         <text
            xml:space="preserve"
-           style="font-size:11.61303043px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
            x="829.71729"
            y="-79.496262"
-           id="text4190"
-           sodipodi:linespacing="125%"><tspan
-             sodipodi:role="line"
-             x="829.71729"
-             y="-79.496262"
-             id="label_vrac_trie"
-             style="font-size:10.63231468px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial">Vrac trié</tspan></text>
+           id="label_vrac_trie"
+           style="font-size:10.63231468px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial">Vrac trié</text>
         <rect
            y="-97.070129"
            x="875.44556"
@@ -1000,21 +921,15 @@
            id="rect4194"
            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" />
         <text
-           sodipodi:linespacing="125%"
-           id="text4196"
            y="-79.496262"
            x="905.71741"
-           style="font-size:12.28379059px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Arial"
-           xml:space="preserve"><tspan
-             style="font-size:12.01316166px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial"
-             id="value_vrac_trie"
-             y="-79.496262"
-             x="905.71741"
-             sodipodi:role="line">00.00 kg</tspan></text>
+           xml:space="preserve"
+           style="font-size:12.01316166px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial"
+           id="value_vrac_trie">00.00 kg</text>
       </g>
     </g>
     <path
-       transform="matrix(0.59793466,0,0,1,-32.540143,38.534812)"
+       transform="matrix(0.59793466,0,0,1,-15.216027,16.614503)"
        style="fill:none;stroke:#006bba;stroke-width:1.77165353;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4077)"
        d="m 599.60276,-96.90552 0,-29.5 131.3125,0 -0.1875,-15 0.1875,14.98614 130.1875,-0.48614 0,31"
        id="path4200"
@@ -1036,12 +951,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,-138.57263,-143.47482)"
+       transform="matrix(1.045689,0,0,0.98527645,-121.60207,-166.80934)"
        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,17.768707,-143.47482)"
+       transform="matrix(1.045689,0,0,0.98527645,34.73927,-166.80934)"
        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"
@@ -1058,7 +973,8 @@
        sodipodi:type="star" />
     <g
        id="g4695"
-       style="filter:url(#filter4705)">
+       style="filter:url(#filter4705)"
+       transform="translate(-8.4852803,-24.395183)">
       <g
          id="g4206"
          transform="matrix(0.84647606,0,0,0.84647606,-8.9848728,152.72655)">
@@ -1069,20 +985,14 @@
              x="409.6925"
              height="26.614988"
              width="154.08636"
-             id="rect4210"
+             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" />
           <text
-             sodipodi:linespacing="125%"
-             id="text4212"
+             xml:space="preserve"
+             style="font-size:10.63231468px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial"
+             id="speciesTotalSortedWeightLabel"
              y="-151.49626"
-             x="453.71802"
-             style="font-size:11.61303043px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
-             xml:space="preserve"><tspan
-               style="font-size:10.63231468px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial"
-               id="speciesTotalSortedWeightLabel"
-               y="-151.49626"
-               x="453.71802"
-               sodipodi:role="line">Espèce trié</tspan></text>
+             x="453.71802">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"
              id="speciesTotalSortedWeightRect"
@@ -1092,29 +1002,24 @@
              y="-169.07013" />
           <text
              xml:space="preserve"
-             style="font-size:12.28379059px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Arial"
              x="531.71814"
              y="-151.49626"
-             id="text4218"
-             sodipodi:linespacing="125%"><tspan
-               sodipodi:role="line"
-               x="531.71814"
-               y="-151.49626"
-               id="speciesTotalSortedWeightValue"
-               style="font-size:12.01316166px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial">00.00 kg</tspan></text>
+             id="speciesTotalSortedWeightValue"
+             style="font-size:12.01316166px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial">00.00 kg</text>
         </g>
       </g>
     </g>
     <rect
-       y="32.215076"
-       x="559.70123"
+       y="7.8198929"
+       x="591.16742"
        height="31.414213"
        width="1.2082677"
        id="rect4338"
        style="fill:#006bba;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter4278)" />
     <g
        id="g4652"
-       style="filter:url(#filter4661)">
+       style="filter:url(#filter4661)"
+       transform="translate(18.384776,-22.627416)">
       <g
          transform="matrix(0.84647606,0,0,0.84647606,-167.9198,91.780282)"
          id="benthosTotalSortedWeight">
@@ -1123,39 +1028,27 @@
            x="783.69177"
            height="26.614988"
            width="154.08636"
-           id="rect4224"
+           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" />
         <text
-           sodipodi:linespacing="125%"
-           id="text4226"
+           xml:space="preserve"
+           style="font-size:10.63231468px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial"
+           id="benthosTotalSortedWeightLabel"
            y="-79.496262"
-           x="829.71729"
-           style="font-size:11.61303043px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
-           xml:space="preserve"><tspan
-             style="font-size:10.63231468px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial"
-             id="benthosTotalSortedWeightLabel"
-             y="-79.496262"
-             x="829.71729"
-             sodipodi:role="line">Benthos isolé</tspan></text>
+           x="829.71729">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"
-           id="benthosTotalSortedWeightLabel"
+           id="benthosTotalSortedWeightRect"
            width="62.439663"
            height="26.829227"
            x="875.44556"
            y="-97.070129" />
         <text
            xml:space="preserve"
-           style="font-size:12.28379059px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Arial"
            x="905.71741"
            y="-79.496262"
-           id="text4232"
-           sodipodi:linespacing="125%"><tspan
-             sodipodi:role="line"
-             x="905.71741"
-             y="-79.496262"
-             id="benthosTotalSortedWeightValue"
-             style="font-size:12.01316166px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial">00.00 kg</tspan></text>
+           id="benthosTotalSortedWeightValue"
+           style="font-size:12.01316166px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial">00.00 kg</text>
       </g>
     </g>
     <path
@@ -1164,10 +1057,10 @@
        id="path4236"
        d="m 599.60276,-96.90552 0,-29.5 131.3125,0 -0.1875,-15 0.1875,14.98614 130.1875,-0.48614 0,31"
        style="fill:none;stroke:#006bba;stroke-width:1.77165353;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter4077)"
-       transform="matrix(0.59793466,0,0,1,45.459857,106.53481)" />
+       transform="matrix(0.70371331,0,0,0.99790992,-14.471753,82.598734)" />
     <path
        inkscape:transform-center-y="1.576596"
-       transform="matrix(1.045689,0,0,0.98527645,-60.572628,-75.474818)"
+       transform="matrix(1.045689,0,0,0.98527645,-57.037093,-100.5771)"
        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"
@@ -1198,59 +1091,48 @@
        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.768712,-75.474818)"
+       transform="matrix(1.045689,0,0,0.98527645,126.88141,-98.455793)"
        inkscape:transform-center-y="1.576596"
        inkscape:transform-center-x="1.1708959e-05" />
     <g
        id="g4631"
-       style="filter:url(#filter4640)">
+       style="filter:url(#filter4640)"
+       transform="translate(18.384776,-26.516503)">
       <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"
-           id="rect4244"
+           id="benthosTotalSampleSortedComputedWeightLabelRect"
            width="154.08636"
            height="26.614988"
            x="783.69177"
            y="-96.963028" />
         <text
            xml:space="preserve"
-           style="font-size:11.61303043px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
            x="829.71729"
            y="-79.496262"
-           id="text4246"
-           sodipodi:linespacing="125%"><tspan
-             sodipodi:role="line"
-             x="829.71729"
-             y="-79.496262"
-             id="benthosTotalSampleSortedComputedWeightLabel"
-             style="font-size:10.63231468px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial">Vrac observé</tspan></text>
+           id="benthosTotalSampleSortedComputedWeightLabel"
+           style="font-size:10.63231468px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial">Vrac observé</text>
         <rect
            y="-97.070129"
            x="875.44556"
            height="26.829227"
            width="62.439663"
-           id="rect4250"
+           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" />
         <text
-           sodipodi:linespacing="125%"
-           id="text4252"
+           xml:space="preserve"
+           style="font-size:12.01316166px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial"
+           id="benthosTotalSampleSortedComputedWeightValue"
            y="-79.496262"
-           x="905.71741"
-           style="font-size:12.28379059px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Arial"
-           xml:space="preserve"><tspan
-             style="font-size:12.01316166px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial"
-             id="benthosTotalSampleSortedComputedWeightValue"
-             y="-79.496262"
-             x="905.71741"
-             sodipodi:role="line">00.00 kg</tspan></text>
+           x="905.71741">00.00 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,95.768712,-15.474818)"
+       transform="matrix(1.045689,0,0,0.98527645,127.58851,-43.405535)"
        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"
@@ -1267,48 +1149,37 @@
        sodipodi:type="star" />
     <g
        id="g4673"
-       style="filter:url(#filter4683)">
+       style="filter:url(#filter4683)"
+       transform="translate(-8.4852803,-26.162951)">
       <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"
-           id="rect4262"
+           id="speciesTotalSampleSortedComputedWeightLabelRect"
            width="154.08636"
            height="26.614988"
            x="409.6925"
            y="-168.96303" />
         <text
            xml:space="preserve"
-           style="font-size:11.61303043px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
            x="453.71802"
            y="-151.49626"
-           id="text4264"
-           sodipodi:linespacing="125%"><tspan
-             sodipodi:role="line"
-             x="453.71802"
-             y="-151.49626"
-             id="speciesTotalSampleSortedComputedWeightLabel"
-             style="font-size:10.63231468px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial">Vrac observé</tspan></text>
+           id="speciesTotalSampleSortedComputedWeightLabel"
+           style="font-size:10.63231468px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial">Vrac observé</text>
         <rect
            y="-169.07013"
            x="501.44632"
            height="26.829227"
            width="62.439663"
-           id="rect4258"
+           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" />
         <text
-           sodipodi:linespacing="125%"
-           id="text4270"
+           xml:space="preserve"
+           style="font-size:12.01316166px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial"
+           id="speciesTotalSampleSortedComputedWeightValue"
            y="-151.49626"
-           x="531.71814"
-           style="font-size:12.28379059px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Arial"
-           xml:space="preserve"><tspan
-             style="font-size:12.01316166px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial"
-             id="speciesTotalSampleSortedComputedWeightValue"
-             y="-151.49626"
-             x="531.71814"
-             sodipodi:role="line">00.00 kg</tspan></text>
+           x="531.71814">00.00 kg</text>
       </g>
     </g>
     <path
@@ -1327,130 +1198,100 @@
        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,-60.572628,-15.474818)"
+       transform="matrix(1.045689,0,0,0.98527645,-57.7442,-43.405535)"
        inkscape:transform-center-y="1.576596" />
     <g
-       id="g4456"
-       transform="matrix(0.88820049,0,0,0.88820049,117.42009,18.212699)"
-       style="filter:url(#filter4536)">
-
-       <g id="marineLitterTotalWeight">
-          <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"
-             id="rect4340"
-             width="170.6974"
-             height="23.112495"
-             x="765.68683"
-             y="-240.95483" />
-          <text
-             xml:space="preserve"
-             style="font-size:10.11326027px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
-             x="821.91687"
-             y="-225.77646"
-             id="text4342"
-             sodipodi:linespacing="125%"><tspan
-               sodipodi:role="line"
-               x="821.91687"
-               y="-225.77646"
-               id="marineLitterTotalWeightLabel"
-               style="font-size:10.4617157px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial">Total macrodéchets</tspan></text>
-          <rect
-             y="-241.08076"
-             x="882.13428"
-             height="23.364353"
-             width="54.375862"
-             id="marineLitterTotalWeightRect"
-             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" />
-          <text
-             sodipodi:linespacing="125%"
-             id="text4348"
-             y="-225.77646"
-             x="908.49664"
-             style="font-size:10.69739437px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Arial"
-             xml:space="preserve"><tspan
-               style="font-size:10.4617157px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial"
-               id="marineLitterTotalWeightValue"
-               y="-225.77646"
-               x="908.49664"
-               sodipodi:role="line">00.00 kg</tspan></text>
-      </g>
-
+       style="filter:url(#filter4536)"
+       id="marineLitterTotalWeight"
+       transform="matrix(0.88820049,0,0,0.88820049,44.941652,259.07094)">
       <rect
-         y="-262.64963"
+         y="-240.95483"
          x="765.68683"
          height="23.112495"
          width="170.6974"
-         id="rect4352"
+         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" />
       <text
-         sodipodi:linespacing="125%"
-         id="text4354"
-         y="-247.47125"
+         style="font-size:10.4617157px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial"
+         id="marineLitterTotalWeightLabel"
+         y="-225.77646"
          x="821.91687"
-         style="font-size:10.11326027px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
-         xml:space="preserve"><tspan
-           style="font-size:10.4617157px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial"
-           id="benthosTotalComputedWeightLabel"
-           y="-247.47125"
-           x="821.91687"
-           sodipodi:role="line">Total Benthos</tspan></text>
+         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"
-         id="rect4358"
+         id="marineLitterTotalWeightRect"
          width="54.375862"
          height="23.364353"
          x="882.13428"
-         y="-262.77554" />
+         y="-241.08076" />
       <text
-         xml:space="preserve"
-         style="font-size:10.69739437px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Arial"
          x="908.49664"
-         y="-247.47125"
-         id="text4360"
-         sodipodi:linespacing="125%"><tspan
-           sodipodi:role="line"
-           x="908.49664"
-           y="-247.47125"
-           id="benthosTotalComputedWeightValue"
-           style="font-size:10.4617157px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial">00.00 kg</tspan></text>
+         y="-225.77646"
+         id="marineLitterTotalWeightValue"
+         style="font-size:10.4617157px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial"
+         xml:space="preserve">00.00 kg</text>
+    </g>
+    <g
+       style="filter:url(#filter4536)"
+       id="benthosTotalComputedWeight"
+       transform="matrix(0.88820049,0,0,0.88820049,44.941652,252.44181)">
       <rect
-         y="-284.34442"
-         x="765.68683"
-         height="23.112495"
+         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"
+         id="benthosTotalComputedWeightLabelRect"
          width="170.6974"
-         id="rect4382"
-         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" />
+         height="23.112495"
+         x="765.68683"
+         y="-262.64963" />
       <text
-         sodipodi:linespacing="125%"
-         id="text4384"
-         y="-269.16605"
          x="821.91687"
-         style="font-size:10.11326027px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
-         xml:space="preserve"><tspan
-           style="font-size:10.4617157px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial"
-           id="speciesTotalComputedWeightLabel"
-           y="-269.16605"
-           x="821.91687"
-           sodipodi:role="line">Total Espèces</tspan></text>
+         y="-247.47125"
+         id="benthosTotalComputedWeightLabel"
+         style="font-size:10.4617157px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial"
+         xml:space="preserve">Total Benthos</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"
-         id="rect4388"
-         width="54.375862"
-         height="23.364353"
+         y="-262.77554"
          x="882.13428"
-         y="-284.47034" />
+         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" />
       <text
-         xml:space="preserve"
-         style="font-size:10.69739437px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans;-inkscape-font-specification:Arial"
+         style="font-size:10.4617157px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial"
+         id="benthosTotalComputedWeightValue"
+         y="-247.47125"
          x="908.49664"
+         xml:space="preserve">00.00 kg</text>
+    </g>
+    <g
+       style="filter:url(#filter4536)"
+       id="speciesTotalComputedWeight"
+       transform="matrix(0.88820049,0,0,0.88820049,44.941652,245.54752)">
+      <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"
+         id="speciesTotalComputedWeightLabelRect"
+         width="170.6974"
+         height="23.112495"
+         x="765.68683"
+         y="-284.34442" />
+      <text
+         x="821.91687"
+         y="-269.16605"
+         id="speciesTotalComputedWeightLabel"
+         style="font-size:10.4617157px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#ffffff;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial"
+         xml:space="preserve">Total Espèces</text>
+      <rect
+         y="-284.47034"
+         x="882.13428"
+         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" />
+      <text
+         style="font-size:10.4617157px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial"
+         id="speciesTotalComputedWeightValue"
          y="-269.16605"
-         id="text4390"
-         sodipodi:linespacing="125%"><tspan
-           sodipodi:role="line"
-           x="908.49664"
-           y="-269.16605"
-           id="speciesTotalComputedWeightValue"
-           style="font-size:10.4617157px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial">00.00 kg</tspan></text>
+         x="908.49664"
+         xml:space="preserve">00.00 kg</text>
     </g>
   </g>
 </svg>
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 9b5c4c8..e8dfe70 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
@@ -621,9 +621,9 @@ tutti.editCatchBatch.field.speciesTotalComputedWeight=Total Espèces
 tutti.editCatchBatch.field.speciesTotalSampleSortedComputedWeight=Vrac observé
 tutti.editCatchBatch.field.speciesTotalSampleSortedWeight=Poids VRAC trié
 tutti.editCatchBatch.field.speciesTotalSampleSortedWeight.tip=Poids total des espèces triées (poissons, crustacés etc.)
-tutti.editCatchBatch.field.speciesTotalSortedWeight=Espèces trié
+tutti.editCatchBatch.field.speciesTotalSortedWeight=Espèces isolées
 tutti.editCatchBatch.field.speciesTotalSortedWeight.tip=Poids total VRAC des espèces dans la capture (poissons, crustacés etc.)
-tutti.editCatchBatch.field.speciesTotalUnsortedComputedWeight=Espèces observé
+tutti.editCatchBatch.field.speciesTotalUnsortedComputedWeight=Espèces observées
 tutti.editCatchBatch.field.speciesTotalUnsortedWeight=Poids total HORS VRAC
 tutti.editCatchBatch.field.speciesTotalUnsortedWeight.tip=Poids total HORS VRAC des espèces dans la capture (poissons, crustacés etc.)
 tutti.editCatchBatch.field.speciesTotalWeight=Poids TOTAL

-- 
To stop receiving notification emails like this one, please contact
codelutin.com SCM administrator <admin+scm@codelutin.com>.

    

[Tutti-commits] 01/01: resize text boxes dynamically

codelutin.com scm