From 71489032c27d72802a15c60b297217f29d3693d8 Mon Sep 17 00:00:00 2001 From: Mike Molinari Date: Sun, 10 Jul 2022 22:23:51 +0000 Subject: [PATCH] Made import FCStd files more relighable --- .../features/importModel/importModel.operation.ts | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/modules/workbenches/modeler/features/importModel/importModel.operation.ts b/modules/workbenches/modeler/features/importModel/importModel.operation.ts index f1dfcbae..d949358d 100644 --- a/modules/workbenches/modeler/features/importModel/importModel.operation.ts +++ b/modules/workbenches/modeler/features/importModel/importModel.operation.ts @@ -56,7 +56,7 @@ export const ImportModelOpperation: OperationDescriptor = { for (const itemToLookAt in DecodedXmlFreeCADData) { const flattenedObject = flattenJSON(DecodedXmlFreeCADData[itemToLookAt]); - let importBrepFlag = false; + let importBrepFlag = true; let importBrepShapeName = ""; let visiblePropertyName = ""; for (const propertyToLookAt in flattenedObject) { @@ -64,14 +64,19 @@ export const ImportModelOpperation: OperationDescriptor = { if (propertyToLookAt.includes("Part.0.$.file")) importBrepShapeName = flattenedObject[propertyToLookAt]; if (propertyToLookAt.includes("$.name") && flattenedObject[propertyToLookAt] == "Visibility") { let propToCheck = propertyToLookAt.replace(".$.name", ".Bool.0.$.value"); - if (flattenedObject[propToCheck] == "true") importBrepFlag = true; + if (flattenedObject[propToCheck] == "false") importBrepFlag = false; } } if (importBrepFlag == true) { - FS.writeFile(importBrepShapeName, `DBRep_DrawableShape\n` + await zipContents[importBrepShapeName].async("string")); - oci.readbrep(importBrepShapeName, importBrepShapeName); - returnObject.created.push(occ.io.getShell(importBrepShapeName)); + try { + await FS.writeFile(importBrepShapeName, `DBRep_DrawableShape\n` + await zipContents[importBrepShapeName].async("string")); + await oci.readbrep(importBrepShapeName, importBrepShapeName); + returnObject.created.push(occ.io.getShell(importBrepShapeName)); + } catch (e) { + console.log(e) + } + } }