Skip to content
Snippets Groups Projects
Commit 1dce600f authored by Jakob Yanagibashi's avatar Jakob Yanagibashi :nail_care_tone4:
Browse files

Add button for second preset

parent bbedf241
No related branches found
No related tags found
No related merge requests found
Pipeline #254319 passed
...@@ -118,7 +118,8 @@ document.querySelector("#app").innerHTML = ` ...@@ -118,7 +118,8 @@ document.querySelector("#app").innerHTML = `
</p> </p>
<form method="dialog"> <form method="dialog">
<menu> <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> <button value="cancel">Close</button>
</menu> </menu>
</form> </form>
...@@ -148,16 +149,6 @@ document.querySelector("#app").innerHTML = ` ...@@ -148,16 +149,6 @@ document.querySelector("#app").innerHTML = `
</form> </form>
</dialog> </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"> <dialog id="exportDialog">
<form method="dialog"> <form method="dialog">
<menu> <menu>
...@@ -215,7 +206,7 @@ document.querySelector("#app").innerHTML = ` ...@@ -215,7 +206,7 @@ document.querySelector("#app").innerHTML = `
<input <input
type="text" type="text"
id="addLineInputE" id="addLineInputE"
value="0" value="1"
/><br /> /><br />
Speed (<strong>F</strong>eed): Speed (<strong>F</strong>eed):
<input <input
...@@ -404,7 +395,7 @@ G28 ...@@ -404,7 +395,7 @@ G28
import { Project } from "./js/project.js"; import { Project } from "./js/project.js";
import { Move } from "./js/command.js"; import { Move } from "./js/command.js";
function getPresetModelmain() { function getPresetModelVase() {
var presetProject = new Project(); var presetProject = new Project();
var precision = 10; var precision = 10;
var zoom = 30; var zoom = 30;
...@@ -455,6 +446,12 @@ function getPresetModelmain() { ...@@ -455,6 +446,12 @@ function getPresetModelmain() {
return presetProject; return presetProject;
} }
function getPresetModelVertical() {
var presetProject = new Project();
return presetProject;
}
/* Model modification */ /* Model modification */
function editSelectedCommand() {} function editSelectedCommand() {}
...@@ -558,10 +555,6 @@ function loadProject(projectToLoad) { ...@@ -558,10 +555,6 @@ function loadProject(projectToLoad) {
//window.currentProject.load(); //window.currentProject.load();
} }
function loadPreset(presetName) {
window.currentProject = eval("getPresetModel" + presetName + "()");
}
/*function loadProject() { /*function loadProject() {
const projectToLoad = document.getElementById("project-input").value; const projectToLoad = document.getElementById("project-input").value;
if (!Number.isInteger(parseInt(projectToLoad))) return; if (!Number.isInteger(parseInt(projectToLoad))) return;
...@@ -636,12 +629,6 @@ function initEventListeners() { ...@@ -636,12 +629,6 @@ function initEventListeners() {
} }
function initMainEventListeners() { function initMainEventListeners() {
/* document
.getElementById("loadPresetMenuButton")
.addEventListener("click", function onOpen() {
document.getElementById("loadPresetDialog").showModal();
}); */
document document
.getElementById("exportProjectMenuButton") .getElementById("exportProjectMenuButton")
.addEventListener("click", function onOpen() { .addEventListener("click", function onOpen() {
...@@ -903,16 +890,6 @@ G28 ...@@ -903,16 +890,6 @@ G28
window.currentProject.renderAll(); 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 document
.getElementById("saveDialog") .getElementById("saveDialog")
.addEventListener("close", function onClose() { .addEventListener("close", function onClose() {
...@@ -938,8 +915,16 @@ G28 ...@@ -938,8 +915,16 @@ G28
.getElementById("helpDialog") .getElementById("helpDialog")
.addEventListener("close", function onClose() { .addEventListener("close", function onClose() {
// Check if Load button was pressed // Check if Load button was pressed
if (event.target.returnValue != "example") return; switch (event.target.returnValue) {
window.currentProject = getPresetModelmain(); case "example1":
window.currentProject = getPresetModelVase();
break;
case "example2":
window.currentProject = getPresetModelVertical();
break;
default:
return;
}
}); });
document document
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment