mg-pso-gui 0.1.171__tar.gz → 0.1.173__tar.gz

{mg-pso-gui-0.1.171 → mg-pso-gui-0.1.173}/PKG-INFO

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

{mg-pso-gui-0.1.171 → mg-pso-gui-0.1.173}/mg_pso_gui.egg-info/PKG-INFO

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

{mg-pso-gui-0.1.171 → mg-pso-gui-0.1.173}/mgpsogui/gui/HomePage.py

@@ -85,6 +85,9 @@ class App(customtkinter.CTk):
 		self.selected_y2 = tk.StringVar()
 		self.selected_y2.set("NONE")
 
+		self.figure_style = tk.StringVar()
+		self.figure_style.set("Scatter")
+
 		self.running_config = None
 		self.selected_graph_name = None
 
@@ -139,7 +142,7 @@ class App(customtkinter.CTk):
 		self.scaling_label.grid(row=0, column=7, padx=header_padding_x, pady=header_padding_y)
 		self.scaling_optionemenu = customtkinter.CTkOptionMenu(self.sidebar_frame, values=["50%", "75%", "100%", "125%", "150%", "175%", "200%"], width=60,
 																command=self.change_scaling_event)
-		self.scaling_optionemenu.grid(row=0, column=8, padx=header_padding_x, pady=header_padding_y)
+		self.scaling_optionemenu.grid(row=0, column=8, padx=(5, 20), pady=header_padding_y)
 		self.scaling_optionemenu.set("100%")
 		
 		expand_image = customtkinter.CTkImage(Image.open(os.path.join("./images", "expand.png")), size=(20, 20))

{mg-pso-gui-0.1.171 → mg-pso-gui-0.1.173}/mgpsogui/gui/VisualizeTab/SideBar.py

@@ -264,6 +264,12 @@ class SideBar(CTkScrollableFrame):
                 if (self.home_page.csv_y2_selector.get() not in columns):
                     self.home_page.csv_y2_selector.set(columns[3])
 
+                style_label = CTkLabel(self.containerFrame, text="Figure Style:")
+                style_label.grid(row=8, column=0, padx=(20, 20), pady=(20, 5), sticky="w")
+                
+                self.home_page.figure_style_selector = CTkOptionMenu(self.containerFrame, values=["Scatter", "Bars", "Lines", "Area", "Box"], variable=self.home_page.figure_style, command=self.home_page.update_graph)
+                self.home_page.figure_style_selector.grid(row=9, column=0, padx=(20, 20), pady=(5, 5), sticky="ew")
+
     def load_special_csv(self, file_path):
         file_metadata = {}
         data_metadata = {}

{mg-pso-gui-0.1.171 → mg-pso-gui-0.1.173}/mgpsogui/util/GraphGenerator.py

@@ -444,6 +444,8 @@ def compare_csv(homepage, option_manager):
 def sampling_csv(homepage, option_manager):
     fig = go.Figure()
 
+    style = homepage.figure_style.get()
+
     data = homepage.csv_data
 
     x = homepage.csv_x_selector.get()
@@ -466,8 +468,21 @@ def sampling_csv(homepage, option_manager):
     
     yy2_unit = ""
 
-    fig.add_trace(go.Scatter(x=xx, y=yy, name=val, mode='markers'))
-    fig.add_trace(go.Scatter(x=xx, y=yy2, name=val2, yaxis='y2', mode='markers'))
+    if (style == "Scatter"):
+        fig.add_trace(go.Scatter(x=xx, y=yy, name=val, mode='markers'))
+        fig.add_trace(go.Scatter(x=xx, y=yy2, name=val2, yaxis='y2', mode='markers'))
+    elif (style == "Bars"):
+        fig.add_trace(go.Bar(x=xx, y=yy, name=val))
+        fig.add_trace(go.Bar(x=xx, y=yy2, name=val2, yaxis='y2'))
+    elif (style == "Lines"):
+        fig.add_trace(go.Scatter(x=xx, y=yy, name=val))
+        fig.add_trace(go.Scatter(x=xx, y=yy2, name=val2, yaxis='y2'))
+    elif (style == "Area"):
+        fig.add_trace(go.Scatter(x=xx, y=yy, name=val, fill='tozeroy'))
+        fig.add_trace(go.Scatter(x=xx, y=yy2, name=val2, yaxis='y2', fill='tozeroy'))
+    elif (style == "Box"):
+        fig.add_trace(go.Box(x=xx, y=yy, name=val))
+        fig.add_trace(go.Box(x=xx, y=yy2, name=val2, yaxis='y2'))
 
     fig.update_layout(
         title="",

{mg-pso-gui-0.1.171 → mg-pso-gui-0.1.173}/setup.py

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