-
+
{% endblock %}
diff --git a/cvat/apps/dashboard/templates/dashboard/task.html b/cvat/apps/dashboard/templates/dashboard/task.html
deleted file mode 100644
index 5b18c4f4f025..000000000000
--- a/cvat/apps/dashboard/templates/dashboard/task.html
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {% for segm in item.segment_set.all %}
- {% for job in segm.job_set.all %}
-
- | {{base_url}}?id={{job.id}} |
-
- {% endfor %}
- {% endfor %}
-
-
-
diff --git a/cvat/apps/dashboard/tests.py b/cvat/apps/dashboard/tests.py
deleted file mode 100644
index ba48a2a3d51c..000000000000
--- a/cvat/apps/dashboard/tests.py
+++ /dev/null
@@ -1,7 +0,0 @@
-
-# Copyright (C) 2018 Intel Corporation
-#
-# SPDX-License-Identifier: MIT
-
-# Create your tests here.
-
diff --git a/cvat/apps/dashboard/urls.py b/cvat/apps/dashboard/urls.py
index 3f732f0e3ed5..9c2cc5380e92 100644
--- a/cvat/apps/dashboard/urls.py
+++ b/cvat/apps/dashboard/urls.py
@@ -9,5 +9,6 @@
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 1b2f81dccc84..864369b886f7 100644
--- a/cvat/apps/dashboard/views.py
+++ b/cvat/apps/dashboard/views.py
@@ -53,29 +53,18 @@ def JsTreeView(request):
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', []),
- 'css_3rdparty': CSS_3RDPARTY.get('dashboard', []),
- })
+ })
\ No newline at end of file
diff --git a/cvat/apps/documentation/__init__.py b/cvat/apps/documentation/__init__.py
index 6808b8600f35..743392981f00 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/js/dashboardPlugin.js b/cvat/apps/documentation/static/documentation/js/dashboardPlugin.js
new file mode 100644
index 000000000000..7f948c9c5f28
--- /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 5d6839a3ffeb..000000000000
--- a/cvat/apps/documentation/static/documentation/js/shortcuts.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright (C) 2018 Intel Corporation
- *
- * SPDX-License-Identifier: MIT
- */
-
-/* global
- Mousetrap:false
-*/
-
-Mousetrap.bind(window.cvat.config.shortkeys["open_help"].value, function() {
- window.open("/documentation/user_guide.html");
-
- return false;
-});
diff --git a/cvat/apps/engine/migrations/0015_rest_api_20190217.py b/cvat/apps/engine/migrations/0015_rest_api_20190217.py
index f9989c7aa929..1022443aff1e 100644
--- a/cvat/apps/engine/migrations/0015_rest_api_20190217.py
+++ b/cvat/apps/engine/migrations/0015_rest_api_20190217.py
@@ -125,7 +125,7 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='task',
name='image_quality',
- field=models.PositiveSmallIntegerField(),
+ field=models.PositiveSmallIntegerField(default=50),
),
migrations.CreateModel(
name='Plugin',
diff --git a/cvat/apps/engine/models.py b/cvat/apps/engine/models.py
index a27afd84bff5..25f15bf0d422 100644
--- a/cvat/apps/engine/models.py
+++ b/cvat/apps/engine/models.py
@@ -66,7 +66,7 @@ class Task(models.Model):
segment_size = models.PositiveIntegerField(default=0)
z_order = models.BooleanField(default=False)
flipped = models.BooleanField(default=False)
- image_quality = models.PositiveSmallIntegerField()
+ image_quality = models.PositiveSmallIntegerField(default=50)
status = models.CharField(max_length=32, choices=StatusChoice.choices(),
default=StatusChoice.ANNOTATION)
diff --git a/cvat/apps/engine/static/engine/js/annotationUI.js b/cvat/apps/engine/static/engine/js/annotationUI.js
index 746f27cc651f..ac0bc3727728 100644
--- a/cvat/apps/engine/static/engine/js/annotationUI.js
+++ b/cvat/apps/engine/static/engine/js/annotationUI.js
@@ -57,7 +57,7 @@ function callAnnotationUI(jid) {
serverRequest("/api/v1/jobs/" + jid, function(job) {
serverRequest("/api/v1/tasks/" + job.task_id, function(task) {
serverRequest("/api/v1/tasks/" + job.task_id + "/frames/meta", function(imageMetaCache) {
- serverRequest("get/annotation/job/" + jid, function(data) {
+ serverRequest(`/api/v1/tasks/${jid}/annotation`, function(data) {
$('#loadingOverlay').remove();
setTimeout(() => {
// FIXME: code cloning
diff --git a/cvat/apps/engine/static/engine/js/base.js b/cvat/apps/engine/static/engine/js/base.js
index 1674b3589c48..953baaa6937a 100644
--- a/cvat/apps/engine/static/engine/js/base.js
+++ b/cvat/apps/engine/static/engine/js/base.js
@@ -24,6 +24,35 @@ Math.clamp = function(x, min, max) {
return Math.min(Math.max(x, min), max);
};
+String.customSplit = function(string, separator) {
+ const regex = /"/gi;
+ const occurences = [];
+ let occurence = null;
+ while ( (occurence = regex.exec(string)) ) {
+ occurences.push(occurence.index);
+ }
+
+ if (occurences.length % 2) {
+ occurences.pop();
+ }
+
+ let copy = "";
+ if (occurences.length) {
+ let start = 0;
+ for (let idx = 0; idx < occurences.length; idx += 2) {
+ copy += string.substr(start, occurences[idx] - start);
+ copy += string.substr(occurences[idx], occurences[idx + 1] - occurences[idx] + 1)
+ .replace(new RegExp(separator, 'g'), '\0');
+ start = occurences[idx + 1] + 1;
+ }
+ copy += string.substr(occurences[occurences.length - 1] + 1);
+ } else {
+ copy = string;
+ }
+
+ return copy.split(new RegExp(separator, 'g')).map((x) => x.replace(/\0/g, separator));
+};
+
function userConfirm(message, onagree, ondisagree) {
let template = $('#confirmTemplate');
diff --git a/cvat/apps/engine/static/engine/js/labelsInfo.js b/cvat/apps/engine/static/engine/js/labelsInfo.js
index f7880494f055..e4401d158fb4 100644
--- a/cvat/apps/engine/static/engine/js/labelsInfo.js
+++ b/cvat/apps/engine/static/engine/js/labelsInfo.js
@@ -14,9 +14,9 @@
class LabelsInfo {
constructor(job) {
- this._labels = new Object;
- this._attributes = new Object;
- this._colorIdxs = new Object;
+ this._labels = {};
+ this._attributes = {};
+ this._colorIdxs = {};
for (let labelKey in job.labels) {
let label = {
@@ -50,6 +50,40 @@ class LabelsInfo {
}
}
+ restConstructor(labels) {
+ this._labels = {};
+ this._attributes = {};
+ this._colorIdxs = {};
+
+ for (let label of labels) {
+ this._labels[label.id] = {
+ name: label.name,
+ attributes: {},
+ }
+
+ for (let attr of label.attributes) {
+ this._attributes[attr.id] = convertAttribute(attr);
+ this._labels[label.id].attributes[attr.id] = this._attributes[attr.id];
+
+ }
+
+ this._colorIdxs[label.id] = +label.id;
+ }
+
+ function convertAttribute(attribute) {
+ return {
+ mutable: attribute.mutable,
+ type: attribute.input_type,
+ name: attribute.name,
+ values: attribute.input_type === 'checkbox' ?
+ [attribute.values[0].toLoweCase() !== 'false' && attribute.values[0] !== false] :
+ attribute.values,
+ }
+ }
+
+ return this;
+ }
+
labelColorIdx(labelId) {
return this._colorIdxs[labelId];
}
@@ -143,11 +177,60 @@ class LabelsInfo {
strToValues(type, string) {
switch (type) {
case 'checkbox':
- return [string !== '0' && string !== 'false' && string !== false];
+ return [string !== '0' && string.toLoweCase() !== 'false' && string !== false];
case 'text':
return [string];
default:
return string.toString().split(',');
}
}
+
+ static serialize(deserialized) {
+ let serialized = "";
+ for (let label of deserialized) {
+ serialized += " " + label.name;
+ for (let attr of label.attributes) {
+ serialized += ' ' + (attr.mutable? "~":"@");
+ serialized += attr.input_type + '=' + attr.name + ':';
+ serialized += attr.values.join(',');
+ }
+ }
+
+ return serialized.trim();
+ }
+
+ static deserialize(serialized) {
+ const normalized = serialized.replace(/'+/g, `'`).replace(/"+/g, `"`).replace(/\s+/g, ` `).trim();
+ const fragments = String.customSplit(normalized, ' ');
+
+ const deserialized = [];
+ let latest = null;
+ for (let fragment of fragments) {
+ fragment = fragment.replace(/\+/g, ' ').trim();
+ if ((fragment.startsWith('~')) || (fragment.startsWith('@'))) {
+ const regex = /(@|~)(checkbox|select|number|text|radio)=([,?!-_0-9a-zA-Z()\s"]+):([,?!-_0-9a-zA-Z()"\s]+)/g;
+ const result = regex.exec(fragment);
+ if (result === null || latest === null) {
+ throw Error('Bad labels format');
+ }
+
+ const values = String.customSplit(result[4], ',');
+ latest.attributes.push({
+ name: result[3],
+ mutable: result[1] === '~',
+ input_type: result[2],
+ default_value: values[0],
+ values: values,
+ });
+ } else {
+ latest = {
+ name: fragment,
+ attributes: []
+ };
+
+ deserialized.push(latest);
+ }
+ }
+ return deserialized;
+ }
}
diff --git a/cvat/apps/engine/task.py b/cvat/apps/engine/task.py
index a6eeed627773..e3dbb33dc153 100644
--- a/cvat/apps/engine/task.py
+++ b/cvat/apps/engine/task.py
@@ -42,7 +42,7 @@ def create(tid, data):
@transaction.atomic
def rq_handler(job, exc_type, exc_value, traceback):
- tid = job.id.split('/')[1]
+ tid = job.id.split('/')[-1]
db_task = models.Task.objects.select_for_update().get(pk=tid)
with open(db_task.get_log_path(), "wt") as log_file:
print_exception(exc_type, exc_value, traceback, file=log_file)
@@ -190,7 +190,7 @@ def _copy_video_to_task(video, db_task):
shutil.copyfile(image_orig_path, image_dest_path)
image = Image.open(db_task.get_frame_path(0))
- models.Video.objects.create(db_task, path=video,
+ models.Video.objects.create(task=db_task, path=video,
start_frame=0, stop_frame=db_task.size, step=1,
width=image.width, height=image.height)
image.close()
@@ -303,6 +303,7 @@ def _create_thread(tid, data):
if video:
db_task.mode = "interpolation"
+ video = os.path.join(upload_dir, video)
_copy_video_to_task(video, db_task)
else:
db_task.mode = "annotation"