Changeset 6499


Ignore:
Timestamp:
Aug 25, 2016 2:01:53 PM (6 years ago)
Author:
ldelgass
Message:

merge from vmdshow trunk

Location:
vmdshow/branches/0.1
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • vmdshow/branches/0.1

  • vmdshow/branches/0.1/vmdserver.tcl

    r6430 r6499  
    1111
    1212# The VMD TCL interpreter is by default interactive.  Turn this off
    13 # so that unknown commands like "scene" don't get exec-ed. 
     13# so that unknown commands like "scene" don't get exec-ed.
    1414set ::tcl_interactive 0
    1515
     
    4747set DisplayProps(options) ""
    4848foreach key {
    49     ambientocclusion antialias aoambient aodirect
     49    ambientocclusion
     50    antialias
     51    aoambient
     52    aodirect
    5053    backgroundgradient
    51     culling cuestart cueend cuedensity cuemode
    52     depthcue distance
     54    cuedensity
     55    cueend
     56    cuemode
     57    cuestart
     58    culling
     59    depthcue
     60    distance
    5361    eyesep
    54     farclip focallength
     62    farclip
     63    focallength
    5564    height
    5665    nearclip
    5766    projection
    58     shadows stereo
     67    shadows
     68    stereo
    5969} {
    6070    if {$key eq "nearclip" || $key eq "farclip"} {
     
    458468
    459469    set slot 0
     470    set op "badOp"
    460471    foreach file $fileList {
    461472        if {[regexp {^@name:(.+)} $file match name]} {
     
    471482        mol $op $file waitfor all
    472483        if { ![info exists name] } {
    473             puts stderr "can't find name file=$file"
     484            puts stderr "can't find name for file: \"$file\""
    474485        }
    475486        if {$op eq "new"} {
     
    502513# defines the script that loads a scene called <id>.  The "show"
    503514# operation executes that script to show the scene.  The "clear"
    504 # operation clears the current scene (usually in preparation for 
     515# operation clears the current scene (usually in preparation for
    505516# showing another scene).  The "forget" operation erases one or more
    506517# scene definitions; if no ids are specified, then all scenes are
     
    555566
    556567            if {[catch {$parser eval $Scenes($id)} result]} {
    557                 error "$result\nwhile loading scene \"$id\""
     568                global errorInfo
     569                error "$errorInfo\n$result\nwhile loading scene \"$id\""
    558570            }
    559571
     
    857869proc cmd_atomselect {args} {
    858870    global parser
    859    
    860     foreach arg $args { 
     871
     872    foreach arg $args {
    861873        if { $arg == "writepdb" } {
    862874            error "autoselect \"writepdb\" option is disallowed"
     
    864876    }
    865877    set cmd [eval atomselect $args]
    866     $parser alias $cmd $cmd
     878    catch { $parser alias $cmd $cmd }
    867879    return $cmd
    868880}
    869    
     881
    870882$parser alias atomselect cmd_atomselect
    871883
     
    906918
    907919proc server_handle {cin cout} {
    908     global parser buffer client 
     920    global parser buffer client
    909921
    910922    if {[gets $cin line] < 0} {
     
    966978    catch {close $cin}
    967979    catch {exit $code}
    968    
     980
    969981}
    970982
     
    10571069
    10581070proc server_set_temporary_directory { path } {
    1059     global tmpDir 
     1071    global tmpDir
    10601072
    10611073    set tmpDir $path
     
    11001112# The VMD TCL interpreter is by default interactive.  Their version
    11011113# of tkconsole always turns this on.  Turn this off
    1102 # so that unknown commands like "scene" don't get exec-ed. 
     1114# so that unknown commands like "scene" don't get exec-ed.
    11031115set ::tcl_interactive 0
Note: See TracChangeset for help on using the changeset viewer.