Changeset 22 for gssim_ui/branches

Timestamp:

08/24/11 14:47:39 (14 years ago)

Author:

mcichenski

Message:

initialization for gannt chart subcomponent

Location:

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

Files:

• app/gssim/gssimstudio/editor/GSSimStudioModel.as (modified) (1 diff)
• app/gssim/gssimstudio/editor/charts/GanntChart.mxml (added)
• app/gssim/gssimstudio/editor/charts/GanntChartModel.as (added)
• app/gssim/gssimstudio/editor/gssim/editors/archive/ExperimentStatisticsWindow.mxml (modified) (3 diffs)
• java/gssim/gssimstudio/flex/app/editor/GSSimStudio.java (modified) (5 diffs)
• java/gssim/gssimstudio/flex/app/editor/GSSimStudioModel.java (modified) (1 diff)
• java/gssim/gssimstudio/flex/app/editor/GanntChart.java (added)
• java/gssim/gssimstudio/flex/app/editor/GanntChartModel.java (added)
• locale/en_US/Charts.properties (modified) (1 diff)
• locale/pl_PL/Charts.properties (modified) (1 diff)

gssim_ui/branches/vine/gssimstudio/src/web/ui/flex/app/gssim/gssimstudio/editor/GSSimStudioModel.as

@@ -21 +21 @@
                 public var comparisonComponents : Object;
                 public var resourceChartComponents:Object;
+                public var ganntChartComponents:Object;
                 
                 public var experimentList:ArrayCollection;

gssim_ui/branches/vine/gssimstudio/src/web/ui/flex/app/gssim/gssimstudio/editor/gssim/editors/archive/ExperimentStatisticsWindow.mxml

@@ -12 +12 @@
 <fx:Script>
         <![CDATA[
+                import gssim.gssimstudio.editor.charts.GanntChart;
                 import gssim.gssimstudio.editor.charts.ResourceChart;
                 import gssim.gssimstudio.editor.charts.ResourceChartModel;
@@ -45 +46 @@
                         resourceChart.addChild(viewer);
                         //parentApplication.bindSubmodel(viewer, 'model', parentApplication.gsSimStudioModel, 'resourceChartComponents', '' + i);
+                        
+                        var gannt : GanntChart = new GanntChart();
+                        gannt.expId = i;
+                        gannt.expName = experiment.name;
+                        gannt.service = new VineRemoteObjectProxy(parentApplication.service, i);
+                        ganntChart.addChild(gannt);
                 }
                 
@@ -115 +122 @@
                                 <!--<charts:ResourceViewer width="100%" height="100%" />-->
                         </mx:VBox>
+                        <mx:VBox width="100%" height="100%" id="ganntChart" label="{resourceManager.getString('ArchiveViewer', 'Task')}">
+                        </mx:VBox>
                         <!--
-                        <mx:VBox width="100%" height="100%" id="taskChart" label="{resourceManager.getString('ArchiveViewer', 'Task')}">
-                                <charts:ScheduleViewer width="100%" height="100%" />
-                                <mx:Label text="task chart"/>
-                        </mx:VBox>
                         <mx:VBox width="100%" height="100%" id="lineChart" label="{resourceManager.getString('ArchiveViewer', 'Line')}">
                                 <charts:ScheduleViewer width="100%" height="100%" />

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

@@ -851 +851 @@
         @BlazeDsMethod()
         public GSSimStudioModel setSelectedResourceIndex(int index, Integer res) {
-                return delegate(new Object[]{res}, index);
+                return delegateResource(new Object[]{res}, index);
         }
         
@@ -857 +857 @@
         public GSSimStudioModel getResourcesFromDb(int index, Integer expId, String name,
                         String type) {
-                return delegate(new Object[]{expId, name, type}, index);
+                return delegateResource(new Object[]{expId, name, type}, index);
         }
         
@@ -863 +863 @@
         public GSSimStudioModel getResourceAllTimelineFromDb(int index, Integer resourceId, Integer expId,
                         Long minTimestampMilis, Long maxTimestampMilis) {
-                return delegate(new Object[]{resourceId, expId, minTimestampMilis, maxTimestampMilis}, index);
+                return delegateResource(new Object[]{resourceId, expId, minTimestampMilis, maxTimestampMilis}, index);
         }
 
@@ -869 +869 @@
         public GSSimStudioModel getResourceEnTimelineFromDb(int index, Integer resourceId, Integer expId,
                         Long minTimestampMilis, Long maxTimestampMilis) {
-                return delegate(new Object[]{resourceId, expId, minTimestampMilis, maxTimestampMilis}, index);
+                return delegateResource(new Object[]{resourceId, expId, minTimestampMilis, maxTimestampMilis}, index);
         }
         
         @BlazeDsMethod()
         public GSSimStudioModel getExperimentConfiguration(int index, Integer expId) {
-                return delegate(new Object[]{expId}, index);
-        }
-        
-        protected GSSimStudioModel delegate(Object[] parameters, Integer index) {
+                return delegateResource(new Object[]{expId}, index);
+        }
+        
+        protected GSSimStudioModel delegateResource(Object[] parameters, Integer index) {
                 GSSimStudioModel gssimStudioModel = (GSSimStudioModel) VineFlexUtilClass.getUIModel();
                 gssimStudioModel.setExperimentListChanged(false);
@@ -910 +910 @@
         }
         VineFlexUtilClass.invokeDestination(ExperimentComparisonChart.class, parameters, experimentComparisonChartModel);
+        return gssimStudioModel;
+    }
+        
+        @BlazeDsMethod()
+        public GSSimStudioModel getTasksAllocationsFromDb(int index, Integer expId) {
+                return delegateGannt(new Object[]{expId}, index);
+        }
+        
+        protected GSSimStudioModel delegateGannt(Object[] parameters, Integer index) {
+                GSSimStudioModel gssimStudioModel = (GSSimStudioModel) VineFlexUtilClass.getUIModel();
+                gssimStudioModel.setExperimentListChanged(false);
+        GanntChartModel ganntChartModel = (GanntChartModel) gssimStudioModel.getGanntChartComponents().get(index.toString());
+        if (ganntChartModel == null)
+        {
+                ganntChartModel = new GanntChartModel();
+                gssimStudioModel.getResourceChartComponents().put(index.toString(), ganntChartModel);
+        }
+        VineFlexUtilClass.invokeDestination(GanntChart.class, parameters, ganntChartModel);
         return gssimStudioModel;
     }

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

@@ -58 +58 @@
     public void setResourceChartComponents(HashMap resourceChartComponents) {
         this.resourceChartComponents = resourceChartComponents;
+    }
+    
+    private HashMap ganntChartComponents = new HashMap();
+    
+    public HashMap getGanntChartComponents() {
+        return ganntChartComponents;
+    }
+
+    public void setGanntChartComponents(HashMap ganntChartComponents) {
+        this.ganntChartComponents = ganntChartComponents;
     }
     

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

@@ -32 +32 @@
 SumType=Sum
 Aggregate=Aggregated
+GanntChartTitle=Task Allocation Chart for Grid Scheduling Simulator

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

@@ -32 +32 @@
 SumType=Suma
 Aggregate=Sumaryczny
+GanntChartTitle=Wykres alokacji zadań dla Grid Scheduling Simulator