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
b88923e8
Commit
b88923e8
authored
May 22, 2019
by
Stefan Dunca
Browse files
Get the default metric system from system locale
parent
e2b34aaf
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/Settings/UnitsSettings.cc
View file @
b88923e8
...
@@ -29,7 +29,18 @@ DECLARE_SETTINGSFACT_NO_FUNC(UnitsSettings, distanceUnits)
...
@@ -29,7 +29,18 @@ DECLARE_SETTINGSFACT_NO_FUNC(UnitsSettings, distanceUnits)
metaData
->
setName
(
distanceUnitsName
);
metaData
->
setName
(
distanceUnitsName
);
metaData
->
setShortDescription
(
"Distance units"
);
metaData
->
setShortDescription
(
"Distance units"
);
metaData
->
setEnumInfo
(
enumStrings
,
enumValues
);
metaData
->
setEnumInfo
(
enumStrings
,
enumValues
);
metaData
->
setRawDefaultValue
(
DistanceUnitsMeters
);
DistanceUnits
defaultDistanceUnit
=
DistanceUnitsMeters
;
switch
(
QLocale
::
system
().
measurementSystem
())
{
case
QLocale
::
MetricSystem
:
{
defaultDistanceUnit
=
DistanceUnitsMeters
;
}
break
;
case
QLocale
::
ImperialUSSystem
:
case
QLocale
::
ImperialUKSystem
:
defaultDistanceUnit
=
DistanceUnitsFeet
;
break
;
}
metaData
->
setRawDefaultValue
(
defaultDistanceUnit
);
metaData
->
setQGCRebootRequired
(
true
);
metaData
->
setQGCRebootRequired
(
true
);
_distanceUnitsFact
=
new
SettingsFact
(
_settingsGroup
,
metaData
,
this
);
_distanceUnitsFact
=
new
SettingsFact
(
_settingsGroup
,
metaData
,
this
);
}
}
...
@@ -54,7 +65,18 @@ DECLARE_SETTINGSFACT_NO_FUNC(UnitsSettings, areaUnits)
...
@@ -54,7 +65,18 @@ DECLARE_SETTINGSFACT_NO_FUNC(UnitsSettings, areaUnits)
metaData
->
setName
(
areaUnitsName
);
metaData
->
setName
(
areaUnitsName
);
metaData
->
setShortDescription
(
"Area units"
);
metaData
->
setShortDescription
(
"Area units"
);
metaData
->
setEnumInfo
(
enumStrings
,
enumValues
);
metaData
->
setEnumInfo
(
enumStrings
,
enumValues
);
metaData
->
setRawDefaultValue
(
AreaUnitsSquareMeters
);
AreaUnits
defaultAreaUnit
=
AreaUnitsSquareMeters
;
switch
(
QLocale
::
system
().
measurementSystem
())
{
case
QLocale
::
MetricSystem
:
{
defaultAreaUnit
=
AreaUnitsSquareMeters
;
}
break
;
case
QLocale
::
ImperialUSSystem
:
case
QLocale
::
ImperialUKSystem
:
defaultAreaUnit
=
AreaUnitsSquareMiles
;
break
;
}
metaData
->
setRawDefaultValue
(
defaultAreaUnit
);
metaData
->
setQGCRebootRequired
(
true
);
metaData
->
setQGCRebootRequired
(
true
);
_areaUnitsFact
=
new
SettingsFact
(
_settingsGroup
,
metaData
,
this
);
_areaUnitsFact
=
new
SettingsFact
(
_settingsGroup
,
metaData
,
this
);
}
}
...
@@ -78,7 +100,18 @@ DECLARE_SETTINGSFACT_NO_FUNC(UnitsSettings, speedUnits)
...
@@ -78,7 +100,18 @@ DECLARE_SETTINGSFACT_NO_FUNC(UnitsSettings, speedUnits)
metaData
->
setName
(
speedUnitsName
);
metaData
->
setName
(
speedUnitsName
);
metaData
->
setShortDescription
(
"Speed units"
);
metaData
->
setShortDescription
(
"Speed units"
);
metaData
->
setEnumInfo
(
enumStrings
,
enumValues
);
metaData
->
setEnumInfo
(
enumStrings
,
enumValues
);
metaData
->
setRawDefaultValue
(
SpeedUnitsMetersPerSecond
);
SpeedUnits
defaultSpeedUnit
=
SpeedUnitsMetersPerSecond
;
switch
(
QLocale
::
system
().
measurementSystem
())
{
case
QLocale
::
MetricSystem
:
{
defaultSpeedUnit
=
SpeedUnitsMetersPerSecond
;
}
break
;
case
QLocale
::
ImperialUSSystem
:
case
QLocale
::
ImperialUKSystem
:
defaultSpeedUnit
=
SpeedUnitsMilesPerHour
;
break
;
}
metaData
->
setRawDefaultValue
(
defaultSpeedUnit
);
metaData
->
setQGCRebootRequired
(
true
);
metaData
->
setQGCRebootRequired
(
true
);
_speedUnitsFact
=
new
SettingsFact
(
_settingsGroup
,
metaData
,
this
);
_speedUnitsFact
=
new
SettingsFact
(
_settingsGroup
,
metaData
,
this
);
}
}
...
@@ -97,7 +130,18 @@ DECLARE_SETTINGSFACT_NO_FUNC(UnitsSettings, temperatureUnits)
...
@@ -97,7 +130,18 @@ DECLARE_SETTINGSFACT_NO_FUNC(UnitsSettings, temperatureUnits)
metaData
->
setName
(
temperatureUnitsName
);
metaData
->
setName
(
temperatureUnitsName
);
metaData
->
setShortDescription
(
"Temperature units"
);
metaData
->
setShortDescription
(
"Temperature units"
);
metaData
->
setEnumInfo
(
enumStrings
,
enumValues
);
metaData
->
setEnumInfo
(
enumStrings
,
enumValues
);
metaData
->
setRawDefaultValue
(
TemperatureUnitsCelsius
);
TemperatureUnits
defaultTemperatureUnit
=
TemperatureUnitsCelsius
;
switch
(
QLocale
::
system
().
measurementSystem
())
{
case
QLocale
::
MetricSystem
:
{
defaultTemperatureUnit
=
TemperatureUnitsCelsius
;
}
break
;
case
QLocale
::
ImperialUSSystem
:
case
QLocale
::
ImperialUKSystem
:
defaultTemperatureUnit
=
TemperatureUnitsFarenheit
;
break
;
}
metaData
->
setRawDefaultValue
(
defaultTemperatureUnit
);
metaData
->
setQGCRebootRequired
(
true
);
metaData
->
setQGCRebootRequired
(
true
);
_temperatureUnitsFact
=
new
SettingsFact
(
_settingsGroup
,
metaData
,
this
);
_temperatureUnitsFact
=
new
SettingsFact
(
_settingsGroup
,
metaData
,
this
);
}
}
...
...
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