Merge pull request #2443 from openvinotoolkit/bs/fixed_issue_2174

Fixed: Reset zoom option doesn't work in tag annotation mode
cvat-ai · Nov 17, 2020 · f0d99ee · f0d99ee
2 parents eef5a41 + 0015d51
commit f0d99ee
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -31,6 +31,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Wrong attribute can be removed in labels editor (<https://github.com/openvinotoolkit/cvat/pull/2436>)
 - UI fails with the error "Cannot read property 'label' of undefined" (<https://github.com/openvinotoolkit/cvat/pull/2442>)
 - Exception: "Value must be a user instance" (<https://github.com/openvinotoolkit/cvat/pull/2441>)
+- Reset zoom option doesn't work in tag annotation mode (<https://github.com/openvinotoolkit/cvat/pull/2443>)
 
 ### Security
 

diff --git a/cvat-ui/package-lock.json b/cvat-ui/package-lock.json
diff --git a/cvat-ui/package.json b/cvat-ui/package.json
@@ -1,6 +1,6 @@
 {
  "name": "cvat-ui",
- "version": "1.10.4",
+ "version": "1.10.5",
  "description": "CVAT single-page application",
  "main": "src/index.tsx",
  "scripts": {

diff --git a/cvat-ui/src/components/annotation-page/standard-workspace/canvas-wrapper.tsx b/cvat-ui/src/components/annotation-page/standard-workspace/canvas-wrapper.tsx
@@ -10,7 +10,9 @@ import Icon from 'antd/lib/icon';
 import Layout from 'antd/lib/layout/layout';
 import Slider, { SliderValue } from 'antd/lib/slider';
 
-import { ColorBy, GridColor, ObjectType, ContextMenuType, Workspace, ShapeType } from 'reducers/interfaces';
+import {
+ ColorBy, GridColor, ObjectType, ContextMenuType, Workspace, ShapeType,
+} from 'reducers/interfaces';
 import { LogType } from 'cvat-logger';
 import { Canvas } from 'cvat-canvas-wrapper';
 import getCore from 'cvat-core-wrapper';
@@ -217,10 +219,7 @@ export default class CanvasWrapperComponent extends React.PureComponent<Props> {
  this.updateCanvas();
  }
 
- if (
- prevProps.frame !== frameData.number &&
- ((resetZoom && workspace !== Workspace.ATTRIBUTE_ANNOTATION) || workspace === Workspace.TAG_ANNOTATION)
- ) {
+ if (prevProps.frame !== frameData.number && resetZoom && workspace !== Workspace.ATTRIBUTE_ANNOTATION) {
  canvasInstance.html().addEventListener(
  'canvas.setup',
  () => {
@@ -304,7 +303,9 @@ export default class CanvasWrapperComponent extends React.PureComponent<Props> {
  }
 
  private onCanvasShapeDrawn = (event: any): void => {
- const { jobInstance, activeLabelID, activeObjectType, frame, onShapeDrawn, onCreateAnnotations } = this.props;
+ const {
+ jobInstance, activeLabelID, activeObjectType, frame, onShapeDrawn, onCreateAnnotations,
+ } = this.props;
 
  if (!event.detail.continue) {
  onShapeDrawn();
@@ -327,7 +328,9 @@ export default class CanvasWrapperComponent extends React.PureComponent<Props> {
  };
 
  private onCanvasObjectsMerged = (event: any): void => {
- const { jobInstance, frame, onMergeAnnotations, onMergeObjects } = this.props;
+ const {
+ jobInstance, frame, onMergeAnnotations, onMergeObjects,
+ } = this.props;
 
  onMergeObjects(false);
 
@@ -340,7 +343,9 @@ export default class CanvasWrapperComponent extends React.PureComponent<Props> {
  };
 
  private onCanvasObjectsGroupped = (event: any): void => {
- const { jobInstance, frame, onGroupAnnotations, onGroupObjects } = this.props;
+ const {
+ jobInstance, frame, onGroupAnnotations, onGroupObjects,
+ } = this.props;
 
  onGroupObjects(false);
 
@@ -349,7 +354,9 @@ export default class CanvasWrapperComponent extends React.PureComponent<Props> {
  };
 
  private onCanvasTrackSplitted = (event: any): void => {
- const { jobInstance, frame, onSplitAnnotations, onSplitTrack } = this.props;
+ const {
+ jobInstance, frame, onSplitAnnotations, onSplitTrack,
+ } = this.props;
 
  onSplitTrack(false);
 
@@ -429,7 +436,9 @@ export default class CanvasWrapperComponent extends React.PureComponent<Props> {
  };
 
  private onCanvasCursorMoved = async (event: any): Promise<void> => {
- const { jobInstance, activatedStateID, workspace, onActivateObject } = this.props;
+ const {
+ jobInstance, activatedStateID, workspace, onActivateObject,
+ } = this.props;
 
  if (workspace !== Workspace.STANDARD) {
  return;
@@ -560,7 +569,9 @@ export default class CanvasWrapperComponent extends React.PureComponent<Props> {
  }
 
  private updateShapesView(): void {
- const { annotations, opacity, colorBy, outlined, outlineColor } = this.props;
+ const {
+ annotations, opacity, colorBy, outlined, outlineColor,
+ } = this.props;
 
  for (const state of annotations) {
  let shapeColor = '';
@@ -588,7 +599,9 @@ export default class CanvasWrapperComponent extends React.PureComponent<Props> {
  }
 
  private updateCanvas(): void {
- const { curZLayer, annotations, frameData, canvasInstance } = this.props;
+ const {
+ curZLayer, annotations, frameData, canvasInstance,
+ } = this.props;
 
  if (frameData !== null) {
  canvasInstance.setup(