From 6566adaeb69a4f5734c836229bc494ba7bead12e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A9sz=C3=A1ros=20Gergely?= Date: Tue, 17 May 2022 01:50:38 +0200 Subject: [PATCH] Scaling option for resample --- index.html | 6 ++++++ modules/ui/submap.js | 13 ++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index 26d88b1e..2b724c8a 100644 --- a/index.html +++ b/index.html @@ -4380,6 +4380,12 @@ 0° +
Scale
+
+ + 1x +
+
Mirror
diff --git a/modules/ui/submap.js b/modules/ui/submap.js index 3e8b8230..0a903443 100644 --- a/modules/ui/submap.js +++ b/modules/ui/submap.js @@ -10,6 +10,12 @@ window.UISubmap = (function () { output.style.color = getCellsDensityColor(cells); }); + document.getElementById("submapScaleInput").addEventListener("input", function (event) { + const exp = Math.pow(1.1, +event.target.value); + document.getElementById("submapScaleOutput").value = rn(exp,2); + event.stopPropagation(); + }); + function openSubmapMenu() { $("#submapOptionsDialog").dialog({ title: "Create a submap", @@ -32,7 +38,9 @@ window.UISubmap = (function () { resetZoom(0); document.getElementById("submapAngleInput").value = 0; - document.getElementById("submapAngleOutput").value = "0°"; + document.getElementById("submapAngleOutput").value = "0"; + document.getElementById("submapScaleInput").value = 1; + document.getElementById("submapScaleOutput").value = 1; document.getElementById("submapShiftX").value = 0; document.getElementById("submapShiftY").value = 0; document.getElementById("submapMirrorH").checked = false; @@ -64,11 +72,13 @@ window.UISubmap = (function () { const angle = (+document.getElementById("submapAngleInput").value / 180) * Math.PI; const shiftX = +document.getElementById("submapShiftX").value; const shiftY = +document.getElementById("submapShiftY").value; + const ratio = +document.getElementById("submapScaleInput").value; const mirrorH = document.getElementById("submapMirrorH").checked; const mirrorV = document.getElementById("submapMirrorV").checked; const [cx, cy] = [graphWidth / 2, graphHeight / 2]; const rot = alfa => (x, y) => [(x - cx) * Math.cos(alfa) - (y - cy) * Math.sin(alfa) + cx, (y - cy) * Math.cos(alfa) + (x - cx) * Math.sin(alfa) + cy]; + const scale = ratio => (x, y) => [(x-cx) * ratio + cx, (y-cy) * ratio + cy]; const shift = (dx, dy) => (x, y) => [x + dx, y + dy]; const flipH = (x, y) => [-x + 2 * cx, y]; const flipV = (x, y) => [x, -y + 2 * cy]; @@ -83,6 +93,7 @@ window.UISubmap = (function () { projection = app(shift(shiftX, shiftY), projection); inverse = app(inverse, shift(-shiftX, -shiftY)); } + if (ratio) [projection, inverse] = [app(scale(Math.pow(1.1,ratio)), projection), app(inverse, scale(Math.pow(1.1,-ratio)))]; if (mirrorH) [projection, inverse] = [app(flipH, projection), app(inverse, flipH)]; if (mirrorV) [projection, inverse] = [app(flipV, projection), app(inverse, flipV)];