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

allow color access and override in api

Browse source
This commit is contained in:
Stewart Allen 2020-03-28 14:17:00 -04:00
commit e8a7dfc8d0
1 changed files with 23 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

47
js/kiri.js
View file

@ -50,17 +50,6 @@ self.kiri.copyright = exports.COPYRIGHT;
localFilterKey ='kiri-gcode-filters', localFilterKey ='kiri-gcode-filters',
localFilters = js2o(SDB.getItem(localFilterKey)) || [], localFilters = js2o(SDB.getItem(localFilterKey)) || [],
// --------------- // ---------------
widget_selected_color = 0xbbff00,
widget_deselected_color = 0xffff00,
widget_slicing_color = 0xffaaaa,
widget_cam_preview_color = 0x0055bb,
preview_opacity_cam = 0.25,
preview_opacity = 0.0,
model_opacity = 1.0,
slicing_opacity = 0.5,
sliced_opacity = 0.0,
sliced_opacity_cam = 0.25,
// ---------------
renderMode = 4, renderMode = 4,
viewMode = VIEWS.ARRANGE, viewMode = VIEWS.ARRANGE,
layoutOnAdd = true, layoutOnAdd = true,
@ -116,7 +105,17 @@ self.kiri.copyright = exports.COPYRIGHT;
}; };
const color = { const color = {
wireframe: 0x444444 wireframe: 0x444444,
selected: 0xbbff00,
deselected: 0xffff00,
slicing: 0xffaaaa,
preview_opacity: 0.0,
model_opacity: 1.0,
slicing_opacity: 0.5,
sliced_opacity: 0.0,
cam_preview: 0x0055bb,
cam_preview_opacity: 0.25,
cam_sliced_opacity: 0.25
}; };
const opacity = { const opacity = {
@ -488,7 +487,7 @@ self.kiri.copyright = exports.COPYRIGHT;
function hideSlices() { function hideSlices() {
var showing = false; var showing = false;
setOpacity(model_opacity); setOpacity(color.model_opacity);
forAllWidgets(function(widget) { forAllWidgets(function(widget) {
widget.setWireframe(false); widget.setWireframe(false);
showing = widget.hideSlices() || showing; showing = widget.hideSlices() || showing;
@ -642,12 +641,12 @@ self.kiri.copyright = exports.COPYRIGHT;
saveSettings(); saveSettings();
if (MODE === MODES.CAM) { if (MODE === MODES.CAM) {
setOpacity(preview_opacity_cam); setOpacity(color.cam_preview_opacity);
forAllWidgets(function(widget) { forAllWidgets(function(widget) {
widget.setColor(widget_cam_preview_color); widget.setColor(color.cam_preview);
}); });
} else { } else {
setOpacity(preview_opacity); setOpacity(color.preview_opacity);
} }
currentPrint = kiri.newPrint(settings, WIDGETS); currentPrint = kiri.newPrint(settings, WIDGETS);
@ -720,7 +719,7 @@ self.kiri.copyright = exports.COPYRIGHT;
// require topo be sent back from worker for local printing // require topo be sent back from worker for local printing
settings.synth.sendTopo = false; settings.synth.sendTopo = false;
setOpacity(slicing_opacity); setOpacity(color.slicing_opacity);
// for each widget, slice // for each widget, slice
forAllWidgets(function(widget) { forAllWidgets(function(widget) {
@ -731,15 +730,15 @@ self.kiri.copyright = exports.COPYRIGHT;
lastMsg; lastMsg;
widget.stats.progress = 0; widget.stats.progress = 0;
widget.setColor(widget_slicing_color); widget.setColor(color.slicing);
widget.slice(settings, function(sliced, error) { widget.slice(settings, function(sliced, error) {
var mark = UTIL.time(); var mark = UTIL.time();
// on done // on done
widget.render(renderMode, MODE === MODES.CAM); widget.render(renderMode, MODE === MODES.CAM);
// clear wireframe // clear wireframe
widget.setWireframe(false, color.wireframe, opacity.wireframe); widget.setWireframe(false, color.wireframe, opacity.wireframe);
widget.setOpacity(settings.mode === 'CAM' ? sliced_opacity_cam : sliced_opacity); widget.setOpacity(settings.mode === 'CAM' ? color.cam_sliced_opacity : color.sliced_opacity);
widget.setColor(widget_deselected_color); widget.setColor(color.deselected);
// update UI info // update UI info
if (sliced) { if (sliced) {
// update segment time // update segment time
@ -756,7 +755,7 @@ self.kiri.copyright = exports.COPYRIGHT;
if (--countdown === 0 || error || errored) { if (--countdown === 0 || error || errored) {
setProgress(0); setProgress(0);
showSlices(preserveLayer); showSlices(preserveLayer);
setOpacity(settings.mode === 'CAM' ? sliced_opacity_cam : sliced_opacity); setOpacity(settings.mode === 'CAM' ? color.cam_sliced_opacity : color.sliced_opacity);
if (callback && typeof callback === 'function') { if (callback && typeof callback === 'function') {
callback(); callback();
} }
@ -767,7 +766,7 @@ self.kiri.copyright = exports.COPYRIGHT;
if (error && !errored) { if (error && !errored) {
errored = true; errored = true;
setViewMode(VIEWS.ARRANGE); setViewMode(VIEWS.ARRANGE);
setOpacity(model_opacity); setOpacity(color.model_opacity);
platform.deselect(); platform.deselect();
alert2(error); alert2(error);
} }
@ -965,7 +964,7 @@ self.kiri.copyright = exports.COPYRIGHT;
if (!mesh.material.visible) return; if (!mesh.material.visible) return;
if (!shift) platform.deselect(); if (!shift) platform.deselect();
selectedMeshes.push(mesh); selectedMeshes.push(mesh);
widget.setColor(widget_selected_color); widget.setColor(color.selected);
meshUpdateInfo(mesh); meshUpdateInfo(mesh);
} }
platformUpdateSelected(); platformUpdateSelected();
@ -996,7 +995,7 @@ self.kiri.copyright = exports.COPYRIGHT;
si = selectedMeshes.indexOf(mesh), si = selectedMeshes.indexOf(mesh),
sel = (si >= 0); sel = (si >= 0);
if (sel) selectedMeshes.splice(si,1); if (sel) selectedMeshes.splice(si,1);
widget.setColor(widget_deselected_color); widget.setColor(color.deselected);
platformUpdateSelected(); platformUpdateSelected();
SPACE.update(); SPACE.update();
meshUpdateInfo(); meshUpdateInfo();