From ed2ebb16ccb605be3582e272268641ef9f96996d Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Wed, 1 Sep 2021 10:48:48 +0200 Subject: [PATCH] don't use image for deleted instances --- .../publish_log_viewer/delegates.py | 38 ++++++------------ .../images/deleted_instance.png | Bin 7384 -> 0 bytes 2 files changed, 12 insertions(+), 26 deletions(-) delete mode 100644 openpype/tools/new_publisher/publish_log_viewer/images/deleted_instance.png diff --git a/openpype/tools/new_publisher/publish_log_viewer/delegates.py b/openpype/tools/new_publisher/publish_log_viewer/delegates.py index e8ee1fd418..5a1c0d6f7e 100644 --- a/openpype/tools/new_publisher/publish_log_viewer/delegates.py +++ b/openpype/tools/new_publisher/publish_log_viewer/delegates.py @@ -24,13 +24,6 @@ colors = { "group-selected-hover": QtGui.QColor("#555555") } -def get_image_path(filename): - return os.path.join( - os.path.dirname(os.path.abspath(__file__)), - "images", - filename - ) - class GroupItemDelegate(QtWidgets.QStyledItemDelegate): """Generic delegate for instance header""" @@ -164,27 +157,20 @@ class GroupItemDelegate(QtWidgets.QStyledItemDelegate): elif name == "removed": draw_ellipse = False - image_path = get_image_path("deleted_instance.png") - source_pix = QtGui.QPixmap(image_path) - width = offset_size - height = offset_size - if source_pix.width() > source_pix.height(): - height = source_pix.width() / width * source_pix.height() - else: - width = source_pix.height() / height * source_pix.width() + offset = offset * 1.5 + p1 = QtCore.QPoint(offset, offset) + p2 = QtCore.QPoint(size - offset, size - offset) + p3 = QtCore.QPoint(offset, size - offset) + p4 = QtCore.QPoint(size - offset, offset) - scaled_pix = source_pix.scaled( - width, - height, - QtCore.Qt.KeepAspectRatio, - QtCore.Qt.SmoothTransformation - ) - start_point = QtCore.QPointF( - offset + ((offset_size / 2) - (scaled_pix.width() / 2)), - offset + ((offset_size / 2) - (scaled_pix.height() / 2)) - ) - painter.drawPixmap(start_point, scaled_pix) + pen = QtGui.QPen(QtCore.Qt.white) + pen.setWidth(offset_size / 4) + pen.setCapStyle(QtCore.Qt.RoundCap) + painter.setPen(pen) + painter.setBrush(QtCore.Qt.transparent) + painter.drawLine(p1, p2) + painter.drawLine(p3, p4) else: color = QtGui.QColor(QtCore.Qt.white) diff --git a/openpype/tools/new_publisher/publish_log_viewer/images/deleted_instance.png b/openpype/tools/new_publisher/publish_log_viewer/images/deleted_instance.png deleted file mode 100644 index a065408f4219e4365418e3ce299e4f5b3574d7d1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7384 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