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

Semi-automatic tools enhancements (Non-blocking UI, tips) #3473

Merged
merged 40 commits into from
Aug 6, 2021
Merged
Show file tree
Hide file tree
Changes from 32 commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
2bf427e
First stage for points minimizer
Jul 20, 2021
57fbbe2
Fixed issue with correct opencv initialization status
Jul 20, 2021
dd63985
Displaying points during interaction
Jul 20, 2021
b6cb02f
Added releasing memory
Jul 20, 2021
367383a
Initial version for on-the-fly optimization
Jul 20, 2021
b2d9548
Redesigned accuracy
Jul 22, 2021
4636548
Updated version & changelog
Jul 22, 2021
725dafa
Fixed opencv scissors
Jul 22, 2021
90d69bc
Clean up some intermediate state
Jul 22, 2021
c111668
Fixed scss
Jul 22, 2021
ca42cb5
Redesigned slider a bit
Jul 26, 2021
1117bf8
Added errored shape
Jul 26, 2021
bbe5c75
Keep slider hidden while didn't recieve first points
Jul 26, 2021
b137176
Adjusted settings slider
Jul 26, 2021
b62d6bf
Updated label
Jul 26, 2021
44c16aa
tmp
Jul 27, 2021
a1be09c
A couple of fixes for trackers & detectors
Jul 27, 2021
59da9df
Merge branch 'bs/semi_enhancements' into bs/semi_enhancements_1
Jul 27, 2021
2d9f04f
Merged develop
Jul 27, 2021
1197639
Updated default value
Jul 27, 2021
14bffea
Merge branch 'bs/semi_enhancements' into bs/semi_enhancements_1
Jul 28, 2021
7b2eb3b
Initial non blocking UI when interaction
Jul 28, 2021
04d4e33
Merged develop
Jul 28, 2021
9acd86f
Minor fix
Jul 28, 2021
86c1c06
Initial gifs feature
Jul 30, 2021
f741681
Added tips from docs
Aug 2, 2021
21f283f
Additional optional tip
Aug 2, 2021
4d4abe1
Updated version & changelog
Aug 2, 2021
51ae74d
Merge branch 'develop' into bs/semi_enhancements_1
Aug 3, 2021
c2a8dbd
Merged develop
Aug 3, 2021
ef645d2
Merged develop
Aug 4, 2021
e6e743d
Redesigned condition
Aug 4, 2021
bac9876
Merge branch 'develop' into bs/semi_enhancements_1
Aug 5, 2021
ce677f3
Keep gif & message within serverless yaml
Aug 5, 2021
94de8cd
Opacity level for drawhandler
Aug 5, 2021
d9e3928
Updated version & changelog
Aug 5, 2021
d3f0f9d
Fixed style
Aug 5, 2021
9e6844c
Fixed minor issue when drawing with N
Aug 5, 2021
df53299
Renamed example_gif_url to animated_gif
Aug 6, 2021
7753c58
merged develop
Aug 6, 2021
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
15 changes: 8 additions & 7 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added

- Notification if the browser does not support nesassary API
- Additional inline tips in interactors with demo gifs (<https://github.com/openvinotoolkit/cvat/pull/3473>)

### Changed

- TDB
- Non-blocking UI when using interactors (<https://github.com/openvinotoolkit/cvat/pull/3473>)

### Deprecated

Expand Down Expand Up @@ -873,20 +874,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
```
## [Unreleased]
### Added
-
- TDB

### Changed
-
- TDB

### Deprecated
-
- TDB

### Removed
-
- TDB

### Fixed
-
- TDB

### Security
-
- TDB
```
2 changes: 1 addition & 1 deletion cvat-ui/package-lock.json

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

2 changes: 1 addition & 1 deletion cvat-ui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cvat-ui",
"version": "1.21.2",
"version": "1.22.0",
"description": "CVAT single-page application",
"main": "src/index.tsx",
"scripts": {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
// Copyright (C) 2021 Intel Corporation
//
// SPDX-License-Identifier: MIT

import React from 'react';
import Image from 'antd/lib/image';
import Paragraph from 'antd/lib/typography/Paragraph';
import Text from 'antd/lib/typography/Text';

interface Props {
tool?: string;
withNegativePoints?: boolean;
}

function InteractorTooltips(props: Props): JSX.Element {
const { tool, withNegativePoints } = props;

const DEXTR_GIF = 'https://openvinotoolkit.github.io/cvat/images/dextr_example.gif';
bsekachev marked this conversation as resolved.
Show resolved Hide resolved
const FBRS_GIF = 'https://openvinotoolkit.github.io/cvat/images/fbrs_example.gif';
const IOG_GIF = 'https://openvinotoolkit.github.io/cvat/images/iog_example.gif';
const DEXTR_DESC =
'The interactor allows to get a mask of an object using its extreme points (more or equal 4). You can add a point left-clicking the image';
const FBRS_DESC = 'The interactor allows to get a mask for an object using positive points, and negative points.';
const IOG_DESC =
'The interactor allows to get a mask of an object using its wrapping boundig box, positive, and negative points inside it';

const UNKNOWN_DESC = 'Selected interactor does not have tips';

let gif = null;
let desc = '';

switch (tool) {
case undefined:
desc = 'Select an interactor to see description';
break;
case 'DEXTR':
gif = DEXTR_GIF;
desc = DEXTR_DESC;
break;
case 'f-BRS':
gif = FBRS_GIF;
desc = FBRS_DESC;
break;
case 'IOG':
gif = IOG_GIF;
desc = IOG_DESC;
break;
default:
desc = UNKNOWN_DESC;
}

return (
<div className='cvat-interactor-tip-container'>
<Paragraph>{desc}</Paragraph>
{tool ? (
<>
<Paragraph>
<Text>You can prevent server requests holding</Text>
<Text strong>{' Ctrl '}</Text>
<Text>key</Text>
</Paragraph>
<Paragraph>
<Text>Positive points can be added by left-clicking the image. </Text>
{withNegativePoints ? (
<Text>Negative points can be added by right-clicking the image. </Text>
) : null}
</Paragraph>
</>
) : null}
{gif ? <Image className='cvat-interactor-tip-image' alt='Example gif' src={gif} /> : null}
</div>
);
}

export default React.memo(InteractorTooltips);
Loading