From 6437e714f036abd094043e578db7e8a05050a479 Mon Sep 17 00:00:00 2001 From: Syres916 <46537884+Syres916@users.noreply.github.com> Date: Mon, 17 Jun 2024 08:03:23 +0100 Subject: [PATCH 1/3] [BIM] QSvgWidget is not a child of QtSvg in PySide6 --- src/Mod/BIM/bimcommands/BimWindow.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Mod/BIM/bimcommands/BimWindow.py b/src/Mod/BIM/bimcommands/BimWindow.py index a9ec5020a3..487bfe74c7 100644 --- a/src/Mod/BIM/bimcommands/BimWindow.py +++ b/src/Mod/BIM/bimcommands/BimWindow.py @@ -258,7 +258,7 @@ class Arch_Window: "sets up a taskbox widget" from draftutils import params - from PySide import QtCore, QtGui, QtSvg + from PySide import QtCore, QtGui, QtSvgWidgets from ArchWindowPresets import WindowPresets w = QtGui.QWidget() ui = FreeCADGui.UiLoader() @@ -322,7 +322,7 @@ class Arch_Window: self.pic.hide() # SVG display - self.im = QtSvg.QSvgWidget(":/ui/ParametersWindowFixed.svg") + self.im = QtSvgWidgets.QSvgWidget(":/ui/ParametersWindowFixed.svg") self.im.setMaximumWidth(200) self.im.setMinimumHeight(120) grid.addWidget(self.im,4,0,1,2) From 0724f3a1c9e63ebdd84a068c95cb014e012e746f Mon Sep 17 00:00:00 2001 From: Syres916 <46537884+Syres916@users.noreply.github.com> Date: Mon, 17 Jun 2024 08:06:03 +0100 Subject: [PATCH 2/3] [BIM] QSvgWidget is not a child of QtSvg in PySide6 --- src/Mod/BIM/ArchPrecast.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Mod/BIM/ArchPrecast.py b/src/Mod/BIM/ArchPrecast.py index 7bb929b10e..138772679d 100644 --- a/src/Mod/BIM/ArchPrecast.py +++ b/src/Mod/BIM/ArchPrecast.py @@ -777,14 +777,14 @@ class _PrecastTaskPanel: def __init__(self): import FreeCADGui - from PySide import QtCore,QtGui,QtSvg + from PySide import QtCore, QtGui, QtSvgWidgets self.form = QtGui.QWidget() self.grid = QtGui.QGridLayout(self.form) self.PrecastTypes = ["Beam","I-Beam","Pillar","Panel","Slab","Stairs"] self.SlabTypes = ["Champagne","Hat"] # image display - self.preview = QtSvg.QSvgWidget(":/ui/ParametersBeam.svg") + self.preview = QtSvgWidgets.QSvgWidget(":/ui/ParametersBeam.svg") self.preview.setMaximumWidth(200) self.preview.setMinimumHeight(120) self.grid.addWidget(self.preview,0,0,1,2) @@ -1263,7 +1263,7 @@ class _DentsTaskPanel: def __init__(self): import FreeCADGui - from PySide import QtCore,QtGui,QtSvg + from PySide import QtCore, QtGui, QtSvgWidgets self.form = QtGui.QWidget() self.grid = QtGui.QGridLayout(self.form) self.Rotations = ["N","S","E","O"] @@ -1282,7 +1282,7 @@ class _DentsTaskPanel: self.grid.addWidget(self.buttonRemove,2,1,1,1) # image display - self.preview = QtSvg.QSvgWidget(":/ui/ParametersDent.svg") + self.preview = QtSvgWidgets.QSvgWidget(":/ui/ParametersDent.svg") self.preview.setMaximumWidth(200) self.preview.setMinimumHeight(120) self.grid.addWidget(self.preview,3,0,1,2) From 3f15b9455c88189f76e48032b68dfff502efc5b8 Mon Sep 17 00:00:00 2001 From: Roy-043 Date: Mon, 17 Jun 2024 16:05:45 +0200 Subject: [PATCH 3/3] Remove superfluous QtSvg import from ArchWindows.py --- src/Mod/BIM/ArchWindow.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Mod/BIM/ArchWindow.py b/src/Mod/BIM/ArchWindow.py index 911b9bc4bb..753d8a661e 100644 --- a/src/Mod/BIM/ArchWindow.py +++ b/src/Mod/BIM/ArchWindow.py @@ -34,7 +34,7 @@ from draftutils.messages import _wrn if FreeCAD.GuiUp: import FreeCADGui - from PySide import QtCore, QtGui, QtSvg + from PySide import QtCore, QtGui from draftutils.translate import translate from PySide.QtCore import QT_TRANSLATE_NOOP import draftguitools.gui_trackers as DraftTrackers