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

Myriam Bouchemit
2 parents ca7b9385 d575ea1d
Showing 36 changed files with 788 additions and 195 deletions Show diff stats
generic_data/rank.json
help/epic.html
help/epic_amda.html
help/epic_table.html
help/ics_e.html
help/ics_i.html
help/images/amda_epic.png
help/images/epic.png
help/images/epic_table.png
help/images/ics_e.png
help/images/ics_i.png
help/images/stics.png
help/stics.html
js/app/controllers/AmdaModule.js
js/app/controllers/InteractiveModule.js
js/app/controllers/PlotModule.js
js/app/models/AmdaNode.js
js/app/models/InteractiveNode.js
js/app/models/LocalParamNode.js
js/app/models/PlotNode.js
-{"Mercury": 1, "Venus": 2, "Heliosphere.NearEarth": 3, "Heliosphere.Remote1AU": 4,
-"Earth.Magnetosheath": 5, "Earth.Magnetosphere": 5, "Earth": 5, "Earth.Surface": 6,
-"Mars": 7, "Jupiter": 8, "Ganymede" : 8, "Saturn": 9, "Uranus" : 10, "Neptune" : 11, "Comet" : 93, 
+{"Sun" : 1, "Mercury": 2, "Venus": 3, "Heliosphere.NearEarth": 4, "Heliosphere.Remote1AU": 5,
+"Earth.Magnetosheath": 6, "Earth.Magnetosphere": 6, "Earth": 6, "Earth.Surface": 7,
+"Mars": 8, "Jupiter": 9, "Ganymede" : 9, "Saturn": 91, "Uranus" : 92, "Neptune" : 93,  "Comet" : 94, 
 "Heliosphere" : 99 }     
 \ No newline at end of file
@@ -0,0 +1,3 @@
+<body>
+	<img src="images/epic.png"/>
+</body>
 \ No newline at end of file
@@ -0,0 +1,3 @@
+<body>
+	<img src="images/amda_epic.png"/>
+</body>
 \ No newline at end of file
@@ -0,0 +1,3 @@
+<body>
+	<img src="images/epic_table.png"/>
+</body>
 \ No newline at end of file
@@ -0,0 +1,3 @@
+<body>
+	<img src="images/ics_e.png"/>
+</body>
 \ No newline at end of file
@@ -0,0 +1,3 @@
+<body>
+	<img src="images/ics_i.png"/>
+</body>
 \ No newline at end of file
@@ -0,0 +1,3 @@
+<body>
+	<img src="images/stics.png"/>
+</body>
 \ No newline at end of file
@@ -99,7 +99,12 @@ Ext.define(&#39;amdaDesktop.AmdaModule&#39;, {
 				show : onshowfn,
 				scope : this
 			});
-		}		
-		win.show();
+		}
+		if (!win.isVisible()) {
+			win.show();
+		}
+		else if (onshowfn) {
+			onshowfn();
+		}
 	}
 });
@@ -144,7 +144,13 @@ Ext.define(&#39;amdaDesktop.InteractiveModule&#39;, {
 			// second arg 'true' is used in CatalogUI to mark if Grid Reconfiguration is needed
 			this.getUiContent().setObject(this.linkedNode.get('object'), true);
 		}
-		win.show();
+
+		if (!win.isVisible()) {
+			win.show();
+		}
+		else if (onShowEvent) {
+			onShowEvent();
+		}
 	},
 	/**
 	 * Mechanism to attach a Module to the Workspace Explorer to enable interactions
@@ -256,4 +262,4 @@ Ext.define(&#39;amdaDesktop.InteractiveModule&#39;, {
               return null;
           }
-});
 \ No newline at end of file
+});
@@ -208,5 +208,5 @@ Ext.define(&#39;amdaDesktop.PlotModule&#39;, {
     getWindowResult: function(winResultId){
 	    if (!this.plotResultWindowsManager.get(winResultId)) return null;
 	    return this.plotResultWindowsManager.get(winResultId);	    
-	}
+    }
 });
@@ -128,7 +128,20 @@ Ext.define(&#39;amdaModel.AmdaNode&#39;, {
 		}
 		// if this node is a leaf and have no child
 		else if (this.isLeaf() || this.get('nodeType' ) ==  'derivedParam' ) {
-			itemKind = amdaUI.ExplorerUI.ITEM_KIND_LEAF;
+			if (this.get('nodeType')  == 'plottab') {
+				itemKind = amdaUI.ExplorerUI.ITEM_KIND_PTAB;
+			}
+			else {
+				itemKind = amdaUI.ExplorerUI.ITEM_KIND_LEAF;
+			}
+		}
+		else if (this.get('nodeType')  ==  'request') {
+			if (this.get('tabs') && (this.get('tabs').length > 0)) {
+				itemKind = amdaUI.ExplorerUI.ITEM_KIND_LEAF;
+			}
+			else {
+				itemKind = amdaUI.ExplorerUI.ITEM_KIND_DIRE;
+			}
 		}
 		else if (this.get('isParameter') &&  this.get('nodeType' ) !=  'derivedParam' ) {
 					itemKind = amdaUI.ExplorerUI.ITEM_KIND_PARA;
@@ -52,7 +52,7 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
 			{
 				node.eachChild(function(n)
 					{		      
-						if (!n.isLoaded() && !n.isLeaf())
+						if (!n.isLoaded() && !n.isRealLeaf())
 						{
 							nodesToLoad.push(n);
 							me.preloadTreeNode(n,nodesToLoad,onloaded);
@@ -70,7 +70,7 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
 					{
 						records.forEach(function (record)
 							{                                                       
-								if (!record.isLoaded() && !record.isLeaf())
+								if (!record.isLoaded() && !record.isRealLeaf())
 									{
 										nodesToLoad.push(record);
 										me.preloadTreeNode(record,nodesToLoad,onloaded);
@@ -99,6 +99,11 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
 			}  
 		}
 	},
+
+	isRealLeaf: function()
+	{
+		return this.isLeaf();
+	},
 /**
 * this method is overriden into ExecutableNode to return true
@@ -146,7 +151,7 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
 */
 	rename: function(value,callBackFn) 
 	{ 		 
-		var dataToSend = {id : this.get('id'), old_name: this.modified.text, name: value,  parent : this.data.parentId, leaf: this.isLeaf(), nodeType: this.get('nodeType')};
+		var dataToSend = {id : this.get('id'), old_name: this.modified.text, name: value,  parent : this.data.parentId, leaf: this.isRealLeaf(), nodeType: this.get('nodeType')};
 		AmdaAction.renameObject(dataToSend, callBackFn);		 
 	},
@@ -155,7 +160,7 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
 */
 	renameDD: function(parentId, callBackFn) 
 	{ 
-		var dataToSend = {id : this.get('id'), old_name: this.get('name'), name: this.get('name'), parent : parentId, leaf: this.isLeaf(), nodeType: this.get('nodeType')};
+		var dataToSend = {id : this.get('id'), old_name: this.get('name'), name: this.get('name'), parent : parentId, leaf: this.isRealLeaf(), nodeType: this.get('nodeType')};
 		AmdaAction.renameObject(dataToSend, callBackFn);
 	},
@@ -166,7 +171,7 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
 */
 	isValidName : function(name, callBackFn)
 	{
-		var dataToSend = {name: name, nodeType: this.get('nodeType'), leaf: this.isLeaf()};
+		var dataToSend = {name: name, nodeType: this.get('nodeType'), leaf: this.isRealLeaf()};
 		AmdaAction.validNameObject(dataToSend, callBackFn);
 	},
@@ -515,7 +520,7 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
 	deleteNode: function() {		   
 			// if the target is a directory
-			if (!this.isLeaf()) {
+			if (!this.isRealLeaf()) {
 				// determine if this directory is empty before launching the delete confirmation method
 				this.isNotEmptyDir(this.confirmDirectoryDeletion);                        
 			// else (the target is a leaf)
@@ -568,14 +573,14 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
 */
 	realDelete : function()
 	{                       
-		AmdaAction.deleteObject({id: this.get('id'), leaf: this.isLeaf(), nodeType: this.get('nodeType')}, function(res,e){ 
+		AmdaAction.deleteObject({id: this.get('id'), leaf: this.isRealLeaf(), nodeType: this.get('nodeType')}, function(res,e){ 
 			//TODO proper errors handling                       
 			// node deletion in tree 
 			if (res) {  // if success
 				if (res.id) {
 					//Ext.Msg.show({title:'Warning', msg: 'Requests with parameter '+node.data.text+' are deleted', icon: Ext.MessageBox.ERROR, buttons: Ext.Msg.OK});
 					if (this.parentNode) {
-						if (this.isLeaf()){
+						if (this.isRealLeaf()){
 							var moduleId = this.get('moduleId');
 							// if really interactive node 
 							if (moduleId) {
@@ -28,9 +28,9 @@ Ext.define(&#39;amdaModel.LocalParamNode&#39;,
 		{name: 'rank', type: 'integer', persist: false, defaultValue: null}
 	],
-	icons : {'1' : 'icon-mercury','2' : 'icon-venus','3' : 'icon-sw','4' : 'icon-sw','5' : 'icon-earth','6' : 'icon-earth',
-				'7' : 'icon-mars','8' : 'icon-jupiter','9' : 'icon-saturn','10' : 'icon-uranus','11' : 'icon-neptune',
-				'93' :'icon-comet', '99' :'icon-solarsystem', '999' :'icon-solarsystem' 
+	icons : {'1' : 'icon-sun', '2' : 'icon-mercury','3' : 'icon-venus','4' : 'icon-sw','5' : 'icon-sw','6' : 'icon-earth','7' : 'icon-earth',
+				'8' : 'icon-mars','9' : 'icon-jupiter','91' : 'icon-saturn','92' : 'icon-uranus','93' : 'icon-neptune',
+				'94' :'icon-comet', '99' :'icon-solarsystem', '999' :'icon-solarsystem' 
 	},
 	constructor : function(config)
@@ -10,15 +10,47 @@
 Ext.define('amdaModel.PlotNode', {
 	extend: 'amdaModel.ExecutableNode',
+    fields : [
+        {name : 'tabs', type:'auto', defaultValue:false,  persist:  false}
+    ],
+
     statics: {
         nodeType: 'request' 
     },
+    requires:[
+        'amdaModel.PlotTabNode'
+    ],
+
     constructor : function(config){
         this.callParent(arguments);
         this.set('moduleId',myDesktopApp.dynamicModules.plot.id);
         this.set('objectDataModel','amdaPlotObj.PlotRequestObject');
         this.set('nodeType',this.self.nodeType);
+	if (this.get('leaf')) {
+		this.updateTabs(this.get('tabs'));
+	}
+    },
+
+    updateTabs : function(tabs) {
+	if (tabs) {
+		var oneTab = (tabs.length == 1);
+        	this.set('leaf', oneTab); 
+		this.set('iconCls', oneTab ? 'icon-plot-page' : 'icon-plot-pages');
+		this.removeAll();
+		if (tabs.length > 1) {
+			var me = this;
+			Ext.Array.each(tabs, function(tab) {
+				var tabNode = new amdaModel.PlotTabNode({text: tab.name, tabid: tab.id});
+              			me.appendChild(tabNode);
+			});
+		}
+		this.set('tabs', tabs);
+	}
+    },
+
+    specialUpdate : function(res) {
+	this.updateTabs(res.tabs);
     },
     allMenuItems : function() {
@@ -44,6 +76,10 @@ Ext.define(&#39;amdaModel.PlotNode&#39;, {
          }, {
              fnId : 'leaf-deleteNode',
              text : 'Delete Request'
+         }, {
+             fnId : 'leaf-insertTabs',
+             text : 'Insert in current Plot Request'
+
          }];
         return menuItems;
@@ -92,10 +128,35 @@ Ext.define(&#39;amdaModel.PlotNode&#39;, {
         case 'deleteMulti':
             this.deleteMulti();
             break;
-            
+        case 'insertTabs':
+	    this.insertPlotTabsRequest();
         default:
             break;
         }
+    },
+
+    isRealLeaf: function()
+    {
+	var isFolder = (!this.isLeaf()) && (this.get('tabs') === false);
+        return !isFolder;
+    },
+
+    insertPlotTabsRequest: function() {
+	var me = this;
+	AmdaAction.getObject(me.get('id'), me.get('nodeType'), function (result,remoteEvent) {
+		var paramObj = Ext.create(me.get('objectDataModel'), result);
+		myDesktopApp.getLoadedModule(me.get('moduleId'), true, function (module) {
+			module.createWindow(function () {
+				var uiContent = module.getUiContent();
+				if (uiContent != null) {
+					paramObj.tabs().each(function (tab) {
+						var tabData = tab.getJsonValues();
+						uiContent.insertPlotTab(tabData);
+					});
+				}
+			});
+		});
+	});
     }
 });
@@ -14,18 +14,41 @@
 Ext.define('amdaPlotObj.PlotLayoutAutoObject', {
-	extend: 'Ext.data.Model',
+    extend: 'Ext.data.Model',
-	requires: [
-	           'amdaPlotObj.PlotObjectConfig'
-	],
+    requires: [
+        'amdaPlotObj.PlotObjectConfig'
+    ],
-	fields : [
-	          {name: 'layout-panel-height', type: 'float', defaultValue: amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.panelHeight},
-	          {name: 'layout-panel-spacing', type: 'float', defaultValue: amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.panelSpacing},
-	          {name: 'layout-expand', type: 'boolean', defaultValue: amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.expand},
-		  {name: 'layout-timeaxes-legend-lowerone', type: 'boolean', defaultValue: amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.timeAxesLegend}
+    fields : [
+        {name: 'layout-panel-height', type: 'float'},
+        {name: 'layout-panel-spacing', type: 'float'},
+        {name: 'layout-expand', type: 'boolean'},
+        {name: 'layout-timeaxes-legend-lowerone', type: 'boolean'}
     ],
+
+    constructor: function()
+    {
+        var me = this;
+        me.callParent(arguments);
+        if ((arguments.length > 0) && arguments[0])
+        {
+        }
+        else
+        {
+            //new object, set default fields values
+            me.setDefaultValues();
+        }
+        this.dirty = false;
+    },
+
+    setDefaultValues: function()
+    {
+        this.set('layout-panel-height', amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.panelHeight);
+        this.set('layout-panel-spacing', amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.panelSpacing);
+        this.set('layout-expand', amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.expand);
+        this.set('layout-timeaxes-legend-lowerone', amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.timeAxesLegend);
+    },
     getJsonValues : function() 
     {
@@ -14,23 +14,45 @@
 Ext.define('amdaPlotObj.PlotLayoutVerticalObject', {
-	extend: 'Ext.data.Model',
+    extend: 'Ext.data.Model',
-	requires: [
-	           'amdaPlotObj.PlotObjectConfig'
-	],
+    requires: [
+        'amdaPlotObj.PlotObjectConfig'
+    ],
-	fields : [
-	          {name: 'layout-panel-height', type: 'float', defaultValue: amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.panelHeight},
-	          {name: 'layout-panel-spacing', type: 'float', defaultValue: amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.panelSpacing},
-	          {name: 'layout-expand', type: 'boolean', defaultValue: amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.expand},
-		  {name: 'layout-timeaxes-legend-lowerone', type: 'boolean', defaultValue: amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.timeAxesLegend},
-	          //{name: 'layout-timeplot-width', type: 'float', useNull:true},
-	          {name: 'layout-timeplot-height', type: 'float', useNull:true},
-	          {name: 'layout-xyplot-width', type: 'float', useNull:true},
-	          {name: 'layout-xyplot-height', type: 'float', useNull:true}
+    fields : [
+        {name: 'layout-panel-height', type: 'float'},
+        {name: 'layout-panel-spacing', type: 'float'},
+        {name: 'layout-expand', type: 'boolean'},
+        {name: 'layout-timeaxes-legend-lowerone', type: 'boolean'},
+        //{name: 'layout-timeplot-width', type: 'float', useNull:true},
+        {name: 'layout-timeplot-height', type: 'float', useNull:true},
+        {name: 'layout-xyplot-width', type: 'float', useNull:true},
+        {name: 'layout-xyplot-height', type: 'float', useNull:true}
     ],
-    
+
+    constructor: function()
+    {
+        var me = this;
+        me.callParent(arguments);
+        if ((arguments.length > 0) && arguments[0])
+        {
+        }
+        else {
+            //new object, set default fields values
+            me.setDefaultValues();
+        }
+        this.dirty = false;
+    },
+
+    setDefaultValues: function()
+    {
+        this.set('layout-panel-height', amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.panelHeight);
+        this.set('layout-panel-spacing', amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.panelSpacing);
+        this.set('layout-expand', amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.expand);
+        this.set('layout-timeaxes-legend-lowerone', amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.timeAxesLegend);
+    },
+
     getJsonValues : function() 
     {
     	var layoutValues  = new Object();
@@ -14,32 +14,46 @@
 Ext.define('amdaPlotObj.PlotLegendSeriesObject', {
-	extend: 'Ext.data.Model',
+    extend: 'Ext.data.Model',
-	requires: [
-	           'amdaPlotObj.PlotObjectConfig'
-	],
+    requires: [
+        'amdaPlotObj.PlotObjectConfig'
+    ],
-	fields : [
-	          {name: 'legend-series-activated', type: 'boolean', defaultValue: false},
-	          {name: 'legend-series-type', type: 'string', defaultValue: amdaPlotObj.PlotObjectConfig.defaultValues.legends.series.type},
-	          {name: 'legend-series-position', type: 'string', defaultValue: amdaPlotObj.PlotObjectConfig.defaultValues.legends.series.position},
-	          {name: 'legend-series-showparaminfo', type: 'boolean', defaultValue: true},
-		      {name: 'legend-series-defaulttextcolor', type: 'string', defaultValue: amdaPlotObj.PlotObjectConfig.defaultValues.legends.series.text.color},
-	          {name: 'legend-series-border-activated', type: 'boolean', defaultValue: false},
-	          {name: 'legend-series-border-color', type: 'string', defaultValue: amdaPlotObj.PlotObjectConfig.defaultValues.legends.series.border.color},
-	          {name: 'legend-series-intervalinfo-activated', type: 'boolean', defaultValue: false},
-	          {name: 'legend-series-intervalinfo-type', type: 'string', defaultValue: amdaPlotObj.PlotObjectConfig.defaultValues.legends.series.intervalinfo.type},
-	          {name: 'legend-series-font-activated', type: 'boolean', defaultValue: false},
-              {name: 'legend-series-font-name', type: 'string', defaultValue: amdaPlotObj.PlotObjectConfig.defaultValues.legends.series.font.name},
-              {name: 'legend-series-font-size', type: 'int', defaultValue: amdaPlotObj.PlotObjectConfig.defaultValues.legends.series.font.size},
-              {name: 'legend-series-font-bold', type: 'boolean', defaultValue: false},
-              {name: 'legend-series-font-italic', type: 'boolean', defaultValue: false}
+    fields : [
+        {name: 'legend-series-activated', type: 'boolean'},
+        {name: 'legend-series-type', type: 'string'},
+        {name: 'legend-series-position', type: 'string'},
+        {name: 'legend-series-showparaminfo', type: 'boolean'},
+        {name: 'legend-series-defaulttextcolor', type: 'string'},
+        {name: 'legend-series-border-activated', type: 'boolean'},
+        {name: 'legend-series-border-color', type: 'string'},
+        {name: 'legend-series-intervalinfo-activated', type: 'boolean'},
+        {name: 'legend-series-intervalinfo-type', type: 'string'},
+        {name: 'legend-series-font-activated', type: 'boolean'},
+        {name: 'legend-series-font-name', type: 'string'},
+        {name: 'legend-series-font-size', type: 'int'},
+        {name: 'legend-series-font-bold', type: 'boolean'},
+        {name: 'legend-series-font-italic', type: 'boolean'}
     ],
+
+    constructor: function()
+    {
+        var me = this;
+        me.callParent(arguments);
+        if ((arguments.length > 0) && arguments[0])
+        {
+        }
+        else {
+            //new object, set default fields values
+            me.setDefaultValues();
+        }
+        this.dirty = false;
+    },
     setDefaultValues: function()
     {
-    	/*this.set('legend-series-activated', false);
+    	this.set('legend-series-activated', false);
     	this.set('legend-series-type', amdaPlotObj.PlotObjectConfig.defaultValues.legends.series.type);
     	this.set('legend-series-position', amdaPlotObj.PlotObjectConfig.defaultValues.legends.series.position);
     	this.set('legend-series-showparaminfo', true);
@@ -52,7 +66,7 @@ Ext.define(&#39;amdaPlotObj.PlotLegendSeriesObject&#39;, {
     	this.set('legend-series-font-name', amdaPlotObj.PlotObjectConfig.defaultValues.legends.series.font.name);
     	this.set('legend-series-font-size', amdaPlotObj.PlotObjectConfig.defaultValues.legends.series.font.size);
     	this.set('legend-series-font-bold', false);
-    	this.set('legend-series-font-italic', false);*/
+    	this.set('legend-series-font-italic', false);
     },
     getShortInfo : function()
@@ -86,4 +100,4 @@ Ext.define(&#39;amdaPlotObj.PlotLegendSeriesObject&#39;, {
     	return legendValues;
     }
-});
 \ No newline at end of file
+});
@@ -30,8 +30,7 @@ Ext.define(&#39;amdaPlotObj.PlotRequestObject&#39;, {
               {name: 'one-file-per-interval', type: 'boolean'},
               {name: 'last-plotted-tab', type: 'int', defaultValue: 0},
               {name: 'last-tab-id', type: 'int', defaultValue: 0},
-				  {name: 'active-tab-id', type: 'int', defaultValue: 1},
-				  {name: 'all-in-one', type: 'boolean', defaultValue: false}
+	      {name: 'active-tab-id', type: 'int', defaultValue: 1}
     ],
     hasMany: {
@@ -74,10 +73,19 @@ Ext.define(&#39;amdaPlotObj.PlotRequestObject&#39;, {
     createNewTab: function() {
     	this.set('last-tab-id', this.get('last-tab-id') + 1);
-    	var recs = this.tabs().add({id : this.get('last-tab-id')});
-    	recs[0].setDefaultValues();
+	var data = {id: this.get('last-tab-id')};
+	var applyDefault = true;
+	if ((arguments.length > 0) && arguments[0]) {
+		data = arguments[0];
+		data['id'] = this.get('last-tab-id');
+		applyDefault = false;
+	}
+    	var recs = this.tabs().add(data);
+	if (applyDefault) {
+    		recs[0].setDefaultValues();
+	}
     	this.dirty = true;
-		return recs[0];
+	return recs[0];
     },
     removeTabById: function(tabId) {
@@ -124,7 +132,6 @@ Ext.define(&#39;amdaPlotObj.PlotRequestObject&#39;, {
     	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['all-in-one'] =  this.get('all-in-one');
     	requestValues['timesrc'] =  this.get('timesrc'); 
@@ -153,26 +160,15 @@ Ext.define(&#39;amdaPlotObj.PlotRequestObject&#39;, {
 				requestValues['durationSec'] = this.get('durationSec');
 			}
-		requestValues['tabs'] = [];
+	requestValues['tabs'] = [];
-		if (this.get('all-in-one')) {
-			this.tabs().each(function (tab, index) {
-				requestValues['tabs'][index] = tab.getJsonValues();
-			});
+	this.tabs().each(function (tab, index) {
+		requestValues['tabs'][index] = tab.getJsonValues();
+	});
-			requestValues['active-tab-id'] = this.get('active-tab-id');
-			requestValues['last-tab-id'] = this.get('last-tab-id');
-		}
-		else {
-			var tab = this.tabs().getAt(this.get('active-tab-id')-1);
-			requestValues['tabs'][0] = tab.getJsonValues();
-			
-			requestValues['tabs'][0]['id'] = "1";
-			requestValues['active-tab-id'] =  "1";
-			requestValues['last-tab-id'] = "1";
-			requestValues['last-plotted-tab'] = "0";
-		}
+	requestValues['active-tab-id'] = this.get('active-tab-id');
+	requestValues['last-tab-id'] = this.get('last-tab-id');
-      return requestValues;
+	return requestValues;
     }
-});
 \ No newline at end of file
+});
@@ -27,6 +27,7 @@ Ext.define(&#39;amdaPlotObj.PlotTabObject&#39;, {
 	fields : [
 	          {name: 'id', type: 'int'},
+                  {name: 'tab-name', type: 'string', defaultValue: ''},
 	          {name: 'tree-full-view', type: 'boolean'},
 	          {name: 'multi-plot-linked', type: 'boolean'},
 	          {name: 'page-node-state', type: 'int', defaultValue: 2}, //0 : collapsed, 1 : expanded, 2 : not set 
@@ -223,6 +224,7 @@ Ext.define(&#39;amdaPlotObj.PlotTabObject&#39;, {
     	var tabValues  = new Object();
     	tabValues['id'] = this.get('id');
+	tabValues['tab-name'] = this.get('tab-name');
     	tabValues['tree-full-view'] = this.get('tree-full-view');
     	tabValues['multi-plot-linked'] = this.get('multi-plot-linked');
     	tabValues['page-node-state'] = this.get('page-node-state');
@@ -289,4 +291,4 @@ Ext.define(&#39;amdaPlotObj.PlotTabObject&#39;, {
     	return tabValues;
     }
-});
 \ No newline at end of file
+});
@@ -0,0 +1,164 @@
+/** 
+ * Project  : AMDA-NG4
+ * Name     : PlotTabNode.js
+ * @class   amdaModel.PlotTabNode
+ * @extends amdaModel.ExecutableNode
+ * @brief   Basic Model of Node corresponding to a tab of a plot request
+ * @author  Benjamin Renard
+ */
+
+Ext.define('amdaModel.PlotTabNode', {
+	extend: 'amdaModel.ExecutableNode',
+
+    fields : [
+        {name : 'tabid', type:'string', defaultValue:'',  persist:  false}
+    ],
+
+    statics: {
+        nodeType: 'plottab' 
+    },
+
+    constructor : function(config){
+        this.callParent(arguments);
+        this.set('moduleId',myDesktopApp.dynamicModules.plot.id);
+        //this.set('objectDataModel','amdaPlotObj.PlotRequestObject');
+        this.set('nodeType',this.self.nodeType);
+	this.set('leaf',true);
+	this.set('iconCls','icon-plot-page');
+    },
+
+    allMenuItems : function() {
+        var menuItems =
+         [
+         {
+            fnId : 'ptab-openTab',
+            text : 'Open in new Plot Request'
+         }, {
+	    fnId : 'ptab-insertTab',
+            text : 'Insert in current Plot Request'
+	 }, {
+             fnId : 'ptab-renameTab',
+             text : 'Rename Plot Tab'
+         }];
+
+        return menuItems;
+    }, 
+    
+    allMenuMultiItems : function() {
+        var menuMulti = [
+        ];
+        return menuMulti;
+    },
+    
+    getAllContextMenuItems: function(){
+        return this.allMenuItems();
+    },
+    
+    getMultiContextMenuItems: function(){
+        return this.allMenuMultiItems();
+    },
+    
+    onMenuItemClick : function(menu,item,event) {
+		 
+        var fnId = Ext.util.Format.substr(item.fnId, 5, item.fnId.length);
+
+        switch (fnId) {
+
+        case 'openTab':
+            this.insertPlotTabRequest(true);
+            break;
+
+        case 'insertTab':
+	    this.insertPlotTabRequest(false);
+            break;
+
+        case 'renameTab':
+	    this.renameTab();
+            break;
+        default:
+            break;
+        }
+    },
+
+    insertPlotTabRequest : function(inNewRequest) {
+	var me = this;
+	amdaModel.InteractiveNode.preloadNodes(this.parentNode.getRootNode(), function() {
+		AmdaAction.getObject(me.parentNode.get('id'), me.parentNode.get('nodeType'), function (result,remoteEvent) {
+			var paramObj = Ext.create(me.parentNode.get('objectDataModel'), result);
+			var tabData = null;
+			paramObj.tabs().each(function(tab) {
+				if (tab.get('id') == me.get('tabid')) {
+					tabData = tab.getJsonValues();
+				}
+			});
+			if (tabData != null) {
+				if (inNewRequest) {
+					tabData['id'] = 1;
+					paramObj.set('id','');
+					paramObj.set('name', '');
+					paramObj.set('folderId', '');
+					paramObj.set('active-tab-id', 1);
+					paramObj.set('last-tab-id', 1);
+					paramObj.set('last-plotted-tab', 1);
+					paramObj.loadTabs([tabData]);
+					myDesktopApp.getLoadedModule(me.get('moduleId'), true, function (module) {
+						module.setContextNode(me.parentNode.getRootNode());
+						module.createWindow(function () {
+							var uiContent = module.getUiContent();
+							if (uiContent != null) {
+								uiContent.resetProcess(paramObj.getJsonValues());
+							}
+						});
+					});
+				}
+				else {
+					myDesktopApp.getLoadedModule(me.get('moduleId'), true, function (module) {
+						module.createWindow(function () {
+							var uiContent = module.getUiContent();
+							if (uiContent != null) {
+								var tabObj = new amdaPlotObj.PlotTabObject(tabData);
+								uiContent.insertPlotTab(tabData);
+							}
+						});
+					});
+				}
+			}
+		}, me);
+	});
+    },
+
+    editPlotTab : function() {
+	var me = this;
+	this.parentNode.editLeaf(function () {
+		myDesktopApp.getLoadedModule(me.get('moduleId'), true, function (module) {
+			var uiContent = module.getUiContent();
+			if (uiContent != null) {
+				uiContent.forceActiveTab(me.get('tabid'));
+			}
+		});
+	});
+    },
+
+    renameTab: function() {
+	if (this.myGetOwnerTree()) {
+		var item = this.myGetOwnerTree().getSelectionModel().selected.items[0];
+		this.myGetOwnerTree().fireEvent('edition', this.myGetOwnerTree().view, item);
+	}
+    },
+
+    rename: function(value,callBackFn) {
+		var me = this;
+                var dataToSend = {id : this.get('tabid'), old_name: this.modified.text, name: value,  parent : this.data.parentId, leaf: this.isLeaf(), nodeType: this.get('nodeType')};
+		AmdaAction.renameObject(dataToSend, function (result) {
+			callBackFn(result);
+			myDesktopApp.getLoadedModule(me.get('moduleId'), true, function (module) {
+				var uiContent = module.getUiContent();
+				if (uiContent != null) {
+					if ((module.linkedNode != null) && (module.linkedNode.get('id') == dataToSend.parent)) {
+						uiContent.updatePlotTabName(dataToSend.id, dataToSend.name);
+					}
+				}
+			});
+		});
+        },
+});
@@ -459,6 +459,7 @@ Ext.define(&#39;amdaUI.DownloadUI&#39;, {
                                             }
                                             break;
                                         case 'alias' :
+                                            // console.log(data.records[0].data);
                                             idToSent = "#" + data.records[0].get('text');
                                             break;
                                         case 'derivedParam' :
@@ -481,7 +482,7 @@ Ext.define(&#39;amdaUI.DownloadUI&#39;, {
                                             }
                                             break;
                                         case 'myDataParam' :
-                                            idToSent = "ws_" + data.records[0].get('text');
+                                            idToSent = "wsd_" + data.records[0].get('text');
                                             break;
                                         default :
                                             return false;
@@ -102,6 +102,7 @@ Ext.define(&#39;amdaUI.ExplorerUI&#39;, {
 		ITEM_KIND_LEAF : 'leaf',
 		ITEM_KIND_DIRE : 'dire',
 		ITEM_KIND_PARA : 'para',
+		ITEM_KIND_PTAB : 'ptab', //plot tab
 		ITEM_KIND_MISS : 'miss'
 	},
@@ -231,7 +232,7 @@ Ext.define(&#39;amdaUI.ExplorerUI&#39;, {
 					toggleGroup: 'sorting',
 					handler: function(){
 							var tree = Ext.getCmp(amdaUI.ExplorerUI.RESRC_TAB.TREE_ID);
-							tree.getStore().sort([{ property : 'rank' }]);
+							tree.getStore().sort('rank');
 							this.updateFilter();
 					}
 				}]
@@ -353,6 +354,7 @@ Ext.define(&#39;amdaUI.ExplorerUI&#39;, {
 							case 'remoteParam' :
 							case 'remoteSimuParam' :
 							case 'myData' :
+							case 'plottab' :
 								return false;
 							default :
 								if (draggedRecord.data.id == targetNode.data.nodeType+'-treeRootNode')
@@ -575,13 +577,13 @@ Ext.define(&#39;amdaUI.ExplorerUI&#39;, {
 						});
 					}
-					if (record.isLeaf() || record.data.isParameter)                                                                                                                                     
+					if (record.isLeaf() || record.data.isParameter || (record.data.tabs && (record.data.tabs.length > 0)))                                                                                                                                     
 						switch (record.get('nodeType'))
 						{
 							case 'myData' :
 							case 'myDataParam' :
 							case 'derivedParam' :
-                                                                                                                                          							case 'timeTable' :
+							case 'timeTable' :
 							case 'sharedtimeTable' :
 							case 'sharedcatalog' :
 							case 'catalog' :
@@ -589,6 +591,9 @@ Ext.define(&#39;amdaUI.ExplorerUI&#39;, {
 							case 'condition' :
 								record.editLeaf();
 								break;
+							case 'plottab' :
+								record.editPlotTab();
+								break;
 							case 'localParam' :
 							case 'remoteParam':
 							case 'remoteSimuParam':
@@ -1024,7 +1029,7 @@ Ext.define( &#39;MyTreeEditor&#39;, {
 									event.record.commit();
 									var rec = event.record.data;
 									// in case of directory
-									if (!rec.leaf){
+									if (!rec.leaf && (rec.nodeType != 'plottab')){
 										// set folder's ID returned by server
 										rec.id = result.id;
 									}
@@ -31,16 +31,20 @@ Ext.define(&#39;amdaPlotComp.PlotTabPanel&#39;, {
 	setRequestObject: function(object)
 	{
+		var me = this;
 		this.removeAll();
 		this.object = object;
-		var selectedTab = this.object.get('active-tab-id');
+		var haveSelectedTab = false;
 		this.object.tabs().each(function (rec, index) {
-			var isSelected = false;
-			if (index+1 == selectedTab) 
-				isSelected = true;
+			if (rec.get('id') == me.object.get('active-tab-id')) {
+				haveSelectedTab = true;
+			}
+		});
-			this.addPlotTab(rec, isSelected); 	
+		this.object.tabs().each(function (rec, index) {
+			var isSelectedTab = haveSelectedTab ? (rec.get('id') == me.object.get('active-tab-id')) : (index == 0);
+			this.addPlotTab(rec, isSelectedTab); 	
 		}, this);
 	},
@@ -49,8 +53,9 @@ Ext.define(&#39;amdaPlotComp.PlotTabPanel&#39;, {
 		var tabNumber = this.getTabBar().items.getCount();
 		var tabContent = new amdaPlotComp.PlotTabContent({plotElementPanel: this.plotElementPanel, plotTabPanel : this, tabId : tabObject.get('id')});
 		tabContent.setTabObject(tabObject);
+		var me = this;
     	var tabComp = this.add({
-    		title: 'Plot '+tabNumber,
+    		title: (tabObject.get('tab-name') != '') ? tabObject.get('tab-name') : 'Plot '+tabNumber,
     		closable: true,
     		layout: 'fit',
     		bodyStyle: 'background: none',
@@ -75,8 +80,34 @@ Ext.define(&#39;amdaPlotComp.PlotTabPanel&#39;, {
     					this.object.removeTabById(tab.items.getAt(0).object.get('id'));
     			},
     			destroy: function(tab, eOpts) {
+				
     				this.updatePlotTabs();
-    			}
+    			},
+			afterrender: function(tab, e0pts) {
+				if (!tab.tab.el) {
+					return;
+				}
+				tab.tab.el.on('contextmenu', function(e, t, eOpts) {
+					var menu = new Ext.menu.Menu({
+						items: [
+							{
+								text: 'Rename',
+								handler: function() {
+									Ext.Msg.prompt('Rename', 'Please enter new plot tab name:', function(btn, text){
+										if (btn == 'ok'){
+											tabObject.set('tab-name',text);
+											me.updatePlotTabs();
+										}
+									}, me);
+								}
+							}
+						]
+					});
+					var position = e.getXY();
+					e.stopEvent();
+					menu.showAt(position);
+				},this);
+			}
     		}
     	});
@@ -88,12 +119,32 @@ Ext.define(&#39;amdaPlotComp.PlotTabPanel&#39;, {
 	updatePlotTabs: function()
 	{
+		var me = this;
+		var haveSelectedTab = false;
+		this.object.tabs().each(function (rec, index) {
+			if (rec.get('id') == me.object.get('active-tab-id')) {
+				haveSelectedTab = true;
+			}
+		});
+
 		var i = 0;
 		for (i = 0; i < this.items.getCount(); ++i)
 		{
+			var tabItem = this.items.getAt(i);
+			var tabContent = tabItem.items.getAt(0);
+			var tabObj = this.object.tabs().getById(tabContent.tabId);
+			if (!tabObj) {
+				continue;
+			}
+			if (!haveSelectedTab) {
+				//Set first tab as the selected one
+				this.setActiveTab(tabItem);
+				this.object.set('active-tab-id', tabObj.get('id'));
+				haveSelectedTab = true;
+			}
 			var tabNumber =  i+1;
-			this.items.getAt(i).setTitle('Plot '+tabNumber);
-			this.items.getAt(i).items.getAt(0).setTabObject(this.object.tabs().getAt(i));
+			tabItem.setTitle((tabObj.get('tab-name') != '') ? tabObj.get('tab-name') : 'Plot '+tabNumber);
+			tabContent.setTabObject(tabObj);
 		}
 	},
@@ -32,8 +32,6 @@ Ext.define(&#39;amdaUI.PlotUI&#39;, {
 	plotElement : null,
-	allPlots : false,
-	
 	constructor: function(config) {
 		this.init(config);	    
 		this.callParent(arguments);
@@ -47,12 +45,6 @@ Ext.define(&#39;amdaUI.PlotUI&#39;, {
 		this.plotTabs.setRequestObject(this.object);
 		this.timeSelector.intervalSel.setInterval(this.object.get('startDate'), this.object.get('stopDate'));
 		this.addTTs(this.object.get('timeTables'));
-		this.updateRequestOption(this.object.get('all-in-one'));
-	},
-	
-	updateRequestOption : function(allInOne) {
-		var requestOptionCB = this.formPanel.getForm().findField('all-in-one');
-		requestOptionCB.setValue(allInOne);
 	},
 	/**
@@ -92,7 +84,11 @@ Ext.define(&#39;amdaUI.PlotUI&#39;, {
 	resetProcess : function(){
 		var plotModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.plot.id);			
 		plotModule.createLinkedNode();
-		plotModule.createObject();					  
+		var obj = null;
+		if ((arguments.length > 0) && (arguments[0] != null)) {
+			obj = arguments[0];
+		}
+		plotModule.createObject(obj);					  
 		this.setObject(plotModule.linkedNode.get('object'));
 	},
@@ -119,7 +115,6 @@ Ext.define(&#39;amdaUI.PlotUI&#39;, {
 	doPlot : function(){
 		this.updateObject();
-		this.object.set('all-in-one', true);
 		this.object.set('last-plotted-tab', this.plotTabs.getSelectedTabId());
 		var plotModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.plot.id);
 		if (plotModule)
@@ -180,10 +175,154 @@ Ext.define(&#39;amdaUI.PlotUI&#39;, {
 		this.timeSelector.intervalSel.setInterval(dateStart, dateStop);        
 	},
+
+	forceActiveTab : function(tabId) {
+		for (var i = 0; i < this.plotTabs.items.getCount(); ++i) {
+			var plotTab = this.plotTabs.items.getAt(i).items.getAt(0);
+			if (plotTab.tabId == tabId) {
+				this.plotTabs.setActiveTab(i);
+				return;
+			}
+		}
+	},
+
+	updatePlotTabName: function(tabId, name) {
+		var me = this;
+		this.object.tabs().each(function (tabObject) {
+			if (tabId == tabObject.getId()) {
+				tabObject.set('tab-name', name);
+				me.plotTabs.updatePlotTabs();
+			}
+		});
+	},
+
+	insertPlotTab : function(tabData) {
+		var newTab = this.object.createNewTab(tabData);
+		this.plotTabs.addPlotTab(newTab,true);
+	},
 	updateLinkedToMultiPlotMode : function(isLinkedToMultiPlotMode) {
 		this.timeSelector.setVisible(isLinkedToMultiPlotMode); 
 	},
+
+	keepOnlySelectedTabInObject: function(showWarning, onSuccess) {
+		if (this.object.tabs().count() == 1) {
+			if (onSuccess) {
+				onSuccess();
+			}
+			return;
+		}
+
+		var me = this;
+		var removeFunc = function() {
+			var tabsToRemove = [];
+			var selectedTabFound = false;
+			me.object.tabs().each(function(tab) {
+				if (tab.get('id') != me.object.get('active-tab-id')) {
+					tabsToRemove.push(tab);
+				}
+				else {
+					selectedTabFound = true;
+				}
+			});
+			if (!selectedTabFound) {
+				myDesktopApp.errorMsg('Cannot retrieve selected tab');
+				return false;
+			}
+			if (tabsToRemove.length > 0) {
+				me.object.tabs().remove(tabsToRemove);
+			}
+			return true;
+		};
+
+		if (!showWarning) {
+			if (removeFunc()) {
+				if (onSuccess) {
+					onSuccess();
+				}
+			}
+			return;
+		}
+
+
+		Ext.Msg.show( { title : 'Warning',
+			msg: 'Active plot will be saved, but other ones will be lost.<br/>Do you want to continue?',
+			width: 300,
+			buttons: Ext.Msg.OKCANCEL,
+			fn: function(btn) {
+				if (btn == 'cancel') return;
+
+				if (removeFunc()) {
+					if (onSuccess) {
+						onSuccess();
+					}
+				}
+				return;
+			},
+			scope: me
+		});
+	},
+
+	savePlotRequest : function(allTabs) {
+		var plotModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.plot.id);
+		if (!plotModule)
+			return;
+		this.updateObject();
+		this.object.set('active-tab-id', this.plotTabs.getSelectedTabId());
+		var me = this;
+
+		if ((this.object.get('id') != '') && (plotModule.linkedNode.get('text') == this.object.get('name'))) {
+			//update existing request
+			if (!allTabs) {
+				this.keepOnlySelectedTabInObject(true, function() {
+					plotModule.linkedNode.update();
+				});
+			}
+			else {
+				plotModule.linkedNode.update();
+			}
+			return;
+		}
+
+		//save new request
+		var me = this;
+		plotModule.linkedNode.isValidName(this.object.get('name'), function (res) {
+			if (!res) {
+				myDesktopApp.errorMsg('Error during object validation');
+				return;
+			}
+			if (!res.valid) {
+				if (res.error) {
+					if (res.error.search('subtree') != -1) {
+						Ext.Msg.show( { title : 'Warning',
+							msg: res.error + '<br/>Do you want to overwrite it?',
+							width: 300,
+							buttons: Ext.Msg.OKCANCEL,
+							icon: Ext.Msg.WARNING,
+							fn :  me.overwriteProcess,
+							scope : me
+						});
+					}
+					else {
+						myDesktopApp.errorMsg(res.error);
+					}
+				}
+				else {
+					myDesktopApp.errorMsg('Invalid object name');
+				}
+				return;
+			}
+			if (!allTabs) {
+				me.keepOnlySelectedTabInObject((me.object.get('id') == ''), function() {
+					me.saveProcess(false);
+					me.setObject(me.object);
+				});
+			}
+			else {
+				me.saveProcess(false);
+			}
+		});
+	},
 	init : function(config) {
 		this.timeSelector = new amdaUI.TimeSelectorUI( { id: 'multiPlotTimeSelector' + config.id, title : 'MultiPlot Time Selection', border : false, collapsible : true, collapseDirection : 'bottom', visible : false, flex: 2 } );
@@ -252,7 +391,8 @@ Ext.define(&#39;amdaUI.PlotUI&#39;, {
 			            ]
 			        }
 			],
-			fbar: [{
+			fbar: [
+					{
 						xtype: 'button',
 						text: 'Plot',
 						scope: this,
@@ -275,68 +415,24 @@ Ext.define(&#39;amdaUI.PlotUI&#39;, {
 						}
 					},
 					'->', '-', {
-						xtype: 'button',
-						text: 'Save Request',
+						xtype: 'splitbutton',
+						text: 'Save All Tabs',
+						menu: {
+							items: [
+								{
+									text: 'Save Current Tab',
+									scope: this,
+									handler: function() {
+										this.savePlotRequest(false);
+									}
+								},
+							]
+						},
 						scope: this,
 						handler: function(button) {
-							var plotModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.plot.id);
-							if (!plotModule)
-											return;
-							
-							this.updateObject();
-							this.object.set('active-tab-id', this.plotTabs.getSelectedTabId());
-							this.object.set('all-in-one', this.allPlots);
-							
-							//update existing request
-							if ((this.object.get('id') != '') && 
-								(plotModule.linkedNode.get('text') == this.object.get('name'))) 
-										plotModule.linkedNode.update();
-							else {
-								var me = this; 
-								plotModule.linkedNode.isValidName(this.object.get('name'), function (res) {
-									if (!res) {
-										myDesktopApp.errorMsg('Error during object validation');
-										return;
-									}
-									if (!res.valid) {
-										if (res.error) {
-											if (res.error.search('subtree') != -1) { 
-												Ext.Msg.show( { title : 'Warning', 
-													msg: res.error + '<br/>Do you want to overwrite it?',
-													width: 300,
-													buttons: Ext.Msg.OKCANCEL,
-													icon: Ext.Msg.WARNING, 
-													fn :  me.overwriteProcess, 
-													scope : me
-												});	 
-											}
-											else {
-												myDesktopApp.errorMsg(res.error);
-											}
-										}
-										else {
-											myDesktopApp.errorMsg('Invalid object name');
-										}
-										
-										return;
-									}
-									me.saveProcess(false);
-								})
-							}
-						}
-					 }, ' ', 
-						myDesktopApp.addAmdaInfo('plotSaveRequest'),
-						' ', {
-						xtype: 'checkbox',
-						boxLabel: 'All Plot Tabs',
-						name : 'all-in-one',
-						listeners : {
-							scope: this,
-							change: function (cb, nv, ov) { 
-									 this.allPlots = nv;
-							}
+							this.savePlotRequest(true);
 						}
-					} 
+					 } 
 			]
 		});
@@ -354,6 +354,12 @@ background-image: url(../images/16x16/error.png) !important;
     opacity:0.5 !important;
 }
+.icon-sun {
+     background-image:url(../images/icons/sun.png) !important;
+     background-position: center;
+     background-repeat: no-repeat;
+}
+
 .icon-mercury {
      background-image:url(../images/icons/mercury.png) !important;
      background-position: center;
@@ -456,6 +462,10 @@ p + p {
 	background-image:url( ../images/16x16/plot_page.png ) !important;
 }
+.icon-plot-pages {
+	background-image:url( ../images/16x16/plot_pages.png ) !important;
+}
+
 .icon-plot-layout {
 	background-image:url( ../images/16x16/plot_layout.png ) !important;
 }
@@ -151,6 +151,7 @@ class AmdaAction
 					$isParameter = false;
 					$isAddable =  false;
 					$isSimulation = false;
+					$plotTabs = FALSE;
 					$rank = null;
 					$skip = FALSE;
@@ -178,18 +179,44 @@ class AmdaAction
 						case 'request':
 						$objectMgr = new RequestMgr();
 						$objplot = $objectMgr->getObject($id);
-						for ($i=0; $i < count($objplot->children); $i++)
-						{
-							for ($j=0; $j < count($objplot->children[$i]->children); $j++) {
-								$info = $info.' . '.$objplot->children[$i]->children[$j]->name;
+						if (isset($objplot->name)) {
+							$info = $objplot->name;
+						}
+						else {
+							$info = $id;
+						}
+
+						$isLeaf = isset($objplot->tabs);
+						if ($isLeaf) {
+							$plotTabs = array();
+							foreach ($objplot->tabs as $index => $tab) {
+								$plotTabs[$index] = array(
+									"name" => (!empty($tab->{'tab-name'})) ? $tab->{'tab-name'} : "Plot ".($index+1),
+									"id" => $tab->id,
+								);
 							}
 						}
+						else
+							$plotTabs = FALSE;
 						break;
 						case 'alias':
 							$info = $id;
 							$id = 'alias_'.$id;
+							$component_info = array();
+							if ($child->hasAttribute("index1"))
+								$component_info["index1"] = $child->getAttribute('index1');
+							if ($child->hasAttribute("index2"))
+								$component_info["index2"] = $child->getAttribute('index2');
+
+							if ($child->hasAttribute("parentId"))
+								$component_info["parentId"] = $child->getAttribute("parentId");
+								
+							if ($child->hasAttribute("iconCls"))
+								$iconCls = $child->getAttribute("iconCls");
+							
 							if ($isLeaf) $isParameter = true;
+							
 						break;
 						case 'timeTable':
@@ -254,8 +281,16 @@ class AmdaAction
 // 								}
 							}
-							if ($child->hasAttribute('units')) $info = $child->getAttribute('units');
-
+							if ($child->hasAttribute('units')) {
+							
+								$units = $child->getAttribute('units');
+								
+								if ($child->hasAttribute('description'))
+									$info = $child->getAttribute('description')."<br/>".$units;
+								else 
+									$info = $units;
+							}
+							
 							if ($child->tagName == 'parameter') {
 								$isParameter = true;
@@ -313,6 +348,7 @@ class AmdaAction
 								}
 							}
+
 							if ($isParameter) {
 								$objectMgr = new AliasMgr();
 								$alias = $objectMgr->getAlias($id);
@@ -561,7 +597,9 @@ class AmdaAction
 						}
 						$childrenToReturn[] = array('text' => $name, 'id' => $id, 'nodeType' => $nodeType, 'info' => $info,
-													'help' => $help, 'leaf' => $isLeaf, 'isParameter' => $isParameter, 'dim_1' => $dim_1, 'dim_2' => $dim_2);
+													'help' => $help, 'leaf' => $isLeaf, 'isParameter' => $isParameter, 'dim_1' => $dim_1, 'dim_2' => $dim_2, 'tabs' => $plotTabs,
+													'component_info' => isset($component_info) ? $component_info : NULL, 
+													'iconCls' => isset($iconCls) ? $iconCls : NULL );
 					}
 				}
 				// if $childrenToReturn we have to return []
@@ -757,6 +795,7 @@ class AmdaAction
 			   break;
 		  case 'condition' :
 		  case 'request' :
+                  case 'plottab' :
 			   $objectMgr = new RequestMgr($obj->nodeType);
 			   break;
 		  case 'alias' :
@@ -846,6 +885,7 @@ class AmdaAction
 				break;
 			case 'condition' :
 			case 'request' :
+			case 'plottab' :
 				$objectMgr = new RequestMgr($obj->nodeType);
 				break;
 			default:
@@ -915,7 +955,8 @@ class AmdaAction
 	}
 	private function executeRequest($obj, $function)
-	{ 
+	{ 				
+	
 		// Check user if access to DD Server and / or possible 'space consuming' action
 		if (  $function == FunctionTypeEnumClass::PARAMS ||
 				$function == FunctionTypeEnumClass::ACTION ||
@@ -30,7 +30,7 @@ class RequestMgr extends AmdaObjectMgr
 		$this->attributes = array('name' => '');
 		$this->optionalAttributes = array();
-		if ($type == 'request') 
+		if ($type == 'request' || $type == 'plottab') 
 		{
 			$this->id_prefix = 'req_';			
 		}
@@ -70,6 +70,52 @@ class RequestMgr extends AmdaObjectMgr
 	{	
 		return false;
 	}
+
+	public function validNameObject($p)
+	{
+		if ($this->type == 'plottab') {
+			if (empty($p->name)) {
+				return array('valid' => false, 'error' => 'Name is required');
+			}
+			return array('valid' => true);
+		}
+		return parent::validNameObject($p);
+	}
+
+	public function renameObject($p)
+        {
+		if ($this->type == 'plottab') {
+			//Rename a plot tab
+			if (!isset($p->parent) || empty($p->parent)) {
+				return array('error' => 'Missing parent definition');
+			}
+			$plotObj = $this->getObject($p->parent);
+			if (is_array($plotObj) && isset($plotObj['error'])) {
+				return array('error' => $plotObj['error']);
+			}
+			if (!isset($plotObj->tabs)) {
+				return array('error' => 'Cannot retrieve tab in plot request');
+			}
+			$renameOK = FALSE;
+			foreach ($plotObj->tabs as &$tab) {
+				if ($tab->id == $p->id) {
+					$tab->{'tab-name'} = $p->name;
+					$renameOK = TRUE;
+					break;
+				}
+			}
+			if (!$renameOK) {
+				return array('error' => 'Cannot retrieve tab in plot request 2');
+			}
+			//Save modification
+			$file = fopen(USERREQDIR.$p->parent, 'w');
+			fwrite($file, json_encode($plotObj));
+			fclose($file);
+			
+			return array('id' => $p->id);
+		}
+		return parent::renameObject($p);
+	}
 	/* Stop Time from StartTime and Interval*/ 
 	public function convertTime($obj)
@@ -144,7 +190,7 @@ class RequestMgr extends AmdaObjectMgr
 *    Make new request/condition resource file (JSON!!) and add it to content file
 *    ATTENTION : it is not DD parameter!!!
 */
-	protected function createParameter($p)
+	protected function createParameter($p, $folder)
 	{
 		if ($this -> objectExistsByName($p->name)) 
 		{
@@ -177,6 +223,19 @@ class RequestMgr extends AmdaObjectMgr
 				}
 			}
 		}
+
+		$additional = array();
+		if ($this->type == 'request') {
+			$additional['tabs'] = array();
+			if (isset($p->tabs)) {
+				foreach ($p->tabs as $index => $tab) {
+					$additional['tabs'][$index] = array(
+						"name" => (!empty($tab->{'tab-name'})) ? $tab->{'tab-name'} : "Plot ".($index+1),
+						"id" => $tab->id,
+					);
+				}
+			}
+		}
 		$this->descFileName = USERREQDIR.$this->id;
 		$p->id = $this->id;
@@ -184,10 +243,10 @@ class RequestMgr extends AmdaObjectMgr
 		$file = fopen($this->descFileName, 'w');
 		fwrite($file, json_encode($p));
 		fclose($file);
-		
+
 		$this -> addToContent($p, $folder);
-		return array('id' => $this->id, 'info' => $info);
+		return array('id' => $this->id, 'info' => $info) + $additional;
 	}
 	public static function checkRequest($obj)
@@ -225,7 +284,7 @@ class RequestMgr extends AmdaObjectMgr
 						{
 							$argsTab['param'] = array_unique($params);
 							$argsTab['startTime'] = $tab->{'multi-plot-linked'} ? $obj->startDate : $tab->startDate;
-							$argsTab['stopTime'] = $tab->{'multi-plot-linked'} ? $obj->startDate : $tab->stopDate;
+							$argsTab['stopTime'] = $tab->{'multi-plot-linked'} ? $obj->stopDate : $tab->stopDate;
 						}
 					}	
 					if (count($argsTab) > 0) $args[] = $argsTab;
@@ -255,8 +314,8 @@ class RequestMgr extends AmdaObjectMgr
 				{
 					// tab is not defined, iterate over $obj->tabs?
 					$argsTab['param'] = array_unique($params);
-					$argsTab['startTime'] = $tab->{'multi-plot-linked'} ? $obj->startDate : $tab->startDate;
-					$argsTab['stopTime'] = $tab->{'multi-plot-linked'} ? $obj->startDate : $tab->stopDate;
+					$argsTab['startTime'] = $obj->startDate;
+					$argsTab['stopTime'] = $obj->stopDate;
 				}
 				if (count($argsTab) > 0) $args[] = $argsTab;
@@ -452,10 +452,11 @@ class TimeTableMgr extends AmdaObjectMgr
 		$attributesToReturn['folderId'] = $folderId;
 		if (!$onlyDescription) {
-			$intNodes = $dom->getElementsByTagName('intervals');
+			$xpath = new DOMXPath($dom);
-			/** @var DOMElement $intNode */
-			foreach ($intNodes as $intNode) {
+			$intervals = $xpath->query('//intervals');
+
+			foreach ($intervals as $intNode) {
 				$startNodes = $intNode->getElementsByTagName('start');
 				if ($startNodes->length <= 0) {
 					return ['error' => 'Error detected in result file'];
@@ -63,7 +63,7 @@ define(&#39;EPNTAP_APIS&#39;, &#39;http://voparis-tap.obspm.fr/__system__/tap/run/tap/sync&#39;)
 define('EPNTAP_AMDA', 'http://cdpp-epntap.irap.omp.eu/__system__/tap/run/tap/sync');
 // PHP run-time settings 
-ini_set('memory_limit',128000000);
+ini_set('memory_limit',256000000);
 ini_set('max_execution_time',600); // max PHP execution
 ini_set('default_socket_timeout', 600); //TODO if this is needed ? IMPEX LONG DURATION WEBSERVICES