Index: trunk/psModules/src/objects/pmSourceContour.c
===================================================================
--- trunk/psModules/src/objects/pmSourceContour.c	(revision 6943)
+++ trunk/psModules/src/objects/pmSourceContour.c	(revision 8246)
@@ -6,6 +6,6 @@
  *  @author EAM, IfA: significant modifications.
  *
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-04-21 21:27:04 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-08-09 02:37:08 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -49,5 +49,5 @@
 {
 
-    psTrace(__func__, 4, "---- %s() begin ----\n", __func__);
+    psTrace("psModules.objects", 4, "---- %s() begin ----\n", __func__);
 
     // We define variables incr and lastColumn so that we can use the same loop
@@ -70,10 +70,10 @@
         float value = image->data.F32[y][subCol];
         if (value <= threshold) {
-            psTrace(__func__, 4, "---- %s() end ----\n", __func__);
+            psTrace("psModules.objects", 4, "---- %s() end ----\n", __func__);
             return (subCol);
         }
         subCol += incr;
     }
-    psTrace(__func__, 4, "---- %s() end ----\n", __func__);
+    psTrace("psModules.objects", 4, "---- %s() end ----\n", __func__);
     return (lastColumn);
 }
@@ -89,5 +89,5 @@
 {
 
-    psTrace(__func__, 4, "---- %s() begin ----\n", __func__);
+    psTrace("psModules.objects", 4, "---- %s() begin ----\n", __func__);
 
     // We define variables incr and lastColumn so that we can use the same loop
@@ -109,5 +109,5 @@
         float value = image->data.F32[y][subCol];
         if (value >= threshold) {
-            psTrace(__func__, 4, "---- %s() end ----\n", __func__);
+            psTrace("psModules.objects", 4, "---- %s() end ----\n", __func__);
             if (subCol == x) {
                 return (subCol);
@@ -117,5 +117,5 @@
         subCol += incr;
     }
-    psTrace(__func__, 4, "---- %s() end ----\n", __func__);
+    psTrace("psModules.objects", 4, "---- %s() end ----\n", __func__);
     return (lastColumn);
 }
@@ -139,5 +139,5 @@
                        psU32 dir)
 {
-    psTrace(__func__, 4, "---- %s() begin ----\n", __func__);
+    psTrace("psModules.objects", 4, "---- %s() begin ----\n", __func__);
     //
     // Convert coords to subImage space.
@@ -149,9 +149,9 @@
     if (!((0 <= subCol) && (subCol < source->pixels->numCols))) {
         psError(PS_ERR_UNKNOWN, true, "Starting column outside subImage range");
-        psTrace(__func__, 4, "---- %s(NAN) end ----\n", __func__);
+        psTrace("psModules.objects", 4, "---- %s(NAN) end ----\n", __func__);
         return(NAN);
     }
     if (!((0 <= subRow) && (subRow < source->pixels->numRows))) {
-        psTrace(__func__, 4, "---- %s(NAN) end ----\n", __func__);
+        psTrace("psModules.objects", 4, "---- %s(NAN) end ----\n", __func__);
         psError(PS_ERR_UNKNOWN, true, "Starting row outside subImage range");
         return(NAN);
@@ -162,5 +162,5 @@
     psF32 oldValue = pmModelEval(source->modelEXT, source->pixels, subCol, subRow);
     if (oldValue == level) {
-        psTrace(__func__, 4, "---- %s() end ----\n", __func__);
+        psTrace("psModules.objects", 4, "---- %s() end ----\n", __func__);
         return(((psF32) (subCol + source->pixels->col0)));
     }
@@ -184,5 +184,5 @@
         psF32 newValue = pmModelEval(source->modelEXT, source->pixels, subCol, subRow);
         if (oldValue == level) {
-            psTrace(__func__, 4, "---- %s() end ----\n", __func__);
+            psTrace("psModules.objects", 4, "---- %s() end ----\n", __func__);
             return((psF32) (subCol + source->pixels->col0));
         }
@@ -190,5 +190,5 @@
         if ((newValue <= level) && (level <= oldValue)) {
             // This is simple linear interpolation.
-            psTrace(__func__, 4, "---- %s() end ----\n", __func__);
+            psTrace("psModules.objects", 4, "---- %s() end ----\n", __func__);
             return( ((psF32) (subCol + source->pixels->col0)) + ((psF32) incr) * ((level - newValue) / (oldValue - newValue)) );
         }
@@ -196,5 +196,5 @@
         if ((oldValue <= level) && (level <= newValue)) {
             // This is simple linear interpolation.
-            psTrace(__func__, 4, "---- %s() end ----\n", __func__);
+            psTrace("psModules.objects", 4, "---- %s() end ----\n", __func__);
             return( ((psF32) (subCol + source->pixels->col0)) + ((psF32) incr) * ((level - oldValue) / (newValue - oldValue)) );
         }
@@ -203,5 +203,5 @@
     }
 
-    psTrace(__func__, 4, "---- %s(NAN) end ----\n", __func__);
+    psTrace("psModules.objects", 4, "---- %s(NAN) end ----\n", __func__);
     return(NAN);
 }
@@ -215,5 +215,5 @@
     int xR, yR, x0, x1, x0s, x1s;
 
-    psTrace(__func__, 3, "---- %s() begin ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() begin ----\n", __func__);
     PS_ASSERT_PTR_NON_NULL(image, false);
 
@@ -327,5 +327,5 @@
     tmpArray->data[0] = (psPtr *) xVec;
     tmpArray->data[1] = (psPtr *) yVec;
-    psTrace(__func__, 3, "---- %s() end ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() end ----\n", __func__);
     return(tmpArray);
 }
@@ -348,5 +348,5 @@
                                psF32 level)
 {
-    psTrace(__func__, 3, "---- %s() begin ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() begin ----\n", __func__);
     PS_ASSERT_PTR_NON_NULL(source, false);
     PS_ASSERT_PTR_NON_NULL(image, false);
@@ -379,5 +379,5 @@
             psFree(xVec);
             psFree(yVec);
-            psTrace(__func__, 3, "---- %s(NULL) end ----\n", __func__);
+            psTrace("psModules.objects", 3, "---- %s(NULL) end ----\n", __func__);
             return(NULL);
             //psLogMsg(__func__, PS_LOG_WARN, "WARNING: Could not find contour edge (NAN)\n");
@@ -392,9 +392,9 @@
             psFree(xVec);
             psFree(yVec);
-            psTrace(__func__, 3, "---- %s(NULL) end ----\n", __func__);
+            psTrace("psModules.objects", 3, "---- %s(NULL) end ----\n", __func__);
             return(NULL);
             //psLogMsg(__func__, PS_LOG_WARN, "WARNING: Could not find contour edge (NAN)\n");
         }
-        psTrace(__func__, 4, "The intercepts are (%.2f, %.2f)\n", leftIntercept, rightIntercept);
+        psTrace("psModules.objects", 4, "The intercepts are (%.2f, %.2f)\n", leftIntercept, rightIntercept);
         xVec->data.F32[row+xVec->n] = ((psF32) source->pixels->col0) + rightIntercept;
 
@@ -417,5 +417,5 @@
             psFree(xVec);
             psFree(yVec);
-            psTrace(__func__, 3, "---- %s(NULL) end ----\n", __func__);
+            psTrace("psModules.objects", 3, "---- %s(NULL) end ----\n", __func__);
             return(NULL);
             //psLogMsg(__func__, PS_LOG_WARN, "WARNING: Could not find contour edge (NAN)\n");
@@ -429,5 +429,5 @@
             psFree(xVec);
             psFree(yVec);
-            psTrace(__func__, 3, "---- %s(NULL) end ----\n", __func__);
+            psTrace("psModules.objects", 3, "---- %s(NULL) end ----\n", __func__);
             return(NULL);
             //psLogMsg(__func__, PS_LOG_WARN, "WARNING: Could not find contour edge (NAN)\n");
@@ -447,5 +447,5 @@
     tmpArray->data[0] = (psPtr *) yVec;
     tmpArray->data[1] = (psPtr *) xVec;
-    psTrace(__func__, 3, "---- %s() end ----\n", __func__);
+    psTrace("psModules.objects", 3, "---- %s() end ----\n", __func__);
     return(tmpArray);
 }