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

Renamed form to GUI

Browse source
This commit is contained in:
Joel Collins 2019-11-20 12:08:13 +00:00
parent 21451b14b3
commit d3f2807bb9
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
openflexure_microscope/plugins/loader.py
View file

@ -230,7 +230,7 @@ class BasePlugin:
def __init__(self): def __init__(self):
self._views = {} # Key: Full, Python-safe ID. Val: Original rule, and view class self._views = {} # Key: Full, Python-safe ID. Val: Original rule, and view class
self._rules = {} # Key: Original rule. Val: View class self._rules = {} # Key: Original rule. Val: View class
self._form = None self._gui = None
# If old api_views dictionary is found # If old api_views dictionary is found
if hasattr(self, "api_views"): if hasattr(self, "api_views"):
@ -269,17 +269,17 @@ class BasePlugin:
self._rules[rule] = self._views[view_id] self._rules[rule] = self._views[view_id]
@property @property
def form(self): def gui(self):
if not self._form: if not self._gui:
return None return None
api_form_info = copy.deepcopy(self._form) api_gui = copy.deepcopy(self._gui)
api_form_info["id"] = self._name api_gui["id"] = self._name
if "forms" in api_form_info and isinstance( if "forms" in api_gui and isinstance(
api_form_info["forms"], list api_gui["forms"], list
): ):
for form in api_form_info["forms"]: for form in api_gui["forms"]:
if "route" in form and form["route"] in self._rules.keys(): if "route" in form and form["route"] in self._rules.keys():
form["route"] = self._rules[form["route"]]["rule"] form["route"] = self._rules[form["route"]]["rule"]
else: else:
@ -288,17 +288,17 @@ class BasePlugin:
form["route"] form["route"]
) )
) )
return api_form_info return api_gui
def set_form(self, form_dictionary: dict): def set_gui(self, form_dictionary: dict):
self._form = form_dictionary self._gui = form_dictionary
def _convert_old_api_views(self): def _convert_old_api_views(self):
for view_route, view_class in self.api_views.items(): for view_route, view_class in self.api_views.items():
self.add_view(view_route, view_class) self.add_view(view_route, view_class)
def _convert_old_api_form(self): def _convert_old_api_form(self):
self.set_form(self.api_form) self.set_gui(self.api_form)
@property @property
def _name(self): def _name(self):