TT Navigation in plot interactive mode

Benjamin Renard
1 parent b74e48d4
Showing 6 changed files with 258 additions and 129 deletions Show diff stats
js/app/controllers/PlotModule.js
js/app/models/ExecutableNode.js
js/app/models/PlotObjects/PlotRequestObject.js
js/app/views/PlotComponents/PlotTabPanel.js
js/app/views/PlotTabResultUI.js
js/app/views/PlotUI.js
@@ -61,7 +61,7 @@ Ext.define(&#39;amdaDesktop.PlotModule&#39;, {
 	    return size;
 	},
-    updateInteractiveSession : function(session) {
+    updateInteractiveSession : function(session, newplot) {
     	var me = this;
     	Ext.each(session.result, function (tabResult, index) {
     		var winResultId = tabResult.id+"-win";
@@ -72,7 +72,14 @@ Ext.define(&#39;amdaDesktop.PlotModule&#39;, {
 					folder   : session.folder,
 					plotFile : tabResult.plot,
 					context  : tabResult.context,
-					tabId    : tabResult.id
+					tabId    : tabResult.id,
+					multiplot : tabResult.multiplot,
+					superposeMode : tabResult.superposeMode,
+					isInterval: tabResult.isInterval,
+					ttName : tabResult.ttName,
+					ttIndex : tabResult.ttIndex,
+					ttNbIntervals : tabResult.ttNbIntervals,
+					ttFileIndex : tabResult.ttFileIndex
 			};
     		if (winResult == null) {
@@ -83,7 +90,7 @@ Ext.define(&#39;amdaDesktop.PlotModule&#39;, {
     			var win = myDesktopApp.getDesktop().createWindow({
     				id    : tabResult.id+"-win",
-    				title : 'Plot '+(index+1),
+    				title : 'Plot '+(tabResult.index+1),
     				width : size.width,
     				height: size.height,
     				layout: 'fit',
@@ -106,7 +113,7 @@ Ext.define(&#39;amdaDesktop.PlotModule&#39;, {
     		else
     		{
     			//update result
-    			winResult.getPanelResult().updatePlotImage(plotTabConfig);
+    			winResult.getPanelResult().updatePlotImage(plotTabConfig, newplot);
     			//update window size
     			var size = me.computeResultWindowSize(winResult.getPanelResult());
     			winResult.setSize(size.width, size.height);
@@ -80,7 +80,7 @@ Ext.define(&#39;amdaModel.ExecutableNode&#39;, {
      	    if (isInteractivePlot)
      	    {
      	    	myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.plot.id, true, function (module) {
-     	    		module.updateInteractiveSession(res);
+     	    		module.updateInteractiveSession(res, true);
      	    	});
      	    }
      	    else
@@ -28,6 +28,7 @@ Ext.define(&#39;amdaPlotObj.PlotRequestObject&#39;, {
               {name: 'file-output', type: 'string'},
               {name: 'file-prefix', type: 'string'},
               {name: 'one-file-per-interval', type: 'boolean'},
+              {name: 'last-plotted-tab', type: 'int', defaultValue: 0},
               {name: 'last-tab-id', type: 'int', defaultValue: 0}
     ],
@@ -65,6 +66,7 @@ Ext.define(&#39;amdaPlotObj.PlotRequestObject&#39;, {
     	this.set('file-output', amdaPlotObj.PlotObjectConfig.defaultValues.file.output);
     	this.set('file-prefix', '');
     	this.set('one-file-per-interval', amdaPlotObj.PlotObjectConfig.defaultValues.file.oneFilePerInterval);
+    	this.set('last-plotted-tab', 0);
     	this.set('name', '');
     },
@@ -118,6 +120,7 @@ Ext.define(&#39;amdaPlotObj.PlotRequestObject&#39;, {
     	requestValues['file-output'] = this.get('file-output');
     	requestValues['file-prefix'] = this.get('file-prefix');
     	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['timesrc'] =  this.get('timesrc');       
@@ -109,6 +109,13 @@ Ext.define(&#39;amdaPlotComp.PlotTabPanel&#39;, {
 		return plotTab.child().treePlot;
 	},
+	getSelectedTabId: function()
+	{
+		if (this.getActiveTab())
+			return this.getActiveTab().child().tabId;
+		return 0;
+	},
+	
 	init : function(config) {
 		var me = this;
@@ -26,6 +26,10 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
     panelImage : null,
     crtContext : null,
     tabId : '',
+    multiPlotCheck : null,
+    navToolBar : null,
+    isTTNavBar : false,
+    crtTTFileIndex : 0,
     constructor: function(config) {
         this.addEvents({'pagesize':true});
@@ -266,7 +270,7 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
 				if (!me.crtContext)
 					return;
-				me.contextualMenu.removeAll();
+				me.contextualMenu.removeAll(true);
 				var sourceXPos = me.toPixelOnSourceImage(imageX);
 				var sourceYPos = me.toPixelOnSourceImage(imageY);
@@ -298,9 +302,21 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
         return this.panelImage;
     },
-    updatePlotImage: function(configResult) {
+    updatePlotImage: function(configResult, newPlot) {
     	this.crtContext = configResult.context;
+    	this.crtTTFileIndex = configResult.ttFileIndex;
+    	
+    	if (this.isTTNavBar != (!configResult.isInterval))
+    	{
+    		//Update navigation bar
+    		this.updateNavToolBar(!configResult.isInterval);
+    	}
+    	
+    	this.updateTimeTableInfo();
+    	
+    	this.multiPlotCheck.setValue(configResult.multiplot);
+    	
     	this.panelImage.setSrc(this.getImageUrl(configResult.folder, configResult.plotFile));
     	var size = this.getImageSize();
@@ -309,6 +325,24 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
     	this.panelImage.refreshMe();
     },
+    updateTimeTableInfo: function()
+    { 	
+    	if (!this.navToolBar)
+    		return;
+    	
+    	var ttNameField = this.navToolBar.items.get('tt-table-'+this.tabId);
+    	if (ttNameField)
+    		ttNameField.setValue(this.crtContext.page.ttName);
+    	
+    	var ttNumberField = this.navToolBar.items.get('tt-number-'+this.tabId);
+    	if (ttNumberField)
+    		ttNumberField.setValue(this.crtContext.page.ttIndex + 1);
+    	
+    	var ttTotalField = this.navToolBar.items.get('tt-total-'+this.tabId);
+    	if (ttTotalField)
+    		ttTotalField.setValue(this.crtContext.page.ttNbIntervals);
+    },
+    
     callInteractivePlot : function(obj) {
     	loadMask.show(true);
     	AmdaAction.interactivePlot(obj, function (result, e) {
@@ -321,7 +355,7 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
 					if (result.success)
 					{
 						myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.plot.id, true, function (module) {
-							module.updateInteractiveSession(result);    
+							module.updateInteractiveSession(result, false);    
 						});
 					}
 					else
@@ -338,129 +372,202 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
     	},this);	
     },
-    createToolBar : function(isTimeTable) { 
-    	var interoperItemCfg =  {
-    			text: 'Get HST Data',
-    			scope: this,
-    			menu: [
-    			       {
-    			    	   text: 'Giant Planet Auroral Emissions',
-    			    	   scope: this,
-    			    	   handler: function()
-    			    	   {
-    			    		   var me = this;
-    			    		   myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.astro.id, true, function (module) {
-    			    			   //module.createWindow(me.object.get('startDate'),me.object.get('stopDate'));
-    			    		   });
-    			    	   }
-    			       }
-    			       ]
-    	};
-
-    	if (isTimeTable) {	 
-    		var toolConfig = {
-    				dock: 'top',
-    				items: [
-    				        {
-    				        	text: 'Previous',
-    				        	scope: this,
-    				        	handler: function(){
-    				        	}                   
-    				        },
-    				        '-',
-    				        {
-    				        	text: 'Next',
-    				        	scope: this,
-    				        	handler: function(){
-    				        	}
-    				        },
-    				        '-',
-    				        {		 
-    				        	text: 'Go to Interval #',  
-    				        	scope: this,
-    				        	handler: function(bt){
-    				        	}
-    				        },
-    				        {
-    				        	xtype: 'numberfield',
-    				        	hideTrigger: true,                        
-    				        	width: 40, 
-    				        	minValue: 1			
-    				        },
-    				        ' ',
-    				        ' ',
-    				        ' ',		    			    
-    				        {   
-    				        	xtype: 'textfield',   
-    				        	labelAlign: 'right',
-    				        	labelWidth: 30,
-    				        	fieldLabel: 'Table',
-    				        	width: 130,
-    				        	disabled : true			
-    				        },
-    				        {		               
-    				        	xtype: 'textfield',            
-    				        	labelAlign: 'right',
-    				        	labelWidth: 30,
-    				        	fieldLabel: 'Int #',
-    				        	width: 70,
-    				        	disabled : true
-    				        },
-    				        {                        
-    				        	xtype: 'textfield',  		     
-    				        	labelAlign: 'right',
-    				        	labelWidth: 30,
-    				        	fieldLabel: 'Total',
-    				        	width: 70,
-    				        	disabled : true    
-    				        }, 
-    				        '->',  
-    				        interoperItemCfg
-    				        ]                          
-    		};
+    updateNavToolBar : function(isTimeTable) {
+    	if (this.navToolBar)
+    		this.navToolBar.removeAll(true);
+    	
+    	this.multiPlotCheck = Ext.create('Ext.form.field.Checkbox', {
+    		boxLabel : 'Linked to Multi Plot Mode',
+    		scope: this,
+        	handler: function(check, checked) {
+        	}
+    	});
+    	
+    	var commonItemsCfg = [
+    	        {
+    	        	xtype: 'tbspacer',
+    	        	width: 50
+    	        },
+    	        this.multiPlotCheck,
+    	        '->',
+    	        {
+    	        	text: 'Get HST Data',
+        			scope: this,
+        			menu: [
+        			       {
+        			    	   text: 'Giant Planet Auroral Emissions',
+        			    	   scope: this,
+        			    	   handler: function()
+        			    	   {
+        			    		   var me = this;
+        			    		   myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.astro.id, true, function (module) {
+        			    			   var startTime = new Date(me.crtContext.page.startTime*1000);
+        			    			   startTime = Ext.Date.add(startTime, Ext.Date.MINUTE, startTime.getTimezoneOffset());
+        			    			   
+        			    			   var stopTime = new Date(me.crtContext.page.stopTime*1000);
+        			    			   stopTime = Ext.Date.add(stopTime, Ext.Date.MINUTE, stopTime.getTimezoneOffset());
+        			    			   
+        			    			   module.createWindow(startTime,stopTime);
+        			    		   });
+        			    	   }
+        			       }
+        			]
+    	        }
+    	];
+    	
+    	if (isTimeTable)
+    	{
+    		var navigationItemsCfg = [
+    				{
+			        	text: 'Previous',
+			        	scope: this,
+			        	handler: function(){
+			        		var ttFileIndex = this.crtTTFileIndex;
+			        		var ttintervalIndex = this.crtContext.page.ttIndex;
+			        		
+			        		if (ttintervalIndex <= 0)
+			        		{
+			        			if (ttFileIndex <= 0)
+			        			{
+			        				myDesktopApp.errorMsg('You are on the first interval of your request');
+			        				return;
+			        			}
+			        			else
+			        			{
+			        				--ttFileIndex;
+			        				ttintervalIndex = 0;
+			        			}
+			        		}
+			        		else
+			        			--ttintervalIndex;
+			        		this.callInteractivePlot({'action' : 'goto', 'tabId' : this.tabId, 'ttFileIndex' : ttFileIndex, 'intIndex' : ttintervalIndex});
+			        	}                   
+			        },
+			        '-',
+			        {
+			        	text: 'Next',
+			        	scope: this,
+			        	handler: function(){
+			        		var ttFileIndex = this.crtTTFileIndex;
+			        		var ttintervalIndex = this.crtContext.page.ttIndex;
+			        		
+			        		if (ttintervalIndex >= this.crtContext.page.ttNbIntervals-1)
+			        		{
+			        			++ttFileIndex;
+			        			ttintervalIndex = 0;
+			        		}
+			        		else
+			        			++ttintervalIndex;
+			        		this.callInteractivePlot({'action' : 'goto', 'tabId' : this.tabId, 'ttFileIndex' : ttFileIndex, 'intIndex' : ttintervalIndex});
+			        	}
+			        },
+			        '-',
+			        {		 
+			        	text: 'Go to Interval #',  
+			        	scope: this,
+			        	handler: function(bt){
+			        		var ttGotoNumberField = this.navToolBar.items.get('tt-goto-number-'+this.tabId);
+			        		var goToIndex = ttGotoNumberField.getValue() - 1;
+			        		if ((goToIndex < 0) || (goToIndex >= this.crtContext.page.ttNbIntervals))
+			        			myDesktopApp.errorMsg('This interval number is outside of the current timeTable');
+			        		else
+			        			this.callInteractivePlot({'action' : 'goto', 'tabId' : this.tabId, 'ttFileIndex' : this.crtTTFileIndex, 'intIndex' : goToIndex});
+			        	}
+			        },
+			        {
+			        	xtype: 'numberfield',
+			        	id : 'tt-goto-number-'+this.tabId,
+			        	hideTrigger: true,                        
+			        	width: 40, 
+			        	minValue: 1			
+			        },
+			        ' ',
+			        ' ',
+			        ' ',		    			    
+			        {   
+			        	xtype: 'textfield',
+			        	id: 'tt-table-'+this.tabId,
+			        	labelAlign: 'right',
+			        	labelWidth: 30,
+			        	fieldLabel: 'Table',
+			        	width: 130,
+			        	disabled : true			
+			        },
+			        {		               
+			        	xtype: 'textfield',
+			        	id: 'tt-number-'+this.tabId,
+			        	labelAlign: 'right',
+			        	labelWidth: 30,
+			        	fieldLabel: 'Int #',
+			        	width: 70,
+			        	disabled : true
+			        },
+			        {                        
+			        	xtype: 'textfield',  
+			        	id: 'tt-total-'+this.tabId,
+			        	labelAlign: 'right',
+			        	labelWidth: 30,
+			        	fieldLabel: 'Total',
+			        	width: 70,
+			        	disabled : true    
+			        }
+    		];
+    	}
+    	else
+    	{
+    		var navigationItemsCfg = [
+    		        {
+    		        	text: 'Backward', 
+    		        	scope: this,
+    		        	handler: function(){
+    		        		this.callInteractivePlot({'action' : 'backward', 'tabId' : this.tabId});
+    		        	}
+    		        },
+    		        '-',
+    		        {
+    		        	text: '1/2 Backward',
+    		        	scope: this,
+    		        	handler: function(){
+    		        		this.callInteractivePlot({'action' : 'halfbackward', 'tabId' : this.tabId});
+    		        	}
+    		        },
+    		        '-',
+    		        {
+    		        	text: '1/2 Forward',
+    		        	scope: this,
+    		        	handler: function(){
+    		        		this.callInteractivePlot({'action' : 'halfforward', 'tabId' : this.tabId});
+    		        	}
+    		        },
+    		        '-',
+    		        {
+    		        	text: 'Forward',
+    		        	scope: this,
+    		        	handler: function(){
+    		        		this.callInteractivePlot({'action' : 'forward', 'tabId' : this.tabId});
+    		        	}
+    		        }               
+    		];
     	}
-    	else {
-    		var toolConfig = {            
+    	
+    	var toolItemsCfg = navigationItemsCfg;
+    	Ext.each(commonItemsCfg, function(item){
+    		toolItemsCfg.push(item);
+    	});
+    	
+    	if (!this.navToolBar)
+    	{
+    		var toolConfig = {
     				dock: 'top',
-    				items: [ {
-    					text: 'Backward', 
-    					scope: this,
-    					handler: function(){
-    						this.callInteractivePlot({'action' : 'backward', 'tabId' : this.tabId});
-    					}
-    				},
-    				'-' ,
-    				{
-    					text: '1/2 Backward',
-    					scope: this,
-    					handler: function(){
-    						this.callInteractivePlot({'action' : 'halfbackward', 'tabId' : this.tabId});
-    					}
-    				},
-    				'-',
-    				{
-    					text: '1/2 Forward',
-    					scope: this,
-    					handler: function(){
-    						this.callInteractivePlot({'action' : 'halfforward', 'tabId' : this.tabId});
-    					}
-    				},
-    				'-',
-    				{
-    					text: 'Forward',
-    					scope: this,
-    					handler: function(){
-    						this.callInteractivePlot({'action' : 'forward', 'tabId' : this.tabId});
-    					}
-    				},
-    				'->',
-    				interoperItemCfg			 
-    				]
+    				items: toolItemsCfg                      
     		};
+    	
+    		this.navToolBar =  Ext.create('Ext.toolbar.Toolbar', toolConfig);
     	}
-	
-    	var toolBar =  Ext.create('Ext.toolbar.Toolbar', toolConfig); 
-    	return toolBar;
+    	else
+    		this.navToolBar.add(toolItemsCfg);
+    	
+    	this.isTTNavBar = isTimeTable;
     }, 
     init: function(configResult){
@@ -512,7 +619,11 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
     		items: []
     	});
-    	var navToolBar = this.createToolBar(false);
+    	this.updateNavToolBar(!configResult.isInterval);
+    	
+    	this.updateTimeTableInfo();
+    	
+    	this.multiPlotCheck.setValue(configResult.multiplot);
     	var plotResultTabPanelConfig = {
     			preventHeader : true,
@@ -520,7 +631,7 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
                 items: [
                         this.createPlotImage(configResult.folder, configResult.plotFile)
                 ],
-                dockedItems: [navToolBar, mouseToolbar],
+                dockedItems: [this.navToolBar, mouseToolbar],
                 plugins: [
                           {
                         	  ptype: 'plotZoomPlugin',
@@ -113,6 +113,7 @@ Ext.define(&#39;amdaUI.PlotUI&#39;, {
      */
     doPlot : function(){
     	this.updateObject();
+    	this.object.set('last-plotted-tab', this.plotTabs.getSelectedTabId());
     	var plotModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.plot.id);
     	if (plotModule)
     		plotModule.linkedNode.execute();