Commit e186cedd authored by pixhawk's avatar pixhawk

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

parent a994cdc1
...@@ -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 = new ParameterInterface(this);
parameters->setVisible(false); parameters->setVisible(false);
watchdogControl = new WatchdogControl(this); watchdogControl = new WatchdogControl(this);
watchdogControl->setVisible(false);
QStringList* acceptList = new QStringList(); QStringList* acceptList = new QStringList();
acceptList->append("roll IMU"); 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); QDockWidget* container6 = new QDockWidget(tr("Onboard Parameters"), this);
container6->setWidget(parameters); container6->setWidget(parameters);
addDockWidget(Qt::RightDockWidgetArea, container6); addDockWidget(Qt::RightDockWidgetArea, container6);
this->show();
} }
void MainWindow::loadEngineerView() void MainWindow::loadEngineerView()
...@@ -504,6 +506,7 @@ void MainWindow::loadMAVLinkView() ...@@ -504,6 +506,7 @@ void MainWindow::loadMAVLinkView()
{ {
clearView(); clearView();
centerStack->setCurrentWidget(protocol); centerStack->setCurrentWidget(protocol);
this->show();
} }
void MainWindow::loadAllView() void MainWindow::loadAllView()
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>1000</width> <width>1000</width>
<height>22</height> <height>25</height>
</rect> </rect>
</property> </property>
<widget class="QMenu" name="menuMGround"> <widget class="QMenu" name="menuMGround">
...@@ -257,7 +257,7 @@ ...@@ -257,7 +257,7 @@
<action name="actionShow_MAVLink_view"> <action name="actionShow_MAVLink_view">
<property name="icon"> <property name="icon">
<iconset resource="../../mavground.qrc"> <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>
<property name="text"> <property name="text">
<string>Show MAVLink view</string> <string>Show MAVLink view</string>
......
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