Changeset 6499 for vmdshow/branches

Timestamp:

Aug 25, 2016, 2:01:53 PM (8 years ago)

Author:

ldelgass

Message:

merge from vmdshow trunk

Location:

vmdshow/branches/0.1

Files:

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

vmdshow/branches/0.1/vmdserver.tcl

@@ -11 +11 @@
 
 # The VMD TCL interpreter is by default interactive.  Turn this off
-# so that unknown commands like "scene" don't get exec-ed. 
+# so that unknown commands like "scene" don't get exec-ed.
 set ::tcl_interactive 0
 
@@ -47 +47 @@
 set DisplayProps(options) ""
 foreach key {
-    ambientocclusion antialias aoambient aodirect
+    ambientocclusion
+    antialias
+    aoambient
+    aodirect
     backgroundgradient
-    culling cuestart cueend cuedensity cuemode
-    depthcue distance
+    cuedensity
+    cueend
+    cuemode
+    cuestart
+    culling
+    depthcue
+    distance
     eyesep
-    farclip focallength
+    farclip
+    focallength
     height
     nearclip
     projection
-    shadows stereo
+    shadows
+    stereo
 } {
     if {$key eq "nearclip" || $key eq "farclip"} {
@@ -458 +468 @@
 
     set slot 0
+    set op "badOp"
     foreach file $fileList {
         if {[regexp {^@name:(.+)} $file match name]} {
@@ -471 +482 @@
         mol $op $file waitfor all
         if { ![info exists name] } {
-            puts stderr "can't find name file=$file"
+            puts stderr "can't find name for file: \"$file\""
         }
         if {$op eq "new"} {
@@ -502 +513 @@
 # defines the script that loads a scene called <id>.  The "show"
 # operation executes that script to show the scene.  The "clear"
-# operation clears the current scene (usually in preparation for 
+# operation clears the current scene (usually in preparation for
 # showing another scene).  The "forget" operation erases one or more
 # scene definitions; if no ids are specified, then all scenes are
@@ -555 +566 @@
 
             if {[catch {$parser eval $Scenes($id)} result]} {
-                error "$result\nwhile loading scene \"$id\""
+                global errorInfo
+                error "$errorInfo\n$result\nwhile loading scene \"$id\""
             }
 
@@ -857 +869 @@
 proc cmd_atomselect {args} {
     global parser
-    
-    foreach arg $args { 
+
+    foreach arg $args {
         if { $arg == "writepdb" } {
             error "autoselect \"writepdb\" option is disallowed"
@@ -864 +876 @@
     }
     set cmd [eval atomselect $args]
-    $parser alias $cmd $cmd
+    catch { $parser alias $cmd $cmd }
     return $cmd
 }
-    
+
 $parser alias atomselect cmd_atomselect
 
@@ -906 +918 @@
 
 proc server_handle {cin cout} {
-    global parser buffer client 
+    global parser buffer client
 
     if {[gets $cin line] < 0} {
@@ -966 +978 @@
     catch {close $cin}
     catch {exit $code}
-    
+
 }
 
@@ -1057 +1069 @@
 
 proc server_set_temporary_directory { path } {
-    global tmpDir 
+    global tmpDir
 
     set tmpDir $path
@@ -1100 +1112 @@
 # The VMD TCL interpreter is by default interactive.  Their version
 # of tkconsole always turns this on.  Turn this off
-# so that unknown commands like "scene" don't get exec-ed. 
+# so that unknown commands like "scene" don't get exec-ed.
 set ::tcl_interactive 0