CDPP / AMDA_IHM

Commit caff798e50c54fc30786b655956169849e52ab9f

Authored by Benjamin Renard
1 parent 7f7d4c70
Exists in master and in 111 other branches 10098, 10178, 5390, 6629, 6728, 6920, 7494, 7497, 7616, 8459, 8528, 8928, 9014, 9016Bis, 9017, 9049, 9084, 9259, 9326, 9345, 9505, 9660, 9750, 9750.bck, 9800, 9980, FER_10285, FER_10400, FER_10435, FER_10557, FER_10663, FER_10765, FER_10828, FER_10828_2, FER_10829, FER_10836, FER_10852, FER_10934, FER_11100, FER_11242, FER_11478, FER_11500, FER_11537, FER_11586, FER_11588, FER_5119, FER_5165, FER_6265, FER_6860, FER_6899, FER_6951, FER_7618, FER_7862, FER_8455, FER_9629, FER_9660, FER_9915, FER_CR41, FER_CR42, FER_CR43, FER_TFCat, Histo1D2D, MAZ_10936, MAZ_11362, MAZ_11427, MAZ_6018, MAZ_9016_New, MAZ_FIX_9016, New_ColorMaps, SpeasyGet, akkodis/amdadev, alias, amdadev, amdadev_test, anr_tempete, catalog-histo, create-user, cu2022, data-activities, density_maps, develop, epn-tap, expression-parser-bre, frames-transformation, hapi, homePage, install-rework, master_vge, minimize, mlplasmas, multiplot, new-save-plot-request, openam, plot-request, plot-request-update, plot-tt-catalog, remoteData, rm_5118, rm_5776, rm_6912, rm_6912_bis, rm_7926, rm_8932, save-other-requests, save-plot, save-plot-request, shared-objects-updater, special-params, sum-components-indexes, test-merge, ws_get_catalog

Fix zoom bar for time axis (#4719)

Showing 2 changed files with 7 additions and 6 deletions   Show diff stats
Inline Side-by-side
js/app/views/PlotComponents/PlotResultImage.js
  Diff comments   View file @caff798
... ... @@ -21,10 +21,10 @@ Ext.define('amdaPlotComp.PlotResultImage', {
21 21 verticalCursor : null,
22 22 horizontalCursor : null,
23 23  
24   - firstVerticalMarker : null,
25   - secondVerticalMarker : null,
26   - firstVerticalMarker : null,
27   - secondVerticalMarker : null,
  24 + firstVerticalMarker : null,
  25 + secondVerticalMarker : null,
  26 + firstHorizontalMarker : null,
  27 + secondHorizontalMarker : null,
28 28  
29 29 showVerticalCursor : true,
30 30 showHorizontalCursor : true,
... ... @@ -223,4 +223,4 @@ Ext.define('amdaPlotComp.PlotResultImage', {
223 223  
224 224 Ext.apply (this , Ext.apply (arguments, myConf));
225 225 }
226   -});
227 226 \ No newline at end of file
  227 +});
... ...
js/app/views/PlotTabResultUI.js
  Diff comments   View file @caff798
... ... @@ -75,6 +75,7 @@ Ext.define('amdaUI.PlotTabResultUI', {
75 75 return;
76 76  
77 77 var panelContext = amdaPlotComp.PlotContextManager.getPanelById(this.crtContext, panelId);
  78 + var size = this.getImageSize();
78 79  
79 80 var me = this;
80 81 Ext.each(panelContext.plotArea.axes, function (axis) {
... ... @@ -147,7 +148,7 @@ Ext.define('amdaUI.PlotTabResultUI', {
147 148 handler : function(item, e) {
148 149 zoomPlugin.show(me.tabId, axis.id, panelContext.id);
149 150 zoomPlugin.resetMinMaxValue();
150   - me.panelImage.startZoom(true, me.toPixelOnResultImage(panelContext.y), me.toPixelOnResultImage(panelContext.height), onMinTimeSelection, onMaxTimeSelection);
  151 + me.panelImage.startZoom(true, 0/*me.toPixelOnResultImage(panelContext.y)*/, size.height /*me.toPixelOnResultImage(panelContext.height)*/, onMinTimeSelection, onMaxTimeSelection);
151 152 },
152 153 scope: this
153 154 });
... ...