Merge branch 'master' of https://git.frank-ebner.de/FHWS/IndoorMap
This commit is contained in:
@@ -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 "../mapview/2D/tools/ToolMeasure.h"
|
||||
|
||||
@@ -117,6 +118,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);
|
||||
|
||||
@@ -142,6 +149,7 @@ void ToolBoxWidget::setSelectedLayer(MapLayer *ml) {
|
||||
btnBeacon->setEnabled(ml && (ml->getLayerType() == MapLayerType::FLOOR_BEACONS));
|
||||
btnFingerprintLocation->setEnabled(ml && (ml->getLayerType() == MapLayerType::FLOOR_FINGERPRINTS));
|
||||
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));
|
||||
|
||||
@@ -495,6 +503,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();
|
||||
|
||||
@@ -47,6 +47,7 @@ private:
|
||||
QPushButton* btnBeacon;
|
||||
QPushButton* btnFingerprintLocation;
|
||||
QPushButton* btnPOI;
|
||||
QPushButton* btnGTP;
|
||||
|
||||
QPushButton* btnImage;
|
||||
|
||||
@@ -66,6 +67,7 @@ private slots:
|
||||
void onNewBeacon();
|
||||
void onNewFingerprintLocation();
|
||||
void onNewPOI();
|
||||
void onNewGTP();
|
||||
|
||||
void onNewImage();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user