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

r1339 - in trunk/isis-fish: . src/java/fr/ifremer/isisfish/simulator/launcher src/resources/i18n
by bpoussin＠users.labs.libre-entreprise.org Sept. 24, 2008

Sept. 24, 2008

Author: bpoussin Date: 2008-09-24 14:39:29 +0000 (Wed, 24 Sep 2008) New Revision: 1339 Modified: trunk/isis-fish/.cvsignore trunk/isis-fish/changelog trunk/isis-fish/src/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.java trunk/isis-fish/src/resources/i18n/isis-fish-en_GB.properties trunk/isis-fish/src/resources/i18n/isis-fish-fr_FR.properties Log: commit avant refactoring du repo (utf, mvn structure) Modified: trunk/isis-fish/.cvsignore =================================================================== --- trunk/isis-fish/.cvsignore 2008-09-12 15:37:10 UTC (rev 1338) +++ trunk/isis-fish/.cvsignore 2008-09-24 14:39:29 UTC (rev 1339) @@ -7,3 +7,4 @@ isis-fish.iws isis-fish.iml .settings +__poubelle__ Modified: trunk/isis-fish/changelog =================================================================== --- trunk/isis-fish/changelog 2008-09-12 15:37:10 UTC (rev 1338) +++ trunk/isis-fish/changelog 2008-09-24 14:39:29 UTC (rev 1339) @@ -3,6 +3,9 @@ * complete refactoring option, vcs * complete refactoring simulation engin * new launcher type (subprocess, caparmor ...) in progress + * modify script to use cell and not zone in some computation + * add TechnicalEfficiency equation + * add Inactivity equation support isis-fish (3.1.3) stable; urgency=high Modified: trunk/isis-fish/src/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.java =================================================================== --- trunk/isis-fish/src/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.java 2008-09-12 15:37:10 UTC (rev 1338) +++ trunk/isis-fish/src/java/fr/ifremer/isisfish/simulator/launcher/SubProcessSimulationLauncher.java 2008-09-24 14:39:29 UTC (rev 1339) @@ -51,6 +51,7 @@ return "Sub process"; } + @Override public SimulationStorage simulate(SimulationService simulationService, SimulationControl control, File simulationZip) throws RemoteException { String simulationId = control.getId(); @@ -70,7 +71,9 @@ } + @Override public int maxSimulationThread() { + // TODO rendre configurable le nombre de processeurs a utiliser int result = Runtime.getRuntime().availableProcessors(); return result; } Modified: trunk/isis-fish/src/resources/i18n/isis-fish-en_GB.properties =================================================================== --- trunk/isis-fish/src/resources/i18n/isis-fish-en_GB.properties 2008-09-12 15:37:10 UTC (rev 1338) +++ trunk/isis-fish/src/resources/i18n/isis-fish-en_GB.properties 2008-09-24 14:39:29 UTC (rev 1339) @@ -1,7 +1,7 @@ Can't\ add\ result\ '%1$s'\ at\ date\ %2$s=Can't add result '%1$s' at date %2$s +Can't\ create\ simulation\ logger=Can't create simulation logger Can't\ evaluate\ simulation\ prescript=Can't evaluate simulation prescript Can't\ get\ result\:\ %1$s=Can't get result\: %1$s -Can't\ create\ simulation\ logger=Can't create simulation logger Can't\ instanciate\ export\ %1$s=Can't instanciate export %1$s Checkout\ pom.xml\ to\ %1$s= Info=Info @@ -230,7 +230,7 @@ isisfish.error.import.recent.files=Erreur lors de l'import, la version du fichier que vous souhaitez importer est plus r\u00E9cente que la version souhait\u00E9e. isisfish.error.import.scripts.force=Some files already exist, you MUST use option [force] pour force overwrite. isisfish.error.init.map=Can't init map. -isisfish.error.init.remove.button=could not init remove button (button or list is null) button : %1$s, list : %2$s +isisfish.error.init.remove.button=could not init remove button (button or list is null) button \: %1$s, list \: %2$s isisfish.error.instanciate=Can't instanciate %1$s isisfish.error.instanciate.export=Can't instanciate export %1$s isisfish.error.integer.positif=Your input must be a positif integer (>1) Modified: trunk/isis-fish/src/resources/i18n/isis-fish-fr_FR.properties =================================================================== --- trunk/isis-fish/src/resources/i18n/isis-fish-fr_FR.properties 2008-09-12 15:37:10 UTC (rev 1338) +++ trunk/isis-fish/src/resources/i18n/isis-fish-fr_FR.properties 2008-09-24 14:39:29 UTC (rev 1339) @@ -1,7 +1,7 @@ Can't\ add\ result\ '%1$s'\ at\ date\ %2$s=Can't add result '%1$s' at date %2$s +Can't\ create\ simulation\ logger=Can't create simulation logger Can't\ evaluate\ simulation\ prescript=Can't evaluate simulation prescript Can't\ get\ result\:\ %1$s=Can't get result\: %1$s -Can't\ create\ simulation\ logger=Can't create simulation logger Can't\ instanciate\ export\ %1$s=Can't instanciate export %1$s Checkout\ pom.xml\ to\ %1$s= Info=Info @@ -230,7 +230,7 @@ isisfish.error.import.recent.files=Erreur lors de l'import, la version du fichier que vous souhaitez importer est plus r\u00E9cente que la version souhait\u00E9e. isisfish.error.import.scripts.force=Certains fichiers existent, vous devez utiliser l'option [force] pour forcer l'\u00E9crasement. isisfish.error.init.map=Can't init map. -isisfish.error.init.remove.button=could not init remove button (button or list is null) button : %1$s, list : %2$s +isisfish.error.init.remove.button=could not init remove button (button or list is null) button \: %1$s, list \: %2$s isisfish.error.instanciate=Can't instanciate %1$s isisfish.error.instanciate.export=Can't instanciate export %1$s isisfish.error.integer.positif=Your input must be a positif integer (>1)

1 0

r1338 - branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator
by sletellier＠users.labs.libre-entreprise.org Sept. 12, 2008

Sept. 12, 2008

Author: sletellier Date: 2008-09-12 15:37:10 +0000 (Fri, 12 Sep 2008) New Revision: 1338 Added: branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator/SensWizardPannelsUI.jaxx branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator/SensWizardUI.jaxx branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator/SimulQueueUI.jaxx branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator/SimulUI.jaxx Log: Interface JAXX Copied: branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx (from rev 1313, branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator/ResultChoice2.jaxx) =================================================================== --- branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx (rev 0) +++ branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator/ResultChoiceUI.jaxx 2008-09-12 15:37:10 UTC (rev 1338) @@ -0,0 +1,32 @@ +<JPanel id="ResultChoice" name="isisfish.resultChoice.title" layout='{new BorderLayout()}'> + + +  + + <JLabel text="isisfish.resultChoice.save" horizontalAlignment="0" constraints='BorderLayout.NORTH'/> + <JScrollPane constraints='BorderLayout.CENTER'> +  + <JList id="listResultNames" selectionMode="2"> + + </JList> + </JScrollPane> + + <JButton constraints='BorderLayout.SOUTH' text="isisfish.common.saveNextSimulation"/> + +</JPanel> + Copied: branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx (from rev 1313, branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator/Sens2.jaxx) =================================================================== --- branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx (rev 0) +++ branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator/SensUI.jaxx 2008-09-12 15:37:10 UTC (rev 1338) @@ -0,0 +1,77 @@ +<JPanel id="simulSens" name="isisfish.sens.title"> + + +  + <JComboBox id="fieldSimulParamsAnalysePlansSelect"> + + </JComboBox> + <JScrollPane> + <JList id="listSimulParamsAnalysePlansList" selectionMode="0"> + +  + + </JList> + </JScrollPane> + + <JButton id="buttonSimulParamsAnalysePlansAdd" text="isisfish.common.add"/> + + <JButton id="buttonSimulParamsAnalysePlansRemove" text="isisfish.common.remove"/> + + <JButton id="buttonSimulParamsAnalysePlansClear" text="isisfish.common.clear"/> + +  + + <JScrollPane> + <JTable id="simulParamsAnalysePlans" name="isisfish.sens.planParameters"> + + </JTable> + </JScrollPane> + + <JButton text="isisfish.sens.backParameter"/> + + +</JPanel> + Copied: branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator/SensWizardPannelsUI.jaxx (from rev 1313, branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator/SensWizardPannels2.jaxx) =================================================================== --- branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator/SensWizardPannelsUI.jaxx (rev 0) +++ branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator/SensWizardPannelsUI.jaxx 2008-09-12 15:37:10 UTC (rev 1338) @@ -0,0 +1,64 @@ +<JPanel name="isisfish.sensWizardPanels.title" id="sensWizardPanels" visible="true" + layout='{new XMLGridLayout("fr/ifremer/isisfish/ui/simulator/SensWizardPanels.xgl")}'> + <script> + import org.codelutin.widget.XMLGridLayout; + </script> + <JTabbedPane id="wizardTabPane" constraints='"wizardTabPane"'> + <tab title="isisfish.sensWizardPanels.type"> + <JPanel name="isisfish.sensWizardPanels.type" layout='{new XMLGridLayout("fr/ifremer/isisfish/ui/simulator/SensWizardPanels.xgl")}'> + <JLabel constraints='"typeSensWizardLabel"' text="isisfish.sensWizardPanels.selectType"/> + <JRadioButton constraints='"buttonSimulSensWizardValuesList"' text="isisfish.sensWizardPanels.values" selected="true" buttonGroup="sensWizardPanelsGroup"/> + <JRadioButton constraints='"buttonSimulSensWizardScriptsList"' text="isisfish.sensWizardPanels.scripts" buttonGroup="sensWizardPanelsGroup"/> + </JPanel> + </tab> + <tab title="isisfish.sensWizardPanels.values"> + <JPanel name="isisfish.sensWizardPanels.values" layout='{new XMLGridLayout("fr/ifremer/isisfish/ui/simulator/SensWizardPanels.xgl")}'> + <JPanel constraints='"valuesSensWizardLabelPanel"'> + <JLabel constraints='"valuesSensWizardObjectLabel"' text="isisfish.sensWizardPanels.object"/> + <JTextField constraints='"valuesSensWizardObjectField"' editable="false"/> + + <JLabel constraints='"valuesSensWizardFieldLabel"' text="isisfish.sensWizardPanels.field"/> + <JTextField constraints='"valuesSensWizardFieldField"' editable="false"/> + + <JLabel constraints='"valuesSensWizardTypeLabel"' text="isisfish.sensWizardPanels.type"/> + <JTextField constraints='"valuesSensWizardTypeField"' editable="false"/> + + </JPanel> + <JPanel constraints='"valuesSensWizardNewValuePanel"'> + + <JTextArea text="isisfish.common.blabla"/>  + + </JPanel> + <JButton constraints='"buttonValuesSensWizardAdd"' id="buttonValuesSensWizardAdd" text="isisfish.sensWizardPanels.add" actionCommand=""/> + <JButton constraints='"buttonValuesSensWizardModify"' id="buttonValuesSensWizardModify" text="isisfish.sensWizardPanels.modify" actionCommand=""/> + <JButton constraints='"buttonValuesSensWizardRemove"' id="buttonValuesSensWizardRemove" text="isisfish.sensWizardPanels.remove" actionCommand=""/> + <JButton constraints='"buttonValuesSensWizardUp"' id="buttonValuesSensWizardUp" text="isisfish.sensWizardPanels.up" actionCommand=""/> + <JButton constraints='"buttonValuesSensWizardDown"' id="buttonValuesSensWizardDown" text="isisfish.sensWizardPanels.down" actionCommand=""/> + <JButton constraints='"buttonValuesSensWizardClear"' id="buttonValuesSensWizardClear" text="isisfish.sensWizardPanels.clear" actionCommand=""/> + <JScrollPane constraints='"fieldSensWizardList"'> + <JList id="listSensWizardList"> + + </JList> + </JScrollPane> + </JPanel> + </tab> + <tab title="isisfish.sensWizardPanels.validate"> + <JPanel name="isisfish.sensWizardPanels.validate" layout='{new XMLGridLayout("fr/ifremer/isisfish/ui/simulator/SensWizardPanels.xgl")}'> + <JLabel constraints='"typeSensWizardLabel"' text="isisfish.sensWizardPanels.finish"/> + </JPanel> + </tab> + </JTabbedPane> +</JPanel> \ No newline at end of file Copied: branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator/SensWizardUI.jaxx (from rev 1313, branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator/SensWizard2.jaxx) =================================================================== --- branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator/SensWizardUI.jaxx (rev 0) +++ branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator/SensWizardUI.jaxx 2008-09-12 15:37:10 UTC (rev 1338) @@ -0,0 +1,34 @@ +<JFrame id="sensWizard" visible="true" size='{new Dimension(400,400)}' title="isisfish.sensibilityWizard.title" + layout='{new XMLGridLayout("fr/ifremer/isisfish/ui/simulator/SensWizard.xgl")}'> + + <script> + import org.codelutin.widget.XMLGridLayout; + </script> + <JPanel constraints='"sensWizardPanel"' layout='{new XMLGridLayout("fr/ifremer/isisfish/ui/simulator/SensWizard.xgl")}'> +  + +  + <JPanel constraints='"sensWizardPanelButtons"'> + <JButton id="wizardPrev" text="isisfish.common.previous" enabled="false"/> + + <JButton id="wizardNext" text="isisfish.common.next"/> + + <JButton id="wizardFinish" text="isisfish.common.finish" enabled="false"/> + + <JButton text="isisfish.common.cancel"/> + + </JPanel> + </JPanel> +</JFrame> \ No newline at end of file Copied: branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator/SimulQueueUI.jaxx (from rev 1313, branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator/SimulQueue2.jaxx) =================================================================== --- branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator/SimulQueueUI.jaxx (rev 0) +++ branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator/SimulQueueUI.jaxx 2008-09-12 15:37:10 UTC (rev 1338) @@ -0,0 +1,9 @@ +<JFrame visible="true" size='{new Dimension(400,400)}' title="isisfish.simulationQueue.title" + layout='{new BorderLayout()}'> + + + +</JFrame> Copied: branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator/SimulUI.jaxx (from rev 1313, branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator/Simul2.jaxx) =================================================================== --- branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator/SimulUI.jaxx (rev 0) +++ branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator/SimulUI.jaxx 2008-09-12 15:37:10 UTC (rev 1338) @@ -0,0 +1,51 @@ +<JPanel size='{new Dimension(800,600)}' id="simul" layout='{new BorderLayout()}'> + +  + + + + <JTabbedPane id="simulTabs" constraints='BorderLayout.CENTER'> + <tab title='isisfish.Params.title'><ParamsUI/></tab> + <tab title='isisfish.PreScripts.title'><PreScriptsUI/></tab> + <tab title='isisfish.Sens.title'><SensUI/></tab> + <tab title='isisfish.Export.title'><ExportUI/></tab> + <tab title='isisfish.ResultChoice.title'><ResultChoiceUI/></tab> + <tab title='isisfish.advancedParameters.title'><AdvancedParamsUI/></tab> + <tab title='isisfish.Queue.title'><QueueUI/></tab> + </JTabbedPane> + + + +</JPanel> \ No newline at end of file

1 0

r1337 - branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator
by sletellier＠users.labs.libre-entreprise.org Sept. 12, 2008

Sept. 12, 2008

Author: sletellier Date: 2008-09-12 15:36:54 +0000 (Fri, 12 Sep 2008) New Revision: 1337 Added: branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator/QueueUI.jaxx Log: Interface JAXX Copied: branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator/QueueUI.jaxx (from rev 1313, branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator/Queue2.jaxx) =================================================================== --- branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator/QueueUI.jaxx (rev 0) +++ branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator/QueueUI.jaxx 2008-09-12 15:36:54 UTC (rev 1337) @@ -0,0 +1,51 @@ +<Table> + <row> + <cell columns="3" fill="both" weightx="1.0" weighty="0.5"> + <JScrollPane> + <JTable id="queueTable"> + + </JTable> + </JScrollPane> + </cell> + </row> + <row> + <cell columns="3" fill="both" weightx="1.0" weighty="0.5"> + <JScrollPane> + <JTable id="queueTableDone"> + + </JTable> + </JScrollPane> + </cell> + </row> + <row> + <cell fill="horizontal" weightx="0.3"> + <JButton id="buttonSimulQueueStart" text="isisfish.queue.simulationLaunch"/> + + </cell> + <cell fill="horizontal" weightx="0.3"> +  + <JButton id="buttonSimulQueueRemove" text="isisfish.queue.stopSimulation"/> + </cell> + <cell fill="horizontal" weightx="0.3"> + + <JButton id="buttonSimulQueueShowLog" text="isisfish.queue.showLog"/> + +  +  + </cell> + </row> +</Table> \ No newline at end of file

1 0

r1336 - branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator
by sletellier＠users.labs.libre-entreprise.org Sept. 12, 2008

Sept. 12, 2008

Author: sletellier Date: 2008-09-12 15:36:47 +0000 (Fri, 12 Sep 2008) New Revision: 1336 Added: branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator/PreScriptsUI.jaxx Log: Interface JAXX Copied: branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator/PreScriptsUI.jaxx (from rev 1313, branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator/PreScripts2.jaxx) =================================================================== --- branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator/PreScriptsUI.jaxx (rev 0) +++ branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator/PreScriptsUI.jaxx 2008-09-12 15:36:47 UTC (rev 1336) @@ -0,0 +1,16 @@ +<JPanel id="simulPreScripts" layout='{new BorderLayout()}'> + <JScrollPane constraints='BorderLayout.CENTER'> + <JTextArea id="fieldSimulPreScript"> + + </JTextArea> + </JScrollPane> + + <JButton constraints='BorderLayout.SOUTH' text="isisfish.preScript.backParameter"/> + + +</JPanel> \ No newline at end of file

1 0

r1335 - branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator
by sletellier＠users.labs.libre-entreprise.org Sept. 12, 2008

Sept. 12, 2008

Author: sletellier Date: 2008-09-12 15:36:41 +0000 (Fri, 12 Sep 2008) New Revision: 1335 Added: branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx Log: Interface JAXX Copied: branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx (from rev 1313, branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator/Params2.jaxx) =================================================================== --- branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx (rev 0) +++ branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator/ParamsUI.jaxx 2008-09-12 15:36:41 UTC (rev 1335) @@ -0,0 +1,224 @@ + +<Table insets='0,0,0,0'> + <row> + <cell fill="horizontal" weightx="1.0"> + <Table> + <row> + <cell columns="4" fill="horizontal"> + <JLabel text="isisfish.params.loadOldSimulation"/> + </cell> + </row> + <row> + <cell columns="2" fill="horizontal" weightx="1.0"> + <JComboBox id="fieldSimulParamsSelect"/> + </cell> + <cell> + <JButton text="isisfish.params.filter" id="buttonSimulParamsSelectFilter"/> + </cell> + <cell> + <JButton text="isisfish.params.clearFilter" id="buttonSimulParamsSelectClearFilter"/> + </cell> + </row> + </Table> + </cell> + </row> + <row> + <cell fill="both" weightx="1.0" weighty="1.0"> + <Table> + <row> + <cell columns="2" fill="horizontal" weightx="0.5"> + <Table> + <row> + <cell fill="horizontal"> + <JLabel text="isisfish.params.simulationName" minimumSize='{new Dimension(140,25)}' preferredSize='{new Dimension(140,25)}'/> + </cell> + <cell fill="both" weightx="1.0"> + <JTextField id="fieldSimulParamsName"/> + </cell> + </row> + </Table> + </cell> + <cell columns="2" fill="horizontal" weightx="0.5"> + <Table> + <row> + <cell columns="2" fill="horizontal"> + <JLabel text="isisfish.common.region"/> + </cell> + <cell fill="horizontal" weightx="1.0"> + <JComboBox id="fieldSimulParamsRegion"/> + </cell> + </row> + </Table> + </cell> + </row> + <row> + <cell columns="4" fill="horizontal" weightx="1.0"> + <Table> + <row> + <cell> + <JLabel text="isisfish.params.description"/> + </cell> + <cell fill="horizontal" weightx="1.0"> + <JPanel/> + </cell> + </row> + </Table> + </cell> + </row> + <row> + <cell columns="4" fill="both" weightx="1.0" weighty="0.3"> + <JScrollPane minimumSize='{new Dimension(0,0)}' preferredSize='{new Dimension(0,0)}'> + <JTextArea id="fieldSimulParamsDesc"/> + </JScrollPane> + </cell> + </row> + <row> + <cell columns="2" fill="horizontal" weightx="0.5"> + <Table> + <row> + <cell fill="horizontal"> + <JLabel text="isisfish.params.numberYear" minimumSize='{new Dimension(140,25)}' preferredSize='{new Dimension(140,25)}'/> + </cell> + <cell fill="both" weightx="1.0"> + <JTextField id="fieldSimulParamsNbAnnees"/> + </cell> + </row> + </Table> + </cell> + <cell columns="2" fill="horizontal" weightx="0.5"> + <JPanel/> + </cell> + </row> + <row> + <cell fill="both" weightx="0.2" weighty="0.1"> + <Table> + <row> + <cell fill="horizontal"> + <JLabel text="isisfish.common.strategies"/> + </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="listSimulParamsStrategies" selectionMode="2"/> + </JScrollPane> + </cell> + </row> + </Table> + </cell> + <cell fill="both" weightx="0.4" weighty="0.1"> + <Table> + <row> + <cell fill="horizontal"> + <JLabel text="isisfish.common.populations"/> + </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="listSimulParamsPopulations" selectionMode="2"/> + </JScrollPane> + </cell> + </row> + </Table> + </cell> + <cell fill="both" weightx="0.4" weighty="0.1"> + <Table> + <row> + <cell fill="horizontal"> + <JLabel text="isisfish.common.rules"/> + </cell> + </row> + <row> + <cell fill="horizontal"> + <JComboBox id="fieldSimulParamsMesuresSelect"/> + </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="listSimulParamsMesuresList" selectionMode="0"/> + </JScrollPane> + </cell> + </row> + </Table> + </cell> + <cell fill="both" weighty="0.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="buttonSimulParamsMesuresAdd" text="isisfish.common.add"/> + </cell> + </row> + <row> + <cell fill='horizontal'> + <JButton id="buttonSimulParamsMesuresRemove" text="isisfish.common.remove"/> + </cell> + </row> + <row> + <cell fill='horizontal'> + <JButton id="buttonSimulParamsMesuresClear" text="isisfish.common.clear"/> + </cell> + </row> + <row> + <cell fill='both' weighty="1.0"> + <JPanel/> + </cell> + </row> + </Table> + </cell> + </row> + <row> + <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.ruleParameters"> + <JTable id="simulParamsRules" name="isisfish.params.ruleParameters"> + </JTable> + </tab> + </JTabbedPane> + </cell> + </row> + </Table> + </cell> + </row> + <row> + <cell fill="horizontal" weightx="1.0"> + <Table> + <row> + <cell fill="horizontal" weightx="0.3"> + <JCheckBox text="isisfish.params.usePreSimulationScript" id="fieldUseSimulPreScripts"/> + </cell> + <cell fill="horizontal" weightx="0.3"> + <JCheckBox text="isisfish.params.useAnalysePlan" id="fieldSimulUseAnalysePlan"/> + </cell> + <cell fill="horizontal" weightx="0.3"> + <JCheckBox text="isisfish.params.onlyExportSimulation" id="fieldSimulOnlyExport"/> + </cell> + </row> + </Table> + </cell> + </row> + <row> + <cell fill="horizontal" weightx="1.0"> + <Table> + <row> + <cell> + <JLabel id="lblLauncher" text="isisfish.params.lblLauncher"/> + </cell> + <cell fill="horizontal" weightx="0.5"> + <JComboBox id="comboSelLauncher"/> + </cell> + <cell fill="horizontal" weightx="0.5"> + <JButton id="buttonSimulParamsSimulate" text="isisfish.common.simulate"/> + </cell> + </row> + </Table> + </cell> + </row> +</Table> + \ No newline at end of file

1 0

r1334 - branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator
by sletellier＠users.labs.libre-entreprise.org Sept. 12, 2008

Sept. 12, 2008

Author: sletellier Date: 2008-09-12 15:36:31 +0000 (Fri, 12 Sep 2008) New Revision: 1334 Added: branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx Log: Interface JAXX Copied: branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx (from rev 1313, branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator/Export2.jaxx) =================================================================== --- branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx (rev 0) +++ branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator/ExportUI.jaxx 2008-09-12 15:36:31 UTC (rev 1334) @@ -0,0 +1,40 @@ + +<Table> + <row> + <cell columns="4" fill="both" weightx="1.0" weighty="1.0"> + <JScrollPane> + <JList id="listSimulExportChoose" selectionMode="2"> + + </JList> + </JScrollPane> + </cell> + </row> + <row> + <cell> + <JLabel text="isisfish.export.directory"/> + </cell> + <cell fill="horizontal" weightx="1.0"> + <JTextField id="fieldSimulExportFolder"/> + </cell> + <cell> + <JButton text="isisfish.common.ellipsis"/> + + </cell> + <cell> + <JButton text="isisfish.common.saveNextSimulation"/> + </cell> + </row> + + +</Table> +

1 0

r1333 - branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator
by sletellier＠users.labs.libre-entreprise.org Sept. 12, 2008

Sept. 12, 2008

Author: sletellier Date: 2008-09-12 15:36:23 +0000 (Fri, 12 Sep 2008) New Revision: 1333 Added: branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx Log: Interface JAXX Copied: branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx (from rev 1313, branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator/AdvancedParams2.jaxx) =================================================================== --- branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx (rev 0) +++ branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator/AdvancedParamsUI.jaxx 2008-09-12 15:36:23 UTC (rev 1333) @@ -0,0 +1,134 @@ +<Table> + <row> + <cell fill="horizontal" weightx="0.16"> + <Table> + <row> + <cell> + <JLabel text="isisfish.advancedParams.simulatorUse"/> + </cell> + <cell fill="horizontal" weightx="1.0"> + <JPanel/> + </cell> + </row> + </Table> + </cell> + <cell columns="5" fill="horizontal" weightx="0.84"> + <JComboBox id="fieldSimulAdvParamsSimulatorSelect"/> + </cell> + </row> + <row> + <cell fill="horizontal" weightx="0.2"> + <JPanel/> + </cell> + <cell columns="2" fill="horizontal" weightx="0.3"> + <JCheckBox text="isisfish.advancedParams.simulationStatistique" id="fieldSimulationStatistique"/> + </cell> + <cell fill="horizontal" weightx="0.2"> + <JPanel/> + </cell> + <cell columns="2" fill="horizontal" weightx="0.3"> + <JCheckBox text="isisfish.advancedParams.simulationCache" id="fieldSimulationCache"/> + </cell> + </row> + <row> + <cell columns="2" fill="horizontal" weightx="0.2"> + <JLabel text="isisfish.advancedParams.simulLevelLogger"/> + </cell> + <cell fill="horizontal" weightx="0.2"> + <JRadioButton id="fieldSimulAdvParamsSimulLoggerError" text="isisfish.common.error" buttonGroup="fieldSimulAdvParamsSimulLoggerGroup"/> + </cell> + <cell fill="horizontal" weightx="0.2"> + <JRadioButton id="fieldSimulAdvParamsSimulLoggerWarn" text="isisfish.common.warn" buttonGroup="fieldSimulAdvParamsSimulLoggerGroup"/> + </cell> + <cell fill="horizontal" weightx="0.2"> + <JRadioButton id="fieldSimulAdvParamsSimulLoggerInfo" text="isisfish.common.info" buttonGroup="fieldSimulAdvParamsSimulLoggerGroup"/> + </cell> + <cell fill="horizontal" weightx="0.2"> + <JRadioButton id="fieldSimulAdvParamsSimulLoggerDebug" text="isisfish.common.debug" buttonGroup="fieldSimulAdvParamsSimulLoggerGroup"/> + </cell> + </row> + <row> + <cell columns="2" fill="horizontal" weightx="0.2"> + <JLabel text="isisfish.advancedParams.scriptLevelLogger"/> + </cell> + <cell fill="horizontal" weightx="0.2"> + <JRadioButton id="fieldSimulAdvParamsScriptLoggerError" text="isisfish.common.error" buttonGroup="fieldSimulAdvParamsScriptLoggerGroup"/> + </cell> + <cell fill="horizontal" weightx="0.2"> + <JRadioButton id="fieldSimulAdvParamsScriptLoggerWarn" text="isisfish.common.warn" buttonGroup="fieldSimulAdvParamsScriptLoggerGroup"/> + </cell> + <cell fill="horizontal" weightx="0.2"> + <JRadioButton id="fieldSimulAdvParamsScriptLoggerInfo" text="isisfish.common.info" buttonGroup="fieldSimulAdvParamsScriptLoggerGroup"/> + </cell> + <cell fill="horizontal" weightx="0.2"> + <JRadioButton id="fieldSimulAdvParamsScriptLoggerDebug" text="isisfish.common.debug" buttonGroup="fieldSimulAdvParamsScriptLoggerGroup"/> + </cell> + </row> + <row> + <cell columns="2" fill="horizontal" weightx="0.2"> + <JLabel text="isisfish.advancedParams.libLevelLogger"/> + </cell> + <cell fill="horizontal" weightx="0.2"> + <JRadioButton id="fieldSimulAdvParamsLibLoggerError" text="isisfish.common.error" buttonGroup="fieldSimulAdvParamsLibLoggerGroup"/> + </cell> + <cell fill="horizontal" weightx="0.2"> + <JRadioButton id="fieldSimulAdvParamsLibLoggerWarn" text="isisfish.common.warn" buttonGroup="fieldSimulAdvParamsLibLoggerGroup"/> + </cell> + <cell fill="horizontal" weightx="0.2"> + <JRadioButton id="fieldSimulAdvParamsLibLoggerInfo" text="isisfish.common.info" buttonGroup="fieldSimulAdvParamsLibLoggerGroup"/> + </cell> + <cell fill="horizontal" weightx="0.2"> + <JRadioButton id="fieldSimulAdvParamsLibLoggerDebug" text="isisfish.common.debug" buttonGroup="fieldSimulAdvParamsLibLoggerGroup"/> + </cell> + </row> + <row> + <cell columns="6" fill="horizontal" weightx="1.0"> + <JLabel text="isisfish.advancedParams.freeParameters" horizontalAlignment="0"/> + </cell> + </row> + <row> + <cell fill="horizontal" weightx="0.25"> + <JLabel text="isisfish.common.tag"/> + </cell> + <cell columns="2" fill="horizontal" weightx="0.25"> + <JTextField id="fieldTag"/> + </cell> + <cell fill="horizontal" weightx="0.25"> + <JLabel text="isisfish.common.value"/> + </cell> + <cell columns="2" fill="horizontal" weightx="0.25"> + <JTextField id="fieldValue"/> + </cell> + </row> + <row> + <cell columns="6" fill="horizontal" weightx="1.0"> + <JButton text="isisfish.common.add"/> + + </cell> + </row> + <row> + <cell columns="6" fill="both" weightx="1.0" weighty="1.0"> + <JScrollPane> + <JTable id="tableTagValue"/> + </JScrollPane> + </cell> + </row> + <row> + <cell columns="6" fill="horizontal" weightx="1.0"> + <JButton text="isisfish.common.remove"/> + + </cell> + </row> + <row> + <cell columns="6" fill="horizontal" weightx="1.0"> + <JButton text="isisfish.common.saveNextSimulation"/> + + </cell> + </row> +</Table> \ No newline at end of file

1 0

r1332 - branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui
by sletellier＠users.labs.libre-entreprise.org Sept. 12, 2008

Sept. 12, 2008

Author: sletellier Date: 2008-09-12 15:34:06 +0000 (Fri, 12 Sep 2008) New Revision: 1332 Added: branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/WelcomeUI.jaxx Log: Interface JAXX Copied: branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/WelcomeUI.jaxx (from rev 1313, branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/Welcome2.jaxx) =================================================================== --- branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/WelcomeUI.jaxx (rev 0) +++ branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/WelcomeUI.jaxx 2008-09-12 15:34:06 UTC (rev 1332) @@ -0,0 +1,133 @@ +<Application title="isisfish.welcome.title" size='{new Dimension(800,600)}' resizable="true" location='{new Point(0,23)}' layout='{new BorderLayout()}'> + <script> + public static void main(String[] args) { + org.codelutin.i18n.I18n.init(); + new WelcomeUI().setVisible(true); + } + </script> + + <JMenuBar> + <JMenu text='isisfish.welcome.menu.file'> + + <JMenuItem text="isisfish.welcome.menu.synchro" accelerator="accSync"/> + + <JSeparator/> + <JMenuItem text="isisfish.welcome.menu.close" accelerator="accClose"/> + + </JMenu> + <JMenu text="isisfish.welcome.menu.frame"> + + <JMenuItem text="isisfish.welcome.menu.simulation" accelerator="accSimul" + onActionPerformed='new fr.ifremer.isisfish.ui.simulator.Simul2()'/> + + <JMenuItem text="isisfish.welcome.menu.result" accelerator="accResult"/> + + <JMenuItem text="isisfish.welcome.menu.input" accelerator="accInput"/> + + <JMenuItem text="isisfish.welcome.menu.script" accelerator="accScript" + onActionPerformed='new fr.ifremer.isisfish.ui.script.Script2()'/> + + <JSeparator/> + <JMenuItem text="isisfish.welcome.menu.queue" accelerator="accSimulQueue" + onActionPerformed='new fr.ifremer.isisfish.ui.simulator.SimulQueue2()'/> + + <JSeparator/> + <JMenu text="isisfish.welcome.menu.configuration"> + + <JMenuItem text="isisfish.welcome.menu.configuration" accelerator="accConfig"/> + + <JMenuItem text="isisfish.welcome.menu.vcs.configuration" accelerator="accVCSConfig"/> + + </JMenu> + </JMenu> + <JMenu text="isisfish.welcome.menu.help"> + + <JMenuItem text="isisfish.welcome.menu.help" accelerator="accHelp"/> + + <JSeparator/> + <JMenuItem text="isisfish.welcome.menu.monitor" accelerator="accLogMonitor" + onActionPerformed='new fr.ifremer.isisfish.ui.ApplicationMonitor2()'/> + + <JSeparator/> + <JMenuItem text="isisfish.welcome.menu.about" accelerator="accAbout"/> + + </JMenu> + </JMenuBar> + <JTabbedPane id="simulTabs" tabPlacement='{JTabbedPane.LEFT}'> + <tab title='' icon='{new ImageIcon(getClass().getResource("/images/simulation.gif"))}'><fr.ifremer.isisfish.ui.simulator.SimulUI/></tab> + <tab title='' icon='{new ImageIcon(getClass().getResource("/images/calc.gif"))}'><StatusBarUI/></tab> + <tab title='' icon='{new ImageIcon(getClass().getResource("/images/book.gif"))}'><StatusBarUI/></tab> + <tab title='' icon='{new ImageIcon(getClass().getResource("/images/bookPage.gif"))}'><fr.ifremer.isisfish.ui.script.ScriptUI/></tab> + </JTabbedPane> + + +  + <JPanel constraints="BorderLayout.SOUTH"> + <StatusBarUI/> + </JPanel> +</Application>

1 0

r1331 - trunk/isis-fish
by sletellier＠users.labs.libre-entreprise.org Sept. 2, 2008

Sept. 2, 2008

Author: sletellier Date: 2008-09-02 13:35:17 +0000 (Tue, 02 Sep 2008) New Revision: 1331 Modified: trunk/isis-fish/pom.xml Log: pom stable Modified: trunk/isis-fish/pom.xml =================================================================== --- trunk/isis-fish/pom.xml 2008-09-01 08:49:17 UTC (rev 1330) +++ trunk/isis-fish/pom.xml 2008-09-02 13:35:17 UTC (rev 1331) @@ -436,7 +436,7 @@ </executions> </plugin> <plugin> - <groupId>lutinplugin</groupId> + <groupId>org.codelutin.plugin</groupId> <artifactId>maven-i18n-plugin</artifactId> <!-- <version>0.4</version> @@ -447,6 +447,7 @@ <param>en_GB</param> </bundles> <keysModifier>false</keysModifier> + <encoding>UTF-8</encoding> <entries> <entry> <basedir> @@ -526,7 +527,7 @@ <dependency> <groupId>org.codelutin</groupId> <artifactId>lutinutil</artifactId> - <version>[0.29,]</version> + <version>0.30</version> <scope>compile</scope> </dependency> <!--

1 0

r1330 - trunk/isis-fish/src/uimodel/fr/ifremer/isisfish/ui/simulator
by bpoussin＠users.labs.libre-entreprise.org Sept. 1, 2008

Sept. 1, 2008

Author: bpoussin Date: 2008-09-01 08:49:17 +0000 (Mon, 01 Sep 2008) New Revision: 1330 Modified: trunk/isis-fish/src/uimodel/fr/ifremer/isisfish/ui/simulator/Params.xml Log: suppression d'un ajout au context qui ne sert plus Modified: trunk/isis-fish/src/uimodel/fr/ifremer/isisfish/ui/simulator/Params.xml =================================================================== --- trunk/isis-fish/src/uimodel/fr/ifremer/isisfish/ui/simulator/Params.xml 2008-09-01 08:48:20 UTC (rev 1329) +++ trunk/isis-fish/src/uimodel/fr/ifremer/isisfish/ui/simulator/Params.xml 2008-09-01 08:49:17 UTC (rev 1330) @@ -3,7 +3,6 @@ <panel id="simulParams" name="isisfish.params.title" constraints="simulParams" layout="XMLGridLayout(fr/ifremer/isisfish/ui/simulator/Params.xgl)"> <ContextDataSource id="RuleNames" context="current" source="RuleNames"/> - <ContextDataSource id="SimulationService" context="current" source="SimulationService"/> <label constraints="labelSimulParamsSelect" text="isisfish.params.loadOldSimulation"/> <panel constraints="panelSimulParamsSelectFilterActions">

1 0