All refactored cmpts works well

Menouar AZIB
1 parent 7587a677
Showing 6 changed files with 46 additions and 15 deletions Show diff stats
js/app/views/PlotComponents/PlotZoomPlug.js
js/app/views/PlotComponents/intervalSelection/DateZoomIntervalSelection.js
js/app/views/PlotComponents/intervalSelection/IntervalSelection.js
js/app/views/PlotComponents/intervalSelection/NumberZoomIntervalSelection.js
js/app/views/PlotComponents/intervalSelection/PlotFunctionIntervalSelection.js
js/app/views/PlotComponents/intervalSelection/ZoomIntervalSelection.js
@@ -17,8 +17,7 @@
 Ext.define('amdaPlotComp.PlotZoomPlug', {
   extend: 'Ext.util.Observable',
   alias: 'plugin.plotZoomPlugin',
-  requires: ['amdaPlotComp.intervalSelection.IntervalSelection',
-    'amdaPlotComp.plotFunction.ParamField', 'amdaPlotComp.plotFunction.FunctionType', 'amdaPlotComp.plotFunction.CreatePlot'],
+  requires: ['amdaPlotComp.intervalSelection.IntervalSelection', 'amdaPlotComp.plotFunction.FunctionType'],
  
   //id: 'plot-zoom-plug',
  
@@ -95,7 +94,7 @@ Ext.define(&#39;amdaPlotComp.PlotZoomPlug&#39;, {
     this.zoomType = zoomType;
     this.panelId = panelId;
     this.interactiveId = interactiveId;
-  
+
     let config = {
       id: 'plot-zoom-win-' + this.hostCmp.ownerCt.getId(), // Plot window ID
       interactiveId: interactiveId,
@@ -131,15 +130,19 @@ Ext.define(&#39;amdaPlotComp.PlotZoomPlug&#39;, {
         break;
       case 'y-left':
       case 'y-right':
+      case 'xaxis_id':
         winType = 'amdaPlotComp.intervalSelection.NumberZoomIntervalSelection';
-        const title = this.zoomType === 'y-left' ? 'Zoom on Y Left axis' : 'Zoom on Y Right axis';
+        let title = "";
+        if (this.zoomType === 'y-left') {
+          title = 'Zoom on Y Left axis';
+        } else if (this.zoomType === 'y-right') {
+          title = 'Zoom on Y Right axis';
+        } else {
+          title = 'Zoom on X axis';
+        }
         config["type"] = this.zoomType;
         config["title"] = title;
         break;
-      case 'xaxis_id':
-        winType = 'amdaPlotComp.intervalSelection.NumberZoomIntervalSelection';
-        title = 'Zoom on X axis';
-        break;
       case 'plotFunction':
         winType = 'amdaPlotComp.intervalSelection.PlotFunctionIntervalSelection';
         break;
@@ -8,7 +8,7 @@ Ext.define(&#39;amdaPlotComp.intervalSelection.DateZoomIntervalSelection&#39;, {
  
     initComponent: function () {
         this.callParent(arguments);
-        this.insertToTTCatlog = new amdaPlotComp.intervalSelection.InsertToTTCatlog({parent: this});
+        this.insertToTTCatlog = new amdaPlotComp.intervalSelection.InsertToTTCatlog({ parent: this });
         this.parent.add(this.insertToTTCatlog);
     },
  
-
-
 // Define a constant for the layout style of the form
 const LAYOUT_STYLE = {
     type: 'vbox', // vertical box layout
@@ -7,6 +5,7 @@ const LAYOUT_STYLE = {
     align: 'stretch' // each child item is stretched to fill the width of the container
 };
  
+// Width of button
 const width = 100;
  
 // Define the parent class
@@ -39,6 +38,7 @@ Ext.define(&#39;amdaPlotComp.intervalSelection.IntervalSelection&#39;, {
     // These will be used to reference the fields later in the code
     FIELD1_ITEM_ID: 'field1',
     FIELD2_ITEM_ID: 'field2',
+    buttonUseTime: 'button-use-time',
  
     initComponent: function () {
         const me = this; // Reference to this instance for use in event handlers
@@ -88,19 +88,22 @@ Ext.define(&#39;amdaPlotComp.intervalSelection.IntervalSelection&#39;, {
                     handler: function () {
                         me._getField1().reset();
                         me._getField2().reset();
+                        me._resetHostCmpSelection();
                     }
-                }, {
+                },
+                {
                     xtype: 'button',
                     text: 'Use in Time Selection',
+                    itemId: this.buttonUseTime,
                     handler: function () {
-                        alert('Button 2 clicked');
+                        me._setTimeInterval();
                     }
                 }]
             }],
             fbar: [
                 {
                     xtype: 'button',
-                    width: 100,
+                    width: width,
                     text: this.buttonApply,
                     handler: function () {
                         me._apply();
@@ -117,6 +120,9 @@ Ext.define(&#39;amdaPlotComp.intervalSelection.IntervalSelection&#39;, {
         this.callParent(arguments);
     },
  
+    _resetHostCmpSelection: function () {
+        this.hostCmp.panelImage.resetZoom();
+    },
  
     _apply: function () { },
  
@@ -146,5 +152,19 @@ Ext.define(&#39;amdaPlotComp.intervalSelection.IntervalSelection&#39;, {
  
     setField2Value: function (value) {
         this._getField2().setValue(value);
+    },
+
+    _setTimeInterval: function () {
+        const timeObj = new Object();
+        timeObj.start = this.getField1Value();
+        timeObj.stop = this.getField2Value();
+        timeObj.interactiveId = this.interactiveId;
+        const plotModule = myDesktopApp.getLoadedModule(myDesktopApp.dynamicModules.plot.id);
+        plotModule.setTimeInterval(timeObj);
+    },
+
+    _removeUseTimeButton: function () {
+        const buttonToHide = this.parent.down('#' + this.buttonUseTime);
+        buttonToHide.hide();
     }
 });
@@ -9,5 +9,8 @@ Ext.define(&#39;amdaPlotComp.intervalSelection.NumberZoomIntervalSelection&#39;, {
     field2Format: null,
  
     type: null,
-
+    initComponent: function () {
+        this.callParent(arguments);
+        this._removeUseTimeButton();
+    }
 });
@@ -26,6 +26,7 @@ Ext.define(&#39;amdaPlotComp.intervalSelection.PlotFunctionIntervalSelection&#39;, {
             });
  
             this.hostCmp.callInteractivePlot(request_to_send);
+            this._resetHostCmpSelection();
         }
     },
  
@@ -29,6 +29,8 @@ Ext.define(&#39;amdaPlotComp.intervalSelection.ZoomIntervalSelection&#39;, {
                 'min': this.getField1Value(),
                 'max': this.getField2Value()
             });
+
+            this._resetHostCmpSelection();
         }
     },
  
@@ -39,6 +41,8 @@ Ext.define(&#39;amdaPlotComp.intervalSelection.ZoomIntervalSelection&#39;, {
             'panelId': this.panelId,
             'axeId': this.type
         });
+
+        this._resetHostCmpSelection();
     }
  
 });