added support for ground truth points: \n -layer for gt points \n -button with icon

-saving and loading support
This commit is contained in:
toni
2016-12-01 19:42:13 +01:00
parent 674f79c150
commit 1da9d916b3
12 changed files with 341 additions and 4 deletions

View File

@@ -12,6 +12,7 @@
#include "../mapview/model/MapModel.h"
#include "../mapview/model/MMFloorAccessPoint.h"
#include "../mapview/model/MMFloorBeacon.h"
#include "../mapview/model/MMFloorGroundTruthPoints.h"
#include "../UIHelper.h"
@@ -86,6 +87,12 @@ ToolBoxWidget::ToolBoxWidget(MapView2D* view, QWidget *parent) : QWidget(parent)
lay->addWidget(btnPOI, r++, 0, 1,1,Qt::AlignTop);
connect(btnPOI, SIGNAL(clicked(bool)), this, SLOT(onNewPOI()));
// GROUNDTRUTH
btnGTP = new QPushButton(UIHelper::getIcon("gtp"), "");
btnGTP->setMinimumSize(s,s);
lay->addWidget(btnGTP, r++, 0, 1,1,Qt::AlignTop);
connect(btnGTP, SIGNAL(clicked(bool)), this, SLOT(onNewGTP()));
// FILL
lay->addItem(new QSpacerItem(0,0,QSizePolicy::Minimum, QSizePolicy::MinimumExpanding), r, 0);
@@ -110,6 +117,7 @@ void ToolBoxWidget::setSelectedLayer(MapLayer *ml) {
btnWifi->setEnabled(ml && (ml->getLayerType() == MapLayerType::FLOOR_ACCESS_POINTS));
btnBeacon->setEnabled(ml && (ml->getLayerType() == MapLayerType::FLOOR_BEACONS));
btnPOI->setEnabled(ml && (ml->getLayerType() == MapLayerType::FLOOR_POIS));
btnGTP->setEnabled(ml && (ml->getLayerType() == MapLayerType::FLOOR_GROUND_TRUTH_POINTS));
btnImage->setEnabled(ml && (ml->getLayerType() == MapLayerType::FLOOR_UNDERLAYS));
@@ -557,6 +565,18 @@ void ToolBoxWidget::onNewPOI() {
}
void ToolBoxWidget::onNewGTP() {
const Point2 center = view->getScaler().getCenter();
Floorplan::GroundTruthPoint* gtp = new Floorplan::GroundTruthPoint(
0, Point2(center.x, center.y)
);
MMFloorGroundTruthPoints* gtps = (MMFloorGroundTruthPoints*) curLayer;
gtps->createGroundTruthPoint(gtp);
}
void ToolBoxWidget::onNewImage() {
const Point2 center = view->getScaler().getCenter();

View File

@@ -43,6 +43,7 @@ private:
QPushButton* btnWifi;
QPushButton* btnBeacon;
QPushButton* btnPOI;
QPushButton* btnGTP;
QPushButton* btnImage;
@@ -60,6 +61,7 @@ private slots:
void onNewAccessPoint();
void onNewBeacon();
void onNewPOI();
void onNewGTP();
void onNewImage();