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

New functions with QT GUI:

Browse Source 
- fix c++ wrapper
- fix compilation bugs
This commit is contained in:
Yannick Verdie 2010-06-20 11:18:23 +00:00
parent 2f9aedfaab
commit f2392f2e2f
3 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/highgui/include/opencv2/highgui/highgui.hpp
View File

@ -56,19 +56,19 @@ namespace cv
enum { WINDOW_AUTOSIZE=1 }; enum { WINDOW_AUTOSIZE=1 };
//YV
//-----------New for QT
//CV_EXPORTS void information(const string& name, const string& text, int delayms);
//------------
CV_EXPORTS void namedWindow( const string& winname, int flags CV_DEFAULT(WINDOW_AUTOSIZE) ); CV_EXPORTS void namedWindow( const string& winname, int flags CV_DEFAULT(WINDOW_AUTOSIZE) );
CV_EXPORTS void destroyWindow( const string& winname ); CV_EXPORTS void destroyWindow( const string& winname );
CV_EXPORTS int startWindowThread(); CV_EXPORTS int startWindowThread();
CV_EXPORTS void setWindowProperty(const string& winname, int prop_id, double prop_value);//YV CV_EXPORTS void setWindowProperty(const string& winname, int prop_id, double prop_value);//YV
CV_EXPORTS double getWindowProperty(const string& winname, int prop_id);//YV CV_EXPORTS double getWindowProperty(const string& winname, int prop_id);//YV
//Only for QT
CV_EXPORTS void displayOverlay(const string& winname, const string& text, int delayms); CV_EXPORTS void displayOverlay(const string& winname, const string& text, int delayms);
CV_EXPORTS int startLoop(int (*pt2Func)(int argc, char *argv[]), int argc, char* argv[]);
CV_EXPORTS void stopLoop();
CV_EXPORTS void imshow( const string& winname, const Mat& mat ); CV_EXPORTS void imshow( const string& winname, const Mat& mat );

3
modules/highgui/include/opencv2/highgui/highgui_c.h
View File

@ -208,9 +208,6 @@ CVAPI(void) cvConvertImage( const CvArr* src, CvArr* dst, int flags CV_DEFAULT(0
/* wait for key event infinitely (delay<=0) or for "delay" milliseconds */ /* wait for key event infinitely (delay<=0) or for "delay" milliseconds */
CVAPI(int) cvWaitKey(int delay CV_DEFAULT(0)); CVAPI(int) cvWaitKey(int delay CV_DEFAULT(0));
void cvInformation(const char* name, const char* text, int delay);
/****************************************************************************************\ /****************************************************************************************\
* Working with Video Files and Cameras * * Working with Video Files and Cameras *
\****************************************************************************************/ \****************************************************************************************/

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

@ -135,11 +135,6 @@ double getWindowProperty(const string& winname, int prop_id)
return cvGetWindowProperty(winname.c_str(),prop_id); return cvGetWindowProperty(winname.c_str(),prop_id);
} }
void displayOverlay(const string& name, const string& text, int delayms)
{
cvDisplayOverlay(name.c_str(),text.c_str(), delayms);
}
void imshow( const string& winname, const Mat& img ) void imshow( const string& winname, const Mat& img )
{ {
CvMat _img = img; CvMat _img = img;
@ -179,6 +174,23 @@ int startWindowThread()
return cvStartWindowThread(); return cvStartWindowThread();
} }
#if defined (HAVE_QT)
void displayOverlay(const string& name, const string& text, int delayms)
{
cvDisplayOverlay(name.c_str(),text.c_str(), delayms);
}
int startLoop(int (*pt2Func)(int argc, char *argv[]), int argc, char* argv[])
{
return cvStartLoop(pt2Func, argc, argv);
}
void stopLoop()
{
cvStopLoop();
}
#endif
} }
#if defined WIN32 || defined _WIN32 // see window_w32.cpp #if defined WIN32 || defined _WIN32 // see window_w32.cpp
@ -211,6 +223,12 @@ CV_IMPL int cvNamedWindow( const char*, int )
return -1; return -1;
} }
CV_IMPL int cvDisplayOverlay(const char* name, const char* text, int delayms)
{
CV_NO_GUI_ERROR("cvNamedWindow");
return -1;
}
CV_IMPL void cvDestroyWindow( const char* ) CV_IMPL void cvDestroyWindow( const char* )
{ {
CV_NO_GUI_ERROR( "cvDestroyWindow" ); CV_NO_GUI_ERROR( "cvDestroyWindow" );