Merge pull request #1562 from DonLakeFlyer/RemoveDebugConsole

Remove DebugConsole

QGCApplication.pro

@@ -164,7 +164,6 @@ INCLUDEPATH += \
 
 FORMS += \
     src/QGCQmlWidgetHolder.ui \
-    src/ui/DebugConsole.ui \
     src/ui/HDDisplay.ui \
     src/ui/Linechart.ui \
     src/ui/MainWindow.ui \
@@ -272,7 +271,6 @@ HEADERS += \
     src/uas/UASManagerInterface.h \
     src/uas/UASMessageHandler.h \
     src/uas/UASWaypointManager.h \
-    src/ui/DebugConsole.h \
     src/ui/flightdisplay/FlightDisplay.h \
     src/ui/HDDisplay.h \
     src/ui/HSIDisplay.h \
@@ -399,7 +397,6 @@ SOURCES += \
     src/uas/UASManager.cc \
     src/uas/UASMessageHandler.cc \
     src/uas/UASWaypointManager.cc \
-    src/ui/DebugConsole.cc \
     src/ui/flightdisplay/FlightDisplay.cc \
     src/ui/HDDisplay.cc \
     src/ui/HSIDisplay.cc \

src/ui/DebugConsole.h

-/*=====================================================================
-
-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

src/ui/MainWindow.cc

@@ -117,7 +117,6 @@ const char* MainWindow::_hdd2DockWidgetName = "HEAD_DOWN_DISPLAY_2_DOCKWIDGET";
 const char* MainWindow::_pfdDockWidgetName = "PRIMARY_FLIGHT_DISPLAY_DOCKWIDGET";
 const char* MainWindow::_hudDockWidgetName = "HEAD_UP_DISPLAY_DOCKWIDGET";
 const char* MainWindow::_uasInfoViewDockWidgetName = "UAS_INFO_INFOVIEW_DOCKWIDGET";
-const char* MainWindow::_debugConsoleDockWidgetName = "COMMUNICATION_CONSOLE_DOCKWIDGET";
 
 static MainWindow* _instance = NULL;   ///< @brief MainWindow singleton
 
@@ -441,7 +440,6 @@ void MainWindow::_buildCommonWidgets(void)
         { _pfdDockWidgetName,               "Primary Flight Display",   Qt::RightDockWidgetArea },
         { _hudDockWidgetName,               "Video Downlink",           Qt::RightDockWidgetArea },
         { _uasInfoViewDockWidgetName,       "Info View",                Qt::LeftDockWidgetArea },
-        { _debugConsoleDockWidgetName,      "Communications Console",   Qt::LeftDockWidgetArea },
     };
     static const size_t cDockWidgetInfo = sizeof(rgDockWidgetInfo) / sizeof(rgDockWidgetInfo[0]);
 
@@ -503,7 +501,8 @@ void MainWindow::_buildSimView(void)
 void MainWindow::_showDockWidget(const QString& name, bool show)
 {
     if (!_mapName2DockWidget.contains(name)) {
-        qWarning() << "Attempt to show unknown dock widget" << name;
+        // Don't show any sort of warning here. Dock Widgets which have been remove could still be in settings.
+        // Which would cause us to end up here.
         return;
     }
 
@@ -574,8 +573,6 @@ void MainWindow::_createInnerDockWidget(const QString& widgetName)
         QGCTabbedInfoView* pInfoView = new QGCTabbedInfoView(this);
         pInfoView->addSource(mavlinkDecoder);
         widget = pInfoView;
-    } else if (widgetName == _debugConsoleDockWidgetName) {
-        widget = new DebugConsole(this);
     } else {
         qWarning() << "Attempt to create unknown Inner Dock Widget" << widgetName;
     }

src/ui/MainWindow.h

@@ -53,7 +53,6 @@ This file is part of the QGROUNDCONTROL project
 #if (defined QGC_MOUSE_ENABLED_WIN) | (defined QGC_MOUSE_ENABLED_LINUX)
 #include "Mouse6dofInput.h"
 #endif // QGC_MOUSE_ENABLED_WIN
-#include "DebugConsole.h"
 #include "ParameterEditorWidget.h"
 #include "HDDisplay.h"
 #include "HSIDisplay.h"
@@ -332,7 +331,6 @@ private:
     static const char* _pfdDockWidgetName;
     static const char* _hudDockWidgetName;
     static const char* _uasInfoViewDockWidgetName;
-    static const char* _debugConsoleDockWidgetName;
 
     QMap<QString, QDockWidget*>     _mapName2DockWidget;
     QMap<int, QDockWidget*>         _mapUasId2HilDockWidget;