New implementation for interactive plot session

Benjamin Renard
1 parent de9b2578
Showing 5 changed files with 243 additions and 48 deletions Show diff stats
desktop.php
js/app/controllers/NewPlotModule.js
js/app/models/ExecutableNode.js
js/app/views/NewPlotTabResultUI.js
js/app/views/NewPlotUI.js
@@ -109,10 +109,10 @@
  
         //create mask class (LoadMask for elements has been deprecated, use Ext.dom.Element.mask & Ext.dom.Element.unmask)
         var AMDAMask = new Ext.Class({
-            show : function(tabId)
+            show : function(interactivePlot)
             {
                 var msg = 'Processing...Please wait';  
-                if (tabId)   
+                if (interactivePlot)   
                     msg += ' <br/> <p align="center"><input id="killopBtn" type="button" value="Kill process" /></p>';
  
                 var mask = Ext.getBody().mask(msg);
@@ -125,9 +125,10 @@
  
                 if (maskMsg)
                     maskMsg.style.zIndex = '99999';
-                if (tabId)
+                if (interactivePlot)
                 {
-                    var killBtn = Ext.get('killopBtn');
+                    //ToDo - BRE
+                   /* var killBtn = Ext.get('killopBtn');
                     var multiPlotWin =  myDesktopApp.desktop.getWindow(amdaDesktop.InteractivePlotMgr.id);
                     // multiPlotWin was closed - single plot mode                   
                     if (!multiPlotWin) {
@@ -160,7 +161,7 @@
                         },this);  
  
                     },
-                    this);
+                    this);*/
  
                 }
             },
@@ -14,7 +14,8 @@ Ext.define(&#39;amdaDesktop.NewPlotModule&#39;, {
 	requires: [
 	           'amdaUI.NewPlotUI',
 	           'amdaPlotObj.PlotRequestObject',
-	           'amdaModel.NewPlotNode'
+	           'amdaModel.NewPlotNode',
+	           'amdaUI.NewPlotTabResultUI'
 	],
  
 	contentId : 'newPlotUI',
@@ -36,6 +37,8 @@ Ext.define(&#39;amdaDesktop.NewPlotModule&#39;, {
     uiType : 'newPanelPlot',
     helpTitle : 'Help on Plot Module',
  
+    plotResultWindowsManager : new Ext.AbstractManager(),
+    
     /**
      * @override
      */
@@ -57,5 +60,85 @@ Ext.define(&#39;amdaDesktop.NewPlotModule&#39;, {
     getState : function() {            
         //   return Ext.state.Manager.get(this.id + '_form'); 
         return Ext.state.Manager.get('timeinterval'); 
-    }
+    },
+    
+    computeResultWindowSize : function(panelResult)
+	{
+	    var size = panelResult.getImageSize();
+	    size.width  += 30;
+	    size.height += 95;
+	    
+	    return size;
+	},
+    
+    startInteractiveSession : function(session) {
+    	var me = this;
+    	Ext.each(session.result, function (tabResult) {
+    		var winResultId = tabResult.id+"-win";
+    		
+    		var winResult = me.getWindowResult(winResultId);
+    		
+    		var plotTabConfig = {
+					folder   : session.folder,
+					plotFile : tabResult.plot,
+					context  : tabResult.context
+			};
+    		
+    		if (winResult == null) {
+    			//create new result win
+    			var panelResult = new amdaUI.NewPlotTabResultUI(plotTabConfig);
+    		
+    			var size = me.computeResultWindowSize(panelResult);
+    		
+    			var win = myDesktopApp.getDesktop().createWindow({
+    				id    : tabResult.id+"-win",
+    				title : tabResult.id,
+    				width : size.width,
+    				height: size.height,
+    				layout: 'fit',
+    				items : [ 
+    				         panelResult 
+    				],
+    				listeners: {
+    					scope: me,				  
+    					beforeclose: function(win,opt) {
+    						me.plotResultWindowsManager.unregister(win);
+    					}
+    				},
+    				getPanelResult: function() {
+    					return panelResult;
+    				}
+    			});
+    			win.show();
+    			me.plotResultWindowsManager.register(win);
+    		}
+    		else
+    		{
+    			//update result
+    			winResult.getPanelResult().updatePlotImage(plotTabConfig);
+    			//update window size
+    			var size = me.computeResultWindowSize(winResult.getPanelResult());
+    			winResult.setSize(size.width, size.height);
+    			
+    			winResult.toFront();
+    		}
+    	});
+    },
+    
+    closeInteractiveSession : function() {
+    	var me = this;
+    	this.plotResultWindowsManager.each(function (key, value, length) {
+    		value.close();
+    		me.plotResultWindowsManager.unregister(value);
+    	});
+    },
+    
+    updateInteractiveSession : function() {
+    	
+    },
+    
+    getWindowResult: function(winResultId){
+	    if (!this.plotResultWindowsManager.get(winResultId)) return null;
+	    return this.plotResultWindowsManager.get(winResultId);	    
+	}
 });
 \ No newline at end of file
@@ -52,10 +52,10 @@ Ext.define(&#39;amdaModel.ExecutableNode&#39;, {
      */
     realExecute : function() {
  
-        var tabId = this.get('nodeType') == 'request' ? this.get('object').get('tabId') : null; 
+    	var isInteractivePlot = (this.get('nodeType') == 'request') && (this.get('object').get('file-output') == 'INTERACTIVE'); 
  
 	if (!loadMask.isMasked())
-                    loadMask.show(tabId);
+                    loadMask.show(isInteractivePlot);
  
         AmdaAction.execute({nodeType : this.get('nodeType')}, this.get('object').getJsonValues(true), function(res,e){
  
@@ -74,8 +74,16 @@ Ext.define(&#39;amdaModel.ExecutableNode&#39;, {
      		    return;
      	    }
  
-     	    var newobj = this.createJobObject(res);	    
-     	    var newNode = Ext.create(this.get('jobNode'), 
+     	    if (isInteractivePlot)
+     	    {
+     	    	myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.plot.id, true, function (module) {
+     	    		module.startInteractiveSession(res);
+     	    	});
+     	    }
+     	    else
+     	    {
+     	    	var newobj = this.createJobObject(res);	    
+     	    	var newNode = Ext.create(this.get('jobNode'), 
      	    		{
      	    			info : res.info,
      	    			jobType : this.get('nodeType'),
@@ -89,45 +97,25 @@ Ext.define(&#39;amdaModel.ExecutableNode&#39;, {
      	    			leaf : true,
      	    			object : newobj});
  
+     	    	newNode.get('object').on('execute', function() {
+     	    		// Then call the node creation method
+     	    		this.execute(arguments);
+     	    	}, newNode);
  
-     	    newNode.get('object').on('execute', function() {
-                // Then call the node creation method
-                this.execute(arguments);
-            }, newNode);
-     	    
-     	    // new Tab
-     	    switch (res.status)
-     	    {
-     	    case amdaModel.BkgJobNode.STATUS_LIST.DONE :
-     	    	//New tab, non-interactive session
-            	var isInteractive = false;
-            	var isNewTab = true;
-            	if (newobj.get('format') &&  newobj.get('format') == 'PNG')
-            	{
-            		isInteractive = true;
-            		//TODO each new plot create new BkgJobNode => delete old!!! 			      
-            		// plot window (1-5) 			       
-            		//      newNode.set('tabId', this.get('object').get('tabId'));
-	      
-            		// if it is plot for TimeTable	      
-            		if (res.tableName) {				 
-            			newobj.set('intervalN', res.intervalN); 
-            			newobj.set('totalN', res.totalN);
-            			newobj.set('ttName', res.tableName); 
-            		}  
-            	}
-            	
-            	if (!isInteractive)
-            		newNode.createJobNode(true);
-                newNode.editNode(isNewTab, isInteractive);
-                break;
-     	    case amdaModel.BkgJobNode.STATUS_LIST.IN_PROGRESS :
-     	    	newNode.createJobNode(false);
-     	    	break;
-     	    default:
-     	    	newNode.createJobNode(true);
+     	    	switch (res.status)
+     	    	{
+     	    	case amdaModel.BkgJobNode.STATUS_LIST.DONE :
+     	    		newNode.createJobNode(true);
+     	    		newNode.editNode(isNewTab, isInteractive);
+     	    		break;
+     	    	case amdaModel.BkgJobNode.STATUS_LIST.IN_PROGRESS :
+     	    		newNode.createJobNode(false);
+     	    		break;
+     	    	default:
+     	    		newNode.createJobNode(true);
+     	    	}
      	    }
-         }, this );
+        }, this );
     },  
  
     createJobObject: function(res) {
@@ -0,0 +1,119 @@
+/**
+ * Project   : AMDA-NG
+ * Name      : NewPlotTabResultUI.js
+ * @class    amdaUI.NewPlotTabResultUI
+ * @extends  Ext. panel.Panel
+ * @brief    Plot Tab Result UI definition (View)
+ * @author    
+ * @version  $Id: NewPlotTabResultUI.js benjamin $
+ ********************************************************************************
+ *    FT Id     :   Date   : Name - Description
+ *******************************************************************************
+ *              
+ */
+
+Ext.define('amdaUI.NewPlotTabResultUI', {
+    extend: 'Ext.panel.Panel',
+ 
+    alias: 'widget.newPlotTabResult',
+
+    requires: [
+        'amdaUI.InteractiveIntervalPlugin'
+    ],
+    
+    isPortrait : false,
+    pageWidth  : 0,
+    pageHeight : 0,
+    
+    constructor: function(config) {
+        this.addEvents({'pagesize':true});
+        
+        this.init(config);	 
+        this.callParent(arguments);	 
+    },  
+    
+    getImageSize : function() {
+    	var size =  {
+    			width  : this.pageWidth * this.sliderPage.getValue()/100.,
+    			height : this.pageHeight * this.sliderPage.getValue()/100.
+	    } 
+    	return size;
+    },
+    
+    getImageUrl: function(resultFolder, plotFile) {
+    	return 'data/'+sessionID +'/RES/'+resultFolder+ '/' + plotFile;
+    },
+    
+    createPlotImage: function(resultFolder, plotFile, context) {
+    	var size = this.getImageSize();
+    	this.panelImage = Ext.create('Ext.Img', {
+            src    : this.getImageUrl(resultFolder, plotFile),
+            width  : size.width,
+            height : size.height,
+            refreshMe : function(){
+            	var el;
+            	if(el = this.el){
+            		el.dom.src = this.src + '?dc=' + new Date().getTime();
+                }
+             },
+             listeners : {
+                render :  function(){
+                	this.refreshMe();
+                }
+             }
+        });
+
+        return this.panelImage;
+    },
+    
+    updatePlotImage: function(configResult) {
+    	this.isPortrait = configResult.context.page.portrait;
+    	this.pageWidth  = configResult.context.page.width;
+    	this.pageHeight = configResult.context.page.height;
+    	
+    	this.panelImage.setSrc(this.getImageUrl(configResult.folder, configResult.plotFile));
+    	
+    	var size = this.getImageSize();
+    	this.panelImage.setSize(size.width, size.height);
+    	
+    	this.panelImage.refreshMe();
+    },
+    
+    init: function(configResult){
+    	this.isPortrait = configResult.context.page.portrait;
+    	this.pageWidth  = configResult.context.page.width;
+    	this.pageHeight = configResult.context.page.height;
+    	
+    	this.sliderPage = new Ext.slider.Single({
+            width: 130,
+            value: 75,
+            increment: 5,
+            minValue: 50,
+            maxValue: 100,
+            fieldLabel : 'Resize',
+            labelWidth : 40,
+            listeners: {
+        		scope : this,
+                changecomplete: function(s, v)
+                {
+        			//ToDo - this.resetMire();
+        			var size = this.getImageSize();	 
+        			this.panelImage.width  = size.width;
+        			this.panelImage.height = size.height;
+        			this.panelImage.doComponentLayout();
+        			this.fireEvent('pagesize',this,v);
+                }
+            }
+        });
+    	
+    	var newPlotResultTabPanelConfig = {
+    			preventHeader : true,
+                autoScroll: true,       
+                items: [
+                        this.createPlotImage(configResult.folder, configResult.plotFile, configResult.context)
+                ]
+    	};
+            
+    	Ext.apply(this , newPlotResultTabPanelConfig);	
+    }
+});
 \ No newline at end of file
@@ -62,6 +62,10 @@ Ext.define(&#39;amdaUI.NewPlotUI&#39;, {
 	 * @return false
 	 */	
 	fclose : function() {
+		myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.plot.id, true, function (module) {
+			module.closeInteractiveSession();
+		});
+		
 		return false;
 	},