Fix doPlot

Benjamin Renard
1 parent d50add6f
Showing 6 changed files with 19 additions and 12 deletions Show diff stats
js/app/controllers/PlotModule.js
js/app/models/BkgJobNode.js
js/app/models/InteractiveNode.js
js/app/models/PlotObjects/PlotRequestObject.js
js/app/views/PlotComponents/PlotTabContent.js
js/app/views/PlotComponents/PlotTabPanel.js
@@ -62,7 +62,7 @@ Ext.define(&#39;amdaDesktop.PlotModule&#39;, {
     	var me = this;
  
  
-    	
+    	console.log(session.result);
     	Ext.each(session.result, function (tabResult, index) {
 		if (logExecTime && tabResult.exectime)
 		{
@@ -109,7 +109,7 @@ Ext.define(&#39;amdaDesktop.PlotModule&#39;, {
  
     			var win = myDesktopApp.getDesktop().createWindow({
     				id    : tabResult.id+"-win",
-    				title : 'Plot '+(tabResult.index+1),
+    				title : tabResult.title,
     				width : size.width,
     				height: size.height,
     				x : x,
@@ -10,9 +10,6 @@
  
 Ext.define('amdaModel.BkgJobNode', {
 		extend: 'amdaModel.ExecutableNode',		
-		requires: [
-			'amdaPlotObj.PlotRequestObject'
-		],    
 		action : null,
  
 		statics: {       	 	 
@@ -11,10 +11,6 @@
 Ext.define('amdaModel.InteractiveNode', {
 	extend: 'amdaModel.AmdaNode',
  
-	requires: [
-		'amdaPlotObj.PlotRequestObject'
-	],
-
 	fields: [
 		{name: 'contextNode', type: 'amdaModel.AmdaNode', persist: false},
 		{name: 'objectDataModel', type: 'string', persist: false},
@@ -28,6 +28,8 @@ Ext.define(&#39;amdaPlotObj.PlotRequestObject&#39;, {
  
 	fields : [
               {name: 'id', type: 'int'},
+              {name: 'tab-index', type: 'int', defaultValue: 0, persist: false},
+              {name: 'tab-title', type: 'string', defaultValue: '', persist: false},
  
               {name: 'file-format', type: 'string'},
               {name: 'file-output', type: 'string'},
@@ -233,6 +235,8 @@ Ext.define(&#39;amdaPlotObj.PlotRequestObject&#39;, {
         requestValues['leaf'] = true;
  
     	requestValues['id'] = this.get('id');
+        requestValues['tab-index'] = this.get('tab-index');
+        requestValues['tab-title'] = this.get('tab-title');
  
         requestValues['file-format'] = this.get('file-format');
         requestValues['file-output'] = this.get('file-output');
@@ -25,6 +25,8 @@ Ext.define(&#39;amdaPlotComp.PlotTabContent&#39;, {
     plotTree: null,
     plotElement: null,
     plotOutput: null,
+
+    tabIndex: 0,
  
     constructor: function(config) {
 		this.init(config);	    
@@ -46,9 +48,15 @@ Ext.define(&#39;amdaPlotComp.PlotTabContent&#39;, {
     },
  
     doPlot : function() {
+        this.plotNode.get('object').set('tab-index', this.tabIndex);
+        this.plotNode.get('object').set('tab-title', this.getPlotTitle());
         this.plotNode.execute();
     },
  
+    getPlotTitle: function() {
+       return (this.plotNode.get('text') != '') ? this.plotNode.get('text') : 'Plot '+(this.tabIndex + 1); 
+    },
+
     savePlot : function() {
         var object = this.plotNode.get('object');
         if (!object)
@@ -123,6 +131,7 @@ Ext.define(&#39;amdaPlotComp.PlotTabContent&#39;, {
  
     init : function(config) {
         this.plotNode = config.plotNode;
+        this.tabIndex = config.tabIndex;
  
         this.timeSelector = new amdaUI.TimeSelectorUI( { id: 'plotTimeSelectorTab' + this.plotNode.id, border : false, flex: 6, collapsible: true, collapseDirection : 'bottom'} );
         this.plotElement = new amdaPlotComp.PlotElementPanel({flex: 11});
@@ -39,10 +39,10 @@ Ext.define(&#39;amdaPlotComp.PlotTabPanel&#39;, {
     addPlotNode: function(plotNode, selectTab)
     {
         var tabNumber = this.getTabBar().items.getCount();
-        var tabContent = new amdaPlotComp.PlotTabContent({plotNode: plotNode});
+        var tabContent = new amdaPlotComp.PlotTabContent({plotNode: plotNode, tabIndex: tabNumber-1});
         var me = this;
         var tabComp = this.add({
-            title: (plotNode.get('text') != '') ? plotNode.get('text') : 'Plot '+tabNumber,
+            title: tabContent.getPlotTitle(),
             closable: true,
             layout: 'fit',
             bodyStyle: 'background: none',
@@ -84,8 +84,9 @@ Ext.define(&#39;amdaPlotComp.PlotTabPanel&#39;, {
         {
             var tabItem = this.items.getAt(i);
             var tabContent = tabItem.items.getAt(0);
+            tabContent.tabIndex = i;
             var plotNode = tabContent.plotNode;
-            var title = (plotNode.get('text') != '') ? plotNode.get('text') : 'Plot '+(i + 1);
+            var title = tabContent.getPlotTitle();
             tabItem.setTitle(title);
             if (!this.getActiveTab())
                 this.setActiveTab(tabItem);