Skip to content

Commit 7d48aee

Browse files
authored
Merge pull request #340 from githubdoe/blinkrate
merged.
2 parents e8c7dc3 + 2fb0a14 commit 7d48aee

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

ronchicomparedialog.cpp

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,18 @@ RonchiCompareDialog::RonchiCompareDialog(const QImage& img1, const QString& name
5959

6060
m_saveBtn = new QPushButton(tr("Save This Comparison Image"));
6161
QPushButton* blinkBtn = new QPushButton(tr("Blink"));
62+
6263
mainLayout->addWidget(m_saveBtn);
6364

6465
blinkLayout->addSpacerItem( new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Expanding));
6566
blinkLayout->addWidget(blinkBtn);
67+
m_speedSlider = new QSlider(Qt::Horizontal, this);
68+
m_speedSlider->setRange(50, 1500);
69+
m_speedSlider->setValue(250);
70+
m_speedSlider->hide();
71+
72+
73+
blinkLayout->addWidget(m_speedSlider);
6674
blinkLayout->addSpacerItem( new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Expanding));
6775
mainLayout->addLayout(blinkLayout);
6876
blinkTimer = new QTimer(this);
@@ -90,13 +98,16 @@ void RonchiCompareDialog::startBlink(){
9098
blinking = false;
9199
m_slider->show();
92100
m_saveBtn->show();
101+
m_speedSlider->hide();
93102
m_info->setText(tr("Blend Ratio (Slide to compare difference):"));
94103
}
95104
else {
96105
blinking = true;
97106
blinkTimer->start(300);
98107
m_slider->hide();
99108
m_saveBtn->hide();
109+
m_speedSlider->show();
110+
100111
}
101112
}
102113

@@ -110,7 +121,7 @@ void RonchiCompareDialog::blink(){
110121
m_displayLabel->setPixmap(QPixmap::fromImage(m_q2));
111122
m_info->setText(m_compLabel->text());
112123
}
113-
blinkTimer->start(300);
124+
blinkTimer->start(m_speedSlider->value());
114125
}
115126

116127
cv::Mat RonchiCompareDialog::qImageToMat(const QImage& image)

ronchicomparedialog.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ private slots:
2222
void startBlink();
2323
void blink();
2424

25+
2526
private:
2627
cv::Mat qImageToMat(const QImage& image);
2728

@@ -37,6 +38,7 @@ private slots:
3738
bool blinking = false;
3839
QTimer *blinkTimer;
3940
QPushButton* m_saveBtn;
41+
QSlider* m_speedSlider;
4042
};
4143

4244
#endif // RONCHICOMPAREDIALOG_H

0 commit comments

Comments
 (0)