mg-pso-gui 0.1.205__tar.gz → 0.1.207__tar.gz

{mg_pso_gui-0.1.205 → mg_pso_gui-0.1.207}/PKG-INFO

@@ -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 → mg_pso_gui-0.1.207}/mg_pso_gui.egg-info/PKG-INFO

@@ -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 → mg_pso_gui-0.1.207}/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

{mg_pso_gui-0.1.205 → mg_pso_gui-0.1.207}/setup.py

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