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

add dark mode

Browse source
This commit is contained in:
Stewart Allen 2020-04-08 09:38:32 -04:00
commit f75ebf668f
6 changed files with 70 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

1
js/kiri-conf.js
View file

@ -500,6 +500,7 @@ var gs_kiri_conf = exports;
}, },
controller:{ controller:{
view: null, view: null,
dark: false,
compact: false, compact: false,
zoomSpeed: 1.0, zoomSpeed: 1.0,
reverseZoom: true, reverseZoom: true,

76
js/kiri-init.js
View file

@ -75,23 +75,29 @@ var gs_kiri_init = exports;
} }
function booleanSave() { function booleanSave() {
let current = settings(); let control = settings().controller;
let isCompact = current.controller.compact; let isCompact = control.compact;
current.controller.showOrigin = UI.showOrigin.checked; let isDark = control.dark;
current.controller.autoLayout = UI.autoLayout.checked; control.showOrigin = UI.showOrigin.checked;
current.controller.freeLayout = UI.freeLayout.checked; control.autoLayout = UI.autoLayout.checked;
current.controller.alignTop = UI.alignTop.checked; control.freeLayout = UI.freeLayout.checked;
current.controller.reverseZoom = UI.reverseZoom.checked; control.alignTop = UI.alignTop.checked;
current.controller.compact = UI.compact.checked; control.reverseZoom = UI.reverseZoom.checked;
SPACE.view.setZoom(current.controller.reverseZoom, current.controller.zoomSpeed); control.compact = UI.compact.checked;
control.dark = UI.dark.checked;
SPACE.view.setZoom(control.reverseZoom, control.zoomSpeed);
platform.layout(); platform.layout();
platform.update_stock(); platform.update_stock();
API.conf.save(); API.conf.save();
// if compact mode changed, reload UI // if compact mode changed, reload UI
if (isCompact !== current.controller.compact) { if (isCompact !== control.compact) {
UC.setDefaults(isCompact); UC.setDefaults(isCompact);
LOC.reload(); LOC.reload();
} }
// if dark mode changed, reload UI
if (isDark !== control.dark) {
LOC.reload();
}
} }
function onLayerToggle() { function onLayerToggle() {
@ -1093,12 +1099,15 @@ var gs_kiri_init = exports;
let assets = $('assets'), let assets = $('assets'),
control = $('control'), control = $('control'),
container = $('container'), container = $('container'),
welcome = $('welcome'); welcome = $('welcome'),
controller = settings().controller,
compact = controller.compact,
dark = controller.dark;
WIN.addEventListener("resize", API.dialog.update); WIN.addEventListener("resize", API.dialog.update);
SPACE.showSkyGrid(false); SPACE.showSkyGrid(false);
SPACE.setSkyColor(0xffffff); SPACE.setSkyColor(dark ? 0 : 0xffffff);
SPACE.init(container, function (delta) { SPACE.init(container, function (delta) {
if (API.var.layer_max === 0) return; if (API.var.layer_max === 0) return;
if (settings().controller.reverseZoom) delta = -delta; if (settings().controller.reverseZoom) delta = -delta;
@ -1109,7 +1118,7 @@ var gs_kiri_init = exports;
SPACE.platform.onMove(API.conf.save); SPACE.platform.onMove(API.conf.save);
SPACE.platform.setRound(true); SPACE.platform.setRound(true);
UC.setCompact(settings().controller.compact); UC.setCompact(compact);
Object.assign(UI, { Object.assign(UI, {
// from static HTML // from static HTML
@ -1180,20 +1189,24 @@ var gs_kiri_init = exports;
device: UC.newGroup(LANG.dv_gr_dev, $('device'), {group:"ddev", nocompact:true}), device: UC.newGroup(LANG.dv_gr_dev, $('device'), {group:"ddev", nocompact:true}),
deviceName: UC.newInput(LANG.dv_name_s, {title:LANG.dv_name_l, size:"60%", text:true}), deviceName: UC.newInput(LANG.dv_name_s, {title:LANG.dv_name_l, size:"60%", text:true}),
setDeviceFilament: UC.newInput(LANG.dv_fila_s, {title:LANG.dv_fila_l, convert:UC.toFloat, modes:FDM}),
setDeviceNozzle: UC.newInput(LANG.dv_nozl_s, {title:LANG.dv_nozl_l, convert:UC.toFloat, modes:FDM}),
setDeviceWidth: UC.newInput(LANG.dv_bedw_s, {title:LANG.dv_bedw_l, convert:UC.toInt}), setDeviceWidth: UC.newInput(LANG.dv_bedw_s, {title:LANG.dv_bedw_l, convert:UC.toInt}),
setDeviceDepth: UC.newInput(LANG.dv_bedd_s, {title:LANG.dv_bedd_l, convert:UC.toInt}), setDeviceDepth: UC.newInput(LANG.dv_bedd_s, {title:LANG.dv_bedd_l, convert:UC.toInt}),
setDeviceHeight: UC.newInput(LANG.dv_bedh_s, {title:LANG.dv_bedh_l, convert:UC.toInt, modes:FDM}), setDeviceHeight: UC.newInput(LANG.dv_bedh_s, {title:LANG.dv_bedh_l, convert:UC.toInt, modes:FDM}),
setDeviceMaxSpindle: UC.newInput(LANG.dv_spmx_s, {title:LANG.dv_spmx_l, convert:UC.toInt, modes:CAM}), setDeviceMaxSpindle: UC.newInput(LANG.dv_spmx_s, {title:LANG.dv_spmx_l, convert:UC.toInt, modes:CAM}),
setDeviceExtrusion: UC.newBoolean(LANG.dv_xtab_s, onBooleanClick, {title:LANG.dv_xtab_l}),
setDeviceOrigin: UC.newBoolean(LANG.dv_orgc_s, onBooleanClick, {title:LANG.dv_orgc_l}), setDeviceOrigin: UC.newBoolean(LANG.dv_orgc_s, onBooleanClick, {title:LANG.dv_orgc_l}),
setDeviceOriginTop: UC.newBoolean(LANG.dv_orgt_s, onBooleanClick, {title:LANG.dv_orgt_l, modes:CAM}), setDeviceOriginTop: UC.newBoolean(LANG.dv_orgt_s, onBooleanClick, {title:LANG.dv_orgt_l, modes:CAM}),
setDeviceRound: UC.newBoolean(LANG.dv_bedc_s, onBooleanClick, {title:LANG.dv_bedc_l, modes:FDM}), setDeviceRound: UC.newBoolean(LANG.dv_bedc_s, onBooleanClick, {title:LANG.dv_bedc_l, modes:FDM}),
setExtruder: UC.newGroup(LANG.dv_gr_ext, $('extruders'), {group:"dext", nocompact:true, modes:FDM}),
setDeviceFilament: UC.newInput(LANG.dv_fila_s, {title:LANG.dv_fila_l, convert:UC.toFloat, modes:FDM}),
setDeviceNozzle: UC.newInput(LANG.dv_nozl_s, {title:LANG.dv_nozl_l, convert:UC.toFloat, modes:FDM}),
setExtruderSelect: UC.newText(LANG.dv_exts_s, {title:LANG.dv_exts_l, modes:FDM, size:14, height:3, modes:FDM}),
setExtruderDeselect: UC.newText(LANG.dv_extd_s, {title:LANG.dv_extd_l, modes:FDM, size:14, height:3, modes:FDM}),
setDeviceExtrusion: UC.newBoolean(LANG.dv_xtab_s, onBooleanClick, {title:LANG.dv_xtab_l, modes:FDM}),
setDevice: UC.newGroup(LANG.dv_gr_gco, $('device'), {group:"dgco", nocompact:true}), setDevice: UC.newGroup(LANG.dv_gr_gco, $('device'), {group:"dgco", nocompact:true}),
setDeviceFan: UC.newInput(LANG.dv_fanp_s, {title:LANG.dv_fanp_l, modes:FDM, size:"30%", text:true}), setDeviceFan: UC.newInput(LANG.dv_fanp_s, {title:LANG.dv_fanp_l, modes:FDM, size:"40%", text:true}),
setDeviceTrack: UC.newInput(LANG.dv_prog_s, {title:LANG.dv_prog_l, modes:FDM, size:"30%", text:true}), setDeviceTrack: UC.newInput(LANG.dv_prog_s, {title:LANG.dv_prog_l, modes:FDM, size:"40%", text:true}),
setDeviceLayer: UC.newText(LANG.dv_layr_s, {title:LANG.dv_layr_l, modes:FDM, size:14, height: 2}), setDeviceLayer: UC.newText(LANG.dv_layr_s, {title:LANG.dv_layr_l, modes:FDM, size:14, height: 2}),
setDeviceToken: UC.newBoolean(LANG.dv_tksp_s, null, {title:LANG.dv_tksp_l, modes:CAM_LASER}), setDeviceToken: UC.newBoolean(LANG.dv_tksp_s, null, {title:LANG.dv_tksp_l, modes:CAM_LASER}),
setDeviceStrip: UC.newBoolean(LANG.dv_strc_s, null, {title:LANG.dv_strc_l, modes:CAM}), setDeviceStrip: UC.newBoolean(LANG.dv_strc_s, null, {title:LANG.dv_strc_l, modes:CAM}),
@ -1285,6 +1298,7 @@ var gs_kiri_init = exports;
]), ]),
layout: UC.newGroup(LANG.op_menu), layout: UC.newGroup(LANG.op_menu),
dark: UC.newBoolean(LANG.op_dark_s, booleanSave, {title:LANG.op_dark_l, modes:ALL, expert:true}),
compact: UC.newBoolean(LANG.op_comp_s, booleanSave, {title:LANG.op_comp_l}), compact: UC.newBoolean(LANG.op_comp_s, booleanSave, {title:LANG.op_comp_l}),
showOrigin: UC.newBoolean(LANG.op_show_s, booleanSave, {title:LANG.op_show_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}), alignTop: UC.newBoolean(LANG.op_alig_s, booleanSave, {title:LANG.op_alig_l, modes:CAM}),
@ -1582,8 +1596,13 @@ var gs_kiri_init = exports;
settings().device.bedHeight settings().device.bedHeight
); );
SPACE.platform.setGrid(25, 5); if (dark) {
SPACE.platform.opacity(0.2); SPACE.platform.setGrid(25, 5, 0x999999, 0x333333);
SPACE.platform.opacity(0.8);
} else {
SPACE.platform.setGrid(25, 5, 0x999999, 0xcccccc);
SPACE.platform.opacity(0.3);
}
SPACE.mouse.downSelect(function(int,event) { SPACE.mouse.downSelect(function(int,event) {
// lay flat with meta or ctrl clicking a selected face // lay flat with meta or ctrl clicking a selected face
@ -1640,20 +1659,21 @@ var gs_kiri_init = exports;
// SECOND STAGE INIT AFTER UI RESTORED // SECOND STAGE INIT AFTER UI RESTORED
function init_two() { function init_two() {
let current = settings(); let current = settings(),
control = current.controller;
platform.deselect(); platform.deselect();
CATALOG.addFileListener(updateCatalog); CATALOG.addFileListener(updateCatalog);
SPACE.view.setZoom(current.controller.reverseZoom, current.controller.zoomSpeed); SPACE.view.setZoom(control.reverseZoom, control.zoomSpeed);
SPACE.platform.setZOff(0.2); SPACE.platform.setZOff(0.2);
// restore UI state from settings // restore UI state from settings
UI.showOrigin.checked = current.controller.showOrigin; UI.showOrigin.checked = control.showOrigin;
UI.freeLayout.checked = current.controller.freeLayout; UI.freeLayout.checked = control.freeLayout;
UI.autoLayout.checked = current.controller.autoLayout; UI.autoLayout.checked = control.autoLayout;
UI.alignTop.checked = current.controller.alignTop; UI.alignTop.checked = control.alignTop;
UI.reverseZoom.checked = current.controller.reverseZoom; UI.reverseZoom.checked = control.reverseZoom;
UI.compact.checked = current.controller.compact; UI.compact.checked = control.compact;
// load script extensions // load script extensions
if (SETUP.s) SETUP.s.forEach(function(lib) { if (SETUP.s) SETUP.s.forEach(function(lib) {

4
js/kiri.js
View file

@ -1421,8 +1421,8 @@ self.kiri.copyright = exports.COPYRIGHT;
return; return;
} }
settings = data.settings; settings = data.settings;
MOTO.restore(data.moto); // MOTO.restore(data.moto);
SDB.setItem('kiri-init', data.init || 2); // SDB.setItem('kiri-init', data.init || 2);
API.conf.save(); API.conf.save();
LOC.reload(); LOC.reload();
} }

10
js/moto-space.js
View file

@ -44,6 +44,8 @@ var MOTO = window.moto = window.moto || {};
gridOrigin, gridOrigin,
gridUnitMinor, gridUnitMinor,
gridUnitMajor, gridUnitMajor,
gridColorMajor,
gridColorMinor,
gridView, gridView,
viewControl, viewControl,
trackPlane, trackPlane,
@ -114,7 +116,7 @@ var MOTO = window.moto = window.moto || {};
refresh(); refresh();
}, },
complete = function() { complete = function() {
setGrid(gridMajor, gridMinor); setGrid(gridMajor, gridMinor, gridColorMajor, gridColorMinor);
}; };
new TWEEN.Tween(from). new TWEEN.Tween(from).
to(to, 500). to(to, 500).
@ -201,6 +203,8 @@ var MOTO = window.moto = window.moto || {};
gridView = new THREE.Group(); gridView = new THREE.Group();
gridUnitMajor = unitMajor; gridUnitMajor = unitMajor;
gridUnitMinor = unitMinor; gridUnitMinor = unitMinor;
gridColorMajor = colorMajor || gridColorMajor;
gridColorMinor = colorMinor || gridColorMinor;
let x = platform.scale.x, let x = platform.scale.x,
y = isRound ? platform.scale.z : platform.scale.y, y = isRound ? platform.scale.z : platform.scale.y,
z = isRound ? platform.scale.y : platform.scale.z, z = isRound ? platform.scale.y : platform.scale.z,
@ -227,8 +231,8 @@ var MOTO = window.moto = window.moto || {};
else if (minors && i % unitMinor === 0) minors.append({x:-ow, y:i, z:zp}).append({x:ow, y:i, z:zp}); else if (minors && i % unitMinor === 0) minors.append({x:-ow, y:i, z:zp}).append({x:ow, y:i, z:zp});
} }
} }
gridView.add(makeLinesFromPoints(majors, colorMajor || 0x999999, 1)); gridView.add(makeLinesFromPoints(majors, gridColorMajor || 0x999999, 1));
if (minors) gridView.add(makeLinesFromPoints(minors, colorMinor || 0xcccccc, 1)); if (minors) gridView.add(makeLinesFromPoints(minors, gridColorMinor || 0xcccccc, 1));
Space.scene.add(gridView); Space.scene.add(gridView);
} }

1
notes.md
View file

@ -3,7 +3,6 @@
## `C` cosmetic, `F` functional, `P` performance, `B` bug fix ## `C` cosmetic, `F` functional, `P` performance, `B` bug fix
* `B` restore settings should restore all mode/device/settings (find corner cases) * `B` restore settings should restore all mode/device/settings (find corner cases)
* `C` set page background color? or dark mode?
* `F` implement an in-app bug reporting system * `F` implement an in-app bug reporting system
* `F` extend mesh object to store raw + annotations (rot,scale,pos) * `F` extend mesh object to store raw + annotations (rot,scale,pos)
* share raw data w/ dups, encode/decode * share raw data w/ dups, encode/decode

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

@ -5,8 +5,12 @@ kiri.lang['en-us'] = {
version: "version", version: "version",
enable: "enable", enable: "enable",
// DEVICE dialog (_s = label, _l = hover help) // DEVICE dialog groups
dv_gr_dev: "device", dv_gr_dev: "device",
dv_gr_ext: "extruder",
dv_gr_gco: "gcode",
// DEVICE dialog (_s = label, _l = hover help)
dv_name_s: "name", dv_name_s: "name",
dv_name_l: "device name", dv_name_l: "device name",
dv_fila_s: "filament", dv_fila_s: "filament",
@ -21,7 +25,7 @@ kiri.lang['en-us'] = {
dv_bedh_l: "max build height\nin millimeters", dv_bedh_l: "max build height\nin millimeters",
dv_spmx_s: "max spindle rpm", dv_spmx_s: "max spindle rpm",
dv_spmx_l: "max spindle speed\n0 to disable", dv_spmx_l: "max spindle speed\n0 to disable",
dv_xtab_s: "extrude absolute", dv_xtab_s: "absolute positioning",
dv_xtab_l: "extrusion moves absolute", dv_xtab_l: "extrusion moves absolute",
dv_orgc_s: "origin center", dv_orgc_s: "origin center",
dv_orgc_l: "bed origin center", dv_orgc_l: "bed origin center",
@ -29,9 +33,6 @@ kiri.lang['en-us'] = {
dv_orgt_l: "part z origin top", dv_orgt_l: "part z origin top",
dv_bedc_s: "circular bed", dv_bedc_s: "circular bed",
dv_bedc_l: "device bed is circular", dv_bedc_l: "device bed is circular",
// DEVICE dialog gcode (_s = label, _l = hover help)
dv_gr_gco: "gcode",
dv_fanp_s: "fan power", dv_fanp_s: "fan power",
dv_fanp_l: "set cooling fan power", dv_fanp_l: "set cooling fan power",
dv_prog_s: "progress", dv_prog_s: "progress",
@ -60,6 +61,10 @@ kiri.lang['en-us'] = {
dv_lzon_l: "gcode laser on script", dv_lzon_l: "gcode laser on script",
dv_lzof_s: "laser off", dv_lzof_s: "laser off",
dv_lzof_l: "gcode laser off script", dv_lzof_l: "gcode laser off script",
dv_exts_s: "select",
dv_exts_l: "gcode to select this extruder",
dv_extd_s: "deselect",
dv_extd_l: "gcode to deselect this extruder",
// MODE // MODE
mo_menu: "mode", mo_menu: "mode",
@ -99,6 +104,8 @@ kiri.lang['en-us'] = {
// OPTIONS // OPTIONS
op_menu: "options", op_menu: "options",
op_dark_s: "dark mode",
op_dark_l: "dark mode interface",
op_comp_s: "compact", op_comp_s: "compact",
op_comp_l: "compact user interface", op_comp_l: "compact user interface",
op_show_s: "show origin", op_show_s: "show origin",