Changeset 3261 for branches

Timestamp:

Jan 24, 2013 11:12:29 AM (11 years ago)

Author:

gah

Message:

fix heightmap scale for stretch-to-fit mode

File:

• branches/Rappture 1.2/gui/scripts/vtkheightmapviewer.tcl (modified) (8 diffs)

branches/Rappture 1.2/gui/scripts/vtkheightmapviewer.tcl

@@ -245 +245 @@
         x-scale                 1.0
         y-scale                 1.0
+        z-scale                 1.0
     }]
 
@@ -717 +718 @@
     global readyForNextFrame
     set readyForNextFrame 1
+    set _reset 1
     set _hosts [GetServerList "vtkvis"]
     if { "" == $_hosts } {
@@ -917 +919 @@
         $_arcball resize $w $h
         DoResize
+        if { $_settings(stretch-to-fit) } {
+            Adjustsetting stretch-to-fit
+        }
     }
     if { $_reset } {
-        InitSettings heightmap-mode 
+ puts stderr "initial settings"
+        InitSettings heightmap-mode background
         #
         # Reset the camera and other view parameters
@@ -925 +931 @@
         SendCmd "axis color all [Color2RGB $itk_option(-plotforeground)]"
         SendCmd "axis lrot z 90"
-        SendCmd "dataset maprange all"
+        SendCmd "dataset maprange explicit $_limits(zmin) $_limits(zmax)"
         set q [list $_view(qw) $_view(qx) $_view(qy) $_view(qz)]
         $_arcball quaternion $q 
@@ -1400 +1406 @@
         "background" {
             set bgcolor [$itk_component(background) value]
+ puts stderr "set background to $bgcolor"
             array set fgcolors {
                 "black" "white"
@@ -1487 +1494 @@
         "stretch-to-fit" {
             set bool $_settings(stretch-to-fit)
+            set _settings(x-scale) 1.0
+            set _settings(y-scale) 1.0
+            set _settings(z-scale) 1.0
             if { $bool } {
                 set w $_width
@@ -1492 +1502 @@
                 set xr [expr $_limits(xmax) - $_limits(xmin)]
                 set yr [expr $_limits(ymax) - $_limits(ymin)]
-                if { $yr < $xr } {
-                    set s [expr (double($h)*$xr) / (double($w)*$yr)]
-                    SendCmd "heightmap scale 1 $s 1"            
-                    set _settings(y-scale) $s
-                    set _settings(x-scale) 1.0
+                if { $h < $w } {
+                    set xs [expr (double($w)*$yr) / (double($h)*$xr)]
+                    set _settings(x-scale) $xs
                 } else {
-                    set s [expr (double($w)*$yr) / (double($h)*$xr)]
-                    SendCmd "heightmap scale $s 1 1"
-                    set _settings(x-scale) $s
-                    set _settings(y-scale) 1.0
+                    set ys [expr (double($h)*$xr) / (double($w)*$yr)]
+                    set _settings(y-scale) $ys
+                    set _settings(z-scale) $ys
                 }
-            } else {
-                set _settings(x-scale) 1.0
-                set _settings(y-scale) 1.0
-                SendCmd "heightmap scale 1 1 1"
             }
+            SendCmd "heightmap scale $_settings(x-scale) $_settings(y-scale) $_settings(z-scale)"
+            # It kind of makes sense that I need to reset the camera 
+            # whenever the scale changes.
+            Zoom reset
         }           
         "heightmap-mode" {
@@ -1843 +1850 @@
         append cmap "$x [Color2RGB $color] "
     }
+puts stderr "colormap $colors = ($cmap)"
     return $cmap
 }