Refactor avalon.tools to avoid cross-referencing imports between tools

avalon/tools/contextmanager/app.py

@@ -1,12 +1,11 @@
 import sys
 import logging
 
-import avalon.api as api
-
-from avalon.vendor.Qt import QtWidgets, QtCore
-from avalon.tools.projectmanager.widget import AssetWidget
-from avalon.tools.projectmanager.app import TasksModel
+from ... import api
 
+from ...vendor.Qt import QtWidgets, QtCore
+from ..widgets import AssetWidget
+from ..models import TasksModel
 
 module = sys.modules[__name__]
 module.window = None
@@ -109,7 +108,7 @@ def _get_selected_task_name(self):
 
     def _get_selected_asset_name(self):
         asset_index = self._assets.get_active_index()
-        asset_data = asset_index.data(self._assets.model.NodeRole)
+        asset_data = asset_index.data(self._assets.model.ItemRole)
         if not asset_data or not isinstance(asset_data, dict):
             return
 

avalon/tools/creator/app.py

@@ -139,8 +139,8 @@ def __init__(self, parent=None):
         create_btn.setEnabled(False)
 
     def _on_state_changed(self, state):
-        self.state['valid'] = state
-        self.data['Create Button'].setEnabled(state)
+        self.state["valid"] = state
+        self.data["Create Button"].setEnabled(state)
 
     def _build_menu(self, default_names):
         """Create optional predefined subset names
@@ -311,7 +311,7 @@ def refresh(self):
     def on_create(self):
 
         # Do not allow creation in an invalid state
-        if not self.state['valid']:
+        if not self.state["valid"]:
             return
 
         asset = self.data["Asset"]
@@ -415,7 +415,7 @@ def set_item(self, item):
         """Update elements to display information of a family item.
 
         Args:
-            family (dict): A family item as registered with name, help and icon
+            item (dict): A family item as registered with name, help and icon
 
         Returns:
             None
@@ -445,11 +445,10 @@ def show(debug=False, parent=None):
     """Display asset creator GUI
 
     Arguments:
-        creator (func, optional): Callable function, passed `name`,
-            `family` and `use_selection`, defaults to `creator`
-            defined in :mod:`pipeline`
         debug (bool, optional): Run loader in debug-mode,
             defaults to False
+        parent (QtCore.QObject, optional): When provided parent the interface
+            to this QObject.
 
     """
 

avalon/tools/delegates.py

@@ -0,0 +1,71 @@
+from ..vendor.Qt import QtWidgets, QtCore
+from .. import io
+
+from .models import TreeModel
+
+
+class VersionDelegate(QtWidgets.QStyledItemDelegate):
+    """A delegate that display version integer formatted as version string."""
+
+    version_changed = QtCore.Signal()
+    first_run = False
+    lock = False
+
+    def _format_version(self, value):
+        """Formats integer to displayable version name"""
+        return "v{0:03d}".format(value)
+
+    def displayText(self, value, locale):
+        assert isinstance(value, int), "Version is not `int`"
+        return self._format_version(value)
+
+    def createEditor(self, parent, option, index):
+        item = index.data(TreeModel.ItemRole)
+        if item.get("isGroup"):
+            return
+
+        editor = QtWidgets.QComboBox(parent)
+
+        def commit_data():
+            if not self.first_run:
+                self.commitData.emit(editor)  # Update model data
+                self.version_changed.emit()   # Display model data
+        editor.currentIndexChanged.connect(commit_data)
+
+        self.first_run = True
+        self.lock = False
+
+        return editor
+
+    def setEditorData(self, editor, index):
+        if self.lock:
+            # Only set editor data once per delegation
+            return
+
+        editor.clear()
+
+        # Current value of the index
+        value = index.data(QtCore.Qt.DisplayRole)
+        assert isinstance(value, int), "Version is not `int`"
+
+        # Add all available versions to the editor
+        item = index.data(TreeModel.ItemRole)
+        parent_id = item["version_document"]["parent"]
+        versions = io.find({"type": "version", "parent": parent_id},
+                           sort=[("name", 1)])
+        index = 0
+        for i, version in enumerate(versions):
+            label = self._format_version(version["name"])
+            editor.addItem(label, userData=version)
+
+            if version["name"] == value:
+                index = i
+
+        editor.setCurrentIndex(index)  # Will trigger index-change signal
+        self.first_run = False
+        self.lock = True
+
+    def setModelData(self, editor, model, index):
+        """Apply the integer version back in the model"""
+        version = editor.itemData(editor.currentIndex())
+        model.setData(index, version["name"])