Changeset 5728 for branches/1.4

Timestamp:

Jun 22, 2015, 11:57:35 AM (9 years ago)

Author:

ldelgass

Message:

merge r5725:5726 from trunk

Location:

branches/1.4

Files:

• . (modified) (1 prop)
• gui/scripts/molvisviewer.tcl (modified) (12 diffs)
• gui/scripts/visviewer.tcl (modified) (2 diffs)

branches/1.4/gui/scripts/molvisviewer.tcl

@@ -26 +26 @@
     Rappture::resources::register \
         molvis_server Rappture::MolvisViewer::SetServerList
-}
-
-set debug 0
-proc debug { args } {
-    global debug
-    if { $debug } {
-        puts stderr "[info level -1]: $args"
-    }
 }
 
@@ -159 +151 @@
 itcl::body Rappture::MolvisViewer::constructor {servers args} {
     set _serverType "pymol"
+
+    #DebugOn
 
     # Register events to the dispatcher.  Base class expects !rebuild
@@ -468 +462 @@
         }
         set _dobj2raise($dataobj) $params(-raise)
-        debug "setting parameters for $dataobj"
+        DebugTrace "setting parameters for $dataobj"
 
         if { [isconnected] } {
@@ -726 +720 @@
 
 itcl::body Rappture::MolvisViewer::SendCmd { cmd } {
-    debug "cmd: ($cmd)"
+    DebugTrace "cmd: ($cmd)"
 
     if { $_state(server) != $_state(client) } {
@@ -758 +752 @@
     }
     set data [ReceiveBytes $size]
-    #debug "success: reading $size bytes from proxy"
+    #DebugTrace "success: reading $size bytes from proxy"
     if { [string match "print*" $cacheid] } {
         # $frame is the token that we sent to the proxy.
@@ -765 +759 @@
     } else {
         set _imagecache($tag) $data
-        #debug "CACHED: $tag,$cacheid"
+        #DebugTrace "CACHED: $tag,$cacheid"
         $_image(plot) configure -data $data
         set _image(id) $tag
@@ -872 +866 @@
 # ----------------------------------------------------------------------
 itcl::body Rappture::MolvisViewer::Rebuild {} {
-    debug "Enter"
+    DebugTrace "Enter"
     set changed 0
 
@@ -1119 +1113 @@
         SendCmd "pan $_view(xpan) $_view(ypan)"
         SendCmd "zoom $_view(zoom)"
-        debug "rotate $_view(mx) $_view(my) $_view(mz)"
+        DebugTrace "rotate $_view(mx) $_view(my) $_view(mz)"
 
         SendCmd "raw -defer {zoom complete=1}"
@@ -1151 +1145 @@
     blt::busy release $itk_component(hull)
 
-    debug "Exit"
+    DebugTrace "Exit"
 }
 
@@ -1430 +1424 @@
         #SendCmd "rotate $mx $my $mz"
         EventuallyRotate $mx $my $mz
-        debug "rotate $_view(mx) $_view(my) $_view(mz)"
+        DebugTrace "rotate $_view(mx) $_view(my) $_view(mz)"
     }
     set _mevent(x) $x
@@ -1527 +1521 @@
                 EventuallyRotate $a $b $c
                 #SendCmd "rotate $a $b $c"
-                debug "x,y: $x $y: rotate $_view(vx) $_view(vy) $_view(vz)"
+                DebugTrace "x,y: $x $y: rotate $_view(vx) $_view(vy) $_view(vz)"
                 set _click(x) $x
                 set _click(y) $y
@@ -1692 +1686 @@
     DoResize
     SendCmd "rotate $_view(mx) $_view(my) $_view(mz)"
-    debug "rotate $_view(mx) $_view(my) $_view(mz)"
+    DebugTrace "rotate $_view(mx) $_view(my) $_view(mz)"
     SendCmd "pan $_view(xpan) $_view(ypan)"
     SendCmd "zoom $_view(zoom)"

branches/1.4/gui/scripts/visviewer.tcl

@@ -43 +43 @@
     #private variable _idleTimeout 0;       # No timeout
 
+    protected variable _debug 0
     protected variable _serverType "???";# Type of server.
     protected variable _sid ""      ;   # socket connection to server
@@ -84 +85 @@
     protected method ColorsToColormap { colors }
     protected method Connect { servers }
+    protected method DebugOff {} {
+        set _debug 0
+    }
+    protected method DebugOn {} {
+        set _debug 1
+    }
+    protected method DebugTrace { args } {
+        if { $_debug } {
+            puts stderr "[info level -1]: $args"
+        }
+    }
     protected method DisableWaitDialog {}
     protected method Disconnect {}