Changeset 4343

Timestamp:

Apr 16, 2014 10:37:36 AM (10 years ago)

Author:

ldelgass

Message:

Camera setting fixes

Location:

trunk/gui/scripts

Files:

• nanovisviewer.tcl (modified) (1 diff)
• vtkvolumeviewer.tcl (modified) (5 diffs)

trunk/gui/scripts/nanovisviewer.tcl

@@ -1980 +1980 @@
             -textvariable [itcl::scope _settings(-$tag)]
         bind $inner.${tag} <Return> \
-            [itcl::code $this camera set ${tag}]
+            [itcl::code $this camera set -${tag}]
         bind $inner.${tag} <KP_Enter> \
-            [itcl::code $this camera set ${tag}]
+            [itcl::code $this camera set -${tag}]
         blt::table $inner \
             $row,0 $inner.${tag}label -anchor e -pady 2 \

trunk/gui/scripts/vtkvolumeviewer.tcl

@@ -1 +1 @@
 # -*- mode: tcl; indent-tabs-mode: nil -*- 
-
-# ----------------------------------------------------------------------
-#  COMPONENT: VtkVolumeViewer - Vtk volume viewer
+# ----------------------------------------------------------------------
+#  COMPONENT: vtkvolumeviewer - Vtk volume viewer
 #
 #  It connects to the Vtk server running on a rendering farm,
@@ -8 +7 @@
 # ======================================================================
 #  AUTHOR:  Michael McLennan, Purdue University
-#  Copyright (c) 2004-2012  HUBzero Foundation, LLC
+#  Copyright (c) 2004-2014  HUBzero Foundation, LLC
 #
 #  See the file "license.terms" for information on usage and
@@ -1920 +1919 @@
         "outer_edges"     "outer"         
     $itk_component(axismode) value "static"
-    bind $inner.mode <<Value>> [itcl::code $this AdjustSetting axisFlyMode]
+    bind $inner.mode <<Value>> [itcl::code $this AdjustSetting -axisflymode]
 
     blt::table $inner \
@@ -1955 +1954 @@
 
     set row 1
-
-    set labels { -qx -qy -qz -qw -xpan -ypan -zoom }
+    set labels { qx qy qz qw xpan ypan zoom }
     foreach tag $labels {
-        label $inner.${tag}label -text $tag -font "Arial 9"
+        label $inner.${tag}-label -text $tag -font "Arial 9"
         entry $inner.${tag} -font "Arial 9"  -bg white \
-            -textvariable [itcl::scope _view($tag)]
-        bind $inner.${tag} <KeyPress-Return> \
-            [itcl::code $this camera set ${tag}]
+            -textvariable [itcl::scope _view(-$tag)]
+        bind $inner.${tag} <Return> \
+            [itcl::code $this camera set -${tag}]
+        bind $inner.${tag} <KP_Enter> \
+            [itcl::code $this camera set -${tag}]
         blt::table $inner \
-            $row,0 $inner.${tag}label -anchor e -pady 2 \
+            $row,0 $inner.${tag}-label -anchor e -pady 2 \
             $row,1 $inner.${tag} -anchor w -pady 2
         blt::table configure $inner r$row -resize none
@@ -1972 +1972 @@
         -text "Orthographic Projection" \
         -variable [itcl::scope _view(-ortho)] \
-        -command [itcl::code $this camera set ortho] \
+        -command [itcl::code $this camera set -ortho] \
         -font "Arial 9"
     blt::table $inner \