Changeset 2375 for trunk/psLib/src/mathtypes

Timestamp:

Nov 16, 2004, 10:00:21 AM (22 years ago)

Author:

desonia

Message:

Added some psfits and pslist changes. More work needs to be done to make it match the current SDRS.

Location:

trunk/psLib/src/mathtypes

Files:

• psImage.c (modified) (3 diffs)
• psImage.h (modified) (4 diffs)

trunk/psLib/src/mathtypes/psImage.c

@@ -9 +9 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.53 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-11-06 00:44:56 $
+ *  @version $Revision: 1.54 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-11-16 20:00:21 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -26 +26 @@
 #include "psImageErrors.h"
 
-static void imageFree(psImage* image);
+static void imageFree(psImage* image)
+{
+    if (image == NULL) {
+        return;
+    }
+
+    if (image->type.type == PS_TYPE_PTR) {
+        // 2-D array of pointers -- must dereference elements
+        psU32 oldNumRows = image->numRows;
+        psU32 oldNumCols = image->numCols;
+        psPtr* rowPtr;
+
+        for (psU32 row = 0; row < oldNumRows; row++) {
+            rowPtr = image->data.PTR[row];
+            for (psU32 col = 0; col < oldNumCols; col++) {
+                psMemDecrRefCounter(rowPtr[col]);
+            }
+        }
+    }
+
+    if (image->parent != NULL) {
+        psArrayRemove(image->parent->children,image);
+        image->parent = NULL;
+    }
+
+    psImageFreeChildren(image);
+
+    psFree(image->rawDataBuffer);
+    psFree(image->data.V);
+}
 
 psImage* psImageAlloc(psU32 numCols,
@@ -71 +100 @@
 }
 
-static void imageFree(psImage* image)
+psRegion* psRegionAlloc(double x0,
+                        double x1,
+                        double y0,
+                        double y1)
 {
-    if (image == NULL) {
-        return;
-    }
-
-    if (image->type.type == PS_TYPE_PTR) {
-        // 2-D array of pointers -- must dereference elements
-        psU32 oldNumRows = image->numRows;
-        psU32 oldNumCols = image->numCols;
-        psPtr* rowPtr;
-
-        for (psU32 row = 0; row < oldNumRows; row++) {
-            rowPtr = image->data.PTR[row];
-            for (psU32 col = 0; col < oldNumCols; col++) {
-                psMemDecrRefCounter(rowPtr[col]);
-            }
-        }
-    }
-
-    if (image->parent != NULL) {
-        psArrayRemove(image->parent->children,image);
-        image->parent = NULL;
-    }
-
-    psImageFreeChildren(image);
-
-    psFree(image->rawDataBuffer);
-    psFree(image->data.V);
-}
+    psRegion* out = psAlloc(sizeof(psRegion));
+
+    out->x0 = x0;
+    out->y0 = y0;
+    out->x1 = x1;
+    out->y1 = y1;
+
+    return out;
+}
+
+
+
+psRegion* psRegionFromString(char* region)
+{
+    psS32 col0;
+    psS32 col1;
+    psS32 row0;
+    psS32 row1;
+
+    // section should be of the form '[col0:col1,row0:row1]'
+    if (region == NULL) {
+        psError(PS_ERR_BAD_PARAMETER_NULL, true,
+                PS_ERRORTEXT_psImage_SUBSECTION_NULL);
+        return NULL;
+    }
+
+    if (sscanf(region,"[%d:%d,%d:%d]",&col0,&col1,&row0,&row1) < 4) {
+        psError(PS_ERR_BAD_PARAMETER_NULL, true,
+                PS_ERRORTEXT_psImage_SUBSECTION_INVALID,
+                region);
+        return NULL;
+    }
+
+    if (col0 > col1 || row0 > row1) {
+        psError(PS_ERR_BAD_PARAMETER_VALUE, true,
+                PS_ERRORTEXT_psImage_SUBSET_RANGE_MALFORMED,
+                col0,col1,row0,row1);
+        return NULL;
+    }
+
+    return psRegionAlloc(col0,col1,row0,row1);
+}
+
 
 psImage* psImageRecycle(psImage* old,

trunk/psLib/src/mathtypes/psImage.h

@@ -11 +11 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.42 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-27 00:57:31 $
+ *  @version $Revision: 1.43 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-11-16 20:00:21 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -75 +75 @@
 psImage;
 
+/** Basic image region structure.
+ *
+ * Struct for specifying a rectangular area in an image.
+ *
+ */
+typedef struct
+{
+    double x0;                         ///< the first column of the region.
+    double x1;                         ///< the last column of the region.
+    double y0;                         ///< the first row of the region.
+    double y1;                         ///< the last row of the region.
+}
+psRegion;
+
 /** Create an image of the specified size and type.
  *
@@ -84 +98 @@
  */
 psImage* psImageAlloc(
-    psU32 numCols,              ///< Number of rows in image.
-    psU32 numRows,              ///< Number of columns in image.
+    psU32 numCols,                     ///< Number of rows in image.
+    psU32 numRows,                     ///< Number of columns in image.
     const psElemType type              ///< Type of data for image.
+);
+
+/** Create an image of the specified size and type.
+ *
+ * Uses psLib memory allocation functions to create an image struct of the
+ * specified size and type.
+ *
+ * @return psImage* : Pointer to psImage.
+ *
+ */
+psRegion* psRegionAlloc(
+    double x0,                         ///< the first column of the region.
+    double x1,                         ///< the last column of the region.
+    double y0,                         ///< the first row of the region.
+    double y1                          ///< the last row of the region.
+);
+
+psRegion* psRegionFromString(
+    char* region                       ///< image rectangular region in the form '[x0:x1,y0:y1]'
 );
 
@@ -96 +129 @@
 psImage* psImageRecycle(
     psImage* old,                      ///< the psImage to recycle by resizing image buffer
-    psU32 numCols,              ///< the desired number of columns in image
-    psU32 numRows,              ///< the desired number of rows in image
+    psU32 numCols,                     ///< the desired number of columns in image
+    psU32 numRows,                     ///< the desired number of rows in image
     const psElemType type              ///< the desired datatype of the image
 );