Skip to content

Commit

Permalink
Merge pull request #877 from opengisch/signal
Browse files Browse the repository at this point in the history
Wait for model refresh on local repository topping receive
  • Loading branch information
signedav authored Mar 8, 2024
2 parents b022e82 + 6840f3f commit 2f0fa4b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
8 changes: 5 additions & 3 deletions QgisModelBaker/gui/workflow_wizard/workflow_wizard.py
Original file line number Diff line number Diff line change
Expand Up @@ -589,7 +589,9 @@ def get_topping_file_model(self, id_list):

# 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())
Expand All @@ -598,8 +600,8 @@ def get_topping_file_model(self, id_list):
topping_file_cache.refresh()
self.log_panel.print_info(self.tr("- - Downloading…"), LogColor.COLOR_TOPPING)

if len(topping_file_cache.downloaded_files) != len(id_list):
loop.exec()
# we wait for the download_finished_and_model_fresh signal, because even when the files are local, it should only continue when both is ready
loop.exec()

if len(topping_file_cache.downloaded_files) == len(id_list):
self.log_panel.print_info(
Expand Down
2 changes: 1 addition & 1 deletion scripts/package_pip_packages.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
LIBS_DIR="QgisModelBaker/libs"

MODELBAKER_LIBRARY=("modelbaker" "1.7.0")
MODELBAKER_LIBRARY=("modelbaker" "1.7.1")
PACKAGING=("packaging" "21.3")

PACKAGES=(
Expand Down

0 comments on commit 2f0fa4b

Please sign in to comment.