Fix for bug 661

Introduce *DECIMAL-SEPARATOR* global for Nyquist.
Improvements to numeric validation error messages.
Fix *TRACK* START-TIME and END-TIME properties for tracks with different
length channels.
Update Adjustable Fade, Regular Interval Labels and Vocal Removal
to use numeric text inputs.
This does NOT fix bug 1020.

plug-ins/adjustable-fade.ny

@@ -19,14 +19,15 @@
 ;control type "Fade Type" choice "Fade Up,Fade Down,S-Curve Up,S-Curve Down" 0
 ;control curve "Mid-fade Adjust (%)" real "" 0 -100 100
 ;control units "Start/End as" choice "% of Original,dB Gain" 0 
-;control gain-string-0 "Start (or end)" string "" "0" ""
+;control gain0 "Start (or end)" float-text "" 0 nil nil
-;control gain-string-1 "End (or start)" string "" "100" ""
+;control gain1 "End (or start)" float-text "" 100 nil nil
 ;control preset "   Handy Presets\n(override controls)" choice "None Selected,Linear In,Linear Out,Exponential In,Exponential Out,Logarithmic In,Logarithmic Out,Rounded In,Rounded Out,Cosine In,Cosine Out,S-Curve In,S-Curve Out" 0
 
 
 (defun get-input (sig)
 "Preview takes the entire selection so that we know the correct
 selection length, but preview only needs to process preview length."
+;; (if *previewp* sig (multichan-expand #'trim-input sig)))
   (if (get '*track* 'view)  ;NIL if preview
       sig
       (multichan-expand #'trim-input sig)))
@@ -37,42 +38,23 @@ selection length, but preview only needs to process preview length."
                   (get '*project* 'preview-duration))))
     (setf sig (extract-abs 0 dur *track*))))
 
-
-(setq err "")
-; bad things may happen outside of the slider range.
-(setq curve (min 1 (max -1 (/ curve 100.0))))
-
-;;; Convert string to value
-(defun string-to-val (string)
-  (setq val-array 
-    (read (make-string-input-stream (format nil "(~a)" string))))
-  (if (and (= (length val-array) 1)
-           (numberp (car val-array)))
-      (let ((val (float (car val-array))))
-        (case units
-          (0 (/ val 100))
-          (t (db-to-linear val))))))
-
-;;; invalid string error
-(defun invalid-string (x y)
-  (unless x 
-    (setf err (format nil "~aYou entered \"~a\"~%~
-      \"Start (or end):\" must be one number.~%"
-      err
-      gain-string-0)))
-  (unless y
-    (setf err (format nil "~aYou entered \"~a\"~%~
-      \"End (or start):\" must be one number.~%"
-      err gain-string-1)))
-  err)
-
 ;;; invalid values
 (defun check-values (x y)
-  (when (or (< x 0)(< y 0))
+  (if (= units 0)  ;percentage values
-    (setf err (format nil "~a% values cannot be negative.~%" err))))
+    (cond
+      ((or (< x 0)(< y 0))
+        (throw 'err (format nil "~aPercentage values cannot be negative." err)))
+      ((or (> x 1000)(> y 1000))
+        (throw 'err (format nil "~aPercentage values cannot be more than 1000 %." err))))
+    (cond   ;dB values
+      ((or (> x 100)(> y 100))
+        (throw 'err (format nil "~adB values cannot be more than +100 dB.~%~%~
+                                 Hint: 6 dB doubles the amplitude~%~
+                                 \t-6 dB halves the amplitude." err))))))
 
 ;;; select and apply fade
 (defun fade (sig type curve g0 g1)
+  (check-values gain0 gain1)
   (mult (get-input sig)
     (case preset
       (0  (case type                  ; Custom fade
@@ -190,11 +172,18 @@ selection length, but preview only needs to process preview length."
     (/ (- (exp (- 1 x)) e)
       (- 1 e))))
 
-(let ((gain0 (string-to-val gain-string-0))
+(defmacro gainscale (gain type)
-      (gain1 (string-to-val gain-string-1)))
+  `(setf ,gain
-  (if (and gain0 gain1)
+      (if (= ,type 0)  ; percent
-    (check-values gain0 gain1)
+          (/ ,gain 100.0)
-    (setf err (format nil "~a" (invalid-string gain0 gain1))))
+          (db-to-linear ,gain))))
-  (if (= (length err) 0)
+
-      (fade *track* type curve gain0 gain1)
+
-      (format nil "Error.~%~a." err)))
+(setf curve (/ curve 100.0))
+(setf gain0 (gainscale gain0 units))
+(setf gain1 (gainscale gain1 units))
+(setf err "Error\n\n")
+
+
+(catch 'err (fade *track* type curve gain0 gain1))
+

plug-ins/equalabel.ny

@@ -1,153 +1,138 @@
 ;nyquist plug-in
-;version 3
+;version 4
 ;type analyze
 ;name "Regular Interval Labels..."
 ;action "Adding equally-spaced labels to the label track..."
-;author "David R. Sky"
+;author "Steve Daulton"
 ;copyright "Released under terms of the GNU General Public License version 2"
 
-;; by David R. Sky (http://www.garyallendj.com/davidsky/), June-October 2007.
+;; Released under terms of the GNU General Public License version 2:
-;; Code for label placement based on silencemarker.ny by Alex S.Brown.
+;; http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
-;; Updated by Steve Daulton (http://easyspacepro.com)
+;;
+;; Original version by David R. Sky (http://www.garyallendj.com/davidsky/) 2007.
+;; Based on an idea by Sami Jumppanen, with contributions from
+;; Alex S.Brown, Dominic Mazzoni, Pierre M.I., Gale Andrews, Steve Daulton.
+;; This version by Steve Daulton (http://easyspacepro.com) 2016
 
-;; Released under terms of the GNU General Public License version 2
+;control mode "Use 'Number of labels' OR 'Label interval'" choice "Number of Labels,Label Interval" 0
-;; http://www.gnu.org/licenses/old-licenses/gpl-2.0.html .
+;control number "Number of labels" int-text "" 10 1 1000
-;; Thanks Sami Jumppanen for plug-in suggestion.
+;control interval "Label interval (seconds)" float-text "" 60 0.001 1000
-;; Thanks Dominic Mazzoni, Pierre M.I., Gale Andrews 
+;control adjust "Adjust label interval to fit length" choice "No,Yes" 0
-;; for improvement suggestions.
+;control labeltext "Label text" string "" "Label" ""
-;; Disallow labels before zero by Steve Daulton, September 2010.
+;control zeros "Minimum number of digits in label" choice "None - text only,1 (before label),2 (before label),3 (before label),1 (after label),2 (after label),3 (after label)" 2
-;; Enhanced label numbering by Steve Daulton, April 17th 2011.
+;control labelnum "Begin numbering from" int-text "" 1 0 nil
-;; Error checking by Steve Daulton, April 18th 2011.
-;; Final Label bug fixed and minor GUI modifications. SD Apr 2011
-;; Requires Audacity 1.3.4 or later.
-
-;control start "Time to place first label [seconds]" string " " "0.0"
-;control placement "Label placement method" choice "Label interval,Number of labels" 0
-;control time "Set either: Label interval [seconds]" string " " "60.0"
-;control label-number "Or: Number of labels" int "" 10 2 100
-;control text "Label text" string "" "Label"
-;control labelnum "Minimum number of digits in label" choice "None - text only,1 (before label),2 (before label),3 (before label),1 (after label),2 (after label),3 (after label)" 2
-;control countfrom "Begin numbering from" int "" 1 0 100
-;control include "Add final label" choice "No,Yes" 0
-;control t-choice "Adjust label interval to fit length" choice "No,Yes" 1
-
-; function to convert string to list
-(defun string-to-list (str)
-	(read (make-string-input-stream (format nil "(~a)" str))))
 
 
-; function to calculate new time value 
+(defun make-labels ()
-; if user value does not create equal duration final audio chunk
+  (when (and (= mode 1)(= adjust 1)) ;adjust interval to fit
-; returns new time value
+      (setf interval (get-interval)))
-(defun new-time (time dur check-labels)
+  (validate)
-	; calculate duration of last audio chunk
+  (let ((labels ()))
-	(setf last-label (- dur (* time check-labels)))
+    (cond
-	(if (< last-label (* time 0.5)) ; last chunk is less than 1/2 time
+      ((= mode 0) ;number of labels
-		(/ dur (- check-labels 1))
+        (setf interval (/ (get-duration 1) number))
-		(/ dur check-labels)))
+        (do* ((i 0 (1+ i))
+              (labelnum labelnum (1+ labelnum)))
+             ((= i number))
+          (push (make-label (* i interval) labelnum) labels))
+        ;print what we've done to debug window
+        (if (= number 1)
+            (format t "1 label requested.")
+            (format t "~a labels at intervals of ~a seconds."
+              number interval)))
+      (t
+        (setf counter 0)
+        (do* ((i 0 (1+ i))
+              (labelnum labelnum (1+ labelnum))
+              (time 0 (* i interval)))
+             ((>= (round-to-sample time) (get-duration 1)))
+          (incf counter)
+          (push (make-label time labelnum) labels))
+        ;print what we've done to debug window
+        (if (and (= adjust 0)(/= (* counter interval)(get-duration 1)))
+            (if (= counter 1)
+                (format t "1 label requested.")
+                (format t "~a labels at regular intervals of ~a seconds.~%~
+                  Final label at ~a seconds from end of selection."
+                  counter
+                  interval
+                  (- (get-duration 1) (* (1- counter) interval))))
+            (format t "~a labels at regular intervals of ~a seconds."
+              counter interval))))
+    ;return labels
+    labels))
+
+(defun validate ()
+  (when (= mode 1)  ;Label interval
+    (when (> (get-duration 1) (round-to-sample (* 1000 interval)))
+      (throw 'err
+        (format nil "Too many labels.~%~%~
+          Selection length is ~a seconds and~%~
+          Label interval is ~a seconds~%~
+          giving a total of ~a labels.~%~
+          Maximum number of labels from this effect is 1000.~%~
+          Please use a shorter selection, or a longer Label interval."
+          (trim-trailing-zeros (get-duration 1))
+          (trim-trailing-zeros interval)
+          (if (= adjust 1)
+              (round (/ (get-duration 1) interval))
+              (1+ (round (/ (get-duration 1) interval)))))))))
+
+(defun round-to-sample (time)
+"Round time in seconds to nearest sample period."
+  (let ((samples (round (* time *sound-srate*))))
+    (/ samples *sound-srate*)))
+
+(defun make-label (time num)
+"Make a single label"
+  (let* ((num-text (format nil "~a" num))
+         (non-zero-digits (length num-text)))
+    (if (= zeros 0)
+        (setf num-text "")
+        (dotimes (i (max 0 (- zeros non-zero-digits)))
+          (setf num-text (format nil "~a~a" "0" num-text))))
+    (if num-before-text
+      (setf text (format nil "~a~a" num-text labeltext))
+      (setf text (format nil "~a~a" labeltext num-text)))
+    (list time text)))
+
+(defun get-interval ()
+"Get adjusted interval to fit duration"
+  (let* ((min-num (truncate (/ (get-duration 1) interval)))
+         (max-num (1+ min-num)))
+    (if (and (> min-num 0)
+             (< (abs (- interval (/ (get-duration 1) min-num)))
+                (abs (- interval (/ (get-duration 1) max-num)))))
+        (/ (get-duration 1) min-num)
+        (/ (get-duration 1) max-num))))
+
+(defun lasttrackp ()
+"true when processing the final selected track"
+  (let ((index (get '*track* 'index))
+        (num (length (get '*selection* 'tracks))))
+    (= index num)))
+
+(defun trim-trailing-zeros (num)
+  ;; sometimes need more precission than "%g".
+  (cond
+   ((/= num (truncate num)) ; not integer
+      (setf *float-format* "%.5f")
+      (let ((numtxt (format nil "~a" num)))
+        (do* ((i (1- (length numtxt)) (1- i))
+              (ch (char numtxt i)(char numtxt i)))
+             ((char/= ch #\0))
+          (setf numtxt (subseq numtxt 0 i)))
+        (setf *float-format* "%g")
+        numtxt))
+    (t num)))
 
 
-; function to add labels to the label track
+(setf num-before-text (<= zeros 3))
-; from silencemarker.ny by Alex S. Brown
+(setf zeros (1+ (rem (1- zeros) 3)))
-(defun add-label (l-time l-text)
- (setq label-list (cons (list l-time l-text) label-list)))
 
-
+;; Analyze plug-ins may return text message per track
-; function to add label number
+;; but we only want error messages once, and we only want
-(defun add-number (i text)
+;; one set of labels.
-	(let* ((num (+ countfrom i))
+(if (lasttrackp)
-				(appendt (if (> labelnum 3) t nil))
+    (catch 'err (make-labels))
-				(labelnum (if (> labelnum 3)(- labelnum 3) labelnum))
+    nil)
-				(sign (if (< num 0) "-" ""))
-				(num (abs num))
-				(zeros (case (- labelnum (length (format nil "~a" num)))
-					(1 "0")
-					(2 "00")
-					(t ""))))
-		(if appendt
-			(format nil "~a~a~a~a" text sign zeros num) ;append number to text
-			(format nil "~a~a~a~a" sign zeros num text)))) ;prepend number
-
-
-; function to calculate 'time' based on number of labels
-(defun num-of-label-time ()
-	(setf time (/ dur label-number)); set label interval
-	(if (= include 0)
-			(setf labels label-number)
-			(setf labels (1+ label-number))))
-
-
-; function to calculate 'time' based on user-selected time interval
-; calculate number of labels in selection
-; this includes label at start of selection
-; which is label number 0 if numbers are prepended to label text
-; if final label is unwanted, decrement number of labels by 1
-(defun user-selected-time ()
-	(setf labels  (if (= include 0)
-			(truncate (/ dur time))
-			(+ 1 (truncate (/ dur time)))))
-	; setf check-labels: number of labels if user includes last label
-	(setf check-labels (+ 1 (truncate (/ dur time))))
-	; depending whether user wants specified time used 
-	; or wants equal duration audio chunks including last chunk
-	; user time may create equal audio chunks even for last chunk
-	(setf time 
-		(if (= t-choice 0) ; final segment need not be equal
-			time ; use user time value...
-			; ...otherwise calculate time for equal duration audio chunks
-			; if user time value creates equal final audio segment duration anyway 
-			; then use user interval
-			(if (= dur (* time (- check-labels 1)))
-				time
-				; user time value does not create equal duration audio chunks
-				(new-time time dur check-labels)))))
-				
-
-;; ERROR CHECKING AND INITIALISE VARIABLES
-
-(setq err ""); initialise error message
-(setq label-list nil); initialize blank label track
-(setq time (first (string-to-list time))); get Interval Label time from string
-(setq start (first (string-to-list start))); get 'start' from string
-
-; check 'start' is a valid number, then calculate and check 'dur(ation)' 
-(if (not(numberp start)) ; check that it is a number
-	(setq err (strcat err (format nil "'Time to place first label [seconds]' must be a number.~%~%")))
-	(progn
-		(setq start (max 0 start)) ;disallow negative label time
-		(setf dur (- (get-duration 1) start)) ;calculate duration
-		(if (<= dur 0)
-			(setq err (strcat err (format nil 
-"'Time to place first label' (~a seconds) is greater than selection length (~a seconds).~%~%"
-				start (get-duration 1)))))))
-
-; If using 'Label Interval'
-(if (= placement 0)
-	(if (not(numberp time)); check time is a number
-		(setq err (strcat err (format nil "'Label interval [seconds]' must be a number.~%~%")))
-		(if (<= time 0); Label interval must be positive
-			(setq err (strcat err (format nil "'Label Interval [seconds]' must be a positive number.~%~%")))
-			(if (and (> dur 0)(> time dur))
-				(setq err (strcat err (format nil
-"Including your time offset of ~a seconds, your requested~%label interval of ~a seconds is greater than the duration~%of your selected audio (~a seconds). ~%~%" 
-					start time dur))))))
-	;else using 'Number of labels'
-	(if (<= label-number 0)
-		(setq err (strcat err (format nil
-"Based on 'Number of labels' you have selected ~a labels.~%~%" label-number)))))
-
-;; MAIN PROGRAM
-
-(if (> (length err) 0) ; if errors
-	(format nil "ERROR.~%~%~a" err) ; print error message(s)
-	(progn ; otherwise run program
-		(if (= placement 1) ; number of labels
-			(num-of-label-time)
-			(user-selected-time))
-	; add the labels
-	(dotimes (i labels)
-		(if (> labelnum 0)
-			(add-label (+ start (* i time)) (add-number i text))
-			(add-label (+ start (* i time)) text)))
-	; return label track
-	label-list))

plug-ins/vocalremover.ny

@@ -22,8 +22,8 @@
 
 ;control action "Remove vocals or view Help" choice "Remove vocals,View Help" 0
 ;control band-choice "Removal choice" choice "Simple (entire spectrum),Remove frequency band,Retain frequency band" 0
-;control low-range "Lower frequency band limit (Hz)" string " " "500"
+;control low-range "Frequency band from (Hz)" float-text "" 500 0 nil
-;control high-range "Upper frequency band limit (Hz)" string " " "2000"
+;control high-range "Frequency band to (Hz)" float-text "" 2000 0 nil
 
 
 ; Initialize globals
@@ -57,9 +57,6 @@ audio in a particular frequency range (such as low drums
 or bass), try 'Retain frequency band'. This only removes
 frequencies outside the limits, retaining the others."))
 
-(defun string-to-list (str)
-  (read (make-string-input-stream (format nil "(~a)" str))))
-
 
 ;;; ERROR CHECKING:
 
@@ -72,39 +69,21 @@ frequencies outside the limits, retaining the others."))
                       channels, use 'Make Stereo Track' on the Track~%~
                       Drop-Down Menu, then run Vocal Remover again.~%"))))
 
+(defmacro validate (Hz)
+;; Filters become unstable when very close to 0 Hz or
+;; Nyquist frequency, so disable.
+  `(if (or (< ,Hz 1)(> ,hz (- (/ *sound-srate* 2) 1)))
+       (setf ,Hz nil)))
+
 ;;; Check that frequency range is valid
 (defun check-range ()
-  (setq low-range (first (string-to-list low-range)))
+  ;; Ensure min < max
-  (setq high-range (first (string-to-list high-range)))
+  (when (< high-range low-range)
-  (if (or (not (numberp low-range))
-          (not (numberp high-range))
-          (< low-range 0)
-          (> low-range 20000)
-          (< high-range 0)
-          (> high-range 20000))
-      (progn
-        (if (= band-choice 1)
-            (setf band-type "remove")
-            (setf band-type "retain"))
-        (setf message (format nil
-                        "~a~%~
-                        Enter both a lower and an upper limit for the~%~
-                        frequency band you want to ~a.~%~
-                        You entered: \"~a\"   \"~a\"~%~%~
-                        Both values must be between 0 and 20000."
-                        message
-                        band-type
-                        low-range
-                        high-range)))
-      ;; Else ensure that high-range > low-range.
     (let ((temp low-range))
-        (when (> low-range high-range)
+      (setf low-range high-range)
-          (setq low-range high-range)
+      (setf high-range temp)))
-          (setq high-range temp))))
+  (validate low-range)
-  ;; Range values must cannot be higher than Nyquist frequency.
+  (validate high-range))
-  (setq low-range (min low-range (/ *sound-srate* 2)))
-  (setq high-range (min high-range (/ *sound-srate* 2))))
-      
 
 (defun show-message ()
   ;; output to both message box and to debug window
@@ -118,13 +97,27 @@ frequencies outside the limits, retaining the others."))
 ;;; DSP FUNCTIONS:
 
 (defun bandpass (sig low high)
+  (cond
+    ((and low high) ;bandpass
       (lowpass8
         (highpass8 sig low)
         high))
+    (low (highpass8 sig low))
+    (high (lowpass8 sig high))
+    (t sig)))
 
 (defun bandstop (sig low high)
-  (sum (lowpass8 sig low)
+  (if (< (/ (- high low) low) 0.1)
-       (highpass8 sig high)))
+      (format t "Warning:~%~
+              Selected band-stop filter is~%~
+              ~a Hz to ~a Hz.~%~
+              A very narrow stop-band filter may have~%~
+              unexpected results.~%~%"
+              low high))
+  (let ((low-sig (if low (lowpass8 sig low)(s-rest 1))))
+    (sum
+      low-sig
+      (if high (highpass8 (diff sig low-sig) high)(s-rest 1)))))
 
 (defun CentrePanRemove ()
   (cond

src/effects/nyquist/Nyquist.cpp

@@ -40,6 +40,7 @@ effects from this one class.
 #include <wx/txtstrm.h>
 #include <wx/valgen.h>
 #include <wx/wfstream.h>
+#include <wx/numformatter.h>
 
 #include "../../AudacityApp.h"
 #include "../../FileNames.h"
@@ -482,6 +483,8 @@ bool NyquistEffect::Process()
 
       mProps += wxString::Format(wxT("(putprop '*AUDACITY* (list %d %d %d) 'VERSION)\n"), AUDACITY_VERSION, AUDACITY_RELEASE, AUDACITY_REVISION);
 
+      mProps += wxString::Format(wxT("(setf *DECIMAL-SEPARATOR* #\\%c)\n"), wxNumberFormatter::GetDecimalSeparator());
+
       mProps += wxString::Format(wxT("(putprop '*SYSTEM-DIR* \"%s\" 'BASE)\n"), EscapeString(FileNames::BaseDir()).c_str());
       mProps += wxString::Format(wxT("(putprop '*SYSTEM-DIR* \"%s\" 'DATA)\n"), EscapeString(FileNames::DataDir()).c_str());
       mProps += wxString::Format(wxT("(putprop '*SYSTEM-DIR* \"%s\" 'HELP)\n"), EscapeString(FileNames::HtmlHelpDir().RemoveLast()).c_str());
@@ -868,10 +871,28 @@ bool NyquistEffect::ProcessOne()
       // Note: "View" property may change when Audacity's choice of track views has stabilized.
       cmd += wxString::Format(wxT("(putprop '*TRACK* %s 'VIEW)\n"), view.c_str());
       cmd += wxString::Format(wxT("(putprop '*TRACK* %d 'CHANNELS)\n"), mCurNumChannels);
+
+      double startTime = 0.0;
+      double endTime = 0.0;
+
+      if (mCurTrack[0]->GetLinked()) {
+         startTime = std::min<double>(mCurTrack[0]->GetStartTime(), mCurTrack[0]->GetLink()->GetStartTime());
+      }
+      else {
+         startTime = mCurTrack[0]->GetStartTime();
+      }
+
+      if (mCurTrack[0]->GetLinked()) {
+         endTime = std::max<double>(mCurTrack[0]->GetEndTime(), mCurTrack[0]->GetLink()->GetEndTime());
+      }
+      else {
+         endTime = mCurTrack[0]->GetEndTime();
+      }
+
       cmd += wxString::Format(wxT("(putprop '*TRACK* (float %s) 'START-TIME)\n"),
-                              Internat::ToString(mCurTrack[0]->GetStartTime()).c_str());
+                              Internat::ToString(startTime).c_str());
       cmd += wxString::Format(wxT("(putprop '*TRACK* (float %s) 'END-TIME)\n"),
-                              Internat::ToString(mCurTrack[0]->GetEndTime()).c_str());
+                              Internat::ToString(endTime).c_str());
       cmd += wxString::Format(wxT("(putprop '*TRACK* (float %s) 'GAIN)\n"),
                               Internat::ToString(mCurTrack[0]->GetGain()).c_str());
       cmd += wxString::Format(wxT("(putprop '*TRACK* (float %s) 'PAN)\n"),

src/widgets/numformatter.h

@@ -75,13 +75,16 @@ private:
    // the separators. This is used by ToString(Style_WithThousandsSep).
    static void AddThousandsSeparators(wxString& s);
 
+   // Remove all thousands separators from a string representing a number.
+   static void RemoveThousandsSeparators(wxString& s);
+
+protected:
    // Remove trailing zeroes and, if there is nothing left after it, the
    // decimal separator itself from a string representing a floating point
    // number. Also used by ToString().
    static void RemoveTrailingZeroes(wxString& s, size_t retain = 0);
 
-    // Remove all thousands separators from a string representing a number.
+   friend class FloatingPointValidatorBase;
-    static void RemoveThousandsSeparators(wxString& s);
 };
 
 #endif // _WIDGETS_NUMFORMATTER_H_

src/widgets/valnum.cpp

@@ -370,7 +370,8 @@ bool IntegerValidatorBase::DoValidateNumber(wxString * errMsg) const
    {
       res = IsInRange(value);
       if ( !res )
-             *errMsg = _("Not in range");
+         errMsg->Printf(_("Not in range %d to %d"),
+                        (int) m_min, (int) m_max);
    }
 
    return res;
@@ -496,20 +497,23 @@ bool FloatingPointValidatorBase::DoValidateNumber(wxString * errMsg) const
          res = IsInRange(value);
          if ( !res )
          {
+            wxString strMin = wxString::Format(wxT("%f"), m_min);
+            wxString strMax = wxString::Format(wxT("%f"), m_max);
+            NumberFormatter::RemoveTrailingZeroes(strMin);
+            NumberFormatter::RemoveTrailingZeroes(strMax);
+
             if (m_minSet && m_maxSet)
             {
-                    errMsg->Printf(_("Value not in range: %.*f to %.*f"),
+               errMsg->Printf(_("Value not in range: %s to %s"),
-                        m_precision, m_min, m_precision, m_max);
+                              strMin, strMax);
             }
             else if (m_minSet)
             {
-                    errMsg->Printf(_("Value must not be less than %.*f"),
+               errMsg->Printf(_("Value must not be less than %s"), strMin);
-                        m_precision, m_min);
             }
             else if (m_maxSet)
             {
-                    errMsg->Printf(_("Value must not be greather than %.*f"),
+               errMsg->Printf(_("Value must not be greather than %s"), strMax);
-                        m_precision, m_max);
             }
          }
       }