From 1c71a0b8e028955f95a1b3c8c62527c84e2525b4 Mon Sep 17 00:00:00 2001 From: Giovani Del Nero Diniz Date: Fri, 11 Apr 2025 20:36:32 -0700 Subject: [PATCH 1/2] fix(compatibility): this commit fixes compatibility issues with FreeCAD 1.0 (flatpak version) --- AM_INSTALLATION_DIGEST.txt | 2 ++ mod/dialog_tools.py | 2 +- mod/executable_tools.py | 2 +- mod/freecad_tools.py | 2 +- mod/gui_tools.py | 9 +++++++-- mod/main.py | 2 +- mod/post_processing_tools.py | 2 +- mod/widgets/acceleration_input_dialog.py | 2 +- mod/widgets/add_geo_dialog.py | 2 +- mod/widgets/bound_initials_dialog.py | 2 +- mod/widgets/case_summary.py | 2 +- mod/widgets/chrono/chrono_config_dialog.py | 2 +- mod/widgets/chrono/chrono_object_check_options.py | 2 +- mod/widgets/chrono/link_coulombdamping_edit.py | 2 +- mod/widgets/chrono/link_hinge_edit.py | 2 +- mod/widgets/chrono/link_linear_spring_edit.py | 2 +- mod/widgets/chrono/link_point_line_edit.py | 2 +- mod/widgets/chrono/link_pulley_edit.py | 2 +- mod/widgets/chrono/link_spheric_edit.py | 2 +- mod/widgets/constants_dialog.py | 2 +- mod/widgets/damping_config_dialog.py | 2 +- mod/widgets/dock/designsphysics_dock.py | 2 +- mod/widgets/dock/dock_configuration_widget.py | 2 +- mod/widgets/dock/dock_dp_widget.py | 2 +- mod/widgets/dock/dock_logo_widget.py | 2 +- mod/widgets/dock/dock_object_list_table_widget.py | 2 +- mod/widgets/dock/dock_post_processing_widget.py | 2 +- mod/widgets/dock/dock_pre_processing_widget.py | 2 +- mod/widgets/dock/dock_simulation_widget.py | 2 +- mod/widgets/error_report_dialog.py | 2 +- mod/widgets/execution_parameters_dialog.py | 2 +- mod/widgets/faces_dialog.py | 2 +- mod/widgets/feature_support_dialog.py | 2 +- mod/widgets/float_state_dialog.py | 2 +- mod/widgets/focusable_combo_box.py | 2 +- mod/widgets/focusable_line_edit.py | 2 +- mod/widgets/gencase_completed_dialog.py | 2 +- mod/widgets/hoverable_label.py | 2 +- mod/widgets/information_dialog.py | 2 +- mod/widgets/initials_dialog.py | 2 +- mod/widgets/inlet_config_dialog.py | 2 +- mod/widgets/inlet_zone_edit.py | 4 ++-- mod/widgets/material_dialog.py | 2 +- mod/widgets/ml_piston_1d_config_dialog.py | 2 +- mod/widgets/ml_piston_2d_config_dialog.py | 2 +- mod/widgets/mode_2d_config_dialog.py | 2 +- .../moorings/moordyn_body_configuration_dialog.py | 2 +- .../moorings/moordyn_line_configuration_dialog.py | 2 +- mod/widgets/moorings/moordyn_parameters_dialog.py | 2 +- mod/widgets/moorings/moorings_configuration_dialog.py | 2 +- mod/widgets/motion/acc_circular_motion_timeline.py | 2 +- mod/widgets/motion/acc_rectilinear_motion_timeline.py | 2 +- mod/widgets/motion/acc_rotational_motion_timeline.py | 2 +- mod/widgets/motion/cir_sinu_motion_timeline.py | 2 +- mod/widgets/motion/file_motion_timeline.py | 2 +- .../motion/focused_piston_wave_motion_timeline.py | 2 +- .../motion/irregular_flap_wave_motion_timeline.py | 2 +- .../motion/irregular_piston_wave_motion_timeline.py | 2 +- mod/widgets/motion/movement_actions.py | 2 +- mod/widgets/motion/movement_dialog.py | 2 +- mod/widgets/motion/movement_timeline_placeholder.py | 2 +- mod/widgets/motion/rect_sinu_motion_timeline.py | 2 +- mod/widgets/motion/rectilinear_motion_timeline.py | 2 +- mod/widgets/motion/regular_flap_wave_motion_timeline.py | 2 +- .../motion/regular_piston_wave_motion_timeline.py | 2 +- mod/widgets/motion/rot_sinu_motion_timeline.py | 2 +- mod/widgets/motion/rotation_file_motion_timeline.py | 2 +- mod/widgets/motion/rotational_motion_timeline.py | 2 +- mod/widgets/motion/wait_motion_timeline.py | 2 +- mod/widgets/motion/wave_movement_actions.py | 2 +- mod/widgets/object_order_widget.py | 2 +- mod/widgets/postprocessing/computeforces_dialog.py | 2 +- mod/widgets/postprocessing/export_progress_dialog.py | 2 +- mod/widgets/postprocessing/floatinginfo_dialog.py | 2 +- mod/widgets/postprocessing/flowtool_box_edit_dialog.py | 2 +- mod/widgets/postprocessing/flowtool_dialog.py | 2 +- mod/widgets/postprocessing/isosurface_dialog.py | 2 +- mod/widgets/postprocessing/measuretool_dialog.py | 2 +- mod/widgets/postprocessing/measuretool_grid_dialog.py | 2 +- mod/widgets/postprocessing/measuretool_points_dialog.py | 2 +- mod/widgets/postprocessing/partvtk_dialog.py | 2 +- mod/widgets/properties_dock_widget.py | 2 +- mod/widgets/relaxation_zone_file_config_dialog.py | 2 +- mod/widgets/relaxation_zone_irregular_config_dialog.py | 2 +- mod/widgets/relaxation_zone_regular_config_dialog.py | 2 +- mod/widgets/relaxation_zone_uniform_config_dialog.py | 2 +- mod/widgets/run_additional_parameters_dialog.py | 2 +- mod/widgets/run_dialog.py | 2 +- mod/widgets/setup_plugin_dialog.py | 2 +- mod/widgets/special_options_selector_dialog.py | 2 +- mod/widgets/velocity_times_dialog.py | 2 +- 91 files changed, 99 insertions(+), 92 deletions(-) create mode 100644 AM_INSTALLATION_DIGEST.txt diff --git a/AM_INSTALLATION_DIGEST.txt b/AM_INSTALLATION_DIGEST.txt new file mode 100644 index 0000000..917cd21 --- /dev/null +++ b/AM_INSTALLATION_DIGEST.txt @@ -0,0 +1,2 @@ +# The following files were created outside this installation path during the installation of this Addon on 2025-03-08 15:32:05.048100+00:00: +/home/ubuntu/.var/app/org.freecad.FreeCAD/data/FreeCAD/Macro/DesignSPHysics.FCMacro diff --git a/mod/dialog_tools.py b/mod/dialog_tools.py index 84febff..252addb 100644 --- a/mod/dialog_tools.py +++ b/mod/dialog_tools.py @@ -5,7 +5,7 @@ Contains general use standard dialogs. """ # from PySide import QtGui -from PySide2 import QtWidgets +from PySide6 import QtWidgets from mod.translation_tools import __ diff --git a/mod/executable_tools.py b/mod/executable_tools.py index fbfba95..e7b4fc7 100644 --- a/mod/executable_tools.py +++ b/mod/executable_tools.py @@ -9,7 +9,7 @@ import json # from PySide import QtCore -from PySide2 import QtCore +from PySide6 import QtCore import FreeCADGui diff --git a/mod/freecad_tools.py b/mod/freecad_tools.py index b972147..b4c656a 100644 --- a/mod/freecad_tools.py +++ b/mod/freecad_tools.py @@ -11,7 +11,7 @@ import Draft # from PySide import QtGui -from PySide2 import QtWidgets +from PySide6 import QtWidgets from mod.translation_tools import __ from mod.stdout_tools import log, error, debug diff --git a/mod/gui_tools.py b/mod/gui_tools.py index 9a5eacc..613d1a6 100644 --- a/mod/gui_tools.py +++ b/mod/gui_tools.py @@ -10,7 +10,7 @@ import os # from PySide import QtGui -from PySide2 import QtWidgets, QtGui +from PySide6 import QtWidgets, QtGui def h_line_generator() -> QtWidgets.QFrame: @@ -33,5 +33,10 @@ def get_icon(file_name, return_only_path=False) -> QtGui.QIcon: """ Returns a QIcon to use with DesignSPHysics. Retrieves a file with filename (like image.png) from the images folder. """ file_to_load = os.path.dirname(os.path.abspath(__file__)) + "/../images/{}".format(file_name) if os.path.isfile(file_to_load): - return file_to_load if return_only_path else QtGui.QIcon(file_to_load) + if return_only_path: + # Return only the path + return QtGui.QPixmap(file_to_load) + else: + # Return the icon + return QtGui.QIcon(file_to_load) raise IOError("File {} not found in images folder".format(file_name)) diff --git a/mod/main.py b/mod/main.py index 6297c9d..50e3772 100644 --- a/mod/main.py +++ b/mod/main.py @@ -17,7 +17,7 @@ import FreeCADGui # from PySide import QtGui, QtCore -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets from mod.translation_tools import __ from mod.freecad_tools import check_compatibility, document_count, prompt_close_all_documents, get_fc_main_window, get_fc_object diff --git a/mod/post_processing_tools.py b/mod/post_processing_tools.py index 3fd1d2b..f375f34 100644 --- a/mod/post_processing_tools.py +++ b/mod/post_processing_tools.py @@ -5,7 +5,7 @@ import subprocess # from PySide import QtCore -from PySide2 import QtCore +from PySide6 import QtCore from mod.translation_tools import __ from mod.dialog_tools import error_dialog, info_dialog diff --git a/mod/widgets/acceleration_input_dialog.py b/mod/widgets/acceleration_input_dialog.py index 439387f..c9b1ea2 100644 --- a/mod/widgets/acceleration_input_dialog.py +++ b/mod/widgets/acceleration_input_dialog.py @@ -3,7 +3,7 @@ """DesignSPHysics Acceleration Input Dialog.""" # from PySide import QtCore, QtGui -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets from mod.translation_tools import __ diff --git a/mod/widgets/add_geo_dialog.py b/mod/widgets/add_geo_dialog.py index 5ce240e..882f450 100644 --- a/mod/widgets/add_geo_dialog.py +++ b/mod/widgets/add_geo_dialog.py @@ -6,7 +6,7 @@ from tempfile import gettempdir # from PySide import QtCore, QtGui -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets from mod.stdout_tools import debug from mod.file_tools import import_geo diff --git a/mod/widgets/bound_initials_dialog.py b/mod/widgets/bound_initials_dialog.py index 512c1de..aa326fc 100644 --- a/mod/widgets/bound_initials_dialog.py +++ b/mod/widgets/bound_initials_dialog.py @@ -5,7 +5,7 @@ import FreeCADGui # from PySide import QtGui, QtCore -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets from mod.translation_tools import __ from mod.dialog_tools import info_dialog diff --git a/mod/widgets/case_summary.py b/mod/widgets/case_summary.py index 177252a..1dd92b0 100644 --- a/mod/widgets/case_summary.py +++ b/mod/widgets/case_summary.py @@ -3,7 +3,7 @@ """ DesignsSPHysics Case Summary Dialog """ # from PySide import QtGui -from PySide2 import QtWidgets +from PySide6 import QtWidgets from mod.translation_tools import __ from mod.template_tools import get_template_text, obj_to_dict diff --git a/mod/widgets/chrono/chrono_config_dialog.py b/mod/widgets/chrono/chrono_config_dialog.py index 4f14f3b..c825dd3 100644 --- a/mod/widgets/chrono/chrono_config_dialog.py +++ b/mod/widgets/chrono/chrono_config_dialog.py @@ -3,7 +3,7 @@ """DesignSPHysics Chrono configuration dialog.""" # from PySide import QtCore, QtGui -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets from mod.translation_tools import __ diff --git a/mod/widgets/chrono/chrono_object_check_options.py b/mod/widgets/chrono/chrono_object_check_options.py index 49185a7..82a13c4 100644 --- a/mod/widgets/chrono/chrono_object_check_options.py +++ b/mod/widgets/chrono/chrono_object_check_options.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- """DesignSPHysics Chrono Object Check Options widget.""" -from PySide2 import QtWidgets +from PySide6 import QtWidgets from mod.translation_tools import __ diff --git a/mod/widgets/chrono/link_coulombdamping_edit.py b/mod/widgets/chrono/link_coulombdamping_edit.py index 527c147..f503269 100644 --- a/mod/widgets/chrono/link_coulombdamping_edit.py +++ b/mod/widgets/chrono/link_coulombdamping_edit.py @@ -3,7 +3,7 @@ """DesignSPHysics CoulombDamping Edit Dialog """ # from PySide import QtGui -from PySide2 import QtWidgets +from PySide6 import QtWidgets from mod.translation_tools import __ diff --git a/mod/widgets/chrono/link_hinge_edit.py b/mod/widgets/chrono/link_hinge_edit.py index 577d548..83fef53 100644 --- a/mod/widgets/chrono/link_hinge_edit.py +++ b/mod/widgets/chrono/link_hinge_edit.py @@ -3,7 +3,7 @@ """DesignSPHysics Link Hinge Edit Dialog """ # from PySide import QtGui -from PySide2 import QtWidgets +from PySide6 import QtWidgets from mod.translation_tools import __ from mod.dialog_tools import error_dialog diff --git a/mod/widgets/chrono/link_linear_spring_edit.py b/mod/widgets/chrono/link_linear_spring_edit.py index 182833a..3875659 100644 --- a/mod/widgets/chrono/link_linear_spring_edit.py +++ b/mod/widgets/chrono/link_linear_spring_edit.py @@ -3,7 +3,7 @@ """DesignSPHysics LinkLinearSprint Edit Dialog """ # from PySide import QtGui -from PySide2 import QtWidgets +from PySide6 import QtWidgets from mod.translation_tools import __ from mod.dialog_tools import error_dialog diff --git a/mod/widgets/chrono/link_point_line_edit.py b/mod/widgets/chrono/link_point_line_edit.py index 72ea089..f3cdeae 100644 --- a/mod/widgets/chrono/link_point_line_edit.py +++ b/mod/widgets/chrono/link_point_line_edit.py @@ -3,7 +3,7 @@ """DesignSPHysics LinkPointLine Edit Dialog """ # from PySide import QtGui -from PySide2 import QtWidgets +from PySide6 import QtWidgets from mod.translation_tools import __ from mod.dialog_tools import error_dialog diff --git a/mod/widgets/chrono/link_pulley_edit.py b/mod/widgets/chrono/link_pulley_edit.py index 3d8fc01..795dc96 100644 --- a/mod/widgets/chrono/link_pulley_edit.py +++ b/mod/widgets/chrono/link_pulley_edit.py @@ -3,7 +3,7 @@ """DesignSPHysics Link Pulley Edit Dialog """ # from PySide import QtGui -from PySide2 import QtWidgets +from PySide6 import QtWidgets from mod.translation_tools import __ from mod.dialog_tools import error_dialog diff --git a/mod/widgets/chrono/link_spheric_edit.py b/mod/widgets/chrono/link_spheric_edit.py index 3be59b6..ed392da 100644 --- a/mod/widgets/chrono/link_spheric_edit.py +++ b/mod/widgets/chrono/link_spheric_edit.py @@ -3,7 +3,7 @@ """DesignSPHysics LinkSphere Edit Widget """ # from PySide import QtGui -from PySide2 import QtWidgets +from PySide6 import QtWidgets from mod.translation_tools import __ from mod.dialog_tools import error_dialog diff --git a/mod/widgets/constants_dialog.py b/mod/widgets/constants_dialog.py index 98b4675..5b25b13 100644 --- a/mod/widgets/constants_dialog.py +++ b/mod/widgets/constants_dialog.py @@ -4,7 +4,7 @@ # from PySide import QtCore, QtGui -from PySide2 import QtCore, QtWidgets, QtGui +from PySide6 import QtCore, QtWidgets, QtGui from mod.translation_tools import __ from mod.stdout_tools import log diff --git a/mod/widgets/damping_config_dialog.py b/mod/widgets/damping_config_dialog.py index e58f77c..926f677 100644 --- a/mod/widgets/damping_config_dialog.py +++ b/mod/widgets/damping_config_dialog.py @@ -4,7 +4,7 @@ import FreeCAD # from PySide import QtCore, QtGui -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets from mod.translation_tools import __ from mod.dialog_tools import error_dialog diff --git a/mod/widgets/dock/designsphysics_dock.py b/mod/widgets/dock/designsphysics_dock.py index da361f5..005e23f 100644 --- a/mod/widgets/dock/designsphysics_dock.py +++ b/mod/widgets/dock/designsphysics_dock.py @@ -3,7 +3,7 @@ """Main DesignSPHysics Dock Widget """ # from PySide import QtGui, QtCore -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets from mod.gui_tools import h_line_generator from mod.freecad_tools import get_fc_main_window diff --git a/mod/widgets/dock/dock_configuration_widget.py b/mod/widgets/dock/dock_configuration_widget.py index 90e28da..4c3f758 100644 --- a/mod/widgets/dock/dock_configuration_widget.py +++ b/mod/widgets/dock/dock_configuration_widget.py @@ -3,7 +3,7 @@ """DesignSPHysics Dock Configuration Widget. """ # from PySide import QtGui -from PySide2 import QtWidgets +from PySide6 import QtWidgets from mod.translation_tools import __ from mod.freecad_tools import get_fc_main_window diff --git a/mod/widgets/dock/dock_dp_widget.py b/mod/widgets/dock/dock_dp_widget.py index d8d5a7a..b90acb6 100644 --- a/mod/widgets/dock/dock_dp_widget.py +++ b/mod/widgets/dock/dock_dp_widget.py @@ -3,7 +3,7 @@ """DesignSPHysics Dock DP Intro Widget """ # from PySide import QtGui -from PySide2 import QtWidgets, QtGui +from PySide6 import QtWidgets, QtGui from mod.translation_tools import __ diff --git a/mod/widgets/dock/dock_logo_widget.py b/mod/widgets/dock/dock_logo_widget.py index db7ab6d..2c55a54 100644 --- a/mod/widgets/dock/dock_logo_widget.py +++ b/mod/widgets/dock/dock_logo_widget.py @@ -5,7 +5,7 @@ import webbrowser # from PySide import QtGui -from PySide2 import QtWidgets, QtGui +from PySide6 import QtWidgets, QtGui from mod.gui_tools import get_icon from mod.translation_tools import __ diff --git a/mod/widgets/dock/dock_object_list_table_widget.py b/mod/widgets/dock/dock_object_list_table_widget.py index 43276a8..5511cc9 100644 --- a/mod/widgets/dock/dock_object_list_table_widget.py +++ b/mod/widgets/dock/dock_object_list_table_widget.py @@ -3,7 +3,7 @@ """DesignSPHysics Object List Table Widget.""" # from PySide import QtGui -from PySide2 import QtWidgets +from PySide6 import QtWidgets from mod.freecad_tools import get_fc_object from mod.translation_tools import __ diff --git a/mod/widgets/dock/dock_post_processing_widget.py b/mod/widgets/dock/dock_post_processing_widget.py index 68f58df..82e56cd 100644 --- a/mod/widgets/dock/dock_post_processing_widget.py +++ b/mod/widgets/dock/dock_post_processing_widget.py @@ -3,7 +3,7 @@ """DesignSPHysics Dock Post Processing Widget """ # from PySide import QtGui -from PySide2 import QtWidgets +from PySide6 import QtWidgets from mod.translation_tools import __ from mod.freecad_tools import get_fc_main_window diff --git a/mod/widgets/dock/dock_pre_processing_widget.py b/mod/widgets/dock/dock_pre_processing_widget.py index db6f46b..1782645 100644 --- a/mod/widgets/dock/dock_pre_processing_widget.py +++ b/mod/widgets/dock/dock_pre_processing_widget.py @@ -7,7 +7,7 @@ from traceback import print_exc # from PySide import QtCore, QtGui -from PySide2 import QtCore, QtWidgets, QtGui +from PySide6 import QtCore, QtWidgets, QtGui from mod.translation_tools import __ from mod.gui_tools import get_icon diff --git a/mod/widgets/dock/dock_simulation_widget.py b/mod/widgets/dock/dock_simulation_widget.py index b504070..908a10e 100644 --- a/mod/widgets/dock/dock_simulation_widget.py +++ b/mod/widgets/dock/dock_simulation_widget.py @@ -6,7 +6,7 @@ from sys import platform # from PySide import QtGui, QtCore -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets from mod.translation_tools import __ from mod.gui_tools import get_icon diff --git a/mod/widgets/error_report_dialog.py b/mod/widgets/error_report_dialog.py index 11f9cff..3711665 100644 --- a/mod/widgets/error_report_dialog.py +++ b/mod/widgets/error_report_dialog.py @@ -7,7 +7,7 @@ import FreeCAD # from PySide import QtGui -from PySide2 import QtWidgets +from PySide6 import QtWidgets from mod.gui_tools import h_line_generator diff --git a/mod/widgets/execution_parameters_dialog.py b/mod/widgets/execution_parameters_dialog.py index 1f8dabf..5049b79 100644 --- a/mod/widgets/execution_parameters_dialog.py +++ b/mod/widgets/execution_parameters_dialog.py @@ -3,7 +3,7 @@ """DesignSPHysics Execution Parameters Configuration Dialog.""" # from PySide import QtCore, QtGui -from PySide2 import QtCore, QtGui, QtWidgets +from PySide6 import QtCore, QtGui, QtWidgets from mod.translation_tools import __ from mod.stdout_tools import log diff --git a/mod/widgets/faces_dialog.py b/mod/widgets/faces_dialog.py index 2d27bdd..1cfc87a 100644 --- a/mod/widgets/faces_dialog.py +++ b/mod/widgets/faces_dialog.py @@ -3,7 +3,7 @@ """DesignSPHysics Faces Configuration Dialog""" # from PySide import QtCore, QtGui -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets from mod.translation_tools import __ diff --git a/mod/widgets/feature_support_dialog.py b/mod/widgets/feature_support_dialog.py index 3d6c725..c31641e 100644 --- a/mod/widgets/feature_support_dialog.py +++ b/mod/widgets/feature_support_dialog.py @@ -3,7 +3,7 @@ """DesignSPHysics Setup Plugin Dialog """ # from PySide import QtGui -from PySide2 import QtWidgets +from PySide6 import QtWidgets from mod.stdout_tools import debug from mod.translation_tools import __ diff --git a/mod/widgets/float_state_dialog.py b/mod/widgets/float_state_dialog.py index f1c638d..076f861 100644 --- a/mod/widgets/float_state_dialog.py +++ b/mod/widgets/float_state_dialog.py @@ -5,7 +5,7 @@ import FreeCADGui # from PySide import QtCore, QtGui -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets from mod.translation_tools import __ from mod.dialog_tools import info_dialog diff --git a/mod/widgets/focusable_combo_box.py b/mod/widgets/focusable_combo_box.py index ffd07d2..bdf71ea 100644 --- a/mod/widgets/focusable_combo_box.py +++ b/mod/widgets/focusable_combo_box.py @@ -3,7 +3,7 @@ """ DesignSPHysics Focusable ComboBox implementation. """ # from PySide import QtCore, QtGui -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets class FocusableComboBox(QtWidgets.QComboBox): diff --git a/mod/widgets/focusable_line_edit.py b/mod/widgets/focusable_line_edit.py index 13afe9d..5780d65 100644 --- a/mod/widgets/focusable_line_edit.py +++ b/mod/widgets/focusable_line_edit.py @@ -3,7 +3,7 @@ """DesignSPHysics Focusable LineEdit implementation.""" # from PySide import QtCore, QtGui -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets class FocusableLineEdit(QtWidgets.QLineEdit): diff --git a/mod/widgets/gencase_completed_dialog.py b/mod/widgets/gencase_completed_dialog.py index ae58951..79d56c9 100644 --- a/mod/widgets/gencase_completed_dialog.py +++ b/mod/widgets/gencase_completed_dialog.py @@ -5,7 +5,7 @@ import subprocess # from PySide import QtCore, QtGui -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets from mod.translation_tools import __ from mod.dialog_tools import error_dialog diff --git a/mod/widgets/hoverable_label.py b/mod/widgets/hoverable_label.py index 8b3a11b..d1de9f8 100644 --- a/mod/widgets/hoverable_label.py +++ b/mod/widgets/hoverable_label.py @@ -3,7 +3,7 @@ """DesignSPHysics Hoverable Label implementation.""" # from PySide import QtCore, QtGui -from PySide2 import QtCore, QtWidgets, QtGui +from PySide6 import QtCore, QtWidgets, QtGui class HoverableLabel(QtWidgets.QLabel): diff --git a/mod/widgets/information_dialog.py b/mod/widgets/information_dialog.py index 8196f7d..10cdf3f 100644 --- a/mod/widgets/information_dialog.py +++ b/mod/widgets/information_dialog.py @@ -3,7 +3,7 @@ """DesignSPHysics General Information Dialog""" # from PySide import QtGui -from PySide2 import QtWidgets +from PySide6 import QtWidgets from mod.gui_tools import h_line_generator from mod.translation_tools import __ diff --git a/mod/widgets/initials_dialog.py b/mod/widgets/initials_dialog.py index 56a370a..cdf83b9 100644 --- a/mod/widgets/initials_dialog.py +++ b/mod/widgets/initials_dialog.py @@ -5,7 +5,7 @@ import FreeCADGui # from PySide import QtGui -from PySide2 import QtWidgets +from PySide6 import QtWidgets from mod.translation_tools import __ from mod.dialog_tools import info_dialog diff --git a/mod/widgets/inlet_config_dialog.py b/mod/widgets/inlet_config_dialog.py index 3c2b070..bee55bd 100644 --- a/mod/widgets/inlet_config_dialog.py +++ b/mod/widgets/inlet_config_dialog.py @@ -4,7 +4,7 @@ from uuid import UUID # from PySide import QtCore, QtGui -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets from mod.translation_tools import __ from mod.freecad_tools import get_fc_main_window diff --git a/mod/widgets/inlet_zone_edit.py b/mod/widgets/inlet_zone_edit.py index ce78aec..31f6b17 100644 --- a/mod/widgets/inlet_zone_edit.py +++ b/mod/widgets/inlet_zone_edit.py @@ -3,10 +3,10 @@ """DesignSPHysics Inlet Zone Configuration Dialog.""" from mod.freecad_tools import get_fc_main_window -from PySide2.QtWidgets import QVBoxLayout +from PySide6.QtWidgets import QVBoxLayout from mod.dataobjects.awas_correction import AWASCorrection # from PySide import QtCore, QtGui -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets from mod.translation_tools import __ from mod.stdout_tools import debug diff --git a/mod/widgets/material_dialog.py b/mod/widgets/material_dialog.py index 363400b..adc7561 100644 --- a/mod/widgets/material_dialog.py +++ b/mod/widgets/material_dialog.py @@ -3,7 +3,7 @@ """DesignSPHysics Faces Configuration Dialog""" # from PySide import QtGui -from PySide2 import QtWidgets +from PySide6 import QtWidgets from mod.translation_tools import __ from mod.dialog_tools import info_dialog diff --git a/mod/widgets/ml_piston_1d_config_dialog.py b/mod/widgets/ml_piston_1d_config_dialog.py index 03abf22..bdd78ce 100644 --- a/mod/widgets/ml_piston_1d_config_dialog.py +++ b/mod/widgets/ml_piston_1d_config_dialog.py @@ -3,7 +3,7 @@ """DesignSPHysics MLPiston1D Configuration Dialog. """ # from PySide import QtGui -from PySide2 import QtWidgets +from PySide6 import QtWidgets from mod.translation_tools import __ from mod.gui_tools import h_line_generator diff --git a/mod/widgets/ml_piston_2d_config_dialog.py b/mod/widgets/ml_piston_2d_config_dialog.py index 14e74d2..63d48f9 100644 --- a/mod/widgets/ml_piston_2d_config_dialog.py +++ b/mod/widgets/ml_piston_2d_config_dialog.py @@ -6,7 +6,7 @@ from os import path # from PySide import QtGui -from PySide2 import QtWidgets +from PySide6 import QtWidgets from mod.translation_tools import __ from mod.gui_tools import h_line_generator diff --git a/mod/widgets/mode_2d_config_dialog.py b/mod/widgets/mode_2d_config_dialog.py index 18b5e58..dc0be6b 100644 --- a/mod/widgets/mode_2d_config_dialog.py +++ b/mod/widgets/mode_2d_config_dialog.py @@ -3,7 +3,7 @@ """ 2D Mode Configuration Dialog. """ # from PySide import QtGui -from PySide2 import QtWidgets +from PySide6 import QtWidgets from mod.translation_tools import __ from mod.dialog_tools import error_dialog diff --git a/mod/widgets/moorings/moordyn_body_configuration_dialog.py b/mod/widgets/moorings/moordyn_body_configuration_dialog.py index b3ae12b..01a72fd 100644 --- a/mod/widgets/moorings/moordyn_body_configuration_dialog.py +++ b/mod/widgets/moorings/moordyn_body_configuration_dialog.py @@ -3,7 +3,7 @@ """ DesignSPHysics MoorDyn Body Configuration Dialog. """ # from PySide import QtGui -from PySide2 import QtWidgets +from PySide6 import QtWidgets from mod.translation_tools import __ from mod.gui_tools import h_line_generator diff --git a/mod/widgets/moorings/moordyn_line_configuration_dialog.py b/mod/widgets/moorings/moordyn_line_configuration_dialog.py index 707e9b0..6b16f97 100644 --- a/mod/widgets/moorings/moordyn_line_configuration_dialog.py +++ b/mod/widgets/moorings/moordyn_line_configuration_dialog.py @@ -3,7 +3,7 @@ """ DesignSPHysics MoorDyn Line Configuration Dialog. """ # from PySide import QtGui -from PySide2 import QtWidgets +from PySide6 import QtWidgets from mod.translation_tools import __ from mod.gui_tools import h_line_generator diff --git a/mod/widgets/moorings/moordyn_parameters_dialog.py b/mod/widgets/moorings/moordyn_parameters_dialog.py index bfc7952..bcad8e8 100644 --- a/mod/widgets/moorings/moordyn_parameters_dialog.py +++ b/mod/widgets/moorings/moordyn_parameters_dialog.py @@ -5,7 +5,7 @@ from uuid import UUID # from PySide import QtGui, QtCore -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets from mod.translation_tools import __ from mod.enums import ObjectType diff --git a/mod/widgets/moorings/moorings_configuration_dialog.py b/mod/widgets/moorings/moorings_configuration_dialog.py index 5d2b882..dec26f7 100644 --- a/mod/widgets/moorings/moorings_configuration_dialog.py +++ b/mod/widgets/moorings/moorings_configuration_dialog.py @@ -5,7 +5,7 @@ from copy import deepcopy # from PySide import QtGui -from PySide2 import QtWidgets +from PySide6 import QtWidgets from mod.translation_tools import __ from mod.dialog_tools import error_dialog diff --git a/mod/widgets/motion/acc_circular_motion_timeline.py b/mod/widgets/motion/acc_circular_motion_timeline.py index f6c06b1..66b339b 100644 --- a/mod/widgets/motion/acc_circular_motion_timeline.py +++ b/mod/widgets/motion/acc_circular_motion_timeline.py @@ -3,7 +3,7 @@ """DesignSPHysics Accelerated Circular Motion Timeline widget""" # from PySide import QtGui, QtCore -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets from mod.translation_tools import __ from mod.gui_tools import get_icon diff --git a/mod/widgets/motion/acc_rectilinear_motion_timeline.py b/mod/widgets/motion/acc_rectilinear_motion_timeline.py index 2487d4a..8693951 100644 --- a/mod/widgets/motion/acc_rectilinear_motion_timeline.py +++ b/mod/widgets/motion/acc_rectilinear_motion_timeline.py @@ -3,7 +3,7 @@ """DesignSPHysics Accelerated Rectilinear Motion widget""" # from PySide import QtCore, QtGui -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets from mod.translation_tools import __ from mod.gui_tools import get_icon diff --git a/mod/widgets/motion/acc_rotational_motion_timeline.py b/mod/widgets/motion/acc_rotational_motion_timeline.py index 61bed86..6754bee 100644 --- a/mod/widgets/motion/acc_rotational_motion_timeline.py +++ b/mod/widgets/motion/acc_rotational_motion_timeline.py @@ -3,7 +3,7 @@ """DesignSPHysics Accelerated Rotation Motion widget""" # from PySide import QtCore, QtGui -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets from mod.translation_tools import __ from mod.gui_tools import get_icon diff --git a/mod/widgets/motion/cir_sinu_motion_timeline.py b/mod/widgets/motion/cir_sinu_motion_timeline.py index 2825890..17a712f 100644 --- a/mod/widgets/motion/cir_sinu_motion_timeline.py +++ b/mod/widgets/motion/cir_sinu_motion_timeline.py @@ -3,7 +3,7 @@ """DesignSPHysics Sinusoidal Circular Motion widget.""" # from PySide import QtCore, QtGui -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets from mod.translation_tools import __ from mod.gui_tools import get_icon diff --git a/mod/widgets/motion/file_motion_timeline.py b/mod/widgets/motion/file_motion_timeline.py index e351954..d745015 100644 --- a/mod/widgets/motion/file_motion_timeline.py +++ b/mod/widgets/motion/file_motion_timeline.py @@ -3,7 +3,7 @@ """DesignSPHysics File Based Motion Timeline Widget. """ # from PySide import QtCore, QtGui -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets from mod.translation_tools import __ from mod.gui_tools import h_line_generator diff --git a/mod/widgets/motion/focused_piston_wave_motion_timeline.py b/mod/widgets/motion/focused_piston_wave_motion_timeline.py index cbb7771..22ab371 100644 --- a/mod/widgets/motion/focused_piston_wave_motion_timeline.py +++ b/mod/widgets/motion/focused_piston_wave_motion_timeline.py @@ -3,7 +3,7 @@ """DesignSPHysics Focused Piston Wave Motion Timeline Widget""" # from PySide import QtCore, QtGui -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets from mod.translation_tools import __ from mod.gui_tools import h_line_generator diff --git a/mod/widgets/motion/irregular_flap_wave_motion_timeline.py b/mod/widgets/motion/irregular_flap_wave_motion_timeline.py index f6ee3f6..666c58b 100644 --- a/mod/widgets/motion/irregular_flap_wave_motion_timeline.py +++ b/mod/widgets/motion/irregular_flap_wave_motion_timeline.py @@ -3,7 +3,7 @@ """DesignSPHysics Irregular Flap Wave Motion timeline widget.""" # from PySide import QtCore, QtGui -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets from mod.translation_tools import __ from mod.gui_tools import h_line_generator diff --git a/mod/widgets/motion/irregular_piston_wave_motion_timeline.py b/mod/widgets/motion/irregular_piston_wave_motion_timeline.py index 0da4afa..4bb1df8 100644 --- a/mod/widgets/motion/irregular_piston_wave_motion_timeline.py +++ b/mod/widgets/motion/irregular_piston_wave_motion_timeline.py @@ -3,7 +3,7 @@ """DesignSPHysics Irregular Piston Wave Motion Timeline Widget""" # from PySide import QtCore, QtGui -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets from mod.translation_tools import __ from mod.gui_tools import h_line_generator diff --git a/mod/widgets/motion/movement_actions.py b/mod/widgets/motion/movement_actions.py index 4ec1fc3..c8a8ed6 100644 --- a/mod/widgets/motion/movement_actions.py +++ b/mod/widgets/motion/movement_actions.py @@ -3,7 +3,7 @@ """DesignSPHysics Movement Actions Widget. """ # from PySide import QtCore, QtGui -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets from mod.translation_tools import __ from mod.gui_tools import get_icon diff --git a/mod/widgets/motion/movement_dialog.py b/mod/widgets/motion/movement_dialog.py index 8df3bb2..1e951c6 100644 --- a/mod/widgets/motion/movement_dialog.py +++ b/mod/widgets/motion/movement_dialog.py @@ -5,7 +5,7 @@ import FreeCADGui # from PySide import QtCore, QtGui -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets from mod.translation_tools import __ from mod.gui_tools import get_icon diff --git a/mod/widgets/motion/movement_timeline_placeholder.py b/mod/widgets/motion/movement_timeline_placeholder.py index 5613472..a967fbd 100644 --- a/mod/widgets/motion/movement_timeline_placeholder.py +++ b/mod/widgets/motion/movement_timeline_placeholder.py @@ -3,7 +3,7 @@ """DesignSPHysics Movement Timeline Placeholder Widget """ # from PySide import QtGui -from PySide2 import QtWidgets +from PySide6 import QtWidgets from mod.translation_tools import __ diff --git a/mod/widgets/motion/rect_sinu_motion_timeline.py b/mod/widgets/motion/rect_sinu_motion_timeline.py index 2aa1d13..dcdff17 100644 --- a/mod/widgets/motion/rect_sinu_motion_timeline.py +++ b/mod/widgets/motion/rect_sinu_motion_timeline.py @@ -3,7 +3,7 @@ """DesignSPHysics Rectilinear Sinusoidal Motion Timeline """ # from PySide import QtCore, QtGui -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets from mod.translation_tools import __ from mod.gui_tools import get_icon diff --git a/mod/widgets/motion/rectilinear_motion_timeline.py b/mod/widgets/motion/rectilinear_motion_timeline.py index ffa3a10..e5e63fa 100644 --- a/mod/widgets/motion/rectilinear_motion_timeline.py +++ b/mod/widgets/motion/rectilinear_motion_timeline.py @@ -3,7 +3,7 @@ """DesignSPHysics Rectilinear Motion Timeline Widget """ # from PySide import QtCore, QtGui -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets from mod.translation_tools import __ from mod.gui_tools import get_icon diff --git a/mod/widgets/motion/regular_flap_wave_motion_timeline.py b/mod/widgets/motion/regular_flap_wave_motion_timeline.py index 81480b4..d906141 100644 --- a/mod/widgets/motion/regular_flap_wave_motion_timeline.py +++ b/mod/widgets/motion/regular_flap_wave_motion_timeline.py @@ -3,7 +3,7 @@ """DesignSPHysics Regular Flap Wave Motion Timeline Widget """ # from PySide import QtCore, QtGui -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets from mod.translation_tools import __ from mod.gui_tools import h_line_generator diff --git a/mod/widgets/motion/regular_piston_wave_motion_timeline.py b/mod/widgets/motion/regular_piston_wave_motion_timeline.py index 4a5b132..dc539c6 100644 --- a/mod/widgets/motion/regular_piston_wave_motion_timeline.py +++ b/mod/widgets/motion/regular_piston_wave_motion_timeline.py @@ -3,7 +3,7 @@ """DesignSPHysics Regular Piston Wave Motion Timeline Widget """ # from PySide import QtCore, QtGui -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets from mod.translation_tools import __ from mod.gui_tools import h_line_generator diff --git a/mod/widgets/motion/rot_sinu_motion_timeline.py b/mod/widgets/motion/rot_sinu_motion_timeline.py index b6947c1..15af2eb 100644 --- a/mod/widgets/motion/rot_sinu_motion_timeline.py +++ b/mod/widgets/motion/rot_sinu_motion_timeline.py @@ -3,7 +3,7 @@ """DesignSPHysics Rotationial Sinusoidal Motion Timeline Widget. """ # from PySide import QtCore, QtGui -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets from mod.translation_tools import __ from mod.gui_tools import get_icon diff --git a/mod/widgets/motion/rotation_file_motion_timeline.py b/mod/widgets/motion/rotation_file_motion_timeline.py index be0559d..fd3e585 100644 --- a/mod/widgets/motion/rotation_file_motion_timeline.py +++ b/mod/widgets/motion/rotation_file_motion_timeline.py @@ -3,7 +3,7 @@ """DesignSPHysics """ # from PySide import QtCore, QtGui -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets from mod.translation_tools import __ from mod.gui_tools import h_line_generator diff --git a/mod/widgets/motion/rotational_motion_timeline.py b/mod/widgets/motion/rotational_motion_timeline.py index 50f2f51..ebefbeb 100644 --- a/mod/widgets/motion/rotational_motion_timeline.py +++ b/mod/widgets/motion/rotational_motion_timeline.py @@ -3,7 +3,7 @@ """DesignSPHysics Rotational Motion Timeline Widget """ # from PySide import QtCore, QtGui -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets from mod.translation_tools import __ from mod.stdout_tools import debug diff --git a/mod/widgets/motion/wait_motion_timeline.py b/mod/widgets/motion/wait_motion_timeline.py index 5cbc341..7eddbb6 100644 --- a/mod/widgets/motion/wait_motion_timeline.py +++ b/mod/widgets/motion/wait_motion_timeline.py @@ -3,7 +3,7 @@ """DesignSPHysics Wait Motion Timeline Widget """ # from PySide import QtCore, QtGui -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets from mod.translation_tools import __ from mod.gui_tools import get_icon diff --git a/mod/widgets/motion/wave_movement_actions.py b/mod/widgets/motion/wave_movement_actions.py index f2a1358..642b6af 100644 --- a/mod/widgets/motion/wave_movement_actions.py +++ b/mod/widgets/motion/wave_movement_actions.py @@ -3,7 +3,7 @@ """DesignSPHysics Wave Movement Actions Widget. """ # from PySide import QtCore, QtGui -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets from mod.translation_tools import __ from mod.gui_tools import get_icon diff --git a/mod/widgets/object_order_widget.py b/mod/widgets/object_order_widget.py index 8e5219c..8bc856c 100644 --- a/mod/widgets/object_order_widget.py +++ b/mod/widgets/object_order_widget.py @@ -3,7 +3,7 @@ """DesignSPHysics Object Order widget""" # from PySide import QtGui -from PySide2 import QtWidgets +from PySide6 import QtWidgets from mod.translation_tools import __ from mod.gui_tools import get_icon diff --git a/mod/widgets/postprocessing/computeforces_dialog.py b/mod/widgets/postprocessing/computeforces_dialog.py index 1069d7a..7d59e16 100644 --- a/mod/widgets/postprocessing/computeforces_dialog.py +++ b/mod/widgets/postprocessing/computeforces_dialog.py @@ -3,7 +3,7 @@ """DesignSPHysics ComputeForces Config and Execution Dialog.""" # from PySide import QtGui -from PySide2 import QtWidgets +from PySide6 import QtWidgets from mod.translation_tools import __ from mod.post_processing_tools import computeforces_export diff --git a/mod/widgets/postprocessing/export_progress_dialog.py b/mod/widgets/postprocessing/export_progress_dialog.py index 3165586..53a7ed1 100644 --- a/mod/widgets/postprocessing/export_progress_dialog.py +++ b/mod/widgets/postprocessing/export_progress_dialog.py @@ -3,7 +3,7 @@ """DesignSPHysics Execution Progress Dialog.""" # from PySide import QtGui, QtCore -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets from mod.translation_tools import __ diff --git a/mod/widgets/postprocessing/floatinginfo_dialog.py b/mod/widgets/postprocessing/floatinginfo_dialog.py index 9ad2f81..1a44910 100644 --- a/mod/widgets/postprocessing/floatinginfo_dialog.py +++ b/mod/widgets/postprocessing/floatinginfo_dialog.py @@ -3,7 +3,7 @@ """DesignSPHysics FloatingInfo configuration and execution Dialog.""" # from PySide import QtGui -from PySide2 import QtWidgets +from PySide6 import QtWidgets from mod.translation_tools import __ from mod.post_processing_tools import floatinginfo_export diff --git a/mod/widgets/postprocessing/flowtool_box_edit_dialog.py b/mod/widgets/postprocessing/flowtool_box_edit_dialog.py index 787bbc6..68d514d 100644 --- a/mod/widgets/postprocessing/flowtool_box_edit_dialog.py +++ b/mod/widgets/postprocessing/flowtool_box_edit_dialog.py @@ -3,7 +3,7 @@ """DesignSPHysics FlowTool Box Edit Dialog.""" # from PySide import QtGui, QtCore -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets from mod.translation_tools import __ from mod.dialog_tools import error_dialog diff --git a/mod/widgets/postprocessing/flowtool_dialog.py b/mod/widgets/postprocessing/flowtool_dialog.py index 7a3f183..9e698d0 100644 --- a/mod/widgets/postprocessing/flowtool_dialog.py +++ b/mod/widgets/postprocessing/flowtool_dialog.py @@ -3,7 +3,7 @@ """DesignSPHysics FlowTool Config and Execution Dialog.""" # from PySide import QtGui -from PySide2 import QtWidgets +from PySide6 import QtWidgets from mod.translation_tools import __ from mod.file_tools import create_flowtool_boxes diff --git a/mod/widgets/postprocessing/isosurface_dialog.py b/mod/widgets/postprocessing/isosurface_dialog.py index 51ce03d..f7a56b9 100644 --- a/mod/widgets/postprocessing/isosurface_dialog.py +++ b/mod/widgets/postprocessing/isosurface_dialog.py @@ -3,7 +3,7 @@ """DesignSPHysics IsoSurface Config and Execution Dialog.""" # from PySide import QtGui -from PySide2 import QtWidgets +from PySide6 import QtWidgets from mod.translation_tools import __ from mod.post_processing_tools import isosurface_export diff --git a/mod/widgets/postprocessing/measuretool_dialog.py b/mod/widgets/postprocessing/measuretool_dialog.py index c2bc7e8..56d1c56 100644 --- a/mod/widgets/postprocessing/measuretool_dialog.py +++ b/mod/widgets/postprocessing/measuretool_dialog.py @@ -3,7 +3,7 @@ """DesignSPHysics ComputeForces Config and Execution Dialog.""" # from PySide import QtGui, QtCore -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets from mod.translation_tools import __ from mod.post_processing_tools import measuretool_export diff --git a/mod/widgets/postprocessing/measuretool_grid_dialog.py b/mod/widgets/postprocessing/measuretool_grid_dialog.py index 6dd5aba..8339b41 100644 --- a/mod/widgets/postprocessing/measuretool_grid_dialog.py +++ b/mod/widgets/postprocessing/measuretool_grid_dialog.py @@ -3,7 +3,7 @@ """DesignSPHysics MeasureTool Grid Dialog """ # from PySide import QtCore, QtGui -from PySide2 import QtCore, QtWidgets, QtGui +from PySide6 import QtCore, QtWidgets, QtGui from mod.translation_tools import __ from mod.stdout_tools import debug diff --git a/mod/widgets/postprocessing/measuretool_points_dialog.py b/mod/widgets/postprocessing/measuretool_points_dialog.py index 5355066..95ecdf0 100644 --- a/mod/widgets/postprocessing/measuretool_points_dialog.py +++ b/mod/widgets/postprocessing/measuretool_points_dialog.py @@ -3,7 +3,7 @@ """DesignSPHysics ComputeForces Points configuration Dialog.""" # from PySide import QtGui -from PySide2 import QtWidgets +from PySide6 import QtWidgets from mod.translation_tools import __ diff --git a/mod/widgets/postprocessing/partvtk_dialog.py b/mod/widgets/postprocessing/partvtk_dialog.py index 041feeb..6224d87 100644 --- a/mod/widgets/postprocessing/partvtk_dialog.py +++ b/mod/widgets/postprocessing/partvtk_dialog.py @@ -3,7 +3,7 @@ """DesignSPHysics PartVTK Config and Execution Dialog.""" # from PySide import QtGui, QtCore -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets from mod.translation_tools import __ from mod.post_processing_tools import partvtk_export diff --git a/mod/widgets/properties_dock_widget.py b/mod/widgets/properties_dock_widget.py index fd70062..ab9355c 100644 --- a/mod/widgets/properties_dock_widget.py +++ b/mod/widgets/properties_dock_widget.py @@ -6,7 +6,7 @@ import FreeCADGui # from PySide import QtCore, QtGui -from PySide2 import QtCore, QtWidgets +from PySide6 import QtCore, QtWidgets from mod.translation_tools import __ from mod.enums import ObjectType, ObjectFillMode, FreeCADObjectType, HelpURL diff --git a/mod/widgets/relaxation_zone_file_config_dialog.py b/mod/widgets/relaxation_zone_file_config_dialog.py index 0061ff3..e4f0460 100644 --- a/mod/widgets/relaxation_zone_file_config_dialog.py +++ b/mod/widgets/relaxation_zone_file_config_dialog.py @@ -5,7 +5,7 @@ from os import path # from PySide import QtGui -from PySide2 import QtWidgets +from PySide6 import QtWidgets from mod.translation_tools import __ diff --git a/mod/widgets/relaxation_zone_irregular_config_dialog.py b/mod/widgets/relaxation_zone_irregular_config_dialog.py index 2a6e97a..0c2216e 100644 --- a/mod/widgets/relaxation_zone_irregular_config_dialog.py +++ b/mod/widgets/relaxation_zone_irregular_config_dialog.py @@ -3,7 +3,7 @@ """DesignSPHysics Relaxation Zone Irregular Config Dialog """ # from PySide import QtGui -from PySide2 import QtWidgets +from PySide6 import QtWidgets from mod.translation_tools import __ diff --git a/mod/widgets/relaxation_zone_regular_config_dialog.py b/mod/widgets/relaxation_zone_regular_config_dialog.py index 9bf1a72..0b1c0f9 100644 --- a/mod/widgets/relaxation_zone_regular_config_dialog.py +++ b/mod/widgets/relaxation_zone_regular_config_dialog.py @@ -3,7 +3,7 @@ """DesignSPHysics Relaxation Zone Regular Config Dialog. """ # from PySide import QtGui -from PySide2 import QtWidgets +from PySide6 import QtWidgets from mod.translation_tools import __ diff --git a/mod/widgets/relaxation_zone_uniform_config_dialog.py b/mod/widgets/relaxation_zone_uniform_config_dialog.py index 60373bd..b7bc21a 100644 --- a/mod/widgets/relaxation_zone_uniform_config_dialog.py +++ b/mod/widgets/relaxation_zone_uniform_config_dialog.py @@ -3,7 +3,7 @@ """DesignSPHysics Relaxation Zone Uniform Config Dialog. """ # from PySide import QtGui -from PySide2 import QtWidgets +from PySide6 import QtWidgets from mod.translation_tools import __ from mod.freecad_tools import get_fc_main_window diff --git a/mod/widgets/run_additional_parameters_dialog.py b/mod/widgets/run_additional_parameters_dialog.py index 11d3293..0d1fa4b 100644 --- a/mod/widgets/run_additional_parameters_dialog.py +++ b/mod/widgets/run_additional_parameters_dialog.py @@ -3,7 +3,7 @@ """DesignSPHysics Additional Parameters Dialog for running configuration. """ # from PySide import QtGui -from PySide2 import QtWidgets +from PySide6 import QtWidgets from mod.translation_tools import __ diff --git a/mod/widgets/run_dialog.py b/mod/widgets/run_dialog.py index c058499..ba2fafa 100644 --- a/mod/widgets/run_dialog.py +++ b/mod/widgets/run_dialog.py @@ -3,7 +3,7 @@ """DesignSPHysics Run Dialog""" # from PySide import QtCore, QtGui -from PySide2 import QtCore, QtWidgets, QtGui +from PySide6 import QtCore, QtWidgets, QtGui from mod.translation_tools import __ from mod.constants import LINE_END diff --git a/mod/widgets/setup_plugin_dialog.py b/mod/widgets/setup_plugin_dialog.py index 6d85b28..894ac5a 100644 --- a/mod/widgets/setup_plugin_dialog.py +++ b/mod/widgets/setup_plugin_dialog.py @@ -3,7 +3,7 @@ """DesignSPHysics Setup Plugin Dialog """ # from PySide import QtGui -from PySide2 import QtWidgets +from PySide6 import QtWidgets from mod.translation_tools import __ from mod.executable_tools import executable_contains_string diff --git a/mod/widgets/special_options_selector_dialog.py b/mod/widgets/special_options_selector_dialog.py index dd60cb8..2ac729b 100644 --- a/mod/widgets/special_options_selector_dialog.py +++ b/mod/widgets/special_options_selector_dialog.py @@ -5,7 +5,7 @@ import FreeCADGui # from PySide import QtGui -from PySide2 import QtWidgets +from PySide6 import QtWidgets from mod.translation_tools import __ from mod.dialog_tools import error_dialog, warning_dialog, ok_cancel_dialog diff --git a/mod/widgets/velocity_times_dialog.py b/mod/widgets/velocity_times_dialog.py index 362967f..2da8fc7 100644 --- a/mod/widgets/velocity_times_dialog.py +++ b/mod/widgets/velocity_times_dialog.py @@ -3,7 +3,7 @@ """DesignSPHysics Velocity Times Dialog """ # from PySide import QtGui -from PySide2 import QtWidgets +from PySide6 import QtWidgets from mod.translation_tools import __ From dd42ec593ee05203dbdf118f5f828fbb0d4ca6c6 Mon Sep 17 00:00:00 2001 From: Giovani Del Nero Diniz Date: Fri, 11 Apr 2025 21:06:44 -0700 Subject: [PATCH 2/2] add(readme): adding readme notes for clarity --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index c1088e7..9d23087 100644 --- a/README.md +++ b/README.md @@ -39,6 +39,9 @@ To execute DesignSPHysics just open the same Macro dialog and double click DualS ### Installing a development build Clone the branch that you like from this repository and rename the folder to 'DesignSPHysics'. Then copy the folder to the Mod folder of the FreeCAD installation directory. +> Note: in FreeCAD 1.0 - flatpak - the repo should be cloned here: +`/home/ubuntu/.var/app/org.freecad.FreeCAD/data/FreeCAD/Mod/` + By default, for example, in Windows, it is located in `%appdata%/FreeCAD/Mod` or in Linux in `~/.FreeCAD/Mod` Then copy the file `DesignSPHysics.FCMacro` of this repository into the FreeCAD macro directory (`%appdata%/FreeCAD/Macro` on Windows; `~/.FreeCAD/Macro` on GNU/Linux)