Commit 33092084 authored by dogmaphobic's avatar dogmaphobic

Removing old Tool Bar code.

parent aa1b3191
......@@ -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/ \
src/ui/map/ \
src/ui/map/ \
src/ui/ \
src/ui/ \
src/ui/ \
src/ui/ \
......@@ -27,7 +27,6 @@
/// @author Don Gagne <>
#include "MainWindowTest.h"
#include "QGCToolBar.h"
#include "MockLink.h"
#include "QGCMessageBox.h"
......@@ -61,7 +61,6 @@ This file is part of the QGROUNDCONTROL project
#include "QGCGoogleEarthView.h"
#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;
This diff is collapsed.
QGroundControl Open Source Ground Control Station
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
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 <>.
#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
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);
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();
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