Skip to content

Commit 34c4c08

Browse files
committed
Fix Acoustic Space Import Tool bug
Fixed bug causing low frequency responses imported using ‘Low frequency mode’ in the acoustic space import tool to fail to load
1 parent 77104eb commit 34c4c08

5 files changed

Lines changed: 15 additions & 14 deletions

File tree

ash_toolset/__main__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2057,7 +2057,7 @@ def get_screen_size(default_width=1722, default_height=717):
20572057
dpg.add_checkbox(label="Enable", tag="as_subwoofer_mode",default_value=loaded_values["as_subwoofer_mode"])
20582058
with dpg.tooltip("as_subwoofer_mode"):
20592059
dpg.add_text("Enable to treat the IRs as low-frequency responses")
2060-
dpg.add_text("The result will appear under low-frequency extension options")
2060+
dpg.add_text("The result will appear under low-frequency extension options instead of acoustic space options")
20612061

20622062
# ---------- Binaural Measurements ----------
20632063
with dpg.table_row():

ash_toolset/air_processing.py

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1166,16 +1166,17 @@ def convert_airs_to_brirs(
11661166

11671167

11681168
#set number of output directions (brir sources)
1169-
if auto_shape_output:#derive based on number of measurements
1170-
if subwoofer_mode == True:#only 1 set required if subwoofer response
1171-
num_brir_sources=1
1172-
elif total_measurements < CN.IR_MIN_THRESHOLD_FULLSET:#limited number of measurements
1173-
num_brir_sources = max(2, total_measurements // 250)#calculate one source per 250 measurements
1174-
else:
1175-
num_brir_sources = max(2, total_measurements // 360)#calculate one source per 360 measurements
1176-
1177-
else:#manual shape mode -> use when called by AS import tool
1178-
num_brir_sources = virtual_speakers
1169+
if subwoofer_mode == True:#only 1 set required if subwoofer response
1170+
num_brir_sources=1
1171+
else:
1172+
if auto_shape_output:#derive based on number of measurements
1173+
if total_measurements < CN.IR_MIN_THRESHOLD_FULLSET:#limited number of measurements
1174+
num_brir_sources = max(2, total_measurements // 250)#calculate one source per 250 measurements
1175+
else:
1176+
num_brir_sources = max(2, total_measurements // 360)#calculate one source per 360 measurements
1177+
1178+
else:#manual shape mode -> use when called by AS import tool
1179+
num_brir_sources = virtual_speakers
11791180

11801181
log_string_a = 'num_brir_sources: ' + str(num_brir_sources)
11811182
hf.log_with_timestamp(log_string_a)

ash_toolset/brir_generation.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ def generate_integrated_brir(brir_name, spatial_res=1, report_progress=0, gui_l
190190
if sub_folder == 'sub' or sub_folder == 'lf_brir':#default sub responses
191191
npy_fname = pjoin(CN.DATA_DIR_SUB, sub_file_name+'.npy')
192192
else:#user sub response
193-
file_folder = pjoin(CN.DATA_DIR_AS_USER,sub_response)
193+
file_folder = pjoin(CN.DATA_DIR_AS_USER, sub_response.replace(" ", "_") )
194194
npy_fname = pjoin(file_folder, sub_file_name+'.npy')
195195
sub_brir_npy = hf.load_convert_npy_to_float64(npy_fname)
196196
sub_brir_ir = np.zeros((2,n_fft))

ash_toolset/callbacks.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2105,7 +2105,7 @@ def plot_sub_brir(name, plot_dest,plot_type):
21052105
if sub_folder in ('sub', 'lf_brir'): # default sub responses
21062106
npy_fname = pjoin(CN.DATA_DIR_SUB, sub_file_name + '.npy')
21072107
else: # user-provided sub response
2108-
file_folder = pjoin(CN.DATA_DIR_AS_USER, name)
2108+
file_folder = pjoin(CN.DATA_DIR_AS_USER, name.replace(" ", "_"))
21092109
npy_fname = pjoin(file_folder, sub_file_name + '.npy')
21102110

21112111
sub_brir_npy = hf.load_convert_npy_to_float64(npy_fname)

metadata.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"version": "4.2.1","author":"Shanon Pearce"}
1+
{"version": "4.2.2","author":"Shanon Pearce"}

0 commit comments

Comments
 (0)