From 869d7db040d174d2f7be02c53380aebed696f46c Mon Sep 17 00:00:00 2001 From: Miguel Date: Thu, 22 May 2025 21:37:13 +0200 Subject: [PATCH] Add configuration saving/loading and enhance manual control features --- MaselliSimulatorApp.py | 239 ++++++++++++++++++++++++++++++++++++++--- 1 file changed, 226 insertions(+), 13 deletions(-) diff --git a/MaselliSimulatorApp.py b/MaselliSimulatorApp.py index 736f35b..4d5f15c 100644 --- a/MaselliSimulatorApp.py +++ b/MaselliSimulatorApp.py @@ -5,6 +5,13 @@ import socket import threading import time import math +import json +import os +from collections import deque +import matplotlib.pyplot as plt +from matplotlib.backends.backend_tkagg import FigureCanvasTkAgg +from matplotlib.figure import Figure +import matplotlib.animation as animation class MaselliSimulatorApp: def __init__(self, root_window): @@ -16,6 +23,16 @@ class MaselliSimulatorApp: self.simulating = False self.simulation_thread = None self.simulation_step = 0 + + # Para el gráfico + self.max_points = 100 + self.time_data = deque(maxlen=self.max_points) + self.brix_data = deque(maxlen=self.max_points) + self.ma_data = deque(maxlen=self.max_points) + self.start_time = time.time() + + # Archivo de configuración + self.config_file = "maselli_simulator_config.json" # --- Configuration Frame --- config_frame = ttk.LabelFrame(self.root, text="Configuración") @@ -88,14 +105,35 @@ class MaselliSimulatorApp: self.period_entry = ttk.Entry(config_frame, textvariable=self.period_var, width=5) self.period_entry.grid(row=4, column=1, padx=5, pady=5, sticky="ew") - # Parámetros específicos para modo Manual - ttk.Label(config_frame, text="Valor Brix Manual:").grid(row=5, column=0, padx=5, pady=5, sticky="w") - self.manual_brix_var = tk.StringVar(value="10.0") - self.manual_brix_entry = ttk.Entry(config_frame, textvariable=self.manual_brix_var, width=10, state=tk.DISABLED) - self.manual_brix_entry.grid(row=5, column=1, padx=5, pady=5, sticky="ew") + # Botones de persistencia + self.save_config_button = ttk.Button(config_frame, text="Guardar Config", command=self.save_config) + self.save_config_button.grid(row=4, column=2, padx=5, pady=5, sticky="ew") + + self.load_config_button = ttk.Button(config_frame, text="Cargar Config", command=self.load_config) + self.load_config_button.grid(row=4, column=3, padx=5, pady=5, sticky="ew") - self.manual_send_button = ttk.Button(config_frame, text="Enviar Manual", command=self.send_manual_value, state=tk.DISABLED) - self.manual_send_button.grid(row=5, column=2, columnspan=2, padx=5, pady=5, sticky="ew") + # Frame para modo Manual con slider + manual_frame = ttk.LabelFrame(config_frame, text="Modo Manual") + manual_frame.grid(row=5, column=0, columnspan=4, padx=5, pady=5, sticky="ew") + + ttk.Label(manual_frame, text="Valor Brix:").grid(row=0, column=0, padx=5, pady=5, sticky="w") + self.manual_brix_var = tk.StringVar(value="10.0") + self.manual_brix_entry = ttk.Entry(manual_frame, textvariable=self.manual_brix_var, width=10, state=tk.DISABLED) + self.manual_brix_entry.grid(row=0, column=1, padx=5, pady=5, sticky="ew") + self.manual_brix_entry.bind('', lambda e: self.update_slider_from_entry()) + self.manual_brix_entry.bind('', lambda e: self.update_slider_from_entry()) + + # Slider para valor manual + self.manual_slider_var = tk.DoubleVar(value=10.0) + self.manual_slider = ttk.Scale(manual_frame, from_=0, to=100, orient=tk.HORIZONTAL, + variable=self.manual_slider_var, command=self.on_slider_change, + state=tk.DISABLED, length=200) + self.manual_slider.grid(row=0, column=2, padx=5, pady=5, sticky="ew") + + self.manual_send_button = ttk.Button(manual_frame, text="Enviar Manual", command=self.send_manual_value, state=tk.DISABLED) + self.manual_send_button.grid(row=0, column=3, padx=5, pady=5, sticky="ew") + + manual_frame.columnconfigure(2, weight=1) # --- Controls Frame --- controls_frame = ttk.LabelFrame(self.root, text="Control Simulación Continua") @@ -107,33 +145,195 @@ class MaselliSimulatorApp: self.stop_button = ttk.Button(controls_frame, text="Detener Simulación", command=self.stop_simulation, state=tk.DISABLED) self.stop_button.pack(side=tk.LEFT, padx=5) + self.clear_graph_button = ttk.Button(controls_frame, text="Limpiar Gráfico", command=self.clear_graph) + self.clear_graph_button.pack(side=tk.LEFT, padx=5) + # --- Display Frame --- display_frame = ttk.LabelFrame(self.root, text="Visualización") display_frame.grid(row=1, column=1, rowspan=2, padx=10, pady=10, sticky="nsew") ttk.Label(display_frame, text="Valor Brix Actual:").grid(row=0, column=0, padx=5, pady=5, sticky="w") self.current_brix_display_var = tk.StringVar(value="---") - self.current_brix_label = ttk.Label(display_frame, textvariable=self.current_brix_display_var, font=("Courier", 10)) + self.current_brix_label = ttk.Label(display_frame, textvariable=self.current_brix_display_var, font=("Courier", 14, "bold")) self.current_brix_label.grid(row=0, column=1, padx=5, pady=5, sticky="w") ttk.Label(display_frame, text="Valor mA Correspondiente:").grid(row=1, column=0, padx=5, pady=5, sticky="w") self.current_ma_display_var = tk.StringVar(value="--.-- mA") - self.current_ma_label = ttk.Label(display_frame, textvariable=self.current_ma_display_var, font=("Courier", 10)) + self.current_ma_label = ttk.Label(display_frame, textvariable=self.current_ma_display_var, font=("Courier", 14, "bold")) self.current_ma_label.grid(row=1, column=1, padx=5, pady=5, sticky="w") + # --- Graph Frame --- + graph_frame = ttk.LabelFrame(self.root, text="Gráfico de Valores") + graph_frame.grid(row=2, column=0, padx=10, pady=5, sticky="nsew") + + # Crear figura de matplotlib + self.fig = Figure(figsize=(6, 3.5), dpi=100) + self.ax1 = self.fig.add_subplot(111) + self.ax2 = self.ax1.twinx() + + # Configurar el gráfico + self.ax1.set_xlabel('Tiempo (s)') + self.ax1.set_ylabel('Brix', color='b') + self.ax2.set_ylabel('mA', color='r') + self.ax1.tick_params(axis='y', labelcolor='b') + self.ax2.tick_params(axis='y', labelcolor='r') + self.ax1.grid(True, alpha=0.3) + + # Líneas del gráfico + self.line_brix, = self.ax1.plot([], [], 'b-', label='Brix', linewidth=2) + self.line_ma, = self.ax2.plot([], [], 'r-', label='mA', linewidth=2) + + # Canvas de matplotlib en tkinter + self.canvas = FigureCanvasTkAgg(self.fig, master=graph_frame) + self.canvas.draw() + self.canvas.get_tk_widget().pack(fill=tk.BOTH, expand=True, padx=5, pady=5) + # --- Log Frame --- log_frame = ttk.LabelFrame(self.root, text="Log de Comunicación") - log_frame.grid(row=2, column=0, padx=10, pady=10, sticky="nsew", columnspan=2) + log_frame.grid(row=3, column=0, padx=10, pady=10, sticky="nsew", columnspan=2) - self.com_log_text = scrolledtext.ScrolledText(log_frame, height=12, width=70, wrap=tk.WORD, state=tk.DISABLED) + self.com_log_text = scrolledtext.ScrolledText(log_frame, height=10, width=70, wrap=tk.WORD, state=tk.DISABLED) self.com_log_text.pack(padx=5,pady=5,fill=tk.BOTH, expand=True) + # Configurar pesos de las filas y columnas + self.root.columnconfigure(0, weight=1) self.root.columnconfigure(1, weight=1) - log_frame.columnconfigure(0, weight=1) - log_frame.rowconfigure(0, weight=1) + self.root.rowconfigure(2, weight=1) + self.root.rowconfigure(3, weight=1) self.root.protocol("WM_DELETE_WINDOW", self.on_closing) + + # Cargar configuración si existe + self.load_config(silent=True) + + # Inicializar estado de la interfaz + self.on_connection_type_change() self.on_function_type_change() + + # Iniciar animación del gráfico + self.ani = animation.FuncAnimation(self.fig, self.update_graph, interval=100, blit=False) + + def save_config(self): + """Guarda la configuración actual en un archivo JSON""" + config = { + 'connection_type': self.connection_type_var.get(), + 'com_port': self.com_port_var.get(), + 'baud_rate': self.baud_rate_var.get(), + 'ip_address': self.ip_address_var.get(), + 'port': self.port_var.get(), + 'adam_address': self.adam_address_var.get(), + 'function_type': self.function_type_var.get(), + 'min_brix_map': self.min_brix_map_var.get(), + 'max_brix_map': self.max_brix_map_var.get(), + 'period': self.period_var.get(), + 'manual_brix': self.manual_brix_var.get() + } + + try: + with open(self.config_file, 'w') as f: + json.dump(config, f, indent=4) + self._log_message("Configuración guardada exitosamente.") + messagebox.showinfo("Éxito", "Configuración guardada correctamente.") + except Exception as e: + self._log_message(f"Error al guardar configuración: {e}") + messagebox.showerror("Error", f"No se pudo guardar la configuración: {e}") + + def load_config(self, silent=False): + """Carga la configuración desde un archivo JSON""" + if not os.path.exists(self.config_file): + if not silent: + messagebox.showinfo("Información", "No se encontró archivo de configuración.") + return + + try: + with open(self.config_file, 'r') as f: + config = json.load(f) + + # Aplicar configuración + self.connection_type_var.set(config.get('connection_type', 'Serial')) + self.com_port_var.set(config.get('com_port', 'COM3')) + self.baud_rate_var.set(config.get('baud_rate', '115200')) + self.ip_address_var.set(config.get('ip_address', '192.168.1.100')) + self.port_var.set(config.get('port', '502')) + self.adam_address_var.set(config.get('adam_address', '01')) + self.function_type_var.set(config.get('function_type', 'Lineal')) + self.min_brix_map_var.set(config.get('min_brix_map', '0')) + self.max_brix_map_var.set(config.get('max_brix_map', '80')) + self.period_var.set(config.get('period', '1.0')) + self.manual_brix_var.set(config.get('manual_brix', '10.0')) + + # Actualizar slider + try: + self.manual_slider_var.set(float(config.get('manual_brix', '10.0'))) + except: + pass + + # Actualizar interfaz + self.on_connection_type_change() + + if not silent: + self._log_message("Configuración cargada exitosamente.") + messagebox.showinfo("Éxito", "Configuración cargada correctamente.") + except Exception as e: + if not silent: + self._log_message(f"Error al cargar configuración: {e}") + messagebox.showerror("Error", f"No se pudo cargar la configuración: {e}") + + def on_slider_change(self, value): + """Actualiza el campo de texto cuando cambia el slider""" + self.manual_brix_var.set(f"{float(value):.1f}") + + def update_slider_from_entry(self): + """Actualiza el slider cuando se modifica el campo de texto""" + try: + value = float(self.manual_brix_var.get()) + # Limitar el valor al rango del slider + value = max(0, min(100, value)) + self.manual_slider_var.set(value) + self.manual_brix_var.set(f"{value:.1f}") + except ValueError: + pass + + def update_graph(self, frame): + """Actualiza el gráfico con los datos actuales""" + if len(self.time_data) > 0: + self.line_brix.set_data(list(self.time_data), list(self.brix_data)) + self.line_ma.set_data(list(self.time_data), list(self.ma_data)) + + # Ajustar límites + if len(self.time_data) > 1: + self.ax1.set_xlim(min(self.time_data), max(self.time_data)) + + if len(self.brix_data) > 0: + brix_min = min(self.brix_data) - 1 + brix_max = max(self.brix_data) + 1 + self.ax1.set_ylim(brix_min, brix_max) + + if len(self.ma_data) > 0: + ma_min = min(self.ma_data) - 0.5 + ma_max = max(self.ma_data) + 0.5 + self.ax2.set_ylim(ma_min, ma_max) + + return self.line_brix, self.line_ma + + def add_data_point(self, brix_value, ma_value): + """Agrega un punto de datos al gráfico""" + current_time = time.time() - self.start_time + self.time_data.append(current_time) + self.brix_data.append(brix_value) + self.ma_data.append(ma_value) + + # Redibujar el canvas + self.canvas.draw_idle() + + def clear_graph(self): + """Limpia los datos del gráfico""" + self.time_data.clear() + self.brix_data.clear() + self.ma_data.clear() + self.start_time = time.time() + self.canvas.draw_idle() + self._log_message("Gráfico limpiado.") def on_connection_type_change(self, event=None): conn_type = self.connection_type_var.get() @@ -152,6 +352,7 @@ class MaselliSimulatorApp: self.manual_brix_entry.config(state=tk.NORMAL) self.manual_send_button.config(state=tk.NORMAL) + self.manual_slider.config(state=tk.NORMAL) self.period_entry.config(state=tk.DISABLED) self.start_button.config(state=tk.DISABLED) @@ -159,6 +360,7 @@ class MaselliSimulatorApp: else: self.manual_brix_entry.config(state=tk.DISABLED) self.manual_send_button.config(state=tk.DISABLED) + self.manual_slider.config(state=tk.DISABLED) self.period_entry.config(state=tk.NORMAL) if not self.simulating: @@ -280,6 +482,9 @@ class MaselliSimulatorApp: self.current_brix_display_var.set(f"{manual_brix:.3f} Brix") self.current_ma_display_var.set(f"{mA_str} mA") + + # Agregar punto al gráfico + self.add_data_point(manual_brix, mA_val) message_part = f"#{adam_address}{mA_str}" checksum = self.calculate_checksum(message_part) @@ -352,20 +557,25 @@ class MaselliSimulatorApp: self.function_type_combo.config(state=state) self.min_brix_map_entry.config(state=state) self.max_brix_map_entry.config(state=state) + self.save_config_button.config(state=state) + self.load_config_button.config(state=state) current_func_type = self.function_type_var.get() if current_func_type != "Manual": self.period_entry.config(state=state) self.manual_brix_entry.config(state=tk.DISABLED) self.manual_send_button.config(state=tk.DISABLED) + self.manual_slider.config(state=tk.DISABLED) else: self.period_entry.config(state=tk.DISABLED) if state == tk.DISABLED: self.manual_brix_entry.config(state=tk.DISABLED) self.manual_send_button.config(state=tk.DISABLED) + self.manual_slider.config(state=tk.DISABLED) else: self.manual_brix_entry.config(state=tk.NORMAL) self.manual_send_button.config(state=tk.NORMAL) + self.manual_slider.config(state=tk.NORMAL) def stop_simulation(self): if not self.simulating: @@ -420,6 +630,9 @@ class MaselliSimulatorApp: self.current_brix_display_var.set(f"{current_brix_val:.3f} Brix") self.current_ma_display_var.set(f"{mA_str} mA") + + # Agregar punto al gráfico + self.root.after(0, lambda b=current_brix_val, m=mA_val: self.add_data_point(b, m)) message_part = f"#{self.adam_address}{mA_str}" checksum = self.calculate_checksum(message_part)