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
d7aa3a1f
Commit
d7aa3a1f
authored
Dec 23, 2014
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add FactLabel and FactTextField qml controls
parent
6b1383fe
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
41 additions
and
2 deletions
+41
-2
qgroundcontrol.qrc
qgroundcontrol.qrc
+8
-0
FactLabel.qml
qml/QGroundControl/FactControls/FactLabel.qml
+13
-0
FactTextField.qml
qml/QGroundControl/FactControls/FactTextField.qml
+14
-0
qmldir
qml/QGroundControl/FactControls/qmldir
+2
-1
SafetyComponent.qml
src/AutoPilotPlugins/PX4/SafetyComponent.qml
+4
-1
No files found.
qgroundcontrol.qrc
View file @
d7aa3a1f
...
...
@@ -237,12 +237,20 @@
</qresource>
<qresource prefix="/qml">
<file alias="test.qml">src/test.qml</file>
<file alias="QGroundControl/FactControls/qmldir">qml/QGroundControl/FactControls/qmldir</file>
<file alias="QGroundControl/FactControls/SetupButton.qml">qml/QGroundControl/FactControls/SetupButton.qml</file>
<file alias="QGroundControl/FactControls/FactLabel.qml">qml/QGroundControl/FactControls/FactLabel.qml</file>
<file alias="QGroundControl/FactControls/FactTextField.qml">qml/QGroundControl/FactControls/FactTextField.qml</file>
<file alias="octo_x.png">files/images/px4/airframes/octo_x.png</file>
<file alias="px4fmu_2.x.png">files/images/px4/boards/px4fmu_2.x.png</file>
<file alias="SetupViewConnected.qml">src/VehicleSetup/SetupViewConnected.qml</file>
<file alias="SetupViewDisconnected.qml">src/VehicleSetup/SetupViewDisconnected.qml</file>
<file alias="SafetyComponent.qml">src/AutoPilotPlugins/PX4/SafetyComponent.qml</file>
</qresource>
<qresource prefix="/AutoPilotPlugins/PX4">
...
...
qml/QGroundControl/FactControls/FactLabel.qml
0 → 100644
View file @
d7aa3a1f
import
QtQuick
2.2
import
QtQuick
.
Controls
1.2
import
QtQuick
.
Controls
.
Styles
1.2
import
QGroundControl
.
FactSystem
1.0
Label
{
property
Fact
fact
:
Fact
{
value
:
"
FactLabel
"
}
QGCPalette
{
id
:
palette
;
colorGroup
:
QGCPalette
.
Active
}
color
:
palette
.
windowText
text
:
fact
.
value
}
qml/QGroundControl/FactControls/FactTextField.qml
0 → 100644
View file @
d7aa3a1f
import
QtQuick
2.2
import
QtQuick
.
Controls
1.2
import
QtQuick
.
Controls
.
Styles
1.2
import
QGroundControl
.
FactSystem
1.0
TextField
{
property
Fact
fact
:
Fact
{
value
:
0
}
QGCPalette
{
id
:
palette
;
colorGroup
:
QGCPalette
.
Active
}
text
:
fact
.
value
onAccepted
:
fact
.
value
=
text
}
qml/QGroundControl/FactControls/qmldir
View file @
d7aa3a1f
Module QGroundControl.FactControls
SetupButton 1.0 SetupButton.qml
\ No newline at end of file
FactLabel 1.0 FactLabel.qml
FactTextField 1.0 FactTextField.qml
\ No newline at end of file
src/AutoPilotPlugins/PX4/SafetyComponent.qml
View file @
d7aa3a1f
...
...
@@ -2,6 +2,7 @@ import QtQuick 2.2
import
QtQuick
.
Controls
1.2
import
QtQuick
.
Controls
.
Styles
1.2
import
QGroundControl
.
FactSystem
1.0
import
QGroundControl
.
FactControls
1.0
Rectangle
{
QGCPalette
{
id
:
palette
;
colorGroup
:
QGCPalette
.
Active
}
...
...
@@ -12,6 +13,8 @@ Rectangle {
Column
{
Label
{
text
:
"
Work in Progress
"
;
color
:
palette
.
windowText
}
Label
{
text
:
autopilot
.
parameters
[
"
RTL_RETURN_ALT
"
].
value
;
color
:
palette
.
windowText
}
Label
{
text
:
"
Return to Land Altitude
"
;
color
:
palette
.
windowText
}
FactLabel
{
fact
:
autopilot
.
parameters
[
"
RTL_RETURN_ALT
"
]
}
FactTextField
{
fact
:
autopilot
.
parameters
[
"
RTL_RETURN_ALT
"
]
}
}
}
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