a lot of work on th map-creator

This commit is contained in:
2016-07-04 15:11:10 +02:00
parent 6243165084
commit 2935f468fc
61 changed files with 2612 additions and 3342 deletions

View File

@@ -2,14 +2,17 @@
#define MV2DELEMENTPOI_H
#include "MV2DElement.h"
#include "HasMoveableNodes.h"
#include "MapViewElementHelper.h"
#include <Indoor/floorplan/v2/Floorplan.h>
class MV2DElementPOI : public MV2DElement {
#include "../../UIHelper.h"
class MV2DElementPOI : public MV2DElement, public HasMoveableNodes {
private:
bool sel = false;
//bool sel = false;
Floorplan::POI* poi;
public:
@@ -34,19 +37,28 @@ public:
/** repaint me */
void paint(Painter& p) override {
if (sel) {
p.setPenBrush(Qt::black, CFG::SEL_COLOR);
p.drawCircle(poi->pos);
static const QPixmap& pixmapUnfocused = UIHelper::getPixmapColored("poi", CFG::UNFOCUS_COLOR, 16);
static const QPixmap& pixmapFocused = UIHelper::getPixmapColored("poi", CFG::FOCUS_COLOR, 16);
static const QPixmap& pixmapSel = UIHelper::getPixmapColored("poi", CFG::SEL_COLOR, 16);
if (selectedUserIdx == 0) {
// p.setPenBrush(Qt::black, CFG::SEL_COLOR);
// p.drawCircle(poi->pos);
p.drawPixmap(poi->pos, pixmapSel);
} else if (hasFocus()) {
p.setPenBrush(Qt::black, Qt::NoBrush);
p.drawCircle(poi->pos);
// p.setPenBrush(Qt::black, Qt::NoBrush);
// p.drawCircle(poi->pos);
p.drawPixmap(poi->pos, pixmapFocused);
} else {
p.setPenBrush(Qt::gray, Qt::NoBrush);
p.drawCircle(poi->pos);
// p.setPenBrush(Qt::gray, Qt::NoBrush);
// p.drawCircle(poi->pos);
p.drawPixmap(poi->pos, pixmapUnfocused);
}
// label
p.setPenBrush(Qt::black, Qt::NoBrush);
p.drawDot(poi->pos);
if (p.getScaler().getScale() >= 10) {
const std::string str = poi->name;
p.p->drawText(p.getScaler().xms(poi->pos.x) + 10, p.getScaler().yms(poi->pos.y) + 5, str.c_str());
@@ -55,29 +67,37 @@ public:
}
virtual std::vector<MoveableNode> getMoveableNodes() const override {
return { MoveableNode(0, poi->pos) };
}
virtual void onNodeMove(MapView2D* v, const int userIdx, const Point2 newPos) override {
(void) v;
if (userIdx == 0) {poi->pos = newPos;}
}
/** mouse pressed at the given point */
virtual void mousePressed(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 {
virtual void mouseMove(MapView2D* v, const Point2 p) override {
(void) v;
if (sel) {
const Point2 p = Scaler::snap(_p, CFG::MOVE_SNAP_SIZE_M);
poi->pos.x = p.x;
poi->pos.y = p.y;
}
(void) p;
// if (sel) {
// const Point2 p = v->getScaler().snap(_p);
// poi->pos.x = p.x;
// poi->pos.y = p.y;
// }
}
/** mouse released */
virtual void mouseReleased(MapView2D* v, const Point2 _p) override {
virtual void mouseReleased(MapView2D* v, const Point2 p) override {
(void) v;
(void) _p;
sel = true;
(void) p;
}
virtual bool keyPressEvent(MapView2D* v, QKeyEvent *e) override {
@@ -87,11 +107,11 @@ public:
}
virtual void onFocus() override {
;
}
virtual void onUnfocus() override {
sel = false;
;
}
};