Commit cab41473 authored by Don Gagne's avatar Don Gagne

Fix failed connection

MainWindow::loadDataView has been commented out for 9 months now.
Removed commented out code instead of leaving cruft in.
parent 5c6da8d4
...@@ -2045,27 +2045,6 @@ void MainWindow::loadMAVLinkView() ...@@ -2045,27 +2045,6 @@ void MainWindow::loadMAVLinkView()
} }
} }
//void MainWindow::loadDataView(QString fileName)
//{
// // Plot is now selected, now load data from file
// if (dataView)
// {
// //dataView->setCentralWidget(new QGCDataPlot2D(this));
// QGCDataPlot2D *plot = qobject_cast<QGCDataPlot2D*>(dataView->centralWidget());
// if (plot)
// {
// plot->loadFile(fileName);
// }
// }
// /*QStackedWidget *centerStack = dynamic_cast<QStackedWidget*>(centralWidget());
// if (centerStack)
// {
// centerStack->setCurrentWidget(dataView);
// dataplotWidget->loadFile(fileName);
// }*/
//}
QList<QAction*> MainWindow::listLinkMenuActions() QList<QAction*> MainWindow::listLinkMenuActions()
{ {
return ui.menuNetwork->actions(); return ui.menuNetwork->actions();
......
...@@ -51,20 +51,20 @@ This file is part of the QGROUNDCONTROL project ...@@ -51,20 +51,20 @@ This file is part of the QGROUNDCONTROL project
#include "ObjectDetectionView.h" #include "ObjectDetectionView.h"
#include "submainwindow.h" #include "submainwindow.h"
#include "input/JoystickInput.h" #include "input/JoystickInput.h"
#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 "DebugConsole.h"
#include "ParameterInterface.h" #include "ParameterInterface.h"
#include "HDDisplay.h" #include "HDDisplay.h"
#include "WatchdogControl.h" #include "WatchdogControl.h"
#include "HSIDisplay.h" #include "HSIDisplay.h"
#include "QGCRemoteControlView.h" #include "QGCRemoteControlView.h"
#include "opmapcontrol.h" #include "opmapcontrol.h"
#ifdef QGC_GOOGLE_EARTH_ENABLED #ifdef QGC_GOOGLE_EARTH_ENABLED
#include "QGCGoogleEarthView.h" #include "QGCGoogleEarthView.h"
#endif #endif
#include "QGCToolBar.h" #include "QGCToolBar.h"
#include "SlugsDataSensorView.h" #include "SlugsDataSensorView.h"
#include "LogCompressor.h" #include "LogCompressor.h"
...@@ -281,9 +281,6 @@ public slots: ...@@ -281,9 +281,6 @@ public slots:
void closeEvent(QCloseEvent* event); void closeEvent(QCloseEvent* event);
/** @brief Load data view, allowing to plot flight data */
// void loadDataView(QString fileName);
/** /**
* @brief Shows a Widget from the center stack based on the action sender * @brief Shows a Widget from the center stack based on the action sender
* *
...@@ -307,10 +304,10 @@ signals: ...@@ -307,10 +304,10 @@ signals:
/** Emitted when any value changes from any source */ /** Emitted when any value changes from any source */
void valueChanged(const int uasId, const QString& name, const QString& unit, const QVariant& value, const quint64 msec); void valueChanged(const int uasId, const QString& name, const QString& unit, const QVariant& value, const quint64 msec);
#ifdef QGC_MOUSE_ENABLED_LINUX #ifdef QGC_MOUSE_ENABLED_LINUX
/** @brief Forward X11Event to catch 3DMouse inputs */ /** @brief Forward X11Event to catch 3DMouse inputs */
void x11EventOccured(XEvent *event); void x11EventOccured(XEvent *event);
#endif //QGC_MOUSE_ENABLED_LINUX #endif //QGC_MOUSE_ENABLED_LINUX
public: public:
QGCMAVLinkLogPlayer* getLogPlayer() QGCMAVLinkLogPlayer* getLogPlayer()
...@@ -419,13 +416,13 @@ protected: ...@@ -419,13 +416,13 @@ protected:
//QPointer<QGCMapTool> mapWidget; //QPointer<QGCMapTool> mapWidget;
//QPointer<XMLCommProtocolWidget> protocolWidget; //QPointer<XMLCommProtocolWidget> protocolWidget;
//QPointer<QGCDataPlot2D> dataplotWidget; //QPointer<QGCDataPlot2D> dataplotWidget;
#ifdef QGC_OSG_ENABLED #ifdef QGC_OSG_ENABLED
QPointer<QWidget> q3DWidget; QPointer<QWidget> q3DWidget;
#endif #endif
#ifdef QGC_GOOGLE_EARTH_ENABLED #ifdef QGC_GOOGLE_EARTH_ENABLED
QPointer<QGCGoogleEarthView> earthWidget; QPointer<QGCGoogleEarthView> earthWidget;
#endif #endif
QPointer<QGCFirmwareUpdate> firmwareUpdateWidget; QPointer<QGCFirmwareUpdate> firmwareUpdateWidget;
// Dock widgets // Dock widgets
QPointer<QDockWidget> controlDockWidget; QPointer<QDockWidget> controlDockWidget;
...@@ -471,17 +468,17 @@ protected: ...@@ -471,17 +468,17 @@ protected:
JoystickInput* joystick; JoystickInput* joystick;
#ifdef QGC_MOUSE_ENABLED_WIN #ifdef QGC_MOUSE_ENABLED_WIN
/** @brief 3d Mouse support (WIN only) */ /** @brief 3d Mouse support (WIN only) */
Mouse3DInput* mouseInput; ///< 3dConnexion 3dMouse SDK Mouse3DInput* mouseInput; ///< 3dConnexion 3dMouse SDK
Mouse6dofInput* mouse; ///< Implementation for 3dMouse input Mouse6dofInput* mouse; ///< Implementation for 3dMouse input
#endif // QGC_MOUSE_ENABLED_WIN #endif // QGC_MOUSE_ENABLED_WIN
#ifdef QGC_MOUSE_ENABLED_LINUX #ifdef QGC_MOUSE_ENABLED_LINUX
/** @brief Reimplementation of X11Event to handle 3dMouse Events (magellan) */ /** @brief Reimplementation of X11Event to handle 3dMouse Events (magellan) */
bool x11Event(XEvent *event); bool x11Event(XEvent *event);
Mouse6dofInput* mouse; ///< Implementation for 3dMouse input Mouse6dofInput* mouse; ///< Implementation for 3dMouse input
#endif // QGC_MOUSE_ENABLED_LINUX #endif // QGC_MOUSE_ENABLED_LINUX
/** User interface actions **/ /** User interface actions **/
QAction* connectUASAct; QAction* connectUASAct;
......
...@@ -22,8 +22,6 @@ Linecharts::Linecharts(QWidget *parent) : ...@@ -22,8 +22,6 @@ Linecharts::Linecharts(QWidget *parent) :
this, SLOT(addSystem(UASInterface*))); this, SLOT(addSystem(UASInterface*)));
connect(UASManager::instance(), SIGNAL(activeUASSet(int)), connect(UASManager::instance(), SIGNAL(activeUASSet(int)),
this, SLOT(selectSystem(int))); this, SLOT(selectSystem(int)));
connect(this, SIGNAL(logfileWritten(QString)),
MainWindow::instance(), SLOT(loadDataView(QString)));
} }
void Linecharts::showEvent(QShowEvent* event) void Linecharts::showEvent(QShowEvent* event)
......
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