Changeset 26894 for trunk/psphot/src/psphotVisual.c

Timestamp:

Feb 10, 2010, 7:36:29 PM (16 years ago)

Author:

eugene

Message:

updates from eam_branches/20091201 (substantially changes to the psphotReadout APIs to support future stack photometry; improvements to the CR masking code)

File:

• trunk/psphot/src/psphotVisual.c (modified) (6 diffs)

trunk/psphot/src/psphotVisual.c

@@ -60 +60 @@
 }
 
+bool psphotVisualEraseOverlays (int channel, char *overlay) {
+
+    int myKapa = psphotKapaChannel (channel);
+    if (!(strcasecmp (overlay, "all"))) {
+      KiiEraseOverlay (myKapa, "red");
+      KiiEraseOverlay (myKapa, "green");
+      KiiEraseOverlay (myKapa, "blue");
+      KiiEraseOverlay (myKapa, "yellow");
+      return true;
+    }
+    KiiEraseOverlay (myKapa, overlay);
+    return true;
+}
+
 bool psphotVisualShowMask (int kapaFD, psImage *inImage, const char *name, int channel) {
 
@@ -171 +185 @@
     if (kapa == -1) return false;
 
-    // psphotVisualShowMask (kapa, readout->mask, "mask", 2);
+    psphotVisualShowMask (kapa, readout->mask, "mask", 2);
     psphotVisualScaleImage (kapa, readout->variance, readout->mask, "variance", 1);
     psphotVisualScaleImage (kapa, readout->image, readout->mask, "image", 0);
@@ -204 +218 @@
 }
 
-bool psphotVisualShowSignificance (psImage *image) {
+bool psphotVisualShowSignificance (psImage *image, float min, float max) {
 
     if (!pmVisualIsVisual()) return true;
@@ -211 +225 @@
     if (kapa == -1) return false;
 
-    psphotVisualRangeImage (kapa, image, "signif", 2, -1.0, 25.0*25.0);
+    psphotVisualRangeImage (kapa, image, "signif", 2, min, max);
 
     pmVisualAskUser(NULL);
@@ -247 +261 @@
         overlay[Noverlay].text = NULL;
         Noverlay ++;
-
-# if (0)
-        overlay[Noverlay].type = KII_OVERLAY_BOX;
-        overlay[Noverlay].x = peak->x;
-        overlay[Noverlay].y = peak->y;
-        overlay[Noverlay].dx = 1.0;
-        overlay[Noverlay].dy = 1.0;
-        overlay[Noverlay].angle = 0.0;
-        overlay[Noverlay].text = NULL;
-        Noverlay ++;
-
-        overlay[Noverlay].type = KII_OVERLAY_CIRCLE;
-        overlay[Noverlay].x = peak->xf;
-        overlay[Noverlay].y = peak->yf;
-        overlay[Noverlay].dx = 2.0;
-        overlay[Noverlay].dy = 2.0;
-        overlay[Noverlay].angle = 0.0;
-        overlay[Noverlay].text = NULL;
-        Noverlay ++;
-# endif
-    }
-
-# if (1)
-    overlay[Noverlay].type = KII_OVERLAY_BOX;
-    overlay[Noverlay].x = 10.0;
-    overlay[Noverlay].y = 10.0;
-    overlay[Noverlay].dx = 1.0;
-    overlay[Noverlay].dy = 1.0;
-    overlay[Noverlay].angle = 0.0;
-    overlay[Noverlay].text = NULL;
-    Noverlay ++;
-# endif
+    }
 
     KiiLoadOverlay (kapa, overlay, Noverlay, "red");
@@ -1905 +1888 @@
     psFree (ySAT);
     psFree (mSAT);
+    psFree (sSAT);
 
     psFree (xEXT);
     psFree (yEXT);
     psFree (mEXT);
+    psFree (sEXT);
 
     psFree (xPSF);
     psFree (yPSF);
     psFree (mPSF);
+    psFree (sPSF);
 
     psFree (xDEF);
     psFree (yDEF);
     psFree (mDEF);
+    psFree (sDEF);
 
     psFree (xCR);
     psFree (yCR);
     psFree (mCR);
+    psFree (sCR);
 
     pmVisualAskUser(NULL);