Skip to content

Commit 7ac5a92

Browse files
committed
move to utils_global
1 parent a04d737 commit 7ac5a92

File tree

4 files changed

+48
-46
lines changed

4 files changed

+48
-46
lines changed

spikeinterface_gui/backend_panel.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
from copy import copy
55

66
from .viewlist import possible_class_views
7-
from .layout_presets import get_layout_description, get_size_bottom_row, get_size_top_row
7+
from .layout_presets import get_layout_description
8+
from .utils_global import get_size_bottom_row, get_size_top_row
89

910
# Used by views to emit/trigger signals
1011
class SignalNotifier(param.Parameterized):

spikeinterface_gui/backend_qt.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
import weakref
88

99
from .viewlist import possible_class_views
10-
from .layout_presets import get_layout_description, get_size_bottom_row, get_size_top_row
10+
from .layout_presets import get_layout_description
11+
from .utils_global import get_size_bottom_row, get_size_top_row
1112

1213
from .utils_qt import qt_style, add_stretch_to_qtoolbar
1314

spikeinterface_gui/layout_presets.py

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -53,50 +53,6 @@ def get_layout_description(preset_name, layout=None):
5353
preset_name = 'default'
5454
return _presets[preset_name]
5555

56-
57-
def get_size_top_row(initial_row, initial_col, is_zone_array, original_zone_array):
58-
59-
if original_zone_array[initial_row][initial_col] == False:
60-
return 0,0
61-
62-
num_rows = is_zone_array[initial_row][initial_col]*1
63-
num_cols = num_rows
64-
65-
num_rows += (not is_zone_array[1][initial_col])*1
66-
67-
if num_rows == 1:
68-
for zone in is_zone_array[0,1+initial_col:]:
69-
if zone == True:
70-
break
71-
num_cols += 1
72-
elif num_rows == 2:
73-
for zone1, zone2 in np.transpose(is_zone_array[:,1+initial_col:]):
74-
if zone1 == True or zone2 == True:
75-
break
76-
num_cols += 1
77-
78-
is_zone_array[initial_row:initial_row+num_rows,initial_col:initial_col+num_cols] = True
79-
80-
return num_rows, num_cols
81-
82-
def get_size_bottom_row(initial_row, initial_col, is_zone_array, original_zone_array):
83-
84-
if original_zone_array[initial_row][initial_col] == False:
85-
return 0,0
86-
87-
num_rows = is_zone_array[initial_row][initial_col]*1
88-
if num_rows == 0:
89-
return 0, 0
90-
num_cols = num_rows
91-
92-
for zone in is_zone_array[1,1+initial_col:]:
93-
if zone == True:
94-
break
95-
else:
96-
num_cols += 1
97-
98-
return num_rows, num_cols
99-
10056
default_layout = dict(
10157
zone1=['curation', 'spikelist'],
10258
zone2=['unitlist', 'mergelist'],

spikeinterface_gui/utils_global.py

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
import numpy as np
2+
3+
def get_size_top_row(initial_row, initial_col, is_zone_array, original_zone_array):
4+
5+
if original_zone_array[initial_row][initial_col] == False:
6+
return 0,0
7+
8+
num_rows = is_zone_array[initial_row][initial_col]*1
9+
num_cols = num_rows
10+
11+
num_rows += (not is_zone_array[1][initial_col])*1
12+
13+
if num_rows == 1:
14+
for zone in is_zone_array[0,1+initial_col:]:
15+
if zone == True:
16+
break
17+
num_cols += 1
18+
elif num_rows == 2:
19+
for zone1, zone2 in np.transpose(is_zone_array[:,1+initial_col:]):
20+
if zone1 == True or zone2 == True:
21+
break
22+
num_cols += 1
23+
24+
is_zone_array[initial_row:initial_row+num_rows,initial_col:initial_col+num_cols] = True
25+
26+
return num_rows, num_cols
27+
28+
def get_size_bottom_row(initial_row, initial_col, is_zone_array, original_zone_array):
29+
30+
if original_zone_array[initial_row][initial_col] == False:
31+
return 0,0
32+
33+
num_rows = is_zone_array[initial_row][initial_col]*1
34+
if num_rows == 0:
35+
return 0, 0
36+
num_cols = num_rows
37+
38+
for zone in is_zone_array[1,1+initial_col:]:
39+
if zone == True:
40+
break
41+
else:
42+
num_cols += 1
43+
44+
return num_rows, num_cols

0 commit comments

Comments
 (0)