diff options
| author | William Joye <wjoye@cfa.harvard.edu> | 2018-06-06 19:10:47 (GMT) |
|---|---|---|
| committer | William Joye <wjoye@cfa.harvard.edu> | 2018-06-06 19:10:47 (GMT) |
| commit | c332ce7cc5ca4c8525b295157abba6bbf0bf0953 (patch) | |
| tree | be8f292c2f10b2baa2be7de173f15665ce008a6b | |
| parent | 5178f98a0a216d2419e6695758101ab321495cbf (diff) | |
| download | blt-c332ce7cc5ca4c8525b295157abba6bbf0bf0953.zip blt-c332ce7cc5ca4c8525b295157abba6bbf0bf0953.tar.gz blt-c332ce7cc5ca4c8525b295157abba6bbf0bf0953.tar.bz2 | |
update ds9 parsers
| -rw-r--r-- | ds9/library/marker.tcl | 7 | ||||
| -rw-r--r-- | ds9/parsers/regionparser.tac | 4 |
2 files changed, 2 insertions, 9 deletions
diff --git a/ds9/library/marker.tcl b/ds9/library/marker.tcl index af426e1..a9c8f9e 100644 --- a/ds9/library/marker.tcl +++ b/ds9/library/marker.tcl @@ -1485,12 +1485,6 @@ proc RegionCmdGroup {cmd {val1 {}} {val2 {}}} { UpdateGroupDialog } -proc RegionCmdGroupTag {tag} { - global marker - - set marker(tag) $tag -} - proc RegionCmdGroupNew {} { global current global marker @@ -1601,6 +1595,5 @@ proc RegionSendCmd {} { set rr [$current(frame) marker list $marker(load,select) $marker(load,format) $marker(load,system) $marker(load,sky) $marker(load,skyformat) $marker(load,strip) $marker(load,props) $marker(load,tags)] - puts $rr ProcessSendCmdResult $ext $rr } diff --git a/ds9/parsers/regionparser.tac b/ds9/parsers/regionparser.tac index a413ef4..39db756 100644 --- a/ds9/parsers/regionparser.tac +++ b/ds9/parsers/regionparser.tac @@ -213,7 +213,7 @@ select : ALL_ {MarkerSelectAll} | NONE_ {MarkerUnselectAll} | INVERT_ {MarkerSelectInvert} # backward compatibility - | GROUP_ STRING_ {RegionCmdGroupTag $2; RegionCmdGroup select} + | GROUP_ STRING_ {ProcessCmdSet marker tag $2; RegionCmdGroup select} ; delete : ALL_ {MarkerDeleteAll} @@ -272,7 +272,7 @@ template : STRING_ {RegionCmdTemplate $1} ; group : NEW_ {RegionCmdGroupNew} - | STRING_ {RegionCmdGroupTag $1} groupTag + | STRING_ {ProcessCmdSet marker tag $1} groupTag ; groupTag : NEW_ {RegionCmdGroupNew} |