Skip to content

Commit dec962d

Browse files
dynamic reading report
improves loading for #440
1 parent 1f24481 commit dec962d

1 file changed

Lines changed: 10 additions & 8 deletions

File tree

src/openlifu/xdc/util.py

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -262,16 +262,18 @@ def load_transducer_from_file(transducer_filepath : PathLike, convert_array:bool
262262
return transducer
263263

264264
def read_test_report(filename: PathLike) -> pd.DataFrame:
265-
sections = [{"name": "info", "start_row": 3, "nrows": 3},
266-
{"name": "txm", "start_row": 9, "nrows": 5},
267-
{"name": "console", "start_row": 17, "nrows": 3},
268-
{"name": "scans", "start_row": 23, "nrows": 7},
269-
{"name": "freq", "start_row": 33, "nrows": 9},
270-
{"name": "voltage", "start_row": 45, "nrows": 7}]
271-
265+
sections = [{"name": "info", "start_row": "A"},
266+
{"name": "txm", "start_row": "B"},
267+
{"name": "console", "start_row": "C"},
268+
{"name": "scans", "start_row": "D"},
269+
{"name": "freq", "start_row": "E"},
270+
{"name": "voltage", "start_row": "F"}]
271+
raw = pd.read_excel(filename, sheet_name="Report", header=None, usecols="A").rename({0: "Index"}, axis=1)
272272
all_data = []
273273
for section in sections:
274-
report_df = pd.read_excel(filename, sheet_name="Report", skiprows=section["start_row"], nrows=section["nrows"], index_col=0, usecols="A:C")
274+
skiprows = raw.loc[raw["Index"] == section["start_row"]].index[0]+1
275+
nrows = raw['Index'].str.startswith(f'{section["start_row"]}.').sum()
276+
report_df = pd.read_excel(filename, sheet_name="Report", skiprows=skiprows, nrows=nrows, index_col=0, usecols="A:C")
275277
report_df["Section"] = section["name"]
276278
all_data.append(report_df)
277279

0 commit comments

Comments
 (0)