--- ray/src/util/do_action.tcl 1994/10/27 15:56:06 2.1 +++ ray/src/util/do_action.tcl 1994/11/30 15:23:56 2.5 @@ -37,7 +37,6 @@ proc make_oct args { # Make octree file ($args is {-t set fi [open "|make $radvar(OCTREE) $args" r] while {[gets $fi curmess] >= 0} { update ; after 1000 } catch {close $fi} curmess - if {"$args" == {}} {return} } if {"$args" == {}} { run_rad -v 0 @@ -101,7 +100,7 @@ proc kill_batch {} { # kill batch rendering switch -glob [exec uname] { SunOS - ULTRIX {set ps "ps -lg"} - default {set ps "ps -lu $env(USER)"} + default {set ps "ps -lu $env(LOGNAME)"} } set fi [open "|$ps" r] gets $fi li @@ -144,29 +143,25 @@ proc make_vmenus {} { # make/update view menus set rvview [lindex [lindex $radvar(view) 0] 0] } catch {destroy $mywin.rivmb.m} + catch {destroy $mywin.rbvmb.m} if {[llength $radvar(view)] < 2} { $mywin.rivmb configure -state disabled - } else { - menu $mywin.rivmb.m - $mywin.rivmb configure -menu $mywin.rivmb.m - foreach v $radvar(view) { - $mywin.rivmb.m add radiobutton -label [lindex $v 0] \ - -variable rvview -value [lindex $v 0] - } + return } - catch {destroy $mywin.rbvmb.m} - if {[llength $radvar(view)] < 2} { - $mywin.rbvmb configure -state disabled - } else { - menu $mywin.rbvmb.m - $mywin.rbvmb configure -menu $mywin.rbvmb.m - $mywin.rbvmb.m add radiobutton -label ALL \ - -variable rpview -value " ALL" - $mywin.rbvmb.m add separator - foreach v $radvar(view) { - $mywin.rbvmb.m add radiobutton -label [lindex $v 0] \ - -variable rpview -value [lindex $v 0] - } + menu $mywin.rivmb.m + $mywin.rivmb configure -menu $mywin.rivmb.m -state normal + foreach v $radvar(view) { + $mywin.rivmb.m add radiobutton -label [lindex $v 0] \ + -variable rvview -value [lindex $v 0] + } + menu $mywin.rbvmb.m + $mywin.rbvmb configure -menu $mywin.rbvmb.m + $mywin.rbvmb.m add radiobutton -label ALL \ + -variable rpview -value " ALL" + $mywin.rbvmb.m add separator + foreach v $radvar(view) { + $mywin.rbvmb.m add radiobutton -label [lindex $v 0] \ + -variable rpview -value [lindex $v 0] } }