Skip to content

Commit

Permalink
Added new GUIGlObjectTypes for packing stoppingPlaces. Refs #14803
Browse files Browse the repository at this point in the history
  • Loading branch information
palvarezlopez committed Sep 11, 2024
1 parent 74ac65e commit e77a195
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 27 deletions.
5 changes: 4 additions & 1 deletion src/utils/gui/globjects/GUIGlObject.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,15 @@ StringBijection<GUIGlObjectType>::Entry GUIGlObject::GUIGlObjectTypeNamesInitial
{"parentChildLine", GLO_PARENTCHILDLINE},
//
{"additional", GLO_ADDITIONALELEMENT},
{"stoppingPlace", GLO_STOPPING_PLACE},
{"busStop", GLO_BUS_STOP},
{"trainStop", GLO_TRAIN_STOP},
{"access", GLO_ACCESS},
{"taz", GLO_TAZ},
{"containerStop", GLO_CONTAINER_STOP},
{"chargingStation", GLO_CHARGING_STATION},
{"overheadWireSegment", GLO_OVERHEAD_WIRE_SEGMENT},
{"parkingArea", GLO_PARKING_AREA},
{"stoppingPlaceLast", GLO_STOPPING_PLACE_LAST},
{"parkingSpace", GLO_PARKING_SPACE},
{"e1Detector", GLO_E1DETECTOR},
{"e1DetectorME", GLO_E1DETECTOR_ME},
Expand All @@ -95,6 +97,7 @@ StringBijection<GUIGlObjectType>::Entry GUIGlObject::GUIGlObjectTypeNamesInitial
{"routeProbe", GLO_ROUTEPROBE},
{"vaporizer", GLO_VAPORIZER},
{"wire", GLO_WIRE},
{"overheadWireSegment", GLO_OVERHEAD_WIRE_SEGMENT},
{"tractionsubstation", GLO_TRACTIONSUBSTATION},
{"additionalLast", GLO_ADDITIONALELEMENT_LAST},
//
Expand Down
58 changes: 32 additions & 26 deletions src/utils/gui/globjects/GUIGlObjectTypes.h
Original file line number Diff line number Diff line change
Expand Up @@ -72,58 +72,64 @@ enum GUIGlObjectType {

/// @brief reserved GLO type for packing all additionals elements
GLO_ADDITIONALELEMENT = 100,
/// @brief reserved GLO type for packing all StoppingPlace elements
GLO_STOPPING_PLACE = 101,
/// @brief a busStop
GLO_BUS_STOP = 101,
GLO_BUS_STOP = 102,
/// @brief a trainStop
GLO_TRAIN_STOP = 103,
/// @brief a containerStop
GLO_CONTAINER_STOP = 102,
GLO_CONTAINER_STOP = 104,
/// @brief a chargingStation
GLO_CHARGING_STATION = 103,
GLO_CHARGING_STATION = 105,
/// @brief a ParkingArea
GLO_PARKING_AREA = 104,
GLO_PARKING_AREA = 106,
/// @brief reserved GLO type for packing all StoppingPlace elements
GLO_STOPPING_PLACE_LAST = 107,
/// @brief a ParkingSpace
GLO_PARKING_SPACE = 105,
GLO_PARKING_SPACE = 108,
/// @brief a E1 detector
GLO_E1DETECTOR = 106,
GLO_E1DETECTOR = 109,
/// @brief a E1 detector
GLO_E1DETECTOR_ME = 107,
GLO_E1DETECTOR_ME = 110,
/// @brief a E1 detector
GLO_E1DETECTOR_INSTANT = 108,
GLO_E1DETECTOR_INSTANT = 111,
/// @brief a E2 detector
GLO_E2DETECTOR = 109,
GLO_E2DETECTOR = 112,
/// @brief a E3 detector
GLO_E3DETECTOR = 110,
GLO_E3DETECTOR = 113,
/// @brief a DetEntry detector
GLO_DET_ENTRY = 111,
GLO_DET_ENTRY = 114,
/// @brief a DetExit detector
GLO_DET_EXIT = 112,
GLO_DET_EXIT = 115,
/// @brief a Rerouter
GLO_REROUTER = 113,
GLO_REROUTER = 116,
/// @brief a rerouter interval
GLO_REROUTER_INTERVAL = 114,
GLO_REROUTER_INTERVAL = 117,
/// @brief a closing reroute
GLO_REROUTER_CLOSINGREROUTE = 115,
GLO_REROUTER_CLOSINGREROUTE = 118,
/// @brief a closing lane reroute
GLO_REROUTER_CLOSINGLANEREROUTE = 116,
GLO_REROUTER_CLOSINGLANEREROUTE = 119,
/// @brief a parking area reroute
GLO_REROUTER_PARKINGAREAREROUTE = 117,
GLO_REROUTER_PARKINGAREAREROUTE = 120,
/// @brief a destination probability reroute
GLO_REROUTER_DESTPROBREROUTE = 118,
GLO_REROUTER_DESTPROBREROUTE = 121,
/// @brief a route probability reroute
GLO_REROUTER_ROUTEPROBREROUTE = 119,
GLO_REROUTER_ROUTEPROBREROUTE = 122,
/// @brief a Rerouter over edge
GLO_REROUTER_EDGE = 120,
GLO_REROUTER_EDGE = 123,
/// @brief a Variable Speed Sign
GLO_VSS = 121,
GLO_VSS = 124,
/// @brief a Variable Speed Sign step
GLO_VSS_STEP = 122,
GLO_VSS_STEP = 125,
/// @brief a Calibrator
GLO_CALIBRATOR = 123,
GLO_CALIBRATOR = 126,
/// @brief a RouteProbe
GLO_ROUTEPROBE = 124,
GLO_ROUTEPROBE = 127,
/// @brief a Vaporizer
GLO_VAPORIZER = 125,
GLO_VAPORIZER = 128,
/// @brief a Acces
GLO_ACCESS = 126,
GLO_ACCESS = 129,
/// @brief reserved GLO type for packing all wire elements
GLO_WIRE = 140,
/// @brief a segment of an overhead line
Expand Down

0 comments on commit e77a195

Please sign in to comment.