split line(old) and wall(new)

added new walling
started working on windows
This commit is contained in:
k-a-z-u
2018-07-25 16:20:34 +02:00
parent 4938987063
commit 8017241c6e
14 changed files with 703 additions and 122 deletions

View File

@@ -0,0 +1,83 @@
#ifndef TOOLNEWLINE_H
#define TOOLNEWLINE_H
#include "ToolNewElement.h"
#include "../../model/MMFloorObstacles.h"
#include "../../model/MMFloorObstacleLine.h"
/** old walls, based on lines */
class ToolNewLine : public ToolNewElement<Floorplan::FloorObstacleLine, MMFloorObstacleLine> {
private:
/** currently edited line node (has 2) */
int idx = 0;
public:
ToolNewLine(Tools& tools, MapLayer* layer) : ToolNewElement(tools, layer) {
;
}
void becomesActive() override {
//create(); // start adding an new element
}
void becomesInactive() override {
deleteCurrent(); // delete the currently pending and not yet finished wall element
}
const std::string getName() const override {
return "new Line";
}
/** mouse is currently moved */
void moving(const Point2 mapPoint) override {
// live-moving of the ending point
if (idx == 1) { foEL->to = mapPoint; }
}
/** next point */
void leftMouse(const Point2 mapPoint) override {
// 1st click (where to start the line)
if (idx == 0) {
createEmptyElement();
foEL->from = mapPoint; foEL->to = mapPoint;
++idx;
// 2nd click (wehere the line ends)
} else if (idx == 1) {
finalizeCurrent();
idx = 0;
if (!addAnother) {disableMe();}
}
}
void rightMouse(const Point2 mapPoint) override {
(void) mapPoint;
finalizeCurrent();
disableMe();
}
private:
void createEmptyElement() {
foEL = new Floorplan::FloorObstacleLine(Floorplan::ObstacleType::WALL, Floorplan::Material::DRYWALL, Point2(0, 0), Point2(0, 0));
MMFloorObstacles* obs = (MMFloorObstacles*)layer;
mmEL = obs->createLine(foEL);
}
};
#endif // TOOLNEWLINE_H