Author: echatellier Date: 2013-11-26 23:07:07 +0100 (Tue, 26 Nov 2013) New Revision: 3846 Url: http://forge.codelutin.com/projects/isis-fish/repository/revisions/3846 Log: Ajout de donn?\195?\169es d'exemple Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/calibration/CalibrationHandler.java branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/calibration/CalibrationMethodUI.jaxx branches/4.0.1/src/main/resources/i18n/isis-fish_fr_FR.properties Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/calibration/CalibrationHandler.java =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/calibration/CalibrationHandler.java 2013-11-26 21:38:18 UTC (rev 3845) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/calibration/CalibrationHandler.java 2013-11-26 22:07:07 UTC (rev 3846) @@ -22,8 +22,30 @@ */ package fr.ifremer.isisfish.ui.calibration; +import javax.swing.DefaultComboBoxModel; +import javax.swing.DefaultListModel; + import fr.ifremer.isisfish.ui.input.InputHandler; public class CalibrationHandler extends InputHandler { + public void init(CalibrationMethodUI view) { + DefaultComboBoxModel<String> methodModel = new DefaultComboBoxModel<>(); + methodModel.addElement("Simplex"); + methodModel.addElement("ABC"); + methodModel.addElement("Génétique"); + view.getFieldCalibrationMethodSelect().setModel(methodModel); + + DefaultListModel<String> objectiveModel = new DefaultListModel<>(); + objectiveModel.addElement("Moindres carrés indice abondance"); + objectiveModel.addElement("Moindres carrés debarquements par flottille"); + view.getAvailableCalibrationObjectives().setModel(objectiveModel); + + DefaultComboBoxModel<String> criteriaModel = new DefaultComboBoxModel<>(); + criteriaModel.addElement("Min"); + criteriaModel.addElement("Max"); + criteriaModel.addElement("Seuil à dépasser"); + criteriaModel.addElement("Epsilon"); + view.getFieldCalibrationCriteriaSelect().setModel(criteriaModel); + } } Modified: branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/calibration/CalibrationMethodUI.jaxx =================================================================== --- branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/calibration/CalibrationMethodUI.jaxx 2013-11-26 21:38:18 UTC (rev 3845) +++ branches/4.0.1/src/main/java/fr/ifremer/isisfish/ui/calibration/CalibrationMethodUI.jaxx 2013-11-26 22:07:07 UTC (rev 3846) @@ -28,92 +28,93 @@ javax.swing.ComboBoxModel javax.swing.table.DefaultTableModel </import> - + <script><![CDATA[ - - - ]]></script> - <row> - <cell fill="horizontal"> - <JLabel text="isisfish.calibration.select"/> - </cell> - <cell fill="horizontal" weightx="1.0"> - <JComboBox id="fieldCalibrationMethodSelect" /> - </cell> - </row> - <row> - <cell columns="2" fill="both" weightx="1.0" weighty="1.0"> - <JScrollPane> - <JTable id="simulCalibrationMethodParam" rowHeight='24'/> - </JScrollPane> - </cell> - </row> - <row> - <cell columns="2" fill="both" weightx="1.0" weighty="1.0"> - <JPanel id="factorCardinalityPanel" layout="{new CardLayout()}"> - <JLabel text="isisfish.calibration.methodfactorsupported" horizontalAlignment="center" - border="{BorderFactory.createEtchedBorder()}" font-style="italic" constraints='"factorCardinalitySupported"'/> - <JScrollPane id="factorCardinalityScrollPane" constraints='"factorCardinalityNotSupported"'> - <JTable id="factorCardinality" rowHeight='24' /> - </JScrollPane> - </JPanel> - </cell> - </row> - <row> - <cell fill="both" columns='3' weightx="1.0"> - <JLabel text="isisfish.calibration.objectives"/> - </cell> - </row> - <row> - <cell columns='2' fill="both" weightx="1.0" weighty="1.0"> - <Table> - <row> - <cell fill="both" weightx="0.5" weighty="1.0"> - <JScrollPane> - <JList id="availableCalibrationObjectives" selectionMode="{javax.swing.ListSelectionModel.MULTIPLE_INTERVAL_SELECTION}" /> - </JScrollPane> - </cell> - <cell fill="both" weighty="1.0"> - <Table> - <row> - <cell fill="both"> - <JButton id="addObjectiveButton" text="isisfish.common.add" enabled="false" /> - </cell> - </row> - <row> - <cell fill="both"> - <JButton id="removeObjectiveButton" text="isisfish.common.remove" enabled="false" /> - </cell> - </row> - <row> - <cell fill="both"> - <JButton id="clearObjectiveButton" text="isisfish.common.clear" enabled="false" /> - </cell> - </row> - </Table> - </cell> + protected void $afterCompleteSetup() { + getContextValue(CalibrationHandler.class).init(this); + } + ]]></script> + <row> + <cell fill="horizontal"> + <JLabel text="isisfish.calibration.select"/> + </cell> + <cell fill="horizontal" weightx="1.0"> + <JComboBox id="fieldCalibrationMethodSelect" /> + </cell> + </row> + <row> + <cell columns="2" fill="both" weightx="1.0" weighty="1.0"> + <JScrollPane> + <JTable id="simulCalibrationMethodParam" rowHeight='24' /> + </JScrollPane> + </cell> + </row> + <row> + <cell columns="2" fill="both" weightx="1.0" weighty="1.0"> + <JPanel id="factorCardinalityPanel" layout="{new CardLayout()}"> + <JLabel text="isisfish.calibration.methodfactorsupported" horizontalAlignment="center" + border="{BorderFactory.createEtchedBorder()}" font-style="italic" constraints='"factorCardinalitySupported"'/> + <JScrollPane id="factorCardinalityScrollPane" constraints='"factorCardinalityNotSupported"'> + <JTable id="factorCardinality" rowHeight='24' /> + </JScrollPane> + </JPanel> + </cell> + </row> + <row> + <cell fill="both" columns='3' weightx="1.0"> + <JLabel text="isisfish.calibration.objectives"/> + </cell> + </row> + <row> + <cell columns='2' fill="both" weightx="1.0" weighty="1.0"> + <Table> + <row> <cell fill="both" weightx="0.5" weighty="1.0"> - <JScrollPane> - <JList id="selectedCalibrationObjectives" selectionMode="{javax.swing.ListSelectionModel.MULTIPLE_INTERVAL_SELECTION}" /> - </JScrollPane> - </cell> - </row> - </Table> - </cell> - </row> - <row> - <cell fill="both" columns='2' weightx="1.0" weighty="1.0"> - <JScrollPane> - <JTable id="objectiveParamsTable" rowHeight='24' /> - </JScrollPane> - </cell> - </row> - <row> - <cell fill="horizontal"> - <JLabel text="isisfish.calibration.optimization"/> - </cell> - <cell fill="horizontal" weightx="1.0"> - <JComboBox id="fieldCalibrationScriptSelect" /> - </cell> - </row> + <JScrollPane> + <JList id="availableCalibrationObjectives" selectionMode="{javax.swing.ListSelectionModel.MULTIPLE_INTERVAL_SELECTION}" /> + </JScrollPane> + </cell> + <cell fill="both" weighty="1.0"> + <Table> + <row> + <cell fill="both"> + <JButton id="addObjectiveButton" text="isisfish.common.add" enabled="false" /> + </cell> + </row> + <row> + <cell fill="both"> + <JButton id="removeObjectiveButton" text="isisfish.common.remove" enabled="false" /> + </cell> + </row> + <row> + <cell fill="both"> + <JButton id="clearObjectiveButton" text="isisfish.common.clear" enabled="false" /> + </cell> + </row> + </Table> + </cell> + <cell fill="both" weightx="0.5" weighty="1.0"> + <JScrollPane> + <JList id="selectedCalibrationObjectives" selectionMode="{javax.swing.ListSelectionModel.MULTIPLE_INTERVAL_SELECTION}" /> + </JScrollPane> + </cell> + </row> + </Table> + </cell> + </row> + <row> + <cell fill="both" columns='2' weightx="1.0" weighty="1.0"> + <JScrollPane> + <JTable id="objectiveParamsTable" rowHeight='24' /> + </JScrollPane> + </cell> + </row> + <row> + <cell fill="horizontal"> + <JLabel text="isisfish.calibration.optimization"/> + </cell> + <cell fill="horizontal" weightx="1.0"> + <JComboBox id="fieldCalibrationCriteriaSelect" /> + </cell> + </row> </Table> Modified: branches/4.0.1/src/main/resources/i18n/isis-fish_fr_FR.properties =================================================================== --- branches/4.0.1/src/main/resources/i18n/isis-fish_fr_FR.properties 2013-11-26 21:38:18 UTC (rev 3845) +++ branches/4.0.1/src/main/resources/i18n/isis-fish_fr_FR.properties 2013-11-26 22:07:07 UTC (rev 3846) @@ -99,7 +99,7 @@ isisfish.advancedParams.simulatorUse=Simulateur à utiliser isisfish.calibration.methodfactorsupported=La méthode de calibration choisie gère les cardinalités des facteurs isisfish.calibration.objectives=Fonctions d'objectif -isisfish.calibration.optimization=Script d'optimisation +isisfish.calibration.optimization=Critère d'optimisation isisfish.calibration.select=Méthode de calibration isisfish.calibration.title=Calibration isisfish.cell.comments=Commentaires