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
65210eff
Commit
65210eff
authored
4 years ago
by
Valentin Platzgummer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
some bugs solved
parent
5e62e791
master
dev1
merge_branch_alt
No related merge requests found
Changes
7
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
97 additions
and
67 deletions
+97
-67
CircularSurvey.cc
src/Wima/CircularSurvey.cc
+80
-62
CircularSurvey.h
src/Wima/CircularSurvey.h
+2
-0
WimaMeasurementArea.cc
src/Wima/Geometry/WimaMeasurementArea.cc
+2
-1
WimaMeasurementArea.h
src/Wima/Geometry/WimaMeasurementArea.h
+1
-0
WimaPlaner.cc
src/Wima/WimaPlaner.cc
+6
-0
WimaPlaner.h
src/Wima/WimaPlaner.h
+1
-0
WimaMeasurementAreaMapVisual.qml
src/WimaView/WimaMeasurementAreaMapVisual.qml
+5
-4
No files found.
src/Wima/CircularSurvey.cc
View file @
65210eff
This diff is collapsed.
Click to expand it.
src/Wima/CircularSurvey.h
View file @
65210eff
...
...
@@ -57,6 +57,7 @@ public:
void
setJoinedArea
(
const
WimaJoinedAreaData
&
jArea
);
void
setMeasurementArea
(
const
WimaMeasurementArea
&
mArea
);
void
setJoinedArea
(
const
WimaJoinedArea
&
jArea
);
void
setDepot
(
const
QGeoCoordinate
&
depot
);
// Property getters
QGeoCoordinate
refPoint
()
const
;
...
...
@@ -155,6 +156,7 @@ private:
// Area data
WimaMeasurementAreaData
_mArea
;
WimaJoinedAreaData
_jArea
;
QGeoCoordinate
_depot
;
// Worker
using
PtrWorker
=
std
::
shared_ptr
<
RoutingThread
>
;
...
...
This diff is collapsed.
Click to expand it.
src/Wima/Geometry/WimaMeasurementArea.cc
View file @
65210eff
...
...
@@ -240,10 +240,11 @@ bool WimaMeasurementArea::loadFromJson(const QJsonObject &json,
}
bool
WimaMeasurementArea
::
setProgress
(
const
QVector
<
int
>
&
p
)
{
if
(
!
ready
())
{
if
(
ready
())
{
if
(
p
.
size
()
==
this
->
tiles
()
->
count
()
&&
this
->
_progress
!=
p
)
{
this
->
_progress
=
p
;
emit
progressChanged
();
emit
progressAccepted
();
return
true
;
}
}
...
...
This diff is collapsed.
Click to expand it.
src/Wima/Geometry/WimaMeasurementArea.h
View file @
65210eff
...
...
@@ -92,6 +92,7 @@ signals:
void
tilesChanged
();
void
maxTilesChanged
();
void
progressChanged
();
void
progressAccepted
();
void
readyChanged
();
public
slots
:
...
...
This diff is collapsed.
Click to expand it.
src/Wima/WimaPlaner.cc
View file @
65210eff
...
...
@@ -61,6 +61,7 @@ WimaPlaner::WimaPlaner(QObject *parent)
// NemoInterface
connect
(
&
this
->
_nemoInterface
,
&
NemoInterface
::
progressChanged
,
[
this
]
{
this
->
_measurementArea
.
setProgress
(
this
->
_nemoInterface
.
progress
());
this
->
_update
();
});
// StateMachine
...
...
@@ -340,6 +341,7 @@ void WimaPlaner::_update() {
&
WimaPlaner
::
CSCalculatingChangedHandler
);
_survey
->
setMeasurementArea
(
this
->
_measurementArea
);
_survey
->
setJoinedArea
(
this
->
_joinedArea
);
_survey
->
setDepot
(
this
->
_serviceArea
.
depot
());
connect
(
_survey
,
&
CircularSurvey
::
calculatingChanged
,
this
,
&
WimaPlaner
::
CSCalculatingChangedHandler
);
...
...
@@ -491,6 +493,8 @@ void WimaPlaner::mAreaProgressChangedHandler() {
this
->
_stateMachine
->
updateState
(
EVENT
::
M_AREA_PROGRESS_CHANGED
);
}
void
WimaPlaner
::
mAreaProgressAcceptedHandler
()
{
this
->
_update
();
}
void
WimaPlaner
::
sAreaPathChangedHandler
()
{
this
->
_stateMachine
->
updateState
(
EVENT
::
S_AREA_PATH_CHANGED
);
}
...
...
@@ -776,6 +780,8 @@ void WimaPlaner::enableMonitoring() {
&
WimaPlaner
::
mAreaTilesChangedHandler
);
connect
(
&
this
->
_measurementArea
,
&
WimaMeasurementArea
::
progressChanged
,
this
,
&
WimaPlaner
::
mAreaProgressChangedHandler
);
connect
(
&
this
->
_measurementArea
,
&
WimaMeasurementArea
::
progressAccepted
,
this
,
&
WimaPlaner
::
mAreaProgressAcceptedHandler
);
connect
(
&
this
->
_serviceArea
,
&
WimaArea
::
pathChanged
,
this
,
&
WimaPlaner
::
sAreaPathChangedHandler
);
connect
(
&
this
->
_serviceArea
,
&
WimaServiceArea
::
depotChanged
,
this
,
...
...
This diff is collapsed.
Click to expand it.
src/Wima/WimaPlaner.h
View file @
65210eff
...
...
@@ -126,6 +126,7 @@ private slots:
void
mAreaPathChangedHandler
();
void
mAreaTilesChangedHandler
();
void
mAreaProgressChangedHandler
();
void
mAreaProgressAcceptedHandler
();
void
sAreaPathChangedHandler
();
void
corridorPathChangedHandler
();
void
depotChangedHandler
();
...
...
This diff is collapsed.
Click to expand it.
src/WimaView/WimaMeasurementAreaMapVisual.qml
View file @
65210eff
...
...
@@ -132,11 +132,11 @@ Item {
}
}
function
getColor
(
progress
)
{
if
(
progress
<
25
)
if
(
progress
===
0
)
return
"
transparent
"
if
(
progress
<
50
)
if
(
progress
<
33
)
return
"
orange
"
if
(
progress
<
75
)
if
(
progress
<
66
)
return
"
yellow
"
if
(
progress
<
100
)
return
"
greenyellow
"
...
...
@@ -150,7 +150,8 @@ Item {
Item
{
property
var
_tileComponent
property
int
_progress
:
_root
.
areaItem
.
progress
.
length
property
int
_progress
:
_root
.
areaItem
.
progress
[
index
]
?
_root
.
areaItem
.
progress
[
index
]
:
0
Component.onCompleted
:
{
_tileComponent
=
tileComponent
.
createObject
(
map
)
...
...
This diff is collapsed.
Click to expand it.
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