From cd08b660681642770cc39752a3944495d2218d10 Mon Sep 17 00:00:00 2001 From: Jakob Yanagibashi <yanagibashi@kg.rwth-aachen.de> Date: Thu, 20 Apr 2023 19:23:03 +0200 Subject: [PATCH] Improvements to vertical test model --- main.js | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/main.js b/main.js index 667c18f..58bb587 100644 --- a/main.js +++ b/main.js @@ -448,23 +448,26 @@ function getPresetModelVase() { function getPresetModelVertical() { var presetProject = new Project(); - var extMult = 4; + var extMult = 5; var ext = 0; - const startX = 40; - var currBig; - var currSmall; + const startX = 35; + var currPoint; - for (var i = 1; i < 15; i++) { - currBig = i * extMult; - currSmall = i * extMult - extMult / 2; + presetProject.addLine(ext, 2500, startX, 0, 0); + presetProject.addLine(ext += 3, 1500, startX, 0, 0); + presetProject.addLine(ext, 1500, startX + 15, 0, 0); + presetProject.addLine(ext, 1500, startX - extMult, 0, 10); - presetProject.addLine(ext, 1500, startX - currSmall, 0, 0); + for (var i = 1; i < 10; i++) { + currPoint = i * extMult; - presetProject.addArc(ext += currSmall * 1.5, 1500, currSmall, "1", "1", "1"); + presetProject.addLine(ext, 2000, startX - currPoint, 0, 0); - presetProject.addLine(ext, 1500, startX, 0, currBig); + presetProject.addArc(ext += currPoint * 1.5, 1500, currPoint, "1", "1", "1"); - presetProject.addArc(ext += currBig * 1.5, 1500, currBig, "3", "2", "1"); + presetProject.addLine(ext, 2000, startX + 12, 0, Math.max(currPoint - 20, 0)); + presetProject.addLine(ext, 1500, startX, 0, currPoint + 10); + presetProject.addLine(ext, 1500, startX - currPoint - 10, 0, currPoint); } return presetProject; -- GitLab