Fix catalog visu

Benjamin Renard
1 parent d7edb1cf
Showing 4 changed files with 165 additions and 152 deletions Show diff stats
js/app/views/VisuUI.js
php/classes/AmdaAction.php
php/classes/CatalogMgr.php
php/config.php
@@ -9,32 +9,32 @@
  
 Ext.define('amdaUI.VisuUI', {
 	extend: 'Ext.container.Container',
-	alias: 'widget.panelVisu', 
-	
+	alias: 'widget.panelVisu',
+
 	constructor: function(config) {
 		this.init(config);
-		this.callParent(arguments);	
+		this.callParent(arguments);
 		if (this.object) this.reformObject();
 	},
-	
-	setObject : function (obj) {		
+
+	setObject : function (obj) {
 		this.object = obj;
 		this.reformObject();
 	},
-	
-	updateObject : function () {	
+
+	updateObject : function () {
 		 return true;
 	},
-	
+
 	reformObject : function () {
-		this.fromPlugin = this.object.get('fromPlugin');	
-		
+		this.fromPlugin = this.object.get('fromPlugin');
+
 		if (this.fromPlugin) {
 			if (this.object.get('folderId') == '')
 				this.object.set('id','cacheCat');
 			else
 				this.object.set('id',this.object.get('folderId'));
-			
+
 			this.object.set('objName',this.object.get('objName'));
 		}
 		else {
@@ -45,7 +45,7 @@ Ext.define(&#39;amdaUI.VisuUI&#39;, {
 		if (this.object.get('id') != '')
 				this.loadObject();
 	},
-		 	
+
 	reset : function() {
 		//reset all fieldsets except the first one (name, intervals)
 		var form = this.items.items[0].items.items[0];
@@ -55,22 +55,22 @@ Ext.define(&#39;amdaUI.VisuUI&#39;, {
 				field.reset();
 			});
 		}
-		this.resetChart();                    
+		this.resetChart();
 	},
-	
+
 	/**
 	 * load object catalog into this view
 	 */
 	loadObject : function()
-	{     
+	{
 		var me = this;
-		
-		var onAfterInit = function(result, e) 
+
+		var onAfterInit = function(result, e)
 		{
-			if (!result) {			
+			if (!result) {
 				myDesktopApp.errorMsg(e.message);
 				Ext.defer(function(){Ext.Msg.toFront()},10);
-				
+
 				return;
 			}
 			else if (!result.success)
@@ -81,61 +81,61 @@ Ext.define(&#39;amdaUI.VisuUI&#39;, {
 					myDesktopApp.errorMsg('Unknown error during catalog cache initialisation');
  
 				Ext.defer(function(){Ext.Msg.toFront()},10);
-				
+
 				return;
 			}
-			
+
 			var fields = [], i = 0, index;
  
 			if (!result.cache) {
 				me.object.set('name', result.name);
 				me.object.set('nbIntervals', result.totalCount);
-				
+
 				var params = [];
 				Ext.Array.each(result.parameters, function(item, index) {
-					params[index] = item;	     	  
+					params[index] = item;
 				}, this);
-		
-				me.object.set('parameters', params);	  	
+
+				me.object.set('parameters', params);
 			}
 			else {
 				fields[0] = Ext.create('Ext.data.Field', { name : 'start', id: 'start', text : 'start: date' });
 				fields[1] = Ext.create('Ext.data.Field', { name : 'stop',  id: 'stop',  text : 'stop: date' });
 				i = 2;
-			} 
-			
+			}
+
 			Ext.Array.each(me.object.get('parameters'), function(obj) {
 				index = 'param'+i.toString();
 				if (obj.type == 2) {
 					fields[i] = Ext.create('Ext.data.Field', { name : index, id: index, text : obj.name + ': string' });
-					 
+
 				}
 				else if (obj.type == 1){
 					fields[i] = Ext.create('Ext.data.Field', { name : index, id: index, text : obj.name + ': date' });
 				}
 				else {
 					fields[i] = Ext.create('Ext.data.Field', { name : index, id: index, text : obj.name,
-						convert: function(value, record) {						
+						convert: function(value, record) {
 							return parseFloat(value);
 						}
 					});
 				}
 				i++;
 			});
-			
-			if (me.chartStore) {				 
+
+			if (me.chartStore) {
 				me.parList.removeAll();
 				me.reset();
 				me.chartStore = null;
 			}
-			
+
 			me.parList.add(fields);
-			
+
 			me.chartStore = Ext.create('Ext.data.Store', {
-				fields : fields,				
+				fields : fields,
 		//		autoDestroy: false,
 		//		pageSize : 200,
-		//		buffered : true, 
+		//		buffered : true,
 		//		purgePageCount: 0,
 		//		remoteSort: true,
 				autoload: false,
@@ -146,7 +146,7 @@ Ext.define(&#39;amdaUI.VisuUI&#39;, {
 						read   :  AmdaAction.readIntervalsForChart
 					},
 					// remplir automatiquement tt, sharedtt , catalog, shared catalog
-					extraParams : {'typeTT' : 'catalog', 'id' : me.object.get('id'), 
+					extraParams : {'typeTT' : 'catalog', 'id' : me.object.get('id'),
 						         'name' : me.object.get('objName'), 'fromPlugin' : me.fromPlugin},
 					reader:
 					{
@@ -157,7 +157,7 @@ Ext.define(&#39;amdaUI.VisuUI&#39;, {
 				},
 				listeners: {
 					scope : me,
-					load: function(store,records) {        
+					load: function(store,records) {
 						//TODO enable plot button
 						// me.object.set('nbIntervals',me.chartStore.getTotalCount());
  
@@ -167,25 +167,25 @@ Ext.define(&#39;amdaUI.VisuUI&#39;, {
 					}
 				}
 			});
-			
-			me.chartStore.load();			 
+
+			me.chartStore.load();
 		}
  
-		AmdaAction.initForChart(this.object.get('id'), this.object.get('objName'), this.fromPlugin, 'catalog', onAfterInit);	
+		AmdaAction.initForChart(this.object.get('id'), this.object.get('folderId'), this.object.get('objName'), this.fromPlugin, 'catalog', onAfterInit);
 	},
-	
-	
+
+
 	/**
-	 * Check if changes were made before closing window 
+	 * Check if changes were made before closing window
 	 * @return true if changes
-	 */	
-	fclose : function() 
-	{  
+	 */
+	fclose : function()
+	{
 		return false;
 	},
  
 	resetChart : function () {
-		
+
 		var emptyAxesConfig =   [{
 			type: 'Numeric',
 			position: 'bottom',
@@ -199,32 +199,32 @@ Ext.define(&#39;amdaUI.VisuUI&#39;, {
 			title: 'Y axis',
 			grid: true
 		}];
-		
+
 		this.chartConfig.series[0].xField = '';
 		this.chartConfig.series[0].yField = '';
-		
+
 		this.chartConfig.theme = 'Blue';
-		
-		this.chartConfig.axes = emptyAxesConfig; 
-		 
-		var chart =  Ext.create('Ext.chart.Chart', this.chartConfig);		
+
+		this.chartConfig.axes = emptyAxesConfig;
+
+		var chart =  Ext.create('Ext.chart.Chart', this.chartConfig);
 		this.replaceChart(chart);
-										 
+
 	},
-	
+
 	plotChart : function () {
-		
-		this.chartConfig.store = this.chartStore;	
-		
-		var xTitle = this.items.items[0].items.items[0].items.items[1].items.items[2].getValue(); 
-		var yTitle = this.items.items[0].items.items[0].items.items[2].items.items[2].getValue(); 
-		
+
+		this.chartConfig.store = this.chartStore;
+
+		var xTitle = this.items.items[0].items.items[0].items.items[1].items.items[2].getValue();
+		var yTitle = this.items.items[0].items.items[0].items.items[2].items.items[2].getValue();
+
 		if (xTitle) this.chartConfig.axes[0].title = xTitle;
 		if (xTitle) this.chartConfig.axes[1].title = yTitle;
-	    
+
 		// axis modifs
 		if (this.comboXrange.getValue() == 'manual') {
-			var minX = this.comboXrange.next().next().getValue();			
+			var minX = this.comboXrange.next().next().getValue();
 			var maxX = this.comboXrange.next().next().next().next().getValue();
 			this.chartConfig.axes[0].minimum = minX;
 			this.chartConfig.axes[0].maximum = maxX ;
@@ -239,39 +239,39 @@ Ext.define(&#39;amdaUI.VisuUI&#39;, {
 		//	if (minX && maxX) {
 			this.chartConfig.axes[1].minimum = minX;
 			this.chartConfig.axes[1].maximum = maxX;
-		//	}						
+		//	}
 		} else {
 			// unset min/max in config
 			delete this.chartConfig.axes[1].minimum;
 			delete this.chartConfig.axes[1].maximum;
 		}
-		
-		var chart =  Ext.create('Ext.chart.Chart', this.chartConfig);	
-					 
-		this.replaceChart(chart); 
+
+		var chart =  Ext.create('Ext.chart.Chart', this.chartConfig);
+
+		this.replaceChart(chart);
 	},
-	   
-	replaceChart: function(chart) {	
+
+	replaceChart: function(chart) {
 		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);	
+		chartPanel.insert(oldIndex, chart);
 	},
-	
-	init : function (config) 
-	{	 
+
+	init : function (config)
+	{
 		var store = Ext.create('Ext.data.Store', {
-			fields      :  [],			
+			fields      :  [],
 			autoload    : false
 		});
-		
+
 		var rangeStore = Ext.create('Ext.data.Store', {
-			fields      :  [],			
+			fields      :  [],
 			autoload    : false
 		});
-		
-		this.chartConfig = {			
+
+		this.chartConfig = {
 			width: 500,
 			height: 500,
 			animate: false,
@@ -316,19 +316,19 @@ Ext.define(&#39;amdaUI.VisuUI&#39;, {
 					height: 20,
 					hideDelay: 100, //200 ms
 					mouseOffset: [0,0],   //[15,18]
-					renderer: function(storeItem, item) {						
+					renderer: function(storeItem, item) {
 						this.setTitle(storeItem.index + 1);
 					}
 				}
 			}]
 		}
-		
+
 		this.parList  = Ext.create('Ext.data.Store', {
-				fields : [ 'text', 'id']	
+				fields : [ 'text', 'id']
 			});
-		
-		var chart = Ext.create('Ext.chart.Chart', this.chartConfig);				
- 
+
+		var chart = Ext.create('Ext.chart.Chart', this.chartConfig);
+
 		this.parCombo = Ext.create('Ext.form.ComboBox', {
 			emptyText: 'select parameter',
 			editable: false,
@@ -336,21 +336,21 @@ Ext.define(&#39;amdaUI.VisuUI&#39;, {
 			queryMode: 'local',
 			displayField: 'text',
 			valueField: 'id',
-			// tpl:'<tpl for="."><div ext:qtip="{qtip}" class="x-combo-list-item">{Name}</div></tpl>', 
+			// tpl:'<tpl for="."><div ext:qtip="{qtip}" class="x-combo-list-item">{Name}</div></tpl>',
 			listeners : {
 				scope : this,
 				change : function(combo, newValue, oldValue) {
 					if (newValue) {
 						this.chartConfig.axes[0].fields = [newValue];
 						var rec = combo.findRecordByValue(newValue);
-						
-						this.chartConfig.axes[0].title = rec.get('text'); 
+
+						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,
@@ -361,16 +361,16 @@ Ext.define(&#39;amdaUI.VisuUI&#39;, {
 			listeners : {
 				scope : this,
 				change : function(combo, newValue, oldValue) {
-					if (newValue) {						
+					if (newValue) {
 						this.chartConfig.axes[1].fields = [newValue];
 						var rec = combo.findRecordByValue(newValue);
-						this.chartConfig.axes[1].title = rec.get('text'); 
+						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,
@@ -380,12 +380,12 @@ Ext.define(&#39;amdaUI.VisuUI&#39;, {
 			value: 'scatter',
 			listeners : {
 				scope : this,
-				change : function(combo, newValue, oldValue) {						 
+				change : function(combo, newValue, oldValue) {
 					this.chartConfig.series[0].type = newValue;
 				}
 			}
-		}); 
-		
+		});
+
 		var plotThemeCombo = Ext.create('Ext.form.ComboBox', {
 			emptyText: 'select theme',
 			editable: false,
@@ -396,12 +396,12 @@ Ext.define(&#39;amdaUI.VisuUI&#39;, {
 			value: 'Blue',
 			listeners : {
 				scope : this,
-				change : function(combo, newValue, oldValue) {						 
+				change : function(combo, newValue, oldValue) {
 					this.chartConfig.theme = newValue;
 				}
 			}
 		});
-		
+
 		var comboRangeConfig = {
 		//	fieldLabel:'X Range',
 			name:'scaling',
@@ -413,48 +413,48 @@ Ext.define(&#39;amdaUI.VisuUI&#39;, {
 			width: 80,
 			listeners : {
 				scope : this,
-				change : function(combo, newValue, oldValue) {					
+				change : function(combo, newValue, oldValue) {
 					var minValue = combo.next().next();
 					var maxValue  = minValue.next().next();
 					var disabled = newValue == "auto";
 					minValue.reset();
 					maxValue.reset();
-					minValue.setDisabled(disabled);										  
-					maxValue.setDisabled(disabled);	  										  
+					minValue.setDisabled(disabled);
+					maxValue.setDisabled(disabled);
 				}
 			}
 		};
-		
+
 		this.comboXrange = Ext.create('Ext.form.ComboBox', comboRangeConfig);
 		this.comboYrange = Ext.create('Ext.form.ComboBox', comboRangeConfig);
-		
-		var formPanel =  Ext.create('Ext.form.Panel', { 
+
+		var formPanel =  Ext.create('Ext.form.Panel', {
 			region : 'center',
-			layout:  'hbox', 
+			layout:  'hbox',
 			bodyStyle: {background : '#dfe8f6'},
 			defaults: { border : false, align: 'stretch',  padding: '3'},
 			fieldDefaults: { labelWidth: 80, labelAlign : 'top' },
-			items: [ {            
+			items: [ {
 				xtype: 'form',
 				flex : 1,
-				bodyStyle: {background : '#dfe8f6'}, 
-				items: [{ 
-						xtype : 'fieldset',				    
+				bodyStyle: {background : '#dfe8f6'},
+				items: [{
+						xtype : 'fieldset',
 						items : [{
 							xtype: 'fieldcontainer',
-							layout: 'hbox',		      
+							layout: 'hbox',
 							items: [
-								{ xtype:'textfield', fieldLabel: 'Catalog Name', name: 'name', readOnly: true}, 		  
-								{ xtype: 'splitter' },			 			 
+								{ xtype:'textfield', fieldLabel: 'Catalog Name', name: 'name', readOnly: true},
+								{ xtype: 'splitter' },
 								{ xtype:'textfield', fieldLabel: 'Intervals', name: 'nbIntervals', readOnly: true}
-							]                                                                       
+							]
 						}]
-					},{ 
+					},{
 						xtype : 'fieldset',
 						title : 'X axis',
-						items : [ 
-							this.parCombo,          
-							{ 
+						items : [
+							this.parCombo,
+							{
 								xtype : 'fieldcontainer',
 								layout: 'hbox',
 								items: [{
@@ -462,8 +462,8 @@ Ext.define(&#39;amdaUI.VisuUI&#39;, {
 								title: 'X Range',
 								border: false,
 								layout: 'hbox',
-								items: [ 
-									this.comboXrange, 
+								items: [
+									this.comboXrange,
 									{
 										xtype: 'splitter'
 									}, {
@@ -484,12 +484,12 @@ Ext.define(&#39;amdaUI.VisuUI&#39;, {
 // 							{ xtype : 'checkbox', boxLabel: 'Logarithmic'},
 							{ xtype: 'textfield', fieldLabel: 'X title', name: 'xtitle'}
 						]
-					},{ 
+					},{
 						xtype : 'fieldset',
 						title : 'Y axis',
 						items : [
-							this.parCombo1,                   
-							{ 
+							this.parCombo1,
+							{
 								xtype : 'fieldcontainer',
 								layout: 'hbox',
 								items: [{
@@ -497,8 +497,8 @@ Ext.define(&#39;amdaUI.VisuUI&#39;, {
 									title: 'Y Range',
 									border: false,
 									layout: 'hbox',
-									items: [ 
-										this.comboYrange, 
+									items: [
+										this.comboYrange,
 										{
 											xtype: 'splitter'
 										}, {
@@ -514,20 +514,20 @@ Ext.define(&#39;amdaUI.VisuUI&#39;, {
 											width: 50,
 											disabled: true
 									}]
-								}] 
+								}]
 							},
 // 						{ xtype : 'checkbox', boxLabel: 'Logarithmic',
 // 						listeners: {
 // 							scope: this,
 // 							change : function( check, newValue, oldValue) {
-// 								
+//
 // 							}
 // 						}
 // 						},
 							{ xtype: 'textfield', fieldLabel: 'Y title', name: 'ytitle'}
 						]
 					},
-						{ 
+						{
 							xtype : 'fieldset',
 							title : 'Plotting Options',
 							items : [
@@ -536,26 +536,26 @@ Ext.define(&#39;amdaUI.VisuUI&#39;, {
 								]
 							}
 						],
-						fbar:[{   
+						fbar:[{
 							type: 'button',
 							text: 'Plot',
 							scope : this,
 							handler: this.plotChart
-							
-						},{   
+
+						},{
 							type: 'button',
 							text: 'Reset',
 							scope : this,
 							handler: this.reset
-						
+
 						}]
 					}, {
-						xtype: 'form',		               
+						xtype: 'form',
 				//		    padding: '3',
 						flex: 2,
 						items : [ chart ],
 						fbar:[
-						{   
+						{
 							type: 'button',
 							text: 'Save Chart',
 							scope: this,
@@ -568,16 +568,16 @@ Ext.define(&#39;amdaUI.VisuUI&#39;, {
 								});
 							}
 						}]
-					}    
-				]  
-		}); 
-	
+					}
+				]
+		});
+
 		var myConf = {
 			layout: 'border',
-			items: [		   
-				formPanel, 		     
+			items: [
+				formPanel,
 				{
-					xtype: 'panel', 
+					xtype: 'panel',
 					region: 'south',
 					title: 'Information',
 					collapsible: true,
@@ -589,11 +589,11 @@ Ext.define(&#39;amdaUI.VisuUI&#39;, {
 					loader: {
 						autoLoad: true,
 						url: helpDir+'visuHOWTO'
-					} 
+					}
 				}
-			] 
+			]
 		};
-	    
-		Ext.apply (this, Ext.apply(arguments, myConf));	
-    } 
-});	
+
+		Ext.apply (this, Ext.apply(arguments, myConf));
+    }
+});
@@ -1126,14 +1126,14 @@ class AmdaAction
         }
  
  
-	public function initForChart($id, $name, $isTmpObject, $type)
+	public function initForChart($id, $folderId, $name, $isTmpObject, $type)
 	{
 		if ($isTmpObject && $type == 'catalog' && $id == 'cacheCat')
 			return array('success' => true, 'cache' => $id);
  
 		if ($type == 'catalog' || $type == 'sharedcatalog') $objMgr = new CatalogMgr();
  
-		return $objMgr->initForChart($id, $name, $isTmpObject, $type);
+		return $objMgr->initForChart($id, $folderId, $name, $isTmpObject, $type);
 	}
  
 	public function initObjectCacheFromTmpObject($folderId, $name, $isCatalog = false)
@@ -101,9 +101,21 @@ class CatalogMgr extends TimeTableMgr
  
 	}
  
-	public function initForChart($id, $name, $isTmpObject, $type)
+	public function initForChart($id, $folderId, $name, $isTmpObject, $type)
 	{
-	       $intervals_res = $this->getCatalogParamDescription($id, $name, $isTmpObject, $type);
+		if ($isTmpObject)
+			$options = array(
+				'name' => $name,
+				'folder' => empty($folderId) ? USERTEMPDIR : USERWORKINGDIR.$folderId,
+				'type' => $type,
+			);
+		else
+			$options = array(
+				'id' => $id,
+				'type' => $type,
+			);
+
+	  $intervals_res = $this->getCatalogParamDescription($options);
  
 		if (!$intervals_res['success'])
 			return $intervals_res;
@@ -145,6 +157,7 @@ class CatalogMgr extends TimeTableMgr
 		if (!$intervals_res['success'])
 			return $intervals_res;
  
+
 		$newIntervals = array();
  
 		foreach ($intervals_res['intervals'] as $interval)
@@ -192,7 +205,7 @@ class CatalogMgr extends TimeTableMgr
  
       //load intervals from Catalog id
 		if (!file_exists($path))
-			return array('success' => false, 'message' => "Cannot find Catalog file ".$path);
+			return array('success' => false, 'message' => "Cannot find Catalog file");
  
 		if (!$this->objectDom->load($path))
 			return array('success' => false, 'message' => "Cannot load Catalog file");
@@ -157,7 +157,7 @@ $API = array(
 			'saveTTCacheIntervalsInTT'=>array('len'=>1),
 			'initObjectCache'=>array ('len'=>2),
 			'initObjectCacheFromObject'=>array('len'=>2),
-			'initForChart'=>array('len'=>4),
+			'initForChart'=>array('len'=>5),
 			'initObjectCacheFromTmpObject'=>array('len'=>3),
 			'initObjectCacheFromUploadedFile'=>array('len'=>3),
 			'initObjectCacheFromCatalog'=>array('len'=>2),