update ds9 parsers

9 files changed, 16 insertions, 43 deletions

diff --git a/ds9/library/imgsvr.tcl b/ds9/library/imgsvr.tcl
index 06290e7..e1da71a 100644
--- a/ds9/library/imgsvr.tcl
+++ b/ds9/library/imgsvr.tcl
@@ -483,33 +483,6 @@ proc IMGSVRProgress {varname token totalsize currentsize} {
     }
 }
 
-proc IMGSVRCmdCoord {varname xx yy skyformat} {
-    upvar #0 $varname var
-    global $varname
-
-    set var(x) $xx
-    set var(y) $yy
-    set var(skyformat) $skyformat
-    set var(skyformat,msg) $skyformat
-    IMGSVRApply $varname 1
-}
-
-proc IMGSVRCmdUpdate {varname} {
-    upvar #0 $varname var
-    global $varname
-
-    IMGSVRUpdate $varname
-    IMGSVRApply $varname 1
-}
-
-proc IMGSVRCmdCrosshair {varname} {
-    upvar #0 $varname var
-    global $varname
-
-    IMGSVRCrosshair $varname
-    IMGSVRApply $varname 1
-}
-
 proc IMGSVRProcessSendCmd {proc id param vvarname} {
     upvar #0 $vvarname vvar
 
diff --git a/ds9/parsers/dssesoparser.tac b/ds9/parsers/dssesoparser.tac
index 810990f..c9e817b 100644
--- a/ds9/parsers/dssesoparser.tac
+++ b/ds9/parsers/dssesoparser.tac
@@ -45,8 +45,8 @@ dsseso : {IMGSVRApply deso 1}
  | COORD_ SEXSTR_ SEXSTR_ sex {ProcessCmdSet4 deso x $2 y $3 skyformat $4 skyformat,msg $4 "IMGSVRApply deso 1"}
  ;
 
-update : FRAME_ {IMGSVRCmdUpdate deso}
- | CROSSHAIR_ {IMGSVRCmdCrosshair deso}
+update : FRAME_ {IMGSVRUpdate deso; IMGSVRApply deso 1}
+ | CROSSHAIR_ {IMGSVRCrosshair deso; IMGSVRApply deso 1}
  ;
 
 survey : DSS1_ {set _ DSS1}
diff --git a/ds9/parsers/dsssaoparser.tac b/ds9/parsers/dsssaoparser.tac
index 52bb769..787a9f2 100644
--- a/ds9/parsers/dsssaoparser.tac
+++ b/ds9/parsers/dsssaoparser.tac
@@ -39,8 +39,8 @@ dsssao : {IMGSVRApply dsao 1}
  | COORD_ SEXSTR_ SEXSTR_ sex {ProcessCmdSet4 dsao x $2 y $3 skyformat $4 skyformat,msg $4 "IMGSVRApply dsao 1"}
  ;
 
-update : FRAME_ {IMGSVRCmdUpdate dsao}
- | CROSSHAIR_ {IMGSVRCmdCrosshair dsao}
+update : FRAME_ {IMGSVRUpdate dsao; IMGSVRApply dsao 1}
+ | CROSSHAIR_ {IMGSVRCrosshair dsao; IMGSVRApply dsao 1}
  ;
 
 %%
diff --git a/ds9/parsers/dssstsciparser.tac b/ds9/parsers/dssstsciparser.tac
index 53b853b..ee09390 100644
--- a/ds9/parsers/dssstsciparser.tac
+++ b/ds9/parsers/dssstsciparser.tac
@@ -50,8 +50,8 @@ dssstsci : {IMGSVRApply dstsci 1}
  | COORD_ SEXSTR_ SEXSTR_ sex {ProcessCmdSet4 dstsci x $2 y $3 skyformat $4 skyformat,msg $4 "IMGSVRApply dstsci 1"}
  ;
 
-update : FRAME_ {IMGSVRCmdUpdate dstsci}
- | CROSSHAIR_ {IMGSVRCmdCrosshair dstsci}
+update : FRAME_ {IMGSVRUpdate dstsci; IMGSVRApply dstsci 1}
+ | CROSSHAIR_ {IMGSVRCrosshair dstsci; IMGSVRApply dstsci 1}
  ;
 
 survey : POSS2RED_ {set _ poss2ukstu_red}
diff --git a/ds9/parsers/nvssparser.tac b/ds9/parsers/nvssparser.tac
index a175acf..f0ef4c7 100644
--- a/ds9/parsers/nvssparser.tac
+++ b/ds9/parsers/nvssparser.tac
@@ -39,8 +39,8 @@ nvss : {IMGSVRApply dnvss 1}
  | COORD_ SEXSTR_ SEXSTR_ sex {ProcessCmdSet4 dnvss x $2 y $3 skyformat $4 skyformat,msg $4 "IMGSVRApply dnvss 1"}
  ;
 
-update : FRAME_ {IMGSVRCmdUpdate dnvss}
- | CROSSHAIR_ {IMGSVRCmdCrosshair dnvss}
+update : FRAME_ {IMGSVRUpdate dnvss; IMGSVRApply dnvss 1}
+ | CROSSHAIR_ {IMGSVRCrosshair dnvss; IMGSVRApply dnvss 1}
  ;
 
 %%
diff --git a/ds9/parsers/skyviewparser.tac b/ds9/parsers/skyviewparser.tac
index fecc723..cd07731 100644
--- a/ds9/parsers/skyviewparser.tac
+++ b/ds9/parsers/skyviewparser.tac
@@ -43,8 +43,8 @@ skyview : {IMGSVRApply dskyview 1}
  | COORD_ SEXSTR_ SEXSTR_ sex {ProcessCmdSet4 dskyview x $2 y $3 skyformat $4 skyformat,msg $4 "IMGSVRApply dskyview 1"}
  ;
 
-update : FRAME_ {IMGSVRCmdUpdate dskyview}
- | CROSSHAIR_ {IMGSVRCmdCrosshair dskyview}
+update : FRAME_ {IMGSVRUpdate dskyview; IMGSVRApply dskyview 1}
+ | CROSSHAIR_ {IMGSVRCrosshair dskyview; IMGSVRApply dskyview 1}
  ;
 
 %%
diff --git a/ds9/parsers/twomassparser.tac b/ds9/parsers/twomassparser.tac
index 5eb6e9d..a65649f 100644
--- a/ds9/parsers/twomassparser.tac
+++ b/ds9/parsers/twomassparser.tac
@@ -40,8 +40,8 @@ twomass : {IMGSVRApply dtwomass 1}
  | COORD_ SEXSTR_ SEXSTR_ sex {ProcessCmdSet4 dtwomass x $2 y $3 skyformat $4 skyformat,msg $4 "IMGSVRApply dtwomass 1"}
  ;
 
-update : FRAME_ {IMGSVRCmdUpdate dtwomass}
- | CROSSHAIR_ {IMGSVRCmdCrosshair dtwomass}
+update : FRAME_ {IMGSVRUpdate dtwomass; IMGSVRApply dtwomass 1}
+ | CROSSHAIR_ {IMGSVRCrosshair dtwomass; IMGSVRApply dtwomass 1}
  ;
 
 survey : 'j' {set _ $1}
diff --git a/ds9/parsers/vlaparser.tac b/ds9/parsers/vlaparser.tac
index 3591f24..15320bb 100644
--- a/ds9/parsers/vlaparser.tac
+++ b/ds9/parsers/vlaparser.tac
@@ -43,8 +43,8 @@ vla : {IMGSVRApply dvla 1}
  | COORD_ SEXSTR_ SEXSTR_ sex {ProcessCmdSet4 dvla x $2 y $3 skyformat $4 skyformat,msg $4 "IMGSVRApply dvla 1"}
  ;
 
-update : FRAME_ {IMGSVRCmdUpdate dvla}
- | CROSSHAIR_ {IMGSVRCmdCrosshair dvla}
+update : FRAME_ {IMGSVRUpdate dvla; IMGSVRApply dvla 1}
+ | CROSSHAIR_ {IMGSVRCrosshair dvla; IMGSVRApply dvla 1}
  ;
 
 survey : STRIPE82_ {set _ stripe82}
diff --git a/ds9/parsers/vlssparser.tac b/ds9/parsers/vlssparser.tac
index 43efc1f..d2de3d6 100644
--- a/ds9/parsers/vlssparser.tac
+++ b/ds9/parsers/vlssparser.tac
@@ -39,8 +39,8 @@ vlss : {IMGSVRApply dvlss 1}
  | COORD_ SEXSTR_ SEXSTR_ sex {ProcessCmdSet4 dvlss x $2 y $3 skyformat $4 skyformat,msg $4 "IMGSVRApply dvlss 1"}
  ;
 
-update : FRAME_ {IMGSVRCmdUpdate dvlss}
- | CROSSHAIR_ {IMGSVRCmdCrosshair dvlss}
+update : FRAME_ {IMGSVRUpdate dvlss; IMGSVRApply dvlss 1}
+ | CROSSHAIR_ {IMGSVRCrosshair dvlss; IMGSVRApply dvlss 1}
  ;
 
 %%