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

Myriam Bouchemit
2 parents b87da101 864d0212
Showing 38 changed files with 3730 additions and 2839 deletions Show diff stats
help/plotHOWTO
js/app/controllers/InteractiveModule.js
js/app/controllers/PlotModule.js
js/app/models/AmdaNode.js
js/app/models/AmdaTimeObject.js
js/app/models/BkgJobNode.js
js/app/models/DownloadNode.js
js/app/models/InteractiveNode.js
js/app/models/MultiplotNode.js
js/app/models/PlotNode.js
js/app/models/PlotObjects/MultiplotRequestObject.js
js/app/models/PlotObjects/PlotRequestObject.js
js/app/models/PlotObjects/PlotTabObject.js
js/app/models/PlotTabNode.js
js/app/views/ExplorerUI.js
js/app/views/IntervalUI.js
js/app/views/PlotComponents/PlotElementPanel.js
js/app/views/PlotComponents/PlotExtendShiftPlug.js
js/app/views/PlotComponents/PlotPreviewUI.js
js/app/views/PlotComponents/PlotStandardForm.js
 <li>1. To plot a parameter <i>drag</i> it from the Parameters tree and <i>drop</i> onto the panel  
-<li>2. <i>Link to MultiPlot</i> replaces the individual plot tab TimeSelector with the common for all plot tabs "MultiTime" Selector 
-<li>3. Check <i>Extended Plot Options</i> to get control over all available plot options
+<li>2. Check <i>Extended Plot Options</i> to get control over all available plot options
+ 
- 
 \ No newline at end of file
@@ -37,12 +37,15 @@ Ext.define(&#39;amdaDesktop.InteractiveModule&#39;, {
 	/**
 	 * Window Creation method of the Module
 	 */
-	createWindow : function (onShowEvent) {
+	createWindow : function (onShowEvent, onAfterCreateObject) {
 		if (this.linkedNode === null){		 
 			this.createLinkedNode();		
 		} 		
-		this.createObject();	 
+		this.createObject();
+                if (onAfterCreateObject) {
+                    onAfterCreateObject();
+                }
 		var desktop = this.app.getDesktop();		
 		var win = desktop.getWindow(this.id);	
 		var me = this;
@@ -13,8 +13,8 @@ Ext.define(&#39;amdaDesktop.PlotModule&#39;, {
 	requires: [
 	           'amdaUI.PlotUI',
-	           'amdaPlotObj.PlotRequestObject',
-	           'amdaModel.PlotNode',
+	           'amdaPlotObj.MultiplotRequestObject',
+	           'amdaModel.MultiplotNode',
 	           'amdaUI.PlotTabResultUI',
 	           'amdaPlotComp.PlotPreviewUI'
 	],
@@ -26,7 +26,7 @@ Ext.define(&#39;amdaDesktop.PlotModule&#39;, {
      * @cfg {String} data models
      * @required
      */
-    nodeDataModel : 'amdaModel.PlotNode',
+    nodeDataModel : 'amdaModel.MultiplotNode',
     /**
      * @cfg {String} window definitions
@@ -40,173 +40,197 @@ Ext.define(&#39;amdaDesktop.PlotModule&#39;, {
     plotResultWindowsManager : new Ext.AbstractManager(),
-    computeResultWindowSize : function(panelResult)
-	{
-	    var size = panelResult.getImageSize();
-	    size.width  += 30;
-	    size.height += 95;
-	    
-	    return size;
-	},
+    computeResultWindowSize : function(panelResult) {
+        var size = panelResult.getImageSize();
+        size.width  += 30;
+        size.height += 95;
+        return size;
+    },
-	computePreviewWindowSize : function(previewContent)
-	{
-	    var size = previewContent.getImageSize();
-	    size.width  += 30;
-	    size.height += 65;
-	    
-	    return size;
-	},
+    computePreviewWindowSize : function(previewContent) {
+        var size = previewContent.getImageSize();
+        size.width  += 30;
+        size.height += 65;
+        return size;
+    },
     updateInteractiveSession : function(session, newplot) {
-    	var me = this;
-    	
-    	
-    	
-    	Ext.each(session.result, function (tabResult, index) {
-		if (logExecTime && tabResult.exectime)
-		{
-			console.log("CMD EXEC TIME FOR "+tabResult.plot+" = "+tabResult.exectime+"ms");
-		}
+        var me = this;
-    		if (tabResult.preview)
-        	{
-    			var plotPreviewConfig = {
-    					folder   : session.folder,
-    					plotFile : tabResult.plot,
-    					context  : tabResult.context,
-    					tabId    : tabResult.id		
-    			};
-    			me.updatePreview(plotPreviewConfig);
-        		return;
-        	}
-    		
-    		var winResultId = tabResult.id+"-win";
-    		
-    		var winResult = me.getWindowResult(winResultId);
-    		
-    		var plotTabConfig = {
-					folder   : session.folder,
-					plotFile : tabResult.plot,
-					context  : tabResult.context,
-					tabId    : tabResult.id,
-					multiplot : tabResult.multiplot,
-					isInterval: tabResult.isInterval,
-					ttName : tabResult.ttName,
-					ttIndex : tabResult.ttIndex,
-					ttNbIntervals : tabResult.ttNbIntervals,
-					ttFileIndex : tabResult.ttFileIndex
-			};
+
+        Ext.each(session.result, function (tabResult, index) {
+            if (logExecTime && tabResult.exectime) {
+                console.log("CMD EXEC TIME FOR "+tabResult.plot+" = "+tabResult.exectime+"ms");
+            }
+
+            if (tabResult.preview) {
+                var plotPreviewConfig = {
+                    folder   : session.folder,
+                    plotFile : tabResult.plot,
+                    context  : tabResult.context,
+                    interactiveId    : tabResult.id		
+                };
+                me.updatePreview(plotPreviewConfig);
+                return;
+            }
+
+            var winResultId = tabResult.id+"-win";
-    		if (winResult == null) {
-    			
-    			var x = 50 + tabResult.index * 50;
-    		    var y = 100 + tabResult.index * 20;
-    			
-    			//create new result win
-    			var panelResult = new amdaUI.PlotTabResultUI(plotTabConfig);
+            var winResult = me.getWindowResult(winResultId);
-    			var size = me.computeResultWindowSize(panelResult);
+            var plotTabConfig = {
+                folder   : session.folder,
+                plotFile : tabResult.plot,
+                context  : tabResult.context,
+                interactiveId : tabResult.id,
+                isInterval: tabResult.isInterval,
+                ttName : tabResult.ttName,
+                ttIndex : tabResult.ttIndex,
+                ttNbIntervals : tabResult.ttNbIntervals,
+                ttFileIndex : tabResult.ttFileIndex
+            };
-    			var win = myDesktopApp.getDesktop().createWindow({
-    				id    : tabResult.id+"-win",
-    				title : 'Plot '+(tabResult.index+1),
-    				width : size.width,
-    				height: size.height,
-    				x : x,
-    				y : y,
-    				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, newplot);
-    			//update window size
-    			var size = me.computeResultWindowSize(winResult.getPanelResult());
-    			winResult.setSize(size.width, size.height);
-    			
-    			winResult.toFront();
-    		}
-    	});
+            if (winResult == null) {
+                var x = 50 + tabResult.index * 50;
+                var y = 100 + tabResult.index * 20;
+                //create new result win
+                var panelResult = new amdaUI.PlotTabResultUI(plotTabConfig);
+
+                var size = me.computeResultWindowSize(panelResult);
+
+                var win = myDesktopApp.getDesktop().createWindow({
+                    id    : tabResult.id+"-win",
+                    title : tabResult.title,
+                    width : size.width,
+                    height: size.height,
+                    x : x,
+                    y : y,
+                    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, newplot);
+                //update window size
+                var size = me.computeResultWindowSize(winResult.getPanelResult());
+                winResult.setTitle(tabResult.title);
+                winResult.setSize(size.width, size.height);
+                winResult.toFront();
+            }
+        });
     },
     closeInteractiveSession : function() {
-    	var me = this;
-    	this.plotResultWindowsManager.each(function (key, value, length) {
-    		value.close();
-    	});
+        var me = this;
+        this.plotResultWindowsManager.each(function (key, value, length) {
+            value.close();
+        });
     },
-    
+
     updatePreview : function(plotPreviewConfig) {
-    	var winPreviewId = "plot-preview-win";
-		
-		var winPreview = this.getWindowResult(winPreviewId);
-		
-		if (winPreview == null) {
-			//create new preview win
-			var previewContent = new amdaPlotComp.PlotPreviewUI(plotPreviewConfig);
-		
-			var size = this.computePreviewWindowSize(previewContent);
-			
-			var win = myDesktopApp.getDesktop().createWindow({
-				id    : winPreviewId,
-				title : 'Plot Preview',
-				width : size.width,
-				height: size.height,
-				layout: 'fit',
-				items : [ 
-				         previewContent 
-				],
-				listeners: {
-					scope: this,				  
-					beforeclose: function(win,opt) {
-						this.plotResultWindowsManager.unregister(win);
-					}
-				},
-				getPreviewContent: function() {
-					return previewContent;
-				}
-			});
-			win.show();
-			this.plotResultWindowsManager.register(win);
-		}
-		else
-		{
-			//update result
-			winPreview.getPreviewContent().updatePlotImage(plotPreviewConfig);
-			//update window size
-			var size = this.computePreviewWindowSize(winPreview.getPreviewContent());
-			winPreview.setSize(size.width, size.height);
-			winPreview.toFront();
-		}
-    },
-    
-    getInteractiveMultiPlotState : function() {
-    	var state = {};
-    	this.plotResultWindowsManager.each(function (key, value, length) {
-    		if (value.getPanelResult)
-    			state[value.getPanelResult().tabId] = value.getPanelResult().getInteractiveMultiPlotState();
-    	});
-    	return state;
+        var winPreviewId = "plot-preview-win";
+
+        var winPreview = this.getWindowResult(winPreviewId);
+
+        if (winPreview == null) {
+            //create new preview win
+            var previewContent = new amdaPlotComp.PlotPreviewUI(plotPreviewConfig);
+
+            var size = this.computePreviewWindowSize(previewContent);
+
+            var win = myDesktopApp.getDesktop().createWindow({
+                id    : winPreviewId,
+                title : 'Plot Preview',
+                width : size.width,
+                height: size.height,
+                layout: 'fit',
+                items : [ 
+                    previewContent 
+                ],
+                listeners: {
+                    scope: this,				  
+                    beforeclose: function(win,opt) {
+                        this.plotResultWindowsManager.unregister(win);
+                    }
+                },
+                getPreviewContent: function() {
+                    return previewContent;
+                }
+            });
+            win.show();
+            this.plotResultWindowsManager.register(win);
+        }
+        else {
+            //update result
+            winPreview.getPreviewContent().updatePlotImage(plotPreviewConfig);
+            //update window size
+            var size = this.computePreviewWindowSize(winPreview.getPreviewContent());
+            winPreview.setSize(size.width, size.height);
+            winPreview.toFront();
+        }
     },
     getWindowResult: function(winResultId){
 	    if (!this.plotResultWindowsManager.get(winResultId)) return null;
 	    return this.plotResultWindowsManager.get(winResultId);	    
+    },
+
+    addParameter : function(paramNode) {
+        var me = this;
+        var desktop = this.app.getDesktop();
+        var win = desktop.getWindow(this.id);
+        if (win) {
+            me.getUiContent().addParameter(paramNode, false);
+            win.show();
+        }
+        else {
+            this.createWindow(function () {
+                me.getUiContent().addParameter(paramNode, true);
+            });
+        }
+    },
+
+    editPlot : function(plotNode) {
+        var me = this;
+        var desktop = this.app.getDesktop();
+        var win = desktop.getWindow(this.id);
+        if (win) {
+            // Plot UI is opened => add plot in a new tab
+            me.getUiContent().editPlot(plotNode);
+            win.show();
+        }
+        else {
+            // Plot UI is closed
+            this.createWindow(null, function() {
+                //This is the onAfterCreateObject callback
+                //Add plot node to the multiplot object
+                me.linkedNode.get('object').plots().removeAll();
+                me.linkedNode.get('object').plots().add(plotNode);
+            });
+        }
+    },
+
+    syncAfterRename: function(renamedNode) {
+        var me = this;
+        var desktop = this.app.getDesktop();
+        var win = desktop.getWindow(this.id);
+        if (win) {
+            me.getUiContent().updateTabs();
+            me.getUiContent().updateRequestName(renamedNode);
+        }
     }
 });
@@ -128,20 +128,7 @@ Ext.define(&#39;amdaModel.AmdaNode&#39;, {
 		}
 		// if this node is a leaf and have no child
 		else if (this.isLeaf() || this.get('nodeType' ) ==  'derivedParam' ) {
-			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;
-			}
+			itemKind = amdaUI.ExplorerUI.ITEM_KIND_LEAF;
 		}
 		else if (this.get('isParameter') &&  this.get('nodeType' ) !=  'derivedParam' ) {
 					itemKind = amdaUI.ExplorerUI.ITEM_KIND_PARA;
@@ -7,11 +7,7 @@
  * 
  * @author elena
  * @version $Id: AmdaTimeObject.js 1534 2013-05-24 13:30:26Z myriam $ 
- * @todo Validations 
- ******************************************************************************
- *    FT Id     :   Date   : Name - Description
- ******************************************************************************
- *	:           :07/07/2011: elena – creation
+ * @todo Validations
  */
@@ -26,66 +22,70 @@ Ext.define(&#39;amdaModel.TTobject&#39;, {
      }
 }); 
-
 Ext.define('amdaModel.AmdaTimeObject', {	
     extend: 'amdaModel.AmdaObject',    
     statics:{
         inputTimeSrc: ['TimeTable','Interval','Catalog']
-    },	
+    },
     fields : [
-	      { name: 'resultId', type: 'string'}, 
-	      { name: 'folderId', type: 'string'}, 
-	      { name: 'processId', type: 'string'},
-	      { name: 'timesrc', type: 'string'/*, defaultValue: amdaModel.AmdaTimeObject.inputTimeSrc[1] /*'Interval'*/ },
-	      { name: 'startDate', type: 'date', defaultValue:Ext.Date.add(Ext.Date.clearTime(new Date()),Ext.Date.DAY,-1),
-		convert: function(value,rec) {
-		  if (!Ext.isDate(value)) {
-		    var valueString = new String(value);
-		    var date = new Date(valueString.replace(/\-/g,'\/').replace(/[T|Z]/g,' '));
-		      return date;
-		  }
-		  return value;
-		  }
-	      },
-	      { name: 'stopDate', type: 'date', defaultValue: Ext.Date.clearTime (new Date()), persist: false, 
-		convert: function(value,rec) {
-		   if (!Ext.isDate(value)){
-		    var valueString = new String(value);
-		    var date = new Date(valueString.replace(/\-/g,'\/').replace(/[T|Z]/g,' '));
-		      return date;
-		   }
-		   return value;
-		   }
-		  
-	      }, 
-	      { 
-	          name: 'durationDay', type: 'int',  
-	          convert: function(value, rec) {                 		 
-                  return Ext.String.leftPad(Math.floor((rec.get('stopDate') - rec.get('startDate'))/86400000),4,'0');      
-	          }
-	      }, 
-	      { 
-	          name: 'durationHour', type: 'int',  
-	          convert: function(value, rec) {
-	              var diffH = (rec.get('stopDate') - rec.get('startDate'))/3600000 % 24;
-	              return Ext.String.leftPad(Math.floor(diffH), 2, '0');      
-	          }
-	      }, 
-	      { 
-	          name: 'durationMin', type: 'int',  
-	          convert: function(value, rec) {
-	              var diffM = (rec.get('stopDate') - rec.get('startDate'))/60000 % 60;
-	              return Ext.String.leftPad(Math.floor(diffM), 2, '0');      
-	          }
-	      },
-	      { 
-	          name: 'durationSec', type: 'int',  
-	          convert: function(value, rec) {
-	              var diffS = (rec.get('stopDate') - rec.get('startDate'))/1000 % 60;
-	              return Ext.String.leftPad(Math.floor(diffS), 2, '0');      
-	          }
-	      }, 
-	      { name: 'timeTables', defaultValue: null }    // array of TTobject
-	 ]
-	 
+        { name: 'resultId', type: 'string'}, 
+        { name: 'folderId', type: 'string'}, 
+        { name: 'processId', type: 'string'},
+        { name: 'timesrc', type: 'string'/*, defaultValue: amdaModel.AmdaTimeObject.inputTimeSrc[1] /*'Interval'*/ },
+        { name: 'startDate', type: 'date', defaultValue:Ext.Date.add(Ext.Date.clearTime(new Date()),Ext.Date.DAY,-1),
+            convert: function(value,rec) {
+                if (!Ext.isDate(value)) {
+                    var valueString = new String(value);
+                    var date = new Date(valueString.replace(/\-/g,'\/').replace(/[T|Z]/g,' '));
+                        return date;
+                }
+                return value;
+            }
+        },
+        { 
+            name: 'stopDate', type: 'date', defaultValue: Ext.Date.clearTime (new Date()), persist: false, 
+            convert: function(value,rec) {
+                if (!Ext.isDate(value)){
+                    var valueString = new String(value);
+                    var date = new Date(valueString.replace(/\-/g,'\/').replace(/[T|Z]/g,' '));
+                    return date;
+                }
+                return value;
+            } 
+        }, 
+        { 
+            name: 'durationDay', type: 'int',  
+            convert: function(value, rec) {
+                var zoneOffset = rec.get('stopDate').getTimezoneOffset() - rec.get('startDate').getTimezoneOffset();
+                
+                return Ext.String.leftPad(Math.floor((rec.get('stopDate') - rec.get('startDate') - zoneOffset*60000)/86400000),4,'0');      
+            }
+        }, 
+        { 
+            name: 'durationHour', type: 'int',  
+            convert: function(value, rec) {
+                var zoneOffset = rec.get('stopDate').getTimezoneOffset() - rec.get('startDate').getTimezoneOffset(); 
+                var diffH = (rec.get('stopDate') - rec.get('startDate') - zoneOffset*60000)/3600000 % 24;
+                
+                return Ext.String.leftPad(Math.floor(diffH), 2, '0');      
+            }
+        }, 
+        { 
+            name: 'durationMin', type: 'int',  
+            convert: function(value, rec) {
+                var diffM = (rec.get('stopDate') - rec.get('startDate'))/60000 % 60;
+                
+                return Ext.String.leftPad(Math.floor(diffM), 2, '0');      
+            }
+        },
+        { 
+            name: 'durationSec', type: 'int',  
+            convert: function(value, rec) {
+                var diffS = (rec.get('stopDate') - rec.get('startDate'))/1000 % 60;
+                
+                return Ext.String.leftPad(Math.floor(diffS), 2, '0');      
+            }
+        }, 
+        { name: 'timeTables', defaultValue: null }    // array of TTobject
+    ]
 });
@@ -10,9 +10,6 @@
 Ext.define('amdaModel.BkgJobNode', {
 		extend: 'amdaModel.ExecutableNode',		
-		requires: [
-			'amdaPlotObj.PlotRequestObject'
-		],    
 		action : null,
 		statics: {       	 	 
@@ -62,90 +62,74 @@ Ext.define(&#39;amdaModel.DownloadNode&#39;, {
 		});
 	},
-	decodeObject: function(obj) {
-		var myValues  = new Object(); 		
-		myValues.list=[];
-		
-		if (!obj) {
-			var fullObject = this.get('realLinkedNode').get('object');	      
-		}
-		else {
-			var fullObject = obj;
-		}
-	   	  
-		var i = 0;		
-		fullObject.tabs().each(function (tab) {
-			// only active tab			
-			if (tab.get('id') == fullObject.get('last-plotted-tab'))
-			{			 
-				tab.panels().each(function (panel) {
-					panel.params().each(function (param) {
-						var myParam = new Object();
-						myParam.paramid =  param.get('paramid');
-						myParam.type =  param.get('type');
-						myParam['dim1-index'] = param.get('dim1-index');
-						myParam['dim1-sum-type'] = param.get('dim1-sum-type');
-						myParam['dim1-min-value'] =  param.get('dim1-min-value');
-						myParam['dim1-max-value'] =  param.get('dim1-max-value');
-						myParam['dim1-min-index'] =  param.get('dim1-min-index');
-						myParam['dim1-max-index'] =  param.get('dim1-max-index');
-						myParam['dim2-index'] = param.get('dim2-index');
-						myParam['dim2-sum-type'] = param.get('dim2-sum-type');
-						myParam['dim2-min-value'] =  param.get('dim2-min-value');
-						myParam['dim2-max-value'] =  param.get('dim2-max-value');
-						myParam['dim2-min-index'] =  param.get('dim2-min-index');
-						myParam['dim2-max-index'] =  param.get('dim2-max-index');
-						myParam.template_args = param.get('template_args');
-						if (!param.get('plotonly')) {
-							myValues.list[i] = myParam;
-							++i;
-						}
-						else 
-							alert('Parameter '+ myParam.paramid + ' is PlotOnly');						
-					});
-				});				
-				if (tab.get('multi-plot-linked'))
-				{
-					var object =  fullObject.data;
-				}
-				else 
-				{
-					var object =  tab.data;
-				}				
-				myValues.timesrc = object.timesrc;
-				// if there's at least one timeTable name into 'timeTables' collection
-				if (myValues.timesrc == amdaModel.AmdaTimeObject.inputTimeSrc[0]
-					&& object.timeTables 
-					&& object.timeTables.length ){
-					// get complete timeTables collection
-					var timeTables =  object.timeTables;	    
-					// init an empty array for timeTables
-					myValues.timeTables=[];
-					// for each interval record
-					Ext.Array.each(timeTables, function(item, index, all){
-						if (!item.$className) {
-							myValues.timeTables[index] = {timeTableName : item.timeTableName, id : item.id};
-						}
-						// get Json simplified value 
-						else {
-							myValues.timeTables[index] = item.getJsonValues();
-						}
-					});            
-				}
-				else {
-					myValues.startDate = object.startDate;
-					myValues.stopDate = object.stopDate;
-					myValues.durationDay = object.durationDay;
-					myValues.durationHour = object.durationHour;
-					myValues.durationMin = object.durationMin;
-					myValues.durationSec = object.durationSec;
-				}
-			}	
-		});
-	  
-		myValues.name = fullObject.get('name');
-		return myValues;
-	},
+    decodeObject: function(obj) {
+        var myValues  = new Object(); 		
+        myValues.list=[];
+
+        if (!obj) {
+            var fullObject = this.get('realLinkedNode').get('object');	      
+        }
+        else {
+            var fullObject = obj;
+        }
+
+        fullObject.panels().each(function (panel) {
+            panel.params().each(function (param) {
+                var myParam = new Object();
+                myParam.paramid =  param.get('paramid');
+                myParam.type =  param.get('type');
+                myParam['dim1-index'] = param.get('dim1-index');
+                myParam['dim1-sum-type'] = param.get('dim1-sum-type');
+                myParam['dim1-min-value'] =  param.get('dim1-min-value');
+                myParam['dim1-max-value'] =  param.get('dim1-max-value');
+                myParam['dim1-min-index'] =  param.get('dim1-min-index');
+                myParam['dim1-max-index'] =  param.get('dim1-max-index');
+                myParam['dim2-index'] = param.get('dim2-index');
+                myParam['dim2-sum-type'] = param.get('dim2-sum-type');
+                myParam['dim2-min-value'] =  param.get('dim2-min-value');
+                myParam['dim2-max-value'] =  param.get('dim2-max-value');
+                myParam['dim2-min-index'] =  param.get('dim2-min-index');
+                myParam['dim2-max-index'] =  param.get('dim2-max-index');
+                myParam.template_args = param.get('template_args');
+                if (!param.get('plotonly')) {
+                    myValues.list.push(myParam);
+                }
+                else 
+                    alert('Parameter '+ myParam.paramid + ' is PlotOnly');						
+            });
+        });				
+        myValues.timesrc = fullObject.get('timesrc');
+        // if there's at least one timeTable name into 'timeTables' collection
+        if (myValues.timesrc == amdaModel.AmdaTimeObject.inputTimeSrc[0]
+            && fullObject.get('timeTables')
+            && fullObject.get('timeTables').length){
+            // get complete timeTables collection
+            var timeTables =  fullObject.get('timeTables');	    
+            // init an empty array for timeTables
+            myValues.timeTables=[];
+            // for each interval record
+            Ext.Array.each(timeTables, function(item, index, all){
+                if (!item.$className) {
+                    myValues.timeTables[index] = {timeTableName : item.timeTableName, id : item.id};
+                }
+                // get Json simplified value 
+                else {
+                    myValues.timeTables[index] = item.getJsonValues();
+                }
+            });            
+        }
+        else {
+            myValues.startDate = fullObject.get('startDate');
+            myValues.stopDate = fullObject.get('stopDate');
+            myValues.durationDay = fullObject.get('durationDay');
+            myValues.durationHour = fullObject.get('durationHour');
+            myValues.durationMin = fullObject.get('durationMin');
+            myValues.durationSec = fullObject.get('durationSec');
+        }
+
+        myValues.name = fullObject.get('name');
+        return myValues;
+    },
 	encodeObject: function() {
 	},
@@ -11,10 +11,6 @@
 Ext.define('amdaModel.InteractiveNode', {
 	extend: 'amdaModel.AmdaNode',
-	requires: [
-		'amdaPlotObj.PlotRequestObject'
-	],
-
 	fields: [
 		{name: 'contextNode', type: 'amdaModel.AmdaNode', persist: false},
 		{name: 'objectDataModel', type: 'string', persist: false},
@@ -52,7 +48,7 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
 			{
 				node.eachChild(function(n)
 					{
-						if (!n.isLoaded() && !n.isRealLeaf())
+						if (!n.isLoaded() && !n.isLeaf())
 						{
 							nodesToLoad.push(n);
 							me.preloadTreeNode(n,nodesToLoad,onloaded);
@@ -70,7 +66,7 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
 					{
 						records.forEach(function (record)
 							{
-								if (!record.isLoaded() && !record.isRealLeaf())
+								if (!record.isLoaded() && !record.isLeaf())
 									{
 										nodesToLoad.push(record);
 										me.preloadTreeNode(record,nodesToLoad,onloaded);
@@ -100,11 +96,6 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
 		}
 	},
-	isRealLeaf: function()
-	{
-		return this.isLeaf();
-	},
-
 /**
 * this method is overriden into ExecutableNode to return true
 */
@@ -151,7 +142,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.isRealLeaf(), nodeType: this.get('nodeType')};
+		var dataToSend = {id : this.get('id'), old_name: this.modified.text, name: value,  parent : this.data.parentId, leaf: this.isLeaf(), nodeType: this.get('nodeType')};
 		AmdaAction.renameObject(dataToSend, callBackFn);
 	},
@@ -160,7 +151,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.isRealLeaf(), nodeType: this.get('nodeType')};
+		var dataToSend = {id : this.get('id'), old_name: this.get('name'), name: this.get('name'), parent : parentId, leaf: this.isLeaf(), nodeType: this.get('nodeType')};
 		AmdaAction.renameObject(dataToSend, callBackFn);
 	},
@@ -171,7 +162,7 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
 */
 	isValidName : function(name, callBackFn)
 	{
-		var dataToSend = {name: name, nodeType: this.get('nodeType'), leaf: this.isRealLeaf()};
+		var dataToSend = {name: name, nodeType: this.get('nodeType'), leaf: this.isLeaf()};
 		AmdaAction.validNameObject(dataToSend, callBackFn);
 	},
@@ -219,7 +210,12 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
 					// reload object into the view of corresponding Module
 					var me = this;
 					myDesktopApp.getLoadedModule(this.get('moduleId'), true, function (module) {
-						module.getUiContent().setObject(me.get('object'));
+						if (!opt || !opt.plot) {
+							module.getUiContent().setObject(me.get('object'));
+						}
+						else {
+							module.getUiContent().reloadPlot(me);
+						}
 					});
 				}
 				else {
@@ -459,16 +455,7 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
 	{
 		if (node.get('disable')) return;
 		myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.plot.id, true, function (module) {
-			if (!myDesktopApp.desktop.getWindow(myDesktopApp.dynamicModules.plot.id)) {
-				var request = Ext.create(amdaPlotObj.PlotRequestObject.$className);
-				var newNode = Ext.create(amdaModel.PlotNode.$className, { object : request });
-				// edit newNode into Plot Module with node as contextNode
-				newNode.editInModule();
-				if((node.get('globalStart') != null) && (node.get('globalStop') != null) && node.get('globalStart') != 'depending on mission' && node.get('isParameter')) {
-					module.getUiContent().setTimeFromData(node.getTimeFromNode(node));
-				}
-			}
-			module.getUiContent().addParameter(node);
+                    module.addParameter(node);
 		});
 	},
@@ -530,7 +517,7 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
 	deleteNode: function() {
 			// if the target is a directory
-			if (!this.isRealLeaf()) {
+			if (!this.isLeaf()) {
 				// determine if this directory is empty before launching the delete confirmation method
 				this.isNotEmptyDir(this.confirmDirectoryDeletion);
 			// else (the target is a leaf)
@@ -583,14 +570,14 @@ Ext.define(&#39;amdaModel.InteractiveNode&#39;, {
 */
 	realDelete : function()
 	{
-		AmdaAction.deleteObject({id: this.get('id'), leaf: this.isRealLeaf(), nodeType: this.get('nodeType')}, function(res,e){
+		AmdaAction.deleteObject({id: this.get('id'), leaf: this.isLeaf(), 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.isRealLeaf()){
+						if (this.isLeaf()){
 							var moduleId = this.get('moduleId');
 							// if really interactive node
 							if (moduleId) {
@@ -0,0 +1,25 @@
+/** 
+ * Project  : AMDA-NG4
+ * Name     : MultiplotNode.js
+ * @class   amdaModel.MutiplotNode
+ * @extends amdaModel.ExecutableNode
+ * @brief   Basic Model of Node corresponding to a multi-plot request
+ * @author  Benjamin Renard
+ */
+
+Ext.define('amdaModel.MultiplotNode', {
+    extend: 'amdaModel.ExecutableNode',
+
+    statics: {
+        nodeType: 'mutiplot' 
+    },
+
+    constructor : function(config){
+        this.callParent(arguments);
+        this.set('moduleId',myDesktopApp.dynamicModules.plot.id);
+        this.set('objectDataModel','amdaPlotObj.MultiplotRequestObject');
+        this.set('nodeType',this.self.nodeType);
+        this.set('leaf', true);
+    }
+
+});
@@ -8,49 +8,17 @@
  */
 Ext.define('amdaModel.PlotNode', {
-	extend: 'amdaModel.ExecutableNode',
-
-    fields : [
-        {name : 'tabs', type:'auto', defaultValue:false,  persist:  false}
-    ],
+    extend: 'amdaModel.ExecutableNode',
     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() {
@@ -76,10 +44,6 @@ Ext.define(&#39;amdaModel.PlotNode&#39;, {
          }, {
              fnId : 'leaf-deleteNode',
              text : 'Delete Request'
-         }, {
-             fnId : 'leaf-insertTabs',
-             text : 'Insert in current Plot Request'
-
          }];
         return menuItems;
@@ -128,35 +92,33 @@ Ext.define(&#39;amdaModel.PlotNode&#39;, {
         case 'deleteMulti':
             this.deleteMulti();
             break;
-        case 'insertTabs':
-	    this.insertPlotTabsRequest();
         default:
             break;
         }
     },
-    isRealLeaf: function()
+    //Override editInModule
+    editInModule : function (contextNode, onReady)
     {
-	var isFolder = (!this.isLeaf()) && (this.get('tabs') === false);
-        return !isFolder;
+        // set the contextNode of this node
+        this.set('contextNode',contextNode);
+
+        var me = this;
+        myDesktopApp.getLoadedModule(this.get('moduleId'),true, function (module) {
+            module.editPlot(me);
+        });
     },
-    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);
-					});
-				}
-			});
-		});
-	});
-    }
-   
+    //Override rename
+    rename: function(value,callBackFn)
+    {
+        var me = this;
+        var dataToSend = {id : this.get('id'), 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) {
+                module.syncAfterRename(me);
+            });
+        });
+     }
 });
@@ -0,0 +1,87 @@
+/**
+ * Project      : AMDA-NG
+ * Name         : MultiplotRequestObject.js
+ * @class   amdaPlotObj.MutiplotRequestObject
+ * @extends amdaModel.AmdaTimeObject
+ * @brief   Multi-Plot Request Business Object Definition 
+ * @author  Benjamin Renard
+ * @version $Id: MultiplotRequestObject.js benjamin $
+ ******************************************************************************
+ *    FT Id     :   Date   : Name - Description
+ ******************************************************************************
+ *	:           :28/02/2020: BRE  - file creation
+ */
+ 
+ 		
+Ext.define('amdaPlotObj.MultiplotRequestObject', {
+    extend: 'amdaModel.AmdaTimeObject',
+    idProperty: 'id',
+
+    requires: [
+        'amdaModel.PlotNode',
+        'amdaPlotObj.PlotRequestObject'
+    ],
+	
+    hasMany: {
+        model : 'amdaModel.PlotNode',
+        name  : 'plots',
+        associationKey:'plots'
+    },
+    
+    constructor: function(){
+    	var me = this;
+    	me.callParent(arguments);
+    },
+
+    isDirty: function() {
+        var dirty = false;
+        this.plots().each(function(plotNode) {
+            var plotObject = plotNode.get('object');
+            if (plotObject && (plotObject.get('id') != '') && plotObject.dirty) {
+                dirty = true;
+            }
+        });
+        return dirty;
+    },
+    
+    createNewPlot: function() {
+        var plotObject = Ext.create('amdaPlotObj.PlotRequestObject');
+        return this.createNewPlotFromObject(plotObject);
+    },
+
+    duplicatePlot: function(plotNode) {
+        var me = this;
+        var newPlotNode = null;
+        this.plots().each(function(node, index) {
+            if (node == plotNode) {
+                newPlotNode = Ext.create('amdaModel.PlotNode', {
+                    leaf : true
+                });
+		var data = plotNode.get('object').getJsonValues();
+                newPlotNode.set('object', Ext.create('amdaPlotObj.PlotRequestObject', data));
+		plotNode.get('object').reject();
+                me.plots().remove(plotNode);
+                me.plots().insert(index, [newPlotNode]);
+            }
+        });
+        return newPlotNode;
+    },
+
+    createNewPlotFromObject: function(plotObject) {
+        var plotNode = Ext.create('amdaModel.PlotNode', {
+            leaf : true
+        });
+        plotNode.set('object',plotObject);
+        this.plots().add(plotNode);
+        return this.plots().getAt(this.plots().count()-1);
+    },
+
+    removePlotByInternalId: function(internalId) {
+        var plotNode = this.plots().data.getByKey(internalId);
+        if (plotNode)
+            this.plots().remove(plotNode);
+    },
+
+    addPlot: function(plotNode) {
+    }
+});
@@ -5,11 +5,12 @@
  * @extends amdaModel.AmdaTimeObject
  * @brief   Plot Request Business Object Definition 
  * @author  Benjamin Renard
- * @version $Id: PlotRequestObject.js benjamin $
+ * @version $Id: PlotTabObject.js benjamin $
  ******************************************************************************
  *    FT Id     :   Date   : Name - Description
  ******************************************************************************
- *	:           :21/07/2015: BRE  - file creation
+ *	:           :22/07/2015: BRE  - file creation
+ *	             20/03/2020: BRE  - full rework
  */
@@ -19,122 +20,256 @@ Ext.define(&#39;amdaPlotObj.PlotRequestObject&#39;, {
 	requires: [
 	           'amdaPlotObj.PlotObjectConfig',
-	           'amdaPlotObj.PlotTabObject'
+	           'amdaPlotObj.PlotPanelObject',
+	           'amdaPlotObj.PlotLayoutVerticalObject',
+	           'amdaPlotObj.PlotLayoutAutoObject',
+	           'amdaPlotObj.PlotLayoutManualObject'
 	],
 	fields : [
-	          {name: 'id', type:'string'},
+              {name: 'tab-index', type: 'int', defaultValue: 0, persist: false},
+              {name: 'tab-title', type: 'string', defaultValue: '', persist: false},
+
               {name: 'file-format', type: 'string'},
               {name: 'file-output', type: 'string'},
               {name: 'file-prefix', type: 'string'},
               {name: 'one-file-per-interval', type: 'boolean'},
-              {name: 'last-plotted-tab', type: 'int', defaultValue: 0},
-              {name: 'last-tab-id', type: 'int', defaultValue: 0},
-	      {name: 'active-tab-id', type: 'int', defaultValue: 1}
+
+	      {name: 'tree-full-view', type: 'boolean'},
+	      {name: 'page-node-state', type: 'int', defaultValue: 2}, //0 : collapsed, 1 : expanded, 2 : not set 
+	      {name: 'panels-node-state', type: 'int', defaultValue: 2},  //0 : collapsed, 1 : expanded, 2 : not set
+
+	      {name: 'page-title-text', type: 'string'},
+              {name: 'page-title-color', type: 'string'},
+              {name: 'page-title-position', type: 'string'},
+              {name: 'page-title-alignment', type: 'string'},
+              {name: 'page-title-font-activated', type: 'boolean'},
+              {name: 'page-title-font-name', type: 'string'},
+              {name: 'page-title-font-size', type: 'int'},
+              {name: 'page-title-font-bold', type: 'boolean'},
+              {name: 'page-title-font-italic', type: 'boolean'},
+              {name: 'page-margins-activated', type: 'boolean'},
+              {name: 'page-margin-x', type: 'float'},
+              {name: 'page-margin-y', type: 'float'},
+              {name: 'page-mode', type: 'string'},
+              {name: 'page-orientation', type: 'string'},
+              {name: 'page-dimension', type: 'string'},
+              {name: 'page-superpose-mode', type: 'boolean'},
+              {name: 'page-font-activated', type: 'boolean'},
+              {name: 'page-font-name', type: 'string'},
+              {name: 'page-font-size', type: 'int'},
+              {name: 'page-font-bold', type: 'boolean'},
+              {name: 'page-font-italic', type: 'boolean'},
+              {name: 'page-layout-type', type: 'string'},
+              {name: 'page-layout-object', type: 'auto', defaultValue: null},
+              {name: 'last-panel-id', type: 'int', defaultValue: 0}
     ],
-    hasMany: {
-    		model : 'amdaPlotObj.PlotTabObject',
-    		name  : 'tabs',
-    		associationKey:'tabs'
-    },
+    associations : [
+              {
+            	  type : 'hasMany', 
+            	  model : 'amdaPlotObj.PlotPanelObject',
+            	  name  : 'panels'
+              }
+    ],
     constructor: function(){
-    	var me = this;
-    	me.callParent(arguments);
-        if ((arguments.length > 0) && arguments[0] && arguments[0].tabs)
+        var me = this;
+        me.callParent(arguments);
+        if ((arguments.length > 0) && arguments[0])
         {
-        	if (arguments[0].tabs)
-        		me.loadTabs(arguments[0].tabs);
+        	if (arguments[0].panels)
+        		me.loadPanels(arguments[0].panels);
+        	if (arguments[0]['page-layout-object'])
+        		me.loadLayoutObject(arguments[0]['page-layout-object']);
         }
         else
         {
         	//new object, set default fields values
         	me.setDefaultValues();
-        	//New object, force the creation of the first tab
-        	me.createNewTab();
         }
+        this.dirty = false;
     },
-    loadTabs: function(tabs)
+    loadPanels: function(panels)
     {
-       this.tabs().loadData(tabs);
+       this.panels().loadData(panels);
+       this.updatePanelIndex();
     },
-    setDefaultValues: function()
+    loadLayoutObject: function(layout)
     {
-    	this.set('file-format', amdaPlotObj.PlotObjectConfig.defaultValues.file.format);
-    	this.set('file-output', amdaPlotObj.PlotObjectConfig.defaultValues.file.output);
-    	this.set('file-prefix', '');
-    	this.set('one-file-per-interval', amdaPlotObj.PlotObjectConfig.defaultValues.file.oneFilePerInterval);
-    	this.set('last-plotted-tab', 0);
-    	this.set('name', '');
+    	this.set('page-layout-object', this.createLayoutByType(this.get('page-layout-type'), layout));
+    	if (this.get('page-layout-object') != null)
+    		this.get('page-layout-object').dirty = false;
     },
-    createNewTab: function() {
-    	this.set('last-tab-id', this.get('last-tab-id') + 1);
-	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();
-	}
+    createNewPanel: function() {
+    	this.set('last-panel-id', this.get('last-panel-id') + 1);
+    	var recs = this.panels().add({id : this.get('last-panel-id')});
+    	recs[0].setDefaultValues();
     	this.dirty = true;
-	return recs[0];
+    	this.updatePanelIndex();
+		return recs[0];
     },
-    removeTabById: function(tabId) {
-    	//Retrieve tab record
-    	var tabRecord = this.tabs().getById(tabId);
-    	if (tabRecord == null)
+    removePanelById: function(panelId) {
+    	//Retrieve panel record
+    	var panelRecord = this.panels().getById(panelId);
+    	if (panelRecord == null)
     		return false;
-    	this.tabs().remove(tabRecord);
+    	this.panels().remove(panelRecord);
     	this.dirty = true;
+    	this.updatePanelIndex();
     	return true;
     },
-    isDirty : function()
+    updatePanelIndex: function() {
+    	this.panels().each(function(panel, index) {
+    		panel.set('panel-index', index);
+    	});
+    },
+    
+    createLayoutByType : function(layoutType, data)
     {
-    	if (this.get('id') == '')
-    		return false;
+    	//Create layout object in relation with the type
+    	switch (layoutType)
+    	{
+    	case 'vertical' :
+    		return new amdaPlotObj.PlotLayoutVerticalObject(data);
+    	case 'auto' :
+    		return new amdaPlotObj.PlotLayoutAutoObject(data);
+    	case 'manual' :
+    		return new amdaPlotObj.PlotLayoutManualObject(data);
+     	default :
+     		return null;
+    	}
+    },
+    
+    setLayout: function(layoutType)
+    {
+    	if (layoutType == this.get('page-layout-type'))
+    		return;
+    	
+    	this.set('page-layout-type', layoutType);
+    	this.set('page-layout-object', this.createLayoutByType(layoutType));
+    },
+    
+    setDefaultValues: function()
+    {
+        this.set('file-format', amdaPlotObj.PlotObjectConfig.defaultValues.file.format);
+        this.set('file-output', amdaPlotObj.PlotObjectConfig.defaultValues.file.output);
+        this.set('file-prefix', '');
+        this.set('one-file-per-interval', amdaPlotObj.PlotObjectConfig.defaultValues.file.oneFilePerInterval);
+        this.set('name', '');
+
+    	this.set('tree-full-view', amdaPlotObj.PlotObjectConfig.defaultValues.tree.fullView);
+    	this.set('page-title-text', '');
+    	this.set('page-title-color', amdaPlotObj.PlotObjectConfig.defaultValues.page.title.color);
+    	this.set('page-title-position', amdaPlotObj.PlotObjectConfig.defaultValues.page.title.position);
+    	this.set('page-title-alignment', amdaPlotObj.PlotObjectConfig.defaultValues.page.title.alignment);
+    	
+    	this.set('page-title-font-activated', false);
+    	this.set('page-title-font-name', amdaPlotObj.PlotObjectConfig.defaultValues.page.font.name);
+    	this.set('page-title-font-size', amdaPlotObj.PlotObjectConfig.defaultValues.page.font.size);
+    	this.set('page-title-font-bold', false);
+    	this.set('page-title-font-italic', false);
+    	
+    	this.set('page-margins-activated', false);
+    	this.set('page-margin-x', amdaPlotObj.PlotObjectConfig.defaultValues.page.xMargin);
+    	this.set('page-margin-y', amdaPlotObj.PlotObjectConfig.defaultValues.page.yMargin);
+    	this.set('page-mode', amdaPlotObj.PlotObjectConfig.defaultValues.page.mode);
+    	this.set('page-orientation', amdaPlotObj.PlotObjectConfig.defaultValues.page.orientation);
+    	this.set('page-dimension', amdaPlotObj.PlotObjectConfig.defaultValues.page.dimension);
+    	this.set('page-superpose-mode', false);
+    	this.set('page-font-activated', false);
+    	this.set('page-font-name', amdaPlotObj.PlotObjectConfig.defaultValues.page.font.name);
+    	this.set('page-font-size', amdaPlotObj.PlotObjectConfig.defaultValues.page.font.size);
+    	this.set('page-font-bold', false);
+    	this.set('page-font-italic', false);
+    	
+    	this.setLayout(amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.type);
+    },
+    
+    getPageShortInfo : function()
+    {
+    	var dimension = amdaPlotObj.PlotObjectConfig.getValueByKey(amdaPlotObj.PlotObjectConfig.availablePageDimensions, this.get('page-dimension'));
+		var orientation = amdaPlotObj.PlotObjectConfig.getValueByKey(amdaPlotObj.PlotObjectConfig.availablePageOrientations, this.get('page-orientation'));
+		
+		var info = dimension+', '+orientation;
+		if (this.get('page-superpose-mode'))
+			info += ', Epoch superposed mode';
+		return info;
+    },
+    
+    getLayoutShortInfo : function()
+    {
+    	var type = amdaPlotObj.PlotObjectConfig.getValueByKey(amdaPlotObj.PlotObjectConfig.availablePageLayouts, this.get('page-layout-type'));
+		return type;
+    },
+    
+    isDirty : function()
+    {
     	if (this.dirty)
     		return true;
+    	if (this.get('page-layout-object') != null)
+    		if (this.get('page-layout-object').dirty)
+    			return true;
+    	
     	var d = false;
-    	this.tabs().each(function (tab, index) {
-    		if (tab.isDirty())
+    	this.panels().each(function (panel, index) {
+    		if (panel.isDirty())
     			d = true;
     	});
     	return d;
     },
-    getJsonValues : function(hasId) 
+    getJsonValues : function() 
     {
     	var requestValues  = new Object();
+
+        requestValues['nodeType'] = 'request';
+        requestValues['leaf'] = true;
-    	requestValues['nodeType'] = 'request';
-    	
-    	if (hasId) {
-    		requestValues['id'] = this.get('id');
-        }
-    	
-    	requestValues['leaf'] = true;
+    	requestValues['id'] = this.get('id');
+        requestValues['tab-index'] = this.get('tab-index');
+        requestValues['tab-title'] = this.get('tab-title');
+        requestValues['name'] = this.get('name');
+
+        requestValues['file-format'] = this.get('file-format');
+        requestValues['file-output'] = this.get('file-output');
+        requestValues['file-prefix'] = this.get('file-prefix');
+        requestValues['one-file-per-interval'] = this.get('one-file-per-interval');
+
+    	requestValues['tree-full-view'] = this.get('tree-full-view');
+    	requestValues['page-node-state'] = this.get('page-node-state');
+    	requestValues['panels-node-state'] = this.get('panels-node-state');
+
+    	requestValues['page-title-text'] = this.get('page-title-text');
+    	requestValues['page-title-color'] = this.get('page-title-color');
+    	requestValues['page-title-position'] = this.get('page-title-position');
+    	requestValues['page-title-alignment'] = this.get('page-title-alignment');
+    	requestValues['page-title-font-activated'] = this.get('page-title-font-activated');
+    	requestValues['page-title-font-name'] = this.get('page-title-font-name');
+    	requestValues['page-title-font-size'] = this.get('page-title-font-size');
+    	requestValues['page-title-font-bold'] = this.get('page-title-font-bold');
+    	requestValues['page-title-font-italic'] = this.get('page-title-font-italic');
+    	requestValues['page-margins-activated'] = this.get('page-margins-activated');
+    	requestValues['page-margin-x'] = this.get('page-margin-x');
+    	requestValues['page-margin-y'] = this.get('page-margin-y');
+    	requestValues['page-mode'] = this.get('page-mode');
+    	requestValues['page-orientation'] = this.get('page-orientation');
+    	requestValues['page-dimension'] = this.get('page-dimension');
+    	requestValues['page-superpose-mode'] = this.get('page-superpose-mode');
+    	requestValues['page-font-activated'] = this.get('page-font-activated');
+    	requestValues['page-font-name'] = this.get('page-font-name');
+    	requestValues['page-font-size'] = this.get('page-font-size');
+    	requestValues['page-font-bold'] = this.get('page-font-bold');
+    	requestValues['page-font-italic'] = this.get('page-font-italic');
-    	requestValues['file-format'] = this.get('file-format');
-    	requestValues['file-output'] = this.get('file-output');
-    	requestValues['file-prefix'] = this.get('file-prefix');
-    	requestValues['one-file-per-interval'] = this.get('one-file-per-interval');
-    	requestValues['last-plotted-tab'] = this.get('last-plotted-tab');
-    	requestValues['name'] = this.get('name');
-		
-    	requestValues['timesrc'] =  this.get('timesrc'); 
-			
+    	requestValues['timesrc'] =  this.get('timesrc');       
         // if there's at least one timeTable name into 'timeTables' collection
         if (this.get('timesrc') == amdaModel.AmdaTimeObject.inputTimeSrc[0] && this.get('timeTables') && this.get('timeTables').length){
             // get complete timeTables collection
@@ -152,23 +287,26 @@ Ext.define(&#39;amdaPlotObj.PlotRequestObject&#39;, {
             	}
             });            
         } else {
-				requestValues['startDate'] = this.get('startDate');	
-				requestValues['stopDate'] = this.get('stopDate'); 
-				requestValues['durationDay'] = this.get('durationDay');
-				requestValues['durationHour'] = this.get('durationHour');
-				requestValues['durationMin'] = this.get('durationMin');
-				requestValues['durationSec'] = this.get('durationSec');
-			}
+        	requestValues['startDate'] = this.get('startDate');	
+            requestValues['stopDate'] = this.get('stopDate'); 
+            requestValues['durationDay'] = this.get('durationDay');
+            requestValues['durationHour'] = this.get('durationHour');
+            requestValues['durationMin'] = this.get('durationMin');
+            requestValues['durationSec'] = this.get('durationSec');
+        }
-	requestValues['tabs'] = [];
-
-	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');
-		
-	return requestValues;
+    	requestValues['page-layout-type'] = this.get('page-layout-type');
+    	if (this.get('page-layout-object') != null)
+    		requestValues['page-layout-object'] = this.get('page-layout-object').getJsonValues();
+    	
+    	requestValues['panels'] = [];
+    	
+    	this.panels().each(function (panel, index) {
+    		requestValues['panels'][index] = panel.getJsonValues();
+    	});
+    	
+    	requestValues['last-panel-id'] = this.get('last-panel-id');
+    	
+    	return requestValues;
     }
 });
@@ -1,294 +0,0 @@
-/**
- * Project      : AMDA-NG
- * Name         : PlotTabObject.js
- * @class   amdaPlotObj.PlotTabObject
- * @extends amdaModel.AmdaTimeObject
- * @brief   Plot Tab Business Object Definition 
- * @author  Benjamin Renard
- * @version $Id: PlotTabObject.js benjamin $
- ******************************************************************************
- *    FT Id     :   Date   : Name - Description
- ******************************************************************************
- *	:           :22/07/2015: BRE  - file creation
- */
- 
- 		
-Ext.define('amdaPlotObj.PlotTabObject', {
-	extend: 'amdaModel.AmdaTimeObject',
-	idProperty: 'id',
-	
-	requires: [
-	           'amdaPlotObj.PlotObjectConfig',
-	           'amdaPlotObj.PlotPanelObject',
-	           'amdaPlotObj.PlotLayoutVerticalObject',
-	           'amdaPlotObj.PlotLayoutAutoObject',
-	           'amdaPlotObj.PlotLayoutManualObject'
-	],
-	
-	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 
-	          {name: 'panels-node-state', type: 'int', defaultValue: 2},  //0 : collapsed, 1 : expanded, 2 : not set
-	          {name: 'page-title-text', type: 'string'},
-              {name: 'page-title-color', type: 'string'},
-              {name: 'page-title-position', type: 'string'},
-              {name: 'page-title-alignment', type: 'string'},
-              {name: 'page-title-font-activated', type: 'boolean'},
-              {name: 'page-title-font-name', type: 'string'},
-              {name: 'page-title-font-size', type: 'int'},
-              {name: 'page-title-font-bold', type: 'boolean'},
-              {name: 'page-title-font-italic', type: 'boolean'},
-              {name: 'page-margins-activated', type: 'boolean'},
-              {name: 'page-margin-x', type: 'float'},
-              {name: 'page-margin-y', type: 'float'},
-              {name: 'page-mode', type: 'string'},
-              {name: 'page-orientation', type: 'string'},
-              {name: 'page-dimension', type: 'string'},
-              {name: 'page-superpose-mode', type: 'boolean'},
-              {name: 'page-font-activated', type: 'boolean'},
-              {name: 'page-font-name', type: 'string'},
-              {name: 'page-font-size', type: 'int'},
-              {name: 'page-font-bold', type: 'boolean'},
-              {name: 'page-font-italic', type: 'boolean'},
-              {name: 'page-layout-type', type: 'string'},
-              {name: 'page-layout-object', type: 'auto', defaultValue: null},
-              {name: 'last-panel-id', type: 'int', defaultValue: 0}
-    ],
-    
-    associations : [
-              {
-            	  type : 'hasMany', 
-            	  model : 'amdaPlotObj.PlotPanelObject',
-            	  name  : 'panels'
-              },
-              {
-            	  type  : 'belongsTo',
-                  model : 'amdaPlotObj.PlotRequestObject'
-              }
-    ],
-    
-    constructor: function(){
-        var me = this;
-        me.callParent(arguments);
-        if ((arguments.length > 0) && arguments[0])
-        {
-        	if (arguments[0].panels)
-        		me.loadPanels(arguments[0].panels);
-        	if (arguments[0]['page-layout-object'])
-        		me.loadLayoutObject(arguments[0]['page-layout-object']);
-        }
-        else
-        {
-        	//new object, set default fields values
-        	me.setDefaultValues();
-        }
-        this.dirty = false;
-    },
-    
-    loadPanels: function(panels)
-    {
-       this.panels().loadData(panels);
-       this.updatePanelIndex();
-    },
-    
-    loadLayoutObject: function(layout)
-    {
-    	this.set('page-layout-object', this.createLayoutByType(this.get('page-layout-type'), layout));
-    	if (this.get('page-layout-object') != null)
-    		this.get('page-layout-object').dirty = false;
-    },
-    
-    createNewPanel: function() {
-    	this.set('last-panel-id', this.get('last-panel-id') + 1);
-    	var recs = this.panels().add({id : this.get('last-panel-id')});
-    	recs[0].setDefaultValues();
-    	this.dirty = true;
-    	this.updatePanelIndex();
-		return recs[0];
-    },
-    
-    removePanelById: function(panelId) {
-    	//Retrieve panel record
-    	var panelRecord = this.panels().getById(panelId);
-    	if (panelRecord == null)
-    		return false;
-    	this.panels().remove(panelRecord);
-    	this.dirty = true;
-    	this.updatePanelIndex();
-    	return true;
-    },
-    
-    updatePanelIndex: function() {
-    	this.panels().each(function(panel, index) {
-    		panel.set('panel-index', index);
-    	});
-    },
-    
-    createLayoutByType : function(layoutType, data)
-    {
-    	//Create layout object in relation with the type
-    	switch (layoutType)
-    	{
-    	case 'vertical' :
-    		return new amdaPlotObj.PlotLayoutVerticalObject(data);
-    	case 'auto' :
-    		return new amdaPlotObj.PlotLayoutAutoObject(data);
-    	case 'manual' :
-    		return new amdaPlotObj.PlotLayoutManualObject(data);
-     	default :
-     		return null;
-    	}
-    },
-    
-    setLayout: function(layoutType)
-    {
-    	if (layoutType == this.get('page-layout-type'))
-    		return;
-    	
-    	this.set('page-layout-type', layoutType);
-    	this.set('page-layout-object', this.createLayoutByType(layoutType));
-    },
-    
-    setDefaultValues: function()
-    {
-    	this.set('tree-full-view', amdaPlotObj.PlotObjectConfig.defaultValues.tree.fullView);
-    	
-    	this.set('multi-plot-linked', false);
-    	
-    	this.set('page-title-text', '');
-    	this.set('page-title-color', amdaPlotObj.PlotObjectConfig.defaultValues.page.title.color);
-    	this.set('page-title-position', amdaPlotObj.PlotObjectConfig.defaultValues.page.title.position);
-    	this.set('page-title-alignment', amdaPlotObj.PlotObjectConfig.defaultValues.page.title.alignment);
-    	
-    	this.set('page-title-font-activated', false);
-    	this.set('page-title-font-name', amdaPlotObj.PlotObjectConfig.defaultValues.page.font.name);
-    	this.set('page-title-font-size', amdaPlotObj.PlotObjectConfig.defaultValues.page.font.size);
-    	this.set('page-title-font-bold', false);
-    	this.set('page-title-font-italic', false);
-    	
-    	this.set('page-margins-activated', false);
-    	this.set('page-margin-x', amdaPlotObj.PlotObjectConfig.defaultValues.page.xMargin);
-    	this.set('page-margin-y', amdaPlotObj.PlotObjectConfig.defaultValues.page.yMargin);
-    	this.set('page-mode', amdaPlotObj.PlotObjectConfig.defaultValues.page.mode);
-    	this.set('page-orientation', amdaPlotObj.PlotObjectConfig.defaultValues.page.orientation);
-    	this.set('page-dimension', amdaPlotObj.PlotObjectConfig.defaultValues.page.dimension);
-    	this.set('page-superpose-mode', false);
-    	this.set('page-font-activated', false);
-    	this.set('page-font-name', amdaPlotObj.PlotObjectConfig.defaultValues.page.font.name);
-    	this.set('page-font-size', amdaPlotObj.PlotObjectConfig.defaultValues.page.font.size);
-    	this.set('page-font-bold', false);
-    	this.set('page-font-italic', false);
-    	
-    	this.setLayout(amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.type);
-    },
-    
-    getPageShortInfo : function()
-    {
-    	var dimension = amdaPlotObj.PlotObjectConfig.getValueByKey(amdaPlotObj.PlotObjectConfig.availablePageDimensions, this.get('page-dimension'));
-		var orientation = amdaPlotObj.PlotObjectConfig.getValueByKey(amdaPlotObj.PlotObjectConfig.availablePageOrientations, this.get('page-orientation'));
-		
-		var info = dimension+', '+orientation;
-		if (this.get('page-superpose-mode'))
-			info += ', Epoch superposed mode';
-		return info;
-    },
-    
-    getLayoutShortInfo : function()
-    {
-    	var type = amdaPlotObj.PlotObjectConfig.getValueByKey(amdaPlotObj.PlotObjectConfig.availablePageLayouts, this.get('page-layout-type'));
-		return type;
-    },
-    
-    isDirty : function()
-    {
-    	if (this.dirty)
-    		return true;
-    	
-    	if (this.get('page-layout-object') != null)
-    		if (this.get('page-layout-object').dirty)
-    			return true;
-    	
-    	var d = false;
-    	this.panels().each(function (panel, index) {
-    		if (panel.isDirty())
-    			d = true;
-    	});
-    	return d;
-    },
-    
-    getJsonValues : function() 
-    {
-    	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');
-    	tabValues['panels-node-state'] = this.get('panels-node-state');
-    	tabValues['page-title-text'] = this.get('page-title-text');
-    	tabValues['page-title-color'] = this.get('page-title-color');
-    	tabValues['page-title-position'] = this.get('page-title-position');
-    	tabValues['page-title-alignment'] = this.get('page-title-alignment');
-    	tabValues['page-title-font-activated'] = this.get('page-title-font-activated');
-    	tabValues['page-title-font-name'] = this.get('page-title-font-name');
-    	tabValues['page-title-font-size'] = this.get('page-title-font-size');
-    	tabValues['page-title-font-bold'] = this.get('page-title-font-bold');
-    	tabValues['page-title-font-italic'] = this.get('page-title-font-italic');
-    	tabValues['page-margins-activated'] = this.get('page-margins-activated');
-    	tabValues['page-margin-x'] = this.get('page-margin-x');
-    	tabValues['page-margin-y'] = this.get('page-margin-y');
-    	tabValues['page-mode'] = this.get('page-mode');
-    	tabValues['page-orientation'] = this.get('page-orientation');
-    	tabValues['page-dimension'] = this.get('page-dimension');
-    	tabValues['page-superpose-mode'] = this.get('page-superpose-mode');
-    	tabValues['page-font-activated'] = this.get('page-font-activated');
-    	tabValues['page-font-name'] = this.get('page-font-name');
-    	tabValues['page-font-size'] = this.get('page-font-size');
-    	tabValues['page-font-bold'] = this.get('page-font-bold');
-    	tabValues['page-font-italic'] = this.get('page-font-italic');
-    	
-    	tabValues['timesrc'] =  this.get('timesrc');       
-        // if there's at least one timeTable name into 'timeTables' collection
-        if (this.get('timesrc') == amdaModel.AmdaTimeObject.inputTimeSrc[0] && this.get('timeTables') && this.get('timeTables').length){
-            // get complete timeTables collection
-            var timeTables = this.get('timeTables');	    
-            // init an empty array for timeTables
-            tabValues['timeTables'] = [];
-            // for each interval record
-            Ext.Array.each(timeTables, function(item, index, all){
-            	if (!item.$className) {
-            		tabValues['timeTables'][index] = {timeTableName : item.timeTableName, id : item.id};
-            	}
-            	// get Json simplified value 
-            	else {
-            		tabValues['timeTables'][index] = item.getJsonValues();
-            	}
-            });            
-        } else {
-        	tabValues['startDate'] = this.get('startDate');	
-            tabValues['stopDate'] = this.get('stopDate'); 
-            tabValues['durationDay'] = this.get('durationDay');
-            tabValues['durationHour'] = this.get('durationHour');
-            tabValues['durationMin'] = this.get('durationMin');
-            tabValues['durationSec'] = this.get('durationSec');
-        }
-    	
-    	tabValues['page-layout-type'] = this.get('page-layout-type');
-    	if (this.get('page-layout-object') != null)
-    		tabValues['page-layout-object'] = this.get('page-layout-object').getJsonValues();
-    	
-    	tabValues['panels'] = [];
-    	
-    	this.panels().each(function (panel, index) {
-    		tabValues['panels'][index] = panel.getJsonValues();
-    	});
-    	
-    	tabValues['last-panel-id'] = this.get('last-panel-id');
-    	
-    	return tabValues;
-    }
-});
@@ -1,164 +0,0 @@
-/** 
- * 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);
-					}
-				}
-			});
-		});
-        },
-});
@@ -102,7 +102,6 @@ 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'
 	},
@@ -354,7 +353,6 @@ 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')
@@ -577,7 +575,7 @@ Ext.define(&#39;amdaUI.ExplorerUI&#39;, {
 						});
 					}
-					if (record.isLeaf() || record.data.isParameter || (record.data.tabs && (record.data.tabs.length > 0)))                                                                                                                                     
+					if (record.isLeaf() || record.data.isParameter)                                                                                                                                     
 						switch (record.get('nodeType'))
 						{
 							case 'myData' :
@@ -591,9 +589,6 @@ Ext.define(&#39;amdaUI.ExplorerUI&#39;, {
 							case 'condition' :
 								record.editLeaf();
 								break;
-							case 'plottab' :
-								record.editPlotTab();
-								break;
 							case 'localParam' :
 							case 'remoteParam':
 							case 'remoteSimuParam':
@@ -1029,7 +1024,7 @@ Ext.define( &#39;MyTreeEditor&#39;, {
 									event.record.commit();
 									var rec = event.record.data;
 									// in case of directory
-									if (!rec.leaf && (rec.nodeType != 'plottab')){
+									if (!rec.leaf){
 										// set folder's ID returned by server
 										rec.id = result.id;
 									}
@@ -125,6 +125,9 @@ Ext.define(&#39;amdaUI.IntervalUI&#39;, {
 		if (stop != null && start != null) {
             if ( stop <= start ) {
                 form.findField('stopDate').markInvalid('Stop Time  must be after Start Time');
+            } else {
+                if (!form.findField('stopDate').isValid())
+                    form.findField('stopDate').clearInvalid();
             }
 			// compute offset
 			var zoneOffset = stop.getTimezoneOffset() - start.getTimezoneOffset();
@@ -159,6 +162,21 @@ Ext.define(&#39;amdaUI.IntervalUI&#39;, {
 		);
 	},
+        isValid: function() {
+            var form = this.findParentByType('form').getForm();
+            var startField = form.findField('startDate');
+            var stopField = form.findField('stopDate');
+            if (!startField.isValid() || !stopField.isValid())
+                return false;
+            var start = this.getStartTime();
+            var stop = this.getStopTime();
+            if ( stop <= start ) {
+                form.findField('stopDate').markInvalid('Stop Time  must be after Start Time');
+                return false;
+            }
+            return true;
+        },
+
 	updateStop: function() {
 		var form = this.findParentByType('form').getForm();
 		var start = form.findField('startDate').getValue();
@@ -10,6 +10,7 @@
 Ext.define('amdaPlotComp.PlotElementPanel', {
 	extend: 'Ext.form.Panel',
+
 	elementFormsManager : new Ext.AbstractManager(),
@@ -21,7 +21,7 @@ Ext.define(&#39;amdaPlotComp.PlotExtendShiftPlug&#39;, {
 	id: 'plot-extendshift-plug',
 	win : null,
 	form : null,
-	tabId : '',
+	interactiveId : '',
 	constructor: function(config) {            
 		Ext.apply(this, config);            
@@ -39,7 +39,7 @@ Ext.define(&#39;amdaPlotComp.PlotExtendShiftPlug&#39;, {
 /**
  *  creation of the window
  */        
-    show : function(tabId) {          
+    show : function(interactiveId) {          
     	if (!this.win)
     	{
     		this.win = new Ext.Window({                
@@ -77,7 +77,7 @@ Ext.define(&#39;amdaPlotComp.PlotExtendShiftPlug&#39;, {
     		Ext.PluginManager.register(this);
     	}
-    	this.tabId = tabId;
+    	this.interactiveId = interactiveId;
     	this.win.show();
     	this.win.setPosition(0,0);	
     },
@@ -111,7 +111,7 @@ Ext.define(&#39;amdaPlotComp.PlotExtendShiftPlug&#39;, {
     	var durationUnitField = this.form.getForm().findField('durationUnit');
     	var duration = this.toSec(durationField.getValue(), durationUnitField.getValue());
     	if (duration) {
-    		this.hostCmp.callInteractivePlot({'action' : actionType, 'tabId' : this.tabId, 'duration' : duration});	                								   
+    		this.hostCmp.callInteractivePlot({'action' : actionType, 'interactiveId' : this.interactiveId, 'duration' : duration});	                								   
     	}	
     	else
     		myDesktopApp.errorMsg('No duration defined');	
@@ -190,4 +190,4 @@ Ext.define(&#39;amdaPlotComp.PlotExtendShiftPlug&#39;, {
     	});   
     	return this.form;   
     }    
-});
 \ No newline at end of file
+});
@@ -80,7 +80,7 @@ Ext.define(&#39;amdaPlotComp.PlotPreviewUI&#39;, {
 	var me = this;
     	this.crtContext = configResult.context;
-    	this.tabId = configResult.tabId;
+    	this.interactiveId = configResult.interactiveId;
     	this.sliderPage = new Ext.slider.Single({
             width: 130,
@@ -136,7 +136,7 @@ Ext.define(&#39;amdaPlotComp.PlotPreviewUI&#39;, {
 					me.hiddenForm.getForm().submit({
 						params: {
 							sessionId: sessionID,
-							tabId : me.tabId,
+							interactiveId : me.interactiveId,
 							preview: true
 						},
 						success: function(form, action) {},
@@ -87,7 +87,6 @@ Ext.define(&#39;amdaPlotComp.PlotStandardForm&#39;, {
 		allowBlank = (typeof allowBlank !== 'undefined') ? allowBlank : false;
 		return {
-                            id:name,
 	        xtype: 'numberfield',
 	        name: name,
 	        fieldLabel: label,
@@ -112,7 +111,6 @@ Ext.define(&#39;amdaPlotComp.PlotStandardForm&#39;, {
 		allowBlank = (typeof allowBlank !== 'undefined') ? allowBlank : false;
 		return {
-                                                            id:name,
 			xtype: 'textfield',
 			name: name,
 			fieldLabel: label,
@@ -9,86 +9,242 @@
  */
 Ext.define('amdaPlotComp.PlotTabContent', {
-	extend: 'Ext.form.Panel',
-	
-	requires: [
-	           'amdaUI.TimeSelectorUI',
-	           'amdaPlotComp.PlotTree'
+    extend: 'Ext.form.Panel',
+
+    requires: [
+        'amdaUI.TimeSelectorUI',
+        'amdaPlotComp.PlotTree',
+        'amdaPlotComp.PlotOutputForm',
+        'amdaPlotComp.PlotElementPanel'
     ],
-    treePlot: null,
-    
-    //Link to the Plot Element Panel
-    plotElementPanel: null,
-    
-    //linkk to the Plot Tab Panel
-    plotTabPanel : null,
-    
-    //Link to the time selctor
-    timeSelector : null,
-    
-    //Tab Object
-    object: null,
+    //Link to the Plot Node
+    plotNode: null,
+
+    //Save initial request data to have the possibility to reject all modifications
+    initialObjectData: null,
+
+    timeSelector: null,
+    plotTree: null,
+    plotElement: null,
+    plotOutput: null,
+
+    tabIndex: 0,
+    plotTabPanel: null,
     constructor: function(config) {
 		this.init(config);	    
 		this.callParent(arguments);
-	},
-	
-	setTabObject : function(object) {
-		this.object = object;
-		this.treePlot.buildTree(this.object);
-		this.timeSelector.intervalSel.setInterval(this.object.get('startDate'), this.object.get('stopDate'));
-		this.addTTs(this.object.get('timeTables'));
-	},
-	
-	addTTs : function(TTarray) {
-		// set TTTab	    
-		this.timeSelector.setTTTab(TTarray);
-	},
-	
-	updateLinkedToMultiPlotMode : function (isLinkedToMultiPlotMode) {
-		this.timeSelector.setVisible(!isLinkedToMultiPlotMode);
-		this.plotTabPanel.updateLinkedToMultiPlotMode(isLinkedToMultiPlotMode);
-	},
-	
-	updateTimeObject : function() {
-		var timeSource = this.timeSelector.getActiveTimeSource();
-    	var tabForm = this.getForm();
-    	tabForm.updateRecord(this.object);
-    	this.object.set('timesrc', timeSource);
-    	if (timeSource === amdaModel.AmdaTimeObject.inputTimeSrc[0])
-        	this.object.set('timeTables',this.timeSelector.TTGrid.getStore().data.items);
-	},
+    },
+
+    setTime : function(startDate, stopDate) {
+        this.timeSelector.intervalSel.setInterval(startDate, stopDate);
+        
+    },
-	init : function(config) {
-		var me = this;
-		
-		this.plotElementPanel = config.plotElementPanel;
-		this.plotTabPanel = config.plotTabPanel;
-		
-		this.timeSelector = new amdaUI.TimeSelectorUI( { id: 'plotTimeSelectorTab' + config.tabId, border : false, flex: 3, collapsible: true, collapseDirection : 'bottom',  hidden: true} );
-		this.treePlot = new amdaPlotComp.PlotTree({flex: 5.6, plotElementPanel: this.plotElementPanel, plotTabContent: this});
-		
-		var myConf = {
-				bodyStyle: { background : '#dfe8f6' },
-				border : false,
-				defaults: {
-					border: false
-				},
-				layout: {
-				    type: 'vbox',
-				    pack: 'start',
-				    align: 'stretch'
-				},
-				items: [
-				        this.treePlot,
-				        this.timeSelector
-				]
-		};
+    updateTimeObject : function() {
+        var timeSource = this.timeSelector.getActiveTimeSource();
+        var tabForm = this.getForm();
+        tabForm.updateRecord(this.plotNode.get('object'));
+        this.plotNode.get('object').set('timesrc', timeSource);
+        if (timeSource === amdaModel.AmdaTimeObject.inputTimeSrc[0])
+            this.plotNode.get('object').set('timeTables',this.timeSelector.TTGrid.getStore().data.items);
+    },
+
+    doPlot : function() {
+        this.plotNode.get('object').set('tab-index', this.tabIndex);
+        this.plotNode.get('object').set('tab-title', this.getPlotTitle());
+        this.plotNode.execute();
+    },
+
+    getPlotTitle: function() {
+       return (this.plotNode.get('text') != '') ? this.plotNode.get('text') : 'Plot '+(this.tabIndex + 1); 
+    },
+
+    savePlot : function() {
+        var me = this;
+
+        var object = this.plotNode.get('object');
+        if (!object)
+            return;
+
+        if ((object.get('id') != '') && (this.plotNode.get('text') == object.get('name'))) {
+            //update existing request
+            this.updateTimeObject();
+            this.plotNode.update({plot: true, callback: function() {
+                me.setPlotNode(me.plotNode); //to update initial request data
+                me.plotTabPanel.updatePlotTabs();
+            }});
+            return;
+        }
+
+        //save new request
+        this.plotNode.isValidName(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 :  function(btn) {
+                                if (btn == 'cancel') return;
+                                me.saveProcess(true);
+                            },
+                            scope : me
+                        });
+                    }
+                    else {
+                        myDesktopApp.errorMsg(res.error);
+                    }
+                }
+                else {
+                    myDesktopApp.errorMsg('Invalid object name');
+                }
+                return;
+            }
+            me.saveProcess(false);
+        });
+    },
+
+    saveProcess : function(toRename) {
+        var me = this;
+        if (toRename) {
+            this.updateTimeObject();
+            this.plotNode.update({plot: true, callback: function() {
+                me.setPlotNode(me.plotNode); //to update initial request data
+                me.plotTabPanel.updatePlotTabs();
+            }});
+        }
+        else {
+            if (this.plotNode.get('object').get('id') != '') {
+                //Duplicate request
+                var plotModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.plot.id);
+                if (!plotModule)
+                    return;
+                var newPlotNode = plotModule.linkedNode.get('object').duplicatePlot(this.plotNode);
+                if (newPlotNode) {
+                    //Reject modifications in old plot node
+                    this.plotNode.reject();
+                    this.plotNode.set('object', Ext.create('amdaPlotObj.PlotRequestObject', this.initialObjectData));
+                    //Set new plot node
+                    this.setPlotNode(newPlotNode);
+                }
+            }
+            this.updateTimeObject();
+            this.plotNode.create({callback: function() {
+                me.plotNode.commit();
+                me.setPlotNode(me.plotNode); //to update initial request data
+                me.plotTabPanel.updatePlotTabs();
+                me.updateUI();
+            }});
+        }
+    },
+
+    getDataProcess : function() {
+        var downObject = amdaModel.DownloadNode.decodeObject(this.plotNode.get('object'));
+        amdaModel.DownloadNode.set('object',Ext.create('amdaModel.Download',downObject));
+        amdaModel.DownloadNode.editInModule();
+    },
+
+    isValidRequest : function(acceptEmptyTTList = true) {
+        this.updateTimeObject();
+        if (!this.timeSelector.isValid(acceptEmptyTTList)) {
+            myDesktopApp.errorMsg('Error in Time definition');
+            return false;
+        }
+        return true;
+    },
+
+    updateUI : function() {
+        this.plotOutput.setObject(this.plotNode.get('object'));
+        this.timeSelector.intervalSel.setInterval(this.plotNode.get('object').get('startDate'), this.plotNode.get('object').get('stopDate'));
+	this.timeSelector.intervalSel.updateStop();
+        this.timeSelector.setTTTab(this.plotNode.get('object').get('timeTables'));
+        this.timeSelector.timeSrc.setActiveTab(this.plotNode.get('object').get('timesrc'));
+        this.treePlot.buildTree(this.plotNode.get('object'));
+    },
+
+    setPlotNode : function(plotNode) {
+        this.initialObjectData = plotNode.get('object').getJsonValues();
+        this.plotNode = plotNode;
+    },
+
+    init : function(config) {
+        this.setPlotNode(config.plotNode);
+        this.tabIndex = config.tabIndex;
+        this.plotTabPanel = config.plotTabPanel;
+
+        this.timeSelector = new amdaUI.TimeSelectorUI( { id: Ext.id()/*'plotTimeSelectorTab' + this.plotNode.id*/, border : false, flex: 6, collapsible: true, collapseDirection : 'bottom'} );
+        this.plotElement = new amdaPlotComp.PlotElementPanel({flex: 11});
+        this.treePlot = new amdaPlotComp.PlotTree({flex: 11, plotElementPanel: this.plotElement});
+        this.plotOutput = new amdaPlotComp.PlotOutputForm({flex: 6, collapseDirection : 'bottom', collapsible : true });
+
+        var treePanel = new Ext.form.Panel({
+            flex: 1,
+            layout: {
+                type: 'vbox',
+                pack: 'start',
+                align: 'stretch'
+            },
+            bodyStyle: { background : '#dfe8f6' },
+            defaults: {
+                border: false
+            },
+            items: [
+                this.treePlot,
+                this.timeSelector
+            ]
+        });
+
+        var optionsPanel = new Ext.form.Panel({
+            flex: 1,
+            layout: {
+                type: 'vbox',
+                pack: 'start',
+                align: 'stretch'
+            },
+            bodyStyle: { background : '#dfe8f6' },
+            defaults: {
+                border: false
+            },
+            items: [
+                this.plotElement,
+                this.plotOutput
+            ]
+        });
+
-		Ext.apply (this , Ext.apply (arguments, myConf));
+        var myConf = {
+            bodyStyle: { background : '#dfe8f6' },
+            border : false,
+            defaults: {
+                border: false
+            },
+            layout: {
+                type: 'hbox',
+                pack: 'start',
+                align: 'stretch'
+            },
+            items: [
+                treePanel,
+                optionsPanel
+            ],
+            listeners: {
+                afterrender: function(comp, eOpts) {
+                    this.updateUI();
+                },
+                scope: this
+            }
+        };
+
+        Ext.apply (this , Ext.apply (arguments, myConf));
-	}
-});
 \ No newline at end of file
+    }
+});
@@ -9,206 +9,178 @@
  */
 Ext.define('amdaPlotComp.PlotTabPanel', {
-	extend: 'Ext.tab.Panel',
+    extend: 'Ext.tab.Panel',
-	requires: [
-	           'amdaPlotComp.PlotTabContent'
-	],
+    requires: [
+        'amdaPlotComp.PlotTabContent'
+    ],
-	//Link to the Plot Element Panel
-    plotElementPanel: null,
-    
     //Link to the Plot UI
     plotUI : null,
-	//Request object
-	object: null,
+    //Multiplot object
+    multiplot_object: null,
+
+    tabbar_destroy : false,
-	constructor: function(config) {
-		this.init(config);	    
-		this.callParent(arguments);
-	},
+    constructor: function(config) {
+        this.init(config);	    
+        this.callParent(arguments);
+    },
-	setRequestObject: function(object)
-	{
-		var me = this;
-		this.removeAll();
-		this.object = object;
+    setMultiplotObject: function(multiplot_object) {
+        var me = this;
+        this.removeAll();
+        this.multiplot_object = multiplot_object;
-		var haveSelectedTab = false;
-		this.object.tabs().each(function (rec, index) {
-			if (rec.get('id') == me.object.get('active-tab-id')) {
-				haveSelectedTab = true;
-			}
-		});
+        this.multiplot_object.plots().each(function (rec, index) {
+            this.addPlotNode(rec, index == 0);
+        }, this);
+    },
-		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);
-	},
+    reloadPlot : function(plotNode) {
+        for (i = 0; i < this.items.getCount(); ++i)
+        {
+            var tabItem = this.items.getAt(i);
+            var tabContent = tabItem.items.getAt(0);
+            if (plotNode == tabContent.plotNode) {
+                tabContent.updateUI();
+            }
+        }
+    },
-	addPlotTab: function(tabObject, selectTab)
-	{
-		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: (tabObject.get('tab-name') != '') ? tabObject.get('tab-name') : 'Plot '+tabNumber,
-    		closable: true,
-    		layout: 'fit',
-    		bodyStyle: 'background: none',
-    		defaults: {
-				border: false
-			},
-    		items: [
-    		        tabContent
-    		],
-    		listeners : {
-    			scope : this,
-    			beforeclose: function( tab, eOpts ) {
-    				if (this.items.getCount() == 1)
-    				{
-    					myDesktopApp.warningMsg('You need to keep at least one plot definition');
-    					return false;
-    				}
-    				return true;
-    			},
-    			close: function( tab, eOpts ) {
-    				if (tab.items.getAt(0).object)
-    					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);
-			}
-    		}
-    	});
+    addPlotNode: function(plotNode, selectTab)
+    {
+        for (i = 0; i < this.items.getCount(); ++i)
+        {
+            var tabItem = this.items.getAt(i);
+            var tabContent = tabItem.items.getAt(0);
+            if (plotNode == tabContent.plotNode) {
+                //Already opened => select tab
+                this.setActiveTab(tabItem);
+                return;
+            }
+        }
+
+        var tabNumber = this.getTabBar().items.getCount();
+        var tabContent = new amdaPlotComp.PlotTabContent({plotNode: plotNode, tabIndex: tabNumber-1, plotTabPanel: this});
+        var me = this;
+        var tabComp = this.add({
+            title: tabContent.getPlotTitle(),
+            closable: true,
+            layout: 'fit',
+            bodyStyle: 'background: none',
+            defaults: {
+                border: false
+            },
+            items: [
+                tabContent
+            ],
+            listeners : {
+                scope : this,
+                beforeclose: function( tab, eOpts ) {
+                    if (this.items.getCount() == 1)
+                    {
+                        myDesktopApp.warningMsg('You need to keep at least one plot definition');
+                        return false;
+                    }
+                    return true;
+                },
+                close: function( tab, eOpts ) {
+                    if (tab.items.getAt(0).plotNode) {
+                        this.multiplot_object.removePlotByInternalId(tab.items.getAt(0).plotNode.internalId);
+                    }
+                },
+                destroy: function(tab, eOpts) {
+                    if (!this.tabbar_destroy)
+                        this.updatePlotTabs();
+                }
+            }
+        });
-    	if (selectTab)
-    		this.setActiveTab(tabComp);
+        if (selectTab)
+            this.setActiveTab(tabComp);
-    	return tabContent;
-	},
+        return tabContent;
+    },
-	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;
-			}
-		});
+    updatePlotTabs: function()
+    {
+        for (i = 0; i < this.items.getCount(); ++i)
+        {
+            var tabItem = this.items.getAt(i);
+            var tabContent = tabItem.items.getAt(0);
+            tabContent.tabIndex = i;
+            var plotNode = tabContent.plotNode;
+            var title = tabContent.getPlotTitle();
+            tabItem.setTitle(title);
+            if (!this.getActiveTab())
+                this.setActiveTab(tabItem);
+        }
+    },
-		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;
-			tabItem.setTitle((tabObj.get('tab-name') != '') ? tabObj.get('tab-name') : 'Plot '+tabNumber);
-			tabContent.setTabObject(tabObj);
-		}
-	},
-	
-	updateLinkedToMultiPlotMode : function(isLinkedToMultiPlotMode) {
-		this.plotUI.updateLinkedToMultiPlotMode(isLinkedToMultiPlotMode);
-	},
-	
-	updateTimeObject : function() {
-		for (i = 0; i < this.items.getCount(); ++i)
-		{
-			this.items.getAt(i).items.getAt(0).updateTimeObject();
-		}
-	},
+    updateRequestName: function(renamedNode)
+    {
+        for (i = 0; i < this.items.getCount(); ++i)
+        {
+            var tabItem = this.items.getAt(i);
+            var tabContent = tabItem.items.getAt(0);
+            var plotNode = tabContent.plotNode;
+            if (plotNode == renamedNode) {
+		plotNode.get('object').set('name', renamedNode.get('text'));
+                tabContent.updateUI();
+            }
+        }
+    },
+
+    getCurrentPlotTabContent : function() {
+        if (this.getActiveTab())
+            return this.getActiveTab().child();
+        return null;
+    },
-	getTreeFromPlotTab: function(plotTab)
-	{
-		return plotTab.child().treePlot;
-	},
+    updateTimeObjects : function() {
+        for (i = 0; i < this.items.getCount(); ++i)
+        {
+            this.items.getAt(i).items.getAt(0).updateTimeObject();
+        }
+    },
-	getSelectedTabId: function()
-	{
-		if (this.getActiveTab())
-			return this.getActiveTab().child().tabId;
-		return 0;
-	},
+    getTreeFromPlotTab: function(plotTab)
+    {
+        return plotTab.child().treePlot;
+    },
-	init : function(config) {
-		var me = this;
-		
-		this.plotElementPanel = config.plotElementPanel;
-		this.plotUI = config.plotUI;
-		
-		var myConf = {
-				plain: true,
-				bodyStyle: { background : '#dfe8f6' },
-				border : false,
-				defaults: {
-					border: false
-				},	
-				tabBar:{
-					items:[
-					       {
-					    text:'+',
-					    closable: false,
-					    handler:function(btn,e){
-					    	var tabContent = me.addPlotTab(me.object.createNewTab(), true);
-					    }
-					}]
-				},
-				
-				listeners: {
-					tabchange: function(tabPanel, newCard, oldCard, eOpts ) {
-						var newCardTree = this.getTreeFromPlotTab(newCard);
-						var selectedNode = newCardTree.getSelectedNode();
-						if (selectedNode == null)
-							me.plotElementPanel.resetElement();
-						else
-							me.plotElementPanel.setElement(selectedNode.type,selectedNode.object, newCardTree);
-						newCardTree.updateLinkedToMultiPlotMode();
-					},
-					scope: me
-				}
-		};
-		
-		Ext.apply (this , Ext.apply (arguments, myConf));
-	}
+    init : function(config) {
+        var me = this;
+
+        this.plotUI = config.plotUI;
+
+        var myConf = {
+            plain: true,
+            bodyStyle: { background : '#dfe8f6' },
+            border : false,
+            defaults: {
+                border: false
+            },	
+            tabBar:{
+                items:[
+                    {
+                        text:'+',
+                        closable: false,
+                        handler:function(btn,e){
+                            var tabContent = me.addPlotNode(me.multiplot_object.createNewPlot(), true);
+                        }
+                    }
+                ],
+                listeners: {
+                    beforedestroy: function(tabbar, eOpts) {
+                        me.tabbar_destroy = true;
+                    }
+                }
+            }
+        };
+
+        Ext.apply (this , Ext.apply (arguments, myConf));
+    }
 });
@@ -18,7 +18,6 @@ Ext.define(&#39;amdaPlotComp.PlotTree&#39;, {
 	//Link to the combo box to define the use of the simplified view
 	simplifiedViewCombo : null,
-	//Link to the combo to attach the tab to the multi plot mode
 	//Link to the Plot Element Panel
     plotElementPanel: null,
@@ -63,7 +62,6 @@ Ext.define(&#39;amdaPlotComp.PlotTree&#39;, {
 		this.suspendLayouts();
 		this.buildPanelsNode();
 		this.simplifiedViewCombo.setValue(this.tabObject.get('tree-full-view'));
-		this.linkToMultiPlotCombo.setValue(this.tabObject.get('multi-plot-linked'));
 		this.resumeLayouts(true);
 	},
@@ -853,10 +851,6 @@ Ext.define(&#39;amdaPlotComp.PlotTree&#39;, {
         }
 	},
-	updateLinkedToMultiPlotMode : function() {
-		this.plotTabContent.updateLinkedToMultiPlotMode(this.tabObject.get('multi-plot-linked'));
-	},
-	
 	init : function(config) {
 		var me = this;
@@ -891,21 +885,6 @@ Ext.define(&#39;amdaPlotComp.PlotTree&#39;, {
 			}
 		});
-		this.linkToMultiPlotCombo = Ext.create('Ext.form.field.Checkbox', {
-			xtype: 'checkbox',
-			boxLabel: 'Link to MultiPlot',
-			listeners: {
-				change: function(combo, newValue, oldValue, eOpts) {
-					if (this.tabObject)
-					{
-			        	this.tabObject.set('multi-plot-linked', newValue);
-			        	this.updateLinkedToMultiPlotMode();
-					}
-				},
-			    scope: this
-			}
-		});
-		
 		var myConf = {
 				store: store,
 				rootVisible: false,
@@ -959,8 +938,6 @@ Ext.define(&#39;amdaPlotComp.PlotTree&#39;, {
 			        	   scope: this
 			           },
 			           '-', '->',
-			           this.linkToMultiPlotCombo,
-			           ' ',
 			           this.simplifiedViewCombo
 			    ]
 		};
@@ -26,7 +26,7 @@ Ext.define(&#39;amdaPlotComp.PlotZoomPlug&#39;, {
   win: null,
   form: null,
   zoomType: '',
-  tabId: '',
+  interactiveId: '',
   panelId: -1,
   linkedTTCatNode: null,
@@ -101,7 +101,7 @@ Ext.define(&#39;amdaPlotComp.PlotZoomPlug&#39;, {
   /**
    *  creation of the window
    */
-  show: function (tabId, zoomType, panelId) {
+  show: function (interactiveId, zoomType, panelId) {
     if (!this.win) {
       this.win = new Ext.Window({
         id: 'plot-zoom-win-' + this.hostCmp.ownerCt.getId(), // Plot window ID
@@ -136,7 +136,7 @@ Ext.define(&#39;amdaPlotComp.PlotZoomPlug&#39;, {
       Ext.PluginManager.register(this);
     }
-    this.tabId = tabId;
+    this.interactiveId = interactiveId;
     this.updateWinByType(zoomType, panelId);
     this.win.show();
     this.win.setPosition(0, 0);
@@ -407,7 +407,7 @@ Ext.define(&#39;amdaPlotComp.PlotZoomPlug&#39;, {
             this.hostCmp.callInteractivePlot({
               'action': 'zoom',
-              'tabId': this.tabId,
+              'interactiveId': this.interactiveId,
               'panelId': this.panelId,
               'axeId': this.zoomType,
               'min': minZoom,
@@ -423,7 +423,7 @@ Ext.define(&#39;amdaPlotComp.PlotZoomPlug&#39;, {
           handler: function () {
             this.hostCmp.callInteractivePlot({
               'action': 'undozoom',
-              'tabId': this.tabId,
+              'interactiveId': this.interactiveId,
               'panelId': this.panelId,
               'axeId': this.zoomType
             });
@@ -22,8 +22,7 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
 	panelImage : null,
 	crtContext : null,
-	tabId : '',
-	multiPlotCheck : null,
+	interactiveId : '',
 	navToolBar : null,
 	isTTNavBar : false,
 	crtTTFileIndex : 0,
@@ -55,12 +54,6 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
 		return 'data/'+sessionID +'/RES/'+resultFolder+ '/' + plotFile;
 	},
-	getInteractiveMultiPlotState: function() {
-		if (!this.multiPlotCheck)
-			return false;
-		return this.multiPlotCheck.getValue();
-	},
-    
 	toPixelOnSourceImage : function(value) {
 		return value*100/this.sliderPage.getValue();
 	},
@@ -147,7 +140,7 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
 				me.contextualMenu.add({
 					text:'Zoom on Time Axis',
 					handler : function(item, e) {
-						zoomPlugin.show(me.tabId, axis.id, panelContext.id);
+						zoomPlugin.show(me.interactiveId, axis.id, panelContext.id);
 						zoomPlugin.resetMinMaxValue();
 						me.panelImage.startZoom(true, 0/*me.toPixelOnResultImage(panelContext.y)*/, size.height /*me.toPixelOnResultImage(panelContext.height)*/, onMinTimeSelection, onMaxTimeSelection);
 					},
@@ -156,7 +149,7 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
 				insertIntervalItem = {
 					text:'Insert Interval in TimeTable or Catalog',
 					handler : function(item, e) {
-						zoomPlugin.show(me.tabId, axis.id, panelContext.id);
+						zoomPlugin.show(me.interactiveId, axis.id, panelContext.id);
 						zoomPlugin.resetMinMaxValue();
 						me.panelImage.startZoom(true, 0/*me.toPixelOnResultImage(panelContext.y)*/, size.height /*me.toPixelOnResultImage(panelContext.height)*/, onMinTimeSelection, onMaxTimeSelection);
 					},
@@ -167,7 +160,7 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
 				me.contextualMenu.add({
 					text:'Zoom on Y Left Axis',
 					handler : function(item, e) {
-						zoomPlugin.show(me.tabId, axis.id, panelContext.id);
+						zoomPlugin.show(me.interactiveId, axis.id, panelContext.id);
 						zoomPlugin.resetMinMaxValue();
 						me.panelImage.startZoom(false, me.toPixelOnResultImage(panelContext.x), me.toPixelOnResultImage(panelContext.width), onMinYValueSelection, onMaxYValueSelection);
 					}
@@ -177,7 +170,7 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
 				me.contextualMenu.add({
 					text:'Zoom on Y Right Axis',
 					handler : function(item, e) {
-						zoomPlugin.show(me.tabId, axis.id, panelContext.id);
+						zoomPlugin.show(me.interactiveId, axis.id, panelContext.id);
 						zoomPlugin.resetMinMaxValue();
 						me.panelImage.startZoom(false, me.toPixelOnResultImage(panelContext.x), me.toPixelOnResultImage(panelContext.width), onMinYValueSelection, onMaxYValueSelection);
 					}
@@ -187,7 +180,7 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
 				me.contextualMenu.add({
 					text:'Zoom on X Axis',
 					handler : function(item, e) {
-						zoomPlugin.show(me.tabId, axis.id, panelContext.id);
+						zoomPlugin.show(me.interactiveId, axis.id, panelContext.id);
 						zoomPlugin.resetMinMaxValue();
 						me.panelImage.startZoom(true, me.toPixelOnResultImage(panelContext.y), me.toPixelOnResultImage(panelContext.height), onMinXValueSelection, onMaxXValueSelection);
 					}
@@ -205,6 +198,11 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
 			me.contextualMenu.add(insertIntervalItem);
 		}
 	},
+
+    getAxisValue: function(axis, pixelMin, pixelMax, pixelVal) {
+        var val = amdaPlotComp.PlotContextManager.toAxisValue(axis, pixelMin, pixelMax, pixelVal);
+        return parseFloat(val).toPrecision(5);
+    },
     createPlotImage: function(resultFolder, plotFile) {
     	var me = this;
@@ -259,16 +257,16 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
 									xText = crtTime.toJSON();
 									break;
 								case 'y-left' :
-									yLeftText = parseFloat(amdaPlotComp.PlotContextManager.toAxisValue(axis, panel.plotArea.y+panel.plotArea.height, panel.plotArea.y, sourceYPos).toFixed(2));
+									yLeftText = me.getAxisValue(axis, panel.plotArea.y+panel.plotArea.height, panel.plotArea.y, sourceYPos);
 									break;
 								case 'y-right' :
-									yRightText = parseFloat(amdaPlotComp.PlotContextManager.toAxisValue(axis, panel.plotArea.y+panel.plotArea.height, panel.plotArea.y, sourceYPos).toFixed(2));
+									yRightText = me.getAxisValue(axis, panel.plotArea.y+panel.plotArea.height, panel.plotArea.y, sourceYPos);
 									break;
 								case 'xaxis_id' :
-									xText = parseFloat(amdaPlotComp.PlotContextManager.toAxisValue(axis, panel.plotArea.x, panel.plotArea.x+panel.plotArea.width, sourceXPos).toFixed(2));
+									xText = me.getAxisValue(axis, panel.plotArea.x, panel.plotArea.x+panel.plotArea.width, sourceXPos);
 									break;
 								case 'epochAxis' :
-									xText = parseFloat(amdaPlotComp.PlotContextManager.toAxisValue(axis, panel.plotArea.x, panel.plotArea.x+panel.plotArea.width, sourceXPos).toFixed(2));
+									xText = me.getAxisValue(axis, panel.plotArea.x, panel.plotArea.x+panel.plotArea.width, sourceXPos);
 									break;
 								}
@@ -312,7 +310,7 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
 									var crtTimestamp = amdaPlotComp.PlotContextManager.toAxisValue(timeAxisContext, panel.plotArea.x, panel.plotArea.x+panel.plotArea.width, sourceXPos);
 									var crtTime = new Date(crtTimestamp*1000);
 									crtTime = Ext.Date.add(crtTime, Ext.Date.MINUTE, crtTime.getTimezoneOffset());
-									me.callInteractivePlot({'action' : 'instant', 'tabId' : this.tabId, 'panelId' : panel.id, 'time' : crtTime});
+									me.callInteractivePlot({'action' : 'instant', 'interactiveId' : this.interactiveId, 'panelId' : panel.id, 'time' : crtTime});
 								},
 								scope: me
 							},
@@ -333,7 +331,7 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
 						handler : function ()
 						{
 							var extendShiftPlugin = this.getPlugin('plot-extendshift-plugin-id');
-							extendShiftPlugin.show(me.tabId);
+							extendShiftPlugin.show(me.interactiveId);
 						},
 						scope: me
 					},
@@ -358,7 +356,7 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
 							me.hiddenForm.getForm().submit({
 								params: {
 									sessionId: sessionID,
-									tabId : me.tabId
+									interactiveId : me.interactiveId
 								},
 								success: function(form, action) {},
 								failure: function(form, action) {}
@@ -388,13 +386,6 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
 		this.updateTimeTableInfo();
-		if (this.multiPlotCheck)
-		{
-			this.disableSynchronize = true;
-			this.multiPlotCheck.setValue(configResult.multiplot);
-			this.disableSynchronize = false;
-		}
-			
 		this.panelImage.setSrc(this.getImageUrl(configResult.folder, configResult.plotFile));
 		var size = this.getImageSize();
@@ -408,15 +399,15 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
 		if (!this.navToolBar)
 			return;
-		var ttNameField = this.navToolBar.items.get('tt-table-'+this.tabId);
+		var ttNameField = this.navToolBar.items.get('tt-table-'+this.interactiveId);
 		if (ttNameField)
 			ttNameField.setValue(this.crtContext.page.ttName);
-		var ttNumberField = this.navToolBar.items.get('tt-number-'+this.tabId);
+		var ttNumberField = this.navToolBar.items.get('tt-number-'+this.interactiveId);
 		if (ttNumberField)
 			ttNumberField.setValue(this.crtContext.page.ttIndex + 1);
-		var ttTotalField = this.navToolBar.items.get('tt-total-'+this.tabId);
+		var ttTotalField = this.navToolBar.items.get('tt-total-'+this.interactiveId);
 		if (ttTotalField)
 			ttTotalField.setValue(this.crtContext.page.ttNbIntervals);
 	},
@@ -425,9 +416,8 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
 		loadMask.show(true);
 		var plotModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.plot.id);
-		var multiPlotState = plotModule.getInteractiveMultiPlotState();
-		AmdaAction.interactivePlot(obj, multiPlotState, function (result, e) {
+		AmdaAction.interactivePlot(obj, function (result, e) {
 			loadMask.hide();
 			var t = e.getTransaction();
 			if (e.status) 
@@ -456,28 +446,12 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
 		if (this.navToolBar)
 			this.navToolBar.removeAll(true);
-		this.multiPlotCheck = Ext.create('Ext.form.field.Checkbox', {
-			boxLabel : 'Linked to Multi Plot',
-			scope: this,
-			handler: function(check, checked) {
-				if (!this.disableSynchronize)
-					this.callInteractivePlot({'action' : 'synchronize', 'tabId' : this.tabId});
-			},
-			scope: this
-		});
-	
 		var commonItemsCfg = [
 		'-',
 		{
 			xtype: 'tbspacer',
 			width: 20
 		},		
-		this.multiPlotCheck,
-		{
-			xtype: 'tbspacer',
-			width: 2
-		},
-		'-',
 		'->',
 		{
 			text: 'Get HST Data',
@@ -515,7 +489,7 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
 					}
 					else
 						--ttintervalIndex;
-					this.callInteractivePlot({'action' : 'goto', 'tabId' : this.tabId, 'ttFileIndex' : ttFileIndex, 'intIndex' : ttintervalIndex});
+					this.callInteractivePlot({'action' : 'goto', 'interactiveId' : this.interactiveId, 'ttFileIndex' : ttFileIndex, 'intIndex' : ttintervalIndex});
 				}                   
 			},
 			'-',
@@ -534,7 +508,7 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
 					else
 						++ttintervalIndex;
-					this.callInteractivePlot({'action' : 'goto', 'tabId' : this.tabId, 'ttFileIndex' : ttFileIndex, 'intIndex' : ttintervalIndex});
+					this.callInteractivePlot({'action' : 'goto', 'interactiveId' : this.interactiveId, 'ttFileIndex' : ttFileIndex, 'intIndex' : ttintervalIndex});
 				}
 			},
 			'-',
@@ -542,17 +516,17 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
 				text: 'Go to Interval #',  
 				scope: this,
 				handler: function(bt){
-					var ttGotoNumberField = this.navToolBar.items.get('tt-goto-number-'+this.tabId);
+					var ttGotoNumberField = this.navToolBar.items.get('tt-goto-number-'+this.interactiveId);
 					var goToIndex = ttGotoNumberField.getValue() - 1;
 					if ((goToIndex < 0) || (goToIndex >= this.crtContext.page.ttNbIntervals))
 						myDesktopApp.errorMsg('This interval number is outside of the current timeTable');
 					else
-						this.callInteractivePlot({'action' : 'goto', 'tabId' : this.tabId, 'ttFileIndex' : this.crtTTFileIndex, 'intIndex' : goToIndex});
+						this.callInteractivePlot({'action' : 'goto', 'interactiveId' : this.interactiveId, 'ttFileIndex' : this.crtTTFileIndex, 'intIndex' : goToIndex});
 				}
 			},
 			{
 				xtype: 'numberfield',
-				id : 'tt-goto-number-'+this.tabId,
+				id : 'tt-goto-number-'+this.interactiveId,
 				hideTrigger: true,                        
 				width: 50, 
 				minValue: 1
@@ -562,7 +536,7 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
 			' ',    
 			{   
 				xtype: 'textfield',
-				id: 'tt-table-'+this.tabId,
+				id: 'tt-table-'+this.interactiveId,
 				labelAlign: 'right',
 				labelWidth: 30,
 				fieldLabel: 'Table',
@@ -571,7 +545,7 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
 			},
 			{		               
 				xtype: 'textfield',
-				id: 'tt-number-'+this.tabId,
+				id: 'tt-number-'+this.interactiveId,
 				labelAlign: 'right',
 				labelWidth: 30,
 				fieldLabel: 'Int #',
@@ -580,7 +554,7 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
 			},
 			{                        
 				xtype: 'textfield',  
-				id: 'tt-total-'+this.tabId,
+				id: 'tt-total-'+this.interactiveId,
 				labelAlign: 'right',
 				labelWidth: 30,
 				fieldLabel: 'Total',
@@ -595,7 +569,7 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
 				text: 'Backward', 
 				scope: this,
 				handler: function(){
-					this.callInteractivePlot({'action' : 'backward', 'tabId' : this.tabId});
+					this.callInteractivePlot({'action' : 'backward', 'interactiveId' : this.interactiveId});
 				}
 			},
 			'-',
@@ -603,7 +577,7 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
 				text: '1/2 Backward',
 				scope: this,
 				handler: function(){
-					this.callInteractivePlot({'action' : 'halfbackward', 'tabId' : this.tabId});
+					this.callInteractivePlot({'action' : 'halfbackward', 'interactiveId' : this.interactiveId});
 				}
 			},
 			'-',
@@ -611,7 +585,7 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
 				text: '1/2 Forward',
 				scope: this,
 				handler: function(){
-					this.callInteractivePlot({'action' : 'halfforward', 'tabId' : this.tabId});
+					this.callInteractivePlot({'action' : 'halfforward', 'interactiveId' : this.interactiveId});
 				}
 			},
 			'-',
@@ -619,7 +593,7 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
 				text: 'Forward',
 				scope: this,
 				handler: function(){
-					this.callInteractivePlot({'action' : 'forward', 'tabId' : this.tabId});
+					this.callInteractivePlot({'action' : 'forward', 'interactiveId' : this.interactiveId});
 				}
 			}];
 		}
@@ -649,7 +623,7 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
 	init: function(configResult){
 		this.crtContext = configResult.context;
-		this.tabId = configResult.tabId;
+		this.interactiveId = configResult.interactiveId;
 		this.coordinatesField = new Ext.toolbar.TextItem({
 			width: 300,
@@ -700,13 +674,6 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
 		this.updateTimeTableInfo();
-		if (this.multiPlotCheck)
-		{
-			this.disableSynchronize = true;
-			this.multiPlotCheck.setValue(configResult.multiplot);
-			this.disableSynchronize = false;
-		}
-
 		var plotResultTabPanelConfig = {
 			preventHeader : true,
 			autoScroll: true,       
@@ -10,454 +10,210 @@
 Ext.define('amdaUI.PlotUI', {
-	extend: 'Ext.container.Container',
-	alias: 'widget.newPanelPlot',
+    extend: 'Ext.container.Container',
+    alias: 'widget.newPanelPlot',
-	requires: [
-	           'amdaModel.DownloadNode',
-	           'amdaModel.Download',
-	           'amdaUI.TimeSelectorUI',
-	           'amdaPlotComp.PlotTabPanel',
-	           'amdaPlotComp.PlotOutputForm',
-	           'amdaPlotComp.PlotElementPanel'
+    requires: [
+        'amdaModel.DownloadNode',
+        'amdaModel.Download',
+        'amdaPlotComp.PlotTabPanel'
     ],
-	formPanel: null,
-	
-	multiPlotIntervalPanel : null,
-	
-	plotOutput: null,
-	
-	plotTabs : null,
-	
-	plotElement : null,
-	
-	constructor: function(config) {
-		this.init(config);	    
-		this.callParent(arguments);
-		if (this.object)
-			this.setObject(this.object);
-	},
-	
-	setObject : function(object) {
-		this.object = object;
-		this.plotOutput.setObject(this.object);
-		this.plotTabs.setRequestObject(this.object);
-		this.timeSelector.intervalSel.setInterval(this.object.get('startDate'), this.object.get('stopDate'));
-		this.addTTs(this.object.get('timeTables'));
-	},
-	
-	/**
-	 * overwrite metod called by Save button
-	 */
-	overwriteProcess : function(btn)
-	{	
-		if (btn == 'cancel') return;	
-  
-		this.saveProcess(true);		
-	},
-	
-	
-	/**
-	 * save method called by Save button to launch the save process
-	 */
-	saveProcess : function(toRename) { 
-		var plotModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.plot.id);
-		if (!plotModule)
-							return;
-			           
-			if (toRename) {
-				plotModule.linkedNode.set('object',this.object);
-				plotModule.linkedNode.update();
-			}
-			else {
-				//Save
-				if (this.object.get('id') != '') {
-					//Duplicate request
-					plotModule.createLinkedNode();
-					plotModule.linkedNode.set('object',this.object);
-				}
-				plotModule.linkedNode.create();
-			}
-	}, 
+    formPanel: null,	
+    plotTabs : null,
+
+    constructor: function(config) {
+        this.init(config);	    
+        this.callParent(arguments);
+        if (this.object)
+            this.setObject(this.object);
+    },
+
+    setObject : function(object) {
+        this.object = object;
+        if (this.object.plots().count() == 0) {
+            this.object.createNewPlot();
+        }
+        this.plotTabs.setMultiplotObject(this.object);
+    },
+	
+    resetProcess : function(){
+        var plotModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.plot.id);			
+        plotModule.createLinkedNode();
+        var obj = null;
+        if ((arguments.length > 0) && (arguments[0] != null)) {
+            obj = arguments[0];
+        }
+        plotModule.createObject(obj);					  
+        this.setObject(plotModule.linkedNode.get('object'));
+    },
+	
+    getDataProcess : function(){
+        if ( this.updateObject() ) {
+            var plotTab = this.plotTabs.getCurrentPlotTabContent();
+            if (!plotTab || !plotTab.plotNode)
+                return;
+            plotTab.getDataProcess();
+        }
+    },
-	resetProcess : function(){
-		var plotModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.plot.id);			
-		plotModule.createLinkedNode();
-		var obj = null;
-		if ((arguments.length > 0) && (arguments[0] != null)) {
-			obj = arguments[0];
-		}
-		plotModule.createObject(obj);					  
-		this.setObject(plotModule.linkedNode.get('object'));
-	},
-	
-	getDataProcess : function(){
-		this.updateObject(); 
-		// plot was not called - form only		
-		if (this.object.get('last-plotted-tab') == 0) {
-			this.object.set('last-plotted-tab', this.plotTabs.getSelectedTabId());
-		}
-		var downObject = amdaModel.DownloadNode.decodeObject(this.object);
-		amdaModel.DownloadNode.set('object',Ext.create('amdaModel.Download',downObject));
-               
-		amdaModel.DownloadNode.editInModule(); 
-	},
-    
-	addParameter : function(node){
-		var crtTree = this.plotTabs.getTreeFromPlotTab(this.plotTabs.getActiveTab());
-		crtTree.dropRecord(node,null,'append');
-	},
+    addParameter : function(node, updateTime){
+        var crtTree = this.plotTabs.getTreeFromPlotTab(this.plotTabs.getActiveTab());
+        if (crtTree) {
+            crtTree.dropRecord(node,null,'append');
+            if (updateTime) {
+                if((node.get('globalStart') != null) && (node.get('globalStop') != null) && node.get('globalStart') != 'depending on mission' && node.get('isParameter')) {
+                    this.setTimeFromData(node.getTimeFromNode(node));
+                }
+            }
+        }
+    },
+
+    editPlot : function(plotNode) {
+        this.plotTabs.addPlotNode(plotNode, true);
+    },
+
+    reloadPlot : function(plotNode) {
+        this.plotTabs.reloadPlot(plotNode);
+    },
-	/**
+    /**
      * plot method called by 'Do Plot' button to launch the plot process
      */
-	doPlot : function(){
-		
-		this.updateObject();
-		this.object.set('last-plotted-tab', this.plotTabs.getSelectedTabId());
-		var plotModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.plot.id);
-		if (plotModule)
-			plotModule.linkedNode.execute();
-	},  
-	
-	/**
-	 * Check if changes were made before closing window 
-	 * @return false
-	 */	
-	fclose : function() {
-		var module = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.plot.id);
-		if (module)
-			module.closeInteractiveSession();
-		
-		return this.object.isDirty();
-	},
-	
-	/**
-	* update time selector of this.object from form
-	*/
-	updateObject : function(){
-		var timeSource = this.timeSelector.getActiveTimeSource();
-
-		var multiPlotForm = this.timeSelector.getForm();
-		multiPlotForm.updateRecord(this.object);
-		this.object.set('timesrc', timeSource);
-		if (timeSource === amdaModel.AmdaTimeObject.inputTimeSrc[0])
-			this.object.set('timeTables',this.timeSelector.TTGrid.getStore().data.items);
-		this.plotTabs.updateTimeObject();
-	},
-	
-	addTT : function(newTTName,newTTid,timeSelectorId) {
-		var crtTimeSelector = Ext.getCmp(timeSelectorId);
-		if (crtTimeSelector)
-			crtTimeSelector.addTT(newTTName,newTTid);
-	},
-	
-	addTTs : function(TTarray) {
-		// set TTTab	    
-		this.timeSelector.setTTTab(TTarray);
-	},
-
-	/**
-	* Set Start-Stop from parameter info (Local & MyData)
-	*/ 
-	setTimeFromData : function(obj) {                                                               
-		if (!obj.start || !obj.stop)
-			return;
-		var dateStart = new Date(obj.start.replace(/[T|Z]/g,' ').replace(/\-/g,'\/')); 
-		var dateStop = new Date(obj.stop.replace(/[T|Z]/g,' ').replace(/\-/g,'\/')); 
-
-		for (var i = 0; i < this.plotTabs.items.getCount(); ++i) {
-			var plotTab = this.plotTabs.items.getAt(i).items.getAt(0);  
-			plotTab.items.getAt(1).intervalSel.setInterval(dateStart, dateStop);
-			//TBD  plotTab.updateTimeObject();		 
-		}
-		
-		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);
-			}
-		});
-	},
+    doPlot : function(){
+        if ( this.updateObject(false) ) {
+            var plotTab = this.plotTabs.getCurrentPlotTabContent();
+            if (plotTab)
+                plotTab.doPlot();
+        }
+    },  
+	
+    /**
+     * Check if changes were made before closing window 
+     * @return false
+     */	
+    fclose : function() {
+        var module = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.plot.id);
+        if (module)
+            module.closeInteractiveSession();
+	
+        return this.object.isDirty();
+    },
+	
+    /**
+     * update time selector of this.object from form
+     */
+    updateObject : function(acceptEmptyTTList = true){
+        var plotTab = this.plotTabs.getCurrentPlotTabContent();
+        if (plotTab)
+            return plotTab.isValidRequest(acceptEmptyTTList);
+        return false;
+    },
+
+    updateTabs : function() {
+        this.plotTabs.updatePlotTabs();
+    },
+
+    updateRequestName : function(renamedNode) {
+        this.plotTabs.updateRequestName(renamedNode);
+    },
+	
+    addTT : function(newTTName,newTTid,timeSelectorId) {
+        var crtTimeSelector = Ext.getCmp(timeSelectorId);
+        if (crtTimeSelector)
+            crtTimeSelector.addTT(newTTName,newTTid);
+    },
+	
+    /**
+     * Set Start-Stop from parameter info (Local & MyData)
+     */ 
+    setTimeFromData : function(obj) {                                                               
+        if (!obj.start || !obj.stop)
+            return;
+        var dateStart = new Date(obj.start.replace(/[T|Z]/g,' ').replace(/\-/g,'\/')); 
+        var dateStop = new Date(obj.stop.replace(/[T|Z]/g,' ').replace(/\-/g,'\/')); 
+
+        var plotTab = this.plotTabs.getCurrentPlotTabContent();
+        if (plotTab)
+            plotTab.setTime(dateStart, dateStop);
+    },
+
+    savePlotRequest : function() {
+        if (this.updateObject(true)) {
+            var plotTab = this.plotTabs.getCurrentPlotTabContent();
+            if (plotTab)
+                plotTab.savePlot();
+        }
+    },
-	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 } );
-		
-		this.plotOutput = new amdaPlotComp.PlotOutputForm({flex: 2, collapseDirection : 'bottom', collapsible : true });
-		
-		this.plotElement = new amdaPlotComp.PlotElementPanel({flex: 4});
-
-		this.plotTabs = new amdaPlotComp.PlotTabPanel({flex: 4, plotElementPanel : this.plotElement, plotUI : this});
-		
-		this.optionsPanel = new Ext.form.Panel({
-			layout: {
-			    type: 'vbox',
-			    pack: 'start',
-			    align: 'stretch'
-			},
-			bodyStyle: { background : '#dfe8f6' },  
-			defaults: {
-				border: false
-			},
-			items: [
-			        this.plotElement,
-			        this.plotOutput
-			]
-		});
-		
-		this.formPanel = new Ext.form.Panel({
-			region: 'center',
-			layout: {
-			    type: 'hbox',
-			    pack: 'start',
-			    align: 'stretch'
-			},
-			bodyStyle: { background : '#dfe8f6' },  
-			defaults: {
-				border: false
-			},
-			items: [
-			        {
-						xtype : 'panel',
-						layout: {
-						    type: 'vbox',
-						    pack: 'start',
-						    align: 'stretch'
-						},
-						bodyStyle: { background : '#dfe8f6' },
-						defaults: {
-							border: false
-						},
-						flex: 1,
-						items: [
-	        				this.plotTabs,
-	        				this.timeSelector // this.multiPlotIntervalPanel
-	        			]
-					},
-			        {
-			        	xtype : 'panel',
-			        	layout: 'fit',
-			        	bodyStyle: { background : '#dfe8f6' },  
-			        	defaults: {
-							border: false
-						},
-			        	flex: 1,
-			        	items: [
-			        	        this.optionsPanel
-			            ]
-			        }
-			],
-			fbar: [
-					{
-						xtype: 'button',
-						text: 'Plot',
-						scope: this,
-						handler: function(button) {
-							this.doPlot();
-						}
-					},' ', {
-						xtype: 'button',
-						text: 'Get Data',
-						scope: this,
-						handler: function(button) {
-							this.getDataProcess();
-						}
-					},' ', {
-						xtype: 'button',
-						text: 'Reset',
-						scope: this,
-						handler: function(button) {
-							this.resetProcess();
-						}
-					},
-					'->', '-', {
-						xtype: 'splitbutton',
-						text: 'Save All Tabs',
-						menu: {
-							items: [
-								{
-									text: 'Save Current Tab',
-									scope: this,
-									handler: function() {
-										this.savePlotRequest(false);
-									}
-								},
-							]
-						},
-						scope: this,
-						handler: function(button) {
-							this.savePlotRequest(true);
-						}
-					 } 
-			]
-		});
-
-		var myConf = {
-			layout: 'border',
-			items: [
-				this.formPanel,
-				{
-					xtype: 'panel', 
-					region: 'south',
-					title: 'Information',
-					collapsible: true,
-					collapseMode: 'header',
-					height: 100,
-					autoHide: false,
-					bodyStyle: 'padding:5px',
-					iconCls: 'icon-information',
-					loader: {
-						autoLoad: true,
-						url: helpDir+'plotHOWTO'
-					}
-				}
-			]
-		};
-		
-		Ext.apply(this, Ext.apply(arguments, myConf));
-	}
+    init : function(config) {
+        this.plotTabs = new amdaPlotComp.PlotTabPanel({plotUI : this});
+
+        this.formPanel = new Ext.form.Panel({
+            region: 'center',
+            layout: 'fit',
+            bodyStyle: { background : '#dfe8f6' },
+            defaults: {
+                border: false
+            },
+            items: [
+                this.plotTabs
+            ],
+            fbar: [
+                {
+                    xtype: 'button',
+                    text: 'Plot',
+                    scope: this,
+                    handler: function(button) {
+                        this.doPlot();
+                    }
+                },' ', {
+                    xtype: 'button',
+                    text: 'Get Data',
+                    scope: this,
+                    handler: function(button) {
+                        this.getDataProcess();
+                    }
+                },' ', {
+                    xtype: 'button',
+                    text: 'Reset',
+                    scope: this,
+                    handler: function(button) {
+                        this.resetProcess();
+                    }
+                },'->', '-', {
+                    xtype: 'button',
+                    text: 'Save',
+                    scope: this,
+                    handler: function(button) {
+                        this.savePlotRequest();
+                    }
+                }
+            ]
+        });
+
+        var myConf = {
+            layout: 'border',
+            items: [
+                this.formPanel,
+                {
+                    xtype: 'panel', 
+                    region: 'south',
+                    title: 'Information',
+                    collapsible: true,
+                    collapseMode: 'header',
+                    height: 100,
+                    autoHide: false,
+                    bodyStyle: 'padding:5px',
+                    iconCls: 'icon-information',
+                    loader: {
+                        autoLoad: true,
+                        url: helpDir+'plotHOWTO'
+                    }
+                }
+            ]
+        };
+
+        Ext.apply(this, Ext.apply(arguments, myConf));
+    }
 });
@@ -61,6 +61,20 @@ Ext.define(&#39;amdaUI.TimeSelectorUI&#39;, {
 	getActiveTimeSource: function() {
 		return this.timeSrc.getActiveTab().getItemId(); 
 	},
+
+        isValid: function(acceptEmptyTTList = true) {
+            if (this.getActiveTimeSource() === amdaModel.AmdaTimeObject.inputTimeSrc[0]) {
+                //TimeTables
+                if (acceptEmptyTTList)
+                    return true;
+                return (this.TTGrid.getStore().count() > 0);
+            }
+            else {
+                //Interval
+                return this.intervalSel.isValid();
+            }
+            return true;
+        },
 	initComponent: function() {
 		this.activeField = null;
@@ -192,7 +192,6 @@ body{
 		font-family: orbitronbold;
 		font-size: 16px;
 		color: rgba(0, 107, 179, 0.7);
-		font-weight: bold;
 }
 #userLogin { 
 		position: relative;
@@ -217,7 +216,6 @@ body{
 		font-family: orbitronbold;
 		font-size: 16px;
         color: rgba(0, 107, 179, 0.9);       
-		font-weight: bold;
 }
 /* •••••••••••••••••••••••••••••••• ANNOUCEMENTS••••••••••••••••••••••••••••••••••••*/
 #textAbout {
@@ -462,10 +462,6 @@ 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,7 +151,6 @@ class AmdaAction
 					$isParameter = false;
 					$isAddable =  false;
 					$isSimulation = false;
-					$plotTabs = FALSE;
 					$rank = null;
 					$skip = FALSE;
@@ -185,19 +184,6 @@ class AmdaAction
 						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':
@@ -597,7 +583,7 @@ 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, 'tabs' => $plotTabs,
+													'help' => $help, 'leaf' => $isLeaf, 'isParameter' => $isParameter, 'dim_1' => $dim_1, 'dim_2' => $dim_2,
 													'component_info' => isset($component_info) ? $component_info : NULL,
 													'iconCls' => isset($iconCls) ? $iconCls : NULL );
 					}
@@ -826,7 +812,6 @@ class AmdaAction
 			   break;
 		  case 'condition' :
 		  case 'request' :
-                  case 'plottab' :
 			   $objectMgr = new RequestMgr($obj->nodeType);
 			   break;
 		  case 'alias' :
@@ -916,7 +901,6 @@ class AmdaAction
 				break;
 			case 'condition' :
 			case 'request' :
-			case 'plottab' :
 				$objectMgr = new RequestMgr($obj->nodeType);
 				break;
 			default:
@@ -1437,11 +1421,10 @@ class AmdaAction
 		return array('success' => true);
 	}
-	public function interactivePlot($obj, $multiPlotState)
+	public function interactivePlot($obj)
 	{
 		$inputobj = (Object)array(
 			'action' => $obj,
-			'multiPlotState' => $multiPlotState
 		);
 		return $this->executeRequest($inputobj, FunctionTypeEnumClass::ACTION);
 	}
@@ -30,7 +30,7 @@ class RequestMgr extends AmdaObjectMgr
 		$this->attributes = array('name' => '');
 		$this->optionalAttributes = array();
-		if ($type == 'request' || $type == 'plottab') 
+		if ($type == 'request' ) 
 		{
 			$this->id_prefix = 'req_';			
 		}
@@ -73,47 +73,11 @@ class RequestMgr extends AmdaObjectMgr
 	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);
 	}
@@ -225,17 +189,6 @@ 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;
@@ -258,17 +211,12 @@ class RequestMgr extends AmdaObjectMgr
 		switch ($obj->nodeType) 
 		{
 			case 'request' :
-				foreach ($obj->tabs as $tab)
-				{
-					$timesrc = $tab->{'multi-plot-linked'} ? $obj->timesrc : $tab->timesrc;
-					
+                                
 					 //TODO check TT as well (first start  and last stop ?)
-					if ($timesrc != 'Interval') continue;	
-					// select active tab
-					if (!$tab->{'multi-plot-linked'} && $tab->id != $obj->{'last-plotted-tab'}) continue;
+					if ($obj->timesrc != 'Interval') continue;	
 					$argsTab = array();										
-					foreach ($tab->panels as $panel)
+					foreach ($obj->panels as $panel)
 					{
 						$params = array();
 						foreach ($panel->params as $param)
@@ -283,12 +231,11 @@ class RequestMgr extends AmdaObjectMgr
 						if (count($params) > 0) 
 						{
 							$argsTab['param'] = array_unique($params);
-							$argsTab['startTime'] = $tab->{'multi-plot-linked'} ? $obj->startDate : $tab->startDate;
-							$argsTab['stopTime'] = $tab->{'multi-plot-linked'} ? $obj->stopDate : $tab->stopDate;
+							$argsTab['startTime'] = $obj->startDate;
+							$argsTab['stopTime'] = $$obj->stopDate;
 						}
 					}	
 					if (count($argsTab) > 0) $args[] = $argsTab;
-				}
 				break;
 			case 'condition' :
 				//$argsTab = array();
@@ -517,6 +517,13 @@ class UserMgr
 			$this->isFirst = true;
 		}
+		$requestManager = new RequestManagerClass();
+		try {
+			$res = $requestManager->runIHMRequest($this->user, $this->getIPclient(), FunctionTypeEnumClass::USERWSINIT, array());
+		} catch (Exception $e) {
+			die("Login for ".$this->user." failed: Error in WS dirs - ".$e->getMessage());
+		}
+
 		if (file_exists($this->userdir.'newLogin')) {
 			touch($this->userdir.'lastLogin', filemtime($this->userdir.'newLogin'));
 		}
-<?php
-/*******************************************************************************
-Version: 1.11 ($Rev: 175 $)
-Website: http://sourceforge.net/projects/simplehtmldom/
-Author: S.C. Chen <me578022@gmail.com>
-Acknowledge: Jose Solorzano (https://sourceforge.net/projects/php-html/)
-Contributions by:
-    Yousuke Kumakura (Attribute filters)
-    Vadim Voituk (Negative indexes supports of "find" method)
-    Antcs (Constructor with automatically load contents either text or file/url)
-Licensed under The MIT License
-Redistributions of files must retain the above copyright notice.
-*******************************************************************************/
-
-define('HDOM_TYPE_ELEMENT', 1);
-define('HDOM_TYPE_COMMENT', 2);
-define('HDOM_TYPE_TEXT',    3);
-define('HDOM_TYPE_ENDTAG',  4);
-define('HDOM_TYPE_ROOT',    5);
-define('HDOM_TYPE_UNKNOWN', 6);
-define('HDOM_QUOTE_DOUBLE', 0);
-define('HDOM_QUOTE_SINGLE', 1);
-define('HDOM_QUOTE_NO',     3);
-define('HDOM_INFO_BEGIN',   0);
-define('HDOM_INFO_END',     1);
-define('HDOM_INFO_QUOTE',   2);
-define('HDOM_INFO_SPACE',   3);
-define('HDOM_INFO_TEXT',    4);
-define('HDOM_INFO_INNER',   5);
-define('HDOM_INFO_OUTER',   6);
-define('HDOM_INFO_ENDSPACE',7);
-
-// helper functions
-// -----------------------------------------------------------------------------
-// get html dom form file
-function file_get_html() {
-    $dom = new simple_html_dom;
-    $args = func_get_args();
-    $dom->load(call_user_func_array('file_get_contents', $args), true);
-    return $dom;
-}
-
-// get html dom form string
-function str_get_html($str, $lowercase=true) {
-    $dom = new simple_html_dom;
-    $dom->load($str, $lowercase);
-    return $dom;
-}
-
-// dump html dom tree
-function dump_html_tree($node, $show_attr=true, $deep=0) {
-    $lead = str_repeat('    ', $deep);
-    echo $lead.$node->tag;
-    if ($show_attr && count($node->attr)>0) {
-        echo '(';
-        foreach($node->attr as $k=>$v)
-            echo "[$k]=>\"".$node->$k.'", ';
-        echo ')';
-    }
-    echo "\n";
-
-    foreach($node->nodes as $c)
-        dump_html_tree($c, $show_attr, $deep+1);
-}
-
-// get dom form file (deprecated)
-function file_get_dom() {
-    $dom = new simple_html_dom;
-    $args = func_get_args();
-    $dom->load(call_user_func_array('file_get_contents', $args), true);
-    return $dom;
-}
-
-// get dom form string (deprecated)
-function str_get_dom($str, $lowercase=true) {
-    $dom = new simple_html_dom;
-    $dom->load($str, $lowercase);
-    return $dom;
-}
-
-// simple html dom node
-// -----------------------------------------------------------------------------
-class simple_html_dom_node {
-    public $nodetype = HDOM_TYPE_TEXT;
-    public $tag = 'text';
-    public $attr = array();
-    public $children = array();
-    public $nodes = array();
-    public $parent = null;
-    public $_ = array();
-    private $dom = null;
-
-    function __construct($dom) {
-        $this->dom = $dom;
-        $dom->nodes[] = $this;
-    }
-
-    function __destruct() {
-        $this->clear();
-    }
-
-    function __toString() {
-        return $this->outertext();
-    }
-
-    // clean up memory due to php5 circular references memory leak...
-    function clear() {
-        $this->dom = null;
-        $this->nodes = null;
-        $this->parent = null;
-        $this->children = null;
-    }
-    
-    // dump node's tree
-    function dump($show_attr=true) {
-        dump_html_tree($this, $show_attr);
-    }
-
-    // returns the parent of node
-    function parent() {
-        return $this->parent;
-    }
-
-    // returns children of node
-    function children($idx=-1) {
-        if ($idx===-1) return $this->children;
-        if (isset($this->children[$idx])) return $this->children[$idx];
-        return null;
-    }
-
-    // returns the first child of node
-    function first_child() {
-        if (count($this->children)>0) return $this->children[0];
-        return null;
-    }
-
-    // returns the last child of node
-    function last_child() {
-        if (($count=count($this->children))>0) return $this->children[$count-1];
-        return null;
-    }
-
-    // returns the next sibling of node    
-    function next_sibling() {
-        if ($this->parent===null) return null;
-        $idx = 0;
-        $count = count($this->parent->children);
-        while ($idx<$count && $this!==$this->parent->children[$idx])
-            ++$idx;
-        if (++$idx>=$count) return null;
-        return $this->parent->children[$idx];
-    }
-
-    // returns the previous sibling of node
-    function prev_sibling() {
-        if ($this->parent===null) return null;
-        $idx = 0;
-        $count = count($this->parent->children);
-        while ($idx<$count && $this!==$this->parent->children[$idx])
-            ++$idx;
-        if (--$idx<0) return null;
-        return $this->parent->children[$idx];
-    }
-
-    // get dom node's inner html
-    function innertext() {
-        if (isset($this->_[HDOM_INFO_INNER])) return $this->_[HDOM_INFO_INNER];
-        if (isset($this->_[HDOM_INFO_TEXT])) return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
-
-        $ret = '';
-        foreach($this->nodes as $n)
-            $ret .= $n->outertext();
-        return $ret;
-    }
-
-    // get dom node's outer text (with tag)
-    function outertext() {
-        if ($this->tag==='root') return $this->innertext();
-
-        // trigger callback
-        if ($this->dom->callback!==null)
-            call_user_func_array($this->dom->callback, array($this));
-
-        if (isset($this->_[HDOM_INFO_OUTER])) return $this->_[HDOM_INFO_OUTER];
-        if (isset($this->_[HDOM_INFO_TEXT])) return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
-
-        // render begin tag
-        $ret = $this->dom->nodes[$this->_[HDOM_INFO_BEGIN]]->makeup();
-
-        // render inner text
-        if (isset($this->_[HDOM_INFO_INNER]))
-            $ret .= $this->_[HDOM_INFO_INNER];
-        else {
-            foreach($this->nodes as $n)
-                $ret .= $n->outertext();
-        }
-
-        // render end tag
-        if(isset($this->_[HDOM_INFO_END]) && $this->_[HDOM_INFO_END]!=0)
-            $ret .= '</'.$this->tag.'>';
-        return $ret;
-    }
-
-    // get dom node's plain text
-    function text() {
-        if (isset($this->_[HDOM_INFO_INNER])) return $this->_[HDOM_INFO_INNER];
-        switch ($this->nodetype) {
-            case HDOM_TYPE_TEXT: return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
-            case HDOM_TYPE_COMMENT: return '';
-            case HDOM_TYPE_UNKNOWN: return '';
-        }
-        if (strcasecmp($this->tag, 'script')===0) return '';
-        if (strcasecmp($this->tag, 'style')===0) return '';
-
-        $ret = '';
-        foreach($this->nodes as $n)
-            $ret .= $n->text();
-        return $ret;
-    }
-    
-    function xmltext() {
-        $ret = $this->innertext();
-        $ret = str_ireplace('<![CDATA[', '', $ret);
-        $ret = str_replace(']]>', '', $ret);
-        return $ret;
-    }
-
-    // build node's text with tag
-    function makeup() {
-        // text, comment, unknown
-        if (isset($this->_[HDOM_INFO_TEXT])) return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
-
-        $ret = '<'.$this->tag;
-        $i = -1;
-
-        foreach($this->attr as $key=>$val) {
-            ++$i;
-
-            // skip removed attribute
-            if ($val===null || $val===false)
-                continue;
-
-            $ret .= $this->_[HDOM_INFO_SPACE][$i][0];
-            //no value attr: nowrap, checked selected...
-            if ($val===true)
-                $ret .= $key;
-            else {
-                switch($this->_[HDOM_INFO_QUOTE][$i]) {
-                    case HDOM_QUOTE_DOUBLE: $quote = '"'; break;
-                    case HDOM_QUOTE_SINGLE: $quote = '\''; break;
-                    default: $quote = '';
-                }
-                $ret .= $key.$this->_[HDOM_INFO_SPACE][$i][1].'='.$this->_[HDOM_INFO_SPACE][$i][2].$quote.$val.$quote;
-            }
-        }
-        $ret = $this->dom->restore_noise($ret);
-        return $ret . $this->_[HDOM_INFO_ENDSPACE] . '>';
-    }
-
-    // find elements by css selector
-    function find($selector, $idx=null) {
-        $selectors = $this->parse_selector($selector);
-        if (($count=count($selectors))===0) return array();
-        $found_keys = array();
-
-        // find each selector
-        for ($c=0; $c<$count; ++$c) {
-            if (($levle=count($selectors[0]))===0) return array();
-            if (!isset($this->_[HDOM_INFO_BEGIN])) return array();
-
-            $head = array($this->_[HDOM_INFO_BEGIN]=>1);
-
-            // handle descendant selectors, no recursive!
-            for ($l=0; $l<$levle; ++$l) {
-                $ret = array();
-                foreach($head as $k=>$v) {
-                    $n = ($k===-1) ? $this->dom->root : $this->dom->nodes[$k];
-                    $n->seek($selectors[$c][$l], $ret);
-                }
-                $head = $ret;
-            }
-
-            foreach($head as $k=>$v) {
-                if (!isset($found_keys[$k]))
-                    $found_keys[$k] = 1;
-            }
-        }
-
-        // sort keys
-        ksort($found_keys);
-
-        $found = array();
-        foreach($found_keys as $k=>$v)
-            $found[] = $this->dom->nodes[$k];
-
-        // return nth-element or array
-        if (is_null($idx)) return $found;
-		else if ($idx<0) $idx = count($found) + $idx;
-        return (isset($found[$idx])) ? $found[$idx] : null;
-    }
-
-    // seek for given conditions
-    protected function seek($selector, &$ret) {
-        list($tag, $key, $val, $exp, $no_key) = $selector;
-
-        // xpath index
-        if ($tag && $key && is_numeric($key)) {
-            $count = 0;
-            foreach ($this->children as $c) {
-                if ($tag==='*' || $tag===$c->tag) {
-                    if (++$count==$key) {
-                        $ret[$c->_[HDOM_INFO_BEGIN]] = 1;
-                        return;
-                    }
-                }
-            } 
-            return;
-        }
-
-        $end = (!empty($this->_[HDOM_INFO_END])) ? $this->_[HDOM_INFO_END] : 0;
-        if ($end==0) {
-            $parent = $this->parent;
-            while (!isset($parent->_[HDOM_INFO_END]) && $parent!==null) {
-                $end -= 1;
-                $parent = $parent->parent;
-            }
-            $end += $parent->_[HDOM_INFO_END];
-        }
-
-        for($i=$this->_[HDOM_INFO_BEGIN]+1; $i<$end; ++$i) {
-            $node = $this->dom->nodes[$i];
-            $pass = true;
-
-            if ($tag==='*' && !$key) {
-                if (in_array($node, $this->children, true))
-                    $ret[$i] = 1;
-                continue;
-            }
-
-            // compare tag
-            if ($tag && $tag!=$node->tag && $tag!=='*') {$pass=false;}
-            // compare key
-            if ($pass && $key) {
-                if ($no_key) {
-                    if (isset($node->attr[$key])) $pass=false;
-                }
-                else if (!isset($node->attr[$key])) $pass=false;
-            }
-            // compare value
-            if ($pass && $key && $val  && $val!=='*') {
-                $check = $this->match($exp, $val, $node->attr[$key]);
-                // handle multiple class
-                if (!$check && strcasecmp($key, 'class')===0) {
-                    foreach(explode(' ',$node->attr[$key]) as $k) {
-                        $check = $this->match($exp, $val, $k);
-                        if ($check) break;
-                    }
-                }
-                if (!$check) $pass = false;
-            }
-            if ($pass) $ret[$i] = 1;
-            unset($node);
-        }
-    }
-
-    protected function match($exp, $pattern, $value) {
-        switch ($exp) {
-            case '=':
-                return ($value===$pattern);
-            case '!=':
-                return ($value!==$pattern);
-            case '^=':
-                return preg_match("/^".preg_quote($pattern,'/')."/", $value);
-            case '$=':
-                return preg_match("/".preg_quote($pattern,'/')."$/", $value);
-            case '*=':
-                if ($pattern[0]=='/')
-                    return preg_match($pattern, $value);
-                return preg_match("/".$pattern."/i", $value);
-        }
-        return false;
-    }
-
-    protected function parse_selector($selector_string) {
-        // pattern of CSS selectors, modified from mootools
-        $pattern = "/([\w-:\*]*)(?:\#([\w-]+)|\.([\w-]+))?(?:\[@?(!?[\w-]+)(?:([!*^$]?=)[\"']?(.*?)[\"']?)?\])?([\/, ]+)/is";
-        preg_match_all($pattern, trim($selector_string).' ', $matches, PREG_SET_ORDER);
-        $selectors = array();
-        $result = array();
-        //print_r($matches);
-
-        foreach ($matches as $m) {
-            $m[0] = trim($m[0]);
-            if ($m[0]==='' || $m[0]==='/' || $m[0]==='//') continue;
-            // for borwser grnreated xpath
-            if ($m[1]==='tbody') continue;
-
-            list($tag, $key, $val, $exp, $no_key) = array($m[1], null, null, '=', false);
-            if(!empty($m[2])) {$key='id'; $val=$m[2];}
-            if(!empty($m[3])) {$key='class'; $val=$m[3];}
-            if(!empty($m[4])) {$key=$m[4];}
-            if(!empty($m[5])) {$exp=$m[5];}
-            if(!empty($m[6])) {$val=$m[6];}
-
-            // convert to lowercase
-            if ($this->dom->lowercase) {$tag=strtolower($tag); $key=strtolower($key);}
-            //elements that do NOT have the specified attribute
-            if (isset($key[0]) && $key[0]==='!') {$key=substr($key, 1); $no_key=true;}
-
-            $result[] = array($tag, $key, $val, $exp, $no_key);
-            if (trim($m[7])===',') {
-                $selectors[] = $result;
-                $result = array();
-            }
-        }
-        if (count($result)>0)
-            $selectors[] = $result;
-        return $selectors;
-    }
-
-    function __get($name) {
-        if (isset($this->attr[$name])) return $this->attr[$name];
-        switch($name) {
-            case 'outertext': return $this->outertext();
-            case 'innertext': return $this->innertext();
-            case 'plaintext': return $this->text();
-            case 'xmltext': return $this->xmltext();
-            default: return array_key_exists($name, $this->attr);
-        }
-    }
-
-    function __set($name, $value) {
-        switch($name) {
-            case 'outertext': return $this->_[HDOM_INFO_OUTER] = $value;
-            case 'innertext':
-                if (isset($this->_[HDOM_INFO_TEXT])) return $this->_[HDOM_INFO_TEXT] = $value;
-                return $this->_[HDOM_INFO_INNER] = $value;
-        }
-        if (!isset($this->attr[$name])) {
-            $this->_[HDOM_INFO_SPACE][] = array(' ', '', ''); 
-            $this->_[HDOM_INFO_QUOTE][] = HDOM_QUOTE_DOUBLE;
-        }
-        $this->attr[$name] = $value;
-    }
-
-    function __isset($name) {
-        switch($name) {
-            case 'outertext': return true;
-            case 'innertext': return true;
-            case 'plaintext': return true;
-        }
-        //no value attr: nowrap, checked selected...
-        return (array_key_exists($name, $this->attr)) ? true : isset($this->attr[$name]);
-    }
-
-    function __unset($name) {
-        if (isset($this->attr[$name]))
-            unset($this->attr[$name]);
-    }
-
-    // camel naming conventions
-    function getAllAttributes() {return $this->attr;}
-    function getAttribute($name) {return $this->__get($name);}
-    function setAttribute($name, $value) {$this->__set($name, $value);}
-    function hasAttribute($name) {return $this->__isset($name);}
-    function removeAttribute($name) {$this->__set($name, null);}
-    function getElementById($id) {return $this->find("#$id", 0);}
-    function getElementsById($id, $idx=null) {return $this->find("#$id", $idx);}
-    function getElementByTagName($name) {return $this->find($name, 0);}
-    function getElementsByTagName($name, $idx=null) {return $this->find($name, $idx);}
-    function parentNode() {return $this->parent();}
-    function childNodes($idx=-1) {return $this->children($idx);}
-    function firstChild() {return $this->first_child();}
-    function lastChild() {return $this->last_child();}
-    function nextSibling() {return $this->next_sibling();}
-    function previousSibling() {return $this->prev_sibling();}
-}
-
-// simple html dom parser
-// -----------------------------------------------------------------------------
-class simple_html_dom {
-    public $root = null;
-    public $nodes = array();
-    public $callback = null;
-    public $lowercase = false;
-    protected $pos;
-    protected $doc;
-    protected $char;
-    protected $size;
-    protected $cursor;
-    protected $parent;
-    protected $noise = array();
-    protected $token_blank = " \t\r\n";
-    protected $token_equal = ' =/>';
-    protected $token_slash = " />\r\n\t";
-    protected $token_attr = ' >';
-    // use isset instead of in_array, performance boost about 30%...
-    protected $self_closing_tags = array('img'=>1, 'br'=>1, 'input'=>1, 'meta'=>1, 'link'=>1, 'hr'=>1, 'base'=>1, 'embed'=>1, 'spacer'=>1);
-    protected $block_tags = array('root'=>1, 'body'=>1, 'form'=>1, 'div'=>1, 'span'=>1, 'table'=>1);
-    protected $optional_closing_tags = array(
-        'tr'=>array('tr'=>1, 'td'=>1, 'th'=>1),
-        'th'=>array('th'=>1),
-        'td'=>array('td'=>1),
-        'li'=>array('li'=>1),
-        'dt'=>array('dt'=>1, 'dd'=>1),
-        'dd'=>array('dd'=>1, 'dt'=>1),
-        'dl'=>array('dd'=>1, 'dt'=>1),
-        'p'=>array('p'=>1),
-        'nobr'=>array('nobr'=>1),
-    );
-
-    function __construct($str=null) {
-        if ($str) {
-            if (preg_match("/^http:\/\//i",$str) || is_file($str)) 
-                $this->load_file($str); 
-            else
-                $this->load($str);
-        }
-    }
-
-    function __destruct() {
-        $this->clear();
-    }
-
-    // load html from string
-    function load($str, $lowercase=true) {
-        // prepare
-        $this->prepare($str, $lowercase);
-        // strip out comments
-        $this->remove_noise("'<!--(.*?)-->'is");
-        // strip out cdata
-        $this->remove_noise("'<!\[CDATA\[(.*?)\]\]>'is", true);
-        // strip out <style> tags
-        $this->remove_noise("'<\s*style[^>]*[^/]>(.*?)<\s*/\s*style\s*>'is");
-        $this->remove_noise("'<\s*style\s*>(.*?)<\s*/\s*style\s*>'is");
-        // strip out <script> tags
-        $this->remove_noise("'<\s*script[^>]*[^/]>(.*?)<\s*/\s*script\s*>'is");
-        $this->remove_noise("'<\s*script\s*>(.*?)<\s*/\s*script\s*>'is");
-        // strip out preformatted tags
-        $this->remove_noise("'<\s*(?:code)[^>]*>(.*?)<\s*/\s*(?:code)\s*>'is");
-        // strip out server side scripts
-        $this->remove_noise("'(<\?)(.*?)(\?>)'s", true);
-        // strip smarty scripts
-        $this->remove_noise("'(\{\w)(.*?)(\})'s", true);
-
-        // parsing
-        while ($this->parse());
-        // end
-        $this->root->_[HDOM_INFO_END] = $this->cursor;
-    }
-
-    // load html from file
-    function load_file() {
-        $args = func_get_args();
-        $this->load(call_user_func_array('file_get_contents', $args), true);
-    }
-
-    // set callback function
-    function set_callback($function_name) {
-        $this->callback = $function_name;
-    }
-
-    // remove callback function
-    function remove_callback() {
-        $this->callback = null;
-    }
-
-    // save dom as string
-    function save($filepath='') {
-        $ret = $this->root->innertext();
-        if ($filepath!=='') file_put_contents($filepath, $ret);
-        return $ret;
-    }
-
-    // find dom node by css selector
-    function find($selector, $idx=null) {
-        return $this->root->find($selector, $idx);
-    }
-
-    // clean up memory due to php5 circular references memory leak...
-    function clear() {
-        foreach($this->nodes as $n) {$n->clear(); $n = null;}
-        if (isset($this->parent)) {$this->parent->clear(); unset($this->parent);}
-        if (isset($this->root)) {$this->root->clear(); unset($this->root);}
-        unset($this->doc);
-        unset($this->noise);
-    }
-    
-    function dump($show_attr=true) {
-        $this->root->dump($show_attr);
-    }
-
-    // prepare HTML data and init everything
-    protected function prepare($str, $lowercase=true) {
-        $this->clear();
-        $this->doc = $str;
-        $this->pos = 0;
-        $this->cursor = 1;
-        $this->noise = array();
-        $this->nodes = array();
-        $this->lowercase = $lowercase;
-        $this->root = new simple_html_dom_node($this);
-        $this->root->tag = 'root';
-        $this->root->_[HDOM_INFO_BEGIN] = -1;
-        $this->root->nodetype = HDOM_TYPE_ROOT;
-        $this->parent = $this->root;
-        // set the length of content
-        $this->size = strlen($str);
-        if ($this->size>0) $this->char = $this->doc[0];
-    }
-
-    // parse html content
-    protected function parse() {
-        if (($s = $this->copy_until_char('<'))==='')
-            return $this->read_tag();
-
-        // text
-        $node = new simple_html_dom_node($this);
-        ++$this->cursor;
-        $node->_[HDOM_INFO_TEXT] = $s;
-        $this->link_nodes($node, false);
-        return true;
-    }
-
-    // read tag info
-    protected function read_tag() {
-        if ($this->char!=='<') {
-            $this->root->_[HDOM_INFO_END] = $this->cursor;
-            return false;
-        }
-        $begin_tag_pos = $this->pos;
-        $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
-
-        // end tag
-        if ($this->char==='/') {
-            $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
-            $this->skip($this->token_blank_t);
-            $tag = $this->copy_until_char('>');
-
-            // skip attributes in end tag
-            if (($pos = strpos($tag, ' '))!==false)
-                $tag = substr($tag, 0, $pos);
-
-            $parent_lower = strtolower($this->parent->tag);
-            $tag_lower = strtolower($tag);
-
-            if ($parent_lower!==$tag_lower) {
-                if (isset($this->optional_closing_tags[$parent_lower]) && isset($this->block_tags[$tag_lower])) {
-                    $this->parent->_[HDOM_INFO_END] = 0;
-                    $org_parent = $this->parent;
-
-                    while (($this->parent->parent) && strtolower($this->parent->tag)!==$tag_lower)
-                        $this->parent = $this->parent->parent;
-
-                    if (strtolower($this->parent->tag)!==$tag_lower) {
-                        $this->parent = $org_parent; // restore origonal parent
-                        if ($this->parent->parent) $this->parent = $this->parent->parent;
-                        $this->parent->_[HDOM_INFO_END] = $this->cursor;
-                        return $this->as_text_node($tag);
-                    }
-                }
-                else if (($this->parent->parent) && isset($this->block_tags[$tag_lower])) {
-                    $this->parent->_[HDOM_INFO_END] = 0;
-                    $org_parent = $this->parent;
-
-                    while (($this->parent->parent) && strtolower($this->parent->tag)!==$tag_lower)
-                        $this->parent = $this->parent->parent;
-
-                    if (strtolower($this->parent->tag)!==$tag_lower) {
-                        $this->parent = $org_parent; // restore origonal parent
-                        $this->parent->_[HDOM_INFO_END] = $this->cursor;
-                        return $this->as_text_node($tag);
-                    }
-                }
-                else if (($this->parent->parent) && strtolower($this->parent->parent->tag)===$tag_lower) {
-                    $this->parent->_[HDOM_INFO_END] = 0;
-                    $this->parent = $this->parent->parent;
-                }
-                else
-                    return $this->as_text_node($tag);
-            }
-
-            $this->parent->_[HDOM_INFO_END] = $this->cursor;
-            if ($this->parent->parent) $this->parent = $this->parent->parent;
-
-            $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
-            return true;
-        }
-
-        $node = new simple_html_dom_node($this);
-        $node->_[HDOM_INFO_BEGIN] = $this->cursor;
-        ++$this->cursor;
-        $tag = $this->copy_until($this->token_slash);
-
-        // doctype, cdata & comments...
-        if (isset($tag[0]) && $tag[0]==='!') {
-            $node->_[HDOM_INFO_TEXT] = '<' . $tag . $this->copy_until_char('>');
-
-            if (isset($tag[2]) && $tag[1]==='-' && $tag[2]==='-') {
-                $node->nodetype = HDOM_TYPE_COMMENT;
-                $node->tag = 'comment';
-            } else {
-                $node->nodetype = HDOM_TYPE_UNKNOWN;
-                $node->tag = 'unknown';
-            }
-
-            if ($this->char==='>') $node->_[HDOM_INFO_TEXT].='>';
-            $this->link_nodes($node, true);
-            $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
-            return true;
-        }
-
-        // text
-        if ($pos=strpos($tag, '<')!==false) {
-            $tag = '<' . substr($tag, 0, -1);
-            $node->_[HDOM_INFO_TEXT] = $tag;
-            $this->link_nodes($node, false);
-            $this->char = $this->doc[--$this->pos]; // prev
-            return true;
-        }
-
-        if (!preg_match("/^[\w-:]+$/", $tag)) {
-            $node->_[HDOM_INFO_TEXT] = '<' . $tag . $this->copy_until('<>');
-            if ($this->char==='<') {
-                $this->link_nodes($node, false);
-                return true;
-            }
-
-            if ($this->char==='>') $node->_[HDOM_INFO_TEXT].='>';
-            $this->link_nodes($node, false);
-            $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
-            return true;
-        }
-
-        // begin tag
-        $node->nodetype = HDOM_TYPE_ELEMENT;
-        $tag_lower = strtolower($tag);
-        $node->tag = ($this->lowercase) ? $tag_lower : $tag;
-
-        // handle optional closing tags
-        if (isset($this->optional_closing_tags[$tag_lower]) ) {
-            while (isset($this->optional_closing_tags[$tag_lower][strtolower($this->parent->tag)])) {
-                $this->parent->_[HDOM_INFO_END] = 0;
-                $this->parent = $this->parent->parent;
-            }
-            $node->parent = $this->parent;
-        }
-
-        $guard = 0; // prevent infinity loop
-        $space = array($this->copy_skip($this->token_blank), '', '');
-
-        // attributes
-        do {
-            if ($this->char!==null && $space[0]==='') break;
-            $name = $this->copy_until($this->token_equal);
-            if($guard===$this->pos) {
-                $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
-                continue;
-            }
-            $guard = $this->pos;
-
-            // handle endless '<'
-            if($this->pos>=$this->size-1 && $this->char!=='>') {
-                $node->nodetype = HDOM_TYPE_TEXT;
-                $node->_[HDOM_INFO_END] = 0;
-                $node->_[HDOM_INFO_TEXT] = '<'.$tag . $space[0] . $name;
-                $node->tag = 'text';
-                $this->link_nodes($node, false);
-                return true;
-            }
-
-            // handle mismatch '<'
-            if($this->doc[$this->pos-1]=='<') {
-                $node->nodetype = HDOM_TYPE_TEXT;
-                $node->tag = 'text';
-                $node->attr = array();
-                $node->_[HDOM_INFO_END] = 0;
-                $node->_[HDOM_INFO_TEXT] = substr($this->doc, $begin_tag_pos, $this->pos-$begin_tag_pos-1);
-                $this->pos -= 2;
-                $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
-                $this->link_nodes($node, false);
-                return true;
-            }
-
-            if ($name!=='/' && $name!=='') {
-                $space[1] = $this->copy_skip($this->token_blank);
-                $name = $this->restore_noise($name);
-                if ($this->lowercase) $name = strtolower($name);
-                if ($this->char==='=') {
-                    $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
-                    $this->parse_attr($node, $name, $space);
-                }
-                else {
-                    //no value attr: nowrap, checked selected...
-                    $node->_[HDOM_INFO_QUOTE][] = HDOM_QUOTE_NO;
-                    $node->attr[$name] = true;
-                    if ($this->char!='>') $this->char = $this->doc[--$this->pos]; // prev
-                }
-                $node->_[HDOM_INFO_SPACE][] = $space;
-                $space = array($this->copy_skip($this->token_blank), '', '');
-            }
-            else
-                break;
-        } while($this->char!=='>' && $this->char!=='/');
-
-        $this->link_nodes($node, true);
-        $node->_[HDOM_INFO_ENDSPACE] = $space[0];
-
-        // check self closing
-        if ($this->copy_until_char_escape('>')==='/') {
-            $node->_[HDOM_INFO_ENDSPACE] .= '/';
-            $node->_[HDOM_INFO_END] = 0;
-        }
-        else {
-            // reset parent
-            if (!isset($this->self_closing_tags[strtolower($node->tag)])) $this->parent = $node;
-        }
-        $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
-        return true;
-    }
-
-    // parse attributes
-    protected function parse_attr($node, $name, &$space) {
-        $space[2] = $this->copy_skip($this->token_blank);
-        switch($this->char) {
-            case '"':
-                $node->_[HDOM_INFO_QUOTE][] = HDOM_QUOTE_DOUBLE;
-                $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
-                $node->attr[$name] = $this->restore_noise($this->copy_until_char_escape('"'));
-                $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
-                break;
-            case '\'':
-                $node->_[HDOM_INFO_QUOTE][] = HDOM_QUOTE_SINGLE;
-                $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
-                $node->attr[$name] = $this->restore_noise($this->copy_until_char_escape('\''));
-                $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
-                break;
-            default:
-                $node->_[HDOM_INFO_QUOTE][] = HDOM_QUOTE_NO;
-                $node->attr[$name] = $this->restore_noise($this->copy_until($this->token_attr));
-        }
-    }
-
-    // link node's parent
-    protected function link_nodes(&$node, $is_child) {
-        $node->parent = $this->parent;
-        $this->parent->nodes[] = $node;
-        if ($is_child)
-            $this->parent->children[] = $node;
-    }
-
-    // as a text node
-    protected function as_text_node($tag) {
-        $node = new simple_html_dom_node($this);
-        ++$this->cursor;
-        $node->_[HDOM_INFO_TEXT] = '</' . $tag . '>';
-        $this->link_nodes($node, false);
-        $this->char = (++$this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
-        return true;
-    }
-
-    protected function skip($chars) {
-        $this->pos += strspn($this->doc, $chars, $this->pos);
-        $this->char = ($this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
-    }
-
-    protected function copy_skip($chars) {
-        $pos = $this->pos;
-        $len = strspn($this->doc, $chars, $pos);
-        $this->pos += $len;
-        $this->char = ($this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
-        if ($len===0) return '';
-        return substr($this->doc, $pos, $len);
-    }
-
-    protected function copy_until($chars) {
-        $pos = $this->pos;
-        $len = strcspn($this->doc, $chars, $pos);
-        $this->pos += $len;
-        $this->char = ($this->pos<$this->size) ? $this->doc[$this->pos] : null; // next
-        return substr($this->doc, $pos, $len);
-    }
-
-    protected function copy_until_char($char) {
-        if ($this->char===null) return '';
-
-        if (($pos = strpos($this->doc, $char, $this->pos))===false) {
-            $ret = substr($this->doc, $this->pos, $this->size-$this->pos);
-            $this->char = null;
-            $this->pos = $this->size;
-            return $ret;
-        }
-
-        if ($pos===$this->pos) return '';
-        $pos_old = $this->pos;
-        $this->char = $this->doc[$pos];
-        $this->pos = $pos;
-        return substr($this->doc, $pos_old, $pos-$pos_old);
-    }
-
-    protected function copy_until_char_escape($char) {
-        if ($this->char===null) return '';
-
-        $start = $this->pos;
-        while(1) {
-            if (($pos = strpos($this->doc, $char, $start))===false) {
-                $ret = substr($this->doc, $this->pos, $this->size-$this->pos);
-                $this->char = null;
-                $this->pos = $this->size;
-                return $ret;
-            }
-
-            if ($pos===$this->pos) return '';
-
-            if ($this->doc[$pos-1]==='\\') {
-                $start = $pos+1;
-                continue;
-            }
-
-            $pos_old = $this->pos;
-            $this->char = $this->doc[$pos];
-            $this->pos = $pos;
-            return substr($this->doc, $pos_old, $pos-$pos_old);
-        }
-    }
-
-    // remove noise from html content
-    protected function remove_noise($pattern, $remove_tag=false) {
-        $count = preg_match_all($pattern, $this->doc, $matches, PREG_SET_ORDER|PREG_OFFSET_CAPTURE);
-
-        for ($i=$count-1; $i>-1; --$i) {
-            $key = '___noise___'.sprintf('% 3d', count($this->noise)+100);
-            $idx = ($remove_tag) ? 0 : 1;
-            $this->noise[$key] = $matches[$i][$idx][0];
-            $this->doc = substr_replace($this->doc, $key, $matches[$i][$idx][1], strlen($matches[$i][$idx][0]));
-        }
-
-        // reset the length of content
-        $this->size = strlen($this->doc);
-        if ($this->size>0) $this->char = $this->doc[0];
-    }
-
-    // restore noise to html content
-    function restore_noise($text) {
-        while(($pos=strpos($text, '___noise___'))!==false) {
-            $key = '___noise___'.$text[$pos+11].$text[$pos+12].$text[$pos+13];
-            if (isset($this->noise[$key]))
-                $text = substr($text, 0, $pos).$this->noise[$key].substr($text, $pos+14);
-        }
-        return $text;
-    }
-
-    function __toString() {
-        return $this->root->innertext();
-    }
-
-    function __get($name) {
-        switch($name) {
-            case 'outertext': return $this->root->innertext();
-            case 'innertext': return $this->root->innertext();
-            case 'plaintext': return $this->root->text();
-        }
-    }
-
-    // camel naming conventions
-    function childNodes($idx=-1) {return $this->root->childNodes($idx);}
-    function firstChild() {return $this->root->first_child();}
-    function lastChild() {return $this->root->last_child();}
-    function getElementById($id) {return $this->find("#$id", 0);}
-    function getElementsById($id, $idx=null) {return $this->find("#$id", $idx);}
-    function getElementByTagName($name) {return $this->find($name, 0);}
-    function getElementsByTagName($name, $idx=-1) {return $this->find($name, $idx);}
-    function loadFile() {$args = func_get_args();$this->load(call_user_func_array('file_get_contents', $args), true);}
-}
-?>
 \ No newline at end of file
+<?php
+/**
+ * Website: http://sourceforge.net/projects/simplehtmldom/
+ * Additional projects: http://sourceforge.net/projects/debugobject/
+ * Acknowledge: Jose Solorzano (https://sourceforge.net/projects/php-html/)
+ *
+ * Licensed under The MIT License
+ * See the LICENSE file in the project root for more information.
+ *
+ * Authors:
+ *   S.C. Chen
+ *   John Schlick
+ *   Rus Carroll
+ *   logmanoriginal
+ *
+ * Contributors:
+ *   Yousuke Kumakura
+ *   Vadim Voituk
+ *   Antcs
+ *
+ * Version Rev. 1.9 (290)
+ */
+
+define('HDOM_TYPE_ELEMENT', 1);
+define('HDOM_TYPE_COMMENT', 2);
+define('HDOM_TYPE_TEXT', 3);
+define('HDOM_TYPE_ENDTAG', 4);
+define('HDOM_TYPE_ROOT', 5);
+define('HDOM_TYPE_UNKNOWN', 6);
+define('HDOM_QUOTE_DOUBLE', 0);
+define('HDOM_QUOTE_SINGLE', 1);
+define('HDOM_QUOTE_NO', 3);
+define('HDOM_INFO_BEGIN', 0);
+define('HDOM_INFO_END', 1);
+define('HDOM_INFO_QUOTE', 2);
+define('HDOM_INFO_SPACE', 3);
+define('HDOM_INFO_TEXT', 4);
+define('HDOM_INFO_INNER', 5);
+define('HDOM_INFO_OUTER', 6);
+define('HDOM_INFO_ENDSPACE', 7);
+
+defined('DEFAULT_TARGET_CHARSET') || define('DEFAULT_TARGET_CHARSET', 'UTF-8');
+defined('DEFAULT_BR_TEXT') || define('DEFAULT_BR_TEXT', "\r\n");
+defined('DEFAULT_SPAN_TEXT') || define('DEFAULT_SPAN_TEXT', ' ');
+defined('MAX_FILE_SIZE') || define('MAX_FILE_SIZE', 600000);
+define('HDOM_SMARTY_AS_TEXT', 1);
+
+function file_get_html(
+	$url,
+	$use_include_path = false,
+	$context = null,
+	$offset = 0,
+	$maxLen = -1,
+	$lowercase = true,
+	$forceTagsClosed = true,
+	$target_charset = DEFAULT_TARGET_CHARSET,
+	$stripRN = true,
+	$defaultBRText = DEFAULT_BR_TEXT,
+	$defaultSpanText = DEFAULT_SPAN_TEXT)
+{
+	if($maxLen <= 0) { $maxLen = MAX_FILE_SIZE; }
+
+	$dom = new simple_html_dom(
+		null,
+		$lowercase,
+		$forceTagsClosed,
+		$target_charset,
+		$stripRN,
+		$defaultBRText,
+		$defaultSpanText
+	);
+
+	/**
+	 * For sourceforge users: uncomment the next line and comment the
+	 * retrieve_url_contents line 2 lines down if it is not already done.
+	 */
+	$contents = file_get_contents(
+		$url,
+		$use_include_path,
+		$context,
+		$offset,
+		$maxLen
+	);
+	// $contents = retrieve_url_contents($url);
+
+	if (empty($contents) || strlen($contents) > $maxLen) {
+		$dom->clear();
+		return false;
+	}
+
+	return $dom->load($contents, $lowercase, $stripRN);
+}
+
+function str_get_html(
+	$str,
+	$lowercase = true,
+	$forceTagsClosed = true,
+	$target_charset = DEFAULT_TARGET_CHARSET,
+	$stripRN = true,
+	$defaultBRText = DEFAULT_BR_TEXT,
+	$defaultSpanText = DEFAULT_SPAN_TEXT)
+{
+	$dom = new simple_html_dom(
+		null,
+		$lowercase,
+		$forceTagsClosed,
+		$target_charset,
+		$stripRN,
+		$defaultBRText,
+		$defaultSpanText
+	);
+
+	if (empty($str) || strlen($str) > MAX_FILE_SIZE) {
+		$dom->clear();
+		return false;
+	}
+
+	return $dom->load($str, $lowercase, $stripRN);
+}
+
+function dump_html_tree($node, $show_attr = true, $deep = 0)
+{
+	$node->dump($node);
+}
+
+class simple_html_dom_node
+{
+	public $nodetype = HDOM_TYPE_TEXT;
+	public $tag = 'text';
+	public $attr = array();
+	public $children = array();
+	public $nodes = array();
+	public $parent = null;
+	public $_ = array();
+	public $tag_start = 0;
+	private $dom = null;
+
+	function __construct($dom)
+	{
+		$this->dom = $dom;
+		$dom->nodes[] = $this;
+	}
+
+	function __destruct()
+	{
+		$this->clear();
+	}
+
+	function __toString()
+	{
+		return $this->outertext();
+	}
+
+	function clear()
+	{
+		$this->dom = null;
+		$this->nodes = null;
+		$this->parent = null;
+		$this->children = null;
+	}
+
+	function dump($show_attr = true, $depth = 0)
+	{
+		echo str_repeat("\t", $depth) . $this->tag;
+
+		if ($show_attr && count($this->attr) > 0) {
+			echo '(';
+			foreach ($this->attr as $k => $v) {
+				echo "[$k]=>\"$v\", ";
+			}
+			echo ')';
+		}
+
+		echo "\n";
+
+		if ($this->nodes) {
+			foreach ($this->nodes as $node) {
+				$node->dump($show_attr, $depth + 1);
+			}
+		}
+	}
+
+	function dump_node($echo = true)
+	{
+		$string = $this->tag;
+
+		if (count($this->attr) > 0) {
+			$string .= '(';
+			foreach ($this->attr as $k => $v) {
+				$string .= "[$k]=>\"$v\", ";
+			}
+			$string .= ')';
+		}
+
+		if (count($this->_) > 0) {
+			$string .= ' $_ (';
+			foreach ($this->_ as $k => $v) {
+				if (is_array($v)) {
+					$string .= "[$k]=>(";
+					foreach ($v as $k2 => $v2) {
+						$string .= "[$k2]=>\"$v2\", ";
+					}
+					$string .= ')';
+				} else {
+					$string .= "[$k]=>\"$v\", ";
+				}
+			}
+			$string .= ')';
+		}
+
+		if (isset($this->text)) {
+			$string .= " text: ({$this->text})";
+		}
+
+		$string .= ' HDOM_INNER_INFO: ';
+
+		if (isset($node->_[HDOM_INFO_INNER])) {
+			$string .= "'" . $node->_[HDOM_INFO_INNER] . "'";
+		} else {
+			$string .= ' NULL ';
+		}
+
+		$string .= ' children: ' . count($this->children);
+		$string .= ' nodes: ' . count($this->nodes);
+		$string .= ' tag_start: ' . $this->tag_start;
+		$string .= "\n";
+
+		if ($echo) {
+			echo $string;
+			return;
+		} else {
+			return $string;
+		}
+	}
+
+	function parent($parent = null)
+	{
+		// I am SURE that this doesn't work properly.
+		// It fails to unset the current node from it's current parents nodes or
+		// children list first.
+		if ($parent !== null) {
+			$this->parent = $parent;
+			$this->parent->nodes[] = $this;
+			$this->parent->children[] = $this;
+		}
+
+		return $this->parent;
+	}
+
+	function has_child()
+	{
+		return !empty($this->children);
+	}
+
+	function children($idx = -1)
+	{
+		if ($idx === -1) {
+			return $this->children;
+		}
+
+		if (isset($this->children[$idx])) {
+			return $this->children[$idx];
+		}
+
+		return null;
+	}
+
+	function first_child()
+	{
+		if (count($this->children) > 0) {
+			return $this->children[0];
+		}
+		return null;
+	}
+
+	function last_child()
+	{
+		if (count($this->children) > 0) {
+			return end($this->children);
+		}
+		return null;
+	}
+
+	function next_sibling()
+	{
+		if ($this->parent === null) {
+			return null;
+		}
+
+		$idx = array_search($this, $this->parent->children, true);
+
+		if ($idx !== false && isset($this->parent->children[$idx + 1])) {
+			return $this->parent->children[$idx + 1];
+		}
+
+		return null;
+	}
+
+	function prev_sibling()
+	{
+		if ($this->parent === null) {
+			return null;
+		}
+
+		$idx = array_search($this, $this->parent->children, true);
+
+		if ($idx !== false && $idx > 0) {
+			return $this->parent->children[$idx - 1];
+		}
+
+		return null;
+	}
+
+	function find_ancestor_tag($tag)
+	{
+		global $debug_object;
+		if (is_object($debug_object)) { $debug_object->debug_log_entry(1); }
+
+		if ($this->parent === null) {
+			return null;
+		}
+
+		$ancestor = $this->parent;
+
+		while (!is_null($ancestor)) {
+			if (is_object($debug_object)) {
+				$debug_object->debug_log(2, 'Current tag is: ' . $ancestor->tag);
+			}
+
+			if ($ancestor->tag === $tag) {
+				break;
+			}
+
+			$ancestor = $ancestor->parent;
+		}
+
+		return $ancestor;
+	}
+
+	function innertext()
+	{
+		if (isset($this->_[HDOM_INFO_INNER])) {
+			return $this->_[HDOM_INFO_INNER];
+		}
+
+		if (isset($this->_[HDOM_INFO_TEXT])) {
+			return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
+		}
+
+		$ret = '';
+
+		foreach ($this->nodes as $n) {
+			$ret .= $n->outertext();
+		}
+
+		return $ret;
+	}
+
+	function outertext()
+	{
+		global $debug_object;
+
+		if (is_object($debug_object)) {
+			$text = '';
+
+			if ($this->tag === 'text') {
+				if (!empty($this->text)) {
+					$text = ' with text: ' . $this->text;
+				}
+			}
+
+			$debug_object->debug_log(1, 'Innertext of tag: ' . $this->tag . $text);
+		}
+
+		if ($this->tag === 'root') {
+			return $this->innertext();
+		}
+
+		// todo: What is the use of this callback? Remove?
+		if ($this->dom && $this->dom->callback !== null) {
+			call_user_func_array($this->dom->callback, array($this));
+		}
+
+		if (isset($this->_[HDOM_INFO_OUTER])) {
+			return $this->_[HDOM_INFO_OUTER];
+		}
+
+		if (isset($this->_[HDOM_INFO_TEXT])) {
+			return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
+		}
+
+		$ret = '';
+
+		if ($this->dom && $this->dom->nodes[$this->_[HDOM_INFO_BEGIN]]) {
+			$ret = $this->dom->nodes[$this->_[HDOM_INFO_BEGIN]]->makeup();
+		}
+
+		if (isset($this->_[HDOM_INFO_INNER])) {
+			// todo: <br> should either never have HDOM_INFO_INNER or always
+			if ($this->tag !== 'br') {
+				$ret .= $this->_[HDOM_INFO_INNER];
+			}
+		} elseif ($this->nodes) {
+			foreach ($this->nodes as $n) {
+				$ret .= $this->convert_text($n->outertext());
+			}
+		}
+
+		if (isset($this->_[HDOM_INFO_END]) && $this->_[HDOM_INFO_END] != 0) {
+			$ret .= '</' . $this->tag . '>';
+		}
+
+		return $ret;
+	}
+
+	function text()
+	{
+		if (isset($this->_[HDOM_INFO_INNER])) {
+			return $this->_[HDOM_INFO_INNER];
+		}
+
+		switch ($this->nodetype) {
+			case HDOM_TYPE_TEXT: return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
+			case HDOM_TYPE_COMMENT: return '';
+			case HDOM_TYPE_UNKNOWN: return '';
+		}
+
+		if (strcasecmp($this->tag, 'script') === 0) { return ''; }
+		if (strcasecmp($this->tag, 'style') === 0) { return ''; }
+
+		$ret = '';
+
+		// In rare cases, (always node type 1 or HDOM_TYPE_ELEMENT - observed
+		// for some span tags, and some p tags) $this->nodes is set to NULL.
+		// NOTE: This indicates that there is a problem where it's set to NULL
+		// without a clear happening.
+		// WHY is this happening?
+		if (!is_null($this->nodes)) {
+			foreach ($this->nodes as $n) {
+				// Start paragraph after a blank line
+				if ($n->tag === 'p') {
+					$ret = trim($ret) . "\n\n";
+				}
+
+				$ret .= $this->convert_text($n->text());
+
+				// If this node is a span... add a space at the end of it so
+				// multiple spans don't run into each other.  This is plaintext
+				// after all.
+				if ($n->tag === 'span') {
+					$ret .= $this->dom->default_span_text;
+				}
+			}
+		}
+		return $ret;
+	}
+
+	function xmltext()
+	{
+		$ret = $this->innertext();
+		$ret = str_ireplace('<![CDATA[', '', $ret);
+		$ret = str_replace(']]>', '', $ret);
+		return $ret;
+	}
+
+	function makeup()
+	{
+		// text, comment, unknown
+		if (isset($this->_[HDOM_INFO_TEXT])) {
+			return $this->dom->restore_noise($this->_[HDOM_INFO_TEXT]);
+		}
+
+		$ret = '<' . $this->tag;
+		$i = -1;
+
+		foreach ($this->attr as $key => $val) {
+			++$i;
+
+			// skip removed attribute
+			if ($val === null || $val === false) { continue; }
+
+			$ret .= $this->_[HDOM_INFO_SPACE][$i][0];
+
+			//no value attr: nowrap, checked selected...
+			if ($val === true) {
+				$ret .= $key;
+			} else {
+				switch ($this->_[HDOM_INFO_QUOTE][$i])
+				{
+					case HDOM_QUOTE_DOUBLE: $quote = '"'; break;
+					case HDOM_QUOTE_SINGLE: $quote = '\''; break;
+					default: $quote = '';
+				}
+
+				$ret .= $key
+				. $this->_[HDOM_INFO_SPACE][$i][1]
+				. '='
+				. $this->_[HDOM_INFO_SPACE][$i][2]
+				. $quote
+				. $val
+				. $quote;
+			}
+		}
+
+		$ret = $this->dom->restore_noise($ret);
+		return $ret . $this->_[HDOM_INFO_ENDSPACE] . '>';
+	}
+
+	function find($selector, $idx = null, $lowercase = false)
+	{
+		$selectors = $this->parse_selector($selector);
+		if (($count = count($selectors)) === 0) { return array(); }
+		$found_keys = array();
+
+		// find each selector
+		for ($c = 0; $c < $count; ++$c) {
+			// The change on the below line was documented on the sourceforge
+			// code tracker id 2788009
+			// used to be: if (($levle=count($selectors[0]))===0) return array();
+			if (($levle = count($selectors[$c])) === 0) { return array(); }
+			if (!isset($this->_[HDOM_INFO_BEGIN])) { return array(); }
+
+			$head = array($this->_[HDOM_INFO_BEGIN] => 1);
+			$cmd = ' '; // Combinator
+
+			// handle descendant selectors, no recursive!
+			for ($l = 0; $l < $levle; ++$l) {
+				$ret = array();
+
+				foreach ($head as $k => $v) {
+					$n = ($k === -1) ? $this->dom->root : $this->dom->nodes[$k];
+					//PaperG - Pass this optional parameter on to the seek function.
+					$n->seek($selectors[$c][$l], $ret, $cmd, $lowercase);
+				}
+
+				$head = $ret;
+				$cmd = $selectors[$c][$l][4]; // Next Combinator
+			}
+
+			foreach ($head as $k => $v) {
+				if (!isset($found_keys[$k])) {
+					$found_keys[$k] = 1;
+				}
+			}
+		}
+
+		// sort keys
+		ksort($found_keys);
+
+		$found = array();
+		foreach ($found_keys as $k => $v) {
+			$found[] = $this->dom->nodes[$k];
+		}
+
+		// return nth-element or array
+		if (is_null($idx)) { return $found; }
+		elseif ($idx < 0) { $idx = count($found) + $idx; }
+		return (isset($found[$idx])) ? $found[$idx] : null;
+	}
+
+	protected function seek($selector, &$ret, $parent_cmd, $lowercase = false)
+	{
+		global $debug_object;
+		if (is_object($debug_object)) { $debug_object->debug_log_entry(1); }
+
+		list($tag, $id, $class, $attributes, $cmb) = $selector;
+		$nodes = array();
+
+		if ($parent_cmd === ' ') { // Descendant Combinator
+			// Find parent closing tag if the current element doesn't have a closing
+			// tag (i.e. void element)
+			$end = (!empty($this->_[HDOM_INFO_END])) ? $this->_[HDOM_INFO_END] : 0;
+			if ($end == 0) {
+				$parent = $this->parent;
+				while (!isset($parent->_[HDOM_INFO_END]) && $parent !== null) {
+					$end -= 1;
+					$parent = $parent->parent;
+				}
+				$end += $parent->_[HDOM_INFO_END];
+			}
+
+			// Get list of target nodes
+			$nodes_start = $this->_[HDOM_INFO_BEGIN] + 1;
+			$nodes_count = $end - $nodes_start;
+			$nodes = array_slice($this->dom->nodes, $nodes_start, $nodes_count, true);
+		} elseif ($parent_cmd === '>') { // Child Combinator
+			$nodes = $this->children;
+		} elseif ($parent_cmd === '+'
+			&& $this->parent
+			&& in_array($this, $this->parent->children)) { // Next-Sibling Combinator
+				$index = array_search($this, $this->parent->children, true) + 1;
+				if ($index < count($this->parent->children))
+					$nodes[] = $this->parent->children[$index];
+		} elseif ($parent_cmd === '~'
+			&& $this->parent
+			&& in_array($this, $this->parent->children)) { // Subsequent Sibling Combinator
+				$index = array_search($this, $this->parent->children, true);
+				$nodes = array_slice($this->parent->children, $index);
+		}
+
+		// Go throgh each element starting at this element until the end tag
+		// Note: If this element is a void tag, any previous void element is
+		// skipped.
+		foreach($nodes as $node) {
+			$pass = true;
+
+			// Skip root nodes
+			if(!$node->parent) {
+				$pass = false;
+			}
+
+			// Skip if node isn't a child node (i.e. text nodes)
+			if($pass && !in_array($node, $node->parent->children, true)) {
+				$pass = false;
+			}
+
+			// Skip if tag doesn't match
+			if ($pass && $tag !== '' && $tag !== $node->tag && $tag !== '*') {
+				$pass = false;
+			}
+
+			// Skip if ID doesn't exist
+			if ($pass && $id !== '' && !isset($node->attr['id'])) {
+				$pass = false;
+			}
+
+			// Check if ID matches
+			if ($pass && $id !== '' && isset($node->attr['id'])) {
+				// Note: Only consider the first ID (as browsers do)
+				$node_id = explode(' ', trim($node->attr['id']))[0];
+
+				if($id !== $node_id) { $pass = false; }
+			}
+
+			// Check if all class(es) exist
+			if ($pass && $class !== '' && is_array($class) && !empty($class)) {
+				if (isset($node->attr['class'])) {
+					$node_classes = explode(' ', $node->attr['class']);
+
+					if ($lowercase) {
+						$node_classes = array_map('strtolower', $node_classes);
+					}
+
+					foreach($class as $c) {
+						if(!in_array($c, $node_classes)) {
+							$pass = false;
+							break;
+						}
+					}
+				} else {
+					$pass = false;
+				}
+			}
+
+			// Check attributes
+			if ($pass
+				&& $attributes !== ''
+				&& is_array($attributes)
+				&& !empty($attributes)) {
+					foreach($attributes as $a) {
+						list (
+							$att_name,
+							$att_expr,
+							$att_val,
+							$att_inv,
+							$att_case_sensitivity
+						) = $a;
+
+						// Handle indexing attributes (i.e. "[2]")
+						/**
+						 * Note: This is not supported by the CSS Standard but adds
+						 * the ability to select items compatible to XPath (i.e.
+						 * the 3rd element within it's parent).
+						 *
+						 * Note: This doesn't conflict with the CSS Standard which
+						 * doesn't work on numeric attributes anyway.
+						 */
+						if (is_numeric($att_name)
+							&& $att_expr === ''
+							&& $att_val === '') {
+								$count = 0;
+
+								// Find index of current element in parent
+								foreach ($node->parent->children as $c) {
+									if ($c->tag === $node->tag) ++$count;
+									if ($c === $node) break;
+								}
+
+								// If this is the correct node, continue with next
+								// attribute
+								if ($count === (int)$att_name) continue;
+						}
+
+						// Check attribute availability
+						if ($att_inv) { // Attribute should NOT be set
+							if (isset($node->attr[$att_name])) {
+								$pass = false;
+								break;
+							}
+						} else { // Attribute should be set
+							// todo: "plaintext" is not a valid CSS selector!
+							if ($att_name !== 'plaintext'
+								&& !isset($node->attr[$att_name])) {
+									$pass = false;
+									break;
+							}
+						}
+
+						// Continue with next attribute if expression isn't defined
+						if ($att_expr === '') continue;
+
+						// If they have told us that this is a "plaintext"
+						// search then we want the plaintext of the node - right?
+						// todo "plaintext" is not a valid CSS selector!
+						if ($att_name === 'plaintext') {
+							$nodeKeyValue = $node->text();
+						} else {
+							$nodeKeyValue = $node->attr[$att_name];
+						}
+
+						if (is_object($debug_object)) {
+							$debug_object->debug_log(2,
+								'testing node: '
+								. $node->tag
+								. ' for attribute: '
+								. $att_name
+								. $att_expr
+								. $att_val
+								. ' where nodes value is: '
+								. $nodeKeyValue
+							);
+						}
+
+						// If lowercase is set, do a case insensitive test of
+						// the value of the selector.
+						if ($lowercase) {
+							$check = $this->match(
+								$att_expr,
+								strtolower($att_val),
+								strtolower($nodeKeyValue),
+								$att_case_sensitivity
+							);
+						} else {
+							$check = $this->match(
+								$att_expr,
+								$att_val,
+								$nodeKeyValue,
+								$att_case_sensitivity
+							);
+						}
+
+						if (is_object($debug_object)) {
+							$debug_object->debug_log(2,
+								'after match: '
+								. ($check ? 'true' : 'false')
+							);
+						}
+
+						if (!$check) {
+							$pass = false;
+							break;
+						}
+					}
+			}
+
+			// Found a match. Add to list and clear node
+			if ($pass) $ret[$node->_[HDOM_INFO_BEGIN]] = 1;
+			unset($node);
+		}
+		// It's passed by reference so this is actually what this function returns.
+		if (is_object($debug_object)) {
+			$debug_object->debug_log(1, 'EXIT - ret: ', $ret);
+		}
+	}
+
+	protected function match($exp, $pattern, $value, $case_sensitivity)
+	{
+		global $debug_object;
+		if (is_object($debug_object)) {$debug_object->debug_log_entry(1);}
+
+		if ($case_sensitivity === 'i') {
+			$pattern = strtolower($pattern);
+			$value = strtolower($value);
+		}
+
+		switch ($exp) {
+			case '=':
+				return ($value === $pattern);
+			case '!=':
+				return ($value !== $pattern);
+			case '^=':
+				return preg_match('/^' . preg_quote($pattern, '/') . '/', $value);
+			case '$=':
+				return preg_match('/' . preg_quote($pattern, '/') . '$/', $value);
+			case '*=':
+				return preg_match('/' . preg_quote($pattern, '/') . '/', $value);
+			case '|=':
+				/**
+				 * [att|=val]
+				 *
+				 * Represents an element with the att attribute, its value
+				 * either being exactly "val" or beginning with "val"
+				 * immediately followed by "-" (U+002D).
+				 */
+				return strpos($value, $pattern) === 0;
+			case '~=':
+				/**
+				 * [att~=val]
+				 *
+				 * Represents an element with the att attribute whose value is a
+				 * whitespace-separated list of words, one of which is exactly
+				 * "val". If "val" contains whitespace, it will never represent
+				 * anything (since the words are separated by spaces). Also if
+				 * "val" is the empty string, it will never represent anything.
+				 */
+				return in_array($pattern, explode(' ', trim($value)), true);
+		}
+		return false;
+	}
+
+	protected function parse_selector($selector_string)
+	{
+		global $debug_object;
+		if (is_object($debug_object)) { $debug_object->debug_log_entry(1); }
+
+		/**
+		 * Pattern of CSS selectors, modified from mootools (https://mootools.net/)
+		 *
+		 * Paperg: Add the colon to the attribute, so that it properly finds
+		 * <tag attr:ibute="something" > like google does.
+		 *
+		 * Note: if you try to look at this attribute, you MUST use getAttribute
+		 * since $dom->x:y will fail the php syntax check.
+		 *
+		 * Notice the \[ starting the attribute? and the @? following? This
+		 * implies that an attribute can begin with an @ sign that is not
+		 * captured. This implies that an html attribute specifier may start
+		 * with an @ sign that is NOT captured by the expression. Farther study
+		 * is required to determine of this should be documented or removed.
+		 *
+		 * Matches selectors in this order:
+		 *
+		 * [0] - full match
+		 *
+		 * [1] - tag name
+		 *     ([\w:\*-]*)
+		 *     Matches the tag name consisting of zero or more words, colons,
+		 *     asterisks and hyphens.
+		 *
+		 * [2] - id name
+		 *     (?:\#([\w-]+))
+		 *     Optionally matches a id name, consisting of an "#" followed by
+		 *     the id name (one or more words and hyphens).
+		 *
+		 * [3] - class names (including dots)
+		 *     (?:\.([\w\.-]+))?
+		 *     Optionally matches a list of classs, consisting of an "."
+		 *     followed by the class name (one or more words and hyphens)
+		 *     where multiple classes can be chained (i.e. ".foo.bar.baz")
+		 *
+		 * [4] - attributes
+		 *     ((?:\[@?(?:!?[\w:-]+)(?:(?:[!*^$|~]?=)[\"']?(?:.*?)[\"']?)?(?:\s*?(?:[iIsS])?)?\])+)?
+		 *     Optionally matches the attributes list
+		 *
+		 * [5] - separator
+		 *     ([\/, >+~]+)
+		 *     Matches the selector list separator
+		 */
+		// phpcs:ignore Generic.Files.LineLength
+		$pattern = "/([\w:\*-]*)(?:\#([\w-]+))?(?:|\.([\w\.-]+))?((?:\[@?(?:!?[\w:-]+)(?:(?:[!*^$|~]?=)[\"']?(?:.*?)[\"']?)?(?:\s*?(?:[iIsS])?)?\])+)?([\/, >+~]+)/is";
+
+		preg_match_all(
+			$pattern,
+			trim($selector_string) . ' ', // Add final ' ' as pseudo separator
+			$matches,
+			PREG_SET_ORDER
+		);
+
+		if (is_object($debug_object)) {
+			$debug_object->debug_log(2, 'Matches Array: ', $matches);
+		}
+
+		$selectors = array();
+		$result = array();
+
+		foreach ($matches as $m) {
+			$m[0] = trim($m[0]);
+
+			// Skip NoOps
+			if ($m[0] === '' || $m[0] === '/' || $m[0] === '//') { continue; }
+
+			// Convert to lowercase
+			if ($this->dom->lowercase) {
+				$m[1] = strtolower($m[1]);
+			}
+
+			// Extract classes
+			if ($m[3] !== '') { $m[3] = explode('.', $m[3]); }
+
+			/* Extract attributes (pattern based on the pattern above!)
+
+			 * [0] - full match
+			 * [1] - attribute name
+			 * [2] - attribute expression
+			 * [3] - attribute value
+			 * [4] - case sensitivity
+			 *
+			 * Note: Attributes can be negated with a "!" prefix to their name
+			 */
+			if($m[4] !== '') {
+				preg_match_all(
+					"/\[@?(!?[\w:-]+)(?:([!*^$|~]?=)[\"']?(.*?)[\"']?)?(?:\s+?([iIsS])?)?\]/is",
+					trim($m[4]),
+					$attributes,
+					PREG_SET_ORDER
+				);
+
+				// Replace element by array
+				$m[4] = array();
+
+				foreach($attributes as $att) {
+					// Skip empty matches
+					if(trim($att[0]) === '') { continue; }
+
+					$inverted = (isset($att[1][0]) && $att[1][0] === '!');
+					$m[4][] = array(
+						$inverted ? substr($att[1], 1) : $att[1], // Name
+						(isset($att[2])) ? $att[2] : '', // Expression
+						(isset($att[3])) ? $att[3] : '', // Value
+						$inverted, // Inverted Flag
+						(isset($att[4])) ? strtolower($att[4]) : '', // Case-Sensitivity
+					);
+				}
+			}
+
+			// Sanitize Separator
+			if ($m[5] !== '' && trim($m[5]) === '') { // Descendant Separator
+				$m[5] = ' ';
+			} else { // Other Separator
+				$m[5] = trim($m[5]);
+			}
+
+			// Clear Separator if it's a Selector List
+			if ($is_list = ($m[5] === ',')) { $m[5] = ''; }
+
+			// Remove full match before adding to results
+			array_shift($m);
+			$result[] = $m;
+
+			if ($is_list) { // Selector List
+				$selectors[] = $result;
+				$result = array();
+			}
+		}
+
+		if (count($result) > 0) { $selectors[] = $result; }
+		return $selectors;
+	}
+
+	function __get($name)
+	{
+		if (isset($this->attr[$name])) {
+			return $this->convert_text($this->attr[$name]);
+		}
+		switch ($name) {
+			case 'outertext': return $this->outertext();
+			case 'innertext': return $this->innertext();
+			case 'plaintext': return $this->text();
+			case 'xmltext': return $this->xmltext();
+			default: return array_key_exists($name, $this->attr);
+		}
+	}
+
+	function __set($name, $value)
+	{
+		global $debug_object;
+		if (is_object($debug_object)) { $debug_object->debug_log_entry(1); }
+
+		switch ($name) {
+			case 'outertext': return $this->_[HDOM_INFO_OUTER] = $value;
+			case 'innertext':
+				if (isset($this->_[HDOM_INFO_TEXT])) {
+					return $this->_[HDOM_INFO_TEXT] = $value;
+				}
+				return $this->_[HDOM_INFO_INNER] = $value;
+		}
+
+		if (!isset($this->attr[$name])) {
+			$this->_[HDOM_INFO_SPACE][] = array(' ', '', '');
+			$this->_[HDOM_INFO_QUOTE][] = HDOM_QUOTE_DOUBLE;
+		}
+
+		$this->attr[$name] = $value;
+	}
+
+	function __isset($name)
+	{
+		switch ($name) {
+			case 'outertext': return true;
+			case 'innertext': return true;
+			case 'plaintext': return true;
+		}
+		//no value attr: nowrap, checked selected...
+		return (array_key_exists($name, $this->attr)) ? true : isset($this->attr[$name]);
+	}
+
+	function __unset($name)
+	{
+		if (isset($this->attr[$name])) { unset($this->attr[$name]); }
+	}
+
+	function convert_text($text)
+	{
+		global $debug_object;
+		if (is_object($debug_object)) { $debug_object->debug_log_entry(1); }
+
+		$converted_text = $text;
+
+		$sourceCharset = '';
+		$targetCharset = '';
+
+		if ($this->dom) {
+			$sourceCharset = strtoupper($this->dom->_charset);
+			$targetCharset = strtoupper($this->dom->_target_charset);
+		}
+
+		if (is_object($debug_object)) {
+			$debug_object->debug_log(3,
+				'source charset: '
+				. $sourceCharset
+				. ' target charaset: '
+				. $targetCharset
+			);
+		}
+
+		if (!empty($sourceCharset)
+			&& !empty($targetCharset)
+			&& (strcasecmp($sourceCharset, $targetCharset) != 0)) {
+			// Check if the reported encoding could have been incorrect and the text is actually already UTF-8
+			if ((strcasecmp($targetCharset, 'UTF-8') == 0)
+				&& ($this->is_utf8($text))) {
+				$converted_text = $text;
+			} else {
+				$converted_text = iconv($sourceCharset, $targetCharset, $text);
+			}
+		}
+
+		// Lets make sure that we don't have that silly BOM issue with any of the utf-8 text we output.
+		if ($targetCharset === 'UTF-8') {
+			if (substr($converted_text, 0, 3) === "\xef\xbb\xbf") {
+				$converted_text = substr($converted_text, 3);
+			}
+
+			if (substr($converted_text, -3) === "\xef\xbb\xbf") {
+				$converted_text = substr($converted_text, 0, -3);
+			}
+		}
+
+		return $converted_text;
+	}
+
+	static function is_utf8($str)
+	{
+		$c = 0; $b = 0;
+		$bits = 0;
+		$len = strlen($str);
+		for($i = 0; $i < $len; $i++) {
+			$c = ord($str[$i]);
+			if($c > 128) {
+				if(($c >= 254)) { return false; }
+				elseif($c >= 252) { $bits = 6; }
+				elseif($c >= 248) { $bits = 5; }
+				elseif($c >= 240) { $bits = 4; }
+				elseif($c >= 224) { $bits = 3; }
+				elseif($c >= 192) { $bits = 2; }
+				else { return false; }
+				if(($i + $bits) > $len) { return false; }
+				while($bits > 1) {
+					$i++;
+					$b = ord($str[$i]);
+					if($b < 128 || $b > 191) { return false; }
+					$bits--;
+				}
+			}
+		}
+		return true;
+	}
+
+	function get_display_size()
+	{
+		global $debug_object;
+
+		$width = -1;
+		$height = -1;
+
+		if ($this->tag !== 'img') {
+			return false;
+		}
+
+		// See if there is aheight or width attribute in the tag itself.
+		if (isset($this->attr['width'])) {
+			$width = $this->attr['width'];
+		}
+
+		if (isset($this->attr['height'])) {
+			$height = $this->attr['height'];
+		}
+
+		// Now look for an inline style.
+		if (isset($this->attr['style'])) {
+			// Thanks to user gnarf from stackoverflow for this regular expression.
+			$attributes = array();
+
+			preg_match_all(
+				'/([\w-]+)\s*:\s*([^;]+)\s*;?/',
+				$this->attr['style'],
+				$matches,
+				PREG_SET_ORDER
+			);
+
+			foreach ($matches as $match) {
+				$attributes[$match[1]] = $match[2];
+			}
+
+			// If there is a width in the style attributes:
+			if (isset($attributes['width']) && $width == -1) {
+				// check that the last two characters are px (pixels)
+				if (strtolower(substr($attributes['width'], -2)) === 'px') {
+					$proposed_width = substr($attributes['width'], 0, -2);
+					// Now make sure that it's an integer and not something stupid.
+					if (filter_var($proposed_width, FILTER_VALIDATE_INT)) {
+						$width = $proposed_width;
+					}
+				}
+			}
+
+			// If there is a width in the style attributes:
+			if (isset($attributes['height']) && $height == -1) {
+				// check that the last two characters are px (pixels)
+				if (strtolower(substr($attributes['height'], -2)) == 'px') {
+					$proposed_height = substr($attributes['height'], 0, -2);
+					// Now make sure that it's an integer and not something stupid.
+					if (filter_var($proposed_height, FILTER_VALIDATE_INT)) {
+						$height = $proposed_height;
+					}
+				}
+			}
+
+		}
+
+		// Future enhancement:
+		// Look in the tag to see if there is a class or id specified that has
+		// a height or width attribute to it.
+
+		// Far future enhancement
+		// Look at all the parent tags of this image to see if they specify a
+		// class or id that has an img selector that specifies a height or width
+		// Note that in this case, the class or id will have the img subselector
+		// for it to apply to the image.
+
+		// ridiculously far future development
+		// If the class or id is specified in a SEPARATE css file thats not on
+		// the page, go get it and do what we were just doing for the ones on
+		// the page.
+
+		$result = array(
+			'height' => $height,
+			'width' => $width
+		);
+
+		return $result;
+	}
+
+	function save($filepath = '')
+	{
+		$ret = $this->outertext();
+
+		if ($filepath !== '') {
+			file_put_contents($filepath, $ret, LOCK_EX);
+		}
+
+		return $ret;
+	}
+
+	function addClass($class)
+	{
+		if (is_string($class)) {
+			$class = explode(' ', $class);
+		}
+
+		if (is_array($class)) {
+			foreach($class as $c) {
+				if (isset($this->class)) {
+					if ($this->hasClass($c)) {
+						continue;
+					} else {
+						$this->class .= ' ' . $c;
+					}
+				} else {
+					$this->class = $c;
+				}
+			}
+		} else {
+			if (is_object($debug_object)) {
+				$debug_object->debug_log(2, 'Invalid type: ', gettype($class));
+			}
+		}
+	}
+
+	function hasClass($class)
+	{
+		if (is_string($class)) {
+			if (isset($this->class)) {
+				return in_array($class, explode(' ', $this->class), true);
+			}
+		} else {
+			if (is_object($debug_object)) {
+				$debug_object->debug_log(2, 'Invalid type: ', gettype($class));
+			}
+		}
+
+		return false;
+	}
+
+	function removeClass($class = null)
+	{
+		if (!isset($this->class)) {
+			return;
+		}
+
+		if (is_null($class)) {
+			$this->removeAttribute('class');
+			return;
+		}
+
+		if (is_string($class)) {
+			$class = explode(' ', $class);
+		}
+
+		if (is_array($class)) {
+			$class = array_diff(explode(' ', $this->class), $class);
+			if (empty($class)) {
+				$this->removeAttribute('class');
+			} else {
+				$this->class = implode(' ', $class);
+			}
+		}
+	}
+
+	function getAllAttributes()
+	{
+		return $this->attr;
+	}
+
+	function getAttribute($name)
+	{
+		return $this->__get($name);
+	}
+
+	function setAttribute($name, $value)
+	{
+		$this->__set($name, $value);
+	}
+
+	function hasAttribute($name)
+	{
+		return $this->__isset($name);
+	}
+
+	function removeAttribute($name)
+	{
+		$this->__set($name, null);
+	}
+
+	function remove()
+	{
+		if ($this->parent) {
+			$this->parent->removeChild($this);
+		}
+	}
+
+	function removeChild($node)
+	{
+		$nidx = array_search($node, $this->nodes, true);
+		$cidx = array_search($node, $this->children, true);
+		$didx = array_search($node, $this->dom->nodes, true);
+
+		if ($nidx !== false && $cidx !== false && $didx !== false) {
+
+			foreach($node->children as $child) {
+				$node->removeChild($child);
+			}
+
+			foreach($node->nodes as $entity) {
+				$enidx = array_search($entity, $node->nodes, true);
+				$edidx = array_search($entity, $node->dom->nodes, true);
+
+				if ($enidx !== false && $edidx !== false) {
+					unset($node->nodes[$enidx]);
+					unset($node->dom->nodes[$edidx]);
+				}
+			}
+
+			unset($this->nodes[$nidx]);
+			unset($this->children[$cidx]);
+			unset($this->dom->nodes[$didx]);
+
+			$node->clear();
+
+		}
+	}
+
+	function getElementById($id)
+	{
+		return $this->find("#$id", 0);
+	}
+
+	function getElementsById($id, $idx = null)
+	{
+		return $this->find("#$id", $idx);
+	}
+
+	function getElementByTagName($name)
+	{
+		return $this->find($name, 0);
+	}
+
+	function getElementsByTagName($name, $idx = null)
+	{
+		return $this->find($name, $idx);
+	}
+
+	function parentNode()
+	{
+		return $this->parent();
+	}
+
+	function childNodes($idx = -1)
+	{
+		return $this->children($idx);
+	}
+
+	function firstChild()
+	{
+		return $this->first_child();
+	}
+
+	function lastChild()
+	{
+		return $this->last_child();
+	}
+
+	function nextSibling()
+	{
+		return $this->next_sibling();
+	}
+
+	function previousSibling()
+	{
+		return $this->prev_sibling();
+	}
+
+	function hasChildNodes()
+	{
+		return $this->has_child();
+	}
+
+	function nodeName()
+	{
+		return $this->tag;
+	}
+
+	function appendChild($node)
+	{
+		$node->parent($this);
+		return $node;
+	}
+
+}
+
+class simple_html_dom
+{
+	public $root = null;
+	public $nodes = array();
+	public $callback = null;
+	public $lowercase = false;
+	public $original_size;
+	public $size;
+
+	protected $pos;
+	protected $doc;
+	protected $char;
+
+	protected $cursor;
+	protected $parent;
+	protected $noise = array();
+	protected $token_blank = " \t\r\n";
+	protected $token_equal = ' =/>';
+	protected $token_slash = " />\r\n\t";
+	protected $token_attr = ' >';
+
+	public $_charset = '';
+	public $_target_charset = '';
+
+	protected $default_br_text = '';
+
+	public $default_span_text = '';
+
+	protected $self_closing_tags = array(
+		'area' => 1,
+		'base' => 1,
+		'br' => 1,
+		'col' => 1,
+		'embed' => 1,
+		'hr' => 1,
+		'img' => 1,
+		'input' => 1,
+		'link' => 1,
+		'meta' => 1,
+		'param' => 1,
+		'source' => 1,
+		'track' => 1,
+		'wbr' => 1
+	);
+	protected $block_tags = array(
+		'body' => 1,
+		'div' => 1,
+		'form' => 1,
+		'root' => 1,
+		'span' => 1,
+		'table' => 1
+	);
+	protected $optional_closing_tags = array(
+		// Not optional, see
+		// https://www.w3.org/TR/html/textlevel-semantics.html#the-b-element
+		'b' => array('b' => 1),
+		'dd' => array('dd' => 1, 'dt' => 1),
+		// Not optional, see
+		// https://www.w3.org/TR/html/grouping-content.html#the-dl-element
+		'dl' => array('dd' => 1, 'dt' => 1),
+		'dt' => array('dd' => 1, 'dt' => 1),
+		'li' => array('li' => 1),
+		'optgroup' => array('optgroup' => 1, 'option' => 1),
+		'option' => array('optgroup' => 1, 'option' => 1),
+		'p' => array('p' => 1),
+		'rp' => array('rp' => 1, 'rt' => 1),
+		'rt' => array('rp' => 1, 'rt' => 1),
+		'td' => array('td' => 1, 'th' => 1),
+		'th' => array('td' => 1, 'th' => 1),
+		'tr' => array('td' => 1, 'th' => 1, 'tr' => 1),
+	);
+
+	function __construct(
+		$str = null,
+		$lowercase = true,
+		$forceTagsClosed = true,
+		$target_charset = DEFAULT_TARGET_CHARSET,
+		$stripRN = true,
+		$defaultBRText = DEFAULT_BR_TEXT,
+		$defaultSpanText = DEFAULT_SPAN_TEXT,
+		$options = 0)
+	{
+		if ($str) {
+			if (preg_match('/^http:\/\//i', $str) || is_file($str)) {
+				$this->load_file($str);
+			} else {
+				$this->load(
+					$str,
+					$lowercase,
+					$stripRN,
+					$defaultBRText,
+					$defaultSpanText,
+					$options
+				);
+			}
+		}
+		// Forcing tags to be closed implies that we don't trust the html, but
+		// it can lead to parsing errors if we SHOULD trust the html.
+		if (!$forceTagsClosed) {
+			$this->optional_closing_array = array();
+		}
+
+		$this->_target_charset = $target_charset;
+	}
+
+	function __destruct()
+	{
+		$this->clear();
+	}
+
+	function load(
+		$str,
+		$lowercase = true,
+		$stripRN = true,
+		$defaultBRText = DEFAULT_BR_TEXT,
+		$defaultSpanText = DEFAULT_SPAN_TEXT,
+		$options = 0)
+	{
+		global $debug_object;
+
+		// prepare
+		$this->prepare($str, $lowercase, $defaultBRText, $defaultSpanText);
+
+		// Per sourceforge http://sourceforge.net/tracker/?func=detail&aid=2949097&group_id=218559&atid=1044037
+		// Script tags removal now preceeds style tag removal.
+		// strip out <script> tags
+		$this->remove_noise("'<\s*script[^>]*[^/]>(.*?)<\s*/\s*script\s*>'is");
+		$this->remove_noise("'<\s*script\s*>(.*?)<\s*/\s*script\s*>'is");
+
+		// strip out the \r \n's if we are told to.
+		if ($stripRN) {
+			$this->doc = str_replace("\r", ' ', $this->doc);
+			$this->doc = str_replace("\n", ' ', $this->doc);
+
+			// set the length of content since we have changed it.
+			$this->size = strlen($this->doc);
+		}
+
+		// strip out cdata
+		$this->remove_noise("'<!\[CDATA\[(.*?)\]\]>'is", true);
+		// strip out comments
+		$this->remove_noise("'<!--(.*?)-->'is");
+		// strip out <style> tags
+		$this->remove_noise("'<\s*style[^>]*[^/]>(.*?)<\s*/\s*style\s*>'is");
+		$this->remove_noise("'<\s*style\s*>(.*?)<\s*/\s*style\s*>'is");
+		// strip out preformatted tags
+		$this->remove_noise("'<\s*(?:code)[^>]*>(.*?)<\s*/\s*(?:code)\s*>'is");
+		// strip out server side scripts
+		$this->remove_noise("'(<\?)(.*?)(\?>)'s", true);
+
+		if($options & HDOM_SMARTY_AS_TEXT) { // Strip Smarty scripts
+			$this->remove_noise("'(\{\w)(.*?)(\})'s", true);
+		}
+
+		// parsing
+		$this->parse();
+		// end
+		$this->root->_[HDOM_INFO_END] = $this->cursor;
+		$this->parse_charset();
+
+		// make load function chainable
+		return $this;
+	}
+
+	function load_file()
+	{
+		$args = func_get_args();
+
+		if(($doc = call_user_func_array('file_get_contents', $args)) !== false) {
+			$this->load($doc, true);
+		} else {
+			return false;
+		}
+	}
+
+	function set_callback($function_name)
+	{
+		$this->callback = $function_name;
+	}
+
+	function remove_callback()
+	{
+		$this->callback = null;
+	}
+
+	function save($filepath = '')
+	{
+		$ret = $this->root->innertext();
+		if ($filepath !== '') { file_put_contents($filepath, $ret, LOCK_EX); }
+		return $ret;
+	}
+
+	function find($selector, $idx = null, $lowercase = false)
+	{
+		return $this->root->find($selector, $idx, $lowercase);
+	}
+
+	function clear()
+	{
+		if (isset($this->nodes)) {
+			foreach ($this->nodes as $n) {
+				$n->clear();
+				$n = null;
+			}
+		}
+
+		// This add next line is documented in the sourceforge repository.
+		// 2977248 as a fix for ongoing memory leaks that occur even with the
+		// use of clear.
+		if (isset($this->children)) {
+			foreach ($this->children as $n) {
+				$n->clear();
+				$n = null;
+			}
+		}
+
+		if (isset($this->parent)) {
+			$this->parent->clear();
+			unset($this->parent);
+		}
+
+		if (isset($this->root)) {
+			$this->root->clear();
+			unset($this->root);
+		}
+
+		unset($this->doc);
+		unset($this->noise);
+	}
+
+	function dump($show_attr = true)
+	{
+		$this->root->dump($show_attr);
+	}
+
+	protected function prepare(
+		$str, $lowercase = true,
+		$defaultBRText = DEFAULT_BR_TEXT,
+		$defaultSpanText = DEFAULT_SPAN_TEXT)
+	{
+		$this->clear();
+
+		$this->doc = trim($str);
+		$this->size = strlen($this->doc);
+		$this->original_size = $this->size; // original size of the html
+		$this->pos = 0;
+		$this->cursor = 1;
+		$this->noise = array();
+		$this->nodes = array();
+		$this->lowercase = $lowercase;
+		$this->default_br_text = $defaultBRText;
+		$this->default_span_text = $defaultSpanText;
+		$this->root = new simple_html_dom_node($this);
+		$this->root->tag = 'root';
+		$this->root->_[HDOM_INFO_BEGIN] = -1;
+		$this->root->nodetype = HDOM_TYPE_ROOT;
+		$this->parent = $this->root;
+		if ($this->size > 0) { $this->char = $this->doc[0]; }
+	}
+
+	protected function parse()
+	{
+		while (true) {
+			// Read next tag if there is no text between current position and the
+			// next opening tag.
+			if (($s = $this->copy_until_char('<')) === '') {
+				if($this->read_tag()) {
+					continue;
+				} else {
+					return true;
+				}
+			}
+
+			// Add a text node for text between tags
+			$node = new simple_html_dom_node($this);
+			++$this->cursor;
+			$node->_[HDOM_INFO_TEXT] = $s;
+			$this->link_nodes($node, false);
+		}
+	}
+
+	protected function parse_charset()
+	{
+		global $debug_object;
+
+		$charset = null;
+
+		if (function_exists('get_last_retrieve_url_contents_content_type')) {
+			$contentTypeHeader = get_last_retrieve_url_contents_content_type();
+			$success = preg_match('/charset=(.+)/', $contentTypeHeader, $matches);
+			if ($success) {
+				$charset = $matches[1];
+				if (is_object($debug_object)) {
+					$debug_object->debug_log(2,
+						'header content-type found charset of: '
+						. $charset
+					);
+				}
+			}
+		}
+
+		if (empty($charset)) {
+			// https://www.w3.org/TR/html/document-metadata.html#statedef-http-equiv-content-type
+			$el = $this->root->find('meta[http-equiv=Content-Type]', 0, true);
+
+			if (!empty($el)) {
+				$fullvalue = $el->content;
+				if (is_object($debug_object)) {
+					$debug_object->debug_log(2,
+						'meta content-type tag found'
+						. $fullvalue
+					);
+				}
+
+				if (!empty($fullvalue)) {
+					$success = preg_match(
+						'/charset=(.+)/i',
+						$fullvalue,
+						$matches
+					);
+
+					if ($success) {
+						$charset = $matches[1];
+					} else {
+						// If there is a meta tag, and they don't specify the
+						// character set, research says that it's typically
+						// ISO-8859-1
+						if (is_object($debug_object)) {
+							$debug_object->debug_log(2,
+								'meta content-type tag couldn\'t be parsed. using iso-8859 default.'
+							);
+						}
+
+						$charset = 'ISO-8859-1';
+					}
+				}
+			}
+		}
+
+		if (empty($charset)) {
+			// https://www.w3.org/TR/html/document-metadata.html#character-encoding-declaration
+			if ($meta = $this->root->find('meta[charset]', 0)) {
+				$charset = $meta->charset;
+				if (is_object($debug_object)) {
+					$debug_object->debug_log(2, 'meta charset: ' . $charset);
+				}
+			}
+		}
+
+		if (empty($charset)) {
+			// Try to guess the charset based on the content
+			// Requires Multibyte String (mbstring) support (optional)
+			if (function_exists('mb_detect_encoding')) {
+				/**
+				 * mb_detect_encoding() is not intended to distinguish between
+				 * charsets, especially single-byte charsets. Its primary
+				 * purpose is to detect which multibyte encoding is in use,
+				 * i.e. UTF-8, UTF-16, shift-JIS, etc.
+				 *
+				 * -- https://bugs.php.net/bug.php?id=38138
+				 *
+				 * Adding both CP1251/ISO-8859-5 and CP1252/ISO-8859-1 will
+				 * always result in CP1251/ISO-8859-5 and vice versa.
+				 *
+				 * Thus, only detect if it's either UTF-8 or CP1252/ISO-8859-1
+				 * to stay compatible.
+				 */
+				$encoding = mb_detect_encoding(
+					$this->doc,
+					array( 'UTF-8', 'CP1252', 'ISO-8859-1' )
+				);
+
+				if ($encoding === 'CP1252' || $encoding === 'ISO-8859-1') {
+					// Due to a limitation of mb_detect_encoding
+					// 'CP1251'/'ISO-8859-5' will be detected as
+					// 'CP1252'/'ISO-8859-1'. This will cause iconv to fail, in
+					// which case we can simply assume it is the other charset.
+					if (!@iconv('CP1252', 'UTF-8', $this->doc)) {
+						$encoding = 'CP1251';
+					}
+				}
+
+				if ($encoding !== false) {
+					$charset = $encoding;
+					if (is_object($debug_object)) {
+						$debug_object->debug_log(2, 'mb_detect: ' . $charset);
+					}
+				}
+			}
+		}
+
+		if (empty($charset)) {
+			// Assume it's UTF-8 as it is the most likely charset to be used
+			$charset = 'UTF-8';
+			if (is_object($debug_object)) {
+				$debug_object->debug_log(2, 'No match found, assume ' . $charset);
+			}
+		}
+
+		// Since CP1252 is a superset, if we get one of it's subsets, we want
+		// it instead.
+		if ((strtolower($charset) == 'iso-8859-1')
+			|| (strtolower($charset) == 'latin1')
+			|| (strtolower($charset) == 'latin-1')) {
+			$charset = 'CP1252';
+			if (is_object($debug_object)) {
+				$debug_object->debug_log(2,
+					'replacing ' . $charset . ' with CP1252 as its a superset'
+				);
+			}
+		}
+
+		if (is_object($debug_object)) {
+			$debug_object->debug_log(1, 'EXIT - ' . $charset);
+		}
+
+		return $this->_charset = $charset;
+	}
+
+	protected function read_tag()
+	{
+		// Set end position if no further tags found
+		if ($this->char !== '<') {
+			$this->root->_[HDOM_INFO_END] = $this->cursor;
+			return false;
+		}
+
+		$begin_tag_pos = $this->pos;
+		$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
+
+		// end tag
+		if ($this->char === '/') {
+			$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
+
+			// Skip whitespace in end tags (i.e. in "</   html>")
+			$this->skip($this->token_blank);
+			$tag = $this->copy_until_char('>');
+
+			// Skip attributes in end tags
+			if (($pos = strpos($tag, ' ')) !== false) {
+				$tag = substr($tag, 0, $pos);
+			}
+
+			$parent_lower = strtolower($this->parent->tag);
+			$tag_lower = strtolower($tag);
+
+			// The end tag is supposed to close the parent tag. Handle situations
+			// when it doesn't
+			if ($parent_lower !== $tag_lower) {
+				// Parent tag does not have to be closed necessarily (optional closing tag)
+				// Current tag is a block tag, so it may close an ancestor
+				if (isset($this->optional_closing_tags[$parent_lower])
+					&& isset($this->block_tags[$tag_lower])) {
+
+					$this->parent->_[HDOM_INFO_END] = 0;
+					$org_parent = $this->parent;
+
+					// Traverse ancestors to find a matching opening tag
+					// Stop at root node
+					while (($this->parent->parent)
+						&& strtolower($this->parent->tag) !== $tag_lower
+					){
+						$this->parent = $this->parent->parent;
+					}
+
+					// If we don't have a match add current tag as text node
+					if (strtolower($this->parent->tag) !== $tag_lower) {
+						$this->parent = $org_parent; // restore origonal parent
+
+						if ($this->parent->parent) {
+							$this->parent = $this->parent->parent;
+						}
+
+						$this->parent->_[HDOM_INFO_END] = $this->cursor;
+						return $this->as_text_node($tag);
+					}
+				} elseif (($this->parent->parent)
+					&& isset($this->block_tags[$tag_lower])
+				) {
+					// Grandparent exists and current tag is a block tag, so our
+					// parent doesn't have an end tag
+					$this->parent->_[HDOM_INFO_END] = 0; // No end tag
+					$org_parent = $this->parent;
+
+					// Traverse ancestors to find a matching opening tag
+					// Stop at root node
+					while (($this->parent->parent)
+						&& strtolower($this->parent->tag) !== $tag_lower
+					) {
+						$this->parent = $this->parent->parent;
+					}
+
+					// If we don't have a match add current tag as text node
+					if (strtolower($this->parent->tag) !== $tag_lower) {
+						$this->parent = $org_parent; // restore origonal parent
+						$this->parent->_[HDOM_INFO_END] = $this->cursor;
+						return $this->as_text_node($tag);
+					}
+				} elseif (($this->parent->parent)
+					&& strtolower($this->parent->parent->tag) === $tag_lower
+				) { // Grandparent exists and current tag closes it
+					$this->parent->_[HDOM_INFO_END] = 0;
+					$this->parent = $this->parent->parent;
+				} else { // Random tag, add as text node
+					return $this->as_text_node($tag);
+				}
+			}
+
+			// Set end position of parent tag to current cursor position
+			$this->parent->_[HDOM_INFO_END] = $this->cursor;
+
+			if ($this->parent->parent) {
+				$this->parent = $this->parent->parent;
+			}
+
+			$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
+			return true;
+		}
+
+		// start tag
+		$node = new simple_html_dom_node($this);
+		$node->_[HDOM_INFO_BEGIN] = $this->cursor;
+		++$this->cursor;
+		$tag = $this->copy_until($this->token_slash); // Get tag name
+		$node->tag_start = $begin_tag_pos;
+
+		// doctype, cdata & comments...
+		// <!DOCTYPE html>
+		// <![CDATA[ ... ]]>
+		// <!-- Comment -->
+		if (isset($tag[0]) && $tag[0] === '!') {
+			$node->_[HDOM_INFO_TEXT] = '<' . $tag . $this->copy_until_char('>');
+
+			if (isset($tag[2]) && $tag[1] === '-' && $tag[2] === '-') { // Comment ("<!--")
+				$node->nodetype = HDOM_TYPE_COMMENT;
+				$node->tag = 'comment';
+			} else { // Could be doctype or CDATA but we don't care
+				$node->nodetype = HDOM_TYPE_UNKNOWN;
+				$node->tag = 'unknown';
+			}
+
+			if ($this->char === '>') { $node->_[HDOM_INFO_TEXT] .= '>'; }
+
+			$this->link_nodes($node, true);
+			$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
+			return true;
+		}
+
+		// The start tag cannot contain another start tag, if so add as text
+		// i.e. "<<html>"
+		if ($pos = strpos($tag, '<') !== false) {
+			$tag = '<' . substr($tag, 0, -1);
+			$node->_[HDOM_INFO_TEXT] = $tag;
+			$this->link_nodes($node, false);
+			$this->char = $this->doc[--$this->pos]; // prev
+			return true;
+		}
+
+		// Handle invalid tag names (i.e. "<html#doc>")
+		if (!preg_match('/^\w[\w:-]*$/', $tag)) {
+			$node->_[HDOM_INFO_TEXT] = '<' . $tag . $this->copy_until('<>');
+
+			// Next char is the beginning of a new tag, don't touch it.
+			if ($this->char === '<') {
+				$this->link_nodes($node, false);
+				return true;
+			}
+
+			// Next char closes current tag, add and be done with it.
+			if ($this->char === '>') { $node->_[HDOM_INFO_TEXT] .= '>'; }
+			$this->link_nodes($node, false);
+			$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
+			return true;
+		}
+
+		// begin tag, add new node
+		$node->nodetype = HDOM_TYPE_ELEMENT;
+		$tag_lower = strtolower($tag);
+		$node->tag = ($this->lowercase) ? $tag_lower : $tag;
+
+		// handle optional closing tags
+		if (isset($this->optional_closing_tags[$tag_lower])) {
+			// Traverse ancestors to close all optional closing tags
+			while (isset($this->optional_closing_tags[$tag_lower][strtolower($this->parent->tag)])) {
+				$this->parent->_[HDOM_INFO_END] = 0;
+				$this->parent = $this->parent->parent;
+			}
+			$node->parent = $this->parent;
+		}
+
+		$guard = 0; // prevent infinity loop
+
+		// [0] Space between tag and first attribute
+		$space = array($this->copy_skip($this->token_blank), '', '');
+
+		// attributes
+		do {
+			// Everything until the first equal sign should be the attribute name
+			$name = $this->copy_until($this->token_equal);
+
+			if ($name === '' && $this->char !== null && $space[0] === '') {
+				break;
+			}
+
+			if ($guard === $this->pos) { // Escape infinite loop
+				$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
+				continue;
+			}
+
+			$guard = $this->pos;
+
+			// handle endless '<'
+			// Out of bounds before the tag ended
+			if ($this->pos >= $this->size - 1 && $this->char !== '>') {
+				$node->nodetype = HDOM_TYPE_TEXT;
+				$node->_[HDOM_INFO_END] = 0;
+				$node->_[HDOM_INFO_TEXT] = '<' . $tag . $space[0] . $name;
+				$node->tag = 'text';
+				$this->link_nodes($node, false);
+				return true;
+			}
+
+			// handle mismatch '<'
+			// Attributes cannot start after opening tag
+			if ($this->doc[$this->pos - 1] == '<') {
+				$node->nodetype = HDOM_TYPE_TEXT;
+				$node->tag = 'text';
+				$node->attr = array();
+				$node->_[HDOM_INFO_END] = 0;
+				$node->_[HDOM_INFO_TEXT] = substr(
+					$this->doc,
+					$begin_tag_pos,
+					$this->pos - $begin_tag_pos - 1
+				);
+				$this->pos -= 2;
+				$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
+				$this->link_nodes($node, false);
+				return true;
+			}
+
+			if ($name !== '/' && $name !== '') { // this is a attribute name
+				// [1] Whitespace after attribute name
+				$space[1] = $this->copy_skip($this->token_blank);
+
+				$name = $this->restore_noise($name); // might be a noisy name
+
+				if ($this->lowercase) { $name = strtolower($name); }
+
+				if ($this->char === '=') { // attribute with value
+					$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
+					$this->parse_attr($node, $name, $space); // get attribute value
+				} else {
+					//no value attr: nowrap, checked selected...
+					$node->_[HDOM_INFO_QUOTE][] = HDOM_QUOTE_NO;
+					$node->attr[$name] = true;
+					if ($this->char != '>') { $this->char = $this->doc[--$this->pos]; } // prev
+				}
+
+				$node->_[HDOM_INFO_SPACE][] = $space;
+
+				// prepare for next attribute
+				$space = array(
+					$this->copy_skip($this->token_blank),
+					'',
+					''
+				);
+			} else { // no more attributes
+				break;
+			}
+		} while ($this->char !== '>' && $this->char !== '/'); // go until the tag ended
+
+		$this->link_nodes($node, true);
+		$node->_[HDOM_INFO_ENDSPACE] = $space[0];
+
+		// handle empty tags (i.e. "<div/>")
+		if ($this->copy_until_char('>') === '/') {
+			$node->_[HDOM_INFO_ENDSPACE] .= '/';
+			$node->_[HDOM_INFO_END] = 0;
+		} else {
+			// reset parent
+			if (!isset($this->self_closing_tags[strtolower($node->tag)])) {
+				$this->parent = $node;
+			}
+		}
+
+		$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
+
+		// If it's a BR tag, we need to set it's text to the default text.
+		// This way when we see it in plaintext, we can generate formatting that the user wants.
+		// since a br tag never has sub nodes, this works well.
+		if ($node->tag === 'br') {
+			$node->_[HDOM_INFO_INNER] = $this->default_br_text;
+		}
+
+		return true;
+	}
+
+	protected function parse_attr($node, $name, &$space)
+	{
+		$is_duplicate = isset($node->attr[$name]);
+
+		if (!$is_duplicate) // Copy whitespace between "=" and value
+			$space[2] = $this->copy_skip($this->token_blank);
+
+		switch ($this->char) {
+			case '"':
+				$quote_type = HDOM_QUOTE_DOUBLE;
+				$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
+				$value = $this->copy_until_char('"');
+				$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
+				break;
+			case '\'':
+				$quote_type = HDOM_QUOTE_SINGLE;
+				$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
+				$value = $this->copy_until_char('\'');
+				$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
+				break;
+			default:
+				$quote_type = HDOM_QUOTE_NO;
+				$value = $this->copy_until($this->token_attr);
+		}
+
+		$value = $this->restore_noise($value);
+
+		// PaperG: Attributes should not have \r or \n in them, that counts as
+		// html whitespace.
+		$value = str_replace("\r", '', $value);
+		$value = str_replace("\n", '', $value);
+
+		// PaperG: If this is a "class" selector, lets get rid of the preceeding
+		// and trailing space since some people leave it in the multi class case.
+		if ($name === 'class') {
+			$value = trim($value);
+		}
+
+		if (!$is_duplicate) {
+			$node->_[HDOM_INFO_QUOTE][] = $quote_type;
+			$node->attr[$name] = $value;
+		}
+	}
+
+	protected function link_nodes(&$node, $is_child)
+	{
+		$node->parent = $this->parent;
+		$this->parent->nodes[] = $node;
+		if ($is_child) {
+			$this->parent->children[] = $node;
+		}
+	}
+
+	protected function as_text_node($tag)
+	{
+		$node = new simple_html_dom_node($this);
+		++$this->cursor;
+		$node->_[HDOM_INFO_TEXT] = '</' . $tag . '>';
+		$this->link_nodes($node, false);
+		$this->char = (++$this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
+		return true;
+	}
+
+	protected function skip($chars)
+	{
+		$this->pos += strspn($this->doc, $chars, $this->pos);
+		$this->char = ($this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
+	}
+
+	protected function copy_skip($chars)
+	{
+		$pos = $this->pos;
+		$len = strspn($this->doc, $chars, $pos);
+		$this->pos += $len;
+		$this->char = ($this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
+		if ($len === 0) { return ''; }
+		return substr($this->doc, $pos, $len);
+	}
+
+	protected function copy_until($chars)
+	{
+		$pos = $this->pos;
+		$len = strcspn($this->doc, $chars, $pos);
+		$this->pos += $len;
+		$this->char = ($this->pos < $this->size) ? $this->doc[$this->pos] : null; // next
+		return substr($this->doc, $pos, $len);
+	}
+
+	protected function copy_until_char($char)
+	{
+		if ($this->char === null) { return ''; }
+
+		if (($pos = strpos($this->doc, $char, $this->pos)) === false) {
+			$ret = substr($this->doc, $this->pos, $this->size - $this->pos);
+			$this->char = null;
+			$this->pos = $this->size;
+			return $ret;
+		}
+
+		if ($pos === $this->pos) { return ''; }
+
+		$pos_old = $this->pos;
+		$this->char = $this->doc[$pos];
+		$this->pos = $pos;
+		return substr($this->doc, $pos_old, $pos - $pos_old);
+	}
+
+	protected function remove_noise($pattern, $remove_tag = false)
+	{
+		global $debug_object;
+		if (is_object($debug_object)) { $debug_object->debug_log_entry(1); }
+
+		$count = preg_match_all(
+			$pattern,
+			$this->doc,
+			$matches,
+			PREG_SET_ORDER | PREG_OFFSET_CAPTURE
+		);
+
+		for ($i = $count - 1; $i > -1; --$i) {
+			$key = '___noise___' . sprintf('% 5d', count($this->noise) + 1000);
+
+			if (is_object($debug_object)) {
+				$debug_object->debug_log(2, 'key is: ' . $key);
+			}
+
+			$idx = ($remove_tag) ? 0 : 1; // 0 = entire match, 1 = submatch
+			$this->noise[$key] = $matches[$i][$idx][0];
+			$this->doc = substr_replace($this->doc, $key, $matches[$i][$idx][1], strlen($matches[$i][$idx][0]));
+		}
+
+		// reset the length of content
+		$this->size = strlen($this->doc);
+
+		if ($this->size > 0) {
+			$this->char = $this->doc[0];
+		}
+	}
+
+	function restore_noise($text)
+	{
+		global $debug_object;
+		if (is_object($debug_object)) { $debug_object->debug_log_entry(1); }
+
+		while (($pos = strpos($text, '___noise___')) !== false) {
+			// Sometimes there is a broken piece of markup, and we don't GET the
+			// pos+11 etc... token which indicates a problem outside of us...
+
+			// todo: "___noise___1000" (or any number with four or more digits)
+			// in the DOM causes an infinite loop which could be utilized by
+			// malicious software
+			if (strlen($text) > $pos + 15) {
+				$key = '___noise___'
+				. $text[$pos + 11]
+				. $text[$pos + 12]
+				. $text[$pos + 13]
+				. $text[$pos + 14]
+				. $text[$pos + 15];
+
+				if (is_object($debug_object)) {
+					$debug_object->debug_log(2, 'located key of: ' . $key);
+				}
+
+				if (isset($this->noise[$key])) {
+					$text = substr($text, 0, $pos)
+					. $this->noise[$key]
+					. substr($text, $pos + 16);
+				} else {
+					// do this to prevent an infinite loop.
+					$text = substr($text, 0, $pos)
+					. 'UNDEFINED NOISE FOR KEY: '
+					. $key
+					. substr($text, $pos + 16);
+				}
+			} else {
+				// There is no valid key being given back to us... We must get
+				// rid of the ___noise___ or we will have a problem.
+				$text = substr($text, 0, $pos)
+				. 'NO NUMERIC NOISE KEY'
+				. substr($text, $pos + 11);
+			}
+		}
+		return $text;
+	}
+
+	function search_noise($text)
+	{
+		global $debug_object;
+		if (is_object($debug_object)) { $debug_object->debug_log_entry(1); }
+
+		foreach($this->noise as $noiseElement) {
+			if (strpos($noiseElement, $text) !== false) {
+				return $noiseElement;
+			}
+		}
+	}
+
+	function __toString()
+	{
+		return $this->root->innertext();
+	}
+
+	function __get($name)
+	{
+		switch ($name) {
+			case 'outertext':
+				return $this->root->innertext();
+			case 'innertext':
+				return $this->root->innertext();
+			case 'plaintext':
+				return $this->root->text();
+			case 'charset':
+				return $this->_charset;
+			case 'target_charset':
+				return $this->_target_charset;
+		}
+	}
+
+	function childNodes($idx = -1)
+	{
+		return $this->root->childNodes($idx);
+	}
+
+	function firstChild()
+	{
+		return $this->root->first_child();
+	}
+
+	function lastChild()
+	{
+		return $this->root->last_child();
+	}
+
+	function createElement($name, $value = null)
+	{
+		return @str_get_html("<$name>$value</$name>")->firstChild();
+	}
+
+	function createTextNode($value)
+	{
+		return @end(str_get_html($value)->nodes);
+	}
+
+	function getElementById($id)
+	{
+		return $this->find("#$id", 0);
+	}
+
+	function getElementsById($id, $idx = null)
+	{
+		return $this->find("#$id", $idx);
+	}
+
+	function getElementByTagName($name)
+	{
+		return $this->find($name, 0);
+	}
+
+	function getElementsByTagName($name, $idx = -1)
+	{
+		return $this->find($name, $idx);
+	}
+
+	function loadFile()
+	{
+		$args = func_get_args();
+		$this->load_file($args);
+	}
+}
@@ -183,7 +183,7 @@ $API = array(
 			//AKKA - New action to clean user WS
 			'cleanUserWS'=>array('len'=>0),
 			'deleteSpecialInfo'=>array('len'=>1),
-			'interactivePlot'=>array('len'=>2),
+			'interactivePlot'=>array('len'=>1),
 			'getParamPlotInit'=>array('len'=>1),
 			'getParamInfo'=>array('len'=>1),
 			'getDerivedParamInfo'=>array('len'=>1),
@@ -10,19 +10,19 @@ if (!isset($_POST[&#39;sessionId&#39;]))
 }
 $sessionId = $_POST['sessionId'];
-if (!isset($_POST['tabId']))
+if (!isset($_POST['interactiveId']))
 {
 	header("HTTP/1.0 400 Bad Request");
-	echo json_encode(array("success" => false, "error" => "Unknown tab Id"));
+	echo json_encode(array("success" => false, "error" => "Unknown interactive Id"));
 	exit;
 }
-$tabId     = $_POST['tabId'];
+$interactiveId     = $_POST['interactiveId'];
 $preview = empty($_POST['preview']) ? FALSE : $_POST['preview'];
-download_plot($sessionId, $tabId, $preview);
+download_plot($sessionId, $interactiveId, $preview);
-function download_plot($sessionId, $tabId, $preview)
+function download_plot($sessionId, $interactiveId, $preview)
 {
 	// Must be fresh start
 	if( headers_sent() )
@@ -38,10 +38,10 @@ function download_plot($sessionId, $tabId, $preview)
 	//Build file path
 	if (!$preview) {
-		$fullPath = USERPATH."/".$sessionId."/RES/Plot_/".$tabId.".png";
+		$fullPath = USERPATH."/".$sessionId."/RES/Plot_/".$interactiveId.".png";
 	}
 	else {
-		$fullPath = USERPATH."/".$sessionId."/RES/Plot_/".str_replace('plot_','instant',$tabId).".png";
+		$fullPath = USERPATH."/".$sessionId."/RES/Plot_/".str_replace('plot_','instant',$interactiveId).".png";
 	}
 	// File Exists?
 	if( file_exists($fullPath) ){
@@ -126,7 +126,7 @@ int main(int argc, char *argv[])
 		if (datatype == CDF_TIME_TT2000) {
 			dbl_value_ = CDF_TT2000_to_UTC_EPOCH(int_value[0]);
 			dbl_value = CDF_TT2000_to_UTC_EPOCH(int_value[1]);
-			sampling = (int)(dbl_value - dbl_value_ + 50)/100;
+			sampling = (int)(dbl_value - dbl_value_);
 		}
 		else {
 			if (datatype == CDF_EPOCH16) {
@@ -139,7 +139,7 @@ int main(int argc, char *argv[])
 				EPOCH16breakdown(epoch16, &year, &month, &day, &hour, &minute, &sec, &msec, &mksec, &nsec, &psec);
 				value[1] = computeEPOCH(year, month, day, hour, minute, sec, msec);
 			}
-			sampling = (int)(value[1] - value[0] + 50)/100;
+			sampling = (int)(value[1] - value[0]);
 		}
 	// fprintf(stdout,"value %f\n", value[11]-value[10]);
@@ -150,5 +150,5 @@ int main(int argc, char *argv[])
 	if ((cstatus = CDFlib(CLOSE_, CDF_, NULL_)) != CDF_OK)
 										cdf_handle_error (cstatus);
-	fprintf(stdout,"%f\n",(float)sampling/10.0); 
+	fprintf(stdout,"%f\n",(float)sampling/1000.0); //  in sec.msec
 }
@@ -162,7 +162,7 @@ int main(int argc, char *argv[])
 		if (datatype == CDF_TIME_TT2000) {
 			dbl_value_ = CDF_TT2000_to_UTC_EPOCH(int_value[i-1]);
 			dbl_value = CDF_TT2000_to_UTC_EPOCH(int_value[i]);
-			delta[i-1] = (int)(dbl_value - dbl_value_ + 50)/100;
+			delta[i-1] = (int)(dbl_value - dbl_value_);
 		}
 		else {
 			if (datatype == CDF_EPOCH16) {
@@ -175,7 +175,7 @@ int main(int argc, char *argv[])
 				EPOCH16breakdown(epoch16, &year, &month, &day, &hour, &minute, &sec, &msec, &mksec, &nsec, &psec);
 				value[i] = computeEPOCH(year, month, day, hour, minute, sec, msec);
 			}
-			delta[i-1] = (int)(value[i] - value[i-1] + 50)/100;
+			delta[i-1] = (int)(value[i] - value[i-1]);
 		}
 	}
 	// fprintf(stdout,"value %f\n", value[11]-value[10]);
@@ -194,5 +194,5 @@ int main(int argc, char *argv[])
 										cdf_handle_error (cstatus);
 	//   fprintf(stdout,"%d %f\n",min[1], (float)min[0]/100.0);
-	fprintf(stdout,"%f\n",(float)min[0]/10.0); 
+	fprintf(stdout,"%f\n",(float)min[0]/1000.0); 
 }