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

move expert setting under options

Browse source
This commit is contained in:
Stewart Allen 2020-04-08 12:09:07 -04:00
commit 9deb2c36d4
5 changed files with 36 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

14
js/kiri-conf.js
View file

@ -51,7 +51,8 @@ var gs_kiri_conf = exports;
gcodeFExt: 1,
gcodeFan: 1,
gcodeTrack: 1,
gcodeLayer: 1
gcodeLayer: 1,
extruders: 1
},
// fields permitted in FDM:Process
p:{
@ -302,7 +303,15 @@ var gs_kiri_conf = exports;
gcodeChange: ["M6 T{tool}"], // CAM tool change script
gcodeSpindle: ["M3 S{speed}"], // CAM spindle speed
gcodeLaserOn: ["M106 S{power}"],// LASER turn on
gcodeLaserOff: ["M107"] // LASER turn off
gcodeLaserOff: ["M107"], // LASER turn off
extruders:[{ // FDM extruders structure
filament: 1.75,
nozzle: 0.4,
select: [],
deselect: [],
offsetX: 0,
offsetY: 0
}]
},
// FDM/CAM/Laser
process:{
@ -501,6 +510,7 @@ var gs_kiri_conf = exports;
controller:{
view: null,
dark: false,
expert: false,
compact: false,
zoomSpeed: 1.0,
reverseZoom: true,

16
js/kiri-init.js
View file

@ -78,6 +78,7 @@ var gs_kiri_init = exports;
let control = settings().controller;
let isCompact = control.compact;
let isDark = control.dark;
control.expert = UI.expert.checked;
control.showOrigin = UI.showOrigin.checked;
control.autoLayout = UI.autoLayout.checked;
control.freeLayout = UI.freeLayout.checked;
@ -98,6 +99,7 @@ var gs_kiri_init = exports;
if (isDark !== control.dark) {
LOC.reload();
}
UC.setExpert(control.expert);
}
function onLayerToggle() {
@ -1306,13 +1308,14 @@ var gs_kiri_init = exports;
]),
layout: UC.newGroup(LANG.op_menu),
dark: UC.newBoolean(LANG.op_dark_s, booleanSave, {title:LANG.op_dark_l, modes:ALL, expert:true}),
expert: UC.newBoolean(LANG.op_xprt_s, booleanSave, {title:LANG.op_xprt_l}),
compact: UC.newBoolean(LANG.op_comp_s, booleanSave, {title:LANG.op_comp_l}),
dark: UC.newBoolean(LANG.op_dark_s, booleanSave, {title:LANG.op_dark_l}),
showOrigin: UC.newBoolean(LANG.op_show_s, booleanSave, {title:LANG.op_show_l}),
alignTop: UC.newBoolean(LANG.op_alig_s, booleanSave, {title:LANG.op_alig_l, modes:CAM}),
autoLayout: UC.newBoolean(LANG.op_auto_s, booleanSave, {title:LANG.op_auto_l}),
freeLayout: UC.newBoolean(LANG.op_free_s, booleanSave, {title:LANG.op_free_l}),
reverseZoom: UC.newBoolean(LANG.op_invr_s, booleanSave, {title:LANG.op_invr_l}),
freeLayout: UC.newBoolean(LANG.op_free_s, booleanSave, {title:LANG.op_free_l, modes:ALL, expert:true}),
reverseZoom: UC.newBoolean(LANG.op_invr_s, booleanSave, {title:LANG.op_invr_l, modes:ALL, expert:true}),
units: UC.newSelect(LANG.op_unit_s, {title: LANG.op_unit_l, modes:CAM}, "units"),
// allow modules to insert new items at the bottom of the left menu
@ -1341,11 +1344,6 @@ var gs_kiri_init = exports;
UC.newButton(LANG.se_load, settingsLoad),
UI.settingsSave =
UC.newButton(LANG.se_save, settingsSave)
],[
UI.settingsExpert =
UC.newButton(LANG.se_xprt, () => { UC.setExpert(true); SDB.setItem('expert', true) }, {modes:FDM, expert:false}),
UI.settingsExpert =
UC.newButton(LANG.se_bsic, () => { UC.setExpert(false); SDB.removeItem('expert') }, {modes:FDM, expert:true})
]
]),
@ -1738,7 +1736,7 @@ var gs_kiri_init = exports;
UI.helpButton.title = `${LANG.version} ` + KIRI.version;
// restore expert setting preference
UC.setExpert(SDB.getItem('expert') ? true : false);
UC.setExpert(control.expert);
// setup tab visibility watcher
// DOC.addEventListener('visibilitychange', function() { document.title = document.hidden });

9
web/kiri/filter/FDM/Any.Generic.Marlin
View file

@ -34,6 +34,15 @@
"T0"
],
"deselect": []
},
"nozzle": 0.4,
"filament": 1.75,
"offset_x": 30,
"offset_y": 0,
"select": [
"T1"
],
"deselect": []
}
],
"cmd":{

12
web/kiri/lang/da.js
View file

@ -3,8 +3,11 @@ kiri.lang['da-dk'] = {
version: "version",
enable: "aktivér",
// DEVICE dialog (_s = label, _l = hover help)
// DEVICE dialog groups
dv_gr_dev: "enhed",
dv_gr_gco: "gcode",
// DEVICE dialog (_s = label, _l = hover help)
dv_name_s: "navn",
dv_name_l: "enhedens navn",
dv_fila_s: "filament",
@ -27,9 +30,6 @@ kiri.lang['da-dk'] = {
dv_orgt_l: "del z udgangspunkt top",
dv_bedc_s: "cirkulær plade",
dv_bedc_l: "enhedens plade er cirkulær",
// DEVICE dialog gcode (_s = label, _l = hover help)
dv_gr_gco: "gcode",
dv_fanp_s: "blæser styrke",
dv_fanp_l: "bestem kæler blæser styrke",
dv_prog_s: "fremgang",
@ -96,6 +96,8 @@ kiri.lang['da-dk'] = {
// OPTIONS
op_menu: "præferencer",
op_xprt_s: "ekspert",
op_xprt_l: "aktivér ekspert præferencer",
op_show_s: "vis udgangspunkt",
op_show_l: "vis enhed eller fremgang udgangspunkt",
op_alig_s: "flugt top",
@ -130,8 +132,6 @@ kiri.lang['da-dk'] = {
se_menu: "Indstillinger",
se_load: "indlæs",
se_save: "gem",
se_xprt: "ekspert",
se_bsic: "grundlæggende",
// FDM SLICING
sl_menu: "klargøre",

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

@ -108,6 +108,8 @@ kiri.lang['en-us'] = {
// OPTIONS
op_menu: "options",
op_xprt_s: "expert",
op_xprt_l: "enable expert options",
op_dark_s: "dark mode",
op_dark_l: "dark mode interface",
op_comp_s: "compact",
@ -146,8 +148,6 @@ kiri.lang['en-us'] = {
se_menu: "settings",
se_load: "load",
se_save: "save",
se_xprt: "expert",
se_bsic: "basic",
// FDM SLICING
sl_menu: "slicing",