Skip to content

Commit

Permalink
Fix many spelling errors (#3244)
Browse files Browse the repository at this point in the history
* Fix spelling errors

* Bump version numbers after the spelling fixes

* Fix OSX build (os.mknod requires super-priviligies)

* Fixed eslint warnings.

Co-authored-by: Nikita Manovich <nikita.manovich@intel.com>
  • Loading branch information
Roman Donchenko and Nikita Manovich authored Jun 1, 2021
1 parent d3fb352 commit d15a319
Show file tree
Hide file tree
Showing 72 changed files with 188 additions and 189 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
cache-from: type=local,src=/tmp/cvat_cache_server
tags: openvino/cvat_server:latest
load: true
- name: Runing unit tests
- name: Running unit tests
env:
HOST_COVERAGE_DATA_DIR: ${{ github.workspace }}
CONTAINER_COVERAGE_DATA_DIR: "/coverage_data"
Expand Down Expand Up @@ -203,7 +203,7 @@ jobs:
needs: [Unit_testing, E2E_testing]
steps:
- uses: actions/checkout@v2
- name: Geting SHA from the default branch
- name: Getting SHA from the default branch
id: get-sha
run: |
URL_get_default_branch="https://api.github.com/repos/${{ github.repository }}"
Expand Down
8 changes: 4 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed

- PATCH requests from cvat-core submit only changed fields (<https://github.com/openvinotoolkit/cvat/pull/2445>)
- deploy.sh in serverless folder is seperated into deploy_cpu.sh and deploy_gpu.sh (<https://github.com/openvinotoolkit/cvat/pull/2546>)
- deploy.sh in serverless folder is separated into deploy_cpu.sh and deploy_gpu.sh (<https://github.com/openvinotoolkit/cvat/pull/2546>)
- Bumped nuclio version to 1.5.8
- Migrated to Antd 4.9 (<https://github.com/openvinotoolkit/cvat/pull/2536>)

Expand Down Expand Up @@ -307,11 +307,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Cannot read property 'pinned' of undefined because of zOrder related issues (<https://github.com/opencv/cvat/pull/1874>)
- Do not iterate over hidden objects in aam (which are invisible because of zOrder) (<https://github.com/opencv/cvat/pull/1874>)
- Cursor position is reset after changing a text field (<https://github.com/opencv/cvat/pull/1874>)
- Hidden points and cuboids can be selected to be groupped (<https://github.com/opencv/cvat/pull/1874>)
- Hidden points and cuboids can be selected to be grouped (<https://github.com/opencv/cvat/pull/1874>)
- `outside` annotations should not be in exported images (<https://github.com/opencv/cvat/issues/1620>)
- `CVAT for video format` import error with interpolation (<https://github.com/opencv/cvat/issues/1893>)
- `Image compression` definition mismatch (<https://github.com/opencv/cvat/issues/1900>)
- Points are dublicated during polygon interpolation sometimes (<https://github.com/opencv/cvat/pull/1892>)
- Points are duplicated during polygon interpolation sometimes (<https://github.com/opencv/cvat/pull/1892>)
- When redraw a shape with activated autobordering, previous points are visible (<https://github.com/opencv/cvat/pull/1892>)
- No mapping between side object element and context menu in some attributes (<https://github.com/opencv/cvat/pull/1923>)
- Interpolated shapes exported as `keyframe = True` (<https://github.com/opencv/cvat/pull/1937>)
Expand Down Expand Up @@ -462,7 +462,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Removed

- Annotation convertation utils, currently supported natively via Datumaro framework
- Annotation conversion utils, currently supported natively via Datumaro framework
(<https://github.com/opencv/cvat/pull/1477>)

### Fixed
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ You develop CVAT under WSL (Windows subsystem for Linux) following next steps.
wsl -d Ubuntu-18.04
```

- Run all commands from this isntallation guide in WSL Ubuntu shell.
- Run all commands from this installation guide in WSL Ubuntu shell.

## Setup additional components in development environment

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ RUN if [ "$INSTALL_SOURCES" = "yes" ]; then \
fi
COPY --from=build-image /tmp/openh264/openh264*.tar.gz /tmp/ffmpeg/ffmpeg*.tar.gz ${HOME}/sources/

# Copy python virtual enviroment and FFmpeg binaries from build-image
# Copy python virtual environment and FFmpeg binaries from build-image
COPY --from=build-image /opt/venv /opt/venv
ENV PATH="/opt/venv/bin:${PATH}"
COPY --from=build-image /opt/ffmpeg /usr
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ Prebuilt docker images for CVAT releases are available on Docker Hub:
Automatically generated Swagger documentation for Django REST API is available
on `<cvat_origin>/api/swagger`(default: `localhost:8080/api/swagger`).

Swagger documentation is visiable on allowed hostes, Update environement
Swagger documentation is visible on allowed hosts, Update environment
variable in docker-compose.yml file with cvat hosted machine IP or domain
name. Example - `ALLOWED_HOSTS: 'localhost, 127.0.0.1'`.

Expand Down
2 changes: 1 addition & 1 deletion cvat-canvas/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -245,4 +245,4 @@ canvas.draw({
You can call setup() during editing, dragging, and resizing only to update objects, not to change a frame.
You can change frame during draw only when you do not redraw an existing object

Other methods do not change state and can be used everytime.
Other methods do not change state and can be used at any time.
2 changes: 1 addition & 1 deletion cvat-canvas/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cvat-canvas/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cvat-canvas",
"version": "2.4.3",
"version": "2.4.4",
"description": "Part of Computer Vision Annotation Tool which presents its canvas library",
"main": "src/canvas.ts",
"scripts": {
Expand Down
27 changes: 13 additions & 14 deletions cvat-canvas/src/typescript/autoborderHandler.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (C) 2020 Intel Corporation
// Copyright (C) 2020-2021 Intel Corporation
//
// SPDX-License-Identifier: MIT

Expand Down Expand Up @@ -28,14 +28,14 @@ export class AutoborderHandlerImpl implements AutoborderHandler {
private auxiliaryGroupID: number | null;
private auxiliaryClicks: number[];
private listeners: Record<
number,
Record<
number,
{
click: (event: MouseEvent) => void;
dblclick: (event: MouseEvent) => void;
}
>
number,
Record<
number,
{
click: (event: MouseEvent) => void;
dblclick: (event: MouseEvent) => void;
}
>
>;

public constructor(frameContent: SVGSVGElement) {
Expand Down Expand Up @@ -172,12 +172,11 @@ export class AutoborderHandlerImpl implements AutoborderHandler {
} else {
// sign defines bypass direction
const landmarks = this.auxiliaryClicks;
const sign =
Math.sign(landmarks[2] - landmarks[0]) *
Math.sign(landmarks[1] - landmarks[0]) *
Math.sign(landmarks[2] - landmarks[1]);
const sign = Math.sign(landmarks[2] - landmarks[0])
* Math.sign(landmarks[1] - landmarks[0])
* Math.sign(landmarks[2] - landmarks[1]);

// go via a polygon and get vertexes
// go via a polygon and get vertices
// the first vertex has been already drawn
const way = [];
for (let i = landmarks[0] + sign; ; i += sign) {
Expand Down
2 changes: 1 addition & 1 deletion cvat-canvas/src/typescript/cuboid.ts
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ function setupCuboidPoints(points: Point[]): any[] {
? Math.abs(points[1].y - points[0].y)
: Math.abs(points[1].y - points[2].y);

// seperate into left and right point
// separate into left and right point
// we pick the first and third point because we know assume they will be on
// opposite corners
if (points[0].x < points[2].x) {
Expand Down
4 changes: 2 additions & 2 deletions cvat-canvas/src/typescript/drawHandler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -462,11 +462,11 @@ export class DrawHandlerImpl implements DrawHandler {
this.drawInstance.draw('point', e);
} else {
this.drawInstance.draw('update', e);
const deltaTreshold = 15;
const deltaThreshold = 15;
const dx = (e.clientX - lastDrawnPoint.x) ** 2;
const dy = (e.clientY - lastDrawnPoint.y) ** 2;
const delta = Math.sqrt(dx + dy);
if (delta > deltaTreshold) {
if (delta > deltaThreshold) {
this.drawInstance.draw('point', e);
}
}
Expand Down
4 changes: 2 additions & 2 deletions cvat-canvas/src/typescript/editHandler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,11 @@ export class EditHandlerImpl implements EditHandler {
if (lastDrawnPoint.x === null || lastDrawnPoint.y === null) {
(this.editLine as any).draw('point', e);
} else {
const deltaTreshold = 15;
const deltaThreshold = 15;
const dxsqr = (e.clientX - lastDrawnPoint.x) ** 2;
const dysqr = (e.clientY - lastDrawnPoint.y) ** 2;
const delta = Math.sqrt(dxsqr + dysqr);
if (delta > deltaTreshold) {
if (delta > deltaThreshold) {
(this.editLine as any).draw('point', e);
}
}
Expand Down
8 changes: 4 additions & 4 deletions cvat-canvas/src/typescript/interactionHandler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ export class InteractionHandlerImpl implements InteractionHandler {
if ((e.button === 0 || (e.button === 2 && this.interactionData.enableNegVertices)) && !e.altKey) {
e.preventDefault();
const [cx, cy] = translateToSVG((this.canvas.node as any) as SVGSVGElement, [e.clientX, e.clientY]);
if (!this.isWithingFrame(cx, cy)) return;
if (!this.isWithinFrame(cx, cy)) return;
if (!this.isWithinThreshold(cx, cy)) return;

this.currentInteractionShape = this.canvas
Expand Down Expand Up @@ -149,7 +149,7 @@ export class InteractionHandlerImpl implements InteractionHandler {
}
};

// clear this listener in relese()
// clear this listener in release()
this.canvas.on('mousedown.interaction', eventListener);
}

Expand Down Expand Up @@ -234,7 +234,7 @@ export class InteractionHandlerImpl implements InteractionHandler {
return xDiff < this.thresholdRectSize / 2 && yDiff < this.thresholdRectSize / 2;
}

private isWithingFrame(x: number, y: number): boolean {
private isWithinFrame(x: number, y: number): boolean {
const { offset, image } = this.geometry;
const { width, height } = image;
const [imageX, imageY] = [Math.round(x - offset), Math.round(y - offset)];
Expand Down Expand Up @@ -280,7 +280,7 @@ export class InteractionHandlerImpl implements InteractionHandler {
}

if (this.interactionData.enableSliding && this.interactionShapes.length) {
if (this.isWithingFrame(x, y)) {
if (this.isWithinFrame(x, y)) {
if (this.interactionData.enableThreshold && !this.isWithinThreshold(x, y)) return;
this.onInteraction(
[
Expand Down
4 changes: 2 additions & 2 deletions cvat-canvas/src/typescript/splitHandler.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (C) 2019-2020 Intel Corporation
// Copyright (C) 2019-2021 Intel Corporation
//
// SPDX-License-Identifier: MIT

Expand Down Expand Up @@ -43,7 +43,7 @@ export class SplitHandlerImpl implements SplitHandler {
}

private closeSplitting(): void {
// Split done is true if an object was splitted
// Split done is true if an object was split
// Split also can be called with { enabled: false } without splitting an object
if (!this.splitDone) {
this.onSplitDone(null);
Expand Down
2 changes: 1 addition & 1 deletion cvat-core/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Description

This CVAT module is a client-side JavaScipt library to management of objects, frames, logs, etc.
This CVAT module is a client-side JavaScript library for management of objects, frames, logs, etc.
It contains the core logic of the Computer Vision Annotation Tool.

## Versioning
Expand Down
2 changes: 1 addition & 1 deletion cvat-core/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cvat-core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cvat-core",
"version": "3.13.0",
"version": "3.13.1",
"description": "Part of Computer Vision Tool which presents an interface for client-side integration",
"main": "babel.config.js",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion cvat-core/src/annotations-collection.js
Original file line number Diff line number Diff line change
Expand Up @@ -868,7 +868,7 @@

const deepSearch = (deepSearchFrom, deepSearchTo) => {
// deepSearchFrom is expected to be a frame that doesn't satisfy a filter
// deepSearchTo is expected to be a frame that satifies a filter
// deepSearchTo is expected to be a frame that satisfies a filter

let [prev, next] = [deepSearchFrom, deepSearchTo];
// half division method instead of linear search
Expand Down
4 changes: 2 additions & 2 deletions cvat-core/src/annotations-objects.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
throw new DataError(`Points must have exact 8 points, but got ${points.length / 2}`);
}
} else {
throw new ArgumentError(`Unknown value of shapeType has been recieved ${shapeType}`);
throw new ArgumentError(`Unknown value of shapeType has been received ${shapeType}`);
}
}

Expand Down Expand Up @@ -1452,7 +1452,7 @@
/ Math.sqrt(Math.pow(y2 - y1, 2) + Math.pow(x2 - x1, 2)),
);
} else {
// The link below works for lines (which have infinit length)
// The link below works for lines (which have infinite length)
// There is a case when perpendicular doesn't cross the edge
// In this case we don't use the computed distance
// Instead we use just distance to the nearest point
Expand Down
2 changes: 1 addition & 1 deletion cvat-core/src/common.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
for (const prop in filter) {
if (Object.prototype.hasOwnProperty.call(filter, prop)) {
if (!(prop in fields)) {
throw new ArgumentError(`Unsupported filter property has been recieved: "${prop}"`);
throw new ArgumentError(`Unsupported filter property has been received: "${prop}"`);
} else if (!fields[prop](filter[prop])) {
throw new ArgumentError(`Received filter property "${prop}" is not satisfied for checker`);
}
Expand Down
2 changes: 1 addition & 1 deletion cvat-core/src/project.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
class Project {
/**
* In a fact you need use the constructor only if you want to create a project
* @param {object} initialData - Object which is used for initalization
* @param {object} initialData - Object which is used for initialization
* <br> It can contain keys:
* <br> <li style="margin-left: 10px;"> name
* <br> <li style="margin-left: 10px;"> labels
Expand Down
10 changes: 5 additions & 5 deletions cvat-core/src/session.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
const Review = require('./review');
const { FieldUpdateTrigger } = require('./common');

function buildDublicatedAPI(prototype) {
function buildDuplicatedAPI(prototype) {
Object.defineProperties(prototype, {
annotations: Object.freeze({
value: {
Expand Down Expand Up @@ -576,7 +576,7 @@
* Create a log and add it to a log collection <br>
* Durable logs will be added after "close" method is called for them <br>
* The fields "task_id" and "job_id" automatically added when add logs
* throught a task or a job <br>
* through a task or a job <br>
* Ignore rules exist for some logs (e.g. zoomImage, changeAttribute) <br>
* Payload of ignored logs are shallowly combined to previous logs of the same type
* @method log
Expand Down Expand Up @@ -999,7 +999,7 @@
class Task extends Session {
/**
* In a fact you need use the constructor only if you want to create a task
* @param {object} initialData - Object which is used for initalization
* @param {object} initialData - Object which is used for initialization
* <br> It can contain keys:
* <br> <li style="margin-left: 10px;"> name
* <br> <li style="margin-left: 10px;"> assignee
Expand Down Expand Up @@ -1697,8 +1697,8 @@
closeSession,
} = require('./annotations');

buildDublicatedAPI(Job.prototype);
buildDublicatedAPI(Task.prototype);
buildDuplicatedAPI(Job.prototype);
buildDuplicatedAPI(Task.prototype);

Job.prototype.save.implementation = async function () {
if (this.id) {
Expand Down
4 changes: 2 additions & 2 deletions cvat-core/tests/api/annotations.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (C) 2020 Intel Corporation
// Copyright (C) 2020-2021 Intel Corporation
//
// SPDX-License-Identifier: MIT

Expand Down Expand Up @@ -211,7 +211,7 @@ describe('Feature: put annotations', () => {
expect(task.annotations.put([state1])).rejects.toThrow(window.cvat.exceptions.ArgumentError);
});

test('put shape without points and with invalud points to a task', async () => {
test('put shape without points and with invalid points to a task', async () => {
const task = (await window.cvat.tasks.get({ id: 101 }))[0];
await task.annotations.clear(true);
const state = new window.cvat.classes.ObjectState({
Expand Down
2 changes: 1 addition & 1 deletion cvat-ui/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cvat-ui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cvat-ui",
"version": "1.20.1",
"version": "1.20.2",
"description": "CVAT single-page application",
"main": "src/index.tsx",
"scripts": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ export default function ControlVisibilityObserver<P = {}>(
visibilityHeightThreshold = wrapper.offsetTop + wrapper.offsetHeight;
// start observing parent size
observer.observe(ref.current.parentElement as HTMLElement);
// then put it to extra controls if parent height is not enought
// then put it to extra controls if parent height is not enough
setVisible(availableHeight - reservedHeight >= visibilityHeightThreshold);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ function AdaptiveAutoAnnotationForm({ formRef }: { formRef: RefObject<FormInstan
);
}

function AdvanvedConfigurationForm({ formRef }: { formRef: RefObject<FormInstance> }): JSX.Element {
function AdvancedConfigurationForm({ formRef }: { formRef: RefObject<FormInstance> }): JSX.Element {
return (
<Form layout='vertical' ref={formRef}>
<Form.Item
Expand Down Expand Up @@ -197,7 +197,7 @@ export default function CreateProjectContent(): JSX.Element {
/>
</Col>
<Col span={24}>
<AdvanvedConfigurationForm formRef={advancedFormRef} />
<AdvancedConfigurationForm formRef={advancedFormRef} />
</Col>
<Col span={24}>
<Button type='primary' onClick={onSumbit}>
Expand Down
Loading

0 comments on commit d15a319

Please sign in to comment.