Restore node state in tree for a plot request

Benjamin Renard
1 parent 35c71481
Showing 4 changed files with 113 additions and 11 deletions Show diff stats
js/app/models/PlotObjects/PlotPanelObject.js
js/app/models/PlotObjects/PlotTabObject.js
js/app/models/PlotObjects/PlotTreeNode.js
js/app/views/PlotComponents/PlotTree.js
@@ -31,6 +31,14 @@ Ext.define(&#39;amdaPlotObj.PlotPanelObject&#39;, {
  
 	fields : [
 	          {name: 'id', type: 'string'},
+	          {name: 'panel-node-state', type: 'int', defaultValue: 2}, //0 : collapsed, 1 : expanded, 2 : not set 
+	          {name: 'axes-node-state', type: 'int', defaultValue: 2}, //0 : collapsed, 1 : expanded, 2 : not set 
+	          {name: 'params-node-state', type: 'int', defaultValue: 2}, //0 : collapsed, 1 : expanded, 2 : not set 
+	          {name: 'add-objects-node-state', type: 'int', defaultValue: 2}, //0 : collapsed, 1 : expanded, 2 : not set 
+	          {name: 'legends-node-state', type: 'int', defaultValue: 2}, //0 : collapsed, 1 : expanded, 2 : not set 
+	          {name: 'text-legends-node-state', type: 'int', defaultValue: 2}, //0 : collapsed, 1 : expanded, 2 : not set 
+	          {name: 'drawing-objects-node-state', type: 'int', defaultValue: 2}, //0 : collapsed, 1 : expanded, 2 : not set 
+	          {name: 'fills-node-state', type: 'int', defaultValue: 2}, //0 : collapsed, 1 : expanded, 2 : not set 
 	          {name: 'panel-index', type: 'int'},
 	          {name: 'panel-background-color', type: 'string'},
               {name: 'panel-title-text', type: 'string'},
@@ -613,6 +621,15 @@ Ext.define(&#39;amdaPlotObj.PlotPanelObject&#39;, {
  
     	panelValues['id'] = this.get('id');
  
+    	panelValues['panel-node-state'] = this.get('panel-node-state');
+    	panelValues['axes-node-state'] = this.get('axes-node-state');
+    	panelValues['params-node-state'] = this.get('params-node-state');
+    	panelValues['add-objects-node-state'] = this.get('add-objects-node-state');
+    	panelValues['legends-node-state'] = this.get('legends-node-state');
+    	panelValues['text-legends-node-state'] = this.get('text-legends-node-state');
+    	panelValues['drawing-objects-node-state'] = this.get('drawing-objects-node-state');
+    	panelValues['fills-node-state'] = this.get('fills-node-state');
+    	
     	panelValues['panel-index'] = this.get('panel-index');
  
     	panelValues['panel-background-color'] = this.get('panel-background-color');
@@ -29,7 +29,9 @@ Ext.define(&#39;amdaPlotObj.PlotTabObject&#39;, {
 	          {name: 'id', type: 'int'},
 	          {name: 'tree-simplified-view', type: 'boolean'},
 	          {name: 'multi-plot-linked', type: 'boolean'},
-              {name: 'page-title-text', type: 'string'},
+	          {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'},
@@ -223,6 +225,8 @@ Ext.define(&#39;amdaPlotObj.PlotTabObject&#39;, {
     	tabValues['id'] = this.get('id');
     	tabValues['tree-simplified-view'] = this.get('tree-simplified-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');
@@ -43,17 +43,38 @@ Ext.define(&#39;amdaPlotObj.PlotTreeNode&#39;, {
 	//Additional information about a node to show in the tree view
 	getAdditionalText : null,
  
+	getNodeStateKey : null,
+	
+	getNodeState : function()
+	{
+		if (!this.getNodeStateKey || !this.object)
+			return;
+		return this.object.get(this.getNodeStateKey());
+	},
+	
+	setNodeState : function(state)
+	{
+		if (!this.getNodeStateKey || !this.object)
+			return;
+		this.object.set(this.getNodeStateKey(), state);
+	},
+	
 	constructor : function(config)
     {
 		this.callParent(arguments);
 		this.set('text',this.text);
 		this.set('iconCls',this.iconCls);
 		this.set('leaf',this.leaf);
-		this.set('expanded',this.expanded);
 		this.set('type',this.type);
 		this.set('removable',this.removable);
 		if (config && config.object)
 			this.object = config.object;
+		if (this.getNodeState() != 2)
+			this.set('expanded',(this.getNodeState() == 1));
+		else {
+			this.set('expanded',this.expanded);
+			this.setNodeState(this.expanded ? 1 : 0);
+		}
     }	
 }, function () {
     Ext.data.NodeInterface.decorate(this);
@@ -68,6 +89,11 @@ Ext.define(&#39;amdaPlotObj.PlotPageTreeNode&#39;, {
  
 	type: 'page',
  
+	getNodeStateKey: function()
+	{
+		return 'page-node-state';
+	},
+	
 	getAdditionalText: function()
 	{
 		return ' ('+this.object.getPageShortInfo()+')';
@@ -98,7 +124,12 @@ Ext.define(&#39;amdaPlotObj.PlotPanelsTreeNode&#39;, {
  
 	text: 'Panels list',
  
-	type: 'panels'
+	type: 'panels',
+	
+	getNodeStateKey: function()
+	{
+		return 'panels-node-state';
+	}
 });
  
 Ext.define('amdaPlotObj.PlotPanelTreeNode', {
@@ -112,6 +143,11 @@ Ext.define(&#39;amdaPlotObj.PlotPanelTreeNode&#39;, {
  
 	removable: true,
  
+	getNodeStateKey: function()
+	{
+		return 'panel-node-state';
+	},
+	
 	getAdditionalText: function()
 	{
 		return ' ('+this.object.getPanelShortInfo()+')';
@@ -127,7 +163,12 @@ Ext.define(&#39;amdaPlotObj.PlotAxesTreeNode&#39;, {
  
 	text: 'Axes',
  
-	type: 'axes'
+	type: 'axes',
+	
+	getNodeStateKey: function()
+	{
+		return 'axes-node-state';
+	}
 });
  
 Ext.define('amdaPlotObj.PlotTimeAxisTreeNode', {
@@ -209,7 +250,12 @@ Ext.define(&#39;amdaPlotObj.PlotParamsTreeNode&#39;, {
  
 	text: 'Params',
  
-	type: 'params'
+	type: 'params',
+	
+	getNodeStateKey: function()
+	{
+		return 'params-node-state';
+	}
 });
  
 Ext.define('amdaPlotObj.PlotParamTreeNode', {
@@ -242,7 +288,12 @@ Ext.define(&#39;amdaPlotObj.PlotAdditionalObjectsTreeNode&#39;, {
  
 	text: 'Additional Objects',
  
-	type: 'objects'
+	type: 'objects',
+	
+	getNodeStateKey: function()
+	{
+		return 'add-objects-node-state';
+	}
 });
  
 Ext.define('amdaPlotObj.PlotLegendsTreeNode', {
@@ -252,7 +303,12 @@ Ext.define(&#39;amdaPlotObj.PlotLegendsTreeNode&#39;, {
  
 	text: 'Legends',
  
-	type: 'legends'
+	type: 'legends',
+	
+	getNodeStateKey: function()
+	{
+		return 'legends-node-state';
+	}
 });
  
 Ext.define('amdaPlotObj.PlotSeriesLegendTreeNode', {
@@ -281,7 +337,12 @@ Ext.define(&#39;amdaPlotObj.PlotTextLegendsTreeNode&#39;, {
  
 	text: 'Text Legends',
  
-	type: 'text-legends'
+	type: 'text-legends',
+	
+	getNodeStateKey: function()
+	{
+		return 'text-legends-node-state';
+	}
 });
  
 Ext.define('amdaPlotObj.PlotTextLegendTreeNode', {
@@ -310,7 +371,12 @@ Ext.define(&#39;amdaPlotObj.PlotDrawingObjectsTreeNode&#39;, {
  
 	text: 'Drawing objects',
  
-	type: 'drawing-objects'
+	type: 'drawing-objects',
+	
+	getNodeStateKey: function()
+	{
+		return 'drawing-objects-node-state';
+	}
 });
  
 Ext.define('amdaPlotObj.PlotConstantTreeNode', {
@@ -367,7 +433,12 @@ Ext.define(&#39;amdaPlotObj.PlotFillsTreeNode&#39;, {
  
 	text: 'Fills',
  
-	type: 'fills'
+	type: 'fills',
+	
+	getNodeStateKey: function()
+	{
+		return 'fills-node-state';
+	}
 });
  
 Ext.define('amdaPlotObj.PlotFillTreeNode', {
@@ -59,7 +59,7 @@ Ext.define(&#39;amdaPlotComp.PlotTree&#39;, {
 			pageNode.appendChild(new amdaPlotObj.PlotLayoutTreeNode({object : tabObject}));
  
 			//Panels node
-			this.panelsNode = pageNode.appendChild(new amdaPlotObj.PlotPanelsTreeNode());
+			this.panelsNode = pageNode.appendChild(new amdaPlotObj.PlotPanelsTreeNode({object : tabObject}));
 		}
 		else
 			this.panelsNode = this.store.getRootNode();
@@ -510,6 +510,14 @@ Ext.define(&#39;amdaPlotComp.PlotTree&#39;, {
 		}
 	},
  
+	onNodeCollapse: function(node) {
+		node.setNodeState(0);
+	},
+	
+	onNodeExpand: function(node) {
+		node.setNodeState(1);
+	},
+	
 	getSelectedNode: function() {
 		var selection = this.getSelectionModel().getSelection();
 		if ((selection == null) || (selection.length == 0))
@@ -855,6 +863,8 @@ Ext.define(&#39;amdaPlotComp.PlotTree&#39;, {
 			        select: me.onNodeSelect,
 			        deselect: me.onNodeDeselect,
 			        cellclick: me.onCellClick,
+			        itemcollapse: me.onNodeCollapse,
+			        itemexpand: me.onNodeExpand,
 			        scope: me
 			    },
 			    columns: [