FHWS/IndoorMap
Archived
2
0
Fork 0
Code Issues 10 Pull Requests Releases Wiki Activity

added elevator support

Browse Source
This commit is contained in:
FrankE
2016-09-10 15:13:49 +02:00
parent fa06320219
commit 674f79c150
13 changed files with 353 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
params/ToolBox.cpp
View File

@@ -57,6 +57,11 @@ ToolBoxWidget::ToolBoxWidget(MapView2D* view, QWidget *parent) : QWidget(parent)
lay->addWidget(btnStair, r++, 0, 1,1,Qt::AlignTop);
connect(btnStair, SIGNAL(clicked(bool)), this, SLOT(onNewStair()));
btnElevator = new QPushButton(UIHelper::getIcon("elevator"), "");
btnElevator->setMinimumSize(s,s);
lay->addWidget(btnElevator, r++, 0, 1,1,Qt::AlignTop);
connect(btnElevator, SIGNAL(clicked(bool)), this, SLOT(onNewElevator()));
// TRANSMITTERS
btnWifi = new QPushButton(UIHelper::getIcon("wifi"), "");
@@ -100,6 +105,7 @@ void ToolBoxWidget::setSelectedLayer(MapLayer *ml) {
btnDoor->setEnabled(ml && (ml->getLayerType() == MapLayerType::FLOOR_OBSTACLES));
btnStair->setEnabled(ml && (ml->getLayerType() == MapLayerType::FLOOR_STAIRS));
btnElevator->setEnabled(ml && (ml->getLayerType() == MapLayerType::FLOOR_ELEVATORS));
btnWifi->setEnabled(ml && (ml->getLayerType() == MapLayerType::FLOOR_ACCESS_POINTS));
btnBeacon->setEnabled(ml && (ml->getLayerType() == MapLayerType::FLOOR_BEACONS));
@@ -491,9 +497,6 @@ void ToolBoxWidget::onNewStair() {
const Point2 center = view->getScaler().getCenter();
// Floorplan::Stair* stair = new Floorplan::StairNormal(center, 0, 0, 3, 2, 6);
// stair->center = center;
Floorplan::StairFreeform* stair = new Floorplan::StairFreeform();
Floorplan::StairPart part(Point3(center.x-3, center.y, 0), Point3(center.x+3, center.y, 3), 3);
stair->parts.push_back( part );
@@ -505,6 +508,19 @@ void ToolBoxWidget::onNewStair() {
}
void ToolBoxWidget::onNewElevator() {
const Point2 center = view->getScaler().getCenter();
Floorplan::Elevator* elevator = new Floorplan::Elevator(center);
MMFloorElevators* elevators = (MMFloorElevators*)curLayer;
elevators->create(elevator);
//view->getModel()->reselect();
}
void ToolBoxWidget::onNewAccessPoint() {
const Point2 center = view->getScaler().getCenter();

2
params/ToolBoxWidget.h
View File

@@ -38,6 +38,7 @@ private:
QPushButton* btnPillar;
QPushButton* btnDoor;
QPushButton* btnStair;
QPushButton* btnElevator;
QPushButton* btnWifi;
QPushButton* btnBeacon;
@@ -54,6 +55,7 @@ private slots:
void onNewPillar();
void onNewDoor();
void onNewStair();
void onNewElevator();
void onNewAccessPoint();
void onNewBeacon();