Added constant getGUIGlObject function. Refs #14109

eclipse-sumo · Dec 19, 2023 · 0fbb8af · 0fbb8af
1 parent 5a04f65
commit 0fbb8af
Show file tree

Hide file tree

Showing 21 changed files with 93 additions and 3 deletions.
diff --git a/src/netedit/elements/GNEAttributeCarrier.h b/src/netedit/elements/GNEAttributeCarrier.h
@@ -91,6 +91,9 @@ class GNEAttributeCarrier : public GNEReferenceCounter {
     /// @brief get GUIGlObject associated with this AttributeCarrier
     virtual GUIGlObject* getGUIGlObject() = 0;
 
+    /// @brief get GUIGlObject associated with this AttributeCarrier (constant)
+    virtual const GUIGlObject* getGUIGlObject() const = 0;
+
     /// @brief update pre-computed geometry information
     virtual void updateGeometry() = 0;
 

diff --git a/src/netedit/elements/GNEContour.cpp b/src/netedit/elements/GNEContour.cpp
@@ -283,16 +283,22 @@ GNEContour::drawDottedContours(const GUIVisualizationSettings& s, const GUIVisua
         if (AC->checkDrawSelectContour()) {
             drawDottedContour(s, GUIDottedGeometry::DottedContourType::SELECT, lineWidth, addOffset);
         }
+        // move contour
+        if (AC->checkDrawMoveContour()) {
+            drawDottedContour(s, GUIDottedGeometry::DottedContourType::MOVE, lineWidth, addOffset);
+        }
     }
 }
 
 
 void
 GNEContour::drawDottedContourGeometryPoints(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d,
-                                            const GUIGlObject* glObject, const PositionVector &shape, const double radius,
+                                            const GNEAttributeCarrier *AC, const PositionVector &shape, const double radius,
                                             const double scale, const double lineWidth) const {
     // first check if draw dotted contour
-    if (!s.disableDottedContours && (d <= GUIVisualizationSettings::Detail::DottedContours)) {
+    if (!s.disableDottedContours && (d <= GUIVisualizationSettings::Detail::DottedContours) && AC->checkDrawMoveContour() ) {
+        // get gl object
+        const auto glObject = AC->getGUIGlObject();
         // get geometry points
         const auto &geometryPoints = gViewObjectsHandler.getGeometryPoints(glObject);
         // get temporal position over shape

diff --git a/src/netedit/elements/GNEContour.h b/src/netedit/elements/GNEContour.h
@@ -114,7 +114,7 @@ class GNEContour {
 
     /// @brief draw dotted contour for geometry points
     void drawDottedContourGeometryPoints(const GUIVisualizationSettings& s, const GUIVisualizationSettings::Detail d,
-                                         const GUIGlObject* glObject, const PositionVector &shape, const double radius,
+                                         const GNEAttributeCarrier *AC, const PositionVector &shape, const double radius,
                                          const double scale, const double lineWidth) const;
 
     /// @brief draw innen contour (currently used only in walkingAreas)

diff --git a/src/netedit/elements/additional/GNEAdditional.cpp b/src/netedit/elements/additional/GNEAdditional.cpp
@@ -87,6 +87,12 @@ GNEAdditional::getGUIGlObject() {
 }
 
 
+const GUIGlObject*
+GNEAdditional::getGUIGlObject() const {
+    return this;
+}
+
+
 const std::string
 GNEAdditional::getOptionalName() const {
     try {

diff --git a/src/netedit/elements/additional/GNEAdditional.h b/src/netedit/elements/additional/GNEAdditional.h
@@ -106,6 +106,9 @@ class GNEAdditional : public GNEPathManager::PathElement, public GNEHierarchical
     /// @brief get GUIGlObject associated with this AttributeCarrier
     GUIGlObject* getGUIGlObject();
 
+    /// @brief get GUIGlObject associated with this AttributeCarrier (constant)
+    const GUIGlObject* getGUIGlObject() const;
+
     /// @brief Returns the name of the object (default "")
     virtual const std::string getOptionalName() const;
 

diff --git a/src/netedit/elements/data/GNEDataInterval.cpp b/src/netedit/elements/data/GNEDataInterval.cpp
@@ -113,6 +113,12 @@ GNEDataInterval::getGUIGlObject() {
 }
 
 
+const GUIGlObject*
+GNEDataInterval::getGUIGlObject() const {
+    return nullptr;
+}
+
+
 void
 GNEDataInterval::updateGeometry() {
     // nothing to update

diff --git a/src/netedit/elements/data/GNEDataInterval.h b/src/netedit/elements/data/GNEDataInterval.h
@@ -73,6 +73,9 @@ class GNEDataInterval : public GNEHierarchicalElement, public Parameterised {
     /// @brief get GUIGlObject associated with this AttributeCarrier
     GUIGlObject* getGUIGlObject();
 
+    /// @brief get GUIGlObject associated with this AttributeCarrier (constant)
+    const GUIGlObject* getGUIGlObject() const;
+
     /// @brief update pre-computed geometry information
     void updateGeometry();
 

diff --git a/src/netedit/elements/data/GNEDataSet.cpp b/src/netedit/elements/data/GNEDataSet.cpp
@@ -133,6 +133,12 @@ GNEDataSet::getGUIGlObject() {
 }
 
 
+const GUIGlObject*
+GNEDataSet::getGUIGlObject() const {
+    return nullptr;
+}
+
+
 void
 GNEDataSet::updateAttributeColors() {
     // first update attribute colors in data interval childrens

diff --git a/src/netedit/elements/data/GNEDataSet.h b/src/netedit/elements/data/GNEDataSet.h
@@ -90,6 +90,9 @@ class GNEDataSet : public GNEAttributeCarrier, public Parameterised {
     /// @brief get GUIGlObject associated with this AttributeCarrier
     GUIGlObject* getGUIGlObject();
 
+    /// @brief get GUIGlObject associated with this AttributeCarrier (constant)
+    const GUIGlObject* getGUIGlObject() const;
+
     /// @brief update attribute colors deprecated
     void updateAttributeColors();
 

diff --git a/src/netedit/elements/data/GNEGenericData.cpp b/src/netedit/elements/data/GNEGenericData.cpp
@@ -67,6 +67,12 @@ GNEGenericData::getGUIGlObject() {
 }
 
 
+const GUIGlObject*
+GNEGenericData::getGUIGlObject() const {
+    return this;
+}
+
+
 GNEDataInterval*
 GNEGenericData::getDataIntervalParent() const {
     return myDataIntervalParent;

diff --git a/src/netedit/elements/data/GNEGenericData.h b/src/netedit/elements/data/GNEGenericData.h
@@ -81,6 +81,9 @@ class GNEGenericData : public GNEPathManager::PathElement, public Parameterised,
     /// @brief get GUIGlObject associated with this AttributeCarrier
     GUIGlObject* getGUIGlObject();
 
+    /// @brief get GUIGlObject associated with this AttributeCarrier (constant)
+    const GUIGlObject* getGUIGlObject() const;
+
     /// @brief get data interval parent
     GNEDataInterval* getDataIntervalParent() const;
 

diff --git a/src/netedit/elements/data/GNEMeanData.cpp b/src/netedit/elements/data/GNEMeanData.cpp
@@ -148,6 +148,12 @@ GNEMeanData::getGUIGlObject() {
 }
 
 
+const GUIGlObject*
+GNEMeanData::getGUIGlObject() const {
+    return nullptr;
+}
+
+
 void
 GNEMeanData::updateGeometry() {
     // nothing to update

diff --git a/src/netedit/elements/data/GNEMeanData.h b/src/netedit/elements/data/GNEMeanData.h
@@ -54,6 +54,9 @@ class GNEMeanData : public GNEHierarchicalElement {
     /// @brief get GUIGlObject associated with this AttributeCarrier
     GUIGlObject* getGUIGlObject();
 
+    /// @brief get GUIGlObject associated with this AttributeCarrier (constant)
+    const GUIGlObject* getGUIGlObject() const;
+
     /// @brief update pre-computed geometry information
     void updateGeometry();
 

diff --git a/src/netedit/elements/demand/GNEDemandElement.cpp b/src/netedit/elements/demand/GNEDemandElement.cpp
@@ -85,6 +85,12 @@ GNEDemandElement::getGUIGlObject() {
 }
 
 
+const GUIGlObject*
+GNEDemandElement::getGUIGlObject() const {
+    return this;
+}
+
+
 const GUIGeometry&
 GNEDemandElement::getDemandElementGeometry() {
     return myDemandElementGeometry;

diff --git a/src/netedit/elements/demand/GNEDemandElement.h b/src/netedit/elements/demand/GNEDemandElement.h
@@ -124,6 +124,9 @@ class GNEDemandElement : public GNEPathManager::PathElement, public GNEHierarchi
     /// @brief get GUIGlObject associated with this AttributeCarrier
     GUIGlObject* getGUIGlObject();
 
+    /// @brief get GUIGlObject associated with this AttributeCarrier (constant)
+    const GUIGlObject* getGUIGlObject() const;
+
     /// @brief get demand element geometry (stacked)
     const GUIGeometry& getDemandElementGeometry();
 

diff --git a/src/netedit/elements/network/GNEEdgeTemplate.cpp b/src/netedit/elements/network/GNEEdgeTemplate.cpp
@@ -75,6 +75,12 @@ GNEEdgeTemplate::getGUIGlObject() {
 }
 
 
+const GUIGlObject*
+GNEEdgeTemplate::getGUIGlObject() const {
+    return nullptr;
+}
+
+
 void
 GNEEdgeTemplate::updateGeometry() {
     throw InvalidArgument("cannot be called in templates");

diff --git a/src/netedit/elements/network/GNEEdgeTemplate.h b/src/netedit/elements/network/GNEEdgeTemplate.h
@@ -55,6 +55,9 @@ class GNEEdgeTemplate : public GNEAttributeCarrier {
     /// @brief get GUIGlObject associated with this AttributeCarrier
     GUIGlObject* getGUIGlObject();
 
+    /// @brief get GUIGlObject associated with this AttributeCarrier (constant)
+    const GUIGlObject* getGUIGlObject() const;
+
     /// @brief update pre-computed geometry information
     void updateGeometry();
 

diff --git a/src/netedit/elements/network/GNELaneTemplate.cpp b/src/netedit/elements/network/GNELaneTemplate.cpp
@@ -49,6 +49,12 @@ GNELaneTemplate::getGUIGlObject() {
 }
 
 
+const GUIGlObject*
+GNELaneTemplate::getGUIGlObject() const {
+    return nullptr;
+}
+
+
 void
 GNELaneTemplate::updateGeometry() {
     throw InvalidArgument("cannot be called in templates");

diff --git a/src/netedit/elements/network/GNELaneTemplate.h b/src/netedit/elements/network/GNELaneTemplate.h
@@ -43,6 +43,9 @@ class GNELaneTemplate : public GNEAttributeCarrier {
     /// @brief get GUIGlObject associated with this AttributeCarrier
     GUIGlObject* getGUIGlObject();
 
+    /// @brief get GUIGlObject associated with this AttributeCarrier (constant)
+    const GUIGlObject* getGUIGlObject() const;
+
     /// @brief update pre-computed geometry information
     void updateGeometry();
 

diff --git a/src/netedit/elements/network/GNENetworkElement.cpp b/src/netedit/elements/network/GNENetworkElement.cpp
@@ -55,6 +55,12 @@ GNENetworkElement::getGUIGlObject() {
 }
 
 
+const GUIGlObject*
+GNENetworkElement::getGUIGlObject() const {
+    return this;
+}
+
+
 void
 GNENetworkElement::setShapeEdited(const bool value) {
     myShapeEdited = value;

diff --git a/src/netedit/elements/network/GNENetworkElement.h b/src/netedit/elements/network/GNENetworkElement.h
@@ -73,6 +73,9 @@ class GNENetworkElement : public GUIGlObject, public GNEHierarchicalElement, pub
     /// @brief get GUIGlObject associated with this AttributeCarrier
     GUIGlObject* getGUIGlObject();
 
+    /// @brief get GUIGlObject associated with this AttributeCarrier (constant)
+    const GUIGlObject* getGUIGlObject() const;
+
     /// @brief set shape edited
     void setShapeEdited(const bool value);