force

Author: tomvanmele

plugin/RV_force.py

@@ -8,60 +8,49 @@
 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
 
 
 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 forceobj:
-        session.scene.remove(forceobj)
-        session.scene.redraw()
-        rs.Redraw()
+    session.clear_all_forcediagrams()
 
     # =============================================================================
     # Init the force diagram
     # =============================================================================
 
-    force: ForceDiagram = ForceDiagram.from_formdiagram(formobj.mesh)
-    force.update_default_edge_attributes(lmin=0.1)
+    forcediagram: ForceDiagram = ForceDiagram.from_formdiagram(form.diagram)
+    forcediagram.update_default_edge_attributes(lmin=0.1)
 
-    bbox_form = Box.from_bounding_box(bounding_box(formobj.mesh.vertices_attributes("xyz")))
-    bbox_force = Box.from_bounding_box(bounding_box(force.vertices_attributes("xyz")))
+    bbox_form = Box.from_bounding_box(bounding_box(form.diagram.vertices_attributes("xyz")))
+    bbox_force = Box.from_bounding_box(bounding_box(forcediagram.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
 
-    force.translate([dx, dy, 0])
-    force.update_angle_deviations()
+    forcediagram.translate([dx, dy, 0])
+    forcediagram.update_angle_deviations()
 
     # =============================================================================
     # Update scene
     # =============================================================================
 
     rs.UnselectAllObjects()
 
-    session.scene.add(force, name=force.name)
+    session.scene.add(forcediagram, name=forcediagram.name)
     session.scene.redraw()
 
     rs.Redraw()
 
-    # =============================================================================
-    # Save session
-    # =============================================================================
-
     if session.settings.autosave:
-        session.record(name="Init Force Diagram")
+        session.record(name="Create Force Diagram")
 
 
 # =============================================================================

plugin/RV_force_modify.py

@@ -2,47 +2,81 @@
 # venv: rhinovault
 # r: compas>=2.5, compas_rui>=0.3.1, compas_session>=0.4.1, compas_tna>=0.5
 
-
 import rhinoscriptsyntax as rs  # type: ignore
 
-from compas_rv.datastructures import ForceDiagram
-from compas_rv.scene import RhinoForceObject
 from compas_rv.session import RVSession
 
 
 def RunCommand():
     session = RVSession()
 
-    force: RhinoForceObject = session.scene.find_by_itemtype(ForceDiagram)
+    form = session.find_formdiagram()
+    if not form:
+        return
+
+    force = session.find_forcediagram()
     if not force:
         return
 
     # =============================================================================
-    # Modify pattern vertices
+    # Modify force vertices
     # =============================================================================
 
     rs.UnselectAllObjects()
 
-    options = ["VertexAttributes", "EdgeAttributes"]
+    options = ["VertexAttributes", "EdgeAttributes", "MoveVertices"]
     option = rs.GetString("Modify the Force Diagram", strings=options)
+
     if not option:
         return
 
     if option == "VertexAttributes":
-        selectable = list(force.mesh.vertices())
-        selected = force.select_vertices(selectable)
+        force.show_vertices = list(force.diagram.vertices())
+        force.redraw_vertices()
+
+        selected = force.select_vertices()
+
         if selected:
             force.update_vertex_attributes(selected)
 
     elif option == "EdgeAttributes":
-        selectable = list(force.mesh.edges_where(_is_edge=True))
-        selected = force.select_edges(selectable)
+        force.show_edges = list(force.diagram.edges())
+        force.redraw_edges()
+
+        selected = force.select_edges()
+
         if selected:
             force.update_edge_attributes(selected)
 
+    elif option == "MoveVertices":
+        force.show_vertices = list(force.diagram.vertices())
+        force.redraw_vertices()
+
+        selected = force.select_vertices()
+
+        if not selected:
+            return
+
+        directions = ["X", "Y", "XY", "Free"]
+        direction = rs.GetString(message="", strings=directions)
+
+        if not direction:
+            return
+
+        if direction in ("X", "Y", "XY"):
+            force.move_vertices_direction(selected, direction=direction)
+
+        else:
+            force.move_vertices(selected)
+
+        # update angle deviations
+
     else:
         raise NotImplementedError
 
+    if session.settings.autoupdate:
+        rs.MessageBox("Automatic equilibrium updates are not available yet.", title="Info")
+
     # =============================================================================
     # Update scene
     # =============================================================================
@@ -54,14 +88,8 @@ def RunCommand():
     force.show_fixed = True
     force.show_supports = True
     force.show_edges = True
-    force.clear()
-    force.draw()
-
-    rs.Redraw()
 
-    # =============================================================================
-    # Save session
-    # =============================================================================
+    force.redraw()
 
     if session.settings.autosave:
         session.record(name="Modify Force Diagram")