mirror of https://gitlab.com/pamhyr/pamhyr2
add waiting dialog while meshing
parent
279fa0bf5e
commit
d934b5e381
|
|
@ -884,12 +884,12 @@ class ProfileXYZ(Profile, SQLSubModel):
|
||||||
if abs(self.point(i_left - 1).z - self.point(i_left).z) < 1e-20:
|
if abs(self.point(i_left - 1).z - self.point(i_left).z) < 1e-20:
|
||||||
pt_left = self.point(i_left)
|
pt_left = self.point(i_left)
|
||||||
else:
|
else:
|
||||||
fact = (z - self.point(i_left).z) / (self.point(i_left - 1).z
|
fact = (z - self.point(i_left).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
|
x = self.point(i_left).x + fact * \
|
||||||
- self.point(i_left).x)
|
(self.point(i_left - 1).x - self.point(i_left).x)
|
||||||
y = self.point(i_left).y + fact * (self.point(i_left - 1).y
|
y = self.point(i_left).y + fact * \
|
||||||
- self.point(i_left).y)
|
(self.point(i_left - 1).y - self.point(i_left).y)
|
||||||
pt_left = PointXYZ(x=x, y=y, z=z, name="wl_left")
|
pt_left = PointXYZ(x=x, y=y, z=z, name="wl_left")
|
||||||
else:
|
else:
|
||||||
pt_left = self.point(0)
|
pt_left = self.point(0)
|
||||||
|
|
@ -900,11 +900,11 @@ class ProfileXYZ(Profile, SQLSubModel):
|
||||||
pt_right = self.point(i_right)
|
pt_right = self.point(i_right)
|
||||||
else:
|
else:
|
||||||
fact = (z - self.point(i_right).z) / \
|
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 * \
|
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 * \
|
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")
|
pt_right = PointXYZ(x=x, y=y, z=z, name="wl_right")
|
||||||
else:
|
else:
|
||||||
pt_right = self.point(self.number_points - 1)
|
pt_right = self.point(self.number_points - 1)
|
||||||
|
|
|
||||||
|
|
@ -50,6 +50,8 @@ from View.Tools.Plot.PamhyrCanvas import MplCanvas
|
||||||
|
|
||||||
from View.SelectReach.Window import SelectReachWindow
|
from View.SelectReach.Window import SelectReachWindow
|
||||||
|
|
||||||
|
from View.WaitingDialog import WaitingDialog
|
||||||
|
|
||||||
from Meshing.Internal import InternalMeshing
|
from Meshing.Internal import InternalMeshing
|
||||||
|
|
||||||
from View.Geometry.Table import GeometryReachTableModel
|
from View.Geometry.Table import GeometryReachTableModel
|
||||||
|
|
@ -326,7 +328,19 @@ class GeometryWindow(PamhyrWindow):
|
||||||
def _edit_meshing(self, data):
|
def _edit_meshing(self, data):
|
||||||
try:
|
try:
|
||||||
mesher = InternalMeshing()
|
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:
|
except Exception as e:
|
||||||
logger_exception(e)
|
logger_exception(e)
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue