| - |
-
-
-
-
- |
-
+
+
+
- {% autopaginate data %}
-
+
+
+
+
+
+
+
+
+
- {% for item in data %}
- {% include "dashboard/task.html" %}
- {% endfor %}
+ {% paginate %}
+
-
@@ -110,14 +108,6 @@ Example: @select=race:__undefined__,skip,asian,black,caucasian,other'/>
-
-
-
-
-
-
-
-
@@ -164,20 +154,20 @@ Example: @select=race:__undefined__,skip,asian,black,caucasian,other'/>
-
-
-
+
-
-
+
+
-
+
@@ -186,14 +176,16 @@ Example: @select=race:__undefined__,skip,asian,black,caucasian,other'/>
- ', views.create),
+ path('cancel/', views.cancel),
+ path('check/', views.check)
+]
\ No newline at end of file
diff --git a/cvat/apps/dextr_segmentation/views.py b/cvat/apps/dextr_segmentation/views.py
new file mode 100644
index 00000000..0a837b3a
--- /dev/null
+++ b/cvat/apps/dextr_segmentation/views.py
@@ -0,0 +1,127 @@
+# Copyright (C) 2018 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+
+from django.http import HttpResponse, HttpResponseBadRequest, JsonResponse
+from cvat.apps.authentication.decorators import login_required
+from rules.contrib.views import permission_required, objectgetter
+
+from cvat.apps.engine.models import Job
+from cvat.apps.engine.log import slogger
+from cvat.apps.dextr_segmentation.dextr import DEXTR_HANDLER
+
+import django_rq
+import json
+import os
+import rq
+
+__RQ_QUEUE_NAME = "default"
+__DEXTR_HANDLER = DEXTR_HANDLER()
+
+def _dextr_thread(im_path, points):
+ job = rq.get_current_job()
+ job.meta["result"] = __DEXTR_HANDLER.handle(im_path, points)
+ job.save_meta()
+
+
+@login_required
+@permission_required(perm=["engine.job.change"],
+ fn=objectgetter(Job, "jid"), raise_exception=True)
+def create(request, jid):
+ try:
+ data = json.loads(request.body.decode("utf-8"))
+
+ points = data["points"]
+ frame = int(data["frame"])
+ username = request.user.username
+
+ slogger.job[jid].info("create dextr request for the JOB: {} ".format(jid)
+ + "by the USER: {} on the FRAME: {}".format(username, frame))
+
+ db_task = Job.objects.select_related("segment__task").get(id=jid).segment.task
+ im_path = os.path.realpath(db_task.get_frame_path(frame))
+
+ queue = django_rq.get_queue(__RQ_QUEUE_NAME)
+ rq_id = "dextr.create/{}/{}".format(jid, username)
+ job = queue.fetch_job(rq_id)
+
+ if job is not None and (job.is_started or job.is_queued):
+ if "cancel" not in job.meta:
+ raise Exception("Segmentation process has been already run for the " +
+ "JOB: {} and the USER: {}".format(jid, username))
+ else:
+ job.delete()
+
+ queue.enqueue_call(func=_dextr_thread,
+ args=(im_path, points),
+ job_id=rq_id,
+ timeout=15,
+ ttl=30)
+
+ return HttpResponse()
+ except Exception as ex:
+ slogger.job[jid].error("can't create a dextr request for the job {}".format(jid), exc_info=True)
+ return HttpResponseBadRequest(str(ex))
+
+
+@login_required
+@permission_required(perm=["engine.job.change"],
+ fn=objectgetter(Job, "jid"), raise_exception=True)
+def cancel(request, jid):
+ try:
+ username = request.user.username
+ slogger.job[jid].info("cancel dextr request for the JOB: {} ".format(jid)
+ + "by the USER: {}".format(username))
+
+ queue = django_rq.get_queue(__RQ_QUEUE_NAME)
+ rq_id = "dextr.create/{}/{}".format(jid, username)
+ job = queue.fetch_job(rq_id)
+
+ if job is None or job.is_finished or job.is_failed:
+ raise Exception("Segmentation isn't running now")
+ elif "cancel" not in job.meta:
+ job.meta["cancel"] = True
+ job.save_meta()
+
+ return HttpResponse()
+ except Exception as ex:
+ slogger.job[jid].error("can't cancel a dextr request for the job {}".format(jid), exc_info=True)
+ return HttpResponseBadRequest(str(ex))
+
+
+@login_required
+@permission_required(perm=["engine.job.change"],
+ fn=objectgetter(Job, "jid"), raise_exception=True)
+def check(request, jid):
+ try:
+ username = request.user.username
+ slogger.job[jid].info("check dextr request for the JOB: {} ".format(jid)
+ + "by the USER: {}".format(username))
+
+ queue = django_rq.get_queue(__RQ_QUEUE_NAME)
+ rq_id = "dextr.create/{}/{}".format(jid, username)
+ job = queue.fetch_job(rq_id)
+ data = {}
+
+ if job is None:
+ data["status"] = "unknown"
+ else:
+ if "cancel" in job.meta:
+ data["status"] = "finished"
+ elif job.is_queued:
+ data["status"] = "queued"
+ elif job.is_started:
+ data["status"] = "started"
+ elif job.is_finished:
+ data["status"] = "finished"
+ data["result"] = job.meta["result"]
+ job.delete()
+ else:
+ data["status"] = "failed"
+ data["stderr"] = job.exc_info
+ job.delete()
+
+ return JsonResponse(data)
+ except Exception as ex:
+ slogger.job[jid].error("can't check a dextr request for the job {}".format(jid), exc_info=True)
+ return HttpResponseBadRequest(str(ex))
diff --git a/cvat/apps/documentation/__init__.py b/cvat/apps/documentation/__init__.py
index 6808b860..74339298 100644
--- a/cvat/apps/documentation/__init__.py
+++ b/cvat/apps/documentation/__init__.py
@@ -5,5 +5,4 @@
from cvat.settings.base import JS_3RDPARTY
-JS_3RDPARTY['dashboard'] = JS_3RDPARTY.get('dashboard', []) + ['documentation/js/shortcuts.js']
-
+JS_3RDPARTY['dashboard'] = JS_3RDPARTY.get('dashboard', []) + ['documentation/js/dashboardPlugin.js']
diff --git a/cvat/apps/documentation/static/documentation/images/gif009.gif b/cvat/apps/documentation/static/documentation/images/gif009.gif
new file mode 100644
index 00000000..48195ba3
Binary files /dev/null and b/cvat/apps/documentation/static/documentation/images/gif009.gif differ
diff --git a/cvat/apps/documentation/static/documentation/images/gif010.gif b/cvat/apps/documentation/static/documentation/images/gif010.gif
new file mode 100644
index 00000000..13edfc59
Binary files /dev/null and b/cvat/apps/documentation/static/documentation/images/gif010.gif differ
diff --git a/cvat/apps/documentation/static/documentation/images/image004.jpg b/cvat/apps/documentation/static/documentation/images/image004.jpg
index fd041067..8622bd77 100644
Binary files a/cvat/apps/documentation/static/documentation/images/image004.jpg and b/cvat/apps/documentation/static/documentation/images/image004.jpg differ
diff --git a/cvat/apps/documentation/static/documentation/images/image005.jpg b/cvat/apps/documentation/static/documentation/images/image005.jpg
index a6bfd6b3..e5b44d0b 100644
Binary files a/cvat/apps/documentation/static/documentation/images/image005.jpg and b/cvat/apps/documentation/static/documentation/images/image005.jpg differ
diff --git a/cvat/apps/documentation/static/documentation/images/image006.jpg b/cvat/apps/documentation/static/documentation/images/image006.jpg
index 2fed246a..07bc6290 100644
Binary files a/cvat/apps/documentation/static/documentation/images/image006.jpg and b/cvat/apps/documentation/static/documentation/images/image006.jpg differ
diff --git a/cvat/apps/documentation/static/documentation/images/image007.jpg b/cvat/apps/documentation/static/documentation/images/image007.jpg
index 225f716c..e1894957 100644
Binary files a/cvat/apps/documentation/static/documentation/images/image007.jpg and b/cvat/apps/documentation/static/documentation/images/image007.jpg differ
diff --git a/cvat/apps/documentation/static/documentation/images/image008.jpg b/cvat/apps/documentation/static/documentation/images/image008.jpg
index 3dc9171c..623ad018 100644
Binary files a/cvat/apps/documentation/static/documentation/images/image008.jpg and b/cvat/apps/documentation/static/documentation/images/image008.jpg differ
diff --git a/cvat/apps/documentation/static/documentation/images/image015.jpg b/cvat/apps/documentation/static/documentation/images/image015.jpg
index bc8cf7f6..6f924002 100644
Binary files a/cvat/apps/documentation/static/documentation/images/image015.jpg and b/cvat/apps/documentation/static/documentation/images/image015.jpg differ
diff --git a/cvat/apps/documentation/static/documentation/images/image016.jpg b/cvat/apps/documentation/static/documentation/images/image016.jpg
index d2ab2f0d..ef11a630 100644
Binary files a/cvat/apps/documentation/static/documentation/images/image016.jpg and b/cvat/apps/documentation/static/documentation/images/image016.jpg differ
diff --git a/cvat/apps/documentation/static/documentation/images/image017.jpg b/cvat/apps/documentation/static/documentation/images/image017.jpg
index 17fda00a..5ffe3c85 100644
Binary files a/cvat/apps/documentation/static/documentation/images/image017.jpg and b/cvat/apps/documentation/static/documentation/images/image017.jpg differ
diff --git a/cvat/apps/documentation/static/documentation/images/image018.jpg b/cvat/apps/documentation/static/documentation/images/image018.jpg
index 2c946329..0d0b1ecf 100644
Binary files a/cvat/apps/documentation/static/documentation/images/image018.jpg and b/cvat/apps/documentation/static/documentation/images/image018.jpg differ
diff --git a/cvat/apps/documentation/static/documentation/images/image028.jpg b/cvat/apps/documentation/static/documentation/images/image028.jpg
index 0b7ae1df..4dc292b8 100644
Binary files a/cvat/apps/documentation/static/documentation/images/image028.jpg and b/cvat/apps/documentation/static/documentation/images/image028.jpg differ
diff --git a/cvat/apps/documentation/static/documentation/images/image034.jpg b/cvat/apps/documentation/static/documentation/images/image034.jpg
index a526abe9..7c091176 100644
Binary files a/cvat/apps/documentation/static/documentation/images/image034.jpg and b/cvat/apps/documentation/static/documentation/images/image034.jpg differ
diff --git a/cvat/apps/documentation/static/documentation/images/image035.jpg b/cvat/apps/documentation/static/documentation/images/image035.jpg
index f531fc0f..532cd9de 100644
Binary files a/cvat/apps/documentation/static/documentation/images/image035.jpg and b/cvat/apps/documentation/static/documentation/images/image035.jpg differ
diff --git a/cvat/apps/documentation/static/documentation/images/image042.jpg b/cvat/apps/documentation/static/documentation/images/image042.jpg
index a4283154..cbba7176 100644
Binary files a/cvat/apps/documentation/static/documentation/images/image042.jpg and b/cvat/apps/documentation/static/documentation/images/image042.jpg differ
diff --git a/cvat/apps/documentation/static/documentation/images/image051.jpg b/cvat/apps/documentation/static/documentation/images/image051.jpg
index 8f132922..4b333d43 100644
Binary files a/cvat/apps/documentation/static/documentation/images/image051.jpg and b/cvat/apps/documentation/static/documentation/images/image051.jpg differ
diff --git a/cvat/apps/documentation/static/documentation/images/image059.jpg b/cvat/apps/documentation/static/documentation/images/image059.jpg
index c2afc988..873ea766 100644
Binary files a/cvat/apps/documentation/static/documentation/images/image059.jpg and b/cvat/apps/documentation/static/documentation/images/image059.jpg differ
diff --git a/cvat/apps/documentation/static/documentation/images/image066.jpg b/cvat/apps/documentation/static/documentation/images/image066.jpg
index c508ecaa..ce09b52b 100644
Binary files a/cvat/apps/documentation/static/documentation/images/image066.jpg and b/cvat/apps/documentation/static/documentation/images/image066.jpg differ
diff --git a/cvat/apps/documentation/static/documentation/images/image067.jpg b/cvat/apps/documentation/static/documentation/images/image067.jpg
index c0d97047..40384b8e 100644
Binary files a/cvat/apps/documentation/static/documentation/images/image067.jpg and b/cvat/apps/documentation/static/documentation/images/image067.jpg differ
diff --git a/cvat/apps/documentation/static/documentation/images/image068.jpg b/cvat/apps/documentation/static/documentation/images/image068.jpg
index 5812efb7..9d8eae4e 100644
Binary files a/cvat/apps/documentation/static/documentation/images/image068.jpg and b/cvat/apps/documentation/static/documentation/images/image068.jpg differ
diff --git a/cvat/apps/documentation/static/documentation/images/image069.jpg b/cvat/apps/documentation/static/documentation/images/image069.jpg
index df457ac2..23a06f43 100644
Binary files a/cvat/apps/documentation/static/documentation/images/image069.jpg and b/cvat/apps/documentation/static/documentation/images/image069.jpg differ
diff --git a/cvat/apps/documentation/static/documentation/images/image074.jpg b/cvat/apps/documentation/static/documentation/images/image074.jpg
index 1c84a747..72bc9ac7 100644
Binary files a/cvat/apps/documentation/static/documentation/images/image074.jpg and b/cvat/apps/documentation/static/documentation/images/image074.jpg differ
diff --git a/cvat/apps/documentation/static/documentation/images/image077.jpg b/cvat/apps/documentation/static/documentation/images/image077.jpg
index b4b4544a..9cacedd7 100644
Binary files a/cvat/apps/documentation/static/documentation/images/image077.jpg and b/cvat/apps/documentation/static/documentation/images/image077.jpg differ
diff --git a/cvat/apps/documentation/static/documentation/images/image078.jpg b/cvat/apps/documentation/static/documentation/images/image078.jpg
index 6e09ffeb..97bc04ba 100644
Binary files a/cvat/apps/documentation/static/documentation/images/image078.jpg and b/cvat/apps/documentation/static/documentation/images/image078.jpg differ
diff --git a/cvat/apps/documentation/static/documentation/images/image080.jpg b/cvat/apps/documentation/static/documentation/images/image080.jpg
index ca9f783a..5fdbcd87 100644
Binary files a/cvat/apps/documentation/static/documentation/images/image080.jpg and b/cvat/apps/documentation/static/documentation/images/image080.jpg differ
diff --git a/cvat/apps/documentation/static/documentation/images/image084.jpg b/cvat/apps/documentation/static/documentation/images/image084.jpg
index b74ab2b7..6ea0a7e2 100644
Binary files a/cvat/apps/documentation/static/documentation/images/image084.jpg and b/cvat/apps/documentation/static/documentation/images/image084.jpg differ
diff --git a/cvat/apps/documentation/static/documentation/images/image085.jpg b/cvat/apps/documentation/static/documentation/images/image085.jpg
index 2254f3a8..8c26e59c 100644
Binary files a/cvat/apps/documentation/static/documentation/images/image085.jpg and b/cvat/apps/documentation/static/documentation/images/image085.jpg differ
diff --git a/cvat/apps/documentation/static/documentation/images/image099.jpg b/cvat/apps/documentation/static/documentation/images/image099.jpg
new file mode 100644
index 00000000..66bd701d
Binary files /dev/null and b/cvat/apps/documentation/static/documentation/images/image099.jpg differ
diff --git a/cvat/apps/documentation/static/documentation/images/image100.jpg b/cvat/apps/documentation/static/documentation/images/image100.jpg
new file mode 100644
index 00000000..54416612
Binary files /dev/null and b/cvat/apps/documentation/static/documentation/images/image100.jpg differ
diff --git a/cvat/apps/documentation/static/documentation/images/image101.jpg b/cvat/apps/documentation/static/documentation/images/image101.jpg
new file mode 100644
index 00000000..8a16401c
Binary files /dev/null and b/cvat/apps/documentation/static/documentation/images/image101.jpg differ
diff --git a/cvat/apps/documentation/static/documentation/images/image102.jpg b/cvat/apps/documentation/static/documentation/images/image102.jpg
new file mode 100644
index 00000000..c64febc1
Binary files /dev/null and b/cvat/apps/documentation/static/documentation/images/image102.jpg differ
diff --git a/cvat/apps/documentation/static/documentation/images/image103.jpg b/cvat/apps/documentation/static/documentation/images/image103.jpg
new file mode 100644
index 00000000..e377d815
Binary files /dev/null and b/cvat/apps/documentation/static/documentation/images/image103.jpg differ
diff --git a/cvat/apps/documentation/static/documentation/images/image104.jpg b/cvat/apps/documentation/static/documentation/images/image104.jpg
new file mode 100644
index 00000000..4d7778aa
Binary files /dev/null and b/cvat/apps/documentation/static/documentation/images/image104.jpg differ
diff --git a/cvat/apps/documentation/static/documentation/images/image105.jpg b/cvat/apps/documentation/static/documentation/images/image105.jpg
new file mode 100644
index 00000000..3ba5cce5
Binary files /dev/null and b/cvat/apps/documentation/static/documentation/images/image105.jpg differ
diff --git a/cvat/apps/documentation/static/documentation/images/image106.jpg b/cvat/apps/documentation/static/documentation/images/image106.jpg
new file mode 100644
index 00000000..28aacfd8
Binary files /dev/null and b/cvat/apps/documentation/static/documentation/images/image106.jpg differ
diff --git a/cvat/apps/documentation/static/documentation/images/image107.jpg b/cvat/apps/documentation/static/documentation/images/image107.jpg
new file mode 100644
index 00000000..9ecf7b9b
Binary files /dev/null and b/cvat/apps/documentation/static/documentation/images/image107.jpg differ
diff --git a/cvat/apps/documentation/static/documentation/images/image108.jpg b/cvat/apps/documentation/static/documentation/images/image108.jpg
new file mode 100644
index 00000000..9084dbb2
Binary files /dev/null and b/cvat/apps/documentation/static/documentation/images/image108.jpg differ
diff --git a/cvat/apps/documentation/static/documentation/images/image109.jpg b/cvat/apps/documentation/static/documentation/images/image109.jpg
new file mode 100644
index 00000000..7c2f264b
Binary files /dev/null and b/cvat/apps/documentation/static/documentation/images/image109.jpg differ
diff --git a/cvat/apps/documentation/static/documentation/images/image110.jpg b/cvat/apps/documentation/static/documentation/images/image110.jpg
new file mode 100644
index 00000000..7acc86f9
Binary files /dev/null and b/cvat/apps/documentation/static/documentation/images/image110.jpg differ
diff --git a/cvat/apps/documentation/static/documentation/images/image111.jpg b/cvat/apps/documentation/static/documentation/images/image111.jpg
new file mode 100644
index 00000000..71e0b2cf
Binary files /dev/null and b/cvat/apps/documentation/static/documentation/images/image111.jpg differ
diff --git a/cvat/apps/documentation/static/documentation/images/image112.jpg b/cvat/apps/documentation/static/documentation/images/image112.jpg
new file mode 100644
index 00000000..5d2526f6
Binary files /dev/null and b/cvat/apps/documentation/static/documentation/images/image112.jpg differ
diff --git a/cvat/apps/documentation/static/documentation/images/image113.jpg b/cvat/apps/documentation/static/documentation/images/image113.jpg
new file mode 100644
index 00000000..8fe6b35b
Binary files /dev/null and b/cvat/apps/documentation/static/documentation/images/image113.jpg differ
diff --git a/cvat/apps/documentation/static/documentation/images/image114.jpg b/cvat/apps/documentation/static/documentation/images/image114.jpg
new file mode 100644
index 00000000..63f48091
Binary files /dev/null and b/cvat/apps/documentation/static/documentation/images/image114.jpg differ
diff --git a/cvat/apps/documentation/static/documentation/images/image115.jpg b/cvat/apps/documentation/static/documentation/images/image115.jpg
new file mode 100644
index 00000000..9b01c793
Binary files /dev/null and b/cvat/apps/documentation/static/documentation/images/image115.jpg differ
diff --git a/cvat/apps/documentation/static/documentation/js/dashboardPlugin.js b/cvat/apps/documentation/static/documentation/js/dashboardPlugin.js
new file mode 100644
index 00000000..27d7ed8d
--- /dev/null
+++ b/cvat/apps/documentation/static/documentation/js/dashboardPlugin.js
@@ -0,0 +1,11 @@
+/*
+ * Copyright (C) 2018 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+window.addEventListener('DOMContentLoaded', () => {
+ $('').on('click', () => {
+ window.open('/documentation/user_guide.html');
+ }).appendTo('#dashboardManageButtons');
+});
diff --git a/cvat/apps/documentation/static/documentation/js/shortcuts.js b/cvat/apps/documentation/static/documentation/js/shortcuts.js
deleted file mode 100644
index 9b45a8f1..00000000
--- a/cvat/apps/documentation/static/documentation/js/shortcuts.js
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright (C) 2018 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- */
-
-Mousetrap.bind(window.cvat.config.shortkeys["open_help"].value, function() {
- window.open("/documentation/user_guide.html");
-
- return false;
-});
\ No newline at end of file
diff --git a/cvat/apps/documentation/user_guide.md b/cvat/apps/documentation/user_guide.md
index d6d60442..a7fac196 100644
--- a/cvat/apps/documentation/user_guide.md
+++ b/cvat/apps/documentation/user_guide.md
@@ -1,234 +1,460 @@
+- [User's guide](#users-guide)
+ - [Getting started](#getting-started)
+ - [Authorization](#authorization)
+ - [Administration panel](#administration-panel)
+ - [Creating an annotation task](#creating-an-annotation-task)
+ - [Model manager](#model-manager)
+ - [Search](#search)
+ - [Interface of the annotation tool](#interface-of-the-annotation-tool)
+ - [Basic navigation](#basic-navigation)
+ - [Types of shapes (basics)](#types-of-shapes-basics)
+ - [Annotation mode (basics)](#annotation-mode-basics)
+ - [Interpolation mode (basics)](#interpolation-mode-basics)
+ - [Attribute annotation mode (basics)](#attribute-annotation-mode-basics)
+ - [Downloading annotations](#downloading-annotations)
+ - [Task synchronization with a repository](#task-synchronization-with-a-repository)
+ - [Vocabulary](#vocabulary)
+ - [Workspace — Context menu](#workspace--context-menu)
+ - [Settings](#settings)
+ - [Bottom Panel](#bottom-panel)
+ - [Side panel](#side-panel)
+ - [Objects](#objects)
+ - [Labels](#labels)
+ - [Bottom side panel](#bottom-side-panel)
+ - [Fullscreen player mode](#fullscreen-player-mode)
+ - [Annotation mode (advanced)](#annotation-mode-advanced)
+ - [Interpolation mode (advanced)](#interpolation-mode-advanced)
+ - [Attribute annotation mode (advanced)](#attribute-annotation-mode-advanced)
+ - [Annotation with polygons](#annotation-with-polygons)
+ - [Annotation with polylines](#annotation-with-polylines)
+ - [Annotation with points](#annotation-with-points)
+ - [Annotation with Auto Segmentation](#annotation-with-auto-segmentation)
+ - [Shape grouping](#shape-grouping)
+ - [Filter](#filter)
+ - [Analytics](#analytics)
+ - [Shortcuts](#shortcuts)
+ - [Hints](#hints)
+
# User's guide
-Computer Vision Annotation Tool (CVAT) is a web-based tool which helps to annotate video and images for Computer Vision algorithms. It was inspired by [Vatic](http://carlvondrick.com/vatic/) free, online, interactive video annotation tool. CVAT has many powerful features: __interpolation of bounding boxes between key frames, automatic annotation using TensorFlow OD API, shortcuts for most of critical actions, dashboard with a list of annotation tasks, LDAP and basic authorization, etc...__ It was created for and used by a professional data annotation team. UX and UI were optimized especially for computer vision tasks developed by our team.
+Computer Vision Annotation Tool (CVAT) is a web-based tool which helps to
+annotate videos and images for Computer Vision algorithms. It was inspired
+by [Vatic](http://carlvondrick.com/vatic/) free, online, interactive video
+annotation tool. CVAT has many powerful features: _interpolation of bounding
+boxes between key frames, automatic annotation using deep learning models,
+shortcuts for most of critical actions, dashboard with a list of annotation
+tasks, LDAP and basic authorization, etc..._ It was created for and used by
+a professional data annotation team. UX and UI were optimized especially for
+computer vision tasks developed by our team.
## Getting started
### Authorization
-- First of all you have to log in to CVAT tool.
+- First of all, you have to log in to CVAT tool.
-- If you don't have an account you have to create it using the link below the login page.
+- You can register a user but by default it will not have rights even to view
+ list of tasks. Thus you should create a superuser. The superuser can use
+ [Django administration panel](http://localhost:8080/admin) to assign correct
+ groups to the user. Please use the command below to create an admin account:
+
+ ``docker exec -it cvat bash -ic '/usr/bin/python3 ~/manage.py createsuperuser'``
+
+- If you want to create a non-admin account, you can do that using the link below
+ on the login page. Don't forget to modify permissions for the new user in the
+ administration panel. There are several groups (aka roles): admin, user,
+ annotator, observer.
### Administration panel
-Type ``/admin`` in URL to go to the administration panel.
-There you can:
- - Create / edit / delete users
- - Control user's permission and access to the tool.
+Go to the [Django administration panel](http://localhost:8080/admin). There you can:
+- Create / edit / delete users
+- Control permissions of users and access to the tool.
+ 
### Creating an annotation task
-1. Create an annotation task by pressing ``Create New Task`` button on the main page.
+1. Create an annotation task pressing ``Create New Task`` button on the main page.
-2. Specify mandatory parameters of the task. You have to fill ``Name``, ``Labels`` and press ``Select Files`` at least.
+1. Specify mandatory parameters of the task.
+ You have to fill in ``Name``, ``Labels`` and press the ``Select Files`` button.
+ After that you have to choose data you want to annotate.
- __Labels__. Use the following scheme to create labels: ``label_name input_type=attribute_name:attribute_value1,attribute_value2``. You can specify multiple labels and multiple attributes separated by space. Attributes belong to previous label.
+ **Labels**. Use the following layout to create labels:
+ ``label_name input_type=attribute_name:attribute_value1,attribute_value2``.
+ You can specify multiple labels and attributes and divide them pressing the space button.
+ Attributes belong to a previous label.
Example:
- ``vehicle @select=type:__undefined__,car,truck,bus,train ~radio=quality:good,bad ~checkbox=parked:false`` -
one label with multiple attributes
- ``car person bike`` - three labels without attributes
- - ``circle @radio=color:green,red,blue @number=radius:0,10,0.1 line square`` - one label with two attributes and two labels without attributes
+ - ``circle @radio=color:green,red,blue @number=radius:0,10,0.1 line square`` -
+ one label with two attributes and two labels without attributes
- ``label_name``: for example *vehicle, person, face etc.*
+ ``label_name``: for example _vehicle, person, face etc._
````:
- - Use ``@`` for unique attributes which cannot be changed from frame to frame *(e.g. age, gender, color, etc.)*
- - Use ``~`` for temporary attributes which can be changed on any frame *(e.g. quality, pose, truncated, etc.)*
+ - Use ``@`` for unique attributes which cannot be changed from frame to frame _(e.g. age, gender, color, etc.)_
+ - Use ``~`` for temporary attributes which can be changed on any frame _(e.g. quality, pose, truncated, etc.)_
``input_type``: the following input types are available ``select``, ``checkbox``, ``radio``, ``number``, ``text``.
- ``attribute_name``: for example *age, quality, parked*
+ ``attribute_name``: for example, _age, quality, parked_
- ``attribute_value``: for example *middle-age, good, true*
+ ``attribute_value``: for example, _middle-age, good, true_
Default value for an attribute is the first value after "``:``".
- For ``select`` and ``radio`` input types the special value is available: ``__undefined__``. Specify this value first if an attribute should be annotated explicitly.
+ For ``select`` and ``radio`` input types the special value is available: ``__undefined__``.
+ Specify this value first if an attribute should be annotated explicitly.
+
+ **Bug Tracker**. Specify full bug tracker's URL if you have it.
+
+ **Dataset Repository**. URL link of the repository optionally specifies the path to the repository for storage
+ (``default: annotation / .zip``).
+ The .zip and .xml file extension of annotation are supported.
+ Field format: ``URL [PATH]`` example: ``https://github.com/project/repos.git [1/2/3/4/annotation.xml]``
+
+ Supported URL formats :
+ - ``https://github.com/project/repos[.git]``
+ - ``github.com/project/repos[.git]``
+ - ``git@github.com:project/repos[.git]``
+
+ The task will be highlighted in red after creation if annotation isn't synchronized with the repository.
+
+ **Use LFS**. If the annotation file is large, you can create a repository with
+ [LFS](https://git-lfs.github.com/) support.
+
+ **Source**. To create huge tasks please use ``shared`` server directory (choose ``Share`` option in the dialog).
+
+ **Z-Order**. Defines the order on drawn polygons. Check the box for enable layered displaying.
+
+ **Overlap Size**. Use this option to make overlapped segments.
+ The option makes tracks continuous from one segment into another.
+ Use it for interpolation mode. There are several options for using the parameter:
+ - For an interpolation task (video sequence).
+ If you annotate a bounding box on two adjacent segments they will be merged into one bounding box.
+ If overlap equals to zero or annotation is poor on adjacent segments inside a dumped annotation file,
+ you will have several tracks, one for each segment, which corresponds to the object.
+ - For an annotation task (independent images).
+ If an object exists on overlapped segments, the overlap is greater than zero
+ and the annotation is good enough on adjacent segments, it will be automatically merged into one object.
+ If overlap equals to zero or annotation is poor on adjacent segments inside a dumped annotation file,
+ you will have several bounding boxes for the same object.
+ Thus, you annotate an object on the first segment.
+ You annotate the same object on second segment, and if you do it right, you
+ will have one track inside the annotations.
+ If annotations on different segments (on overlapped frames)
+ are very different, you will have two shapes for the same object.
+ This functionality works only for bounding boxes.
+ Polygons, polylines, points don't support automatic merge on overlapped segments
+ even the overlap parameter isn't zero and match between corresponding shapes on adjacent segments is perfect.
+
+ **Segment size**. Use this option to divide a huge dataset into a few smaller segments.
+ For example, one job cannot be annotated by several labelers (it isn't supported).
+ Thus using "segment size" you can create several jobs for the same annotation task.
+ It will help you to parallel data annotation process.
+
+ **Image Quality**. Use this option to specify quality of uploaded images.
+ The option helps to load high resolution datasets faster.
+ Use the value from ``1`` (completely compressed images) to ``95`` (almost not compressed images).
+
+ **Select files**. Push this button to select files you want to annotate.
+
+ Push ``Submit`` button and it will be added into the list of annotation tasks.
+ Then, the created task will be displayed on dashboard:
+ 
- __Bug Tracker__. Specify full URL your bug tracker if you have it.
+1. The Dashboard contains elements and each of them relates to a separate task. They are sorted in creation order.
+ Each element contains: task name, preview, execution status, buttons, and one or more links.
+ Each button is responsible for a specific function:
+ - ``Dump Annotation`` — download an annotation file from the task (xml format)
+ - ``Upload Annotation`` — upload an annotation file to the task (xml format)
+ - ``Update Task`` — bring up "Update task" panel. It is used to edit or add labels line
+ - ``Delete Task`` — delete the task
+ - ``Git Repository Sync`` — sync annotation with the dataset repository.
+ It is available only if you specify a dataset repository when the task has been created.
+ - ``Run TF Annotation`` — automatic annotation with Tensorflow Object Detection API.
+ Presence depends on how you build CVAT instance
+ - ``Run Auto Annotation`` — automatic annotation with OpenVINO toolkit.
+ Presence depends on how you build CVAT instance.
+
+ Item color depends on status of synchronization with the dataset repository:
+ ``red`` means annotations are not synchronized with the repository,
+ ``yellow`` means annotations are in a temporary branch of the repository,
+ ``green`` means annotations are merged into the repository.
+
+1. Follow a link inside ``Jobs`` section to start annotation process.
+ In some cases, you can have several links. It depends on size of your
+ task and ``Overlap Size`` and ``Segment Size`` parameters. To improve
+ UX, only the first several frames will be loaded and you will be able
+ to annotate first images. Other frames will be loaded in background.
- __Source__. To create huge tasks please use ``shared`` server directory (choose ``Share`` option in the dialog).
+ 
- __Flip images__. All selected files will be turned around 180.
+### Model manager
- __Z-Order__. Defines the order on drawn polygons. Check the box for enable layered displaying.
+The application will be enabled automatically if [OpenVINO™ component](/components/openvino/README.md) is installed.
+It allows to use custom models for auto annotation. Only models in OpenVINO™ toolkit format are supported.
+If you would like to annotate a task with a custom model,
+please convert it to the intermediate representation (IR) format via the model optimizer tool.
+See [OpenVINO documentation](https://software.intel.com/en-us/articles/OpenVINO-InferEngine) for details.
+You can "register" a model and "use" it after that to pre annotate your tasks.
- __Overlap Size__. Use this option to make overlapped segments. The option makes tracks continuous from one segment into another. Use it for interpolation mode. There are several use cases for the parameter:
- - For an interpolation task (video sequence) if an object exists on overlapped segments it will be automatically merged into one track if overlap is greater than zero and annotation is good enough on adjacent segments. If overlap equals to zero or annotation is poor on adjacent segments inside a dumped annotation file you will have several tracks, one for each segment, which correspond to the object).
- - For an annotation task (independent images) if an object exists on overlapped segments bounding boxes will be automatically merged into one if overlap is greater than zero and annotation is good enough on adjacent segments. If overlap equals to zero or annotation is poor on adjacent segments inside a dumped annotation file you will have several bounding boxes for the same object.
+
- Thus you annotate an object on the first segment. You annotate the same object on second segment and if you do it right you will have one track inside your annotation file. If annotations on different segments (on overlapped frames) are very different or overlap is zero you will have two tracks for the same object. This functionality works only for bounding boxes. Polygon, polyline, points don't support automatic merge on overlapped segments even the overlap parameter isn't zero and match between corresponding shapes on adjacent segments is perfect.
+The model manager allows you to manage your deep learning (DL) models uploaded for auto annotation.
+Using the functionality you can upload, update or delete a specific DL model.
+Use "Auto annotation" button to pre annotate a task using one of your DL models. [Read more](/cvat/apps/auto_annotation)
- __Segment size__. Use this option to divide a huge dataset into a few smaller segments.
+
- __Image Quality__. Use this option to specify quality of uploaded images. The option makes it faster to load high-quality datasets. Use the value from ``1`` (completely compressed images) to ``95`` (almost not compressed images).
+### Search
- Push ``Submit`` button and it will be added into the list of annotation tasks. Finally you should see something similar to the figure below:
+There are several options how to use the search.
+It may be task's name, mode (annotation or interpolation), owner (username), assignee (username),
+status (annotation, validation, completed), id.
+The search is case insensitive.
- 
+
-3. Follow a link inside ``Jobs`` section to start annotation process. In some cases you can have several links. It depends on size of your task and ``Overlap Size`` and ``Segment Size`` parameters. To improve UX only several first frames will be loaded and you will be able to annotate first images. Other frames will be loaded in background.
+## Interface of the annotation tool
- 
+The tool consists of:
+- ``Workspace`` — where images are shown;
+- ``Bottom panel`` (under workspace) — for navigation, filtering annotation and accessing tools' menu;
+- ``Side panel`` — contains two lists: objects (on the frame) and labels (of objects on the frame);
+- ``Bottom side panel`` — contains the main annotation functions (create, merge, group objects).
+ Here you can choose a type of shape, a label you want to annotate and a mode (annotation or interpolation)
+
+
+
+There is also:
+- ``Settings`` (F2) — the button inside ``Open Menu`` in the bottom panel. Contains different parameters
+ which can be adjusted according to the user's needs.
+- ``Context menu`` — available on right mouse button.
### Basic navigation
-1. Use arrows below to move on next/previous frame. Almost every button is covered by a shortcut. To get a hint about the shortcut just put your mouse pointer over an UI element.
+1. Use arrows below to move on next/previous frame.
+ Use the scroll bar slider to scroll through frames.
+ Almost every button is covered by a shortcut.
+ To get a hint about a shortcut, just put your mouse pointer over an UI element.
-2. An image can be zoom in/out using mouse's wheel. The image will be zoomed relatively your current cursor position. Thus if you point on an object it will be under your mouse during zooming process.
+1. An image can be scaled in/out using mouse's wheel. The image will be zoomed relatively your current cursor position.
+ Thus, if you point on an object, it will be under your mouse during zooming process.
-3. An image can be moved/shifted by holding left mouse button inside some area without annotated objects. If ``Mouse Wheel`` is pressed then all annotated objects are ignored otherwise a highlighted bounding box will be moved instead of the image itself.
+1. An image can be moved/shifted by holding left mouse button inside some area without annotated objects.
+ If ``Mouse Wheel`` is pressed, then all annotated objects are ignored.
+ Otherwise, a highlighted bounding box will be moved instead of the image itself.
-### Types of Shapes (basic)
-There are four shapes you can annotate your images with:
+### Types of shapes (basics)
+There are four shapes which you can annotate your images with:
- ``box``
- ``polygon``
- ``polyline``
- ``points``
+- ``auto segmentation``
And there is how they all look like:
- 
+ 
- 
+ 
+
### Annotation mode (basics)
Usage examples:
- - Create new annotations for a set of images.
- - Add/modify/delete objects for existing annotations.
+- Create new annotations for a set of images.
+- Add/modify/delete objects for existing annotations.
-1. Before starting need to check that ``Annotation`` is selected:
+1. Before starting, you need to check if ``Annotation`` is selected:
 
-2. Create a new annotation:
-
- - Choose right ``Shape`` (box etc.) and ``Label`` (was specified by you while creating the task) beforehand:
+1. Create a new annotation:
+
+ - Choose a right ``Shape`` (box etc.) and ``Label`` (was specified by you while creating the task) beforehand:
-  
+  
- - Create a bounding box by clicking on ``Create Shape`` button or ``N`` shortcut. Choose opposite points. Your first bounding box is ready!
+ - Create a bounding box by clicking on ``Create Shape`` button or ``N`` shortcut.
+ Choose opposite points. Your first bounding box is ready!
- 
+ 
- - It is possible to adjust boundaries and location of the bounding box using mouse. In the top right corner boxes' size is shown, you can check it by clicking one of the boxes' points. You can also undo your actions by using ``Ctrl+Z`` and redo them with ``Shift+Ctrl+Z`` or ``Ctrl+Y``.
+ - It is possible to adjust boundaries and location of the bounding box using mouse.
+ Box's size is shown in the top right corner , you can check it clicking on the one point of box.
+ You can also undo your actions using ``Ctrl+Z`` and redo them with ``Shift+Ctrl+Z`` or ``Ctrl+Y``.
-3. In the list of objects you can see the labeled car. In the side panel you can perform basic operations under the object — choose attributes, change label or delete box.
+1. In the list of objects you can see the labeled car.
+ In the side panel you can perform basic operations under the object — choose attributes,
+ change its label or delete box.
-4. An example of fully annotated frame in ``Annotation`` mode can look like on the figure below.
+1. The following figure is an example of fully annotated frame in ``Annotation`` mode.
### Interpolation mode (basics)
Usage examples:
- - Create new annotations for a sequence of frames.
- - Add/modify/delete objects for existing annotations.
- - Edit tracks, merge many bounding boxes into one track.
+- Create new annotations for a sequence of frames.
+- Add/modify/delete objects for existing annotations.
+- Edit tracks, merge a lot of bounding boxes into one track.
-1. Before starting need to be sure that ``Interpolation`` is selected.
+1. Before starting, you have to be sure that ``Interpolation`` is selected.
-2. Create a track for an object (look at the selected car as an example):
+1. Create a track for an object (look at the selected car as an example):
- Annotate a bounding box on the first frame for the object.
- In ``Interpolation`` mode the bounding box will be interpolated on next frames automatically.
- 
+ 
-3. If the object starts to change its position you need to modify bounding boxes where it happens. Changing of bounding boxes on each frame isn't necessary. It is enough to update several key frames and frames between them will be interpolated automatically. See an example below:
- - The car starts moving on frame #70. Let's mark the frame as a key frame. You can press ``K`` for that.
+1. If the object starts to change its position, you need to modify bounding
+ boxes where it happens. It isn't necessary to change bounding boxes on each
+ frame. It is enough to update several key frames and frames between them
+ will be interpolated automatically. See an example below:
+ - The car starts moving on frame #630. Let's mark the frame as a key frame.
+ You can press ``K`` for that or push ``star`` button (see the screenshot below)
- - Let's jump 30 frames forward and adjust boundaries of the object.
+ - Let's jump 30 frames forward and adjust boundaries of the object.
- - After that bounding boxes of the object between 70 and 100 frames will be changed automatically. For example, frame #85 looks like on the figure below:
+ - After that, bounding boxes of the object between 630 and 660 frames
+ will be changed automatically. For example, frame #645 looks like on the figure below:
-4. When the annotated object disappears or becomes too small, you need to finish the track. To do that you need to choose ``Outside Property``, shortcut ``O``.
+1. When the annotated object disappears or becomes too small, you need to
+ finish the track. You have to choose ``Outside Property``, shortcut ``O``.
-5. If the object isn't visible on a couple of frames and after that it appears again it is possible to use ``Merge Tracks`` functionality to merge several separated tracks into one.
+1. If the object isn't visible on a couple of frames and then appears again,
+ you can use ``Merge Tracks`` feature to merge several individual tracks
+ into one.
- - Let's create a track for the bus.
+ - Let's create a track for the bus.
- - After that create a track when it appears again on the sequence of frames.
+ After that, you should create a track when it appears again on the sequence of frames.
- - Press ``Merge Tracks`` button and click on any bounding box of the first track and on any bounding box of the second track.
+ - Press ``Merge Tracks`` button and click on any bounding box of the
+ first track and on any bounding box of the second track.
- - Press ``Apply Merge`` button to apply changes.
+ - Press ``Apply Merge`` button to apply changes.
- - The final annotated sequence of frames in ``Interpolation`` mode can look like the clip below:
+ - The final annotated sequence of frames in ``Interpolation`` mode can
+ look like the clip below:
### Attribute annotation mode (basics)
-- In this mode you can edit attributes with fast navigation between objects and frames using keyboard. Press ``Shift+Enter`` shortcut to enter AAMode. After that it is possible to change attributes using keyboard.
+- In this mode you can edit attributes with fast navigation between
+ objects and frames using keyboard. Press ``Shift+Enter`` shortcut
+ to enter the mode. After that, you can change attributes using a keyboard.
-- The active attribute will be red. In this case it is ``gender``. Look at the bottom side panel to see all possible shortcuts to change the attribute. Press ``2`` key on your keyboard to assign ``female`` value for the attribute.
+- The active attribute will be red. It is ``gender`` in this case. Look at
+ the bottom side panel to see all possible shortcuts for changing the
+ attribute. Press ``2`` key on your keyboard to assign ``female`` value for
+ the attribute.
 
-- Press ``Up Arrow``/``Down Arrow`` on your keyboard to go to next/previous attribute. In this case after pressing ``Down Arrow`` you will be able to edit ``Age`` attribute.
+- Press ``Up Arrow``/``Down Arrow`` on your keyboard to go to next/previous
+ attribute. In this case, after pressing ``Down Arrow`` you will be able to
+ edit ``Age`` attribute.
 
-- Use ``Right Arrow``/``Left Arrow`` keys to move on previous/next image with annotation.
+- Use ``Right Arrow``/``Left Arrow`` keys to move on previous/next image with annotation.
### Downloading annotations
-1. To download latest annotations save all changes first. Press ``Open Menu`` and then ``Save Work`` button. There is ``Ctrl+S`` shortcut to save annotations quickly.
+1. To download the latest annotations, you have to save all changes first.
+ Press ``Open Menu`` and then ``Save Work`` button. There is ``Ctrl+S``
+ shortcut to save annotations quickly.
-2. After that press ``Open Menu`` and then ``Dump Annotation`` button.
+1. After that, press ``Open Menu`` and then ``Dump Annotation`` button.
-3. The annotation will be written into **.xml** file. To find the annotation file go to the directory where your browser saves downloaded files by default. For more information visit [.xml format page](./documentation/xml_format.html).
+1. The annotation will be written into **.xml** file. To find the annotation
+ file, you should go to the directory where your browser saves downloaded
+ files by default. For more information visit [xml format page](/cvat/apps/documentation/xml_format.md).
+### Task synchronization with a repository
+
+1. At the end of the annotation process, a task is synchronized clicking
+ the `` Git Repository Sync`` on the main page. Notice: this feature
+ works only if a git repository was specified when the task was created.
+
+ 
+
+1. Clicking `` Sync`` starts synchronization of annotation with the
+ repository, the url address of which is specified in the
+ ``Repository URL`` field. The synchronization process may take some time.
+
+ 
+
+ 
+
+1. After synchronization, the task in the list is highlighted in yellow. The
+ annotation is now in the repository, in a temporary branch.
+
+ 
+
+1. The next step is to go to the repository and manually create a pull request to the main branch.
+1. After confirming the PR, when the annotation is saved in the main branch, the color of the task changes to green.
+
+ 
+ 
+
### Vocabulary
-**Bounding box** is an area which defines boundaries of an object. To specify it you need to define two opposite corners.
+**Bounding box** is an area which defines boundaries of an object. To specify
+it, you need to define two opposite corners.
-**Tight bounding box** is a bounding box where margin between the object inside and boundaries of the box is absent. This type of bounding box is used in most tasks by default but precision completely depends on an annotation task.
+**Tight bounding box** is a bounding box where margin between the object inside
+and boundaries of the box is absent. This type of bounding box is used in most
+tasks by default, but precision completely depends on an annotation task.
-| Bounding box |Tight bounding box|
-| ------------ |:----------------:|
-|  | |
+| Bounding box | Tight bounding box |
+| ------------ | :----------------: |
+|  |  |
---
**Label** is a type of an annotated object (e.g. person, car, face, etc.)
@@ -237,13 +463,14 @@ Usage examples:
---
-**Attribute** is a property of an annotated object (e.g. color, model, quality, etc.). There are two types of attributes:
+**Attribute** is a property of an annotated object (e.g. color, model,
+quality, etc.). There are two types of attributes:
-- __Unique__: immutable and can't be changed from frame to frame (e.g. age, gender, color, etc.)
+- **Unique**: immutable and can't be changed from frame to frame (e.g. age, gender, color, etc.)
-- __Temporary__: mutable and can be changed on any frame (e.g. quality, pose, truncated, etc.)
+- **Temporary**: mutable and can be changed on any frame (e.g. quality, pose, truncated, etc.)
@@ -254,81 +481,82 @@ Usage examples:
---
**Annotation** is a set of shapes and tracks. There are several types of annotations:
-- *Manual* which is created by a person
-- *Semi-automatic* which is created mainly automatically but the user provides some data (e.g. interpolation)
-- *Automatic* which is created automatically without a person in the loop
-
-## Interface of the annotation tool
-
-The tool is composed of:
-- ``Workspace`` — where images are shown;
-- ``Bottom panel`` (under workspace) — for navigation, filtering annotation and accessing tools' menu;
-- ``Side panel`` — contains two lists: of objects (on the frame) and labels (of objects on the frame);
-- ``Bottom side panel`` — for choosing types of/creating/merging/grouping annotation;
-
-
-
-There is also:
-- ``Settings`` (F2) — pop-up in the Bottom panel, contains different parameters which can be adjusted by the user's needs
-
-- ``Context menu`` — available on right mouse button.
+- _Manual_ which is created by a person
+- _Semi-automatic_ which is created mainly automatically, but the user provides some data (e.g. interpolation)
+- _Automatic_ which is created automatically without a person in the loop
---
### Workspace — Context menu
-Context menu opens by right mouse click.
-
-By clicking inside bounding box the next is available:
-- ``Copy Object URL`` — copying in buffer address of an object on the frame in the task
-- ``Change Color``
-- ``Remove Shape``
-- ``Switch Occluded``
-- ``Switch Lock``
+Press the ``Right mouse button`` to see the context menu.
+
+Next options are available clicking inside bounding box:
+- ``Copy Object URL`` — copying to the buffer address of an object on the frame
+in the task
+- ``Change Color`` — change color of active shape
+- ``Remove Shape`` — deleting the shape
+- ``Switch Occluded`` — attribute is used if an object is occluded by another
+object or isn't fully visible on the frame. Use the ``Q`` shortcut to set the
+property quickly.
+- ``Switch Lock`` — block editing the active shape
- ``Enable Dragging`` — (only for polygons) allows to adjust polygons position
+- ``Split`` — allows to split an interpolated track into two separate tracks. This function is the opposite
+of the merge function.
- 
+
+
+
-By clicking on the points of poly-shapes ``Remove`` option is available.
+Clicking on the points of poly-shapes, ``Remove`` option is available.
-By clicking outside any shapes you can either copy ``Frame URL`` (link to present frame) or ``Job URL`` (link from address bar)
+Clicking outside any shapes, you can copy ``Frame URL`` (link to present frame) or ``Job URL`` (link from address bar)
+
+
-
+Applying ``split`` into an interpolated track divides it into two separate tracks.
+
+
---
### Settings
-Click ``F2`` to access settings menu.
+Press ``F2`` to access settings menu.
There is ``Player Settings`` which adjusts ``Workspace`` and ``Other Settings``.
In ``Player Settings`` you can:
- - Control step of ``C`` and ``V`` shortcuts
- - Control speed of ``Space``/Play button
- - Show every image in full or zoomed out like previous (reset by default)
-
- - Enable ``Grid`` when you don't need too small annotation. ``Grid`` can have different opacity, color and cells' size — use ``F2`` to tune settings.
+- Control step of ``C`` and ``V`` shortcuts
+- Control speed of ``Space``/``Play`` button
+- Show every image in full or zoomed out like previous
+ (it is enabled by default for interpolation mode and disabled for annotation mode)
+- Enable ``Grid`` when you don't need small objects. ``Grid`` can have
+ different opacity, color and cells' size — use ``F2`` to configure settings.
- - Adjust ``Brightness``/``Contrast``/``Saturation`` of too exposing or too dark images using ``F2`` — color settings (changes displaying and not the image itself).
+- Adjust ``Brightness``/``Contrast``/``Saturation`` of too exposing or too
+ dark images using ``F2`` — color settings (changes displaying and not the
+ image itself).
+
Shortcuts:
- - ``Shift+B``/``Alt+B`` for brightness
- - ``Shift+C``/``Alt+C`` for contrast
- - ``Shift+S``/``Alt+S`` for saturation
- - ``F2`` —> ``Reset Color Settings`` for default image
+- ``Shift+B``/``Alt+B`` for brightness
+- ``Shift+C``/``Alt+C`` for contrast
+- ``Shift+S``/``Alt+S`` for saturation
+- ``F2`` —> ``Reset Color Settings`` to default values
- 
+ 
``Other Settings`` contains:
- - ``Show All Interpolation Tracks`` checkbox — shows hidden object on the side panel for every interpolated object (turned off by default)
- - ``AAM Zoom Margin`` slider — defines margins for shape in attribute annotation mode
- - ``Enable AutoSaving`` checkbox — turned off by default
- - ``AutoSaving Interval (min)`` input box — 15 minutes by default
- - ``Propagate Frames`` input box — allows to choose on how many frames of selected object will be copied in by ``Ctrl+B`` (50 by default)
+- ``Show All Interpolation Tracks`` checkbox — shows hidden object on the
+ side panel for every interpolated object (turned off by default)
+- ``AAM Zoom Margin`` slider — defines margins for shape in attribute annotation mode
+- ``Enable AutoSaving`` checkbox — turned off by default
+- ``AutoSaving Interval (min)`` input box — 15 minutes by default
+- ``Rotate all images`` checkbox — switch the rotation of all frames / individual frame
---
### Bottom Panel
@@ -341,12 +569,14 @@ Go to the first and latest frames.
---
-Go to the next/previous frame with a predefined step. Shortcuts: ``v`` — step backward, ``c`` — step forward. By default the step is ``10`` (change at ``Open Menu`` —> ``Settings`` —> ``Player Step``).
+Go to the next/previous frame with a predefined step. Shortcuts:
+``V`` — step backward, ``C`` — step forward. By default the step is ``10``
+(change at ``Open Menu`` —> ``Settings`` —> ``Player Step``).
---
-Go to the next/previous frame with step equals to 1. Shortcuts: ``d`` — previous, ``f`` — next.
+Go to the next/previous frame with step equals to 1. Shortcuts: ``D`` — previous, ``F`` — next.
@@ -356,151 +586,193 @@ Play the sequence of frames or the set of images. Shortcut: ``Space`` (change at
---
-Go to specified frame. Press ``~`` to highlight element.
+Go to specified frame. Press ``~`` to focus on the element.
---
-__Open Menu__ button
+**Open Menu** button
-It is the main menu for the annotation tool. It can be used to download, upload and remove annotations.
+It is the main menu of the annotation tool. It can be used to download, upload and remove annotations.
-As well it shows statistics about the current task, such as:
+Button assignment:
+
+- ``Open Task`` — open task in cvat dashboard
+- ``RunReID Merge`` — The ReID application uses deep learning model to perform
+ an automatic merging of bounding boxes between neighbor frames. You can use
+ "Merge" and "Split" functionality to edit automatically generated annotation
+ [read more](/cvat/apps/reid).
+- ``Dump Annotation`` — download annotations from the task
+- ``Upload Annotation`` — uploading annotations to the task
+- ``Remove Annotation`` — remove annotations from current task
+- ``Settings`` — open the settings menu
+- ``Fullscreen Player`` — fullscreen player mode
+- ``Switch AAM`` — switch to attribute annotation mode
+- ``Help`` — open the shortkeys
+- ``Save Work`` — save annotations for the current job. The button has an
+ indication of the saving process
+
+It also shows statistics about the current task, for example:
- task name
-- type of performance on the task: ``annotation``, ``validation`` or ``completed task``
+- status of the task: ``annotation``, ``validation`` or ``completed task``
- technical information about task
-- number of created bounding boxes, sorted by labels (e.g. vehicle, person) and type of annotation (polygons, boxes, etc.)
+- number of created bounding boxes, sorted by labels (e.g. vehicle, person) and
+type of annotation (polygons, boxes, etc.)
---
-__Filter__ input box
+**Filter** input box
The way how to use filters is described in the advanced guide (below).
---
-__History / Undo-redo panel__
+**History / Undo-redo** panel
Use ``Ctrl+Z`` for undo actions and ``Ctrl+Shift+Z`` or ``Ctrl+Y`` to redo them.
---
-__Fill Opacity slider__
+**Propagation** input box
+
+Allows you to select how many frames of the selected object will be copied clicking ``Ctrl+B`` (50 by default)
+
+
+
+---
+**Rotation** of an image
+
+Buttons are used to rotate the image clockwise / counterclockwise or use ``Ctrl+R``/``Ctrl+Shift+R``
+
+
+
+---
+**Fill Opacity** slider
Change opacity of every bounding box in the annotation.
-Opacity can be chaged from 0% to 100% and by random colors or white. If any white option is chosen, ``Color By`` scheme won't work.
+Opacity can be changed from 0% to 100% and by random colors or white. If any
+white option is chosen, ``Color By`` scheme won't work.
-__Selected Fill Opacity slider__
+**Selected Fill Opacity** slider
-Change opacity of bounding box under mouse pointer.
+Change the opacity of the selected object's fill.
-Opacity can be changed from 0% till 100%.
+Opacity can be changed from 0% to 100%.
-__Black Stroke checkbox__
+**Black Stroke** checkbox
Change bounding box border from white/colored to black.
-__Color By options__
+**Color By** options
-Change color scheme of annotation:
-- ``Instance`` — every bounding box has random color
+Change the color scheme of annotation:
+- ``Instance`` — every bounding box has random color
-
+ 
-- ``Group`` — every group of boxes has its own random color, ungrouped boxes are white
+- ``Group`` — every group of boxes has its own random color, ungrouped boxes are white
-
+ 
-- ``Label`` — every label (e.g. vehicle, pedestrian, roadmark) has its own random color
+- ``Label`` — every label (e.g. vehicle, pedestrian, road marks) has its own random color
-
+ 
-You can change any random color by pointing on needed box on a frame or on a side panel and pressing ``Enter``.
+ You can change any random color pointing on needed box on a frame or on a
+ side panel and press ``Enter``.
---
### Side panel
#### Objects
-In the side panel you can see the list of available objects on the current frame. An example how the list can look like is below:
+In the side panel you can see the list of available objects on the current
+frame. The following figure is an example of how a list might look like:
-|Annotation mode|Interpolation mode|
-|--|--|
-|||
+| Annotation mode | Interpolation mode |
+|-- |-- |
+|  |  |
#### Labels
-You also can see all the labels that used on this frame and highlight them by clicking needed label.
+You can also see all labels that were used on this frame and highlight them clicking on a label you need
---
-__Objects' card__
+**Objects** on the side bar
-A shape can be removed. Shortcut: ``Delete``. A locked shape can be deleted using ``Shift+Delete`` shortcut.
+A shape can be removed. Shortcut: ``Delete``. You can delete a locked shape using the ``Shift+Delete`` shortcut.
---
-A shape can be locked to prevent its modification or moving by an accident. Shortcut to lock an object: ``l``.
+A shape can be locked to prevent its modification or moving by an accident. Shortcut to lock an object: ``L``.
---
-A shape can be **Occluded**. Shortcut: ``q``. Such shapes have dashed boundaries.
+A shape can be **Occluded**. Shortcut: ``Q``. Such shapes have dashed boundaries.
---
-You can copy and paste this object on this or another frame. ``Ctrl+C``/``Ctrl+V`` shortcuts works under mouse point.
+You can copy and paste an object in a particular frame. The keyboard
+shortcuts ``Ctrl + C`` / ``Ctrl + V`` work when you hover over an object
---
-You can propagate this object on next X frames. ``Ctrl+B`` shortcut works under mouse point. ``F2`` for change on how many frames in nesessary to propagate this object.
+You can propagate an object in the following X frames. The keyboard
+shortcut ``Ctrl + B`` works when you hover the mouse over an object. You can
+change the number of propagating frames in the bottom panel.
---
-You can change the way this objects' annotation is displayed on this frame. It could be hide, shows only box, shows box and title. ``H`` is for this object, ``T+H`` for all objects on this frame.
+You can change the way an object is displayed on a frame.
+It could be hide, shows only box, shows box and title. ``H`` is for this
+object, ``T+H`` for all objects on this frame.
---
-The type of a shape can be changed by selecting __Label__ property. For instance, it can look like on the figure below:
+The type of a shape can be changed selecting **Label** property. For instance, it can look like on the figure below:
-To change a type of a highlighted shape using keyboard you need to press ``Shift+``.
+To change a type of a highlighted shape using keyboard, you need to press ``Shift+``.
### Bottom side panel
- ``Create Shape`` (``N``) — start/stop drawing new shape mode
-- ``Merge Shapes`` (``M``) — start/stop merging boxes mode
-- ``Group Shapes`` (``G``) — start/stop grouping boxes mode
+- ``Merge Shapes`` (``M``) — start/stop merging shapes mode
+- ``Group Shapes`` (``G``) — start/stop grouping shapes mode
- ``Label Type`` — (e.g. face, person, vehicle)
-- ``Working Mode`` — Annotation or Interpolation modes. You can't interpolate polygons/polylines/points, but you can propagate them using ``Ctrl+B`` or merge into a track
+- ``Working Mode`` — Annotation or Interpolation modes. You can't interpolate
+polygons/polylines/points, but you can propagate them using ``Ctrl+B`` or
+merge into a track
- ``Shape Type`` — (e.g. box, polygon, polyline, points)
-- ``Poly Shape Size`` — (optional) hard number of dots for creating polygon/polyline shapes
+- ``Poly Shape Size`` — (optional) hard number of dots for creating polygon, polyline and points shapes
-#### Fullscreen player mode
+### Fullscreen player mode
Go to ``Open Menu`` —> ``Fullscreen Player``
Exit with ``F11`` or ``Ecs``.
-That is how it looks like.
+This is how it looks like.
@@ -508,15 +780,21 @@ That is how it looks like.
Basic operations in the mode were described above.
-__occluded__ attribute is used if an object is occluded by another object or it isn't fully visible on the frame. Use ``Q`` shortcut to set the property quickly.
+**Occluded** attribute is used if an object is occluded by another object or
+isn't fully visible on the frame. Use ``Q`` shortcut to set the property
+quickly.
-Example: both cars on the figure below should be labeled as __occluded__.
+Example: both cars on the figure below should be labeled as **occluded**.
-If a frame contains too many objects and it is difficult to annotate them due to many shapes which are placed mostly in the same place then it makes sense to lock them. Shapes for locked objects are transparent and it is easy to annotate new objects. Also it will not be possible to change previously annotated objects by an accident. Shortcut: ``L``.
+If a frame contains too many objects and it is difficult to annotate them
+due to many shapes that are placed mostly in the same place, it makes sense
+to lock them. Shapes for locked objects are transparent, and it is easy to
+annotate new objects. Besides, you can't change previously annotated objects
+by accident. Shortcut: ``L``.
@@ -524,77 +802,99 @@ If a frame contains too many objects and it is difficult to annotate them due to
Basic operations in the mode were described above.
-Bounding boxes created in the mode have extra navigation buttons.
-- These buttons help to jump to previous/next key frame.
+Bounding boxes that were created in the mode, have extra navigation buttons.
+- These buttons help to jump to previous/next key frame.
-- The button helps to jump to initial frame for the object (first bounding box for the track).
+- The button helps to jump to initial frame for the object (first bounding box for the track).
-
## Attribute annotation mode (advanced)
Basic operations in the mode was described above.
-It is possible to handle many objects on the same frame in the mode.
+It is possible to handle lots of objects on the same frame in the mode.
-It is more convenient to annotate objects of the same type. For the purpose it is possible to specify a corresponding filter. For example, the following filter will hide all objects except pedestrians: ``pedestrian``.
+It is more convenient to annotate objects of the same type. You can specify
+the appropriate filter in this case. For example, the following filter will
+hide all objects except pedestrians: ``pedestrian``.
-To navigate between objects (pedestrians in the case) use the following shortcuts:
+To navigate between objects (pedestrians in the case), use the following shortcuts:
- ``Tab`` — go to the next object
- ``Shift+Tab`` — go to the previous object.
-By default in the mode objects are zoomed in to full screen. Check
-``Open Menu`` —> ``Settings`` —> ``AAM Zoom Margin`` for adjust that.
+By default, objects in the mode are zoomed. Check
+``Open Menu`` —> ``Settings`` —> ``AAM Zoom Margin`` to adjust that.
## Annotation with polygons
It is used for semantic / instance segmentation.
-Be sure ``Z-Order`` flag in ``Create task`` dialog is enabled if you want to annotate polygons. Z-Order flag defines order of drawing. It is necessary to get right annotation mask without extra work (additional drawing of borders). Z-Order can be changed by `+`/`-` which set maximum/minimum z-order respectively.
+Be sure ``Z-Order`` flag in ``Create task`` dialog is enabled if you want to
+annotate polygons. Z-Order flag defines order of drawing. It is necessary to
+get right annotation mask without extra work (additional drawing of borders).
+Z-Order can be changed by ``+``/``-`` which set maximum/minimum z-order
+accordingly.
-Before starting need to be sure that ``Polygon`` is selected.
+Before starting, you need to be sure that ``Polygon`` is selected.
-Click ``N`` for entering drawing mode. There are two ways to draw a polygon — you either create points by clicking or by dragging mouse on the screen, holding ``Shift``.
+Press ``N`` for entering drawing mode. There are two ways to draw a polygon
+— you either create points by clicking or by dragging mouse on the screen
+holding ``Shift``.
-|Clicking points|Holding Shift+Dragging|
-|--|--|
-|||
+| Clicking points | Holding Shift+Dragging |
+| -- | -- |
+|  |  |
-
-When ``Shift`` isn't pressed, you can zoom in/out (on mouse wheel scroll) and move (on mouse wheel press and mouse move), you can delete previous point by clicking right mouse button. Click ``N`` again for completing the shape. You can move points or delete them by double-clicking. Double-click with pressed ``Shift`` will open a polygon editor. In it you can create new points (by clicking or dragging) or delete part of a polygon by closing the red line on other point. Press ``Esc`` to cancel editing.
+When ``Shift`` isn't pressed, you can zoom in/out (when scrolling the mouse
+wheel) and move (when clicking the mouse wheel and moving the mouse), you can
+delete the previous point clicking right mouse button. Press ``N`` again for
+completing the shape. You can move points or delete them by double-clicking.
+Double-click with pressed ``Shift`` will open a polygon editor. There you can
+create new points (clicking or dragging) or delete part of a polygon closing
+the red line on another point. Press ``Esc`` to cancel editing.
-Also you can set fixed number of points in the field "poly shape size", then drawing will be stopped automatically.
-To enable dragging, right-click inside polygon and choose ``Enable Dragging``.
-
+Also, you can set fixed number of points in the "poly shape size" field, then
+drawing will be stopped automatically. To enable dragging, you should right-click
+inside polygon and choose ``Enable Dragging``.
Below you can see results with opacity and black stroke:
-Also if you need to annotate small objects, increase ``Image Quality`` to ``95`` in ``Create task`` dialog for annotators convenience.
+Also, if you need to annotate small objects, increase ``Image Quality`` to
+``95`` in ``Create task`` dialog for annotator's convenience.
## Annotation with polylines
It is used for road markup annotation etc.
-Before starting you have to be sure that ``Polyline`` is selected.
+Before starting, you have to be sure that ``Polyline`` is selected.
-Click ``N`` for entering drawing mode. There are two ways to draw a polyline — you either create points by clicking or by dragging mouse on the screen, holding ``Shift``.
-When ``Shift`` isn't pressed, you can zoom in/out (on mouse wheel scroll) and move (on mouse wheel press and mouse move), you can delete previous point by clicking right mouse button. Click ``N`` again for completing the shape. You can delete points by double-clicking them. Double-click with pressed ``Shift`` will open a polyline editor. In it you can create new points (by clicking or dragging) or delete part of a polyline by closing the red line on other point. Press ``Esc`` to cancel editing. Also you can set fixed number of points in the field "poly shape size", then drawing will be stopped automatically.
-You can adjust polyline after it was drawn.
+Press ``N`` for entering drawing mode. There are two ways to draw a polyline —
+you either create points clicking or dragging mouse on the screen, holding ``Shift``.
+
+When ``Shift`` isn't pressed, you can zoom in/out (when scrolling the mouse wheel)
+and move (when clicking the mouse wheel and moving the mouse), you can delete
+previous point clicking right mouse button. Press ``N`` again to complete the
+shape. You can delete points double-clicking them. Double-click with pressed
+``Shift`` will open a polyline editor. There you can create new points
+(clicking or dragging) or delete part of a polygon closing the red line on
+another point. Press ``Esc`` to cancel editing. Also, you can set fixed number
+of points in the "poly shape size" field, then drawing will be stopped
+automatically. You can adjust the polyline after it has been drawn.
@@ -602,31 +902,58 @@ You can adjust polyline after it was drawn.
It is used for face landmarks annotation etc.
-Before starting you have to be sure that ``Points`` is selected.
+Before starting, you have to be sure that ``Points`` is selected.
-Click ``N`` for entering drawing mode. Now you can start marking a needed area.
-Click ``N`` again for finishing marking an area. You can delete points by double-clicking them. Double-click with pressed ``Shift`` will open a points shape editor. In it you can create new points into existing shape. Also you can set fixed number of points in the field "poly shape size", then drawing will be stopped automatically. Points are automatically grouped — between individual start and finish all points will be considered linked. You can zoom in/out (on mouse wheel scroll) and move (on mouse wheel press and mouse move) while drawing. You can drag object after it was drawn and fix a position of individual points after finishing the object. You can add/delete points after finishing.
+Press ``N`` for entering drawing mode. Now you can start annotating the necessary area.
+Press ``N`` again for finishing marking an area. You can delete points
+double-clicking them. Double-click with pressed ``Shift`` will open a points
+shape editor. There you can create new points into existing shape. Also, you
+can set fixed number of points in the "poly shape size" field, then drawing
+will be stopped automatically. Points are automatically grouped — all points
+will be considered linked between individual start and finish. You can zoom
+in/out (when scrolling the mouse wheel) and move (when clicking the mouse
+wheel and moving the mouse) while drawing. You can drag object after it has
+been drawn and fix a position of individual points after finishing the object.
+You can add/delete points after finishing.
+## Annotation with Auto Segmentation
+
+Used to create a polygon semi-automatically. Before starting, you have to be
+sure that ``Auto Segmentation`` is selected.
+
+
+
+Press ``N`` for entering drawing mode. Now you can start annotating the necessary area.
+Press ``N`` again for finishing marking an area. A shape must consist of 4
+points minimum. You can set a fixed number of points in the field
+"poly shape size", then drawing will be stopped automatically. You can zoom
+in/out (when scrolling the mouse wheel) and move (when clicking the mouse
+wheel and moving the mouse) while drawing. At the end of Auto Segmentation,
+a shape is created and you can work with it as a polygon.
+
+
+
## Shape grouping
This feature allows to group several shapes.
You may use ``Group Shapes`` button or shortcuts:
- - ``G`` — switch group mode
- - ``Alt+G`` — close group mode
- - ``Shift+G`` — reset group for selected shapes
+- ``G`` — switch group mode
+- ``Alt+G`` — close group mode
+- ``Shift+G`` — reset group for selected shapes
-You may select shapes by clicking or by area selection.
+You may select shapes clicking on them or selecting an area.
Grouped shapes will have ``group_id`` filed in dumped annotation.
-Also you may switch color distribution from by instance (default) to by group. To do this you have to switch ``Color By Group`` checkbox.
+Also you may switch color distribution from an instance (default) to a group.
+You have to switch ``Color By Group`` checkbox for that.
-Shapes which haven't ``group_id`` will be highlighted with white color.
+Shapes that don't have ``group_id``, will be highlighted in white.
@@ -634,133 +961,152 @@ Shapes which haven't ``group_id`` will be highlighted with white color.
## Filter
-
+
-There are several reasons for using the feature:
+There are some reasons to use the feature:
-1. When using a filter objects which don't correspond to the filter will be hidden.
-2. Fast navigation between frames which have an object of interest. Use ``Left Arrow/Right Arrow`` keys for the purpose. If the filter is empty the mentioned arrows will go to previous/next frames which contain any objects.
+1. When you use a filter, objects that don't match the filter will be hidden.
+1. Fast navigation between frames that have an object of interest. Use
+``Left Arrow`` / ``Right Arrow`` keys for the purpose. If the filter is empty,
+the arrows go to previous/next frames which contain any objects.
+1. The list contains frequently used and recent filters.
-To use the functionality it is enough to specify a value inside ``Filter`` text box and defocus the text box (for example, click on the image). After that the filter will be applied.
+To use the functionality, it is enough to specify a value inside ``Filter`` text
+box and defocus the text box (for example, click on the image). After that, the
+filter will be applied.
---
-In a trivial case a correct filter should correspond to the template: ``label[prop operator "value"]``
+In the trivial case, the correct filter must match the template: ``label[prop operator "value"]``
-``label`` is a type of an object (e.g. _person, car, face_, etc.). If the type isn't important you can use ``*``.
+``label`` is a type of an object (e.g. _person, car, face_, etc.). If the type isn't important, you can use ``*``.
``prop`` is a property which should be filtered. The following items are available:
- - ``id`` — identifier of an object. It helps to find a specific object easily in case of huge number of objects and images/frames.
- - ``type`` — an annotation type. Possible values:
- - ``annotation``
- - ``interpolation``
- - ``lock`` accepts ``true`` and ``false`` values. It can be used to hide all locked objects.
- - ``occluded`` accepts ``true`` and ``false`` values. It can be used to hide all occluded objects.
- - ``attr`` is a prefix to access attributes of an object. For example, it is possible to access _race_ attribute. For the purpose you should specify ``attr/race``. To access all attributes it is necessary to write ``attr/*``.
+- ``id`` — identifier of an object. It helps to find a specific object easily
+in case of huge number of objects and static/documentation/images/frames.
+- ``type`` — an annotation type. Possible values: ``annotation``, ``interpolation``
+- ``lock`` accepts ``true`` and ``false`` values. It can be used to hide all locked objects.
+- ``occluded`` accepts ``true`` and ``false`` values. It can be used to hide all occluded objects.
+- ``attr`` is a prefix to access attributes of an object. For example, it is possible to
+access _race_ attribute. For the purpose you should specify
+- ``attr/race``. To access all attributes, it is necessary to write ``attr/*``.
-``operator`` can be ``=`` (equal), ``!=`` (not equal), ``<`` (less), ``>`` (more), ``<=`` (less or equal), ``>=`` (more or equal).
+``operator`` can be ``=`` (equal), ``!=`` (not equal), ``<`` (less), ``>``
+(more), ``<=`` (less or equal), ``>=`` (more or equal).
``"value"`` — value of an attribute or a property. It has to be specified in quotes.
---
-Example | Description
--------------------------------|-------------
-``face`` | all faces
-``*[id=4]`` | object with id #4
-``*[type="annotation"]`` | *annotation* objects only
-``car[occluded="true"]`` | cars with *occluded* property
-``*[lock!="true"]`` | all unlocked objects
-``car[attr/parked="true"]`` | parked cars
-``*[attr/*="__undefined__"]``| any objects with ``__undefined__`` value of an attribute
+| Example | Description |
+| -------------------------------|------------- |
+| ``face`` | all faces |
+| ``*[id=4]`` | object with id #4 |
+| ``*[type="annotation"]`` | annotated objects only |
+| ``car[occluded="true"]`` | cars with _occluded_ property |
+| ``*[lock!="true"]`` | all unlocked objects |
+| ``car[attr/parked="true"]`` | parked cars |
+| ``*[attr/*="__undefined__"]`` | any objects with ``__undefined__`` value of an attribute |
+| ``*[width<300 or height<300]`` | shape less than 300 pixels wide and more than 200 pixels high |
---
-The functionality allows to create more complex conditions. Several filters can be combined by ``or``, ``and``, ``|`` operators. Operators ``or``, ``and`` can be applied inside square brackets. ``|`` operator (union) can be applied outside of square brackets.
+The functionality allows to create more complex conditions. Several filters can
+be combined by ``or``, ``and``, ``|`` operators. Operators ``or``, ``and`` can
+be applied inside square brackets. ``|`` operator (union) can be applied
+outside of square brackets.
-Example | Description
---------------------------------------------------------|-------------
-``person[attr/age>="25" and attr/age<="35"]`` | people with age between 25 and 35.
-``face[attr/glass="sunglass" or attr/glass="no"]`` | faces with sunglasses or without glasses at all.
-```person[attr/race="asian"] | car[attr/model="bmw" or attr/model="mazda"]``` | asian persons or bmw or mazda cars.
+| Example | Description |
+| -------------------------------------------------------- |------------- |
+| ``person[attr/age>="25" and attr/age<="35"]`` | people with age between 25 and 35. |
+| ``face[attr/glass="sunglass" or attr/glass="no"]`` | faces with sunglasses or without glasses at all. |
+| ``person[attr/race="asian"]`` \| ``car[attr/model="bmw" or attr/model="mazda"]`` | asian persons or bmw or mazda cars. |
## Analytics
-If your CVAT instance is built with [analytics](/components/analytics) support you can press F3 in dashboard, a new tab with analytics and logs will be opened.
+If your CVAT instance is created with analytics support, you can press the
+"analytics" button in dashboard, a new tab with analytics and journals will
+be opened.
+
+
-It allows to see how much working time every user spend on each task and how much they did, over any time range.
+It allows you to see how much working time every user spend on each task and how much they did, over any time range.
-It also has activity graph, which can be modified with number of users shown, and timeframe.
+It also has activity graph which can be modified with number of users shown and timeframe.
-
## Shortcuts
Many UI elements have shortcut hints. Put your pointer to a required element to see it.
-| Shortcut | Common |
------------------------|------------------------------
-``F1`` | open help
-``F1`` in dashboard | open page with documentation
-``F2`` | open settings
-``L`` | lock/unlock an active shape
-``L+T`` | lock/unlock all shapes on the current frame
-``Q`` or ``Num/`` | set occluded property for an active shape
-``N`` | start/stop draw mode
-``Esc`` | close draw mode without create
-``Ctrl+`` | change type of an active shape
-``Shift+`` | change type of new shape by default
-``Enter`` | change color of active shape
-``H`` | hide active shape
-``T+H`` | hide all shapes
-``J`` | hide labels with attributes on every frame
-``Delete`` | delete an active shape
-``Shift+Delete`` | delete an active shape even if it is locked
-``F`` | go to next frame
-``D`` | go to previous frame
-``V`` | go forward with a predefined step
-``C`` | go backward with a predefined step
-``~`` | focus to ``go to frame`` element
-``Ctrl+C`` | copy an active shape
-``Ctrl+V`` | insert a copied shape
-``Ctrl+Z`` | undo previous action
-``Ctrl+Shift+Z``/``Ctrl+Y``| redo previous action
-``Shift+B``/``Alt+B`` | increase/decrease brightness on an image
-``Shift+C``/``Alt+C`` | increase/decrease contrast on an image
-``Shift+S``/``Alt+S`` | increase/decrease saturation on an image
-``Ctrl+S`` | save job
-``Ctrl+B`` | propagate active shape
-``+``/``-`` | change relative order of highlighted box (if Z-Order is enabled)
-| | __Interpolation__ |
-``M`` | enter/apply merge mode
-``Esc`` | close merge mode without apply the merge
-``R`` | go to the next key frame of an active shape
-``E`` | go to the previous key frame of an active shape
-``O`` | change attribute of an active shape to "Outside the frame"
-``K`` | mark current frame as key frame on an active shape
-| | __Attribute annotation mode__ |
-``Shift+Enter`` | enter/leave Attribute Annotation mode
-``Up Arrow`` | go to the next attribute (up)
-``Down Arrow`` | go to the next attribute (down)
-``Tab`` | go to the next annotated object
-``Shift+Tab`` | go to the previous annotated object
-```` | assign a corresponding value to the current attribute
-| | __Grouping__ |
-``G`` | switch group mode
-``Esc`` | close group mode
-``Shift+G`` | reset group for selected shapes
-| | __Filter__ |
-``Left Arrow`` | go to the previous frame which corresponds to the specified filter value
-``Right Arrow`` | go to the next frame which corresponds to the specified filter value
-
-### Hints
-
-Hold ``Mouse Wheel`` in order to move frame (for example during drawing)
+| Shortcut | Common |
+|----------------------- |------------------------------ |
+| ``F1`` | open help |
+| ``F1`` in dashboard | open page with documentation |
+| ``F2`` | open settings |
+| ``L`` | lock/unlock an active shape |
+| ``L+T`` | lock/unlock all shapes on the current frame |
+| ``Q`` or ``Num/`` | set occluded property for an active shape |
+| ``N`` | start/stop draw mode |
+| ``Esc`` | close draw mode without create |
+| ``Ctrl+`` | change type of an active shape |
+| ``Shift+`` | change type of new shape by default |
+| `` Alt + >`` | switch next default shape type |
+| ``Alt + <`` | switch previous default shape type |
+| ``Enter`` | change color of active shape |
+| ``H`` | hide active shape |
+| ``T+H`` | hide all shapes |
+| ``J`` | hide labels with attributes on every frame |
+| ``Delete`` | delete an active shape |
+| ``Shift+Delete`` | delete an active shape even if it is locked |
+| ``F`` | go to next frame |
+| ``D`` | go to previous frame |
+| ``V`` | go forward with a predefined step |
+| ``C`` | go backward with a predefined step |
+| ``~`` | focus to ``go to frame`` element |
+| ``Ctrl + R`` | clockwise image rotation |
+| ``Ctrl + Shift + R`` | counter clockwise image rotation |
+| ``Ctrl+C`` | copy an active shape |
+| ``Ctrl+V`` | insert a copied shape |
+| ``Ctrl+Z`` | undo previous action |
+| ``Ctrl+Shift+Z``/``Ctrl+Y`` | redo previous action |
+| ``Shift+B``/``Alt+B`` | increase/decrease brightness on an image |
+| ``Shift+C``/``Alt+C`` | increase/decrease contrast on an image |
+| ``Shift+S``/``Alt+S`` | increase/decrease saturation on an image |
+| ``Alt + G + '+', Alt + G + '-'`` | increase/decrease grid opacity |
+| ``Alt + G + Enter`` | change grid color |
+| ``Ctrl+S`` | save job |
+| ``Ctrl+B`` | propagate active shape |
+| ``+``/``-`` | change relative order of highlighted box (if Z-Order is enabled) |
+| | **Interpolation** |
+| ``M`` | enter/apply merge mode |
+| ``Esc`` | close merge mode without apply the merge |
+| ``R`` | go to the next key frame of an active shape |
+| ``E`` | go to the previous key frame of an active shape |
+| ``O`` | change attribute of an active shape to "Outside the frame" |
+| ``K`` | mark current frame as key frame on an active shape |
+| | **Attribute annotation mode** |
+| ``Shift+Enter`` | enter/leave Attribute Annotation mode |
+| ``Up Arrow`` | go to the next attribute (up) |
+| ``Down Arrow`` | go to the next attribute (down) |
+| ``Tab`` | go to the next annotated object |
+| ``Shift+Tab`` | go to the previous annotated object |
+| ```` | assign a corresponding value to the current attribute |
+| | **Grouping** |
+| ``G`` | switch group mode |
+| ``Esc`` | close group mode |
+| ``Shift+G`` | reset group for selected shapes |
+| | **Filter** |
+| ``Left Arrow`` | go to the previous frame which corresponds to the specified filter value |
+| ``Right Arrow`` | go to the next frame which corresponds to the specified filter value |
+
+## Hints
+Hold ``Mouse Wheel`` to move frame (for example, while drawing)
Hold ``Ctrl`` when shape is active and fix it.
diff --git a/cvat/apps/engine/__init__.py b/cvat/apps/engine/__init__.py
index d8e62e54..8c438336 100644
--- a/cvat/apps/engine/__init__.py
+++ b/cvat/apps/engine/__init__.py
@@ -1,5 +1,5 @@
-
# Copyright (C) 2018 Intel Corporation
#
# SPDX-License-Identifier: MIT
+default_app_config = 'cvat.apps.engine.apps.EngineConfig'
diff --git a/cvat/apps/engine/admin.py b/cvat/apps/engine/admin.py
index 9cc6599c..55786f89 100644
--- a/cvat/apps/engine/admin.py
+++ b/cvat/apps/engine/admin.py
@@ -56,8 +56,7 @@ class SegmentAdmin(admin.ModelAdmin):
class TaskAdmin(admin.ModelAdmin):
date_hierarchy = 'updated_date'
- readonly_fields = ('size', 'path', 'created_date', 'updated_date',
- 'overlap', 'flipped')
+ readonly_fields = ('size', 'created_date', 'updated_date', 'overlap', 'flipped')
list_display = ('name', 'mode', 'owner', 'assignee', 'created_date', 'updated_date')
search_fields = ('name', 'mode', 'owner__username', 'owner__first_name',
'owner__last_name', 'owner__email', 'assignee__username', 'assignee__first_name',
diff --git a/cvat/apps/engine/annotation.py b/cvat/apps/engine/annotation.py
index 79f4f126..ef1d0bcc 100644
--- a/cvat/apps/engine/annotation.py
+++ b/cvat/apps/engine/annotation.py
@@ -1,514 +1,128 @@
-
# Copyright (C) 2018 Intel Corporation
#
# SPDX-License-Identifier: MIT
import os
import copy
+from enum import Enum
from django.utils import timezone
-from collections import OrderedDict
import numpy as np
from scipy.optimize import linear_sum_assignment
from collections import OrderedDict
-from distutils.util import strtobool
from xml.sax.saxutils import XMLGenerator
from abc import ABCMeta, abstractmethod
from PIL import Image
+from shapely import geometry
-import django_rq
from django.conf import settings
from django.db import transaction
from cvat.apps.profiler import silk_profile
+from cvat.apps.engine.plugins import plugin_decorator
from . import models
-from .task import get_frame_path, get_image_meta_cache
+from .task import get_image_meta_cache
from .log import slogger
+from . import serializers
+
+class PatchAction(str, Enum):
+ CREATE = "create"
+ UPDATE = "update"
+ DELETE = "delete"
+
+ @classmethod
+ def values(cls):
+ return [item.value for item in cls]
-############################# Low Level server API
-
-FORMAT_XML = 1
-FORMAT_JSON = 2
-
-def dump(tid, data_format, scheme, host):
- """
- Dump annotation for the task in specified data format.
- """
- queue = django_rq.get_queue('default')
- queue.enqueue_call(func=_dump, args=(tid, data_format, scheme, host),
- job_id="annotation.dump/{}".format(tid))
-
-def check(tid):
- """
- Check that potentially long operation 'dump' is completed.
- Return the status as json/dictionary object.
- """
- queue = django_rq.get_queue('default')
- job = queue.fetch_job("annotation.dump/{}".format(tid))
- if job is None:
- response = {"state": "unknown"}
- elif job.is_failed:
- # FIXME: here we have potential race. In general job.exc_info is
- # initialized inside handler but the method can be called before
- # that. By a reason exc_info isn't initialized by RQ python.
- response = {
- "state": "error",
- "stderr": job.exc_info}
- elif job.is_finished:
- response = {"state": "created"}
- else:
- response = {"state": "started"}
-
- return response
+ def __str__(self):
+ return self.value
+@silk_profile(name="GET job data")
@transaction.atomic
-def get(jid):
- """
- Get annotations for the job.
- """
- db_job = models.Job.objects.select_for_update().get(id=jid)
- annotation = _AnnotationForJob(db_job)
+def get_job_data(pk, user):
+ annotation = JobAnnotation(pk, user)
annotation.init_from_db()
- return annotation.to_client()
+ return annotation.data
-@silk_profile(name="Save job")
+@silk_profile(name="POST job data")
@transaction.atomic
-def save_job(jid, data):
- """
- Save new annotations for the job.
- """
- slogger.job[jid].info("Enter save_job API: jid = {}".format(jid))
- db_job = models.Job.objects.select_related('segment__task') \
- .select_for_update().get(id=jid)
+def put_job_data(pk, user, data):
+ annotation = JobAnnotation(pk, user)
+ annotation.put(data)
- annotation = _AnnotationForJob(db_job)
- annotation.force_set_client_id(data['create'])
- client_ids = annotation.validate_data_from_client(data)
+ return annotation.data
- annotation.delete_from_db(data['delete'])
- annotation.save_to_db(data['create'])
- annotation.update_in_db(data['update'])
-
- db_job.segment.task.updated_date = timezone.now()
- db_job.segment.task.save()
+@silk_profile(name="UPDATE job data")
+@plugin_decorator
+@transaction.atomic
+def patch_job_data(pk, user, data, action):
+ annotation = JobAnnotation(pk, user)
+ if action == PatchAction.CREATE:
+ annotation.create(data)
+ elif action == PatchAction.UPDATE:
+ annotation.update(data)
+ elif action == PatchAction.DELETE:
+ annotation.delete(data)
+
+ return annotation.data
+
+@silk_profile(name="DELETE job data")
+@transaction.atomic
+def delete_job_data(pk, user):
+ annotation = JobAnnotation(pk, user)
+ annotation.delete()
- db_job.max_shape_id = max(db_job.max_shape_id, max(client_ids['create']) if client_ids['create'] else -1)
- db_job.save()
+@silk_profile(name="GET task data")
+@transaction.atomic
+def get_task_data(pk, user):
+ annotation = TaskAnnotation(pk, user)
+ annotation.init_from_db()
- slogger.job[jid].info("Leave save_job API: jid = {}".format(jid))
+ return annotation.data
-@silk_profile(name="Clear job")
+@silk_profile(name="POST task data")
@transaction.atomic
-def clear_job(jid):
- """
- Clear annotations for the job.
- """
- slogger.job[jid].info("Enter clear_job API: jid = {}".format(jid))
- db_job = models.Job.objects.select_related('segment__task') \
- .select_for_update().get(id=jid)
-
- annotation = _AnnotationForJob(db_job)
- annotation.delete_all_shapes_from_db()
- annotation.delete_all_paths_from_db()
-
- db_job.segment.task.updated_date = timezone.now()
- db_job.segment.task.save()
- slogger.job[jid].info("Leave clear_job API: jid = {}".format(jid))
-
-# pylint: disable=unused-argument
-@silk_profile(name="Save task")
-def save_task(tid, data):
- """
- Save new annotations for the task.
- """
- slogger.task[tid].info("Enter save_task API: tid = {}".format(tid))
- db_task = models.Task.objects.get(id=tid)
- db_segments = list(db_task.segment_set.prefetch_related('job_set').all())
-
- splitted_data = {}
-
- for segment in db_segments:
- jid = segment.job_set.first().id
- start = segment.start_frame
- stop = segment.stop_frame
- splitted_data[jid] = {}
- for action in ['create', 'update', 'delete']:
- splitted_data[jid][action] = {
- "boxes": list(filter(lambda x: start <= int(x['frame']) <= stop, data[action]['boxes'])),
- "polygons": list(filter(lambda x: start <= int(x['frame']) <= stop, data[action]['polygons'])),
- "polylines": list(filter(lambda x: start <= int(x['frame']) <= stop, data[action]['polylines'])),
- "points": list(filter(lambda x: start <= int(x['frame']) <= stop, data[action]['points'])),
- "box_paths": list(filter(lambda x: len(list(filter(lambda y: (start <= int(y['frame']) <= stop) and (not y['outside']), x['shapes']))), data[action]['box_paths'])),
- "polygon_paths": list(filter(lambda x: len(list(filter(lambda y: (start <= int(y['frame']) <= stop) and (not y['outside']), x['shapes']))), data[action]['polygon_paths'])),
- "polyline_paths": list(filter(lambda x: len(list(filter(lambda y: (start <= int(y['frame']) <= stop) and (not y['outside']), x['shapes']))), data[action]['polyline_paths'])),
- "points_paths": list(filter(lambda x: len(list(filter(lambda y: (start <= int(y['frame']) <= stop) and (not y['outside']), x['shapes']))), data[action]['points_paths'])),
- }
+def put_task_data(pk, user, data):
+ annotation = TaskAnnotation(pk, user)
+ annotation.put(data)
- for jid, _data in splitted_data.items():
- # if an item inside _data isn't empty need to call save_job
- isNonEmpty = False
- for action in ['create', 'update', 'delete']:
- for objects in _data[action].values():
- if objects:
- isNonEmpty = True
- break
-
- if isNonEmpty:
- save_job(jid, _data)
-
- slogger.task[tid].info("Leave save_task API: tid = {}".format(tid))
-
-
-# pylint: disable=unused-argument
-@silk_profile(name="Clear task")
-def clear_task(tid):
- """
- Clear annotations for the task.
- """
- slogger.task[tid].info("Enter clear_task API: tid = {}".format(tid))
- db_task = models.Task.objects.get(id=tid)
- db_segments = list(db_task.segment_set.prefetch_related('job_set').all())
-
- for db_segment in db_segments:
- for db_job in list(db_segment.job_set.all()):
- clear_job(db_job.id)
-
- slogger.task[tid].info("Leave clear_task API: tid = {}".format(tid))
-
-# pylint: disable=unused-argument
-def rq_handler(job, exc_type, exc_value, traceback):
- tid = job.id.split('/')[1]
- slogger.task[tid].error("dump annotation error was occured", exc_info=True)
-
-##################################################
-
-class _Label:
- def __init__(self, db_label):
- self.id = db_label.id
- self.name = db_label.name
-
-class _Attribute:
- def __init__(self, db_attr, value):
- self.id = db_attr.id
- self.name = db_attr.get_name()
- if db_attr.get_type() == 'checkbox':
- self.value = str(value).lower()
- else:
- self.value = str(value)
-
-class _BoundingBox:
- def __init__(self, x0, y0, x1, y1, frame, occluded, z_order, client_id=None, attributes=None):
- self.xtl = x0
- self.ytl = y0
- self.xbr = x1
- self.ybr = y1
- self.occluded = occluded
- self.z_order = z_order
- self.client_id = client_id
- self.frame = frame
- self.attributes = attributes if attributes else []
-
- def merge(self, box):
- # The occluded property and attributes cannot be merged. Let's keep
- # original attributes and occluded property of the self object.
- assert self.frame == box.frame
- self.xtl = (self.xtl + box.xtl) / 2
- self.ytl = (self.ytl + box.ytl) / 2
- self.xbr = (self.xbr + box.xbr) / 2
- self.ybr = (self.ybr + box.ybr) / 2
-
- def add_attribute(self, attr):
- self.attributes.append(attr)
-
-class _LabeledBox(_BoundingBox):
- def __init__(self, label, x0, y0, x1, y1, frame, group_id, occluded, z_order, client_id=None, attributes=None):
- super().__init__(x0, y0, x1, y1, frame, occluded, z_order, client_id, attributes)
- self.label = label
- self.group_id = group_id
-
-class _TrackedBox(_BoundingBox):
- def __init__(self, x0, y0, x1, y1, frame, occluded, z_order, outside, attributes=None):
- super().__init__(x0, y0, x1, y1, frame, occluded, z_order, None, attributes)
- self.outside = outside
-
-class _InterpolatedBox(_TrackedBox):
- def __init__(self, x0, y0, x1, y1, frame, occluded, z_order, outside, keyframe, attributes=None):
- super().__init__(x0, y0, x1, y1, frame, occluded, z_order, outside, attributes)
- self.keyframe = keyframe
-
-class _PolyShape:
- def __init__(self, points, frame, occluded, z_order, client_id=None, attributes=None):
- self.points = points
- self.frame = frame
- self.occluded = occluded
- self.z_order = z_order
- self.client_id=client_id
- self.attributes = attributes if attributes else []
-
- def add_attribute(self, attr):
- self.attributes.append(attr)
-
-class _LabeledPolyShape(_PolyShape):
- def __init__(self, label, points, frame, group_id, occluded, z_order, client_id=None, attributes=None):
- super().__init__(points, frame, occluded, z_order, client_id, attributes)
- self.label = label
- self.group_id = group_id
-
-class _TrackedPolyShape(_PolyShape):
- def __init__(self, points, frame, occluded, z_order, outside, attributes=None):
- super().__init__(points, frame, occluded, z_order, None, attributes)
- self.outside = outside
-
-class _InterpolatedPolyShape(_TrackedPolyShape):
- def __init__(self, points, frame, occluded, z_order, outside, keyframe, attributes=None):
- super().__init__(points, frame, occluded, z_order, outside, attributes)
- self.keyframe = keyframe
-
-class _BoxPath:
- def __init__(self, label, start_frame, stop_frame, group_id, boxes=None, client_id=None, attributes=None):
- self.label = label
- self.frame = start_frame
- self.stop_frame = stop_frame
- self.group_id = group_id
- self.boxes = boxes if boxes else []
- self.client_id = client_id
- self.attributes = attributes if attributes else []
- self._interpolated_boxes = []
- assert not self.boxes or self.boxes[-1].frame <= self.stop_frame
-
- def add_box(self, box):
- self.boxes.append(box)
-
- def get_interpolated_boxes(self):
- if not self._interpolated_boxes:
- self._init_interpolated_boxes()
-
- return self._interpolated_boxes
-
- def _init_interpolated_boxes(self):
- assert self.boxes[-1].frame <= self.stop_frame
-
- boxes = []
- stop_box = copy.copy(self.boxes[-1])
- stop_box.frame = self.stop_frame + 1
- attributes = {}
- for box0, box1 in zip(self.boxes, self.boxes[1:] + [stop_box]):
- assert box0.frame < box1.frame
-
- distance = float(box1.frame - box0.frame)
- delta_xtl = (box1.xtl - box0.xtl) / distance
- delta_ytl = (box1.ytl - box0.ytl) / distance
- delta_xbr = (box1.xbr - box0.xbr) / distance
- delta_ybr = (box1.ybr - box0.ybr) / distance
-
- # New box doesn't have all attributes (only first one does).
- # Thus it is necessary to propagate them.
- for attr in box0.attributes:
- attributes[attr.id] = attr
-
- for frame in range(box0.frame, box1.frame):
- off = frame - box0.frame
- xtl = box0.xtl + delta_xtl * off
- ytl = box0.ytl + delta_ytl * off
- xbr = box0.xbr + delta_xbr * off
- ybr = box0.ybr + delta_ybr * off
-
- box = _InterpolatedBox(xtl, ytl, xbr, ybr, frame, box0.occluded, box0.z_order,
- box0.outside, box0.frame == frame, list(attributes.values()))
- boxes.append(box)
-
- if box0.outside:
- break
-
- self._interpolated_boxes = boxes
-
- def merge(self, path):
- assert self.label.id == path.label.id
- boxes = {box.frame:box for box in self.boxes}
- for box in path.boxes:
- if box.frame in boxes:
- boxes[box.frame].merge(box)
- else:
- boxes[box.frame] = box
-
- self.frame = min(self.frame, path.frame)
- self.stop_frame = max(self.stop_frame, path.stop_frame)
- self.boxes = list(sorted(boxes.values(), key=lambda box: box.frame))
- self._interpolated_boxes = []
-
- def add_attribute(self, attr):
- self.attributes.append(attr)
-
-class _PolyPath:
- def __init__(self, label, start_frame, stop_frame, group_id, shapes=None, client_id=None, attributes=None):
- self.label = label
- self.frame = start_frame
- self.stop_frame = stop_frame
- self.group_id = group_id
- self.shapes = shapes if shapes else []
- self.client_id = client_id
- self.attributes = attributes if attributes else []
- self._interpolated_shapes = [] # ???
-
- def add_shape(self, shape):
- self.shapes.append(shape)
-
- def get_interpolated_shapes(self):
- if not self._interpolated_shapes:
- self._init_interpolated_shapes()
-
- return self._interpolated_shapes
-
- def _init_interpolated_shapes(self):
- assert self.shapes[-1].frame <= self.stop_frame
- self._interpolated_shapes = []
- shapes = {shape.frame: shape for shape in self.shapes}
- outside = False
- attributes = {}
- for frame in range(self.frame, self.stop_frame + 1):
- if frame in shapes:
- for attr in shapes[frame].attributes:
- attributes[attr.id] = attr
- shape = _InterpolatedPolyShape(shapes[frame].points, frame,
- shapes[frame].occluded, shapes[frame].z_order, shapes[frame].outside, True, list(attributes.values()))
- outside = shape.outside
- self._interpolated_shapes.append(shape)
- elif not outside:
- shape = _InterpolatedPolyShape(self._interpolated_shapes[-1].points, frame, False,
- 0, True, True, list(attributes.values()))
- outside = shape.outside
- self._interpolated_shapes.append(shape)
-
- def merge(self, path):
- pass
+ return annotation.data
- def add_attribute(self, attr):
- self.attributes.append(attr)
+@silk_profile(name="UPDATE task data")
+@transaction.atomic
+def patch_task_data(pk, user, data, action):
+ annotation = TaskAnnotation(pk, user)
+ if action == PatchAction.CREATE:
+ annotation.create(data)
+ elif action == PatchAction.UPDATE:
+ annotation.update(data)
+ elif action == PatchAction.DELETE:
+ annotation.delete(data)
+
+ return annotation.data
+
+@silk_profile(name="DELETE task data")
+@transaction.atomic
+def delete_task_data(pk, user):
+ annotation = TaskAnnotation(pk, user)
+ annotation.delete()
+
+
+def dump_task_data(pk, user, file_path, scheme, host, query_params):
+ # For big tasks dump function may run for a long time and
+ # we dont need to acquire lock after _AnnotationForTask instance
+ # has been initialized from DB.
+ # But there is the bug with corrupted dump file in case 2 or more dump request received at the same time.
+ # https://github.com/opencv/cvat/issues/217
+ with transaction.atomic():
+ annotation = TaskAnnotation(pk, user)
+ annotation.init_from_db()
-class _Annotation:
- def __init__(self, start_frame, stop_frame):
- self.start_frame = start_frame
- self.stop_frame = stop_frame
- self.reset()
+ annotation.dump(file_path, scheme, host, query_params)
- def reset(self):
- self.boxes = []
- self.box_paths = []
- self.polygons = []
- self.polygon_paths = []
- self.polylines = []
- self.polyline_paths = []
- self.points = []
- self.points_paths = []
-
- def has_data(self):
- non_empty = False
- for attr in ['boxes', 'box_paths', 'polygons', 'polygon_paths',
- 'polylines', 'polyline_paths', 'points', 'points_paths']:
- non_empty |= bool(getattr(self, attr))
-
- return non_empty
-
- # Functions below used by dump functionality
- def to_boxes(self):
- boxes = []
- for path in self.box_paths:
- for box in path.get_interpolated_boxes():
- if not box.outside:
- box = _LabeledBox(
- label=path.label,
- x0=box.xtl, y0=box.ytl, x1=box.xbr, y1=box.ybr,
- frame=box.frame,
- group_id=path.group_id,
- occluded=box.occluded,
- z_order=box.z_order,
- attributes=box.attributes + path.attributes,
- )
- boxes.append(box)
-
- return self.boxes + boxes
-
- def _to_poly_shapes(self, iter_attr_name):
- shapes = []
- for path in getattr(self, iter_attr_name):
- for shape in path.get_interpolated_shapes():
- if not shape.outside:
- shape = _LabeledPolyShape(
- label=path.label,
- points=shape.points,
- frame=shape.frame,
- group_id=path.group_id,
- occluded=shape.occluded,
- z_order=shape.z_order,
- attributes=shape.attributes + path.attributes,
- )
- shapes.append(shape)
- return shapes
+######
- def to_polygons(self):
- polygons = self._to_poly_shapes('polygon_paths')
- return polygons + self.polygons
-
- def to_polylines(self):
- polylines = self._to_poly_shapes('polyline_paths')
- return polylines + self.polylines
-
- def to_points(self):
- points = self._to_poly_shapes('points_paths')
- return points + self.points
-
- def to_box_paths(self):
- paths = []
- for box in self.boxes:
- box0 = _InterpolatedBox(box.xtl, box.ytl, box.xbr, box.ybr, box.frame,
- box.occluded, box.z_order, False, True)
- box1 = copy.copy(box0)
- box1.outside = True
- box1.frame += 1
- path = _BoxPath(
- label=box.label,
- start_frame=box.frame,
- stop_frame=box.frame + 1,
- group_id=box.group_id,
- boxes=[box0, box1],
- attributes=box.attributes,
- client_id=box.client_id,
- )
- paths.append(path)
-
- return self.box_paths + paths
-
-
- def _to_poly_paths(self, iter_attr_name):
- paths = []
- for shape in getattr(self, iter_attr_name):
- shape0 = _InterpolatedPolyShape(shape.points, shape.frame, shape.occluded, shape.z_order, False, True)
- shape1 = copy.copy(shape0)
- shape1.outside = True
- shape1.frame += 1
- path = _PolyPath(
- label=shape.label,
- start_frame=shape.frame,
- stop_frame=shape.frame + 1,
- group_id=shape.group_id,
- shapes=[shape0, shape1],
- client_id=shape.client_id,
- attributes=shape.attributes,
- )
- paths.append(path)
-
- return paths
-
- def to_polygon_paths(self):
- return self._to_poly_paths('polygons') + self.polygon_paths
-
- def to_polyline_paths(self):
- return self._to_poly_paths('polylines') + self.polyline_paths
-
- def to_points_paths(self):
- return self._to_poly_paths('points') + self.points_paths
-
-def bulk_create(db_model, objects, flt_param = {}):
+def bulk_create(db_model, objects, flt_param):
if objects:
if flt_param:
if 'postgresql' in settings.DATABASES["default"]["ENGINE"]:
@@ -521,1005 +135,451 @@ def bulk_create(db_model, objects, flt_param = {}):
else:
return db_model.objects.bulk_create(objects)
-class _AnnotationForJob(_Annotation):
- def __init__(self, db_job):
- db_segment = db_job.segment
- super().__init__(db_segment.start_frame, db_segment.stop_frame)
+ return []
+
+def _merge_table_rows(rows, keys_for_merge, field_id):
+ """dot.notation access to dictionary attributes"""
+ from collections import OrderedDict
+ class dotdict(OrderedDict):
+ __getattr__ = OrderedDict.get
+ __setattr__ = OrderedDict.__setitem__
+ __delattr__ = OrderedDict.__delitem__
+ __eq__ = lambda self, other: self.id == other.id
+ __hash__ = lambda self: self.id
+
+ # It is necessary to keep a stable order of original rows
+ # (e.g. for tracked boxes). Otherwise prev_box.frame can be bigger
+ # than next_box.frame.
+ merged_rows = OrderedDict()
+
+ # Group all rows by field_id. In grouped rows replace fields in
+ # accordance with keys_for_merge structure.
+ for row in rows:
+ row_id = row[field_id]
+ if not row_id in merged_rows:
+ merged_rows[row_id] = dotdict(row)
+ for key in keys_for_merge:
+ merged_rows[row_id][key] = []
+
+ for key in keys_for_merge:
+ item = dotdict({v.split('__', 1)[-1]:row[v] for v in keys_for_merge[key]})
+ if item.id is not None:
+ merged_rows[row_id][key].append(item)
+
+ # Remove redundant keys from final objects
+ redundant_keys = [item for values in keys_for_merge.values() for item in values]
+ for i in merged_rows:
+ for j in redundant_keys:
+ del merged_rows[i][j]
+
+ return list(merged_rows.values())
+
+class JobAnnotation:
+ def __init__(self, pk, user):
+ self.user = user
+ self.db_job = models.Job.objects.select_related('segment__task') \
+ .select_for_update().get(id=pk)
+
+ db_segment = self.db_job.segment
+ self.start_frame = db_segment.start_frame
+ self.stop_frame = db_segment.stop_frame
+ self.reset()
# pylint: disable=bad-continuation
- self.db_job = db_job
- self.logger = slogger.job[db_job.id]
+ self.logger = slogger.job[self.db_job.id]
self.db_labels = {db_label.id:db_label
- for db_label in db_job.segment.task.label_set.all()}
+ for db_label in db_segment.task.label_set.all()}
self.db_attributes = {db_attr.id:db_attr
for db_attr in models.AttributeSpec.objects.filter(
- label__task__id=db_job.segment.task.id)}
-
- def _get_client_ids_from_db(self):
- client_ids = set()
-
- ids = list(self.db_job.objectpath_set.values_list('client_id', flat=True))
- client_ids.update(ids)
-
- for shape_type in ['polygons', 'polylines', 'points', 'boxes']:
- ids = list(self._get_shape_class(shape_type).objects.filter(
- job_id=self.db_job.id).values_list('client_id', flat=True))
- client_ids.update(ids)
-
- return client_ids
-
- def _merge_table_rows(self, rows, keys_for_merge, field_id):
- """dot.notation access to dictionary attributes"""
- class dotdict(OrderedDict):
- __getattr__ = OrderedDict.get
- __setattr__ = OrderedDict.__setitem__
- __delattr__ = OrderedDict.__delitem__
- __eq__ = lambda self, other: self.id == other.id
- __hash__ = lambda self: self.id
-
- # It is necessary to keep a stable order of original rows
- # (e.g. for tracked boxes). Otherwise prev_box.frame can be bigger
- # than next_box.frame.
- merged_rows = OrderedDict()
-
- # Group all rows by field_id. In grouped rows replace fields in
- # accordance with keys_for_merge structure.
- for row in rows:
- row_id = row[field_id]
- if not row_id in merged_rows:
- merged_rows[row_id] = dotdict(row)
- for key in keys_for_merge:
- merged_rows[row_id][key] = []
+ label__task__id=db_segment.task.id)}
- for key in keys_for_merge:
- item = dotdict({v.split('__', 1)[-1]:row[v] for v in keys_for_merge[key]})
- if item.id:
- merged_rows[row_id][key].append(item)
-
- # Remove redundant keys from final objects
- redundant_keys = [item for values in keys_for_merge.values() for item in values]
- for i in merged_rows:
- for j in redundant_keys:
- del merged_rows[i][j]
-
- return list(merged_rows.values())
-
- @staticmethod
- def _clamp(value, min_value, max_value):
- return max(min(value, max_value), min_value)
-
- def _clamp_box(self, xtl, ytl, xbr, ybr, im_size):
- xtl = self._clamp(xtl, 0, im_size['width'])
- xbr = self._clamp(xbr, 0, im_size['width'])
- ytl = self._clamp(ytl, 0, im_size['height'])
- ybr = self._clamp(ybr, 0, im_size['height'])
-
- return xtl, ytl, xbr, ybr
-
- def _clamp_poly(self, points, im_size):
- verified = []
- points = points.split(' ')
- for p in points:
- p = p.split(',')
- verified.append('{},{}'.format(
- self._clamp(float(p[0]), 0, im_size['width']),
- self._clamp(float(p[1]), 0, im_size['height'])
- ))
+ def reset(self):
+ self.data = {
+ "version": 0,
+ "tags": [],
+ "shapes": [],
+ "tracks": []
+ }
- return ' '.join(verified)
+ def _save_tracks_to_db(self, tracks):
+ db_tracks = []
+ db_track_attrvals = []
+ db_shapes = []
+ db_shape_attrvals = []
+
+ for track in tracks:
+ track_attributes = track.pop("attributes", [])
+ shapes = track.pop("shapes")
+ db_track = models.LabeledTrack(job=self.db_job, **track)
+ if db_track.label_id not in self.db_labels:
+ raise AttributeError("label_id `{}` is invalid".format(db_track.label_id))
+
+ for attr in track_attributes:
+ db_attrval = models.LabeledTrackAttributeVal(**attr)
+ if db_attrval.spec_id not in self.db_attributes:
+ raise AttributeError("spec_id `{}` is invalid".format(db_attrval.spec_id))
+ db_attrval.track_id = len(db_tracks)
+ db_track_attrvals.append(db_attrval)
- def init_from_db(self):
- def get_values(shape_type):
- if shape_type == 'polygons':
- return [
- ('id', 'frame', 'points', 'label_id', 'group_id', 'occluded', 'z_order', 'client_id',
- 'labeledpolygonattributeval__value', 'labeledpolygonattributeval__spec_id',
- 'labeledpolygonattributeval__id'), {
- 'attributes': [
- 'labeledpolygonattributeval__value',
- 'labeledpolygonattributeval__spec_id',
- 'labeledpolygonattributeval__id'
- ]
- }, 'labeledpolygonattributeval_set'
- ]
- elif shape_type == 'polylines':
- return [
- ('id', 'frame', 'points', 'label_id', 'group_id', 'occluded', 'z_order', 'client_id',
- 'labeledpolylineattributeval__value', 'labeledpolylineattributeval__spec_id',
- 'labeledpolylineattributeval__id'), {
- 'attributes': [
- 'labeledpolylineattributeval__value',
- 'labeledpolylineattributeval__spec_id',
- 'labeledpolylineattributeval__id'
- ]
- }, 'labeledpolylineattributeval_set'
- ]
- elif shape_type == 'boxes':
- return [
- ('id', 'frame', 'xtl', 'ytl', 'xbr', 'ybr', 'label_id', 'group_id', 'occluded', 'z_order', 'client_id',
- 'labeledboxattributeval__value', 'labeledboxattributeval__spec_id',
- 'labeledboxattributeval__id'), {
- 'attributes': [
- 'labeledboxattributeval__value',
- 'labeledboxattributeval__spec_id',
- 'labeledboxattributeval__id'
- ]
- }, 'labeledboxattributeval_set'
- ]
- elif shape_type == 'points':
- return [
- ('id', 'frame', 'points', 'label_id', 'group_id', 'occluded', 'z_order', 'client_id',
- 'labeledpointsattributeval__value', 'labeledpointsattributeval__spec_id',
- 'labeledpointsattributeval__id'), {
- 'attributes': [
- 'labeledpointsattributeval__value',
- 'labeledpointsattributeval__spec_id',
- 'labeledpointsattributeval__id'
- ]
- }, 'labeledpointsattributeval_set'
- ]
+ for shape in shapes:
+ shape_attributes = shape.pop("attributes", [])
+ # FIXME: need to clamp points (be sure that all of them inside the image)
+ # Should we check here or implement a validator?
+ db_shape = models.TrackedShape(**shape)
+ db_shape.track_id = len(db_tracks)
+
+ for attr in shape_attributes:
+ db_attrval = models.TrackedShapeAttributeVal(**attr)
+ if db_attrval.spec_id not in self.db_attributes:
+ raise AttributeError("spec_id `{}` is invalid".format(db_attrval.spec_id))
+ db_attrval.shape_id = len(db_shapes)
+ db_shape_attrvals.append(db_attrval)
+ db_shapes.append(db_shape)
+ shape["attributes"] = shape_attributes
+
+ db_tracks.append(db_track)
+ track["attributes"] = track_attributes
+ track["shapes"] = shapes
+
+ db_tracks = bulk_create(
+ db_model=models.LabeledTrack,
+ objects=db_tracks,
+ flt_param={"job_id": self.db_job.id}
+ )
+
+ for db_attrval in db_track_attrvals:
+ db_attrval.track_id = db_tracks[db_attrval.track_id].id
+ bulk_create(
+ db_model=models.LabeledTrackAttributeVal,
+ objects=db_track_attrvals,
+ flt_param={}
+ )
+
+ for db_shape in db_shapes:
+ db_shape.track_id = db_tracks[db_shape.track_id].id
+
+ db_shapes = bulk_create(
+ db_model=models.TrackedShape,
+ objects=db_shapes,
+ flt_param={"track__job_id": self.db_job.id}
+ )
+
+ for db_attrval in db_shape_attrvals:
+ db_attrval.shape_id = db_shapes[db_attrval.shape_id].id
+
+ bulk_create(
+ db_model=models.TrackedShapeAttributeVal,
+ objects=db_shape_attrvals,
+ flt_param={}
+ )
+
+ shape_idx = 0
+ for track, db_track in zip(tracks, db_tracks):
+ track["id"] = db_track.id
+ for shape in track["shapes"]:
+ shape["id"] = db_shapes[shape_idx].id
+ shape_idx += 1
+
+ self.data["tracks"] = tracks
+
+ def _save_shapes_to_db(self, shapes):
+ db_shapes = []
+ db_attrvals = []
+
+ for shape in shapes:
+ attributes = shape.pop("attributes", [])
+ # FIXME: need to clamp points (be sure that all of them inside the image)
+ # Should we check here or implement a validator?
+ db_shape = models.LabeledShape(job=self.db_job, **shape)
+ if db_shape.label_id not in self.db_labels:
+ raise AttributeError("label_id `{}` is invalid".format(db_shape.label_id))
+
+ for attr in attributes:
+ db_attrval = models.LabeledShapeAttributeVal(**attr)
+ if db_attrval.spec_id not in self.db_attributes:
+ raise AttributeError("spec_id `{}` is invalid".format(db_attrval.spec_id))
+ db_attrval.shape_id = len(db_shapes)
+ db_attrvals.append(db_attrval)
+
+ db_shapes.append(db_shape)
+ shape["attributes"] = attributes
+
+ db_shapes = bulk_create(
+ db_model=models.LabeledShape,
+ objects=db_shapes,
+ flt_param={"job_id": self.db_job.id}
+ )
+
+ for db_attrval in db_attrvals:
+ db_attrval.shape_id = db_shapes[db_attrval.shape_id].id
+
+ bulk_create(
+ db_model=models.LabeledShapeAttributeVal,
+ objects=db_attrvals,
+ flt_param={}
+ )
+
+ for shape, db_shape in zip(shapes, db_shapes):
+ shape["id"] = db_shape.id
+
+ self.data["shapes"] = shapes
+
+ def _save_tags_to_db(self, tags):
+ db_tags = []
+ db_attrvals = []
+
+ for tag in tags:
+ attributes = tag.pop("attributes", [])
+ db_tag = models.LabeledImage(job=self.db_job, **tag)
+ if db_tag.label_id not in self.db_labels:
+ raise AttributeError("label_id `{}` is invalid".format(db_tag.label_id))
+
+ for attr in attributes:
+ db_attrval = models.LabeledImageAttributeVal(**attr)
+ if db_attrval.spec_id not in self.db_attributes:
+ raise AttributeError("spec_id `{}` is invalid".format(db_attrval.spec_id))
+ db_attrval.tag_id = len(db_tags)
+ db_attrvals.append(db_attrval)
+
+ db_tags.append(db_tag)
+ tag["attributes"] = attributes
+
+ db_tags = bulk_create(
+ db_model=models.LabeledImage,
+ objects=db_tags,
+ flt_param={"job_id": self.db_job.id}
+ )
+
+ for db_attrval in db_attrvals:
+ db_attrval.tag_id = db_tags[db_attrval.tag_id].id
+
+ bulk_create(
+ db_model=models.LabeledImageAttributeVal,
+ objects=db_attrvals,
+ flt_param={}
+ )
+
+ for tag, db_tag in zip(tags, db_tags):
+ tag["id"] = db_tag.id
+
+ self.data["tags"] = tags
+
+ def _commit(self):
+ db_prev_commit = self.db_job.commits.last()
+ db_curr_commit = models.JobCommit()
+ if db_prev_commit:
+ db_curr_commit.version = db_prev_commit.version + 1
+ else:
+ db_curr_commit.version = 1
+ db_curr_commit.job = self.db_job
+ db_curr_commit.message = "Changes: tags - {}; shapes - {}; tracks - {}".format(
+ len(self.data["tags"]), len(self.data["shapes"]), len(self.data["tracks"]))
+ db_curr_commit.save()
+ self.data["version"] = db_curr_commit.version
+
+ def _save_to_db(self, data):
self.reset()
- for shape_type in ['boxes', 'points', 'polygons', 'polylines']:
- (values, merge_keys, prefetch) = get_values(shape_type)
- db_shapes = list(self._get_shape_set(shape_type).prefetch_related(prefetch).
- values(*values).order_by('frame'))
- db_shapes = self._merge_table_rows(db_shapes, merge_keys, 'id')
- for db_shape in db_shapes:
- label = _Label(self.db_labels[db_shape.label_id])
- if shape_type == 'boxes':
- shape = _LabeledBox(label=label,
- x0=db_shape.xtl, y0=db_shape.ytl, x1=db_shape.xbr, y1=db_shape.ybr,
- frame=db_shape.frame,
- group_id=db_shape.group_id,
- occluded=db_shape.occluded,
- z_order=db_shape.z_order,
- client_id=db_shape.client_id,
- )
- else:
- shape = _LabeledPolyShape(
- label=label,
- points=db_shape.points,
- frame=db_shape.frame,
- group_id=db_shape.group_id,
- occluded=db_shape.occluded,
- z_order=db_shape.z_order,
- client_id=db_shape.client_id,
- )
- for db_attr in db_shape.attributes:
- if db_attr.id != None:
- spec = self.db_attributes[db_attr.spec_id]
- attr = _Attribute(spec, db_attr.value)
- shape.add_attribute(attr)
- getattr(self, shape_type).append(shape)
-
- db_paths = self.db_job.objectpath_set
- for shape in ['trackedpoints_set', 'trackedbox_set', 'trackedpolyline_set', 'trackedpolygon_set']:
- db_paths.prefetch_related(shape)
- for shape_attr in ['trackedpoints_set__trackedpointsattributeval_set', 'trackedbox_set__trackedboxattributeval_set',
- 'trackedpolygon_set__trackedpolygonattributeval_set', 'trackedpolyline_set__trackedpolylineattributeval_set']:
- db_paths.prefetch_related(shape_attr)
- db_paths.prefetch_related('objectpathattributeval_set')
- db_paths = list (db_paths.values('id', 'frame', 'group_id', 'shapes', 'client_id', 'objectpathattributeval__spec_id',
- 'objectpathattributeval__id', 'objectpathattributeval__value',
- 'trackedbox', 'trackedpolygon', 'trackedpolyline', 'trackedpoints',
- 'trackedbox__id', 'label_id', 'trackedbox__xtl', 'trackedbox__ytl',
- 'trackedbox__xbr', 'trackedbox__ybr', 'trackedbox__frame', 'trackedbox__occluded',
- 'trackedbox__z_order','trackedbox__outside', 'trackedbox__trackedboxattributeval__spec_id',
- 'trackedbox__trackedboxattributeval__value', 'trackedbox__trackedboxattributeval__id',
- 'trackedpolygon__id' ,'trackedpolygon__points', 'trackedpolygon__frame', 'trackedpolygon__occluded',
- 'trackedpolygon__z_order', 'trackedpolygon__outside', 'trackedpolygon__trackedpolygonattributeval__spec_id',
- 'trackedpolygon__trackedpolygonattributeval__value', 'trackedpolygon__trackedpolygonattributeval__id',
- 'trackedpolyline__id', 'trackedpolyline__points', 'trackedpolyline__frame', 'trackedpolyline__occluded',
- 'trackedpolyline__z_order', 'trackedpolyline__outside', 'trackedpolyline__trackedpolylineattributeval__spec_id',
- 'trackedpolyline__trackedpolylineattributeval__value', 'trackedpolyline__trackedpolylineattributeval__id',
- 'trackedpoints__id', 'trackedpoints__points', 'trackedpoints__frame', 'trackedpoints__occluded',
- 'trackedpoints__z_order', 'trackedpoints__outside', 'trackedpoints__trackedpointsattributeval__spec_id',
- 'trackedpoints__trackedpointsattributeval__value', 'trackedpoints__trackedpointsattributeval__id')
- .order_by('id', 'trackedbox__frame', 'trackedpolygon__frame', 'trackedpolyline__frame', 'trackedpoints__frame'))
-
- db_box_paths = list(filter(lambda path: path['shapes'] == 'boxes', db_paths ))
- db_polygon_paths = list(filter(lambda path: path['shapes'] == 'polygons', db_paths ))
- db_polyline_paths = list(filter(lambda path: path['shapes'] == 'polylines', db_paths ))
- db_points_paths = list(filter(lambda path: path['shapes'] == 'points', db_paths ))
-
- object_path_attr_merge_key = [
- 'objectpathattributeval__value',
- 'objectpathattributeval__spec_id',
- 'objectpathattributeval__id'
- ]
-
- db_box_paths = self._merge_table_rows(db_box_paths, {
- 'attributes': object_path_attr_merge_key,
- 'shapes': [
- 'trackedbox__id', 'trackedbox__xtl', 'trackedbox__ytl',
- 'trackedbox__xbr', 'trackedbox__ybr', 'trackedbox__frame',
- 'trackedbox__occluded', 'trackedbox__z_order', 'trackedbox__outside',
- 'trackedbox__trackedboxattributeval__value',
- 'trackedbox__trackedboxattributeval__spec_id',
- 'trackedbox__trackedboxattributeval__id'
- ],
- }, 'id')
-
- db_polygon_paths = self._merge_table_rows(db_polygon_paths, {
- 'attributes': object_path_attr_merge_key,
- 'shapes': [
- 'trackedpolygon__id', 'trackedpolygon__points', 'trackedpolygon__frame',
- 'trackedpolygon__occluded', 'trackedpolygon__z_order', 'trackedpolygon__outside',
- 'trackedpolygon__trackedpolygonattributeval__value',
- 'trackedpolygon__trackedpolygonattributeval__spec_id',
- 'trackedpolygon__trackedpolygonattributeval__id'
- ]
- }, 'id')
-
- db_polyline_paths = self._merge_table_rows(db_polyline_paths, {
- 'attributes': object_path_attr_merge_key,
- 'shapes': [
- 'trackedpolyline__id', 'trackedpolyline__points', 'trackedpolyline__frame',
- 'trackedpolyline__occluded', 'trackedpolyline__z_order', 'trackedpolyline__outside',
- 'trackedpolyline__trackedpolylineattributeval__value',
- 'trackedpolyline__trackedpolylineattributeval__spec_id',
- 'trackedpolyline__trackedpolylineattributeval__id'
- ],
- }, 'id')
-
- db_points_paths = self._merge_table_rows(db_points_paths, {
- 'attributes': object_path_attr_merge_key,
- 'shapes': [
- 'trackedpoints__id', 'trackedpoints__points', 'trackedpoints__frame',
- 'trackedpoints__occluded', 'trackedpoints__z_order', 'trackedpoints__outside',
- 'trackedpoints__trackedpointsattributeval__value',
- 'trackedpoints__trackedpointsattributeval__spec_id',
- 'trackedpoints__trackedpointsattributeval__id'
- ]
- }, 'id')
-
- for db_box_path in db_box_paths:
- db_box_path.attributes = list(set(db_box_path.attributes))
- db_box_path.shapes = self._merge_table_rows(db_box_path.shapes, {
- 'attributes': [
- 'trackedboxattributeval__value',
- 'trackedboxattributeval__spec_id',
- 'trackedboxattributeval__id'
- ]
- }, 'id')
-
- for db_polygon_path in db_polygon_paths:
- db_polygon_path.attributes = list(set(db_polygon_path.attributes))
- db_polygon_path.shapes = self._merge_table_rows(db_polygon_path.shapes, {
- 'attributes': [
- 'trackedpolygonattributeval__value',
- 'trackedpolygonattributeval__spec_id',
- 'trackedpolygonattributeval__id'
- ]
- }, 'id')
-
- for db_polyline_path in db_polyline_paths:
- db_polyline_path.attributes = list(set(db_polyline_path.attributes))
- db_polyline_path.shapes = self._merge_table_rows(db_polyline_path.shapes, {
- 'attributes': [
- 'trackedpolylineattributeval__value',
- 'trackedpolylineattributeval__spec_id',
- 'trackedpolylineattributeval__id'
- ]
- }, 'id')
-
- for db_points_path in db_points_paths:
- db_points_path.attributes = list(set(db_points_path.attributes))
- db_points_path.shapes = self._merge_table_rows(db_points_path.shapes, {
- 'attributes': [
- 'trackedpointsattributeval__value',
- 'trackedpointsattributeval__spec_id',
- 'trackedpointsattributeval__id'
+ self._save_tags_to_db(data["tags"])
+ self._save_shapes_to_db(data["shapes"])
+ self._save_tracks_to_db(data["tracks"])
+
+ return self.data["tags"] or self.data["shapes"] or self.data["tracks"]
+
+ def _create(self, data):
+ if self._save_to_db(data):
+ db_task = self.db_job.segment.task
+ db_task.updated_date = timezone.now()
+ db_task.save()
+ self.db_job.save()
+
+ def create(self, data):
+ self._create(data)
+ self._commit()
+
+ def put(self, data):
+ self._delete()
+ self._create(data)
+ self._commit()
+
+ def update(self, data):
+ self._delete(data)
+ self._create(data)
+ self._commit()
+
+ def _delete(self, data=None):
+ if data is None:
+ self.db_job.labeledimage_set.all().delete()
+ self.db_job.labeledshape_set.all().delete()
+ self.db_job.labeledtrack_set.all().delete()
+ else:
+ labeledimage_ids = [image["id"] for image in data["tags"]]
+ labeledshape_ids = [shape["id"] for shape in data["shapes"]]
+ labeledtrack_ids = [track["id"] for track in data["tracks"]]
+ labeledimage_set = self.db_job.labeledimage_set
+ labeledimage_set = labeledimage_set.filter(pk__in=labeledimage_ids)
+ labeledshape_set = self.db_job.labeledshape_set
+ labeledshape_set = labeledshape_set.filter(pk__in=labeledshape_ids)
+ labeledtrack_set = self.db_job.labeledtrack_set
+ labeledtrack_set = labeledtrack_set.filter(pk__in=labeledtrack_ids)
+
+ # It is not important for us that data had some "invalid" objects
+ # which were skipped (not acutally deleted). The main idea is to
+ # say that all requested objects are absent in DB after the method.
+ self.data = data
+
+ labeledimage_set.delete()
+ labeledshape_set.delete()
+ labeledtrack_set.delete()
+
+ def delete(self, data=None):
+ self._delete(data)
+ self._commit()
+
+ def _init_tags_from_db(self):
+ db_tags = self.db_job.labeledimage_set.prefetch_related(
+ "label",
+ "labeledimageattributeval_set"
+ ).values(
+ 'id',
+ 'frame',
+ 'label_id',
+ 'group',
+ 'labeledimageattributeval__spec_id',
+ 'labeledimageattributeval__value',
+ 'labeledimageattributeval__id',
+ ).order_by('frame')
+
+ db_tags = _merge_table_rows(
+ rows=db_tags,
+ keys_for_merge={
+ "labeledimageattributeval_set": [
+ 'labeledimageattributeval__spec_id',
+ 'labeledimageattributeval__value',
+ 'labeledimageattributeval__id',
+ ],
+ },
+ field_id='id',
+ )
+ serializer = serializers.LabeledImageSerializer(db_tags, many=True)
+ self.data["tags"] = serializer.data
+
+ def _init_shapes_from_db(self):
+ db_shapes = self.db_job.labeledshape_set.prefetch_related(
+ "label",
+ "labeledshapeattributeval_set"
+ ).values(
+ 'id',
+ 'label_id',
+ 'type',
+ 'frame',
+ 'group',
+ 'occluded',
+ 'z_order',
+ 'points',
+ 'labeledshapeattributeval__spec_id',
+ 'labeledshapeattributeval__value',
+ 'labeledshapeattributeval__id',
+ ).order_by('frame')
+
+ db_shapes = _merge_table_rows(
+ rows=db_shapes,
+ keys_for_merge={
+ 'labeledshapeattributeval_set': [
+ 'labeledshapeattributeval__spec_id',
+ 'labeledshapeattributeval__value',
+ 'labeledshapeattributeval__id',
+ ],
+ },
+ field_id='id',
+ )
+
+ serializer = serializers.LabeledShapeSerializer(db_shapes, many=True)
+ self.data["shapes"] = serializer.data
+
+ def _init_tracks_from_db(self):
+ db_tracks = self.db_job.labeledtrack_set.prefetch_related(
+ "label",
+ "labeledtrackattributeval_set",
+ "trackedshape_set__trackedshapeattributeval_set"
+ ).values(
+ "id",
+ "frame",
+ "label_id",
+ "group",
+ "labeledtrackattributeval__spec_id",
+ "labeledtrackattributeval__value",
+ "labeledtrackattributeval__id",
+ "trackedshape__type",
+ "trackedshape__occluded",
+ "trackedshape__z_order",
+ "trackedshape__points",
+ "trackedshape__id",
+ "trackedshape__frame",
+ "trackedshape__outside",
+ "trackedshape__trackedshapeattributeval__spec_id",
+ "trackedshape__trackedshapeattributeval__value",
+ "trackedshape__trackedshapeattributeval__id",
+ ).order_by('id', 'trackedshape__frame')
+
+ db_tracks = _merge_table_rows(
+ rows=db_tracks,
+ keys_for_merge={
+ "labeledtrackattributeval_set": [
+ "labeledtrackattributeval__spec_id",
+ "labeledtrackattributeval__value",
+ "labeledtrackattributeval__id",
+ ],
+ "trackedshape_set":[
+ "trackedshape__type",
+ "trackedshape__occluded",
+ "trackedshape__z_order",
+ "trackedshape__points",
+ "trackedshape__id",
+ "trackedshape__frame",
+ "trackedshape__outside",
+ "trackedshape__trackedshapeattributeval__spec_id",
+ "trackedshape__trackedshapeattributeval__value",
+ "trackedshape__trackedshapeattributeval__id",
+ ],
+ },
+ field_id="id",
+ )
+
+ for db_track in db_tracks:
+ db_track["trackedshape_set"] = _merge_table_rows(db_track["trackedshape_set"], {
+ 'trackedshapeattributeval_set': [
+ 'trackedshapeattributeval__value',
+ 'trackedshapeattributeval__spec_id',
+ 'trackedshapeattributeval__id',
]
}, 'id')
- for db_path in db_box_paths:
- for db_shape in db_path.shapes:
- db_shape.attributes = list(set(db_shape.attributes))
- label = _Label(self.db_labels[db_path.label_id])
- path = _BoxPath(
- label=label,
- start_frame=db_path.frame,
- stop_frame=self.stop_frame,
- group_id=db_path.group_id,
- client_id=db_path.client_id,
- )
- for db_attr in db_path.attributes:
- spec = self.db_attributes[db_attr.spec_id]
- attr = _Attribute(spec, db_attr.value)
- path.add_attribute(attr)
-
- frame = -1
- for db_shape in db_path.shapes:
- box = _TrackedBox(
- x0=db_shape.xtl, y0=db_shape.ytl, x1=db_shape.xbr, y1=db_shape.ybr,
- frame=db_shape.frame,
- occluded=db_shape.occluded,
- z_order=db_shape.z_order,
- outside=db_shape.outside,
+ # A result table can consist many equal rows for track/shape attributes
+ # We need filter unique attributes manually
+ db_track["labeledtrackattributeval_set"] = list(set(db_track["labeledtrackattributeval_set"]))
+ for db_shape in db_track["trackedshape_set"]:
+ db_shape["trackedshapeattributeval_set"] = list(
+ set(db_shape["trackedshapeattributeval_set"])
)
- assert box.frame > frame
- frame = box.frame
-
- for db_attr in db_shape.attributes:
- spec = self.db_attributes[db_attr.spec_id]
- attr = _Attribute(spec, db_attr.value)
- box.add_attribute(attr)
- path.add_box(box)
-
- self.box_paths.append(path)
-
- for idx, paths_type in enumerate(['polygon_paths', 'polyline_paths', 'points_paths']):
- source = [db_polygon_paths, db_polyline_paths, db_points_paths][idx]
-
- for db_path in source:
- for db_shape in db_path.shapes:
- db_shape.attributes = list(set(db_shape.attributes))
- label = _Label(self.db_labels[db_path.label_id])
- path = _PolyPath(
- label=label,
- start_frame=db_path.frame,
- stop_frame= self.stop_frame,
- group_id=db_path.group_id,
- client_id=db_path.client_id,
- )
- for db_attr in db_path.attributes:
- spec = self.db_attributes[db_attr.spec_id]
- attr = _Attribute(spec, db_attr.value)
- path.add_attribute(attr)
-
- frame = -1
- for db_shape in db_path.shapes:
- shape = _TrackedPolyShape(
- points=db_shape.points,
- frame=db_shape.frame,
- occluded=db_shape.occluded,
- z_order=db_shape.z_order,
- outside=db_shape.outside,
- )
- assert shape.frame > frame
- frame = shape.frame
-
- for db_attr in db_shape.attributes:
- spec = self.db_attributes[db_attr.spec_id]
- attr = _Attribute(spec, db_attr.value)
- shape.add_attribute(attr)
- path.add_shape(shape)
-
- getattr(self, paths_type).append(path)
-
-
- def init_from_client(self, data):
- # All fields inside data should be converted to correct type explicitly.
- # We cannot trust that client will send 23 as integer. Here we also
- # accept "23".
- db_task = self.db_job.segment.task
- image_meta = get_image_meta_cache(db_task)
- self.reset()
-
- for box in data['boxes']:
- label = _Label(self.db_labels[int(box['label_id'])])
-
- frame_idx = int(box['frame']) if db_task.mode == 'annotation' else 0
- xtl, ytl, xbr, ybr = self._clamp_box(float(box['xtl']), float(box['ytl']),
- float(box['xbr']), float(box['ybr']),
- image_meta['original_size'][frame_idx])
-
- labeled_box = _LabeledBox(
- label=label,
- x0=xtl, y0=ytl, x1=xbr, y1=ybr,
- frame=int(box['frame']),
- group_id=int(box['group_id']),
- occluded=strtobool(str(box['occluded'])),
- z_order=int(box['z_order']),
- client_id=int(box['id']),
- )
-
- for attr in box['attributes']:
- spec = self.db_attributes[int(attr['id'])]
- attr = _Attribute(spec, str(attr['value']))
- labeled_box.add_attribute(attr)
-
- self.boxes.append(labeled_box)
-
- for poly_shape_type in ['points', 'polygons', 'polylines']:
- for poly_shape in data[poly_shape_type]:
- label = _Label(self.db_labels[int(poly_shape['label_id'])])
-
- frame_idx = int(poly_shape['frame']) if db_task.mode == 'annotation' else 0
- points = self._clamp_poly(poly_shape['points'], image_meta['original_size'][frame_idx])
- labeled_poly_shape = _LabeledPolyShape(
- label=label,
- points=points,
- frame=int(poly_shape['frame']),
- group_id=int(poly_shape['group_id']),
- occluded=poly_shape['occluded'],
- z_order=int(poly_shape['z_order']),
- client_id=int(poly_shape['id']),
- )
-
- for attr in poly_shape['attributes']:
- spec = self.db_attributes[int(attr['id'])]
- attr = _Attribute(spec, str(attr['value']))
- labeled_poly_shape.add_attribute(attr)
-
- getattr(self, poly_shape_type).append(labeled_poly_shape)
-
- for path in data['box_paths']:
- label = _Label(self.db_labels[int(path['label_id'])])
- boxes = []
- frame = -1
-
- has_boxes_on_prev_segm = False
- last_box_on_prev_segm = None
- has_box_on_start_frame = False
- for box in path['shapes']:
- if int(box['frame']) < self.start_frame:
- has_boxes_on_prev_segm = True
- if last_box_on_prev_segm is None or int(last_box_on_prev_segm["frame"]) < int(box["frame"]):
- last_box_on_prev_segm = box
- elif int(box['frame']) == self.start_frame:
- has_box_on_start_frame = True
- break
- if has_boxes_on_prev_segm and not has_box_on_start_frame:
- last_box_on_prev_segm["frame"] = self.start_frame
-
- for box in path['shapes']:
- if int(box['frame']) <= self.stop_frame and int(box['frame']) >= self.start_frame:
- frame_idx = int(box['frame']) if db_task.mode == 'annotation' else 0
- xtl, ytl, xbr, ybr = self._clamp_box(float(box['xtl']), float(box['ytl']),
- float(box['xbr']), float(box['ybr']), image_meta['original_size'][frame_idx])
- tracked_box = _TrackedBox(
- x0=xtl, y0=ytl, x1=xbr, y1=ybr,
- frame=int(box['frame']),
- occluded=strtobool(str(box['occluded'])),
- z_order=int(box['z_order']),
- outside=strtobool(str(box['outside'])),
- )
- assert tracked_box.frame > frame
- frame = tracked_box.frame
-
- for attr in box['attributes']:
- spec = self.db_attributes[int(attr['id'])]
- assert spec.is_mutable()
- attr = _Attribute(spec, str(attr['value']))
- tracked_box.add_attribute(attr)
-
- boxes.append(tracked_box)
- else:
- self.logger.error("init_from_client: ignore frame #%d " +
- "because it out of segment range [%d-%d]", int(box['frame']), self.start_frame, self.stop_frame)
-
- attributes = []
- for attr in path['attributes']:
- spec = self.db_attributes[int(attr['id'])]
- assert not spec.is_mutable()
- attr = _Attribute(spec, str(attr['value']))
- attributes.append(attr)
-
- assert frame <= self.stop_frame
- box_path = _BoxPath(label=label,
- start_frame=min(list(map(lambda box: box.frame, boxes))),
- stop_frame=self.stop_frame,
- group_id=int(path['group_id']),
- boxes=boxes,
- client_id=int(path['id']),
- attributes=attributes,
- )
- self.box_paths.append(box_path)
-
- for poly_path_type in ['points_paths', 'polygon_paths', 'polyline_paths']:
- for path in data[poly_path_type]:
- label = _Label(self.db_labels[int(path['label_id'])])
- poly_shapes = []
- frame = -1
-
- has_shapes_on_prev_segm = False
- last_shape_on_prev_segm = None
- has_shape_on_start_frame = False
- for poly_shape in path['shapes']:
- if int(poly_shape['frame']) < self.start_frame:
- has_shapes_on_prev_segm = True
- if last_shape_on_prev_segm is None or int(last_shape_on_prev_segm["frame"]) < (poly_shape["frame"]):
- last_shape_on_prev_segm = box
- elif int(poly_shape['frame']) == self.start_frame:
- has_shape_on_start_frame = True
- break
- if has_shapes_on_prev_segm and not has_shape_on_start_frame:
- last_shape_on_prev_segm["frame"] = self.start_frame
-
- for poly_shape in path['shapes']:
- if int(poly_shape['frame']) <= self.stop_frame and int(poly_shape['frame']) >= self.start_frame:
- frame_idx = int(poly_shape['frame']) if db_task.mode == 'annotation' else 0
- points = self._clamp_poly(poly_shape['points'], image_meta['original_size'][frame_idx])
- tracked_poly_shape = _TrackedPolyShape(
- points=points,
- frame=int(poly_shape['frame']),
- occluded=strtobool(str(poly_shape['occluded'])),
- z_order=int(poly_shape['z_order']),
- outside=strtobool(str(poly_shape['outside'])),
- )
- assert tracked_poly_shape.frame > frame
- frame = tracked_poly_shape.frame
-
- for attr in poly_shape['attributes']:
- spec = self.db_attributes[int(attr['id'])]
- assert spec.is_mutable()
- attr = _Attribute(spec, str(attr['value']))
- tracked_poly_shape.add_attribute(attr)
-
- poly_shapes.append(tracked_poly_shape)
- else:
- self.logger.error("init_from_client: ignore frame #%d " +
- "because it out of segment range [%d-%d]", int(poly_shape['frame']), self.start_frame, self.stop_frame)
-
- attributes = []
- for attr in path['attributes']:
- spec = self.db_attributes[int(attr['id'])]
- assert not spec.is_mutable()
- attr = _Attribute(spec, str(attr['value']))
- attributes.append(attr)
-
- poly_path = _PolyPath(
- label=label,
- start_frame=min(list(map(lambda shape: shape.frame, poly_shapes))),
- stop_frame=self.stop_frame + 1,
- group_id=int(path['group_id']),
- shapes=poly_shapes,
- client_id=int(path['id']),
- attributes=attributes,
- )
-
- getattr(self, poly_path_type).append(poly_path)
-
- return self.has_data()
-
- def _get_shape_class(self, shape_type):
- if shape_type == 'polygons':
- return models.LabeledPolygon
- elif shape_type == 'polylines':
- return models.LabeledPolyline
- elif shape_type == 'boxes':
- return models.LabeledBox
- elif shape_type == 'points':
- return models.LabeledPoints
- elif shape_type == 'polygon_paths':
- return models.TrackedPolygon
- elif shape_type == 'polyline_paths':
- return models.TrackedPolyline
- elif shape_type == 'box_paths':
- return models.TrackedBox
- elif shape_type == 'points_paths':
- return models.TrackedPoints
-
- def _get_shape_attr_class(self, shape_type):
- if shape_type == 'polygons':
- return models.LabeledPolygonAttributeVal
- elif shape_type == 'polylines':
- return models.LabeledPolylineAttributeVal
- elif shape_type == 'boxes':
- return models.LabeledBoxAttributeVal
- elif shape_type == 'points':
- return models.LabeledPointsAttributeVal
- elif shape_type == 'polygon_paths':
- return models.TrackedPolygonAttributeVal
- elif shape_type == 'polyline_paths':
- return models.TrackedPolylineAttributeVal
- elif shape_type == 'box_paths':
- return models.TrackedBoxAttributeVal
- elif shape_type == 'points_paths':
- return models.TrackedPointsAttributeVal
-
- def _save_paths_to_db(self):
- for shape_type in ['polygon_paths', 'polyline_paths', 'points_paths', 'box_paths']:
- db_paths = []
- db_path_attrvals = []
- db_shapes = []
- db_shape_attrvals = []
-
- shapes = getattr(self, shape_type)
- for path in shapes:
- db_path = models.ObjectPath()
- db_path.job = self.db_job
- db_path.label = self.db_labels[path.label.id]
- db_path.frame = path.frame
- db_path.group_id = path.group_id
- db_path.client_id = path.client_id
- if shape_type == 'polygon_paths':
- db_path.shapes = 'polygons'
- elif shape_type == 'polyline_paths':
- db_path.shapes = 'polylines'
- elif shape_type == 'box_paths':
- db_path.shapes = 'boxes'
- elif shape_type == 'points_paths':
- db_path.shapes = 'points'
-
- for attr in path.attributes:
- db_attrspec = self.db_attributes[attr.id]
- db_attrval = models.ObjectPathAttributeVal()
- db_attrval.track_id = len(db_paths)
- db_attrval.spec = db_attrspec
- db_attrval.value = attr.value
- db_path_attrvals.append(db_attrval)
-
- path_shapes = path.boxes if hasattr(path, 'boxes') else path.shapes
- for shape in path_shapes:
- db_shape = self._get_shape_class(shape_type)()
- db_shape.track_id = len(db_paths)
- if shape_type == 'box_paths':
- db_shape.xtl = shape.xtl
- db_shape.ytl = shape.ytl
- db_shape.xbr = shape.xbr
- db_shape.ybr = shape.ybr
- else:
- db_shape.points = shape.points
- db_shape.frame = shape.frame
- db_shape.occluded = shape.occluded
- db_shape.z_order = shape.z_order
- db_shape.outside = shape.outside
-
- for attr in shape.attributes:
- db_attrspec = self.db_attributes[attr.id]
- db_attrval = self._get_shape_attr_class(shape_type)()
- if shape_type == 'polygon_paths':
- db_attrval.polygon_id = len(db_shapes)
- elif shape_type == 'polyline_paths':
- db_attrval.polyline_id = len(db_shapes)
- elif shape_type == 'box_paths':
- db_attrval.box_id = len(db_shapes)
- elif shape_type == 'points_paths':
- db_attrval.points_id = len(db_shapes)
- db_attrval.spec = db_attrspec
- db_attrval.value = attr.value
- db_shape_attrvals.append(db_attrval)
-
- db_shapes.append(db_shape)
- db_paths.append(db_path)
-
- db_paths = bulk_create(models.ObjectPath, db_paths,
- {"job_id": self.db_job.id})
-
- for db_attrval in db_path_attrvals:
- db_attrval.track_id = db_paths[db_attrval.track_id].id
- bulk_create(models.ObjectPathAttributeVal, db_path_attrvals)
-
- for db_shape in db_shapes:
- db_shape.track_id = db_paths[db_shape.track_id].id
-
- db_shapes = bulk_create(self._get_shape_class(shape_type), db_shapes,
- {"track__job_id": self.db_job.id})
-
- for db_attrval in db_shape_attrvals:
- if shape_type == 'polygon_paths':
- db_attrval.polygon_id = db_shapes[db_attrval.polygon_id].id
- elif shape_type == 'polyline_paths':
- db_attrval.polyline_id = db_shapes[db_attrval.polyline_id].id
- elif shape_type == 'box_paths':
- db_attrval.box_id = db_shapes[db_attrval.box_id].id
- elif shape_type == 'points_paths':
- db_attrval.points_id = db_shapes[db_attrval.points_id].id
-
- bulk_create(self._get_shape_attr_class(shape_type), db_shape_attrvals)
-
- def _get_shape_set(self, shape_type):
- if shape_type == 'polygons':
- return self.db_job.labeledpolygon_set
- elif shape_type == 'polylines':
- return self.db_job.labeledpolyline_set
- elif shape_type == 'boxes':
- return self.db_job.labeledbox_set
- elif shape_type == 'points':
- return self.db_job.labeledpoints_set
-
- def _save_shapes_to_db(self):
- for shape_type in ['polygons', 'polylines', 'points', 'boxes']:
- db_shapes = []
- db_attrvals = []
-
- shapes = getattr(self, shape_type)
- for shape in shapes:
- db_shape = self._get_shape_class(shape_type)()
- db_shape.job = self.db_job
- db_shape.label = self.db_labels[shape.label.id]
- db_shape.group_id = shape.group_id
- db_shape.client_id = shape.client_id
- if shape_type == 'boxes':
- db_shape.xtl = shape.xtl
- db_shape.ytl = shape.ytl
- db_shape.xbr = shape.xbr
- db_shape.ybr = shape.ybr
- else:
- db_shape.points = shape.points
- db_shape.frame = shape.frame
- db_shape.occluded = shape.occluded
- db_shape.z_order = shape.z_order
-
- for attr in shape.attributes:
- db_attrval = self._get_shape_attr_class(shape_type)()
- if shape_type == 'polygons':
- db_attrval.polygon_id = len(db_shapes)
- elif shape_type == 'polylines':
- db_attrval.polyline_id = len(db_shapes)
- elif shape_type == 'boxes':
- db_attrval.box_id = len(db_shapes)
- else:
- db_attrval.points_id = len(db_shapes)
-
- db_attrval.spec = self.db_attributes[attr.id]
- db_attrval.value = attr.value
- db_attrvals.append(db_attrval)
-
- db_shapes.append(db_shape)
-
- db_shapes = bulk_create(self._get_shape_class(shape_type), db_shapes,
- {"job_id": self.db_job.id})
-
- for db_attrval in db_attrvals:
- if shape_type == 'polygons':
- db_attrval.polygon_id = db_shapes[db_attrval.polygon_id].id
- elif shape_type == 'polylines':
- db_attrval.polyline_id = db_shapes[db_attrval.polyline_id].id
- elif shape_type == 'boxes':
- db_attrval.box_id = db_shapes[db_attrval.box_id].id
- else:
- db_attrval.points_id = db_shapes[db_attrval.points_id].id
-
- bulk_create(self._get_shape_attr_class(shape_type), db_attrvals)
-
- def _update_shapes_in_db(self):
- client_ids_to_delete = {}
- for shape_type in ['polygons', 'polylines', 'points', 'boxes']:
- client_ids_to_delete[shape_type] = list(shape.client_id for shape in getattr(self, shape_type))
- self._delete_shapes_from_db(client_ids_to_delete)
- self._save_shapes_to_db()
-
- def _update_paths_in_db(self):
- client_ids_to_delete = {}
- for shape_type in ['polygon_paths', 'polyline_paths', 'points_paths', 'box_paths']:
- client_ids_to_delete[shape_type] = list(shape.client_id for shape in getattr(self, shape_type))
- self._delete_paths_from_db(client_ids_to_delete)
- self._save_paths_to_db()
-
- def _delete_shapes_from_db(self, data):
- for shape_type in ['polygons', 'polylines', 'points', 'boxes']:
- client_ids_to_delete = data[shape_type]
- deleted = self._get_shape_set(shape_type).filter(client_id__in=client_ids_to_delete).delete()
- class_name = 'engine.{}'.format(self._get_shape_class(shape_type).__name__)
- if not (deleted[0] == 0 and len(client_ids_to_delete) == 0) and (class_name in deleted[1] and deleted[1][class_name] != len(client_ids_to_delete)):
- raise Exception('Number of deleted object doesn\'t match with requested number')
-
- def _delete_paths_from_db(self, data):
- client_ids_to_delete = []
- for shape_type in ['polygon_paths', 'polyline_paths', 'points_paths', 'box_paths']:
- client_ids_to_delete.extend(data[shape_type])
- deleted = self.db_job.objectpath_set.filter(client_id__in=client_ids_to_delete).delete()
- class_name = 'engine.ObjectPath'
- if not (deleted[0] == 0 and len(client_ids_to_delete) == 0) and \
- (class_name in deleted[1] and deleted[1][class_name] != len(client_ids_to_delete)):
- raise Exception('Number of deleted object doesn\'t match with requested number')
-
- def delete_all_shapes_from_db(self):
- for shape_type in ['polygons', 'polylines', 'points', 'boxes']:
- self._get_shape_set(shape_type).all().delete()
-
- def delete_all_paths_from_db(self):
- self.db_job.objectpath_set.all().delete()
-
- def delete_from_db(self, data):
- self._delete_shapes_from_db(data)
- self._delete_paths_from_db(data)
-
- def update_in_db(self, data):
- if self.init_from_client(data):
- self._update_shapes_in_db()
- self._update_paths_in_db()
-
- def save_to_db(self, data):
- if self.init_from_client(data):
- self._save_shapes_to_db()
- self._save_paths_to_db()
-
- def to_client(self):
- data = {
- "boxes": [],
- "box_paths": [],
- "polygons": [],
- "polygon_paths": [],
- "polylines": [],
- "polyline_paths": [],
- "points": [],
- "points_paths": [],
- }
- for box in self.boxes:
- data["boxes"].append({
- "id": box.client_id,
- "label_id": box.label.id,
- "group_id": box.group_id,
- "xtl": box.xtl,
- "ytl": box.ytl,
- "xbr": box.xbr,
- "ybr": box.ybr,
- "occluded": box.occluded,
- "z_order": box.z_order,
- "frame": box.frame,
- "attributes": [{'id': attr.id, 'value':attr.value} for attr in box.attributes],
- })
-
- for poly_type in ['polygons', 'polylines', 'points']:
- for poly in getattr(self, poly_type):
- data[poly_type].append({
- "id": poly.client_id,
- "label_id": poly.label.id,
- "group_id": poly.group_id,
- "points": poly.points,
- "occluded": poly.occluded,
- "z_order": poly.z_order,
- "frame": poly.frame,
- "attributes": [{'id': attr.id, 'value':attr.value} for attr in poly.attributes],
- })
-
- for box_path in self.box_paths:
- data["box_paths"].append({
- "id": box_path.client_id,
- "label_id": box_path.label.id,
- "group_id": box_path.group_id,
- "frame": box_path.frame,
- "attributes": [{'id': attr.id, 'value':attr.value} for attr in box_path.attributes],
- "shapes": [box for box in map(lambda box:
- ({
- "frame": box.frame,
- "xtl": box.xtl,
- "ytl": box.ytl,
- "xbr": box.xbr,
- "ybr": box.ybr,
- "occluded": box.occluded,
- "z_order": box.z_order,
- "outside": box.outside,
- "attributes": [{'id': attr.id, 'value':attr.value} for attr in box.attributes],
- }), box_path.boxes)
- ],
- })
-
- for poly_path_type in ['polygon_paths', 'polyline_paths', 'points_paths']:
- for poly_path in getattr(self, poly_path_type):
- data[poly_path_type].append({
- "id": poly_path.client_id,
- "label_id": poly_path.label.id,
- "group_id": poly_path.group_id,
- "frame": poly_path.frame,
- "attributes": [{'id': attr.id, 'value':attr.value} for attr in poly_path.attributes],
- "shapes": [shape for shape in map(lambda shape:
- ({
- "frame": shape.frame,
- "points": shape.points,
- "occluded": shape.occluded,
- "z_order": shape.z_order,
- "outside": shape.outside,
- "attributes": [{'id': attr.id, 'value':attr.value} for attr in shape.attributes],
- }), poly_path.shapes)
- ],
- })
-
- return data
-
- def validate_data_from_client(self, data):
- client_ids = {
- 'saved': self._get_client_ids_from_db(),
- 'create': set(),
- 'update': set(),
- 'delete': set(),
- }
+ serializer = serializers.LabeledTrackSerializer(db_tracks, many=True)
+ self.data["tracks"] = serializer.data
- def extract_clinet_id(shape, action):
- if action != 'delete':
- if 'id' not in shape:
- raise Exception('No id field in received data')
- client_id = shape['id']
- else:
- # client send only shape.id, not shape object
- client_id = shape
- client_ids[action].add(client_id)
-
- shape_types = ['boxes', 'points', 'polygons', 'polylines', 'box_paths',
- 'points_paths', 'polygon_paths', 'polyline_paths']
-
- for action in ['create', 'update', 'delete']:
- for shape_type in shape_types:
- for shape in data[action][shape_type]:
- extract_clinet_id(shape, action)
-
- # In case of delete action potentially it is possible to intersect set of IDs
- # that should delete and set of IDs that should create(i.e. save uploaded anno).
- # There is no need to check that
- tmp_res = (client_ids['create'] & client_ids['update']) | (client_ids['update'] & client_ids['delete'])
- if tmp_res:
- raise Exception('More than one action for shape(s) with id={}'.format(tmp_res))
-
- tmp_res = (client_ids['saved'] - client_ids['delete']) & client_ids['create']
- if tmp_res:
- raise Exception('Trying to create new shape(s) with existing client id {}'.format(tmp_res))
-
- tmp_res = client_ids['delete'] - client_ids['saved']
- if tmp_res:
- raise Exception('Trying to delete shape(s) with nonexistent client id {}'.format(tmp_res))
-
- tmp_res = client_ids['update'] - (client_ids['saved'] - client_ids['delete'])
- if tmp_res:
- raise Exception('Trying to update shape(s) with nonexistent client id {}'.format(tmp_res))
-
- max_id = self.db_job.max_shape_id
- if any(new_client_id <= max_id for new_client_id in client_ids['create']):
- raise Exception('Trying to create shape(s) with client id {} less than allowed value {}'.format(client_ids['create'], max_id))
-
- return client_ids
-
- def force_set_client_id(self, data):
- shape_types = ['boxes', 'points', 'polygons', 'polylines', 'box_paths',
- 'points_paths', 'polygon_paths', 'polyline_paths']
-
- max_id = self.db_job.max_shape_id
- for shape_type in shape_types:
- if not data[shape_type]:
- continue
- for shape in data[shape_type]:
- if 'id' in shape:
- max_id = max(max_id, shape['id'])
-
- max_id += 1
- for shape_type in shape_types:
- for shape in data[shape_type]:
- if 'id' not in shape or shape['id'] == -1:
- shape['id'] = max_id
- max_id += 1
-
-class _AnnotationForSegment(_Annotation):
- def __init__(self, db_segment):
- super().__init__(db_segment.start_frame, db_segment.stop_frame)
- self.db_segment = db_segment
+ def _init_version_from_db(self):
+ db_commit = self.db_job.commits.last()
+ if db_commit:
+ self.data["version"] = db_commit.version
+ else:
+ self.data["version"] = 0
def init_from_db(self):
- # FIXME: at the moment a segment has only one job always. Thus
- # the implementation makes sense. Need to implement a good one
- # in the future.
- self.reset()
-
- db_job0 = list(self.db_segment.job_set.all())[0]
- annotation = _AnnotationForJob(db_job0)
- annotation.init_from_db()
- self.boxes = annotation.boxes
- self.box_paths = annotation.box_paths
- self.polygons = annotation.polygons
- self.polygon_paths = annotation.polygon_paths
- self.polylines = annotation.polylines
- self.polyline_paths = annotation.polyline_paths
- self.points = annotation.points
- self.points_paths = annotation.points_paths
-
-@transaction.atomic
-def _dump(tid, data_format, scheme, host):
- db_task = models.Task.objects.select_for_update().get(id=tid)
- annotation = _AnnotationForTask(db_task)
- annotation.init_from_db()
- annotation.dump(data_format, scheme, host)
-
-def _calc_box_area(box):
- return (box.xbr - box.xtl) * (box.ybr - box.ytl)
+ self._init_tags_from_db()
+ self._init_shapes_from_db()
+ self._init_tracks_from_db()
+ self._init_version_from_db()
-def _calc_overlap_box_area(box0, box1):
- dx = min(box0.xbr, box1.xbr) - max(box0.xtl, box1.xtl)
- dy = min(box0.ybr, box1.ybr) - max(box0.ytl, box1.ytl)
- if dx > 0 and dy > 0:
- return dx * dy
- else:
- return 0
-
-def _calc_box_IoU(box0, box1):
- overlap_area = _calc_overlap_box_area(box0, box1)
- return overlap_area / (_calc_box_area(box0) + _calc_box_area(box1) - overlap_area)
-
-class _AnnotationWriter:
+class AnnotationWriter:
__metaclass__ = ABCMeta
def __init__(self, file, version):
@@ -1590,7 +650,7 @@ class _AnnotationWriter:
def close_root(self):
raise NotImplementedError
-class _XmlAnnotationWriter(_AnnotationWriter):
+class XmlAnnotationWriter(AnnotationWriter):
def __init__(self, file):
super().__init__(file, "1.1")
self.xmlgen = XMLGenerator(self.file, 'utf-8')
@@ -1622,7 +682,7 @@ class _XmlAnnotationWriter(_AnnotationWriter):
self._add_meta(v)
self._indent()
self.xmlgen.endElement(k)
- elif type(v) == list:
+ elif isinstance(v, list):
self._indent()
self.xmlgen.startElement(k, {})
for tup in v:
@@ -1715,196 +775,467 @@ class _XmlAnnotationWriter(_AnnotationWriter):
self.xmlgen.endElement("annotations")
self.xmlgen.endDocument()
-class _AnnotationForTask(_Annotation):
- def __init__(self, db_task):
- super().__init__(0, db_task.size)
- self.db_task = db_task
+class DataManager:
+ def __init__(self, data):
+ self.data = data
- def init_from_db(self):
- self.reset()
+ def merge(self, data, start_frame, overlap):
+ tags = TagManager(self.data["tags"])
+ tags.merge(data["tags"], start_frame, overlap)
- for db_segment in self.db_task.segment_set.all():
- annotation = _AnnotationForSegment(db_segment)
- annotation.init_from_db()
- self._merge_boxes(annotation.boxes, db_segment.start_frame,
- self.db_task.overlap)
- self._merge_paths(annotation.box_paths, db_segment.start_frame,
- self.db_task.overlap)
- self.polygons.extend(annotation.polygons)
- self.polylines.extend(annotation.polylines)
- self.points.extend(annotation.points)
- self.polygon_paths.extend(annotation.polygon_paths)
- self.polyline_paths.extend(annotation.polyline_paths)
- self.points_paths.extend(annotation.points_paths)
- # FIXME PolyShapes merge???
-
- def _merge_paths(self, paths, start_frame, overlap):
- # 1. Split paths on two parts: new and which can be intersected
- # with existing paths.
- new_paths = [path for path in paths
- if path.frame >= start_frame + overlap]
- int_paths = [path for path in paths
- if path.frame < start_frame + overlap]
- assert len(new_paths) + len(int_paths) == len(paths)
-
- # 4. Find old paths which are intersected with int_paths
- old_paths = []
- for path in self.box_paths:
- box = path.get_interpolated_boxes()[-1]
- if box.frame >= start_frame:
- old_paths.append(path)
-
- # 3. Add new paths as is. It should be done only after old_paths
- # variable is initialized.
- self.box_paths.extend(new_paths)
+ shapes = ShapeManager(self.data["shapes"])
+ shapes.merge(data["shapes"], start_frame, overlap)
- # Nothing to merge. Just add all int_paths if any.
- if not old_paths or not int_paths:
- self.box_paths.extend(int_paths)
- return
+ tracks = TrackManager(self.data["tracks"])
+ tracks.merge(data["tracks"], start_frame, overlap)
- # 4. Build cost matrix for each path and find correspondence using
- # Hungarian algorithm.
- min_cost_thresh = 0.5
- cost_matrix = np.empty(shape=(len(int_paths), len(old_paths)),
- dtype=float)
- for i, int_path in enumerate(int_paths):
- for j, old_path in enumerate(old_paths):
- cost_matrix[i][j] = 1
- if int_path.label.id == old_path.label.id:
- # Here start_frame is the start frame of next segment
- # and stop_frame is the stop frame of current segment
- stop_frame = start_frame + overlap - 1
- int_boxes = int_path.get_interpolated_boxes()
- old_boxes = old_path.get_interpolated_boxes()
- int_boxes = {box.frame:box for box in int_boxes if box.frame <= stop_frame}
- old_boxes = {box.frame:box for box in old_boxes if box.frame >= start_frame}
- assert int_boxes and old_boxes
-
- count, error = 0, 0
- for frame in range(start_frame, stop_frame + 1):
- box0, box1 = int_boxes.get(frame), old_boxes.get(frame)
- if box0 and box1:
- if box0.outside != box1.outside:
- error += 1
- else:
- error += 1 - _calc_box_IoU(box0, box1)
- count += 1
- elif box0 or box1:
- error += 1
- count += 1
-
- cost_matrix[i][j] = error / count
-
- # 6. Find optimal solution using Hungarian algorithm.
- row_ind, col_ind = linear_sum_assignment(cost_matrix)
- int_paths_indexes = list(range(0, len(int_paths)))
- for i, j in zip(row_ind, col_ind):
- # Reject the solution if the cost is too high. Remember
- # inside int_boxes_indexes boxes which were handled.
- if cost_matrix[i][j] <= min_cost_thresh:
- old_paths[j].merge(int_paths[i])
- int_paths_indexes[i] = -1
-
- # 7. Add all paths which were not processed.
- for i in int_paths_indexes:
- if i != -1:
- self.box_paths.append(int_paths[i])
-
- def _merge_boxes(self, boxes, start_frame, overlap):
- # 1. Split boxes on two parts: new and which can be intersected
- # with existing boxes.
- new_boxes = [box for box in boxes
- if box.frame >= start_frame + overlap]
- int_boxes = [box for box in boxes
- if box.frame < start_frame + overlap]
- assert len(new_boxes) + len(int_boxes) == len(boxes)
-
- # 2. Convert to more convenient data structure (boxes by frame)
- int_boxes_by_frame = {}
- for box in int_boxes:
- if box.frame in int_boxes_by_frame:
- int_boxes_by_frame[box.frame].append(box)
- else:
- int_boxes_by_frame[box.frame] = [box]
+ def to_shapes(self, end_frame):
+ shapes = self.data["shapes"]
+ tracks = TrackManager(self.data["tracks"])
+
+ return shapes + tracks.to_shapes(end_frame)
+
+ def to_tracks(self):
+ tracks = self.data["tracks"]
+ shapes = ShapeManager(self.data["shapes"])
+
+ return tracks + shapes.to_tracks()
- old_boxes_by_frame = {}
- for box in self.boxes:
- if box.frame >= start_frame:
- if box.frame in old_boxes_by_frame:
- old_boxes_by_frame[box.frame].append(box)
+class ObjectManager:
+ def __init__(self, objects):
+ self.objects = objects
+
+ @staticmethod
+ def _get_objects_by_frame(objects, start_frame):
+ objects_by_frame = {}
+ for obj in objects:
+ if obj["frame"] >= start_frame:
+ if obj["frame"] in objects_by_frame:
+ objects_by_frame[obj["frame"]].append(obj)
else:
- old_boxes_by_frame[box.frame] = [box]
+ objects_by_frame[obj["frame"]] = [obj]
- # 3. Add new boxes as is. It should be done only after old_boxes_by_frame
- # variable is initialized.
- self.boxes.extend(new_boxes)
+ return objects_by_frame
+
+ @staticmethod
+ def _get_cost_threshold():
+ raise NotImplementedError()
+
+ @staticmethod
+ def _calc_objects_similarity(obj0, obj1, start_frame, overlap):
+ raise NotImplementedError()
- # Nothing to merge here. Just add all int_boxes if any.
- if not old_boxes_by_frame or not int_boxes_by_frame:
- self.boxes.extend(int_boxes)
+ @staticmethod
+ def _unite_objects(obj0, obj1):
+ raise NotImplementedError()
+
+ @staticmethod
+ def _modify_unmached_object(obj, end_frame):
+ raise NotImplementedError()
+
+ def merge(self, objects, start_frame, overlap):
+ # 1. Split objects on two parts: new and which can be intersected
+ # with existing objects.
+ new_objects = [obj for obj in objects
+ if obj["frame"] >= start_frame + overlap]
+ int_objects = [obj for obj in objects
+ if obj["frame"] < start_frame + overlap]
+ assert len(new_objects) + len(int_objects) == len(objects)
+
+ # 2. Convert to more convenient data structure (objects by frame)
+ int_objects_by_frame = self._get_objects_by_frame(int_objects, start_frame)
+ old_objects_by_frame = self._get_objects_by_frame(self.objects, start_frame)
+
+ # 3. Add new objects as is. It should be done only after old_objects_by_frame
+ # variable is initialized.
+ self.objects.extend(new_objects)
+
+ # Nothing to merge here. Just add all int_objects if any.
+ if not old_objects_by_frame or not int_objects_by_frame:
+ for frame in old_objects_by_frame:
+ for old_obj in old_objects_by_frame[frame]:
+ self._modify_unmached_object(old_obj, start_frame + overlap)
+ self.objects.extend(int_objects)
return
# 4. Build cost matrix for each frame and find correspondence using
# Hungarian algorithm. In this case min_cost_thresh is stronger
# because we compare only on one frame.
- min_cost_thresh = 0.25
- for frame in int_boxes_by_frame:
- if frame in old_boxes_by_frame:
- int_boxes = int_boxes_by_frame[frame]
- old_boxes = old_boxes_by_frame[frame]
- cost_matrix = np.empty(shape=(len(int_boxes), len(old_boxes)),
+ min_cost_thresh = self._get_cost_threshold()
+ for frame in int_objects_by_frame:
+ if frame in old_objects_by_frame:
+ int_objects = int_objects_by_frame[frame]
+ old_objects = old_objects_by_frame[frame]
+ cost_matrix = np.empty(shape=(len(int_objects), len(old_objects)),
dtype=float)
# 5.1 Construct cost matrix for the frame.
- for i, box0 in enumerate(int_boxes):
- for j, box1 in enumerate(old_boxes):
- if box0.label.id == box1.label.id:
- cost_matrix[i][j] = 1 - _calc_box_IoU(box0, box1)
- else:
- cost_matrix[i][j] = 1
+ for i, int_obj in enumerate(int_objects):
+ for j, old_obj in enumerate(old_objects):
+ cost_matrix[i][j] = 1 - self._calc_objects_similarity(
+ int_obj, old_obj, start_frame, overlap)
# 6. Find optimal solution using Hungarian algorithm.
row_ind, col_ind = linear_sum_assignment(cost_matrix)
- int_boxes_indexes = list(range(0, len(int_boxes)))
+ old_objects_indexes = list(range(0, len(old_objects)))
+ int_objects_indexes = list(range(0, len(int_objects)))
for i, j in zip(row_ind, col_ind):
# Reject the solution if the cost is too high. Remember
- # inside int_boxes_indexes boxes which were handled.
+ # inside int_objects_indexes objects which were handled.
if cost_matrix[i][j] <= min_cost_thresh:
- old_boxes[j].merge(int_boxes[i])
- int_boxes_indexes[i] = -1
+ old_objects[j] = self._unite_objects(int_objects[i], old_objects[j])
+ int_objects_indexes[i] = -1
+ old_objects_indexes[j] = -1
- # 7. Add all boxes which were not processed.
- for i in int_boxes_indexes:
+ # 7. Add all new objects which were not processed.
+ for i in int_objects_indexes:
if i != -1:
- self.boxes.append(int_boxes[i])
+ self.objects.append(int_objects[i])
+
+ # 8. Modify all old objects which were not processed
+ # (e.g. generate a shape with outside=True at the end).
+ for j in old_objects_indexes:
+ if j != -1:
+ self._modify_unmached_object(old_objects[j],
+ start_frame + overlap)
+ else:
+ # We don't have old objects on the frame. Let's add all new ones.
+ self.objects.extend(int_objects_by_frame[frame])
+
+class TagManager(ObjectManager):
+ @staticmethod
+ def _get_cost_threshold():
+ return 0.25
+
+ @staticmethod
+ def _calc_objects_similarity(obj0, obj1, start_frame, overlap):
+ # TODO: improve the trivial implementation, compare attributes
+ return 1 if obj0["label_id"] == obj1["label_id"] else 0
+
+ @staticmethod
+ def _unite_objects(obj0, obj1):
+ # TODO: improve the trivial implementation
+ return obj0 if obj0["frame"] < obj1["frame"] else obj1
+
+ @staticmethod
+ def _modify_unmached_object(obj, end_frame):
+ pass
+
+def pairwise(iterable):
+ a = iter(iterable)
+ return zip(a, a)
+
+class ShapeManager(ObjectManager):
+ def to_tracks(self):
+ tracks = []
+ for shape in self.objects:
+ shape0 = copy.copy(shape)
+ shape0["keyframe"] = True
+ shape0["outside"] = False
+ # TODO: Separate attributes on mutable and unmutable
+ shape0["attributes"] = []
+ shape0.pop("group", None)
+ shape1 = copy.copy(shape0)
+ shape1["outside"] = True
+ shape1["frame"] += 1
+
+ track = {
+ "label_id": shape["label_id"],
+ "frame": shape["frame"],
+ "group": shape.get("group", None),
+ "attributes": shape["attributes"],
+ "shapes": [shape0, shape1]
+ }
+ tracks.append(track)
+
+ return tracks
+
+ @staticmethod
+ def _get_cost_threshold():
+ return 0.25
+
+ @staticmethod
+ def _calc_objects_similarity(obj0, obj1, start_frame, overlap):
+ def _calc_polygons_similarity(p0, p1):
+ overlap_area = p0.intersection(p1).area
+ return overlap_area / (p0.area + p1.area - overlap_area)
+
+ has_same_type = obj0["type"] == obj1["type"]
+ has_same_label = obj0.get("label_id") == obj1.get("label_id")
+ if has_same_type and has_same_label:
+ if obj0["type"] == models.ShapeType.RECTANGLE:
+ p0 = geometry.box(*obj0["points"])
+ p1 = geometry.box(*obj1["points"])
+
+ return _calc_polygons_similarity(p0, p1)
+ elif obj0["type"] == models.ShapeType.POLYGON:
+ p0 = geometry.Polygon(pairwise(obj0["points"]))
+ p1 = geometry.Polygon(pairwise(obj0["points"]))
+
+ return _calc_polygons_similarity(p0, p1)
+ else:
+ return 0 # FIXME: need some similarity for points and polylines
+ return 0
+
+ @staticmethod
+ def _unite_objects(obj0, obj1):
+ # TODO: improve the trivial implementation
+ return obj0 if obj0["frame"] < obj1["frame"] else obj1
+
+ @staticmethod
+ def _modify_unmached_object(obj, end_frame):
+ pass
+
+class TrackManager(ObjectManager):
+ def to_shapes(self, end_frame):
+ shapes = []
+ for track in self.objects:
+ for shape in TrackManager.get_interpolated_shapes(track, 0, end_frame):
+ if not shape["outside"]:
+ shape.pop("outside")
+ shape.pop("keyframe", None)
+ shape["label_id"] = track["label_id"]
+ shape["group"] = track["group"]
+ shape["attributes"] += track["attributes"]
+
+ shapes.append(shape)
+
+ return shapes
+
+ @staticmethod
+ def _get_objects_by_frame(objects, start_frame):
+ # Just for unification. All tracks are assigned on the same frame
+ objects_by_frame = {0: []}
+ for obj in objects:
+ shape = obj["shapes"][-1] # optimization for old tracks
+ if shape["frame"] >= start_frame or not shape["outside"]:
+ objects_by_frame[0].append(obj)
+
+ if not objects_by_frame[0]:
+ objects_by_frame = {}
+
+ return objects_by_frame
+
+ @staticmethod
+ def _get_cost_threshold():
+ return 0.5
+
+ @staticmethod
+ def _calc_objects_similarity(obj0, obj1, start_frame, overlap):
+ if obj0["label_id"] == obj1["label_id"]:
+ # Here start_frame is the start frame of next segment
+ # and stop_frame is the stop frame of current segment
+ # end_frame == stop_frame + 1
+ end_frame = start_frame + overlap
+ obj0_shapes = TrackManager.get_interpolated_shapes(obj0, start_frame, end_frame)
+ obj1_shapes = TrackManager.get_interpolated_shapes(obj1, start_frame, end_frame)
+ obj0_shapes_by_frame = {shape["frame"]:shape for shape in obj0_shapes}
+ obj1_shapes_by_frame = {shape["frame"]:shape for shape in obj1_shapes}
+ assert obj0_shapes_by_frame and obj1_shapes_by_frame
+
+ count, error = 0, 0
+ for frame in range(start_frame, end_frame):
+ shape0 = obj0_shapes_by_frame.get(frame)
+ shape1 = obj1_shapes_by_frame.get(frame)
+ if shape0 and shape1:
+ if shape0["outside"] != shape1["outside"]:
+ error += 1
+ else:
+ error += 1 - ShapeManager._calc_objects_similarity(shape0, shape1, start_frame, overlap)
+ count += 1
+ elif shape0 or shape1:
+ error += 1
+ count += 1
+
+ return 1 - error / count
+ else:
+ return 0
+
+ @staticmethod
+ def _modify_unmached_object(obj, end_frame):
+ shape = obj["shapes"][-1]
+ if not shape["outside"]:
+ shape = copy.deepcopy(shape)
+ shape["frame"] = end_frame
+ shape["outside"] = True
+ obj["shapes"].append(shape)
+
+ @staticmethod
+ def normalize_shape(shape):
+ points = np.asarray(shape["points"]).reshape(-1, 2)
+ broken_line = geometry.LineString(points)
+ points = []
+ for off in range(0, 100, 1):
+ p = broken_line.interpolate(off / 100, True)
+ points.append(p.x)
+ points.append(p.y)
+
+ shape = copy.copy(shape)
+ shape["points"] = points
+
+ return shape
+
+ @staticmethod
+ def get_interpolated_shapes(track, start_frame, end_frame):
+ def interpolate(shape0, shape1):
+ shapes = []
+ is_same_type = shape0["type"] == shape1["type"]
+ is_polygon = shape0["type"] == models.ShapeType.POLYGON
+ is_polyline = shape0["type"] == models.ShapeType.POLYLINE
+ is_same_size = len(shape0["points"]) == len(shape1["points"])
+ if not is_same_type or is_polygon or is_polyline or not is_same_size:
+ shape0 = TrackManager.normalize_shape(shape0)
+ shape1 = TrackManager.normalize_shape(shape1)
+
+ distance = shape1["frame"] - shape0["frame"]
+ step = np.subtract(shape1["points"], shape0["points"]) / distance
+ for frame in range(shape0["frame"] + 1, shape1["frame"]):
+ off = frame - shape0["frame"]
+ points = shape0["points"] + step * off
+ shape = copy.deepcopy(shape0)
+ broken_line = geometry.LineString(points.reshape(-1, 2)).simplify(0.05, False)
+ shape["keyframe"] = False
+ shape["frame"] = frame
+ shape["points"] = [x for p in broken_line.coords for x in p]
+ shapes.append(shape)
+ return shapes
+
+ if track.get("interpolated_shapes"):
+ return track["interpolated_shapes"]
+
+ # TODO: should be return an iterator?
+ shapes = []
+ curr_frame = track["shapes"][0]["frame"]
+ prev_shape = {}
+ for shape in track["shapes"]:
+ if prev_shape:
+ assert shape["frame"] > curr_frame
+ for attr in prev_shape["attributes"]:
+ if attr["spec_id"] not in map(lambda el: el["spec_id"], shape["attributes"]):
+ shape["attributes"].append(copy.deepcopy(attr))
+ if not prev_shape["outside"]:
+ shapes.extend(interpolate(prev_shape, shape))
+
+ shape["keyframe"] = True
+ shapes.append(shape)
+ curr_frame = shape["frame"]
+ prev_shape = shape
+
+ # TODO: Need to modify a client and a database (append "outside" shapes for polytracks)
+ if not prev_shape["outside"] and prev_shape["type"] == models.ShapeType.RECTANGLE:
+ shape = copy.copy(prev_shape)
+ shape["frame"] = end_frame
+ shapes.extend(interpolate(prev_shape, shape))
+
+ track["interpolated_shapes"] = shapes
+
+ return shapes
+
+ @staticmethod
+ def _unite_objects(obj0, obj1):
+ track = obj0 if obj0["frame"] < obj1["frame"] else obj1
+ assert obj0["label_id"] == obj1["label_id"]
+ shapes = {shape["frame"]:shape for shape in obj0["shapes"]}
+ for shape in obj1["shapes"]:
+ frame = shape["frame"]
+ if frame in shapes:
+ shapes[frame] = ShapeManager._unite_objects(shapes[frame], shape)
+ else:
+ shapes[frame] = shape
+
+ track["frame"] = min(obj0["frame"], obj1["frame"])
+ track["shapes"] = list(sorted(shapes.values(), key=lambda shape: shape["frame"]))
+ track["interpolated_shapes"] = []
+
+ return track
+
+class TaskAnnotation:
+ def __init__(self, pk, user):
+ self.user = user
+ self.db_task = models.Task.objects.prefetch_related("image_set").get(id=pk)
+ self.db_jobs = models.Job.objects.select_related("segment").filter(segment__task_id=pk)
+ self.reset()
+
+ def reset(self):
+ self.data = {
+ "version": 0,
+ "tags": [],
+ "shapes": [],
+ "tracks": []
+ }
+
+ def _patch_data(self, data, action):
+ splitted_data = {}
+ jobs = {}
+ for db_job in self.db_jobs:
+ jid = db_job.id
+ start = db_job.segment.start_frame
+ stop = db_job.segment.stop_frame
+ jobs[jid] = { "start": start, "stop": stop }
+ is_frame_inside = lambda x: (start <= int(x['frame']) <= stop)
+ splitted_data[jid] = {
+ "tags": list(filter(is_frame_inside, data['tags'])),
+ "shapes": list(filter(is_frame_inside, data['shapes'])),
+ "tracks": list(filter(lambda y: len(list(filter(is_frame_inside, y['shapes']))), data['tracks']))
+ }
+
+ for jid, job_data in splitted_data.items():
+ if action is None:
+ _data = put_job_data(jid, self.user, job_data)
else:
- # We don't have old boxes on the frame. Let's add all new ones.
- self.boxes.extend(int_boxes_by_frame[frame])
+ _data = patch_job_data(jid, self.user, job_data, action)
+ if _data["version"] > self.data["version"]:
+ self.data["version"] = _data["version"]
+ self._merge_data(_data, jobs[jid]["start"], self.db_task.overlap)
- def dump(self, data_format, scheme, host):
- def _flip_box(box, im_w, im_h):
- box.xbr, box.xtl = im_w - box.xtl, im_w - box.xbr
- box.ybr, box.ytl = im_h - box.ytl, im_h - box.ybr
+ def _merge_data(self, data, start_frame, overlap):
+ data_manager = DataManager(self.data)
+ data_manager.merge(data, start_frame, overlap)
- def _flip_shape(shape, im_w, im_h):
- points = []
- for p in shape.points.split(' '):
- p = p.split(',')
- points.append({
- 'x': p[0],
- 'y': p[1]
- })
+ def put(self, data):
+ self._patch_data(data, None)
- for p in points:
- p['x'] = im_w - (float(p['x']) + 1)
- p['y'] = im_h - (float(p['y']) + 1)
+ def create(self, data):
+ self._patch_data(data, PatchAction.CREATE)
+
+ def update(self, data):
+ self._patch_data(data, PatchAction.UPDATE)
+
+ def delete(self, data=None):
+ if data:
+ self._patch_data(data, PatchAction.DELETE)
+ else:
+ for db_job in self.db_jobs:
+ delete_job_data(db_job.id, self.user)
- shape.points = ' '.join(['{},{}'.format(point['x'], point['y']) for point in points])
+ def init_from_db(self):
+ self.reset()
+
+ for db_job in self.db_jobs:
+ annotation = JobAnnotation(db_job.id, self.user)
+ annotation.init_from_db()
+ if annotation.data["version"] > self.data["version"]:
+ self.data["version"] = annotation.data["version"]
+ db_segment = db_job.segment
+ start_frame = db_segment.start_frame
+ overlap = self.db_task.overlap
+ self._merge_data(annotation.data, start_frame, overlap)
+
+ @staticmethod
+ def _flip_shape(shape, im_w, im_h):
+ for x in range(0, len(shape["points"]), 2):
+ y = x + 1
+ shape["points"][x] = im_w - shape["points"][x]
+ shape["points"][y] = im_w - shape["points"][y]
+ def dump(self, file_path, scheme, host, query_params):
db_task = self.db_task
db_segments = db_task.segment_set.all().prefetch_related('job_set')
db_labels = db_task.label_set.all().prefetch_related('attributespec_set')
- im_meta_data = get_image_meta_cache(db_task)
+ db_label_by_id = {db_label.id:db_label for db_label in db_labels}
+ db_attribute_by_id = {db_attribute.id:db_attribute
+ for db_label in db_labels
+ for db_attribute in db_label.attributespec_set.all()}
+ im_meta_data = get_image_meta_cache(db_task)['original_size']
meta = OrderedDict([
("task", OrderedDict([
@@ -1917,12 +1248,17 @@ class _AnnotationForTask(_Annotation):
("flipped", str(db_task.flipped)),
("created", str(timezone.localtime(db_task.created_date))),
("updated", str(timezone.localtime(db_task.updated_date))),
- ("source", db_task.source),
("labels", [
("label", OrderedDict([
("name", db_label.name),
- ("attributes", [("attribute", db_attr.text)
+ ("attributes", [
+ ("attribute", OrderedDict([
+ ("name", db_attr.name),
+ ("mutable", str(db_attr.mutable)),
+ ("input_type", db_attr.input_type),
+ ("default_value", db_attr.default_value),
+ ("values", db_attr.values)]))
for db_attr in db_label.attributespec_set.all()])
])) for db_label in db_labels
]),
@@ -1933,8 +1269,8 @@ class _AnnotationForTask(_Annotation):
("start", str(db_segment.start_frame)),
("stop", str(db_segment.stop_frame)),
("url", "{0}://{1}/?id={2}".format(
- scheme, host, db_segment.job_set.all()[0].id))
- ])) for db_segment in db_segments
+ scheme, host, db_segment.job_set.all()[0].id))]
+ )) for db_segment in db_segments
]),
("owner", OrderedDict([
@@ -1947,217 +1283,179 @@ class _AnnotationForTask(_Annotation):
if db_task.mode == "interpolation":
meta["task"]["original_size"] = OrderedDict([
- ("width", str(im_meta_data["original_size"][0]["width"])),
- ("height", str(im_meta_data["original_size"][0]["height"]))
+ ("width", str(im_meta_data[0]["width"])),
+ ("height", str(im_meta_data[0]["height"]))
])
- dump_path = db_task.get_dump_path()
- with open(dump_path, "w") as dump_file:
- dumper = _XmlAnnotationWriter(dump_file)
+ with open(file_path, "w") as dump_file:
+ dumper = XmlAnnotationWriter(dump_file)
dumper.open_root()
dumper.add_meta(meta)
if db_task.mode == "annotation":
+ db_image_by_frame = {db_image.frame:db_image
+ for db_image in db_task.image_set.all()}
shapes = {}
- shapes["boxes"] = {}
- shapes["polygons"] = {}
- shapes["polylines"] = {}
- shapes["points"] = {}
- boxes = self.to_boxes()
- for box in boxes:
- if box.frame not in shapes["boxes"]:
- shapes["boxes"][box.frame] = []
- shapes["boxes"][box.frame].append(box)
-
- polygons = self.to_polygons()
- for polygon in polygons:
- if polygon.frame not in shapes["polygons"]:
- shapes["polygons"][polygon.frame] = []
- shapes["polygons"][polygon.frame].append(polygon)
-
- polylines = self.to_polylines()
- for polyline in polylines:
- if polyline.frame not in shapes["polylines"]:
- shapes["polylines"][polyline.frame] = []
- shapes["polylines"][polyline.frame].append(polyline)
-
- points = self.to_points()
- for points in points:
- if points.frame not in shapes["points"]:
- shapes["points"][points.frame] = []
- shapes["points"][points.frame].append(points)
-
- for frame in sorted(set(list(shapes["boxes"].keys()) +
- list(shapes["polygons"].keys()) +
- list(shapes["polylines"].keys()) +
- list(shapes["points"].keys()))):
-
- link = get_frame_path(db_task.id, frame)
- path = os.readlink(link)
-
- rpath = path.split(os.path.sep)
+ data_manager = DataManager(self.data)
+ for shape in data_manager.to_shapes(db_task.size):
+ frame = shape["frame"]
+ if frame not in shapes:
+ shapes[frame] = []
+ shapes[frame].append(shape)
+
+ for frame in sorted(list(shapes.keys())):
+ db_image = db_image_by_frame[frame]
+
+ rpath = db_image.path.split(os.path.sep)
rpath = os.path.sep.join(rpath[rpath.index(".upload")+1:])
- im_w = im_meta_data['original_size'][frame]['width']
- im_h = im_meta_data['original_size'][frame]['height']
+ im_w = db_image.width
+ im_h = db_image.height
dumper.open_image(OrderedDict([
("id", str(frame)),
("name", rpath),
- ("width", str(im_meta_data['original_size'][frame]["width"])),
- ("height", str(im_meta_data['original_size'][frame]["height"]))
+ ("width", str(im_w)),
+ ("height", str(im_h))
]))
- for shape_type in ["boxes", "polygons", "polylines", "points"]:
- shape_dict = shapes[shape_type]
- if frame in shape_dict:
- for shape in shape_dict[frame]:
- if shape_type == "boxes":
- if db_task.flipped:
- _flip_box(shape, im_w, im_h)
-
- dump_dict = OrderedDict([
- ("label", shape.label.name),
- ("xtl", "{:.2f}".format(shape.xtl)),
- ("ytl", "{:.2f}".format(shape.ytl)),
- ("xbr", "{:.2f}".format(shape.xbr)),
- ("ybr", "{:.2f}".format(shape.ybr)),
- ("occluded", str(int(shape.occluded))),
- ])
- if db_task.z_order:
- dump_dict['z_order'] = str(shape.z_order)
- if shape.group_id:
- dump_dict['group_id'] = str(shape.group_id)
- dumper.open_box(dump_dict)
- else:
- if db_task.flipped:
- _flip_shape(shape, im_w, im_h)
-
- dump_dict = OrderedDict([
- ("label", shape.label.name),
- ("points", ';'.join((
- ','.join((
- "{:.2f}".format(float(p.split(',')[0])),
- "{:.2f}".format(float(p.split(',')[1]))
- )) for p in shape.points.split(' '))
- )),
- ("occluded", str(int(shape.occluded))),
- ])
-
- if db_task.z_order:
- dump_dict['z_order'] = str(shape.z_order)
- if shape.group_id:
- dump_dict['group_id'] = str(shape.group_id)
-
- if shape_type == "polygons":
- dumper.open_polygon(dump_dict)
- elif shape_type == "polylines":
- dumper.open_polyline(dump_dict)
- else:
- dumper.open_points(dump_dict)
-
- for attr in shape.attributes:
- dumper.add_attribute(OrderedDict([
- ("name", attr.name),
- ("value", attr.value)
- ]))
-
- if shape_type == "boxes":
- dumper.close_box()
- elif shape_type == "polygons":
- dumper.close_polygon()
- elif shape_type == "polylines":
- dumper.close_polyline()
- else:
- dumper.close_points()
+ for shape in shapes.get(frame, []):
+ if db_task.flipped:
+ self._flip_shape(shape, im_w, im_h)
+
+ db_label = db_label_by_id[shape["label_id"]]
+
+ dump_data = OrderedDict([
+ ("label", db_label.name),
+ ("occluded", str(int(shape["occluded"]))),
+ ])
+
+ if shape["type"] == models.ShapeType.RECTANGLE:
+ dump_data.update(OrderedDict([
+ ("xtl", "{:.2f}".format(shape["points"][0])),
+ ("ytl", "{:.2f}".format(shape["points"][1])),
+ ("xbr", "{:.2f}".format(shape["points"][2])),
+ ("ybr", "{:.2f}".format(shape["points"][3]))
+ ]))
+ else:
+ dump_data.update(OrderedDict([
+ ("points", ';'.join((
+ ','.join((
+ "{:.2f}".format(x),
+ "{:.2f}".format(y)
+ )) for x,y in pairwise(shape["points"]))
+ )),
+ ]))
+
+ if db_task.z_order:
+ dump_data['z_order'] = str(shape["z_order"])
+ if shape["group"]:
+ dump_data['group_id'] = str(shape["group"])
+
+ if shape["type"] == models.ShapeType.RECTANGLE:
+ dumper.open_box(dump_data)
+ elif shape["type"] == models.ShapeType.POLYGON:
+ dumper.open_polygon(dump_data)
+ elif shape["type"] == models.ShapeType.POLYLINE:
+ dumper.open_polyline(dump_data)
+ elif shape["type"] == models.ShapeType.POINTS:
+ dumper.open_points(dump_data)
+ else:
+ raise NotImplementedError("unknown shape type")
+
+ for attr in shape["attributes"]:
+ db_attribute = db_attribute_by_id[attr["spec_id"]]
+ dumper.add_attribute(OrderedDict([
+ ("name", db_attribute.name),
+ ("value", attr["value"])
+ ]))
+
+ if shape["type"] == models.ShapeType.RECTANGLE:
+ dumper.close_box()
+ elif shape["type"] == models.ShapeType.POLYGON:
+ dumper.close_polygon()
+ elif shape["type"] == models.ShapeType.POLYLINE:
+ dumper.close_polyline()
+ elif shape["type"] == models.ShapeType.POINTS:
+ dumper.close_points()
+ else:
+ raise NotImplementedError("unknown shape type")
dumper.close_image()
else:
- paths = {}
- paths["boxes"] = self.to_box_paths()
- paths["polygons"] = self.to_polygon_paths()
- paths["polylines"] = self.to_polyline_paths()
- paths["points"] = self.to_points_paths()
+ data_manager = DataManager(self.data)
+ tracks = data_manager.to_tracks()
- im_w = im_meta_data['original_size'][0]['width']
- im_h = im_meta_data['original_size'][0]['height']
+ im_w = im_meta_data[0]['width']
+ im_h = im_meta_data[0]['height']
counter = 0
- for shape_type in ["boxes", "polygons", "polylines", "points"]:
- path_list = paths[shape_type]
- for path in path_list:
- path_id = path.client_id if path.client_id != -1 else counter
- counter += 1
- dump_dict = OrderedDict([
- ("id", str(path_id)),
- ("label", path.label.name),
+ for track in tracks:
+ track_id = counter
+ counter += 1
+ db_label = db_label_by_id[track["label_id"]]
+ dump_data = OrderedDict([
+ ("id", str(track_id)),
+ ("label", db_label.name),
+ ])
+ if track["group"]:
+ dump_data['group_id'] = str(track["group"])
+ dumper.open_track(dump_data)
+ for shape in TrackManager.get_interpolated_shapes(
+ track, 0, db_task.size):
+ if db_task.flipped:
+ self._flip_shape(shape, im_w, im_h)
+
+ dump_data = OrderedDict([
+ ("frame", str(shape["frame"])),
+ ("outside", str(int(shape["outside"]))),
+ ("occluded", str(int(shape["occluded"]))),
+ ("keyframe", str(int(shape["keyframe"])))
])
- if path.group_id:
- dump_dict['group_id'] = str(path.group_id)
- dumper.open_track(dump_dict)
- if shape_type == "boxes":
- for box in path.get_interpolated_boxes():
- if db_task.flipped:
- _flip_box(box, im_w, im_h)
- dump_dict = OrderedDict([
- ("frame", str(box.frame)),
- ("xtl", "{:.2f}".format(box.xtl)),
- ("ytl", "{:.2f}".format(box.ytl)),
- ("xbr", "{:.2f}".format(box.xbr)),
- ("ybr", "{:.2f}".format(box.ybr)),
- ("outside", str(int(box.outside))),
- ("occluded", str(int(box.occluded))),
- ("keyframe", str(int(box.keyframe)))
- ])
-
- if db_task.z_order:
- dump_dict["z_order"] = str(box.z_order)
-
- dumper.open_box(dump_dict)
- for attr in path.attributes + box.attributes:
- dumper.add_attribute(OrderedDict([
- ("name", attr.name),
- ("value", attr.value)
- ]))
- dumper.close_box()
+
+ if shape["type"] == models.ShapeType.RECTANGLE:
+ dump_data.update(OrderedDict([
+ ("xtl", "{:.2f}".format(shape["points"][0])),
+ ("ytl", "{:.2f}".format(shape["points"][1])),
+ ("xbr", "{:.2f}".format(shape["points"][2])),
+ ("ybr", "{:.2f}".format(shape["points"][3])),
+ ]))
+ else:
+ dump_data.update(OrderedDict([
+ ("points", ';'.join(['{:.2f},{:.2f}'.format(x, y)
+ for x,y in pairwise(shape["points"])]))
+ ]))
+
+ if db_task.z_order:
+ dump_data["z_order"] = str(shape["z_order"])
+
+ if shape["type"] == models.ShapeType.RECTANGLE:
+ dumper.open_box(dump_data)
+ elif shape["type"] == models.ShapeType.POLYGON:
+ dumper.open_polygon(dump_data)
+ elif shape["type"] == models.ShapeType.POLYLINE:
+ dumper.open_polyline(dump_data)
+ elif shape["type"] == models.ShapeType.POINTS:
+ dumper.open_points(dump_data)
+ else:
+ raise NotImplementedError("unknown shape type")
+
+ for attr in shape.get("attributes", []) + track.get("attributes", []):
+ db_attribute = db_attribute_by_id[attr["spec_id"]]
+ dumper.add_attribute(OrderedDict([
+ ("name", db_attribute.name),
+ ("value", attr["value"])
+ ]))
+
+ if shape["type"] == models.ShapeType.RECTANGLE:
+ dumper.close_box()
+ elif shape["type"] == models.ShapeType.POLYGON:
+ dumper.close_polygon()
+ elif shape["type"] == models.ShapeType.POLYLINE:
+ dumper.close_polyline()
+ elif shape["type"] == models.ShapeType.POINTS:
+ dumper.close_points()
else:
- for shape in path.get_interpolated_shapes():
- if db_task.flipped:
- _flip_shape(shape, im_w, im_h)
- dump_dict = OrderedDict([
- ("frame", str(shape.frame)),
- ("points", ';'.join((
- ','.join((
- "{:.2f}".format(float(p.split(',')[0])),
- "{:.2f}".format(float(p.split(',')[1]))
- )) for p in shape.points.split(' '))
- )),
- ("outside", str(int(shape.outside))),
- ("occluded", str(int(shape.occluded))),
- ("keyframe", str(int(shape.keyframe)))
- ])
-
- if db_task.z_order:
- dump_dict["z_order"] = str(shape.z_order)
-
- if shape_type == "polygons":
- dumper.open_polygon(dump_dict)
- elif shape_type == "polylines":
- dumper.open_polyline(dump_dict)
- else:
- dumper.open_points(dump_dict)
-
- for attr in path.attributes + shape.attributes:
- dumper.add_attribute(OrderedDict([
- ("name", attr.name),
- ("value", attr.value)
- ]))
-
- if shape_type == "polygons":
- dumper.close_polygon()
- elif shape_type == "polylines":
- dumper.close_polyline()
- else:
- dumper.close_points()
- dumper.close_track()
+ raise NotImplementedError("unknown shape type")
+ dumper.close_track()
dumper.close_root()
diff --git a/cvat/apps/engine/apps.py b/cvat/apps/engine/apps.py
index 3570035e..684345bc 100644
--- a/cvat/apps/engine/apps.py
+++ b/cvat/apps/engine/apps.py
@@ -5,7 +5,12 @@
from django.apps import AppConfig
-
class EngineConfig(AppConfig):
- name = 'engine'
+ name = 'cvat.apps.engine'
+
+ def ready(self):
+ from django.db.models.signals import post_save
+ from .signals import update_task_status
+ post_save.connect(update_task_status, sender='engine.Job',
+ dispatch_uid="update_task_status")
diff --git a/cvat/apps/engine/log.py b/cvat/apps/engine/log.py
index 4b065bfc..d54e161a 100644
--- a/cvat/apps/engine/log.py
+++ b/cvat/apps/engine/log.py
@@ -90,7 +90,8 @@ class dotdict(dict):
clogger = dotdict({
'task': TaskClientLoggerStorage(),
- 'job': JobClientLoggerStorage()
+ 'job': JobClientLoggerStorage(),
+ 'glob': logging.getLogger('cvat.client'),
})
slogger = dotdict({
diff --git a/cvat/apps/engine/migrations/0015_db_redesign_20190217.py b/cvat/apps/engine/migrations/0015_db_redesign_20190217.py
new file mode 100644
index 00000000..d20e4bbb
--- /dev/null
+++ b/cvat/apps/engine/migrations/0015_db_redesign_20190217.py
@@ -0,0 +1,212 @@
+# Generated by Django 2.1.5 on 2019-02-17 19:32
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.migrations.operations.special
+import django.db.models.deletion
+import cvat.apps.engine.models
+
+def set_segment_size(apps, schema_editor):
+ Task = apps.get_model('engine', 'Task')
+ for task in Task.objects.all():
+ segment = task.segment_set.first()
+ if segment:
+ task.segment_size = segment.stop_frame - segment.start_frame + 1
+ task.save()
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+ ('engine', '0014_job_max_shape_id'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='task',
+ name='segment_size',
+ field=models.PositiveIntegerField(null=True),
+ ),
+ migrations.RunPython(
+ code=set_segment_size,
+ reverse_code=django.db.migrations.operations.special.RunPython.noop,
+ ),
+ migrations.AlterField(
+ model_name='task',
+ name='segment_size',
+ field=models.PositiveIntegerField(),
+ ),
+ migrations.CreateModel(
+ name='ClientFile',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('file', models.FileField(max_length=1024, storage=cvat.apps.engine.models.MyFileSystemStorage(),
+ upload_to=cvat.apps.engine.models.upload_path_handler)),
+ ('task', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='engine.Task')),
+ ],
+ options={
+ 'default_permissions': (),
+ },
+ ),
+ migrations.CreateModel(
+ name='RemoteFile',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('file', models.CharField(max_length=1024)),
+ ('task', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='engine.Task')),
+ ],
+ options={
+ 'default_permissions': (),
+ },
+ ),
+ migrations.CreateModel(
+ name='ServerFile',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('file', models.CharField(max_length=1024)),
+ ('task', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='engine.Task')),
+ ],
+ options={
+ 'default_permissions': (),
+ },
+ ),
+ migrations.AlterField(
+ model_name='task',
+ name='status',
+ field=models.CharField(choices=[('ANNOTATION', 'annotation'), ('VALIDATION', 'validation'), ('COMPLETED', 'completed')], default=cvat.apps.engine.models.StatusChoice('annotation'), max_length=32),
+ ),
+ migrations.AlterField(
+ model_name='task',
+ name='overlap',
+ field=models.PositiveIntegerField(null=True),
+ ),
+ migrations.RemoveField(
+ model_name='task',
+ name='path',
+ ),
+ migrations.AddField(
+ model_name='task',
+ name='image_quality',
+ field=models.PositiveSmallIntegerField(default=50),
+ ),
+ migrations.CreateModel(
+ name='Plugin',
+ fields=[
+ ('name', models.SlugField(max_length=32, primary_key=True, serialize=False)),
+ ('description', cvat.apps.engine.models.SafeCharField(max_length=8192)),
+ ('created_at', models.DateTimeField(auto_now_add=True)),
+ ('updated_at', models.DateTimeField(auto_now_add=True)),
+ ('maintainer', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='maintainers', to=settings.AUTH_USER_MODEL)),
+ ],
+ options={
+ 'default_permissions': (),
+ },
+ ),
+ migrations.CreateModel(
+ name='PluginOption',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('name', cvat.apps.engine.models.SafeCharField(max_length=32)),
+ ('value', cvat.apps.engine.models.SafeCharField(max_length=1024)),
+ ('plugin', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='engine.Plugin')),
+ ],
+ ),
+ migrations.AlterUniqueTogether(
+ name='label',
+ unique_together={('task', 'name')},
+ ),
+ migrations.AlterUniqueTogether(
+ name='clientfile',
+ unique_together={('task', 'file')},
+ ),
+ migrations.AddField(
+ model_name='attributespec',
+ name='default_value',
+ field=models.CharField(default='', max_length=128),
+ preserve_default=False,
+ ),
+ migrations.AddField(
+ model_name='attributespec',
+ name='input_type',
+ field=models.CharField(choices=[('CHECKBOX', 'checkbox'), ('RADIO', 'radio'), ('NUMBER', 'number'), ('TEXT', 'text'), ('SELECT', 'select')], default='select', max_length=16),
+ preserve_default=False,
+ ),
+ migrations.AddField(
+ model_name='attributespec',
+ name='mutable',
+ field=models.BooleanField(default=True),
+ preserve_default=False,
+ ),
+ migrations.AddField(
+ model_name='attributespec',
+ name='name',
+ field=models.CharField(default='test', max_length=64),
+ preserve_default=False,
+ ),
+ migrations.AddField(
+ model_name='attributespec',
+ name='values',
+ field=models.CharField(default='', max_length=4096),
+ preserve_default=False,
+ ),
+ migrations.AlterField(
+ model_name='job',
+ name='status',
+ field=models.CharField(choices=[('ANNOTATION', 'annotation'), ('VALIDATION', 'validation'), ('COMPLETED', 'completed')], default=cvat.apps.engine.models.StatusChoice('annotation'), max_length=32),
+ ),
+ migrations.AlterField(
+ model_name='attributespec',
+ name='text',
+ field=models.CharField(default='', max_length=1024),
+ ),
+ migrations.AlterField(
+ model_name='attributespec',
+ name='input_type',
+ field=models.CharField(choices=[('checkbox', 'CHECKBOX'), ('radio', 'RADIO'), ('number', 'NUMBER'), ('text', 'TEXT'), ('select', 'SELECT')], max_length=16),
+ ),
+ migrations.AlterField(
+ model_name='task',
+ name='segment_size',
+ field=models.PositiveIntegerField(default=0),
+ ),
+ migrations.AlterField(
+ model_name='job',
+ name='status',
+ field=models.CharField(choices=[('annotation', 'ANNOTATION'), ('validation', 'VALIDATION'), ('completed', 'COMPLETED')], default=cvat.apps.engine.models.StatusChoice('annotation'), max_length=32),
+ ),
+ migrations.AlterField(
+ model_name='task',
+ name='status',
+ field=models.CharField(choices=[('annotation', 'ANNOTATION'), ('validation', 'VALIDATION'), ('completed', 'COMPLETED')], default=cvat.apps.engine.models.StatusChoice('annotation'), max_length=32),
+ ),
+ migrations.CreateModel(
+ name='Image',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('path', models.CharField(max_length=1024)),
+ ('frame', models.PositiveIntegerField()),
+ ('task', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='engine.Task')),
+ ('height', models.PositiveIntegerField()),
+ ('width', models.PositiveIntegerField()),
+ ],
+ options={
+ 'default_permissions': (),
+ },
+ ),
+ migrations.CreateModel(
+ name='Video',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('path', models.CharField(max_length=1024)),
+ ('start_frame', models.PositiveIntegerField()),
+ ('stop_frame', models.PositiveIntegerField()),
+ ('step', models.PositiveIntegerField(default=1)),
+ ('task', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='engine.Task')),
+ ('height', models.PositiveIntegerField()),
+ ('width', models.PositiveIntegerField()),
+ ],
+ options={
+ 'default_permissions': (),
+ },
+ ),
+ ]
diff --git a/cvat/apps/engine/migrations/0016_attribute_spec_20190217.py b/cvat/apps/engine/migrations/0016_attribute_spec_20190217.py
new file mode 100644
index 00000000..dfb84fff
--- /dev/null
+++ b/cvat/apps/engine/migrations/0016_attribute_spec_20190217.py
@@ -0,0 +1,172 @@
+import os
+import re
+import csv
+from io import StringIO
+from PIL import Image
+from django.db import migrations
+from django.conf import settings
+from cvat.apps.engine.task import _get_mime
+
+def parse_attribute(value):
+ match = re.match(r'^([~@])(\w+)=(\w+):(.+)?$', value)
+ if match:
+ prefix = match.group(1)
+ input_type = match.group(2)
+ name = match.group(3)
+ if match.group(4):
+ values = list(csv.reader(StringIO(match.group(4)),
+ quotechar="'"))[0]
+ else:
+ values = []
+
+ return {'prefix':prefix, 'type':input_type, 'name':name, 'values':values}
+ else:
+ return None
+
+def split_text_attribute(apps, schema_editor):
+ AttributeSpec = apps.get_model('engine', 'AttributeSpec')
+ for attribute in AttributeSpec.objects.all():
+ spec = parse_attribute(attribute.text)
+ if spec:
+ attribute.mutable = (spec['prefix'] == '~')
+ attribute.input_type = spec['type']
+ attribute.name = spec['name']
+ attribute.default_value = spec['values'][0] if spec['values'] else ''
+ attribute.values = '\n'.join(spec['values'])
+ attribute.save()
+
+def join_text_attribute(apps, schema_editor):
+ AttributeSpec = apps.get_model('engine', 'AttributeSpec')
+ for attribute in AttributeSpec.objects.all():
+ attribute.text = ""
+ if attribute.mutable:
+ attribute.text += "~"
+ else:
+ attribute.text += "@"
+
+ attribute.text += attribute.input_type
+ attribute.text += "=" + attribute.name + ":"
+ attribute.text += ",".join(attribute.values.split('\n'))
+ attribute.save()
+
+def _get_task_dirname(task_obj):
+ return os.path.join(settings.DATA_ROOT, str(task_obj.id))
+
+def _get_upload_dirname(task_obj):
+ return os.path.join(_get_task_dirname(task_obj), ".upload")
+
+def _get_frame_path(task_obj, frame):
+ return os.path.join(
+ _get_task_dirname(task_obj),
+ "data",
+ str(int(frame) // 10000),
+ str(int(frame) // 100),
+ str(frame) + '.jpg',
+ )
+
+def fill_task_meta_data_forward(apps, schema_editor):
+ db_alias = schema_editor.connection.alias
+ task_model = apps.get_model('engine', 'Task')
+ video_model = apps.get_model('engine', "Video")
+ image_model = apps.get_model('engine', 'Image')
+
+ for db_task in task_model.objects.all():
+ if db_task.mode == 'interpolation':
+ db_video = video_model()
+ db_video.task_id = db_task.id
+ db_video.start_frame = 0
+ db_video.stop_frame = db_task.size
+ db_video.step = 1
+
+ video = ""
+ for root, _, files in os.walk(_get_upload_dirname(db_task)):
+ fullnames = map(lambda f: os.path.join(root, f), files)
+ videos = list(filter(lambda x: _get_mime(x) == 'video', fullnames))
+ if len(videos):
+ video = videos[0]
+ break
+ db_video.path = video
+ try:
+ image = Image.open(_get_frame_path(db_task, 0))
+ db_video.width = image.width
+ db_video.height = image.height
+ image.close()
+ except FileNotFoundError:
+ db_video.width = 0
+ db_video.height = 0
+
+ db_video.save()
+ else:
+ filenames = []
+ for root, _, files in os.walk(_get_upload_dirname(db_task)):
+ fullnames = map(lambda f: os.path.join(root, f), files)
+ images = filter(lambda x: _get_mime(x) == 'image', fullnames)
+ filenames.extend(images)
+ filenames.sort()
+
+ db_images = []
+ for i, image_path in enumerate(filenames):
+ db_image = image_model()
+ db_image.task_id = db_task.id
+ db_image.path = image_path
+ db_image.frame = i
+ try:
+ image = Image.open(image_path)
+ db_image.width = image.width
+ db_image.height = image.height
+ image.close()
+ except FileNotFoundError:
+ db_image.width = 0
+ db_image.height = 0
+
+ db_images.append(db_image)
+ image_model.objects.using(db_alias).bulk_create(db_images)
+
+def fill_task_meta_data_backward(apps, schema_editor):
+ task_model = apps.get_model('engine', 'Task')
+ video_model = apps.get_model('engine', "Video")
+ image_model = apps.get_model('engine', 'Image')
+
+ for db_task in task_model.objects.all():
+ upload_dir = _get_upload_dirname(db_task)
+ if db_task.mode == 'interpolation':
+ video = video_model.objects.get(task__id=db_task.id)
+ db_task.source = os.path.relpath(video.path, upload_dir)
+ video.delete()
+ else:
+ images = image_model.objects.filter(task__id=db_task.id)
+ db_task.source = '{} images: {}, ...'.format(
+ len(images),
+ ", ".join([os.path.relpath(x.path, upload_dir) for x in images[0:2]])
+ )
+ images.delete()
+ db_task.save()
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('engine', '0015_db_redesign_20190217'),
+ ]
+
+ operations = [
+ migrations.RunPython(
+ code=split_text_attribute,
+ reverse_code=join_text_attribute,
+ ),
+ migrations.RemoveField(
+ model_name='attributespec',
+ name='text',
+ ),
+ migrations.AlterUniqueTogether(
+ name='attributespec',
+ unique_together={('label', 'name')},
+ ),
+ migrations.RunPython(
+ code=fill_task_meta_data_forward,
+ reverse_code=fill_task_meta_data_backward,
+ ),
+ migrations.RemoveField(
+ model_name='task',
+ name='source',
+ ),
+ ]
diff --git a/cvat/apps/engine/migrations/0017_db_redesign_20190221.py b/cvat/apps/engine/migrations/0017_db_redesign_20190221.py
new file mode 100644
index 00000000..9c54bacd
--- /dev/null
+++ b/cvat/apps/engine/migrations/0017_db_redesign_20190221.py
@@ -0,0 +1,915 @@
+# Generated by Django 2.1.5 on 2019-02-21 12:25
+
+import cvat.apps.engine.models
+from django.db import migrations, models
+import django.db.models.deletion
+from django.conf import settings
+from cvat.apps.engine.annotation import _merge_table_rows
+
+# some modified functions to transer annotation
+def _bulk_create(db_model, db_alias, objects, flt_param):
+ if objects:
+ if flt_param:
+ if 'postgresql' in settings.DATABASES["default"]["ENGINE"]:
+ return db_model.objects.using(db_alias).bulk_create(objects)
+ else:
+ ids = list(db_model.objects.using(db_alias).filter(**flt_param).values_list('id', flat=True))
+ db_model.objects.using(db_alias).bulk_create(objects)
+
+ return list(db_model.objects.using(db_alias).exclude(id__in=ids).filter(**flt_param))
+ else:
+ return db_model.objects.using(db_alias).bulk_create(objects)
+
+def get_old_db_shapes(shape_type, db_job):
+ def _get_shape_set(db_job, shape_type):
+ if shape_type == 'polygons':
+ return db_job.labeledpolygon_set
+ elif shape_type == 'polylines':
+ return db_job.labeledpolyline_set
+ elif shape_type == 'boxes':
+ return db_job.labeledbox_set
+ elif shape_type == 'points':
+ return db_job.labeledpoints_set
+
+ def get_values(shape_type):
+ if shape_type == 'polygons':
+ return [
+ ('id', 'frame', 'points', 'label_id', 'group_id', 'occluded', 'z_order', 'client_id',
+ 'labeledpolygonattributeval__value', 'labeledpolygonattributeval__spec_id',
+ 'labeledpolygonattributeval__id'), {
+ 'attributes': [
+ 'labeledpolygonattributeval__value',
+ 'labeledpolygonattributeval__spec_id',
+ 'labeledpolygonattributeval__id'
+ ]
+ }, 'labeledpolygonattributeval_set'
+ ]
+ elif shape_type == 'polylines':
+ return [
+ ('id', 'frame', 'points', 'label_id', 'group_id', 'occluded', 'z_order', 'client_id',
+ 'labeledpolylineattributeval__value', 'labeledpolylineattributeval__spec_id',
+ 'labeledpolylineattributeval__id'), {
+ 'attributes': [
+ 'labeledpolylineattributeval__value',
+ 'labeledpolylineattributeval__spec_id',
+ 'labeledpolylineattributeval__id'
+ ]
+ }, 'labeledpolylineattributeval_set'
+ ]
+ elif shape_type == 'boxes':
+ return [
+ ('id', 'frame', 'xtl', 'ytl', 'xbr', 'ybr', 'label_id', 'group_id', 'occluded', 'z_order', 'client_id',
+ 'labeledboxattributeval__value', 'labeledboxattributeval__spec_id',
+ 'labeledboxattributeval__id'), {
+ 'attributes': [
+ 'labeledboxattributeval__value',
+ 'labeledboxattributeval__spec_id',
+ 'labeledboxattributeval__id'
+ ]
+ }, 'labeledboxattributeval_set'
+ ]
+ elif shape_type == 'points':
+ return [
+ ('id', 'frame', 'points', 'label_id', 'group_id', 'occluded', 'z_order', 'client_id',
+ 'labeledpointsattributeval__value', 'labeledpointsattributeval__spec_id',
+ 'labeledpointsattributeval__id'), {
+ 'attributes': [
+ 'labeledpointsattributeval__value',
+ 'labeledpointsattributeval__spec_id',
+ 'labeledpointsattributeval__id'
+ ]
+ }, 'labeledpointsattributeval_set'
+ ]
+ (values, merge_keys, prefetch) = get_values(shape_type)
+ db_shapes = list(_get_shape_set(db_job, shape_type).prefetch_related(prefetch).values(*values).order_by('frame'))
+ return _merge_table_rows(db_shapes, merge_keys, 'id')
+
+def get_old_db_paths(db_job):
+ db_paths = db_job.objectpath_set
+ for shape in ['trackedpoints_set', 'trackedbox_set', 'trackedpolyline_set', 'trackedpolygon_set']:
+ db_paths.prefetch_related(shape)
+ for shape_attr in ['trackedpoints_set__trackedpointsattributeval_set', 'trackedbox_set__trackedboxattributeval_set',
+ 'trackedpolygon_set__trackedpolygonattributeval_set', 'trackedpolyline_set__trackedpolylineattributeval_set']:
+ db_paths.prefetch_related(shape_attr)
+ db_paths.prefetch_related('objectpathattributeval_set')
+ db_paths = list (db_paths.values('id', 'frame', 'group_id', 'shapes', 'client_id', 'objectpathattributeval__spec_id',
+ 'objectpathattributeval__id', 'objectpathattributeval__value',
+ 'trackedbox', 'trackedpolygon', 'trackedpolyline', 'trackedpoints',
+ 'trackedbox__id', 'label_id', 'trackedbox__xtl', 'trackedbox__ytl',
+ 'trackedbox__xbr', 'trackedbox__ybr', 'trackedbox__frame', 'trackedbox__occluded',
+ 'trackedbox__z_order','trackedbox__outside', 'trackedbox__trackedboxattributeval__spec_id',
+ 'trackedbox__trackedboxattributeval__value', 'trackedbox__trackedboxattributeval__id',
+ 'trackedpolygon__id' ,'trackedpolygon__points', 'trackedpolygon__frame', 'trackedpolygon__occluded',
+ 'trackedpolygon__z_order', 'trackedpolygon__outside', 'trackedpolygon__trackedpolygonattributeval__spec_id',
+ 'trackedpolygon__trackedpolygonattributeval__value', 'trackedpolygon__trackedpolygonattributeval__id',
+ 'trackedpolyline__id', 'trackedpolyline__points', 'trackedpolyline__frame', 'trackedpolyline__occluded',
+ 'trackedpolyline__z_order', 'trackedpolyline__outside', 'trackedpolyline__trackedpolylineattributeval__spec_id',
+ 'trackedpolyline__trackedpolylineattributeval__value', 'trackedpolyline__trackedpolylineattributeval__id',
+ 'trackedpoints__id', 'trackedpoints__points', 'trackedpoints__frame', 'trackedpoints__occluded',
+ 'trackedpoints__z_order', 'trackedpoints__outside', 'trackedpoints__trackedpointsattributeval__spec_id',
+ 'trackedpoints__trackedpointsattributeval__value', 'trackedpoints__trackedpointsattributeval__id')
+ .order_by('id', 'trackedbox__frame', 'trackedpolygon__frame', 'trackedpolyline__frame', 'trackedpoints__frame'))
+
+ db_box_paths = list(filter(lambda path: path['shapes'] == 'boxes', db_paths ))
+ db_polygon_paths = list(filter(lambda path: path['shapes'] == 'polygons', db_paths ))
+ db_polyline_paths = list(filter(lambda path: path['shapes'] == 'polylines', db_paths ))
+ db_points_paths = list(filter(lambda path: path['shapes'] == 'points', db_paths ))
+
+ object_path_attr_merge_key = [
+ 'objectpathattributeval__value',
+ 'objectpathattributeval__spec_id',
+ 'objectpathattributeval__id'
+ ]
+
+ db_box_paths = _merge_table_rows(db_box_paths, {
+ 'attributes': object_path_attr_merge_key,
+ 'shapes': [
+ 'trackedbox__id', 'trackedbox__xtl', 'trackedbox__ytl',
+ 'trackedbox__xbr', 'trackedbox__ybr', 'trackedbox__frame',
+ 'trackedbox__occluded', 'trackedbox__z_order', 'trackedbox__outside',
+ 'trackedbox__trackedboxattributeval__value',
+ 'trackedbox__trackedboxattributeval__spec_id',
+ 'trackedbox__trackedboxattributeval__id'
+ ],
+ }, 'id')
+
+ db_polygon_paths = _merge_table_rows(db_polygon_paths, {
+ 'attributes': object_path_attr_merge_key,
+ 'shapes': [
+ 'trackedpolygon__id', 'trackedpolygon__points', 'trackedpolygon__frame',
+ 'trackedpolygon__occluded', 'trackedpolygon__z_order', 'trackedpolygon__outside',
+ 'trackedpolygon__trackedpolygonattributeval__value',
+ 'trackedpolygon__trackedpolygonattributeval__spec_id',
+ 'trackedpolygon__trackedpolygonattributeval__id'
+ ]
+ }, 'id')
+
+ db_polyline_paths = _merge_table_rows(db_polyline_paths, {
+ 'attributes': object_path_attr_merge_key,
+ 'shapes': [
+ 'trackedpolyline__id', 'trackedpolyline__points', 'trackedpolyline__frame',
+ 'trackedpolyline__occluded', 'trackedpolyline__z_order', 'trackedpolyline__outside',
+ 'trackedpolyline__trackedpolylineattributeval__value',
+ 'trackedpolyline__trackedpolylineattributeval__spec_id',
+ 'trackedpolyline__trackedpolylineattributeval__id'
+ ],
+ }, 'id')
+
+ db_points_paths = _merge_table_rows(db_points_paths, {
+ 'attributes': object_path_attr_merge_key,
+ 'shapes': [
+ 'trackedpoints__id', 'trackedpoints__points', 'trackedpoints__frame',
+ 'trackedpoints__occluded', 'trackedpoints__z_order', 'trackedpoints__outside',
+ 'trackedpoints__trackedpointsattributeval__value',
+ 'trackedpoints__trackedpointsattributeval__spec_id',
+ 'trackedpoints__trackedpointsattributeval__id'
+ ]
+ }, 'id')
+
+ for db_box_path in db_box_paths:
+ db_box_path.attributes = list(set(db_box_path.attributes))
+ db_box_path.type = 'box_path'
+ db_box_path.shapes = _merge_table_rows(db_box_path.shapes, {
+ 'attributes': [
+ 'trackedboxattributeval__value',
+ 'trackedboxattributeval__spec_id',
+ 'trackedboxattributeval__id'
+ ]
+ }, 'id')
+
+ for db_polygon_path in db_polygon_paths:
+ db_polygon_path.attributes = list(set(db_polygon_path.attributes))
+ db_polygon_path.type = 'poligon_path'
+ db_polygon_path.shapes = _merge_table_rows(db_polygon_path.shapes, {
+ 'attributes': [
+ 'trackedpolygonattributeval__value',
+ 'trackedpolygonattributeval__spec_id',
+ 'trackedpolygonattributeval__id'
+ ]
+ }, 'id')
+
+ for db_polyline_path in db_polyline_paths:
+ db_polyline_path.attributes = list(set(db_polyline_path.attributes))
+ db_polyline_path.type = 'polyline_path'
+ db_polyline_path.shapes = _merge_table_rows(db_polyline_path.shapes, {
+ 'attributes': [
+ 'trackedpolylineattributeval__value',
+ 'trackedpolylineattributeval__spec_id',
+ 'trackedpolylineattributeval__id'
+ ]
+ }, 'id')
+
+ for db_points_path in db_points_paths:
+ db_points_path.attributes = list(set(db_points_path.attributes))
+ db_points_path.type = 'points_path'
+ db_points_path.shapes = _merge_table_rows(db_points_path.shapes, {
+ 'attributes': [
+ 'trackedpointsattributeval__value',
+ 'trackedpointsattributeval__spec_id',
+ 'trackedpointsattributeval__id'
+ ]
+ }, 'id')
+ return db_box_paths + db_polygon_paths + db_polyline_paths + db_points_paths
+
+def process_shapes(db_job, apps, db_labels, db_attributes, db_alias):
+ LabeledShape = apps.get_model('engine', 'LabeledShape')
+ LabeledShapeAttributeVal = apps.get_model('engine', 'LabeledShapeAttributeVal')
+ new_db_shapes = []
+ new_db_attrvals = []
+ for shape_type in ['boxes', 'points', 'polygons', 'polylines']:
+ for shape in get_old_db_shapes(shape_type, db_job):
+ new_db_shape = LabeledShape()
+ new_db_shape.job = db_job
+ new_db_shape.label = db_labels[shape.label_id]
+ new_db_shape.group = shape.group_id
+
+ if shape_type == 'boxes':
+ new_db_shape.type = cvat.apps.engine.models.ShapeType.RECTANGLE
+ new_db_shape.points = [shape.xtl, shape.ytl, shape.xbr, shape.ybr]
+ else:
+ new_db_shape.points = shape.points.replace(',', ' ').split()
+ if shape_type == 'points':
+ new_db_shape.type = cvat.apps.engine.models.ShapeType.POINTS
+ elif shape_type == 'polygons':
+ new_db_shape.type = cvat.apps.engine.models.ShapeType.POLYGON
+ elif shape_type == 'polylines':
+ new_db_shape.type = cvat.apps.engine.models.ShapeType.POLYLINE
+
+ new_db_shape.frame = shape.frame
+ new_db_shape.occluded = shape.occluded
+ new_db_shape.z_order = shape.z_order
+
+ for attr in shape.attributes:
+ db_attrval = LabeledShapeAttributeVal()
+ db_attrval.shape_id = len(new_db_shapes)
+ db_attrval.spec = db_attributes[attr.spec_id]
+ db_attrval.value = attr.value
+ new_db_attrvals.append(db_attrval)
+
+ new_db_shapes.append(new_db_shape)
+
+ new_db_shapes = _bulk_create(LabeledShape, db_alias, new_db_shapes, {"job_id": db_job.id})
+ for db_attrval in new_db_attrvals:
+ db_attrval.shape_id = new_db_shapes[db_attrval.shape_id].id
+
+ _bulk_create(LabeledShapeAttributeVal, db_alias, new_db_attrvals, {})
+
+def process_paths(db_job, apps, db_labels, db_attributes, db_alias):
+ TrackedShape = apps.get_model('engine', 'TrackedShape')
+ LabeledTrack = apps.get_model('engine', 'LabeledTrack')
+ LabeledTrackAttributeVal = apps.get_model('engine', 'LabeledTrackAttributeVal')
+ TrackedShapeAttributeVal = apps.get_model('engine', 'TrackedShapeAttributeVal')
+ tracks = get_old_db_paths(db_job)
+
+ new_db_tracks = []
+ new_db_track_attrvals = []
+ new_db_shapes = []
+ new_db_shape_attrvals = []
+
+ for track in tracks:
+ db_track = LabeledTrack()
+ db_track.job = db_job
+ db_track.label = db_labels[track.label_id]
+ db_track.frame = track.frame
+ db_track.group = track.group_id
+
+ for attr in track.attributes:
+ db_attrspec = db_attributes[attr.spec_id]
+ db_attrval = LabeledTrackAttributeVal()
+ db_attrval.track_id = len(new_db_tracks)
+ db_attrval.spec = db_attrspec
+ db_attrval.value = attr.value
+ new_db_track_attrvals.append(db_attrval)
+
+ for shape in track.shapes:
+ db_shape = TrackedShape()
+ db_shape.track_id = len(new_db_tracks)
+ db_shape.frame = shape.frame
+ db_shape.occluded = shape.occluded
+ db_shape.z_order = shape.z_order
+ db_shape.outside = shape.outside
+ if track.type == 'box_path':
+ db_shape.type = cvat.apps.engine.models.ShapeType.RECTANGLE
+ db_shape.points = [shape.xtl, shape.ytl, shape.xbr, shape.ybr]
+ else:
+ db_shape.points = shape.points.replace(',', ' ').split()
+ if track.type == 'points_path':
+ db_shape.type = cvat.apps.engine.models.ShapeType.POINTS
+ elif track.type == 'polygon_path':
+ db_shape.type = cvat.apps.engine.models.ShapeType.POLYGON
+ elif track.type == 'polyline_path':
+ db_shape.type = cvat.apps.engine.models.ShapeType.POLYLINE
+
+ for attr in shape.attributes:
+ db_attrspec = db_attributes[attr.spec_id]
+ db_attrval = TrackedShapeAttributeVal()
+ db_attrval.shape_id = len(new_db_shapes)
+ db_attrval.spec = db_attrspec
+ db_attrval.value = attr.value
+ new_db_shape_attrvals.append(db_attrval)
+
+ new_db_shapes.append(db_shape)
+ new_db_tracks.append(db_track)
+
+ new_db_tracks = _bulk_create(LabeledTrack, db_alias, new_db_tracks, {"job_id": db_job.id})
+
+ for db_attrval in new_db_track_attrvals:
+ db_attrval.track_id = new_db_tracks[db_attrval.track_id].id
+ _bulk_create(LabeledTrackAttributeVal, db_alias, new_db_track_attrvals, {})
+
+ for db_shape in new_db_shapes:
+ db_shape.track_id = new_db_tracks[db_shape.track_id].id
+
+ new_db_shapes = _bulk_create(TrackedShape, db_alias, new_db_shapes, {"track__job_id": db_job.id})
+
+ for db_attrval in new_db_shape_attrvals:
+ db_attrval.shape_id = new_db_shapes[db_attrval.shape_id].id
+
+ _bulk_create(TrackedShapeAttributeVal, db_alias, new_db_shape_attrvals, {})
+
+def copy_annotations_forward(apps, schema_editor):
+ db_alias = schema_editor.connection.alias
+ Task = apps.get_model('engine', 'Task')
+ AttributeSpec = apps.get_model('engine', 'AttributeSpec')
+
+
+ for task in Task.objects.all():
+ print("run anno migration for the task {}".format(task.id))
+ db_labels = {db_label.id:db_label for db_label in task.label_set.all()}
+ db_attributes = {db_attr.id:db_attr for db_attr in AttributeSpec.objects.filter(label__task__id=task.id)}
+ for segment in task.segment_set.prefetch_related('job_set').all():
+ db_job = segment.job_set.first()
+ print("run anno migration for the job {}".format(db_job.id))
+ process_shapes(db_job, apps, db_labels, db_attributes, db_alias)
+ process_paths(db_job, apps, db_labels, db_attributes, db_alias)
+
+def _save_old_shapes_to_db(apps, db_shapes, db_attributes, db_alias, db_job):
+ def _get_shape_class(shape_type):
+ if shape_type == 'polygons':
+ return apps.get_model('engine', 'LabeledPolygon')
+ elif shape_type == 'polylines':
+ return apps.get_model('engine', 'LabeledPolyline')
+ elif shape_type == 'boxes':
+ return apps.get_model('engine', 'LabeledBox')
+ elif shape_type == 'points':
+ return apps.get_model('engine', 'LabeledPoints')
+
+ def _get_shape_attr_class(shape_type):
+ if shape_type == 'polygons':
+ return apps.get_model('engine', 'LabeledPolygonAttributeVal')
+ elif shape_type == 'polylines':
+ return apps.get_model('engine', 'LabeledPolylineAttributeVal')
+ elif shape_type == 'boxes':
+ return apps.get_model('engine', 'LabeledBoxAttributeVal')
+ elif shape_type == 'points':
+ return apps.get_model('engine', 'LabeledPointsAttributeVal')
+
+ shapes = [
+ list(filter(lambda s: s.type == cvat.apps.engine.models.ShapeType.RECTANGLE, db_shapes)),
+ list(filter(lambda s: s.type == cvat.apps.engine.models.ShapeType.POLYLINE, db_shapes)),
+ list(filter(lambda s: s.type == cvat.apps.engine.models.ShapeType.POLYGON, db_shapes)),
+ list(filter(lambda s: s.type == cvat.apps.engine.models.ShapeType.POINTS, db_shapes)),
+ ]
+ for i, shape_type in enumerate(['boxes', 'polylines', 'polygons', 'points']):
+ new_db_shapes = []
+ new_db_attrvals = []
+ for shape in shapes[i]:
+ db_shape = _get_shape_class(shape_type)()
+ db_shape.job = shape.job
+ db_shape.label = shape.label
+ db_shape.group_id = shape.group
+ if shape.type == cvat.apps.engine.models.ShapeType.RECTANGLE:
+ db_shape.xtl = shape.points[0]
+ db_shape.ytl = shape.points[1]
+ db_shape.xbr = shape.points[2]
+ db_shape.ybr = shape.points[3]
+ else:
+ point_iterator = iter(shape.points)
+ db_shape.points = ' '.join(['{},{}'.format(point, next(point_iterator)) for point in point_iterator])
+ db_shape.frame = shape.frame
+ db_shape.occluded = shape.occluded
+ db_shape.z_order = shape.z_order
+
+ for attr in list(shape.labeledshapeattributeval_set.all()):
+ db_attrval = _get_shape_attr_class(shape_type)()
+ if shape.type == cvat.apps.engine.models.ShapeType.POLYGON:
+ db_attrval.polygon_id = len(new_db_shapes)
+ elif shape.type == cvat.apps.engine.models.ShapeType.POLYLINE:
+ db_attrval.polyline_id = len(new_db_shapes)
+ elif shape.type == cvat.apps.engine.models.ShapeType.RECTANGLE:
+ db_attrval.box_id = len(new_db_shapes)
+ else:
+ db_attrval.points_id = len(new_db_shapes)
+
+ db_attrval.spec = db_attributes[attr.spec_id]
+ db_attrval.value = attr.value
+ new_db_attrvals.append(db_attrval)
+
+ new_db_shapes.append(db_shape)
+
+ new_db_shapes = _bulk_create(_get_shape_class(shape_type), db_alias, new_db_shapes, {"job_id": db_job.id})
+
+ for db_attrval in new_db_attrvals:
+ if shape_type == 'polygons':
+ db_attrval.polygon_id = new_db_shapes[db_attrval.polygon_id].id
+ elif shape_type == 'polylines':
+ db_attrval.polyline_id = new_db_shapes[db_attrval.polyline_id].id
+ elif shape_type == 'boxes':
+ db_attrval.box_id = new_db_shapes[db_attrval.box_id].id
+ else:
+ db_attrval.points_id = new_db_shapes[db_attrval.points_id].id
+
+ _bulk_create(_get_shape_attr_class(shape_type), db_alias, new_db_attrvals, {})
+
+def _save_old_tracks_to_db(apps, db_shapes, db_attributes, db_alias, db_job):
+ def _get_shape_class(shape_type):
+ if shape_type == 'polygon_paths':
+ return apps.get_model('engine', 'TrackedPolygon')
+ elif shape_type == 'polyline_paths':
+ return apps.get_model('engine', 'TrackedPolyline')
+ elif shape_type == 'box_paths':
+ return apps.get_model('engine', 'TrackedBox')
+ elif shape_type == 'points_paths':
+ return apps.get_model('engine', 'TrackedPoints')
+
+ def _get_shape_attr_class(shape_type):
+ if shape_type == 'polygon_paths':
+ return apps.get_model('engine', 'TrackedPolygonAttributeVal')
+ elif shape_type == 'polyline_paths':
+ return apps.get_model('engine', 'TrackedPolylineAttributeVal')
+ elif shape_type == 'box_paths':
+ return apps.get_model('engine', 'TrackedBoxAttributeVal')
+ elif shape_type == 'points_paths':
+ return apps.get_model('engine', 'TrackedPointsAttributeVal')
+
+ tracks = [
+ list(filter(lambda t: t.trackedshape_set.first().type == cvat.apps.engine.models.ShapeType.RECTANGLE, db_shapes)),
+ list(filter(lambda t: t.trackedshape_set.first().type == cvat.apps.engine.models.ShapeType.POLYLINE, db_shapes)),
+ list(filter(lambda t: t.trackedshape_set.first().type == cvat.apps.engine.models.ShapeType.POLYGON, db_shapes)),
+ list(filter(lambda t: t.trackedshape_set.first().type == cvat.apps.engine.models.ShapeType.POINTS, db_shapes)),
+ ]
+
+ ObjectPath = apps.get_model('engine', 'ObjectPath')
+ ObjectPathAttributeVal = apps.get_model('engine', 'ObjectPathAttributeVal')
+
+ for i, shape_type in enumerate(['box_paths', 'polyline_paths', 'polygon_paths', 'points_paths', ]):
+ new_db_paths = []
+ new_db_path_attrvals = []
+ new_db_shapes = []
+ new_db_shape_attrvals = []
+
+ for path in tracks[i]:
+ db_path = ObjectPath()
+ db_path.job = db_job
+ db_path.label = path.label
+ db_path.frame = path.frame
+ db_path.group_id = path.group
+ # db_path.client_id = path.client_id
+ if shape_type == 'polygon_paths':
+ db_path.shapes = 'polygons'
+ elif shape_type == 'polyline_paths':
+ db_path.shapes = 'polylines'
+ elif shape_type == 'box_paths':
+ db_path.shapes = 'boxes'
+ elif shape_type == 'points_paths':
+ db_path.shapes = 'points'
+
+ for attr in list(path.labeledtrackattributeval_set.all()):
+ db_attrspec = db_attributes[attr.spec_id]
+ db_attrval = ObjectPathAttributeVal()
+ db_attrval.track_id = len(new_db_paths)
+ db_attrval.spec = db_attrspec
+ db_attrval.value = attr.value
+ new_db_path_attrvals.append(db_attrval)
+
+ for shape in list(path.trackedshape_set.all()):
+ db_shape = _get_shape_class(shape_type)()
+ db_shape.track_id = len(new_db_paths)
+ if shape_type == 'box_paths':
+ db_shape.xtl = shape.points[0]
+ db_shape.ytl = shape.points[1]
+ db_shape.xbr = shape.points[2]
+ db_shape.ybr = shape.points[3]
+ else:
+ point_iterator = iter(shape.points)
+ db_shape.points = ' '.join(['{},{}'.format(point, next(point_iterator)) for point in point_iterator])
+
+ db_shape.frame = shape.frame
+ db_shape.occluded = shape.occluded
+ db_shape.z_order = shape.z_order
+ db_shape.outside = shape.outside
+
+ for attr in list(shape.trackedshapeattributeval_set.all()):
+ db_attrspec = db_attributes[attr.spec_id]
+ db_attrval = _get_shape_attr_class(shape_type)()
+ if shape_type == 'polygon_paths':
+ db_attrval.polygon_id = len(new_db_shapes)
+ elif shape_type == 'polyline_paths':
+ db_attrval.polyline_id = len(new_db_shapes)
+ elif shape_type == 'box_paths':
+ db_attrval.box_id = len(new_db_shapes)
+ elif shape_type == 'points_paths':
+ db_attrval.points_id = len(new_db_shapes)
+ db_attrval.spec = db_attrspec
+ db_attrval.value = attr.value
+ new_db_shape_attrvals.append(db_attrval)
+
+ new_db_shapes.append(db_shape)
+ new_db_paths.append(db_path)
+
+ new_db_paths = _bulk_create(ObjectPath, db_alias, new_db_paths, {"job_id": db_job.id})
+
+ for db_attrval in new_db_path_attrvals:
+ db_attrval.track_id = new_db_paths[db_attrval.track_id].id
+ _bulk_create(ObjectPathAttributeVal, db_alias, new_db_path_attrvals, {})
+
+ for db_shape in new_db_shapes:
+ db_shape.track_id = new_db_paths[db_shape.track_id].id
+
+ db_shapes = _bulk_create(_get_shape_class(shape_type), db_alias, new_db_shapes, {"track__job_id": db_job.id})
+
+ for db_attrval in new_db_shape_attrvals:
+ if shape_type == 'polygon_paths':
+ db_attrval.polygon_id = db_shapes[db_attrval.polygon_id].id
+ elif shape_type == 'polyline_paths':
+ db_attrval.polyline_id = db_shapes[db_attrval.polyline_id].id
+ elif shape_type == 'box_paths':
+ db_attrval.box_id = db_shapes[db_attrval.box_id].id
+ elif shape_type == 'points_paths':
+ db_attrval.points_id = db_shapes[db_attrval.points_id].id
+
+ _bulk_create(_get_shape_attr_class(shape_type), db_alias, new_db_shape_attrvals, {})
+
+def copy_annotations_backward(apps, schema_editor):
+ Task = apps.get_model('engine', 'Task')
+ AttributeSpec = apps.get_model('engine', 'AttributeSpec')
+ db_alias = schema_editor.connection.alias
+
+ for task in Task.objects.all():
+ db_attributes = {db_attr.id:db_attr for db_attr in AttributeSpec.objects.filter(label__task__id=task.id)}
+ for segment in task.segment_set.prefetch_related('job_set').all():
+ db_job = segment.job_set.first()
+
+ db_shapes = list(db_job.labeledshape_set
+ .prefetch_related("label")
+ .prefetch_related("labeledshapeattributeval_set"))
+ _save_old_shapes_to_db(apps, db_shapes, db_attributes, db_alias, db_job)
+
+ db_tracks = list(db_job.labeledtrack_set
+ .select_related("label")
+ .prefetch_related("labeledtrackattributeval_set")
+ .prefetch_related("trackedshape_set__trackedshapeattributeval_set"))
+ _save_old_tracks_to_db(apps, db_tracks, db_attributes, db_alias, db_job)
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('engine', '0016_attribute_spec_20190217'),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='LabeledImageAttributeVal',
+ fields=[
+ ('id', models.BigAutoField(primary_key=True, serialize=False)),
+ ('value', cvat.apps.engine.models.SafeCharField(max_length=64)),
+ ('spec', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='engine.AttributeSpec')),
+ ],
+ options={
+ 'abstract': False,
+ 'default_permissions': (),
+ },
+ ),
+ migrations.CreateModel(
+ name='LabeledShapeAttributeVal',
+ fields=[
+ ('id', models.BigAutoField(primary_key=True, serialize=False)),
+ ('value', cvat.apps.engine.models.SafeCharField(max_length=64)),
+ ('spec', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='engine.AttributeSpec')),
+ ],
+ options={
+ 'abstract': False,
+ 'default_permissions': (),
+ },
+ ),
+ migrations.CreateModel(
+ name='LabeledTrackAttributeVal',
+ fields=[
+ ('id', models.BigAutoField(primary_key=True, serialize=False)),
+ ('value', cvat.apps.engine.models.SafeCharField(max_length=64)),
+ ('spec', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='engine.AttributeSpec')),
+ ],
+ options={
+ 'abstract': False,
+ 'default_permissions': (),
+ },
+ ),
+ migrations.CreateModel(
+ name='TrackedShape',
+ fields=[
+ ('type', models.CharField(choices=[('rectangle', 'RECTANGLE'), ('polygon', 'POLYGON'), ('polyline', 'POLYLINE'), ('points', 'POINTS')], max_length=16)),
+ ('occluded', models.BooleanField(default=False)),
+ ('z_order', models.IntegerField(default=0)),
+ ('points', cvat.apps.engine.models.FloatArrayField()),
+ ('id', models.BigAutoField(primary_key=True, serialize=False)),
+ ('frame', models.PositiveIntegerField()),
+ ('outside', models.BooleanField(default=False)),
+ ],
+ options={
+ 'default_permissions': (),
+ },
+ ),
+ migrations.CreateModel(
+ name='TrackedShapeAttributeVal',
+ fields=[
+ ('id', models.BigAutoField(primary_key=True, serialize=False)),
+ ('value', cvat.apps.engine.models.SafeCharField(max_length=64)),
+ ('shape', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='engine.TrackedShape')),
+ ('spec', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='engine.AttributeSpec')),
+ ],
+ options={
+ 'abstract': False,
+ 'default_permissions': (),
+ },
+ ),
+ migrations.CreateModel(
+ name='LabeledImage',
+ fields=[
+ ('id', models.BigAutoField(primary_key=True, serialize=False)),
+ ('frame', models.PositiveIntegerField()),
+ ('group', models.PositiveIntegerField(null=True)),
+ ],
+ options={
+ 'abstract': False,
+ 'default_permissions': (),
+ },
+ ),
+ migrations.CreateModel(
+ name='LabeledShape',
+ fields=[
+ ('id', models.BigAutoField(primary_key=True, serialize=False)),
+ ('frame', models.PositiveIntegerField()),
+ ('group', models.PositiveIntegerField(null=True)),
+ ('type', models.CharField(choices=[('rectangle', 'RECTANGLE'), ('polygon', 'POLYGON'), ('polyline', 'POLYLINE'), ('points', 'POINTS')], max_length=16)),
+ ('occluded', models.BooleanField(default=False)),
+ ('z_order', models.IntegerField(default=0)),
+ ('points', cvat.apps.engine.models.FloatArrayField()),
+ ],
+ options={
+ 'abstract': False,
+ 'default_permissions': (),
+ },
+ ),
+ migrations.CreateModel(
+ name='LabeledTrack',
+ fields=[
+ ('id', models.BigAutoField(primary_key=True, serialize=False)),
+ ('frame', models.PositiveIntegerField()),
+ ('group', models.PositiveIntegerField(null=True)),
+ ],
+ options={
+ 'abstract': False,
+ 'default_permissions': (),
+ },
+ ),
+ migrations.AddField(
+ model_name='labeledimage',
+ name='job',
+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='engine.Job'),
+ ),
+ migrations.AddField(
+ model_name='labeledtrack',
+ name='job',
+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='engine.Job'),
+ ),
+ migrations.AddField(
+ model_name='labeledshape',
+ name='job',
+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='engine.Job'),
+ ),
+ migrations.AddField(
+ model_name='labeledimage',
+ name='label',
+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='engine.Label'),
+ ),
+ migrations.AddField(
+ model_name='labeledshape',
+ name='label',
+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='engine.Label'),
+ ),
+ migrations.AddField(
+ model_name='labeledtrack',
+ name='label',
+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='engine.Label'),
+ ),
+ migrations.AddField(
+ model_name='trackedshape',
+ name='track',
+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='engine.LabeledTrack'),
+ ),
+ migrations.AddField(
+ model_name='labeledtrackattributeval',
+ name='track',
+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='engine.LabeledTrack'),
+ ),
+ migrations.AddField(
+ model_name='labeledshapeattributeval',
+ name='shape',
+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='engine.LabeledShape'),
+ ),
+ migrations.AddField(
+ model_name='labeledimageattributeval',
+ name='image',
+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='engine.LabeledImage'),
+ ),
+ migrations.RunPython(
+ code=copy_annotations_forward,
+ reverse_code=copy_annotations_backward,
+ ),
+ migrations.RemoveField(
+ model_name='labeledbox',
+ name='job',
+ ),
+ migrations.RemoveField(
+ model_name='labeledbox',
+ name='label',
+ ),
+ migrations.RemoveField(
+ model_name='labeledboxattributeval',
+ name='box',
+ ),
+ migrations.RemoveField(
+ model_name='labeledboxattributeval',
+ name='spec',
+ ),
+ migrations.RemoveField(
+ model_name='labeledpoints',
+ name='job',
+ ),
+ migrations.RemoveField(
+ model_name='labeledpoints',
+ name='label',
+ ),
+ migrations.RemoveField(
+ model_name='labeledpointsattributeval',
+ name='points',
+ ),
+ migrations.RemoveField(
+ model_name='labeledpointsattributeval',
+ name='spec',
+ ),
+ migrations.RemoveField(
+ model_name='labeledpolygon',
+ name='job',
+ ),
+ migrations.RemoveField(
+ model_name='job',
+ name='max_shape_id',
+ ),
+ migrations.RemoveField(
+ model_name='labeledpolygon',
+ name='label',
+ ),
+ migrations.RemoveField(
+ model_name='labeledpolygonattributeval',
+ name='polygon',
+ ),
+ migrations.RemoveField(
+ model_name='labeledpolygonattributeval',
+ name='spec',
+ ),
+ migrations.RemoveField(
+ model_name='labeledpolyline',
+ name='job',
+ ),
+ migrations.RemoveField(
+ model_name='labeledpolyline',
+ name='label',
+ ),
+ migrations.RemoveField(
+ model_name='labeledpolylineattributeval',
+ name='polyline',
+ ),
+ migrations.RemoveField(
+ model_name='labeledpolylineattributeval',
+ name='spec',
+ ),
+ migrations.RemoveField(
+ model_name='objectpath',
+ name='job',
+ ),
+ migrations.RemoveField(
+ model_name='objectpath',
+ name='label',
+ ),
+ migrations.RemoveField(
+ model_name='objectpathattributeval',
+ name='spec',
+ ),
+ migrations.RemoveField(
+ model_name='objectpathattributeval',
+ name='track',
+ ),
+ migrations.RemoveField(
+ model_name='trackedbox',
+ name='track',
+ ),
+ migrations.RemoveField(
+ model_name='trackedboxattributeval',
+ name='box',
+ ),
+ migrations.RemoveField(
+ model_name='trackedboxattributeval',
+ name='spec',
+ ),
+ migrations.RemoveField(
+ model_name='trackedpoints',
+ name='track',
+ ),
+ migrations.RemoveField(
+ model_name='trackedpointsattributeval',
+ name='points',
+ ),
+ migrations.RemoveField(
+ model_name='trackedpointsattributeval',
+ name='spec',
+ ),
+ migrations.RemoveField(
+ model_name='trackedpolygon',
+ name='track',
+ ),
+ migrations.RemoveField(
+ model_name='trackedpolygonattributeval',
+ name='polygon',
+ ),
+ migrations.RemoveField(
+ model_name='trackedpolygonattributeval',
+ name='spec',
+ ),
+ migrations.RemoveField(
+ model_name='trackedpolyline',
+ name='track',
+ ),
+ migrations.RemoveField(
+ model_name='trackedpolylineattributeval',
+ name='polyline',
+ ),
+ migrations.RemoveField(
+ model_name='trackedpolylineattributeval',
+ name='spec',
+ ),
+ migrations.DeleteModel(
+ name='LabeledBox',
+ ),
+ migrations.DeleteModel(
+ name='LabeledBoxAttributeVal',
+ ),
+ migrations.DeleteModel(
+ name='LabeledPoints',
+ ),
+ migrations.DeleteModel(
+ name='LabeledPointsAttributeVal',
+ ),
+ migrations.DeleteModel(
+ name='LabeledPolygon',
+ ),
+ migrations.DeleteModel(
+ name='LabeledPolygonAttributeVal',
+ ),
+ migrations.DeleteModel(
+ name='LabeledPolyline',
+ ),
+ migrations.DeleteModel(
+ name='LabeledPolylineAttributeVal',
+ ),
+ migrations.DeleteModel(
+ name='ObjectPath',
+ ),
+ migrations.DeleteModel(
+ name='ObjectPathAttributeVal',
+ ),
+ migrations.DeleteModel(
+ name='TrackedBox',
+ ),
+ migrations.DeleteModel(
+ name='TrackedBoxAttributeVal',
+ ),
+ migrations.DeleteModel(
+ name='TrackedPoints',
+ ),
+ migrations.DeleteModel(
+ name='TrackedPointsAttributeVal',
+ ),
+ migrations.DeleteModel(
+ name='TrackedPolygon',
+ ),
+ migrations.DeleteModel(
+ name='TrackedPolygonAttributeVal',
+ ),
+ migrations.DeleteModel(
+ name='TrackedPolyline',
+ ),
+ migrations.DeleteModel(
+ name='TrackedPolylineAttributeVal',
+ ),
+ ]
diff --git a/cvat/apps/engine/migrations/0018_jobcommit.py b/cvat/apps/engine/migrations/0018_jobcommit.py
new file mode 100644
index 00000000..c526cb89
--- /dev/null
+++ b/cvat/apps/engine/migrations/0018_jobcommit.py
@@ -0,0 +1,31 @@
+# Generated by Django 2.1.7 on 2019-04-17 09:25
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+ ('engine', '0017_db_redesign_20190221'),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='JobCommit',
+ fields=[
+ ('id', models.BigAutoField(primary_key=True, serialize=False)),
+ ('version', models.PositiveIntegerField(default=0)),
+ ('timestamp', models.DateTimeField(auto_now=True)),
+ ('message', models.CharField(default='', max_length=4096)),
+ ('author', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL)),
+ ('job', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='commits', to='engine.Job')),
+ ],
+ options={
+ 'abstract': False,
+ 'default_permissions': (),
+ },
+ ),
+ ]
diff --git a/cvat/apps/engine/models.py b/cvat/apps/engine/models.py
index 1d2729d4..736fd6b0 100644
--- a/cvat/apps/engine/models.py
+++ b/cvat/apps/engine/models.py
@@ -2,42 +2,39 @@
#
# SPDX-License-Identifier: MIT
+from enum import Enum
+
+import shlex
+import os
+
from django.db import models
from django.conf import settings
from django.contrib.auth.models import User
+from django.core.files.storage import FileSystemStorage
-from io import StringIO
-from enum import Enum
-
-import shlex
-import csv
-import re
-import os
+class SafeCharField(models.CharField):
+ def get_prep_value(self, value):
+ value = super().get_prep_value(value)
+ if value:
+ return value[:self.max_length]
+ return value
-class StatusChoice(Enum):
+class StatusChoice(str, Enum):
ANNOTATION = 'annotation'
VALIDATION = 'validation'
COMPLETED = 'completed'
@classmethod
def choices(self):
- return tuple((x.name, x.value) for x in self)
+ return tuple((x.value, x.name) for x in self)
def __str__(self):
return self.value
-class SafeCharField(models.CharField):
- def get_prep_value(self, value):
- value = super().get_prep_value(value)
- if value:
- return value[:self.max_length]
- return value
-
class Task(models.Model):
name = SafeCharField(max_length=256)
size = models.PositiveIntegerField()
- path = models.CharField(max_length=256)
mode = models.CharField(max_length=32)
owner = models.ForeignKey(User, null=True, blank=True,
on_delete=models.SET_NULL, related_name="owners")
@@ -46,45 +43,110 @@ class Task(models.Model):
bug_tracker = models.CharField(max_length=2000, blank=True, default="")
created_date = models.DateTimeField(auto_now_add=True)
updated_date = models.DateTimeField(auto_now_add=True)
- overlap = models.PositiveIntegerField(default=0)
+ overlap = models.PositiveIntegerField(null=True)
+ # Zero means that there are no limits (default)
+ segment_size = models.PositiveIntegerField(default=0)
z_order = models.BooleanField(default=False)
flipped = models.BooleanField(default=False)
- source = SafeCharField(max_length=256, default="unknown")
- status = models.CharField(max_length=32, default=StatusChoice.ANNOTATION)
+ image_quality = models.PositiveSmallIntegerField(default=50)
+ status = models.CharField(max_length=32, choices=StatusChoice.choices(),
+ default=StatusChoice.ANNOTATION)
# Extend default permission model
class Meta:
default_permissions = ()
+ def get_frame_path(self, frame):
+ d1 = str(int(frame) // 10000)
+ d2 = str(int(frame) // 100)
+ path = os.path.join(self.get_data_dirname(), d1, d2,
+ str(frame) + '.jpg')
+
+ return path
+
def get_upload_dirname(self):
- return os.path.join(self.path, ".upload")
+ return os.path.join(self.get_task_dirname(), ".upload")
def get_data_dirname(self):
- return os.path.join(self.path, "data")
-
- def get_dump_path(self):
- name = re.sub(r'[\\/*?:"<>|]', '_', self.name)
- return os.path.join(self.path, "{}.dump".format(name))
+ return os.path.join(self.get_task_dirname(), "data")
def get_log_path(self):
- return os.path.join(self.path, "task.log")
+ return os.path.join(self.get_task_dirname(), "task.log")
def get_client_log_path(self):
- return os.path.join(self.path, "client.log")
+ return os.path.join(self.get_task_dirname(), "client.log")
def get_image_meta_cache_path(self):
- return os.path.join(self.path, "image_meta.cache")
-
- def set_task_dirname(self, path):
- self.path = path
- self.save(update_fields=['path'])
+ return os.path.join(self.get_task_dirname(), "image_meta.cache")
def get_task_dirname(self):
- return self.path
+ return os.path.join(settings.DATA_ROOT, str(self.id))
def __str__(self):
return self.name
+# Redefined a couple of operation for FileSystemStorage to avoid renaming
+# or other side effects.
+class MyFileSystemStorage(FileSystemStorage):
+ def get_valid_name(self, name):
+ return name
+
+ def get_available_name(self, name, max_length=None):
+ if self.exists(name) or (max_length and len(name) > max_length):
+ raise IOError('`{}` file already exists or its name is too long'.format(name))
+ return name
+
+def upload_path_handler(instance, filename):
+ return os.path.join(instance.task.get_upload_dirname(), filename)
+
+# For client files which the user is uploaded
+class ClientFile(models.Model):
+ task = models.ForeignKey(Task, on_delete=models.CASCADE)
+ file = models.FileField(upload_to=upload_path_handler,
+ max_length=1024, storage=MyFileSystemStorage())
+
+ class Meta:
+ default_permissions = ()
+ unique_together = ("task", "file")
+
+# For server files on the mounted share
+class ServerFile(models.Model):
+ task = models.ForeignKey(Task, on_delete=models.CASCADE)
+ file = models.CharField(max_length=1024)
+
+ class Meta:
+ default_permissions = ()
+
+# For URLs
+class RemoteFile(models.Model):
+ task = models.ForeignKey(Task, on_delete=models.CASCADE)
+ file = models.CharField(max_length=1024)
+
+ class Meta:
+ default_permissions = ()
+
+class Video(models.Model):
+ task = models.OneToOneField(Task, on_delete=models.CASCADE)
+ path = models.CharField(max_length=1024)
+ start_frame = models.PositiveIntegerField()
+ stop_frame = models.PositiveIntegerField()
+ step = models.PositiveIntegerField(default=1)
+ width = models.PositiveIntegerField()
+ height = models.PositiveIntegerField()
+
+ class Meta:
+ default_permissions = ()
+
+class Image(models.Model):
+ task = models.ForeignKey(Task, on_delete=models.CASCADE)
+ path = models.CharField(max_length=1024)
+ frame = models.PositiveIntegerField()
+ width = models.PositiveIntegerField()
+ height = models.PositiveIntegerField()
+
+ class Meta:
+ default_permissions = ()
+
class Segment(models.Model):
task = models.ForeignKey(Task, on_delete=models.CASCADE)
start_frame = models.IntegerField()
@@ -96,8 +158,8 @@ class Segment(models.Model):
class Job(models.Model):
segment = models.ForeignKey(Segment, on_delete=models.CASCADE)
assignee = models.ForeignKey(User, null=True, blank=True, on_delete=models.SET_NULL)
- status = models.CharField(max_length=32, default=StatusChoice.ANNOTATION)
- max_shape_id = models.BigIntegerField(default=-1)
+ status = models.CharField(max_length=32, choices=StatusChoice.choices(),
+ default=StatusChoice.ANNOTATION)
class Meta:
default_permissions = ()
@@ -111,53 +173,37 @@ class Label(models.Model):
class Meta:
default_permissions = ()
+ unique_together = ('task', 'name')
+class AttributeType(str, Enum):
+ CHECKBOX = 'checkbox'
+ RADIO = 'radio'
+ NUMBER = 'number'
+ TEXT = 'text'
+ SELECT = 'select'
-def parse_attribute(text):
- match = re.match(r'^([~@])(\w+)=(\w+):(.+)?$', text)
- prefix = match.group(1)
- type = match.group(2)
- name = match.group(3)
- if match.group(4):
- values = list(csv.reader(StringIO(match.group(4)), quotechar="'"))[0]
- else:
- values = []
+ @classmethod
+ def choices(self):
+ return tuple((x.value, x.name) for x in self)
- return {'prefix':prefix, 'type':type, 'name':name, 'values':values}
+ def __str__(self):
+ return self.value
class AttributeSpec(models.Model):
label = models.ForeignKey(Label, on_delete=models.CASCADE)
- text = models.CharField(max_length=1024)
+ name = models.CharField(max_length=64)
+ mutable = models.BooleanField()
+ input_type = models.CharField(max_length=16,
+ choices=AttributeType.choices())
+ default_value = models.CharField(max_length=128)
+ values = models.CharField(max_length=4096)
class Meta:
default_permissions = ()
-
- def get_attribute(self):
- return parse_attribute(self.text)
-
- def is_mutable(self):
- attr = self.get_attribute()
- return attr['prefix'] == '~'
-
- def get_type(self):
- attr = self.get_attribute()
- return attr['type']
-
- def get_name(self):
- attr = self.get_attribute()
- return attr['name']
-
- def get_default_value(self):
- attr = self.get_attribute()
- return attr['values'][0]
-
- def get_values(self):
- attr = self.get_attribute()
- return attr['values']
+ unique_together = ('label', 'name')
def __str__(self):
- return self.get_attribute()['name']
-
+ return self.name
class AttributeVal(models.Model):
# TODO: add a validator here to be sure that it corresponds to self.label
@@ -169,103 +215,112 @@ class AttributeVal(models.Model):
abstract = True
default_permissions = ()
+class ShapeType(str, Enum):
+ RECTANGLE = 'rectangle' # (x0, y0, x1, y1)
+ POLYGON = 'polygon' # (x0, y0, ..., xn, yn)
+ POLYLINE = 'polyline' # (x0, y0, ..., xn, yn)
+ POINTS = 'points' # (x0, y0, ..., xn, yn)
+
+ @classmethod
+ def choices(self):
+ return tuple((x.value, x.name) for x in self)
+
+ def __str__(self):
+ return self.value
class Annotation(models.Model):
- job = models.ForeignKey(Job, on_delete=models.CASCADE)
+ id = models.BigAutoField(primary_key=True)
+ job = models.ForeignKey(Job, on_delete=models.CASCADE)
label = models.ForeignKey(Label, on_delete=models.CASCADE)
frame = models.PositiveIntegerField()
- group_id = models.PositiveIntegerField(default=0)
- client_id = models.BigIntegerField(default=-1)
-
- class Meta:
- abstract = True
-
-class Shape(models.Model):
- occluded = models.BooleanField(default=False)
- z_order = models.IntegerField(default=0)
+ group = models.PositiveIntegerField(null=True)
class Meta:
abstract = True
default_permissions = ()
-class BoundingBox(Shape):
+class Commit(models.Model):
id = models.BigAutoField(primary_key=True)
- xtl = models.FloatField()
- ytl = models.FloatField()
- xbr = models.FloatField()
- ybr = models.FloatField()
+ author = models.ForeignKey(User, null=True, blank=True, on_delete=models.SET_NULL)
+ version = models.PositiveIntegerField(default=0)
+ timestamp = models.DateTimeField(auto_now=True)
+ message = models.CharField(max_length=4096, default="")
class Meta:
abstract = True
default_permissions = ()
-class PolyShape(Shape):
- id = models.BigAutoField(primary_key=True)
- points = models.TextField()
+class JobCommit(Commit):
+ job = models.ForeignKey(Job, on_delete=models.CASCADE, related_name="commits")
+
+class FloatArrayField(models.TextField):
+ separator = ","
+
+ def from_db_value(self, value, expression, connection):
+ if value is None:
+ return value
+ return [float(v) for v in value.split(self.separator)]
+
+ def to_python(self, value):
+ if isinstance(value, list):
+ return value
+
+ return self.from_db_value(value, None, None)
+
+ def get_prep_value(self, value):
+ return self.separator.join(map(str, value))
+
+class Shape(models.Model):
+ type = models.CharField(max_length=16, choices=ShapeType.choices())
+ occluded = models.BooleanField(default=False)
+ z_order = models.IntegerField(default=0)
+ points = FloatArrayField()
class Meta:
abstract = True
default_permissions = ()
-class LabeledBox(Annotation, BoundingBox):
+class LabeledImage(Annotation):
pass
-class LabeledBoxAttributeVal(AttributeVal):
- box = models.ForeignKey(LabeledBox, on_delete=models.CASCADE)
+class LabeledImageAttributeVal(AttributeVal):
+ image = models.ForeignKey(LabeledImage, on_delete=models.CASCADE)
-class LabeledPolygon(Annotation, PolyShape):
+class LabeledShape(Annotation, Shape):
pass
-class LabeledPolygonAttributeVal(AttributeVal):
- polygon = models.ForeignKey(LabeledPolygon, on_delete=models.CASCADE)
+class LabeledShapeAttributeVal(AttributeVal):
+ shape = models.ForeignKey(LabeledShape, on_delete=models.CASCADE)
-class LabeledPolyline(Annotation, PolyShape):
+class LabeledTrack(Annotation):
pass
-class LabeledPolylineAttributeVal(AttributeVal):
- polyline = models.ForeignKey(LabeledPolyline, on_delete=models.CASCADE)
-
-class LabeledPoints(Annotation, PolyShape):
- pass
+class LabeledTrackAttributeVal(AttributeVal):
+ track = models.ForeignKey(LabeledTrack, on_delete=models.CASCADE)
-class LabeledPointsAttributeVal(AttributeVal):
- points = models.ForeignKey(LabeledPoints, on_delete=models.CASCADE)
-
-class ObjectPath(Annotation):
+class TrackedShape(Shape):
id = models.BigAutoField(primary_key=True)
- shapes = models.CharField(max_length=10, default='boxes')
-
-class ObjectPathAttributeVal(AttributeVal):
- track = models.ForeignKey(ObjectPath, on_delete=models.CASCADE)
-
-class TrackedObject(models.Model):
- track = models.ForeignKey(ObjectPath, on_delete=models.CASCADE)
+ track = models.ForeignKey(LabeledTrack, on_delete=models.CASCADE)
frame = models.PositiveIntegerField()
outside = models.BooleanField(default=False)
- class Meta:
- abstract = True
- default_permissions = ()
-class TrackedBox(TrackedObject, BoundingBox):
- pass
+class TrackedShapeAttributeVal(AttributeVal):
+ shape = models.ForeignKey(TrackedShape, on_delete=models.CASCADE)
-class TrackedBoxAttributeVal(AttributeVal):
- box = models.ForeignKey(TrackedBox, on_delete=models.CASCADE)
-class TrackedPolygon(TrackedObject, PolyShape):
- pass
-
-class TrackedPolygonAttributeVal(AttributeVal):
- polygon = models.ForeignKey(TrackedPolygon, on_delete=models.CASCADE)
+class Plugin(models.Model):
+ name = models.SlugField(max_length=32, primary_key=True)
+ description = SafeCharField(max_length=8192)
+ maintainer = models.ForeignKey(User, null=True, blank=True,
+ on_delete=models.SET_NULL, related_name="maintainers")
+ created_at = models.DateTimeField(auto_now_add=True)
+ updated_at = models.DateTimeField(auto_now_add=True)
-class TrackedPolyline(TrackedObject, PolyShape):
- pass
-
-class TrackedPolylineAttributeVal(AttributeVal):
- polyline = models.ForeignKey(TrackedPolyline, on_delete=models.CASCADE)
-
-class TrackedPoints(TrackedObject, PolyShape):
- pass
+ # Extend default permission model
+ class Meta:
+ default_permissions = ()
-class TrackedPointsAttributeVal(AttributeVal):
- points = models.ForeignKey(TrackedPoints, on_delete=models.CASCADE)
+class PluginOption(models.Model):
+ plugin = models.ForeignKey(Plugin, on_delete=models.CASCADE)
+ name = SafeCharField(max_length=32)
+ value = SafeCharField(max_length=1024)
diff --git a/cvat/apps/engine/plugins.py b/cvat/apps/engine/plugins.py
new file mode 100644
index 00000000..6bf0143f
--- /dev/null
+++ b/cvat/apps/engine/plugins.py
@@ -0,0 +1,70 @@
+# Copyright (C) 2018 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+
+from functools import update_wrapper
+
+__plugins = {}
+
+
+def add_plugin(name, function, order, exc_ok = False):
+ if order not in ["before", "after"]:
+ raise Exception("Order may be 'before' or 'after' only. Got {}.".format(order))
+
+ if not callable(function):
+ raise Exception("'function' argument should be a callable element")
+
+ if not isinstance(name, str):
+ raise Exception("'name' argument should be a string. Got {}.".format(type(name)))
+
+ if name not in __plugins:
+ __plugins[name] = {
+ "before": [],
+ "after": []
+ }
+
+ if function in __plugins[name][order]:
+ raise Exception("plugin has been attached already")
+
+ __plugins[name][order].append(function)
+
+ function.exc_ok = exc_ok
+
+
+def remove_plugin(name, function):
+ if name in __plugins:
+ if function in __plugins[name]["before"]:
+ __plugins[name]["before"].remove(function)
+ del function.exc_ok
+ if function in __plugins[name]["after"]:
+ __plugins[name]["after"].remove(function)
+ del function.exc_ok
+
+
+def plugin_decorator(function_to_decorate):
+ name = function_to_decorate.__name__
+
+ def function_wrapper(*args, **kwargs):
+ if name in __plugins:
+ for wrapper in __plugins[name]["before"]:
+ try:
+ wrapper(*args, **kwargs)
+ except Exception as ex:
+ if not wrapper.exc_ok:
+ raise ex
+
+ result = function_to_decorate(*args, **kwargs)
+
+ if name in __plugins:
+ for wrapper in __plugins[name]["after"]:
+ try:
+ wrapper(*args, **kwargs)
+ except Exception as ex:
+ if not wrapper.exc_ok:
+ raise ex
+
+ return result
+
+ # Copy meta info about wrapped function to wrapper function
+ update_wrapper(function_wrapper, function_to_decorate)
+ return function_wrapper
diff --git a/cvat/apps/engine/serializers.py b/cvat/apps/engine/serializers.py
new file mode 100644
index 00000000..7acc365b
--- /dev/null
+++ b/cvat/apps/engine/serializers.py
@@ -0,0 +1,366 @@
+# Copyright (C) 2019 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+
+import os
+import shutil
+
+from rest_framework import serializers
+from django.contrib.auth.models import User, Group
+
+from cvat.apps.engine import models
+from cvat.apps.engine.log import slogger
+
+
+class AttributeSerializer(serializers.ModelSerializer):
+ class Meta:
+ model = models.AttributeSpec
+ fields = ('id', 'name', 'mutable', 'input_type', 'default_value',
+ 'values')
+
+ # pylint: disable=no-self-use
+ def to_internal_value(self, data):
+ attribute = data.copy()
+ attribute['values'] = '\n'.join(data.get('values', []))
+ return attribute
+
+ def to_representation(self, instance):
+ attribute = super().to_representation(instance)
+ attribute['values'] = attribute['values'].split('\n')
+ return attribute
+
+class LabelSerializer(serializers.ModelSerializer):
+ attributes = AttributeSerializer(many=True, source='attributespec_set',
+ default=[])
+ class Meta:
+ model = models.Label
+ fields = ('id', 'name', 'attributes')
+
+class JobCommitSerializer(serializers.ModelSerializer):
+ class Meta:
+ model = models.JobCommit
+ fields = ('id', 'version', 'author', 'message', 'timestamp')
+
+class JobSerializer(serializers.ModelSerializer):
+ task_id = serializers.ReadOnlyField(source="segment.task.id")
+ start_frame = serializers.ReadOnlyField(source="segment.start_frame")
+ stop_frame = serializers.ReadOnlyField(source="segment.stop_frame")
+
+ class Meta:
+ model = models.Job
+ fields = ('url', 'id', 'assignee', 'status', 'start_frame',
+ 'stop_frame', 'task_id')
+
+class SimpleJobSerializer(serializers.ModelSerializer):
+ class Meta:
+ model = models.Job
+ fields = ('url', 'id', 'assignee', 'status')
+
+class SegmentSerializer(serializers.ModelSerializer):
+ jobs = SimpleJobSerializer(many=True, source='job_set')
+
+ class Meta:
+ model = models.Segment
+ fields = ('start_frame', 'stop_frame', 'jobs')
+
+class ClientFileSerializer(serializers.ModelSerializer):
+ class Meta:
+ model = models.ClientFile
+ fields = ('file', )
+
+ # pylint: disable=no-self-use
+ def to_internal_value(self, data):
+ return {'file': data}
+
+ # pylint: disable=no-self-use
+ def to_representation(self, instance):
+ upload_dir = instance.task.get_upload_dirname()
+ return instance.file.path[len(upload_dir) + 1:]
+
+class ServerFileSerializer(serializers.ModelSerializer):
+ class Meta:
+ model = models.ServerFile
+ fields = ('file', )
+
+ # pylint: disable=no-self-use
+ def to_internal_value(self, data):
+ return {'file': data}
+
+ # pylint: disable=no-self-use
+ def to_representation(self, instance):
+ return instance.file
+
+class RemoteFileSerializer(serializers.ModelSerializer):
+ class Meta:
+ model = models.RemoteFile
+ fields = ('file', )
+
+class RqStatusSerializer(serializers.Serializer):
+ state = serializers.ChoiceField(choices=[
+ "Queued", "Started", "Finished", "Failed"])
+ message = serializers.CharField(allow_blank=True, default="")
+
+class TaskDataSerializer(serializers.ModelSerializer):
+ client_files = ClientFileSerializer(many=True, source='clientfile_set',
+ default=[])
+ server_files = ServerFileSerializer(many=True, source='serverfile_set',
+ default=[])
+ remote_files = RemoteFileSerializer(many=True, source='remotefile_set',
+ default=[])
+
+ class Meta:
+ model = models.Task
+ fields = ('client_files', 'server_files', 'remote_files')
+
+ # pylint: disable=no-self-use
+ def update(self, instance, validated_data):
+ client_files = validated_data.pop('clientfile_set')
+ server_files = validated_data.pop('serverfile_set')
+ remote_files = validated_data.pop('remotefile_set')
+
+ for file in client_files:
+ client_file = models.ClientFile(task=instance, **file)
+ client_file.save()
+
+ for file in server_files:
+ server_file = models.ServerFile(task=instance, **file)
+ server_file.save()
+
+ for file in remote_files:
+ remote_file = models.RemoteFile(task=instance, **file)
+ remote_file.save()
+
+ return instance
+
+class WriteOnceMixin:
+ """Adds support for write once fields to serializers.
+
+ To use it, specify a list of fields as `write_once_fields` on the
+ serializer's Meta:
+ ```
+ class Meta:
+ model = SomeModel
+ fields = '__all__'
+ write_once_fields = ('collection', )
+ ```
+
+ Now the fields in `write_once_fields` can be set during POST (create),
+ but cannot be changed afterwards via PUT or PATCH (update).
+ Inspired by http://stackoverflow.com/a/37487134/627411.
+ """
+
+ def get_extra_kwargs(self):
+ extra_kwargs = super().get_extra_kwargs()
+
+ # We're only interested in PATCH/PUT.
+ if 'update' in getattr(self.context.get('view'), 'action', ''):
+ return self._set_write_once_fields(extra_kwargs)
+
+ return extra_kwargs
+
+ def _set_write_once_fields(self, extra_kwargs):
+ """Set all fields in `Meta.write_once_fields` to read_only."""
+ write_once_fields = getattr(self.Meta, 'write_once_fields', None)
+ if not write_once_fields:
+ return extra_kwargs
+
+ if not isinstance(write_once_fields, (list, tuple)):
+ raise TypeError(
+ 'The `write_once_fields` option must be a list or tuple. '
+ 'Got {}.'.format(type(write_once_fields).__name__)
+ )
+
+ for field_name in write_once_fields:
+ kwargs = extra_kwargs.get(field_name, {})
+ kwargs['read_only'] = True
+ extra_kwargs[field_name] = kwargs
+
+ return extra_kwargs
+
+class TaskSerializer(WriteOnceMixin, serializers.ModelSerializer):
+ labels = LabelSerializer(many=True, source='label_set', partial=True)
+ segments = SegmentSerializer(many=True, source='segment_set', read_only=True)
+ image_quality = serializers.IntegerField(min_value=0, max_value=100)
+
+ class Meta:
+ model = models.Task
+ fields = ('url', 'id', 'name', 'size', 'mode', 'owner', 'assignee',
+ 'bug_tracker', 'created_date', 'updated_date', 'overlap',
+ 'segment_size', 'z_order', 'flipped', 'status', 'labels', 'segments',
+ 'image_quality')
+ read_only_fields = ('size', 'mode', 'created_date', 'updated_date',
+ 'status')
+ write_once_fields = ('overlap', 'segment_size', 'image_quality')
+ ordering = ['-id']
+
+ # pylint: disable=no-self-use
+ def create(self, validated_data):
+ labels = validated_data.pop('label_set')
+ db_task = models.Task.objects.create(size=0, **validated_data)
+ for label in labels:
+ attributes = label.pop('attributespec_set')
+ db_label = models.Label.objects.create(task=db_task, **label)
+ for attr in attributes:
+ models.AttributeSpec.objects.create(label=db_label, **attr)
+
+ task_path = db_task.get_task_dirname()
+ if os.path.isdir(task_path):
+ shutil.rmtree(task_path)
+
+ upload_dir = db_task.get_upload_dirname()
+ os.makedirs(upload_dir)
+ output_dir = db_task.get_data_dirname()
+ os.makedirs(output_dir)
+
+ return db_task
+
+ # pylint: disable=no-self-use
+ def update(self, instance, validated_data):
+ instance.name = validated_data.get('name', instance.name)
+ instance.owner = validated_data.get('owner', instance.owner)
+ instance.assignee = validated_data.get('assignee', instance.assignee)
+ instance.bug_tracker = validated_data.get('bug_tracker',
+ instance.bug_tracker)
+ instance.z_order = validated_data.get('z_order', instance.z_order)
+ instance.flipped = validated_data.get('flipped', instance.flipped)
+ instance.image_quality = validated_data.get('image_quality',
+ instance.image_quality)
+ labels = validated_data.get('label_set', [])
+ for label in labels:
+ attributes = label.pop('attributespec_set', [])
+ (db_label, created) = models.Label.objects.get_or_create(task=instance,
+ name=label['name'])
+ if created:
+ slogger.task[instance.id].info("New {} label was created"
+ .format(db_label.name))
+ else:
+ slogger.task[instance.id].info("{} label was updated"
+ .format(db_label.name))
+ for attr in attributes:
+ (db_attr, created) = models.AttributeSpec.objects.get_or_create(
+ label=db_label, name=attr['name'], defaults=attr)
+ if created:
+ slogger.task[instance.id].info("New {} attribute for {} label was created"
+ .format(db_attr.name, db_label.name))
+ else:
+ slogger.task[instance.id].info("{} attribute for {} label was updated"
+ .format(db_attr.name, db_label.name))
+
+ # FIXME: need to update only "safe" fields
+ db_attr.default_value = attr.get('default_value', db_attr.default_value)
+ db_attr.mutable = attr.get('mutable', db_attr.mutable)
+ db_attr.input_type = attr.get('input_type', db_attr.input_type)
+ db_attr.values = attr.get('values', db_attr.values)
+ db_attr.save()
+
+ return instance
+
+class UserSerializer(serializers.ModelSerializer):
+ groups = serializers.SlugRelatedField(many=True,
+ slug_field='name', queryset=Group.objects.all())
+
+ class Meta:
+ model = User
+ fields = ('url', 'id', 'username', 'first_name', 'last_name', 'email',
+ 'groups', 'is_staff', 'is_superuser', 'is_active', 'last_login',
+ 'date_joined', 'groups')
+ read_only_fields = ('last_login', 'date_joined')
+ write_only_fields = ('password', )
+ ordering = ['-id']
+
+class ExceptionSerializer(serializers.Serializer):
+ system = serializers.CharField(max_length=255)
+ client = serializers.CharField(max_length=255)
+ time = serializers.DateTimeField()
+
+ job_id = serializers.IntegerField(required=False)
+ task_id = serializers.IntegerField(required=False)
+ proj_id = serializers.IntegerField(required=False)
+ client_id = serializers.IntegerField()
+
+ message = serializers.CharField(max_length=4096)
+ filename = serializers.URLField()
+ line = serializers.IntegerField()
+ column = serializers.IntegerField()
+ stack = serializers.CharField(max_length=8192,
+ style={'base_template': 'textarea.html'}, allow_blank=True)
+
+class AboutSerializer(serializers.Serializer):
+ name = serializers.CharField(max_length=128)
+ description = serializers.CharField(max_length=2048)
+ version = serializers.CharField(max_length=64)
+
+class ImageMetaSerializer(serializers.Serializer):
+ width = serializers.IntegerField()
+ height = serializers.IntegerField()
+
+class AttributeValSerializer(serializers.Serializer):
+ spec_id = serializers.IntegerField()
+ value = serializers.CharField(max_length=64, allow_blank=True)
+
+ def to_internal_value(self, data):
+ data['value'] = str(data['value'])
+ return super().to_internal_value(data)
+
+class AnnotationSerializer(serializers.Serializer):
+ id = serializers.IntegerField(default=None, allow_null=True)
+ frame = serializers.IntegerField(min_value=0)
+ label_id = serializers.IntegerField(min_value=0)
+ group = serializers.IntegerField(min_value=0, allow_null=True)
+
+class LabeledImageSerializer(AnnotationSerializer):
+ attributes = AttributeValSerializer(many=True,
+ source="labeledimageattributeval_set")
+
+class ShapeSerializer(serializers.Serializer):
+ type = serializers.ChoiceField(choices=models.ShapeType.choices())
+ occluded = serializers.BooleanField()
+ z_order = serializers.IntegerField(default=0)
+ points = serializers.ListField(
+ child=serializers.FloatField(min_value=0)
+ )
+
+class LabeledShapeSerializer(ShapeSerializer, AnnotationSerializer):
+ attributes = AttributeValSerializer(many=True,
+ source="labeledshapeattributeval_set")
+
+class TrackedShapeSerializer(ShapeSerializer):
+ id = serializers.IntegerField(default=None, allow_null=True)
+ frame = serializers.IntegerField(min_value=0)
+ outside = serializers.BooleanField()
+ attributes = AttributeValSerializer(many=True,
+ source="trackedshapeattributeval_set")
+
+class LabeledTrackSerializer(AnnotationSerializer):
+ shapes = TrackedShapeSerializer(many=True, allow_empty=False,
+ source="trackedshape_set")
+ attributes = AttributeValSerializer(many=True,
+ source="labeledtrackattributeval_set")
+
+class LabeledDataSerializer(serializers.Serializer):
+ version = serializers.IntegerField()
+ tags = LabeledImageSerializer(many=True)
+ shapes = LabeledShapeSerializer(many=True)
+ tracks = LabeledTrackSerializer(many=True)
+
+class FileInfoSerializer(serializers.Serializer):
+ name = serializers.CharField(max_length=1024)
+ type = serializers.ChoiceField(choices=["REG", "DIR"])
+
+class PluginSerializer(serializers.ModelSerializer):
+ class Meta:
+ model = models.Plugin
+ fields = ('name', 'description', 'maintainer', 'created_at',
+ 'updated_at')
+
+class LogEventSerializer(serializers.Serializer):
+ job_id = serializers.IntegerField(required=False)
+ task_id = serializers.IntegerField(required=False)
+ proj_id = serializers.IntegerField(required=False)
+ client_id = serializers.IntegerField()
+
+ name = serializers.CharField(max_length=64)
+ time = serializers.DateTimeField()
+ message = serializers.CharField(max_length=4096, required=False)
+ payload = serializers.DictField(required=False)
+ is_active = serializers.BooleanField()
diff --git a/cvat/apps/engine/signals.py b/cvat/apps/engine/signals.py
new file mode 100644
index 00000000..f39a96d8
--- /dev/null
+++ b/cvat/apps/engine/signals.py
@@ -0,0 +1,19 @@
+# Copyright (C) 2019 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+
+from .models import Job, StatusChoice
+
+def update_task_status(instance, **kwargs):
+ db_task = instance.segment.task
+ db_jobs = list(Job.objects.filter(segment__task_id=db_task.id))
+ status = StatusChoice.COMPLETED
+ if list(filter(lambda x: x.status == StatusChoice.ANNOTATION, db_jobs)):
+ status = StatusChoice.ANNOTATION
+ elif list(filter(lambda x: x.status == StatusChoice.VALIDATION, db_jobs)):
+ status = StatusChoice.VALIDATION
+
+ if status != db_task.status:
+ db_task.status = status
+ db_task.save()
+
diff --git a/cvat/apps/engine/static/engine/base.css b/cvat/apps/engine/static/engine/base.css
index 30b2b128..3d33c454 100644
--- a/cvat/apps/engine/static/engine/base.css
+++ b/cvat/apps/engine/static/engine/base.css
@@ -75,7 +75,6 @@ html {
overflow: auto;
background-color: rgb(0,0,0);
background-color: rgba(0,0,0,0.4);
- overflow: hidden;
}
.modal-content {
@@ -86,6 +85,36 @@ html {
width: 80%;
}
+.close {
+ position: absolute;
+ right: 5px;
+ top: 5px;
+ width: 32px;
+ height: 32px;
+ opacity: 0.3;
+ }
+
+ .close:hover {
+ opacity: 1;
+ }
+
+ .close:before, .close:after {
+ position: absolute;
+ left: 15px;
+ content: ' ';
+ height: 22px;
+ width: 2px;
+ background-color: #333;
+ }
+
+ .close:before {
+ transform: rotate(45deg);
+ }
+
+ .close:after {
+ transform: rotate(-45deg);
+ }
+
.tab {
overflow: hidden;
border: 1px solid black;
diff --git a/cvat/apps/engine/static/engine/js/3rdparty.patch b/cvat/apps/engine/static/engine/js/3rdparty.patch
index c12855f4..0aa47dfb 100644
--- a/cvat/apps/engine/static/engine/js/3rdparty.patch
+++ b/cvat/apps/engine/static/engine/js/3rdparty.patch
@@ -1,14 +1,14 @@
-From d44089dfc96b56d427d5631442d6587f876f43b6 Mon Sep 17 00:00:00 2001
-From: Boris Sekachev
-Date: Mon, 19 Nov 2018 12:09:48 +0300
-Subject: [PATCH] tmp
+From a2f542cc7ac4149fe14f42e194e44ef982d7fc28 Mon Sep 17 00:00:00 2001
+From: Boris Sekachev
+Date: Wed, 27 Mar 2019 15:08:18 +0300
+Subject: [PATCH] upd
---
- .../engine/static/engine/js/3rdparty/svg.draggable.js | 1 +
- cvat/apps/engine/static/engine/js/3rdparty/svg.draw.js | 17 +++++++++++++++--
- .../apps/engine/static/engine/js/3rdparty/svg.resize.js | 6 ++++--
- .../apps/engine/static/engine/js/3rdparty/svg.select.js | 5 ++++-
- 4 files changed, 24 insertions(+), 5 deletions(-)
+ .../static/engine/js/3rdparty/svg.draggable.js | 1 +
+ .../static/engine/js/3rdparty/svg.draw.js | 17 +++++++++++++++--
+ .../static/engine/js/3rdparty/svg.resize.min.js | 2 +-
+ .../static/engine/js/3rdparty/svg.select.js | 5 ++++-
+ 4 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/cvat/apps/engine/static/engine/js/3rdparty/svg.draggable.js b/cvat/apps/engine/static/engine/js/3rdparty/svg.draggable.js
index d88abf5..aba474c 100644
@@ -77,37 +77,14 @@ index 68dbf2a..20a6917 100644
}
}
-diff --git a/cvat/apps/engine/static/engine/js/3rdparty/svg.resize.js b/cvat/apps/engine/static/engine/js/3rdparty/svg.resize.js
-index 0c3b63d..dceede5 100644
---- a/cvat/apps/engine/static/engine/js/3rdparty/svg.resize.js
-+++ b/cvat/apps/engine/static/engine/js/3rdparty/svg.resize.js
-@@ -34,8 +34,8 @@
- // Extract a position from a mouse/touch event.
- // Returns { x: .., y: .. }
- return {
-- x: event.clientX || event.touches[0].pageX,
-- y: event.clientY || event.touches[0].pageY
-+ x: event.clientX != null ? event.clientX : event.touches[0].clientX,
-+ y: event.clientY != null ? event.clientY : event.touches[0].clientY
- };
- };
-
-@@ -98,6 +98,7 @@
- };
-
- ResizeHandler.prototype.resize = function (event) {
-+ if (event.detail.event.button) return; // only left mouse button
-
- var _this = this;
-
-@@ -343,6 +344,7 @@
- }
- return;
- }
-+ this.m = this.el.node.getScreenCTM().inverse();
-
- // Calculate the difference between the mouseposition at start and now
- var txPt = this._extractPosition(event);
+diff --git a/cvat/apps/engine/static/engine/js/3rdparty/svg.resize.min.js b/cvat/apps/engine/static/engine/js/3rdparty/svg.resize.min.js
+index 2dca34b..50ef3d3 100644
+--- a/cvat/apps/engine/static/engine/js/3rdparty/svg.resize.min.js
++++ b/cvat/apps/engine/static/engine/js/3rdparty/svg.resize.min.js
+@@ -1 +1 @@
+-/*! svg.resize.js v1.4.3 MIT*/;!function(){"use strict";(function(){function t(t){t.remember("_resizeHandler",this),this.el=t,this.parameters={},this.lastUpdateCall=null,this.p=t.doc().node.createSVGPoint()}t.prototype.transformPoint=function(t,e,i){return this.p.x=t-(this.offset.x-window.pageXOffset),this.p.y=e-(this.offset.y-window.pageYOffset),this.p.matrixTransform(i||this.m)},t.prototype._extractPosition=function(t){return{x:null!=t.clientX?t.clientX:t.touches[0].clientX,y:null!=t.clientY?t.clientY:t.touches[0].clientY}},t.prototype.init=function(t){var e=this;if(this.stop(),"stop"!==t){this.options={};for(var i in this.el.resize.defaults)this.options[i]=this.el.resize.defaults[i],void 0!==t[i]&&(this.options[i]=t[i]);this.el.on("lt.resize",function(t){e.resize(t||window.event)}),this.el.on("rt.resize",function(t){e.resize(t||window.event)}),this.el.on("rb.resize",function(t){e.resize(t||window.event)}),this.el.on("lb.resize",function(t){e.resize(t||window.event)}),this.el.on("t.resize",function(t){e.resize(t||window.event)}),this.el.on("r.resize",function(t){e.resize(t||window.event)}),this.el.on("b.resize",function(t){e.resize(t||window.event)}),this.el.on("l.resize",function(t){e.resize(t||window.event)}),this.el.on("rot.resize",function(t){e.resize(t||window.event)}),this.el.on("point.resize",function(t){e.resize(t||window.event)}),this.update()}},t.prototype.stop=function(){return this.el.off("lt.resize"),this.el.off("rt.resize"),this.el.off("rb.resize"),this.el.off("lb.resize"),this.el.off("t.resize"),this.el.off("r.resize"),this.el.off("b.resize"),this.el.off("l.resize"),this.el.off("rot.resize"),this.el.off("point.resize"),this},t.prototype.resize=function(t){var e=this;this.m=this.el.node.getScreenCTM().inverse(),this.offset={x:window.pageXOffset,y:window.pageYOffset};var i=this._extractPosition(t.detail.event);if(this.parameters={type:this.el.type,p:this.transformPoint(i.x,i.y),x:t.detail.x,y:t.detail.y,box:this.el.bbox(),rotation:this.el.transform().rotation},"text"===this.el.type&&(this.parameters.fontSize=this.el.attr()["font-size"]),void 0!==t.detail.i){var s=this.el.array().valueOf();this.parameters.i=t.detail.i,this.parameters.pointCoords=[s[t.detail.i][0],s[t.detail.i][1]]}switch(t.type){case"lt":this.calc=function(t,e){var i=this.snapToGrid(t,e);if(this.parameters.box.width-i[0]>0&&this.parameters.box.height-i[1]>0){if("text"===this.parameters.type)return this.el.move(this.parameters.box.x+i[0],this.parameters.box.y),void this.el.attr("font-size",this.parameters.fontSize-i[0]);i=this.checkAspectRatio(i),this.el.move(this.parameters.box.x+i[0],this.parameters.box.y+i[1]).size(this.parameters.box.width-i[0],this.parameters.box.height-i[1])}};break;case"rt":this.calc=function(t,e){var i=this.snapToGrid(t,e,2);if(this.parameters.box.width+i[0]>0&&this.parameters.box.height-i[1]>0){if("text"===this.parameters.type)return this.el.move(this.parameters.box.x-i[0],this.parameters.box.y),void this.el.attr("font-size",this.parameters.fontSize+i[0]);i=this.checkAspectRatio(i,!0),this.el.move(this.parameters.box.x,this.parameters.box.y+i[1]).size(this.parameters.box.width+i[0],this.parameters.box.height-i[1])}};break;case"rb":this.calc=function(t,e){var i=this.snapToGrid(t,e,0);if(this.parameters.box.width+i[0]>0&&this.parameters.box.height+i[1]>0){if("text"===this.parameters.type)return this.el.move(this.parameters.box.x-i[0],this.parameters.box.y),void this.el.attr("font-size",this.parameters.fontSize+i[0]);i=this.checkAspectRatio(i),this.el.move(this.parameters.box.x,this.parameters.box.y).size(this.parameters.box.width+i[0],this.parameters.box.height+i[1])}};break;case"lb":this.calc=function(t,e){var i=this.snapToGrid(t,e,1);if(this.parameters.box.width-i[0]>0&&this.parameters.box.height+i[1]>0){if("text"===this.parameters.type)return this.el.move(this.parameters.box.x+i[0],this.parameters.box.y),void this.el.attr("font-size",this.parameters.fontSize-i[0]);i=this.checkAspectRatio(i,!0),this.el.move(this.parameters.box.x+i[0],this.parameters.box.y).size(this.parameters.box.width-i[0],this.parameters.box.height+i[1])}};break;case"t":this.calc=function(t,e){var i=this.snapToGrid(t,e,2);if(this.parameters.box.height-i[1]>0){if("text"===this.parameters.type)return;this.el.move(this.parameters.box.x,this.parameters.box.y+i[1]).height(this.parameters.box.height-i[1])}};break;case"r":this.calc=function(t,e){var i=this.snapToGrid(t,e,0);if(this.parameters.box.width+i[0]>0){if("text"===this.parameters.type)return;this.el.move(this.parameters.box.x,this.parameters.box.y).width(this.parameters.box.width+i[0])}};break;case"b":this.calc=function(t,e){var i=this.snapToGrid(t,e,0);if(this.parameters.box.height+i[1]>0){if("text"===this.parameters.type)return;this.el.move(this.parameters.box.x,this.parameters.box.y).height(this.parameters.box.height+i[1])}};break;case"l":this.calc=function(t,e){var i=this.snapToGrid(t,e,1);if(this.parameters.box.width-i[0]>0){if("text"===this.parameters.type)return;this.el.move(this.parameters.box.x+i[0],this.parameters.box.y).width(this.parameters.box.width-i[0])}};break;case"rot":this.calc=function(t,e){var i={x:t+this.parameters.p.x,y:e+this.parameters.p.y},s=Math.atan2(this.parameters.p.y-this.parameters.box.y-this.parameters.box.height/2,this.parameters.p.x-this.parameters.box.x-this.parameters.box.width/2),r=Math.atan2(i.y-this.parameters.box.y-this.parameters.box.height/2,i.x-this.parameters.box.x-this.parameters.box.width/2),a=this.parameters.rotation+180*(r-s)/Math.PI+this.options.snapToAngle/2;this.el.center(this.parameters.box.cx,this.parameters.box.cy).rotate(a-a%this.options.snapToAngle,this.parameters.box.cx,this.parameters.box.cy)};break;case"point":this.calc=function(t,e){var i=this.snapToGrid(t,e,this.parameters.pointCoords[0],this.parameters.pointCoords[1]),s=this.el.array().valueOf();s[this.parameters.i][0]=this.parameters.pointCoords[0]+i[0],s[this.parameters.i][1]=this.parameters.pointCoords[1]+i[1],this.el.plot(s)}}this.el.fire("resizestart",{dx:this.parameters.x,dy:this.parameters.y,event:t}),SVG.on(window,"touchmove.resize",function(t){e.update(t||window.event)}),SVG.on(window,"touchend.resize",function(){e.done()}),SVG.on(window,"mousemove.resize",function(t){e.update(t||window.event)}),SVG.on(window,"mouseup.resize",function(){e.done()})},t.prototype.update=function(t){if(!t)return void(this.lastUpdateCall&&this.calc(this.lastUpdateCall[0],this.lastUpdateCall[1]));var e=this._extractPosition(t),i=this.transformPoint(e.x,e.y),s=i.x-this.parameters.p.x,r=i.y-this.parameters.p.y;this.lastUpdateCall=[s,r],this.calc(s,r),this.el.fire("resizing",{dx:s,dy:r,event:t})},t.prototype.done=function(){this.lastUpdateCall=null,SVG.off(window,"mousemove.resize"),SVG.off(window,"mouseup.resize"),SVG.off(window,"touchmove.resize"),SVG.off(window,"touchend.resize"),this.el.fire("resizedone")},t.prototype.snapToGrid=function(t,e,i,s){var r;return void 0!==s?r=[(i+t)%this.options.snapToGrid,(s+e)%this.options.snapToGrid]:(i=null==i?3:i,r=[(this.parameters.box.x+t+(1&i?0:this.parameters.box.width))%this.options.snapToGrid,(this.parameters.box.y+e+(2&i?0:this.parameters.box.height))%this.options.snapToGrid]),t<0&&(r[0]-=this.options.snapToGrid),e<0&&(r[1]-=this.options.snapToGrid),t-=Math.abs(r[0])o.maxX&&(t=o.maxX-r),void 0!==o.minY&&a+eo.maxY&&(e=o.maxY-a),[t,e]},t.prototype.checkAspectRatio=function(t,e){if(!this.options.saveAspectRatio)return t;var i=t.slice(),s=this.parameters.box.width/this.parameters.box.height,r=this.parameters.box.width+t[0],a=this.parameters.box.height-t[1],o=r/a;return os&&(i[0]=this.parameters.box.width-a*s,e&&(i[0]=-i[0])),i},SVG.extend(SVG.Element,{resize:function(e){return(this.remember("_resizeHandler")||new t(this)).init(e||{}),this}}),SVG.Element.prototype.resize.defaults={snapToAngle:.1,snapToGrid:1,constraint:{},saveAspectRatio:!1}}).call(this)}();
++/*! svg.resize.js v1.4.3 MIT*/;!function(){"use strict";(function(){function t(t){t.remember("_resizeHandler",this),this.el=t,this.parameters={},this.lastUpdateCall=null,this.p=t.doc().node.createSVGPoint()}t.prototype.transformPoint=function(t,e,i){return this.p.x=t-(this.offset.x-window.pageXOffset),this.p.y=e-(this.offset.y-window.pageYOffset),this.p.matrixTransform(i||this.m)},t.prototype._extractPosition=function(t){return{x:null!=t.clientX?t.clientX:t.touches[0].clientX,y:null!=t.clientY?t.clientY:t.touches[0].clientY}},t.prototype.init=function(t){var e=this;if(this.stop(),"stop"!==t){this.options={};for(var i in this.el.resize.defaults)this.options[i]=this.el.resize.defaults[i],void 0!==t[i]&&(this.options[i]=t[i]);this.el.on("lt.resize",function(t){e.resize(t||window.event)}),this.el.on("rt.resize",function(t){e.resize(t||window.event)}),this.el.on("rb.resize",function(t){e.resize(t||window.event)}),this.el.on("lb.resize",function(t){e.resize(t||window.event)}),this.el.on("t.resize",function(t){e.resize(t||window.event)}),this.el.on("r.resize",function(t){e.resize(t||window.event)}),this.el.on("b.resize",function(t){e.resize(t||window.event)}),this.el.on("l.resize",function(t){e.resize(t||window.event)}),this.el.on("rot.resize",function(t){e.resize(t||window.event)}),this.el.on("point.resize",function(t){e.resize(t||window.event)}),this.update()}},t.prototype.stop=function(){return this.el.off("lt.resize"),this.el.off("rt.resize"),this.el.off("rb.resize"),this.el.off("lb.resize"),this.el.off("t.resize"),this.el.off("r.resize"),this.el.off("b.resize"),this.el.off("l.resize"),this.el.off("rot.resize"),this.el.off("point.resize"),this},t.prototype.resize=function(t){if(!t.detail.event.button){var e=this;this.m=this.el.node.getScreenCTM().inverse(),this.offset={x:window.pageXOffset,y:window.pageYOffset};var i=this._extractPosition(t.detail.event);if(this.parameters={type:this.el.type,p:this.transformPoint(i.x,i.y),x:t.detail.x,y:t.detail.y,box:this.el.bbox(),rotation:this.el.transform().rotation},"text"===this.el.type&&(this.parameters.fontSize=this.el.attr()["font-size"]),void 0!==t.detail.i){var s=this.el.array().valueOf();this.parameters.i=t.detail.i,this.parameters.pointCoords=[s[t.detail.i][0],s[t.detail.i][1]]}switch(t.type){case"lt":this.calc=function(t,e){var i=this.snapToGrid(t,e);if(this.parameters.box.width-i[0]>0&&this.parameters.box.height-i[1]>0){if("text"===this.parameters.type)return this.el.move(this.parameters.box.x+i[0],this.parameters.box.y),void this.el.attr("font-size",this.parameters.fontSize-i[0]);i=this.checkAspectRatio(i),this.el.move(this.parameters.box.x+i[0],this.parameters.box.y+i[1]).size(this.parameters.box.width-i[0],this.parameters.box.height-i[1])}};break;case"rt":this.calc=function(t,e){var i=this.snapToGrid(t,e,2);if(this.parameters.box.width+i[0]>0&&this.parameters.box.height-i[1]>0){if("text"===this.parameters.type)return this.el.move(this.parameters.box.x-i[0],this.parameters.box.y),void this.el.attr("font-size",this.parameters.fontSize+i[0]);i=this.checkAspectRatio(i,!0),this.el.move(this.parameters.box.x,this.parameters.box.y+i[1]).size(this.parameters.box.width+i[0],this.parameters.box.height-i[1])}};break;case"rb":this.calc=function(t,e){var i=this.snapToGrid(t,e,0);if(this.parameters.box.width+i[0]>0&&this.parameters.box.height+i[1]>0){if("text"===this.parameters.type)return this.el.move(this.parameters.box.x-i[0],this.parameters.box.y),void this.el.attr("font-size",this.parameters.fontSize+i[0]);i=this.checkAspectRatio(i),this.el.move(this.parameters.box.x,this.parameters.box.y).size(this.parameters.box.width+i[0],this.parameters.box.height+i[1])}};break;case"lb":this.calc=function(t,e){var i=this.snapToGrid(t,e,1);if(this.parameters.box.width-i[0]>0&&this.parameters.box.height+i[1]>0){if("text"===this.parameters.type)return this.el.move(this.parameters.box.x+i[0],this.parameters.box.y),void this.el.attr("font-size",this.parameters.fontSize-i[0]);i=this.checkAspectRatio(i,!0),this.el.move(this.parameters.box.x+i[0],this.parameters.box.y).size(this.parameters.box.width-i[0],this.parameters.box.height+i[1])}};break;case"t":this.calc=function(t,e){var i=this.snapToGrid(t,e,2);if(this.parameters.box.height-i[1]>0){if("text"===this.parameters.type)return;this.el.move(this.parameters.box.x,this.parameters.box.y+i[1]).height(this.parameters.box.height-i[1])}};break;case"r":this.calc=function(t,e){var i=this.snapToGrid(t,e,0);if(this.parameters.box.width+i[0]>0){if("text"===this.parameters.type)return;this.el.move(this.parameters.box.x,this.parameters.box.y).width(this.parameters.box.width+i[0])}};break;case"b":this.calc=function(t,e){var i=this.snapToGrid(t,e,0);if(this.parameters.box.height+i[1]>0){if("text"===this.parameters.type)return;this.el.move(this.parameters.box.x,this.parameters.box.y).height(this.parameters.box.height+i[1])}};break;case"l":this.calc=function(t,e){var i=this.snapToGrid(t,e,1);if(this.parameters.box.width-i[0]>0){if("text"===this.parameters.type)return;this.el.move(this.parameters.box.x+i[0],this.parameters.box.y).width(this.parameters.box.width-i[0])}};break;case"rot":this.calc=function(t,e){var i={x:t+this.parameters.p.x,y:e+this.parameters.p.y},s=Math.atan2(this.parameters.p.y-this.parameters.box.y-this.parameters.box.height/2,this.parameters.p.x-this.parameters.box.x-this.parameters.box.width/2),r=Math.atan2(i.y-this.parameters.box.y-this.parameters.box.height/2,i.x-this.parameters.box.x-this.parameters.box.width/2),a=this.parameters.rotation+180*(r-s)/Math.PI+this.options.snapToAngle/2;this.el.center(this.parameters.box.cx,this.parameters.box.cy).rotate(a-a%this.options.snapToAngle,this.parameters.box.cx,this.parameters.box.cy)};break;case"point":this.calc=function(t,e){var i=this.snapToGrid(t,e,this.parameters.pointCoords[0],this.parameters.pointCoords[1]),s=this.el.array().valueOf();s[this.parameters.i][0]=this.parameters.pointCoords[0]+i[0],s[this.parameters.i][1]=this.parameters.pointCoords[1]+i[1],this.el.plot(s)}}this.el.fire("resizestart",{dx:this.parameters.x,dy:this.parameters.y,event:t}),SVG.on(window,"touchmove.resize",function(t){e.update(t||window.event)}),SVG.on(window,"touchend.resize",function(){e.done()}),SVG.on(window,"mousemove.resize",function(t){e.update(t||window.event)}),SVG.on(window,"mouseup.resize",function(){e.done()})}},t.prototype.update=function(t){if(!t)return void(this.lastUpdateCall&&this.calc(this.lastUpdateCall[0],this.lastUpdateCall[1]));this.m=this.el.node.getScreenCTM().inverse();var e=this._extractPosition(t),i=this.transformPoint(e.x,e.y),s=i.x-this.parameters.p.x,r=i.y-this.parameters.p.y;this.lastUpdateCall=[s,r],this.calc(s,r),this.el.fire("resizing",{dx:s,dy:r,event:t})},t.prototype.done=function(){this.lastUpdateCall=null,SVG.off(window,"mousemove.resize"),SVG.off(window,"mouseup.resize"),SVG.off(window,"touchmove.resize"),SVG.off(window,"touchend.resize"),this.el.fire("resizedone")},t.prototype.snapToGrid=function(t,e,i,s){var r;return void 0!==s?r=[(i+t)%this.options.snapToGrid,(s+e)%this.options.snapToGrid]:(i=null==i?3:i,r=[(this.parameters.box.x+t+(1&i?0:this.parameters.box.width))%this.options.snapToGrid,(this.parameters.box.y+e+(2&i?0:this.parameters.box.height))%this.options.snapToGrid]),t<0&&(r[0]-=this.options.snapToGrid),e<0&&(r[1]-=this.options.snapToGrid),t-=Math.abs(r[0])o.maxX&&(t=o.maxX-r),void 0!==o.minY&&a+eo.maxY&&(e=o.maxY-a),[t,e]},t.prototype.checkAspectRatio=function(t,e){if(!this.options.saveAspectRatio)return t;var i=t.slice(),s=this.parameters.box.width/this.parameters.box.height,r=this.parameters.box.width+t[0],a=this.parameters.box.height-t[1],o=r/a;return os&&(i[0]=this.parameters.box.width-a*s,e&&(i[0]=-i[0])),i},SVG.extend(SVG.Element,{resize:function(e){return(this.remember("_resizeHandler")||new t(this)).init(e||{}),this}}),SVG.Element.prototype.resize.defaults={snapToAngle:.1,snapToGrid:1,constraint:{},saveAspectRatio:!1}}).call(this)}();
+\ No newline at end of file
diff --git a/cvat/apps/engine/static/engine/js/3rdparty/svg.select.js b/cvat/apps/engine/static/engine/js/3rdparty/svg.select.js
index 47e07bd..cee6d34 100644
--- a/cvat/apps/engine/static/engine/js/3rdparty/svg.select.js
@@ -147,5 +124,5 @@ index 47e07bd..cee6d34 100644
};
--
-2.7.4
+2.19.1
diff --git a/cvat/apps/engine/static/engine/js/3rdparty/defiant.js b/cvat/apps/engine/static/engine/js/3rdparty/defiant.js
deleted file mode 100644
index 743f1bea..00000000
--- a/cvat/apps/engine/static/engine/js/3rdparty/defiant.js
+++ /dev/null
@@ -1,882 +0,0 @@
-/*
- * defiant.js.js [v1.4.5]
- * http://www.defiantjs.com
- * Copyright (c) 2013-2017, Hakan Bilgin
- * Licensed under the MIT License
- */
-/*
- * x10.js v0.1.3
- * Web worker wrapper with simple interface
- *
- * Copyright (c) 2013-2015, Hakan Bilgin
- * Licensed under the MIT License
- */
-
-(function(window, undefined) {
- //'use strict';
-
- var x10 = {
- init: function() {
- return this;
- },
- work_handler: function(event) {
- var args = Array.prototype.slice.call(event.data, 1),
- func = event.data[0],
- ret = tree[func].apply(tree, args);
-
- // return process finish
- postMessage([func, ret]);
- },
- setup: function(tree) {
- var url = window.URL || window.webkitURL,
- script = 'var tree = {'+ this.parse(tree).join(',') +'};',
- blob = new Blob([script + 'self.addEventListener("message", '+ this.work_handler.toString() +', false);'],
- {type: 'text/javascript'}),
- worker = new Worker(url.createObjectURL(blob));
-
- // thread pipe
- worker.onmessage = function(event) {
- var args = Array.prototype.slice.call(event.data, 1),
- func = event.data[0];
- x10.observer.emit('x10:'+ func, args);
- };
-
- return worker;
- },
- call_handler: function(func, worker) {
- return function() {
- var args = Array.prototype.slice.call(arguments, 0, -1),
- callback = arguments[arguments.length-1];
-
- // add method name
- args.unshift(func);
-
- // listen for 'done'
- x10.observer.on('x10:'+ func, function(event) {
- callback(event.detail[0]);
- });
-
- // start worker
- worker.postMessage(args);
- };
- },
- compile: function(hash) {
- var worker = this.setup(typeof(hash) === 'function' ? {func: hash} : hash),
- obj = {},
- fn;
- // create return object
- if (typeof(hash) === 'function') {
- obj.func = this.call_handler('func', worker);
- return obj.func;
- } else {
- for (fn in hash) {
- obj[fn] = this.call_handler(fn, worker);
- }
- return obj;
- }
- },
- parse: function(tree, isArray) {
- var hash = [],
- key,
- val,
- v;
-
- for (key in tree) {
- v = tree[key];
- // handle null
- if (v === null) {
- hash.push(key +':null');
- continue;
- }
- // handle undefined
- if (v === undefined) {
- hash.push(key +':undefined');
- continue;
- }
- switch (v.constructor) {
- case Date: val = 'new Date('+ v.valueOf() +')'; break;
- case Object: val = '{'+ this.parse(v).join(',') +'}'; break;
- case Array: val = '['+ this.parse(v, true).join(',') +']'; break;
- case String: val = '"'+ v.replace(/"/g, '\\"') +'"'; break;
- case RegExp:
- case Function: val = v.toString(); break;
- default: val = v;
- }
- if (isArray) hash.push(val);
- else hash.push(key +':'+ val);
- }
- return hash;
- },
- // simple event emitter
- observer: (function() {
- var stack = {};
-
- return {
- on: function(type, fn) {
- if (!stack[type]) {
- stack[type] = [];
- }
- stack[type].unshift(fn);
- },
- off: function(type, fn) {
- if (!stack[type]) return;
- var i = stack[type].indexOf(fn);
- stack[type].splice(i,1);
- },
- emit: function(type, detail) {
- if (!stack[type]) return;
- var event = {
- type : type,
- detail : detail,
- isCanceled : false,
- cancelBubble : function() {
- this.isCanceled = true;
- }
- },
- len = stack[type].length;
- while(len--) {
- if (event.isCanceled) return;
- stack[type][len](event);
- }
- }
- };
- })()
- };
-
- if (typeof module === "undefined") {
- // publish x10
- window.x10 = x10.init();
- } else {
- module.exports = x10.init();
- }
-
-})(this);
-
-
-(function(window, module, undefined) {
- 'use strict';
-
- var Defiant = {
- is_ie : /(msie|trident)/i.test(navigator.userAgent),
- is_safari : /safari/i.test(navigator.userAgent),
- env : 'production',
- xml_decl : '',
- namespace : 'xmlns:d="defiant-namespace"',
- tabsize : 4,
- render: function(template, data) {
- var processor = new XSLTProcessor(),
- span = document.createElement('span'),
- opt = {match: '/'},
- tmpltXpath,
- scripts,
- temp,
- sorter;
- // handle arguments
- switch (typeof(template)) {
- case 'object':
- this.extend(opt, template);
- if (!opt.data) opt.data = data;
- break;
- case 'string':
- opt.template = template;
- opt.data = data;
- break;
- default:
- throw 'error';
- }
- opt.data = JSON.toXML(opt.data);
- tmpltXpath = '//xsl:template[@name="'+ opt.template +'"]';
-
- if (!this.xsl_template) this.gatherTemplates();
-
- if (opt.sorter) {
- sorter = this.node.selectSingleNode(this.xsl_template, tmpltXpath +'//xsl:for-each//xsl:sort');
- if (sorter) {
- if (opt.sorter.order) sorter.setAttribute('order', opt.sorter.order);
- if (opt.sorter.select) sorter.setAttribute('select', opt.sorter.select);
- sorter.setAttribute('data-type', opt.sorter.type || 'text');
- }
- }
-
- temp = this.node.selectSingleNode(this.xsl_template, tmpltXpath);
- temp.setAttribute('match', opt.match);
- processor.importStylesheet(this.xsl_template);
- span.appendChild(processor.transformToFragment(opt.data, document));
- temp.removeAttribute('match');
-
- if (this.is_safari) {
- scripts = span.getElementsByTagName('script');
- for (var i=0, il=scripts.length; i'+ str.replace(/defiant:(\w+)/g, '$1') +'');
- },
- getSnapshot: function(data, callback) {
- return JSON.toXML(data, callback || true);
- },
- xmlFromString: function(str) {
- var parser,
- doc;
- str = str.replace(/>\s{1,}<');
- if (str.trim().match(/<\?xml/) === null) {
- str = this.xml_decl + str;
- }
- if ( 'ActiveXObject' in window ) {
- doc = new ActiveXObject('Msxml2.DOMDocument');
- doc.loadXML(str);
- doc.setProperty('SelectionNamespaces', this.namespace);
- if (str.indexOf('xsl:stylesheet') === -1) {
- doc.setProperty('SelectionLanguage', 'XPath');
- }
- } else {
- parser = new DOMParser();
- doc = parser.parseFromString(str, 'text/xml');
- }
- return doc;
- },
- extend: function(src, dest) {
- for (var content in dest) {
- if (!src[content] || typeof(dest[content]) !== 'object') {
- src[content] = dest[content];
- } else {
- this.extend(src[content], dest[content]);
- }
- }
- return src;
- },
- node: {}
- };
-
- // Export
- window.Defiant = module.exports = Defiant;
-
-})(
- typeof window !== 'undefined' ? window : {},
- typeof module !== 'undefined' ? module : {}
-);
-
-
-if (typeof(XSLTProcessor) === 'undefined') {
-
- // emulating XSLT Processor (enough to be used in defiant)
- var XSLTProcessor = function() {};
- XSLTProcessor.prototype = {
- importStylesheet: function(xsldoc) {
- this.xsldoc = xsldoc;
- },
- transformToFragment: function(data, doc) {
- var str = data.transformNode(this.xsldoc),
- span = document.createElement('span');
- span.innerHTML = str;
- return span;
- }
- };
-
-} else if (typeof(XSLTProcessor) !== 'function' && !XSLTProcessor) {
-
- // throw error
- throw 'XSLTProcessor transformNode not implemented';
-
-}
-
-
-// extending STRING
-if (!String.prototype.fill) {
- String.prototype.fill = function(i,c) {
- var str = this;
- c = c || ' ';
- for (; str.length/,
- rx_constructor : /<(.+?)( d:contr=".*?")>/,
- rx_namespace : / xmlns\:d="defiant\-namespace"/,
- rx_data : /(<.+?>)(.*?)(<\/d:data>)/i,
- rx_function : /function (\w+)/i,
- namespace : 'xmlns:d="defiant-namespace"',
- to_xml_str: function(tree) {
- return {
- str: this.hash_to_xml(null, tree),
- map: this.map
- };
- },
- hash_to_xml: function(name, tree, array_child) {
- var is_array = tree.constructor === Array,
- self = this,
- elem = [],
- attr = [],
- key,
- val,
- val_is_array,
- type,
- is_attr,
- cname,
- constr,
- cnName,
- i,
- il,
- fn = function(key, tree) {
- val = tree[key];
- if (val === null || val === undefined || val.toString() === 'NaN') val = null;
-
- is_attr = key.slice(0,1) === '@';
- cname = array_child ? name : key;
- if (cname == +cname && tree.constructor !== Object) cname = 'd:item';
- if (val === null) {
- constr = null;
- cnName = false;
- } else {
- constr = val.constructor;
- cnName = constr.toString().match(self.rx_function)[1];
- }
-
- if (is_attr) {
- attr.push( cname.slice(1) +'="'+ self.escape_xml(val) +'"' );
- if (cnName !== 'String') attr.push( 'd:'+ cname.slice(1) +'="'+ cnName +'"' );
- } else if (val === null) {
- elem.push( self.scalar_to_xml( cname, val ) );
- } else {
- switch (constr) {
- case Function:
- // if constructor is function, then it's not a JSON structure
- throw 'JSON data should not contain functions. Please check your structure.';
- /* falls through */
- case Object:
- elem.push( self.hash_to_xml( cname, val ) );
- break;
- case Array:
- if (key === cname) {
- val_is_array = val.constructor === Array;
- if (val_is_array) {
- i = val.length;
- while (i--) {
- if (val[i] === null || !val[i] || val[i].constructor === Array) val_is_array = true;
- if (!val_is_array && val[i].constructor === Object) val_is_array = true;
- }
- }
- elem.push( self.scalar_to_xml( cname, val, val_is_array ) );
- break;
- }
- /* falls through */
- case String:
- if (typeof(val) === 'string') {
- val = val.toString().replace(/\&/g, '&')
- .replace(/\r|\n/g, '
');
- }
- if (cname === '#text') {
- // prepare map
- self.map.push(tree);
- attr.push('d:mi="'+ self.map.length +'"');
- attr.push('d:constr="'+ cnName +'"');
- elem.push( self.escape_xml(val) );
- break;
- }
- /* falls through */
- case Number:
- case Boolean:
- if (cname === '#text' && cnName !== 'String') {
- // prepare map
- self.map.push(tree);
- attr.push('d:mi="'+ self.map.length +'"');
- attr.push('d:constr="'+ cnName +'"');
- elem.push( self.escape_xml(val) );
- break;
- }
- elem.push( self.scalar_to_xml( cname, val ) );
- break;
- }
- }
- };
- if (tree.constructor === Array) {
- i = 0;
- il = tree.length;
- for (; i'+ elem.join('') +'' : '/>' );
- },
- scalar_to_xml: function(name, val, override) {
- var attr = '',
- text,
- constr,
- cnName;
-
- // check whether the nodename is valid
- if (name.match(this.rx_validate_name) === null) {
- attr += ' d:name="'+ name +'"';
- name = 'd:name';
- override = false;
- }
- if (val === null || val.toString() === 'NaN') val = null;
- if (val === null) return '<'+ name +' d:constr="null"/>';
- if (val.length === 1 && val.constructor === Array && !val[0]) {
- return '<'+ name +' d:constr="null" d:type="ArrayItem"/>';
- }
- if (val.length === 1 && val[0].constructor === Object) {
-
- text = this.hash_to_xml(false, val[0]);
-
- var a1 = text.match(this.rx_node),
- a2 = text.match(this.rx_constructor);
- a1 = (a1 !== null)? a1[2]
- .replace(this.rx_namespace, '')
- .replace(/>/, '')
- .replace(/"\/$/, '"') : '';
- a2 = (a2 !== null)? a2[2] : '';
-
- text = text.match(this.rx_data);
- text = (text !== null)? text[2] : '';
-
- return '<'+ name + a1 +' '+ a2 +' d:type="ArrayItem">'+ text +'';
- } else if (val.length === 0 && val.constructor === Array) {
- return '<'+ name +' d:constr="Array"/>';
- }
- // else
- if (override) {
- return this.hash_to_xml( name, val, true );
- }
-
- constr = val.constructor;
- cnName = constr.toString().match(this.rx_function)[1];
- text = (constr === Array) ? this.hash_to_xml( 'd:item', val, true )
- : this.escape_xml(val);
-
- attr += ' d:constr="'+ cnName +'"';
- // prepare map
- this.map.push(val);
- attr += ' d:mi="'+ this.map.length +'"';
-
- return (name === '#text') ? this.escape_xml(val) : '<'+ name + attr +'>'+ text +'';
- },
- escape_xml: function(text) {
- return String(text) .replace(//g, '>')
- .replace(/"/g, '"')
- .replace(/ /g, ' ');
- }
- },
- processed,
- doc,
- task;
- // depending on request
- switch (typeof callback) {
- case 'function':
- // compile interpreter with 'x10.js'
- task = x10.compile(interpreter);
-
- // parse in a dedicated thread
- task.to_xml_str(tree, function(processed) {
- // snapshot distinctly improves performance
- callback({
- doc: Defiant.xmlFromString(processed.str),
- src: tree,
- map: processed.map
- });
- });
- return;
- case 'boolean':
- processed = interpreter.to_xml_str.call(interpreter, tree);
- // return snapshot
- return {
- doc: Defiant.xmlFromString(processed.str),
- src: tree,
- map: processed.map
- };
- default:
- processed = interpreter.to_xml_str.call(interpreter, tree);
- doc = Defiant.xmlFromString(processed.str);
-
- this.search.map = processed.map;
- return doc;
- }
- };
-}
-
-
-if (!JSON.search) {
- JSON.search = function(tree, xpath, single) {
- 'use strict';
-
- var isSnapshot = tree.doc && tree.doc.nodeType,
- doc = isSnapshot ? tree.doc : JSON.toXML(tree),
- map = isSnapshot ? tree.map : this.search.map,
- src = isSnapshot ? tree.src : tree,
- xres = Defiant.node[ single ? 'selectSingleNode' : 'selectNodes' ](doc, xpath.xTransform()),
- ret = [],
- mapIndex,
- i;
-
- if (single) xres = [xres];
- i = xres.length;
-
- while (i--) {
- switch(xres[i].nodeType) {
- case 2:
- case 3:
- ret.unshift( xres[i].nodeValue );
- break;
- default:
- mapIndex = +xres[i].getAttribute('d:mi');
- //if (map[mapIndex-1] !== false) {
- ret.unshift( map[mapIndex-1] );
- //}
- }
- }
-
- // if environment = development, add search tracing
- if (Defiant.env === 'development') {
- this.trace = JSON.mtrace(src, ret, xres);
- }
-
- return ret;
- };
-}
-
-if (!JSON.mtrace) {
- JSON.mtrace = function(root, hits, xres) {
- 'use strict';
-
- var win = window,
- stringify = JSON.stringify,
- sroot = stringify( root, null, '\t' ).replace(/\t/g, ''),
- trace = [],
- i = 0,
- il = xres.length,
- od = il ? xres[i].ownerDocument.documentElement : false,
- map = this.search.map,
- hstr,
- cConstr,
- fIndex = 0,
- mIndex,
- lStart,
- lEnd;
-
- for (; i 0)? xI[0] : null;
- } else {
- return XNode.selectSingleNode(XPath);
- }
-};
-
-
-Defiant.node.prettyPrint = function(node) {
- var root = Defiant,
- tabs = root.tabsize,
- decl = root.xml_decl.toLowerCase(),
- ser,
- xstr;
- if (root.is_ie) {
- xstr = node.xml;
- } else {
- ser = new XMLSerializer();
- xstr = ser.serializeToString(node);
- }
- if (root.env !== 'development') {
- // if environment is not development, remove defiant related info
- xstr = xstr.replace(/ \w+\:d=".*?"| d\:\w+=".*?"/g, '');
- }
- var str = xstr.trim().replace(/(>)\s*(<)(\/*)/g, '$1\n$2$3'),
- lines = str.split('\n'),
- indent = -1,
- i = 0,
- il = lines.length,
- start,
- end;
- for (; i/g) !== null;
- //start = lines[i].match(/<[^\/]+>/g) !== null;
- end = lines[i].match(/<\/[\w\:]+>/g) !== null;
- if (lines[i].match(/<.*?\/>/g) !== null) start = end = true;
- if (start) indent++;
- lines[i] = String().fill(indent, '\t') + lines[i];
- if (start && end) indent--;
- if (!start && end) indent--;
- }
- return lines.join('\n').replace(/\t/g, String().fill(tabs, ' '));
-};
-
-
-Defiant.node.toJSON = function(xnode, stringify) {
- 'use strict';
-
- var interpret = function(leaf) {
- var obj = {},
- win = window,
- attr,
- type,
- item,
- cname,
- cConstr,
- cval,
- text,
- i, il, a;
-
- switch (leaf.nodeType) {
- case 1:
- cConstr = leaf.getAttribute('d:constr');
- if (cConstr === 'Array') obj = [];
- else if (cConstr === 'String' && leaf.textContent === '') obj = '';
-
- attr = leaf.attributes;
- i = 0;
- il = attr.length;
- for (; i
+ * License GNU AGPLv3
+ */if(function(window,module){"use strict";var defiant={is_ie:/(msie|trident)/i.test(navigator.userAgent),is_safari:/safari/i.test(navigator.userAgent),env:"production",xml_decl:'',namespace:'xmlns:d="defiant-namespace"',tabsize:4,snapshots:{},node:{},renderXml:function(e,t){var n=new window.XSLTProcessor,r=document.createElement("span"),a='//xsl:template[@name="'+e+'"]',s=this.node.selectSingleNode(this.xsl_template,a);return(s=this.node.selectSingleNode(this.xsl_template,a)).setAttribute("match","/"),n.importStylesheet(this.xsl_template),r.appendChild(n.transformToFragment(t,document)),s.removeAttribute("match"),r.innerHTML},render:function(e,t){var n,r,a,s,o=new window.XSLTProcessor,i=document.createElement("span"),l={match:"/"};switch(typeof e){case"object":this.extend(l,e),l.data||(l.data=t);break;case"string":l.template=e,l.data=t;break;default:throw"error"}if(l.data=l.data.nodeType?l.data:defiant.json.toXML(l.data),n='//xsl:template[@name="'+l.template+'"]',this.xsl_template||this.gatherTemplates(),l.sorter&&(s=this.node.selectSingleNode(this.xsl_template,n+"//xsl:for-each//xsl:sort"))&&(l.sorter.order&&s.setAttribute("order",l.sorter.order),l.sorter.select&&s.setAttribute("select",l.sorter.select),s.setAttribute("data-type",l.sorter.type||"text")),(a=this.node.selectSingleNode(this.xsl_template,n)).setAttribute("match",l.match),o.importStylesheet(this.xsl_template),i.appendChild(o.transformToFragment(l.data,document)),a.removeAttribute("match"),this.is_safari)for(var c=0,d=(r=i.getElementsByTagName("script")).length;c"+t.replace(/defiant:(\w+)/g,"$1")+"")},registerTemplate:function(e){this.xsl_template=this.xmlFromString('"+e.replace(/defiant:(\w+)/g,"$1")+" ")},getSnapshot:function(e,t){return this.json.toXML(e,t||!0)},createSnapshot:function(e,t){var n=this,r="snapshot_"+Date.now();this.json.toXML(e,function(e){n.snapshots[r]=e,t(r)})},getFacets:function(e,t){var n,r,a,s,o,i,l=e.constructor===String&&"snapshot_"===e.slice(0,9)?this.snapshots[e].doc:defiant.json.toXML(e),c=l.cloneNode(!0),d={},u={},p=0,h=function(e){var t=e.childNodes.length;switch(e.nodeType){case 1:t>=p&&(p=t,r=e);case 9:e.childNodes.map(function(e){return h(e)})}};for(i in h(l),r.childNodes.map(function(e){u[e.nodeName]||(u[e.nodeName]=1),u[e.nodeName]++}),p=0,u)p<=u[i]&&(p=u[i],o=i);return this.createFacetTemplate(t),s=defiant.node.selectSingleNode(c,'//*[@d:mi="'+r.getAttribute("d:mi")+'"]'),defiant.node.selectNodes(c,'//*[@d:mi="'+r.getAttribute("d:mi")+'"]/'+o).map(function(e){return e.parentNode.removeChild(e)}),a=defiant.node.selectNodes(l,'//*[@d:mi="'+r.getAttribute("d:mi")+'"]/'+o),n=a.length-1,a.map(function(e,t){if(s.appendChild(e.cloneNode(!0)),t%50==49||t===n){var a=defiant.render("facets",c).replace(/\n|\t/g,"").replace(/"": 0,?/g,"").replace(/,\}/g,"}"),i=JSON.parse(a);d=defiant.concatFacet(i,d),defiant.node.selectNodes(c,'//*[@d:mi="'+r.getAttribute("d:mi")+'"]/'+o).map(function(e){return e.parentNode.removeChild(e)})}}),d},createFacetTemplate:function(e){var t,n,r=[],a=[];for(n in e)r.push('", }'.replace(/\n|\t/g,""));t=r.join("")+'{'+a.join(",")+"} ",this.registerTemplate(t)},xmlFromString:function(e){var t;return null===(e=e.replace(/>\s{1,}<")).trim().match(/<\?xml/)&&(e=this.xml_decl+e),"ActiveXObject"in window?((t=new ActiveXObject("Msxml2.DOMDocument")).loadXML(e),t.setProperty("SelectionNamespaces",this.namespace),-1===e.indexOf("xsl:stylesheet")&&t.setProperty("SelectionLanguage","XPath")):t=(new DOMParser).parseFromString(e,"text/xml"),t},concatFacet:function(e,t){for(var n in t)e[n]&&"object"==typeof t[n]?this.concatFacet(e[n],t[n]):e[n]=(e[n]||0)+t[n];return e},extend:function(e,t){for(var n in t)e[n]&&"object"==typeof t[n]?this.extend(e[n],t[n]):e[n]=t[n];return e},node:{selectNodes:function(e,t){if(e.evaluate){for(var n=e.createNSResolver(e.documentElement),r=e.evaluate(t,e,n,XPathResult.ORDERED_NODE_SNAPSHOT_TYPE,null),a=[],s=0,o=r.snapshotLength;s0?n[0]:null}return e.selectSingleNode(t)},prettyPrint:function(e){var t,n=defiant,r=n.tabsize,a=n.xml_decl.toLowerCase();t=n.is_ie?e.xml:(new XMLSerializer).serializeToString(e),"development"!==n.env&&(t=t.replace(/ \w+\:d=".*?"| d\:\w+=".*?"/g,""));for(var s,o,i=t.trim().replace(/(>)\s*(<)(\/*)/g,"$1\n$2$3").split("\n"),l=-1,c=0,d=i.length;c/g),o=null!==i[c].match(/<\/[\w\:]+>/g),null!==i[c].match(/<.*?\/>/g)&&(s=o=!0),s&&l++,i[c]=String().fill(l,"\t")+i[c],s&&o&&l--,!s&&o&&l--);return i.join("\n").replace(/\t/g,String().fill(r," "))},toJSON:function(e,t){var n=function(e){var t,r,a,s,o,i,l,c,d,u,p={},h=window;switch(e.nodeType){case 1:for("Array"===(o=e.getAttribute("d:constr"))?p=[]:"String"===o&&""===e.textContent&&(p=""),c=0,d=(t=e.attributes).length;c/,rx_constructor:/<(.+?)( d:contr=".*?")>/,rx_namespace:/ xmlns\:d="defiant\-namespace"/,rx_data:/(<.+?>)(.*?)(<\/d:data>)/i,rx_function:/function (\w+)/i,namespace:'xmlns:d="defiant-namespace"',to_xml_str:function(e){return{str:this.hash_to_xml(null,e),map:this.map}},hash_to_xml:function(e,t,n){var r,a,s,o,i,l,c,d,u,p=t.constructor===Array,h=this,m=[],f=[],g=function(t,r){if(null!==(a=r[t])&&void 0!==a&&"NaN"!==a.toString()||(a=null),o="@"===t.slice(0,1),(i=n?e:t)==+i&&r.constructor!==Object&&(i="d:item"),null===a?(l=null,c=!1):(l=a.constructor,c=l.toString().match(h.rx_function)[1]),o)f.push(i.slice(1)+'="'+h.escape_xml(a)+'"'),"String"!==c&&f.push("d:"+i.slice(1)+'="'+c+'"');else if(null===a)m.push(h.scalar_to_xml(i,a));else switch(l){case Function:throw"JSON data should not contain functions. Please check your structure.";case Object:m.push(h.hash_to_xml(i,a));break;case Array:if(t===i){if(s=a.constructor===Array)for(d=a.length;d--;)null!==a[d]&&a[d]&&a[d].constructor!==Array||(s=!0),s||a[d].constructor!==Object||(s=!0);m.push(h.scalar_to_xml(i,a,s));break}case String:if("string"==typeof a&&(a=a.toString().replace(/\&/g,"&").replace(/\r|\n/g,"
")),"#text"===i){h.map.push(r),f.push('d:mi="'+h.map.length+'"'),f.push('d:constr="'+c+'"'),m.push(h.escape_xml(a));break}case Number:case Boolean:if("#text"===i&&"String"!==c){h.map.push(r),f.push('d:mi="'+h.map.length+'"'),f.push('d:constr="'+c+'"'),m.push(h.escape_xml(a));break}m.push(h.scalar_to_xml(i,a))}};if(t.constructor===Array)for(d=0,u=t.length;d"+m.join("")+"":"/>"))},scalar_to_xml:function(e,t,n){var r,a,s,o="";if(null===e.match(this.rx_validate_name)&&(o+=' d:name="'+e+'"',e="d:name",n=!1),null!==t&&"NaN"!==t.toString()||(t=null),null===t)return"<"+e+' d:constr="null"/>';if(1===t.length&&t.constructor===Array&&!t[0])return"<"+e+' d:constr="null" d:type="ArrayItem"/>';if(1===t.length&&t[0].constructor===Object){var i=(r=this.hash_to_xml(!1,t[0])).match(this.rx_node),l=r.match(this.rx_constructor);return"<"+e+(i=null!==i?i[2].replace(this.rx_namespace,"").replace(/>/,"").replace(/"\/$/,'"'):"")+" "+(l=null!==l?l[2]:"")+' d:type="ArrayItem">'+(r=null!==(r=r.match(this.rx_data))?r[2]:"")+""}return 0===t.length&&t.constructor===Array?"<"+e+' d:constr="Array"/>':n?this.hash_to_xml(e,t,!0):(s=(a=t.constructor).toString().match(this.rx_function)[1],r=a===Array?this.hash_to_xml("d:item",t,!0):this.escape_xml(t),o+=' d:constr="'+s+'"',this.map.push(t),o+=' d:mi="'+this.map.length+'"',"#text"===e?this.escape_xml(t):"<"+e+o+">"+r+"")},escape_xml:function(e){return String(e).replace(/&/g,"&").replace(//g,">").replace(/"/g,""").replace(/ /g," ")}},toXML:function(e,t){var n,r,a=defiant.json.interpreter;switch(typeof t){case"function":return void defiant.compiled.to_xml_str(e,function(n){t({doc:defiant.xmlFromString(n.str),src:e,map:n.map})});case"boolean":return n=a.to_xml_str.call(a,e),{doc:defiant.xmlFromString(n.str),src:e,map:n.map};default:return n=a.to_xml_str.call(a,e),r=defiant.xmlFromString(n.str),this.search.map=n.map,r}},search:function(e,t,n){e.constructor===String&&"snapshot_"===e.slice(0,9)&&defiant.snapshots[e]&&(e=defiant.snapshots[e]);var r,a,s=defiant.json,o=e.doc&&e.doc.nodeType,i=o?e.doc:s.toXML(e),l=o?e.map:s.search.map,c=o?e.src:e,d=defiant.node[n?"selectSingleNode":"selectNodes"](i,t.xTransform()),u=[];for(n&&(d=[d]),a=d.length;a--;)switch(d[a].nodeType){case 2:case 3:u.unshift(d[a].nodeValue);break;default:r=+d[a].getAttribute("d:mi"),u.unshift(l[r-1])}return"development"===defiant.env&&(u.trace=s.matchTrace(c,u,d)),u},matchTrace:function(e,t,n){var r=[],a=0,s=window,o=defiant.node.toJSON,i=function(e){return JSON.stringify(e,null,"\t").replace(/\t/g,"")},l=i(e);return n.map(function(e,c){var d,u,p,h,m,f,g,x=0;switch(e.nodeType){case 2:d=n[c].ownerElement?n[c].ownerElement.getAttribute("d:"+n[c].nodeName):"String",h=s[d](t[c]),m='"@'+n[c].nodeName+'": '+h,f=l.indexOf(m,a);break;case 3:d=n[c].parentNode.getAttribute("d:constr"),h=s[d](t[c]),m='"'+n[c].parentNode.nodeName+'": '+("Number"===m?h:'"'+h+'"'),f=l.indexOf(m,a);break;default:d=e.getAttribute("d:constr"),["String","Number"].indexOf(d)>-1?(u=o(n[c].parentNode),p=i(u),h=s[d](t[c]),m='"'+n[c].nodeName+'": '+("Number"===d?h:'"'+h+'"'),f=l.indexOf(p,a)+p.indexOf(m)):(m=i(t[c]),f=l.indexOf(m),x=m.split("\n").length-1)}a=f+1,g=l.slice(0,f).split("\n").length,r.push([g,x])}),r}}},x10={id:1,work_handler:function(e){var t=Array.prototype.slice.call(e.data,2),n=e.data[0],r=e.data[1],a=tree[n].apply(tree,t);a.map=JSON.parse(JSON.stringify(a.map)),postMessage([r,n,a])},setup:function(e){var t=window.URL||window.webkitURL,n="var tree = {"+this.parse(e).join(",")+"};",r=new Blob([n+'self.addEventListener("message", '+this.work_handler.toString()+", false);"],{type:"text/javascript"}),a=new Worker(t.createObjectURL(r));return a.onmessage=function(e){var t=Array.prototype.slice.call(e.data,2),n=e.data[0],r=e.data[1];x10.observer.emit("x10:"+r+n,t),x10.observer.off("x10:"+r+n)},a},call_handler:function(e,t){return function(){var n=Array.prototype.slice.call(arguments,0,-1),r=arguments[arguments.length-1],a=x10.id++;n.unshift(a),n.unshift(e),x10.observer.on("x10:"+e+a,function(e){r(e.detail[0])}),t.postMessage(n)}},compile:function(e){var t,n=this.setup("function"==typeof e?{func:e}:e),r={};if("function"==typeof e)return r.func=this.call_handler("func",n),r.func;for(t in e)r[t]=this.call_handler(t,n);return r},parse:function(e,t){var n,r,a,s=[];for(n in e)if(null!==(a=e[n]))if(void 0!==a){switch(a.constructor){case Date:r="new Date("+a.valueOf()+")";break;case Object:r="{"+this.parse(a).join(",")+"}";break;case Array:r="["+this.parse(a,!0).join(",")+"]";break;case String:r='"'+a.replace(/"/g,'\\"')+'"';break;case RegExp:case Function:r=a.toString();break;default:r=a}t?s.push(r):s.push(n+":"+r)}else s.push(n+":undefined");else s.push(n+":null");return s},observer:(stack={},{on:function(e,t){stack[e]||(stack[e]=[]),stack[e].unshift(t)},off:function(e,t){if(stack[e]){var n=stack[e].indexOf(t);stack[e].splice(n,1)}},emit:function(e,t){if(stack[e])for(var n={type:e,detail:t,isCanceled:!1,cancelBubble:function(){this.isCanceled=!0}},r=stack[e].length;r--;){if(n.isCanceled)return;stack[e][r](n)}}})},stack;String.prototype.fill||(String.prototype.fill=function(e,t){var n=this;for(t=t||" ";n.length 0)
- if (this.parameters.box.width - snap[0] > 0 && this.parameters.box.height - snap[1] > 0) {
- // ...if valid, we resize the this.el (which can include moving because the coord-system starts at the left-top and this edge is moving sometimes when resized)
-
- /*
- * but first check if the element is text box, so we can change the font size instead of
- * the width and height
- */
-
- if (this.parameters.type === "text") {
- this.el.move(this.parameters.box.x + snap[0], this.parameters.box.y);
- this.el.attr("font-size", this.parameters.fontSize - snap[0]);
- return;
- }
-
- this.el.move(this.parameters.box.x + snap[0], this.parameters.box.y + snap[1]).size(this.parameters.box.width - snap[0], this.parameters.box.height - snap[1]);
- }
- };
- break;
-
- // Right-Top
- case 'rt':
- // s.a.
- this.calc = function (diffX, diffY) {
- var snap = this.snapToGrid(diffX, diffY, 1 << 1);
- if (this.parameters.box.width + snap[0] > 0 && this.parameters.box.height - snap[1] > 0) {
- if (this.parameters.type === "text") {
- this.el.move(this.parameters.box.x - snap[0], this.parameters.box.y);
- this.el.attr("font-size", this.parameters.fontSize + snap[0]);
- return;
- }
-
- this.el.move(this.parameters.box.x, this.parameters.box.y + snap[1]).size(this.parameters.box.width + snap[0], this.parameters.box.height - snap[1]);
- }
- };
- break;
-
- // Right-Bottom
- case 'rb':
- // s.a.
- this.calc = function (diffX, diffY) {
- var snap = this.snapToGrid(diffX, diffY, 0);
- if (this.parameters.box.width + snap[0] > 0 && this.parameters.box.height + snap[1] > 0) {
- if (this.parameters.type === "text") {
- this.el.move(this.parameters.box.x - snap[0], this.parameters.box.y);
- this.el.attr("font-size", this.parameters.fontSize + snap[0]);
- return;
- }
-
- this.el.move(this.parameters.box.x, this.parameters.box.y).size(this.parameters.box.width + snap[0], this.parameters.box.height + snap[1]);
- }
- };
- break;
-
- // Left-Bottom
- case 'lb':
- // s.a.
- this.calc = function (diffX, diffY) {
- var snap = this.snapToGrid(diffX, diffY, 1);
- if (this.parameters.box.width - snap[0] > 0 && this.parameters.box.height + snap[1] > 0) {
- if (this.parameters.type === "text") {
- this.el.move(this.parameters.box.x + snap[0], this.parameters.box.y);
- this.el.attr("font-size", this.parameters.fontSize - snap[0]);
- return;
- }
-
- this.el.move(this.parameters.box.x + snap[0], this.parameters.box.y).size(this.parameters.box.width - snap[0], this.parameters.box.height + snap[1]);
- }
- };
- break;
-
- // Top
- case 't':
- // s.a.
- this.calc = function (diffX, diffY) {
- var snap = this.snapToGrid(diffX, diffY, 1 << 1);
- if (this.parameters.box.height - snap[1] > 0) {
- // Disable the font-resizing if it is not from the corner of bounding-box
- if (this.parameters.type === "text") {
- return;
- }
-
- this.el.move(this.parameters.box.x, this.parameters.box.y + snap[1]).height(this.parameters.box.height - snap[1]);
- }
- };
- break;
-
- // Right
- case 'r':
- // s.a.
- this.calc = function (diffX, diffY) {
- var snap = this.snapToGrid(diffX, diffY, 0);
- if (this.parameters.box.width + snap[0] > 0) {
- if (this.parameters.type === "text") {
- return;
- }
-
- this.el.move(this.parameters.box.x, this.parameters.box.y).width(this.parameters.box.width + snap[0]);
- }
- };
- break;
-
- // Bottom
- case 'b':
- // s.a.
- this.calc = function (diffX, diffY) {
- var snap = this.snapToGrid(diffX, diffY, 0);
- if (this.parameters.box.height + snap[1] > 0) {
- if (this.parameters.type === "text") {
- return;
- }
-
- this.el.move(this.parameters.box.x, this.parameters.box.y).height(this.parameters.box.height + snap[1]);
- }
- };
- break;
-
- // Left
- case 'l':
- // s.a.
- this.calc = function (diffX, diffY) {
- var snap = this.snapToGrid(diffX, diffY, 1);
- if (this.parameters.box.width - snap[0] > 0) {
- if (this.parameters.type === "text") {
- return;
- }
-
- this.el.move(this.parameters.box.x + snap[0], this.parameters.box.y).width(this.parameters.box.width - snap[0]);
- }
- };
- break;
-
- // Rotation
- case 'rot':
- // s.a.
- this.calc = function (diffX, diffY) {
-
- // yes this is kinda stupid but we need the mouse coords back...
- var current = {x: diffX + this.parameters.p.x, y: diffY + this.parameters.p.y};
-
- // start minus middle
- var sAngle = Math.atan2((this.parameters.p.y - this.parameters.box.y - this.parameters.box.height / 2), (this.parameters.p.x - this.parameters.box.x - this.parameters.box.width / 2));
-
- // end minus middle
- var pAngle = Math.atan2((current.y - this.parameters.box.y - this.parameters.box.height / 2), (current.x - this.parameters.box.x - this.parameters.box.width / 2));
-
- var angle = (pAngle - sAngle) * 180 / Math.PI;
-
- // We have to move the element to the center of the box first and change the rotation afterwards
- // because rotation always works around a rotation-center, which is changed when moving the element
- // We also set the new rotation center to the center of the box.
- this.el.center(this.parameters.box.cx, this.parameters.box.cy).rotate(this.parameters.rotation + angle - angle % this.options.snapToAngle, this.parameters.box.cx, this.parameters.box.cy);
- };
- break;
-
- // Moving one single Point (needed when an element is deepSelected which means you can move every single point of the object)
- case 'point':
- this.calc = function (diffX, diffY) {
-
- // Snapping the point to the grid
- var snap = this.snapToGrid(diffX, diffY, this.parameters.pointCoords[0], this.parameters.pointCoords[1]);
-
- // Get the point array
- var array = this.el.array().valueOf();
-
- // Changing the moved point in the array
- array[this.parameters.i][0] = this.parameters.pointCoords[0] + snap[0];
- array[this.parameters.i][1] = this.parameters.pointCoords[1] + snap[1];
-
- // And plot the new this.el
- this.el.plot(array);
- };
- }
-
- this.el.fire('resizestart', {dx: this.parameters.x, dy: this.parameters.y, event: event});
- // When resizing started, we have to register events for...
- // Touches.
- SVG.on(window, 'touchmove.resize', function(e) {
- _this.update(e || window.event);
- });
- SVG.on(window, 'touchend.resize', function() {
- _this.done();
- });
- // Mouse.
- SVG.on(window, 'mousemove.resize', function (e) {
- _this.update(e || window.event);
- });
- SVG.on(window, 'mouseup.resize', function () {
- _this.done();
- });
-
- };
-
- // The update-function redraws the element every time the mouse is moving
- ResizeHandler.prototype.update = function (event) {
-
- if (!event) {
- if (this.lastUpdateCall) {
- this.calc(this.lastUpdateCall[0], this.lastUpdateCall[1]);
- }
- return;
- }
-
- // Calculate the difference between the mouseposition at start and now
- var txPt = this._extractPosition(event);
- var p = this.transformPoint(txPt.x, txPt.y);
-
- var diffX = p.x - this.parameters.p.x,
- diffY = p.y - this.parameters.p.y;
-
- this.lastUpdateCall = [diffX, diffY];
-
- // Calculate the new position and height / width of the element
- this.calc(diffX, diffY);
-
- // Emit an event to say we have changed.
- this.el.fire('resizing', {dx: diffX, dy: diffY, event: event});
- };
-
- // Is called on mouseup.
- // Removes the update-function from the mousemove event
- ResizeHandler.prototype.done = function () {
- this.lastUpdateCall = null;
- SVG.off(window, 'mousemove.resize');
- SVG.off(window, 'mouseup.resize');
- SVG.off(window, 'touchmove.resize');
- SVG.off(window, 'touchend.resize');
- this.el.fire('resizedone');
- };
-
- // The flag is used to determine whether the resizing is used with a left-Point (first bit) and top-point (second bit)
- // In this cases the temp-values are calculated differently
- ResizeHandler.prototype.snapToGrid = function (diffX, diffY, flag, pointCoordsY) {
-
- var temp;
-
- // If `pointCoordsY` is given, a single Point has to be snapped (deepSelect). That's why we need a different temp-value
- if (typeof pointCoordsY !== 'undefined') {
- // Note that flag = pointCoordsX in this case
- temp = [(flag + diffX) % this.options.snapToGrid, (pointCoordsY + diffY) % this.options.snapToGrid];
- } else {
- // We check if the flag is set and if not we set a default-value (both bits set - which means upper-left-edge)
- flag = flag == null ? 1 | 1 << 1 : flag;
- temp = [(this.parameters.box.x + diffX + (flag & 1 ? 0 : this.parameters.box.width)) % this.options.snapToGrid, (this.parameters.box.y + diffY + (flag & (1 << 1) ? 0 : this.parameters.box.height)) % this.options.snapToGrid];
- }
-
-
- diffX -= (Math.abs(temp[0]) < this.options.snapToGrid / 2 ?
- temp[0] :
- temp[0] - (diffX < 0 ? -this.options.snapToGrid : this.options.snapToGrid));
- diffY -= (Math.abs(temp[1]) < this.options.snapToGrid / 2 ?
- temp[1] :
- temp[1] - (diffY < 0 ? -this.options.snapToGrid : this.options.snapToGrid));
-
- return this.constraintToBox(diffX, diffY, flag, pointCoordsY);
-
- };
-
- // keep element within constrained box
- ResizeHandler.prototype.constraintToBox = function (diffX, diffY, flag, pointCoordsY) {
- //return [diffX, diffY]
- var c = this.options.constraint || {};
- var orgX, orgY;
-
- if (typeof pointCoordsY !== 'undefined') {
- orgX = flag;
- orgY = pointCoordsY;
- } else {
- orgX = this.parameters.box.x + (flag & 1 ? 0 : this.parameters.box.width);
- orgY = this.parameters.box.y + (flag & (1<<1) ? 0 : this.parameters.box.height);
- }
-
- if (typeof c.minX !== 'undefined' && orgX + diffX < c.minX) {
- diffX = c.minX - orgX;
- }
-
- if (typeof c.maxX !== 'undefined' && orgX + diffX > c.maxX) {
- diffX = c.maxX - orgX;
- }
-
- if (typeof c.minY !== 'undefined' && orgY + diffY < c.minY) {
- diffY = c.minY - orgY;
- }
-
- if (typeof c.maxY !== 'undefined' && orgY + diffY > c.maxY) {
- diffY = c.maxY - orgY;
- }
-
- return [diffX, diffY];
- };
-
- SVG.extend(SVG.Element, {
- // Resize element with mouse
- resize: function (options) {
-
- (this.remember('_resizeHandler') || new ResizeHandler(this)).init(options || {});
-
- return this;
-
- }
-
- });
-
- SVG.Element.prototype.resize.defaults = {
- snapToAngle: 0.1, // Specifies the speed the rotation is happening when moving the mouse
- snapToGrid: 1, // Snaps to a grid of `snapToGrid` Pixels
- constraint: {} // keep element within constrained box
- };
-
-}).call(this);
-}());
diff --git a/cvat/apps/engine/static/engine/js/3rdparty/svg.resize.min.js b/cvat/apps/engine/static/engine/js/3rdparty/svg.resize.min.js
new file mode 100644
index 00000000..2dca34ba
--- /dev/null
+++ b/cvat/apps/engine/static/engine/js/3rdparty/svg.resize.min.js
@@ -0,0 +1 @@
+/*! svg.resize.js v1.4.3 MIT*/;!function(){"use strict";(function(){function t(t){t.remember("_resizeHandler",this),this.el=t,this.parameters={},this.lastUpdateCall=null,this.p=t.doc().node.createSVGPoint()}t.prototype.transformPoint=function(t,e,i){return this.p.x=t-(this.offset.x-window.pageXOffset),this.p.y=e-(this.offset.y-window.pageYOffset),this.p.matrixTransform(i||this.m)},t.prototype._extractPosition=function(t){return{x:null!=t.clientX?t.clientX:t.touches[0].clientX,y:null!=t.clientY?t.clientY:t.touches[0].clientY}},t.prototype.init=function(t){var e=this;if(this.stop(),"stop"!==t){this.options={};for(var i in this.el.resize.defaults)this.options[i]=this.el.resize.defaults[i],void 0!==t[i]&&(this.options[i]=t[i]);this.el.on("lt.resize",function(t){e.resize(t||window.event)}),this.el.on("rt.resize",function(t){e.resize(t||window.event)}),this.el.on("rb.resize",function(t){e.resize(t||window.event)}),this.el.on("lb.resize",function(t){e.resize(t||window.event)}),this.el.on("t.resize",function(t){e.resize(t||window.event)}),this.el.on("r.resize",function(t){e.resize(t||window.event)}),this.el.on("b.resize",function(t){e.resize(t||window.event)}),this.el.on("l.resize",function(t){e.resize(t||window.event)}),this.el.on("rot.resize",function(t){e.resize(t||window.event)}),this.el.on("point.resize",function(t){e.resize(t||window.event)}),this.update()}},t.prototype.stop=function(){return this.el.off("lt.resize"),this.el.off("rt.resize"),this.el.off("rb.resize"),this.el.off("lb.resize"),this.el.off("t.resize"),this.el.off("r.resize"),this.el.off("b.resize"),this.el.off("l.resize"),this.el.off("rot.resize"),this.el.off("point.resize"),this},t.prototype.resize=function(t){var e=this;this.m=this.el.node.getScreenCTM().inverse(),this.offset={x:window.pageXOffset,y:window.pageYOffset};var i=this._extractPosition(t.detail.event);if(this.parameters={type:this.el.type,p:this.transformPoint(i.x,i.y),x:t.detail.x,y:t.detail.y,box:this.el.bbox(),rotation:this.el.transform().rotation},"text"===this.el.type&&(this.parameters.fontSize=this.el.attr()["font-size"]),void 0!==t.detail.i){var s=this.el.array().valueOf();this.parameters.i=t.detail.i,this.parameters.pointCoords=[s[t.detail.i][0],s[t.detail.i][1]]}switch(t.type){case"lt":this.calc=function(t,e){var i=this.snapToGrid(t,e);if(this.parameters.box.width-i[0]>0&&this.parameters.box.height-i[1]>0){if("text"===this.parameters.type)return this.el.move(this.parameters.box.x+i[0],this.parameters.box.y),void this.el.attr("font-size",this.parameters.fontSize-i[0]);i=this.checkAspectRatio(i),this.el.move(this.parameters.box.x+i[0],this.parameters.box.y+i[1]).size(this.parameters.box.width-i[0],this.parameters.box.height-i[1])}};break;case"rt":this.calc=function(t,e){var i=this.snapToGrid(t,e,2);if(this.parameters.box.width+i[0]>0&&this.parameters.box.height-i[1]>0){if("text"===this.parameters.type)return this.el.move(this.parameters.box.x-i[0],this.parameters.box.y),void this.el.attr("font-size",this.parameters.fontSize+i[0]);i=this.checkAspectRatio(i,!0),this.el.move(this.parameters.box.x,this.parameters.box.y+i[1]).size(this.parameters.box.width+i[0],this.parameters.box.height-i[1])}};break;case"rb":this.calc=function(t,e){var i=this.snapToGrid(t,e,0);if(this.parameters.box.width+i[0]>0&&this.parameters.box.height+i[1]>0){if("text"===this.parameters.type)return this.el.move(this.parameters.box.x-i[0],this.parameters.box.y),void this.el.attr("font-size",this.parameters.fontSize+i[0]);i=this.checkAspectRatio(i),this.el.move(this.parameters.box.x,this.parameters.box.y).size(this.parameters.box.width+i[0],this.parameters.box.height+i[1])}};break;case"lb":this.calc=function(t,e){var i=this.snapToGrid(t,e,1);if(this.parameters.box.width-i[0]>0&&this.parameters.box.height+i[1]>0){if("text"===this.parameters.type)return this.el.move(this.parameters.box.x+i[0],this.parameters.box.y),void this.el.attr("font-size",this.parameters.fontSize-i[0]);i=this.checkAspectRatio(i,!0),this.el.move(this.parameters.box.x+i[0],this.parameters.box.y).size(this.parameters.box.width-i[0],this.parameters.box.height+i[1])}};break;case"t":this.calc=function(t,e){var i=this.snapToGrid(t,e,2);if(this.parameters.box.height-i[1]>0){if("text"===this.parameters.type)return;this.el.move(this.parameters.box.x,this.parameters.box.y+i[1]).height(this.parameters.box.height-i[1])}};break;case"r":this.calc=function(t,e){var i=this.snapToGrid(t,e,0);if(this.parameters.box.width+i[0]>0){if("text"===this.parameters.type)return;this.el.move(this.parameters.box.x,this.parameters.box.y).width(this.parameters.box.width+i[0])}};break;case"b":this.calc=function(t,e){var i=this.snapToGrid(t,e,0);if(this.parameters.box.height+i[1]>0){if("text"===this.parameters.type)return;this.el.move(this.parameters.box.x,this.parameters.box.y).height(this.parameters.box.height+i[1])}};break;case"l":this.calc=function(t,e){var i=this.snapToGrid(t,e,1);if(this.parameters.box.width-i[0]>0){if("text"===this.parameters.type)return;this.el.move(this.parameters.box.x+i[0],this.parameters.box.y).width(this.parameters.box.width-i[0])}};break;case"rot":this.calc=function(t,e){var i={x:t+this.parameters.p.x,y:e+this.parameters.p.y},s=Math.atan2(this.parameters.p.y-this.parameters.box.y-this.parameters.box.height/2,this.parameters.p.x-this.parameters.box.x-this.parameters.box.width/2),r=Math.atan2(i.y-this.parameters.box.y-this.parameters.box.height/2,i.x-this.parameters.box.x-this.parameters.box.width/2),a=this.parameters.rotation+180*(r-s)/Math.PI+this.options.snapToAngle/2;this.el.center(this.parameters.box.cx,this.parameters.box.cy).rotate(a-a%this.options.snapToAngle,this.parameters.box.cx,this.parameters.box.cy)};break;case"point":this.calc=function(t,e){var i=this.snapToGrid(t,e,this.parameters.pointCoords[0],this.parameters.pointCoords[1]),s=this.el.array().valueOf();s[this.parameters.i][0]=this.parameters.pointCoords[0]+i[0],s[this.parameters.i][1]=this.parameters.pointCoords[1]+i[1],this.el.plot(s)}}this.el.fire("resizestart",{dx:this.parameters.x,dy:this.parameters.y,event:t}),SVG.on(window,"touchmove.resize",function(t){e.update(t||window.event)}),SVG.on(window,"touchend.resize",function(){e.done()}),SVG.on(window,"mousemove.resize",function(t){e.update(t||window.event)}),SVG.on(window,"mouseup.resize",function(){e.done()})},t.prototype.update=function(t){if(!t)return void(this.lastUpdateCall&&this.calc(this.lastUpdateCall[0],this.lastUpdateCall[1]));var e=this._extractPosition(t),i=this.transformPoint(e.x,e.y),s=i.x-this.parameters.p.x,r=i.y-this.parameters.p.y;this.lastUpdateCall=[s,r],this.calc(s,r),this.el.fire("resizing",{dx:s,dy:r,event:t})},t.prototype.done=function(){this.lastUpdateCall=null,SVG.off(window,"mousemove.resize"),SVG.off(window,"mouseup.resize"),SVG.off(window,"touchmove.resize"),SVG.off(window,"touchend.resize"),this.el.fire("resizedone")},t.prototype.snapToGrid=function(t,e,i,s){var r;return void 0!==s?r=[(i+t)%this.options.snapToGrid,(s+e)%this.options.snapToGrid]:(i=null==i?3:i,r=[(this.parameters.box.x+t+(1&i?0:this.parameters.box.width))%this.options.snapToGrid,(this.parameters.box.y+e+(2&i?0:this.parameters.box.height))%this.options.snapToGrid]),t<0&&(r[0]-=this.options.snapToGrid),e<0&&(r[1]-=this.options.snapToGrid),t-=Math.abs(r[0])o.maxX&&(t=o.maxX-r),void 0!==o.minY&&a+eo.maxY&&(e=o.maxY-a),[t,e]},t.prototype.checkAspectRatio=function(t,e){if(!this.options.saveAspectRatio)return t;var i=t.slice(),s=this.parameters.box.width/this.parameters.box.height,r=this.parameters.box.width+t[0],a=this.parameters.box.height-t[1],o=r/a;return os&&(i[0]=this.parameters.box.width-a*s,e&&(i[0]=-i[0])),i},SVG.extend(SVG.Element,{resize:function(e){return(this.remember("_resizeHandler")||new t(this)).init(e||{}),this}}),SVG.Element.prototype.resize.defaults={snapToAngle:.1,snapToGrid:1,constraint:{},saveAspectRatio:!1}}).call(this)}();
diff --git a/cvat/apps/engine/static/engine/js/annotationParser.js b/cvat/apps/engine/static/engine/js/annotationParser.js
index e34a780d..1f0cfc6d 100644
--- a/cvat/apps/engine/static/engine/js/annotationParser.js
+++ b/cvat/apps/engine/static/engine/js/annotationParser.js
@@ -5,103 +5,107 @@
*/
/* exported AnnotationParser */
-"use strict";
+
+/* global
+ PolyShapeModel:false
+ LabelsInfo:false
+*/
class AnnotationParser {
- constructor(job, labelsInfo, idGenerator) {
+ constructor(job, labelsInfo) {
this._parser = new DOMParser();
this._startFrame = job.start;
this._stopFrame = job.stop;
this._flipped = job.flipped;
this._im_meta = job.image_meta_data;
this._labelsInfo = labelsInfo;
- this._idGen = idGenerator;
}
_xmlParseError(parsedXML) {
- return parsedXML.getElementsByTagName("parsererror");
+ return parsedXML.getElementsByTagName('parsererror');
}
_getBoxPosition(box, frame) {
- frame = Math.min(frame - this._startFrame, this._im_meta['original_size'].length - 1);
- let im_w = this._im_meta['original_size'][frame].width;
- let im_h = this._im_meta['original_size'][frame].height;
+ frame = Math.min(frame - this._startFrame, this._im_meta.length - 1);
+ const imWidth = this._im_meta[frame].width;
+ const imHeight = this._im_meta[frame].height;
let xtl = +box.getAttribute('xtl');
let ytl = +box.getAttribute('ytl');
let xbr = +box.getAttribute('xbr');
let ybr = +box.getAttribute('ybr');
- if (xtl < 0 || ytl < 0 || xbr < 0 || ybr < 0 ||
- xtl > im_w || ytl > im_h || xbr > im_w || ybr > im_h) {
- let message = `Incorrect bb found in annotation file: xtl=${xtl} ytl=${ytl} xbr=${xbr} ybr=${ybr}. `;
- message += `Box out of range: ${im_w}x${im_h}`;
+ if (xtl < 0 || ytl < 0 || xbr < 0 || ybr < 0
+ || xtl > imWidth || ytl > imHeight || xbr > imWidth || ybr > imHeight) {
+ const message = `Incorrect bb found in annotation file: xtl=${xtl} `
+ + `ytl=${ytl} xbr=${xbr} ybr=${ybr}. `
+ + `Box out of range: ${imWidth}x${imHeight}`;
throw Error(message);
}
if (this._flipped) {
- let _xtl = im_w - xbr;
- let _xbr = im_w - xtl;
- let _ytl = im_h - ybr;
- let _ybr = im_h - ytl;
- xtl = _xtl;
- ytl = _ytl;
- xbr = _xbr;
- ybr = _ybr;
+ [xtl, ytl, xbr, ybr] = [
+ imWidth - xbr,
+ imWidth - xtl,
+ imHeight - ybr,
+ imHeight - ytl,
+ ];
}
- let occluded = +box.getAttribute('occluded');
- let z_order = box.getAttribute('z_order') || '0';
- return [xtl, ytl, xbr, ybr, occluded, +z_order];
+ const occluded = box.getAttribute('occluded');
+ const zOrder = box.getAttribute('z_order') || '0';
+ return [[xtl, ytl, xbr, ybr], +occluded, +zOrder];
}
_getPolyPosition(shape, frame) {
- frame = Math.min(frame - this._startFrame, this._im_meta['original_size'].length - 1);
- let im_w = this._im_meta['original_size'][frame].width;
- let im_h = this._im_meta['original_size'][frame].height;
+ frame = Math.min(frame - this._startFrame, this._im_meta.length - 1);
+ const imWidth = this._im_meta[frame].width;
+ const imHeight = this._im_meta[frame].height;
let points = shape.getAttribute('points').split(';').join(' ');
points = PolyShapeModel.convertStringToNumberArray(points);
- for (let point of points) {
- if (point.x < 0 || point.y < 0 || point.x > im_w || point.y > im_h) {
- let message = `Incorrect point found in annotation file x=${point.x} y=${point.y}. `;
- message += `Point out of range ${im_w}x${im_h}`;
+ for (const point of points) {
+ if (point.x < 0 || point.y < 0 || point.x > imWidth || point.y > imHeight) {
+ const message = `Incorrect point found in annotation file x=${point.x} `
+ + `y=${point.y}. Point out of range ${imWidth}x${imHeight}`;
throw Error(message);
}
if (this._flipped) {
- point.x = im_w - point.x;
- point.y = im_h - point.y;
+ point.x = imWidth - point.x;
+ point.y = imHeight - point.y;
}
}
- points = PolyShapeModel.convertNumberArrayToString(points);
- let occluded = +shape.getAttribute('occluded');
- let z_order = shape.getAttribute('z_order') || '0';
- return [points, occluded, +z_order];
+ points = points.reduce((acc, el) => {
+ acc.push(el.x, el.y);
+ return acc;
+ }, []);
+
+ const occluded = shape.getAttribute('occluded');
+ const zOrder = shape.getAttribute('z_order') || '0';
+ return [points, +occluded, +zOrder];
}
_getAttribute(labelId, attrTag) {
- let name = attrTag.getAttribute('name');
- let attrId = this._labelsInfo.attrIdOf(labelId, name);
+ const name = attrTag.getAttribute('name');
+ const attrId = this._labelsInfo.attrIdOf(labelId, name);
if (attrId === null) {
- throw Error('An unknown attribute found in the annotation file: ' + name);
+ throw Error(`An unknown attribute found in the annotation file: ${name}`);
}
- let attrInfo = this._labelsInfo.attrInfo(attrId);
- let value = this._labelsInfo.strToValues(attrInfo.type, attrTag.innerHTML)[0];
+ const attrInfo = this._labelsInfo.attrInfo(attrId);
+ const value = LabelsInfo.normalize(attrInfo.type, attrTag.textContent);
if (['select', 'radio'].includes(attrInfo.type) && !attrInfo.values.includes(value)) {
- throw Error('Incorrect attribute value found for "' + name + '" attribute: ' + value);
- }
- else if (attrInfo.type === 'number') {
- if (isNaN(+value)) {
- throw Error('Incorrect attribute value found for "' + name + '" attribute: ' + value + '. Value must be a number.');
- }
- else {
- let min = +attrInfo.values[0];
- let max = +attrInfo.values[1];
+ throw Error(`Incorrect attribute value found for "${name}" + attribute: "${value}"`);
+ } else if (attrInfo.type === 'number') {
+ if (Number.isNaN(+value)) {
+ throw Error(`Incorrect attribute value found for "${name}" attribute: "${value}". Value must be a number.`);
+ } else {
+ const min = +attrInfo.values[0];
+ const max = +attrInfo.values[1];
if (+value < min || +value > max) {
- throw Error('Number attribute value out of range for "' + name +'" attribute: ' + value);
+ throw Error(`Number attribute value out of range for "${name}" attribute: "${value}"`);
}
}
}
@@ -110,46 +114,48 @@ class AnnotationParser {
}
_getAttributeList(shape, labelId) {
- let attributeDict = {};
- let attributes = shape.getElementsByTagName('attribute');
- for (let attribute of attributes ) {
- let [id, value] = this._getAttribute(labelId, attribute);
+ const attributeDict = {};
+ const attributes = shape.getElementsByTagName('attribute');
+ for (const attribute of attributes) {
+ const [id, value] = this._getAttribute(labelId, attribute);
attributeDict[id] = value;
}
- let attributeList = [];
- for (let attrId in attributeDict) {
- attributeList.push({
- id: attrId,
- value: attributeDict[attrId],
- });
+ const attributeList = [];
+ for (const attrId in attributeDict) {
+ if (Object.prototype.hasOwnProperty.call(attributeDict, attrId)) {
+ attributeList.push({
+ spec_id: attrId,
+ value: attributeDict[attrId],
+ });
+ }
}
return attributeList;
}
- _getShapeFromPath(shape_type, tracks) {
- let result = [];
- for (let track of tracks) {
- let label = track.getAttribute('label');
- let group_id = track.getAttribute('group_id') || '0';
- let labelId = this._labelsInfo.labelIdOf(label);
+ _getShapeFromPath(shapeType, tracks) {
+ const result = [];
+ for (const track of tracks) {
+ const label = track.getAttribute('label');
+ const group = track.getAttribute('group_id') || '0';
+ const labelId = this._labelsInfo.labelIdOf(label);
if (labelId === null) {
throw Error(`An unknown label found in the annotation file: ${label}`);
}
- let shapes = Array.from(track.getElementsByTagName(shape_type));
- shapes.sort((a,b) => +a.getAttribute('frame') - + b.getAttribute('frame'));
+ const shapes = Array.from(track.getElementsByTagName(shapeType));
+ shapes.sort((a, b) => +a.getAttribute('frame') - +b.getAttribute('frame'));
while (shapes.length && +shapes[0].getAttribute('outside')) {
shapes.shift();
}
if (shapes.length === 2) {
- if (shapes[1].getAttribute('frame') - shapes[0].getAttribute('frame') === 1 &&
- !+shapes[0].getAttribute('outside') && +shapes[1].getAttribute('outside')) {
+ if (shapes[1].getAttribute('frame') - shapes[0].getAttribute('frame') === 1
+ && !+shapes[0].getAttribute('outside') && +shapes[1].getAttribute('outside')) {
shapes[0].setAttribute('label', label);
- shapes[0].setAttribute('group_id', group_id);
+ shapes[0].setAttribute('group_id', group);
result.push(shapes[0]);
}
}
@@ -159,87 +165,93 @@ class AnnotationParser {
}
_parseAnnotationData(xml) {
- let data = {
+ const data = {
boxes: [],
polygons: [],
polylines: [],
- points: []
+ points: [],
};
- let tracks = xml.getElementsByTagName('track');
- let parsed = {
- boxes: this._getShapeFromPath('box', tracks),
- polygons: this._getShapeFromPath('polygon', tracks),
- polylines: this._getShapeFromPath('polyline', tracks),
+ const tracks = xml.getElementsByTagName('track');
+ const parsed = {
+ box: this._getShapeFromPath('box', tracks),
+ polygon: this._getShapeFromPath('polygon', tracks),
+ polyline: this._getShapeFromPath('polyline', tracks),
points: this._getShapeFromPath('points', tracks),
};
+ const shapeTarget = {
+ box: 'boxes',
+ polygon: 'polygons',
+ polyline: 'polylines',
+ points: 'points',
+ };
- let images = xml.getElementsByTagName('image');
- for (let image of images) {
- let frame = image.getAttribute('id');
+ const images = xml.getElementsByTagName('image');
+ for (const image of images) {
+ const frame = image.getAttribute('id');
- for (let box of image.getElementsByTagName('box')) {
+ for (const box of image.getElementsByTagName('box')) {
box.setAttribute('frame', frame);
- parsed.boxes.push(box);
+ parsed.box.push(box);
}
- for (let polygon of image.getElementsByTagName('polygon')) {
+ for (const polygon of image.getElementsByTagName('polygon')) {
polygon.setAttribute('frame', frame);
- parsed.polygons.push(polygon);
+ parsed.polygon.push(polygon);
}
- for (let polyline of image.getElementsByTagName('polyline')) {
+ for (const polyline of image.getElementsByTagName('polyline')) {
polyline.setAttribute('frame', frame);
- parsed.polylines.push(polyline);
+ parsed.polyline.push(polyline);
}
- for (let points of image.getElementsByTagName('points')) {
+ for (const points of image.getElementsByTagName('points')) {
points.setAttribute('frame', frame);
parsed.points.push(points);
}
}
- for (let shape_type in parsed) {
- for (let shape of parsed[shape_type]) {
- let frame = +shape.getAttribute('frame');
- if (frame < this._startFrame || frame > this._stopFrame) continue;
+ for (const shapeType in parsed) {
+ if (Object.prototype.hasOwnProperty.call(parsed, shapeType)) {
+ for (const shape of parsed[shapeType]) {
+ const frame = +shape.getAttribute('frame');
+ if (frame < this._startFrame || frame > this._stopFrame) {
+ continue;
+ }
- let labelId = this._labelsInfo.labelIdOf(shape.getAttribute('label'));
- let groupId = shape.getAttribute('group_id') || "0";
- if (labelId === null) {
- throw Error('An unknown label found in the annotation file: ' + shape.getAttribute('label'));
- }
+ const labelId = this._labelsInfo.labelIdOf(shape.getAttribute('label'));
+ const group = shape.getAttribute('group_id') || '0';
+ if (labelId === null) {
+ throw Error(`An unknown label found in the annotation file: "${shape.getAttribute('label')}"`);
+ }
- let attributeList = this._getAttributeList(shape, labelId);
-
- if (shape_type === 'boxes') {
- let [xtl, ytl, xbr, ybr, occluded, z_order] = this._getBoxPosition(shape, frame);
- data.boxes.push({
- label_id: labelId,
- group_id: +groupId,
- frame: frame,
- occluded: occluded,
- xtl: xtl,
- ytl: ytl,
- xbr: xbr,
- ybr: ybr,
- z_order: z_order,
- attributes: attributeList,
- id: this._idGen.next(),
- });
- }
- else {
- let [points, occluded, z_order] = this._getPolyPosition(shape, frame);
- data[shape_type].push({
- label_id: labelId,
- group_id: +groupId,
- frame: frame,
- points: points,
- occluded: occluded,
- z_order: z_order,
- attributes: attributeList,
- id: this._idGen.next(),
- });
+ const attributeList = this._getAttributeList(shape, labelId);
+
+ if (shapeType === 'box') {
+ const [points, occluded, zOrder] = this._getBoxPosition(shape, frame);
+ data[shapeTarget[shapeType]].push({
+ label_id: labelId,
+ group: +group,
+ attributes: attributeList,
+ type: 'rectangle',
+ z_order: zOrder,
+ frame,
+ occluded,
+ points,
+ });
+ } else {
+ const [points, occluded, zOrder] = this._getPolyPosition(shape, frame);
+ data[shapeTarget[shapeType]].push({
+ label_id: labelId,
+ group: +group,
+ attributes: attributeList,
+ type: shapeType,
+ z_order: zOrder,
+ frame,
+ points,
+ occluded,
+ });
+ }
}
}
}
@@ -248,76 +260,81 @@ class AnnotationParser {
}
_parseInterpolationData(xml) {
- let data = {
+ const data = {
box_paths: [],
polygon_paths: [],
polyline_paths: [],
- points_paths: []
+ points_paths: [],
};
- let tracks = xml.getElementsByTagName('track');
- for (let track of tracks) {
- let labelId = this._labelsInfo.labelIdOf(track.getAttribute('label'));
- let groupId = track.getAttribute('group_id') || '0';
+ const tracks = xml.getElementsByTagName('track');
+ for (const track of tracks) {
+ const labelId = this._labelsInfo.labelIdOf(track.getAttribute('label'));
+ const group = track.getAttribute('group_id') || '0';
if (labelId === null) {
- throw Error('An unknown label found in the annotation file: ' + name);
+ throw Error(`An unknown label found in the annotation file: "${track.getAttribute('label')}"`);
}
- let parsed = {
- boxes: Array.from(track.getElementsByTagName('box')),
- polygons: Array.from(track.getElementsByTagName('polygon')),
- polylines: Array.from(track.getElementsByTagName('polyline')),
+ const parsed = {
+ box: Array.from(track.getElementsByTagName('box')),
+ polygon: Array.from(track.getElementsByTagName('polygon')),
+ polyline: Array.from(track.getElementsByTagName('polyline')),
points: Array.from(track.getElementsByTagName('points')),
};
- for (let shape_type in parsed) {
- let shapes = parsed[shape_type];
- shapes.sort((a,b) => +a.getAttribute('frame') - + b.getAttribute('frame'));
+ for (const shapeType in parsed) {
+ if (Object.prototype.hasOwnProperty.call(parsed, shapeType)) {
+ const shapes = parsed[shapeType];
+ shapes.sort((a, b) => +a.getAttribute('frame') - +b.getAttribute('frame'));
- while (shapes.length && +shapes[0].getAttribute('outside')) {
- shapes.shift();
- }
+ while (shapes.length && +shapes[0].getAttribute('outside')) {
+ shapes.shift();
+ }
- if (shapes.length === 2) {
- if (shapes[1].getAttribute('frame') - shapes[0].getAttribute('frame') === 1 &&
- !+shapes[0].getAttribute('outside') && +shapes[1].getAttribute('outside')) {
- parsed[shape_type] = []; // pseudo interpolation track (actually is annotation)
+ if (shapes.length === 2) {
+ if (shapes[1].getAttribute('frame') - shapes[0].getAttribute('frame') === 1
+ && !+shapes[0].getAttribute('outside') && +shapes[1].getAttribute('outside')) {
+ // pseudo interpolation track (actually is annotation)
+ parsed[shapeType] = [];
+ }
}
}
}
- let type = null, target = null;
- if (parsed.boxes.length) {
- type = 'boxes';
+ let type = null;
+ let target = null;
+ if (parsed.box.length) {
+ type = 'box';
target = 'box_paths';
- }
- else if (parsed.polygons.length) {
- type = 'polygons';
+ } else if (parsed.polygon.length) {
+ type = 'polygon';
target = 'polygon_paths';
- }
- else if (parsed.polylines.length) {
- type = 'polylines';
+ } else if (parsed.polyline.length) {
+ type = 'polyline';
target = 'polyline_paths';
- }
- else if (parsed.points.length) {
+ } else if (parsed.points.length) {
type = 'points';
target = 'points_paths';
+ } else {
+ continue;
}
- else continue;
- let path = {
+ const path = {
label_id: labelId,
- group_id: +groupId,
+ group: +group,
frame: +parsed[type][0].getAttribute('frame'),
attributes: [],
shapes: [],
- id: this._idGen.next(),
};
- for (let shape of parsed[type]) {
- let keyFrame = +shape.getAttribute('keyframe');
- let outside = +shape.getAttribute('outside');
- let frame = +shape.getAttribute('frame');
+ if (path.frame < this._startFrame || path.frame > this._stopFrame) {
+ continue;
+ }
+
+ for (const shape of parsed[type]) {
+ const keyFrame = +shape.getAttribute('keyframe');
+ const outside = +shape.getAttribute('outside');
+ const frame = +shape.getAttribute('frame');
/*
All keyframes are significant.
@@ -325,53 +342,53 @@ class AnnotationParser {
Ignore all frames less then start.
Ignore all frames more then stop.
*/
- let significant = keyFrame || frame === this._startFrame;
+ const significant = (keyFrame || frame === this._startFrame)
+ && frame >= this._startFrame && frame <= this._stopFrame;
if (significant) {
- let attributeList = this._getAttributeList(shape, labelId);
- let shapeAttributes = [];
- let pathAttributes = [];
+ const attributeList = this._getAttributeList(shape, labelId);
+ const shapeAttributes = [];
+ const pathAttributes = [];
- for (let attr of attributeList) {
- let attrInfo = this._labelsInfo.attrInfo(attr.id);
+ for (const attr of attributeList) {
+ const attrInfo = this._labelsInfo.attrInfo(attr.spec_id);
if (attrInfo.mutable) {
shapeAttributes.push({
- id: attr.id,
+ spec_id: attr.spec_id,
value: attr.value,
});
- }
- else {
+ } else {
pathAttributes.push({
- id: attr.id,
+ spec_id: attr.spec_id,
value: attr.value,
});
}
}
path.attributes = pathAttributes;
- if (type === 'boxes') {
- let [xtl, ytl, xbr, ybr, occluded, z_order] = this._getBoxPosition(shape, Math.clamp(frame, this._startFrame, this._stopFrame));
+ if (type === 'box') {
+ const [points, occluded, zOrder] = this._getBoxPosition(shape,
+ Math.clamp(frame, this._startFrame, this._stopFrame));
path.shapes.push({
- frame: frame,
- occluded: occluded,
- outside: outside,
- xtl: xtl,
- ytl: ytl,
- xbr: xbr,
- ybr: ybr,
- z_order: z_order,
attributes: shapeAttributes,
+ type: 'rectangle',
+ frame,
+ occluded,
+ outside,
+ points,
+ zOrder,
});
- }
- else {
- let [points, occluded, z_order] = this._getPolyPosition(shape, Math.clamp(frame, this._startFrame, this._stopFrame));
+ } else {
+ const [points, occluded, zOrder] = this._getPolyPosition(shape,
+ Math.clamp(frame, this._startFrame, this._stopFrame));
path.shapes.push({
- frame: frame,
- occluded: occluded,
- outside: outside,
- points: points,
- z_order: z_order,
attributes: shapeAttributes,
+ type,
+ frame,
+ occluded,
+ outside,
+ points,
+ zOrder,
});
}
}
@@ -386,14 +403,33 @@ class AnnotationParser {
}
parse(text) {
- let xml = this._parser.parseFromString(text, 'text/xml');
- let parseerror = this._xmlParseError(xml);
+ const xml = this._parser.parseFromString(text, 'text/xml');
+ const parseerror = this._xmlParseError(xml);
if (parseerror.length) {
- throw Error('Annotation page parsing error. ' + parseerror[0].innerText);
+ throw Error(`Annotation page parsing error. ${parseerror[0].innerText}`);
}
- let interpolationData = this._parseInterpolationData(xml);
- let annotationData = this._parseAnnotationData(xml);
- return Object.assign({}, annotationData, interpolationData);
+ const interpolationData = this._parseInterpolationData(xml);
+ const annotationData = this._parseAnnotationData(xml);
+
+ const data = {
+ shapes: [],
+ tracks: [],
+ };
+
+
+ for (const type in interpolationData) {
+ if (Object.prototype.hasOwnProperty.call(interpolationData, type)) {
+ Array.prototype.push.apply(data.tracks, interpolationData[type]);
+ }
+ }
+
+ for (const type in annotationData) {
+ if (Object.prototype.hasOwnProperty.call(annotationData, type)) {
+ Array.prototype.push.apply(data.shapes, annotationData[type]);
+ }
+ }
+
+ return data;
}
}
diff --git a/cvat/apps/engine/static/engine/js/annotationSaver.js b/cvat/apps/engine/static/engine/js/annotationSaver.js
new file mode 100644
index 00000000..5a034eda
--- /dev/null
+++ b/cvat/apps/engine/static/engine/js/annotationSaver.js
@@ -0,0 +1,402 @@
+/* exported buildAnnotationSaver */
+
+/* global
+ showOverlay:false
+ showMessage:false
+ Listener:false
+ Logger:false
+ Mousetrap:false
+*/
+
+
+class AnnotationSaverModel extends Listener {
+ constructor(initialData, shapeCollection) {
+ super('onAnnotationSaverUpdate', () => this._state);
+
+ this._state = {
+ status: null,
+ message: null,
+ };
+
+ this._version = initialData.version;
+ this._shapeCollection = shapeCollection;
+ this._initialObjects = [];
+
+ this._hash = this._getHash();
+
+ // We need use data from export instead of initialData
+ // Otherwise we have differ keys order and JSON comparison code incorrect
+ const data = this._shapeCollection.export()[0];
+ for (const shape of data.shapes) {
+ this._initialObjects[shape.id] = shape;
+ }
+
+ for (const track of data.tracks) {
+ this._initialObjects[track.id] = track;
+ }
+ }
+
+ async _request(data, action) {
+ return new Promise((resolve, reject) => {
+ $.ajax({
+ url: `/api/v1/jobs/${window.cvat.job.id}/annotations?action=${action}`,
+ type: 'PATCH',
+ data: JSON.stringify(data),
+ contentType: 'application/json',
+ }).done((savedData) => {
+ resolve(savedData);
+ }).fail((errorData) => {
+ const message = `Could not make ${action} annotations. Code: ${errorData.status}. `
+ + `Message: ${errorData.responseText || errorData.statusText}`;
+ reject(new Error(message));
+ });
+ });
+ }
+
+ async _put(data) {
+ return new Promise((resolve, reject) => {
+ $.ajax({
+ url: `/api/v1/jobs/${window.cvat.job.id}/annotations`,
+ type: 'PUT',
+ data: JSON.stringify(data),
+ contentType: 'application/json',
+ }).done((savedData) => {
+ resolve(savedData);
+ }).fail((errorData) => {
+ const message = `Could not put annotations. Code: ${errorData.status}. `
+ + `Message: ${errorData.responseText || errorData.statusText}`;
+ reject(new Error(message));
+ });
+ });
+ }
+
+ async _create(created) {
+ return this._request(created, 'create');
+ }
+
+ async _update(updated) {
+ return this._request(updated, 'update');
+ }
+
+ async _delete(deleted) {
+ return this._request(deleted, 'delete');
+ }
+
+ async _logs() {
+ Logger.addEvent(Logger.EventType.saveJob);
+ const totalStat = this._shapeCollection.collectStatistic()[1];
+ Logger.addEvent(Logger.EventType.sendTaskInfo, {
+ 'track count': totalStat.boxes.annotation + totalStat.boxes.interpolation
+ + totalStat.polygons.annotation + totalStat.polygons.interpolation
+ + totalStat.polylines.annotation + totalStat.polylines.interpolation
+ + totalStat.points.annotation + totalStat.points.interpolation,
+ 'frame count': window.cvat.player.frames.stop - window.cvat.player.frames.start + 1,
+ 'object count': totalStat.total,
+ 'box count': totalStat.boxes.annotation + totalStat.boxes.interpolation,
+ 'polygon count': totalStat.polygons.annotation + totalStat.polygons.interpolation,
+ 'polyline count': totalStat.polylines.annotation + totalStat.polylines.interpolation,
+ 'points count': totalStat.points.annotation + totalStat.points.interpolation,
+ });
+
+ const annotationLogs = Logger.getLogs();
+
+ return new Promise((resolve, reject) => {
+ $.ajax({
+ url: '/api/v1/server/logs',
+ type: 'POST',
+ data: JSON.stringify(annotationLogs.export()),
+ contentType: 'application/json',
+ }).done(() => {
+ resolve();
+ }).fail((errorData) => {
+ annotationLogs.save();
+ const message = `Could not send logs. Code: ${errorData.status}. `
+ + `Message: ${errorData.responseText || errorData.statusText}`;
+ reject(new Error(message));
+ });
+ });
+ }
+
+ _split(exported) {
+ const exportedIDs = Array.from(exported.shapes, shape => +shape.id)
+ .concat(Array.from(exported.tracks, track => +track.id));
+
+ const created = {
+ version: this._version,
+ shapes: [],
+ tracks: [],
+ tags: [],
+ };
+
+ const updated = {
+ version: this._version + 1,
+ shapes: [],
+ tracks: [],
+ tags: [],
+ };
+
+ const deleted = {
+ version: this._version + 2,
+ shapes: [],
+ tracks: [],
+ tags: [],
+ };
+
+ // Compare initial state objects and export state objects
+ // in order to get updated and created objects
+ for (const obj of exported.shapes.concat(exported.tracks)) {
+ if (obj.id in this._initialObjects) {
+ const exportedHash = JSON.stringify(obj);
+ const initialSash = JSON.stringify(this._initialObjects[obj.id]);
+ if (exportedHash !== initialSash) {
+ const target = 'shapes' in obj ? updated.tracks : updated.shapes;
+ target.push(obj);
+ }
+ } else if (typeof obj.id === 'undefined') {
+ const target = 'shapes' in obj ? created.tracks : created.shapes;
+ target.push(obj);
+ } else {
+ throw Error(`Bad object ID found: ${obj.id}. `
+ + 'It is not contained in initial state and have server ID');
+ }
+ }
+
+ // Compare initial state indexes and export state indexes
+ // in order to get removed objects
+ for (const shapeID in this._initialObjects) {
+ if (!exportedIDs.includes(+shapeID)) {
+ const initialShape = this._initialObjects[shapeID];
+ const target = 'shapes' in initialShape ? deleted.tracks : deleted.shapes;
+ target.push(initialShape);
+ }
+ }
+
+ return [created, updated, deleted];
+ }
+
+ _getHash() {
+ const exported = this._shapeCollection.export()[0];
+ return JSON.stringify(exported);
+ }
+
+ _updateCreatedObjects(objectsToSave, savedObjects, mapping) {
+ // Method setups IDs of created objects after saving on a server
+ const allSavedObjects = savedObjects.shapes.concat(savedObjects.tracks);
+ const allObjectsToSave = objectsToSave.shapes.concat(objectsToSave.tracks);
+ if (allSavedObjects.length !== allObjectsToSave.length) {
+ throw Error('Number of saved objects and objects to save is not match');
+ }
+
+ for (let idx = 0; idx < allSavedObjects.length; idx += 1) {
+ const objectModel = mapping.filter(el => el[0] === allObjectsToSave[idx])[0][1];
+ const { id } = allSavedObjects[idx];
+ objectModel.serverID = id;
+ allObjectsToSave[idx].id = id;
+ }
+
+ this._shapeCollection.update();
+ }
+
+ notify(status, message = null) {
+ this._state.status = status;
+ this._state.message = message;
+ Listener.prototype.notify.call(this);
+ }
+
+ hasUnsavedChanges() {
+ return this._getHash() !== this._hash;
+ }
+
+ async save() {
+ this.notify('saveStart');
+ try {
+ const [exported, mapping] = this._shapeCollection.export();
+ const { flush } = this._shapeCollection;
+ if (flush) {
+ const data = Object.assign({}, exported, {
+ version: this._version,
+ tags: [],
+ });
+
+ this._version += 1;
+
+ this.notify('saveCreated');
+ const savedObjects = await this._put(data);
+ this._updateCreatedObjects(exported, savedObjects, mapping);
+ this._shapeCollection.flush = false;
+ this._version = savedObjects.version;
+ for (const object of savedObjects.shapes.concat(savedObjects.tracks)) {
+ this._initialObjects[object.id] = object;
+ }
+
+ this._version = savedObjects.version;
+ } else {
+ const [created, updated, deleted] = this._split(exported);
+ this.notify('saveCreated');
+ const savedCreated = await this._create(created);
+ this._updateCreatedObjects(created, savedCreated, mapping);
+ this._version = savedCreated.version;
+ for (const object of created.shapes.concat(created.tracks)) {
+ this._initialObjects[object.id] = object;
+ }
+
+ this.notify('saveUpdated');
+ const savedUpdated = await this._update(updated);
+ this._version = savedUpdated.version;
+ for (const object of updated.shapes.concat(updated.tracks)) {
+ if (object.id in this._initialObjects) {
+ this._initialObjects[object.id] = object;
+ }
+ }
+
+ this.notify('saveDeleted');
+ const savedDeleted = await this._delete(deleted);
+ this._version = savedDeleted.version;
+ for (const object of savedDeleted.shapes.concat(savedDeleted.tracks)) {
+ if (object.id in this._initialObjects) {
+ delete this._initialObjects[object.id];
+ }
+ }
+
+ this._version = savedDeleted.version;
+ }
+
+ await this._logs();
+ } catch (error) {
+ this.notify('saveUnlocked');
+ this.notify('saveError', error.message);
+ this._state = {
+ status: null,
+ message: null,
+ };
+ throw Error(error);
+ }
+
+ this._hash = this._getHash();
+ this.notify('saveDone');
+
+ setTimeout(() => {
+ this.notify('saveUnlocked');
+ this._state = {
+ status: null,
+ message: null,
+ };
+ }, 1000);
+ }
+
+ get state() {
+ return JSON.parse(JSON.stringify(this._state));
+ }
+}
+
+class AnnotationSaverController {
+ constructor(model) {
+ this._model = model;
+ this._autoSaveInterval = null;
+
+ const { shortkeys } = window.cvat.config;
+ Mousetrap.bind(shortkeys.save_work.value, () => {
+ this.save();
+ return false;
+ }, 'keydown');
+ }
+
+ autoSave(enabled, time) {
+ if (this._autoSaveInterval) {
+ clearInterval(this._autoSaveInterval);
+ this._autoSaveInterval = null;
+ }
+
+ if (enabled) {
+ this._autoSaveInterval = setInterval(() => {
+ this.save();
+ }, time * 1000 * 60);
+ }
+ }
+
+ hasUnsavedChanges() {
+ return this._model.hasUnsavedChanges();
+ }
+
+ save() {
+ if (this._model.state.status === null) {
+ this._model.save().catch((error) => {
+ setTimeout(() => {
+ throw error;
+ });
+ });
+ }
+ }
+}
+
+
+class AnnotationSaverView {
+ constructor(model, controller) {
+ model.subscribe(this);
+
+ this._controller = controller;
+ this._overlay = null;
+
+ const { shortkeys } = window.cvat.config;
+ const saveHelp = `${shortkeys.save_work.view_value} - ${shortkeys.save_work.description}`;
+
+ this._saveButton = $('#saveButton').on('click', () => {
+ this._controller.save();
+ }).attr('title', saveHelp);
+
+ this._autoSaveBox = $('#autoSaveBox').on('change', (e) => {
+ const enabled = e.target.checked;
+ const time = +this._autoSaveTime.prop('value');
+ this._controller.autoSave(enabled, time);
+ });
+
+ this._autoSaveTime = $('#autoSaveTime').on('change', (e) => {
+ e.target.value = Math.clamp(+e.target.value, +e.target.min, +e.target.max);
+ this._autoSaveBox.trigger('change');
+ });
+
+ window.onbeforeunload = (e) => {
+ if (this._controller.hasUnsavedChanges()) { // eslint-disable-line react/no-this-in-sfc
+ const message = 'You have unsaved changes. Leave this page?';
+ e.returnValue = message;
+ return message;
+ }
+ return null;
+ };
+ }
+
+ onAnnotationSaverUpdate(state) {
+ if (state.status === 'saveStart') {
+ this._overlay = showOverlay('Annotations are being saved..');
+ this._saveButton.prop('disabled', true).text('Saving..');
+ } else if (state.status === 'saveDone') {
+ this._saveButton.text('Successful save');
+ this._overlay.remove();
+ } else if (state.status === 'saveError') {
+ this._saveButton.prop('disabled', false).text('Save Work');
+ const message = `Couldn't to save the job. Errors occured: ${state.message}. `
+ + 'Please report the problem to support team immediately.';
+ showMessage(message);
+ this._overlay.remove();
+ } else if (state.status === 'saveCreated') {
+ this._overlay.setMessage(`${this._overlay.getMessage()}
- Created objects are being saved..`); + } else if (state.status === 'saveUpdated') { + this._overlay.setMessage(`${this._overlay.getMessage()}
- Updated objects are being saved..`); + } else if (state.status === 'saveDeleted') { + this._overlay.setMessage(`${this._overlay.getMessage()}
- Deleted objects are being saved..`); + } else if (state.status === 'saveUnlocked') { + this._saveButton.prop('disabled', false).text('Save Work'); + } else { + const message = `Unknown state has been reached during annotation saving: ${state.status} ` + + 'Please report the problem to support team immediately.'; + showMessage(message); + } + } +} + + +function buildAnnotationSaver(initialData, shapeCollection) { + const model = new AnnotationSaverModel(initialData, shapeCollection); + const controller = new AnnotationSaverController(model); + new AnnotationSaverView(model, controller); +} diff --git a/cvat/apps/engine/static/engine/js/annotationUI.js b/cvat/apps/engine/static/engine/js/annotationUI.js index 53a0edca..1044fb25 100644 --- a/cvat/apps/engine/static/engine/js/annotationUI.js +++ b/cvat/apps/engine/static/engine/js/annotationUI.js @@ -5,289 +5,167 @@ */ /* exported callAnnotationUI blurAllElements drawBoxSize copyToClipboard */ -"use strict"; -function callAnnotationUI(jid) { - initLogger(jid); - let loadJobEvent = Logger.addContinuedEvent(Logger.EventType.loadJob); - serverRequest("/get/job/" + jid, function(job) { - serverRequest("get/annotation/job/" + jid, function(data) { - $('#loadingOverlay').remove(); - setTimeout(() => { - buildAnnotationUI(job, data, loadJobEvent); - }, 0); - }); - }); -} - -function initLogger(jobID) { - if (!Logger.initializeLogger('CVAT', jobID)) - { - let message = 'Could not initialize Logger. Please immediately report the problem to support team'; +/* global + AAMController:false + AAMModel:false + AAMView:false + AnnotationParser:false + Config:false + userConfirm:false + CoordinateTranslator:false + dumpAnnotationRequest:false + HistoryController:false + HistoryModel:false + HistoryView:false + Logger:false + Mousetrap:false + PlayerController:false + PlayerModel:false + PlayerView:false + PolyshapeEditorController:false + PolyshapeEditorModel:false + PolyshapeEditorView:false + PolyShapeView:false + ShapeBufferController:false + ShapeBufferModel:false + ShapeBufferView:false + ShapeCollectionController:false + ShapeCollectionModel:false + ShapeCollectionView:false + ShapeCreatorController:false + ShapeCreatorModel:false + ShapeCreatorView:false + ShapeGrouperController:false + ShapeGrouperModel:false + ShapeGrouperView:false + ShapeMergerController:false + ShapeMergerModel:false + ShapeMergerView:false + showMessage:false + showOverlay:false + buildAnnotationSaver:false + LabelsInfo:false +*/ + +async function initLogger(jobID) { + if (!Logger.initializeLogger(jobID)) { + const message = 'Logger has been already initialized'; console.error(message); showMessage(message); return; } Logger.setTimeThreshold(Logger.EventType.zoomImage); +} - serverRequest('/get/username', function(response) { - Logger.setUsername(response.username); - }); + +function blurAllElements() { + document.activeElement.blur(); } -function buildAnnotationUI(job, shapeData, loadJobEvent) { - // Setup some API - window.cvat = { - labelsInfo: new LabelsInfo(job), - translate: new CoordinateTranslator(), - player: { - geometry: { - scale: 1, - }, - frames: { - current: job.start, - start: job.start, - stop: job.stop, - } - }, - mode: null, - job: { - z_order: job.z_order, - id: job.jobid, - images: job.image_meta_data, - }, - search: { - value: window.location.search, - set: function(name, value) { - let searchParams = new URLSearchParams(this.value); +function uploadAnnotation(shapeCollectionModel, historyModel, + annotationParser, uploadAnnotationButton) { + $('#annotationFileSelector').one('change', (changedFileEvent) => { + const file = changedFileEvent.target.files['0']; + changedFileEvent.target.value = ''; + if (!file || file.type !== 'text/xml') return; + uploadAnnotationButton.text('Preparing..'); + uploadAnnotationButton.prop('disabled', true); + const overlay = showOverlay('File is being uploaded..'); - if (typeof value === 'undefined' || value === null) { - if (searchParams.has(name)) { - searchParams.delete(name); - } - } - else searchParams.set(name, value); - this.value = `${searchParams.toString()}`; - }, + const fileReader = new FileReader(); + fileReader.onload = (loadedFileEvent) => { + let data = null; - get: function(name) { + const asyncParse = () => { try { - let decodedURI = decodeURIComponent(this.value); - let urlSearchParams = new URLSearchParams(decodedURI); - if (urlSearchParams.has(name)) { - return urlSearchParams.get(name); - } - else return null; - } - catch (error) { - showMessage('Bad URL has been found'); - this.value = window.location.href; - return null; + data = annotationParser.parse(loadedFileEvent.target.result); + } catch (err) { + overlay.remove(); + showMessage(err.message); + return; + } finally { + uploadAnnotationButton.text('Upload Annotation'); + uploadAnnotationButton.prop('disabled', false); } - }, - - toString: function() { - return `${window.location.origin}/?${this.value}`; - } - } - }; - - // Remove external search parameters from url - window.history.replaceState(null, null, `${window.location.origin}/?id=${job.jobid}`); - - window.cvat.config = new Config(); - - // Setup components - let idGenerator = new IncrementIdGenerator(job.max_shape_id + 1); - let annotationParser = new AnnotationParser(job, window.cvat.labelsInfo, idGenerator); - - let shapeCollectionModel = new ShapeCollectionModel(idGenerator).import(shapeData, true); - let shapeCollectionController = new ShapeCollectionController(shapeCollectionModel); - let shapeCollectionView = new ShapeCollectionView(shapeCollectionModel, shapeCollectionController); - - // In case of old tasks that dont provide max saved shape id properly - if (job.max_shape_id === -1) { - idGenerator.reset(shapeCollectionModel.maxId + 1); - } - - window.cvat.data = { - get: () => shapeCollectionModel.exportAll(), - set: (data) => { - shapeCollectionModel.empty(); - shapeCollectionModel.import(data, false); - shapeCollectionModel.update(); - }, - clear: () => shapeCollectionModel.empty(), - }; - - let shapeBufferModel = new ShapeBufferModel(shapeCollectionModel); - let shapeBufferController = new ShapeBufferController(shapeBufferModel); - let shapeBufferView = new ShapeBufferView(shapeBufferModel, shapeBufferController); - - $('#shapeModeSelector').prop('value', job.mode); - let shapeCreatorModel = new ShapeCreatorModel(shapeCollectionModel, job); - let shapeCreatorController = new ShapeCreatorController(shapeCreatorModel); - let shapeCreatorView = new ShapeCreatorView(shapeCreatorModel, shapeCreatorController); - - let polyshapeEditorModel = new PolyshapeEditorModel(); - let polyshapeEditorController = new PolyshapeEditorController(polyshapeEditorModel); - let polyshapeEditorView = new PolyshapeEditorView(polyshapeEditorModel, polyshapeEditorController); - - // Add static member for class. It will be used by all polyshapes. - PolyShapeView.editor = polyshapeEditorModel; - - let shapeMergerModel = new ShapeMergerModel(shapeCollectionModel); - let shapeMergerController = new ShapeMergerController(shapeMergerModel); - new ShapeMergerView(shapeMergerModel, shapeMergerController); - - let shapeGrouperModel = new ShapeGrouperModel(shapeCollectionModel); - let shapeGrouperController = new ShapeGrouperController(shapeGrouperModel); - let shapeGrouperView = new ShapeGrouperView(shapeGrouperModel, shapeGrouperController); - - let aamModel = new AAMModel(shapeCollectionModel, (xtl, xbr, ytl, ybr) => { - playerModel.focus(xtl, xbr, ytl, ybr); - }, () => { - playerModel.fit(); - }); - let aamController = new AAMController(aamModel); - new AAMView(aamModel, aamController); - - shapeCreatorModel.subscribe(shapeCollectionModel); - shapeGrouperModel.subscribe(shapeCollectionView); - shapeCollectionModel.subscribe(shapeGrouperModel); - - $('#playerProgress').css('width', $('#player')["0"].clientWidth - 420); - - let playerGeometry = { - width: $('#playerFrame').width(), - height: $('#playerFrame').height(), - }; - let playerModel = new PlayerModel(job, playerGeometry); - let playerController = new PlayerController(playerModel, - () => shapeCollectionModel.activeShape, - (direction) => shapeCollectionModel.find(direction), - Object.assign({}, playerGeometry, { - left: $('#playerFrame').offset().left, - top: $('#playerFrame').offset().top, - }), job); - new PlayerView(playerModel, playerController, job); - - let historyModel = new HistoryModel(playerModel); - let historyController = new HistoryController(historyModel); - new HistoryView(historyController, historyModel); - - playerModel.subscribe(shapeCollectionModel); - playerModel.subscribe(shapeCollectionView); - playerModel.subscribe(shapeCreatorView); - playerModel.subscribe(shapeBufferView); - playerModel.subscribe(shapeGrouperView); - playerModel.subscribe(polyshapeEditorView); - playerModel.shift(window.cvat.search.get('frame') || 0, true); - - let shortkeys = window.cvat.config.shortkeys; - - setupHelpWindow(shortkeys); - setupSettingsWindow(); - setupMenu(job, shapeCollectionModel, annotationParser, aamModel, playerModel, historyModel); - setupFrameFilters(); - setupShortkeys(shortkeys, { - aam: aamModel, - shapeCreator: shapeCreatorModel, - shapeMerger: shapeMergerModel, - shapeGrouper: shapeGrouperModel, - shapeBuffer: shapeBufferModel, - shapeEditor: polyshapeEditorModel - }); - - $(window).on('click', function(event) { - Logger.updateUserActivityTimer(); - if (['helpWindow', 'settingsWindow'].indexOf(event.target.id) != -1) { - event.target.classList.add('hidden'); - } - }); - - let totalStat = shapeCollectionModel.collectStatistic()[1]; - loadJobEvent.addValues({ - 'track count': totalStat.boxes.annotation + totalStat.boxes.interpolation + - totalStat.polygons.annotation + totalStat.polygons.interpolation + - totalStat.polylines.annotation + totalStat.polylines.interpolation + - totalStat.points.annotation + totalStat.points.interpolation, - 'frame count': job.stop - job.start + 1, - 'object count': totalStat.total, - 'box count': totalStat.boxes.annotation + totalStat.boxes.interpolation, - 'polygon count': totalStat.polygons.annotation + totalStat.polygons.interpolation, - 'polyline count': totalStat.polylines.annotation + totalStat.polylines.interpolation, - 'points count': totalStat.points.annotation + totalStat.points.interpolation, - }); - loadJobEvent.close(); - - window.onbeforeunload = function(e) { - if (shapeCollectionModel.hasUnsavedChanges()) { - let message = "You have unsaved changes. Leave this page?"; - e.returnValue = message; - return message; - } - return; - }; - - $('#player').on('click', (e) => { - if (e.target.tagName.toLowerCase() != 'input') { - blurAllElements(); - } - }); -} + const asyncImport = () => { + try { + historyModel.empty(); + shapeCollectionModel.empty(); + shapeCollectionModel.import(data); + shapeCollectionModel.update(); + } finally { + overlay.remove(); + } + }; + overlay.setMessage('Data are being imported..'); + setTimeout(asyncImport); + }; -function copyToClipboard(text) { - let tempInput = $(""); - $("body").append(tempInput); - tempInput.prop('value', text).select(); - document.execCommand("copy"); - tempInput.remove(); + overlay.setMessage('File is being parsed..'); + setTimeout(asyncParse); + }; + fileReader.readAsText(file); + }).click(); } function setupFrameFilters() { - let brightnessRange = $('#playerBrightnessRange'); - let contrastRange = $('#playerContrastRange'); - let saturationRange = $('#playerSaturationRange'); - let frameBackground = $('#frameBackground'); - let reset = $('#resetPlayerFilterButton'); + const brightnessRange = $('#playerBrightnessRange'); + const contrastRange = $('#playerContrastRange'); + const saturationRange = $('#playerSaturationRange'); + const frameBackground = $('#frameBackground'); + const reset = $('#resetPlayerFilterButton'); let brightness = 100; let contrast = 100; let saturation = 100; - let shortkeys = window.cvat.config.shortkeys; + const { shortkeys } = window.cvat.config; + + function updateFilterParameters() { + frameBackground.css('filter', `contrast(${contrast}%) brightness(${brightness}%) saturate(${saturation}%)`); + } + brightnessRange.attr('title', ` - ${shortkeys['change_player_brightness'].view_value} - ${shortkeys['change_player_brightness'].description}`); + ${shortkeys.change_player_brightness.view_value} - ${shortkeys.change_player_brightness.description}`); contrastRange.attr('title', ` - ${shortkeys['change_player_contrast'].view_value} - ${shortkeys['change_player_contrast'].description}`); + ${shortkeys.change_player_contrast.view_value} - ${shortkeys.change_player_contrast.description}`); saturationRange.attr('title', ` - ${shortkeys['change_player_saturation'].view_value} - ${shortkeys['change_player_saturation'].description}`); + ${shortkeys.change_player_saturation.view_value} - ${shortkeys.change_player_saturation.description}`); - let changeBrightnessHandler = Logger.shortkeyLogDecorator(function(e) { - if (e.shiftKey) brightnessRange.prop('value', brightness + 10).trigger('input'); - else brightnessRange.prop('value', brightness - 10).trigger('input'); + const changeBrightnessHandler = Logger.shortkeyLogDecorator((e) => { + if (e.shiftKey) { + brightnessRange.prop('value', brightness + 10).trigger('input'); + } else { + brightnessRange.prop('value', brightness - 10).trigger('input'); + } }); - let changeContrastHandler = Logger.shortkeyLogDecorator(function(e) { - if (e.shiftKey) contrastRange.prop('value', contrast + 10).trigger('input'); - else contrastRange.prop('value', contrast - 10).trigger('input'); + const changeContrastHandler = Logger.shortkeyLogDecorator((e) => { + if (e.shiftKey) { + contrastRange.prop('value', contrast + 10).trigger('input'); + } else { + contrastRange.prop('value', contrast - 10).trigger('input'); + } }); - let changeSaturationHandler = Logger.shortkeyLogDecorator(function(e) { - if (e.shiftKey) saturationRange.prop('value', saturation + 10).trigger('input'); - else saturationRange.prop('value', saturation - 10).trigger('input'); + const changeSaturationHandler = Logger.shortkeyLogDecorator((e) => { + if (e.shiftKey) { + saturationRange.prop('value', saturation + 10).trigger('input'); + } else { + saturationRange.prop('value', saturation - 10).trigger('input'); + } }); - Mousetrap.bind(shortkeys["change_player_brightness"].value, changeBrightnessHandler, 'keydown'); - Mousetrap.bind(shortkeys["change_player_contrast"].value, changeContrastHandler, 'keydown'); - Mousetrap.bind(shortkeys["change_player_saturation"].value, changeSaturationHandler, 'keydown'); + Mousetrap.bind(shortkeys.change_player_brightness.value, changeBrightnessHandler, 'keydown'); + Mousetrap.bind(shortkeys.change_player_contrast.value, changeContrastHandler, 'keydown'); + Mousetrap.bind(shortkeys.change_player_saturation.value, changeSaturationHandler, 'keydown'); - reset.on('click', function() { + reset.on('click', () => { brightness = 100; contrast = 100; saturation = 100; @@ -297,74 +175,61 @@ function setupFrameFilters() { updateFilterParameters(); }); - brightnessRange.on('input', function(e) { - let value = Math.clamp(+e.target.value, +e.target.min, +e.target.max); - brightness = e.target.value = value; + brightnessRange.on('input', (e) => { + const value = Math.clamp(+e.target.value, +e.target.min, +e.target.max); + e.target.value = value; + brightness = value; updateFilterParameters(); }); - contrastRange.on('input', function(e) { - let value = Math.clamp(+e.target.value, +e.target.min, +e.target.max); - contrast = e.target.value = value; + contrastRange.on('input', (e) => { + const value = Math.clamp(+e.target.value, +e.target.min, +e.target.max); + e.target.value = value; + contrast = value; updateFilterParameters(); }); - saturationRange.on('input', function(e) { - let value = Math.clamp(+e.target.value, +e.target.min, +e.target.max); - saturation = e.target.value = value; + saturationRange.on('input', (e) => { + const value = Math.clamp(+e.target.value, +e.target.min, +e.target.max); + e.target.value = value; + saturation = value; updateFilterParameters(); }); - - function updateFilterParameters() { - frameBackground.css('filter', `contrast(${contrast}%) brightness(${brightness}%) saturate(${saturation}%)`); - } } function setupShortkeys(shortkeys, models) { - let annotationMenu = $('#annotationMenu'); - let settingsWindow = $('#settingsWindow'); - let helpWindow = $('#helpWindow'); + const annotationMenu = $('#annotationMenu'); + const settingsWindow = $('#settingsWindow'); + const helpWindow = $('#helpWindow'); - Mousetrap.prototype.stopCallback = function() { - return false; - }; + Mousetrap.prototype.stopCallback = () => false; - let openHelpHandler = Logger.shortkeyLogDecorator(function() { - let helpInvisible = helpWindow.hasClass('hidden'); + const openHelpHandler = Logger.shortkeyLogDecorator(() => { + const helpInvisible = helpWindow.hasClass('hidden'); if (helpInvisible) { annotationMenu.addClass('hidden'); settingsWindow.addClass('hidden'); helpWindow.removeClass('hidden'); - } - else { + } else { helpWindow.addClass('hidden'); } return false; }); - let openSettingsHandler = Logger.shortkeyLogDecorator(function() { - let settingsInvisible = settingsWindow.hasClass('hidden'); + const openSettingsHandler = Logger.shortkeyLogDecorator(() => { + const settingsInvisible = settingsWindow.hasClass('hidden'); if (settingsInvisible) { annotationMenu.addClass('hidden'); helpWindow.addClass('hidden'); settingsWindow.removeClass('hidden'); - } - else { + } else { $('#settingsWindow').addClass('hidden'); } return false; }); - let saveHandler = Logger.shortkeyLogDecorator(function() { - let saveButtonLocked = $('#saveButton').prop('disabled'); - if (!saveButtonLocked) { - $('#saveButton').click(); - } - return false; - }); - - let cancelModeHandler = Logger.shortkeyLogDecorator(function() { + const cancelModeHandler = Logger.shortkeyLogDecorator(() => { switch (window.cvat.mode) { case 'aam': models.aam.switchAAMMode(); @@ -384,83 +249,62 @@ function setupShortkeys(shortkeys, models) { case 'poly_editing': models.shapeEditor.finish(); break; + default: + break; } return false; }); - Mousetrap.bind(shortkeys["open_help"].value, openHelpHandler, 'keydown'); - Mousetrap.bind(shortkeys["open_settings"].value, openSettingsHandler, 'keydown'); - Mousetrap.bind(shortkeys["save_work"].value, saveHandler, 'keydown'); - Mousetrap.bind(shortkeys["cancel_mode"].value, cancelModeHandler, 'keydown'); + Mousetrap.bind(shortkeys.open_help.value, openHelpHandler, 'keydown'); + Mousetrap.bind(shortkeys.open_settings.value, openSettingsHandler, 'keydown'); + Mousetrap.bind(shortkeys.cancel_mode.value, cancelModeHandler, 'keydown'); } function setupHelpWindow(shortkeys) { - let closeHelpButton = $('#closeHelpButton'); - let helpTable = $('#shortkeyHelpTable'); + const closeHelpButton = $('#closeHelpButton'); + const helpTable = $('#shortkeyHelpTable'); - closeHelpButton.on('click', function() { + closeHelpButton.on('click', () => { $('#helpWindow').addClass('hidden'); }); - for (let key in shortkeys) { - helpTable.append($(` ${shortkeys[key].view_value} ${shortkeys[key].description} `));
+ for (const key in shortkeys) {
+ if (Object.prototype.hasOwnProperty.call(shortkeys, key)) {
+ helpTable.append($(` ${shortkeys[key].view_value} ${shortkeys[key].description} `));
+ }
}
}
function setupSettingsWindow() {
- let closeSettingsButton = $('#closeSettignsButton');
- let autoSaveBox = $('#autoSaveBox');
- let autoSaveTime = $('#autoSaveTime');
+ const closeSettingsButton = $('#closeSettignsButton');
- closeSettingsButton.on('click', function() {
+ closeSettingsButton.on('click', () => {
$('#settingsWindow').addClass('hidden');
});
-
- let saveInterval = null;
- autoSaveBox.on('change', function(e) {
- if (saveInterval) {
- clearInterval(saveInterval);
- saveInterval = null;
- }
-
- if (e.target.checked) {
- let time = +autoSaveTime.prop('value');
- saveInterval = setInterval(() => {
- let saveButton = $('#saveButton');
- if (!saveButton.prop('disabled')) {
- saveButton.click();
- }
- }, time * 1000 * 60);
- }
-
- autoSaveTime.on('change', () => {
- let value = Math.clamp(+e.target.value, +e.target.min, +e.target.max);
- e.target.value = value;
- autoSaveBox.trigger('change');
- });
- });
}
-function setupMenu(job, shapeCollectionModel, annotationParser, aamModel, playerModel, historyModel) {
- let annotationMenu = $('#annotationMenu');
- let menuButton = $('#menuButton');
+function setupMenu(job, task, shapeCollectionModel,
+ annotationParser, aamModel, playerModel, historyModel) {
+ const annotationMenu = $('#annotationMenu');
+ const menuButton = $('#menuButton');
function hide() {
annotationMenu.addClass('hidden');
}
- (function setupVisibility() {
+ function setupVisibility() {
let timer = null;
menuButton.on('click', () => {
- let [byLabelsStat, totalStat] = shapeCollectionModel.collectStatistic();
- let table = $('#annotationStatisticTable');
+ const [byLabelsStat, totalStat] = shapeCollectionModel.collectStatistic();
+ const table = $('#annotationStatisticTable');
table.find('.temporaryStatisticRow').remove();
- for (let labelId in byLabelsStat) {
- $(`
+ for (const labelId in byLabelsStat) {
+ if (Object.prototype.hasOwnProperty.call(byLabelsStat, labelId)) {
+ $(`
${window.cvat.labelsInfo.labels()[labelId].normalize()}
${byLabelsStat[labelId].boxes.annotation}
${byLabelsStat[labelId].boxes.interpolation}
@@ -474,6 +318,7 @@ function setupMenu(job, shapeCollectionModel, annotationParser, aamModel, player
${byLabelsStat[labelId].interpolated}
${byLabelsStat[labelId].total}
`).addClass('temporaryStatisticRow').appendTo(table);
+ }
}
$(`
@@ -494,7 +339,7 @@ function setupMenu(job, shapeCollectionModel, annotationParser, aamModel, player
menuButton.on('click', () => {
annotationMenu.removeClass('hidden');
- annotationMenu.css('top', menuButton.offset().top - annotationMenu.height() - menuButton.height() + 'px');
+ annotationMenu.css('top', `${menuButton.offset().top - annotationMenu.height() - menuButton.height()}px`);
if (timer) {
clearTimeout(timer);
timer = null;
@@ -512,79 +357,86 @@ function setupMenu(job, shapeCollectionModel, annotationParser, aamModel, player
timer = setTimeout(hide, 500);
});
- annotationMenu.on('mouseover', function() {
+ annotationMenu.on('mouseover', () => {
if (timer) {
clearTimeout(timer);
timer = null;
}
});
- })();
-
- $('#statTaskName').text(job.slug);
- $('#statFrames').text(`[${job.start}-${job.stop}]`);
- $('#statOverlap').text(job.overlap);
- $('#statZOrder').text(job.z_order);
- $('#statFlipped').text(job.flipped);
- $('#statTaskStatus').prop("value", job.status).on('change', (e) => {
- $.ajax({
- type: 'POST',
- url: 'save/status/job/' + window.cvat.job.id,
- data: JSON.stringify({
- status: e.target.value
- }),
- contentType: "application/json; charset=utf-8",
- error: (data) => {
- showMessage(`Can not change job status. Code: ${data.status}. Message: ${data.responeText || data.statusText}`);
- }
- });
+ }
+
+ setupVisibility();
+
+ $('#statTaskName').text(task.name);
+ $('#statFrames').text(`[${window.cvat.player.frames.start}-${window.cvat.player.frames.stop}]`);
+ $('#statOverlap').text(task.overlap);
+ $('#statZOrder').text(task.z_order);
+ $('#statFlipped').text(task.flipped);
+ $('#statTaskStatus').prop('value', job.status).on('change', async (e) => {
+ try {
+ const jobCopy = JSON.parse(JSON.stringify(job));
+ jobCopy.status = e.target.value;
+
+ await $.ajax({
+ url: `/api/v1/jobs/${window.cvat.job.id}`,
+ type: 'PATCH',
+ data: JSON.stringify(jobCopy),
+ contentType: 'application/json',
+ });
+ } catch (errorData) {
+ const message = `Can not update a job status. Code: ${errorData.status}. `
+ + `Message: ${errorData.responseText || errorData.statusText}`;
+ showMessage(message);
+ }
});
- let shortkeys = window.cvat.config.shortkeys;
+ const { shortkeys } = window.cvat.config;
$('#helpButton').on('click', () => {
hide();
$('#helpWindow').removeClass('hidden');
});
+
$('#helpButton').attr('title', `
- ${shortkeys['open_help'].view_value} - ${shortkeys['open_help'].description}`);
+ ${shortkeys.open_help.view_value} - ${shortkeys.open_help.description}`);
$('#settingsButton').on('click', () => {
hide();
$('#settingsWindow').removeClass('hidden');
});
- $('#settingsButton').attr('title', `
- ${shortkeys['open_settings'].view_value} - ${shortkeys['open_settings'].description}`);
- $('#downloadAnnotationButton').on('click', (e) => {
- dumpAnnotationRequest(e.target, job.taskid, job.slug);
+ $('#settingsButton').attr('title', `
+ ${shortkeys.open_settings.view_value} - ${shortkeys.open_settings.description}`);
+
+ $('#downloadAnnotationButton').on('click', async (e) => {
+ e.target.disabled = true;
+ try {
+ await dumpAnnotationRequest(task.id, task.name);
+ } catch (error) {
+ showMessage(error.message);
+ } finally {
+ e.target.disabled = false;
+ }
});
$('#uploadAnnotationButton').on('click', () => {
hide();
- confirm('Current annotation will be removed from the client. Continue?',
+ userConfirm('Current annotation will be removed from the client. Continue?',
() => {
uploadAnnotation(shapeCollectionModel, historyModel, annotationParser, $('#uploadAnnotationButton'));
- }
- );
+ });
});
$('#removeAnnotationButton').on('click', () => {
if (!window.cvat.mode) {
hide();
- confirm('Do you want to remove all annotations? The action cannot be undone!',
+ userConfirm('Do you want to remove all annotations? The action cannot be undone!',
() => {
historyModel.empty();
shapeCollectionModel.empty();
- }
- );
+ });
}
});
- $('#saveButton').on('click', () => {
- saveAnnotation(shapeCollectionModel, job);
- });
- $('#saveButton').attr('title', `
- ${shortkeys['save_work'].view_value} - ${shortkeys['save_work'].description}`);
-
// JS function cancelFullScreen don't work after pressing
// and it is famous problem.
$('#fullScreenButton').on('click', () => {
@@ -605,142 +457,268 @@ function setupMenu(job, shapeCollectionModel, annotationParser, aamModel, player
});
$('#switchAAMButton').attr('title', `
- ${shortkeys['switch_aam_mode'].view_value} - ${shortkeys['switch_aam_mode'].description}`);
+ ${shortkeys.switch_aam_mode.view_value} - ${shortkeys.switch_aam_mode.description}`);
}
-function drawBoxSize(scene, box) {
- let scale = window.cvat.player.geometry.scale;
- let width = +box.getAttribute('width');
- let height = +box.getAttribute('height');
- let text = `${width.toFixed(1)}x${height.toFixed(1)}`;
- let obj = this && this.textUI && this.rm ? this : {
- textUI: scene.text('').font({
- weight: 'bolder'
- }).fill('white'),
+function buildAnnotationUI(jobData, taskData, imageMetaData, annotationData, loadJobEvent) {
+ // Setup some API
+ window.cvat = {
+ labelsInfo: new LabelsInfo(taskData.labels),
+ translate: new CoordinateTranslator(),
+ player: {
+ geometry: {
+ scale: 1,
+ },
+ frames: {
+ current: jobData.start_frame,
+ start: jobData.start_frame,
+ stop: jobData.stop_frame,
+ },
+ },
+ mode: null,
+ job: {
+ z_order: taskData.z_order,
+ id: jobData.id,
+ task_id: taskData.id,
+ images: imageMetaData,
+ },
+ search: {
+ value: window.location.search,
- rm: function() {
- if (this.textUI) {
- this.textUI.remove();
- }
- }
+ set(name, value) {
+ const searchParams = new URLSearchParams(this.value);
+
+ if (typeof value === 'undefined' || value === null) {
+ if (searchParams.has(name)) {
+ searchParams.delete(name);
+ }
+ } else {
+ searchParams.set(name, value);
+ }
+ this.value = `${searchParams.toString()}`;
+ },
+
+ get(name) {
+ try {
+ const decodedURI = decodeURIComponent(this.value);
+ const urlSearchParams = new URLSearchParams(decodedURI);
+ if (urlSearchParams.has(name)) {
+ return urlSearchParams.get(name);
+ }
+ return null;
+ } catch (error) {
+ showMessage('Bad URL has been received');
+ this.value = window.location.href;
+ return null;
+ }
+ },
+
+ toString() {
+ return `${window.location.origin}/?${this.value}`;
+ },
+ },
};
- obj.textUI.clear().plain(text);
+ // Remove external search parameters from url
+ window.history.replaceState(null, null, `${window.location.origin}/?id=${jobData.id}`);
- obj.textUI.font({
- size: 20 / scale,
- }).style({
- stroke: 'black',
- 'stroke-width': 1 / scale
- });
+ window.cvat.config = new Config();
- obj.textUI.move(+box.getAttribute('x'), +box.getAttribute('y'));
+ // Setup components
+ const annotationParser = new AnnotationParser({
+ start: window.cvat.player.frames.start,
+ stop: window.cvat.player.frames.stop,
+ flipped: taskData.flipped,
+ image_meta_data: imageMetaData,
+ }, window.cvat.labelsInfo);
- return obj;
-}
+ const shapeCollectionModel = new ShapeCollectionModel().import(annotationData);
+ const shapeCollectionController = new ShapeCollectionController(shapeCollectionModel);
+ const shapeCollectionView = new ShapeCollectionView(shapeCollectionModel,
+ shapeCollectionController);
+ buildAnnotationSaver(annotationData, shapeCollectionModel);
-function uploadAnnotation(shapeCollectionModel, historyModel, annotationParser, uploadAnnotationButton) {
- $('#annotationFileSelector').one('change', (e) => {
- let file = e.target.files['0'];
- e.target.value = "";
- if (!file || file.type != 'text/xml') return;
- uploadAnnotationButton.text('Preparing..');
- uploadAnnotationButton.prop('disabled', true);
- let overlay = showOverlay("File is being uploaded..");
+ window.cvat.data = {
+ get: () => shapeCollectionModel.export()[0],
+ set: (data) => {
+ shapeCollectionModel.import(data);
+ shapeCollectionModel.update();
+ },
+ clear: () => shapeCollectionModel.empty(),
+ };
- let fileReader = new FileReader();
- fileReader.onload = function(e) {
- let data = null;
+ const shapeBufferModel = new ShapeBufferModel(shapeCollectionModel);
+ const shapeBufferController = new ShapeBufferController(shapeBufferModel);
+ const shapeBufferView = new ShapeBufferView(shapeBufferModel, shapeBufferController);
- let asyncParse = function() {
- try {
- data = annotationParser.parse(e.target.result);
- }
- catch (err) {
- overlay.remove();
- showMessage(err.message);
- return;
- }
- finally {
- uploadAnnotationButton.text('Upload Annotation');
- uploadAnnotationButton.prop('disabled', false);
- }
+ $('#shapeModeSelector').prop('value', taskData.mode);
+ const shapeCreatorModel = new ShapeCreatorModel(shapeCollectionModel);
+ const shapeCreatorController = new ShapeCreatorController(shapeCreatorModel);
+ const shapeCreatorView = new ShapeCreatorView(shapeCreatorModel, shapeCreatorController);
- let asyncImport = function() {
- try {
- historyModel.empty();
- shapeCollectionModel.empty();
- shapeCollectionModel.import(data, false);
- shapeCollectionModel.update();
- }
- finally {
- overlay.remove();
- }
- };
+ const polyshapeEditorModel = new PolyshapeEditorModel();
+ const polyshapeEditorController = new PolyshapeEditorController(polyshapeEditorModel);
+ const polyshapeEditorView = new PolyshapeEditorView(polyshapeEditorModel,
+ polyshapeEditorController);
- overlay.setMessage('Data are being imported..');
- setTimeout(asyncImport);
- };
+ // Add static member for class. It will be used by all polyshapes.
+ PolyShapeView.editor = polyshapeEditorModel;
+
+ const shapeMergerModel = new ShapeMergerModel(shapeCollectionModel);
+ const shapeMergerController = new ShapeMergerController(shapeMergerModel);
+ new ShapeMergerView(shapeMergerModel, shapeMergerController);
+
+ const shapeGrouperModel = new ShapeGrouperModel(shapeCollectionModel);
+ const shapeGrouperController = new ShapeGrouperController(shapeGrouperModel);
+ const shapeGrouperView = new ShapeGrouperView(shapeGrouperModel, shapeGrouperController);
+
+ const playerGeometry = {
+ width: $('#playerFrame').width(),
+ height: $('#playerFrame').height(),
+ };
+
+ const playerModel = new PlayerModel(taskData, playerGeometry);
+ const playerController = new PlayerController(playerModel,
+ () => shapeCollectionModel.activeShape,
+ direction => shapeCollectionModel.find(direction),
+ Object.assign({}, playerGeometry, {
+ left: $('#playerFrame').offset().left,
+ top: $('#playerFrame').offset().top,
+ }));
+ new PlayerView(playerModel, playerController);
- overlay.setMessage('File is being parsed..');
- setTimeout(asyncParse);
- };
- fileReader.readAsText(file);
- }).click();
-}
+ const aamModel = new AAMModel(shapeCollectionModel, (xtl, xbr, ytl, ybr) => {
+ playerModel.focus(xtl, xbr, ytl, ybr);
+ }, () => {
+ playerModel.fit();
+ });
+ const aamController = new AAMController(aamModel);
+ new AAMView(aamModel, aamController);
+
+ shapeCreatorModel.subscribe(shapeCollectionModel);
+ shapeGrouperModel.subscribe(shapeCollectionView);
+ shapeCollectionModel.subscribe(shapeGrouperModel);
+
+ $('#playerProgress').css('width', $('#player')['0'].clientWidth - 420);
+
+ const historyModel = new HistoryModel(playerModel);
+ const historyController = new HistoryController(historyModel);
+ new HistoryView(historyController, historyModel);
+
+ playerModel.subscribe(shapeCollectionModel);
+ playerModel.subscribe(shapeCollectionView);
+ playerModel.subscribe(shapeCreatorView);
+ playerModel.subscribe(shapeBufferView);
+ playerModel.subscribe(shapeGrouperView);
+ playerModel.subscribe(polyshapeEditorView);
+ playerModel.shift(window.cvat.search.get('frame') || 0, true);
+
+ const { shortkeys } = window.cvat.config;
+
+ setupHelpWindow(shortkeys);
+ setupSettingsWindow();
+ setupMenu(jobData, taskData, shapeCollectionModel,
+ annotationParser, aamModel, playerModel, historyModel);
+ setupFrameFilters();
+ setupShortkeys(shortkeys, {
+ aam: aamModel,
+ shapeCreator: shapeCreatorModel,
+ shapeMerger: shapeMergerModel,
+ shapeGrouper: shapeGrouperModel,
+ shapeBuffer: shapeBufferModel,
+ shapeEditor: polyshapeEditorModel,
+ });
-function saveAnnotation(shapeCollectionModel, job) {
- let saveButton = $('#saveButton');
+ $(window).on('click', (event) => {
+ Logger.updateUserActivityTimer();
+ if (event.target.classList.contains('modal') && !event.target.classList.contains('force-modal')) {
+ event.target.classList.add('hidden');
+ }
+ });
- Logger.addEvent(Logger.EventType.saveJob);
- let totalStat = shapeCollectionModel.collectStatistic()[1];
- Logger.addEvent(Logger.EventType.sendTaskInfo, {
- 'track count': totalStat.boxes.annotation + totalStat.boxes.interpolation +
- totalStat.polygons.annotation + totalStat.polygons.interpolation +
- totalStat.polylines.annotation + totalStat.polylines.interpolation +
- totalStat.points.annotation + totalStat.points.interpolation,
- 'frame count': job.stop - job.start + 1,
+ const totalStat = shapeCollectionModel.collectStatistic()[1];
+ loadJobEvent.addValues({
+ 'track count': totalStat.boxes.annotation + totalStat.boxes.interpolation
+ + totalStat.polygons.annotation + totalStat.polygons.interpolation
+ + totalStat.polylines.annotation + totalStat.polylines.interpolation
+ + totalStat.points.annotation + totalStat.points.interpolation,
+ 'frame count': window.cvat.player.frames.stop - window.cvat.player.frames.start + 1,
'object count': totalStat.total,
'box count': totalStat.boxes.annotation + totalStat.boxes.interpolation,
'polygon count': totalStat.polygons.annotation + totalStat.polygons.interpolation,
'polyline count': totalStat.polylines.annotation + totalStat.polylines.interpolation,
'points count': totalStat.points.annotation + totalStat.points.interpolation,
});
+ loadJobEvent.close();
+
+ $('#player').on('click', (e) => {
+ if (e.target.tagName.toLowerCase() !== 'input') {
+ blurAllElements();
+ }
+ });
+}
- const exportedData = shapeCollectionModel.export();
- shapeCollectionModel.updateExportedState();
- const annotationLogs = Logger.getLogs();
- const data = {
- annotation: JSON.stringify(exportedData),
- logs: JSON.stringify(annotationLogs.export()),
- };
+function callAnnotationUI(jid) {
+ function onError(errorData) {
+ $('body').empty();
+ const message = `Can not build CVAT annotation UI. Code: ${errorData.status}. `
+ + `Message: ${errorData.responseText || errorData.statusText}`;
+ showMessage(message);
+ }
- saveButton.prop('disabled', true);
- saveButton.text('Saving..');
-
- saveJobRequest(job.jobid, data, () => {
- // success
- shapeCollectionModel.confirmExportedState();
- saveButton.text('Success!');
- setTimeout(() => {
- saveButton.prop('disabled', false);
- saveButton.text('Save Work');
- }, 3000);
- }, (response) => {
- // error
- saveButton.prop('disabled', false);
- saveButton.text('Save Work');
- let message = `Impossible to save job. Errors was occured. Status: ${response.status}`;
- showMessage(message + ' ' + 'Please immediately report the problem to support team');
- throw Error(message);
- });
+ initLogger(jid);
+
+ const loadJobEvent = Logger.addContinuedEvent(Logger.EventType.loadJob);
+ $.get(`/api/v1/jobs/${jid}`).done((jobData) => {
+ $.when(
+ $.get(`/api/v1/tasks/${jobData.task_id}`),
+ $.get(`/api/v1/tasks/${jobData.task_id}/frames/meta`),
+ $.get(`/api/v1/jobs/${jid}/annotations`),
+ ).then((taskData, imageMetaData, annotationData) => {
+ $('#loadingOverlay').remove();
+ setTimeout(() => {
+ buildAnnotationUI(jobData, taskData[0],
+ imageMetaData[0], annotationData[0], loadJobEvent);
+ });
+ }).fail(onError);
+ }).fail(onError);
}
-function blurAllElements() {
- document.activeElement.blur();
+function copyToClipboard(text) {
+ const tempInput = $('');
+ $('body').append(tempInput);
+ tempInput.prop('value', text).select();
+ document.execCommand('copy');
+ tempInput.remove();
+}
+
+
+function drawBoxSize(boxScene, textScene, box) {
+ const clientBox = window.cvat.translate.box.canvasToClient(boxScene.node, box);
+ const text = `${box.width.toFixed(1)}x${box.height.toFixed(1)}`;
+ const obj = this && this.textUI && this.rm ? this : {
+ textUI: textScene.text('').font({
+ weight: 'bolder',
+ }).fill('white'),
+
+ rm() {
+ if (this.textUI) {
+ this.textUI.remove();
+ }
+ },
+ };
+
+ const textPoint = window.cvat.translate.point.clientToCanvas(textScene.node,
+ clientBox.x, clientBox.y);
+
+ obj.textUI.clear().plain(text);
+ obj.textUI.addClass('shapeText');
+ obj.textUI.move(textPoint.x, textPoint.y);
+
+ return obj;
}
diff --git a/cvat/apps/engine/static/engine/js/attributeAnnotationMode.js b/cvat/apps/engine/static/engine/js/attributeAnnotationMode.js
index f0ae3cdb..ece1d78b 100644
--- a/cvat/apps/engine/static/engine/js/attributeAnnotationMode.js
+++ b/cvat/apps/engine/static/engine/js/attributeAnnotationMode.js
@@ -4,8 +4,15 @@
* SPDX-License-Identifier: MIT
*/
-/* exported AAMModel AAMController AAMView */
-"use strict";
+/* exported AAMModel AAMController AAMView AAMUndefinedKeyword */
+
+/* global
+ Listener:false
+ Logger:false
+ Mousetrap:false
+ PolyShapeModel:false
+ SVG:false
+*/
const AAMUndefinedKeyword = '__undefined__';
@@ -22,40 +29,27 @@ class AAMModel extends Listener {
this._currentShapes = [];
this._attrNumberByLabel = {};
this._helps = {};
- for (let labelId in window.cvat.labelsInfo.labels()) {
- let labelAttributes = window.cvat.labelsInfo.labelAttributes(labelId);
- if (Object.keys(labelAttributes).length) {
- this._attrNumberByLabel[labelId] = {
- current: 0,
- end: Object.keys(labelAttributes).length
- };
-
- for (let attrId in labelAttributes) {
- this._helps[attrId] = {
- title: `${window.cvat.labelsInfo.labels()[labelId]}, ${window.cvat.labelsInfo.attributes()[attrId]}`,
- help: getHelp(attrId),
- };
- }
- }
- }
function getHelp(attrId) {
- let attrInfo = window.cvat.labelsInfo.attrInfo(attrId);
- let help = [];
+ const attrInfo = window.cvat.labelsInfo.attrInfo(attrId);
+ const help = [];
switch (attrInfo.type) {
case 'checkbox':
- help.push('0 - ' + attrInfo.values[0]);
- help.push('1 - ' + !attrInfo.values[0]);
+ help.push(`0 - ${attrInfo.values[0]}`);
+ help.push(`1 - ${!attrInfo.values[0]}`);
break;
default:
- for (let idx = 0; idx < attrInfo.values.length; idx ++) {
- if (idx > 9) break;
- if (attrInfo.values[0] === AAMUndefinedKeyword) {
- if (!idx) continue;
- help.push(idx - 1 + ' - ' + attrInfo.values[idx]);
+ for (let idx = 0; idx < attrInfo.values.length; idx += 1) {
+ if (idx > 9) {
+ break;
}
- else {
- help.push(idx + ' - ' + attrInfo.values[idx]);
+ if (attrInfo.values[0] === AAMUndefinedKeyword) {
+ if (!idx) {
+ continue;
+ }
+ help.push(`${idx - 1} - ${attrInfo.values[idx]}`);
+ } else {
+ help.push(`${idx} - ${attrInfo.values[idx]}`);
}
}
}
@@ -63,35 +57,56 @@ class AAMModel extends Listener {
return help;
}
+ const labels = window.cvat.labelsInfo.labels();
+ for (const labelId in labels) {
+ if (Object.prototype.hasOwnProperty.call(labels, labelId)) {
+ const labelAttributes = window.cvat.labelsInfo.labelAttributes(labelId);
+ if (Object.keys(labelAttributes).length) {
+ this._attrNumberByLabel[labelId] = {
+ current: 0,
+ end: Object.keys(labelAttributes).length,
+ };
+
+ for (const attrId in labelAttributes) {
+ if (Object.prototype.hasOwnProperty.call(labelAttributes, attrId)) {
+ this._helps[attrId] = {
+ title: `${window.cvat.labelsInfo.labels()[labelId]}, ${window.cvat.labelsInfo.attributes()[attrId]}`,
+ help: getHelp(attrId),
+ };
+ }
+ }
+ }
+ }
+ }
+
shapeCollection.subscribe(this);
}
_bbRect(pos) {
if ('points' in pos) {
- let points = PolyShapeModel.convertStringToNumberArray(pos.points);
+ const points = PolyShapeModel.convertStringToNumberArray(pos.points);
let xtl = Number.MAX_SAFE_INTEGER;
let ytl = Number.MAX_SAFE_INTEGER;
let xbr = Number.MIN_SAFE_INTEGER;
let ybr = Number.MIN_SAFE_INTEGER;
- for (let point of points) {
+ for (const point of points) {
xtl = Math.min(xtl, point.x);
ytl = Math.min(ytl, point.y);
xbr = Math.max(xbr, point.x);
ybr = Math.max(ybr, point.y);
}
- return [xtl, ytl, xbr, ybr];
- }
- else {
- return [pos.xtl, pos.ytl, pos.xbr, pos.ybr];
+ return [xtl, ytl, xbr, ybr];
}
+ return [pos.xtl, pos.ytl, pos.xbr, pos.ybr];
}
_updateCollection() {
this._currentShapes = [];
- for (let shape of this._shapeCollection.currentShapes) {
- let labelAttributes = window.cvat.labelsInfo.labelAttributes(shape.model.label);
- if (Object.keys(labelAttributes).length && !shape.model.removed && !shape.interpolation.position.outside) {
+ for (const shape of this._shapeCollection.currentShapes) {
+ const labelAttributes = window.cvat.labelsInfo.labelAttributes(shape.model.label);
+ if (Object.keys(labelAttributes).length
+ && !shape.model.removed && !shape.interpolation.position.outside) {
this._currentShapes.push({
model: shape.model,
interpolation: shape.model.interpolate(window.cvat.player.frames.current),
@@ -102,8 +117,7 @@ class AAMModel extends Listener {
if (this._currentShapes.length) {
this._activeIdx = 0;
this._active = this._currentShapes[0].model;
- }
- else {
+ } else {
this._activeIdx = null;
this._active = null;
}
@@ -115,35 +129,23 @@ class AAMModel extends Listener {
_activate() {
if (this._activeAAM && this._active) {
- let label = this._active.label;
- let attrId = +this._attrIdByIdx(label, this._attrNumberByLabel[label].current);
- let attrInfo = window.cvat.labelsInfo.attrInfo(attrId);
-
- let [xtl, ytl, xbr, ybr] = this._bbRect(this._currentShapes[this._activeIdx].interpolation.position);
- this._focus(xtl - this._margin, xbr + this._margin, ytl - this._margin, ybr + this._margin);
-
- this._active.activeAAM = {
- shape: true,
- attribute: attrId,
- };
+ const { label } = this._active;
+ const attrId = +this._attrIdByIdx(label, this._attrNumberByLabel[label].current);
+ const [xtl, ytl, xbr, ybr] = this._bbRect(this._currentShapes[this._activeIdx]
+ .interpolation.position);
+ this._focus(xtl - this._margin, xbr + this._margin,
+ ytl - this._margin, ybr + this._margin);
this.notify();
-
- if (attrInfo.type === 'text' || attrInfo.type === 'number') {
- this._active.aamAttributeFocus();
- }
- }
- else {
+ this._active.activeAttribute = attrId;
+ } else {
this.notify();
}
}
_deactivate() {
if (this._activeAAM && this._active) {
- this._active.activeAAM = {
- shape: false,
- attribute: null
- };
+ this._active.activeAttribute = null;
}
}
@@ -153,7 +155,6 @@ class AAMModel extends Listener {
this._shapeCollection.resetActive();
this._activeAAM = true;
this._updateCollection();
- this.notify();
this._activate();
}
}
@@ -175,8 +176,7 @@ class AAMModel extends Listener {
switchAAMMode() {
if (this._activeAAM) {
this._disable();
- }
- else {
+ } else {
this._enable();
}
}
@@ -189,14 +189,13 @@ class AAMModel extends Listener {
this._deactivate();
if (Math.sign(direction) < 0) {
// next
- this._activeIdx ++;
+ this._activeIdx += 1;
if (this._activeIdx >= this._currentShapes.length) {
this._activeIdx = 0;
}
- }
- else {
+ } else {
// prev
- this._activeIdx --;
+ this._activeIdx -= 1;
if (this._activeIdx < 0) {
this._activeIdx = this._currentShapes.length - 1;
}
@@ -211,7 +210,7 @@ class AAMModel extends Listener {
return;
}
- let curAttr = this._attrNumberByLabel[this._active.label];
+ const curAttr = this._attrNumberByLabel[this._active.label];
if (curAttr.end < 2) {
return;
@@ -219,14 +218,13 @@ class AAMModel extends Listener {
if (Math.sign(direction) > 0) {
// next
- curAttr.current ++;
+ curAttr.current += 1;
if (curAttr.current >= curAttr.end) {
curAttr.current = 0;
}
- }
- else {
+ } else {
// prev
- curAttr.current --;
+ curAttr.current -= 1;
if (curAttr.current < 0) {
curAttr.current = curAttr.end - 1;
}
@@ -238,26 +236,22 @@ class AAMModel extends Listener {
if (!this._activeAAM || !this._active) {
return;
}
-
- let label = this._active.label;
- let frame = window.cvat.player.frames.current;
- let attrId = this._attrIdByIdx(label, this._attrNumberByLabel[label].current);
- let attrInfo = window.cvat.labelsInfo.attrInfo(attrId);
-
+ const { label } = this._active;
+ const frame = window.cvat.player.frames.current;
+ const attrId = this._attrIdByIdx(label, this._attrNumberByLabel[label].current);
+ const attrInfo = window.cvat.labelsInfo.attrInfo(attrId);
if (key >= attrInfo.values.length) {
if (attrInfo.type === 'checkbox' && key < 2) {
this._active.updateAttribute(frame, attrId, !attrInfo.values[0]);
}
return;
}
-
if (attrInfo.values[0] === AAMUndefinedKeyword) {
if (key >= attrInfo.values.length - 1) {
return;
}
- key ++;
+ key += 1;
}
-
this._active.updateAttribute(frame, attrId, attrInfo.values[key]);
}
@@ -271,80 +265,78 @@ class AAMModel extends Listener {
generateHelps() {
if (this._active) {
- let label = this._active.label;
- let attrId = +this._attrIdByIdx(label, this._attrNumberByLabel[label].current);
+ const { label } = this._active;
+ const attrId = +this._attrIdByIdx(label, this._attrNumberByLabel[label].current);
return [this._helps[attrId].title, this._helps[attrId].help, `${this._activeIdx + 1}/${this._currentShapes.length}`];
}
- else {
- return ['No Shapes Found', '', '0/0'];
- }
+ return ['No Shapes Found', '', '0/0'];
}
get activeAAM() {
return this._activeAAM;
}
+ get active() {
+ return this._active;
+ }
+
set margin(value) {
this._margin = value;
}
}
-
class AAMController {
constructor(aamModel) {
this._model = aamModel;
- setupAAMShortkeys.call(this);
-
function setupAAMShortkeys() {
- let switchAAMHandler = Logger.shortkeyLogDecorator(function() {
+ const switchAAMHandler = Logger.shortkeyLogDecorator(() => {
this._model.switchAAMMode();
- }.bind(this));
+ });
- let nextAttributeHandler = Logger.shortkeyLogDecorator(function(e) {
+ const nextAttributeHandler = Logger.shortkeyLogDecorator((e) => {
this._model.moveAttr(1);
e.preventDefault();
- }.bind(this));
+ });
- let prevAttributeHandler = Logger.shortkeyLogDecorator(function(e) {
+ const prevAttributeHandler = Logger.shortkeyLogDecorator((e) => {
this._model.moveAttr(-1);
e.preventDefault();
- }.bind(this));
+ });
- let nextShapeHandler = Logger.shortkeyLogDecorator(function(e) {
+ const nextShapeHandler = Logger.shortkeyLogDecorator((e) => {
this._model.moveShape(1);
e.preventDefault();
- }.bind(this));
+ });
- let prevShapeHandler = Logger.shortkeyLogDecorator(function(e) {
+ const prevShapeHandler = Logger.shortkeyLogDecorator((e) => {
this._model.moveShape(-1);
e.preventDefault();
- }.bind(this));
+ });
- let selectAttributeHandler = Logger.shortkeyLogDecorator(function(e) {
+ const selectAttributeHandler = Logger.shortkeyLogDecorator((e) => {
let key = e.keyCode;
if (key >= 48 && key <= 57) {
- key -= 48; // 0 and 9
- }
- else if (key >= 96 && key <= 105) {
+ key -= 48; // 0 and 9
+ } else if (key >= 96 && key <= 105) {
key -= 96; // num 0 and 9
- }
- else {
+ } else {
return;
}
-
this._model.setupAttributeValue(key);
- }.bind(this));
-
- let shortkeys = window.cvat.config.shortkeys;
- Mousetrap.bind(shortkeys["switch_aam_mode"].value, switchAAMHandler, 'keydown');
- Mousetrap.bind(shortkeys["aam_next_attribute"].value, nextAttributeHandler, 'keydown');
- Mousetrap.bind(shortkeys["aam_prev_attribute"].value, prevAttributeHandler, 'keydown');
- Mousetrap.bind(shortkeys["aam_next_shape"].value, nextShapeHandler, 'keydown');
- Mousetrap.bind(shortkeys["aam_prev_shape"].value, prevShapeHandler, 'keydown');
- Mousetrap.bind(shortkeys["select_i_attribute"].value, selectAttributeHandler, 'keydown');
+ });
+
+ const { shortkeys } = window.cvat.config;
+ Mousetrap.bind(shortkeys.switch_aam_mode.value, switchAAMHandler, 'keydown');
+ Mousetrap.bind(shortkeys.aam_next_attribute.value, nextAttributeHandler, 'keydown');
+ Mousetrap.bind(shortkeys.aam_prev_attribute.value, prevAttributeHandler, 'keydown');
+ Mousetrap.bind(shortkeys.aam_next_shape.value, nextShapeHandler, 'keydown');
+ Mousetrap.bind(shortkeys.aam_prev_shape.value, prevShapeHandler, 'keydown');
+ Mousetrap.bind(shortkeys.select_i_attribute.value, selectAttributeHandler, 'keydown');
}
+
+ setupAAMShortkeys.call(this);
}
setMargin(value) {
@@ -361,38 +353,87 @@ class AAMView {
this._aamCounter = $('#aamCounter');
this._aamHelpContainer = $('#aamHelpContainer');
this._zoomMargin = $('#aamZoomMargin');
+ this._frameContent = SVG.adopt($('#frameContent')[0]);
this._controller = aamController;
this._zoomMargin.on('change', (e) => {
- let value = +e.target.value;
+ const value = +e.target.value;
this._controller.setMargin(value);
}).trigger('change');
aamModel.subscribe(this);
}
+ _setupAAMView(active, type, pos) {
+ const oldRect = $('#outsideRect');
+ const oldMask = $('#outsideMask');
+
+ if (active) {
+ if (oldRect.length) {
+ oldRect.remove();
+ oldMask.remove();
+ }
+
+ const size = window.cvat.translate.box.actualToCanvas({
+ x: 0,
+ y: 0,
+ width: window.cvat.player.geometry.frameWidth,
+ height: window.cvat.player.geometry.frameHeight,
+ });
+
+ const excludeField = this._frameContent.rect(size.width, size.height).move(size.x, size.y).fill('#666');
+ let includeField = null;
+
+ if (type === 'box') {
+ pos = window.cvat.translate.box.actualToCanvas(pos);
+ includeField = this._frameContent.rect(pos.xbr - pos.xtl,
+ pos.ybr - pos.ytl).move(pos.xtl, pos.ytl);
+ } else {
+ pos.points = window.cvat.translate.points.actualToCanvas(pos.points);
+ includeField = this._frameContent.polygon(pos.points);
+ }
+
+ this._frameContent.mask().add(excludeField)
+ .add(includeField).fill('black')
+ .attr('id', 'outsideMask');
+ this._frameContent.rect(size.width, size.height)
+ .move(size.x, size.y).attr({
+ mask: 'url(#outsideMask)',
+ id: 'outsideRect',
+ });
+
+ const content = $(this._frameContent.node);
+ const texts = content.find('.shapeText');
+ for (const text of texts) {
+ content.append(text);
+ }
+ } else {
+ oldRect.remove();
+ oldMask.remove();
+ }
+ }
+
onAAMUpdate(aam) {
+ this._setupAAMView(Boolean(aam.active),
+ aam.active ? aam.active.type.split('_')[1] : '',
+ aam.active ? aam.active.interpolate(window.cvat.player.frames.current).position : 0);
+
if (aam.activeAAM) {
if (this._aamMenu.hasClass('hidden')) {
this._trackManagement.addClass('hidden');
this._aamMenu.removeClass('hidden');
}
- let [title, help, counter] = aam.generateHelps();
+ const [title, help, counter] = aam.generateHelps();
this._aamHelpContainer.empty();
this._aamCounter.text(counter);
this._aamTitle.text(title);
- for (let helpRow of help) {
+ for (const helpRow of help) {
$(`
-
+
-
+
-
+
-
+
-
+
-
+
@@ -301,8 +316,8 @@
-
-
+
+
-
-
-
-
-
-
+
+
+
{% endblock %}
diff --git a/cvat/apps/dashboard/templates/dashboard/task.html b/cvat/apps/dashboard/templates/dashboard/task.html
deleted file mode 100644
index da017006..00000000
--- a/cvat/apps/dashboard/templates/dashboard/task.html
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
+
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
diff --git a/cvat/apps/dashboard/urls.py b/cvat/apps/dashboard/urls.py
index 3f732f0e..d05317f7 100644
--- a/cvat/apps/dashboard/urls.py
+++ b/cvat/apps/dashboard/urls.py
@@ -7,7 +7,7 @@ from django.urls import path
from . import views
urlpatterns = [
- path('get_share_nodes', views.JsTreeView),
path('', views.DashboardView),
+ path('meta', views.DashboardMeta),
]
diff --git a/cvat/apps/dashboard/views.py b/cvat/apps/dashboard/views.py
index 0341cc4d..3ba6b102 100644
--- a/cvat/apps/dashboard/views.py
+++ b/cvat/apps/dashboard/views.py
@@ -9,72 +9,22 @@ from django.shortcuts import render
from django.conf import settings
from cvat.apps.authentication.decorators import login_required
-from cvat.apps.engine.models import Task as TaskModel, Job as JobModel
-from cvat.settings.base import JS_3RDPARTY
+from cvat.settings.base import JS_3RDPARTY, CSS_3RDPARTY
import os
-def ScanNode(directory):
- if '..' in directory.split(os.path.sep):
- return HttpResponseBadRequest('Permission Denied')
-
- act_dir = os.path.normpath(settings.SHARE_ROOT + directory)
- result = []
-
- nodes = os.listdir(act_dir)
- files = filter(os.path.isfile, map(lambda f: os.path.join(act_dir, f), nodes))
- dirs = filter(os.path.isdir, map(lambda d: os.path.join(act_dir, d), nodes))
-
- for d in dirs:
- name = os.path.basename(d)
- children = len(os.listdir(d)) > 0
- node = {'id': directory + name + '/', 'text': name, 'children': children}
- result.append(node)
-
- for f in files:
- name = os.path.basename(f)
- node = {'id': directory + name, 'text': name, "icon" : "jstree-file"}
- result.append(node)
-
- return result
-
-@login_required
-def JsTreeView(request):
- node_id = None
- if 'id' in request.GET:
- node_id = request.GET['id']
-
- if node_id is None or node_id == '#':
- node_id = '/'
- response = [{"id": node_id, "text": node_id, "children": ScanNode(node_id)}]
- else:
- response = ScanNode(node_id)
-
- return JsonResponse(response, safe=False,
- json_dumps_params=dict(ensure_ascii=False))
-
-
@login_required
def DashboardView(request):
- query_name = request.GET['search'] if 'search' in request.GET else None
- query_job = int(request.GET['jid']) if 'jid' in request.GET and request.GET['jid'].isdigit() else None
- task_list = None
-
- if query_job is not None and JobModel.objects.filter(pk = query_job).exists():
- task_list = [JobModel.objects.select_related('segment__task').get(pk = query_job).segment.task]
- else:
- task_list = list(TaskModel.objects.prefetch_related('segment_set__job_set').order_by('-created_date').all())
- if query_name is not None:
- task_list = list(filter(lambda x: query_name.lower() in x.name.lower(), task_list))
-
- task_list = list(filter(lambda task: request.user.has_perm(
- 'engine.task.access', task), task_list))
-
return render(request, 'dashboard/dashboard.html', {
- 'data': task_list,
+ 'js_3rdparty': JS_3RDPARTY.get('dashboard', []),
+ 'css_3rdparty': CSS_3RDPARTY.get('dashboard', []),
+ })
+
+@login_required
+def DashboardMeta(request):
+ return JsonResponse({
'max_upload_size': settings.LOCAL_LOAD_MAX_FILES_SIZE,
'max_upload_count': settings.LOCAL_LOAD_MAX_FILES_COUNT,
'base_url': "{0}://{1}/".format(request.scheme, request.get_host()),
'share_path': os.getenv('CVAT_SHARE_URL', default=r'${cvat_root}/share'),
- 'js_3rdparty': JS_3RDPARTY.get('dashboard', []),
- })
+ })
\ No newline at end of file
diff --git a/cvat/apps/dextr_segmentation/README.md b/cvat/apps/dextr_segmentation/README.md
new file mode 100644
index 00000000..2382a380
--- /dev/null
+++ b/cvat/apps/dextr_segmentation/README.md
@@ -0,0 +1,31 @@
+# Semi-Automatic Segmentation with [Deep Extreme Cut](http://www.vision.ee.ethz.ch/~cvlsegmentation/dextr/)
+
+## About the application
+
+The application allows to use deep learning models for semi-automatic semantic and instance segmentation.
+You can get a segmentation polygon from four (or more) extreme points of an object.
+This application uses the pre-trained DEXTR model which has been converted to Inference Engine format.
+
+We are grateful to K.K. Maninis, S. Caelles, J. Pont-Tuset, and L. Van Gool who permitted using their models in our tool
+
+## Build docker image
+```bash
+# OpenVINO component is also needed
+docker-compose -f docker-compose.yml -f components/openvino/docker-compose.openvino.yml -f cvat/apps/dextr_segmentation/docker-compose.dextr.yml build
+```
+
+## Run docker container
+```bash
+docker-compose -f docker-compose.yml -f components/openvino/docker-compose.openvino.yml -f cvat/apps/dextr_segmentation/docker-compose.dextr.yml up -d
+```
+
+## Using
+
+1. Open a job
+2. Select "Auto Segmentation" in the list of shapes
+3. Run the draw mode as usually (by press the "Create Shape" button or by "N" shortcut)
+4. Click four-six (or more if it's need) extreme points of an object
+5. Close the draw mode as usually (by shortcut or pressing the button "Stop Creation")
+6. Wait a moment and you will get a class agnostic annotation polygon
+7. You can close an annotation request if it is too long
+(in case if it is queued to rq worker and all workers are busy)
diff --git a/cvat/apps/dextr_segmentation/__init__.py b/cvat/apps/dextr_segmentation/__init__.py
new file mode 100644
index 00000000..472c2ac3
--- /dev/null
+++ b/cvat/apps/dextr_segmentation/__init__.py
@@ -0,0 +1,7 @@
+# Copyright (C) 2018 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+
+from cvat.settings.base import JS_3RDPARTY
+
+JS_3RDPARTY['engine'] = JS_3RDPARTY.get('engine', []) + ['dextr_segmentation/js/enginePlugin.js']
diff --git a/cvat/apps/dextr_segmentation/apps.py b/cvat/apps/dextr_segmentation/apps.py
new file mode 100644
index 00000000..d5d43a88
--- /dev/null
+++ b/cvat/apps/dextr_segmentation/apps.py
@@ -0,0 +1,8 @@
+# Copyright (C) 2018 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+
+from django.apps import AppConfig
+
+class DextrSegmentationConfig(AppConfig):
+ name = 'dextr_segmentation'
diff --git a/cvat/apps/dextr_segmentation/dextr.py b/cvat/apps/dextr_segmentation/dextr.py
new file mode 100644
index 00000000..703c6d08
--- /dev/null
+++ b/cvat/apps/dextr_segmentation/dextr.py
@@ -0,0 +1,105 @@
+
+# Copyright (C) 2018 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+
+from cvat.apps.auto_annotation.inference_engine import make_plugin, make_network
+
+import os
+import cv2
+import PIL
+import numpy as np
+
+_IE_CPU_EXTENSION = os.getenv("IE_CPU_EXTENSION", "libcpu_extension_avx2.so")
+_IE_PLUGINS_PATH = os.getenv("IE_PLUGINS_PATH", None)
+
+_DEXTR_MODEL_DIR = os.getenv("DEXTR_MODEL_DIR", None)
+_DEXTR_PADDING = 50
+_DEXTR_TRESHOLD = 0.9
+_DEXTR_SIZE = 512
+
+class DEXTR_HANDLER:
+ def __init__(self):
+ self._plugin = None
+ self._network = None
+ self._exec_network = None
+ self._input_blob = None
+ self._output_blob = None
+ if not _DEXTR_MODEL_DIR:
+ raise Exception("DEXTR_MODEL_DIR is not defined")
+
+
+ def handle(self, im_path, points):
+ # Lazy initialization
+ if not self._plugin:
+ self._plugin = make_plugin()
+ self._network = make_network(os.path.join(_DEXTR_MODEL_DIR, 'dextr.xml'),
+ os.path.join(_DEXTR_MODEL_DIR, 'dextr.bin'))
+ self._input_blob = next(iter(self._network.inputs))
+ self._output_blob = next(iter(self._network.outputs))
+ self._exec_network = self._plugin.load(network=self._network)
+
+ image = PIL.Image.open(im_path)
+ numpy_image = np.array(image)
+ points = np.asarray([[int(p["x"]), int(p["y"])] for p in points], dtype=int)
+ bounding_box = (
+ max(min(points[:, 0]) - _DEXTR_PADDING, 0),
+ max(min(points[:, 1]) - _DEXTR_PADDING, 0),
+ min(max(points[:, 0]) + _DEXTR_PADDING, numpy_image.shape[1] - 1),
+ min(max(points[:, 1]) + _DEXTR_PADDING, numpy_image.shape[0] - 1)
+ )
+
+ # Prepare an image
+ numpy_cropped = np.array(image.crop(bounding_box))
+ resized = cv2.resize(numpy_cropped, (_DEXTR_SIZE, _DEXTR_SIZE),
+ interpolation = cv2.INTER_CUBIC).astype(np.float32)
+
+ # Make a heatmap
+ points = points - [min(points[:, 0]), min(points[:, 1])] + [_DEXTR_PADDING, _DEXTR_PADDING]
+ points = (points * [_DEXTR_SIZE / numpy_cropped.shape[1], _DEXTR_SIZE / numpy_cropped.shape[0]]).astype(int)
+ heatmap = np.zeros(shape=resized.shape[:2], dtype=np.float64)
+ for point in points:
+ gaussian_x_axis = np.arange(0, _DEXTR_SIZE, 1, float) - point[0]
+ gaussian_y_axis = np.arange(0, _DEXTR_SIZE, 1, float)[:, np.newaxis] - point[1]
+ gaussian = np.exp(-4 * np.log(2) * ((gaussian_x_axis ** 2 + gaussian_y_axis ** 2) / 100)).astype(np.float64)
+ heatmap = np.maximum(heatmap, gaussian)
+ cv2.normalize(heatmap, heatmap, 0, 255, cv2.NORM_MINMAX)
+
+ # Concat an image and a heatmap
+ input_dextr = np.concatenate((resized, heatmap[:, :, np.newaxis].astype(resized.dtype)), axis=2)
+ input_dextr = input_dextr.transpose((2,0,1))
+
+ pred = self._exec_network.infer(inputs={self._input_blob: input_dextr[np.newaxis, ...]})[self._output_blob][0, 0, :, :]
+ pred = cv2.resize(pred, tuple(reversed(numpy_cropped.shape[:2])), interpolation = cv2.INTER_CUBIC)
+ result = np.zeros(numpy_image.shape[:2])
+ result[bounding_box[1]:bounding_box[1] + pred.shape[0], bounding_box[0]:bounding_box[0] + pred.shape[1]] = pred > _DEXTR_TRESHOLD
+
+ # Convert a mask to a polygon
+ result = np.array(result, dtype=np.uint8)
+ cv2.normalize(result,result,0,255,cv2.NORM_MINMAX)
+ contours = None
+ if int(cv2.__version__.split('.')[0]) > 3:
+ contours = cv2.findContours(result, cv2.RETR_EXTERNAL, cv2.CHAIN_APPROX_TC89_KCOS)[0]
+ else:
+ contours = cv2.findContours(result, cv2.RETR_EXTERNAL, cv2.CHAIN_APPROX_TC89_KCOS)[1]
+
+ contours = max(contours, key=lambda arr: arr.size)
+ if contours.shape.count(1):
+ contours = np.squeeze(contours)
+ if contours.size < 3 * 2:
+ raise Exception('Less then three point have been detected. Can not build a polygon.')
+
+ result = ""
+ for point in contours:
+ result += "{},{} ".format(int(point[0]), int(point[1]))
+ result = result[:-1]
+
+ return result
+
+ def __del__(self):
+ if self._exec_network:
+ del self._exec_network
+ if self._network:
+ del self._network
+ if self._plugin:
+ del self._plugin
diff --git a/cvat/apps/dextr_segmentation/docker-compose.dextr.yml b/cvat/apps/dextr_segmentation/docker-compose.dextr.yml
new file mode 100644
index 00000000..468523b8
--- /dev/null
+++ b/cvat/apps/dextr_segmentation/docker-compose.dextr.yml
@@ -0,0 +1,14 @@
+#
+# Copyright (C) 2018 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+#
+
+version: "2.3"
+
+services:
+ cvat:
+ build:
+ context: .
+ args:
+ WITH_DEXTR: "yes"
diff --git a/cvat/apps/dextr_segmentation/static/dextr_segmentation/js/enginePlugin.js b/cvat/apps/dextr_segmentation/static/dextr_segmentation/js/enginePlugin.js
new file mode 100644
index 00000000..548f19f6
--- /dev/null
+++ b/cvat/apps/dextr_segmentation/static/dextr_segmentation/js/enginePlugin.js
@@ -0,0 +1,213 @@
+/*
+ * Copyright (C) 2018 Intel Corporation
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+/* global
+ AREA_TRESHOLD:false
+ PolyShapeModel:false
+ ShapeCreatorModel:true
+ ShapeCreatorView:true
+ showMessage:false
+*/
+
+/* eslint no-underscore-dangle: 0 */
+
+window.addEventListener('DOMContentLoaded', () => {
+ $('').appendTo('#shapeTypeSelector');
+
+ const dextrCancelButtonId = 'dextrCancelButton';
+ const dextrOverlay = $(`
+
-
-
-
-
- {% for segm in item.segment_set.all %}
- {% for job in segm.job_set.all %}
-
-
-| {{base_url}}?id={{job.id}} | -
+
`).appendTo('body');
+
+ const dextrCancelButton = $(`#${dextrCancelButtonId}`);
+ dextrCancelButton.on('click', () => {
+ dextrCancelButton.prop('disabled', true);
+ $.ajax({
+ url: `/dextr/cancel/${window.cvat.job.id}`,
+ type: 'GET',
+ error: (errorData) => {
+ const message = `Can not cancel segmentation. Code: ${errorData.status}.
+ Message: ${errorData.responseText || errorData.statusText}`;
+ showMessage(message);
+ },
+ complete: () => {
+ dextrCancelButton.prop('disabled', false);
+ },
+ });
+ });
+
+ function ShapeCreatorModelWrapper(OriginalClass) {
+ // Constructor will patch some properties for a created instance
+ function constructorDecorator(...args) {
+ const instance = new OriginalClass(...args);
+
+ // Decorator for the defaultType property
+ Object.defineProperty(instance, 'defaultType', {
+ get: () => instance._defaultType,
+ set: (type) => {
+ if (!['box', 'points', 'polygon', 'polyline', 'auto_segmentation'].includes(type)) {
+ throw Error(`Unknown shape type found ${type}`);
+ }
+ instance._defaultType = type;
+ },
+ });
+
+ // Decorator for finish method.
+ const decoratedFinish = instance.finish;
+ instance.finish = (result) => {
+ if (instance._defaultType === 'auto_segmentation') {
+ try {
+ instance._defaultType = 'polygon';
+ decoratedFinish.call(instance, result);
+ } finally {
+ instance._defaultType = 'auto_segmentation';
+ }
+ } else {
+ decoratedFinish.call(instance, result);
+ }
+ };
+
+ return instance;
+ }
+
+ constructorDecorator.prototype = OriginalClass.prototype;
+ constructorDecorator.prototype.constructor = constructorDecorator;
+ return constructorDecorator;
+ }
+
+
+ function ShapeCreatorViewWrapper(OriginalClass) {
+ // Constructor will patch some properties for each instance
+ function constructorDecorator(...args) {
+ const instance = new OriginalClass(...args);
+
+ // Decorator for the _create() method.
+ // We save the decorated _create() and we will use it if type != 'auto_segmentation'
+ const decoratedCreate = instance._create;
+ instance._create = () => {
+ if (instance._type !== 'auto_segmentation') {
+ decoratedCreate.call(instance);
+ return;
+ }
+
+ instance._drawInstance = instance._frameContent.polyline().draw({ snapToGrid: 0.1 }).addClass('shapeCreation').attr({
+ 'stroke-width': 0,
+ z_order: Number.MAX_SAFE_INTEGER,
+ });
+ instance._createPolyEvents();
+
+ /* the _createPolyEvents method have added "drawdone"
+ * event handler which invalid for this case
+ * because of that reason we remove the handler and
+ * create the valid handler instead
+ */
+ instance._drawInstance.off('drawdone').on('drawdone', (e) => {
+ let actualPoints = window.cvat.translate.points.canvasToActual(e.target.getAttribute('points'));
+ actualPoints = PolyShapeModel.convertStringToNumberArray(actualPoints);
+
+ if (actualPoints.length < 4) {
+ showMessage('It is need to specify minimum four extreme points for an object');
+ instance._controller.switchCreateMode(true);
+ return;
+ }
+
+ const { frameWidth } = window.cvat.player.geometry;
+ const { frameHeight } = window.cvat.player.geometry;
+ for (let idx = 0; idx < actualPoints.length; idx += 1) {
+ const point = actualPoints[idx];
+ point.x = Math.clamp(point.x, 0, frameWidth);
+ point.y = Math.clamp(point.y, 0, frameHeight);
+ }
+
+ e.target.setAttribute('points',
+ window.cvat.translate.points.actualToCanvas(
+ PolyShapeModel.convertNumberArrayToString(actualPoints),
+ ));
+
+ const polybox = e.target.getBBox();
+ const area = polybox.width * polybox.height;
+
+ if (area > AREA_TRESHOLD) {
+ $.ajax({
+ url: `/dextr/create/${window.cvat.job.id}`,
+ type: 'POST',
+ data: JSON.stringify({
+ frame: window.cvat.player.frames.current,
+ points: actualPoints,
+ }),
+ contentType: 'application/json',
+ success: () => {
+ function intervalCallback() {
+ $.ajax({
+ url: `/dextr/check/${window.cvat.job.id}`,
+ type: 'GET',
+ success: (jobData) => {
+ if (['queued', 'started'].includes(jobData.status)) {
+ if (jobData.status === 'queued') {
+ dextrCancelButton.prop('disabled', false);
+ }
+ setTimeout(intervalCallback, 1000);
+ } else {
+ dextrOverlay.addClass('hidden');
+ if (jobData.status === 'finished') {
+ if (jobData.result) {
+ instance._controller.finish({ points: jobData.result }, 'polygon');
+ }
+ } else if (jobData.status === 'failed') {
+ const message = `Segmentation has fallen. Error: '${jobData.stderr}'`;
+ showMessage(message);
+ } else {
+ let message = `Check segmentation request returned "${jobData.status}" status.`;
+ if (jobData.stderr) {
+ message += ` Error: ${jobData.stderr}`;
+ }
+ showMessage(message);
+ }
+ }
+ },
+ error: (errorData) => {
+ dextrOverlay.addClass('hidden');
+ const message = `Can not check segmentation. Code: ${errorData.status}.`
+ + ` Message: ${errorData.responseText || errorData.statusText}`;
+ showMessage(message);
+ },
+ });
+ }
+
+ dextrCancelButton.prop('disabled', true);
+ dextrOverlay.removeClass('hidden');
+ setTimeout(intervalCallback, 1000);
+ },
+ error: (errorData) => {
+ const message = `Can not cancel ReID process. Code: ${errorData.status}.`
+ + ` Message: ${errorData.responseText || errorData.statusText}`;
+ showMessage(message);
+ },
+ });
+ }
+
+ instance._controller.switchCreateMode(true);
+ }); // end of "drawdone" handler
+ }; // end of _create() method
+
+ return instance;
+ } // end of constructorDecorator()
+
+ constructorDecorator.prototype = OriginalClass.prototype;
+ constructorDecorator.prototype.constructor = constructorDecorator;
+ return constructorDecorator;
+ } // end of ShapeCreatorViewWrapper
+
+ // Apply patch for classes
+ ShapeCreatorModel = ShapeCreatorModelWrapper(ShapeCreatorModel);
+ ShapeCreatorView = ShapeCreatorViewWrapper(ShapeCreatorView);
+});
diff --git a/cvat/apps/dextr_segmentation/urls.py b/cvat/apps/dextr_segmentation/urls.py
new file mode 100644
index 00000000..82e415bd
--- /dev/null
+++ b/cvat/apps/dextr_segmentation/urls.py
@@ -0,0 +1,12 @@
+# Copyright (C) 2018 Intel Corporation
+#
+# SPDX-License-Identifier: MIT
+
+from django.urls import path
+from . import views
+
+urlpatterns = [
+ path('create/
+
+
+
+
+
+ - Created objects are being saved..`); + } else if (state.status === 'saveUpdated') { + this._overlay.setMessage(`${this._overlay.getMessage()}
- Updated objects are being saved..`); + } else if (state.status === 'saveDeleted') { + this._overlay.setMessage(`${this._overlay.getMessage()}
- Deleted objects are being saved..`); + } else if (state.status === 'saveUnlocked') { + this._saveButton.prop('disabled', false).text('Save Work'); + } else { + const message = `Unknown state has been reached during annotation saving: ${state.status} ` + + 'Please report the problem to support team immediately.'; + showMessage(message); + } + } +} + + +function buildAnnotationSaver(initialData, shapeCollection) { + const model = new AnnotationSaverModel(initialData, shapeCollection); + const controller = new AnnotationSaverController(model); + new AnnotationSaverView(model, controller); +} diff --git a/cvat/apps/engine/static/engine/js/annotationUI.js b/cvat/apps/engine/static/engine/js/annotationUI.js index 53a0edca..1044fb25 100644 --- a/cvat/apps/engine/static/engine/js/annotationUI.js +++ b/cvat/apps/engine/static/engine/js/annotationUI.js @@ -5,289 +5,167 @@ */ /* exported callAnnotationUI blurAllElements drawBoxSize copyToClipboard */ -"use strict"; -function callAnnotationUI(jid) { - initLogger(jid); - let loadJobEvent = Logger.addContinuedEvent(Logger.EventType.loadJob); - serverRequest("/get/job/" + jid, function(job) { - serverRequest("get/annotation/job/" + jid, function(data) { - $('#loadingOverlay').remove(); - setTimeout(() => { - buildAnnotationUI(job, data, loadJobEvent); - }, 0); - }); - }); -} - -function initLogger(jobID) { - if (!Logger.initializeLogger('CVAT', jobID)) - { - let message = 'Could not initialize Logger. Please immediately report the problem to support team'; +/* global + AAMController:false + AAMModel:false + AAMView:false + AnnotationParser:false + Config:false + userConfirm:false + CoordinateTranslator:false + dumpAnnotationRequest:false + HistoryController:false + HistoryModel:false + HistoryView:false + Logger:false + Mousetrap:false + PlayerController:false + PlayerModel:false + PlayerView:false + PolyshapeEditorController:false + PolyshapeEditorModel:false + PolyshapeEditorView:false + PolyShapeView:false + ShapeBufferController:false + ShapeBufferModel:false + ShapeBufferView:false + ShapeCollectionController:false + ShapeCollectionModel:false + ShapeCollectionView:false + ShapeCreatorController:false + ShapeCreatorModel:false + ShapeCreatorView:false + ShapeGrouperController:false + ShapeGrouperModel:false + ShapeGrouperView:false + ShapeMergerController:false + ShapeMergerModel:false + ShapeMergerView:false + showMessage:false + showOverlay:false + buildAnnotationSaver:false + LabelsInfo:false +*/ + +async function initLogger(jobID) { + if (!Logger.initializeLogger(jobID)) { + const message = 'Logger has been already initialized'; console.error(message); showMessage(message); return; } Logger.setTimeThreshold(Logger.EventType.zoomImage); +} - serverRequest('/get/username', function(response) { - Logger.setUsername(response.username); - }); + +function blurAllElements() { + document.activeElement.blur(); } -function buildAnnotationUI(job, shapeData, loadJobEvent) { - // Setup some API - window.cvat = { - labelsInfo: new LabelsInfo(job), - translate: new CoordinateTranslator(), - player: { - geometry: { - scale: 1, - }, - frames: { - current: job.start, - start: job.start, - stop: job.stop, - } - }, - mode: null, - job: { - z_order: job.z_order, - id: job.jobid, - images: job.image_meta_data, - }, - search: { - value: window.location.search, - set: function(name, value) { - let searchParams = new URLSearchParams(this.value); +function uploadAnnotation(shapeCollectionModel, historyModel, + annotationParser, uploadAnnotationButton) { + $('#annotationFileSelector').one('change', (changedFileEvent) => { + const file = changedFileEvent.target.files['0']; + changedFileEvent.target.value = ''; + if (!file || file.type !== 'text/xml') return; + uploadAnnotationButton.text('Preparing..'); + uploadAnnotationButton.prop('disabled', true); + const overlay = showOverlay('File is being uploaded..'); - if (typeof value === 'undefined' || value === null) { - if (searchParams.has(name)) { - searchParams.delete(name); - } - } - else searchParams.set(name, value); - this.value = `${searchParams.toString()}`; - }, + const fileReader = new FileReader(); + fileReader.onload = (loadedFileEvent) => { + let data = null; - get: function(name) { + const asyncParse = () => { try { - let decodedURI = decodeURIComponent(this.value); - let urlSearchParams = new URLSearchParams(decodedURI); - if (urlSearchParams.has(name)) { - return urlSearchParams.get(name); - } - else return null; - } - catch (error) { - showMessage('Bad URL has been found'); - this.value = window.location.href; - return null; + data = annotationParser.parse(loadedFileEvent.target.result); + } catch (err) { + overlay.remove(); + showMessage(err.message); + return; + } finally { + uploadAnnotationButton.text('Upload Annotation'); + uploadAnnotationButton.prop('disabled', false); } - }, - - toString: function() { - return `${window.location.origin}/?${this.value}`; - } - } - }; - - // Remove external search parameters from url - window.history.replaceState(null, null, `${window.location.origin}/?id=${job.jobid}`); - - window.cvat.config = new Config(); - - // Setup components - let idGenerator = new IncrementIdGenerator(job.max_shape_id + 1); - let annotationParser = new AnnotationParser(job, window.cvat.labelsInfo, idGenerator); - - let shapeCollectionModel = new ShapeCollectionModel(idGenerator).import(shapeData, true); - let shapeCollectionController = new ShapeCollectionController(shapeCollectionModel); - let shapeCollectionView = new ShapeCollectionView(shapeCollectionModel, shapeCollectionController); - - // In case of old tasks that dont provide max saved shape id properly - if (job.max_shape_id === -1) { - idGenerator.reset(shapeCollectionModel.maxId + 1); - } - - window.cvat.data = { - get: () => shapeCollectionModel.exportAll(), - set: (data) => { - shapeCollectionModel.empty(); - shapeCollectionModel.import(data, false); - shapeCollectionModel.update(); - }, - clear: () => shapeCollectionModel.empty(), - }; - - let shapeBufferModel = new ShapeBufferModel(shapeCollectionModel); - let shapeBufferController = new ShapeBufferController(shapeBufferModel); - let shapeBufferView = new ShapeBufferView(shapeBufferModel, shapeBufferController); - - $('#shapeModeSelector').prop('value', job.mode); - let shapeCreatorModel = new ShapeCreatorModel(shapeCollectionModel, job); - let shapeCreatorController = new ShapeCreatorController(shapeCreatorModel); - let shapeCreatorView = new ShapeCreatorView(shapeCreatorModel, shapeCreatorController); - - let polyshapeEditorModel = new PolyshapeEditorModel(); - let polyshapeEditorController = new PolyshapeEditorController(polyshapeEditorModel); - let polyshapeEditorView = new PolyshapeEditorView(polyshapeEditorModel, polyshapeEditorController); - - // Add static member for class. It will be used by all polyshapes. - PolyShapeView.editor = polyshapeEditorModel; - - let shapeMergerModel = new ShapeMergerModel(shapeCollectionModel); - let shapeMergerController = new ShapeMergerController(shapeMergerModel); - new ShapeMergerView(shapeMergerModel, shapeMergerController); - - let shapeGrouperModel = new ShapeGrouperModel(shapeCollectionModel); - let shapeGrouperController = new ShapeGrouperController(shapeGrouperModel); - let shapeGrouperView = new ShapeGrouperView(shapeGrouperModel, shapeGrouperController); - - let aamModel = new AAMModel(shapeCollectionModel, (xtl, xbr, ytl, ybr) => { - playerModel.focus(xtl, xbr, ytl, ybr); - }, () => { - playerModel.fit(); - }); - let aamController = new AAMController(aamModel); - new AAMView(aamModel, aamController); - - shapeCreatorModel.subscribe(shapeCollectionModel); - shapeGrouperModel.subscribe(shapeCollectionView); - shapeCollectionModel.subscribe(shapeGrouperModel); - - $('#playerProgress').css('width', $('#player')["0"].clientWidth - 420); - - let playerGeometry = { - width: $('#playerFrame').width(), - height: $('#playerFrame').height(), - }; - let playerModel = new PlayerModel(job, playerGeometry); - let playerController = new PlayerController(playerModel, - () => shapeCollectionModel.activeShape, - (direction) => shapeCollectionModel.find(direction), - Object.assign({}, playerGeometry, { - left: $('#playerFrame').offset().left, - top: $('#playerFrame').offset().top, - }), job); - new PlayerView(playerModel, playerController, job); - - let historyModel = new HistoryModel(playerModel); - let historyController = new HistoryController(historyModel); - new HistoryView(historyController, historyModel); - - playerModel.subscribe(shapeCollectionModel); - playerModel.subscribe(shapeCollectionView); - playerModel.subscribe(shapeCreatorView); - playerModel.subscribe(shapeBufferView); - playerModel.subscribe(shapeGrouperView); - playerModel.subscribe(polyshapeEditorView); - playerModel.shift(window.cvat.search.get('frame') || 0, true); - - let shortkeys = window.cvat.config.shortkeys; - - setupHelpWindow(shortkeys); - setupSettingsWindow(); - setupMenu(job, shapeCollectionModel, annotationParser, aamModel, playerModel, historyModel); - setupFrameFilters(); - setupShortkeys(shortkeys, { - aam: aamModel, - shapeCreator: shapeCreatorModel, - shapeMerger: shapeMergerModel, - shapeGrouper: shapeGrouperModel, - shapeBuffer: shapeBufferModel, - shapeEditor: polyshapeEditorModel - }); - - $(window).on('click', function(event) { - Logger.updateUserActivityTimer(); - if (['helpWindow', 'settingsWindow'].indexOf(event.target.id) != -1) { - event.target.classList.add('hidden'); - } - }); - - let totalStat = shapeCollectionModel.collectStatistic()[1]; - loadJobEvent.addValues({ - 'track count': totalStat.boxes.annotation + totalStat.boxes.interpolation + - totalStat.polygons.annotation + totalStat.polygons.interpolation + - totalStat.polylines.annotation + totalStat.polylines.interpolation + - totalStat.points.annotation + totalStat.points.interpolation, - 'frame count': job.stop - job.start + 1, - 'object count': totalStat.total, - 'box count': totalStat.boxes.annotation + totalStat.boxes.interpolation, - 'polygon count': totalStat.polygons.annotation + totalStat.polygons.interpolation, - 'polyline count': totalStat.polylines.annotation + totalStat.polylines.interpolation, - 'points count': totalStat.points.annotation + totalStat.points.interpolation, - }); - loadJobEvent.close(); - - window.onbeforeunload = function(e) { - if (shapeCollectionModel.hasUnsavedChanges()) { - let message = "You have unsaved changes. Leave this page?"; - e.returnValue = message; - return message; - } - return; - }; - - $('#player').on('click', (e) => { - if (e.target.tagName.toLowerCase() != 'input') { - blurAllElements(); - } - }); -} + const asyncImport = () => { + try { + historyModel.empty(); + shapeCollectionModel.empty(); + shapeCollectionModel.import(data); + shapeCollectionModel.update(); + } finally { + overlay.remove(); + } + }; + overlay.setMessage('Data are being imported..'); + setTimeout(asyncImport); + }; -function copyToClipboard(text) { - let tempInput = $(""); - $("body").append(tempInput); - tempInput.prop('value', text).select(); - document.execCommand("copy"); - tempInput.remove(); + overlay.setMessage('File is being parsed..'); + setTimeout(asyncParse); + }; + fileReader.readAsText(file); + }).click(); } function setupFrameFilters() { - let brightnessRange = $('#playerBrightnessRange'); - let contrastRange = $('#playerContrastRange'); - let saturationRange = $('#playerSaturationRange'); - let frameBackground = $('#frameBackground'); - let reset = $('#resetPlayerFilterButton'); + const brightnessRange = $('#playerBrightnessRange'); + const contrastRange = $('#playerContrastRange'); + const saturationRange = $('#playerSaturationRange'); + const frameBackground = $('#frameBackground'); + const reset = $('#resetPlayerFilterButton'); let brightness = 100; let contrast = 100; let saturation = 100; - let shortkeys = window.cvat.config.shortkeys; + const { shortkeys } = window.cvat.config; + + function updateFilterParameters() { + frameBackground.css('filter', `contrast(${contrast}%) brightness(${brightness}%) saturate(${saturation}%)`); + } + brightnessRange.attr('title', ` - ${shortkeys['change_player_brightness'].view_value} - ${shortkeys['change_player_brightness'].description}`); + ${shortkeys.change_player_brightness.view_value} - ${shortkeys.change_player_brightness.description}`); contrastRange.attr('title', ` - ${shortkeys['change_player_contrast'].view_value} - ${shortkeys['change_player_contrast'].description}`); + ${shortkeys.change_player_contrast.view_value} - ${shortkeys.change_player_contrast.description}`); saturationRange.attr('title', ` - ${shortkeys['change_player_saturation'].view_value} - ${shortkeys['change_player_saturation'].description}`); + ${shortkeys.change_player_saturation.view_value} - ${shortkeys.change_player_saturation.description}`); - let changeBrightnessHandler = Logger.shortkeyLogDecorator(function(e) { - if (e.shiftKey) brightnessRange.prop('value', brightness + 10).trigger('input'); - else brightnessRange.prop('value', brightness - 10).trigger('input'); + const changeBrightnessHandler = Logger.shortkeyLogDecorator((e) => { + if (e.shiftKey) { + brightnessRange.prop('value', brightness + 10).trigger('input'); + } else { + brightnessRange.prop('value', brightness - 10).trigger('input'); + } }); - let changeContrastHandler = Logger.shortkeyLogDecorator(function(e) { - if (e.shiftKey) contrastRange.prop('value', contrast + 10).trigger('input'); - else contrastRange.prop('value', contrast - 10).trigger('input'); + const changeContrastHandler = Logger.shortkeyLogDecorator((e) => { + if (e.shiftKey) { + contrastRange.prop('value', contrast + 10).trigger('input'); + } else { + contrastRange.prop('value', contrast - 10).trigger('input'); + } }); - let changeSaturationHandler = Logger.shortkeyLogDecorator(function(e) { - if (e.shiftKey) saturationRange.prop('value', saturation + 10).trigger('input'); - else saturationRange.prop('value', saturation - 10).trigger('input'); + const changeSaturationHandler = Logger.shortkeyLogDecorator((e) => { + if (e.shiftKey) { + saturationRange.prop('value', saturation + 10).trigger('input'); + } else { + saturationRange.prop('value', saturation - 10).trigger('input'); + } }); - Mousetrap.bind(shortkeys["change_player_brightness"].value, changeBrightnessHandler, 'keydown'); - Mousetrap.bind(shortkeys["change_player_contrast"].value, changeContrastHandler, 'keydown'); - Mousetrap.bind(shortkeys["change_player_saturation"].value, changeSaturationHandler, 'keydown'); + Mousetrap.bind(shortkeys.change_player_brightness.value, changeBrightnessHandler, 'keydown'); + Mousetrap.bind(shortkeys.change_player_contrast.value, changeContrastHandler, 'keydown'); + Mousetrap.bind(shortkeys.change_player_saturation.value, changeSaturationHandler, 'keydown'); - reset.on('click', function() { + reset.on('click', () => { brightness = 100; contrast = 100; saturation = 100; @@ -297,74 +175,61 @@ function setupFrameFilters() { updateFilterParameters(); }); - brightnessRange.on('input', function(e) { - let value = Math.clamp(+e.target.value, +e.target.min, +e.target.max); - brightness = e.target.value = value; + brightnessRange.on('input', (e) => { + const value = Math.clamp(+e.target.value, +e.target.min, +e.target.max); + e.target.value = value; + brightness = value; updateFilterParameters(); }); - contrastRange.on('input', function(e) { - let value = Math.clamp(+e.target.value, +e.target.min, +e.target.max); - contrast = e.target.value = value; + contrastRange.on('input', (e) => { + const value = Math.clamp(+e.target.value, +e.target.min, +e.target.max); + e.target.value = value; + contrast = value; updateFilterParameters(); }); - saturationRange.on('input', function(e) { - let value = Math.clamp(+e.target.value, +e.target.min, +e.target.max); - saturation = e.target.value = value; + saturationRange.on('input', (e) => { + const value = Math.clamp(+e.target.value, +e.target.min, +e.target.max); + e.target.value = value; + saturation = value; updateFilterParameters(); }); - - function updateFilterParameters() { - frameBackground.css('filter', `contrast(${contrast}%) brightness(${brightness}%) saturate(${saturation}%)`); - } } function setupShortkeys(shortkeys, models) { - let annotationMenu = $('#annotationMenu'); - let settingsWindow = $('#settingsWindow'); - let helpWindow = $('#helpWindow'); + const annotationMenu = $('#annotationMenu'); + const settingsWindow = $('#settingsWindow'); + const helpWindow = $('#helpWindow'); - Mousetrap.prototype.stopCallback = function() { - return false; - }; + Mousetrap.prototype.stopCallback = () => false; - let openHelpHandler = Logger.shortkeyLogDecorator(function() { - let helpInvisible = helpWindow.hasClass('hidden'); + const openHelpHandler = Logger.shortkeyLogDecorator(() => { + const helpInvisible = helpWindow.hasClass('hidden'); if (helpInvisible) { annotationMenu.addClass('hidden'); settingsWindow.addClass('hidden'); helpWindow.removeClass('hidden'); - } - else { + } else { helpWindow.addClass('hidden'); } return false; }); - let openSettingsHandler = Logger.shortkeyLogDecorator(function() { - let settingsInvisible = settingsWindow.hasClass('hidden'); + const openSettingsHandler = Logger.shortkeyLogDecorator(() => { + const settingsInvisible = settingsWindow.hasClass('hidden'); if (settingsInvisible) { annotationMenu.addClass('hidden'); helpWindow.addClass('hidden'); settingsWindow.removeClass('hidden'); - } - else { + } else { $('#settingsWindow').addClass('hidden'); } return false; }); - let saveHandler = Logger.shortkeyLogDecorator(function() { - let saveButtonLocked = $('#saveButton').prop('disabled'); - if (!saveButtonLocked) { - $('#saveButton').click(); - } - return false; - }); - - let cancelModeHandler = Logger.shortkeyLogDecorator(function() { + const cancelModeHandler = Logger.shortkeyLogDecorator(() => { switch (window.cvat.mode) { case 'aam': models.aam.switchAAMMode(); @@ -384,83 +249,62 @@ function setupShortkeys(shortkeys, models) { case 'poly_editing': models.shapeEditor.finish(); break; + default: + break; } return false; }); - Mousetrap.bind(shortkeys["open_help"].value, openHelpHandler, 'keydown'); - Mousetrap.bind(shortkeys["open_settings"].value, openSettingsHandler, 'keydown'); - Mousetrap.bind(shortkeys["save_work"].value, saveHandler, 'keydown'); - Mousetrap.bind(shortkeys["cancel_mode"].value, cancelModeHandler, 'keydown'); + Mousetrap.bind(shortkeys.open_help.value, openHelpHandler, 'keydown'); + Mousetrap.bind(shortkeys.open_settings.value, openSettingsHandler, 'keydown'); + Mousetrap.bind(shortkeys.cancel_mode.value, cancelModeHandler, 'keydown'); } function setupHelpWindow(shortkeys) { - let closeHelpButton = $('#closeHelpButton'); - let helpTable = $('#shortkeyHelpTable'); + const closeHelpButton = $('#closeHelpButton'); + const helpTable = $('#shortkeyHelpTable'); - closeHelpButton.on('click', function() { + closeHelpButton.on('click', () => { $('#helpWindow').addClass('hidden'); }); - for (let key in shortkeys) { - helpTable.append($(`