Changeset 3330 for trunk/gui/scripts/vtkvolumeviewer.tcl

Timestamp:

Feb 24, 2013 1:11:18 PM (11 years ago)

Author:

gah

Message:

merge (by hand) with Rappture1.2 branch

File:

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

trunk/gui/scripts/vtkvolumeviewer.tcl

@@ +1 @@
+# -*- mode: tcl; indent-tabs-mode: nil -*- 
 
 # ----------------------------------------------------------------------
@@ -211 +212 @@
     $_parser alias dataset [itcl::code $this ReceiveDataset]
     $_parser alias legend [itcl::code $this ReceiveLegend]
+    $_parser alias viserror [itcl::code $this ReceiveError]
 
     array set _outline {
@@ -293 +295 @@
     bind $c <KeyPress-Down>  [list %W yview scroll -10 units]
     bind $c <Enter> "focus %W"
+    bind $c <Control-F1> [itcl::code $this ToggleConsole]
 
     # Fixes the scrollregion in case we go off screen
@@ -1034 +1037 @@
         }
 
-        if 0 {
+        if 1 {
             # Tell the server the name of the tool, the version, and dataset
             # that we are rendering.  Have to do it here because we don't know
@@ -1042 +1045 @@
             lappend args version [$_first hints toolRevision]
             lappend args dataset [$_first hints label]
-            SendCmd "clientinfo $args"
+            SendCmd "clientinfo [list $args]"
         }
 
@@ -2169 +2172 @@
 
     itk_component add xCutScale {
-        ::scale $inner.xval -from 100 -to 1 \
+        ::scale $inner.xval -from 100 -to 0 \
             -width 10 -orient vertical -showvalue yes \
             -borderwidth 1 -highlightthickness 0 \
@@ -2196 +2199 @@
 
     itk_component add yCutScale {
-        ::scale $inner.yval -from 100 -to 1 \
+        ::scale $inner.yval -from 100 -to 0 \
             -width 10 -orient vertical -showvalue yes \
             -borderwidth 1 -highlightthickness 0 \
@@ -2223 +2226 @@
 
     itk_component add zCutScale {
-        ::scale $inner.zval -from 100 -to 1 \
+        ::scale $inner.zval -from 100 -to 0 \
             -width 10 -orient vertical -showvalue yes \
             -borderwidth 1 -highlightthickness 0 \