Add fill elements for plot

Benjamin Renard
1 parent fd5552a4
Showing 14 changed files with 349 additions and 9 deletions Show diff stats
js/app/models/DownloadNode.js
js/app/models/PlotObjects/PlotFillObject.js
js/app/models/PlotObjects/PlotObjectConfig.js
js/app/models/PlotObjects/PlotPanelObject.js
js/app/models/PlotObjects/PlotTreeNode.js
js/app/views/PlotComponents/PlotCurveForm.js
js/app/views/PlotComponents/PlotElementPanel.js
js/app/views/PlotComponents/PlotFillForm.js
js/app/views/PlotComponents/PlotFillsForm.js
js/app/views/PlotComponents/PlotTree.js
js/app/views/PlotUI.js
js/resources/css/amda.css
js/resources/images/16x16/plot_additional_fill.png
js/resources/images/16x16/plot_additional_fills.png
@@ -68,7 +68,6 @@ Ext.define(&#39;amdaModel.DownloadNode&#39;, {
     },
       decodeObject: function(obj) {
-    	  console.log(obj);
     	  var myValues  = new Object(); 
     	  myValues.list=[];
@@ -0,0 +1,65 @@
+/**
+ * Project      : AMDA-NG
+ * Name         : PlotFillObject.js
+ * @class   amdaPlotObj.PlotFillObject
+ * @extends Ext.data.Model
+ * @brief   Plot Fill Business Object Definition 
+ * @author  Benjamin Renard
+ * @version $Id: PlotFillObject.js benjamin $
+ ******************************************************************************
+ *    FT Id     :   Date   : Name - Description
+ ******************************************************************************
+ *	:           :04/09/2015: BRE  - file creation
+ */
+ 
+ 		
+Ext.define('amdaPlotObj.PlotFillObject', {
+	extend: 'Ext.data.Model',
+	idProperty: 'id',
+	
+	requires: [
+	           'amdaPlotObj.PlotObjectConfig'
+	],
+	
+	fields : [
+	          {name: 'id', type: 'int'},
+	          {name: 'fill-type', type: 'string'},
+	          {name: 'fill-firstserie-id', type: 'int', useNull:true},
+	          {name: 'fill-secondserie-id', type: 'int', useNull:true},
+	          {name: 'fill-constant-id', type: 'int', useNull:true},
+	          {name: 'fill-greater-color', type: 'string'},
+	          {name: 'fill-less-color', type: 'string'}
+    ],
+    
+    setDefaultValues: function()
+    {
+    	this.set('fill-type', amdaPlotObj.PlotObjectConfig.defaultValues.fills.type);
+    	this.set('fill-firstserie-id', null);
+    	this.set('fill-secondserie-id', null);
+    	this.set('fill-constant-id', null);
+    	this.set('fill-greater-color', amdaPlotObj.PlotObjectConfig.defaultValues.fills.greaterColor);
+    	this.set('fill-less-color', amdaPlotObj.PlotObjectConfig.defaultValues.fills.lessColor);
+    },
+    
+    getShortInfo : function()
+    {
+    	var type = amdaPlotObj.PlotObjectConfig.getValueByKey(amdaPlotObj.PlotObjectConfig.availableFillTypes, this.get('fill-type'));
+		return type;
+    },
+    
+    getJsonValues : function() 
+    {
+    	var fillValues  = new Object();
+    	
+    	fillValues['id'] = this.get('id');
+    	
+    	fillValues['fill-type'] = this.get('fill-type');
+    	fillValues['fill-firstserie-id'] = this.get('fill-firstserie-id');
+    	fillValues['fill-secondserie-id'] = this.get('fill-secondserie-id');
+    	fillValues['fill-constant-id'] = this.get('fill-constant-id');
+    	fillValues['fill-greater-color'] = this.get('fill-greater-color');
+    	fillValues['fill-less-color'] = this.get('fill-less-color');
+    	
+    	return fillValues;
+    }
+});
 \ No newline at end of file
@@ -166,6 +166,11 @@ Ext.define(&#39;amdaPlotObj.PlotObjectConfig&#39;, {
 				width : 1,
 				color : '#000000'
 			}
+		},
+		fills : {
+			type : 'serie-constant',
+			greaterColor : 'none',
+			lessColor : 'none'
 		}
 	},
@@ -374,5 +379,10 @@ Ext.define(&#39;amdaPlotObj.PlotObjectConfig&#39;, {
                    {'key' : 'left', 'value' : 'Left'},
                    {'key' : 'center', 'value' : 'Center'},
                    {'key' : 'right', 'value' : 'Right'}
-    ]
+    ],
+    
+    availableFillTypes : [
+	               {'key' : 'serie-constant', 'value' : 'Serie / Constant'},
+	               {'key' : 'serie-serie', 'value' : 'Serie / Serie'}    
+	]
 });
 \ No newline at end of file
@@ -25,7 +25,8 @@ Ext.define(&#39;amdaPlotObj.PlotPanelObject&#39;, {
 	           'amdaPlotObj.PlotLegendTextObject',
 	           'amdaPlotObj.PlotConstantObject',
 	           'amdaPlotObj.PlotTextObject',
-	           'amdaPlotObj.PlotCurveObject'
+	           'amdaPlotObj.PlotCurveObject',
+	           'amdaPlotObj.PlotFillObject'
 	],
 	fields : [
@@ -84,7 +85,8 @@ Ext.define(&#39;amdaPlotObj.PlotPanelObject&#39;, {
               {name: 'last-textlegend-id', type: 'int', defaultValue:0},
               {name: 'last-constant-id', type: 'int', defaultValue:0},
               {name: 'last-textobj-id', type: 'int', defaultValue:0},
-              {name: 'last-curve-id', type: 'int', defaultValue:0}
+              {name: 'last-curve-id', type: 'int', defaultValue:0},
+              {name: 'last-fill-id', type: 'int', defaultValue:0}
     ],
     associations : [
@@ -119,6 +121,11 @@ Ext.define(&#39;amdaPlotObj.PlotPanelObject&#39;, {
             	  name : 'curves'
               },
               {
+            	  type : 'hasMany',
+            	  model : 'amdaPlotObj.PlotFillObject',
+            	  name : 'fills'
+              },
+              {
             	  type  : 'belongsTo',
                   model : 'amdaPlotObj.PlotTabObject'
               }
@@ -141,6 +148,8 @@ Ext.define(&#39;amdaPlotObj.PlotPanelObject&#39;, {
         		me.loadTextObjs(arguments[0].textObjs);
         	if (arguments[0].curves)
         		me.loadCurves(arguments[0].curves);
+        	if (arguments[0].fills)
+        		me.loadFills(arguments[0].fills);
         }
         else
         {
@@ -179,6 +188,11 @@ Ext.define(&#39;amdaPlotObj.PlotPanelObject&#39;, {
     	this.curves().loadData(curves);
     },
+    loadFills: function(fills)
+    {
+    	this.fills().loadData(fills);
+    },
+    
     initAxes : function()
     {
     	this.axes().removeAll();
@@ -327,6 +341,22 @@ Ext.define(&#39;amdaPlotObj.PlotPanelObject&#39;, {
     	return true;
     },
+    createNewFill: function() {
+    	this.set('last-fill-id', this.get('last-fill-id') + 1);
+    	var recs = this.fills().add({id : this.get('last-fill-id')});
+    	recs[0].setDefaultValues();
+    	return recs[0];
+    },
+    
+    removeFillById: function(fillId) {
+    	//Retrieve fill record
+    	var fillRecord = this.fills().getById(fillId);
+    	if (fillRecord == null)
+    		return false;
+    	this.fills().remove(fillRecord);
+    	return true;
+    },
+    
     updatePlotType: function(plotType, forceUpdate) {
     	forceUpdate = (typeof forceUpdate !== 'undefined') ? forceUpdate : false;
@@ -369,6 +399,7 @@ Ext.define(&#39;amdaPlotObj.PlotPanelObject&#39;, {
     		this.textObjs().removeAll();
     		this.constants().removeAll();
     		this.curves().removeAll();
+    		this.fills().removeAll();
     	}
     	else if (plotType != 'xyPlot')
     		this.curves().removeAll();
@@ -518,6 +549,12 @@ Ext.define(&#39;amdaPlotObj.PlotPanelObject&#39;, {
     		panelValues['curves'][index] = curve.getJsonValues();
     	});
+    	panelValues['fills'] = [];
+    	
+    	this.fills().each(function (fill, index) {
+    		panelValues['fills'][index] = fill.getJsonValues();
+    	});
+    	
     	panelValues['axes'] = [];
     	this.axes().each(function (axe, index) {
@@ -535,6 +572,7 @@ Ext.define(&#39;amdaPlotObj.PlotPanelObject&#39;, {
     	panelValues['last-constant-id'] = this.get('last-constant-id');
     	panelValues['last-textobj-id'] = this.get('last-textobj-id');
     	panelValues['last-curve-id'] = this.get('last-curve-id');
+    	panelValues['last-fill-id'] = this.get('last-fill-id');
     	return panelValues;
     }
@@ -359,3 +359,32 @@ Ext.define(&#39;amdaPlotObj.PlotCurveTreeNode&#39;, {
 	removable: true
 });
+
+Ext.define('amdaPlotObj.PlotFillsTreeNode', {
+	extend: 'amdaPlotObj.PlotTreeNode',
+	
+	iconCls: 'icon-plot-add-fills',
+	
+	text: 'Fills',
+	
+	type: 'fills'
+});
+
+Ext.define('amdaPlotObj.PlotFillTreeNode', {
+	extend: 'amdaPlotObj.PlotTreeNode',
+	
+	leaf: true,
+	
+	iconCls: 'icon-plot-add-fill',
+	
+	text: 'Fill',
+	
+	type: 'fill',
+		
+	removable: true,
+	
+	getAdditionalText: function()
+	{
+		return ' ('+this.object.getShortInfo()+')';
+	}
+});
@@ -109,8 +109,6 @@ Ext.define(&#39;amdaPlotComp.PlotCurveForm&#39;, {
 				attachedSerieField.getStore().add({key : paramObject.get('id'), value : paramObject.getShortInfo(panelObject.get('panel-plot-type'))});
 			}
 		});
-		
-		console.log(attachedSerieField.getStore());
 	},
 	getFormItems: function() {
@@ -26,7 +26,9 @@ Ext.define(&#39;amdaPlotComp.PlotElementPanel&#39;, {
 	           'amdaPlotComp.PlotDrawingObjectForm',
 	           'amdaPlotComp.PlotConstantForm',
 	           'amdaPlotComp.PlotTextForm',
-	           'amdaPlotComp.PlotCurveForm'
+	           'amdaPlotComp.PlotCurveForm',
+	           'amdaPlotComp.PlotFillsForm',
+	           'amdaPlotComp.PlotFillForm'
 	],
 	elementFormsManager : new Ext.AbstractManager(),
@@ -182,6 +184,20 @@ Ext.define(&#39;amdaPlotComp.PlotElementPanel&#39;, {
 						me.getEl().unmask();
 				});
 				break;
+			case 'fills' :
+				this.elementFormsManager.register(new amdaPlotComp.PlotFillsForm({id : formId}));
+				if (onFormReady != null)
+					onFormReady(this.elementFormsManager.get(formId));
+				if (this.rendered)
+					this.getEl().unmask();
+				break;
+			case 'fill' :
+				this.elementFormsManager.register(new amdaPlotComp.PlotFillForm({id : formId}));
+				if (onFormReady != null)
+					onFormReady(this.elementFormsManager.get(formId));
+				if (this.rendered)
+					this.getEl().unmask();
+				break;
 			case '' :
 				this.elementFormsManager.register(new Ext.form.Label({id : formId, text: 'Select an element to the tree to show options'}));
 				if (onFormReady != null)
@@ -0,0 +1,90 @@
+/**
+ * Project   : AMDA-NG
+ * Name      : PlotFillForm.js
+ * @class   amdaPlotComp.PlotFillForm
+ * @extends amdaPlotComp.PlotStandardForm
+ * @brief   Form to define specifics fill options
+ * @author  Benjamin Renard
+ * @version $Id: PlotFillForm.js benjamin $
+ */
+
+Ext.define('amdaPlotComp.PlotFillForm', {
+	extend: 'amdaPlotComp.PlotStandardForm',
+	
+	requires: [
+	           'amdaPlotObj.PlotCurveDef'
+	],
+	
+	setObject : function(object) {
+		this.object = object;
+		if (this.object != null)
+		{
+			this.updateSerieIdLists();
+			this.updateConstantIdList();
+			this.loadRecord(this.object);
+		}
+	},
+	
+	updateOptions : function() {
+		var typeField = this.getForm().findField('fill-type');
+		var secondSerieField = this.getForm().findField('fill-secondserie-id');
+		var constantField = this.getForm().findField('fill-constant-id');
+		
+		var isSerieSerie = (typeField.getValue() == 'serie-serie');
+		
+		secondSerieField.setVisible(isSerieSerie);
+		constantField.setVisible(!isSerieSerie);
+	},
+	
+	updateSerieIdLists: function() {
+		var firstSerieField = this.getForm().findField('fill-firstserie-id');
+		var secondSerieField = this.getForm().findField('fill-secondserie-id');
+		
+		firstSerieField.getStore().removeAll();
+		secondSerieField.getStore().removeAll();
+		
+		var panelObject = this.crtTree.getSelectedPanelObject();
+		if (panelObject == null)
+			return;
+		
+		panelObject.params().each(function(paramObject) {
+			var drawingType = paramObject.get('param-drawing-type');
+			if ((drawingType == 'serie') || (drawingType == 'orbit-serie'))
+			{
+				firstSerieField.getStore().add({key : paramObject.get('id'), value : paramObject.getShortInfo(panelObject.get('panel-plot-type'))});
+				secondSerieField.getStore().add({key : paramObject.get('id'), value : paramObject.getShortInfo(panelObject.get('panel-plot-type'))});
+			}
+		});
+	},
+	
+	updateConstantIdList: function() {
+		var constantField = this.getForm().findField('fill-constant-id');
+		
+		constantField.getStore().removeAll();
+		
+		var panelObject = this.crtTree.getSelectedPanelObject();
+		if (panelObject == null)
+			return;
+		
+		panelObject.constants().each(function(constantObject) {
+			constantField.getStore().add({key : constantObject.get('id'), value : constantObject.getShortInfo()});
+		});
+	},
+	
+	getFormItems: function() {
+		var me = this;
+		
+		return [
+		        
+		        this.addStandardCombo('fill-type', 'Fill type', amdaPlotObj.PlotObjectConfig.availableFillTypes, function(name, value, oldValue) {
+		        	me.updateOptions();
+		        	me.crtTree.getView().refresh();
+		        }),
+		        this.addStandardCombo('fill-firstserie-id', 'First serie Id', []),
+		        this.addStandardCombo('fill-secondserie-id', 'Second serie Id', []),
+		        this.addStandardCombo('fill-constant-id', 'Constant Id', []),
+		        this.addStandardColor('fill-greater-color', 'Greater Color', amdaPlotObj.PlotObjectConfig.availableBackgroundColors),
+		        this.addStandardColor('fill-less-color', 'Less Color', amdaPlotObj.PlotObjectConfig.availableBackgroundColors)
+        ];
+	}
+});
 \ No newline at end of file
@@ -0,0 +1,34 @@
+/**
+ * Project   : AMDA-NG
+ * Name      : PlotFillsForm.js
+ * @class   amdaPlotComp.PlotFillsForm
+ * @extends amdaPlotComp.PlotStandardForm
+ * @brief   Form to define a list of fill
+ * @author  Benjamin Renard
+ * @version $Id: PlotFillsForm.js benjamin $
+ */
+
+Ext.define('amdaPlotComp.PlotFillsForm', {
+	extend: 'amdaPlotComp.PlotStandardForm',
+	
+	setObject : function(object) {
+		this.object = object;
+		if (this.object != null)
+			this.loadRecord(this.object);
+	},
+	
+	getFormItems: function() {
+		var me = this;
+		return [
+            {
+            	xtype: 'button',
+            	text: 'Add new fill',
+            	iconCls: 'icon-add',
+            	handler : function() {
+            		var fillObject = me.object.createNewFill();
+            		me.crtTree.buildPanelAdditionalObjectsNode(me.object, fillObject);
+            	}
+            }
+		];
+	}
+});
 \ No newline at end of file
@@ -194,6 +194,9 @@ Ext.define(&#39;amdaPlotComp.PlotTree&#39;, {
 		//create drawing objects node
 		this.buildDrawingObjectsNode(panelObject, objectsNode, selectedObject);
+		
+		//create fills node
+		this.buildFillsNode(panelObject, objectsNode, selectedObject);
 	},
 	buildPanelLegendsNode: function(panelObject, objectsNode, selectedObject) {
@@ -255,6 +258,21 @@ Ext.define(&#39;amdaPlotComp.PlotTree&#39;, {
 			this.getSelectionModel().select(selectedCurveNode);
 	},
+	buildFillsNode: function(panelObject, objectsNode, selectedObject) {
+		var fillsNode = objectsNode.appendChild(new amdaPlotObj.PlotFillsTreeNode({object : panelObject}));
+		
+		var selectedFillNode = null;
+		panelObject.fills().each(function (fillObject) {
+			var fillNode = fillsNode.appendChild(new amdaPlotObj.PlotFillTreeNode({object : fillObject}));
+			if (fillObject == selectedObject)
+				selectedFillNode = fillNode;
+		});
+		
+		this.getView().refresh();
+		if (selectedFillNode)
+			this.getSelectionModel().select(selectedFillNode);
+	},
+	
 	addPanelNode: function(panelObject) {
 		var panelNode = this.panelsNode.appendChild(new amdaPlotObj.PlotPanelTreeNode({object : panelObject}));
 		if (!this.isSimplifiedView)
@@ -378,7 +396,43 @@ Ext.define(&#39;amdaPlotComp.PlotTree&#39;, {
 				if (panelObject.removeTextLegendById(record.object.get('id')))
 					this.buildPanelAdditionalObjectsNode(panelObject);
 				break;
-			}
+			case 'constant' :
+				var panelObject = null;
+				if (!this.isSimplifiedView)
+					panelObject = record.parentNode.parentNode.object;
+				else
+					panelObject = record.parentNode.object;
+				if (panelObject.removeConstantById(record.object.get('id')))
+					this.buildPanelAdditionalObjectsNode(panelObject);
+				break;
+			case 'text-obj' :
+				var panelObject = null;
+				if (!this.isSimplifiedView)
+					panelObject = record.parentNode.parentNode.object;
+				else
+					panelObject = record.parentNode.object;
+				if (panelObject.removeTextObjectById(record.object.get('id')))
+					this.buildPanelAdditionalObjectsNode(panelObject);
+				break;
+			case 'curve' :
+				var panelObject = null;
+				if (!this.isSimplifiedView)
+					panelObject = record.parentNode.parentNode.object;
+				else
+					panelObject = record.parentNode.object;
+				if (panelObject.removeCurveById(record.object.get('id')))
+					this.buildPanelAdditionalObjectsNode(panelObject);
+				break;
+			case 'fill' :
+				var panelObject = null;
+				if (!this.isSimplifiedView)
+					panelObject = record.parentNode.parentNode.object;
+				else
+					panelObject = record.parentNode.object;
+				if (panelObject.removeFillById(record.object.get('id')))
+					this.buildPanelAdditionalObjectsNode(panelObject);
+				break;
+ 			}
 		}
 	},
@@ -49,7 +49,6 @@ Ext.define(&#39;amdaUI.PlotUI&#39;, {
      */
     saveProcess : function(){
     	var plotModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.plot.id);
-    	console.log(plotModule.linkedNode);
     	if (plotModule)
     		plotModule.linkedNode.create();
     },
@@ -474,6 +474,14 @@ p + p {
 	background-image:url( ../images/16x16/plot_additional_drawing_text.png ) !important;
 }
+.icon-plot-add-fills {
+	background-image:url( ../images/16x16/plot_additional_fills.png ) !important;
+}
+
+.icon-plot-add-fill {
+	background-image:url( ../images/16x16/plot_additional_fill.png ) !important;
+}
+
 .x-item-disabled .x-form-item-label {
 	filter:progid:DXImageTransform.Microsoft.Alpha(Opacity=100) !important;
 	opacity: 1.0 !important;