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

Qt: fixed using of OpenCV in another Qt app (patch #919)

Browse Source
This commit is contained in:
Ilya Lysenkov 2011-06-16 13:20:50 +00:00
parent 8d8ef596c8
commit 0565a9456d
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -442,14 +442,11 @@ CvButtonbar* icvFindButtonbarByName( const char* button_name,QBoxLayout* layout)
int icvInitSystem(int *c, char** v)
{
static int wasInitialized = 0;
// check initialization status
if( !wasInitialized)
//"For any GUI application using Qt, there is precisely one QApplication object"
if(!QApplication::instance())
{
new QApplication(*c,v);
wasInitialized = 1;
qDebug()<<"init done";
#if defined( HAVE_QT_OPENGL )
@ -700,6 +697,7 @@ CV_IMPL void cvShowImage( const char* name, const CvArr* arr )
GuiReceiver::GuiReceiver() : _bTimeOut(false), nb_windows(0)
{
doesExternalQAppExist = (QApplication::instance() != 0);
icvInitSystem(&parameterSystemC, parameterSystemV);
timer = new QTimer;
@ -714,7 +712,10 @@ void GuiReceiver::isLastWindow()
{
delete guiMainThread;//delete global_control_panel too
guiMainThread = NULL;
qApp->quit();
if(!doesExternalQAppExist)
{
qApp->quit();
}
}
}
@ -983,6 +984,9 @@ void GuiReceiver::destroyAllWindow()
if (multiThreads)
{
// WARNING: this could even close windows from an external parent app
//#TODO check externalQAppExists and in case it does, close windows carefully,
// i.e. apply the className-check from below...
qApp->closeAllWindows();
}else{

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

@ -121,6 +121,7 @@ public:
private:
int nb_windows;
bool doesExternalQAppExist;
public slots:
void createWindow( QString name, int flags = 0 );