From 5127b63d914220d6648deca41a39cba413f0a9d6 Mon Sep 17 00:00:00 2001 From: Guillermo Date: Mon, 2 Aug 2021 16:24:37 +0200 Subject: [PATCH] Fixed issues with new map.name --- PythonAPI/examples/automatic_control.py | 2 +- PythonAPI/examples/manual_control_carsim.py | 10 ++-------- PythonAPI/examples/manual_control_chrono.py | 7 +------ PythonAPI/examples/no_rendering_mode.py | 2 +- 4 files changed, 5 insertions(+), 16 deletions(-) diff --git a/PythonAPI/examples/automatic_control.py b/PythonAPI/examples/automatic_control.py index 5cb5ca5a6..5501fcfe9 100755 --- a/PythonAPI/examples/automatic_control.py +++ b/PythonAPI/examples/automatic_control.py @@ -284,7 +284,7 @@ class HUD(object): 'Client: % 16.0f FPS' % clock.get_fps(), '', 'Vehicle: % 20s' % get_actor_display_name(world.player, truncate=20), - 'Map: % 20s' % world.map.name, + 'Map: % 20s' % world.map.name.split('/')[-1], 'Simulation time: % 12s' % datetime.timedelta(seconds=int(self.simulation_time)), '', 'Speed: % 15.0f km/h' % (3.6 * math.sqrt(vel.x**2 + vel.y**2 + vel.z**2)), diff --git a/PythonAPI/examples/manual_control_carsim.py b/PythonAPI/examples/manual_control_carsim.py index d10b83e70..ba4ca561a 100644 --- a/PythonAPI/examples/manual_control_carsim.py +++ b/PythonAPI/examples/manual_control_carsim.py @@ -63,13 +63,7 @@ import glob import os import sys -try: - # sys.path.append(glob.glob('../carla/dist/carla-*%d.%d-%s.egg' % ( - print(os.path.abspath(__file__)) - print(os.path.dirname(os.path.abspath(__file__))) - sys.path.append(glob.glob(os.path.dirname(os.path.dirname(os.path.abspath(__file__))) + '/carla/dist/carla-*%d.%d-%s.egg' % ( - # sys.path.append(glob.glob(os.path.dirname(os.path.abspath(__file__)) + '/dist/carla-*%d.%d-%s.egg' % ( - # sys.path.append(glob.glob(os.path.dirname(os.path.abspath(__file__)) + '/../carla/dist/carla-*%d.%d-%s.egg' % ( +try:sys.path.append(glob.glob(os.path.dirname(os.path.dirname(os.path.abspath(__file__))) + '/carla/dist/carla-*%d.%d-%s.egg' % ( sys.version_info.major, sys.version_info.minor, 'win-amd64' if os.name == 'nt' else 'linux-x86_64'))[0]) @@ -608,7 +602,7 @@ class HUD(object): 'Client: % 16.0f FPS' % clock.get_fps(), '', 'Vehicle: % 20s' % get_actor_display_name(world.player, truncate=20), - 'Map: % 20s' % world.map.name, + 'Map: % 20s' % world.map.name.split('/')[-1], 'Simulation time: % 12s' % datetime.timedelta(seconds=int(self.simulation_time)), '', 'Speed: % 15.0f km/h' % (3.6 * math.sqrt(v.x**2 + v.y**2 + v.z**2)), diff --git a/PythonAPI/examples/manual_control_chrono.py b/PythonAPI/examples/manual_control_chrono.py index e557d2699..52058fa12 100644 --- a/PythonAPI/examples/manual_control_chrono.py +++ b/PythonAPI/examples/manual_control_chrono.py @@ -64,12 +64,7 @@ import os import sys try: - # sys.path.append(glob.glob('../carla/dist/carla-*%d.%d-%s.egg' % ( - print(os.path.abspath(__file__)) - print(os.path.dirname(os.path.abspath(__file__))) sys.path.append(glob.glob(os.path.dirname(os.path.dirname(os.path.abspath(__file__))) + '/carla/dist/carla-*%d.%d-%s.egg' % ( - # sys.path.append(glob.glob(os.path.dirname(os.path.abspath(__file__)) + '/dist/carla-*%d.%d-%s.egg' % ( - # sys.path.append(glob.glob(os.path.dirname(os.path.abspath(__file__)) + '/../carla/dist/carla-*%d.%d-%s.egg' % ( sys.version_info.major, sys.version_info.minor, 'win-amd64' if os.name == 'nt' else 'linux-x86_64'))[0]) @@ -616,7 +611,7 @@ class HUD(object): 'Client: % 16.0f FPS' % clock.get_fps(), '', 'Vehicle: % 20s' % get_actor_display_name(world.player, truncate=20), - 'Map: % 20s' % world.map.name, + 'Map: % 20s' % world.map.name.split('/')[-1], 'Simulation time: % 12s' % datetime.timedelta(seconds=int(self.simulation_time)), '', 'Speed: % 15.0f km/h' % (3.6 * math.sqrt(v.x**2 + v.y**2 + v.z**2)), diff --git a/PythonAPI/examples/no_rendering_mode.py b/PythonAPI/examples/no_rendering_mode.py index eb7d6abb6..075290411 100755 --- a/PythonAPI/examples/no_rendering_mode.py +++ b/PythonAPI/examples/no_rendering_mode.py @@ -470,7 +470,7 @@ class MapImage(object): opendrive_hash = str(hash_func.hexdigest()) # Build path for saving or loading the cached rendered map - filename = carla_map.name + "_" + opendrive_hash + ".tga" + filename = carla_map.name.split('/')[-1] + "_" + opendrive_hash + ".tga" dirname = os.path.join("cache", "no_rendering_mode") full_path = str(os.path.join(dirname, filename))