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
7b92d05e
Commit
7b92d05e
authored
May 01, 2017
by
DonLakeFlyer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove obsolete AutomaticMissionUpload
parent
8019e932
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
22 deletions
+0
-22
App.SettingsGroup.json
src/Settings/App.SettingsGroup.json
+0
-7
AppSettings.cc
src/Settings/AppSettings.cc
+0
-11
AppSettings.h
src/Settings/AppSettings.h
+0
-4
No files found.
src/Settings/App.SettingsGroup.json
View file @
7b92d05e
...
...
@@ -116,13 +116,6 @@
"type"
:
"bool"
,
"defaultValue"
:
false
},
{
"name"
:
"AutomaticMissionUpload"
,
"shortDescription"
:
"Automatic mission upload"
,
"longDescription"
:
"Automatically upload mission to vehicle after changes"
,
"type"
:
"bool"
,
"defaultValue"
:
true
},
{
"name"
:
"SavePath"
,
"shortDescription"
:
"Application save directory"
,
...
...
src/Settings/AppSettings.cc
View file @
7b92d05e
...
...
@@ -31,7 +31,6 @@ const char* AppSettings::indoorPaletteName = "StyleIs
const
char
*
AppSettings
::
showLargeCompassName
=
"ShowLargeCompass"
;
const
char
*
AppSettings
::
savePathName
=
"SavePath"
;
const
char
*
AppSettings
::
autoLoadMissionsName
=
"AutoLoadMissions"
;
const
char
*
AppSettings
::
automaticMissionUploadName
=
"AutomaticMissionUpload"
;
const
char
*
AppSettings
::
parameterFileExtension
=
"params"
;
const
char
*
AppSettings
::
planFileExtension
=
"plan"
;
...
...
@@ -62,7 +61,6 @@ AppSettings::AppSettings(QObject* parent)
,
_showLargeCompassFact
(
NULL
)
,
_savePathFact
(
NULL
)
,
_autoLoadMissionsFact
(
NULL
)
,
_automaticMissionUpload
(
NULL
)
{
QQmlEngine
::
setObjectOwnership
(
this
,
QQmlEngine
::
CppOwnership
);
qmlRegisterUncreatableType
<
AppSettings
>
(
"QGroundControl.SettingsManager"
,
1
,
0
,
"AppSettings"
,
"Reference only"
);
...
...
@@ -280,15 +278,6 @@ Fact* AppSettings::autoLoadMissions(void)
return
_autoLoadMissionsFact
;
}
Fact
*
AppSettings
::
automaticMissionUpload
(
void
)
{
if
(
!
_automaticMissionUpload
)
{
_automaticMissionUpload
=
_createSettingsFact
(
automaticMissionUploadName
);
}
return
_automaticMissionUpload
;
}
MAV_AUTOPILOT
AppSettings
::
offlineEditingFirmwareTypeFromFirmwareType
(
MAV_AUTOPILOT
firmwareType
)
{
if
(
firmwareType
!=
MAV_AUTOPILOT_PX4
&&
firmwareType
!=
MAV_AUTOPILOT_ARDUPILOTMEGA
)
{
...
...
src/Settings/AppSettings.h
View file @
7b92d05e
...
...
@@ -35,7 +35,6 @@ public:
Q_PROPERTY
(
Fact
*
showLargeCompass
READ
showLargeCompass
CONSTANT
)
Q_PROPERTY
(
Fact
*
savePath
READ
savePath
CONSTANT
)
Q_PROPERTY
(
Fact
*
autoLoadMissions
READ
autoLoadMissions
CONSTANT
)
Q_PROPERTY
(
Fact
*
automaticMissionUpload
READ
automaticMissionUpload
CONSTANT
)
Q_PROPERTY
(
QString
missionSavePath
READ
missionSavePath
NOTIFY
savePathsChanged
)
Q_PROPERTY
(
QString
parameterSavePath
READ
parameterSavePath
NOTIFY
savePathsChanged
)
...
...
@@ -62,7 +61,6 @@ public:
Fact
*
showLargeCompass
(
void
);
Fact
*
savePath
(
void
);
Fact
*
autoLoadMissions
(
void
);
Fact
*
automaticMissionUpload
(
void
);
QString
missionSavePath
(
void
);
QString
parameterSavePath
(
void
);
...
...
@@ -88,7 +86,6 @@ public:
static
const
char
*
showLargeCompassName
;
static
const
char
*
savePathName
;
static
const
char
*
autoLoadMissionsName
;
static
const
char
*
automaticMissionUploadName
;
// Application wide file extensions
static
const
char
*
parameterFileExtension
;
...
...
@@ -127,7 +124,6 @@ private:
SettingsFact
*
_showLargeCompassFact
;
SettingsFact
*
_savePathFact
;
SettingsFact
*
_autoLoadMissionsFact
;
SettingsFact
*
_automaticMissionUpload
;
};
#endif
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