Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
e186cedd
Commit
e186cedd
authored
May 26, 2010
by
pixhawk
Browse files
Fixed a bug introduced by watchdog view which deactivated the main window
parent
a994cdc1
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/ui/MainWindow.cc
View file @
e186cedd
...
...
@@ -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()
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()
{
clearView
();
centerStack
->
setCurrentWidget
(
protocol
);
this
->
show
();
}
void
MainWindow
::
loadAllView
()
...
...
src/ui/MainWindow.ui
View file @
e186cedd
...
...
@@ -35,7 +35,7 @@
<x>
0
</x>
<y>
0
</y>
<width>
1000
</width>
<height>
2
2
</height>
<height>
2
5
</height>
</rect>
</property>
<widget
class=
"QMenu"
name=
"menuMGround"
>
...
...
@@ -257,7 +257,7 @@
<action
name=
"actionShow_MAVLink_view"
>
<property
name=
"icon"
>
<iconset
resource=
"../../mavground.qrc"
>
<normaloff>
:/images/devices/network-wire
less
.svg
</normaloff>
:/images/devices/network-wire
less
.svg
</iconset>
<normaloff>
:/images/devices/network-wire
d
.svg
</normaloff>
:/images/devices/network-wire
d
.svg
</iconset>
</property>
<property
name=
"text"
>
<string>
Show MAVLink view
</string>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment