Changeset 5160

Timestamp:

Mar 21, 2015, 2:59:48 PM (10 years ago)

Author:

ldelgass

Message:

Override SendCmd? method from VisViewer? superclass rather than using a renamed
method

File:

• trunk/gui/scripts/molvisviewer.tcl (modified) (35 diffs)

trunk/gui/scripts/molvisviewer.tcl

@@ -1 +1 @@
 # -*- mode: tcl; indent-tabs-mode: nil -*-
-
 # ----------------------------------------------------------------------
 #  COMPONENT: molvisviewer - view a molecule in 3D
@@ -117 +116 @@
     protected method Rebuild { }
     protected method Rotate {option x y}
-    protected method ServerCmd { string }
+    protected method SendCmd { string }
     protected method Unmap {}
     protected method Vmouse  {option b m x y}
@@ -699 +698 @@
             lappend info "user" $user
             lappend info "session" $session
-            ServerCmd "clientinfo [list $info]"
+            SendCmd "clientinfo [list $info]"
         }
 
@@ -731 +730 @@
 }
 
-itcl::body Rappture::MolvisViewer::ServerCmd { cmd } {
-    debug "in ServerCmd ($cmd)\n"
+itcl::body Rappture::MolvisViewer::SendCmd { cmd } {
+    debug "in SendCmd ($cmd)\n"
 
     if { $_state(server) != $_state(client) } {
-        SendCmd "frame -defer $_state(client)"
+        VisViewer::SendCmd "frame -defer $_state(client)"
         set _state(server) $_state(client)
     }
     if { $_rocker(server) != $_rocker(client) } {
-        SendCmd "rock -defer $_rocker(client)"
+        VisViewer::SendCmd "rock -defer $_rocker(client)"
         set _rocker(server) $_rocker(client)
     }
-    SendCmd "$cmd"
+    VisViewer::SendCmd "$cmd"
 }
 
@@ -891 +890 @@
         set _cacheid 0
 
-        ServerCmd "raw -defer {set auto_color,0}"
-        ServerCmd "raw -defer {set auto_show_lines,0}"
+        SendCmd "raw -defer {set auto_color,0}"
+        SendCmd "raw -defer {set auto_show_lines,0}"
     }
     set _first ""
@@ -935 +934 @@
                 lappend info "tool_revision" \
                     [$xmlobj get tool.version.application.revision]
-                ServerCmd "clientinfo [list $info]"
+                SendCmd "clientinfo [list $info]"
             }
             foreach _atom [$dataobj children -type atom components.molecule] {
@@ -965 +964 @@
                 # We know we're buffered here, so append the "loadpdb" command
                 # with the data payload immediately afterwards.
-                ServerCmd "loadpdb -defer follows $model $state $numBytes"
+                SendCmd "loadpdb -defer follows $model $state $numBytes"
                 SendData $data1
                 set _dataobjs($model-$state)  1
@@ -978 +977 @@
                 # We know we're buffered here, so append the "loadpdb" command
                 # with the data payload immediately afterwards.
-                ServerCmd "loadpdb -defer follows $model $state $numBytes"
+                SendCmd "loadpdb -defer follows $model $state $numBytes"
                 SendData $data2
                 set _dataobjs($model-$state)  1
@@ -1027 +1026 @@
                     # We know we're buffered here, so append the "loadpdb"
                     # command with the data payload immediately afterwards.
-                    ServerCmd "loadpdb -defer follows $model $state $numBytes"
+                    SendCmd "loadpdb -defer follows $model $state $numBytes"
                     SendData $data3
                 }
@@ -1051 +1050 @@
         if { $vector != "" } {
             set vertices [ComputeParallelepipedVertices $dataobj]
-            ServerCmd "raw -defer {verts = \[$vertices\]\n}"
-            ServerCmd "raw -defer {run \$PYMOL_SITE_PATH/rappture/box.py\n}"
-            ServerCmd "raw -defer {draw_box(verts)\n}"
+            SendCmd "raw -defer {verts = \[$vertices\]\n}"
+            SendCmd "raw -defer {run \$PYMOL_SITE_PATH/rappture/box.py\n}"
+            SendCmd "raw -defer {draw_box(verts)\n}"
             set _cell 1
         }
@@ -1063 +1062 @@
     foreach model [array names _mlist] {
         if { $_mlist($model) == 1 } {
-            ServerCmd "disable -defer $model"
+            SendCmd "disable -defer $model"
             set _mlist($model) 0
             set changed 1
         } elseif { $_mlist($model) == 2 } {
             set _mlist($model) 1
-            ServerCmd "enable -defer $model"
+            SendCmd "enable -defer $model"
             set changed 1
         } elseif { $_mlist($model) == 3 } {
@@ -1084 +1083 @@
                 set rep $_model($model-newrep)
                 set transp $_model($model-newtransparency)
-                ServerCmd "representation -defer -model $model $rep"
+                SendCmd "representation -defer -model $model $rep"
                 set changed 1
                 set _model($model-transparency) $_model($model-newtransparency)
@@ -1103 +1102 @@
         set _state(server) 1
         set _state(client) 1
-        ServerCmd "frame 1"
+        SendCmd "frame 1"
         set flush 1
     } elseif { ![info exists _imagecache($state,$_rocker(client))] } {
         set _state(server) $state
         set _state(client) $state
-        ServerCmd "frame $state"
+        SendCmd "frame $state"
         set flush 1
     } else {
@@ -1120 +1119 @@
         set w  [winfo width $itk_component(3dview)]
         set h  [winfo height $itk_component(3dview)]
-        ServerCmd "reset"
-        ServerCmd "screen $w $h"
-        ServerCmd "rotate $_view(mx) $_view(my) $_view(mz)"
-        ServerCmd "pan $_view(x) $_view(y)"
-        ServerCmd "zoom $_view(zoom)"
+        SendCmd "reset"
+        SendCmd "screen $w $h"
+        SendCmd "rotate $_view(mx) $_view(my) $_view(mz)"
+        SendCmd "pan $_view(x) $_view(y)"
+        SendCmd "zoom $_view(zoom)"
         debug "rebuild: rotate $_view(mx) $_view(my) $_view(mz)"
 
-        ServerCmd "raw -defer {zoom complete=1}"
+        SendCmd "raw -defer {zoom complete=1}"
         set _reset 0
     }
@@ -1151 +1150 @@
         set readyForNextFrame 0;        # Don't advance to the next frame
                                         # until we get an image.
-        #ServerCmd "ppm";                 # Flush the results.
+        #SendCmd "ppm";                 # Flush the results.
     }
     blt::busy hold $itk_component(hull)
@@ -1183 +1182 @@
 
 itcl::body Rappture::MolvisViewer::DoResize { } {
-    ServerCmd "screen $_width $_height"
+    SendCmd "screen $_width $_height"
     $_image(plot) configure -width $_width -height $_height
     # Immediately invalidate cache, defer update until mapped
@@ -1200 +1199 @@
 
 itcl::body Rappture::MolvisViewer::DoRotate {} {
-    ServerCmd "rotate $_view(a) $_view(b) $_view(c)"
+    SendCmd "rotate $_view(a) $_view(b) $_view(c)"
     array unset _imagecache
     set _rotatePending 0
@@ -1245 +1244 @@
         set _view(y) [expr $_view(y) + $dy]
         array unset _imagecache
-        ServerCmd "pan $dx $dy"
+        SendCmd "pan $dx $dy"
         return
     }
@@ -1260 +1259 @@
         set _view(y) [expr $_view(y) + $dy]
         array unset _imagecache
-        ServerCmd "pan $dx $dy"
+        SendCmd "pan $dx $dy"
     }
     set _mevent(x) $x
@@ -1281 +1280 @@
         "in" {
             set _view(zoom) [expr $_view(zoom) + $factor]
-            ServerCmd "zoom $factor"
+            SendCmd "zoom $factor"
         }
         "out" {
             set _view(zoom) [expr $_view(zoom) - $factor]
-            ServerCmd "zoom -$factor"
+            SendCmd "zoom -$factor"
         }
         "reset" {
             set _view(zoom) 0
-            ServerCmd "reset"
+            SendCmd "reset"
         }
     }
@@ -1332 +1331 @@
         if { ![info exists _imagecache($_state(server),$_rocker(client))] } {
             set _rocker(server) $_rocker(client)
-            ServerCmd "rock $_rocker(client)"
+            SendCmd "rock $_rocker(client)"
         }
         UpdateState
@@ -1365 +1364 @@
         }
     }
-    ServerCmd "vmouse $vButton $vModifier $vState $x $y"
+    SendCmd "vmouse $vButton $vModifier $vState $x $y"
     set _mevent(time) $now
 }
@@ -1424 +1423 @@
         set _view(my) [expr {$_view(my) + $my}]
         set _view(mz) [expr {$_view(mz) + $mz}]
-        #ServerCmd "rotate $mx $my $mz"
+        #SendCmd "rotate $mx $my $mz"
         EventuallyRotate $mx $my $mz
         debug "_vmmouse: rotate $_view(mx) $_view(my) $_view(mz)"
@@ -1522 +1521 @@
                 }]
                 EventuallyRotate $a $b $c
-                #ServerCmd "rotate $a $b $c"
+                #SendCmd "rotate $a $b $c"
                 debug "Rotate $x $y: rotate $_view(vx) $_view(vy) $_view(vz)"
                 set _click(x) $x
@@ -1581 +1580 @@
     }
     if { [isconnected] } {
-        ServerCmd "representation -model $model $option"
+        SendCmd "representation -model $model $option"
         #$_dispatcher event -idle !rebuild
     }
@@ -1622 +1621 @@
             "Use perspective projection"
         set _settings($this-ortho) 1
-        ServerCmd "orthoscopic on"
+        SendCmd "orthoscopic on"
     } else {
         $itk_component(ortho) configure -image [Rappture::icon molvis-3dpers]
@@ -1628 +1627 @@
             "Use orthoscopic projection"
         set _settings($this-ortho) 0
-        ServerCmd "orthoscopic off"
+        SendCmd "orthoscopic off"
     }
 }
@@ -1662 +1661 @@
             "Hide the cell."
         set _settings($this-showcell) 1
-        ServerCmd "raw {show everything,unitcell}"
+        SendCmd "raw {show everything,unitcell}"
     } else {
         Rappture::Tooltip::for $itk_component(ortho) \
             "Show the cell."
         set _settings($this-showcell) 0
-        ServerCmd "raw {hide everything,unitcell}"
+        SendCmd "raw {hide everything,unitcell}"
     }
 }
@@ -1690 +1689 @@
         height  0
     }
-    ServerCmd "reset"
+    SendCmd "reset"
     DoResize
-    ServerCmd "rotate $_view(mx) $_view(my) $_view(mz)"
+    SendCmd "rotate $_view(mx) $_view(my) $_view(mz)"
     debug "ResetView: rotate $_view(mx) $_view(my) $_view(mz)"
-    ServerCmd "pan $_view(x) $_view(y)"
-    ServerCmd "zoom $_view(zoom)"
+    SendCmd "pan $_view(x) $_view(y)"
+    SendCmd "zoom $_view(zoom)"
 }
 
@@ -1779 +1778 @@
     focus $inner.cancel
 
-    ServerCmd "print $token $width $height $bgcolor"
+    SendCmd "print $token $width $height $bgcolor"
 
     $popup activate $widget below
@@ -1843 +1842 @@
     set _settings($this-spherescale) $radius
     if { $models == "all" } {
-        ServerCmd "spherescale -model all $radius"
+        SendCmd "spherescale -model all $radius"
         return
     }
     set overrideradius [expr $radius * 0.8]
-    ServerCmd "spherescale -model all $overrideradius"
+    SendCmd "spherescale -model all $overrideradius"
     foreach model $models {
         if { [info exists _active($model)] } {
-            ServerCmd "spherescale -model $model $radius"
+            SendCmd "spherescale -model $model $radius"
         }
     }
@@ -1879 +1878 @@
     set _settings($this-stickradius) $radius
     if { $models == "all" } {
-        ServerCmd "stickradius -model all $radius"
+        SendCmd "stickradius -model all $radius"
         return
     }
     set overrideradius [expr $radius * 0.8]
-    ServerCmd "stickradius -model all $overrideradius"
+    SendCmd "stickradius -model all $overrideradius"
     foreach model $models {
         if { [info exists _active($model)] } {
-            ServerCmd "stickradius -model $model $radius"
+            SendCmd "stickradius -model $model $radius"
         }
     }
@@ -1918 +1917 @@
     set models [array names _active]
     if { [llength $models] == 0 } {
-        ServerCmd "transparency -model all $transparency"
+        SendCmd "transparency -model all $transparency"
         return
     }
     set overridetransparency 0.60
-    ServerCmd "transparency -model all $overridetransparency"
+    SendCmd "transparency -model all $overridetransparency"
     foreach model $models {
-        ServerCmd "transparency -model $model $transparency"
+        SendCmd "transparency -model $model $transparency"
     }
 }
@@ -1948 +1947 @@
     set _settings($this-showlabels) $showlabels
     if { $models == "all" } {
-        ServerCmd "label -model all $showlabels"
+        SendCmd "label -model all $showlabels"
         return
     }
-    ServerCmd "label -model all off"
+    SendCmd "label -model all off"
     if { $showlabels } {
         foreach model $models {
             if { [info exists _active($model)] } {
-                ServerCmd "label -model $model $showlabels"
+                SendCmd "label -model $model $showlabels"
             }
         }
@@ -1980 +1979 @@
     set _settings($this-cartoontrace) $trace
     if { $models == "all" } {
-        ServerCmd "cartoontrace -model all $trace"
+        SendCmd "cartoontrace -model all $trace"
         return
     }
-    ServerCmd "cartoontrace -model all off"
+    SendCmd "cartoontrace -model all off"
     if { $trace } {
         foreach model $models {
             if { [info exists _active($model)] } {
-                ServerCmd "cartoontrace -model $model $trace"
+                SendCmd "cartoontrace -model $model $trace"
             }
         }