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
ea95b807
Commit
ea95b807
authored
4 years ago
by
Xiao Gui
Browse files
Options
Downloads
Patches
Plain Diff
fix regression (slice view controls)
unit tests finding regression! who'd thought!
parent
4836d978
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/ui/nehubaContainer/nehubaContainer.component.ts
+2
-1
2 additions, 1 deletion
src/ui/nehubaContainer/nehubaContainer.component.ts
src/ui/nehubaContainer/nehubaContainer.template.html
+40
-39
40 additions, 39 deletions
src/ui/nehubaContainer/nehubaContainer.template.html
with
42 additions
and
40 deletions
src/ui/nehubaContainer/nehubaContainer.component.ts
+
2
−
1
View file @
ea95b807
...
...
@@ -437,7 +437,8 @@ export class NehubaContainer implements OnInit, OnChanges, OnDestroy {
}),
distinctUntilChanged
(),
startWith
(
'
Loading ...
'
),
throttleTime
(
100
,
asyncScheduler
,
{
leading
:
true
,
trailing
:
true
})
throttleTime
(
100
,
asyncScheduler
,
{
leading
:
true
,
trailing
:
true
}),
shareReplay
(
1
),
))
)
...
...
This diff is collapsed.
Click to expand it.
src/ui/nehubaContainer/nehubaContainer.template.html
+
40
−
39
View file @
ea95b807
...
...
@@ -29,7 +29,7 @@
<ng-content
*ngTemplateOutlet=
"ngPanelOverlayTmpl; context: { panelIndex: panelOrder$ | async | getNthElement : 2 | parseAsNumber }"
></ng-content>
</div>
<div
class=
"w-100 h-100 position-relative"
cell-iv
>
<ng-content
*ngTemplateOutlet=
"
overlayPerspectiveTmpl
"
></ng-content>
<ng-content
*ngTemplateOutlet=
"
ngPanelOverlayTmpl; context: { panelIndex: panelOrder$ | async | getNthElement : 3 | parseAsNumber }
"
></ng-content>
</div>
</current-layout>
...
...
@@ -579,49 +579,49 @@
<!-- overlay templates -->
<!-- perspective view tmpl -->
<ng-template
#overlayPerspectiveTmpl
>
<layout-floating-container
class=
"tmp"
landmarkContainer
>
<div
class=
"d-flex flex-column justify-content-center align-items-center w-100 h-100 position-absolute opacity-crossfade screen-overlay pe-none"
[ngClass]=
"{onHover: !!(showPerpsectiveScreen$ | async)}"
[attr.id]=
"ID_MESH_LOADING_STATUS"
role=
"status"
>
<!-- slice view overlay tmpl -->
<ng-template
#ngPanelOverlayTmpl
let-panelIndex=
"panelIndex"
>
<spinner-cmp
*ngIf=
"showPerpsectiveScreen$ | async"
>
</spinner-cmp>
<mat-list>
<mat-list-item>
{{ showPerpsectiveScreen$ | async }}
</mat-list-item>
</mat-list>
</div>
<!-- perspective view tmpl -->
<ng-template
#overlayPerspectiveTmpl
>
<layout-floating-container
class=
"tmp"
landmarkContainer
>
<div
class=
"d-flex flex-column justify-content-center align-items-center w-100 h-100 position-absolute opacity-crossfade screen-overlay pe-none"
[ngClass]=
"{onHover: !!(showPerpsectiveScreen$ | async)}"
[attr.id]=
"ID_MESH_LOADING_STATUS"
role=
"status"
>
<spinner-cmp
*ngIf=
"showPerpsectiveScreen$ | async"
>
</spinner-cmp>
<mat-list>
<mat-list-item>
{{ showPerpsectiveScreen$ | async }}
</mat-list-item>
</mat-list>
</div>
<!-- maximise/minimise button -->
<ng-container
*ngTemplateOutlet=
"panelCtrlTmpl; context: {
panelIndex: panel
Order$ | async | getNthElement : 3 | parseAsNumber
,
visible: (
panelOrder$ | async | reorderPanelIndexPipe : (
hoveredPanelIndices$ | async
)
) ===
3
}"
>
</ng-container>
<!-- maximise/minimise button -->
<ng-container
*ngTemplateOutlet=
"panelCtrlTmpl; context: {
panelIndex: panel
Index
,
visible: (hoveredPanelIndices$ | async) ===
panelIndex
}"
>
</ng-container>
<!-- mesh loading is still weird -->
<!-- if the precomputed server does not have the necessary fragment file, then the numberws will not collate -->
<div
*ngIf=
"false && (perspectiveViewLoading$ | async)"
class=
"loadingIndicator"
>
<spinner-cmp></spinner-cmp>
<!-- mesh loading is still weird -->
<!-- if the precomputed server does not have the necessary fragment file, then the numberws will not collate -->
<div
*ngIf=
"false && (perspectiveViewLoading$ | async)"
class=
"loadingIndicator"
>
<spinner-cmp></spinner-cmp>
<div
*ngIf=
"false"
perspectiveLoadingText
>
{{ perspectiveViewLoading$ | async }}
<div
*ngIf=
"false"
perspectiveLoadingText
>
{{ perspectiveViewLoading$ | async }}
</div>
</div>
</div>
</layout-floating-container>
</ng-template>
<!-- slice view overlay tmpl -->
<ng-template
#ngPanelOverlayTmpl
let-panelIndex=
"panelIndex"
>
</layout-floating-container>
</ng-template>
<!-- nb this slice view is not suitable for perspective view! -->
<layout-floating-container
*ngIf=
"panelIndex < 3"
landmarkContainer
>
<layout-floating-container
*ngIf=
"panelIndex < 3
; else overlayPerspectiveTmpl
"
landmarkContainer
>
<!-- customLandmarks -->
<nehuba-2dlandmark-unit
*ngFor=
"let lm of (customLandmarks$ | async | filterByProperty : 'showInSliceView')"
...
...
@@ -649,8 +649,8 @@
<!-- maximise/minimise button -->
<ng-container
*ngTemplateOutlet=
"panelCtrlTmpl; context: {
panelIndex: panel
Order$ | async | getNthElement : panelIndex | parseAsNumber
,
visible: (
panelOrder$ | async | reorderPanelIndexPipe : (
hoveredPanelIndices$ | async
)
) === panelIndex
panelIndex: panel
Index
,
visible: (hoveredPanelIndices$ | async) === panelIndex
}"
>
</ng-container>
...
...
@@ -658,6 +658,7 @@
<spinner-cmp></spinner-cmp>
</div>
</layout-floating-container>
</ng-template>
<!-- panel control template -->
...
...
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