MN pannel + handler correction

Author: MartinBaGar

molecularnodes/addon.py

@@ -12,9 +12,9 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 import bpy
-from bpy.app.handlers import frame_change_pre, frame_change_post, load_post, save_post
+from bpy.app.handlers import frame_change_pre, load_post, save_post
 from bpy.props import PointerProperty, CollectionProperty
-from .handlers import update_trajectories, update_interactions
+from .handlers import update_trajectories
 from . import entities, operators, props, session, ui
 from .utils import add_current_module_to_path
 from .ui import pref
@@ -59,7 +59,6 @@ def register():
     save_post.append(session._pickle)
     load_post.append(session._load)
     frame_change_pre.append(update_trajectories)
-    frame_change_post.append(update_interactions)
 
     bpy.types.Scene.MNSession = session.MNSession()  # type: ignore
     bpy.types.Object.uuid = props.uuid_property  # type: ignore
@@ -90,7 +89,6 @@ def unregister():
     save_post.remove(session._pickle)
     load_post.remove(session._load)
     frame_change_pre.remove(update_trajectories)
-    frame_change_post.remove(update_interactions)
     del bpy.types.Scene.MNSession  # type: ignore
     del bpy.types.Scene.mn  # type: ignore
     del bpy.types.Scene.interaction_visualiser  # type: ignore

molecularnodes/entities/interaction/__init__.py

@@ -1,4 +1,3 @@
 from .interaction import CLASSES as INTERACTION_CLASSES
-from .ui import CLASSES as UI_CLASSES
 
-CLASSES = INTERACTION_CLASSES + UI_CLASSES
+CLASSES = INTERACTION_CLASSES

molecularnodes/entities/interaction/interaction.py

@@ -15,6 +15,11 @@ def __init__(self):
         self.bond_objects = {}
         self.trajectory_name = ""
         self.bond_width = 0.0025
+        self._frame = None
+
+    def set_frame(self, frame: int) -> None:
+        # self._frame = self.frame_mapper(frame)
+        self.update_positions(frame)
 
     @staticmethod
     def create_bond_material(interaction_type):
@@ -133,12 +138,12 @@ def create_bond_objects(self, all_bonds, bond_material, interaction_type):
 
         return bond_objects
 
-    def update_bond_positions(self, scene):
+    def update_positions(self, current_frame):
         blender_object = bpy.data.objects.get(self.trajectory_name)
         if not blender_object or not blender_object.data:
             return
 
-        frame = str(scene)
+        frame = str(current_frame)
         for interaction_type, type_bonds in self.bond_objects.items():
             couples = self.frame_dict[interaction_type].get(frame, set())
 

molecularnodes/entities/interaction/ui.py

@@ -46,32 +46,29 @@ def _selection_update_trajectories(self, context: bpy.types.Context) -> None:
 def update_trajectories(scene):
     "Call the set_frame method of all trajectories in the current session"
     session = scene.MNSession
-    print('Update trajectory has been called')
     for traj in session.trajectories.values():
         # use the updated method if it exists but otherwise fallback on the old method
         # of updating the trajectories
         if hasattr(traj, "update_with_scene"):
             if traj.update_with_scene:
                 traj.set_frame(scene.frame_current)
-                print("Hey change !")
             else:
                 traj.set_frame(traj.frame)
 
         else:
-            print("Hey change !")
             traj._update_positions(scene.frame_current)
             traj._update_selections()
             traj._update_calculations()
 
-
-@persistent
-def update_interactions(scene):
-    print("Update interactions has been called")
-    session = scene.MNSession
     for entity in session.entities.values():
+        if hasattr(entity, "update_with_scene"):
+            if entity.update_with_scene:
+                entity.set_frame(scene.frame_current)
+            else:
+                entity.set_frame(entity.frame)
+
         if entity._entity_type.value == "interaction":
-            print("An entity has been found")
-            entity.update_bond_positions(scene.frame_current)
+            entity.set_frame(scene.frame_current)
 
         # except NotImplementedError:
         #     pass

molecularnodes/handlers.py

@@ -66,7 +66,8 @@ def change_style_node_menu(self, context):
     layout.label(text="Molecular Nodes", icon="MOD_PARTICLES")
 
     row = layout.row()
-    op = row.operator_menu_enum("mn.node_swap", "node_items", text="Change Node")
+    op = row.operator_menu_enum(
+        "mn.node_swap", "node_items", text="Change Node")
     op.node_description = "The topology nodes"
 
     layout.separator()
@@ -181,11 +182,24 @@ def panel_md_properties(layout, context):
             box.label(text="Invalid Selection", icon="ERROR")
             box.label(text=item.message)
             box.alert = True
-            op = box.operator("wm.url_open", text="Selection Langauge Docs", icon="URL")
+            op = box.operator(
+                "wm.url_open", text="Selection Langauge Docs", icon="URL")
             op.url = (
                 "https://docs.mdanalysis.org/stable/documentation_pages/selections.html"
             )
 
+    layout.label(text="Interactions", icon="OPTIONS")
+    scene = context.scene
+    interaction_props = scene.interaction_visualiser
+
+    box = layout.box()
+    box.prop(interaction_props, "json_file")
+    box.operator("object.interaction_visualiser")
+
+    box = layout.box()
+    box.label(text="Visualisation Settings")
+    box.prop(interaction_props, "bond_width")
+
 
 def panel_object(layout, context):
     object = context.active_object