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

Timestamp:

Mar 2, 2013, 9:11:34 PM (12 years ago)

Author:

gah

Message:

fix switching between heightmap/contour modes

File:

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

trunk/gui/scripts/vtkheightmapviewer.tcl

@@ -941 +941 @@
         $_arcball quaternion $q 
         if {$_settings(isHeightmap) } {
-            SendCmd "camera reset"
             if { $_view(ortho)} {
                 SendCmd "camera mode ortho"
@@ -947 +946 @@
                 SendCmd "camera mode persp"
             }
+            SendCmd "camera reset"
+            DoRotate
         }           
-        DoRotate
         PanCamera
     }
@@ -1070 +1070 @@
         $_arcball quaternion $q 
         if {$_settings(isHeightmap) } {
-            SendCmd "camera reset"
             if { $_view(ortho)} {
                 SendCmd "camera mode ortho"
@@ -1076 +1075 @@
                 SendCmd "camera mode persp"
             }
+            SendCmd "camera reset"
+            DoRotate
         }
-        DoRotate
         PanCamera
         InitSettings axisXGrid axisYGrid axisZGrid \
@@ -1172 +1172 @@
                 ypan    0 
             }
-            SendCmd "camera reset all"
             if { $_first != "" } {
                 set location [$_first hints camera]
@@ -1181 +1180 @@
             set q [list $_view(qw) $_view(qx) $_view(qy) $_view(qz)]
             $_arcball quaternion $q
-            DoRotate
+            SendCmd "camera reset"
+            if {$_settings(isHeightmap) } {
+                DoRotate
+            }
         }
     }
@@ -1523 +1525 @@
         "isHeightmap" {
             set bool $_settings(isHeightmap)
+            incr _buffering 
+            if { $_buffering == 1 } {
+                set _outbuf ""
+            }
             if { $bool } {
                 $itk_component(lighting) configure -state normal
+                if {$_view(ortho)} {
+                    SendCmd "camera mode ortho"
+                } else {
+                    SendCmd "camera mode persp"
+                }
             } else {
                 $itk_component(lighting) configure -state disabled
@@ -1562 +1573 @@
                 set q [list $_view(qw) $_view(qx) $_view(qy) $_view(qz)]
                 $_arcball quaternion $q
-                if {$_view(ortho)} {
-                    SendCmd "camera mode ortho"
-                } else {
-                    SendCmd "camera mode persp"
-                }
                 SendCmd "camera orient $q" 
             } else {
@@ -1574 +1580 @@
                 bind $c <ButtonRelease-1> {}
                 SendCmd "camera mode image"
+            }
+            incr _buffering -1
+            if { $_buffering == 0 } {
+                sendto $_outbuf
+                set _outbuf ""
             }
         }
@@ -2050 +2061 @@
         foreach comp [$dataobj components] {
             set tag $dataobj-$comp
-            set contents [ConvertToVtkData $dataobj $comp]
-            #set contents [$dataobj vtkdata $comp]
+            #set contents [ConvertToVtkData $dataobj $comp]
+            set contents [$dataobj vtkdata $comp]
             append bytes "$contents\n\n"
         }
@@ -2138 +2149 @@
     SendCmd "heightmap wireframe $_settings(wireframe) $tag"
     SendCmd "heightmap colormap $_currentColormap $tag"
+    set color [$itk_component(isolinecolor) value]
+    SendCmd "heightmap isolinecolor [Color2RGB $color] $tag"
 }
 
@@ -2175 +2188 @@
 # DrawLegend --
 #
-#       Draws the legend in it's own canvas which resides to the right
-#       of the contour plot area.
-#
-itcl::body Rappture::VtkHeightmapViewer::DrawLegend { name } {
+#       Draws the legend in the own canvas on the right side of the plot area.
+#
+itcl::body Rappture::VtkHeightmapViewer::DrawLegend { fname } {
     set c $itk_component(view)
     set w [winfo width $c]
@@ -2185 +2197 @@
     set lineht [font metrics $font -linespace]
     
-    if { $name == "component" } {
+    if { $fname == "component" } {
         set title ""
     } else {
-        if { [info exists _fields($name)] } {
-            foreach { title units } $_fields($name) break
+        if { [info exists _fields($fname)] } {
+            foreach { title units } $_fields($fname) break
             if { $units != "" } {
                 set title [format "%s (%s)" $title $units]
             }
         } else {
-            set title $name
+            set title $fname
         }
     }
@@ -2302 +2314 @@
 itcl::body Rappture::VtkHeightmapViewer::SetIsolineTip { x y value } {
     set c $itk_component(view)
-    set w [winfo width $c]
-    set h [winfo height $c]
-    set font "Arial 8"
-    set lineht [font metrics $font -linespace]
-    
-    if { [info exists _fields($_title)] } {
-        foreach { title units } $_fields($_title) break
-        if { $units != "" } {
-            set title [format "%s (%s)" $title $units]
-        }
-    } else {
-        set title $_title
-    }
-    set imgHeight [image height $_image(legend)]
-    set coords [$c coords colormap]
-    set imgX [expr $w - [image width $_image(legend)] - 2]
-    set imgY [expr $y - 2 * ($lineht + 2)]
-
     .rappturetooltip configure -icon ""
 
-    # Compute the value of the point
-    set tipx [expr $x + 15] 
-    set tipy [expr $y - 5]
+    # Compute the position of the tip
+    set tx [expr $x + 15] 
+    set ty [expr $y - 5]
     Rappture::Tooltip::text $c "Isoline $value"
-    Rappture::Tooltip::tooltip show $c +$tipx,+$tipy    
+    Rappture::Tooltip::tooltip show $c +$tx,+$ty    
 }
 
@@ -2364 +2358 @@
     set lineht [font metrics $font -linespace]
     
-    set imgHeight [image height $_image(legend)]
-    set coords [$c coords colormap]
-    set imgX [expr $w - [image width $_image(legend)] - 2]
-    set imgY [expr $y - 2 * ($lineht + 2)]
+    set ih [image height $_image(legend)]
+    set iy [expr $y - ($lineht + 2)]
 
     if { [info exists _fields($_title)] } {
@@ -2377 +2369 @@
         set title $_title
     }
+    # If there's a legend title, increase the offset by the line height.
+    if { $title != "" } {
+        incr iy $lineht
+    }
+
     # Make a swatch of the selected color
-    if { [catch { $_image(legend) get 10 $imgY } pixel] != 0 } {
-        #puts stderr "out of range: $imgY"
+    if { [catch { $_image(legend) get 10 $iy } pixel] != 0 } {
+        #puts stderr "out of range: $iy"
         return
     }
+
     if { ![info exists _image(swatch)] } {
         set _image(swatch) [image create photo -width 24 -height 24]
@@ -2393 +2391 @@
     if { [info exists _limits(v)] } {
         foreach { vmin vmax } $_limits(v) break
-        set t [expr 1.0 - (double($imgY) / double($imgHeight-1))]
+        set t [expr 1.0 - (double($iy) / double($ih-1))]
         set value [expr $t * ($vmax - $vmin) + $vmin]
     } else {