Rework Fixture Name to be not dependent on PropertyGroup

Author: vanous

dmx.py

@@ -2035,6 +2035,7 @@ def addFixture(
         fixture_id_numeric=0,
         unit_number=0,
         classing=None,
+        user_fixture_name="",
     ):
         # TODO: fix order of attributes to match fixture.build()
         dmx = bpy.context.scene.dmx
@@ -2057,6 +2058,7 @@ def addFixture(
                 fixture_id_numeric,
                 unit_number,
                 classing=classing,
+                user_fixture_name=user_fixture_name,
             )
         except Exception as e:
             DMX_Log.log.error(f"Error while adding fixture {e}")

fixture.py

@@ -413,6 +413,11 @@ class DMX_Fixture(PropertyGroup):
         type = DMX_Fixture_Channel
     )
 
+    user_fixture_name: StringProperty(
+        name = "Fixture name",
+        description="User definable fixture name, can be non-unique, is for MVR export and all UI",
+        default = "")
+
     gdtf_long_name: StringProperty(
         name = "Fixture > Name",
         default = "")
@@ -530,6 +535,7 @@ def build(
         fixture_id_numeric=0,
         unit_number=0,
         classing="",
+        user_fixture_name="",
     ):
         bpy.ops.object.select_all(action="DESELECT")
         for obj in bpy.data.objects:
@@ -551,6 +557,7 @@ def build(
         self.name = name
         self.profile = profile
         self.mode = mode
+        self.user_fixture_name = user_fixture_name
         if fixture_id is not None:
             self.fixture_id = fixture_id
         if custom_id is not None:
@@ -2750,7 +2757,7 @@ def to_mvr_fixture(self, universe_add=False):
         ]
 
         return pymvr.Fixture(
-            name=self.name,
+            name=self.user_fixture_name,
             uuid=self.uuid,
             gdtf_spec=self.profile,
             gdtf_mode=self.mode,
@@ -2775,7 +2782,7 @@ def focus_to_mvr_focus_point(self):
                 return pymvr.FocusPoint(
                     matrix=pymvr.Matrix(matrix),
                     uuid=uuid_,
-                    name=f"Target for {self.name}",
+                    name=f"Target for {self.user_fixture_name}",
                 )
 
     def follow_target_constraint_enable(self, enabled):

panels/fixtures.py

@@ -147,7 +147,7 @@ class DMX_OT_Fixture_Profiles(Operator):
 
     def execute(self, context):
         context.add_edit_panel.profile = self.profile
-        context.add_edit_panel.name = self.short_name
+        context.add_edit_panel.user_fixture_name = self.short_name
         return {"FINISHED"}
 
 
@@ -177,7 +177,7 @@ def onProfile(self, context):
         update=onProfile,
     )
 
-    name: StringProperty(name=_("Name"), default="Fixture")
+    user_fixture_name: StringProperty(name=_("Name"), default="Fixture")
 
     dmx_breaks: CollectionProperty(name="DMX Break", type=DMX_Break)
 
@@ -268,10 +268,10 @@ def draw(self, context):
         if self.units == 1:
             self.advanced_edit = True
         if self.advanced_edit:
-            col.prop(self, "name")
+            col.prop(self, "user_fixture_name")
         else:
-            if self.name != "*":
-                col.label(text=f"{self.name}")
+            if self.user_fixture_name != "*":
+                col.label(text=f"{self.user_fixture_name}")
 
         col.context_pointer_set("add_edit_panel", self)
         text_profile = _("GDTF Profile")
@@ -378,11 +378,11 @@ def execute(self, context):
         bpy.context.scene.cursor.location = (0.0, 0.0, 0.0)
         bpy.context.scene.cursor.rotation_euler = (0.0, 0.0, 0.0)
 
-        if self.name in bpy.data.collections:
-            self.report(
-                {"ERROR"}, _("Fixture named {} already exists").format(self.name)
-            )
-            return {"CANCELLED"}
+        # if self.name in bpy.data.collections:
+        #    self.report(
+        #        {"ERROR"}, _("Fixture named {} already exists").format(self.name)
+        #    )
+        #    return {"CANCELLED"}
         if not len(self.profile):
             self.report({"ERROR"}, _("No GDTF Profile selected."))
             return {"CANCELLED"}
@@ -392,8 +392,8 @@ def execute(self, context):
         dmx_breaks = self.dmx_breaks
         fixture_id = self.fixture_id
         for i in range(self.units):
-            DMX_Log.log.debug(f"Adding fixture {self.name}")
-            new_name = generate_fixture_name(self.name, i + 1)
+            DMX_Log.log.debug(f"Adding fixture {self.user_fixture_name}")
+            new_name = generate_fixture_name(self.profile, i + 1)
             dmx.addFixture(
                 new_name,
                 self.profile,
@@ -403,6 +403,7 @@ def execute(self, context):
                 self.display_beams,
                 self.add_target,
                 fixture_id=fixture_id,
+                user_fixture_name=self.user_fixture_name,
             )
             fixture = dmx.fixtures[-1]
             DMX_Log.log.debug(f"Added fixture {fixture}")
@@ -427,7 +428,7 @@ def execute(self, context):
     def invoke(self, context, event):
         # fixtures_len = len(context.scene.dmx.fixtures)
         # self.name = generate_fixture_name("Fixture", fixtures_len + 1)
-        self.name = "Fixture"
+        self.user_fixture_name = "Fixture Name"
         self.units = 1
         DMX_Fixture_AddEdit.profile_list_items = []
         wm = context.window_manager
@@ -454,15 +455,15 @@ def execute(self, context):
         # Single fixture
         if len(selected) == 1:
             fixture = selected[0]
-            if self.name != fixture.name and self.name in bpy.data.collections:
-                self.report(
-                    {"ERROR"}, _("Fixture named {} already exists").format(self.name)
-                )
-                return {"CANCELLED"}
+            # if self.name != fixture.name and self.name in bpy.data.collections:
+            #    self.report(
+            #        {"ERROR"}, _("Fixture named {} already exists").format(self.name)
+            #    )
+            #    return {"CANCELLED"}
 
             if self.advanced_edit:
                 fixture.build(
-                    self.name,
+                    fixture.name,
                     self.profile,
                     self.mode,
                     self.dmx_breaks,
@@ -471,6 +472,7 @@ def execute(self, context):
                     self.add_target,
                     uuid=fixture.uuid,
                     fixture_id=fixture.fixture_id,
+                    user_fixture_name=self.user_fixture_name,
                 )
                 context.window_manager.dmx.pause_render = False
             else:
@@ -504,21 +506,26 @@ def execute(self, context):
         else:
             dmx_breaks = self.dmx_breaks
             fixture_id = self.fixture_id
+            # for i, fixture in enumerate(selected):
+            # name = generate_fixture_name(self.name, i + 1)
+            # if name != fixture.name and name in bpy.data.collections:
+            #    self.report(
+            #        {"ERROR"},
+            #        _("Fixture named {} already exists".format(self.name)),
+            #    )
+            #    return {"CANCELLED"}
             for i, fixture in enumerate(selected):
-                name = generate_fixture_name(self.name, i + 1)
-                if name != fixture.name and name in bpy.data.collections:
-                    self.report(
-                        {"ERROR"},
-                        _("Fixture named {} already exists".format(self.name)),
-                    )
-                    return {"CANCELLED"}
-            for i, fixture in enumerate(selected):
-                name = (
-                    generate_fixture_name(self.name, i + 1)
-                    if (self.name != "*")
-                    else fixture.name
-                )
+                # name = (
+                #    generate_fixture_name(self.name, i + 1)
+                #    if (self.name != "*")
+                #    else fixture.name
+                # )
                 # fixture_id = f"{self.fixture_id}{i+1}" if (self.name != '*') else fixture.name
+                if self.user_fixture_name == "*":
+                    new_fixture_name = fixture.user_fixture_name
+                else:
+                    new_fixture_name = self.user_fixture_name
+
                 profile = self.profile if (self.profile != "") else fixture.profile
                 mode = self.mode if (self.mode != "") else fixture.mode
                 if not self.modify_address:
@@ -536,7 +543,7 @@ def execute(self, context):
                     _fixture_id = fixture.fixture_id
                 if self.advanced_edit:
                     fixture.build(
-                        name,
+                        fixture.name,
                         profile,
                         mode,
                         dmx_breaks,
@@ -545,6 +552,7 @@ def execute(self, context):
                         self.add_target,
                         uuid=fixture.uuid,
                         fixture_id=_fixture_id,
+                        user_fixture_name=new_fixture_name,
                     )
                 if self.modify_address:
                     for fixture_break, edit_break in zip(
@@ -581,8 +589,8 @@ def invoke(self, context, event):
         # Single fixture edit
         if len(selected) == 1:
             fixture = selected[0]
-            self.name = fixture.name
             self.profile = fixture.profile
+            self.user_fixture_name = fixture.user_fixture_name
             self.dmx_breaks.clear()
             for dmx_break in fixture.dmx_breaks:
                 new_break = self.dmx_breaks.add()
@@ -609,7 +617,7 @@ def invoke(self, context, event):
             self.use_target = fixture.use_target
         # Multiple fixtures edit
         else:
-            self.name = "*"
+            self.user_fixture_name = "*"
             self.profile = ""
             self.dmx_breaks.clear()
             for selected_dmx_break in selected[0].dmx_breaks:
@@ -946,7 +954,7 @@ def filter_items(self, context, data, propname):
         flt_neworder = []
 
         flt_flags = helper_funcs.filter_items_by_name(
-            self.filter_name, self.bitflag_filter_item, vgroups, "name"
+            self.filter_name, self.bitflag_filter_item, vgroups, "user_fixture_name"
         )
         if not flt_flags:
             flt_flags = [self.bitflag_filter_item] * len(vgroups)
@@ -965,7 +973,7 @@ def filter_items(self, context, data, propname):
             ]
             flt_neworder = helper_funcs.sort_items_helper(_sort, lambda e: e[1], False)
         elif sorting_order == "NAME":
-            flt_neworder = helper_funcs.sort_items_by_name(vgroups, "name")
+            flt_neworder = helper_funcs.sort_items_by_name(vgroups, "user_fixture_name")
         elif sorting_order == "FIXTURE_ID":
             _sort = [
                 (idx, self.str_to_digit(vgroups[vg.name].fixture_id))
@@ -989,15 +997,22 @@ def draw_item(
         dmx = scene.dmx
 
         has_ies = len(item.ies_data) > 0
-        item_dmx_break = item.dmx_breaks[0]  # just get the first breake for now
+        item_dmx_break = item.dmx_breaks[0]  # just get the first break for now
         col = layout.column()
         col.context_pointer_set("fixture", item)
-        col.operator(
-            "dmx.fixture_item",
-            text=f"{item.name}{' 📈' if has_ies else ''} {'*' if item.dmx_cache_dirty else ''}",
-            depress=item.is_selected(),
-            icon="LOCKED" if item.ignore_movement_dmx else "OUTLINER_DATA_LIGHT",
-        )
+
+        if dmx.fixture_properties_editable:
+            col = layout.column()
+            col.label(text=f"{item.gdtf_long_name}")
+            col = layout.column()
+            col.prop(item, "user_fixture_name", text="")
+        else:
+            col.operator(
+                "dmx.fixture_item",
+                text=f"{item.user_fixture_name}{' 📈' if has_ies else ''} {'🖊' if item.dmx_cache_dirty else ''}",
+                depress=item.is_selected(),
+                icon="LOCKED" if item.ignore_movement_dmx else "OUTLINER_DATA_LIGHT",
+            )
         col.ui_units_x = 6
 
         if dmx.column_fixture_id:
@@ -1050,7 +1065,7 @@ def draw_item(
                 ]  # just get the first break for now
                 if overlapping:
                     break
-                if fixture.name == item.name:
+                if fixture.name == item.name:  # TODO user_fixture_name
                     continue
                 if fixture_dmx_break.universe == item_dmx_break.universe:
                     channels = set(

panels/programmer.py

@@ -514,7 +514,12 @@ def draw(self, context):
         if len(selected_fixtures) == 0:
             selected_fixture_label = _("Nothing selected")
         elif len(selected_fixtures) == 1:
-            selected_fixture_label = selected_fixtures[0].name
+            my_id = f"{selected_fixtures[0].fixture_id or selected_fixtures[0].custom_id or selected_fixtures[0].unit_number or selected_fixtures[0].fixture_id_numeric}"
+            my_addr = f"{selected_fixtures[0].dmx_breaks[0].universe}/{selected_fixtures[0].dmx_breaks[0].address}"
+            selected_fixture_label = (
+                f"{selected_fixtures[0].user_fixture_name}: {my_id} - {my_addr}"
+            )
+
             selected_fixture_class = selected_fixtures[0]
         else:
             profiles = []