Merge branch 'develop' into amdadev

Benjamin Renard
2 parents d4ab05cd 9b729ba5
Showing 5 changed files with 182 additions and 3 deletions Show diff stats
js/app/models/PlotObjects/PlotObjectConfig.js
js/app/models/PlotObjects/PlotParamObject.js
js/app/models/PlotObjects/PlotSauvaudObject.js
js/app/views/PlotComponents/PlotParamForm.js
js/app/views/PlotComponents/PlotSauvaudForm.js
@@ -144,6 +144,10 @@ Ext.define(&#39;amdaPlotObj.PlotObjectConfig&#39;, {
 			yAxis: 'y-left',
 			resolution: 3000
 		},
+                		sauvaud: {
+			yAxis: 'y-right',
+			resolution: 3000
+		},
 		legends: {
 			series: {
 				type: 'text-only',
@@ -19,13 +19,14 @@ Ext.define(&#39;amdaPlotObj.PlotParamObject&#39;, {
 	requires: [
 	           'amdaPlotObj.PlotObjectConfig',
 	           'amdaPlotObj.PlotSerieObject',
-		   'amdaPlotObj.PlotOrbitSerieObject',
+                               'amdaPlotObj.PlotOrbitSerieObject',
 	           'amdaPlotObj.PlotSpectroObject',
+                               'amdaPlotObj.PlotSauvaudObject',
 	           'amdaPlotObj.PlotStatusBarObject',
 	           'amdaPlotObj.PlotTickBarObject',
 	           'amdaPlotObj.PlotInstantSerieObject',
 	           'amdaPlotObj.PlotInstantSpectroObject',
-		   'amdaPlotObj.PlotIntervalsObject'
+                               'amdaPlotObj.PlotIntervalsObject'
 	],
 	fields : [
@@ -85,6 +86,8 @@ Ext.define(&#39;amdaPlotObj.PlotParamObject&#39;, {
     		return new amdaPlotObj.PlotInstantSpectroObject(data);
 	case 'intervals' :
 		return new amdaPlotObj.PlotIntervalsObject(data);
+                	case 'sauvaud' :
+		return new amdaPlotObj.PlotSauvaudObject(data);
     	default :
     		return null;
     	}
@@ -119,6 +122,7 @@ Ext.define(&#39;amdaPlotObj.PlotParamObject&#39;, {
     		return [
     		        {'key' : 'serie', 'value' : 'Serie'},
     		        {'key' : 'spectro', 'value' : 'Spectro'},
+                                                {'key' : 'sauvaud', 'value' : 'Sauvaud'},
     		        {'key' : 'tick-bar', 'value' : 'Tick Bar'},
     		        {'key' : 'status-bar', 'value' : 'Status Bar'}
     		];
@@ -211,6 +215,10 @@ Ext.define(&#39;amdaPlotObj.PlotParamObject&#39;, {
 			var yAxis = amdaPlotObj.PlotObjectConfig.getValueByKey(amdaPlotObj.PlotObjectConfig.availableYAxes, this.get('param-drawing-object').get('spectro-yaxis'));
 			info += ', Y '+yAxis;
 			break;
+                        	case 'sauvaud' :
+			var yAxis = amdaPlotObj.PlotObjectConfig.getValueByKey(amdaPlotObj.PlotObjectConfig.availableYAxes, this.get('param-drawing-object').get('spectro-yaxis'));
+			info += ', Y '+yAxis;
+			break;
 		}
 		return info;
@@ -0,0 +1,96 @@
+/**
+ * Project      : AMDA-NG
+ * Name         : PlotSpectroObject.js
+ * @class   amdaPlotObj.PlotSpectroObject
+ * @extends Ext.data.Model
+ * @brief   Plot Spectro Business Object Definition 
+ * @author  Benjamin Renard
+ * @version $Id: PlotSpectroObject.js benjamin $
+ ******************************************************************************
+ *    FT Id     :   Date   : Name - Description
+ ******************************************************************************
+ *	:           :21/08/2015: BRE  - file creation
+ */
+
+
+Ext.define('amdaPlotObj.PlotSauvaudObject', {
+    extend: 'Ext.data.Model',
+
+    requires: [
+        'amdaPlotObj.PlotObjectConfig'
+    ],
+
+    fields: [
+        { name: 'spectro-yaxis', type: 'string' },
+        { name: 'spectro-resolution', type: 'int' },
+        { name: 'spectro-value-min', type: 'float', useNull: true },
+        { name: 'spectro-value-max', type: 'float', useNull: true },
+        { name: 'spectro-log0-as-min', type: 'boolean' },
+        { name: 'spectro-normalization', type: 'string' },
+        //Filtering
+        { name: 'filtering-activated', type: 'boolean' },
+        { name: 'filtering-level', type: 'int' },
+        { name: 'right_dim', type: 'int' },
+
+        { name: amdaPlotObj.PlotObjectConfig.bgSubstraction.name, type: 'boolean' },
+        { name: amdaPlotObj.PlotObjectConfig.bgSubstraction.type.key, type: 'string' },
+        { name: amdaPlotObj.PlotObjectConfig.bgSubstraction.value.key, type: 'string' },
+        { name: amdaPlotObj.PlotObjectConfig.bgSubstraction.value.dimkey, type: 'string' }
+    ],
+
+    constructor: function () {
+        var me = this;
+        me.callParent(arguments);
+        if ((arguments.length > 0) && arguments[0]) {
+        }
+        else {
+            //new object, set default fields values
+            me.setDefaultValues();
+        }
+        this.dirty = false;
+    },
+
+    loadFromData: function (drawData) {
+        Ext.Object.each(drawData, function (key, value) {
+            if (key == 'type')
+                return;
+            this.set(key, value);
+        }, this);
+    },
+
+    setDefaultValues: function () {
+        this.set('spectro-yaxis', amdaPlotObj.PlotObjectConfig.defaultValues.spectro.yAxis);
+        this.set('spectro-resolution', amdaPlotObj.PlotObjectConfig.defaultValues.spectro.resolution);
+        this.set('spectro-log0-as-min', false);
+        this.set('spectro-normalization', "none");
+        // filtering 
+        this.set('filtering-activated', false);
+        this.set('filtering-level', amdaPlotObj.PlotObjectConfig.defaultValues.filtering.level);
+        this.set('right_dim', 0);
+
+        this.set(amdaPlotObj.PlotObjectConfig.bgSubstraction.name, false);
+        this.set(amdaPlotObj.PlotObjectConfig.bgSubstraction.type.key, null);
+        this.set(amdaPlotObj.PlotObjectConfig.bgSubstraction.value.key, amdaPlotObj.PlotObjectConfig.bgSubstraction.value.dimNullValue);
+        this.set(amdaPlotObj.PlotObjectConfig.bgSubstraction.value.dimkey, amdaPlotObj.PlotObjectConfig.bgSubstraction.value.dimNullValue);
+    },
+
+    getJsonValues: function () {
+        var sauvaudValues = new Object();
+
+        sauvaudValues['spectro-yaxis'] = this.get('spectro-yaxis');
+        sauvaudValues['spectro-resolution'] = this.get('spectro-resolution');
+        sauvaudValues['spectro-value-min'] = this.get('spectro-value-min');
+        sauvaudValues['spectro-value-max'] = this.get('spectro-value-max');
+        sauvaudValues['spectro-log0-as-min'] = this.get('spectro-log0-as-min');
+        sauvaudValues['spectro-normalization'] = this.get('spectro-normalization');
+        sauvaudValues['filtering-activated'] = this.get('filtering-activated');
+        sauvaudValues['filtering-level'] = this.get('filtering-level');
+         sauvaudValues['right_dim'] = this.get('right_dim');
+
+        sauvaudValues[amdaPlotObj.PlotObjectConfig.bgSubstraction.name] = this.get(amdaPlotObj.PlotObjectConfig.bgSubstraction.name);
+        sauvaudValues[amdaPlotObj.PlotObjectConfig.bgSubstraction.type.key] = this.get(amdaPlotObj.PlotObjectConfig.bgSubstraction.type.key);
+        sauvaudValues[amdaPlotObj.PlotObjectConfig.bgSubstraction.value.key] = this.get(amdaPlotObj.PlotObjectConfig.bgSubstraction.value.key);
+        sauvaudValues[amdaPlotObj.PlotObjectConfig.bgSubstraction.value.dimkey] = this.get(amdaPlotObj.PlotObjectConfig.bgSubstraction.value.dimkey);
+        return sauvaudValues;
+    }
+});
@@ -15,6 +15,7 @@ Ext.define(&#39;amdaPlotComp.PlotParamForm&#39;, {
 		'amdaPlotComp.PlotSerieForm',
 		'amdaPlotComp.PlotOrbitSerieForm',
 		'amdaPlotComp.PlotSpectroForm',
+                                        'amdaPlotComp.PlotSauvaudForm',
 		'amdaPlotComp.PlotStatusBarForm',
 		'amdaPlotComp.PlotTickBarForm',
 		'amdaPlotComp.PlotInstantSerieForm',
@@ -62,6 +63,14 @@ Ext.define(&#39;amdaPlotComp.PlotParamForm&#39;, {
 				case 'orbit-serie':
 					this.drawingOptionsFormsManager.register(new amdaPlotComp.PlotOrbitSerieForm({ id: formId }));
 					break;
+                                                                                case 'sauvaud':
+                                                                                                    if(this.object.get('type') !=2){
+                                                                                                        myDesktopApp.warningMsg('Sauvaud Plot requires <b>2D Parameter</b> ');
+                                                                                                    }else if(this.object.get('dim1-index') != '*' ||  this.object.get('dim2-index') != '*' ){
+                                                                                                        myDesktopApp.warningMsg('Sauvaud Plot requires the selection of <b>All Arguments</b> in both directions');
+                                                                                                    }
+                                                                                                    this.drawingOptionsFormsManager.register(new amdaPlotComp.PlotSauvaudForm({ id: formId }));
+					break;
 				case 'spectro':
 					this.drawingOptionsFormsManager.register(new amdaPlotComp.PlotSpectroForm({ id: formId }));
 					break;
@@ -113,7 +122,8 @@ Ext.define(&#39;amdaPlotComp.PlotParamForm&#39;, {
 	onChangeParamArgs: function (uiScope, args_key, newValue, oldValue, isTemplateArg) {
 		if ((uiScope.isFirstMsg) && (uiScope.object.get('type') == 2) && (uiScope.object.get('dim1-sum-type') == 0) && (uiScope.object.get('dim2-sum-type') == 0) &&
-			(uiScope.object.get('dim1-index') == '*') && (uiScope.object.get('dim2-index') == '*')) {
+			(uiScope.object.get('dim1-index') == '*') && (uiScope.object.get('dim2-index') == '*') &&  (uiScope.object.get('param-drawing-type') != 'sauvaud')) {
+                                                            console.log(uiScope.object);
 			uiScope.isFirstMsg = false;
 			myDesktopApp.warningMsg('If argument <i>All</i> is set for both dimensions output will be the total sum <b>(not spectra!)</b>');
 		}
@@ -0,0 +1,61 @@
+/* 
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+
+Ext.define('amdaPlotComp.PlotSauvaudForm', {
+	extend: 'amdaPlotComp.PlotSpectroForm', 
+        	requires: [
+		'amdaUI.ParamArgumentsUI'
+	],
+        setObject: function (object) {
+		this.data = object.data;
+		this.object = object.get('param-drawing-object');
+
+		this.loadRecord(this.object);
+	},
+        
+        	/**
+	 * Populate the comboBoxValue by the set of channel data related to the selected dimension
+	 * @param {*} ref  the reference of the current instance of this class
+	 * @param {*} index dimension's index
+	 * @param {*} comboBoxV  the comboBoxValue
+	 * @returns 
+	 */
+
+        
+  	addComboSauvaudDim: (ref) => {
+
+		const comboBoxDim = ref.addStandardCombo(amdaPlotObj.PlotObjectConfig.bgSubstraction.value.dimkey,
+			amdaPlotObj.PlotObjectConfig.bgSubstraction.value.dimlabel, [],
+			(name, newKey, oldKey) => {
+
+					ref.populateSauvaudComboBoxValue(ref, newKey, this);
+			});
+
+		return comboBoxDim;
+	},
+
+           getSauvaudItems(){
+                return [this.addComboSauvaudDim(this)];
+            },
+        
+        getFormItems: function () {
+             items = this.callParent();
+            const ref = this;
+           const dataStore = [
+                                              { 'key': 0, 'value': 'dim1' },
+		      { 'key': 1, 'value': 'dim2' }, 
+                                            ];
+            const dimField = this.addStandardCombo('right_dimension', 'Right Dim', dataStore , function (name, value, oldValue) {
+				if (ref.object.get('right_dim') != value) {
+					ref.object.set('right_dim', value);
+				}
+			});
+        
+           items.splice(0,0, dimField);
+            return items;
+        },
+    }); 
 \ No newline at end of file