From 1dce600fb6910289f5d187f9ae741e48e3357886 Mon Sep 17 00:00:00 2001
From: Jakob Yanagibashi <jakob.yanagibashi@rwth-aachen.de>
Date: Thu, 13 Apr 2023 17:13:32 +0000
Subject: [PATCH] Add button for second preset
---
main.js | 55 ++++++++++++++++++++-----------------------------------
1 file changed, 20 insertions(+), 35 deletions(-)
diff --git a/main.js b/main.js
index d8fe0ad..e60a7d5 100644
--- a/main.js
+++ b/main.js
@@ -118,7 +118,8 @@ document.querySelector("#app").innerHTML = `
</p>
<form method="dialog">
<menu>
- <button value="example">Load example</button>
+ <button value="example1">Load example 1</button>
+ <button value="example2">Load example 2</button>
<button value="cancel">Close</button>
</menu>
</form>
@@ -148,16 +149,6 @@ document.querySelector("#app").innerHTML = `
</form>
</dialog>
-<dialog id="loadPresetDialog">
- <form method="dialog">
- <input type="text" id="loadPresetInput" />
- <menu>
- <button value="load">Load</button>
- <button value="cancel">Cancel</button>
- </menu>
- </form>
-</dialog>
-
<dialog id="exportDialog">
<form method="dialog">
<menu>
@@ -215,7 +206,7 @@ document.querySelector("#app").innerHTML = `
<input
type="text"
id="addLineInputE"
- value="0"
+ value="1"
/><br />
Speed (<strong>F</strong>eed):
<input
@@ -404,7 +395,7 @@ G28
import { Project } from "./js/project.js";
import { Move } from "./js/command.js";
-function getPresetModelmain() {
+function getPresetModelVase() {
var presetProject = new Project();
var precision = 10;
var zoom = 30;
@@ -455,6 +446,12 @@ function getPresetModelmain() {
return presetProject;
}
+function getPresetModelVertical() {
+ var presetProject = new Project();
+
+ return presetProject;
+}
+
/* Model modification */
function editSelectedCommand() {}
@@ -558,10 +555,6 @@ function loadProject(projectToLoad) {
//window.currentProject.load();
}
-function loadPreset(presetName) {
- window.currentProject = eval("getPresetModel" + presetName + "()");
-}
-
/*function loadProject() {
const projectToLoad = document.getElementById("project-input").value;
if (!Number.isInteger(parseInt(projectToLoad))) return;
@@ -636,12 +629,6 @@ function initEventListeners() {
}
function initMainEventListeners() {
- /* document
- .getElementById("loadPresetMenuButton")
- .addEventListener("click", function onOpen() {
- document.getElementById("loadPresetDialog").showModal();
- }); */
-
document
.getElementById("exportProjectMenuButton")
.addEventListener("click", function onOpen() {
@@ -903,16 +890,6 @@ G28
window.currentProject.renderAll();
});
- document
- .getElementById("loadPresetDialog")
- .addEventListener("close", function onClose() {
- // Check if Load button was pressed
- if (event.target.returnValue != "load") return;
- const inputEl = document.getElementById("loadPresetInput");
- loadPreset(inputEl.value);
- inputEl.value = "";
- });
-
document
.getElementById("saveDialog")
.addEventListener("close", function onClose() {
@@ -938,8 +915,16 @@ G28
.getElementById("helpDialog")
.addEventListener("close", function onClose() {
// Check if Load button was pressed
- if (event.target.returnValue != "example") return;
- window.currentProject = getPresetModelmain();
+ switch (event.target.returnValue) {
+ case "example1":
+ window.currentProject = getPresetModelVase();
+ break;
+ case "example2":
+ window.currentProject = getPresetModelVertical();
+ break;
+ default:
+ return;
+ }
});
document
--
GitLab