Edit plot tab on double click

Benjamin Renard
1 parent 0ead0129
Showing 9 changed files with 66 additions and 36 deletions Show diff stats
js/app/controllers/AmdaModule.js
js/app/controllers/InteractiveModule.js
js/app/controllers/PlotModule.js
js/app/models/PlotNode.js
js/app/models/PlotObjects/PlotRequestObject.js
js/app/models/PlotTabNode.js
js/app/views/ExplorerUI.js
js/app/views/PlotComponents/PlotTabPanel.js
js/app/views/PlotUI.js
@@ -99,7 +99,12 @@ Ext.define(&#39;amdaDesktop.AmdaModule&#39;, {
 				show : onshowfn,
 				scope : this
 			});
-		}		
-		win.show();
+		}
+		if (!win.isVisible()) {
+			win.show();
+		}
+		else if (onshowfn) {
+			onshowfn();
+		}
 	}
 });
@@ -144,7 +144,13 @@ Ext.define(&#39;amdaDesktop.InteractiveModule&#39;, {
 			// second arg 'true' is used in CatalogUI to mark if Grid Reconfiguration is needed
 			this.getUiContent().setObject(this.linkedNode.get('object'), true);
 		}
-		win.show();
+
+		if (!win.isVisible()) {
+			win.show();
+		}
+		else if (onShowEvent) {
+			onShowEvent();
+		}
 	},
 	/**
 	 * Mechanism to attach a Module to the Workspace Explorer to enable interactions
@@ -256,4 +262,4 @@ Ext.define(&#39;amdaDesktop.InteractiveModule&#39;, {
               return null;
           }
  
-});
 \ No newline at end of file
+});
@@ -208,5 +208,12 @@ Ext.define(&#39;amdaDesktop.PlotModule&#39;, {
     getWindowResult: function(winResultId){
 	    if (!this.plotResultWindowsManager.get(winResultId)) return null;
 	    return this.plotResultWindowsManager.get(winResultId);	    
+	},
+
+    forceTabSelection: function(tabId) {
+	var uiContent = this.getUiContent();
+        if (uiContent != null) {
+		uiContent.forceActiveTab(tabId);
 	}
+    }
 });
@@ -43,6 +43,7 @@ Ext.define(&#39;amdaModel.PlotNode&#39;, {
               			me.appendChild(tabNode);
 			});
 		}
+		this.set('tabs', tabs);
 	}
     },
  
@@ -30,8 +30,7 @@ Ext.define(&#39;amdaPlotObj.PlotRequestObject&#39;, {
               {name: 'one-file-per-interval', type: 'boolean'},
               {name: 'last-plotted-tab', type: 'int', defaultValue: 0},
               {name: 'last-tab-id', type: 'int', defaultValue: 0},
-				  {name: 'active-tab-id', type: 'int', defaultValue: 1},
-				  {name: 'all-in-one', type: 'boolean', defaultValue: false}
+	      {name: 'active-tab-id', type: 'int', defaultValue: 1}
     ],
  
     hasMany: {
@@ -77,7 +76,7 @@ Ext.define(&#39;amdaPlotObj.PlotRequestObject&#39;, {
     	var recs = this.tabs().add({id : this.get('last-tab-id')});
     	recs[0].setDefaultValues();
     	this.dirty = true;
-		return recs[0];
+	return recs[0];
     },
  
     removeTabById: function(tabId) {
@@ -124,7 +123,6 @@ Ext.define(&#39;amdaPlotObj.PlotRequestObject&#39;, {
     	requestValues['one-file-per-interval'] = this.get('one-file-per-interval');
     	requestValues['last-plotted-tab'] = this.get('last-plotted-tab');
     	requestValues['name'] = this.get('name');
-		requestValues['all-in-one'] =  this.get('all-in-one');
  
     	requestValues['timesrc'] =  this.get('timesrc'); 
  
@@ -153,26 +151,15 @@ Ext.define(&#39;amdaPlotObj.PlotRequestObject&#39;, {
 				requestValues['durationSec'] = this.get('durationSec');
 			}
  
-		requestValues['tabs'] = [];
+	requestValues['tabs'] = [];
  
-		if (this.get('all-in-one')) {
-			this.tabs().each(function (tab, index) {
-				requestValues['tabs'][index] = tab.getJsonValues();
-			});
+	this.tabs().each(function (tab, index) {
+		requestValues['tabs'][index] = tab.getJsonValues();
+	});
  
-			requestValues['active-tab-id'] = this.get('active-tab-id');
-			requestValues['last-tab-id'] = this.get('last-tab-id');
-		}
-		else {
-			var tab = this.tabs().getAt(this.get('active-tab-id')-1);
-			requestValues['tabs'][0] = tab.getJsonValues();
-			
-			requestValues['tabs'][0]['id'] = "1";
-			requestValues['active-tab-id'] =  "1";
-			requestValues['last-tab-id'] = "1";
-			requestValues['last-plotted-tab'] = "0";
-		}
+	requestValues['active-tab-id'] = this.get('active-tab-id');
+	requestValues['last-tab-id'] = this.get('last-tab-id');
  
-      return requestValues;
+	return requestValues;
     }
-});
 \ No newline at end of file
+});
@@ -78,6 +78,15 @@ Ext.define(&#39;amdaModel.PlotTabNode&#39;, {
         default:
             break;
         }
+    },
+
+    editPlotTab : function() {
+	var me = this;
+	this.parentNode.editLeaf(function () {
+		myDesktopApp.getLoadedModule(me.get('moduleId'), true, function (module) {
+			module.forceTabSelection(me.get('tabid'));
+		});
+	});
     }
  
 });
@@ -576,13 +576,13 @@ Ext.define(&#39;amdaUI.ExplorerUI&#39;, {
 						});
 					}
  
-					if (record.isLeaf() || record.data.isParameter)                                                                                                                                     
+					if (record.isLeaf() || record.data.isParameter || (record.data.tabs && (record.data.tabs.length > 0)))                                                                                                                                     
 						switch (record.get('nodeType'))
 						{
 							case 'myData' :
 							case 'myDataParam' :
 							case 'derivedParam' :
-                                                                                                                                          							case 'timeTable' :
+							case 'timeTable' :
 							case 'sharedtimeTable' :
 							case 'sharedcatalog' :
 							case 'catalog' :
@@ -590,6 +590,9 @@ Ext.define(&#39;amdaUI.ExplorerUI&#39;, {
 							case 'condition' :
 								record.editLeaf();
 								break;
+							case 'plottab' :
+								record.editPlotTab();
+								break;
 							case 'localParam' :
 							case 'remoteParam':
 							case 'remoteSimuParam':
@@ -31,16 +31,20 @@ Ext.define(&#39;amdaPlotComp.PlotTabPanel&#39;, {
  
 	setRequestObject: function(object)
 	{
+		var me = this;
 		this.removeAll();
 		this.object = object;
-		var selectedTab = this.object.get('active-tab-id');
  
+		var haveSelectedTab = false;
 		this.object.tabs().each(function (rec, index) {
-			var isSelected = false;
-			if (index+1 == selectedTab) 
-				isSelected = true;
+			if (rec.get('id') == me.object.get('active-tab-id')) {
+				haveSelectedTab = true;
+			}
+		});
  
-			this.addPlotTab(rec, isSelected); 	
+		this.object.tabs().each(function (rec, index) {
+			var isSelectedTab = haveSelectedTab ? (rec.get('id') == me.object.get('active-tab-id')) : (index == 0);
+			this.addPlotTab(rec, isSelectedTab); 	
 		}, this);
 	},
  
@@ -111,7 +111,6 @@ Ext.define(&#39;amdaUI.PlotUI&#39;, {
 	doPlot : function(){
  
 		this.updateObject();
-		this.object.set('all-in-one', true);
 		this.object.set('last-plotted-tab', this.plotTabs.getSelectedTabId());
 		var plotModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.plot.id);
 		if (plotModule)
@@ -172,6 +171,16 @@ Ext.define(&#39;amdaUI.PlotUI&#39;, {
  
 		this.timeSelector.intervalSel.setInterval(dateStart, dateStop);        
 	},
+
+	forceActiveTab : function(tabId) {
+		for (var i = 0; i < this.plotTabs.items.getCount(); ++i) {
+			var plotTab = this.plotTabs.items.getAt(i).items.getAt(0);
+			if (plotTab.tabId == tabId) {
+				this.plotTabs.setActiveTab(i);
+				return;
+			}
+		}
+	},
  
 	updateLinkedToMultiPlotMode : function(isLinkedToMultiPlotMode) {
 		this.timeSelector.setVisible(isLinkedToMultiPlotMode); 
@@ -183,7 +192,6 @@ Ext.define(&#39;amdaUI.PlotUI&#39;, {
 			return;
 		this.updateObject();
 		this.object.set('active-tab-id', this.plotTabs.getSelectedTabId());
-		this.object.set('all-in-one', allTabs);
  
 		if ((this.object.get('id') != '') && (plotModule.linkedNode.get('text') == this.object.get('name'))) {
 			//update existing request