Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Wait for model refresh on local repository topping receive #877

Merged
merged 2 commits into from
Mar 8, 2024
Merged

Wait for model refresh on local repository topping receive #877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce360b7
wait for the signal even when the files are already there (because of…
signedav Feb 8, 2024
6840f3f
bump modelbaker to 1.7.1
signedav Feb 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions QgisModelBaker/gui/workflow_wizard/workflow_wizard.py
View file
Open in desktop
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
View file
Open in desktop
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
Loading