Changeset 27840 for branches/simtest_nebulous_branches/psModules/src/objects/pmFootprint.h

Timestamp:

May 3, 2010, 8:50:52 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simtest_nebulous_branches

Files:

• . (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/objects/pmFootprint.h (modified) (3 diffs)

branches/simtest_nebulous_branches/psModules/src/objects/pmFootprint.h

@@ -13 +13 @@
 #include <pslib.h>
 #include "pmSpan.h"
-
+#include "pmFootprintSpans.h"
 
 typedef struct {
     const int id;                       //!< unique ID
     int npix;                           //!< number of pixels in this pmFootprint
-    psArray *spans;                     //!< the pmSpans
+    int nspans;
+    psArray *spans;                     //!< the allocated pmSpans
     psRegion bbox;                      //!< the pmFootprint's bounding box
     psArray *peaks;                     //!< the peaks lying in this footprint
@@ -26 +27 @@
 
 pmFootprint *pmFootprintAlloc(int nspan, const psImage *img);
+bool pmFootprintInit(pmFootprint *footprint);
 bool pmFootprintTest(const psPtr ptr);
+
+bool pmFootprintAllocEmptySpans (pmFootprint *footprint, int nSpans);
 
 pmFootprint *pmFootprintNormalize(pmFootprint *fp);
@@ -37 +41 @@
                            int x1);    //          columns
 
+pmSpan *pmFootprintSetSpan(pmFootprint *fp,     // the footprint to add to
+                           const int y,         // row to add
+                           int x0,              // range of
+                           int x1);             // columns
+
 psArray *pmFootprintsFind(const psImage *img, const float threshold, const int npixMin);
-pmFootprint *pmFootprintsFindAtPoint(const psImage *img,
-                                    const float threshold,
-                                    const psArray *peaks,
-                                    int row, int col);
+
+bool pmFootprintsFindAtPoint(pmFootprint *fp,
+                             pmFootprintSpans *fpSpans,
+                             const psImage *img,     // image to search
+                             psImage *mask,
+                             const float threshold,   // Threshold
+                             const psArray *peaks, // array of peaks; finding one terminates search for footprint
+                             int row, int col);
+
+// pmFootprint *pmFootprintsFindAtPoint(const psImage *img,
+//                                     const float threshold,
+//                                     const psArray *peaks,
+//                                     int row, int col);
+
+bool pmFootprintSpansBuild(pmFootprint *fp, // the footprint that we're building
+                           pmFootprintSpans *fpSpans,
+                           const psImage *img, // the psImage we're working on
+                           psImage *mask, // the associated masks
+                           const float threshold // Threshold
+    );
 
 psArray *pmFootprintArrayGrow(const psArray *footprints, int r);