parouby
/
Pamhyr2
mirror of https://gitlab.com/pamhyr/pamhyr2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Geometry: Reverte purge algorithme to previous version (modified).

scenarios
Pierre-Antoine 2025-09-11 10:01:18 +02:00
parent 4ba232a7e4
commit 37ea9e9083
2 changed files with 32 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Model/Geometry/PointXYZ.py
View File

@ -373,8 +373,8 @@ class PointXYZ(Point):
c = PointXYZ.distance(p3, p1) c = PointXYZ.distance(p3, p1)
s = float((a + b + c) / 2) s = float((a + b + c) / 2)
res = ( res = abs(
s * abs(s - a) * abs(s - b) * abs(s - c) s * (s - a) * (s - b) * (s - c)
) ** 0.5 ) ** 0.5
return res return res

62
src/Model/Geometry/ProfileXYZ.py
View File

@ -1008,49 +1008,47 @@ class ProfileXYZ(Profile, SQLSubModel):
""" """
Remove points to keep at most np_purge points. Remove points to keep at most np_purge points.
""" """
if (self.nb_points <= np_purge): if self.nb_points <= np_purge:
return return
q_area = queue.PriorityQueue() nb_named = 0 # we consider the first and last point as named
deleted = [] area = []
for ind, point in enumerate(self.points): for i, p in enumerate(self.points):
if (ind == 0) or (ind == self.nb_points - 1): if p.is_named() or i == 0 or i == self.nb_points - 1:
continue area.append((9999999.999, p))
nb_named += 1
if not point.is_named(): else:
q_area.put(( area.append((
PointXYZ.areatriangle3d( PointXYZ.areatriangle3d(
self.point(ind - 1), self.point(i-1),
point, p,
self.point(ind + 1) self.point(i+1)
), ),
ind, point p
)) ))
while self.nb_points > np_purge and not q_area.empty(): while self.nb_points > max(np_purge, nb_named):
area, ind, point = q_area.get() ind, (min_area, p) = min(
enumerate(area),
key=lambda t: t[1][0]
)
self.delete_points([point]) p.set_as_deleted()
deleted.append(point) area.pop(ind)
# Recompute point neighbourhood
for i in [ind-1, ind]: for i in [ind-1, ind]:
if (i <= 0) or (i >= self.nb_points - 1): p = self.point(i)
continue
point = self.point(i) if p.is_named() or i == 0 or i == self.nb_points - 1:
if not point.is_named(): area[i] = (9999999.999, p)
q_area.put(( else:
PointXYZ.areatriangle3d( area[i] = (
self.point(i-1), PointXYZ.areatriangle3d(
point, self.point(i-1), p, self.point(i+1)
self.point(i+1) ),
), i, point p
)) )
self.modified()
return deleted
def shift(self, x, y, z): def shift(self, x, y, z):
for p in self._points: for p in self._points: