From f46f5e4aac83baa513c957a989ba539363632cd8 Mon Sep 17 00:00:00 2001
From: William Joye <wjoye@cfa.harvard.edu>
Date: Wed, 24 Apr 2019 15:42:03 -0400
Subject: tweak mask GUI

---
 ds9/doc/release/r8.1.html |  1 +
 ds9/library/mask.tcl      | 12 ++++++------
 tksao/frame/frame.C       |  4 +++-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/ds9/doc/release/r8.1.html b/ds9/doc/release/r8.1.html
index 087bb13..e0539c6 100644
--- a/ds9/doc/release/r8.1.html
+++ b/ds9/doc/release/r8.1.html
@@ -75,6 +75,7 @@
 <li><tt>04.17.2019 MACOS: fix issue with analysis filedialog macro and MacOS Aqua.</tt></li>
 <li><tt>04.22.2019 TCL/TK: downgrade to version 8.6.8.</tt></li>
 <li><tt>04.22.2019 GUI: rotate image and change colorbar now uses full render algorithm.</tt></li>
+<li><tt>04.23.2019 MAST: default systems is now WCS (similar to RGB).</tt></li>
 <li><tt><b>xx.xx.2019 RELEASE version 8.1b1</b></tt></li>
 </ol>
 </div>
diff --git a/ds9/library/mask.tcl b/ds9/library/mask.tcl
index 3015a99..07c267a 100644
--- a/ds9/library/mask.tcl
+++ b/ds9/library/mask.tcl
@@ -97,11 +97,12 @@ proc MaskDialog {} {
 
     $mb add cascade -label [msgcat::mc {File}] -menu $mb.file
     $mb add cascade -label [msgcat::mc {Edit}] -menu $mb.edit
+    $mb add cascade -label [msgcat::mc {Align}] -menu $mb.align
 
     menu $mb.file
-    $mb.file add command -label "[msgcat::mc {Open}]..." \
+    $mb.file add command -label "[msgcat::mc {Load}]..." \
 	-command [list OpenDialog fits mask]
-    $mb.file add cascade -label [msgcat::mc {Open as}] \
+    $mb.file add cascade -label [msgcat::mc {Load as}] \
 	-menu $mb.file.open
     $mb.file add separator
     $mb.file add cascade -label [msgcat::mc {Import}] \
@@ -132,6 +133,8 @@ proc MaskDialog {} {
 
     EditMenu $mb imask
 
+    CoordMenu $mb.align mask system 1 {} {} MaskSystem
+
     # Param
     set f [ttk::frame $w.param]
 
@@ -237,9 +240,6 @@ proc MaskParamsDialog {} {
     # Param
     set f [ttk::frame $w.param]
 
-    ttk::label $f.coordtitle -text [msgcat::mc {Coordinate System}]
-    CoordMenuButton $f.coordbutton mask system 1 {} {} {}
-
     ttk::label $f.colortitle -text [msgcat::mc {Color}]
     ColorMenuButton $f.colorbutton ed color {}
 
@@ -262,7 +262,6 @@ proc MaskParamsDialog {} {
     ttk::entry $f.low -textvariable ed(low) -width 13
     ttk::entry $f.high -textvariable ed(high) -width 13
 
-    grid $f.coordtitle $f.coordbutton -padx 2 -pady 2 -sticky w
     grid $f.colortitle $f.colorbutton -padx 2 -pady 2 -sticky w
     grid $f.marktitle $f.markbutton -padx 2 -pady 2 -sticky w
     grid $f.rangetitle $f.low $f.high -padx 2 -pady 2 -sticky w
@@ -301,6 +300,7 @@ proc MaskBackup {ch which} {
     puts $ch "$which mask color [$which get mask color]"
     puts $ch "$which mask mark [$which get mask mark]"
     puts $ch "$which mask range [$which get mask range]"
+    puts $ch "$which mask system [$which get mask system]"
     puts $ch "$which mask transparency [$which get mask transparency]"
 }
 
diff --git a/tksao/frame/frame.C b/tksao/frame/frame.C
index 8e6402c..55df988 100644
--- a/tksao/frame/frame.C
+++ b/tksao/frame/frame.C
@@ -37,7 +37,7 @@ Frame::Frame(Tcl_Interp* i, Tk_Canvas c, Tk_Item* item)
   maskMark = FitsMask::NONZERO;
   maskLow = 0;
   maskHigh = 0;
-  maskSystem = Coord::PHYSICAL;
+  maskSystem = Coord::WCS;
 }
 
 Frame::~Frame()
@@ -527,6 +527,8 @@ void Frame::maskColorCmd(const char* color)
 void Frame::maskSystemCmd(Coord::CoordSystem sys)
 {
   maskSystem = sys;
+  updateMaskMatrices();
+  update(MATRIX);
 }
 
 void Frame::maskTransparencyCmd(float tt)
-- 
cgit v0.12