ihm ok

Hacene SI HADJ MOHAND
1 parent be6060f0
Showing 2 changed files with 44 additions and 9 deletions Show diff stats
js/app/models/RequestParamObject.js
js/app/views/ParamArgumentsUI.js
@@ -29,12 +29,14 @@ Ext.define(&#39;amdaModel.RequestParamObject&#39;, {
             	'dim1-max-value': 0.,
             	'dim1-min-index': 0,
             	'dim1-max-index': 0,
+                    'dim1-process-type': '',
             	'dim2-index': '*',
             	'dim2-sum-type': 0,
             	'dim2-min-value': 0.,
             	'dim2-max-value': 0.,
             	'dim2-min-index': 0,
             	'dim2-max-index': 0,
+                    'dim2-process-type': '',
             	'template_args': {}
             };
           },
@@ -53,6 +55,7 @@ Ext.define(&#39;amdaModel.RequestParamObject&#39;, {
           {name: 'dim1-max-value', type: 'float', defaultValue: 0.},
           {name: 'dim1-min-index', type: 'int', defaultValue: 0},
           {name: 'dim1-max-index', type: 'int', defaultValue: 0},
+          {name: 'dim1-process-type', type: 'string', defaultValue: ''}, // process type : sum, average, median, integral, all 
           /* Fields for dim2 */
           {name: 'dim2-index', type: 'string', defaultValue: '*'},
           {name: 'dim2-sum-type', type: 'int', defaultValue: 0}, /* Sum type. 0: None, 1: sum into values range, 2: sum between indexes */
@@ -60,6 +63,7 @@ Ext.define(&#39;amdaModel.RequestParamObject&#39;, {
           {name: 'dim2-max-value', type: 'float', defaultValue: 0.},
           {name: 'dim2-min-index', type: 'int', defaultValue: 0},
           {name: 'dim2-max-index', type: 'int', defaultValue: 0},
+          {name: 'dim2-process-type', type: 'string', defaultValue: ''}, // process type : sum, average, median, integral, all 
           /* Field for arguments of a templated parameter */
           {name: 'template_args', type: 'auto', defaultValue: null},
           /* ?? */
@@ -141,17 +145,19 @@ Ext.define(&#39;amdaModel.RequestParamObject&#39;, {
 	paramValues['dim1-index'] = this.get('dim1-index');
     	paramValues['dim1-sum-type'] = this.get('dim1-sum-type');
-        paramValues['dim1-min-value'] = this.get('dim1-min-value');
-        paramValues['dim1-max-value'] = this.get('dim1-max-value');
-        paramValues['dim1-min-index'] = this.get('dim1-min-index');
-        paramValues['dim1-max-index'] = this.get('dim1-max-index');
+                    paramValues['dim1-min-value'] = this.get('dim1-min-value');
+                    paramValues['dim1-max-value'] = this.get('dim1-max-value');
+                    paramValues['dim1-min-index'] = this.get('dim1-min-index');
+                    paramValues['dim1-max-index'] = this.get('dim1-max-index');
+                    paramValues['dim1-process-type'] = this.get('dim1-process-type');
 	paramValues['dim2-index'] = this.get('dim2-index');
 	paramValues['dim2-sum-type'] = this.get('dim2-sum-type');
-        paramValues['dim2-min-value'] = this.get('dim2-min-value');
-        paramValues['dim2-max-value'] = this.get('dim2-max-value');
-        paramValues['dim2-min-index'] = this.get('dim2-min-index');
-        paramValues['dim2-max-index'] = this.get('dim2-max-index');
+                    paramValues['dim2-min-value'] = this.get('dim2-min-value');
+                    paramValues['dim2-max-value'] = this.get('dim2-max-value');
+                    paramValues['dim2-min-index'] = this.get('dim2-min-index');
+                    paramValues['dim2-max-index'] = this.get('dim2-max-index');
+                    paramValues['dim2-process-type'] = this.get('dim2-process-type');
     	paramValues['type'] = this.get('type');
 	paramValues['is-init'] = this.get('is-init');
@@ -333,6 +333,16 @@ Ext.define(&#39;amdaUI.ParamArgumentsUI&#39;, {
 		this.add(indexesCombo);
 		if (relatedTable) {
+                                                            var processTypes = Ext.create('Ext.data.Store', {
+				fields: ['type', 'name'],
+				data: [
+					{'type': 'all', 'name': 'Value in each channel'},
+					{'type': 'sum', 'name': 'Sum in range'},
+                                                                                                    {'type': 'average', 'name': 'Average in range'},
+                                                                                                    {'type': 'median', 'name': 'Median in range'},
+                                                                                                    {'type': 'integral', 'name': 'Integral flux in range'}
+				]
+			});
 			var sumTypes = Ext.create('Ext.data.Store', {
 				fields: ['type', 'name'],
 				data: [
@@ -341,7 +351,26 @@ Ext.define(&#39;amdaUI.ParamArgumentsUI&#39;, {
 				]
 			});
 			var sumItems = [
-                {
+                                 {
+			xtype: 'combobox',
+			name: 'process_type_'+relatedDim,
+			store: processTypes,
+			queryMode: 'local',
+			editable: false,
+			displayField: 'name',
+			valueField: 'type',
+			fieldLabel: 'Process Type',
+                                                            value:'Sum in range',
+			listeners: {
+				change: function(field, newValue, oldValue, eOpts) {
+					this.paramRequestObject.set(relatedDim+'-process-type',newValue);				
+					if (!this.inRebuild && (this.onChange != null))
+						this.onChange(uiScope, relatedDim, newValue, oldValue, false);
+				},
+				scope: this
+			}
+                                        },
+                                                          {
 			xtype: 'combobox',
 			name: 'sum_type_'+relatedDim,
 			store: sumTypes,