Skip to content
Snippets Groups Projects
Commit 4a078f99 authored by Lorenz Meier's avatar Lorenz Meier
Browse files

Added connect button, added 15 seconds timeout on system messages

parent e6ffde7c
No related branches found
No related tags found
No related merge requests found
...@@ -110,7 +110,6 @@ QGCToolBar::QGCToolBar(QWidget *parent) : ...@@ -110,7 +110,6 @@ QGCToolBar::QGCToolBar(QWidget *parent) :
addWidget(toolBarMessageLabel); addWidget(toolBarMessageLabel);
connectButton = new QPushButton(tr("Connect"), this); connectButton = new QPushButton(tr("Connect"), this);
connectButton->setCheckable(true);
connectButton->setToolTip(tr("Connect wireless link to MAV")); connectButton->setToolTip(tr("Connect wireless link to MAV"));
addWidget(connectButton); addWidget(connectButton);
connect(connectButton, SIGNAL(clicked(bool)), this, SLOT(connectLink(bool))); connect(connectButton, SIGNAL(clicked(bool)), this, SLOT(connectLink(bool)));
...@@ -309,7 +308,12 @@ void QGCToolBar::updateView() ...@@ -309,7 +308,12 @@ void QGCToolBar::updateView()
toolBarStateLabel->setText(tr("%1").arg(state)); toolBarStateLabel->setText(tr("%1").arg(state));
toolBarModeLabel->setText(tr("%1").arg(mode)); toolBarModeLabel->setText(tr("%1").arg(mode));
toolBarNameLabel->setText(systemName); toolBarNameLabel->setText(systemName);
// expire after 15 seconds
if (QGC::groundTimeMilliseconds() - lastSystemMessageTimeMs < 15000) {
toolBarMessageLabel->setText(lastSystemMessage); toolBarMessageLabel->setText(lastSystemMessage);
} else {
toolBarMessageLabel->setText("");
}
if (systemArmed) if (systemArmed)
{ {
...@@ -454,6 +458,8 @@ void QGCToolBar::receiveTextMessage(int uasid, int componentid, int severity, QS ...@@ -454,6 +458,8 @@ void QGCToolBar::receiveTextMessage(int uasid, int componentid, int severity, QS
Q_UNUSED(severity); Q_UNUSED(severity);
if (lastSystemMessage != text) changed = true; if (lastSystemMessage != text) changed = true;
lastSystemMessage = text; lastSystemMessage = text;
lastSystemMessageTimeMs = QGC::groundTimeMilliseconds();
QTimer::singleShot(16000, this, SLOT(clearStatusString()));
} }
void QGCToolBar::connectLink(bool connect) void QGCToolBar::connectLink(bool connect)
...@@ -481,6 +487,12 @@ void QGCToolBar::connectLink(bool connect) ...@@ -481,6 +487,12 @@ void QGCToolBar::connectLink(bool connect)
} }
void QGCToolBar::clearStatusString()
{
lastSystemMessage = "";
changed = true;
}
QGCToolBar::~QGCToolBar() QGCToolBar::~QGCToolBar()
{ {
if (toggleLoggingAction) toggleLoggingAction->deleteLater(); if (toggleLoggingAction) toggleLoggingAction->deleteLater();
......
...@@ -75,6 +75,8 @@ public slots: ...@@ -75,6 +75,8 @@ public slots:
void heartbeatTimeout(bool timeout, unsigned int ms); void heartbeatTimeout(bool timeout, unsigned int ms);
/** @brief Create or connect link */ /** @brief Create or connect link */
void connectLink(bool connect); void connectLink(bool connect);
/** @brief Clear status string */
void clearStatusString();
protected: protected:
void createCustomWidgets(); void createCustomWidgets();
...@@ -104,6 +106,7 @@ protected: ...@@ -104,6 +106,7 @@ protected:
QString mode; QString mode;
QString systemName; QString systemName;
QString lastSystemMessage; QString lastSystemMessage;
quint64 lastSystemMessageTimeMs;
QTimer updateViewTimer; QTimer updateViewTimer;
bool systemArmed; bool systemArmed;
}; };
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment