Changeset 73 for gssim_ui/branches

Timestamp:

09/13/11 12:58:49 (14 years ago)

Author:

mcichenski

Message:

 

Location:

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

Files:

• app/gssim/gssimstudio/editor/GSSimStudioModel.as (modified) (1 diff)
• app/gssim/gssimstudio/editor/gssim/editors/archive/ExperimentStatisticsWindow.mxml (modified) (2 diffs)
• java/gssim/gssimstudio/flex/app/editor/GSSimStudio.java (modified) (1 diff)
• java/gssim/gssimstudio/flex/app/editor/GSSimStudioModel.java (modified) (1 diff)

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

@@ -20 +20 @@
                 private var tellBlazeToLoadThisClass : ResourceChartModel;
                 private var tellBlazeToLoadThisClassToo : GanntChartModel;
+                
+                public var resourceTimelineList:ArrayCollection; //used to store data loaded via Network Editor
                 
                 /* Hashmap used to load multiple experiments configurations from Archive into Experiment Editor. */

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

@@ -67 +67 @@
                 public function loadNetwork(event : ResultEvent) : void
                 {
-                        Alert.show("network loads");
                         var r : topologyReader = new topologyReader(parentApplication.topologyEditor.objectCanvas, false);
                         r.readFromBinary(parentApplication.gsSimStudioModel.currentExperimentNetworkTopology);
@@ -82 +81 @@
                         if (parentApplication.experimentModel.experimentConfiguration.hasOwnProperty('networktopologyfilename'))
                         {
-                                Alert.show("network exists");
                                 parentApplication.addModelUpdatedSingleCallbacks(
                                         parentApplication.service.getExperimentNetworkTopology(experiment.PK), loadNetwork);
                         }
-                        //Alert.show(parentApplication.experimentModel.experimentConfiguration['name']);
-                        //Alert.show(parentApplication.experimentModel);
                 }
                 

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

@@ -326 +326 @@
         }
         
+        /**
+         * Used to get data for resource chart in network topology editor.
+         * 
+         * @param type a string representing the chart type - energy or allocation
+         * 
+         * This method is a copy of the method from ResourceChart.
+         * FIXME: some refactorization could be useful
+         */
+        @BlazeDsMethod()
+        public ResourceChartModel getResourceTimelineFromDb(String resourceName, Integer expId, String type) {
+
+                GSSimStudioModel model = (GSSimStudioModel) VineFlexUtilClass.getUIModel();
+                
+                Connection connection = null;
+                try {
+                        connection = factory().createDBConnection(dbAddress, dbUser,
+                                        dbPassword);
+                        Timestamp minTimestamp = minTimestampMilis == null ? null
+                                        : new Timestamp(minTimestampMilis);
+                        Timestamp maxTimestamp = maxTimestampMilis == null ? null
+                                        : new Timestamp(maxTimestampMilis);
+                        
+                        ResourceDAO resDAO = factory.createResource();
+                        Finder resFinder = Finder.getResourceFinder(expId, resourceName, null);
+                        List<Resource> resList = resDAO.find(resFinder);
+                        if (resList.size() > 0)
+                        {
+                                Resource res = resList.get(0);
+                                switch (type)
+                                {
+                                        case 'energy':
+                                        {
+                                                ResourceAllTimelineDAO resourceDAO = factory
+                                                .createResourceEnTimeline();
+        
+                                                Finder finder = Finder.getResourceAllocationTimelineFinder(res.getPK(), minTimestamp, maxTimestamp);
+                                                List<ResourceEnTimeline> list = resourceDAO.find(finder);
+                        
+                                                model.setResourceTimelineList(list);
+                                                break;
+                                        }
+                                        case 'allocation':
+                                        {
+                                                ResourceAllTimelineDAO resourceDAO = factory
+                                                .createResourceAllTimeline();
+        
+                                                Finder finder = Finder.getResourceAllocationTimelineFinder(res.getPK(), minTimestamp, maxTimestamp);
+                                                List<ResourceAllTimeline> list = resourceDAO.find(finder);
+                        
+                                                model.setResourceTimelineList(list);
+                                                break;
+                                        }
+                                }
+                        }
+
+                } catch (SQLException e) {
+                        setSqlError("Resources allocation timeline", model, e);
+                } catch (InstantiationException e) {
+                        setDbConnectionError(model, e);         
+                } catch (IllegalAccessException e) {
+                        setDbConnectionError(model, e); 
+                } catch (ClassNotFoundException e) {
+                        setDbConnectionError(model, e); 
+                } catch (Exception e) {
+                        setError("Unexpected error occured", model, e); 
+                } finally {
+                        closeConnection(connection, model);
+                }
+
+                return model;
+        }
+        
         @BlazeDsMethod()
         public GSSimStudioModel getExperimentConfiguration(List experiments) {

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

@@ -39 +39 @@
     public GSSimStudioModel() {
     }
+    
+    private List resourceTimelineList;
+    
+    public List getResourceTimelineList() {
+                return resourceTimelineList;
+        }
+
+        public void setResourceTimelineList(
+                        List resourceTimelineList) {
+                this.resourceTimelineList = resourceTimelineList;
+        }
     
     private HashMap experimentsConfiguration = new HashMap();