mg-pso-gui 0.2.23__tar.gz → 0.2.25__tar.gz

{mg_pso_gui-0.2.23 → mg_pso_gui-0.2.25}/PKG-INFO

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

{mg_pso_gui-0.2.23 → mg_pso_gui-0.2.25}/mg_pso_gui.egg-info/PKG-INFO

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

{mg_pso_gui-0.2.23 → mg_pso_gui-0.2.25}/mgpsogui/gui/OptionManager.py

@@ -34,7 +34,7 @@ class OptionManager():
                     "sensitivity_parameters": [],
                     "sensitivity_positiveBestMetrics": [],
                     "sensitivity_negativeBestMetrics": [],
-                    
+
                     "sensitivity_analysis_path": sv(),
                     "sampling_output_mode": sv(),
                     "selected_graph": sv(),
@@ -47,16 +47,16 @@ class OptionManager():
                     "figure_style": sv(),
                     "matrix_values": []}
             
-            self._data["selected_graph"].set("Best Cost Stacked")
-            self._data["graph_theme"].set("Dark")
-            self._data["selected_csv"].set("No files found...")
-            self._data["selected_csv2"].set("No files found...")
-            self._data["selected_x"].set("time")
-            self._data["selected_y1"].set("NONE")
-            self._data["selected_y2"].set("NONE")
-            self._data["figure_style"].set("Scatter")
-            self._data["matrix_values"].append(sv())
-            self._data["matrix_values"][0].set("NONE")
+            self._data[service]["selected_graph"].set("Best Cost Stacked")
+            self._data[service]["graph_theme"].set("Dark")
+            self._data[service]["selected_csv"].set("No files found...")
+            self._data[service]["selected_csv2"].set("No files found...")
+            self._data[service]["selected_x"].set("time")
+            self._data[service]["selected_y1"].set("NONE")
+            self._data[service]["selected_y2"].set("NONE")
+            self._data[service]["figure_style"].set("Scatter")
+            self._data[service]["matrix_values"].append(sv())
+            self._data[service]["matrix_values"][0].set("NONE")
 
             
             if service == "Sampling: Halton" or service == "Sampling: Random":

{mg_pso_gui-0.2.23 → mg_pso_gui-0.2.25}/mgpsogui/gui/SetupTab/StepView.py

@@ -93,8 +93,8 @@ class StepView(CTkScrollableFrame):
 
             if len(files) == 0:
                 files = ["      No CSV files found! Run sampling first!       "]
-            elif self.option_manager["sensitivity_analysis_path"].get() not in files:
-                self.option_manager["sensitivity_analysis_path"].set(files[0])
+            elif self.option_manager.get("sensitivity_analysis_path").get() not in files:
+                self.option_manager.get("sensitivity_analysis_path").set(files[0])
 
             header_padding_x = (5, 5)
             header_padding_y = (10, 10)
@@ -104,7 +104,7 @@ class StepView(CTkScrollableFrame):
             self.logo_label = CTkLabel(self.file_selector_frame, text="Select File:")
             self.logo_label.grid(row=0, column=0, padx=(10, 10), pady=header_padding_y)
             
-            self.file_selector = CTkOptionMenu(self.file_selector_frame, values=files, width=50, variable=self.option_manager["sensitivity_analysis_path"])
+            self.file_selector = CTkOptionMenu(self.file_selector_frame, values=files, width=50, variable=self.option_manager.get("sensitivity_analysis_path"))
             self.file_selector.grid(row=0, column=1, padx=(10, 10), pady=header_padding_y)
 
             row += 1
@@ -119,9 +119,9 @@ class StepView(CTkScrollableFrame):
             self.logo_label2 = CTkLabel(self.file_selector_frame, text="Output:")
             self.logo_label2.grid(row=0, column=1, padx=(20, 10), pady=header_padding_y)
 
-            self.output_method = CTkOptionMenu(self.file_selector_frame, values=["Replace", "Append"], width=50, variable=self.option_manager["sampling_output_mode"])
-            if self.option_manager["sampling_output_mode"].get() == "":
-                self.option_manager["sampling_output_mode"].set("Replace")
+            self.output_method = CTkOptionMenu(self.file_selector_frame, values=["Replace", "Append"], width=50, variable=self.option_manager.get("sampling_output_mode"))
+            if self.option_manager.get("sampling_output_mode").get() == "":
+                self.option_manager.get("sampling_output_mode").set("Replace")
             self.output_method.grid(row=0, column=2, padx=(10, 10), pady=header_padding_y)
 
             row += 1

{mg_pso_gui-0.2.23 → mg_pso_gui-0.2.25}/setup.py

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