diff --git a/README.md b/README.md index 9e0abeec2426929b8def7a8f5b5f4434967fff4d..17600f0bf72bd06c4d1e823d71fce2d9644a5412 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ <img align="right" src="https://raw.githubusercontent.com/FZJ-INM1-BDA/siibra-explorer/master/docs/images/siibra-explorer-square.jpeg" width="200"> -[](https://interactive-viewer.readthedocs.io/en/latest/) +[](https://siibra-explorer.readthedocs.io/) [](https://opensource.org/licenses/Apache-2.0) # siibra-explorer - Interactive viewer for multilevel brain atlases diff --git a/docs/releases/v2.6.7.md b/docs/releases/v2.6.7.md new file mode 100644 index 0000000000000000000000000000000000000000..e0afbec153763eb59e29a992bdeeff70bbd98329 --- /dev/null +++ b/docs/releases/v2.6.7.md @@ -0,0 +1,11 @@ +# 2.6.7 + +## Bugfix + +- set max height of descriptions to show rich elements +- fix mkdocs configuration +- fix docs links + +## Behind the scene + +- temporarily disabled explore in other templates diff --git a/mkdocs.yml b/mkdocs.yml index fb8f1aded1ce21f342f7149a36483a6025183377..67b26f6d082ccaa2ca9a0123518efded6d49905c 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -17,7 +17,7 @@ markdown_extensions: plugins: - search -pages: +nav: - Home: 'index.md' - System requirements: 'requirements.md' - User documentation: @@ -33,6 +33,7 @@ pages: - Fetching datasets: 'advanced/datasets.md' - Display non-atlas volumes: 'advanced/otherVolumes.md' - Release notes: + - v2.6.7: 'releases/v2.6.7.md' - v2.6.6: 'releases/v2.6.6.md' - v2.6.5: 'releases/v2.6.5.md' - v2.6.4: 'releases/v2.6.4.md' diff --git a/package.json b/package.json index d24a488d857bce622022afa1440248afc640dc21..80f7571de266bebcc04a85af585efb152411b5e5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "interactive-viewer", - "version": "2.6.6", + "version": "2.6.7", "description": "HBP interactive atlas viewer. Integrating KG query, dataset previews & more. Based on humanbrainproject/nehuba & google/neuroglancer. Built with angular", "scripts": { "build-aot": "ng build && node ./third_party/matomo/processMatomo.js", diff --git a/src/atlasComponents/parcellationRegion/regionMenu/regionMenu.template.html b/src/atlasComponents/parcellationRegion/regionMenu/regionMenu.template.html index 06aac677565c2f5f7f4f169710bdcf64b39cb915..55539c2c1993146b799f90acc9555d8456c1c1ae 100644 --- a/src/atlasComponents/parcellationRegion/regionMenu/regionMenu.template.html +++ b/src/atlasComponents/parcellationRegion/regionMenu/regionMenu.template.html @@ -74,6 +74,13 @@ <!-- Explore in other template --> + + <!-- Disabling explore in other templates for now --> + <!-- rework before reenable + - identify the open todos (bigbrain hemisphere split, navigation to center coordinates in surface viewer, …) until the functionality is working + - put it in the development board --> + <ng-template [ngIf]="false"> + <ng-template [ngIf]="region$ | async | regionInOtherTmpl" let-otherTmpls> <ng-template #exploreInOtherTmpl> <mat-grid-list cols="3" @@ -120,6 +127,7 @@ }"> </ng-container> </ng-template> + </ng-template> <!-- kg regional features list --> diff --git a/src/atlasComponents/regionalFeatures/bsFeatures/genericInfo/genericInfoCmp/genericInfo.style.css b/src/atlasComponents/regionalFeatures/bsFeatures/genericInfo/genericInfoCmp/genericInfo.style.css index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..3e722e3e9997fb043174c54f56a641035c3f1b6d 100644 --- a/src/atlasComponents/regionalFeatures/bsFeatures/genericInfo/genericInfoCmp/genericInfo.style.css +++ b/src/atlasComponents/regionalFeatures/bsFeatures/genericInfo/genericInfoCmp/genericInfo.style.css @@ -0,0 +1,5 @@ +.desc-container +{ + max-height: 35vh; + overflow: auto; +} diff --git a/src/atlasComponents/regionalFeatures/bsFeatures/genericInfo/genericInfoCmp/genericInfo.template.html b/src/atlasComponents/regionalFeatures/bsFeatures/genericInfo/genericInfoCmp/genericInfo.template.html index 2bce44e578033cd6aa517f3dae798aafb6944bc4..be13818c97aec683681de104eba5f82ea9d0e6d8 100644 --- a/src/atlasComponents/regionalFeatures/bsFeatures/genericInfo/genericInfoCmp/genericInfo.template.html +++ b/src/atlasComponents/regionalFeatures/bsFeatures/genericInfo/genericInfoCmp/genericInfo.template.html @@ -88,7 +88,7 @@ </mat-card> <!-- description --> - <div class="text-muted d-block mat-body m-4" + <div class="text-muted d-block mat-body m-4 desc-container" *ngIf="!loadingFlag"> <ng-container *ngTemplateOutlet="descTmpl"> </ng-container> diff --git a/src/atlasComponents/regionalFeatures/bsFeatures/receptor/ar/autoradiograph.component.ts b/src/atlasComponents/regionalFeatures/bsFeatures/receptor/ar/autoradiograph.component.ts index 83054ac26c45903d6e5cef7c64015a57454f2cf1..0ea3e7fb5419c6db96466584773ba98e5d529934 100644 --- a/src/atlasComponents/regionalFeatures/bsFeatures/receptor/ar/autoradiograph.component.ts +++ b/src/atlasComponents/regionalFeatures/bsFeatures/receptor/ar/autoradiograph.component.ts @@ -1,15 +1,13 @@ import { Component, ElementRef, Input, OnChanges, ViewChild } from "@angular/core"; import { BsFeatureReceptorBase } from "../base"; import { CONST } from 'common/constants' -import { TBSDetail } from "../type"; import { environment } from 'src/environments/environment' import { AtlasWorkerService } from "src/atlasViewer/atlasViewer.workerService.service"; const { RECEPTOR_AR_CAPTION } = CONST -export function isAr(detail: TBSDetail, label: string){ - if (label) return !!detail.__data.__autoradiographs[label] - return !!detail.__data.__autoradiographs +export function isAr(filename: string, label: string = ''){ + return filename.indexOf(`_ar_${label}`) >= 0 } @Component({ @@ -51,6 +49,11 @@ export class BsFeatureReceptorAR extends BsFeatureReceptorBase implements OnChan return } + this.urls = this.bsFeature.__files + .filter(url => isAr(url, this.bsLabel)) + .map(url => { + return { url } + }) try { const { "x-channel": channel, diff --git a/src/util/pureConstant.service.ts b/src/util/pureConstant.service.ts index 25ed812de16b7bd3db650aad9421dec116726d47..76dc7ee97e28529c7308857c41de2c1d00590a23 100644 --- a/src/util/pureConstant.service.ts +++ b/src/util/pureConstant.service.ts @@ -17,7 +17,7 @@ import { MatSnackBar } from "@angular/material/snack-bar"; import { TTemplateImage } from "./interfaces"; export const SIIBRA_API_VERSION_HEADER_KEY='x-siibra-api-version' -export const SIIBRA_API_VERSION = '0.1.11' +export const SIIBRA_API_VERSION = '0.1.12' const validVolumeType = new Set([ 'neuroglancer/precomputed',