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

refactoring

Browse Source 
wireframe display
worked on 3d-model display
This commit is contained in:
FrankE
2018-02-08 21:38:51 +01:00
parent bce771d6d6
commit 839401edb7
16 changed files with 395 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
IndoorMap.pro
View File

@@ -48,7 +48,8 @@ SOURCES += \
mapview/3D/misc/Outline.cpp \
mapview/3D/misc/Handrail.cpp \
mapview/3D/navMesh/QNavMeshSettings.cpp \
params/ToolBoxWidget.cpp
params/ToolBoxWidget.cpp \
mapview/2D/MV2DElementFloorObstacleDoor.cpp
HEADERS += MainWindow.h \

6
MainController.cpp
View File

@@ -108,10 +108,12 @@ MainController::MainController() {
//mapModel->load("/apps/map24b.xml");
//mapModel->load("/apps/SHL41.xml");
//mapModel->load("/mnt/vm/paper/diss/data/maps/SHL41_nm.xml");
//mapModel->load("/mnt/vm/paper/diss/data/maps/test_in_out_overlap.xml");
mapModel->load("/mnt/vm/paper/diss/data/maps/SHL42_nm.xml");
//mapModel->load("/apps/paper/diss/data/maps/SHL41_nm.xml");
mapModel->load("/mnt/sdcard/SHL41_nm.xml");
//mapModel->load("/mnt/sdcard/SHL41_nm.xml");
//mapModel->load("/apps/paper/diss/data/maps/map_elevator2.xml");

138
mapview/2D/MV2DElementFloorObstacleDoor.cpp Normal file
View File

@@ -0,0 +1,138 @@
#include "MV2DElementFloorObstacleDoor.h"
#include "MV2DElement.h"
#include "MapViewElementHelper.h"
#include "HasMoveableNodes.h"
#include <Indoor/floorplan/v2/Floorplan.h>
#include <chrono>
MV2DElementFloorObstacleDoor::MV2DElementFloorObstacleDoor(Floorplan::FloorObstacleDoor* fo) : fo(fo) {
;
}
BBox2 MV2DElementFloorObstacleDoor::getBoundingBox() const {
BBox2 bbox;
bbox.add(fo->from);
bbox.add(fo->to);
return bbox;
}
ClickDist MV2DElementFloorObstacleDoor::getMinDistanceXY(const Point2 p) const {
return MapElementHelper::getLineDistanceXY(fo->from, fo->to, p) * 0.95;
}
void MV2DElementFloorObstacleDoor::paint(Painter& p) {
// selected endpoints?
if (hasFocus()) {
p.setPenBrush(Qt::NoPen, CFG::SEL_COLOR);
if (selectedUserIdx == 0) {p.drawCircle(fo->from);}
if (selectedUserIdx == 1) {p.drawCircle(fo->to);}
}
QPen pen;
pen.setColor(QColor(0.5,0.5,0.5));
pen.setStyle(Qt::PenStyle::DotLine);
p.setPenBrush(pen, Qt::NoBrush);
if (Floorplan::DoorType::SWING == fo->type) {
// opening indicator
const float open = (fo->swap) ? (-M_PI * 0.5) : (+M_PI * 0.5);
const float len = (fo->to - fo->from).length();
const float angle1 = std::atan2(fo->to.y-fo->from.y, fo->to.x-fo->from.x);
const float angle2 = angle1 + open;
const Point2 pOpen = Point2( std::cos(angle2) * len, std::sin(angle2) * len ) + fo->from;
pen.setWidth(2); p.setPen(pen);
p.drawLine(fo->from, fo->to);
pen.setWidth(1); p.setPen(pen);
p.drawLine(fo->from, pOpen);
p.drawArc(fo->from, len, angle1, open);
} else if (Floorplan::DoorType::REVOLVING == fo->type) {
const float angle_rad = std::atan2(fo->to.y-fo->from.y, fo->to.x-fo->from.x);
// arcs
const Point2 cen = (fo->from + fo->to) / 2;
const float rad = (fo->to - fo->from).length() / 2;
p.drawArc(cen, rad, (40-90)/180.0f*M_PI+angle_rad, 100/180.0f*M_PI);
p.drawArc(cen, rad, (180+40-90)/180.0f*M_PI+angle_rad, 100/180.0f*M_PI);
const int funAngle = (std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count() / 50) % 360;
// inner spinner
int numDoors = 3;
for (int i = 0; i < numDoors; ++i) {
const int deg = 360 * i / numDoors + angle_rad*180.0f/M_PI + funAngle;
const float sx = std::cos(deg / 180.0f * M_PI);
const float sy = std::sin(deg / 180.0f * M_PI);
const Point2 dst = cen + Point2(sx,sy) * rad;
p.drawLine(cen, dst);
}
}
// available endpoints
if (hasFocus()) {
p.setPenBrush(Qt::black, Qt::NoBrush);
p.drawCircle(fo->from);
p.drawCircle(fo->to);
}
// obstacle length
if (hasFocus()) {
p.setPenBrush(Qt::black, Qt::NoBrush);
p.drawLength(fo->from, fo->to, fo->from.getDistance(fo->to));
}
}
void MV2DElementFloorObstacleDoor::onFocus() {
;
}
void MV2DElementFloorObstacleDoor::onUnfocus() {
selectedUserIdx = -1; // clear selection
}
void MV2DElementFloorObstacleDoor::mousePressed(MapView2D* v, const Point2 p) {
(void) v;
(void) p;
}
void MV2DElementFloorObstacleDoor::mouseMove(MapView2D* v, const Point2 p) {
(void) v;
(void) p;
}
void MV2DElementFloorObstacleDoor::mouseReleased(MapView2D* v, const Point2 p) {
(void) v;
(void) p;
}
std::vector<MoveableNode> MV2DElementFloorObstacleDoor::getMoveableNodes() const {
std::vector<MoveableNode> nodes = {
MoveableNode(0, fo->from),
MoveableNode(1, fo->to)
};
return nodes;
}
void MV2DElementFloorObstacleDoor::onNodeMove(MapView2D* v, const int userIdx, const Point2 newPos) {
switch (userIdx) {
case 0: fo->from = newPos; break;
case 1: fo->to = newPos; break;
}
emit v->onElementChange(this);
}
bool MV2DElementFloorObstacleDoor::keyPressEvent(MapView2D* v, QKeyEvent *e) {
(void) v;
(void) e;
return false;
}

125
mapview/2D/MV2DElementFloorObstacleDoor.h
View File

@@ -2,7 +2,6 @@
#define MV2DELEMENTFLOOROBSTACLEDOOR_H
#include "MV2DElement.h"
#include "MapViewElementHelper.h"
#include "HasMoveableNodes.h"
#include <Indoor/floorplan/v2/Floorplan.h>
@@ -16,136 +15,36 @@ private:
public:
/** ctor */
MV2DElementFloorObstacleDoor(Floorplan::FloorObstacleDoor* fo) : fo(fo) {;}
MV2DElementFloorObstacleDoor(Floorplan::FloorObstacleDoor* fo);
/** get the element's 3D bounding box */
BBox2 getBoundingBox() const override {
BBox2 bbox;
bbox.add(fo->from);
bbox.add(fo->to);
return bbox;
}
BBox2 getBoundingBox() const override;
/** get the element's minimal distance (nearest whatsoever) to the given point */
ClickDist getMinDistanceXY(const Point2 p) const override {
return MapElementHelper::getLineDistanceXY(fo->from, fo->to, p);
}
ClickDist getMinDistanceXY(const Point2 p) const override;
/** repaint me */
void paint(Painter& p) override {
void paint(Painter& p) override;
// selected endpoints?
if (hasFocus()) {
p.setPenBrush(Qt::NoPen, CFG::SEL_COLOR);
if (selectedUserIdx == 0) {p.drawCircle(fo->from);}
if (selectedUserIdx == 1) {p.drawCircle(fo->to);}
}
virtual void onFocus() override;
QPen pen;
pen.setColor(QColor(0.5,0.5,0.5));
pen.setStyle(Qt::PenStyle::DotLine);
p.setPenBrush(pen, Qt::NoBrush);
virtual void onUnfocus() override;
// opening indicator
const float open = (fo->swap) ? (-M_PI * 0.5) : (+M_PI * 0.5);
const float len = (fo->to - fo->from).length();
const float angle1 = std::atan2(fo->to.y-fo->from.y, fo->to.x-fo->from.x);
const float angle2 = angle1 + open;
const Point2 pOpen = Point2( std::cos(angle2) * len, std::sin(angle2) * len ) + fo->from;
virtual void mousePressed(MapView2D* v, const Point2 p) override;
pen.setWidth(2); p.setPen(pen);
p.drawLine(fo->from, fo->to);
virtual void mouseMove(MapView2D* v, const Point2 p) override;
pen.setWidth(1); p.setPen(pen);
p.drawLine(fo->from, pOpen);
p.drawArc(fo->from, len, angle1, open);
// available endpoints
if (hasFocus()) {
p.setPenBrush(Qt::black, Qt::NoBrush);
p.drawCircle(fo->from);
p.drawCircle(fo->to);
}
// obstacle length
if (hasFocus()) {
p.setPenBrush(Qt::black, Qt::NoBrush);
p.drawLength(fo->from, fo->to, fo->from.getDistance(fo->to));
}
}
virtual void onFocus() override {
;
}
virtual void onUnfocus() override {
selectedUserIdx = -1; // clear selection
}
virtual void mousePressed(MapView2D* v, const Point2 p) override {
(void) v;
(void) p;
}
virtual void mouseMove(MapView2D* v, const Point2 p) override {
(void) v;
(void) p;
}
virtual void mouseReleased(MapView2D* v, const Point2 p) override {
(void) v;
(void) p;
}
/** mouse moved to the given point */
// virtual void mouseMove(MapView2D* v, const Point2 _p) override {
// (void) v;
// if (selPoint == -1) {return;}
// const Point2 p = v->getScaler().snap(_p);
// if (selPoint == 0) {fo->from.x = p.x; fo->from.y = p.y;}
// if (selPoint == 1) {fo->to.x = p.x; fo->to.y = p.y;}
// emit v->onElementChange(this);
// }
/** mouse released */
// virtual void mouseReleased(MapView2D* v, const Point2 _p) override {
// // select a new point on mouse-release (more robust than on mouse-press)
// const float t = v->getScaler().sm(CFG::SEL_THRESHOLD_SIZE_PX);
// const float l1 = _p.getDistance(fo->from);
// const float l2 = _p.getDistance(fo->to);
// if (l1 < l2 && l1 <= t) {selPoint = 0;}
// else if (l2 < l1 && l2 <= t) {selPoint = 1;}
// else {selPoint = -1;}
// }
virtual void mouseReleased(MapView2D* v, const Point2 p) override;
/** get a list of all nodes that are selectable / moveable */
virtual std::vector<MoveableNode> getMoveableNodes() const override {
std::vector<MoveableNode> nodes = {
MoveableNode(0, fo->from),
MoveableNode(1, fo->to)
};
return nodes;
}
virtual std::vector<MoveableNode> getMoveableNodes() const override;
/** the given node was moved */
virtual void onNodeMove(MapView2D* v, const int userIdx, const Point2 newPos) override {
switch (userIdx) {
case 0: fo->from = newPos; break;
case 1: fo->to = newPos; break;
}
emit v->onElementChange(this);
}
virtual void onNodeMove(MapView2D* v, const int userIdx, const Point2 newPos) override;
virtual bool keyPressEvent(MapView2D* v, QKeyEvent *e) override {
(void) v;
(void) e;
return false;
}
virtual bool keyPressEvent(MapView2D* v, QKeyEvent *e) override;
};

2
mapview/2D/MV2DElementFloorOutlinePolygon.h
View File

@@ -34,7 +34,7 @@ public:
const ClickDist dst = MapElementHelper::getLineDistanceXY(p1, p2, p);
if (dst < min) {min = dst;}
}
return min;
return min * 1.1; // penalty.. outlines are everywhere.. reduce priority
}
virtual void onFocus() override {

2
mapview/2D/MapViewElementHelper.h
View File

@@ -56,7 +56,7 @@ public:
}
// distance from endpoints
// (direct) distance from endpoints
const ClickDist d1(p1.getDistance(dst), ClickDistType::DIRECT);
const ClickDist d2(p2.getDistance(dst), ClickDistType::DIRECT);

20
mapview/3D/MapView3D.cpp
View File

@@ -56,6 +56,15 @@ MapView3D::MapView3D(QWidget *parent) : QOpenGLWidget(parent) {
emit update();
});
QPushButton* btnWireframe = new QPushButton(UIHelper::getIcon("wireframe"), "", this);
btnWireframe->setCheckable(true);
btnWireframe->setStyleSheet(style);
btnWireframe->setGeometry(16, 16+8+32+8+32, 32, 32);
connect(btnWireframe, &QPushButton::clicked, [this] () {
useWireframe = !useWireframe;
emit update();
});
QPushButton* btnGrid = new QPushButton(UIHelper::getIcon("grid"), "", this);
btnGrid->setCheckable(true);
btnGrid->setChecked(false);
@@ -74,6 +83,7 @@ MapView3D::MapView3D(QWidget *parent) : QOpenGLWidget(parent) {
emit onShow3DNavMesh(btnNavMesh->isChecked());
});
// android
setAttribute(Qt::WA_AcceptTouchEvents, true);
grabGesture(Qt::PanGesture);
@@ -81,7 +91,7 @@ MapView3D::MapView3D(QWidget *parent) : QOpenGLWidget(parent) {
auto format = QSurfaceFormat();
//format.setVersion(4,3);
format.setSamples(4);
format.setSamples(2);
//format.setProfile(QSurfaceFormat::CoreProfile);
setFormat(format);
@@ -298,8 +308,8 @@ void MapView3D::draw() {
rs.shader->setViewMatrix(V);
rs.shader->setProjectionMatrix(P);
if (floorplanRenderer && floorplanRendererModel) {
floorplanRenderer->renderSolid(rs, floorplanRendererModel->getTriaSolid() );
if (showFloorplan && floorplanRendererModel) {
floorplanRenderer->renderSolid(rs, floorplanRendererModel->getTriaSolid(), useWireframe );
}
// // solid floorplan parts
@@ -330,8 +340,8 @@ void MapView3D::draw() {
// }
if (floorplanRenderer && floorplanRendererModel) {
floorplanRenderer->renderTransp(rs, floorplanRendererModel->getTriaTransp() );
if (showFloorplan && floorplanRendererModel) {
floorplanRenderer->renderTransp(rs, floorplanRendererModel->getTriaTransp(), useWireframe);
}

1
mapview/3D/MapView3D.h
View File

@@ -21,6 +21,7 @@ class MapView3D : public QOpenGLWidget {
Q_OBJECT
bool usePerspectiveProjection = false;
bool useWireframe = false;
public:

39
mapview/3D/floorplan/FloorplanRenderer.h
View File

@@ -27,25 +27,34 @@ public:
}
/** render the given grid using GL commands */
void renderSolid(const RenderSettings& rs, const RenderTriangle& rt) {
void renderSolid(const RenderSettings& rs, const RenderTriangle& rt, bool wireframe) {
rs.shader->bind();
rs.shader->setModelMatrix(QMatrix4x4());
rs.shader->setVertices(rt.getVertices().data());
rs.shader->setNormals(rt.getNormals().data());
rs.shader->setVertexColor(rt.getRGBA().data());
glDrawArrays(GL_TRIANGLES, 0, rt.getVertices().size()/3);
rs.shader->setVertices(rt.getVertices());
rs.shader->setNormals(rt.getNormals());
rs.shader->setVertexColor(rt.getRGBA());
glDrawArrays(GL_TRIANGLES, 0, rt.count());
rs.shader->unsetVertices();
rs.shader->unsetNormals();
rs.shader->unsetVertexColor();
if (wireframe) {
RenderTriangle rt2 = rt.toWireframe(false);
rs.shader->setColor(0,0,0,128);
rs.shader->setVertices(rt2.getVertices());
//rs.shader->setVertexColor(rt2.getRGBA());
glDrawArrays(GL_LINES, 0, rt2.count());
rs.shader->unsetVertices();
//rs.shader->unsetVertexColor();
}
rs.shader->release();
}
/** render the given grid using GL commands */
void renderTransp(const RenderSettings& rs, const RenderTriangle& rt) {
void renderTransp(const RenderSettings& rs, const RenderTriangle& rt, bool wireframe) {
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@@ -53,14 +62,24 @@ public:
rs.shader->bind();
rs.shader->setModelMatrix(QMatrix4x4());
rs.shader->setVertices(rt.getVertices().data());
rs.shader->setNormals(rt.getNormals().data());
rs.shader->setVertexColor(rt.getRGBA().data());
glDrawArrays(GL_TRIANGLES, 0, rt.getVertices().size()/3);
rs.shader->setVertices(rt.getVertices());
rs.shader->setNormals(rt.getNormals());
rs.shader->setVertexColor(rt.getRGBA());
glDrawArrays(GL_TRIANGLES, 0, rt.count());
rs.shader->unsetVertices();
rs.shader->unsetNormals();
rs.shader->unsetVertexColor();
if (wireframe) {
RenderTriangle rt2 = rt.toWireframe(false);
rs.shader->setColor(0,0,0,128);
rs.shader->setVertices(rt2.getVertices());
//rs.shader->setVertexColor(rt2.getRGBA());
glDrawArrays(GL_LINES, 0, rt2.count());
rs.shader->unsetVertices();
//rs.shader->unsetVertexColor();
}
rs.shader->release();
glDisable(GL_BLEND);

109
mapview/3D/floorplan/RenderTriangle.h
View File

@@ -7,56 +7,71 @@
class RenderTriangle {
std::vector<float> vertices;
std::vector<float> normals;
std::vector<float> rgba;
struct Vertex{
float x,y,z;
Vertex(const float x, const float y, const float z) : x(x), y(y), z(z) {;}
} __attribute__((packed));
struct Normal {
float x,y,z;
Normal(const float x, const float y, const float z) : x(x), y(y), z(z) {;}
} __attribute__((packed));
struct RGBA {
float r,g,b,a;
RGBA(const float r, const float g, const float b, const float a) : r(r), g(g), b(b), a(a) {;}
} __attribute__((packed));
std::vector<Vertex> vertices;
std::vector<Normal> normals;
std::vector<RGBA> rgba;
public:
void addTriangle(Point3 p1, Point3 p2, Point3 p3) {
vertices.insert(vertices.end(), {p1.x, p1.y, p1.z});
vertices.insert(vertices.end(), {p2.x, p2.y, p2.z});
vertices.insert(vertices.end(), {p3.x, p3.y, p3.z});
vertices.push_back(Vertex(p1.x, p1.y, p1.z));
vertices.push_back(Vertex(p2.x, p2.y, p2.z));
vertices.push_back(Vertex(p3.x, p3.y, p3.z));
}
void addTriangle(Point3 p1, Point3 p2, Point3 p3, const Point3 n) {
vertices.insert(vertices.end(), {p1.x, p1.y, p1.z});
vertices.insert(vertices.end(), {p2.x, p2.y, p2.z});
vertices.insert(vertices.end(), {p3.x, p3.y, p3.z});
vertices.push_back(Vertex(p1.x, p1.y, p1.z));
vertices.push_back(Vertex(p2.x, p2.y, p2.z));
vertices.push_back(Vertex(p3.x, p3.y, p3.z));
normals.insert(normals.end(), {n.x, n.y, n.z});
normals.insert(normals.end(), {n.x, n.y, n.z});
normals.insert(normals.end(), {n.x, n.y, n.z});
normals.push_back(Normal(n.x, n.y, n.z));
normals.push_back(Normal(n.x, n.y, n.z));
normals.push_back(Normal(n.x, n.y, n.z));
}
void addTriangle(Point3 p1, Point3 p2, Point3 p3, const Point3 n, const float r, const float g, const float b, const float a) {
vertices.insert(vertices.end(), {p1.x, p1.y, p1.z});
vertices.insert(vertices.end(), {p2.x, p2.y, p2.z});
vertices.insert(vertices.end(), {p3.x, p3.y, p3.z});
vertices.push_back(Vertex(p1.x, p1.y, p1.z));
vertices.push_back(Vertex(p2.x, p2.y, p2.z));
vertices.push_back(Vertex(p3.x, p3.y, p3.z));
normals.insert(normals.end(), {n.x, n.y, n.z});
normals.insert(normals.end(), {n.x, n.y, n.z});
normals.insert(normals.end(), {n.x, n.y, n.z});
normals.push_back(Normal(n.x, n.y, n.z));
normals.push_back(Normal(n.x, n.y, n.z));
normals.push_back(Normal(n.x, n.y, n.z));
rgba.insert(rgba.end(), {r,g,b,a});
rgba.insert(rgba.end(), {r,g,b,a});
rgba.insert(rgba.end(), {r,g,b,a});
rgba.push_back(RGBA(r,g,b,a));
rgba.push_back(RGBA(r,g,b,a));
rgba.push_back(RGBA(r,g,b,a));
}
void addLine(Point3 p1, Point3 p2, const float r, const float g, const float b, const float a) {
vertices.insert(vertices.end(), {p1.x, p1.y, p1.z});
vertices.insert(vertices.end(), {p2.x, p2.y, p2.z});
vertices.push_back( Vertex(p1.x, p1.y, p1.z));
vertices.push_back(Vertex(p2.x, p2.y, p2.z));
rgba.insert(rgba.end(), {r,g,b,a});
rgba.insert(rgba.end(), {r,g,b,a});
rgba.push_back( RGBA(r,g,b,a));
rgba.push_back(RGBA(r,g,b,a));
}
@@ -66,11 +81,49 @@ public:
rgba.clear();
}
const std::vector<float>& getVertices() const {return vertices;}
const float* getVertices() const {return (float*) vertices.data();}
const std::vector<float>& getNormals() const {return normals;}
const float* getNormals() const {return (float*) normals.data();}
const std::vector<float>& getRGBA() const {return rgba;}
const float* getRGBA() const {return (float*) rgba.data();}
size_t count() const {return vertices.size();}
RenderTriangle toWireframe(const bool withVertexColors) const {
RenderTriangle res;
for (size_t i = 0; i < vertices.size(); i += 3) {
res.vertices.push_back(vertices[i+0]);
res.vertices.push_back(vertices[i+1]);
res.vertices.push_back(vertices[i+1]);
res.vertices.push_back(vertices[i+2]);
res.vertices.push_back(vertices[i+2]);
res.vertices.push_back(vertices[i+0]);
}
if (withVertexColors) {
for (size_t i = 0; i < rgba.size(); i += 3) {
res.rgba.push_back(rgba[i+0]);
res.rgba.push_back(rgba[i+1]);
res.rgba.push_back(rgba[i+1]);
res.rgba.push_back(rgba[i+2]);
res.rgba.push_back(rgba[i+2]);
res.rgba.push_back(rgba[i+0]);
}
}
return res;
}
};

10
mapview/model/IHasParams.h
View File

@@ -15,6 +15,7 @@ enum class ParamType {
FILE,
POINT2,
POINT3,
ENUM,
};
class ParamValue {
@@ -85,13 +86,22 @@ struct Param {
/** read-only parameter? */
bool readOnly;
std::vector<std::string> enumValues;
/** ctor */
Param(const std::string& name, const ParamType type, const bool readOnly = false) : name(name), type(type), readOnly(readOnly) {;}
/** ctor */
Param(const std::string& name, const ParamType type, const std::vector<std::string>& enumValues) : name(name), type(type), readOnly(false), enumValues(enumValues) {;}
/** special parameter */
static Param getNA() { return Param("", ParamType::NOT_AVAILABLE); }
/** get all supported enum values */
const std::vector<std::string>& getEnumValues() const {return enumValues;}
};
/** free parameters */

5
mapview/model/MMFloorObstacleDoor.h
View File

@@ -46,7 +46,7 @@ public:
/** get the number of parameters */
int getNumParams() const override {
return 3;
return 4;
}
/** get the description of the idx-th parameter */
@@ -55,6 +55,7 @@ public:
case 0: return Param("width", ParamType::FLOAT, true);
case 1: return Param("height", ParamType::FLOAT);
case 2: return Param("swap", ParamType::BOOL);
case 3: return Param("type", ParamType::ENUM, {"unknown", "swing", "double swing", "slide", "double slide", "revolving"});
default: throw Exception("out of bounds");
}
}
@@ -65,6 +66,7 @@ public:
case 0: return fo->getSize();
case 1: return fo->height;
case 2: return fo->swap;
case 3: return (int) fo->type;
default: throw Exception("out of bounds");
}
}
@@ -75,6 +77,7 @@ public:
case 0: break;
case 1: fo->height = val.toFloat(); break;
case 2: fo->swap = val.toBool(); break;
case 3: fo->type = (Floorplan::DoorType) val.toInt(); break;
default: throw Exception("out of bounds");
}
}

44
params/ElementParamWidget.cpp
View File

@@ -65,8 +65,6 @@ QComboBox* getOutlineMethods() {
return cmb;
}
ElementParamWidget::ElementParamWidget(QWidget *parent) : QWidget(parent) {
this->lay = new QGridLayout(this);
@@ -148,7 +146,6 @@ void ElementParamWidget::refresh() {
}
}
{ // does the element have "parameters" ?
IHasParams* elem = dynamic_cast<IHasParams*>(el);
if (elem) {
@@ -168,6 +165,21 @@ void ElementParamWidget::refresh() {
case ParamType::NOT_AVAILABLE:
break;
case ParamType::ENUM: {
QComboBox* cmb = new QComboBox();
int idx = 0;
for (const std::string& str : param.getEnumValues()) {cmb->addItem(str.c_str(), idx++);}
cmb->setCurrentIndex(value.toInt());
connect(cmb, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), [i, elem, cmb] (int idx) {
(void) idx;
elem->setParamValue(i, cmb->currentData().toInt() );
});
lay->addWidget(cmb,r,1);
break;
}
case ParamType::BOOL: {
QCheckBox* chk = new QCheckBox( );
chk->setChecked(value.toBool());
@@ -197,20 +209,20 @@ void ElementParamWidget::refresh() {
break;
}
case ParamType::DOUBLE: {
const std::string str = std::to_string(value.toDouble());
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 double val = str.toDouble();
elem->setParamValue(i, ParamValue(val));
});
lay->addWidget(le,r,1);
case ParamType::DOUBLE: {
const std::string str = std::to_string(value.toDouble());
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 double val = str.toDouble();
elem->setParamValue(i, ParamValue(val));
});
lay->addWidget(le,r,1);
}
break;
}
break;
}
case ParamType::INT: {
const std::string str = std::to_string(value.toInt());

1
res.qrc
View File

@@ -24,5 +24,6 @@
<file>res/icons/perspective.svg</file>
<file>res/icons/floorplan.svg</file>
<file>res/icons/grid.svg</file>
<file>res/icons/wireframe.svg</file>
</qresource>
</RCC>

72
res/icons/mesh.svg
View File

@@ -1,65 +1,21 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 512.001 512.001" style="enable-background:new 0 0 512.001 512.001;" xml:space="preserve">
width="177.778px" height="177.778px" viewBox="0 0 177.778 177.778" style="enable-background:new 0 0 177.778 177.778;"
xml:space="preserve">
<g>
<g>
<path d="M502.119,377.125c-13.239,4.385-26.744,8.435-40.219,12.11c-3.507-9.345-11.323-16.593-21.017-19.323
c-2.774-36.168-10.07-60.945-16.45-78.778c8.672-5.182,14.656-14.398,15.351-25.037c22.545-5.337,45.085-11.71,67.063-18.988
c3.94-1.306,6.076-5.557,4.771-9.496c-1.305-3.941-5.557-6.075-9.496-4.772c-21.293,7.052-43.123,13.236-64.962,18.432
c-4.909-11.068-15.995-18.813-28.862-18.813c-2.349,0-4.634,0.266-6.838,0.754c-6.71-18.498-13.386-41.911-16.034-75.265
c12.649-3.858,21.943-15.461,22.346-29.258c33.444-6.48,66.758-15.161,99.075-25.863c3.888-1.287,6.059-5.61,4.771-9.497
c-1.288-3.887-5.609-6.056-9.496-4.771c-31.799,10.531-64.582,19.068-97.491,25.431c-3.866-7.942-10.969-14.025-19.581-16.534
c2.61-40.118,10.99-66.578,18.923-87.242c1.487-3.874-0.448-8.221-4.322-9.708c-3.876-1.484-8.222,0.448-9.709,4.322
c-8.363,21.785-17.201,49.686-19.912,91.981c-12.963,2.595-23.081,13.156-25.017,26.342c-27.306,3.125-54.987,4.827-82.418,5.06
c-2.911-11.795-12.467-20.999-24.456-23.391c2.003-43.955,10.44-71.458,19.328-94.607c1.487-3.874-0.448-8.221-4.322-9.708
c-3.875-1.484-8.222,0.448-9.709,4.322c-8.984,23.404-18.364,53.608-20.373,100.665c-10.09,2.969-18.097,10.846-21.234,20.864
c-27.676-1.925-55.475-5.348-82.802-10.204c-1.598-14.051-12.454-25.33-26.305-27.566c3.182-35.347,10.957-59.406,18.238-78.372
c1.487-3.874-0.448-8.221-4.322-9.708c-3.875-1.485-8.222,0.447-9.709,4.322c-7.836,20.414-16.22,46.431-19.405,85.034
c-7.099,2.419-13.069,7.293-16.886,13.614C43.593,99.086,26.545,94.08,9.881,88.56c-3.94-1.303-8.191,0.833-9.496,4.771
c-1.305,3.941,0.832,8.192,4.771,9.497c16.752,5.548,33.885,10.589,51.019,15.021c-0.037,0.626-0.062,1.256-0.062,1.892
c0,13.577,8.619,25.179,20.672,29.624c2.158,40.025,9.679,67.23,17.347,88.464c-5.418,3.65-9.644,8.935-11.971,15.141
c-24.344-5.545-48.633-12.297-72.281-20.129c-3.943-1.305-8.192,0.832-9.496,4.772c-1.305,3.94,0.832,8.191,4.771,9.497
c24.618,8.152,49.917,15.158,75.261,20.876c1.957,15.538,15.244,27.599,31.304,27.599c1.763,0,3.491-0.152,5.176-0.432
c7.729,21.387,15.296,49.063,16.849,91.251c-8.552,2.878-15.479,9.316-19,17.554c-35.467-6.511-70.723-15.525-104.866-26.834
c-3.94-1.304-8.191,0.832-9.497,4.771c-1.305,3.941,0.832,8.192,4.771,9.497c34.894,11.556,70.926,20.763,107.172,27.401
c0.946,12.131,8.773,22.353,19.576,26.76c-2.182,20.197-6.034,38.282-12.039,56.597c-1.227,3.74,0.738,7.903,4.403,9.339
c3.967,1.554,8.553-0.613,9.878-4.656c6.285-19.165,10.331-38.064,12.638-59.098c12.148-1.151,22.306-9.215,26.497-20.205
c27.394,2.857,55.2,4.32,82.721,4.32c0.464,0,0.944-0.004,1.411-0.005c2.523,10.293,10.103,18.619,19.949,22.18
c-2.294,16.908-5.798,32.293-10.989,48.125c-1.227,3.74,0.738,7.903,4.403,9.339c3.968,1.554,8.553-0.613,9.878-4.656
c5.529-16.861,9.243-33.226,11.661-51.23c13.764-1.862,24.738-12.623,26.914-26.285c29.02-2.312,58.156-6.248,86.747-11.716
c4.563,6.927,11.774,11.958,20.184,13.636c-1.726,25.98-5.975,48.633-13.28,70.912c-1.227,3.74,0.738,7.903,4.403,9.339
c3.968,1.554,8.553-0.613,9.878-4.656c7.865-23.985,12.36-48.314,14.096-76.272c11.82-3.486,20.769-13.717,22.381-26.219
c14.47-3.902,28.991-8.241,43.21-12.949c3.94-1.306,6.076-5.557,4.771-9.497C510.311,377.956,506.059,375.822,502.119,377.125z
M408.298,247.49c9.116,0,16.532,7.416,16.532,16.532c0,9.116-7.416,16.532-16.532,16.532s-16.532-7.416-16.532-16.532
S399.183,247.49,408.298,247.49z M376.236,111.224c9.116,0,16.532,7.416,16.532,16.532c0,9.116-7.416,16.532-16.532,16.532
s-16.532-7.416-16.532-16.532C359.704,118.641,367.12,111.224,376.236,111.224z M231.955,119.24
c9.116,0,16.532,7.416,16.532,16.532s-7.416,16.532-16.532,16.532c-9.116,0-16.532-7.416-16.532-16.532
S222.84,119.24,231.955,119.24z M71.143,119.741c0-9.116,7.416-16.532,16.532-16.532s16.532,7.416,16.532,16.532
s-7.416,16.532-16.532,16.532S71.143,128.857,71.143,119.741z M91.932,151.007c11.541-1.564,21.116-9.386,25.19-19.93
c27.655,4.886,55.778,8.337,83.777,10.279c2.212,12.334,11.609,22.199,23.691,25.1c3.8,38.007,12.824,64.147,22.136,87.213
c-6.473,4.256-11.297,10.822-13.278,18.521c-30.086-0.87-60.376-3.501-90.173-7.837c0.001-0.111,0.008-0.22,0.008-0.332
c0-17.403-14.159-31.561-31.561-31.561c-1.175,0-2.335,0.07-3.477,0.195C101.128,212.919,94.154,187.742,91.932,151.007z
M111.722,280.554c-9.116,0-16.532-7.416-16.532-16.532s7.416-16.532,16.532-16.532s16.532,7.416,16.532,16.532
C128.254,273.137,120.837,280.554,111.722,280.554z M143.784,432.85c-9.116,0-16.532-7.416-16.532-16.532
s7.416-16.532,16.532-16.532c9.116,0,16.532,7.416,16.532,16.532S152.9,432.85,143.784,432.85z M257.415,416.814
c-0.468,0-0.949,0.005-1.414,0.005c-26.907,0-54.094-1.427-80.881-4.21c-1.65-14.025-12.526-25.265-26.38-27.459
c-1.704-44.378-9.814-73.451-18.012-95.95c3.603-2.726,6.606-6.205,8.77-10.203c30.977,4.574,62.495,7.331,93.79,8.225
c3.256,13.959,15.794,24.392,30.73,24.392c1.594,0,3.16-0.121,4.691-0.351c7.464,25.159,11.135,51.028,11.741,82.442
C269.123,396.523,260.198,405.473,257.415,416.814z M247.486,280.053c0-9.116,7.416-16.532,16.532-16.532
c9.116,0,16.532,7.416,16.532,16.532c0,9.116-7.416,16.532-16.532,16.532C254.902,296.585,247.486,289.169,247.486,280.053z
M288.065,440.866c-9.116,0-16.532-7.416-16.532-16.532s7.416-16.532,16.532-16.532s16.532,7.416,16.532,16.532
S297.18,440.866,288.065,440.866z M400.784,400.287c0,1.003,0.052,1.994,0.144,2.973c-27.352,5.149-55.197,8.871-82.933,11.08
c-3.422-10.219-11.934-18.12-22.516-20.678c-0.636-33.137-4.734-61.405-12.811-88.167c6.138-4.512,10.59-11.185,12.223-18.89
c11.2-0.548,22.5-1.327,33.661-2.347c4.133-0.378,7.177-4.034,6.799-8.167c-0.377-4.133-4.04-7.181-8.167-6.799
c-10.865,0.993-21.864,1.752-32.769,2.288c-3.712-13.299-15.929-23.088-30.397-23.088c-1.05,0-2.088,0.054-3.112,0.154
c-9.175-22.643-17.504-46.601-21.213-82.275c11.286-2.855,20.164-11.805,22.924-23.128c27.895-0.232,56.044-1.958,83.815-5.124
c3.678,10.547,12.8,18.558,23.987,20.652c2.84,36.268,10.217,61.393,17.503,81.178c-6.624,5.616-10.904,13.908-11.161,23.192
c-5.863,0.915-11.753,1.787-17.596,2.564c-4.114,0.547-7.007,4.324-6.46,8.439c0.502,3.778,3.729,6.526,7.439,6.526
c0.33,0,0.663-0.021,0.999-0.066c6.241-0.829,12.536-1.763,18.795-2.746c5.136,10.486,15.918,17.726,28.36,17.726
c0.587,0,1.17-0.019,1.75-0.051c6.014,16.706,12.953,39.922,15.723,73.885C411.514,372.453,400.784,385.138,400.784,400.287z
M432.345,416.819c-9.116,0-16.532-7.416-16.532-16.532c0-9.116,7.416-16.532,16.532-16.532s16.532,7.416,16.532,16.532
C448.877,409.402,441.461,416.819,432.345,416.819z"/>
<polygon points="171.235,0 113.954,0 142.597,49.612 "/>
<polygon points="99.626,0 42.345,0 70.986,49.612 "/>
<polygon points="35.184,4.141 6.543,53.747 63.825,53.747 "/>
<polygon points="106.79,4.141 78.152,53.747 135.434,53.747 "/>
<polygon points="135.434,62.021 78.152,62.021 106.79,111.631 "/>
<polygon points="70.986,66.15 42.345,115.763 99.626,115.763 "/>
<polygon points="171.235,124.031 113.954,124.031 142.597,173.646 "/>
<polygon points="99.626,124.031 42.345,124.031 70.986,173.646 "/>
<polygon points="35.184,128.169 6.543,177.778 63.825,177.778 "/>
<polygon points="106.79,128.169 78.152,177.778 135.434,177.778 "/>
</g>
</g>
<g>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.0 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

54
res/icons/wireframe.svg Normal file
View File

@@ -0,0 +1,54 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 270.06 270.06" style="enable-background:new 0 0 270.06 270.06;" xml:space="preserve">
<path color-rendering="auto" image-rendering="auto" shape-rendering="auto" color-interpolation="sRGB" d="M264.898,0.007
c-0.181,0.006-0.362,0.023-0.541,0.049H84.996c-1.326,0-2.598,0.527-3.535,1.465l-80,80C0.525,82.459-0.001,83.73,0,85.056v180
c0,2.761,2.239,5,5,5h180c1.326,0,2.598-0.527,3.535-1.465l80-80c0.938-0.938,1.465-2.209,1.465-3.535V5.819
c0.14-0.893,0.035-1.807-0.303-2.645c-0.016-0.045-0.033-0.09-0.051-0.135c-0.808-1.89-2.69-3.093-4.744-3.033L264.898,0.007z
M87.066,10.056h165.859l-70,70H17.066L87.066,10.056z M259.996,17.126v165.859l-70,70V87.126L259.996,17.126L259.996,17.126z
M84.92,19.985c-2.759,0.042-4.963,2.311-4.924,5.07v40c-0.039,2.761,2.168,5.032,4.929,5.071s5.032-2.168,5.071-4.929
c0.001-0.047,0.001-0.094,0-0.141v-40c0.039-2.761-2.168-5.031-4.93-5.07C85.018,19.984,84.969,19.984,84.92,19.985z M9.996,90.056
h170v170h-170V90.056L9.996,90.056z M84.92,99.985c-2.759,0.042-4.963,2.311-4.924,5.07v30c-0.039,2.761,2.168,5.032,4.929,5.071
s5.032-2.168,5.071-4.929c0.001-0.047,0.001-0.094,0-0.141v-30c0.039-2.761-2.168-5.031-4.93-5.07
C85.018,99.984,84.969,99.984,84.92,99.985z M84.92,159.985c-2.759,0.042-4.963,2.311-4.924,5.07v17.93L61.461,201.52
c-1.992,1.913-2.057,5.078-0.144,7.07c1.913,1.992,5.078,2.057,7.07,0.144c0.049-0.047,0.097-0.095,0.144-0.144l18.535-18.535h17.93
c2.761,0.039,5.032-2.168,5.071-4.929s-2.168-5.032-4.929-5.071c-0.047-0.001-0.094-0.001-0.141,0h-15v-15
c0.039-2.761-2.168-5.031-4.93-5.07C85.018,159.984,84.969,159.984,84.92,159.985z M134.996,180.055
c-2.761-0.039-5.032,2.168-5.071,4.929c-0.039,2.761,2.168,5.032,4.929,5.071c0.047,0.001,0.094,0.001,0.141,0h30
c2.761,0.039,5.032-2.168,5.071-4.929c0.039-2.761-2.168-5.032-4.929-5.071c-0.047-0.001-0.094-0.001-0.141,0H134.996z
M204.996,180.055c-2.761-0.039-5.032,2.168-5.071,4.929c-0.039,2.761,2.168,5.032,4.929,5.071c0.047,0.001,0.094,0.001,0.141,0h40
c2.761,0.039,5.032-2.168,5.071-4.929s-2.168-5.032-4.929-5.071c-0.047-0.001-0.094-0.001-0.141,0H204.996z M44.898,220.007
c-1.299,0.039-2.532,0.582-3.438,1.514l-20,20c-1.992,1.913-2.057,5.078-0.144,7.07c1.913,1.992,5.078,2.057,7.07,0.144
c0.049-0.047,0.097-0.095,0.144-0.144l20-20c1.98-1.925,2.025-5.091,0.1-7.071C47.654,220.514,46.3,219.965,44.898,220.007z"/>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
<g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.7 KiB