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.

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

Dt v2.2.0 #4

Open
wants to merge 3 commits into
base: dt-v2.2.0
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
/letsencrypt-webroot/

# Ignore temporary files
docker-compose.override.yml
__pycache__
*.pyc
._*
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.ui
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
FROM node:lts-slim AS cvat-ui

ARG http_proxy
ARG https_proxy
ARG no_proxy
Expand Down Expand Up @@ -33,7 +32,8 @@ COPY cvat-core/ /tmp/cvat-core/
COPY cvat-canvas3d/ /tmp/cvat-canvas3d/
COPY cvat-canvas/ /tmp/cvat-canvas/
COPY cvat-ui/ /tmp/cvat-ui/
RUN npm run build:cvat-ui
# RUN npm run build:cvat-ui
RUN NODE_OPTIONS='--openssl-legacy-provider' npm run build:cvat-ui

FROM nginx:mainline-alpine
# Replace default.conf configuration to remove unnecessary rules
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,19 +78,19 @@ function MakeCopyItem(props: ItemProps): JSX.Element {
);
}

function PropagateItem(props: ItemProps): JSX.Element {
const { toolProps, ...rest } = props;
const { propagateShortcut, propagate } = toolProps;
return (
<Menu.Item {...rest}>
<CVATTooltip title={`${propagateShortcut}`}>
<Button type='link' icon={<BlockOutlined />} onClick={propagate}>
Propagate
</Button>
</CVATTooltip>
</Menu.Item>
);
}
// function PropagateItem(props: ItemProps): JSX.Element {
// const { toolProps, ...rest } = props;
// const { propagateShortcut, propagate } = toolProps;
// return (
// <Menu.Item {...rest}>
// <CVATTooltip title={`${propagateShortcut}`}>
// <Button type='link' icon={<BlockOutlined />} onClick={propagate}>
// Propagate
// </Button>
// </CVATTooltip>
// </Menu.Item>
// );
// }

function SwitchOrientationItem(props: ItemProps): JSX.Element {
const { toolProps, ...rest } = props;
Expand Down Expand Up @@ -231,7 +231,7 @@ export default function ItemMenu(props: Props): JSX.Element {
<Menu className='cvat-object-item-menu' selectable={false}>
<CreateURLItem key={MenuKeys.CREATE_URL} toolProps={props} />
{!readonly && <MakeCopyItem key={MenuKeys.COPY} toolProps={props} />}
{!readonly && <PropagateItem key={MenuKeys.PROPAGATE} toolProps={props} />}
{/* {!readonly && <PropagateItem key={MenuKeys.PROPAGATE} toolProps={props} />} */}
{is2D && !readonly && [ShapeType.POLYGON, ShapeType.POLYLINE, ShapeType.CUBOID].includes(shapeType) && (
<SwitchOrientationItem key={MenuKeys.SWITCH_ORIENTATION} toolProps={props} />
)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export default function StandardWorkspaceComponent(): JSX.Element {
<ControlsSideBarContainer />
<CanvasWrapperContainer />
<ObjectSideBarComponent objectsList={<ObjectsListContainer />} />
<PropagateConfirmContainer />
{/* <PropagateConfirmContainer /> */}
<CanvasContextMenuContainer />
<CanvasPointContextMenuComponent />
<IssueAggregatorComponent />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export default function StandardWorkspace3DComponent(): JSX.Element {
<ControlsSideBarContainer />
<CanvasWrapperContainer />
<ObjectSideBarComponent objectsList={<ObjectsListContainer />} />
<PropagateConfirmContainer />
{/* <PropagateConfirmContainer /> */}
<CanvasContextMenuContainer />
<CanvasPointContextMenuComponent />
</Layout>
Expand Down
15 changes: 15 additions & 0 deletions docker-compose.override.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
version: '3.3'

services:
cvat:
environment:
CVAT_SHARE_URL: 'Mounted from ${CVAT_MOUNT:-/home/ubuntu/dtpl-ai-data-labelling} host directory'
volumes:
- cvat_share:/home/django/share:ro

volumes:
cvat_share:
driver_opts:
type: none
device: ${CVAT_MOUNT:-/home/ubuntu/dtpl-ai-data-labelling}
o: bind