diff --git a/src/assets/images/persp-view/bb1.png b/src/assets/images/persp-view/bb1.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0515117421f9ac3adacc9ba1224984f38b31f1c
Binary files /dev/null and b/src/assets/images/persp-view/bb1.png differ
diff --git a/src/assets/images/persp-view/bb2.png b/src/assets/images/persp-view/bb2.png
new file mode 100644
index 0000000000000000000000000000000000000000..b6b249ff6e9407e34968eadca0454195c3ffec71
Binary files /dev/null and b/src/assets/images/persp-view/bb2.png differ
diff --git a/src/assets/images/persp-view/bb3.png b/src/assets/images/persp-view/bb3.png
new file mode 100644
index 0000000000000000000000000000000000000000..3626bbcef457d0e717ce297ab65ad88d622fee79
Binary files /dev/null and b/src/assets/images/persp-view/bb3.png differ
diff --git a/src/assets/images/persp-view/colin1.png b/src/assets/images/persp-view/colin1.png
new file mode 100644
index 0000000000000000000000000000000000000000..8ffab1b4ad70c8c3fc57721eb6b6317bf0a512e9
Binary files /dev/null and b/src/assets/images/persp-view/colin1.png differ
diff --git a/src/assets/images/persp-view/colin2.png b/src/assets/images/persp-view/colin2.png
new file mode 100644
index 0000000000000000000000000000000000000000..0ed43b88e713babdcf36fe48847e93eca9bb2027
Binary files /dev/null and b/src/assets/images/persp-view/colin2.png differ
diff --git a/src/assets/images/persp-view/colin3.png b/src/assets/images/persp-view/colin3.png
new file mode 100644
index 0000000000000000000000000000000000000000..648c30596771a08b4603bc492f74b308975e83b0
Binary files /dev/null and b/src/assets/images/persp-view/colin3.png differ
diff --git a/src/assets/images/persp-view/mni1.png b/src/assets/images/persp-view/mni1.png
new file mode 100644
index 0000000000000000000000000000000000000000..7adb2eea89d2ef7f1c0008c540e249bffdffdeff
Binary files /dev/null and b/src/assets/images/persp-view/mni1.png differ
diff --git a/src/assets/images/persp-view/mni2.png b/src/assets/images/persp-view/mni2.png
new file mode 100644
index 0000000000000000000000000000000000000000..1782cd03ce16433646378ca6ae23e18f382579b6
Binary files /dev/null and b/src/assets/images/persp-view/mni2.png differ
diff --git a/src/assets/images/persp-view/mni3.png b/src/assets/images/persp-view/mni3.png
new file mode 100644
index 0000000000000000000000000000000000000000..4e7ffe77613710c063408a77e2dbe72fa975b16a
Binary files /dev/null and b/src/assets/images/persp-view/mni3.png differ
diff --git a/src/assets/images/persp-view/monkey1.png b/src/assets/images/persp-view/monkey1.png
new file mode 100644
index 0000000000000000000000000000000000000000..12022445d01b4a64c3a5edda8750b6ea62fa1bb4
Binary files /dev/null and b/src/assets/images/persp-view/monkey1.png differ
diff --git a/src/assets/images/persp-view/monkey2.png b/src/assets/images/persp-view/monkey2.png
new file mode 100644
index 0000000000000000000000000000000000000000..8589d4cf772ed634532ebfdace4d376405e560cb
Binary files /dev/null and b/src/assets/images/persp-view/monkey2.png differ
diff --git a/src/assets/images/persp-view/monkey3.png b/src/assets/images/persp-view/monkey3.png
new file mode 100644
index 0000000000000000000000000000000000000000..cba88d37878fecbe630cfdc4348d83b51d813c89
Binary files /dev/null and b/src/assets/images/persp-view/monkey3.png differ
diff --git a/src/assets/images/persp-view/mouse1.png b/src/assets/images/persp-view/mouse1.png
new file mode 100644
index 0000000000000000000000000000000000000000..0182036c42ba05a6061441eaab61478901d00994
Binary files /dev/null and b/src/assets/images/persp-view/mouse1.png differ
diff --git a/src/assets/images/persp-view/mouse2.png b/src/assets/images/persp-view/mouse2.png
new file mode 100644
index 0000000000000000000000000000000000000000..7eceb0c8e755ded6c1ffa97c4ba52edf43129cc5
Binary files /dev/null and b/src/assets/images/persp-view/mouse2.png differ
diff --git a/src/assets/images/persp-view/mouse3.png b/src/assets/images/persp-view/mouse3.png
new file mode 100644
index 0000000000000000000000000000000000000000..013dd6938b47fe56db3bc7d92f425ca14dc2c38c
Binary files /dev/null and b/src/assets/images/persp-view/mouse3.png differ
diff --git a/src/assets/images/persp-view/rat1.png b/src/assets/images/persp-view/rat1.png
new file mode 100644
index 0000000000000000000000000000000000000000..6aba7db21397cee6db3ef40d7be71ee1df96621e
Binary files /dev/null and b/src/assets/images/persp-view/rat1.png differ
diff --git a/src/assets/images/persp-view/rat2.png b/src/assets/images/persp-view/rat2.png
new file mode 100644
index 0000000000000000000000000000000000000000..3787537dbe9fa168c6a86c8fe9fc80c74c0396eb
Binary files /dev/null and b/src/assets/images/persp-view/rat2.png differ
diff --git a/src/assets/images/persp-view/rat3.png b/src/assets/images/persp-view/rat3.png
new file mode 100644
index 0000000000000000000000000000000000000000..3787537dbe9fa168c6a86c8fe9fc80c74c0396eb
Binary files /dev/null and b/src/assets/images/persp-view/rat3.png differ
diff --git a/src/services/maximiseView.service.ts b/src/services/maximiseView.service.ts
index 38a1e38684926a5f2f11b8fd5cf3ed386798e7ca..51d4e407c881c90fab78d327b9af6ac0339cb43f 100644
--- a/src/services/maximiseView.service.ts
+++ b/src/services/maximiseView.service.ts
@@ -46,6 +46,8 @@ export class MaximiseViewService implements OnDestroy {
public heightChanged: EventEmitter<null> = new EventEmitter();
+ public previewImage: string
+
private get viewer(){
return (window as any).viewer
}
@@ -197,6 +199,9 @@ export class MaximiseViewService implements OnDestroy {
}
maximise(panelIndex, panelOrder) {
+
+ this.previewImage = `assets/images/persp-view/${perspectiveScreenshots[this.selectedTemplateId][+panelOrder[0]]}`
+
this.isMaximised = true
this.maximisedPanelIndex = panelIndex
this.formatMiniPerspectiveView()
@@ -285,3 +290,12 @@ const defaultZoom = {
"minds/core/referencespace/v1.0.0/265d32a0-3d84-40a5-926f-bf89f68212b9": [165000,140000,100000],
"minds/core/referencespace/v1.0.0/d5717c4a-0fa1-46e6-918c-b8003069ade8": [600000,240000,240000],
}
+
+export const perspectiveScreenshots = {
+ "minds/core/referencespace/v1.0.0/dafcffc5-4826-4bf1-8ff6-46b8a31ff8e2": ['mni1.png', 'mni2.png', 'mni3.png'],
+ "minds/core/referencespace/v1.0.0/7f39f7be-445b-47c0-9791-e971c0b6d992": ['colin1.png', 'colin2.png', 'colin3.png'],
+ "minds/core/referencespace/v1.0.0/a1655b99-82f1-420f-a3c2-fe80fd4c8588": ['bb1.png', 'bb2.png', 'bb3.png'],
+ "minds/core/referencespace/v1.0.0/MEBRAINS": ['monkey1.png', 'monkey2.png', 'monkey3.png'],
+ "minds/core/referencespace/v1.0.0/265d32a0-3d84-40a5-926f-bf89f68212b9": ['mouse1.png', 'mouse2.png', 'mouse3.png'],
+ "minds/core/referencespace/v1.0.0/d5717c4a-0fa1-46e6-918c-b8003069ade8": ['rat1.png', 'rat2.png', 'rat3.png'],
+}
diff --git a/src/viewerModule/nehuba/layoutOverlay/nehuba.layoutOverlay/nehuba.layoutOverlay.style.css b/src/viewerModule/nehuba/layoutOverlay/nehuba.layoutOverlay/nehuba.layoutOverlay.style.css
index 90de968e708b69cc358dc467702f7780e20a7fb9..259ca72b47522cbc6f9704b181e647556a868338 100644
--- a/src/viewerModule/nehuba/layoutOverlay/nehuba.layoutOverlay/nehuba.layoutOverlay.style.css
+++ b/src/viewerModule/nehuba/layoutOverlay/nehuba.layoutOverlay/nehuba.layoutOverlay.style.css
@@ -94,6 +94,7 @@ current-layout
outline: none;
opacity: 1;
left: 0;
+ min-height: 5px;
background-color: rgba(0,0,0,0);
-webkit-transition: .2s;
transition: opacity .2s;
diff --git a/src/viewerModule/nehuba/layoutOverlay/nehuba.layoutOverlay/nehuba.layoutOverlay.template.html b/src/viewerModule/nehuba/layoutOverlay/nehuba.layoutOverlay/nehuba.layoutOverlay.template.html
index 42dad401343fbebec9d9d182b0264004d2e946c8..97e3a1fefeea877990d93d30d8f5bfae4569fef3 100644
--- a/src/viewerModule/nehuba/layoutOverlay/nehuba.layoutOverlay/nehuba.layoutOverlay.template.html
+++ b/src/viewerModule/nehuba/layoutOverlay/nehuba.layoutOverlay/nehuba.layoutOverlay.template.html
@@ -157,7 +157,9 @@
<ng-template #miniPerspectiveTmp>
<div *ngIf="panelOrder && panelOrder[0] !== '3'" class="pe-all position-relative mini-perspective-viewer overflow-hidden">
- <div *ngIf="maximiseService.maximisedPanelIndex !== null && maximiseService.templateTransform">
+ <div *ngIf="maximiseService.maximisedPanelIndex !== null && maximiseService.templateTransform"
+ [style.background-image]="'url(' + maximiseService.previewImage + ')'"
+ style="background-size: cover;">
<input type="range"
class="custom-slider-3d mini-perspective-viewer"
diff --git a/src/viewerModule/nehuba/util.ts b/src/viewerModule/nehuba/util.ts
index 08306f71ec67082fc722876ed68d3e0fbf58c840..97d3909ef08b7997483b21287e113ea96f3918b3 100644
--- a/src/viewerModule/nehuba/util.ts
+++ b/src/viewerModule/nehuba/util.ts
@@ -151,39 +151,21 @@ export const getFourPanel = (panels: [HTMLElement, HTMLElement, HTMLElement, HTM
export const getSinglePanel = (panels: [HTMLElement, HTMLElement, HTMLElement, HTMLElement], panelOrderString: string): HTMLDivElement => {
washPanels(panels)
- const panelOrder = panelOrderString.split('').map(p => +p)
-
panels.forEach((panel, idx) => addTouchSideClasses(panel, idx, "SINGLE_PANEL"))
const majorContainer = makeRow(panels[0])
majorContainer.style.flexBasis = '100%'
- const perspectivePanelIndex = panelOrder.findIndex(po => po === 3)
-
let minorContainer
- const perspectiveContainer = (panels[perspectivePanelIndex])
-
- if (panelOrder[0] !== 3) {
- perspectiveContainer.style.width = '200px'
- perspectiveContainer.style.height = '200px'
- perspectiveContainer.style.bottom = '50px'
- perspectiveContainer.style.right = '50px'
- perspectiveContainer.style.border='1px solid lightgrey'
- perspectiveContainer.classList.add('position-absolute')
-
- } else {
- washPanels(panels)
- majorContainer.style.flexBasis = '100%'
- minorContainer = makeRow(panels[1], panels[2], panels[3])
- minorContainer.style.flexBasis = '0%'
- minorContainer.className = ''
- minorContainer.style.height = '0px'
- }
+ washPanels(panels)
+ majorContainer.style.flexBasis = '100%'
+ minorContainer = makeRow(panels[1], panels[2], panels[3])
+ minorContainer.style.flexBasis = '0%'
+ minorContainer.className = ''
- return panelOrder[0] !== 3 ? makeRow(majorContainer, perspectiveContainer)
- : makeRow(majorContainer, minorContainer)
+ return makeRow(majorContainer, minorContainer)
}
export const getNavigationStateFromConfig = nehubaConfig => {