r1845 - isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input
Author: sletellier Date: 2009-02-20 14:07:08 +0000 (Fri, 20 Feb 2009) New Revision: 1845 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx Log: Migrations bugs fixed Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2009-02-20 11:38:14 UTC (rev 1844) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2009-02-20 14:07:08 UTC (rev 1845) @@ -39,6 +39,10 @@ <fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl id='popInfo' javaBean='null'/> + <Boolean id='gPopSelected' javaBean='false'/> + <Boolean id='zoneDepartSelected' javaBean='false'/> + <Boolean id='coefNonVide' javaBean='false'/> + <script><![CDATA[ import fr.ifremer.isisfish.entities.Population; import fr.ifremer.isisfish.entities.PopulationImpl; @@ -67,6 +71,53 @@ } } }); +populationMigrationEmigrationTable.getTable().addMouseListener(new MouseListener() { + + @Override + public void mouseClicked(MouseEvent e) { + } + + @Override + public void mousePressed(MouseEvent e) { + } + + @Override + public void mouseReleased(MouseEvent e) { + remove.setEnabled(populationMigrationEmigrationTable.getTable().getSelectedRow() != -1); + } + + @Override + public void mouseEntered(MouseEvent e) { + } + + @Override + public void mouseExited(MouseEvent e) { + } +}); + +populationMigrationEmigrationTable.getTable().addMouseListener(new MouseListener() { + + @Override + public void mouseClicked(MouseEvent e) { + } + + @Override + public void mousePressed(MouseEvent e) { + } + + @Override + public void mouseReleased(MouseEvent e) { + remove.setEnabled(populationMigrationEmigrationTable.getTable().getSelectedRow() != -1); + } + + @Override + public void mouseEntered(MouseEvent e) { + } + + @Override + public void mouseExited(MouseEvent e) { + } +}); public void init(PopulationSeasonInfo pi){ setPopInfo((PopulationSeasonInfoImpl)pi); } @@ -76,10 +127,14 @@ setFieldPopulationMigrationMigrationGroupChooserModel(); setFieldPopulationMigrationMigrationDepartureZoneChooserModel(); + remove.setEnabled(false); + setAddButton(); + + populationMigrationEmigrationTable.addMatrixListener(new MatrixPanelListener() { - @Override public void matrixChanged(MatrixPanelEvent arg0) { + remove.setEnabled(populationMigrationEmigrationTable.getTable().getSelectedRow() != -1); if (popInfo != null){ popInfo.setMigrationMatrix(populationMigrationEmigrationTable.getMatrix()); } @@ -102,7 +157,6 @@ (PopulationGroup) fieldPopulationMigrationEmigrationGroupChooser.getSelectedItem(), (Zone) fieldPopulationMigrationEmigrationDepartureZoneChooser.getSelectedItem(), Double.parseDouble(fieldPopulationMigrationEmigrationCoefficient.getText())); - refresh(); } protected void remove(){ @@ -114,14 +168,27 @@ MatrixND mat = popInfo.getEmigrationMatrix().copy(); mat.setValue(group, departure, 0); - popInfo.setEmigrationMatrix(mat); - + popInfo.setEmigrationMatrix(mat); + remove.setEnabled(false); }catch(Exception eee){ log.error("Can't remove migration", eee); -// return new OutputView("Error.xml", "error", eee.getMessage()); } - refresh(); } + protected void groupChanged(){ + setGPopSelected(fieldPopulationMigrationEmigrationGroupChooser.getSelectedItem() != null); + setAddButton(); + } + protected void coefChanged(){ + setCoefNonVide(!fieldPopulationMigrationEmigrationCoefficient.getText().equals("")); + setAddButton(); + } + protected void zoneChanged(){ + setZoneDepartSelected(fieldPopulationMigrationEmigrationDepartureZoneChooser.getSelectedItem() != null); + setAddButton(); + } + protected void setAddButton(){ + add.setEnabled(getGPopSelected() && getZoneDepartSelected() && getCoefNonVide()); + } ]]> </script> <Table id='body'> @@ -130,13 +197,13 @@ <JLabel text="isisfish.common.populationGroup" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JComboBox id="fieldPopulationMigrationEmigrationGroupChooser" enabled='{isActif()}'/> + <JComboBox id="fieldPopulationMigrationEmigrationGroupChooser" enabled='{isActif()}' onActionPerformed='groupChanged()'/> </cell> <cell> <JLabel text="isisfish.populationMigrationEmigration.coefficient" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JTextField id="fieldPopulationMigrationEmigrationCoefficient" enabled='{isActif()}'/> + <JTextField id="fieldPopulationMigrationEmigrationCoefficient" enabled='{isActif()}' onKeyReleased='coefChanged()'/> </cell> </row> <row> @@ -144,7 +211,7 @@ <JLabel text="isisfish.populationMigrationEmigration.departureZone" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JComboBox id="fieldPopulationMigrationEmigrationDepartureZoneChooser" enabled='{isActif()}'/> + <JComboBox id="fieldPopulationMigrationEmigrationDepartureZoneChooser" enabled='{isActif()}' onActionPerformed='zoneChanged()'/> </cell> <cell columns='2' fill='horizontal' weightx='0.5'> <JPanel/> @@ -157,7 +224,7 @@ </row> <row columns='4'> <cell fill='both' weightx='1.0' weighty='1.0'> - <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='populationMigrationEmigrationTable' matrix='{getPopInfo().getEmigrationMatrix()}' enabled='{isActif()}'/> + <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='populationMigrationEmigrationTable' linearModel="true" matrix='{getPopInfo().getEmigrationMatrix().copy()}' enabled='{isActif()}'/> </cell> </row> <row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2009-02-20 11:38:14 UTC (rev 1844) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2009-02-20 14:07:08 UTC (rev 1845) @@ -40,6 +40,10 @@ <fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl id='popInfo' javaBean='null'/> + <Boolean id='gPopSelected' javaBean='false'/> + <Boolean id='zoneDepartSelected' javaBean='false'/> + <Boolean id='coefNonVide' javaBean='false'/> + <script><![CDATA[ import fr.ifremer.isisfish.entities.Population; @@ -67,7 +71,40 @@ } } }); - + +populationMigrationImmigrationTable.getTable().addMouseListener(new MouseListener() { + + @Override + public void mouseClicked(MouseEvent e) { + } + + @Override + public void mousePressed(MouseEvent e) { + } + + @Override + public void mouseReleased(MouseEvent e) { + remove.setEnabled(populationMigrationImmigrationTable.getTable().getSelectedRow() != -1); + } + + @Override + public void mouseEntered(MouseEvent e) { + } + + @Override + public void mouseExited(MouseEvent e) { + } +}); +populationMigrationImmigrationTable.addMatrixListener(new MatrixPanelListener() { + + @Override + public void matrixChanged(MatrixPanelEvent arg0) { + if (getPopInfo() != null){ + getPopInfo().setImmigrationMatrix(populationMigrationImmigrationTable.getMatrix()); + } + } +}); + public void init(PopulationSeasonInfo pi){ setPopInfo((PopulationSeasonInfoImpl)pi); } @@ -76,32 +113,25 @@ setBean((PopulationImpl) population); setFieldPopulationMigrationMigrationGroupChooserModel(); setFieldPopulationMigrationMigrationArrivalZoneChooserModel(); - populationMigrationImmigrationTable.addMatrixListener(new MatrixPanelListener() { - @Override - public void matrixChanged(MatrixPanelEvent arg0) { - if (getPopInfo() != null){ - getPopInfo().setImmigrationMatrix(populationMigrationImmigrationTable.getMatrix()); - } - } - }); + remove.setEnabled(false); + setAddButton(); } protected void setFieldPopulationMigrationMigrationGroupChooserModel(){ if (getBean() != null && getBean().getPopulationGroup() != null){ - jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationImmigrationArrivalZoneChooser,getBean().getPopulationGroup(), null, true); + jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationImmigrationGroupChooser, getBean().getPopulationGroup(), null, true); } } protected void setFieldPopulationMigrationMigrationArrivalZoneChooserModel(){ if (getBean() != null && getBean().getPopulationZone() != null){ - jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationImmigrationArrivalZoneChooser,getBean().getPopulationZone(), null, true); + jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationImmigrationArrivalZoneChooser, getBean().getPopulationZone(), null, true); } } protected void add(){ getContextValue(InputAction.class).addImmigration(getPopInfo(), - (PopulationGroup) fieldPopulationMigrationImmigrationArrivalZoneChooser.getSelectedItem(), + (PopulationGroup) fieldPopulationMigrationImmigrationGroupChooser.getSelectedItem(), (Zone) fieldPopulationMigrationImmigrationArrivalZoneChooser.getSelectedItem(), Double.parseDouble(fieldPopulationMigrationImmigrationCoefficient.getText())); - refresh(); } protected void remove(){ int row = populationMigrationImmigrationTable.getTable().getSelectedRow(); @@ -112,8 +142,23 @@ MatrixND mat = getPopInfo().getImmigrationMatrix().copy(); mat.setValue(group, departure, arrival, 0); getPopInfo().setImmigrationMatrix(mat); - refresh(); + remove.setEnabled(false); } + protected void groupChanged(){ + setGPopSelected(fieldPopulationMigrationImmigrationGroupChooser.getSelectedItem() != null); + setAddButton(); + } + protected void coefChanged(){ + setCoefNonVide(!fieldPopulationMigrationImmigrationCoefficient.getText().equals("")); + setAddButton(); + } + protected void zoneChanged(){ + setZoneDepartSelected(fieldPopulationMigrationImmigrationArrivalZoneChooser.getSelectedItem() != null); + setAddButton(); + } + protected void setAddButton(){ + add.setEnabled(getGPopSelected() && getZoneDepartSelected() && getCoefNonVide()); + } ]]> </script> <Table id='body'> @@ -122,13 +167,13 @@ <JLabel text="isisfish.common.populationGroup" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JComboBox id="fieldPopulationMigrationImmigrationGroupChooser" enabled='{isActif()}'/> + <JComboBox id="fieldPopulationMigrationImmigrationGroupChooser" enabled='{isActif()}' onActionPerformed='groupChanged()'/> </cell> <cell> <JLabel text="isisfish.populationMigrationImmigration.coefficient" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JTextField id="fieldPopulationMigrationImmigrationCoefficient" enabled='{isActif()}'/> + <JTextField id="fieldPopulationMigrationImmigrationCoefficient" enabled='{isActif()}' onKeyReleased='coefChanged()'/> </cell> </row> <row> @@ -136,7 +181,7 @@ <JLabel text="isisfish.populationMigrationImmigration.arrivalZone" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JComboBox id="fieldPopulationMigrationImmigrationArrivalZoneChooser" enabled='{isActif()}'/> + <JComboBox id="fieldPopulationMigrationImmigrationArrivalZoneChooser" enabled='{isActif()}' onActionPerformed='zoneChanged()'/> </cell> <cell columns='2' fill='horizontal' weightx='0.5'> <JPanel/> @@ -144,17 +189,17 @@ </row> <row columns='4'> <cell fill='horizontal' weightx='1.0'> - <JButton id="buttonPopulationMigrationImmigrationAdd" text="isisfish.common.add" onActionPerformed='add()' enabled='{isActif()}'/> + <JButton id="add" text="isisfish.common.add" onActionPerformed='add()' enabled='{isActif()}'/> </cell> </row> <row columns='4'> <cell fill='both' weightx='1.0' weighty='1.0'> - <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='populationMigrationImmigrationTable' matrix='{getPopInfo().getImmigrationMatrix()}' enabled='{isActif()}'/> + <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='populationMigrationImmigrationTable' linearModel="true" matrix='{getPopInfo().getImmigrationMatrix().copy()}' enabled='{isActif()}'/> </cell> </row> <row> <cell columns='4' fill='horizontal' weightx='1.0'> - <JButton id="buttonPopulationImmigrationMigrationRemove" text="isisfish.common.remove" onActionPerformed='remove()' enabled='{isActif()}'/> + <JButton id="remove" text="isisfish.common.remove" onActionPerformed='remove()' enabled='{isActif()}'/> </cell> </row> </Table> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2009-02-20 11:38:14 UTC (rev 1844) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2009-02-20 14:07:08 UTC (rev 1845) @@ -38,6 +38,11 @@ <fr.ifremer.isisfish.entities.PopulationSeasonInfoImpl id='popInfo' javaBean='null'/> + <Boolean id='gPopSelected' javaBean='false'/> + <Boolean id='zoneDepartSelected' javaBean='false'/> + <Boolean id='zoneArrivalSelected' javaBean='false'/> + <Boolean id='coefNonVide' javaBean='false'/> + <script><![CDATA[ import fr.ifremer.isisfish.entities.PopulationSeasonInfo; @@ -66,6 +71,41 @@ } } }); + +populationMigrationMigrationTable.getTable().addMouseListener(new MouseListener() { + + @Override + public void mouseClicked(MouseEvent e) { + } + + @Override + public void mousePressed(MouseEvent e) { + } + + @Override + public void mouseReleased(MouseEvent e) { + remove.setEnabled(populationMigrationMigrationTable.getTable().getSelectedRow() != -1); + } + + @Override + public void mouseEntered(MouseEvent e) { + } + + @Override + public void mouseExited(MouseEvent e) { + } +}); + +populationMigrationMigrationTable.addMatrixListener(new MatrixPanelListener() { + + @Override + public void matrixChanged(MatrixPanelEvent arg0) { + if (getPopInfo() != null){ + getPopInfo().setMigrationMatrix(populationMigrationMigrationTable.getMatrix()); + } + } +}); + public void init(PopulationSeasonInfo pi){ setPopInfo((PopulationSeasonInfoImpl)pi); } @@ -76,15 +116,9 @@ setFieldPopulationMigrationMigrationGroupChooserModel(); setFieldPopulationMigrationMigrationDepartureZoneChooserModel(); setFieldPopulationMigrationMigrationArrivalZoneChooserModel(); - populationMigrationMigrationTable.addMatrixListener(new MatrixPanelListener() { - @Override - public void matrixChanged(MatrixPanelEvent arg0) { - if (getPopInfo() != null){ - getPopInfo().setMigrationMatrix(populationMigrationMigrationTable.getMatrix()); - } - } - }); + remove.setEnabled(false); + setAddButton(); } protected void setFieldPopulationMigrationMigrationGroupChooserModel(){ if (getBean() != null && getBean().getPopulationGroup() != null){ @@ -93,12 +127,12 @@ } protected void setFieldPopulationMigrationMigrationDepartureZoneChooserModel(){ if (getBean() != null && getBean().getPopulationZone() != null){ - jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationMigrationGroupChooser,getBean().getPopulationZone(), null, true); + jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationMigrationDepartureZoneChooser,getBean().getPopulationZone(), null, true); } } protected void setFieldPopulationMigrationMigrationArrivalZoneChooserModel(){ if (getBean() != null && getBean().getPopulationZone() != null){ - jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationMigrationGroupChooser,getBean().getPopulationZone(), null, true); + jaxx.runtime.swing.Utils.fillComboBox(fieldPopulationMigrationMigrationArrivalZoneChooser,getBean().getPopulationZone(), null, true); } } protected void add(){ @@ -107,7 +141,6 @@ (Zone) fieldPopulationMigrationMigrationDepartureZoneChooser.getSelectedItem(), (Zone) fieldPopulationMigrationMigrationArrivalZoneChooser.getSelectedItem(), Double.parseDouble(fieldPopulationMigrationMigrationCoefficient.getText())); - refresh(); } protected void remove(){ int row = populationMigrationMigrationTable.getTable().getSelectedRow(); @@ -118,8 +151,27 @@ MatrixND mat = getPopInfo().getMigrationMatrix().copy(); mat.setValue(group, departure, arrival, 0); getPopInfo().setMigrationMatrix(mat); - refresh(); + remove.setEnabled(false); } +protected void groupChanged(){ + setGPopSelected(fieldPopulationMigrationMigrationGroupChooser.getSelectedItem() != null); + setAddButton(); +} +protected void coefChanged(){ + setCoefNonVide(!fieldPopulationMigrationMigrationCoefficient.getText().equals("")); + setAddButton(); +} +protected void zoneDepartueChanged(){ + setZoneDepartSelected(fieldPopulationMigrationMigrationDepartureZoneChooser.getSelectedItem() != null); + setAddButton(); +} +protected void zoneArrivalChanged(){ + setZoneArrivalSelected(fieldPopulationMigrationMigrationArrivalZoneChooser.getSelectedItem() != null); + setAddButton(); +} +protected void setAddButton(){ + add.setEnabled(getGPopSelected() && getZoneDepartSelected() && getZoneArrivalSelected() && getCoefNonVide()); +} ]]> </script> <Table id='body'> @@ -128,13 +180,13 @@ <JLabel text="isisfish.common.populationGroup" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JComboBox id="fieldPopulationMigrationMigrationGroupChooser" enabled='{isActif()}'/> + <JComboBox id="fieldPopulationMigrationMigrationGroupChooser" enabled='{isActif()}' onActionPerformed='groupChanged()'/> </cell> <cell> <JLabel text="isisfish.populationMigrationMigration.coefficient" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JTextField id="fieldPopulationMigrationMigrationCoefficient" enabled='{isActif()}'/> + <JTextField id="fieldPopulationMigrationMigrationCoefficient" enabled='{isActif()}' onKeyReleased='coefChanged()'/> </cell> </row> <row> @@ -142,28 +194,28 @@ <JLabel text="isisfish.populationMigrationMigration.departureZone" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JComboBox id="fieldPopulationMigrationMigrationDepartureZoneChooser" enabled='{isActif()}'/> + <JComboBox id="fieldPopulationMigrationMigrationDepartureZoneChooser" enabled='{isActif()}' onActionPerformed='zoneDepartueChanged()'/> </cell> <cell> <JLabel text="isisfish.populationMigrationMigration.arrivalZone" enabled='{isActif()}'/> </cell> <cell fill='horizontal' weightx='0.5'> - <JComboBox id="fieldPopulationMigrationMigrationArrivalZoneChooser" enabled='{isActif()}'/> + <JComboBox id="fieldPopulationMigrationMigrationArrivalZoneChooser" enabled='{isActif()}' onActionPerformed='zoneArrivalChanged()'/> </cell> </row> <row columns='4'> <cell fill='horizontal' weightx='1.0'> - <JButton id="buttonPopulationMigrationMigrationAdd" text="isisfish.common.add" onActionPerformed='add()' enabled='{isActif()}'/> + <JButton id="add" text="isisfish.common.add" onActionPerformed='add()' enabled='{isActif()}'/> </cell> </row> <row columns='4'> <cell fill='both' weightx='1.0' weighty='1.0'> - <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='populationMigrationMigrationTable' matrix='{getPopInfo().getMigrationMatrix()}' enabled='{isActif()}'/> + <org.codelutin.math.matrix.gui.MatrixPanelEditor id ='populationMigrationMigrationTable' linearModel="true" matrix='{getPopInfo().getMigrationMatrix().copy()}' enabled='{isActif()}'/> </cell> </row> <row> <cell columns='4' fill='horizontal' weightx='1.0'> - <JButton id="buttonPopulationMigrationMigrationRemove" text="isisfish.common.remove" onActionPerformed='remove()' enabled='{isActif()}'/> + <JButton id="remove" text="isisfish.common.remove" onActionPerformed='remove()' enabled='{isActif()}'/> </cell> </row> </Table> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2009-02-20 11:38:14 UTC (rev 1844) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationUI.jaxx 2009-02-20 14:07:08 UTC (rev 1845) @@ -54,6 +54,7 @@ // remove previous binding on getBean() //jaxx.runtime.Util.removeDataBinding(get$Table0(), "fieldCellName.text", "fieldCellLongitude.text", "fieldCellLatitude.text", "fieldCellLand.selected", "fieldCellComment.text"); fieldPopulationMigrationComment.setText(""); + fieldUseEquationMigration.setSelected(false); } if (evt.getNewValue() != null) { // add binding on getBean() @@ -71,6 +72,7 @@ if (getBean() != null){ setFieldPopulationMigrationSeasonChooserModel(); } + useEquationChanged(); } protected void seasonChanged(){ setPopInfo((PopulationSeasonInfoImpl)getPopulationSeasonInfo()); @@ -81,6 +83,7 @@ populationMigrationImmigrationUI.init(getPopInfo()); populationMigrationEmigrationUI.init(getPopInfo()); } + useEquationChanged(); } protected void setFieldPopulationMigrationSeasonChooserModel(){ DefaultComboBoxModel model = new DefaultComboBoxModel();
participants (1)
-
sletellier@users.labs.libre-entreprise.org