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

added support for object-sizing

Browse Source 
added support for wall-heights
This commit is contained in:
k-a-z-u
2018-07-04 20:29:09 +02:00
parent 2f37baf497
commit ba9c8359d7
5 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
MainController.cpp
View File

@@ -120,10 +120,12 @@ MainController::MainController() {
//mapModel->load("/mnt/vm/paper/diss/data/maps/walkmodel_stairs3.xml"); //mapModel->load("/mnt/vm/paper/diss/data/maps/walkmodel_stairs3.xml");
//mapModel->load("/mnt/vm/paper/diss/data/maps/walkmodel_2D_1.xml"); //mapModel->load("/apps/paper/diss/data/maps/walkmodel_2D_2.xml");
//mapModel->load("/apps/paper/diss/data/maps/walkmodel_2D_2.xml");
//mapModel->load("/mnt/vm/paper/diss/data/maps/walkmodel_stairs3.xml"); //mapModel->load("/apps/paper/diss/data/maps/walkmodel_stairs3.xml");
mapModel->load("/mnt/vm/paper/diss/data/maps/SHL44_nm.xml");
mapModel->load("/apps/paper/maps/museum/map43_svg.xml");
//mapModel->load("/apps/paper/diss/data/maps/SHL41_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");

2
mapview/2D/tools/ToolNewObject.h
View File

@@ -32,7 +32,7 @@ public:
/** next point */ /** next point */
void leftMouse(const Point2 mapPoint) override { void leftMouse(const Point2 mapPoint) override {
foEL = new Floorplan::FloorObstacleObject("", Point3(mapPoint.x, mapPoint.y, 0.0), Point3(0,0,0)); foEL = new Floorplan::FloorObstacleObject("", Point3(mapPoint.x, mapPoint.y, 0.0), Point3(0,0,0), Point3(1,1,1));
MMFloorObstacles* obs = (MMFloorObstacles*)layer; MMFloorObstacles* obs = (MMFloorObstacles*)layer;
mmEL = obs->createObject(foEL); mmEL = obs->createObject(foEL);
} }

4
mapview/3D/floorplan/FloorplanRendererModel.h
View File

@@ -31,13 +31,13 @@ private:
Material(0,128,0,255), // ground outdoor Material(0,128,0,255), // ground outdoor
Material(64,64,64,255), // ground outdoor Material(64,64,64,255), // ground outdoor
Material(120,120,120,255), // stair Material(105,105,105,255), // stair
Material(220,220,220,255), // handrail Material(220,220,220,255), // handrail
Material(200,200,255,96), // door (glass) Material(200,200,255,96), // door (glass)
Material(140,140,140,255), // door (wood) Material(140,140,140,255), // door (wood)
Material(128,128,128,255), // concrete Material(135,135,135,255), // concrete
Material(240,240,255,96), // glass Material(240,240,255,96), // glass
Material(170,170,255,96), // glass (metallized) Material(170,170,255,96), // glass (metallized)
Material(170,120,60,255), // wood Material(170,120,60,255), // wood

11
mapview/model/MMFloorObstacleLine.h
View File

@@ -46,13 +46,14 @@ public:
virtual int getNumParams() const override { virtual int getNumParams() const override {
return 2; return 3;
} }
virtual Param getParamDesc(const int idx) const override { virtual Param getParamDesc(const int idx) const override {
switch(idx) { switch(idx) {
case 0: return Param("thickness (m)", ParamType::FLOAT); case 0: return Param("thickness (m)", ParamType::FLOAT);
case 1: return Param("length", ParamType::FLOAT, true); case 1: return Param("height (m)", ParamType::FLOAT);
case 2: return Param("length", ParamType::FLOAT, true);
} }
throw 1; throw 1;
} }
@@ -60,7 +61,8 @@ public:
virtual ParamValue getParamValue(const int idx) const override { virtual ParamValue getParamValue(const int idx) const override {
switch(idx) { switch(idx) {
case 0: return fo->thickness_m; case 0: return fo->thickness_m;
case 1: return fo->from.getDistance(fo->to); case 1: return fo->height_m;
case 2: return fo->from.getDistance(fo->to);
} }
throw 1; throw 1;
} }
@@ -68,7 +70,8 @@ public:
virtual void setParamValue(const int idx, const ParamValue& val) override { virtual void setParamValue(const int idx, const ParamValue& val) override {
switch(idx) { switch(idx) {
case 0: fo->thickness_m = val.toFloat(); break; case 0: fo->thickness_m = val.toFloat(); break;
case 1: break; case 1: fo->height_m = val.toFloat(); break;
case 2: break;
} }
} }

5
mapview/model/MMFloorObstacleObject.h
View File

@@ -41,7 +41,7 @@ public:
/** get the number of parameters */ /** get the number of parameters */
int getNumParams() const override { int getNumParams() const override {
return 3; return 4;
} }
/** get the description of the idx-th parameter */ /** get the description of the idx-th parameter */
@@ -50,6 +50,7 @@ public:
case 0: return Param("file", ParamType::STRING); case 0: return Param("file", ParamType::STRING);
case 1: return Param("pos", ParamType::POINT3); case 1: return Param("pos", ParamType::POINT3);
case 2: return Param("rot", ParamType::POINT3); case 2: return Param("rot", ParamType::POINT3);
case 3: return Param("scale", ParamType::POINT3);
default: throw Exception("out of bounds"); default: throw Exception("out of bounds");
} }
} }
@@ -60,6 +61,7 @@ public:
case 0: return fo->file; case 0: return fo->file;
case 1: return fo->pos; case 1: return fo->pos;
case 2: return fo->rot; case 2: return fo->rot;
case 3: return fo->scale;
default: throw Exception("out of bounds"); default: throw Exception("out of bounds");
} }
} }
@@ -70,6 +72,7 @@ public:
case 0: fo->file = val.toString(); break; case 0: fo->file = val.toString(); break;
case 1: fo->pos = val.toPoint3(); break; case 1: fo->pos = val.toPoint3(); break;
case 2: fo->rot = val.toPoint3(); break; case 2: fo->rot = val.toPoint3(); break;
case 3: fo->scale = val.toPoint3(); break;
default: throw Exception("out of bounds"); default: throw Exception("out of bounds");
} }
} }