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
b88923e8
Commit
b88923e8
authored
May 22, 2019
by
Stefan Dunca
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Get the default metric system from system locale
parent
e2b34aaf
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
48 additions
and
4 deletions
+48
-4
UnitsSettings.cc
src/Settings/UnitsSettings.cc
+48
-4
No files found.
src/Settings/UnitsSettings.cc
View file @
b88923e8
...
...
@@ -29,7 +29,18 @@ DECLARE_SETTINGSFACT_NO_FUNC(UnitsSettings, distanceUnits)
metaData
->
setName
(
distanceUnitsName
);
metaData
->
setShortDescription
(
"Distance units"
);
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
);
_distanceUnitsFact
=
new
SettingsFact
(
_settingsGroup
,
metaData
,
this
);
}
...
...
@@ -54,7 +65,18 @@ DECLARE_SETTINGSFACT_NO_FUNC(UnitsSettings, areaUnits)
metaData
->
setName
(
areaUnitsName
);
metaData
->
setShortDescription
(
"Area units"
);
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
);
_areaUnitsFact
=
new
SettingsFact
(
_settingsGroup
,
metaData
,
this
);
}
...
...
@@ -78,7 +100,18 @@ DECLARE_SETTINGSFACT_NO_FUNC(UnitsSettings, speedUnits)
metaData
->
setName
(
speedUnitsName
);
metaData
->
setShortDescription
(
"Speed units"
);
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
);
_speedUnitsFact
=
new
SettingsFact
(
_settingsGroup
,
metaData
,
this
);
}
...
...
@@ -97,7 +130,18 @@ DECLARE_SETTINGSFACT_NO_FUNC(UnitsSettings, temperatureUnits)
metaData
->
setName
(
temperatureUnitsName
);
metaData
->
setShortDescription
(
"Temperature units"
);
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
);
_temperatureUnitsFact
=
new
SettingsFact
(
_settingsGroup
,
metaData
,
this
);
}
...
...
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