Enums from attributes can now be searched by name

This commit is contained in:
Gorgious56
2022-07-06 12:09:37 +02:00
parent 7eac5397cd
commit 4195d41e4c
12 changed files with 31 additions and 23 deletions
+18 -5
View File
@@ -38,11 +38,14 @@ def draw_attribute(attribute, layout, copy_operator=None):
if not value_name:
layout.label(text=attribute.name)
return
layout.prop(
attribute,
value_name,
text=attribute.name,
)
if value_name == "enum_value":
prop_with_search(layout, attribute, "enum_value", text=attribute.name)
else:
layout.prop(
attribute,
value_name,
text=attribute.name,
)
if attribute.is_optional:
layout.prop(attribute, "is_null", icon="RADIOBUT_OFF" if attribute.is_null else "RADIOBUT_ON", text="")
if copy_operator:
@@ -105,6 +108,16 @@ def export_attributes(props, callback=None):
return attributes
def prop_with_search(layout, data, prop_name, **kwargs):
# kwargs are layout.prop arguments (text, icon, etc.)
row = layout.row(align=True)
# Magick courtesy of https://blender.stackexchange.com/a/203443/86891
row.context_pointer_set(name="data", data=data)
row.prop(data, prop_name, **kwargs)
op = row.operator("bim.enum_property_search", text="", icon="VIEWZOOM")
op.prop_name = prop_name
class IfcHeaderExtractor:
def __init__(self, filepath: str):
self.filepath = filepath
@@ -18,7 +18,7 @@
import blenderbim.tool as tool
from bpy.types import Panel, UIList
from blenderbim.bim.ui import prop_with_search
from blenderbim.bim.helper import prop_with_search
from blenderbim.bim.module.brick.data import BrickschemaData, BrickschemaReferencesData
@@ -19,7 +19,7 @@
import bpy
from bpy.types import Panel
from blenderbim.bim.ifc import IfcStore
from blenderbim.bim.ui import prop_with_search
from blenderbim.bim.helper import prop_with_search
from blenderbim.bim.module.geometry.data import RepresentationsData, DerivedPlacementsData
@@ -22,7 +22,7 @@ from ifcopenshell.api.material.data import Data
from ifcopenshell.api.profile.data import Data as ProfileData
from blenderbim.bim.ifc import IfcStore
from blenderbim.bim.helper import draw_attributes
from blenderbim.bim.ui import prop_with_search
from blenderbim.bim.helper import prop_with_search
from blenderbim.bim.module.material.data import MaterialsData, ObjectMaterialData
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with BlenderBIM Add-on. If not, see <http://www.gnu.org/licenses/>.
from blenderbim.bim.ui import prop_with_search
from blenderbim.bim.helper import prop_with_search
import bpy
from blenderbim.bim.helper import draw_attributes
@@ -17,7 +17,7 @@
# along with BlenderBIM Add-on. If not, see <http://www.gnu.org/licenses/>.
import os
from blenderbim.bim.ui import prop_with_search
from blenderbim.bim.helper import prop_with_search
from bpy.types import Panel, UIList
from blenderbim.bim.ifc import IfcStore
from blenderbim.bim.module.project.data import ProjectData
@@ -18,7 +18,7 @@
from bpy.types import Panel
from blenderbim.bim.ifc import IfcStore
from blenderbim.bim.ui import prop_with_search
from blenderbim.bim.helper import prop_with_search
from blenderbim.bim.module.pset.data import (
ObjectPsetsData,
ObjectQtosData,
@@ -19,7 +19,7 @@
import bpy
from bpy.types import Panel
from blenderbim.bim.ifc import IfcStore
from blenderbim.bim.ui import prop_with_search
from blenderbim.bim.helper import prop_with_search
from blenderbim.bim.module.pset_template.prop import (
getPsetTemplates,
)
@@ -20,7 +20,7 @@ import bpy
import blenderbim.bim.module.root.prop as root_prop
from bpy.types import Panel
from blenderbim.bim.ifc import IfcStore
from blenderbim.bim.ui import prop_with_search
from blenderbim.bim.helper import prop_with_search
from blenderbim.bim.module.root.data import IfcClassData
@@ -19,7 +19,7 @@
import blenderbim.bim.helper
from bpy.types import Panel, UIList
from blenderbim.bim.ifc import IfcStore
from blenderbim.bim.ui import prop_with_search
from blenderbim.bim.helper import prop_with_search
from blenderbim.bim.module.unit.data import UnitsData
+4
View File
@@ -240,6 +240,10 @@ class Attribute(PropertyGroup):
value = str(value)
setattr(self, self.get_value_name(), value)
getter_enum = {
"enum_value": getAttributeEnumValues,
}
class ModuleVisibility(PropertyGroup):
name: StringProperty(name="Name")
-9
View File
@@ -170,15 +170,6 @@ class BIM_ADDON_preferences(bpy.types.AddonPreferences):
row.operator("bim.configure_visibility")
def prop_with_search(layout, data, prop_name, **kwargs): # Kwargs are layout.prop arguments (text, icon, etc.)
row = layout.row(align=True)
# Magick courtesy of https://blender.stackexchange.com/a/203443/86891
row.context_pointer_set(name="data", data=data)
row.prop(data, prop_name, **kwargs)
op = row.operator("bim.enum_property_search", text="", icon="VIEWZOOM")
op.prop_name = prop_name
def ifc_units(self, context):
scene = context.scene
props = scene.BIMProperties