Commit 501470b8 authored by Don Gagne's avatar Don Gagne

Remove DebugConsole

parent 886b40b5
...@@ -167,7 +167,6 @@ FORMS += \ ...@@ -167,7 +167,6 @@ FORMS += \
src/QGCQmlWidgetHolder.ui \ src/QGCQmlWidgetHolder.ui \
src/ui/configuration/SerialSettingsDialog.ui \ src/ui/configuration/SerialSettingsDialog.ui \
src/ui/configuration/terminalconsole.ui \ src/ui/configuration/terminalconsole.ui \
src/ui/DebugConsole.ui \
src/ui/HDDisplay.ui \ src/ui/HDDisplay.ui \
src/ui/Linechart.ui \ src/ui/Linechart.ui \
src/ui/MainWindow.ui \ src/ui/MainWindow.ui \
...@@ -278,7 +277,6 @@ HEADERS += \ ...@@ -278,7 +277,6 @@ HEADERS += \
src/ui/configuration/console.h \ src/ui/configuration/console.h \
src/ui/configuration/SerialSettingsDialog.h \ src/ui/configuration/SerialSettingsDialog.h \
src/ui/configuration/terminalconsole.h \ src/ui/configuration/terminalconsole.h \
src/ui/DebugConsole.h \
src/ui/flightdisplay/FlightDisplay.h \ src/ui/flightdisplay/FlightDisplay.h \
src/ui/HDDisplay.h \ src/ui/HDDisplay.h \
src/ui/HSIDisplay.h \ src/ui/HSIDisplay.h \
...@@ -408,7 +406,6 @@ SOURCES += \ ...@@ -408,7 +406,6 @@ SOURCES += \
src/ui/configuration/console.cpp \ src/ui/configuration/console.cpp \
src/ui/configuration/SerialSettingsDialog.cc \ src/ui/configuration/SerialSettingsDialog.cc \
src/ui/configuration/terminalconsole.cpp \ src/ui/configuration/terminalconsole.cpp \
src/ui/DebugConsole.cc \
src/ui/flightdisplay/FlightDisplay.cc \ src/ui/flightdisplay/FlightDisplay.cc \
src/ui/HDDisplay.cc \ src/ui/HDDisplay.cc \
src/ui/HSIDisplay.cc \ src/ui/HSIDisplay.cc \
......
This diff is collapsed.
/*=====================================================================
QGroundControl Open Source Ground Control Station
(c) 2009, 2010 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/>.
======================================================================*/
/**
* @file
* @brief Debug console
*
* @author Lorenz Meier <mavteam@student.ethz.ch>
*
*/
#ifndef DEBUGCONSOLE_H
#define DEBUGCONSOLE_H
#include <QWidget>
#include <QList>
#include <QByteArray>
#include <QTimer>
#include <QKeyEvent>
#include "LinkInterface.h"
namespace Ui
{
class DebugConsole;
}
class UASInterface;
/**
* @brief Shows a debug console
*
* This class shows the raw data stream of each link
* and the debug / text messages sent by all systems
*/
class DebugConsole : public QWidget
{
Q_OBJECT
public:
DebugConsole(QWidget *parent = 0);
~DebugConsole();
public slots:
/** @brief Add a link to the list of monitored links */
void addLink(LinkInterface* link);
/** @brief Add a UAS to the list of monitored UAS */
void uasCreated(UASInterface* uas);
/** @brief Remove a link from the list */
void removeLink(LinkInterface* link);
/** @brief Update a link name */
void updateLinkName(QString name);
/** @brief Select a link for the active view */
void linkSelected(int linkId);
/** @brief Receive bytes from link */
void receiveBytes(LinkInterface* link, QByteArray bytes);
/** @brief Send lineedit content over link */
void sendBytes();
/** @brief Enable HEX display mode */
void hexModeEnabled(bool mode);
/** @brief Filter out MAVLINK raw data */
void MAVLINKfilterEnabled(bool filter);
/** @brief Freeze input, do not store new incoming data */
void hold(bool hold);
/** @brief Handle the connect button */
void handleConnectButton();
/** @brief Enable auto-freeze mode if traffic intensity is too high to display */
void setAutoHold(bool hold);
/** @brief Receive plain text message to output to the user */
void receiveTextMessage(int id, int component, int severity, QString text);
/** @brief Append a special symbol */
void appendSpecialSymbol(const QString& text);
/** @brief Append the special symbol currently selected in combo box */
void appendSpecialSymbol();
/** @brief A new special symbol is selected */
void specialSymbolSelected(const QString& text);
void linkStatusUpdate(const QString& name,const QString& text);
protected slots:
/** @brief Draw information overlay */
void paintEvent(QPaintEvent *event);
/** @brief Update traffic measurements */
void updateTrafficMeasurements();
void loadSettings();
void storeSettings();
protected:
void changeEvent(QEvent *e);
void hideEvent(QHideEvent* event);
/** @brief Convert a symbol name to the byte representation */
QByteArray symbolNameToBytes(const QString& symbol);
/** @brief Convert a symbol byte to the name */
QString bytesToSymbolNames(const QByteArray& b);
/** @brief Handle keypress events */
void keyPressEvent(QKeyEvent * event);
/** @brief Cycle through the command history */
void cycleCommandHistory(bool up);
LinkInterface* currLink;
bool holdOn; ///< Hold current view, ignore new data
bool convertToAscii; ///< Convert data to ASCII
bool filterMAVLINK; ///< Set true to filter out MAVLink in output
bool autoHold; ///< Auto-hold mode sets view into hold if the data rate is too high
int bytesToIgnore; ///< Number of bytes to ignore
char lastByte; ///< The last received byte
bool escReceived; ///< True if received ESC char in ASCII mode
int escIndex; ///< Index of bytes since ESC was received
char escBytes[5]; ///< Escape-following bytes
bool terminalReceived; ///< Terminal sequence received
QList<QString> sentBytes; ///< Transmitted bytes, per transmission
QByteArray holdBuffer; ///< Buffer where bytes are stored during hold-enable
QString lineBuffer; ///< Buffere where bytes are stored before writing them out
quint64 lastLineBuffer; ///< Last line buffer emission time
QTimer lineBufferTimer; ///< Line buffer timer
QTimer snapShotTimer; ///< Timer for measuring traffic snapshots
static const int snapShotInterval = 500; ///< Set the time between UI updates for the data rate (ms)
float lowpassInDataRate; ///< Lowpass filtered data rate (kilobytes/s)
static const float inDataRateThreshold; ///< Threshold where to enable auto-hold (kilobytes/s)
float lowpassOutDataRate; ///< Low-pass filtered outgoing data rate (kilobytes/s)
QStringList commandHistory;
QString currCommand;
int commandIndex;
private slots:
void _linkConnected(void);
void _linkDisconnected(void);
private:
/** @brief Set connection state of the current link */
void _setConnectionState(bool);
/// List of all links we are keeping track of. We keep SharedLinkInterface objects
/// which are QSharedPointer's in order to maintain reference counts. Otherwise signals
/// can get out of order and the link may be deleted before we clean up our side.
QList<SharedLinkInterface> _links;
Ui::DebugConsole *m_ui;
};
#endif // DEBUGCONSOLE_H
This diff is collapsed.
...@@ -119,7 +119,6 @@ const char* MainWindow::_hdd2DockWidgetName = "HEAD_DOWN_DISPLAY_2_DOCKWIDGET"; ...@@ -119,7 +119,6 @@ const char* MainWindow::_hdd2DockWidgetName = "HEAD_DOWN_DISPLAY_2_DOCKWIDGET";
const char* MainWindow::_pfdDockWidgetName = "PRIMARY_FLIGHT_DISPLAY_DOCKWIDGET"; const char* MainWindow::_pfdDockWidgetName = "PRIMARY_FLIGHT_DISPLAY_DOCKWIDGET";
const char* MainWindow::_hudDockWidgetName = "HEAD_UP_DISPLAY_DOCKWIDGET"; const char* MainWindow::_hudDockWidgetName = "HEAD_UP_DISPLAY_DOCKWIDGET";
const char* MainWindow::_uasInfoViewDockWidgetName = "UAS_INFO_INFOVIEW_DOCKWIDGET"; const char* MainWindow::_uasInfoViewDockWidgetName = "UAS_INFO_INFOVIEW_DOCKWIDGET";
const char* MainWindow::_debugConsoleDockWidgetName = "COMMUNICATION_CONSOLE_DOCKWIDGET";
static MainWindow* _instance = NULL; ///< @brief MainWindow singleton static MainWindow* _instance = NULL; ///< @brief MainWindow singleton
...@@ -445,7 +444,6 @@ void MainWindow::_buildCommonWidgets(void) ...@@ -445,7 +444,6 @@ void MainWindow::_buildCommonWidgets(void)
{ _pfdDockWidgetName, "Primary Flight Display", Qt::RightDockWidgetArea }, { _pfdDockWidgetName, "Primary Flight Display", Qt::RightDockWidgetArea },
{ _hudDockWidgetName, "Video Downlink", Qt::RightDockWidgetArea }, { _hudDockWidgetName, "Video Downlink", Qt::RightDockWidgetArea },
{ _uasInfoViewDockWidgetName, "Info View", Qt::LeftDockWidgetArea }, { _uasInfoViewDockWidgetName, "Info View", Qt::LeftDockWidgetArea },
{ _debugConsoleDockWidgetName, "Communications Console", Qt::LeftDockWidgetArea },
}; };
static const size_t cDockWidgetInfo = sizeof(rgDockWidgetInfo) / sizeof(rgDockWidgetInfo[0]); static const size_t cDockWidgetInfo = sizeof(rgDockWidgetInfo) / sizeof(rgDockWidgetInfo[0]);
...@@ -586,8 +584,6 @@ void MainWindow::_createInnerDockWidget(const QString& widgetName) ...@@ -586,8 +584,6 @@ void MainWindow::_createInnerDockWidget(const QString& widgetName)
QGCTabbedInfoView* pInfoView = new QGCTabbedInfoView(this); QGCTabbedInfoView* pInfoView = new QGCTabbedInfoView(this);
pInfoView->addSource(mavlinkDecoder); pInfoView->addSource(mavlinkDecoder);
widget = pInfoView; widget = pInfoView;
} else if (widgetName == _debugConsoleDockWidgetName) {
widget = new DebugConsole(this);
} else { } else {
qWarning() << "Attempt to create unknown Inner Dock Widget" << widgetName; qWarning() << "Attempt to create unknown Inner Dock Widget" << widgetName;
} }
......
...@@ -53,7 +53,6 @@ This file is part of the QGROUNDCONTROL project ...@@ -53,7 +53,6 @@ This file is part of the QGROUNDCONTROL project
#if (defined QGC_MOUSE_ENABLED_WIN) | (defined QGC_MOUSE_ENABLED_LINUX) #if (defined QGC_MOUSE_ENABLED_WIN) | (defined QGC_MOUSE_ENABLED_LINUX)
#include "Mouse6dofInput.h" #include "Mouse6dofInput.h"
#endif // QGC_MOUSE_ENABLED_WIN #endif // QGC_MOUSE_ENABLED_WIN
#include "DebugConsole.h"
#include "ParameterEditorWidget.h" #include "ParameterEditorWidget.h"
#include "HDDisplay.h" #include "HDDisplay.h"
#include "HSIDisplay.h" #include "HSIDisplay.h"
...@@ -334,7 +333,6 @@ private: ...@@ -334,7 +333,6 @@ private:
static const char* _pfdDockWidgetName; static const char* _pfdDockWidgetName;
static const char* _hudDockWidgetName; static const char* _hudDockWidgetName;
static const char* _uasInfoViewDockWidgetName; static const char* _uasInfoViewDockWidgetName;
static const char* _debugConsoleDockWidgetName;
QMap<QString, QDockWidget*> _mapName2DockWidget; QMap<QString, QDockWidget*> _mapName2DockWidget;
QMap<int, QDockWidget*> _mapUasId2HilDockWidget; QMap<int, QDockWidget*> _mapUasId2HilDockWidget;
......
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