Changeset 6430 for vmdshow/branches/0.1/vmdserver.tcl

Timestamp:

Jul 18, 2016, 2:59:33 PM (8 years ago)

Author:

ldelgass

Message:

Merge from vmdshow trunk

Location:

vmdshow/branches/0.1

Files:

• . (modified) (1 prop)
• vmdserver.tcl (modified) (9 diffs)

vmdshow/branches/0.1/vmdserver.tcl

@@ -442 +442 @@
 # ----------------------------------------------------------------------
 proc cmd_load { fileList } {
-    puts stderr "cmd_load fileList=$fileList\n"
     global MolInfo MolNames tmpDir
 
@@ -457 +456 @@
         set fileList [linsert $fileList 0 "@name:0"]
     }
-    puts stderr "2. cmd_load fileList=$fileList"
 
     set slot 0
     foreach file $fileList {
-    puts stderr "file=$file\n"
         if {[regexp {^@name:(.+)} $file match name]} {
             set op "new"
@@ -589 +586 @@
             }
             set Scenes(@CURRENT) ""
-            catch {unset Views}
+            array unset Views
+            array unset ViewCmds
 
             # reset the server properties
@@ -614 +612 @@
 }
 $parser alias scene cmd_scene
+
+proc FramesDefview { frameNum matrixNameList matrixValueList } {
+    global Views
+    if { ![string is int $frameNum] } {
+        error "bad frame value \"$frameNum\""
+    }
+    set Views($frameNum) [list $matrixNameList $matrixValueList]
+}
+
+proc FramesSetViewCmds { frameNum cmds } {
+    global ViewCmds
+    if { ![string is int $frameNum] } {
+        error "bad frame value \"$frameNum\""
+    }
+    set ViewCmds($frameNum) [join $cmds \;]
+}
 
 # ----------------------------------------------------------------------
@@ -684 +698 @@
         # new epoch? then clean out work queue
         if {$epochValue > $Epoch} {
-            catch {unset Work}
+            array unset Work
             set Work(queue) ""
             set Epoch $epochValue
@@ -780 +794 @@
       }
       defview {
-          if {[llength $args] != 3} { error "wrong # args: should be \"defview matrixNameList matrixValueList\"" }
-          set n [lindex $args 0]
-          if {![string is int $n]} { error "bad frame value \"$n\"" }
-          set Views($n) [lrange $args 1 end]
+          eval FramesDefview $args
+      }
+      setcmds {
+          eval FramesSetViewCmds $args
       }
       max {
@@ -804 +818 @@
       }
       default {
-        error "bad option \"$what\": should be defview, time, rotate, max"
+        error "bad option \"$what\": should be defview, time, rotate, setcmds, or max"
       }
     }
@@ -963 +977 @@
 
 proc server_send_image {{when -now}} {
-    global client Epoch Work Views Sendqueue DisplaySize
+    global client Epoch Work Views ViewCmds Sendqueue DisplaySize
 
     if {$when eq "-eventually"} {
@@ -1017 +1031 @@
             }
         }
-        catch {unset Work($item(num))}
+        if { [info exists item(frame)] &&
+             [info exists ViewCmds($item(frame))] } {
+            if { [catch {
+                eval $ViewCmds($item(frame))
+            } errs] != 0 }  {
+                puts stderr "viewcmd error: $errs"
+            }
+        }
+        array unset Work $item(num)
         break
     }