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

a lot of work on th map-creator

Browse Source
This commit is contained in:
FrankE
2016-07-04 15:11:10 +02:00
parent 6243165084
commit 2935f468fc
61 changed files with 2612 additions and 3342 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
params/ElementParamWidget.cpp
View File

@@ -38,7 +38,6 @@ QComboBox* getObstacleTypes() {
QComboBox* cmb = new QComboBox();
for (int i = 0; i < (int)ObstacleType::_END; ++i) {
switch ((ObstacleType)i) {
case ObstacleType::DOOR: cmb->addItem("Door", i); break;
case ObstacleType::UNKNOWN: cmb->addItem("Unknown ", i); break;
case ObstacleType::WALL: cmb->addItem("Wall", i); break;
case ObstacleType::WINDOW: cmb->addItem("Window", i); break;
@@ -64,6 +63,7 @@ QComboBox* getOutlineMethods() {
}
ElementParamWidget::ElementParamWidget(QWidget *parent) : QGroupBox(parent) {
this->lay = new QGridLayout(this);
@@ -81,6 +81,13 @@ ElementParamWidget::ElementParamWidget(QWidget *parent) : QGroupBox(parent) {
void ElementParamWidget::setElement(MapModelElement* el) {
this->curElement = el;
refresh();
}
void ElementParamWidget::refresh() {
while ( QWidget* w = this->findChild<QWidget*>() ) {delete w;}
delete this->layout();
@@ -88,20 +95,7 @@ void ElementParamWidget::setElement(MapModelElement* el) {
this->setLayout(lay);
int r = 0;
this->curElement = el;
// if (el == nullptr) {
// lblDetails->setText("-");
// } else if (dynamic_cast<MMFloorObstacleLine*>(el)) {
// MMFloorObstacleLine* obs = dynamic_cast<MMFloorObstacleLine*>(el);
// lblDetails->setText("Obstacle");
// } else if (dynamic_cast<MMFloorOutlinePolygon*>(el)) {
// MMFloorOutlinePolygon* poly = dynamic_cast<MMFloorOutlinePolygon*>(el);
// std::string txt = "Polygon (" + std::to_string(poly->getPolygon()->poly.points.size()) + " Points)";
// lblDetails->setText(txt.c_str());
// } else {
// lblDetails->setText("?");
// }
MapModelElement* el = this->curElement;
// material? -> select in combo-box
{
@@ -157,18 +151,39 @@ void ElementParamWidget::setElement(MapModelElement* el) {
const Param param = elem->getParamDesc(i);
const ParamValue value = elem->getParamValue(i);
// skip Not-Available entries
if (param.type == ParamType::NOT_AVAILABLE) {continue;}
lay->addWidget(new QLabel(param.name.c_str()),r,0);
switch(param.type) {
case ParamType::BOOL: {
QCheckBox* chk = new QCheckBox( );
chk->setChecked(value.toBool());
if (param.readOnly) {
chk->setEnabled(false);
} else {
connect(chk, &QCheckBox::clicked, [i,elem] (const bool checked) {
elem->setParamValue(i, ParamValue(checked));
});
}
lay->addWidget(chk,r,1);
break;
}
case ParamType::FLOAT: {
const std::string str = std::to_string(value.toFloat());
QLineEdit* le = new QLineEdit( str.c_str() );
connect(le, &QLineEdit::textChanged, [i,elem] (const QString& str) {
const float val = std::stof(str.toStdString());
elem->setParamValue(i, ParamValue(val));
});
lay->addWidget(le,r,1);
if (param.readOnly) {
lay->addWidget(new QLabel(str.c_str()),r,1);
} else {
QLineEdit* le = new QLineEdit( str.c_str() );
connect(le, &QLineEdit::textChanged, [i,elem] (const QString& str) {
const float val = str.toFloat();
elem->setParamValue(i, ParamValue(val));
});
lay->addWidget(le,r,1);
}
break;
}
@@ -176,7 +191,7 @@ void ElementParamWidget::setElement(MapModelElement* el) {
const std::string str = std::to_string(value.toInt());
QLineEdit* le = new QLineEdit( str.c_str() );
connect(le, &QLineEdit::textChanged, [i,elem] (const QString& str) {
const int val = std::stoi(str.toStdString());
const int val = str.toInt();
elem->setParamValue(i, ParamValue(val));
});
lay->addWidget(le,r,1);
@@ -237,6 +252,7 @@ void ElementParamWidget::setElement(MapModelElement* el) {
laySub->addWidget(txtZ,0,2);
lay->addWidget(subWidget,r,1);
auto onChange = [i,elem,txtX,txtY,txtZ] (const QString& str) {
(void) str;
elem->setParamValue(i, ParamValue( Point3(txtX->text().toFloat(), txtY->text().toFloat(), txtZ->text().toFloat()) ));
};
connect(txtX, &QLineEdit::textChanged, onChange);

3
params/ElementParamWidget.h
View File

@@ -18,7 +18,8 @@ public:
explicit ElementParamWidget(QWidget *parent = 0);
/** refresh the currently selected element */
void refresh();
private:

6
params/StairBuilder.cpp Normal file
View File

@@ -0,0 +1,6 @@
#include "StairBuilder.h"
StairBuilder::StairBuilder(QWidget *parent) : QWidget(parent)
{
}

17
params/StairBuilder.h Normal file
View File

@@ -0,0 +1,17 @@
#ifndef STAIRBUILDER_H
#define STAIRBUILDER_H
#include <QWidget>
class StairBuilder : public QWidget
{
Q_OBJECT
public:
explicit StairBuilder(QWidget *parent = 0);
signals:
public slots:
};
#endif // STAIRBUILDER_H

52
params/ToolBox.cpp
View File

@@ -40,6 +40,17 @@ ToolBoxWidget::ToolBoxWidget(MapView2D* view, QWidget *parent) : QWidget(parent)
lay->addWidget(btnPillar, r++, 0, 1,1,Qt::AlignTop);
connect(btnPillar, SIGNAL(clicked(bool)), this, SLOT(onNewPillar()));
btnDoor = new QPushButton(UIHelper::getIcon("door"), "");
btnDoor->setMinimumSize(s,s);
lay->addWidget(btnDoor, r++, 0, 1,1,Qt::AlignTop);
connect(btnDoor, SIGNAL(clicked(bool)), this, SLOT(onNewDoor()));
btnStair = new QPushButton(UIHelper::getIcon("stair"), "");
btnStair->setMinimumSize(s,s);
lay->addWidget(btnStair, r++, 0, 1,1,Qt::AlignTop);
connect(btnStair, SIGNAL(clicked(bool)), this, SLOT(onNewStair()));
// TRANSMITTERS
btnWifi = new QPushButton(UIHelper::getIcon("wifi"), "");
btnWifi->setMinimumSize(s,s);
@@ -79,6 +90,9 @@ void ToolBoxWidget::setSelectedLayer(MapLayer *ml) {
btnWall->setEnabled(ml && (ml->getLayerType() == MapLayerType::FLOOR_OBSTACLES));
btnPillar->setEnabled(ml && (ml->getLayerType() == MapLayerType::FLOOR_OBSTACLES));
btnDoor->setEnabled(ml && (ml->getLayerType() == MapLayerType::FLOOR_OBSTACLES));
btnStair->setEnabled(ml && (ml->getLayerType() == MapLayerType::FLOOR_STAIRS));
btnWifi->setEnabled(ml && (ml->getLayerType() == MapLayerType::FLOOR_ACCESS_POINTS));
btnBeacon->setEnabled(ml && (ml->getLayerType() == MapLayerType::FLOOR_BEACONS));
@@ -133,7 +147,6 @@ void ToolBoxWidget::onNewPillar() {
float s = view->getScaler().sm(50);
Floorplan::FloorObstacleCircle* pillar = new Floorplan::FloorObstacleCircle(
Floorplan::ObstacleType::PILLAR,
Floorplan::Material::DRYWALL,
Point2(center.x-s, center.y),
s
@@ -146,6 +159,43 @@ void ToolBoxWidget::onNewPillar() {
}
void ToolBoxWidget::onNewDoor() {
const Point2 center = view->getScaler().getCenter();
float s = view->getScaler().sm(50);
Floorplan::FloorObstacleDoor* door = new Floorplan::FloorObstacleDoor(
Floorplan::DoorType::SWING,
Floorplan::Material::WOOD,
Point2(center.x-s, center.y),
Point2(center.x+s, center.y)
);
MMFloorObstacles* obs = (MMFloorObstacles*)curLayer;
obs->createDoor(door);
view->getModel()->reselect();
}
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 );
MMFloorStairs* stairs = (MMFloorStairs*)curLayer;
stairs->create(stair);
view->getModel()->reselect();
}
void ToolBoxWidget::onNewAccessPoint() {
const Point2 center = view->getScaler().getCenter();

5
params/ToolBoxWidget.h
View File

@@ -31,6 +31,9 @@ private:
QPushButton* btnGround;
QPushButton* btnWall;
QPushButton* btnPillar;
QPushButton* btnDoor;
QPushButton* btnStair;
QPushButton* btnWifi;
QPushButton* btnBeacon;
@@ -43,6 +46,8 @@ private slots:
void onNewGround();
void onNewWall();
void onNewPillar();
void onNewDoor();
void onNewStair();
void onNewAccessPoint();
void onNewBeacon();