Skip to content
Snippets Groups Projects
Unverified Commit ae8c8ec9 authored by Xiao Gui's avatar Xiao Gui
Browse files

fix: screenshot in fsaverage

parent 52b6d796
No related branches found
No related tags found
No related merge requests found
# v2.12.2
## Bugfixes
- fixes screenshot in fsaverage
...@@ -33,6 +33,7 @@ nav: ...@@ -33,6 +33,7 @@ nav:
- Fetching datasets: 'advanced/datasets.md' - Fetching datasets: 'advanced/datasets.md'
- Display non-atlas volumes: 'advanced/otherVolumes.md' - Display non-atlas volumes: 'advanced/otherVolumes.md'
- Release notes: - Release notes:
- v2.12.2: 'releases/v2.12.2.md'
- v2.12.1: 'releases/v2.12.1.md' - v2.12.1: 'releases/v2.12.1.md'
- v2.12.0: 'releases/v2.12.0.md' - v2.12.0: 'releases/v2.12.0.md'
- v2.11.4: 'releases/v2.11.4.md' - v2.11.4: 'releases/v2.11.4.md'
......
{ {
"name": "siibra-explorer", "name": "siibra-explorer",
"version": "2.12.1", "version": "2.12.2",
"description": "siibra-explorer - explore brain atlases. Based on humanbrainproject/nehuba & google/neuroglancer. Built with angular", "description": "siibra-explorer - explore brain atlases. Based on humanbrainproject/nehuba & google/neuroglancer. Built with angular",
"scripts": { "scripts": {
"lint": "eslint src --ext .ts", "lint": "eslint src --ext .ts",
......
...@@ -40,11 +40,21 @@ import { HANDLE_SCREENSHOT_PROMISE, TypeHandleScrnShotPromise } from "../screens ...@@ -40,11 +40,21 @@ import { HANDLE_SCREENSHOT_PROMISE, TypeHandleScrnShotPromise } from "../screens
{ {
provide: HANDLE_SCREENSHOT_PROMISE, provide: HANDLE_SCREENSHOT_PROMISE,
useValue: ((param) => { useValue: ((param) => {
const canvas: HTMLCanvasElement = document.querySelector('#neuroglancer-container canvas') const ngCanvas: HTMLCanvasElement = document.querySelector('#neuroglancer-container canvas')
const threeSurferCanvas: HTMLCanvasElement = document.querySelector('three-surfer-glue-cmp canvas')
if (threeSurferCanvas) {
const tsViewer = window['tsViewer']
tsViewer.renderer.render(tsViewer.scene, tsViewer.camera)
}
if (ngCanvas) {
window['viewer'].display.draw()
}
const canvas = ngCanvas || threeSurferCanvas
if (!canvas) { if (!canvas) {
return Promise.reject(`element '#neuroglancer-container canvas' not found`) return Promise.reject(`element '#neuroglancer-container canvas' or 'three-surfer-glue-cmp canvas' not found`)
} }
(window as any).viewer.display.draw()
if (!param) { if (!param) {
return new Promise(rs => { return new Promise(rs => {
canvas.toBlob(blob => { canvas.toBlob(blob => {
......
...@@ -824,11 +824,13 @@ export class ThreeSurferGlueCmp implements IViewer<'threeSurfer'>, AfterViewInit ...@@ -824,11 +824,13 @@ export class ThreeSurferGlueCmp implements IViewer<'threeSurfer'>, AfterViewInit
() => this.domEl.removeEventListener((window as any).ThreeSurfer.CUSTOM_EVENTNAME_UPDATED, customEvHandler) () => this.domEl.removeEventListener((window as any).ThreeSurfer.CUSTOM_EVENTNAME_UPDATED, customEvHandler)
) )
this.tsRef = new (window as any).ThreeSurfer(this.domEl, {highlightHovered: true}) this.tsRef = new (window as any).ThreeSurfer(this.domEl, {highlightHovered: true})
window['tsViewer'] = this.tsRef
this.onDestroyCb.push( this.onDestroyCb.push(
() => { () => {
this.tsRef.dispose() this.tsRef.dispose()
this.tsRef = null this.tsRef = null
window['tsViewer'] = null
} }
) )
this.tsRef.control.enablePan = false this.tsRef.control.enablePan = false
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment