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
d72a4693
Commit
d72a4693
authored
Aug 22, 2011
by
LM
Browse files
Fixed long-standing issues with HSI display and load logging
parent
80bae56d
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/uas/UAS.cc
View file @
d72a4693
...
@@ -270,7 +270,7 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message)
...
@@ -270,7 +270,7 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message)
}
}
emit
loadChanged
(
this
,
state
.
load
/
10.0
f
);
emit
loadChanged
(
this
,
state
.
load
/
10.0
f
);
emit
valueChanged
(
uasId
,
"Load"
,
"%"
,
((
float
)
state
.
load
)
/
10.0
f
,
getUnixTime
());
//
emit valueChanged(uasId, "Load", "%", ((float)state.load)/10.0f, getUnixTime());
if
(
this
->
mode
!=
static_cast
<
int
>
(
state
.
mode
))
if
(
this
->
mode
!=
static_cast
<
int
>
(
state
.
mode
))
{
{
...
...
src/ui/HDDisplay.ui
View file @
d72a4693
...
@@ -14,6 +14,9 @@
...
@@ -14,6 +14,9 @@
<string>
Form
</string>
<string>
Form
</string>
</property>
</property>
<layout
class=
"QHBoxLayout"
name=
"horizontalLayout"
>
<layout
class=
"QHBoxLayout"
name=
"horizontalLayout"
>
<property
name=
"margin"
>
<number>
0
</number>
</property>
<item>
<item>
<widget
class=
"QGraphicsView"
name=
"view"
/>
<widget
class=
"QGraphicsView"
name=
"view"
/>
</item>
</item>
...
...
src/ui/HSIDisplay.cc
View file @
d72a4693
...
@@ -119,8 +119,8 @@ HSIDisplay::HSIDisplay(QWidget *parent) :
...
@@ -119,8 +119,8 @@ HSIDisplay::HSIDisplay(QWidget *parent) :
// Add interaction elements
// Add interaction elements
QHBoxLayout
*
layout
=
new
QHBoxLayout
(
this
);
QHBoxLayout
*
layout
=
new
QHBoxLayout
(
this
);
layout
->
setMargin
(
2
);
layout
->
setMargin
(
0
);
layout
->
setSpacing
(
0
);
layout
->
setSpacing
(
12
);
QDoubleSpinBox
*
spinBox
=
new
QDoubleSpinBox
(
this
);
QDoubleSpinBox
*
spinBox
=
new
QDoubleSpinBox
(
this
);
spinBox
->
setMinimum
(
0.1
);
spinBox
->
setMinimum
(
0.1
);
spinBox
->
setMaximum
(
9999
);
spinBox
->
setMaximum
(
9999
);
...
...
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