Add text object plot definition

Benjamin Renard
1 parent 829160b3
Showing 11 changed files with 273 additions and 31 deletions Show diff stats
js/app/models/PlotObjects/PlotObjectConfig.js
js/app/models/PlotObjects/PlotPanelObject.js
js/app/models/PlotObjects/PlotTextObject.js
js/app/models/PlotObjects/PlotTreeNode.js
js/app/views/PlotComponents/PlotDrawingObjectForm.js
js/app/views/PlotComponents/PlotElementPanel.js
js/app/views/PlotComponents/PlotOutputForm.js
js/app/views/PlotComponents/PlotPageForm.js
js/app/views/PlotComponents/PlotStandardForm.js
js/app/views/PlotComponents/PlotTextForm.js
js/app/views/PlotComponents/PlotTree.js
@@ -148,6 +148,17 @@ Ext.define(&#39;amdaPlotObj.PlotObjectConfig&#39;, {
 				width : 1,
 				color : '#000000'
 			}
+		},
+		textObjs : {
+			yAxisId   : 'y-left',
+			xRelative : true,
+			yRelative : true,
+			align : 'left',
+			color : '#000000',
+			font : {
+				name : 'sans-serif',
+				size: '12'
+			}
 		}
 	},
  
@@ -337,5 +348,11 @@ Ext.define(&#39;amdaPlotObj.PlotObjectConfig&#39;, {
 	               {'key' : 'x', 'value' : 'X / Time / Epoch'},
 	               {'key' : 'y-left', 'value' : 'Y Left'},
 	               {'key' : 'y-right', 'value' : 'Y Right'}
+    ],
+    
+    availableTextAlignments : [
+                   {'key' : 'left', 'value' : 'Left'},
+                   {'key' : 'center', 'value' : 'Center'},
+                   {'key' : 'right', 'value' : 'Right'}
     ]
 });
 \ No newline at end of file
@@ -26,7 +26,8 @@ Ext.define(&#39;amdaPlotObj.PlotPanelObject&#39;, {
 	           'amdaPlotObj.PlotParamObject',
 	           'amdaPlotObj.PlotLegendSeriesObject',
 	           'amdaPlotObj.PlotLegendTextObject',
-	           'amdaPlotObj.PlotConstantObject'
+	           'amdaPlotObj.PlotConstantObject',
+	           'amdaPlotObj.PlotTextObject'
 	],
  
 	fields : [
@@ -104,6 +105,11 @@ Ext.define(&#39;amdaPlotObj.PlotPanelObject&#39;, {
             	  name  : 'constants'
               },
               {
+            	  type : 'hasMany',
+            	  model : 'amdaPlotObj.PlotTextObject',
+            	  name : 'textObjs'
+              },
+              {
             	  type  : 'belongsTo',
                   model : 'amdaPlotObj.PlotTabObject'
               }
@@ -122,6 +128,8 @@ Ext.define(&#39;amdaPlotObj.PlotPanelObject&#39;, {
         		me.loadTextLegends(arguments[0].textLegends);
         	if (arguments[0].constants)
         		me.loadConstants(arguments[0].constants);
+        	if (arguments[0].textObjs)
+        		me.loadTextObjs(arguments[0].textObjs);
         }
         else
         {
@@ -150,6 +158,11 @@ Ext.define(&#39;amdaPlotObj.PlotPanelObject&#39;, {
        this.constants().loadData(constants);
     },
  
+    loadTextObjs: function(textObjs)
+    {
+    	this.textObjs().loadData(textObjs);
+    },
+    
     initAxes : function()
     {
     	this.axes().removeAll();
@@ -266,6 +279,22 @@ Ext.define(&#39;amdaPlotObj.PlotPanelObject&#39;, {
     	return true;
     },
  
+    createNewTextObject: function() {
+    	var recs = this.textObjs().add({id : this.get('id')+'-text-object-'+this.lastTextObjectId});
+    	++this.lastTextObjectId;
+    	recs[0].setDefaultValues();
+    	return recs[0];
+    },
+    
+    removeTextObjectById: function(textObjId) {
+    	//Retrieve text object record
+    	var textObjRecord = this.textObjs().getById(textObjId);
+    	if (textObjRecord == null)
+    		return false;
+    	this.textObjs().remove(textObjRecord);
+    	return true;
+    },
+    
     updatePlotType: function(plotType, forceUpdate) {
     	forceUpdate = (typeof forceUpdate !== 'undefined') ? forceUpdate : false;
  
@@ -414,6 +443,12 @@ Ext.define(&#39;amdaPlotObj.PlotPanelObject&#39;, {
     		panelValues['constants'][index] = constant.getJsonValues();
     	});
  
+    	panelValues['textObjs'] = [];
+    	
+    	this.textObjs().each(function (textObj, index) {
+    		panelValues['textObjs'][index] = textObj.getJsonValues();
+    	});
+    	
     	panelValues['axes'] = [];
  
     	this.axes().each(function (axe, index) {
@@ -0,0 +1,91 @@
+/**
+ * Project      : AMDA-NG
+ * Name         : PlotTextObject.js
+ * @class   amdaPlotObj.PlotTextObject
+ * @extends Ext.data.Model
+ * @brief   Plot Constant Business Object Definition 
+ * @author  Benjamin Renard
+ * @version $Id: PlotTextObject.js benjamin $
+ ******************************************************************************
+ *    FT Id     :   Date   : Name - Description
+ ******************************************************************************
+ *	:           :01/09/2015: BRE  - file creation
+ */
+ 
+ 		
+Ext.define('amdaPlotObj.PlotTextObject', {
+	extend: 'Ext.data.Model',
+	
+	requires: [
+	           'amdaPlotObj.PlotObjectConfig'
+	],
+	
+	fields : [
+	          {name: 'text-value', type: 'string'},
+	          {name: 'text-y-axis', type: 'string'},
+	          {name: 'text-x-relative', type: 'boolean'},
+	          {name: 'text-x-floatvalue', type: 'float'},
+	          {name: 'text-x-timevalue', 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: 'text-y-relative', type: 'boolean'},
+	          {name: 'text-y-value', type: 'float'},
+	          {name: 'text-angle', type: 'float'},
+	          {name: 'text-color', type: 'string'},
+	          {name: 'text-align', type: 'string'},
+	          {name: 'text-font-activated', type: 'boolean'},
+              {name: 'text-font-name', type: 'string'},
+              {name: 'text-font-size', type: 'int'},
+              {name: 'text-font-bold', type: 'boolean'},
+              {name: 'text-font-italic', type: 'boolean'}
+    ],
+    
+    setDefaultValues: function()
+    {
+    	this.set('text-value', '');
+    	this.set('text-y-axis', amdaPlotObj.PlotObjectConfig.defaultValues.textObjs.yAxisId);
+    	this.set('text-x-relative', amdaPlotObj.PlotObjectConfig.defaultValues.textObjs.xRelative);
+    	this.set('text-x-floatvalue', 0.);
+    	this.set('text-y-relative', amdaPlotObj.PlotObjectConfig.defaultValues.textObjs.yRelative);
+    	this.set('text-y-value', 0.);
+    	this.set('text-angle', 0.);
+    	this.set('text-color', amdaPlotObj.PlotObjectConfig.defaultValues.textObjs.color);
+    	this.set('text-align', amdaPlotObj.PlotObjectConfig.defaultValues.textObjs.align);
+    	this.set('text-font-activated', false);
+    	this.set('text-font-name', amdaPlotObj.PlotObjectConfig.defaultValues.textObjs.font.name);
+    	this.set('text-font-size', amdaPlotObj.PlotObjectConfig.defaultValues.textObjs.font.size);
+    	this.set('text-font-bold', false);
+    	this.set('text-font-italic', false);
+    },
+    
+    getJsonValues : function() 
+    {
+    	var textValues  = new Object();
+    	
+    	textValues['text-value'] = this.get('text-value');
+    	textValues['text-y-axis'] = this.get('text-y-axis');
+    	textValues['text-x-relative'] = this.get('text-x-relative');
+    	textValues['text-x-floatvalue'] = this.get('text-x-floatvalue');
+    	textValues['text-x-timevalue'] = this.get('text-x-timevalue');
+    	textValues['text-y-relative'] = this.get('text-y-relative');
+    	textValues['text-y-value'] = this.get('text-y-value');
+    	textValues['text-angle'] = this.get('text-angle');
+    	textValues['text-color'] = this.get('text-color');
+    	textValues['text-align'] = this.get('text-align');
+    	textValues['text-font-activated'] = this.get('text-font-activated');
+    	textValues['text-font-name'] = this.get('text-font-name');
+    	textValues['text-font-size'] = this.get('text-font-size');
+    	textValues['text-font-bold'] = this.get('text-font-bold');
+    	textValues['text-font-italic'] = this.get('text-font-italic');	
+    	
+    	return textValues;
+    }
+});
 \ No newline at end of file
@@ -314,24 +314,16 @@ Ext.define(&#39;amdaPlotObj.PlotConstantTreeNode&#39;, {
 	removable: true
 });
  
-
-/*
- * .icon-plot-add-objs {
-	background-image:url( ../images/16x16/plot_additional_objs.png ) !important;
-}
-
-.icon-plot-add-legends {
-	background-image:url( ../images/16x16/plot_additional_legends.png ) !important;
-}
-
-.icon-plot-add-legend-series {
-	background-image:url( ../images/16x16/plot_additional_series_legend.png ) !important;
-}
-
-.icon-plot-add-legends-text {
-	background-image:url( ../images/16x16/plot_additional_text_legends.png ) !important;
-}
-
-.icon-plot-add-legend-text {
-	background-image:url( ../images/16x16/plot_additional_text_legend.png ) !important;
-}*/
+Ext.define('amdaPlotObj.PlotTextTreeNode', {
+	extend: 'amdaPlotObj.PlotTreeNode',
+	
+	leaf: true,
+	
+	iconCls: 'icon-plot-add-drawing-text',
+	
+	text: 'Text',
+	
+	type: 'text-obj',
+	
+	removable: true
+});
@@ -28,6 +28,15 @@ Ext.define(&#39;amdaPlotComp.PlotDrawingObjectForm&#39;, {
             		var constantObject = me.object.createNewConstant();
             		me.crtTree.buildPanelAdditionalObjectsNode(me.object, constantObject.get('id'));
             	}
+            },
+            {
+            	xtype: 'button',
+            	text: 'Add new text',
+            	iconCls: 'icon-add',
+            	handler : function() {
+            		var textObject = me.object.createNewTextObject();
+            		me.crtTree.buildPanelAdditionalObjectsNode(me.object, textObject.get('id'));
+            	}
             }
 		];
 	}
@@ -24,7 +24,8 @@ Ext.define(&#39;amdaPlotComp.PlotElementPanel&#39;, {
 	           'amdaPlotComp.PlotLegendTextForm',
 	           'amdaPlotComp.PlotLegendsTextForm',
 	           'amdaPlotComp.PlotDrawingObjectForm',
-	           'amdaPlotComp.PlotConstantForm'
+	           'amdaPlotComp.PlotConstantForm',
+	           'amdaPlotComp.PlotTextForm'
 	],
  
 	elementFormsManager : new Ext.AbstractManager(),
@@ -106,6 +107,9 @@ Ext.define(&#39;amdaPlotComp.PlotElementPanel&#39;, {
 			case 'constant' :
 				this.elementFormsManager.register(new amdaPlotComp.PlotConstantForm({id : formId}));
 				break;
+			case 'text-obj' :
+				this.elementFormsManager.register(new amdaPlotComp.PlotTextForm({id : formId}));
+				break;
 			case '' :
 				this.elementFormsManager.register(new Ext.form.Label({id : formId, text: 'Select an element to the tree to show options'}));
 				break;
@@ -50,11 +50,11 @@ Ext.define(&#39;amdaPlotComp.PlotOutputForm&#39;, {
 		var me = this;
  
 		return [
-		        this.addStandardCombo('file-format', 'File format', amdaPlotObj.PlotObjectConfig.availableFileFormats, function(name, value) {
+		        this.addStandardCombo('file-format', 'File format', amdaPlotObj.PlotObjectConfig.availableFileFormats, function(name, value, oldValue) {
 		        	me.updateOutputOption();
 		        	me.updateOneFilePerIntOption();
 		        }),
-		        this.addStandardCombo('file-output', 'File output', amdaPlotObj.PlotObjectConfig.availableFileOutputs, function(name, value) {
+		        this.addStandardCombo('file-output', 'File output', amdaPlotObj.PlotObjectConfig.availableFileOutputs, function(name, value, oldValue) {
 		        	me.updateFilePrefixOption();
 		        }),
 		        this.addStandardText('file-prefix', 'File prefix'),
@@ -28,13 +28,13 @@ Ext.define(&#39;amdaPlotComp.PlotPageForm&#39;, {
 		var me = this;
 		return [
 		        //this.addStandardCombo('page-mode', 'Mode', amdaPlotObj.PlotObjectConfig.availablePageModes),
-    	        this.addStandardCombo('page-orientation', 'Orientation', amdaPlotObj.PlotObjectConfig.availablePageOrientations, function(name, value) {
+    	        this.addStandardCombo('page-orientation', 'Orientation', amdaPlotObj.PlotObjectConfig.availablePageOrientations, function(name, value, oldValue) {
     	        	me.crtTree.getView().refresh();
     	        }),
-    	        this.addStandardCombo('page-dimension', 'Dimension', amdaPlotObj.PlotObjectConfig.availablePageDimensions, function(name, value) {
+    	        this.addStandardCombo('page-dimension', 'Dimension', amdaPlotObj.PlotObjectConfig.availablePageDimensions, function(name, value, oldValue) {
     	        	me.crtTree.getView().refresh();
     	        }),
-    	        this.addStandardCheck('page-superpose-mode', 'Epoch Superposed Mode', function(name, value) {
+    	        this.addStandardCheck('page-superpose-mode', 'Epoch Superposed Mode', function(name, value, oldValue) {
     	        	me.crtTree.getView().refresh();
     	        }),
 		        this.addStandardFieldSet('Title', '', titleItems),
@@ -89,7 +89,7 @@ Ext.define(&#39;amdaPlotComp.PlotStandardForm&#39;, {
             	change: function(combo, newValue, oldValue, eOpts) {
             		this.object.set(name, newValue);
             		if (onChange != null)
-            			onChange(name, newValue);
+            			onChange(name, newValue, oldValue);
             	},
             	scope: this
             }
@@ -105,7 +105,7 @@ Ext.define(&#39;amdaPlotComp.PlotStandardForm&#39;, {
             	change: function(combo, newValue, oldValue, eOpts) {
             		this.object.set(name, newValue);
             		if (onChange != null)
-            			onChange(name, newValue);
+            			onChange(name, newValue, oldValue);
             	},
             	scope: this
             }
@@ -228,7 +228,7 @@ Ext.define(&#39;amdaPlotComp.PlotStandardForm&#39;, {
             	change: function(combo, newValue, oldValue, eOpts) {
             		this.object.set(name, newValue);
             		if (onChange != null)
-            			onChange(name, newValue);
+            			onChange(name, newValue, oldValue);
             	},
             	scope: this
             }
@@ -0,0 +1,81 @@
+/**
+ * Project   : AMDA-NG
+ * Name      : PlotTextForm.js
+ * @class   amdaPlotComp.PlotTextForm
+ * @extends amdaPlotComp.PlotStandardForm
+ * @brief   Form to define specifics Text object options
+ * @author  Benjamin Renard
+ * @version $Id: PlotTextForm.js benjamin $
+ */
+
+Ext.define('amdaPlotComp.PlotTextForm', {
+	extend: 'amdaPlotComp.PlotStandardForm',
+	
+	setObject : function(object) {
+		this.object = object;
+		if (this.object != null)
+		{
+			this.loadRecord(this.object);
+			this.updateOptions(this.crtTree.getSelectedPlotType());
+		}
+	},
+	
+	updateOptions: function(plotType) {
+		var xRelativeField = this.getForm().findField('text-x-relative');
+		var xFloatValueField = this.getForm().findField('text-x-floatvalue');
+		var xTimeValueField = this.getForm().findField('text-x-timevalue');
+		var yRelativeField = this.getForm().findField('text-y-relative');
+		var yValueField = this.getForm().findField('text-y-value');
+		var yAxisField = this.getForm().findField('text-y-axis');
+		
+		var isTimePlot = (plotType == 'timePlot');
+		
+		if (xRelativeField.getValue())
+		{
+			xFloatValueField.setMinValue(0);
+			xFloatValueField.setMaxValue(1);
+		}
+		else
+		{
+			xFloatValueField.setMinValue(-Number.MAX_VALUE);
+			xFloatValueField.setMaxValue(Number.MAX_VALUE);
+		}
+		
+		xFloatValueField.setVisible(!(isTimePlot && !xRelativeField.getValue()));
+		xTimeValueField.setVisible(isTimePlot && !xRelativeField.getValue());
+		
+		if (yRelativeField.getValue())
+		{
+			yAxisField.setVisible(false);
+			yValueField.setMinValue(0);
+			yValueField.setMaxValue(1);
+		}
+		else
+		{
+			yAxisField.setVisible(true);
+			yValueField.setMinValue(-Number.MAX_VALUE);
+			yValueField.setMaxValue(Number.MAX_VALUE);
+		}
+	},
+	
+	getFormItems: function() {
+		var me = this;
+		return [
+		        this.addStandardText('text-value', 'Text'),
+		        this.addStandardColor('text-color', 'Color', amdaPlotObj.PlotObjectConfig.availableColors),
+		        this.addStandardCombo('text-align', 'Alignment', amdaPlotObj.PlotObjectConfig.availableTextAlignments),
+		        this.addStandardCheck('text-x-relative', 'Relative X Position', function(name, value, oldValue) {
+		        	me.updateOptions(me.crtTree.getSelectedPlotType());
+		        }),
+		        this.addStandardFloat('text-x-floatvalue', 'X Position', 0, 1),
+		        this.addStandardDate('text-x-timevalue', 'X Position', 0, 1),
+		        this.addStandardCheck('text-y-relative', 'Relative Y Position', function(name, value, oldValue) {
+		        	me.updateOptions(me.crtTree.getSelectedPlotType());
+		        }),
+		        this.addStandardCombo('text-y-axis', 'Y Axis attachment', amdaPlotObj.PlotObjectConfig.availableYAxes),
+		        this.addStandardFloat('text-y-value', 'Y Position', 0, 1),
+		        this.addStandardFloat('text-angle', 'Rotation Angle', 0, 360),
+		        this.addStandardFont('text-font')
+        ];
+	}
+});
 \ No newline at end of file
@@ -218,6 +218,7 @@ Ext.define(&#39;amdaPlotComp.PlotTree&#39;, {
 	buildDrawingObjectsNode: function(panelObject, objectsNode, selectedObjectId) {
 		var drawingObjectsNode = objectsNode.appendChild(new amdaPlotObj.PlotDrawingObjectsTreeNode({object : panelObject}));
  
+		//Constants
 		var selectedConstantNode = null;
 		panelObject.constants().each(function (constantObject) {
 			var constantNode = drawingObjectsNode.appendChild(new amdaPlotObj.PlotConstantTreeNode({object : constantObject}));
@@ -225,9 +226,21 @@ Ext.define(&#39;amdaPlotComp.PlotTree&#39;, {
 				selectedConstantNode = constantNode;
 		});
  
+		//Texts
+		var selectedTextNode = null;
+		panelObject.textObjs().each(function (textObject) {
+			var textNode = drawingObjectsNode.appendChild(new amdaPlotObj.PlotTextTreeNode({object : textObject}));
+			if (textObject.get('id') == selectedObjectId)
+				selectedTextNode = textNode;
+		});
+		
+		//Refresh & selection
 		this.getView().refresh();
 		if (selectedConstantNode)
 			this.getSelectionModel().select(selectedConstantNode);
+		
+		if (selectedTextNode)
+			this.getSelectionModel().select(selectedTextNode);
 	},
  
 	addPanelNode: function(panelObject) {