Changeset 3031 for branches/blt4

Timestamp:

Jun 12, 2012 3:28:52 PM (12 years ago)

Author:

gah

Message:

intermediate updates for vtkcontourviewer

Location:

branches/blt4

Files:

• examples/zoo/contour (added)
• examples/zoo/contour/c3.vtk (added)
• examples/zoo/contour/c4.vtk (added)
• examples/zoo/contour/c5.vtk (added)
• examples/zoo/contour/c6.vtk (added)
• examples/zoo/contour/contour.tcl (added)
• examples/zoo/contour/mesh.vtk (added)
• examples/zoo/contour/tool.xml (added)
• gui/scripts/images/surface.png (added)
• gui/scripts/vtkcontourviewer.tcl (modified) (7 diffs)

branches/blt4/gui/scripts/vtkcontourviewer.tcl

@@ -155 +155 @@
     keep -background -foreground -cursor -font
 }
+itk::usual BltTkPushbutton {
+    #empty
+}
 
 # ----------------------------------------------------------------------
@@ -225 +228 @@
         contour-palette   BCGYR
         colormap          1
+        surface           0
     }]
 
@@ -301 +305 @@
     pack $itk_component(zoomout) -side top -padx 2 -pady 2
     Rappture::Tooltip::for $itk_component(zoomout) "Zoom out"
+
+    itk_component add surface {
+        blt::tk::pushbutton $f.surface \
+            -onimage [Rappture::icon surface] \
+            -offimage [Rappture::icon surface] \
+            -command [itcl::code $this AdjustSetting surface] \
+            -variable [itcl::scope _settings(surface)]
+    }
+    Rappture::Tooltip::for $itk_component(surface) \
+        "Toggle the surface/contour on/off"
+    pack $itk_component(surface) -padx 2 -pady 2
+
 
     if { [catch BuildViewTab errs] != 0 } {
@@ -1310 +1326 @@
             }
         }
+        "surface" {
+            if {[isconnected]} {
+                set bool $_settings(surface)
+                foreach dataset [CurrentDatasets -all] {
+                    set c itk_component(view)
+                    if { $bool } {
+    # Bindings for rotation via mouse
+    bind $itk_component(view) <ButtonPress-1> \
+        [itcl::code $this Rotate click %x %y]
+    bind $itk_component(view) <B1-Motion> \
+        [itcl::code $this Rotate drag %x %y]
+    bind $itk_component(view) <ButtonRelease-1> \
+        [itcl::code $this Rotate release %x %y]
+                        SendCmd "heightmap heightscale 100.0 $dataset"
+                        set q [list $_view(qw) $_view(qx) $_view(qy) $_view(qz)]
+                        $_arcball quaternion $q
+                        SendCmd "camera mode persp"
+                        SendCmd "camera orient $q" 
+                    } else {
+                        bind $c <ButtonPress-1> [itcl::code $this BeginSelectionRectangle %x %y]
+                        bind $c <B1-Motion> [itcl::code $this AdjustSelectionRectangle %x %y]
+                        bind $c <ButtonRelease-1> [itcl::code $this EndSelectionRectangle %x %y]
+                        SendCmd "heightmap heightscale 0 $dataset"
+                        SendCmd "camera mode image"
+                    }
+                }
+            }
+        }
         "lighting" {
             if {[isconnected]} {
@@ -1459 +1503 @@
         -variable [itcl::scope _settings(edges)] \
         -command [itcl::code $this AdjustSetting edges] \
+        -font "Arial 9"
+
+    checkbutton $inner.surface \
+        -text "Surface" \
+        -variable [itcl::scope _settings(surface)] \
+        -command [itcl::code $this AdjustSetting surface] \
         -font "Arial 9"
 
@@ -1522 +1572 @@
         5,0 $inner.legend  -columnspan 4 -anchor w \
         6,0 $inner.edges -columnspan 4 -anchor w -pady 2 \
-        7,0 $inner.clear -anchor e -pady 2 \
-        7,1 $inner.opacity -columnspan 2 -pady 2 -fill x\
-        7,3 $inner.opaque -anchor w -pady 2  \
-        8,0 $inner.field_l -anchor e -pady 2  \
-        8,1 $inner.field -cspan 3 -anchor w -pady 2 -fill x  \
-        9,0 $inner.palette_l -anchor e -pady 2  \
-        9,1 $inner.palette -cspan 3 -fill x -pady 2  
+        7,0 $inner.surface -columnspan 4 -anchor w -pady 2 \
+        8,0 $inner.clear -anchor e -pady 2 \
+        8,1 $inner.opacity -columnspan 2 -pady 2 -fill x\
+        8,3 $inner.opaque -anchor w -pady 2  \
+        9,0 $inner.field_l -anchor e -pady 2  \
+        9,1 $inner.field -cspan 3 -anchor w -pady 2 -fill x  \
+        10,0 $inner.palette_l -anchor e -pady 2  \
+        10,1 $inner.palette -cspan 3 -fill x -pady 2  
 
     blt::table configure $inner r* -resize none
-    blt::table configure $inner r10 -resize expand
+    blt::table configure $inner r11 -resize expand
 }
 
@@ -2172 +2223 @@
         -color \#808080
         -edgecolor black
+        -surface 0
         -edges 0
         -lighting 1