Fixed: invisible text in case when frame fully fitted in player and b…

…b is full frame
cvat-ai · Nov 21, 2018 · d655d85 · d655d85
1 parent 9440de2
commit d655d85
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/cvat/apps/engine/static/engine/js/coordinateTranslator.js b/cvat/apps/engine/static/engine/js/coordinateTranslator.js
@@ -76,6 +76,13 @@ class CoordinateTranslator {
                 pt.y = clientY;
                 pt = pt.matrixTransform(targetCanvas.getScreenCTM().inverse());
                 return pt;
+            },
+            canvasToClient: function(sourceCanvas, canvasX, canvasY) {
+                let pt = sourceCanvas.createSVGPoint();
+                pt.x = canvasX;
+                pt.y = canvasY;
+                pt = pt.matrixTransform(sourceCanvas.getScreenCTM());
+                return pt;
             }
         };
     }

diff --git a/cvat/apps/engine/static/engine/js/shapes.js b/cvat/apps/engine/static/engine/js/shapes.js
@@ -1431,6 +1431,8 @@ class ShapeView extends Listener {
         this._shapeContextMenu = $('#shapeContextMenu');
         this._pointContextMenu = $('#pointContextMenu');
 
+        this._rightBorderFrame = $('#playerFrame')[0].offsetWidth;
+
         shapeModel.subscribe(this);
     }
 
@@ -2444,10 +2446,17 @@ class ShapeView extends Listener {
             if (this._uis.text && this._uis.text.node.parentElement) {
                 let revscale = 1 / scale;
                 let shapeBBox = this._uis.shape.node.getBBox();
+                let textBBox = this._uis.text.node.getBBox()
 
-                let x = shapeBBox.x + shapeBBox.width + TEXT_MARGIN;
+                let x = shapeBBox.x + shapeBBox.width + TEXT_MARGIN * revscale;
                 let y = shapeBBox.y;
 
+                let transl = window.cvat.translate.point;
+                let canvas = this._scenes.svg.node;
+                if (transl.canvasToClient(canvas, x + textBBox.width * revscale, 0).x > this._rightBorderFrame) {
+                    x = shapeBBox.x + TEXT_MARGIN * revscale;
+                }
+
                 this._uis.text.move(x / revscale, y / revscale);
                 this._uis.text.attr('transform', `scale(${revscale})`);