- Isis-fish-commits - mailman.cloud.codelutin.com

r2289 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org 27 May '09

27 May '09

Author: chatellier Date: 2009-05-27 17:01:22 +0000 (Wed, 27 May 2009) New Revision: 2289 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx Log: Switch la matric a chaque clic spacialise/non spacialise Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx 2009-05-27 16:37:08 UTC (rev 2288) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx 2009-05-27 17:01:22 UTC (rev 2289) @@ -67,8 +67,8 @@ lengthChangeMatrix = popInfo.unspacializeLengthChangeMatrix(lengthChangeMatrix); } else { lengthChangeMatrix = popInfo.spacializeLengthChangeMatrix(lengthChangeMatrix); - popInfo.setLengthChangeMatrix(lengthChangeMatrix); } + popInfo.setLengthChangeMatrix(lengthChangeMatrix); } } catch(Exception eee) { if (log.isErrorEnabled()) {

1 0

r2288 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org 27 May '09

27 May '09

Author: chatellier Date: 2009-05-27 16:37:08 +0000 (Wed, 27 May 2009) New Revision: 2288 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx Log: Fix switch to non spacialized event triggered at UI init. Improve jaxx code. Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx 2009-05-27 14:54:20 UTC (rev 2287) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonSpacializedUI.jaxx 2009-05-27 16:37:08 UTC (rev 2288) @@ -1,13 +1,30 @@ - + + <fr.ifremer.isisfish.ui.input.InputContentUI>  <fr.ifremer.isisfish.entities.PopulationImpl id='bean' javaBean='null'/> - <fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl id='populationSeasonInfo' javaBean='null'/> <Boolean id='popSeasonInfoNotNull' javaBean='false'/> - <Boolean id='ageGroupType' javaBean='false'/> <script><![CDATA[ @@ -19,57 +36,66 @@ import org.codelutin.math.matrix.gui.MatrixPanelListener; import jaxx.runtime.swing.ErrorDialogUI; -protected MatrixPanelListener listener = null; +protected MatrixPanelListener matrixPanelListener; -listener = new MatrixPanelListener() { - +matrixPanelListener = new MatrixPanelListener() { @Override - public void matrixChanged(MatrixPanelEvent arg0) { - if (getPopulationSeasonInfo() != null && fieldPopulationSeasonReproductionDistribution.getMatrix() != null){ - getPopulationSeasonInfo().setLengthChangeMatrix(fieldPopulationSeasonReproductionDistribution.getMatrix().copy()); + public void matrixChanged(MatrixPanelEvent event) { + if (getPopulationSeasonInfo() != null && matrixPanelPopulationSeasonLengthChange.getMatrix() != null) { + // must be a copy for fire event + MatrixND lengthChangeMatrix = matrixPanelPopulationSeasonLengthChange.getMatrix().copy(); + getPopulationSeasonInfo().setLengthChangeMatrix(lengthChangeMatrix); } } }; -public void refresh(){ - fieldPopulationSeasonReproductionDistribution.addMatrixListener(listener); + +public void refresh() { + matrixPanelPopulationSeasonLengthChange.addMatrixListener(matrixPanelListener); } -public void spacialized(){ - getPopulationSeasonInfo().setSimpleLengthChangeMatrix(labelPopulationSeasonGroupChangeLengthNoSpacialized.isSelected()); + +/** + * Called on spacialized radio button change. + */ +protected void spacializedActionPerformed() { PopulationSeasonInfo popInfo = getPopulationSeasonInfo(); + boolean spacializedSelection = radioPopulationSeasonGroupChangeLengthNoSpacialized.isSelected(); + popInfo.setSimpleLengthChangeMatrix(spacializedSelection); try { - MatrixND mat = popInfo.getLengthChangeMatrix(); - if (mat != null){ + MatrixND lengthChangeMatrix = popInfo.getLengthChangeMatrix(); + if (lengthChangeMatrix != null) { if (popInfo.getSimpleLengthChangeMatrix()) { - mat = popInfo.unspacializeLengthChangeMatrix(mat); + lengthChangeMatrix = popInfo.unspacializeLengthChangeMatrix(lengthChangeMatrix); } else { - mat = popInfo.spacializeLengthChangeMatrix(mat); - popInfo.setLengthChangeMatrix(mat); + lengthChangeMatrix = popInfo.spacializeLengthChangeMatrix(lengthChangeMatrix); + popInfo.setLengthChangeMatrix(lengthChangeMatrix); } } - }catch(Exception eee){ - log.error("Can't (un)spacialize Matrix Change Of Group", eee); + } catch(Exception eee) { + if (log.isErrorEnabled()) { + log.error("Can't (un)spacialize Matrix Change Of Group", eee); + } ErrorDialogUI.showError(eee); } } -public void computeMatrixChangeOfGroup(){ +protected void computeMatrixChangeOfGroup() { PopulationSeasonInfo popInfo = getPopulationSeasonInfo(); - MatrixND mat = popInfo.computeLengthChangeMatrix(); - if(!popInfo.getSimpleLengthChangeMatrix()){ - mat = popInfo.spacializeLengthChangeMatrix(mat); + MatrixND lengthChangeMatrix = popInfo.computeLengthChangeMatrix(); + if (!popInfo.getSimpleLengthChangeMatrix()){ + lengthChangeMatrix = popInfo.spacializeLengthChangeMatrix(lengthChangeMatrix); } - popInfo.setLengthChangeMatrix(mat); + popInfo.setLengthChangeMatrix(lengthChangeMatrix); } -public void showSpacializedMatrixChangeOfGroup(){ +protected void showSpacializedMatrixChangeOfGroup() { PopulationSeasonInfo popInfo = getPopulationSeasonInfo(); - MatrixND mat = popInfo.getLengthChangeMatrix(); - if(popInfo.getSimpleLengthChangeMatrix()){ - mat = popInfo.spacializeLengthChangeMatrix(mat); + MatrixND lengthChangeMatrix = popInfo.getLengthChangeMatrix(); + if (popInfo.getSimpleLengthChangeMatrix()){ + lengthChangeMatrix = popInfo.spacializeLengthChangeMatrix(lengthChangeMatrix); } JAXXMatrixEditor panel = new JAXXMatrixEditor(false, 800, 300); - panel.setMatrix(mat); - JOptionPane.showMessageDialog(null, panel, _("isisfish.message.spacialized.visualisation"), JOptionPane.INFORMATION_MESSAGE); + panel.setMatrix(lengthChangeMatrix); + JOptionPane.showMessageDialog(null, panel, _("isisfish.populationSeasons.spacialized.visualisation"), JOptionPane.INFORMATION_MESSAGE); } ]]></script> @@ -79,19 +105,20 @@ <Panel/> </cell> <cell fill='horizontal' weightx='0.5'> - <JRadioButton id="labelPopulationSeasonGroupChangeLengthNoSpacialized" - buttonGroup="labelPopulationSeasonGroupChangeLengthSpacializedGroup" + <JRadioButton id="radioPopulationSeasonGroupChangeLengthNoSpacialized" + buttonGroup="radioPopulationSeasonGroupChangeLengthSpacializedGroup" selected='{getPopulationSeasonInfo().getSimpleLengthChangeMatrix()}' - text="isisfish.populationSeasons.noSpacialized" decorator='boxed' - enabled='{isPopSeasonInfoNotNull()}' onItemStateChanged='spacialized()' - visible='{isAgeGroupType()}'/> + enabled='{isPopSeasonInfoNotNull()}' + text="isisfish.populationSeasons.noSpacialized" onActionPerformed='spacializedActionPerformed()' + visible='{isAgeGroupType()}' decorator='boxed' /> </cell> <cell fill='horizontal' weightx='0.5'> - <JRadioButton id="labelPopulationSeasonGroupChangeLengthSpacialized" - buttonGroup="labelPopulationSeasonGroupChangeLengthSpacializedGroup" + <JRadioButton id="radioPopulationSeasonGroupChangeLengthSpacialized" + buttonGroup="radioPopulationSeasonGroupChangeLengthSpacializedGroup" selected='{!getPopulationSeasonInfo().getSimpleLengthChangeMatrix()}' - text="isisfish.populationSeasons.spacialized" enabled='{isPopSeasonInfoNotNull()}' - visible='{isAgeGroupType()}' decorator='boxed'/> + enabled='{isPopSeasonInfoNotNull()}' + text="isisfish.populationSeasons.spacialized" onActionPerformed='spacializedActionPerformed()' + visible='{isAgeGroupType()}' decorator='boxed' /> </cell> </row> <row> @@ -103,8 +130,8 @@ enabled='{isPopSeasonInfoNotNull()}' onActionPerformed='computeMatrixChangeOfGroup()'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JButton id="labelPopulationSeasonGroupChangeLengthButtonShow" text="isisfish.populationSeasons.showSpacialized" - enabled='{labelPopulationSeasonGroupChangeLengthNoSpacialized.isSelected()}' decorator='boxed' + <JButton id="buttonPopulationSeasonGroupChangeLengthButtonShow" text="isisfish.populationSeasons.showSpacialized" + enabled='{radioPopulationSeasonGroupChangeLengthNoSpacialized.isSelected()}' decorator='boxed' onActionPerformed='showSpacializedMatrixChangeOfGroup()' visible='{isAgeGroupType()}'/> </cell> @@ -114,10 +141,11 @@ <Panel/> </cell> <cell columns='2' fill='both' weightx='1.0' weighty='1.0'> - <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='fieldPopulationSeasonReproductionDistribution' - matrix='{getPopulationSeasonInfo() == null ? null : getPopulationSeasonInfo().getLengthChangeMatrix()}' enabled='{isPopSeasonInfoNotNull()}' - decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"LengthChangeMatrix"' - visible='{isAgeGroupType()}'/> + <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='matrixPanelPopulationSeasonLengthChange' + matrix='{getPopulationSeasonInfo() == null ? null : getPopulationSeasonInfo().getLengthChangeMatrix().copy()}' + enabled='{isPopSeasonInfoNotNull()}' + _bean='{PopulationSeasonInfoImpl.class}' _method='"LengthChangeMatrix"' + visible='{isAgeGroupType()}' decorator='boxed' /> </cell> </row> </Table>

1 0

r2287 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 27 May '09

27 May '09

Author: chatellier Date: 2009-05-27 14:54:20 +0000 (Wed, 27 May 2009) New Revision: 2287 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java Log: Remove space in i18n key Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2009-05-27 14:26:59 UTC (rev 2286) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/InProcessSimulatorLauncher.java 2009-05-27 14:54:20 UTC (rev 2287) @@ -218,7 +218,7 @@ libLogLevel, simThread.getName()); } catch (Exception e) { if (log.isWarnEnabled()) { - log.warn(_("isisfish.error.add.logger.simulation ", e)); + log.warn(_("isisfish.error.add.logger.simulation", e)); } } try {

1 0

r2286 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org 27 May '09

27 May '09

Author: chatellier Date: 2009-05-27 14:26:59 +0000 (Wed, 27 May 2009) New Revision: 2286 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx Log: Set a matrix copy for modification detected by fire event 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-05-27 14:26:27 UTC (rev 2285) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-05-27 14:26:59 UTC (rev 2286) @@ -39,7 +39,7 @@ import org.codelutin.math.matrix.gui.MatrixPanelEvent; import org.codelutin.math.matrix.gui.MatrixPanelListener; -protected MatrixPanelListener matrixSeasonReproductionDistributionPanelListener; +protected MatrixPanelListener matrixPanelListener; protected Interval seasonInterval; protected boolean init = false;

1 0

r2285 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org 27 May '09

27 May '09

Author: chatellier Date: 2009-05-27 14:26:27 +0000 (Wed, 27 May 2009) New Revision: 2285 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx Log: Set a matrix copy for modification detected by fire event 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-05-27 09:11:47 UTC (rev 2284) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-05-27 14:26:27 UTC (rev 2285) @@ -39,8 +39,8 @@ import org.codelutin.math.matrix.gui.MatrixPanelEvent; import org.codelutin.math.matrix.gui.MatrixPanelListener; -protected MatrixPanelListener matrixPanelListener = null; -protected Interval seasonInterval = null; +protected MatrixPanelListener matrixSeasonReproductionDistributionPanelListener; +protected Interval seasonInterval; protected boolean init = false; /* @@ -207,13 +207,14 @@ setPopSeasonInfoNotNull(getPopulationSeasonInfo() != null); setSeasonInterval(); setReproductionDistributionMatrix(); - //getVerifier().addCurrentEntity(getPopulationSeasonInfo()); + getVerifier().addCurrentEntity(getPopulationSeasonInfo()); init = false; } protected void setReproductionDistributionMatrix() { MatrixND reproductionDistribution = getPopulationSeasonInfo().getReproductionDistribution(); - fieldPopulationSeasonReproductionDistribution.setMatrix(reproductionDistribution); + // must be a copy (otherwise, modify current entity matrix) + fieldPopulationSeasonReproductionDistribution.setMatrix(reproductionDistribution.copy()); } // TODO une methode isXXX ne prend pas de parametre

1 0

r2284 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher
by chatellier＠users.labs.libre-entreprise.org 27 May '09

27 May '09

Author: chatellier Date: 2009-05-27 09:11:47 +0000 (Wed, 27 May 2009) New Revision: 2284 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java Log: Ajout de l'appel ?\195?\160 la m?\195?\169thode init() des plans d'analyse Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2009-05-26 15:52:43 UTC (rev 2283) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/launcher/SimulationService.java 2009-05-27 09:11:47 UTC (rev 2284) @@ -691,6 +691,15 @@ control = job.getItem().getControl(); param = job.getItem().getParameter(); this.planContext = new AnalysePlanContext(control.getId(), param); + + try { + // appel de init sur chaque plan + for (AnalysePlan plan : param.getAnalysePlans()) { + plan.init(planContext); + } + } catch (Exception eee) { + throw new IsisFishRuntimeException(_("isisfish.error.evaluate.preplan.script"), eee); + } } /**

1 0

r2283 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org 26 May '09

26 May '09

Author: chatellier Date: 2009-05-26 15:52:43 +0000 (Tue, 26 May 2009) New Revision: 2283 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx Log: Display correct distributionReproduction matrix (cut&paste ?). Refactor all UI (beautiful variables names, etc...) 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-05-26 13:58:39 UTC (rev 2282) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-05-26 15:52:43 UTC (rev 2283) @@ -28,16 +28,19 @@ <Boolean id='popSeasonInfoNotNull' javaBean='false'/> <script><![CDATA[ +import fr.ifremer.isisfish.entities.PopulationSeasonInfo; import fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl; import fr.ifremer.isisfish.types.Month; import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.entities.PopulationImpl; +import fr.ifremer.isisfish.ui.widget.Interval; +import fr.ifremer.isisfish.ui.widget.IntervalPanel; +import org.codelutin.math.matrix.MatrixND; import org.codelutin.math.matrix.gui.MatrixPanelEvent; import org.codelutin.math.matrix.gui.MatrixPanelListener; -import fr.ifremer.isisfish.ui.widget.Interval; -protected MatrixPanelListener listener = null; -protected Interval interval = null; +protected MatrixPanelListener matrixPanelListener = null; +protected Interval seasonInterval = null; protected boolean init = false; /* @@ -45,19 +48,19 @@ * When first is set, last value from getPopulationSeasonInfo() * is erased by interval.getLast() default value. */ -ip.addPropertyChangeListener("first", new PropertyChangeListener() { +seasonIntervalPanel.addPropertyChangeListener("first", new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { if (getPopulationSeasonInfo() != null) { - getPopulationSeasonInfo().setFirstMonth(new Month(interval.getFirst())); + getPopulationSeasonInfo().setFirstMonth(new Month(seasonInterval.getFirst())); } } }); -ip.addPropertyChangeListener("last", new PropertyChangeListener() { +seasonIntervalPanel.addPropertyChangeListener("last", new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { if (getPopulationSeasonInfo() != null) { - getPopulationSeasonInfo().setLastMonth(new Month(interval.getLast())); + getPopulationSeasonInfo().setLastMonth(new Month(seasonInterval.getLast())); } } }); @@ -65,56 +68,54 @@ addPropertyChangeListener("bean", new PropertyChangeListener() { public void propertyChange(PropertyChangeEvent evt) { if (evt.getOldValue() != null || evt.getNewValue() == null) { - // remove previous binding on getBean() - //jaxx.runtime.SwingUtil.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text"); fieldPopulationSeasonComment.setText(""); fieldPopulationSeasonReproductionDistribution.setMatrix(null); } if (evt.getNewValue() != null) { - // add binding on getBean() - //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text"); + } } }); create.addActionListener(new ActionListener() { - @Override public void actionPerformed(ActionEvent e) { getContextValue(InputAction.class).createPopulationSeasonInfo(getBean()); - setCombo(); + setPopulationSeasonInfoCombo(); } }); remove.addActionListener(new ActionListener() { - @Override public void actionPerformed(ActionEvent e) { getContextValue(InputAction.class).removePopulationSeasonInfo(getBean(), getPopulationSeasonInfo()); - setCombo(); + setPopulationSeasonInfoCombo(); } }); save.addActionListener(new ActionListener() { - @Override public void actionPerformed(ActionEvent e) { getVerifier().topiaSave(); - setCombo(); + setPopulationSeasonInfoCombo(); } }); -listener = new MatrixPanelListener() { - +matrixPanelListener = new MatrixPanelListener() { @Override - public void matrixChanged(MatrixPanelEvent arg0) { - if (getPopulationSeasonInfo() != null && fieldPopulationSeasonReproductionDistribution.getMatrix() != null){ - getPopulationSeasonInfo().setLengthChangeMatrix(fieldPopulationSeasonReproductionDistribution.getMatrix().copy()); + public void matrixChanged(MatrixPanelEvent event) { + if (getPopulationSeasonInfo() != null && fieldPopulationSeasonReproductionDistribution.getMatrix() != null) { + MatrixND reproductionDistribution = fieldPopulationSeasonReproductionDistribution.getMatrix().copy(); + if (log.isDebugEnabled()) { + log.debug("Matrix ReproductionDistribution modified : " + reproductionDistribution); + } + getPopulationSeasonInfo().setReproductionDistribution(reproductionDistribution); } } }; -public void refresh(){ - if (!isActif()){ + +public void refresh() { + if (!isActif()) { setPopSeasonInfoNotNull(false); } getVerifier().setSaveButton(save, false); @@ -125,28 +126,30 @@ setBean((PopulationImpl) population); // Model instanciation - interval = new Interval(); - interval.setMin(0); - interval.setMax(11); - interval.setFirst(0); - interval.setLast(2); + seasonInterval = new Interval(); + seasonInterval.setMin(0); + seasonInterval.setMax(11); + seasonInterval.setFirst(0); + seasonInterval.setLast(2); - setCombo(); - setInterval(); + setPopulationSeasonInfoCombo(); + setSeasonInterval(); - ip.setLabelRenderer(Month.MONTH); - ip.setModel(interval); + seasonIntervalPanel.setLabelRenderer(Month.MONTH); + seasonIntervalPanel.setModel(seasonInterval); + fieldPopulationSeasonReproductionDistribution.addMatrixListener(matrixPanelListener); + if(getPopulationSeasonInfo() != null) { PopulationSeasonInfoImpl popInfo = getPopulationSeasonInfo(); setPopulationSeasonInfo(null); setPopulationSeasonInfo(popInfo); getVerifier().addCurrentEntity(getPopulationSeasonInfo()); } - fieldPopulationSeasonReproductionDistribution.addMatrixListener(listener); getVerifier().addCurrentPanel(populationSeasonSpecializedUI); } -protected void setInterval() { + +protected void setSeasonInterval() { if(getPopulationSeasonInfo() != null) { try { if (log.isDebugEnabled()) { @@ -155,23 +158,23 @@ Month firstMonth = getPopulationSeasonInfo().getFirstMonth(); if (firstMonth != null) { - interval.setFirst(firstMonth.getMonthNumber()); + seasonInterval.setFirst(firstMonth.getMonthNumber()); if (log.isDebugEnabled()) { - log.debug(" first : " + interval.getFirst()); + log.debug(" first : " + seasonInterval.getFirst()); } } else { - interval.setFirst(0); + seasonInterval.setFirst(0); } Month lastMonth = getPopulationSeasonInfo().getLastMonth(); if (lastMonth != null) { - interval.setLast(lastMonth.getMonthNumber()); + seasonInterval.setLast(lastMonth.getMonthNumber()); if (log.isDebugEnabled()) { - log.debug(" last : " + interval.getLast()); + log.debug(" last : " + seasonInterval.getLast()); } } else { - interval.setLast(3); + seasonInterval.setLast(3); } } catch (Exception e) { if (log.isErrorEnabled()) { @@ -180,29 +183,42 @@ } } } -protected void setCombo(){ - if (getBean() != null){ - jaxx.runtime.SwingUtil.fillComboBox(fieldPopulationSeasonInfoChooser,getBean().getPopulationSeasonInfo(), getPopulationSeasonInfo(), true); + +protected void setPopulationSeasonInfoCombo() { + if (getBean() != null) { + jaxx.runtime.SwingUtil.fillComboBox(fieldPopulationSeasonInfoChooser, + getBean().getPopulationSeasonInfo(), getPopulationSeasonInfo(), true); } } -protected void seasonGroupChanged(){ - if (getPopulationSeasonInfo() != null){ + +protected void seasonGroupChanged() { + if (getPopulationSeasonInfo() != null) { getPopulationSeasonInfo().setGroupChange(fieldPopulationSeasonGroupChange.isSelected()); } } + protected void seasonChanged(ActionEvent event) { init = true; - setPopulationSeasonInfo((PopulationSeasonInfoImpl)fieldPopulationSeasonInfoChooser.getSelectedItem()); - getVerifier().addCurrentEntity(getPopulationSeasonInfo()); + PopulationSeasonInfo seasonInfoSelected = (PopulationSeasonInfo)fieldPopulationSeasonInfoChooser.getSelectedItem(); + if (log.isDebugEnabled()) { + log.debug("Season changed : " + seasonInfoSelected); + } + setPopulationSeasonInfo((PopulationSeasonInfoImpl)seasonInfoSelected); setPopSeasonInfoNotNull(getPopulationSeasonInfo() != null); - setInterval(); - setMatrix(); + setSeasonInterval(); + setReproductionDistributionMatrix(); + //getVerifier().addCurrentEntity(getPopulationSeasonInfo()); init = false; } -protected void setMatrix(){ - fieldPopulationSeasonReproductionDistribution.setMatrix(getPopulationSeasonInfo().getLengthChangeMatrix()); + +protected void setReproductionDistributionMatrix() { + MatrixND reproductionDistribution = getPopulationSeasonInfo().getReproductionDistribution(); + fieldPopulationSeasonReproductionDistribution.setMatrix(reproductionDistribution); } -protected boolean isAgeGroupType(boolean result){ + +// TODO une methode isXXX ne prend pas de parametre +// et ne fait rien +protected boolean isAgeGroupType(boolean result) { populationSeasonSpecializedUI.setVisible(result); return result; } @@ -227,7 +243,7 @@ <JLabel text="isisfish.common.season" enabled='{isPopSeasonInfoNotNull()}'/> </cell> <cell fill='horizontal' weightx='1.0'> - <IntervalPanel id='ip' enabled='{isPopSeasonInfoNotNull()}' decorator='boxed'/> + <IntervalPanel id='seasonIntervalPanel' enabled='{isPopSeasonInfoNotNull()}' decorator='boxed'/> </cell> </row> <row> @@ -259,13 +275,15 @@ </row> <row> <cell anchor='east'> - <JLabel text="isisfish.populationSeasons.distributionSpawning" enabled='{isPopSeasonInfoNotNull()}' visible='{getPopulationSeasonInfo().getReproduction()}'/> + <JLabel text="isisfish.populationSeasons.distributionSpawning" enabled='{isPopSeasonInfoNotNull()}' + visible='{getPopulationSeasonInfo().getReproduction()}'/> </cell> <cell fill='both' weightx='1.0' weighty='0.2'> <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='fieldPopulationSeasonReproductionDistribution' - matrix='{getPopulationSeasonInfo() == null ? null : getPopulationSeasonInfo().getLengthChangeMatrix()}' enabled='{isPopSeasonInfoNotNull()}' + matrix='{getPopulationSeasonInfo() == null ? null : getPopulationSeasonInfo().getReproductionDistribution()}' + enabled='{isPopSeasonInfoNotNull()}' visible='{getPopulationSeasonInfo().getReproduction()}' - decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"LengthChangeMatrix"'/> + decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"ReproductionDistribution"'/> </cell> </row> <row>

1 0

r2282 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org 26 May '09

26 May '09

Author: chatellier Date: 2009-05-26 13:58:39 +0000 (Tue, 26 May 2009) New Revision: 2282 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/PopulationUI.jaxx Log: Fix doc/imports 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-05-26 12:48:19 UTC (rev 2281) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-05-26 13:58:39 UTC (rev 2282) @@ -1,7 +1,6 @@  <fr.ifremer.isisfish.ui.input.InputContentUI> @@ -41,8 +28,6 @@ <Boolean id='popSeasonInfoNotNull' javaBean='false'/> <script><![CDATA[ -import fr.ifremer.isisfish.entities.Season; -import fr.ifremer.isisfish.entities.PopulationSeasonInfo; import fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl; import fr.ifremer.isisfish.types.Month; import fr.ifremer.isisfish.entities.Population; @@ -50,7 +35,6 @@ 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; protected MatrixPanelListener listener = null; protected Interval interval = null; Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2009-05-26 12:48:19 UTC (rev 2281) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationUI.jaxx 2009-05-26 13:58:39 UTC (rev 2282) @@ -1,7 +1,6 @@  - -  <fr.ifremer.isisfish.ui.input.InputContentUI>  <fr.ifremer.isisfish.entities.PopulationImpl id='bean' javaBean='null'/> <script><![CDATA[ - -import fr.ifremer.isisfish.entities.Gear; -import fr.ifremer.isisfish.entities.Population; -import fr.ifremer.isisfish.entities.PopulationImpl; import fr.ifremer.isisfish.ui.sensitivity.SensitivityTabbedPaneListener; getVerifier().addCurrentPanel(this);

1 0

r2281 - isis-fish/trunk/src/main/resources/i18n
by chatellier＠users.labs.libre-entreprise.org 26 May '09

26 May '09

Author: chatellier Date: 2009-05-26 12:48:19 +0000 (Tue, 26 May 2009) New Revision: 2281 Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Traduction des "spacialized" Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-05-26 11:48:34 UTC (rev 2280) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-05-26 12:48:19 UTC (rev 2281) @@ -749,10 +749,10 @@ isisfish.populationSeasons.comments=Commentaires isisfish.populationSeasons.computeCoefficient=Calculer le coefficient isisfish.populationSeasons.distributionSpawning=Distribution de la reproduction -isisfish.populationSeasons.noSpacialized=Non spacialized +isisfish.populationSeasons.noSpacialized=Non spatialis\u00E9 isisfish.populationSeasons.selectSeason=S\u00E9lectionnez une saison -isisfish.populationSeasons.showSpacialized=Voir les spacialized -isisfish.populationSeasons.spacialized=Spacialized +isisfish.populationSeasons.showSpacialized=Voir les coefficients spatialis\u00E9s +isisfish.populationSeasons.spacialized=spatialis\u00E9 isisfish.populationSeasons.title=Saisons isisfish.populationZones.betweenSpawningRecruitmentAreas=Correspondance entre les zones de reproduction et de recrutement isisfish.populationZones.selectPopulationAreas=S\u00E9lectionnez les zones des populations

1 0

r2280 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
by chatellier＠users.labs.libre-entreprise.org 26 May '09

26 May '09

Author: chatellier Date: 2009-05-26 11:48:34 +0000 (Tue, 26 May 2009) New Revision: 2280 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx Log: Fix equation refresh problem Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx 2009-05-26 11:48:09 UTC (rev 2279) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/InputOneEquationUI.jaxx 2009-05-26 11:48:34 UTC (rev 2280) @@ -69,7 +69,10 @@ if (evt.getNewValue() != null) { // add binding on getBean() //jaxx.runtime.SwingUtil.applyDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text"); - setComboModel(); + //setComboModel(); + + // chatellier 20090526 : force refresh in bean change ? + refresh(); } } }); @@ -132,10 +135,11 @@ } } if (nameEquation != null){ + // chatellier 20090526 (change to get combo selected on this equation) + selectedEquation = getEquation(); setComboModel(); setFormule((Formule)formuleComboBox.getSelectedItem()); setEditorText(); - selectedEquation = getEquation(); } editor.getCurrentEditor().addDocumentListener(listener); } @@ -150,6 +154,13 @@ java.util.List<Item> items = new ArrayList<Item>(); items.add(new Item("null", " ", null, false)); for (Formule f : formules) { + // chatellier 20090526 equals seams to not work + //boolean selected = f.equals(selectedEquation); + /*if (log.isDebugEnabled()) { + log.debug("Compare formula"); + log.debug(" first : name=" + f.getName() + ", category=" + f.getCategory()); + log.debug(" second : name=" + selectedEquation.getName() + ", category=" + selectedEquation.getCategory()); + }*/ boolean selected = f.equals(selectedEquation); items.add(new Item(f.getName(), f.getName(), f, selected)); }

1 0