diff --git a/js/app/models/PlotObjects/PlotBaseSerieObject.js b/js/app/models/PlotObjects/PlotBaseSerieObject.js index 932bf62..9aa2a24 100644 --- a/js/app/models/PlotObjects/PlotBaseSerieObject.js +++ b/js/app/models/PlotObjects/PlotBaseSerieObject.js @@ -22,6 +22,7 @@ Ext.define('amdaPlotObj.PlotBaseSerieObject', { fields : [ {name: 'serie-yaxis', type: 'string'}, + {name: 'serie-resolution', type: 'int'}, {name: 'serie-lines-activated', type: 'boolean'}, {name: 'serie-lines-style', type: 'string'}, {name: 'serie-lines-width', type: 'float'}, @@ -85,6 +86,7 @@ Ext.define('amdaPlotObj.PlotBaseSerieObject', { setDefaultValues: function() { this.set('serie-yaxis', amdaPlotObj.PlotObjectConfig.defaultValues.serie.yAxis); + this.set('serie-resolution', amdaPlotObj.PlotObjectConfig.defaultValues.serie.resolution); this.set('serie-lines-activated', true); this.set('serie-lines-style', amdaPlotObj.PlotObjectConfig.defaultValues.serie.lines.style); this.set('serie-lines-width', amdaPlotObj.PlotObjectConfig.defaultValues.serie.lines.width); @@ -141,6 +143,7 @@ Ext.define('amdaPlotObj.PlotBaseSerieObject', { var serieValues = new Object(); serieValues['serie-yaxis'] = this.get('serie-yaxis'); + serieValues['serie-resolution'] = this.get('serie-resolution'); serieValues['serie-lines-activated'] = this.get('serie-lines-activated'); serieValues['serie-lines-style'] = this.get('serie-lines-style'); serieValues['serie-lines-width'] = this.get('serie-lines-width'); @@ -186,4 +189,4 @@ Ext.define('amdaPlotObj.PlotBaseSerieObject', { return serieValues; } -}); \ No newline at end of file +}); diff --git a/js/app/models/PlotObjects/PlotObjectConfig.js b/js/app/models/PlotObjects/PlotObjectConfig.js index 9e312b5..403f6e4 100644 --- a/js/app/models/PlotObjects/PlotObjectConfig.js +++ b/js/app/models/PlotObjects/PlotObjectConfig.js @@ -83,6 +83,7 @@ Ext.define('amdaPlotObj.PlotObjectConfig', { }, serie : { yAxis : 'y-left', + resolution : 3000, lines : { style : 'plain', width : 1, @@ -293,7 +294,14 @@ Ext.define('amdaPlotObj.PlotObjectConfig', { availableYAxes : [ {'key' : 'y-left', 'value' : 'Left'}, {'key' : 'y-right', 'value' : 'Right'} - ], + ], + + availableResolutions : [ + {'key' : 3000, 'value' : '3000'}, + {'key' : 10000, 'value' : '10000'}, + {'key' : 50000, 'value' : '50000'}, + {'key' : 100000, 'value' : '100000'} + ], availableLinesStyles : [ {'key' : 'plain', 'value' : 'Plain'}, diff --git a/js/app/views/PlotComponents/PlotBaseSerieForm.js b/js/app/views/PlotComponents/PlotBaseSerieForm.js index 8b7ef38..8e2c8b7 100644 --- a/js/app/views/PlotComponents/PlotBaseSerieForm.js +++ b/js/app/views/PlotComponents/PlotBaseSerieForm.js @@ -86,6 +86,9 @@ Ext.define('amdaPlotComp.PlotBaseSerieForm', { var me = this; return [ + this.addStandardCombo('serie-resolution', 'Resolution', amdaPlotObj.PlotObjectConfig.availableResolutions, function(name, value, oldValue) { + me.object.set('serie-resolution', value); + }), this.addStandardCombo('serie-yaxis', 'Y axis', amdaPlotObj.PlotObjectConfig.availableYAxes, function(name, value, oldValue) { me.object.set('serie-yaxis', value); me.crtTree.refresh(); -- libgit2 0.21.2