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

Jump to bottom

fix(front): Display drawn polygon on image only if viewId matches #74

Merged
merged 1 commit into from
Feb 1, 2024
Merged

fix(front): Display drawn polygon on image only if viewId matches #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions ui/components/canvas2d/src/Canvas2D.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,6 +519,7 @@
status: "creating",
type: "mask",
points: [...oldPoints, { x, y, id: oldPoints.length || 0 }],
viewId,
};
}

Expand Down
44 changes: 23 additions & 21 deletions ui/components/canvas2d/src/components/CreatePolygon.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,24 +89,26 @@
$: flatPoints = polygonPoints[0]?.reduce((acc, val) => [...acc, val.x, val.y], [] as number[]);
</script>

<Group config={{ id: "polygon", draggable: true }}>
<Line
config={{
points: flatPoints,
stroke: "hsl(316deg 60% 29.41%)",
strokeWidth: INPUTRECT_STROKEWIDTH / zoomFactor[viewId],
fill: "#f9f4f773",
closed: isClosed,
}}
/>
<PolygonPoints
{viewId}
{stage}
{zoomFactor}
polygonId={POLYGON_ID}
points={polygonPoints}
{handlePolygonPointsClick}
{handlePolygonPointsDragMove}
handlePolygonPointsDragEnd={null}
/>
</Group>
{#if "viewId" in newShape && newShape.viewId === viewId}
<Group config={{ id: "polygon", draggable: true }}>
<Line
config={{
points: flatPoints,
stroke: "hsl(316deg 60% 29.41%)",
strokeWidth: INPUTRECT_STROKEWIDTH / zoomFactor[viewId],
fill: "#f9f4f773",
closed: isClosed,
}}
/>
<PolygonPoints
{viewId}
{stage}
{zoomFactor}
polygonId={POLYGON_ID}
points={polygonPoints}
{handlePolygonPointsClick}
{handlePolygonPointsDragMove}
handlePolygonPointsDragEnd={null}
/>
</Group>
{/if}
1 change: 1 addition & 0 deletions ui/components/core/src/lib/types/objectTypes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ export type CreateMaskShape = {
status: "creating";
type: "mask";
points: PolygonGroupPoint[];
viewId: string;
};

export type editMaskShape = {
Expand Down
Loading