Author: sletellier Date: 2009-03-17 17:22:24 +0000 (Tue, 17 Mar 2009) New Revision: 1989 Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties Log: Input factor cardinality Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java 2009-03-17 16:35:51 UTC (rev 1988) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/simulator/sensitivity/Factor.java 2009-03-17 17:22:24 UTC (rev 1989) @@ -207,4 +207,9 @@ return f; } + + @Override + public String toString(){ + return name; + } } Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx 2009-03-17 16:35:51 UTC (rev 1988) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityChooserUI.jaxx 2009-03-17 17:22:24 UTC (rev 1989) @@ -40,6 +40,9 @@ import fr.ifremer.isisfish.ui.simulator.SimulAction; import fr.ifremer.isisfish.ui.widget.editor.GenericCell; import fr.ifremer.isisfish.ui.widget.editor.ParameterColumnEditor; +import fr.ifremer.isisfish.simulator.sensitivity.Domain; +import fr.ifremer.isisfish.simulator.sensitivity.Factor; +import fr.ifremer.isisfish.simulator.sensitivity.domain.ContinuousDomain; public ComboBoxModel getSensitivityModel(){ java.util.List<Item> items = new ArrayList<Item>(); @@ -101,18 +104,142 @@ } } +public void setFactorCardinalityModel(){ + DefaultTableModel model = new DefaultTableModel(){ + @Override + public boolean isCellEditable(int row, int column) { + boolean result = false; + if (column > 0){ + result =true; + } + return result; + } + }; + java.util.List<Factor<? extends Serializable>> factors = getSimulAction().getFactors(); + + java.util.List<Factor<? extends Serializable>> factorsContinue = new ArrayList<Factor<? extends Serializable>>(); + java.util.List<String> incs = new ArrayList<String>(); + for (Factor f : factors){ + Domain domain = f.getDomain(); + if (ContinuousDomain.class.isInstance(domain)){ + ContinuousDomain continuousDomain = (ContinuousDomain)domain; + factorsContinue.add(f); + incs.add(continuousDomain.getCardinality() + ""); + } + } + model.addColumn("Factor", factorsContinue.toArray()); + model.addColumn("Cardinality", incs.toArray()); + + factorCardinality.setModel(model); + factorCardinality.getModel().addTableModelListener(new TableModelListener() { + @Override + public void tableChanged(TableModelEvent e) { + int row = e.getFirstRow(); + TableModel model = (TableModel)e.getSource(); + Factor f = (Factor) model.getValueAt(row, 0); + ((ContinuousDomain)f.getDomain()).setCardinality(Integer.parseInt((String)model.getValueAt(row, 1))); + } + }); +} +protected DefaultComboBoxModel getExportModel(){ + DefaultComboBoxModel model = new DefaultComboBoxModel(); + return model; +} +protected void exportListSelected(){ +} +protected void add(){ +} +protected void remove(){ +} +protected void clear(){ +} ]]> </script> <row> - <cell columns="2" fill="horizontal" weightx="1.0"> + <cell fill="horizontal"> + <JLabel text="isisfish.sensitivity.select"/> + </cell> + <cell fill="horizontal" weightx="1.0"> <JComboBox id="fieldSensitivitySelect" model='{getSensitivityModel()}' onActionPerformed='sensChanged()'/> </cell> </row> <row> - <cell columns="2" fill="both" weightx="1.0" weighty="1.0"> + <cell columns="2" fill="both" weightx="1.0" weighty="0.1"> <JScrollPane> <JTable id="simulSensitivityParam" rowHeight='24'/> </JScrollPane> </cell> </row> + <row> + <cell columns="2" fill="both" weightx="1.0" weighty="0.1"> + <JScrollPane> + <JTable id="factorCardinality" rowHeight='24'/> + </JScrollPane> + </cell> + </row> + <row> + <cell fill="both" columns='2' weightx="1" weighty="0.5"> + <Table> + <row> + <cell fill="both" weightx="1" weighty="1"> + <Table> + <row> + <cell fill="horizontal"> + <JLabel text="isisfish.sensitivity.export"/> + </cell> + </row> + <row> + <cell fill="horizontal"> + <JComboBox id="export" model='{getExportModel()}'/> + </cell> + </row> + <row> + <cell fill="both" weightx="1.0" weighty="1.0"> + <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> + <JList id="exportList" selectionMode="0" onMouseClicked='exportListSelected()'/> + </JScrollPane> + </cell> + </row> + </Table> + </cell> + <cell fill="both" weighty="1"> + <Table> + <row> + <cell fill="horizontal"> + <JLabel text=" " minimumSize='{new Dimension(2,15)}' preferredSize='{new Dimension(2,15)}'/> + </cell> + </row> + <row> + <cell fill='horizontal'> + <JButton id="add" text="isisfish.common.add" onActionPerformed='add()'/> + </cell> + </row> + <row> + <cell fill='horizontal'> + <JButton id="remove" text="isisfish.common.remove" enabled="false" onActionPerformed='remove()'/> + </cell> + </row> + <row> + <cell fill='horizontal'> + <JButton id="clear" text="isisfish.common.clear" enabled="false" onActionPerformed='clear()'/> + </cell> + </row> + <row> + <cell fill='both' weighty="1.0"> + <JPanel/> + </cell> + </row> + </Table> + </cell> + </row> + </Table> + </cell> + </row> + <row> + <cell fill="both" columns='2' weightx="1" weighty="0.3"> + <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> + <JTable id="exportParams" rowHeight='24'/> + </JScrollPane> + </cell> + </row> </Table> \ No newline at end of file Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx 2009-03-17 16:35:51 UTC (rev 1988) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/sensitivity/SensitivityTabUI.jaxx 2009-03-17 17:22:24 UTC (rev 1989) @@ -152,6 +152,7 @@ FactorTreeModel model = new FactorTreeModel(root); factors.setModel(model); factors.setCellRenderer(new FactorTreeCellRenderer()); + getParentContainer(SensitivityUI.class).getSensitivityChooserUI().setFactorCardinalityModel(); } ]]> </script> Modified: isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties =================================================================== --- isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-03-17 16:35:51 UTC (rev 1988) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-en_GB.properties 2009-03-17 17:22:24 UTC (rev 1989) @@ -858,8 +858,10 @@ isisfish.sensWizardPanels.validate=Validate isisfish.sensWizardPanels.values=Values isisfish.sensibilityWizard.title=Sensibility Wizard +isisfish.sensitivity.export=Export isisfish.sensitivity.secondpass=Analyze results isisfish.sensitivity.secondpass.title=Analyze results +isisfish.sensitivity.select=Method isisfish.sensitivity.title=Factors input isisfish.sensitivityChooser.title=Sensitivities input isisfish.server.ssh.generateKey.title=Generate Ssh key 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-03-17 16:35:51 UTC (rev 1988) +++ isis-fish/trunk/src/main/resources/i18n/isis-fish-fr_FR.properties 2009-03-17 17:22:24 UTC (rev 1989) @@ -858,8 +858,10 @@ isisfish.sensWizardPanels.validate=Valider isisfish.sensWizardPanels.values=Valeurs isisfish.sensibilityWizard.title=Sensibility Wizard +isisfish.sensitivity.export=Export isisfish.sensitivity.secondpass=Analyse des r\u00E9sultats isisfish.sensitivity.secondpass.title=Analyse des r\u00E9sultats +isisfish.sensitivity.select=M\u00E9thode isisfish.sensitivity.title=S\u00E9lection des facteurs isisfish.sensitivityChooser.title=M\u00E9thode de la sensibilit\u00E9 isisfish.server.ssh.generateKey.title=G\u00E9n\u00E9rer une cl\u00E9 SSH