Author: sletellier Date: 2008-08-29 19:29:03 +0000 (Fri, 29 Aug 2008) New Revision: 1324 Modified: trunk/isis-fish/src/uimodel/fr/ifremer/isisfish/ui/simulator/Params.xgl trunk/isis-fish/src/uimodel/fr/ifremer/isisfish/ui/simulator/Params.xml trunk/isis-fish/src/uimodel/fr/ifremer/isisfish/ui/simulator/Simul.xml Log: Ajout d'un combobox pour choisir sont launcher Modified: trunk/isis-fish/src/uimodel/fr/ifremer/isisfish/ui/simulator/Params.xgl =================================================================== --- trunk/isis-fish/src/uimodel/fr/ifremer/isisfish/ui/simulator/Params.xgl 2008-08-29 19:28:47 UTC (rev 1323) +++ trunk/isis-fish/src/uimodel/fr/ifremer/isisfish/ui/simulator/Params.xgl 2008-08-29 19:29:03 UTC (rev 1324) @@ -50,6 +50,7 @@ <td fill="Both" colspan="3" width="50%">fieldSimulParamsOptions</td> </tr> <tr> + <td colspan="3">comboSelLauncher</td> <td colspan="3">buttonSimulParamsSimulate</td> <td colspan="3">buttonSimulParamsAddQueue</td> </tr> 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-08-29 19:28:47 UTC (rev 1323) +++ trunk/isis-fish/src/uimodel/fr/ifremer/isisfish/ui/simulator/Params.xml 2008-08-29 19:29:03 UTC (rev 1324) @@ -3,6 +3,7 @@ <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"> @@ -141,9 +142,14 @@ actionCommand="update($fieldSimulOnlyExport/selected)"/> </panel> + <combobox constraints="comboSelLauncher" id="comboSelLauncher" + firstNull="true"> + <ComboBoxModel origin="getSimulationLaunchers(fr.ifremer.isisfish.simulator.launcher.SimulationService.getService())"/> + </combobox> + <button constraints="buttonSimulParamsSimulate" id="buttonSimulParamsSimulate" text="isisfish.common.simulate" - actionCommand="simulator.SimulatorAction.simulate($fieldSimulParamsName/text, $SimulationParameter, 'false', $simulTabs)"/> + actionCommand="simulator.SimulatorAction.simulate($fieldSimulParamsName/text, $SimulationParameter, 'false', $simulTabs, $comboSelLauncher/selectedItem)"/> <!-- La queue n'existe plus <button constraints="buttonSimulParamsAddQueue" id="buttonSimulParamsAddQueue" text="isisfish.common.addQueue" Modified: trunk/isis-fish/src/uimodel/fr/ifremer/isisfish/ui/simulator/Simul.xml =================================================================== --- trunk/isis-fish/src/uimodel/fr/ifremer/isisfish/ui/simulator/Simul.xml 2008-08-29 19:28:47 UTC (rev 1323) +++ trunk/isis-fish/src/uimodel/fr/ifremer/isisfish/ui/simulator/Simul.xml 2008-08-29 19:29:03 UTC (rev 1324) @@ -11,6 +11,10 @@ onOpened="simulator.SimulatorAction.opened($simulTabs,$buttonSimulQueueStart,$buttonSimulQueueRemove,$buttonSimulQueueShowLog,$queueTable,$queueTableDone,$buttonSimulParamsAnalysePlansRemove,$listSimulParamsAnalysePlansList,$buttonSimulParamsMesuresRemove,$listSimulParamsMesuresList)" --> +<!-- Fixme : Modif Letellier 29/08/08 +$buttonSimulQueueStart, $buttonSimulQueueRemove, $buttonSimulQueueShowLog, $queueTable, $queueTableDone, +--> + <ContextDataSource id="OldSimulationName" context="current" source="OldSimulationName"/> <ContextDataSource id="SimulationFilterModel" context="current" source="SimulationFilterModel"/> <ContextDataSource id="SimulationParameter" context="current" source="SimulationParameter"/>