fixing merge

This commit is contained in:
2024-06-29 20:46:42 +08:00
19 changed files with 668 additions and 163 deletions

View File

@ -308,7 +308,7 @@ def p_single(wb, single, vel, trq, rpms, w2t):
data.append(df.iloc[row, 1])
i = 0
for row in ws.iter_rows(min_row=2, min_col=2, max_row=70000, max_col=3):
for row in ws.iter_rows(min_row=2, min_col=2, max_row=150000, max_col=3):
for cell in row:
try:
_ = f"{data[i]:.2f}"
@ -360,7 +360,7 @@ def p_scenario(wb, single, vel, trq, rpms, dur, w2t):
data.append(df.iloc[row, 1])
i = 0
for row in ws.iter_rows(min_row=2, min_col=2, max_row=70000, max_col=3):
for row in ws.iter_rows(min_row=2, min_col=2, max_row=150000, max_col=3):
for cell in row:
try:
_ = f"{data[i]:.2f}"