Changeset 2426 for trunk/gui

Timestamp:

Aug 27, 2011 2:53:26 AM (13 years ago)

Author:

ldelgass

Message:

Add ortho/perspective camera setting, pick value tests. Also disable camera
reset -- server should be scaling on resizes again.

File:

• trunk/gui/scripts/vtkviewer.tcl (modified) (11 diffs)

trunk/gui/scripts/vtkviewer.tcl

@@ -70 +70 @@
     protected method FixSettings {what {value ""}}
     protected method Pan {option x y}
+    protected method Pick {x y}
     protected method Rebuild {}
     protected method ReceiveDataset { args }
@@ -173 +174 @@
         pan-x           0
         pan-y           0
+        ortho           0
     }
     set _arcball [blt::arcball create 100 100]
@@ -291 +293 @@
     bind $itk_component(view) <ButtonRelease-2> \
         [itcl::code $this Pan release %x %y]
+
+    bind $itk_component(view) <ButtonRelease-3> \
+        [itcl::code $this Pick %x %y]
 
     # Bindings for panning via keyboard
@@ -356 +361 @@
 
     # Must reset camera to have object scaling to take effect.
-    SendCmd "camera reset"
-    SendCmd "camera zoom $_view(zoom)"
+    #SendCmd "camera reset"
+    #SendCmd "camera zoom $_view(zoom)"
     set _resizePending 0
 }
@@ -736 +741 @@
     set option [lindex $args 0]
     switch -- $option {
-        "value" {
+        "scalar" {
             set option [lindex $args 1]
             switch -- $option {
                 "world" {
-                    foreach { x y z value } [lrange $args 2 end] break
+                    foreach { x y z value tag } [lrange $args 2 end] break
                 }
                 "pixel" {
-                    foreach { x y value } [lrange $args 2 end] break
+                    foreach { x y value tag } [lrange $args 2 end] break
                 }
             }
+        }
+        "vector" {
+            set option [lindex $args 1]
+            switch -- $option {
+                "world" {
+                    foreach { x y z vx vy vz tag } [lrange $args 2 end] break
+                }
+                "pixel" {
+                    foreach { x y vx vy vz tag } [lrange $args 2 end] break
+                }
+            }
+        }
+        "names" {
+            foreach { name } [lindex $args 1] {
+                #puts stderr "Dataset: $name"
+            }
         }
         default {
@@ -811 +832 @@
     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" 
     PanCamera
-    SendCmd "camera mode persp"
     if { $_reset || $_first == "" } {
         Zoom reset
@@ -824 +849 @@
     FixSettings volume
     FixSettings lighting
+    FixSettings wireframe
     FixSettings axes
     FixSettings edges
@@ -932 +958 @@
 
 itcl::body Rappture::VtkViewer::PanCamera {} {
-#    set w [winfo width $itk_component(view)]
-#    set h [winfo height $itk_component(view)]
-#    set x [expr ($_view(pan-x)) / $w]
-#    set y [expr ($_view(pan-y)) / $h]
-#    set x [expr $x * $_limits(xmax) - $_limits(xmin)]
-#    set y [expr $y * $_limits(ymax) - $_limits(ymin)]
     set x $_view(pan-x)
     set y $_view(pan-y)
@@ -995 +1015 @@
         }
     }
+}
+
+itcl::body Rappture::VtkViewer::Pick {x y} {
+    foreach tag [CurrentDatasets -visible] {
+        SendCmd "dataset getscalar pixel $x $y $tag"
+    } 
 }
 
@@ -1395 +1421 @@
         incr row
     }
+    checkbutton $inner.ortho \
+        -text "Orthogrpahic" \
+        -variable [itcl::scope _view(ortho)] \
+        -command [itcl::code $this camera set ortho] \
+        -font "Arial 9"
+    blt::table $inner \
+            $row,0 $inner.ortho -columnspan 2 -anchor w -pady 2
+    blt::table configure $inner r$row -resize none
+    incr row
+
     blt::table configure $inner c0 c1 -resize none
     blt::table configure $inner c2 -resize expand
@@ -1414 +1450 @@
             set code [catch { string is double $x } result]
             if { $code != 0 || !$result } {
-                set x _view($who)
                 return
             }
             switch -- $who {
+                "ortho" {
+                    if {$_view(ortho)} {
+                        SendCmd "camera mode ortho"
+                    } else {
+                        SendCmd "camera mode persp"
+                    }
+                }
                 "pan-x" - "pan-y" {
                     PanCamera