Skip to content
Snippets Groups Projects
Commit ab6d6c46 authored by justayak's avatar justayak
Browse files

#5 change functionality

parent 3137ca7f
No related branches found
No related tags found
No related merge requests found
...@@ -19,7 +19,6 @@ extern "C" { ...@@ -19,7 +19,6 @@ extern "C" {
SampleTracker::SampleTracker(Settings &settings, QWidget *parent) SampleTracker::SampleTracker(Settings &settings, QWidget *parent)
: TrackingAlgorithm(settings, parent) : TrackingAlgorithm(settings, parent)
, _paramsFrame(std::make_shared<QFrame>())
, _toolsFrame(std::make_shared<QFrame>()) , _toolsFrame(std::make_shared<QFrame>())
, _showSelectorRec(false) , _showSelectorRec(false)
, _showOriginal(false) , _showOriginal(false)
...@@ -143,7 +142,7 @@ void SampleTracker::mouseWheelEvent(QWheelEvent *) {} ...@@ -143,7 +142,7 @@ void SampleTracker::mouseWheelEvent(QWheelEvent *) {}
/*std::shared_ptr<QWidget> SampleTracker::getParamsWidget() { /*std::shared_ptr<QWidget> SampleTracker::getParamsWidget() {
return _paramsFrame; return _toolsFrame;
}*/ }*/
std::shared_ptr<QWidget> SampleTracker::getToolsWidget() { std::shared_ptr<QWidget> SampleTracker::getToolsWidget() {
...@@ -158,21 +157,21 @@ void SampleTracker::initToolsFrame() { ...@@ -158,21 +157,21 @@ void SampleTracker::initToolsFrame() {
void SampleTracker::initParamsFrame() { void SampleTracker::initParamsFrame() {
_lowHEdit = new QLineEdit(_paramsFrame.get()); _lowHEdit = new QLineEdit(_toolsFrame.get());
_highHEdit = new QLineEdit(_paramsFrame.get()); _highHEdit = new QLineEdit(_toolsFrame.get());
_lowSEdit = new QLineEdit(_paramsFrame.get()); _lowSEdit = new QLineEdit(_toolsFrame.get());
_highSEdit = new QLineEdit(_paramsFrame.get()); _highSEdit = new QLineEdit(_toolsFrame.get());
_lowVEdit = new QLineEdit(_paramsFrame.get()); _lowVEdit = new QLineEdit(_toolsFrame.get());
_highVEdit = new QLineEdit(_paramsFrame.get()); _highVEdit = new QLineEdit(_toolsFrame.get());
_colorBut = new QPushButton("change color!", _paramsFrame.get()); _colorBut = new QPushButton("change color!", _toolsFrame.get());
_lowHEdit->setValidator(new QIntValidator(0, 255, _paramsFrame.get())); _lowHEdit->setValidator(new QIntValidator(0, 255, _toolsFrame.get()));
_highHEdit->setValidator(new QIntValidator(0, 255, _paramsFrame.get())); _highHEdit->setValidator(new QIntValidator(0, 255, _toolsFrame.get()));
_lowSEdit->setValidator(new QIntValidator(0, 255, _paramsFrame.get())); _lowSEdit->setValidator(new QIntValidator(0, 255, _toolsFrame.get()));
_highSEdit->setValidator(new QIntValidator(0, 255, _paramsFrame.get())); _highSEdit->setValidator(new QIntValidator(0, 255, _toolsFrame.get()));
_lowVEdit->setValidator(new QIntValidator(0, 255, _paramsFrame.get())); _lowVEdit->setValidator(new QIntValidator(0, 255, _toolsFrame.get()));
_highVEdit->setValidator(new QIntValidator(0, 255, _paramsFrame.get())); _highVEdit->setValidator(new QIntValidator(0, 255, _toolsFrame.get()));
_lowHEdit->setText(QString::number(_lowH)); _lowHEdit->setText(QString::number(_lowH));
_highHEdit->setText(QString::number(_highH)); _highHEdit->setText(QString::number(_highH));
...@@ -181,14 +180,14 @@ void SampleTracker::initParamsFrame() { ...@@ -181,14 +180,14 @@ void SampleTracker::initParamsFrame() {
_lowVEdit->setText(QString::number(_lowV)); _lowVEdit->setText(QString::number(_lowV));
_highVEdit->setText(QString::number(_highV)); _highVEdit->setText(QString::number(_highV));
QFormLayout *layout = new QFormLayout(_paramsFrame.get()); QFormLayout *layout = new QFormLayout(_toolsFrame.get());
layout->addRow("H-low", _lowHEdit); layout->addRow("H-low", _lowHEdit);
layout->addRow("H-high", _highHEdit); layout->addRow("H-high", _highHEdit);
layout->addRow("S-low", _lowSEdit); layout->addRow("S-low", _lowSEdit);
layout->addRow("S-high", _highSEdit); layout->addRow("S-high", _highSEdit);
layout->addRow("V-low", _lowVEdit); layout->addRow("V-low", _lowVEdit);
layout->addRow("V-high", _highVEdit); layout->addRow("V-high", _highVEdit);
_paramsFrame->setLayout(layout); _toolsFrame->setLayout(layout);
QObject::connect(this->_colorBut, SIGNAL(clicked()), this, QObject::connect(this->_colorBut, SIGNAL(clicked()), this,
SLOT(changeFilterColor())); SLOT(changeFilterColor()));
......
...@@ -25,7 +25,6 @@ class SampleTracker : public TrackingAlgorithm { ...@@ -25,7 +25,6 @@ class SampleTracker : public TrackingAlgorithm {
void changeFilterColor(); void changeFilterColor();
private: private:
std::shared_ptr<QFrame> _paramsFrame;
std::shared_ptr<QFrame> _toolsFrame; std::shared_ptr<QFrame> _toolsFrame;
QPointF _selectorRecStart; QPointF _selectorRecStart;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment