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

QT new functions:

Browse Source 
- cvAddButton changed to match requirement
 - CV_GUI_NORMAL and CV_GUI_EXPANDED done
 - context menu with right click
This commit is contained in:
Yannick Verdie
2010-07-22 20:39:44 +00:00
parent 912607a387
commit 2c923c7eba
5 changed files with 1506 additions and 1453 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -79,8 +79,8 @@ CV_EXPORTS void loadWindowParameters(const string& windowName);
CV_EXPORTS int startLoop(int (*pt2Func)(int argc, char *argv[]), int argc, char* argv[]);
CV_EXPORTS void stopLoop();
typedef void (CV_CDECL *ButtonCallback)(void* userdata);
CV_EXPORTS int createButton( const char* bar_name, const char* window_name, ButtonCallback on_change, const char* button_name CV_DEFAULT(NULL), void* userdata CV_DEFAULT(NULL));
typedef void (CV_CDECL *ButtonCallback)(int state, void* userdata);
CV_EXPORTS int createButton( const string& bar_name, ButtonCallback on_change , void* userdata CV_DEFAULT(NULL), int type CV_DEFAULT(CV_PUSH_BUTTON), bool initial_button_state CV_DEFAULT(0));
//-------------------------
CV_EXPORTS void imshow( const string& winname, const Mat& mat );

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

@@ -94,8 +94,9 @@ CVAPI(void) cvLoadWindowParameters(const char* name);
CVAPI(int) cvStartLoop(int (*pt2Func)(int argc, char *argv[]), int argc, char* argv[]);
CVAPI(void) cvStopLoop();
typedef void (CV_CDECL *CvButtonCallback)(void* userdata);
CVAPI(int) cvCreateButton( const char* bar_name, const char* window_name, CvButtonCallback on_change, const char* button_name CV_DEFAULT(NULL), void* userdata CV_DEFAULT(NULL));
typedef void (CV_CDECL *CvButtonCallback)(int state, void* userdata);
enum {CV_PUSH_BUTTON = 0, CV_CHECKBOX = 1};
CVAPI(int) cvCreateButton( const char* button_name CV_DEFAULT(NULL),CvButtonCallback on_change CV_DEFAULT(NULL), void* userdata CV_DEFAULT(NULL) , int button_type CV_DEFAULT(CV_PUSH_BUTTON), bool initial_button_state CV_DEFAULT(0));
//----------------------