Interactive histo 1D: set X min/max in relation with the context

Benjamin Renard
1 parent c855ad54
Showing 5 changed files with 25 additions and 10 deletions Show diff stats
js/app/views/PlotComponents/PlotZoomPlug.js
js/app/views/PlotComponents/intervalSelection/PlotFunctionIntervalSelection.js
js/app/views/PlotComponents/plotFunction/FunctionType.js
js/app/views/PlotComponents/plotFunction/Histogram.js
js/app/views/PlotTabResultUI.js
@@ -57,11 +57,12 @@ Ext.define(&#39;amdaPlotComp.PlotZoomPlug&#39;, {
   /**
    * Function to create and show a window with specific configuration
    */
-  show: function (interactiveId, zoomType, panelId) {
+  show: function (interactiveId, zoomType, panelId, panelContext) {
     let config = {
       id: 'plot-zoom-win-' + this.hostCmp.ownerCt.getId(),
       interactiveId: interactiveId,
       panelId: panelId,
+      panelContext: panelContext,
       hostCmp: this.hostCmp,
       renderTo: this.hostCmp.ownerCt.body,
       listeners: {
@@ -11,7 +11,10 @@ Ext.define(&#39;amdaPlotComp.intervalSelection.PlotFunctionIntervalSelection&#39;, {
      */
     initComponent: function () {
         this.callParent(arguments);
-        this.plotFunctionType = new amdaPlotComp.plotFunction.FunctionType();
+        this.plotFunctionType = Ext.create('amdaPlotComp.plotFunction.FunctionType', {
+            panelContext: this.panelContext
+        });
+
         this.form.add(this.plotFunctionType);
     },
@@ -97,7 +97,16 @@ Ext.define(&#39;amdaPlotComp.plotFunction.FunctionType&#39;, {
                 this.currentModule = Ext.create('amdaPlotComp.plotFunction.FFTCmpt', { title: "DFT Arguments" });
                 break;
             case this.functionOptions.hist.value:
-                this.currentModule = Ext.create('amdaPlotComp.plotFunction.Histogram');
+                var histoConfig = {};
+                if (this.panelContext && this.panelContext.plotArea.axes) {
+                    Ext.Array.each(this.panelContext.plotArea.axes, function(axis) {
+                        if (axis['id'] == 'y-left') {
+                            histoConfig['xmin'] = axis['min'];
+                            histoConfig['xmax'] = axis['max'];
+                        }
+                    });
+                }
+                this.currentModule = Ext.create('amdaPlotComp.plotFunction.Histogram', histoConfig);
                 break;
             default:
                 break;
@@ -14,7 +14,7 @@ Ext.define(&#39;amdaPlotComp.plotFunction.Histogram&#39;, {
      */
     initComponent: function () {
         const self = this;
-
+        
         // Define combo box store
         const comboStore = Ext.create('Ext.data.Store', {
             fields: ['label', 'value'],
@@ -46,6 +46,7 @@ Ext.define(&#39;amdaPlotComp.plotFunction.Histogram&#39;, {
                     allowDecimals: true,
                     hideTrigger: true,
                     keyNavEnabled: false,
+                    value: self.xmin,
                 },
                 {
                     xtype: 'numberfield',
@@ -54,6 +55,7 @@ Ext.define(&#39;amdaPlotComp.plotFunction.Histogram&#39;, {
                     allowDecimals: true,
                     hideTrigger: true,
                     keyNavEnabled: false,
+                    value: self.xmax,
                 },
                 {
                     xtype: 'numberfield',
@@ -153,7 +153,7 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
 					me.contextualMenu.add({
 						text: 'Zoom on Time Axis',
 						handler: function (item, e) {
-							zoomPlugin.show(me.interactiveId, axis.id, panelContext.id);
+							zoomPlugin.show(me.interactiveId, axis.id, panelContext.id, panelContext);
 							zoomPlugin.resetMinMaxValue();
 							me.panelImage.startZoom(true, 0/*me.toPixelOnResultImage(panelContext.y)*/, size.height /*me.toPixelOnResultImage(panelContext.height)*/, onMinTimeSelection, onMaxTimeSelection);
 						},
@@ -163,7 +163,7 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
 					plotFunctionItem = {
 						text: 'Apply a Function on Interval',
 						handler: function (item, e) {
-							zoomPlugin.show(me.interactiveId, "plotFunction", panelContext.id);
+							zoomPlugin.show(me.interactiveId, "plotFunction", panelContext.id, panelContext);
 							zoomPlugin.resetMinMaxValue();
 							me.panelImage.startZoom(true, 0, size.height, onMinTimeSelection, onMaxTimeSelection);
 						},
@@ -172,7 +172,7 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
 					insertIntervalItem = {
 						text: 'Insert Interval in TimeTable or Catalog',
 						handler: function (item, e) {
-							zoomPlugin.show(me.interactiveId, axis.id, panelContext.id);
+							zoomPlugin.show(me.interactiveId, axis.id, panelContext.id, panelContext);
 							zoomPlugin.resetMinMaxValue();
 							me.panelImage.startZoom(true, 0/*me.toPixelOnResultImage(panelContext.y)*/, size.height /*me.toPixelOnResultImage(panelContext.height)*/, onMinTimeSelection, onMaxTimeSelection);
 						},
@@ -183,7 +183,7 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
 					me.contextualMenu.add({
 						text: 'Zoom on Y Left Axis',
 						handler: function (item, e) {
-							zoomPlugin.show(me.interactiveId, axis.id, panelContext.id);
+							zoomPlugin.show(me.interactiveId, axis.id, panelContext.id, panelContext);
 							zoomPlugin.resetMinMaxValue();
 							me.panelImage.startZoom(false, me.toPixelOnResultImage(panelContext.x), me.toPixelOnResultImage(panelContext.width), onMinYValueSelection, onMaxYValueSelection);
 						}
@@ -193,7 +193,7 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
 					me.contextualMenu.add({
 						text: 'Zoom on Y Right Axis',
 						handler: function (item, e) {
-							zoomPlugin.show(me.interactiveId, axis.id, panelContext.id);
+							zoomPlugin.show(me.interactiveId, axis.id, panelContext.id, panelContext);
 							zoomPlugin.resetMinMaxValue();
 							me.panelImage.startZoom(false, me.toPixelOnResultImage(panelContext.x), me.toPixelOnResultImage(panelContext.width), onMinYValueSelection, onMaxYValueSelection);
 						}
@@ -203,7 +203,7 @@ Ext.define(&#39;amdaUI.PlotTabResultUI&#39;, {
 					me.contextualMenu.add({
 						text: 'Zoom on X Axis',
 						handler: function (item, e) {
-							zoomPlugin.show(me.interactiveId, axis.id, panelContext.id);
+							zoomPlugin.show(me.interactiveId, axis.id, panelContext.id, panelContext);
 							zoomPlugin.resetMinMaxValue();
 							me.panelImage.startZoom(true, me.toPixelOnResultImage(panelContext.y), me.toPixelOnResultImage(panelContext.height), onMinXValueSelection, onMaxXValueSelection);
 						}