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

React UI: Batch of fixes #1211

Merged
merged 12 commits into from
Feb 28, 2020
Merged

React UI: Batch of fixes #1211

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
5ae9be7
Disabled tracks for polyshapes in UI
bsekachev Feb 28, 2020
1261476
RectDrawingMethod enum pushed to cvat-canvas, fixed some code issues
bsekachev Feb 28, 2020
fb30615
Optional arguments
bsekachev Feb 28, 2020
a08a234
Draw a text for locked shapes, some fixes with not keyframe shapes
bsekachev Feb 28, 2020
50f3c7d
Fixed zooming & batch grouping
bsekachev Feb 28, 2020
ed59bd5
Reset zoom for tasks with images
bsekachev Feb 28, 2020
2d7fdb3
Fixed putting shapes out of canvas
bsekachev Feb 28, 2020
d10b034
Fixed grid opacity, little refactoring of componentDidUpdate in canva…
bsekachev Feb 28, 2020
8d88aa7
Fixed corner cases for drawing
bsekachev Feb 28, 2020
280e898
Fixed putting shapes out of canvas
bsekachev Feb 28, 2020
66248a1
Improved drawing
bsekachev Feb 28, 2020
a5fa306
Removed extra event handler
bsekachev Feb 28, 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
Prev Previous commit
Next Next commit
Reset zoom for tasks with images
  • Loading branch information
@bsekachev
bsekachev committed Feb 28, 2020
commit ed59bd5cd45970359affc48e45b7dd883a70f740
12 changes: 12 additions & 0 deletions cvat-ui/src/reducers/settings-reducer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import { AnyAction } from 'redux';
import { SettingsActionTypes } from 'actions/settings-actions';
import { AnnotationActionTypes } from 'actions/annotation-actions';

import {
SettingsState,
Expand Down Expand Up @@ -213,6 +214,17 @@ export default (state = defaultState, action: AnyAction): SettingsState => {
},
};
}
case AnnotationActionTypes.GET_JOB_SUCCESS: {
const { job } = action.payload;

return {
...state,
player: {
...state.player,
resetZoom: job && job.task.mode === 'annotation',
},
};
}
default: {
return state;
}
Expand Down