Changeset 14723 for branches/eam_branch_20070830/psLib/src/imageops/psImageMap.c

Timestamp:

Sep 1, 2007, 4:03:58 PM (19 years ago)

Author:

magnier

Message:

updates to the image map tools

File:

• branches/eam_branch_20070830/psLib/src/imageops/psImageMap.c (modified) (5 diffs)

branches/eam_branch_20070830/psLib/src/imageops/psImageMap.c

@@ -7 +7 @@
  *  @author Eugene Magnier, IfA
  *
- *  @version $Revision: 1.1.2.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-09-01 00:41:01 $
+ *  @version $Revision: 1.1.2.2 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-09-02 02:03:58 $
  *
  *  Copyright 2007 Institute for Astronomy, University of Hawaii
@@ -22 +22 @@
 #include "psAssert.h"
 #include "psRegion.h"
+#include "psVector.h"
 #include "psImage.h"
+#include "psStats.h"
 #include "psImageBinning.h"
 #include "psImageMap.h"
+#include "psImagePixelInterpolate.h"
 
 static void psImageMapFree(psImageMap *map) {
@@ -57 +60 @@
 
 // generate a psImageMap (or NULL) with the given number of superpixels in X and Y
-psImageMap *psImageMapGenerate (psImageMap *map, psVector *x, psVector *y, psVector *f, float badFrac) {
-
-    int nBad;
-    int nPoor;
+bool psImageMapGenerate (psImageMap *map, psVector *x, psVector *y, psVector *f, float badFrac) {
 
     psImage *mask = psImageAlloc (map->map->numCols, map->map->numRows, PS_TYPE_MASK);
@@ -84 +84 @@
     }
 
-    for (int iy = 0; iy < map->map->numRows; iy++) {
-        for (int ix = 0; ix < map->map->numCols; ix++) {
+    int Nx = map->map->numCols;
+    int Ny = map->map->numRows;
+    for (int iy = 0; iy < Ny; iy++) {
+        for (int ix = 0; ix < Nx; ix++) {
     
             // select the vector
             psVector *vector = vectors->data[ix + iy*Nx];
-            
+
+            // reset the stats to avoid contamination from the previous loop
+            psStatsInit (map->stats);
+
             // get the value
-            if (psVectorStats (stats, vector, NULL, NULL, 0)) {
+            if (psVectorStats (map->stats, vector, NULL, NULL, 0)) {
                 mask->data.U8[iy][ix] = 0;
-                map->map->data.F32[iy][ix] = stats->robustMedian; // XXX select correct stats
+                // XXX ensure only one option is selected, or save both position and width
+                map->map->data.F32[iy][ix] = psStatsGetValue (map->stats, map->stats->options); 
             } else {
                 mask->data.U8[iy][ix] = 1;
@@ -102 +108 @@
     psImage *state = psImagePixelInterpolateState (&map->nBad, &map->nPoor, mask, 0xff);
     map->nGood = mask->numCols * mask->numRows - map->nBad - map->nPoor;
-    if (nBad > badFrac * mask->numCols * mask->numRows) {
-        return false:
+    if (map->nBad > badFrac * mask->numCols * mask->numRows) {
+        return false;
     }