mg-pso-gui 0.0.130__tar.gz → 0.0.132__tar.gz

{mg-pso-gui-0.0.130 → mg-pso-gui-0.0.132}/PKG-INFO

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

{mg-pso-gui-0.0.130 → mg-pso-gui-0.0.132}/mg_pso_gui.egg-info/PKG-INFO

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

{mg-pso-gui-0.0.130 → mg-pso-gui-0.0.132}/mgpsogui/gui/HomePage.py

@@ -73,27 +73,27 @@ class App(customtkinter.CTk):
 
         # create sidebar frame with widgets
         self.sidebar_frame = customtkinter.CTkFrame(self, width=140, corner_radius=0)
-        self.sidebar_frame.grid(row=0, column=0, rowspan=4, sticky="nsew")
-        self.sidebar_frame.grid_rowconfigure(4, weight=1)
+        self.sidebar_frame.grid(row=0, column=0, columnspan=4, sticky="nsew")
+        self.sidebar_frame.grid_columnconfigure(4, weight=1)
         self.logo_label = customtkinter.CTkLabel(self.sidebar_frame, text="CSIP PSO", font=customtkinter.CTkFont(size=20, weight="bold"))
         self.logo_label.grid(row=0, column=0, padx=20, pady=(20, 20))
         self.save_button = customtkinter.CTkButton(self.sidebar_frame, text="Save", command=self.save_project)
-        self.save_button.grid(row=1, column=0, padx=20, pady=(10, 10))
+        self.save_button.grid(row=0, column=1, padx=20, pady=(10, 10))
         self.load_button = customtkinter.CTkButton(self.sidebar_frame, text="Load", command=self.load_project)
-        self.load_button.grid(row=2, column=0, padx=20, pady=(10, 10))
+        self.load_button.grid(row=0, column=1, padx=20, pady=(10, 10))
         
         self.new_window = customtkinter.CTkButton(self.sidebar_frame, text="New Window", command=self.new_window)
-        self.new_window.grid(row=6, column=0, padx=20, pady=(10, 10))
+        self.new_window.grid(row=0, column=6, padx=20, pady=(10, 10))
         
         self.scaling_label = customtkinter.CTkLabel(self.sidebar_frame, text="Scale:", anchor="w")
-        self.scaling_label.grid(row=7, column=0, padx=20, pady=(10, 0))
+        self.scaling_label.grid(row=0, column=7, padx=20, pady=(10, 0))
         self.scaling_optionemenu = customtkinter.CTkOptionMenu(self.sidebar_frame, values=["50%", "75%", "100%", "150%", "200%"],
                                                                command=self.change_scaling_event)
-        self.scaling_optionemenu.grid(row=8, column=0, padx=20, pady=(10, 20))
+        self.scaling_optionemenu.grid(row=0, column=8, padx=20, pady=(10, 20))
         self.scaling_optionemenu.set("100%")
         
         self.tabview = customtkinter.CTkTabview(self)
-        self.tabview.grid(row=0, column=1, columnspan=2, rowspan=2, padx=(20, 20), pady=(20, 20), sticky="nsew")
+        self.tabview.grid(row=1, column=0, columnspan=2, rowspan=2, padx=(20, 20), pady=(20, 20), sticky="nsew")
         tab1 = "Platform"
         tab2 = "Setup"
         tab3 = "Run"

{mg-pso-gui-0.0.130 → mg-pso-gui-0.0.132}/mgpsogui/gui/PlatformTab/PlatformTab.py

@@ -9,7 +9,7 @@ import tkinter as tk
 
 def create_tab(self, tab):
     
-    def make_request(self):
+    def make_request():
         service_url = self.service_url.get()
         response = requests.get(service_url)
             
@@ -30,13 +30,13 @@ def create_tab(self, tab):
         
         self.load_parameters.configure(text="Loaded!")
     
-    def load(self):
+    def load():
         # Make HTTP request to service_url and save the result to bounds.json
         self.load_parameters.configure(text="Loading...")
-        self.after(10, self.make_request)
+        self.after(10, make_request)
         self.after(3000, lambda: self.load_parameters.configure(text="Connect"))
         
-    def start_cluster(self):
+    def start_cluster():
         process = subprocess.Popen(["minikube", "start"], stdout=subprocess.PIPE)
         output, error = process.communicate()
         if error:
@@ -55,7 +55,7 @@ def create_tab(self, tab):
             print(f"Output: {output}")
             self.custer_details.insert("0.0", output.decode('unicode-escape') + "\n\n")
             
-    def cluster_status(self):
+    def cluster_status():
         process = subprocess.Popen(["minikube", "status"], stdout=subprocess.PIPE)
         output, error = process.communicate()
         if error:
@@ -66,7 +66,7 @@ def create_tab(self, tab):
             self.custer_details.insert("0.0", output.decode('unicode-escape') + "\n\n")
             
                 
-    def open_terminal_and_run_cluster(self):
+    def open_terminal_and_run_cluster():
         full_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'start.yaml'))
         command = "minikube kubectl -- create -f " + full_path + " ; sleep 60 ; minikube service pf8087-csu-csip-oms -n csip"
         #command = "minikube kubectl -- create -f " + full_path + " ; until [[ $(minikube kubectl -- get pods -l app=pf8087-csu-csip-oms -n csip -o \\'jsonpath={..status.conditions[?(@.type==\\\"Ready\\\")].status}\\') == \\\"True\\\" ]]; do echo \\\"waiting for pod\\\" && sleep 1; done ; minikube service pf8087-csu-csip-oms -n csip"
@@ -80,7 +80,7 @@ def create_tab(self, tab):
         # Change the service URL to /csip-oms/m/ages/0.3.0
         self.service_url.cget("textvariable").set("PASTE_URL/csip-oms/m/ages/0.3.0")
         
-    def deploy_cluster(self):
+    def deploy_cluster():
         full_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'start.yaml'))
         command = "minikube kubectl -- create -f " + full_path + " ; sleep 60 ; minikube service pf8087-csu-csip-oms -n csip"
         
@@ -101,7 +101,7 @@ def create_tab(self, tab):
         # Change the service URL to /csip-oms/m/ages/0.3.0
         self.service_url.cget("textvariable").set("PASTE_URL/csip-oms/m/ages/0.3.0")
         
-    def stop_cluster(self):
+    def stop_cluster():
         process = subprocess.Popen(["minikube", "delete"], stdout=subprocess.PIPE)
         output, error = process.communicate()
         if error:
@@ -126,7 +126,7 @@ def create_tab(self, tab):
     self.service_url = customtkinter.CTkEntry(self.top_bar_container, textvariable=self.option_manager.get_arguments()['url'])
     self.service_url.grid(row=0, column=1, columnspan=1, padx=(20, 20), pady=(20, 20), sticky="nsew")
     
-    self.load_parameters = customtkinter.CTkButton(self.top_bar_container, text="Connect", command=self.load)
+    self.load_parameters = customtkinter.CTkButton(self.top_bar_container, text="Connect", command=load)
     self.load_parameters.grid(row=0, column=2, padx=(20, 20), pady=(20, 20), sticky="nsew")
             
     self.service_editor = customtkinter.CTkScrollableFrame(tab, label_text="Service Editor")

{mg-pso-gui-0.0.130 → mg-pso-gui-0.0.132}/setup.py

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