Commit 2b61da4b authored by Valentin Platzgummer's avatar Valentin Platzgummer

no seg. fault, about to swicht QmlObjectListModel to QVariantList

parent 7a0feac0
......@@ -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) {
......
......@@ -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;
};
......@@ -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:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment