From 9357bb4df7f6cdadc1bb318db5a6712981ddeca2 Mon Sep 17 00:00:00 2001 From: Pablo Alvarez Lopez Date: Fri, 15 Sep 2023 12:54:28 +0200 Subject: [PATCH] Updated GNEAttributeCarrier.cpp. Refs #13784 --- src/netedit/elements/GNEAttributeCarrier.cpp | 48 ++++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/src/netedit/elements/GNEAttributeCarrier.cpp b/src/netedit/elements/GNEAttributeCarrier.cpp index e98df4493fb..2edb882e44f 100644 --- a/src/netedit/elements/GNEAttributeCarrier.cpp +++ b/src/netedit/elements/GNEAttributeCarrier.cpp @@ -4853,7 +4853,7 @@ GNEAttributeCarrier::fillPersonPlanTrips() { // set values of tag myTagProperties[currentTag] = GNETagProperties(currentTag, GNETagProperties::TagType::DEMANDELEMENT | GNETagProperties::TagType::PERSONPLAN | GNETagProperties::TagType::PERSONTRIP, - GNETagProperties::TagProperty::CHILD | GNETagProperties::TagProperty::NOPARAMETERS, + GNETagProperties::TagProperty::PLAN_FROM_EDGE | GNETagProperties::TagProperty::PLAN_TO_EDGE | GNETagProperties::TagProperty::CHILD | GNETagProperties::TagProperty::NOPARAMETERS, GUIIcon::PERSONTRIP_FROMTO, SUMO_TAG_PERSONTRIP, TL("PersonTrip: edge->edge"), {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes @@ -4865,7 +4865,7 @@ GNEAttributeCarrier::fillPersonPlanTrips() { // set values of tag myTagProperties[currentTag] = GNETagProperties(currentTag, GNETagProperties::TagType::DEMANDELEMENT | GNETagProperties::TagType::PERSONPLAN | GNETagProperties::TagType::PERSONTRIP, - GNETagProperties::TagProperty::CHILD | GNETagProperties::TagProperty::NOPARAMETERS, + GNETagProperties::TagProperty::PLAN_FROM_EDGE | GNETagProperties::TagProperty::PLAN_TO_TAZ | GNETagProperties::TagProperty::CHILD | GNETagProperties::TagProperty::NOPARAMETERS, GUIIcon::PERSONTRIP_TAZS, SUMO_TAG_PERSONTRIP, TL("PersonTrip: edge->taz"), {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes @@ -4877,7 +4877,7 @@ GNEAttributeCarrier::fillPersonPlanTrips() { // set values of tag myTagProperties[currentTag] = GNETagProperties(currentTag, GNETagProperties::TagType::DEMANDELEMENT | GNETagProperties::TagType::PERSONPLAN | GNETagProperties::TagType::PERSONTRIP, - GNETagProperties::TagProperty::CHILD | GNETagProperties::TagProperty::NOPARAMETERS, + GNETagProperties::TagProperty::PLAN_FROM_EDGE | GNETagProperties::TagProperty::PLAN_TO_BUSSTOP | GNETagProperties::TagProperty::CHILD | GNETagProperties::TagProperty::NOPARAMETERS, GUIIcon::PERSONTRIP_BUSSTOP, SUMO_TAG_PERSONTRIP, TL("PersonTrip: edge->busStop"), {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes @@ -4889,7 +4889,7 @@ GNEAttributeCarrier::fillPersonPlanTrips() { // set values of tag myTagProperties[currentTag] = GNETagProperties(currentTag, GNETagProperties::TagType::DEMANDELEMENT | GNETagProperties::TagType::PERSONPLAN | GNETagProperties::TagType::PERSONTRIP, - GNETagProperties::TagProperty::CHILD | GNETagProperties::TagProperty::NOPARAMETERS, + GNETagProperties::TagProperty::PLAN_FROM_EDGE | GNETagProperties::TagProperty::PLAN_TO_TRAINSTOP | GNETagProperties::TagProperty::CHILD | GNETagProperties::TagProperty::NOPARAMETERS, GUIIcon::PERSONTRIP_TRAINSTOP, SUMO_TAG_PERSONTRIP, TL("PersonTrip: edge->trainStop"), {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes @@ -4901,7 +4901,7 @@ GNEAttributeCarrier::fillPersonPlanTrips() { // set values of tag myTagProperties[currentTag] = GNETagProperties(currentTag, GNETagProperties::TagType::DEMANDELEMENT | GNETagProperties::TagType::PERSONPLAN | GNETagProperties::TagType::PERSONTRIP, - GNETagProperties::TagProperty::CHILD | GNETagProperties::TagProperty::NOPARAMETERS, + GNETagProperties::TagProperty::PLAN_FROM_TAZ | GNETagProperties::TagProperty::PLAN_TO_EDGE | GNETagProperties::TagProperty::CHILD | GNETagProperties::TagProperty::NOPARAMETERS, GUIIcon::PERSONTRIP_FROMTO, SUMO_TAG_PERSONTRIP, TL("PersonTrip: taz->edge"), {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes @@ -4913,7 +4913,7 @@ GNEAttributeCarrier::fillPersonPlanTrips() { // set values of tag myTagProperties[currentTag] = GNETagProperties(currentTag, GNETagProperties::TagType::DEMANDELEMENT | GNETagProperties::TagType::PERSONPLAN | GNETagProperties::TagType::PERSONTRIP, - GNETagProperties::TagProperty::CHILD | GNETagProperties::TagProperty::NOPARAMETERS, + GNETagProperties::TagProperty::PLAN_FROM_TAZ | GNETagProperties::TagProperty::PLAN_TO_TAZ | GNETagProperties::TagProperty::CHILD | GNETagProperties::TagProperty::NOPARAMETERS, GUIIcon::PERSONTRIP_TAZS, SUMO_TAG_PERSONTRIP, TL("PersonTrip: taz->taz"), {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes @@ -4925,7 +4925,7 @@ GNEAttributeCarrier::fillPersonPlanTrips() { // set values of tag myTagProperties[currentTag] = GNETagProperties(currentTag, GNETagProperties::TagType::DEMANDELEMENT | GNETagProperties::TagType::PERSONPLAN | GNETagProperties::TagType::PERSONTRIP, - GNETagProperties::TagProperty::CHILD | GNETagProperties::TagProperty::NOPARAMETERS, + GNETagProperties::TagProperty::PLAN_FROM_TAZ | GNETagProperties::TagProperty::PLAN_TO_BUSSTOP | GNETagProperties::TagProperty::CHILD | GNETagProperties::TagProperty::NOPARAMETERS, GUIIcon::PERSONTRIP_BUSSTOP, SUMO_TAG_PERSONTRIP, TL("PersonTrip: taz->busStop"), {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes @@ -4937,7 +4937,7 @@ GNEAttributeCarrier::fillPersonPlanTrips() { // set values of tag myTagProperties[currentTag] = GNETagProperties(currentTag, GNETagProperties::TagType::DEMANDELEMENT | GNETagProperties::TagType::PERSONPLAN | GNETagProperties::TagType::PERSONTRIP, - GNETagProperties::TagProperty::CHILD | GNETagProperties::TagProperty::NOPARAMETERS, + GNETagProperties::TagProperty::PLAN_FROM_TAZ | GNETagProperties::TagProperty::PLAN_TO_TRAINSTOP | GNETagProperties::TagProperty::CHILD | GNETagProperties::TagProperty::NOPARAMETERS, GUIIcon::PERSONTRIP_TRAINSTOP, SUMO_TAG_PERSONTRIP, TL("PersonTrip: taz->trainStop"), {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes @@ -4949,7 +4949,7 @@ GNEAttributeCarrier::fillPersonPlanTrips() { // set values of tag myTagProperties[currentTag] = GNETagProperties(currentTag, GNETagProperties::TagType::DEMANDELEMENT | GNETagProperties::TagType::PERSONPLAN | GNETagProperties::TagType::PERSONTRIP, - GNETagProperties::TagProperty::CHILD | GNETagProperties::TagProperty::NOPARAMETERS, + GNETagProperties::TagProperty::PLAN_FROM_JUNCTION | GNETagProperties::TagProperty::PLAN_TO_JUNCTION | GNETagProperties::TagProperty::CHILD | GNETagProperties::TagProperty::NOPARAMETERS, GUIIcon::PERSONTRIP_JUNCTIONS, SUMO_TAG_PERSONTRIP, TL("PersonTrip: junction->junction"), {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(253, 255, 206, 255)); // set values of attributes @@ -4969,7 +4969,7 @@ GNEAttributeCarrier::fillPersonPlanWalks() { // set values of tag myTagProperties[currentTag] = GNETagProperties(currentTag, GNETagProperties::TagType::DEMANDELEMENT | GNETagProperties::TagType::PERSONPLAN | GNETagProperties::TagType::WALK, - GNETagProperties::TagProperty::CHILD | GNETagProperties::TagProperty::NOPARAMETERS, + GNETagProperties::TagProperty::PLAN_FROM_EDGE | GNETagProperties::TagProperty::PLAN_TO_EDGE | GNETagProperties::TagProperty::CHILD | GNETagProperties::TagProperty::NOPARAMETERS, GUIIcon::WALK_FROMTO, SUMO_TAG_WALK, TL("walk: edge->edge"), {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(240, 255, 205, 255)); // set values of attributes @@ -4980,7 +4980,7 @@ GNEAttributeCarrier::fillPersonPlanWalks() { // set values of tag myTagProperties[currentTag] = GNETagProperties(currentTag, GNETagProperties::TagType::DEMANDELEMENT | GNETagProperties::TagType::PERSONPLAN | GNETagProperties::TagType::WALK, - GNETagProperties::TagProperty::CHILD | GNETagProperties::TagProperty::NOPARAMETERS, + GNETagProperties::TagProperty::PLAN_FROM_EDGE | GNETagProperties::TagProperty::PLAN_TO_TAZ | GNETagProperties::TagProperty::CHILD | GNETagProperties::TagProperty::NOPARAMETERS, GUIIcon::WALK_TAZS, SUMO_TAG_WALK, TL("walk: edge->taz"), {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(240, 255, 205, 255)); // set values of attributes @@ -4991,7 +4991,7 @@ GNEAttributeCarrier::fillPersonPlanWalks() { // set values of tag myTagProperties[currentTag] = GNETagProperties(currentTag, GNETagProperties::TagType::DEMANDELEMENT | GNETagProperties::TagType::PERSONPLAN | GNETagProperties::TagType::WALK, - GNETagProperties::TagProperty::CHILD | GNETagProperties::TagProperty::NOPARAMETERS, + GNETagProperties::TagProperty::PLAN_FROM_EDGE | GNETagProperties::TagProperty::PLAN_TO_BUSSTOP | GNETagProperties::TagProperty::CHILD | GNETagProperties::TagProperty::NOPARAMETERS, GUIIcon::WALK_BUSSTOP, SUMO_TAG_WALK, TL("walk: edge->busStop"), {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(240, 255, 205, 255)); // set values of attributes @@ -5002,7 +5002,7 @@ GNEAttributeCarrier::fillPersonPlanWalks() { // set values of tag myTagProperties[currentTag] = GNETagProperties(currentTag, GNETagProperties::TagType::DEMANDELEMENT | GNETagProperties::TagType::PERSONPLAN | GNETagProperties::TagType::WALK, - GNETagProperties::TagProperty::CHILD | GNETagProperties::TagProperty::NOPARAMETERS, + GNETagProperties::TagProperty::PLAN_FROM_EDGE | GNETagProperties::TagProperty::PLAN_TO_TRAINSTOP | GNETagProperties::TagProperty::CHILD | GNETagProperties::TagProperty::NOPARAMETERS, GUIIcon::WALK_TRAINSTOP, SUMO_TAG_WALK, TL("walk: edge->trainStop"), {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(240, 255, 205, 255)); // set values of attributes @@ -5013,7 +5013,7 @@ GNEAttributeCarrier::fillPersonPlanWalks() { // set values of tag myTagProperties[currentTag] = GNETagProperties(currentTag, GNETagProperties::TagType::DEMANDELEMENT | GNETagProperties::TagType::PERSONPLAN | GNETagProperties::TagType::WALK, - GNETagProperties::TagProperty::CHILD | GNETagProperties::TagProperty::NOPARAMETERS, + GNETagProperties::TagProperty::PLAN_FROM_TAZ | GNETagProperties::TagProperty::PLAN_TO_EDGE | GNETagProperties::TagProperty::CHILD | GNETagProperties::TagProperty::NOPARAMETERS, GUIIcon::WALK_FROMTO, SUMO_TAG_WALK, TL("walk: taz->edge"), {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(240, 255, 205, 255)); // set values of attributes @@ -5024,7 +5024,7 @@ GNEAttributeCarrier::fillPersonPlanWalks() { // set values of tag myTagProperties[currentTag] = GNETagProperties(currentTag, GNETagProperties::TagType::DEMANDELEMENT | GNETagProperties::TagType::PERSONPLAN | GNETagProperties::TagType::WALK, - GNETagProperties::TagProperty::CHILD | GNETagProperties::TagProperty::NOPARAMETERS, + GNETagProperties::TagProperty::PLAN_FROM_TAZ | GNETagProperties::TagProperty::PLAN_TO_TAZ | GNETagProperties::TagProperty::CHILD | GNETagProperties::TagProperty::NOPARAMETERS, GUIIcon::WALK_TAZS, SUMO_TAG_WALK, TL("walk: taz->taz"), {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(240, 255, 205, 255)); // set values of attributes @@ -5035,7 +5035,7 @@ GNEAttributeCarrier::fillPersonPlanWalks() { // set values of tag myTagProperties[currentTag] = GNETagProperties(currentTag, GNETagProperties::TagType::DEMANDELEMENT | GNETagProperties::TagType::PERSONPLAN | GNETagProperties::TagType::WALK, - GNETagProperties::TagProperty::CHILD | GNETagProperties::TagProperty::NOPARAMETERS, + GNETagProperties::TagProperty::PLAN_FROM_TAZ | GNETagProperties::TagProperty::PLAN_TO_BUSSTOP | GNETagProperties::TagProperty::CHILD | GNETagProperties::TagProperty::NOPARAMETERS, GUIIcon::WALK_BUSSTOP, SUMO_TAG_WALK, TL("walk: taz->busStop"), {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(240, 255, 205, 255)); // set values of attributes @@ -5046,7 +5046,7 @@ GNEAttributeCarrier::fillPersonPlanWalks() { // set values of tag myTagProperties[currentTag] = GNETagProperties(currentTag, GNETagProperties::TagType::DEMANDELEMENT | GNETagProperties::TagType::PERSONPLAN | GNETagProperties::TagType::WALK, - GNETagProperties::TagProperty::CHILD | GNETagProperties::TagProperty::NOPARAMETERS, + GNETagProperties::TagProperty::PLAN_FROM_TAZ | GNETagProperties::TagProperty::PLAN_TO_TRAINSTOP | GNETagProperties::TagProperty::CHILD | GNETagProperties::TagProperty::NOPARAMETERS, GUIIcon::WALK_TRAINSTOP, SUMO_TAG_WALK, TL("walk: taz->trainStop"), {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(240, 255, 205, 255)); // set values of attributes @@ -5057,7 +5057,7 @@ GNEAttributeCarrier::fillPersonPlanWalks() { // set values of tag myTagProperties[currentTag] = GNETagProperties(currentTag, GNETagProperties::TagType::DEMANDELEMENT | GNETagProperties::TagType::PERSONPLAN | GNETagProperties::TagType::WALK, - GNETagProperties::TagProperty::CHILD | GNETagProperties::TagProperty::NOPARAMETERS, + GNETagProperties::TagProperty::PLAN_FROM_JUNCTION | GNETagProperties::TagProperty::PLAN_TO_JUNCTION | GNETagProperties::TagProperty::CHILD | GNETagProperties::TagProperty::NOPARAMETERS, GUIIcon::WALK_JUNCTIONS, SUMO_TAG_WALK, TL("walk: junction->junction"), {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(240, 255, 205, 255)); // set values of attributes @@ -5116,7 +5116,7 @@ GNEAttributeCarrier::fillPersonPlanRides() { // set values of tag myTagProperties[currentTag] = GNETagProperties(currentTag, GNETagProperties::TagType::DEMANDELEMENT | GNETagProperties::TagType::PERSONPLAN | GNETagProperties::TagType::RIDE, - GNETagProperties::TagProperty::CHILD | GNETagProperties::TagProperty::NOPARAMETERS, + GNETagProperties::TagProperty::PLAN_FROM_EDGE | GNETagProperties::TagProperty::PLAN_TO_EDGE | GNETagProperties::TagProperty::CHILD | GNETagProperties::TagProperty::NOPARAMETERS, GUIIcon::RIDE_BUSSTOP, SUMO_TAG_RIDE, TL("ride: edge->edge"), {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(210, 233, 255, 255)); // set values of attributes @@ -5128,7 +5128,7 @@ GNEAttributeCarrier::fillPersonPlanRides() { // set values of tag myTagProperties[currentTag] = GNETagProperties(currentTag, GNETagProperties::TagType::DEMANDELEMENT | GNETagProperties::TagType::PERSONPLAN | GNETagProperties::TagType::RIDE, - GNETagProperties::TagProperty::CHILD | GNETagProperties::TagProperty::NOPARAMETERS, + GNETagProperties::TagProperty::PLAN_FROM_EDGE | GNETagProperties::TagProperty::PLAN_TO_BUSSTOP | GNETagProperties::TagProperty::CHILD | GNETagProperties::TagProperty::NOPARAMETERS, GUIIcon::RIDE_BUSSTOP, SUMO_TAG_RIDE, TL("ride: edge->busStop"), {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(210, 233, 255, 255)); // set values of attributes @@ -5140,7 +5140,7 @@ GNEAttributeCarrier::fillPersonPlanRides() { // set values of tag myTagProperties[currentTag] = GNETagProperties(currentTag, GNETagProperties::TagType::DEMANDELEMENT | GNETagProperties::TagType::PERSONPLAN | GNETagProperties::TagType::RIDE, - GNETagProperties::TagProperty::CHILD | GNETagProperties::TagProperty::NOPARAMETERS, + GNETagProperties::TagProperty::PLAN_FROM_EDGE | GNETagProperties::TagProperty::PLAN_TO_TRAINSTOP | GNETagProperties::TagProperty::CHILD | GNETagProperties::TagProperty::NOPARAMETERS, GUIIcon::RIDE_TRAINSTOP, SUMO_TAG_RIDE, TL("ride: edge->trainStop"), {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(210, 233, 255, 255)); // set values of attributes @@ -5160,7 +5160,7 @@ GNEAttributeCarrier::fillStopPersonElements() { // set values of tag myTagProperties[currentTag] = GNETagProperties(currentTag, GNETagProperties::TagType::DEMANDELEMENT | GNETagProperties::TagType::PERSONPLAN | GNETagProperties::TagType::STOPPERSON, - GNETagProperties::TagProperty::CHILD | GNETagProperties::TagProperty::NOPARAMETERS, + GNETagProperties::TagProperty::PLAN_FROM_EDGE | GNETagProperties::TagProperty::CHILD | GNETagProperties::TagProperty::NOPARAMETERS, GUIIcon::STOPELEMENT, SUMO_TAG_STOP, TL("StopPersonEdge"), {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(255, 213, 213, 255)); @@ -5206,7 +5206,7 @@ GNEAttributeCarrier::fillStopPersonElements() { // set values of tag myTagProperties[currentTag] = GNETagProperties(currentTag, GNETagProperties::TagType::DEMANDELEMENT | GNETagProperties::TagType::PERSONPLAN | GNETagProperties::TagType::STOPPERSON, - GNETagProperties::TagProperty::CHILD | GNETagProperties::TagProperty::NOPARAMETERS, + GNETagProperties::TagProperty::PLAN_FROM_BUSSTOP | GNETagProperties::TagProperty::CHILD | GNETagProperties::TagProperty::NOPARAMETERS, GUIIcon::STOPELEMENT, SUMO_TAG_STOP, TL("StopPersonBusStop"), {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(255, 213, 213, 255)); @@ -5239,7 +5239,7 @@ GNEAttributeCarrier::fillStopPersonElements() { // set values of tag myTagProperties[currentTag] = GNETagProperties(currentTag, GNETagProperties::TagType::DEMANDELEMENT | GNETagProperties::TagType::PERSONPLAN | GNETagProperties::TagType::STOPPERSON, - GNETagProperties::TagProperty::CHILD | GNETagProperties::TagProperty::NOPARAMETERS, + GNETagProperties::TagProperty::PLAN_FROM_TRAINSTOP | GNETagProperties::TagProperty::CHILD | GNETagProperties::TagProperty::NOPARAMETERS, GUIIcon::STOPELEMENT, SUMO_TAG_STOP, TL("StopPersonTrainStop"), {SUMO_TAG_PERSON, SUMO_TAG_PERSONFLOW}, FXRGBA(255, 213, 213, 255));