Unverified Commit aabefe6b authored by Julien Veyssier's avatar Julien Veyssier
Browse files

fix layer labels, delete topologie* before step4


Signed-off-by: default avatarJulien Veyssier <eneiluj@posteo.net>
parent 466312a0
Subproject commit ac9763701aa22e70e110b4d207af7bb96bfc853f
Subproject commit aa544b714214402ba57a1c3f0d621e9fe4c5cd36
......@@ -905,16 +905,16 @@ class HruDelinDockWidget(QtWidgets.QDockWidget, FORM_CLASS):
strPath = str(fPath)
task.displayLayer.emit({
'type': 'raster',
'path': strPath.replace('step1_', ''),
'name': os.path.basename(strPath),
'path': strPath,
'name': os.path.basename(strPath).replace('step1_', ''),
'tag': 'step1'
})
for fPath in Path(self.cfgFilesOutPath).rglob('*step1*.shp'):
strPath = str(fPath)
task.displayLayer.emit({
'type': 'vector',
'path': strPath.replace('step1_', ''),
'name': os.path.basename(strPath),
'path': strPath,
'name': os.path.basename(strPath).replace('step1_', ''),
'tag': 'step1'
})
......@@ -941,16 +941,16 @@ class HruDelinDockWidget(QtWidgets.QDockWidget, FORM_CLASS):
strPath = str(fPath)
task.displayLayer.emit({
'type': 'raster',
'path': strPath.replace('step2_', ''),
'name': os.path.basename(strPath),
'path': strPath,
'name': os.path.basename(strPath).replace('step2_', ''),
'tag': 'step2'
})
for fPath in Path(self.cfgFilesOutPath).rglob('*step2*.shp'):
strPath = str(fPath)
task.displayLayer.emit({
'type': 'vector',
'path': strPath.replace('step2_', ''),
'name': os.path.basename(strPath),
'path': strPath,
'name': os.path.basename(strPath).replace('step2_', ''),
'tag': 'step2'
})
......@@ -975,16 +975,16 @@ class HruDelinDockWidget(QtWidgets.QDockWidget, FORM_CLASS):
strPath = str(fPath)
task.displayLayer.emit({
'type': 'raster',
'path': strPath.replace('step3_', ''),
'name': os.path.basename(strPath),
'path': strPath,
'name': os.path.basename(strPath).replace('step3_', ''),
'tag': 'step3'
})
for fPath in Path(self.cfgFilesOutPath).rglob('*step3*.shp'):
strPath = str(fPath)
task.displayLayer.emit({
'type': 'vector',
'path': strPath.replace('step3_', ''),
'name': os.path.basename(strPath),
'path': strPath,
'name': os.path.basename(strPath).replace('step3_', ''),
'tag': 'step3'
})
......@@ -997,6 +997,9 @@ class HruDelinDockWidget(QtWidgets.QDockWidget, FORM_CLASS):
shutil.rmtree(self.cfgResultsOutPath)
os.mkdir(self.cfgResultsOutPath)
for fPath in Path(os.path.join(self.projectFileDir, 'tmp')).rglob('topolog*'):
os.remove(str(fPath))
# run the mzfc
for progress in main4(self.projectFilePath, cpu_count(), True):
task.setProgress(progress)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment