Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
bf0a7e19
Commit
bf0a7e19
authored
Feb 04, 2011
by
pixhawk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minor visual improvements
parent
a7bbb6f2
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
47 additions
and
14 deletions
+47
-14
UAS.cc
src/uas/UAS.cc
+1
-1
DebugConsole.cc
src/ui/DebugConsole.cc
+24
-1
MainWindow.cc
src/ui/MainWindow.cc
+6
-6
UASControl.ui
src/ui/UASControl.ui
+16
-6
No files found.
src/uas/UAS.cc
View file @
bf0a7e19
...
...
@@ -413,7 +413,7 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message)
emit
valueChanged
(
uasId
,
"roll deg"
,
"deg"
,
(
roll
/
M_PI
)
*
180.0
,
time
);
emit
valueChanged
(
uasId
,
"pitch deg"
,
"deg"
,
(
pitch
/
M_PI
)
*
180.0
,
time
);
emit
valueChanged
(
uasId
,
"
yaw
deg"
,
"deg"
,
compass
,
time
);
emit
valueChanged
(
uasId
,
"
heading
deg"
,
"deg"
,
compass
,
time
);
emit
valueChanged
(
uasId
,
"rollspeed d/s"
,
"deg/s"
,
(
attitude
.
rollspeed
/
M_PI
)
*
180.0
,
time
);
emit
valueChanged
(
uasId
,
"pitchspeed d/s"
,
"deg/s"
,
(
attitude
.
pitchspeed
/
M_PI
)
*
180.0
,
time
);
emit
valueChanged
(
uasId
,
"yawspeed d/s"
,
"deg/s"
,
(
attitude
.
yawspeed
/
M_PI
)
*
180.0
,
time
);
...
...
src/ui/DebugConsole.cc
View file @
bf0a7e19
...
...
@@ -252,7 +252,30 @@ void DebugConsole::setAutoHold(bool hold)
void
DebugConsole
::
receiveTextMessage
(
int
id
,
int
component
,
int
severity
,
QString
text
)
{
Q_UNUSED
(
severity
);
m_ui
->
receiveText
->
appendHtml
(
QString
(
"<font color=
\"
%1
\"
>(MAV%2:%3) %4</font>
\n
"
).
arg
(
UASManager
::
instance
()
->
getUASForId
(
id
)
->
getColor
().
name
(),
QString
::
number
(
id
),
QString
::
number
(
component
),
text
));
QString
name
=
UASManager
::
instance
()
->
getUASForId
(
id
)
->
getUASName
();
QString
comp
;
// Get a human readable name if possible
switch
(
component
)
{
// TODO: To be completed
case
MAV_COMP_ID_IMU
:
comp
=
tr
(
"IMU"
);
break
;
case
MAV_COMP_ID_MAPPER
:
comp
=
tr
(
"MAPPER"
);
break
;
case
MAV_COMP_ID_WAYPOINTPLANNER
:
comp
=
tr
(
"WP-PLANNER"
);
break
;
case
MAV_COMP_ID_AIRSLAM
:
comp
=
tr
(
"AIRSLAM"
);
break
;
default:
comp
=
QString
::
number
(
component
);
break
;
}
m_ui
->
receiveText
->
appendHtml
(
QString
(
"<font color=
\"
%1
\"
>(%2:%3) %4</font>
\n
"
).
arg
(
UASManager
::
instance
()
->
getUASForId
(
id
)
->
getColor
().
name
(),
name
,
comp
,
text
));
//m_ui->receiveText->appendPlainText("");
}
...
...
src/ui/MainWindow.cc
View file @
bf0a7e19
...
...
@@ -397,13 +397,13 @@ void MainWindow::buildPxWidgets()
{
//FIXME: memory of acceptList will never be freed again
QStringList
*
acceptList
=
new
QStringList
();
acceptList
->
append
(
"-105,roll,deg,+105,s"
);
acceptList
->
append
(
"-105,pitch,deg,+105,s"
);
acceptList
->
append
(
"-105,
yaw
,deg,+105,s"
);
acceptList
->
append
(
"-105,roll
deg
,deg,+105,s"
);
acceptList
->
append
(
"-105,pitch
deg
,deg,+105,s"
);
acceptList
->
append
(
"-105,
heading deg
,deg,+105,s"
);
acceptList
->
append
(
"-60,rollspeed,deg/s,+60,s"
);
acceptList
->
append
(
"-60,pitchspeed,deg/s,+60,s"
);
acceptList
->
append
(
"-60,yawspeed,deg/s,+60,s"
);
acceptList
->
append
(
"-60,rollspeed
d/s
,deg/s,+60,s"
);
acceptList
->
append
(
"-60,pitchspeed
d/s
,deg/s,+60,s"
);
acceptList
->
append
(
"-60,yawspeed
d/s
,deg/s,+60,s"
);
acceptList
->
append
(
"0,airspeed,m/s,30"
);
acceptList
->
append
(
"0,gpsspeed,m/s,30"
);
acceptList
->
append
(
"0,truespeed,m/s,30"
);
...
...
src/ui/UASControl.ui
View file @
bf0a7e19
...
...
@@ -7,7 +7,7 @@
<x>
0
</x>
<y>
0
</y>
<width>
200
</width>
<height>
150
</height>
<height>
228
</height>
</rect>
</property>
<property
name=
"sizePolicy"
>
...
...
@@ -25,7 +25,7 @@
<property
name=
"maximumSize"
>
<size>
<width>
267
</width>
<height>
1
94
</height>
<height>
1
6777215
</height>
</size>
</property>
<property
name=
"windowTitle"
>
...
...
@@ -34,13 +34,10 @@
<property
name=
"toolTip"
>
<string>
Control widget to send basic control actions to the micro air vehicle
</string>
</property>
<layout
class=
"QGridLayout"
name=
"gridLayout"
rowstretch=
"5,1,40,1,40,40,40"
columnstretch=
"5,20,20,25,5"
>
<layout
class=
"QGridLayout"
name=
"gridLayout"
rowstretch=
"5,1,40,1,40,40,40
,1000
"
columnstretch=
"5,20,20,25,5"
>
<property
name=
"margin"
>
<number>
4
</number>
</property>
<property
name=
"spacing"
>
<number>
6
</number>
</property>
<item
row=
"0"
column=
"0"
rowspan=
"7"
>
<spacer
name=
"horizontalSpacer"
>
<property
name=
"orientation"
>
...
...
@@ -261,6 +258,19 @@
</property>
</widget>
</item>
<item
row=
"7"
column=
"1"
colspan=
"3"
>
<spacer
name=
"verticalSpacer_2"
>
<property
name=
"orientation"
>
<enum>
Qt::Vertical
</enum>
</property>
<property
name=
"sizeHint"
stdset=
"0"
>
<size>
<width>
20
</width>
<height>
5
</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<resources>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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