Skip to content

Commit

Permalink
fix neomorph url bug
Browse files Browse the repository at this point in the history
  • Loading branch information
lhqing committed Oct 7, 2020
1 parent c766c87 commit a396854
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 5 deletions.
10 changes: 8 additions & 2 deletions omb/app.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,13 @@
"""

import dash
import dash_bootstrap_components as dbc
import subprocess

APP_ROOT_NAME = 'omb'

app = dash.Dash(
__name__,
suppress_callback_exceptions=True,
# external_stylesheets=[dbc.themes.FLATLY],
meta_tags=[
{
"name": "viewport",
Expand All @@ -20,3 +19,10 @@
)
app.title = 'mC Viewer'
server = app.server

# judge which server I am running and change the prefix
host_name = subprocess.run(['hostname'], stdout=subprocess.PIPE, encoding='utf-8').stdout.strip()
if host_name.lower().startswith('neomorph'):
ON_NEOMORPH = True
else:
ON_NEOMORPH = False
7 changes: 6 additions & 1 deletion omb/apps/brain_region_browser.py
Original file line number Diff line number Diff line change
Expand Up @@ -595,5 +595,10 @@ def update_cell_type_sunburst(region_name):
Input('region-name', 'children')]
)
def make_pair_scatter_markdown(coords, cell_type_level, region_name):
url = f'/scatter?coords={coords};meta={cell_type_level};br={region_name}'.replace(' ', '%20')
from ..app import ON_NEOMORPH, APP_ROOT_NAME
if ON_NEOMORPH:
prefix = f'/{APP_ROOT_NAME}'
else:
prefix = f''
url = f'{prefix}/scatter?coords={coords};meta={cell_type_level};br={region_name}'.replace(' ', '%20')
return url
7 changes: 6 additions & 1 deletion omb/apps/cell_type_browser.py
Original file line number Diff line number Diff line change
Expand Up @@ -820,7 +820,12 @@ def make_pair_scatter_markdown(coord_base, gene, mc_type, cnorm, cell_type_name)
cell_type_level = 'SubType'
else:
cell_type_level = 'MajorType'
url = f'/scatter?coords={coord_base};meta={cell_type_level};gene={gene};' \
from ..app import ON_NEOMORPH, APP_ROOT_NAME
if ON_NEOMORPH:
prefix = f'/{APP_ROOT_NAME}'
else:
prefix = f''
url = f'{prefix}/scatter?coords={coord_base};meta={cell_type_level};gene={gene};' \
f'mc={mc_type};cnorm={",".join(map(str, cnorm))};ct={cell_type_name}'
text = f'For more details, go to the [**Paired Scatter Browser**]({url.replace(" ", "%20")}).'
return text
7 changes: 6 additions & 1 deletion omb/apps/gene_browser.py
Original file line number Diff line number Diff line change
Expand Up @@ -643,6 +643,11 @@ def get_gene_scatter_fig(coord_name, gene_int, mc_type, cnorm, gene_name):
Input('mc-range-slider', 'value')]
)
def make_pair_scatter_markdown(coords, cell_meta, gene, mc_type, cnorm):
url = f'/scatter?coords={coords};meta={cell_meta};gene={gene};mc={mc_type};cnorm={",".join(map(str, cnorm))}'
from ..app import ON_NEOMORPH, APP_ROOT_NAME
if ON_NEOMORPH:
prefix = f'/{APP_ROOT_NAME}'
else:
prefix = f''
url = f'{prefix}/scatter?coords={coords};meta={cell_meta};gene={gene};mc={mc_type};cnorm={",".join(map(str, cnorm))}'
text = f'For more details, go to the [**Paired Scatter Browser**]({url.replace(" ", "%20")})'
return text

0 comments on commit a396854

Please sign in to comment.