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
e4627208
Commit
e4627208
authored
5 years ago
by
fsdavid
Browse files
Options
Downloads
Patches
Plain Diff
remove connectivity region selection
parent
908cc5f3
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/ui/connectivityBrowser/connectivityBrowser.component.ts
+1
-16
1 addition, 16 deletions
src/ui/connectivityBrowser/connectivityBrowser.component.ts
src/ui/connectivityBrowser/connectivityBrowser.template.html
+19
-52
19 additions, 52 deletions
src/ui/connectivityBrowser/connectivityBrowser.template.html
with
20 additions
and
68 deletions
src/ui/connectivityBrowser/connectivityBrowser.component.ts
+
1
−
16
View file @
e4627208
...
...
@@ -12,8 +12,6 @@ import {CLEAR_CONNECTIVITY_REGION, SET_CONNECTIVITY_REGION} from "src/services/s
import
{
HIDE_SIDE_PANEL_CONNECTIVITY
,
isDefined
,
safeFilter
}
from
"
src/services/stateStore.service
"
;
import
{
VIEWERSTATE_CONTROLLER_ACTION_TYPES
}
from
"
src/ui/viewerStateController/viewerState.base
"
;
const
compareFn
=
(
it
,
item
)
=>
it
.
name
===
item
.
name
@
Component
({
selector
:
'
connectivity-browser
'
,
templateUrl
:
'
./connectivityBrowser.template.html
'
,
...
...
@@ -31,10 +29,8 @@ export class ConnectivityBrowserComponent implements AfterViewInit, OnDestroy {
public
expandMenuIndex
=
-
1
public
allRegions
=
[]
public
defaultColorMap
:
Map
<
string
,
Map
<
number
,
{
red
:
number
,
green
:
number
,
blue
:
number
}
>>
public
parcellationHasConnectivityData
=
true
private
areaHemisphere
:
string
public
math
=
Math
public
compareFn
=
compareFn
...
...
@@ -69,7 +65,6 @@ export class ConnectivityBrowserComponent implements AfterViewInit, OnDestroy {
this
.
subscriptions
.
push
(
this
.
selectedParcellation$
.
subscribe
(
parcellation
=>
{
if
(
parcellation
&&
parcellation
.
hasAdditionalViewMode
&&
parcellation
.
hasAdditionalViewMode
.
includes
(
'
connectivity
'
))
{
this
.
parcellationHasConnectivityData
=
true
if
(
parcellation
.
regions
&&
parcellation
.
regions
.
length
)
{
this
.
allRegions
=
[]
this
.
getAllRegionsFromParcellation
(
parcellation
.
regions
)
...
...
@@ -78,7 +73,7 @@ export class ConnectivityBrowserComponent implements AfterViewInit, OnDestroy {
}
}
}
else
{
this
.
parcellationHasConnectivityData
=
false
this
.
closeConnectivityView
()
}
}),
this
.
connectivityRegion$
.
subscribe
(
cr
=>
{
...
...
@@ -103,7 +98,6 @@ export class ConnectivityBrowserComponent implements AfterViewInit, OnDestroy {
}
public
ngOnDestroy
():
void
{
this
.
setDefaultMap
()
this
.
subscriptions
.
forEach
(
s
=>
s
.
unsubscribe
())
}
...
...
@@ -121,20 +115,11 @@ export class ConnectivityBrowserComponent implements AfterViewInit, OnDestroy {
})
}
toggleRegionSelection
(
region
)
{
this
.
store$
.
dispatch
({
type
:
VIEWERSTATE_CONTROLLER_ACTION_TYPES
.
TOGGLE_REGION_SELECT
,
payload
:
{
region
:
this
.
getRegionWithName
(
region
)
},
})
}
getRegionWithName
(
region
)
{
return
this
.
allRegions
.
find
(
ar
=>
ar
.
name
===
region
)
}
public
closeConnectivityView
()
{
this
.
setDefaultMap
()
this
.
store$
.
dispatch
({
type
:
HIDE_SIDE_PANEL_CONNECTIVITY
,
})
...
...
This diff is collapsed.
Click to expand it.
src/ui/connectivityBrowser/connectivityBrowser.template.html
+
19
−
52
View file @
e4627208
<div
class=
"w-100 h-100 overflow-auto d-block d-flex flex-column pb-2"
#connectivityComponent
*ngIf=
"parcellationHasConnectivityData; else noConnectivity"
>
<div
class=
"w-100 h-100 overflow-auto d-block d-flex flex-column pb-2"
#connectivityComponent
>
<!--ToDo set show-description="true" when data will available-->
<hbp-connectivity-matrix-row
[region]=
"region"
...
...
@@ -11,63 +11,30 @@
show-description=
"true"
>
<div
slot=
"header"
class=
"w-100 d-flex justify-content-between mt-3"
>
<span>
Connectivity Browser
</span>
<i
(click)=
"closeConnectivityView()"
class=
"far fa-times-circle cursorPointer"
></i>
<i
(click)=
"closeConnectivityView()
; setDefaultMap()
"
class=
"far fa-times-circle cursorPointer"
></i>
</div>
<div
slot=
"connectedRegionMenu"
>
<div
class=
"d-flex flex-column"
*ngIf=
"expandMenuIndex >= 0"
>
<div
class=
"d-flex flex-column p-0 m-0"
*ngIf=
"expandMenuIndex >= 0"
>
<mat-divider></mat-divider>
<span
class=
"mt-2 mr-2 ml-2"
>
<small>
Region: {{connectedAreas[expandMenuIndex].name}}
</small>
<br>
<small>
Number of Connection: {{connectedAreas[expandMenuIndex].numberOfConnections}}
</small>
<br>
<small>
Log(123) = {{math.log10(connectedAreas[expandMenuIndex].numberOfConnections)}}
</small>
</span>
<mat-card-subtitle
class=
"pt-2 pr-2 pl-2 pb-0"
>
{{connectedAreas[expandMenuIndex].name}}
</mat-card-subtitle>
<div
class=
"d-flex align-items-center justify-content-around"
>
<small
class=
"d-flex flex-column align-items-center w-100"
>
<button
mat-icon-button
class=
"border"
(click)=
"toggleRegionSelection(connectedAreas[expandMenuIndex].name)"
>
<span
class=
"fa-stack fa-1x "
>
<i
class=
"fas fa-hand-pointer fa-stack-1x"
></i>
<i
class=
"fas fa-slash fa-stack-1x fa-inverse"
*ngIf=
"(selectedRegions$ | async | includes : getRegionWithName(connectedAreas[expandMenuIndex].name) : compareFn)"
></i>
</span>
</button>
<span
[innerText]=
"(selectedRegions$ | async | includes : getRegionWithName(connectedAreas[expandMenuIndex].name) : compareFn) ? 'Deselect' : 'Select'"
></span>
</small>
<small
class=
"d-flex flex-column align-items-center w-100"
>
<button
mat-icon-button
class=
"border"
(click)=
"navigateToRegion(connectedAreas[expandMenuIndex].name)"
>
<i
class=
"fas fa-crosshairs mt-n1"
></i>
</button>
Go To
</small>
<small
class=
"d-flex flex-column align-items-center w-100"
>
<button
mat-icon-button
class=
"border"
(click)=
"updateConnevtivityRegion(connectedAreas[expandMenuIndex].name)"
>
<i
class=
"fab fa-connectdevelop mt-n1"
></i>
</button>
Set as Source
</small>
<button
mat-button
(click)=
"navigateToRegion(navigateToRegion(connectedAreas[expandMenuIndex].name))"
>
<i
class=
"fas fa-map-marked-alt"
></i>
<span>
Navigate
</span>
</button>
<button
mat-button
(click)=
"updateConnevtivityRegion(connectedAreas[expandMenuIndex].name)"
>
<i
class=
"fab fa-connectdevelop"
></i>
<span>
Connectivity
</span>
</button>
</div>
</div>
</div>
</hbp-connectivity-matrix-row>
</div>
<ng-template
#noConnectivity
>
<mat-card
class=
"p-2 w-100 h-100 overflow-auto d-block"
>
<div
class=
"w-100 d-flex justify-content-end mt-3"
><span
class=
"cursorPointer"
(click)=
"closeConnectivityView()"
>
X
</span></div>
<h5>
Connectivity Matrix Browser
</h5>
<div>
No Connectivity for selected Parcellation!
</div>
</mat-card>
</ng-template>
\ No newline at end of file
</div>
\ No newline at end of file
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