Added "Draw from center" option to Analog ROI editor (#3975)

This commit is contained in:
evgbus
2025-12-29 23:59:04 +03:00
committed by GitHub
parent 39de778ffe
commit 71577039f8

View File

@@ -156,6 +156,7 @@ The following settings are only used for easier setup, they are <b>not</b> persi
<input type="checkbox" id="showall" name="showall" value="1" onclick="draw()" checked tabindex=9><label for="showall"> Show all ROIs</label><br> <input type="checkbox" id="showall" name="showall" value="1" onclick="draw()" checked tabindex=9><label for="showall"> Show all ROIs</label><br>
<input type="checkbox" id="lockAspectRatio" name="lockAspectRatio" value="1" onclick="changelockAspectRatio()" checked tabindex=6><label for="lockAspectRatio"> Lock aspect ratio </label><br> <input type="checkbox" id="lockAspectRatio" name="lockAspectRatio" value="1" onclick="changelockAspectRatio()" checked tabindex=6><label for="lockAspectRatio"> Lock aspect ratio </label><br>
<input type="checkbox" id="lockSizes" name="lockSizes" value="1" onclick="changelockSizes()" checked tabindex=7><label for="lockSizes"> Synchronize y, Δx and Δy between ROIs</label><br> <input type="checkbox" id="lockSizes" name="lockSizes" value="1" onclick="changelockSizes()" checked tabindex=7><label for="lockSizes"> Synchronize y, Δx and Δy between ROIs</label><br>
<input type="checkbox" id="drawFromCenter" name="drawFromCenter" value="1" onclick="changeDrawFromCenter()" checked tabindex=8><label for="drawFromCenter"> Draw from center</label><br>
<hr> <hr>
<table> <table>
@@ -196,6 +197,7 @@ The following settings are only used for easier setup, they are <b>not</b> persi
enhanceCon = false, enhanceCon = false,
lockAspectRatio = true, lockAspectRatio = true,
lockSizes = false, lockSizes = false,
drawFromCenter = true,
domainname = getDomainname(); domainname = getDomainname();
function doReboot() { function doReboot() {
@@ -319,6 +321,10 @@ The following settings are only used for easier setup, they are <b>not</b> persi
UpdateROIs(); UpdateROIs();
} }
function changeDrawFromCenter() {
drawFromCenter = document.getElementById("drawFromCenter").checked;
}
function changeCCW() { function changeCCW() {
var sel = document.getElementById("Numbers_value1"); var sel = document.getElementById("Numbers_value1");
var _number = sel.options[sel.selectedIndex].text; var _number = sel.options[sel.selectedIndex].text;
@@ -800,6 +806,10 @@ The following settings are only used for easier setup, they are <b>not</b> persi
zw = getCoords(this) zw = getCoords(this)
rect.startX = e.pageX - zw.left; rect.startX = e.pageX - zw.left;
rect.startY = e.pageY - zw.top; rect.startY = e.pageY - zw.top;
if (drawFromCenter) {
rect.centerX = rect.startX;
rect.centerY = rect.startY;
}
document.getElementById("refx").value = rect.startX; document.getElementById("refx").value = rect.startX;
document.getElementById("refy").value = rect.startY; document.getElementById("refy").value = rect.startY;
drag = true; drag = true;
@@ -822,16 +832,33 @@ The following settings are only used for easier setup, they are <b>not</b> persi
} }
function mouseMove(e) { function mouseMove(e) {
const mouseX = e.pageX - zw.left;
const mouseY = e.pageY - zw.top;
if (drag) { if (drag) {
zw = getCoords(this) zw = getCoords(this)
if (drawFromCenter) {
if (lockAspectRatio) { if (lockAspectRatio) {
rect.h = (e.pageY - zw.top) - rect.startY; rect.h = Math.abs(mouseY - rect.centerY) * 2;
rect.w = Math.round(rect.h * ROIInfo[aktindex]["ar"]); rect.w = Math.round(rect.h * ROIInfo[aktindex]["ar"]);
} else {
rect.w = Math.abs(mouseX - rect.centerX) * 2;
rect.h = Math.abs(mouseY - rect.centerY) * 2;
}
rect.startX = rect.centerX - rect.w / 2;
rect.startY = rect.centerY - rect.h / 2;
document.getElementById("refx").value = Math.round(rect.startX);
document.getElementById("refy").value = Math.round(rect.startY);
} else {
if (lockAspectRatio) {
rect.h = mouseY - rect.startY;
rect.w = Math.round(rect.h * ROIInfo[aktindex]["ar"]);
} else {
rect.w = mouseX - rect.startX;
rect.h = mouseY - rect.startY;
} }
else {
rect.w = (e.pageX - zw.left) - rect.startX;
rect.h = (e.pageY - zw.top) - rect.startY;
} }
document.getElementById("refdx").value = rect.w; document.getElementById("refdx").value = rect.w;
document.getElementById("refdy").value = rect.h; document.getElementById("refdy").value = rect.h;
@@ -843,8 +870,8 @@ The following settings are only used for easier setup, they are <b>not</b> persi
var context = canvas.getContext('2d'); var context = canvas.getContext('2d');
zw = getCoords(this); zw = getCoords(this);
x = e.pageX - zw.left; x = mouseX;
y = e.pageY - zw.top; y = mouseY;
context.lineWidth = 2; context.lineWidth = 2;
context.strokeStyle = "#00FF00"; context.strokeStyle = "#00FF00";