mg-pso-gui 0.1.171__py3-none-any.whl → 0.1.173__py3-none-any.whl

{mg_pso_gui-0.1.171.dist-info → mg_pso_gui-0.1.173.dist-info}/METADATA

@@ -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.dist-info → mg_pso_gui-0.1.173.dist-info}/RECORD

@@ -1,7 +1,7 @@
 mgpsogui/__init__.py,sha256=q7AfBjeJABnFtbsZnsObpUwaXKPDVYtz46G6MKXLF74,42
 mgpsogui/mgpsogui.py,sha256=NIZmyNcbwC8EgSwf1ubdMUSJscrIEgoD4jLYziqHQ-k,148
 mgpsogui/start.yaml,sha256=ZjCVLb-MLqAxrGRm9kA7_SDpa-45EuKIELNQ2QqCAiU,4713
-mgpsogui/gui/HomePage.py,sha256=XYpCCzAq3e2hvQV0paN1DyXrVEkL1ZGmzL9upCQYBDI,22559
+mgpsogui/gui/HomePage.py,sha256=HkBEmLTaSyCadVs-JLWK1ch9xAdZGNaFBCjekUw_yno,22623
 mgpsogui/gui/OptionManager.py,sha256=36_MlFd6nLt6xd6HHE2sHtL8oW7VBOZbCvJ8er-wWJ4,12544
 mgpsogui/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/PlatformTab/PlatformTab.py,sha256=q8x_tvVgSoyGINuQbivXRThF3gaSSfg8X_dsLSPv4F0,10492
@@ -18,7 +18,7 @@ mgpsogui/gui/SetupTab/SetupTab.py,sha256=8f_xqmMaD8grmSKFFUHm8zIGEDrSUzU_sNW6CdR
 mgpsogui/gui/SetupTab/StaticParameterView.py,sha256=iEG-UpBBlAJabZo3MG768oLqOROjUPc23tKOSd47IUc,2739
 mgpsogui/gui/SetupTab/StepView.py,sha256=_gdfiYr_GqqbQfSYLvdllIYCHdGsy1339cALfYLDAEQ,5909
 mgpsogui/gui/SetupTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mgpsogui/gui/VisualizeTab/SideBar.py,sha256=_3fEMB3MStWIoprfTfHVi4cZEsnP1H5MpFMWTCztSao,17209
+mgpsogui/gui/VisualizeTab/SideBar.py,sha256=R1JxJfmQVbxJGhDZZ6kCU6ikBMmAZHVzN0KMmL6goyw,17733
 mgpsogui/gui/VisualizeTab/VisualizeTab.py,sha256=PBIlpGWlr2TVkMoXww7iYMRBcCBuGvJ5Nt4_S-EqbhU,3449
 mgpsogui/gui/VisualizeTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/images/IGOW 4 Logo.png,sha256=JixNXz5gOEj898VF-_PHthAlGU-6W-y9ucb4EVNPtjs,433752
@@ -32,7 +32,7 @@ mgpsogui/gui/images/stop.png,sha256=JPuxXQerCGpLikcp7cAj3iLCOjULMYYZ2sZe0lArh68,
 mgpsogui/gui/images/test.png,sha256=MUnVpRK-isxhEHzx4Q6Yh0M6FRZD1qvgCHH2XmiSBbk,3642
 mgpsogui/gui/images/trash.png,sha256=j8cf0kWbJd-4Jp20lUVV1o1NSeQ4v1Ej4gfcIA3DVRQ,2958
 mgpsogui/gui/images/up.png,sha256=AQvFWCUqSQNaQ1E6LKZ9zNfSvW6t4mgy8uswdg9T2Hg,2457
-mgpsogui/util/GraphGenerator.py,sha256=nKviGGhN2FZhW28hzkhv8qGmtCBtlUMZOCifH2vY5SA,17222
+mgpsogui/util/GraphGenerator.py,sha256=T5eWApqbIPZTuhAKqGXMry3fBoNvA0cyVqP88-5q82A,17932
 mgpsogui/util/PSORunner.py,sha256=sWgickFGl97p3ybWz97LR5qeYhnNqryKx5nWAa-NhwA,6306
 mgpsogui/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/util/debug.py,sha256=Swzny9_1S-CCONWGssj9iDoSpbwu5Vr4f95g_9L8bec,19759
@@ -58,8 +58,8 @@ mgpsogui/util/recosu/utils/trace_writer.py,sha256=V9BJlOjCbNYGoXGEk3CF5wjifBxvar
 mgpsogui/util/recosu/utils/utils.py,sha256=QB8vftq3142ekG0ORjz0ZBHU5YknXbR0oTsrxrPAsF0,3951
 mgpsogui/util/recosu/utils/plot/__init__.py,sha256=h1KjM7_tNDv351pcwt8A6Ibb1jhwWyx5Gbu-zj-sI3Q,71
 mgpsogui/util/recosu/utils/plot/cost_steps.py,sha256=1Ce11AJyweWkmvjXPxEygzS-h8yVLmQEDLS53yjPLqQ,3779
-mg_pso_gui-0.1.171.dist-info/METADATA,sha256=Q2-rRVJ0K4hgjefNQTVDRIYVaATLLSgnD8uDFgQYoJI,9456
-mg_pso_gui-0.1.171.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-mg_pso_gui-0.1.171.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.1.171.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.1.171.dist-info/RECORD,,
+mg_pso_gui-0.1.173.dist-info/METADATA,sha256=vzCUDcpMJwPYyjkxyLglG8vXVCKUWkosCtmJT7sfAwA,9456
+mg_pso_gui-0.1.173.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+mg_pso_gui-0.1.173.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.1.173.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.1.173.dist-info/RECORD,,

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))

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 = {}

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="",