Browse Source

Temporary fix to map widget issue

QGC4.4
lm 14 years ago
parent
commit
c7bec2b0bf
  1. 1
      src/uas/UASManager.cc
  2. 14
      src/ui/MainWindow.cc
  3. 1267
      src/ui/MapWidget.cc

1
src/uas/UASManager.cc

@ -58,7 +58,6 @@ UASManager* UASManager::instance() @@ -58,7 +58,6 @@ UASManager* UASManager::instance()
UASManager::UASManager() :
activeUAS(NULL)
{
systems = QList<UASInterface*>();
start(QThread::LowPriority);
}

14
src/ui/MainWindow.cc

@ -1990,8 +1990,6 @@ void MainWindow::presentView() @@ -1990,8 +1990,6 @@ void MainWindow::presentView()
// VIDEO 2
showTheWidget(MENU_VIDEO_STREAM_2, currentView);
this->show();
// Restore window state
if (UASManager::instance()->getUASList().count() > 0)
{
@ -2007,6 +2005,18 @@ void MainWindow::presentView() @@ -2007,6 +2005,18 @@ void MainWindow::presentView()
restoreState(settings.value(getWindowStateKey()).toByteArray(), QGC::applicationVersion());
}
}
// ACTIVATE MAP WIDGET
if (headUpDockWidget)
{
HUD* tmpHud = dynamic_cast<HUD*>( headUpDockWidget->widget() );
if (tmpHud)
{
}
}
this->show();
}
void MainWindow::showTheCentralWidget (TOOLS_WIDGET_NAMES centralWidget, VIEW_SECTIONS view)

1267
src/ui/MapWidget.cc

File diff suppressed because it is too large Load Diff
Loading…
Cancel
Save