Add constants definition

Benjamin Renard
1 parent 339866c4
Showing 13 changed files with 258 additions and 4 deletions Show diff stats
js/app/models/PlotObjects/PlotConstantObject.js
js/app/models/PlotObjects/PlotObjectConfig.js
js/app/models/PlotObjects/PlotPanelObject.js
js/app/models/PlotObjects/PlotTreeNode.js
js/app/views/PlotComponents/PlotConstantForm.js
js/app/views/PlotComponents/PlotDrawingObjectForm.js
js/app/views/PlotComponents/PlotElementPanel.js
js/app/views/PlotComponents/PlotTree.js
js/resources/css/amda.css
js/resources/images/16x16/plot_additional_drawing_constant.png
js/resources/images/16x16/plot_additional_drawing_curve.png
js/resources/images/16x16/plot_additional_drawing_objs.png
js/resources/images/16x16/plot_additional_drawing_text.png
@@ -0,0 +1,64 @@
+/**
+ * Project      : AMDA-NG
+ * Name         : PlotConstantObject.js
+ * @class   amdaPlotObj.PlotConstantObject
+ * @extends Ext.data.Model
+ * @brief   Plot Constant Business Object Definition 
+ * @author  Benjamin Renard
+ * @version $Id: PlotConstantObject.js benjamin $
+ ******************************************************************************
+ *    FT Id     :   Date   : Name - Description
+ ******************************************************************************
+ *	:           :01/09/2015: BRE  - file creation
+ */
+ 
+ 		
+Ext.define('amdaPlotObj.PlotConstantObject', {
+	extend: 'Ext.data.Model',
+	
+	requires: [
+	           'amdaPlotObj.PlotObjectConfig'
+	],
+	
+	fields : [
+	          {name: 'constant-axis-id', type: 'string'},
+	          {name: 'constant-time-value', 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: 'constant-float-value', type: 'float'},
+	          {name: 'constant-line-style', type: 'string'},
+	          {name: 'constant-line-width', type: 'float'},
+	          {name: 'constant-line-color', type: 'string'}
+    ],
+    
+    setDefaultValues: function()
+    {
+    	this.set('constant-axis-id', amdaPlotObj.PlotObjectConfig.defaultValues.constants.axisId);
+    	this.set('constant-float-value', 0.);
+    	this.set('constant-line-style', amdaPlotObj.PlotObjectConfig.defaultValues.constants.line.style);
+    	this.set('constant-line-width', amdaPlotObj.PlotObjectConfig.defaultValues.constants.line.width);
+    	this.set('constant-line-color', amdaPlotObj.PlotObjectConfig.defaultValues.constants.line.color);
+    },
+    
+    getJsonValues : function() 
+    {
+    	var constantValues  = new Object();
+    	
+    	constantValues['constant-axis-id'] = this.get('constant-axis-id');
+    	constantValues['constant-time-value'] = this.get('constant-time-value');
+    	constantValues['constant-float-value'] = this.get('constant-float-value');
+    	constantValues['constant-line-style'] = this.get('constant-line-style');
+    	constantValues['constant-line-width'] = this.get('constant-line-width');
+    	constantValues['constant-line-color'] = this.get('constant-line-color');
+    	
+    	return constantValues;
+    }
+});
 \ No newline at end of file
@@ -140,6 +140,14 @@ Ext.define(&#39;amdaPlotObj.PlotObjectConfig&#39;, {
 					size: '12'
 				}
 			}
+		},
+		constants : {
+			axisId : 'y-left',
+			line : {
+				style : 'plain',
+				width : 1,
+				color : '#000000'
+			}
 		}
 	},
  
@@ -323,5 +331,11 @@ Ext.define(&#39;amdaPlotObj.PlotObjectConfig&#39;, {
                    {'key' : 'left', 'value' : 'Left'},
                    {'key' : 'top', 'value' : 'Top'},
                    {'key' : 'bottom', 'value' : 'Bottom'}
-	]
+	],
+	
+	availableConstantAxes : [
+	               {'key' : 'x', 'value' : 'X / Time / Epoch'},
+	               {'key' : 'y-left', 'value' : 'Y Left'},
+	               {'key' : 'y-right', 'value' : 'Y Right'}
+    ]
 });
 \ No newline at end of file
@@ -16,15 +16,17 @@
 Ext.define('amdaPlotObj.PlotPanelObject', {
 	extend: 'Ext.data.Model',
  
-	lastParamId : 0,
+	lastParamId      : 0,
 	lastTextLegendId : 0,
+	lastConstantId   : 0,
  
 	requires: [
 	           'amdaPlotObj.PlotObjectConfig',
 	           'amdaPlotObj.PlotAxisObject',
 	           'amdaPlotObj.PlotParamObject',
 	           'amdaPlotObj.PlotLegendSeriesObject',
-	           'amdaPlotObj.PlotLegendTextObject'
+	           'amdaPlotObj.PlotLegendTextObject',
+	           'amdaPlotObj.PlotConstantObject'
 	],
  
 	fields : [
@@ -97,6 +99,11 @@ Ext.define(&#39;amdaPlotObj.PlotPanelObject&#39;, {
             	  name  : 'textLegends'
               },
               {
+            	  type : 'hasMany', 
+            	  model : 'amdaPlotObj.PlotConstantObject',
+            	  name  : 'constants'
+              },
+              {
             	  type  : 'belongsTo',
                   model : 'amdaPlotObj.PlotTabObject'
               }
@@ -113,6 +120,8 @@ Ext.define(&#39;amdaPlotObj.PlotPanelObject&#39;, {
         		me.loadParams(arguments[0].params);
         	if (arguments[0].textLegends)
         		me.loadTextLegends(arguments[0].textLegends);
+        	if (arguments[0].constants)
+        		me.loadConstants(arguments[0].constants);
         }
         else
         {
@@ -136,6 +145,11 @@ Ext.define(&#39;amdaPlotObj.PlotPanelObject&#39;, {
        this.textLegends().loadData(textLegends);
     },
  
+    loadConstants: function(constants)
+    {
+       this.constants().loadData(constants);
+    },
+    
     initAxes : function()
     {
     	this.axes().removeAll();
@@ -236,6 +250,22 @@ Ext.define(&#39;amdaPlotObj.PlotPanelObject&#39;, {
     	return true;
     },
  
+    createNewConstant: function() {
+    	var recs = this.constants().add({id : this.get('id')+'-constant-'+this.lastConstantId});
+    	++this.lastConstantId;
+    	recs[0].setDefaultValues();
+    	return recs[0];
+    },
+    
+    removeConstantById: function(constantId) {
+    	//Retrieve constant record
+    	var constantRecord = this.constants().getById(constantId);
+    	if (constantRecord == null)
+    		return false;
+    	this.constants().remove(constantRecord);
+    	return true;
+    },
+    
     updatePlotType: function(plotType, forceUpdate) {
     	forceUpdate = (typeof forceUpdate !== 'undefined') ? forceUpdate : false;
  
@@ -378,6 +408,12 @@ Ext.define(&#39;amdaPlotObj.PlotPanelObject&#39;, {
     		panelValues['text-legends'][index] = legend.getJsonValues();
     	});
  
+    	panelValues['constants'] = [];
+    	
+    	this.constants().each(function (constant, index) {
+    		panelValues['constants'][index] = constant.getJsonValues();
+    	});
+    	
     	panelValues['axes'] = [];
  
     	this.axes().each(function (axe, index) {
@@ -290,6 +290,31 @@ Ext.define(&#39;amdaPlotObj.PlotTextLegendTreeNode&#39;, {
 	removable: true
 });
  
+Ext.define('amdaPlotObj.PlotDrawingObjectsTreeNode', {
+	extend: 'amdaPlotObj.PlotTreeNode',
+	
+	iconCls: 'icon-plot-add-drawing-objs',
+	
+	text: 'Drawing objects',
+	
+	type: 'drawing-objects'
+});
+
+Ext.define('amdaPlotObj.PlotConstantTreeNode', {
+	extend: 'amdaPlotObj.PlotTreeNode',
+	
+	leaf: true,
+	
+	iconCls: 'icon-plot-add-drawing-constant',
+	
+	text: 'Constant',
+	
+	type: 'constant',
+	
+	removable: true
+});
+
+
 /*
  * .icon-plot-add-objs {
 	background-image:url( ../images/16x16/plot_additional_objs.png ) !important;
@@ -0,0 +1,39 @@
+/**
+ * Project   : AMDA-NG
+ * Name      : PlotConstantForm.js
+ * @class   amdaPlotComp.PlotConstantForm
+ * @extends amdaPlotComp.PlotStandardForm
+ * @brief   Form to define specifics Text legend options
+ * @author  Benjamin Renard
+ * @version $Id: PlotConstantForm.js benjamin $
+ */
+
+Ext.define('amdaPlotComp.PlotConstantForm', {
+	extend: 'amdaPlotComp.PlotStandardForm',
+	
+	setObject : function(object) {
+		this.object = object;
+		if (this.object != null)
+			this.loadRecord(this.object);
+	},
+	
+	updateOptions: function(axisId, plotType) {
+		var timeValueField = this.getForm().findField('constant-time-value');
+		var floatValueField = this.getForm().findField('constant-float-value');
+		var isTimePlot = (plotType == 'timePlot');
+		timeValueField.setVisible(isTimePlot && (axisId == "x"));
+		floatValueField.setVisible(!(isTimePlot && (axisId == "x")));
+	},
+	
+	getFormItems: function() {
+		var me = this;
+		return [
+		        this.addStandardCombo('constant-axis-id', 'Axis attachment', amdaPlotObj.PlotObjectConfig.availableConstantAxes, function (name, value, oldValue) {
+		        	me.updateOptions(value, me.crtTree.getSelectedPlotType());
+		        }),
+		        this.addStandardDate('constant-time-value', 'Value'),
+		        this.addStandardText('constant-float-value', 'Value'),
+		        this.addStandardFieldSet('Line', '', this.addStandardLineItems('constant-line'))
+        ];
+	}
+});
 \ No newline at end of file
@@ -0,0 +1,34 @@
+/**
+ * Project   : AMDA-NG
+ * Name      : PlotDrawingObjectForm.js
+ * @class   amdaPlotComp.PlotDrawingObjectForm
+ * @extends amdaPlotComp.PlotStandardForm
+ * @brief   Form to define a list of text legends
+ * @author  Benjamin Renard
+ * @version $Id: PlotDrawingObjectForm.js benjamin $
+ */
+
+Ext.define('amdaPlotComp.PlotDrawingObjectForm', {
+	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 constant',
+            	iconCls: 'icon-add',
+            	handler : function() {
+            		var constantObject = me.object.createNewConstant();
+            		me.crtTree.buildPanelAdditionalObjectsNode(me.object, constantObject.get('id'));
+            	}
+            }
+		];
+	}
+});
 \ No newline at end of file
@@ -22,7 +22,9 @@ Ext.define(&#39;amdaPlotComp.PlotElementPanel&#39;, {
 	           'amdaPlotComp.PlotLayoutForm',
 	           'amdaPlotComp.PlotLegendSeriesForm',
 	           'amdaPlotComp.PlotLegendTextForm',
-	           'amdaPlotComp.PlotLegendsTextForm'
+	           'amdaPlotComp.PlotLegendsTextForm',
+	           'amdaPlotComp.PlotDrawingObjectForm',
+	           'amdaPlotComp.PlotConstantForm'
 	],
  
 	elementFormsManager : new Ext.AbstractManager(),
@@ -98,6 +100,12 @@ Ext.define(&#39;amdaPlotComp.PlotElementPanel&#39;, {
 			case 'text-legends' :
 				this.elementFormsManager.register(new amdaPlotComp.PlotLegendsTextForm({id : formId}));
 				break;
+			case 'drawing-objects' :
+				this.elementFormsManager.register(new amdaPlotComp.PlotDrawingObjectForm({id : formId}));
+				break;
+			case 'constant' :
+				this.elementFormsManager.register(new amdaPlotComp.PlotConstantForm({id : formId}));
+				break;
 			case '' :
 				this.elementFormsManager.register(new Ext.form.Label({id : formId, text: 'Select an element to the tree to show options'}));
 				break;
@@ -191,6 +191,9 @@ Ext.define(&#39;amdaPlotComp.PlotTree&#39;, {
  
 		//create legends node
 		this.buildPanelLegendsNode(panelObject, objectsNode, selectedObjectId);
+		
+		//create drawing objects node
+		this.buildDrawingObjectsNode(panelObject, objectsNode, selectedObjectId);
 	},
  
 	buildPanelLegendsNode: function(panelObject, objectsNode, selectedObjectId) {
@@ -212,6 +215,21 @@ Ext.define(&#39;amdaPlotComp.PlotTree&#39;, {
 			this.getSelectionModel().select(selectedTextLegendNode);
 	},
  
+	buildDrawingObjectsNode: function(panelObject, objectsNode, selectedObjectId) {
+		var drawingObjectsNode = objectsNode.appendChild(new amdaPlotObj.PlotDrawingObjectsTreeNode({object : panelObject}));
+		
+		var selectedConstantNode = null;
+		panelObject.constants().each(function (constantObject) {
+			var constantNode = drawingObjectsNode.appendChild(new amdaPlotObj.PlotConstantTreeNode({object : constantObject}));
+			if (constantObject.get('id') == selectedObjectId)
+				selectedConstantNode = constantNode;
+		});
+		
+		this.getView().refresh();
+		if (selectedConstantNode)
+			this.getSelectionModel().select(selectedConstantNode);
+	},
+	
 	addPanelNode: function(panelObject) {
 		var panelNode = this.panelsNode.appendChild(new amdaPlotObj.PlotPanelTreeNode({object : panelObject}));
 		if (!this.isSimplifiedView)
@@ -458,6 +458,22 @@ p + p {
 	background-image:url( ../images/16x16/plot_additional_text_legend.png ) !important;
 }
  
+.icon-plot-add-drawing-objs {
+	background-image:url( ../images/16x16/plot_additional_drawing_objs.png ) !important;
+}
+
+.icon-plot-add-drawing-constant {
+	background-image:url( ../images/16x16/plot_additional_drawing_constant.png ) !important;
+}
+
+.icon-plot-add-drawing-curve {
+	background-image:url( ../images/16x16/plot_additional_drawing_curve.png ) !important;
+}
+
+.icon-plot-add-drawing-text {
+	background-image:url( ../images/16x16/plot_additional_drawing_text.png ) !important;
+}
+
 .x-item-disabled .x-form-item-label {
 	filter:progid:DXImageTransform.Microsoft.Alpha(Opacity=100) !important;
 	opacity: 1.0 !important;