scene session settings

Author: tomvanmele

plugin/RV_scene_clear.py

@@ -2,7 +2,6 @@
 # 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.session import RVSession

plugin/RV_scene_redraw.py

@@ -2,7 +2,6 @@
 # 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.session import RVSession

plugin/RV_session_open.py

@@ -2,7 +2,6 @@
 # venv: rhinovault
 # r: compas>=2.5, compas_rui>=0.3.1, compas_session>=0.4.1, compas_tna>=0.5
 
-
 from compas_rui.forms import FileForm
 from compas_rv.session import RVSession
 

plugin/RV_session_redo.py

@@ -2,7 +2,6 @@
 # venv: rhinovault
 # r: compas>=2.5, compas_rui>=0.3.1, compas_session>=0.4.1, compas_tna>=0.5
 
-
 from compas_rv.session import RVSession
 
 

plugin/RV_session_save.py

@@ -2,7 +2,6 @@
 # venv: rhinovault
 # r: compas>=2.5, compas_rui>=0.3.1, compas_session>=0.4.1, compas_tna>=0.5
 
-
 from compas_rui.forms import FileForm
 from compas_rv.session import RVSession
 

plugin/RV_session_undo.py

@@ -2,7 +2,6 @@
 # venv: rhinovault
 # r: compas>=2.5, compas_rui>=0.3.1, compas_session>=0.4.1, compas_tna>=0.5
 
-
 from compas_rv.session import RVSession
 
 

plugin/RV_settings.py

@@ -3,65 +3,52 @@
 # 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 pydantic import BaseModel
 
 from compas_rui.forms import NamedValuesForm
 from compas_rv.session import RVSession
 
+# Switch to using ModelFieldsForm
+
 
 def update_settings(model, title):
-    names = [name for name, info in model.model_fields.items()]
-    values = [getattr(model, name) for name in names]
+    names = []
+    values = []
+    for name, info in model.model_fields.items():
+        if issubclass(info.annotation, BaseModel):
+            continue
+        names.append(name)
+        values.append(getattr(model, name))
     form = NamedValuesForm(names, values, title=title)
     if form.show():
         for name, value in form.attributes.items():
             setattr(model, name, value)
 
 
+# =============================================================================
+# Command
+# =============================================================================
+
+
 def RunCommand():
     session = RVSession()
 
-    options1 = ["TNA", "Drawing"]
-    option1 = rs.GetString(message="Settings Section", strings=options1)
-    if not option1:
+    options = ["RhinoVAULT", "TNA", "Drawing"]
+    option = rs.GetString(message="Settings Section", strings=options)
+    if not option:
         return
 
-    if option1 == "TNA":
-        options2 = ["Horizontal", "Vertical"]
-        option2 = rs.GetString(message="Settings Section", strings=options2)
-        if not option2:
-            return
-
-        title = f"{option1} {option2}"
+    if option == "RhinoVAULT":
+        update_settings(session.settings, title=option)
 
-        if option2 == "Horizontal":
-            update_settings(session.settings.tna.horizontal, title=title)
+    elif option == "TNA":
+        update_settings(session.settings.tna, title=option)
 
-        elif option2 == "Vertical":
-            update_settings(session.settings.tna.vertical, title=title)
-
-    elif option1 == "Drawing":
-        options2 = ["FormDiagram", "ForceDiagram", "ThrustDiagram"]
-        option2 = rs.GetString(message="Settings Section", strings=options2)
-        if not option2:
-            return
-
-        title = f"{option1} {option2}"
-
-        if option2 == "FormDiagram":
-            pass
-
-        elif option2 == "ForceDiagram":
-            pass
-
-        elif option2 == "ThrustDiagram":
-            update_settings(session.settings.drawing.thrust, title=title)
+    elif option == "Drawing":
+        update_settings(session.settings.drawing, title=option)
 
     session.scene.redraw()
 
-    # =============================================================================
-    # Save session
-    # =============================================================================
-
     if session.settings.autosave:
         session.record(name="Update settings")