Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change FreeFormTool to pixel-based logic and add multipolygon factory #110

Open
wants to merge 7 commits into
base: development
Choose a base branch
from
Open

Change FreeFormTool to pixel-based logic and add multipolygon factory #110

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
88ac486
feat: multipolygon factory, fftoolAdd for multipolygon
simonasarvasova Dec 2, 2024
3914ee8
feat: fftool remove for multipolygon
simonasarvasova Dec 6, 2024
94e8a30
fix: changed multipolygon factory representation to fabric.Path
simonasarvasova Dec 8, 2024
7ede034
fix: multipolygon export issue, unwanted contour removal in fftoolremove
simonasarvasova Dec 9, 2024
ebabfda
fixed small typos and copy function in multipolygon factory
simonasarvasova Dec 10, 2024
b35da5b
fixed configure in generic object factories, deleted some comments
simonasarvasova Dec 21, 2024
1827c07
added test for intersection while moving mouse
simonasarvasova Dec 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 44 additions & 11 deletions modules/annotations/annotations.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1356,6 +1356,7 @@ window.OSDAnnotations = class extends XOpatModuleSingleton {
OSDAnnotations.registerAnnotationFactory(OSDAnnotations.Ellipse, false);
OSDAnnotations.registerAnnotationFactory(OSDAnnotations.Ruler, false);
OSDAnnotations.registerAnnotationFactory(OSDAnnotations.Polygon, false);
OSDAnnotations.registerAnnotationFactory(OSDAnnotations.Multipolygon, false);

/**
* Polygon factory, the only factory required within the module
Expand Down Expand Up @@ -2229,8 +2230,9 @@ OSDAnnotations.StateFreeFormTool = class extends OSDAnnotations.AnnotationState
if (!o.sessionID) return false;
let factory = o._factory();
if (!factory.isEditable()) return false;
const result = factory.isImplicit() ?
factory.toPointArray(o, OSDAnnotations.AnnotationObjectFactory.withObjectPoint) : o.points;
const result = factory.isImplicit()
? factory.toPointArray(o, OSDAnnotations.AnnotationObjectFactory.withObjectPoint)
: o.points;
if (!result) return false;
return {object: o, asPolygon: result};
}
Expand All @@ -2250,19 +2252,47 @@ OSDAnnotations.StateFreeFormTool = class extends OSDAnnotations.AnnotationState
height: ffTool.radius * 2 + offset
}, getObjectAsCandidateForIntersectionTest);

const polygonUtils = OSDAnnotations.PolygonUtilities;
const active = this.context.canvas.getActiveObject();
let max = 0,
result = candidates; // by default return the whole list if intersections are <= 0
for (let i = 0; i < candidates.length; i++) {
let candidate = candidates[i];
const intersection = OSDAnnotations.checkPolygonIntersect(brushPolygon, candidate.asPolygon);
if (intersection.length) {
if (active) { // prefer first encountered object if it is also the selection
return candidate;
let max = 0, result = candidates; // by default return the whole list if intersections are <= 0

for (let candidate of candidates) {
let outerPolygon;
let holes = null;
let notFullyInHoles = false;
let isMultipolygon = candidate.object.factoryID === "multipolygon";

if (isMultipolygon) {
outerPolygon = candidate.asPolygon[0];
holes = candidate.asPolygon.slice(1);
} else {
outerPolygon = candidate.asPolygon;
}

const intersection = OSDAnnotations.checkPolygonIntersect(brushPolygon, outerPolygon);
if (!intersection.length) continue;

if (holes) {
notFullyInHoles = holes.every(hole => {

const bboxBrush = polygonUtils.getBoundingBox(brushPolygon);
const bboxHole = polygonUtils.getBoundingBox(hole);

if (polygonUtils.intersectAABB(bboxBrush, bboxHole)) {
const preciseIntersection = OSDAnnotations.checkPolygonIntersect(brushPolygon, hole);
return !(JSON.stringify(preciseIntersection) === JSON.stringify(brushPolygon));
}
return true;
});
}

if (!isMultipolygon || notFullyInHoles) {
if (active) { // prefer first encounhtered object if it is also the selection
return candidate.object;
}
if (intersection.length > max) {
max = intersection.length;
result = candidate;
result = candidate.object;
}
}
}
Expand Down Expand Up @@ -2323,6 +2353,7 @@ OSDAnnotations.StateFreeFormToolAdd = class extends OSDAnnotations.StateFreeForm
}
let created = false;
const ffTool = this.context.freeFormTool;
ffTool.zoom = this.context.canvas.getZoom();
ffTool.recomputeRadius();
const newPolygonPoints = ffTool.getCircleShape(point);
let targetIntersection = this.fftFindTarget(point, ffTool, newPolygonPoints, 0);
Expand Down Expand Up @@ -2390,6 +2421,7 @@ OSDAnnotations.StateFreeFormToolRemove = class extends OSDAnnotations.StateFreeF
}

const ffTool = this.context.freeFormTool;
ffTool.zoom = this.context.canvas.getZoom();
ffTool.recomputeRadius();
const newPolygonPoints = ffTool.getCircleShape(point);
let candidates = this.fftFindTarget(point, ffTool, newPolygonPoints, 50);
Expand Down Expand Up @@ -2573,6 +2605,7 @@ OSDAnnotations.StateCorrectionTool = class extends OSDAnnotations.StateFreeFormT

const ffTool = this.context.freeFormTool,
newPolygonPoints = ffTool.getCircleShape(point);
ffTool.zoom = this.context.canvas.getZoom();
let candidates = this.fftFindTarget(point, ffTool, newPolygonPoints, 50);

if (this.fftFoundIntersection(candidates)) {
Expand Down
Loading