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/PopulationCapturabilityUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx Log: Update matrix bugs fixed Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2009-02-24 13:27:40 UTC (rev 1870) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.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; - MatrixPanelListener listener = null; addPropertyChangeListener("bean", new PropertyChangeListener() { Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2009-02-24 13:27:40 UTC (rev 1870) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.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; @@ -85,6 +83,9 @@ } } } +protected void setMatrix(){ + fieldPopulationGroupNaturalDeathRate.setMatrix(((AbstractMatrixND)getBean().getNaturalDeathRateMatrix()).getSubMatrixOnSemantic(0, getPopulationGroup())); +} ]]> </script> <Table id='body'> @@ -93,7 +94,7 @@ <JLabel text="isisfish.common.populationGroup" enabled='{isActif()}'/> </cell> <cell columns='2' fill='horizontal' weightx='1.0'> - <JComboBox id='fieldPopulationGroupPopulationGroup' onActionPerformed='setPopulationGroup((PopulationGroupImpl)fieldPopulationGroupPopulationGroup.getSelectedItem());getVerifier().addCurrentEntity(getPopulationGroup());setPopGroupNotNull(getPopulationGroup() != null);' enabled='{isActif()}'/> + <JComboBox id='fieldPopulationGroupPopulationGroup' onActionPerformed='setPopulationGroup((PopulationGroupImpl)fieldPopulationGroupPopulationGroup.getSelectedItem());getVerifier().addCurrentEntity(getPopulationGroup());setPopGroupNotNull(getPopulationGroup() != null);setMatrix();' enabled='{isActif()}'/> </cell> </row> <row> @@ -117,7 +118,7 @@ <JLabel text="isisfish.populationGroup.naturalDeathRate" enabled='{isPopGroupNotNull()}'/> </cell> <cell columns='2' fill='both' weightx='1.0' weighty='0.5'> - <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='fieldPopulationGroupNaturalDeathRate' matrix='{getBean() == null || getPopulationGroup() == null ? null : ((AbstractMatrixND)getBean().getNaturalDeathRateMatrix()).getSubMatrixOnSemantic(0, getPopulationGroup())}' enabled='{isPopGroupNotNull()}'/> + <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='fieldPopulationGroupNaturalDeathRate' editable='false' matrix='{getBean() == null || getPopulationGroup() == null ? null : ((AbstractMatrixND)getBean().getNaturalDeathRateMatrix()).getSubMatrixOnSemantic(0, getPopulationGroup())}' enabled='{isPopGroupNotNull()}'/> </cell> </row> <row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-02-24 13:27:40 UTC (rev 1870) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.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; +MatrixPanelListener listener = null; protected Interval interval = null; protected IntervalPanel ip = new IntervalPanel(); fieldPopulationSeasonInterval.add(ip, BorderLayout.CENTER); @@ -133,6 +136,17 @@ ip.setLabelRenderer(Month.MONTH); ip.setModel(interval); + + listener = new MatrixPanelListener() { + + @Override + public void matrixChanged(MatrixPanelEvent arg0) { + if (getPopulationSeasonInfo() != null && fieldPopulationSeasonReproductionDistribution.getMatrix() != null){ + getPopulationSeasonInfo().setLengthChangeMatrix(fieldPopulationSeasonReproductionDistribution.getMatrix().copy()); + } + } + }; + fieldPopulationSeasonReproductionDistribution.addMatrixListener(listener); } protected void setInterval(){ if(getPopulationSeasonInfo() != null){ @@ -176,8 +190,12 @@ getVerifier().addCurrentEntity(getPopulationSeasonInfo()); setPopSeasonInfoNotNull(getPopulationSeasonInfo() != null); setInterval(); + setMatrix(); init = false; } +protected void setMatrix(){ + fieldPopulationSeasonReproductionDistribution.setMatrix(getPopulationSeasonInfo().getLengthChangeMatrix()); +} ]]> </script> <Table id='body'> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2009-02-24 13:27:40 UTC (rev 1870) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.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; +MatrixPanelListener matrixListener = null; + int month = 0; PropertyChangeListener listener = null; @@ -81,7 +85,6 @@ Strategy strategy = (Strategy)getVerifier().getEntity(Strategy.class); setBean((StrategyImpl) strategy); if (getBean() != null){ -// setStrategyMonthInfo((StrategyMonthInfoImpl)getBean().getStrategyMonthInfo(month)); Object[] monthInfos = getBean().getStrategyMonthInfo().toArray(); if (monthInfos.length != 0){ setStrategyMonthInfo((StrategyMonthInfoImpl) monthInfos[month]); @@ -97,11 +100,25 @@ for (ActionListener listener : listeners){ fieldStrategyMonthInfoTripType.addActionListener(listener); } + setMatrix(); } + matrixListener = new MatrixPanelListener() { + + @Override + public void matrixChanged(MatrixPanelEvent arg0) { + if (getStrategyMonthInfo() != null && fieldStrategyMonthInfoProportion.getMatrix() != null){ + getStrategyMonthInfo().setProportionMetier(fieldStrategyMonthInfoProportion.getMatrix().copy()); + } + } + }; + fieldStrategyMonthInfoProportion.addMatrixListener(matrixListener); } public void init(int m){ month = m; } +protected void setMatrix(){ + fieldStrategyMonthInfoProportion.setMatrix(getStrategyMonthInfo().getProportionMetier() == null ? null : getStrategyMonthInfo().getProportionMetier().copy()); +} ]]></script> <Table id='body'> <row>