rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-27 16:54:15 +01:00
Code Issues Releases Activity

OP-1458 Embed the delayed next QTimer in ConfigInputWidget

Browse Source
This commit is contained in:
Stefan Karlsson 2014-08-31 23:24:20 +02:00
parent a59e4defc5
commit 6633e788b1
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ground/openpilotgcs/src/plugins/config/configinputwidget.cpp
View File

@ -56,7 +56,7 @@ ConfigInputWidget::ConfigInputWidget(QWidget *parent) :
//
loop(NULL),
skipflag(false),
nextDelayedTimer(new QTimer()),
nextDelayedTimer(),
nextDelayedTick(0),
nextDelayedLatestActivityTick(0)
{
@ -462,8 +462,8 @@ void ConfigInputWidget::wzNextDelayed()
void ConfigInputWidget::wzNextDelayedStart()
{
// Call wzNextDelayed every 100 ms, to see if it's time to go to the next page.
connect(nextDelayedTimer, SIGNAL(timeout()), this, SLOT(wzNextDelayed()));
nextDelayedTimer->start(100);
connect(&nextDelayedTimer, SIGNAL(timeout()), this, SLOT(wzNextDelayed()));
nextDelayedTimer.start(100);
}
// Cancel the delayed next timer, if it's active.
@ -471,9 +471,9 @@ void ConfigInputWidget::wzNextDelayedCancel()
{
nextDelayedTick = 0;
nextDelayedLatestActivityTick = 0;
if (nextDelayedTimer->isActive()) {
nextDelayedTimer->stop();
disconnect(nextDelayedTimer, SIGNAL(timeout()), this, SLOT(wzNextDelayed()));
if (nextDelayedTimer.isActive()) {
nextDelayedTimer.stop();
disconnect(&nextDelayedTimer, SIGNAL(timeout()), this, SLOT(wzNextDelayed()));
}
}

2
ground/openpilotgcs/src/plugins/config/configinputwidget.h
View File

@ -97,7 +97,7 @@ private:
bool skipflag;
// Variables to support delayed transitions when detecting input controls.
QTimer *nextDelayedTimer;
QTimer nextDelayedTimer;
int nextDelayedTick;
int nextDelayedLatestActivityTick;