Changeset 1250 for trunk/gui/scripts/heightmapviewer.tcl

Timestamp:

Dec 1, 2008 2:05:26 PM (16 years ago)

Author:

gah

Message:

Fix for interrupted nanovis session

File:

• trunk/gui/scripts/heightmapviewer.tcl (modified) (9 diffs)

trunk/gui/scripts/heightmapviewer.tcl

@@ +1 @@
+
 # ----------------------------------------------------------------------
 #  COMPONENT: heightmapviewer - 3D volume rendering
@@ -67 +68 @@
     protected method _send_dataobjs {}
     protected method ReceiveImage {option size}
-    private method ReceiveLegend {ivol vmin vmax size}
+    private method ReceiveLegend {tf vmin vmax size}
     protected method _receive_echo {channel {data ""}}
 
@@ -236 +237 @@
         -command [itcl::code $this _fixSettings wireframe]
     grid $inner.f.wireframe -row 3 -column 0 -sticky w
-
-    set ::Rappture::HeightmapViewer::settings_($this-shading) "smooth"
-    ::checkbutton $inner.f.shading \
-        -text "Flat Shading" \
-        -onvalue "flat" -offvalue "smooth" \
-        -variable ::Rappture::HeightmapViewer::settings_($this-shading) \
-        -command [itcl::code $this _fixSettings shading]
-    grid $inner.f.shading -row 4 -column 0 -sticky w
 
     # Legend
@@ -676 +669 @@
 
 # ----------------------------------------------------------------------
-# USAGE: ReceiveLegend <volume> <vmin> <vmax> <size>
+# USAGE: ReceiveLegend <tf> <vmin> <vmax> <size>
 #
 # Invoked automatically whenever the "legend" command comes in from
@@ -682 +675 @@
 # specified <size> will follow.
 # ----------------------------------------------------------------------
-itcl::body Rappture::HeightmapViewer::ReceiveLegend {ivol vmin vmax size} {
+itcl::body Rappture::HeightmapViewer::ReceiveLegend {tf vmin vmax size} {
     if { [IsConnected] } {
         set bytes [ReceiveBytes $size]
@@ -766 +759 @@
          _send "grid linecolor [Color2RGB $itk_option(-plotoutline)]"
      }
-    _fixSettings shading
     _fixSettings wireframe
     _fixSettings grid
@@ -857 +849 @@
         click {
             $itk_component(3dview) configure -cursor fleur
-            array set click [subst {
+            array set click_ [subst {
                 x       $x
                 y       $y
@@ -878 +870 @@
                     set dx [expr {double($x-$click_(x))/$w}]
                     set dy [expr {double($y-$click_(y))/$h}]
-                }]} {
+                }] != 0 } {
                     return
                 }
@@ -977 +969 @@
             }
         }
-        "shading" {
-            if { [IsConnected] } {
-                _send "heightmap shading $settings_($this-shading)"
-            }
-        }
         "wireframe" {
             if { [IsConnected] } {