Store connections for round-tripping

Author: vanous

fixture.py

@@ -21,6 +21,7 @@
 from types import SimpleNamespace
 import uuid as py_uuid
 from itertools import zip_longest
+from xml.etree import ElementTree
 
 import bpy
 import mathutils
@@ -515,6 +516,12 @@ def on_use_target(self, context):
         default = ""
             )
 
+    mvr_connections_xml: StringProperty(
+        name = "MVR Connections XML",
+        description = "Raw MVR <Connections> XML for round-tripping",
+        default = ""
+            )
+
     dmx_breaks:  CollectionProperty(
             name = "DMX Break",
             type = DMX_Break)
@@ -2785,6 +2792,20 @@ def to_mvr_fixture(self, universe_add=False):
             for index, dmx_break in enumerate(self.dmx_breaks)
         ]
 
+        connections = None
+        connections_xml = (self.mvr_connections_xml or "").strip()
+        if connections_xml:
+            try:
+                connections_node = ElementTree.fromstring(connections_xml)
+                if connections_node.tag != "Connections":
+                    connections_node = connections_node.find("Connections")
+                if connections_node is not None:
+                    connections = pymvr.Connections(xml_node=connections_node)
+            except Exception as exc:
+                DMX_Log.log.warning(
+                    f"Failed to parse MVR Connections XML for fixture {self.uuid}: {exc}"
+                )
+
         return pymvr.Fixture(
             name=self.user_fixture_name,
             uuid=self.uuid,
@@ -2796,6 +2817,7 @@ def to_mvr_fixture(self, universe_add=False):
             focus=uuid_focus_point,
             color=color,
             classing=self.classing,
+            connections=connections,
         )
 
     def focus_to_mvr_focus_point(self):

mvr.py

@@ -24,6 +24,7 @@
 from pathlib import Path
 from types import SimpleNamespace
 import traceback
+from xml.etree import ElementTree
 
 import bpy
 import pymvr
@@ -69,6 +70,17 @@ def create_local_transform_property(obj):
     obj["MVR Local Transform"] = trans_mtx
 
 
+def serialize_connections_xml(connections):
+    if not connections or len(connections) == 0:
+        return ""
+    root = ElementTree.Element("Root")
+    connections.to_xml(root)
+    connections_node = root.find("Connections")
+    if connections_node is None:
+        return ""
+    return ElementTree.tostring(connections_node, encoding="unicode")
+
+
 def get_matrix(obj, mtx):
     mtx_data = obj.matrix.matrix
     check_float = any(isinstance(i, float) for i in set().union(sum(mtx_data, [])))
@@ -773,6 +785,7 @@ def add_mvr_fixture(
         for address in fixture.addresses.addresses
         if address.address > 0
     ]
+    connections_xml = serialize_connections_xml(fixture.connections)
     null_matrix = pymvr.Matrix([[0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0], [0, 0, 0, 0]])
     # ensure that fixture is not scaled to 0
     if fixture.matrix == null_matrix:
@@ -807,6 +820,8 @@ def add_mvr_fixture(
             classing=fixture.classing,
             user_fixture_name=fixture.name,
         )
+        existing_fixture.mvr_connections_xml = connections_xml
+        added_fixture = existing_fixture
     else:
         if isinstance(fixture.color, str):
             fixture.color = pymvr.Color(str_repr=fixture.color)
@@ -829,6 +844,9 @@ def add_mvr_fixture(
             classing=fixture.classing,
             user_fixture_name=fixture.name,
         )
+        added_fixture = dmx.findFixtureByUUID(fixture.uuid)
+        if added_fixture:
+            added_fixture.mvr_connections_xml = connections_xml
 
     if parent_object is not None:
         direct_fixture_children.append(
@@ -852,7 +870,6 @@ def add_mvr_fixture(
         dump.append(fixture.uuid)
         group.dump = json.dumps(dump)
 
-        added_fixture = dmx.findFixtureByUUID(fixture.uuid)
         if added_fixture:
             added_fixture["layer_name"] = layer_collection.name
             added_fixture["layer_uuid"] = layer_collection.get("UUID", None)