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

notes on prusa convert. better function name

Browse source
This commit is contained in:
Stewart Allen 2022-01-19 12:50:52 -05:00
commit 0fbdcb030c
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/kiri/main.js
View file

@ -2563,13 +2563,14 @@
} }
// import and convert prusa ini file // import and convert prusa ini file
function settingsConvert(data) { function settingsPrusaConvert(data) {
let map = {}; let map = {};
try { try {
data.split('\n') data.split('\n')
.filter(l => l.charAt(0) !== '#') .filter(l => l.charAt(0) !== '#')
.map(l => l.split('=').map(v => v.trim())) .map(l => l.split('=').map(v => v.trim()))
.map(l => { .map(l => {
// convert gcode string into a string array
if (l[0].indexOf('_gcode') > 0) { if (l[0].indexOf('_gcode') > 0) {
l[1] = l[1].replaceAll('\\n','\n').split('\n'); l[1] = l[1].replaceAll('\\n','\n').split('\n');
} }
@ -2579,7 +2580,6 @@
map[l[0]] = l[1]; map[l[0]] = l[1];
}); });
} catch (e) { } catch (e) {
console.log('data',data);
return UC.alert('invalid file'); return UC.alert('invalid file');
} }
// device setup // device setup
@ -2619,9 +2619,9 @@
process.outputRetractDist = parseFloat(map.retract_length); process.outputRetractDist = parseFloat(map.retract_length);
process.outputRetractSpeed = parseFloat(map.retract_speed); process.outputRetractSpeed = parseFloat(map.retract_speed);
} }
console.log({device, process, map});
UC.confirm(`Import "${dname}"?`).then(yes => { UC.confirm(`Import "${dname}"?`).then(yes => {
if (yes) { if (yes) {
// create device, associated profile, set as current and show dialog
settings.devices[dname] = device; settings.devices[dname] = device;
settings.devproc[dname] = pname; settings.devproc[dname] = pname;
settings.process = settings.sproc.FDM[pname] = process; settings.process = settings.sproc.FDM[pname] = process;
@ -2876,7 +2876,7 @@
else if (isset) settingsImport(e.target.result, true); else if (isset) settingsImport(e.target.result, true);
else if (ispng) loadImageDialog(e.target.result, e.target.file.name); else if (ispng) loadImageDialog(e.target.result, e.target.file.name);
else if (isjpg) loadImageConvert(e.target.result, e.target.file.name); else if (isjpg) loadImageConvert(e.target.result, e.target.file.name);
else if (isini) settingsConvert(e.target.result); else if (isini) settingsPrusaConvert(e.target.result);
else API.show.alert(`Unsupported file: ${files[i].name}`); else API.show.alert(`Unsupported file: ${files[i].name}`);
}; };
if (isstl || ispng || isjpg || iskmz) { if (isstl || ispng || isjpg || iskmz) {