Skip to content

O
opencv
Commit 94b58809 authored by Yannick Verdie's avatar Yannick Verdie
Browse files
Options

Qt test (some code disabled for debugging)

parent aaa8678c
Show whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
modules/highgui/src/window_QT.cpp
View file @ 94b58809
...@@ -436,7 +436,7 @@ int icvInitSystem(int *c, char** v) ...@@ -436,7 +436,7 @@ int icvInitSystem(int *c, char** v)
wasInitialized = 1; wasInitialized = 1;
qDebug()<<"init done"; qDebug()<<"init done";
#if defined( HAVE_QT_OPENGL )//OK tested ! #if defined( HAVE_QT_OPENGL )
qDebug()<<"opengl support available"; qDebug()<<"opengl support available";
#endif #endif
} }
...@@ -1014,7 +1014,7 @@ void GuiReceiver::addButton(QString button_name, int button_type, int initial_bu ...@@ -1014,7 +1014,7 @@ void GuiReceiver::addButton(QString button_name, int button_type, int initial_bu
{ {
b = CvWindow::createButtonbar(button_name);//the bar has the name of the first button attached to it b = CvWindow::createButtonbar(button_name);//the bar has the name of the first button attached to it
enablePropertiesButtonEachWindow(); //enablePropertiesButtonEachWindow();
}else{ }else{
CvBar* lastbar = (CvBar*) global_control_panel->myLayout->itemAt(global_control_panel->myLayout->count()-1); CvBar* lastbar = (CvBar*) global_control_panel->myLayout->itemAt(global_control_panel->myLayout->count()-1);
...@@ -1637,8 +1637,8 @@ void CvWindow::createActionsandShortcuts() ...@@ -1637,8 +1637,8 @@ void CvWindow::createActionsandShortcuts()
vect_QActions[9]->setIconVisibleInMenu(true); vect_QActions[9]->setIconVisibleInMenu(true);
vect_QActions[9]->setShortcut(shortcut_properties_win); vect_QActions[9]->setShortcut(shortcut_properties_win);
if (global_control_panel->myLayout->count() == 0) //if (global_control_panel->myLayout->count() == 0)
vect_QActions[9]->setDisabled(true); // vect_QActions[9]->setDisabled(true);
QObject::connect( vect_QActions[9],SIGNAL(triggered()),this, SLOT( displayPropertiesWin() )); QObject::connect( vect_QActions[9],SIGNAL(triggered()),this, SLOT( displayPropertiesWin() ));
...@@ -1745,8 +1745,8 @@ void CvWindow::addSlider2(CvWindow* w,QString name, int* value, int count,CvTrac ...@@ -1745,8 +1745,8 @@ void CvWindow::addSlider2(CvWindow* w,QString name, int* value, int count,CvTrac
myLayout = global_control_panel->myLayout; myLayout = global_control_panel->myLayout;
//if first one, enable control panel //if first one, enable control panel
if (myLayout->count() == 0) //if (myLayout->count() == 0)
guiMainThread->enablePropertiesButtonEachWindow(); // guiMainThread->enablePropertiesButtonEachWindow();
} }
myLayout->insertLayout( myLayout->count(),t); myLayout->insertLayout( myLayout->count(),t);
...@@ -1771,8 +1771,8 @@ void CvWindow::addSlider(CvWindow* w,QString name, int* value, int count,CvTrack ...@@ -1771,8 +1771,8 @@ void CvWindow::addSlider(CvWindow* w,QString name, int* value, int count,CvTrack
myLayout = global_control_panel->myLayout; myLayout = global_control_panel->myLayout;
//if first one, enable control panel //if first one, enable control panel
if (myLayout->count() == 0) //if (myLayout->count() == 0)
guiMainThread->enablePropertiesButtonEachWindow(); // guiMainThread->enablePropertiesButtonEachWindow();
} }
myLayout->insertLayout( myLayout->count(),t); myLayout->insertLayout( myLayout->count(),t);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment