Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update develop from release-0.6.0 branch #1266

Merged
merged 18 commits into from
Mar 15, 2020
Merged

Update develop from release-0.6.0 branch #1266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
26da003
Merge pull request #468 from opencv/hotfix-0.4.2
nmanovic Jun 4, 2019
52c9b5f
Changed version number (0, 5, 'final', 0).
Sep 10, 2019
0967a74
Updated changelog file.
Sep 10, 2019
fda7c1a
fixed default attribute values for tracked shapes (#703)
azhavoro Sep 10, 2019
242b3df
Release 0.5.0
nmanovic Sep 12, 2019
eacfab7
Updated CHANGELOG with information about Zenodo
Oct 17, 2019
69bc32b
Updated CHANGELOG with information about Zenodo (#777)
nmanovic Oct 17, 2019
87a74a7
Updated version of the project.
Oct 17, 2019
0913abf
Merge pull request #778 from opencv/hotfix-0.5.1
nmanovic Oct 17, 2019
9124584
Hotfix: fixed skikit-image version (#965)
bsekachev Dec 16, 2019
42aad8b
Increased CVAT version (0.5.2)
Dec 16, 2019
bdecc41
Merge branch 'master' into release-0.6.0
Mar 5, 2020
3ab6ca1
Fixed date in CHANGELOG.md
Mar 5, 2020
2f0fe36
sort frame shapes by z_order (#1258)
azhavoro Mar 13, 2020
70b99dd
Merge branch 'release-0.6.0' into nm/update_develop
Mar 15, 2020
7b4e99c
Updated CHANGELOG.md
Mar 15, 2020
f629dd3
Updated CVAT version.
Mar 15, 2020
9b3b019
Merge remote-tracking branch 'origin/release-0.6.0' into nm/update_de…
Mar 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 23 additions & 9 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,26 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [1.0.0.alpha] - 2020-02-XX
## [1.0.0-beta] - Unreleased
### Added
-

### Changed
-

### Deprecated
-

### Removed
-

### Fixed
-

### Security
-

## [0.6.0] - 2020-03-15
### Added
- Server only support for projects. Extend REST API v1 (/api/v1/projects*)
- Ability to get basic information about users without admin permissions ([#750](https://github.com/opencv/cvat/issues/750))
Expand All @@ -28,12 +47,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Yolov3 interpretation script fix and changes to mapping.json
- YOLO format support ([#1151](https://github.com/opencv/cvat/pull/1151))

### Deprecated
-

### Removed
-

### Fixed
- Exception in Git plugin [#826](https://github.com/opencv/cvat/issues/826)
- Label ids in TFrecord format now start from 1 [#866](https://github.com/opencv/cvat/issues/866)
Expand All @@ -42,8 +55,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Output labels for VOC format can be specified with Datumaro [#942](https://github.com/opencv/cvat/issues/942)
- Annotations can be filtered before dumping with Datumaro [#994](https://github.com/opencv/cvat/issues/994)

### Security
-
## [0.5.2] - 2019-12-15
### Fixed
- Frozen version of scikit-image==0.15 in requirements.txt because next releases don't support Python 3.5

## [0.5.1] - 2019-10-17
### Added
Expand Down
5 changes: 2 additions & 3 deletions cvat/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@

# Copyright (C) 2018 Intel Corporation
# Copyright (C) 2018-2020 Intel Corporation
#
# SPDX-License-Identifier: MIT

from cvat.utils.version import get_version

VERSION = (0, 6, 0, 'alpha', 0)
VERSION = (1, 0, 0, 'alpha', 0)

__version__ = get_version(VERSION)
2 changes: 1 addition & 1 deletion cvat/apps/annotation/annotation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ def _get_frame(annotations, shape):

annotations = {}
data_manager = DataManager(self._annotation_ir)
for shape in data_manager.to_shapes(self._db_task.size):
for shape in sorted(data_manager.to_shapes(self._db_task.size), key=lambda s: s.get("z_order", 0)):
_get_frame(annotations, shape).labeled_shapes.append(self._export_labeled_shape(shape))

for tag in self._annotation_ir.tags:
Expand Down