[Tutti-commits] 01/01: refs #6453 ajout des fractions + coloration de certains champs sous certaines conditions

26 Jan 2015

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 5022287a6e0456de1d786a0786553221e109a31d
Author: Kevin Morin <morin@codelutin.com>
Date:   Mon Jan 26 15:30:08 2015 +0100

    refs #6453 ajout des fractions + coloration de certains champs sous certaines conditions
---
 tutti-ui-swing/pom.xml                             |   4 +
 .../operation/catches/EditCatchesUIHandler.java    | 295 +++++--
 tutti-ui-swing/src/main/resources/EcranResume.svg  | 901 +++++----------------
 3 files changed, 450 insertions(+), 750 deletions(-)

diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml
index 17980a0..bb5ac18 100644
--- a/tutti-ui-swing/pom.xml
+++ b/tutti-ui-swing/pom.xml
@@ -178,6 +178,10 @@
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
     </dependency>
+    <dependency>
+      <groupId>commons-beanutils</groupId>
+      <artifactId>commons-beanutils</artifactId>
+    </dependency>
     <!-- used forApplicationUpdater -->
     <dependency>
       <groupId>commons-httpclient</groupId>
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 746dab7..2048267 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
@@ -22,6 +22,7 @@ package fr.ifremer.tutti.ui.swing.content.operation.catches;
  * #L%
  */
 
+import com.google.common.base.Function;
 import com.google.common.collect.Sets;
 import fr.ifremer.tutti.TuttiConfiguration;
 import fr.ifremer.tutti.persistence.entities.data.CatchBatch;
@@ -236,8 +237,8 @@ public class EditCatchesUIHandler extends AbstractTuttiTabContainerUIHandler<Edi
         svgDocument = f.createDocument(url.toString());
 
         canvas = new JSVGCanvas();
-        canvas.setSize(new Dimension(700, 300));
-        canvas.setMySize(new Dimension(700, 300));
+        canvas.setSize(new Dimension(1, 1));
+        canvas.setMySize(new Dimension(1, 1));
 
         getUI().getSvgCanvasPanel().add(canvas, BorderLayout.CENTER);
 
@@ -253,22 +254,91 @@ public class EditCatchesUIHandler extends AbstractTuttiTabContainerUIHandler<Edi
                 WeightUnit marineLitterWeightUnit = config.getMarineLitterWeightUnit();
 
                 initSvgField(CatchBatch.PROPERTY_CATCH_TOTAL_WEIGHT, getModel().getCatchTotalComputedOrNotWeight(), catchWeightUnit);
+
+                initSvgField(CatchBatch.PROPERTY_CATCH_TOTAL_SORTED_COMPUTED_WEIGHT, catchWeightUnit);
                 initSvgField(CatchBatch.PROPERTY_CATCH_TOTAL_REJECTED_WEIGHT, getModel().getCatchTotalRejectedComputedOrNotWeight(), catchWeightUnit);
+                initSvgField(CatchBatch.PROPERTY_CATCH_TOTAL_SORTED_SORTED_COMPUTED_WEIGHT, catchWeightUnit);
+
                 initSvgField(CatchBatch.PROPERTY_SPECIES_TOTAL_SORTED_WEIGHT, getModel().getSpeciesTotalSortedComputedOrNotWeight(), speciesWeightUnit);
+                initSvgField(CatchBatch.PROPERTY_SPECIES_TOTAL_SAMPLE_SORTED_COMPUTED_WEIGHT, speciesWeightUnit);
+
                 initSvgField(CatchBatch.PROPERTY_BENTHOS_TOTAL_SORTED_WEIGHT, getModel().getBenthosTotalSortedComputedOrNotWeight(), benthosWeightUnit);
-                initSvgField(CatchBatch.PROPERTY_MARINE_LITTER_TOTAL_WEIGHT, getModel().getMarineLitterTotalComputedOrNotWeight(), marineLitterWeightUnit);
+                initSvgField(CatchBatch.PROPERTY_BENTHOS_TOTAL_SAMPLE_SORTED_COMPUTED_WEIGHT, benthosWeightUnit);
 
-                initSvgField(CatchBatch.PROPERTY_CATCH_TOTAL_SORTED_COMPUTED_WEIGHT, catchWeightUnit);
-                initSvgField(CatchBatch.PROPERTY_CATCH_TOTAL_SORTED_SORTED_COMPUTED_WEIGHT, catchWeightUnit);
                 initSvgField(CatchBatch.PROPERTY_CATCH_TOTAL_UNSORTED_COMPUTED_WEIGHT, catchWeightUnit);
-
-                initSvgField(CatchBatch.PROPERTY_SPECIES_TOTAL_COMPUTED_WEIGHT, speciesWeightUnit);
                 initSvgField(CatchBatch.PROPERTY_SPECIES_TOTAL_UNSORTED_COMPUTED_WEIGHT, speciesWeightUnit);
-                initSvgField(CatchBatch.PROPERTY_SPECIES_TOTAL_SAMPLE_SORTED_COMPUTED_WEIGHT, speciesWeightUnit);
+                initSvgField(CatchBatch.PROPERTY_BENTHOS_TOTAL_UNSORTED_COMPUTED_WEIGHT, benthosWeightUnit);
+
+                getModel().addPropertyChangeListener(new ChangeElementBackgroundColorPropertyChangeListener(
+                        CatchBatch.PROPERTY_SPECIES_TOTAL_UNSORTED_COMPUTED_WEIGHT,
+                        Sets.newHashSet(CatchBatch.PROPERTY_CATCH_TOTAL_REJECTED_WEIGHT,
+                                        CatchBatch.PROPERTY_CATCH_TOTAL_REJECTED_COMPUTED_WEIGHT,
+                                        CatchBatch.PROPERTY_SPECIES_TOTAL_SORTED_WEIGHT,
+                                        CatchBatch.PROPERTY_SPECIES_TOTAL_SORTED_COMPUTED_WEIGHT,
+                                        CatchBatch.PROPERTY_SPECIES_TOTAL_SAMPLE_SORTED_COMPUTED_WEIGHT),
+                        canvas,
+                        svgDocument,
+                        new Function<EditCatchesUIModel, Color>() {
+                            @Override
+                            public Color apply(EditCatchesUIModel model) {
+                                Float catchTotalRejectedWeight = model.getCatchTotalRejectedComputedOrNotWeight().getDataOrComputedData();
+                                Float speciesTotalSortedWeight = model.getSpeciesTotalSortedComputedOrNotWeight().getDataOrComputedData();
+                                Float speciesTotalSampleSortedComputedWeight = model.getSpeciesTotalSampleSortedComputedWeight();
+
+                                boolean warning = catchTotalRejectedWeight != null
+                                                    && speciesTotalSortedWeight != null
+                                                    && speciesTotalSampleSortedComputedWeight != null
+                                                    && Weights.isEqualWeight(catchTotalRejectedWeight, 0f)
+                                                    && Weights.isEqualWeight(speciesTotalSortedWeight,
+                                                                             speciesTotalSampleSortedComputedWeight);
+
+                                return warning ? Color.ORANGE : Color.decode("#006bba");
+                            }
+                        }));
+
+                getModel().addPropertyChangeListener(new ChangeElementBackgroundColorPropertyChangeListener(
+                        CatchBatch.PROPERTY_BENTHOS_TOTAL_UNSORTED_COMPUTED_WEIGHT,
+                        Sets.newHashSet(CatchBatch.PROPERTY_CATCH_TOTAL_REJECTED_WEIGHT,
+                                        CatchBatch.PROPERTY_CATCH_TOTAL_REJECTED_COMPUTED_WEIGHT,
+                                        CatchBatch.PROPERTY_BENTHOS_TOTAL_SORTED_WEIGHT,
+                                        CatchBatch.PROPERTY_BENTHOS_TOTAL_SORTED_COMPUTED_WEIGHT,
+                                        CatchBatch.PROPERTY_BENTHOS_TOTAL_SAMPLE_SORTED_COMPUTED_WEIGHT),
+                        canvas,
+                        svgDocument,
+                        new Function<EditCatchesUIModel, Color>() {
+                            @Override
+                            public Color apply(EditCatchesUIModel model) {
+                                Float catchTotalRejectedWeight = model.getCatchTotalRejectedComputedOrNotWeight().getDataOrComputedData();
+                                Float benthosTotalSortedWeight = model.getBenthosTotalSortedComputedOrNotWeight().getDataOrComputedData();
+                                Float benthosTotalSampleSortedComputedWeight = model.getBenthosTotalSampleSortedComputedWeight();
+
+                                boolean warning = catchTotalRejectedWeight != null
+                                        && benthosTotalSortedWeight != null
+                                        && benthosTotalSampleSortedComputedWeight != null
+                                        && Weights.isEqualWeight(catchTotalRejectedWeight, 0f)
+                                        && Weights.isEqualWeight(benthosTotalSortedWeight,
+                                                                 benthosTotalSampleSortedComputedWeight);
+
+                                return warning ? Color.ORANGE : Color.decode("#006bba");
+                            }
+                        }));
 
+                initSvgField(CatchBatch.PROPERTY_SPECIES_TOTAL_COMPUTED_WEIGHT, speciesWeightUnit);
                 initSvgField(CatchBatch.PROPERTY_BENTHOS_TOTAL_COMPUTED_WEIGHT, benthosWeightUnit);
-                initSvgField(CatchBatch.PROPERTY_BENTHOS_TOTAL_UNSORTED_COMPUTED_WEIGHT, benthosWeightUnit);
-                initSvgField(CatchBatch.PROPERTY_BENTHOS_TOTAL_SAMPLE_SORTED_COMPUTED_WEIGHT, benthosWeightUnit);
+                initSvgField(CatchBatch.PROPERTY_MARINE_LITTER_TOTAL_WEIGHT, getModel().getMarineLitterTotalComputedOrNotWeight(), marineLitterWeightUnit);
+
+                getModel().addPropertyChangeListener(new RatioPropertyChangeListener("ratioSpeciesSampleSortedOverSpeciesSortedWeightLabel",
+                                                                                     CatchBatch.PROPERTY_SPECIES_TOTAL_SAMPLE_SORTED_COMPUTED_WEIGHT,
+                                                                                     CatchBatch.PROPERTY_SPECIES_TOTAL_SORTED_WEIGHT,
+                                                                                     CatchBatch.PROPERTY_SPECIES_TOTAL_SORTED_COMPUTED_WEIGHT,
+                                                                                     canvas,
+                                                                                     svgDocument));
+                getModel().addPropertyChangeListener(new RatioPropertyChangeListener("ratioBenthosSampleSortedOverBenthosSortedWeightLabel",
+                                                                                     CatchBatch.PROPERTY_BENTHOS_TOTAL_SAMPLE_SORTED_COMPUTED_WEIGHT,
+                                                                                     CatchBatch.PROPERTY_BENTHOS_TOTAL_SORTED_WEIGHT,
+                                                                                     CatchBatch.PROPERTY_BENTHOS_TOTAL_SORTED_COMPUTED_WEIGHT,
+                                                                                     canvas,
+                                                                                     svgDocument));
 
             }
         });
@@ -298,22 +368,21 @@ public class EditCatchesUIHandler extends AbstractTuttiTabContainerUIHandler<Edi
                 Float x = bbox.getX();
 
                 Element labelElement = svgDocument.getElementById(property + "Label");
-                labelElement.setTextContent(t("tutti.editCatchBatch.field." + property));
-
-                SVGOMTextElement labelTextElem = (SVGOMTextElement) labelElement;
-                bbox = labelTextElem.getBBox();
-                float width = bbox.getWidth() + 20;
-                labelElement.setAttribute("x", String.valueOf(x - width / 2));
-
-                Element labelRectElement = svgDocument.getElementById(property + "LabelRect");
-                labelRectElement.setAttribute("width", Float.toString(width));
-                labelRectElement.setAttribute("x", String.valueOf(x - width));
-
                 if (computableData == null) {
                     SVGStylable field = (SVGStylable) labelElement;
                     CSSStyleDeclaration style = field.getStyle();
                     style.setProperty("font-style", "italic", null);
                 }
+
+                SVGOMTextElement labelTextElem = (SVGOMTextElement) labelElement;
+                labelElement.setTextContent(weightUnit.decorateLabel(t("tutti.editCatchBatch.field." + property)));
+                bbox = labelTextElem.getBBox();
+                float labelX = bbox.getX();
+                float width = Math.abs(x - labelX);
+
+                Element labelRectElement = svgDocument.getElementById(property + "LabelRect");
+                labelRectElement.setAttribute("width", Float.toString(width + 10));
+                labelRectElement.setAttribute("x", String.valueOf(labelX - 10));
             }
         });
 
@@ -322,19 +391,7 @@ public class EditCatchesUIHandler extends AbstractTuttiTabContainerUIHandler<Edi
 
             // computed data value
             OnDataOrComputedDataValueChangedListener listener = new OnDataOrComputedDataValueChangedListener(property, weightUnit, true, canvas, svgDocument, colorComputedWeights);
-            EditCatchesUIModel model = getModel();
-            String propertyValue = null;
-            try {
-                propertyValue = BeanUtils.getProperty(model, property);
-
-            } catch (ReflectiveOperationException e) {
-                if (log.isErrorEnabled()) {
-                    log.error("Error while getting model's property " + property, e);
-                }
-            }
-            Float value = propertyValue != null ? Float.valueOf(propertyValue) : null;
-            listener.updateValue(value, true);
-            model.addPropertyChangeListener(property, listener);
+            getModel().addPropertyChangeListener(property, listener);
 
         } else {
 
@@ -344,9 +401,6 @@ public class EditCatchesUIHandler extends AbstractTuttiTabContainerUIHandler<Edi
             target.addEventListener("click", new OnValueClickListener(computableData, property, weightUnit), false);
 
             OnDataOrComputedDataValueChangedListener listener = new OnDataOrComputedDataValueChangedListener(property, weightUnit, false, canvas, svgDocument, colorComputedWeights);
-            boolean computed = computableData.getData() == null;
-            Float value = computableData.getDataOrComputedData();
-            listener.updateValue(value, computed);
             computableData.addPropertyChangeListener(listener);
         }
     }
@@ -893,20 +947,32 @@ public class EditCatchesUIHandler extends AbstractTuttiTabContainerUIHandler<Edi
         }
     }
 
-    private static class OnDataOrComputedDataValueChangedListener implements PropertyChangeListener {
+    private static abstract class UpdateRunnableQueuePropertyChangeListener implements PropertyChangeListener {
 
-        private final String property;
-
-        private final WeightUnit weightUnit;
+        protected final JSVGCanvas canvas;
+        protected RunnableQueue updateRunnableQueue;
+        protected final Document svgDocument;
 
-        private final boolean onlyReactOnComputedData;
+        public UpdateRunnableQueuePropertyChangeListener(JSVGCanvas canvas,
+                                                         Document svgDocument) {
+            this.canvas = canvas;
+            this.svgDocument = svgDocument;
+        }
 
-        private final JSVGCanvas canvas;
+        protected RunnableQueue getUpdateRunnableQueue() {
+            if (updateRunnableQueue == null) {
+                updateRunnableQueue = canvas.getUpdateManager().getUpdateRunnableQueue();
 
-        private RunnableQueue updateRunnableQueue;
+            }
+            return updateRunnableQueue;
+        }
+    }
 
-        private final Document svgDocument;
+    private static class OnDataOrComputedDataValueChangedListener extends UpdateRunnableQueuePropertyChangeListener {
 
+        private final String property;
+        private final WeightUnit weightUnit;
+        private final boolean onlyReactOnComputedData;
         private final Color colorComputedWeights;
 
         public OnDataOrComputedDataValueChangedListener(String property,
@@ -915,21 +981,11 @@ public class EditCatchesUIHandler extends AbstractTuttiTabContainerUIHandler<Edi
                                                         JSVGCanvas canvas,
                                                         Document svgDocument,
                                                         Color colorComputedWeights) {
+            super(canvas, svgDocument);
             this.property = property;
             this.weightUnit = weightUnit;
             this.onlyReactOnComputedData = onlyReactOnComputedData;
-            this.canvas = canvas;
-            this.svgDocument = svgDocument;
             this.colorComputedWeights = colorComputedWeights;
-
-        }
-
-        public RunnableQueue getUpdateRunnableQueue() {
-            if (updateRunnableQueue == null) {
-                updateRunnableQueue = canvas.getUpdateManager().getUpdateRunnableQueue();
-
-            }
-            return updateRunnableQueue;
         }
 
         @Override
@@ -965,7 +1021,7 @@ public class EditCatchesUIHandler extends AbstractTuttiTabContainerUIHandler<Edi
 
         }
 
-        public void updateValue(final Float value, final boolean computed) {
+        private void updateValue(final Float value, final boolean computed) {
 
             getUpdateRunnableQueue().invokeLater
                     (new Runnable() {
@@ -979,11 +1035,6 @@ public class EditCatchesUIHandler extends AbstractTuttiTabContainerUIHandler<Edi
                                 return;
                             }
 
-                            Element rectElement = svgDocument.getElementById(property + "Rect");
-                            SVGOMRectElement rectElem = (SVGOMRectElement) rectElement;
-                            SVGRect bbox = rectElem.getBBox();
-                            Float x = bbox.getX();
-
                             //TODO i18n ?
                             String textContent;
                             if (value != null) {
@@ -1001,11 +1052,11 @@ public class EditCatchesUIHandler extends AbstractTuttiTabContainerUIHandler<Edi
                             style.setProperty("font-style", computed ? "italic" : "normal", null);
 
                             SVGOMTextElement textElem = (SVGOMTextElement) element;
-                            bbox = textElem.getBBox();
+                            SVGRect bbox = textElem.getBBox();
                             if (bbox != null) {
-                                float width = bbox.getWidth() + 20;
+                                float width = bbox.getWidth() + 15;
+                                Element rectElement = svgDocument.getElementById(property + "Rect");
                                 rectElement.setAttribute("width", Float.toString(width));
-                                element.setAttribute("x", String.valueOf(x + width / 2));
                             }
                         }
                     });
@@ -1013,4 +1064,118 @@ public class EditCatchesUIHandler extends AbstractTuttiTabContainerUIHandler<Edi
         }
     }
 
+    private static class ChangeElementBackgroundColorPropertyChangeListener extends UpdateRunnableQueuePropertyChangeListener {
+
+        private final String elementId;
+        private Set<String> propertiesToListen;
+        private Function<EditCatchesUIModel, Color> colorFunction;
+
+        public ChangeElementBackgroundColorPropertyChangeListener(String elementId,
+                                                                  Set<String> propertiesToListen,
+                                                                  JSVGCanvas canvas,
+                                                                  Document svgDocument,
+                                                                  Function<EditCatchesUIModel, Color> colorFunction) {
+            super(canvas, svgDocument);
+            this.elementId = elementId;
+            this.propertiesToListen = propertiesToListen;
+            this.colorFunction = colorFunction;
+        }
+
+        @Override
+        public void propertyChange(PropertyChangeEvent evt) {
+            EditCatchesUIModel model = (EditCatchesUIModel) evt.getSource();
+            final Color background = colorFunction.apply(model);
+
+            if (propertiesToListen.contains(evt.getPropertyName())) {
+
+                getUpdateRunnableQueue().invokeLater
+                        (new Runnable() {
+                            public void run() {
+                                if (log.isDebugEnabled()) {
+                                    log.debug("update " + elementId + " field");
+                                }
+
+                                Element rectElement = svgDocument.getElementById(elementId + "LabelRect");
+                                SVGStylable field = (SVGStylable) rectElement;
+                                CSSStyleDeclaration style = field.getStyle();
+
+                                String color = "#" + Integer.toHexString(background.getRGB()).substring(2);
+                                style.setProperty("fill", color, null);
+                            }
+                        });
+            }
+        }
+    }
+
+    private static class RatioPropertyChangeListener extends UpdateRunnableQueuePropertyChangeListener {
+
+        private final String elementId;
+        private final String numeratorProperty;
+        private final String denominatorProperty;
+        private final String denominatorComputedProperty;
+        private Integer ratio = null;
+
+        public RatioPropertyChangeListener(String elementId,
+                                           String numeratorProperty,
+                                           String denominatorProperty,
+                                           String denominatorComputedProperty,
+                                           JSVGCanvas canvas,
+                                           Document svgDocument) {
+            super(canvas, svgDocument);
+            this.elementId = elementId;
+            this.numeratorProperty = numeratorProperty;
+            this.denominatorProperty = denominatorProperty;
+            this.denominatorComputedProperty = denominatorComputedProperty;
+        }
+
+        @Override
+        public void propertyChange(PropertyChangeEvent evt) {
+            String propertyName = evt.getPropertyName();
+
+            if (numeratorProperty.equals(propertyName) || denominatorProperty.equals(propertyName)) {
+                EditCatchesUIModel model = (EditCatchesUIModel) evt.getSource();
+
+                try {
+                    String numerator = BeanUtils.getProperty(model, numeratorProperty);
+                    String denominator = BeanUtils.getProperty(model, denominatorProperty);
+                    if (denominator == null) {
+                        denominator = BeanUtils.getProperty(model, denominatorComputedProperty);
+                    }
+
+                    if (numerator != null && denominator != null) {
+                        Float numeratorValue = Float.valueOf(numerator);
+                        Float denominatorValue = Float.valueOf(denominator);
+
+                        if (denominatorValue != 0) {
+                            ratio = (int) (100 * numeratorValue / denominatorValue);
+                        }
+                    }
+
+                } catch (ReflectiveOperationException e) {
+                    if (log.isErrorEnabled()) {
+                        log.error("Error while computing the ration", e);
+                    }
+                }
+
+                getUpdateRunnableQueue().invokeLater
+                        (new Runnable() {
+                            public void run() {
+                                if (log.isDebugEnabled()) {
+                                    log.debug("update " + elementId + " field");
+                                }
+
+                                Element ratioElement = svgDocument.getElementById(elementId);
+                                String textContent;
+                                if (ratio != null) {
+                                    textContent = ratio + "%";
+                                } else {
+                                    textContent = null;
+                                }
+                                ratioElement.setTextContent(textContent);
+                            }
+                        });
+            }
+        }
+    }
+
 }
diff --git a/tutti-ui-swing/src/main/resources/EcranResume.svg b/tutti-ui-swing/src/main/resources/EcranResume.svg
index 0c8e16f..9995d81 100644
--- a/tutti-ui-swing/src/main/resources/EcranResume.svg
+++ b/tutti-ui-swing/src/main/resources/EcranResume.svg
@@ -10,528 +10,18 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="EcranResume.svg"
+   sodipodi:docname="EcranResume2.svg"
    version="1.1"
    x="0px"
    y="0px"
-   width="700px"
-   height="350px"
-   viewport="0 0 700 350"
-   viewBox="0 0 700 350"
+   width="800"
+   height="500"
+   viewport="0 0 800 500"
+   viewBox="0 0 800 500"
    id="svg2985"
    preserveAspectRatio="xMidYMid">
   <defs
-     id="defs2987">
-    <filter
-       id="filter4065"
-       inkscape:label="Drop Shadow"
-       color-interpolation-filters="sRGB">
-      <feFlood
-         id="feFlood4067"
-         flood-opacity="0.2"
-         flood-color="rgb(0,0,0)"
-         result="flood" />
-      <feComposite
-         id="feComposite4069"
-         in2="SourceGraphic"
-         in="flood"
-         operator="in"
-         result="composite1" />
-      <feGaussianBlur
-         id="feGaussianBlur4071"
-         stdDeviation="0.5"
-         result="blur" />
-      <feOffset
-         id="feOffset4073"
-         dx="1"
-         dy="1"
-         result="offset" />
-      <feComposite
-         id="feComposite4075"
-         in2="offset"
-         in="SourceGraphic"
-         operator="over"
-         result="composite2" />
-    </filter>
-    <filter
-       id="filter4077"
-       inkscape:label="Drop Shadow"
-       color-interpolation-filters="sRGB">
-      <feFlood
-         id="feFlood4079"
-         flood-opacity="0.2"
-         flood-color="rgb(0,0,0)"
-         result="flood" />
-      <feComposite
-         id="feComposite4081"
-         in2="SourceGraphic"
-         in="flood"
-         operator="in"
-         result="composite1" />
-      <feGaussianBlur
-         id="feGaussianBlur4083"
-         stdDeviation="0.5"
-         result="blur" />
-      <feOffset
-         id="feOffset4085"
-         dx="1"
-         dy="1"
-         result="offset" />
-      <feComposite
-         id="feComposite4087"
-         in2="offset"
-         in="SourceGraphic"
-         operator="over"
-         result="composite2" />
-    </filter>
-    <filter
-       id="filter4278"
-       inkscape:label="Drop Shadow"
-       color-interpolation-filters="sRGB">
-      <feFlood
-         id="feFlood4280"
-         flood-opacity="0.2"
-         flood-color="rgb(0,0,0)"
-         result="flood" />
-      <feComposite
-         id="feComposite4282"
-         in2="SourceGraphic"
-         in="flood"
-         operator="in"
-         result="composite1" />
-      <feGaussianBlur
-         id="feGaussianBlur4284"
-         stdDeviation="0.5"
-         result="blur" />
-      <feOffset
-         id="feOffset4286"
-         dx="1"
-         dy="1"
-         result="offset" />
-      <feComposite
-         id="feComposite4288"
-         in2="offset"
-         in="SourceGraphic"
-         operator="over"
-         result="fbSourceGraphic" />
-      <feColorMatrix
-         result="fbSourceGraphicAlpha"
-         in="fbSourceGraphic"
-         values="0 0 0 -1 0 0 0 0 -1 0 0 0 0 -1 0 0 0 0 1 0"
-         id="feColorMatrix4326" />
-      <feFlood
-         id="feFlood4328"
-         flood-opacity="0.2"
-         flood-color="rgb(0,0,0)"
-         result="flood"
-         in="fbSourceGraphic" />
-      <feComposite
-         id="feComposite4330"
-         in2="fbSourceGraphic"
-         in="flood"
-         operator="in"
-         result="composite1" />
-      <feGaussianBlur
-         id="feGaussianBlur4332"
-         stdDeviation="0.5"
-         result="blur" />
-      <feOffset
-         id="feOffset4334"
-         dx="2"
-         dy="1"
-         result="offset" />
-      <feComposite
-         id="feComposite4336"
-         in2="offset"
-         in="fbSourceGraphic"
-         operator="over"
-         result="composite2" />
-    </filter>
-    <filter
-       id="filter4536"
-       inkscape:label="Drop Shadow"
-       style="color-interpolation-filters:sRGB;">
-      <feFlood
-         id="feFlood4538"
-         flood-opacity="0.2"
-         flood-color="rgb(0,0,0)"
-         result="flood" />
-      <feComposite
-         id="feComposite4540"
-         in2="SourceGraphic"
-         in="flood"
-         operator="in"
-         result="composite1" />
-      <feGaussianBlur
-         id="feGaussianBlur4542"
-         stdDeviation="1"
-         result="blur"
-         in="composite" />
-      <feOffset
-         id="feOffset4544"
-         dx="2"
-         dy="1"
-         result="offset" />
-      <feComposite
-         id="feComposite4546"
-         in2="offset"
-         in="SourceGraphic"
-         operator="over"
-         result="composite2" />
-    </filter>
-    <filter
-       id="filter4556"
-       inkscape:label="Drop Shadow"
-       style="color-interpolation-filters:sRGB;">
-      <feFlood
-         id="feFlood4558"
-         flood-opacity="0.2"
-         flood-color="rgb(0,0,0)"
-         result="flood" />
-      <feComposite
-         id="feComposite4560"
-         in2="SourceGraphic"
-         in="flood"
-         operator="in"
-         result="composite1" />
-      <feGaussianBlur
-         id="feGaussianBlur4562"
-         stdDeviation="1"
-         result="blur"
-         in="composite" />
-      <feOffset
-         id="feOffset4564"
-         dx="2"
-         dy="1"
-         result="offset" />
-      <feComposite
-         id="feComposite4566"
-         in2="offset"
-         in="SourceGraphic"
-         operator="over"
-         result="composite2" />
-    </filter>
-    <filter
-       id="filter4576"
-       inkscape:label="Drop Shadow"
-       style="color-interpolation-filters:sRGB;">
-      <feFlood
-         id="feFlood4578"
-         flood-opacity="0.2"
-         flood-color="rgb(0,0,0)"
-         result="flood" />
-      <feComposite
-         id="feComposite4580"
-         in2="SourceGraphic"
-         in="flood"
-         operator="in"
-         result="composite1" />
-      <feGaussianBlur
-         id="feGaussianBlur4582"
-         stdDeviation="1"
-         result="blur"
-         in="composite" />
-      <feOffset
-         id="feOffset4584"
-         dx="2"
-         dy="1"
-         result="offset" />
-      <feComposite
-         id="feComposite4586"
-         in2="offset"
-         in="SourceGraphic"
-         operator="over"
-         result="composite2" />
-    </filter>
-    <filter
-       id="filter4597"
-       inkscape:label="Drop Shadow"
-       style="color-interpolation-filters:sRGB;">
-      <feFlood
-         id="feFlood4599"
-         flood-opacity="0.2"
-         flood-color="rgb(0,0,0)"
-         result="flood" />
-      <feComposite
-         id="feComposite4601"
-         in2="SourceGraphic"
-         in="flood"
-         operator="in"
-         result="composite1" />
-      <feGaussianBlur
-         id="feGaussianBlur4603"
-         stdDeviation="1"
-         result="blur"
-         in="composite" />
-      <feOffset
-         id="feOffset4605"
-         dx="2"
-         dy="1"
-         result="offset" />
-      <feComposite
-         id="feComposite4607"
-         in2="offset"
-         in="SourceGraphic"
-         operator="over"
-         result="composite2" />
-    </filter>
-    <filter
-       id="filter4619"
-       inkscape:label="Drop Shadow"
-       style="color-interpolation-filters:sRGB;">
-      <feFlood
-         id="feFlood4621"
-         flood-opacity="0.2"
-         flood-color="rgb(0,0,0)"
-         result="flood" />
-      <feComposite
-         id="feComposite4623"
-         in2="SourceGraphic"
-         in="flood"
-         operator="in"
-         result="composite1" />
-      <feGaussianBlur
-         id="feGaussianBlur4625"
-         stdDeviation="1"
-         result="blur"
-         in="composite" />
-      <feOffset
-         id="feOffset4627"
-         dx="2"
-         dy="1"
-         result="offset" />
-      <feComposite
-         id="feComposite4629"
-         in2="offset"
-         in="SourceGraphic"
-         operator="over"
-         result="composite2" />
-    </filter>
-    <filter
-       id="filter4640"
-       inkscape:label="Drop Shadow"
-       style="color-interpolation-filters:sRGB;">
-      <feFlood
-         id="feFlood4642"
-         flood-opacity="0.2"
-         flood-color="rgb(0,0,0)"
-         result="flood" />
-      <feComposite
-         id="feComposite4644"
-         in2="SourceGraphic"
-         in="flood"
-         operator="in"
-         result="composite1" />
-      <feGaussianBlur
-         id="feGaussianBlur4646"
-         stdDeviation="1"
-         result="blur"
-         in="composite" />
-      <feOffset
-         id="feOffset4648"
-         dx="2"
-         dy="1"
-         result="offset" />
-      <feComposite
-         id="feComposite4650"
-         in2="offset"
-         in="SourceGraphic"
-         operator="over"
-         result="composite2" />
-    </filter>
-    <filter
-       id="filter4661"
-       inkscape:label="Drop Shadow"
-       style="color-interpolation-filters:sRGB;">
-      <feFlood
-         id="feFlood4663"
-         flood-opacity="0.2"
-         flood-color="rgb(0,0,0)"
-         result="flood" />
-      <feComposite
-         id="feComposite4665"
-         in2="SourceGraphic"
-         in="flood"
-         operator="in"
-         result="composite1" />
-      <feGaussianBlur
-         id="feGaussianBlur4667"
-         stdDeviation="1"
-         result="blur"
-         in="composite" />
-      <feOffset
-         id="feOffset4669"
-         dx="2"
-         dy="1"
-         result="offset" />
-      <feComposite
-         id="feComposite4671"
-         in2="offset"
-         in="SourceGraphic"
-         operator="over"
-         result="composite2" />
-    </filter>
-    <filter
-       id="filter4683"
-       inkscape:label="Drop Shadow"
-       style="color-interpolation-filters:sRGB;">
-      <feFlood
-         id="feFlood4685"
-         flood-opacity="0.2"
-         flood-color="rgb(0,0,0)"
-         result="flood" />
-      <feComposite
-         id="feComposite4687"
-         in2="SourceGraphic"
-         in="flood"
-         operator="in"
-         result="composite1" />
-      <feGaussianBlur
-         id="feGaussianBlur4689"
-         stdDeviation="1"
-         result="blur"
-         in="composite" />
-      <feOffset
-         id="feOffset4691"
-         dx="2"
-         dy="1"
-         result="offset" />
-      <feComposite
-         id="feComposite4693"
-         in2="offset"
-         in="SourceGraphic"
-         operator="over"
-         result="composite2" />
-    </filter>
-    <filter
-       id="filter4705"
-       inkscape:label="Drop Shadow"
-       style="color-interpolation-filters:sRGB;">
-      <feFlood
-         id="feFlood4707"
-         flood-opacity="0.2"
-         flood-color="rgb(0,0,0)"
-         result="flood" />
-      <feComposite
-         id="feComposite4709"
-         in2="SourceGraphic"
-         in="flood"
-         operator="in"
-         result="composite1" />
-      <feGaussianBlur
-         id="feGaussianBlur4711"
-         stdDeviation="1"
-         result="blur"
-         in="composite" />
-      <feOffset
-         id="feOffset4713"
-         dx="2"
-         dy="1"
-         result="offset" />
-      <feComposite
-         id="feComposite4715"
-         in2="offset"
-         in="SourceGraphic"
-         operator="over"
-         result="composite2" />
-    </filter>
-    <filter
-       id="filter4726"
-       inkscape:label="Drop Shadow"
-       style="color-interpolation-filters:sRGB;">
-      <feFlood
-         id="feFlood4728"
-         flood-opacity="0.2"
-         flood-color="rgb(0,0,0)"
-         result="flood" />
-      <feComposite
-         id="feComposite4730"
-         in2="SourceGraphic"
-         in="flood"
-         operator="in"
-         result="composite1" />
-      <feGaussianBlur
-         id="feGaussianBlur4732"
-         stdDeviation="1"
-         result="blur"
-         in="composite" />
-      <feOffset
-         id="feOffset4734"
-         dx="2"
-         dy="1"
-         result="offset" />
-      <feComposite
-         id="feComposite4736"
-         in2="offset"
-         in="SourceGraphic"
-         operator="over"
-         result="composite2" />
-    </filter>
-    <filter
-       id="filter4748"
-       inkscape:label="Drop Shadow"
-       style="color-interpolation-filters:sRGB;">
-      <feFlood
-         id="feFlood4750"
-         flood-opacity="0.2"
-         flood-color="rgb(0,0,0)"
-         result="flood" />
-      <feComposite
-         id="feComposite4752"
-         in2="SourceGraphic"
-         in="flood"
-         operator="in"
-         result="composite1" />
-      <feGaussianBlur
-         id="feGaussianBlur4754"
-         stdDeviation="1"
-         result="blur"
-         in="composite" />
-      <feOffset
-         id="feOffset4756"
-         dx="2"
-         dy="1"
-         result="offset" />
-      <feComposite
-         id="feComposite4758"
-         in2="offset"
-         in="SourceGraphic"
-         operator="over"
-         result="composite2" />
-    </filter>
-    <filter
-       id="filter4770"
-       inkscape:label="Drop Shadow"
-       style="color-interpolation-filters:sRGB;">
-      <feFlood
-         id="feFlood4772"
-         flood-opacity="0.2"
-         flood-color="rgb(0,0,0)"
-         result="flood" />
-      <feComposite
-         id="feComposite4774"
-         in2="SourceGraphic"
-         in="flood"
-         operator="in"
-         result="composite1" />
-      <feGaussianBlur
-         id="feGaussianBlur4776"
-         stdDeviation="1"
-         result="blur"
-         in="composite" />
-      <feOffset
-         id="feOffset4778"
-         dx="2"
-         dy="1"
-         result="offset" />
-      <feComposite
-         id="feComposite4780"
-         in2="offset"
-         in="SourceGraphic"
-         operator="over"
-         result="composite2" />
-    </filter>
-  </defs>
+     id="defs3092" />
   <sodipodi:namedview
      inkscape:document-units="mm"
      pagecolor="#ffffff"
@@ -539,12 +29,12 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="2.8284272"
-     inkscape:cx="318.06599"
-     inkscape:cy="160.32352"
+     inkscape:zoom="4.0000002"
+     inkscape:cx="281.61972"
+     inkscape:cy="101.44429"
      inkscape:current-layer="layer2"
      id="namedview2989"
-     showgrid="false"
+     showgrid="true"
      inkscape:window-width="1920"
      inkscape:window-height="1048"
      inkscape:window-x="1280"
@@ -556,7 +46,8 @@
      fit-margin-top="10"
      fit-margin-left="10"
      fit-margin-right="10"
-     fit-margin-bottom="10">
+     fit-margin-bottom="10"
+     inkscape:snap-global="false">
     <sodipodi:guide
        orientation="1,0"
        position="214.34461,373.83805"
@@ -565,6 +56,9 @@
        orientation="1,0"
        position="475.97412,346.96802"
        id="guide4093" />
+    <inkscape:grid
+       type="xygrid"
+       id="grid4224" />
   </sodipodi:namedview>
   <metadata
      id="metadata2991">
@@ -588,8 +82,8 @@
     <rect
        style="opacity:0.8;fill:#d6d9df;fill-opacity:1;fill-rule:nonzero;stroke:none"
        id="rect3782"
-       width="700"
-       height="350"
+       width="800"
+       height="500"
        x="254.46719"
        y="-246.05853" />
   </g>
@@ -599,23 +93,22 @@
      inkscape:label="Arbre"
      transform="translate(-254.46719,246.05856)">
     <rect
-       style="fill:#006bba;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter4278)"
+       style="fill:#006bba;fill-opacity:1;fill-rule:nonzero;stroke:none"
        id="rect4276"
        width="1.2082677"
-       height="31.414213"
-       x="406.18842"
-       y="6.759233" />
+       height="54.04163"
+       x="432.35135"
+       y="105.75418" />
     <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"
+       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"
        id="path3976"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccccc"
-       transform="matrix(1.4580208,0,0,0.99343887,-262.74144,13.949373)" />
+       transform="matrix(1.4580208,0,0,0.99343887,-241.52824,52.133138)" />
     <g
        id="catchTotalWeight"
-       style="filter:url(#filter4556)"
-       transform="translate(-23.334523,-23.688076)">
+       transform="translate(-12.727921,-11.667261)">
       <rect
          y="-206.33543"
          x="480.88577"
@@ -627,8 +120,8 @@
          sodipodi:linespacing="125%"
          id="catchTotalWeightLabel"
          y="-186.02356"
-         x="556.13354"
-         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"
+         x="630.37976"
+         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"
@@ -639,16 +132,15 @@
          y="-206.50395" />
       <text
          xml:space="preserve"
-         x="671.99567"
+         x="643.71143"
          y="-186.02356"
          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%" />
+         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>
     </g>
     <g
        id="g4760"
-       style="filter:url(#filter4770)"
-       transform="translate(3.1819804,-21.213203)">
+       transform="translate(28.34493,26.620057)">
       <g
          transform="translate(-82.899508,38.534812)"
          id="g4095">
@@ -663,10 +155,10 @@
              y="-168.96303" />
           <text
              xml:space="preserve"
-             x="453.71802"
-             y="-151.49626"
+             x="494.73022"
+             y="-150.78915"
              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>
+             style="font-size:12.01316166px;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">VRAC</text>
           <rect
              y="-169.07013"
              x="501.44632"
@@ -676,17 +168,16 @@
              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
              id="catchTotalSortedComputedWeightValue"
-             y="-151.49626"
-             x="531.71814"
+             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:center;text-anchor:middle;fill:#000000;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial" />
+             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>
         </g>
       </g>
     </g>
     <g
        id="g4568"
-       style="filter:url(#filter4576)"
-       transform="translate(2.1213203,-22.273863)">
+       transform="translate(24.748736,25.809397)">
       <rect
          y="-130.42822"
          x="708.43945"
@@ -697,10 +188,10 @@
       <text
          sodipodi:linespacing="125%"
          id="catchTotalUnsortedComputedWeightLabel"
-         y="-112.96145"
-         x="754.46497"
+         y="-112.25434"
+         x="794.77008"
          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>
+         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"
          id="catchTotalUnsortedComputedWeightRect"
@@ -710,14 +201,14 @@
          y="-130.53532" />
       <text
          xml:space="preserve"
-         x="830.46509"
-         y="-112.96145"
+         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:center;text-anchor:middle;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">00.00 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;filter:url(#filter4065)"
+       style="fill:#006bba;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"
@@ -730,11 +221,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(-23.045062,-240.05358)"
+       transform="translate(2.4107815,-192.67742)"
        inkscape:transform-center-y="1.6001575" />
     <path
        inkscape:transform-center-y="1.6001575"
-       transform="translate(358.21336,-240.05358)"
+       transform="translate(380.84078,-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"
@@ -747,46 +238,45 @@
        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;filter:url(#filter4065)"
+       style="fill:#006bba;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(-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)"
-         y="-151.49626"
-         x="453.71802"
-         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="speciesTotalUnsortedComputedWeightRect"
-         width="62.439663"
-         height="26.829227"
-         x="501.44632"
-         y="-169.07013" />
-      <text
-         transform="matrix(0.84647606,0,0,0.84647606,294.30529,84.726553)"
-         xml:space="preserve"
-         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</text>
+       transform="translate(171.93502,88.162948)">
+      <g
+         id="g3094"
+         transform="matrix(0.84647606,0,0,0.84647606,135.37037,23.780278)">
+        <rect
+           y="-168.96303"
+           x="409.6925"
+           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" />
+        <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"
+           xml:space="preserve"
+           x="495.87607"
+           y="-152.40439">Espèces observées</text>
+        <rect
+           y="-169.07013"
+           x="501.44632"
+           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" />
+        <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>
+      </g>
     </g>
     <g
        id="g4588"
-       style="filter:url(#filter4597)"
-       transform="translate(18.384776,-21.920309)">
+       transform="translate(42.426405,66.620054)">
       <g
          transform="matrix(0.84647606,0,0,0.84647606,135.37037,23.780278)"
          id="g4154">
@@ -800,9 +290,9 @@
         <text
            id="benthosTotalUnsortedComputedWeightLabel"
            y="-79.496262"
-           x="829.71729"
+           x="870.6496"
            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>
+           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"
            id="benthosTotalUnsortedComputedWeightRect"
@@ -812,22 +302,22 @@
            y="-97.070129" />
         <text
            xml:space="preserve"
-           x="905.71741"
-           y="-79.496262"
+           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:center;text-anchor:middle;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">00.00 kg</text>
       </g>
     </g>
     <path
        sodipodi:nodetypes="ccccccc"
        inkscape:connector-curvature="0"
        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.71136481,0,0,0.99776526,283.05333,15.995784)" />
+       d="m 599.60276,-96.90552 0,-29.5 131.3125,0 -0.1875,-15 0.1875,14.98614 130.1875,-0.48614 0,67.581749"
+       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)" />
     <path
        inkscape:transform-center-y="1.576596"
-       transform="matrix(1.045689,0,0,0.98527645,244.83886,-167.87)"
+       transform="matrix(1.045689,0,0,0.98527645,267.46628,-118.28673)"
        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"
@@ -840,12 +330,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;filter:url(#filter4065)"
+       style="fill:#006bba;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;filter:url(#filter4065)"
+       style="fill:#006bba;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"
@@ -858,13 +348,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,430.87867,-167.1629)"
+       transform="matrix(1.045689,0,0,0.98527645,454.00609,-77.829632)"
        inkscape:transform-center-y="1.576596"
        inkscape:transform-center-x="1.1708959e-05" />
     <g
        id="g4738"
-       style="filter:url(#filter4748)"
-       transform="translate(5.3033007,-21.920309)">
+       transform="translate(31.259144,27.882252)">
       <g
          transform="matrix(0.84647606,0,0,0.84647606,-86.984873,84.726553)"
          id="catchTotalRejectedWeight">
@@ -877,10 +366,10 @@
            y="-168.96303" />
         <text
            xml:space="preserve"
-           x="453.71802"
+           x="493.81497"
            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é</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">Vrac non trié</text>
         <rect
            y="-169.07013"
            x="501.44632"
@@ -890,16 +379,15 @@
            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
            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"
+           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="-151.49626"
-           x="531.71814">00.00 kg</text>
+           y="-150.66092"
+           x="507.49289">00.00 kg</text>
       </g>
     </g>
     <g
        id="g4717"
-       style="filter:url(#filter4726)"
-       transform="translate(4.9497475,-22.627416)">
+       transform="translate(51.618793,66.468036)">
       <g
          id="catchTotalSortedSortedComputedWeight"
          transform="matrix(0.84647606,0,0,0.84647606,-245.9198,23.780278)">
@@ -912,10 +400,10 @@
            y="-96.963028" />
         <text
            xml:space="preserve"
-           x="829.71729"
+           x="866.47284"
            y="-79.496262"
            id="catchTotalSortedSortedComputedWeightLabel"
-           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>
+           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">Vrac trié</text>
         <rect
            y="-97.070129"
            x="875.44556"
@@ -924,24 +412,23 @@
            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" />
         <text
-           y="-79.496262"
-           x="905.71741"
+           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:center;text-anchor:middle;fill:#000000;fill-opacity:1;font-family:Arial;-inkscape-font-specification:Arial"
+           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>
       </g>
     </g>
     <path
-       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"
+       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.29586,-29.885424 0,-18.445454 78.27538,0 -0.11177,-27.429891 0.11177,27.404546 99.77508,-0.01767 -0.16421,53.7386949"
        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;filter:url(#filter4065)"
+       style="fill:#006bba;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"
@@ -954,12 +441,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,-121.60207,-166.80934)"
+       transform="matrix(1.045689,0,0,0.98527645,-95.89623,-116.25677)"
        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,34.73927,-166.80934)"
+       transform="matrix(1.045689,0,0,0.98527645,81.408316,-77.71388)"
        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"
@@ -972,12 +459,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;filter:url(#filter4065)"
+       style="fill:#006bba;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"
-       style="filter:url(#filter4705)"
-       transform="translate(-8.4852803,-24.395183)">
+       transform="translate(17.67767,74.599764)">
       <g
          id="g4206"
          transform="matrix(0.84647606,0,0,0.84647606,-8.9848728,152.72655)">
@@ -992,10 +478,10 @@
              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
              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"
+             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="speciesTotalSortedWeightLabel"
              y="-151.49626"
-             x="453.71802">Espèce trié</text>
+             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"
              id="speciesTotalSortedWeightRect"
@@ -1005,24 +491,23 @@
              y="-169.07013" />
           <text
              xml:space="preserve"
-             x="531.71814"
-             y="-151.49626"
+             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:center;text-anchor:middle;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">00.00 kg</text>
         </g>
       </g>
     </g>
     <rect
-       y="7.8198929"
-       x="591.16742"
-       height="31.414213"
+       y="105.81484"
+       x="656.83038"
+       height="53.334522"
        width="1.2082677"
        id="rect4338"
-       style="fill:#006bba;fill-opacity:1;fill-rule:nonzero;stroke:none;filter:url(#filter4278)" />
+       style="fill:#006bba;fill-opacity:1;fill-rule:nonzero;stroke:none" />
     <g
        id="g4652"
-       style="filter:url(#filter4661)"
-       transform="translate(18.384776,-22.627416)">
+       transform="translate(84.297725,74.367531)">
       <g
          transform="matrix(0.84647606,0,0,0.84647606,-167.9198,91.780282)"
          id="benthosTotalSortedWeight">
@@ -1035,10 +520,10 @@
            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
            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"
+           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="benthosTotalSortedWeightLabel"
            y="-79.496262"
-           x="829.71729">Benthos isolé</text>
+           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"
            id="benthosTotalSortedWeightRect"
@@ -1048,22 +533,21 @@
            y="-97.070129" />
         <text
            xml:space="preserve"
-           x="905.71741"
-           y="-79.496262"
+           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:center;text-anchor:middle;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">00.00 kg</text>
       </g>
     </g>
     <path
        sodipodi:nodetypes="ccccccc"
        inkscape:connector-curvature="0"
        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.70371331,0,0,0.99790992,-14.471753,82.598734)" />
+       d="m 433.03409,78.367492 0,-31.14047 112.89255,0 -0.16119,-15.834137 0.16119,15.819506 111.92537,-0.513174 0,32.723884"
+       style="fill:none;stroke:#006bba;stroke-width:1.68775713;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,-57.037093,-100.5771)"
+       transform="matrix(1.045689,0,0,0.98527645,-30.874143,-1.5821532)"
        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"
@@ -1076,12 +560,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;filter:url(#filter4065)"
+       style="fill:#006bba;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;filter:url(#filter4065)"
+       style="fill:#006bba;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"
@@ -1094,13 +578,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,126.88141,-98.455793)"
+       transform="matrix(1.045689,0,0,0.98527645,192.54436,-0.46084621)"
        inkscape:transform-center-y="1.576596"
        inkscape:transform-center-x="1.1708959e-05" />
     <g
        id="g4631"
-       style="filter:url(#filter4640)"
-       transform="translate(18.384776,-26.516503)">
+       transform="translate(84.797725,97.391394)">
       <g
          id="g4242"
          transform="matrix(0.84647606,0,0,0.84647606,-167.9198,151.78028)">
@@ -1113,10 +596,10 @@
            y="-96.963028" />
         <text
            xml:space="preserve"
-           x="829.71729"
+           x="869.81427"
            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é</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">Vrac observé</text>
         <rect
            y="-97.070129"
            x="875.44556"
@@ -1126,16 +609,16 @@
            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
            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"
+           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="-79.496262"
-           x="905.71741">00.00 kg</text>
+           y="-78.660912"
+           x="881.07446">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,127.58851,-43.405535)"
+       transform="matrix(1.045689,0,0,0.98527645,193.25146,80.752362)"
        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"
@@ -1148,12 +631,11 @@
        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;filter:url(#filter4065)"
+       style="fill:#006bba;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"
-       style="filter:url(#filter4683)"
-       transform="translate(-8.4852803,-26.162951)">
+       transform="translate(18.384777,96.873626)">
       <g
          transform="matrix(0.84647606,0,0,0.84647606,-8.9848728,212.72655)"
          id="g4258">
@@ -1166,10 +648,10 @@
            y="-168.96303" />
         <text
            xml:space="preserve"
-           x="453.71802"
+           x="495.48569"
            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é</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">Vrac observé</text>
         <rect
            y="-169.07013"
            x="501.44632"
@@ -1179,16 +661,16 @@
            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
            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"
+           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.49626"
-           x="531.71814">00.00 kg</text>
+           y="-151.07858"
+           x="508.74591">00.00 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;filter:url(#filter4065)"
+       style="fill:#006bba;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"
@@ -1201,12 +683,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="matrix(1.045689,0,0,0.98527645,-57.7442,-43.405535)"
+       transform="matrix(1.045689,0,0,0.98527645,-30.874143,79.631042)"
        inkscape:transform-center-y="1.576596" />
     <g
-       style="filter:url(#filter4536)"
        id="marineLitterTotalWeight"
-       transform="matrix(0.88820049,0,0,0.88820049,44.941652,259.07094)">
+       transform="matrix(0.88820049,0,0,0.88820049,172.22087,32.796776)">
       <rect
          y="-240.95483"
          x="765.68683"
@@ -1215,10 +696,10 @@
          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
-         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"
+         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"
-         y="-225.77646"
-         x="821.91687"
+         y="-226.17451"
+         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"
@@ -1228,16 +709,15 @@
          x="882.13428"
          y="-241.08076" />
       <text
-         x="908.49664"
+         x="889.35681"
          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"
+         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>
     </g>
     <g
-       style="filter:url(#filter4536)"
        id="benthosTotalComputedWeight"
-       transform="matrix(0.88820049,0,0,0.88820049,44.941652,252.44181)">
+       transform="matrix(0.88820049,0,0,0.88820049,172.22087,26.167646)">
       <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="benthosTotalComputedWeightLabelRect"
@@ -1246,10 +726,10 @@
          x="765.68683"
          y="-262.64963" />
       <text
-         x="821.91687"
+         x="873.66412"
          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"
+         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"
          xml:space="preserve">Total Benthos</text>
       <rect
          y="-262.77554"
@@ -1259,16 +739,15 @@
          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
-         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"
+         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="908.49664"
+         x="888.79388"
          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)">
+       transform="matrix(0.88820049,0,0,0.88820049,172.22087,19.273356)">
       <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"
@@ -1277,10 +756,10 @@
          x="765.68683"
          y="-284.34442" />
       <text
-         x="821.91687"
+         x="874.46027"
          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"
+         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"
          xml:space="preserve">Total Espèces</text>
       <rect
          y="-284.47034"
@@ -1290,11 +769,63 @@
          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"
+         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="908.49664"
+         x="889.91974"
          xml:space="preserve">00.00 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.8772"
+       y="138.49066"
+       id="ratioSpeciesSampleSortedOverSpeciesSortedWeightLabel"
+       sodipodi:linespacing="125%"
+       inkscape:label="#text3186" />
+    <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="140.25211"
+       id="ratioBenthosSampleSortedOverBenthosgitSortedWeightLabel"
+       sodipodi:linespacing="125%" />
+    <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="536.52875"
+       y="-18.190062"
+       id="ratioSortedSortedOverSortedWeightLabel"
+       sodipodi:linespacing="125%" />
+    <text
+       xml:space="preserve"
+       style="font-size:9px;font-style:normal;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="434.4368"
+       y="208.85081"
+       id="speciesSpeciesNumberLabel"
+       sodipodi:linespacing="125%">Nombre d'espèces :</text>
+    <text
+       xml:space="preserve"
+       style="font-size:9px;font-style:normal;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.59515"
+       y="209.14259"
+       id="benthosSpeciesNumberLabel"
+       sodipodi:linespacing="125%"
+       inkscape:transform-center-x="79.903062"
+       inkscape:transform-center-y="-4.5351562">Nombre d'espèces :</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="438.71716"
+       y="209.19144"
+       id="speciesSpeciesNumberValue"
+       sodipodi:linespacing="125%"></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="208.83646"
+       id="benthosSpeciesNumberValue-0"
+       sodipodi:linespacing="125%"></text>
   </g>
 </svg>

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

    

[Tutti-commits] 01/01: refs #6453 ajout des fractions + coloration de certains champs sous certaines conditions

codelutin.com scm