Fix #4086. Add support for non predefined bSDD pset and qto values.

src/blenderbim/blenderbim/bim/module/bsdd/operator.py

@@ -34,10 +34,10 @@ class LoadBSDDDomains(bpy.types.Operator):
         props.domains.clear()
         client = bsdd.Client()
 
-        if props.load_activated_domains:
-            domains = [d for d in client.Domain() if d["status"] == "Active"]
-        else:
+        if props.load_preview_domains:
             domains = client.Domain()
+        else:
+            domains = [d for d in client.Domain() if d["status"] == "Active"]
 
         for domain in sorted(domains, key=lambda x: x["name"]):
             new = props.domains.add()
@@ -125,14 +125,23 @@ class GetBSDDClassificationProperties(bpy.types.Operator):
                 possible_values = prop.get("possibleValues", []) or []
                 possible_values = [v["value"] for v in possible_values]
 
-            psets[pset][prop["name"]] = possible_values
+            psets[pset][prop["name"]] = {"data_type": prop["dataType"], "possible_values": possible_values}
+
+        data_type_map = {
+            "String": "string",
+            "Real": "float",
+            "Boolean": "boolean",
+        }
 
         for pset_name, pset in psets.items():
             new = bprops.classification_psets.add()
             new.name = pset_name
-            for name, values in pset.items():
+            for name, data in pset.items():
                 new2 = new.properties.add()
                 new2.name = name
-                new2.enum_items = json.dumps(values)
-                new2.data_type = "enum"
+                if data["possible_values"]:
+                    new2.enum_items = json.dumps(data["possible_values"])
+                    new2.data_type = "enum"
+                else:
+                    new2.data_type = data_type_map[data["data_type"]]
         return {"FINISHED"}

src/blenderbim/blenderbim/bim/module/bsdd/prop.py

@@ -63,5 +63,5 @@ class BIMBSDDProperties(PropertyGroup):
     active_classification_index: IntProperty(name="Active Classification Index")
     keyword: StringProperty(name="Keyword")
     should_filter_ifc_class: BoolProperty(name="Filter Active IFC Class", default=True)
-    load_activated_domains: BoolProperty(name="Load Activated Domains Only", default=True)
+    load_preview_domains: BoolProperty(name="Load Preview Domains", default=False)
     classification_psets: CollectionProperty(name="Classification Psets", type=BSDDPset)

src/blenderbim/blenderbim/bim/module/bsdd/ui.py

@@ -32,8 +32,10 @@ class BIM_PT_bsdd(Panel):
 
     def draw(self, context):
         props = context.scene.BIMBSDDProperties
-        row = self.layout.row()
-        row.prop(props, "load_activated_domains")
+        row = self.layout.row(align=True)
+        row.prop(props, "load_preview_domains")
+        if len(props.domains):
+            row.operator("bim.load_bsdd_domains", text="", icon="FILE_REFRESH")
 
         if props.active_domain:
             row = self.layout.row()
@@ -51,8 +53,6 @@ class BIM_PT_bsdd(Panel):
                 props,
                 "active_domain_index",
             )
-            row = self.layout.row()
-            row.operator("bim.load_bsdd_domains", text="Reload bSDD Domains")
         else:
             row = self.layout.row()
             row.operator("bim.load_bsdd_domains")
@@ -62,8 +62,10 @@ class BIM_UL_bsdd_domains(UIList):
     def draw_item(self, context, layout, data, item, icon, active_data, active_propname):
         if item:
             row = layout.row(align=True)
-            row.label(text=f"{item.name} ({item.organization_name_owner})")
-            row.label(text=item.status)
+            if item.status != "Active":
+                row.label(text=f"{item.name} ({item.organization_name_owner}) - {item.status}", icon="ERROR")
+            else:
+                row.label(text=f"{item.name} ({item.organization_name_owner})")
             op = row.operator("bim.set_active_bsdd_domain", text="", icon="RESTRICT_SELECT_OFF")
             op.name = item.name
             op.uri = item.namespace_uri

src/blenderbim/blenderbim/bim/module/classification/operator.py

@@ -324,17 +324,32 @@ class AddClassificationReferenceFromBSDD(bpy.types.Operator, tool.Ifc.Operator):
             reference.Location = bsdd_classification.namespace_uri
 
             for classification_pset in bprops.classification_psets:
-                pset = ifcopenshell.util.element.get_pset(element, classification_pset.name)
+                is_pset = not classification_pset.name.startswith("Qto_")
+
+                if is_pset:
+                    pset = ifcopenshell.util.element.get_pset(element, classification_pset.name, psets_only=True)
+                else:
+                    pset = ifcopenshell.util.element.get_pset(element, classification_pset.name, qtos_only=True)
+
                 if pset:
                     pset = tool.Ifc.get().by_id(pset["id"])
-                else:
+                elif is_pset:
                     pset = ifcopenshell.api.run(
                         "pset.add_pset", tool.Ifc.get(), product=element, name=classification_pset.name
                     )
+                else:
+                    pset = ifcopenshell.api.run(
+                        "pset.add_qto", tool.Ifc.get(), product=element, name=classification_pset.name
+                    )
+
                 properties = {}
                 for prop in classification_pset.properties:
                     properties[prop.name] = prop.get_value()
-                ifcopenshell.api.run("pset.edit_pset", tool.Ifc.get(), pset=pset, properties=properties)
+
+                if is_pset:
+                    ifcopenshell.api.run("pset.edit_pset", tool.Ifc.get(), pset=pset, properties=properties)
+                else:
+                    ifcopenshell.api.run("pset.edit_qto", tool.Ifc.get(), qto=pset, properties=properties)
 
 
 class ChangeClassificationLevel(bpy.types.Operator):