Skip to content

Q
qgroundcontrol
Commit a9aa4968 authored by Bryant's avatar Bryant
Browse files
Options

Finish removing MAVLink generation code. 

This was deprecated on Febuary 3rd, 2014 and removed a little later. This finally completes that process.
parent 35a1a5ed
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 49 deletions
src/ui/MainWindow.cc
View file @ a9aa4968
......@@ -74,11 +74,6 @@ This file is part of the QGROUNDCONTROL project
#include "QGCUASFileViewMulti.h"
#include <QDesktopWidget>
// Add support for the MAVLink generator UI if it's been requested.
#ifdef QGC_MAVGEN_ENABLED
#include "XMLCommProtocolWidget.h"
#endif
#ifdef QGC_OSG_ENABLED
#include "Q3DWidgetFactory.h"
#endif
......@@ -370,7 +365,6 @@ void MainWindow::init()
ui.actionHardwareConfig->setShortcut(QApplication::translate("MainWindow", "Meta+3", 0));
ui.actionSimulationView->setShortcut(QApplication::translate("MainWindow", "Meta+4", 0));
ui.actionEngineersView->setShortcut(QApplication::translate("MainWindow", "Meta+5", 0));
ui.actionMavlinkView->setShortcut(QApplication::translate("MainWindow", "Meta+M", 0));
ui.actionUnconnectedView->setShortcut(QApplication::translate("MainWindow", "Meta+U", 0));
ui.actionFullscreen->setShortcut(QApplication::translate("MainWindow", "Meta+Return", 0));
#else
......@@ -379,7 +373,6 @@ void MainWindow::init()
ui.actionHardwareConfig->setShortcut(QApplication::translate("MainWindow", "Ctrl+3", 0));
ui.actionSimulationView->setShortcut(QApplication::translate("MainWindow", "Ctrl+4", 0));
ui.actionEngineersView->setShortcut(QApplication::translate("MainWindow", "Ctrl+5", 0));
ui.actionMavlinkView->setShortcut(QApplication::translate("MainWindow", "Ctrl+M", 0));
ui.actionUnconnectedView->setShortcut(QApplication::translate("MainWindow", "Ctrl+U", 0));
ui.actionFullscreen->setShortcut(QApplication::translate("MainWindow", "Ctrl+Return", 0));
#endif
......@@ -507,9 +500,6 @@ void MainWindow::buildCustomWidget()
case VIEW_MISSION:
dock = createDockWidget(plannerView,tool,tool->getTitle(),tool->objectName(),(VIEW_SECTIONS)view,location);
break;
case VIEW_MAVLINK:
dock = createDockWidget(mavlinkView,tool,tool->getTitle(),tool->objectName(),(VIEW_SECTIONS)view,location);
break;
case VIEW_GOOGLEEARTH:
dock = createDockWidget(googleEarthView,tool,tool->getTitle(),tool->objectName(),(VIEW_SECTIONS)view,location);
break;
......@@ -602,17 +592,6 @@ void MainWindow::buildCommonWidgets()
addToCentralStackedWidget(engineeringView, VIEW_ENGINEER, tr("Logfile Plot"));
}
// Add the MAVLink generator UI if it's been requested.
#ifdef QGC_MAVGEN_ENABLED
if (!mavlinkView)
{
mavlinkView = new SubMainWindow(this);
mavlinkView->setObjectName("VIEW_MAVLINK");
mavlinkView->setCentralWidget(new XMLCommProtocolWidget(this));
addToCentralStackedWidget(mavlinkView, VIEW_MAVLINK, tr("Mavlink Generator"));
}
#endif
#ifdef QGC_GOOGLE_EARTH_ENABLED
if (!googleEarthView)
{
......@@ -1288,7 +1267,6 @@ void MainWindow::connectCommonActions()
// Bind together the perspective actions
QActionGroup* perspectives = new QActionGroup(ui.menuPerspectives);
perspectives->addAction(ui.actionEngineersView);
perspectives->addAction(ui.actionMavlinkView);
perspectives->addAction(ui.actionFlightView);
perspectives->addAction(ui.actionSimulationView);
perspectives->addAction(ui.actionMissionView);
......@@ -1303,9 +1281,6 @@ void MainWindow::connectCommonActions()
/* Hide the actions that are not relevant */
ui.actionSoftwareConfig->setVisible(getCustomMode() == CUSTOM_MODE_APM);
#ifndef QGC_MAVGEN_ENABLED
ui.actionMavlinkView->setVisible(false);
#endif
#ifndef QGC_GOOGLE_EARTH_ENABLED
ui.actionGoogleEarthView->setVisible(false);
#endif
......@@ -1319,11 +1294,6 @@ void MainWindow::connectCommonActions()
ui.actionEngineersView->setChecked(true);
ui.actionEngineersView->activate(QAction::Trigger);
}
if (currentView == VIEW_MAVLINK)
{
ui.actionMavlinkView->setChecked(true);
ui.actionMavlinkView->activate(QAction::Trigger);
}
if (currentView == VIEW_FLIGHT)
{
ui.actionFlightView->setChecked(true);
......@@ -1406,7 +1376,6 @@ void MainWindow::connectCommonActions()
connect(ui.actionHardwareConfig, SIGNAL(triggered()), this, SLOT(loadHardwareConfigView()));
connect(ui.actionSoftwareConfig,SIGNAL(triggered()),this,SLOT(loadSoftwareConfigView()));
connect(ui.actionTerminalView,SIGNAL(triggered()),this,SLOT(loadTerminalView()));
connect(ui.actionMavlinkView, SIGNAL(triggered()), this, SLOT(loadMAVLinkView()));
// Help Actions
connect(ui.actionOnline_Documentation, SIGNAL(triggered()), this, SLOT(showHelp()));
......@@ -1912,9 +1881,6 @@ void MainWindow::loadViewState()
case VIEW_FLIGHT:
centerStack->setCurrentWidget(pilotView);
break;
case VIEW_MAVLINK:
centerStack->setCurrentWidget(mavlinkView);
break;
// case VIEW_FIRMWAREUPDATE:
// centerStack->setCurrentWidget(firmwareUpdateWidget);
// break;
......@@ -2119,17 +2085,6 @@ void MainWindow::loadSimulationView()
}
}
void MainWindow::loadMAVLinkView()
{
if (currentView != VIEW_MAVLINK)
{
storeViewState();
currentView = VIEW_MAVLINK;
ui.actionMavlinkView->setChecked(true);
loadViewState();
}
}
QList<QAction*> MainWindow::listLinkMenuActions()
{
return ui.menuNetwork->actions();
......
src/ui/MainWindow.h
View file @ a9aa4968
......@@ -234,8 +234,6 @@ public slots:
void loadEngineerView();
/** @brief Load view for operator */
void loadOperatorView();
/** @brief Load MAVLink XML generator view */
void loadMAVLinkView();
/** @brief Load Terminal Console views */
void loadTerminalView();
/** @brief Load Google Earth View */
......@@ -339,7 +337,6 @@ protected:
VIEW_MISSION,
VIEW_FLIGHT,
VIEW_SIMULATION,
VIEW_MAVLINK,
VIEW_FIRMWAREUPDATE,
VIEW_HARDWARE_CONFIG,
VIEW_SOFTWARE_CONFIG,
......@@ -413,7 +410,6 @@ protected:
QPointer<SubMainWindow> pilotView;
QPointer<SubMainWindow> configView;
QPointer<SubMainWindow> softwareConfigView;
QPointer<SubMainWindow> mavlinkView;
QPointer<SubMainWindow> engineeringView;
QPointer<SubMainWindow> simView;
QPointer<SubMainWindow> terminalView;
......
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