Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-24 19:49:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

See #4696. Allow editing of properties that do not comply with the pset template definition.

Browse Source 
Strictly speaking, the only properties that should exist in a pset should be those in a pset template. However, there are situations where this is not the case, such as when the pset template has since been modified, or if there is invalid data coming from other software, or migrating between schemas. In this case, we should still load the property, and give the user the option to edit it (or null it).
This commit is contained in:
Dion Moult
2024-05-21 23:06:08 +10:00
parent 4fb34c0816
commit aeb1e4bf49
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/blenderbim/blenderbim/bim/module/pset/operator.py
+18 -9
View File
@@ -61,15 +61,16 @@ def get_pset_props(context, obj, obj_type):
elif obj_type == "Group": elif obj_type == "Group":
return context.scene.GroupPsetProperties return context.scene.GroupPsetProperties
class TogglePsetExpansion(bpy.types.Operator, Operator): class TogglePsetExpansion(bpy.types.Operator, Operator):
bl_idname = "bim.toggle_pset_expansion" bl_idname = "bim.toggle_pset_expansion"
bl_label = "Toggle Pset Expansion" bl_label = "Toggle Pset Expansion"
pset_id: bpy.props.IntProperty() pset_id: bpy.props.IntProperty()
def _execute(self, context): def _execute(self, context):
blenderbim.bim.module.pset.data.is_expanded[ blenderbim.bim.module.pset.data.is_expanded[self.pset_id] = (
self.pset_id not blenderbim.bim.module.pset.data.is_expanded.setdefault(self.pset_id, True)
] = not blenderbim.bim.module.pset.data.is_expanded.setdefault(self.pset_id, True) )
class EnablePsetEditing(bpy.types.Operator): class EnablePsetEditing(bpy.types.Operator):
@@ -99,8 +100,7 @@ class EnablePsetEditing(bpy.types.Operator):
if pset_template: if pset_template:
self.load_from_pset_template(pset_template, pset) self.load_from_pset_template(pset_template, pset)
else: self.load_from_pset_data(pset)
self.load_from_pset_data(pset)
self.props.active_pset_id = self.pset_id self.props.active_pset_id = self.pset_id
return {"FINISHED"} return {"FINISHED"}
@@ -141,10 +141,14 @@ class EnablePsetEditing(bpy.types.Operator):
metadata.data_type = self.get_data_type(prop_template) metadata.data_type = self.get_data_type(prop_template)
special_type = "" special_type = ""
if prop_template.PrimaryMeasureType in ( if (
"IfcPositiveLengthMeasure", prop_template.PrimaryMeasureType
"IfcLengthMeasure", in (
) or prop_template.TemplateType == "Q_LENGTH": "IfcPositiveLengthMeasure",
"IfcLengthMeasure",
)
or prop_template.TemplateType == "Q_LENGTH"
):
special_type = "LENGTH" special_type = "LENGTH"
elif prop_template.PrimaryMeasureType == "IfcAreaMeasure" or prop_template.TemplateType == "Q_AREA": elif prop_template.PrimaryMeasureType == "IfcAreaMeasure" or prop_template.TemplateType == "Q_AREA":
special_type = "AREA" special_type = "AREA"
@@ -196,6 +200,9 @@ class EnablePsetEditing(bpy.types.Operator):
new.is_selected = enum in selected_enum_items new.is_selected = enum in selected_enum_items
def load_from_pset_data(self, pset): def load_from_pset_data(self, pset):
if pset is None:
return
props = [] props = []
if pset.is_a("IfcElementQuantity"): if pset.is_a("IfcElementQuantity"):
props = pset.Quantities props = pset.Quantities
@@ -205,6 +212,8 @@ class EnablePsetEditing(bpy.types.Operator):
props = pset.Properties props = pset.Properties
for prop in props: for prop in props:
if self.props.properties.get(prop.Name):
continue # This property has already been added from a template
if prop.is_a("IfcPropertyEnumeratedValue"): if prop.is_a("IfcPropertyEnumeratedValue"):
simple_prop = self.props.properties.add() simple_prop = self.props.properties.add()
simple_prop.name = prop.Name simple_prop.name = prop.Name