Skip to content

37 ignore draw #16

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

Merged
merged 4 commits into from
Jun 12, 2020
Merged

37 ignore draw #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0ed8551
draw mode added
pashidlos Jun 12, 2020
77b136c
cursor updated
pashidlos Jun 12, 2020
7204e16
stage offset fixed
pashidlos Jun 12, 2020
d78fb6b
rounding fixed
pashidlos Jun 12, 2020
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
24 changes: 24 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"dependencies": {
"@material-ui/core": "^4.9.11",
"@material-ui/icons": "^4.9.1",
"@material-ui/lab": "^4.0.0-alpha.56",
"@testing-library/jest-dom": "^4.2.4",
"@testing-library/react": "^9.5.0",
"@testing-library/user-event": "^7.2.1",
Expand Down
65 changes: 60 additions & 5 deletions src/components/DrawArea.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { FunctionComponent } from "react";
import { Stage, Layer, Image } from "react-konva";
import { RectConfig } from "konva/types/shapes/Rect";
import Rectangle from "./Rectangle";
import Rectangle, { MIN_RECT_SIDE_PIXEL } from "./Rectangle";
import { KonvaEventObject } from "konva/types/Node";
import { IgnoreArea } from "../types/ignoreArea";

Expand All @@ -25,6 +25,7 @@ interface IDrawArea {
React.Dispatch<React.SetStateAction<{ x: number; y: number }>>
];
stageScaleState: [number, React.Dispatch<React.SetStateAction<number>>];
drawModeState: [boolean, React.Dispatch<React.SetStateAction<boolean>>];
}
const DrawArea: FunctionComponent<IDrawArea> = ({
image,
Expand All @@ -37,20 +38,67 @@ const DrawArea: FunctionComponent<IDrawArea> = ({
stageOffsetState,
stageInitPosState,
stagePosState,
drawModeState,
}) => {
const [stageInitPos, setStageInitPos] = stageInitPosState;
const [stageOffset, setStageOffset] = stageOffsetState;
const [stagePos, setStagePos] = stagePosState;
const [stageScale] = stageScaleState;
const [isDrag, setIsDrag] = React.useState(false);

const [isDrawMode, setIsDrawMode] = drawModeState;
const [isDrawing, setIsDrawing] = React.useState(isDrawMode);

const handleContentMousedown = (e: any) => {
if (!isDrawMode) return;

const newArea: IgnoreArea = {
id: Date.now().toString(),
x: Math.round((e.evt.layerX - stageOffset.x) / stageScale),
y: Math.round((e.evt.layerY - stageOffset.y) / stageScale),
width: MIN_RECT_SIDE_PIXEL,
height: MIN_RECT_SIDE_PIXEL,
};
setIgnoreAreas([...ignoreAreas, newArea]);
setSelectedRectId(newArea.id);
setIsDrawing(true);
};

const handleContentMouseup = (e: any) => {
if (isDrawing) {
setIsDrawing(!isDrawing);
setIsDrawMode(false);
}
};

const handleContentMouseMove = (e: any) => {
if (!isDrawMode) return;

if (isDrawing) {
// update the current rectangle's width and height based on the mouse position + stage scale
const mouseX = (e.evt.layerX - stageOffset.x) / stageScale;
const mouseY = (e.evt.layerY - stageOffset.y) / stageScale;

const newShapesList = ignoreAreas.map((i) => {
if (i.id === selectedRectId) {
// new width and height
i.width = Math.max(Math.round(mouseX - i.x), MIN_RECT_SIDE_PIXEL);
i.height = Math.max(Math.round(mouseY - i.y), MIN_RECT_SIDE_PIXEL);
return i;
}
return i;
});
setIgnoreAreas(newShapesList);
}
};

return (
<div
style={{
transform: `translate3d(${stagePos.x}px, ${stagePos.y}px, 0px)`,
}}
onMouseMove={(event) => {
if (isDrag && !selectedRectId) {
if (!isDrawMode && isDrag && !selectedRectId) {
event.preventDefault();
setStagePos({
x: event.clientX - stageInitPos.x,
Expand Down Expand Up @@ -83,12 +131,15 @@ const DrawArea: FunctionComponent<IDrawArea> = ({
transform: `scale(${stageScale})`,
transformOrigin: "top left",
}}
onContentMousedown={handleContentMousedown}
onContentMouseup={handleContentMouseup}
onContentMouseMove={handleContentMouseMove}
>
<Layer>
<Image
image={image}
onMouseOver={(event) => {
document.body.style.cursor = "grab";
document.body.style.cursor = isDrawMode ? "crosshair" : "grab";
}}
onMouseDown={(event) => {
document.body.style.cursor = "grabbing";
Expand Down Expand Up @@ -117,8 +168,12 @@ const DrawArea: FunctionComponent<IDrawArea> = ({

rects[i].x = Math.round(newAttrs.x || 0);
rects[i].y = Math.round(newAttrs.y || 0);
rects[i].width = Math.round(newAttrs.width || 0);
rects[i].height = Math.round(newAttrs.height || 0);
rects[i].width = Math.round(
newAttrs.width || MIN_RECT_SIDE_PIXEL
);
rects[i].height = Math.round(
newAttrs.height || MIN_RECT_SIDE_PIXEL
);

setIgnoreAreas(rects);
}}
Expand Down
11 changes: 8 additions & 3 deletions src/components/Rectangle.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import React from "react";
import { Rect, Transformer } from "react-konva";

export const MIN_RECT_SIDE_PIXEL = 5;

const Rectangle = ({ shapeProps, isSelected, onSelect, onChange }) => {
const shapeRef = React.useRef();
const trRef = React.useRef();
Expand Down Expand Up @@ -59,8 +61,8 @@ const Rectangle = ({ shapeProps, isSelected, onSelect, onChange }) => {
x: node.x(),
y: node.y(),
// set minimal value
width: Math.max(5, node.width() * scaleX),
height: Math.max(node.height() * scaleY),
width: Math.max(MIN_RECT_SIDE_PIXEL, node.width() * scaleX),
height: Math.max(MIN_RECT_SIDE_PIXEL, node.height() * scaleY),
});
}}
onMouseOver={(event) => {
Expand All @@ -82,7 +84,10 @@ const Rectangle = ({ shapeProps, isSelected, onSelect, onChange }) => {
rotateEnabled={false}
boundBoxFunc={(oldBox, newBox) => {
// limit resize
if (newBox.width < 5 || newBox.height < 5) {
if (
newBox.width < MIN_RECT_SIDE_PIXEL ||
newBox.height < MIN_RECT_SIDE_PIXEL
) {
return oldBox;
}
return newBox;
Expand Down
26 changes: 11 additions & 15 deletions src/components/TestDetailsModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
Box,
makeStyles,
} from "@material-ui/core";
import { ToggleButton } from "@material-ui/lab";
import { TestRun } from "../types";
import {
testRunService,
Expand All @@ -37,11 +38,7 @@ import { TestRunDetails } from "./TestRunDetails";
import useImage from "use-image";
import { routes } from "../constants";
import { NoImagePlaceholder } from "./NoImageAvailable";
import {
useTestRunDispatch,
updateTestRun,
selectTestRun,
} from "../contexts";
import { useTestRunDispatch, updateTestRun, selectTestRun } from "../contexts";

const useStyles = makeStyles((theme) => ({
imageContainer: {
Expand Down Expand Up @@ -89,6 +86,7 @@ const TestDetailsModal: React.FunctionComponent<{
testRun.diffName && staticService.getImage(testRun.diffName)
);

const [isDrawMode, setIsDrawMode] = useState(false);
const [isDiffShown, setIsDiffShown] = useState(false);
const [selectedRectId, setSelectedRectId] = React.useState<string>();

Expand Down Expand Up @@ -219,20 +217,15 @@ const TestDetailsModal: React.FunctionComponent<{
</Typography>
</Grid>
<Grid item>
<IconButton
<ToggleButton
value={"drawMode"}
selected={isDrawMode}
onClick={() => {
const newArea: IgnoreArea = {
id: Date.now().toString(),
x: 0,
y: 0,
width: 150,
height: 100,
};
setIgnoreAreas([...ignoreAreas, newArea]);
setIsDrawMode(!isDrawMode);
}}
>
<Add />
</IconButton>
</ToggleButton>
</Grid>
<Grid item>
<IconButton
Expand Down Expand Up @@ -351,6 +344,7 @@ const TestDetailsModal: React.FunctionComponent<{
stagePosState={[stagePos, setStagePos]}
stageInitPosState={[stageInitPos, setStageInitPos]}
stageOffsetState={[stageOffset, setStageOffset]}
drawModeState={[false, setIsDrawMode]}
/>
</div>
</Grid>
Expand Down Expand Up @@ -384,6 +378,7 @@ const TestDetailsModal: React.FunctionComponent<{
stagePosState={[stagePos, setStagePos]}
stageInitPosState={[stageInitPos, setStageInitPos]}
stageOffsetState={[stageOffset, setStageOffset]}
drawModeState={[isDrawMode, setIsDrawMode]}
/>
</div>
</Grid>
Expand Down Expand Up @@ -415,6 +410,7 @@ const TestDetailsModal: React.FunctionComponent<{
stagePosState={[stagePos, setStagePos]}
stageInitPosState={[stageInitPos, setStageInitPos]}
stageOffsetState={[stageOffset, setStageOffset]}
drawModeState={[isDrawMode, setIsDrawMode]}
/>
</div>
</Grid>
Expand Down