diff --git a/flatland/utils/graphics_pil.py b/flatland/utils/graphics_pil.py index 94dffa4d13c29a4e235649c85e8c5f2729754a9a..7bfc67c1a2f19c31a73a5c41dde0c8645649ed60 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 39bffd173a000a1fa40018cc5b856c9a26e2e253..cc4d9ee348065f633692a139feb21557009e7c38 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,