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.

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

Added sorting methods #3937

Merged
merged 29 commits into from
Dec 9, 2021
Merged

Added sorting methods #3937

merged 29 commits into from
Dec 9, 2021

Conversation

Marishka17
Copy link
Contributor

@Marishka17 Marishka17 commented Nov 23, 2021

Motivation and context

Resolve #3877
Resolve #1092
This PR contains ability to choose data sorting for images, archive and pdf.

Screenshot from 2021-11-29 11-35-17

How has this been tested?

Manually, unit tests

Checklist

License

  • I submit my code changes under the same MIT License that covers the project.
    Feel free to contact the maintainers if that's a concern.
    - [ ] I have updated the license header for each file (see an example below)
# Copyright (C) 2021 Intel Corporation
#
# SPDX-License-Identifier: MIT

@Marishka17 Marishka17 changed the title [WIP] Added sorting methods Added sorting methods Nov 25, 2021
cvat/apps/engine/utils.py Outdated Show resolved Hide resolved
cvat-core/src/enums.js Outdated Show resolved Hide resolved
@ErikOrjehag
Copy link

Awesome! 😁👍

@Marishka17 Marishka17 changed the title [WIP] Added sorting methods Added sorting methods Nov 30, 2021
nmanovic
nmanovic previously approved these changes Nov 30, 2021
@Marishka17 Marishka17 changed the title Added sorting methods [WIP] Added sorting methods Nov 30, 2021
@Marishka17 Marishka17 changed the title [WIP] Added sorting methods Added sorting methods Nov 30, 2021
nmanovic
nmanovic previously approved these changes Dec 1, 2021
cvat-core/src/session.js Outdated Show resolved Hide resolved
cvat-core/src/session.js Outdated Show resolved Hide resolved
@bsekachev
Copy link
Member

Does it work with backup/restore feature?

Co-authored-by: Boris Sekachev <boris.sekachev@intel.com>
@Marishka17
Copy link
Contributor Author

Does it work with backup/restore feature?

I forgot to check this case. No.. I will fix.

@Marishka17 Marishka17 changed the title Added sorting methods [WIP] Added sorting methods Dec 1, 2021
@Marishka17 Marishka17 changed the title [WIP] Added sorting methods Added sorting methods Dec 3, 2021
Copy link
Contributor

@azhavoro azhavoro left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@nmanovic nmanovic merged commit 68fbcde into develop Dec 9, 2021
@nmanovic nmanovic deleted the mk/data_sorting branch December 9, 2021 13:45
@nmanovic nmanovic mentioned this pull request Mar 4, 2022
7 tasks
@Huy2122k
Copy link

Huy2122k commented Sep 10, 2022

@Marishka17 @nmanovic
PREDEFINED sorting is wrong with server files using cache and share? this is my testing in rest api. I think it's was reversed ??

request
{
  "chunk_size": 20,
  "image_quality": 70,
  "server_files": [
     "test_1.jpg", 
     "test_2.jpg", 
     "test_10.jpg",
     "test_3.jpg"
  ],
  "remote_files": [],
  "use_zip_chunks": true,
  "use_cache": true,
  "storage_method": "cache",
  "storage": "share",
  "sorting_method": "predefined"
}
#response
{
    "chunk_size": 20,
    "size": 0,
    "image_quality": 70,
    "start_frame": 0,
    "stop_frame": 0,
    "frame_filter": "",
    "compressed_chunk_type": "imageset",
    "original_chunk_type": "imageset",
    "client_files": [],
    "server_files": [
        "test_3.jpg",
        "test_10.jpg",
        "test_2.jpg",
        "test_1.jpg"
    ],
    "remote_files": [],
    "use_zip_chunks": false,
    "use_cache": false,
    "copy_data": false,
    "storage_method": "cache",
    "storage": "share",
    "sorting_method": "predefined"
}

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
6 participants