TNA commands update

Author: tomvanmele

commands/TNA_envelope.py

@@ -20,15 +20,15 @@ def RunCommand():
 
     session["params"] = {}
 
-    session.delete("formdiagram")
     session.delete("envelope")
+    session.delete("formdiagram")
     session.delete("analysis")
 
-    for obj in session.scene.find_all_by_itemtype(FormDiagram):
+    for obj in session.scene.find_all_by_itemtype(Envelope):
         obj.clear()
         session.scene.remove(obj)
 
-    for obj in session.scene.find_all_by_itemtype(Envelope):
+    for obj in session.scene.find_all_by_itemtype(FormDiagram):
         obj.clear()
         session.scene.remove(obj)
 
@@ -42,6 +42,10 @@ def RunCommand():
     if not option:
         return
 
+    # =============================================================================
+    # From a tempalate in the library
+    # =============================================================================
+
     if option == "FromLibrary":
         option = rs.GetString(message="Choose a pattern", strings=["CrossVault", "PointedVault", "PavilionVault", "Dome"])
         if not option:
@@ -172,7 +176,7 @@ def RunCommand():
             raise NotImplementedError
 
     # =============================================================================
-    # Middle
+    # From the middle surface
     # =============================================================================
 
     elif option == "FromMiddle":
@@ -182,7 +186,7 @@ def RunCommand():
         pass
 
     # =============================================================================
-    # Intrados
+    # From the intrados mesh
     # =============================================================================
 
     elif option == "FromIntrados":
@@ -192,7 +196,7 @@ def RunCommand():
         pass
 
     # =============================================================================
-    # BoundsMeshes
+    # From the intrados and extrados meshes
     # =============================================================================
 
     elif option == "FromBounds":

commands/TNA_formdiagram.py

@@ -5,7 +5,9 @@
 import rhinoscriptsyntax as rs  # type: ignore
 
 from compas_masonry.session import MasonrySession as Session
+from compas_rui import feedback
 from compas_tna.diagrams import FormDiagram
+from compas_tna.envelope import Envelope
 
 # Would be better to differentiate between an analysis using a known typology,
 # for which both form diagram and envelope can be auto-generated based on a few params,
@@ -21,14 +23,27 @@
 def RunCommand():
     session = Session()
 
+    # =============================================================================
+    # Remove existing form diagram
+    # =============================================================================
+
     session.delete("formdiagram")
 
     for obj in session.scene.find_all_by_itemtype(FormDiagram):
         obj.clear()
         session.scene.remove(obj)
 
     # =============================================================================
-    # Create a form diagram
+    # Check for existing envelope
+    # =============================================================================
+
+    envelope: Envelope = session["envelope"]
+    if not envelope:
+        feedback.warn("There is no Envelope. Please create one first.")
+        return
+
+    # =============================================================================
+    # Create a (new) form diagram
     # =============================================================================
 
     formdiagram = None
@@ -37,12 +52,24 @@ def RunCommand():
     if not option:
         return
 
+    # =============================================================================
+    # From Rhino lines
+    # =============================================================================
+
     if option == "FromLines":
         pass
 
+    # =============================================================================
+    # From a Rhino mesh
+    # =============================================================================
+
     elif option == "FromRhinoMesh":
         pass
 
+    # =============================================================================
+    # From a predefined pattern
+    # =============================================================================
+
     elif option == "FromPattern":
         option = rs.GetString(message="From Pattern", strings=["Circular", "Cross", "Fan", "Ortho"])
         if not option:
@@ -212,6 +239,8 @@ def RunCommand():
 
     session["formdiagram"] = formdiagram
 
+    envelope.apply_bounds_to_formdiagram(formdiagram)
+
     session.scene.add(formdiagram, name="FormDiagram", layer="Masonry::TNA::FormDiagram")  # type: ignore
     session.scene.redraw()
 

commands/TNA_supports.py

@@ -13,7 +13,7 @@
 def RunCommand():
     session = Session()
 
-    formdiagram = session["formdiagram"]
+    formdiagram: FormDiagram = session["formdiagram"]
 
     if not formdiagram:
         feedback.warn("There is no FormDiagram. Please create one first.")
@@ -62,8 +62,8 @@ def RunCommand():
 
     rs.UnselectAllObjects()
 
-    formobject.show_edges = False  # type: ignore
-    formobject.show_faces = True  # type: ignore
+    formobject.show_edges = True  # type: ignore
+    formobject.show_faces = False  # type: ignore
     formobject.redraw()
 
     rs.Redraw()