Bernina/eco
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make scan return wait

Browse Source
This commit is contained in:
mankowsky_r
2021-02-13 12:52:34 +01:00
parent 3a956e979b
commit fd7e02b6c1
2 changed files with 63 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
eco/acquisition/scan.py
+8 -3
View File
@@ -250,11 +250,16 @@ class Scan:
finally:
print(tb)
if self.return_at_end == "question":
if input("Move back to initial values? (y/n)")[0] == "y":
self.changeToInitialValues()
if input("Change back to initial values? (y/n)")[0] == "y":
chs = self.changeToInitialValues()
print("Changing back to value(s) before scan.")
for ch in chs:
ch.wait()
elif self.return_at_end:
self.changeToInitialValues()
print("Moving back to value(s) before scan.")
print("Changing back to value(s) before scan.")
for ch in chs:
ch.wait()
else:
print("Staying at final scan value(s)!")
eco/utilities/config.py
+55 -18
View File
@@ -13,7 +13,7 @@ import socket
from importlib import import_module
from lazy_object_proxy import Proxy as Proxy_orig
from tabulate import tabulate
from concurrent.futures import ThreadPoolExecutor
import traceback
@@ -274,28 +274,65 @@ class Namespace(object):
def all_names(self):
return self.initialized_names | self.lazy_names
def init_all(self, verbose=True, raise_errors=False):
for name in self.all_names:
def init_name(self, name, verbose=True, raise_errors=False):
# for name in self.all_names:
if verbose:
print(("Configuring %s " % (name)).ljust(25), end="")
sys.stdout.flush()
# if verbose:
# print(("(%s)" % (name)).ljust(25), end="")
# sys.stdout.flush()
try:
dir(self.get_obj(name))
if verbose:
print(("Configuring %s " % (name)).ljust(25), end="")
print((_color.GREEN + "OK" + _color.RESET).rjust(5))
sys.stdout.flush()
except Exception as expt:
# tb = traceback.format_exc()
if verbose:
print((_color.RED + "FAILED" + _color.RESET).rjust(5))
# print(sys.exc_info())
if raise_errors:
raise expt
def init_all(self, verbose=True, raise_errors=False, max_workers=20):
with ThreadPoolExecutor(max_workers=max_workers) as exc:
for name in self.all_names:
exc.submit(
self.init_name, name, verbose=verbose, raise_errors=raise_errors
)
# if verbose:
# print(("(%s)" % (name)).ljust(25), end="")
# print(("Configuring %s " % (name)).ljust(25), end="")
# sys.stdout.flush()
# # if verbose:
# # print(("(%s)" % (name)).ljust(25), end="")
# # sys.stdout.flush()
# try:
# dir(self.get_obj(name))
# if verbose:
# print((_color.GREEN + "OK" + _color.RESET).rjust(5))
# sys.stdout.flush()
# except Exception as expt:
# # tb = traceback.format_exc()
# if verbose:
# print((_color.RED + "FAILED" + _color.RESET).rjust(5))
# # print(sys.exc_info())
# if raise_errors:
# raise expt
def get_initialized_aliases(self):
aliases = []
has_no_aliases = []
for tn, tv in self.initialized_items.items():
try:
dir(self.get_obj(name))
if verbose:
print((_color.GREEN + "OK" + _color.RESET).rjust(5))
sys.stdout.flush()
except Exception as expt:
# tb = traceback.format_exc()
if verbose:
print((_color.RED + "FAILED" + _color.RESET).rjust(5))
# print(sys.exc_info())
if raise_errors:
raise expt
aliases.append(tv.alias.get_all())
except:
has_no_aliases.append(tn)
return aliases, has_no_aliases
def append_obj(
self, obj_factory, *args, lazy=False, name=None, module_name=None, **kwargs