From e20d4c93b7cf03e97076aed20719b3920afc8fb9 Mon Sep 17 00:00:00 2001
From: Massimo Fabbro <maxfb87@yahoo.it>
Date: Sun, 8 Jan 2023 20:23:37 +0100
Subject: [PATCH] Delete unuseful qto tool function

---
 src/blenderbim/blenderbim/core/qto.py  |  2 +-
 src/blenderbim/blenderbim/core/tool.py |  1 -
 src/blenderbim/blenderbim/tool/qto.py  | 15 +++++----------
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/blenderbim/blenderbim/core/qto.py b/src/blenderbim/blenderbim/core/qto.py
index 609499bab7..e25c7056a2 100644
--- a/src/blenderbim/blenderbim/core/qto.py
+++ b/src/blenderbim/blenderbim/core/qto.py
@@ -28,7 +28,7 @@ def assign_pset_qto(qto, selected_objects):
 
 def calculate_all_qtos(qto, selected_objects):
     for obj in selected_objects:
-        if not qto.get_pset_qto_object_ifc_info(obj):
+        if not qto.get_qto_entity(obj):
             print(f"There is no pset qto instance associated to object {obj.name}")
             continue
 
diff --git a/src/blenderbim/blenderbim/core/tool.py b/src/blenderbim/blenderbim/core/tool.py
index bcd01d2693..1dd5ef9391 100644
--- a/src/blenderbim/blenderbim/core/tool.py
+++ b/src/blenderbim/blenderbim/core/tool.py
@@ -405,7 +405,6 @@ class Qto:
     def get_radius_of_selected_vertices(cls, obj): pass
     def set_qto_result(cls, result): pass
     def assign_base_qto_to_object(cls, object): pass
-    def get_pset_qto_object_ifc_info(cls, object): pass
     def get_applicable_quantity_names(cls, object): pass
     def get_qto_applicable_name(cls, object): pass
     def edit_qto(cls, object, calculated_quantities): pass
diff --git a/src/blenderbim/blenderbim/tool/qto.py b/src/blenderbim/blenderbim/tool/qto.py
index 7abc235834..6044269fed 100644
--- a/src/blenderbim/blenderbim/tool/qto.py
+++ b/src/blenderbim/blenderbim/tool/qto.py
@@ -55,12 +55,6 @@ class Qto(blenderbim.core.tool.Qto):
             },
         )
 
-    @classmethod
-    def get_pset_qto_object_ifc_info(cls, obj):
-        element = tool.Ifc.get_entity(obj)
-        pset_qto_ifc_info = ifcopenshell.util.element.get_psets(element, qtos_only = True)
-        return pset_qto_ifc_info
-
     @classmethod
     def get_applicable_quantity_names(cls, obj):
         file = tool.Ifc.get()
@@ -83,7 +77,7 @@ class Qto(blenderbim.core.tool.Qto):
     def edit_qto(cls, obj, calculated_quantities):
         file = tool.Ifc.get()
         pset_qto_applicable_name = cls.get_qto_applicable_name(obj)
-        qto_entity = cls.get_qto_entity(obj, pset_qto_applicable_name)
+        qto_entity = cls.get_qto_entity(obj)
 
         ifcopenshell.api.run("pset.edit_qto",
                 file,
@@ -91,10 +85,11 @@ class Qto(blenderbim.core.tool.Qto):
             )
 
     @classmethod
-    def get_qto_entity(cls, obj, pset_qto_applicable_name):
+    def get_qto_entity(cls, obj):
         file = tool.Ifc.get()
-        pset_qto_object_ifc_info = cls.get_pset_qto_object_ifc_info(obj)
-        qto_entity = file.by_id(pset_qto_object_ifc_info[pset_qto_applicable_name]['id'])
+        entity = tool.Ifc.get_entity(obj)
+        qto_applicable_name = cls.get_qto_applicable_name(obj)
+        qto_entity = tool.Pset.get_element_pset(entity, qto_applicable_name)
         return qto_entity
 
     @classmethod