Merge branch 'devel'

7 files changed, 19 insertions, 73 deletions

diff --git a/ds9/doc/release/r8.1.html b/ds9/doc/release/r8.1.html
index 2393d19..356fe9d 100644
--- a/ds9/doc/release/r8.1.html
+++ b/ds9/doc/release/r8.1.html
@@ -25,6 +25,7 @@
 <li><tt>12.14.2018 BINNING: bring forward any 3rd column WCS defines for binned 3d cubes.</tt></li>
 <li><tt>12.14.2018 PLOT3D: verify 3D WCS, reset to IMAGE if not available.</tt></li>
 <li><tt>12.19.2018 SAVEIMAGE: is now supported under Windows.</tt></li>
+<li><tt>12.19.2018 MOVIE3D: is now supported under Windows.</tt></li>
 <li><tt>12.27.2018 TCLIIS: update TEA to 3.13.</tt></li>
 <li><tt>12.27.2018 TKSAO: update TEA to 3.13.</tt></li>
 <li><tt>12.29.2018 TKMACOSX: update TEA to 3.13.</tt></li>
@@ -40,7 +41,12 @@
 <li><tt>01.07.2019 TKTABLE: update TEA to 3.13.</tt></li>
 <li><tt>01.08.2019 TKIMG: updated to version 1.4.7</tt></li>
 <li><tt>01.17.2019 TCLZIPFS: now using tclzipfs for unix port.</tt></li>
-<li><tt>01.22.2019 MACOS: fixed image byte order bug introduced with TCL/TK 8.6.9.</tt></li>
+<li><tt>01.22.2019 MACOS: fixed image byte order bug introduced with TCL/TK 8.6.</tt></li>
+<li><tt>01.23.2019 MACOS: fixed rotate and colormap issues with TCL/TK 8.6.</tt></li>
+<li><tt>01.23.2019 MACOS: fixed 3D magnifier issues with TCL/TK 8.6.</tt></li>
+<li><tt>01.24.2019 SAVEIMAGE: is now supported under MacOS Aqua.</tt></li>
+<li><tt>01.24.2019 MOVIE3D: is now supported under MacOS Aqua.</tt></li>
+9.</tt></li>
 <li><tt><b>xx.xx.2019 RELEASE version 8.1b1</b></tt></li>
 </ol>
 </div>
diff --git a/ds9/library/movie.tcl b/ds9/library/movie.tcl
index b1cf975..de63422 100644
--- a/ds9/library/movie.tcl
+++ b/ds9/library/movie.tcl
@@ -29,20 +29,7 @@ proc MovieDef {} {
     set movie(status) 0
     set movie(abort) 0
 
-    set aa [msgcat::mc {An error has occurred while creating the image. Please be sure that the entire image window is visible on the screen.}]
-    set bb [msgcat::mc {An error has occurred while creating the image. Please be sure that the ds9 window is in the upper left corner of the default screen and the entire window is visible.}]
-    switch $tcl_platform(os) {
-	Darwin {
-	    switch [lindex [split $tcl_platform(osVersion) {.}] 0] {
-		10 -
-		11 {set movie(error) $bb}
-		8 -
-		9 -
-		default {set movie(error) $aa}
-	    }
-	}
-	default {set movie(error) $aa}
-    }
+    set movie(error) [msgcat::mc {An error has occurred while creating the image. Please be sure that the ds9 window is in the upper left corner of the default screen and the entire window is visible.}]
 }
 
 proc MovieDialog {} {
@@ -129,15 +116,6 @@ proc Movie {fn} {
 	return
     }
 
-    switch $ds9(wm) {
-	x11 {}
-	aqua -
-	win32 {
-	    Error $saveimage(error)
-	    return
-	}
-    }
-
     # besure we are on top
     raise $ds9(top)
 
diff --git a/ds9/library/saveimage.tcl b/ds9/library/saveimage.tcl
index ba421a2..04cf59c 100644
--- a/ds9/library/saveimage.tcl
+++ b/ds9/library/saveimage.tcl
@@ -10,30 +10,7 @@ proc SaveImageDef {} {
     set saveimage(jpeg,quality) 75
     set saveimage(tiff,compress) none
 
-    set aa [msgcat::mc {An error has occurred while creating the image. Please be sure that the entire image window is visible on the screen.}]
-    set bb [msgcat::mc {An error has occurred while creating the image. Please be sure that the ds9 window is in the upper left corner of the default screen and the entire window is visible.}]
-    set cc [msgcat::mc {This function is not currently supported for this port.}]
-
-    global ds9
-    switch $ds9(wm) {
-	x11 {
-	    global tcl_platform
-	    switch $tcl_platform(os) {
-		Darwin {
-		    switch [lindex [split $tcl_platform(osVersion) {.}] 0] {
-			10 -
-			11 {set saveimage(error) $bb}
-			8 -
-			9 -
-			default {set saveimage(error) $aa}
-		    }
-		}
-		default {set saveimage(error) $aa}
-	    }
-	}
-	aqua {set saveimage(error) $cc}
-	win32 {set saveimage(error) $aa}
-    }
+    set saveimage(error) [msgcat::mc {An error has occurred while creating the image. Please be sure that the ds9 window is in the upper left corner of the default screen and the entire window is visible.}]
 }
 
 proc SaveImageDialog {format} {
@@ -115,15 +92,6 @@ proc SaveImagePhoto {fn format} {
     global ds9
     global saveimage
 
-    switch $ds9(wm) {
-	x11 {}
-	aqua {
-	    Error $saveimage(error)
-	    return
-	}
-	win32 {}
-    }
-
     set rr [catch {image create photo -format window -data $ds9(canvas)} ph]
     if {$rr != 0} {
 	Error $saveimage(error)
diff --git a/tk8.6/macosx/tkMacOSXDraw.c b/tk8.6/macosx/tkMacOSXDraw.c
index 984e2e5..3c2c802 100644
--- a/tk8.6/macosx/tkMacOSXDraw.c
+++ b/tk8.6/macosx/tkMacOSXDraw.c
@@ -192,7 +192,7 @@ TkMacOSXBitmapRepFromDrawableRect(
 	 * display and return NULL.
 	 */
 
-	if (view == [NSView focusView]) {
+	if (view == [NSView focusView] || 1) {
 	    bitmap_rep = [view bitmapImageRepForCachingDisplayInRect: view_rect];
 	    [bitmap_rep retain];
 	    [view cacheDisplayInRect:view_rect toBitmapImageRep:bitmap_rep];
diff --git a/tksao/frame/frame.C b/tksao/frame/frame.C
index 692a0ae..c3f469a 100644
--- a/tksao/frame/frame.C
+++ b/tksao/frame/frame.C
@@ -790,7 +790,10 @@ void Frame::colormapMotionCmd(int id, float b, float c, int i,
   updatePanner();
 }
 
-void Frame::colormapEndCmd() {}
+void Frame::colormapEndCmd()
+{
+  update(BASE);
+}
 #endif
 
 void Frame::getColorbarCmd()
diff --git a/tksao/frame/frame3dbase.C b/tksao/frame/frame3dbase.C
index aa2ae05..90ee455 100644
--- a/tksao/frame/frame3dbase.C
+++ b/tksao/frame/frame3dbase.C
@@ -1217,21 +1217,9 @@ void Frame3dBase::ximageToPixmapMagnifier()
     for (int ii=0; ii<ww; ii++, dest+=bytesPerPixel) {
       Vector vv = Vector(ii,jj)*mm;
 
-      if (vv[0] >= 0 && vv[0] < zz[0] && vv[1] >= 0 && vv[1] < zz[1]) {
-	// I really don't understand this
-#if MAC_OSX_TK
-	char* sptr = src + ((int)vv[1])*srcBytesPerLine + 
-	  ((int)vv[0])*bytesPerPixel;
-
-	*(dest+0) = *(sptr+3);
-	*(dest+1) = *(sptr+0);
-	*(dest+2) = *(sptr+1);
-	*(dest+3) = *(sptr+2);
-#else
+      if (vv[0] >= 0 && vv[0] < zz[0] && vv[1] >= 0 && vv[1] < zz[1])
 	memcpy(dest, src + ((int)vv[1])*srcBytesPerLine + 
 	       ((int)vv[0])*bytesPerPixel, bytesPerPixel);
-#endif
-      }
       else
 	memcpy(dest, bgTrueColor_, bytesPerPixel);
     }
diff --git a/tksao/frame/frcommand.C b/tksao/frame/frcommand.C
index 949dfca..e93a7e8 100644
--- a/tksao/frame/frcommand.C
+++ b/tksao/frame/frcommand.C
@@ -418,7 +418,10 @@ void FrameBase::rotateMotionCmd(double angle)
   update(MATRIX);
 }
 
-void FrameBase::rotateEndCmd() {}
+void FrameBase::rotateEndCmd()
+{
+  update(MATRIX);
+}
 #endif
 
 void FrameBase::saveFitsResampleFileCmd(const char* fn)