From ea5a72dece41dd2cbf80821e372166b078ee6ee8 Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Sat, 4 Dec 2021 15:06:49 -0500 Subject: [PATCH] allow grouping of imported 3mf object groups --- src/kiri/main.js | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/kiri/main.js b/src/kiri/main.js index c82ff6bc..0104172d 100644 --- a/src/kiri/main.js +++ b/src/kiri/main.js @@ -2741,8 +2741,8 @@ } } else if (is3mf) { - MOTO.TMF.parseAsync(e.target.result).then(models => { - console.log({models}); + let odon = function(models) { + let msg = API.show.alert('Adding Objects'); for (let model of models) { let name = e.target.file.name; if (model.name) { @@ -2754,6 +2754,21 @@ .saveToCatalog(name) ); } + API.hide.alert(msg); + } + let msg = API.show.alert('Decoding 3MF'); + MOTO.TMF.parseAsync(e.target.result).then(models => { + API.hide.alert(msg); + if (models.length > 1 && !group) { + UC.confirm(`group ${models.length} objects?`).then(ok => { + if (ok) { + group = []; + } + odon(models); + }); + } else { + odon(models); + } }); } else if (isgcode) loadCode(e.target.result, 'gcode');