diff --git a/.gitignore b/.gitignore index 406b54cb..0750298a 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ tmp .DS_Store node_modules package-lock.json +logs/* +data/* \ No newline at end of file diff --git a/src/kiri/conf.js b/src/kiri/conf.js index e789bab6..8fc4907d 100644 --- a/src/kiri/conf.js +++ b/src/kiri/conf.js @@ -619,6 +619,7 @@ exportOcto: false, exportGhost: false, exportLocal: true, + exportCodePreview: false, decimate: true, detail: "good", animesh: "200" diff --git a/src/kiri/export.js b/src/kiri/export.js index 438f715c..e1d53e67 100644 --- a/src/kiri/export.js +++ b/src/kiri/export.js @@ -425,6 +425,9 @@ let octo = set.controller.exportOcto && MODE !== MODES.CAM; let ghost = set.controller.exportGhost; let local = set.controller.exportLocal; + let codepreview = set.controller.exportCodePreview; + $('code-preview-head').style.display = codepreview ? '' : 'none'; + $('code-preview').style.display = codepreview ? '' : 'none'; $('print-download').onclick = download; $('print-filament-head').style.display = fdm ? '' : 'none'; $('print-filament-info').style.display = fdm ? '' : 'none'; @@ -485,6 +488,9 @@ $('print-gridlocal').onclick = sendto_gridlocal; $('admin-gridlocal').onclick = admin_gridlocal; } catch (e) { console.log(e) } + + // preview of the generated GCODE + if (codepreview && gcode) $('code-preview-textarea').value = gcode; // show dialog API.modal.show('print'); diff --git a/src/kiri/init.js b/src/kiri/init.js index fb74e120..31ba6aba 100644 --- a/src/kiri/init.js +++ b/src/kiri/init.js @@ -144,6 +144,7 @@ control.exportOcto = UI.exportOcto.checked; control.exportGhost = UI.exportGhost.checked; control.exportLocal = UI.exportLocal.checked; + control.exportCodePreview = UI.exportCodePreview.checked; control.decimate = UI.decimate.checked; SPACE.view.setZoom(control.reverseZoom, control.zoomSpeed); platform.layout(); @@ -1502,6 +1503,7 @@ exportOcto: UC.newBoolean(`OctoPrint`, booleanSave), exportGhost: UC.newBoolean(`Grid:Host`, booleanSave), exportLocal: UC.newBoolean(`Grid:Local`, booleanSave), + exportCodePreview: UC.newBoolean(`Code Preview`, booleanSave), parts: UC.newGroup(LANG.pt_menu, $('prefs-prt'), {inline: true}), detail: UC.newSelect(LANG.pt_qual_s, {title: LANG.pt_qual_l, action: detailSave}, "detail"), diff --git a/web/kiri/index.css b/web/kiri/index.css index beebb510..2654690d 100644 --- a/web/kiri/index.css +++ b/web/kiri/index.css @@ -645,6 +645,11 @@ th, tr, td, label { #print-download { min-height: 4em !important; } +#code-preview-textarea { + width: 100%; + height: 250px; + font-size: 10px; +} .mod-end { height: 10px; border-bottom-left-radius: 10px; diff --git a/web/kiri/output-gcode.html b/web/kiri/output-gcode.html index 792dd0de..64c17714 100644 --- a/web/kiri/output-gcode.html +++ b/web/kiri/output-gcode.html @@ -12,6 +12,11 @@
+
+
+
+
+