Skip to content

Image on flatmap #12

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.

Sign up for GitHub

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

Draft
akhuoa wants to merge 64 commits into
base: feature/images-on-flatmap-updated
Choose a base branch
from
Draft

Image on flatmap #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
eb924e5
Merge remote-tracking branch 'upstream/main' into image-on-flatmap
ddjnw1yu Jul 30, 2024
baae461
Update to support show image on flatmap
ddjnw1yu Jul 31, 2024
abf9348
Comment out test use code and remove unused
ddjnw1yu Jul 31, 2024
38f23f9
Minor url issue
ddjnw1yu Jul 31, 2024
0330030
Update to use same mixin as scaffold
ddjnw1yu Aug 5, 2024
0b93cb4
Merge branch 'main' into image-on-flatmap
ddjnw1yu Aug 13, 2024
a732b8b
Demo implementation with new image API
ddjnw1yu Aug 15, 2024
8b3badf
Merge branch 'main' into image-on-flatmap
ddjnw1yu Aug 15, 2024
61ce7b0
Package version update
ddjnw1yu Aug 16, 2024
3021eaa
Update flatmap-viewer version
ddjnw1yu Aug 16, 2024
08e94b7
Add select box for selecting different image type
ddjnw1yu Aug 19, 2024
3ee9039
Modify image selector based on new image api
ddjnw1yu Aug 20, 2024
e23211e
Support scaffold in display image mode.
alan-wu Aug 21, 2024
c0dbe1b
Modify code and add scaffold support
ddjnw1yu Aug 21, 2024
00455dc
Add plot type.
alan-wu Aug 21, 2024
e6bbb6c
Clean up unused codes.
alan-wu Aug 21, 2024
a5fe1d1
Merge pull request #16 from alan-wu/feature/images-on-flatmap-updated
ddjnw1yu Aug 21, 2024
46a8d7a
Merge branch 'temp-branch' into image-on-flatmap
ddjnw1yu Aug 21, 2024
3722c4c
Make some changes after merge in upstream
ddjnw1yu Aug 21, 2024
ff45171
Change scicrunch mixin to service
ddjnw1yu Aug 21, 2024
6f45801
Rename function
ddjnw1yu Aug 21, 2024
326c1e6
Fix image size issue
ddjnw1yu Aug 22, 2024
b4cecee
Create settings store
ddjnw1yu Aug 23, 2024
2fc3286
Emit image data to sidebar
ddjnw1yu Aug 25, 2024
5005faa
Merge branch 'main' into image-on-flatmap
ddjnw1yu Aug 26, 2024
fe64a8d
minor update
ddjnw1yu Aug 27, 2024
76e6d53
Try to fix testing
ddjnw1yu Aug 27, 2024
9a943ed
Add more stored state
ddjnw1yu Aug 28, 2024
965a49e
Add markRaw
ddjnw1yu Aug 28, 2024
cc056e1
Update image select box
ddjnw1yu Aug 29, 2024
df4be7f
Increase select box width
ddjnw1yu Aug 29, 2024
30e93d7
Fix minor issue
ddjnw1yu Aug 29, 2024
4e5c99c
v1.4.1-beta.1 image selector
ddjnw1yu Aug 29, 2024
314481e
Fix image data emit issue
ddjnw1yu Aug 30, 2024
767ab47
Emit empty array if no imageEntry
ddjnw1yu Aug 30, 2024
6e56b0a
Reset tooltip entries
ddjnw1yu Aug 30, 2024
b13f3fc
v1.4.1-beta.4 minor fix
ddjnw1yu Sep 1, 2024
f77a321
Fix help-mode index
akhuoa Sep 1, 2024
524f589
Fix help mode svg icon highlight for Safari
akhuoa Sep 2, 2024
8863ebc
Add image display emit
ddjnw1yu Sep 2, 2024
0756684
Add markerType to resouce callback.
alan-wu Sep 2, 2024
2190fe3
Merge pull request #18 from alan-wu/feature/images-on-flatmap-updated
ddjnw1yu Sep 2, 2024
a7a9c7d
Merge branch 'main' into image-on-flatmap
akhuoa Sep 2, 2024
5c204a5
Merge pull request #190 from akhuoa/bugfix/help-mode
alan-wu Sep 2, 2024
9833cf0
1.4.2
alan-wu Sep 2, 2024
52be8bd
Remove unnused codes
akhuoa Aug 22, 2024
402034a
Merge branch 'main' into image-on-flatmap
akhuoa Sep 2, 2024
812f16b
Merge pull request #19 from akhuoa/image-on-flatmap
ddjnw1yu Sep 2, 2024
0745f7e
Update flatmap-viewer which fixes an issue with selectGeoJSONFeatures…
alan-wu Sep 2, 2024
9399f62
Merge pull request #191 from alan-wu/unselect-geojson
alan-wu Sep 2, 2024
b106ce5
1.4.3
alan-wu Sep 2, 2024
6bfd82a
Merge branch 'main' into image-on-flatmap
ddjnw1yu Sep 2, 2024
cd04986
Hide maker display option when sparcAPI not exists
ddjnw1yu Sep 2, 2024
b106917
Clear tooltip when switching between markers display
akhuoa Sep 3, 2024
4793695
Disable markers display switch while downloading thumbnail images
akhuoa Sep 3, 2024
b095104
Merge branch 'image-on-flatmap' of github.com:ddjnw1yu/flatmapvuer in…
akhuoa Sep 3, 2024
be9ab3b
Fix empty list rendering for image thumbnails loading
akhuoa Sep 3, 2024
ae556c7
Merge pull request #20 from akhuoa/image-on-flatmap
ddjnw1yu Sep 4, 2024
8d1d26e
Prevent image thumbnail emit on connectivity click
akhuoa Sep 5, 2024
9f02d89
Merge pull request #21 from akhuoa/image-on-flatmap
ddjnw1yu Sep 5, 2024
4b763b9
Update flatmap-viewer which fixes an issue on the minimap.
alan-wu Sep 11, 2024
4dd799d
1.4.4
alan-wu Sep 11, 2024
fcd4e9d
Merge branch 'main' into image-on-flatmap
akhuoa Sep 11, 2024
dc750b7
Add biolucida id for thumbnail images
akhuoa Sep 19, 2024
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
71 changes: 70 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,76 @@ 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.3.1](https://github.com/alan-wu/flatmapvuer/compare/v1.3.0...v1.3.1)
## [v1.4.4](https://github.com/alan-wu/flatmapvuer/compare/v1.4.3...v1.4.4)

### Commits

- Update flatmap-viewer which fixes an issue on the minimap. [`4b763b9`](https://github.com/alan-wu/flatmapvuer/commit/4b763b928c54e6a46c7b4b538bfaeb38f87e6f34)

## [v1.4.3](https://github.com/alan-wu/flatmapvuer/compare/v1.4.2...v1.4.3) - 2024-09-03

### Merged

- Update flatmap-viewer which fixes an issue with geojson related call. [`#191`](https://github.com/alan-wu/flatmapvuer/pull/191)

### Commits

- Update flatmap-viewer which fixes an issue with selectGeoJSONFeatures call. [`0745f7e`](https://github.com/alan-wu/flatmapvuer/commit/0745f7e5b318c483b18720398ef88d829d893f05)

## [v1.4.2](https://github.com/alan-wu/flatmapvuer/compare/v1.4.1...v1.4.2) - 2024-09-02

### Merged

- Help mode bugfix [`#190`](https://github.com/alan-wu/flatmapvuer/pull/190)
- Remove error log from abortController [`#189`](https://github.com/alan-wu/flatmapvuer/pull/189)

### Commits

- Fix help mode svg icon highlight for Safari [`524f589`](https://github.com/alan-wu/flatmapvuer/commit/524f5897de2a80335e010981c02b93c0c14c9d60)
- Update README.md [`71e3072`](https://github.com/alan-wu/flatmapvuer/commit/71e3072438dc0c5b48eec3d43fd5db29f71ad78f)
- Fix help-mode index [`f77a321`](https://github.com/alan-wu/flatmapvuer/commit/f77a321120b8f96a298e3052a80fffbad2f75261)

## [v1.4.1](https://github.com/alan-wu/flatmapvuer/compare/v1.4.0...v1.4.1) - 2024-08-22

### Merged

- Update to Flatmap-viewer version 3.1.4. [`#187`](https://github.com/alan-wu/flatmapvuer/pull/187)

### Commits

- Update to version 3.1.4. [`3bba246`](https://github.com/alan-wu/flatmapvuer/commit/3bba2462ebc26b7381e6aa96370bbb7ecbaf7905)
- Improve README.md. [`284cc20`](https://github.com/alan-wu/flatmapvuer/commit/284cc2043d059076a4acc3ad501caa059966fc05)

## [v1.4.0](https://github.com/alan-wu/flatmapvuer/compare/v1.3.2...v1.4.0) - 2024-08-16

### Merged

- Add species legend to the FC map [`#186`](https://github.com/alan-wu/flatmapvuer/pull/186)
- Fix beta tooltip index [`#185`](https://github.com/alan-wu/flatmapvuer/pull/185)
- Map annotation shortcut [`#183`](https://github.com/alan-wu/flatmapvuer/pull/183)
- Fix missing features alert [`#182`](https://github.com/alan-wu/flatmapvuer/pull/182)
- Replace global variable with markRaw [`#181`](https://github.com/alan-wu/flatmapvuer/pull/181)

### Commits

- Modify code to provide change viewing mode api [`adca34e`](https://github.com/alan-wu/flatmapvuer/commit/adca34e4c114b04013a22363e1bd201d5df69b84)
- Update to the latest packages. [`6bf41fd`](https://github.com/alan-wu/flatmapvuer/commit/6bf41fd2e69bfb38397b3f005c6a9e168472fc62)
- Beta release v1.3.2-beta.2 [`883760f`](https://github.com/alan-wu/flatmapvuer/commit/883760f8d35b004c74e250de16ae72f72106237f)

## [v1.3.2](https://github.com/alan-wu/flatmapvuer/compare/v1.3.1...v1.3.2) - 2024-07-22

### Merged

- Release v-1.3.2 [`#180`](https://github.com/alan-wu/flatmapvuer/pull/180)
- Hide connectivity info for empty tooltip data [`#179`](https://github.com/alan-wu/flatmapvuer/pull/179)

### Commits

- Fix empty tooltip checking function [`54a8498`](https://github.com/alan-wu/flatmapvuer/commit/54a8498c043434effd997d17ebdfd62ae087e7a6)
- Update to beta version 1.3.2-beta.1 [`5476730`](https://github.com/alan-wu/flatmapvuer/commit/5476730548f78a9a078270ebe8610f6f91daadc5)
- Rename function to be more meaningful [`aa370f8`](https://github.com/alan-wu/flatmapvuer/commit/aa370f8cac39746e22270a7505969789915738fd)

## [v1.3.1](https://github.com/alan-wu/flatmapvuer/compare/v1.3.0...v1.3.1) - 2024-07-10

### Commits

Expand Down
9 changes: 5 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,15 @@ export default {
The line above registers both the FlatmapVuer and MultiFlatmapVuer component into the global scope.
You can now use the FlatmapVuer in your vue template as followed:
```html
<FlatmapVuer entry="NCBITaxon:9606" v-on:resource-selected="FlatmapSelected" v-on:ready="FlatmapReady"/>
<FlatmapVuer entry="NCBITaxon:9606" uuid="uuid-to-set" v-on:resource-selected="FlatmapSelected" v-on:ready="FlatmapReady"/>
```

**entry** is the variable/string with the NCBI Taxonomy term. There are five available at this moment:
NCBITaxon:9606 (Human), NCBITaxon:9685 (Cat), NCBITaxon:9823 (Pig), NCBITaxon:10090 (Mouse) and NCBITaxon:10114 (Rat)
**entry** is the variable/string with the NCBI Taxonomy term. Some of the available taxon including: NCBITaxon:9606 (Human), NCBITaxon:9685 (Cat), NCBITaxon:9823 (Pig), NCBITaxon:10090 (Mouse) and NCBITaxon:10114 (Rat). This will always get the latest version of a map with the matching taxon.

**uuid** is the unique id of a specific map. This will be used instead of **entry** when specified.

**ready** is the custom event when the map has been loaded successfully.
**resource-selected** is the custom event triggered when a part of the flatmap is selected, the returned argument **resource** provides information of the selected resource.
**resource-selected** is the custom event triggered when a part of the flatmap is selected, the returned argument **resource** provides information of the selected resource. Information of location is provided with supported maps in the **feature -> location** property.

Markers must be added to make a label selectable and it can be done through the **addMarker** method on the mapImp member of the FlatmapVuer component.

Expand Down
Loading