Heatmap: Abandoning estimated constants and calculating the external dimensions of the graph using JS and the internal dimensions of the graph

analyze_winscore.py

@@ -9,6 +9,7 @@ import numpy as np
 from bokeh.plotting import figure
 from bokeh.models import LabelSet, LogScale, ColumnDataSource, tickers
 from bokeh.models import LinearColorMapper, HoverTool
+from bokeh.models import CustomJS
 from bokeh.palettes import Turbo256  # A color palette with enough colors
 
 # Function to fit a polynomial curve and return the x and y values of the fitted curve
@@ -222,13 +223,15 @@ def create_heatmap(data_matrix, original_scores,
     FONTSIZE = 9
     
     n_rows, n_cols = data_matrix.shape
-    y_axis_size = 253
-    x_axis_size = 278
     cell_size = 22
+    plot_inner_width = None
+    plot_inner_height = None
     if plot_width == None:
-        plot_width  = n_rows * cell_size + (y_axis_size if y_axis_visible else 0)
+        plot_inner_width  = n_rows * cell_size
+        plot_width = plot_inner_width
     if plot_height == None:
-        plot_height = n_cols * cell_size + (x_axis_size if x_axis_visible else 0)
+        plot_inner_height = n_cols * cell_size
+        plot_height = plot_inner_height
 
     if selected_rows is not None:
         # Select only the specified rows (models)
@@ -327,6 +330,44 @@ def create_heatmap(data_matrix, original_scores,
     # Hide the axis labels
     p.xaxis.visible = x_axis_visible
     p.yaxis.visible = y_axis_visible
+    
+    # Fix inner size
+    if plot_inner_width != None:
+        p.js_on_change('inner_width', CustomJS(args=dict(p=p, target=plot_inner_width), code="""
+            // current inner width of the plot area
+            const iw = p.inner_width;
+            // calculate the margin between full width and inner plot area
+            const margin = p.width - iw;
+            // adjust total width so that inner width matches the desired target
+            p.width = target + margin;
+            
+            // remove only this callback from the inner_width callbacks array
+            const cbs = p.js_property_callbacks.inner_width;
+            for (let i = 0; i < cbs.length; i++) {
+                if (cbs[i] === this) {
+                    cbs.splice(i, 1);
+                    break;
+                }
+            }
+        """))
+    if plot_inner_height != None:
+        p.js_on_change('inner_height', CustomJS(args=dict(p=p, target=plot_inner_height), code="""
+            // current inner height of the plot area
+            const ih = p.inner_height;
+            // calculate the margin between full height and inner plot area
+            const margin = p.height - ih;
+            // adjust total height so that inner height matches the desired target
+            p.height = target + margin;
+            
+            // remove only this callback from the inner_height callbacks array
+            const cbs = p.js_property_callbacks.inner_height;
+            for (let i = 0; i < cbs.length; i++) {
+                if (cbs[i] === this) {
+                    cbs.splice(i, 1);
+                    break;
+                }
+            }
+        """))
 
     return p