CDPP / AMDA_IHM

Commit 29f02ab88c785a58eebe5ad7d999b226ab4fd082

Authored by Benjamin Renard
1 parent 06ae16cb
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

Add layout property to draw time axes only for the lower time plot (#5493)

Showing 4 changed files with 20 additions and 6 deletions   Show diff stats
Inline Side-by-side
js/app/models/PlotObjects/PlotLayoutAutoObject.js
  Diff comments   View file @29f02ab
... ... @@ -23,7 +23,8 @@ Ext.define('amdaPlotObj.PlotLayoutAutoObject', {
23 23 fields : [
24 24 {name: 'layout-panel-height', type: 'float', defaultValue: amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.panelHeight},
25 25 {name: 'layout-panel-spacing', type: 'float', defaultValue: amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.panelSpacing},
26   - {name: 'layout-expand', type: 'boolean', defaultValue: amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.expand}
  26 + {name: 'layout-expand', type: 'boolean', defaultValue: amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.expand},
  27 + {name: 'layout-timeaxes-legend-lowerone', type: 'boolean', defaultValue: amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.timeAxesLegend}
27 28 ],
28 29  
29 30 getJsonValues : function()
... ... @@ -33,7 +34,8 @@ Ext.define('amdaPlotObj.PlotLayoutAutoObject', {
33 34 layoutValues['layout-panel-height'] = this.get('layout-panel-height');
34 35 layoutValues['layout-panel-spacing'] = this.get('layout-panel-spacing');
35 36 layoutValues['layout-expand'] = this.get('layout-expand');
  37 + layoutValues['layout-timeaxes-legend-lowerone'] = this.get('layout-timeaxes-legend-lowerone');
36 38  
37 39 return layoutValues;
38 40 }
39   -});
40 41 \ No newline at end of file
  42 +});
... ...
js/app/models/PlotObjects/PlotLayoutVerticalObject.js
  Diff comments   View file @29f02ab
... ... @@ -24,6 +24,7 @@ Ext.define('amdaPlotObj.PlotLayoutVerticalObject', {
24 24 {name: 'layout-panel-height', type: 'float', defaultValue: amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.panelHeight},
25 25 {name: 'layout-panel-spacing', type: 'float', defaultValue: amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.panelSpacing},
26 26 {name: 'layout-expand', type: 'boolean', defaultValue: amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.expand},
  27 + {name: 'layout-timeaxes-legend-lowerone', type: 'boolean', defaultValue: amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.timeAxesLegend},
27 28 //{name: 'layout-timeplot-width', type: 'float', useNull:true},
28 29 {name: 'layout-timeplot-height', type: 'float', useNull:true},
29 30 {name: 'layout-xyplot-width', type: 'float', useNull:true},
... ... @@ -37,6 +38,7 @@ Ext.define('amdaPlotObj.PlotLayoutVerticalObject', {
37 38 layoutValues['layout-panel-height'] = this.get('layout-panel-height');
38 39 layoutValues['layout-panel-spacing'] = this.get('layout-panel-spacing');
39 40 layoutValues['layout-expand'] = this.get('layout-expand');
  41 + layoutValues['layout-timeaxes-legend-lowerone'] = this.get('layout-timeaxes-legend-lowerone');
40 42 //layoutValues['layout-timeplot-width'] = this.get('layout-timeplot-width') ? this.get('layout-timeplot-width') : -1;
41 43 layoutValues['layout-timeplot-height'] = this.get('layout-timeplot-height') ? this.get('layout-timeplot-height') : -1;
42 44 layoutValues['layout-xyplot-width'] = this.get('layout-xyplot-width') ? this.get('layout-xyplot-width') : -1;
... ... @@ -44,4 +46,4 @@ Ext.define('amdaPlotObj.PlotLayoutVerticalObject', {
44 46  
45 47 return layoutValues;
46 48 }
47   -});
48 49 \ No newline at end of file
  50 +});
... ...
js/app/views/PlotComponents/PlotLayoutAutoForm.js
  Diff comments   View file @29f02ab
... ... @@ -17,10 +17,15 @@ Ext.define('amdaPlotComp.PlotLayoutAutoForm', {
17 17 },
18 18  
19 19 getFormItems: function() {
  20 + var legendTimeAxesVisibilityItems = [
  21 + this.addStandardCheck('layout-timeaxes-legend-lowerone', 'Only for the lower one')
  22 + ];
  23 +
20 24 return [
21 25 this.addStandardFloat('layout-panel-height', 'Panels height', 0, 1),
22 26 this.addStandardFloat('layout-panel-spacing', 'Panels spacing', 0, 1),
23   - this.addStandardCheck('layout-expand', 'Expand panels')
  27 + this.addStandardCheck('layout-expand', 'Expand panels'),
  28 + this.addStandardFieldSet('Legend visibility for time axes', '', legendTimeAxesVisibilityItems)
24 29 ];
25 30 }
26   -});
27 31 \ No newline at end of file
  32 +});
... ...
js/app/views/PlotComponents/PlotLayoutVerticalForm.js
  Diff comments   View file @29f02ab
... ... @@ -26,13 +26,18 @@ Ext.define('amdaPlotComp.PlotLayoutVerticalForm', {
26 26 this.addStandardFloat('layout-xyplot-width', 'Panels width', 0, 1, true),
27 27 this.addStandardFloat('layout-xyplot-height', 'Panels height', 0, 1, true)
28 28 ];
  29 +
  30 + var legendTimeAxesVisibilityItems = [
  31 + this.addStandardCheck('layout-timeaxes-legend-lowerone', 'Only for the lower one')
  32 + ];
29 33  
30 34 return [
31 35 this.addStandardFloat('layout-panel-height', 'General Panels height', 0, 1),
32 36 this.addStandardFloat('layout-panel-spacing', 'Panels spacing', 0, 1),
33 37 this.addStandardCheck('layout-expand', 'Expand panels'),
  38 + this.addStandardFieldSet('Legend visibility for time axes', '', legendTimeAxesVisibilityItems),
34 39 this.addStandardFieldSet('Time / Epoch Panels Dimensions', '', timePlotDimItems),
35 40 this.addStandardFieldSet('Scatter / Instant Panels Dimensions', '', xyPlotDimItems)
36 41 ];
37 42 }
38   -});
39 43 \ No newline at end of file
  44 +});
... ...