diff --git a/src/ui/SlugsVideoCamControl.cpp b/src/ui/SlugsVideoCamControl.cpp index ed9ac5e3eb8335705480895b867a1689df8eed63..3d6338b03789197fb27370be521b01e56b10a73f 100644 --- a/src/ui/SlugsVideoCamControl.cpp +++ b/src/ui/SlugsVideoCamControl.cpp @@ -12,7 +12,8 @@ SlugsVideoCamControl::SlugsVideoCamControl(QWidget *parent) : QWidget(parent), - ui(new Ui::SlugsVideoCamControl) + ui(new Ui::SlugsVideoCamControl), + dragging(0) { ui->setupUi(this); @@ -42,7 +43,7 @@ void SlugsVideoCamControl::mouseMoveEvent(QMouseEvent *event) QPoint bR = ui->widget->frameGeometry().bottomRight(); if (!(event->x() > bR.x() || event->x() < tL.x() || - event->y() > bR.y() || event->y() < tL.y() )){ + event->y() > bR.y() || event->y() < tL.y() ) && dragging){ ui->label_x->setText(QString::number(event->x())); ui->label_y->setText(QString::number(event->y())); } @@ -50,15 +51,17 @@ void SlugsVideoCamControl::mouseMoveEvent(QMouseEvent *event) } -//void SlugsVideoCamControl::mousePressEvent(QMouseEvent *evnt) -//{ - -//} +void SlugsVideoCamControl::mousePressEvent(QMouseEvent *evnt) +{ + Q_UNUSED(evnt); -//void SlugsVideoCamControl::mouseReleaseEvent(QMouseEvent *evnt) -//{ + dragging = true; +} -//} +void SlugsVideoCamControl::mouseReleaseEvent(QMouseEvent *evnt) +{ +dragging = false; +} //void SlugsVideoCamControl::mouseDoubleClickEvent(QMouseEvent *evnt) //{ diff --git a/src/ui/SlugsVideoCamControl.h b/src/ui/SlugsVideoCamControl.h index 5e09a27274ef13376be6b90f2f10f3bfb86d71f8..fe7b247507052614eafdebd0625350a2fbbcdea9 100644 --- a/src/ui/SlugsVideoCamControl.h +++ b/src/ui/SlugsVideoCamControl.h @@ -21,8 +21,8 @@ public: ~SlugsVideoCamControl(); protected: - // virtual void mousePressEvent(QMouseEvent* event); - //virtual void mouseReleaseEvent(QMouseEvent* event); + virtual void mousePressEvent(QMouseEvent* event); + virtual void mouseReleaseEvent(QMouseEvent* event); //void mouseMoveEvent(QMouseEvent* event); void mouseMoveEvent(QMouseEvent* event); // virtual void wheelEvent(QWheelEvent* event); @@ -33,6 +33,7 @@ protected: private: Ui::SlugsVideoCamControl *ui; + bool dragging; }; #endif // SLUGSVIDEOCAMCONTROL_H