From 7af110b9e0f32e59d71b632b0c25a609371b55fd Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Mon, 30 Nov 2020 09:03:00 -0500 Subject: [PATCH] remove old label names. swap contour x/y labels for clarity. shorten new gcode preview var names --- src/kiri/conf.js | 2 +- src/kiri/export.js | 10 +++++----- src/kiri/init.js | 6 +++--- web/kiri/lang/en.js | 26 ++++---------------------- 4 files changed, 13 insertions(+), 31 deletions(-) diff --git a/src/kiri/conf.js b/src/kiri/conf.js index 8fc4907d..098b7367 100644 --- a/src/kiri/conf.js +++ b/src/kiri/conf.js @@ -619,7 +619,7 @@ exportOcto: false, exportGhost: false, exportLocal: true, - exportCodePreview: false, + exportPreview: false, decimate: true, detail: "good", animesh: "200" diff --git a/src/kiri/export.js b/src/kiri/export.js index e1d53e67..a8f56e8e 100644 --- a/src/kiri/export.js +++ b/src/kiri/export.js @@ -425,9 +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'; + let preview = set.controller.exportPreview; + $('code-preview-head').style.display = preview ? '' : 'none'; + $('code-preview').style.display = preview ? '' : 'none'; $('print-download').onclick = download; $('print-filament-head').style.display = fdm ? '' : 'none'; $('print-filament-info').style.display = fdm ? '' : 'none'; @@ -488,9 +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; + if (preview && 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 31ba6aba..340d5c51 100644 --- a/src/kiri/init.js +++ b/src/kiri/init.js @@ -144,7 +144,7 @@ control.exportOcto = UI.exportOcto.checked; control.exportGhost = UI.exportGhost.checked; control.exportLocal = UI.exportLocal.checked; - control.exportCodePreview = UI.exportCodePreview.checked; + control.exportPreview = UI.exportPreview.checked; control.decimate = UI.decimate.checked; SPACE.view.setZoom(control.reverseZoom, control.zoomSpeed); platform.layout(); @@ -1503,7 +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), + exportPreview: 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"), @@ -1607,8 +1607,8 @@ camContourCurves: UC.newBoolean(LANG.cf_curv_s, onBooleanClick, {title:LANG.cf_curv_l, modes:CAM}), camContourIn: UC.newBoolean(LANG.cf_olin_s, onBooleanClick, {title:LANG.cf_olin_l, modes:CAM}), camContourSep: UC.newBlank({class:"pop-sep"}), - camContourXOn: UC.newBoolean(LANG.cf_linx_s, onBooleanClick, {title:LANG.cf_linx_l, modes:CAM}), camContourYOn: UC.newBoolean(LANG.cf_liny_s, onBooleanClick, {title:LANG.cf_liny_l, modes:CAM}), + camContourXOn: UC.newBoolean(LANG.cf_linx_s, onBooleanClick, {title:LANG.cf_linx_l, modes:CAM}), camTracing: UC.newGroup(LANG.cu_menu, null, {modes:CAM, marker:true}), camTraceTool: UC.newSelect(LANG.cc_tool, {modes:CAM}), camTraceSpeed: UC.newInput(LANG.cc_feed_s, {title:LANG.cc_feed_l, convert:UC.toInt, modes:CAM}), diff --git a/web/kiri/lang/en.js b/web/kiri/lang/en.js index 20b3e6f3..132613e8 100644 --- a/web/kiri/lang/en.js +++ b/web/kiri/lang/en.js @@ -160,24 +160,6 @@ kiri.lang['en-us'] = { xp_menu: "exports", - // LAYERS pop-menu - la_menu: "layers", - la_olin: "slice", - la_trce: "shells", - la_face: "level", - la_ruff: "rough", - la_fini: "outline", - la_finx: "contour x", - la_finy: "contour y", - la_dlta: "delta", - la_slds: "solids", - la_fill: "solid fill", - la_sprs: "infill", - la_sprt: "supports", - la_prnt: "print", - la_move: "moves", - la_part: "parts", - // SETTINGS se_menu: "library", se_load: "load", @@ -324,10 +306,10 @@ kiri.lang['en-us'] = { cf_curv_l: "limit linear cleanup\nto curved surfaces", cf_olin_s: "inside only", cf_olin_l: "limit cutting to\ninside part boundaries", - cf_linx_s: "enable x pass", - cf_linx_l: "linear x-axis finishing", - cf_liny_s: "enable y pass", - cf_liny_l: "linear y-axis finishing", + cf_linx_s: "enable y pass", + cf_linx_l: "linear y-axis finishing", + cf_liny_s: "enable x pass", + cf_liny_l: "linear x-axis finishing", // CNC CONTOUR cu_menu: "trace",