set symbol empty area color by itemStyle's backgroundColor

Assets/XCharts/CHANGELOG-EN.md

@@ -41,6 +41,7 @@
 
 ## branch-2.0
 
+* (2021.12.04) Added setting symbol empty area color by itemStyle's backgroundColor
 * (2021.12.03) Fixed formatter `{c}` not work #175
 * (2021.12.03) Fixed axis `boundaryGap` display error in some cases #174
 * (2021.11.30) Fixed serie `ignore` display error in some cases #173

Assets/XCharts/CHANGELOG.md

@@ -41,6 +41,7 @@
 
 ## branch-2.0
 
+* (2021.12.04) 增加`Symbol`的`Empty`区域颜色可通过`ItemStyle`的`backgroundColor`设置的支持
 * (2021.12.03) 修复`Formatter`的`{c}`通配符不生效的问题 #175
 * (2021.12.03) 修复`Axis`的`boundaryGap`某些情况下显示的问题 #174
 * (2021.11.30) 修复`Serie`的`ignore`某些情况下绘制异常的问题 #173

Assets/XCharts/Runtime/Component/Sub/MarkLine.cs

@@ -539,7 +539,7 @@ namespace XCharts
             var tickness = SerieHelper.GetSymbolBorder(serie, null, theme, false);
             var cornerRadius = SerieHelper.GetSymbolCornerRadius(serie, null, false);
             chart.Internal_CheckClipAndDrawSymbol(vh, symbol.type, symbolSize, tickness, pos, lineColor, lineColor,
-                symbol.gap, true, cornerRadius, grid, startPos);
+                ColorUtil.clearColor32, symbol.gap, true, cornerRadius, grid, startPos);
         }
 
         private void GetStartEndPos(Axis xAxis, Axis yAxis, Grid grid, double value, ref Vector3 sp, ref Vector3 ep)

Assets/XCharts/Runtime/Internal/BaseChart.cs

@@ -1022,17 +1022,20 @@ namespace XCharts
         }
 
         public void DrawSymbol(VertexHelper vh, SerieSymbolType type, float symbolSize,
-          float tickness, Vector3 pos, Color32 color, Color32 toColor, float gap, float[] cornerRadius)
+          float tickness, Vector3 pos, Color32 color, Color32 toColor, Color32 fillColor, float gap, float[] cornerRadius)
         {
-            DrawSymbol(vh, type, symbolSize, tickness, pos, color, toColor, gap, cornerRadius, Vector3.zero);
+            DrawSymbol(vh, type, symbolSize, tickness, pos, color, toColor, fillColor, gap, cornerRadius, Vector3.zero);
         }
+
         public void DrawSymbol(VertexHelper vh, SerieSymbolType type, float symbolSize,
-          float tickness, Vector3 pos, Color32 color, Color32 toColor, float gap, float[] cornerRadius, Vector3 startPos)
+          float tickness, Vector3 pos, Color32 color, Color32 toColor, Color32 fillColor, float gap, float[] cornerRadius, Vector3 startPos)
         {
             var backgroundColor = ThemeHelper.GetBackgroundColor(m_Theme, m_Background);
+            if (ChartHelper.IsClearColor(fillColor))
+                fillColor = backgroundColor;
             var smoothness = settings.cicleSmoothness;
             ChartDrawer.DrawSymbol(vh, type, symbolSize, tickness, pos, color, toColor, gap,
-                cornerRadius, backgroundColor, smoothness, startPos);
+                cornerRadius, fillColor, backgroundColor, smoothness, startPos);
         }
 
         public void DrawLabelBackground(VertexHelper vh, Serie serie, SerieData serieData)

Assets/XCharts/Runtime/Internal/CoordinateChart.cs

@@ -1687,11 +1687,12 @@ namespace XCharts
         }
 
         public void Internal_CheckClipAndDrawSymbol(VertexHelper vh, SerieSymbolType type, float symbolSize, float tickness,
-            Vector3 pos, Color32 color, Color32 toColor, float gap, bool clip, float[] cornerRadius, Grid grid, Vector3 startPos)
+            Vector3 pos, Color32 color, Color32 toColor, Color32 backgroundColor, float gap, bool clip, float[] cornerRadius,
+            Grid grid, Vector3 startPos)
         {
             if (!IsInChart(pos)) return;
             if (!clip || (clip && (IsInGrid(grid, pos))))
-                DrawSymbol(vh, type, symbolSize, tickness, pos, color, toColor, gap, cornerRadius, startPos);
+                DrawSymbol(vh, type, symbolSize, tickness, pos, color, toColor, backgroundColor, gap, cornerRadius, startPos);
         }
 
         public void Internal_CheckClipAndDrawZebraLine(VertexHelper vh, Vector3 p1, Vector3 p2, float size, float zebraWidth,

Assets/XCharts/Runtime/Internal/CoordinateChart_DrawLine.cs

@@ -40,13 +40,14 @@ namespace XCharts
                     ? symbol.GetSelectedSize(serie.data[i].data, m_Theme.serie.lineSymbolSelectedSize)
                     : symbol.GetSize(serie.data[i].data, m_Theme.serie.lineSymbolSize);
                 var symbolColor = SerieHelper.GetItemColor(serie, serieData, m_Theme, serie.index, highlight);
-
                 var symbolToColor = SerieHelper.GetItemToColor(serie, serieData, m_Theme, serie.index, highlight);
+                var backgroundColor = SerieHelper.GetItemBackgroundColor(serie, serieData, m_Theme, serie.index, highlight, false);
                 var symbolBorder = SerieHelper.GetSymbolBorder(serie, serieData, m_Theme, highlight);
                 var cornerRadius = SerieHelper.GetSymbolCornerRadius(serie, serieData, highlight);
                 symbolSize = serie.animation.GetSysmbolSize(symbolSize);
                 Internal_CheckClipAndDrawSymbol(vh, symbol.type, symbolSize, symbolBorder, serie.dataPoints[i], symbolColor,
-                    symbolToColor, symbol.gap, clip, cornerRadius, grid, i > 0 ? serie.dataPoints[i - 1] : grid.runtimePosition);
+                    symbolToColor, backgroundColor, symbol.gap, clip, cornerRadius, grid,
+                    i > 0 ? serie.dataPoints[i - 1] : grid.runtimePosition);
             }
         }
 

Assets/XCharts/Runtime/Internal/CoordinateChart_DrawScatter.cs

@@ -36,6 +36,7 @@ namespace XCharts
                 var highlight = serie.highlighted || serieData.highlighted;
                 var color = SerieHelper.GetItemColor(serie, serieData, m_Theme, colorIndex, highlight);
                 var toColor = SerieHelper.GetItemToColor(serie, serieData, m_Theme, colorIndex, highlight);
+                var backgroundColor = SerieHelper.GetItemBackgroundColor(serie, serieData, m_Theme, colorIndex, highlight, false);
                 var symbolBorder = SerieHelper.GetSymbolBorder(serie, serieData, m_Theme, highlight);
                 var cornerRadius = SerieHelper.GetSymbolCornerRadius(serie, serieData, highlight);
                 double xValue = serieData.GetCurrData(0, dataChangeDuration, xAxis.inverse);
@@ -67,13 +68,13 @@ namespace XCharts
                     {
                         var nowSize = symbol.animationSize[count];
                         color.a = (byte)(255 * (symbolSize - nowSize) / symbolSize);
-                        DrawSymbol(vh, symbol.type, nowSize, symbolBorder, pos, color, toColor, symbol.gap, cornerRadius);
+                        DrawSymbol(vh, symbol.type, nowSize, symbolBorder, pos, color, toColor, backgroundColor, symbol.gap, cornerRadius);
                     }
                     RefreshPainter(serie);
                 }
                 else
                 {
-                    DrawSymbol(vh, symbol.type, symbolSize, symbolBorder, pos, color, toColor, symbol.gap, cornerRadius);
+                    DrawSymbol(vh, symbol.type, symbolSize, symbolBorder, pos, color, toColor, backgroundColor, symbol.gap, cornerRadius);
                 }
             }
             if (!serie.animation.IsFinish())

Assets/XCharts/Runtime/Internal/DrawSerieRadar.cs

@@ -387,10 +387,11 @@ namespace XCharts
                             : serie.symbol.GetSize(null, chart.theme.serie.lineSymbolSize);
                         var symbolColor = SerieHelper.GetItemColor(serie, serieData, chart.theme, serieIndex, isHighlight);
                         var symbolToColor = SerieHelper.GetItemToColor(serie, serieData, chart.theme, serieIndex, isHighlight);
+                        var backgroundColor = SerieHelper.GetItemBackgroundColor(serie, serieData, chart.theme, serieIndex, isHighlight, false);
                         var symbolBorder = SerieHelper.GetSymbolBorder(serie, serieData, chart.theme, isHighlight);
                         var cornerRadius = SerieHelper.GetSymbolCornerRadius(serie, serieData, isHighlight);
                         chart.DrawSymbol(vh, serie.symbol.type, symbolSize, symbolBorder, point, symbolColor,
-                           symbolToColor, serie.symbol.gap, cornerRadius);
+                           symbolToColor, backgroundColor, serie.symbol.gap, cornerRadius);
                     }
                 }
             }
@@ -570,6 +571,7 @@ namespace XCharts
                         : serie.symbol.GetSize(serieData.data, chart.theme.serie.lineSymbolSize);
                     var symbolColor = SerieHelper.GetItemColor(serie, serieData, chart.theme, serieIndex, isHighlight);
                     var symbolToColor = SerieHelper.GetItemToColor(serie, serieData, chart.theme, serieIndex, isHighlight);
+                    var backgroundColor = SerieHelper.GetItemBackgroundColor(serie, serieData, chart.theme, serieIndex, isHighlight, false);
                     var symbolBorder = SerieHelper.GetSymbolBorder(serie, serieData, chart.theme, isHighlight);
                     var cornerRadius = SerieHelper.GetSymbolCornerRadius(serie, serieData, isHighlight);
                     if (!radar.IsInIndicatorRange(j, serieData.GetData(1)))
@@ -578,7 +580,7 @@ namespace XCharts
                         symbolToColor = radar.outRangeColor;
                     }
                     chart.DrawSymbol(vh, serie.symbol.type, symbolSize, symbolBorder, serieData.labelPosition, symbolColor,
-                           symbolToColor, serie.symbol.gap, cornerRadius);
+                           symbolToColor, backgroundColor, serie.symbol.gap, cornerRadius);
                 }
             }
             if (!serie.animation.IsFinish())
@@ -619,12 +621,13 @@ namespace XCharts
                     : serie.symbol.GetSize(serieData.data, chart.theme.serie.lineSymbolSize);
                 var symbolColor = SerieHelper.GetItemColor(serie, serieData, chart.theme, serieIndex, isHighlight);
                 var symbolToColor = SerieHelper.GetItemToColor(serie, serieData, chart.theme, serieIndex, isHighlight);
+                var backgroundColor = SerieHelper.GetItemBackgroundColor(serie, serieData, chart.theme, serieIndex, isHighlight, false);
                 var symbolBorder = SerieHelper.GetSymbolBorder(serie, serieData, chart.theme, isHighlight);
                 var cornerRadius = SerieHelper.GetSymbolCornerRadius(serie, serieData, isHighlight);
                 foreach (var point in pointList)
                 {
                     chart.DrawSymbol(vh, serie.symbol.type, symbolSize, symbolBorder, point, symbolColor,
-                       symbolToColor, serie.symbol.gap, cornerRadius);
+                       symbolToColor, backgroundColor, serie.symbol.gap, cornerRadius);
                 }
             }
         }

Assets/XCharts/Runtime/Internal/Utility/ChartDrawer.cs

@@ -18,7 +18,7 @@ namespace XCharts
 
         public static void DrawSymbol(VertexHelper vh, SerieSymbolType type, float symbolSize,
            float tickness, Vector3 pos, Color32 color, Color32 toColor, float gap, float[] cornerRadius,
-           Color32 backgroundColor, float smoothness, Vector3 startPos)
+           Color32 centerFillColor, Color32 backgroundColor, float smoothness, Vector3 startPos)
         {
             switch (type)
             {
@@ -38,11 +38,11 @@ namespace XCharts
                     if (gap > 0)
                     {
                         UGL.DrawCricle(vh, pos, symbolSize + gap, backgroundColor, smoothness);
-                        UGL.DrawEmptyCricle(vh, pos, symbolSize, tickness, color, color, backgroundColor, smoothness);
+                        UGL.DrawEmptyCricle(vh, pos, symbolSize, tickness, color, color, centerFillColor, smoothness);
                     }
                     else
                     {
-                        UGL.DrawEmptyCricle(vh, pos, symbolSize, tickness, color, color, backgroundColor, smoothness);
+                        UGL.DrawEmptyCricle(vh, pos, symbolSize, tickness, color, color, centerFillColor, smoothness);
                     }
                     break;
                 case SerieSymbolType.Rect:
@@ -88,7 +88,7 @@ namespace XCharts
                     break;
             }
         }
-        
+
         public static void DrawLineStyle(VertexHelper vh, LineStyle lineStyle, Vector3 startPos, Vector3 endPos,
            Color32 defaultColor, float themeWidth, LineStyle.Type themeType)
         {

Assets/XCharts/Runtime/PolarChart.cs

@@ -510,11 +510,12 @@ namespace XCharts
                         : symbol.GetSize(serieData.data, m_Theme.serie.lineSymbolSize);
                     var symbolColor = SerieHelper.GetItemColor(serie, serieData, m_Theme, n, highlight);
                     var symbolToColor = SerieHelper.GetItemToColor(serie, serieData, m_Theme, n, highlight);
+                    var backgroundColor = SerieHelper.GetItemBackgroundColor(serie, serieData, m_Theme, n, highlight, false);
                     var symbolBorder = SerieHelper.GetSymbolBorder(serie, serieData, m_Theme, highlight);
                     var cornerRadius = SerieHelper.GetSymbolCornerRadius(serie, serieData, highlight);
                     symbolSize = serie.animation.GetSysmbolSize(symbolSize);
                     DrawSymbol(vh, symbol.type, symbolSize, symbolBorder, serieData.runtimePosition, symbolColor,
-                        symbolToColor, symbol.gap, cornerRadius);
+                        symbolToColor, backgroundColor, symbol.gap, cornerRadius);
                 }
             }
         }