From a54b8634d390d2ca3e4015cd43fbd00d663fce24 Mon Sep 17 00:00:00 2001
From: Benjamin Wild <b.w@fu-berlin.de>
Date: Wed, 16 Mar 2016 18:49:42 +0100
Subject: [PATCH] update interface
---
SampleTracker.cpp | 44 +++++++++++++++++---------------------------
SampleTracker.h | 5 -----
2 files changed, 17 insertions(+), 32 deletions(-)
diff --git a/SampleTracker.cpp b/SampleTracker.cpp
index 0a0c202..fa49424 100644
--- a/SampleTracker.cpp
+++ b/SampleTracker.cpp
@@ -19,7 +19,6 @@ extern "C" {
SampleTracker::SampleTracker(Settings &settings)
: TrackingAlgorithm(settings)
- , _toolsFrame(std::make_shared<QFrame>())
, _showSelectorRec(false)
, _showOriginal(false)
, _lowH(0)
@@ -28,7 +27,6 @@ SampleTracker::SampleTracker(Settings &settings)
, _highS(255)
, _lowV(0)
, _highV(255) {
- initParamsFrame();
initToolsFrame();
_currentView="";
_imageChanged=false;
@@ -140,33 +138,24 @@ void SampleTracker::mouseWheelEvent(QWheelEvent *) {}
return _toolsFrame;
}*/
-std::shared_ptr<QWidget> SampleTracker::getToolsWidget() {
- return _toolsFrame;
-}
-
void SampleTracker::initToolsFrame() {
- QFormLayout *layout = new QFormLayout(_toolsFrame.get());
- layout->addRow(_colorBut);
- _toolsFrame->setLayout(layout);
-}
-
+ new QTextEdit(getToolsWidget());
-void SampleTracker::initParamsFrame() {
- _lowHEdit = new QLineEdit(_toolsFrame.get());
- _highHEdit = new QLineEdit(_toolsFrame.get());
- _lowSEdit = new QLineEdit(_toolsFrame.get());
- _highSEdit = new QLineEdit(_toolsFrame.get());
- _lowVEdit = new QLineEdit(_toolsFrame.get());
- _highVEdit = new QLineEdit(_toolsFrame.get());
+ _lowHEdit = new QLineEdit(getToolsWidget());
+ _highHEdit = new QLineEdit(getToolsWidget());
+ _lowSEdit = new QLineEdit(getToolsWidget());
+ _highSEdit = new QLineEdit(getToolsWidget());
+ _lowVEdit = new QLineEdit(getToolsWidget());
+ _highVEdit = new QLineEdit(getToolsWidget());
- _colorBut = new QPushButton("change color!", _toolsFrame.get());
+ _colorBut = new QPushButton("change color!", getToolsWidget());
- _lowHEdit->setValidator(new QIntValidator(0, 255, _toolsFrame.get()));
- _highHEdit->setValidator(new QIntValidator(0, 255, _toolsFrame.get()));
- _lowSEdit->setValidator(new QIntValidator(0, 255, _toolsFrame.get()));
- _highSEdit->setValidator(new QIntValidator(0, 255, _toolsFrame.get()));
- _lowVEdit->setValidator(new QIntValidator(0, 255, _toolsFrame.get()));
- _highVEdit->setValidator(new QIntValidator(0, 255, _toolsFrame.get()));
+ _lowHEdit->setValidator(new QIntValidator(0, 255, getToolsWidget()));
+ _highHEdit->setValidator(new QIntValidator(0, 255, getToolsWidget()));
+ _lowSEdit->setValidator(new QIntValidator(0, 255, getToolsWidget()));
+ _highSEdit->setValidator(new QIntValidator(0, 255, getToolsWidget()));
+ _lowVEdit->setValidator(new QIntValidator(0, 255, getToolsWidget()));
+ _highVEdit->setValidator(new QIntValidator(0, 255, getToolsWidget()));
_lowHEdit->setText(QString::number(_lowH));
_highHEdit->setText(QString::number(_highH));
@@ -175,14 +164,15 @@ void SampleTracker::initParamsFrame() {
_lowVEdit->setText(QString::number(_lowV));
_highVEdit->setText(QString::number(_highV));
- QFormLayout *layout = new QFormLayout(_toolsFrame.get());
+ QFormLayout *layout = new QFormLayout(getToolsWidget());
layout->addRow("H-low", _lowHEdit);
layout->addRow("H-high", _highHEdit);
layout->addRow("S-low", _lowSEdit);
layout->addRow("S-high", _highSEdit);
layout->addRow("V-low", _lowVEdit);
layout->addRow("V-high", _highVEdit);
- _toolsFrame->setLayout(layout);
+
+ getToolsWidget()->setLayout(layout);
QObject::connect(this->_colorBut, SIGNAL(clicked()), this,
SLOT(changeFilterColor()));
diff --git a/SampleTracker.h b/SampleTracker.h
index c5222cd..aa45170 100644
--- a/SampleTracker.h
+++ b/SampleTracker.h
@@ -19,14 +19,10 @@ class SampleTracker : public TrackingAlgorithm {
void postConnect() override;
- std::shared_ptr<QWidget> getToolsWidget() override;
-
public Q_SLOTS:
void changeFilterColor();
private:
- std::shared_ptr<QFrame> _toolsFrame;
-
QPointF _selectorRecStart;
QPointF _selectorRecEnd;
@@ -58,7 +54,6 @@ class SampleTracker : public TrackingAlgorithm {
std::vector<TrackedObject> _trackedObjects;
void drawRectangle(QPainter *painter);
- void initParamsFrame();
void initToolsFrame();
private:
--
GitLab