From dd7a6a80eb21794ed78a35ec3e25407e33fb8054 Mon Sep 17 00:00:00 2001
From: Andrej730 <azhilenkov@gmail.com>
Date: Wed, 18 Oct 2023 12:25:00 +0500
Subject: [PATCH] activate_drawing to prioritize already active representation

If there are multiple representations in the same subcontext, when it was searching for the representation for some specific subcontext, it would previously always switch to the first representation from the list, now it's going to prioritize the one that's already active.
---
 src/blenderbim/blenderbim/tool/drawing.py  | 27 +++++++++++++---------
 src/blenderbim/blenderbim/tool/geometry.py |  8 +++++++
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/src/blenderbim/blenderbim/tool/drawing.py b/src/blenderbim/blenderbim/tool/drawing.py
index 9c35acf8ad..09a4011c7b 100644
--- a/src/blenderbim/blenderbim/tool/drawing.py
+++ b/src/blenderbim/blenderbim/tool/drawing.py
@@ -1647,20 +1647,25 @@ class Drawing(blenderbim.core.tool.Drawing):
 
         for element in filtered_elements:
             obj = tool.Ifc.get_object(element)
+            subcontext = tool.Geometry.get_active_representation(obj).ContextOfItems
+            current_representation_subcontext = tool.Geometry.get_subcontext_parameters(subcontext)
+
             for subcontext in subcontexts:
+                # prioritize already active representation if it matches the subcontext
+                # (element could have multiple representations in the same subcontext)
+                if subcontext == current_representation_subcontext:
+                    break
                 priority_representation = ifcopenshell.util.representation.get_representation(element, *subcontext)
                 if priority_representation:
-                    current_representation = tool.Geometry.get_active_representation(obj)
-                    if current_representation != priority_representation:
-                        blenderbim.core.geometry.switch_representation(
-                            tool.Ifc,
-                            tool.Geometry,
-                            obj=obj,
-                            representation=priority_representation,
-                            should_reload=False,
-                            is_global=True,
-                            should_sync_changes_first=True,
-                        )
+                    blenderbim.core.geometry.switch_representation(
+                        tool.Ifc,
+                        tool.Geometry,
+                        obj=obj,
+                        representation=priority_representation,
+                        should_reload=False,
+                        is_global=True,
+                        should_sync_changes_first=True,
+                    )
                     break
 
     @classmethod
diff --git a/src/blenderbim/blenderbim/tool/geometry.py b/src/blenderbim/blenderbim/tool/geometry.py
index d4d8fa7509..5e480ade96 100644
--- a/src/blenderbim/blenderbim/tool/geometry.py
+++ b/src/blenderbim/blenderbim/tool/geometry.py
@@ -308,6 +308,14 @@ class Geometry(blenderbim.core.tool.Geometry):
             return active_representation.ContextOfItems
         return ifcopenshell.util.representation.get_context(tool.Ifc.get(), "Model", "Body", "MODEL_VIEW")
 
+    @classmethod
+    def get_subcontext_parameters(cls, subcontext):
+        return (
+            subcontext.ContextType,
+            subcontext.ContextIdentifier,
+            subcontext.TargetView,
+        )
+
     @classmethod
     def get_representation_by_context(cls, element, context):
         if element.is_a("IfcProduct") and element.Representation: