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
1968914d
Unverified
Commit
1968914d
authored
4 years ago
by
xgui3783
Committed by
GitHub
4 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #663 from HumanBrainProject/dev_user_landmark_color
add color to highlited user landmark
parents
af426fe2
b90bd307
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/ui/nehubaContainer/landmarkUnit/landmarkUnit.component.ts
+9
-5
9 additions, 5 deletions
...ui/nehubaContainer/landmarkUnit/landmarkUnit.component.ts
with
9 additions
and
5 deletions
src/ui/nehubaContainer/landmarkUnit/landmarkUnit.component.ts
+
9
−
5
View file @
1968914d
...
...
@@ -58,7 +58,7 @@ export class LandmarkUnit implements OnChanges {
public
opacity
:
number
=
1
public
ngOnChanges
(
simpleChanges
:
SimpleChanges
)
{
const
{
const
{
positionX
,
positionY
,
positionZ
,
...
...
@@ -75,15 +75,15 @@ export class LandmarkUnit implements OnChanges {
if
(
positionX
||
positionY
)
{
this
.
transform
=
`translate(
${
positionX
?.
currentValue
||
this
.
positionX
}
px,
${
positionY
?.
currentValue
||
this
.
positionY
}
px)`
}
if
(
color
||
positionZ
||
highlight
)
{
const
zIndex
=
(
positionZ
.
currentValue
||
this
.
positionZ
)
>=
0
?
0
:
-
2
const
nColor
=
color
?.
currentValue
||
this
.
color
||
(
highlight
?.
currentValue
||
this
.
highlight
)
?
HOVER_COLOR
:
NORMAL_COLOR
:
this
.
color
?
this
.
color
:
NORMAL_COLOR
this
.
nodeStyle
=
{
color
:
`rgb(
${
nColor
.
join
(
'
,
'
)}
)`
,
'
z-index
'
:
zIndex
...
...
@@ -100,6 +100,10 @@ export class LandmarkUnit implements OnChanges {
...
this
.
shadowStyle
,
background
:
shadowStyleBackground
,
}
this
.
beamColorInner
=
{
...
this
.
beamColorInner
,
'
border-top-color
'
:
`rgba(
${
nColor
.
join
(
'
,
'
)}
,0.8)`
,
}
}
if
(
flatProjection
||
highlight
||
positionZ
)
{
...
...
@@ -111,7 +115,7 @@ export class LandmarkUnit implements OnChanges {
const
highlightVal
=
typeof
highlight
===
'
undefined
'
?
this
.
highlight
:
flatProjection
.
currentValue
const
positionZVal
=
typeof
positionZ
===
'
undefined
'
?
this
.
positionZ
:
positionZ
.
currentValue
...
...
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