Commit 1ded5739369082856d2957117ebf093b29aee41a

Authored by Menouard AZIB
Committed by Benjamin Renard
1 parent da1cb3af

Prise en des mls dans les starts et stops times dans le plotfunction, activer la DFT.

js/app/views/PlotComponents/PlotZoomPlug.js
... ... @@ -460,9 +460,6 @@ Ext.define('amdaPlotComp.PlotZoomPlug', {
460 460 }
461 461  
462 462 if (me.isPlotFunction) {
463   - const start_time = this.form.getForm().findField('zoom-min-time').getValue();
464   - const stop_time = this.form.getForm().findField('zoom-max-time').getValue();
465   -
466 463 let request_to_send = {};
467 464  
468 465 if (!me.plotFunctionType || !me.plotFunctionType.parent) {
... ... @@ -476,8 +473,8 @@ Ext.define('amdaPlotComp.PlotZoomPlug', {
476 473 'action': 'plotFunction',
477 474 'interactiveId': this.interactiveId,
478 475 'panelId': this.panelId,
479   - 'starttime': start_time,
480   - 'stoptime': stop_time
  476 + 'starttime': minZoom,
  477 + 'stoptime': maxZoom
481 478 });
482 479  
483 480 this.hostCmp.callInteractivePlot(request_to_send);
... ...
js/app/views/PlotComponents/plotFunction/FunctionType.js
... ... @@ -18,8 +18,8 @@ Ext.define('amdaPlotComp.plotFunction.FunctionType', {
18 18 avg: "AVG"
19 19 },
20 20 labels: {
21   - fft: "DSP: FFT",
22   - dft: "DSP: DFT",
  21 + fft: "PSD: FFT",
  22 + dft: "PSD: DFT",
23 23 sum: "SUM",
24 24 avg: "AVG"
25 25 }
... ... @@ -61,7 +61,7 @@ Ext.define('amdaPlotComp.plotFunction.FunctionType', {
61 61 item_type[key_] = this.plotFunctionItems.type.values.dft;
62 62 item_type[name_] = this.plotFunctionItems.type.labels.dft;
63 63 // Disbale DFT momentarily
64   - //data_function_type.push(item_type);
  64 + data_function_type.push(item_type);
65 65  
66 66 item_type = {};
67 67 item_type[key_] = this.plotFunctionItems.type.values.sum;
... ...