Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 2 additions & 33 deletions src/navigate/controller/configurator.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
hardwares_dict,
hardwares_config_name_dict,
)
from navigate.tools.file_functions import load_yaml_file
from navigate.tools.file_functions import load_yaml_file, write_to_yaml

# Logger Setup
import logging
Expand Down Expand Up @@ -214,7 +214,7 @@ def set_value(temp_dict, key_list, value):
warning_info[hardware_name] = True
set_value(temp_dict, k.split("/"), v)

self.write_to_yaml(config_dict, filename)
write_to_yaml({"microscopes": config_dict}, filename)
# display warning
if warning_info:
messagebox.showwarning(
Expand All @@ -224,37 +224,6 @@ def set_value(temp_dict, key_list, value):
f". Please double check!",
)

def write_to_yaml(self, config: dict, filename: str) -> None:
"""write yaml file

Parameters
----------
config: dict
configuration dictionary
filename: str
yaml file name
"""

def write_func(prefix, config_dict, f):
for k in config_dict:
if type(config_dict[k]) == dict:
f.write(f"{prefix}{k}:\n")
write_func(prefix + " " * 2, config_dict[k], f)
elif type(config_dict[k]) == list:
list_prefix = " "
if k != "None":
f.write(f"{prefix}{k}:\n")
list_prefix = " " * 2
for list_item in config_dict[k]:
f.write(f"{prefix}{list_prefix}-\n")
write_func(prefix + list_prefix * 2, list_item, f)
elif k != "":
f.write(f"{prefix}{k}: {config_dict[k]}\n")

with open(filename, "w") as f:
f.write("microscopes:\n")
write_func(" ", config, f)

def create_config_window(self, id: int) -> None:
"""Creates the configuration window tabs.

Expand Down
7 changes: 5 additions & 2 deletions src/navigate/controller/sub_controllers/plugins.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
from navigate.tools.decorators import AcquisitionMode
from navigate.controller.sub_controllers.gui import GUIController
from navigate.view.popups.plugins_popup import PluginsPopup
from navigate.view.custom_widgets.common import uniform_grid
from navigate.plugins.plugin_manager import PluginFileManager, PluginPackageManager


Expand Down Expand Up @@ -199,12 +200,14 @@ def func(*args, **kwargs):
if controller_name in self.plugins_dict:
self.plugins_dict[controller_name].popup.deiconify()
return
popup = PopUp(self.view, plugin_name, "+320+180", transient=False)
popup = PopUp(self.view, plugin_name, "+320+180", top=False, transient=False)
popup.configure(bg="white")
popup.resizable(True, True)
content_frame = popup.get_frame()
plugin_frame = frame(content_frame)
plugin_frame.grid(row=0, column=0, sticky=tk.NSEW, padx=10, pady=10)

uniform_grid(content_frame)
uniform_grid(plugin_frame)
plugin_controller = controller(plugin_frame, self.parent_controller)
self.parent_controller.register_event_listeners(
getattr(plugin_controller, "custom_events", {})
Expand Down
8 changes: 4 additions & 4 deletions src/navigate/model/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -1513,10 +1513,10 @@ def launch_virtual_microscope(
if microscope_config[k] == "":
idx = int(k[k.rfind("_") + 1 :])
microscope.filter_wheel[k] = SyntheticFilterWheel(
type("DummyConnection", (object,), {}),
self.configuration["configuration"]["microscopes"][
microscope_name
]["filter_wheel"][idx],
microscope_name,
None,
self.configuration,
idx
)
else:
if microscope_config[k] == "":
Expand Down
Loading