mirror of
https://github.com/IfcOpenShell/IfcOpenShell.git
synced 2026-09-24 15:07:38 +00:00
regenerate_wall_representation - remove debug prints
This commit is contained in:
@@ -107,8 +107,6 @@ class Regenerator:
|
|||||||
)
|
)
|
||||||
|
|
||||||
def regenerate(self, wall, length=1.0, height=1.0, angle=None):
|
def regenerate(self, wall, length=1.0, height=1.0, angle=None):
|
||||||
print("-" * 100)
|
|
||||||
print(wall)
|
|
||||||
self.fallback_length = length / self.unit_scale
|
self.fallback_length = length / self.unit_scale
|
||||||
self.fallback_height = height / self.unit_scale
|
self.fallback_height = height / self.unit_scale
|
||||||
self.fallback_angle = angle
|
self.fallback_angle = angle
|
||||||
@@ -164,9 +162,6 @@ class Regenerator:
|
|||||||
np.array((maxx, axes[0][0][1])),
|
np.array((maxx, axes[0][0][1])),
|
||||||
np.array((maxx, axes[-1][0][1])),
|
np.array((maxx, axes[-1][0][1])),
|
||||||
]
|
]
|
||||||
print("FINISHED")
|
|
||||||
print(self.start_points)
|
|
||||||
print(self.end_points)
|
|
||||||
|
|
||||||
if self.start_points[0][1] > self.start_points[-1][1]: # Canonicalise to the +Y direction
|
if self.start_points[0][1] > self.start_points[-1][1]: # Canonicalise to the +Y direction
|
||||||
self.start_points.reverse()
|
self.start_points.reverse()
|
||||||
@@ -360,8 +355,6 @@ class Regenerator:
|
|||||||
return
|
return
|
||||||
if connection1 == "ATPATH" and connection2 == "ATPATH":
|
if connection1 == "ATPATH" and connection2 == "ATPATH":
|
||||||
return
|
return
|
||||||
print("joining", wall1, layers1, connection1)
|
|
||||||
print("to", wall2, layers2, connection2)
|
|
||||||
|
|
||||||
reference1 = ifcopenshell.util.representation.get_reference_line(wall1, self.fallback_length)
|
reference1 = ifcopenshell.util.representation.get_reference_line(wall1, self.fallback_length)
|
||||||
reference2 = ifcopenshell.util.representation.get_reference_line(wall2, self.fallback_length)
|
reference2 = ifcopenshell.util.representation.get_reference_line(wall2, self.fallback_length)
|
||||||
@@ -370,8 +363,6 @@ class Regenerator:
|
|||||||
axes2 = self.get_axes(wall2, reference2, layers2, wall_vectors2["a"])
|
axes2 = self.get_axes(wall2, reference2, layers2, wall_vectors2["a"])
|
||||||
matrix1i = np.linalg.inv(ifcopenshell.util.placement.get_local_placement(wall1.ObjectPlacement))
|
matrix1i = np.linalg.inv(ifcopenshell.util.placement.get_local_placement(wall1.ObjectPlacement))
|
||||||
matrix2 = ifcopenshell.util.placement.get_local_placement(wall2.ObjectPlacement)
|
matrix2 = ifcopenshell.util.placement.get_local_placement(wall2.ObjectPlacement)
|
||||||
print(axes1)
|
|
||||||
print(axes2)
|
|
||||||
|
|
||||||
# Convert wall2 data to wall1 local coordinates
|
# Convert wall2 data to wall1 local coordinates
|
||||||
for axis in axes2:
|
for axis in axes2:
|
||||||
@@ -408,9 +399,6 @@ class Regenerator:
|
|||||||
axes1 = list(reversed(axes1))
|
axes1 = list(reversed(axes1))
|
||||||
layers1 = list(reversed(layers1))
|
layers1 = list(reversed(layers1))
|
||||||
|
|
||||||
print("modified")
|
|
||||||
print(axes1)
|
|
||||||
print(axes2)
|
|
||||||
if connection1 == "ATPATH":
|
if connection1 == "ATPATH":
|
||||||
first_axis2 = axes2[0]
|
first_axis2 = axes2[0]
|
||||||
last_axis2 = axes2[-1]
|
last_axis2 = axes2[-1]
|
||||||
@@ -519,7 +507,6 @@ class Regenerator:
|
|||||||
|
|
||||||
# This creates "mitering" behaviour which is an ambiguity by bSI.
|
# This creates "mitering" behaviour which is an ambiguity by bSI.
|
||||||
while layer1 and layer2:
|
while layer1 and layer2:
|
||||||
print("considering", layer1, layer2)
|
|
||||||
if layer1.priority > layer2.priority:
|
if layer1.priority > layer2.priority:
|
||||||
axis2 = next(axes2)
|
axis2 = next(axes2)
|
||||||
x = ifcopenshell.util.shape_builder.intersect_x_axis_2d(*axis2, y=y)
|
x = ifcopenshell.util.shape_builder.intersect_x_axis_2d(*axis2, y=y)
|
||||||
@@ -535,7 +522,6 @@ class Regenerator:
|
|||||||
layer2 = next(layers2, None)
|
layer2 = next(layers2, None)
|
||||||
points.append(np.array((x, y)))
|
points.append(np.array((x, y)))
|
||||||
|
|
||||||
print("points", points)
|
|
||||||
if points[-1][1] != last_y:
|
if points[-1][1] != last_y:
|
||||||
points.append(
|
points.append(
|
||||||
np.array((ifcopenshell.util.shape_builder.intersect_x_axis_2d(*last_axis2, y=last_y), last_y))
|
np.array((ifcopenshell.util.shape_builder.intersect_x_axis_2d(*last_axis2, y=last_y), last_y))
|
||||||
|
|||||||
Reference in New Issue
Block a user