From 49e5bf3fd020a564bd44d5e6209f15e0fff3db2c Mon Sep 17 00:00:00 2001 From: Pablo Alvarez Lopez Date: Fri, 28 Jul 2023 10:15:46 +0200 Subject: [PATCH] now GNEPOIs and GNEPolys supports new types. Refs #13667 --- src/netedit/elements/additional/GNEPOI.cpp | 2 +- src/netedit/elements/additional/GNEPoly.cpp | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/netedit/elements/additional/GNEPOI.cpp b/src/netedit/elements/additional/GNEPOI.cpp index e4abe097cf6..9d1dba1ee23 100644 --- a/src/netedit/elements/additional/GNEPOI.cpp +++ b/src/netedit/elements/additional/GNEPOI.cpp @@ -86,7 +86,7 @@ GNEPOI::GNEPOI(GNENet* net, const std::string& id, const std::string& type, cons GNEPOI::GNEPOI(GNENet* net, const std::string& id, double x, const double y, const std::string& name, const Parameterised::Map& parameters) : PointOfInterest(id, "jupedsim.waypoint", RGBColor::CYAN, Position(x, y), false, "", 0, false, 0, 2, 0, "", false, 0, 0, name, parameters), - GNEAdditional(id, net, GLO_POI, GNE_TAG_POIWAYPOINT, GUIIconSubSys::getIcon(GUIIcon::POIWAYPOINT), + GNEAdditional(id, net, GLO_POIWAYPOINT, GNE_TAG_POIWAYPOINT, GUIIconSubSys::getIcon(GUIIcon::POIWAYPOINT), "", {}, {}, {}, {}, {}, {}) { // update geometry (needed for adjust myShapeWidth and myShapeHeight) updateGeometry(); diff --git a/src/netedit/elements/additional/GNEPoly.cpp b/src/netedit/elements/additional/GNEPoly.cpp index 04eda29ca47..b085eb5142a 100644 --- a/src/netedit/elements/additional/GNEPoly.cpp +++ b/src/netedit/elements/additional/GNEPoly.cpp @@ -85,7 +85,9 @@ GNEPoly::GNEPoly(SumoXMLTag tag, GNENet* net, const std::string& id, const Posit shape, false, true, 1, (tag == GNE_TAG_WALKABLEAREA)? 1 : 2, 0, "", false, name, parameters), - GNEAdditional(id, net, GLO_POLYGON, tag, + GNEAdditional(id, net, + (tag == GNE_TAG_WALKABLEAREA)? GLO_WALKABLEAREA : GLO_OBSTACLE, + tag, (tag == GNE_TAG_WALKABLEAREA)? GUIIconSubSys::getIcon(GUIIcon::WALKABLEAREA) : GUIIconSubSys::getIcon(GUIIcon::OBSTACLE), "", {}, {}, {}, {}, {}, {}), mySimplifiedShape(false) { @@ -348,7 +350,7 @@ GNEPoly::drawGL(const GUIVisualizationSettings& s) const { s.neteditSizeSettings.polygonGeometryPointRadius * (moveMode ? 1 : 0.5), polyExaggeration, myNet->getViewNet()->getNetworkViewOptions().editingElevation(), drawExtremeSymbols); // draw moving hint points - if (!myNet->getViewNet()->getLockManager().isObjectLocked(GLO_POLYGON, isAttributeCarrierSelected()) && moveMode) { + if (!myNet->getViewNet()->getLockManager().isObjectLocked(getType(), isAttributeCarrierSelected()) && moveMode) { GUIGeometry::drawMovingHint(s, myNet->getViewNet()->getPositionInformation(), myPolygonGeometry.getShape(), invertedColor, s.neteditSizeSettings.polygonGeometryPointRadius, polyExaggeration); }