Better layout

Author: pgleeson

app.py

@@ -6,7 +6,7 @@
 import pyvista as pv
 import sys
 
-version = "v0.0.7"
+version = "v0.0.8"
 
 st_mode = "-gui" not in sys.argv
 
@@ -39,15 +39,15 @@
 plotter = pv.Plotter()
 
 
-add_virtualworm_muscles(plotter)
-# add_virtualworm_neurons(plotter)
-add_neuroml_model(plotter, "NeuroML2/c302_D_Full.net.nml", somas_only=True)
-add_sibernetic_model(plotter)
+spacing = 50
+
+add_sibernetic_model(plotter, swap_y_z=True, offset=spacing)
+add_neuroml_model(plotter, "NeuroML2/c302_A_Full.net.nml", somas_only=False)  # at 0...
+add_virtualworm_muscles(plotter, translate=(-1 * spacing, 0, 0))
+# add_virtualworm_neurons(plotter, translate=(-1.8*spacing, 0, 0))
 
 
 plotter.set_viewup([0, 10, 0])
-# plotter.remove_scalar_bar("RegionId")
-# plotter.remove_scalar_bar("types")
 
 
 print("Created the scene...")

load.py

@@ -9,16 +9,19 @@
 if __name__ == "__main__":
     plotter = pv.Plotter()
 
-    add_virtualworm_muscles(plotter, translate=(-40, 0, 0))
-    add_virtualworm_neurons(plotter)
+    spacing = 50
 
-    add_neuroml_model(plotter, "NeuroML2/c302_D_Full.net.nml", somas_only=False)
-    add_sibernetic_model(plotter, swap_y_z=True)
+    add_sibernetic_model(plotter, swap_y_z=True, offset=spacing)
+    add_neuroml_model(
+        plotter, "NeuroML2/c302_D_Full.net.nml", somas_only=False
+    )  # at 0...
+    add_virtualworm_muscles(plotter, translate=(-1 * spacing, 0, 0))
+    add_virtualworm_neurons(plotter, translate=(-1.8 * spacing, 0, 0))
 
     plotter.set_background("white")
     plotter.set_viewup([0, 10, 0])
 
-    plotter.add_axes()
+    # plotter.add_axes()
 
     if "-nogui" not in sys.argv:
         plotter.show()

neuromlmodel.py

@@ -82,7 +82,7 @@ def add_neuroml_model(
                     "Plotting only sphere (radius: %s) %s(%i) at %s, %s"
                     % (radius, cell.id, cell_index, pos, pp)
                 )
-                sphere = pv.Sphere(center=(pp[0], pp[1], pp[2]), radius=radius * factor)
+                sphere = pv.Sphere(center=(pp[0], pp[1], pp[2]), radius=radius)
 
                 plotter.add_mesh(sphere, color=color)
 

siberneticmodel.py

@@ -11,12 +11,12 @@
 
 plotter = None
 
-spacing_ = 50
+offset_ = 50
 
 
-def add_sibernetic_model(pl, swap_y_z=False, spacing=50):
-    global all_points, all_point_types, last_mesh, plotter, spacing_
-    spacing_ = spacing
+def add_sibernetic_model(pl, swap_y_z=False, offset=50):
+    global all_points, all_point_types, last_mesh, plotter, offset_
+    offset_ = offset
     plotter = pl
 
     points = []
@@ -96,7 +96,7 @@ def add_sibernetic_model(pl, swap_y_z=False, spacing=50):
     plotter.remove_scalar_bar("types")
 
     max_time = len(all_points) - 1
-    pl.add_slider_widget(create_mesh, rng=[0, max_time], value=0, title="Time point")
+    pl.add_slider_widget(create_mesh, rng=[0, max_time], value=30, title="Time point")
     pl.add_timer_event(max_steps=5, duration=2, callback=create_mesh)
 
 
@@ -105,7 +105,7 @@ def create_mesh(step):
 
     step_count = step
     value = step_count
-    global all_points, all_point_types, last_mesh, plotter, spacing_
+    global all_points, all_point_types, last_mesh, plotter, offset_
 
     index = int(value)
 
@@ -128,7 +128,7 @@ def create_mesh(step):
         )
     else:
         last_mesh.points = curr_points
-        last_mesh.translate((spacing_, -50, -100), inplace=True)
+        last_mesh.translate((offset_, -50, -100), inplace=True)
 
     plotter.render()