generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Qt - debugging Linux and Windows

Browse Source
This commit is contained in:
Yannick Verdie
2010-07-27 17:29:22 +00:00
parent 4d67fc266c
commit c77e8fc638
5 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
modules/highgui/src/window.cpp
View File

@@ -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;
}

10
modules/highgui/src/window_QT.cpp
View File

@@ -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)