From 5be5e5daaf4d599b578b7fb79651a880561309fa Mon Sep 17 00:00:00 2001
From: xgui3783 <xgui3783@gmail.com>
Date: Wed, 1 Jul 2020 22:12:17 +0200
Subject: [PATCH] bugfix: atlas image selection pathing (#565)
updated doc
---
.../images/atlas-selection/allen-mouse-2015.png | Bin
.../images/atlas-selection/allen-mouse-2017.png | Bin
.../assets}/images/atlas-selection/allen-mouse.png | Bin
.../assets}/images/atlas-selection/bugbrain.png | Bin
.../assets}/images/atlas-selection/colin27.png | Bin
.../images/atlas-selection/cortical-layers.png | Bin
.../atlas-selection/cytoarchitectonic-maps.png | Bin
.../assets}/images/atlas-selection/difumo-1024.png | Bin
.../assets}/images/atlas-selection/difumo-128.png | Bin
.../assets}/images/atlas-selection/difumo-256.png | Bin
.../assets}/images/atlas-selection/difumo-512.png | Bin
.../assets}/images/atlas-selection/difumo-64.png | Bin
.../assets}/images/atlas-selection/firbe-long.png | Bin
.../assets}/images/atlas-selection/firbe-short.png | Bin
.../images/atlas-selection/grey-white-matter.png | Bin
.../assets}/images/atlas-selection/icbm2009c.png | Bin
.../assets}/images/atlas-selection/waxholm-v1.png | Bin
.../assets}/images/atlas-selection/waxholm-v2.png | Bin
.../assets}/images/atlas-selection/waxholm-v3.png | Bin
.../assets}/images/atlas-selection/waxholm.png | Bin
deploy/atlas/index.js | 8 ++------
docs/releases/v2.3.0.md | 1 +
22 files changed, 3 insertions(+), 6 deletions(-)
rename {src/res => deploy/assets}/images/atlas-selection/allen-mouse-2015.png (100%)
rename {src/res => deploy/assets}/images/atlas-selection/allen-mouse-2017.png (100%)
rename {src/res => deploy/assets}/images/atlas-selection/allen-mouse.png (100%)
rename {src/res => deploy/assets}/images/atlas-selection/bugbrain.png (100%)
rename {src/res => deploy/assets}/images/atlas-selection/colin27.png (100%)
rename {src/res => deploy/assets}/images/atlas-selection/cortical-layers.png (100%)
rename {src/res => deploy/assets}/images/atlas-selection/cytoarchitectonic-maps.png (100%)
rename {src/res => deploy/assets}/images/atlas-selection/difumo-1024.png (100%)
rename {src/res => deploy/assets}/images/atlas-selection/difumo-128.png (100%)
rename {src/res => deploy/assets}/images/atlas-selection/difumo-256.png (100%)
rename {src/res => deploy/assets}/images/atlas-selection/difumo-512.png (100%)
rename {src/res => deploy/assets}/images/atlas-selection/difumo-64.png (100%)
rename {src/res => deploy/assets}/images/atlas-selection/firbe-long.png (100%)
rename {src/res => deploy/assets}/images/atlas-selection/firbe-short.png (100%)
rename {src/res => deploy/assets}/images/atlas-selection/grey-white-matter.png (100%)
rename {src/res => deploy/assets}/images/atlas-selection/icbm2009c.png (100%)
rename {src/res => deploy/assets}/images/atlas-selection/waxholm-v1.png (100%)
rename {src/res => deploy/assets}/images/atlas-selection/waxholm-v2.png (100%)
rename {src/res => deploy/assets}/images/atlas-selection/waxholm-v3.png (100%)
rename {src/res => deploy/assets}/images/atlas-selection/waxholm.png (100%)
diff --git a/src/res/images/atlas-selection/allen-mouse-2015.png b/deploy/assets/images/atlas-selection/allen-mouse-2015.png
similarity index 100%
rename from src/res/images/atlas-selection/allen-mouse-2015.png
rename to deploy/assets/images/atlas-selection/allen-mouse-2015.png
diff --git a/src/res/images/atlas-selection/allen-mouse-2017.png b/deploy/assets/images/atlas-selection/allen-mouse-2017.png
similarity index 100%
rename from src/res/images/atlas-selection/allen-mouse-2017.png
rename to deploy/assets/images/atlas-selection/allen-mouse-2017.png
diff --git a/src/res/images/atlas-selection/allen-mouse.png b/deploy/assets/images/atlas-selection/allen-mouse.png
similarity index 100%
rename from src/res/images/atlas-selection/allen-mouse.png
rename to deploy/assets/images/atlas-selection/allen-mouse.png
diff --git a/src/res/images/atlas-selection/bugbrain.png b/deploy/assets/images/atlas-selection/bugbrain.png
similarity index 100%
rename from src/res/images/atlas-selection/bugbrain.png
rename to deploy/assets/images/atlas-selection/bugbrain.png
diff --git a/src/res/images/atlas-selection/colin27.png b/deploy/assets/images/atlas-selection/colin27.png
similarity index 100%
rename from src/res/images/atlas-selection/colin27.png
rename to deploy/assets/images/atlas-selection/colin27.png
diff --git a/src/res/images/atlas-selection/cortical-layers.png b/deploy/assets/images/atlas-selection/cortical-layers.png
similarity index 100%
rename from src/res/images/atlas-selection/cortical-layers.png
rename to deploy/assets/images/atlas-selection/cortical-layers.png
diff --git a/src/res/images/atlas-selection/cytoarchitectonic-maps.png b/deploy/assets/images/atlas-selection/cytoarchitectonic-maps.png
similarity index 100%
rename from src/res/images/atlas-selection/cytoarchitectonic-maps.png
rename to deploy/assets/images/atlas-selection/cytoarchitectonic-maps.png
diff --git a/src/res/images/atlas-selection/difumo-1024.png b/deploy/assets/images/atlas-selection/difumo-1024.png
similarity index 100%
rename from src/res/images/atlas-selection/difumo-1024.png
rename to deploy/assets/images/atlas-selection/difumo-1024.png
diff --git a/src/res/images/atlas-selection/difumo-128.png b/deploy/assets/images/atlas-selection/difumo-128.png
similarity index 100%
rename from src/res/images/atlas-selection/difumo-128.png
rename to deploy/assets/images/atlas-selection/difumo-128.png
diff --git a/src/res/images/atlas-selection/difumo-256.png b/deploy/assets/images/atlas-selection/difumo-256.png
similarity index 100%
rename from src/res/images/atlas-selection/difumo-256.png
rename to deploy/assets/images/atlas-selection/difumo-256.png
diff --git a/src/res/images/atlas-selection/difumo-512.png b/deploy/assets/images/atlas-selection/difumo-512.png
similarity index 100%
rename from src/res/images/atlas-selection/difumo-512.png
rename to deploy/assets/images/atlas-selection/difumo-512.png
diff --git a/src/res/images/atlas-selection/difumo-64.png b/deploy/assets/images/atlas-selection/difumo-64.png
similarity index 100%
rename from src/res/images/atlas-selection/difumo-64.png
rename to deploy/assets/images/atlas-selection/difumo-64.png
diff --git a/src/res/images/atlas-selection/firbe-long.png b/deploy/assets/images/atlas-selection/firbe-long.png
similarity index 100%
rename from src/res/images/atlas-selection/firbe-long.png
rename to deploy/assets/images/atlas-selection/firbe-long.png
diff --git a/src/res/images/atlas-selection/firbe-short.png b/deploy/assets/images/atlas-selection/firbe-short.png
similarity index 100%
rename from src/res/images/atlas-selection/firbe-short.png
rename to deploy/assets/images/atlas-selection/firbe-short.png
diff --git a/src/res/images/atlas-selection/grey-white-matter.png b/deploy/assets/images/atlas-selection/grey-white-matter.png
similarity index 100%
rename from src/res/images/atlas-selection/grey-white-matter.png
rename to deploy/assets/images/atlas-selection/grey-white-matter.png
diff --git a/src/res/images/atlas-selection/icbm2009c.png b/deploy/assets/images/atlas-selection/icbm2009c.png
similarity index 100%
rename from src/res/images/atlas-selection/icbm2009c.png
rename to deploy/assets/images/atlas-selection/icbm2009c.png
diff --git a/src/res/images/atlas-selection/waxholm-v1.png b/deploy/assets/images/atlas-selection/waxholm-v1.png
similarity index 100%
rename from src/res/images/atlas-selection/waxholm-v1.png
rename to deploy/assets/images/atlas-selection/waxholm-v1.png
diff --git a/src/res/images/atlas-selection/waxholm-v2.png b/deploy/assets/images/atlas-selection/waxholm-v2.png
similarity index 100%
rename from src/res/images/atlas-selection/waxholm-v2.png
rename to deploy/assets/images/atlas-selection/waxholm-v2.png
diff --git a/src/res/images/atlas-selection/waxholm-v3.png b/deploy/assets/images/atlas-selection/waxholm-v3.png
similarity index 100%
rename from src/res/images/atlas-selection/waxholm-v3.png
rename to deploy/assets/images/atlas-selection/waxholm-v3.png
diff --git a/src/res/images/atlas-selection/waxholm.png b/deploy/assets/images/atlas-selection/waxholm.png
similarity index 100%
rename from src/res/images/atlas-selection/waxholm.png
rename to deploy/assets/images/atlas-selection/waxholm.png
diff --git a/deploy/atlas/index.js b/deploy/atlas/index.js
index 35f4c488f..24fde4879 100644
--- a/deploy/atlas/index.js
+++ b/deploy/atlas/index.js
@@ -61,12 +61,8 @@ router.get('/preview', (req, res) => {
const filename = previewImageFIleNameMap.get(id)
if (!filename) return res.status(404).end()
- let filepath
- if (process.env.NODE_ENV === 'production') {
- filepath = path.join(__dirname, '../res/image', filename)
- } else {
- filepath = path.join(__dirname, '../../src/res/images/atlas-selection', filename)
- }
+ const filepath = path.join(__dirname, '../assets/images/atlas-selection', filename)
+
try {
res.setHeader('Content-Type', 'image/png')
fs.createReadStream(filepath).pipe(res).on('error', getHandleErrorFn(req, res))
diff --git a/docs/releases/v2.3.0.md b/docs/releases/v2.3.0.md
index da2150d30..9b0086dd4 100644
--- a/docs/releases/v2.3.0.md
+++ b/docs/releases/v2.3.0.md
@@ -8,3 +8,4 @@
- allowing for color maps other than jet
- Updated `README.md`
- introduced zoom buttons
+- major UI overhaul
--
GitLab