plotly fixes

Author: max-models

src/maxplotlib/backends/matplotlib/utils.py

@@ -63,21 +63,19 @@ def set_size(width, fraction=1, ratio="golden"):
         width_pt = width
 
     fig_width_pt = width_pt * fraction
-    inches_per_pt = 1 / 72.27
+    #inches_per_pt = 1 / 72.27
 
     # Calculate the figure height based on the desired ratio
     if ratio == "golden":
         golden_ratio = (5**0.5 - 1) / 2
-        fig_height_in = fig_width_pt * inches_per_pt * golden_ratio
+        fig_height_pt = fig_width_pt * golden_ratio
     elif ratio == "square":
-        fig_height_in = fig_width_pt * inches_per_pt
+        fig_height_pt = fig_width_pt
     elif isinstance(ratio, (int, float)):
-        fig_height_in = fig_width_pt * inches_per_pt * ratio
+        fig_height_pt = fig_width_pt * ratio
     else:
         raise ValueError("Invalid ratio specified.")
-
-    fig_width_in = fig_width_pt * inches_per_pt
-    fig_dim = (fig_width_in, fig_height_in)
+    fig_dim = (fig_width_pt, fig_height_pt)
     return fig_dim
 
 def create_lineplot(

src/maxplotlib/canvas/canvas.py

@@ -22,6 +22,7 @@ def __init__(self, **kwargs):
         self._description = kwargs.get('description', None)
         self._label = kwargs.get('label', None)
 
+        self._dpi=kwargs.get('dpi', 300)
         self._width=kwargs.get('width', 426.79135)
         self._ratio=kwargs.get('ratio', "golden")
         self._gridspec_kw = kwargs.get('gridspec_kw', {"wspace": 0.08, "hspace": 0.1})
@@ -106,7 +107,8 @@ def plot_matplotlib(self, show=True, savefig=False):
         else:
             fig_width, fig_height = plt_utils.set_size(width=self._width, ratio=self._ratio)
 
-        fig, axes = plt.subplots(self.nrows, self.ncols, figsize=(fig_width, fig_height), squeeze=False)
+        print(fig_width, fig_height, fig_width / self._dpi, fig_height / self._dpi)
+        fig, axes = plt.subplots(self.nrows, self.ncols, figsize=(fig_width / self._dpi, fig_height / self._dpi), squeeze=False, dpi = self._dpi)
 
         for (row, col), line_plot in self.subplots.items():
             ax = axes[row][col]
@@ -138,7 +140,7 @@ def plot_plotly(self, show=True, savefig=None):
             fig_width, fig_height = self._figsize
         else:
             fig_width, fig_height = plt_utils.set_size(width=self._width, ratio=self._ratio)
-
+        print(self._width, fig_width, fig_height)
         # Create subplots
         fig = make_subplots(rows=self.nrows, cols=self.ncols, subplot_titles=[
             f"Subplot ({row}, {col})" for (row, col) in self.subplots.keys()
@@ -152,8 +154,8 @@ def plot_plotly(self, show=True, savefig=None):
 
         # Update layout settings
         fig.update_layout(
-            width=fig_width,
-            height=fig_height,
+            # width=fig_width,
+            # height=fig_height,
             font=dict(size=fontsize),
             margin=dict(l=10, r=10, t=40, b=10),  # Adjust margins if needed
         )
@@ -169,6 +171,11 @@ def plot_plotly(self, show=True, savefig=None):
 
 
     # Property getters
+
+    @property
+    def dpi(self):
+        return self._dpi
+
     @property
     def nrows(self):
         return self._nrows
@@ -198,6 +205,10 @@ def subplot_matrix(self):
         return self._subplot_matrix
 
     # Property setters
+    @nrows.setter
+    def dpi(self, value):
+        self._dpi = value
+    
     @nrows.setter
     def nrows(self, value):
         self._nrows = value