|
|
@ -18,7 +18,7 @@ from .parsers import parse_cli_arguments, parse_gui_arguments |
|
|
|
|
|
|
|
|
|
|
|
try: |
|
|
|
try: |
|
|
|
from gooey import Gooey |
|
|
|
from gooey import Gooey |
|
|
|
except ImportError as exc: |
|
|
|
except ImportError: |
|
|
|
|
|
|
|
|
|
|
|
def Gooey(*args, **kargs): |
|
|
|
def Gooey(*args, **kargs): |
|
|
|
msg = "The graphilcal user interface must be installed separately" |
|
|
|
msg = "The graphilcal user interface must be installed separately" |
|
|
@ -98,7 +98,8 @@ def gooey_progress_factory(settings): |
|
|
|
total = settings.measurements |
|
|
|
total = settings.measurements |
|
|
|
print( |
|
|
|
print( |
|
|
|
( |
|
|
|
( |
|
|
|
f"measuring every {settings.interval.value}{settings.interval.unit} " |
|
|
|
f"measuring every " |
|
|
|
|
|
|
|
f"{settings.interval.value}{settings.interval.unit} " |
|
|
|
f"for {settings.duration.value}{settings.duration.unit}" |
|
|
|
f"for {settings.duration.value}{settings.duration.unit}" |
|
|
|
) |
|
|
|
) |
|
|
|
) |
|
|
|
) |
|
|
@ -200,7 +201,7 @@ def cli(): |
|
|
|
|
|
|
|
|
|
|
|
@Gooey( |
|
|
|
@Gooey( |
|
|
|
program_name="SartoriusLogger", |
|
|
|
program_name="SartoriusLogger", |
|
|
|
progress_regex="^measurement (?P<current>\d+) of (?P<total>\d+)", |
|
|
|
progress_regex=r"^measurement (?P<current>\d+) of (?P<total>\d+)", |
|
|
|
progress_expr="current / total * 100", |
|
|
|
progress_expr="current / total * 100", |
|
|
|
) |
|
|
|
) |
|
|
|
def gui(): |
|
|
|
def gui(): |
|
|
|