mirror of
https://github.com/ynput/ayon-core.git
synced 2026-01-02 08:54:53 +01:00
implemented basic concept of 2 views
This commit is contained in:
iLLiCiTiT
parent
ce5126092f
commit
65671f49d3
2 changed files with 200 additions and 54 deletions
|
|
@ -827,9 +827,26 @@ class InstanceCardWidget(QtWidgets.QWidget):
|
|||
self._set_expanded()
|
||||
|
||||
|
||||
class InstanceCardView(QtWidgets.QWidget):
|
||||
class _AbstractInstanceView(QtWidgets.QWidget):
|
||||
selection_changed = QtCore.Signal()
|
||||
|
||||
def refresh(self):
|
||||
raise NotImplementedError((
|
||||
"{} Method 'refresh' is not implemented."
|
||||
).format(self.__class__.__name__))
|
||||
|
||||
def get_selected_instances(self):
|
||||
raise NotImplementedError((
|
||||
"{} Method 'get_selected_instances' is not implemented."
|
||||
).format(self.__class__.__name__))
|
||||
|
||||
def set_selected_instances(self, instances):
|
||||
raise NotImplementedError((
|
||||
"{} Method 'set_selected_instances' is not implemented."
|
||||
).format(self.__class__.__name__))
|
||||
|
||||
|
||||
class InstanceCardView(_AbstractInstanceView):
|
||||
def __init__(self, controller, parent):
|
||||
super(InstanceCardView, self).__init__(parent)
|
||||
|
||||
|
|
@ -912,3 +929,125 @@ class InstanceCardView(QtWidgets.QWidget):
|
|||
if widget:
|
||||
instances.append(widget.instance)
|
||||
return instances
|
||||
|
||||
def set_selected_instances(self, instances):
|
||||
indexes = []
|
||||
model = self.list_widget.model()
|
||||
for instance in instances:
|
||||
instance_id = instance.data["uuid"]
|
||||
item = self._items_by_id.get(instance_id)
|
||||
if item:
|
||||
row = self.list_widget.row(item)
|
||||
index = model.index(row, 0)
|
||||
indexes.append(index)
|
||||
|
||||
selection_model = self.list_widget.selectionModel()
|
||||
first_item = True
|
||||
for index in indexes:
|
||||
if first_item:
|
||||
first_item = False
|
||||
select_type = QtCore.QItemSelectionModel.SelectCurrent
|
||||
else:
|
||||
select_type = QtCore.QItemSelectionModel.Select
|
||||
selection_model.select(index, select_type)
|
||||
|
||||
|
||||
class InstanceListView(_AbstractInstanceView):
|
||||
def __init__(self, controller, parent):
|
||||
super(InstanceListView, self).__init__(parent)
|
||||
|
||||
self.controller = controller
|
||||
|
||||
instance_view = QtWidgets.QTreeView(self)
|
||||
instance_view.setHeaderHidden(True)
|
||||
instance_view.setIndentation(0)
|
||||
instance_view.setSelectionMode(
|
||||
QtWidgets.QAbstractItemView.ExtendedSelection
|
||||
)
|
||||
|
||||
instance_model = QtGui.QStandardItemModel()
|
||||
instance_view.setModel(instance_model)
|
||||
|
||||
layout = QtWidgets.QHBoxLayout(self)
|
||||
layout.setContentsMargins(0, 0, 0, 0)
|
||||
layout.addWidget(instance_view)
|
||||
|
||||
instance_view.selectionModel().selectionChanged.connect(
|
||||
self._on_selection_change
|
||||
)
|
||||
|
||||
self.instance_view = instance_view
|
||||
self.instance_model = instance_model
|
||||
|
||||
def refresh(self):
|
||||
to_remove = set()
|
||||
existing_mapping = {}
|
||||
|
||||
for idx in range(self.instance_model.rowCount()):
|
||||
index = self.instance_model.index(idx, 0)
|
||||
uuid = index.data(QtCore.Qt.UserRole)
|
||||
to_remove.add(uuid)
|
||||
existing_mapping[uuid] = idx
|
||||
|
||||
new_items = []
|
||||
for instance in self.controller.instances:
|
||||
uuid = instance.data["uuid"]
|
||||
if uuid in to_remove:
|
||||
to_remove.remove(uuid)
|
||||
continue
|
||||
|
||||
item = QtGui.QStandardItem(instance.data["subset"])
|
||||
item.setData(instance.data["uuid"], QtCore.Qt.UserRole)
|
||||
new_items.append(item)
|
||||
|
||||
idx_to_remove = []
|
||||
for uuid in to_remove:
|
||||
idx_to_remove.append(existing_mapping[uuid])
|
||||
|
||||
for idx in reversed(sorted(idx_to_remove)):
|
||||
self.instance_model.removeRows(idx, 1)
|
||||
|
||||
if new_items:
|
||||
self.instance_model.invisibleRootItem().appendRows(new_items)
|
||||
|
||||
def get_selected_instances(self):
|
||||
instances = []
|
||||
instances_by_id = {}
|
||||
for instance in self.controller.instances:
|
||||
instance_id = instance.data["uuid"]
|
||||
instances_by_id[instance_id] = instance
|
||||
|
||||
for index in self.instance_view.selectionModel().selectedIndexes():
|
||||
instance_id = index.data(QtCore.Qt.UserRole)
|
||||
instance = instances_by_id.get(instance_id)
|
||||
if instance:
|
||||
instances.append(instance)
|
||||
|
||||
return instances
|
||||
|
||||
def set_selected_instances(self, instances):
|
||||
model = self.instance_view.model()
|
||||
selected_ids = set()
|
||||
for instance in instances:
|
||||
instance_id = instance.data["uuid"]
|
||||
selected_ids.add(instance_id)
|
||||
|
||||
indexes = []
|
||||
for row in range(model.rowCount()):
|
||||
index = model.index(row, 0)
|
||||
instance_id = index.data(QtCore.Qt.UserRole)
|
||||
if instance_id in selected_ids:
|
||||
indexes.append(index)
|
||||
|
||||
selection_model = self.instance_view.selectionModel()
|
||||
first_item = True
|
||||
for index in indexes:
|
||||
if first_item:
|
||||
first_item = False
|
||||
select_type = QtCore.QItemSelectionModel.SelectCurrent
|
||||
else:
|
||||
select_type = QtCore.QItemSelectionModel.Select
|
||||
selection_model.select(index, select_type)
|
||||
|
||||
def _on_selection_change(self, *_args):
|
||||
self.selection_changed.emit()
|
||||
|
|
|
|||
|
|
@ -31,6 +31,8 @@ from openpype import style
|
|||
from control import PublisherController
|
||||
from widgets import (
|
||||
SubsetAttributesWidget,
|
||||
InstanceCardView,
|
||||
InstanceListView,
|
||||
CreateDialog
|
||||
)
|
||||
|
||||
|
|
@ -42,6 +44,10 @@ class PublisherWindow(QtWidgets.QWidget):
|
|||
self._first_show = True
|
||||
self._refreshing_instances = False
|
||||
|
||||
self._view_type_order = ["card", "list"]
|
||||
self._view_type = self._view_type_order[0]
|
||||
self._views_refreshed = {}
|
||||
|
||||
controller = PublisherController()
|
||||
|
||||
# TODO Title, Icon, Stylesheet
|
||||
|
|
@ -61,15 +67,11 @@ class PublisherWindow(QtWidgets.QWidget):
|
|||
# Subset widget
|
||||
subset_widget = QtWidgets.QWidget(main_frame)
|
||||
|
||||
subset_view = QtWidgets.QTreeView(subset_widget)
|
||||
subset_view.setHeaderHidden(True)
|
||||
subset_view.setIndentation(0)
|
||||
subset_view.setSelectionMode(
|
||||
QtWidgets.QAbstractItemView.ExtendedSelection
|
||||
)
|
||||
subset_view_cards = InstanceCardView(controller, subset_widget)
|
||||
subset_list_view = InstanceListView(controller, subset_widget)
|
||||
|
||||
subset_model = QtGui.QStandardItemModel()
|
||||
subset_view.setModel(subset_model)
|
||||
subset_view_cards.setVisible(False)
|
||||
subset_list_view.setVisible(False)
|
||||
|
||||
# Buttons at the bottom of subset view
|
||||
create_btn = QtWidgets.QPushButton("Create", subset_widget)
|
||||
|
|
@ -95,7 +97,8 @@ class PublisherWindow(QtWidgets.QWidget):
|
|||
# Layout of view and buttons
|
||||
subset_view_layout = QtWidgets.QVBoxLayout()
|
||||
subset_view_layout.setContentsMargins(0, 0, 0, 0)
|
||||
subset_view_layout.addWidget(subset_view, 1)
|
||||
subset_view_layout.addWidget(subset_view_cards, 1)
|
||||
subset_view_layout.addWidget(subset_list_view, 1)
|
||||
subset_view_layout.addLayout(subset_view_btns_layout, 0)
|
||||
|
||||
# Whole subset layout with attributes and details
|
||||
|
|
@ -143,7 +146,10 @@ class PublisherWindow(QtWidgets.QWidget):
|
|||
validate_btn.clicked.connect(self._on_validate_clicked)
|
||||
publish_btn.clicked.connect(self._on_publish_clicked)
|
||||
|
||||
subset_view.selectionModel().selectionChanged.connect(
|
||||
subset_list_view.selection_changed.connect(
|
||||
self._on_subset_change
|
||||
)
|
||||
subset_view_cards.selection_changed.connect(
|
||||
self._on_subset_change
|
||||
)
|
||||
|
||||
|
|
@ -151,8 +157,8 @@ class PublisherWindow(QtWidgets.QWidget):
|
|||
|
||||
self.context_label = context_label
|
||||
|
||||
self.subset_view = subset_view
|
||||
self.subset_model = subset_model
|
||||
self.subset_view_cards = subset_view_cards
|
||||
self.subset_list_view = subset_list_view
|
||||
|
||||
self.delete_btn = delete_btn
|
||||
|
||||
|
|
@ -165,11 +171,19 @@ class PublisherWindow(QtWidgets.QWidget):
|
|||
|
||||
self.creator_window = creator_window
|
||||
|
||||
self.views_by_type = {
|
||||
"card": subset_view_cards,
|
||||
"list": subset_list_view
|
||||
}
|
||||
|
||||
self._change_view_type(self._view_type)
|
||||
|
||||
self.setStyleSheet(style.load_stylesheet())
|
||||
|
||||
# DEBUGING
|
||||
self.set_context_label(
|
||||
"<project>/<hierarchy>/<asset>/<task>/<workfile>"
|
||||
)
|
||||
self.setStyleSheet(style.load_stylesheet())
|
||||
|
||||
def showEvent(self, event):
|
||||
super(PublisherWindow, self).showEvent(event)
|
||||
|
|
@ -184,19 +198,37 @@ class PublisherWindow(QtWidgets.QWidget):
|
|||
self.context_label.setText(label)
|
||||
|
||||
def get_selected_instances(self):
|
||||
instances = []
|
||||
instances_by_id = {}
|
||||
for instance in self.controller.instances:
|
||||
instance_id = instance.data["uuid"]
|
||||
instances_by_id[instance_id] = instance
|
||||
view = self.views_by_type[self._view_type]
|
||||
return view.get_selected_instances()
|
||||
|
||||
for index in self.subset_view.selectionModel().selectedIndexes():
|
||||
instance_id = index.data(QtCore.Qt.UserRole)
|
||||
instance = instances_by_id.get(instance_id)
|
||||
if instance:
|
||||
instances.append(instance)
|
||||
def _change_view_type(self, view_type=None):
|
||||
if view_type is None:
|
||||
next_type = False
|
||||
for _view_type in self._view_type_order:
|
||||
if next_type:
|
||||
view_type = _view_type
|
||||
break
|
||||
|
||||
return instances
|
||||
if _view_type == self._view_type:
|
||||
next_type = True
|
||||
|
||||
if view_type is None:
|
||||
view_type = self._view_type_order[0]
|
||||
|
||||
old_view = self.views_by_type[self._view_type]
|
||||
old_view.setVisible(False)
|
||||
|
||||
self._view_type = view_type
|
||||
refreshed = self._views_refreshed.get(view_type, False)
|
||||
new_view = self.views_by_type[view_type]
|
||||
new_view.setVisible(True)
|
||||
if not refreshed:
|
||||
new_view.refresh()
|
||||
self._views_refreshed[view_type] = True
|
||||
|
||||
if new_view is not old_view:
|
||||
selected_instances = old_view.get_selected_instances()
|
||||
new_view.set_selected_instances(selected_instances)
|
||||
|
||||
def _on_reset_clicked(self):
|
||||
self.reset()
|
||||
|
|
@ -231,7 +263,7 @@ class PublisherWindow(QtWidgets.QWidget):
|
|||
self.controller.remove_instances(instances)
|
||||
|
||||
def _on_change_view_clicked(self):
|
||||
print("change view")
|
||||
self._change_view_type()
|
||||
|
||||
def _on_save_clicked(self):
|
||||
self.controller.save_instance_changes()
|
||||
|
|
@ -248,35 +280,10 @@ class PublisherWindow(QtWidgets.QWidget):
|
|||
|
||||
self._refreshing_instances = True
|
||||
|
||||
to_remove = set()
|
||||
existing_mapping = {}
|
||||
view = self.views_by_type[self._view_type]
|
||||
view.refresh()
|
||||
|
||||
for idx in range(self.subset_model.rowCount()):
|
||||
index = self.subset_model.index(idx, 0)
|
||||
uuid = index.data(QtCore.Qt.UserRole)
|
||||
to_remove.add(uuid)
|
||||
existing_mapping[uuid] = idx
|
||||
|
||||
new_items = []
|
||||
for instance in self.controller.instances:
|
||||
uuid = instance.data["uuid"]
|
||||
if uuid in to_remove:
|
||||
to_remove.remove(uuid)
|
||||
continue
|
||||
|
||||
item = QtGui.QStandardItem(instance.data["subset"])
|
||||
item.setData(instance.data["uuid"], QtCore.Qt.UserRole)
|
||||
new_items.append(item)
|
||||
|
||||
idx_to_remove = []
|
||||
for uuid in to_remove:
|
||||
idx_to_remove.append(existing_mapping[uuid])
|
||||
|
||||
for idx in reversed(sorted(idx_to_remove)):
|
||||
self.subset_model.removeRows(idx, 1)
|
||||
|
||||
if new_items:
|
||||
self.subset_model.invisibleRootItem().appendRows(new_items)
|
||||
self._views_refreshed = {self._view_type: True}
|
||||
|
||||
self._refreshing_instances = False
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue