diff --git a/GUI/gui.py b/GUI/gui.py index c7087fb..1eb5332 100644 --- a/GUI/gui.py +++ b/GUI/gui.py @@ -1,7 +1,6 @@ from Tkinter import * import tkMessageBox -from fourmi import search from utils.sourceloader import SourceLoader class ConfigImporter(): @@ -26,13 +25,15 @@ class ConfigImporter(): class GUI(): - def __init__(self): + def __init__(self, search): """Boots the window, configuration.""" self.configurator = ConfigImporter('GUI/gui.cfg') self.finish_with_search = False self.values = {} self.window, self.variables = self.generate_window(self.load_common_attributes(), self.load_output_types()) self.required_variables = ['substance'] + self.search = search + def load_common_attributes(self): """Calls the configuration parser for common attributes.""" @@ -180,7 +181,7 @@ class GUI(): 'search': True} source_loader = SourceLoader() - search(arguments, source_loader) + self.search(arguments, source_loader) def run(self): """Starts the window and the search.""" diff --git a/gui_launcher.py b/gui_launcher.py index 0dc698b..734cb46 100644 --- a/gui_launcher.py +++ b/gui_launcher.py @@ -1,4 +1,5 @@ +from fourmi import search from GUI import gui -gui_window = gui.GUI() +gui_window = gui.GUI(search) gui_window.run()