From 77639681ec5b26ba92598c989fba317aebed4a74 Mon Sep 17 00:00:00 2001 From: signedav Date: Fri, 9 Feb 2024 10:28:36 +0100 Subject: [PATCH] change signalname because it's triggered when downloaded and model ready --- modelbaker/iliwrapper/ilicache.py | 5 +++-- tests/test_projectgen.py | 4 +++- tests/test_projecttopping.py | 4 +++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/modelbaker/iliwrapper/ilicache.py b/modelbaker/iliwrapper/ilicache.py index b08c09c..67e2430 100644 --- a/modelbaker/iliwrapper/ilicache.py +++ b/modelbaker/iliwrapper/ilicache.py @@ -835,7 +835,7 @@ def drawDisplay(self, painter, option, rect, text): class IliToppingFileCache(IliDataCache): - download_finished = pyqtSignal() + download_finished_and_model_fresh = pyqtSignal() """ meta_netloc is the repository (netloc) of the metaconfiguration file used for file paths in the file_ids file_ids can contain ilidata: or file: information @@ -904,8 +904,9 @@ def on_download_status(self, dataset_id): # here we could add some more logic if dataset_id is not None: self.downloaded_files.append(dataset_id) + # ensure all the files are downloaded and contained in the model if len(self.downloaded_files) == len(self.file_ids) == self.model.rowCount(): - self.download_finished.emit() + self.download_finished_and_model_fresh.emit() def _process_informationfile(self, file, netloc, url): """ diff --git a/tests/test_projectgen.py b/tests/test_projectgen.py index 72f847f..553ecd2 100644 --- a/tests/test_projectgen.py +++ b/tests/test_projectgen.py @@ -4259,7 +4259,9 @@ def get_topping_file_model(self, base_config, id_list, tool_dir=None): # we wait for the download or we timeout after 30 seconds and we apply what we have loop = QEventLoop() - topping_file_cache.download_finished.connect(lambda: loop.quit()) + topping_file_cache.download_finished_and_model_fresh.connect( + lambda: loop.quit() + ) timer = QTimer() timer.setSingleShot(True) timer.timeout.connect(lambda: loop.quit()) diff --git a/tests/test_projecttopping.py b/tests/test_projecttopping.py index 9ce1bbe..46f1afe 100644 --- a/tests/test_projecttopping.py +++ b/tests/test_projecttopping.py @@ -1238,7 +1238,9 @@ def get_topping_file_model(self, base_config, id_list, tool_dir=None): # we wait for the download or we timeout after 30 seconds and we apply what we have loop = QEventLoop() - topping_file_cache.download_finished.connect(lambda: loop.quit()) + topping_file_cache.download_finished_and_model_fresh.connect( + lambda: loop.quit() + ) timer = QTimer() timer.setSingleShot(True) timer.timeout.connect(lambda: loop.quit())