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
6b0ef073
Commit
6b0ef073
authored
Jan 31, 2019
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
parent
7158b395
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
20 additions
and
4 deletions
+20
-4
ComplexMissionItem.h
src/MissionManager/ComplexMissionItem.h
+0
-4
CorridorScanComplexItem.h
src/MissionManager/CorridorScanComplexItem.h
+1
-0
FixedWingLandingComplexItem.h
src/MissionManager/FixedWingLandingComplexItem.h
+1
-0
MissionSettingsItem.h
src/MissionManager/MissionSettingsItem.h
+1
-0
StructureScanComplexItem.h
src/MissionManager/StructureScanComplexItem.h
+1
-0
SurveyComplexItem.cc
src/MissionManager/SurveyComplexItem.cc
+13
-0
SurveyComplexItem.h
src/MissionManager/SurveyComplexItem.h
+1
-0
TransectStyleComplexItem.cc
src/MissionManager/TransectStyleComplexItem.cc
+1
-0
TransectStyleComplexItemTest.h
src/MissionManager/TransectStyleComplexItemTest.h
+1
-0
No files found.
src/MissionManager/ComplexMissionItem.h
View file @
6b0ef073
...
...
@@ -44,10 +44,6 @@ public:
/// This mission item attribute specifies the type of the complex item.
static
const
char
*
jsonComplexItemTypeKey
;
// Overrides from VisualMissionItem
double
additionalTimeDelay
(
void
)
const
final
{
return
0
;
}
signals:
void
complexDistanceChanged
(
void
);
void
boundingCubeChanged
(
void
);
...
...
src/MissionManager/CorridorScanComplexItem.h
View file @
6b0ef073
...
...
@@ -52,6 +52,7 @@ public:
QString
commandName
(
void
)
const
final
{
return
tr
(
"Corridor Scan"
);
}
QString
abbreviation
(
void
)
const
final
{
return
tr
(
"C"
);
}
bool
readyForSave
(
void
)
const
;
double
additionalTimeDelay
(
void
)
const
final
{
return
0
;
}
static
const
char
*
jsonComplexItemTypeValue
;
...
...
src/MissionManager/FixedWingLandingComplexItem.h
View file @
6b0ef073
...
...
@@ -91,6 +91,7 @@ public:
double
specifiedGimbalPitch
(
void
)
final
{
return
std
::
numeric_limits
<
double
>::
quiet_NaN
();
}
void
appendMissionItems
(
QList
<
MissionItem
*>&
items
,
QObject
*
missionItemParent
)
final
;
void
applyNewAltitude
(
double
newAltitude
)
final
;
double
additionalTimeDelay
(
void
)
const
final
{
return
0
;
}
bool
coordinateHasRelativeAltitude
(
void
)
const
final
{
return
_altitudesAreRelative
;
}
bool
exitCoordinateHasRelativeAltitude
(
void
)
const
final
{
return
_altitudesAreRelative
;
}
...
...
src/MissionManager/MissionSettingsItem.h
View file @
6b0ef073
...
...
@@ -77,6 +77,7 @@ public:
void
appendMissionItems
(
QList
<
MissionItem
*>&
items
,
QObject
*
missionItemParent
)
final
;
void
applyNewAltitude
(
double
newAltitude
)
final
{
Q_UNUSED
(
newAltitude
);
/* no action */
}
double
specifiedFlightSpeed
(
void
)
final
;
double
additionalTimeDelay
(
void
)
const
final
{
return
0
;
}
bool
coordinateHasRelativeAltitude
(
void
)
const
final
{
return
false
;
}
bool
exitCoordinateHasRelativeAltitude
(
void
)
const
final
{
return
false
;
}
...
...
src/MissionManager/StructureScanComplexItem.h
View file @
6b0ef073
...
...
@@ -84,6 +84,7 @@ public:
void
appendMissionItems
(
QList
<
MissionItem
*>&
items
,
QObject
*
missionItemParent
)
final
;
void
setMissionFlightStatus
(
MissionController
::
MissionFlightStatus_t
&
missionFlightStatus
)
final
;
void
applyNewAltitude
(
double
newAltitude
)
final
;
double
additionalTimeDelay
(
void
)
const
final
{
return
0
;
}
bool
coordinateHasRelativeAltitude
(
void
)
const
final
{
return
_altitudeRelative
;
}
bool
exitCoordinateHasRelativeAltitude
(
void
)
const
final
{
return
_altitudeRelative
;
}
...
...
src/MissionManager/SurveyComplexItem.cc
View file @
6b0ef073
...
...
@@ -1476,3 +1476,16 @@ double SurveyComplexItem::timeBetweenShots(void)
{
return
_cruiseSpeed
==
0
?
0
:
triggerDistance
()
/
_cruiseSpeed
;
}
double
SurveyComplexItem
::
additionalTimeDelay
(
void
)
const
{
double
hoverTime
=
0
;
if
(
hoverAndCaptureEnabled
())
{
for
(
const
QList
<
TransectStyleComplexItem
::
CoordInfo_t
>&
transect
:
_transects
)
{
hoverTime
+=
_hoverAndCaptureDelaySeconds
*
transect
.
count
();
}
}
return
hoverTime
;
}
src/MissionManager/SurveyComplexItem.h
View file @
6b0ef073
...
...
@@ -52,6 +52,7 @@ public:
QString
commandName
(
void
)
const
final
{
return
tr
(
"Survey"
);
}
QString
abbreviation
(
void
)
const
final
{
return
tr
(
"S"
);
}
bool
readyForSave
(
void
)
const
final
;
double
additionalTimeDelay
(
void
)
const
final
;
// Must match json spec for GridEntryLocation
enum
EntryLocation
{
...
...
src/MissionManager/TransectStyleComplexItem.cc
View file @
6b0ef073
...
...
@@ -398,6 +398,7 @@ void TransectStyleComplexItem::_rebuildTransects(void)
emit
lastSequenceNumberChanged
(
lastSequenceNumber
());
emit
timeBetweenShotsChanged
();
emit
additionalTimeDelayChanged
();
}
void
TransectStyleComplexItem
::
_queryTransectsPathHeightInfo
(
void
)
...
...
src/MissionManager/TransectStyleComplexItemTest.h
View file @
6b0ef073
...
...
@@ -94,6 +94,7 @@ public:
bool
specifiesCoordinate
(
void
)
const
final
{
return
true
;
}
void
appendMissionItems
(
QList
<
MissionItem
*>&
items
,
QObject
*
missionItemParent
)
final
{
Q_UNUSED
(
items
);
Q_UNUSED
(
missionItemParent
);
}
void
applyNewAltitude
(
double
newAltitude
)
final
{
Q_UNUSED
(
newAltitude
);
}
double
additionalTimeDelay
(
void
)
const
final
{
return
0
;
}
bool
rebuildTransectsPhase1Called
;
bool
rebuildTransectsPhase2Called
;
...
...
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