From d934b5e38139f346b52ef6587306f248cde2a7f5 Mon Sep 17 00:00:00 2001 From: Theophile Terraz Date: Tue, 4 Nov 2025 09:24:51 +0100 Subject: [PATCH] add waiting dialog while meshing --- src/Model/Geometry/ProfileXYZ.py | 18 +++++++++--------- src/View/Geometry/Window.py | 16 +++++++++++++++- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/src/Model/Geometry/ProfileXYZ.py b/src/Model/Geometry/ProfileXYZ.py index 323fb9bc..2a4f87fd 100644 --- a/src/Model/Geometry/ProfileXYZ.py +++ b/src/Model/Geometry/ProfileXYZ.py @@ -884,12 +884,12 @@ class ProfileXYZ(Profile, SQLSubModel): if abs(self.point(i_left - 1).z - self.point(i_left).z) < 1e-20: pt_left = self.point(i_left) else: - fact = (z - self.point(i_left).z) / (self.point(i_left - 1).z - - self.point(i_left).z) - x = self.point(i_left).x + fact * (self.point(i_left - 1).x - - self.point(i_left).x) - y = self.point(i_left).y + fact * (self.point(i_left - 1).y - - self.point(i_left).y) + fact = (z - self.point(i_left).z) / \ + (self.point(i_left - 1).z - self.point(i_left).z) + x = self.point(i_left).x + fact * \ + (self.point(i_left - 1).x - self.point(i_left).x) + y = self.point(i_left).y + fact * \ + (self.point(i_left - 1).y - self.point(i_left).y) pt_left = PointXYZ(x=x, y=y, z=z, name="wl_left") else: pt_left = self.point(0) @@ -900,11 +900,11 @@ class ProfileXYZ(Profile, SQLSubModel): pt_right = self.point(i_right) else: fact = (z - self.point(i_right).z) / \ - (self.point(i_right + 1).z - self.point(i_right).z) + (self.point(i_right + 1).z - self.point(i_right).z) x = self.point(i_right).x + fact * \ - (self.point(i_right + 1).x - self.point(i_right).x) + (self.point(i_right + 1).x - self.point(i_right).x) y = self.point(i_right).y + fact * \ - (self.point(i_right + 1).y - self.point(i_right).y) + (self.point(i_right + 1).y - self.point(i_right).y) pt_right = PointXYZ(x=x, y=y, z=z, name="wl_right") else: pt_right = self.point(self.number_points - 1) diff --git a/src/View/Geometry/Window.py b/src/View/Geometry/Window.py index b28754a5..13f25e30 100644 --- a/src/View/Geometry/Window.py +++ b/src/View/Geometry/Window.py @@ -50,6 +50,8 @@ from View.Tools.Plot.PamhyrCanvas import MplCanvas from View.SelectReach.Window import SelectReachWindow +from View.WaitingDialog import WaitingDialog + from Meshing.Internal import InternalMeshing from View.Geometry.Table import GeometryReachTableModel @@ -326,7 +328,19 @@ class GeometryWindow(PamhyrWindow): def _edit_meshing(self, data): try: mesher = InternalMeshing() - self._table.meshing(mesher, data, self.tableView) + tableview = self.tableView + + def fn(): + self._table.meshing(mesher, data, tableview) + # self._table.meshing(mesher, data, tableview) + dlg2 = WaitingDialog( + payload_fn=fn, + title="waiting_mesh", + parent=self + ) + dlg2.exec_() + self._table.update() + except Exception as e: logger_exception(e)