Fixed AAM bug: #1750

cvat-ai · Jun 19, 2020 · 4065bb3 · 4065bb3
1 parent 4047df9
commit 4065bb3
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/...ribute-annotation-workspace/attribute-annotation-sidebar/attribute-annotation-sidebar.tsx b/...ribute-annotation-workspace/attribute-annotation-sidebar/attribute-annotation-sidebar.tsx
@@ -35,6 +35,7 @@ interface StateToProps {
     jobInstance: any;
     keyMap: Record<string, ExtendedKeyMapOptions>;
     normalizedKeyMap: Record<string, string>;
+    canvasIsReady: boolean;
 }
 
 interface DispatchToProps {
@@ -58,6 +59,9 @@ function mapStateToProps(state: CombinedState): StateToProps {
                 instance: jobInstance,
                 labels,
             },
+            canvas: {
+                ready: canvasIsReady,
+            },
         },
         shortcuts: {
             keyMap,
@@ -73,6 +77,7 @@ function mapStateToProps(state: CombinedState): StateToProps {
         states,
         keyMap,
         normalizedKeyMap,
+        canvasIsReady,
     };
 }
 
@@ -98,6 +103,7 @@ function AttributeAnnotationSidebar(props: StateToProps & DispatchToProps): JSX.
         activateObject,
         keyMap,
         normalizedKeyMap,
+        canvasIsReady,
     } = props;
 
     const [labelAttrMap, setLabelAttrMap] = useState(
@@ -117,14 +123,16 @@ function AttributeAnnotationSidebar(props: StateToProps & DispatchToProps): JSX.
         ? labelAttrMap[activeObjectState.label.id]
         : null;
 
-    if (activeObjectState) {
-        const attribute = labelAttrMap[activeObjectState.label.id];
-        if (attribute && attribute.id !== activatedAttributeID) {
-            activateObject(activatedStateID, attribute ? attribute.id : null);
+    if (canvasIsReady) {
+        if (activeObjectState) {
+            const attribute = labelAttrMap[activeObjectState.label.id];
+            if (attribute && attribute.id !== activatedAttributeID) {
+                activateObject(activatedStateID, attribute ? attribute.id : null);
+            }
+        } else if (states.length) {
+            const attribute = labelAttrMap[states[0].label.id];
+            activateObject(states[0].clientID, attribute ? attribute.id : null);
         }
-    } else if (states.length) {
-        const attribute = labelAttrMap[states[0].label.id];
-        activateObject(states[0].clientID, attribute ? attribute.id : null);
     }
 
     const nextObject = (step: number): void => {

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
@@ -618,14 +618,12 @@ export default class CanvasWrapperComponent extends React.PureComponent<Props> {
         const {
             annotations,
             frameData,
-            frameAngle,
             canvasInstance,
         } = this.props;
 
         if (frameData !== null) {
             canvasInstance.setup(frameData, annotations
                 .filter((e) => e.objectType !== ObjectType.TAG));
-            canvasInstance.rotate(frameAngle);
         }
     }