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

fix: ifc clash operator fixes

Browse Source 
fixes #2698
This commit is contained in:
Andrea Ghensi
2023-01-15 22:47:49 +01:00
committed by Dion Moult
parent e535f911d1
commit a5b4ac863b
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/blenderbim/blenderbim/bim/module/clash/operator.py
+11 -8
View File
@@ -194,11 +194,12 @@ class SelectSmartGroupedClashesPath(bpy.types.Operator):
class ExecuteIfcClash(bpy.types.Operator): class ExecuteIfcClash(bpy.types.Operator):
bl_idname = "bim.execute_ifc_clash" bl_idname = "bim.execute_ifc_clash"
bl_label = "Execute IFC Clash" bl_label = "Execute IFC Clash"
filename_ext = ".bcf" filter_glob: bpy.props.StringProperty( default='*.bcf;*.json', options={'HIDDEN'} )
filepath: bpy.props.StringProperty(subtype="FILE_PATH") filepath: bpy.props.StringProperty(subtype="FILE_PATH")
def invoke(self, context, event): def invoke(self, context, event):
if ".json" not in bpy.data.filepath: _, extension = os.path.splitext(self.filepath)
if extension != ".json":
self.filepath = bpy.path.ensure_ext(bpy.data.filepath, ".bcf") self.filepath = bpy.path.ensure_ext(bpy.data.filepath, ".bcf")
WindowManager = context.window_manager WindowManager = context.window_manager
WindowManager.fileselect_add(self) WindowManager.fileselect_add(self)
@@ -207,9 +208,10 @@ class ExecuteIfcClash(bpy.types.Operator):
def execute(self, context): def execute(self, context):
from ifcclash import ifcclash from ifcclash import ifcclash
settings = ifcclash.ClashSettings() _, extension = os.path.splitext(self.filepath)
if ".json" not in self.filepath: if extension != ".json":
self.filepath = bpy.path.ensure_ext(self.filepath, ".bcf") self.filepath = bpy.path.ensure_ext(self.filepath, ".bcf")
settings = ifcclash.ClashSettings()
settings.output = self.filepath settings.output = self.filepath
settings.logger = logging.getLogger("Clash") settings.logger = logging.getLogger("Clash")
settings.logger.setLevel(logging.DEBUG) settings.logger.setLevel(logging.DEBUG)
@@ -271,6 +273,7 @@ class SelectIfcClashResults(bpy.types.Operator):
return {"RUNNING_MODAL"} return {"RUNNING_MODAL"}
def execute(self, context): def execute(self, context):
self.file = IfcStore.get_file()
self.filepath = bpy.path.ensure_ext(self.filepath, ".json") self.filepath = bpy.path.ensure_ext(self.filepath, ".json")
with open(self.filepath) as f: with open(self.filepath) as f:
clash_sets = json.load(f) clash_sets = json.load(f)
@@ -304,14 +307,14 @@ class SmartClashGroup(bpy.types.Operator):
return context.scene.BIMClashProperties.clash_results_path return context.scene.BIMClashProperties.clash_results_path
def execute(self, context): def execute(self, context):
import ifcclash from ifcclash import ifcclash
settings = ifcclash.IfcClashSettings() settings = ifcclash.ClashSettings()
self.filepath = bpy.path.ensure_ext(context.scene.BIMClashProperties.clash_results_path, ".json") self.filepath = bpy.path.ensure_ext(context.scene.BIMClashProperties.clash_results_path, ".json")
settings.output = self.filepath settings.output = self.filepath
settings.logger = logging.getLogger("Clash") settings.logger = logging.getLogger("Clash")
settings.logger.setLevel(logging.DEBUG) settings.logger.setLevel(logging.DEBUG)
ifc_clasher = ifcclash.IfcClasher(settings) ifc_clasher = ifcclash.Clasher(settings)
with open(self.filepath) as f: with open(self.filepath) as f:
clash_sets = json.load(f) clash_sets = json.load(f)