Changeset 3258 for branches

Timestamp:

Jan 15, 2013 2:27:50 PM (11 years ago)

Author:

gah

Message:

turn off lighting for 2d contour

File:

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

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

@@ -241 +241 @@
         contour-field           "Default"
         contour-isolines        10
-        contour-lighting        1
+        heightmap-lighting      1
         contour-opacity         100
         colormap-visible         1
@@ -1072 +1072 @@
             axis-visible axis-labels 
         InitSettings contour-opacity \
-            heightmap-scale contour-lighting \
+            heightmap-scale heightmap-lighting \
             contour-colormap contour-field \
             contour-edges contour-opacity contour-wireframe 
@@ -1347 +1347 @@
             }
         }
-        "contour-lighting" {
-            set bool $_settings(contour-lighting)
-            foreach dataset [CurrentDatasets -all] {
-                SendCmd "heightmap lighting $bool $dataset"
-            }
+        "heightmap-lighting" {
+            if { $_settings(heightmap-mode) } {
+                set bool $_settings(heightmap-lighting)
+                SendCmd "heightmap lighting $bool"
+            } else {
+                SendCmd "heightmap lighting 0"
+            }
         }
         "contour-edges" {
@@ -1466 +1468 @@
             }
         }
-        "contour-lighting" {
-            set bool $_settings(contour-lighting)
-            foreach dataset [CurrentDatasets -all] {
-                SendCmd "heightmap lighting $bool $dataset"
-            }
+        "heightmap-lighting" {
+            if { $_settings(heightmap-mode) } {
+                set bool $_settings(heightmap-lighting)
+                SendCmd "heightmap lighting $bool"
+            } else {
+                SendCmd "heightmap lighting 0"
+            }
         }
         "contour-field" {
@@ -1486 +1490 @@
         }
         "heightmap-mode" {
+            set bool $_settings(heightmap-mode)
+            if { $bool } {
+                $itk_component(lighting) configure -state normal
+            } else {
+                $itk_component(lighting) configure -state disabled
+            }
             if {[isconnected]} {
-                set bool $_settings(heightmap-mode)
+                set _settings(heightmap-lighting) $bool
                 # Fix heightmap scale: 0 for contours, 1 for heightmaps.
                 if { $bool } {
@@ -1494 +1504 @@
                     set _settings(heightmap-scale) 50
                 }
+                SendCmd "heightmap lighting $bool"
                 set scale [GetHeightmapScale]
                 foreach dataset [CurrentDatasets -all] {
@@ -1899 +1910 @@
         -font "Arial 9"
 
-    checkbutton $inner.lighting \
-        -text "Enable Lighting" \
-        -variable [itcl::scope _settings(contour-lighting)] \
-        -command [itcl::code $this AdjustSetting contour-lighting] \
-        -font "Arial 9"
+    itk_component add lighting {
+        checkbutton $inner.lighting \
+            -text "Enable Lighting" \
+            -variable [itcl::scope _settings(heightmap-lighting)] \
+            -command [itcl::code $this AdjustSetting heightmap-lighting] \
+            -font "Arial 9"
+    }
 
     checkbutton $inner.edges \
@@ -2255 +2268 @@
     set _comp2scale($tag) $_settings(heightmap-scale)
     SendCmd "heightmap edges $_settings(contour-edges) $tag"
-    SendCmd "heightmap lighting $_settings(contour-lighting) $tag"
     SendCmd "heightmap wireframe $_settings(contour-wireframe) $tag"
     SetColormap $dataobj $comp
@@ -2285 +2297 @@
         }
         $_image(legend) configure -data $bytes
-        $_image(legend) write /tmp/junk.png -format png
         #puts stderr "read $size bytes for [image width $_image(legend)]x[image height $_image(legend)] legend>"
         if { [catch {DrawLegend $_title} errs] != 0 } {