X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=server%2Fsensors%2Fdilatometer.c;h=4358acc43ae2ef77466b3aa0ffa5541dc4459ef4;hb=537721537d5b62e02a5e05d363f548d1c6a48299;hp=10b2e61a7247c7090cc03db08b8e1629bad7cd43;hpb=3977290418955f0f737c4ac727565e34b687b8d1;p=matches%2FMCTX3420.git

diff --git a/server/sensors/dilatometer.c b/server/sensors/dilatometer.c
index 10b2e61..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);
@@ -165,7 +159,7 @@ void CannyThreshold()
  * @param samples - Number of rows to scan (increasing will slow down performance!)
  * @returns true on successful read
  */
-bool Dilatometer_GetEdge( double * value, int samples)
+bool Dilatometer_GetExpansion( double * value, int samples)
 {
 	bool result = false; 
 	double average = 0;
@@ -244,7 +238,7 @@ bool Dilatometer_GetEdge( double * value, int samples)
  */
 bool Dilatometer_Read(int id, double * value)
 {
-	bool result = Dilatometer_GetEdge(value, SAMPLES);
+	bool result = Dilatometer_GetExpansion(value, SAMPLES);
 	return result;
 }
 
@@ -256,7 +250,7 @@ bool Dilatometer_Init(const char * name, int id)
 	// Make an initial reading (will allocate memory the first time only).
 	double val;
 	lastPosition = 0;  // Reset the last position
-	bool result = Dilatometer_GetEdge(&val, 1); 
+	bool result = Dilatometer_GetExpansion(&val, 1); 
 	return result;
 }