fix of the data type mis-matched error

rsharp-lang · Dec 20, 2024 · 618c9ee · 618c9ee
1 parent e67805a
commit 618c9ee
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/src/ggplot/Internal/ggplot.vb b/src/ggplot/Internal/ggplot.vb
@@ -384,9 +384,10 @@ Public Class ggplot : Inherits Plot
     End Sub
 
     Private Sub DrawMultiple(all As IggplotLegendElement(), g As IGraphics, canvas As GraphicsRegion, pos As PointF)
-        Dim width As Double = canvas.Padding.Right / (all.Length + 1)
         Dim css As CSSEnvirnment = g.LoadEnvironment
-        Dim box As Rectangle = canvas.PlotRegion(css)
+        Dim padding As PaddingLayout = PaddingLayout.EvaluateFromCSS(CSS, canvas.Padding)
+        Dim width As Double = padding.Right / (all.Length + 1)
+        Dim box As Rectangle = canvas.PlotRegion(CSS)
         Dim x As Double
         Dim y As Double
 

diff --git a/src/ggplot/Internal/layers/ggplotLayer.vb b/src/ggplot/Internal/layers/ggplotLayer.vb
@@ -143,6 +143,7 @@ Namespace layers
             Dim padding As New GraphicsRegion(g.Size, theme.padding)
             Dim legend As ColorMapLegend
             Dim css As CSSEnvirnment = g.LoadEnvironment
+            Dim margin As PaddingLayout = PaddingLayout.EvaluateFromCSS(css, theme.padding)
 
             If TypeOf colorMap Is ggplotColorPalette Then
                 legend = New ColorMapLegend(DirectCast(palette.colorMap, String), maplevels)
@@ -161,7 +162,7 @@ Namespace layers
 
             legends = New legendColorMapElement With {
                 .colorMapLegend = legend,
-                .width = padding.Padding.Right * 3 / 4,
+                .width = margin.Right * 3 / 4,
                 .height = padding.PlotRegion(css).Height
             }
 

diff --git a/src/ggplot/Internal/layers/scatter/ggplotTileLayer.vb b/src/ggplot/Internal/layers/scatter/ggplotTileLayer.vb
@@ -140,6 +140,7 @@ Namespace layers
             Dim textures As Brush() = colors.Select(Function(c) c.GetBrush).ToArray
             Dim rxi, ryi As Double
             Dim css As CSSEnvirnment = stream.g.LoadEnvironment
+            Dim padding As PaddingLayout = PaddingLayout.EvaluateFromCSS(css, stream.canvas.Padding)
 
             For i As Integer = 0 To x.Length - 1
                 rxi = stream.scale.TranslateX(x(i)) - tile_size.Width
@@ -158,7 +159,7 @@ Namespace layers
                     .ticks = fillData.CreateAxisTicks,
                     .titleFont = css.GetFont(stream.theme.legendTitleCSS)
                 },
-                .width = stream.canvas.Padding.Right * 3 / 4,
+                .width = padding.Right * 3 / 4,
                 .height = stream.canvas.PlotRegion(css).Height
             }
         End Function