Changeset 3434 for trunk/gui/scripts/vtkheightmapviewer.tcl

Timestamp:

Mar 3, 2013 9:06:13 PM (11 years ago)

Author:

gah

Message:

put back, camera reset in window resizes (pending)

File:

• trunk/gui/scripts/vtkheightmapviewer.tcl (modified) (3 diffs)

trunk/gui/scripts/vtkheightmapviewer.tcl

@@ -406 +406 @@
     SendCmd "screen size [expr $_width - 20] $_height"
 
+    # FIXME: This "camera reset" stops the plot from shrinking each time the
+    #        window is resized.  
+    SendCmd "camera reset"
+
     set font "Arial 8"
     set lh [font metrics $font -linespace]
@@ -436 +440 @@
     if { !$_resizePending } {
         set _resizePending 1
-        $_dispatcher event -after 400 !resize
+        $_dispatcher event -after 250 !resize
     }
 }
@@ -1632 +1636 @@
     foreach { ymin ymax } $_limits(y) break
     foreach { vmin vmax } $_limits($_curFldName) break
-    set dataRange   [expr $vmax - $vmin]
-    set boundsRange [expr $xmax - $xmin]
-    set r [expr $ymax - $ymin]
-    if {$r > $boundsRange} {
-        set boundsRange $r
-    }
-    if {$dataRange < 1.0e-16} {
+
+    global tcl_precision
+    set tcl_precision 17
+    set xr [expr $xmax - $xmin]
+    set yr [expr $ymax - $ymin]
+    set vr [expr $vmax - $vmin]
+    set r  [expr ($yr > $xr) ? $yr : $xr]
+    if { $vr < 1.0e-17 } {
         set dataScale 1.0
     } else {
-        set dataScale [expr $boundsRange / $dataRange]
+        set dataScale [expr $r / $vr]
     }
     set heightScale [GetHeightmapScale]
-    set bMin [expr $heightScale * $dataScale * $vmin]
-    set bMax [expr $heightScale * $dataScale * $vmax]
+    set bmin [expr $heightScale * $dataScale * $vmin]
+    set bmax [expr $heightScale * $dataScale * $vmax]
     SendCmd "dataset maprange explicit $_limits($_curFldName) $_curFldName"
-    SendCmd "axis bounds z $bMin $bMax"
+    SendCmd "axis bounds z $bmin $bmax"
     SendCmd "axis range z $_limits($_curFldName)"
 }