diff --git a/MainController.cpp b/MainController.cpp index 9d0572e..d8b1a32 100644 --- a/MainController.cpp +++ b/MainController.cpp @@ -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_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("/mnt/vm/paper/diss/data/maps/SHL44_nm.xml"); + //mapModel->load("/apps/paper/diss/data/maps/walkmodel_stairs3.xml"); + + mapModel->load("/apps/paper/maps/museum/map43_svg.xml"); //mapModel->load("/apps/paper/diss/data/maps/SHL41_nm.xml"); //mapModel->load("/mnt/sdcard/SHL41_nm.xml"); diff --git a/mapview/2D/tools/ToolNewObject.h b/mapview/2D/tools/ToolNewObject.h index a6b085d..e396510 100644 --- a/mapview/2D/tools/ToolNewObject.h +++ b/mapview/2D/tools/ToolNewObject.h @@ -32,7 +32,7 @@ public: /** next point */ 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; mmEL = obs->createObject(foEL); } diff --git a/mapview/3D/floorplan/FloorplanRendererModel.h b/mapview/3D/floorplan/FloorplanRendererModel.h index cc41f43..e9382e9 100644 --- a/mapview/3D/floorplan/FloorplanRendererModel.h +++ b/mapview/3D/floorplan/FloorplanRendererModel.h @@ -31,13 +31,13 @@ private: Material(0,128,0,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(200,200,255,96), // door (glass) 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(170,170,255,96), // glass (metallized) Material(170,120,60,255), // wood diff --git a/mapview/model/MMFloorObstacleLine.h b/mapview/model/MMFloorObstacleLine.h index 386c9b1..95fde9d 100644 --- a/mapview/model/MMFloorObstacleLine.h +++ b/mapview/model/MMFloorObstacleLine.h @@ -46,13 +46,14 @@ public: virtual int getNumParams() const override { - return 2; + return 3; } virtual Param getParamDesc(const int idx) const override { switch(idx) { 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; } @@ -60,7 +61,8 @@ public: virtual ParamValue getParamValue(const int idx) const override { switch(idx) { 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; } @@ -68,7 +70,8 @@ public: virtual void setParamValue(const int idx, const ParamValue& val) override { switch(idx) { case 0: fo->thickness_m = val.toFloat(); break; - case 1: break; + case 1: fo->height_m = val.toFloat(); break; + case 2: break; } } diff --git a/mapview/model/MMFloorObstacleObject.h b/mapview/model/MMFloorObstacleObject.h index 38071f0..5502602 100644 --- a/mapview/model/MMFloorObstacleObject.h +++ b/mapview/model/MMFloorObstacleObject.h @@ -41,7 +41,7 @@ public: /** get the number of parameters */ int getNumParams() const override { - return 3; + return 4; } /** get the description of the idx-th parameter */ @@ -50,6 +50,7 @@ public: case 0: return Param("file", ParamType::STRING); case 1: return Param("pos", ParamType::POINT3); case 2: return Param("rot", ParamType::POINT3); + case 3: return Param("scale", ParamType::POINT3); default: throw Exception("out of bounds"); } } @@ -60,6 +61,7 @@ public: case 0: return fo->file; case 1: return fo->pos; case 2: return fo->rot; + case 3: return fo->scale; default: throw Exception("out of bounds"); } } @@ -70,6 +72,7 @@ public: case 0: fo->file = val.toString(); break; case 1: fo->pos = val.toPoint3(); break; case 2: fo->rot = val.toPoint3(); break; + case 3: fo->scale = val.toPoint3(); break; default: throw Exception("out of bounds"); } }