Adjusted initial camera position, enabled 'Reset zoom' option for 3D …

…canvas (#5395)
cvat-ai · Dec 1, 2022 · 772f0cd · 772f0cd
1 parent 01fec6f
commit 772f0cd
Show file tree

Hide file tree

Showing 11 changed files with 194 additions and 186 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -27,6 +27,7 @@ from online detectors & interactors) (<https://github.com/opencv/cvat/pull/4543>
 - 3D canvas now can be dragged in IDLE mode (<https://github.com/opencv/cvat/pull/5385>)
 - Datumaro version is upgraded to 0.3 (dev) (<https://github.com/opencv/cvat/pull/4984>)
 - Allowed trailing slashes in the SDK host address (<https://github.com/opencv/cvat/pull/5057>)
+- Adjusted initial camera position, enabled 'Reset zoom' option for 3D canvas (<https://github.com/opencv/cvat/pull/5395>)
 - Enabled authentication via email (<https://github.com/opencv/cvat/pull/5037>)
 
 ### Deprecated

diff --git a/cvat-canvas3d/package.json b/cvat-canvas3d/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cvat-canvas3d",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "Part of Computer Vision Annotation Tool which presents its canvas3D library",
   "main": "src/canvas3d.ts",
   "scripts": {

diff --git a/cvat-canvas3d/src/typescript/canvas3d.ts b/cvat-canvas3d/src/typescript/canvas3d.ts
@@ -1,4 +1,5 @@
 // Copyright (C) 2021-2022 Intel Corporation
+// Copyright (C) 2022 CVAT.ai Corporation
 //
 // SPDX-License-Identifier: MIT
 
@@ -13,6 +14,7 @@ import {
     MouseInteraction,
     ShapeProperties,
     GroupData,
+    Configuration,
 } from './canvas3dModel';
 import {
     Canvas3dView, Canvas3dViewImpl, ViewsDOM, CameraAction,
@@ -94,6 +96,10 @@ class Canvas3dImpl implements Canvas3d {
         this.model.configureShapes(shapeProperties);
     }
 
+    public configure(configuration: Configuration): void {
+        this.model.configure(configuration);
+    }
+
     public activate(clientID: number | null, attributeID: number | null = null): void {
         this.model.activate(String(clientID), attributeID);
     }

diff --git a/cvat-canvas3d/src/typescript/canvas3dController.ts b/cvat-canvas3d/src/typescript/canvas3dController.ts
@@ -1,9 +1,10 @@
 // Copyright (C) 2021-2022 Intel Corporation
+// Copyright (C) 2022 CVAT.ai Corporation
 //
 // SPDX-License-Identifier: MIT
 
 import {
-    Canvas3dModel, Mode, DrawData, ActiveElement, FocusData, GroupData,
+    Canvas3dModel, Mode, DrawData, ActiveElement, FocusData, GroupData, Configuration,
 } from './canvas3dModel';
 
 export interface Canvas3dController {
@@ -12,6 +13,7 @@ export interface Canvas3dController {
     readonly selected: any;
     readonly focused: FocusData;
     readonly groupData: GroupData;
+    readonly configuration: Configuration;
     readonly imageIsDeleted: boolean;
     mode: Mode;
     group(groupData: GroupData): void;
@@ -56,6 +58,10 @@ export class Canvas3dControllerImpl implements Canvas3dController {
         return this.model.groupData;
     }
 
+    public get configuration(): Configuration {
+        return this.model.configuration;
+    }
+
     public group(groupData: GroupData): void {
         this.model.group(groupData);
     }

diff --git a/cvat-canvas3d/src/typescript/canvas3dModel.ts b/cvat-canvas3d/src/typescript/canvas3dModel.ts
@@ -1,4 +1,5 @@
 // Copyright (C) 2021-2022 Intel Corporation
+// Copyright (C) 2022 CVAT.ai Corporation
 //
 // SPDX-License-Identifier: MIT
 
@@ -19,6 +20,10 @@ export interface GroupData {
     grouped?: [];
 }
 
+export interface Configuration {
+    resetZoom?: boolean;
+}
+
 export interface Image {
     renderWidth: number;
     renderHeight: number;
@@ -80,6 +85,7 @@ export enum UpdateReasons {
     SHAPE_ACTIVATED = 'shape_activated',
     GROUP = 'group',
     FITTED_CANVAS = 'fitted_canvas',
+    CONFIG_UPDATED = 'config_updated',
 }
 
 export enum Mode {
@@ -112,20 +118,23 @@ export interface Canvas3dDataModel {
     selected: any;
     shapeProperties: ShapeProperties;
     groupData: GroupData;
+    configuration: Configuration;
 }
 
 export interface Canvas3dModel {
     mode: Mode;
     data: Canvas3dDataModel;
     readonly imageIsDeleted: boolean;
     readonly groupData: GroupData;
+    readonly configuration: Configuration;
     setup(frameData: any, objectStates: any[]): void;
     isAbleToChangeFrame(): boolean;
     draw(drawData: DrawData): void;
     cancel(): void;
     dragCanvas(enable: boolean): void;
     activate(clientID: string | null, attributeID: number | null): void;
     configureShapes(shapeProperties: any): void;
+    configure(configuration: Configuration): void;
     fit(): void;
     group(groupData: GroupData): void;
     destroy(): void;
@@ -177,6 +186,9 @@ export class Canvas3dModelImpl extends MasterImpl implements Canvas3dModel {
                 selectedOpacity: 60,
                 colorBy: 'Label',
             },
+            configuration: {
+                resetZoom: false,
+            },
         };
     }
 
@@ -327,6 +339,14 @@ export class Canvas3dModelImpl extends MasterImpl implements Canvas3dModel {
         this.notify(UpdateReasons.GROUP);
     }
 
+    public configure(configuration: Configuration): void {
+        if (typeof configuration.resetZoom === 'boolean') {
+            this.data.configuration.resetZoom = configuration.resetZoom;
+        }
+
+        this.notify(UpdateReasons.CONFIG_UPDATED);
+    }
+
     public configureShapes(shapeProperties: ShapeProperties): void {
         this.data.drawData.enabled = false;
         this.data.mode = Mode.IDLE;
@@ -341,6 +361,10 @@ export class Canvas3dModelImpl extends MasterImpl implements Canvas3dModel {
         this.notify(UpdateReasons.FITTED_CANVAS);
     }
 
+    public get configuration(): Configuration {
+        return { ...this.data.configuration };
+    }
+
     public get groupData(): GroupData {
         return { ...this.data.groupData };
     }