--- ray/src/util/do_action.tcl 1994/12/06 13:00:31 2.6 +++ ray/src/util/do_action.tcl 2004/01/01 19:31:46 2.11 @@ -1,4 +1,4 @@ -# SCCSid "$SunId$ LBL" +# RCSid: $Id: do_action.tcl,v 2.11 2004/01/01 19:31:46 greg Exp $ # # Action screen for trad # @@ -73,7 +73,8 @@ proc run_batch {} { # start rendering in background return } # Make space for PID to be written later - puts $fo " " + puts $fo \ +" " if {$rpview == " ALL"} { set radcom "rad" } else { @@ -173,7 +174,7 @@ proc do_action w { # Action screen global rifname rvview rpview radvar bfname batch_pid \ curmess scname mywin alldone batch_fmt hostname if {"$w" == "done"} { - unset rpview bfname batch_pid mywin + unset rvview rpview bfname batch_pid mywin return } set bfname [file rootname [file tail $rifname]].err @@ -195,10 +196,10 @@ proc do_action w { # Action screen # Render interactively label $w.ril -text {Render interactively} place $w.ril -relx .1429 -rely .2439 - button $w.rirv -text rview -relief raised \ + button $w.rirv -text rvu -relief raised \ -command {run_rad -v $rvview -o x11} place $w.rirv -relwidth .1071 -relheight .0610 -relx .4643 -rely .2439 - helplink $w.rirv trad action rview + helplink $w.rirv trad action rvu label $w.rivl -text View: place $w.rivl -relx .6072 -rely .2439 menubutton $w.rivmb -textvariable rvview -anchor w -relief raised @@ -222,10 +223,14 @@ proc do_action w { # Action screen -command {view_txt $bfname} place $w.rbce -relwidth .1786 -relheight .0610 -relx .6429 -rely .5488 helplink $w.rbce trad action checkerr - if [file exists $bfname] { + if [file isfile $bfname] { set fi [open $bfname r] - scan [gets $fi] $batch_fmt batch_pid batch_host - gets $fi radcom + if {[scan [gets $fi] $batch_fmt batch_pid batch_host] != 2} { + set batch_host unknown + set radcom {} + } else { + gets $fi radcom + } close $fi if [string match "rad -v *" $radcom] { set rpview [lindex $radcom 2] @@ -235,10 +240,10 @@ proc do_action w { # Action screen if {"$hostname" != "$batch_host"} { if $alldone { set curmess "Batch rendering finished\ - on host $batch_host." + on $batch_host." } else { - set curmess "Unknown batch rendering status\ - on host $batch_host." + set curmess "Batch rendering on\ + $batch_host -- status UNKNOWN." $w.rbst configure -state disabled $w.rbvmb configure -state disabled }