Changeset 3511

Timestamp:

Mar 16, 2013, 9:31:43 AM (11 years ago)

Author:

gah

Message:

fixes for lack of string trim for numbers and unit conversion

Location:

trunk

Files:

• gui/scripts/numberentry.tcl (modified) (7 diffs)
• lang/tcl/src/RpUnitsTclInterface.cc (modified) (3 diffs)

trunk/gui/scripts/numberentry.tcl

@@ -48 +48 @@
     set _owner $owner
     set _path $path
-
+    
     #
     # Figure out what sort of control to create
@@ -54 +54 @@
     set presets ""
     foreach pre [$_owner xml children -type preset $path] {
-        lappend presets \
-            [$_owner xml get $path.$pre.value] \
-            [$_owner xml get $path.$pre.label]
-    }
-
+        set value [string trim [$_owner xml get $path.$pre.value]]
+        set label [$_owner xml get $path.$pre.label]
+        lappend presets $value $label
+    }
+    
     set class Rappture::Gauge
-    set units [$_owner xml get $path.units]
+    set units [string trim [$_owner xml get $path.units]]
     if {$units != ""} {
         set desc [Rappture::Units::description $units]
@@ -67 +67 @@
         }
     }
-
+    
     #
     # Create the widget and configure it properly based on other
@@ -77 +77 @@
     pack $itk_component(gauge) -expand yes -fill both
     bind $itk_component(gauge) <<Value>> [itcl::code $this _newValue]
-
-    set min [$_owner xml get $path.min]
-    if {$min ne ""} { $itk_component(gauge) configure -minvalue $min }
-
-    set max [$_owner xml get $path.max]
-    if {$max ne ""} { $itk_component(gauge) configure -maxvalue $max }
+    
+    set min [string trim [$_owner xml get $path.min]]
+    if {$min ne ""} { 
+        $itk_component(gauge) configure -minvalue $min 
+    }
+    
+    set max [string trim [$_owner xml get $path.max]]
+    if {$max ne ""} { 
+        $itk_component(gauge) configure -maxvalue $max 
+    }
 
     if {$class == "Rappture::Gauge" && $min ne "" && $max ne ""} {
-        set color [$_owner xml get $path.about.color]
+        set color [string trim [$_owner xml get $path.about.color]]
         if {$color == ""} {
             # deprecated.  Color should be in "about"
-            set color [$_owner xml get $path.color]
+            set color [string trim [$_owner xml get $path.color]]
         }
         if {$color != ""}  {
@@ -100 +104 @@
             }
             $itk_component(gauge) configure \
-                -spectrum [Rappture::Spectrum ::#auto $color -units $units]
+                -spectrum [Rappture::Spectrum ::\#auto $color -units $units]
         }
     }
 
     # if the control has an icon, plug it in
-    set str [$_owner xml get $path.about.icon]
+    set str [string trim [$_owner xml get $path.about.icon]]
     if {$str ne ""} {
         $itk_component(gauge) configure -image [image create photo -data $str]
     }
-
     eval itk_initialize $args
 
@@ -115 +118 @@
     # Assign the default value to this widget, if there is one.
     #
-    set str [$_owner xml get $path.default]
-    if {$str ne ""} { $itk_component(gauge) value $str }
+    set str [string trim [$_owner xml get $path.default]]
+    if {$str ne ""} { 
+        $itk_component(gauge) value $str 
+    }
 }
 
@@ -180 +185 @@
     set str [$_owner xml get $_path.about.description]
 
-    set units [$_owner xml get $_path.units]
-    set min [$_owner xml get $_path.min]
-    set max [$_owner xml get $_path.max]
+    set units [string trim [$_owner xml get $_path.units]]
+    set min [string trim [$_owner xml get $_path.min]]
+    set max [string trim [$_owner xml get $_path.max]]
 
     if {$units != "" || $min != "" || $max != ""} {

trunk/lang/tcl/src/RpUnitsTclInterface.cc

@@ -38 +38 @@
  */
 
+#include <algorithm> 
+#include <functional>
+#include <cctype>
+
+// Trim from start
+static inline std::string &ltrim(std::string &s) 
+{
+    s.erase(s.begin(), 
+        std::find_if(s.begin(), s.end(), 
+                     std::not1(std::ptr_fun<int, int>(std::isspace))));
+    return s;
+}
+
+// Trim from end
+static inline std::string &rtrim(std::string &s) 
+{
+    s.erase(std::find_if(s.rbegin(), s.rend(), 
+        std::not1(std::ptr_fun<int, int>(std::isspace))).base(), s.end());
+    return s;
+}
+
+// Trim from both ends
+static inline std::string &trim(std::string &s) 
+{
+    return ltrim(rtrim(s));
+}
+
 extern "C" int
 RpUnits_Init(Tcl_Interp *interp)
@@ -71 +98 @@
  * provided in -context option.
  */
+
 
 int
@@ -208 +236 @@
     // or if we should use those provided in -context option
 
+
+    // Trim away white space from the value.  
+    trim(inValue);
+
     double value;
-    value = strtod(inValue.c_str(),&endptr);
+    value = strtod(inValue.c_str(), &endptr);
     if (endptr == inValue.c_str()) {
         // there was no numeric value that could be pulled from inValue