rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Tidied up debug statements

Browse source
This commit is contained in:
jtc42 2019-11-19 21:35:32 +00:00
parent 3c096e9b53
commit a3716cf817
3 changed files with 2 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

1
openflexure_microscope/api/v1/blueprints/plugins.py
View file

@ -112,7 +112,6 @@ def construct_blueprint(microscope_obj):
# Store the complete form in Microscope().plugin.form
microscope_obj.plugins.forms.append(api_form_info)
print(microscope_obj.plugins.forms)
else:
warnings.warn(

32
openflexure_microscope/api/v2/blueprints/plugins.py
View file

@ -21,8 +21,6 @@ def plugins_representation(plugin_loader_object: PluginLoader):
"""
plugins = []
print(plugin_loader_object.active)
for plugin in plugin_loader_object.active:
logging.info(f"Representing plugin {plugin._name}")
d = {
@ -42,12 +40,8 @@ def plugins_representation(plugin_loader_object: PluginLoader):
d["views"][view_id] = view_d
print("\n")
print(d)
print("\n")
plugins.append(d)
print(plugins)
return plugins
@ -93,30 +87,4 @@ def construct_blueprint(microscope_obj):
),
)
"""
# If plugin includes an API form
if hasattr(plugin_obj, "api_form") and isinstance(
plugin_obj.api_form, dict
):
# TODO: We deep copy this to avoid clashing between API versions. Can be removed when v1 is removed.
api_form_info = copy.deepcopy(plugin_obj.api_form)
api_form_info["id"] = plugin_name
if "forms" in api_form_info and isinstance(
api_form_info["forms"], list
):
for form in api_form_info["forms"]:
if "route" in form and form["route"] in expanded_routes.keys():
form["route"] = expanded_routes[form["route"]]
else:
logging.warn(
"No valid expandable route found for {}".format(
form["route"]
)
)
# Store the complete form in Microscope().plugin.form
plugin_representation["form"] = api_form_info
print(microscope_obj.plugins.forms)
"""
return blueprint