Commit 2f178ef7 authored by Valentin Valls's avatar Valentin Valls
Browse files

Merge the duplication code

parent d6252c33
...@@ -936,7 +936,7 @@ def __umove(*args, **kwargs): ...@@ -936,7 +936,7 @@ def __umove(*args, **kwargs):
print("") print("")
magic_char = "\033[F" magic_char = "\033[F"
while group.is_moving: def format_group(group):
positions = group.position_with_reals positions = group.position_with_reals
dials = group.dial_with_reals dials = group.dial_with_reals
row = "".join( row = "".join(
...@@ -948,21 +948,16 @@ def __umove(*args, **kwargs): ...@@ -948,21 +948,16 @@ def __umove(*args, **kwargs):
] ]
) )
ret_depth = magic_char * row.count("\n") ret_depth = magic_char * row.count("\n")
print("{}{}".format(ret_depth, row), end="", flush=True) return "{}{}".format(ret_depth, row)
while group.is_moving:
string = format_group(group)
print(string, end="", flush=True)
sleep(0.1) sleep(0.1)
# print last time for final positions # print last time for final positions
positions = group.position_with_reals string = format_group(group)
dials = group.dial_with_reals print(string, end="", flush=True)
row = "".join(
[
"user ",
__row_positions(positions, motors, rfmt, sep=" "),
"\ndial ",
__row_positions(dials, motors, rfmt, sep=" "),
]
)
ret_depth = magic_char * row.count("\n")
print("{}{}".format(ret_depth, row), end="", flush=True)
print("") print("")
return group, motor_pos return group, motor_pos
......
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