Renamed variables and sub classes. Refs #12

eclipse-sumo · Dec 19, 2023 · e42a5c2 · e42a5c2
1 parent 258b64d
commit e42a5c2
Show file tree

Hide file tree

Showing 90 changed files with 558 additions and 583 deletions.
diff --git a/src/netedit/GNEPathManager.cpp b/src/netedit/GNEPathManager.cpp
@@ -553,7 +553,7 @@ GNEPathManager::PathDraw::clearPathDraw() {
 bool
 GNEPathManager::PathDraw::checkDrawPathGeometry(const GUIVisualizationSettings& s, const GNELane* lane, SumoXMLTag tag) {
     // check conditions
-    if (s.drawForObjectUnderCursor) {
+    if (s.drawForViewObjectsHandler) {
         return true;
     } else if (myLaneDrawedElements.count(lane) > 0) {
         // check tag
@@ -578,7 +578,7 @@ GNEPathManager::PathDraw::checkDrawPathGeometry(const GUIVisualizationSettings&
 bool
 GNEPathManager::PathDraw::checkDrawPathGeometry(const GUIVisualizationSettings& s, const Segment* segment, SumoXMLTag tag) {
     // check conditions
-    if (s.drawForObjectUnderCursor) {
+    if (s.drawForViewObjectsHandler) {
         return true;
     } else {
         // declare lane2lane

diff --git a/src/netedit/GNEViewNet.cpp b/src/netedit/GNEViewNet.cpp
diff --git a/src/netedit/GNEViewNet.h b/src/netedit/GNEViewNet.h
@@ -81,7 +81,7 @@ class GNEViewNet : public GUISUMOAbstractView {
     void viewUpdated();
 
     /// @brief get objects under cursor
-    const GNEViewNetHelper::ObjectsUnderCursor& getObjectsUnderCursor() const;
+    const GNEViewNetHelper::ViewObjectsSelector& getObjectsUnderCursor() const;
 
     /// @brief get move multiple element values
     const GNEViewNetHelper::MoveMultipleElementValues& getMoveMultipleElementValues() const;
@@ -615,8 +615,6 @@ class GNEViewNet : public GUISUMOAbstractView {
     /// @brief variable used to save key status after certain events
     GNEViewNetHelper::MouseButtonKeyPressed myMouseButtonKeyPressed;
 
-    /// @brief variable use to save all pointers to objects under cursor after a click
-    GNEViewNetHelper::ObjectsUnderCursor myObjectsUnderCursor;
     /// @}
 
     /// @name structs related with checkable buttons
@@ -670,6 +668,9 @@ class GNEViewNet : public GUISUMOAbstractView {
     GNEViewNetHelper::VehicleTypeOptions myVehicleTypeOptions;
     // @}
 
+    /// @brief variable use to select objects in view
+    GNEViewNetHelper::ViewObjectsSelector myViewObjectsSelector;
+
     /// @brief variable used for grouping all variables related with salve elements
     GNEViewNetHelper::SaveElements mySaveElements;