From 037a68d7e6b721cb5928d0eb379162fab082a10c Mon Sep 17 00:00:00 2001
From: Boris Sekachev <40690378+bsekachev@users.noreply.github.com>
Date: Thu, 24 Jan 2019 16:28:12 +0300
Subject: [PATCH] Propagate setup on the bottom panel (#294)

* Minor fixes
* Added migration for Git
* Updated changelog
---
 CHANGELOG.md                                  |  3 ++-
 cvat/apps/engine/static/engine/js/logger.js   |  4 ++++
 cvat/apps/engine/static/engine/js/player.js   |  1 +
 .../engine/static/engine/js/shapeBuffer.js    |  1 +
 .../engine/templates/engine/annotation.html   | 24 +++++++++----------
 .../git/migrations/0002_auto_20190123_1305.py | 19 +++++++++++++++
 6 files changed, 38 insertions(+), 14 deletions(-)
 create mode 100644 cvat/apps/git/migrations/0002_auto_20190123_1305.py

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b8bdd976..0b271c00 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - OpenVINO auto annotation: it is possible to upload a custom model and annotate images automatically.
 
 ### Changed
--
+- Propagation setup has been moved from settings to bottom player panel
+- Additional events like "Debug Info" or "Fit Image" have been added for analitics
 
 ### Deprecated
 -
diff --git a/cvat/apps/engine/static/engine/js/logger.js b/cvat/apps/engine/static/engine/js/logger.js
index a2ca5185..57f28cf4 100644
--- a/cvat/apps/engine/static/engine/js/logger.js
+++ b/cvat/apps/engine/static/engine/js/logger.js
@@ -354,7 +354,10 @@ var Logger = {
         sendException: 22,
         // dumped as "Change frame". There are no additional required fields.
         changeFrame: 23,
+        // dumped as "Debug info". There are no additional required fields.
         debugInfo: 24,
+        // dumped as "Fit image". There are no additional required fields.
+        fitImage: 25,
     },
 
     /**
@@ -517,6 +520,7 @@ var Logger = {
         case this.EventType.sendException: return 'Send exception';
         case this.EventType.changeFrame: return 'Change frame';
         case this.EventType.debugInfo: return 'Debug info';
+        case this.EventType.fitImage: return 'Fit image';
         default: return 'Unknown';
         }
     },
diff --git a/cvat/apps/engine/static/engine/js/player.js b/cvat/apps/engine/static/engine/js/player.js
index 2f445647..191a22a8 100644
--- a/cvat/apps/engine/static/engine/js/player.js
+++ b/cvat/apps/engine/static/engine/js/player.js
@@ -493,6 +493,7 @@ class PlayerController {
     }
 
     fit() {
+        Logger.addEvent(Logger.EventType.fitImage)
         this._model.fit();
     }
 
diff --git a/cvat/apps/engine/static/engine/js/shapeBuffer.js b/cvat/apps/engine/static/engine/js/shapeBuffer.js
index 6c554b94..c7f58991 100644
--- a/cvat/apps/engine/static/engine/js/shapeBuffer.js
+++ b/cvat/apps/engine/static/engine/js/shapeBuffer.js
@@ -281,6 +281,7 @@ class ShapeBufferController {
             let propagateDialogShowed = false;
             let propagateHandler = Logger.shortkeyLogDecorator(function() {
                 if (!propagateDialogShowed) {
+                    blurAllElements();
                     if (this._model.copyToBuffer()) {
                         let curFrame = window.cvat.player.frames.current;
                         let startFrame = window.cvat.player.frames.start;
diff --git a/cvat/apps/engine/templates/engine/annotation.html b/cvat/apps/engine/templates/engine/annotation.html
index 55798e05..3fd53602 100644
--- a/cvat/apps/engine/templates/engine/annotation.html
+++ b/cvat/apps/engine/templates/engine/annotation.html
@@ -132,19 +132,21 @@
             <input type = "range" id = "playerProgress"/>
         </div>  <!-- END of PLAYER PANEL -->
         <div style="margin-top: 20px">
-            <button id="menuButton" class="regular h1"> Open Menu </button>
-            <label class="regular h1" style="margin-left: 50px"> Filter: </label>
+            <button id="menuButton" class="regular h2"> Open Menu </button>
+            <label class="regular h2" style="margin-left: 50px"> Filter: </label>
             <datalist id="filterSubmitList" style="display: none;"> </datalist>
             <input type="text" list="filterSubmitList" id="filterInputString" class="regular h2" placeholder='car[attr/model=/"mazda"'/>
-            <button id="resetFilterButton" class="regular h1"> Reset </button>
-            <button class="regular h1" id="undoButton" disabled> &#x27F2; </button>
+            <button id="resetFilterButton" class="regular h2"> Reset </button>
+            <button class="regular h2" id="undoButton" disabled> &#x27F2; </button>
             <select size="2" class="regular" style="overflow: hidden; width: 15%; top: 0.5em; position: relative;" disabled>
                 <option id="lastUndoText" title="Undo Action" selected> None </option>
                 <option id="lastRedoText" title="Redo Action"> None </option>
             </select>
-            <button class="regular h1" id="redoButton" disabled> &#10227; </button>
+            <button class="regular h2" id="redoButton" disabled> &#10227; </button>
+            <label class="regular h2" style="margin-left: 15px;"> Propagation: </label>
+            <input type ="number" id="propagateFramesInput" style="width: 3em" min="1" max="10000" value="50" class="regular h2"/>
             <div style="float: right;">
-                <label class="regular h1"> Frame </label>
+                <label class="regular h2"> Frame </label>
                 <input class="regular h2" style="width: 3.5em;" type="number" id="frameNumber">
             </div>
             <hr>
@@ -263,15 +265,15 @@
                         </td>
                     </tr>
                     <tr>
-                        <td> <label class="regular h2" for="playerBrightnessRange"> Brightness: </label> </td>
+                        <td> <label for="playerBrightnessRange"> Brightness: </label> </td>
                         <td> <input type="range" min="50" max="200" value="100" id="playerBrightnessRange"> </td>
                     </tr>
                     <tr>
-                        <td> <label class="regular h2" for="playerContrastRange"> Contrast: </label> </td>
+                        <td> <label for="playerContrastRange"> Contrast: </label> </td>
                         <td> <input type="range" min="50" max="200" value="100" id="playerContrastRange"> </td>
                     </tr>
                     <tr>
-                        <td> <label class="regular h2" for="playerSaturationRange"> Saturation: </label> </td>
+                        <td> <label for="playerSaturationRange"> Saturation: </label> </td>
                         <td> <input type="range" min="0" max="300" value="100" id="playerSaturationRange"> </td>
                     </tr>
                     <tr>
@@ -301,10 +303,6 @@
                         <td> <label> Auto Saving Interval (Min) </label> </td>
                         <td> <input type = "number"  id="autoSaveTime" style="width: 3em" min="5" max="60" value="15" class="regular h2"/> </td>
                     </tr>
-                    <tr>
-                        <td> <label> Propagate Frames </label> </td>
-                        <td> <input type = "number" id="propagateFramesInput" style="width: 3em" min="1" max="10000" value="50" class="regular h2"/> </td>
-                    </tr>
                 </table>
             </div>
 
diff --git a/cvat/apps/git/migrations/0002_auto_20190123_1305.py b/cvat/apps/git/migrations/0002_auto_20190123_1305.py
new file mode 100644
index 00000000..f7156064
--- /dev/null
+++ b/cvat/apps/git/migrations/0002_auto_20190123_1305.py
@@ -0,0 +1,19 @@
+# Generated by Django 2.1.3 on 2019-01-23 10:05
+
+import cvat.apps.git.models
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('git', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='gitdata',
+            name='status',
+            field=models.CharField(default=cvat.apps.git.models.GitStatusChoice('!sync'), max_length=20),
+        ),
+    ]