renaming

VTTI-CSM · Jul 24, 2023 · 51c7781 · 51c7781
1 parent 5e47fc4
commit 51c7781
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/NeTrainSim/traindefinition/traintypes.h b/src/NeTrainSim/traindefinition/traintypes.h
@@ -81,7 +81,7 @@ namespace TrainTypes {
     /** The car type map */
     static const std::map<std::string, CarType> carTypeMap = {
     {"Cargo Car", CarType::cargo},
-    {"Fuel Tank", CarType::dieselTender},
+    {"Diesel Tender", CarType::dieselTender},
     {"Battery Tender", CarType::batteryTender},
     {"Hydrogen Tender", CarType::hydrogenFuelCell},
     {"Biodiesel Tender", CarType::biodieselTender}
@@ -247,7 +247,7 @@ namespace TrainTypes {
     "Diesel Locomotive",
     "Electric Locomotive",
     "Biodiesel Locomotive",
-    "Diesel-Electric Locomotive",
+    "Diesel-Battery Locomotive",
     "Diesel-Hybrid Locomotive",
     "Hydrogen-Hybrid Locomotive",
     "Biodiesel-Hybrid Locomotive"
@@ -269,7 +269,7 @@ namespace TrainTypes {
     {"Diesel Locomotive", PowerType::diesel},
     {"Electric Locomotive", PowerType::electric},
     {"Biodiesel Locomotive", PowerType::biodiesel},
-    {"Diesel-Electric Locomotive", PowerType::dieselElectric},
+    {"Diesel-Battery Locomotive", PowerType::dieselElectric},
     {"Diesel-Hyprid Locomotive", PowerType::dieselHybrid},
     {"Hydrogen-Hyprid Locomotive", PowerType::hydrogenHybrid},
     {"biodiesel-Hyprid Locomotive", PowerType::biodieselHybrid}

diff --git a/src/NeTrainSimGUI/gui/netrainsimmainwindow.ui b/src/NeTrainSimGUI/gui/netrainsimmainwindow.ui
@@ -1056,7 +1056,7 @@
                      <item>
                       <widget class="QLabel" name="label_14">
                        <property name="text">
-                        <string>Train Cars:</string>
+                        <string>Train Vehicles:</string>
                        </property>
                       </widget>
                      </item>
@@ -1839,7 +1839,7 @@
      <x>0</x>
      <y>0</y>
      <width>1318</width>
-     <height>25</height>
+     <height>21</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuNeTrainSim">