summaryrefslogtreecommitdiffstats
path: root/ds9
diff options
context:
space:
mode:
authorWilliam Joye <wjoye@cfa.harvard.edu>2018-06-06 20:31:38 (GMT)
committerWilliam Joye <wjoye@cfa.harvard.edu>2018-06-06 20:31:38 (GMT)
commit458832c9a3d99e965341f8a460583cf32062c0fb (patch)
treeae32f63c41a1025ee0c1b2f20b4891dbdab69911 /ds9
parentc02940558ef4f2c7b4df9c8b84ac442a876d3fc4 (diff)
downloadblt-458832c9a3d99e965341f8a460583cf32062c0fb.zip
blt-458832c9a3d99e965341f8a460583cf32062c0fb.tar.gz
blt-458832c9a3d99e965341f8a460583cf32062c0fb.tar.bz2
update ds9 parsers
Diffstat (limited to 'ds9')
-rw-r--r--ds9/library/eso.tcl12
-rw-r--r--ds9/library/manalysis.tcl2
-rw-r--r--ds9/library/nvss.tcl14
-rw-r--r--ds9/library/sao.tcl2
-rw-r--r--ds9/library/source.tcl10
-rw-r--r--ds9/library/stsci.tcl12
-rw-r--r--ds9/library/vla.tcl12
-rw-r--r--ds9/library/vlss.tcl12
-rw-r--r--ds9/parsers/dssesosendlex.fcl13
-rw-r--r--ds9/parsers/dssesosendparser.tac28
-rw-r--r--ds9/parsers/dsssaosendparser.tac1
-rw-r--r--ds9/parsers/dssstscisendlex.fcl13
-rw-r--r--ds9/parsers/dssstscisendparser.tac28
-rw-r--r--ds9/parsers/nvsssendlex.fcl13
-rw-r--r--ds9/parsers/nvsssendparser.tac27
-rw-r--r--ds9/parsers/vlasendlex.fcl13
-rw-r--r--ds9/parsers/vlasendparser.tac28
-rw-r--r--ds9/parsers/vlsssendlex.fcl13
-rw-r--r--ds9/parsers/vlsssendparser.tac27
19 files changed, 254 insertions, 26 deletions
diff --git a/ds9/library/eso.tcl b/ds9/library/eso.tcl
index 38a341d..cd3d680 100644
--- a/ds9/library/eso.tcl
+++ b/ds9/library/eso.tcl
@@ -41,9 +41,6 @@ proc ESODialog {} {
set var(rformat) $eso(rformat)
set var(width) $eso(width)
set var(height) $eso(height)
- # not used
- set var(width,pixels) 300
- set var(height,pixels) 300
set var(survey) $eso(survey)
set var(mode) $eso(mode)
set var(save) $eso(save)
@@ -170,5 +167,12 @@ proc ProcessESOCmd {varname iname} {
proc ProcessSendESOCmd {proc id param {sock {}} {fn {}}} {
ESODialog
- IMGSVRProcessSendCmd $proc $id $param deso
+
+ global parse
+ set parse(proc) $proc
+ set parse(id) $id
+
+ dssesosend::YY_FLUSH_BUFFER
+ dssesosend::yy_scan_string $param
+ dssesosend::yyparse
}
diff --git a/ds9/library/manalysis.tcl b/ds9/library/manalysis.tcl
index 44d6425..c227862 100644
--- a/ds9/library/manalysis.tcl
+++ b/ds9/library/manalysis.tcl
@@ -148,7 +148,7 @@ proc AnalysisMainMenu {} {
$ds9(mb).analysis.image add command \
-label {NVSS (NRAO)} -command NVSSDialog
$ds9(mb).analysis.image add command \
- -label {NLSS (NRAO)} -command VLSSDialog
+ -label {VLSS (NRAO)} -command VLSSDialog
$ds9(mb).analysis.image add separator
$ds9(mb).analysis.image add command \
-label {SkyView (NASA/HEASARC)} -command SkyViewDialog
diff --git a/ds9/library/nvss.tcl b/ds9/library/nvss.tcl
index 8c3b8c2..b12df44 100644
--- a/ds9/library/nvss.tcl
+++ b/ds9/library/nvss.tcl
@@ -17,7 +17,6 @@ proc NVSSDef {} {
set nvss(height) 15
set nvss(mode) new
set nvss(save) 0
- set nvss(survey) nvss
}
proc NVSSDialog {} {
@@ -41,12 +40,8 @@ proc NVSSDialog {} {
set var(rformat) $nvss(rformat)
set var(width) $nvss(width)
set var(height) $nvss(height)
- # not used
- set var(width,pixels) 300
- set var(height,pixels) 300
set var(mode) $nvss(mode)
set var(save) $nvss(save)
- set var(survey) $nvss(survey)
set w $var(top)
IMGSVRInit $varname "NVSS [msgcat::mc {Server}]" \
@@ -162,5 +157,12 @@ proc ProcessNVSSCmd {varname iname} {
proc ProcessSendNVSSCmd {proc id param {sock {}} {fn {}}} {
NVSSDialog
- IMGSVRProcessSendCmd $proc $id $param dnvss
+
+ global parse
+ set parse(proc) $proc
+ set parse(id) $id
+
+ nvsssend::YY_FLUSH_BUFFER
+ nvsssend::yy_scan_string $param
+ nvsssend::yyparse
}
diff --git a/ds9/library/sao.tcl b/ds9/library/sao.tcl
index 60a507a..0efafa9 100644
--- a/ds9/library/sao.tcl
+++ b/ds9/library/sao.tcl
@@ -160,7 +160,5 @@ proc ProcessSendSAOCmd {proc id param {sock {}} {fn {}}} {
dsssaosend::YY_FLUSH_BUFFER
dsssaosend::yy_scan_string $param
dsssaosend::yyparse
-
-# IMGSVRProcessSendCmd $proc $id $param dsao
}
diff --git a/ds9/library/source.tcl b/ds9/library/source.tcl
index 7cca79c..8b175bd 100644
--- a/ds9/library/source.tcl
+++ b/ds9/library/source.tcl
@@ -232,12 +232,16 @@ source $ds9(root)/library/cursorparser.tcl
source $ds9(root)/library/cursorlex.tcl
source $ds9(root)/library/dssesoparser.tcl
source $ds9(root)/library/dssesolex.tcl
+source $ds9(root)/library/dssesosendparser.tcl
+source $ds9(root)/library/dssesosendlex.tcl
source $ds9(root)/library/dsssaoparser.tcl
source $ds9(root)/library/dsssaolex.tcl
source $ds9(root)/library/dsssaosendparser.tcl
source $ds9(root)/library/dsssaosendlex.tcl
source $ds9(root)/library/dssstsciparser.tcl
source $ds9(root)/library/dssstscilex.tcl
+source $ds9(root)/library/dssstscisendparser.tcl
+source $ds9(root)/library/dssstscisendlex.tcl
source $ds9(root)/library/enviparser.tcl
source $ds9(root)/library/envilex.tcl
source $ds9(root)/library/exportparser.tcl
@@ -296,6 +300,8 @@ source $ds9(root)/library/nrrdparser.tcl
source $ds9(root)/library/nrrdlex.tcl
source $ds9(root)/library/nvssparser.tcl
source $ds9(root)/library/nvsslex.tcl
+source $ds9(root)/library/nvsssendparser.tcl
+source $ds9(root)/library/nvsssendlex.tcl
source $ds9(root)/library/orientparser.tcl
source $ds9(root)/library/orientlex.tcl
source $ds9(root)/library/rotateparser.tcl
@@ -384,8 +390,12 @@ source $ds9(root)/library/viewsendparser.tcl
source $ds9(root)/library/viewsendlex.tcl
source $ds9(root)/library/vlaparser.tcl
source $ds9(root)/library/vlalex.tcl
+source $ds9(root)/library/vlasendparser.tcl
+source $ds9(root)/library/vlasendlex.tcl
source $ds9(root)/library/vlssparser.tcl
source $ds9(root)/library/vlsslex.tcl
+source $ds9(root)/library/vlsssendparser.tcl
+source $ds9(root)/library/vlsssendlex.tcl
source $ds9(root)/library/voparser.tcl
source $ds9(root)/library/volex.tcl
source $ds9(root)/library/wcsparser.tcl
diff --git a/ds9/library/stsci.tcl b/ds9/library/stsci.tcl
index 47ef6a3..c9d4001 100644
--- a/ds9/library/stsci.tcl
+++ b/ds9/library/stsci.tcl
@@ -41,9 +41,6 @@ proc STSCIDialog {} {
set var(rformat) $stsci(rformat)
set var(width) $stsci(width)
set var(height) $stsci(height)
- # not used
- set var(width,pixels) 300
- set var(height,pixels) 300
set var(mode) $stsci(mode)
set var(save) $stsci(save)
set var(survey) $stsci(survey)
@@ -182,5 +179,12 @@ proc ProcessSTSCICmd {varname iname} {
proc ProcessSendSTSCICmd {proc id param {sock {}} {fn {}}} {
STSCIDialog
- IMGSVRProcessSendCmd $proc $id $param dstsci
+
+ global parse
+ set parse(proc) $proc
+ set parse(id) $id
+
+ dssstscisend::YY_FLUSH_BUFFER
+ dssstscisend::yy_scan_string $param
+ dssstscisend::yyparse
}
diff --git a/ds9/library/vla.tcl b/ds9/library/vla.tcl
index 48fab6a..5cd3d48 100644
--- a/ds9/library/vla.tcl
+++ b/ds9/library/vla.tcl
@@ -41,9 +41,6 @@ proc VLADialog {} {
set var(rformat) $vla(rformat)
set var(width) $vla(width)
set var(height) $vla(height)
- # not used
- set var(width,pixels) 300
- set var(height,pixels) 300
set var(mode) $vla(mode)
set var(save) $vla(save)
set var(survey) $vla(survey)
@@ -173,5 +170,12 @@ proc ProcessVLACmd {varname iname} {
proc ProcessSendVLACmd {proc id param {sock {}} {fn {}}} {
VLADialog
- IMGSVRProcessSendCmd $proc $id $param dvla
+
+ global parse
+ set parse(proc) $proc
+ set parse(id) $id
+
+ vlasend::YY_FLUSH_BUFFER
+ vlasend::yy_scan_string $param
+ vlasend::yyparse
}
diff --git a/ds9/library/vlss.tcl b/ds9/library/vlss.tcl
index 8c585a0..93d2e4c 100644
--- a/ds9/library/vlss.tcl
+++ b/ds9/library/vlss.tcl
@@ -40,9 +40,6 @@ proc VLSSDialog {} {
set var(rformat) $vlss(rformat)
set var(width) $vlss(width)
set var(height) $vlss(height)
- # not used
- set var(width,pixels) 300
- set var(height,pixels) 300
set var(mode) $vlss(mode)
set var(save) $vlss(save)
@@ -132,5 +129,12 @@ proc ProcessVLSSCmd {varname iname} {
proc ProcessSendVLSSCmd {proc id param {sock {}} {fn {}}} {
VLSSDialog
- IMGSVRProcessSendCmd $proc $id $param dvlss
+
+ global parse
+ set parse(proc) $proc
+ set parse(id) $id
+
+ vlsssend::YY_FLUSH_BUFFER
+ vlsssend::yy_scan_string $param
+ vlsssend::yyparse
}
diff --git a/ds9/parsers/dssesosendlex.fcl b/ds9/parsers/dssesosendlex.fcl
new file mode 100644
index 0000000..c07f80e
--- /dev/null
+++ b/ds9/parsers/dssesosendlex.fcl
@@ -0,0 +1,13 @@
+#tab dssesosendparser.tab.tcl
+
+%{
+%}
+
+#include defs.fin
+
+%%
+
+#include imgsvr.fin
+#include string.fin
+
+%%
diff --git a/ds9/parsers/dssesosendparser.tac b/ds9/parsers/dssesosendparser.tac
new file mode 100644
index 0000000..5d8d64c
--- /dev/null
+++ b/ds9/parsers/dssesosendparser.tac
@@ -0,0 +1,28 @@
+%{
+%}
+
+#include imgsvr.tin
+#include string.tin
+
+%start dssesosend
+
+%%
+
+dssesosend : {ProcessSendCmdGet deso name}
+ | NAME_ {ProcessSendCmdGet deso name}
+ | SAVE_ {ProcessSendCmdYesNo deso save}
+ | FRAME_ {ProcessSendCmdGet deso mode}
+ | SURVEY_ {ProcessSendCmdGet deso survey}
+ | SIZE_ {ProcessSendCmdGet3 deso width height rformat}
+ | COORD_ {ProcessSendCmdGet3 deso x y skyformat}
+ ;
+
+%%
+
+proc dssesosend::yyerror {msg} {
+ variable yycnt
+ variable yy_current_buffer
+ variable index_
+
+ ParserError $msg $yycnt $yy_current_buffer $index_
+}
diff --git a/ds9/parsers/dsssaosendparser.tac b/ds9/parsers/dsssaosendparser.tac
index 10eb6a6..f023440 100644
--- a/ds9/parsers/dsssaosendparser.tac
+++ b/ds9/parsers/dsssaosendparser.tac
@@ -12,7 +12,6 @@ dsssaosend : {ProcessSendCmdGet dsao name}
| NAME_ {ProcessSendCmdGet dsao name}
| SAVE_ {ProcessSendCmdYesNo dsao save}
| FRAME_ {ProcessSendCmdGet dsao mode}
- | SURVEY_ {ProcessSendCmdGet dsao survey}
| SIZE_ {ProcessSendCmdGet3 dsao width height rformat}
| COORD_ {ProcessSendCmdGet3 dsao x y skyformat}
;
diff --git a/ds9/parsers/dssstscisendlex.fcl b/ds9/parsers/dssstscisendlex.fcl
new file mode 100644
index 0000000..d239e24
--- /dev/null
+++ b/ds9/parsers/dssstscisendlex.fcl
@@ -0,0 +1,13 @@
+#tab dssstscisendparser.tab.tcl
+
+%{
+%}
+
+#include defs.fin
+
+%%
+
+#include imgsvr.fin
+#include string.fin
+
+%%
diff --git a/ds9/parsers/dssstscisendparser.tac b/ds9/parsers/dssstscisendparser.tac
new file mode 100644
index 0000000..831dbb2
--- /dev/null
+++ b/ds9/parsers/dssstscisendparser.tac
@@ -0,0 +1,28 @@
+%{
+%}
+
+#include imgsvr.tin
+#include string.tin
+
+%start dssstscisend
+
+%%
+
+dssstscisend : {ProcessSendCmdGet dstsci name}
+ | NAME_ {ProcessSendCmdGet dstsci name}
+ | SAVE_ {ProcessSendCmdYesNo dstsci save}
+ | FRAME_ {ProcessSendCmdGet dstsci mode}
+ | SURVEY_ {ProcessSendCmdGet dstsci survey}
+ | SIZE_ {ProcessSendCmdGet3 dstsci width height rformat}
+ | COORD_ {ProcessSendCmdGet3 dstsci x y skyformat}
+ ;
+
+%%
+
+proc dssstscisend::yyerror {msg} {
+ variable yycnt
+ variable yy_current_buffer
+ variable index_
+
+ ParserError $msg $yycnt $yy_current_buffer $index_
+}
diff --git a/ds9/parsers/nvsssendlex.fcl b/ds9/parsers/nvsssendlex.fcl
new file mode 100644
index 0000000..e604ab8
--- /dev/null
+++ b/ds9/parsers/nvsssendlex.fcl
@@ -0,0 +1,13 @@
+#tab nvsssendparser.tab.tcl
+
+%{
+%}
+
+#include defs.fin
+
+%%
+
+#include imgsvr.fin
+#include string.fin
+
+%%
diff --git a/ds9/parsers/nvsssendparser.tac b/ds9/parsers/nvsssendparser.tac
new file mode 100644
index 0000000..8a7624d
--- /dev/null
+++ b/ds9/parsers/nvsssendparser.tac
@@ -0,0 +1,27 @@
+%{
+%}
+
+#include imgsvr.tin
+#include string.tin
+
+%start nvsssend
+
+%%
+
+nvsssend : {ProcessSendCmdGet dnvss name}
+ | NAME_ {ProcessSendCmdGet dnvss name}
+ | SAVE_ {ProcessSendCmdYesNo dnvss save}
+ | FRAME_ {ProcessSendCmdGet dnvss mode}
+ | SIZE_ {ProcessSendCmdGet3 dnvss width height rformat}
+ | COORD_ {ProcessSendCmdGet3 dnvss x y skyformat}
+ ;
+
+%%
+
+proc nvsssend::yyerror {msg} {
+ variable yycnt
+ variable yy_current_buffer
+ variable index_
+
+ ParserError $msg $yycnt $yy_current_buffer $index_
+}
diff --git a/ds9/parsers/vlasendlex.fcl b/ds9/parsers/vlasendlex.fcl
new file mode 100644
index 0000000..9bcbabf
--- /dev/null
+++ b/ds9/parsers/vlasendlex.fcl
@@ -0,0 +1,13 @@
+#tab vlasendparser.tab.tcl
+
+%{
+%}
+
+#include defs.fin
+
+%%
+
+#include imgsvr.fin
+#include string.fin
+
+%%
diff --git a/ds9/parsers/vlasendparser.tac b/ds9/parsers/vlasendparser.tac
new file mode 100644
index 0000000..4237c88
--- /dev/null
+++ b/ds9/parsers/vlasendparser.tac
@@ -0,0 +1,28 @@
+%{
+%}
+
+#include imgsvr.tin
+#include string.tin
+
+%start vlasend
+
+%%
+
+vlasend : {ProcessSendCmdGet dvla name}
+ | NAME_ {ProcessSendCmdGet dvla name}
+ | SAVE_ {ProcessSendCmdYesNo dvla save}
+ | FRAME_ {ProcessSendCmdGet dvla mode}
+ | SURVEY_ {ProcessSendCmdGet dvla survey}
+ | SIZE_ {ProcessSendCmdGet3 dvla width height rformat}
+ | COORD_ {ProcessSendCmdGet3 dvla x y skyformat}
+ ;
+
+%%
+
+proc vlasend::yyerror {msg} {
+ variable yycnt
+ variable yy_current_buffer
+ variable index_
+
+ ParserError $msg $yycnt $yy_current_buffer $index_
+}
diff --git a/ds9/parsers/vlsssendlex.fcl b/ds9/parsers/vlsssendlex.fcl
new file mode 100644
index 0000000..7b86e60
--- /dev/null
+++ b/ds9/parsers/vlsssendlex.fcl
@@ -0,0 +1,13 @@
+#tab vlsssendparser.tab.tcl
+
+%{
+%}
+
+#include defs.fin
+
+%%
+
+#include imgsvr.fin
+#include string.fin
+
+%%
diff --git a/ds9/parsers/vlsssendparser.tac b/ds9/parsers/vlsssendparser.tac
new file mode 100644
index 0000000..7be19a3
--- /dev/null
+++ b/ds9/parsers/vlsssendparser.tac
@@ -0,0 +1,27 @@
+%{
+%}
+
+#include imgsvr.tin
+#include string.tin
+
+%start vlsssend
+
+%%
+
+vlsssend : {ProcessSendCmdGet dvlss name}
+ | NAME_ {ProcessSendCmdGet dvlss name}
+ | SAVE_ {ProcessSendCmdYesNo dvlss save}
+ | FRAME_ {ProcessSendCmdGet dvlss mode}
+ | SIZE_ {ProcessSendCmdGet3 dvlss width height rformat}
+ | COORD_ {ProcessSendCmdGet3 dvlss x y skyformat}
+ ;
+
+%%
+
+proc vlsssend::yyerror {msg} {
+ variable yycnt
+ variable yy_current_buffer
+ variable index_
+
+ ParserError $msg $yycnt $yy_current_buffer $index_
+}