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

Fixed bugs on Qt

Browse Source
This commit is contained in:
Yannick Verdie
2010-07-31 18:04:28 +00:00
parent 49f1a9c3d5
commit e8aad75446
5 changed files with 451 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -190,10 +190,15 @@ int startWindowThread()
#if defined (HAVE_QT)
CvFont fontQt(const string& nameFont, int pointSize, Scalar color, int weight, int style, int spacing)
{
return cvFontQt(nameFont.c_str(), pointSize,color,weight, style);
}
void addText( const Mat& img, const string& text, Point org, CvFont font)
{
CvMat _img = img;
cvAddText( &_img, text.c_str(), CvPoint(org),&font);
cvAddText( &_img, text.c_str(), org,&font);
}
void displayStatusBar(const string& name, const string& text, int delayms)

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

File diff suppressed because it is too large Load Diff

4
modules/highgui/src/window_QT.h
View File

@@ -304,6 +304,10 @@ private:
void icvLoadTrackbars(QSettings *settings);
void icvSaveTrackbars(QSettings *settings);
void icvLoadControlPanel();
void icvSaveControlPanel();
void icvLoadButtonbar(CvButtonbar* t,QSettings *settings);
void icvSaveButtonbar(CvButtonbar* t,QSettings *settings);
void createShortcuts();
void createActions();