From 7696fbd2de0ddb239f9d257da4def93478580fb2 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Fri, 17 Sep 2021 16:21:43 +0200 Subject: [PATCH] pass refreshed to subset widget --- openpype/tools/loader/app.py | 17 +++++++---------- openpype/tools/loader/widgets.py | 2 ++ 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/openpype/tools/loader/app.py b/openpype/tools/loader/app.py index 4beebe43b8..5cb0bf41a9 100644 --- a/openpype/tools/loader/app.py +++ b/openpype/tools/loader/app.py @@ -146,6 +146,7 @@ class LoaderWidow(QtWidgets.QDialog): assets.view.clicked.connect(self.on_assetview_click) subsets.active_changed.connect(self.on_subsetschanged) subsets.version_changed.connect(self.on_versionschanged) + subsets.refreshed.connect(self._on_subset_refresh) subsets.load_started.connect(self._on_load_start) subsets.load_ended.connect(self._on_load_end) @@ -215,6 +216,12 @@ class LoaderWidow(QtWidgets.QDialog): def _hide_overlay(self): self._overlay_frame.setVisible(False) + def _on_subset_refresh(self, has_item): + subsets_widget = self.data["widgets"]["subsets"] + familis_widget = self.data["widgets"]["families"] + + subsets_widget.set_loading_state(loading=False, empty=not has_item) + def _on_load_end(self): # Delay hiding as click events happened during loading should be # blocked @@ -264,8 +271,6 @@ class LoaderWidow(QtWidgets.QDialog): def _assetschanged(self): """Selected assets have changed""" - t1 = time.time() - assets_widget = self.data["widgets"]["assets"] subsets_widget = self.data["widgets"]["subsets"] subsets_model = subsets_widget.model @@ -283,14 +288,6 @@ class LoaderWidow(QtWidgets.QDialog): empty=True ) - def on_refreshed(has_item): - empty = not has_item - subsets_widget.set_loading_state(loading=False, empty=empty) - subsets_model.refreshed.disconnect() - self.echo("Duration: %.3fs" % (time.time() - t1)) - - subsets_model.refreshed.connect(on_refreshed) - subsets_model.set_assets(asset_ids) subsets_widget.view.setColumnHidden( subsets_model.Columns.index("asset"), diff --git a/openpype/tools/loader/widgets.py b/openpype/tools/loader/widgets.py index 0c61db2623..5a04cbac8f 100644 --- a/openpype/tools/loader/widgets.py +++ b/openpype/tools/loader/widgets.py @@ -122,6 +122,7 @@ class SubsetWidget(QtWidgets.QWidget): version_changed = QtCore.Signal() # version state changed for a subset load_started = QtCore.Signal() load_ended = QtCore.Signal() + refreshed = QtCore.Signal(bool) default_widths = ( ("subset", 200), @@ -242,6 +243,7 @@ class SubsetWidget(QtWidgets.QWidget): self.filter.textChanged.connect(self.proxy.setFilterRegExp) self.filter.textChanged.connect(self.view.expandAll) + model.refreshed.connect(self.refreshed) self.model.refresh()