Merge branch 'master' into develop

Author: imestevez

mod/constants.py

@@ -11,7 +11,7 @@
 DIVIDER = 1000
 LINE_END = "\n"
 PICKLE_PROTOCOL = 1  # Binary mode
-VERSION = "0.7.1 (25-11-2024)" # Version must be M.m.p (dd-mm-yyyy)
+VERSION = "0.7.1 (26-11-2024)" # Version must be M.m.p (dd-mm-yyyy)
 WIDTH_2D = 0.001
 MAX_PARTICLE_WARNING = 2000000
 DISK_DUMP_FILE_NAME = "designsphysics-{}.log".format(VERSION)

mod/executable_tools.py

@@ -8,7 +8,8 @@
 from sys import platform
 import json
 
-from PySide import QtCore
+# from PySide import QtCore
+from PySide2 import QtCore
 
 import FreeCADGui
 

mod/post_processing_tools.py

@@ -4,7 +4,8 @@
 
 import subprocess
 
-from PySide import QtCore
+# from PySide import QtCore
+from PySide2 import QtCore
 
 from mod.translation_tools import __
 from mod.dialog_tools import error_dialog, info_dialog

mod/widgets/chrono/chrono_object_check_options.py

@@ -2,7 +2,6 @@
 # -*- coding: utf-8 -*-
 """DesignSPHysics Chrono Object Check Options widget."""
 
-from PySide import QtGui
 from PySide2 import QtWidgets
 
 from mod.translation_tools import __

mod/widgets/execution_parameters_dialog.py

@@ -3,7 +3,7 @@
 """DesignSPHysics Execution Parameters Configuration Dialog."""
 
 # from PySide import QtCore, QtGui
-from PySide2 import QtCore, QtWidgets
+from PySide2 import QtCore, QtGui, QtWidgets
 
 from mod.translation_tools import __
 from mod.stdout_tools import log

mod/widgets/focusable_line_edit.py

@@ -2,7 +2,8 @@
 # -*- coding: utf-8 -*-
 """DesignSPHysics Focusable LineEdit implementation."""
 
-from PySide import QtCore, QtGui
+# from PySide import QtCore, QtGui
+from PySide2 import QtCore, QtGui
 
 
 class FocusableLineEdit(QtGui.QLineEdit):

mod/widgets/properties_dock_widget.py

@@ -5,7 +5,7 @@
 import FreeCAD
 import FreeCADGui
 
-#from PySide import QtCore, QtGui
+# from PySide import QtCore, QtGui
 from PySide2 import QtCore, QtWidgets
 
 from mod.translation_tools import __

package.xml

@@ -2,8 +2,8 @@
 <package format="1" xmlns="https://wiki.freecad.org/Package_Metadata">
   <name>DesignSPHysics</name>
   <description>DesignSPHysics is a macro/addon for FreeCAD that provides a Graphical User Interface for fluid and multi-physics solver DualSPHysics</description>
-  <version>0.7.1 (25-11-2024)</version>
-  <date>25-11-2024</date>
+  <version>0.7.1 (26-11-2024)</version>
+  <date>26-11-2024</date>
   <maintainer email="ivan.martinez.estevez@uvigo.es">Iván Martínez Estévez</maintainer>
   <license file="LICENSE">GPL-3.0-or-later</license>
   <url type="repository" branch="master">https://github.com/DualSPHysics/DesignSPHysics</url>