From 2887fd30571298c2c34d815675339ad57bff902a Mon Sep 17 00:00:00 2001 From: William Joye Date: Thu, 31 May 2018 16:15:16 -0400 Subject: update ds9 parsers --- ds9/library/nameres.tcl | 7 ---- ds9/library/plotprocess.tcl | 24 ------------ ds9/library/sia.tcl | 96 --------------------------------------------- ds9/parsers/nresparser.tac | 2 +- ds9/parsers/plotparser.tac | 14 +++---- ds9/parsers/siaparser.tac | 4 +- 6 files changed, 10 insertions(+), 137 deletions(-) diff --git a/ds9/library/nameres.tcl b/ds9/library/nameres.tcl index 9539994..63fc3c8 100644 --- a/ds9/library/nameres.tcl +++ b/ds9/library/nameres.tcl @@ -195,13 +195,6 @@ proc ProcessNRESCmd {varname iname} { incr i [expr $nres::yycnt-1] } -proc NRESCmdSet {which value} { - global cvarname - upvar #0 $cvarname cvar - - set cvar($which) $value -} - proc NRESCmdName {value} { global cvarname upvar #0 $cvarname cvar diff --git a/ds9/library/plotprocess.tcl b/ds9/library/plotprocess.tcl index fc7b171..6a6557a 100644 --- a/ds9/library/plotprocess.tcl +++ b/ds9/library/plotprocess.tcl @@ -248,22 +248,6 @@ proc PlotCmdSaveConfig {fn} { } } -proc PlotCmdSet {which value {cmd {}}} { - global cvarname - upvar #0 $cvarname cvar - - set cvar($which) $value - if {$cmd != {}} { - eval $cmd $cvarname - } -} - -proc PlotCmdPrint {} { - global cvarname - - PlotPostScript $cvarname -} - proc PlotCmdUpdateGraph {which value} { global cvarname upvar #0 $cvarname cvar @@ -302,14 +286,6 @@ proc PlotCmdFontStyle {which value} { $cvar(proc,updategraph) $cvarname } -proc PlotCmdSelect {value} { - global cvarname - upvar #0 $cvarname cvar - - set cvar(data,current) $value - PlotCurrentData $cvarname -} - # File Menu proc ProcessPlotPrint {varname xarname iname} { upvar #0 $varname var diff --git a/ds9/library/sia.tcl b/ds9/library/sia.tcl index 5f0c8de..bad13cc 100644 --- a/ds9/library/sia.tcl +++ b/ds9/library/sia.tcl @@ -377,95 +377,6 @@ proc ProcessSIACmd {varname iname} { incr i [expr $sia::yycnt-1] } -proc ProcessSIA {varname iname cvarname} { - upvar 2 $varname var - upvar 2 $iname i - - global isia - global psia - global current - - # we should have a sia now - global $cvarname - upvar #0 $cvarname cvar - - if {![info exists cvar(top)]} { - Error "[msgcat::mc {Unable to find SIAP window}] $cvarname" - return - } - if {![winfo exists $cvar(top)]} { - Error "[msgcat:: mc {Unable to find SIAP window}] $cvarname" - return - } - - # now, process it - set item [string tolower [lindex $var $i]] - switch -- $item { - cancel {ARCancel $cvarname} - clear {SIAOff $cvarname} - close {SIADestroy $cvarname} - coordinate { - incr i - set cvar(x) [lindex $var $i] - incr i - set cvar(y) [lindex $var $i] - incr i - set cvar(sky) [lindex $var $i] - } - crosshair {IMGSVRCrosshair $cvarname} - export - - save { - incr i - set writer VOTWrite - switch -- [lindex $var $i] { - xml - - vot {incr i; set writer VOTWrite} - sb - - starbase {incr i; set writer starbase_write} - csv - - tsv {incr i; set writer TSVWrite} - } - - set fn [lindex $var $i] - SIASaveFn $cvarname $fn $writer - FileLast siafbox $fn - } - name { - incr i - set cvar(name) [lindex $var $i] - } - print {CATPrint $cvarname} - retrieve - - retreive {SIAApply $cvarname 1} - size { - incr i - set cvar(width) [lindex $var $i] - incr i - set cvar(height) [lindex $var $i] - incr i - set cvar(rformat) [lindex $var $i] - set cvar(rformat,msg) $cvar(rformat) - } - sky { - incr i - set cvar(sky) [lindex $var $i] - CoordMenuButtonCmd $cvarname system sky \ - [list SIAWCSMenuUpdate $cvarname] - } - skyformat { - incr i - set cvar(skyformat) [lindex $var $i] - } - system { - incr i - set cvar(system) [lindex $var $i] - CoordMenuButtonCmd $cvarname system sky \ - [list SIAWCSMenuUpdate $cvarname] - } - update {IMGSVRUpdate $cvarname} - } -} - proc SIACmdCheck {} { global cvarname upvar #0 $cvarname cvar @@ -503,13 +414,6 @@ proc SIACmdRef {ref} { } } -proc SIACmdSet {which value} { - global cvarname - upvar #0 $cvarname cvar - - set cvar($which) $value -} - proc SIACmdCoord {xx yy sky} { global cvarname upvar #0 $cvarname cvar diff --git a/ds9/parsers/nresparser.tac b/ds9/parsers/nresparser.tac index 390ab52..ecc42dd 100644 --- a/ds9/parsers/nresparser.tac +++ b/ds9/parsers/nresparser.tac @@ -36,7 +36,7 @@ nres : OPEN_ | SERVER_ server {global pnres; set pnres(server) $2} | PAN_ {global cvarname; NRESPan $cvarname} | CROSSHAIR_ {global cvarname; NRESCrosshair $cvarname} - | SKYFORMAT_ skyformat {NRESCmdSet skyformat $2; NRESCmdSet skyformat,msg $2} + | SKYFORMAT_ skyformat {ProcessCmdCVAR skyformat $2; ProcessCmdCVAR skyformat,msg $2} | NAME_ STRING_ {NRESCmdName $2} | STRING_ {NRESCmdName $1} ; diff --git a/ds9/parsers/plotparser.tac b/ds9/parsers/plotparser.tac index d601f72..fd007fb 100644 --- a/ds9/parsers/plotparser.tac +++ b/ds9/parsers/plotparser.tac @@ -221,10 +221,10 @@ plotCmd : LOAD_ load | DUPLICATE_ duplicate # backward compatibility | DUP_ duplicate - | STATS_ yesno {PlotCmdSet stats $2 PlotStats} + | STATS_ yesno {ProcessCmdCVAR stats $2 PlotStats} # backward compatibility - | STATISTICS_ yesno {PlotCmdSet stats $2 PlotStats} - | LIST_ yesno {PlotCmdSet list $2 PlotList} + | STATISTICS_ yesno {ProcessCmdCVAR stats $2 PlotStats} + | LIST_ yesno {ProcessCmdCVAR list $2 PlotList} | LOADCONFIG_ STRING_ {PlotCmdLoadConfig $2} | SAVECONFIG_ STRING_ {PlotCmdSaveConfig $2} | PAGESETUP_ pagesetup @@ -233,7 +233,7 @@ plotCmd : LOAD_ load | PRINT_ print | CLOSE_ {global cvarname; PlotDestroy $cvarname} - | MODE_ mode {PlotCmdSet mode $2 PlotChangeMode} + | MODE_ mode {ProcessCmdCVAR mode $2 PlotChangeMode} | AXIS_ axis | LEGEND_ legend @@ -255,9 +255,9 @@ plotCmd : LOAD_ load | WIDTH_ INT_ {PlotCmdUpdateElement width $2} | DASH_ yesno {PlotCmdUpdateElement dash $2} - | SELECT_ INT_ {PlotCmdSelect $2} + | SELECT_ INT_ {ProcessCmdCVAR data,current $2 PlotCurrentData} # backward compatibility - | DATASET_ INT_ {PlotCmdSelect $2} + | DATASET_ INT_ {ProcessCmdCVAR data,current $2 PlotCurrentData} # backward compatibility | GRAPH_ oldGraph @@ -290,7 +290,7 @@ pageSize : LETTER_ {set _ letter} | A4_ {set _ a4} ; -print : {PlotCmdPrint} +print : {global cvarname; PlotPostScript $cvarname} | DESTINATION_ printDest {global ps; set ps(dest) $2} | COMMAND_ STRING_ {global ps; set ps(cmd) $2} | FILENAME_ STRING_ {global ps; set ps(filename) $2} diff --git a/ds9/parsers/siaparser.tac b/ds9/parsers/siaparser.tac index 4f117a4..ac3274a 100644 --- a/ds9/parsers/siaparser.tac +++ b/ds9/parsers/siaparser.tac @@ -61,12 +61,12 @@ siaCmd : CANCEL_ {global cvarname; ARCancel $cvarname} | CROSSHAIR_ {global cvarname; IMGSVRCrosshair $cvarname} | EXPORT_ writer STRING_ {SIACmdSave $3 $2} | SAVE_ STRING_ {SIACmdSave $2 VOTWrite} - | NAME_ STRING_ {SIACmdSet name $2} + | NAME_ STRING_ {ProcessCmdCVAR name $2} | PRINT_ {global cvarname; CATPrint $cvarname} | RETRIEVE_ {global cvarname; SIAApply $cvarname 1} | SIZE_ numeric numeric rformat {SIACmdSize $2 $3 $4} | SKY_ skyframe {SIACmdSkyframe $2} - | SKYFORMAT_ skyformat {SIACmdSet skyformat $2} + | SKYFORMAT_ skyformat {ProcessCmdCVAR skyformat $2} | SYSTEM_ wcssys {SIACmdSystem $2} | UPDATE_ {global cvarname; IMGSVRUpdate $cvarname} ; -- cgit v0.12