fix gcode import and add extruder compensation from selected device. fix tool select script output
This commit is contained in:
parent
24b7a6456b
commit
5030dbd5f3
4 changed files with 24 additions and 9 deletions
|
|
@ -1088,10 +1088,10 @@ self.kiri.copyright = exports.COPYRIGHT;
|
|||
}
|
||||
|
||||
// called after all new widgets are loaded to update group positions
|
||||
function platformGroupDone() {
|
||||
function platformGroupDone(skipLayout) {
|
||||
grouping = false;
|
||||
Widget.Groups.loadDone();
|
||||
if (layoutOnAdd) platform.layout();
|
||||
if (layoutOnAdd && !skipLayout) platform.layout();
|
||||
}
|
||||
|
||||
function platformAdd(widget, shift, nolayout) {
|
||||
|
|
@ -1488,7 +1488,7 @@ self.kiri.copyright = exports.COPYRIGHT;
|
|||
if (isgcode) loadCode(e.target.result, 'gcode');
|
||||
if (issvg) loadCode(e.target.result, 'svg');
|
||||
if (isset) settingsImport(e.target.result, true);
|
||||
if (--loaded === 0) platform.group_done();
|
||||
if (--loaded === 0) platform.group_done(isgcode);
|
||||
};
|
||||
reader.readAsBinaryString(reader.file);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue