Bug fixes and tracking feature improvement

cvat-canvas/src/typescript/canvas.ts

@@ -56,6 +56,9 @@ interface Canvas {
 
     mode(): Mode;
     cancel(): void;
+    // EDITED FOR USER STORY 12/13
+    trackObject(enable: boolean, objectID: number | null): void;
+    // EDITED END
     configure(configuration: Configuration): void;
 }
 
@@ -74,6 +77,12 @@ class CanvasImpl implements Canvas {
         return this.view.html();
     }
 
+    // EDITED FOR USER STORY 12/13
+    public trackObject(enable: boolean, objectID: number | null): void {
+        this.model.trackObject(enable, objectID);
+    }
+    // EDITED END
+
     public setZLayer(zLayer: number | null): void {
         this.model.setZLayer(zLayer);
     }

cvat-canvas/src/typescript/canvasController.ts

@@ -37,6 +37,8 @@ export interface CanvasController {
     drag(x: number, y: number): void;
     disableDrag(): void;
     fit(): void;
+
+    trackingElement: any; // EDITED FOR USER STORY 12/13
 }
 
 export class CanvasControllerImpl implements CanvasController {
@@ -147,4 +149,14 @@ export class CanvasControllerImpl implements CanvasController {
     public get mode(): Mode {
         return this.model.mode;
     }
+
+    // EDITED FOR USER STORY 12/13
+    public set trackingElement(value: any) {
+        this.model.trackingElement = value;
+    }
+
+    public get trackingElement(): any {
+        return this.model.trackingElement;
+    }
+    // EDITED END
 }

cvat-canvas/src/typescript/canvasModel.ts

@@ -107,6 +107,7 @@ export enum UpdateReasons {
     DRAG_CANVAS = 'drag_canvas',
     ZOOM_CANVAS = 'zoom_canvas',
     CONFIG_UPDATED = 'config_updated',
+    SWITCH_TRACKING = 'SWITCH_TRACKING', // EDITED START FOR USER STORY 12/13
 }
 
 export enum Mode {
@@ -163,6 +164,12 @@ export interface CanvasModel {
 
     configure(configuration: Configuration): void;
     cancel(): void;
+
+
+    // EDITED FOR USER STORY 12/13
+    trackObject(enable: boolean, trackedStateID: number | null): void;
+    trackingElement: any;
+    // EDITED END
 }
 
 export class CanvasModelImpl extends MasterImpl implements CanvasModel {
@@ -189,6 +196,24 @@ export class CanvasModelImpl extends MasterImpl implements CanvasModel {
         splitData: SplitData;
         selected: any;
         mode: Mode;
+        // EDITED START FOR USER STORY 12/13
+        trackingElement: {
+            enable: boolean;
+            trackID: number | null;
+            mousecoords: any[];
+            scalemode: number;
+            trackrect: any | null;
+            trackedStates: any[];
+            trackedframes: any[];
+            trackedcentroids: any[];
+            trackedwidthheight: any[];
+            interpolatekeyframes: any[];
+            frameindex: {
+                frame: number | null;
+                index: number | null;
+            }
+        }
+        // EDITED END
     };
 
     public constructor() {
@@ -244,9 +269,56 @@ export class CanvasModelImpl extends MasterImpl implements CanvasModel {
             },
             selected: null,
             mode: Mode.IDLE,
+
+            // EDITED START FOR USER STORY 12/13
+            trackingElement: {
+                enable: false,
+                trackID: null,
+                trackrect: null,
+                mousecoords: [],
+                scalemode: 0,
+                trackedStates: [],
+                trackedframes: [],
+                trackedcentroids: [],
+                trackedwidthheight: [],
+                interpolatekeyframes: [],
+                frameindex: {
+                    frame: null,
+                    index: null,
+                }
+            }
+            // EDITED END
         };
     }
 
+    // EDITED FOR USER STORY 12/13
+    public trackObject(enable: boolean, trackedStateID: number | null): void {
+        if (enable) {
+            this.trackingElement.enable = true;
+            this.data.trackingElement.trackID = trackedStateID;
+        } else {
+            this.data.trackingElement = {
+                enable: false,
+                trackID: null,
+                mousecoords: this.data.trackingElement.mousecoords,
+                scalemode: 0,
+                trackrect: this.data.trackingElement.trackrect,
+                trackedStates: [],
+                trackedframes: [],
+                trackedcentroids: [],
+                trackedwidthheight: [],
+                interpolatekeyframes: [],
+                frameindex: {
+                    frame: null,
+                    index: null,
+                }
+            }
+        }
+
+        this.notify(UpdateReasons.SWITCH_TRACKING);
+    }
+    // EDITED END
+
     public setZLayer(zLayer: number | null): void {
         this.data.zLayer = zLayer;
         this.notify(UpdateReasons.SET_Z_LAYER);
@@ -631,4 +703,14 @@ export class CanvasModelImpl extends MasterImpl implements CanvasModel {
     public get mode(): Mode {
         return this.data.mode;
     }
+
+    // EDITED FOR USER STORY 12/13
+    public set trackingElement(value: any) {
+        this.data.trackingElement = value;
+    }
+
+    public get trackingElement(): any {
+        return this.data.trackingElement;
+    }
+    // EDITED END
 }