Add possibility to define an instant plot

Benjamin Renard
1 parent c6ac946e
Showing 10 changed files with 241 additions and 6 deletions Show diff stats
js/app/models/PlotObjects/PlotInstantSerieObject.js
js/app/models/PlotObjects/PlotInstantSpectroObject.js
js/app/models/PlotObjects/PlotObjectConfig.js
js/app/models/PlotObjects/PlotPanelObject.js
js/app/models/PlotObjects/PlotParamObject.js
js/app/views/PlotComponents/PlotInstantSerieForm.js
js/app/views/PlotComponents/PlotInstantSpectroForm.js
js/app/views/PlotComponents/PlotPanelForm.js
js/app/views/PlotComponents/PlotParamForm.js
js/app/views/PlotComponents/PlotStandardForm.js
@@ -0,0 +1,64 @@
+/**
+ * Project      : AMDA-NG
+ * Name         : PlotInstantSerieObject.js
+ * @class   amdaPlotObj.PlotInstantSerieObject
+ * @extends Ext.data.Model
+ * @brief   Plot Instant Serie Business Object Definition 
+ * @author  Benjamin Renard
+ * @version $Id: PlotInstantSerieObject.js benjamin $
+ ******************************************************************************
+ *    FT Id     :   Date   : Name - Description
+ ******************************************************************************
+ *	:           :28/08/2015: BRE  - file creation
+ */
+ 
+ 		
+Ext.define('amdaPlotObj.PlotInstantSerieObject', {
+	extend: 'Ext.data.Model',
+	
+	requires: [
+	           'amdaPlotObj.PlotObjectConfig'
+	],
+	
+	fields : [
+	          {name: 'iserie-tableonx', type: 'boolean'},
+	          {name: 'iserie-lines-activated', type: 'bool'},
+	          {name: 'iserie-lines-style', type: 'string'},
+	          {name: 'iserie-lines-width', type: 'float'},
+	          {name: 'iserie-lines-color', type: 'string'},
+	          {name: 'iserie-symbols-activated', type: 'bool'},
+	          {name: 'iserie-symbols-type', type: 'string'},
+	          {name: 'iserie-symbols-size', type: 'float'},
+	          {name: 'iserie-symbols-color', type: 'string'}
+    ],
+    
+    setDefaultValues: function()
+    {
+    	this.set('iserie-tableonx', false);
+    	this.set('iserie-lines-activated', true);
+    	this.set('iserie-lines-style', amdaPlotObj.PlotObjectConfig.defaultValues.serie.lines.style);
+    	this.set('iserie-lines-width', amdaPlotObj.PlotObjectConfig.defaultValues.serie.lines.width);
+    	this.set('iserie-lines-color', amdaPlotObj.PlotObjectConfig.defaultValues.serie.lines.color);
+    	this.set('iserie-symbols-activated', false);
+    	this.set('iserie-symbols-type', amdaPlotObj.PlotObjectConfig.defaultValues.serie.symbols.type);
+    	this.set('iserie-symbols-size', amdaPlotObj.PlotObjectConfig.defaultValues.serie.symbols.size);
+    	this.set('iserie-symbols-color', amdaPlotObj.PlotObjectConfig.defaultValues.serie.symbols.color);
+    },
+    
+    getJsonValues : function() 
+    {
+    	var iserieValues  = new Object();
+    	
+    	iserieValues['iserie-tableonx'] = this.get('iserie-tableonx');
+    	iserieValues['iserie-lines-activated'] = this.get('iserie-lines-activated');
+    	iserieValues['iserie-lines-style'] = this.get('iserie-lines-style');
+    	iserieValues['iserie-lines-width'] = this.get('iserie-lines-width');
+    	iserieValues['iserie-lines-color'] = this.get('iserie-lines-color');
+    	iserieValues['iserie-symbols-activated'] = this.get('iserie-symbols-activated');
+    	iserieValues['iserie-symbols-type'] = this.get('iserie-symbols-type');
+    	iserieValues['iserie-symbols-size'] = this.get('iserie-symbols-size');
+    	iserieValues['iserie-symbols-color'] = this.get('iserie-symbols-color');
+    	
+    	return iserieValues;
+    }
+});
 \ No newline at end of file
@@ -0,0 +1,40 @@
+/**
+ * Project      : AMDA-NG
+ * Name         : PlotInstantSpectroObject.js
+ * @class   amdaPlotObj.PlotInstantSpectroObject
+ * @extends Ext.data.Model
+ * @brief   Plot Instant Spectro Business Object Definition 
+ * @author  Benjamin Renard
+ * @version $Id: PlotInstantSpectroObject.js benjamin $
+ ******************************************************************************
+ *    FT Id     :   Date   : Name - Description
+ ******************************************************************************
+ *	:           :28/08/2015: BRE  - file creation
+ */
+ 
+ 		
+Ext.define('amdaPlotObj.PlotInstantSpectroObject', {
+	extend: 'Ext.data.Model',
+	
+	requires: [
+	           'amdaPlotObj.PlotObjectConfig'
+	],
+	
+	fields : [
+	          {name: 'ispectro-dimonxaxis', type: 'int'}
+    ],
+    
+    setDefaultValues: function()
+    {
+    	this.set('ispectro-dimonxaxis', 0);
+    },
+    
+    getJsonValues : function() 
+    {
+    	var ispectroValues  = new Object();
+    	
+    	ispectroValues['ispectro-dimonxaxis'] = this.get('ispectro-dimonxaxis');
+    	
+    	return ispectroValues;
+    }
+});
 \ No newline at end of file
@@ -240,5 +240,10 @@ Ext.define(&#39;amdaPlotObj.PlotObjectConfig&#39;, {
     availableResamplingModes : [
                    {'key' : 'xparam', 'value' : 'X Parameter'},
                    {'key' : 'yparam', 'value' : 'Y Parameter'}
+    ],
+    
+    availableDimsOnXAxis : [
+                   {'key' : '0', 'value' : 'First dimension'},
+                   {'key' : '1', 'value' : 'Second dimension'}  
     ]
 });
 \ No newline at end of file
@@ -60,7 +60,19 @@ Ext.define(&#39;amdaPlotObj.PlotPanelObject&#39;, {
               //Only used for tickPlot and timePlot
               {name: 'panel-tick-format', type: 'int'},
               //Only used for epochPlot
-              {name: 'panel-epoch-centertimeid', type: 'string'}
+              {name: 'panel-epoch-centertimeid', type: 'string'},
+              //Only used for instantPlot
+              {name: 'panel-instant-time', 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;
+            	  }
+              }
     ],
  
     associations : [
@@ -127,7 +139,6 @@ Ext.define(&#39;amdaPlotObj.PlotPanelObject&#39;, {
         	recs[0].setDefaultValues('color');
     		break;
     	case 'xyPlot' :
-    	case 'instantPlot' :
     		//X Axis
     		var recs = this.axes().add({id : 'x'});
         	recs[0].setDefaultValues('x');
@@ -141,6 +152,17 @@ Ext.define(&#39;amdaPlotObj.PlotPanelObject&#39;, {
         	recs = this.axes().add({id : 'color'});
         	recs[0].setDefaultValues('color');
     		break;
+    	case 'instantPlot' :
+    		//X Axis
+    		var recs = this.axes().add({id : 'x'});
+        	recs[0].setDefaultValues('x');
+        	//Y Left Axis
+        	recs = this.axes().add({id : 'y-left'});
+        	recs[0].setDefaultValues('y-left');
+        	//Color Axis
+        	recs = this.axes().add({id : 'color'});
+        	recs[0].setDefaultValues('color');
+    		break;
     	case 'epochPlot' :
     		//Epoch Axis
     		var recs = this.axes().add({id : 'epoch'});
@@ -297,6 +319,9 @@ Ext.define(&#39;amdaPlotObj.PlotPanelObject&#39;, {
     	if (this.get('panel-plot-type') == 'epochPlot')
     		panelValues['panel-epoch-centertimeid'] = this.get('panel-epoch-centertimeid');
  
+    	if (this.get('panel-plot-type') == 'instantPlot')
+    		panelValues['panel-instant-time'] = this.get('panel-instant-time');
+    	
     	panelValues['axes'] = [];
  
     	this.axes().each(function (axe, index) {
@@ -21,7 +21,9 @@ Ext.define(&#39;amdaPlotObj.PlotParamObject&#39;, {
 	           'amdaPlotObj.PlotSerieObject',
 	           'amdaPlotObj.PlotSpectroObject',
 	           'amdaPlotObj.PlotStatusBarObject',
-	           'amdaPlotObj.PlotTickBarObject'
+	           'amdaPlotObj.PlotTickBarObject',
+	           'amdaPlotObj.PlotInstantSerieObject',
+	           'amdaPlotObj.PlotInstantSpectroObject'
 	],
  
 	fields : [
@@ -84,6 +86,12 @@ Ext.define(&#39;amdaPlotObj.PlotParamObject&#39;, {
     	case 'tick-bar' :
     		this.set('param-drawing-object', new amdaPlotObj.PlotTickBarObject());
     		break;
+    	case 'iserie' :
+    		this.set('param-drawing-object', new amdaPlotObj.PlotInstantSerieObject());
+    		break;
+    	case 'ispectro' :
+    		this.set('param-drawing-object', new amdaPlotObj.PlotInstantSpectroObject());
+    		break;
     	default :
     		this.set('param-drawing-object', null);
     	}
@@ -111,8 +119,8 @@ Ext.define(&#39;amdaPlotObj.PlotParamObject&#39;, {
     		];
     	case 'instantPlot' :
     		return [
-    		        {'key' : 'serie', 'value' : 'Serie'},
-    		        {'key' : 'spectro', 'value' : 'Spectro'}
+    		        {'key' : 'iserie', 'value' : 'Serie'},
+    		        {'key' : 'ispectro', 'value' : 'Spectro'}
     		];
     	case 'statusPlot' :
     		return [
@@ -0,0 +1,38 @@
+/**
+ * Project   : AMDA-NG
+ * Name      : PlotInstantSerieForm.js
+ * @class   amdaPlotComp.PlotInstantSerieForm
+ * @extends amdaPlotComp.PlotStandardForm
+ * @brief   Form to define specifics instant serie options
+ * @author  Benjamin Renard
+ * @version $Id: PlotInstantSerieForm.js benjamin $
+ */
+
+Ext.define('amdaPlotComp.PlotInstantSerieForm', {
+	extend: 'amdaPlotComp.PlotStandardForm',
+	
+	setObject : function(object) {
+		this.object = object.get('param-drawing-object');
+		this.loadRecord(this.object);
+	},
+	
+	getFormItems: function() {
+		var linesItems = [
+	    	this.addStandardCombo('iserie-lines-style', 'Style', amdaPlotObj.PlotObjectConfig.availableLinesStyles),
+	    	this.addStandardFloat('iserie-lines-width', 'Width', 1, 10),
+	    	this.addStandardColor('iserie-lines-color', 'Color', amdaPlotObj.PlotObjectConfig.availableColors)
+		];
+		
+		var symbolsItems = [
+		    this.addStandardCombo('iserie-symbols-type', 'Type', amdaPlotObj.PlotObjectConfig.availableSymbolsTypes),
+		    this.addStandardFloat('iserie-symbols-size', 'Size', 1, 10),
+		    this.addStandardColor('iserie-symbols-color', 'Color', amdaPlotObj.PlotObjectConfig.availableColors)
+        ];
+		
+		return [
+		    this.addStandardCheck('iserie-tableonx', 'Table on X axis'),
+		    this.addStandardFieldSet('Lines', 'iserie-lines-activated', linesItems),
+		    this.addStandardFieldSet('Symbols', 'iserie-symbols-activated', symbolsItems)
+		];
+	}
+});
 \ No newline at end of file
@@ -0,0 +1,24 @@
+/**
+ * Project   : AMDA-NG
+ * Name      : PlotInstantSpectroForm.js
+ * @class   amdaPlotComp.PlotInstantSpectroForm
+ * @extends amdaPlotComp.PlotStandardForm
+ * @brief   Form to define specifics instant spectro options
+ * @author  Benjamin Renard
+ * @version $Id: PlotInstantSpectroForm.js benjamin $
+ */
+
+Ext.define('amdaPlotComp.PlotInstantSpectroForm', {
+	extend: 'amdaPlotComp.PlotStandardForm',
+	
+	setObject : function(object) {
+		this.object = object.get('param-drawing-object');
+		this.loadRecord(this.object);
+	},
+	
+	getFormItems: function() {
+		return [
+		    this.addStandardCombo('ispectro-dimonxaxis', 'Dim. on X axis', amdaPlotObj.PlotObjectConfig.availableDimsOnXAxis)
+		];
+	}
+});
 \ No newline at end of file
@@ -46,6 +46,11 @@ Ext.define(&#39;amdaPlotComp.PlotPanelForm&#39;, {
  
 		centerTimeIdField.setVisible(plotType == 'epochPlot');
  
+		//Instant time visibility
+		var instantTimeField = this.getForm().findField('panel-instant-time');
+		
+		instantTimeField.setVisible(plotType == 'instantPlot');
+		
 		//Options in relation with the layout
 		this.updateLayoutOptions(plotType);
 	},
@@ -122,6 +127,7 @@ Ext.define(&#39;amdaPlotComp.PlotPanelForm&#39;, {
 		        }),
 		        this.addStandardCheck('panel-scatter-isotropic', 'Isotropic'), 
 		        this.addStandardText('panel-epoch-centertimeid', 'Epoch Center Time Id'),
+		        this.addStandardDate('panel-instant-time', 'Instant time'),
 		        this.addStandardColor('panel-background-color', 'Background Color', amdaPlotObj.PlotObjectConfig.availableBackgroundColors),
 		        this.addStandardFieldSet('Manual Bounds', '', boundsItems),
 		        this.addStandardFieldSet('Manual Margins', '', marginItems),
@@ -15,7 +15,9 @@ Ext.define(&#39;amdaPlotComp.PlotParamForm&#39;, {
 	    'amdaPlotComp.PlotSerieForm',
 	    'amdaPlotComp.PlotSpectroForm',
 	    'amdaPlotComp.PlotStatusBarForm',
-	    'amdaPlotComp.PlotTickBarForm'
+	    'amdaPlotComp.PlotTickBarForm',
+	    'amdaPlotComp.PlotInstantSerieForm',
+	    'amdaPlotComp.PlotInstantSpectroForm'
 	],
  
 	drawingOptionsContainer: null,
@@ -54,6 +56,12 @@ Ext.define(&#39;amdaPlotComp.PlotParamForm&#39;, {
 				case 'tick-bar' :
 					this.drawingOptionsFormsManager.register(new amdaPlotComp.PlotTickBarForm({id : formId}));
 					break;
+				case 'iserie' :
+					this.drawingOptionsFormsManager.register(new amdaPlotComp.PlotInstantSerieForm({id : formId}));
+					break;
+				case 'ispectro' :
+					this.drawingOptionsFormsManager.register(new amdaPlotComp.PlotInstantSpectroForm({id : formId}));
+					break;
  				default :
 					this.drawingOptionsFormsManager.register(new Ext.form.Label({id : formId, text: 'No available options for this drawing type'}));
 			}
@@ -266,6 +266,23 @@ Ext.define(&#39;amdaPlotComp.PlotStandardForm&#39;, {
 	    };
 	},
  
+	addStandardDate: function(name, label) {
+		return { 
+            xtype: 'datefield',
+            name: name,
+            format: 'Y/m/d H:i:s',
+            enforceMaxLength : true,
+            maxLength: 19,
+            fieldLabel: label,
+            listeners: {
+                change: function(field, newValue, oldValue, eOpts) {
+            		this.object.set(name, newValue);
+            	},
+                scope : this
+            } 
+        };
+	},
+	
 	init : function(config) {
 		var me = this;