Changeset 63 for gssim_ui/branches/vine/gssimstudio/src/web

Timestamp:

09/06/11 15:08:11 (14 years ago)

Author:

mcichenski

Message:

 

Location:

gssim_ui/branches/vine/gssimstudio/src/web/ui/flex

Files:

• app/gssim/gssimstudio/editor/gssim/editors/experiment/ExperimentPropertiesPanel.mxml (modified) (6 diffs)
• app/gssim/gssimstudio/editor/views/ArchiveViewer.mxml (modified) (1 diff)
• java/gssim/gssimstudio/flex/app/editor/GSSimStudio.java (modified) (1 diff)
• locale/en_US/ArchiveViewer.properties (modified) (1 diff)
• locale/en_US/ExperimentEditor.properties (modified) (1 diff)
• locale/pl_PL/ArchiveViewer.properties (modified) (1 diff)
• locale/pl_PL/ExperimentEditor.properties (modified) (1 diff)

gssim_ui/branches/vine/gssimstudio/src/web/ui/flex/app/gssim/gssimstudio/editor/gssim/editors/experiment/ExperimentPropertiesPanel.mxml

@@ -18 +18 @@
                         import mx.events.ListEvent;
                         
+                        [Bindable]
                         private var editedExperiment : ExperimentProperties;
                         
@@ -276 +277 @@
                                 }
                                 workloadMissingImage.visible = true;
+                        }
+                        
+                        protected function cancelExperiment() : void
+                        {
+                                editedExperiment = null;
+                                experimentName.text = "";
+                                experimentRuns.value = 1;
+                                localGridPlugin.selectedIndex = 0;
+                                gridSchedulingPlugin.selectedIndex = 0;
+                                executionTimeEstimationPlugin.selectedIndex = 0;
+                                workloadFile.text = "";
+                                networkTopologyFile.text = "";
+                                resourceDescriptionFile.text = "";
                         }
 
@@ -374 +388 @@
                                         <mx:Spacer width="100%"/>
                                         <mx:CheckBox id="workloadSelectedCB" label="{resourceManager.getString('ExperimentEditor', 'UseSelectedFiles')}" height="16"
-                                                                 enabled="{!topologySelectedCB.selected &amp;&amp; !resourceSelectedCB.selected}"/>
+                                                                 enabled="{editedExperiment == null &amp;&amp; !topologySelectedCB.selected &amp;&amp; !resourceSelectedCB.selected}"/>
                                         <!--
                                         <mx:Button label="{resourceManager.getString('ExperimentEditor', 'View')}" click="workloadView()" />
@@ -394 +408 @@
                                         <mx:Spacer width="100%"/>
                                         <mx:CheckBox id="resourceSelectedCB" label="{resourceManager.getString('ExperimentEditor', 'UseSelectedFiles')}" height="16"
-                                                                 enabled="{!topologySelectedCB.selected &amp;&amp; !workloadSelectedCB.selected}"/>
+                                                                 enabled="{editedExperiment == null &amp;&amp; !topologySelectedCB.selected &amp;&amp; !workloadSelectedCB.selected}"/>
                                 </mx:HBox>
                                 <mx:HBox>
@@ -413 +427 @@
                                         <mx:Spacer width="100%"/>
                                         <mx:CheckBox id="topologySelectedCB" label="{resourceManager.getString('ExperimentEditor', 'UseSelectedFiles')}"
-                                                                 enabled="{topologyCB.selected &amp;&amp; !resourceSelectedCB.selected &amp;&amp; !workloadSelectedCB.selected}" height="16"/>
+                                                                 enabled="{editedExperiment == null &amp;&amp; topologyCB.selected &amp;&amp; !resourceSelectedCB.selected &amp;&amp; !workloadSelectedCB.selected}" height="16"/>
                                 </mx:HBox>
                                 <mx:HBox>
@@ -426 +440 @@
                 <mx:HBox width="100%">
                         <mx:Spacer width="50%"/>
-                        <mx:Button id="addExperiment" click="createExperiment();" toolTip="{resourceManager.getString('ExperimentEditor', 'AddTooltip')}" labelPlacement="bottom" label="{resourceManager.getString('ExperimentEditor', 'Add')}"/>
+                        <mx:HBox visible="{editedExperiment == null}" includeInLayout="{editedExperiment == null}">
+                                <mx:Button id="addExperiment" click="createExperiment();" toolTip="{resourceManager.getString('ExperimentEditor', 'AddTooltip')}" labelPlacement="bottom" label="{resourceManager.getString('ExperimentEditor', 'Add')}"/>
+                        </mx:HBox>
+                        <mx:HBox visible="{editedExperiment != null}" includeInLayout="{editedExperiment != null}">
+                                <mx:Button id="saveExperiment" click="createExperiment();" toolTip="{resourceManager.getString('ExperimentEditor', 'SaveTooltip')}" labelPlacement="bottom" label="{resourceManager.getString('ExperimentEditor', 'Save')}"/>
+                                <mx:Button id="cancelChangesExperiment" click="cancelExperiment();" toolTip="{resourceManager.getString('ExperimentEditor', 'CancelTooltip')}" labelPlacement="bottom" label="{resourceManager.getString('ExperimentEditor', 'Cancel')}"/>
+                        </mx:HBox>
                         <mx:Spacer width="50%"/>
                 </mx:HBox>

gssim_ui/branches/vine/gssimstudio/src/web/ui/flex/app/gssim/gssimstudio/editor/views/ArchiveViewer.mxml

@@ -75 +75 @@
                                         ExperimentEditor.experiments.addItem(properties);
                                 }
+                                Alert.show(resourceManager.getString("ArchiveViewer", "ExperimentsAddedMessage"));
                         }
                         

gssim_ui/branches/vine/gssimstudio/src/web/ui/flex/java/gssim/gssimstudio/flex/app/editor/GSSimStudio.java

@@ -330 +330 @@
 
                 GSSimStudioModel model = (GSSimStudioModel) VineFlexUtilClass.getUIModel();
+                //avoid updating experiment list in archive when nothing changed
+                model.setExperimentListChanged(false);
                 
                 Connection connection = null;

gssim_ui/branches/vine/gssimstudio/src/web/ui/flex/locale/en_US/ArchiveViewer.properties

@@ -22 +22 @@
 RunAgain=Run again
 WithSelected=Selected experiments
+ExperimentsAddedMessage=Selected experiments have been added to Experiment Editor and can be runned again.

gssim_ui/branches/vine/gssimstudio/src/web/ui/flex/locale/en_US/ExperimentEditor.properties

@@ -125 +125 @@
 FileManager=Manage files
 Close=Close
+
+SaveTooltip=Save changes made to the experiment

gssim_ui/branches/vine/gssimstudio/src/web/ui/flex/locale/pl_PL/ArchiveViewer.properties

@@ -23 +23 @@
 RunAgain=Uruchom ponownie
 WithSelected=Zaznaczone eksperymenty
+ExperimentsAddedMessage=Dodano zaznaczone eksperymenty do Edytora Eksperymentów, moÅŒna je ponownie uruchomić z poziomu tego edytora.

gssim_ui/branches/vine/gssimstudio/src/web/ui/flex/locale/pl_PL/ExperimentEditor.properties

@@ -144 +144 @@
 dzaj plikami
 Close=Zamknij
+
+SaveTooltip=Zapisz zmiany dokonane w eksperymencie