Skip to content

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

New functions with QT GUI: 

StatusBar with zoom/color/position information
user can display infor mation in statusbar with cvDisplayStatusBar(window,text,delay_ms)
parent 4606638b
Show whitespace changes
Inline Side-by-side
Showing with 218 additions and 69 deletions
modules/highgui/include/opencv2/highgui/highgui.hpp
View file @ f69514ee
...@@ -66,6 +66,7 @@ CV_EXPORTS double getWindowProperty(const string& winname, int prop_id);//YV ...@@ -66,6 +66,7 @@ CV_EXPORTS double getWindowProperty(const string& winname, int prop_id);//YV
//Only for QT //Only for QT
CV_EXPORTS void displayOverlay(const string& winname, const string& text, int delayms); CV_EXPORTS void displayOverlay(const string& winname, const string& text, int delayms);
CV_EXPORTS void displayStatusBar(const string& winname, const string& text, int delayms);
CV_EXPORTS int startLoop(int (*pt2Func)(int argc, char *argv[]), int argc, char* argv[]); CV_EXPORTS int startLoop(int (*pt2Func)(int argc, char *argv[]), int argc, char* argv[]);
CV_EXPORTS void stopLoop(); CV_EXPORTS void stopLoop();
......
modules/highgui/include/opencv2/highgui/highgui_c.h
View file @ f69514ee
...@@ -59,6 +59,7 @@ extern "C" { ...@@ -59,6 +59,7 @@ extern "C" {
//YV //YV
//-----------New for QT //-----------New for QT
CVAPI(void) cvDisplayOverlay(const char* name, const char* text, int delayms); CVAPI(void) cvDisplayOverlay(const char* name, const char* text, int delayms);
CVAPI(void) cvDisplayStatusBar(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();
//---------------------- //----------------------
......
modules/highgui/src/window.cpp
View file @ f69514ee
...@@ -175,6 +175,11 @@ int startWindowThread() ...@@ -175,6 +175,11 @@ int startWindowThread()
} }
#if defined (HAVE_QT) #if defined (HAVE_QT)
void displayStatusBar(const string& name, const string& text, int delayms)
{
cvDisplayStatusBar(name.c_str(),text.c_str(), delayms);
}
void displayOverlay(const string& name, const string& text, int delayms) void displayOverlay(const string& name, const string& text, int delayms)
{ {
cvDisplayOverlay(name.c_str(),text.c_str(), delayms); cvDisplayOverlay(name.c_str(),text.c_str(), delayms);
......
modules/highgui/src/window_QT.cpp
View file @ f69514ee
...@@ -109,6 +109,18 @@ CV_IMPL void cvDisplayOverlay(const char* name, const char* text, int delayms) ...@@ -109,6 +109,18 @@ CV_IMPL void cvDisplayOverlay(const char* name, const char* text, int delayms)
} }
CV_IMPL void cvDisplayStatusBar(const char* name, const char* text, int delayms)
{
QMetaObject::invokeMethod(&guiMainThread,
"displayStatusBar",
Qt::AutoConnection,
//Qt::DirectConnection,
Q_ARG(QString, QString(name)),
Q_ARG(QString, QString(text)),
Q_ARG(int, delayms));
}
CV_IMPL int cvInitSystem( int, char** ) CV_IMPL int cvInitSystem( int, char** )
{ {
...@@ -223,9 +235,10 @@ CvTrackbar* icvFindTrackbarByName( const char* name_trackbar, const char* name_w ...@@ -223,9 +235,10 @@ CvTrackbar* icvFindTrackbarByName( const char* name_trackbar, const char* name_w
QString nameQt = QString(name_trackbar); QString nameQt = QString(name_trackbar);
QPointer<CvTrackbar> t; QPointer<CvTrackbar> t;
//for now, only trackbar are added so the Mutable cast is ok. //Warning ---- , asume the location 0 is myview and max-1 the status bar
for (int i = 0; i < w->layout->layout()->count()-1; ++i) for (int i = 1; i < w->layout->layout()->count()-2; ++i)
{ {
t = (CvTrackbar*) w->layout->layout()->itemAt(i); t = (CvTrackbar*) w->layout->layout()->itemAt(i);
if (t->trackbar_name==nameQt) if (t->trackbar_name==nameQt)
{ {
...@@ -534,6 +547,14 @@ void GuiReceiver::displayInfo( QString name, QString text, int delayms ) ...@@ -534,6 +547,14 @@ void GuiReceiver::displayInfo( QString name, QString text, int delayms )
w->displayInfo(text,delayms); w->displayInfo(text,delayms);
} }
void GuiReceiver::displayStatusBar( QString name, QString text, int delayms )
{
QPointer<CvWindow> w = icvFindWindowByName( name.toLatin1().data() );
if (w && delayms > 0)
w->displayStatusBar(text,delayms);
}
void GuiReceiver::showImage(QString name, void* arr) void GuiReceiver::showImage(QString name, void* arr)
{ {
//qDebug()<<"inshowimage"<<endl; //qDebug()<<"inshowimage"<<endl;
...@@ -721,6 +742,21 @@ CvTrackbar::~CvTrackbar() ...@@ -721,6 +742,21 @@ CvTrackbar::~CvTrackbar()
delete label; delete label;
} }
CustomLayout::CustomLayout()
{
}
int CustomLayout::heightForWidth ( int w ) const
{
return w/2;
}
bool CustomLayout::hasHeightForWidth () const
{
return true;
}
CvWindow::CvWindow(QString arg, int arg2) CvWindow::CvWindow(QString arg, int arg2)
{ {
moveToThread(qApp->instance()->thread()); moveToThread(qApp->instance()->thread());
...@@ -735,7 +771,7 @@ CvWindow::CvWindow(QString arg, int arg2) ...@@ -735,7 +771,7 @@ CvWindow::CvWindow(QString arg, int arg2)
resize(400,300); resize(400,300);
//CV_MODE_NORMAL or CV_MODE_OPENGL //CV_MODE_NORMAL or CV_MODE_OPENGL
myview = new ViewPort(this, CV_MODE_NORMAL); myview = new ViewPort(this, CV_MODE_NORMAL,false);//parent, mode_display, keep_aspect_ratio
myview->setAlignment(Qt::AlignHCenter); myview->setAlignment(Qt::AlignHCenter);
...@@ -755,17 +791,30 @@ CvWindow::CvWindow(QString arg, int arg2) ...@@ -755,17 +791,30 @@ CvWindow::CvWindow(QString arg, int arg2)
QObject::connect(shortcutDown, SIGNAL( activated ()),myview, SLOT( siftWindowOnDown() )); QObject::connect(shortcutDown, SIGNAL( activated ()),myview, SLOT( siftWindowOnDown() ));
layout = new QBoxLayout(QBoxLayout::TopToBottom); layout = new QBoxLayout(QBoxLayout::TopToBottom);
layout->setSpacing(5); //layout = new CustomLayout;
layout->setObjectName(QString::fromUtf8("boxLayout")); layout->setObjectName(QString::fromUtf8("boxLayout"));
layout->setContentsMargins(0, 0, 0, 0); layout->setContentsMargins(0, 0, 0, 0);
layout->setSpacing(0);
layout->setMargin(0); layout->setMargin(0);
layout->addWidget(myview); layout->addWidget(myview,Qt::AlignCenter);
if (flags == CV_WINDOW_AUTOSIZE) if (flags == CV_WINDOW_AUTOSIZE)
layout->setSizeConstraint(QLayout::SetFixedSize); layout->setSizeConstraint(QLayout::SetFixedSize);
setLayout(layout);
//now status bar
myBar = new QStatusBar;
myBar->setSizeGripEnabled(false);
myBar->setMaximumHeight(20);
myBar_msg = new QLabel;
myBar_msg->setFrameStyle(QFrame::Raised);
myBar_msg->setAlignment(Qt::AlignHCenter);
//myBar_msg->setWordWrap(true);
myBar->addWidget(myBar_msg);
layout->addWidget(myBar,Qt::AlignCenter);
setLayout(layout);
show(); show();
} }
...@@ -781,6 +830,9 @@ CvWindow::~CvWindow() ...@@ -781,6 +830,9 @@ CvWindow::~CvWindow()
delete layout; delete layout;
} }
delete myBar;
delete myBar_msg;
delete shortcutZ; delete shortcutZ;
delete shortcutPlus; delete shortcutPlus;
...@@ -796,6 +848,11 @@ void CvWindow::displayInfo(QString text,int delayms) ...@@ -796,6 +848,11 @@ void CvWindow::displayInfo(QString text,int delayms)
myview->startDisplayInfo(text, delayms); myview->startDisplayInfo(text, delayms);
} }
void CvWindow::displayStatusBar(QString text,int delayms)
{
myBar->showMessage(text,delayms);
}
void CvWindow::updateImage(void* arr) void CvWindow::updateImage(void* arr)
{ {
myview->updateImage(arr); myview->updateImage(arr);
...@@ -810,7 +867,7 @@ void CvWindow::addSlider(QString name, int* value, int count,CvTrackbarCallback ...@@ -810,7 +867,7 @@ void CvWindow::addSlider(QString name, int* value, int count,CvTrackbarCallback
{ {
QPointer<CvTrackbar> t = new CvTrackbar(this,name,value, count, on_change); QPointer<CvTrackbar> t = new CvTrackbar(this,name,value, count, on_change);
t->setAlignment(Qt::AlignHCenter); t->setAlignment(Qt::AlignHCenter);
layout->insertLayout(layout->count()-1,t); layout->insertLayout(layout->count()-1,t);//max-1 means add trackbar between myview and statusbar
} }
//Need more test here ! //Need more test here !
...@@ -864,10 +921,15 @@ void CvWindow::writeSettings()//not tested ...@@ -864,10 +921,15 @@ void CvWindow::writeSettings()//not tested
} }
//Here is ViewPort //Here is ViewPort
ViewPort::ViewPort(QWidget* arg, int arg2) ViewPort::ViewPort(CvWindow* arg, int arg2, bool arg3)
{ {
mode = arg2;
centralWidget = arg, centralWidget = arg,
mode = arg2;
keepRatio = arg3;
modeRatio = Qt::IgnoreAspectRatio;
if (keepRatio)
modeRatio = Qt::KeepAspectRatio;
setupViewport(centralWidget); setupViewport(centralWidget);
setContentsMargins(0,0,0,0); setContentsMargins(0,0,0,0);
...@@ -880,7 +942,8 @@ ViewPort::ViewPort(QWidget* arg, int arg2) ...@@ -880,7 +942,8 @@ ViewPort::ViewPort(QWidget* arg, int arg2)
positionGrabbing = QPointF(0,0); positionGrabbing = QPointF(0,0);
positionCorners = QRect(0,0,size().width(),size().height()); positionCorners = QRect(0,0,size().width(),size().height());
on_mouse = NULL; on_mouse = NULL;
deltaOffset = QPoint(0,0);
mouseCoordinate = QPoint(-1,-1);
#if defined(OPENCV_GL) #if defined(OPENCV_GL)
...@@ -891,15 +954,17 @@ ViewPort::ViewPort(QWidget* arg, int arg2) ...@@ -891,15 +954,17 @@ ViewPort::ViewPort(QWidget* arg, int arg2)
} }
#endif #endif
image2Draw=cvCreateImage(cvSize(centralWidget->width(),centralWidget->height()),IPL_DEPTH_8U,3); image2Draw_ipl=cvCreateImage(cvSize(centralWidget->width(),centralWidget->height()),IPL_DEPTH_8U,3);
cvZero(image2Draw); cvZero(image2Draw_ipl);
setInteractive(false); setInteractive(false);
setMouseTracking (true);//receive mouse event everytime
} }
ViewPort::~ViewPort() ViewPort::~ViewPort()
{ {
if (image2Draw) if (image2Draw_ipl)
cvReleaseImage(&image2Draw); cvReleaseImage(&image2Draw_ipl);
delete timerDisplay; delete timerDisplay;
} }
...@@ -920,7 +985,6 @@ void ViewPort::ZoomOut() ...@@ -920,7 +985,6 @@ void ViewPort::ZoomOut()
scaleView( -0.5,QPointF(size().width()/2,size().height()/2)); scaleView( -0.5,QPointF(size().width()/2,size().height()/2));
} }
//Note: move 2 percent of the window //Note: move 2 percent of the window
void ViewPort::siftWindowOnLeft() void ViewPort::siftWindowOnLeft()
{ {
...@@ -977,21 +1041,24 @@ void ViewPort::updateImage(void* arr) ...@@ -977,21 +1041,24 @@ void ViewPort::updateImage(void* arr)
IplImage* tempImage = (IplImage*)arr; IplImage* tempImage = (IplImage*)arr;
if (!isSameSize(image2Draw,tempImage)) if (!isSameSize(image2Draw_ipl,tempImage))
{ {
cvReleaseImage(&image2Draw); cvReleaseImage(&image2Draw_ipl);
image2Draw=cvCreateImage(cvGetSize(tempImage),IPL_DEPTH_8U,3); image2Draw_ipl=cvCreateImage(cvGetSize(tempImage),IPL_DEPTH_8U,3);
ratioX=float(image2Draw_ipl->width)/float(width());
ratioY=float(image2Draw_ipl->height)/float(height());
//centralWidget->myBar_msg->setMaximumWidth(width());
updateGeometry(); updateGeometry();
} }
cvConvertImage(tempImage,image2Draw,CV_CVTIMG_SWAP_RB ); cvConvertImage(tempImage,image2Draw_ipl,CV_CVTIMG_SWAP_RB );
viewport()->update(); viewport()->update();
} }
void ViewPort::setMouseCallBack(CvMouseCallback m, void* param) void ViewPort::setMouseCallBack(CvMouseCallback m, void* param)
{ {
setMouseTracking (true);//receive mouse event everytime
on_mouse = m; on_mouse = m;
on_mouse_param = param; on_mouse_param = param;
} }
...@@ -1000,8 +1067,9 @@ void ViewPort::controlImagePosition() ...@@ -1000,8 +1067,9 @@ void ViewPort::controlImagePosition()
{ {
qreal left, top, right, bottom; qreal left, top, right, bottom;
//after check top-left, bottom right corner to avoid getting "out" during zoom/panning
matrixWorld.map(0,0,&left,&top); matrixWorld.map(0,0,&left,&top);
if (left > 0) if (left > 0)
{ {
matrixWorld.translate(-left,0); matrixWorld.translate(-left,0);
...@@ -1012,7 +1080,7 @@ void ViewPort::controlImagePosition() ...@@ -1012,7 +1080,7 @@ void ViewPort::controlImagePosition()
matrixWorld.translate(0,-top); matrixWorld.translate(0,-top);
top = 0; top = 0;
} }
positionCorners.setTopLeft(QPoint(left,top)); //-------
QSize sizeImage = size(); QSize sizeImage = size();
matrixWorld.map(sizeImage.width(),sizeImage.height(),&right,&bottom); matrixWorld.map(sizeImage.width(),sizeImage.height(),&right,&bottom);
...@@ -1026,12 +1094,29 @@ void ViewPort::controlImagePosition() ...@@ -1026,12 +1094,29 @@ void ViewPort::controlImagePosition()
matrixWorld.translate(0,sizeImage.height()-bottom); matrixWorld.translate(0,sizeImage.height()-bottom);
bottom = sizeImage.height(); bottom = sizeImage.height();
} }
positionCorners.setBottomRight(QPoint(right,bottom));
/*
if (keepRatio)
{
cout<<"here"<<endl;
QSize t1(image2Draw_ipl->width, image2Draw_ipl->height);
QSize delta(width(),height());
t1.scale(delta.width(), delta.height(), Qt::KeepAspectRatio);
delta = (delta - t1)/2;
//left += delta.width();
//right += delta.width();
//top += delta.height();
//bottom += delta.height();
matrixWorld.translate(delta.width(),delta.height());
}
*/
//save corner position
positionCorners.setTopLeft(QPoint(left,top));
positionCorners.setBottomRight(QPoint(right,bottom));
//save also the inv matrix //save also the inv matrix
matrixWorld_inv = matrixWorld.inverted(); matrixWorld_inv = matrixWorld.inverted();
viewport()->update(); viewport()->update();
} }
...@@ -1062,6 +1147,9 @@ void ViewPort::scaleView(qreal factor,QPointF center) ...@@ -1062,6 +1147,9 @@ void ViewPort::scaleView(qreal factor,QPointF center)
controlImagePosition(); controlImagePosition();
//display new zoom
centralWidget->displayStatusBar(tr("Zoom: %1%").arg(matrixWorld.m11()*100),1000);
if (matrixWorld.m11()>1) if (matrixWorld.m11()>1)
setCursor(Qt::OpenHandCursor); setCursor(Qt::OpenHandCursor);
else else
...@@ -1076,7 +1164,7 @@ void ViewPort::wheelEvent(QWheelEvent *event) ...@@ -1076,7 +1164,7 @@ void ViewPort::wheelEvent(QWheelEvent *event)
void ViewPort::mousePressEvent(QMouseEvent *event) void ViewPort::mousePressEvent(QMouseEvent *event)
{ {
int cv_event = -1, flags = 0; int cv_event = -1, flags = 0;
QPoint pt = event->pos(); QPoint pt = event->pos()+deltaOffset;
switch(event->modifiers()) switch(event->modifiers())
...@@ -1116,15 +1204,13 @@ void ViewPort::mousePressEvent(QMouseEvent *event) ...@@ -1116,15 +1204,13 @@ void ViewPort::mousePressEvent(QMouseEvent *event)
default:; default:;
} }
if (on_mouse) //to convert mouse coordinate
{ matrixWorld_inv.map(pt.x(),pt.y(),&mouseCoordinate.rx(),&mouseCoordinate.ry());
int a, b; mouseCoordinate.rx()*=ratioX;
matrixWorld_inv.map(pt.x(),pt.y(),&a,&b); mouseCoordinate.ry()*=ratioY;
a*=float(image2Draw->width)/float(width());
b*=float(image2Draw->height)/float(height());
on_mouse( cv_event, a, b, flags, on_mouse_param );
}
if (on_mouse)
on_mouse( cv_event, mouseCoordinate.x(),mouseCoordinate.y(), flags, on_mouse_param );
if (matrixWorld.m11()>1) if (matrixWorld.m11()>1)
{ {
...@@ -1139,7 +1225,7 @@ void ViewPort::mouseReleaseEvent(QMouseEvent *event) ...@@ -1139,7 +1225,7 @@ void ViewPort::mouseReleaseEvent(QMouseEvent *event)
{ {
int cv_event = -1, flags = 0; int cv_event = -1, flags = 0;
QPoint pt = event->pos(); QPoint pt = event->pos()+deltaOffset;
switch(event->modifiers()) switch(event->modifiers())
...@@ -1179,14 +1265,13 @@ void ViewPort::mouseReleaseEvent(QMouseEvent *event) ...@@ -1179,14 +1265,13 @@ void ViewPort::mouseReleaseEvent(QMouseEvent *event)
default:; default:;
} }
//to convert mouse coordinate
matrixWorld_inv.map(pt.x(),pt.y(),&mouseCoordinate.rx(),&mouseCoordinate.ry());
mouseCoordinate.rx()*=ratioX;
mouseCoordinate.ry()*=ratioY;
if (on_mouse) if (on_mouse)
{ on_mouse( cv_event, mouseCoordinate.x(),mouseCoordinate.y(), flags, on_mouse_param );
int a, b;
matrixWorld_inv.map(pt.x(),pt.y(),&a,&b);
a*=float(image2Draw->width)/float(width());
b*=float(image2Draw->height)/float(height());
on_mouse( cv_event, a, b, flags, on_mouse_param );
}
if (matrixWorld.m11()>1) if (matrixWorld.m11()>1)
setCursor(Qt::OpenHandCursor); setCursor(Qt::OpenHandCursor);
...@@ -1197,7 +1282,7 @@ void ViewPort::mouseReleaseEvent(QMouseEvent *event) ...@@ -1197,7 +1282,7 @@ void ViewPort::mouseReleaseEvent(QMouseEvent *event)
void ViewPort::mouseDoubleClickEvent(QMouseEvent *event) void ViewPort::mouseDoubleClickEvent(QMouseEvent *event)
{ {
int cv_event = -1, flags = 0; int cv_event = -1, flags = 0;
QPoint pt = event->pos(); QPoint pt = event->pos()+deltaOffset;
switch(event->modifiers()) switch(event->modifiers())
{ {
...@@ -1236,22 +1321,21 @@ void ViewPort::mouseDoubleClickEvent(QMouseEvent *event) ...@@ -1236,22 +1321,21 @@ void ViewPort::mouseDoubleClickEvent(QMouseEvent *event)
default:; default:;
} }
//to convert mouse coordinate
matrixWorld_inv.map(pt.x(),pt.y(),&mouseCoordinate.rx(),&mouseCoordinate.ry());
mouseCoordinate.rx()*=ratioX;
mouseCoordinate.ry()*=ratioY;
if (on_mouse) if (on_mouse)
{ on_mouse( cv_event, mouseCoordinate.x(),mouseCoordinate.y(), flags, on_mouse_param );
int a, b;
matrixWorld_inv.map(pt.x(),pt.y(),&a,&b);
a*=float(image2Draw->width)/float(width());
b*=float(image2Draw->height)/float(height());
on_mouse( cv_event, a, b, flags, on_mouse_param );
}
QWidget::mouseDoubleClickEvent(event); QWidget::mouseDoubleClickEvent(event);
} }
void ViewPort::mouseMoveEvent(QMouseEvent *event) void ViewPort::mouseMoveEvent(QMouseEvent *event)
{ {
int cv_event = -1, flags = 0; int cv_event = -1, flags = 0;
QPoint pt = event->pos(); QPoint pt = event->pos()-deltaOffset;
switch(event->modifiers()) switch(event->modifiers())
{ {
...@@ -1288,14 +1372,14 @@ void ViewPort::mouseMoveEvent(QMouseEvent *event) ...@@ -1288,14 +1372,14 @@ void ViewPort::mouseMoveEvent(QMouseEvent *event)
default:; default:;
} }
//to convert mouse coordinate
matrixWorld_inv.map(pt.x(),pt.y(),&mouseCoordinate.rx(),&mouseCoordinate.ry());
mouseCoordinate.rx()*=ratioX;
mouseCoordinate.ry()*=ratioY;
if (on_mouse) if (on_mouse)
{ on_mouse( cv_event, mouseCoordinate.x(),mouseCoordinate.y(), flags, on_mouse_param );
int a, b;
matrixWorld_inv.map(pt.x(),pt.y(),&a,&b);
a*=float(image2Draw->width)/float(width());
b*=float(image2Draw->height)/float(height());
on_mouse( cv_event, a, b, flags, on_mouse_param );
}
if (matrixWorld.m11()>1 && event->buttons() == Qt::LeftButton) if (matrixWorld.m11()>1 && event->buttons() == Qt::LeftButton)
...@@ -1307,23 +1391,39 @@ void ViewPort::mouseMoveEvent(QMouseEvent *event) ...@@ -1307,23 +1391,39 @@ void ViewPort::mouseMoveEvent(QMouseEvent *event)
moveView(dxy); moveView(dxy);
} }
//I update the statusbar here because if the user does a cvWaitkey(0) (like with inpaint.cpp)
//the status bar will be repaint only when a click occurs.
viewport()->update();
QWidget::mouseMoveEvent(event); QWidget::mouseMoveEvent(event);
} }
QSize ViewPort::sizeHint() const QSize ViewPort::sizeHint() const
{ {
if(image2Draw) //return QSize(width(),width()/2);
if(image2Draw_ipl)
{ {
return QSize(image2Draw->width,image2Draw->height); return QSize(image2Draw_ipl->width,image2Draw_ipl->height);
} else { } else {
return QGraphicsView::sizeHint(); return QGraphicsView::sizeHint();
} }
} }
QPoint ViewPort::computeOffset()
{
QSizeF t1(image2Draw_ipl->width, image2Draw_ipl->height);
QSizeF t2(width(),height());
t1.scale(t2.width(), t2.height(), Qt::KeepAspectRatio);
t2 = (t2 - t1)/2.0;
return QPoint(t2.width(),t2.height());
}
void ViewPort::resizeEvent ( QResizeEvent *event) void ViewPort::resizeEvent ( QResizeEvent *event)
{ {
controlImagePosition(); controlImagePosition();
ratioX=float(image2Draw_ipl->width)/float(width());
ratioY=float(image2Draw_ipl->height)/float(height());
return QGraphicsView::resizeEvent(event); return QGraphicsView::resizeEvent(event);
} }
...@@ -1354,6 +1454,13 @@ void ViewPort::paintEvent(QPaintEvent* event) ...@@ -1354,6 +1454,13 @@ void ViewPort::paintEvent(QPaintEvent* event)
drawOverview(&myPainter); drawOverview(&myPainter);
} }
//for statusbar
if (mouseCoordinate.x()>=0 && mouseCoordinate.y()>=0 &&
mouseCoordinate.x()<image2Draw_ipl->width && mouseCoordinate.y()<image2Draw_ipl->height)
{
drawStatusBar();
}
//for information overlay //for information overlay
if (drawInfo) if (drawInfo)
{ {
...@@ -1366,8 +1473,21 @@ void ViewPort::paintEvent(QPaintEvent* event) ...@@ -1366,8 +1473,21 @@ void ViewPort::paintEvent(QPaintEvent* event)
void ViewPort::draw2D(QPainter *painter) void ViewPort::draw2D(QPainter *painter)
{ {
QImage image((uchar*) image2Draw->imageData, image2Draw->width, image2Draw->height,QImage::Format_RGB888); image2Draw_qt = QImage((uchar*) image2Draw_ipl->imageData, image2Draw_ipl->width, image2Draw_ipl->height,QImage::Format_RGB888);
painter->drawImage(0,0,image.scaled(this->width(),this->height(),Qt::IgnoreAspectRatio,Qt::SmoothTransformation)); painter->drawImage(deltaOffset.x(),deltaOffset.y(),image2Draw_qt.scaled(this->width(),this->height(),modeRatio,Qt::SmoothTransformation));
}
void ViewPort::drawStatusBar()
{
//CvScalar value = cvGet2D(image2Draw_ipl,mouseCoordinate.y(),mouseCoordinate.x());
QRgb rgbValue = image2Draw_qt.pixel(mouseCoordinate);
centralWidget->myBar_msg->setText(tr("<font color='black'>Coordinate: %1x%2 ~ </font>")
.arg(mouseCoordinate.x())
.arg(mouseCoordinate.y())+
tr("<font color='red'>R:%3 </font>").arg(qRed(rgbValue))+//.arg(value.val[0])+
tr("<font color='green'>G:%4 </font>").arg(qGreen(rgbValue))+//.arg(value.val[1])+
tr("<font color='blue'>B:%5</font>").arg(qBlue(rgbValue))//.arg(value.val[2])
);
} }
void ViewPort::drawOverview(QPainter *painter) void ViewPort::drawOverview(QPainter *painter)
......
modules/highgui/src/window_QT.h
View file @ f69514ee
...@@ -66,6 +66,7 @@ ...@@ -66,6 +66,7 @@
#include <QLabel> #include <QLabel>
#include <QIODevice> #include <QIODevice>
#include <QShortcut> #include <QShortcut>
#include <QStatusBar>
//Macro here //Macro here
#define CV_MODE_NORMAL 0 #define CV_MODE_NORMAL 0
...@@ -97,6 +98,7 @@ public slots: ...@@ -97,6 +98,7 @@ public slots:
void resizeWindow(QString name, int width, int height); void resizeWindow(QString name, int width, int height);
void showImage(QString name, void* arr); void showImage(QString name, void* arr);
void displayInfo( QString name, QString text, int delayms ); void displayInfo( QString name, QString text, int delayms );
void displayStatusBar( QString name, QString text, int delayms );
void refreshEvents(); void refreshEvents();
void timeOut(); void timeOut();
void toggleFullScreen(QString name, double flags ); void toggleFullScreen(QString name, double flags );
...@@ -129,6 +131,15 @@ private: ...@@ -129,6 +131,15 @@ private:
int* dataSlider; int* dataSlider;
}; };
class CustomLayout : public QVBoxLayout
{
Q_OBJECT
public:
CustomLayout();
int heightForWidth ( int w ) const;
bool hasHeightForWidth () const;
};
class CvWindow : public QWidget class CvWindow : public QWidget
{ {
Q_OBJECT Q_OBJECT
...@@ -139,10 +150,14 @@ public: ...@@ -139,10 +150,14 @@ public:
void setMouseCallBack(CvMouseCallback m, void* param); void setMouseCallBack(CvMouseCallback m, void* param);
void updateImage(void* arr); void updateImage(void* arr);
void displayInfo(QString text, int delayms ); void displayInfo(QString text, int delayms );
void displayStatusBar(QString text, int delayms );
QPointer<QBoxLayout> layout;
QString name; QString name;
int flags; int flags;
QPointer<QBoxLayout> layout;
QPointer<QStatusBar> myBar;
QPointer<QLabel> myBar_msg;
//QPointer<CustomLayout> layout;
protected: protected:
void readSettings(); void readSettings();
...@@ -169,12 +184,15 @@ class ViewPort : public QGraphicsView ...@@ -169,12 +184,15 @@ class ViewPort : public QGraphicsView
{ {
Q_OBJECT Q_OBJECT
public: public:
ViewPort(QWidget* centralWidget, int mode = CV_MODE_NORMAL); ViewPort(CvWindow* centralWidget, int mode = CV_MODE_NORMAL, bool keepRatio = true);
~ViewPort(); ~ViewPort();
void updateImage(void* arr); void updateImage(void* arr);
void startDisplayInfo(QString text, int delayms); void startDisplayInfo(QString text, int delayms);
void setMouseCallBack(CvMouseCallback m, void* param); void setMouseCallBack(CvMouseCallback m, void* param);
IplImage* image2Draw_ipl;
QImage image2Draw_qt;
public slots: public slots:
//reference: //reference:
//http://www.qtcentre.org/wiki/index.php?title=QGraphicsView:_Smooth_Panning_and_Zooming //http://www.qtcentre.org/wiki/index.php?title=QGraphicsView:_Smooth_Panning_and_Zooming
...@@ -191,22 +209,25 @@ public slots: ...@@ -191,22 +209,25 @@ public slots:
void resizeEvent ( QResizeEvent * ); void resizeEvent ( QResizeEvent * );
private: private:
QGraphicsScene *myScene; Qt::AspectRatioMode modeRatio;
QPoint deltaOffset;
QPoint computeOffset();
QPoint mouseCoordinate;
QPointF positionGrabbing; QPointF positionGrabbing;
QRect positionCorners; QRect positionCorners;
QTransform matrixWorld; QTransform matrixWorld;
QTransform matrixWorld_inv; QTransform matrixWorld_inv;
float ratioX, ratioY;
CvMouseCallback on_mouse; CvMouseCallback on_mouse;
void* on_mouse_param; void* on_mouse_param;
int mode; int mode;
IplImage* image2Draw; bool keepRatio;
bool isSameSize(IplImage* img1,IplImage* img2); bool isSameSize(IplImage* img1,IplImage* img2);
QSize sizeHint() const; QSize sizeHint() const;
QPointer<QWidget> centralWidget; QPointer<CvWindow> centralWidget;
QPointer<QTimer> timerDisplay; QPointer<QTimer> timerDisplay;
bool drawInfo; bool drawInfo;
QString infoText; QString infoText;
...@@ -221,6 +242,7 @@ private: ...@@ -221,6 +242,7 @@ private:
void drawInstructions(QPainter *painter); void drawInstructions(QPainter *painter);
void drawOverview(QPainter *painter); void drawOverview(QPainter *painter);
void draw2D(QPainter *painter); void draw2D(QPainter *painter);
void drawStatusBar();
void controlImagePosition(); void controlImagePosition();
#if defined(OPENCV_GL) #if defined(OPENCV_GL)
......
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