Fix addParameter + remove plot

Benjamin Renard
1 parent 495fc7a3
Showing 8 changed files with 83 additions and 39 deletions Show diff stats
js/app/controllers/PlotModule.js
js/app/models/InteractiveNode.js
js/app/models/MultiplotNode.js
js/app/models/PlotObjects/MultiplotRequestObject.js
js/app/models/PlotObjects/PlotRequestObject.js
js/app/views/PlotComponents/PlotTabContent.js
js/app/views/PlotComponents/PlotTabPanel.js
js/app/views/PlotUI.js
@@ -208,5 +208,20 @@ Ext.define(&#39;amdaDesktop.PlotModule&#39;, {
     getWindowResult: function(winResultId){
 	    if (!this.plotResultWindowsManager.get(winResultId)) return null;
 	    return this.plotResultWindowsManager.get(winResultId);	    
+    },
+
+    addParameter : function(paramNode) {
+        var me = this;
+        var desktop = this.app.getDesktop();
+        var win = desktop.getWindow(this.id);
+        if (win) {
+            me.getUiContent().addParameter(paramNode, false);
+            win.show();
+        }
+        else {
+            this.createWindow(function () {
+                me.getUiContent().addParameter(paramNode, true);
+            });
+        }
     }
 });
@@ -454,16 +454,7 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
 	{
 		if (node.get('disable')) return;
 		myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.plot.id, true, function (module) {
-			if (!myDesktopApp.desktop.getWindow(myDesktopApp.dynamicModules.plot.id)) {
-				var request = Ext.create(amdaPlotObj.PlotRequestObject.$className);
-				var newNode = Ext.create(amdaModel.PlotNode.$className, { object : request });
-				// edit newNode into Plot Module with node as contextNode
-				newNode.editInModule();
-				if((node.get('globalStart') != null) && (node.get('globalStop') != null) && node.get('globalStart') != 'depending on mission' && node.get('isParameter')) {
-					module.getUiContent().setTimeFromData(node.getTimeFromNode(node));
-				}
-			}
-			module.getUiContent().addParameter(node);
+                    module.addParameter(node);
 		});
 	},
@@ -21,4 +21,5 @@ Ext.define(&#39;amdaModel.MultiplotNode&#39;, {
         this.set('nodeType',this.self.nodeType);
         this.set('leaf', true);
     }
+
 });
@@ -54,7 +54,10 @@ Ext.define(&#39;amdaPlotObj.MultiplotRequestObject&#39;, {
         return this.plots().getAt(this.plots().count()-1);
     },
-    removePlotById: function(id) {
+    removePlotByInternalId: function(internalId) {
+        var plotNode = this.plots().data.getByKey(internalId);
+        if (plotNode)
+            this.plots().remove(plotNode);
     },
     addPlot: function(plotNode) {
@@ -231,6 +231,8 @@ Ext.define(&#39;amdaPlotObj.PlotRequestObject&#39;, {
     getJsonValues : function() 
     {
     	var requestValues  = new Object();
+
+        requestValues['nodeType'] = 'request';
     	requestValues['id'] = this.get('id');
@@ -30,6 +30,11 @@ Ext.define(&#39;amdaPlotComp.PlotTabContent&#39;, {
 		this.init(config);	    
 		this.callParent(arguments);
     },
+
+    setTime : function(startDate, stopDate) {
+        this.timeSelector.intervalSel.setInterval(startDate, stopDate);
+        
+    },
     updateTimeObject : function() {
         var timeSource = this.timeSelector.getActiveTimeSource();
@@ -39,7 +44,11 @@ Ext.define(&#39;amdaPlotComp.PlotTabContent&#39;, {
         if (timeSource === amdaModel.AmdaTimeObject.inputTimeSrc[0])
             this.plotNode.get('object').set('timeTables',this.timeSelector.TTGrid.getStore().data.items);
     },
-	
+
+    doPlot : function() {
+        this.plotNode.execute();
+    },
+
     init : function(config) {
         var me = this;
         me.plotNode = config.plotNode;
@@ -43,6 +43,7 @@ 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',
@@ -63,8 +64,8 @@ Ext.define(&#39;amdaPlotComp.PlotTabPanel&#39;, {
                     return true;
                 },
                 close: function( tab, eOpts ) {
-                    if (tab.items.getAt(0).object)
-                        this.object.removeTabById(tab.items.getAt(0).object.get('id'));
+                    if (tab.items.getAt(0).plotNode)
+                        this.multiplot_object.removePlotByInternalId(tab.items.getAt(0).plotNode.internalId);
                 },
                 destroy: function(tab, eOpts) {	
                     this.updatePlotTabs();
@@ -80,7 +81,22 @@ Ext.define(&#39;amdaPlotComp.PlotTabPanel&#39;, {
     updatePlotTabs: function()
     {
-        // ToDo - BRE
+        for (i = 0; i < this.items.getCount(); ++i)
+        {
+            var tabItem = this.items.getAt(i);
+            var tabContent = tabItem.items.getAt(0);
+            var plotNode = tabContent.plotNode;
+            var title = (plotNode.get('text') != '') ? plotNode.get('text') : 'Plot '+(i + 1);
+            tabItem.setTitle(title);
+            if (!this.getActiveTab())
+                this.setActiveTab(tabItem);
+        }
+    },
+
+    getCurrentPlotTabContent : function() {
+        if (this.getActiveTab())
+            return this.getActiveTab().child();
+        return null;
     },
     updateTimeObject : function() {
@@ -93,22 +93,33 @@ Ext.define(&#39;amdaUI.PlotUI&#39;, {
 		amdaModel.DownloadNode.editInModule(); 
 	},
-	addParameter : function(node){
-		var crtTree = this.plotTabs.getTreeFromPlotTab(this.plotTabs.getActiveTab());
-		crtTree.dropRecord(node,null,'append');
-	},
+    addParameter : function(node, updateTime){
+        var crtTree = this.plotTabs.getTreeFromPlotTab(this.plotTabs.getActiveTab());
+        if (crtTree) {
+            crtTree.dropRecord(node,null,'append');
+            if (updateTime) {
+                if((node.get('globalStart') != null) && (node.get('globalStop') != null) && node.get('globalStart') != 'depending on mission' && node.get('isParameter')) {
+                    this.setTimeFromData(node.getTimeFromNode(node));
+                }
+            }
+        }
+    },
 	/**
      * plot method called by 'Do Plot' button to launch the plot process
      */
-	doPlot : function(){
+    doPlot : function(){
+        var plotTab = this.plotTabs.getCurrentPlotTabContent()
+        if (plotTab)
+            plotTab.doPlot();
-		this.updateObject();
+		/*this.updateObject();
 		this.object.set('last-plotted-tab', this.plotTabs.getSelectedTabId());
 		var plotModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.plot.id);
 		if (plotModule)
-			plotModule.linkedNode.execute();
-	},  
+			plotModule.linkedNode.execute();*/
+
+    },  
 	/**
 	 * Check if changes were made before closing window 
@@ -142,23 +153,19 @@ Ext.define(&#39;amdaUI.PlotUI&#39;, {
 			crtTimeSelector.addTT(newTTName,newTTid);
 	},
-	/**
-	* Set Start-Stop from parameter info (Local & MyData)
-	*/ 
-	setTimeFromData : function(obj) {                                                               
-		if (!obj.start || !obj.stop)
-			return;
-		var dateStart = new Date(obj.start.replace(/[T|Z]/g,' ').replace(/\-/g,'\/')); 
-		var dateStop = new Date(obj.stop.replace(/[T|Z]/g,' ').replace(/\-/g,'\/')); 
+    /**
+     * Set Start-Stop from parameter info (Local & MyData)
+     */ 
+    setTimeFromData : function(obj) {                                                               
+        if (!obj.start || !obj.stop)
+            return;
+        var dateStart = new Date(obj.start.replace(/[T|Z]/g,' ').replace(/\-/g,'\/')); 
+        var dateStop = new Date(obj.stop.replace(/[T|Z]/g,' ').replace(/\-/g,'\/')); 
-		for (var i = 0; i < this.plotTabs.items.getCount(); ++i) {
-			var plotTab = this.plotTabs.items.getAt(i).items.getAt(0);  
-			plotTab.items.getAt(1).intervalSel.setInterval(dateStart, dateStop);
-			//TBD  plotTab.updateTimeObject();		 
-		}
-		
-		this.timeSelector.intervalSel.setInterval(dateStart, dateStop);        
-	},
+        var plotTab = this.plotTabs.getCurrentPlotTabContent();
+        if (plotTab)
+            plotTab.setTime(dateStart, dateStop);
+    },
 	forceActiveTab : function(tabId) {
 		for (var i = 0; i < this.plotTabs.items.getCount(); ++i) {