From 5ef46e82c2166227ec7966c6844f9da625bc9a7b Mon Sep 17 00:00:00 2001 From: William Joye Date: Thu, 31 May 2018 14:44:33 -0400 Subject: update ds9 parsers --- ds9/library/frame.tcl | 9 --------- ds9/library/mask.tcl | 9 --------- ds9/library/movie.tcl | 9 --------- ds9/library/panzoom.tcl | 9 --------- ds9/library/print.tcl | 9 --------- ds9/library/rgb.tcl | 9 --------- ds9/library/save.tcl | 9 --------- ds9/library/saveimage.tcl | 9 --------- ds9/library/scale.tcl | 27 --------------------------- ds9/library/smooth.tcl | 9 --------- ds9/library/util.tcl | 18 ------------------ ds9/library/vo.tcl | 6 ------ ds9/library/wcs.tcl | 9 --------- ds9/library/xpa.tcl | 6 ------ ds9/parsers/bgparser.tac | 2 +- ds9/parsers/cmapparser.tac | 4 ++-- ds9/parsers/frameparser.tac | 8 ++++---- ds9/parsers/lockparser.tac | 24 ++++++++++++------------ ds9/parsers/maskparser.tac | 6 +++--- ds9/parsers/minmaxparser.tac | 8 ++++---- ds9/parsers/movieparser.tac | 28 ++++++++++++++-------------- ds9/parsers/nanparser.tac | 2 +- ds9/parsers/pagesetupparser.tac | 6 +++--- ds9/parsers/precisionparser.tac | 2 +- ds9/parsers/prefsparser.tac | 10 +++++----- ds9/parsers/preserveparser.tac | 4 ++-- ds9/parsers/psparser.tac | 12 ++++++------ ds9/parsers/rgbparser.tac | 6 +++--- ds9/parsers/saveimageparser.tac | 10 +++++----- ds9/parsers/saveparser.tac | 10 +++++----- ds9/parsers/scaleparser.tac | 26 +++++++++++++------------- ds9/parsers/smoothparser.tac | 16 ++++++++-------- ds9/parsers/threadsparser.tac | 2 +- ds9/parsers/viewparser.tac | 6 +++--- ds9/parsers/voparser.tac | 8 ++++---- ds9/parsers/wcsparser.tac | 12 ++++++------ ds9/parsers/xpafirstparser.tac | 6 +++--- ds9/parsers/zscaleparser.tac | 8 ++++---- 38 files changed, 113 insertions(+), 260 deletions(-) diff --git a/ds9/library/frame.tcl b/ds9/library/frame.tcl index 9f260b9..7dadb56 100644 --- a/ds9/library/frame.tcl +++ b/ds9/library/frame.tcl @@ -2062,15 +2062,6 @@ proc ProcessFrameCmd {varname iname} { incr i [expr $frame::yycnt-1] } -proc ActiveCmdSet {which value {cmd {}}} { - global active - - set active($which) $value - if {$cmd != {}} { - eval $cmd - } -} - proc ProcessSendFrameCmd {proc id param {sock {}} {fn {}}} { global ds9 global current diff --git a/ds9/library/mask.tcl b/ds9/library/mask.tcl index 55129ed..8775abe 100644 --- a/ds9/library/mask.tcl +++ b/ds9/library/mask.tcl @@ -272,15 +272,6 @@ proc ProcessMaskCmd {varname iname} { return $parse(result) } -proc MaskCmdSet {which value {cmd {}}} { - global mask - - set mask($which) $value - if {$cmd != {}} { - eval $cmd - } -} - proc ProcessSendMaskCmd {proc id param {sock {}} {fn {}}} { global mask diff --git a/ds9/library/movie.tcl b/ds9/library/movie.tcl index 55d55e7..2a8027b 100644 --- a/ds9/library/movie.tcl +++ b/ds9/library/movie.tcl @@ -466,12 +466,3 @@ proc ProcessMovieCmd {varname iname} { incr i [expr $movie::yycnt-1] } -proc MovieCmdSet {which value {cmd {}}} { - global movie - - set movie($which) $value - if {$cmd != {}} { - eval $cmd - } -} - diff --git a/ds9/library/panzoom.tcl b/ds9/library/panzoom.tcl index dd2fa53..89632a3 100644 --- a/ds9/library/panzoom.tcl +++ b/ds9/library/panzoom.tcl @@ -677,15 +677,6 @@ proc PanZoomBackup {ch which} { # Process Cmds -proc PanZoomCmdSet {which value {cmd {}}} { - global panzoom - - set panzoom($which) $value - if {$cmd != {}} { - eval $cmd - } -} - proc ProcessPanCmd {varname iname} { upvar $varname var upvar $iname i diff --git a/ds9/library/print.tcl b/ds9/library/print.tcl index d82e53d..953e410 100644 --- a/ds9/library/print.tcl +++ b/ds9/library/print.tcl @@ -586,15 +586,6 @@ proc ProcessPSPrintCmd {varname iname} { incr i [expr $ps::yycnt-1] } -proc PSCmdSet {which value {cmd {}}} { - global ps - - set ps($which) $value - if {$cmd != {}} { - eval $cmd - } -} - proc ProcessSendPSPrintCmd {proc id param {sock {}} {fn {}}} { global ps diff --git a/ds9/library/rgb.tcl b/ds9/library/rgb.tcl index ca90e98..246eccc 100644 --- a/ds9/library/rgb.tcl +++ b/ds9/library/rgb.tcl @@ -270,15 +270,6 @@ proc ProcessRGBCmd {varname iname} { incr i [expr $rgb::yycnt-1] } -proc RGBCmdSet {which value {cmd {}}} { - global rgb - - set rgb($which) $value - if {$cmd != {}} { - eval $cmd - } -} - proc ProcessSendRGBCmd {proc id param {sock {}} {fn {}}} { global current global rgb diff --git a/ds9/library/save.tcl b/ds9/library/save.tcl index 97af246..4b1a0ab 100644 --- a/ds9/library/save.tcl +++ b/ds9/library/save.tcl @@ -54,15 +54,6 @@ proc SaveCmdLoad {format fn} { Save $format $fn } -proc SavefitsCmdSet {which value {cmd {}}} { - global savefits - - set savefits($which) $value - if {$cmd != {}} { - eval $cmd - } -} - # Support proc SaveDialog {format} { diff --git a/ds9/library/saveimage.tcl b/ds9/library/saveimage.tcl index 4729deb..35f5d96 100644 --- a/ds9/library/saveimage.tcl +++ b/ds9/library/saveimage.tcl @@ -160,15 +160,6 @@ proc ProcessSaveImageCmd {varname iname} { incr i [expr $saveimage::yycnt-1] } -proc SaveimageCmdSet {which value {cmd {}}} { - global saveimage - - set saveimage($which) $value - if {$cmd != {}} { - eval $cmd - } -} - proc SaveimageCmdLoad {format fn} { switch -- $format { fits {FileLast fitsfbox $fn} diff --git a/ds9/library/scale.tcl b/ds9/library/scale.tcl index 4ad2b65..ba0fdb6 100644 --- a/ds9/library/scale.tcl +++ b/ds9/library/scale.tcl @@ -833,15 +833,6 @@ proc ProcessScaleCmd {varname iname} { incr i [expr $scale::yycnt-1] } -proc ScaleCmdSet {which value {cmd {}}} { - global scale - - set scale($which) $value - if {$cmd != {}} { - eval $cmd - } -} - proc ProcessSendScaleCmd {proc id param {sock {}} {fn {}}} { global current global scale @@ -874,15 +865,6 @@ proc ProcessMinMaxCmd {varname iname} { incr i [expr $minmax::yycnt-1] } -proc MinmaxCmdSet {which value {cmd {}}} { - global minmax - - set minmax($which) $value - if {$cmd != {}} { - eval $cmd - } -} - proc ProcessSendMinMaxCmd {proc id param {sock {}} {fn {}}} { global minmax @@ -906,15 +888,6 @@ proc ProcessZScaleCmd {varname iname} { incr i [expr $zscale::yycnt-1] } -proc ZscaleCmdSet {which value {cmd {}}} { - global zscale - - set zscale($which) $value - if {$cmd != {}} { - eval $cmd - } -} - proc ProcessSendZScaleCmd {proc id param {sock {}} {fn {}}} { global zscale diff --git a/ds9/library/smooth.tcl b/ds9/library/smooth.tcl index ce2daed..f43f156 100644 --- a/ds9/library/smooth.tcl +++ b/ds9/library/smooth.tcl @@ -351,15 +351,6 @@ proc ProcessSmoothCmd {varname iname} { incr i [expr $smooth::yycnt-1] } -proc SmoothCmdSet {which value {cmd {}}} { - global smooth - - set smooth($which) $value - if {$cmd != {}} { - eval $cmd - } -} - proc ProcessSendSmoothCmd {proc id param {sock {}} {fn {}}} { global smooth diff --git a/ds9/library/util.tcl b/ds9/library/util.tcl index e2a7a0f..6ac644b 100644 --- a/ds9/library/util.tcl +++ b/ds9/library/util.tcl @@ -1210,24 +1210,6 @@ proc DS9Backup {ch which} { # Process Cmds -proc ds9CmdSet {which value {cmd {}}} { - global ds9 - - set ds9($which) $value - if {$cmd != {}} { - eval $cmd - } -} - -proc pds9CmdSet {which value {cmd {}}} { - global pds9 - - set pds9($which) $value - if {$cmd != {}} { - eval $cmd - } -} - proc ProcessPrefsCmd {varname iname} { upvar $varname var upvar $iname i diff --git a/ds9/library/vo.tcl b/ds9/library/vo.tcl index aec60ee..3f52ac7 100644 --- a/ds9/library/vo.tcl +++ b/ds9/library/vo.tcl @@ -472,12 +472,6 @@ proc ProcessVOCmd {varname iname} { incr i [expr $vo::yycnt-1] } -proc VOCmdSet {which value} { - global pvo - - set pvo($which) $value -} - proc VOCmdConnect {str} { global voi global ivo diff --git a/ds9/library/wcs.tcl b/ds9/library/wcs.tcl index 8d9ceec..1141783 100644 --- a/ds9/library/wcs.tcl +++ b/ds9/library/wcs.tcl @@ -1144,15 +1144,6 @@ proc ProcessWCSCmd {varname iname sock fn} { incr i [expr $wcs::yycnt-1] } -proc WCSCmdSet {which value {cmd {}}} { - global wcs - - set wcs($which) $value - if {$cmd != {}} { - eval $cmd - } -} - proc WCSCmdReset {ext} { global rgb global current diff --git a/ds9/library/xpa.tcl b/ds9/library/xpa.tcl index 00ddf29..f071cc3 100644 --- a/ds9/library/xpa.tcl +++ b/ds9/library/xpa.tcl @@ -2221,12 +2221,6 @@ proc ProcessXPACmd {varname iname} { incr i [expr $xpa::yycnt-1] } -proc XPACmdSet {varname which value} { - upvar #0 $varname var - - set var($which) $value -} - proc ProcessSendXPACmd {proc id param {sock {}} {fn {}}} { switch -- [string tolower [lindex $param 0]] { info {$proc $id [XPAInfoResult]} diff --git a/ds9/parsers/bgparser.tac b/ds9/parsers/bgparser.tac index 859a114..fc1e1b7 100644 --- a/ds9/parsers/bgparser.tac +++ b/ds9/parsers/bgparser.tac @@ -11,7 +11,7 @@ command : bg | bg {yyclearin; YYACCEPT} STRING_ ; -bg : STRING_ {pds9CmdSet bg $1 PrefsBgColor} +bg : STRING_ {ProcessCmdSet pds9 bg $1 PrefsBgColor} ; %% diff --git a/ds9/parsers/cmapparser.tac b/ds9/parsers/cmapparser.tac index b5b85a7..2d70717 100644 --- a/ds9/parsers/cmapparser.tac +++ b/ds9/parsers/cmapparser.tac @@ -35,14 +35,14 @@ cmap : STRING_ {CmapCmd $1} # backward compatibility | MATCH_ {MatchColorCurrent} # backward compatibility - | LOCK_ yesno {ColorbarCmdSet lock $2 LockColorCurrent} + | LOCK_ yesno {ProcessCmdSet colorbar lock $2 LockColorCurrent} | LOAD_ cmapLoad # backward compatibility | FILE_ cmapLoad | SAVE_ STRING_ {SaveColormapFile $2; FileLast colormapfbox $2} - | INVERT_ yesno {ColorbarCmdSet invert $2 InvertColorbar} + | INVERT_ yesno {ProcessCmdSet colorbar invert $2 InvertColorbar} | TAG_ cmapTag | numeric numeric {CmapValueCmd $1 $2} diff --git a/ds9/parsers/frameparser.tac b/ds9/parsers/frameparser.tac index 82f9066..41e906e 100644 --- a/ds9/parsers/frameparser.tac +++ b/ds9/parsers/frameparser.tac @@ -39,7 +39,7 @@ command : frame ; frame : MATCH_ match {MatchFrameCurrent $2} - | LOCK_ lock {PanZoomCmdSet lock $2; LockFrameCurrent} + | LOCK_ lock {ProcessCmdSet panzoom lock $2; LockFrameCurrent} | CENTER_ center | CLEAR_ clear | DELETE_ delete @@ -87,13 +87,13 @@ refresh : {UpdateCurrentFrame} | ALL_ {UpdateAllFrame} ; -hide : {global current; ActiveCmdSet $current(frame) 0 UpdateActiveFrames} - | INT_ {ActiveCmdSet "Frame$1" 0 UpdateActiveFrames} +hide : {global current; ProcessCmdSet active $current(frame) 0 UpdateActiveFrames} + | INT_ {ProcessCmdSet active "Frame$1" 0 UpdateActiveFrames} | ALL_ {ActiveFrameNone} ; show : - | INT_ {ActiveCmdSet "Frame$1" 1 UpdateActiveFrames} + | INT_ {ProcessCmdSet active "Frame$1" 1 UpdateActiveFrames} | ALL_ {ActiveFrameAll} ; diff --git a/ds9/parsers/lockparser.tac b/ds9/parsers/lockparser.tac index f49c1a0..1b298c9 100644 --- a/ds9/parsers/lockparser.tac +++ b/ds9/parsers/lockparser.tac @@ -33,18 +33,18 @@ command : lock | lock {yyclearin; YYACCEPT} STRING_ ; -lock : FRAME_ lock {PanZoomCmdSet lock $2 LockFrameCurrent} - | CROSSHAIR_ lock {CrosshairCmdSet lock $2 LockCrosshairCurrent} - | CROP_ lock {CropCmdSet lock $2 LockCropCurrent} - | SLICE_ lockslice {CubeCmdSet lock $2 LockCubeCurrent} - | BIN_ yesno {BinCmdSet lock $2 LockBinCurrent} - | AXES_ yesno {CubeCmdSet lock,axes $2 LockAxesCurrent} - | SCALE_ yesno {ScaleCmdSet lock $2 LockScaleCurrent} - | SCALELIMITS_ yesno {ScaleCmdSet lock,limits $2 LockScaleLimitsCurrent} - | COLORBAR_ yesno {ColorbarCmdSet lock $2 LockColorCurrent} - | BLOCK_ yesno {BlockCmdSet lock $2 LockBlockCurrent} - | SMOOTH_ yesno {SmoothCmdSet lock $2 LockSmoothCurrent} - | 3D_ yesno {ThreedCmdSet lock $2 Lock3DCurrent} +lock : FRAME_ lock {ProcessCmdSet panzoom lock $2 LockFrameCurrent} + | CROSSHAIR_ lock {ProcessCmdSet crosshair lock $2 LockCrosshairCurrent} + | CROP_ lock {ProcessCmdSet crop lock $2 LockCropCurrent} + | SLICE_ lockslice {ProcessCmdSet cube lock $2 LockCubeCurrent} + | BIN_ yesno {ProcessCmdSet bin lock $2 LockBinCurrent} + | AXES_ yesno {ProcessCmdSet cube lock,axes $2 LockAxesCurrent} + | SCALE_ yesno {ProcessCmdSet scale lock $2 LockScaleCurrent} + | SCALELIMITS_ yesno {ProcessCmdSet scale lock,limits $2 LockScaleLimitsCurrent} + | COLORBAR_ yesno {ProcessCmdSet colorbar lock $2 LockColorCurrent} + | BLOCK_ yesno {ProcessCmdSet block lock $2 LockBlockCurrent} + | SMOOTH_ yesno {ProessCmdSet smooth lock $2 LockSmoothCurrent} + | 3D_ yesno {ProcessCmdSet threed lock $2 Lock3DCurrent} ; %% diff --git a/ds9/parsers/maskparser.tac b/ds9/parsers/maskparser.tac index e1e1dd9..9087950 100644 --- a/ds9/parsers/maskparser.tac +++ b/ds9/parsers/maskparser.tac @@ -25,9 +25,9 @@ mask : {global parse; set parse(result) mask} | OPEN_ {MaskDialog} | CLOSE_ {MaskDestroyDialog} | CLEAR_ {MaskClear} - | COLOR_ STRING_ {MaskCmdSet color $2 MaskColor} - | MARK_ INT_ {MaskCmdSet mark $2 MaskMark} - | TRANSPARENCY_ INT_ {MaskCmdSet transparency $2 MaskTransparency} + | COLOR_ STRING_ {ProcessCmdSet mask color $2 MaskColor} + | MARK_ INT_ {ProcessCmdSet mask mark $2 MaskMark} + | TRANSPARENCY_ INT_ {ProcessCmdSet mask transparency $2 MaskTransparency} ; %% diff --git a/ds9/parsers/minmaxparser.tac b/ds9/parsers/minmaxparser.tac index 7b926f2..b5be097 100644 --- a/ds9/parsers/minmaxparser.tac +++ b/ds9/parsers/minmaxparser.tac @@ -22,10 +22,10 @@ command : minmax | minmax {yyclearin; YYACCEPT} STRING_ ; -minmax : {ScaleCmdSet mode minmax ChangeScaleMode} - | mode {MinmaxCmdSet mode $1 ChangeMinMax} - | MODE_ mode {MinmaxCmdSet mode $2 ChangeMinMax} - | INTERVAL_ INT_ {MinmaxCmdSet sample $2 ChangeMinMax} +minmax : {ProcessCmdSet scale mode minmax ChangeScaleMode} + | mode {ProcessCmdSet minmax mode $1 ChangeMinMax} + | MODE_ mode {ProcessCmdSet minmax mode $2 ChangeMinMax} + | INTERVAL_ INT_ {ProcessCmdSet minmax sample $2 ChangeMinMax} ; mode : SCAN_ {set _ scan} diff --git a/ds9/parsers/movieparser.tac b/ds9/parsers/movieparser.tac index f8e3a96..3a7889a 100644 --- a/ds9/parsers/movieparser.tac +++ b/ds9/parsers/movieparser.tac @@ -27,26 +27,26 @@ command : movie | movie {yyclearin; YYACCEPT} STRING_ ; -movie : STRING_ {MovieCmdSet action frame; Movie $1} - | FRAME_ STRING_ {MovieCmdSet action frame; Movie $2} - | SLICE_ STRING_ {MovieCmdSet action slice; Movie $2} - | 3D_ STRING_ {MovieCmdSet action 3d; Movie $2} - | 3D_ STRING_ opts {MovieCmdSet action 3d; Movie $2} +movie : STRING_ {ProcessCmdSet movie action frame; Movie $1} + | FRAME_ STRING_ {ProcessCmdSet movie action frame; Movie $2} + | SLICE_ STRING_ {ProcessCmdSet movie action slice; Movie $2} + | 3D_ STRING_ {ProcessCmdSet movie action 3d; Movie $2} + | 3D_ STRING_ opts {ProcessCmdSet movie action 3d; Movie $2} ; opts : opts opt | opt ; -opt : NUMBER_ INT_ {MovieCmdSet number $2} - | AZFROM_ numeric {MovieCmdSet azfrom $2} - | AZTO_ numeric {MovieCmdSet azto $2} - | ELFROM_ numeric {MovieCmdSet elfrom $2} - | ELTO_ numeric {MovieCmdSet elto $2} - | SLFROM_ INT_ {MovieCmdSet slfrom $2} - | SLTO_ INT_ {MovieCmdSet slto $2} - | OSCILLATE_ INT_ {MovieCmdSet repeat oscillate; MovieCmdSet repeat,num $2} - | REPEAT_ INT_ {MovieCmdSet repeat repeat; MovieCmdSet repeat,num $2} +opt : NUMBER_ INT_ {ProcessCmdSet movie number $2} + | AZFROM_ numeric {ProcessCmdSet movie azfrom $2} + | AZTO_ numeric {ProcessCmdSet movie azto $2} + | ELFROM_ numeric {ProcessCmdSet movie elfrom $2} + | ELTO_ numeric {ProcessCmdSet movie elto $2} + | SLFROM_ INT_ {ProcessCmdSet movie slfrom $2} + | SLTO_ INT_ {ProcessCmdSet movie slto $2} + | OSCILLATE_ INT_ {ProcessCmdSet movie repeat oscillate; ProcessCmdSet movie repeat,num $2} + | REPEAT_ INT_ {ProcessCmdSet movie repeat repeat; ProcessCmdSet movie repeat,num $2} ; %% diff --git a/ds9/parsers/nanparser.tac b/ds9/parsers/nanparser.tac index 25fcdc1..d63dc3a 100644 --- a/ds9/parsers/nanparser.tac +++ b/ds9/parsers/nanparser.tac @@ -11,7 +11,7 @@ command : nan | nan {yyclearin; YYACCEPT} STRING_ ; -nan : STRING_ {pds9CmdSet nan $1 PrefsNanColor} +nan : STRING_ {ProcessCmdSet pds9 nan $1 PrefsNanColor} ; %% diff --git a/ds9/parsers/pagesetupparser.tac b/ds9/parsers/pagesetupparser.tac index 5025c00..3813800 100644 --- a/ds9/parsers/pagesetupparser.tac +++ b/ds9/parsers/pagesetupparser.tac @@ -27,9 +27,9 @@ command : pagesetup | pagesetup {yyclearin; YYACCEPT} STRING_ ; -pagesetup : ORIENT_ orient {PSCmdSet orient $2} - | SCALE_ numeric {PSCmdSet scale $2} - | SIZE_ size {PSCmdSet size $2} +pagesetup : ORIENT_ orient {ProcessCmdSet ps orient $2} + | SCALE_ numeric {ProcessCmdSet ps scale $2} + | SIZE_ size {ProcessCmdSet ps size $2} ; orient : PORTRAIT_ {set _ portrait} diff --git a/ds9/parsers/precisionparser.tac b/ds9/parsers/precisionparser.tac index 859a1d0..4a89c59 100644 --- a/ds9/parsers/precisionparser.tac +++ b/ds9/parsers/precisionparser.tac @@ -14,7 +14,7 @@ command : precision | precision {yyclearin; YYACCEPT} STRING_ ; -precision : INT_ INT_ INT_ INT_ INT_ INT_ {pds9CmdSet prec,linear $1; pds9CmdSet prec,deg $2; pds9CmdSet prec,hms $3;pds9CmdSet prec,dms $4; pds9CmdSet prec,arcmin $5; pds9CmdSet prec,arcsec $6 PrefsPrecision} +precision : INT_ INT_ INT_ INT_ INT_ INT_ {ProcessCmdSet pds9 prec,linear $1; ProcessCmdSet pds9 prec,deg $2; ProcessCmdSet pds9 prec,hms $3;ProcessCmdSet pds9 prec,dms $4; ProcessCmdSet pds9 prec,arcmin $5; ProcessCmdSet pds9 prec,arcsec $6 PrefsPrecision} ; %% diff --git a/ds9/parsers/prefsparser.tac b/ds9/parsers/prefsparser.tac index 16becbb..0630354 100644 --- a/ds9/parsers/prefsparser.tac +++ b/ds9/parsers/prefsparser.tac @@ -24,11 +24,11 @@ command : prefs ; prefs : CLEAR_ {ClearPrefs} - | PRECISION_ INT_ INT_ INT_ INT_ INT_ INT_ {pds9CmdSet prec,linear $2; pds9CmdSet prec,deg $3; pds9CmdSet prec,hms $4;pds9CmdSet prec,dms $5; pds9CmdSet prec,arcmin $6; pds9CmdSet prec,arcsec $7 PrefsPrecision} - | BGCOLOR_ STRING_ {pds9CmdSet bg $2 PrefsBgColor} - | NANCOLOR_ STRING_ {pds9CmdSet nan $2 PrefsNanColor} - | THREADS_ INT_ {ds9CmdSet threads $2 ChangeThreads} - | IRAFALIGN_ yesno {pds9CmdSet iraf $2 PrefsIRAFAlign} + | PRECISION_ INT_ INT_ INT_ INT_ INT_ INT_ {ProcessCmdSet pds9 prec,linear $2; ProcessCmdSet pds9 prec,deg $3; ProcessCmdSet pds9 prec,hms $4;ProcessCmdSet pds9 prec,dms $5; ProcessCmdSet pds9 prec,arcmin $6; ProcessCmdSet pds9 prec,arcsec $7 PrefsPrecision} + | BGCOLOR_ STRING_ {ProcessCmdSet pds9 bg $2 PrefsBgColor} + | NANCOLOR_ STRING_ {ProcessCmdSet pds9 nan $2 PrefsNanColor} + | THREADS_ INT_ {ProcessCmdSet ds9 threads $2 ChangeThreads} + | IRAFALIGN_ yesno {ProcessCmdSet pds9 iraf $2 PrefsIRAFAlign} ; %% diff --git a/ds9/parsers/preserveparser.tac b/ds9/parsers/preserveparser.tac index 0c33299..c372044 100644 --- a/ds9/parsers/preserveparser.tac +++ b/ds9/parsers/preserveparser.tac @@ -19,8 +19,8 @@ command : preserve | preserve {yyclearin; YYACCEPT} STRING_ ; -preserve : PAN_ yesno {PanZoomCmdSet preserve $2 PreservePan} - | REGIONS_ yesno {MarkerCmdSet preserve $2 MarkerPreserve} +preserve : PAN_ yesno {ProcessCmdSet panzoom preserve $2 PreservePan} + | REGIONS_ yesno {ProcessCmdSet marker preserve $2 MarkerPreserve} ; %% diff --git a/ds9/parsers/psparser.tac b/ds9/parsers/psparser.tac index 400fb4e..4c0622b 100644 --- a/ds9/parsers/psparser.tac +++ b/ds9/parsers/psparser.tac @@ -36,12 +36,12 @@ command : ps ; ps : {PostScript} - | DESTINATION_ dest {PSCmdSet dest $2} - | COMMAND_ STRING_ {PSCmdSet cmd $2} - | FILENAME_ STRING_ {PSCmdSet filename $2} - | COLOR_ color {PSCmdSet color $2} - | LEVEL_ level {PSCmdSet level $2} - | RESOLUTION_ resolution {PSCmdSet resolution $2} + | DESTINATION_ dest {ProcessCmdSet ps dest $2} + | COMMAND_ STRING_ {ProcessCmdSet ps cmd $2} + | FILENAME_ STRING_ {ProcessCmdSet ps filename $2} + | COLOR_ color {ProcessCmdSet ps color $2} + | LEVEL_ level {ProcessCmdSet ps level $2} + | RESOLUTION_ resolution {ProcessCmdSet ps resolution $2} #backward compatibility | INTERPOLATE_ ; diff --git a/ds9/parsers/rgbparser.tac b/ds9/parsers/rgbparser.tac index 8bc8cea..e020d04 100644 --- a/ds9/parsers/rgbparser.tac +++ b/ds9/parsers/rgbparser.tac @@ -42,9 +42,9 @@ rgb : {CreateRGBFrame} | CLOSE_ {RGBDestroyDialog} | channel {ProcessCmdSet current rgb $1 RGBChannel} | CHANNEL_ channel {ProcessCmdSet current rgb $2 RGBChannel} - | LOCK_ lock yesno {RGBCmdSet $2 $3} - | SYSTEM_ wcssys {RGBCmdSet system $2 RGBSystem} - | VIEW_ channel yesno {RGBCmdSet $2 $3 RGBView} + | LOCK_ lock yesno {ProcessCmdSet rgb $2 $3} + | SYSTEM_ wcssys {ProcessCmdSet rgb system $2 RGBSystem} + | VIEW_ channel yesno {ProcessCmdSet rgb $2 $3 RGBView} ; channel : RED_ {set _ red} diff --git a/ds9/parsers/saveimageparser.tac b/ds9/parsers/saveimageparser.tac index ba7c013..1447f75 100644 --- a/ds9/parsers/saveimageparser.tac +++ b/ds9/parsers/saveimageparser.tac @@ -47,11 +47,11 @@ ext : FITS_ {set _ fits} ; opts : - | NONE_ {SaveimageCmdSet tiff,compress none} - | JPEG_ {SaveimageCmdSet tiff,compress jpeg} - | PACKBITS_ {SaveimageCmdSet tiff,compress packbits} - | DEFLATE_ {SaveimageCmdSet tiff,compress deflate} - | numeric {SaveimageCmdSet jpeg,quality $1} + | NONE_ {ProcessCmdSet saveimage tiff,compress none} + | JPEG_ {ProcessCmdSet saveimage tiff,compress jpeg} + | PACKBITS_ {ProcessCmdSet saveimage tiff,compress packbits} + | DEFLATE_ {ProcessCmdSet saveimage tiff,compress deflate} + | numeric {ProcessCmdSet saveimage jpeg,quality $1} ; %% diff --git a/ds9/parsers/saveparser.tac b/ds9/parsers/saveparser.tac index df6b801..32fb6a4 100644 --- a/ds9/parsers/saveparser.tac +++ b/ds9/parsers/saveparser.tac @@ -50,11 +50,11 @@ mosaicimage : MOSAICIMAGE_ {set _ mosaicimage} | MOSAICIMAGEWCS_ {set _ mosaicimage} ; -opts : {SavefitsCmdSet type image; SavefitsCmdSet mosaic 1} - | IMAGE_ {SavefitsCmdSet type image} - | TABLE_ {SavefitsCmdSet type table} - | SLICE_ {SavefitsCmdSet type slice} - | INT_ {SavefitsCmdSet mosaic $1} +opts : {ProcessCmdSet savefits type image; ProcessCmdSet savefits mosaic 1} + | IMAGE_ {ProcessCmdSet savefits type image} + | TABLE_ {ProcessCmdSet savefits type table} + | SLICE_ {ProcessCmdSet savefits type slice} + | INT_ {ProcessCmdSet savefits mosaic $1} ; %% diff --git a/ds9/parsers/scaleparser.tac b/ds9/parsers/scaleparser.tac index 865f11f..7ca2bec 100644 --- a/ds9/parsers/scaleparser.tac +++ b/ds9/parsers/scaleparser.tac @@ -45,15 +45,15 @@ scale : OPEN_ {ScaleDialog} | CLOSE_ {ScaleDestroyDialog} | MATCH_ match | LOCK_ lock - | scales {ScaleCmdSet type $1 ChangeScale} + | scales {ProcessCmdSet scale type $1 ChangeScale} | LOG_ log - | DATASEC_ yesno {ScaleCmdSet datasec $2 ChangeDATASEC} - | LIMITS_ numeric numeric {ScaleCmdSet min $2 {}; ScaleCmdSet max $3 ChangeScaleLimit} - | SCALELIMITS_ numeric numeric {ScaleCmdSet min $2 {}; ScaleCmdSet max $3 ChangeScaleLimit} - | mode {ScaleCmdSet mode $1 ChangeScaleMode} - | MODE_ mode {ScaleCmdSet mode $2 ChangeScaleMode} - | scope {ScaleCmdSet scope $1 ChangeScaleScope} - | SCOPE_ scope {ScaleCmdSet scope $2 ChangeScaleScope} + | DATASEC_ yesno {ProcessCmdSet scale datasec $2 ChangeDATASEC} + | LIMITS_ numeric numeric {ProcessCmdSet scale min $2 {}; ProcessCmdSet scale max $3 ChangeScaleLimit} + | SCALELIMITS_ numeric numeric {ProcessCmdSet scale min $2 {}; ProcessCmdSet scale max $3 ChangeScaleLimit} + | mode {ProcessCmdSet scale mode $1 ChangeScaleMode} + | MODE_ mode {ProcessCmdSet scale mode $2 ChangeScaleMode} + | scope {ProcessCmdSet scale scope $1 ChangeScaleScope} + | SCOPE_ scope {ProcessCmdSet scale scope $2 ChangeScaleScope} ; scales : LINEAR_ {set _ linear} @@ -71,13 +71,13 @@ match : {MatchScaleCurrent} | SCALELIMITS_ {MatchScaleLimitsCurrent} ; -lock : yesno {ScaleCmdSet lock $1 LockScaleCurrent} - | LIMITS_ yesno {ScaleCmdSet lock,limits $2 LockScaleLimitsCurrent} - | SCALELIMITS_ yesno {ScaleCmdSet lock,limits $2 LockScaleLimitsCurrent} +lock : yesno {ProcessCmdSet scale lock $1 LockScaleCurrent} + | LIMITS_ yesno {ProcessCmdSet scale lock,limits $2 LockScaleLimitsCurrent} + | SCALELIMITS_ yesno {ProcessCmdSet scale lock,limits $2 LockScaleLimitsCurrent} ; -log : {ScaleCmdSet type log ChangeScale} - | EXP_ numeric {ScaleCmdSet log $2 ChangeScale} +log : {ProcessCmdSet scale type log ChangeScale} + | EXP_ numeric {ProcessCmdSet scale log $2 ChangeScale} ; mode : numeric {set _ $1} diff --git a/ds9/parsers/smoothparser.tac b/ds9/parsers/smoothparser.tac index 7a59a74..203c01d 100644 --- a/ds9/parsers/smoothparser.tac +++ b/ds9/parsers/smoothparser.tac @@ -32,17 +32,17 @@ command : smooth ; -smooth : yesno {SmoothCmdSet view $1 SmoothUpdate} +smooth : yesno {ProcessCmdSet smooth view $1 SmoothUpdate} | OPEN_ {SmoothDialog} | CLOSE_ {SmoothDestroyDialog} | MATCH_ {MatchSmoothCurrent} - | LOCK_ yesno {SmoothCmdSet lock $2 LockSmoothCurrent} - | FUNCTION_ function {SmoothCmdSet function $2 SmoothUpdate} - | RADIUS_ INT_ {SmoothCmdSet radius $2 SmoothUpdate} - | RADIUSMINOR_ INT_ {SmoothCmdSet radius,minor $2 SmoothUpdate} - | SIGMA_ numeric {SmoothCmdSet sigma $2 SmoothUpdate} - | SIGMAMINOR_ numeric {SmoothCmdSet sigma,minor $2 SmoothUpdate} - | ANGLE_ numeric {SmoothCmdSet angle $2 SmoothUpdate} + | LOCK_ yesno {ProcessCmdSet smooth lock $2 LockSmoothCurrent} + | FUNCTION_ function {ProcessCmdSet smooth function $2 SmoothUpdate} + | RADIUS_ INT_ {ProcessCmdSet smooth radius $2 SmoothUpdate} + | RADIUSMINOR_ INT_ {ProcessCmdSet smooth radius,minor $2 SmoothUpdate} + | SIGMA_ numeric {ProcessCmdSet smooth sigma $2 SmoothUpdate} + | SIGMAMINOR_ numeric {ProcessCmdSet smooth sigma,minor $2 SmoothUpdate} + | ANGLE_ numeric {ProcessCmdSet smooth angle $2 SmoothUpdate} ; function : BOXCAR_ {set _ boxcar} diff --git a/ds9/parsers/threadsparser.tac b/ds9/parsers/threadsparser.tac index ab81d27..fe013c9 100644 --- a/ds9/parsers/threadsparser.tac +++ b/ds9/parsers/threadsparser.tac @@ -14,7 +14,7 @@ command : threads | threads {yyclearin; YYACCEPT} STRING_ ; -threads : INT_ {ds9CmdSet threads $1 ChangeThreads} +threads : INT_ {ProcessCmdSet ds9 threads $1 ChangeThreads} ; %% diff --git a/ds9/parsers/viewparser.tac b/ds9/parsers/viewparser.tac index 7310b2e..283b954 100644 --- a/ds9/parsers/viewparser.tac +++ b/ds9/parsers/viewparser.tac @@ -68,9 +68,9 @@ view : layout | coordsys yesno {ProcessCmdSet view info,$1 $2 UpdateView} | wcssys yesno {ProcessCmdSet view info,$1 $2 UpdateView} | FRAME_ yesno {ProcessCmdSet view info,frame $2 UpdateView} - | RED_ yesno {RGBCmdSet red $2 RGBView} - | GREEN_ yesno {RGBCmdSet green $2 RGBView} - | BLUE_ yesno {RGBCmdSet blue $2 RGBView} + | RED_ yesno {ProcessCmdSet rgb red $2 RGBView} + | GREEN_ yesno {ProcessCmdSet rgb green $2 RGBView} + | BLUE_ yesno {ProcessCmdSet rgb blue $2 RGBView} ; layout : HORIZONTAL_ {ProcessCmdSet view layout horizontal ViewHorzCmd} diff --git a/ds9/parsers/voparser.tac b/ds9/parsers/voparser.tac index 85ce25d..e448a37 100644 --- a/ds9/parsers/voparser.tac +++ b/ds9/parsers/voparser.tac @@ -29,10 +29,10 @@ command : vo vo : OPEN_ {VODialog} | CLOSE_ {VODestroy voi} - | METHOD_ method {VOCmdSet method $2} - | SERVER_ STRING_ {VOCmdSet server $2} - | INTERNAL_ yesno {VOCmdSet hv $2} - | DELAY_ INT_ {VOCmdSet delay $2} + | METHOD_ method {ProcessCmdSet pvo method $2} + | SERVER_ STRING_ {ProcessCmdSet pvo server $2} + | INTERNAL_ yesno {ProcessCmdSet pvo hv $2} + | DELAY_ INT_ {ProcessCmdSet pvo delay $2} | CONNECT_ STRING_ {VOCmdConnect $2} | DISCONNECT_ STRING_ {VOCmdDisconnect $2} | STRING_ {VOCmdConnect $1} diff --git a/ds9/parsers/wcsparser.tac b/ds9/parsers/wcsparser.tac index 98f4c25..4404fb8 100644 --- a/ds9/parsers/wcsparser.tac +++ b/ds9/parsers/wcsparser.tac @@ -30,12 +30,12 @@ command : wcs wcs : OPEN_ {WCSDialog} | CLOSE_ {WCSDestroyDialog} - | wcssys {WCSCmdSet system $1 UpdateWCS} - | SYSTEM_ wcssys {WCSCmdSet system $2 UpdateWCS} - | skyframe {WCSCmdSet sky $1 UpdateWCS} - | SKY_ skyframe {WCSCmdSet sky $2 UpdateWCS} - | skyformat {WCSCmdSet skyformat $1 UpdateWCS} - | SKYFORMAT_ skyformat {WCSCmdSet skyformat $2 UpdateWCS} + | wcssys {ProcessCmdSet wcs system $1 UpdateWCS} + | SYSTEM_ wcssys {ProcessCmdSet wcs system $2 UpdateWCS} + | skyframe {ProcessCmdSet wcs sky $1 UpdateWCS} + | SKY_ skyframe {ProcessCmdSet wcs sky $2 UpdateWCS} + | skyformat {ProcessCmdSet wcs skyformat $1 UpdateWCS} + | SKYFORMAT_ skyformat {ProcessCmdSet wcs skyformat $2 UpdateWCS} | ALIGN_ yesno {ProcessCmdSet current align $2 AlignWCSFrame} | RESET_ {WCSCmdReset 1} | RESET_ INT_ {WCSCmdReset $2} diff --git a/ds9/parsers/xpafirstparser.tac b/ds9/parsers/xpafirstparser.tac index 85c6cd4..bdeca86 100644 --- a/ds9/parsers/xpafirstparser.tac +++ b/ds9/parsers/xpafirstparser.tac @@ -26,9 +26,9 @@ command : xpa | xpa {yyclearin; YYACCEPT} STRING_ ; -xpa : yesno {XPACmdSet pds9 xpa $1} - | method {XPACmdSet env XPA_METHOD $1} - | NOXPANS_ {XPACmdSet env XPA_NSREGISTER false} +xpa : yesno {ProcessCmdSet pds9 xpa $1} + | method {ProcessCmdSet env XPA_METHOD $1} + | NOXPANS_ {ProcessCmdSet env XPA_NSREGISTER false} | CONNECT_ | DISCONNECT_ diff --git a/ds9/parsers/zscaleparser.tac b/ds9/parsers/zscaleparser.tac index bf5ced8..4f7e6a3 100644 --- a/ds9/parsers/zscaleparser.tac +++ b/ds9/parsers/zscaleparser.tac @@ -20,10 +20,10 @@ command : zscale | zscale {yyclearin; YYACCEPT} STRING_ ; -zscale : yesno {ScaleCmdSet mode zscale ChangeScaleMode} - | CONTRAST_ numeric {ZscaleCmdSet contrast $2 ChangeZScale} - | SAMPLE_ INT_ {ZscaleCmdSet sample $2 ChangeZScale} - | LINE_ INT_ {ZscaleCmdSet line $2 ChangeZScale} +zscale : yesno {ProcessCmdSet scale mode zscale ChangeScaleMode} + | CONTRAST_ numeric {ProcessCmdSet zscale contrast $2 ChangeZScale} + | SAMPLE_ INT_ {ProcessCmdSet zscale sample $2 ChangeZScale} + | LINE_ INT_ {ProcessCmdSet zscale line $2 ChangeZScale} ; %% -- cgit v0.12