Author: sletellier
Date: 2009-03-23 17:45:43 +0000 (Mon, 23 Mar 2009)
New Revision: 2029
Modified:
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java
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/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/PopulationRecruitmentUI.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/PopulationZonesEditorUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanel.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizard.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanel.jaxx
isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx
Log:
Debug
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java 2009-03-23 16:31:30 UTC (rev 2028)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/domain/DiscreteDomain.java 2009-03-23 17:45:43 UTC (rev 2029)
@@ -52,7 +52,7 @@
protected SortedMap<Serializable, E> values;
/**
- * Contructor.
+ * Constructor.
*/
public DiscreteDomain() {
values = new TreeMap<Serializable, E>();
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-03-23 16:31:30 UTC (rev 2028)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationCapturabilityUI.jaxx 2009-03-23 17:45:43 UTC (rev 2029)
@@ -92,7 +92,10 @@
</row>
<row>
<cell columns='2' fill='both' weightx='1.0'>
- <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='fieldPopulationCapturability' matrix='{getBean().getCapturability() == null ? null : getBean().getCapturability().copy()}' enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"Capturability"'/>
+ <JScrollPane>
+ <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='fieldPopulationCapturability' constructorParams='null, false'
+ matrix='{getBean().getCapturability() == null ? null : getBean().getCapturability().copy()}' enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"Capturability"'/>
+ </JScrollPane>
</cell>
</row>
<row>
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-03-23 16:31:30 UTC (rev 2028)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationGroupUI.jaxx 2009-03-23 17:45:43 UTC (rev 2029)
@@ -133,7 +133,11 @@
<JLabel text="isisfish.populationGroup.naturalDeathRate" enabled='{isPopGroupNotNull()}'/>
</cell>
<cell columns='2' fill='both' weightx='1.0' weighty='0.5'>
- <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='fieldPopulationGroupNaturalDeathRate' matrix='{getBean() == null || getPopulationGroup() == null ? null : ((AbstractMatrixND)getBean().getNaturalDeathRateMatrix()).getSubMatrixOnSemantic(0, getPopulationGroup())}' enabled='{isPopGroupNotNull()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"NaturalDeathRateMatrix"'/>
+ <JScrollPane>
+ <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='fieldPopulationGroupNaturalDeathRate' constructorParams='null, false'
+ matrix='{getBean() == null || getPopulationGroup() == null ? null : ((AbstractMatrixND)getBean().getNaturalDeathRateMatrix()).getSubMatrixOnSemantic(0, getPopulationGroup())}'
+ enabled='{isPopGroupNotNull()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"NaturalDeathRateMatrix"'/>
+ </JScrollPane>
</cell>
</row>
<row>
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-03-23 16:31:30 UTC (rev 2028)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationEmigrationUI.jaxx 2009-03-23 17:45:43 UTC (rev 2029)
@@ -96,6 +96,7 @@
});
public void init(PopulationSeasonInfo pi){
setPopInfo((PopulationSeasonInfoImpl)pi);
+ populationMigrationEmigrationTable.setMatrix(getPopInfo().getEmigrationMatrix().clone());
}
public void refresh(){
Population population = getVerifier().getEntity(Population.class);
@@ -114,7 +115,7 @@
public void matrixChanged(MatrixPanelEvent arg0) {
remove.setEnabled(populationMigrationEmigrationTable.getTable().getSelectedRow() != -1);
if (popInfo != null){
- popInfo.setMigrationMatrix(populationMigrationEmigrationTable.getMatrix().copy());
+ popInfo.setMigrationMatrix(populationMigrationEmigrationTable.getMatrix().clone());
}
}
});
@@ -135,6 +136,7 @@
(PopulationGroup) fieldPopulationMigrationEmigrationGroupChooser.getSelectedItem(),
(Zone) fieldPopulationMigrationEmigrationDepartureZoneChooser.getSelectedItem(),
Double.parseDouble(fieldPopulationMigrationEmigrationCoefficient.getText()));
+ populationMigrationEmigrationTable.setMatrix(getPopInfo().getEmigrationMatrix().clone());
}
protected void remove(){
@@ -144,7 +146,7 @@
Object group = populationMigrationEmigrationTable.getTable().getValueAt(row, 0);
Object departure = populationMigrationEmigrationTable.getTable().getValueAt(row, 1);
- MatrixND mat = popInfo.getEmigrationMatrix().copy();
+ MatrixND mat = popInfo.getEmigrationMatrix().clone();
mat.setValue(group, departure, 0);
popInfo.setEmigrationMatrix(mat);
remove.setEnabled(false);
@@ -202,7 +204,9 @@
</row>
<row columns='4'>
<cell fill='both' weightx='1.0' weighty='1.0'>
- <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='populationMigrationEmigrationTable' linearModel="true" matrix='{getPopInfo().getEmigrationMatrix().copy()}' enabled='{isActif()}'/>
+ <JScrollPane>
+ <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='populationMigrationEmigrationTable' constructorParams='null, false' linearModel="true" enabled='{isActif()}'/>
+ </JScrollPane>
</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-03-23 16:31:30 UTC (rev 2028)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationImmigrationUI.jaxx 2009-03-23 17:45:43 UTC (rev 2029)
@@ -100,13 +100,14 @@
@Override
public void matrixChanged(MatrixPanelEvent arg0) {
if (getPopInfo() != null){
- getPopInfo().setImmigrationMatrix(populationMigrationImmigrationTable.getMatrix().copy());
+ getPopInfo().setImmigrationMatrix(populationMigrationImmigrationTable.getMatrix().clone());
}
}
});
public void init(PopulationSeasonInfo pi){
setPopInfo((PopulationSeasonInfoImpl)pi);
+ populationMigrationImmigrationTable.setMatrix(getPopInfo().getImmigrationMatrix().clone());
}
public void refresh(){
Population population = getVerifier().getEntity(Population.class);
@@ -136,6 +137,7 @@
(PopulationGroup) fieldPopulationMigrationImmigrationGroupChooser.getSelectedItem(),
(Zone) fieldPopulationMigrationImmigrationArrivalZoneChooser.getSelectedItem(),
Double.parseDouble(fieldPopulationMigrationImmigrationCoefficient.getText()));
+ populationMigrationImmigrationTable.setMatrix(getPopInfo().getImmigrationMatrix().clone());
}
protected void remove(){
int row = populationMigrationImmigrationTable.getTable().getSelectedRow();
@@ -143,7 +145,7 @@
Object departure = populationMigrationImmigrationTable.getTable().getValueAt(row, 1);
Object arrival = populationMigrationImmigrationTable.getTable().getValueAt(row, 2);
- MatrixND mat = getPopInfo().getImmigrationMatrix().copy();
+ MatrixND mat = getPopInfo().getImmigrationMatrix().clone();
mat.setValue(group, departure, arrival, 0);
getPopInfo().setImmigrationMatrix(mat);
remove.setEnabled(false);
@@ -198,7 +200,9 @@
</row>
<row columns='4'>
<cell fill='both' weightx='1.0' weighty='1.0'>
- <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='populationMigrationImmigrationTable' linearModel="true" matrix='{getPopInfo().getImmigrationMatrix().copy()}' enabled='{isActif()}'/>
+ <JScrollPane>
+ <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='populationMigrationImmigrationTable' constructorParams='null, false' linearModel="true" enabled='{isActif()}'/>
+ </JScrollPane>
</cell>
</row>
<row>
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-03-23 16:31:30 UTC (rev 2028)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationMigrationMigrationUI.jaxx 2009-03-23 17:45:43 UTC (rev 2029)
@@ -100,13 +100,14 @@
@Override
public void matrixChanged(MatrixPanelEvent arg0) {
if (getPopInfo() != null){
- getPopInfo().setMigrationMatrix(populationMigrationMigrationTable.getMatrix().copy());
+ getPopInfo().setMigrationMatrix(populationMigrationMigrationTable.getMatrix().clone());
}
}
};
public void init(PopulationSeasonInfo pi){
setPopInfo((PopulationSeasonInfoImpl)pi);
+ populationMigrationMigrationTable.setMatrix(getPopInfo().getMigrationMatrix().clone());
}
public void refresh(){
Population population = getVerifier().getEntity(Population.class);
@@ -144,6 +145,7 @@
(Zone) fieldPopulationMigrationMigrationDepartureZoneChooser.getSelectedItem(),
(Zone) fieldPopulationMigrationMigrationArrivalZoneChooser.getSelectedItem(),
Double.parseDouble(fieldPopulationMigrationMigrationCoefficient.getText()));
+ populationMigrationMigrationTable.setMatrix(getPopInfo().getMigrationMatrix().clone());
}
protected void remove(){
int row = populationMigrationMigrationTable.getTable().getSelectedRow();
@@ -151,7 +153,7 @@
Object departure = populationMigrationMigrationTable.getTable().getValueAt(row, 1);
Object arrival = populationMigrationMigrationTable.getTable().getValueAt(row, 2);
- MatrixND mat = getPopInfo().getMigrationMatrix().copy();
+ MatrixND mat = getPopInfo().getMigrationMatrix().clone();
mat.setValue(group, departure, arrival, 0);
getPopInfo().setMigrationMatrix(mat);
remove.setEnabled(false);
@@ -213,7 +215,9 @@
</row>
<row columns='4'>
<cell fill='both' weightx='1.0' weighty='1.0'>
- <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='populationMigrationMigrationTable' linearModel='{true}' matrix='{getPopInfo().getMigrationMatrix().copy()}' enabled='{isActif()}'/>
+ <JScrollPane>
+ <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='populationMigrationMigrationTable' constructorParams='null, false' linearModel='{true}' enabled='{isActif()}'/>
+ </JScrollPane>
</cell>
</row>
<row>
@@ -222,4 +226,4 @@
</cell>
</row>
</Table>
- </fr.ifremer.isisfish.ui.input.InputContentUI>
+ </fr.ifremer.isisfish.ui.input.InputContentUI>
\ No newline at end of file
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2009-03-23 16:31:30 UTC (rev 2028)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationRecruitmentUI.jaxx 2009-03-23 17:45:43 UTC (rev 2029)
@@ -113,7 +113,10 @@
<JLabel text="isisfish.populationRecruitment.recruitmentDistribution" enabled='{isActif()}'/>
</cell>
<cell fill='both' weightx='1.0'>
- <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='fieldPopulationRecruitmentDistribution' matrix='{getBean().getRecruitmentDistribution() == null ? null : getBean().getRecruitmentDistribution().copy()}' enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"RecruitmentDistribution"'/>
+ <JScrollPane>
+ <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='fieldPopulationRecruitmentDistribution' constructorParams='null, false'
+ matrix='{getBean().getRecruitmentDistribution() == null ? null : getBean().getRecruitmentDistribution().copy()}' enabled='{isActif()}' decorator='boxed' _bean='{PopulationImpl.class}' _method='"RecruitmentDistribution"'/>
+ </JScrollPane>
</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-03-23 16:31:30 UTC (rev 2028)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationSeasonsUI.jaxx 2009-03-23 17:45:43 UTC (rev 2029)
@@ -235,9 +235,11 @@
<JLabel text="isisfish.populationSeasons.distributionSpawning" enabled='{isPopSeasonInfoNotNull()}'/>
</cell>
<cell fill='both' weightx='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"'/>
+ <JScrollPane>
+ <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='fieldPopulationSeasonReproductionDistribution' constructorParams='null, false'
+ matrix='{getPopulationSeasonInfo() == null ? null : getPopulationSeasonInfo().getLengthChangeMatrix()}' enabled='{isPopSeasonInfoNotNull()}'
+ decorator='boxed' _bean='{PopulationSeasonInfoImpl.class}' _method='"LengthChangeMatrix"'/>
+ </JScrollPane>
</cell>
</row>
<row>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx 2009-03-23 16:31:30 UTC (rev 2028)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/PopulationZonesEditorUI.jaxx 2009-03-23 17:45:43 UTC (rev 2029)
@@ -39,8 +39,8 @@
public void refresh(){
setPopulationZonesPresenceModel();
- setFieldPopulationZonesReproductionModel();
- setFieldPopulationZonesRecruitmentModel();
+ setFieldPopulationZonesReproductionModel(getSelectedValue(populationZonesPresence));
+ setFieldPopulationZonesRecruitmentModel(getSelectedValue(populationZonesPresence));
fieldPopulationMappingZoneReproZoneRecru.removeMatrixPanelListener(listener);
setFieldPopulationMappingZoneReproZoneRecru();
fieldPopulationMappingZoneReproZoneRecru.addMatrixListener(listener);
@@ -57,22 +57,22 @@
}
protected void setPopulationZonesPresenceModel(){
if (getBean() != null){
- setModel(getBean().getPopulationZone(), populationZonesPresence);
+ java.util.List<Zone> zones = getRegion().getZone();
+ setModel(zones, getBean().getPopulationZone(), populationZonesPresence);
}
}
-protected void setFieldPopulationZonesReproductionModel(){
+protected void setFieldPopulationZonesReproductionModel(java.util.List<Zone> zones){
if (getBean() != null){
- setModel(getBean().getReproductionZone(), fieldPopulationZonesReproduction);
+ setModel(zones, getBean().getReproductionZone(), fieldPopulationZonesReproduction);
}
}
-protected void setFieldPopulationZonesRecruitmentModel(){
+protected void setFieldPopulationZonesRecruitmentModel(java.util.List<Zone> zones){
if (getBean() != null){
- setModel(getBean().getRecruitmentZone(), fieldPopulationZonesRecruitment);
+ setModel(zones, getBean().getRecruitmentZone(), fieldPopulationZonesRecruitment);
}
}
-protected void setModel(java.util.List<Zone> selected, JAXXList componant){
+protected void setModel(java.util.List<Zone> zones, java.util.List<Zone> selected, JAXXList componant){
DefaultListModel model = new DefaultListModel();
- java.util.List<Zone> zones = getRegion().getZone();
java.util.List<GenericCell> selectedZones = new ArrayList<GenericCell>();
if (zones != null){
for (Zone z : zones){
@@ -102,6 +102,8 @@
}
protected void presenceChanged(){
getBean().setPopulationZone(getSelectedValue(populationZonesPresence));
+ setFieldPopulationZonesReproductionModel(getSelectedValue(populationZonesPresence));
+ setFieldPopulationZonesRecruitmentModel(getSelectedValue(populationZonesPresence));
setFieldPopulationMappingZoneReproZoneRecru();
}
protected void reproductionChanged(){
@@ -165,7 +167,9 @@
</row>
<row>
<cell columns='3' fill='both' weightx='1.0' weighty='0.5'>
- <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='fieldPopulationMappingZoneReproZoneRecru' enabled='{isActif()}'/>
+ <JScrollPane>
+ <org.codelutin.math.matrix.gui.JAXXMatrixEditor id ='fieldPopulationMappingZoneReproZoneRecru' constructorParams='false' enabled='{isActif()}'/>
+ </JScrollPane>
</cell>
</row>
</Table>
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-03-23 16:31:30 UTC (rev 2028)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2009-03-23 17:45:43 UTC (rev 2029)
@@ -149,7 +149,9 @@
</row>
<row>
<cell columns='2' fill='both' weightx='1.0' weighty='1.0'>
- <org.codelutin.math.matrix.gui.JAXXMatrixEditor id="fieldStrategyMonthInfoProportion" linearModelShowDefault='{true}' linearModel='{true}' matrix='{getStrategyMonthInfo().getProportionMetier() == null ? null : getStrategyMonthInfo().getProportionMetier().copy()}' enabled='{isActif()}' decorator='boxed' _bean='{StrategyMonthInfoImpl.class}' _method='"ProportionMetier"'/>
+ <JScrollPane>
+ <org.codelutin.math.matrix.gui.JAXXMatrixEditor id="fieldStrategyMonthInfoProportion" constructorParams='null, false' linearModelShowDefault='{true}' linearModel='{true}' matrix='{getStrategyMonthInfo().getProportionMetier() == null ? null : getStrategyMonthInfo().getProportionMetier().copy()}' enabled='{isActif()}' decorator='boxed' _bean='{StrategyMonthInfoImpl.class}' _method='"ProportionMetier"'/>
+ </JScrollPane>
</cell>
</row>
</Table>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2009-03-23 16:31:30 UTC (rev 2028)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/ZoneUI.jaxx 2009-03-23 17:45:43 UTC (rev 2029)
@@ -183,19 +183,21 @@
<JButton id='create' decorator='boxed'/>
</cell>
<cell fill='horizontal' weightx='0.5'>
- <JButton id='remove' decorator='boxed'/>
+ <JButton id='remove' decorator='boxed'/>
</cell>
</row>
</Table>
<JPanel id='map' layout='{new BorderLayout()}'>
<fr.ifremer.isisfish.map.OpenMapToolPanel id='toolMap'
javaBean='new fr.ifremer.isisfish.map.OpenMapToolPanel()'
+ decorator='boxed'
constraints='BorderLayout.NORTH'/>
<fr.ifremer.isisfish.map.IsisMapBean id='zoneMap'
javaBean='new fr.ifremer.isisfish.map.IsisMapBean()'
selectionMode="2"
fisheryRegion='{getRegion()}'
selectedCells='{getBean().getCell()}'
+ decorator='boxed'
constraints='BorderLayout.CENTER'/>
</JPanel>
</JSplitPane>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java 2009-03-23 16:31:30 UTC (rev 2028)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EditorHelper.java 2009-03-23 17:45:43 UTC (rev 2029)
@@ -82,8 +82,11 @@
} else if (result instanceof MatrixEditor){
MatrixEditor ui = (MatrixEditor) c;
- JAXXMatrixEditor matrix = new JAXXMatrixEditor();
- matrix.setMatrix((MatrixND)callMethod(e, fieldName));
+ MatrixND m = (MatrixND)callMethod(e, fieldName);
+ JAXXMatrixEditor matrix = new JAXXMatrixEditor(false);
+ if (m != null){
+ matrix.setMatrix(m.clone());
+ }
matrix.setLinearModel(ui.isLinearModel());
matrix.setLinearModelShowDefault(ui.isLinearModelShowDefault());
result = matrix;
@@ -203,7 +206,10 @@
result = ui;
} else if (c instanceof MatrixEditor){
MatrixContinuousPanel matrixPanel = new MatrixContinuousPanel();
- matrixPanel.setMatrix((MatrixND)callMethod(e, fieldName));
+ MatrixND m = (MatrixND)callMethod(e, fieldName);
+ if (m != null){
+ matrixPanel.setMatrix(m.clone());
+ }
continuousPanel = matrixPanel.getDefaultContinuousPanel();
result = matrixPanel;
} else {
@@ -248,7 +254,10 @@
} else if (c instanceof MatrixEditor){
MatrixContinuousPanel panel = new MatrixContinuousPanel();
MatrixContinuousDomain matrixDomain = (MatrixContinuousDomain)domain;
- panel.setMatrix(matrixDomain.getMatrix());
+ MatrixND m = matrixDomain.getMatrix();
+ if (m != null){
+ panel.setMatrix(m.clone());
+ }
continuousPanel = panel.getDefaultContinuousPanel();
panel.getOperator().setSelectedItem(matrixDomain.getOperator());
result = panel;
@@ -279,8 +288,11 @@
result = new JTextField(value.toString());
} else if (result instanceof MatrixEditor){
MatrixEditor ui = (MatrixEditor) c;
- JAXXMatrixEditor matrix = new JAXXMatrixEditor();
- matrix.setMatrix((MatrixND)value);
+ MatrixND m = (MatrixND)value;
+ JAXXMatrixEditor matrix = new JAXXMatrixEditor(false);
+ if (m != null){
+ matrix.setMatrix(m.clone());
+ }
matrix.setLinearModel(ui.isLinearModel());
matrix.setLinearModelShowDefault(ui.isLinearModelShowDefault());
result = matrix;
@@ -344,7 +356,8 @@
PopulationZonesEditorUI origine = (PopulationZonesEditorUI)c;
PopulationZonesEditorUI ui = new PopulationZonesEditorUI(new JAXXInitialContext().add(new InputAction()).add(origine.getRegion()));
ui.setBean(origine.getBean());
- ui.getFieldPopulationMappingZoneReproZoneRecru().setMatrix((MatrixND)value);
+ MatrixND m = (MatrixND)value;
+ ui.getFieldPopulationMappingZoneReproZoneRecru().setMatrix(m == null ? null : m.clone());
ui.setActif(true);
ui.refresh();
result = ui;
@@ -353,7 +366,8 @@
PopulationMigrationMigrationUI ui = new PopulationMigrationMigrationUI(new JAXXInitialContext().add(new InputAction()));
ui.setBean(origine.getBean());
ui.setPopInfo(origine.getPopInfo());
- ui.getPopInfo().setMigrationMatrix((MatrixND)value);
+ MatrixND m = (MatrixND)value;
+ ui.getPopInfo().setMigrationMatrix(m == null ? null : m.clone());
ui.setActif(true);
ui.refreshPanel();
result = ui;
@@ -362,7 +376,8 @@
PopulationMigrationEmigrationUI ui = new PopulationMigrationEmigrationUI(new JAXXInitialContext().add(new InputAction()));
ui.setBean(origine.getBean());
ui.setPopInfo(origine.getPopInfo());
- ui.getPopInfo().setEmigrationMatrix((MatrixND)value);
+ MatrixND m = (MatrixND)value;
+ ui.getPopInfo().setEmigrationMatrix(m == null ? null : m.clone());
ui.setActif(true);
ui.refreshPanel();
result = ui;
@@ -371,7 +386,8 @@
PopulationMigrationImmigrationUI ui = new PopulationMigrationImmigrationUI(new JAXXInitialContext().add(new InputAction()));
ui.setBean(origine.getBean());
ui.setPopInfo(origine.getPopInfo());
- ui.getPopInfo().setImmigrationMatrix((MatrixND)value);
+ MatrixND m = (MatrixND)value;
+ ui.getPopInfo().setImmigrationMatrix(m == null ? null : m.clone());
ui.setActif(true);
ui.refreshPanel();
result = ui;
@@ -458,7 +474,7 @@
return canBeContinue(c, o);
} else if (c instanceof InputOneEquationUI){
return true;
- } else if (c instanceof JAXXMatrixEditor){
+ } else if (c instanceof MatrixEditor){
return true;
} else if (c instanceof RangeOfValuesUI){
RangeOfValuesUI ui = (RangeOfValuesUI)c;
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanel.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanel.jaxx 2009-03-23 16:31:30 UTC (rev 2028)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/EquationContinuousPanel.jaxx 2009-03-23 17:45:43 UTC (rev 2029)
@@ -49,7 +49,7 @@
import javax.swing.table.TableCellEditor;
import javax.swing.table.TableModel;
-protected String[] columnNames = {"Name", "Min", "Max", "Operator", "Action"};
+protected String[] columnNames = {"Name", "Value", "Coef", "Operator", "Action"};
protected java.util.List<EquationContinuousDomain> datas = new ArrayList<EquationContinuousDomain>();
protected java.util.List<JComboBox> operateurs = new ArrayList<JComboBox>();
protected java.util.List<JButton> actions = new ArrayList<JButton>();
@@ -203,6 +203,34 @@
public void removeCellEditorListener(CellEditorListener l) {
}
});
+ params.addMouseListener(new MouseListener() {
+
+ @Override
+ public void mouseClicked(MouseEvent e) {
+ if (params.getSelectedRow() != -1){
+ remove.setEnabled(true);
+ }
+ else {
+ remove.setEnabled(false);
+ }
+ }
+
+ @Override
+ public void mousePressed(MouseEvent e) {
+ }
+
+ @Override
+ public void mouseReleased(MouseEvent e) {
+ }
+
+ @Override
+ public void mouseEntered(MouseEvent e) {
+ }
+
+ @Override
+ public void mouseExited(MouseEvent e) {
+ }
+ });
}
protected void add(){
datas.add(new EquationContinuousDomain());
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizard.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizard.jaxx 2009-03-23 16:31:30 UTC (rev 2028)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/FactorWizard.jaxx 2009-03-23 17:45:43 UTC (rev 2029)
@@ -153,7 +153,8 @@
cache = o;
JComponent c = EditorHelper.getEditorWithValue(cOrigine, o);
discretComponents.add(c);
- tabPane.add(c, "Factor " + i);
+ JScrollPane js = new JScrollPane(c);
+ tabPane.addTab("Factor " + i, js);
}
setContinuePossible(EditorHelper.canBeContinue(cOrigine, cache));
@@ -175,7 +176,8 @@
for (int i=0;i<nbTab;i++){
JComponent c = getNewComponent();
discretComponents.add(c);
- tabPane.add(c, "Factor " + (i+1));
+ JScrollPane js = new JScrollPane(c);
+ tabPane.addTab("Factor " + (i+1), js);
}
this.pack();
}
@@ -247,7 +249,7 @@
</cell>
</row>
<row>
- <cell columns='4' fill='both' weightx='1' weighty='1'>
+ <cell columns='4' fill='both' weightx='1' weighty='0.3'>
<JScrollPane>
<JTextArea id='comment'/>
</JScrollPane>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanel.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanel.jaxx 2009-03-23 16:31:30 UTC (rev 2028)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/MatrixContinuousPanel.jaxx 2009-03-23 17:45:43 UTC (rev 2029)
@@ -51,7 +51,7 @@
</cell>
<cell fill='both' weightx='1' weighty='1'>
<JScrollPane>
- <JAXXMatrixEditor id='componentPanel' constructorParams='getMatrix(), false' matrix='{getMatrix()}' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/>
+ <JAXXMatrixEditor id='componentPanel' constructorParams='false' matrix='{getMatrix() == null ? null : getMatrix().clone()}' visible='{isContinuePossible()}' enabled='{isContinueSelected()}'/>
</JScrollPane>
</cell>
</row>
Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx
===================================================================
--- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2009-03-23 16:31:30 UTC (rev 2028)
+++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2009-03-23 17:45:43 UTC (rev 2029)
@@ -564,7 +564,7 @@
<cell columns="4" fill="both" weightx="1.0" weighty="0.6">
<JTabbedPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'>
<tab title='{_("isisfish.params.populationNumbers")}'>
- <org.codelutin.math.matrix.gui.JAXXMatrixEditor id="simulParamsNumbers" name="isisfish.params.populationNumbers"/>
+ <org.codelutin.math.matrix.gui.JAXXMatrixEditor id="simulParamsNumbers" constructorParams='null, false' name="isisfish.params.populationNumbers"/>
</tab>
<tab title='{_("isisfish.params.ruleParameters")}'>
<JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'>
