diff --git a/js/app/models/PlotObjects/PlotLayoutAutoObject.js b/js/app/models/PlotObjects/PlotLayoutAutoObject.js index 709231a..38ed710 100644 --- a/js/app/models/PlotObjects/PlotLayoutAutoObject.js +++ b/js/app/models/PlotObjects/PlotLayoutAutoObject.js @@ -23,7 +23,8 @@ Ext.define('amdaPlotObj.PlotLayoutAutoObject', { fields : [ {name: 'layout-panel-height', type: 'float', defaultValue: amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.panelHeight}, {name: 'layout-panel-spacing', type: 'float', defaultValue: amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.panelSpacing}, - {name: 'layout-expand', type: 'boolean', defaultValue: amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.expand} + {name: 'layout-expand', type: 'boolean', defaultValue: amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.expand}, + {name: 'layout-timeaxes-legend-lowerone', type: 'boolean', defaultValue: amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.timeAxesLegend} ], getJsonValues : function() @@ -33,7 +34,8 @@ Ext.define('amdaPlotObj.PlotLayoutAutoObject', { layoutValues['layout-panel-height'] = this.get('layout-panel-height'); layoutValues['layout-panel-spacing'] = this.get('layout-panel-spacing'); layoutValues['layout-expand'] = this.get('layout-expand'); + layoutValues['layout-timeaxes-legend-lowerone'] = this.get('layout-timeaxes-legend-lowerone'); return layoutValues; } -}); \ No newline at end of file +}); diff --git a/js/app/models/PlotObjects/PlotLayoutVerticalObject.js b/js/app/models/PlotObjects/PlotLayoutVerticalObject.js index 3f36e65..5c07b58 100644 --- a/js/app/models/PlotObjects/PlotLayoutVerticalObject.js +++ b/js/app/models/PlotObjects/PlotLayoutVerticalObject.js @@ -24,6 +24,7 @@ Ext.define('amdaPlotObj.PlotLayoutVerticalObject', { {name: 'layout-panel-height', type: 'float', defaultValue: amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.panelHeight}, {name: 'layout-panel-spacing', type: 'float', defaultValue: amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.panelSpacing}, {name: 'layout-expand', type: 'boolean', defaultValue: amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.expand}, + {name: 'layout-timeaxes-legend-lowerone', type: 'boolean', defaultValue: amdaPlotObj.PlotObjectConfig.defaultValues.page.layout.timeAxesLegend}, //{name: 'layout-timeplot-width', type: 'float', useNull:true}, {name: 'layout-timeplot-height', type: 'float', useNull:true}, {name: 'layout-xyplot-width', type: 'float', useNull:true}, @@ -37,6 +38,7 @@ Ext.define('amdaPlotObj.PlotLayoutVerticalObject', { layoutValues['layout-panel-height'] = this.get('layout-panel-height'); layoutValues['layout-panel-spacing'] = this.get('layout-panel-spacing'); layoutValues['layout-expand'] = this.get('layout-expand'); + layoutValues['layout-timeaxes-legend-lowerone'] = this.get('layout-timeaxes-legend-lowerone'); //layoutValues['layout-timeplot-width'] = this.get('layout-timeplot-width') ? this.get('layout-timeplot-width') : -1; layoutValues['layout-timeplot-height'] = this.get('layout-timeplot-height') ? this.get('layout-timeplot-height') : -1; layoutValues['layout-xyplot-width'] = this.get('layout-xyplot-width') ? this.get('layout-xyplot-width') : -1; @@ -44,4 +46,4 @@ Ext.define('amdaPlotObj.PlotLayoutVerticalObject', { return layoutValues; } -}); \ No newline at end of file +}); diff --git a/js/app/views/PlotComponents/PlotLayoutAutoForm.js b/js/app/views/PlotComponents/PlotLayoutAutoForm.js index f1520d8..3a04f6f 100644 --- a/js/app/views/PlotComponents/PlotLayoutAutoForm.js +++ b/js/app/views/PlotComponents/PlotLayoutAutoForm.js @@ -17,10 +17,15 @@ Ext.define('amdaPlotComp.PlotLayoutAutoForm', { }, getFormItems: function() { + var legendTimeAxesVisibilityItems = [ + this.addStandardCheck('layout-timeaxes-legend-lowerone', 'Only for the lower one') + ]; + return [ this.addStandardFloat('layout-panel-height', 'Panels height', 0, 1), this.addStandardFloat('layout-panel-spacing', 'Panels spacing', 0, 1), - this.addStandardCheck('layout-expand', 'Expand panels') + this.addStandardCheck('layout-expand', 'Expand panels'), + this.addStandardFieldSet('Legend visibility for time axes', '', legendTimeAxesVisibilityItems) ]; } -}); \ No newline at end of file +}); diff --git a/js/app/views/PlotComponents/PlotLayoutVerticalForm.js b/js/app/views/PlotComponents/PlotLayoutVerticalForm.js index 553180f..a3b78c2 100644 --- a/js/app/views/PlotComponents/PlotLayoutVerticalForm.js +++ b/js/app/views/PlotComponents/PlotLayoutVerticalForm.js @@ -26,13 +26,18 @@ Ext.define('amdaPlotComp.PlotLayoutVerticalForm', { this.addStandardFloat('layout-xyplot-width', 'Panels width', 0, 1, true), this.addStandardFloat('layout-xyplot-height', 'Panels height', 0, 1, true) ]; + + var legendTimeAxesVisibilityItems = [ + this.addStandardCheck('layout-timeaxes-legend-lowerone', 'Only for the lower one') + ]; return [ this.addStandardFloat('layout-panel-height', 'General Panels height', 0, 1), this.addStandardFloat('layout-panel-spacing', 'Panels spacing', 0, 1), this.addStandardCheck('layout-expand', 'Expand panels'), + this.addStandardFieldSet('Legend visibility for time axes', '', legendTimeAxesVisibilityItems), this.addStandardFieldSet('Time / Epoch Panels Dimensions', '', timePlotDimItems), this.addStandardFieldSet('Scatter / Instant Panels Dimensions', '', xyPlotDimItems) ]; } -}); \ No newline at end of file +}); -- libgit2 0.21.2