summaryrefslogtreecommitdiffstats
path: root/ds9
diff options
context:
space:
mode:
authorWilliam Joye <wjoye@cfa.harvard.edu>2017-06-23 21:06:19 (GMT)
committerWilliam Joye <wjoye@cfa.harvard.edu>2017-06-23 21:06:19 (GMT)
commit1327f66cf7250024c8e5e14fbc4e956b313a155a (patch)
treec27c6d50b4fb6b9756dbfc7bfa0eeb2d30c81b0f /ds9
parent25f3ec07a5f8c32c65ffa55cec9aef2bab285087 (diff)
downloadblt-1327f66cf7250024c8e5e14fbc4e956b313a155a.zip
blt-1327f66cf7250024c8e5e14fbc4e956b313a155a.tar.gz
blt-1327f66cf7250024c8e5e14fbc4e956b313a155a.tar.bz2
new command parser 2mass
Diffstat (limited to 'ds9')
-rw-r--r--ds9/library/parser.tac36
1 files changed, 22 insertions, 14 deletions
diff --git a/ds9/library/parser.tac b/ds9/library/parser.tac
index af558f2..58a67d6 100644
--- a/ds9/library/parser.tac
+++ b/ds9/library/parser.tac
@@ -77,19 +77,8 @@ degArcminArcsec : DEGREES_ {set _ degrees}
| CLOSE_ {ARDestroy dtwomass}
| SAVE_ yesno {global dtwomass; set dtwomass(save) $2}
| FRAME_ newCurrent {global dtwomass; set dtwomass(mode) $2}
- | SURVEY_ STRING_ {global dtwomass; set dtwomass(survey) $2}
- | SIZE_ numeric numeric {
- global dtwomass
- set dtwomass(width) $2
- set dtwomass(height) $3
- }
- | SIZE_ numeric numeric degArcminArcsec {
- global dtwomass
- set dtwomass(width) $2
- set dtwomass(height) $3
- set dtwomass(rformat) $4
- set dtwomass(rformat,msg) $4
- }
+ | SIZE_ 2massSize
+ | SURVEY_ 2massSurvey {global dtwomass; set dtwomass(survey) $2}
| UPDATE_ FRAME_ {IMGSVRUpdate dtwomass; IMGSVRApply dtwomass 1}
| UPDATE_ CROSSHAIR_ {IMGSVRCrosshair dtwomass; IMGSVRApply dtwomass 1}
| COORD_
@@ -98,7 +87,26 @@ degArcminArcsec : DEGREES_ {set _ degrees}
# {}
# default
-3d : {puts "*** 2MASS ***"}
+2massSize : numeric numeric {
+ global dtwomass
+ set dtwomass(width) $1
+ set dtwomass(height) $2
+ }
+ | numeric numeric degArcminArcsec {
+ global dtwomass
+ set dtwomass(width) $1
+ set dtwomass(height) $2
+ set dtwomass(rformat) $3
+ set dtwomass(rformat,msg) $3
+ }
+ ;
+
+2massSurvey : 'j' {set _ $1}
+ | 'h' {set _ $1}
+ | 'k' {set _ $1}
+ ;
+
+3d : {puts "*** 3D ***"}
;
about : {puts "*** ABOUT ***"}