ihn normalization ok

Hacene SI HADJ MOHAND
1 parent bb30f90e
Showing 3 changed files with 19 additions and 6 deletions Show diff stats
js/app/models/PlotObjects/PlotObjectConfig.js
js/app/models/PlotObjects/PlotSpectroObject.js
js/app/views/PlotComponents/PlotSpectroForm.js
@@ -473,6 +473,11 @@ Ext.define(&#39;amdaPlotObj.PlotObjectConfig&#39;, {
 	               {'key' : 'serie-constant', 'value' : 'Serie / Constant'},
 	               {'key' : 'serie-serie', 'value' : 'Serie / Serie'}    
 	],
+       availableSpectroNormalization : [
+                                    {'key' : 'none', 'value' : 'None'},
+	               {'key' : 'linear', 'value' : 'linear'},
+	               {'key' : 'logarithmic', 'value' : 'log'}    
+	],
 	getParamConfig : function(paramId, onParamConfigLoaded) {
 		AmdaAction.getParamPlotInit({"paramId" : paramId}, function (result, e) {
@@ -22,10 +22,11 @@ Ext.define(&#39;amdaPlotObj.PlotSpectroObject&#39;, {
 	fields : [
 	          {name: 'spectro-yaxis', type: 'string'},
-                  {name: 'spectro-resolution', type: 'int'},
+                              {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-log0-as-min', type: 'boolean'},
+                              {name: 'spectro-normalization', type: 'string'}
 	],
     constructor: function(){
@@ -55,7 +56,8 @@ Ext.define(&#39;amdaPlotObj.PlotSpectroObject&#39;, {
     {
     	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-log0-as-min', false);
+                    this.set('spectro-normalization', "none");
     },
     getJsonValues : function() 
@@ -66,8 +68,8 @@ Ext.define(&#39;amdaPlotObj.PlotSpectroObject&#39;, {
 	spectroValues['spectro-resolution'] = this.get('spectro-resolution');
     	spectroValues['spectro-value-min'] = this.get('spectro-value-min');
     	spectroValues['spectro-value-max'] = this.get('spectro-value-max');
-        spectroValues['spectro-log0-as-min'] = this.get('spectro-log0-as-min');
-    	
+                    spectroValues['spectro-log0-as-min'] = this.get('spectro-log0-as-min');	
+                    spectroValues['spectro-normalization'] = this.get('spectro-normalization');
     	return spectroValues;
     }
 });
@@ -37,7 +37,13 @@ Ext.define(&#39;amdaPlotComp.PlotSpectroForm&#39;, {
 			this.addStandardFieldSet('Min/Max thresholds', '', this.getValuesRangeItems()),
 			this.addStandardCheck('spectro-log0-as-min', 'Show 0 values as Min Values in log scale', function(name, value, oldValue) {
 				me.object.set('spectro-log0-as-min', value);
-			})
+			}),
+                                                            this.addStandardCombo('spectro-normalization', 'Normalization', amdaPlotObj.PlotObjectConfig.availableSpectroNormalization, function(name, value, oldValue) {
+		    	if (me.object.get('spectro-normalization') != value)
+		    	{
+		    		me.object.set('spectro-normalization', value);
+		    	}
+                                                            })
 		];
 	}
 });