mg-pso-gui 0.1.205__py3-none-any.whl → 0.1.207__py3-none-any.whl

{mg_pso_gui-0.1.205.dist-info → mg_pso_gui-0.1.207.dist-info}/METADATA

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

{mg_pso_gui-0.1.205.dist-info → mg_pso_gui-0.1.207.dist-info}/RECORD

@@ -34,7 +34,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=lIVhG2G8T8vEws8RJD6kU9c2qaIaZpEBwjrwxEjp7KM,24375
+mgpsogui/util/GraphGenerator.py,sha256=yv66Hz9BIZsg_tRQDHcUAFBurOuc4tWpjwVWDsMiHMg,24380
 mgpsogui/util/PSORunner.py,sha256=ELpRgEpUiLV4hW-A-y4yzfkFN1BXgH7LZ0qlwWBRz3s,11012
 mgpsogui/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/util/debug.py,sha256=Swzny9_1S-CCONWGssj9iDoSpbwu5Vr4f95g_9L8bec,19759
@@ -60,8 +60,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.205.dist-info/METADATA,sha256=tqGJn1XWRwA32FSi-8GhC-mG4cjWl-EXc799-LgE2E4,9456
-mg_pso_gui-0.1.205.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
-mg_pso_gui-0.1.205.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.1.205.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.1.205.dist-info/RECORD,,
+mg_pso_gui-0.1.207.dist-info/METADATA,sha256=PemyAcGXj9BwATFdgVpjAF5tqWSb0DBM_PEAyQrgcuY,9456
+mg_pso_gui-0.1.207.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
+mg_pso_gui-0.1.207.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.1.207.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.1.207.dist-info/RECORD,,

mgpsogui/util/GraphGenerator.py

@@ -7,6 +7,7 @@ import os
 from PIL import Image, ImageTk
 import customtkinter
 import traceback
+import math
 
 theme_background_color = {
     "Dark": 'rgba(42, 42, 42, 0)',
@@ -615,7 +616,7 @@ def matrix_editor(homepage, option_manager):
     elif (total_figures == 9 or total_figures == 10):
         figures_per_row = 5
 
-    fig_combined = make_subplots(rows=(total_figures // figures_per_row) + 1, cols=figures_per_row, shared_xaxes=False, shared_yaxes=False)
+    fig_combined = make_subplots(rows=(math.ceil(total_figures / figures_per_row)), cols=figures_per_row, shared_xaxes=False, shared_yaxes=False)
 
     for parameter in figure_parameters:
         name = parameter['name'].get()
@@ -627,32 +628,31 @@ def matrix_editor(homepage, option_manager):
         val = parameter['value'].get()
         
         xx = None
-        if x == "time":
-            xx = pd.to_datetime(data["time"], format='%Y-%m-%d', errors='coerce')
-        elif x == "date":
-            xx = pd.to_datetime(data["date"], format='%d-%m-%Y', errors='coerce')
-        else:
-            xx = pd.to_numeric(data[x], errors="coerce")
-            
+        #if x == "time":
+        #    xx = pd.to_datetime(data["time"], format='%Y-%m-%d', errors='coerce')
+        #elif x == "date":
+        #    xx = pd.to_datetime(data["date"], format='%d-%m-%Y', errors='coerce')
+        #else:
+        xx = pd.to_numeric(data[x], errors="coerce") 
         yy = pd.to_numeric(data[val], errors="coerce")
         
         yy_unit = ""
 
         if (style == "Scatter"):
-            fig.add_trace(go.Scatter(x=xx, y=yy, name=val, mode='markers'))
+            fig.add_trace(go.Scatter(x=yy, y=xx, name=val, mode='markers'))
         elif (style == "Bars"):
-            fig.add_trace(go.Bar(x=xx, y=yy, name=val))
+            fig.add_trace(go.Bar(x=yy, y=xx, name=val))
         elif (style == "Lines"):
-            fig.add_trace(go.Scatter(x=xx, y=yy, name=val))
+            fig.add_trace(go.Scatter(x=yy, y=xx, name=val))
         elif (style == "Area"):
-            fig.add_trace(go.Scatter(x=xx, y=yy, name=val, fill='tozeroy'))
+            fig.add_trace(go.Scatter(x=yy, y=xx, name=val, fill='tozeroy'))
         elif (style == "Box"):
-            fig.add_trace(go.Box(x=xx, y=yy, name=val))
+            fig.add_trace(go.Box(x=yy, y=xx, name=val))
 
         fig.update_layout(
             title="",
-            xaxis_title=x,
-            yaxis_title=val,
+            xaxis_title=val,
+            yaxis_title=x,
             font=dict(color=theme_font_color[theme]),
             paper_bgcolor=theme_background_color[theme],
             plot_bgcolor=theme_plot_color[theme],
@@ -661,7 +661,7 @@ def matrix_editor(homepage, option_manager):
                 gridwidth=1
             ),
             yaxis=dict(
-                title=val,
+                title=x,
                 autorange=True,
                 gridcolor=theme_grid_color[theme],
                 gridwidth=0.1