From scm@users.codelutin.com Fri Jan 23 14:38:08 2015
From: "codelutin.com scm" <scm@users.codelutin.com>
To: tutti-commits@list.forge.codelutin.com
Subject: [Tutti-commits] 01/01: refs #6453 resize the svg dinacally
Date: Fri, 23 Jan 2015 14:38:08 +0000
Message-ID: <20150123143808.3F7F35C4F39@goh.codelutin.com>
In-Reply-To: <20150123143807.9186.10930@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8411539588891426121=="

--===============8411539588891426121==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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 dfcc32bece205f2ece91017a710824027416c366
Author: Kevin Morin <morin@codelutin.com>
Date:   Fri Jan 23 15:37:22 2015 +0100

    refs #6453 resize the svg dinacally
---
 .../content/operation/catches/EditCatchesUI.jaxx   |  13 +-
 .../operation/catches/EditCatchesUIHandler.java    | 150 +++++++++++--------=
--
 tutti-ui-swing/src/main/resources/EcranResume.svg  |  15 ++-
 3 files changed, 89 insertions(+), 89 deletions(-)

diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/o=
peration/catches/EditCatchesUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer=
/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx
index b9d3491..4f285c1 100644
--- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operatio=
n/catches/EditCatchesUI.jaxx
+++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operatio=
n/catches/EditCatchesUI.jaxx
@@ -113,17 +113,8 @@ public EditCatchesUI(FishingOperationsUI parentUI) {
   <JTabbedPane id=3D'tabPane' constraints=3D'BorderLayout.CENTER'>
     <tab id=3D'svgTab'>
       <JXTitledPanel id=3D'svgTabPane'>
-        <!--JScrollPane id=3D'svgTabScrollPane'>
-          <JPanel layout=3D'{new BorderLayout()}' id=3D'svgCanvasPanel'-->
-            <Table>
-              <row>
-                <cell>
-                  <JPanel id=3D'svgCanvasPanel' layout=3D'{new BorderLayout(=
)}'/>
-                </cell>
-              </row>
-            </Table>
-          <!--/JPanel>
-        </JScrollPane-->
+        <JPanel layout=3D'{new BorderLayout()}' id=3D'svgCanvasPanel'>
+        </JPanel>
       </JXTitledPanel>
     </tab>
=20
diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/o=
peration/catches/EditCatchesUIHandler.java b/tutti-ui-swing/src/main/java/fr/=
ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java
index 612fa46..746dab7 100644
--- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operatio=
n/catches/EditCatchesUIHandler.java
+++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operatio=
n/catches/EditCatchesUIHandler.java
@@ -47,16 +47,11 @@ 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.swing.JSVGCanvas;
-import org.apache.batik.swing.JSVGScrollPane;
-import org.apache.batik.swing.gvt.GVTTreeRendererAdapter;
-import org.apache.batik.swing.gvt.GVTTreeRendererEvent;
 import org.apache.batik.swing.svg.GVTTreeBuilderAdapter;
 import org.apache.batik.swing.svg.GVTTreeBuilderEvent;
-import org.apache.batik.swing.svg.SVGDocumentLoaderAdapter;
-import org.apache.batik.swing.svg.SVGDocumentLoaderEvent;
 import org.apache.batik.util.RunnableQueue;
-import org.apache.batik.util.SVGConstants;
 import org.apache.batik.util.XMLResourceDescriptor;
+import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.jdesktop.swingx.JXTitledPanel;
@@ -67,23 +62,13 @@ 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.SVGLength;
 import org.w3c.dom.svg.SVGRect;
-import org.w3c.dom.svg.SVGSVGElement;
 import org.w3c.dom.svg.SVGStylable;
=20
-import javax.swing.JComponent;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JTabbedPane;
+import javax.swing.*;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import java.awt.*;
-import java.awt.event.ComponentAdapter;
-import java.awt.event.ComponentEvent;
-import java.awt.geom.AffineTransform;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.io.IOException;
@@ -234,56 +219,62 @@ public class EditCatchesUIHandler extends AbstractTutti=
TabContainerUIHandler<Edi
         });
=20
         try {
-            // Parse the barChart.svg file into a Document.
-            String parser =3D XMLResourceDescriptor.getXMLParserClassName();
-            SAXSVGDocumentFactory f =3D new SAXSVGDocumentFactory(parser);
-            URL url =3D Resource.getURL("EcranResume.svg");
-            svgDocument =3D f.createDocument(url.toString());
-
-            canvas =3D new JSVGCanvas();
-            ui.getSvgCanvasPanel().add(canvas, BorderLayout.CENTER);
-            canvas.setRecenterOnResize(true);
-
-            canvas.addGVTTreeBuilderListener(new GVTTreeBuilderAdapter() {
-                public void gvtBuildCompleted(GVTTreeBuilderEvent e) {
-
-                    TuttiConfiguration config =3D getConfig();
-                    WeightUnit catchWeightUnit =3D WeightUnit.KG;
-                    WeightUnit speciesWeightUnit =3D config.getSpeciesWeight=
Unit();
-                    WeightUnit benthosWeightUnit =3D config.getBenthosWeight=
Unit();
-                    WeightUnit marineLitterWeightUnit =3D config.getMarineLi=
tterWeightUnit();
-
-                    initSvgField(CatchBatch.PROPERTY_CATCH_TOTAL_WEIGHT, get=
Model().getCatchTotalComputedOrNotWeight(), catchWeightUnit);
-                    initSvgField(CatchBatch.PROPERTY_CATCH_TOTAL_REJECTED_WE=
IGHT, getModel().getCatchTotalRejectedComputedOrNotWeight(), catchWeightUnit);
-                    initSvgField(CatchBatch.PROPERTY_SPECIES_TOTAL_SORTED_WE=
IGHT, getModel().getSpeciesTotalSortedComputedOrNotWeight(), speciesWeightUni=
t);
-                    initSvgField(CatchBatch.PROPERTY_BENTHOS_TOTAL_SORTED_WE=
IGHT, getModel().getBenthosTotalSortedComputedOrNotWeight(), benthosWeightUni=
t);
-                    initSvgField(CatchBatch.PROPERTY_MARINE_LITTER_TOTAL_WEI=
GHT, getModel().getMarineLitterTotalComputedOrNotWeight(), marineLitterWeight=
Unit);
-
-                    initSvgField(CatchBatch.PROPERTY_CATCH_TOTAL_SORTED_COMP=
UTED_WEIGHT, catchWeightUnit);
-                    initSvgField(CatchBatch.PROPERTY_CATCH_TOTAL_SORTED_SORT=
ED_COMPUTED_WEIGHT, catchWeightUnit);
-                    initSvgField(CatchBatch.PROPERTY_CATCH_TOTAL_UNSORTED_CO=
MPUTED_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_SO=
RTED_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_SO=
RTED_COMPUTED_WEIGHT, benthosWeightUnit);
+            initResumeSvg();
=20
-                }
-            });
-
-            canvas.setDocumentState(JSVGCanvas.ALWAYS_DYNAMIC);
-            canvas.setDocument(svgDocument);
-
-        } catch (IOException e) {
+        } catch (IOException err) {
             if (log.isErrorEnabled()) {
-                log.error("error while initializing the resume background", =
e);
+                log.error("error while initializing the resume background", =
err);
             }
-            getContext().getErrorHelper().showErrorDialog(t("tutti.editCatch=
Batch.svgLoading.error"), e);
+            getContext().getErrorHelper().showErrorDialog(t("tutti.editCatch=
Batch.svgLoading.error"), err);
         }
+    }
+
+    public void initResumeSvg() throws IOException {
+        String parser =3D XMLResourceDescriptor.getXMLParserClassName();
+        SAXSVGDocumentFactory f =3D new SAXSVGDocumentFactory(parser);
+        URL url =3D Resource.getURL("EcranResume.svg");
+        svgDocument =3D f.createDocument(url.toString());
+
+        canvas =3D new JSVGCanvas();
+        canvas.setSize(new Dimension(700, 300));
+        canvas.setMySize(new Dimension(700, 300));
+
+        getUI().getSvgCanvasPanel().add(canvas, BorderLayout.CENTER);
+
+        canvas.setRecenterOnResize(true);
+
+        canvas.addGVTTreeBuilderListener(new GVTTreeBuilderAdapter() {
+            public void gvtBuildCompleted(GVTTreeBuilderEvent e) {
+
+                TuttiConfiguration config =3D getConfig();
+                WeightUnit catchWeightUnit =3D WeightUnit.KG;
+                WeightUnit speciesWeightUnit =3D config.getSpeciesWeightUnit=
();
+                WeightUnit benthosWeightUnit =3D config.getBenthosWeightUnit=
();
+                WeightUnit marineLitterWeightUnit =3D config.getMarineLitter=
WeightUnit();
+
+                initSvgField(CatchBatch.PROPERTY_CATCH_TOTAL_WEIGHT, getMode=
l().getCatchTotalComputedOrNotWeight(), catchWeightUnit);
+                initSvgField(CatchBatch.PROPERTY_CATCH_TOTAL_REJECTED_WEIGHT=
, getModel().getCatchTotalRejectedComputedOrNotWeight(), catchWeightUnit);
+                initSvgField(CatchBatch.PROPERTY_SPECIES_TOTAL_SORTED_WEIGHT=
, getModel().getSpeciesTotalSortedComputedOrNotWeight(), speciesWeightUnit);
+                initSvgField(CatchBatch.PROPERTY_BENTHOS_TOTAL_SORTED_WEIGHT=
, getModel().getBenthosTotalSortedComputedOrNotWeight(), benthosWeightUnit);
+                initSvgField(CatchBatch.PROPERTY_MARINE_LITTER_TOTAL_WEIGHT,=
 getModel().getMarineLitterTotalComputedOrNotWeight(), marineLitterWeightUnit=
);
=20
+                initSvgField(CatchBatch.PROPERTY_CATCH_TOTAL_SORTED_COMPUTED=
_WEIGHT, catchWeightUnit);
+                initSvgField(CatchBatch.PROPERTY_CATCH_TOTAL_SORTED_SORTED_C=
OMPUTED_WEIGHT, catchWeightUnit);
+                initSvgField(CatchBatch.PROPERTY_CATCH_TOTAL_UNSORTED_COMPUT=
ED_WEIGHT, catchWeightUnit);
+
+                initSvgField(CatchBatch.PROPERTY_SPECIES_TOTAL_COMPUTED_WEIG=
HT, speciesWeightUnit);
+                initSvgField(CatchBatch.PROPERTY_SPECIES_TOTAL_UNSORTED_COMP=
UTED_WEIGHT, speciesWeightUnit);
+                initSvgField(CatchBatch.PROPERTY_SPECIES_TOTAL_SAMPLE_SORTED=
_COMPUTED_WEIGHT, speciesWeightUnit);
+
+                initSvgField(CatchBatch.PROPERTY_BENTHOS_TOTAL_COMPUTED_WEIG=
HT, benthosWeightUnit);
+                initSvgField(CatchBatch.PROPERTY_BENTHOS_TOTAL_UNSORTED_COMP=
UTED_WEIGHT, benthosWeightUnit);
+                initSvgField(CatchBatch.PROPERTY_BENTHOS_TOTAL_SAMPLE_SORTED=
_COMPUTED_WEIGHT, benthosWeightUnit);
+
+            }
+        });
+
+        canvas.setDocumentState(JSVGCanvas.ALWAYS_DYNAMIC);
+        canvas.setDocument(svgDocument);
     }
=20
     protected void initSvgField(String property, WeightUnit weightUnit) {
@@ -330,18 +321,33 @@ public class EditCatchesUIHandler extends AbstractTutti=
TabContainerUIHandler<Edi
         if (computableData =3D=3D null) {
=20
             // computed data value
+            OnDataOrComputedDataValueChangedListener listener =3D new OnData=
OrComputedDataValueChangedListener(property, weightUnit, true, canvas, svgDoc=
ument, colorComputedWeights);
+            EditCatchesUIModel model =3D getModel();
+            String propertyValue =3D null;
+            try {
+                propertyValue =3D BeanUtils.getProperty(model, property);
+
+            } catch (ReflectiveOperationException e) {
+                if (log.isErrorEnabled()) {
+                    log.error("Error while getting model's property " + prop=
erty, e);
+                }
+            }
+            Float value =3D propertyValue !=3D null ? Float.valueOf(property=
Value) : null;
+            listener.updateValue(value, true);
+            model.addPropertyChangeListener(property, listener);
=20
-            getModel().addPropertyChangeListener(property, new OnDataOrCompu=
tedDataValueChangedListener(property, weightUnit, true, canvas, svgDocument, =
colorComputedWeights));
         } else {
=20
             // data or computed data value
-
             Element element =3D svgDocument.getElementById(property);
             EventTarget target =3D (EventTarget) element;
             target.addEventListener("click", new OnValueClickListener(comput=
ableData, property, weightUnit), false);
=20
-            computableData.addPropertyChangeListener(new OnDataOrComputedDat=
aValueChangedListener(property, weightUnit, false, canvas, svgDocument, color=
ComputedWeights));
-
+            OnDataOrComputedDataValueChangedListener listener =3D new OnData=
OrComputedDataValueChangedListener(property, weightUnit, false, canvas, svgDo=
cument, colorComputedWeights);
+            boolean computed =3D computableData.getData() =3D=3D null;
+            Float value =3D computableData.getDataOrComputedData();
+            listener.updateValue(value, computed);
+            computableData.addPropertyChangeListener(listener);
         }
     }
=20
@@ -955,25 +961,25 @@ public class EditCatchesUIHandler extends AbstractTutti=
TabContainerUIHandler<Edi
                 }
=20
             }
-            updateValue(property, newValue, weightUnit, computedData);
+            updateValue(newValue, computedData);
=20
         }
=20
-        protected void updateValue(final String id, final Float value, final=
 WeightUnit unit, final boolean computed) {
+        public void updateValue(final Float value, final boolean computed) {
=20
             getUpdateRunnableQueue().invokeLater
                     (new Runnable() {
                         public void run() {
                             if (log.isDebugEnabled()) {
-                                log.debug("update " + id + " field");
+                                log.debug("update " + property + " field");
                             }
=20
-                            Element element =3D svgDocument.getElementById(i=
d + "Value");
+                            Element element =3D svgDocument.getElementById(p=
roperty + "Value");
                             if (element =3D=3D null) {
                                 return;
                             }
=20
-                            Element rectElement =3D svgDocument.getElementBy=
Id(id + "Rect");
+                            Element rectElement =3D svgDocument.getElementBy=
Id(property + "Rect");
                             SVGOMRectElement rectElem =3D (SVGOMRectElement)=
 rectElement;
                             SVGRect bbox =3D rectElem.getBBox();
                             Float x =3D bbox.getX();
@@ -981,7 +987,7 @@ public class EditCatchesUIHandler extends AbstractTuttiTa=
bContainerUIHandler<Edi
                             //TODO i18n ?
                             String textContent;
                             if (value !=3D null) {
-                                textContent =3D Weights.getWeightStringValue=
(value) + " " + unit.getShortLabel();
+                                textContent =3D Weights.getWeightStringValue=
(value) + " " + weightUnit.getShortLabel();
                             } else {
                                 textContent =3D null;
                             }
diff --git a/tutti-ui-swing/src/main/resources/EcranResume.svg b/tutti-ui-swi=
ng/src/main/resources/EcranResume.svg
index efb6873..0c8e16f 100644
--- a/tutti-ui-swing/src/main/resources/EcranResume.svg
+++ b/tutti-ui-swing/src/main/resources/EcranResume.svg
@@ -9,14 +9,17 @@
    xmlns=3D"http://www.w3.org/2000/svg"
    xmlns:sodipodi=3D"http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape=3D"http://www.inkscape.org/namespaces/inkscape"
-   width=3D"700"
-   height=3D"350"
+   inkscape:version=3D"0.48.3.1 r9886"
+   sodipodi:docname=3D"EcranResume.svg"
+   version=3D"1.1"
+   x=3D"0px"
+   y=3D"0px"
+   width=3D"700px"
+   height=3D"350px"
    viewport=3D"0 0 700 350"
+   viewBox=3D"0 0 700 350"
    id=3D"svg2985"
-   preserveAspectRatio=3D"xMidYMid"
-   version=3D"1.1"
-   inkscape:version=3D"0.48.3.1 r9886"
-   sodipodi:docname=3D"EcranResume.svg">
+   preserveAspectRatio=3D"xMidYMid">
   <defs
      id=3D"defs2987">
     <filter

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

--===============8411539588891426121==--


From scm@users.codelutin.com Fri Jan 23 14:38:08 2015
From: "codelutin.com scm" <scm@users.codelutin.com>
To: tutti-commits@list.forge.codelutin.com
Subject: [Tutti-commits] branch develop updated (43ef7e4 -> dfcc32b)
Date: Fri, 23 Jan 2015 14:38:07 +0000
Message-ID: <20150123143807.9186.10930@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2368275549497920942=="

--===============2368275549497920942==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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

New change to branch develop in repository tutti.

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

      from  43ef7e4   refs #6453 [CAPTURE] compl=C3=A9ter l'=C3=A9cran r=C3=
=A9sum=C3=A9 avec un poids label non modifiables en italique
       new  dfcc32b   refs #6453 resize the svg dinacally

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Detailed log of new commits:

commit dfcc32bece205f2ece91017a710824027416c366
Author: Kevin Morin <morin@codelutin.com>
Date:   Fri Jan 23 15:37:22 2015 +0100

    refs #6453 resize the svg dinacally

Summary of changes:
 .../content/operation/catches/EditCatchesUI.jaxx   |  13 +-
 .../operation/catches/EditCatchesUIHandler.java    | 150 +++++++++++--------=
--
 tutti-ui-swing/src/main/resources/EcranResume.svg  |  15 ++-
 3 files changed, 89 insertions(+), 89 deletions(-)

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

--===============2368275549497920942==--