temporary icons. refs #14646

eclipse-sumo · Apr 2, 2024 · 6e8ce57 · 6e8ce57
1 parent ebdb52e
commit 6e8ce57
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 1 deletion.
diff --git a/src/netedit/dialogs/GNEAllowVClassesDialog.cpp b/src/netedit/dialogs/GNEAllowVClassesDialog.cpp
@@ -268,6 +268,12 @@ GNEAllowVClassesDialog::constructor() {
     buildVClass(myContentRightFrame, SVC_AUTHORITY, GUIIcon::VCLASS_AUTHORITY, TL("Vehicle of a governmental security agency"));
     buildVClass(myContentRightFrame, SVC_VIP, GUIIcon::VCLASS_VIP, TL("A civilian security armored car used by VIPs"));
     buildVClass(myContentRightFrame, SVC_HOV, GUIIcon::VCLASS_HOV, TL("High-Occupancy Vehicle (two or more passengers)"));
+    buildVClass(myContentRightFrame, SVC_CONTAINER, GUIIcon::VCLASS_CUSTOM1, TL("A transport container"));
+    buildVClass(myContentRightFrame, SVC_CABLE_CAR, GUIIcon::VCLASS_CUSTOM1, TL("A conveyance suspended on a cable"));
+    buildVClass(myContentRightFrame, SVC_SUBWAY, GUIIcon::VCLASS_CUSTOM1, TL("A railway that mostly runs underground"));
+    buildVClass(myContentRightFrame, SVC_AIRCRAFT, GUIIcon::VCLASS_CUSTOM1, TL("A airplane"));
+    buildVClass(myContentRightFrame, SVC_WHEELCHAIR, GUIIcon::VCLASS_CUSTOM1, TL("A mobility impaired person"));
+    buildVClass(myContentRightFrame, SVC_DRONE, GUIIcon::VCLASS_CUSTOM1, TL("A small unmanned robot"));
     buildVClass(myContentRightFrame, SVC_CUSTOM1, GUIIcon::VCLASS_CUSTOM1, TL("Reserved for user-defined semantics"));
     buildVClass(myContentRightFrame, SVC_CUSTOM2, GUIIcon::VCLASS_CUSTOM2, TL("Reserved for user-defined semantics"));
     // create dialog buttons bot centered

diff --git a/src/netedit/dialogs/GNEVehicleTypeDialog.cpp b/src/netedit/dialogs/GNEVehicleTypeDialog.cpp
@@ -243,6 +243,24 @@ GNEVehicleTypeDialog::VTypeAttributes::VClassRow::setVClassLabelImage() {
             case SVC_SHIP:
                 myComboBoxVClassLabelImage->setIcon(GUIIconSubSys::getIcon(GUIIcon::VCLASS_SHIP));
                 break;
+            case SVC_CONTAINER:
+                myComboBoxVClassLabelImage->setIcon(GUIIconSubSys::getIcon(GUIIcon::VCLASS_CUSTOM1));
+                break;
+            case SVC_CABLE_CAR:
+                myComboBoxVClassLabelImage->setIcon(GUIIconSubSys::getIcon(GUIIcon::VCLASS_CUSTOM1));
+                break;
+            case SVC_SUBWAY:
+                myComboBoxVClassLabelImage->setIcon(GUIIconSubSys::getIcon(GUIIcon::VCLASS_CUSTOM1));
+                break;
+            case SVC_AIRCRAFT:
+                myComboBoxVClassLabelImage->setIcon(GUIIconSubSys::getIcon(GUIIcon::VCLASS_CUSTOM1));
+                break;
+            case SVC_WHEELCHAIR:
+                myComboBoxVClassLabelImage->setIcon(GUIIconSubSys::getIcon(GUIIcon::VCLASS_CUSTOM1));
+                break;
+            case SVC_DRONE:
+                myComboBoxVClassLabelImage->setIcon(GUIIconSubSys::getIcon(GUIIcon::VCLASS_CUSTOM1));
+                break;
             case SVC_CUSTOM1:
                 myComboBoxVClassLabelImage->setIcon(GUIIconSubSys::getIcon(GUIIcon::VCLASS_CUSTOM1));
                 break;

diff --git a/src/utils/gui/images/VClassIcons.cpp b/src/utils/gui/images/VClassIcons.cpp
@@ -83,7 +83,19 @@ VClassIcons::getVClassIcon(const SUMOVehicleClass vc) {
         case SVC_RAIL_FAST:
             return GUIIconSubSys::getIcon(GUIIcon::VCLASS_SMALL_RAIL_FAST);
         case SVC_SHIP:
-            return GUIIconSubSys::getIcon(GUIIcon::VCLASS_SMALL_SHIP);
+            return GUIIconSubSys::getIcon(GUIIcon::VCLASS_SMALL_CUSTOM1);
+        case SVC_CONTAINER:
+            return GUIIconSubSys::getIcon(GUIIcon::VCLASS_SMALL_CUSTOM1);
+        case SVC_CABLE_CAR:
+            return GUIIconSubSys::getIcon(GUIIcon::VCLASS_SMALL_CUSTOM1);
+        case SVC_SUBWAY:
+            return GUIIconSubSys::getIcon(GUIIcon::VCLASS_SMALL_CUSTOM1);
+        case SVC_AIRCRAFT:
+            return GUIIconSubSys::getIcon(GUIIcon::VCLASS_SMALL_CUSTOM1);
+        case SVC_WHEELCHAIR:
+            return GUIIconSubSys::getIcon(GUIIcon::VCLASS_SMALL_CUSTOM1);
+        case SVC_DRONE:
+            return GUIIconSubSys::getIcon(GUIIcon::VCLASS_SMALL_CUSTOM1);
         case SVC_CUSTOM1:
             return GUIIconSubSys::getIcon(GUIIcon::VCLASS_SMALL_CUSTOM1);
         case SVC_CUSTOM2: