From 1c67d6f171b0c716a01ffcc04a697ac312cda953 Mon Sep 17 00:00:00 2001 From: William Joye Date: Thu, 31 May 2018 14:11:55 -0400 Subject: update ds9 parsers --- ds9/library/frame.tcl | 27 -------- ds9/library/grid.tcl | 9 --- ds9/library/layout.tcl | 18 ----- ds9/library/magnifier.tcl | 9 --- ds9/library/marker.tcl | 18 ----- ds9/parsers/alignparser.tac | 2 +- ds9/parsers/blinkparser.tac | 8 +-- ds9/parsers/colorbarparser.tac | 2 +- ds9/parsers/gridparser.tac | 148 ++++++++++++++++++++-------------------- ds9/parsers/heightparser.tac | 2 +- ds9/parsers/magnifierparser.tac | 10 +-- ds9/parsers/modeparser.tac | 2 +- ds9/parsers/orientparser.tac | 2 +- ds9/parsers/regionparser.tac | 70 +++++++++---------- ds9/parsers/rgbparser.tac | 4 +- ds9/parsers/rotateparser.tac | 2 +- ds9/parsers/tileparser.tac | 22 +++--- ds9/parsers/viewparser.tac | 42 ++++++------ ds9/parsers/wcsparser.tac | 2 +- ds9/parsers/widthparser.tac | 2 +- 20 files changed, 160 insertions(+), 241 deletions(-) diff --git a/ds9/library/frame.tcl b/ds9/library/frame.tcl index db6b5d0..9f260b9 100644 --- a/ds9/library/frame.tcl +++ b/ds9/library/frame.tcl @@ -2071,15 +2071,6 @@ proc ActiveCmdSet {which value {cmd {}}} { } } -proc CurrentCmdSet {which value {cmd {}}} { - global current - - set current($which) $value - if {$cmd != {}} { - eval $cmd - } -} - proc ProcessSendFrameCmd {proc id param {sock {}} {fn {}}} { global ds9 global current @@ -2186,15 +2177,6 @@ proc ProcessTileCmd {varname iname} { incr i [expr $tile::yycnt-1] } -proc TileCmdSet {which value {cmd {}}} { - global tile - - set tile($which) $value - if {$cmd != {}} { - eval $cmd - } -} - proc ProcessSendTileCmd {proc id param {sock {}} {fn {}}} { global current global tile @@ -2229,15 +2211,6 @@ proc ProcessBlinkCmd {varname iname} { incr i [expr $blink::yycnt-1] } -proc BlinkCmdSet {which value {cmd {}}} { - global blink - - set blink($which) $value - if {$cmd != {}} { - eval $cmd - } -} - proc ProcessSendBlinkCmd {proc id param {sock {}} {fn {}}} { global current global blink diff --git a/ds9/library/grid.tcl b/ds9/library/grid.tcl index 844d88a..ac32009 100644 --- a/ds9/library/grid.tcl +++ b/ds9/library/grid.tcl @@ -1146,15 +1146,6 @@ proc ProcessGridCmd {varname iname} { incr i [expr $grid::yycnt-1] } -proc GridCmdSet {which value {cmd {}}} { - global grid - - set grid($which) $value - if {$cmd != {}} { - eval $cmd - } -} - proc GridCmdFontStyle {which value {cmd {}}} { global grid diff --git a/ds9/library/layout.tcl b/ds9/library/layout.tcl index 9abab0a..6fe2630 100644 --- a/ds9/library/layout.tcl +++ b/ds9/library/layout.tcl @@ -810,15 +810,6 @@ proc ViewVertCmd {} { # Process Cmds -proc CanvasCmdSet {which value {cmd {}}} { - global canvas - - set canvas($which) $value - if {$cmd != {}} { - eval $cmd - } -} - proc ProcessHeightCmd {varname iname} { upvar $varname var upvar $iname i @@ -867,15 +858,6 @@ proc ProcessViewCmd {varname iname} { incr i [expr $view::yycnt-1] } -proc ViewCmdSet {which value {cmd {}}} { - global view - - set view($which) $value - if {$cmd != {}} { - eval $cmd - } -} - proc ProcessSendViewCmd {proc id param {sock {}} {fn {}}} { global view diff --git a/ds9/library/magnifier.tcl b/ds9/library/magnifier.tcl index 1dc0866..2ddfd1b 100644 --- a/ds9/library/magnifier.tcl +++ b/ds9/library/magnifier.tcl @@ -146,15 +146,6 @@ proc ProcessMagnifierCmd {varname iname} { incr i [expr $magnifier::yycnt-1] } -proc PmagnifierCmdSet {which value {cmd {}}} { - global pmagnifier - - set pmagnifier($which) $value - if {$cmd != {}} { - eval $cmd - } -} - proc ProcessSendMagnifierCmd {proc id param {sock {}} {fn {}}} { global pmagnifier diff --git a/ds9/library/marker.tcl b/ds9/library/marker.tcl index d63aca6..3adc9a8 100644 --- a/ds9/library/marker.tcl +++ b/ds9/library/marker.tcl @@ -1411,24 +1411,6 @@ proc ProcessRegionsCmd {varname iname sock fn} { incr i [expr $region::yycnt-1] } -proc MarkerCmdSet {which value {cmd {}}} { - global marker - - set marker($which) $value - if {$cmd != {}} { - eval $cmd - } -} - -proc PmarkerCmdSet {which value {cmd {}}} { - global pmarker - - set pmarker($which) $value - if {$cmd != {}} { - eval $cmd - } -} - proc RegionCmdLoad {} { global marker global current diff --git a/ds9/parsers/alignparser.tac b/ds9/parsers/alignparser.tac index dcc85dd..dad1442 100644 --- a/ds9/parsers/alignparser.tac +++ b/ds9/parsers/alignparser.tac @@ -15,7 +15,7 @@ command : align ; -align : yesno {CurrentCmdSet align $1} +align : yesno {ProcessCmdSet current align $1} ; %% diff --git a/ds9/parsers/blinkparser.tac b/ds9/parsers/blinkparser.tac index 48f34a2..2277764 100644 --- a/ds9/parsers/blinkparser.tac +++ b/ds9/parsers/blinkparser.tac @@ -18,10 +18,10 @@ command : blink | blink {yyclearin; YYACCEPT} STRING_ ; -blink : {CurrentCmdSet display blink DisplayMode} - | yes {CurrentCmdSet display blink DisplayMode} - | no {CurrentCmdSet display single DisplayMode} - | INTERVAL_ numeric {BlinkCmdSet interval [expr int($2*1000)] DisplayMode} +blink : {ProcessCmdSet current display blink DisplayMode} + | yes {ProcessCmdSet current display blink DisplayMode} + | no {ProcessCmdSet current display single DisplayMode} + | INTERVAL_ numeric {ProcessCmdSet blink interval [expr int($2*1000)] DisplayMode} ; %% diff --git a/ds9/parsers/colorbarparser.tac b/ds9/parsers/colorbarparser.tac index b9e999a..21e7572 100644 --- a/ds9/parsers/colorbarparser.tac +++ b/ds9/parsers/colorbarparser.tac @@ -30,7 +30,7 @@ command : colorbar | colorbar {yyclearin; YYACCEPT} STRING_ ; -colorbar : yesno {ViewCmdSet colorbar $1 UpdateView} +colorbar : yesno {ProcessCmdSet view colorbar $1 UpdateView} | MATCH_ {MatchColorCurrent} | LOCK_ yesno {ProcessCmdSet colorbar lock $2 LockColorCurrent} diff --git a/ds9/parsers/gridparser.tac b/ds9/parsers/gridparser.tac index bffadf7..ba7e681 100644 --- a/ds9/parsers/gridparser.tac +++ b/ds9/parsers/gridparser.tac @@ -78,17 +78,17 @@ interiortype : INTERIOR_ {set _ interior} | EXTERIOR_ {set _ exterior} ; -grid : yesno {GridCmdSet view $1 GridUpdateCurrent} +grid : yesno {ProcessCmdSet grid view $1 GridUpdateCurrent} | OPEN_ {GridDialog} | CLOSE_ {GridDestroyDialog} # backward compatible | TYPE_ type {GridUpdateCurrent} - | SYSTEM_ system {GridCmdSet system $2 GridUpdateCurrent} - | SKYFRAME_ skyframe {GridCmdSet sky $2 GridUpdateCurrent} - | SKYFORMAT_ skyformat {GridCmdSet skyformat $2 GridUpdateCurrent} + | SYSTEM_ system {ProcessCmdSet grid system $2 GridUpdateCurrent} + | SKYFRAME_ skyframe {ProcessCmdSet grid sky $2 GridUpdateCurrent} + | SKYFORMAT_ skyformat {ProcessCmdSet grid skyformat $2 GridUpdateCurrent} | GRID_ gridgrid {GridUpdateCurrent} - | FORMAT1_ STRING_ {GridCmdSet format1 $2 GridUpdateCurrent} - | FORMAT2_ STRING_ {GridCmdSet format2 $2 GridUpdateCurrent} + | FORMAT1_ STRING_ {ProcessCmdSet grid format1 $2 GridUpdateCurrent} + | FORMAT2_ STRING_ {ProcessCmdSet grid format2 $2 GridUpdateCurrent} | AXES_ axes {GridUpdateCurrent} | TICKMARKS_ tickmarks {GridUpdateCurrent} | BORDER_ border {GridUpdateCurrent} @@ -101,34 +101,34 @@ grid : yesno {GridCmdSet view $1 GridUpdateCurrent} | SAVE_ STRING_ {FileLast gridfbox $2; GridSave $2} ; -type : typegrid {GridCmdSet type $1} - | AXES_ interiortype {GridCmdSet axes,type $2} - | NUMERICS_ interiortype {GridCmdSet numlab,type $2} +type : typegrid {ProcessCmdSet grid type $1} + | AXES_ interiortype {ProcessCmdSet grid axes,type $2} + | NUMERICS_ interiortype {ProcessCmdSet grid numlab,type $2} ; system : coordsys {set _ $1} | wcssys {set _ $1} ; -gridgrid : yesno {GridCmdSet grid $1} - | COLOR_ STRING_ {GridCmdSet grid,color $2} - | WIDTH_ INT_ {GridCmdSet grid,width $2} - | DASH_ yesno {GridCmdSet grid,style $2} +gridgrid : yesno {ProcessCmdSet grid grid $1} + | COLOR_ STRING_ {ProcessCmdSet grid grid,color $2} + | WIDTH_ INT_ {ProcessCmdSet grid grid,width $2} + | DASH_ yesno {ProcessCmdSet grid grid,style $2} # backward compatible - | STYLE_ INT_ {GridCmdSet grid,style $2} - | GAP1_ numeric {GridCmdSet grid,gap1 $2} - | GAP2_ numeric {GridCmdSet grid,gap2 $2} - | GAP3_ numeric {GridCmdSet grid,gap3 $2} + | STYLE_ INT_ {ProcessCmdSet grid grid,style $2} + | GAP1_ numeric {ProcessCmdSet grid grid,gap1 $2} + | GAP2_ numeric {ProcessCmdSet grid grid,gap2 $2} + | GAP3_ numeric {ProcessCmdSet grid grid,gap3 $2} ; -axes : yesno {GridCmdSet axes $1} - | COLOR_ STRING_ {GridCmdSet axes,color $2} - | WIDTH_ INT_ {GridCmdSet axes,width $2} - | DASH_ yesno {GridCmdSet axes,style $2} +axes : yesno {ProcessCmdSet grid axes $1} + | COLOR_ STRING_ {ProcessCmdSet grid axes,color $2} + | WIDTH_ INT_ {ProcessCmdSet grid axes,width $2} + | DASH_ yesno {ProcessCmdSet grid axes,style $2} # backward compatible - | STYLE_ INT_ {GridCmdSet axes,style $2} - | TYPE_ interiortype {GridCmdSet axes,type $2} - | ORIGIN_ origin {GridCmdSet axes,origin $2} + | STYLE_ INT_ {ProcessCmdSet grid axes,style $2} + | TYPE_ interiortype {ProcessCmdSet grid axes,type $2} + | ORIGIN_ origin {ProcessCmdSet grid axes,origin $2} ; origin : LLL_ {set _ lll} @@ -141,77 +141,77 @@ origin : LLL_ {set _ lll} | UUU_ {set _ uuu} ; -tickmarks : yesno {GridCmdSet tick $1} - | COLOR_ STRING_ {GridCmdSet tick,color $2} - | WIDTH_ INT_ {GridCmdSet tick,width $2} - | DASH_ yesno {GridCmdSet tick,style $2} +tickmarks : yesno {ProcessCmdSet grid tick $1} + | COLOR_ STRING_ {ProcessCmdSet grid tick,color $2} + | WIDTH_ INT_ {ProcessCmdSet grid tick,width $2} + | DASH_ yesno {ProcessCmdSet grid tick,style $2} # backward compatible - | STYLE_ INT_ {GridCmdSet tick,style $2} + | STYLE_ INT_ {ProcessCmdSet grid tick,style $2} ; -border : yesno {GridCmdSet border $1} - | COLOR_ STRING_ {GridCmdSet border,color $2} - | WIDTH_ INT_ {GridCmdSet border,width $2} - | DASH_ yesno {GridCmdSet border,style $2} +border : yesno {ProcessCmdSet grid border $1} + | COLOR_ STRING_ {ProcessCmdSet grid border,color $2} + | WIDTH_ INT_ {ProcessCmdSet grid border,width $2} + | DASH_ yesno {ProcessCmdSet grid border,style $2} # backward compatible - | STYLE_ INT_ {GridCmdSet border,style $2} + | STYLE_ INT_ {ProcessCmdSet grid border,style $2} ; -numerics : yesno {GridCmdSet numlab $1} - | FONT_ font {GridCmdSet numlab,font $2} - | FONTSIZE_ INT_ {GridCmdSet numlab,size $2} - | FONTWEIGHT_ fontWeight {GridCmdSet numlab,weight $2} - | FONTSLANT_ fontSlant {GridCmdSet numlab,slant $2} +numerics : yesno {ProcessCmdSet grid numlab $1} + | FONT_ font {ProcessCmdSet grid numlab,font $2} + | FONTSIZE_ INT_ {ProcessCmdSet grid numlab,size $2} + | FONTWEIGHT_ fontWeight {ProcessCmdSet grid numlab,weight $2} + | FONTSLANT_ fontSlant {ProcessCmdSet grid numlab,slant $2} # backward compatibility | FONTSTYLE_ fontStyle {GridCmdFontStyle numlab $2} - | COLOR_ STRING_ {GridCmdSet numlab,color $2} - | GAP1_ numeric {GridCmdSet numlab,gap1 $2} - | GAP2_ numeric {GridCmdSet numlab,gap2 $2} - | GAP3_ numeric {GridCmdSet numlab,gap3 $2} - | TYPE_ interiortype {GridCmdSet numlab,type $2} - | VERTICAL_ yesno {GridCmdSet numlab,vertical $2} + | COLOR_ STRING_ {ProcessCmdSet grid numlab,color $2} + | GAP1_ numeric {ProcessCmdSet grid numlab,gap1 $2} + | GAP2_ numeric {ProcessCmdSet grid numlab,gap2 $2} + | GAP3_ numeric {ProcessCmdSet grid numlab,gap3 $2} + | TYPE_ interiortype {ProcessCmdSet grid numlab,type $2} + | VERTICAL_ yesno {ProcessCmdSet grid numlab,vertical $2} ; -title : yesno {GridCmdSet title $1} - | TEXT_ STRING_ {GridCmdSet title,text $2} - | DEF_ yesno {GridCmdSet title,def $2} - | GAP_ numeric {GridCmdSet title,gap $2} - | FONT_ font {GridCmdSet title,font $2} - | FONTSIZE_ INT_ {GridCmdSet title,size $2} - | FONTWEIGHT_ fontWeight {GridCmdSet title,weight $2} - | FONTSLANT_ fontSlant {GridCmdSet title,slant $2} +title : yesno {ProcessCmdSet grid title $1} + | TEXT_ STRING_ {ProcessCmdSet grid title,text $2} + | DEF_ yesno {ProcessCmdSet grid title,def $2} + | GAP_ numeric {ProcessCmdSet grid title,gap $2} + | FONT_ font {ProcessCmdSet grid title,font $2} + | FONTSIZE_ INT_ {ProcessCmdSet grid title,size $2} + | FONTWEIGHT_ fontWeight {ProcessCmdSet grid title,weight $2} + | FONTSLANT_ fontSlant {ProcessCmdSet grid title,slant $2} # backward compatibility | FONTSTYLE_ fontStyle {GridCmdFontStyle title $2} - | COLOR_ STRING_ {GridCmdSet title,color $2} + | COLOR_ STRING_ {ProcessCmdSet grid title,color $2} ; -labels : yesno {GridCmdSet textlab $1} - | TEXT1_ STRING_ {GridCmdSet textlab,text1 $2} - | TEXT2_ STRING_ {GridCmdSet textlab,text2 $2} - | DEF1_ yesno {GridCmdSet textlab,def1 $2} - | DEF2_ yesno {GridCmdSet textlab,def2 $2} - | GAP1_ numeric {GridCmdSet textlab,gap1 $2} - | GAP2_ numeric {GridCmdSet textlab,gap2 $2} - | FONT_ font {GridCmdSet textlab,font $2} - | FONTSIZE_ INT_ {GridCmdSet textlab,size $2} - | FONTWEIGHT_ fontWeight {GridCmdSet textlab,weight $2} - | FONTSLANT_ fontSlant {GridCmdSet textlab,slant $2} +labels : yesno {ProcessCmdSet grid textlab $1} + | TEXT1_ STRING_ {ProcessCmdSet grid textlab,text1 $2} + | TEXT2_ STRING_ {ProcessCmdSet grid textlab,text2 $2} + | DEF1_ yesno {ProcessCmdSet grid textlab,def1 $2} + | DEF2_ yesno {ProcessCmdSet grid textlab,def2 $2} + | GAP1_ numeric {ProcessCmdSet grid textlab,gap1 $2} + | GAP2_ numeric {ProcessCmdSet grid textlab,gap2 $2} + | FONT_ font {ProcessCmdSet grid textlab,font $2} + | FONTSIZE_ INT_ {ProcessCmdSet grid textlab,size $2} + | FONTWEIGHT_ fontWeight {ProcessCmdSet grid textlab,weight $2} + | FONTSLANT_ fontSlant {ProcessCmdSet grid textlab,slant $2} # backward compatibility | FONTSTYLE_ fontStyle {GridCmdFontStyle textlab $2} - | COLOR_ STRING_ {GridCmdSet textlab,color $2} + | COLOR_ STRING_ {ProcessCmdSet grid textlab,color $2} ; -view : GRID_ yesno {GridCmdSet grid $1} +view : GRID_ yesno {ProcessCmdSet grid grid $1} | AXES_ viewaxes - | TITLE_ yesno {GridCmdSet title $2} - | BORDER_ yesno {GridCmdSet border $2} - | VERTICAL_ yesno {GridCmdSet numlab,vertical $2} + | TITLE_ yesno {ProcessCmdSet grid title $2} + | BORDER_ yesno {ProcessCmdSet grid border $2} + | VERTICAL_ yesno {ProcessCmdSet grid numlab,vertical $2} ; -viewaxes : yesno {GridCmdSet axes $1} - | NUMBERS_ yesno {GridCmdSet numlab $2} - | TICKMARKS_ yesno {GridCmdSet tick $2} - | LABELS_ yesno {GridCmdSet textlab $2} +viewaxes : yesno {ProcessCmdSet grid axes $1} + | NUMBERS_ yesno {ProcessCmdSet grid numlab $2} + | TICKMARKS_ yesno {ProcessCmdSet grid tick $2} + | LABELS_ yesno {ProcessCmdSet grid textlab $2} ; %% diff --git a/ds9/parsers/heightparser.tac b/ds9/parsers/heightparser.tac index c9fdc5c..f3a49ce 100644 --- a/ds9/parsers/heightparser.tac +++ b/ds9/parsers/heightparser.tac @@ -14,7 +14,7 @@ command : height | height {yyclearin; YYACCEPT} STRING_ ; -height : INT_ {CanvasCmdSet height $1 UpdateView} +height : INT_ {ProcessCmdSet canvas height $1 UpdateView} ; %% diff --git a/ds9/parsers/magnifierparser.tac b/ds9/parsers/magnifierparser.tac index 69dc5dc..d2e8906 100644 --- a/ds9/parsers/magnifierparser.tac +++ b/ds9/parsers/magnifierparser.tac @@ -21,12 +21,12 @@ command : magnifier | magnifier {yyclearin; YYACCEPT} STRING_ ; -magnifier : COLOR_ STRING_ {PmagnifierCmdSet color $2 MagnifierColor} - | ZOOM_ numeric {PmagnifierCmdSet zoom $2 MagnifierZoom} - | CURSOR_ yesno {PmagnifierCmdSet cursor $2 MagnifierCursor} - | REGION_ yesno {PmagnifierCmdSet region $2 MagnifierRegion} +magnifier : COLOR_ STRING_ {ProcessCmdSet pmagnifier color $2 MagnifierColor} + | ZOOM_ numeric {ProcessCmdSet pmagnifier zoom $2 MagnifierZoom} + | CURSOR_ yesno {ProcessCmdSet pmagnifier cursor $2 MagnifierCursor} + | REGION_ yesno {ProcessCmdSet pmagnifier region $2 MagnifierRegion} # backward compatibility - | yesno {ViewCmdSet magnifier $1 UpdateView} + | yesno {ProcessCmdSet view magnifier $1 UpdateView} ; %% diff --git a/ds9/parsers/modeparser.tac b/ds9/parsers/modeparser.tac index 9665367..be7fb2f 100644 --- a/ds9/parsers/modeparser.tac +++ b/ds9/parsers/modeparser.tac @@ -23,7 +23,7 @@ command : mode | mode {yyclearin; YYACCEPT} STRING_ ; -mode : item {CurrentCmdSet mode $1 ChangeMode} +mode : item {ProcessCmdSet current mode $1 ChangeMode} ; item : NONE_ {set _ none} diff --git a/ds9/parsers/orientparser.tac b/ds9/parsers/orientparser.tac index 0b5f0bb..099e1ec 100644 --- a/ds9/parsers/orientparser.tac +++ b/ds9/parsers/orientparser.tac @@ -16,7 +16,7 @@ command : orient | orient {yyclearin; YYACCEPT} STRING_ ; -orient : orientation {CurrentCmdSet orient $1 ChangeOrient} +orient : orientation {ProcessCmdSet current orient $1 ChangeOrient} | OPEN_ {PanZoomDialog} | CLOSE_ {PanZoomDestroyDialog} ; diff --git a/ds9/parsers/regionparser.tac b/ds9/parsers/regionparser.tac index dd9c61c..5142ea4 100644 --- a/ds9/parsers/regionparser.tac +++ b/ds9/parsers/regionparser.tac @@ -125,12 +125,12 @@ region : {RegionCmdLoad} | FILE_ loadall STRING_ {RegionCmdLoadFn $3 $2} | SAVE_ STRING_ {RegionCmdSave $2} | LIST_ list - | EPSILON_ INT_ {PmarkerCmdSet epsilon $2 MarkerEpsilon} - | SHOW_ yesno {MarkerCmdSet show $2 MarkerShow} - | SHOWTEXT_ yesno {MarkerCmdSet show,text $2 MarkerShowText} + | EPSILON_ INT_ {ProcessCmdSet pmarker epsilon $2 MarkerEpsilon} + | SHOW_ yesno {ProcessCmdSet marker show $2 MarkerShow} + | SHOWTEXT_ yesno {ProcessCmdSet marker show,text $2 MarkerShowText} | CENTROID_ centroid # backward compatibility - | AUTOCENTROID_ yesno {MarkerCmdSet centroid,auto $2 MarkerCentroidAuto} + | AUTOCENTROID_ yesno {ProcessCmdSet marker centroid,auto $2 MarkerCentroidAuto} | GETINFO_ {MarkerInfo} | MOVE_ move # backward compatibility @@ -145,35 +145,35 @@ region : {RegionCmdLoad} | DELETE_ delete # backward compatibility | DELETEALL_ {MarkerDeleteAll} - | FORMAT_ format {MarkerCmdSet format $2} - | SYSTEM_ coordsys {MarkerCmdSet system $2} - | SYSTEM_ wcssys {MarkerCmdSet system $2} + | FORMAT_ format {ProcessCmdSet marker format $2} + | SYSTEM_ coordsys {ProcessCmdSet marker system $2} + | SYSTEM_ wcssys {ProcessCmdSet marker system $2} # backward compatibility - | SYSTEM_ skyframe {MarkerCmdSet system wcs; MarkerCmdSet sky $2} - | SKY_ skyframe {MarkerCmdSet sky $2} - | SKYFORMAT_ skyformat {MarkerCmdSet skyformat $2} - | STRIP_ yesno {MarkerCmdSet strip $2} - | DELIM_ delim {MarkerCmdSet strip $2} - | SHAPE_ shape {MarkerCmdSet shape $2} - | COLOR_ STRING_ {MarkerCmdSet color $2 MarkerColor} - | WIDTH_ INT_ {MarkerCmdSet width $2 MarkerWidth} - | FIXED_ yesno {MarkerCmdSet fixed $2 [list MarkerProp fixed]} - | EDIT_ yesno {MarkerCmdSet edit $2 [list MarkerProp edit]} - | ROTATE_ yesno {MarkerCmdSet rotate $2 [list MarkerProp rotate]} - | DELETE_ yesno {MarkerCmdSet delete $2 [list MarkerProp delete]} - | INCLUDE_ {MarkerCmdSet include 1 [list MarkerProp include]} - | EXCLUDE_ {MarkerCmdSet include 0 [list MarkerProp include]} - | SOURCE_ {MarkerCmdSet source 1 [list MarkerProp source]} - | BACKGROUND_ {MarkerCmdSet source 0 [list MarkerProp source]} + | SYSTEM_ skyframe {ProcessCmdSet marker system wcs; ProcessCmdSet marker sky $2} + | SKY_ skyframe {ProcessCmdSet marker sky $2} + | SKYFORMAT_ skyformat {ProcessCmdSet marker skyformat $2} + | STRIP_ yesno {ProcessCmdSet marker strip $2} + | DELIM_ delim {ProcessCmdSet marker strip $2} + | SHAPE_ shape {ProcessCmdSet marker shape $2} + | COLOR_ STRING_ {ProcessCmdSet marker color $2 MarkerColor} + | WIDTH_ INT_ {ProcessCmdSet marker width $2 MarkerWidth} + | FIXED_ yesno {ProcessCmdSet marker fixed $2 [list MarkerProp fixed]} + | EDIT_ yesno {ProcessCmdSet marker edit $2 [list MarkerProp edit]} + | ROTATE_ yesno {ProcessCmdSet marker rotate $2 [list MarkerProp rotate]} + | DELETE_ yesno {ProcessCmdSet marker delete $2 [list MarkerProp delete]} + | INCLUDE_ {ProcessCmdSet marker include 1 [list MarkerProp include]} + | EXCLUDE_ {ProcessCmdSet marker include 0 [list MarkerProp include]} + | SOURCE_ {ProcessCmdSet marker source 1 [list MarkerProp source]} + | BACKGROUND_ {ProcessCmdSet marker source 0 [list MarkerProp source]} | GROUPS_ group | GROUP_ group | COPY_ {MarkerCopy} | CUT_ {MarkerCut} - | PASTE_ {MarkerCmdSet paste,system wcs MarkerPaste} - | PASTE_ coordsys {MarkerCmdSet paste,system $2 MarkerPaste} - | PASTE_ wcssys {MarkerCmdSet paste,system $2 MarkerPaste} + | PASTE_ {ProcessCmdSet marker paste,system wcs MarkerPaste} + | PASTE_ coordsys {ProcessCmdSet marker paste,system $2 MarkerPaste} + | PASTE_ wcssys {ProcessCmdSet marker paste,system $2 MarkerPaste} # backward compatibility - | PASTE_ skyframe {MarkerCmdSet paste,system wcs MarkerPaste} + | PASTE_ skyframe {ProcessCmdSet marker paste,system wcs MarkerPaste} | UNDO_ {MarkerUndo} | COMPOSITE_ {CompositeCreate} | DISSOLVE_ {CompositeDelete} @@ -186,12 +186,12 @@ props : props prop | prop ; -prop : -FORMAT_ format {MarkerCmdSet load,format $2} - | -SYSTEM_ coordsys {MarkerCmdSet load,system $2} - | -SYSTEM_ wcssys {MarkerCmdSet load,system $2} +prop : -FORMAT_ format {ProcessCmdSet marker load,format $2} + | -SYSTEM_ coordsys {ProcessCmdSet marker load,system $2} + | -SYSTEM_ wcssys {ProcessCmdSet marker load,system $2} # backward compatibility - | -SYSTEM_ skyframe {MarkerCmdSet load,system wcs; MarkerCmdSet load,sky $2} - | -SKY_ skyframe {MarkerCmdSet load,sky $2} + | -SYSTEM_ skyframe {ProcessCmdSet marker load,system wcs; ProcessCmdSet marker load,sky $2} + | -SKY_ skyframe {ProcessCmdSet marker load,sky $2} ; loadall : {set _ 0} @@ -203,9 +203,9 @@ list : {RegionCmdList} ; centroid : {MarkerCentroid} - | AUTO_ yesno {MarkerCmdSet centroid,auto $2 MarkerCentroidAuto} - | RADIUS_ numeric {MarkerCmdSet centroid,radius $2 MarkerCentroidRadius} - | ITERATION_ INT_ {MarkerCmdSet centroid,iteration $2 MarkerCentroidIteration} + | AUTO_ yesno {ProcessCmdSet marker centroid,auto $2 MarkerCentroidAuto} + | RADIUS_ numeric {ProcessCmdSet marker centroid,radius $2 MarkerCentroidRadius} + | ITERATION_ INT_ {ProcessCmdSet marker centroid,iteration $2 MarkerCentroidIteration} ; move : FRONT_ {MarkerFront} diff --git a/ds9/parsers/rgbparser.tac b/ds9/parsers/rgbparser.tac index 7e01875..8bc8cea 100644 --- a/ds9/parsers/rgbparser.tac +++ b/ds9/parsers/rgbparser.tac @@ -40,8 +40,8 @@ command : rgb rgb : {CreateRGBFrame} | OPEN_ {} | CLOSE_ {RGBDestroyDialog} - | channel {CurrentCmdSet rgb $1 RGBChannel} - | CHANNEL_ channel {CurrentCmdSet rgb $2 RGBChannel} + | 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} diff --git a/ds9/parsers/rotateparser.tac b/ds9/parsers/rotateparser.tac index e9d81df..536f1e6 100644 --- a/ds9/parsers/rotateparser.tac +++ b/ds9/parsers/rotateparser.tac @@ -19,7 +19,7 @@ command : rotate ; rotate : numeric {Rotate $1} - | TO_ numeric {CurrentCmdSet rotate $2 ChangeRotate} + | TO_ numeric {ProcessCmdSet current rotate $2 ChangeRotate} | OPEN_ {PanZoomDialog} | CLOSE_ {PanZoomDestroyDialog} ; diff --git a/ds9/parsers/tileparser.tac b/ds9/parsers/tileparser.tac index a0f8690..486814d 100644 --- a/ds9/parsers/tileparser.tac +++ b/ds9/parsers/tileparser.tac @@ -26,13 +26,13 @@ command : tile | tile {yyclearin; YYACCEPT} STRING_ ; -tile: {CurrentCmdSet display tile DisplayMode} - | yes {CurrentCmdSet display tile DisplayMode} - | no {CurrentCmdSet display single DisplayMode} - | MODE_ tileMode {TileCmdSet mode $2 DisplayMode} +tile: {ProcessCmdSet current display tile DisplayMode} + | yes {ProcessCmdSet current display tile DisplayMode} + | no {ProcessCmdSet current display single DisplayMode} + | MODE_ tileMode {ProcessCmdSet tile mode $2 DisplayMode} | GRID_ tileGrid - | COLUMN_ {TileCmdSet mode column DisplayMode} - | ROW_ {TileCmdSet mode row DisplayMode} + | COLUMN_ {ProcessCmdSet tile mode column DisplayMode} + | ROW_ {ProcessCmdSet tile mode row DisplayMode} ; tileMode : GRID_ {set _ grid} @@ -40,11 +40,11 @@ tileMode : GRID_ {set _ grid} | ROW_ {set _ row} ; -tileGrid : {TileCmdSet mode grid DisplayMode} - | MODE_ tileGridMode {TileCmdSet grid,mode $2 DisplayMode} - | DIRECTION_ tileGridDir {TileCmdSet grid,dir $2 DisplayMode} - | LAYOUT_ INT_ INT_ {TileCmdSet grid,col $2; TileCmdSet grid,row $3; TileCmdSetgrid,mode manual DisplayMode} - | GAP_ INT_ {TileCmdSet grid,gap $2 DisplayMode} +tileGrid : {ProcessCmdSet tile mode grid DisplayMode} + | MODE_ tileGridMode {ProcessCmdSet tile grid,mode $2 DisplayMode} + | DIRECTION_ tileGridDir {ProcessCmdSet tile grid,dir $2 DisplayMode} + | LAYOUT_ INT_ INT_ {ProcessCmdSet tile grid,col $2; ProcessCmdSet tile grid,row $3; TileCmdSetgrid,mode manual DisplayMode} + | GAP_ INT_ {ProcessCmdSet tile grid,gap $2 DisplayMode} ; tileGridMode : AUTOMATIC_ {set _ automatic} diff --git a/ds9/parsers/viewparser.tac b/ds9/parsers/viewparser.tac index 2c5715c..7310b2e 100644 --- a/ds9/parsers/viewparser.tac +++ b/ds9/parsers/viewparser.tac @@ -43,38 +43,38 @@ command : view view : layout | LAYOUT_ layout - | KEYVALUE_ STRING_ {ViewCmdSet info,keyvalue $2 UpdateView} - | INFO_ yesno {ViewCmdSet info $2 UpdateView} - | PANNER_ yesno {ViewCmdSet panner $2 UpdateView} - | MAGNIFIER_ yesno {ViewCmdSet magnifier $2 UpdateView} - | BUTTONS_ yesno {ViewCmdSet buttons $2 UpdateView} - | COLORBAR_ yesno {ViewCmdSet colorbar $2 UpdateView} + | KEYVALUE_ STRING_ {ProcessCmdSet view info,keyvalue $2 UpdateView} + | INFO_ yesno {ProcessCmdSet view info $2 UpdateView} + | PANNER_ yesno {ProcessCmdSet view panner $2 UpdateView} + | MAGNIFIER_ yesno {ProcessCmdSet view magnifier $2 UpdateView} + | BUTTONS_ yesno {ProcessCmdSet view buttons $2 UpdateView} + | COLORBAR_ yesno {ProcessCmdSet view colorbar $2 UpdateView} # backward compatible | COLORBARNUMERICS_ yesno {ColorbarCmdSet numerics $2 UpdateView} - | GRAPH_ orient yesno {ViewCmdSet graph,$1 $2 UpdateView} + | GRAPH_ orient yesno {ProcessCmdSet view graph,$1 $2 UpdateView} # backward compatible - | HORZGRAPH_ yesno {ViewCmdSet graph,horz $2 UpdateView} - | VERTGRAPH_ yesno {ViewCmdSet graph,vert $2 UpdateView} - - | FILENAME_ yesno {ViewCmdSet info,filename $2 UpdateView} - | OBJECT_ yesno {ViewCmdSet info,object $2 UpdateView} - | KEYWORD_ yesno {ViewCmdSet info,keyword $2 UpdateView} - | MINMAX_ yesno {ViewCmdSet info,minmax $2 UpdateView} - | LOWHIGH_ yesno {ViewCmdSet info,lowhigh $2 UpdateView} - | UNITS_ yesno {ViewCmdSet info,units $2 UpdateView} - | coordsys yesno {ViewCmdSet info,$1 $2 UpdateView} - | wcssys yesno {ViewCmdSet info,$1 $2 UpdateView} - | FRAME_ yesno {ViewCmdSet info,frame $2 UpdateView} + | HORZGRAPH_ yesno {ProcessCmdSet view graph,horz $2 UpdateView} + | VERTGRAPH_ yesno {ProcessCmdSet view graph,vert $2 UpdateView} + + | FILENAME_ yesno {ProcessCmdSet view info,filename $2 UpdateView} + | OBJECT_ yesno {ProcessCmdSet view info,object $2 UpdateView} + | KEYWORD_ yesno {ProcessCmdSet view info,keyword $2 UpdateView} + | MINMAX_ yesno {ProcessCmdSet view info,minmax $2 UpdateView} + | LOWHIGH_ yesno {ProcessCmdSet view info,lowhigh $2 UpdateView} + | UNITS_ yesno {ProcessCmdSet view info,units $2 UpdateView} + | 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} ; -layout : HORIZONTAL_ {ViewCmdSet layout horizontal ViewHorzCmd} - | VERTICAL_ {ViewCmdSet layout vertical ViewVertCmd} +layout : HORIZONTAL_ {ProcessCmdSet view layout horizontal ViewHorzCmd} + | VERTICAL_ {ProcessCmdSet view layout vertical ViewVertCmd} ; orient : HORIZONTAL_ {set _ horz} diff --git a/ds9/parsers/wcsparser.tac b/ds9/parsers/wcsparser.tac index fd904f1..98f4c25 100644 --- a/ds9/parsers/wcsparser.tac +++ b/ds9/parsers/wcsparser.tac @@ -36,7 +36,7 @@ wcs : OPEN_ {WCSDialog} | SKY_ skyframe {WCSCmdSet sky $2 UpdateWCS} | skyformat {WCSCmdSet skyformat $1 UpdateWCS} | SKYFORMAT_ skyformat {WCSCmdSet skyformat $2 UpdateWCS} - | ALIGN_ yesno {CurrentCmdSet align $2 AlignWCSFrame} + | ALIGN_ yesno {ProcessCmdSet current align $2 AlignWCSFrame} | RESET_ {WCSCmdReset 1} | RESET_ INT_ {WCSCmdReset $2} | REPLACE_ replace diff --git a/ds9/parsers/widthparser.tac b/ds9/parsers/widthparser.tac index b7d03df..8fe7cfe 100644 --- a/ds9/parsers/widthparser.tac +++ b/ds9/parsers/widthparser.tac @@ -14,7 +14,7 @@ command : width | width {yyclearin; YYACCEPT} STRING_ ; -width : INT_ {CanvasCmdSet width $1 UpdateView} +width : INT_ {ProcessCmdSet canvas width $1 UpdateView} ; %% -- cgit v0.12