Skip to content
This repository has been archived by the owner on Dec 7, 2021. It is now read-only.

release: Master into dev #856

Merged
merged 31 commits into from
Aug 20, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
39521f2
Fix ymax and rename Tensorflow nama everywhere (#763)
JacopoMangiavacchi Apr 15, 2019
0fe6386
feat: Save partial project progress during project creation (#769)
wbreza Apr 17, 2019
c10c971
feat: CNTK Export Provider (#771)
wbreza Apr 17, 2019
d6a0594
Fix: Enables selection of azure region for custom vision export (#765)
wbreza Apr 18, 2019
37234ec
refactor: Remove editor footer
tbarlow12 Apr 18, 2019
6974aef
Project service functions
tbarlow12 Apr 15, 2019
1001528
Added tests for project service
tbarlow12 Apr 15, 2019
2ef4e13
Added confirm and strings for tag and rename operations
tbarlow12 Apr 15, 2019
4f325df
Split out project functions and asset functions into respective services
tbarlow12 Apr 15, 2019
f394ea3
Editor Page and canvas upates
tbarlow12 Apr 15, 2019
4193bc0
Register mixins and run async loop
tbarlow12 Apr 15, 2019
8439574
Saving assets in async foreach loop
tbarlow12 Apr 15, 2019
996a555
Delete tag working
tbarlow12 Apr 15, 2019
5b4610b
Rename tag function in editor page
tbarlow12 Apr 15, 2019
bbd83a4
Fix tag removal test for editor page
tbarlow12 Apr 16, 2019
8b34db5
Clean up and docs
tbarlow12 Apr 16, 2019
354623e
Lint fixes
tbarlow12 Apr 16, 2019
4a0dcb2
Dummy commit to kick off build again
tbarlow12 Apr 16, 2019
3998b6e
fix: Refactored project tag/delete updates
wbreza Apr 19, 2019
0b06d6a
test: Refactored editor page tests
wbreza Apr 19, 2019
48805dc
test: Verify tag update/delete project actions
wbreza Apr 19, 2019
0429590
doc: Add bug & feature templates (#780)
wbreza Apr 23, 2019
25b4aa2
Create CODE_OF_CONDUCT.md (#779)
wbreza Apr 23, 2019
a2ef52c
docs: updates to readme and changelog (#781)
pjlittle Apr 23, 2019
921dbac
feat: Active Learning Updates (#778)
wbreza Apr 24, 2019
acbbc86
fix: Fix display of tag color picker (#782)
tbarlow12 Apr 26, 2019
f29963c
feat: Add CSV Exporter (#757)
JacopoMangiavacchi Apr 26, 2019
90754dc
fix: change method for alloc string to buffer (#777)
golee Apr 29, 2019
4d02db4
fix: Updates export options for pascalVOC rename (#788)
wbreza Apr 29, 2019
2234c8a
fix: Updates backwards compat & fixes cntk export image bug (#789)
wbreza Apr 29, 2019
745e854
Release 2.1.0 (#790)
wbreza Apr 29, 2019
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: 32 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: ''
assignees: ''

---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

**Expected behavior**
A clear and concise description of what you expected to happen.

**Screenshots**
If applicable, add screenshots to help explain your problem.

**Desktop (please complete the following information):**
- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]

**Additional context**
Add any other context about the problem here.
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
22 changes: 20 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,26 @@

<!-- cl-start -->

# [2.1.0](https://github.com/Microsoft/VoTT/compare/v2.0.0...v2.1.0) (04-29-2019)
[GitHub Release](https://github.com/Microsoft/VoTT/releases/tag/v2.1.0)

- fix: Updates backwards compat & fixes cntk export image bug (#789)
- fix: Updates export options for pascalVOC rename (#788)
- fix: change method for alloc string to buffer (#777)
- feat: Add CSV Exporter (#757)
- fix: Fix display of tag color picker (#782)
- feat: Active Learning Updates (#778)
- doc: updates to readme and changelog (#781)
- doc: Adds CODE_OF_CONDUCT.md (#779)
- doc: Add bug & feature templates (#780)
- fix: Refactored project tag/delete updates (#764)
- fix: Enables selection of azure region for custom vision export (#765)
- feat: CNTK Export Provider (#771)
- feat: Save partial project progress during project creation (#769)
- fix: Fixes ymax and rename Tensorflow nama everywhere (#763)

# [2.0.0](https://github.com/Microsoft/VoTT/compare/v2.0.0-preview.3...v2.0.0) (04-12-2019)
[GitHub Release](https://github.com/Microsoft/VoTT/releases/tag/2.0.0)
[GitHub Release](https://github.com/Microsoft/VoTT/releases/tag/v2.0.0)

- doc: update v1/master reference (#748)
- ci: update pipeline for v2 flipover to master (#747)
Expand Down Expand Up @@ -36,7 +54,7 @@
- ci: update pipelines to work for all branches with prefix dev (#700)

# [2.0.0-preview.3](https://github.com/Microsoft/VoTT/compare/v2.0.0-preview.2...v2.0.0-preview.3) (03-20-2019)
[GitHub Release](https://github.com/Microsoft/VoTT/releases/tag/2.0.0-preview.3)
[GitHub Release](https://github.com/Microsoft/VoTT/releases/tag/v2.0.0-preview.3)

- ci: Clean up sonar cloud issues
- Remove height from root style (#694)
Expand Down
76 changes: 76 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
# Contributor Covenant Code of Conduct

## Our Pledge

In the interest of fostering an open and welcoming environment, we as
contributors and maintainers pledge to making participation in our project and
our community a harassment-free experience for everyone, regardless of age, body
size, disability, ethnicity, sex characteristics, gender identity and expression,
level of experience, education, socio-economic status, nationality, personal
appearance, race, religion, or sexual identity and orientation.

## Our Standards

Examples of behavior that contributes to creating a positive environment
include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or
advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic
address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting

## Our Responsibilities

Project maintainers are responsible for clarifying the standards of acceptable
behavior and are expected to take appropriate and fair corrective action in
response to any instances of unacceptable behavior.

Project maintainers have the right and responsibility to remove, edit, or
reject comments, commits, code, wiki edits, issues, and other contributions
that are not aligned to this Code of Conduct, or to ban temporarily or
permanently any contributor for other behaviors that they deem inappropriate,
threatening, offensive, or harmful.

## Scope

This Code of Conduct applies both within project spaces and in public spaces
when an individual is representing the project or its community. Examples of
representing a project or community include using an official project e-mail
address, posting via an official social media account, or acting as an appointed
representative at an online or offline event. Representation of a project may be
further defined and clarified by project maintainers.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the project team at [email protected]. All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. The project team is
obligated to maintain confidentiality with regard to the reporter of an incident.
Further details of specific enforcement policies may be posted separately.

Project maintainers who do not follow or enforce the Code of Conduct in good
faith may face temporary or permanent repercussions as determined by other
members of the project's leadership.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html

[homepage]: https://www.contributor-covenant.org

For answers to common questions about this code of conduct, see
https://www.contributor-covenant.org/faq
60 changes: 35 additions & 25 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,34 +28,37 @@ VoTT helps facilitate an end-to-end machine learning pipeline:

<!-- toc -->

* [Getting Started](#getting-started)
* [Download and install a release package for your platform (recommended)](#download-and-install-a-release-package-for-your-platform-recommended)
* [Build and run from source](#build-and-run-from-source)
* [V1 & V2](#v1--v2)
* [Where is V1](#where-is-v1)
* [V1 releases](#v1-releases)
* [Can I use my V1 project in V2](#can-i-use-my-v1-project-in-v2)
* [Using VoTT](#using-vott)
* [Creating Connections](#creating-connections)
* [Creating a New Project](#creating-a-new-project)
* [Project Settings](#project-settings)
* [Security Tokens](#security-tokens)
* [Labeling an Image](#labeling-an-image)
* [Labeling a Video](#labeling-a-video)
* [Exporting Labels](#exporting-labels)
* [Keyboard Shortcuts](#keyboard-shortcuts)
* [Tag Shortcuts](#tag-shortcuts)
* [Tag Ordering](#tag-ordering)
* [Tag Locking](#tag-locking)
* [Editor Shortcuts](#editor-shortcuts)
* [Collaborators](#collaborators)
* [Contributing to VoTT](#contributing-to-vott)
- [VoTT (Visual Object Tagging Tool)](#vott-visual-object-tagging-tool)
- [Table of Contents](#table-of-contents)
- [Getting Started](#getting-started)
- [Download and install a release package for your platform (recommended)](#download-and-install-a-release-package-for-your-platform-recommended)
- [Build and run from source](#build-and-run-from-source)
- [Run as Web Application](#run-as-web-application)
- [V1 & V2](#v1--v2)
- [Where is V1](#where-is-v1)
- [V1 releases](#v1-releases)
- [V1 projects in V2](#v1-projects-in-v2)
- [Using VoTT](#using-vott)
- [Creating Connections](#creating-connections)
- [Creating a New Project](#creating-a-new-project)
- [Project Settings](#project-settings)
- [Security Tokens](#security-tokens)
- [Labeling an Image](#labeling-an-image)
- [Labeling a Video](#labeling-a-video)
- [Exporting Labels](#exporting-labels)
- [Keyboard Shortcuts](#keyboard-shortcuts)
- [Tag Ordering](#tag-ordering)
- [Tag Locking](#tag-locking)
- [Editor Shortcuts](#editor-shortcuts)
- [Mouse Controls](#mouse-controls)
- [Collaborators](#collaborators)
- [Contributing to VoTT](#contributing-to-vott)

<!-- tocstop -->

## Getting Started

VoTT can be installed as a native application or run from source.
VoTT can be installed as a native application or run from source. VoTT is also available as a [stand-alone Web application](https://vott.z5.web.core.windows.net) and can be used in any modern Web browser.

### Download and install a release package for your platform (recommended)

Expand All @@ -71,11 +74,16 @@ VoTT requires [NodeJS (>= 10.x, Dubnium) and NPM](https://github.com/nodejs/Rele
npm ci
npm start
```

> **IMPORTANT**
>
> When running locally with `npm`, both the electron and the browser versions of the application will start. One major difference is that the electron version can access the local file system.

### Run as Web Application

Using a modern Web browser, VoTT can be loaded from: [https://vott.z5.web.core.windows.net](https://vott.z5.web.core.windows.net)

As noted above, the Web version of VoTT *cannot* access the local file system; all assets must be imported/exported through a Cloud project.

## V1 & V2

VoTT V2 is a refactor and refresh of the original Electron-based application. As the usage and demand for VoTT grew, `V2` was started as an initiative to improve and make VoTT more extensible and maintainable. In addition, `V2` uses more modern development frameworks and patterns (React, Redux) and is authored in TypeScript.
Expand Down Expand Up @@ -187,8 +195,10 @@ Tagging and drawing regions is not possible while the video is playing.
Once assets have been labeled, they can be exported into a variety of formats:

* [Azure Custom Vision Service](https://azure.microsoft.com/en-us/services/cognitive-services/custom-vision-service/)
* [Microsoft Cognitive Toolkit (CNTK)](https://github.com/Microsoft/CNTK)
* TensorFlow (Pascal VOC and TFRecords)
* VoTT (generic JSON schema)
* Comma Separated Values (CSV)

In addition, users may choose to export

Expand Down Expand Up @@ -238,7 +248,7 @@ VOTT allows you to fine tune the bounding boxes using the arrow keys in a few di
* Ctrl + Alt + Arrowkey - Shrink Region
* Ctrl + Shift + Arrowkey - Expand Region

The slide viewer can be navigated from the keyboard as follows:
The slide viewer can be navigated from the keyboard as follows:

* W or ArrowUp - Previous Asset
* S or ArrowDown - Next Asset
Expand Down
1 change: 1 addition & 0 deletions cocoSSDModel/classes.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[{"name":"/m/01g317","id":1,"displayName":"person"},{"name":"/m/0199g","id":2,"displayName":"bicycle"},{"name":"/m/0k4j","id":3,"displayName":"car"},{"name":"/m/04_sv","id":4,"displayName":"motorcycle"},{"name":"/m/05czz6l","id":5,"displayName":"airplane"},{"name":"/m/01bjv","id":6,"displayName":"bus"},{"name":"/m/07jdr","id":7,"displayName":"train"},{"name":"/m/07r04","id":8,"displayName":"truck"},{"name":"/m/019jd","id":9,"displayName":"boat"},{"name":"/m/015qff","id":10,"displayName":"traffic light"},{"name":"/m/01pns0","id":11,"displayName":"fire hydrant"},{"name":"/m/02pv19","id":13,"displayName":"stop sign"},{"name":"/m/015qbp","id":14,"displayName":"parking meter"},{"name":"/m/0cvnqh","id":15,"displayName":"bench"},{"name":"/m/015p6","id":16,"displayName":"bird"},{"name":"/m/01yrx","id":17,"displayName":"cat"},{"name":"/m/0bt9lr","id":18,"displayName":"dog"},{"name":"/m/03k3r","id":19,"displayName":"horse"},{"name":"/m/07bgp","id":20,"displayName":"sheep"},{"name":"/m/01xq0k1","id":21,"displayName":"cow"},{"name":"/m/0bwd_0j","id":22,"displayName":"elephant"},{"name":"/m/01dws","id":23,"displayName":"bear"},{"name":"/m/0898b","id":24,"displayName":"zebra"},{"name":"/m/03bk1","id":25,"displayName":"giraffe"},{"name":"/m/01940j","id":27,"displayName":"backpack"},{"name":"/m/0hnnb","id":28,"displayName":"umbrella"},{"name":"/m/080hkjn","id":31,"displayName":"handbag"},{"name":"/m/01rkbr","id":32,"displayName":"tie"},{"name":"/m/01s55n","id":33,"displayName":"suitcase"},{"name":"/m/02wmf","id":34,"displayName":"frisbee"},{"name":"/m/071p9","id":35,"displayName":"skis"},{"name":"/m/06__v","id":36,"displayName":"snowboard"},{"name":"/m/018xm","id":37,"displayName":"sports ball"},{"name":"/m/02zt3","id":38,"displayName":"kite"},{"name":"/m/03g8mr","id":39,"displayName":"baseball bat"},{"name":"/m/03grzl","id":40,"displayName":"baseball glove"},{"name":"/m/06_fw","id":41,"displayName":"skateboard"},{"name":"/m/019w40","id":42,"displayName":"surfboard"},{"name":"/m/0dv9c","id":43,"displayName":"tennis racket"},{"name":"/m/04dr76w","id":44,"displayName":"bottle"},{"name":"/m/09tvcd","id":46,"displayName":"wine glass"},{"name":"/m/08gqpm","id":47,"displayName":"cup"},{"name":"/m/0dt3t","id":48,"displayName":"fork"},{"name":"/m/04ctx","id":49,"displayName":"knife"},{"name":"/m/0cmx8","id":50,"displayName":"spoon"},{"name":"/m/04kkgm","id":51,"displayName":"bowl"},{"name":"/m/09qck","id":52,"displayName":"banana"},{"name":"/m/014j1m","id":53,"displayName":"apple"},{"name":"/m/0l515","id":54,"displayName":"sandwich"},{"name":"/m/0cyhj_","id":55,"displayName":"orange"},{"name":"/m/0hkxq","id":56,"displayName":"broccoli"},{"name":"/m/0fj52s","id":57,"displayName":"carrot"},{"name":"/m/01b9xk","id":58,"displayName":"hot dog"},{"name":"/m/0663v","id":59,"displayName":"pizza"},{"name":"/m/0jy4k","id":60,"displayName":"donut"},{"name":"/m/0fszt","id":61,"displayName":"cake"},{"name":"/m/01mzpv","id":62,"displayName":"chair"},{"name":"/m/02crq1","id":63,"displayName":"couch"},{"name":"/m/03fp41","id":64,"displayName":"potted plant"},{"name":"/m/03ssj5","id":65,"displayName":"bed"},{"name":"/m/04bcr3","id":67,"displayName":"dining table"},{"name":"/m/09g1w","id":70,"displayName":"toilet"},{"name":"/m/07c52","id":72,"displayName":"tv"},{"name":"/m/01c648","id":73,"displayName":"laptop"},{"name":"/m/020lf","id":74,"displayName":"mouse"},{"name":"/m/0qjjc","id":75,"displayName":"remote"},{"name":"/m/01m2v","id":76,"displayName":"keyboard"},{"name":"/m/050k8","id":77,"displayName":"cell phone"},{"name":"/m/0fx9l","id":78,"displayName":"microwave"},{"name":"/m/029bxz","id":79,"displayName":"oven"},{"name":"/m/01k6s3","id":80,"displayName":"toaster"},{"name":"/m/0130jx","id":81,"displayName":"sink"},{"name":"/m/040b_t","id":82,"displayName":"refrigerator"},{"name":"/m/0bt_c3","id":84,"displayName":"book"},{"name":"/m/01x3z","id":85,"displayName":"clock"},{"name":"/m/02s195","id":86,"displayName":"vase"},{"name":"/m/01lsmm","id":87,"displayName":"scissors"},{"name":"/m/0kmg4","id":88,"displayName":"teddy bear"},{"name":"/m/03wvsk","id":89,"displayName":"hair drier"},{"name":"/m/012xff","id":90,"displayName":"toothbrush"}]
Binary file added cocoSSDModel/group1-shard1of5
Binary file not shown.
Binary file added cocoSSDModel/group1-shard2of5
Binary file not shown.
Binary file added cocoSSDModel/group1-shard3of5
Binary file not shown.
Binary file added cocoSSDModel/group1-shard4of5
Binary file not shown.
Binary file added cocoSSDModel/group1-shard5of5
Binary file not shown.
Loading