Skip to content

Q
qgroundcontrol
Commit bb3a268d authored by Don Gagne's avatar Don Gagne
Browse files
Options

Merge pull request #1391 from dogmaphobic/cleanupToolbar 

Removing old Tool Bar code.
parents 04a12284 33092084
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 918 deletions
qgroundcontrol.pro
View file @ bb3a268d
......@@ -425,7 +425,6 @@ HEADERS += \
src/ui/map/QGCMapTool.h \
src/ui/map/QGCMapToolBar.h \
src/QGCGeo.h \
src/ui/QGCToolBar.h \
src/ui/QGCMAVLinkInspector.h \
src/ui/MAVLinkDecoder.h \
src/ui/WaypointViewOnlyView.h \
......@@ -571,7 +570,6 @@ SOURCES += \
src/ui/map/Waypoint2DIcon.cc \
src/ui/map/QGCMapTool.cc \
src/ui/map/QGCMapToolBar.cc \
src/ui/QGCToolBar.cc \
src/ui/QGCMAVLinkInspector.cc \
src/ui/MAVLinkDecoder.cc \
src/ui/WaypointViewOnlyView.cc \
......
src/qgcunittest/MainWindowTest.cc
View file @ bb3a268d
......@@ -27,7 +27,6 @@
/// @author Don Gagne <don@thegagnes.com>
#include "MainWindowTest.h"
#include "QGCToolBar.h"
#include "MockLink.h"
#include "QGCMessageBox.h"
......
src/ui/MainWindow.h
View file @ bb3a268d
......@@ -61,7 +61,6 @@ This file is part of the QGROUNDCONTROL project
#include "QGCGoogleEarthView.h"
#endif
#include "MainToolBar.h"
#include "QGCToolBar.h"
#include "LogCompressor.h"
#include "QGCMAVLinkInspector.h"
......@@ -255,8 +254,6 @@ protected:
QPointer<QGCFirmwareUpdate> firmwareUpdateWidget;
QPointer<MainToolBar> _mainToolBar;
QPointer<QGCToolBar> toolBar;
QPointer<QDockWidget> mavlinkInspectorWidget;
QPointer<MAVLinkDecoder> mavlinkDecoder;
QPointer<QDockWidget> mavlinkSenderWidget;
......
src/ui/QGCToolBar.cc deleted 100644 → 0
View file @ 04a12284
/*=====================================================================
QGroundControl Open Source Ground Control Station
(c) 2009 - 2011 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
This file is part of the QGROUNDCONTROL project
QGROUNDCONTROL is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
QGROUNDCONTROL is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with QGROUNDCONTROL. If not, see <http://www.gnu.org/licenses/>.
======================================================================*/
#include <QToolButton>
#include <QLabel>
#include <QSpacerItem>
#include <QSerialPortInfo>
#include "SettingsDialog.h"
#include "QGCToolBar.h"
#include "UASManager.h"
#include "MainWindow.h"
#include "QGCApplication.h"
#include "UASMessageView.h"
#include "UASMessageHandler.h"
// Label class that sends mouse hover events
class QCGHoverLabel : public QLabel
{
public:
QCGHoverLabel(QGCToolBar* toolBar) : QLabel(toolBar)
{
_toolBar = toolBar;
}
protected:
void enterEvent(QEvent* event)
{
Q_UNUSED(event);
_toolBar->enterMessageLabel();
}
private:
QGCToolBar* _toolBar;
};
QGCToolBar::QGCToolBar(QWidget *parent) :
QToolBar(parent),
mav(NULL),
changed(true),
batteryPercent(0),
batteryVoltage(0),
wpId(0),
wpDistance(0),
altitudeRel(0),
systemArmed(false),
currentLink(NULL),
firstAction(NULL),
_linkMgr(LinkManager::instance()),
_linkCombo(NULL),
_linkComboAction(NULL),
_rollDownMessages(NULL),
_linksConnected(false),
_linkSelected(false)
{
setObjectName("QGCToolBar");
setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
connect(LinkManager::instance(), &LinkManager::linkConnected, this, &QGCToolBar::_linkConnected);
connect(LinkManager::instance(), &LinkManager::linkDisconnected, this, &QGCToolBar::_linkDisconnected);
connect(LinkManager::instance(), &LinkManager::linkConfigurationChanged, this, &QGCToolBar::_updateConfigurations);
}
void QGCToolBar::heartbeatTimeout(bool timeout, unsigned int ms)
{
// set timeout label visible
if (timeout)
{
// Alternate colors to increase visibility
if ((ms / 1000) % 2 == 0)
{
toolBarTimeoutLabel->setStyleSheet(QString("QLabel {color: #000; background-color: #FF0037;}"));
}
else
{
toolBarTimeoutLabel->setStyleSheet(QString("QLabel {color: #FFF; background-color: #6B0017;}"));
}
toolBarTimeoutLabel->setText(tr("CONNECTION LOST: %1 s").arg((ms / 1000.0f), 2, 'f', 1, ' '));
toolBarTimeoutAction->setVisible(true);
toolBarMessageAction->setVisible(false);
toolBarBatteryBarAction->setVisible(false);
}
else
{
// Check if loss text is present, reset once
if (toolBarTimeoutAction->isVisible())
{
toolBarTimeoutAction->setVisible(false);
toolBarMessageAction->setVisible(true);
toolBarBatteryBarAction->setVisible(true);
}
}
}
void QGCToolBar::createUI()
{
// CREATE TOOLBAR ITEMS
// Add internal actions
// Add MAV widget
symbolLabel = new QLabel(this);
addWidget(symbolLabel);
toolBarNameLabel = new QLabel(this);
toolBarNameLabel->setToolTip(tr("Currently controlled vehicle"));
toolBarNameLabel->setAlignment(Qt::AlignCenter);
toolBarNameLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
addWidget(toolBarNameLabel);
toolBarTimeoutLabel = new QLabel(this);
toolBarTimeoutLabel->setToolTip(tr("System timed out, interval since last message"));
toolBarTimeoutLabel->setAlignment(Qt::AlignCenter);
toolBarTimeoutLabel->setObjectName("toolBarTimeoutLabel");
toolBarTimeoutLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
toolBarTimeoutAction = addWidget(toolBarTimeoutLabel);
toolBarSafetyLabel = new QLabel(this);
toolBarSafetyLabel->setToolTip(tr("Vehicle safety state"));
toolBarSafetyLabel->setAlignment(Qt::AlignCenter);
addWidget(toolBarSafetyLabel);
toolBarModeLabel = new QLabel(this);
toolBarModeLabel->setToolTip(tr("Vehicle mode"));
toolBarModeLabel->setObjectName("toolBarModeLabel");
toolBarModeLabel->setAlignment(Qt::AlignCenter);
addWidget(toolBarModeLabel);
// toolBarStateLabel = new QLabel(this);
// toolBarStateLabel->setToolTip(tr("Vehicle state"));
// toolBarStateLabel->setObjectName("toolBarStateLabel");
// toolBarStateLabel->setAlignment(Qt::AlignCenter);
// addWidget(toolBarStateLabel);
toolBarBatteryBar = new QProgressBar(this);
toolBarBatteryBar->setMinimum(0);
toolBarBatteryBar->setMaximum(100);
toolBarBatteryBar->setMinimumWidth(20);
toolBarBatteryBar->setMaximumWidth(100);
toolBarBatteryBar->setToolTip(tr("Battery charge level"));
toolBarBatteryBar->setObjectName("toolBarBatteryBar");
toolBarBatteryBar->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::MinimumExpanding);
toolBarBatteryBarAction = addWidget(toolBarBatteryBar);
toolBarBatteryVoltageLabel = new QLabel(this);
toolBarBatteryVoltageLabel->setToolTip(tr("Battery voltage"));
toolBarBatteryVoltageLabel->setObjectName("toolBarBatteryVoltageLabel");
toolBarBatteryVoltageLabel->setAlignment(Qt::AlignCenter);
toolBarBatteryVoltageAction = addWidget(toolBarBatteryVoltageLabel);
toolBarWpLabel = new QLabel(this);
toolBarWpLabel->setToolTip(tr("Current waypoint"));
toolBarWpLabel->setObjectName("toolBarWpLabel");
toolBarWpLabel->setAlignment(Qt::AlignCenter);
toolBarWpAction = addWidget(toolBarWpLabel);
toolBarMessageLabel = new QCGHoverLabel(this);
toolBarMessageLabel->setToolTip(tr("Most recent system message"));
toolBarMessageLabel->setObjectName("toolBarMessageLabel");
toolBarMessageAction = addWidget(toolBarMessageLabel);
QWidget* spacer = new QWidget();
spacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
addWidget(spacer);
// Links to connect to
_linkCombo = new QComboBox(this);
connect(_linkCombo, SIGNAL(activated(int)), SLOT(_linkComboActivated(int)));
_linkCombo->setToolTip(tr("Choose the link to use"));
_linkCombo->setEnabled(true);
_linkCombo->setMinimumWidth(160);
_linkComboAction = addWidget(_linkCombo);
_updateConfigurations();
_connectButton = new QPushButton(tr("Connect"), this);
_connectButton->setObjectName("connectButton");
addWidget(_connectButton);
connect(_connectButton, &QPushButton::clicked, this, &QGCToolBar::_connectButtonClicked);
resetToolbarUI();
// DONE INITIALIZING BUTTONS
// Set the toolbar to be updated every 2s
connect(&updateViewTimer, SIGNAL(timeout()), this, SLOT(updateView()));
// Configure the toolbar for the current default UAS
setActiveUAS(UASManager::instance()->getActiveUAS());
connect(UASManager::instance(), SIGNAL(activeUASSet(UASInterface*)), this, SLOT(setActiveUAS(UASInterface*)));
toolBarMessageAction->setVisible(false);
toolBarBatteryBarAction->setVisible(false);
changed = false;
}
/**
* Reset all the labels and stuff for the toolbar to a pristine state. Done at startup after
* all UI has been created and also when the last UAS has been deleted.
**/
void QGCToolBar::resetToolbarUI()
{
toolBarNameLabel->setText("------");
toolBarNameLabel->setStyleSheet("");
toolBarTimeoutLabel->setText(tr("UNCONNECTED"));
//toolBarTimeoutLabel->show();
toolBarSafetyLabel->setText("----");
toolBarModeLabel->setText("------");
// toolBarStateLabel->setText("------");
toolBarBatteryBar->setValue(0);
toolBarBatteryBar->setDisabled(true);
toolBarBatteryVoltageLabel->setText("xx.x V");
toolBarWpLabel->setText("WP--");
toolBarMessageLabel->clear();
lastSystemMessage = "";
lastSystemMessageTimeMs = 0;
symbolLabel->setStyleSheet("");
symbolLabel->clear();
toolBarMessageAction->setVisible(false);
toolBarBatteryBarAction->setVisible(false);
}
void QGCToolBar::setPerspectiveChangeActions(const QList<QAction*> &actions)
{
if (actions.count() > 1)
{
group = new QButtonGroup(this);
group->setExclusive(true);
// Add the first button.
QToolButton *first = new QToolButton(this);
//first->setIcon(actions.first()->icon());
first->setText(actions.first()->text());
first->setToolTip(actions.first()->toolTip());
first->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
first->setCheckable(true);
connect(first, SIGNAL(clicked(bool)), actions.first(), SIGNAL(triggered(bool)));
connect(actions.first(),SIGNAL(triggered(bool)),first,SLOT(setChecked(bool)));
first->setObjectName("firstAction");
//first->setStyleSheet("QToolButton { min-height: 24px; max-height: 24px; min-width: 60px; color: #222222; background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #A2A3A4, stop: 1 #B6B7B8); margin-left: 8px; margin-right: 0px; padding-left: 4px; padding-right: 8px; border-radius: 0px; border : 0px solid blue; border-bottom-left-radius: 6px; border-top-left-radius: 6px; border-left: 1px solid #484848; border-top: 1px solid #484848; border-bottom: 1px solid #484848; } QToolButton:checked { background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #555555, stop: 1 #787878); color: #DDDDDD; }");
addWidget(first);
group->addButton(first);
// Add all the middle buttons.
for (int i = 1; i < actions.count(); i++)
{
QToolButton *btn = new QToolButton(this);
//btn->setIcon(actions.at(i)->icon());
btn->setText(actions.at(i)->text());
btn->setToolTip(actions.at(i)->toolTip());
btn->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
btn->setCheckable(true);
connect(btn, SIGNAL(clicked(bool)), actions.at(i), SIGNAL(triggered(bool)));
connect(actions.at(i),SIGNAL(triggered(bool)),btn,SLOT(setChecked(bool)));
addWidget(btn);
group->addButton(btn);
}
// Add last button
advancedButton = new QToolButton(this);
advancedButton->setIcon(QIcon(":/files/images/apps/utilities-system-monitor.svg"));
advancedButton->setText(tr("More"));
advancedButton->setToolTip(tr("Options for advanced users"));
advancedButton->setCheckable(true);
advancedButton->setObjectName("advancedButton");
advancedButton->setPopupMode(QToolButton::InstantPopup);
advancedButton->setToolButtonStyle(Qt::ToolButtonTextOnly);
addWidget(advancedButton);
group->addButton(advancedButton);
} else {
qDebug() << __FILE__ << __LINE__ << "Not enough perspective change actions provided";
}
// Add the "rest"
createUI();
}
void QGCToolBar::setPerspectiveChangeAdvancedActions(const QList<QAction*> &actions)
{
if (actions.count() > 1)
{
QMenu *menu = new QMenu(advancedButton);
for (int i = 0; i < actions.count(); i++)
{
menu->addAction(actions.at(i));
}
advancedButton->setMenu(menu);
connect(menu, SIGNAL(triggered(QAction*)), this, SLOT(advancedActivityTriggered(QAction*)));
} else {
qDebug() << __FILE__ << __LINE__ << "Not enough perspective change actions provided";
}
}
void QGCToolBar::advancedActivityTriggered(QAction* action)
{
if (action->isChecked())
advancedButton->setChecked(true);
}
void QGCToolBar::setActiveUAS(UASInterface* active)
{
// Do nothing if system is the same
if (mav == active || active == NULL)
return;
// If switching UASes, disconnect the only one.
if (mav)
{
disconnect(mav, SIGNAL(statusChanged(UASInterface*,QString,QString)), this, SLOT(updateState(UASInterface*,QString,QString)));
disconnect(mav, SIGNAL(modeChanged(int,QString,QString)), this, SLOT(updateMode(int,QString,QString)));
disconnect(mav, SIGNAL(nameChanged(QString)), this, SLOT(updateName(QString)));
disconnect(mav, SIGNAL(systemTypeSet(UASInterface*,uint)), this, SLOT(setSystemType(UASInterface*,uint)));
disconnect(mav, SIGNAL(textMessageReceived(int,int,int,QString)), this, SLOT(receiveTextMessage(int,int,int,QString)));
disconnect(mav, SIGNAL(batteryChanged(UASInterface*, double, double, double,int)), this, SLOT(updateBatteryRemaining(UASInterface*, double, double, double, int)));
disconnect(mav, SIGNAL(armingChanged(bool)), this, SLOT(updateArmingState(bool)));
disconnect(mav, SIGNAL(heartbeatTimeout(bool, unsigned int)), this, SLOT(heartbeatTimeout(bool,unsigned int)));
if (mav->getWaypointManager())
{
disconnect(mav->getWaypointManager(), SIGNAL(currentWaypointChanged(quint16)), this, SLOT(updateCurrentWaypoint(quint16)));
disconnect(mav->getWaypointManager(), SIGNAL(waypointDistanceChanged(double)), this, SLOT(updateWaypointDistance(double)));
}
}
else
{
// Only update the UI once a UAS has been selected.
updateViewTimer.start(2000);
}
// Connect new system
mav = active;
if (mav)
{
connect(mav, SIGNAL(statusChanged(UASInterface*,QString,QString)), this, SLOT(updateState(UASInterface*, QString,QString)));
connect(mav, SIGNAL(modeChanged(int,QString,QString)), this, SLOT(updateMode(int,QString,QString)));
connect(mav, SIGNAL(nameChanged(QString)), this, SLOT(updateName(QString)));
connect(mav, SIGNAL(systemTypeSet(UASInterface*,uint)), this, SLOT(setSystemType(UASInterface*,uint)));
connect(mav, SIGNAL(textMessageReceived(int,int,int,QString)), this, SLOT(receiveTextMessage(int,int,int,QString)));
connect(mav, SIGNAL(batteryChanged(UASInterface*,double,double,double,int)), this, SLOT(updateBatteryRemaining(UASInterface*,double,double,double,int)));
connect(mav, SIGNAL(armingChanged(bool)), this, SLOT(updateArmingState(bool)));
connect(mav, SIGNAL(heartbeatTimeout(bool, unsigned int)), this, SLOT(heartbeatTimeout(bool,unsigned int)));
if (mav->getWaypointManager())
{
connect(mav->getWaypointManager(), SIGNAL(currentWaypointChanged(quint16)), this, SLOT(updateCurrentWaypoint(quint16)));
connect(mav->getWaypointManager(), SIGNAL(waypointDistanceChanged(double)), this, SLOT(updateWaypointDistance(double)));
}
// Update all values once
systemName = mav->getUASName();
systemArmed = mav->isArmed();
toolBarNameLabel->setText(mav->getUASName().replace("MAV", ""));
toolBarNameLabel->setStyleSheet(QString("QLabel {color: %1;}").arg(mav->getColor().name()));
symbolLabel->setStyleSheet(QString("QWidget {background-color: %1;}").arg(mav->getColor().name()));
QString shortMode = mav->getShortMode();
shortMode = shortMode.replace("D|", "");
shortMode = shortMode.replace("A|", "");
toolBarModeLabel->setText(shortMode);
// toolBarStateLabel->setText(mav->getShortState());
toolBarTimeoutAction->setVisible(false);
toolBarMessageLabel->clear();
lastSystemMessageTimeMs = 0;
toolBarBatteryBar->setEnabled(true);
setSystemType(mav, mav->getSystemType());
}
else
{
updateViewTimer.stop();
resetToolbarUI();
}
}
void QGCToolBar::updateArmingState(bool armed)
{
systemArmed = armed;
changed = true;
/* important, immediately update */
updateView();
}
void QGCToolBar::updateView()
{
if (!changed) return;
if (toolBarWpAction->isVisible())
toolBarWpLabel->setText(tr("WP%1").arg(wpId));
if (toolBarBatteryBarAction->isVisible()) {
toolBarBatteryBar->setValue(batteryPercent);
if (batteryPercent < 30 && toolBarBatteryBar->value() >= 30) {
toolBarBatteryBar->setStyleSheet(qgcApp()->styleIsDark() ?
"QProgressBar {color: #000} QProgressBar QProgressBar::chunk { background-color: #0F0}" :
"QProgressBar {color: #FFF} QProgressBar::chunk { background-color: #008000}");
} else if (batteryPercent >= 30 && toolBarBatteryBar->value() < 30){
toolBarBatteryBar->setStyleSheet(qgcApp()->styleIsDark() ?
"QProgressBar {color: #000} QProgressBar QProgressBar::chunk { background-color: #FF0}" :
"QProgressBar {color: #FFF} QProgressBar::chunk { background-color: #808000}");
}
}
if (toolBarBatteryVoltageLabel->isVisible()) {
toolBarBatteryVoltageLabel->setText(tr("%1 V").arg(batteryVoltage, 4, 'f', 1, ' '));
}
// toolBarStateLabel->setText(QString("%1").arg(state));
if (mode.size() > 0) {
toolBarModeLabel->setText(QString("%1").arg(mode));
}
toolBarNameLabel->setText(systemName);
// expire after 15 seconds
if (toolBarMessageAction->isVisible()) {
if (QGC::groundTimeMilliseconds() - lastSystemMessageTimeMs < 15000) {
toolBarMessageLabel->setText(QString("%1").arg(lastSystemMessage));
} else {
if(UASMessageHandler::instance()->messages().count()) {
toolBarMessageLabel->setText(tr("Messages"));
} else {
toolBarMessageLabel->setText(tr("No Messages"));
}
}
}
// Display the system armed state with a red-on-yellow background if armed or green text if safe.
if (systemArmed)
{
toolBarSafetyLabel->setStyleSheet(QString("QLabel {color: %1; background-color: %2; font-size: 15pt;}").arg(QGC::colorRed.name()).arg(QGC::colorYellow.name()));
toolBarSafetyLabel->setText(tr("ARMED"));
}
else
{
toolBarSafetyLabel->setStyleSheet(qgcApp()->styleIsDark() ?
"QLabel {color: #14C814; font-size: 15pt;}" :
"QLabel {color: #0D820D; font-size: 15pt;}");
toolBarSafetyLabel->setText(tr("DISARMED"));
}
changed = false;
}
void QGCToolBar::updateWaypointDistance(double distance)
{
if (wpDistance != distance) changed = true;
wpDistance = distance;
}
void QGCToolBar::updateCurrentWaypoint(quint16 id)
{
if (wpId != id) changed = true;
wpId = id;
}
void QGCToolBar::updateBatteryRemaining(UASInterface* uas, double voltage, double current, double percent, int seconds)
{
Q_UNUSED(uas);
Q_UNUSED(seconds);
Q_UNUSED(current);
if (batteryPercent != percent || batteryVoltage != voltage) changed = true;
batteryPercent = percent;
batteryVoltage = voltage;
}
void QGCToolBar::updateState(UASInterface* system, QString name, QString description)
{
Q_UNUSED(system);
Q_UNUSED(description);
if (state != name) changed = true;
state = name;
/* important, immediately update */
updateView();
}
void QGCToolBar::updateMode(int system, QString name, QString description)
{
Q_UNUSED(system);
Q_UNUSED(description);
if (name.size() == 0) {
qDebug() << "EMPTY MODE, RETURN";
}
QString shortMode = name;
shortMode = shortMode.replace("D|", "");
shortMode = shortMode.replace("A|", "");
if (mode != shortMode) changed = true;
mode = shortMode;
/* important, immediately update */
updateView();
}
void QGCToolBar::updateName(const QString& name)
{
if (systemName != name)
{
changed = true;
}
systemName = name;
}
/**
* The current system type is represented through the system icon.
*
* @param uas Source system, has to be the same as this->uas
* @param systemType type ID, following the MAVLink system type conventions
* @see http://pixhawk.ethz.ch/software/mavlink
*/
void QGCToolBar::setSystemType(UASInterface* uas, unsigned int systemType)
{
Q_UNUSED(uas);
QPixmap newPixmap;
switch (systemType) {
case MAV_TYPE_GENERIC:
newPixmap = QPixmap(":/files/images/mavs/generic.svg");
break;
case MAV_TYPE_FIXED_WING:
newPixmap = QPixmap(":/files/images/mavs/fixed-wing.svg");
break;
case MAV_TYPE_QUADROTOR:
newPixmap = QPixmap(":/files/images/mavs/quadrotor.svg");
break;
case MAV_TYPE_COAXIAL:
newPixmap = QPixmap(":/files/images/mavs/coaxial.svg");
break;
case MAV_TYPE_HELICOPTER:
newPixmap = QPixmap(":/files/images/mavs/helicopter.svg");
break;
case MAV_TYPE_ANTENNA_TRACKER:
newPixmap = QPixmap(":/files/images/mavs/antenna-tracker.svg");
break;
case MAV_TYPE_GCS:
newPixmap = QPixmap(":files/images/mavs/groundstation.svg");
break;
case MAV_TYPE_AIRSHIP:
newPixmap = QPixmap(":files/images/mavs/airship.svg");
break;
case MAV_TYPE_FREE_BALLOON:
newPixmap = QPixmap(":files/images/mavs/free-balloon.svg");
break;
case MAV_TYPE_ROCKET:
newPixmap = QPixmap(":files/images/mavs/rocket.svg");
break;
case MAV_TYPE_GROUND_ROVER:
newPixmap = QPixmap(":files/images/mavs/ground-rover.svg");
break;
case MAV_TYPE_SURFACE_BOAT:
newPixmap = QPixmap(":files/images/mavs/surface-boat.svg");
break;
case MAV_TYPE_SUBMARINE:
newPixmap = QPixmap(":files/images/mavs/submarine.svg");
break;
case MAV_TYPE_HEXAROTOR:
newPixmap = QPixmap(":files/images/mavs/hexarotor.svg");
break;
case MAV_TYPE_OCTOROTOR:
newPixmap = QPixmap(":files/images/mavs/octorotor.svg");
break;
case MAV_TYPE_TRICOPTER:
newPixmap = QPixmap(":files/images/mavs/tricopter.svg");
break;
case MAV_TYPE_FLAPPING_WING:
newPixmap = QPixmap(":files/images/mavs/flapping-wing.svg");
break;
case MAV_TYPE_KITE:
newPixmap = QPixmap(":files/images/mavs/kite.svg");
break;
default:
newPixmap = QPixmap(":/files/images/mavs/unknown.svg");
break;
}
symbolLabel->setPixmap(newPixmap.scaledToHeight(24));
}
void QGCToolBar::receiveTextMessage(int uasid, int componentid, int severity, QString text)
{
Q_UNUSED(uasid);
Q_UNUSED(componentid);
Q_UNUSED(severity);
if (lastSystemMessage != text) changed = true;
lastSystemMessage = text;
lastSystemMessageTimeMs = QGC::groundTimeMilliseconds();
}
void QGCToolBar::_linkConnected(LinkInterface* link)
{
Q_UNUSED(link);
_updateConnectButton();
}
void QGCToolBar::_linkDisconnected(LinkInterface* link)
{
_updateConnectButton(link);
}
void QGCToolBar::_updateConnectButton(LinkInterface *disconnectedLink)
{
QMenu* menu = new QMenu(this);
// If there are multiple connected links add/update the connect button menu
int connectedCount = 0;
QList<LinkInterface*> links = _linkMgr->getLinks();
foreach(LinkInterface* link, links) {
if (disconnectedLink != link && link->isConnected()) {
connectedCount++;
QAction* action = menu->addAction(link->getName());
action->setData(QVariant::fromValue((void*)link));
connect(action, &QAction::triggered, this, &QGCToolBar::_disconnectFromMenu);
}
}
// Remove old menu
QMenu* oldMenu = _connectButton->menu();
_connectButton->setMenu(NULL);
if (oldMenu) {
oldMenu->deleteLater();
}
// Add new menu if needed
if (connectedCount > 1) {
_connectButton->setMenu(menu);
} else {
delete menu;
}
_linksConnected = connectedCount != 0;
_connectButton->setText(_linksConnected ? tr("Disconnect") : tr("Connect"));
_linkComboAction->setVisible(!_linksConnected);
toolBarMessageAction->setVisible(_linksConnected);
toolBarWpAction->setVisible(_linksConnected);
}
void QGCToolBar::_connectButtonClicked(bool checked)
{
Q_UNUSED(checked);
if (_linksConnected) {
// Disconnect
// Should be just one connected link, disconnect it
int connectedCount = 0;
LinkInterface* connectedLink = NULL;
QList<LinkInterface*> links = _linkMgr->getLinks();
foreach(LinkInterface* link, links) {
if (link->isConnected()) {
connectedCount++;
connectedLink = link;
}
}
Q_ASSERT(connectedCount == 1);
Q_ASSERT(connectedLink);
// TODO The link is "disconnected" but not deleted. On subsequent connections,
// new links are created. Why's that?
_linkMgr->disconnectLink(connectedLink);
} else {
// We don't want the combo box updating under our feet
_linkMgr->suspendConfigurationUpdates(true);
// Connect
int valid = _linkCombo->currentData().toInt();
// Is this a valid option?
if(valid == 1) {
// Get the configuration name
QString confName = _linkCombo->currentText();
// Create a link for it
LinkInterface* link = _linkMgr->createConnectedLink(confName);
if(link) {
// Save last used connection
MainWindow::instance()->saveLastUsedConnection(confName);
}
_linkMgr->suspendConfigurationUpdates(false);
// Else, it must be Manage Links
} else if(valid == 0) {
_linkMgr->suspendConfigurationUpdates(false);
MainWindow::instance()->manageLinks();
}
}
}
void QGCToolBar::_disconnectFromMenu(bool checked)
{
Q_UNUSED(checked);
QAction* action = qobject_cast<QAction*>(sender());
Q_ASSERT(action);
LinkInterface* link = (LinkInterface*)(action->data().value<void *>());
Q_ASSERT(link);
_linkMgr->disconnectLink(link);
}
void QGCToolBar::_linkComboActivated(int index)
{
int type = _linkCombo->itemData(index).toInt();
// Check if we should "Manage Connections"
if(type == 0) {
MainWindow::instance()->manageLinks();
} else {
_linkSelected = true;
}
}
void QGCToolBar::_updateConfigurations()
{
bool resetSelected = false;
QString selected = _linkCombo->currentText();
_linkCombo->clear();
_linkCombo->addItem("Manage Links", 0);
QList<LinkConfiguration*> configs = LinkManager::instance()->getLinkConfigurationList();
foreach(LinkConfiguration* conf, configs) {
if(conf) {
_linkCombo->addItem(conf->name(), 1);
if(!_linkSelected && conf->isPreferred()) {
selected = conf->name();
resetSelected = true;
}
}
}
int index = _linkCombo->findText(selected);
if(index >= 0) {
_linkCombo->setCurrentIndex(index);
}
if(resetSelected) {
_linkSelected = false;
}
}
/**
* @brief Mouse entered Message label area
*/
void QGCToolBar::enterMessageLabel()
{
/*
// If not already there and messages are actually present
if(!_rollDownMessages && UASMessageHandler::instance()->messages().count())
{
QPoint p = toolBarMessageLabel->mapToGlobal(QPoint(0,0));
_rollDownMessages = new UASMessageViewRollDown(MainWindow::instance(),this);
_rollDownMessages->setAttribute(Qt::WA_DeleteOnClose);
_rollDownMessages->move(mapFromGlobal(p));
_rollDownMessages->setMinimumSize(360,200);
_rollDownMessages->show();
}
*/
}
/**
* @brief Mouse left message drop down list area (and closed it)
*/
void QGCToolBar::leaveMessageView()
{
_rollDownMessages = NULL;
}
src/ui/QGCToolBar.h deleted 100644 → 0
View file @ 04a12284
/*=====================================================================
QGroundControl Open Source Ground Control Station
(c) 2009 - 2011 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
This file is part of the QGROUNDCONTROL project
QGROUNDCONTROL is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
QGROUNDCONTROL is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with QGROUNDCONTROL. If not, see <http://www.gnu.org/licenses/>.
======================================================================*/
#ifndef QGCTOOLBAR_H
#define QGCTOOLBAR_H
#include <QToolBar>
#include <QAction>
#include <QToolButton>
#include <QPushButton>
#include <QLabel>
#include <QProgressBar>
#include <QComboBox>
#include <QTimer>
#include "UASInterface.h"
#include "SerialLink.h"
#include "LinkManager.h"
class UASMessageViewRollDown;
class QGCToolBar : public QToolBar
{
Q_OBJECT
public:
explicit QGCToolBar(QWidget* parent = 0);
void setPerspectiveChangeActions(const QList<QAction*> &action);
void setPerspectiveChangeAdvancedActions(const QList<QAction*> &action);
/**
* @brief Mouse entered Message label area
*/
void enterMessageLabel();
/**
* @brief Mouse left message drop down list area (and closed it)
*/
void leaveMessageView();
public slots:
/** @brief Set the system that is currently displayed by this widget */
void setActiveUAS(UASInterface* active);
/** @brief Set the system state */
void updateState(UASInterface* system, QString name, QString description);
/** @brief Set the system mode */
void updateMode(int system, QString name, QString description);
/** @brief Update the system name */
void updateName(const QString& name);
/** @brief Set the MAV system type */
void setSystemType(UASInterface* uas, unsigned int systemType);
/** @brief Received system text message */
void receiveTextMessage(int uasid, int componentid, int severity, QString text);
/** @brief Update battery charge state */
void updateBatteryRemaining(UASInterface* uas, double voltage, double current, double percent, int seconds);
/** @brief Update current waypoint */
void updateCurrentWaypoint(quint16 id);
/** @brief Update distance to current waypoint */
void updateWaypointDistance(double distance);
/** @brief Update arming state */
void updateArmingState(bool armed);
/** @brief Repaint widgets */
void updateView();
/** @brief Update connection timeout time */
void heartbeatTimeout(bool timeout, unsigned int ms);
/** @brief Set an activity action as checked in menu */
void advancedActivityTriggered(QAction* action);
protected:
void createUI();
void resetToolbarUI();
UASInterface* mav;
QLabel* symbolLabel;
QLabel* toolBarNameLabel;
QLabel* toolBarTimeoutLabel;
QAction* toolBarTimeoutAction; ///< Needed to set label (in)visible.
QAction* toolBarMessageAction;
QAction* toolBarWpAction;
QAction* toolBarBatteryBarAction;
QAction* toolBarBatteryVoltageAction;
QLabel* toolBarSafetyLabel;
QLabel* toolBarModeLabel;
QLabel* toolBarStateLabel;
QLabel* toolBarWpLabel;
QLabel* toolBarMessageLabel;
QProgressBar* toolBarBatteryBar;
QLabel* toolBarBatteryVoltageLabel;
bool changed;
float batteryPercent;
float batteryVoltage;
int wpId;
double wpDistance;
float altitudeRel;
QString state;
QString mode;
QString systemName;
QString lastSystemMessage;
quint64 lastSystemMessageTimeMs;
QTimer updateViewTimer;
bool systemArmed;
LinkInterface* currentLink;
QAction* firstAction;
QToolButton *advancedButton;
QButtonGroup *group;
private slots:
void _linkConnected(LinkInterface* link);
void _linkDisconnected(LinkInterface* link);
void _disconnectFromMenu(bool checked);
void _connectButtonClicked(bool checked);
void _linkComboActivated(int index);
void _updateConfigurations();
private:
void _updateConnectButton(LinkInterface* disconnectedLink = NULL);
LinkManager* _linkMgr;
QComboBox* _linkCombo;
QAction* _linkComboAction;
UASMessageViewRollDown* _rollDownMessages;
QPushButton* _connectButton;
bool _linksConnected;
bool _linkSelected; // User selected a link. Stop autoselecting it.
};
#endif // QGCTOOLBAR_H
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment