Fixed eclipse-sumo#6516

abcsyald · Oct 14, 2020 · 4b3d329 · 4b3d329
1 parent f52ba98
commit 4b3d329
Show file tree

Hide file tree

Showing 15 changed files with 55 additions and 25 deletions.
diff --git a/src/netedit/elements/additional/GNEAdditional.cpp b/src/netedit/elements/additional/GNEAdditional.cpp
@@ -370,7 +370,7 @@ GNEAdditional::drawPartialGL(const GUIVisualizationSettings& s, const GNELane* l
         }
         // Pop last matrix
         glPopMatrix();
-        // Draw name if isn't being drawn for selecting
+        // draw additional ID
         if (!s.drawForRectangleSelection) {
             drawName(getCenteringBoundary().getCenter(), s.scale, s.addName);
         }
@@ -475,17 +475,40 @@ GNEAdditional::isValidDetectorID(const std::string& newID) const {
 }
 
 
+void
+GNEAdditional::drawAdditionalID(const GUIVisualizationSettings& s) const {
+    if (s.addName.show && (myAdditionalGeometry.getShape().size() > 0) && !s.drawForRectangleSelection && !s.drawForPositionSelection) {
+        // calculate middle point
+        const double middlePoint = (myAdditionalGeometry.getShape().length2D() * 0.5);
+        // calculate position
+        const Position pos = (myAdditionalGeometry.getShape().size() == 1)? myAdditionalGeometry.getShape().front() : myAdditionalGeometry.getShape().positionAtOffset2D(middlePoint);
+        // calculate rotation
+        const double rot = (myAdditionalGeometry.getShape().size() == 1)? myAdditionalGeometry.getShapeRotations().front() : myAdditionalGeometry.getShape().rotationDegreeAtOffset(middlePoint);
+        // draw additional ID
+        if (myTagProperty.hasAttribute(SUMO_ATTR_LANE)) {
+            GLHelper::drawText(getMicrosimID(), pos, GLO_MAX - getType(), s.addFullName.scaledSize(s.scale), s.addFullName.color, s.getTextAngle(rot - 90));
+        } else {
+            GLHelper::drawText(getMicrosimID(), pos, GLO_MAX - getType(), s.addFullName.scaledSize(s.scale), s.addFullName.color, 0);
+        }
+    }
+}
+
+
 void
 GNEAdditional::drawAdditionalName(const GUIVisualizationSettings& s) const {
-    if (s.addFullName.show && (myAdditionalName != "") && !s.drawForRectangleSelection && !s.drawForPositionSelection) {
+    if (s.addFullName.show && (myAdditionalGeometry.getShape().size() > 0) && (myAdditionalName != "") && !s.drawForRectangleSelection && !s.drawForPositionSelection) {
         // calculate middle point
         const double middlePoint = (myAdditionalGeometry.getShape().length2D() * 0.5);
         // calculate position
         const Position pos = (myAdditionalGeometry.getShape().size() == 1)? myAdditionalGeometry.getShape().front() : myAdditionalGeometry.getShape().positionAtOffset2D(middlePoint);
         // calculate rotation
         const double rot = (myAdditionalGeometry.getShape().size() == 1)? myAdditionalGeometry.getShapeRotations().front() : myAdditionalGeometry.getShape().rotationDegreeAtOffset(middlePoint);
-        // get texture
-        GLHelper::drawText(myAdditionalName, pos, GLO_MAX - getType(), s.addFullName.scaledSize(s.scale), s.addFullName.color, rot);
+        // draw additional name
+        if (myTagProperty.hasAttribute(SUMO_ATTR_LANE)) {
+            GLHelper::drawText(myAdditionalName, pos, GLO_MAX - getType(), s.addFullName.scaledSize(s.scale), s.addFullName.color, s.getTextAngle(rot - 90));
+        } else {
+            GLHelper::drawText(myAdditionalName, pos, GLO_MAX - getType(), s.addFullName.scaledSize(s.scale), s.addFullName.color, 0);
+        }
     }
 }
 

diff --git a/src/netedit/elements/additional/GNEAdditional.h b/src/netedit/elements/additional/GNEAdditional.h
@@ -304,6 +304,9 @@ class GNEAdditional : public GUIGlObject, public Parameterised, public GNEHierar
 
     /// @}
 
+    /// @brief draw additional ID
+    void drawAdditionalID(const GUIVisualizationSettings& s) const;
+
     /// @brief draw additional name
     void drawAdditionalName(const GUIVisualizationSettings& s) const;
 

diff --git a/src/netedit/elements/additional/GNEBusStop.cpp b/src/netedit/elements/additional/GNEBusStop.cpp
@@ -123,12 +123,12 @@ GNEBusStop::drawGL(const GUIVisualizationSettings& s) const {
         }
         // pop draw matrix
         glPopMatrix();
-        // Draw name if isn't being drawn for selecting
-        drawName(getPositionInView(), s.scale, s.addName);
         // Pop name
         glPopName();
         // draw connection betwen access
         drawConnectionAccess(s, baseColor);
+        // Draw additional ID
+        drawAdditionalID(s);
         // draw additional name
         drawAdditionalName(s);
         // check if dotted contours has to be drawn

diff --git a/src/netedit/elements/additional/GNECalibrator.cpp b/src/netedit/elements/additional/GNECalibrator.cpp
@@ -150,7 +150,7 @@ GNECalibrator::drawGL(const GUIVisualizationSettings& s) const {
         // pop name
         glPopName();
         // draw name
-        drawName(getPositionInView(), s.scale, s.addName);
+        drawAdditionalID(s);
     }
 }
 

diff --git a/src/netedit/elements/additional/GNEChargingStation.cpp b/src/netedit/elements/additional/GNEChargingStation.cpp
@@ -107,10 +107,10 @@ GNEChargingStation::drawGL(const GUIVisualizationSettings& s) const {
         }
         // pop draw matrix
         glPopMatrix();
-        // Draw name if isn't being drawn for selecting
-        drawName(getPositionInView(), s.scale, s.addName);
         // Pop name
         glPopName();
+        // Draw additional ID
+        drawAdditionalID(s);
         // draw additional name
         drawAdditionalName(s);
         // check if dotted contours has to be drawn

diff --git a/src/netedit/elements/additional/GNEContainerStop.cpp b/src/netedit/elements/additional/GNEContainerStop.cpp
@@ -104,10 +104,10 @@ GNEContainerStop::drawGL(const GUIVisualizationSettings& s) const {
         }
         // pop draw matrix
         glPopMatrix();
-        // Draw name if isn't being drawn for selecting
-        drawName(getPositionInView(), s.scale, s.addName);
         // Pop name
         glPopName();
+        // Draw additional ID
+        drawAdditionalID(s);
         // draw additional name
         drawAdditionalName(s);
         // check if dotted contours has to be drawn

diff --git a/src/netedit/elements/additional/GNEDetectorE1.cpp b/src/netedit/elements/additional/GNEDetectorE1.cpp
@@ -125,10 +125,10 @@ GNEDetectorE1::drawGL(const GUIVisualizationSettings& s) const {
         }
         // pop layer matrix
         glPopMatrix();
-        // Draw name if isn't being drawn for selecting
-        drawName(getPositionInView(), s.scale, s.addName);
         // Pop name
         glPopName();
+        // Draw additional ID
+        drawAdditionalID(s);
         // draw additional name
         drawAdditionalName(s);
         // check if dotted contours has to be drawn

diff --git a/src/netedit/elements/additional/GNEDetectorE1Instant.cpp b/src/netedit/elements/additional/GNEDetectorE1Instant.cpp
@@ -125,10 +125,10 @@ GNEDetectorE1Instant::drawGL(const GUIVisualizationSettings& s) const {
         }
         // pop layer matrix
         glPopMatrix();
-        // Draw name if isn't being drawn for selecting
-        drawName(getPositionInView(), s.scale, s.addName);
         // Pop name
         glPopName();
+        // Draw additional ID
+        drawAdditionalID(s);
         // draw additional name
         drawAdditionalName(s);
         // check if dotted contours has to be drawn

diff --git a/src/netedit/elements/additional/GNEDetectorE2.cpp b/src/netedit/elements/additional/GNEDetectorE2.cpp
@@ -327,10 +327,10 @@ GNEDetectorE2::drawGL(const GUIVisualizationSettings& s) const {
         }
         // pop layer matrix
         glPopMatrix();
-        // Draw name if isn't being drawn for selecting
-        drawName(getPositionInView(), s.scale, s.addName);
         // Pop name
         glPopName();
+        // Draw additional ID
+        drawAdditionalID(s);
         // draw additional name
         drawAdditionalName(s);
         // check if dotted contours has to be drawn

diff --git a/src/netedit/elements/additional/GNEDetectorE3.cpp b/src/netedit/elements/additional/GNEDetectorE3.cpp
@@ -150,8 +150,6 @@ GNEDetectorE3::drawGL(const GUIVisualizationSettings& s) const {
         glPopMatrix();
         // Pop name
         glPopName();
-        // Draw name if isn't being drawn for selecting
-        drawName(getPositionInView(), s.scale, s.addName);
         // Pop name
         glPopName();
         // push connection matrix
@@ -162,6 +160,8 @@ GNEDetectorE3::drawGL(const GUIVisualizationSettings& s) const {
         drawHierarchicalConnections(s, this, E3Exaggeration);
         // Pop connection matrix
         glPopMatrix();
+        // Draw additional ID
+        drawAdditionalID(s);
         // draw additional name
         drawAdditionalName(s);
         // check if dotted contours has to be drawn

diff --git a/src/netedit/elements/additional/GNEDetectorEntryExit.cpp b/src/netedit/elements/additional/GNEDetectorEntryExit.cpp
@@ -205,16 +205,14 @@ GNEDetectorEntryExit::drawGL(const GUIVisualizationSettings& s) const {
         GNEViewNetHelper::LockIcon::drawLockIcon(this, myAdditionalGeometry, entryExitExaggeration, 0, 0, true, 0.4);
         // Pop layer matrix
         glPopMatrix();
-        // Draw name if isn't being drawn for selecting
-        if (!s.drawForRectangleSelection) {
-            drawName(getPositionInView(), s.scale, s.addName);
-        }
         // check if dotted contour has to be drawn
         if (s.drawDottedContour() || myNet->getViewNet()->isAttributeCarrierInspected(this)) {
             // GNEGeometry::drawShapeDottedContour(s, getType(), entryExitExaggeration, myDottedGeometry);
         }
         // pop gl identificator
         glPopName();
+        // draw additional name
+        drawAdditionalName(s);
     }
 }
 

diff --git a/src/netedit/elements/additional/GNEParkingArea.cpp b/src/netedit/elements/additional/GNEParkingArea.cpp
@@ -106,10 +106,10 @@ GNEParkingArea::drawGL(const GUIVisualizationSettings& s) const {
         }
         // pop draw matrix
         glPopMatrix();
-        // Draw name if isn't being drawn for selecting
-        drawName(getPositionInView(), s.scale, s.addName);
         // Pop name
         glPopName();
+        // Draw additional ID
+        drawAdditionalID(s);
         // draw additional name
         drawAdditionalName(s);
         // check if dotted contours has to be drawn

diff --git a/src/netedit/elements/additional/GNEParkingSpace.cpp b/src/netedit/elements/additional/GNEParkingSpace.cpp
@@ -151,6 +151,8 @@ GNEParkingSpace::drawGL(const GUIVisualizationSettings& s) const {
         glPopMatrix();
         // pop name
         glPopName();
+        // Draw additional ID
+        drawAdditionalID(s);
         // draw additional name
         drawAdditionalName(s);
         // check if dotted contours has to be drawn

diff --git a/src/netedit/elements/additional/GNERerouter.cpp b/src/netedit/elements/additional/GNERerouter.cpp
@@ -172,6 +172,8 @@ GNERerouter::drawGL(const GUIVisualizationSettings& s) const {
         drawHierarchicalConnections(s, this, rerouterExaggeration);
         // Pop connection matrix
         glPopMatrix();
+        // Draw additional ID
+        drawAdditionalID(s);
         // draw additional name
         drawAdditionalName(s);
         // check if dotted contour has to be drawn

diff --git a/src/netedit/elements/additional/GNEVariableSpeedSign.cpp b/src/netedit/elements/additional/GNEVariableSpeedSign.cpp
@@ -167,6 +167,8 @@ GNEVariableSpeedSign::drawGL(const GUIVisualizationSettings& s) const {
         drawHierarchicalConnections(s, this, VSSExaggeration);
         // Pop connection matrix
         glPopMatrix();
+        // Draw additional ID
+        drawAdditionalID(s);
         // draw additional name
         drawAdditionalName(s);
         // check if dotted contour has to be drawn