diff --git a/js/app/models/PlotObjects/PlotAxisObject.js b/js/app/models/PlotObjects/PlotAxisObject.js index 39d14c1..b5572f4 100644 --- a/js/app/models/PlotObjects/PlotAxisObject.js +++ b/js/app/models/PlotObjects/PlotAxisObject.js @@ -36,6 +36,10 @@ Ext.define('amdaPlotObj.PlotAxisObject', { {name: 'axis-tick-position', type: 'string'}, {name: 'axis-grid-minor', type: 'boolean'}, {name: 'axis-grid-major', type: 'boolean'}, + {name:'axis-grid-minor-number',type:'int'}, + {name:'axis-grid-major-number',type:'int'}, + {name:'axis-grid-major-space',type:'float'}, + {name:'axis-grid-minor-space',type:'float'}, {name: 'axis-legend-activated', type: 'boolean'}, {name: 'axis-legend-text', type: 'string'}, {name: 'axis-legend-color', type: 'string'}, @@ -89,6 +93,10 @@ Ext.define('amdaPlotObj.PlotAxisObject', { this.set('axis-thickness', amdaPlotObj.PlotObjectConfig.defaultValues.axis.thickness); this.set('axis-tick-showmarks', true); this.set('axis-tick-position', amdaPlotObj.PlotObjectConfig.defaultValues.axis.tickPosition); + this.set('axis-grid-minor-number',0); + this.set('axis-grid-major-number',0); + this.set('axis-grid-minor-space',0); + this.set('axis-grid-major-space',0); this.set('axis-grid-minor', false); this.set('axis-grid-major', false); this.set('axis-legend-activated', true); @@ -128,6 +136,10 @@ Ext.define('amdaPlotObj.PlotAxisObject', { axisValues['axis-tick-position'] = this.get('axis-tick-position'); axisValues['axis-grid-minor'] = this.get('axis-grid-minor'); axisValues['axis-grid-major'] = this.get('axis-grid-major'); + axisValues['axis-grid-minor-number']=this.get('axis-grid-minor-number'); + axisValues['axis-grid-major-number']=this.get('axis-grid-major-number'); + axisValues['axis-grid-minor-space']=this.get('axis-grid-minor-space'); + axisValues['axis-grid-major-space']=this.get('axis-grid-major-space'); axisValues['axis-legend-activated'] = this.get('axis-legend-activated'); axisValues['axis-legend-text'] = this.get('axis-legend-text'); axisValues['axis-legend-color'] = this.get('axis-legend-color'); diff --git a/js/app/views/PlotComponents/PlotBaseAxisForm.js b/js/app/views/PlotComponents/PlotBaseAxisForm.js index 288e3a6..b5f4853 100644 --- a/js/app/views/PlotComponents/PlotBaseAxisForm.js +++ b/js/app/views/PlotComponents/PlotBaseAxisForm.js @@ -33,7 +33,11 @@ Ext.define('amdaPlotComp.PlotBaseAxisForm', { this.addStandardCombo('axis-tick-position', 'Ticks position', amdaPlotObj.PlotObjectConfig.availableTicksPositions), this.addStandardCheck('axis-tick-showmarks', 'Show tick marks'), this.addStandardCheck('axis-grid-major', 'Show major grid'), - this.addStandardCheck('axis-grid-minor', 'Show minor grid') + this.addStandardCheck('axis-grid-minor', 'Show minor grid'), + this.addStandardInteger('axis-grid-major-number', 'Nb of Major Ticks', 0, Number.MAX_VALUE,true), + this.addStandardInteger('axis-grid-minor-number', 'Nb of Minor Ticks', 0, Number.MAX_VALUE,true), + this.addStandardFloat2('axis-grid-minor-space', ' Minor Ticks Space', 0, Number.MAX_VALUE,true), + this.addStandardFloat2('axis-grid-major-space', ' Major Ticks Space', 0, Number.MAX_VALUE,true) ]; var axisItems = []; diff --git a/js/app/views/PlotComponents/PlotStandardForm.js b/js/app/views/PlotComponents/PlotStandardForm.js index cf6b7fa..c56c2c8 100644 --- a/js/app/views/PlotComponents/PlotStandardForm.js +++ b/js/app/views/PlotComponents/PlotStandardForm.js @@ -81,6 +81,28 @@ Ext.define('amdaPlotComp.PlotStandardForm', { } }; }, + addStandardInteger: function(name, label, min, max, allowBlank, onChange) { + allowBlank = (typeof allowBlank !== 'undefined') ? allowBlank : false; + + return { + xtype: 'numberfield', + name: name, + fieldLabel: label, + regex:/^\d+$/, + decimalPrecision : 20, + minValue : min, + maxValue : max, + allowBlank : allowBlank, + listeners: { + change: function(field, newValue, oldValue, eOpts) { + this.object.set(name, newValue); + if (onChange != null) + onChange(name, newValue, oldValue); + }, + scope: this + } + }; + }, addStandardFloat2: function(name, label, min, max, allowBlank, onChange) { allowBlank = (typeof allowBlank !== 'undefined') ? allowBlank : false; -- libgit2 0.21.2