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

fixed some issues

Browse Source 
added new tools for creating APs, Beacons, GTP, POI, Fingerprints
fixed selection issue
changed new-element creation
added missing layer parameters
This commit is contained in:
FrankE
2017-06-01 16:26:09 +02:00
parent 489a64fd69
commit 7a23001b82
29 changed files with 763 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
mapview/2D/tools/ToolNewElement.h
View File

@@ -48,24 +48,34 @@ public:
}
virtual bool mouseMoveEvent(MapView2D* m, QMouseEvent* e) override {
// get location on screen and within map
const Point2 onScreen(e->x(), e->y());
Point2 onMap = m->getScaler().sm(onScreen);
onMap = m->getScaler().snap(onMap);
moving(onMap);
return true;
}
virtual bool mouseReleaseEvent(MapView2D* m, QMouseEvent* e) override {
(void) m;
// get location on screen and within map
const Point2 onScreen(e->x(), e->y());
Point2 onMap = m->getScaler().sm(onScreen);
onMap = m->getScaler().snap(onMap);
if (e->button() == Qt::MouseButton::LeftButton) {
leftMouse();
leftMouse(onMap);
return true;
} else if (e->button() == Qt::MouseButton::RightButton) {
rightMouse();
rightMouse(onMap);
return true;
} else {
return false;
}
}
virtual bool keyPressEvent(MapView2D* m, QKeyEvent* e) override {
@@ -81,22 +91,22 @@ public:
protected:
/** all subclasses must create a new, empty element here */
virtual void createEmptyElement() = 0;
//virtual void createEmptyElement() = 0;
/** mouse is currently moved */
virtual void moving(const Point2 mapPoint) = 0;
/** left mouse: usually: next part */
virtual void leftMouse() = 0;
virtual void leftMouse(const Point2 mapPoint) = 0;
/** right mouse: usually: done */
virtual void rightMouse() = 0;
virtual void rightMouse(const Point2 mapPoint) = 0;
protected:
void create() {
createEmptyElement();
mmEL->getMV2D()->focus();
//createEmptyElement();
//mmEL->getMV2D()->focus();
}
/** delete the currently edited element */
@@ -107,8 +117,10 @@ protected:
/** finalize the current element (if any) */
void finalizeCurrent() {
if (!mmEL) {return;}
layer->changed(); // update the UI
mmEL->getMV2D()->unfocus();
mmEL = nullptr;
layer->changed(); // update the UI
}
/** finish creating new elements */