From d1cf38a35e41662c7258b68ca649a0802172c3ba Mon Sep 17 00:00:00 2001 From: Callum Date: Tue, 29 Oct 2013 23:57:57 +0800 Subject: [PATCH] changed some variables to defines --- server/sensors/dilatometer.c | 10 ++-------- server/sensors/dilatometer.h | 6 ++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/server/sensors/dilatometer.c b/server/sensors/dilatometer.c index 18d5e68..4358acc 100644 --- a/server/sensors/dilatometer.c +++ b/server/sensors/dilatometer.c @@ -15,12 +15,6 @@ static double test_left, test_right; static double lastPosition; -// Canny Edge algorithm variables -int blur = 5; -int lowThreshold = 30; -int ratio = 3; -int kernel_size = 3; - /** Buffers for storing image data. **/ static CvMat * g_srcRGB = NULL; // Source Image static CvMat * g_srcGray = NULL; // Gray scale of source image @@ -140,7 +134,7 @@ void CannyThreshold() //cvWaitKey(0); // Reduce noise with a kernel blurxblur. Input the grayscale source image, output to edges. (0's mean it's determined from kernel sizes) - cvSmooth( g_srcGray, g_edges, CV_GAUSSIAN, blur, blur ,0 ,0 ); + cvSmooth( g_srcGray, g_edges, CV_GAUSSIAN, BLUR, BLUR ,0 ,0 ); //Save the image //cvSaveImage("test_blurred.jpg",g_edges,0); @@ -149,7 +143,7 @@ void CannyThreshold() //cvWaitKey(0); // Find the edges in the image - cvCanny( g_edges, g_edges, lowThreshold, lowThreshold*ratio, kernel_size ); + cvCanny( g_edges, g_edges, LOWTHRESHOLD, LOWTHRESHOLD*RATIO, KERNELSIZE ); //Save the image //cvSaveImage("test_edge.jpg",g_edges,0); diff --git a/server/sensors/dilatometer.h b/server/sensors/dilatometer.h index e8be7d1..52831e1 100644 --- a/server/sensors/dilatometer.h +++ b/server/sensors/dilatometer.h @@ -11,6 +11,12 @@ //Number of samples of the image to take #define SAMPLES 600 +// Canny Edge algorithm variables +#define BLUR 5 +#define LOWTHRESHOLD 30 +#define RATIO 3 +#define KERNELSIZE 3 + //Scaling factor required to change from pixels to mm #define SCALE 1 // Note camera has not been calibrated yet so result will be in pixels -- 2.20.1