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
8b46d4e6
Commit
8b46d4e6
authored
Jul 22, 2015
by
Don Gagne
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1731 from DonLakeFlyer/UTParamMetaData
Unit test always use resource based meta data
parents
d6a13203
1ee424af
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
5 deletions
+10
-5
PX4ParameterLoader.cc
src/AutoPilotPlugins/PX4/PX4ParameterLoader.cc
+10
-5
No files found.
src/AutoPilotPlugins/PX4/PX4ParameterLoader.cc
View file @
8b46d4e6
...
...
@@ -92,11 +92,16 @@ void PX4ParameterLoader::loadParameterFactMetaData(void)
Q_ASSERT
(
_mapParameterName2FactMetaData
.
count
()
==
0
);
// First look for meta data that comes from a firmware download. Fall back to resource if not there.
QSettings
settings
;
QDir
parameterDir
=
QFileInfo
(
settings
.
fileName
()).
dir
();
QString
parameterFilename
=
parameterDir
.
filePath
(
"PX4ParameterFactMetaData.xml"
);
if
(
!
QFile
(
parameterFilename
).
exists
())
{
QString
parameterFilename
;
// We want unit test builds to always use the resource based meta data to provide repeatable results
if
(
!
qgcApp
()
->
runningUnitTests
())
{
// First look for meta data that comes from a firmware download. Fall back to resource if not there.
QSettings
settings
;
QDir
parameterDir
=
QFileInfo
(
settings
.
fileName
()).
dir
();
parameterFilename
=
parameterDir
.
filePath
(
"PX4ParameterFactMetaData.xml"
);
}
if
(
parameterFilename
.
isEmpty
()
||
!
QFile
(
parameterFilename
).
exists
())
{
parameterFilename
=
":/AutoPilotPlugins/PX4/ParameterFactMetaData.xml"
;
}
...
...
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