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
583da803
Commit
583da803
authored
Oct 23, 2018
by
Patrick José Pereira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Camera: Change from foreach to c++11 for
Signed-off-by:
Patrick José Pereira
<
patrickelectric@gmail.com
>
parent
7e3cf7c7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
11 deletions
+11
-11
QGCCameraControl.cc
src/Camera/QGCCameraControl.cc
+11
-11
No files found.
src/Camera/QGCCameraControl.cc
View file @
583da803
...
...
@@ -917,7 +917,7 @@ void
QGCCameraControl
::
_requestAllParameters
()
{
//-- Reset receive list
for
each
(
QString
paramName
,
_paramIO
.
keys
())
{
for
(
QString
paramName
:
_paramIO
.
keys
())
{
if
(
_paramIO
[
paramName
])
{
_paramIO
[
paramName
]
->
setParamRequest
();
}
else
{
...
...
@@ -984,7 +984,7 @@ QGCCameraControl::_updateActiveList()
{
//-- Clear out excluded parameters based on exclusion rules
QStringList
exclusionList
;
for
each
(
QGCCameraOptionExclusion
*
param
,
_valueExclusions
)
{
for
(
QGCCameraOptionExclusion
*
param
:
_valueExclusions
)
{
Fact
*
pFact
=
getFact
(
param
->
param
);
if
(
pFact
)
{
QString
option
=
pFact
->
rawValueString
();
...
...
@@ -994,7 +994,7 @@ QGCCameraControl::_updateActiveList()
}
}
QStringList
active
;
for
each
(
QString
key
,
_settings
)
{
for
(
QString
key
:
_settings
)
{
if
(
!
exclusionList
.
contains
(
key
))
{
active
.
append
(
key
);
}
...
...
@@ -1094,7 +1094,7 @@ QGCCameraControl::_updateRanges(Fact* pFact)
QStringList
resetList
;
QStringList
updates
;
//-- Iterate range sets looking for limited ranges
for
each
(
QGCCameraOptionRange
*
pRange
,
_optionRanges
)
{
for
(
QGCCameraOptionRange
*
pRange
:
_optionRanges
)
{
//-- If this fact or one of its conditions is part of this range set
if
(
!
changedList
.
contains
(
pRange
->
targetParam
)
&&
(
pRange
->
param
==
pFact
->
name
()
||
pRange
->
condition
.
contains
(
pFact
->
name
())))
{
Fact
*
pRFact
=
getFact
(
pRange
->
param
);
//-- This parameter
...
...
@@ -1115,7 +1115,7 @@ QGCCameraControl::_updateRanges(Fact* pFact)
}
}
//-- Iterate range sets again looking for resets
for
each
(
QGCCameraOptionRange
*
pRange
,
_optionRanges
)
{
for
(
QGCCameraOptionRange
*
pRange
:
_optionRanges
)
{
if
(
!
changedList
.
contains
(
pRange
->
targetParam
)
&&
(
pRange
->
param
==
pFact
->
name
()
||
pRange
->
condition
.
contains
(
pFact
->
name
())))
{
Fact
*
pTFact
=
getFact
(
pRange
->
targetParam
);
//-- The target parameter (the one its range is to change)
if
(
!
resetList
.
contains
(
pRange
->
targetParam
))
{
...
...
@@ -1128,7 +1128,7 @@ QGCCameraControl::_updateRanges(Fact* pFact)
}
}
//-- Update limited range set
for
each
(
Fact
*
f
,
rangesSet
.
keys
())
{
for
(
Fact
*
f
:
rangesSet
.
keys
())
{
f
->
setEnumInfo
(
rangesSet
[
f
]
->
optNames
,
rangesSet
[
f
]
->
optVariants
);
if
(
!
updates
.
contains
(
f
->
name
()))
{
_paramIO
[
f
->
name
()]
->
optNames
=
rangesSet
[
f
]
->
optNames
;
...
...
@@ -1139,7 +1139,7 @@ QGCCameraControl::_updateRanges(Fact* pFact)
}
}
//-- Restore full range set
for
each
(
Fact
*
f
,
rangesReset
.
keys
())
{
for
(
Fact
*
f
:
rangesReset
.
keys
())
{
f
->
setEnumInfo
(
_originalOptNames
[
rangesReset
[
f
]],
_originalOptValues
[
rangesReset
[
f
]]);
if
(
!
updates
.
contains
(
f
->
name
()))
{
_paramIO
[
f
->
name
()]
->
optNames
=
_originalOptNames
[
rangesReset
[
f
]];
...
...
@@ -1151,7 +1151,7 @@ QGCCameraControl::_updateRanges(Fact* pFact)
}
//-- Parameter update requests
if
(
_requestUpdates
.
contains
(
pFact
->
name
()))
{
for
each
(
QString
param
,
_requestUpdates
[
pFact
->
name
()])
{
for
(
QString
param
:
_requestUpdates
[
pFact
->
name
()])
{
if
(
!
_updatesToRequest
.
contains
(
param
))
{
_updatesToRequest
<<
param
;
}
...
...
@@ -1166,7 +1166,7 @@ QGCCameraControl::_updateRanges(Fact* pFact)
void
QGCCameraControl
::
_requestParamUpdates
()
{
for
each
(
QString
param
,
_updatesToRequest
)
{
for
(
QString
param
:
_updatesToRequest
)
{
_paramIO
[
param
]
->
paramRequest
();
}
_updatesToRequest
.
clear
();
...
...
@@ -1358,7 +1358,7 @@ void
QGCCameraControl
::
_processRanges
()
{
//-- After all parameter are loaded, process parameter ranges
for
each
(
QGCCameraOptionRange
*
pRange
,
_optionRanges
)
{
for
(
QGCCameraOptionRange
*
pRange
:
_optionRanges
)
{
Fact
*
pRFact
=
getFact
(
pRange
->
targetParam
);
if
(
pRFact
)
{
for
(
int
i
=
0
;
i
<
pRange
->
optNames
.
size
();
i
++
)
{
...
...
@@ -1488,7 +1488,7 @@ QGCCameraControl::_dataReady(QByteArray data)
void
QGCCameraControl
::
_paramDone
()
{
for
each
(
QString
param
,
_paramIO
.
keys
())
{
for
(
QString
param
:
_paramIO
.
keys
())
{
if
(
!
_paramIO
[
param
]
->
paramDone
())
{
return
;
}
...
...
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