From 05e202059e8f156cac7d1bf174bdbd293afdf2f5 Mon Sep 17 00:00:00 2001 From: Ryan Schultz Date: Sat, 20 Jul 2024 13:02:21 -0500 Subject: [PATCH] fix #5047 - order IfcAnnotationTypes alphabetically. and order types regardless of case. --- src/blenderbim/blenderbim/bim/module/drawing/data.py | 1 + src/blenderbim/blenderbim/bim/module/model/data.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/blenderbim/blenderbim/bim/module/drawing/data.py b/src/blenderbim/blenderbim/bim/module/drawing/data.py index 61652baa8e..a349970b91 100644 --- a/src/blenderbim/blenderbim/bim/module/drawing/data.py +++ b/src/blenderbim/blenderbim/bim/module/drawing/data.py @@ -410,6 +410,7 @@ class AnnotationData: results = [("0", "Untyped", "")] results.extend([(str(e.id()), e.Name or "Unnamed", e.Description or "") for e in relating_types]) + results.sort(key=lambda x: x[1].lower()) return results @classmethod diff --git a/src/blenderbim/blenderbim/bim/module/model/data.py b/src/blenderbim/blenderbim/bim/module/model/data.py index 7f39a44552..f8fcfd2612 100644 --- a/src/blenderbim/blenderbim/bim/module/model/data.py +++ b/src/blenderbim/blenderbim/bim/module/model/data.py @@ -245,7 +245,7 @@ class AuthoringData: if not ifc_class and ifc_classes: ifc_class = ifc_classes[0][0] if ifc_class: - elements = sorted(tool.Ifc.get().by_type(ifc_class), key=lambda s: s.Name or "Unnamed") + elements = sorted(tool.Ifc.get().by_type(ifc_class), key=lambda s: (s.Name or "Unnamed").lower()) results.extend(elements) return [(str(e.id()), e.Name or "Unnamed", e.Description or "") for e in results] return []