Integrate ifccityjson in BlenderBIM (#1859)

* ifccityjson-BB integration: include CJIO in makefile

* Add ifccityjson to BlenderBIM

* Make ifccityjson work like a package

* Use pip while installing CJIO dependency for ifccityjson

* revert removal of brick module

* Changes from pull request review

* Use ifccityjson as CLI and as package for BlenderBIM
This commit is contained in:
Laurens Oostwegel
2021-11-08 22:51:30 +01:00
committed by GitHub
parent de7c54b771
commit ff6db5f24d
11 changed files with 185 additions and 19 deletions
+10
View File
@@ -134,6 +134,8 @@ endif
# Provides IFC5D functionality
cp -r dist/working/IfcOpenShell-0.7.0/src/ifc5d/ifc5d dist/blenderbim/libs/site/packages/
rm -rf dist/working
# Provides IFCCityJSON functionality
cp -r dist/working/IfcOpenShell-0.7.0/src/ifccityjson dist/blenderbim/libs/site/packages/
# Provides Mustache templating in construction documentation
mkdir dist/working
@@ -259,6 +261,14 @@ endif
mkdir dist/working
cd dist/working && wget $(HPPFCL_URL)
cd dist/working && tar -xf hpp-fcl*
# Required by IFCCityJSON
mkdir dist/working
cd dist/working && python -m venv env
cd dist/working && . env/bin/activate && pip install cjio
cp -r dist/working/env/Lib/site-packages dist/blenderbim/libs/site/packages/
rm -rf dist/working
ifeq ($(PLATFORM), linux)
cp -r dist/working/lib/$(PYLIBDIR)/site-packages/hppfcl dist/blenderbim/libs/site/packages/
cp -r dist/working/lib/*.so* dist/blenderbim/libs/
@@ -63,6 +63,7 @@ modules = {
"bimtester": None,
"diff": None,
"patch": None,
"gis": None,
"covetool": None,
"augin": None,
"debug": None,
@@ -0,0 +1,17 @@
import bpy
from . import prop
from . import operator
from . import ui
classes = (
prop.BIMCityJsonProperties,
operator.BIM_OT_cityjson2ifc,
operator.BIM_OT_find_cityjson_lod,
ui.BIM_PT_cityjson_converter,
)
def register():
bpy.types.Scene.ifccityjson_properties = bpy.props.PointerProperty(type=prop.BIMCityJsonProperties)
def unregister():
del bpy.types.Scene.ifccityjson_properties
@@ -0,0 +1,47 @@
import bpy
from bpy.types import Operator
from cjio import cityjson
from ifccityjson.cityjson2ifc.cityjson2ifc import Cityjson2ifc
class BIM_OT_cityjson2ifc(Operator):
bl_idname = "bim.convert_cityjson2ifc"
bl_label = "Convert CityJSON to IFC"
bl_context = "scene"
def execute(self, context):
props = context.scene.ifccityjson_properties
city_model = cityjson.load(props.input, transform=False)
data = {
"file_destination": props.output,
"lod": props.lod,
"split": props.split_lod,
}
if props.name is not "":
data["name_attribute"] = props.name
converter = Cityjson2ifc()
converter.configuration(**data)
converter.convert(city_model)
if props.load_after_convert:
bpy.ops.bim.load_project(filepath=props.output)
return {'FINISHED'}
class BIM_OT_find_cityjson_lod(Operator):
bl_idname = "bim.find_cityjson_lod"
bl_label = "Find LODs in CityJSON file"
bl_context = "scene"
def execute(self, context):
props = context.scene.ifccityjson_properties
city_model = cityjson.load(props.input)
lods = set()
for obj_id, obj in city_model.get_cityobjects().items():
for geometry in obj.geometry:
lod = str(geometry.lod)
if lod not in lods:
lods.add(lod)
props.lods.add()
props.lods[-1].name = lod
props.is_lod_found = True
return {'FINISHED'}
@@ -0,0 +1,16 @@
from bpy.types import PropertyGroup
from bpy.props import StringProperty, BoolProperty, EnumProperty, CollectionProperty
from blenderbim.bim.prop import StrProperty
class BIMCityJsonProperties(PropertyGroup):
def get_lods(self, context):
return [(item.name, "LOD" + item.name, "Level of Detail " + item.name) for item in self.lods]
input: StringProperty(name="cj_input", default="", subtype='FILE_PATH')
output: StringProperty(name="ifc_output", default="", subtype='FILE_PATH')
name: StringProperty(name="identifier", default="")
split_lod: BoolProperty(name="split_lod", default=True)
lods: CollectionProperty(name="lods", type=StrProperty)
lod: EnumProperty(name="lod", description="", items=get_lods, options={'ANIMATABLE'}, default=None)
is_lod_found: BoolProperty(name="is_lod_found", default=False)
load_after_convert: BoolProperty(name="load_after_convert", default=True)
@@ -0,0 +1,32 @@
from bpy.types import Panel
class BIM_PT_cityjson_converter(Panel):
bl_label = "IFC CityJSON converter"
bl_idname = "BIM_PT_ifccityjson"
bl_options = {"DEFAULT_CLOSED"}
bl_space_type = "PROPERTIES"
bl_region_type = "WINDOW"
bl_context = "scene"
def draw(self, context):
layout = self.layout
scene = context.scene
props = scene.ifccityjson_properties
row = layout.row(align=True)
row.prop(props, "input")
row = layout.row(align=True)
row.operator("bim.find_cityjson_lod")
row = layout.row(align=True)
row.prop(props, "output")
row = layout.row(align=True)
row.prop(props, "name")
row = layout.row(align=True)
row.prop(props, "split_lod")
row.prop(props, "load_after_convert")
row = layout.row(align=True)
row.prop(props, "lod")
if not props.is_lod_found:
row.enabled = False
row = layout.row(align=True)
row.operator("bim.convert_cityjson2ifc")