Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions main.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import sys

from PySide2 import QtWidgets, QtCore, QtGui
from PySide6 import QtWidgets, QtCore, QtGui

import logging
import os
Expand Down Expand Up @@ -61,5 +61,5 @@ def closeEvent(self, event):
app.setPalette(palette)
launcher = NodeEditor()
launcher.show()
app.exec_()
app.exec()
sys.exit()
2 changes: 1 addition & 1 deletion node_editor/gui/connection.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from PySide2 import QtWidgets, QtGui, QtCore
from PySide6 import QtWidgets, QtGui, QtCore


class Connection(QtWidgets.QGraphicsPathItem):
Expand Down
8 changes: 4 additions & 4 deletions node_editor/gui/node.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from PySide2 import QtWidgets, QtGui, QtCore
from PySide6 import QtWidgets, QtGui, QtCore

from node_editor.gui.port import Port

Expand Down Expand Up @@ -87,12 +87,12 @@ def build(self):

# Get the dimentions of the title and type
title_dim = {
"w": QtGui.QFontMetrics(title_font).width(self._title_text),
"w": QtGui.QFontMetrics(title_font).horizontalAdvance(self._title_text),
"h": QtGui.QFontMetrics(title_font).height(),
}

title_type_dim = {
"w": QtGui.QFontMetrics(title_type_font).width("(" + self._type_text + ")"),
"w": QtGui.QFontMetrics(title_type_font).horizontalAdvance("(" + self._type_text + ")"),
"h": QtGui.QFontMetrics(title_type_font).height(),
}

Expand All @@ -108,7 +108,7 @@ def build(self):
# Add the heigth for each of the ports
for port in self._ports:
port_dim = {
"w": QtGui.QFontMetrics(port_font).width(port.name()),
"w": QtGui.QFontMetrics(port_font).horizontalAdvance(port.name()),
"h": QtGui.QFontMetrics(port_font).height(),
}

Expand Down
2 changes: 1 addition & 1 deletion node_editor/gui/node_editor.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from PySide2 import QtWidgets, QtCore
from PySide6 import QtWidgets, QtCore

from node_editor.gui.connection import Connection
from node_editor.gui.node import Node
Expand Down
2 changes: 1 addition & 1 deletion node_editor/gui/node_list.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from PySide2 import QtWidgets, QtCore, QtGui
from PySide6 import QtWidgets, QtCore, QtGui


class NodeList(QtWidgets.QListWidget):
Expand Down
4 changes: 2 additions & 2 deletions node_editor/gui/node_widget.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# from PySide2.QtWidgets import QWidget, QVBoxLayout, QGraphicsScene
# from PySide6.QtWidgets import QWidget, QVBoxLayout, QGraphicsScene

from PySide2 import QtWidgets, QtGui
from PySide6 import QtWidgets, QtGui

from node_editor.gui.view import View
from node_editor.gui.node import Node
Expand Down
6 changes: 3 additions & 3 deletions node_editor/gui/palette.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from PySide2 import QtGui
from PySide2.QtGui import QPalette, QColor
from PySide2.QtCore import Qt
from PySide6 import QtGui
from PySide6.QtGui import QPalette, QColor
from PySide6.QtCore import Qt

palette = QtGui.QPalette()

Expand Down
4 changes: 2 additions & 2 deletions node_editor/gui/port.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from PySide2 import QtWidgets, QtGui, QtCore
from PySide6 import QtWidgets, QtGui, QtCore


class Port(QtWidgets.QGraphicsPathItem):
Expand Down Expand Up @@ -35,7 +35,7 @@ def set_is_output(self, is_output):
def set_name(self, name):
self._name = name
nice_name = self._name.replace("_", " ").title()
self.port_text_width = self.font_metrics.width(nice_name)
self.port_text_width = self.font_metrics.horizontalAdvance(nice_name)

if self._is_output:
x = -self.radius_ - self.margin - self.port_text_width
Expand Down
7 changes: 4 additions & 3 deletions node_editor/gui/view.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from PySide2 import QtCore, QtGui, QtWidgets, QtOpenGL
from PySide6 import QtCore, QtGui, QtWidgets, QtOpenGLWidgets

from node_editor.gui.connection import Connection
from node_editor.gui.node import Node
Expand All @@ -22,9 +22,10 @@ def __init__(self, parent):
self.setRenderHint(QtGui.QPainter.Antialiasing)
self._manipulationMode = 0

gl_format = QtOpenGL.QGLFormat(QtOpenGL.QGL.SampleBuffers)
gl_format = QtGui.QSurfaceFormat()
gl_format.setSamples(10)
gl_widget = QtOpenGL.QGLWidget(gl_format)
QtGui.QSurfaceFormat.setDefaultFormat(gl_format)
gl_widget = QtOpenGLWidgets.QOpenGLWidget()

self.currentScale = 1
self._pan = False
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
PySide2
PySide6