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
39f67c63
Commit
39f67c63
authored
Feb 20, 2017
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add new SettingsGroup support
parent
a8ada715
Changes
33
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
33 changed files
with
699 additions
and
170 deletions
+699
-170
qgroundcontrol.pro
qgroundcontrol.pro
+13
-2
qgroundcontrol.qrc
qgroundcontrol.qrc
+4
-1
FactMetaData.cc
src/FactSystem/FactMetaData.cc
+19
-19
MapScale.qml
src/FlightMap/MapScale.qml
+1
-1
GAudioOutput.cc
src/GAudioOutput.cc
+1
-1
MissionSettingsEditor.qml
src/MissionEditor/MissionSettingsEditor.qml
+5
-5
MissionCommandTree.cc
src/MissionManager/MissionCommandTree.cc
+2
-2
MissionController.cc
src/MissionManager/MissionController.cc
+3
-3
RallyPointController.cc
src/MissionManager/RallyPointController.cc
+1
-1
SimpleMissionItem.cc
src/MissionManager/SimpleMissionItem.cc
+1
-1
SimpleMissionItemTest.cc
src/MissionManager/SimpleMissionItemTest.cc
+2
-2
AppSettings.cc
src/Settings/AppSettings.cc
+129
-0
AppSettings.h
src/Settings/AppSettings.h
+6
-58
AutoConnectSettings.cc
src/Settings/AutoConnectSettings.cc
+21
-0
AutoConnectSettings.h
src/Settings/AutoConnectSettings.h
+27
-0
SettingsGroup.app.json
src/Settings/SettingsGroup.app.json
+0
-0
SettingsGroup.autoConnect.json
src/Settings/SettingsGroup.autoConnect.json
+2
-0
SettingsGroup.cc
src/Settings/SettingsGroup.cc
+29
-0
SettingsGroup.h
src/Settings/SettingsGroup.h
+43
-0
SettingsGroup.units.json
src/Settings/SettingsGroup.units.json
+2
-0
SettingsGroup.video.json
src/Settings/SettingsGroup.video.json
+2
-0
SettingsManager.cc
src/Settings/SettingsManager.cc
+34
-0
SettingsManager.h
src/Settings/SettingsManager.h
+52
-0
UnitsSettings.cc
src/Settings/UnitsSettings.cc
+93
-0
UnitsSettings.h
src/Settings/UnitsSettings.h
+68
-0
VideoSettings.cc
src/Settings/VideoSettings.cc
+21
-0
VideoSettings.h
src/Settings/VideoSettings.h
+27
-0
MultiVehicleManager.cc
src/Vehicle/MultiVehicleManager.cc
+2
-2
Vehicle.cc
src/Vehicle/Vehicle.cc
+10
-10
QGCCorePlugin.cc
src/api/QGCCorePlugin.cc
+8
-0
QGCCorePlugin.h
src/api/QGCCorePlugin.h
+5
-0
MAVLinkProtocol.cc
src/comm/MAVLinkProtocol.cc
+1
-1
GeneralSettings.qml
src/ui/preferences/GeneralSettings.qml
+65
-61
No files found.
qgroundcontrol.pro
View file @
39f67c63
...
@@ -291,6 +291,7 @@ INCLUDEPATH += \
...
@@ -291,6 +291,7 @@ INCLUDEPATH += \
src/QmlControls \
src/QmlControls \
src/QtLocationPlugin \
src/QtLocationPlugin \
src/QtLocationPlugin/QMLControl \
src/QtLocationPlugin/QMLControl \
src/Settings \
src/VehicleSetup \
src/VehicleSetup \
src/ViewWidgets \
src/ViewWidgets \
src/audio \
src/audio \
...
@@ -474,7 +475,12 @@ HEADERS += \
...
@@ -474,7 +475,12 @@ HEADERS += \
src/QmlControls/RCChannelMonitorController.h \
src/QmlControls/RCChannelMonitorController.h \
src/QmlControls/ScreenToolsController.h \
src/QmlControls/ScreenToolsController.h \
src/QtLocationPlugin/QMLControl/QGCMapEngineManager.h \
src/QtLocationPlugin/QMLControl/QGCMapEngineManager.h \
src/SettingsManager.h \
src/Settings/AppSettings.h \
src/Settings/AutoConnectSettings.h \
src/Settings/SettingsGroup.h \
src/Settings/SettingsManager.h \
src/Settings/UnitsSettings.h \
src/Settings/VideoSettings.h \
src/Vehicle/MAVLinkLogManager.h \
src/Vehicle/MAVLinkLogManager.h \
src/VehicleSetup/JoystickConfigController.h \
src/VehicleSetup/JoystickConfigController.h \
src/audio/QGCAudioWorker.h \
src/audio/QGCAudioWorker.h \
...
@@ -636,7 +642,12 @@ SOURCES += \
...
@@ -636,7 +642,12 @@ SOURCES += \
src/QmlControls/RCChannelMonitorController.cc \
src/QmlControls/RCChannelMonitorController.cc \
src/QmlControls/ScreenToolsController.cc \
src/QmlControls/ScreenToolsController.cc \
src/QtLocationPlugin/QMLControl/QGCMapEngineManager.cc \
src/QtLocationPlugin/QMLControl/QGCMapEngineManager.cc \
src/SettingsManager.cc \
src/Settings/AppSettings.cc \
src/Settings/AutoConnectSettings.cc \
src/Settings/SettingsGroup.cc \
src/Settings/SettingsManager.cc \
src/Settings/UnitsSettings.cc \
src/Settings/VideoSettings.cc \
src/Vehicle/MAVLinkLogManager.cc \
src/Vehicle/MAVLinkLogManager.cc \
src/VehicleSetup/JoystickConfigController.cc \
src/VehicleSetup/JoystickConfigController.cc \
src/audio/QGCAudioWorker.cpp \
src/audio/QGCAudioWorker.cpp \
...
...
qgroundcontrol.qrc
View file @
39f67c63
...
@@ -178,7 +178,10 @@
...
@@ -178,7 +178,10 @@
<file alias="Vehicle/GPSFact.json">src/Vehicle/GPSFact.json</file>
<file alias="Vehicle/GPSFact.json">src/Vehicle/GPSFact.json</file>
<file alias="Vehicle/WindFact.json">src/Vehicle/WindFact.json</file>
<file alias="Vehicle/WindFact.json">src/Vehicle/WindFact.json</file>
<file alias="Vehicle/VibrationFact.json">src/Vehicle/VibrationFact.json</file>
<file alias="Vehicle/VibrationFact.json">src/Vehicle/VibrationFact.json</file>
<file alias="SettingsManager.json">src/SettingsManager.json</file>
<file alias="SettingsGroup.app.json">src/Settings/SettingsGroup.app.json</file>
<file alias="SettingsGroup.autoConnect.json">src/Settings/SettingsGroup.autoConnect.json</file>
<file alias="SettingsGroup.units.json">src/Settings/SettingsGroup.units.json</file>
<file alias="SettingsGroup.video.json">src/Settings/SettingsGroup.video.json</file>
<file alias="RallyPoint.FactMetaData.json">src/MissionManager/RallyPoint.FactMetaData.json</file>
<file alias="RallyPoint.FactMetaData.json">src/MissionManager/RallyPoint.FactMetaData.json</file>
<file alias="FWLandingPattern.FactMetaData.json">src/MissionManager/FWLandingPattern.FactMetaData.json</file>
<file alias="FWLandingPattern.FactMetaData.json">src/MissionManager/FWLandingPattern.FactMetaData.json</file>
<file alias="Survey.FactMetaData.json">src/MissionManager/Survey.FactMetaData.json</file>
<file alias="Survey.FactMetaData.json">src/MissionManager/Survey.FactMetaData.json</file>
...
...
src/FactSystem/FactMetaData.cc
View file @
39f67c63
...
@@ -40,21 +40,21 @@ const FactMetaData::BuiltInTranslation_s FactMetaData::_rgBuiltInTranslations[]
...
@@ -40,21 +40,21 @@ const FactMetaData::BuiltInTranslation_s FactMetaData::_rgBuiltInTranslations[]
// Translations driven by app settings
// Translations driven by app settings
const
FactMetaData
::
AppSettingsTranslation_s
FactMetaData
::
_rgAppSettingsTranslations
[]
=
{
const
FactMetaData
::
AppSettingsTranslation_s
FactMetaData
::
_rgAppSettingsTranslations
[]
=
{
{
"m"
,
"m"
,
false
,
SettingsManager
::
DistanceUnitsMeters
,
FactMetaData
::
_defaultTranslator
,
FactMetaData
::
_defaultTranslator
},
{
"m"
,
"m"
,
false
,
UnitsSettings
::
DistanceUnitsMeters
,
FactMetaData
::
_defaultTranslator
,
FactMetaData
::
_defaultTranslator
},
{
"meters"
,
"meters"
,
false
,
SettingsManager
::
DistanceUnitsMeters
,
FactMetaData
::
_defaultTranslator
,
FactMetaData
::
_defaultTranslator
},
{
"meters"
,
"meters"
,
false
,
UnitsSettings
::
DistanceUnitsMeters
,
FactMetaData
::
_defaultTranslator
,
FactMetaData
::
_defaultTranslator
},
{
"m/s"
,
"m/s"
,
true
,
SettingsManager
::
SpeedUnitsMetersPerSecond
,
FactMetaData
::
_defaultTranslator
,
FactMetaData
::
_defaultTranslator
},
{
"m/s"
,
"m/s"
,
true
,
UnitsSettings
::
SpeedUnitsMetersPerSecond
,
FactMetaData
::
_defaultTranslator
,
FactMetaData
::
_defaultTranslator
},
{
"m^2"
,
"m^2"
,
false
,
SettingsManager
::
AreaUnitsSquareMeters
,
FactMetaData
::
_defaultTranslator
,
FactMetaData
::
_defaultTranslator
},
{
"m^2"
,
"m^2"
,
false
,
UnitsSettings
::
AreaUnitsSquareMeters
,
FactMetaData
::
_defaultTranslator
,
FactMetaData
::
_defaultTranslator
},
{
"m"
,
"ft"
,
false
,
SettingsManager
::
DistanceUnitsFeet
,
FactMetaData
::
_metersToFeet
,
FactMetaData
::
_feetToMeters
},
{
"m"
,
"ft"
,
false
,
UnitsSettings
::
DistanceUnitsFeet
,
FactMetaData
::
_metersToFeet
,
FactMetaData
::
_feetToMeters
},
{
"meters"
,
"ft"
,
false
,
SettingsManager
::
DistanceUnitsFeet
,
FactMetaData
::
_metersToFeet
,
FactMetaData
::
_feetToMeters
},
{
"meters"
,
"ft"
,
false
,
UnitsSettings
::
DistanceUnitsFeet
,
FactMetaData
::
_metersToFeet
,
FactMetaData
::
_feetToMeters
},
{
"m^2"
,
"km^2"
,
false
,
SettingsManager
::
AreaUnitsSquareKilometers
,
FactMetaData
::
_squareMetersToSquareKilometers
,
FactMetaData
::
_squareKilometersToSquareMeters
},
{
"m^2"
,
"km^2"
,
false
,
UnitsSettings
::
AreaUnitsSquareKilometers
,
FactMetaData
::
_squareMetersToSquareKilometers
,
FactMetaData
::
_squareKilometersToSquareMeters
},
{
"m^2"
,
"ha"
,
false
,
SettingsManager
::
AreaUnitsHectares
,
FactMetaData
::
_squareMetersToHectares
,
FactMetaData
::
_hectaresToSquareMeters
},
{
"m^2"
,
"ha"
,
false
,
UnitsSettings
::
AreaUnitsHectares
,
FactMetaData
::
_squareMetersToHectares
,
FactMetaData
::
_hectaresToSquareMeters
},
{
"m^2"
,
"ft^2"
,
false
,
SettingsManager
::
AreaUnitsSquareFeet
,
FactMetaData
::
_squareMetersToSquareFeet
,
FactMetaData
::
_squareFeetToSquareMeters
},
{
"m^2"
,
"ft^2"
,
false
,
UnitsSettings
::
AreaUnitsSquareFeet
,
FactMetaData
::
_squareMetersToSquareFeet
,
FactMetaData
::
_squareFeetToSquareMeters
},
{
"m^2"
,
"ac"
,
false
,
SettingsManager
::
AreaUnitsAcres
,
FactMetaData
::
_squareMetersToAcres
,
FactMetaData
::
_acresToSquareMeters
},
{
"m^2"
,
"ac"
,
false
,
UnitsSettings
::
AreaUnitsAcres
,
FactMetaData
::
_squareMetersToAcres
,
FactMetaData
::
_acresToSquareMeters
},
{
"m^2"
,
"mi^2"
,
false
,
SettingsManager
::
AreaUnitsSquareMiles
,
FactMetaData
::
_squareMetersToSquareMiles
,
FactMetaData
::
_squareMilesToSquareMeters
},
{
"m^2"
,
"mi^2"
,
false
,
UnitsSettings
::
AreaUnitsSquareMiles
,
FactMetaData
::
_squareMetersToSquareMiles
,
FactMetaData
::
_squareMilesToSquareMeters
},
{
"m/s"
,
"ft/s"
,
true
,
SettingsManager
::
SpeedUnitsFeetPerSecond
,
FactMetaData
::
_metersToFeet
,
FactMetaData
::
_feetToMeters
},
{
"m/s"
,
"ft/s"
,
true
,
UnitsSettings
::
SpeedUnitsFeetPerSecond
,
FactMetaData
::
_metersToFeet
,
FactMetaData
::
_feetToMeters
},
{
"m/s"
,
"mph"
,
true
,
SettingsManager
::
SpeedUnitsMilesPerHour
,
FactMetaData
::
_metersPerSecondToMilesPerHour
,
FactMetaData
::
_milesPerHourToMetersPerSecond
},
{
"m/s"
,
"mph"
,
true
,
UnitsSettings
::
SpeedUnitsMilesPerHour
,
FactMetaData
::
_metersPerSecondToMilesPerHour
,
FactMetaData
::
_milesPerHourToMetersPerSecond
},
{
"m/s"
,
"km/h"
,
true
,
SettingsManager
::
SpeedUnitsKilometersPerHour
,
FactMetaData
::
_metersPerSecondToKilometersPerHour
,
FactMetaData
::
_kilometersPerHourToMetersPerSecond
},
{
"m/s"
,
"km/h"
,
true
,
UnitsSettings
::
SpeedUnitsKilometersPerHour
,
FactMetaData
::
_metersPerSecondToKilometersPerHour
,
FactMetaData
::
_kilometersPerHourToMetersPerSecond
},
{
"m/s"
,
"kn"
,
true
,
SettingsManager
::
SpeedUnitsKnots
,
FactMetaData
::
_metersPerSecondToKnots
,
FactMetaData
::
_knotsToMetersPerSecond
},
{
"m/s"
,
"kn"
,
true
,
UnitsSettings
::
SpeedUnitsKnots
,
FactMetaData
::
_metersPerSecondToKnots
,
FactMetaData
::
_knotsToMetersPerSecond
},
};
};
const
char
*
FactMetaData
::
_decimalPlacesJsonKey
=
"decimalPlaces"
;
const
char
*
FactMetaData
::
_decimalPlacesJsonKey
=
"decimalPlaces"
;
...
@@ -635,8 +635,8 @@ void FactMetaData::_setAppSettingsTranslators(void)
...
@@ -635,8 +635,8 @@ void FactMetaData::_setAppSettingsTranslators(void)
const
AppSettingsTranslation_s
*
pAppSettingsTranslation
=
&
_rgAppSettingsTranslations
[
i
];
const
AppSettingsTranslation_s
*
pAppSettingsTranslation
=
&
_rgAppSettingsTranslations
[
i
];
if
(
pAppSettingsTranslation
->
rawUnits
==
_rawUnits
.
toLower
()
&&
if
(
pAppSettingsTranslation
->
rawUnits
==
_rawUnits
.
toLower
()
&&
((
pAppSettingsTranslation
->
speed
&&
pAppSettingsTranslation
->
speedOrDistanceUnits
==
qgcApp
()
->
toolbox
()
->
settingsManager
()
->
speedUnits
()
->
rawValue
().
toUInt
())
||
((
pAppSettingsTranslation
->
speed
&&
pAppSettingsTranslation
->
speedOrDistanceUnits
==
qgcApp
()
->
toolbox
()
->
settingsManager
()
->
unitsSettings
()
->
speedUnits
()
->
rawValue
().
toUInt
())
||
(
!
pAppSettingsTranslation
->
speed
&&
pAppSettingsTranslation
->
speedOrDistanceUnits
==
qgcApp
()
->
toolbox
()
->
settingsManager
()
->
distanceUnits
()
->
rawValue
().
toUInt
())))
{
(
!
pAppSettingsTranslation
->
speed
&&
pAppSettingsTranslation
->
speedOrDistanceUnits
==
qgcApp
()
->
toolbox
()
->
settingsManager
()
->
unitsSettings
()
->
distanceUnits
()
->
rawValue
().
toUInt
())))
{
_cookedUnits
=
pAppSettingsTranslation
->
cookedUnits
;
_cookedUnits
=
pAppSettingsTranslation
->
cookedUnits
;
setTranslators
(
pAppSettingsTranslation
->
rawTranslator
,
pAppSettingsTranslation
->
cookedTranslator
);
setTranslators
(
pAppSettingsTranslation
->
rawTranslator
,
pAppSettingsTranslation
->
cookedTranslator
);
return
;
return
;
...
@@ -651,7 +651,7 @@ const FactMetaData::AppSettingsTranslation_s* FactMetaData::_findAppSettingsDist
...
@@ -651,7 +651,7 @@ const FactMetaData::AppSettingsTranslation_s* FactMetaData::_findAppSettingsDist
const
AppSettingsTranslation_s
*
pAppSettingsTranslation
=
&
_rgAppSettingsTranslations
[
i
];
const
AppSettingsTranslation_s
*
pAppSettingsTranslation
=
&
_rgAppSettingsTranslations
[
i
];
if
(
pAppSettingsTranslation
->
rawUnits
==
rawUnits
&&
if
(
pAppSettingsTranslation
->
rawUnits
==
rawUnits
&&
(
!
pAppSettingsTranslation
->
speed
&&
pAppSettingsTranslation
->
speedOrDistanceUnits
==
qgcApp
()
->
toolbox
()
->
settingsManager
()
->
distanceUnits
()
->
rawValue
().
toUInt
()))
{
(
!
pAppSettingsTranslation
->
speed
&&
pAppSettingsTranslation
->
speedOrDistanceUnits
==
qgcApp
()
->
toolbox
()
->
settingsManager
()
->
unitsSettings
()
->
distanceUnits
()
->
rawValue
().
toUInt
()))
{
return
pAppSettingsTranslation
;
return
pAppSettingsTranslation
;
}
}
}
}
...
@@ -665,7 +665,7 @@ const FactMetaData::AppSettingsTranslation_s* FactMetaData::_findAppSettingsArea
...
@@ -665,7 +665,7 @@ const FactMetaData::AppSettingsTranslation_s* FactMetaData::_findAppSettingsArea
const
AppSettingsTranslation_s
*
pAppSettingsTranslation
=
&
_rgAppSettingsTranslations
[
i
];
const
AppSettingsTranslation_s
*
pAppSettingsTranslation
=
&
_rgAppSettingsTranslations
[
i
];
if
(
pAppSettingsTranslation
->
rawUnits
==
rawUnits
&&
if
(
pAppSettingsTranslation
->
rawUnits
==
rawUnits
&&
(
!
pAppSettingsTranslation
->
speed
&&
pAppSettingsTranslation
->
speedOrDistanceUnits
==
qgcApp
()
->
toolbox
()
->
settingsManager
()
->
areaUnits
()
->
rawValue
().
toUInt
())
(
!
pAppSettingsTranslation
->
speed
&&
pAppSettingsTranslation
->
speedOrDistanceUnits
==
qgcApp
()
->
toolbox
()
->
settingsManager
()
->
unitsSettings
()
->
areaUnits
()
->
rawValue
().
toUInt
())
)
{
)
{
return
pAppSettingsTranslation
;
return
pAppSettingsTranslation
;
}
}
...
...
src/FlightMap/MapScale.qml
View file @
39f67c63
...
@@ -115,7 +115,7 @@ Item {
...
@@ -115,7 +115,7 @@ Item {
var
rightCoord
=
mapControl
.
toCoordinate
(
Qt
.
point
(
scaleLinePixelLength
,
scale
.
y
))
var
rightCoord
=
mapControl
.
toCoordinate
(
Qt
.
point
(
scaleLinePixelLength
,
scale
.
y
))
var
scaleLineMeters
=
Math
.
round
(
leftCoord
.
distanceTo
(
rightCoord
))
var
scaleLineMeters
=
Math
.
round
(
leftCoord
.
distanceTo
(
rightCoord
))
if
(
QGroundControl
.
settingsManager
.
distanceUnits
.
value
==
QGroundControl
.
settingsManager
.
DistanceUnitsFeet
)
{
if
(
QGroundControl
.
settingsManager
.
unitsSettings
.
distanceUnits
.
value
==
UnitsSettings
.
DistanceUnitsFeet
)
{
calculateFeetRatio
(
scaleLineMeters
,
scaleLinePixelLength
)
calculateFeetRatio
(
scaleLineMeters
,
scaleLinePixelLength
)
}
else
{
}
else
{
calculateMetersRatio
(
scaleLineMeters
,
scaleLinePixelLength
)
calculateMetersRatio
(
scaleLineMeters
,
scaleLinePixelLength
)
...
...
src/GAudioOutput.cc
View file @
39f67c63
...
@@ -56,7 +56,7 @@ GAudioOutput::~GAudioOutput()
...
@@ -56,7 +56,7 @@ GAudioOutput::~GAudioOutput()
bool
GAudioOutput
::
say
(
const
QString
&
inText
)
bool
GAudioOutput
::
say
(
const
QString
&
inText
)
{
{
bool
muted
=
qgcApp
()
->
toolbox
()
->
settingsManager
()
->
audioMuted
()
->
rawValue
().
toBool
();
bool
muted
=
qgcApp
()
->
toolbox
()
->
settingsManager
()
->
a
ppSettings
()
->
a
udioMuted
()
->
rawValue
().
toBool
();
muted
|=
qgcApp
()
->
runningUnitTests
();
muted
|=
qgcApp
()
->
runningUnitTests
();
if
(
!
muted
&&
!
qgcApp
()
->
runningUnitTests
())
{
if
(
!
muted
&&
!
qgcApp
()
->
runningUnitTests
())
{
#if defined __android__
#if defined __android__
...
...
src/MissionEditor/MissionSettingsEditor.qml
View file @
39f67c63
...
@@ -122,7 +122,7 @@ Rectangle {
...
@@ -122,7 +122,7 @@ Rectangle {
Layout.fillWidth
:
true
Layout.fillWidth
:
true
}
}
FactComboBox
{
FactComboBox
{
fact
:
QGroundControl
.
settingsManager
.
offlineEditingFirmwareType
fact
:
QGroundControl
.
settingsManager
.
appSettings
.
offlineEditingFirmwareType
indexModel
:
false
indexModel
:
false
visible
:
_showOfflineEditingCombos
visible
:
_showOfflineEditingCombos
Layout.preferredWidth
:
_fieldWidth
Layout.preferredWidth
:
_fieldWidth
...
@@ -146,7 +146,7 @@ Rectangle {
...
@@ -146,7 +146,7 @@ Rectangle {
}
}
FactComboBox
{
FactComboBox
{
id
:
offlineVehicleCombo
id
:
offlineVehicleCombo
fact
:
QGroundControl
.
settingsManager
.
offlineEditingVehicleType
fact
:
QGroundControl
.
settingsManager
.
appSettings
.
offlineEditingVehicleType
indexModel
:
false
indexModel
:
false
visible
:
_showOfflineEditingCombos
visible
:
_showOfflineEditingCombos
Layout.preferredWidth
:
_fieldWidth
Layout.preferredWidth
:
_fieldWidth
...
@@ -170,7 +170,7 @@ Rectangle {
...
@@ -170,7 +170,7 @@ Rectangle {
Layout.fillWidth
:
true
Layout.fillWidth
:
true
}
}
FactTextField
{
FactTextField
{
fact
:
QGroundControl
.
settingsManager
.
offlineEditingCruiseSpeed
fact
:
QGroundControl
.
settingsManager
.
appSettings
.
offlineEditingCruiseSpeed
visible
:
_showCruiseSpeed
visible
:
_showCruiseSpeed
Layout.preferredWidth
:
_fieldWidth
Layout.preferredWidth
:
_fieldWidth
}
}
...
@@ -182,7 +182,7 @@ Rectangle {
...
@@ -182,7 +182,7 @@ Rectangle {
Layout.fillWidth
:
true
Layout.fillWidth
:
true
}
}
FactTextField
{
FactTextField
{
fact
:
QGroundControl
.
settingsManager
.
offlineEditingHoverSpeed
fact
:
QGroundControl
.
settingsManager
.
appSettings
.
offlineEditingHoverSpeed
visible
:
_showHoverSpeed
visible
:
_showHoverSpeed
Layout.preferredWidth
:
_fieldWidth
Layout.preferredWidth
:
_fieldWidth
}
}
...
@@ -196,7 +196,7 @@ Rectangle {
...
@@ -196,7 +196,7 @@ Rectangle {
QGCLabel
{
text
:
qsTr
(
"
Hover speed:
"
);
Layout.fillWidth
:
true
}
QGCLabel
{
text
:
qsTr
(
"
Hover speed:
"
);
Layout.fillWidth
:
true
}
FactTextField
{
FactTextField
{
Layout.preferredWidth
:
_fieldWidth
Layout.preferredWidth
:
_fieldWidth
fact
:
QGroundControl
.
settingsManager
.
offlineEditingHoverSpeed
fact
:
QGroundControl
.
settingsManager
.
appSettings
.
offlineEditingHoverSpeed
}
}
}
}
...
...
src/MissionManager/MissionCommandTree.cc
View file @
39f67c63
...
@@ -253,7 +253,7 @@ void MissionCommandTree::_baseVehicleInfo(Vehicle* vehicle, MAV_AUTOPILOT& baseF
...
@@ -253,7 +253,7 @@ void MissionCommandTree::_baseVehicleInfo(Vehicle* vehicle, MAV_AUTOPILOT& baseF
baseVehicleType
=
_baseVehicleType
(
vehicle
->
vehicleType
());
baseVehicleType
=
_baseVehicleType
(
vehicle
->
vehicleType
());
}
else
{
}
else
{
// No Vehicle means offline editing
// No Vehicle means offline editing
baseFirmwareType
=
_baseFirmwareType
((
MAV_AUTOPILOT
)
_settingsManager
->
offlineEditingFirmwareType
()
->
rawValue
().
toInt
());
baseFirmwareType
=
_baseFirmwareType
((
MAV_AUTOPILOT
)
_settingsManager
->
appSettings
()
->
offlineEditingFirmwareType
()
->
rawValue
().
toInt
());
baseVehicleType
=
_baseVehicleType
((
MAV_TYPE
)
_settingsManager
->
offlineEditingVehicleType
()
->
rawValue
().
toInt
());
baseVehicleType
=
_baseVehicleType
((
MAV_TYPE
)
_settingsManager
->
appSettings
()
->
offlineEditingVehicleType
()
->
rawValue
().
toInt
());
}
}
}
}
src/MissionManager/MissionController.cc
View file @
39f67c63
...
@@ -437,13 +437,13 @@ bool MissionController::_loadJsonMissionFileV2(Vehicle* vehicle, const QJsonObje
...
@@ -437,13 +437,13 @@ bool MissionController::_loadJsonMissionFileV2(Vehicle* vehicle, const QJsonObje
return
false
;
return
false
;
}
}
if
(
json
.
contains
(
_jsonVehicleTypeKey
)
&&
vehicle
->
isOfflineEditingVehicle
())
{
if
(
json
.
contains
(
_jsonVehicleTypeKey
)
&&
vehicle
->
isOfflineEditingVehicle
())
{
settingsManager
->
offlineEditingVehicleType
()
->
setRawValue
(
json
[
_jsonVehicleTypeKey
].
toDouble
());
settingsManager
->
appSettings
()
->
offlineEditingVehicleType
()
->
setRawValue
(
json
[
_jsonVehicleTypeKey
].
toDouble
());
}
}
if
(
json
.
contains
(
_jsonCruiseSpeedKey
))
{
if
(
json
.
contains
(
_jsonCruiseSpeedKey
))
{
settingsManager
->
offlineEditingCruiseSpeed
()
->
setRawValue
(
json
[
_jsonCruiseSpeedKey
].
toDouble
());
settingsManager
->
appSettings
()
->
offlineEditingCruiseSpeed
()
->
setRawValue
(
json
[
_jsonCruiseSpeedKey
].
toDouble
());
}
}
if
(
json
.
contains
(
_jsonHoverSpeedKey
))
{
if
(
json
.
contains
(
_jsonHoverSpeedKey
))
{
settingsManager
->
offlineEditingHoverSpeed
()
->
setRawValue
(
json
[
_jsonHoverSpeedKey
].
toDouble
());
settingsManager
->
appSettings
()
->
offlineEditingHoverSpeed
()
->
setRawValue
(
json
[
_jsonHoverSpeedKey
].
toDouble
());
}
}
SimpleMissionItem
*
homeItem
=
new
SimpleMissionItem
(
vehicle
,
visualItems
);
SimpleMissionItem
*
homeItem
=
new
SimpleMissionItem
(
vehicle
,
visualItems
);
...
...
src/MissionManager/RallyPointController.cc
View file @
39f67c63
...
@@ -268,7 +268,7 @@ void RallyPointController::addPoint(QGeoCoordinate point)
...
@@ -268,7 +268,7 @@ void RallyPointController::addPoint(QGeoCoordinate point)
if
(
_points
.
count
())
{
if
(
_points
.
count
())
{
defaultAlt
=
qobject_cast
<
RallyPoint
*>
(
_points
[
_points
.
count
()
-
1
])
->
coordinate
().
altitude
();
defaultAlt
=
qobject_cast
<
RallyPoint
*>
(
_points
[
_points
.
count
()
-
1
])
->
coordinate
().
altitude
();
}
else
{
}
else
{
defaultAlt
=
qgcApp
()
->
toolbox
()
->
settingsManager
()
->
defaultMissionItemAltitude
()
->
rawValue
().
toDouble
();
defaultAlt
=
qgcApp
()
->
toolbox
()
->
settingsManager
()
->
appSettings
()
->
defaultMissionItemAltitude
()
->
rawValue
().
toDouble
();
}
}
point
.
setAltitude
(
defaultAlt
);
point
.
setAltitude
(
defaultAlt
);
RallyPoint
*
newPoint
=
new
RallyPoint
(
point
,
this
);
RallyPoint
*
newPoint
=
new
RallyPoint
(
point
,
this
);
...
...
src/MissionManager/SimpleMissionItem.cc
View file @
39f67c63
...
@@ -530,7 +530,7 @@ void SimpleMissionItem::_syncFrameToAltitudeRelativeToHome(void)
...
@@ -530,7 +530,7 @@ void SimpleMissionItem::_syncFrameToAltitudeRelativeToHome(void)
void
SimpleMissionItem
::
setDefaultsForCommand
(
void
)
void
SimpleMissionItem
::
setDefaultsForCommand
(
void
)
{
{
// We set these global defaults first, then if there are param defaults they will get reset
// We set these global defaults first, then if there are param defaults they will get reset
_missionItem
.
setParam7
(
qgcApp
()
->
toolbox
()
->
settingsManager
()
->
defaultMissionItemAltitude
()
->
rawValue
().
toDouble
());
_missionItem
.
setParam7
(
qgcApp
()
->
toolbox
()
->
settingsManager
()
->
appSettings
()
->
defaultMissionItemAltitude
()
->
rawValue
().
toDouble
());
MAV_CMD
command
=
(
MAV_CMD
)
this
->
command
();
MAV_CMD
command
=
(
MAV_CMD
)
this
->
command
();
const
MissionCommandUIInfo
*
uiInfo
=
_commandTree
->
getUIInfo
(
_vehicle
,
command
);
const
MissionCommandUIInfo
*
uiInfo
=
_commandTree
->
getUIInfo
(
_vehicle
,
command
);
...
...
src/MissionManager/SimpleMissionItemTest.cc
View file @
39f67c63
...
@@ -141,7 +141,7 @@ void SimpleMissionItemTest::_testDefaultValues(void)
...
@@ -141,7 +141,7 @@ void SimpleMissionItemTest::_testDefaultValues(void)
item
.
missionItem
().
setCommand
(
MAV_CMD_NAV_WAYPOINT
);
item
.
missionItem
().
setCommand
(
MAV_CMD_NAV_WAYPOINT
);
item
.
missionItem
().
setFrame
(
MAV_FRAME_GLOBAL_RELATIVE_ALT
);
item
.
missionItem
().
setFrame
(
MAV_FRAME_GLOBAL_RELATIVE_ALT
);
QCOMPARE
(
item
.
missionItem
().
param7
(),
qgcApp
()
->
toolbox
()
->
settingsManager
()
->
defaultMissionItemAltitude
()
->
rawValue
().
toDouble
());
QCOMPARE
(
item
.
missionItem
().
param7
(),
qgcApp
()
->
toolbox
()
->
settingsManager
()
->
appSettings
()
->
defaultMissionItemAltitude
()
->
rawValue
().
toDouble
());
}
}
void
SimpleMissionItemTest
::
_testSignals
(
void
)
void
SimpleMissionItemTest
::
_testSignals
(
void
)
...
@@ -226,7 +226,7 @@ void SimpleMissionItemTest::_testSignals(void)
...
@@ -226,7 +226,7 @@ void SimpleMissionItemTest::_testSignals(void)
// dirtyChanged
// dirtyChanged
// Check that changing to the same coordinate does not signal
// Check that changing to the same coordinate does not signal
simpleMissionItem
.
setCoordinate
(
QGeoCoordinate
(
50.1234567
,
60.1234567
,
qgcApp
()
->
toolbox
()
->
settingsManager
()
->
defaultMissionItemAltitude
()
->
rawValue
().
toDouble
()));
simpleMissionItem
.
setCoordinate
(
QGeoCoordinate
(
50.1234567
,
60.1234567
,
qgcApp
()
->
toolbox
()
->
settingsManager
()
->
appSettings
()
->
defaultMissionItemAltitude
()
->
rawValue
().
toDouble
()));
QVERIFY
(
multiSpy
->
checkNoSignals
());
QVERIFY
(
multiSpy
->
checkNoSignals
());
// Check that actually changing coordinate signals correctly
// Check that actually changing coordinate signals correctly
...
...
src/Settings/AppSettings.cc
0 → 100644
View file @
39f67c63
/****************************************************************************
*
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
*
* QGroundControl is licensed according to the terms in the file
* COPYING.md in the root of the source code directory.
*
****************************************************************************/
#include "AppSettings.h"
#include <QQmlEngine>
const
char
*
AppSettings
::
appSettingsGroupName
=
"app"
;
const
char
*
AppSettings
::
offlineEditingFirmwareTypeSettingsName
=
"OfflineEditingFirmwareType"
;
const
char
*
AppSettings
::
offlineEditingVehicleTypeSettingsName
=
"OfflineEditingVehicleType"
;
const
char
*
AppSettings
::
offlineEditingCruiseSpeedSettingsName
=
"OfflineEditingCruiseSpeed"
;
const
char
*
AppSettings
::
offlineEditingHoverSpeedSettingsName
=
"OfflineEditingHoverSpeed"
;
const
char
*
AppSettings
::
batteryPercentRemainingAnnounceSettingsName
=
"batteryPercentRemainingAnnounce"
;
const
char
*
AppSettings
::
defaultMissionItemAltitudeSettingsName
=
"DefaultMissionItemAltitude"
;
const
char
*
AppSettings
::
missionAutoLoadDirSettingsName
=
"MissionAutoLoadDir"
;
const
char
*
AppSettings
::
promptFlightTelemetrySaveName
=
"PromptFLightDataSave"
;
const
char
*
AppSettings
::
promptFlightTelemetrySaveNotArmedName
=
"PromptFLightDataSaveNotArmed"
;
const
char
*
AppSettings
::
audioMutedName
=
"AudioMuted"
;
AppSettings
::
AppSettings
(
QObject
*
parent
)
:
SettingsGroup
(
appSettingsGroupName
,
QString
()
/* root settings group */
,
parent
)
,
_offlineEditingFirmwareTypeFact
(
NULL
)
,
_offlineEditingVehicleTypeFact
(
NULL
)
,
_offlineEditingCruiseSpeedFact
(
NULL
)
,
_offlineEditingHoverSpeedFact
(
NULL
)
,
_batteryPercentRemainingAnnounceFact
(
NULL
)
,
_defaultMissionItemAltitudeFact
(
NULL
)
,
_missionAutoLoadDirFact
(
NULL
)
,
_promptFlightTelemetrySave
(
NULL
)
,
_promptFlightTelemetrySaveNotArmed
(
NULL
)
,
_audioMuted
(
NULL
)
{
QQmlEngine
::
setObjectOwnership
(
this
,
QQmlEngine
::
CppOwnership
);
qmlRegisterUncreatableType
<
AppSettings
>
(
"QGroundControl.SettingsManager"
,
1
,
0
,
"AppSettings"
,
"Reference only"
);
}
Fact
*
AppSettings
::
offlineEditingFirmwareType
(
void
)
{
if
(
!
_offlineEditingFirmwareTypeFact
)
{
_offlineEditingFirmwareTypeFact
=
_createSettingsFact
(
offlineEditingFirmwareTypeSettingsName
);
}
return
_offlineEditingFirmwareTypeFact
;
}
Fact
*
AppSettings
::
offlineEditingVehicleType
(
void
)
{
if
(
!
_offlineEditingVehicleTypeFact
)
{
_offlineEditingVehicleTypeFact
=
_createSettingsFact
(
offlineEditingVehicleTypeSettingsName
);
}
return
_offlineEditingVehicleTypeFact
;
}
Fact
*
AppSettings
::
offlineEditingCruiseSpeed
(
void
)
{
if
(
!
_offlineEditingCruiseSpeedFact
)
{
_offlineEditingCruiseSpeedFact
=
_createSettingsFact
(
offlineEditingCruiseSpeedSettingsName
);
}
return
_offlineEditingCruiseSpeedFact
;
}
Fact
*
AppSettings
::
offlineEditingHoverSpeed
(
void
)
{
if
(
!
_offlineEditingHoverSpeedFact
)
{
_offlineEditingHoverSpeedFact
=
_createSettingsFact
(
offlineEditingHoverSpeedSettingsName
);
}
return
_offlineEditingHoverSpeedFact
;
}
Fact
*
AppSettings
::
batteryPercentRemainingAnnounce
(
void
)
{
if
(
!
_batteryPercentRemainingAnnounceFact
)
{
_batteryPercentRemainingAnnounceFact
=
_createSettingsFact
(
batteryPercentRemainingAnnounceSettingsName
);
}
return
_batteryPercentRemainingAnnounceFact
;
}
Fact
*
AppSettings
::
defaultMissionItemAltitude
(
void
)
{
if
(
!
_defaultMissionItemAltitudeFact
)
{
_defaultMissionItemAltitudeFact
=
_createSettingsFact
(
defaultMissionItemAltitudeSettingsName
);
}
return
_defaultMissionItemAltitudeFact
;
}
Fact
*
AppSettings
::
missionAutoLoadDir
(
void
)
{
if
(
!
_missionAutoLoadDirFact
)
{
_missionAutoLoadDirFact
=
_createSettingsFact
(
missionAutoLoadDirSettingsName
);
}
return
_missionAutoLoadDirFact
;
}
Fact
*
AppSettings
::
promptFlightTelemetrySave
(
void
)
{
if
(
!
_promptFlightTelemetrySave
)
{
_promptFlightTelemetrySave
=
_createSettingsFact
(
promptFlightTelemetrySaveName
);
}
return
_promptFlightTelemetrySave
;
}
Fact
*
AppSettings
::
promptFlightTelemetrySaveNotArmed
(
void
)
{
if
(
!
_promptFlightTelemetrySaveNotArmed
)
{
_promptFlightTelemetrySaveNotArmed
=
_createSettingsFact
(
promptFlightTelemetrySaveNotArmedName
);
}
return
_promptFlightTelemetrySaveNotArmed
;
}
Fact
*
AppSettings
::
audioMuted
(
void
)
{
if
(
!
_audioMuted
)
{
_audioMuted
=
_createSettingsFact
(
audioMutedName
);
}
return
_audioMuted
;
}
src/Settings
Manager
.h
→
src/Settings
/AppSettings
.h
View file @
39f67c63
...
@@ -7,60 +7,22 @@
...
@@ -7,60 +7,22 @@
*
*
****************************************************************************/
****************************************************************************/
#ifndef AppSettings_H
#define AppSettings_H
#ifndef SettingsManager_H
#include "SettingsGroup.h"
#define SettingsManager_H
#include "QGCLoggingCategory.h"
class
AppSettings
:
public
SettingsGroup
#include "Joystick.h"
#include "MultiVehicleManager.h"
#include "QGCToolbox.h"
#include <QVariantList>
Q_DECLARE_LOGGING_CATEGORY
(
SettingsManagerLog
)
/// Provides access to all app settings
class
SettingsManager
:
public
QGCTool
{
{
Q_OBJECT
Q_OBJECT
public:
public:
SettingsManager
(
QGCApplication
*
app
);
AppSettings
(
QObject
*
parent
=
NULL
);
enum
DistanceUnits
{
DistanceUnitsFeet
=
0
,
DistanceUnitsMeters
};
enum
AreaUnits
{
AreaUnitsSquareFeet
=
0
,
AreaUnitsSquareMeters
,
AreaUnitsSquareKilometers
,
AreaUnitsHectares
,
AreaUnitsAcres
,
AreaUnitsSquareMiles
,
};
enum
SpeedUnits
{
SpeedUnitsFeetPerSecond
=
0
,
SpeedUnitsMetersPerSecond
,
SpeedUnitsMilesPerHour
,
SpeedUnitsKilometersPerHour
,
SpeedUnitsKnots
,
};
Q_ENUMS
(
DistanceUnits
)
Q_ENUMS
(
AreaUnits
)
Q_ENUMS
(
SpeedUnits
)
Q_PROPERTY
(
Fact
*
offlineEditingFirmwareType
READ
offlineEditingFirmwareType
CONSTANT
)
Q_PROPERTY
(
Fact
*
offlineEditingFirmwareType
READ
offlineEditingFirmwareType
CONSTANT
)
Q_PROPERTY
(
Fact
*
offlineEditingVehicleType
READ
offlineEditingVehicleType
CONSTANT
)
Q_PROPERTY
(
Fact
*
offlineEditingVehicleType
READ
offlineEditingVehicleType
CONSTANT
)
Q_PROPERTY
(
Fact
*
offlineEditingCruiseSpeed
READ
offlineEditingCruiseSpeed
CONSTANT
)
Q_PROPERTY
(
Fact
*
offlineEditingCruiseSpeed
READ
offlineEditingCruiseSpeed
CONSTANT
)
Q_PROPERTY
(
Fact
*
offlineEditingHoverSpeed
READ
offlineEditingHoverSpeed
CONSTANT
)
Q_PROPERTY
(
Fact
*
offlineEditingHoverSpeed
READ
offlineEditingHoverSpeed
CONSTANT
)
Q_PROPERTY
(
Fact
*
distanceUnits
READ
distanceUnits
CONSTANT
)
Q_PROPERTY
(
Fact
*
areaUnits
READ
areaUnits
CONSTANT
)
Q_PROPERTY
(
Fact
*
speedUnits
READ
speedUnits
CONSTANT
)
Q_PROPERTY
(
Fact
*
batteryPercentRemainingAnnounce
READ
batteryPercentRemainingAnnounce
CONSTANT
)
Q_PROPERTY
(
Fact
*
batteryPercentRemainingAnnounce
READ
batteryPercentRemainingAnnounce
CONSTANT
)
Q_PROPERTY
(
Fact
*
defaultMissionItemAltitude
READ
defaultMissionItemAltitude
CONSTANT
)
Q_PROPERTY
(
Fact
*
defaultMissionItemAltitude
READ
defaultMissionItemAltitude
CONSTANT
)
Q_PROPERTY
(
Fact
*
missionAutoLoadDir
READ
missionAutoLoadDir
CONSTANT
)
Q_PROPERTY
(
Fact
*
missionAutoLoadDir
READ
missionAutoLoadDir
CONSTANT
)
...
@@ -72,9 +34,6 @@ public:
...
@@ -72,9 +34,6 @@ public:
Fact
*
offlineEditingVehicleType
(
void
);
Fact
*
offlineEditingVehicleType
(
void
);
Fact
*
offlineEditingCruiseSpeed
(
void
);
Fact
*
offlineEditingCruiseSpeed
(
void
);
Fact
*
offlineEditingHoverSpeed
(
void
);
Fact
*
offlineEditingHoverSpeed
(
void
);
Fact
*
distanceUnits
(
void
);
Fact
*
areaUnits
(
void
);
Fact
*
speedUnits
(
void
);
Fact
*
batteryPercentRemainingAnnounce
(
void
);
Fact
*
batteryPercentRemainingAnnounce
(
void
);
Fact
*
defaultMissionItemAltitude
(
void
);
Fact
*
defaultMissionItemAltitude
(
void
);
Fact
*
missionAutoLoadDir
(
void
);
Fact
*
missionAutoLoadDir
(
void
);
...
@@ -82,16 +41,12 @@ public:
...
@@ -82,16 +41,12 @@ public:
Fact
*
promptFlightTelemetrySaveNotArmed
(
void
);
Fact
*
promptFlightTelemetrySaveNotArmed
(
void
);
Fact
*
audioMuted
(
void
);
Fact
*
audioMuted
(
void
);
// Override from QGCTool
static
const
char
*
appSettingsGroupName
;
virtual
void
setToolbox
(
QGCToolbox
*
toolbox
);
static
const
char
*
offlineEditingFirmwareTypeSettingsName
;
static
const
char
*
offlineEditingFirmwareTypeSettingsName
;
static
const
char
*
offlineEditingVehicleTypeSettingsName
;
static
const
char
*
offlineEditingVehicleTypeSettingsName
;
static
const
char
*
offlineEditingCruiseSpeedSettingsName
;
static
const
char
*
offlineEditingCruiseSpeedSettingsName
;
static
const
char
*
offlineEditingHoverSpeedSettingsName
;
static
const
char
*
offlineEditingHoverSpeedSettingsName
;
static
const
char
*
distanceUnitsSettingsName
;
static
const
char
*
areaUnitsSettingsName
;
static
const
char
*
speedUnitsSettingsName
;
static
const
char
*
batteryPercentRemainingAnnounceSettingsName
;
static
const
char
*
batteryPercentRemainingAnnounceSettingsName
;
static
const
char
*
defaultMissionItemAltitudeSettingsName
;
static
const
char
*
defaultMissionItemAltitudeSettingsName
;
static
const
char
*
missionAutoLoadDirSettingsName
;
static
const
char
*
missionAutoLoadDirSettingsName
;
...
@@ -100,17 +55,10 @@ public:
...
@@ -100,17 +55,10 @@ public:
static
const
char
*
audioMutedName
;
static
const
char
*
audioMutedName
;
private:
private:
SettingsFact
*
_createSettingsFact
(
const
QString
&
name
);
QMap
<
QString
,
FactMetaData
*>
_nameToMetaDataMap
;
SettingsFact
*
_offlineEditingFirmwareTypeFact
;
SettingsFact
*
_offlineEditingFirmwareTypeFact
;
SettingsFact
*
_offlineEditingVehicleTypeFact
;
SettingsFact
*
_offlineEditingVehicleTypeFact
;
SettingsFact
*
_offlineEditingCruiseSpeedFact
;
SettingsFact
*
_offlineEditingCruiseSpeedFact
;
SettingsFact
*
_offlineEditingHoverSpeedFact
;
SettingsFact
*
_offlineEditingHoverSpeedFact
;
SettingsFact
*
_distanceUnitsFact
;
SettingsFact
*
_areaUnitsFact
;
SettingsFact
*
_speedUnitsFact
;
SettingsFact
*
_batteryPercentRemainingAnnounceFact
;
SettingsFact
*
_batteryPercentRemainingAnnounceFact
;
SettingsFact
*
_defaultMissionItemAltitudeFact
;
SettingsFact
*
_defaultMissionItemAltitudeFact
;
SettingsFact
*
_missionAutoLoadDirFact
;
SettingsFact
*
_missionAutoLoadDirFact
;
...
...
src/Settings/AutoConnectSettings.cc
0 → 100644
View file @
39f67c63
/****************************************************************************
*
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
*
* QGroundControl is licensed according to the terms in the file
* COPYING.md in the root of the source code directory.
*
****************************************************************************/
#include "AutoConnectSettings.h"
#include <QQmlEngine>
const
char
*
AutoConnectSettings
::
autoConnectSettingsGroupName
=
"autoConnect"
;
AutoConnectSettings
::
AutoConnectSettings
(
QObject
*
parent
)
:
SettingsGroup
(
autoConnectSettingsGroupName
,
QString
()
/* root settings group */
,
parent
)
{
QQmlEngine
::
setObjectOwnership
(
this
,
QQmlEngine
::
CppOwnership
);
qmlRegisterUncreatableType
<
AutoConnectSettings
>
(
"QGroundControl.SettingsManager"
,
1
,
0
,
"AutoConnectSettings"
,
"Reference only"
);
}
src/Settings/AutoConnectSettings.h
0 → 100644
View file @
39f67c63
/****************************************************************************
*
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
*
* QGroundControl is licensed according to the terms in the file
* COPYING.md in the root of the source code directory.
*
****************************************************************************/
#ifndef AutoConnectSettings_H
#define AutoConnectSettings_H
#include "SettingsGroup.h"
class
AutoConnectSettings
:
public
SettingsGroup
{
Q_OBJECT
public:
AutoConnectSettings
(
QObject
*
parent
=
NULL
);
static
const
char
*
autoConnectSettingsGroupName
;
private:
};
#endif
src/Settings
Manager
.json
→
src/Settings
/SettingsGroup.app
.json
View file @
39f67c63
File moved
src/Settings/SettingsGroup.autoConnect.json
0 → 100644
View file @
39f67c63
[
]
src/Settings/SettingsGroup.cc
0 → 100644
View file @
39f67c63
/****************************************************************************
*
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
*
* QGroundControl is licensed according to the terms in the file
* COPYING.md in the root of the source code directory.
*
****************************************************************************/
#include "SettingsGroup.h"
#include "QGCCorePlugin.h"
#include "QGCApplication.h"
SettingsGroup
::
SettingsGroup
(
const
QString
&
name
,
const
QString
&
settingsGroup
,
QObject
*
parent
)
:
QObject
(
parent
)
,
_name
(
name
)
,
_settingsGroup
(
settingsGroup
)
,
_visible
(
qgcApp
()
->
toolbox
()
->
corePlugin
()
->
overrideSettingsGroupVisibility
(
name
))
{
QString
jsonNameFormat
(
":/json/SettingsGroup.%1.json"
);
_nameToMetaDataMap
=
FactMetaData
::
createMapFromJsonFile
(
jsonNameFormat
.
arg
(
name
),
this
);
}
SettingsFact
*
SettingsGroup
::
_createSettingsFact
(
const
QString
&
name
)
{
return
new
SettingsFact
(
_settingsGroup
,
_nameToMetaDataMap
[
name
],
this
);