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
04ecfa68
Commit
04ecfa68
authored
Jan 25, 2011
by
lm
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improved UI
parent
b23a3324
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
227 additions
and
10 deletions
+227
-10
UASControl.ui
src/ui/UASControl.ui
+48
-0
UASView.ui
src/ui/UASView.ui
+108
-0
WaypointView.ui
src/ui/WaypointView.ui
+67
-7
UASView.cc
src/ui/uas/UASView.cc
+4
-3
No files found.
src/ui/UASControl.ui
View file @
04ecfa68
...
...
@@ -62,6 +62,12 @@
<height>
10
</height>
</size>
</property>
<property
name=
"toolTip"
>
<string>
Currently controlled system
</string>
</property>
<property
name=
"statusTip"
>
<string>
Currently controlled system
</string>
</property>
<property
name=
"text"
>
<string>
UNCONNECTED
</string>
</property>
...
...
@@ -99,6 +105,12 @@
<height>
16
</height>
</size>
</property>
<property
name=
"toolTip"
>
<string>
Liftoff / Launch
</string>
</property>
<property
name=
"statusTip"
>
<string>
Liftoff / Launch
</string>
</property>
<property
name=
"text"
>
<string>
Start
</string>
</property>
...
...
@@ -116,6 +128,12 @@
<height>
16
</height>
</size>
</property>
<property
name=
"toolTip"
>
<string>
Fly straight to landing spot
</string>
</property>
<property
name=
"statusTip"
>
<string>
Fly straight to landing spot
</string>
</property>
<property
name=
"text"
>
<string>
Land
</string>
</property>
...
...
@@ -133,6 +151,12 @@
<height>
16
</height>
</size>
</property>
<property
name=
"toolTip"
>
<string>
Only active on the ground: Poweroff system
</string>
</property>
<property
name=
"statusTip"
>
<string>
Only active on the ground: Poweroff system
</string>
</property>
<property
name=
"text"
>
<string>
Halt
</string>
</property>
...
...
@@ -152,6 +176,12 @@
<height>
16
</height>
</size>
</property>
<property
name=
"toolTip"
>
<string>
Select MAV operation mode
</string>
</property>
<property
name=
"statusTip"
>
<string>
Select MAV operation mode
</string>
</property>
</widget>
</item>
<item
row=
"5"
column=
"3"
>
...
...
@@ -162,6 +192,12 @@
<height>
16
</height>
</size>
</property>
<property
name=
"toolTip"
>
<string>
Transmit and enable mode on MAV
</string>
</property>
<property
name=
"statusTip"
>
<string>
Transmit and enable mode on MAV
</string>
</property>
<property
name=
"text"
>
<string>
Set
</string>
</property>
...
...
@@ -179,6 +215,12 @@
<height>
10
</height>
</size>
</property>
<property
name=
"toolTip"
>
<string>
Status label
</string>
</property>
<property
name=
"statusTip"
>
<string>
Status label
</string>
</property>
<property
name=
"text"
>
<string>
No actions executed so far
</string>
</property>
...
...
@@ -208,6 +250,12 @@
<height>
30
</height>
</size>
</property>
<property
name=
"toolTip"
>
<string>
Main control button
</string>
</property>
<property
name=
"statusTip"
>
<string>
Main control button
</string>
</property>
<property
name=
"text"
>
<string>
Activate Engine
</string>
</property>
...
...
src/ui/UASView.ui
View file @
04ecfa68
...
...
@@ -285,6 +285,12 @@ QMenu::separator {
<height>
30
</height>
</size>
</property>
<property
name=
"toolTip"
>
<string>
System Type
</string>
</property>
<property
name=
"statusTip"
>
<string>
System Type
</string>
</property>
<property
name=
"text"
>
<string>
...
</string>
</property>
...
...
@@ -332,6 +338,12 @@ QMenu::separator {
<bold>
true
</bold>
</font>
</property>
<property
name=
"toolTip"
>
<string>
System Name
</string>
</property>
<property
name=
"statusTip"
>
<string>
System Name
</string>
</property>
<property
name=
"text"
>
<string>
UAS001
</string>
</property>
...
...
@@ -368,6 +380,12 @@ QMenu::separator {
<bold>
false
</bold>
</font>
</property>
<property
name=
"toolTip"
>
<string>
Remaining flight time
</string>
</property>
<property
name=
"statusTip"
>
<string>
Remaining flight time
</string>
</property>
<property
name=
"text"
>
<string>
00:00:00
</string>
</property>
...
...
@@ -383,6 +401,12 @@ QMenu::separator {
<bold>
false
</bold>
</font>
</property>
<property
name=
"toolTip"
>
<string>
Uptime
</string>
</property>
<property
name=
"statusTip"
>
<string>
Uptime
</string>
</property>
<property
name=
"text"
>
<string>
00:00:00
</string>
</property>
...
...
@@ -395,6 +419,12 @@ QMenu::separator {
<pointsize>
-1
</pointsize>
</font>
</property>
<property
name=
"toolTip"
>
<string>
Current throttle
</string>
</property>
<property
name=
"statusTip"
>
<string>
Current throttle
</string>
</property>
<property
name=
"value"
>
<number>
0
</number>
</property>
...
...
@@ -410,6 +440,12 @@ QMenu::separator {
<bold>
false
</bold>
</font>
</property>
<property
name=
"toolTip"
>
<string>
Altitude
</string>
</property>
<property
name=
"statusTip"
>
<string>
Altitude
</string>
</property>
<property
name=
"text"
>
<string>
00.00 m
</string>
</property>
...
...
@@ -425,6 +461,12 @@ QMenu::separator {
<bold>
false
</bold>
</font>
</property>
<property
name=
"toolTip"
>
<string>
Ground Speed
</string>
</property>
<property
name=
"statusTip"
>
<string>
Ground Speed
</string>
</property>
<property
name=
"text"
>
<string>
00.0 m/s
</string>
</property>
...
...
@@ -450,6 +492,12 @@ QMenu::separator {
<height>
40
</height>
</size>
</property>
<property
name=
"toolTip"
>
<string>
Heartbeat
</string>
</property>
<property
name=
"statusTip"
>
<string>
Heartbeat
</string>
</property>
<property
name=
"title"
>
<string/>
</property>
...
...
@@ -474,6 +522,12 @@ QMenu::separator {
<pointsize>
-1
</pointsize>
</font>
</property>
<property
name=
"toolTip"
>
<string>
Battery Fuel
</string>
</property>
<property
name=
"statusTip"
>
<string>
Battery Fuel
</string>
</property>
<property
name=
"value"
>
<number>
0
</number>
</property>
...
...
@@ -507,6 +561,12 @@ QMenu::separator {
<bold>
false
</bold>
</font>
</property>
<property
name=
"toolTip"
>
<string>
Current Waypoint
</string>
</property>
<property
name=
"statusTip"
>
<string>
Current Waypoint
</string>
</property>
<property
name=
"text"
>
<string>
---
</string>
</property>
...
...
@@ -537,6 +597,12 @@ QMenu::separator {
<bold>
false
</bold>
</font>
</property>
<property
name=
"toolTip"
>
<string>
Current Position
</string>
</property>
<property
name=
"statusTip"
>
<string>
Current Position
</string>
</property>
<property
name=
"text"
>
<string>
00.0 00.0 00.0 m
</string>
</property>
...
...
@@ -576,6 +642,12 @@ QMenu::separator {
<height>
22
</height>
</size>
</property>
<property
name=
"toolTip"
>
<string>
Liftoff / Launch
</string>
</property>
<property
name=
"statusTip"
>
<string>
Liftoff / Launch
</string>
</property>
<property
name=
"text"
>
<string/>
</property>
...
...
@@ -593,6 +665,12 @@ QMenu::separator {
<height>
22
</height>
</size>
</property>
<property
name=
"toolTip"
>
<string>
Loiter / Wait at current position
</string>
</property>
<property
name=
"statusTip"
>
<string>
Loiter / Wait at current position
</string>
</property>
<property
name=
"text"
>
<string/>
</property>
...
...
@@ -610,6 +688,12 @@ QMenu::separator {
<height>
22
</height>
</size>
</property>
<property
name=
"toolTip"
>
<string>
Continue flightplan
</string>
</property>
<property
name=
"statusTip"
>
<string>
Continue flightplan
</string>
</property>
<property
name=
"text"
>
<string/>
</property>
...
...
@@ -627,6 +711,12 @@ QMenu::separator {
<height>
22
</height>
</size>
</property>
<property
name=
"toolTip"
>
<string>
Fly straight to landing location
</string>
</property>
<property
name=
"statusTip"
>
<string>
Fly straight to landing location
</string>
</property>
<property
name=
"text"
>
<string/>
</property>
...
...
@@ -638,6 +728,12 @@ QMenu::separator {
</item>
<item>
<widget
class=
"QPushButton"
name=
"shutdownButton"
>
<property
name=
"toolTip"
>
<string>
Only in standby mode: Power off system
</string>
</property>
<property
name=
"statusTip"
>
<string>
Only in standby mode: Power off system
</string>
</property>
<property
name=
"text"
>
<string/>
</property>
...
...
@@ -655,6 +751,12 @@ QMenu::separator {
<height>
22
</height>
</size>
</property>
<property
name=
"toolTip"
>
<string>
Emergency land system at closest possible site
</string>
</property>
<property
name=
"statusTip"
>
<string>
Emergency land system at closest possible site
</string>
</property>
<property
name=
"text"
>
<string/>
</property>
...
...
@@ -672,6 +774,12 @@ QMenu::separator {
<height>
22
</height>
</size>
</property>
<property
name=
"toolTip"
>
<string>
Kill immediately all onboard power
</string>
</property>
<property
name=
"statusTip"
>
<string>
Kill immediately all onboard power
</string>
</property>
<property
name=
"text"
>
<string/>
</property>
...
...
src/ui/WaypointView.ui
View file @
04ecfa68
...
...
@@ -176,6 +176,9 @@ QProgressBar::chunk#thrustBar {
<property
name=
"toolTip"
>
<string>
Currently selected waypoint
</string>
</property>
<property
name=
"statusTip"
>
<string>
Currently selected waypoint
</string>
</property>
<property
name=
"text"
>
<string/>
</property>
...
...
@@ -214,6 +217,12 @@ QProgressBar::chunk#thrustBar {
<verstretch>
0
</verstretch>
</sizepolicy>
</property>
<property
name=
"toolTip"
>
<string>
Action at Waypoint
</string>
</property>
<property
name=
"statusTip"
>
<string>
Action at Waypoint
</string>
</property>
</widget>
</item>
<item>
...
...
@@ -224,6 +233,12 @@ QProgressBar::chunk#thrustBar {
<verstretch>
0
</verstretch>
</sizepolicy>
</property>
<property
name=
"toolTip"
>
<string>
Coordinate frame
</string>
</property>
<property
name=
"statusTip"
>
<string>
Coordinate frame
</string>
</property>
</widget>
</item>
<item>
...
...
@@ -240,6 +255,9 @@ QProgressBar::chunk#thrustBar {
<property
name=
"toolTip"
>
<string>
Position X coordinate
</string>
</property>
<property
name=
"statusTip"
>
<string>
Position X corrdinate
</string>
</property>
<property
name=
"wrapping"
>
<bool>
false
</bool>
</property>
...
...
@@ -278,7 +296,10 @@ QProgressBar::chunk#thrustBar {
<enum>
Qt::WheelFocus
</enum>
</property>
<property
name=
"toolTip"
>
<string>
Position Y coordinate
</string>
<string>
Position Y/Longitude coordinate
</string>
</property>
<property
name=
"statusTip"
>
<string>
Position Y/Longitude coordinate
</string>
</property>
<property
name=
"prefix"
>
<string>
E
</string>
...
...
@@ -312,7 +333,10 @@ QProgressBar::chunk#thrustBar {
<enum>
Qt::WheelFocus
</enum>
</property>
<property
name=
"toolTip"
>
<string>
Position Z coordinate (negative)
</string>
<string>
Position Z coordinate (local frame, negative)
</string>
</property>
<property
name=
"statusTip"
>
<string/>
</property>
<property
name=
"prefix"
>
<string>
D
</string>
...
...
@@ -342,6 +366,12 @@ QProgressBar::chunk#thrustBar {
<property
name=
"focusPolicy"
>
<enum>
Qt::WheelFocus
</enum>
</property>
<property
name=
"toolTip"
>
<string>
Latitude in degrees
</string>
</property>
<property
name=
"statusTip"
>
<string>
Latitude in degrees
</string>
</property>
<property
name=
"prefix"
>
<string>
lat
</string>
</property>
...
...
@@ -373,6 +403,12 @@ QProgressBar::chunk#thrustBar {
<property
name=
"focusPolicy"
>
<enum>
Qt::WheelFocus
</enum>
</property>
<property
name=
"toolTip"
>
<string>
Longitude in degrees
</string>
</property>
<property
name=
"statusTip"
>
<string>
Longitude in degrees
</string>
</property>
<property
name=
"prefix"
>
<string>
lon
</string>
</property>
...
...
@@ -401,6 +437,12 @@ QProgressBar::chunk#thrustBar {
<verstretch>
0
</verstretch>
</sizepolicy>
</property>
<property
name=
"toolTip"
>
<string>
Altitude in meters
</string>
</property>
<property
name=
"statusTip"
>
<string>
Altitude in meters
</string>
</property>
<property
name=
"prefix"
>
<string>
alt
</string>
</property>
...
...
@@ -430,7 +472,10 @@ QProgressBar::chunk#thrustBar {
<enum>
Qt::StrongFocus
</enum>
</property>
<property
name=
"toolTip"
>
<string>
Yaw angle
</string>
<string>
Rotary wing only: Desired yaw angle at waypoint
</string>
</property>
<property
name=
"statusTip"
>
<string>
Rotary wing only: Desired yaw angle at waypoint
</string>
</property>
<property
name=
"wrapping"
>
<bool>
true
</bool>
...
...
@@ -461,7 +506,10 @@ QProgressBar::chunk#thrustBar {
<enum>
Qt::StrongFocus
</enum>
</property>
<property
name=
"toolTip"
>
<string>
Orbit radius
</string>
<string>
Orbit (navigate waypoint) /Loiter (loiter waypoint) radius
</string>
</property>
<property
name=
"statusTip"
>
<string>
Orbit (navigate waypoint) /Loiter (loiter waypoint) radius
</string>
</property>
<property
name=
"suffix"
>
<string>
m
</string>
...
...
@@ -495,7 +543,7 @@ QProgressBar::chunk#thrustBar {
<string>
Time in milliseconds that the MAV has to stay inside the orbit before advancing
</string>
</property>
<property
name=
"statusTip"
>
<string
/
>
<string
>
Time in milliseconds that the MAV has to stay inside the orbit before advancing
</string
>
</property>
<property
name=
"suffix"
>
<string>
ms
</string>
...
...
@@ -525,6 +573,9 @@ QProgressBar::chunk#thrustBar {
<property
name=
"toolTip"
>
<string>
Take off angle
</string>
</property>
<property
name=
"statusTip"
>
<string>
Take off angle
</string>
</property>
<property
name=
"prefix"
>
<string/>
</property>
...
...
@@ -538,6 +589,9 @@ QProgressBar::chunk#thrustBar {
<property
name=
"toolTip"
>
<string>
Automatically continue after this waypoint
</string>
</property>
<property
name=
"statusTip"
>
<string>
Automatically continue after this waypoint
</string>
</property>
<property
name=
"text"
>
<string/>
</property>
...
...
@@ -555,7 +609,10 @@ QProgressBar::chunk#thrustBar {
<enum>
Qt::NoFocus
</enum>
</property>
<property
name=
"toolTip"
>
<string>
Move Up
</string>
<string>
Move Up in List
</string>
</property>
<property
name=
"statusTip"
>
<string>
Move Up in List
</string>
</property>
<property
name=
"text"
>
<string/>
...
...
@@ -578,7 +635,10 @@ QProgressBar::chunk#thrustBar {
<enum>
Qt::NoFocus
</enum>
</property>
<property
name=
"toolTip"
>
<string>
Move Down
</string>
<string>
Move Down in List
</string>
</property>
<property
name=
"statusTip"
>
<string>
Move Down in List
</string>
</property>
<property
name=
"text"
>
<string/>
...
...
src/ui/uas/UASView.cc
View file @
04ecfa68
...
...
@@ -66,8 +66,8 @@ UASView::UASView(UASInterface* uas, QWidget *parent) :
localFrame
(
false
),
removeAction
(
new
QAction
(
"Delete this system"
,
this
)),
renameAction
(
new
QAction
(
"Rename.."
,
this
)),
selectAction
(
new
QAction
(
"
Select
this system"
,
this
)),
selectAirframeAction
(
new
QAction
(
"
Select
Airframe"
,
this
)),
selectAction
(
new
QAction
(
"
Control
this system"
,
this
)),
selectAirframeAction
(
new
QAction
(
"
Choose
Airframe"
,
this
)),
m_ui
(
new
Ui
::
UASView
)
{
m_ui
->
setupUi
(
this
);
...
...
@@ -415,12 +415,13 @@ void UASView::updateLoad(UASInterface* uas, double load)
void
UASView
::
contextMenuEvent
(
QContextMenuEvent
*
event
)
{
QMenu
menu
(
this
);
menu
.
addAction
(
selectAction
);
menu
.
addSeparator
();
menu
.
addAction
(
renameAction
);
if
(
timeout
)
{
menu
.
addAction
(
removeAction
);
}
menu
.
addAction
(
selectAction
);
menu
.
addAction
(
selectAirframeAction
);
menu
.
exec
(
event
->
globalPos
());
}
...
...
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