Commit 1323b9d4 authored by Martin Schorb's avatar Martin Schorb
Browse files

tile neighbours fixes

parent 65668353
...@@ -94,7 +94,6 @@ for idx in range(params.max_tileviews): ...@@ -94,7 +94,6 @@ for idx in range(params.max_tileviews):
if o_min == o_max: slicestyle = {'display':'none'} if o_min == o_max: slicestyle = {'display':'none'}
url = params.render_base_url + params.render_version + 'owner/' + owner + '/project/' + project + '/stack/' + stack_sel url = params.render_base_url + params.render_version + 'owner/' + owner + '/project/' + project + '/stack/' + stack_sel
url1 = url + '/tileIds' url1 = url + '/tileIds'
...@@ -103,7 +102,6 @@ for idx in range(params.max_tileviews): ...@@ -103,7 +102,6 @@ for idx in range(params.max_tileviews):
url2 = url +'/tile/' + tile url2 = url +'/tile/' + tile
url2 += '/render-parameters' url2 += '/render-parameters'
tilespec = requests.get(url2).json() tilespec = requests.get(url2).json()
max_int = tilespec['tileSpecs'][0]['maxIntensity'] max_int = tilespec['tileSpecs'][0]['maxIntensity']
...@@ -173,20 +171,18 @@ for idx in range(params.max_tileviews): ...@@ -173,20 +171,18 @@ for idx in range(params.max_tileviews):
tp_jsonfiles = hf.jsonfiles(tilepairdir) tp_jsonfiles = hf.jsonfiles(tilepairdir)
if 'tile' in lead_tile.keys(): if 'tile' in lead_tile.keys():
tiles,slices,positions = hf.neighbours_from_json(tp_jsonfiles,lead_tile['tile']) tiles,slices,positions = hf.neighbours_from_json(tp_jsonfiles,lead_tile['tile'])
t_labels = tiles t_labels = tiles.copy()
if tiles==[]: if tiles==[]:
return dash.no_update return dash.no_update
tile = tiles[-1] tile = tiles[-1]
if owner in params.tile_display.keys() and len(slices)==len(t_labels):
if owner in params.tile_display.keys():
t_labels, tile0 = params.tile_display[owner](tiles, prev_tile, slicenum) t_labels, tile0 = params.tile_display[owner](tiles, prev_tile, slicenum)
for t_idx,label in enumerate(t_labels): for t_idx,label in enumerate(t_labels):
if len(slices)>1: if len(slices)>1 :
slicestr = 'Slice '+str(slices[t_idx])+' - ' slicestr = 'Slice '+str(slices[t_idx])+' - '
else: else:
slicestr = '' slicestr = ''
......
...@@ -171,7 +171,7 @@ def tilepairs_execute_gobutton(click,pairmode,stack,slicedepth,comp_sel,startsec ...@@ -171,7 +171,7 @@ def tilepairs_execute_gobutton(click,pairmode,stack,slicedepth,comp_sel,startsec
run_params_generate['excludeSameLayerNeighbors'] = 'True' run_params_generate['excludeSameLayerNeighbors'] = 'True'
if owner == 'SBEM': if owner == 'SBEM':
run_params_generate["xyNeighborFactor"] = 0.3 run_params_generate["xyNeighborFactor"] = 0.2
param_file = params.json_run_dir + '/' + module + '_' + run_prefix + '_' + pairmode + '.json' param_file = params.json_run_dir + '/' + module + '_' + run_prefix + '_' + pairmode + '.json'
......
Supports Markdown
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