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

New functions with QT GUI:

Browse Source 
- fix c++ wrapper
- rename cvInformation in cvDisplayOverlay
This commit is contained in:
Yannick Verdie 2010-06-20 10:29:11 +00:00
parent bd643ad550
commit 2f9aedfaab
5 changed files with 54 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,6 +68,7 @@ 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
CV_EXPORTS void displayOverlay(const string& winname, const string& text, int delayms);
CV_EXPORTS void imshow( const string& winname, const Mat& mat ); CV_EXPORTS void imshow( const string& winname, const Mat& mat );

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

@ -58,7 +58,7 @@ extern "C" {
\****************************************************************************************/ \****************************************************************************************/
//YV //YV
//-----------New for QT //-----------New for QT
CVAPI(void) cvInformation(const char* name, const char* text, int delayms); CVAPI(void) cvDisplayOverlay(const char* name, const char* text, int delayms);
CVAPI(int) cvStartLoop(int (*pt2Func)(int argc, char *argv[]), int argc, char* argv[]); CVAPI(int) cvStartLoop(int (*pt2Func)(int argc, char *argv[]), int argc, char* argv[]);
CVAPI(void) cvStopLoop(); CVAPI(void) cvStopLoop();
//---------------------- //----------------------

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

@ -125,24 +125,20 @@ void destroyWindow( const string& winname )
cvDestroyWindow( winname.c_str() ); cvDestroyWindow( winname.c_str() );
} }
//YV
void setWindowProperty(const string& winname, int prop_id, double prop_value) void setWindowProperty(const string& winname, int prop_id, double prop_value)
{ {
cvSetWindowProperty( winname.c_str(),prop_id,prop_value); cvSetWindowProperty( winname.c_str(),prop_id,prop_value);
} }
//YV
double getWindowProperty(const string& winname, int prop_id) 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)
void information(const string& name, const string& text, int delayms)
{ {
cvInformation(name.c_str(),text.c_str(), 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 )
{ {

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

@ -96,7 +96,7 @@ double cvGetModeWindow_QT(const char* name)
return result; return result;
} }
CV_IMPL void cvInformation(const char* name, const char* text, int delayms) CV_IMPL void cvDisplayOverlay(const char* name, const char* text, int delayms)
{ {
QMetaObject::invokeMethod(&guiMainThread, QMetaObject::invokeMethod(&guiMainThread,