From bd43e007753c1e5baf1f8b191944378beb68c6ec Mon Sep 17 00:00:00 2001
From: Kaalleen <36401965+kaalleen@users.noreply.github.com>
Date: Mon, 28 Feb 2022 16:24:51 +0100
Subject: Cutwork segmentation (#1582)
* add cutwork segmentation extension
* simulator: option to not render jump stitches
---
electron/src/renderer/assets/js/simulator.js | 13 +++++++++++++
electron/src/renderer/assets/style/simulator.css | 4 ----
electron/src/renderer/components/Simulator.vue | 5 ++++-
electron/src/renderer/main.js | 2 ++
4 files changed, 19 insertions(+), 5 deletions(-)
(limited to 'electron/src')
diff --git a/electron/src/renderer/assets/js/simulator.js b/electron/src/renderer/assets/js/simulator.js
index 21859d80..fa963bbe 100644
--- a/electron/src/renderer/assets/js/simulator.js
+++ b/electron/src/renderer/assets/js/simulator.js
@@ -49,6 +49,7 @@ export default {
showColorChanges: false,
showStops: false,
showNeedlePenetrationPoints: false,
+ renderJumps: true,
showRealisticPreview: false,
showCursor: true
}
@@ -70,6 +71,10 @@ export default {
}
})
},
+ renderJumps() {
+ this.renderedStitch = 1
+ this.renderFrame()
+ },
showRealisticPreview() {
let animating = this.animating
this.stop()
@@ -291,6 +296,14 @@ export default {
renderFrame() {
while (this.renderedStitch < this.currentStitch) {
this.renderedStitch += 1
+ if (!this.renderJumps && this.stitches[this.renderedStitch].jump){
+ if (this.showRealisticPreview) {
+ this.realisticPaths[this.renderedStitch].hide();
+ } else {
+ this.stitchPaths[this.renderedStitch].hide();
+ }
+ continue;
+ }
if (this.showRealisticPreview) {
this.realisticPaths[this.renderedStitch].show()
} else {
diff --git a/electron/src/renderer/assets/style/simulator.css b/electron/src/renderer/assets/style/simulator.css
index 6673c69d..8a79de98 100644
--- a/electron/src/renderer/assets/style/simulator.css
+++ b/electron/src/renderer/assets/style/simulator.css
@@ -172,10 +172,6 @@ fieldset.show-commands span {
vertical-align: top;
}
-fieldset.show-commands span.npp {
- text-align: right;
-}
-
fieldset.show-commands span:first-of-type {
padding: 0 5px;
}
diff --git a/electron/src/renderer/components/Simulator.vue b/electron/src/renderer/components/Simulator.vue
index 26bada6c..22b25446 100644
--- a/electron/src/renderer/components/Simulator.vue
+++ b/electron/src/renderer/components/Simulator.vue
@@ -215,7 +215,7 @@
-
+
+
+
+
diff --git a/electron/src/renderer/main.js b/electron/src/renderer/main.js
index 68486098..1afbca3a 100644
--- a/electron/src/renderer/main.js
+++ b/electron/src/renderer/main.js
@@ -24,6 +24,7 @@ import {
faExchangeAlt,
faEye,
faFrog,
+ faLink,
faHippo,
faHorse,
faInfo,
@@ -60,6 +61,7 @@ library.add(
faExchangeAlt,
faEye,
faFrog,
+ faLink,
faHippo,
faHorse,
faInfo,
--
cgit v1.2.3