Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
69 changes: 0 additions & 69 deletions .drone.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/blank.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ on:
pull_request:
push:
branches:
- master
- main
jobs:
build-and-test:
defaults:
Expand Down
13 changes: 5 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
<img src="http://www.viametoolkit.org/wp-content/uploads/2016/08/viami_logo.png" alt="VIAME Logo" width="200" height="78">
<br>
VIAME-Web is a web interface for performing data management, video annotation, and running a portion of the algorithms stored
within the VIAME (https://github.com/VIAME/VIAME) repository. When compiled, docker instances for VIAME-Web can be run either
as local servers or online in web services. A sample instance of VIAME-Web is running on a public server at https://viame.kitware.com.
Additional documentation will be available in the future for users.
DIVE is a web interface for performing data management, video annotation, and running a portion of the algorithms stored within the VIAME (https://github.com/VIAME/VIAME) repository. When compiled, docker instances for DIVE can be run either as local servers or online in web services. A sample instance of DIVE is running on a public server at https://viame.kitware.com. Additional documentation will be available in the future for users.

![docs/images/Banner.png](docs/images/Banner.png)

Expand All @@ -12,7 +9,7 @@ Additional documentation will be available in the future for users.
* Video Annotation
* Single-frame boxes and polygons
* Multi-frame bounding box tracks with interpolation
* Automatic transcoding to support `avi`, `mov`,
* Automatic transcoding to support `avi`, `mov`
* Still image annotation
* Bounding boxes
* Polygons
Expand All @@ -22,13 +19,13 @@ Additional documentation will be available in the future for users.

## Documentation

* [Client User Guide](https://viame.github.io/VIAME-Web/)
* [Client User Guide](https://kitware.github.io/dive/)
* [Client Development Docs](client/README.md)
* [Docker Getting Started Guide](docker/README.md)

## Code Architecture

VIAME-Web uses [Girder](https://girder.readthedocs.io/en/stable/) for data management and has a typical girder + girder worker +
DIVE uses [Girder](https://girder.readthedocs.io/en/stable/) for data management and has a typical girder + girder worker +
docker architecture. Command-line executables for VIAME and FFmpeg are built inside the worker docker image. See docker scripts
for additional details.

Expand All @@ -51,7 +48,7 @@ Run `pip install` on the against the server directory. Then `girder-worker -l in

### Input

VIAME-Web takes two different kinds of input data, either a video file (e.g. .mpg) or an image sequence. Both types can
DIVE takes two different kinds of input data, either a video file (e.g. .mpg) or an image sequence. Both types can
be optionally accompanied with a CSV file containing video annotations. Example input sequences are available at
https://viame.kitware.com/girder#collections.

Expand Down
4 changes: 2 additions & 2 deletions client/README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# VIAME Web Frontend
# DIVE Frontend

This directory contains the code for both

* The specific VIAME-Web client deployed to [viame.kitware.com](https://viame.kitware.com)
* The specific DIVE client deployed to [viame.kitware.com](https://viame.kitware.com)
* The web annotation library published to npm as [`vue-media-annotator`](https://developer.aliyun.com/mirror/npm/package/vue-media-annotator)

## Development
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {
computed, defineComponent, PropType, Ref, ref,
} from '@vue/composition-api';

import { Attribute } from 'viame-web-common/apispec';
import { Attribute } from 'dive-common/apispec';

export default defineComponent({
name: 'AttributeSettings',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ import {
PropType,
computed,
} from '@vue/composition-api';
import { Attribute } from 'viame-web-common/apispec';
import { Attribute } from 'dive-common/apispec';
import {
useSelectedTrackId,
useFrame,
useTrackMap,
} from 'vue-media-annotator/provides';
import { getTrack } from 'vue-media-annotator/use/useTrackStore';
import AttributeInput from 'viame-web-common/components/AttributeInput.vue';
import PanelSubsection from 'viame-web-common/components/PanelSubsection.vue';
import AttributeInput from 'dive-common/components/AttributeInput.vue';
import PanelSubsection from 'dive-common/components/PanelSubsection.vue';


export default defineComponent({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
useTypeStyling,
} from 'vue-media-annotator/provides';

import PanelSubsection from 'viame-web-common/components/PanelSubsection.vue';
import PanelSubsection from 'dive-common/components/PanelSubsection.vue';

export default defineComponent({
name: 'ConfidenceSubsection',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import {
defineComponent, ref, PropType,
} from '@vue/composition-api';
import type { DatasetType } from 'viame-web-common/apispec';
import type { DatasetType } from 'dive-common/apispec';
import type { ImageDataItem } from 'vue-media-annotator/components/annotators/ImageAnnotator.vue';

import {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script lang="ts">
import Vue, { PropType } from 'vue';
import { cloneDeep } from 'lodash';
import { NewTrackSettings } from 'viame-web-common/use/useSettings';
import { NewTrackSettings } from 'dive-common/use/useSettings';

export default Vue.extend({
name: 'CreationMode',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import {
defineComponent, computed, PropType, ref, onBeforeMount, reactive,
} from '@vue/composition-api';
import { Pipelines, Pipe, useApi } from 'viame-web-common/apispec';
import { Pipelines, Pipe, useApi } from 'dive-common/apispec';

export default defineComponent({
props: {
Expand Down Expand Up @@ -139,7 +139,7 @@ export default defineComponent({
<v-card-text class="pb-0">
Choose a pipeline type. Check the
<a
href="https://viame.github.io/VIAME-Web/Pipeline-Documentation/"
href="https://kitware.github.io/dive/Pipeline-Documentation/"
target="_blank"
>docs</a>
for more information about these options.
Expand Down Expand Up @@ -194,8 +194,8 @@ export default defineComponent({
</v-menu>
<v-dialog
:value="pipelineState.status !== null"
@input="dismissLaunchDialog"
max-width="400"
@input="dismissLaunchDialog"
>
<v-card outlined>
<v-card-title>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {
defineComponent, computed, PropType, ref, onBeforeMount,
} from '@vue/composition-api';

import { useApi, TrainingConfigs } from 'viame-web-common/apispec';
import { useApi, TrainingConfigs } from 'dive-common/apispec';


export default defineComponent({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ import {
import { TypeList, TrackList } from 'vue-media-annotator/components';
import { useAllTypes } from 'vue-media-annotator/provides';

import { NewTrackSettings, TypeSettings } from 'viame-web-common/use/useSettings';
import TrackDetailsPanel from 'viame-web-common/components/TrackDetailsPanel.vue';
import CreationMode from 'viame-web-common/components/CreationMode.vue';
import TypeSettingsPanel from 'viame-web-common/components/TypeSettingsPanel.vue';
import { NewTrackSettings, TypeSettings } from 'dive-common/use/useSettings';
import TrackDetailsPanel from 'dive-common/components/TrackDetailsPanel.vue';
import CreationMode from 'dive-common/components/CreationMode.vue';
import TypeSettingsPanel from 'dive-common/components/TypeSettingsPanel.vue';

export default defineComponent({
props: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ import {
import { getTrack } from 'vue-media-annotator/use/useTrackStore';
import TrackItem from 'vue-media-annotator/components/TrackItem.vue';

import { useApi, Attribute } from 'viame-web-common/apispec';
import AttributeInput from 'viame-web-common/components/AttributeInput.vue';
import AttributeEditor from 'viame-web-common/components/AttributeEditor.vue';
import AttributeSubsection from 'viame-web-common/components/AttributesSubsection.vue';
import ConfidenceSubsection from 'viame-web-common/components/ConfidenceSubsection.vue';
import { useApi, Attribute } from 'dive-common/apispec';
import AttributeInput from 'dive-common/components/AttributeInput.vue';
import AttributeEditor from 'dive-common/components/AttributeEditor.vue';
import AttributeSubsection from 'dive-common/components/AttributesSubsection.vue';
import ConfidenceSubsection from 'dive-common/components/ConfidenceSubsection.vue';


export default defineComponent({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script lang="ts">
import Vue, { PropType } from 'vue';
import { cloneDeep } from 'lodash';
import { TypeSettings } from 'viame-web-common/use/useSettings';
import { TypeSettings } from 'dive-common/use/useSettings';

export default Vue.extend({
name: 'TypeSettingsPanel',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script>
import UserGuideDialog from 'viame-web-common/components/UserGuideDialog.vue';
import UserGuideDialog from 'dive-common/components/UserGuideDialog.vue';

export default {
components: {
Expand All @@ -14,7 +14,7 @@ export default {
data() {
return {
dialog: false,
userGuideLink: 'https://viame.github.io/VIAME-Web/',
userGuideLink: 'https://kitware.github.io/dive/',
};
},
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,23 @@ import {
} from 'vue-media-annotator/components';
import { MediaController } from 'vue-media-annotator/components/annotators/mediaControllerType';

/* VIAME WEB COMMON */
import PolygonBase from 'viame-web-common/recipes/polygonbase';
import HeadTail from 'viame-web-common/recipes/headtail';
import EditorMenu from 'viame-web-common/components/EditorMenu.vue';
import ConfidenceFilter from 'viame-web-common/components/ConfidenceFilter.vue';
import UserGuideButton from 'viame-web-common/components/UserGuideButton.vue';
import RunPipelineMenu from 'viame-web-common/components/RunPipelineMenu.vue';
import DeleteControls from 'viame-web-common/components/DeleteControls.vue';
import ControlsContainer from 'viame-web-common/components/ControlsContainer.vue';
import Sidebar from 'viame-web-common/components/Sidebar.vue';
/* DIVE COMMON */
import PolygonBase from 'dive-common/recipes/polygonbase';
import HeadTail from 'dive-common/recipes/headtail';
import EditorMenu from 'dive-common/components/EditorMenu.vue';
import ConfidenceFilter from 'dive-common/components/ConfidenceFilter.vue';
import UserGuideButton from 'dive-common/components/UserGuideButton.vue';
import RunPipelineMenu from 'dive-common/components/RunPipelineMenu.vue';
import DeleteControls from 'dive-common/components/DeleteControls.vue';
import ControlsContainer from 'dive-common/components/ControlsContainer.vue';
import Sidebar from 'dive-common/components/Sidebar.vue';

import {
useModeManager,
useSave,
useSettings,
} from 'viame-web-common/use';
import { useApi, FrameImage, DatasetType } from 'viame-web-common/apispec';
} from 'dive-common/use';
import { useApi, FrameImage, DatasetType } from 'dive-common/apispec';

export default defineComponent({
components: {
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { ref, Ref } from '@vue/composition-api';
import Track, { TrackId } from 'vue-media-annotator/track';
import { useApi, DatasetMetaMutable } from 'viame-web-common/apispec';
import { useApi, DatasetMetaMutable } from 'dive-common/apispec';

export default function useSave(datasetId: Ref<Readonly<string>>) {
const pendingSaveCount = ref(0);
Expand Down
6 changes: 3 additions & 3 deletions client/jsconfig.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"include": [
"src/**/*",
"viame-web-common/**/*"
"dive-common/**/*"
],
"compilerOptions": {
"baseUrl": "",
"paths": {
"vue-media-annotator/*": [
"src/*"
],
"viame-web-common/*": [
"viame-web-common/*"
"dive-common/*": [
"dive-common/*"
]
}
}
Expand Down
10 changes: 5 additions & 5 deletions client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"name": "Kitware, Inc.",
"email": "viame-web@kitware.com"
},
"description": "VIAME Web annotation platform",
"homepage": "https://github.com/VIAME/VIAME-Web",
"description": "DIVE annotation platform",
"homepage": "https://github.com/Kitware/dive",
"scripts": {
"serve": "vue-cli-service serve platform/web-girder/main.ts",
"serve:electron": "vue-cli-service electron:serve",
Expand All @@ -16,9 +16,9 @@
"build:cli": "tsc -b tsconfig.cli.json && tsc-alias -p tsconfig.cli.json",
"dev:cli": "tsc -w -p tsconfig.cli.json & tsc-alias -w -p tsconfig.cli.json",
"divecli": "node ./bin/platform/desktop/backend/cli.js",
"lint": "vue-cli-service lint src/ viame-web-common/ platform/",
"lint": "vue-cli-service lint src/ dive-common/ platform/",
"lint:templates": "vtc --workspace . --srcDir src/",
"test": "vue-cli-service test:unit src/ viame-web-common/ platform/"
"test": "vue-cli-service test:unit src/ dive-common/ platform/"
},
"resolutions": {
"@types/jest": "^25.2.3"
Expand Down Expand Up @@ -131,7 +131,7 @@
"verbose": true,
"moduleNameMapper": {
"^vue-media-annotator/(.*)$": "<rootDir>/src/$1",
"^viame-web-common/(.*)$": "<rootDir>/viame-web-common/$1",
"^dive-common/(.*)$": "<rootDir>/dive-common/$1",
"^platform/(.*)$": "<rootDir>/platform/$1",
"\\.css$": "<rootDir>/test/stub.js"
},
Expand Down
2 changes: 1 addition & 1 deletion client/platform/desktop/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<script lang="ts">
import { defineComponent } from '@vue/composition-api';
import { provideApi } from 'viame-web-common/apispec';
import { provideApi } from 'dive-common/apispec';
import statefulApi from './frontend/store';

export default defineComponent({
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Attributes } from 'platform/desktop/constants';
import { MultiTrackRecord } from 'viame-web-common/apispec';
import { MultiTrackRecord } from 'dive-common/apispec';
import { StringKeyObject, TrackData } from 'vue-media-annotator/track';


Expand Down
Loading