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
467a2a11
Commit
467a2a11
authored
Aug 19, 2013
by
Lorenz Meier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minor UI improvements, WIP
parent
dc568649
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
28 additions
and
74 deletions
+28
-74
flying_wing.png
files/images/px4/airframes/flying_wing.png
+0
-0
plane_aert.png
files/images/px4/airframes/plane_aert.png
+0
-0
plane_ert.png
files/images/px4/airframes/plane_ert.png
+0
-0
qgroundcontrol.qrc
qgroundcontrol.qrc
+3
-0
QGCPX4AirframeConfig.cc
src/ui/px4_configuration/QGCPX4AirframeConfig.cc
+3
-0
QGCPX4AirframeConfig.ui
src/ui/px4_configuration/QGCPX4AirframeConfig.ui
+19
-74
UASListWidget.cc
src/ui/uas/UASListWidget.cc
+3
-0
No files found.
files/images/px4/airframes/flying_wing.png
0 → 100644
View file @
467a2a11
12.4 KB
files/images/px4/airframes/plane_aert.png
0 → 100644
View file @
467a2a11
14 KB
files/images/px4/airframes/plane_ert.png
0 → 100644
View file @
467a2a11
12.3 KB
qgroundcontrol.qrc
View file @
467a2a11
...
...
@@ -163,6 +163,9 @@
<file>files/images/px4/airframes/hexa_+.png</file>
<file>files/images/px4/airframes/hexa_x.png</file>
<file>files/images/px4/airframes/octo_x.png</file>
<file>files/images/px4/airframes/flying_wing.png</file>
<file>files/images/px4/airframes/plane_ert.png</file>
<file>files/images/px4/airframes/plane_aert.png</file>
</qresource>
<qresource prefix="/general">
<file alias="vera.ttf">files/styles/Vera.ttf</file>
...
...
src/ui/px4_configuration/QGCPX4AirframeConfig.cc
View file @
467a2a11
...
...
@@ -44,6 +44,9 @@ QGCPX4AirframeConfig::QGCPX4AirframeConfig(QWidget *parent) :
connect
(
ui
->
hComboBox
,
SIGNAL
(
currentIndexChanged
(
int
)),
this
,
SLOT
(
hSelected
(
int
)));
ui
->
hComboBox
->
addItem
(
tr
(
"TBS Discovery"
),
15
);
ui
->
hComboBox
->
addItem
(
tr
(
"H Custom"
),
16
);
connect
(
ui
->
applyButton
,
SIGNAL
(
clicked
()),
this
,
SLOT
(
applyAndReboot
()));
connect
(
UASManager
::
instance
(),
SIGNAL
(
activeUASSet
(
UASInterface
*
)),
this
,
SLOT
(
setActiveUAS
()));
...
...
src/ui/px4_configuration/QGCPX4AirframeConfig.ui
View file @
467a2a11
...
...
@@ -24,7 +24,7 @@
<rect>
<x>
0
</x>
<y>
0
</y>
<width>
80
2
</width>
<width>
76
2
</width>
<height>
531
</height>
</rect>
</property>
...
...
@@ -36,6 +36,10 @@
<property
name=
"text"
>
<string/>
</property>
<property
name=
"icon"
>
<iconset
resource=
"../../../qgroundcontrol.qrc"
>
<normaloff>
:/files/images/px4/airframes/plane_aert.png
</normaloff>
:/files/images/px4/airframes/plane_aert.png
</iconset>
</property>
<property
name=
"iconSize"
>
<size>
<width>
120
</width>
...
...
@@ -45,33 +49,7 @@
</widget>
</item>
<item>
<widget
class=
"QComboBox"
name=
"planeComboBox"
>
<item>
<property
name=
"text"
>
<string>
Please select
</string>
</property>
</item>
<item>
<property
name=
"text"
>
<string>
EasyStar
</string>
</property>
</item>
<item>
<property
name=
"text"
>
<string>
EasyStar 2
</string>
</property>
</item>
<item>
<property
name=
"text"
>
<string>
EasyStar 2 w. Ailerons
</string>
</property>
</item>
<item>
<property
name=
"text"
>
<string>
Bixler 2
</string>
</property>
</item>
</widget>
<widget
class=
"QComboBox"
name=
"planeComboBox"
/>
</item>
<item>
<widget
class=
"QLabel"
name=
"label"
>
...
...
@@ -89,21 +67,20 @@
<property
name=
"text"
>
<string/>
</property>
<property
name=
"icon"
>
<iconset
resource=
"../../../qgroundcontrol.qrc"
>
<normaloff>
:/files/images/px4/airframes/flying_wing.png
</normaloff>
:/files/images/px4/airframes/flying_wing.png
</iconset>
</property>
<property
name=
"iconSize"
>
<size>
<width>
120
</width>
<height>
120
</height>
</size>
</property>
</widget>
</item>
<item>
<widget
class=
"QComboBox"
name=
"flyingWingComboBox"
>
<item>
<property
name=
"text"
>
<string>
Bormatec CamFlyer Q
</string>
</property>
</item>
<item>
<property
name=
"text"
>
<string>
FX-61 Phantom
</string>
</property>
</item>
</widget>
<widget
class=
"QComboBox"
name=
"flyingWingComboBox"
/>
</item>
<item>
<widget
class=
"QLabel"
name=
"label_2"
>
...
...
@@ -134,28 +111,7 @@
</widget>
</item>
<item>
<widget
class=
"QComboBox"
name=
"quadXComboBox"
>
<item>
<property
name=
"text"
>
<string>
AR.Drone Frame
</string>
</property>
</item>
<item>
<property
name=
"text"
>
<string>
Arducopter C Frame
</string>
</property>
</item>
<item>
<property
name=
"text"
>
<string>
DJI F330 Frame
</string>
</property>
</item>
<item>
<property
name=
"text"
>
<string>
DJI F450 Frame
</string>
</property>
</item>
</widget>
<widget
class=
"QComboBox"
name=
"quadXComboBox"
/>
</item>
<item>
<widget
class=
"QLabel"
name=
"label_3"
>
...
...
@@ -331,18 +287,7 @@
</widget>
</item>
<item>
<widget
class=
"QComboBox"
name=
"hComboBox"
>
<item>
<property
name=
"text"
>
<string>
Steadydrone
</string>
</property>
</item>
<item>
<property
name=
"text"
>
<string>
H Frame Custom
</string>
</property>
</item>
</widget>
<widget
class=
"QComboBox"
name=
"hComboBox"
/>
</item>
<item>
<widget
class=
"QLabel"
name=
"label_9"
>
...
...
src/ui/uas/UASListWidget.cc
View file @
467a2a11
...
...
@@ -102,6 +102,9 @@ void UASListWidget::updateStatus()
while
(
i
.
hasNext
())
{
i
.
next
();
LinkInterface
*
link
=
i
.
key
();
if
(
!
link
)
continue
;
ProtocolInterface
*
p
=
LinkManager
::
instance
()
->
getProtocolForLink
(
link
);
// Build the tooltip out of the protocol parsing data: received, dropped, and parsing errors.
...
...
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