From: Callum Date: Sun, 13 Oct 2013 13:22:22 +0000 (+0800) Subject: Finished test function X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=63f02bf9619cf03ba20ffb8909a4e7dfb4dc353e;p=matches%2FMCTX3420.git Finished test function --- diff --git a/server/dilatometer.c b/server/dilatometer.c index 69f263a..a22fd64 100644 --- a/server/dilatometer.c +++ b/server/dilatometer.c @@ -1,6 +1,6 @@ /** * @file dilatometer.c - * @brief Implementation of dilatometer related functions + * @purpose Implementation of dilatometer related functions */ #include "cv.h" @@ -8,6 +8,9 @@ #include "dilatometer.h" #include +// test positions +static double test_left, test_right; + /** Buffer for storing image data. Stored as a **/ static CvMat * g_data = NULL; @@ -16,34 +19,55 @@ static CvMat * g_data = NULL; static CvCapture * g_capture = NULL; /** - * Create a test image + * Create a test image using left as left edge and right as right edge positions */ void Dilatometer_TestImage() { CvMat *g_dataRGB; - g_dataRGB = cvCreateMat(480, 640, CV_8UC3); //32 - - //Make a rectangle from col=300 to 500, row=150 to 350 - /*for (int x = 100; x < 500; ++x) + g_dataRGB = cvCreateMat(480, 640, CV_8UC3); + //Make sure left and right positions are sane + if( test_left < 0) + test_left = 0; + if( test_right > 639) + test_right = 639; + if( test_left > test_right) { - CvScalar s; - s.val[0] = 150; s.val[1] = 233; s.val[2] = 244; - cvSet2D(g_dataRGB,150,x,s); - cvSet2D(g_dataRGB,350,x,s); - }*/ - for (int y = 0; y < 480; ++y) + int tmp = test_right; + test_right = test_left; + test_left = tmp; + } + + for( int x = 0; x < 640; ++x) { - CvScalar s; - s.val[0] = 200; s.val[1] = 233; s.val[2] = 244; - cvSet2D(g_dataRGB,y,100,s); - cvSet2D(g_dataRGB,y,500,s); + for (int y = 0; y < 480; ++y) + { + CvScalar s; + for( int i = 0; i < 3; ++i) + { + s.val[i] = 220 + (rand() % 1000) * 1e-2 - (rand() % 1000) * 1e-2; + // Produce an exponential decay around left edge + if( x < test_left) + s.val[i] *= exp( (x - test_left) / 25); + else if( x < 320) + s.val[i] *= exp( (test_left - x) / 25); + // Produce an exponential decay around right edge + else if( x < test_right) + s.val[i] *= exp( (x - test_right) / 25); + else + s.val[i] *= exp( (test_right - x) / 25); + } + cvSet2D(g_dataRGB,y,x,s); + // if( s.val[0] > 200) + // printf("row: %d, col: %d, %f\n", y, x, s.val[0]); + } + } if (g_data == NULL) { g_data = cvCreateMat(g_dataRGB->rows,g_dataRGB->cols,CV_8UC1); //IPL_DEPTH_8U? - cvCvtColor(g_dataRGB,g_data,CV_RGB2GRAY); } + cvCvtColor(g_dataRGB,g_data,CV_RGB2GRAY); } /** @@ -73,11 +97,18 @@ void Dilatometer_Cleanup() * Get an image from the Dilatometer */ static void Dilatometer_GetImage() +{ + //Need to implement camera +} + +// Test algorithm +static void Dilatometer_GetImageTest( ) { //Test image Dilatometer_TestImage(); - //Need to implement camera } + + /** * Read the dilatometer; gets the latest image, processes it, THEN DOES WHAT * @param samples - Number of rows to scan (increasing will slow down performance!) @@ -86,8 +117,10 @@ static void Dilatometer_GetImage() double Dilatometer_Read(int samples) { //Get the latest image - Dilatometer_GetImage(); + //Dilatometer_GetImage(); + Dilatometer_GetImageTest(); + int width = g_data->cols; int height = g_data->rows; // If the number of samples is greater than the image height, sample every row @@ -102,18 +135,16 @@ double Dilatometer_Read(int samples) // The average width of the can double average_width; int sample_height; - printf("here2; %d\n", width); for (int i=0; i THRES) - - //printf("val is %f\n", cvGet2D(g_data, col, sample_height)); - //printf("position is col: %d, row: %d\n",col, sample_height); CvScalar value = cvGet2D(g_data, sample_height, col); - //printf("value is %f\n", value.val[0]); if( value.val[0]> THRES) { edges[pos] += (double) col; num++; - printf("here; %f\n", edges[pos]); } // If num > 0 and we're not above threshold, we have left the threshold of the edge else if( num > 0) @@ -151,9 +176,8 @@ double Dilatometer_Read(int samples) //widths[i] = edges[1] - edges[0]; average_width += (edges[1] - edges[0]); } - average_width /= samples; - printf("the average width is %f\n", average_width); - return average_width; + average_width /= (double) samples; + return average_width; } /** @@ -163,12 +187,25 @@ int main(int argc, char ** argv) { //cvNamedWindow( "display", CV_WINDOW_AUTOSIZE );// Create a window for display. //gettimeofday(&start, NULL); - + test_left = 100; + test_right = 500; Dilatometer_Init(); cvNamedWindow( "display", CV_WINDOW_AUTOSIZE); cvShowImage("display", g_data); cvWaitKey(0); - Dilatometer_Read(5); + double width; + for( int i = 0; i < 20; ++i) + { + test_left -= i * (rand() % 1000) * 1e-3; + test_right += i * (rand() % 1000) * 1e-3; + width = Dilatometer_Read(5); + cvNamedWindow( "display", CV_WINDOW_AUTOSIZE); + cvShowImage("display", g_data); + cvWaitKey(0); + double expected = test_right - test_left; + double perc = 100 * (expected - width) / expected; + printf("%d: Left: %.4f. Width: %.4f.\n Right: %.4f. Expected: %.4f. Percentage: %.4f\n", i, test_left, width, test_right, expected, perc); + } }