From bf8da553793e0a104a5e5972511075edc21508ec Mon Sep 17 00:00:00 2001 From: vicky Date: Fri, 24 Feb 2023 14:01:58 +0100 Subject: [PATCH] Fixed log to work as intended. Message order is reversed for now. --- python/src/ffcraft_solver/__main__.py | 31 ++++++++++++--------- python/src/ffcraft_solver/modules/loader.py | 19 ++++--------- python/src/ffcraft_solver/modules/log.py | 12 +++++--- python/src/ffcraft_solver/modules/solver.py | 8 ++---- 4 files changed, 35 insertions(+), 35 deletions(-) diff --git a/python/src/ffcraft_solver/__main__.py b/python/src/ffcraft_solver/__main__.py index 252ebd2..effa028 100644 --- a/python/src/ffcraft_solver/__main__.py +++ b/python/src/ffcraft_solver/__main__.py @@ -1,5 +1,6 @@ +import time + import dearpygui.dearpygui as dpg -import xiv_craft_solver as xcs from ffcraft_solver.modules import loader, log, solver import rich @@ -170,7 +171,8 @@ class Recipe: class Solution: - def __init__(self, title): + def __init__(self, title, logger): + self.loggers = logger self.result = None self.title = title @@ -178,33 +180,35 @@ class Solution: if self.result: dpg.set_value(results, self.result) else: - loggers.add_log('No solution to display.') + self.loggers.add_log('No solution to display.') def print_macro_1(self): if self.result and self.result.macro1: dpg.set_value(results, self.result.macro1) else: - loggers.add_log('No macro to display.') + self.loggers.add_log('No macro to display.') def print_macro_2(self): if self.result and self.result.macro2: dpg.set_value(results, self.result.macro2) else: - loggers.add_log('No macro to display.') + self.loggers.add_log('No macro to display.') def print_macro_3(self): if self.result and self.result.macro3: dpg.set_value(results, self.result.macro3) else: - loggers.add_log('No macro to display.') + self.loggers.add_log('No macro to display.') def request_solve() -> True: + loggers.add_log('Solver initialised. Please stand by.') all_results = solver.Solver(user, recipe) best_quality.result = all_results.best_quality least_steps.result = all_results.least_steps safe_50.result = all_results.safe_50 dpg.set_value(results, best_quality.result) + loggers.add_log('Solved!') return True @@ -220,20 +224,20 @@ if __name__ == '__main__': with dpg.window(label="Settings", width=500, height=700, no_resize=True, no_title_bar=True, no_move=True): # Initialization of all our classes + loggers = log.Loggers() + user = User() recipe = Recipe() - best_quality = Solution("Best Quality") - least_steps = Solution("Least Steps") - safe_50 = Solution("Safe Margin") + best_quality = Solution("Best Quality", loggers) + least_steps = Solution("Least Steps", loggers) + safe_50 = Solution("Safe Margin", loggers) - full_config = loader.Loader() + full_config = loader.Loader(loggers) characters_names = full_config.get_users_names() foods_names = full_config.get_foods_names() pots_names = full_config.get_pots_names() recipe_names = full_config.get_recipes_names() - loggers = log.Loggers() - # Start of GUI drawing # CHARACTER dpg.add_text("Character") @@ -286,6 +290,7 @@ if __name__ == '__main__': dpg.add_text() dpg.add_collapsing_header(label="Results", leaf=True) # TODO: Add feedback when pressed + with dpg.group(horizontal=True): results = dpg.add_input_text(multiline=True, height=220, readonly=True) with dpg.child_window(autosize_x=True, height=220): @@ -301,7 +306,7 @@ if __name__ == '__main__': # LOG log_window = dpg.add_input_text(multiline=True, default_value=loggers.log, height=50, width=500, - tab_input=True, pos=[0, 642], tracked=True, readonly=True) + tab_input=True, pos=[0, 642], tracked=False, readonly=True, tag="log_window") dpg.setup_dearpygui() dpg.show_viewport() diff --git a/python/src/ffcraft_solver/modules/loader.py b/python/src/ffcraft_solver/modules/loader.py index 4af8c12..061a98b 100644 --- a/python/src/ffcraft_solver/modules/loader.py +++ b/python/src/ffcraft_solver/modules/loader.py @@ -1,12 +1,8 @@ -import rich import yaml import os from ffcraft_solver.modules import log -loggers = log.Loggers() - - class DefaultConfig: yaml_user = 'configs/users.yaml' yaml_consumable = 'configs/consumables.yaml' @@ -16,7 +12,8 @@ class DefaultConfig: class Loader: # TODO: create folder/file if missing when clicking "save" # TODO: log any missing file(s) or the whole folder - def __init__(self): + def __init__(self, loggers: log.Loggers): + self.loggers = loggers self.user_list = {' ': [0, 0, 0]} self.foods_list = {' ': [[0, 0], [0, 0], [0, 0]]} self.pots_list = {' ': [[0, 0], [0, 0], [0, 0]]} @@ -27,7 +24,7 @@ class Loader: with open(self.relative_import(self.config.yaml_user), 'r') as file: self.user_list.update(yaml.safe_load(file)) except FileNotFoundError as e: - loggers.add_log(e) + self.loggers.add_log(e) try: with open(self.relative_import(self.config.yaml_consumable), 'r') as file: @@ -35,20 +32,20 @@ class Loader: self.foods_list.update(loaded_file['Foods']) self.pots_list.update(loaded_file['Pots']) except FileNotFoundError as e: - loggers.add_log(e) + self.loggers.add_log(e) try: with open(self.relative_import(self.config.yaml_recipes), 'r') as file: self.recipes_list.update(yaml.safe_load(file)) except (FileNotFoundError, IsADirectoryError) as e: - loggers.add_log(e) + self.loggers.add_log(e) @staticmethod def relative_import(path): return os.path.normpath(os.path.join(__file__, "../..", path)) def get_users_dict(self) -> dict: - loggers.add_log('Loaded user dictionary from users.yaml') + self.loggers.add_log('Loaded user dictionary from users.yaml') return self.user_list def get_users_names(self) -> list: @@ -83,7 +80,3 @@ class Loader: for r in self.recipes_list: recipes_names.append(r) return recipes_names - - -if __name__ == "__main__": - loader = Loader() diff --git a/python/src/ffcraft_solver/modules/log.py b/python/src/ffcraft_solver/modules/log.py index 87040a4..d28c427 100644 --- a/python/src/ffcraft_solver/modules/log.py +++ b/python/src/ffcraft_solver/modules/log.py @@ -1,15 +1,19 @@ from datetime import datetime +import dearpygui.dearpygui as dpg class Loggers: - def __init__(self): + def __init__(self, log=None): timestamp = self.get_timestamp() - self.log = f"{timestamp} Log initialised." + if not log: + self.log = f"{timestamp} Log initialised." + else: + self.log = log def add_log(self, other: str) -> str: timestamp = self.get_timestamp() - self.log += '\n' + timestamp + ' ' + other - print(self.log) + self.log = timestamp + ' ' + other + '\n' + self.log + dpg.set_value('log_window', self.log) return self.log # noinspection PyMethodMayBeStatic diff --git a/python/src/ffcraft_solver/modules/solver.py b/python/src/ffcraft_solver/modules/solver.py index 3a2f39a..015d501 100644 --- a/python/src/ffcraft_solver/modules/solver.py +++ b/python/src/ffcraft_solver/modules/solver.py @@ -1,10 +1,8 @@ import rich -import xiv_craft_solver +import xiv_craft_solver as xcs from ffcraft_solver.__main__ import User, Recipe from ffcraft_solver.modules import log, translator -loggers = log.Loggers() - class Result: def __init__(self, result, title: str): @@ -124,8 +122,8 @@ class Solver: self.compute_all() def solve(self) -> str: - self.solutions = xiv_craft_solver.solve_from_python(self) - return xiv_craft_solver.solve_from_python(self) + self.solutions = xcs.solve_from_python(self) + return xcs.solve_from_python(self) def compute_all(self) -> True: if self.solutions: