mg-pso-gui 0.1.204__py3-none-any.whl → 0.1.206__py3-none-any.whl

{mg_pso_gui-0.1.204.dist-info → mg_pso_gui-0.1.206.dist-info}/METADATA

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

{mg_pso_gui-0.1.204.dist-info → mg_pso_gui-0.1.206.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=S4vm9gtwoWjfbNmFSX5e-_l18ti0YIFulrH9a3v953s,22845
+mgpsogui/gui/HomePage.py,sha256=L2Vj2B6BzdXvoi6CkLWgxvtrzRMPJlF2sfbB8VpCVyc,22925
 mgpsogui/gui/OptionManager.py,sha256=dtWY5jzNAaL6t3q7SLHiwoKQOYrAsMGE5UqwYdmPzF4,14829
 mgpsogui/gui/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/PlatformTab/PlatformTab.py,sha256=q8x_tvVgSoyGINuQbivXRThF3gaSSfg8X_dsLSPv4F0,10492
@@ -21,7 +21,7 @@ mgpsogui/gui/SetupTab/StepView.py,sha256=C6DDinU9AgaUM1EOAHetFI4bE89ANJ247F0doks
 mgpsogui/gui/SetupTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/VisualizeTab/MatrixEditor.py,sha256=JPQmfljdddIwHtTKpFqUdk7hRzVdX-IKl4neOk3DsjM,3132
 mgpsogui/gui/VisualizeTab/SideBar.py,sha256=MtZfDScNFN0fQ8DyPm6bZGJSrFRgT14fZeUq-qc61O8,21936
-mgpsogui/gui/VisualizeTab/VisualizeTab.py,sha256=_SiRDUvYJ7VUmMZ_VzylWP2tFygbLzWeUCGW3TU3yZM,3466
+mgpsogui/gui/VisualizeTab/VisualizeTab.py,sha256=gLDuI6rS21rYZ9v-77qffmtTp3NS9DdohrMQgo_JZvY,3953
 mgpsogui/gui/VisualizeTab/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mgpsogui/gui/images/IGOW 4 Logo.png,sha256=JixNXz5gOEj898VF-_PHthAlGU-6W-y9ucb4EVNPtjs,433752
 mgpsogui/gui/images/collapse.png,sha256=yicb16LaY7Nl5q9V8HHlht-Fbg5xU-l4_LJ_Arfmu1c,2989
@@ -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=OyCPwIDkbRzNZiJQII3F76yTKj_EdeMiE8vaih-n5lE,22811
+mgpsogui/util/GraphGenerator.py,sha256=Orr_OPne3GsE3StDtEbg87fK1Mu46k6iOBuHozXTjPg,24358
 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.204.dist-info/METADATA,sha256=tdWt8lx-iN5HvTlUc5fXK6YG-19LCCGsH_ES9YttD4Q,9456
-mg_pso_gui-0.1.204.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
-mg_pso_gui-0.1.204.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
-mg_pso_gui-0.1.204.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
-mg_pso_gui-0.1.204.dist-info/RECORD,,
+mg_pso_gui-0.1.206.dist-info/METADATA,sha256=4Jxvwcq9y9U9ZjGGjdyMu1L0-iawM4i65WkwGPG_9Cg,9456
+mg_pso_gui-0.1.206.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
+mg_pso_gui-0.1.206.dist-info/entry_points.txt,sha256=jg82VOFjR1XDGrchs1wJSCqKYE4Ozv12aBcCSp--koA,117
+mg_pso_gui-0.1.206.dist-info/top_level.txt,sha256=y7JuS9xJN5YdxUsQ3PSVjN8MzQAnR146bP3ZN3PYWdE,9
+mg_pso_gui-0.1.206.dist-info/RECORD,,

mgpsogui/gui/HomePage.py

@@ -66,6 +66,9 @@ class App(customtkinter.CTk):
 		self.graph_selector_value = tk.StringVar()
 		self.graph_selector_value.set("Best Cost Stacked")
 
+		self.graph_theme_value = tk.StringVar()
+		self.graph_theme_value.set("Dark")
+
 		self.selected_csv = tk.StringVar()
 		self.selected_csv.set("No files found...")
 		self.open_file = "None"

mgpsogui/gui/VisualizeTab/VisualizeTab.py

@@ -25,6 +25,9 @@ def create_tab(self, tab):
             subprocess.Popen(["open", file_path])
         else:
             subprocess.Popen(["xdg-open", file_path])
+
+    def export_graph():
+        pass
     
     def _resize_image(event):
         self.graph_label.update_idletasks()
@@ -66,10 +69,17 @@ def create_tab(self, tab):
     
     # Create SideBar
     self.vis_sidebar = SideBar.SideBar(self.graph_sidebar, option_manager=self.option_manager, home_page=self, fg_color="transparent")
-    self.vis_sidebar.grid(row=1, column=0, rowspan=8, padx=(0, 0), pady=(0, 0), sticky="nsew")
+    self.vis_sidebar.grid(row=1, column=0, rowspan=6, padx=(0, 0), pady=(0, 0), sticky="nsew")
     
+
+    self.graph_theme = customtkinter.CTkOptionMenu(self.graph_sidebar, values=["Dark", "Light", "Publication"], variable=self.graph_theme_value, command=self.update_graph)
+    self.graph_theme.grid(row=7, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")
+
+    self.graph_export = customtkinter.CTkButton(self.graph_sidebar, text="Export", command=export_graph)
+    self.graph_export.grid(row=8, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")
+
     # Add a button to call open_graph_in_browser
-    self.graph_button = customtkinter.CTkButton(self.graph_sidebar, text="Open in Browser", command=open_graph_in_browser)
+    self.graph_button = customtkinter.CTkButton(self.graph_sidebar, text="Preview", command=open_graph_in_browser)
     self.graph_button.grid(row=9, column=0, padx=(20, 20), pady=(20, 20), sticky="nsew")
     
     self.graph_image_obj = Image.open(os.path.join("./images", "refresh_hd.png"))

mgpsogui/util/GraphGenerator.py

@@ -8,7 +8,44 @@ from PIL import Image, ImageTk
 import customtkinter
 import traceback
 
+theme_background_color = {
+    "Dark": 'rgba(42, 42, 42, 0)',
+    "Light": 'rgba(255, 255, 255, 0)',
+    "Publication": 'rgba(255, 255, 255, 0)'
+}
+
+theme_background_color_html = {
+    "Dark": '#2a2a2a',
+    "Light": '#ffffff',
+    "Publication": '#ffffff'
+}
+
+theme_plot_color = {
+    "Dark": 'rgb(62, 62, 62)',
+    "Light": 'rgb(242, 242, 242)',
+    "Publication": 'rgb(242, 242, 242)'
+}
+
+theme_grid_color = {
+    "Dark": 'rgb(72, 72, 72)',
+    "Light": 'rgb(242, 242, 242)',
+    "Publication": 'rgb(242, 242, 242)'
+}
+
+theme_line_color = {
+    "Dark": 'rgb(102, 102, 102)',
+    "Light": 'rgb(102, 102, 102)',
+    "Publication": 'rgb(102, 102, 102)'
+}
+
+theme_font_color = {
+    "Dark": 'white',
+    "Light": 'black',
+    "Publication": 'black'
+}
+
 def generate_graphs(HomePage):
+
     try:
         selected_graph = HomePage.graph_selector_value.get()
         info = HomePage.option_manager.get_project_data()
@@ -18,16 +55,16 @@ def generate_graphs(HomePage):
             
         if (selected_graph == "Best Cost Stacked"):
             HomePage.selected_graph_name = "best_cost_stacked"
-            best_cost_stacked(HomePage.running_config['steps'], HomePage.progress_data, HomePage.option_manager)
+            best_cost_stacked(HomePage, HomePage.running_config['steps'], HomePage.progress_data, HomePage.option_manager)
         elif (selected_graph == "Best Cost by Round"):
             HomePage.selected_graph_name = "best_cost_by_round"
-            best_cost_by_round(HomePage.running_config['steps'], HomePage.progress_data, HomePage.option_manager)
+            best_cost_by_round(HomePage, HomePage.running_config['steps'], HomePage.progress_data, HomePage.option_manager)
         elif (selected_graph == "Iteration Table"):
             HomePage.selected_graph_name = "table"
-            table(HomePage.running_config['steps'], HomePage.progress_data, HomePage.option_manager)
+            table(HomePage, HomePage.running_config['steps'], HomePage.progress_data, HomePage.option_manager)
         elif (selected_graph == "Calibrated Parameters"):
             HomePage.selected_graph_name = "calibrated_params_by_round"
-            calibrated_params_by_round(HomePage.running_config['steps'], HomePage.calibration_data, HomePage.option_manager)
+            calibrated_params_by_round(HomePage, HomePage.running_config['steps'], HomePage.calibration_data, HomePage.option_manager)
         elif (selected_graph == "Custom CSV"):
             HomePage.selected_graph_name = "custom_csv"
             custom_csv(HomePage, HomePage.option_manager)
@@ -56,7 +93,9 @@ def generate_graphs(HomePage):
         print("Traceback:")
         traceback.print_exc()
 
-def best_cost_stacked(config, data, option_manager):
+def best_cost_stacked(homepage, config, data, option_manager):
+    theme = homepage.graph_theme_value.get()
+
     fig = go.Figure()
         
     total_steps = len(config)
@@ -69,17 +108,17 @@ def best_cost_stacked(config, data, option_manager):
         title="",
         xaxis_title="Progress (% through Group)",
         yaxis_title="Best Cost",
-        font=dict(color='white'),
-        paper_bgcolor='rgba(42, 42, 42, 0)',
-        plot_bgcolor='rgb(62, 62, 62)',
+        font=dict(color=theme_font_color[theme]),
+        paper_bgcolor=theme_background_color[theme],
+        plot_bgcolor=theme_plot_color[theme],
         xaxis=dict(
-            gridcolor='rgb(72, 72, 72)',
+            gridcolor=theme_grid_color[theme],
             gridwidth=1
         ),
         yaxis=dict(
             range=[0, 0.6],
             autorange=True,
-            gridcolor='rgb(72, 72, 72)',
+            gridcolor=theme_grid_color[theme],
             gridwidth=0.1
         )
     )
@@ -101,7 +140,9 @@ def best_cost_stacked(config, data, option_manager):
     
         return fig
 
-def table(config, dataframe, option_manager):
+def table(homepage, config, dataframe, option_manager):
+    theme = homepage.graph_theme_value.get()
+
     # Create a plotly table with the values in the dataframe
     fig = go.Figure(data=[go.Table(
         header=dict(
@@ -119,17 +160,17 @@ def table(config, dataframe, option_manager):
         title="",
         xaxis_title="Iteration",
         yaxis_title="Best Cost",
-        font=dict(color='white'),
-        paper_bgcolor='rgba(42, 42, 42, 0)',
-        plot_bgcolor='rgb(62, 62, 62)',
+        font=dict(color=theme_font_color[theme]),
+        paper_bgcolor=theme_background_color[theme],
+        plot_bgcolor=theme_plot_color[theme],
         xaxis=dict(
-            gridcolor='rgb(72, 72, 72)',
+            gridcolor=theme_grid_color[theme],
             gridwidth=1
         ),
         yaxis=dict(
             range=[0, 0.6],
             autorange=True,
-            gridcolor='rgb(72, 72, 72)',
+            gridcolor=theme_grid_color[theme],
             gridwidth=0.1
         )
     )
@@ -150,7 +191,9 @@ def table(config, dataframe, option_manager):
     
     return fig
 
-def best_cost_by_round(config, data, option_manager):
+def best_cost_by_round(homepage, config, data, option_manager):
+    theme = homepage.graph_theme_value.get()
+
     fig = go.Figure()
         
     total_steps = len(config)
@@ -181,7 +224,7 @@ def best_cost_by_round(config, data, option_manager):
             y1=1,
             yref='paper',
             line=dict(
-                color='rgb(102, 102, 102)',
+                color=theme_line_color[theme],
                 width=2
             )
         )
@@ -199,17 +242,17 @@ def best_cost_by_round(config, data, option_manager):
         title="",
         xaxis_title="Progress (%)",
         yaxis_title="Best Cost",
-        font=dict(color='white'),
-        paper_bgcolor='rgba(42, 42, 42, 0)',
-        plot_bgcolor='rgb(62, 62, 62)',
+        font=dict(color=theme_font_color[theme]),
+        paper_bgcolor=theme_background_color[theme],
+        plot_bgcolor=theme_plot_color[theme],
         xaxis=dict(
-            gridcolor='rgb(72, 72, 72)',
+            gridcolor=theme_grid_color[theme],
             gridwidth=1
         ),
         yaxis=dict(
             range=[0, 0.6],
             autorange=True,
-            gridcolor='rgb(72, 72, 72)',
+            gridcolor=theme_grid_color[theme],
             gridwidth=0.1
         )
     )
@@ -230,7 +273,9 @@ def best_cost_by_round(config, data, option_manager):
     
     return fig
 
-def calibrated_params_by_round(config, list_of_objs, option_manager):
+def calibrated_params_by_round(homepage, config, list_of_objs, option_manager):
+    theme = homepage.graph_theme_value.get()
+
     fig = go.Figure()
         
     total_steps = len(config)
@@ -264,15 +309,15 @@ def calibrated_params_by_round(config, list_of_objs, option_manager):
         title="",
         xaxis_title="Round",
         yaxis_title="Particle Parameters",
-        font=dict(color='white'),
-        paper_bgcolor='rgba(42, 42, 42, 0)',
-        plot_bgcolor='rgb(62, 62, 62)',
+        font=dict(color=theme_font_color[theme]),
+        paper_bgcolor=theme_background_color[theme],
+        plot_bgcolor=theme_plot_color[theme],
         xaxis=dict(
-            gridcolor='rgb(72, 72, 72)',
+            gridcolor=theme_grid_color[theme],
             gridwidth=1
         ),
         yaxis=dict(
-            gridcolor='rgb(72, 72, 72)',
+            gridcolor=theme_grid_color[theme],
             gridwidth=0.1
         )
     )
@@ -294,6 +339,8 @@ def calibrated_params_by_round(config, list_of_objs, option_manager):
     return fig
 
 def custom_csv(homepage, option_manager):
+    theme = homepage.graph_theme_value.get()
+
     fig = go.Figure()
 
     data = homepage.csv_data["data"]
@@ -329,17 +376,17 @@ def custom_csv(homepage, option_manager):
         title="",
         xaxis_title=x,
         yaxis_title=val,
-        font=dict(color='white'),
-        paper_bgcolor='rgba(42, 42, 42, 0)',
-        plot_bgcolor='rgb(62, 62, 62)',
+        font=dict(color=theme_font_color[theme]),
+        paper_bgcolor=theme_background_color[theme],
+        plot_bgcolor=theme_plot_color[theme],
         xaxis=dict(
-            gridcolor='rgb(72, 72, 72)',
+            gridcolor=theme_grid_color[theme],
             gridwidth=1
         ),
         yaxis=dict(
             title=val + " (" + str(yy_unit) + ")",
             autorange=True,
-            gridcolor='rgb(72, 72, 72)',
+            gridcolor=theme_grid_color[theme],
             gridwidth=0.1
         ),
         yaxis2=dict(
@@ -366,6 +413,8 @@ def custom_csv(homepage, option_manager):
     return fig
 
 def compare_csv(homepage, option_manager):
+    theme = homepage.graph_theme_value.get()
+
     fig = go.Figure()
 
     data = homepage.csv_data["data"]
@@ -410,17 +459,17 @@ def compare_csv(homepage, option_manager):
         title="",
         xaxis_title=x,
         yaxis_title=val,
-        font=dict(color='white'),
-        paper_bgcolor='rgba(42, 42, 42, 0)',
-        plot_bgcolor='rgb(62, 62, 62)',
+        font=dict(color=theme_font_color[theme]),
+        paper_bgcolor=theme_background_color[theme],
+        plot_bgcolor=theme_plot_color[theme],
         xaxis=dict(
-            gridcolor='rgb(72, 72, 72)',
+            gridcolor=theme_grid_color[theme],
             gridwidth=1
         ),
         yaxis=dict(
             title=val + " (" + str(yy_unit) + ")",
             autorange=True,
-            gridcolor='rgb(72, 72, 72)',
+            gridcolor=theme_grid_color[theme],
             gridwidth=0.1
         ),
         yaxis2=dict(
@@ -447,6 +496,8 @@ def compare_csv(homepage, option_manager):
     return fig
 
 def sampling_csv(homepage, option_manager):
+    theme = homepage.graph_theme_value.get()
+
     fig = go.Figure()
 
     style = homepage.figure_style.get()
@@ -493,17 +544,17 @@ def sampling_csv(homepage, option_manager):
         title="",
         xaxis_title=x,
         yaxis_title=val,
-        font=dict(color='white'),
-        paper_bgcolor='rgba(42, 42, 42, 0)',
-        plot_bgcolor='rgb(62, 62, 62)',
+        font=dict(color=theme_font_color[theme]),
+        paper_bgcolor=theme_background_color[theme],
+        plot_bgcolor=theme_plot_color[theme],
         xaxis=dict(
-            gridcolor='rgb(72, 72, 72)',
+            gridcolor=theme_grid_color[theme],
             gridwidth=1
         ),
         yaxis=dict(
             title=val,
             autorange=True,
-            gridcolor='rgb(72, 72, 72)',
+            gridcolor=theme_grid_color[theme],
             gridwidth=0.1
         ),
         yaxis2=dict(
@@ -530,6 +581,8 @@ def sampling_csv(homepage, option_manager):
     return fig
 
 def matrix_editor(homepage, option_manager):
+    theme = homepage.graph_theme_value.get()
+
     style = homepage.figure_style.get()
     data = homepage.csv_data
     x = homepage.csv_x_selector.get()
@@ -562,7 +615,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=(total_figures // figures_per_row), cols=figures_per_row, shared_xaxes=False, shared_yaxes=False)
 
     for parameter in figure_parameters:
         name = parameter['name'].get()
@@ -574,43 +627,42 @@ 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,
-            font=dict(color='white'),
-            paper_bgcolor='rgba(42, 42, 42, 0)',
-            plot_bgcolor='rgb(62, 62, 62)',
+            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],
             xaxis=dict(
-                gridcolor='rgb(72, 72, 72)',
+                gridcolor=theme_grid_color[theme],
                 gridwidth=1
             ),
             yaxis=dict(
-                title=val,
+                title=x,
                 autorange=True,
-                gridcolor='rgb(72, 72, 72)',
+                gridcolor=theme_grid_color[theme],
                 gridwidth=0.1
             )
         )
@@ -650,9 +702,9 @@ def matrix_editor(homepage, option_manager):
     fig = fig_combined
     fig.update_layout(
         title="",
-        font=dict(color='white'),
-        paper_bgcolor='rgba(42, 42, 42, 0)',
-        plot_bgcolor='rgb(62, 62, 62)'
+        font=dict(color=theme_font_color[theme]),
+        paper_bgcolor=theme_background_color[theme],
+        plot_bgcolor=theme_plot_color[theme]
     )
 
     if not os.path.exists(folder):