From 9a8516defbbb2cf01cbebac926a500320e508f47 Mon Sep 17 00:00:00 2001 From: kazu Date: Thu, 23 Mar 2017 18:01:46 +0100 Subject: [PATCH] fixed correspondence-point deletion --- MainController.cpp | 2 +- mapview/model/MMRegistrationPoint.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/MainController.cpp b/MainController.cpp index a737696..a568f9d 100644 --- a/MainController.cpp +++ b/MainController.cpp @@ -95,7 +95,7 @@ MainController::MainController() { connect(mw, &MainWindow::onGridShowEdges, [&] (const bool show) {mw->getMapView3D()->getGridRenderer()->setShowEdges(show);} ); - mapModel->load("../IndoorMap/maps/SHL36.xml"); + mapModel->load("../IndoorMap/maps/SHL37.xml"); //mapModel->resize(0.983, 0.983, 1, -0.2, -0.3, 0); diff --git a/mapview/model/MMRegistrationPoint.h b/mapview/model/MMRegistrationPoint.h index a40f7fc..d75ca36 100644 --- a/mapview/model/MMRegistrationPoint.h +++ b/mapview/model/MMRegistrationPoint.h @@ -36,7 +36,8 @@ public: MV3DElement* getMV3D() const override {return (MV3DElement*) &mv3d;} void deleteMe() const override { - ; + parent->removeElement(this); + map->earthReg.correspondences.erase(std::remove(map->earthReg.correspondences.begin(), map->earthReg.correspondences.end(), reg), map->earthReg.correspondences.end()); } int getNumParams() const override {