Commit aea21143 authored by treymarc's avatar treymarc Committed by Koen Kooi

Make HUD the center widget in Flight view. Add menu item for map widget.

parent abe60a9a
...@@ -556,7 +556,7 @@ void MainWindow::buildCommonWidgets() ...@@ -556,7 +556,7 @@ void MainWindow::buildCommonWidgets()
{ {
pilotView = new SubMainWindow(this); pilotView = new SubMainWindow(this);
pilotView->setObjectName("VIEW_FLIGHT"); pilotView->setObjectName("VIEW_FLIGHT");
pilotView->setCentralWidget(new QGCMapTool(this)); pilotView->setCentralWidget(new HUD(640,480,this));
addToCentralStackedWidget(pilotView, VIEW_FLIGHT, "Pilot"); addToCentralStackedWidget(pilotView, VIEW_FLIGHT, "Pilot");
} }
...@@ -658,6 +658,8 @@ void MainWindow::buildCommonWidgets() ...@@ -658,6 +658,8 @@ void MainWindow::buildCommonWidgets()
createDockWidget(engineeringView,new ParameterInterface(this),tr("Onboard Parameters"),"PARAMETER_INTERFACE_DOCKWIDGET",VIEW_ENGINEER,Qt::RightDockWidgetArea); createDockWidget(engineeringView,new ParameterInterface(this),tr("Onboard Parameters"),"PARAMETER_INTERFACE_DOCKWIDGET",VIEW_ENGINEER,Qt::RightDockWidgetArea);
createDockWidget(simView,new ParameterInterface(this),tr("Onboard Parameters"),"PARAMETER_INTERFACE_DOCKWIDGET",VIEW_SIMULATION,Qt::RightDockWidgetArea); createDockWidget(simView,new ParameterInterface(this),tr("Onboard Parameters"),"PARAMETER_INTERFACE_DOCKWIDGET",VIEW_SIMULATION,Qt::RightDockWidgetArea);
createDockWidget(pilotView,new QGCMapTool(this),tr("Map view"),"MAP_VIEW_DOCKWIDGET",VIEW_MISSION,Qt::RightDockWidgetArea);
menuActionHelper->createToolAction(tr("Status Details"), "UAS_STATUS_DETAILS_DOCKWIDGET"); menuActionHelper->createToolAction(tr("Status Details"), "UAS_STATUS_DETAILS_DOCKWIDGET");
{ {
...@@ -819,6 +821,10 @@ void MainWindow::loadDockWidget(const QString& name) ...@@ -819,6 +821,10 @@ void MainWindow::loadDockWidget(const QString& name)
{ {
createDockWidget(centerStack->currentWidget(),new UASInfoWidget(this),tr("Status Details"),"UAS_STATUS_DETAILS_DOCKWIDGET",currentView,Qt::RightDockWidgetArea); createDockWidget(centerStack->currentWidget(),new UASInfoWidget(this),tr("Status Details"),"UAS_STATUS_DETAILS_DOCKWIDGET",currentView,Qt::RightDockWidgetArea);
} }
else if (name == "MAP_VIEW_DOCKWIDGET")
{
createDockWidget(centerStack->currentWidget(),new QGCMapTool(this),tr("Map view"),"MAP_VIEW_DOCKWIDGET",currentView,Qt::RightDockWidgetArea);
}
else if (name == "COMMUNICATION_DEBUG_CONSOLE_DOCKWIDGET") else if (name == "COMMUNICATION_DEBUG_CONSOLE_DOCKWIDGET")
{ {
//This is now a permanently detached window. //This is now a permanently detached window.
......
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