diff options
| -rw-r--r-- | ds9/library/iis.tcl | 12 | ||||
| -rw-r--r-- | ds9/library/saveimage.tcl | 5 | ||||
| -rw-r--r-- | ds9/parsers/saveimageparser.tac | 11 |
3 files changed, 8 insertions, 20 deletions
diff --git a/ds9/library/iis.tcl b/ds9/library/iis.tcl index 837a6ed..8f13a39 100644 --- a/ds9/library/iis.tcl +++ b/ds9/library/iis.tcl @@ -382,17 +382,5 @@ proc ProcessSendIISCmd {proc id param {sock {}} {fn {}}} { iissend::YY_FLUSH_BUFFER iissend::yy_scan_string $param iissend::yyparse - return - - global current - - switch -- [string tolower [lindex $param 0]] { - filename { - if {$current(frame) != {}} { - $proc $id \ - "[$current(frame) get iis file name [lindex $param 1]]\n" - } - } - } } diff --git a/ds9/library/saveimage.tcl b/ds9/library/saveimage.tcl index 35f5d96..cf6b240 100644 --- a/ds9/library/saveimage.tcl +++ b/ds9/library/saveimage.tcl @@ -45,7 +45,6 @@ proc SaveImageDialog {format} { global tifffbox global pngfbox - puts "a:[array get tifffbox]" switch -- $format { fits {set fn [SaveFileDialog fitsfbox]} eps {set fn [SaveFileDialog epsfbox]} @@ -160,7 +159,7 @@ proc ProcessSaveImageCmd {varname iname} { incr i [expr $saveimage::yycnt-1] } -proc SaveimageCmdLoad {format fn} { +proc SaveImageCmdLoad {format fn} { switch -- $format { fits {FileLast fitsfbox $fn} eps {FileLast epsfbox $fn} @@ -172,7 +171,7 @@ proc SaveimageCmdLoad {format fn} { SaveImage $fn $format } -proc SaveimageCmdMPEG {fn na} { +proc SaveImageCmdMPEG {fn na} { global movie set movie(action) slice diff --git a/ds9/parsers/saveimageparser.tac b/ds9/parsers/saveimageparser.tac index 1447f75..6996b15 100644 --- a/ds9/parsers/saveimageparser.tac +++ b/ds9/parsers/saveimageparser.tac @@ -26,16 +26,16 @@ command : saveimage | saveimage {yyclearin; YYACCEPT} STRING_ ; -saveimage : STRING_ opts {SaveimageCmdLoad [ExtToFormat $1] $1} - | ext STRING_ opts {SaveimageCmdLoad $1 $2} +saveimage : STRING_ opts {SaveImageCmdLoad [ExtToFormat $1] $1} + | ext STRING_ opts {SaveImageCmdLoad $1 $2} # backward compatibilty - | ext opts STRING_ {SaveimageCmdLoad $1 $2} + | ext opts STRING_ {SaveImageCmdLoad $1 $3} # backward compatibilty | MPEG_ mpeg ; -mpeg : STRING_ {SaveimageCmdMPEG $1 1} - | STRING_ INT_ {SaveimageCmdMPEG $1 $2} +mpeg : STRING_ {SaveImageCmdMPEG $1 1} + | STRING_ INT_ {SaveImageCmdMPEG $1 $2} ; ext : FITS_ {set _ fits} @@ -46,6 +46,7 @@ ext : FITS_ {set _ fits} | PNG_ {set _ png} ; +# opts sets a var that will be used later opts : | NONE_ {ProcessCmdSet saveimage tiff,compress none} | JPEG_ {ProcessCmdSet saveimage tiff,compress jpeg} |