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
15669c39
Commit
15669c39
authored
Jan 15, 2018
by
DonLakeFlyer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fly view needs to slurp in sections using scan
Otherwise things like gimbal angles end up on the wrong items.
parent
67b428fb
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
16 deletions
+22
-16
MissionController.cc
src/MissionManager/MissionController.cc
+21
-15
MissionController.h
src/MissionManager/MissionController.h
+1
-1
No files found.
src/MissionManager/MissionController.cc
View file @
15669c39
...
@@ -189,9 +189,7 @@ void MissionController::_newMissionItemsAvailableFromVehicle(bool removeAllReque
...
@@ -189,9 +189,7 @@ void MissionController::_newMissionItemsAvailableFromVehicle(bool removeAllReque
_addMissionSettings
(
_visualItems
,
_editMode
&&
_visualItems
->
count
()
>
0
/* addToCenter */
);
_addMissionSettings
(
_visualItems
,
_editMode
&&
_visualItems
->
count
()
>
0
/* addToCenter */
);
}
}
if
(
_editMode
)
{
MissionController
::
_scanForAdditionalSettings
(
_visualItems
,
_controllerVehicle
);
MissionController
::
_scanForAdditionalSettings
(
_visualItems
,
_controllerVehicle
);
}
_initAllVisualItems
();
_initAllVisualItems
();
_updateContainsItems
();
_updateContainsItems
();
...
@@ -1218,6 +1216,8 @@ void MissionController::_recalcMissionFlightStatus()
...
@@ -1218,6 +1216,8 @@ void MissionController::_recalcMissionFlightStatus()
}
}
}
}
qDebug
()
<<
"Gimbal calc"
;
for
(
int
i
=
0
;
i
<
_visualItems
->
count
();
i
++
)
{
for
(
int
i
=
0
;
i
<
_visualItems
->
count
();
i
++
)
{
VisualMissionItem
*
item
=
qobject_cast
<
VisualMissionItem
*>
(
_visualItems
->
get
(
i
));
VisualMissionItem
*
item
=
qobject_cast
<
VisualMissionItem
*>
(
_visualItems
->
get
(
i
));
SimpleMissionItem
*
simpleItem
=
qobject_cast
<
SimpleMissionItem
*>
(
item
);
SimpleMissionItem
*
simpleItem
=
qobject_cast
<
SimpleMissionItem
*>
(
item
);
...
@@ -1247,6 +1247,7 @@ void MissionController::_recalcMissionFlightStatus()
...
@@ -1247,6 +1247,7 @@ void MissionController::_recalcMissionFlightStatus()
// Look for gimbal change
// Look for gimbal change
double
gimbalYaw
=
item
->
specifiedGimbalYaw
();
double
gimbalYaw
=
item
->
specifiedGimbalYaw
();
if
(
!
qIsNaN
(
gimbalYaw
))
{
if
(
!
qIsNaN
(
gimbalYaw
))
{
qDebug
()
<<
_editMode
<<
gimbalYaw
;
_missionFlightStatus
.
gimbalYaw
=
gimbalYaw
;
_missionFlightStatus
.
gimbalYaw
=
gimbalYaw
;
}
}
double
gimbalPitch
=
item
->
specifiedGimbalPitch
();
double
gimbalPitch
=
item
->
specifiedGimbalPitch
();
...
@@ -1352,6 +1353,7 @@ void MissionController::_recalcMissionFlightStatus()
...
@@ -1352,6 +1353,7 @@ void MissionController::_recalcMissionFlightStatus()
_addTimeDistance
(
vtolInHover
,
hoverTime
,
cruiseTime
,
extraTime
,
distance
,
item
->
sequenceNumber
());
_addTimeDistance
(
vtolInHover
,
hoverTime
,
cruiseTime
,
extraTime
,
distance
,
item
->
sequenceNumber
());
}
}
qDebug
()
<<
"setMissionFlightStatus"
<<
item
->
sequenceNumber
()
<<
_missionFlightStatus
.
gimbalYaw
<<
item
->
commandName
();
item
->
setMissionFlightStatus
(
_missionFlightStatus
);
item
->
setMissionFlightStatus
(
_missionFlightStatus
);
}
}
...
@@ -1783,8 +1785,10 @@ void MissionController::setDirty(bool dirty)
...
@@ -1783,8 +1785,10 @@ void MissionController::setDirty(bool dirty)
void
MissionController
::
_scanForAdditionalSettings
(
QmlObjectListModel
*
visualItems
,
Vehicle
*
vehicle
)
void
MissionController
::
_scanForAdditionalSettings
(
QmlObjectListModel
*
visualItems
,
Vehicle
*
vehicle
)
{
{
if
(
_editMode
)
{
// First we look for a Fixed Wing Landing Pattern which is at the end
// First we look for a Fixed Wing Landing Pattern which is at the end
FixedWingLandingComplexItem
::
scanForItem
(
visualItems
,
vehicle
);
FixedWingLandingComplexItem
::
scanForItem
(
visualItems
,
vehicle
);
}
int
scanIndex
=
0
;
int
scanIndex
=
0
;
while
(
scanIndex
<
visualItems
->
count
())
{
while
(
scanIndex
<
visualItems
->
count
())
{
...
@@ -1792,12 +1796,14 @@ void MissionController::_scanForAdditionalSettings(QmlObjectListModel* visualIte
...
@@ -1792,12 +1796,14 @@ void MissionController::_scanForAdditionalSettings(QmlObjectListModel* visualIte
qCDebug
(
MissionControllerLog
)
<<
"MissionController::_scanForAdditionalSettings count:scanIndex"
<<
visualItems
->
count
()
<<
scanIndex
;
qCDebug
(
MissionControllerLog
)
<<
"MissionController::_scanForAdditionalSettings count:scanIndex"
<<
visualItems
->
count
()
<<
scanIndex
;
if
(
_editMode
)
{
MissionSettingsItem
*
settingsItem
=
qobject_cast
<
MissionSettingsItem
*>
(
visualItem
);
MissionSettingsItem
*
settingsItem
=
qobject_cast
<
MissionSettingsItem
*>
(
visualItem
);
if
(
settingsItem
)
{
if
(
settingsItem
)
{
scanIndex
++
;
scanIndex
++
;
settingsItem
->
scanForMissionSettings
(
visualItems
,
scanIndex
);
settingsItem
->
scanForMissionSettings
(
visualItems
,
scanIndex
);
continue
;
continue
;
}
}
}
SimpleMissionItem
*
simpleItem
=
qobject_cast
<
SimpleMissionItem
*>
(
visualItem
);
SimpleMissionItem
*
simpleItem
=
qobject_cast
<
SimpleMissionItem
*>
(
visualItem
);
if
(
simpleItem
)
{
if
(
simpleItem
)
{
...
...
src/MissionManager/MissionController.h
View file @
15669c39
...
@@ -227,7 +227,7 @@ private:
...
@@ -227,7 +227,7 @@ private:
bool
_loadJsonMissionFileV2
(
const
QJsonObject
&
json
,
QmlObjectListModel
*
visualItems
,
QString
&
errorString
);
bool
_loadJsonMissionFileV2
(
const
QJsonObject
&
json
,
QmlObjectListModel
*
visualItems
,
QString
&
errorString
);
bool
_loadTextMissionFile
(
QTextStream
&
stream
,
QmlObjectListModel
*
visualItems
,
QString
&
errorString
);
bool
_loadTextMissionFile
(
QTextStream
&
stream
,
QmlObjectListModel
*
visualItems
,
QString
&
errorString
);
int
_nextSequenceNumber
(
void
);
int
_nextSequenceNumber
(
void
);
static
void
_scanForAdditionalSettings
(
QmlObjectListModel
*
visualItems
,
Vehicle
*
vehicle
);
void
_scanForAdditionalSettings
(
QmlObjectListModel
*
visualItems
,
Vehicle
*
vehicle
);
static
bool
_convertToMissionItems
(
QmlObjectListModel
*
visualMissionItems
,
QList
<
MissionItem
*>&
rgMissionItems
,
QObject
*
missionItemParent
);
static
bool
_convertToMissionItems
(
QmlObjectListModel
*
visualMissionItems
,
QList
<
MissionItem
*>&
rgMissionItems
,
QObject
*
missionItemParent
);
void
_setPlannedHomePositionFromFirstCoordinate
(
void
);
void
_setPlannedHomePositionFromFirstCoordinate
(
void
);
void
_resetMissionFlightStatus
(
void
);
void
_resetMissionFlightStatus
(
void
);
...
...
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