draw in layers

Author: tomvanmele

commands/RV_dem_blocks.py

@@ -44,12 +44,12 @@ def RunCommand():
     # Scene
     # =============================================================================
 
-    compas_rhino.layers.clear_layer("RV::DEM")
+    compas_rhino.layers.clear_layer("RhinoVAULT::DEM")
 
     scene = Scene()
 
     for block in model.blocks():
-        scene.add(block.modelgeometry, layer="RV::DEM", disjoint=True)  # type: ignore
+        scene.add(block.modelgeometry, layer="RhinoVAULT::DEM", disjoint=True)  # type: ignore
 
     scene.draw()
 

commands/RV_force.py

@@ -41,7 +41,7 @@ def RunCommand():
 
     rs.UnselectAllObjects()
 
-    session.scene.add(forcediagram, name=forcediagram.name)  # type: ignore
+    session.scene.add(forcediagram, name=forcediagram.name, layer="RhinoVAULT::ForceDiagram")  # type: ignore
     session.scene.redraw()
 
     rs.Redraw()

commands/RV_form.py

@@ -54,8 +54,8 @@ def RunCommand():
 
     pattern.show = False
 
-    session.scene.add(formdiagram, name=formdiagram.name)  # type: ignore
-    session.scene.add(thrustdiagram, name=thrustdiagram.name, show=False)  # type: ignore
+    session.scene.add(formdiagram, name=formdiagram.name, layer="RhinoVAULT::FormDiagram")  # type: ignore
+    session.scene.add(thrustdiagram, name=thrustdiagram.name, show=False, layer="RhinoVAULT::ThrustDiagram")  # type: ignore
     session.scene.redraw()
     rs.Redraw()
 

commands/RV_pattern.py

@@ -111,7 +111,7 @@ def RunCommand():
     # Update scene
     # =============================================================================
 
-    session.scene.add(pattern, name=pattern.name)  # type: ignore
+    session.scene.add(pattern, name=pattern.name, layer="RhinoVAULT::Pattern")  # type: ignore
     session.scene.draw()
 
     print("Pattern successfully created.")

commands/RV_session_open.py

@@ -19,8 +19,22 @@ def RunCommand():
     session.scene.clear()
     session.load(filepath)
 
+    pattern = session.find_pattern(warn=False)
     form = session.find_formdiagram(warn=False)
     force = session.find_forcediagram(warn=False)
+    thrust = session.find_thrustdiagram(warn=False)
+
+    if pattern:
+        pattern.layer = "RhinoVAULT::Pattern"
+
+    if form:
+        form.layer = "RhinoVAULT::FormDiagram"
+
+    if force:
+        force.layer = "RhinoVAULT::ForceDiagram"
+
+    if thrust:
+        thrust.layer = "RhinoVAULT::ThrustDiagram"
 
     if form and force:
         form.diagram.dual = force.diagram

commands/RV_session_redo.py

@@ -13,8 +13,22 @@ def RunCommand():
     if not session.redo():
         return
 
+    pattern = session.find_pattern(warn=False)
     form = session.find_formdiagram(warn=False)
     force = session.find_forcediagram(warn=False)
+    thrust = session.find_thrustdiagram(warn=False)
+
+    if pattern:
+        pattern.layer = "RhinoVAULT::Pattern"
+
+    if form:
+        form.layer = "RhinoVAULT::FormDiagram"
+
+    if force:
+        force.layer = "RhinoVAULT::ForceDiagram"
+
+    if thrust:
+        thrust.layer = "RhinoVAULT::ThrustDiagram"
 
     if form and force:
         form.diagram.dual = force.diagram

commands/RV_session_undo.py

@@ -13,8 +13,22 @@ def RunCommand():
     if not session.undo():
         return
 
+    pattern = session.find_pattern(warn=False)
     form = session.find_formdiagram(warn=False)
     force = session.find_forcediagram(warn=False)
+    thrust = session.find_thrustdiagram(warn=False)
+
+    if pattern:
+        pattern.layer = "RhinoVAULT::Pattern"
+
+    if form:
+        form.layer = "RhinoVAULT::FormDiagram"
+
+    if force:
+        force.layer = "RhinoVAULT::ForceDiagram"
+
+    if thrust:
+        thrust.layer = "RhinoVAULT::ThrustDiagram"
 
     if form and force:
         form.diagram.dual = force.diagram

commands/RV_thrust_modify.py

@@ -5,7 +5,8 @@
 import rhinoscriptsyntax as rs  # type: ignore
 
 from compas_rv.session import RVSession
-from compas_rv.solvers import InteractiveScaleHorizontal
+from compas_rv.solvers import update_force_from_form
+from compas_tna.equilibrium import vertical_from_zmax
 
 
 def RunCommand():
@@ -30,9 +31,12 @@ def RunCommand():
     # Modify pattern vertices
     # =============================================================================
 
+    kmax = session.settings.tna.vertical_kmax
+    zmax = session.settings.tna.vertical_zmax
+
     rs.UnselectAllObjects()
 
-    options = ["VertexAttributes", "EdgeAttributes", "FaceAttributes", "MoveSupports", "ScaleForces"]
+    options = ["VertexAttributes", "EdgeAttributes", "FaceAttributes", "MoveSupports", "ScaleForceDensities"]
     option = rs.GetString("Modify the Thrust Diagram", strings=options)
     if not option:
         return
@@ -60,22 +64,37 @@ def RunCommand():
         if selected:
             thrust.move_vertices_direction(selected, direction="Z")
 
-    # interactively change the scale of the force diagram
-    # recompute vertical equilibrium accordingly
-    # use vertical_from_q
+    elif option == "ScaleForceDensities":
+        thrust.show_edges = list(thrust.diagram.edges_where(_is_edge=True))
+        thrust.redraw_edges()
+        selected = thrust.select_edges()
+        if selected:
+            selected = list(set(selected))
+            factor = rs.GetReal("Scale factor", number=1.0, minimum=0)
+            if not factor:
+                return
+            for edge in selected:
+                q = factor * thrust.diagram.edge_attribute(edge, "q")
+
+                form.diagram.edge_attribute(edge, "q", q)
 
-    elif option == "ScaleForces":
-        scalehorizontal = InteractiveScaleHorizontal(thrust.diagram)
-        if scalehorizontal():
-            force.diagram.attributes["scale"] = scalehorizontal.scale
+                form.diagram.solve_fd()
+                update_force_from_form(force.diagram, form.diagram)
+                _, scale = vertical_from_zmax(form.diagram, zmax, kmax=kmax)
+                force.diagram.attributes["scale"] = scale
+                force.diagram.update_position()
 
-            for index, vertex in enumerate(thrust.diagram.vertices()):
-                thrust.diagram.vertex_attribute(vertex, "z", scalehorizontal.numdata.xyz[index, 2])  # type: ignore
+                for vertex in form.diagram.vertices():
+                    form_attr = form.diagram.vertex_attributes(vertex)
+                    thrust_attr = thrust.diagram.vertex_attributes(vertex)
+                    thrust_attr.update(form_attr)  # type: ignore
 
-            for index, edge in enumerate(thrust.diagram.edges_where(_is_edge=True)):
-                q = scalehorizontal.scale * scalehorizontal.numdata.q[index, 0]  # type: ignore
-                form.diagram.edge_attribute(edge, "q", q)
-                thrust.diagram.edge_attribute(edge, "q", q)
+                for edge in form.diagram.edges():
+                    form_attr = form.diagram.edge_attributes(edge)
+                    thrust_attr = thrust.diagram.edge_attributes(edge)
+                    thrust_attr.update(form_attr)  # type: ignore
+
+                form.diagram.vertices_attribute(name="z", value=0)
 
     else:
         raise NotImplementedError
@@ -90,15 +109,24 @@ def RunCommand():
     rs.UnselectAllObjects()
 
     form.show_vertices = True
-    form.redraw_vertices()
+    form.show_free = False
+    form.show_fixed = True
+    form.show_supports = True
+    form.show_edges = True
+
+    force.show_vertices = True
+    force.show_free = False
+    force.show_fixed = True
+    force.show_supports = True
+    force.show_edges = True
 
     thrust.show_vertices = True  # type: ignore
     thrust.show_free = False
     thrust.show_fixed = True
     thrust.show_supports = True
     thrust.show_edges = False
 
-    thrust.redraw()
+    session.scene.redraw()
 
     if session.settings.autosave:
         session.record(name="Modify Thrust Diagram")

commands/RV_tna_horizontal.py

@@ -98,17 +98,18 @@ def redraw(k, xy, edges):
 
         conduit = HorizontalConduit([], refreshrate=refresh)
         with conduit.enabled():
-            horizontal_nodal(form.diagram, force.diagram, kmax=kmax, alpha=alpha, callback=redraw)
+            horizontal_nodal(form.diagram, force.diagram, kmax=kmax, alpha=alpha, callback=redraw)  # type: ignore
     else:
-        horizontal_nodal(form.diagram, force.diagram, kmax=kmax, alpha=alpha)
+        horizontal_nodal(form.diagram, force.diagram, kmax=kmax, alpha=alpha)  # type: ignore
 
     force.diagram.update_position()
 
     # =============================================================================
     # Update scene
     # =============================================================================
 
-    max_angle = max(form.diagram.edges_attribute("_a"))
+    angles: list[float] = form.diagram.edges_attribute("_a")  # type: ignore
+    max_angle = max(angles)
     tol_angles = session.settings.tna.horizontal_max_angle
 
     if max_angle < tol_angles:

commands/RV_tna_vertical.py

@@ -54,8 +54,15 @@ def RunCommand():
 
     force.diagram.attributes["scale"] = scale
 
-    thrustdiagram: ThrustDiagram = form.diagram.copy(cls=ThrustDiagram)
-    thrustdiagram.name = "ThrustDiagram"
+    for vertex in form.diagram.vertices():
+        form_attr = form.diagram.vertex_attributes(vertex)
+        thrust_attr = thrust.diagram.vertex_attributes(vertex)
+        thrust_attr.update(form_attr)  # type: ignore
+
+    for edge in form.diagram.edges():
+        form_attr = form.diagram.edge_attributes(edge)
+        thrust_attr = thrust.diagram.edge_attributes(edge)
+        thrust_attr.update(form_attr)  # type: ignore
 
     # flatten the formdiagram again
     form.diagram.vertices_attribute(name="z", value=0)
@@ -69,7 +76,6 @@ def RunCommand():
 
     rs.UnselectAllObjects()
 
-    thrust.diagram = thrustdiagram
     thrust.redraw()
 
     print("Vertical equilibrium found!")