--- ray/src/util/do_results.tcl 1995/09/28 14:11:51 2.4 +++ ray/src/util/do_results.tcl 2008/11/10 19:08:19 2.8 @@ -1,4 +1,4 @@ -# SCCSid "$SunId$ LBL" +# RCSid: $Id: do_results.tcl,v 2.8 2008/11/10 19:08:19 greg Exp $ # # Results screen for trad # @@ -34,10 +34,10 @@ set conv(ras-24,nam) "Sun 24-bit" set conv(ras-24,com) "ra_pr24 %s %s" set conv(ras-24,suf) .ras set conv(PS-bw,nam) "PostScript B&W" -set conv(PS-bw,com) "ra_ps %s %s" +set conv(PS-bw,com) "ra_ps -b -C %s %s" set conv(PS-bw,suf) .ps set conv(PS-clr,nam) "PostScript Color" -set conv(PS-clr,com) "ra_ps -c %s %s" +set conv(PS-clr,com) "ra_ps -c -C %s %s" set conv(PS-clr,suf) .ps set conv(tga-bw,nam) "Targa B&W" set conv(tga-bw,com) "ra_t8 -b %s %s" @@ -57,7 +57,7 @@ set conv(typ) tga-24 proc testappend {flst tf} { # test if tf exists and append to flst if so upvar $flst mylist - if [file exists $tf] { + if [file isfile $tf] { lappend mylist $tf } } @@ -67,9 +67,9 @@ proc list_views {} { # List finished and unfinished p set fpics {} set ufpics {} foreach vw $radvar(view) { - if [file exists ${rawfroot}_[lindex $vw 0].unf] { + if [file isfile ${rawfroot}_[lindex $vw 0].unf] { lappend ufpics [lindex $vw 0] - } elseif {[file exists $radvar(PICTURE)_[lindex $vw 0].pic]} { + } elseif {[file isfile $radvar(PICTURE)_[lindex $vw 0].hdr]} { lappend fpics [lindex $vw 0] } } @@ -102,9 +102,9 @@ proc get_selpics {{getall 0}} { # return selected pic global fvwbox ufvwbox radvar rawfroot set sl {} foreach i [$fvwbox curselection] { - testappend sl $radvar(PICTURE)_[$fvwbox get $i].pic + testappend sl $radvar(PICTURE)_[$fvwbox get $i].hdr if {$getall && $rawfroot != $radvar(PICTURE)} { - testappend sl ${rawfroot}_[$fvwbox get $i].pic + testappend sl ${rawfroot}_[$fvwbox get $i].hdr } if {$getall && $radvar(ZFILE) != {}} { testappend sl $radvar(ZFILE)_[$fvwbox get $i].zbf @@ -151,7 +151,7 @@ proc cnvpic {} { # Convert selected pictures set curmess "No finished pictures selected." foreach i [$fvwbox curselection] { set vw [$fvwbox get $i] - set p $radvar(PICTURE)_$vw.pic + set p $radvar(PICTURE)_$vw.hdr set df [format $convdest $vw] set curmess "Converting $p to $df..." update @@ -166,7 +166,7 @@ proc prtpic {} { # Print selected pictures global curmess prntcom radvar fvwbox set curmess "No finished pictures selected." foreach i [$fvwbox curselection] { - set p $radvar(PICTURE)_[$fvwbox get $i].pic + set p $radvar(PICTURE)_[$fvwbox get $i].hdr set curmess "Printing $p..." update set pc [format $prntcom $p]