Skip to content

Commit

Permalink
Merge pull request #146 from alan-wu/annotation
Browse files Browse the repository at this point in the history
Support external annotation display
  • Loading branch information
alan-wu authored Nov 14, 2024
2 parents bdc4480 + aa853de commit 4a7cc15
Show file tree
Hide file tree
Showing 8 changed files with 119 additions and 245 deletions.
10 changes: 9 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

## [v1.5.1](https://github.com/alan-wu/scaffoldvuer/compare/v1.5.0...v1.5.1)
## [v1.6.0-beta.1](https://github.com/alan-wu/scaffoldvuer/compare/v1.5.1...v1.6.0-beta.1)

### Commits

- Move create tooltip content. [`71863ca`](https://github.com/alan-wu/scaffoldvuer/commit/71863ca1444ecf49c03ae88b7a336ad8429ffb83)
- Support annotation on sidebar. [`0f914af`](https://github.com/alan-wu/scaffoldvuer/commit/0f914aff457a71c5f67409b682ae5211b84908bb)
- Improve inject provide for annotator. [`e8f3226`](https://github.com/alan-wu/scaffoldvuer/commit/e8f32265c3cca8501da98a2d255141581651f85e)

## [v1.5.1](https://github.com/alan-wu/scaffoldvuer/compare/v1.5.0...v1.5.1) - 2024-10-16

### Commits

Expand Down
27 changes: 18 additions & 9 deletions package-lock.json

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

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@abi-software/scaffoldvuer",
"version": "1.5.1",
"version": "1.6.0-beta.1",
"license": "Apache-2.0",
"repository": {
"type": "git",
Expand Down Expand Up @@ -41,7 +41,7 @@
"*.js"
],
"dependencies": {
"@abi-software/map-utilities": "^1.1.2",
"@abi-software/map-utilities": "^1.2.0",
"@abi-software/sparc-annotation": "^0.3.1",
"@abi-software/svg-sprite": "^1.0.1",
"@element-plus/icons-vue": "^2.3.1",
Expand Down
11 changes: 9 additions & 2 deletions src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,8 @@

<script>
/* eslint-disable no-alert, no-console */
import { shallowRef } from 'vue';
import { AnnotationService } from '@abi-software/sparc-annotation'
import { markRaw, shallowRef } from 'vue';
import { ScaffoldVuer } from "./components/index.js";
import DropZone from "./app/DropZone.vue";
import ModelsTable from "./app/ModelsTable.vue";
Expand Down Expand Up @@ -356,6 +357,11 @@ export default {
ModelsTable,
HelpModeDialog,
},
provide() {
return {
$annotator: this.annotator,
}
},
data: function () {
return {
consoleOn: true,
Expand Down Expand Up @@ -406,7 +412,8 @@ export default {
router: useRouter(),
ElIconSetting: shallowRef(ElIconSetting),
ElIconFolderOpened: shallowRef(ElIconFolderOpened),
auto: NaN
auto: NaN,
annotator: markRaw(new AnnotationService(`https://mapcore-demo.org/devel/flatmap/v4/annotator`)),
};
},
watch: {
Expand Down
7 changes: 0 additions & 7 deletions src/components.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,32 +7,25 @@ export {}

declare module 'vue' {
export interface GlobalComponents {
CreateTooltipContent: typeof import('./components/CreateTooltipContent.vue')['default']
ElAutocomplete: typeof import('element-plus/es')['ElAutocomplete']
ElButton: typeof import('element-plus/es')['ElButton']
ElCol: typeof import('element-plus/es')['ElCol']
ElCollapse: typeof import('element-plus/es')['ElCollapse']
ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem']
ElContainer: typeof import('element-plus/es')['ElContainer']
ElFooter: typeof import('element-plus/es')['ElFooter']
ElHeader: typeof import('element-plus/es')['ElHeader']
ElIcon: typeof import('element-plus/es')['ElIcon']
ElIconArrowLeft: typeof import('@element-plus/icons-vue')['ArrowLeft']
ElIconArrowRight: typeof import('@element-plus/icons-vue')['ArrowRight']
ElIconDelete: typeof import('@element-plus/icons-vue')['Delete']
ElIconPlus: typeof import('@element-plus/icons-vue')['Plus']
ElIconWarningFilled: typeof import('@element-plus/icons-vue')['WarningFilled']
ElInput: typeof import('element-plus/es')['ElInput']
ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
ElMain: typeof import('element-plus/es')['ElMain']
ElOption: typeof import('element-plus/es')['ElOption']
ElPopover: typeof import('element-plus/es')['ElPopover']
ElRow: typeof import('element-plus/es')['ElRow']
ElSelect: typeof import('element-plus/es')['ElSelect']
ElSlider: typeof import('element-plus/es')['ElSlider']
ElSwitch: typeof import('element-plus/es')['ElSwitch']
ElTable: typeof import('element-plus/es')['ElTable']
ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
ElTabPane: typeof import('element-plus/es')['ElTabPane']
ElTabs: typeof import('element-plus/es')['ElTabs']
LinesControls: typeof import('./components/LinesControls.vue')['default']
Expand Down
201 changes: 0 additions & 201 deletions src/components/CreateTooltipContent.vue

This file was deleted.

Loading

0 comments on commit 4a7cc15

Please sign in to comment.