tna

Author: tomvanmele

plugin/RV_tna_horizontal.py

@@ -7,66 +7,57 @@
 
 from compas.geometry import Box
 from compas.geometry import bounding_box
-from compas_rv.datastructures import ForceDiagram
-from compas_rv.datastructures import FormDiagram
-from compas_rv.scene import RhinoForceObject
-from compas_rv.scene import RhinoFormObject
 from compas_rv.session import RVSession
 from compas_tna.equilibrium import horizontal_nodal
 
 
 def RunCommand():
     session = RVSession()
 
-    formobj: RhinoFormObject = session.scene.find_by_itemtype(FormDiagram)
-    if not formobj:
+    form = session.find_formdiagram()
+    if not form:
         return
 
-    forceobj: RhinoForceObject = session.scene.find_by_itemtype(ForceDiagram)
-    if not forceobj:
+    force = session.find_forcediagram()
+    if not force:
         return
 
     # =============================================================================
     # Compute horizontal
     # =============================================================================
 
-    kmax = session.settings.tna.horizontal.kmax
-    alpha = session.settings.tna.horizontal.alpha
+    kmax = session.settings.tna.horizontal_kmax
+    alpha = session.settings.tna.horizontal_alpha
 
-    horizontal_nodal(formobj.mesh, forceobj.mesh, kmax=kmax, alpha=alpha)
+    horizontal_nodal(form.diagram, force.diagram, kmax=kmax, alpha=alpha)
 
-    bbox_form = Box.from_bounding_box(bounding_box(formobj.mesh.vertices_attributes("xyz")))
-    bbox_force = Box.from_bounding_box(bounding_box(forceobj.mesh.vertices_attributes("xyz")))
+    bbox_form = Box.from_bounding_box(bounding_box(form.diagram.vertices_attributes("xyz")))
+    bbox_force = Box.from_bounding_box(bounding_box(force.diagram.vertices_attributes("xyz")))
 
     y_form = bbox_form.ymin + 0.5 * (bbox_form.ymax - bbox_form.ymin)
     y_force = bbox_force.ymin + 0.5 * (bbox_force.ymax - bbox_force.ymin)
     dx = 1.3 * (bbox_form.xmax - bbox_form.xmin) + (bbox_form.xmin - bbox_force.xmin)
     dy = y_form - y_force
 
-    forceobj.mesh.translate([dx, dy, 0])
-    forceobj.mesh.update_angle_deviations()
+    force.diagram.translate([dx, dy, 0])
 
     # =============================================================================
     # Update scene
     # =============================================================================
 
-    # max_angle = max(form.diagram.edges_attribute("_a"))
-    # tol = ui.registry["RV3"]["tol.angles"]
+    max_angle = max(form.diagram.edges_attribute("_a"))
+    tol_angles = session.settings.tna.horizontal_max_angle
 
-    # if max_angle < tol:
-    #     print("Horizontal equilibrium found!\nMaximum angle deviation: {}".format(max_angle))
-    # else:
-    #     compas_rhino.display_message("Horizontal equilibrium NOT found! Consider running more iterations.\nMaximum angle deviation: {}".format(max_angle))
+    if max_angle < tol_angles:
+        print(f"Horizontal equilibrium found!\nMaximum angle deviation: {max_angle} < {tol_angles}")
+    else:
+        rs.MessageBox(f"Horizontal equilibrium NOT found! Consider running more iterations.\nMaximum angle deviation: {max_angle} > {tol_angles}")
 
     rs.UnselectAllObjects()
 
     session.scene.redraw()
     rs.Redraw()
 
-    # =============================================================================
-    # Save session
-    # =============================================================================
-
     if session.settings.autosave:
         session.record(name="TNA Horizontal")
 

plugin/RV_tna_vertical.py

@@ -5,60 +5,69 @@
 
 import rhinoscriptsyntax as rs  # type: ignore
 
-from compas_rv.datastructures import FormDiagram
 from compas_rv.datastructures import ThrustDiagram
-from compas_rv.scene import RhinoFormObject
-from compas_rv.scene import RhinoThrustObject
 from compas_rv.session import RVSession
 from compas_tna.equilibrium import vertical_from_zmax
 
 
 def RunCommand():
     session = RVSession()
 
-    formobj: RhinoFormObject = session.scene.find_by_itemtype(FormDiagram)
-    if not formobj:
+    form = session.find_formdiagram()
+    if not form:
+        return
+
+    force = session.find_forcediagram()
+    if not force:
+        return
+
+    thrust = session.find_thrustdiagram()
+    if not thrust:
         return
 
     # =============================================================================
     # Compute horizontal
     # =============================================================================
 
-    kmax = session.settings.tna.vertical.kmax
-    zmax = session.settings.tna.vertical.zmax
+    # density
+    kmax = session.settings.tna.vertical_kmax
+    zmax = session.settings.tna.vertical_zmax
     zmax = rs.GetReal("Set maximum height (zmax)", number=zmax, minimum=0)
 
-    # warn the user about nonsensical values
+    if zmax is None:
+        return
+
+    session.settings.tna.vertical_zmax = zmax
+
+    # copy the vertical coordinates of the thrust diagram
+    # onto the form diagram
+    for vertex in thrust.diagram.vertices_where(is_support=True):
+        z = thrust.diagram.vertex_attribute(vertex, "z")
+        form.diagram.vertex_attribute(vertex, "z", z)
 
-    _, scale = vertical_from_zmax(formobj.mesh, zmax, kmax=kmax)
+    # can we not use the thrust diagram here
+    _, scale = vertical_from_zmax(form.diagram, zmax, kmax=kmax)
 
     # store scale in force diagram
+    print(scale)
 
-    thrust: ThrustDiagram = formobj.mesh.copy(cls=ThrustDiagram)
-    thrust.name = "ThrustDiagram"
+    thrustdiagram: ThrustDiagram = form.diagram.copy(cls=ThrustDiagram)
+    thrustdiagram.name = "ThrustDiagram"
 
-    formobj.mesh.vertices_attribute(name="z", value=0)
+    # flatten the formdiagram again
+    form.diagram.vertices_attribute(name="z", value=0)
+
+    # show the thrust diagram
+    thrust.show = True
 
     # =============================================================================
     # Update scene
     # =============================================================================
 
     rs.UnselectAllObjects()
 
-    thrustobj = session.scene.find_by_itemtype(ThrustDiagram)
-
-    if not thrustobj:
-        thrustobj: RhinoThrustObject = session.scene.add(thrust, name=thrust.name)
-    else:
-        thrustobj.mesh = thrust
-
-    thrustobj.clear()
-    thrustobj.draw()
-    rs.Redraw()
-
-    # =============================================================================
-    # Save session
-    # =============================================================================
+    thrust.diagram = thrustdiagram
+    thrust.redraw()
 
     if session.settings.autosave:
         session.record(name="TNA Vertical")