AI_Assistant/grid-apps-cmms
Watch
1
0
Fork
You've already forked grid-apps-cmms
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove old label names. swap contour x/y labels for clarity. shorten new gcode preview var names

Browse source
This commit is contained in:
Stewart Allen 2020-11-30 09:03:00 -05:00
commit 7af110b9e0
4 changed files with 13 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/kiri/conf.js
View file

@ -619,7 +619,7 @@
exportOcto: false, exportOcto: false,
exportGhost: false, exportGhost: false,
exportLocal: true, exportLocal: true,
exportCodePreview: false, exportPreview: false,
decimate: true, decimate: true,
detail: "good", detail: "good",
animesh: "200" animesh: "200"

8
src/kiri/export.js
View file

@ -425,9 +425,9 @@
let octo = set.controller.exportOcto && MODE !== MODES.CAM; let octo = set.controller.exportOcto && MODE !== MODES.CAM;
let ghost = set.controller.exportGhost; let ghost = set.controller.exportGhost;
let local = set.controller.exportLocal; let local = set.controller.exportLocal;
let codepreview = set.controller.exportCodePreview; let preview = set.controller.exportPreview;
$('code-preview-head').style.display = codepreview ? '' : 'none'; $('code-preview-head').style.display = preview ? '' : 'none';
$('code-preview').style.display = codepreview ? '' : 'none'; $('code-preview').style.display = preview ? '' : 'none';
$('print-download').onclick = download; $('print-download').onclick = download;
$('print-filament-head').style.display = fdm ? '' : 'none'; $('print-filament-head').style.display = fdm ? '' : 'none';
$('print-filament-info').style.display = fdm ? '' : 'none'; $('print-filament-info').style.display = fdm ? '' : 'none';
@ -490,7 +490,7 @@
} catch (e) { console.log(e) } } catch (e) { console.log(e) }
// preview of the generated GCODE // preview of the generated GCODE
if (codepreview && gcode) $('code-preview-textarea').value = gcode; if (preview && gcode) $('code-preview-textarea').value = gcode;
// show dialog // show dialog
API.modal.show('print'); API.modal.show('print');

6
src/kiri/init.js
View file

@ -144,7 +144,7 @@
control.exportOcto = UI.exportOcto.checked; control.exportOcto = UI.exportOcto.checked;
control.exportGhost = UI.exportGhost.checked; control.exportGhost = UI.exportGhost.checked;
control.exportLocal = UI.exportLocal.checked; control.exportLocal = UI.exportLocal.checked;
control.exportCodePreview = UI.exportCodePreview.checked; control.exportPreview = UI.exportPreview.checked;
control.decimate = UI.decimate.checked; control.decimate = UI.decimate.checked;
SPACE.view.setZoom(control.reverseZoom, control.zoomSpeed); SPACE.view.setZoom(control.reverseZoom, control.zoomSpeed);
platform.layout(); platform.layout();
@ -1503,7 +1503,7 @@
exportOcto: UC.newBoolean(`OctoPrint`, booleanSave), exportOcto: UC.newBoolean(`OctoPrint`, booleanSave),
exportGhost: UC.newBoolean(`Grid:Host`, booleanSave), exportGhost: UC.newBoolean(`Grid:Host`, booleanSave),
exportLocal: UC.newBoolean(`Grid:Local`, 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}), 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"), 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}), 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}), camContourIn: UC.newBoolean(LANG.cf_olin_s, onBooleanClick, {title:LANG.cf_olin_l, modes:CAM}),
camContourSep: UC.newBlank({class:"pop-sep"}), 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}), 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}), camTracing: UC.newGroup(LANG.cu_menu, null, {modes:CAM, marker:true}),
camTraceTool: UC.newSelect(LANG.cc_tool, {modes:CAM}), 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}), camTraceSpeed: UC.newInput(LANG.cc_feed_s, {title:LANG.cc_feed_l, convert:UC.toInt, modes:CAM}),

26
web/kiri/lang/en.js
View file

@ -160,24 +160,6 @@ kiri.lang['en-us'] = {
xp_menu: "exports", 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 // SETTINGS
se_menu: "library", se_menu: "library",
se_load: "load", se_load: "load",
@ -324,10 +306,10 @@ kiri.lang['en-us'] = {
cf_curv_l: "limit linear cleanup\nto curved surfaces", cf_curv_l: "limit linear cleanup\nto curved surfaces",
cf_olin_s: "inside only", cf_olin_s: "inside only",
cf_olin_l: "limit cutting to\ninside part boundaries", cf_olin_l: "limit cutting to\ninside part boundaries",
cf_linx_s: "enable x pass", cf_linx_s: "enable y pass",
cf_linx_l: "linear x-axis finishing", cf_linx_l: "linear y-axis finishing",
cf_liny_s: "enable y pass", cf_liny_s: "enable x pass",
cf_liny_l: "linear y-axis finishing", cf_liny_l: "linear x-axis finishing",
// CNC CONTOUR // CNC CONTOUR
cu_menu: "trace", cu_menu: "trace",