From 039e12957d62da70dfa5f191b8a45fc112437fc4 Mon Sep 17 00:00:00 2001
From: William Joye <wjoye@cfa.harvard.edu>
Date: Fri, 3 May 2019 12:09:56 -0400
Subject: REGION: fixed statistics dialog if region off image

---
 ds9/doc/release/r8.1.html |  2 ++
 tksao/frame/frblt.C       | 25 +++++++++++++++++--------
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/ds9/doc/release/r8.1.html b/ds9/doc/release/r8.1.html
index c28b1af..da5a089 100644
--- a/ds9/doc/release/r8.1.html
+++ b/ds9/doc/release/r8.1.html
@@ -76,6 +76,8 @@
 <li><tt>04.25.2019 CUBE: add 'get cube coordsys command'</tt></li>
 <li><tt>05.02.2019 XPA: fix -xpa command issue.</tt></li>
 <li><tt>05.02.2019 CUBE: fix an issue with updating the current slice via the dialog slider.</tt></li>
+<li><tt>05.02.2019 REGION: fixed histogram analysis plot if region off image.</tt></li>
+<li><tt>05.03.2019 REGION: fixed statistics dialog if region off image.</tt></li>
 <li><tt><b>xx.xx.2019 RELEASE version 8.1b1</b></tt></li>
 </ol>
 </div>
diff --git a/tksao/frame/frblt.C b/tksao/frame/frblt.C
index 4f146ed..75a2068 100644
--- a/tksao/frame/frblt.C
+++ b/tksao/frame/frblt.C
@@ -617,9 +617,11 @@ void Base::markerAnalysisStats(Marker* pp, ostream& str, const BBox& bb,
     delete [] marr;
 
   int unit = markerAnalysisStats1(pp,ptr,str,sys,sky);
-  markerAnalysisStats2(ptr,str,sys,0,cnt,sum,unit);
+  if (cnt)
+    markerAnalysisStats2(ptr,str,sys,0,cnt,sum,unit);
   markerAnalysisStats3(str);
-  markerAnalysisStats4(str,0,cnt,sum,sum2,median,min,max);
+  if (cnt)
+    markerAnalysisStats4(str,0,cnt,sum,sum2,median,min,max);
 }
 
 // for annulus regions
@@ -699,12 +701,15 @@ void Base::markerAnalysisStats(Marker* pp, ostream& str,
 
   int unit = markerAnalysisStats1(pp,ptr,str,sys,sky);
   for (int kk=0; kk<num; kk++) 
-    markerAnalysisStats2(ptr,str,sys,kk,cnt[kk],sum[kk],unit);
+    if (cnt[kk])
+      markerAnalysisStats2(ptr,str,sys,kk,cnt[kk],sum[kk],unit);
 
   markerAnalysisStats3(str);
+
   for (int kk=0; kk<num; kk++)
-    markerAnalysisStats4(str,kk,cnt[kk],sum[kk],sum2[kk],
-			 median[kk],min[kk],max[kk]);
+    if (cnt[kk])
+      markerAnalysisStats4(str,kk,cnt[kk],sum[kk],sum2[kk],
+			   median[kk],min[kk],max[kk]);
 }
 
 // for panda regions
@@ -792,15 +797,19 @@ void Base::markerAnalysisStats(Marker* pp, ostream& str,
   }
 
   int unit = markerAnalysisStats1(pp,ptr,str,sys,sky);
+
   for (int kk=0; kk<num; kk++) 
     for (int qq=0; qq<aa; qq++)
-      markerAnalysisStats2(ptr,str,sys,kk*aa+qq,cnt[kk][qq],sum[kk][qq],unit);
+      if (cnt[kk][qq])
+	markerAnalysisStats2(ptr,str,sys,kk*aa+qq,cnt[kk][qq],sum[kk][qq],unit);
 
   markerAnalysisStats3(str);
+
   for (int kk=0; kk<num; kk++)
     for (int qq=0; qq<aa; qq++)
-      markerAnalysisStats4(str,kk*aa+qq,cnt[kk][qq],sum[kk][qq],sum2[kk][qq],
-			   median[kk][qq],min[kk][qq],max[kk][qq]);
+      if (cnt[kk][qq])
+	markerAnalysisStats4(str,kk*aa+qq,cnt[kk][qq],sum[kk][qq],sum2[kk][qq],
+			     median[kk][qq],min[kk][qq],max[kk][qq]);
 }
 
 int Base::markerAnalysisStats1(Marker* pp,FitsImage* ptr, ostream& str, 
-- 
cgit v0.12