Changeset 4815 for trunk/psLib/src/mathtypes

Timestamp:

Aug 18, 2005, 11:44:40 AM (21 years ago)

Author:

drobbin

Message:

folded in code from bug 481. Tests still to be written.

Location:

trunk/psLib/src/mathtypes

Files:

• psImage.c (modified) (2 diffs)
• psImage.h (modified) (5 diffs)

trunk/psLib/src/mathtypes/psImage.c

@@ -9 +9 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.74 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-07-12 19:35:15 $
+ *  @version $Revision: 1.75 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-08-18 21:44:40 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -147 +147 @@
     return psStringCopy(tmpText);
 }
+
+
+// set actual region based on image parameters:
+// compensate for negative upper limits
+// XXX this is inconsistent: the coordindates should always be in the parent
+//     frame, which means the negative values should subtract from Nx,Ny of
+//     the parent, not the child.  but, we don't carry the dimensions of the
+//     parent in the psImage container.  for now, us the child Nx,Ny
+// force range to be on this subimage
+// XXX EAM : this needs to be changes to use psRegion rather than psRegion*
+psRegion psRegionForImage(psImage *image,
+                          psRegion *in)
+{
+
+    // x0,y0, x1,y1 are in *parent* units
+    //    PS_ASSERT_PTR_NON_NULL(in, NULL);
+    if( in == NULL ) {
+        psError(PS_ERR_BAD_PARAMETER_NULL, true, "Unallowable operation.  psRegion *in is NULL.");
+        return *in;
+    }
+    /*    if (out == NULL) {
+    //    out = psRegionAlloc(in->x0, in->x1, in->y0, in->y1);
+        *out = psRegionSet(in->x0, in->x1, in->y0, in->y1);
+        } else {
+        *out = *in;
+        }
+    */    // XXX these are probably wrong (see above)
+    if (in->x1 <= 0) {
+        in->x1 = image->col0 + image->numCols + in->x1;
+    }
+    if (in->y1 <= 0) {
+        in->y1 = image->row0 + image->numRows + in->y1;
+    }
+
+    // force the lower-limits to be on the child
+    in->x0 = PS_MAX(image->col0, in->x0);
+    in->y0 = PS_MAX(image->row0, in->y0);
+
+    // force the upper-limits to be on the child
+    in->x1 = PS_MIN(image->col0 + image->numCols, in->x1);
+    in->y1 = PS_MIN(image->row0 + image->numRows, in->y1);
+    return (*in);
+}
+
+// define a square region centered on the given coordinate
+psRegion psRegionForSquare(float x,
+                           float y,
+                           float radius)
+{
+    psRegion region;
+    region = psRegionSet (x - radius, x + radius + 1,
+                          y - radius, y + radius + 1);
+    return (region);
+}
+
+bool psImageInit (psImage *image,...)
+{
+
+    va_list argp;
+    psU8  vU8;
+    psF32 vF32;
+    psF64 vF64;
+
+    if (image == NULL)
+        return (false);
+
+    va_start (argp, image);
+
+    switch (image->type.type) {
+    case PS_TYPE_U8:
+        vU8 = va_arg (argp, psU32);
+
+        for (int iy = 0; iy < image->numRows; iy++) {
+            for (int ix = 0; ix < image->numCols; ix++) {
+                image->data.U8[iy][ix] = vU8;
+            }
+        }
+        break;
+
+    case PS_TYPE_F32:
+        vF32 = va_arg (argp, psF64);
+
+        for (int iy = 0; iy < image->numRows; iy++) {
+            for (int ix = 0; ix < image->numCols; ix++) {
+                image->data.F32[iy][ix] = vF32;
+            }
+        }
+        return (true);
+
+    case PS_TYPE_F64:
+        vF64 = va_arg (argp, psF64);
+
+        for (int iy = 0; iy < image->numRows; iy++) {
+            for (int ix = 0; ix < image->numCols; ix++) {
+                image->data.F64[iy][ix] = vF64;
+            }
+        }
+        return (true);
+
+    default:
+        psError (PS_ERR_BAD_PARAMETER_TYPE, true, "datatype %d not defined in psImageInit\n", image->type);
+        return (false);
+    }
+    return (false);
+}
+
 
 psImage* psImageRecycle(psImage* old,

trunk/psLib/src/mathtypes/psImage.h

@@ -11 +11 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.61 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-07-21 02:39:57 $
+ *  @version $Revision: 1.62 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-08-18 21:44:40 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -23 +23 @@
 #include "psType.h"
 #include "psArray.h"
+#include "psConstants.h"
 
 /// @addtogroup Image
@@ -112 +113 @@
 /** Create a psRegion with the specified attributes.
  *
- * @return psRegion : a cooresponding psRegion.
+ *  @return psRegion : a cooresponding psRegion.
  */
 psRegion psRegionSet(
@@ -141 +142 @@
 );
 
+/** Sets an actual region based on image parameters.
+ *
+ *  An image region defined with negative upper limits may be rationalized for the bounds of a
+ *  specific image with psRegionForImage.  The output of this function is a region with negative
+ *  upper limits replaced by their corrected value appropriate to the given image.  In addition,
+ *  the lower and upper limits are foced to lie within the bounds of the image.  If the lower-
+ *  limit coordinates are lewss than the lower bound of the image, they are limited to the lower
+ *  bound of the image.  Conversely, if the upper-limit coordinates are greater than the upper
+ *  bound of the image, they are truncated to define only valid pixels.  If the lower-limit
+ *  coordinates are greater than the upper bounds of the image, or the upper-limit coordinates
+ *  are less than the lower bounds of the image, the coordinates should saturate on those limits.
+ *
+ *  @return psRegion:       A region with negative upper limits replaced by the corrected
+ */
+psRegion psRegionForImage(
+    psImage *image,                    ///< the image for which the region is to be set
+    psRegion *in                       ///< the image region limits
+);
+
+/** Defines a region corresponding to the square with center at coordinate x,y
+ *  and with coderadius.  The width of the square is 2radius + 1.
+ *
+ *  @return psRegion:       the newly defined psRegion.
+ */
+psRegion psRegionForSquare(
+    float x,                           ///< x coordinate at square-center
+    float y,                           ///< y coordinate at square-center
+    float radius                       ///< radius of square
+);
+
+/** Initializes the image with the given value.
+ *
+ *  The input data is cast to match the image datatype.
+ *
+ *  @return bool:       True on success, otherwise false.
+ */
+bool psImageInit(
+    psImage *image,                    ///< the image to be initialized
+    ...                                ///< Variable argument list for initialization
+);
+
 /** Resize a given image to the given size/type.
  *
  *  @return psImage* Resized psImage.
- *
  */
 psImage* psImageRecycle(
@@ -166 +207 @@
  *
  *  @return int      Number of children freed.
- *
  */
 int psImageFreeChildren(