From 02ddedd3e6b4601a80368d2a55d79a65ab195592 Mon Sep 17 00:00:00 2001
From: Ryan Schultz <ryan@openingdesign.com>
Date: Tue, 24 Feb 2026 10:10:57 -0600
Subject: [PATCH] Generalize ExcludeAnnotation to any IFC element

Rename ExcludeAnnotation to ExcludeFromDrawing and update
bl_idname to bim.exclude_from_drawing. The operator now
excludes any selected IFC element, not just auto-annotations.
For auto-annotations the referenced product is still resolved
first. Also rename exclude_annotation_from_drawing to
exclude_element_from_drawing in tool.Drawing.

Generated with the assistance of an AI coding tool.
---
 .../bonsai/bim/module/drawing/__init__.py      |  2 +-
 .../bonsai/bim/module/drawing/operator.py      | 18 +++++++++++-------
 src/bonsai/bonsai/bim/module/drawing/ui.py     |  2 +-
 src/bonsai/bonsai/tool/drawing.py              |  2 +-
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/bonsai/bonsai/bim/module/drawing/__init__.py b/src/bonsai/bonsai/bim/module/drawing/__init__.py
index 9f172ce2bb..1c167f18a8 100644
--- a/src/bonsai/bonsai/bim/module/drawing/__init__.py
+++ b/src/bonsai/bonsai/bim/module/drawing/__init__.py
@@ -66,7 +66,7 @@ classes = (
     operator.EnableEditingAssignedProduct,
     operator.EnableEditingElementFilter,
     operator.EnableEditingText,
-    operator.ExcludeAnnotation,
+    operator.ExcludeFromDrawing,
     operator.ExpandSheet,
     operator.ToggleElementValuesPanel,
     operator.ToggleElementValuesCategory,
diff --git a/src/bonsai/bonsai/bim/module/drawing/operator.py b/src/bonsai/bonsai/bim/module/drawing/operator.py
index 2cddf46f9e..86aaf0db3b 100644
--- a/src/bonsai/bonsai/bim/module/drawing/operator.py
+++ b/src/bonsai/bonsai/bim/module/drawing/operator.py
@@ -4023,20 +4023,24 @@ class OpenDocumentationWebUi(bpy.types.Operator):
         return {"FINISHED"}
 
 
-class ExcludeAnnotation(bpy.types.Operator, tool.Ifc.Operator):
-    bl_idname = "bim.exclude_annotation"
-    bl_label = "Exclude Annotation"
-    bl_description = "Excludes the automatic annotation reference from the drawing"
+class ExcludeFromDrawing(bpy.types.Operator, tool.Ifc.Operator):
+    bl_idname = "bim.exclude_from_drawing"
+    bl_label = "Exclude From Drawing"
+    bl_description = "Excludes the selected IFC elements from the drawing"
     bl_options = {"REGISTER", "UNDO"}
 
     def _execute(self, context):
         if not (obj := bpy.context.scene.camera) or not (drawing := tool.Ifc.get_entity(obj)):
             return
         for obj in tool.Blender.get_selected_objects(include_active=False):
-            if (element := tool.Ifc.get_entity(obj)) and tool.Drawing.is_auto_annotation(element):
-                if referenced_element := tool.Drawing.get_annotation_element(element):
-                    tool.Drawing.exclude_annotation_from_drawing(referenced_element, drawing)
+            if element := tool.Ifc.get_entity(obj):
+                if tool.Drawing.is_auto_annotation(element):
+                    element = tool.Drawing.get_annotation_element(element)
+                if element:
+                    tool.Drawing.exclude_element_from_drawing(element, drawing)
         core.sync_references(tool.Ifc, tool.Collector, tool.Drawing, drawing=drawing)
+        bpy.ops.bim.enable_editing_element_filter(filter_mode="EXCLUDE")
+        bpy.ops.bim.edit_element_filter(filter_mode="EXCLUDE")
 
 
 class ActivateDrawingByAnnotation(bpy.types.Operator, tool.Ifc.Operator):
diff --git a/src/bonsai/bonsai/bim/module/drawing/ui.py b/src/bonsai/bonsai/bim/module/drawing/ui.py
index dc98715686..00f6288f82 100644
--- a/src/bonsai/bonsai/bim/module/drawing/ui.py
+++ b/src/bonsai/bonsai/bim/module/drawing/ui.py
@@ -198,7 +198,7 @@ class BIM_PT_element_filters(Panel):
             text = "Exclude Filter" if ElementFiltersData.data["has_exclude_filter"] else "No Exclude Filter Found"
             icon = "GREASEPENCIL" if ElementFiltersData.data["has_exclude_filter"] else "ADD"
             row.label(text=text, icon="FILTER")
-            row.operator("bim.exclude_annotation", icon="REMOVE", text="")
+            row.operator("bim.exclude_from_drawing", icon="REMOVE", text="")
             row.operator("bim.enable_editing_element_filter", icon=icon, text="").filter_mode = "EXCLUDE"
 
 
diff --git a/src/bonsai/bonsai/tool/drawing.py b/src/bonsai/bonsai/tool/drawing.py
index 864568c835..75289671b4 100644
--- a/src/bonsai/bonsai/tool/drawing.py
+++ b/src/bonsai/bonsai/tool/drawing.py
@@ -223,7 +223,7 @@ class Drawing(bonsai.core.tool.Drawing):
                         return e
 
     @classmethod
-    def exclude_annotation_from_drawing(
+    def exclude_element_from_drawing(
         cls, element: ifcopenshell.entity_instance, drawing: ifcopenshell.entity_instance
     ) -> None:
         ifc_file = tool.Ifc.get()