update mask

5 files changed, 18 insertions, 22 deletions

diff --git a/ds9/library/command.tcl b/ds9/library/command.tcl
index 525c032..6fd1e53 100644
--- a/ds9/library/command.tcl
+++ b/ds9/library/command.tcl
@@ -555,7 +555,7 @@ proc CommandLineLoadBase {item argvname iname} {
 	    MultiLoad $file(layer)
 	    switch -- $file(mosaic) {
 		iraf {LoadMosaicImageIRAFFile $item $file(layer)}
-		wfpc2 {LoadMosaicImageWFPC2File $item}
+		wfpc2 {LoadMosaicImageWFPC2File $item $file(layer)}
 		default {LoadMosaicImageWCSFile $item $file(layer) $file(mosaic)}
 	    }
 	}
@@ -647,7 +647,7 @@ proc CommandLineLoadRGB {item argvname iname} {
 	mosaicimage {
 	    switch -- $file(mosaic) {
 		iraf {LoadMosaicImageIRAFFile $item {}}
-		wfpc2 {LoadMosaicImageWFPC2File $item}
+		wfpc2 {LoadMosaicImageWFPC2File $item {}}
 		default {LoadMosaicImageWCSFile $item {} $file(mosaic)}
 	    }
 	}
@@ -734,7 +734,7 @@ proc CommandLineLoad3D {item argvname iname} {
 	    MultiLoad
 	    switch -- $file(mosaic) {
 		iraf {LoadMosaicImageIRAFFile $item {}}
-		wfpc2 {LoadMosaicImageWFPC2File $item}
+		wfpc2 {LoadMosaicImageWFPC2File $item {}}
 		default {LoadMosaicImageWCSFile $item {} $file(mosaic)}
 	    }
 	}
diff --git a/ds9/library/mask.tcl b/ds9/library/mask.tcl
index 09ece84..937221d 100644
--- a/ds9/library/mask.tcl
+++ b/ds9/library/mask.tcl
@@ -281,6 +281,8 @@ proc ProcessMaskCmd {varname iname} {
     global parse
     set parse(result) {}
 
+    MaskDialog
+
     mask::YY_FLUSH_BUFFER
     mask::yy_scan_string [lrange $var $i end]
     mask::yyparse
diff --git a/ds9/library/mosaicimagewfpc2.tcl b/ds9/library/mosaicimagewfpc2.tcl
index fcedc97..f98c596 100644
--- a/ds9/library/mosaicimagewfpc2.tcl
+++ b/ds9/library/mosaicimagewfpc2.tcl
@@ -4,22 +4,20 @@
 
 package provide DS9 1.0
 
-proc LoadMosaicImageWFPC2File {fn} {
+proc LoadMosaicImageWFPC2File {fn layer} {
     global loadParam
 
     set loadParam(file,type) fits
     set loadParam(file,mode) {mosaic image wfpc2}
     set loadParam(load,type) mmapincr
     set loadParam(file,name) $fn
-
-    # mask not supported
-    set loadParam(load,layer) {}
+    set loadParam(load,layer) $layer
 
     ConvertFitsFile
     ProcessLoad
 }
 
-proc LoadMosaicImageWFPC2Alloc {path fn} {
+proc LoadMosaicImageWFPC2Alloc {path fn layer} {
     global loadParam
 
     set loadParam(file,type) fits
@@ -27,14 +25,12 @@ proc LoadMosaicImageWFPC2Alloc {path fn} {
     set loadParam(load,type) allocgz
     set loadParam(file,name) $fn
     set loadParam(file,fn) $path
-
-    # mask not supported
-    set loadParam(load,layer) {}
+    set loadParam(load,layer) $layer
 
     ProcessLoad
 }
 
-proc LoadMosaicImageWFPC2Socket {sock fn} {
+proc LoadMosaicImageWFPC2Socket {sock fn layer} {
     global loadParam
 
     set loadParam(file,type) fits
@@ -42,9 +38,7 @@ proc LoadMosaicImageWFPC2Socket {sock fn} {
     set loadParam(load,type) socketgz
     set loadParam(file,name) $fn
     set loadParam(socket,id) $sock
-
-    # mask not supported
-    set loadParam(load,layer) {}
+    set loadParam(load,layer) $layer
 
     return [ProcessLoad 0]
 }
@@ -63,21 +57,21 @@ proc ProcessMosaicImageWFPC2Cmd {varname iname sock fn} {
     incr i [expr $mosaicimagewfpc2::yycnt-1]
 }
 
-proc MosaicImageWFPC2CmdLoad {param} {
+proc MosaicImageWFPC2CmdLoad {param layer} {
     global parse
 
     if {$parse(sock) != {}} {
 	# xpa
-	if {![LoadMosaicImageWFPC2Socket $parse(sock) $param]} {
+	if {![LoadMosaicImageWFPC2Socket $parse(sock) $param $layer]} {
 	    InitError xpa
-	    LoadMosaicImageWFPC2File $param
+	    LoadMosaicImageWFPC2File $param $layer
 	}
     } else {
 	# comm
 	if {$parse(fn) != {}} {
-	    LoadMosaicImageWFPC2Alloc $parse(fn) $param
+	    LoadMosaicImageWFPC2Alloc $parse(fn) $param $layer
 	} else {
-	    LoadMosaicImageWFPC2File $param
+	    LoadMosaicImageWFPC2File $param $layer
 	}
     }
     FinishLoad
diff --git a/ds9/library/open.tcl b/ds9/library/open.tcl
index d7d789b..0a45453 100644
--- a/ds9/library/open.tcl
+++ b/ds9/library/open.tcl
@@ -13,7 +13,7 @@ proc Open {fn format layer mode sys} {
 	fits {LoadFitsFile $fn $layer $mode}
 	mosaicimagewcs {LoadMosaicImageWCSFile $fn $layer $sys}
 	mosaicimageiraf {LoadMosaicImageIRAFFile $fn $layer}
-	mosaicimagewfpc2 {LoadMosaicImageWFPC2File $fn}
+	mosaicimagewfpc2 {LoadMosaicImageWFPC2File $fn $layer}
 	mosaicwcs {LoadMosaicWCSFile $fn $layer $sys}
 	mosaiciraf {LoadMosaicIRAFFile $fn $layer}
 	mecube {LoadMECubeFile $fn}
diff --git a/ds9/parsers/maskparser.tac b/ds9/parsers/maskparser.tac
index 55596cb..6462738 100644
--- a/ds9/parsers/maskparser.tac
+++ b/ds9/parsers/maskparser.tac
@@ -28,7 +28,7 @@ command : mask
  ;
 
 mask : {global parse; set parse(result) mask}
- | OPEN_ {MaskDialog}
+ | OPEN_
  | CLOSE_ {MaskDestroyDialog}
  | CLEAR_ {MaskClear}
  | COLOR_ STRING_ {ProcessCmdSet mask color $2 MaskColor}