From af96d720e9340e02b1ec6dafe10bf9a47e045804 Mon Sep 17 00:00:00 2001 From: Lex Neva Date: Thu, 7 Sep 2023 13:25:47 -0400 Subject: improve params errors (#2437) --- electron/src/renderer/assets/js/simulator.js | 20 +++++++++++++++++++- electron/src/renderer/assets/style/simulator.css | 4 ++-- electron/src/renderer/components/Simulator.vue | 13 +++++++++++++ 3 files changed, 34 insertions(+), 3 deletions(-) (limited to 'electron/src') diff --git a/electron/src/renderer/assets/js/simulator.js b/electron/src/renderer/assets/js/simulator.js index 8a0423f3..e751f137 100644 --- a/electron/src/renderer/assets/js/simulator.js +++ b/electron/src/renderer/assets/js/simulator.js @@ -54,7 +54,9 @@ export default { showNeedlePenetrationPoints: false, renderJumps: true, showRealisticPreview: false, - showCursor: true + showCursor: true, + error: false, + error_message: "" } }, watch: { @@ -543,6 +545,9 @@ export default { zoomPage () { this.svg.viewbox(this.page_specs.bbox.x, this.page_specs.bbox.y - 50, this.page_specs.bbox.width + 100, this.page_specs.bbox.height + 100) this.resizeCursor() + }, + close () { + window.close() } }, created: function () { @@ -642,6 +647,19 @@ export default { }) this.start() + }).catch(error => { + this.loading = false + if (error.response) { + // Stitch plan generation had an error. Show it to the user. + this.error_message = error.response.data.error_message + } else if (error.request) { + // We sent the request and didn't get a response. + this.error_message = "Stitch plan generation failed." + } else { + // Something weird happened in axios. + this.error_message = error.message + } + this.error = true }) } } diff --git a/electron/src/renderer/assets/style/simulator.css b/electron/src/renderer/assets/style/simulator.css index e938cbe3..1ce61865 100644 --- a/electron/src/renderer/assets/style/simulator.css +++ b/electron/src/renderer/assets/style/simulator.css @@ -26,12 +26,12 @@ padding: 1rem; } -button { +.controls button { color: rgb(0, 51, 153); align-items: flex-start; text-align: center; cursor: default; - background: linear-gradient(0deg, rgba(169,169,169,1) 0%, rgba(255,255,255,1) 68%, rgba(227,227,227,1) 100%); + background: linear-gradient(0deg, rgba(169, 169, 169, 1) 0%, rgba(255, 255, 255, 1) 68%, rgba(227, 227, 227, 1) 100%); box-sizing: border-box; padding: 2px 6px 3px; border-width: 2px; diff --git a/electron/src/renderer/components/Simulator.vue b/electron/src/renderer/components/Simulator.vue index 6d76b133..e2d65ed8 100644 --- a/electron/src/renderer/components/Simulator.vue +++ b/electron/src/renderer/components/Simulator.vue @@ -306,6 +306,19 @@ + + + + Error Generating Stitch Plan + + +

{{ error_message }}

+
+ + Close + +
+
-- cgit v1.2.3