Changeset 23187 for trunk/psModules/src/objects/pmSourceContour.c
- Timestamp:
- Mar 4, 2009, 5:29:50 PM (17 years ago)
- File:
-
- 1 edited
-
trunk/psModules/src/objects/pmSourceContour.c (modified) (20 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/psModules/src/objects/pmSourceContour.c
r20937 r23187 59 59 { 60 60 61 psTrace("psModules.objects", 4, "---- %s() begin ----\n", __func__);61 psTrace("psModules.objects", 10, "---- %s() begin ----\n", __func__); 62 62 63 63 // We define variables incr and lastColumn so that we can use the same loop … … 80 80 float value = image->data.F32[y][subCol]; 81 81 if (value <= threshold) { 82 psTrace("psModules.objects", 4, "---- %s() end ----\n", __func__);82 psTrace("psModules.objects", 10, "---- %s() end ----\n", __func__); 83 83 return (subCol); 84 84 } 85 85 subCol += incr; 86 86 } 87 psTrace("psModules.objects", 4, "---- %s() end ----\n", __func__);87 psTrace("psModules.objects", 10, "---- %s() end ----\n", __func__); 88 88 return (lastColumn); 89 89 } … … 99 99 { 100 100 101 psTrace("psModules.objects", 4, "---- %s() begin ----\n", __func__);101 psTrace("psModules.objects", 10, "---- %s() begin ----\n", __func__); 102 102 103 103 // We define variables incr and lastColumn so that we can use the same loop … … 119 119 float value = image->data.F32[y][subCol]; 120 120 if (value >= threshold) { 121 psTrace("psModules.objects", 4, "---- %s() end ----\n", __func__);121 psTrace("psModules.objects", 10, "---- %s() end ----\n", __func__); 122 122 if (subCol == x) { 123 123 return (subCol); … … 127 127 subCol += incr; 128 128 } 129 psTrace("psModules.objects", 4, "---- %s() end ----\n", __func__);129 psTrace("psModules.objects", 10, "---- %s() end ----\n", __func__); 130 130 return (lastColumn); 131 131 } … … 149 149 psU32 dir) 150 150 { 151 psTrace("psModules.objects", 4, "---- %s() begin ----\n", __func__);151 psTrace("psModules.objects", 10, "---- %s() begin ----\n", __func__); 152 152 // 153 153 // Convert coords to subImage space. … … 159 159 if (!((0 <= subCol) && (subCol < source->pixels->numCols))) { 160 160 psError(PS_ERR_UNKNOWN, true, "Starting column outside subImage range"); 161 psTrace("psModules.objects", 4, "---- %s(NAN) end ----\n", __func__);161 psTrace("psModules.objects", 10, "---- %s(NAN) end ----\n", __func__); 162 162 return(NAN); 163 163 } 164 164 if (!((0 <= subRow) && (subRow < source->pixels->numRows))) { 165 psTrace("psModules.objects", 4, "---- %s(NAN) end ----\n", __func__);165 psTrace("psModules.objects", 10, "---- %s(NAN) end ----\n", __func__); 166 166 psError(PS_ERR_UNKNOWN, true, "Starting row outside subImage range"); 167 167 return(NAN); … … 172 172 psF32 oldValue = pmModelEval(source->modelEXT, source->pixels, subCol, subRow); 173 173 if (oldValue == level) { 174 psTrace("psModules.objects", 4, "---- %s() end ----\n", __func__);174 psTrace("psModules.objects", 10, "---- %s() end ----\n", __func__); 175 175 return(((psF32) (subCol + source->pixels->col0))); 176 176 } … … 194 194 psF32 newValue = pmModelEval(source->modelEXT, source->pixels, subCol, subRow); 195 195 if (oldValue == level) { 196 psTrace("psModules.objects", 4, "---- %s() end ----\n", __func__);196 psTrace("psModules.objects", 10, "---- %s() end ----\n", __func__); 197 197 return((psF32) (subCol + source->pixels->col0)); 198 198 } … … 200 200 if ((newValue <= level) && (level <= oldValue)) { 201 201 // This is simple linear interpolation. 202 psTrace("psModules.objects", 4, "---- %s() end ----\n", __func__);202 psTrace("psModules.objects", 10, "---- %s() end ----\n", __func__); 203 203 return( ((psF32) (subCol + source->pixels->col0)) + ((psF32) incr) * ((level - newValue) / (oldValue - newValue)) ); 204 204 } … … 206 206 if ((oldValue <= level) && (level <= newValue)) { 207 207 // This is simple linear interpolation. 208 psTrace("psModules.objects", 4, "---- %s() end ----\n", __func__);208 psTrace("psModules.objects", 10, "---- %s() end ----\n", __func__); 209 209 return( ((psF32) (subCol + source->pixels->col0)) + ((psF32) incr) * ((level - oldValue) / (newValue - oldValue)) ); 210 210 } … … 213 213 } 214 214 215 psTrace("psModules.objects", 4, "---- %s(NAN) end ----\n", __func__);215 psTrace("psModules.objects", 10, "---- %s(NAN) end ----\n", __func__); 216 216 return(NAN); 217 217 } … … 222 222 psArray *pmSourceContour (psImage *image, int xc, int yc, float threshold) 223 223 { 224 psTrace("psModules.objects", 3, "---- %s() begin ----\n", __func__);224 psTrace("psModules.objects", 10, "---- %s() begin ----\n", __func__); 225 225 PS_ASSERT_PTR_NON_NULL(image, NULL); 226 226 … … 339 339 tmpArray->data[0] = (psPtr *) xVec; 340 340 tmpArray->data[1] = (psPtr *) yVec; 341 psTrace("psModules.objects", 3, "---- %s() end ----\n", __func__);341 psTrace("psModules.objects", 10, "---- %s() end ----\n", __func__); 342 342 return(tmpArray); 343 343 } … … 360 360 psF32 level) 361 361 { 362 psTrace("psModules.objects", 3, "---- %s() begin ----\n", __func__);362 psTrace("psModules.objects", 10, "---- %s() begin ----\n", __func__); 363 363 PS_ASSERT_PTR_NON_NULL(source, false); 364 364 PS_ASSERT_PTR_NON_NULL(image, false); … … 390 390 psFree(xVec); 391 391 psFree(yVec); 392 psTrace("psModules.objects", 3, "---- %s(NULL) end ----\n", __func__);392 psTrace("psModules.objects", 10, "---- %s(NULL) end ----\n", __func__); 393 393 return(NULL); 394 394 //psLogMsg(__func__, PS_LOG_WARN, "WARNING: Could not find contour edge (NAN)\n"); … … 403 403 psFree(xVec); 404 404 psFree(yVec); 405 psTrace("psModules.objects", 3, "---- %s(NULL) end ----\n", __func__);405 psTrace("psModules.objects", 10, "---- %s(NULL) end ----\n", __func__); 406 406 return(NULL); 407 407 //psLogMsg(__func__, PS_LOG_WARN, "WARNING: Could not find contour edge (NAN)\n"); … … 428 428 psFree(xVec); 429 429 psFree(yVec); 430 psTrace("psModules.objects", 3, "---- %s(NULL) end ----\n", __func__);430 psTrace("psModules.objects", 10, "---- %s(NULL) end ----\n", __func__); 431 431 return(NULL); 432 432 //psLogMsg(__func__, PS_LOG_WARN, "WARNING: Could not find contour edge (NAN)\n"); … … 440 440 psFree(xVec); 441 441 psFree(yVec); 442 psTrace("psModules.objects", 3, "---- %s(NULL) end ----\n", __func__);442 psTrace("psModules.objects", 10, "---- %s(NULL) end ----\n", __func__); 443 443 return(NULL); 444 444 //psLogMsg(__func__, PS_LOG_WARN, "WARNING: Could not find contour edge (NAN)\n"); … … 457 457 tmpArray->data[0] = (psPtr *) yVec; 458 458 tmpArray->data[1] = (psPtr *) xVec; 459 psTrace("psModules.objects", 3, "---- %s() end ----\n", __func__);459 psTrace("psModules.objects", 10, "---- %s() end ----\n", __func__); 460 460 return(tmpArray); 461 461 }
Note:
See TracChangeset
for help on using the changeset viewer.
