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

Timestamp:

Jan 24, 2012, 1:24:54 PM (13 years ago)

Author:

ldelgass

Message:

Heightmap viewer fixes: set fully opaque by default, fix scaling control and
limit to .5x - 2x range.

File:

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

trunk/gui/scripts/vtkheightmapviewer.tcl

@@ -261 +261 @@
         surface-edges           0
         surface-lighting        1
-        surface-opacity         40
+        surface-opacity         100
         surface-visible         1
         surface-wireframe       0
         surface-numcontours     10
-        surface-scale           1
+        surface-scale           50
         legend-visible          1
     }]
@@ -1112 +1112 @@
     if { $_reset } {
         InitSettings surface-opacity \
-            surface-numcontours surface-lighting \
+            surface-numcontours surface-scale surface-lighting \
             surface-palette surface-field \
             surface-edges surface-opacity surface-wireframe 
@@ -1502 +1502 @@
         "surface-scale" {
             set val $_settings(surface-scale)
-            set sval [expr { 0.01 * double($val) }]
+            set sval [expr { $val >= 50 ? double($val)/50.0 : 1.0/(2.0-(double($val)/50.0)) }]
             foreach dataset [CurrentDatasets -visible $_first] {
-                SendCmd "heightmap scale $sval $sval $sval $dataset"
+                SendCmd "heightmap heightscale $sval $dataset"
             }
         }
@@ -1992 +1992 @@
 
     label $inner.scale_l -text "Scale" -font "Arial 9"
-    ::scale $inner.scale -from 1 -to 100 -orient horizontal \
+    ::scale $inner.scale -from 0 -to 100 -orient horizontal \
         -variable [itcl::scope _settings(surface-scale)] \
         -width 10 \
@@ -2032 +2032 @@
 
     blt::table $inner \
-        0,0 $inner.surface    -anchor w -pady 2 \
+        0,0 $inner.surface   -anchor w -pady 2 \
         1,0 $inner.wireframe -anchor w -pady 2 \
         2,0 $inner.lighting  -anchor w -pady 2 \
@@ -2040 +2040 @@
         6,0 $inner.numcontours_l   -anchor w -pady 2 -cspan 2 \
         7,0 $inner.numcontours     -fill x   -pady 2 -cspan 2 \
-        8,0 $inner.field_l     -anchor w -pady 2  \
-        8,1 $inner.field       -anchor w -pady 2  \
-        9,0 $inner.palette_l   -anchor w -pady 2  \
-        9,1 $inner.palette     -anchor w -pady 2  \
+        8,0 $inner.scale_l     -anchor w -pady 2 -cspan 2 \
+        9,0 $inner.scale       -fill x   -pady 2 -cspan 2 \
+        10,0 $inner.field_l    -anchor w -pady 2  \
+        10,1 $inner.field      -anchor w -pady 2  \
+        11,0 $inner.palette_l  -anchor w -pady 2  \
+        11,1 $inner.palette    -anchor w -pady 2  \
 
     blt::table configure $inner r* c* -resize none
-    blt::table configure $inner r10 c1 -resize expand
+    blt::table configure $inner r12 c1 -resize expand
 }
 
@@ -2423 +2425 @@
         -edges 0
         -edgecolor black
+        -lighting 1
         -linewidth 1.0
-        -opacity 0.4
+        -opacity 1.0
+        -scale 1.0
+        -numcontours 10
+        -visible 1
         -wireframe 0
-        -lighting 1
-        -visible 1
     }
     if { $dataobj != $_first } {
@@ -2433 +2437 @@
     }
     array set settings $style
-    SendCmd "heightmap add $tag"
+    SendCmd "heightmap add numcontours $settings(-numcontours) $settings(-scale) $tag"
+    set _settings(surface-numcontours) $settings(-numcontours)
+    set val $settings(-scale)
+    set val [expr { $val < 0.5 ? 0.5 : $val } ]
+    set val [expr { $val > 2.0 ? 2.0 : $val } ]
+    set _settings(surface-scale) [expr { $val >= 1.0 ? int($val * 50.0) : int(50.0 * (2.0 - (1.0/$val))) }]
     #SendCmd "cutplane add $tag"
     #SendCmd "cutplane edges 0 $tag"