Changeset 3051 for branches/blt4/gui

Timestamp:

Jun 20, 2012, 4:59:49 PM (12 years ago)

Author:

gah

Message:

 

Location:

branches/blt4/gui/scripts

Files:

• drawing.tcl (modified) (3 diffs)
• field.tcl (modified) (1 diff)
• gauge.tcl (modified) (1 diff)
• unirect2d.tcl (modified) (1 diff)
• unirect3d.tcl (modified) (1 diff)
• vtkcontourviewer.tcl (modified) (1 diff)

branches/blt4/gui/scripts/drawing.tcl

@@ -73 +73 @@
             polygon* {
                 set _data($elem) [$_xmlobj get $path.$elem.vtk]
+                set _data($elem) [string trim $_data($elem)]
                 set _styles($elem) [$_xmlobj get $path.$elem.about.style]
                 set _labels($elem) [$_xmlobj get $path.$elem.about.label]
@@ -79 +80 @@
             streamlines* {
                 set _data($elem) [$_xmlobj get $path.$elem.vtk]
+                set _data($elem) [string trim $_data($elem)]
                 set _styles($elem) [$_xmlobj get $path.$elem.about.style]
                 set _labels($elem) [$_xmlobj get $path.$elem.about.label]
@@ -85 +87 @@
             spheres* {
                 set _data($elem) [$_xmlobj get $path.$elem.vtk]
+                set _data($elem) [string trim $_data($elem)]
                 set _styles($elem) [$_xmlobj get $path.$elem.about.style]
                 set _labels($elem) [$_xmlobj get $path.$elem.about.label]

branches/blt4/gui/scripts/field.tcl

@@ -840 +840 @@
 
             set data [$_field get $cname.vtk]
+            set data [string trim $data]
             ReadVtkDataSet $cname $data
             set _comp2vtkcontour($cname) $data

branches/blt4/gui/scripts/gauge.tcl

@@ -239 +239 @@
             }
             real {
-                if {[string length $nv] <= 0
-                      || ![string is double $nv]
-                      || [regexp -nocase {^(inf|nan)$} $nv]} {
+                # "scan" will reject the number if the string is "NaN" or
+                # "Inf" or the empty string.  It also is accepts large numbers
+                # (e.g. 111111111111111111111) that "string is double"
+                # rejects.  The problem with "scan" is that it doesn't care if
+                # there are extra characters trailing the number (eg. "123a").
+                # The extra %s substitution is used to detect this case.
+                if { [scan $nv "%g%s" dummy1 dummy2] != 1 } {
                     error "bad value \"$nv\": should be a real number"
                 }

branches/blt4/gui/scripts/unirect2d.tcl

@@ -102 +102 @@
     set n [expr $_xNum * $_yNum * $_compNum]
     if { [$_values length] != $n } {
-        error "wrong \# of values in \"$cname.values\": expected $n values"
+        error "wrong \# of values in \"$cname.values\": expected $n values, got [$_values length]"
     }
 }

branches/blt4/gui/scripts/unirect3d.tcl

@@ -105 +105 @@
     set n [expr $_xNum * $_yNum * $_zNum * $_compNum]
     if { [$_values length] != $n } {
-        error "wrong \# of values in \"$cname.values\": expected $n values"
+        error "wrong \# of values in \"$cname.values\": expected $n values, got [$_values length]"
     }
 }

branches/blt4/gui/scripts/vtkcontourviewer.tcl

@@ -1339 +1339 @@
     bind $itk_component(view) <ButtonRelease-1> \
         [itcl::code $this Rotate release %x %y]
-                        SendCmd "heightmap heightscale 100.0 $dataset"
+                        SendCmd "heightmap heightscale 1.0 $dataset"
                         set q [list $_view(qw) $_view(qx) $_view(qy) $_view(qz)]
                         $_arcball quaternion $q