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
cc5ba699
Commit
cc5ba699
authored
May 20, 2019
by
Valentin Platzgummer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
about to add survey to wimaController
parent
07975ff6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
1 deletion
+17
-1
WimaController.cc
src/Wima/WimaController.cc
+16
-1
WimaController.h
src/Wima/WimaController.h
+1
-0
No files found.
src/Wima/WimaController.cc
View file @
cc5ba699
...
@@ -146,6 +146,7 @@ void WimaController::resumeMission()
...
@@ -146,6 +146,7 @@ void WimaController::resumeMission()
bool
WimaController
::
updateMission
()
bool
WimaController
::
updateMission
()
{
{
// pick first WimaGOperationArea
WimaGOperationArea
*
opArea
=
nullptr
;
WimaGOperationArea
*
opArea
=
nullptr
;
for
(
int
i
=
0
;
i
<
_visualItems
->
count
();
i
++
)
{
for
(
int
i
=
0
;
i
<
_visualItems
->
count
();
i
++
)
{
WimaGOperationArea
*
currentArea
=
qobject_cast
<
WimaGOperationArea
*>
(
_visualItems
->
get
(
i
));
WimaGOperationArea
*
currentArea
=
qobject_cast
<
WimaGOperationArea
*>
(
_visualItems
->
get
(
i
));
...
@@ -155,6 +156,7 @@ bool WimaController::updateMission()
...
@@ -155,6 +156,7 @@ bool WimaController::updateMission()
}
}
}
}
// pick first WimaServiceArea
WimaServiceArea
*
serArea
=
nullptr
;
WimaServiceArea
*
serArea
=
nullptr
;
for
(
int
i
=
0
;
i
<
_visualItems
->
count
();
i
++
)
{
for
(
int
i
=
0
;
i
<
_visualItems
->
count
();
i
++
)
{
WimaServiceArea
*
currentArea
=
qobject_cast
<
WimaServiceArea
*>
(
_visualItems
->
get
(
i
));
WimaServiceArea
*
currentArea
=
qobject_cast
<
WimaServiceArea
*>
(
_visualItems
->
get
(
i
));
...
@@ -164,8 +166,21 @@ bool WimaController::updateMission()
...
@@ -164,8 +166,21 @@ bool WimaController::updateMission()
}
}
}
}
// calc. vehicle corridor
if
(
opArea
!=
nullptr
&&
serArea
!=
nullptr
){
if
(
opArea
!=
nullptr
&&
serArea
!=
nullptr
){
return
addVehicleCorridor
(
opArea
,
serArea
);
if
(
!
addVehicleCorridor
(
opArea
,
serArea
)){
return
false
;
}
}
else
{
return
false
;
}
// create survey mission, will be extened with more mission types in the future
int
secNumber
=
_missionController
->
insertComplexMissionItem
(
_missionController
->
surveyComplexItemName
(),
new
QGeoCoordinate
(),
_missionController
->
visualItems
()
->
count
());
SurveyComplexItem
*
survey
=
qobject_cast
<
SurveyComplexItem
*>
(
_missionController
->
visualItems
()
->
get
(
secNumber
));
if
(
survey
!=
nullptr
)
{
survey
->
}
else
{
}
else
{
return
false
;
return
false
;
}
}
...
...
src/Wima/WimaController.h
View file @
cc5ba699
...
@@ -11,6 +11,7 @@
...
@@ -11,6 +11,7 @@
#include "PlanMasterController.h"
#include "PlanMasterController.h"
#include "MissionController.h"
#include "MissionController.h"
#include "SurveyComplexItem.h"
class
WimaController
:
public
QObject
class
WimaController
:
public
QObject
...
...
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