update to latest repo structure and package versions

Author: tomvanmele

README.md

@@ -1,7 +1,7 @@
 # COMPAS Formfinder for Rhino
 
 > [!NOTE]
-> The current version of COMPAS-FormFinder on the Yak package server is `0.2.62`.
+> The current version of COMPAS-FormFinder on the Yak package server is `0.2.71`.
 > Note that this is still a pre-release!
 
 ![COMPAS FormFinder](compas-FoFin.png)

plugin/FF.py renamed to commands/FF.py

@@ -1,6 +1,5 @@
 #! python3
-# venv: formfinder
-# r: compas>=2.4, compas_dr>=0.3, compas_fd>=0.5.2, compas_rui>=0.3, compas_session>=0.3
+# venv: brg-csd
 
 import pathlib
 
@@ -10,8 +9,6 @@
 import Rhino.UI  # type: ignore
 import System  # type: ignore
 
-import compas_fofin
-
 pluginfile = Rhino.PlugIns.PlugIn.PathFromId(System.Guid("5df3b821-822e-49e0-b24e-aebbe671c3d1"))
 shared = pathlib.Path(str(pluginfile)).parent / "shared"
 
@@ -46,8 +43,8 @@ def show(self):
         return self.ShowModal(Rhino.UI.RhinoEtoApp.MainWindow)
 
 
-def RunCommand(is_interactive):
-    form = SplashForm(title=compas_fofin.title, url=str(shared / "index.html"))
+def RunCommand():
+    form = SplashForm(title="FormFinder", url=str(shared / "index.html"))
     form.show()
 
 
@@ -56,4 +53,4 @@ def RunCommand(is_interactive):
 # =============================================================================
 
 if __name__ == "__main__":
-    RunCommand(True)
+    RunCommand()

plugin/FF_anchors.py renamed to commands/FF_anchors.py

@@ -1,6 +1,6 @@
 #! python3
-# venv: formfinder
-# r: compas>=2.4, compas_dr>=0.3, compas_fd>=0.5.2, compas_rui>=0.3, compas_session>=0.3
+# venv: brg-csd
+# r: compas_dr>=0.3, compas_fd>=0.5.2, compas_session>=0.4.5
 
 import rhinoscriptsyntax as rs  # type: ignore
 
@@ -9,16 +9,14 @@
 from compas_fofin.solvers import AutoUpdateFD
 
 
-def RunCommand(is_interactive):
+def RunCommand():
     session = FoFinSession()
 
     # =============================================================================
     # Load stuff from session
     # =============================================================================
 
-    scene = session.scene()
-
-    meshobj: RhinoCableMeshObject = scene.get_node_by_name(name="CableMesh")
+    meshobj: RhinoCableMeshObject = session.scene.get_node_by_name(name="CableMesh")
     if not meshobj:
         return
 
@@ -28,7 +26,7 @@ def RunCommand(is_interactive):
 
     meshobj.clear_conduits()
 
-    meshobj.display_edges_conduit()
+    meshobj.display_edges_conduit(thickness=session.settings.drawing.edge_thickness)
     meshobj.display_mesh_conduit()
 
     # =============================================================================
@@ -53,15 +51,19 @@ def RunCommand(is_interactive):
         return
 
     if option == "Add":
-        selectable = list(meshobj.mesh.vertices())
-        selected = meshobj.select_vertices(selectable)
+        meshobj.show_vertices = list(meshobj.mesh.vertices())
+        meshobj.redraw_vertices()
+
+        selected = meshobj.select_vertices()
 
         if selected:
             meshobj.mesh.vertices_attribute("is_support", True, keys=selected)
 
     elif option == "Remove":
-        selectable = list(meshobj.mesh.vertices_where(is_support=True))
-        selected = meshobj.select_vertices(selectable)
+        meshobj.show_vertices = list(meshobj.mesh.vertices_where(is_support=True))
+        meshobj.redraw_vertices()
+
+        selected = meshobj.select_vertices()
 
         if selected:
             meshobj.mesh.vertices_attribute("is_support", False, keys=selected)
@@ -86,14 +88,14 @@ def RunCommand(is_interactive):
         meshobj.show_faces = False
         meshobj.draw()
         meshobj.display_forces_conduit(tmax=session.settings.display.tmax)
-        meshobj.display_reactions_conduit()
+        meshobj.display_reactions_conduit(scale=session.settings.drawing.scale_reactions)
 
     else:
         meshobj.show_vertices = list(meshobj.mesh.vertices_where(is_support=True))
         meshobj.show_edges = False
         meshobj.show_faces = False
         meshobj.draw()
-        meshobj.display_edges_conduit()
+        meshobj.display_edges_conduit(thickness=session.settings.drawing.edge_thickness)
 
     meshobj.display_mesh_conduit()
 
@@ -110,4 +112,4 @@ def RunCommand(is_interactive):
 # =============================================================================
 
 if __name__ == "__main__":
-    RunCommand(True)
+    RunCommand()

plugin/FF_anchors_constraints.py renamed to commands/FF_anchors_constraints.py

@@ -1,6 +1,6 @@
 #! python3
-# venv: formfinder
-# r: compas>=2.4, compas_dr>=0.3, compas_fd>=0.5.2, compas_rui>=0.3, compas_session>=0.3
+# venv: brg-csd
+# r: compas_dr>=0.3, compas_fd>=0.5.2, compas_session>=0.4.5
 
 import rhinoscriptsyntax as rs  # type: ignore
 
@@ -14,16 +14,14 @@
 from compas_fofin.solvers import AutoUpdateFD
 
 
-def RunCommand(is_interactive):
+def RunCommand():
     session = FoFinSession()
 
     # =============================================================================
     # Load stuff from session
     # =============================================================================
 
-    scene = session.scene()
-
-    meshobj: RhinoCableMeshObject = scene.find_by_name(name="CableMesh")
+    meshobj: RhinoCableMeshObject = session.scene.find_by_name(name="CableMesh")
     if not meshobj:
         return
 
@@ -33,7 +31,7 @@ def RunCommand(is_interactive):
 
     meshobj.clear_conduits()
 
-    meshobj.display_edges_conduit()
+    meshobj.display_edges_conduit(thickness=session.settings.drawing.edge_thickness)
     meshobj.display_mesh_conduit()
 
     # =============================================================================
@@ -47,16 +45,20 @@ def RunCommand(is_interactive):
         return
 
     if option == "Remove":
-        selectable = list(meshobj.mesh.vertices_where(is_support=True))
-        selected = meshobj.select_vertices(selectable)
+        meshobj.show_vertices = list(meshobj.mesh.vertices_where(is_support=True))
+        meshobj.redraw_vertices()
+
+        selected = meshobj.select_vertices()
 
         if selected:
             for vertex in selected:
                 meshobj.mesh.unset_vertex_attribute(vertex, "constraint")
 
     elif option == "Add":
-        selectable = list(meshobj.mesh.vertices())
-        selected = meshobj.select_vertices(selectable)
+        meshobj.show_vertices = list(meshobj.mesh.vertices())
+        meshobj.redraw_vertices()
+
+        selected = meshobj.select_vertices()
 
         if selected:
             meshobj.show_vertices = selected
@@ -86,7 +88,7 @@ def RunCommand(is_interactive):
             if not constraint:
                 curve = compas_rhino.conversions.curveobject_to_compas(robj)
                 constraint = Constraint(curve)
-                sceneobject = scene.add(constraint, color=Color.cyan())
+                sceneobject = session.scene.add(constraint, color=Color.cyan())
                 sceneobject.draw()
 
                 robj = compas_rhino.objects.find_object(sceneobject.guids[0])
@@ -125,14 +127,14 @@ def RunCommand(is_interactive):
         meshobj.show_faces = False
         meshobj.draw()
         meshobj.display_forces_conduit(tmax=session.settings.display.tmax)
-        meshobj.display_reactions_conduit()
+        meshobj.display_reactions_conduit(scale=session.settings.drawing.scale_reactions)
 
     else:
         meshobj.show_vertices = list(meshobj.mesh.vertices_where(is_support=True))
         meshobj.show_edges = False
         meshobj.show_faces = False
         meshobj.draw()
-        meshobj.display_edges_conduit()
+        meshobj.display_edges_conduit(thickness=session.settings.drawing.edge_thickness)
 
     meshobj.display_mesh_conduit()
 
@@ -149,4 +151,4 @@ def RunCommand(is_interactive):
 # =============================================================================
 
 if __name__ == "__main__":
-    RunCommand(True)
+    RunCommand()

plugin/FF_anchors_move.py renamed to commands/FF_anchors_move.py

@@ -1,6 +1,6 @@
 #! python3
-# venv: formfinder
-# r: compas>=2.4, compas_dr>=0.3, compas_fd>=0.5.2, compas_rui>=0.3, compas_session>=0.3
+# venv: brg-csd
+# r: compas_dr>=0.3, compas_fd>=0.5.2, compas_session>=0.4.5
 
 import rhinoscriptsyntax as rs  # type: ignore
 
@@ -9,16 +9,14 @@
 from compas_fofin.solvers import AutoUpdateFD
 
 
-def RunCommand(is_interactive):
+def RunCommand():
     session = FoFinSession()
 
     # =============================================================================
     # Load stuff from session
     # =============================================================================
 
-    scene = session.scene()
-
-    meshobj: RhinoCableMeshObject = scene.find_by_name(name="CableMesh")
+    meshobj: RhinoCableMeshObject = session.scene.find_by_name(name="CableMesh")
     if not meshobj:
         return
 
@@ -28,7 +26,7 @@ def RunCommand(is_interactive):
 
     meshobj.clear_conduits()
 
-    meshobj.display_edges_conduit()
+    meshobj.display_edges_conduit(thickness=session.settings.drawing.edge_thickness)
     meshobj.display_mesh_conduit()
 
     # =============================================================================
@@ -42,8 +40,10 @@ def RunCommand(is_interactive):
     if not option:
         return
 
-    selectable = list(meshobj.mesh.vertices_where(is_support=True))
-    selected = meshobj.select_vertices(selectable)
+    meshobj.show_vertices = list(meshobj.mesh.vertices_where(is_support=True))
+    meshobj.redraw_vertices()
+
+    selected = meshobj.select_vertices()
 
     if selected:
         if option == "Free":
@@ -69,14 +69,14 @@ def RunCommand(is_interactive):
         meshobj.show_faces = False
         meshobj.draw()
         meshobj.display_forces_conduit(tmax=session.settings.display.tmax)
-        meshobj.display_reactions_conduit()
+        meshobj.display_reactions_conduit(scale=session.settings.drawing.scale_reactions)
 
     else:
         meshobj.show_vertices = list(meshobj.mesh.vertices_where(is_support=True))
         meshobj.show_edges = False
         meshobj.show_faces = False
         meshobj.draw()
-        meshobj.display_edges_conduit()
+        meshobj.display_edges_conduit(thickness=session.settings.drawing.edge_thickness)
 
     meshobj.display_mesh_conduit()
 
@@ -89,8 +89,8 @@ def RunCommand(is_interactive):
 
 
 # =============================================================================
-# Run as main
+# Main
 # =============================================================================
 
 if __name__ == "__main__":
-    RunCommand(True)
+    RunCommand()

plugin/FF_anchors_update.py renamed to commands/FF_anchors_update.py

@@ -1,23 +1,21 @@
 #! python3
-# venv: formfinder
-# r: compas>=2.4, compas_dr>=0.3, compas_fd>=0.5.2, compas_rui>=0.3, compas_session>=0.3
+# venv: brg-csd
+# r: compas_dr>=0.3, compas_fd>=0.5.2, compas_session>=0.4.5
 
 from compas_fofin.scene import RhinoCableMeshObject
 from compas_fofin.scene import RhinoConstraintObject
 from compas_fofin.session import FoFinSession
 from compas_fofin.solvers import AutoUpdateFD
 
 
-def RunCommand(is_interactive):
+def RunCommand():
     session = FoFinSession()
 
     # =============================================================================
     # Load stuff from session
     # =============================================================================
 
-    scene = session.scene()
-
-    meshobj: RhinoCableMeshObject = scene.get_node_by_name(name="CableMesh")
+    meshobj: RhinoCableMeshObject = session.scene.get_node_by_name(name="CableMesh")
     if not meshobj:
         return
 
@@ -27,14 +25,14 @@ def RunCommand(is_interactive):
 
     meshobj.clear_conduits()
 
-    meshobj.display_edges_conduit()
+    meshobj.display_edges_conduit(thickness=session.settings.drawing.edge_thickness)
     meshobj.display_mesh_conduit()
 
     # =============================================================================
     # Update Constraints
     # =============================================================================
 
-    for sceneobject in scene.objects:
+    for sceneobject in session.scene.objects:
         if isinstance(sceneobject, RhinoConstraintObject):
             sceneobject.update_constraint_geometry()
 
@@ -56,14 +54,14 @@ def RunCommand(is_interactive):
         meshobj.show_faces = False
         meshobj.draw()
         meshobj.display_forces_conduit(tmax=session.settings.display.tmax)
-        meshobj.display_reactions_conduit()
+        meshobj.display_reactions_conduit(scale=session.settings.drawing.scale_reactions)
 
     else:
         meshobj.show_vertices = list(meshobj.mesh.vertices_where(is_support=True))
         meshobj.show_edges = False
         meshobj.show_faces = False
         meshobj.draw()
-        meshobj.display_edges_conduit()
+        meshobj.display_edges_conduit(thickness=session.settings.drawing.edge_thickness)
 
     meshobj.display_mesh_conduit()
 
@@ -80,4 +78,4 @@ def RunCommand(is_interactive):
 # =============================================================================
 
 if __name__ == "__main__":
-    RunCommand(True)
+    RunCommand()