Browse Source

Fixed a bug introduced by watchdog view which deactivated the main window

QGC4.4
pixhawk 15 years ago
parent
commit
e186cedd96
  1. 3
      src/ui/MainWindow.cc
  2. 4
      src/ui/MainWindow.ui

3
src/ui/MainWindow.cc

@ -99,6 +99,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), @@ -99,6 +99,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent),
parameters = new ParameterInterface(this);
parameters->setVisible(false);
watchdogControl = new WatchdogControl(this);
watchdogControl->setVisible(false);
QStringList* acceptList = new QStringList();
acceptList->append("roll IMU");
@ -459,6 +460,7 @@ void MainWindow::loadSettingsView() @@ -459,6 +460,7 @@ void MainWindow::loadSettingsView()
QDockWidget* container6 = new QDockWidget(tr("Onboard Parameters"), this);
container6->setWidget(parameters);
addDockWidget(Qt::RightDockWidgetArea, container6);
this->show();
}
void MainWindow::loadEngineerView()
@ -504,6 +506,7 @@ void MainWindow::loadMAVLinkView() @@ -504,6 +506,7 @@ void MainWindow::loadMAVLinkView()
{
clearView();
centerStack->setCurrentWidget(protocol);
this->show();
}
void MainWindow::loadAllView()

4
src/ui/MainWindow.ui

@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
<x>0</x>
<y>0</y>
<width>1000</width>
<height>22</height>
<height>25</height>
</rect>
</property>
<widget class="QMenu" name="menuMGround">
@ -257,7 +257,7 @@ @@ -257,7 +257,7 @@
<action name="actionShow_MAVLink_view">
<property name="icon">
<iconset resource="../../mavground.qrc">
<normaloff>:/images/devices/network-wireless.svg</normaloff>:/images/devices/network-wireless.svg</iconset>
<normaloff>:/images/devices/network-wired.svg</normaloff>:/images/devices/network-wired.svg</iconset>
</property>
<property name="text">
<string>Show MAVLink view</string>

Loading…
Cancel
Save