Fix Get Data

Benjamin Renard
1 parent 57e15214
Showing 3 changed files with 97 additions and 131 deletions Show diff stats
js/app/models/DownloadNode.js
js/app/views/PlotComponents/PlotTabPanel.js
js/app/views/PlotUI.js
@@ -62,91 +62,74 @@ Ext.define(&#39;amdaModel.DownloadNode&#39;, {
 		});
 	},
-	decodeObject: function(obj) {
-		var myValues  = new Object(); 		
-		myValues.list=[];
-		
-		if (!obj) {
-			var fullObject = this.get('realLinkedNode').get('object');	      
-		}
-		else {
-			var fullObject = obj;
-		}
-	   	  
-		var i = 0;
-		// Todo - BRE - PLOTSAVE
-		fullObject.tabs().each(function (tab) {
-			// only active tab			
-			if (tab.get('id') == fullObject.get('last-plotted-tab'))
-			{			 
-				tab.panels().each(function (panel) {
-					panel.params().each(function (param) {
-						var myParam = new Object();
-						myParam.paramid =  param.get('paramid');
-						myParam.type =  param.get('type');
-						myParam['dim1-index'] = param.get('dim1-index');
-						myParam['dim1-sum-type'] = param.get('dim1-sum-type');
-						myParam['dim1-min-value'] =  param.get('dim1-min-value');
-						myParam['dim1-max-value'] =  param.get('dim1-max-value');
-						myParam['dim1-min-index'] =  param.get('dim1-min-index');
-						myParam['dim1-max-index'] =  param.get('dim1-max-index');
-						myParam['dim2-index'] = param.get('dim2-index');
-						myParam['dim2-sum-type'] = param.get('dim2-sum-type');
-						myParam['dim2-min-value'] =  param.get('dim2-min-value');
-						myParam['dim2-max-value'] =  param.get('dim2-max-value');
-						myParam['dim2-min-index'] =  param.get('dim2-min-index');
-						myParam['dim2-max-index'] =  param.get('dim2-max-index');
-						myParam.template_args = param.get('template_args');
-						if (!param.get('plotonly')) {
-							myValues.list[i] = myParam;
-							++i;
-						}
-						else 
-							alert('Parameter '+ myParam.paramid + ' is PlotOnly');						
-					});
-				});				
-				if (tab.get('multi-plot-linked'))
-				{
-					var object =  fullObject.data;
-				}
-				else 
-				{
-					var object =  tab.data;
-				}				
-				myValues.timesrc = object.timesrc;
-				// if there's at least one timeTable name into 'timeTables' collection
-				if (myValues.timesrc == amdaModel.AmdaTimeObject.inputTimeSrc[0]
-					&& object.timeTables 
-					&& object.timeTables.length ){
-					// get complete timeTables collection
-					var timeTables =  object.timeTables;	    
-					// init an empty array for timeTables
-					myValues.timeTables=[];
-					// for each interval record
-					Ext.Array.each(timeTables, function(item, index, all){
-						if (!item.$className) {
-							myValues.timeTables[index] = {timeTableName : item.timeTableName, id : item.id};
-						}
-						// get Json simplified value 
-						else {
-							myValues.timeTables[index] = item.getJsonValues();
-						}
-					});            
-				}
-				else {
-					myValues.startDate = object.startDate;
-					myValues.stopDate = object.stopDate;
-					myValues.durationDay = object.durationDay;
-					myValues.durationHour = object.durationHour;
-					myValues.durationMin = object.durationMin;
-					myValues.durationSec = object.durationSec;
-				}
-			}	
-		});
-	  
-		myValues.name = fullObject.get('name');
-		return myValues;
-	},
+    decodeObject: function(obj) {
+        var myValues  = new Object(); 		
+        myValues.list=[];
+
+        if (!obj) {
+            var fullObject = this.get('realLinkedNode').get('object');	      
+        }
+        else {
+            var fullObject = obj;
+        }
+
+        fullObject.panels().each(function (panel) {
+            panel.params().each(function (param) {
+                var myParam = new Object();
+                myParam.paramid =  param.get('paramid');
+                myParam.type =  param.get('type');
+                myParam['dim1-index'] = param.get('dim1-index');
+                myParam['dim1-sum-type'] = param.get('dim1-sum-type');
+                myParam['dim1-min-value'] =  param.get('dim1-min-value');
+                myParam['dim1-max-value'] =  param.get('dim1-max-value');
+                myParam['dim1-min-index'] =  param.get('dim1-min-index');
+                myParam['dim1-max-index'] =  param.get('dim1-max-index');
+                myParam['dim2-index'] = param.get('dim2-index');
+                myParam['dim2-sum-type'] = param.get('dim2-sum-type');
+                myParam['dim2-min-value'] =  param.get('dim2-min-value');
+                myParam['dim2-max-value'] =  param.get('dim2-max-value');
+                myParam['dim2-min-index'] =  param.get('dim2-min-index');
+                myParam['dim2-max-index'] =  param.get('dim2-max-index');
+                myParam.template_args = param.get('template_args');
+                if (!param.get('plotonly')) {
+                    myValues.list.push(myParam);
+                }
+                else 
+                    alert('Parameter '+ myParam.paramid + ' is PlotOnly');						
+            });
+        });				
+        myValues.timesrc = fullObject.get('timesrc');
+        // if there's at least one timeTable name into 'timeTables' collection
+        if (myValues.timesrc == amdaModel.AmdaTimeObject.inputTimeSrc[0]
+            && fullObject.get('timeTables')
+            && fullObject.get('timeTables').length){
+            // get complete timeTables collection
+            var timeTables =  fullObject.get('timeTables');	    
+            // init an empty array for timeTables
+            myValues.timeTables=[];
+            // for each interval record
+            Ext.Array.each(timeTables, function(item, index, all){
+                if (!item.$className) {
+                    myValues.timeTables[index] = {timeTableName : item.timeTableName, id : item.id};
+                }
+                // get Json simplified value 
+                else {
+                    myValues.timeTables[index] = item.getJsonValues();
+                }
+            });            
+        }
+        else {
+            myValues.startDate = fullObject.get('startDate');
+            myValues.stopDate = fullObject.get('stopDate');
+            myValues.durationDay = fullObject.get('durationDay');
+            myValues.durationHour = fullObject.get('durationHour');
+            myValues.durationMin = fullObject.get('durationMin');
+            myValues.durationSec = fullObject.get('durationSec');
+        }
+
+        myValues.name = fullObject.get('name');
+        return myValues;
+    },
 	encodeObject: function() {
 	},
@@ -43,7 +43,6 @@ Ext.define(&#39;amdaPlotComp.PlotTabPanel&#39;, {
         var me = this;
         var tabComp = this.add({
             title: (plotNode.get('text') != '') ? plotNode.get('text') : 'Plot '+tabNumber,
-            isRendered: false,
             closable: true,
             layout: 'fit',
             bodyStyle: 'background: none',
@@ -99,7 +98,7 @@ Ext.define(&#39;amdaPlotComp.PlotTabPanel&#39;, {
         return null;
     },
-    updateTimeObject : function() {
+    updateTimeObjects : function() {
         for (i = 0; i < this.items.getCount(); ++i)
         {
             this.items.getAt(i).items.getAt(0).updateTimeObject();
@@ -70,28 +70,26 @@ Ext.define(&#39;amdaUI.PlotUI&#39;, {
 			}
 	}, 
-	resetProcess : function(){
-		var plotModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.plot.id);			
-		plotModule.createLinkedNode();
-		var obj = null;
-		if ((arguments.length > 0) && (arguments[0] != null)) {
-			obj = arguments[0];
-		}
-		plotModule.createObject(obj);					  
-		this.setObject(plotModule.linkedNode.get('object'));
-	},
+    resetProcess : function(){
+        var plotModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.plot.id);			
+        plotModule.createLinkedNode();
+        var obj = null;
+        if ((arguments.length > 0) && (arguments[0] != null)) {
+            obj = arguments[0];
+        }
+        plotModule.createObject(obj);					  
+        this.setObject(plotModule.linkedNode.get('object'));
+    },
-	getDataProcess : function(){
-		this.updateObject(); 
-		// plot was not called - form only		
-		if (this.object.get('last-plotted-tab') == 0) {
-			this.object.set('last-plotted-tab', this.plotTabs.getSelectedTabId());
-		}
-		var downObject = amdaModel.DownloadNode.decodeObject(this.object);
-		amdaModel.DownloadNode.set('object',Ext.create('amdaModel.Download',downObject));
-               
-		amdaModel.DownloadNode.editInModule(); 
-	},
+    getDataProcess : function(){
+        this.updateObject();
+        var plotTab = this.plotTabs.getCurrentPlotTabContent();
+        if (!plotTab || !plotTab.plotNode)
+            return;
+        var downObject = amdaModel.DownloadNode.decodeObject(plotTab.plotNode.get('object'));
+        amdaModel.DownloadNode.set('object',Ext.create('amdaModel.Download',downObject));
+        amdaModel.DownloadNode.editInModule();
+    },
     addParameter : function(node, updateTime){
         var crtTree = this.plotTabs.getTreeFromPlotTab(this.plotTabs.getActiveTab());
@@ -105,20 +103,13 @@ Ext.define(&#39;amdaUI.PlotUI&#39;, {
         }
     },
-	/**
+    /**
      * plot method called by 'Do Plot' button to launch the plot process
      */
     doPlot : function(){
-        var plotTab = this.plotTabs.getCurrentPlotTabContent()
+        var plotTab = this.plotTabs.getCurrentPlotTabContent();
         if (plotTab)
             plotTab.doPlot();
-		
-		/*this.updateObject();
-		this.object.set('last-plotted-tab', this.plotTabs.getSelectedTabId());
-		var plotModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.plot.id);
-		if (plotModule)
-			plotModule.linkedNode.execute();*/
-
     },  
 	/**
@@ -133,19 +124,12 @@ Ext.define(&#39;amdaUI.PlotUI&#39;, {
 		return this.object.isDirty();
 	},
-	/**
-	* update time selector of this.object from form
-	*/
-	updateObject : function(){
-		var timeSource = this.timeSelector.getActiveTimeSource();
-
-		var multiPlotForm = this.timeSelector.getForm();
-		multiPlotForm.updateRecord(this.object);
-		this.object.set('timesrc', timeSource);
-		if (timeSource === amdaModel.AmdaTimeObject.inputTimeSrc[0])
-			this.object.set('timeTables',this.timeSelector.TTGrid.getStore().data.items);
-		this.plotTabs.updateTimeObject();
-	},
+    /**
+     * update time selector of this.object from form
+     */
+    updateObject : function(){
+        this.plotTabs.updateTimeObjects();
+    },
 	addTT : function(newTTName,newTTid,timeSelectorId) {
 		var crtTimeSelector = Ext.getCmp(timeSelectorId);
@@ -244,7 +228,7 @@ Ext.define(&#39;amdaUI.PlotUI&#39;, {
 		var plotModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.plot.id);
 		if (!plotModule)
 			return;
-		this.updateObject();
+                this.updateObject();
 		this.object.set('active-tab-id', this.plotTabs.getSelectedTabId());
 		var me = this;