From 269258c60b392d16a69cd66ebb9e695f8310f91f Mon Sep 17 00:00:00 2001
From: "Egli Adrian (IT-SCI-API-PFI)" <adrian.egli@sbb.ch>
Date: Thu, 13 Jun 2019 09:57:53 +0200
Subject: [PATCH] bug fix
---
flatland/utils/graphics_pil.py | 6 ++----
setup.py | 6 ++++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/flatland/utils/graphics_pil.py b/flatland/utils/graphics_pil.py
index 94dffa4d..7bfc67c1 100644
--- a/flatland/utils/graphics_pil.py
+++ b/flatland/utils/graphics_pil.py
@@ -299,8 +299,7 @@ class PILSVG(PILGL):
self.dBuildings = []
for sFile in dBuildingFiles:
- sPathSvg = "./svg/" + sFile
- img = self.pilFromSvgFile(sPathSvg)
+ img = self.pilFromSvgFile('svg',sFile)
self.dBuildings.append(img)
def loadScenerySVGs(self):
@@ -319,8 +318,7 @@ class PILSVG(PILGL):
}
self.dScenery = []
for sFile in dSceneryFiles:
- sPathSvg = "./svg/" + sFile
- img = self.pilFromSvgFile(sPathSvg)
+ img = self.pilFromSvgFile('svg',sFile)
self.dScenery.append(img)
def loadRailSVGs(self):
diff --git a/setup.py b/setup.py
index 39bffd17..cc4d9ee3 100644
--- a/setup.py
+++ b/setup.py
@@ -64,7 +64,9 @@ def get_all_svg_files(directory='./svg/'):
ret = []
for f in os.listdir(directory):
if f != '__pycache__':
- ret.append(directory + f)
+ if f != "Buildings" and f != "Scenery":
+ ret.append(directory + f)
+ print("install svg:" , ret)
return ret
@@ -103,7 +105,7 @@ setup(
keywords='flatland',
name='flatland-rl',
packages=find_packages('.'),
- data_files=[('svg', get_all_svg_files())],
+ data_files=[('svg', get_all_svg_files()),('svg/Buildings', get_all_svg_files('svg/Buildings/')),('svg/Scenery', get_all_svg_files('svg/Scenery/'))],
setup_requires=setup_requirements,
test_suite='tests',
tests_require=test_requirements,
--
GitLab