fixed tracking screen mouse-callback.

diff --git a/stickletrack.cpp b/stickletrack.cpp
index da812df1dec9a78ea97a7614dec2cab3d98d311b..e872ebd4111d665fa3e78cf58f3c85b293dbc346 100755 (executable)
--- a/stickletrack.cpp
+++ b/stickletrack.cpp
@@ -397,9 +397,7 @@ int process(VideoCapture& capture) {
   openTanjaLog();
 
   masking_init();
-  tracking_init();
-
-  cvSetMouseCallback("contours_picture", mouseTracking, 0);
+  tracking_init(&mouseTracking);
 
   capture.set(CV_CAP_PROP_POS_FRAMES, 0);
 

diff --git a/tracking.cpp b/tracking.cpp
index 88c9512eff2a00cd35d0a8590ca3f4a96e163a46..9a185df5e75891113a588900a4dd692948a8a0ca 100644 (file)
--- a/tracking.cpp
+++ b/tracking.cpp
@@ -65,7 +65,7 @@ bool tracking_isEnabled () {
   return enablecontours;
 }
 
-void tracking_init() {
+void tracking_init( void (*mouseTracking)(int, int, int, int, void*) ) {
   namedWindow("stickletrack_tracking_prefs", CV_WINDOW_KEEPRATIO);
   namedWindow("stickletrack_tracking_screen", CV_WINDOW_KEEPRATIO);
 
@@ -82,6 +82,8 @@ void tracking_init() {
   createTrackbar("max speed", "stickletrack_tracking_prefs", &Prefs.contours_maxspeed, 100, &trackbarCallbackUpdateNormPrefs, 0);
   createTrackbar("max rotation speed", "stickletrack_tracking_prefs", &Prefs.contours_maxrot, 100, &trackbarCallbackUpdateNormPrefs, 0);
 
+  cvSetMouseCallback("stickletrack_tracking_screen", mouseTracking, 0);
+
   mContours = Mat::zeros(Props.height, Props.width, CV_8UC3);
 }
 

diff --git a/tracking.h b/tracking.h
index 7911da0d25cc83a062c60f22818ba4f12802afca..b8c522c6b38fcae8b0ca980f604c850949432058 100644 (file)
--- a/tracking.h
+++ b/tracking.h
@@ -19,7 +19,7 @@ struct tag {
   Point2f head, tail;
 };
 
-void tracking_init();
+void tracking_init( void (*mouseTracking)(int, int, int, int, void*) );
 void tracking_locateTags(vector<tag>& tags, Mat combinedmask_contour);
 Mat& tracking_getFrame();
 int tracking_showFrame();