r1338 - branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator - Isis-fish-commits

12 Sep 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()}'>
+
+<!-- Fixme : ContextDataSource 
+	<ContextDataSource id="ResultNames" context="current" source="ResultNames"/>
+-->
+	<!--
+	 |
+	 | Result enabled
+	 |
+	 +-->
+
+	    <JLabel text="isisfish.resultChoice.save" horizontalAlignment="0" constraints='BorderLayout.NORTH'/>	    
+	    <JScrollPane constraints='BorderLayout.CENTER'>
+            <!--list id="listResultNames" SelectionMode="2" renderer="org.codelutin.i18n.I18n._(.)"-->
+            <JList id="listResultNames" selectionMode="2">
+<!-- Fixme : ListModel, ListSelectionEvents and listRender
+                origin="$SimulationParameter/resultEnabled"
+                <ListModel origin="$ResultNames"/>
+	            <ListSelectionEvents onValueChanged="Update($listResultNames/selectedValues, $SimulationParameter/resultEnabled)"/>
+                <ListRenderer>
+                    <SimpleToolTipListRenderer origin='fr.ifremer.isisfish.ui.simulator.ToolTipListModelFactory.createResultFieldsModel($ResultNames)'/>
+                </ListRenderer>
+-->
+	        </JList>
+	    </JScrollPane>
+
+	    <JButton constraints='BorderLayout.SOUTH' text="isisfish.common.saveNextSimulation"/>
+<!--
+	     actionCommand="simulator.SimulatorAction.saveResultNames($listResultNames/selectedValues)"
+-->	    
+</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">
+
+<!-- Fixme : ContextDataSource
+    <ContextDataSource id="AnalysePlanNames" context="current" source="AnalysePlanNames"/>
+-->
+    <!--JScrollPane constraints='"labelSimulParamsAnalysePlans"'>
+      <JTextArea id="AnalysePlanDescription" editable="false" text="isisfish.sens.planAdd"/>
+    </JScrollPane-->
+    <JComboBox id="fieldSimulParamsAnalysePlansSelect">
+<!-- Fixme : ComboBoxModel and ComboBoxRenderer
+origin=""
+        <ComboBoxModel origin="$AnalysePlanNames"/>
+        <ComboBoxRenderer>
+            <SimpleToolTipComboBoxRenderer origin='fr.ifremer.isisfish.ui.simulator.ToolTipListModelFactory.createAnalysePlanDescriptionsModel($AnalysePlanNames)'/>
+        </ComboBoxRenderer>
+-->
+    </JComboBox>
+    <JScrollPane>
+        <JList id="listSimulParamsAnalysePlansList" selectionMode="0">
+<!-- Fixme : ListModel, ListSelectionEvents and ListRenderer
+origin=""
+renderer="fr.ifremer.isisfish.datastore.AnalysePlanStorage.getName(/)"
+toolTipTextPropertyName="description"
+            <ListModel origin="$SimulationParameter/analysePlans"/>
+            <ListSelectionEvents onValueChanged="refreshView($simulParamsAnalysePlans)"/>
+-->
+            <!--ListSelectionEvents onValueChanged="xpath:setText($AnalysePlanDescription, $listSimulParamsAnalysePlansList/selectedValue/description)"/-->
+<!--            <ListRenderer>
+                <SimpleToolTipListRenderer origin='fr.ifremer.isisfish.ui.simulator.ToolTipListModelFactory.createAnalysePlanDescriptionsModel2($SimulationParameter/analysePlans,$buttonSimulParamsAnalysePlansClear,$listSimulParamsAnalysePlansList)'/>
+            </ListRenderer>
+-->
+        </JList>
+    </JScrollPane>
+    
+    <JButton id="buttonSimulParamsAnalysePlansAdd" text="isisfish.common.add"/>
+<!--
+actionCommand="xpath:addAnalysePlan($SimulationParameter, getNewAnalysePlanInstance(fr.ifremer.isisfish.datastore.AnalysePlanStorage.getAnalysePlan($fieldSimulParamsAnalysePlansSelect/selectedItem)));refreshView($listSimulParamsAnalysePlansList)"
+-->
+    <JButton id="buttonSimulParamsAnalysePlansRemove" text="isisfish.common.remove"/>
+<!--
+     actionCommand="xpath:removeAnalysePlan($SimulationParameter, $listSimulParamsAnalysePlansList/selectedValue);refreshView($listSimulParamsAnalysePlansList)"
+-->
+    <JButton id="buttonSimulParamsAnalysePlansClear" text="isisfish.common.clear"/>
+<!--
+actionCommand="xpath:clearPlans($SimulationParameter);refreshView($listSimulParamsAnalysePlansList,$simulParamsAnalysePlans)"
+-->
+     <!--TODO Doest not work! when calling use an AbstractCollection with no clear implementation text="Clear" actionCommand="xpath:clear($SimulationParameter/analysePlans);refreshView($listSimulParamsAnalysePlansList)"/>-->
+
+    <JScrollPane>
+	    <JTable id="simulParamsAnalysePlans" name="isisfish.sens.planParameters">
+<!-- Fixme : JTableModel
+			<tableModel origin="fr.ifremer.isisfish.datastore.AnalysePlanStorage.getParameterNames($listSimulParamsAnalysePlansList/selectedValue)">
+				<column title="Name" property="/" renderer="key">
+                    <tableColumnRenderer>
+                        <SimpleToolTipTableColumnRenderer origin='fr.ifremer.isisfish.ui.simulator.ToolTipListModelFactory.createAnalysePlanParamsModel($listSimulParamsAnalysePlansList/selectedValue)'/>
+                    </tableColumnRenderer>
+				</column>
+				<column title="Value" editable="true"
+				 property="fr.ifremer.isisfish.datastore.AnalysePlanStorage.getParameterValue($listSimulParamsAnalysePlansList/selectedValue, /key)"
+				 actionEdit="fr.ifremer.isisfish.datastore.AnalysePlanStorage.setParameterValue($listSimulParamsAnalysePlansList/selectedValue, $e/object/key, $e/value)">
+	            	<tableColumnEditor><ParameterColumnEditor origin="$RegionStorage"/></tableColumnEditor>
+                    <tableColumnRenderer>
+                        <SimpleToolTipTableColumnRenderer origin=''/>
+                    </tableColumnRenderer>
+				</column>
+			</tableModel>
+-->
+	    </JTable>
+    </JScrollPane>
+
+    <JButton text="isisfish.sens.backParameter"/>
+<!--
+actionCommand="simulator.SimulatorAction.selectTab($simulTabs, 'true', '0')"
+-->
+
+</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"/>
+<!--
+origin=""
+-->
+                <JLabel constraints='"valuesSensWizardFieldLabel"' text="isisfish.sensWizardPanels.field"/>
+                <JTextField constraints='"valuesSensWizardFieldField"' editable="false"/>
+<!--
+origin=""
+-->
+                <JLabel constraints='"valuesSensWizardTypeLabel"' text="isisfish.sensWizardPanels.type"/>
+                <JTextField constraints='"valuesSensWizardTypeField"' editable="false"/>
+<!--
+origin=""
+-->
+            </JPanel>
+            <JPanel constraints='"valuesSensWizardNewValuePanel"'>
+<!--
+text="New Value"
+-->
+                <JTextArea text="isisfish.common.blabla"/> <!-- TODO Peut dependre du type de l'obet -->
+<!--
+origin=""
+-->
+            </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">
+<!-- Fixme : ListModel
+origin="" SelectionMode="1" iterate="false"
+                    <ListModel origin=""/>
+-->
+                </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")}'>
+<!--
+bundle="org.codelutin.i18n.I18nBundleBridge"
+-->
+    <script>
+        import org.codelutin.widget.XMLGridLayout;
+    </script>
+    <JPanel constraints='"sensWizardPanel"' layout='{new XMLGridLayout("fr/ifremer/isisfish/ui/simulator/SensWizard.xgl")}'>
+        <!--JPanel constraints='"sensWizardPanelContent"'-->
+<!-- Fixme : WizardPanel
+           <WizardPanel id="wizpnl" constraints="sensWizardPanelContentPanel" xml="simulator/SensWizardPanels.xml" onChange="simulator.SensWizard.newTab($wizardPrev, $wizardNext, $wizardFinish, $wizardTabPane)"/>
+-->
+        <!--/panel-->
+        <JPanel constraints='"sensWizardPanelButtons"'>
+            <JButton id="wizardPrev" text="isisfish.common.previous" enabled="false"/>
+<!--
+actionCommand="prev" 
+-->
+            <JButton id="wizardNext" text="isisfish.common.next"/>
+<!--
+actionCommand="next"
+-->
+            <JButton id="wizardFinish" text="isisfish.common.finish" enabled="false"/>
+<!--
+actionCommand="finishSensWizard" 
+-->
+            <JButton text="isisfish.common.cancel"/>
+<!--
+actionCommand="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()}'>
+
+<!--
+bundle="org.codelutin.i18n.I18nBundleBridge"
+<xpanel xml="simulator/Queue.xml"/>
+-->
+
+</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()}'>
+<!--
+title="isisfish.simulation.title" 
+visible="true" size='{new Dimension(700,500)}' location='{new Point(0,139)}' 
+-->
+    <!--onOpened="simulator.SimulatorAction.opened($simulTabs)"-->
+<!--    
+     <WindowEvents id="events"     
+     onOpened="simulator.SimulatorAction.opened($simulTabs,$buttonSimulQueueStart,$buttonSimulQueueRemove,$buttonSimulQueueShowLog,$queueTable,$queueTableDone,$buttonSimulParamsAnalysePlansRemove,$listSimulParamsAnalysePlansList,$buttonSimulParamsMesuresRemove,$listSimulParamsMesuresList)"     
+     onClosing="UIHelper.closeContext()" />
+
+    <ContextDataSource id="OldSimulationName" context="current" source="OldSimulationName"/>
+	<ContextDataSource id="SimulationFilterModel" context="current" source="SimulationFilterModel"/>
+    <ContextDataSource id="SimulationParameter" context="current" source="SimulationParameter"/>
+	<ContextDataSource id="RegionStorage" context="current" source="RegionStorage"/>
+-->	
+<!--
+    <JMenuBar>
+        <JMenu text="isisfish.simulation.menu.file">
+            <JMenuItem name="miClose" text="isisfish.simulation.menu.close" accelerator="accClose"/>
+        </JMenu>
+
+        <JMenu text="txtSimulation" mnemonic="mnSimulation">
+            <JMenuItem name="miSimulate" text="txtSimulate" icon="imgSimulate"
+             mnemonic="mnSimulate" ActionCommand="simulate" accelerator="accSimulate"/>
+            <JMenuItem name="miQueue" text="txtQueue" icon="imgQueue"
+             mnemonic="mnQueue" ActionCommand="queue"  accelerator="accQueue"/>
+        </JMenu>
+             
+        <JMenu text="isisfish.simulation.menu.help">
+            <JMenuItem name="miAbout" text="isisfish.simulation.menu.about" accelerator="accAbout"/>
+        </JMenu>
+    </JMenuBar>
+-->
+
+    <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>
+    
+
+<!--
+	<StatutBar2 constraints='"statusBar"'/>
+    <JLabel icon="images/fish.jpg" constraints='"fishIcon"'/>
+-->
+</JPanel>
\ No newline at end of file

    

r1338 - branches/isis-fish-3.2.1/src/uimodel/fr/ifremer/isisfish/ui/simulator

sletellier＠users.labs.libre-entreprise.org

tags

participants (1)