fix index mode change order of ops to allow clearning of animation artifacts
This commit is contained in:
parent
5f69f353bf
commit
1c6e4429aa
2 changed files with 5 additions and 10 deletions
|
|
@ -103,10 +103,6 @@ CAM.init = function(kiri, api) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const clockOp = cp.ops.filter(op => op.type === '|')[0];
|
const clockOp = cp.ops.filter(op => op.type === '|')[0];
|
||||||
// if (isIndexed && !clockOp) {
|
|
||||||
// func.opAdd(popOp['|'].new());
|
|
||||||
// } else if (!isIndexed && clockOp) {
|
|
||||||
// func.opDel(clockOp);
|
|
||||||
if (!clockOp) {
|
if (!clockOp) {
|
||||||
func.opAdd(popOp['|'].new());
|
func.opAdd(popOp['|'].new());
|
||||||
} else {
|
} else {
|
||||||
|
|
@ -199,7 +195,6 @@ CAM.init = function(kiri, api) {
|
||||||
updateStock();
|
updateStock();
|
||||||
func.opRender();
|
func.opRender();
|
||||||
api.uc.setVisible($('layer-animate'), isAnimate && isCamMode);
|
api.uc.setVisible($('layer-animate'), isAnimate && isCamMode);
|
||||||
// api.uc.setVisible($('layer-toolpos'), isAnimate && isCamMode);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
api.event.on("settings.saved", (settings) => {
|
api.event.on("settings.saved", (settings) => {
|
||||||
|
|
|
||||||
|
|
@ -223,13 +223,13 @@ gapp.register("kiri.init", (root, exports) => {
|
||||||
settings.device.fwRetract = ui.fwRetract.checked;
|
settings.device.fwRetract = ui.fwRetract.checked;
|
||||||
// refresh vars and other ui elements
|
// refresh vars and other ui elements
|
||||||
uc.refresh();
|
uc.refresh();
|
||||||
|
if (el === ui.camStockIndexed) {
|
||||||
|
api.view.set_arrange();
|
||||||
|
}
|
||||||
api.conf.update();
|
api.conf.update();
|
||||||
DOC.activeElement.blur();
|
DOC.activeElement.blur();
|
||||||
api.event.emit("boolean.click");
|
api.event.emit("boolean.click");
|
||||||
api.devices.update_laser_state();
|
api.devices.update_laser_state();
|
||||||
if (el === ui.camStockIndexed) {
|
|
||||||
api.space.set_focus();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function onButtonClick(ev) {
|
function onButtonClick(ev) {
|
||||||
|
|
@ -991,9 +991,9 @@ gapp.register("kiri.init", (root, exports) => {
|
||||||
anim.speed = newButton(null,"anim.fast",{icon:'<i class="fas fa-forward"></i>',title:"toggle speed"}),
|
anim.speed = newButton(null,"anim.fast",{icon:'<i class="fas fa-forward"></i>',title:"toggle speed"}),
|
||||||
anim.labspd = newValue(3, {class:"center padleft"}),
|
anim.labspd = newValue(3, {class:"center padleft"}),
|
||||||
anim.labx = newLabel("X", {class:"padleft"}),
|
anim.labx = newLabel("X", {class:"padleft"}),
|
||||||
anim.valx = newValue(6, {class:"center"}),
|
anim.valx = newValue(7, {class:"center"}),
|
||||||
anim.laby = newLabel("Y", {class:"padleft"}),
|
anim.laby = newLabel("Y", {class:"padleft"}),
|
||||||
anim.valy = newValue(6, {class:"center"}),
|
anim.valy = newValue(7, {class:"center"}),
|
||||||
anim.labz = newLabel("Z", {class:"padleft"}),
|
anim.labz = newLabel("Z", {class:"padleft"}),
|
||||||
anim.valz = newValue(6, {class:"center"}),
|
anim.valz = newValue(6, {class:"center"}),
|
||||||
anim.laba = newLabel("A", {class:"padleft hide"}),
|
anim.laba = newLabel("A", {class:"padleft hide"}),
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue