Merge pull request #173 from HumanBrainProject/dev_next

may point release

deploy/datasets/index.js

@@ -3,6 +3,8 @@ const path = require('path')
 const fs = require('fs')
 const datasetsRouter = express.Router()
 const { init, getDatasets, getPreview } = require('./query')
+const url = require('url')
+const qs = require('querystring')
 
 const bodyParser = require('body-parser')
 datasetsRouter.use(bodyParser.urlencoded({ extended: false }))
@@ -56,7 +58,10 @@ datasetsRouter.get('/parcellationName/:parcellationName', (req, res, next) => {
 
 datasetsRouter.get('/preview/:datasetName', (req, res, next) => {
   const { datasetName } = req.params
-  getPreview({ datasetName })
+  const ref = url.parse(req.headers.referer)
+  const { templateSelected, parcellationSelected } = qs.parse(ref.query)
+  
+  getPreview({ datasetName, templateSelected })
     .then(preview => {
       if (preview) {
         res.status(200).json(preview)

deploy/datasets/query.js

@@ -189,7 +189,7 @@ exports.init = async () => {
 exports.getDatasets = ({ templateName, parcellationName, user }) => getDs({ user })
     .then(json => filter(json, {templateName, parcellationName}))
 
-exports.getPreview = ({ datasetName }) => getPreviewFile({ datasetName })
+exports.getPreview = ({ datasetName, templateSelected }) => getPreviewFile({ datasetName, templateSelected })
 
 /**
  * TODO

deploy/datasets/supplements/previewFile.js

@@ -3,6 +3,7 @@ const path = require('path')
 
 const DISABLE_RECEPTOR_PREVIEW = process.env.DISABLE_RECEPTOR_PREVIEW
 const DISABLE_JUBRAIN_PMAP = process.env.DISABLE_JUBRAIN_PMAP
+const DISABLE_JUBRAIN_PMAP_V17 = process.env.DISABLE_JUBRAIN_PMAP_V17
 const DISABLE_DWM_PMAP = process.env.DISABLE_DWM_PMAP
 const HOSTNAME = process.env.HOSTNAME || 'http://localhost:3000'
 
@@ -22,7 +23,8 @@ const readFile = (filename) => new Promise((resolve) => {
 Promise.all([
   DISABLE_RECEPTOR_PREVIEW ? Promise.resolve([]) : readFile('receptorPreview.json'),
   DISABLE_JUBRAIN_PMAP ? Promise.resolve([]) : readFile('pmapJubrainPreview.json'),
-  DISABLE_DWM_PMAP ? Promise.resolve([]) : readFile('pmapDWMPreview.json')
+  DISABLE_DWM_PMAP ? Promise.resolve([]) : readFile('pmapDWMPreview.json'),
+  DISABLE_JUBRAIN_PMAP_V17 ? Promise.resolve([]) : readFile('pmapJuBrainV17Preview.json')
 ])
   .then(arrOfA => arrOfA.reduce((acc, item) => acc.concat(item), []))
   .then(iterable => {
@@ -33,8 +35,13 @@ Promise.all([
     console.error('preview file error', e)
   })
 
-exports.getPreviewFile = ({ datasetName }) => Promise.resolve(
+exports.getPreviewFile = ({ datasetName, templateSelected }) => Promise.resolve(
   previewMap.get(datasetName)
+    .filter(({ templateSpace }) => {
+      if (!templateSpace) return true
+      if (!templateSelected) return true
+      return templateSpace === templateSelected
+    })
     .map(file => {
       return {
         ...file,

src/atlasViewer/atlasViewer.component.ts

@@ -22,6 +22,12 @@ import { TabsetComponent } from "ngx-bootstrap/tabs";
 import { ToastService } from "src/services/toastService.service";
 import { ZipFileDownloadService } from "src/services/zipFileDownload.service";
 
+/**
+ * TODO
+ * check against auxlillary mesh indicies, to only filter out aux indicies
+ */
+const filterFn = (segment) => typeof segment.segment !== 'string'
+
 @Component({
   selector: 'atlas-viewer',
   templateUrl: './atlasViewer.template.html',
@@ -201,9 +207,14 @@ export class AtlasViewer implements OnDestroy, OnInit, AfterViewInit {
       this.onhoverLandmark$
     ).pipe(
       map(([segments, onhoverLandmark]) => onhoverLandmark ? null : segments ),
-      map(segments => !segments || segments.length === 0
-          ? null
-          : segments.map(s => s.segment) )
+      map(segments => {
+        if (!segments)
+          return null
+        const filteredSeg = segments.filter(filterFn)
+        return filteredSeg.length > 0
+          ? segments.map(s => s.segment) 
+          : null
+        })
     )
 
     this.selectedParcellation$ = this.store.pipe(

src/services/effect/effect.ts

@@ -69,7 +69,7 @@ export class UseEffects implements OnDestroy{
       const { selectRegionIds } = action
       const { ngId: defaultNgId } = parcellation
 
-      const regionsSelected = (<any[]>selectRegionIds)
+      const selectRegions = (<any[]>selectRegionIds)
         .map(labelIndexId => getNgIdLabelIndexFromId({ labelIndexId }))
         .map(({ ngId, labelIndex }) => {
           return {
@@ -90,10 +90,9 @@ export class UseEffects implements OnDestroy{
           if (!v) console.log(`SELECT_REGIONS_WITH_ID, some ids cannot be parsed intto label index`)
           return !!v
         })
-      console.log('regionsselectd', regionsSelected)
       return {
         type: SELECT_REGIONS,
-        regionsSelected
+        selectRegions
       }
     })
   )

src/services/stateStore.service.ts

@@ -151,6 +151,5 @@ export function recursiveFindRegionWithLabelIndexId({ regions, labelIndexId, inh
   const fr2 = fr1.reduce((acc, curr) => acc.concat(...curr), [])
   const found = fr2.find(r => r.ngId === ngId && Number(r.labelIndex) === Number(labelIndex))
   if (found) return found
-  debugger
   return null
 }

src/ui/databrowserModule/databrowser/databrowser.style.css

@@ -221,4 +221,10 @@ radio-list
   display: inline-block;
   border-radius: 50%;
   background-color:white;
+}
+
+div[regionTagsContainer]
+{
+  max-height: 4em;
+  overflow:hidden;
 }
\ No newline at end of file