Merge pull request #2185 from pypeclub/bugfix/usage_of_avalon_tools_code

Usage of tools code

openpype/hosts/houdini/api/usd.py

@@ -4,8 +4,8 @@ import contextlib
 
 import logging
 from Qt import QtCore, QtGui
-from avalon.tools.widgets import AssetWidget
-from avalon import style
+from openpype.tools.utils.widgets import AssetWidget
+from avalon import style, io
 
 from pxr import Sdf
 
@@ -31,7 +31,7 @@ def pick_asset(node):
     # Construct the AssetWidget as a frameless popup so it automatically
     # closes when clicked outside of it.
     global tool
-    tool = AssetWidget(silo_creatable=False)
+    tool = AssetWidget(io)
     tool.setContentsMargins(5, 5, 5, 5)
     tool.setWindowTitle("Pick Asset")
     tool.setStyleSheet(style.load_stylesheet())
@@ -41,8 +41,6 @@ def pick_asset(node):
     # Select the current asset if there is any
     name = parm.eval()
     if name:
-        from avalon import io
-
         db_asset = io.find_one({"name": name, "type": "asset"})
         if db_asset:
             silo = db_asset.get("silo")

openpype/hosts/maya/api/__init__.py

@@ -275,8 +275,7 @@ def on_open(_):
 
             # Show outdated pop-up
             def _on_show_inventory():
-                import avalon.tools.sceneinventory as tool
-                tool.show(parent=parent)
+                host_tools.show_scene_inventory(parent=parent)
 
             dialog = popup.Popup(parent=parent)
             dialog.setWindowTitle("Maya scene has outdated content")

openpype/plugins/publish/validate_containers.py

@@ -9,9 +9,9 @@ class ShowInventory(pyblish.api.Action):
     on = "failed"
 
     def process(self, context, plugin):
-        from avalon.tools import sceneinventory
+        from openpype.tools.utils import host_tools
 
-        sceneinventory.show()
+        host_tools.show_scene_inventory()
 
 
 class ValidateContainers(pyblish.api.ContextPlugin):

openpype/tools/launcher/window.py

@@ -8,8 +8,7 @@ from avalon.api import AvalonMongoDB
 from openpype import style
 from openpype.api import resources
 
-from avalon.tools import lib as tools_lib
-from avalon.tools.widgets import AssetWidget
+from openpype.tools.utils.widgets import AssetWidget
 from avalon.vendor import qtawesome
 from .models import ProjectModel
 from .lib import get_action_label, ProjectHandler

openpype/tools/pyblish_pype/control.py

@@ -7,7 +7,6 @@ an active window manager; such as via Travis-CI.
 """
 import os
 import sys
-import traceback
 import inspect
 import logging
 

openpype/tools/utils/lib.py

@@ -35,26 +35,6 @@ def application():
         yield app
 
 
-def defer(delay, func):
-    """Append artificial delay to `func`
-
-    This aids in keeping the GUI responsive, but complicates logic
-    when producing tests. To combat this, the environment variable ensures
-    that every operation is synchonous.
-
-    Arguments:
-        delay (float): Delay multiplier; default 1, 0 means no delay
-        func (callable): Any callable
-
-    """
-
-    delay *= float(os.getenv("PYBLISH_DELAY", 1))
-    if delay > 0:
-        return QtCore.QTimer.singleShot(delay, func)
-    else:
-        return func()
-
-
 class SharedObjects:
     jobs = {}
 
@@ -82,18 +62,6 @@ def schedule(func, time, channel="default"):
     SharedObjects.jobs[channel] = timer
 
 
-@contextlib.contextmanager
-def dummy():
-    """Dummy context manager
-
-    Usage:
-        >> with some_context() if False else dummy():
-        ..   pass
-
-    """
-    yield
-
-
 def iter_model_rows(model, column, include_root=False):
     """Iterate over all row indices in a model"""
     indices = [QtCore.QModelIndex()]  # start iteration at root
@@ -111,76 +79,6 @@ def iter_model_rows(model, column, include_root=False):
         yield index
 
 
-@contextlib.contextmanager
-def preserve_states(tree_view,
-                    column=0,
-                    role=None,
-                    preserve_expanded=True,
-                    preserve_selection=True,
-                    expanded_role=QtCore.Qt.DisplayRole,
-                    selection_role=QtCore.Qt.DisplayRole):
-    """Preserves row selection in QTreeView by column's data role.
-    This function is created to maintain the selection status of
-    the model items. When refresh is triggered the items which are expanded
-    will stay expanded and vise versa.
-        tree_view (QWidgets.QTreeView): the tree view nested in the application
-        column (int): the column to retrieve the data from
-        role (int): the role which dictates what will be returned
-    Returns:
-        None
-    """
-    # When `role` is set then override both expanded and selection roles
-    if role:
-        expanded_role = role
-        selection_role = role
-
-    model = tree_view.model()
-    selection_model = tree_view.selectionModel()
-    flags = selection_model.Select | selection_model.Rows
-
-    expanded = set()
-
-    if preserve_expanded:
-        for index in iter_model_rows(
-            model, column=column, include_root=False
-        ):
-            if tree_view.isExpanded(index):
-                value = index.data(expanded_role)
-                expanded.add(value)
-
-    selected = None
-
-    if preserve_selection:
-        selected_rows = selection_model.selectedRows()
-        if selected_rows:
-            selected = set(row.data(selection_role) for row in selected_rows)
-
-    try:
-        yield
-    finally:
-        if expanded:
-            for index in iter_model_rows(
-                model, column=0, include_root=False
-            ):
-                value = index.data(expanded_role)
-                is_expanded = value in expanded
-                # skip if new index was created meanwhile
-                if is_expanded is None:
-                    continue
-                tree_view.setExpanded(index, is_expanded)
-
-        if selected:
-            # Go through all indices, select the ones with similar data
-            for index in iter_model_rows(
-                model, column=column, include_root=False
-            ):
-                value = index.data(selection_role)
-                state = value in selected
-                if state:
-                    tree_view.scrollTo(index)  # Ensure item is visible
-                    selection_model.select(index, flags)
-
-
 @contextlib.contextmanager
 def preserve_expanded_rows(tree_view, column=0, role=None):
     """Preserves expanded row in QTreeView by column's data role.