Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
siibra-explorer
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Xiao Gui
siibra-explorer
Commits
3203ee7a
Commit
3203ee7a
authored
5 years ago
by
fsdavid
Browse files
Options
Downloads
Patches
Plain Diff
change dataset explore for muliply datasets
parent
8bc17d23
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
deploy/datasets/query.js
+1
-4
1 addition, 4 deletions
deploy/datasets/query.js
src/atlasViewer/atlasViewer.component.ts
+5
-5
5 additions, 5 deletions
src/atlasViewer/atlasViewer.component.ts
src/atlasViewer/atlasViewer.template.html
+14
-9
14 additions, 9 deletions
src/atlasViewer/atlasViewer.template.html
with
20 additions
and
18 deletions
deploy/datasets/query.js
+
1
−
4
View file @
3203ee7a
...
@@ -306,10 +306,7 @@ const fetchSpatialDataFromKg = async ({ templateName, queryGeometry, queryArg, u
...
@@ -306,10 +306,7 @@ const fetchSpatialDataFromKg = async ({ templateName, queryGeometry, queryArg, u
return
{
return
{
name
,
name
,
templateSpace
:
templateName
,
templateSpace
:
templateName
,
dataset
:
{
dataset
:
dataset
.
map
(
ds
=>
ds
=
{
name
:
ds
.
name
,
externalLink
:
'
https://kg.humanbrainproject.eu/instances/Dataset/
'
+
ds
.
identifier
}),
name
:
dataset
[
0
].
name
,
externalLink
:
'
https://kg.humanbrainproject.eu/instances/Dataset/
'
+
dataset
[
0
].
identifier
,
},
geometry
:
{
geometry
:
{
type
:
'
point
'
,
type
:
'
point
'
,
space
:
'
real
'
,
space
:
'
real
'
,
...
...
This diff is collapsed.
Click to expand it.
src/atlasViewer/atlasViewer.component.ts
+
5
−
5
View file @
3203ee7a
...
@@ -79,7 +79,7 @@ export class AtlasViewer implements OnDestroy, OnInit, AfterViewInit {
...
@@ -79,7 +79,7 @@ export class AtlasViewer implements OnDestroy, OnInit, AfterViewInit {
public
onhoverSegments$
:
Observable
<
string
[]
>
public
onhoverSegments$
:
Observable
<
string
[]
>
public
onhoverSegmentsForFixed$
:
Observable
<
string
[]
>
public
onhoverSegmentsForFixed$
:
Observable
<
string
[]
>
public
onhoverLandmarksForFixed$
:
Observable
<
any
>
public
onhoverLandmarksForFixed$
:
Observable
<
any
>
public
onhoverLandmark$
:
Observable
<
{
landmarkName
:
string
,
externalUrl
:
string
}
|
null
>
public
onhoverLandmark$
:
Observable
<
{
landmarkName
:
string
,
datasets
:
any
}
|
null
>
private
subscriptions
:
Subscription
[]
=
[]
private
subscriptions
:
Subscription
[]
=
[]
/* handlers for nglayer */
/* handlers for nglayer */
...
@@ -188,8 +188,8 @@ export class AtlasViewer implements OnDestroy, OnInit, AfterViewInit {
...
@@ -188,8 +188,8 @@ export class AtlasViewer implements OnDestroy, OnInit, AfterViewInit {
return
`Landmark index could not be parsed as a number:
${
landmark
}
`
return
`Landmark index could not be parsed as a number:
${
landmark
}
`
return
{
return
{
landmarkName
:
spatialDatas
[
idx
].
name
,
landmarkName
:
spatialDatas
[
idx
].
name
,
externalUrl
:
(
spatialDatas
[
idx
].
dataset
datasets
:
(
spatialDatas
[
idx
].
dataset
&&
spatialDatas
[
idx
].
dataset
.
externalLink
)?
spatialDatas
[
idx
].
dataset
.
externalLink
:
null
&&
spatialDatas
[
idx
].
dataset
.
length
)?
spatialDatas
[
idx
].
dataset
:
null
}
}
})
})
)
)
...
@@ -484,9 +484,9 @@ export class AtlasViewer implements OnDestroy, OnInit, AfterViewInit {
...
@@ -484,9 +484,9 @@ export class AtlasViewer implements OnDestroy, OnInit, AfterViewInit {
}
}
}
}
openLandmarkUrl
(
landmark
)
{
openLandmarkUrl
(
dataset
)
{
this
.
rClContextualMenu
.
hide
()
this
.
rClContextualMenu
.
hide
()
window
.
open
(
landmark
.
external
Url
,
"
_blank
"
)
;
window
.
open
(
dataset
.
external
Link
,
"
_blank
"
)
}
}
@
HostBinding
(
'
attr.version
'
)
@
HostBinding
(
'
attr.version
'
)
...
...
This diff is collapsed.
Click to expand it.
src/atlasViewer/atlasViewer.template.html
+
14
−
9
View file @
3203ee7a
...
@@ -151,20 +151,25 @@
...
@@ -151,20 +151,25 @@
<div
body
>
<div
body
>
<div
<div
*ngIf=
"(onhoverSegmentsForFixed$ | async)?.length > 0 || (selectedRegions$ | async)?.length >
0 || (onhoverLandmarksForFixed$ | async)?.externalUrl.length >
0"
*ngIf=
"(onhoverSegmentsForFixed$ | async)?.length > 0 || (selectedRegions$ | async)?.length > 0"
class=
"p-2"
>
class=
"p-2"
>
Search for data relating to:
Search for data relating to:
</div>
</div>
<div
*ngIf=
"(onhoverLandmarksForFixed$ | async) as onhoverLandmarksForFixed"
>
<div
*ngIf=
"(onhoverLandmarksForFixed$ | async) as onhoverLandmarksForFixed"
>
<div
<div
*ngIf=
"onhoverLandmarksForFixed && onhoverLandmarksForFixed.datasets && onhoverLandmarksForFixed.datasets.length > 0"
>
*ngIf=
"onhoverLandmarksForFixed && onhoverLandmarksForFixed.externalUrl && onhoverLandmarksForFixed.externalUrl.length > 0"
<div
class=
"p-2"
>
class=
"ws-no-wrap text-left pe-all btn btn-sm btn-secondary btn-block mt-0"
Explore datasets for {{onhoverLandmarksForFixed.landmarkName}}
data-toggle=
"tooltip"
</div>
data-placement=
"top"
<div
(click)=
"openLandmarkUrl(onhoverLandmarksForFixed)"
*ngFor=
"let dataset of onhoverLandmarksForFixed.datasets"
[title]=
"onhoverLandmarksForFixed.landmarkName"
>
class=
"ws-no-wrap text-left pe-all btn btn-sm btn-secondary btn-block mt-0"
Explore dataset of {{ onhoverLandmarksForFixed.landmarkName }}
<i
class=
"fas fa-external-link-alt"
></i>
data-toggle=
"tooltip"
data-placement=
"top"
(click)=
"openLandmarkUrl(dataset)"
[title]=
"dataset.name"
>
{{ dataset.name }}
<i
class=
"fas fa-external-link-alt"
></i>
</div>
</div>
</div>
</div>
</div>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment