Fix decimal precision for axis range (#6193)

Benjamin Renard
1 parent 23fba7a9
Showing 5 changed files with 45 additions and 12 deletions Show diff stats
js/app/views/PlotComponents/PlotBaseAxisForm.js
js/app/views/PlotComponents/PlotBaseSerieForm.js
js/app/views/PlotComponents/PlotSerieForm.js
js/app/views/PlotComponents/PlotSpectroForm.js
js/app/views/PlotComponents/PlotStandardForm.js
@@ -18,8 +18,8 @@ Ext.define(&#39;amdaPlotComp.PlotBaseAxisForm&#39;, {
 	getFormItems: function() {
 		var rangeItems = [
-                this.addStandardFloat('axis-range-min', 'Min', -Number.MAX_VALUE, Number.MAX_VALUE),
-                this.addStandardFloat('axis-range-max', 'Max', -Number.MAX_VALUE, Number.MAX_VALUE),
+                this.addStandardFloat2('axis-range-min', 'Min', -Number.MAX_VALUE, Number.MAX_VALUE),
+                this.addStandardFloat2('axis-range-max', 'Max', -Number.MAX_VALUE, Number.MAX_VALUE),
                 this.addStandardCheck('axis-range-extend', 'Extend Axis Range')
 		];
@@ -51,4 +51,4 @@ Ext.define(&#39;amdaPlotComp.PlotBaseAxisForm&#39;, {
 		return axisItems;
 	}
-});
 \ No newline at end of file
+});
@@ -77,8 +77,8 @@ Ext.define(&#39;amdaPlotComp.PlotBaseSerieForm&#39;, {
 	getValuesRangeItems: function() {
 		return [
-		        this.addStandardFloat('serie-value-min', 'Min value', -Number.MAX_VALUE, Number.MAX_VALUE, true),
-		        this.addStandardFloat('serie-value-max', 'Max value', -Number.MAX_VALUE, Number.MAX_VALUE, true)
+		        this.addStandardFloat2('serie-value-min', 'Min value', -Number.MAX_VALUE, Number.MAX_VALUE, true),
+		        this.addStandardFloat2('serie-value-max', 'Max value', -Number.MAX_VALUE, Number.MAX_VALUE, true)
 		];
 	},
@@ -98,4 +98,4 @@ Ext.define(&#39;amdaPlotComp.PlotBaseSerieForm&#39;, {
 			this.addStandardFieldSet('Interval ticks', 'serie-intervaltick-activated', this.getIntervalTickItems())
 		];
 	}
-});
 \ No newline at end of file
+});
@@ -58,8 +58,8 @@ Ext.define(&#39;amdaPlotComp.PlotSerieForm&#39;, {
 	getXValuesRangeItems: function() {
 		return [
-		        this.addStandardFloat('serie-xvalue-min', 'Min value', -Number.MAX_VALUE, Number.MAX_VALUE, true),
-		        this.addStandardFloat('serie-xvalue-max', 'Max value', -Number.MAX_VALUE, Number.MAX_VALUE, true)
+		        this.addStandardFloat2('serie-xvalue-min', 'Min value', -Number.MAX_VALUE, Number.MAX_VALUE, true),
+		        this.addStandardFloat2('serie-xvalue-max', 'Max value', -Number.MAX_VALUE, Number.MAX_VALUE, true)
 		];
 	},
@@ -85,4 +85,4 @@ Ext.define(&#39;amdaPlotComp.PlotSerieForm&#39;, {
 		return serieItems;
 	}
-});
 \ No newline at end of file
+});
@@ -18,8 +18,8 @@ Ext.define(&#39;amdaPlotComp.PlotSpectroForm&#39;, {
 	getValuesRangeItems: function() {
 		return [
-		        this.addStandardFloat('spectro-value-min', 'Min value', -Number.MAX_VALUE, Number.MAX_VALUE, true),
-		        this.addStandardFloat('spectro-value-max', 'Max value', -Number.MAX_VALUE, Number.MAX_VALUE, true)
+		        this.addStandardFloat2('spectro-value-min', 'Min value', -Number.MAX_VALUE, Number.MAX_VALUE, true),
+		        this.addStandardFloat2('spectro-value-max', 'Max value', -Number.MAX_VALUE, Number.MAX_VALUE, true)
 		];
 	},
@@ -33,4 +33,4 @@ Ext.define(&#39;amdaPlotComp.PlotSpectroForm&#39;, {
 		    this.addStandardFieldSet('Min/Max thresholds', '', this.getValuesRangeItems())
 		];
 	}
-});
 \ No newline at end of file
+});
@@ -81,6 +81,39 @@ Ext.define(&#39;amdaPlotComp.PlotStandardForm&#39;, {
             }
 	    };
 	},
+
+	addStandardFloat2: function(name, label, min, max, allowBlank, onChange) {
+		allowBlank = (typeof allowBlank !== 'undefined') ? allowBlank : false;
+
+		return {
+			xtype: 'textfield',
+			name: name,
+			fieldLabel: label,
+			regex :  /[-+]?(?:\d*\.?\d+|\d+\.?\d*)(?:[eE][-+]?\d+)?/,
+			validator: function (val) {
+				var errMsg = null;
+				if (!allowBlank && Ext.isEmpty(val)) {
+					errMsg = 'Blank value not allowed';
+				}
+				else if ((typeof min !== 'undefined') && (parseFloat(val) < min)) {
+					errMsg = 'Min. allowed value is ' + min;
+				}
+				else if ((typeof max !== 'undefined') && (parseFloat(val) > max)) {
+					errMsg = 'Max. allowed value is ' + max;
+				}
+				
+				return errMsg ? errMsg : true;
+			},
+			listeners: {
+				change: function(field, newValue, oldValue, eOpts) {
+					this.object.set(name, newValue);
+					if (onChange != null)
+						onChange(name, newValue, oldValue);
+				},
+				scope: this
+			}
+		};
+	},
 	addStandardCombo: function(name, label, availableData, onChange) {
 		var comboStore = Ext.create('Ext.data.Store', {