Moved checkDrawMoveContour() function in every additional. Refs #14109

eclipse-sumo · Dec 20, 2023 · 544ba52 · 544ba52
1 parent 4f52b88
commit 544ba52
Show file tree

Hide file tree

Showing 54 changed files with 484 additions and 16 deletions.
diff --git a/src/netedit/elements/additional/GNEAccess.cpp b/src/netedit/elements/additional/GNEAccess.cpp
@@ -186,6 +186,21 @@ void GNEAccess::fixAdditionalProblem() {
 }
 
 
+bool
+GNEAccess::checkDrawMoveContour() const {
+    // get edit modes
+    const auto& editModes = myNet->getViewNet()->getEditModes();
+    // check if we're in move mode
+    if (editModes.isCurrentSupermodeNetwork() && (editModes.networkEditMode == NetworkEditMode::NETWORK_MOVE) &&
+        myNet->getViewNet()->checkOverLockedElement(this, mySelected)) {
+        // only move the first element
+        return myNet->getViewNet()->getViewObjectsSelector().getGUIGlObjectFront() == this;
+    } else {
+        return false;
+    }
+}
+
+
 GNEEdge*
 GNEAccess::getEdge() const {
     return getParentLanes().front()->getParentEdge();

diff --git a/src/netedit/elements/additional/GNEAccess.h b/src/netedit/elements/additional/GNEAccess.h
@@ -85,6 +85,14 @@ class GNEAccess : public GNEAdditional, public Parameterised {
 
     /// @}
 
+    /// @name Function related with contour drawing
+    /// @{
+
+    /// @brief check if draw move contour (red)
+    bool checkDrawMoveContour() const;
+
+    /// @}
+
     /// @name Functions related with geometry of element
     /// @{
 

diff --git a/src/netedit/elements/additional/GNEAdditional.cpp b/src/netedit/elements/additional/GNEAdditional.cpp
@@ -355,21 +355,6 @@ GNEAdditional::checkDrawSelectContour() const {
 }
 
 
-bool
-GNEAdditional::checkDrawMoveContour() const {
-    // get edit modes
-    const auto& editModes = myNet->getViewNet()->getEditModes();
-    // check if we're in move mode
-    if (editModes.isCurrentSupermodeNetwork() && (editModes.networkEditMode == NetworkEditMode::NETWORK_MOVE) &&
-        myNet->getViewNet()->checkOverLockedElement(this, mySelected)) {
-        // only move the first element
-        return myNet->getViewNet()->getViewObjectsSelector().getGUIGlObjectFront() == this;
-    } else {
-        return false;
-    }
-}
-
-
 GUIGLObjectPopupMenu*
 GNEAdditional::getPopUpMenu(GUIMainWindow& app, GUISUMOAbstractView& parent) {
     GUIGLObjectPopupMenu* ret = new GUIGLObjectPopupMenu(app, parent, *this);

diff --git a/src/netedit/elements/additional/GNEAdditional.h b/src/netedit/elements/additional/GNEAdditional.h
@@ -188,7 +188,7 @@ class GNEAdditional : public GNEPathManager::PathElement, public GNEHierarchical
     bool checkDrawSelectContour() const;
 
     /// @brief check if draw move contour (red)
-    bool checkDrawMoveContour() const;
+    virtual bool checkDrawMoveContour() const = 0;
 
     /// @}
 

diff --git a/src/netedit/elements/additional/GNECalibrator.cpp b/src/netedit/elements/additional/GNECalibrator.cpp
@@ -267,6 +267,21 @@ GNECalibrator::drawGL(const GUIVisualizationSettings& s) const {
 }
 
 
+bool 
+GNECalibrator::checkDrawMoveContour() const {
+    // get edit modes
+    const auto& editModes = myNet->getViewNet()->getEditModes();
+    // check if we're in move mode
+    if (editModes.isCurrentSupermodeNetwork() && (editModes.networkEditMode == NetworkEditMode::NETWORK_MOVE) &&
+        myNet->getViewNet()->checkOverLockedElement(this, mySelected)) {
+        // only move the first element
+        return myNet->getViewNet()->getViewObjectsSelector().getGUIGlObjectFront() == this;
+    } else {
+        return false;
+    }
+}
+
+
 void
 GNECalibrator::openAdditionalDialog() {
     // Open calibrator dialog

diff --git a/src/netedit/elements/additional/GNECalibrator.h b/src/netedit/elements/additional/GNECalibrator.h
@@ -131,6 +131,14 @@ class GNECalibrator : public GNEAdditional, public Parameterised {
 
     /// @}
 
+    /// @name Function related with contour drawing
+    /// @{
+
+    /// @brief check if draw move contour (red)
+    bool checkDrawMoveContour() const;
+
+    /// @}
+
     /// @brief open Calibrator Dialog
     void openAdditionalDialog();
 

diff --git a/src/netedit/elements/additional/GNECalibratorFlow.cpp b/src/netedit/elements/additional/GNECalibratorFlow.cpp
@@ -115,6 +115,12 @@ GNECalibratorFlow::fixAdditionalProblem() {
 }
 
 
+bool
+GNECalibratorFlow::checkDrawMoveContour() const {
+    return false;
+}
+
+
 GNEMoveOperation*
 GNECalibratorFlow::getMoveOperation() {
     // calibrators flow cannot be moved

diff --git a/src/netedit/elements/additional/GNECalibratorFlow.h b/src/netedit/elements/additional/GNECalibratorFlow.h
@@ -76,6 +76,14 @@ class GNECalibratorFlow : public GNEAdditional, public SUMOVehicleParameter {
 
     /// @}
 
+    /// @name Function related with contour drawing
+    /// @{
+
+    /// @brief check if draw move contour (red)
+    bool checkDrawMoveContour() const;
+
+    /// @}
+
     /// @name Functions related with geometry of element
     /// @{
 

diff --git a/src/netedit/elements/additional/GNEClosingLaneReroute.cpp b/src/netedit/elements/additional/GNEClosingLaneReroute.cpp
@@ -86,6 +86,12 @@ GNEClosingLaneReroute::fixAdditionalProblem() {
 }
 
 
+bool
+GNEClosingLaneReroute::checkDrawMoveContour() const {
+    return false;
+}
+
+
 GNEMoveOperation*
 GNEClosingLaneReroute::getMoveOperation() {
     // GNEClosingLaneReroute cannot be moved

diff --git a/src/netedit/elements/additional/GNEClosingLaneReroute.h b/src/netedit/elements/additional/GNEClosingLaneReroute.h
@@ -72,6 +72,14 @@ class GNEClosingLaneReroute : public GNEAdditional {
 
     /// @}
 
+    /// @name Function related with contour drawing
+    /// @{
+
+    /// @brief check if draw move contour (red)
+    bool checkDrawMoveContour() const;
+
+    /// @}
+
     /// @name Functions related with geometry of element
     /// @{
 

diff --git a/src/netedit/elements/additional/GNEClosingReroute.cpp b/src/netedit/elements/additional/GNEClosingReroute.cpp
@@ -86,6 +86,12 @@ GNEClosingReroute::fixAdditionalProblem() {
 }
 
 
+bool
+GNEClosingReroute::checkDrawMoveContour() const {
+    return false;
+}
+
+
 GNEMoveOperation*
 GNEClosingReroute::getMoveOperation() {
     // GNEClosingReroutes cannot be moved

diff --git a/src/netedit/elements/additional/GNEClosingReroute.h b/src/netedit/elements/additional/GNEClosingReroute.h
@@ -71,6 +71,14 @@ class GNEClosingReroute : public GNEAdditional {
 
     /// @}
 
+    /// @name Function related with contour drawing
+    /// @{
+
+    /// @brief check if draw move contour (red)
+    bool checkDrawMoveContour() const;
+
+    /// @}
+
     /// @name Functions related with geometry of element
     /// @{
 

diff --git a/src/netedit/elements/additional/GNEDestProbReroute.cpp b/src/netedit/elements/additional/GNEDestProbReroute.cpp
@@ -79,6 +79,12 @@ GNEDestProbReroute::fixAdditionalProblem() {
 }
 
 
+bool
+GNEDestProbReroute::checkDrawMoveContour() const {
+    return false;
+}
+
+
 GNEMoveOperation*
 GNEDestProbReroute::getMoveOperation() {
     // GNEDestProbReroutes cannot be moved

diff --git a/src/netedit/elements/additional/GNEDestProbReroute.h b/src/netedit/elements/additional/GNEDestProbReroute.h
@@ -72,6 +72,14 @@ class GNEDestProbReroute : public GNEAdditional {
 
     /// @}
 
+    /// @name Function related with contour drawing
+    /// @{
+
+    /// @brief check if draw move contour (red)
+    bool checkDrawMoveContour() const;
+
+    /// @}
+
     /// @name Functions related with geometry of element
     /// @{
 

diff --git a/src/netedit/elements/additional/GNEDetector.cpp b/src/netedit/elements/additional/GNEDetector.cpp
@@ -85,6 +85,21 @@ GNEDetector::getPositionOverLane() const {
 }
 
 
+bool
+GNEDetector::checkDrawMoveContour() const {
+    // get edit modes
+    const auto& editModes = myNet->getViewNet()->getEditModes();
+    // check if we're in move mode
+    if (editModes.isCurrentSupermodeNetwork() && (editModes.networkEditMode == NetworkEditMode::NETWORK_MOVE) &&
+        myNet->getViewNet()->checkOverLockedElement(this, mySelected)) {
+        // only move the first element
+        return myNet->getViewNet()->getViewObjectsSelector().getGUIGlObjectFront() == this;
+    } else {
+        return false;
+    }
+}
+
+
 GNELane*
 GNEDetector::getLane() const {
     return getParentLanes().front();

diff --git a/src/netedit/elements/additional/GNEDetector.h b/src/netedit/elements/additional/GNEDetector.h
@@ -93,6 +93,14 @@ class GNEDetector : public GNEAdditional, public Parameterised {
 
     /// @}
 
+    /// @name Function related with contour drawing
+    /// @{
+
+    /// @brief check if draw move contour (red)
+    bool checkDrawMoveContour() const;
+
+    /// @}
+
     /// @brief get lane
     GNELane* getLane() const;
 

diff --git a/src/netedit/elements/additional/GNEMultiEntryExitDetector.cpp b/src/netedit/elements/additional/GNEMultiEntryExitDetector.cpp
@@ -135,6 +135,21 @@ GNEMultiEntryExitDetector::fixAdditionalProblem() {
 }
 
 
+bool
+GNEMultiEntryExitDetector::checkDrawMoveContour() const {
+    // get edit modes
+    const auto& editModes = myNet->getViewNet()->getEditModes();
+    // check if we're in move mode
+    if (editModes.isCurrentSupermodeNetwork() && (editModes.networkEditMode == NetworkEditMode::NETWORK_MOVE) &&
+        myNet->getViewNet()->checkOverLockedElement(this, mySelected)) {
+        // only move the first element
+        return myNet->getViewNet()->getViewObjectsSelector().getGUIGlObjectFront() == this;
+    } else {
+        return false;
+    }
+}
+
+
 void
 GNEMultiEntryExitDetector::updateGeometry() {
     // update additional geometry

diff --git a/src/netedit/elements/additional/GNEMultiEntryExitDetector.h b/src/netedit/elements/additional/GNEMultiEntryExitDetector.h
@@ -79,6 +79,14 @@ class GNEMultiEntryExitDetector : public GNEAdditional, public Parameterised {
 
     /// @}
 
+    /// @name Function related with contour drawing
+    /// @{
+
+    /// @brief check if draw move contour (red)
+    bool checkDrawMoveContour() const;
+
+    /// @}
+
     /// @name Functions related with geometry of element
     /// @{
 

diff --git a/src/netedit/elements/additional/GNEOverheadWire.cpp b/src/netedit/elements/additional/GNEOverheadWire.cpp
@@ -192,6 +192,12 @@ GNEOverheadWire::fixAdditionalProblem() {
 }
 
 
+bool
+GNEOverheadWire::checkDrawMoveContour() const {
+    return false;
+}
+
+
 void
 GNEOverheadWire::updateGeometry() {
     // compute path

diff --git a/src/netedit/elements/additional/GNEOverheadWire.h b/src/netedit/elements/additional/GNEOverheadWire.h
@@ -79,6 +79,14 @@ class GNEOverheadWire : public GNEAdditional, public Parameterised {
 
     /// @}
 
+    /// @name Function related with contour drawing
+    /// @{
+
+    /// @brief check if draw move contour (red)
+    bool checkDrawMoveContour() const;
+
+    /// @}
+
     /// @brief update pre-computed geometry information
     void updateGeometry();
 

diff --git a/src/netedit/elements/additional/GNEPOI.cpp b/src/netedit/elements/additional/GNEPOI.cpp
@@ -299,6 +299,21 @@ GNEPOI::getGlID() const {
 }
 
 
+bool
+GNEPOI::checkDrawMoveContour() const {
+    // get edit modes
+    const auto& editModes = myNet->getViewNet()->getEditModes();
+    // check if we're in move mode
+    if (editModes.isCurrentSupermodeNetwork() && (editModes.networkEditMode == NetworkEditMode::NETWORK_MOVE) &&
+        myNet->getViewNet()->checkOverLockedElement(this, mySelected)) {
+        // only move the first element
+        return myNet->getViewNet()->getViewObjectsSelector().getGUIGlObjectFront() == this;
+    } else {
+        return false;
+    }
+}
+
+
 std::string
 GNEPOI::getParentName() const {
     if (getParentLanes().size() > 0) {

diff --git a/src/netedit/elements/additional/GNEPOI.h b/src/netedit/elements/additional/GNEPOI.h
@@ -150,6 +150,14 @@ class GNEPOI : public PointOfInterest, public GNEAdditional {
 
     /// @}
 
+    /// @name Function related with contour drawing
+    /// @{
+
+    /// @brief check if draw move contour (red)
+    bool checkDrawMoveContour() const;
+
+    /// @}
+
     /// @name inherited from GUIGlObject
     /// @{
     /**@brief Returns the name of the parent object

diff --git a/src/netedit/elements/additional/GNEParkingAreaReroute.cpp b/src/netedit/elements/additional/GNEParkingAreaReroute.cpp
@@ -84,6 +84,12 @@ GNEParkingAreaReroute::fixAdditionalProblem() {
 }
 
 
+bool
+GNEParkingAreaReroute::checkDrawMoveContour() const {
+    return false;
+}
+
+
 GNEMoveOperation*
 GNEParkingAreaReroute::getMoveOperation() {
     // GNEParkingAreaReroutes cannot be moved

diff --git a/src/netedit/elements/additional/GNEParkingAreaReroute.h b/src/netedit/elements/additional/GNEParkingAreaReroute.h
@@ -73,6 +73,14 @@ class GNEParkingAreaReroute : public GNEAdditional {
 
     /// @}
 
+    /// @name Function related with contour drawing
+    /// @{
+
+    /// @brief check if draw move contour (red)
+    bool checkDrawMoveContour() const;
+
+    /// @}
+
     /// @name Functions related with geometry of element
     /// @{