From bpoussin@users.labs.libre-entreprise.org Mon Jun 15 00:25:33 2026
From: bpoussin@users.labs.libre-entreprise.org
To: isis-fish-commits@list.isis-fish.org
Subject: [Isis-fish-commits] r1296 - in branches/isis-fish-3.1.4/src:
	java/fr/ifremer/isisfish/entities	uimodel/fr/ifremer/isisfish/ui/input
	uimodel/fr/ifremer/isisfish/ui/simulator
Date: Wed, 13 Aug 2008 20:15:26 +0200
Message-ID: <20080813181526.89640461BA3@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8551797755185783991=="

--===============8551797755185783991==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Author: bpoussin
Date: 2008-08-13 18:15:25 +0000 (Wed, 13 Aug 2008)
New Revision: 1296

Modified:
   branches/isis-fish-3.1.4/src/java/fr/ifremer/isisfish/entities/SetOfVessel=
sImpl.java
   branches/isis-fish-3.1.4/src/uimodel/fr/ifremer/isisfish/ui/input/Populati=
onMigration.xgl
   branches/isis-fish-3.1.4/src/uimodel/fr/ifremer/isisfish/ui/input/SetOfVes=
sels.xgl
   branches/isis-fish-3.1.4/src/uimodel/fr/ifremer/isisfish/ui/input/SetOfVes=
sels.xml
   branches/isis-fish-3.1.4/src/uimodel/fr/ifremer/isisfish/ui/input/Strategy=
.xgl
   branches/isis-fish-3.1.4/src/uimodel/fr/ifremer/isisfish/ui/input/Strategy=
.xml
   branches/isis-fish-3.1.4/src/uimodel/fr/ifremer/isisfish/ui/simulator/Adva=
ncedParams.xgl
   branches/isis-fish-3.1.4/src/uimodel/fr/ifremer/isisfish/ui/simulator/Adva=
ncedParams.xml
Log:
- ajout des composants graphiques pour l'edition des equations (inactivity, t=
echnicalEfficiency)
- ajout de la possibilite de lancer les simulations en batch (sous process)

Modified: branches/isis-fish-3.1.4/src/java/fr/ifremer/isisfish/entities/SetO=
fVesselsImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/isis-fish-3.1.4/src/java/fr/ifremer/isisfish/entities/SetOfVesse=
lsImpl.java	2008-08-13 13:17:17 UTC (rev 1295)
+++ branches/isis-fish-3.1.4/src/java/fr/ifremer/isisfish/entities/SetOfVesse=
lsImpl.java	2008-08-13 18:15:25 UTC (rev 1296)
@@ -84,7 +84,7 @@
                 EquationDAO dao =3D IsisFishDAOHelper.getEquationDAO(getTopi=
aContext());           =20
                 // create Growth equation
                 eq =3D dao.create();       =20
-                eq.setCategory("Inactivity");
+                eq.setCategory("TechnicalEfficiency");
                 eq.setJavaInterface(SoVTechnicalEfficiencyEquation.class);
                 eq.setLanguage(Language.JAVA);
                 setTechnicalEfficiencyEquation(eq);

Modified: branches/isis-fish-3.1.4/src/uimodel/fr/ifremer/isisfish/ui/input/P=
opulationMigration.xgl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/isis-fish-3.1.4/src/uimodel/fr/ifremer/isisfish/ui/input/Populat=
ionMigration.xgl	2008-08-13 13:17:17 UTC (rev 1295)
+++ branches/isis-fish-3.1.4/src/uimodel/fr/ifremer/isisfish/ui/input/Populat=
ionMigration.xgl	2008-08-13 18:15:25 UTC (rev 1296)
@@ -33,7 +33,7 @@
     </tr>
 </table>
=20
-<table Zonespacing=3D"5">
+<table cellspacing=3D"5">
     <tr>
         <td fill=3D"Both" width=3D"100%">buttonPopulationMigrationSave</td>
         <td fill=3D"Both" width=3D"100%">buttonPopulationMigrationCancel</td>

Modified: branches/isis-fish-3.1.4/src/uimodel/fr/ifremer/isisfish/ui/input/S=
etOfVessels.xgl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/isis-fish-3.1.4/src/uimodel/fr/ifremer/isisfish/ui/input/SetOfVe=
ssels.xgl	2008-08-13 13:17:17 UTC (rev 1295)
+++ branches/isis-fish-3.1.4/src/uimodel/fr/ifremer/isisfish/ui/input/SetOfVe=
ssels.xgl	2008-08-13 18:15:25 UTC (rev 1296)
@@ -26,11 +26,25 @@
 	        <td class=3D"label">labelSetOfVesselsFixedCosts</td>
 	        <td class=3D"field">fieldSetOfVesselsFixedCosts</td>
 	    </tr>
+
 	    <tr>
-	        <td class=3D"label" rowspan=3D"3">labelSetOfVesselsComment</td>
-	        <td class=3D"field" height=3D"20%" rowspan=3D"3">fieldSetOfVesselsC=
omment</td>
+	        <td class=3D"label">labelSetOfVesselsTechnicalEfficiency</td>
+	        <td class=3D"field">fieldSetOfVesselsTechnicalEfficiency</td>
 	    </tr>
+	    <tr>
+	        <td class=3D"label">buttonSetOfVesselsTechnicalEfficiencySaveAsMode=
l</td>
+	        <td class=3D"field" height=3D"30%" rowspan=3D"3">fieldScriptSetOfVe=
sselsTechnicalEfficiency</td>
+	    </tr>
+	    <tr>
+                <td class=3D"label">buttonSetOfVesselsTechnicalEfficiencyEqu=
ationEditor</td>
+            </tr>
 	    <tr></tr>
+
+
+	    <tr>
+	        <td class=3D"label" rowspan=3D"2">labelSetOfVesselsComment</td>
+	        <td class=3D"field" height=3D"20%" rowspan=3D"2">fieldSetOfVesselsC=
omment</td>
+	    </tr>
 	    <tr></tr>
 	   =20
 	    <tr>

Modified: branches/isis-fish-3.1.4/src/uimodel/fr/ifremer/isisfish/ui/input/S=
etOfVessels.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/isis-fish-3.1.4/src/uimodel/fr/ifremer/isisfish/ui/input/SetOfVe=
ssels.xml	2008-08-13 13:17:17 UTC (rev 1295)
+++ branches/isis-fish-3.1.4/src/uimodel/fr/ifremer/isisfish/ui/input/SetOfVe=
ssels.xml	2008-08-13 18:15:25 UTC (rev 1296)
@@ -36,6 +36,31 @@
         <DocumentEvents onModified=3D"Update($fieldSetOfVesselsFixedCosts/te=
xt)"/>
     </textfield>
=20
+   =20
+    <label constraints=3D"labelSetOfVesselsTechnicalEfficiency" text=3D"isis=
fish.setOfVessels.technicalEfficiency"/>
+    <combobox constraints=3D"fieldSetOfVesselsTechnicalEfficiency" id=3D"fie=
ldSetOfVesselsTechnicalEfficiency"
+     origin=3D"$SetOfVessels/technicalEfficiencyEquation" renderer=3D"name" =
firstNull=3D"true"
+     actionCommand=3D"Update($fieldSetOfVesselsTechnicalEfficiency/selectedI=
tem/content, $fieldScriptSetOfVesselsTechnicalEfficiency/text)">
+        <ComboBoxModel origin=3D'fr.ifremer.isisfish.datastore.FormuleStorag=
e.getFormules($TopiaContext, "TechnicalEfficiency")'/>
+    </combobox>
+
+    <button constraints=3D"buttonSetOfVesselsTechnicalEfficiencySaveAsModel"=
 text=3D"isisfish.common.saveModel"
+     actionCommand=3D'input.Input.saveEquationAsModel($SetOfVessels/technica=
lEfficiencyEquation);refreshView($fieldSetOfVesselsTechnicalEfficiency)'/>
+   =20
+    <button constraints=3D"buttonSetOfVesselsTechnicalEfficiencyEquationEdit=
or" text=3D"isisfish.common.openEditor"
+     actionCommand=3D'input.Input.openEditor($SetOfVessels/technicalEfficien=
cyEquation/category,$SetOfVessels/technicalEfficiencyEquation/name,$SetOfVess=
els/technicalEfficiencyEquation/javaInterface,$SetOfVessels/technicalEfficien=
cyEquation/content,$fieldScriptSetOfVesselsTechnicalEfficiency)'/>
+   =20
+    <editor constraints=3D"fieldScriptSetOfVesselsTechnicalEfficiency" askIf=
NotSaved=3D"false"
+     id=3D"fieldScriptSetOfVesselsTechnicalEfficiency"
+     origin=3D"org.codelutin.util.FileUtil.getTempFile($SetOfVessels/technic=
alEfficiencyEquation/content, '.java')">
+        <DocumentEvents onModified=3D"Update">
+            <UpdateOrigin
+	            target=3D"setEquationTechnicalEfficiency($SetOfVessels, $fieldS=
criptSetOfVesselsTechnicalEfficiency/text)"/>
+        </DocumentEvents>	   =20
+    </editor>
+
+   =20
+   =20
     <label constraints=3D"labelSetOfVesselsComment" text=3D"isisfish.setOfVe=
ssels.comments"/>
     <scrollPane constraints=3D"fieldSetOfVesselsComment">
 	    <textarea id=3D"fieldSetOfVesselsComment" origin=3D"$SetOfVessels/comme=
nt">

Modified: branches/isis-fish-3.1.4/src/uimodel/fr/ifremer/isisfish/ui/input/S=
trategy.xgl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/isis-fish-3.1.4/src/uimodel/fr/ifremer/isisfish/ui/input/Strateg=
y.xgl	2008-08-13 13:17:17 UTC (rev 1295)
+++ branches/isis-fish-3.1.4/src/uimodel/fr/ifremer/isisfish/ui/input/Strateg=
y.xgl	2008-08-13 18:15:25 UTC (rev 1296)
@@ -18,9 +18,18 @@
 	        <td class=3D"label">labelStrategyProportionSetOfVessels</td>
 	        <td class=3D"field">fieldStrategyProportionSetOfVessels</td>
 	    </tr>
+
+    <tr>
+        <td></td>
+        <td class=3D"field">fieldUseEquationInactivity</td>
+    </tr>
+    <tr>
+        <td class=3D"labelTitle" fill=3D"Both" height=3D"100%" width=3D"100%=
" colspan=3D"2">hideablePanelInactivityEquation</td>
+    </tr>
+
 	    <tr>
-	        <td class=3D"label" rowspan=3D"3">labelStrategyComment</td>
-	        <td class=3D"field" height=3D"20%" rowspan=3D"3">fieldStrategyComme=
nt</td>
+	        <td class=3D"label" rowspan=3D"2">labelStrategyComment</td>
+	        <td class=3D"field" height=3D"20%" rowspan=3D"2">fieldStrategyComme=
nt</td>
 	    </tr>
 	    <tr></tr>
 	    <tr></tr>
@@ -30,5 +39,26 @@
 	    </tr>
 	</table>
=20
+    <table>
+        <tr>
+            <td fill=3D"Both" height=3D"100%" width=3D"100%">fieldUseEquatio=
n</td>
+        </tr>
+    </table>
+
+    <table cellspacing=3D"2">
+	    <tr>
+	        <td class=3D"label">labelStrategyInactivity</td>
+	        <td class=3D"field">fieldStrategyInactivity</td>
+	    </tr>
+	    <tr>
+	        <td class=3D"label">buttonStrategyInactivitySaveAsModel</td>
+	        <td class=3D"field" height=3D"30%" rowspan=3D"3">fieldScriptStrateg=
yInactivity</td>
+	    </tr>
+	    <tr>
+            <td class=3D"label">buttonStrategyInactivityEquationEditor</td>
+        </tr>
+	    <tr></tr>
+    </table>
+
 </layout>
=20

Modified: branches/isis-fish-3.1.4/src/uimodel/fr/ifremer/isisfish/ui/input/S=
trategy.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/isis-fish-3.1.4/src/uimodel/fr/ifremer/isisfish/ui/input/Strateg=
y.xml	2008-08-13 13:17:17 UTC (rev 1295)
+++ branches/isis-fish-3.1.4/src/uimodel/fr/ifremer/isisfish/ui/input/Strateg=
y.xml	2008-08-13 18:15:25 UTC (rev 1296)
@@ -22,6 +22,42 @@
         <DocumentEvents onModified=3D"Update($fieldStrategyProportionSetOfVe=
ssels/text)"/>
     </textfield>
=20
+    <checkbox constraints=3D"fieldUseEquationInactivity" id=3D"fieldUseEquat=
ionInactivity"
+     origin=3D"$Strategy/inactivityEquationUsed" text=3D"isisfish.strategy.i=
nactivityEquationUsed">
+        <ItemEvents onStateChanged=3D"Update($fieldUseEquationInactivity/sel=
ected, $Strategy/inactivityEquationUsed, refreshView($hideablePanelInactivity=
Equation))"/>
+    </checkbox>
+
+       =20
+    <panel id=3D"hideablePanelInactivityEquation" constraints=3D"hideablePan=
elInactivityEquation" layout=3D"XMLGridLayout(fr/ifremer/isisfish/ui/input/St=
rategy.xgl)">
+
+	    <hidablePanel constraints=3D"fieldUseEquation"
+                      origin=3D"getInactivityEquationUsed($Strategy)"
+                      layout=3D"XMLGridLayout(fr/ifremer/isisfish/ui/input/S=
trategy.xgl)">
+            <label constraints=3D"labelStrategyInactivity" text=3D"isisfish.=
strategy.inactivity"/>
+            <combobox constraints=3D"fieldStrategyInactivity" id=3D"fieldStr=
ategyInactivity"
+                      origin=3D"$Strategy/inactivityEquation" renderer=3D"na=
me" firstNull=3D"true"
+                      actionCommand=3D"Update($fieldStrategyInactivity/selec=
tedItem/content, $fieldScriptStrategyInactivity/text)">
+                <ComboBoxModel origin=3D'fr.ifremer.isisfish.datastore.Formu=
leStorage.getFormules($TopiaContext, "Inactivity")'/>
+            </combobox>
+
+            <button constraints=3D"buttonStrategyInactivitySaveAsModel" text=
=3D"isisfish.common.saveModel"
+                    actionCommand=3D'input.Input.saveEquationAsModel($Strate=
gy/inactivityEquation);refreshView($fieldStrategyInactivity)'/>
+   =20
+            <button constraints=3D"buttonStrategyInactivityEquationEditor" t=
ext=3D"isisfish.common.openEditor"
+                    actionCommand=3D'input.Input.openEditor($Strategy/inacti=
vityEquation/category,$Strategy/inactivityEquation/name,$Strategy/inactivityE=
quation/javaInterface,$Strategy/inactivityEquation/content,$fieldScriptStrate=
gyInactivity)'/>
+   =20
+            <editor constraints=3D"fieldScriptStrategyInactivity" askIfNotSa=
ved=3D"false"
+                    id=3D"fieldScriptStrategyInactivity"
+                    origin=3D"org.codelutin.util.FileUtil.getTempFile($Strat=
egy/inactivityEquation/content, '.java')">
+                <DocumentEvents onModified=3D"Update">
+                    <UpdateOrigin
+                    target=3D"setEquationInactivity($Strategy, $fieldScriptS=
trategyInactivity/text)"/>
+                </DocumentEvents>	   =20
+            </editor>
+
+        </hidablePanel>
+    </panel>
+
     <label constraints=3D"labelStrategyComment" text=3D"isisfish.strategy.co=
mments"/>
 	<scrollPane constraints=3D"fieldStrategyComment">
 	    <textarea id=3D"fieldStrategyComment" origin=3D"$Strategy/comment">

Modified: branches/isis-fish-3.1.4/src/uimodel/fr/ifremer/isisfish/ui/simulat=
or/AdvancedParams.xgl
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/isis-fish-3.1.4/src/uimodel/fr/ifremer/isisfish/ui/simulator/Adv=
ancedParams.xgl	2008-08-13 13:17:17 UTC (rev 1295)
+++ branches/isis-fish-3.1.4/src/uimodel/fr/ifremer/isisfish/ui/simulator/Adv=
ancedParams.xgl	2008-08-13 18:15:25 UTC (rev 1296)
@@ -20,7 +20,8 @@
             <td width=3D"99%" colspan=3D"3" fill=3D"Horizontal">fieldSimulAd=
vParamsSimulatorSelect</td>
        </tr>
        <tr>
-             <td fill=3D"Horizontal" colspan=3D"2" width=3D"33%">fieldSimulA=
dvParamsSimulatorLocal</td>
+             <td fill=3D"Horizontal" width=3D"33%">fieldSimulAdvParamsSimula=
torLocal</td>
+             <td fill=3D"Horizontal" width=3D"33%">fieldSimulAdvParamsSimula=
torSubProcess</td>
              <td fill=3D"Horizontal" width=3D"33%">fieldSimulationStatistiqu=
e</td>
              <td fill=3D"Horizontal" width=3D"33%">fieldSimulationCache</td>
         </tr>

Modified: branches/isis-fish-3.1.4/src/uimodel/fr/ifremer/isisfish/ui/simulat=
or/AdvancedParams.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/isis-fish-3.1.4/src/uimodel/fr/ifremer/isisfish/ui/simulator/Adv=
ancedParams.xml	2008-08-13 13:17:17 UTC (rev 1295)
+++ branches/isis-fish-3.1.4/src/uimodel/fr/ifremer/isisfish/ui/simulator/Adv=
ancedParams.xml	2008-08-13 18:15:25 UTC (rev 1296)
@@ -33,6 +33,12 @@
      origin=3D"$SimulationParameter/local"
      actionCommand=3D"Update($fieldSimulAdvParamsSimulatorLocal/selected)"/>
     =20
+    <checkbox text=3D"isisfish.advancedParams.subProcessSimulation"
+     constraints=3D"fieldSimulAdvParamsSimulatorSubProcess"
+     id=3D"fieldSimulAdvParamsSimulatorSubProcess"
+     origin=3D"$SimulationParameter/subProcess"
+     actionCommand=3D"Update($fieldSimulAdvParamsSimulatorSubProcess/selecte=
d)"/>
+    =20
 	<!--
 	 |
 	 | Trace/Cache option


--===============8551797755185783991==--