mg-pso-gui 0.2.81__tar.gz → 0.2.82__tar.gz

{mg_pso_gui-0.2.81 → mg_pso_gui-0.2.82}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mg-pso-gui
-Version: 0.2.81
+Version: 0.2.82
 Summary: GUI for MG-PSO
 Author: Robert Cordingly
 Author-email: <rcording@uw.ed>

{mg_pso_gui-0.2.81 → mg_pso_gui-0.2.82}/mg_pso_gui.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mg-pso-gui
-Version: 0.2.81
+Version: 0.2.82
 Summary: GUI for MG-PSO
 Author: Robert Cordingly
 Author-email: <rcording@uw.ed>

{mg_pso_gui-0.2.81 → mg_pso_gui-0.2.82}/mg_pso_gui.egg-info/SOURCES.txt

@@ -12,6 +12,7 @@ mgpsogui/gui/HomePage.py
 mgpsogui/gui/OptionManager.py
 mgpsogui/gui/OptionManager_backup.py
 mgpsogui/gui/__init__.py
+mgpsogui/gui/General/NoticeWindow.py
 mgpsogui/gui/General/ParameterView.py
 mgpsogui/gui/General/__init__.py
 mgpsogui/gui/PlatformTab/PlatformTab.py
@@ -28,6 +29,8 @@ mgpsogui/gui/SetupTab/ListEditor.py
 mgpsogui/gui/SetupTab/ListParametersView.py
 mgpsogui/gui/SetupTab/OverrideParameterMetrics.py
 mgpsogui/gui/SetupTab/OverrideParameterWindow.py
+mgpsogui/gui/SetupTab/SamplingListView.py
+mgpsogui/gui/SetupTab/SamplingNameListWindow.py
 mgpsogui/gui/SetupTab/SetupTab.py
 mgpsogui/gui/SetupTab/StepView.py
 mgpsogui/gui/SetupTab/__init__.py

mg_pso_gui-0.2.82/mgpsogui/gui/General/NoticeWindow.py

@@ -0,0 +1,53 @@
+from typing import Union, Tuple, Optional
+
+from customtkinter import CTkLabel
+from customtkinter import CTkButton
+from customtkinter import CTkEntry
+from customtkinter import CTkInputDialog
+from customtkinter import CTkTextbox
+
+class NoticeWindow(CTkInputDialog):
+    """
+    Dialog with extra window, message, entry widget, cancel and ok button.
+    For detailed information check out the documentation.
+    """
+
+    def __init__(self, *args,
+                 message: None,
+                 **kwargs):
+        super().__init__(*args, **kwargs)
+        
+        self.geometry("400x800")
+
+        self.message = message
+
+    def _create_widgets(self):
+
+        self.grid_columnconfigure(0, weight=1)
+        self.rowconfigure(0, weight=1)
+
+        self.textbox = CTkTextbox(self, state="disabled")
+        self.textbox.grid(row=0, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")
+        self.textbox.insert("0.0", self.message)
+            
+        self._ok_button = CTkButton(master=self,
+                                    width=100,
+                                    border_width=0,
+                                    fg_color=self._button_fg_color,
+                                    hover_color=self._button_hover_color,
+                                    text_color=self._button_text_color,
+                                    text='OK',
+                                    command=self._ok_event)
+        self._ok_button.grid(row=1, column=0, columnspan=1, padx=(20, 10), pady=(0, 20), sticky="ew")
+        
+    def _ok_event(self, event=None):
+        self.grab_release()
+        self.destroy()
+
+    def _on_closing(self):
+        self.grab_release()
+        self.destroy()
+
+    def _cancel_event(self):
+        self.grab_release()
+        self.destroy()

{mg_pso_gui-0.2.81 → mg_pso_gui-0.2.82}/mgpsogui/gui/HomePage.py

@@ -30,6 +30,8 @@ import time
 
 from queue import Empty
 
+from General.NoticeWindow import NoticeWindow as NW
+
 from ..util import PSORunner
 from ..util import GraphGenerator
 from ..util.CTkToolTip import CTkToolTip as ctt
@@ -208,6 +210,8 @@ class App(customtkinter.CTk):
 		self.refresh_step_view(0)
 		self.after(1000, self.running_loop)
 
+		NW(title="Welcome!", message="Welcome to COSU Manager!", option_manager=self.option_manager)
+
 	def update_graph(self, value):
 		self.vis_sidebar.refresh()
 		GraphGenerator.generate_graphs(self)

mg_pso_gui-0.2.82/mgpsogui/gui/SetupTab/SamplingListView.py

@@ -0,0 +1,127 @@
+from customtkinter import CTkScrollableFrame
+from customtkinter import CTkFrame
+from customtkinter import CTkLabel
+from customtkinter import CTkButton
+from customtkinter import CTkEntry
+import tkinter as tk
+import subprocess
+import platform
+import os
+
+global option_manager
+
+class SamplingListView(CTkScrollableFrame):
+    def __init__(self, *args,
+                 option_manager: None,
+                 step_index: 0,
+                 bound_index: 0,
+                 **kwargs):
+        super().__init__(*args, **kwargs)
+        
+        self.option_manager = option_manager
+        self.step_index = step_index
+        self.bounds_index = bound_index
+        self.key_values = []
+        self.visual_name = tk.StringVar()
+        self.visual_name.set("name")
+        
+        
+        self.name = self.option_manager.get_steps()[self.step_index]["parameter_objects"][bound_index]["name"].get()
+        self.default = self.option_manager.get_steps()[self.step_index]["parameter_objects"][bound_index]["default_value"].get()
+        try:
+            if self.name != "" and self.default != "":
+                
+                self.visual_name.set(self.name.rsplit('/', 1)[0] + '/')
+                self.names = self.name.split('/')
+                self.rows = self.names[-1].split(';')
+                self.defaults = self.default.replace("[", "").replace("]", "").replace("(", "").replace(")", "").replace(" ", "").split(",")
+                
+                print("rows", self.rows)
+                print("defaults", self.defaults)
+                index = 0
+                
+                for name in self.rows:
+                    obj = {"name": tk.StringVar(), "value": tk.StringVar()}
+                    obj['name'].set(name)
+                    obj['value'].set(self.defaults[index])
+                    self.key_values.append(obj)
+                    index += 1
+        except Exception as e:
+            print(e)
+        
+        if (len(self.key_values) == 0):
+            self.add_key()
+        
+        self.edit_mode = False
+        
+        self.render()
+
+    def clear(self):
+        self.containerFrame.destroy()
+        
+    def toggle_edit_mode(self):
+        self.clear()
+        self.edit_mode = not self.edit_mode
+        self.render()
+        
+    def add_key(self, key="0000", value="0"):
+        obj = {"name": tk.StringVar(), "value": tk.StringVar()}
+        obj['name'].set(key)
+        obj['value'].set(value)
+        self.key_values.append(obj)
+        
+    def remove_key(self, index):
+        self.key_values.pop(index)
+        
+    def render(self):
+        row = 0
+        index = 0
+        
+        self.containerFrame = CTkFrame(self)
+        self.containerFrame.grid(row=0, column=0, padx=(5, 5), pady=(5, 5), sticky="nsew")
+        self.containerFrame.grid_columnconfigure((0, 1), weight=1)
+        
+        
+        CTkLabel(self.containerFrame, text="Row:").grid(row=row, column=0, columnspan=1, padx=5, pady=5, sticky="")
+        CTkLabel(self.containerFrame, text="Default:").grid(row=row, column=1, columnspan=1, padx=5, pady=5, sticky="")
+        row += 1
+        
+        for key_value_pair in self.key_values:
+            CTkEntry(self.containerFrame, textvariable=self.key_values[index]["name"]).grid(row=row, column=0, padx=(5, 5), pady=(5, 5), sticky="ew")
+            
+            if self.edit_mode:
+                return_func = lambda index=index: (self.clear(), self.remove_key(index), self.render())
+                CTkButton(self.containerFrame, text="Remove", command=return_func).grid(row=row, column=1, padx=(5, 5), pady=(5, 5), sticky="ew")
+            else:
+                bb = CTkEntry(self.containerFrame)
+                bb.grid(row=row, column=1, padx=(5, 5), pady=(5, 5), sticky="ew")
+                bb.configure(textvariable=self.key_values[index]["value"])
+            row += 1
+            index += 1
+            
+        if self.edit_mode:
+            CTkButton(self.containerFrame, text="Exit", command=self.toggle_edit_mode).grid(row=row, column=0, padx=(5, 5), pady=(5, 5), sticky="ew")
+        else:
+            CTkButton(self.containerFrame, text="Edit", command=self.toggle_edit_mode).grid(row=row, column=0, padx=(5, 5), pady=(5, 5), sticky="ew")
+            
+        add_key_func = lambda: (self.clear(), self.add_key(), self.render())
+        CTkButton(self.containerFrame, text="Add", command=add_key_func).grid(row=row, column=1, padx=(5, 5), pady=(5, 5), sticky="ew")
+        
+        row += 1
+        
+    def push_to_option_manager(self):
+        visual_name = self.visual_name.get()
+        default_values = "["
+        first = True
+        for key_value_pair in self.key_values:
+            if first:
+                visual_name += key_value_pair['name'].get()
+                first = False
+            else:
+                visual_name += ";" + key_value_pair['name'].get()
+            default_values += key_value_pair['value'].get() + ","
+            
+        default_values = default_values[:-1] + "]"
+            
+        self.option_manager.get_steps()[self.step_index]["parameter_objects"][self.bounds_index]["name"].set(visual_name)
+        self.option_manager.get_steps()[self.step_index]["parameter_objects"][self.bounds_index]["default_value"].set(default_values)

mg_pso_gui-0.2.82/mgpsogui/gui/SetupTab/SamplingNameListWindow.py

@@ -0,0 +1,74 @@
+from typing import Union, Tuple, Optional
+
+from customtkinter import CTkLabel
+from customtkinter import CTkButton
+from customtkinter import CTkEntry
+from customtkinter import CTkInputDialog
+from .SamplingListView import SamplingListView as SamplingListView
+
+class SamplingNameListWindow(CTkInputDialog):
+    """
+    Dialog with extra window, message, entry widget, cancel and ok button.
+    For detailed information check out the documentation.
+    """
+
+    def __init__(self, *args,
+                 step_index: 0,
+                 bound_index: 0,
+                 option_manager: None,
+                 **kwargs):
+        super().__init__(*args, **kwargs)
+        
+        self.geometry("400x800")
+        
+        self.step_index = step_index
+        self.bound_index = bound_index  
+        self.option_manager = option_manager
+        self.bounds = None
+
+    def _create_widgets(self):
+
+        self.grid_columnconfigure((0, 1), weight=1)
+        self.rowconfigure(0, weight=1)
+
+        self.bounds = SamplingListView(
+                self, step_index=self.step_index, bound_index=self.bound_index, option_manager=self.option_manager)
+        self.bounds.grid(row=0, column=0, columnspan=2, padx=(10, 10),
+                    pady=(10, 10), sticky="nsew")
+        self.bounds.grid_columnconfigure(0, weight=1)
+
+        self._ok_button = CTkButton(master=self,
+                                    width=100,
+                                    border_width=0,
+                                    fg_color=self._button_fg_color,
+                                    hover_color=self._button_hover_color,
+                                    text_color=self._button_text_color,
+                                    text='Save',
+                                    command=self._ok_event)
+        self._ok_button.grid(row=2, column=0, columnspan=1, padx=(20, 10), pady=(0, 20), sticky="ew")
+
+        self._cancel_button = CTkButton(master=self,
+                                        width=100,
+                                        border_width=0,
+                                        fg_color=self._button_fg_color,
+                                        hover_color=self._button_hover_color,
+                                        text_color=self._button_text_color,
+                                        text='Cancel',
+                                        command=self._cancel_event)
+        self._cancel_button.grid(row=2, column=1, columnspan=1, padx=(10, 20), pady=(0, 20), sticky="ew")
+        
+    def _ok_event(self, event=None):
+        # Save values in bounds editor...
+        
+        self.bounds.push_to_option_manager()
+        
+        self.grab_release()
+        self.destroy()
+
+    def _on_closing(self):
+        self.grab_release()
+        self.destroy()
+
+    def _cancel_event(self):
+        self.grab_release()
+        self.destroy()

{mg_pso_gui-0.2.81 → mg_pso_gui-0.2.82}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import codecs
 import os
 
-VERSION = '0.2.81'
+VERSION = '0.2.82'
 DESCRIPTION = 'GUI for MG-PSO'
 LONG_DESCRIPTION = open('../README.md').read()