Merge pull request #20 from gramaziokohler/multi_dims

multi dimensions WIP

src/compas_cadwork/scene/instructionobject.py

@@ -134,12 +134,12 @@ def draw(self, *args, **kwargs):
 
         text_plane_normal = self.linear_dimension.location.normal * -1.0
         text_plane_origin = self.linear_dimension.location.point.copy()
-        text_plane_origin.z += self.linear_dimension.offset
+        # text_plane_origin.z += self.linear_dimension.offset
         element_id = create_dimension(
             vector_to_cadwork(direction),
             vector_to_cadwork(text_plane_normal),
             point_to_cadwork(text_plane_origin),
-            [point_to_cadwork(self.linear_dimension.start), point_to_cadwork(self.linear_dimension.end)],
+            [point_to_cadwork(point) for point in self.linear_dimension.points],
         )
         element = self.add_element(element_id)
         element.set_is_instruction(True, self.linear_dimension.id)

src/compas_cadwork/utilities/__init__.py

@@ -1,6 +1,5 @@
 from typing import List
 from typing import Dict
-from typing import Tuple
 from typing import Union
 from typing import Generator
 
@@ -11,18 +10,16 @@
 import element_controller as ec
 import attribute_controller as ac
 import visualization_controller as vc
-import dimension_controller as dc
 
 from compas.geometry import Point
-from compas.geometry import Vector
 from compas_cadwork.datamodel import Element
 from compas_cadwork.datamodel import ElementGroup
 from compas_cadwork.datamodel.element import StrEnum
 from compas_cadwork.conversions import point_to_compas
-from compas_cadwork.conversions import vector_to_compas
 
 from .ifc_export import IFCExporter
 from .ifc_export import IFCExportSettings
+from .dimensions import get_dimension_data
 
 
 class CameraView(StrEnum):
@@ -371,35 +368,6 @@ def save_project_file():
     uc.save_3d_file_silently()
 
 
-def get_dimension_data(element: Union[int, Element]) -> Tuple[List[Point], Vector, float]:
-    """Get linear dimension by its element id or Element object.
-
-    TODO: Return a LinearDimension object instead of a tuple once it's out of monosashi.
-    TODO: Not doing it now to avoid circular dependency.
-
-    Parameters
-    ----------
-    element : int or :class:`Element`
-        The element id or Element object.
-
-    Returns
-    -------
-    tuple
-        A tuple of (points, xaxis, text_normal, distances).
-
-    """
-    distances = []
-    element_id = element.id if isinstance(element, Element) else element
-    points = dc.get_dimension_points(element_id)
-    points = [point_to_compas(p) for p in points]
-    text_normal = Vector(*dc.get_plane_normal(element_id))
-    for i in range(dc.get_segment_count(element_id)):
-        distances.append(dc.get_segment_distance(element_id, i))
-    xaxis = vector_to_compas(dc.get_plane_xl(element_id))
-
-    return points, xaxis, text_normal, distances
-
-
 __all__ = [
     "IFCExporter",
     "IFCExportSettings",

src/compas_cadwork/utilities/dimensions.py

@@ -0,0 +1,85 @@
+from typing import List
+from typing import Tuple
+from typing import Union
+
+import dimension_controller as dc
+
+from compas.geometry import Frame
+from compas.geometry import Point
+from compas.geometry import Plane
+from compas.geometry import Vector
+from compas.geometry import closest_point_on_plane
+
+from compas_cadwork.datamodel import Element
+from compas_cadwork.conversions import point_to_compas
+from compas_cadwork.conversions import vector_to_compas
+
+
+def _get_dimension_element(element: Union[int, Element]) -> Tuple[List[Point], Vector, float]:
+    distances = []
+    element_id = element.id if isinstance(element, Element) else element
+    points = dc.get_dimension_points(element_id)
+    points = [point_to_compas(p) for p in points]
+    text_normal = Vector(*dc.get_plane_normal(element_id))
+    seg_count = dc.get_segment_count(element_id)
+    for i in range(seg_count):
+        distances.append(dc.get_segment_distance(element_id, i))
+    xaxis = vector_to_compas(dc.get_plane_xl(element_id))
+
+    return points, xaxis, text_normal, distances
+
+
+def _frame_from_dim(points, xaxis, text_normal):
+    """Construct a Frame object from the dimension points and text normal."""
+    zaxis = -Vector(*text_normal)
+    yaxis = xaxis.cross(zaxis).unitized()
+    ref_frame = Frame(points[0], xaxis, yaxis)
+    return ref_frame
+
+
+def _shift_anchor_points_to_line(points, distances, ref_frame):
+    plane = Plane.from_frame(ref_frame)
+
+    if _are_anchors_above_line(points, ref_frame):
+        direction = ref_frame.yaxis
+    else:
+        direction = -ref_frame.yaxis
+
+    new_anchors = []
+    for point, distance in zip(points, distances):
+        point = point + direction * distance
+        point = Point(*closest_point_on_plane(point, plane))
+        new_anchors.append(point)
+    new_frame = Frame(new_anchors[0], ref_frame.xaxis, ref_frame.yaxis)
+    return new_anchors, new_frame
+
+
+def _are_anchors_above_line(points, ref_frame):
+    """Check if the anchors of the dimension are above the line."""
+    # TODO: not sure how to implement this yet.
+    # the points received from get_dimension_points are the anchor points
+    # the actual line has no representation except the absolute value distance..
+    return True
+
+
+def get_dimension_data(element: Union[int, Element]) -> Tuple[Frame, List[Point]]:
+    """Get linear dimension by its element id or Element object.
+
+    TODO: Return a LinearDimension object instead of a tuple once it's out of monosashi.
+    TODO: Not doing it now to avoid circular dependency.
+
+    Parameters
+    ----------
+    element : int or :class:`Element`
+        The element id or Element object.
+
+    Returns
+    -------
+    tuple
+        A tuple of (points, xaxis, text_normal, distances).
+
+    """
+    points, xaxis, text_normal, distances = _get_dimension_element(element)
+    ref_frame = _frame_from_dim(points, xaxis, text_normal)
+    new_anchors, new_frame = _shift_anchor_points_to_line(points, distances, ref_frame)
+    return new_frame, new_anchors