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
2b61da4b
Commit
2b61da4b
authored
Jun 23, 2019
by
Valentin Platzgummer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no seg. fault, about to swicht QmlObjectListModel to QVariantList
parent
7a0feac0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
50 additions
and
9 deletions
+50
-9
WimaController.cc
src/Wima/WimaController.cc
+35
-0
WimaController.h
src/Wima/WimaController.h
+8
-7
WimaDataContainer.h
src/Wima/WimaDataContainer.h
+7
-2
No files found.
src/Wima/WimaController.cc
View file @
2b61da4b
...
...
@@ -13,6 +13,15 @@ WimaController::WimaController(QObject *parent) :
connect
(
this
,
&
WimaController
::
currentPolygonIndexChanged
,
this
,
&
WimaController
::
recalcPolygonInteractivity
);
}
QmlObjectListModel
*
WimaController
::
visualItems
()
const
{
if
(
_container
!=
nullptr
)
{
return
_container
->
visualItems
();
}
else
{
return
nullptr
;
}
}
QStringList
WimaController
::
loadNameFilters
()
const
{
QStringList
filters
;
...
...
@@ -30,6 +39,25 @@ QStringList WimaController::saveNameFilters() const
return
filters
;
}
QGeoCoordinate
WimaController
::
joinedAreaCenter
()
const
{
if
(
_container
!=
nullptr
)
{
return
_container
->
joinedArea
()
->
center
();
}
else
{
return
QGeoCoordinate
();
}
}
WimaArea
*
WimaController
::
joinedArea
()
const
{
if
(
_container
!=
nullptr
)
{
return
_container
->
joinedArea
();
void
uploadToContainer
();
void
downloadFromContainer
();
}
else
{
return
nullptr
;
}
}
void
WimaController
::
setMasterController
(
PlanMasterController
*
masterC
)
{
_masterController
=
masterC
;
...
...
@@ -628,6 +656,13 @@ void WimaController::updateJoinedArea()
emit
joinedAreaChanged
()
;
}
void
WimaController
::
uploadToContainer
()
{
if
(
_container
!=
nullptr
)
{
}
}
void
WimaController
::
resetAllInteractive
()
{
if
(
_container
==
nullptr
)
{
...
...
src/Wima/WimaController.h
View file @
2b61da4b
...
...
@@ -47,14 +47,14 @@ public:
// Property accessors
PlanMasterController
*
masterController
(
void
)
const
{
return
_masterController
;
}
MissionController
*
missionController
(
void
)
const
{
return
_missionController
;
}
QmlObjectListModel
*
visualItems
(
void
)
const
{
return
_container
->
visualItems
();
}
QmlObjectListModel
*
visualItems
(
void
)
const
;
int
currentPolygonIndex
(
void
)
const
{
return
_currentPolygonIndex
;
}
QString
currentFile
(
void
)
const
{
return
_currentFile
;
}
QStringList
loadNameFilters
(
void
)
const
;
QStringList
saveNameFilters
(
void
)
const
;
QString
fileExtension
(
void
)
const
{
return
wimaFileExtension
;
}
QGeoCoordinate
joinedAreaCenter
(
void
)
const
{
return
_container
->
joinedArea
()
->
center
();
}
WimaArea
*
joinedArea
(
void
)
const
{
return
_container
->
joinedArea
();
}
QGeoCoordinate
joinedAreaCenter
(
void
)
const
;
WimaArea
*
joinedArea
(
void
)
const
;
WimaDataContainer
*
dataContainer
(
void
)
const
{
return
_container
;
}
bool
flyView
(
void
)
const
{
return
_flyView
;
}
...
...
@@ -67,6 +67,7 @@ public:
void
setCurrentPolygonIndex
(
int
index
);
void
setDataContainer
(
WimaDataContainer
*
container
);
// Member Methodes
Q_INVOKABLE
void
startWimaController
(
bool
flyView
);
Q_INVOKABLE
bool
addGOperationArea
();
/// Removes an area from _visualItems
...
...
@@ -100,10 +101,6 @@ public:
// Member Methodes
QJsonDocument
saveToJson
(
FileType
fileType
);
signals:
void
masterControllerChanged
(
void
);
void
missionControllerChanged
(
void
);
...
...
@@ -119,6 +116,8 @@ private slots:
void
recalcAll
();
void
recalcPolygonInteractivity
(
int
index
);
void
updateJoinedArea
();
void
uploadToContainer
();
void
downloadFromContainer
();
private:
...
...
@@ -128,6 +127,8 @@ private:
int
_currentPolygonIndex
;
QString
_currentFile
;
WimaDataContainer
*
_container
;
QmlObjectListModel
*
_visualItems
;
WimaArea
*
_joinedArea
;
};
src/Wima/WimaDataContainer.h
View file @
2b61da4b
...
...
@@ -13,10 +13,15 @@ class WimaDataContainer : public QObject
public:
explicit
WimaDataContainer
(
QObject
*
parent
=
nullptr
);
QmlObjectListModel
*
visualItems
(
void
)
{
return
&
_visualItems
;
}
WimaArea
*
joinedArea
(
void
)
{
return
&
_joinedArea
;
}
QmlObjectListModel
*
visualItems
(
void
)
{
return
&
_visualItems
;
}
//use setVisualItems to modify list
WimaArea
joinedArea
(
void
)
{
return
_joinedArea
;
}
void
setJoinedArea
(
const
WimaArea
&
joinedArea
);
void
setVisualItems
(
const
QmlObjectListModel
&
list
);
signals:
void
joinedAreaChanged
();
void
visualItemsChanged
();
public
slots
:
...
...
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