Merge branch 'master' of https://gitlab.irap.omp.eu/CDPP/AMDA_IHM

Benjamin Renard
2 parents a971060f d0a99d97
Showing 10 changed files with 576 additions and 11 deletions Show diff stats
help/visuHOWTO
js/app/AmdaApp.js
js/app/controllers/VisuModule.js
js/app/models/CatalogNode.js
js/app/models/TimeTableNode.js
js/app/views/ExplorerUI.js
js/app/views/VisuUI.js
php/classes/AmdaAction.php
php/classes/CatalogMgr.php
php/config.php
@@ -0,0 +1,3 @@
+TBD
+
+
@@ -20,6 +20,13 @@ Ext.define(&#39;amdaApp.AmdaApp&#39;, {
     ],
  
     dynamicModules: {
+	visu : {
+    		id          : 'visu-win',
+    		icon        : 'icon-visu_catalog',
+    		title       : 'Visualization',
+    		source      : 'amdaDesktop.VisuModule',
+    		useLauncher : true
+    	},    
 	statistics : {
     		id          : 'statistics-win',
     		icon        : 'icon-statistics',
@@ -57,7 +64,7 @@ Ext.define(&#39;amdaApp.AmdaApp&#39;, {
     	},
     	plot : {
             id          : 'plot-win',
-    	    icon        : 'icon-plot',
+    	    icon         : 'icon-plot',
     	    title       : 'Plot Manager',
     	    source      : 'amdaDesktop.PlotModule',
     	    useLauncher : true
@@ -281,7 +288,7 @@ Ext.define(&#39;amdaApp.AmdaApp&#39;, {
                    { name: 'Manage TimeTables',    iconCls: 'timeTable', module: 'timetab-win' },
                    { name: 'TimeTables operations',   iconCls: 'operations', module: 'ttsOpe-win' },
                    { name: 'Manage catalogs',  iconCls: 'catalog', module: 'catalog-win'},
-                   { name: 'Visualize catalogs',  iconCls: 'visu_catalog', module: 'visucatalog-win'},
+                   { name: 'Visualize catalogs',  iconCls: 'visu_catalog', module: 'visu-win'},
                    { name: 'Interoperability',   iconCls: 'interop', module: 'interop-win' }
                ]
             }),
@@ -0,0 +1,35 @@
+/**
+ * Project   AMDA-NG
+ * Name      VisuModule.js
+ * @class    amdaDesktop.VisuModule
+ * @extends  amdaDesktop.InteractiveModule
+ * @brief    Visualization Module controller definition 
+ * @author   elena
+ */
+
+Ext.define('amdaDesktop.VisuModule', {
+	extend: 'amdaDesktop.InteractiveModule',
+	
+	 requires: [
+         'amdaUI.VisuUI'
+     ],
+     
+      contentId : 'visuUI',
+      
+    /**
+     * @cfg {String} data models
+     * @required
+     */
+	nodeDataModel : 'amdaModel.CatalogNode', //  'amdaModel.MyDataNode'
+	
+    /**
+     * @cfg {String} window definitions
+     * @required
+     */
+	width : 800,
+	height: 700,
+	uiType : 'panelVisu',
+	helpTitle : 'Help on Visualization Module',
+	helpFile : 'visuHelp'
+		
+});
@@ -38,11 +38,11 @@ Ext.define(&#39;amdaModel.CatalogNode&#39;, {
             fnId : 'leaf-download',
             text : 'Download '+ this.self.objectName,
             hidden : true
-        }/*,{
-            fnId : 'leaf-operations',
-            text : 'Operations',
+        },{
+            fnId : 'leaf-visu',
+            text : 'Visualize '+ this.self.objectName,
             hidden : true
-        }*/];
+        }];
  
         return menuItems;
     },
@@ -69,5 +69,16 @@ Ext.define(&#39;amdaModel.CatalogNode&#39;, {
  
      downloadMulti: function() { 
 	    alert('NOT IMPLEMENTED YET');
+    },
+    
+    visu : function(contextNode) { 
+	    
+	var me = this;
+	 
+       myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.visu.id, true, function (module) {	 	 
+		// Opening parameter window     
+		module.createWindow();
+		module.getUiContent().setObject(me.get('text'), me.get('id'));
+        });
     }
 });
@@ -117,6 +117,10 @@ Ext.define(&#39;amdaModel.TimeTableNode&#39;, {
 	    case 'operationsMulti':
 	        this.operationsMulti();
 	        break;
+	   
+	    case 'visu':
+	        this.visu();
+	        break;
  
 	    default:
 	        break;
@@ -353,7 +353,9 @@ Ext.define(&#39;amdaUI.ExplorerUI&#39;, {
                         switch (targetNode.data.nodeType)
                         {
                         case 'localParam' :
-                        case 'myData' :
+			   case 'remoteParam' :
+			   case 'remoteSimuParam' :	   
+                        case 'myData' :	   
                             return false;
                         default :
                                 if (draggedRecord.data.id == targetNode.data.nodeType+'-treeRootNode')
@@ -0,0 +1,413 @@
+/**
+ * Project       AMDA-NG
+ * Name          VisuUI.js
+ * @class 	   amdaUI.visuUI
+ * @extends      Ext.container.Container
+ * @brief	   Visualization Module UI definition (View)
+ * @author 	 elena
+ */
+
+Ext.define('amdaUI.VisuUI', {
+	extend: 'Ext.container.Container',
+	alias: 'widget.panelVisu',
+
+	constructor: function(config) 
+	{
+		this.init(config);
+		this.callParent(arguments);
+		 
+		//if (this.object) this.loadObject();	         
+	},
+	
+	setObject : function (name,id) 
+	{
+		// set object
+		this.object.set('id',id);
+		this.object.set('name',name);
+		// load object into view
+		this.loadObject();
+	},
+	
+	/**
+	 * set params description into this.object
+	 */
+	setParamInfo : function(parameters) 
+	{
+		var params = [];
+		Ext.Array.each(parameters, function(item, index) {
+			params[index] = item;	     	  
+		}, this);
+		
+		this.object.set('parameters', params);	  
+	},	
+	
+	updateCount : function() 
+	{
+// 		this.object.set('nbIntervals',this.TTGrid.getStore().getTotalCount());		
+// 		this.formPanel.getForm().findField('nbIntervals').setValue(this.object.get('nbIntervals'));
+	},
+	
+	/**
+	 * load object catalog into this view
+	 */
+	loadObject : function()
+	{ 	  
+		// load object into form
+						 		 		
+		var me = this;
+		
+		var onAfterInit = function(result, e) 
+		{		
+			if (!result || !result.success)
+			{
+				if (result.message)
+					myDesktopApp.errorMsg(result.message);
+				else
+					myDesktopApp.errorMsg('Unknown error during catalog cache initialisation');
+				return;
+			}
+
+									 			 
+			 
+			var fields = [], i = 0, index;
+								
+			Ext.Array.each(result.parameters, function(obj) 
+			{
+				
+				index = 'param'+i.toString();			
+				fields[i] = Ext.create('Ext.data.Field', { name : index, id: index, text : obj.name,
+					convert: function(value, record) {						
+						return parseFloat(value);
+					}
+				}
+				);
+								
+				i++;
+			});
+			
+			var newStore  = Ext.create('Ext.data.Store', {
+				fields : [ 'text', 'id'],
+				data : fields
+			});
+			
+			me.parCombo.bindStore(newStore);
+			me.parCombo1.bindStore(newStore);
+			
+			me.chartStore = Ext.create('Ext.data.Store', {
+				fields : fields, 
+				autoDestroy: false,
+		//				pageSize : 200,
+		//				buffered : true, 
+		//				purgePageCount: 0,
+		//				remoteSort: true,
+				autoload: false,
+				proxy: {
+					type: 'direct',
+					api :
+					{
+						read   :  AmdaAction.readIntervalsForChart
+					},
+					// remplir automatiquement tt, sharedtt , catalog, shared catalog
+					extraParams : {'typeTT' : 'catalog', 'id' : me.object.get('id')},
+					reader:
+					{
+						type: 'json',
+						root: 'intervals',
+						totalProperty : 'totalCount'
+					}
+				},
+				listeners: {
+					scope : me,
+					load: function(store,records) {        
+						//TODO enable plot button
+					}
+				}
+			});
+	 
+			 me.chartStore.load();
+									
+		}
+
+		AmdaAction.initForChartFromTT(this.object.get('id'), 'catalog', onAfterInit);   			          
+	  		
+	},
+	
+	/**
+	 * updated object catalog into this view
+	 */
+	updateObject : function()
+	{ 	  
+		// load object into form
+		//this.formPanel.getForm().loadRecord(this.object);
+				 			
+		var me = this;				   			          
+	  		
+	},
+	
+	/**
+	 * Check if changes were made before closing window 
+	 * @return true if changes
+	 */	
+	fclose : function() 
+	{
+		  
+	return false;
+	},	
+	
+	plotChart : function () {
+		
+		this.chartConfig.store=this.chartStore;
+		
+		var chart =  Ext.create('Ext.chart.Chart', this.chartConfig);
+	//	 chart.bindStore(this.chartStore);
+		var chartPanel =  this.items.items[0].items.items[1];
+		var oldChart = chartPanel.down('chart');
+		oldIndex = chartPanel.items.indexOf(oldChart);
+		chartPanel.remove(oldChart);
+		chartPanel.insert(oldIndex, chart);								 
+	},
+	
+	init : function (config) 
+	{	 
+		var store = Ext.create('Ext.data.Store', {
+			fields      :  [],			
+			autoload    : false
+		});
+		
+		this.chartConfig = {			
+			width: 500,
+			height: 500,
+			animate: true,
+			mask: true,
+			//      theme:'Category2',
+			store: store,
+			axes: [{
+				type: 'Numeric',
+				position: 'bottom',
+				fields: [],
+				title: 'x axe',
+				grid : true
+				}, {
+				type: 'Numeric',
+				position: 'left',
+				fields: [],
+				title: 'y axe',
+				grid: true
+			}],
+			series: [{
+				type: 'scatter',
+		 		markerConfig: {
+		 			radius: 5,
+		 			size: 5
+				},
+		// 		//      axes: ['left', 'bottom'],
+				xField: '',
+				yField: '',
+				label: {
+// 					display: 'under',
+// 					render: function(value) {
+// 						return parseFloat(value);
+// 					}
+				}
+			}]
+		}
+
+		var plotTypeList = Ext.create('Ext.data.Store', {
+			fields: ['type'],
+			data: [
+				{ 'type': 'line'    },
+				{ 'type': 'scatter' } 
+				] 
+		});
+		
+		var parList = Ext.create('Ext.data.Store', {
+			fields: [],
+			autoload    : false
+		});		 
+	
+		var chart = Ext.create('Ext.chart.Chart', this.chartConfig);				
+ 
+		this.parCombo = Ext.create('Ext.form.ComboBox', {
+			emptyText: 'select parameter',
+			editable: false,
+			store: parList,
+			queryMode: 'local',
+			displayField: 'text',
+			valueField: 'id',
+			listeners : {
+				scope : this,
+				change : function(combo, newValue, oldValue) {
+					
+					this.chartConfig.axes[0].fields = [newValue];
+					var rec = combo.findRecordByValue(newValue);
+					this.chartConfig.axes[0].title = rec.get('text'); 
+					this.chartConfig.series[0].xField = newValue;
+				}
+			}
+		});
+                   
+		this.parCombo1 = Ext.create('Ext.form.ComboBox', {
+			emptyText: 'select parameter',
+			editable: false,
+			store: parList,
+			queryMode: 'local',
+			displayField: 'text',
+			valueField: 'id',
+			listeners : {
+				scope : this,
+				change : function(combo, newValue, oldValue) {
+					
+					this.chartConfig.axes[1].fields = [newValue];
+					var rec = combo.findRecordByValue(newValue);
+					this.chartConfig.axes[1].title = rec.get('text'); 
+					this.chartConfig.series[0].yField = newValue;
+				}
+			}
+		}); 
+		
+		var plotTypeCombo = Ext.create('Ext.form.ComboBox', {
+			emptyText: 'select plot type',
+			editable: false,
+			store: plotTypeList,
+			queryMode: 'local',
+			displayField: 'type',
+			valueField: 'type',
+			listeners : {
+				scope : this,
+				change : function(combo, newValue, oldValue) {						 
+					this.chartConfig.series[0].type = newValue;
+				}
+			}
+		}); 	 
+		 
+		 
+		var formPanel =  Ext.create('Ext.form.Panel', { 
+			region : 'center',
+			layout:  'hbox', 
+			bodyStyle: {background : '#dfe8f6'},
+			defaults: { border : false, align: 'stretch',  padding: '3'},
+			fieldDefaults: { labelWidth: 80, labelAlign : 'top' },
+			items: [ 
+				{            
+				xtype: 'form',
+				flex : 1,
+				bodyStyle: {background : '#dfe8f6'}, 
+				items: [
+				{ 
+					xtype : 'fieldset',
+					title : 'X axis',
+					items : [ 
+							this.parCombo,          
+							{ 
+								xtype : 'fieldcontainer',
+								layout: 'hbox',
+								items: [{
+								xtype: 'textfield',
+								flex: 1
+								}, {
+								xtype: 'splitter'
+								}, {
+								xtype: 'textfield',
+								flex: 1
+							}]
+						},
+						{ xtype : 'checkbox' },
+						{ xtype : 'checkbox' }
+					]
+				},
+				{ 
+					xtype : 'fieldset',
+					title : 'Y axis',
+					items : [
+						this.parCombo1,                   
+						{ 
+						xtype : 'fieldcontainer',
+						layout: 'hbox',
+						items: [{
+							xtype: 'textfield',
+							flex: 1
+							}, {
+							xtype: 'splitter'
+							}, {
+							xtype: 'textfield',
+							flex: 1
+							}                                
+						]
+					},
+					{ xtype : 'checkbox' },
+					{ xtype : 'checkbox' }
+					]
+				},
+				{ 
+					xtype : 'fieldset',
+					title : 'Plotting Options',
+				       items : [
+						plotTypeCombo
+						]
+				}
+				],
+				fbar:[
+					{   
+						type: 'button',
+						text: 'Plot',
+						scope : this,
+						handler: this.plotChart
+						
+					},{   
+						type: 'button',
+						text: 'Reset'
+					
+					}
+				]
+				}, {
+				xtype: 'form',		               
+		//		    padding: '3',
+				flex: 2,
+				items : [
+					chart
+					],
+			fbar:[
+				{   
+				type: 'button',
+				text: 'Save Chart',
+				scope: this,
+				handler: function() {
+					var chartPanel =  this.items.items[0].items.items[1];
+					var chart = chartPanel.down('chart');
+					chart.save({
+						type: 'image/png'
+					});
+				}
+				
+				}
+			]
+			}    
+		]  
+		}); 
+		
+	
+		var myConf = {
+			layout: 'border',
+			items: [		   
+				formPanel, 		     
+				{
+				xtype: 'panel', 
+				region: 'south',
+				title: 'Information',
+				collapsible: true,
+				height: 100,
+				autoHide: false,
+				bodyStyle: 'padding:5px',
+				iconCls:  'icon-information',
+				loader: {
+					autoLoad: true,
+					url: helpDir+'visuHOWTO'
+				} 
+				}
+			] 
+		};
+	    
+		Ext.apply (this, Ext.apply(arguments, myConf));	
+    }
+	 
+});	
@@ -954,6 +954,14 @@ class AmdaAction {
         	return $cacheMgr->initFromTT($id, $type);
         }
  
+        public function initForChartFromTT($id, $type)
+        {
+        	if ($type == 'catalog') $objMgr = new CatalogMgr();
+        	 
+        	
+        	return $objMgr->initForChartFromTT($id, $type);
+        }
+        
         public function initTTCacheFromTmpObject($folderId, $name, $isCatalog = false)
         {
 			if (!$isCatalog) $cacheMgr = new TimeTableCacheMgr();
@@ -978,7 +986,15 @@ class AmdaAction {
  
         	return $cacheMgr->getIntervals($o->start,$o->limit,$o->sort,$o->filter);
         }
-    
+        
+	 public function readIntervalsForChart($o)
+        {
+        	if ($o->typeTT == 'catalog') $objMgr = new CatalogMgr();
+        	 
+        	
+        	return $objMgr->getIntervalsForChart($o->id, $o->typeTT);
+        }
+        
         public function saveTTCacheIntervalsInTT($o)
         {
         	$cacheMgr = new TimeTableCacheMgr();
@@ -249,6 +249,74 @@ class CatalogMgr extends TimeTableMgr {
  
 	}
  
+	public function initForChartFromTT($id, $typeTT) 
+	{
+	       $intervals_res = $this->loadIntervalsFromTT($id,$typeTT);
+		
+		if (!$intervals_res['success'])
+			return $intervals_res;
+
+		$paramHeaders = [];
+		
+		foreach ( $intervals_res['parameters'] as $param ) {
+		 
+		  if ($param['size'] > 1) {
+		  
+			for ($i = 0; $i < $param['size']; $i++) {
+				$paramComp = array();
+				$paramComp['id'] = $param['id'].'_'.$i;
+				$paramComp['name'] = $param['name'].'_'.$i;
+			//	$paramComp['size'] = 1;
+				
+				$paramHeaders[] = $paramComp;
+			}
+		  }
+		  else {
+		       $paramHeaders[] = $param;    
+		  }
+		}
+			
+		unset($intervals_res);
+		 
+		return array('success' => true, 'parameters' => $paramHeaders);
+	}
+	
+	public function getIntervalsForChart($id, $type) {
+		
+		$intervals_res = $this->loadIntervalsFromTT($id,$type);  
+		
+		if (!$intervals_res['success'])
+			return $intervals_res;
+			
+		$newIntervals = array();
+		 
+		foreach ($intervals_res['intervals'] as $interval)
+		{
+			$newIntervalComp = array();
+			$k = 0;
+			
+			for ( $j = 0; $j < count($interval['paramTable']); $j++ ) {
+			 
+				$param = $interval['paramTable'][$j];
+				$tempArr = explode(',',$param);
+
+				if (count($tempArr) > 1) {
+					for ($i = 0; $i < count($tempArr); $i++) {
+						$newIntervalComp['param'.$k] = $tempArr[$i];
+						$k++;						
+					}					 
+				} 
+				else {
+				       $newIntervalComp['param'.$k] = $param;
+					$k++; 
+				}
+			}
+			$newIntervals[] = $newIntervalComp; 
+		}
+		
+		return array('success' => true, 'intervals' => $newIntervals);
+			
+	}
  
 }
 ?>
@@ -241,9 +241,9 @@ $API = array(
 	      'modifyObject'=>array(
 		  'len'=>1
 	      ),
-      'validNameObject'=>array(
-  'len'=>1
-      ),
+		'validNameObject'=>array(
+			'len'=>1
+		),
 	      'getJobs'=>array(
 		  'len'=>0
 	      ),
@@ -278,6 +278,9 @@ $API = array(
 		'initTTCacheFromTT' => array(
 		'len'=>2
 		),
+		'initForChartFromTT' => array(
+		'len'=>2
+		),
 		'initTTCacheFromTmpObject' => array(
 		'len'=>3
 		),
@@ -287,6 +290,9 @@ $API = array(
 		'readTTCacheIntervals'=>array(
 		'len'=>1
 		),
+		'readIntervalsForChart'=>array(
+		'len'=>1
+		),
 		'addTTCacheInterval'=>array (
 		'len'=>1
 		),