La feature 'PlotFunction' est bien implementée au niveau de l'IHM

Menouar AZIB
1 parent a53fe520
Showing 2 changed files with 28 additions and 14 deletions Show diff stats
js/app/views/PlotComponents/PlotZoomPlug.js
js/app/views/PlotComponents/plotFunction/ParamField.js
@@ -86,13 +86,13 @@ Ext.define(&#39;amdaPlotComp.PlotZoomPlug&#39;, {
       if (minValue <= max) {
         this.form.getForm().findField('zoom-max-time').setValue(max);
         if (this.isPlotFunction)
-          this.plotFunctionParamField.setNbPoints(this.form.getForm(), minValue, max);
+          this.plotFunctionParamField.setValues(minValue, max);
       }
       else {
         this.form.getForm().findField('zoom-min-time').setValue(max);
         this.form.getForm().findField('zoom-max-time').setValue(minValue);
         if (this.isPlotFunction)
-          this.plotFunctionParamField.setNbPoints(this.form.getForm(), max, minValue);
+          this.plotFunctionParamField.setValues(max, minValue);
       }
  
     }
@@ -455,14 +455,20 @@ Ext.define(&#39;amdaPlotComp.PlotZoomPlug&#39;, {
               return;
             }
  
-            this.hostCmp.callInteractivePlot({
-              'action': 'zoom',
-              'interactiveId': this.interactiveId,
-              'panelId': this.panelId,
-              'axeId': this.zoomType,
-              'min': minZoom,
-              'max': maxZoom
-            });
+            if (me.isPlotFunction) {
+              console.log(me.plotFunctionType.getValues());
+              console.log(me.plotFunctionParamField.getValues());
+            } else {
+              this.hostCmp.callInteractivePlot({
+                'action': 'zoom',
+                'interactiveId': this.interactiveId,
+                'panelId': this.panelId,
+                'axeId': this.zoomType,
+                'min': minZoom,
+                'max': maxZoom
+              });
+            }
+
             this.hostCmp.panelImage.resetZoom();
           }
         },
@@ -484,6 +490,7 @@ Ext.define(&#39;amdaPlotComp.PlotZoomPlug&#39;, {
     });
  
     this.plotFunctionType.setParent(this.form.getForm());
+    this.plotFunctionParamField.setParent(this.form.getForm());
     return this.form;
   },
  
@@ -5,6 +5,7 @@ Ext.define(&#39;amdaPlotComp.plotFunction.ParamField&#39;, {
     extend: 'Ext.form.Panel',
     label_number_field: "NUMBERFIELD",
     label_number_field1: "NUMBERFIELD1",
+    parent: null,
  
     initComponent: function () {
         const items_params = [];
@@ -69,22 +70,28 @@ Ext.define(&#39;amdaPlotComp.plotFunction.ParamField&#39;, {
         this.callParent(arguments);
     },
  
-    getNbPoints: function (parentForm) {
+    setParent: function (parent_) {
+        this.parent = parent_;
+    },
+
+    getValues: function () {
         const list = [];
         for (p in this.params) {
             let param = this.params[p];
-            const ui_item = parentForm.findField(this.label_number_field1 + param.id);
+            const ui_item = this.parent.findField(this.label_number_field1 + param.id);
             if (ui_item !== undefined && ui_item !== null) {
                 param["nb_points"] = ui_item.getValue();
+                list.push(param);
             }
         }
+        return { "param_nb_points": list };
     },
  
-    setNbPoints: function (parentForm, startTime, stopTime) {
+    setValues: function (startTime, stopTime) {
         for (p in this.params) {
             let param = this.params[p];
             const nb_points = (stopTime - startTime) / param.MinSampling;
-            const ui_item = parentForm.findField(this.label_number_field1 + param.id);
+            const ui_item = this.parent.findField(this.label_number_field1 + param.id);
             ui_item.setValue(parseInt(nb_points));
         }
     }