Changeset 78 for gssim_ui/branches

Timestamp:

09/13/11 13:28:53 (14 years ago)

Author:

mcichenski

Message:

integration of Network Editor with charts

Location:

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

Files:

• app/gssim/gssimstudio/editor/gssim/editors/topology/ObjectPropertiesWindow.mxml (modified) (4 diffs)
• java/gssim/gssimstudio/flex/app/editor/GSSimStudio.java (modified) (1 diff)
• java/gssim/gssimstudio/flex/app/editor/ResourceChart.java (modified) (1 diff)

gssim_ui/branches/vine/gssimstudio/src/web/ui/flex/app/gssim/gssimstudio/editor/gssim/editors/topology/ObjectPropertiesWindow.mxml

@@ -7 +7 @@
                 import flexlib.mdi.events.MDIWindowEvent;
                 
+                import gssim.gssimstudio.editor.charts.StaticResourceChart;
                 import gssim.gssimstudio.editor.gssim.editors.resources.ComputingResourceWindow;
                 import gssim.gssimstudio.editor.gssim.editors.resources.QueueResourceWindow;
@@ -13 +14 @@
                 import gssim.gssimstudio.editor.gssim.topology.GenderObject;
                 import gssim.gssimstudio.editor.gssim.topology.ResourceObject;
+                import gssim.gssimstudio.editor.script.views.ViewsHelper;
                 
                 import mx.binding.utils.BindingUtils;
+                import mx.collections.ArrayCollection;
                 import mx.controls.Alert;
+                import mx.rpc.events.ResultEvent;
+                import mx.utils.ObjectUtil;
                 
                 protected var _object : GenderObject;
@@ -94 +99 @@
                 }
 
+                public function loadAllocationChart() : void
+                {
+                        parentApplication.addModelUpdatedSingleCallbacks(parentApplication.service.getResourceTimelineFromDb(_object.nodeName,parentApplication.experimentModel.experimentConfiguration['pk'],'allocation'), createChart);
+                }
+                
+                protected function createChart(event : ResultEvent)
+                {
+                        var static : StaticResourceChart = new StaticResourceChart();
+                        static.expName = parentApplication.experimentModel.experimentConfiguration['name'];
+                        static.resName = _object.nodeName;
+                        static.dataProvider = ObjectUtil.copy(parentApplication.gsSimStudioModel.resourceTimelineList) as ArrayCollection;
+                        ViewsHelper.TopologyCanvas.windowManager.add(static);
+                        //ViewsHelper.ArchiveCanvas.windowManager.add(static);
+                }
+                
         ]]>
 </mx:Script>
@@ -149 +169 @@
                         <mx:Button id="EditQueueButton" label="{resourceManager.getString('ResourceEditor', 'EditQueue')}" click="editQueue()" />
                 </mx:VBox>
-                <mx:Button id="EditResourceButton" label="{resourceManager.getString('ResourceEditor', 'EditResource')}" click="editFrontend()" />
+                <mx:HBox>
+                        <mx:Button id="EditResourceButton" label="{resourceManager.getString('ResourceEditor', 'EditResource')}" click="editFrontend()" />
+                        <mx:Button label="KABOOM" click="loadAllocationChart()" />
+                </mx:HBox>
                 <mx:Button label="{resourceManager.getString('TopologyEditor', 'Close')}" click="close();"/>
         </mx:VBox>

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

@@ -423 +423 @@
                                 }
                                 map.put("name", exp.getName());
+                                map.put("pk", exp.getPK().toString());
                                 map.put("groupId", exp.getMetaexpId().toString());
                                 result.put(exp.getPK().toString(), map);

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

@@ -151 +151 @@
                         }
                         map.put("name", exp.getName());
+                        map.put("pk", exp.getPK().toString());
                         map.put("groupId", exp.getMetaexpId().toString());