Qt - debugging Linux and Windows

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 51e1563f7cab665aec3ea9307fccd3ae40f72ad6..3802ca214f2f9a884baff2e036914b03015e6f8d 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -509,20 +509,21 @@ endif()
 set(WITH_QT OFF CACHE BOOL "Build with Qt Backend support")\r
 set(WITH_QT_OPENGL OFF CACHE BOOL "Add OpenGL extension to Qt")\r
 \r
-#set(HAVE_QT 0)\r
-#set(HAVE_QT_OPENGL 0)\r
+set(HAVE_QT 0)\r
+set(HAVE_QT_OPENGL 0)\r
 \r
 if (WITH_QT)\r
     find_package(Qt4)\r
     if (QT4_FOUND)\r
         set(HAVE_QT 1)\r
-        #add_definitions(-DHAVE_QT)\r
-        #set_property(DIRECTORY PROPERTY COMPILE_DEFINITIONS "HAVE_QT")\r
-        \r
+               add_definitions(-DHAVE_QT)#We need to define te macro this way, using cvconfig.h.cmake does not work\r
+\r
         find_package (OpenGL QUIET)\r
-        if (QT_QTOPENGL_FOUND AND OPENGL_FOUND)\r
+               if (NOT WIN32)  #WIN32 always detect OpenGL, so I disabled it.\r
+                       if (QT_QTOPENGL_FOUND AND OPENGL_FOUND)\r
                        set(HAVE_QT_OPENGL 1)\r
-                       #add_definitions(-DHAVE_QT_OPENGL)\r
+                       add_definitions(-DHAVE_QT_OPENGL)\r
+               endif()\r
         endif()\r
     endif()\r
 endif()\r

diff --git a/cvconfig.h.cmake b/cvconfig.h.cmake
index ebe9528f7b10ae42068bb8e878f0ace3740b69b2..4299d7bd1a4de84bf85e5603561f4a4ed87fb7d9 100644 (file)
--- a/cvconfig.h.cmake
+++ b/cvconfig.h.cmake
@@ -161,10 +161,10 @@
 #cmakedefine  HAVE_EIGEN2
 
 /* Qt bindings */
-#cmakedefine  HAVE_QT
+//#cmakedefine  HAVE_QT
 
 /* Qt bindings use OpenGL */
-#cmakedefine  HAVE_HAVE_QT_OPENGL
+//#cmakedefine  HAVE_QT_OPENGL
 
 /* NVidia Cuda Runtime API*/
 #cmakedefine HAVE_CUDA

diff --git a/modules/highgui/include/opencv2/highgui/highgui_c.h b/modules/highgui/include/opencv2/highgui/highgui_c.h
index 28afd89c8a0725fc05133630557184957304f1e4..66fcab4e559809bf7443d8a22e63b1a99f6b10e4 100644 (file)
--- a/modules/highgui/include/opencv2/highgui/highgui_c.h
+++ b/modules/highgui/include/opencv2/highgui/highgui_c.h
@@ -81,7 +81,7 @@ enum {CV_GUI_EXPANDED = 0x00000000, CV_GUI_NORMAL = 0x00000010};
 //and alpha= 0 <-> 0xFF (not transparent <-> transparent)
 CVAPI(CvFont) cvFont_Qt(const char* nameFont, int pointSize CV_DEFAULT(-1), CvScalar color CV_DEFAULT(cvScalarAll(0)), int weight CV_DEFAULT(CV_FONT_NORMAL),  int style CV_DEFAULT(CV_STYLE_NORMAL), int spacing CV_DEFAULT(0));
 
-CVAPI(void) cvAddText( CvArr* img, const char* text, CvPoint org, CvFont *arg2);
+CVAPI(void) cvAddText(const CvArr* img, const char* text, CvPoint org, CvFont *arg2);
 
 CVAPI(void) cvDisplayOverlay(const char* name, const char* text, int delayms);
 CVAPI(void) cvDisplayStatusBar(const char* name, const char* text, int delayms);

diff --git a/modules/highgui/src/window.cpp b/modules/highgui/src/window.cpp
index ef9ddb91c93660d3c5dbee61e47e19fda61ff93e..9658cd50e249d5aa5a82d0a7a3eb97113aa31008 100644 (file)
--- a/modules/highgui/src/window.cpp
+++ b/modules/highgui/src/window.cpp
@@ -365,7 +365,7 @@ CV_IMPL int cvStartWindowThread()
 
 
 //-------- Qt ---------
-CV_IMPL void cvAddText( const CvArr*, const char*, CvPoint org, CvFont font)
+CV_IMPL void cvAddText( const CvArr*, const char*, CvPoint org, CvFont* font)
 {
     CV_NO_GUI_ERROR("cvAddText");
 }
@@ -375,12 +375,7 @@ CV_IMPL void cvDisplayStatusBar(const char* name, const char* arg2, int arg3)
     CV_NO_GUI_ERROR("cvDisplayStatusBar");
 }  
 
-CV_IMPL void cvDisplayStatusBar(const char* name, const char* arg2, int arg3)
-{
-    CV_NO_GUI_ERROR("cvDisplayStatusBar");
-}  
-
-CV_IMPL void cvCreateOpenGLCallback(const char* name, cvOpenGLCallback callback, void* param)
+CV_IMPL void cvCreateOpenGLCallback(const char*, void (*)(void*), void*, double, double, double)
 {
     CV_NO_GUI_ERROR("createOpenGLCallback");
 }  
@@ -390,9 +385,10 @@ CV_IMPL void cvDisplayOverlay(const char* name, const char* text, int delayms)
     CV_NO_GUI_ERROR("cvNamedWindow");
 }  
 
-CV_IMPL void cvStartLoop(int (*pt2Func)(int argc, char *argv[]), int argc, char* argv[])
+CV_IMPL int cvStartLoop(int (*pt2Func)(int argc, char *argv[]), int argc, char* argv[])
 {
     CV_NO_GUI_ERROR("cvStartLoop");
+    return -1;
 }  
 
 CV_IMPL void cvStopLoop()
@@ -410,9 +406,10 @@ CV_IMPL void cvLoadWindowParameterss(const char* name)
     CV_NO_GUI_ERROR("cvLoadWindowParameters");
 }  
 
-CV_IMPL void cvCreateButton(const char* arg1, const char* arg2, cvButtonCallback on_change, const char* name, void* userdata)
+CV_IMPL int cvCreateButton(const char*, void (*)(int, void*), void*, int, int)
 {
     CV_NO_GUI_ERROR("cvCreateButton");
+    return -1;
 }  
 
 

diff --git a/modules/highgui/src/window_QT.cpp b/modules/highgui/src/window_QT.cpp
index ef3e8895e42ea249357932334e696feca6e9be96..caaa0ab1fa4703a492b861bf6ec1f8c3ec0e97fa 100755 (executable)
--- a/modules/highgui/src/window_QT.cpp
+++ b/modules/highgui/src/window_QT.cpp
@@ -82,7 +82,7 @@ CV_IMPL CvFont cvFont_Qt(const char* nameFont, int pointSize,CvScalar color,int
 
 
 
-CV_IMPL void cvAddText( CvArr* img, const char* text, CvPoint org, CvFont* font)
+CV_IMPL void cvAddText(const CvArr* img, const char* text, CvPoint org, CvFont* font)
 {
 
        if (!guiMainThread)
@@ -1988,7 +1988,11 @@ void ViewPort::setMouseCallBack(CvMouseCallback m, void* param)
 
 void ViewPort::setOpenGLCallback(CvOpenGLCallback func,void* userdata, double angle_arg, double zmin_arg, double zmax_arg)
 {
-#if defined( HAVE_QT_OPENGL )//all this section -> not tested
+       //avoid unreferenced formal parameter warning with vs 2008
+       //http://msdn.microsoft.com/en-en/library/26kb9fy0%28VS.80%29.aspx
+       func;userdata;angle_arg;zmin_arg;zmax_arg;
+
+#if defined( HAVE_QT_OPENGL )
        on_openGL_draw3D = func;
        on_openGL_param = userdata;
        
@@ -2309,7 +2313,7 @@ void ViewPort::paintEvent(QPaintEvent* event)
 
     //for information overlay
     if (drawInfo)
-       drawInstructions(&myPainter);
+               drawInstructions(&myPainter);
 
        //for statusbar
        if (centralWidget->myStatusBar)