From sletellier@users.labs.libre-entreprise.org Mon Jun 15 00:25:54 2026
From: sletellier@users.labs.libre-entreprise.org
To: isis-fish-commits@list.isis-fish.org
Subject: [Isis-fish-commits] r1871 -
	isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
Date: Tue, 24 Feb 2009 15:52:01 +0100
Message-ID: <20090224145201.46CB8461C6F@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7388448877225256424=="

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

Author: sletellier
Date: 2009-02-24 14:52:00 +0000 (Tue, 24 Feb 2009)
New Revision: 1871

Modified:
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCaptu=
rabilityUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroup=
UI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeaso=
nsUI.jaxx
   isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMont=
hInfoUI.jaxx
Log:
Update matrix bugs fixed

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Populati=
onCapturabilityUI.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapt=
urabilityUI.jaxx	2009-02-24 13:27:40 UTC (rev 1870)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapt=
urabilityUI.jaxx	2009-02-24 14:52:00 UTC (rev 1871)
@@ -43,7 +43,6 @@
 import org.codelutin.math.matrix.gui.MatrixPanelEvent;
 import org.codelutin.math.matrix.gui.MatrixPanelListener;
=20
-
 MatrixPanelListener listener =3D null;
=20
 addPropertyChangeListener("bean", new PropertyChangeListener() {

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Populati=
onGroupUI.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGrou=
pUI.jaxx	2009-02-24 13:27:40 UTC (rev 1870)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGrou=
pUI.jaxx	2009-02-24 14:52:00 UTC (rev 1871)
@@ -45,8 +45,6 @@
 import fr.ifremer.isisfish.entities.PopulationGroupImpl;
 import fr.ifremer.isisfish.entities.Population;
 import fr.ifremer.isisfish.entities.PopulationImpl;
-import org.codelutin.math.matrix.gui.MatrixPanelListener;
-import org.codelutin.math.matrix.gui.MatrixPanelEvent;
 import org.codelutin.math.matrix.AbstractMatrixND;
 import org.codelutin.math.matrix.MatrixND;
=20
@@ -85,6 +83,9 @@
         }
     }
 }
+protected void setMatrix(){
+    fieldPopulationGroupNaturalDeathRate.setMatrix(((AbstractMatrixND)getBea=
n().getNaturalDeathRateMatrix()).getSubMatrixOnSemantic(0, getPopulationGroup=
()));
+}
     ]]>
     </script>
     <Table id=3D'body'>
@@ -93,7 +94,7 @@
                 <JLabel text=3D"isisfish.common.populationGroup" enabled=3D'=
{isActif()}'/>
             </cell>
             <cell columns=3D'2' fill=3D'horizontal' weightx=3D'1.0'>
-                <JComboBox id=3D'fieldPopulationGroupPopulationGroup' onActi=
onPerformed=3D'setPopulationGroup((PopulationGroupImpl)fieldPopulationGroupPo=
pulationGroup.getSelectedItem());getVerifier().addCurrentEntity(getPopulation=
Group());setPopGroupNotNull(getPopulationGroup() !=3D null);' enabled=3D'{isA=
ctif()}'/>
+                <JComboBox id=3D'fieldPopulationGroupPopulationGroup' onActi=
onPerformed=3D'setPopulationGroup((PopulationGroupImpl)fieldPopulationGroupPo=
pulationGroup.getSelectedItem());getVerifier().addCurrentEntity(getPopulation=
Group());setPopGroupNotNull(getPopulationGroup() !=3D null);setMatrix();' ena=
bled=3D'{isActif()}'/>
             </cell>
         </row>
         <row>
@@ -117,7 +118,7 @@
                 <JLabel text=3D"isisfish.populationGroup.naturalDeathRate" e=
nabled=3D'{isPopGroupNotNull()}'/>
             </cell>
             <cell columns=3D'2' fill=3D'both' weightx=3D'1.0' weighty=3D'0.5=
'>
-                <org.codelutin.math.matrix.gui.MatrixPanelEditor id =3D'fiel=
dPopulationGroupNaturalDeathRate' matrix=3D'{getBean() =3D=3D null || getPopu=
lationGroup() =3D=3D null ? null : ((AbstractMatrixND)getBean().getNaturalDea=
thRateMatrix()).getSubMatrixOnSemantic(0, getPopulationGroup())}' enabled=3D'=
{isPopGroupNotNull()}'/>
+                <org.codelutin.math.matrix.gui.MatrixPanelEditor id =3D'fiel=
dPopulationGroupNaturalDeathRate' editable=3D'false' matrix=3D'{getBean() =3D=
=3D null || getPopulationGroup() =3D=3D null ? null : ((AbstractMatrixND)getB=
ean().getNaturalDeathRateMatrix()).getSubMatrixOnSemantic(0, getPopulationGro=
up())}' enabled=3D'{isPopGroupNotNull()}'/>
             </cell>
         </row>
         <row>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Populati=
onSeasonsUI.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeas=
onsUI.jaxx	2009-02-24 13:27:40 UTC (rev 1870)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeas=
onsUI.jaxx	2009-02-24 14:52:00 UTC (rev 1871)
@@ -47,9 +47,12 @@
 import fr.ifremer.isisfish.types.Month;
 import fr.ifremer.isisfish.entities.Population;
 import fr.ifremer.isisfish.entities.PopulationImpl;
+import org.codelutin.math.matrix.gui.MatrixPanelEvent;
+import org.codelutin.math.matrix.gui.MatrixPanelListener;
 import fr.ifremer.isisfish.ui.widget.Interval;
 import fr.ifremer.isisfish.ui.widget.IntervalPanel;
=20
+MatrixPanelListener listener =3D null;
 protected Interval interval =3D null;
 protected IntervalPanel ip =3D new IntervalPanel();
 fieldPopulationSeasonInterval.add(ip, BorderLayout.CENTER);
@@ -133,6 +136,17 @@
=20
     ip.setLabelRenderer(Month.MONTH);
     ip.setModel(interval);
+
+    listener =3D new MatrixPanelListener() {
+
+        @Override
+        public void matrixChanged(MatrixPanelEvent arg0) {
+            if (getPopulationSeasonInfo() !=3D null && fieldPopulationSeason=
ReproductionDistribution.getMatrix() !=3D null){
+                getPopulationSeasonInfo().setLengthChangeMatrix(fieldPopulat=
ionSeasonReproductionDistribution.getMatrix().copy());
+            }
+        }
+    };
+    fieldPopulationSeasonReproductionDistribution.addMatrixListener(listener=
);
 }
 protected void setInterval(){
     if(getPopulationSeasonInfo() !=3D null){
@@ -176,8 +190,12 @@
     getVerifier().addCurrentEntity(getPopulationSeasonInfo());
     setPopSeasonInfoNotNull(getPopulationSeasonInfo() !=3D null);
     setInterval();
+    setMatrix();
     init =3D false;
 }
+protected void setMatrix(){
+    fieldPopulationSeasonReproductionDistribution.setMatrix(getPopulationSea=
sonInfo().getLengthChangeMatrix());
+}
     ]]>
     </script>
     <Table id=3D'body'>

Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/Strategy=
OneMonthInfoUI.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMon=
thInfoUI.jaxx	2009-02-24 13:27:40 UTC (rev 1870)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMon=
thInfoUI.jaxx	2009-02-24 14:52:00 UTC (rev 1871)
@@ -45,10 +45,14 @@
 import fr.ifremer.isisfish.entities.StrategyMonthInfoImpl;
 import fr.ifremer.isisfish.entities.Strategy;
 import fr.ifremer.isisfish.entities.StrategyImpl;
+import org.codelutin.math.matrix.gui.MatrixPanelEvent;
+import org.codelutin.math.matrix.gui.MatrixPanelListener;
 import fr.ifremer.isisfish.types.Month;
 import fr.ifremer.isisfish.entities.TripType;
 import fr.ifremer.isisfish.ui.widget.editor.GenericCell;
=20
+MatrixPanelListener matrixListener =3D null;
+
 int month =3D 0;
 PropertyChangeListener listener =3D null;
=20
@@ -81,7 +85,6 @@
     Strategy strategy =3D (Strategy)getVerifier().getEntity(Strategy.class);
     setBean((StrategyImpl) strategy);
     if (getBean() !=3D null){
-//        setStrategyMonthInfo((StrategyMonthInfoImpl)getBean().getStrategyM=
onthInfo(month));
         Object[] monthInfos =3D getBean().getStrategyMonthInfo().toArray();
         if (monthInfos.length !=3D 0){
             setStrategyMonthInfo((StrategyMonthInfoImpl) monthInfos[month]);
@@ -97,11 +100,25 @@
        for (ActionListener listener : listeners){
            fieldStrategyMonthInfoTripType.addActionListener(listener);
        }
+       setMatrix();
     }
+    matrixListener =3D new MatrixPanelListener() {
+
+        @Override
+        public void matrixChanged(MatrixPanelEvent arg0) {
+            if (getStrategyMonthInfo() !=3D null && fieldStrategyMonthInfoPr=
oportion.getMatrix() !=3D null){
+                getStrategyMonthInfo().setProportionMetier(fieldStrategyMont=
hInfoProportion.getMatrix().copy());
+            }
+        }
+    };
+    fieldStrategyMonthInfoProportion.addMatrixListener(matrixListener);
 }
 public void init(int m){
     month =3D m;
 }
+protected void setMatrix(){
+    fieldStrategyMonthInfoProportion.setMatrix(getStrategyMonthInfo().getPro=
portionMetier() =3D=3D null ? null : getStrategyMonthInfo().getProportionMeti=
er().copy());
+}
     ]]></script>
     <Table id=3D'body'>
         <row>


--===============7388448877225256424==--