From 98dc441e09b534baa68f8ca36ce60735db5dacfc Mon Sep 17 00:00:00 2001 From: William Joye Date: Tue, 10 Apr 2018 15:16:44 -0400 Subject: update ds9 parsers --- ds9/library/imgsvr.tcl | 56 ++++++++++++++++-------------------------- ds9/parsers/contourparser.tac | 13 +++++++--- ds9/parsers/dssesoparser.tac | 18 +++++++------- ds9/parsers/dsssaoparser.tac | 16 ++++++------ ds9/parsers/dssstsciparser.tac | 18 +++++++------- ds9/parsers/nvssparser.tac | 16 ++++++------ ds9/parsers/skyviewparser.tac | 18 +++++++------- ds9/parsers/twomassparser.tac | 18 +++++++------- ds9/parsers/vlaparser.tac | 18 +++++++------- ds9/parsers/vlssparser.tac | 16 ++++++------ 10 files changed, 100 insertions(+), 107 deletions(-) diff --git a/ds9/library/imgsvr.tcl b/ds9/library/imgsvr.tcl index 2af43fd..21262da 100644 --- a/ds9/library/imgsvr.tcl +++ b/ds9/library/imgsvr.tcl @@ -568,19 +568,11 @@ proc IMGSVRProcessCmd {varname iname vvarname} { } } -proc IMGSVRProcessSendCmd {proc id param vvarname} { - upvar #0 $vvarname vvar +proc IMGSVRCmd {varname which value} { + upvar #0 $varname var + global $varname - switch -- [string tolower [lindex $param 0]] { - save {$proc $id [ToYesNo $vvar(save)]} - frame {$proc $id "$vvar(mode)\n"} - survey {$proc $id "$vvar(survey)\n"} - size {$proc $id "$vvar(width) $vvar(height) $vvar(rformat)\n"} - pixels {$proc $id "$vvar(width,pixels) $vvar(height,pixels)\n"} - coord {$proc $id "$vvar(x) $vvar(y) $vvar(skyformat)\n"} - name - - default {$proc $id "$vvar(name)\n"} - } + set var($which) $value } proc IMGSVRCmdName {varname name} { @@ -622,39 +614,33 @@ proc IMGSVRCmdPixels {varname ww hh} { set var(height,pixels) $hh } -proc IMGSVRCmdSave {varname save} { +proc IMGSVRCmdUpdate {varname} { upvar #0 $varname var global $varname - set var(save) $save -} - -proc IMGSVRCmdMode {varname mode} { - upvar #0 $varname var - global $varname - - set var(mode) $mode -} - -proc IMGSVRCmdSurvey {varname survey} { - upvar #0 $varname var - global $varname - - set var(survey) $survey + IMGSVRUpdate $varname + IMGSVRApply $varname 1 } -proc IMGSVRCmdUpdateFrame {varname} { +proc IMGSVRCmdCrosshair {varname} { upvar #0 $varname var global $varname - IMGSVRUpdate $varname + IMGSVRCrosshair $varname IMGSVRApply $varname 1 } -proc IMGSVRCmdUpdateCrosshair {varname} { - upvar #0 $varname var - global $varname +proc IMGSVRProcessSendCmd {proc id param vvarname} { + upvar #0 $vvarname vvar - IMGSVRUpdate $varname - IMGSVRApply $varname 1 + switch -- [string tolower [lindex $param 0]] { + save {$proc $id [ToYesNo $vvar(save)]} + frame {$proc $id "$vvar(mode)\n"} + survey {$proc $id "$vvar(survey)\n"} + size {$proc $id "$vvar(width) $vvar(height) $vvar(rformat)\n"} + pixels {$proc $id "$vvar(width,pixels) $vvar(height,pixels)\n"} + coord {$proc $id "$vvar(x) $vvar(y) $vvar(skyformat)\n"} + name - + default {$proc $id "$vvar(name)\n"} + } } diff --git a/ds9/parsers/contourparser.tac b/ds9/parsers/contourparser.tac index a9ae784..7514e4f 100644 --- a/ds9/parsers/contourparser.tac +++ b/ds9/parsers/contourparser.tac @@ -66,8 +66,6 @@ contour : yesno {ContourCmdSet view $1} | SAVE_ save | CONVERT_ {Contour2Polygons} - | LOAD_ LEVELS_ STRING_ {ContourCmdLoadLevels $3} - | SAVE_ LEVELS_ STRING_ {ContourCmdSaveLevels $3} # backward compatibility | LOADLEVELS_ STRING_ {ContourCmdLoadLevels $2} | SAVELEVELS_ STRING_ {ContourCmdSaveLevels $2} @@ -90,19 +88,25 @@ contour : yesno {ContourCmdSet view $1} ; load : STRING_ {ContourCmdLoad $1} - | STRING_ STRING_ INT_ yesno {ContourCmdLoadParam $1 $2 $3 $4} + | LEVELS_ STRING_ {ContourCmdLoadLevels $2} # backward compatibility | STRING_ coordsys STRING_ INT_ yesno {ContourCmdLoadOrg $1 $2 fk5 $3 $4 $5} | STRING_ wcssys STRING_ INT_ yesno {ContourCmdLoadOrg $1 $2 fk5 $3 $4 $5} | STRING_ skyframe STRING_ INT_ yesno {ContourCmdLoadOrg $1 wcs $2 $3 $4 $5} | STRING_ wcssys skyframe STRING_ INT_ yesno {ContourCmdLoadOrg $1 $2 $3 $4 $5 $6} +# no longer supported +# | STRING_ STRING_ INT_ yesno {ContourCmdLoadParam $1 $2 $3 $4} ; save : STRING_ {ContourCmdSave $1 physical fk5} + | LEVELS_ STRING_ {ContourCmdSaveLevels $2} | STRING_ coordsys {ContourCmdSave $1 $2 fk5} | STRING_ wcssys {ContourCmdSave $1 $2 fk5} | STRING_ skyframe {ContourCmdSave $1 wcs $2} | STRING_ wcssys skyframe {ContourCmdSave $1 $2 $3} +# backward compatibility +# no longer supported +# | STRING_ wcssys skyframe STRING_ INT_ yesno {ContourCmdSave $1 $2 $3} ; paste : {ContourCmdPaste wcs fk5 green 1 no} @@ -110,6 +114,9 @@ paste : {ContourCmdPaste wcs fk5 green 1 no} | wcssys STRING_ INT_ yesno {ContourCmdPaste $1 fk5 $2 $3 $4} | skyframe STRING_ INT_ yesno {ContourCmdPaste wcs $1 $2 $3 $4} | wcssys skyframe STRING_ INT_ yesno {ContourCmdPaste $1 $2 $3 $4 $5} +# no longer supported +# | coordsys +# | wcssys ; method : BLOCK_ {set _ block} diff --git a/ds9/parsers/dssesoparser.tac b/ds9/parsers/dssesoparser.tac index c51517a..99620b0 100644 --- a/ds9/parsers/dssesoparser.tac +++ b/ds9/parsers/dssesoparser.tac @@ -26,22 +26,22 @@ command : dsseso dsseso : {IMGSVRApply deso 1} | OPEN_ {} | CLOSE_ {ARDestroy deso} - | STRING_ {IMGSVRCmdName deso $1} - | numeric numeric coordOpt {IMGSVRCmdCoord deso $1 $2 degrees} - | SEXSTR_ SEXSTR_ coordOpt {IMGSVRCmdCoord deso $1 $2 sexagesimal} + | STRING_ {IMGSVRCmd deso name $1} + | NAME_ STRING_ {IMGSVRCmd deso name $2} | SIZE_ numeric numeric sizeOpt {IMGSVRCmdSize deso $2 $3 $4} - | SAVE_ yesno {IMGSVRCmdSave deso $2} - | FRAME_ frame {IMGSVRCmdMode deso $2} - | SURVEY_ survey {IMGSVRCmdSurvey deso $2} + | SAVE_ yesno {IMGSVRCmd deso save $2} + | FRAME_ frame {IMGSVRCmd deso mode $2} + | SURVEY_ survey {IMGSVRCmd deso survey $2} | UPDATE_ update + | numeric numeric coordOpt {IMGSVRCmdCoord deso $1 $2 degrees} + | SEXSTR_ SEXSTR_ coordOpt {IMGSVRCmdCoord deso $1 $2 sexagesimal} | COORD_ numeric numeric deg {IMGSVRCmdCoord deso $2 $3 $4} | COORD_ SEXSTR_ SEXSTR_ sex {IMGSVRCmdCoord deso $2 $3 $4} - | NAME_ STRING_ {IMGSVRCmdName deso $2} ; -update : FRAME_ {IMGSVRCmdUpdateFrame deso} - | CROSSHAIR_ {IMGSVRCmdUpdateCrosshair deso} +update : FRAME_ {IMGSVRCmdUpdate deso} + | CROSSHAIR_ {IMGSVRCmdCrosshair deso} ; survey : DSS1_ {set _ DSS1} diff --git a/ds9/parsers/dsssaoparser.tac b/ds9/parsers/dsssaoparser.tac index 9b4cff3..a620fbe 100644 --- a/ds9/parsers/dsssaoparser.tac +++ b/ds9/parsers/dsssaoparser.tac @@ -21,21 +21,21 @@ command : dsssao dsssao : {IMGSVRApply dsao 1} | OPEN_ {} | CLOSE_ {ARDestroy dsao} - | STRING_ {IMGSVRCmdName dsao $1} - | numeric numeric coordOpt {IMGSVRCmdCoord dsao $1 $2 degrees} - | SEXSTR_ SEXSTR_ coordOpt {IMGSVRCmdCoord dsao $1 $2 sexagesimal} + | STRING_ {IMGSVRCmd dsao name $1} + | NAME_ STRING_ {IMGSVRCmd dsao name $2} | SIZE_ numeric numeric sizeOpt {IMGSVRCmdSize dsao $2 $3 $4} - | SAVE_ yesno {IMGSVRCmdSave dsao $2} - | FRAME_ frame {IMGSVRCmdMode dsao $2} + | SAVE_ yesno {IMGSVRCmd dsao save $2} + | FRAME_ frame {IMGSVRCmd dsao mode $2} | UPDATE_ update + | numeric numeric coordOpt {IMGSVRCmdCoord dsao $1 $2 degrees} + | SEXSTR_ SEXSTR_ coordOpt {IMGSVRCmdCoord dsao $1 $2 sexagesimal} | COORD_ numeric numeric deg {IMGSVRCmdCoord dsao $2 $3 $4} | COORD_ SEXSTR_ SEXSTR_ sex {IMGSVRCmdCoord dsao $2 $3 $4} - | NAME_ STRING_ {IMGSVRCmdName dsao $2} ; -update : FRAME_ {IMGSVRCmdUpdateFrame dsao} - | CROSSHAIR_ {IMGSVRCmdUpdateCrosshair dsao} +update : FRAME_ {IMGSVRCmdUpdate dsao} + | CROSSHAIR_ {IMGSVRCmdCrosshair dsao} ; %% diff --git a/ds9/parsers/dssstsciparser.tac b/ds9/parsers/dssstsciparser.tac index 38e6792..030c01b 100644 --- a/ds9/parsers/dssstsciparser.tac +++ b/ds9/parsers/dssstsciparser.tac @@ -31,22 +31,22 @@ command : dssstsci dssstsci : {IMGSVRApply dstsci 1} | OPEN_ {} | CLOSE_ {ARDestroy dstsci} - | STRING_ {IMGSVRCmdName dstsci $1} - | numeric numeric coordOpt {IMGSVRCmdCoord dstsci $1 $2 degrees} - | SEXSTR_ SEXSTR_ coordOpt {IMGSVRCmdCoord dstsci $1 $2 sexagesimal} + | STRING_ {IMGSVRCmd dstsci name $1} + | NAME_ STRING_ {IMGSVRCmd dstsci name $2} | SIZE_ numeric numeric sizeOpt {IMGSVRCmdSize dstsci $2 $3 $4} - | SAVE_ yesno {IMGSVRCmdSave dstsci $2} - | FRAME_ frame {IMGSVRCmdMode dstsci $2} - | SURVEY_ survey {IMGSVRCmdSurvey dstsci $2} + | SAVE_ yesno {IMGSVRCmd dstsci save $2} + | FRAME_ frame {IMGSVRCmd dstsci mode $2} + | SURVEY_ survey {IMGSVRCmd dstsci survey $2} | UPDATE_ update + | numeric numeric coordOpt {IMGSVRCmdCoord dstsci $1 $2 degrees} + | SEXSTR_ SEXSTR_ coordOpt {IMGSVRCmdCoord dstsci $1 $2 sexagesimal} | COORD_ numeric numeric deg {IMGSVRCmdCoord dstsci $2 $3 $4} | COORD_ SEXSTR_ SEXSTR_ sex {IMGSVRCmdCoord dstsci $2 $3 $4} - | NAME_ STRING_ {IMGSVRCmdName dstsci $2} ; -update : FRAME_ {IMGSVRCmdUpdateFrame dstsci} - | CROSSHAIR_ {IMGSVRCmdUpdateCrosshair dstsci} +update : FRAME_ {IMGSVRCmdUpdate dstsci} + | CROSSHAIR_ {IMGSVRCmdCrosshair dstsci} ; survey : POSS2RED_ {set _ poss2ukstu_red} diff --git a/ds9/parsers/nvssparser.tac b/ds9/parsers/nvssparser.tac index ccd9be0..fe2bdf3 100644 --- a/ds9/parsers/nvssparser.tac +++ b/ds9/parsers/nvssparser.tac @@ -21,21 +21,21 @@ command : nvss nvss : {IMGSVRApply dnvss 1} | OPEN_ {} | CLOSE_ {ARDestroy dnvss} - | STRING_ {IMGSVRCmdName dnvss $1} - | numeric numeric coordOpt {IMGSVRCmdCoord dnvss $1 $2 degrees} - | SEXSTR_ SEXSTR_ coordOpt {IMGSVRCmdCoord dnvss $1 $2 sexagesimal} + | STRING_ {IMGSVRCmd dnvss name $1} + | NAME_ STRING_ {IMGSVRCmd dnvss name $2} | SIZE_ numeric numeric sizeOpt {IMGSVRCmdSize dnvss $2 $3 $4} - | SAVE_ yesno {IMGSVRCmdSave dnvss $2} - | FRAME_ frame {IMGSVRCmdMode dnvss $2} + | SAVE_ yesno {IMGSVRCmd dnvss save $2} + | FRAME_ frame {IMGSVRCmd dnvss mode $2} | UPDATE_ update + | numeric numeric coordOpt {IMGSVRCmdCoord dnvss $1 $2 degrees} + | SEXSTR_ SEXSTR_ coordOpt {IMGSVRCmdCoord dnvss $1 $2 sexagesimal} | COORD_ numeric numeric deg {IMGSVRCmdCoord dnvss $2 $3 $4} | COORD_ SEXSTR_ SEXSTR_ sex {IMGSVRCmdCoord dnvss $2 $3 $4} - | NAME_ STRING_ {IMGSVRCmdName dnvss $2} ; -update : FRAME_ {IMGSVRCmdUpdateFrame dnvss} - | CROSSHAIR_ {IMGSVRCmdUpdateCrosshair dnvss} +update : FRAME_ {IMGSVRCmdUpdate dnvss} + | CROSSHAIR_ {IMGSVRCmdCrosshair dnvss} ; %% diff --git a/ds9/parsers/skyviewparser.tac b/ds9/parsers/skyviewparser.tac index cd052fb..40aa835 100644 --- a/ds9/parsers/skyviewparser.tac +++ b/ds9/parsers/skyviewparser.tac @@ -23,23 +23,23 @@ command : skyview skyview : {IMGSVRApply dskyview 1} | OPEN_ {} | CLOSE_ {ARDestroy dskyview} - | STRING_ {IMGSVRCmdName dskyview $1} - | numeric numeric coordOpt {IMGSVRCmdCoord dskyview $1 $2 degrees} - | SEXSTR_ SEXSTR_ coordOpt {IMGSVRCmdCoord dskyview $1 $2 sexagesimal} + | STRING_ {IMGSVRCmd dskyview name $1} + | NAME_ STRING_ {IMGSVRCmd dskyview name $2} | SIZE_ numeric numeric sizeOpt {IMGSVRCmdSize dskyview $2 $3 $4} | PIXELS_ numeric numeric {IMGSVRCmdPixels dskyview $2 $3} - | SAVE_ yesno {IMGSVRCmdSave dskyview $2} - | FRAME_ frame {IMGSVRCmdMode dskyview $2} - | SURVEY_ STRING_ {IMGSVRCmdSurvey dskyview $2} + | SAVE_ yesno {IMGSVRCmd dskyview save $2} + | FRAME_ frame {IMGSVRCmd dskyview mode $2} + | SURVEY_ STRING_ {IMGSVRCmd dskyview survey $2} | UPDATE_ update + | numeric numeric coordOpt {IMGSVRCmdCoord dskyview $1 $2 degrees} + | SEXSTR_ SEXSTR_ coordOpt {IMGSVRCmdCoord dskyview $1 $2 sexagesimal} | COORD_ numeric numeric deg {IMGSVRCmdCoord dskyview $2 $3 $4} | COORD_ SEXSTR_ SEXSTR_ sex {IMGSVRCmdCoord dskyview $2 $3 $4} - | NAME_ STRING_ {IMGSVRCmdName dskyview $2} ; -update : FRAME_ {IMGSVRCmdUpdateFrame dskyview} - | CROSSHAIR_ {IMGSVRCmdUpdateCrosshair dskyview} +update : FRAME_ {IMGSVRCmdUpdate dskyview} + | CROSSHAIR_ {IMGSVRCmdCrosshair dskyview} ; %% diff --git a/ds9/parsers/twomassparser.tac b/ds9/parsers/twomassparser.tac index 00f8fbb..069d013 100644 --- a/ds9/parsers/twomassparser.tac +++ b/ds9/parsers/twomassparser.tac @@ -21,22 +21,22 @@ command : 2mass 2mass : {IMGSVRApply dtwomass 1} | OPEN_ {} | CLOSE_ {ARDestroy dtwomass} - | STRING_ {IMGSVRCmdName dtwomass $1} - | numeric numeric coordOpt {IMGSVRCmdCoord dtwomass $1 $2 degrees} - | SEXSTR_ SEXSTR_ coordOpt {IMGSVRCmdCoord dtwomass $1 $2 sexagesimal} + | STRING_ {IMGSVRCmd dtwomass name $1} + | NAME_ STRING_ {IMGSVRCmd dtwomass name $2} | SIZE_ numeric numeric sizeOpt {IMGSVRCmdSize dtwomass $2 $3 $4} - | SAVE_ yesno {IMGSVRCmdSave dtwomass $2} - | FRAME_ frame {IMGSVRCmdMode dtwomass $2} - | SURVEY_ survey {IMGSVRCmdSurvey dtwomass $2} + | SAVE_ yesno {IMGSVRCmd dtwomass save $2} + | FRAME_ frame {IMGSVRCmd dtwomass mode $2} + | SURVEY_ survey {IMGSVRCmd dtwomass survey $2} | UPDATE_ update + | numeric numeric coordOpt {IMGSVRCmdCoord dtwomass $1 $2 degrees} + | SEXSTR_ SEXSTR_ coordOpt {IMGSVRCmdCoord dtwomass $1 $2 sexagesimal} | COORD_ numeric numeric deg {IMGSVRCmdCoord dtwomass $2 $3 $4} | COORD_ SEXSTR_ SEXSTR_ sex {IMGSVRCmdCoord dtwomass $2 $3 $4} - | NAME_ STRING_ {IMGSVRCmdName dtwomass $2} ; -update : FRAME_ {IMGSVRCmdUpdateFrame dtwomass} - | CROSSHAIR_ {IMGSVRCmdUpdateCrosshair dtwomass} +update : FRAME_ {IMGSVRCmdUpdate dtwomass} + | CROSSHAIR_ {IMGSVRCmdCrosshair dtwomass} ; survey : 'j' {set _ $1} diff --git a/ds9/parsers/vlaparser.tac b/ds9/parsers/vlaparser.tac index b2a7ca8..fcb5dbf 100644 --- a/ds9/parsers/vlaparser.tac +++ b/ds9/parsers/vlaparser.tac @@ -24,22 +24,22 @@ command : vla vla : {IMGSVRApply dvla 1} | OPEN_ {} | CLOSE_ {ARDestroy dvla} - | STRING_ {IMGSVRCmdName dvla $1} - | numeric numeric coordOpt {IMGSVRCmdCoord dvla $1 $2 degrees} - | SEXSTR_ SEXSTR_ coordOpt {IMGSVRCmdCoord dvla $1 $2 sexagesimal} + | STRING_ {IMGSVRCmd dvla name $1} + | NAME_ STRING_ {IMGSVRCmd dvla name $2} | SIZE_ numeric numeric sizeOpt {IMGSVRCmdSize dvla $2 $3 $4} - | SAVE_ yesno {IMGSVRCmdSave dvla $2} - | FRAME_ frame {IMGSVRCmdMode dvla $2} - | SURVEY_ survey {IMGSVRCmdSurvey dvla $2} + | SAVE_ yesno {IMGSVRCmd dvla save $2} + | FRAME_ frame {IMGSVRCmd dvla mode $2} + | SURVEY_ survey {IMGSVRCmd dvla survey $2} | UPDATE_ update + | numeric numeric coordOpt {IMGSVRCmdCoord dvla $1 $2 degrees} + | SEXSTR_ SEXSTR_ coordOpt {IMGSVRCmdCoord dvla $1 $2 sexagesimal} | COORD_ numeric numeric deg {IMGSVRCmdCoord dvla $2 $3 $4} | COORD_ SEXSTR_ SEXSTR_ sex {IMGSVRCmdCoord dvla $2 $3 $4} - | NAME_ STRING_ {IMGSVRCmdName dvla $2} ; -update : FRAME_ {IMGSVRCmdUpdateFrame dvla} - | CROSSHAIR_ {IMGSVRCmdUpdateCrosshair dvla} +update : FRAME_ {IMGSVRCmdUpdate dvla} + | CROSSHAIR_ {IMGSVRCmdCrosshair dvla} ; survey : STRIPE82_ {set _ stripe82} diff --git a/ds9/parsers/vlssparser.tac b/ds9/parsers/vlssparser.tac index 6fcaf1f..e4105ab 100644 --- a/ds9/parsers/vlssparser.tac +++ b/ds9/parsers/vlssparser.tac @@ -21,21 +21,21 @@ command : vlss vlss : {IMGSVRApply dvlss 1} | OPEN_ {} | CLOSE_ {ARDestroy dvlss} - | STRING_ {IMGSVRCmdName dvlss $1} - | numeric numeric coordOpt {IMGSVRCmdCoord dvlss $1 $2 degrees} - | SEXSTR_ SEXSTR_ coordOpt {IMGSVRCmdCoord dvlss $1 $2 sexagesimal} + | STRING_ {IMGSVRCmd dvlss name $1} + | NAME_ STRING_ {IMGSVRCmd dvlss name $2} | SIZE_ numeric numeric sizeOpt {IMGSVRCmdSize dvlss $2 $3 $4} - | SAVE_ yesno {IMGSVRCmdSave dvlss $2} - | FRAME_ frame {IMGSVRCmdMode dvlss $2} + | SAVE_ yesno {IMGSVRCmd dvlss save $2} + | FRAME_ frame {IMGSVRCmd dvlss mode $2} | UPDATE_ update + | numeric numeric coordOpt {IMGSVRCmdCoord dvlss $1 $2 degrees} + | SEXSTR_ SEXSTR_ coordOpt {IMGSVRCmdCoord dvlss $1 $2 sexagesimal} | COORD_ numeric numeric deg {IMGSVRCmdCoord dvlss $2 $3 $4} | COORD_ SEXSTR_ SEXSTR_ sex {IMGSVRCmdCoord dvlss $2 $3 $4} - | NAME_ STRING_ {IMGSVRCmdName dvlss $2} ; -update : FRAME_ {IMGSVRCmdUpdateFrame dvlss} - | CROSSHAIR_ {IMGSVRCmdUpdateCrosshair dvlss} +update : FRAME_ {IMGSVRCmdUpdate dvlss} + | CROSSHAIR_ {IMGSVRCmdCrosshair dvlss} ; %% -- cgit v0.12