From c0c8abfa6b311ad0632245c235dad5196ce78c31 Mon Sep 17 00:00:00 2001 From: William Joye Date: Mon, 18 Jun 2018 17:07:10 -0400 Subject: add ds9 nres send parser --- ds9/library/nameres.tcl | 29 ++++++++++++++--------------- ds9/library/source.tcl | 2 ++ 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/ds9/library/nameres.tcl b/ds9/library/nameres.tcl index 5c5c2c6..2040539 100644 --- a/ds9/library/nameres.tcl +++ b/ds9/library/nameres.tcl @@ -193,23 +193,22 @@ proc ProcessNRESCmd {varname iname} { } proc ProcessSendNRESCmd {proc id param {sock {}} {fn {}}} { - global nres - global pnres - global dnres + global parse + set parse(proc) $proc + set parse(id) $id NRESDialog - switch -- [string tolower [lindex $param 0]] { - server {$proc $id "$pnres(server)\n"} - format - - skyformat {$proc $id "$dnres(skyformat)\n"} - name - - {} {$proc $id "$dnres(name)\n"} - default { - set dnres(name) [lindex $param 0] - NRESApply dnres 1 - $proc $id "$dnres(x) $dnres(y)\n" - } - } + nressend::YY_FLUSH_BUFFER + nressend::yy_scan_string $param + nressend::yyparse } +proc NRESSendCmd {name} { + global parse + global dnres + + set dnres(name) $name + NRESApply dnres 1 + $parse(proc) $parse(id) "$dnres(x) $dnres(y)\n" +} diff --git a/ds9/library/source.tcl b/ds9/library/source.tcl index 2a16199..ffee7f2 100644 --- a/ds9/library/source.tcl +++ b/ds9/library/source.tcl @@ -314,6 +314,8 @@ source $ds9(root)/library/nanparser.tcl source $ds9(root)/library/nanlex.tcl source $ds9(root)/library/nresparser.tcl source $ds9(root)/library/nreslex.tcl +source $ds9(root)/library/nressendparser.tcl +source $ds9(root)/library/nressendlex.tcl source $ds9(root)/library/nrrdparser.tcl source $ds9(root)/library/nrrdlex.tcl source $ds9(root)/library/nvssparser.tcl -- cgit v0.12