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
d04518d5
Commit
d04518d5
authored
Feb 18, 2016
by
Don Gagne
Browse files
Altitude properties are visually distinct
parent
a6cffd54
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/FlightMap/Widgets/ValuesWidget.qml
View file @
d04518d5
...
...
@@ -56,6 +56,15 @@ QGCFlickable {
qgcView
.
showDialog
(
propertyPicker
,
"
Value Widget Setup
"
,
qgcView
.
showDialogDefaultWidth
,
StandardButton
.
Ok
)
}
function
listContains
(
list
,
value
)
{
for
(
var
i
=
0
;
i
<
list
.
length
;
i
++
)
{
if
(
list
[
i
]
===
value
)
{
return
true
}
}
return
false
}
MouseArea
{
anchors.fill
:
parent
onClicked
:
showPicker
()
...
...
@@ -74,6 +83,7 @@ QGCFlickable {
width
:
_largeColumn
.
width
property
Fact
fact
:
_activeVehicle
.
getFact
(
modelData
.
replace
(
"
Vehicle.
"
,
""
))
property
bool
largeValue
:
_root
.
listContains
(
controller
.
altitudeProperties
,
fact
.
name
)
QGCLabel
{
width
:
parent
.
width
...
...
@@ -84,8 +94,8 @@ QGCFlickable {
QGCLabel
{
width
:
parent
.
width
horizontalAlignment
:
Text
.
AlignHCenter
font.pixelSize
:
ScreenTools
.
largeFontPixelSize
font.weight
:
Font
.
DemiBold
font.pixelSize
:
ScreenTools
.
largeFontPixelSize
*
(
largeValue
?
1.3
:
1.0
)
font.weight
:
largeValue
?
Font
.
ExtraBold
:
Font
.
Normal
color
:
textColor
text
:
fact
.
valueString
}
...
...
@@ -185,15 +195,6 @@ QGCFlickable {
property
string
propertyName
:
factGroupName
+
"
.
"
+
modelData
function
contains
(
list
,
value
)
{
for
(
var
i
=
0
;
i
<
list
.
length
;
i
++
)
{
if
(
list
[
i
]
===
value
)
{
return
true
}
}
return
false
}
function
removeFromList
(
list
,
value
)
{
var
newList
=
[]
for
(
var
i
=
0
;
i
<
list
.
length
;
i
++
)
{
...
...
@@ -236,14 +237,14 @@ QGCFlickable {
QGCCheckBox
{
id
:
_addCheckBox
text
:
factGroup
.
getFact
(
modelData
).
shortDescription
checked
:
_largeCheckBox
.
checked
||
parent
.
c
ontains
(
controller
.
smallValues
,
propertyName
)
checked
:
_largeCheckBox
.
checked
||
listC
ontains
(
controller
.
smallValues
,
propertyName
)
onClicked
:
updateValues
()
}
QGCCheckBox
{
id
:
_largeCheckBox
text
:
"
large
"
checked
:
parent
.
c
ontains
(
controller
.
largeValues
,
propertyName
)
checked
:
listC
ontains
(
controller
.
largeValues
,
propertyName
)
enabled
:
_addCheckBox
.
checked
onClicked
:
updateValues
()
}
...
...
src/FlightMap/Widgets/ValuesWidgetController.cc
View file @
d04518d5
...
...
@@ -40,6 +40,8 @@ ValuesWidgetController::ValuesWidgetController(void)
_largeValues
=
settings
.
value
(
_largeValuesKey
,
largeDefaults
).
toStringList
();
_smallValues
=
settings
.
value
(
_smallValuesKey
,
QStringList
()).
toStringList
();
_altitudeProperties
<<
"altitudeRelative"
<<
"altitudeAMSL"
;
// Keep back compat for removed WGS84 value
if
(
_largeValues
.
contains
(
"Vehicle.altitudeWGS84"
))
{
setLargeValues
(
_largeValues
.
replaceInStrings
(
"Vehicle.altitudeWGS84"
,
"Vehicle.altitudeRelative"
));
...
...
src/FlightMap/Widgets/ValuesWidgetController.h
View file @
d04518d5
...
...
@@ -36,10 +36,13 @@ public:
Q_PROPERTY
(
QStringList
largeValues
READ
largeValues
WRITE
setLargeValues
NOTIFY
largeValuesChanged
)
Q_PROPERTY
(
QStringList
smallValues
READ
smallValues
WRITE
setSmallValues
NOTIFY
smallValuesChanged
)
Q_PROPERTY
(
QStringList
altitudeProperties
READ
altitudeProperties
CONSTANT
)
QStringList
largeValues
(
void
)
const
{
return
_largeValues
;
}
QStringList
smallValues
(
void
)
const
{
return
_smallValues
;
}
void
setLargeValues
(
const
QStringList
&
values
);
void
setSmallValues
(
const
QStringList
&
values
);
QStringList
altitudeProperties
(
void
)
const
{
return
_altitudeProperties
;
}
signals:
void
largeValuesChanged
(
QStringList
values
);
...
...
@@ -48,6 +51,7 @@ signals:
private:
QStringList
_largeValues
;
QStringList
_smallValues
;
QStringList
_altitudeProperties
;
static
const
char
*
_groupKey
;
static
const
char
*
_largeValuesKey
;
...
...
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