Compare commits

...

64 Commits

Author SHA1 Message Date
monitor1394
fdcefb48f6 优化DataZoom的缩放功能 2026-06-09 22:32:39 +08:00
monitor1394
986fe7e575 增加Tooltip通过TitleLabelStyleTextStyleAlignment设置标题的对齐方式 (#363) 2026-06-03 22:03:06 +08:00
monitor1394
12be0ef93b 优化图表性能 2026-05-28 23:24:42 +08:00
monitor1394
2688d93f17 优化DataZoomMarquee框选功能 2026-05-28 09:14:53 +08:00
monitor1394
b040f27b2c 增加DataZoomfilterAxisRange设置坐标轴的范围计算是否受DataZoom的影响 2026-05-26 08:46:49 +08:00
monitor1394
584ef9a834 优化DataZoomMarquee框选功能 2026-05-25 22:19:22 +08:00
monitor1394
b14a574ad6 优化DataZoomMarquee框选功能 2026-05-24 21:15:29 +08:00
monitor1394
9d982019dd 修复DataZoom内绘制的折线图可能会超出范围的问题 2026-05-23 22:51:15 +08:00
monitor1394
be07afeb69 修复Axisinverse没能正确反转的问题 2026-05-23 22:16:28 +08:00
monitor1394
4ad2b3268f 增加LabelStyleshowCondition,showFilter,showThreshold可控制label显示和隐藏 2026-05-23 17:07:00 +08:00
monitor1394
f7ccec87d9 增加LabelStyleminGap可避免label过于密集 2026-05-22 21:52:22 +08:00
monitor1394
9bca52fbfb 修复DataZoom点击时指示区域不准的问题 2026-05-20 23:09:51 +08:00
monitor1394
2ee94acd30 优化图表性能 2026-05-20 22:13:04 +08:00
monitor1394
10d67cff41 修复DataZoom点击时指示区域不准的问题 2026-05-17 22:52:05 +08:00
monitor1394
4120b61f2a 增加LegendWidthHeight可设置固定宽高 2026-05-17 18:47:47 +08:00
monitor1394
0174453b05 修复SerieEndLabelY轴是MinMax类型时显示的数值不对的问题 2026-05-17 18:37:47 +08:00
monitor1394
68cb18305d 修复Candlestick按昨收判断涨跌颜色,一字涨停/跌停显示不对的问题 (#362) 2026-05-17 18:28:03 +08:00
monitor1394
39514f82b3 修复Candlestick的涨停颜色不对的问题 (#362) 2026-05-16 22:33:40 +08:00
monitor1394
5f66391428 修复LegendBackground区域在Horizonal模式下不对的问题 2026-03-29 21:48:25 +08:00
monitor1394
99e56d238a 增加ChartJson导出导入 2026-03-25 22:46:26 +08:00
monitor1394
dcac0f9655 默认设置圆角 2026-03-10 09:27:13 +08:00
monitor1394
2bb56fcd28 修复SaveAsImage保存的图片在PC和手机上不一致的问题 2026-03-03 22:23:07 +08:00
monitor1394
7d4ba652ec 修复SaveAsImage保存的图片尺寸变大的问题 2026-02-28 21:56:35 +08:00
monitor1394
619246bee2 3.15.0 2026-02-27 21:14:53 +08:00
monitor1394
52b9b0a03a 增加SerieignoreZeroOccupy可设置0数据的Bar是否占位 (#286) 2026-02-26 22:31:50 +08:00
monitor1394
3301d5fd36 修复SaveAsImage被其他组件遮挡时无法正常保存的问题 (#337) 2026-02-26 21:53:29 +08:00
monitor1394
92abee1a6c 增加AxismainAxis参数设置主轴可控制柱图的朝向 (#331) 2026-02-26 08:47:51 +08:00
monitor1394
90e9187808 修复Pie的点击有时候不响应的问题 (#357) 2026-01-15 08:53:42 +08:00
monitor1394
b311d17d94 增加DataZoomminZoomRatio替换旧的minShowNum (#350) 2026-01-08 08:58:12 +08:00
monitor1394
880a6b1885 优化Candlestick对时间轴的支持 2025-11-05 23:05:15 +08:00
monitor1394
fb841a3498 修复AxisindicatorLabel无法隐藏的问题 2025-11-05 22:49:23 +08:00
monitor1394
ac41dd1d07 优化Candlestick对时间轴的支持 2025-11-05 08:55:02 +08:00
monitor1394
39cee1bd52 增加TooltipTitle可通过TitleLabelStylenumericFormatter格式化时间显示 (#353) 2025-11-03 07:41:41 +08:00
monitor1394
f1c9a3ac4b 增加ChartuseUtc参数设置显示时间是否用UTC时间 2025-10-31 08:39:29 +08:00
monitor1394
2cb82526bc 优化Candlestick对时间轴的支持 2025-10-30 22:48:36 +08:00
monitor1394
0499126e55 增加Scatterignore支持设置忽略数据 2025-10-30 22:46:53 +08:00
monitor1394
c2bafb8aa8 增加PiepieType支持实心饼图和线框柄图 (#349) 2025-10-22 09:06:28 +08:00
monitor1394
c83fe89a31 优化MarkLine的表现 2025-09-05 22:09:11 +08:00
monitor1394
dd473b7d29 增加AxisLinestartExtendLengthendExtendLength设置轴线的延长线 2025-09-01 23:05:49 +08:00
monitor1394
d1f424f3a1 修复SerieTitleStyle在数据变更时不及时刷新的问题 2025-08-27 09:10:58 +08:00
monitor1394
efbe16b804 修复TMP开启时Axis运行报错 2025-05-19 21:57:11 +08:00
monitor1394
2d2e45da80 修复TMP开启时Axis运行报错 2025-05-19 21:55:52 +08:00
monitor1394
06bd26dc5f 修复MarkArea指定yValuexValue时绘制区域不准确的问题 2025-04-25 22:42:11 +08:00
monitor1394
a0dba26318 重构Title相关代码 2025-04-17 22:10:47 +08:00
monitor1394
e124d38d3e 增加Bar支持通过VisualMap设置颜色 2025-04-15 23:11:05 +08:00
monitor1394
21ffcba0c0 增加AxisLabelshowZeroLabel设置是否显示0刻度 2025-04-15 22:51:59 +08:00
monitor1394
ccf815c853 优化AxisTime时间轴支持设置Custom和ceilRate 2025-04-07 22:30:17 +08:00
monitor1394
fc0451e535 update doc 2025-04-07 20:59:12 +08:00
monitor1394
b23c581b63 修复GridCoord在设置背景色且Serie开启Clip时会覆盖图表的问题 2025-04-07 11:16:33 +08:00
monitor1394
eafd7276c0 修复AxisTime时间轴无法显示大于2038的年份的问题 2025-04-07 10:03:19 +08:00
monitor1394
3818d1213e 修复AxisTime时间轴在有DataZoom缩放时文本显示异常的问题 2025-04-06 22:24:05 +08:00
monitor1394
85b92ca2cc 增加LegenditemInactiveOpacity可设置非激活状态时的颜色透明度 (#343) 2025-03-27 22:35:02 +08:00
monitor1394
546ff1f61a 增加AxisonLabelClick回调事件 2025-03-27 08:39:30 +08:00
monitor1394
da360693e6 增加AxisonLabelClick回调事件 2025-03-27 08:31:21 +08:00
monitor1394
ad3bc75d7c 重命名MarkLineType的None为Custom 2025-03-26 22:24:41 +08:00
monitor1394
0b218f6dfe 增加AnimationExchange排序交换动画 2025-03-26 08:28:27 +08:00
monitor1394
9e07617cc4 增加Commentlayer设置层级 2025-03-22 09:24:46 +08:00
monitor1394
8bc66ca30a 优化Comment坐标刷新 2025-03-21 21:39:12 +08:00
monitor1394
20da9dbe94 增加SerieLabelformatter支持{index}通配符 2025-03-21 08:44:33 +08:00
monitor1394
62f071e5a9 增加SerieLabelformatter支持{index}通配符 2025-03-19 23:03:11 +08:00
monitor1394
4c001c8130 增加Bar可添加TitleStyle组件支持 2025-03-18 23:10:52 +08:00
monitor1394
4ad4505720 增加Bar可添加TitleStyle组件支持 2025-03-18 08:18:22 +08:00
monitor1394
47caaa2113 增加LabelStylefixedXfixedY可固定label的坐标 2025-03-18 07:41:58 +08:00
monitor1394
2f8a1300d3 增加ItemStylebackgroundGap可设置数据项背景间隙 2025-03-18 07:37:15 +08:00
101 changed files with 6405 additions and 769 deletions

View File

@@ -13,6 +13,7 @@ slug: /api
- [AnimationAddition](#animationaddition)
- [AnimationChange](#animationchange)
- [AnimationEasing](#animationeasing)
- [AnimationExchange](#animationexchange)
- [AnimationFadeIn](#animationfadein)
- [AnimationFadeOut](#animationfadeout)
- [AnimationHiding](#animationhiding)
@@ -70,6 +71,7 @@ slug: /api
- [ColorUtil](#colorutil)
- [Comment](#comment)
- [CommentItem](#commentitem)
- [CommentLayer](#commentlayer)
- [CommentMarkStyle](#commentmarkstyle)
- [ComponentHandlerAttribute](#componenthandlerattribute)
- [ComponentHelper](#componenthelper)
@@ -157,6 +159,7 @@ slug: /api
- [MainComponentContext](#maincomponentcontext)
- [MainComponentHandler](#maincomponenthandler)
- [MainComponentHandler<T>](#maincomponenthandlert)
- [MainComponentHandler<Title>](#maincomponenthandlertitle)
- [MarkArea](#markarea)
- [MarkAreaData](#markareadata)
- [MarkAreaType](#markareatype)
@@ -179,6 +182,7 @@ slug: /api
- [ParallelCoordContext](#parallelcoordcontext)
- [Pie](#pie)
- [PieChart](#piechart)
- [PieType](#pietype)
- [PolarAxisTheme](#polaraxistheme)
- [PolarChart](#polarchart)
- [PolarCoord](#polarcoord)
@@ -255,6 +259,7 @@ slug: /api
- [ThemeStyle](#themestyle)
- [ThemeType](#themetype)
- [Title](#title)
- [TitleHandler](#titlehandler)
- [TitleStyle](#titlestyle)
- [TitleTheme](#titletheme)
- [Tooltip](#tooltip)
@@ -360,6 +365,14 @@ Options:
- `Linear`:
## AnimationExchange
class in XCharts.Runtime / Inherits from: [AnimationInfo](#animationinfo)
> Since `v3.15.0`
Data exchange animation. Generally used for animation of data sorting.
## AnimationFadeIn
class in XCharts.Runtime / Inherits from: [AnimationInfo](#animationinfo)
@@ -386,7 +399,7 @@ Data hiding animation.
## AnimationInfo
class in XCharts.Runtime / Subclasses: [AnimationFadeIn](#animationfadein),[AnimationFadeOut](#animationfadeout),[AnimationChange](#animationchange),[AnimationAddition](#animationaddition),[AnimationHiding](#animationhiding),[AnimationInteraction](#animationinteraction)
class in XCharts.Runtime / Subclasses: [AnimationFadeIn](#animationfadein),[AnimationFadeOut](#animationfadeout),[AnimationChange](#animationchange),[AnimationAddition](#animationaddition),[AnimationHiding](#animationhiding),[AnimationInteraction](#animationinteraction),[AnimationExchange](#animationexchange)
> Since `v3.8.0`
@@ -531,7 +544,7 @@ public float GetWidth(float width)
class in XCharts.Runtime / Inherits from: [ChildComponent](#childcomponent)
the animation of serie. support animation type: fadeIn, fadeOut, change, addition.
the animation of serie. support animation type: fadeIn, fadeOut, change, addition, exchange.
### AnimationStyle.addition
@@ -548,6 +561,11 @@ Update data animation configuration.
public bool enable
Whether to enable animation.
### AnimationStyle.exchange
public AnimationExchange exchange
Exchange animation configuration. Valid in sort bar chart.
### AnimationStyle.fadeIn
public AnimationFadeIn fadeIn
@@ -639,6 +657,10 @@ public int GetCurrIndex()
public float GetCurrRate()
### AnimationStyle.GetExchangeDuration
public float GetExchangeDuration()
### AnimationStyle.GetInteractionDuration
public float GetInteractionDuration()
@@ -789,6 +811,14 @@ class in XCharts.Runtime / Inherits from: [MainComponent](#maincomponent) / Subc
The axis in rectangular coordinate.
### Axis.onLabelClick
public Action<int, string> onLabelClick
> Since `v3.15.0`
Callback function when click on the label. Parameters: labelIndex, labelName.
### Axis.AddData
public void AddData(string category)
@@ -888,7 +918,7 @@ public bool IsLog()
### Axis.IsNeedShowLabel
public bool IsNeedShowLabel(int index, int total = 0)
public bool IsNeedShowLabel(int index, int total = 0, string content = null)
### Axis.IsRight
@@ -1059,6 +1089,14 @@ class in XCharts / Inherits from: [MainComponentHandler](#maincomponenthandler)
public T component
### AxisHandler<T>.DrawTop
// public override void DrawTop(VertexHelper vh)
### AxisHandler<T>.OnPointerClick
public override void OnPointerClick(PointerEventData eventData)
## AxisHelper
class in XCharts.Runtime
@@ -1097,7 +1135,7 @@ public static float GetAxisValueDistance(GridCoord grid, Axis axis, float scaleW
### AxisHelper.GetAxisValueLength
public static float GetAxisValueLength(GridCoord grid, Axis axis, float scaleWidth, double value)
public static float GetAxisValueLength(GridCoord grid, Axis axis, float scaleWidth, double value, float gap = 0)
获得数值value在坐标轴上对应的长度
### AxisHelper.GetAxisValuePosition
@@ -1184,7 +1222,7 @@ public override string GetFormatterContent(int labelIndex, int totalIndex, doubl
### AxisLabel.IsNeedShowLabel
public bool IsNeedShowLabel(int index, int total)
public bool IsNeedShowLabel(int index, int total, string content = null)
### AxisLabel.SetRelatedText
@@ -1674,6 +1712,10 @@ Global parameter setting component.
public ThemeStyle theme
### BaseChart.topPainter
public Painter topPainter
### BaseChart.typeListForComponent
public Dictionary<Type, FieldInfo> typeListForComponent
@@ -1682,6 +1724,11 @@ public Dictionary<Type, FieldInfo> typeListForComponent
public Dictionary<Type, FieldInfo> typeListForSerie
### BaseChart.useUtc
public bool useUtc
Whether to use UTC time for the chart.
### BaseChart.AddChartComponent
public MainComponent AddChartComponent(Type type)
@@ -1938,6 +1985,10 @@ public Color32 GetLegendRealShowNameColor(string name)
public int GetLegendRealShowNameIndex(string name)
### BaseChart.GetMainAxis
public Axis GetMainAxis()
### BaseChart.GetMarkColor
public Color32 GetMarkColor(Serie serie, SerieData serieData)
@@ -1996,10 +2047,6 @@ public float GetSerieTotalGap<T>(float categoryWidth, float gap, int index
public float GetSerieTotalWidth<T>(float categoryWidth, float gap, int realBarCount, int gridIndex) where T : Serie
### BaseChart.GetTitlePosition
public Vector3 GetTitlePosition(Title title)
### BaseChart.GetVisualMapOfSerie
public VisualMap GetVisualMapOfSerie(Serie serie)
@@ -2519,6 +2566,10 @@ public string warningInfo
public string CheckWarning()
检测警告信息。
### BaseGraph.GetTitlePosition
public Vector3 GetTitlePosition(Title title)
### BaseGraph.LocalPointToScreenPoint
public Vector2 LocalPointToScreenPoint(Vector2 localPoint)
@@ -2585,11 +2636,6 @@ public void RefreshAllComponent()
public virtual void RefreshGraph()
Redraw graph in next frame.
### BaseGraph.SaveAsImage
public void SaveAsImage(string imageType = "png", string savePath = "")
保存图表为图片。
### BaseGraph.ScreenPointToChartPoint
public bool ScreenPointToChartPoint(Vector2 screenPoint, out Vector2 chartPoint)
@@ -2847,6 +2893,14 @@ public static string ColorToStr(Color color)
public static string FloatToStr(double value, string numericFormatter = "F", int precision = 0)
### ChartCached.GetAxisLabelName
public static string GetAxisLabelName(int index)
### ChartCached.GetComponentObjectName
public static string GetComponentObjectName(MainComponent component)
### ChartCached.GetSerieLabelName
public static string GetSerieLabelName(string prefix, int i, int j)
@@ -2855,17 +2909,25 @@ public static string GetSerieLabelName(string prefix, int i, int j)
public static string GetString(string prefix, int suffix)
### ChartCached.GetTypeName
public static string GetTypeName(Type type)
### ChartCached.GetTypeName<T>
public static string GetTypeName<T>()
### ChartCached.IntToStr
public static string IntToStr(int value, string numericFormatter = "")
### ChartCached.NumberToDateStr
public static string NumberToDateStr(double timestamp, string formatter)
public static string NumberToDateStr(double timestamp, string formatter, bool local = false)
### ChartCached.NumberToDateTime
public static DateTime NumberToDateTime(double timestamp)
public static DateTime NumberToDateTime(double timestamp, bool local = false)
### ChartCached.NumberToStr
@@ -3111,10 +3173,6 @@ public static void RemoveTMPComponents(GameObject gameObject)
public static Vector3 RotateRound(Vector3 position, Vector3 center, Vector3 axis, float angle)
### ChartHelper.SaveAsImage
public static Texture2D SaveAsImage(RectTransform rectTransform, Canvas canvas, string imageType = "png", string path = "")
### ChartHelper.SetActive
public static bool SetActive(Image image, bool active)
@@ -3174,6 +3232,10 @@ public float GetTextWidth()
public float GetWidth()
### ChartLabel.InRect
public bool InRect(Vector2 local)
### ChartLabel.IsActiveByScale
public bool IsActiveByScale()
@@ -3428,13 +3490,20 @@ Convert the html string to color.
class in XCharts.Runtime / Inherits from: [MainComponent](#maincomponent),[IPropertyChanged](#ipropertychanged)
comment of chart.
> Since `v3.15.0`
comment of chart. Used to annotate special information in the chart.
### Comment.items
public List<CommentItem> items
The items of comment.
### Comment.layer
public CommentLayer layer
The layer of comment.
### Comment.show
public bool show
@@ -3443,10 +3512,12 @@ Set this to false to prevent the comment from showing.
### Comment.GetLabelStyle
public LabelStyle GetLabelStyle(int index)
Get the label style of comment item.
### Comment.GetMarkStyle
public CommentMarkStyle GetMarkStyle(int index)
Get the mark style of comment item.
### Comment.OnChanged
@@ -3478,6 +3549,17 @@ the mark rect style.
public bool show
Set this to false to prevent this comment item from showing.
## CommentLayer
class in XCharts.Runtime
The layer of comment.
Options:
- `Lower`: The comment is display under the serie.
- `Upper`: The comment is display above the serie.
## CommentMarkStyle
class in XCharts.Runtime / Inherits from: [ChildComponent](#childcomponent)
@@ -3763,17 +3845,17 @@ class in XCharts.Runtime
### DateTimeUtil.GetDateTime
public static DateTime GetDateTime(double timestamp, bool local = true)
public static DateTime GetDateTime(double timestamp, bool local = false)
### DateTimeUtil.GetDefaultDateTimeString
public static string GetDefaultDateTimeString(int timestamp, double range = 0)
public static string GetDefaultDateTimeString(double timestamp, double range = 0, bool local = false)
### DateTimeUtil.GetTimestamp
public static int GetTimestamp(DateTime time, bool local = false)
public static double GetTimestamp(DateTime time, bool local = false)
public static int GetTimestamp(string dateTime, bool local = false)
public static double GetTimestamp(string dateTime, bool local = false)
### DateTimeUtil.IsDateOrTimeRegex
@@ -4683,7 +4765,7 @@ public virtual string GetFormatterContent(int labelIndex, int totalIndex, double
### LabelStyle.GetFormatterDateTime
public string GetFormatterDateTime(int labelIndex, int totalIndex, double value, double minValue, double maxValue)
public string GetFormatterDateTime(int labelIndex, int totalIndex, double value, double minValue, double maxValue, bool local)
### LabelStyle.GetOffset
@@ -5687,6 +5769,10 @@ class in XCharts.Runtime / Inherits from: [MainComponentHandler](#maincomponenth
public T component
## MainComponentHandler<Title>
class in / Subclasses: [TitleHandler](#titlehandler)
## MarkArea
class in XCharts.Runtime / Inherits from: [MainComponent](#maincomponent)
@@ -5781,15 +5867,15 @@ public double runtimeValue
class in XCharts.Runtime
标线类型
Mark line type.
Options:
- `None`: 标线类型
- `Min`: 最小值。
- `Max`: 最大值。
- `Average`: 平均值。
- `Median`: 中位数。
- `Custom`: Custom. You can customize the xy coordinates or values.
- `Min`: Minimum value.
- `Max`: Maximum value.
- `Average`: Average value.
- `Median`: Median.
## MarqueeStyle
@@ -5982,10 +6068,6 @@ class in XCharts.Runtime / Inherits from: [MaskableGraphic](https://docs.unity3d
public int index
### Painter.onPopulateMesh
public Action<VertexHelper, Painter> onPopulateMesh
### Painter.type
public Type type
@@ -6120,6 +6202,15 @@ default label pie chart.
public void DefaultRadiusRosePieChart()
default rose pie chart.
## PieType
class in XCharts.Runtime
Options:
- `Solid`: solid pie chart - default fill style.
- `Wireframe`: wireframe pie chart - only show the outline wireframe.
## PolarAxisTheme
class in XCharts.Runtime / Inherits from: [BaseAxisTheme](#baseaxistheme)
@@ -7141,12 +7232,12 @@ public double GetLastData()
### SerieData.GetMaxData
public double GetMaxData(bool inverse = false)
public double GetMaxData(bool inverse = false, int startDimensionIndex = 0)
the maxinum value.
### SerieData.GetMinData
public double GetMinData(bool inverse = false)
public double GetMinData(bool inverse = false, int startDimensionIndex = 0)
the mininum value.
### SerieData.GetMinMaxData
@@ -7257,6 +7348,10 @@ class in XCharts.Runtime
public void Reset()
### SerieDataContext.UpdateExchangePosition
public void UpdateExchangePosition(ref float x, ref float y, float totalTime)
## SerieDataExtraFieldAttribute
class in XCharts.Runtime / Inherits from: [Attribute](https://docs.unity3d.com/ScriptReference/30_search.html?q=attribute)
@@ -7685,6 +7780,10 @@ public override void RefreshLabelInternal()
public override void RefreshLabelNextFrame()
### SerieHandler<T>.RefreshTitleLabelInternal
public void RefreshTitleLabelInternal()
### SerieHandler<T>.RemoveComponent
public override void RemoveComponent()
@@ -8605,6 +8704,30 @@ public override void ClearComponentDirty()
public void OnChanged()
## TitleHandler
class in XCharts.Runtime / Inherits from: [MainComponentHandler<Title>](#maincomponenthandlertitle)
### TitleHandler.AddSubTitleLabel
public static ChartLabel AddSubTitleLabel(Transform parent, Title title, ComponentTheme componentTheme, BaseChart chart = null)
### TitleHandler.AddTitleLabel
public static ChartLabel AddTitleLabel(Transform parent, Title title, ComponentTheme componentTheme, BaseChart chart = null)
### TitleHandler.AddTitleObject
public static GameObject AddTitleObject(BaseGraph graph, Title title, ComponentTheme componentTheme, int titleSiblingIndex, string objectName = null)
### TitleHandler.InitComponent
public override void InitComponent()
### TitleHandler.OnSerieDataUpdate
public override void OnSerieDataUpdate(int serieIndex)
## TitleStyle
class in XCharts.Runtime / Inherits from: [LabelStyle](#labelstyle),[ISerieDataComponent](#iseriedatacomponent),[ISerieComponent](#iseriecomponent)

View File

@@ -6,6 +6,7 @@ slug: /changelog
# Changelog
[master](#master)
[v3.15.0](#v3150)
[v3.14.0](#v3140)
[v3.13.0](#v3130)
[v3.12.1](#v3121)
@@ -79,9 +80,62 @@ slug: /changelog
## master
## v3.15.0
Version Highlights:
* __Enhanced Timeline & Zoom Capabilities__: Added `DataZoom.minZoomRatio` (replacing `minShowNum`), `Chart.useUtc`, and continuous optimization of `Axis Time` performance during zooming and handling of large year ranges.
* __More Flexible Bar Charts & Axis Configuration__: Added `Axis.mainAxis` to control bar chart orientation, `Serie.ignoreZeroOccupy` to control whether zero-value bars occupy space, and `AxisLine` extension line configurations.
* __Improved Chart Styling & Interactivity__: Added `Pie.pieType`, `Legend.itemInactiveOpacity`, `Axis.onLabelClick`, `Animation.Exchange`, `LabelStyle.fixedX/fixedY`, and more.
* __Ongoing Enhancement of Extended UI Components__: Added `Title` and `Viewport` configurations for `UITable`, enhanced `UIStatistic.desc`, and optimized `Comment.layer` and coordinate refresh experience.
* __Focused Stability & Compatibility Fixes__: Resolved critical issues including `SaveAsImage` being blocked by other components, `Pie` click failures, `TMP` compatibility, `Gantt` time range and year 2038 problem, `MarkArea/GridCoord/Axis` and more.
Changelog Details:
* (2026.03.01) Released version `v3.15.0`
* (2026.02.26) Added `ignoreZeroOccupy` to `Serie` to set whether zero-value Bars occupy space (#286)
* (2026.02.26) Fixed `SaveAsImage` not saving correctly when blocked by other components (#337)
* (2026.02.26) Added `mainAxis` parameter to `Axis` to set the main axis for controlling bar chart orientation (#331)
* (2026.02.03) Fixed `UITable` `viewport` potentially drawing incorrectly under different anchor points
* (2026.01.15) Fixed `Pie` click sometimes not responding (#357)
* (2026.01.08) Added `minZoomRatio` to `DataZoom` to replace the old `minShowNum` (#350)
* (2025.11.05) Fixed `Axis` `indicatorLabel` not being hideable
* (2025.11.03) Added `Tooltip` `Title` time formatting via `TitleLabelStyle` `numericFormatter` (#353)
* (2025.10.30) Added `useUtc` parameter to `Chart` to set whether displayed time uses UTC
* (2025.10.30) Optimized `Candlestick` support for time axis
* (2025.10.30) Added support for `ignore` in `Scatter` to skip data points
* (2025.10.24) Optimized line drawing order for `Sankey`
* (2025.10.22) Added `pieType` to `Pie` supporting solid pie charts and wireframe handle charts (#349)
* (2025.09.05) Optimized `MarkLine` performance
* (2025.09.01) Added `startExtendLength` and `endExtendLength` to `AxisLine` for setting axis line extensions
* (2025.08.27) Fixed `Serie` `TitleStyle` not refreshing promptly when data changed
* (2025.05.19) Fixed `Axis` runtime error when `TMP` is enabled
* (2025.04.25) Fixed `MarkArea` drawing inaccurately when specifying `yValue` or `xValue`
* (2025.04.17) Added `Title` support for `UITable` to set headers
* (2025.04.17) Added `Viewport` support for `UITable` to set table viewport margins and borders
* (2025.04.15) Added `Bar` support for color settings via `VisualMap`
* (2025.04.14) Added `showZeroLabel` to `AxisLabel` to set whether to display zero tick
* (2025.04.08) Added `desc` description text setting support for `UIStatistic`
* (2025.04.07) Fixed `Gantt` chart calculating inaccurate time ranges with multi-dimensional data
* (2025.04.07) Optimized `Axis` `Time` axis support for Custom and ceilRate settings
* (2025.04.07) Fixed `GridCoord` covering charts when background color set and Serie Clip enabled
* (2025.04.07) Fixed `Gantt` chart display errors when year exceeds 2038
* (2025.04.07) Fixed `Axis` `Time` axis not displaying years beyond 2038
* (2025.04.06) Fixed `Axis` `Time` axis text display errors when zoomed with `DataZoom`
* (2025.03.28) Fixed `Pie3D` `avoidLabelOverlap` not working
* (2025.03.27) Added `itemInactiveOpacity` to `Legend` to set color transparency for inactive states (#343)
* (2025.03.27) Added `onLabelClick` callback event to `Axis`
* (2025.03.26) Added `Exchange` sort swap animation to `Animation`
* (2025.03.22) Added `layer` setting to `Comment`
* (2025.03.21) Optimized coordinate refresh for `Comment`
* (2025.03.19) Added `{index}` wildcard support for `Serie` `Label` `formatter`
* (2025.03.18) Added `TitleStyle` component support for `Bar`
* (2025.03.18) Added `fixedX` and `fixedY` to `LabelStyle` to fix label coordinates
* (2025.03.17) Added `backgroundGap` to `ItemStyle` to set data item background gap
## v3.14.0
**Key Highlights:**
Version Highlights:
* Added real-time sorting functionality for `Bar`
* Added support for `\n` line breaks in `itemFormatter` for `Tooltip`
@@ -89,7 +143,7 @@ slug: /changelog
* Added `speed` to `Animation` to specify animation speed
* Optimized column alignment in `Tooltip`
**Detailed Changelog:**
Changelog Details:
* (2025.03.15) Released version `v3.14.0`
* (2025.03.09) Fixed an issue where `Bar` displayed abnormally when placed in different `Grids` within the same `Chart`
@@ -111,7 +165,7 @@ slug: /changelog
## v3.13.0
Key Features:
Version Highlights:
* Added the `UIText` extension component
* Added the `UIToggle` extension component
@@ -121,7 +175,7 @@ Key Features:
* Added the `size2` parameter to `SymbolStyle` to support rectangular markers
* Other optimizations and bug fixes
Detailed Changelog:
Changelog Details:
* (2025.01.01) Released `v3.13.0`
* (2024.12.27) Added the `size2` parameter to `SymbolStyle` to support rectangular markers
@@ -168,7 +222,7 @@ Version Highlights:
* Adjusted and perfected the documentation
* Other optimizations and fixes
Log Details:
Changelog Details:
* (2024.09.30) Released version `v3.12.0`
* (2024.09.27) Improved the `5-minute tutorial`
@@ -201,7 +255,7 @@ Log Details:
## v3.11.0
Release Highlights:
Version Highlights:
* Added `Line3DChart` for 3D line charts
* Added `GraphChart` for relationship graphs

View File

@@ -176,6 +176,7 @@ slug: /configuration
- [AnimationAddition](#animationaddition)
- [AnimationChange](#animationchange)
- [AnimationExchange](#animationexchange)
- [AnimationFadeIn](#animationfadein)
- [AnimationFadeOut](#animationfadeout)
- [AnimationHiding](#animationhiding)
@@ -234,6 +235,14 @@ class in XCharts.Runtime / Inherits from: [AnimationInfo](#animationinfo)
Data change animation.
## AnimationExchange
class in XCharts.Runtime / Inherits from: [AnimationInfo](#animationinfo)
> Since `v3.15.0`
Data exchange animation. Generally used for animation of data sorting.
## AnimationFadeIn
class in XCharts.Runtime / Inherits from: [AnimationInfo](#animationinfo)
@@ -260,7 +269,7 @@ Data hiding animation.
## AnimationInfo
class in XCharts.Runtime / Subclasses: [AnimationFadeIn](#animationfadein), [AnimationFadeOut](#animationfadeout), [AnimationChange](#animationchange), [AnimationAddition](#animationaddition), [AnimationHiding](#animationhiding), [AnimationInteraction](#animationinteraction)
class in XCharts.Runtime / Subclasses: [AnimationFadeIn](#animationfadein), [AnimationFadeOut](#animationfadeout), [AnimationChange](#animationchange), [AnimationAddition](#animationaddition), [AnimationHiding](#animationhiding), [AnimationInteraction](#animationinteraction), [AnimationExchange](#animationexchange)
> Since `v3.8.0`
@@ -326,7 +335,7 @@ the mlvalue of width.
class in XCharts.Runtime / Inherits from: [ChildComponent](#childcomponent)
the animation of serie. support animation type: fadeIn, fadeOut, change, addition.
the animation of serie. support animation type: fadeIn, fadeOut, change, addition, exchange.
### AnimationStyle.addition
@@ -356,6 +365,12 @@ Options:
Whether to enable animation.
### AnimationStyle.exchange
[AnimationExchange](#animationexchange) `v3.15.0`
Exchange animation configuration. Valid in sort bar chart.
### AnimationStyle.fadeIn
[AnimationFadeIn](#animationfadein) `v3.8.0`
@@ -603,6 +618,12 @@ Base of logarithm, which is valid only for numeric axes with type: 'Log'.
On the log axis, if base e is the natural number, and is true, logBase fails.
### Axis.mainAxis
`bool` `false` `v3.15.0`
Whether it is the main axis. When both X and Y axes are of the same type, the axis set to main axis will determine the orientation, such as horizontal bar chart and vertical bar chart.
### Axis.max
`double`
@@ -789,6 +810,12 @@ Whether to display the last label.
Whether to display the first label.
### AxisLabel.showZeroLabel
`bool` `true` `v3.15.0`
Whether to display the zero label.
### AxisLabel.textLimit
[TextLimit](#textlimit)
@@ -807,6 +834,12 @@ Settings related to axis line.
the arrow of line.
### AxisLine.endExtendLength
`float`
Extend length of the axis line at the end.
### AxisLine.onZero
`bool`
@@ -819,6 +852,12 @@ When mutiple axes exists, this option can be used to specify which axis can be "
Whether to show the arrow symbol of axis.
### AxisLine.startExtendLength
`float`
Extend length of the axis line at the start.
## AxisMinorSplitLine
class in XCharts.Runtime / Inherits from: [BaseLine](#baseline)
@@ -1247,7 +1286,9 @@ class in XCharts.Runtime / Subclasses: [AnimationStyle](#animationstyle), [AxisA
class in XCharts.Runtime / Inherits from: [MainComponent](#maincomponent), [IPropertyChanged](#ipropertychanged)
comment of chart.
> Since `v3.15.0`
comment of chart. Used to annotate special information in the chart.
### Comment.items
@@ -1261,6 +1302,17 @@ The items of comment.
The text style of all comments.
### Comment.layer
[CommentLayer](#commentlayer) `v3.15.0`
The layer of comment.
Options:
- `Lower`: The comment is display under the serie.
- `Upper`: The comment is display above the serie.
### Comment.markStyle
[CommentMarkStyle](#commentmarkstyle)
@@ -1470,11 +1522,11 @@ Distance between dataZoom component and the left side of the container. left val
选取框样式。
### DataZoom.minShowNum
### DataZoom.minZoomRatio
`int` `2`
`float` `0.2f`
Minimum number of display data. Minimum number of data displayed when DataZoom is enlarged to maximum.
The minimum zoom ratio of dataZoom. Range 0f-1f.
### DataZoom.orient
@@ -2238,6 +2290,12 @@ class in XCharts.Runtime / Inherits from: [ChildComponent](#childcomponent), [IS
数据项背景颜色。
### ItemStyle.backgroundGap
`float` `v3.15.0`
the gap between background and data item.
### ItemStyle.backgroundWidth
`float`
@@ -2464,6 +2522,18 @@ the sytle of background.
the distance of label to axis line.
### LabelStyle.fixedX
`float` `0` `v3.15.0`
the fixed x of label. When not 0, it will be fixed on the specified x value.
### LabelStyle.fixedY
`float` `0` `v3.15.0`
the fixed y of label. When not 0, it will be fixed on the specified y value.
### LabelStyle.formatter
`string`
@@ -2615,6 +2685,12 @@ The distance between each legend, horizontal distance in horizontal layout, and
Image height of legend symbol.
### Legend.itemInactiveOpacity
`float` `1` `v3.15.0`
the opacity of item color when item is inactive.
### Legend.itemOpacity
`float` `1`
@@ -2690,11 +2766,11 @@ the limit of text.
class in XCharts.Runtime / Inherits from: [ComponentTheme](#componenttheme)
### LegendTheme.unableColor
### LegendTheme.inactiveColor
`Color`
the color of text.
the color when the component is inactive.
## Level
@@ -3110,11 +3186,11 @@ Special label types, are used to label maximum value, minimum value and so on.
Options:
- `None`: 标线类型
- `Min`: 最小值。
- `Max`: 最大值。
- `Average`: 平均值。
- `Median`: 中位数。
- `Custom`: Custom. You can customize the xy coordinates or values.
- `Min`: Minimum value.
- `Max`: Maximum value.
- `Average`: Average value.
- `Median`: Median.
### MarkLineData.xPosition
@@ -3303,6 +3379,17 @@ Distance between grid component and the top side of the container.
class in XCharts.Runtime / Inherits from: [Serie](#serie)
### Pie.pieType
[PieType](#pietype) `v3.15.0`
Pie chart type.
Options:
- `Solid`: solid pie chart - default fill style.
- `Wireframe`: wireframe pie chart - only show the outline wireframe.
### Pie.radiusGradient
`bool` `false` `v3.8.1`
@@ -3471,13 +3558,13 @@ The width of the bar. Adaptive when default 0.
`float` `2f`
斑马线的间距。
The gap of zebra bar. It is the distance between two zebra stripes. When the value is 0, there is no gap between stripes.
### Serie.barZebraWidth
`float` `4f`
斑马线的粗细。
The width of zebra bar. It is the width of each zebra stripe. When the value is 0, there is no zebra stripe.
### Serie.bottom
@@ -3581,6 +3668,12 @@ Index of layout component that serie uses. Default is -1 means not use layout, o
忽略数据的默认值。当ignore为true才有效。
### Serie.ignoreZeroOccupy
`bool` `false` `v3.15.0`
Whether to ignore the zero value bar occupy. When enabled, the bar with zero value will not occupy space, and the gap between bars will be automatically adjusted according to the actual displayed bars. Generally used in bar chart.
### Serie.index
`int`

View File

@@ -13,6 +13,7 @@ slug: /api
- [AnimationAddition](#animationaddition)
- [AnimationChange](#animationchange)
- [AnimationEasing](#animationeasing)
- [AnimationExchange](#animationexchange)
- [AnimationFadeIn](#animationfadein)
- [AnimationFadeOut](#animationfadeout)
- [AnimationHiding](#animationhiding)
@@ -70,6 +71,7 @@ slug: /api
- [ColorUtil](#colorutil)
- [Comment](#comment)
- [CommentItem](#commentitem)
- [CommentLayer](#commentlayer)
- [CommentMarkStyle](#commentmarkstyle)
- [ComponentHandlerAttribute](#componenthandlerattribute)
- [ComponentHelper](#componenthelper)
@@ -157,6 +159,7 @@ slug: /api
- [MainComponentContext](#maincomponentcontext)
- [MainComponentHandler](#maincomponenthandler)
- [MainComponentHandler<T>](#maincomponenthandlert)
- [MainComponentHandler<Title>](#maincomponenthandlertitle)
- [MarkArea](#markarea)
- [MarkAreaData](#markareadata)
- [MarkAreaType](#markareatype)
@@ -179,6 +182,7 @@ slug: /api
- [ParallelCoordContext](#parallelcoordcontext)
- [Pie](#pie)
- [PieChart](#piechart)
- [PieType](#pietype)
- [PolarAxisTheme](#polaraxistheme)
- [PolarChart](#polarchart)
- [PolarCoord](#polarcoord)
@@ -255,6 +259,7 @@ slug: /api
- [ThemeStyle](#themestyle)
- [ThemeType](#themetype)
- [Title](#title)
- [TitleHandler](#titlehandler)
- [TitleStyle](#titlestyle)
- [TitleTheme](#titletheme)
- [Tooltip](#tooltip)
@@ -360,6 +365,14 @@ class in XCharts.Runtime
- `Linear`:
## AnimationExchange
class in XCharts.Runtime / 继承自: [AnimationInfo](#animationinfo)
> 从 `v3.15.0` 开始支持
数据交换动画。一般用于图表数据排序时顺序变化的动画。
## AnimationFadeIn
class in XCharts.Runtime / 继承自: [AnimationInfo](#animationinfo)
@@ -386,7 +399,7 @@ class in XCharts.Runtime / 继承自: [AnimationInfo](#animationinfo)
## AnimationInfo
class in XCharts.Runtime / 子类: [AnimationFadeIn](#animationfadein),[AnimationFadeOut](#animationfadeout),[AnimationChange](#animationchange),[AnimationAddition](#animationaddition),[AnimationHiding](#animationhiding),[AnimationInteraction](#animationinteraction)
class in XCharts.Runtime / 子类: [AnimationFadeIn](#animationfadein),[AnimationFadeOut](#animationfadeout),[AnimationChange](#animationchange),[AnimationAddition](#animationaddition),[AnimationHiding](#animationhiding),[AnimationInteraction](#animationinteraction),[AnimationExchange](#animationexchange)
> 从 `v3.8.0` 开始支持
@@ -531,7 +544,7 @@ public float GetWidth(float width)
class in XCharts.Runtime / 继承自: [ChildComponent](#childcomponent)
动画组件用于控制图表的动画播放。支持配置五种动画表现FadeIn渐入动画FadeOut渐出动画Change变更动画Addition新增动画Interaction交互动画。 按作用的对象可以分为两类SerieAnimation系列动画和DataAnimation数据动画
动画组件用于控制图表的动画播放。支持配置五种动画表现FadeIn渐入动画FadeOut渐出动画Change变更动画Addition新增动画Interaction交互动画Exchange交换动画。 按作用的对象可以分为两类SerieAnimation系列动画和DataAnimation数据动画
### AnimationStyle.addition
@@ -548,6 +561,11 @@ public AnimationChange change
public bool enable
是否开启动画效果。
### AnimationStyle.exchange
public AnimationExchange exchange
交换动画配置。如在排序柱图中有效。
### AnimationStyle.fadeIn
public AnimationFadeIn fadeIn
@@ -639,6 +657,10 @@ public int GetCurrIndex()
public float GetCurrRate()
### AnimationStyle.GetExchangeDuration
public float GetExchangeDuration()
### AnimationStyle.GetInteractionDuration
public float GetInteractionDuration()
@@ -789,6 +811,14 @@ class in XCharts.Runtime / 继承自: [MainComponent](#maincomponent) / 子类:
直角坐标系的坐标轴组件。
### Axis.onLabelClick
public Action<int, string> onLabelClick
> 从 `v3.15.0` 开始支持
点击文本标签回调函数。参数labelIndex, labelName。
### Axis.AddData
public void AddData(string category)
@@ -888,7 +918,7 @@ public bool IsLog()
### Axis.IsNeedShowLabel
public bool IsNeedShowLabel(int index, int total = 0)
public bool IsNeedShowLabel(int index, int total = 0, string content = null)
### Axis.IsRight
@@ -1059,6 +1089,14 @@ class in XCharts / 继承自: [MainComponentHandler](#maincomponenthandler)
public T component
### AxisHandler<T>.DrawTop
// public override void DrawTop(VertexHelper vh)
### AxisHandler<T>.OnPointerClick
public override void OnPointerClick(PointerEventData eventData)
## AxisHelper
class in XCharts.Runtime
@@ -1097,7 +1135,7 @@ public static float GetAxisValueDistance(GridCoord grid, Axis axis, float scaleW
### AxisHelper.GetAxisValueLength
public static float GetAxisValueLength(GridCoord grid, Axis axis, float scaleWidth, double value)
public static float GetAxisValueLength(GridCoord grid, Axis axis, float scaleWidth, double value, float gap = 0)
获得数值value在坐标轴上对应的长度
### AxisHelper.GetAxisValuePosition
@@ -1184,7 +1222,7 @@ public override string GetFormatterContent(int labelIndex, int totalIndex, doubl
### AxisLabel.IsNeedShowLabel
public bool IsNeedShowLabel(int index, int total)
public bool IsNeedShowLabel(int index, int total, string content = null)
### AxisLabel.SetRelatedText
@@ -1674,6 +1712,10 @@ public Settings settings
public ThemeStyle theme
### BaseChart.topPainter
public Painter topPainter
### BaseChart.typeListForComponent
public Dictionary<Type, FieldInfo> typeListForComponent
@@ -1682,6 +1724,11 @@ public Dictionary<Type, FieldInfo> typeListForComponent
public Dictionary<Type, FieldInfo> typeListForSerie
### BaseChart.useUtc
public bool useUtc
图表的时间是否都显示为UTC时间。
### BaseChart.AddChartComponent
public MainComponent AddChartComponent(Type type)
@@ -1938,6 +1985,10 @@ public Color32 GetLegendRealShowNameColor(string name)
public int GetLegendRealShowNameIndex(string name)
### BaseChart.GetMainAxis
public Axis GetMainAxis()
### BaseChart.GetMarkColor
public Color32 GetMarkColor(Serie serie, SerieData serieData)
@@ -1996,10 +2047,6 @@ public float GetSerieTotalGap<T>(float categoryWidth, float gap, int index
public float GetSerieTotalWidth<T>(float categoryWidth, float gap, int realBarCount, int gridIndex) where T : Serie
### BaseChart.GetTitlePosition
public Vector3 GetTitlePosition(Title title)
### BaseChart.GetVisualMapOfSerie
public VisualMap GetVisualMapOfSerie(Serie serie)
@@ -2519,6 +2566,10 @@ public string warningInfo
public string CheckWarning()
检测警告信息。
### BaseGraph.GetTitlePosition
public Vector3 GetTitlePosition(Title title)
### BaseGraph.LocalPointToScreenPoint
public Vector2 LocalPointToScreenPoint(Vector2 localPoint)
@@ -2585,11 +2636,6 @@ public void RefreshAllComponent()
public virtual void RefreshGraph()
在下一帧刷新图形。
### BaseGraph.SaveAsImage
public void SaveAsImage(string imageType = "png", string savePath = "")
保存图表为图片。
### BaseGraph.ScreenPointToChartPoint
public bool ScreenPointToChartPoint(Vector2 screenPoint, out Vector2 chartPoint)
@@ -2847,6 +2893,14 @@ public static string ColorToStr(Color color)
public static string FloatToStr(double value, string numericFormatter = "F", int precision = 0)
### ChartCached.GetAxisLabelName
public static string GetAxisLabelName(int index)
### ChartCached.GetComponentObjectName
public static string GetComponentObjectName(MainComponent component)
### ChartCached.GetSerieLabelName
public static string GetSerieLabelName(string prefix, int i, int j)
@@ -2855,17 +2909,25 @@ public static string GetSerieLabelName(string prefix, int i, int j)
public static string GetString(string prefix, int suffix)
### ChartCached.GetTypeName
public static string GetTypeName(Type type)
### ChartCached.GetTypeName<T>
public static string GetTypeName<T>()
### ChartCached.IntToStr
public static string IntToStr(int value, string numericFormatter = "")
### ChartCached.NumberToDateStr
public static string NumberToDateStr(double timestamp, string formatter)
public static string NumberToDateStr(double timestamp, string formatter, bool local = false)
### ChartCached.NumberToDateTime
public static DateTime NumberToDateTime(double timestamp)
public static DateTime NumberToDateTime(double timestamp, bool local = false)
### ChartCached.NumberToStr
@@ -3111,10 +3173,6 @@ public static void RemoveTMPComponents(GameObject gameObject)
public static Vector3 RotateRound(Vector3 position, Vector3 center, Vector3 axis, float angle)
### ChartHelper.SaveAsImage
public static Texture2D SaveAsImage(RectTransform rectTransform, Canvas canvas, string imageType = "png", string path = "")
### ChartHelper.SetActive
public static bool SetActive(Image image, bool active)
@@ -3174,6 +3232,10 @@ public float GetTextWidth()
public float GetWidth()
### ChartLabel.InRect
public bool InRect(Vector2 local)
### ChartLabel.IsActiveByScale
public bool IsActiveByScale()
@@ -3428,13 +3490,20 @@ public static Color32 GetColor(string hexColorStr)
class in XCharts.Runtime / 继承自: [MainComponent](#maincomponent),[IPropertyChanged](#ipropertychanged)
图表注解组件。
> 从 `v3.15.0` 开始支持
图表注解组件。用于标注图表中的特殊信息。
### Comment.items
public List<CommentItem> items
注解项。每个注解组件可以设置多个注解项。
### Comment.layer
public CommentLayer layer
注解的显示层级。
### Comment.show
public bool show
@@ -3443,10 +3512,12 @@ public bool show
### Comment.GetLabelStyle
public LabelStyle GetLabelStyle(int index)
获取注解项的文本样式。
### Comment.GetMarkStyle
public CommentMarkStyle GetMarkStyle(int index)
获取注解项的标记样式。
### Comment.OnChanged
@@ -3478,6 +3549,17 @@ public CommentMarkStyle markStyle
public bool show
是否显示当前注解项。
## CommentLayer
class in XCharts.Runtime
注解的显示层级。
可选:
- `Lower`: 注解在系列下方。
- `Upper`: 注解在系列上方。
## CommentMarkStyle
class in XCharts.Runtime / 继承自: [ChildComponent](#childcomponent)
@@ -3763,17 +3845,17 @@ class in XCharts.Runtime
### DateTimeUtil.GetDateTime
public static DateTime GetDateTime(double timestamp, bool local = true)
public static DateTime GetDateTime(double timestamp, bool local = false)
### DateTimeUtil.GetDefaultDateTimeString
public static string GetDefaultDateTimeString(int timestamp, double range = 0)
public static string GetDefaultDateTimeString(double timestamp, double range = 0, bool local = false)
### DateTimeUtil.GetTimestamp
public static int GetTimestamp(DateTime time, bool local = false)
public static double GetTimestamp(DateTime time, bool local = false)
public static int GetTimestamp(string dateTime, bool local = false)
public static double GetTimestamp(string dateTime, bool local = false)
### DateTimeUtil.IsDateOrTimeRegex
@@ -4683,7 +4765,7 @@ public virtual string GetFormatterContent(int labelIndex, int totalIndex, double
### LabelStyle.GetFormatterDateTime
public string GetFormatterDateTime(int labelIndex, int totalIndex, double value, double minValue, double maxValue)
public string GetFormatterDateTime(int labelIndex, int totalIndex, double value, double minValue, double maxValue, bool local)
### LabelStyle.GetOffset
@@ -5687,6 +5769,10 @@ class in XCharts.Runtime / 继承自: [MainComponentHandler](#maincomponenthandl
public T component
## MainComponentHandler<Title>
class in / 子类: [TitleHandler](#titlehandler)
## MarkArea
class in XCharts.Runtime / 继承自: [MainComponent](#maincomponent)
@@ -5785,7 +5871,7 @@ class in XCharts.Runtime
可选:
- `None`: 标线类型
- `Custom`: 自定义。可自定义xy坐标或数值。
- `Min`: 最小值。
- `Max`: 最大值。
- `Average`: 平均值。
@@ -5982,10 +6068,6 @@ class in XCharts.Runtime / 继承自: [MaskableGraphic](https://docs.unity3d.com
public int index
### Painter.onPopulateMesh
public Action<VertexHelper, Painter> onPopulateMesh
### Painter.type
public Type type
@@ -6120,6 +6202,15 @@ public void DefaultLabelPieChart()
public void DefaultRadiusRosePieChart()
默认玫瑰饼图。
## PieType
class in XCharts.Runtime
可选:
- `Solid`: 实心饼图 - 默认填充样式
- `Wireframe`: 线框饼图 - 仅显示轮廓线框
## PolarAxisTheme
class in XCharts.Runtime / 继承自: [BaseAxisTheme](#baseaxistheme)
@@ -7141,12 +7232,12 @@ public double GetLastData()
### SerieData.GetMaxData
public double GetMaxData(bool inverse = false)
public double GetMaxData(bool inverse = false, int startDimensionIndex = 0)
最大值。
### SerieData.GetMinData
public double GetMinData(bool inverse = false)
public double GetMinData(bool inverse = false, int startDimensionIndex = 0)
最小值。
### SerieData.GetMinMaxData
@@ -7257,6 +7348,10 @@ class in XCharts.Runtime
public void Reset()
### SerieDataContext.UpdateExchangePosition
public void UpdateExchangePosition(ref float x, ref float y, float totalTime)
## SerieDataExtraFieldAttribute
class in XCharts.Runtime / 继承自: [Attribute](https://docs.unity3d.com/ScriptReference/30_search.html?q=attribute)
@@ -7685,6 +7780,10 @@ public override void RefreshLabelInternal()
public override void RefreshLabelNextFrame()
### SerieHandler<T>.RefreshTitleLabelInternal
public void RefreshTitleLabelInternal()
### SerieHandler<T>.RemoveComponent
public override void RemoveComponent()
@@ -8605,6 +8704,30 @@ public override void ClearComponentDirty()
public void OnChanged()
## TitleHandler
class in XCharts.Runtime / 继承自: [MainComponentHandler<Title>](#maincomponenthandlertitle)
### TitleHandler.AddSubTitleLabel
public static ChartLabel AddSubTitleLabel(Transform parent, Title title, ComponentTheme componentTheme, BaseChart chart = null)
### TitleHandler.AddTitleLabel
public static ChartLabel AddTitleLabel(Transform parent, Title title, ComponentTheme componentTheme, BaseChart chart = null)
### TitleHandler.AddTitleObject
public static GameObject AddTitleObject(BaseGraph graph, Title title, ComponentTheme componentTheme, int titleSiblingIndex, string objectName = null)
### TitleHandler.InitComponent
public override void InitComponent()
### TitleHandler.OnSerieDataUpdate
public override void OnSerieDataUpdate(int serieIndex)
## TitleStyle
class in XCharts.Runtime / 继承自: [LabelStyle](#labelstyle),[ISerieDataComponent](#iseriedatacomponent),[ISerieComponent](#iseriecomponent)

View File

@@ -6,6 +6,7 @@ slug: /changelog
# 更新日志
[master](#master)
[v3.15.0](#v3150)
[v3.14.0](#v3140)
[v3.13.0](#v3130)
[v3.12.1](#v3121)
@@ -80,6 +81,77 @@ slug: /changelog
## master
* (2026.06.03) 增加`Tooltip`通过`TitleLabelStyle``TextStyle``Alignment`设置标题的对齐方式 (#363)
* (2026.05.25) 增加`DataZoom``filterAxisRange`设置坐标轴的范围计算是否受`DataZoom`的影响
* (2026.05.23) 优化`DataZoom``Marquee`框选功能
* (2026.05.23) 修复`DataZoom`内绘制的折线图可能会超出范围的问题
* (2026.05.23) 修复`Axis``inverse`没能正确反转的问题
* (2026.05.23) 增加`LabelStyle``showCondition`,`showFilter`,`showThreshold`可控制`label`显示和隐藏
* (2026.05.22) 增加`LabelStyle``minGap`可避免`label`过于密集
* (2026.05.17) 修复`DataZoom`点击时指示区域不准的问题
* (2026.05.17) 增加`Legend``Width``Height`可设置固定宽高
* (2026.05.17) 修复`Serie``EndLabel``Y`轴是`MinMax`类型时显示的数值不对的问题
* (2026.05.16) 修复`Candlestick`按昨收判断涨跌颜色,一字涨停/跌停显示不对的问题 (#362)
* (2026.03.29) 修复`Legend``Background`区域在`Horizonal`模式下不对的问题
* (2026.03.25) 增加`Chart``Json`导出导入
* (2026.03.10) 增加`Sankey`的线条tooltip触发显示
* (2026.03.10) 增加`UITable`的排序功能支持
* (2026.03.07) 修复`UITable`在尺寸变化时背景没有实时刷新的问题
* (2026.03.06) 优化`UITable`支持万级以上数据量不卡顿
## v3.15.0
版本要点:
* __时间轴与缩放能力增强__新增 `DataZoom.minZoomRatio`(替代 `minShowNum`)、`Chart.useUtc`,并持续优化 `Axis Time` 在缩放与大年份场景下的表现。
* __柱图与坐标轴配置更灵活__新增 `Axis.mainAxis` 控制柱图朝向、`Serie.ignoreZeroOccupy` 控制 0 值柱是否占位、`AxisLine` 延长线配置等。
* __图表样式与交互能力提升__新增 `Pie.pieType``Legend.itemInactiveOpacity``Axis.onLabelClick``Animation.Exchange``LabelStyle.fixedX/fixedY` 等。
* __扩展 UI 组件持续完善__`UITable` 新增 `Title``Viewport` 配置,`UIStatistic.desc` 增强,`Comment.layer` 与坐标刷新体验优化。
* __稳定性与兼容性修复集中推进__修复 `SaveAsImage` 遮挡保存、`Pie` 点击失效、`TMP` 兼容、`Gantt` 时间区间与 2038 年问题、`MarkArea/GridCoord/Axis` 等多项关键问题。
日志详情:
* (2026.03.01) 发布`v3.15.0`版本
* (2026.02.26) 增加`Serie``ignoreZeroOccupy`可设置0数据的Bar是否占位 (#286)
* (2026.02.26) 修复`SaveAsImage`被其他组件遮挡时无法正常保存的问题 (#337)
* (2026.02.26) 增加`Axis``mainAxis`参数设置主轴可控制柱图的朝向 (#331)
* (2026.02.03) 修复`UITable``viewport`在不同的锚点下可能会绘制异常的问题
* (2026.01.15) 修复`Pie`的点击有时候不响应的问题 (#357)
* (2026.01.08) 增加`DataZoom``minZoomRatio`替换旧的`minShowNum` (#350)
* (2025.11.05) 修复`Axis``indicatorLabel`无法隐藏的问题
* (2025.11.03) 增加`Tooltip``Title`可通过`TitleLabelStyle``numericFormatter`格式化时间显示 (#353)
* (2025.10.30) 增加`Chart``useUtc`参数设置显示时间是否用UTC时间
* (2025.10.30) 优化`Candlestick`对时间轴的支持
* (2025.10.30) 增加`Scatter``ignore`支持设置忽略数据
* (2025.10.24) 优化`Sankey`的线条绘制排序
* (2025.10.22) 增加`Pie``pieType`支持实心饼图和线框柄图 (#349)
* (2025.09.05) 优化`MarkLine`的表现
* (2025.09.01) 增加`AxisLine``startExtendLength``endExtendLength`设置轴线的延长线
* (2025.08.27) 修复`Serie``TitleStyle`在数据变更时不及时刷新的问题
* (2025.05.19) 修复`TMP`开启时`Axis`运行报错
* (2025.04.25) 修复`MarkArea`指定`yValue``xValue`时绘制区域不准确的问题
* (2025.04.17) 增加`UITable``Title`支持设置标题
* (2025.04.17) 增加`UITable``Viewport`支持设置表格视口边距边框
* (2025.04.15) 增加`Bar`支持通过`VisualMap`设置颜色
* (2025.04.14) 增加`AxisLabel``showZeroLabel`设置是否显示0刻度
* (2025.04.08) 增加`UIStatistic``desc`描述文本设置支持
* (2025.04.07) 修复`Gantt`甘特图在有多维数据时计算的时间区间不准确的问题
* (2025.04.07) 优化`Axis``Time`时间轴支持设置Custom和ceilRate
* (2025.04.07) 修复`GridCoord`在设置背景色且Serie开启Clip时会覆盖图表的问题
* (2025.04.07) 修复`Gantt`甘特图年份大于2038时显示异常的问题
* (2025.04.07) 修复`Axis``Time`时间轴无法显示大于2038的年份的问题
* (2025.04.06) 修复`Axis``Time`时间轴在有`DataZoom`缩放时文本显示异常的问题
* (2025.03.28) 修复`Pie3D``avoidLabelOverlap`不生效的问题
* (2025.03.27) 增加`Legend``itemInactiveOpacity`可设置非激活状态时的颜色透明度 (#343)
* (2025.03.27) 增加`Axis``onLabelClick`回调事件
* (2025.03.26) 增加`Animation``Exchange`排序交换动画
* (2025.03.22) 增加`Comment``layer`设置层级
* (2025.03.21) 优化`Comment`的坐标刷新
* (2025.03.19) 增加`Serie``Label``formatter`支持`{index}`通配符
* (2025.03.18) 增加`Bar`可添加`TitleStyle`组件支持
* (2025.03.18) 增加`LabelStyle``fixedX``fixedY`可固定label的坐标
* (2025.03.17) 增加`ItemStyle``backgroundGap`可设置数据项背景间隙
## v3.14.0
版本要点:

View File

@@ -176,6 +176,7 @@ slug: /configuration
- [AnimationAddition](#animationaddition)
- [AnimationChange](#animationchange)
- [AnimationExchange](#animationexchange)
- [AnimationFadeIn](#animationfadein)
- [AnimationFadeOut](#animationfadeout)
- [AnimationHiding](#animationhiding)
@@ -234,6 +235,14 @@ class in XCharts.Runtime / 继承自: [AnimationInfo](#animationinfo)
数据变更动画。
## AnimationExchange
class in XCharts.Runtime / 继承自: [AnimationInfo](#animationinfo)
> 从 `v3.15.0` 开始支持
数据交换动画。一般用于图表数据排序时顺序变化的动画。
## AnimationFadeIn
class in XCharts.Runtime / 继承自: [AnimationInfo](#animationinfo)
@@ -260,7 +269,7 @@ class in XCharts.Runtime / 继承自: [AnimationInfo](#animationinfo)
## AnimationInfo
class in XCharts.Runtime / 子类: [AnimationFadeIn](#animationfadein), [AnimationFadeOut](#animationfadeout), [AnimationChange](#animationchange), [AnimationAddition](#animationaddition), [AnimationHiding](#animationhiding), [AnimationInteraction](#animationinteraction)
class in XCharts.Runtime / 子类: [AnimationFadeIn](#animationfadein), [AnimationFadeOut](#animationfadeout), [AnimationChange](#animationchange), [AnimationAddition](#animationaddition), [AnimationHiding](#animationhiding), [AnimationInteraction](#animationinteraction), [AnimationExchange](#animationexchange)
> 从 `v3.8.0` 开始支持
@@ -326,7 +335,7 @@ class in XCharts.Runtime / 继承自: [AnimationInfo](#animationinfo)
class in XCharts.Runtime / 继承自: [ChildComponent](#childcomponent)
动画组件用于控制图表的动画播放。支持配置五种动画表现FadeIn渐入动画FadeOut渐出动画Change变更动画Addition新增动画Interaction交互动画。 按作用的对象可以分为两类SerieAnimation系列动画和DataAnimation数据动画
动画组件用于控制图表的动画播放。支持配置五种动画表现FadeIn渐入动画FadeOut渐出动画Change变更动画Addition新增动画Interaction交互动画Exchange交换动画。 按作用的对象可以分为两类SerieAnimation系列动画和DataAnimation数据动画
### AnimationStyle.addition
@@ -356,6 +365,12 @@ class in XCharts.Runtime / 继承自: [ChildComponent](#childcomponent)
是否开启动画效果。
### AnimationStyle.exchange
[AnimationExchange](#animationexchange) `v3.15.0`
交换动画配置。如在排序柱图中有效。
### AnimationStyle.fadeIn
[AnimationFadeIn](#animationfadein) `v3.8.0`
@@ -603,6 +618,12 @@ class in XCharts.Runtime / 继承自: [MainComponent](#maincomponent) / 子类:
对数轴是否以自然数 e 为底数,为 true 时 logBase 失效。
### Axis.mainAxis
`bool` `false` `v3.15.0`
是否为主轴。当XY轴类型都相同时设置为主轴的轴会决定朝向如横向柱图和纵向柱图。
### Axis.max
`double`
@@ -789,6 +810,12 @@ class in XCharts.Runtime / 继承自: [LabelStyle](#labelstyle)
是否显示第一个文本。
### AxisLabel.showZeroLabel
`bool` `true` `v3.15.0`
是否显示0刻度文本。
### AxisLabel.textLimit
[TextLimit](#textlimit)
@@ -807,6 +834,12 @@ class in XCharts.Runtime / 继承自: [BaseLine](#baseline)
轴线箭头。
### AxisLine.endExtendLength
`float`
轴线终点延长线长度。
### AxisLine.onZero
`bool`
@@ -819,6 +852,12 @@ X 轴或者 Y 轴的轴线是否在另一个轴的 0 刻度上,只有在另一
是否显示箭头。
### AxisLine.startExtendLength
`float`
轴线起点延长线长度。
## AxisMinorSplitLine
class in XCharts.Runtime / 继承自: [BaseLine](#baseline)
@@ -1247,7 +1286,9 @@ class in XCharts.Runtime / 子类: [AnimationStyle](#animationstyle), [AxisAnima
class in XCharts.Runtime / 继承自: [MainComponent](#maincomponent), [IPropertyChanged](#ipropertychanged)
图表注解组件。
> 从 `v3.15.0` 开始支持
图表注解组件。用于标注图表中的特殊信息。
### Comment.items
@@ -1261,6 +1302,17 @@ class in XCharts.Runtime / 继承自: [MainComponent](#maincomponent), [IPropert
所有组件的文本样式。
### Comment.layer
[CommentLayer](#commentlayer) `v3.15.0`
注解的显示层级。
可选:
- `Lower`: 注解在系列下方。
- `Upper`: 注解在系列上方。
### Comment.markStyle
[CommentMarkStyle](#commentmarkstyle)
@@ -1470,11 +1522,11 @@ DataZoom 组件 用于区域缩放,从而能自由关注细节的数据信息
选取框样式。
### DataZoom.minShowNum
### DataZoom.minZoomRatio
`int` `2`
`float` `0.2f`
最小显示数据个数。当DataZoom放大到最大时最小显示的数据个数
缩放区域组件的最小缩放比例范围0f-1f
### DataZoom.orient
@@ -2238,6 +2290,12 @@ class in XCharts.Runtime / 继承自: [ChildComponent](#childcomponent), [ISerie
数据项背景颜色。
### ItemStyle.backgroundGap
`float` `v3.15.0`
数据项背景间隙。
### ItemStyle.backgroundWidth
`float`
@@ -2464,6 +2522,18 @@ class in XCharts.Runtime / 继承自: [ChildComponent](#childcomponent), [ISerie
距离轴线的距离。
### LabelStyle.fixedX
`float` `0` `v3.15.0`
固定的X值。不为0时会固定在指定的X值上。
### LabelStyle.fixedY
`float` `0` `v3.15.0`
固定的Y值。不为0时会固定在指定的Y值上。
### LabelStyle.formatter
`string`
@@ -2615,6 +2685,12 @@ class in XCharts.Runtime / 继承自: [MainComponent](#maincomponent), [IPropert
图例标记的图形高度。
### Legend.itemInactiveOpacity
`float` `1` `v3.15.0`
图例标记的图形在非激活状态下的颜色透明度。
### Legend.itemOpacity
`float` `1`
@@ -2690,11 +2766,11 @@ class in XCharts.Runtime / 继承自: [MainComponent](#maincomponent), [IPropert
class in XCharts.Runtime / 继承自: [ComponentTheme](#componenttheme)
### LegendTheme.unableColor
### LegendTheme.inactiveColor
`Color`
文本颜色。
非激活状态时的颜色。
## Level
@@ -3110,7 +3186,7 @@ class in XCharts.Runtime / 继承自: [ChildComponent](#childcomponent)
可选:
- `None`: 标线类型
- `Custom`: 自定义。可自定义xy坐标或数值。
- `Min`: 最小值。
- `Max`: 最大值。
- `Average`: 平均值。
@@ -3120,25 +3196,25 @@ class in XCharts.Runtime / 继承自: [ChildComponent](#childcomponent)
`float`
相对原点的 x 坐标单位像素。当type为None时有效。
相对原点的 x 坐标单位像素。当type为Custom时有效。
### MarkLineData.xValue
`double`
X轴上的指定值。当X轴为类目轴时指定值表示类目轴数据的索引否则为具体的值。当type为None时有效。
X轴上的指定值。当X轴为类目轴时指定值表示类目轴数据的索引否则为具体的值。当type为Custom时有效。
### MarkLineData.yPosition
`float`
相对原点的 y 坐标单位像素。当type为None时有效。
相对原点的 y 坐标单位像素。当type为Custom时有效。
### MarkLineData.yValue
`double`
Y轴上的指定值。当Y轴为类目轴时指定值表示类目轴数据的索引否则为具体的值。当type为None时有效。
Y轴上的指定值。当Y轴为类目轴时指定值表示类目轴数据的索引否则为具体的值。当type为Custom时有效。
### MarkLineData.zeroPosition
@@ -3303,6 +3379,17 @@ grid 组件离容器上侧的距离。
class in XCharts.Runtime / 继承自: [Serie](#serie)
### Pie.pieType
[PieType](#pietype) `v3.15.0`
饼图类型。
可选:
- `Solid`: 实心饼图 - 默认填充样式
- `Wireframe`: 线框饼图 - 仅显示轮廓线框
### Pie.radiusGradient
`bool` `false` `v3.8.1`
@@ -3581,6 +3668,12 @@ class in XCharts.Runtime / 继承自: [BaseSerie](#baseserie), [IComparable](htt
忽略数据的默认值。当ignore为true才有效。
### Serie.ignoreZeroOccupy
`bool` `false` `v3.15.0`
柱图是否忽略值为0的柱子占位。开启后值为0的柱子将不会占用空间柱子之间的间距会根据实际显示的柱子自动调整。一般用在柱状图中。
### Serie.index
`int`

View File

@@ -19,6 +19,8 @@ namespace XCharts.Editor
public static readonly GUIContent btnSaveAsImage = new GUIContent("Save As Image", "");
public static readonly GUIContent btnCheckWarning = new GUIContent("Check Warning", "");
public static readonly GUIContent btnHideWarning = new GUIContent("Hide Warning", "");
public static readonly GUIContent btnImportJsonData = new GUIContent("Import Json", "");
public static readonly GUIContent btnExportJsonData = new GUIContent("Export Json", "");
}
protected BaseChart m_Chart;
protected SerializedProperty m_Script;
@@ -26,6 +28,7 @@ namespace XCharts.Editor
protected SerializedProperty m_Settings;
protected SerializedProperty m_Theme;
protected SerializedProperty m_ChartName;
protected SerializedProperty m_UseUtc;
protected SerializedProperty m_DebugInfo;
protected SerializedProperty m_RaycastTarget;
@@ -35,6 +38,7 @@ namespace XCharts.Editor
private bool m_BaseFoldout;
private bool m_CheckWarning = false;
private bool m_ExportPending = false;
private int m_LastComponentCount = 0;
private int m_LastSerieCount = 0;
private string m_VersionString = "";
@@ -49,6 +53,7 @@ namespace XCharts.Editor
m_Script = serializedObject.FindProperty("m_Script");
m_EnableTextMeshPro = serializedObject.FindProperty("m_EnableTextMeshPro");
m_ChartName = serializedObject.FindProperty("m_ChartName");
m_UseUtc = serializedObject.FindProperty("m_UseUtc");
m_Theme = serializedObject.FindProperty("m_Theme");
m_Settings = serializedObject.FindProperty("m_Settings");
m_DebugInfo = serializedObject.FindProperty("m_DebugInfo");
@@ -124,6 +129,7 @@ namespace XCharts.Editor
{
EditorGUILayout.PropertyField(m_Script);
EditorGUILayout.PropertyField(m_ChartName);
EditorGUILayout.PropertyField(m_UseUtc);
EditorGUILayout.PropertyField(m_RaycastTarget);
if (XChartsMgr.IsRepeatChartName(m_Chart, m_ChartName.stringValue))
{
@@ -282,7 +288,7 @@ namespace XCharts.Editor
}
if (GUILayout.Button(Styles.btnSaveAsImage))
{
m_Chart.SaveAsImage();
m_Chart.SaveAsImage("png", "", 4f);
}
if (m_CheckWarning)
{
@@ -297,6 +303,14 @@ namespace XCharts.Editor
m_CheckWarning = false;
}
EditorGUILayout.EndHorizontal();
if (GUILayout.Button(Styles.btnImportJsonData))
{
ChartJsonImportWindow.ShowWindow(m_Chart);
}
if (GUILayout.Button(Styles.btnExportJsonData))
{
RequestExportJsonData();
}
sb.Length = 0;
sb.AppendFormat("v{0}", XChartsMgr.fullVersion);
if (!string.IsNullOrEmpty(m_Chart.warningInfo))
@@ -318,8 +332,47 @@ namespace XCharts.Editor
m_CheckWarning = true;
m_Chart.CheckWarning();
}
if (GUILayout.Button(Styles.btnImportJsonData))
{
ChartJsonImportWindow.ShowWindow(m_Chart);
}
if (GUILayout.Button(Styles.btnExportJsonData))
{
RequestExportJsonData();
}
}
}
private void RequestExportJsonData()
{
if (m_ExportPending) return;
m_ExportPending = true;
var chart = m_Chart;
EditorApplication.delayCall += delegate()
{
m_ExportPending = false;
ExportJsonData(chart);
};
GUIUtility.ExitGUI();
}
private static void ExportJsonData(BaseChart chart)
{
if (chart == null) return;
var json = chart.ExportToJson(true);
var defaultName = chart.gameObject.name + ".json";
var path = EditorUtility.SaveFilePanel("Save Chart JSON", "", defaultName, "json");
if (string.IsNullOrEmpty(path)) return;
try
{
System.IO.File.WriteAllText(path, json);
Debug.Log("[XCharts] JSON exported to: " + path);
}
catch (Exception ex)
{
Debug.LogError("[XCharts] Failed to save JSON: " + ex.Message);
}
}
}
}

View File

@@ -71,6 +71,21 @@ namespace XCharts.Editor
}
}
[CustomPropertyDrawer(typeof(XCharts.Runtime.AnimationExchange), true)]
public class AnimationExchangeDrawer : BasePropertyDrawer
{
public override void OnGUI(Rect pos, SerializedProperty prop, GUIContent label)
{
base.OnGUI(pos, prop, label);
if (MakeComponentFoldout(prop, "m_Enable", true))
{
++EditorGUI.indentLevel;
PropertyField(prop, "m_Duration");
--EditorGUI.indentLevel;
}
}
}
[CustomPropertyDrawer(typeof(AnimationStyle), true)]
public class AnimationDrawer : BasePropertyDrawer
{
@@ -88,6 +103,7 @@ namespace XCharts.Editor
PropertyField(prop, "m_Change");
PropertyField(prop, "m_Addition");
PropertyField(prop, "m_Interaction");
PropertyField(prop, "m_Exchange");
--EditorGUI.indentLevel;
}
}

View File

@@ -113,6 +113,15 @@ namespace XCharts.Editor
}
}
protected void PropertyFlagsField(SerializedProperty prop, string relativePropName, System.Type enumType)
{
if (IngorePropertys.Contains(relativePropName)) return;
if (!ChartEditorHelper.PropertyFlagsField(ref m_DrawRect, m_Heights, m_KeyName, prop, relativePropName, enumType))
{
Debug.LogError("PropertyFlagsField ERROR:" + prop.displayName + ", " + relativePropName);
}
}
protected void PropertyFieldLimitMin(SerializedProperty prop, string relativePropName, float minValue)
{
if (IngorePropertys.Contains(relativePropName)) return;

View File

@@ -102,7 +102,7 @@ namespace XCharts.Editor
protected override void DrawExtendeds(SerializedProperty prop)
{
base.DrawExtendeds(prop);
PropertyField(prop, "m_UnableColor");
PropertyField(prop, "m_InactiveColor");
}
}

View File

@@ -21,6 +21,7 @@ namespace XCharts.Editor
PropertyField(prop, "m_MarkColor");
PropertyField(prop, "m_BackgroundColor");
PropertyField(prop, "m_BackgroundWidth");
PropertyField(prop, "m_BackgroundGap");
PropertyField(prop, "m_CenterColor");
PropertyField(prop, "m_CenterGap");
PropertyField(prop, "m_BorderWidth");

View File

@@ -24,6 +24,12 @@ namespace XCharts.Editor
PropertyField(prop, "m_Rotate");
PropertyField(prop, "m_Width");
PropertyField(prop, "m_Height");
PropertyField(prop, "m_FixedX");
PropertyField(prop, "m_FixedY");
PropertyField(prop, "m_ShowCondition");
PropertyField(prop, "m_ShowFilter");
PropertyField(prop, "m_ShowThreshold");
PropertyField(prop, "m_ShowMinGap");
PropertyField(prop, "m_Icon");
PropertyField(prop, "m_Background");
PropertyField(prop, "m_TextStyle");

View File

@@ -29,6 +29,8 @@ namespace XCharts.Editor
{
base.DrawExtendeds(prop);
PropertyField(prop, "m_OnZero");
PropertyField(prop, "m_StartExtendLength");
PropertyField(prop, "m_EndExtendLength");
PropertyField(prop, "m_ShowArrow");
PropertyField(prop, "m_Arrow");
}

View File

@@ -102,10 +102,24 @@ namespace XCharts.Editor
}
[ComponentEditor(typeof(XAxis))]
public class XAxisEditor : AxisEditor { }
public class XAxisEditor : AxisEditor
{
protected override void DrawExtendeds()
{
base.DrawExtendeds();
PropertyField("m_MainAxis");
}
}
[ComponentEditor(typeof(YAxis))]
public class YAxisEditor : AxisEditor { }
public class YAxisEditor : AxisEditor
{
protected override void DrawExtendeds()
{
base.DrawExtendeds();
PropertyField("m_MainAxis");
}
}
[ComponentEditor(typeof(XAxis3D))]
public class XAxis3DEditor : AxisEditor { }
@@ -164,6 +178,7 @@ namespace XCharts.Editor
PropertyField(prop, "m_ShowAsPositiveNumber");
PropertyField(prop, "m_OnZero");
PropertyField(prop, "m_ShowZeroLabel");
PropertyField(prop, "m_ShowStartLabel");
PropertyField(prop, "m_ShowEndLabel");

View File

@@ -9,6 +9,7 @@ namespace XCharts.Editor
public override void OnInspectorGUI()
{
++EditorGUI.indentLevel;
PropertyField("m_Layer");
PropertyField("m_LabelStyle");
//PropertyField("m_MarkStyle");
PropertyListField("m_Items", true);

View File

@@ -13,7 +13,7 @@ namespace XCharts.Editor
var m_SupportMarquee = baseProperty.FindPropertyRelative("m_SupportMarquee");
var m_Start = baseProperty.FindPropertyRelative("m_Start");
var m_End = baseProperty.FindPropertyRelative("m_End");
var m_MinShowNum = baseProperty.FindPropertyRelative("m_MinShowNum");
var m_MinZoomRatio = baseProperty.FindPropertyRelative("m_MinZoomRatio");
++EditorGUI.indentLevel;
PropertyField("m_Orient");
PropertyField("m_SupportInside");
@@ -28,13 +28,15 @@ namespace XCharts.Editor
PropertyField("m_ScrollSensitivity");
PropertyField("m_RangeMode");
PropertyField(m_Start);
PropertyField(m_End);
PropertyField("m_StartLock");
PropertyField(m_End);
PropertyField("m_EndLock");
PropertyField(m_MinShowNum);
PropertyField(m_MinZoomRatio);
PropertyField("m_FilterAxisRange");
if (m_Start.floatValue < 0) m_Start.floatValue = 0;
if (m_End.floatValue > 100) m_End.floatValue = 100;
if (m_MinShowNum.intValue < 0) m_MinShowNum.intValue = 0;
if (m_MinZoomRatio.floatValue < 0) m_MinZoomRatio.floatValue = 0;
if (m_MinZoomRatio.floatValue > 1) m_MinZoomRatio.floatValue = 1;
if (m_SupportSlider.boolValue)
{
PropertyField("m_ShowDataShadow");

View File

@@ -10,11 +10,14 @@ namespace XCharts.Editor
{
++EditorGUI.indentLevel;
PropertyField("m_IconType");
PropertyField("m_Width");
PropertyField("m_Height");
PropertyField("m_ItemWidth");
PropertyField("m_ItemHeight");
PropertyField("m_ItemGap");
PropertyField("m_ItemAutoColor");
PropertyField("m_ItemOpacity");
PropertyField("m_ItemInactiveOpacity");
PropertyField("m_SelectedMode");
PropertyField("m_Orient");
PropertyField("m_Location");

View File

@@ -34,7 +34,7 @@ namespace XCharts.Editor
PropertyField(prop, "m_Name");
switch (type)
{
case MarkLineType.None:
case MarkLineType.Custom:
PropertyField(prop, "m_XPosition");
PropertyField(prop, "m_YPosition");
PropertyField(prop, "m_XValue");
@@ -48,7 +48,7 @@ namespace XCharts.Editor
break;
}
PropertyField(prop, "m_Group");
if (group > 0 && type == MarkLineType.None) PropertyField(prop, "m_ZeroPosition");
if (group > 0 && type == MarkLineType.Custom) PropertyField(prop, "m_ZeroPosition");
PropertyField(prop, "m_LineStyle");
PropertyField(prop, "m_StartSymbol");
PropertyField(prop, "m_EndSymbol");

View File

@@ -13,10 +13,13 @@ namespace XCharts.Editor
public static readonly GUIContent btnAddComponent = new GUIContent("Add Main Component", "");
public static readonly GUIContent btnRebuildChartObject = new GUIContent("Rebuild Object", "");
public static readonly GUIContent btnSaveAsImage = new GUIContent("Save As Image", "");
public static readonly GUIContent btnImportJsonData = new GUIContent("Import Json", "");
public static readonly GUIContent btnExportJsonData = new GUIContent("Export Json", "");
public static readonly GUIContent btnCheckWarning = new GUIContent("Check Warning", "");
public static readonly GUIContent btnHideWarning = new GUIContent("Hide Warning", "");
}
public UIComponent m_UIComponent;
private bool m_ExportPending;
public static T AddUIComponent<T>(string chartName) where T : UIComponent
{
@@ -54,7 +57,15 @@ namespace XCharts.Editor
}
if (GUILayout.Button(Styles.btnSaveAsImage))
{
m_UIComponent.SaveAsImage();
m_UIComponent.SaveAsImage("png", "", 4f);
}
if (GUILayout.Button(Styles.btnImportJsonData))
{
UIComponentJsonImportWindow.ShowWindow(m_UIComponent);
}
if (GUILayout.Button(Styles.btnExportJsonData))
{
RequestExportJsonData();
}
OnDebugEndInspectorGUI();
}
@@ -89,6 +100,37 @@ namespace XCharts.Editor
EditorGUILayout.PropertyField(property, title);
}
private void RequestExportJsonData()
{
if (m_ExportPending) return;
m_ExportPending = true;
var target = m_UIComponent;
EditorApplication.delayCall += delegate ()
{
m_ExportPending = false;
ExportJsonData(target);
};
GUIUtility.ExitGUI();
}
private static void ExportJsonData(UIComponent target)
{
if (target == null) return;
var json = target.ExportToJson(true);
var defaultName = target.gameObject.name + ".json";
var path = EditorUtility.SaveFilePanel("Save UI Component JSON", "", defaultName, "json");
if (string.IsNullOrEmpty(path)) return;
try
{
System.IO.File.WriteAllText(path, json);
Debug.Log("[XCharts] UI JSON exported to: " + path);
}
catch (System.Exception ex)
{
Debug.LogError("[XCharts] Failed to save UI JSON: " + ex.Message);
}
}
protected void PropertyListField(string relativePropName, bool showOrder = true, params HeaderMenuInfo[] menus)
{
var m_DrawRect = GUILayoutUtility.GetRect(1f, 17f);

View File

@@ -22,6 +22,7 @@ namespace XCharts.Editor
PropertyField("m_BarWidth");
PropertyField("m_BarGap");
PropertyField("m_BarMaxWidth");
PropertyField("m_IgnoreZeroOccupy");
PropertyField("m_RealtimeSort");
if(serie.useSortData)
{

View File

@@ -8,6 +8,7 @@ namespace XCharts.Editor
public override void OnCustomInspectorGUI()
{
PropertyField("m_GridIndex");
PropertyField("m_PieType");
PropertyField("m_RoseType");
PropertyField("m_Gap");
PropertyTwoFiled("m_Center");

View File

@@ -18,6 +18,8 @@ namespace XCharts.Editor
}
PropertyField("m_MaxCache");
PropertyField("m_Clip");
PropertyField("m_Ignore");
PropertyField("m_IgnoreValue");
PropertyField("m_Symbol");
PropertyField("m_ItemStyle");

View File

@@ -507,6 +507,28 @@ namespace XCharts.Editor
{
return PropertyField(ref drawRect, heights, key, parentProp.FindPropertyRelative(relativeName));
}
public static bool PropertyFlagsField(ref Rect drawRect, Dictionary<string, float> heights, string key,
SerializedProperty parentProp, string relativeName, System.Type enumType)
{
return PropertyFlagsField(ref drawRect, heights, key, parentProp.FindPropertyRelative(relativeName), enumType);
}
public static bool PropertyFlagsField(ref Rect drawRect, Dictionary<string, float> heights, string key,
SerializedProperty prop, System.Type enumType)
{
if (prop == null) return false;
var label = GetContent(prop.displayName);
var enumValue = (System.Enum)System.Enum.ToObject(enumType, prop.intValue);
EditorGUI.BeginChangeCheck();
var newValue = EditorGUI.EnumFlagsField(drawRect, label, enumValue);
if (EditorGUI.EndChangeCheck())
prop.intValue = (int)(object)newValue;
var hig = EditorGUIUtility.singleLineHeight + EditorGUIUtility.standardVerticalSpacing;
drawRect.y += hig;
heights[key] += hig;
return true;
}
public static bool PropertyFieldWithMinValue(ref Rect drawRect, Dictionary<string, float> heights, string key,
SerializedProperty parentProp, string relativeName, float minValue)
{

View File

@@ -0,0 +1,201 @@
using UnityEditor;
using UnityEngine;
using XCharts.Runtime;
namespace XCharts.Editor
{
public class ChartJsonImportWindow : EditorWindow
{
private const int TEXTAREA_SAFE_CHAR_LIMIT = 8000;
private const int LARGE_JSON_PREVIEW_CHAR_LIMIT = 4000;
private static BaseChart s_TargetChart;
private string m_JsonInput = "";
private Vector2 m_ScrollPos;
private bool m_ShowPreview = false;
private string m_PreviewText = "";
private bool m_OpenFilePending = false;
private bool m_PreviewPending = false;
private bool m_ImportPending = false;
public static void ShowWindow(BaseChart targetChart)
{
s_TargetChart = targetChart;
var window = GetWindow<ChartJsonImportWindow>("Import Chart JSON");
window.minSize = new Vector2(600, 400);
window.Show();
}
private void OnGUI()
{
if (s_TargetChart == null)
{
EditorGUILayout.HelpBox("Target chart is null. Please select a chart first.", MessageType.Error);
if (GUILayout.Button("Close")) Close();
return;
}
if (m_JsonInput == null) m_JsonInput = "";
EditorGUILayout.LabelField("Target Chart: " + s_TargetChart.gameObject.name, EditorStyles.boldLabel);
GUILayout.Space(10);
EditorGUILayout.LabelField("Paste JSON Data:", EditorStyles.boldLabel);
using (var scroll = new EditorGUILayout.ScrollViewScope(m_ScrollPos, GUILayout.Height(250)))
{
m_ScrollPos = scroll.scrollPosition;
if (m_JsonInput.Length <= TEXTAREA_SAFE_CHAR_LIMIT)
{
m_JsonInput = EditorGUILayout.TextArea(m_JsonInput, GUILayout.ExpandHeight(true), GUILayout.ExpandWidth(true));
}
else
{
var preview = m_JsonInput.Substring(0, LARGE_JSON_PREVIEW_CHAR_LIMIT);
EditorGUILayout.HelpBox("JSON content is very large. To avoid editor text rendering limits, only a preview is shown below. Import uses full content.", MessageType.Info);
EditorGUILayout.TextArea(preview, GUILayout.ExpandHeight(true), GUILayout.ExpandWidth(true));
}
}
EditorGUILayout.HelpBox("Paste JSON directly, or click Open Json File.", MessageType.Info);
GUILayout.Space(10);
using (new EditorGUILayout.HorizontalScope())
{
if (GUILayout.Button("Open Json File", GUILayout.Width(120)))
{
RequestOpenJsonFile();
}
if (GUILayout.Button("Preview", GUILayout.Width(100)))
{
RequestPreviewJson();
}
}
if (m_ShowPreview && !string.IsNullOrEmpty(m_PreviewText))
{
EditorGUILayout.TextArea(m_PreviewText, GUILayout.Height(150));
}
GUILayout.Space(10);
using (new EditorGUILayout.HorizontalScope())
{
if (GUILayout.Button("Import", GUILayout.Height(40), GUILayout.Width(150)))
{
RequestImportJson();
}
if (GUILayout.Button("Cancel", GUILayout.Height(40), GUILayout.Width(150))) Close();
}
}
private void RequestOpenJsonFile()
{
if (m_OpenFilePending) return;
m_OpenFilePending = true;
EditorApplication.delayCall += delegate ()
{
m_OpenFilePending = false;
if (this == null) return;
OpenJsonFile();
Repaint();
};
GUIUtility.ExitGUI();
}
private void RequestPreviewJson()
{
if (m_PreviewPending) return;
m_PreviewPending = true;
EditorApplication.delayCall += delegate ()
{
m_PreviewPending = false;
if (this == null) return;
PreviewJson();
Repaint();
};
GUIUtility.ExitGUI();
}
private void RequestImportJson()
{
if (m_ImportPending) return;
m_ImportPending = true;
EditorApplication.delayCall += delegate ()
{
m_ImportPending = false;
if (this == null) return;
ImportJson();
};
GUIUtility.ExitGUI();
}
private void PreviewJson()
{
if (string.IsNullOrEmpty(m_JsonInput))
{
EditorUtility.DisplayDialog("Error", "JSON input is empty.", "OK");
return;
}
try
{
var json = JsonUtility.FromJson<XCharts.Runtime.ChartJson>(m_JsonInput);
if (json == null)
{
m_PreviewText = "Invalid JSON or unsupported schema.";
}
else
{
var componentCount = json.components != null ? json.components.Count : 0;
var seriesCount = json.series != null ? json.series.Count : 0;
m_PreviewText = "Chart Type: " + json.chartType + "\nComponents: " + componentCount + "\nSeries: " + seriesCount + "\n(Full validation on import)";
}
m_ShowPreview = true;
}
catch (System.Exception ex)
{
EditorUtility.DisplayDialog("Preview Error", "Invalid JSON: " + ex.Message, "OK");
}
}
private void ImportJson()
{
if (string.IsNullOrEmpty(m_JsonInput))
{
EditorUtility.DisplayDialog("Error", "JSON input is empty. Please paste JSON data.", "OK");
return;
}
try
{
Undo.RecordObject(s_TargetChart, "Import Chart JSON");
s_TargetChart.ImportFromJson(m_JsonInput);
s_TargetChart.RebuildChartObject();
s_TargetChart.RefreshAllComponent();
s_TargetChart.RefreshChart();
EditorUtility.SetDirty(s_TargetChart);
UnityEditor.SceneView.RepaintAll();
var chart = s_TargetChart;
EditorApplication.delayCall += delegate ()
{
if (chart == null) return;
chart.RefreshAllComponent();
chart.RefreshChart();
UnityEditor.SceneView.RepaintAll();
};
EditorUtility.DisplayDialog("Success", "Chart '" + s_TargetChart.gameObject.name + "' imported successfully!", "OK");
Close();
}
catch (System.Exception ex)
{
EditorUtility.DisplayDialog("Import Error", "Failed to import JSON:\n" + ex.Message + "\n\n" + ex.StackTrace, "OK");
}
}
private void OpenJsonFile()
{
var path = EditorUtility.OpenFilePanel("Open Chart JSON", "", "json");
if (string.IsNullOrEmpty(path)) return;
try
{
m_JsonInput = System.IO.File.ReadAllText(path);
m_ShowPreview = false;
m_PreviewText = "";
}
catch (System.Exception ex)
{
EditorUtility.DisplayDialog("Open File Error", "Failed to read JSON file:\n" + ex.Message, "OK");
}
}
}
}

View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 21f2eafb07ab34d4abf575784acc56a3
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,193 @@
using UnityEditor;
using UnityEngine;
using XCharts.Runtime;
namespace XCharts.Editor
{
public class UIComponentJsonImportWindow : EditorWindow
{
private const int TEXTAREA_SAFE_CHAR_LIMIT = 8000;
private const int LARGE_JSON_PREVIEW_CHAR_LIMIT = 4000;
private static UIComponent s_TargetComponent;
private string m_JsonInput = "";
private Vector2 m_ScrollPos;
private bool m_ShowPreview = false;
private string m_PreviewText = "";
private bool m_OpenFilePending = false;
private bool m_PreviewPending = false;
private bool m_ImportPending = false;
public static void ShowWindow(UIComponent target)
{
s_TargetComponent = target;
var window = GetWindow<UIComponentJsonImportWindow>("Import UI JSON");
window.minSize = new Vector2(600, 400);
window.Show();
}
private void OnGUI()
{
if (s_TargetComponent == null)
{
EditorGUILayout.HelpBox("Target UI component is null. Please select a component first.", MessageType.Error);
if (GUILayout.Button("Close")) Close();
return;
}
if (m_JsonInput == null) m_JsonInput = "";
EditorGUILayout.LabelField("Target: " + s_TargetComponent.gameObject.name + " (" + s_TargetComponent.GetType().Name + ")", EditorStyles.boldLabel);
GUILayout.Space(10);
EditorGUILayout.LabelField("Paste JSON Data:", EditorStyles.boldLabel);
using (var scroll = new EditorGUILayout.ScrollViewScope(m_ScrollPos, GUILayout.Height(250)))
{
m_ScrollPos = scroll.scrollPosition;
if (m_JsonInput.Length <= TEXTAREA_SAFE_CHAR_LIMIT)
{
m_JsonInput = EditorGUILayout.TextArea(m_JsonInput, GUILayout.ExpandHeight(true), GUILayout.ExpandWidth(true));
}
else
{
var preview = m_JsonInput.Substring(0, LARGE_JSON_PREVIEW_CHAR_LIMIT);
EditorGUILayout.HelpBox("JSON content is very large. Only a preview is shown below. Import uses full content.", MessageType.Info);
EditorGUILayout.TextArea(preview, GUILayout.ExpandHeight(true), GUILayout.ExpandWidth(true));
}
}
EditorGUILayout.HelpBox("Paste JSON directly, or click Open Json File.", MessageType.Info);
GUILayout.Space(10);
using (new EditorGUILayout.HorizontalScope())
{
if (GUILayout.Button("Open Json File", GUILayout.Width(120))) RequestOpenJsonFile();
if (GUILayout.Button("Preview", GUILayout.Width(100))) RequestPreviewJson();
}
if (m_ShowPreview && !string.IsNullOrEmpty(m_PreviewText))
{
EditorGUILayout.TextArea(m_PreviewText, GUILayout.Height(120));
}
GUILayout.Space(10);
using (new EditorGUILayout.HorizontalScope())
{
if (GUILayout.Button("Import", GUILayout.Height(40), GUILayout.Width(150))) RequestImportJson();
if (GUILayout.Button("Cancel", GUILayout.Height(40), GUILayout.Width(150))) Close();
}
}
private void RequestOpenJsonFile()
{
if (m_OpenFilePending) return;
m_OpenFilePending = true;
EditorApplication.delayCall += delegate ()
{
m_OpenFilePending = false;
if (this == null) return;
OpenJsonFile();
Repaint();
};
GUIUtility.ExitGUI();
}
private void RequestPreviewJson()
{
if (m_PreviewPending) return;
m_PreviewPending = true;
EditorApplication.delayCall += delegate ()
{
m_PreviewPending = false;
if (this == null) return;
PreviewJson();
Repaint();
};
GUIUtility.ExitGUI();
}
private void RequestImportJson()
{
if (m_ImportPending) return;
m_ImportPending = true;
EditorApplication.delayCall += delegate ()
{
m_ImportPending = false;
if (this == null) return;
ImportJson();
};
GUIUtility.ExitGUI();
}
private void PreviewJson()
{
if (string.IsNullOrEmpty(m_JsonInput))
{
EditorUtility.DisplayDialog("Error", "JSON input is empty.", "OK");
return;
}
try
{
var json = JsonUtility.FromJson<UIComponentJson>(m_JsonInput);
if (json == null)
m_PreviewText = "Invalid JSON or unsupported schema.";
else
m_PreviewText = "Component Type: " + json.componentType + "\nSchema: " + json.schemaVersion + "\nVersion: " + json.componentVersion;
m_ShowPreview = true;
}
catch (System.Exception ex)
{
EditorUtility.DisplayDialog("Preview Error", "Invalid JSON: " + ex.Message, "OK");
}
}
private void ImportJson()
{
if (string.IsNullOrEmpty(m_JsonInput))
{
EditorUtility.DisplayDialog("Error", "JSON input is empty. Please paste JSON data.", "OK");
return;
}
try
{
Undo.RecordObject(s_TargetComponent, "Import UI Component JSON");
s_TargetComponent.ImportFromJson(m_JsonInput);
s_TargetComponent.RebuildChartObject();
s_TargetComponent.RefreshAllComponent();
s_TargetComponent.RefreshGraph();
EditorUtility.SetDirty(s_TargetComponent);
SceneView.RepaintAll();
var target = s_TargetComponent;
EditorApplication.delayCall += delegate ()
{
if (target == null) return;
target.RefreshAllComponent();
target.RefreshGraph();
SceneView.RepaintAll();
};
EditorUtility.DisplayDialog("Success", "UI component imported successfully!", "OK");
Close();
}
catch (System.Exception ex)
{
EditorUtility.DisplayDialog("Import Error", "Failed to import JSON:\n" + ex.Message + "\n\n" + ex.StackTrace, "OK");
}
}
private void OpenJsonFile()
{
var path = EditorUtility.OpenFilePanel("Open UI Component JSON", "", "json");
if (string.IsNullOrEmpty(path)) return;
try
{
m_JsonInput = System.IO.File.ReadAllText(path);
m_ShowPreview = false;
m_PreviewText = "";
}
catch (System.Exception ex)
{
EditorUtility.DisplayDialog("Open File Error", "Failed to read JSON file:\n" + ex.Message, "OK");
}
}
}
}

View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 68157a6f7d4e94ccc8ccbb4913d187f3
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -493,4 +493,14 @@ namespace XCharts.Runtime
return m_Offset.value;
}
}
/// <summary>
/// Data exchange animation. Generally used for animation of data sorting.
/// ||数据交换动画。一般用于图表数据排序时顺序变化的动画。
/// </summary>
[Since("v3.15.0")]
[System.Serializable]
public class AnimationExchange : AnimationInfo
{
}
}

View File

@@ -44,8 +44,8 @@ namespace XCharts.Runtime
}
/// <summary>
/// the animation of serie. support animation type: fadeIn, fadeOut, change, addition.
/// ||动画组件用于控制图表的动画播放。支持配置五种动画表现FadeIn渐入动画FadeOut渐出动画Change变更动画Addition新增动画Interaction交互动画
/// the animation of serie. support animation type: fadeIn, fadeOut, change, addition, exchange.
/// ||动画组件用于控制图表的动画播放。支持配置五种动画表现FadeIn渐入动画FadeOut渐出动画Change变更动画Addition新增动画Interaction交互动画Exchange交换动画
/// 按作用的对象可以分为两类SerieAnimation系列动画和DataAnimation数据动画
/// </summary>
[System.Serializable]
@@ -62,6 +62,7 @@ namespace XCharts.Runtime
[SerializeField][Since("v3.8.0")] private AnimationAddition m_Addition = new AnimationAddition() { duration = 500 };
[SerializeField][Since("v3.8.0")] private AnimationHiding m_Hiding = new AnimationHiding() { duration = 500 };
[SerializeField][Since("v3.8.0")] private AnimationInteraction m_Interaction = new AnimationInteraction() { duration = 250 };
[SerializeField][Since("v3.15.0")] private AnimationExchange m_Exchange = new AnimationExchange() { duration = 250 };
[Obsolete("Use animation.fadeIn.delayFunction instead.", true)]
public AnimationDelayFunction fadeInDelayFunction;
@@ -138,6 +139,11 @@ namespace XCharts.Runtime
/// ||交互动画配置。
/// </summary>
public AnimationInteraction interaction { get { return m_Interaction; } }
/// <summary>
/// Exchange animation configuration. Valid in sort bar chart.
/// ||交换动画配置。如在排序柱图中有效。
/// </summary>
public AnimationExchange exchange { get { return m_Exchange; } }
private Vector3 m_LinePathLastPos;
private List<AnimationInfo> m_Animations;
@@ -147,12 +153,15 @@ namespace XCharts.Runtime
{
if (m_Animations == null)
{
m_Animations = new List<AnimationInfo>();
m_Animations.Add(m_FadeIn);
m_Animations.Add(m_FadeOut);
m_Animations.Add(m_Change);
m_Animations.Add(m_Addition);
m_Animations.Add(m_Hiding);
m_Animations = new List<AnimationInfo>
{
m_FadeIn,
m_FadeOut,
m_Change,
m_Addition,
m_Hiding,
m_Exchange
};
}
return m_Animations;
}
@@ -565,6 +574,14 @@ namespace XCharts.Runtime
return 0;
}
public float GetExchangeDuration()
{
if (m_Enable && m_Exchange.enable)
return m_Exchange.context.currDuration > 0 ? m_Exchange.context.currDuration : m_Exchange.duration;
else
return 0;
}
public float GetAdditionDuration()
{
if (m_Enable && m_Addition.enable)

View File

@@ -85,7 +85,7 @@ namespace XCharts.Runtime
float scaleAngle = AxisHelper.GetScaleWidth(axis, total, i + 1, null);
bool inside = axis.axisLabel.inside;
var labelName = AxisHelper.GetLabelName(axis, total, i, axis.context.minValue, axis.context.maxValue,
null, isPercentStack);
null, isPercentStack, chart.useUtc);
var label = ChartHelper.AddAxisLabelObject(splitNumber, i, objName + i, axisObj.transform,
new Vector2(scaleAngle, txtHig), axis,
chart.theme.axis, labelName, Color.clear);

View File

@@ -100,6 +100,7 @@ namespace XCharts.Runtime
[SerializeField] private bool m_Clockwise = true;
[SerializeField] private bool m_InsertDataToHead;
[SerializeField][Since("v3.11.0")] private float m_MinCategorySpacing = 0;
[SerializeField][Since("v3.15.0")] private bool m_MainAxis = false;
[SerializeField] protected List<Sprite> m_Icons = new List<Sprite>();
[SerializeField] protected List<string> m_Data = new List<string>();
[SerializeField] protected AxisLine m_AxisLine = AxisLine.defaultAxisLine;
@@ -115,6 +116,13 @@ namespace XCharts.Runtime
public AxisContext context = new AxisContext();
private Action<int, string> m_OnLabelClick;
/// <summary>
/// Callback function when click on the label. Parameters: labelIndex, labelName.
/// ||点击文本标签回调函数。参数labelIndex, labelName。
/// </summary>
[Since("v3.15.0")]
public Action<int, string> onLabelClick { internal get { return m_OnLabelClick; } set { m_OnLabelClick = value; } }
/// <summary>
/// Whether to show axis.
/// ||是否显示坐标轴。
@@ -292,6 +300,17 @@ namespace XCharts.Runtime
set { if (PropertyUtil.SetStruct(ref m_Clockwise, value)) SetAllDirty(); }
}
/// <summary>
/// Whether it is the main axis. When both X and Y axes are of the same type, the axis set to main axis will determine the orientation,
/// such as horizontal bar chart and vertical bar chart.
/// ||是否为主轴。当XY轴类型都相同时设置为主轴的轴会决定朝向如横向柱图和纵向柱图。
/// </summary>
[Since("v3.15.0")]
public bool mainAxis
{
get { return m_MainAxis; }
set { if (PropertyUtil.SetStruct(ref m_MainAxis, value)) SetAllDirty(); }
}
/// <summary>
/// Category data, available in type: 'Category' axis.
/// ||类目数据在类目轴type: 'category')中有效。
/// </summary>
@@ -478,6 +497,7 @@ namespace XCharts.Runtime
context.maxValue = 0;
context.destMinValue = 0;
context.destMaxValue = 0;
context.labelValueList.Clear();
}
public Axis Clone()
@@ -609,13 +629,13 @@ namespace XCharts.Runtime
return m_Position == AxisPosition.Bottom;
}
public bool IsNeedShowLabel(int index, int total = 0)
public bool IsNeedShowLabel(int index, int total = 0, string content = null)
{
if (total == 0)
{
total = context.labelValueList.Count;
}
return axisLabel.IsNeedShowLabel(index, total);
return axisLabel.IsNeedShowLabel(index, total, content);
}
public void SetNeedUpdateFilterData()

View File

@@ -103,41 +103,55 @@ namespace XCharts.Runtime
internal void UpdateFilterData(List<string> data, DataZoom dataZoom)
{
int start = 0, end = 0;
var range = Mathf.RoundToInt(data.Count * (dataZoom.end - dataZoom.start) / 100);
if (range <= 0)
range = 1;
if (dataZoom.context.invert)
// Use (N-1) intervals to match shadow drawing (scaleWid = width/(N-1)).
// CeilToInt for start, FloorToInt for end, so filter aligns exactly with filler.
int n = data.Count - 1;
int startIndex, endIndex;
if (n > 0)
{
end = Mathf.RoundToInt(data.Count * dataZoom.end / 100);
start = end - range;
if (start < 0) start = 0;
if (dataZoom.context.invert)
{
startIndex = Mathf.CeilToInt((float)n * (100 - dataZoom.end) / 100);
endIndex = Mathf.FloorToInt((float)n * (100 - dataZoom.start) / 100);
}
else
{
startIndex = Mathf.CeilToInt((float)n * dataZoom.start / 100);
endIndex = Mathf.FloorToInt((float)n * dataZoom.end / 100);
}
}
else
{
start = Mathf.RoundToInt(data.Count * dataZoom.start / 100);
end = start + range;
if (end > data.Count) end = data.Count;
startIndex = 0;
endIndex = 0;
}
var range = endIndex - startIndex + 1;
if (range <= 0)
range = 1;
start = startIndex;
if (start < 0) start = 0;
end = start + range;
if (end > data.Count) end = data.Count;
var minZoomRatio = (int)(data.Count * dataZoom.minZoomRatio);
if (start != filterStart ||
end != filterEnd ||
dataZoom.minShowNum != filterMinShow ||
minZoomRatio != filterMinShow ||
isNeedUpdateFilterData)
{
filterStart = start;
filterEnd = end;
filterMinShow = dataZoom.minShowNum;
filterMinShow = minZoomRatio;
isNeedUpdateFilterData = false;
if (data.Count > 0)
{
if (range < dataZoom.minShowNum)
if (range < minZoomRatio)
{
if (dataZoom.minShowNum > data.Count)
if (dataZoom.minZoomRatio > data.Count)
range = data.Count;
else
range = dataZoom.minShowNum;
range = minZoomRatio;
}
if (range > data.Count - start)
start = data.Count - range;

View File

@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.EventSystems;
using UnityEngine.UI;
using XCharts.Runtime;
using XUGL;
@@ -32,6 +33,33 @@ namespace XCharts
protected virtual Orient orient { get; set; }
public override void OnPointerClick(PointerEventData eventData)
{
if (component.onLabelClick == null) return;
var labelObjects = component.context.labelObjectList;
for (int i = 0; i < labelObjects.Count; i++)
{
var label = labelObjects[i];
if (label == null) continue;
if (label.InRect(chart.pointerPos))
{
component.onLabelClick.Invoke(i, label.text.GetText());
break;
}
}
}
// public override void DrawTop(VertexHelper vh)
// {
// var color = Color.red;
// color.a = 0.5f;
// foreach (var label in component.context.labelObjectList)
// {
// if (label == null) continue;
// UGL.DrawRectangle(vh, label.rect, color);
// }
// }
protected virtual void UpdatePointerValue(Axis axis)
{
var grid = chart.GetChartComponent<GridCoord>(axis.gridIndex);
@@ -94,10 +122,9 @@ namespace XCharts
{
if (axis is YAxis)
{
var yRate = axis.context.minMaxRange / grid.context.height;
var yValue = yRate * (chart.pointerPos.y - grid.context.y - axis.context.offset);
if (axis.context.minValue > 0)
yValue += axis.context.minValue;
var yValue = axis.context.minValue + (chart.pointerPos.y - grid.context.y) / grid.context.height * axis.context.minMaxRange;
if (axis.inverse)
yValue = -yValue;
var labelX = axis.GetLabelObjectPosition(0).x;
axis.context.pointerValue = yValue;
@@ -122,10 +149,9 @@ namespace XCharts
}
else
{
var xRate = axis.context.minMaxRange / grid.context.width;
xValue = xRate * (chart.pointerPos.x - grid.context.x - axis.context.offset);
if (axis.context.minValue > 0)
xValue += axis.context.minValue;
xValue = axis.context.minValue + (chart.pointerPos.x - grid.context.x) / grid.context.width * axis.context.minMaxRange;
if (axis.inverse)
xValue = -xValue;
}
var labelY = axis.GetLabelObjectPosition(0).y;
axis.context.pointerValue = xValue;
@@ -160,15 +186,20 @@ namespace XCharts
double tempMinValue;
double tempMaxValue;
axis.context.needAnimation = Application.isPlaying && axis.animation.show;
if (axis.inverse != axis.context.lastCheckInverse)
{
foreach (var serie in chart.series)
serie.context.InvalidateMinMaxCache();
}
chart.GetSeriesMinMaxValue(axis, axisIndex, out tempMinValue, out tempMaxValue);
var dataZoom = chart.GetDataZoomOfAxis(axis);
if (dataZoom != null && dataZoom.enable)
{
if (axis is XAxis)
dataZoom.SetXAxisIndexValueInfo(axisIndex, ref tempMinValue, ref tempMaxValue);
dataZoom.SetXAxisIndexValueInfo(axisIndex, ref tempMinValue, ref tempMaxValue, axis.inverse);
else
dataZoom.SetYAxisIndexValueInfo(axisIndex, ref tempMinValue, ref tempMaxValue);
dataZoom.SetYAxisIndexValueInfo(axisIndex, ref tempMinValue, ref tempMaxValue, axis.inverse);
}
if (tempMinValue != axis.context.destMinValue ||
@@ -253,21 +284,40 @@ namespace XCharts
var serie = chart.GetSerie(0);
if (isCategory && serie != null && serie.useSortData)
{
var isY = axis is YAxis;
var showData = serie.GetDataList(dataZoom, true);
var isChanged = CheckSortedDataChanged(axis, showData);
if (isChanged)
if (CheckSortedDataChanged(axis, showData))
{
for (int i = 0; i < context.labelObjectList.Count; i++)
{
if (context.labelObjectList[i] != null)
{
var index = i < showData.Count ? showData[i].index : i;
var text = AxisHelper.GetLabelName(axis, coordinateWidth, index, destMinValue, destMaxValue, dataZoom, forcePercent, i);
var text = AxisHelper.GetLabelName(axis, coordinateWidth, index, destMinValue, destMaxValue, dataZoom, forcePercent, chart.useUtc, i);
context.labelObjectList[i].SetText(text);
}
}
SaveSortedDataIndex(axis, showData);
}
if (CheckSortedDataAnimation(axis, showData))
{
float diff = axis.context.scaleWidth / 2;
for (int i = 0; i < context.labelObjectList.Count; i++)
{
var labelObject = context.labelObjectList[i];
if (labelObject != null)
{
if (i < showData.Count)
{
var serieData = showData[i];
var pos = serieData.context.exchangePosition;
if (ChartHelper.IsZeroVector(pos)) continue;
var sourPos = labelObject.GetPosition();
labelObject.SetPosition(isY ? new Vector3(sourPos.x, pos.y + diff) : new Vector3(pos.x + diff, sourPos.y));
}
}
}
}
}
else
{
@@ -275,14 +325,14 @@ namespace XCharts
{
if (context.labelObjectList[i] != null)
{
var text = AxisHelper.GetLabelName(axis, coordinateWidth, i, destMinValue, destMaxValue, dataZoom, forcePercent);
var text = AxisHelper.GetLabelName(axis, coordinateWidth, i, destMinValue, destMaxValue, dataZoom, forcePercent, chart.useUtc);
context.labelObjectList[i].SetText(text);
}
}
}
}
private bool CheckSortedDataChanged(Axis axis, List<SerieData> dataList)
private static bool CheckSortedDataChanged(Axis axis, List<SerieData> dataList)
{
if (dataList.Count != axis.context.sortedDataIndices.Count) return true;
for (int i = 0; i < dataList.Count; i++)
@@ -292,7 +342,17 @@ namespace XCharts
return false;
}
private void SaveSortedDataIndex(Axis axis, List<SerieData> dataList)
private static bool CheckSortedDataAnimation(Axis axis, List<SerieData> dataList)
{
if (!axis.IsCategory()) return false;
foreach (var data in dataList)
{
if (!data.context.exchangeEnd) return true;
}
return false;
}
private static void SaveSortedDataIndex(Axis axis, List<SerieData> dataList)
{
axis.context.sortedDataIndices.Clear();
for (int i = 0; i < dataList.Count; i++)
@@ -307,7 +367,7 @@ namespace XCharts
{
var lastCount = axis.context.labelValueList.Count;
axis.context.tickValue = DateTimeUtil.UpdateTimeAxisDateTimeList(axis.context.labelValueList,
(int)axis.context.minValue, (int)axis.context.maxValue, axis.splitNumber);
axis.context.minValue, axis.context.maxValue, axis.splitNumber, axis.ceilRate, !chart.useUtc);
if (axis.context.labelValueList.Count != lastCount)
axis.SetAllDirty();
@@ -390,13 +450,17 @@ namespace XCharts
return Math.Pow(10, n);
}
internal void CheckValueLabelActive(Axis axis, int i, ChartLabel label, Vector3 pos)
internal void CheckValueLabelActive(Axis axis, int i, ChartLabel label, Vector3 pos, string content = null)
{
if (!axis.show || !axis.axisLabel.show)
{
label.SetTextActive(false);
return;
}
if (content == null)
{
content = label.text.GetText();
}
if (axis.IsValue())
{
if (orient == Orient.Horizonal)
@@ -404,12 +468,12 @@ namespace XCharts
if (i == 0)
{
var dist = GetLabelPosition(0, 1).x - pos.x;
label.SetTextActive(axis.IsNeedShowLabel(i) && dist > label.text.GetPreferredWidth());
label.SetTextActive(axis.IsNeedShowLabel(i, 0, content) && dist > label.text.GetPreferredWidth());
}
else if (i == axis.context.labelValueList.Count - 1)
{
var dist = pos.x - GetLabelPosition(0, i - 1).x;
label.SetTextActive(axis.IsNeedShowLabel(i) && dist > label.text.GetPreferredWidth());
label.SetTextActive(axis.IsNeedShowLabel(i, 0, content) && dist > label.text.GetPreferredWidth());
}
}
else
@@ -417,12 +481,12 @@ namespace XCharts
if (i == 0)
{
var dist = GetLabelPosition(0, 1).y - pos.y;
label.SetTextActive(axis.IsNeedShowLabel(i) && dist > label.text.GetPreferredHeight());
label.SetTextActive(axis.IsNeedShowLabel(i, 0, content) && dist > label.text.GetPreferredHeight());
}
else if (i == axis.context.labelValueList.Count - 1)
{
var dist = pos.y - GetLabelPosition(0, i - 1).y;
label.SetTextActive(axis.IsNeedShowLabel(i) && dist > label.text.GetPreferredHeight());
label.SetTextActive(axis.IsNeedShowLabel(i, 0, content) && dist > label.text.GetPreferredHeight());
}
}
}
@@ -484,7 +548,6 @@ namespace XCharts
SerieHelper.UpdateSerieRuntimeFilterData(sortSerie);
}
var showData = sortSerie != null ? sortSerie.GetDataList(dataZoom, true) : null;
for (int i = 0; i < splitNumber; i++)
{
var labelWidth = AxisHelper.GetScaleWidth(axis, axisLength, i + 1, dataZoom);
@@ -492,7 +555,7 @@ namespace XCharts
var labelName = AxisHelper.GetLabelName(axis, axisLength, sortIndex,
axis.context.destMinValue,
axis.context.destMaxValue,
dataZoom, isPercentStack, i);
dataZoom, isPercentStack, chart.useUtc, i);
var label = ChartHelper.AddAxisLabelObject(splitNumber, i,
ChartCached.GetAxisLabelName(i),
@@ -611,7 +674,7 @@ namespace XCharts
var labelName = AxisHelper.GetLabelName(axis, axisLength, sortIndex,
axis.context.destMinValue,
axis.context.destMaxValue,
dataZoom, isPercentStack, i);
dataZoom, isPercentStack, chart.useUtc, i);
var label = ChartHelper.AddAxisLabelObject(splitNumber, i,
ChartCached.GetAxisLabelName(i),
@@ -627,7 +690,7 @@ namespace XCharts
var pos = GetLabelPosition(totalWidth + gapWidth, i);
label.SetPosition(pos);
CheckValueLabelActive(axis, i, label, pos);
CheckValueLabelActive(axis, i, label, pos, labelName);
axis.context.labelObjectList.Add(label);
@@ -772,17 +835,19 @@ namespace XCharts
var lineWidth = axis.axisLine.GetWidth(theme.lineWidth);
var lineType = axis.axisLine.GetType(theme.lineType);
var lineColor = axis.axisLine.GetColor(theme.lineColor);
var sExtendLength = axis.axisLine.startExtendLength;
var eExtendLength = axis.axisLine.endExtendLength;
if (orient == Orient.Horizonal)
{
var left = new Vector3(startX - lineWidth - (inverse ? offset : 0), startY);
var right = new Vector3(startX + axisLength + lineWidth + (!inverse ? offset : 0), startY);
var left = new Vector3(startX - lineWidth - (inverse ? offset : 0) - sExtendLength, startY);
var right = new Vector3(startX + axisLength + lineWidth + (!inverse ? offset : 0) + eExtendLength, startY);
ChartDrawer.DrawLineStyle(vh, lineType, lineWidth, left, right, lineColor);
}
else
{
var bottom = new Vector3(startX, startY - lineWidth - (inverse ? offset : 0));
var top = new Vector3(startX, startY + axisLength + lineWidth + (!inverse ? offset : 0));
var bottom = new Vector3(startX, startY - lineWidth - (inverse ? offset : 0) - sExtendLength);
var top = new Vector3(startX, startY + axisLength + lineWidth + (!inverse ? offset : 0) + eExtendLength);
ChartDrawer.DrawLineStyle(vh, lineType, lineWidth, bottom, top, lineColor);
}
}

View File

@@ -116,7 +116,7 @@ namespace XCharts.Runtime
/// <param name="dataZoom"></param>
/// <returns></returns>
public static string GetLabelName(Axis axis, float coordinateWidth, int index, double minValue, double maxValue,
DataZoom dataZoom, bool forcePercent, int sortIndex = -1)
DataZoom dataZoom, bool forcePercent, bool useUtc, int sortIndex = -1)
{
int split = GetSplitNumber(axis, coordinateWidth, dataZoom);
if (sortIndex == -1) sortIndex = index;
@@ -161,7 +161,7 @@ namespace XCharts.Runtime
return string.Empty;
var value = axis.GetLabelValue(index);
return axis.axisLabel.GetFormatterDateTime(sortIndex, axis.context.labelValueList.Count, value, minValue, maxValue);
return axis.axisLabel.GetFormatterDateTime(sortIndex, axis.context.labelValueList.Count, value, minValue, maxValue, !useUtc);
}
var showData = axis.GetDataList(dataZoom);
int dataCount = showData.Count;
@@ -354,8 +354,8 @@ namespace XCharts.Runtime
axis.splitNumber = splitNumber;
return;
}
if (axis.type == Axis.AxisType.Time) { }
else if (axis.minMaxType == Axis.AxisMinMaxType.Custom)
if (ceilRate == 0) ceilRate = axis.ceilRate;
if (axis.minMaxType == Axis.AxisMinMaxType.Custom)
{
if (axis.min != 0 || axis.max != 0)
{
@@ -371,13 +371,19 @@ namespace XCharts.Runtime
}
}
}
else if (axis.type == Axis.AxisType.Time)
{
if (ceilRate != 0)
{
minValue = ChartHelper.GetMinCeilRate(minValue, ceilRate);
maxValue = ChartHelper.GetMaxCeilRate(maxValue, ceilRate);
}
}
else
{
if (ceilRate == 0) ceilRate = axis.ceilRate;
switch (axis.minMaxType)
{
case Axis.AxisMinMaxType.Default:
if (minValue == 0 && maxValue == 0) { }
else if (minValue > 0 && maxValue > 0)
{
@@ -489,17 +495,17 @@ namespace XCharts.Runtime
public static double GetAxisPositionValue(GridCoord grid, Axis axis, Vector3 pos)
{
if (axis is YAxis)
return GetAxisPositionValue(pos.y, grid.context.height, axis.context.minMaxRange, grid.context.y, axis.context.offset);
return GetAxisPositionValue(pos.y, grid.context.height, axis.context.minMaxRange, grid.context.y, axis.context.offset, axis.context.minValue);
else if (axis is XAxis)
return GetAxisPositionValue(pos.x, grid.context.width, axis.context.minMaxRange, grid.context.x, axis.context.offset);
return GetAxisPositionValue(pos.x, grid.context.width, axis.context.minMaxRange, grid.context.x, axis.context.offset, axis.context.minValue);
else
return 0;
}
public static double GetAxisPositionValue(float xy, float axisLength, double axisRange, float axisStart, float axisOffset)
public static double GetAxisPositionValue(float xy, float axisLength, double axisRange, float axisStart, float axisOffset, double minValue = 0)
{
var yRate = axisRange / axisLength;
return yRate * (xy - axisStart - axisOffset);
return minValue + yRate * (xy - axisStart - axisOffset);
}
/// <summary>
@@ -536,9 +542,9 @@ namespace XCharts.Runtime
/// <param name="scaleWidth"></param>
/// <param name="value"></param>
/// <returns></returns>
public static float GetAxisValueLength(GridCoord grid, Axis axis, float scaleWidth, double value)
public static float GetAxisValueLength(GridCoord grid, Axis axis, float scaleWidth, double value, float gap = 0)
{
return GetAxisPositionInternal(grid, axis, scaleWidth, value, false, true);
return GetAxisPositionInternal(grid, axis, scaleWidth, value, false, true, gap);
}
/// <summary>
@@ -572,10 +578,11 @@ namespace XCharts.Runtime
}
}
private static float GetAxisPositionInternal(GridCoord grid, Axis axis, float scaleWidth, double value, bool includeGridXY, bool realLength)
private static float GetAxisPositionInternal(GridCoord grid, Axis axis, float scaleWidth, double value, bool includeGridXY, bool realLength, float gap = 0)
{
var isY = axis is YAxis;
var gridHeight = isY ? grid.context.height : grid.context.width;
gridHeight -= gap;
var gridXY = isY ? grid.context.y : grid.context.x;
if (axis.IsLog())

View File

@@ -17,6 +17,7 @@ namespace XCharts.Runtime
[SerializeField] private bool m_OnZero = false;
[SerializeField] private bool m_ShowStartLabel = true;
[SerializeField] private bool m_ShowEndLabel = true;
[SerializeField][Since("v3.15.0")] private bool m_ShowZeroLabel = true;
[SerializeField] private TextLimit m_TextLimit = new TextLimit();
/// <summary>
@@ -74,6 +75,15 @@ namespace XCharts.Runtime
set { if (PropertyUtil.SetStruct(ref m_ShowEndLabel, value)) SetComponentDirty(); }
}
/// <summary>
/// Whether to display the zero label.
/// ||是否显示0刻度文本。
/// </summary>
public bool showZeroLabel
{
get { return m_ShowZeroLabel; }
set { if (PropertyUtil.SetStruct(ref m_ShowZeroLabel, value)) SetComponentDirty(); }
}
/// <summary>
/// 文本限制。
/// </summary>
public TextLimit textLimit
@@ -118,6 +128,7 @@ namespace XCharts.Runtime
height = height,
showStartLabel = showStartLabel,
showEndLabel = showEndLabel,
showZeroLabel = showZeroLabel,
textLimit = textLimit.Clone()
};
axisLabel.textStyle.Copy(textStyle);
@@ -136,6 +147,7 @@ namespace XCharts.Runtime
height = axisLabel.height;
showStartLabel = axisLabel.showStartLabel;
showEndLabel = axisLabel.showEndLabel;
showZeroLabel = axisLabel.showZeroLabel;
textLimit.Copy(axisLabel.textLimit);
textStyle.Copy(axisLabel.textStyle);
}
@@ -171,13 +183,14 @@ namespace XCharts.Runtime
return base.GetFormatterContent(labelIndex, totalIndex, value, minValue, maxValue, isLog);
}
public bool IsNeedShowLabel(int index, int total)
public bool IsNeedShowLabel(int index, int total, string content = null)
{
var labelShow = show && (interval == 0 || index % (interval + 1) == 0);
if (labelShow)
{
if (!showStartLabel && index == 0) labelShow = false;
else if (!showEndLabel && index == total - 1) labelShow = false;
if (labelShow && content == "0") labelShow = showZeroLabel;
}
return labelShow;
}

View File

@@ -10,6 +10,8 @@ namespace XCharts.Runtime
public class AxisLine : BaseLine
{
[SerializeField] private bool m_OnZero;
[SerializeField] private float m_StartExtendLength;
[SerializeField] private float m_EndExtendLength;
[SerializeField] private bool m_ShowArrow;
[SerializeField] private ArrowStyle m_Arrow = new ArrowStyle();
@@ -23,6 +25,24 @@ namespace XCharts.Runtime
set { if (PropertyUtil.SetStruct(ref m_OnZero, value)) SetVerticesDirty(); }
}
/// <summary>
/// Extend length of the axis line at the start.
/// ||轴线起点延长线长度。
/// </summary>
public float startExtendLength
{
get { return m_StartExtendLength; }
set { if (PropertyUtil.SetStruct(ref m_StartExtendLength, value)) SetVerticesDirty(); }
}
/// <summary>
/// Extend length of the axis line at the end.
/// ||轴线终点延长线长度。
/// </summary>
public float endExtendLength
{
get { return m_EndExtendLength; }
set { if (PropertyUtil.SetStruct(ref m_EndExtendLength, value)) SetVerticesDirty(); }
}
/// <summary>
/// Whether to show the arrow symbol of axis.
/// ||是否显示箭头。
/// </summary>

View File

@@ -114,7 +114,7 @@ namespace XCharts.Runtime
var inside = axis.axisLabel.inside;
var isPercentStack = SeriesHelper.IsPercentStack<Bar>(chart.series);
var labelName = AxisHelper.GetLabelName(axis, radius, i, axis.context.minValue, axis.context.maxValue,
null, isPercentStack);
null, isPercentStack, chart.useUtc);
var label = ChartHelper.AddAxisLabelObject(splitNumber, i, objName + i, axisObj.transform,
new Vector2(labelWidth, txtHig), axis, chart.theme.axis, labelName, Color.clear);

View File

@@ -15,7 +15,7 @@ namespace XCharts.Runtime
[SerializeField] private float m_BorderWidth;
[SerializeField] private Color32 m_BorderColor;
[SerializeField] private bool m_RoundedCorner = true;
[SerializeField] private float[] m_CornerRadius = new float[] { 0, 0, 0, 0 };
[SerializeField] private float[] m_CornerRadius = new float[] { 10, 10, 10, 10 };
/// <summary>
/// whether the border is visible.

View File

@@ -16,6 +16,7 @@ namespace XCharts.Runtime
[SerializeField][Since("v3.6.0")] private Color32 m_MarkColor;
[SerializeField] private Color32 m_BackgroundColor;
[SerializeField] private float m_BackgroundWidth;
[SerializeField][Since("v3.15.0")] private float m_BackgroundGap;
[SerializeField] private Color32 m_CenterColor;
[SerializeField] private float m_CenterGap;
[SerializeField] private float m_BorderWidth = 0;
@@ -129,6 +130,15 @@ namespace XCharts.Runtime
set { if (PropertyUtil.SetStruct(ref m_BackgroundWidth, value)) SetVerticesDirty(); }
}
/// <summary>
/// the gap between background and data item.
/// ||数据项背景间隙。
/// </summary>
public float backgroundGap
{
get { return m_BackgroundGap; }
set { if (PropertyUtil.SetStruct(ref m_BackgroundGap, value)) SetVerticesDirty(); }
}
/// <summary>
/// 中心区域颜色。
/// </summary>
public Color32 centerColor

View File

@@ -11,8 +11,8 @@ namespace XCharts.Runtime
[Since("v3.5.0")]
[System.Serializable]
public class MarqueeStyle : ChildComponent
{
[SerializeField][Since("v3.5.0")] private bool m_Apply = false;
{
[SerializeField][Since("v3.5.0")] private bool m_Apply = true;
[SerializeField][Since("v3.5.0")] private bool m_RealRect = false;
[SerializeField][Since("v3.5.0")] private AreaStyle m_AreaStyle = new AreaStyle();
[SerializeField][Since("v3.5.0")] private LineStyle m_LineStyle = new LineStyle();
@@ -52,7 +52,7 @@ namespace XCharts.Runtime
/// Custom checkboxes select ongoing callbacks.
/// ||自定义选取框选取进行时的回调。
/// </summary>
public Action<DataZoom> onGoing { set { m_OnStart = value; } get { return m_OnStart; } }
public Action<DataZoom> onGoing { set { m_OnGoing = value; } get { return m_OnGoing; } }
/// <summary>
/// Customize the callback at the end of the selection.
/// ||自定义选取框结束选取时的回调。

View File

@@ -5,14 +5,33 @@ using UnityEngine;
namespace XCharts.Runtime
{
/// <summary>
/// comment of chart.
/// ||图表注解组件
/// The layer of comment.
/// ||注解的显示层级
/// </summary>
[Since("v3.15.0")]
public enum CommentLayer
{
/// <summary>
/// The comment is display under the serie.
/// ||注解在系列下方。
/// </summary>
Lower,
/// <summary>
/// The comment is display above the serie.
/// ||注解在系列上方。
/// </summary>
Upper
}
/// <summary>
/// comment of chart. Used to annotate special information in the chart.
/// ||图表注解组件。用于标注图表中的特殊信息。
/// </summary>
[Serializable]
[ComponentHandler(typeof(CommentHander), true)]
public class Comment : MainComponent, IPropertyChanged
{
[SerializeField] private bool m_Show = true;
[SerializeField][Since("v3.15.0")] private CommentLayer m_Layer = CommentLayer.Lower;
[SerializeField] private LabelStyle m_LabelStyle = new LabelStyle();
[SerializeField] private CommentMarkStyle m_MarkStyle;
[SerializeField] private List<CommentItem> m_Items = new List<CommentItem>() { new CommentItem() };
@@ -23,6 +42,11 @@ namespace XCharts.Runtime
/// </summary>
public bool show { get { return m_Show; } set { if (PropertyUtil.SetStruct(ref m_Show, value)) SetComponentDirty(); } }
/// <summary>
/// The layer of comment.
/// ||注解的显示层级。
/// </summary>
public CommentLayer layer { get { return m_Layer; } set { if (PropertyUtil.SetStruct(ref m_Layer, value)) SetComponentDirty(); } }
/// <summary>
/// The items of comment.
/// ||注解项。每个注解组件可以设置多个注解项。
/// </summary>
@@ -45,7 +69,12 @@ namespace XCharts.Runtime
get { return m_MarkStyle; }
set { if (PropertyUtil.SetClass(ref m_MarkStyle, value)) SetVerticesDirty(); }
}
/// <summary>
/// Get the label style of comment item.
/// ||获取注解项的文本样式。
/// </summary>
/// <param name="index">the index of item</param>
/// <returns></returns>
public LabelStyle GetLabelStyle(int index)
{
if (index >= 0 && index < items.Count)
@@ -55,7 +84,12 @@ namespace XCharts.Runtime
}
return m_LabelStyle;
}
/// <summary>
/// Get the mark style of comment item.
/// ||获取注解项的标记样式。
/// </summary>
/// <param name="index">the index of item</param>
/// <returns></returns>
public CommentMarkStyle GetMarkStyle(int index)
{
if (index >= 0 && index < items.Count)

View File

@@ -14,7 +14,7 @@ namespace XCharts.Runtime
var comment = component;
comment.OnChanged();
comment.painter = null;
comment.refreshComponent = delegate()
comment.refreshComponent = delegate ()
{
var objName = ChartCached.GetComponentObjectName(comment);
var commentObj = ChartHelper.AddObject(objName,
@@ -23,20 +23,24 @@ namespace XCharts.Runtime
chart.chartMaxAnchor,
chart.chartPivot,
chart.chartSizeDelta, -1, chart.childrenNodeNames);
var siblingIndex = comment.layer == CommentLayer.Upper
? chart.topPainter.transform.GetSiblingIndex() - 1
: chart.painter.transform.GetSiblingIndex() + 1;
commentObj.SetActive(comment.show);
commentObj.transform.SetSiblingIndex(siblingIndex);
commentObj.hideFlags = chart.chartHideFlags;
ChartHelper.HideAllObject(commentObj);
for (int i = 0; i < comment.items.Count; i++)
{
var item = comment.items[i];
var labelStyle = comment.GetLabelStyle(i);
item.location.OnChanged();
var labelPos = chart.chartPosition + item.location.GetPosition(chart.chartWidth, chart.chartHeight);
var label = ChartHelper.AddChartLabel(s_CommentObjectName + i, commentObj.transform, labelStyle, chart.theme.common,
GetContent(item), Color.clear, TextAnchor.MiddleCenter);
label.SetActive(comment.show && item.show, true);
label.SetPosition(labelPos);
label.text.SetLocalPosition(labelStyle.offset);
label.SetPosition(labelPos + labelStyle.offset);
item.labelObject = label;
}
};

View File

@@ -11,11 +11,11 @@ namespace XCharts.Runtime
public class CommentItem : ChildComponent
{
[SerializeField] private bool m_Show = true;
[SerializeField] private string m_Content = "comment";
[SerializeField] private string m_Content = "xcharts";
[SerializeField] private Rect m_MarkRect;
[SerializeField] private CommentMarkStyle m_MarkStyle = new CommentMarkStyle() { show = false };
[SerializeField] private LabelStyle m_LabelStyle = new LabelStyle() { show = false };
[SerializeField][Since("v3.5.0")] private Location m_Location = new Location() { align = Location.Align.TopLeft, top = 0.125f };
[SerializeField][Since("v3.5.0")] private Location m_Location = new Location() { align = Location.Align.BottomRight, right = 0.1f, bottom = 0.05f };
public ChartLabel labelObject { get; set; }

View File

@@ -1,3 +1,4 @@
using System;
using System.Collections.Generic;
using UnityEngine;
@@ -81,7 +82,7 @@ namespace XCharts.Runtime
[SerializeField] private RangeMode m_RangeMode;
[SerializeField] private float m_Start;
[SerializeField] private float m_End;
[SerializeField] private int m_MinShowNum = 2;
[SerializeField] private float m_MinZoomRatio = 0.2f;
[Range(1f, 20f)]
[SerializeField] private float m_ScrollSensitivity = 1.1f;
[SerializeField] private Orient m_Orient = Orient.Horizonal;
@@ -91,6 +92,7 @@ namespace XCharts.Runtime
[SerializeField][Since("v3.5.0")] private MarqueeStyle m_MarqueeStyle = new MarqueeStyle();
[SerializeField][Since("v3.6.0")] private bool m_StartLock;
[SerializeField][Since("v3.6.0")] private bool m_EndLock;
[SerializeField][Since("v3.12.0")] private bool m_FilterAxisRange = true;
public DataZoomContext context = new DataZoomContext();
private CustomDataZoomStartEndFunction m_StartEndFunction;
@@ -324,6 +326,16 @@ namespace XCharts.Runtime
set { if (PropertyUtil.SetStruct(ref m_EndLock, value)) SetVerticesDirty(); }
}
/// <summary>
/// Whether dataZoom filters the axis min/max range. When true, the axis scale adapts to the current zoom window.
/// When false, the axis always shows the full data range regardless of the zoom position.
/// ||是否根据DataZoom的缩放窗口过滤坐标轴的最大最小值范围。为true时坐标轴范围随缩放窗口变化为false时坐标轴始终显示全部数据范围。
/// </summary>
public bool filterAxisRange
{
get { return m_FilterAxisRange; }
set { if (PropertyUtil.SetStruct(ref m_FilterAxisRange, value)) SetVerticesDirty(); }
}
/// <summary>
/// The end percentage of the window out of the data extent, in the range of 0 ~ 100.
/// ||数据窗口范围的结束百分比。范围是0 ~ 100。
/// </summary>
@@ -336,10 +348,19 @@ namespace XCharts.Runtime
/// Minimum number of display data. Minimum number of data displayed when DataZoom is enlarged to maximum.
/// ||最小显示数据个数。当DataZoom放大到最大时最小显示的数据个数。
/// </summary>
public int minShowNum
[Obsolete("Use \"minZoomRatio\" instead", true)]
public float minShowNum
{
get { return m_MinShowNum; }
set { if (PropertyUtil.SetStruct(ref m_MinShowNum, value)) SetVerticesDirty(); }
set;get;
}
/// <summary>
/// The minimum zoom ratio of dataZoom. Range 0f-1f.
/// ||缩放区域组件的最小缩放比例范围0f-1f。
/// </summary>
public float minZoomRatio
{
get { return m_MinZoomRatio; }
set { if (PropertyUtil.SetStruct(ref m_MinZoomRatio, value)) SetVerticesDirty(); }
}
/// <summary>
/// The sensitivity of dataZoom scroll.
@@ -405,6 +426,7 @@ namespace XCharts.Runtime
public double rawMax;
public double min;
public double max;
public bool isInverse;
}
private Dictionary<int, AxisIndexValueInfo> m_XAxisIndexInfos = new Dictionary<int, AxisIndexValueInfo>();
private Dictionary<int, AxisIndexValueInfo> m_YAxisIndexInfos = new Dictionary<int, AxisIndexValueInfo>();
@@ -678,7 +700,7 @@ namespace XCharts.Runtime
context.height = chartHeight - runtimeTop - runtimeBottom;
}
internal void SetXAxisIndexValueInfo(int xAxisIndex, ref double min, ref double max)
internal void SetXAxisIndexValueInfo(int xAxisIndex, ref double min, ref double max, bool isInverse = false)
{
AxisIndexValueInfo info;
if (!m_XAxisIndexInfos.TryGetValue(xAxisIndex, out info))
@@ -688,13 +710,14 @@ namespace XCharts.Runtime
}
info.rawMin = min;
info.rawMax = max;
info.isInverse = isInverse;
info.min = min + (max - min) * start / 100;
info.max = min + (max - min) * end / 100;
min = info.min;
max = info.max;
}
internal void SetYAxisIndexValueInfo(int yAxisIndex, ref double min, ref double max)
internal void SetYAxisIndexValueInfo(int yAxisIndex, ref double min, ref double max, bool isInverse = false)
{
AxisIndexValueInfo info;
if (!m_YAxisIndexInfos.TryGetValue(yAxisIndex, out info))
@@ -704,6 +727,7 @@ namespace XCharts.Runtime
}
info.rawMin = min;
info.rawMax = max;
info.isInverse = isInverse;
info.min = min + (max - min) * start / 100;
info.max = min + (max - min) * end / 100;
min = info.min;
@@ -728,6 +752,14 @@ namespace XCharts.Runtime
var range = info.rawMax - info.rawMin;
min = info.rawMin + range * m_Start / 100;
max = info.rawMin + range * m_End / 100;
if (info.isInverse)
{
// Internal values are negated; convert back to original for data comparison
var originalMin = -max;
var originalMax = -min;
min = originalMin;
max = originalMax;
}
}
else
{
@@ -743,6 +775,14 @@ namespace XCharts.Runtime
var range = info.rawMax - info.rawMin;
min = info.rawMin + range * m_Start / 100;
max = info.rawMin + range * m_End / 100;
if (info.isInverse)
{
// Internal values are negated; convert back to original for data comparison
var originalMin = -max;
var originalMax = -min;
min = originalMin;
max = originalMax;
}
}
else
{

View File

@@ -1,3 +1,4 @@
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.EventSystems;
using UnityEngine.UI;
@@ -19,6 +20,9 @@ namespace XCharts.Runtime
private float m_DataZoomLastEndIndex;
private float m_LastStart;
private float m_LastEnd;
private List<double> _sampleSumPrefixCache;
private int _sampleSumPrefixMaxCount = 0;
private bool _sampleSumPrefixInverse = false;
public override void InitComponent()
{
@@ -113,7 +117,7 @@ namespace XCharts.Runtime
dataZoom.context.isCoordinateDrag = true;
}
}
if (dataZoom.supportMarquee)
if (dataZoom.supportMarquee && grid.Contains(pos))
{
dataZoom.context.isMarqueeDrag = true;
dataZoom.context.marqueeStartPos = pos;
@@ -163,7 +167,7 @@ namespace XCharts.Runtime
var dataZoom = component;
var grid = chart.GetGridOfDataZoom(dataZoom);
if (dataZoom.supportMarquee)
if (dataZoom.supportMarquee && dataZoom.context.isMarqueeDrag)
{
Vector2 pos;
if (!chart.ScreenPointToChartPoint(eventData.position, out pos))
@@ -207,16 +211,38 @@ namespace XCharts.Runtime
var dataZoom = component;
if (dataZoom.supportMarquee)
if (dataZoom.supportMarquee && dataZoom.context.isMarqueeDrag)
{
dataZoom.context.isMarqueeDrag = false;
if (dataZoom.marqueeStyle.apply)
{
var grid = chart.GetGridOfDataZoom(dataZoom);
var start = (dataZoom.context.marqueeRect.x - grid.context.x) / grid.context.width * 100;
var end = (dataZoom.context.marqueeRect.x - grid.context.x + dataZoom.context.marqueeRect.width) / grid.context.width * 100;
UpdateDataZoomRange(dataZoom, start, end);
var currentRange = dataZoom.end - dataZoom.start;
var startRatio = (dataZoom.context.marqueeRect.x - grid.context.x) / grid.context.width;
var endRatio = (dataZoom.context.marqueeRect.x - grid.context.x + dataZoom.context.marqueeRect.width) / grid.context.width;
var start = dataZoom.start + startRatio * currentRange;
var end = dataZoom.start + endRatio * currentRange;
if (start > end)
{
var temp = start;
start = end;
end = temp;
}
if (start < 0) start = 0;
if (end > 100) end = 100;
if (end - start >= 1)
{
// Bypass minZoomRatio for marquee: the user explicitly selected this region.
if (!dataZoom.startLock) dataZoom.start = start;
if (!dataZoom.endLock) dataZoom.end = end;
m_LastStart = dataZoom.start;
m_LastEnd = dataZoom.end;
chart.OnDataZoomRangeChanged(dataZoom);
chart.RefreshChart();
}
}
dataZoom.context.marqueeRect = Rect.zero;
dataZoom.SetVerticesDirty();
if (dataZoom.marqueeStyle.onEnd != null)
{
dataZoom.marqueeStyle.onEnd(dataZoom);
@@ -247,31 +273,56 @@ namespace XCharts.Runtime
var dataZoom = component;
var grid = chart.GetGridOfDataZoom(dataZoom);
if (dataZoom.IsInStartZoom(localPos) ||
dataZoom.IsInEndZoom(localPos))
dataZoom.IsInEndZoom(localPos) ||
dataZoom.IsInSelectedZoom(localPos))
{
return;
}
if (dataZoom.IsInZoom(localPos) &&
!dataZoom.IsInSelectedZoom(localPos))
if (dataZoom.IsInZoom(localPos))
{
var pointerX = localPos.x;
var selectWidth = grid.context.width * (dataZoom.end - dataZoom.start) / 100;
var startX = pointerX - selectWidth / 2;
var endX = pointerX + selectWidth / 2;
if (startX < grid.context.x)
var start = dataZoom.start;
var end = dataZoom.end;
switch (dataZoom.orient)
{
startX = grid.context.x;
endX = grid.context.x + selectWidth;
case Orient.Horizonal:
var pointerX = localPos.x;
var selectWidth = dataZoom.context.width * (dataZoom.end - dataZoom.start) / 100;
var startX = pointerX - selectWidth / 2;
var endX = pointerX + selectWidth / 2;
if (startX < dataZoom.context.x)
{
startX = dataZoom.context.x;
endX = dataZoom.context.x + selectWidth;
}
else if (endX > dataZoom.context.x + dataZoom.context.width)
{
endX = dataZoom.context.x + dataZoom.context.width;
startX = dataZoom.context.x + dataZoom.context.width - selectWidth;
}
start = (startX - dataZoom.context.x) / dataZoom.context.width * 100;
end = (endX - dataZoom.context.x) / dataZoom.context.width * 100;
break;
case Orient.Vertical:
var pointerY = localPos.y;
var selectHeight = dataZoom.context.height * (dataZoom.end - dataZoom.start) / 100;
var startY = pointerY - selectHeight / 2;
var endY = pointerY + selectHeight / 2;
if (startY < dataZoom.context.y)
{
startY = dataZoom.context.y;
endY = dataZoom.context.y + selectHeight;
}
else if (endY > dataZoom.context.y + dataZoom.context.height)
{
endY = dataZoom.context.y + dataZoom.context.height;
startY = dataZoom.context.y + dataZoom.context.height - selectHeight;
}
start = (startY - dataZoom.context.y) / dataZoom.context.height * 100;
end = (endY - dataZoom.context.y) / dataZoom.context.height * 100;
break;
}
else if (endX > grid.context.x + grid.context.width)
{
endX = grid.context.x + grid.context.width;
startX = grid.context.x + grid.context.width - selectWidth;
}
var start = (startX - grid.context.x) / grid.context.width * 100;
var end = (endX - grid.context.x) / grid.context.width * 100;
UpdateDataZoomRange(dataZoom, start, end);
UpdateDataZoomRange(dataZoom, start, end, grid);
}
}
@@ -294,7 +345,7 @@ namespace XCharts.Runtime
if ((dataZoom.supportInside && dataZoom.supportInsideScroll && grid.Contains(pos)) ||
dataZoom.IsInZoom(pos))
{
ScaleDataZoom(dataZoom, eventData.scrollDelta.y * dataZoom.scrollSensitivity);
ScaleDataZoom(dataZoom, eventData.scrollDelta.y * dataZoom.scrollSensitivity, grid, pos);
}
}
@@ -375,25 +426,65 @@ namespace XCharts.Runtime
}
}
private void ScaleDataZoom(DataZoom dataZoom, float delta)
private void ScaleDataZoom(DataZoom dataZoom, float delta, GridCoord grid = null, Vector2? mousePos = null)
{
var grid = chart.GetGridOfDataZoom(dataZoom);
var deltaPercent = dataZoom.orient == Orient.Horizonal ?
Mathf.Abs(delta / grid.context.width * 100) :
Mathf.Abs(delta / grid.context.height * 100);
if (delta > 0)
if (grid == null) grid = chart.GetGridOfDataZoom(dataZoom);
var gridRange = dataZoom.orient == Orient.Horizonal ? grid.context.width : grid.context.height;
var currentRange = dataZoom.end - dataZoom.start;
if (delta > 0 && currentRange <= 0) return;
// Mouse position as a fraction [0,1] within the grid.
// The grid always maps the current [start,end] window onto its full pixel width,
// so this fraction directly equals the mouse's relative position inside the data window.
float fraction = 0.5f;
if (mousePos.HasValue && gridRange > 0)
{
if (dataZoom.end <= dataZoom.start)
return;
UpdateDataZoomRange(dataZoom, dataZoom.start + deltaPercent, dataZoom.end - deltaPercent);
float raw = dataZoom.orient == Orient.Horizonal
? (mousePos.Value.x - grid.context.x) / gridRange
: (mousePos.Value.y - grid.context.y) / gridRange;
bool isInverse = false;
if (dataZoom.orient == Orient.Horizonal && dataZoom.xAxisIndexs.Count > 0)
{
var xAxis = chart.GetChartComponent<XAxis>(dataZoom.xAxisIndexs[0]);
isInverse = xAxis != null && xAxis.inverse;
}
else if (dataZoom.orient == Orient.Vertical && dataZoom.yAxisIndexs.Count > 0)
{
var yAxis = chart.GetChartComponent<YAxis>(dataZoom.yAxisIndexs[0]);
isInverse = yAxis != null && yAxis.inverse;
}
fraction = Mathf.Clamp01(isInverse ? 1f - raw : raw);
}
else
// The data-space anchor (0~100) under the mouse — must stay at the same fraction after zoom.
var anchorPercent = dataZoom.start + fraction * currentRange;
// New range: proportional to current range for consistent zoom feel at any zoom level.
var deltaPercent = Mathf.Abs(delta / gridRange * currentRange);
var newRange = delta > 0 ? currentRange - deltaPercent : currentRange + deltaPercent;
// Place the new window so that anchorPercent stays under the mouse.
var start = anchorPercent - fraction * newRange;
var end = anchorPercent + (1f - fraction) * newRange;
// If the window goes out of [0,100], slide it to the boundary while keeping its size,
// so the zoom always feels consistent and the window never shrinks on one side only.
if (start < 0f)
{
UpdateDataZoomRange(dataZoom, dataZoom.start - deltaPercent, dataZoom.end + deltaPercent);
end = Mathf.Min(100f, newRange);
start = 0f;
}
else if (end > 100f)
{
start = Mathf.Max(0f, 100f - newRange);
end = 100f;
}
UpdateDataZoomRange(dataZoom, start, end, grid);
}
public void UpdateDataZoomRange(DataZoom dataZoom, float start, float end)
public void UpdateDataZoomRange(DataZoom dataZoom, float start, float end, GridCoord grid = null)
{
if (end > 100)
end = 100;
@@ -403,13 +494,30 @@ namespace XCharts.Runtime
if (end < start)
end = start;
if (dataZoom.startEndFunction != null)
dataZoom.startEndFunction(ref start, ref end);
if(dataZoom.minZoomRatio > 0)
{
if(grid == null) grid = chart.GetGridOfDataZoom(dataZoom);
var range = dataZoom.orient == Orient.Horizonal ? grid.context.width : grid.context.height;
var minRange = dataZoom.minZoomRatio * range;
var newRange = end - start;
var currentRange = dataZoom.end - dataZoom.start;
// Only block when shrinking the range; always allow expansion so the chart
// cannot get permanently locked after a marquee selects a narrow region.
if (newRange < minRange / range * 100 && newRange <= currentRange)
{
return;
}
}
if (!dataZoom.startLock)
dataZoom.start = start;
if (!dataZoom.endLock)
dataZoom.end = end;
if (dataZoom.startEndFunction != null)
dataZoom.startEndFunction(ref start, ref end);
m_LastStart = dataZoom.start;
m_LastEnd = dataZoom.end;
if (dataZoom.realtime)
@@ -444,7 +552,7 @@ namespace XCharts.Runtime
var tempPos1 = touch1.position;
var currDist = Vector2.Distance(tempPos0, tempPos1);
var lastDist = Vector2.Distance(m_LastTouchPos0, m_LastTouchPos1);
var delta = (currDist - lastDist);
var delta = currDist - lastDist;
ScaleDataZoom(dataZoom, delta / dataZoom.scrollSensitivity);
m_LastTouchPos0 = tempPos0;
m_LastTouchPos1 = tempPos1;
@@ -492,7 +600,6 @@ namespace XCharts.Runtime
}
else if (xAxis.IsTime())
{
//TODO:
dataZoom.SetStartLabelText("");
dataZoom.SetEndLabelText("");
}
@@ -532,13 +639,26 @@ namespace XCharts.Runtime
Serie serie = chart.series[0];
Axis axis = chart.GetChartComponent<YAxis>(0);
var showData = serie.GetDataList(null);
float scaleWid = dataZoom.context.width / (showData.Count - 1);
float scaleWid = showData.Count > 1 ? dataZoom.context.width / (showData.Count - 1) : dataZoom.context.width;
Vector3 lp = Vector3.zero;
Vector3 np = Vector3.zero;
double minValue = 0;
double maxValue = 0;
SeriesHelper.GetYMinMaxValue(chart, 0, axis.inverse, out minValue, out maxValue, false, false);
AxisHelper.AdjustMinMaxValue(axis, ref minValue, ref maxValue, true);
// shadow always shows the full data range, independent of DataZoom window
double minValue = SerieHelper.GetMinData(serie, 1, null, axis.inverse);
double maxValue = SerieHelper.GetMaxData(serie, 1, null, axis.inverse);
minValue = ChartHelper.GetMinDivisibleValue(minValue, 0);
maxValue = ChartHelper.GetMaxDivisibleValue(maxValue, 0);
double xMinValue = 0;
double xMaxValue = 0;
bool useXValueForShadow = false;
var xAxisIndex = dataZoom.xAxisIndexs.Count > 0 ? dataZoom.xAxisIndexs[0] : 0;
var xAxis = chart.GetChartComponent<XAxis>(xAxisIndex);
if (xAxis != null && (xAxis.IsValue() || xAxis.IsTime()))
{
xMinValue = SerieHelper.GetMinData(serie, 0, null, xAxis.inverse);
xMaxValue = SerieHelper.GetMaxData(serie, 0, null, xAxis.inverse);
AxisHelper.AdjustMinMaxValue(xAxis, ref xMinValue, ref xMaxValue, true);
useXValueForShadow = (xMaxValue - xMinValue) > 0;
}
int rate = 1;
var sampleDist = serie.sampleDist < 2 ? 2 : serie.sampleDist;
@@ -554,12 +674,40 @@ namespace XCharts.Runtime
var animationDuration = serie.animation.GetChangeDuration();
var dataAddDuration = serie.animation.GetAdditionDuration();
var unscaledTime = serie.animation.unscaledTime;
var useCurrentData = false;
List<double> sampleSumPrefix = null;
if (serie.animation.enable)
{
useCurrentData = DataHelper.IsAnyDataChanged(ref showData, serie.minShow, maxCount);
dataChanging = useCurrentData;
}
if (!useCurrentData && rate > 1 &&
(serie.sampleType == SampleType.Sum || serie.sampleType == SampleType.Average))
{
if (_sampleSumPrefixCache == null || _sampleSumPrefixMaxCount != maxCount || _sampleSumPrefixInverse != axis.inverse)
{
_sampleSumPrefixCache = DataHelper.BuildSampleSumPrefix(ref showData, maxCount, axis.inverse);
_sampleSumPrefixMaxCount = maxCount;
_sampleSumPrefixInverse = axis.inverse;
}
sampleSumPrefix = _sampleSumPrefixCache;
}
for (int i = 0; i < maxCount; i += rate)
for (int i = serie.minShow; i < maxCount; i += rate)
{
double value = DataHelper.SampleValue(ref showData, serie.sampleType, rate, serie.minShow, maxCount, totalAverage, i,
dataAddDuration, animationDuration, ref dataChanging, axis, unscaledTime);
float pX = dataZoom.context.x + i * scaleWid;
dataAddDuration, animationDuration, ref dataChanging, axis, unscaledTime,
useCurrentData, false, sampleSumPrefix);
float pX;
if (useXValueForShadow && i < showData.Count && showData[i].data.Count > 0)
{
var xVal = (xAxis != null && xAxis.inverse) ? -showData[i].data[0] : showData[i].data[0];
pX = dataZoom.context.x + (float)((xVal - xMinValue) / (xMaxValue - xMinValue)) * dataZoom.context.width;
}
else
{
pX = dataZoom.context.x + i * scaleWid;
}
float dataHig = (float)((maxValue - minValue) == 0 ? 0 :
(value - minValue) / (maxValue - minValue) * dataZoom.context.height);
np = new Vector3(pX, chart.chartY + dataZoom.bottom + dataHig);
@@ -627,11 +775,11 @@ namespace XCharts.Runtime
float scaleWid = dataZoom.context.height / (showData.Count - 1);
Vector3 lp = Vector3.zero;
Vector3 np = Vector3.zero;
double minValue = 0;
double maxValue = 0;
double minValue;
double maxValue;
SeriesHelper.GetYMinMaxValue(chart, 0, axis.inverse, out minValue, out maxValue);
AxisHelper.AdjustMinMaxValue(axis, ref minValue, ref maxValue, true);
minValue = ChartHelper.GetMinDivisibleValue(minValue, 0);
maxValue = ChartHelper.GetMaxDivisibleValue(maxValue, 0);
int rate = 1;
var sampleDist = serie.sampleDist < 2 ? 2 : serie.sampleDist;
var maxCount = showData.Count;
@@ -646,11 +794,30 @@ namespace XCharts.Runtime
var animationDuration = serie.animation.GetChangeDuration();
var dataAddDuration = serie.animation.GetAdditionDuration();
var unscaledTime = serie.animation.unscaledTime;
var useCurrentData = false;
List<double> sampleSumPrefix = null;
if (serie.animation.enable)
{
useCurrentData = DataHelper.IsAnyDataChanged(ref showData, serie.minShow, maxCount);
dataChanging = useCurrentData;
}
if (!useCurrentData && rate > 1 &&
(serie.sampleType == SampleType.Sum || serie.sampleType == SampleType.Average))
{
if (_sampleSumPrefixCache == null || _sampleSumPrefixMaxCount != maxCount || _sampleSumPrefixInverse != axis.inverse)
{
_sampleSumPrefixCache = DataHelper.BuildSampleSumPrefix(ref showData, maxCount, axis.inverse);
_sampleSumPrefixMaxCount = maxCount;
_sampleSumPrefixInverse = axis.inverse;
}
sampleSumPrefix = _sampleSumPrefixCache;
}
for (int i = 0; i < maxCount; i += rate)
for (int i = serie.minShow; i < maxCount; i += rate)
{
double value = DataHelper.SampleValue(ref showData, serie.sampleType, rate, serie.minShow, maxCount, totalAverage, i,
dataAddDuration, animationDuration, ref dataChanging, axis, unscaledTime);
dataAddDuration, animationDuration, ref dataChanging, axis, unscaledTime,
useCurrentData, false, sampleSumPrefix);
float pY = dataZoom.context.y + i * scaleWid;
float dataHig = (maxValue - minValue) == 0 ? 0 :
(float)((value - minValue) / (maxValue - minValue) * dataZoom.context.width);
@@ -692,7 +859,7 @@ namespace XCharts.Runtime
private void DrawMarquee(VertexHelper vh, DataZoom dataZoom)
{
if (!dataZoom.enable || !dataZoom.supportMarquee)
if (!dataZoom.enable || !dataZoom.supportMarquee || !dataZoom.context.isMarqueeDrag)
return;
var areaColor = dataZoom.marqueeStyle.areaStyle.GetColor(chart.theme.dataZoom.dataAreaColor);
UGL.DrawRectangle(vh, dataZoom.context.marqueeRect, areaColor);

View File

@@ -68,6 +68,50 @@ namespace XCharts.Runtime
/// </summary>
End
}
/// <summary>
/// The value-based condition for showing label. Controls visibility based on threshold comparison.
/// ||标签基于值的显示条件,通过与阈值比较来控制标签的显示。
/// </summary>
public enum ShowCondition
{
/// <summary>
/// Always show label.
/// ||总是显示标签。
/// </summary>
Always,
/// <summary>
/// Show label when value is greater than showThreshold.
/// ||大于showThreshold才显示标签。
/// </summary>
GreaterThan,
/// <summary>
/// Show label when value is less than showThreshold.
/// ||小于showThreshold才显示标签。
/// </summary>
LessThan,
}
/// <summary>
/// The data-pattern-based filter for showing label. Controls visibility based on data topology.
/// ||标签基于数据形态的显示筛选,通过数据的拓扑特征(波峰/波谷)来控制标签的显示。
/// </summary>
public enum ShowFilter
{
/// <summary>
/// All data points show label.
/// ||所有数据点都显示标签。
/// </summary>
All,
/// <summary>
/// Show label when value is at a peak.
/// ||波峰才显示标签。
/// </summary>
Peak,
/// <summary>
/// Show label when value is at a valley.
/// ||波谷才显示标签。
/// </summary>
Valley
}
[SerializeField] protected bool m_Show = true;
[SerializeField] Position m_Position = Position.Default;
@@ -80,6 +124,12 @@ namespace XCharts.Runtime
[SerializeField] protected string m_NumericFormatter = "";
[SerializeField] protected float m_Width = 0;
[SerializeField] protected float m_Height = 0;
[SerializeField][Since("v3.15.0")] protected float m_FixedX = 0;
[SerializeField][Since("v3.15.0")] protected float m_FixedY = 0;
[SerializeField][Since("v3.16.0")] protected ShowCondition m_ShowCondition = ShowCondition.Always;
[SerializeField][Since("v3.16.0")] protected ShowFilter m_ShowFilter = ShowFilter.All;
[SerializeField][Since("v3.16.0")] protected double m_ShowThreshold = 0;
[SerializeField][Since("v3.16.0")] protected float m_ShowMinGap = 0;
[SerializeField] protected IconStyle m_Icon = new IconStyle();
[SerializeField] protected ImageStyle m_Background = new ImageStyle();
@@ -98,6 +148,9 @@ namespace XCharts.Runtime
m_Height = 0;
m_NumericFormatter = "";
m_AutoOffset = false;
m_ShowCondition = ShowCondition.Always;
m_ShowFilter = ShowFilter.All;
m_ShowThreshold = 0;
}
/// <summary>
@@ -288,6 +341,65 @@ namespace XCharts.Runtime
set { if (PropertyUtil.SetStruct(ref m_AutoOffset, value)) SetAllDirty(); }
}
/// <summary>
/// the fixed x of label. When not 0, it will be fixed on the specified x value.
/// ||固定的X值。不为0时会固定在指定的X值上。
/// </summary>
public float fixedX
{
get { return m_FixedX; }
set { if (PropertyUtil.SetStruct(ref m_FixedX, value)) SetComponentDirty(); }
}
/// <summary>
/// the fixed y of label. When not 0, it will be fixed on the specified y value.
/// ||固定的Y值。不为0时会固定在指定的Y值上。
/// </summary>
public float fixedY
{
get { return m_FixedY; }
set { if (PropertyUtil.SetStruct(ref m_FixedY, value)) SetComponentDirty(); }
}
/// <summary>
/// The value-based show condition of label. Default is ShowCondition.Always.
/// When set to GreaterThan or LessThan, the label is shown only when the value satisfies the threshold.
/// ||标签基于值的显示条件。默认为ShowCondition.Always总是显示。
/// 设为GreaterThan或LessThan时只有满足showThreshold阈值条件的数据点才显示标签。
/// </summary>
public ShowCondition showCondition
{
get { return m_ShowCondition; }
set { if (PropertyUtil.SetStruct(ref m_ShowCondition, value)) SetComponentDirty(); }
}
/// <summary>
/// The data-pattern-based show filter of label. Default is ShowFilter.All.
/// When set to Peak or Valley, the label is shown only at local maximum or minimum data points.
/// ||标签基于数据形态的显示筛选。默认为ShowFilter.All所有数据点都显示。
/// 设为Peak或Valley时只在局部波峰或波谷的数据点显示标签。
/// </summary>
public ShowFilter showFilter
{
get { return m_ShowFilter; }
set { if (PropertyUtil.SetStruct(ref m_ShowFilter, value)) SetComponentDirty(); }
}
/// <summary>
/// The threshold for showCondition. When showCondition is GreaterThan or LessThan, only values that satisfy the comparison will show label. Default is 0.
/// ||showCondition的阈值。当showCondition为GreaterThan或LessThan时生效只有满足比较条件的值才显示标签。默认值为0。
/// </summary>
public double showThreshold
{
get { return m_ShowThreshold; }
set { if (PropertyUtil.SetStruct(ref m_ShowThreshold, value)) SetComponentDirty(); }
}
/// <summary>
/// the gap between label and the previous label. When the distance to the previous label is less than this value,
/// the label with smaller y value will be hidden. Default is 0, which means this function is turned off.
/// 和上一个标签的最小间距。当和上一个标签的距离小于该值时隐藏对应y值较小的标签。默认为0不开启该功能。
/// </summary>
public float showMinGap
{
get { return m_ShowMinGap; }
set { if (PropertyUtil.SetStruct(ref m_ShowMinGap, value)) SetComponentDirty(); }
}
/// <summary>
/// the sytle of background.
/// ||背景图样式。
/// </summary>
@@ -375,6 +487,8 @@ namespace XCharts.Runtime
label.m_Height = m_Height;
label.m_NumericFormatter = m_NumericFormatter;
label.m_AutoOffset = m_AutoOffset;
label.m_FixedX = m_FixedX;
label.m_FixedY = m_FixedY;
label.m_Icon.Copy(m_Icon);
label.m_Background.Copy(m_Background);
label.m_TextPadding = m_TextPadding;
@@ -394,6 +508,8 @@ namespace XCharts.Runtime
m_Height = label.m_Height;
m_NumericFormatter = label.m_NumericFormatter;
m_AutoOffset = label.m_AutoOffset;
m_FixedX = label.m_FixedX;
m_FixedY = label.m_FixedY;
m_Icon.Copy(label.m_Icon);
m_Background.Copy(label.m_Background);
m_TextPadding = label.m_TextPadding;
@@ -461,10 +577,10 @@ namespace XCharts.Runtime
private static bool isDateFormatter = false;
private static string newFormatter = null;
public string GetFormatterDateTime(int labelIndex, int totalIndex, double value, double minValue, double maxValue)
public string GetFormatterDateTime(int labelIndex, int totalIndex, double value, double minValue, double maxValue, bool local)
{
var timestamp = (int)value;
var dateTime = DateTimeUtil.GetDateTime(timestamp);
var timestamp = value;
var dateTime = DateTimeUtil.GetDateTime(timestamp, local);
var dateString = string.Empty;
if (string.IsNullOrEmpty(numericFormatter) || numericFormatter.Equals("f2"))
{
@@ -477,7 +593,7 @@ namespace XCharts.Runtime
if (DateTimeUtil.IsDateOrTimeRegex(numericFormatter, ref isDateFormatter, ref newFormatter))
{
if (isDateFormatter)
dateString = ChartCached.NumberToDateStr(timestamp, newFormatter);
dateString = ChartCached.NumberToDateStr(timestamp, newFormatter, local);
else
dateString = ChartCached.NumberToTimeStr(timestamp, newFormatter);
}

View File

@@ -45,7 +45,7 @@ namespace XCharts.Runtime
{
var content = serieLabel.formatter;
FormatterHelper.ReplaceSerieLabelContent(ref content, numericFormatter, serie.dataCount, dataValue,
dataTotal, serieName, dataName, dataName, color, serieData, chart, serie.index);
dataTotal, serieName, dataName, dataName, color, serieData, chart, serie.index, serie.useSortData);
if (serieLabel.formatterFunction == null)
return content;
else
@@ -53,6 +53,22 @@ namespace XCharts.Runtime
}
}
public static string GetTitleFormatterContent(Serie serie, SerieData serieData,
int dataIndex, LabelStyle titleStyle, BaseChart chart)
{
string content;
if (string.IsNullOrEmpty(titleStyle.formatter))
{
content = serieData.name;
}
else
{
content = titleStyle.formatter;
FormatterHelper.ReplaceContent(ref content, dataIndex, titleStyle.numericFormatter, serie, chart, null, serieData);
}
return content;
}
public static void SetGaugeLabelText(Serie serie)
{
var serieData = serie.GetSerieData(0);

View File

@@ -79,6 +79,9 @@ namespace XCharts.Runtime
[SerializeField] private float m_ItemGap = 10f;
[SerializeField] private bool m_ItemAutoColor = true;
[SerializeField] private float m_ItemOpacity = 1;
[SerializeField][Since("v3.15.0")] private float m_ItemInactiveOpacity = 1;
[SerializeField][Since("v3.16.0")] private float m_Width = 0;
[SerializeField][Since("v3.16.0")] private float m_Height = 0;
[SerializeField] private string m_Formatter;
[SerializeField] private LabelStyle m_LabelStyle = new LabelStyle();
[SerializeField][Since("v3.10.0")] private TextLimit m_TextLimit = new TextLimit();
@@ -182,6 +185,15 @@ namespace XCharts.Runtime
set { if (PropertyUtil.SetStruct(ref m_ItemOpacity, value)) SetComponentDirty(); }
}
/// <summary>
/// the opacity of item color when item is inactive.
/// ||图例标记的图形在非激活状态下的颜色透明度。
/// </summary>
public float itemInactiveOpacity
{
get { return m_ItemInactiveOpacity; }
set { if (PropertyUtil.SetStruct(ref m_ItemInactiveOpacity, value)) SetComponentDirty(); }
}
/// <summary>
/// No longer used, the use of LabelStyle.formatter instead.
/// ||不再使用使用LabelStyle.formatter代替。
/// </summary>
@@ -192,6 +204,25 @@ namespace XCharts.Runtime
set { if (PropertyUtil.SetClass(ref m_Formatter, value)) SetComponentDirty(); }
}
/// <summary>
/// the width of legend component. Default is 0 for auto adapt. When set a value between 0 and 1, it means the percentage relative to chart width and height.
/// ||图例组件的宽。默认为0自适应。当设置0-1的值时表示相对于图表宽高的比例。
/// </summary>
public float width
{
get { return m_Width; }
set { if (PropertyUtil.SetStruct(ref m_Width, value)) SetComponentDirty(); }
}
/// <summary>
/// the height of legend component. Default is 0 for auto adapt. When set a value between 0 and 1, it means the percentage relative to chart width and height.
/// ||图例组件的高。默认为0自适应。当设置0-1的值时表示相对于图表宽高的比例。
/// </summary>
/// <value></value>
public float height
{
get { return m_Height; }
set { if (PropertyUtil.SetStruct(ref m_Height, value)) SetComponentDirty(); }
}
/// <summary>
/// the style of text.
/// ||文本样式。
/// </summary>

View File

@@ -92,15 +92,15 @@ namespace XCharts.Runtime
{
if (!SeriesHelper.IsLegalLegendName(datas[i])) continue;
string legendName = datas[i];
var serieIndex = isAnySerieColorByData ? 0 : i;
var dataIndex = isAnySerieColorByData ? i : 0;
var serieIndex = isAnySerieColorByData ? 0 : i;
var dataIndex = isAnySerieColorByData ? i : 0;
var legendContent = GetFormatterContent(legend, dataIndex, datas[i], serieIndex);
if (legend.textLimit.enable)
legendContent = legend.textLimit.GetLimitContent(legendContent);
var readIndex = chart.m_LegendRealShowName.IndexOf(datas[i]);
var active = chart.IsActiveByLegend(datas[i]);
var bgColor = LegendHelper.GetIconColor(chart, legend, readIndex, datas[i], active);
bgColor.a = legend.itemOpacity;
bgColor.a = active ? legend.itemOpacity : legend.itemInactiveOpacity;
var item = LegendHelper.AddLegendItem(chart, legend, i, legendName, legendObject.transform, chart.theme,
legendContent, bgColor, active, readIndex);
legend.SetButton(legendName, item, totalLegend);

View File

@@ -16,7 +16,7 @@ namespace XCharts.Runtime
else
return !ChartHelper.IsClearColor(textStyle.color) ? textStyle.color : theme.legend.textColor;
}
else return theme.legend.unableColor;
else return theme.legend.inactiveColor;
}
public static Color GetIconColor(BaseChart chart, Legend legend, int readIndex, string legendName, bool active)
@@ -30,7 +30,7 @@ namespace XCharts.Runtime
else
return legend.GetColor(readIndex);
}
else return chart.theme.legend.unableColor;
else return chart.theme.legend.inactiveColor;
}
public static LegendItem AddLegendItem(BaseChart chart, Legend legend, int i, string legendName, Transform parent,
@@ -93,10 +93,23 @@ namespace XCharts.Runtime
var startY = 0f;
var legendMaxWidth = chartWidth - legend.location.runtimeLeft - legend.location.runtimeRight;
var legendMaxHeight = chartHeight - legend.location.runtimeTop - legend.location.runtimeBottom;
var isVertical = legend.orient == Orient.Vertical;
var fixedWidth = legend.width <= 0 ? 0
: legend.width < 1 ? chartWidth * legend.width
: legend.width;
var fixedHeight = legend.height <= 0 ? 0
: legend.height < 1 ? chartHeight * legend.height
: legend.height;
// Horizonal: width constrains layout wrapping; Vertical: height constrains layout wrapping.
// The other axis only affects the background size, not the layout.
if (!isVertical && fixedWidth > 0) legendMaxWidth = fixedWidth;
if (isVertical && fixedHeight > 0) legendMaxHeight = fixedHeight;
UpdateLegendWidthAndHeight(legend, legendMaxWidth, legendMaxHeight);
// Override context size for fixed dimensions (controls background rect size).
if (fixedWidth > 0) legend.context.width = fixedWidth;
if (fixedHeight > 0) legend.context.height = fixedHeight;
var legendRuntimeWidth = legend.context.width;
var legendRuntimeHeight = legend.context.height;
var isVertical = legend.orient == Orient.Vertical;
switch (legend.location.align)
{
case Location.Align.TopCenter:
@@ -198,11 +211,14 @@ namespace XCharts.Runtime
legend.context.eachHeight = 0;
if (legend.orient == Orient.Horizonal)
{
var maxRowWidth = 0f;
foreach (var kv in legend.context.buttonList)
{
if (width + kv.Value.width > maxWidth)
{
realWidth = width - legend.itemGap;
if (realWidth > maxRowWidth)
maxRowWidth = realWidth;
realHeight += height + legend.itemGap;
if (legend.context.eachHeight < height + legend.itemGap)
{
@@ -216,8 +232,10 @@ namespace XCharts.Runtime
height = kv.Value.height;
}
width -= legend.itemGap;
if (width > maxRowWidth)
maxRowWidth = width;
legend.context.height = realHeight + height;
legend.context.width = realWidth > 0 ? realWidth : width;
legend.context.width = maxRowWidth;
}
else
{

View File

@@ -40,7 +40,7 @@ namespace XCharts.Runtime
private void InitMarkArea(MarkArea markArea)
{
markArea.painter = chart.m_PainterUpper;
markArea.refreshComponent = delegate()
markArea.refreshComponent = delegate ()
{
var label = ChartHelper.AddChartLabel("label", m_MarkLineLabelRoot.transform, markArea.label, chart.theme.axis,
component.text, Color.clear, TextAnchor.MiddleCenter);
@@ -142,31 +142,12 @@ namespace XCharts.Runtime
else if (data.yValue != 0)
{
data.runtimeValue = data.yValue;
if (yAxis.IsCategory())
{
var pY = AxisHelper.GetAxisPosition(grid, yAxis, data.yValue, showData.Count, dataZoom);
return start ?
new Vector3(grid.context.x, pY) :
new Vector3(grid.context.x + grid.context.width, pY);
}
else
{
return GetPosition(xAxis, yAxis, grid, data.runtimeValue, start);
}
return GetPosition(yAxis, grid, data.runtimeValue, start);
}
else
{
data.runtimeValue = data.xValue;
if (xAxis.IsCategory())
{
var pX = AxisHelper.GetAxisPosition(grid, xAxis, data.xValue, showData.Count, dataZoom);
return start ? new Vector3(pX, grid.context.y + grid.context.height) :
new Vector3(pX, grid.context.y);
}
else
{
return GetPosition(xAxis, yAxis, grid, data.xValue, start);
}
return GetPosition(xAxis, grid, data.xValue, start);
}
default:
break;
@@ -178,16 +159,28 @@ namespace XCharts.Runtime
{
if (yAxis.IsCategory())
{
var pX = AxisHelper.GetAxisPosition(grid, xAxis, value);
return GetPosition(xAxis, grid, value, start);
}
else
{
return GetPosition(yAxis, grid, value, start);
}
}
private Vector3 GetPosition(Axis axis, GridCoord grid, double value, bool start)
{
if (axis is XAxis)
{
var pX = AxisHelper.GetAxisPosition(grid, axis, value);
return start ?
new Vector3(pX, grid.context.y + grid.context.height) :
new Vector3(pX, grid.context.y);
}
else
{
var pY = AxisHelper.GetAxisPosition(grid, yAxis, value);
var pY = AxisHelper.GetAxisPosition(grid, axis, value);
return start ?
new Vector3(grid.context.x, pY + grid.context.height) :
new Vector3(grid.context.x, pY) :
new Vector3(grid.context.x + grid.context.width, pY);
}
}

View File

@@ -4,25 +4,34 @@ using UnityEngine;
namespace XCharts.Runtime
{
/// <summary>
/// 标线类型
/// Mark line type.
/// ||标线类型
/// </summary>
public enum MarkLineType
{
None,
/// <summary>
/// 最小值。
/// Custom. You can customize the xy coordinates or values.
/// ||自定义。可自定义xy坐标或数值。
/// </summary>
Custom,
/// <summary>
/// Minimum value.
/// ||最小值。
/// </summary>
Min,
/// <summary>
/// 最大值。
/// Maximum value.
/// ||最大值。
/// </summary>
Max,
/// <summary>
/// 平均值。
/// Average value.
/// ||平均值。
/// </summary>
Average,
/// <summary>
/// 中位数。
/// Median.
/// ||中位数。
/// </summary>
Median
}
@@ -118,7 +127,7 @@ namespace XCharts.Runtime
[System.Serializable]
public class MarkLineData : ChildComponent
{
[SerializeField] private MarkLineType m_Type = MarkLineType.None;
[SerializeField] private MarkLineType m_Type = MarkLineType.Custom;
[SerializeField] private string m_Name;
[SerializeField] private int m_Dimension = 1;
[SerializeField] private float m_XPosition;
@@ -170,7 +179,7 @@ namespace XCharts.Runtime
}
/// <summary>
/// The x coordinate relative to the origin, in pixels.
/// ||相对原点的 x 坐标单位像素。当type为None时有效。
/// ||相对原点的 x 坐标单位像素。当type为Custom时有效。
/// </summary>
public float xPosition
{
@@ -179,7 +188,7 @@ namespace XCharts.Runtime
}
/// <summary>
/// The y coordinate relative to the origin, in pixels.
/// ||相对原点的 y 坐标单位像素。当type为None时有效。
/// ||相对原点的 y 坐标单位像素。当type为Custom时有效。
/// </summary>
public float yPosition
{
@@ -188,7 +197,7 @@ namespace XCharts.Runtime
}
/// <summary>
/// The value specified on the X-axis. A value specified when the X-axis is the category axis represents the index of the category axis data, otherwise a specific value.
/// ||X轴上的指定值。当X轴为类目轴时指定值表示类目轴数据的索引否则为具体的值。当type为None时有效。
/// ||X轴上的指定值。当X轴为类目轴时指定值表示类目轴数据的索引否则为具体的值。当type为Custom时有效。
/// </summary>
public double xValue
{
@@ -197,7 +206,7 @@ namespace XCharts.Runtime
}
/// <summary>
/// That's the value on the Y-axis. The value specified when the Y axis is the category axis represents the index of the category axis data, otherwise the specific value.
/// ||Y轴上的指定值。当Y轴为类目轴时指定值表示类目轴数据的索引否则为具体的值。当type为None时有效。
/// ||Y轴上的指定值。当Y轴为类目轴时指定值表示类目轴数据的索引否则为具体的值。当type为Custom时有效。
/// </summary>
public double yValue
{

View File

@@ -146,7 +146,7 @@ namespace XCharts.Runtime
data.runtimeValue = SerieHelper.GetMedianData(serie, data.dimension, dataZoom);
GetStartEndPos(yAxis, grid, data.runtimeValue, ref sp, ref ep);
break;
case MarkLineType.None:
case MarkLineType.Custom:
if (data.xPosition != 0)
{
data.runtimeValue = data.xPosition;
@@ -292,18 +292,20 @@ namespace XCharts.Runtime
switch (data.type)
{
case MarkLineType.Min:
var serieData = SerieHelper.GetMinSerieData(serie, data.dimension, dataZoom);
var serieData = SerieHelper.GetMinSerieData(serie, data.dimension, null);
data.runtimeValue = serieData.GetData(data.dimension);
var pX = GetAxisPosition(grid, xAxis, dataZoom, serieDataCount, serieData.index);
var pY = GetAxisPosition(grid, yAxis, dataZoom, serieDataCount, data.runtimeValue);
return new Vector3(pX, pY);
//return new Vector3(pX, pY);
return serieData.context.position;
case MarkLineType.Max:
serieData = SerieHelper.GetMaxSerieData(serie, data.dimension, dataZoom);
serieData = SerieHelper.GetMaxSerieData(serie, data.dimension, null);
data.runtimeValue = serieData.GetData(data.dimension);
pX = GetAxisPosition(grid, xAxis, dataZoom, serieDataCount, serieData.index);
pY = GetAxisPosition(grid, yAxis, dataZoom, serieDataCount, data.runtimeValue);
return new Vector3(pX, pY);
case MarkLineType.None:
//return new Vector3(pX, pY);
return serieData.context.position;
case MarkLineType.Custom:
if (data.zeroPosition)
{
data.runtimeValue = 0;

View File

@@ -8,7 +8,7 @@ namespace XCharts.Runtime
/// ||标题组件,包含主标题和副标题。
/// </summary>
[Serializable]
[ComponentHandler(typeof(TitleHander), true)]
[ComponentHandler(typeof(TitleHandler), true)]
public class Title : MainComponent, IPropertyChanged
{
[SerializeField] private bool m_Show = true;

View File

@@ -3,7 +3,7 @@ using UnityEngine;
namespace XCharts.Runtime
{
[UnityEngine.Scripting.Preserve]
internal sealed class TitleHander : MainComponentHandler<Title>
public sealed class TitleHandler : MainComponentHandler<Title>
{
private static readonly string s_TitleObjectName = "title";
private static readonly string s_SubTitleObjectName = "title_sub";
@@ -14,50 +14,68 @@ namespace XCharts.Runtime
{
var title = component;
title.painter = null;
title.refreshComponent = delegate()
title.refreshComponent = delegate ()
{
title.OnChanged();
var anchorMin = title.location.runtimeAnchorMin;
var anchorMax = title.location.runtimeAnchorMax;
var pivot = title.location.runtimePivot;
var objName = ChartCached.GetComponentObjectName(title);
var titleObject = ChartHelper.AddObject(objName, chart.transform, anchorMin, anchorMax,
pivot, chart.chartSizeDelta, -1, chart.childrenNodeNames);
title.gameObject = titleObject;
title.gameObject.transform.SetSiblingIndex(chart.m_PainterUpper.transform.GetSiblingIndex() + 1);
anchorMin = title.location.runtimeAnchorMin;
anchorMax = title.location.runtimeAnchorMax;
pivot = title.location.runtimePivot;
var fontSize = title.labelStyle.textStyle.GetFontSize(chart.theme.title);
ChartHelper.UpdateRectTransform(titleObject, anchorMin, anchorMax, pivot, new Vector2(chart.chartWidth, chart.chartHeight));
var titlePosition = chart.GetTitlePosition(title);
var subTitlePosition = -new Vector3(0, fontSize + title.itemGap, 0);
var titleObject = AddTitleObject(chart, title, chart.theme.title, chart.m_PainterUpper.transform.GetSiblingIndex() + 1);
titleObject.transform.localPosition = titlePosition;
titleObject.hideFlags = chart.chartHideFlags;
ChartHelper.HideAllObject(titleObject);
m_LabelObject = AddTitleLabel(titleObject.transform, title, chart.theme.title, chart);
m_SubLabelObject = AddSubTitleLabel(titleObject.transform, title, chart.theme.subTitle, chart);
m_LabelObject = ChartHelper.AddChartLabel(s_TitleObjectName, titleObject.transform, title.labelStyle, chart.theme.title,
GetTitleText(title), Color.clear, title.location.runtimeTextAlignment);
m_LabelObject.SetActive(title.show && title.labelStyle.show, true);
m_SubLabelObject = ChartHelper.AddChartLabel(s_SubTitleObjectName, titleObject.transform, title.subLabelStyle, chart.theme.subTitle,
GetSubTitleText(title), Color.clear, title.location.runtimeTextAlignment);
m_SubLabelObject.SetActive(title.show && title.subLabelStyle.show, true);
m_SubLabelObject.transform.localPosition = subTitlePosition + title.subLabelStyle.offset;
};
title.refreshComponent();
}
public static GameObject AddTitleObject(BaseGraph graph, Title title, ComponentTheme componentTheme, int titleSiblingIndex, string objectName = null)
{
var anchorMin = title.location.runtimeAnchorMin;
var anchorMax = title.location.runtimeAnchorMax;
var pivot = title.location.runtimePivot;
var objName = objectName == null ? ChartCached.GetComponentObjectName(title) : objectName;
var titleObject = ChartHelper.AddObject(objName, graph.transform, anchorMin, anchorMax,
pivot, graph.graphSizeDelta, -1, graph.childrenNodeNames);
title.gameObject = titleObject;
title.gameObject.transform.SetSiblingIndex(titleSiblingIndex);
anchorMin = title.location.runtimeAnchorMin;
anchorMax = title.location.runtimeAnchorMax;
pivot = title.location.runtimePivot;
ChartHelper.UpdateRectTransform(titleObject, anchorMin, anchorMax, pivot, new Vector2(graph.graphWidth, graph.graphHeight));
var titlePosition = graph.GetTitlePosition(title);
titleObject.transform.localPosition = titlePosition;
titleObject.hideFlags = graph.chartHideFlags;
ChartHelper.HideAllObject(titleObject);
return titleObject;
}
public static ChartLabel AddTitleLabel(Transform parent, Title title, ComponentTheme componentTheme, BaseChart chart = null)
{
var m_LabelObject = ChartHelper.AddChartLabel(s_TitleObjectName, parent, title.labelStyle, componentTheme,
GetTitleText(title, chart), Color.clear, title.location.runtimeTextAlignment);
m_LabelObject.SetActive(title.show && title.labelStyle.show, true);
return m_LabelObject;
}
public static ChartLabel AddSubTitleLabel(Transform parent, Title title, ComponentTheme componentTheme, BaseChart chart = null)
{
var fontSize = title.labelStyle.textStyle.GetFontSize(componentTheme);
var subTitlePosition = -new Vector3(0, fontSize + title.itemGap, 0);
var m_SubLabelObject = ChartHelper.AddChartLabel(s_SubTitleObjectName, parent, title.subLabelStyle, componentTheme,
GetSubTitleText(title, chart), Color.clear, title.location.runtimeTextAlignment);
m_SubLabelObject.SetActive(title.show && title.subLabelStyle.show, true);
m_SubLabelObject.transform.localPosition = subTitlePosition + title.subLabelStyle.offset;
return m_SubLabelObject;
}
public override void OnSerieDataUpdate(int serieIndex)
{
if (m_LabelObject != null && FormatterHelper.NeedFormat(component.text))
m_LabelObject.SetText(GetTitleText(component));
m_LabelObject.SetText(GetTitleText(component, chart));
if (m_SubLabelObject != null && FormatterHelper.NeedFormat(component.subText))
m_SubLabelObject.SetText(GetSubTitleText(component));
m_SubLabelObject.SetText(GetSubTitleText(component, chart));
}
private string GetTitleText(Title title)
private static string GetTitleText(Title title, BaseChart chart)
{
if (FormatterHelper.NeedFormat(title.text))
{
@@ -71,7 +89,7 @@ namespace XCharts.Runtime
}
}
private string GetSubTitleText(Title title)
private static string GetSubTitleText(Title title, BaseChart chart)
{
if (FormatterHelper.NeedFormat(title.subText))
{

View File

@@ -155,7 +155,7 @@ namespace XCharts.Runtime
[SerializeField]
private List<LabelStyle> m_ContentLabelStyles = new List<LabelStyle>()
{
new LabelStyle() { textPadding = new TextPadding(0, 5, 0, 0), textStyle = new TextStyle() { alignment = TextAnchor.MiddleCenter } },
new LabelStyle() { textPadding = new TextPadding(0, 5, 0, 0), textStyle = new TextStyle() { alignment = TextAnchor.MiddleLeft } },
new LabelStyle() { textPadding = new TextPadding(0, 20, 0, 0), textStyle = new TextStyle() { alignment = TextAnchor.MiddleLeft } },
new LabelStyle() { textPadding = new TextPadding(0, 0, 0, 0), textStyle = new TextStyle() { alignment = TextAnchor.MiddleRight } }
};

View File

@@ -11,6 +11,8 @@ namespace XCharts.Runtime
internal sealed class TooltipHandler : MainComponentHandler<Tooltip>
{
private Dictionary<string, ChartLabel> m_IndicatorLabels = new Dictionary<string, ChartLabel>();
private Dictionary<Serie, Dictionary<int, List<SerieData>>> m_SortedAxisDataCache =
new Dictionary<Serie, Dictionary<int, List<SerieData>>>();
private GameObject m_LabelRoot;
private ISerieContainer m_PointerContainer;
@@ -255,6 +257,11 @@ namespace XCharts.Runtime
{
if (label == null) return;
if (double.IsNaN(axis.context.pointerValue)) return;
if (!axis.show || !axis.indicatorLabel.show)
{
label.SetActive(false, false);
return;
}
label.SetActive(true, true);
label.SetTextActive(true);
label.SetPosition(axis.context.pointerLabelPosition + axis.indicatorLabel.offset);
@@ -268,7 +275,7 @@ namespace XCharts.Runtime
}
else if (axis.IsTime())
{
label.SetText(axis.indicatorLabel.GetFormatterDateTime(0, 0, axis.context.pointerValue, axis.context.minValue, axis.context.maxValue));
label.SetText(axis.indicatorLabel.GetFormatterDateTime(0, 0, axis.context.pointerValue, axis.context.minValue, axis.context.maxValue, !chart.useUtc));
}
else
{
@@ -356,7 +363,7 @@ namespace XCharts.Runtime
if (isTriggerAxis)
{
var index = serie.context.dataZoomStartIndex + (int)yAxis.context.pointerValue;
if(serie.useSortData) index = yAxis.context.sortedDataIndices[index];
if (serie.useSortData) index = yAxis.context.sortedDataIndices[index];
serie.context.pointerEnter = true;
serie.context.pointerAxisDataIndexs.Add(index);
serie.context.pointerItemDataIndex = index;
@@ -376,7 +383,7 @@ namespace XCharts.Runtime
if (isTriggerAxis)
{
var index = serie.context.dataZoomStartIndex + (int)xAxis.context.pointerValue;
if(serie.useSortData) index = xAxis.context.sortedDataIndices[index];
if (serie.useSortData) index = xAxis.context.sortedDataIndices[index];
if (chart.isTriggerOnClick)
{
if (serie.insertDataToHead)
@@ -420,8 +427,10 @@ namespace XCharts.Runtime
private void GetSerieDataByXYAxis(Serie serie, Axis xAxis, Axis yAxis)
{
var xAxisIndex = AxisHelper.GetAxisValueSplitIndex(xAxis, xAxis.context.pointerValue, false);
var yAxisIndex = AxisHelper.GetAxisValueSplitIndex(yAxis, yAxis.context.pointerValue, false);
var xPointerInternal = xAxis.inverse ? -xAxis.context.pointerValue : xAxis.context.pointerValue;
var yPointerInternal = yAxis.inverse ? -yAxis.context.pointerValue : yAxis.context.pointerValue;
var xAxisIndex = AxisHelper.GetAxisValueSplitIndex(xAxis, xPointerInternal, false);
var yAxisIndex = AxisHelper.GetAxisValueSplitIndex(yAxis, yPointerInternal, false);
serie.context.pointerItemDataIndex = -1;
if (serie is Heatmap)
{
@@ -434,8 +443,10 @@ namespace XCharts.Runtime
}
foreach (var serieData in serie.data)
{
var x = AxisHelper.GetAxisValueSplitIndex(xAxis, serieData.GetData(0), true);
var y = AxisHelper.GetAxisValueSplitIndex(yAxis, serieData.GetData(1), true);
var xData = xAxis.inverse ? -serieData.GetData(0) : serieData.GetData(0);
var yData = yAxis.inverse ? -serieData.GetData(1) : serieData.GetData(1);
var x = AxisHelper.GetAxisValueSplitIndex(xAxis, xData, true);
var y = AxisHelper.GetAxisValueSplitIndex(yAxis, yData, true);
if (xAxisIndex == x && y == yAxisIndex)
{
serie.context.pointerItemDataIndex = serieData.index;
@@ -446,40 +457,140 @@ namespace XCharts.Runtime
private void GetSerieDataIndexByAxis(Serie serie, Axis axis, GridCoord grid, int dimension = 0)
{
var currValue = 0d;
var lastValue = 0d;
var nextValue = 0d;
var axisValue = axis.context.pointerValue;
var isTimeAxis = axis.IsTime();
var dataCount = serie.dataCount;
var themeSymbolSize = chart.theme.serie.scatterSymbolSize;
var data = serie.data;
if (!isTimeAxis)// || serie.useSortData)
serie.context.pointerAxisDataIndexs.Clear();
if (axis.IsTime())
{
serie.context.sortedData.Clear();
for (int i = 0; i < dataCount; i++)
FindSerieDataIndexByAxisLinear(serie, axis, axisValue, dimension);
}
else
{
var sortedData = GetSortedAxisData(serie, dimension);
var nearestIndex = GetNearestSerieDataIndex(sortedData, axisValue, dimension, axis.context.tickValue);
if (nearestIndex >= 0)
serie.context.pointerAxisDataIndexs.Add(nearestIndex);
}
if (serie.context.pointerAxisDataIndexs.Count > 0)
{
var index = serie.context.pointerAxisDataIndexs[0];
serie.context.pointerItemDataIndex = index;
var dataValue = serie.GetSerieData(index).GetData(dimension);
axis.context.axisTooltipValue = axis.inverse ? -dataValue : dataValue;
}
else
{
serie.context.pointerItemDataIndex = -1;
axis.context.axisTooltipValue = 0;
}
}
private List<SerieData> GetSortedAxisData(Serie serie, int dimension)
{
Dictionary<int, List<SerieData>> dimensionCache;
if (!m_SortedAxisDataCache.TryGetValue(serie, out dimensionCache))
{
dimensionCache = new Dictionary<int, List<SerieData>>();
m_SortedAxisDataCache[serie] = dimensionCache;
}
List<SerieData> sortedData;
if (!dimensionCache.TryGetValue(dimension, out sortedData))
{
sortedData = new List<SerieData>();
dimensionCache[dimension] = sortedData;
}
if (serie.dataDirty || sortedData.Count != serie.dataCount)
{
sortedData.Clear();
for (int i = 0; i < serie.dataCount; i++)
{
var serieData = serie.data[i];
serie.context.sortedData.Add(serieData);
sortedData.Add(serie.data[i]);
}
serie.context.sortedData.Sort(delegate (SerieData a, SerieData b)
sortedData.Sort(delegate (SerieData a, SerieData b)
{
return a.GetData(dimension).CompareTo(b.GetData(dimension));
});
data = serie.context.sortedData;
}
serie.context.pointerAxisDataIndexs.Clear();
return sortedData;
}
private int GetNearestSerieDataIndex(List<SerieData> sortedData, double axisValue, int dimension, double tickValue)
{
var dataCount = sortedData.Count;
if (dataCount <= 0) return -1;
if (dataCount == 1)
{
var currValue = sortedData[0].GetData(dimension);
var diff = tickValue * 0.5f;
return axisValue >= currValue - diff && axisValue <= currValue + diff
? sortedData[0].index
: -1;
}
var firstValue = sortedData[0].GetData(dimension);
var secondValue = sortedData[1].GetData(dimension);
if (axisValue <= firstValue + (secondValue - firstValue) / 2)
return sortedData[0].index;
var lastValue = sortedData[dataCount - 1].GetData(dimension);
var beforeLastValue = sortedData[dataCount - 2].GetData(dimension);
if (axisValue > beforeLastValue + (lastValue - beforeLastValue) / 2)
return sortedData[dataCount - 1].index;
var low = 1;
var high = dataCount - 2;
while (low <= high)
{
var mid = (low + high) / 2;
var prevValue = sortedData[mid - 1].GetData(dimension);
var currValue = sortedData[mid].GetData(dimension);
var nextValue = sortedData[mid + 1].GetData(dimension);
var leftBound = currValue - (currValue - prevValue) / 2;
var rightBound = currValue + (nextValue - currValue) / 2;
if (axisValue > leftBound && axisValue <= rightBound)
return sortedData[mid].index;
if (axisValue <= leftBound)
high = mid - 1;
else
low = mid + 1;
}
return -1;
}
private void FindSerieDataIndexByAxisLinear(Serie serie, Axis axis, double axisValue, int dimension)
{
var currValue = 0d;
var lastValue = 0d;
var nextValue = 0d;
var dataCount = serie.dataCount;
var data = serie.data;
for (int i = 0; i < dataCount; i++)
{
var serieData = data[i];
currValue = serieData.GetData(dimension);
if (i == 0 && i + 1 < dataCount)
if (i == 0)
{
nextValue = data[i + 1].GetData(dimension);
if (axisValue <= currValue + (nextValue - currValue) / 2)
if (i + 1 < dataCount)
{
serie.context.pointerAxisDataIndexs.Add(serieData.index);
break;
nextValue = data[i + 1].GetData(dimension);
if (axisValue <= currValue + (nextValue - currValue) / 2)
{
serie.context.pointerAxisDataIndexs.Add(serieData.index);
break;
}
}
else
{
var diff = axis.context.tickValue * 0.5f;
if (axisValue >= currValue - diff && axisValue <= currValue + diff)
{
serie.context.pointerAxisDataIndexs.Add(serieData.index);
break;
}
}
}
else if (i == dataCount - 1)
@@ -501,28 +612,18 @@ namespace XCharts.Runtime
}
lastValue = currValue;
}
if (serie.context.pointerAxisDataIndexs.Count > 0)
{
var index = serie.context.pointerAxisDataIndexs[0];
serie.context.pointerItemDataIndex = index;
axis.context.axisTooltipValue = serie.GetSerieData(index).GetData(dimension);
}
else
{
serie.context.pointerItemDataIndex = -1;
axis.context.axisTooltipValue = 0;
}
}
private void GetSerieDataIndexByItem(Serie serie, Axis axis, GridCoord grid, int dimension = 0)
{
if (serie.context.pointerItemDataIndex >= 0)
{
axis.context.axisTooltipValue = serie.GetSerieData(serie.context.pointerItemDataIndex).GetData(dimension);
var dataValue = serie.GetSerieData(serie.context.pointerItemDataIndex).GetData(dimension);
axis.context.axisTooltipValue = axis.inverse ? -dataValue : dataValue;
}
else if (component.type == Tooltip.Type.Cross)
{
axis.context.axisTooltipValue = axis.context.pointerValue;
axis.context.axisTooltipValue = axis.inverse ? -axis.context.pointerValue : axis.context.pointerValue;
}
else
{
@@ -616,7 +717,21 @@ namespace XCharts.Runtime
var serieData = serie.GetSerieData(serie.context.pointerItemDataIndex);
if (serieData != null)
{
tooltip.context.data.title = DateTimeUtil.GetDefaultDateTimeString((int)serieData.GetData(0), axisRange);
var value = (int)serieData.GetData(0);
if (string.IsNullOrEmpty(tooltip.titleLabelStyle.numericFormatter))
tooltip.context.data.title = DateTimeUtil.GetDefaultDateTimeString(value, axisRange, !chart.useUtc);
else
{
var dateTime = DateTimeUtil.GetDateTime(value, !chart.useUtc);
try
{
tooltip.context.data.title = dateTime.ToString(tooltip.titleLabelStyle.numericFormatter);
}
catch
{
tooltip.context.data.title = DateTimeUtil.GetDefaultDateTimeString(value, axisRange, !chart.useUtc);
}
}
}
}
serie.handler.UpdateTooltipSerieParams(dataIndex, showCategory, category,
@@ -706,6 +821,7 @@ namespace XCharts.Runtime
private void DrawXAxisIndicator(VertexHelper vh, Tooltip tooltip, GridCoord grid)
{
if (!tooltip.lineStyle.show) return;
var xAxes = chart.GetChartComponents<XAxis>();
var lineType = tooltip.lineStyle.GetType(chart.theme.tooltip.lineType);
var lineWidth = tooltip.lineStyle.GetWidth(chart.theme.tooltip.lineWidth);

View File

@@ -16,8 +16,9 @@ namespace XCharts.Runtime
else
{
tooltip.context.data.title = tooltip.titleFormatter;
FormatterHelper.ReplaceContent(ref tooltip.context.data.title, -1,
tooltip.numericFormatter, null, chart);
var numericFormatter = string.IsNullOrEmpty(tooltip.titleLabelStyle.numericFormatter)
? tooltip.numericFormatter : tooltip.titleLabelStyle.numericFormatter;
FormatterHelper.ReplaceContent(ref tooltip.context.data.title, -1, numericFormatter, null, chart);
}
}
for (int i = tooltip.context.data.param.Count - 1; i >= 0; i--)
@@ -56,7 +57,7 @@ namespace XCharts.Runtime
public static bool IsIgnoreFormatter(string itemFormatter)
{
return "-".Equals(itemFormatter) ||"{i}".Equals(itemFormatter, StringComparison.CurrentCultureIgnoreCase);
return "-".Equals(itemFormatter) || "{i}".Equals(itemFormatter, StringComparison.CurrentCultureIgnoreCase);
}
public static void LimitInRect(BaseChart chart, Tooltip tooltip, Rect chartRect)

View File

@@ -260,6 +260,7 @@ namespace XCharts.Runtime
view.layout.childControlWidth = false;
view.layout.childForceExpandHeight = false;
view.layout.childForceExpandWidth = false;
view.layout.childAlignment = tooltip.titleLabelStyle.textStyle.alignment;
view.layout.padding = new RectOffset(tooltip.paddingLeftRight,
tooltip.paddingLeftRight,
tooltip.paddingTopBottom,

View File

@@ -12,7 +12,7 @@ namespace XCharts.Runtime
{
var grid = component;
grid.painter = chart.painter;
grid.refreshComponent = delegate()
grid.refreshComponent = delegate ()
{
grid.UpdateRuntimeData(chart);
chart.OnCoordinateChanged();
@@ -51,6 +51,7 @@ namespace XCharts.Runtime
public override void DrawBase(VertexHelper vh)
{
DrawBackground(vh, component);
if (!SeriesHelper.IsAnyClipSerie(chart.series))
{
DrawCoord(vh, component);
@@ -64,7 +65,7 @@ namespace XCharts.Runtime
}
}
private void DrawCoord(VertexHelper vh, GridCoord grid)
private void DrawBackground(VertexHelper vh, GridCoord grid)
{
if (!grid.show) return;
if (!ChartHelper.IsClearColor(grid.backgroundColor))
@@ -75,6 +76,11 @@ namespace XCharts.Runtime
var p4 = new Vector2(grid.context.x + grid.context.width, grid.context.y);
UGL.DrawQuadrilateral(vh, p1, p2, p3, p4, grid.backgroundColor);
}
}
private void DrawCoord(VertexHelper vh, GridCoord grid)
{
if (!grid.show) return;
if (grid.showBorder)
{
var borderWidth = grid.borderWidth == 0 ? chart.theme.axis.lineWidth * 2 : grid.borderWidth;

View File

@@ -25,6 +25,13 @@ namespace XCharts.Runtime
return !string.IsNullOrEmpty(content) && content.IndexOf('{') >= 0;
}
public static bool NeedTotalContent(string content)
{
if (string.IsNullOrEmpty(content)) return false;
return content.IndexOf("{d", System.StringComparison.OrdinalIgnoreCase) >= 0 ||
content.IndexOf("{f", System.StringComparison.OrdinalIgnoreCase) >= 0;
}
/// <summary>
/// 替换字符串中的通配符,支持的通配符有{.}、{a}、{b}、{c}、{d}、{e}、{f}、{g}、{h}、{y}。
/// </summary>
@@ -37,7 +44,7 @@ namespace XCharts.Runtime
/// <param name="category">选中的类目,一般用在折线图和柱状图</param>
/// <returns></returns>
public static bool ReplaceContent(ref string content, int dataIndex, string numericFormatter, Serie serie,
BaseChart chart, string colorName = null)
BaseChart chart, string colorName = null, SerieData serieData = null)
{
var foundDot = false;
var mc = s_Regex.Matches(content);
@@ -112,7 +119,7 @@ namespace XCharts.Runtime
}
else
{
var serieData = serie.GetSerieData(bIndex);
serieData = serie.GetSerieData(bIndex);
content = content.Replace(old, serieData.name);
}
}
@@ -207,12 +214,17 @@ namespace XCharts.Runtime
}
}
}
if (serieData != null)
{
ReplaceIndexContent(ref content, serie.useSortData ? serieData.sortIndex : serieData.index, serie.dataCount);
}
content = s_RegexNewLine.Replace(content, PH_NN);
return foundDot;
}
public static void ReplaceSerieLabelContent(ref string content, string numericFormatter, int dataCount, double value, double total,
string serieName, string category, string dataName, Color color, SerieData serieData, BaseChart chart = null, int serieIndex = 0)
string serieName, string category, string dataName, Color color, SerieData serieData, BaseChart chart = null, int serieIndex = 0,
bool sortData = false)
{
var mc = s_RegexForSerieLabel.Matches(content);
foreach (var m in mc)
@@ -309,6 +321,10 @@ namespace XCharts.Runtime
}
}
}
if (serieData != null)
{
ReplaceIndexContent(ref content, sortData ? serieData.sortIndex : serieData.index, dataCount);
}
content = TrimAndReplaceLine(content);
}

View File

@@ -31,6 +31,11 @@ namespace XCharts.Runtime
}
}
/// <summary>
/// Whether to use UTC time for the chart.
/// ||图表的时间是否都显示为UTC时间。
/// </summary>
public bool useUtc { get { return m_UseUtc; } set { m_UseUtc = value; } }
/// <summary>
/// The theme.
/// ||</summary>
public ThemeStyle theme { get { return m_Theme; } set { m_Theme = value; } }
@@ -69,6 +74,7 @@ namespace XCharts.Runtime
/// </summary>
public Vector3 chartPosition { get { return m_ChartPosition; } }
public Rect chartRect { get { return m_ChartRect; } }
public Painter topPainter { get { return m_PainterTop; } }
/// <summary>
/// The callback function of chart init.
/// ||图表的初始化完成回调。
@@ -587,11 +593,6 @@ namespace XCharts.Runtime
}
}
public Vector3 GetTitlePosition(Title title)
{
return chartPosition + title.location.GetPosition(chartWidth, chartHeight);
}
public int GetLegendRealShowNameIndex(string name)
{
return m_LegendRealShowName.IndexOf(name);
@@ -777,5 +778,27 @@ namespace XCharts.Runtime
foreach (var component in m_Components) component.ResetStatus();
foreach (var handler in m_SerieHandlers) handler.ForceUpdateSerieContext();
}
/// <summary>
/// Export chart configuration and data to JSON string.
/// ||导出图表配置和数据为JSON字符串。
/// </summary>
[Since("v3.16.0")]
public string ExportToJson(bool prettyPrint = true)
{
return XCharts.Runtime.ChartJsonSerializer.Serialize(this, prettyPrint);
}
/// <summary>
/// Import JSON and update current chart configuration.
/// ||导入JSON并更新当前图表配置。
/// </summary>
[Since("v3.16.0")]
public void ImportFromJson(string json)
{
XCharts.Runtime.ChartJsonDeserializer.Deserialize(json, this);
RefreshAllComponent();
RefreshChart();
}
}
}

View File

@@ -429,6 +429,19 @@ namespace XCharts.Runtime
return true;
}
public Axis GetMainAxis()
{
foreach (var component in m_Components)
{
if (component is Axis)
{
var axis = component as Axis;
if (axis.show && axis.mainAxis) return axis;
}
}
return null;
}
/// <summary>
/// 纯类目轴。
/// </summary>
@@ -483,7 +496,15 @@ namespace XCharts.Runtime
relativedAxis = null;
return false;
}
var isY = yAxis.IsCategory() && !xAxis.IsCategory();
bool isY;
if (xAxis.type == yAxis.type)
{
isY = yAxis.mainAxis;
}
else
{
isY = yAxis.IsCategory() && !xAxis.IsCategory();
}
if (isY)
{
axis = yAxis;

View File

@@ -11,32 +11,60 @@ namespace XCharts.Runtime
public virtual void GetSeriesMinMaxValue(Axis axis, int axisIndex, out double tempMinValue, out double tempMaxValue)
{
var needAnimationData = !axis.context.needAnimation;
bool isX = false, isY = false, isZ = false;
tempMinValue = 0;
tempMaxValue = 0;
if (axis is XAxis3D)
{
SeriesHelper.GetXMinMaxValue(this, axisIndex, axis.inverse, out tempMinValue, out tempMaxValue, false, false, needAnimationData);
}
isX = true;
else if (axis is ZAxis3D)
{
SeriesHelper.GetZMinMaxValue(this, axisIndex, axis.inverse, out tempMinValue, out tempMaxValue, false, false, needAnimationData);
isZ = true;
}
else if (axis is YAxis3D)
{
SeriesHelper.GetYMinMaxValue(this, axisIndex, axis.inverse, out tempMinValue, out tempMaxValue, false, false, needAnimationData);
isY = true;
}
else if (IsAllAxisValue())
{
if (axis is XAxis)
var mainAxis = GetMainAxis();
if (mainAxis == null)
{
SeriesHelper.GetXMinMaxValue(this, axisIndex, axis.inverse, out tempMinValue, out tempMaxValue, false, false, needAnimationData);
if (axis is XAxis)
{
isX = true;
}
else
{
isY = true;
}
}
else
{
SeriesHelper.GetYMinMaxValue(this, axisIndex, axis.inverse, out tempMinValue, out tempMaxValue, false, false, needAnimationData);
if (axis == mainAxis)
{
isX = true;
}
else
{
isY = true;
}
}
}
else
{
SeriesHelper.GetYMinMaxValue(this, axisIndex, axis.inverse, out tempMinValue, out tempMaxValue, false, false, needAnimationData);
isY = true;
}
if (isX)
{
SeriesHelper.GetXMinMaxValue(this, axisIndex, axis.inverse, out tempMinValue, out tempMaxValue, false, needAnimationData);
}
else if (isY)
{
SeriesHelper.GetYMinMaxValue(this, axisIndex, axis.inverse, out tempMinValue, out tempMaxValue, false, needAnimationData);
}
else if(isZ)
{
SeriesHelper.GetZMinMaxValue(this, axisIndex, axis.inverse, out tempMinValue, out tempMaxValue, false, needAnimationData);
}
AxisHelper.AdjustMinMaxValue(axis, ref tempMinValue, ref tempMaxValue, true);
}

View File

@@ -16,6 +16,7 @@ namespace XCharts.Runtime
public partial class BaseChart : BaseGraph, ISerializationCallbackReceiver
{
[SerializeField] protected string m_ChartName;
[SerializeField] protected bool m_UseUtc = true;
[SerializeField] protected ThemeStyle m_Theme = new ThemeStyle();
[SerializeField] protected Settings m_Settings;
[SerializeField] protected DebugInfo m_DebugInfo = new DebugInfo();
@@ -204,7 +205,7 @@ namespace XCharts.Runtime
protected override void OnValidate()
{
base.OnValidate();
foreach (var handler in m_SerieHandlers) handler.ForceUpdateSerieContext();
ResetChartStatus();
}
#endif
@@ -626,6 +627,8 @@ namespace XCharts.Runtime
vh.Clear();
var maxPainter = settings.maxPainter;
var maxSeries = m_Series.Count;
if (painter == null || painter.index < 0 || painter.index >= maxPainter)
return;
var rate = Mathf.CeilToInt(maxSeries * 1.0f / maxPainter);
m_PainterUpper.Refresh();
m_PainterTop.Refresh();

View File

@@ -209,15 +209,25 @@ namespace XCharts.Runtime
/// </summary>
/// <param name="imageType">type of image: png, jpg, exr</param>
/// <param name="savePath">save path</param>
public void SaveAsImage(string imageType = "png", string savePath = "")
/// <param name="exportScale">export resolution scale. 1 means original size</param>
/// <param name="useRecursiveBackgroundColor">whether to recursively use lower-level UI background color</param>
public void SaveAsImage(string imageType = "png", string savePath = "", float exportScale = 1f,
bool useRecursiveBackgroundColor = false)
{
StartCoroutine(SaveAsImageSync(imageType, savePath));
StartCoroutine(SaveAsImageSync(imageType, savePath, exportScale, useRecursiveBackgroundColor));
}
private IEnumerator SaveAsImageSync(string imageType, string path)
private IEnumerator SaveAsImageSync(string imageType, string path, float exportScale,
bool useRecursiveBackgroundColor)
{
yield return new WaitForEndOfFrame();
ChartHelper.SaveAsImage(rectTransform, canvas, imageType, path);
ChartHelper.SaveAsImage(rectTransform, canvas, imageType, path, exportScale,
useRecursiveBackgroundColor);
}
public Vector3 GetTitlePosition(Title title)
{
return graphPosition + title.location.GetPosition(graphWidth, graphHeight);
}
}
}

View File

@@ -53,6 +53,11 @@ namespace XCharts.Runtime
}
}
public bool InRect(Vector2 local)
{
return rect.Contains(local);
}
protected override void Awake()
{
raycastTarget = false;
@@ -183,6 +188,7 @@ namespace XCharts.Runtime
public void SetPosition(Vector3 position)
{
transform.localPosition = position;
UpdateRect();
}
public void SetRectPosition(Vector3 position)
@@ -264,6 +270,45 @@ namespace XCharts.Runtime
m_Width = sizeDelta.x + m_PaddingLeft + m_PaddingRight;
m_Height = sizeDelta.y + m_PaddingTop + m_PaddingBottom;
objectRect.sizeDelta = new Vector2(m_Width, m_Height);
UpdateRect();
}
}
private void UpdateRect()
{
if (m_TextRect == null) return;
switch (text.alignment)
{
case TextAnchor.LowerLeft:
rect = new Rect(transform.localPosition.x, transform.localPosition.y, m_Width, m_Height);
break;
case TextAnchor.UpperLeft:
rect = new Rect(transform.localPosition.x, transform.localPosition.y - m_Height, m_Width, m_Height);
break;
case TextAnchor.MiddleLeft:
rect = new Rect(transform.localPosition.x, transform.localPosition.y - m_Height / 2, m_Width, m_Height);
break;
case TextAnchor.LowerRight:
rect = new Rect(transform.localPosition.x - m_Width, transform.localPosition.y, m_Width, m_Height);
break;
case TextAnchor.UpperRight:
rect = new Rect(transform.localPosition.x - m_Width, transform.localPosition.y - m_Height, m_Width, m_Height);
break;
case TextAnchor.MiddleRight:
rect = new Rect(transform.localPosition.x - m_Width, transform.localPosition.y - m_Height / 2, m_Width, m_Height);
break;
case TextAnchor.LowerCenter:
rect = new Rect(transform.localPosition.x - m_Width / 2, transform.localPosition.y, m_Width, m_Height);
break;
case TextAnchor.UpperCenter:
rect = new Rect(transform.localPosition.x - m_Width / 2, transform.localPosition.y - m_Height, m_Width, m_Height);
break;
case TextAnchor.MiddleCenter:
rect = new Rect(transform.localPosition.x - m_Width / 2, transform.localPosition.y - m_Height / 2, m_Width, m_Height);
break;
default:
rect = new Rect(transform.localPosition.x - m_Width / 2, transform.localPosition.y - m_Height / 2, m_Width, m_Height);
break;
}
}

View File

@@ -18,7 +18,11 @@ namespace XCharts.Runtime
protected bool m_Refresh;
protected Action<VertexHelper, Painter> m_OnPopulateMesh;
public Action<VertexHelper, Painter> onPopulateMesh { set { m_OnPopulateMesh = value; } }
public Action<VertexHelper, Painter> onPopulateMesh
{
get { return m_OnPopulateMesh; }
set { m_OnPopulateMesh = value; }
}
public int index { get { return m_Index; } set { m_Index = value; } }
public Type type { get { return m_Type; } set { m_Type = value; } }
public void Refresh()

View File

@@ -154,5 +154,25 @@ namespace XCharts.Runtime
}
protected virtual void OnThemeChanged() { }
/// <summary>
/// Export UI component configuration to JSON string.
/// </summary>
[Since("v3.16.0")]
public string ExportToJson(bool prettyPrint = true)
{
return UIComponentJsonSerializer.Serialize(this, prettyPrint);
}
/// <summary>
/// Import JSON and update current UI component configuration.
/// </summary>
[Since("v3.16.0")]
public void ImportFromJson(string json)
{
UIComponentJsonDeserializer.Deserialize(json, this);
RefreshAllComponent();
RefreshGraph();
}
}
}

View File

@@ -100,9 +100,9 @@ namespace XCharts.Runtime
return NumberToStr(value, numericFormatter);
}
public static string NumberToDateStr(double timestamp, string formatter)
public static string NumberToDateStr(double timestamp, string formatter, bool local = false)
{
var dt = NumberToDateTime(timestamp);
var dt = NumberToDateTime(timestamp, local);
try
{
return dt.ToString(formatter, ci);
@@ -132,11 +132,11 @@ namespace XCharts.Runtime
}
}
public static DateTime NumberToDateTime(double timestamp)
public static DateTime NumberToDateTime(double timestamp, bool local = false)
{
if (!s_TimestampToDateTimeDict.ContainsKey(timestamp))
{
s_TimestampToDateTimeDict[timestamp] = DateTimeUtil.GetDateTime(timestamp);
s_TimestampToDateTimeDict[timestamp] = DateTimeUtil.GetDateTime(timestamp, local);
}
return s_TimestampToDateTimeDict[timestamp];
}
@@ -200,7 +200,7 @@ namespace XCharts.Runtime
return s_StringIntDict[prefix][suffix];
}
internal static string GetComponentObjectName(MainComponent component)
public static string GetComponentObjectName(MainComponent component)
{
Dictionary<int, string> dict;
var type = component.GetType();
@@ -224,7 +224,7 @@ namespace XCharts.Runtime
}
}
internal static string GetAxisLabelName(int index)
public static string GetAxisLabelName(int index)
{
string name;
if (!s_AxisLabelName.TryGetValue(index, out name))
@@ -239,12 +239,12 @@ namespace XCharts.Runtime
}
}
internal static string GetTypeName<T>()
public static string GetTypeName<T>()
{
return GetTypeName(typeof(T));
}
internal static string GetTypeName(Type type)
public static string GetTypeName(Type type)
{
if (s_TypeName.ContainsKey(type)) return s_TypeName[type];
else

View File

@@ -6,6 +6,7 @@ using System.Text.RegularExpressions;
using UnityEngine;
using UnityEngine.EventSystems;
using UnityEngine.UI;
using XUGL;
#if dUI_TextMeshPro
using TMPro;
#endif
@@ -461,7 +462,7 @@ namespace XCharts.Runtime
{
var textStyle = axis.axisLabel.textStyle;
var label = AddChartLabel(name, parent, axis.axisLabel, theme, content, autoColor, autoAlignment);
var labelShow = axis.IsNeedShowLabel(index, total);
var labelShow = axis.IsNeedShowLabel(index, total, content);
label.UpdateIcon(axis.axisLabel.icon, axis.GetIcon(index), iconDefaultColor);
label.text.SetActive(labelShow);
return label;
@@ -1060,34 +1061,382 @@ namespace XCharts.Runtime
private static extern void Download(string base64str, string fileName);
#endif
public static Texture2D SaveAsImage(RectTransform rectTransform, Canvas canvas, string imageType = "png", string path = "")
private static void SetLayerRecursively(GameObject obj, int layer)
{
if (obj == null) return;
obj.layer = layer;
var trans = obj.transform;
for (int i = 0; i < trans.childCount; i++)
{
SetLayerRecursively(trans.GetChild(i).gameObject, layer);
}
}
private static void CloneChildrenRecursively(Transform source, Transform targetParent, int layer)
{
if (source == null || targetParent == null) return;
for (int i = 0; i < source.childCount; i++)
{
var child = source.GetChild(i);
var childClone = GameObject.Instantiate(child.gameObject, targetParent, false);
SetLayerRecursively(childClone, layer);
SyncPainterCallbacks(child, childClone.transform);
}
}
private static void SyncPainterCallbacks(Transform source, Transform clone)
{
if (source == null || clone == null) return;
var sourcePainter = source.GetComponent<Painter>();
var clonePainter = clone.GetComponent<Painter>();
if (sourcePainter != null && clonePainter != null)
{
clonePainter.onPopulateMesh = sourcePainter.onPopulateMesh;
clonePainter.index = sourcePainter.index;
clonePainter.type = sourcePainter.type;
clonePainter.material = sourcePainter.material;
clonePainter.Refresh();
}
var count = Mathf.Min(source.childCount, clone.childCount);
for (int i = 0; i < count; i++)
{
SyncPainterCallbacks(source.GetChild(i), clone.GetChild(i));
}
}
private static void DestroyObject(GameObject obj)
{
if (obj == null) return;
#if UNITY_EDITOR
if (!Application.isPlaying)
GameObject.DestroyImmediate(obj, true);
else
GameObject.Destroy(obj);
#else
GameObject.Destroy(obj);
#endif
}
private static byte[] EncodeImage(Texture2D tex, string imageType)
{
var cam = canvas.renderMode == RenderMode.ScreenSpaceOverlay ? null : canvas.worldCamera;
var pos = RectTransformUtility.WorldToScreenPoint(cam, rectTransform.position);
var width = (int)(rectTransform.rect.width * canvas.scaleFactor);
var height = (int)(rectTransform.rect.height * canvas.scaleFactor);
var posX = pos.x + rectTransform.rect.xMin * canvas.scaleFactor;
var posY = pos.y + rectTransform.rect.yMin * canvas.scaleFactor;
var rect = new Rect(posX, posY, width, height);
var tex = new Texture2D(width, height, TextureFormat.ARGB32, false);
tex.ReadPixels(rect, 0, 0);
tex.Apply();
byte[] bytes;
switch (imageType)
{
case "png":
bytes = tex.EncodeToPNG();
break;
return tex.EncodeToPNG();
case "jpg":
bytes = tex.EncodeToJPG();
break;
return tex.EncodeToJPG();
case "exr":
bytes = tex.EncodeToEXR();
break;
return tex.EncodeToEXR();
default:
Debug.LogError("SaveAsImage ERROR: not support image type:" + imageType);
return null;
}
}
private static float[] GetChartCornerRadius(BaseChart chart, float chartWidth, float chartHeight, float scaleFactor)
{
if (chart == null || chartWidth <= 0 || chartHeight <= 0)
return null;
var background = chart.GetChartComponent<Background>();
if (background == null || background.borderStyle == null || !background.borderStyle.roundedCorner)
return null;
var cornerRadius = background.borderStyle.cornerRadius;
if (cornerRadius == null || cornerRadius.Length == 0)
return null;
float brLt = 0, brRt = 0, brRb = 0, brLb = 0;
bool needRound = false;
UGL.InitCornerRadius(cornerRadius, chartWidth, chartHeight, false, false,
ref brLt, ref brRt, ref brRb, ref brLb, ref needRound);
if (!needRound)
return null;
return new float[]
{
brLt * scaleFactor,
brRt * scaleFactor,
brRb * scaleFactor,
brLb * scaleFactor
};
}
private static float GetRoundedRectCoverage(float x, float y, float width, float height,
float radiusLt, float radiusRt, float radiusRb, float radiusLb, float aaWidth = 1f)
{
if (radiusLb > 0 && x < radiusLb && y < radiusLb)
{
var dx = x - radiusLb;
var dy = y - radiusLb;
var dist = Mathf.Sqrt(dx * dx + dy * dy);
var delta = radiusLb - dist;
if (delta >= aaWidth) return 1f;
if (delta <= -aaWidth) return 0f;
return Mathf.Clamp01((delta + aaWidth) / (2f * aaWidth));
}
if (radiusLt > 0 && x < radiusLt && y > height - radiusLt)
{
var dx = x - radiusLt;
var dy = y - (height - radiusLt);
var dist = Mathf.Sqrt(dx * dx + dy * dy);
var delta = radiusLt - dist;
if (delta >= aaWidth) return 1f;
if (delta <= -aaWidth) return 0f;
return Mathf.Clamp01((delta + aaWidth) / (2f * aaWidth));
}
if (radiusRt > 0 && x > width - radiusRt && y > height - radiusRt)
{
var dx = x - (width - radiusRt);
var dy = y - (height - radiusRt);
var dist = Mathf.Sqrt(dx * dx + dy * dy);
var delta = radiusRt - dist;
if (delta >= aaWidth) return 1f;
if (delta <= -aaWidth) return 0f;
return Mathf.Clamp01((delta + aaWidth) / (2f * aaWidth));
}
if (radiusRb > 0 && x > width - radiusRb && y < radiusRb)
{
var dx = x - (width - radiusRb);
var dy = y - radiusRb;
var dist = Mathf.Sqrt(dx * dx + dy * dy);
var delta = radiusRb - dist;
if (delta >= aaWidth) return 1f;
if (delta <= -aaWidth) return 0f;
return Mathf.Clamp01((delta + aaWidth) / (2f * aaWidth));
}
return 1f;
}
private static void ApplyRoundedCornerClip(Texture2D tex, float[] cornerRadii)
{
if (tex == null || cornerRadii == null || cornerRadii.Length < 4)
return;
var width = tex.width;
var height = tex.height;
if (width <= 0 || height <= 0)
return;
var radiusLt = Mathf.Max(0, cornerRadii[0]);
var radiusRt = Mathf.Max(0, cornerRadii[1]);
var radiusRb = Mathf.Max(0, cornerRadii[2]);
var radiusLb = Mathf.Max(0, cornerRadii[3]);
if (radiusLt <= 0 && radiusRt <= 0 && radiusRb <= 0 && radiusLb <= 0)
return;
var colors = tex.GetPixels32();
for (int y = 0; y < height; y++)
{
for (int x = 0; x < width; x++)
{
var px = x + 0.5f;
var py = y + 0.5f;
var coverage = GetRoundedRectCoverage(px, py, width, height,
radiusLt, radiusRt, radiusRb, radiusLb, 1f);
if (coverage <= 0f)
{
var index = y * width + x;
var color = colors[index];
color.a = 0;
colors[index] = color;
}
else if (coverage < 1f)
{
var index = y * width + x;
var color = colors[index];
color.a = (byte)Mathf.Clamp(Mathf.RoundToInt(color.a * coverage), 0, 255);
colors[index] = color;
}
}
}
tex.SetPixels32(colors);
tex.Apply();
}
private static Color32 GetBackgroundColorRecursive(Transform parent)
{
if (parent == null) return new Color32(255, 255, 255, 255);
// Try to find Image components with colors in child nodes
for (int i = 0; i < parent.childCount; i++)
{
var child = parent.GetChild(i);
var image = child.GetComponent<Image>();
if (image != null && image.enabled && child.gameObject.activeInHierarchy)
{
var color = image.color;
if (color.a > 0)
{
// Found a visible background image
color.a = 1f; // Make it fully opaque for proper blending
return color;
}
}
// Recursively search child nodes
var foundColor = GetBackgroundColorRecursive(child);
if (foundColor.a > 0)
return foundColor;
}
return Color.white;
}
public static Texture2D SaveAsImage(RectTransform rectTransform, Canvas canvas, string imageType = "png",
string path = "", float exportScale = 1f, bool useRecursiveBackgroundColor = false)
{
if (rectTransform == null || canvas == null)
return null;
var clampedExportScale = Mathf.Max(1f, exportScale);
var outputScaleFactor = clampedExportScale;
var width = Mathf.Max(1, Mathf.CeilToInt(rectTransform.rect.width * outputScaleFactor));
var height = Mathf.Max(1, Mathf.CeilToInt(rectTransform.rect.height * outputScaleFactor));
var chart = rectTransform.GetComponent<BaseChart>();
var cornerRadii = GetChartCornerRadius(chart, rectTransform.rect.width, rectTransform.rect.height, outputScaleFactor);
Texture2D tex = null;
var rt = RenderTexture.GetTemporary(width, height, 24, RenderTextureFormat.ARGB32);
var antiAliasing = QualitySettings.antiAliasing > 0 ? QualitySettings.antiAliasing : 4;
rt.antiAliasing = Mathf.Clamp(antiAliasing, 1, 8);
var oldActive = RenderTexture.active;
var captureLayer = 31;
var rootObj = new GameObject("xcharts_save_image_root");
var camObj = new GameObject("xcharts_save_image_camera");
var canvasObj = new GameObject("xcharts_save_image_canvas");
var contentObj = new GameObject("xcharts_save_image_content", typeof(RectTransform));
try
{
SetLayerRecursively(rootObj, captureLayer);
SetLayerRecursively(camObj, captureLayer);
SetLayerRecursively(canvasObj, captureLayer);
SetLayerRecursively(contentObj, captureLayer);
camObj.transform.SetParent(rootObj.transform, false);
var camera = camObj.AddComponent<Camera>();
camera.clearFlags = CameraClearFlags.SolidColor;
// Get background color - try multiple sources for better results
Color32 bgColor = new Color32(255, 255, 255, 255);
var chartParent = rectTransform.parent;
// First, try to get from chart's Background component
if (chart != null)
{
bgColor = chart.GetChartBackgroundColor();
//bgColor.a = 255;
}
// If enabled, find background color recursively from sibling nodes
if (useRecursiveBackgroundColor && (bgColor.a < 255 ||
(bgColor.r == 255 && bgColor.g == 255 && bgColor.b == 255)))
{
var siblingBgColor = GetBackgroundColorRecursive(chartParent);
if (siblingBgColor.a > 0)
bgColor = siblingBgColor;
}
camera.backgroundColor = bgColor;
camera.cullingMask = 1 << captureLayer;
camera.orthographic = true;
camera.orthographicSize = height / 2f;
camera.nearClipPlane = -100;
camera.farClipPlane = 100;
camera.allowHDR = false;
camera.allowMSAA = rt.antiAliasing > 1;
camera.targetTexture = rt;
canvasObj.transform.SetParent(rootObj.transform, false);
var captureCanvas = canvasObj.AddComponent<Canvas>();
captureCanvas.renderMode = RenderMode.ScreenSpaceCamera;
captureCanvas.worldCamera = camera;
captureCanvas.planeDistance = 1;
captureCanvas.pixelPerfect = canvas.pixelPerfect;
captureCanvas.sortingOrder = 0;
canvasObj.AddComponent<GraphicRaycaster>();
var canvasRect = canvasObj.GetComponent<RectTransform>();
canvasRect.anchorMin = Vector2.zero;
canvasRect.anchorMax = Vector2.one;
canvasRect.pivot = new Vector2(0.5f, 0.5f);
canvasRect.anchoredPosition = Vector2.zero;
canvasRect.sizeDelta = new Vector2(width, height);
contentObj.transform.SetParent(canvasObj.transform, false);
var contentRect = contentObj.GetComponent<RectTransform>();
contentRect.anchorMin = new Vector2(0.5f, 0.5f);
contentRect.anchorMax = new Vector2(0.5f, 0.5f);
contentRect.pivot = rectTransform.pivot;
contentRect.anchoredPosition = Vector2.zero;
contentRect.sizeDelta = rectTransform.rect.size;
contentRect.localScale = new Vector3(clampedExportScale, clampedExportScale, 1f);
// Clone sibling nodes (including background layers below chart)
var chartSiblingIndex = rectTransform.GetSiblingIndex();
if (chartParent != null)
{
for (int i = 0; i < chartParent.childCount; i++)
{
var sibling = chartParent.GetChild(i);
// Only clone siblings below the chart (smaller sibling index)
if (i < chartSiblingIndex)
{
var siblingClone = GameObject.Instantiate(sibling.gameObject, contentObj.transform, false);
SetLayerRecursively(siblingClone, captureLayer);
}
}
}
CloneChildrenRecursively(rectTransform, contentObj.transform, captureLayer);
Canvas.ForceUpdateCanvases();
camera.Render();
RenderTexture.active = rt;
// If exportScale > 1 we want to save the image back to the original logical
// size (option B): render at higher density, then downscale to target pixels
// so the saved image has original width/height but higher quality.
if (clampedExportScale > 1f)
{
var targetWidth = Mathf.Max(1, Mathf.CeilToInt(rectTransform.rect.width));
var targetHeight = Mathf.Max(1, Mathf.CeilToInt(rectTransform.rect.height));
var smallRT = RenderTexture.GetTemporary(targetWidth, targetHeight, 0, rt.format);
Graphics.Blit(rt, smallRT);
RenderTexture.active = smallRT;
tex = new Texture2D(targetWidth, targetHeight, TextureFormat.ARGB32, false);
tex.ReadPixels(new Rect(0, 0, targetWidth, targetHeight), 0, 0);
tex.Apply();
RenderTexture.ReleaseTemporary(smallRT);
var cornerRadiiFinal = GetChartCornerRadius(chart, rectTransform.rect.width, rectTransform.rect.height, 1f);
ApplyRoundedCornerClip(tex, cornerRadiiFinal);
}
else
{
tex = new Texture2D(width, height, TextureFormat.ARGB32, false);
tex.ReadPixels(new Rect(0, 0, width, height), 0, 0);
tex.Apply();
ApplyRoundedCornerClip(tex, cornerRadii);
}
}
finally
{
RenderTexture.active = oldActive;
RenderTexture.ReleaseTemporary(rt);
DestroyObject(rootObj);
}
var bytes = EncodeImage(tex, imageType);
if (bytes == null)
return null;
var fileName = rectTransform.name + "." + imageType;
#if UNITY_WEBGL
string base64str = Convert.ToBase64String(bytes);

View File

@@ -5,6 +5,36 @@ namespace XCharts.Runtime
{
public static class DataHelper
{
private static List<double> s_SampleSumPrefix = new List<double>();
public static bool IsAnyDataChanged(ref List<SerieData> showData, int minCount, int maxCount)
{
for (int i = minCount; i < maxCount; i++)
{
if (showData[i].IsDataChanged())
return true;
}
return false;
}
public static List<double> BuildSampleSumPrefix(ref List<SerieData> showData, int maxCount, bool inverse)
{
if (maxCount < 0) maxCount = 0;
var targetCount = maxCount + 1;
if (s_SampleSumPrefix.Count != targetCount)
{
s_SampleSumPrefix.Clear();
for (int i = 0; i < targetCount; i++)
s_SampleSumPrefix.Add(0);
}
s_SampleSumPrefix[0] = 0;
for (int i = 0; i < maxCount; i++)
{
s_SampleSumPrefix[i + 1] = s_SampleSumPrefix[i] + showData[i].GetData(1, inverse);
}
return s_SampleSumPrefix;
}
public static double DataAverage(ref List<SerieData> showData, SampleType sampleType,
int minCount, int maxCount, int rate)
{
@@ -23,14 +53,84 @@ namespace XCharts.Runtime
public static double SampleValue(ref List<SerieData> showData, SampleType sampleType, int rate,
int minCount, int maxCount, double totalAverage, int index, float dataAddDuration, float dataChangeDuration,
ref bool dataChanging, Axis axis, bool unscaledTime)
ref bool dataChanging, Axis axis, bool unscaledTime, bool useCurrentData = true,
bool checkDataChanging = true, List<double> sampleSumPrefix = null)
{
var inverse = axis.inverse;
var minValue = 0;
var maxValue = 0;
if (!useCurrentData)
{
if (rate <= 1 || index == minCount)
return showData[index].GetData(1, inverse);
switch (sampleType)
{
case SampleType.Sum:
case SampleType.Average:
if (sampleSumPrefix != null)
{
var totalByPrefix = sampleSumPrefix[index + 1] - sampleSumPrefix[index - rate + 1];
if (sampleType == SampleType.Average)
return totalByPrefix / rate;
else
return totalByPrefix;
}
double total = 0;
for (int i = index; i > index - rate; i--)
{
total += showData[i].GetData(1, inverse);
}
if (sampleType == SampleType.Average)
return total / rate;
else
return total;
case SampleType.Max:
double max = double.MinValue;
for (int i = index; i > index - rate; i--)
{
var value = showData[i].GetData(1, inverse);
if (value > max)
max = value;
}
return max;
case SampleType.Min:
double min = double.MaxValue;
for (int i = index; i > index - rate; i--)
{
var value = showData[i].GetData(1, inverse);
if (value < min)
min = value;
}
return min;
case SampleType.Peak:
max = double.MinValue;
min = double.MaxValue;
total = 0;
for (int i = index; i > index - rate; i--)
{
var value = showData[i].GetData(1, inverse);
total += value;
if (value < min)
min = value;
if (value > max)
max = value;
}
var average = total / rate;
if (average >= totalAverage)
return max;
else
return min;
}
return showData[index].GetData(1, inverse);
}
if (rate <= 1 || index == minCount)
{
if (showData[index].IsDataChanged())
if (checkDataChanging && showData[index].IsDataChanged())
dataChanging = true;
return showData[index].GetCurrData(1, dataAddDuration, dataChangeDuration, inverse, minValue, maxValue, unscaledTime);
@@ -45,7 +145,7 @@ namespace XCharts.Runtime
{
count++;
total += showData[i].GetCurrData(1, dataAddDuration, dataChangeDuration, inverse, minValue, maxValue, unscaledTime);
if (showData[i].IsDataChanged())
if (checkDataChanging && showData[i].IsDataChanged())
dataChanging = true;
}
if (sampleType == SampleType.Average)
@@ -61,7 +161,7 @@ namespace XCharts.Runtime
if (value > max)
max = value;
if (showData[i].IsDataChanged())
if (checkDataChanging && showData[i].IsDataChanged())
dataChanging = true;
}
return max;
@@ -74,7 +174,7 @@ namespace XCharts.Runtime
if (value < min)
min = value;
if (showData[i].IsDataChanged())
if (checkDataChanging && showData[i].IsDataChanged())
dataChanging = true;
}
return min;
@@ -92,7 +192,7 @@ namespace XCharts.Runtime
if (value > max)
max = value;
if (showData[i].IsDataChanged())
if (checkDataChanging && showData[i].IsDataChanged())
dataChanging = true;
}
var average = total / rate;
@@ -101,7 +201,7 @@ namespace XCharts.Runtime
else
return min;
}
if (showData[index].IsDataChanged())
if (checkDataChanging && showData[index].IsDataChanged())
dataChanging = true;
return showData[index].GetCurrData(1, dataAddDuration, dataChangeDuration, inverse, minValue, maxValue, unscaledTime);

View File

@@ -21,8 +21,8 @@ namespace XCharts.Runtime
[ExecuteInEditMode]
public static class XChartsMgr
{
public static readonly string version = "3.14.0";
public static readonly int versionDate = 20250315;
public static readonly string version = "3.15.0";
public static readonly int versionDate = 20260301;
public static string fullVersion { get { return version + "-" + versionDate; } }
internal static List<BaseChart> chartList = new List<BaseChart>();

View File

@@ -8,13 +8,13 @@ namespace XCharts.Runtime
[CoordOptions(typeof(GridCoord), typeof(PolarCoord))]
[DefaultAnimation(AnimationType.BottomToTop)]
[DefaultTooltip(Tooltip.Type.Shadow, Tooltip.Trigger.Axis)]
[SerieComponent(typeof(LabelStyle), typeof(EmphasisStyle), typeof(BlurStyle), typeof(SelectStyle))]
[SerieDataComponent(typeof(ItemStyle), typeof(LabelStyle), typeof(EmphasisStyle), typeof(BlurStyle), typeof(SelectStyle))]
[SerieComponent(typeof(TitleStyle), typeof(LabelStyle), typeof(EmphasisStyle), typeof(BlurStyle), typeof(SelectStyle))]
[SerieDataComponent(typeof(ItemStyle), typeof(TitleStyle), typeof(LabelStyle), typeof(EmphasisStyle), typeof(BlurStyle), typeof(SelectStyle))]
[SerieDataExtraField("m_Ignore")]
public class Bar : Serie, INeedSerieContainer
{
public override bool useSortData { get { return realtimeSort; } }
public int containerIndex { get; internal set; }
public int containterInstanceId { get; internal set; }

View File

@@ -47,12 +47,14 @@ namespace XCharts.Runtime
{
switch (label.position)
{
case LabelStyle.Position.Start:
case LabelStyle.Position.Bottom:
var center = serieData.context.areaCenter;
var angle = serieData.context.halfAngle;
var radius = serieData.context.insideRadius;
return ChartHelper.GetPosition(center, angle, radius);
case LabelStyle.Position.Top:
case LabelStyle.Position.End:
center = serieData.context.areaCenter;
angle = serieData.context.halfAngle;
radius = serieData.context.outsideRadius;
@@ -65,6 +67,7 @@ namespace XCharts.Runtime
{
switch (label.position)
{
case LabelStyle.Position.Start:
case LabelStyle.Position.Bottom:
var center = serieData.context.rect.center;
if (serie.context.isHorizontal)
@@ -73,6 +76,7 @@ namespace XCharts.Runtime
return new Vector3(center.x, center.y - serieData.context.rect.height / 2);
case LabelStyle.Position.Center:
case LabelStyle.Position.Inside:
case LabelStyle.Position.Middle:
return serieData.context.rect.center;
default:
return serieData.context.position;
@@ -80,6 +84,11 @@ namespace XCharts.Runtime
}
}
public override Vector3 GetSerieDataTitlePosition(SerieData serieData, TitleStyle titleStyle)
{
return GetSerieDataLabelPosition(serieData, titleStyle);
}
private void UpdateSerieGridContext()
{
if (m_SerieGrid == null)
@@ -171,7 +180,7 @@ namespace XCharts.Runtime
if (showData.Count <= 0)
return;
var visualMap = chart.GetVisualMapOfSerie(serie);
var axisLength = isY ? m_SerieGrid.context.height : m_SerieGrid.context.width;
var relativedAxisLength = isY ? m_SerieGrid.context.width : m_SerieGrid.context.height;
var axisXY = isY ? m_SerieGrid.context.y : m_SerieGrid.context.x;
@@ -198,15 +207,24 @@ namespace XCharts.Runtime
var dataChangeDuration = serie.animation.GetChangeDuration();
var dataAddDuration = serie.animation.GetAdditionDuration();
var interactDuration = serie.animation.GetInteractionDuration();
var exchangeDuration = serie.animation.GetExchangeDuration();
var areaColor = ColorUtil.clearColor32;
var areaToColor = ColorUtil.clearColor32;
var interacting = false;
axis.context.scaleWidth = categoryWidth;
serie.context.isHorizontal = isY;
serie.containerIndex = m_SerieGrid.index;
serie.containterInstanceId = m_SerieGrid.instanceId;
serie.animation.InitProgress(axisXY, axisXY + axisLength);
var visualMapDimension = VisualMapHelper.GetDimension(visualMap, defaultDimension);
if (visualMap != null && visualMap.show && visualMap.autoMinMax)
{
double maxValue, minValue;
SerieHelper.GetMinMaxData(serie, visualMapDimension, out minValue, out maxValue);
VisualMapHelper.SetMinMax(visualMap, minValue, maxValue);
}
for (int i = serie.minShow; i < maxCount; i++)
{
var serieData = showData[i];
@@ -228,37 +246,55 @@ namespace XCharts.Runtime
var borderGap = relativedValue == 0 ? 0 : itemStyle.borderGap;
var borderGapAndWidth = borderWidth + borderGap;
var backgroundColor = itemStyle.backgroundColor;
var backgroundGap = itemStyle.backgroundGap;
if (!serieData.interact.TryGetColor(ref areaColor, ref areaToColor, ref interacting, interactDuration))
{
SerieHelper.GetItemColor(out areaColor, out areaToColor, serie, serieData, chart.theme);
if (visualMap != null && visualMap.show)
{
var visualValue = serieData.GetData(visualMapDimension, relativedAxis.inverse);
areaColor = visualMap.GetColor(visualValue);
areaToColor = areaColor;
}
serieData.interact.SetColor(ref interacting, areaColor, areaToColor);
}
var pX = 0f;
var pY = 0f;
UpdateXYPosition(m_SerieGrid, isY, axis, relativedAxis, i, categoryWidth, relativedCategoryWidth, barWidth, isStack, value, ref pX, ref pY);
var barHig = 0f;
var runtimeBarWidth = barWidth;
var runtimeGap = gap;
if (serie.ignoreZeroOccupy)
{
UpdateActiveBarLayout(serie, dataZoom, i, categoryWidth, barGap, runtimeBarWidth, ref runtimeGap);
}
UpdateXYPosition(m_SerieGrid, isY, axis, relativedAxis, i, categoryWidth, relativedCategoryWidth,
runtimeBarWidth, isStack, value, backgroundGap, ref pX, ref pY);
if (serie.useSortData)
{
serieData.context.UpdateExchangePosition(ref pX, ref pY, exchangeDuration);
}
float barHig;
if (isPercentStack)
{
var valueTotal = chart.GetSerieSameStackTotalValue<Bar>(serie.stack, i, m_SerieGrid.index);
barHig = valueTotal != 0 ? (float)(relativedValue / valueTotal * relativedAxisLength) : 0;
barHig = valueTotal != 0 ? (float)(relativedValue / valueTotal * (relativedAxisLength - 2 * backgroundGap)) : 0;
}
else
{
barHig = AxisHelper.GetAxisValueLength(m_SerieGrid, relativedAxis, relativedCategoryWidth, relativedValue);
barHig = AxisHelper.GetAxisValueLength(m_SerieGrid, relativedAxis, relativedCategoryWidth, relativedValue, 2 * backgroundGap);
}
float currHig = AnimationStyleHelper.CheckDataAnimation(chart, serie, i, barHig);
Vector3 plb, plt, prt, prb, top;
UpdateRectPosition(m_SerieGrid, isY, relativedValue, pX, pY, gap, borderWidth, barWidth, currHig,
UpdateRectPosition(m_SerieGrid, isY, relativedValue, pX, pY, runtimeGap, borderWidth, runtimeBarWidth, currHig,
out plb, out plt, out prt, out prb, out top);
serieData.context.stackHeight = barHig;
serieData.context.position = top;
serieData.context.rect = Rect.MinMaxRect(plb.x + borderGapAndWidth, plb.y + borderGapAndWidth,
prt.x - borderGapAndWidth, prt.y - borderGapAndWidth);
serieData.context.backgroundRect = isY ?
Rect.MinMaxRect(m_SerieGrid.context.x, plb.y, m_SerieGrid.context.x + relativedAxisLength, prt.y) :
Rect.MinMaxRect(plb.x, m_SerieGrid.context.y, prb.x, m_SerieGrid.context.y + relativedAxisLength);
Rect.MinMaxRect(m_SerieGrid.context.x, plb.y - backgroundGap, m_SerieGrid.context.x + relativedAxisLength, prt.y + backgroundGap) :
Rect.MinMaxRect(plb.x - backgroundGap, m_SerieGrid.context.y, prb.x + backgroundGap, m_SerieGrid.context.y + relativedAxisLength);
if (!serie.clip || (serie.clip && m_SerieGrid.Contains(top)))
{
@@ -276,11 +312,11 @@ namespace XCharts.Runtime
{
case BarType.Normal:
case BarType.Capsule:
DrawNormalBar(vh, serie, serieData, itemStyle, backgroundColor, gap, barWidth,
DrawNormalBar(vh, serie, serieData, itemStyle, backgroundColor, runtimeGap, runtimeBarWidth,
pX, pY, plb, plt, prt, prb, isY, m_SerieGrid, axis, areaColor, areaToColor, relativedValue);
break;
case BarType.Zebra:
DrawZebraBar(vh, serie, serieData, itemStyle, backgroundColor, gap, barWidth,
DrawZebraBar(vh, serie, serieData, itemStyle, backgroundColor, runtimeGap, runtimeBarWidth,
pX, pY, plb, plt, prt, prb, isY, m_SerieGrid, axis, areaColor, areaToColor);
break;
}
@@ -301,9 +337,106 @@ namespace XCharts.Runtime
}
}
List<string> m_SlotOrder = new List<string>();
Dictionary<string, bool> m_ActiveSlot = new Dictionary<string, bool>();
private void UpdateActiveBarLayout(Bar currentSerie, DataZoom dataZoom, int dataIndex,
float categoryWidth, float barGap, float barWidth, ref float gap)
{
m_SlotOrder.Clear();
m_ActiveSlot.Clear();
for (int n = 0; n < chart.series.Count; n++)
{
var serie = chart.series[n] as Bar;
if (serie == null || !serie.show || serie.placeHolder)
continue;
if (!IsSerieInGrid(serie, m_SerieGrid.index))
continue;
var slotKey = GetBarSlotKey(serie);
if (!m_ActiveSlot.ContainsKey(slotKey))
{
m_ActiveSlot[slotKey] = false;
m_SlotOrder.Add(slotKey);
}
if (IsSerieDataActiveForLayout(serie, dataZoom, dataIndex))
{
m_ActiveSlot[slotKey] = true;
}
}
var currentSlotKey = GetBarSlotKey(currentSerie);
if (!m_ActiveSlot.ContainsKey(currentSlotKey) || !m_ActiveSlot[currentSlotKey])
return;
var activeCount = 0;
var activeSlotIndex = -1;
for (int n = 0; n < m_SlotOrder.Count; n++)
{
var slotKey = m_SlotOrder[n];
if (!m_ActiveSlot[slotKey])
continue;
if (slotKey == currentSlotKey)
activeSlotIndex = activeCount;
activeCount++;
}
if (activeCount <= 0 || activeSlotIndex < 0)
return;
var actualGap = ChartHelper.GetActualValue(barGap, barWidth);
var totalBarWidth = barGap == -1
? barWidth
: activeCount * barWidth + (activeCount - 1) * actualGap;
var offset = (categoryWidth - totalBarWidth) * 0.5f;
gap = barGap == -1
? offset
: offset + activeSlotIndex * (barWidth + actualGap);
}
private string GetBarSlotKey(Bar serie)
{
return string.IsNullOrEmpty(serie.stack) ? "s_" + serie.index : "k_" + serie.stack;
}
private bool IsSerieDataActiveForLayout(Bar serie, DataZoom dataZoom, int dataIndex)
{
var dataList = serie.GetDataList(dataZoom, true);
if (dataList == null || dataIndex < 0 || dataIndex >= dataList.Count)
return false;
var serieData = dataList[dataIndex];
if (serieData == null || !serieData.show || serie.IsIgnoreValue(serieData))
return false;
if (!serie.ignoreZeroOccupy)
return true;
return !MathUtil.Approximately(serieData.GetData(1), 0);
}
private bool IsSerieInGrid(Bar serie, int gridIndex)
{
XAxis xAxis;
if (chart.TryGetChartComponent<XAxis>(out xAxis, serie.xAxisIndex))
{
if (xAxis.gridIndex != gridIndex)
return false;
}
YAxis yAxis;
if (chart.TryGetChartComponent<YAxis>(out yAxis, serie.yAxisIndex))
{
if (yAxis.gridIndex != gridIndex)
return false;
}
return true;
}
private void UpdateXYPosition(GridCoord grid, bool isY, Axis axis, Axis relativedAxis, int i,
float categoryWidth, float relativedCategoryWidth, float barWidth, bool isStack,
double value, ref float pX, ref float pY)
double value, float backgroundGap, ref float pX, ref float pY)
{
if (isY)
{
@@ -320,7 +453,7 @@ namespace XCharts.Runtime
pY = grid.context.y + valueLen - categoryWidth * 0.5f;
}
}
pX = AxisHelper.GetAxisValuePosition(grid, relativedAxis, relativedCategoryWidth, 0);
pX = AxisHelper.GetAxisValuePosition(grid, relativedAxis, relativedCategoryWidth, 0) + backgroundGap;
if (isStack)
{
for (int n = 0; n < m_StackSerieData.Count - 1; n++)
@@ -342,7 +475,7 @@ namespace XCharts.Runtime
pX = grid.context.x + valueLen - categoryWidth * 0.5f;
}
}
pY = AxisHelper.GetAxisValuePosition(grid, relativedAxis, relativedCategoryWidth, 0);
pY = AxisHelper.GetAxisValuePosition(grid, relativedAxis, relativedCategoryWidth, 0) + backgroundGap;
if (isStack)
{
for (int n = 0; n < m_StackSerieData.Count - 1; n++)

View File

@@ -8,6 +8,7 @@ namespace XCharts.Runtime
[UnityEngine.Scripting.Preserve]
internal sealed class CandlestickHandler : SerieHandler<Candlestick>
{
private GridCoord m_SerieGrid;
public override void DrawSerie(VertexHelper vh)
{
DrawCandlestickSerie(vh, serie);
@@ -106,20 +107,84 @@ namespace XCharts.Runtime
}
}
public override void UpdateSerieContext()
{
if (m_SerieGrid == null)
return;
var needCheck = (chart.isPointerInChart && m_SerieGrid.IsPointerEnter() && !serie.placeHolder) || m_LegendEnter;
var needInteract = false;
if (!needCheck)
{
if (m_LastCheckContextFlag != needCheck)
{
m_LastCheckContextFlag = needCheck;
serie.context.pointerItemDataIndex = -1;
serie.context.pointerEnter = false;
Color32 color1, toColor1;
foreach (var serieData in serie.data)
{
serieData.context.highlight = false;
var state = SerieHelper.GetSerieState(serie, serieData, true);
SerieHelper.GetItemColor(out color1, out toColor1, serie, serieData, chart.theme, state);
serieData.interact.SetColor(ref needInteract, color1, toColor1);
}
chart.RefreshPainter(serie);
}
return;
}
m_LastCheckContextFlag = needCheck;
Color32 color, toColor;
if (m_LegendEnter)
{
serie.context.pointerEnter = true;
foreach (var serieData in serie.data)
{
SerieHelper.GetItemColor(out color, out toColor, serie, serieData, chart.theme);
serieData.interact.SetColor(ref needInteract, color, toColor);
}
}
else
{
serie.context.pointerItemDataIndex = -1;
serie.context.pointerEnter = false;
foreach (var serieData in serie.data)
{
if (serie.context.pointerAxisDataIndexs.Contains(serieData.index) ||
serieData.context.rect.Contains(chart.pointerPos))
{
serie.context.pointerItemDataIndex = serieData.index;
serie.context.pointerEnter = true;
serieData.context.highlight = true;
}
else
{
serieData.context.highlight = false;
}
var state = SerieHelper.GetSerieState(serie, serieData, true);
SerieHelper.GetItemColor(out color, out toColor, serie, serieData, chart.theme, state);
serieData.interact.SetColor(ref needInteract, color, toColor);
}
}
if (needInteract)
{
chart.RefreshPainter(serie);
}
}
private void DrawCandlestickSerie(VertexHelper vh, Candlestick serie)
{
if (!serie.show) return;
if (serie.animation.HasFadeOut()) return;
XAxis xAxis;
YAxis yAxis;
GridCoord grid;
if (!chart.TryGetChartComponent<XAxis>(out xAxis, serie.xAxisIndex)) return;
if (!chart.TryGetChartComponent<YAxis>(out yAxis, serie.yAxisIndex)) return;
if (!chart.TryGetChartComponent<GridCoord>(out grid, xAxis.gridIndex)) return;
if (!chart.TryGetChartComponent<GridCoord>(out m_SerieGrid, xAxis.gridIndex)) return;
var theme = chart.theme;
var dataZoom = chart.GetDataZoomOfAxis(xAxis);
var showData = serie.GetDataList(dataZoom);
float categoryWidth = AxisHelper.GetDataWidth(xAxis, grid.context.width, showData.Count, dataZoom);
float categoryWidth = AxisHelper.GetDataWidth(xAxis, m_SerieGrid.context.width, showData.Count, dataZoom);
float barWidth = serie.GetBarWidth(categoryWidth);
float gap = (categoryWidth - barWidth) / 2;
int maxCount = serie.maxShow > 0 ?
@@ -133,9 +198,9 @@ namespace XCharts.Runtime
double yMinValue = yAxis.context.minValue;
double yMaxValue = yAxis.context.maxValue;
var isYAxis = false;
serie.containerIndex = grid.index;
serie.containterInstanceId = grid.instanceId;
var intensive = grid.context.width / (maxCount - serie.minShow) < 0.6f;
serie.containerIndex = m_SerieGrid.index;
serie.containterInstanceId = m_SerieGrid.instanceId;
var intensive = m_SerieGrid.context.width / (maxCount - serie.minShow) < 0.6f;
for (int i = serie.minShow; i < maxCount; i++)
{
var serieData = showData[i];
@@ -152,29 +217,30 @@ namespace XCharts.Runtime
var close = serieData.GetCurrData(startDataIndex + 1, dataAddDuration, dataChangeDuration, yAxis.inverse, yMinValue, yMaxValue, unscaledTime);
var lowest = serieData.GetCurrData(startDataIndex + 2, dataAddDuration, dataChangeDuration, yAxis.inverse, yMinValue, yMaxValue, unscaledTime);
var heighest = serieData.GetCurrData(startDataIndex + 3, dataAddDuration, dataChangeDuration, yAxis.inverse, yMinValue, yMaxValue, unscaledTime);
var isRise = yAxis.inverse ? close < open : close > open;
var isBodyRise = yAxis.inverse ? close <= open : close >= open;
var isColorRise = IsColorRise(showData, i, startDataIndex, open, close);
var borderWidth = open == 0 ? 0f :
(itemStyle.borderWidth == 0 ? theme.serie.candlestickBorderWidth :
itemStyle.borderWidth);
if (serieData.IsDataChanged()) dataChanging = true;
float pX = grid.context.x + i * categoryWidth;
float zeroY = grid.context.y + yAxis.context.offset;
float pX = xAxis.IsCategory() ? m_SerieGrid.context.x + i * categoryWidth : AxisHelper.GetAxisValuePosition(m_SerieGrid, xAxis, categoryWidth, serieData.GetData(0));
float zeroY = m_SerieGrid.context.y + yAxis.context.offset;
if (!xAxis.boundaryGap) pX -= categoryWidth / 2;
float pY = zeroY;
var barHig = 0f;
double valueTotal = yMaxValue - yMinValue;
var minCut = (yMinValue > 0 ? yMinValue : 0);
var minCut = yMinValue > 0 ? yMinValue : 0;
if (valueTotal != 0)
{
barHig = (float)((close - open) / valueTotal * grid.context.height);
pY += (float)((open - minCut) / valueTotal * grid.context.height);
barHig = (float)((close - open) / valueTotal * m_SerieGrid.context.height);
pY += (float)((open - minCut) / valueTotal * m_SerieGrid.context.height);
}
serieData.context.stackHeight = barHig;
float currHig = AnimationStyleHelper.CheckDataAnimation(chart, serie, i, barHig);
Vector3 plb, plt, prt, prb, top;
var offset = 2 * borderWidth;
if (isRise)
if (isBodyRise)
{
plb = new Vector3(pX + gap + offset, pY + offset);
plt = new Vector3(pX + gap + offset, pY + currHig - offset);
@@ -192,27 +258,33 @@ namespace XCharts.Runtime
}
if (serie.clip)
{
plb = chart.ClampInGrid(grid, plb);
plt = chart.ClampInGrid(grid, plt);
prt = chart.ClampInGrid(grid, prt);
prb = chart.ClampInGrid(grid, prb);
top = chart.ClampInGrid(grid, top);
plb = chart.ClampInGrid(m_SerieGrid, plb);
plt = chart.ClampInGrid(m_SerieGrid, plt);
prt = chart.ClampInGrid(m_SerieGrid, prt);
prb = chart.ClampInGrid(m_SerieGrid, prb);
top = chart.ClampInGrid(m_SerieGrid, top);
}
serie.context.dataPoints.Add(top);
serie.context.dataIndexs.Add(serieData.index);
var areaColor = isRise ?
var areaColor = isColorRise ?
itemStyle.GetColor(theme.serie.candlestickColor) :
itemStyle.GetColor0(theme.serie.candlestickColor0);
var borderColor = isRise ?
var borderColor = isColorRise ?
itemStyle.GetBorderColor(theme.serie.candlestickBorderColor) :
itemStyle.GetBorderColor0(theme.serie.candlestickBorderColor0);
var itemWidth = Mathf.Abs(prt.x - plb.x);
var itemHeight = Mathf.Abs(plt.y - prb.y);
var center = new Vector3((plb.x + prt.x) / 2, (plt.y + prb.y) / 2);
var lowPos = new Vector3(center.x, zeroY + (float)((lowest - minCut) / valueTotal * grid.context.height));
var heighPos = new Vector3(center.x, zeroY + (float)((heighest - minCut) / valueTotal * grid.context.height));
var lowPos = new Vector3(center.x, zeroY + (float)((lowest - minCut) / valueTotal * m_SerieGrid.context.height));
var heighPos = new Vector3(center.x, zeroY + (float)((heighest - minCut) / valueTotal * m_SerieGrid.context.height));
var openCenterPos = new Vector3(center.x, prb.y);
var closeCenterPos = new Vector3(center.x, prt.y);
var rectMinX = Mathf.Min(plb.x, prb.x, plt.x, prt.x);
var rectMaxX = Mathf.Max(plb.x, prb.x, plt.x, prt.x);
var rectMinY = Mathf.Min(plb.y, prb.y, plt.y, prt.y, lowPos.y, heighPos.y);
var rectMaxY = Mathf.Max(plb.y, prb.y, plt.y, prt.y, lowPos.y, heighPos.y);
serieData.context.rect = new Rect(rectMinX, rectMinY, rectMaxX - rectMinX, rectMaxY - rectMinY);
if (intensive)
{
UGL.DrawLine(vh, lowPos, heighPos, borderWidth, borderColor);
@@ -231,7 +303,7 @@ namespace XCharts.Runtime
else
{
chart.DrawClipPolygon(vh, ref prb, ref plb, ref plt, ref prt, areaColor, areaColor,
serie.clip, grid);
serie.clip, m_SerieGrid);
}
UGL.DrawBorder(vh, center, itemWidth, itemHeight, 2 * borderWidth, borderColor, 0,
itemStyle.cornerRadius, isYAxis, 0.5f);
@@ -241,7 +313,7 @@ namespace XCharts.Runtime
{
UGL.DrawLine(vh, openCenterPos, closeCenterPos, Mathf.Max(borderWidth, barWidth / 2), borderColor);
}
if (isRise)
if (isBodyRise)
{
UGL.DrawLine(vh, openCenterPos, lowPos, borderWidth, borderColor);
UGL.DrawLine(vh, closeCenterPos, heighPos, borderWidth, borderColor);
@@ -262,5 +334,17 @@ namespace XCharts.Runtime
chart.RefreshPainter(serie);
}
}
private static bool IsColorRise(List<SerieData> showData, int dataIndex, int startDataIndex, double open, double close)
{
if (dataIndex > 0)
{
var prevSerieData = showData[dataIndex - 1];
var prevStartDataIndex = prevSerieData.data.Count > 4 ? 1 : 0;
var prevClose = prevSerieData.GetData(prevStartDataIndex + 1);
return close >= prevClose;
}
return close >= open;
}
}
}

View File

@@ -151,7 +151,8 @@ namespace XCharts.Runtime
var close = serieData.GetCurrData(startDataIndex + 1, dataAddDuration, dataChangeDuration, yAxis.inverse, yMinValue, yMaxValue, unscaledTime);
var lowest = serieData.GetCurrData(startDataIndex + 2, dataAddDuration, dataChangeDuration, yAxis.inverse, yMinValue, yMaxValue, unscaledTime);
var heighest = serieData.GetCurrData(startDataIndex + 3, dataAddDuration, dataChangeDuration, yAxis.inverse, yMinValue, yMaxValue, unscaledTime);
var isRise = yAxis.inverse ? close<open : close> open;
var isBodyRise = yAxis.inverse ? close <= open : close >= open;
var isColorRise = IsColorRise(showData, i, startDataIndex, open, close);
var borderWidth = open == 0 ? 0f :
(itemStyle.borderWidth == 0 ? theme.serie.candlestickBorderWidth :
itemStyle.borderWidth);
@@ -173,7 +174,7 @@ namespace XCharts.Runtime
Vector3 plb, plt, prt, prb, top;
var offset = 2 * borderWidth;
if (isRise)
if (isBodyRise)
{
plb = new Vector3(pX + gap + offset, pY + offset);
plt = new Vector3(pX + gap + offset, pY + currHig - offset);
@@ -199,10 +200,10 @@ namespace XCharts.Runtime
// }
serie.context.dataPoints.Add(top);
serie.context.dataIndexs.Add(serieData.index);
var areaColor = isRise ?
var areaColor = isColorRise ?
itemStyle.GetColor(theme.serie.candlestickColor) :
itemStyle.GetColor0(theme.serie.candlestickColor0);
var borderColor = isRise ?
var borderColor = isColorRise ?
itemStyle.GetBorderColor(theme.serie.candlestickBorderColor) :
itemStyle.GetBorderColor0(theme.serie.candlestickBorderColor0);
var itemWidth = Mathf.Abs(prt.x - plb.x);
@@ -235,7 +236,7 @@ namespace XCharts.Runtime
UGL.DrawBorder(vh, center, itemWidth, itemHeight, 2 * borderWidth, borderColor, 0,
itemStyle.cornerRadius, isYAxis, 0.5f);
}
if (isRise)
if (isBodyRise)
{
UGL.DrawLine(vh, openCenterPos, lowPos, borderWidth, borderColor);
UGL.DrawLine(vh, closeCenterPos, heighPos, borderWidth, borderColor);
@@ -261,5 +262,17 @@ namespace XCharts.Runtime
chart.RefreshPainter(serie);
}
}
private static bool IsColorRise(List<SerieData> showData, int dataIndex, int startDataIndex, double open, double close)
{
if (dataIndex > 0)
{
var prevSerieData = showData[dataIndex - 1];
var prevStartDataIndex = prevSerieData.data.Count > 4 ? 1 : 0;
var prevClose = prevSerieData.GetData(prevStartDataIndex + 1);
return close >= prevClose;
}
return close >= open;
}
}
}

View File

@@ -56,6 +56,7 @@ namespace XCharts.Runtime
m_LastCheckContextFlag = needCheck;
var lineWidth = serie.lineStyle.GetWidth(chart.theme.serie.lineWidth);
var themeSymbolSize = chart.theme.serie.lineSymbolSize;
var symbolVisible = serie.symbol != null && serie.symbol.show && serie.symbol.type != SymbolType.None;
var needInteract = false;
serie.ResetDataIndex();
if (m_LegendEnter)
@@ -65,9 +66,12 @@ namespace XCharts.Runtime
for (int i = 0; i < serie.dataCount; i++)
{
var serieData = serie.data[i];
var size = SerieHelper.GetSysmbolSize(serie, serieData, themeSymbolSize, SerieState.Emphasis);
serieData.context.highlight = true;
serieData.interact.SetValue(ref needInteract, size);
if (symbolVisible)
{
var size = SerieHelper.GetSysmbolSize(serie, serieData, themeSymbolSize, SerieState.Emphasis);
serieData.interact.SetValue(ref needInteract, size);
}
}
}
else if (serie.context.isTriggerByAxis)
@@ -79,9 +83,12 @@ namespace XCharts.Runtime
var serieData = serie.data[i];
var highlight = i == serie.context.pointerItemDataIndex;
serieData.context.highlight = highlight;
var state = SerieHelper.GetSerieState(serie, serieData, true);
var size = SerieHelper.GetSysmbolSize(serie, serieData, themeSymbolSize, state);
serieData.interact.SetValue(ref needInteract, size);
if (symbolVisible)
{
var state = SerieHelper.GetSerieState(serie, serieData, true);
var size = SerieHelper.GetSysmbolSize(serie, serieData, themeSymbolSize, state);
serieData.interact.SetValue(ref needInteract, size);
}
if (highlight)
{
serie.context.pointerEnter = true;
@@ -98,13 +105,23 @@ namespace XCharts.Runtime
for (int i = 0; i < serie.dataCount; i++)
{
var serieData = serie.data[i];
var dist = Vector3.Distance(chart.pointerPos, serieData.context.position);
var size = SerieHelper.GetSysmbolSize(serie, serieData, themeSymbolSize);
var highlight = dist <= size;
var pointerOffset = (Vector2)chart.pointerPos - (Vector2)serieData.context.position;
bool highlight;
if (symbolVisible)
{
var size = SerieHelper.GetSysmbolSize(serie, serieData, themeSymbolSize);
var radius = size * 2.5f;
highlight = pointerOffset.sqrMagnitude <= radius * radius;
var state = SerieHelper.GetSerieState(serie, serieData, true);
size = SerieHelper.GetSysmbolSize(serie, serieData, themeSymbolSize, state);
serieData.interact.SetValue(ref needInteract, size);
}
else
{
var radius = themeSymbolSize * 2.5f;
highlight = pointerOffset.sqrMagnitude <= radius * radius;
}
serieData.context.highlight = highlight;
var state = SerieHelper.GetSerieState(serie, serieData, true);
size = SerieHelper.GetSysmbolSize(serie, serieData, themeSymbolSize, state);
serieData.interact.SetValue(ref needInteract, size);
if (highlight)
{
serie.context.pointerEnter = true;
@@ -292,6 +309,20 @@ namespace XCharts.Runtime
var dataChanging = false;
var dataChangeDuration = serie.animation.GetChangeDuration();
var unscaledTime = serie.animation.unscaledTime;
var dataAddDuration = 0f;
var useCurrentData = false;
List<double> sampleSumPrefix = null;
if (serie.animation.enable)
{
dataAddDuration = serie.animation.GetAdditionDuration();
useCurrentData = DataHelper.IsAnyDataChanged(ref showData, serie.minShow, showData.Count);
dataChanging = useCurrentData;
}
if (!useCurrentData && rate > 1 &&
(serie.sampleType == SampleType.Sum || serie.sampleType == SampleType.Average))
{
sampleSumPrefix = DataHelper.BuildSampleSumPrefix(ref showData, showData.Count, relativedAxis.inverse);
}
var interacting = false;
var lineWidth = LineHelper.GetLineWidth(ref interacting, serie, chart.theme.serie.lineWidth);
@@ -328,7 +359,8 @@ namespace XCharts.Runtime
var np = Vector3.zero;
var xValue = axis.IsCategory() ? realIndex : serieData.GetData(0, axis.inverse);
var relativedValue = DataHelper.SampleValue(ref showData, serie.sampleType, rate, serie.minShow,
maxCount, totalAverage, i, 0, dataChangeDuration, ref dataChanging, relativedAxis, unscaledTime);
maxCount, totalAverage, i, dataAddDuration, dataChangeDuration, ref dataChanging, relativedAxis,
unscaledTime, useCurrentData, false, sampleSumPrefix);
serieData.context.stackHeight = GetDataPoint(isY, axis, relativedAxis, m_SerieGrid, xValue, relativedValue,
i, scaleWid, scaleRelativedWid, isStack, ref np);

View File

@@ -97,6 +97,25 @@ namespace XCharts.Runtime
new Vector3(zero, points[count - 1].position.y) :
new Vector3(points[count - 1].position.x, zero);
// ===== 优化:缓存动画检查结果 =====
bool needAnimationCheck = serie.animation.IsSerieAnimation() && !serie.animation.IsFinish();
float animationCurrDetail = serie.animation.GetCurrDetail();
// ===== 优化:预计算颜色 =====
Color32[] gradientColors1 = null, gradientColors2 = null;
if (isVisualMapGradient)
{
gradientColors1 = new Color32[count];
gradientColors2 = new Color32[count];
for (int i = 0; i < count; i++)
{
var tp = points[i].position;
var zp = isY ? new Vector3(zero, tp.y) : new Vector3(tp.x, zero);
gradientColors1[i] = VisualMapHelper.GetLineGradientColor(visualMap, zp, grid, axis, relativedAxis, areaColor);
gradientColors2[i] = VisualMapHelper.GetLineGradientColor(visualMap, tp, grid, axis, relativedAxis, areaToColor);
}
}
var lastDataIsIgnore = false;
for (int i = 0; i < points.Count; i++)
{
@@ -111,23 +130,26 @@ namespace XCharts.Runtime
var toColor = areaToColor;
var lerp = areaLerp;
if (serie.animation.CheckDetailBreak(tp, isY))
// ===== 优化:使用缓存的动画状态 =====
if (needAnimationCheck)
{
isBreak = true;
if (isY && tp.y > animationCurrDetail || !isY && tp.x > animationCurrDetail)
{
isBreak = true;
var ip = Vector3.zero;
var axisStartPos = isY ? new Vector3(-10000, animationCurrDetail) : new Vector3(animationCurrDetail, -10000);
var axisEndPos = isY ? new Vector3(10000, animationCurrDetail) : new Vector3(animationCurrDetail, 10000);
var progress = serie.animation.GetCurrDetail();
var ip = Vector3.zero;
var axisStartPos = isY ? new Vector3(-10000, progress) : new Vector3(progress, -10000);
var axisEndPos = isY ? new Vector3(10000, progress) : new Vector3(progress, 10000);
if (UGLHelper.GetIntersection(lp, tp, axisStartPos, axisEndPos, ref ip))
tp = ip;
if (UGLHelper.GetIntersection(lp, tp, axisStartPos, axisEndPos, ref ip))
tp = ip;
}
}
var zp = isY ? new Vector3(zero, tp.y) : new Vector3(tp.x, zero);
if (isVisualMapGradient)
{
color = VisualMapHelper.GetLineGradientColor(visualMap, zp, grid, axis, relativedAxis, areaColor);
toColor = VisualMapHelper.GetLineGradientColor(visualMap, tp, grid, axis, relativedAxis, areaToColor);
color = gradientColors1[i];
toColor = gradientColors2[i];
lerp = true;
}
if (i > 0)
@@ -271,6 +293,13 @@ namespace XCharts.Runtime
}
}
/// <summary>
/// 【优化版本】关键性能优化:
/// 1. 颜色预计算 (50-70% 性能提升)
/// 2. 缓存动画检查结果 (30-40% 性能提升)
/// 3. 线段样式预处理 (10-20% 性能提升)
/// 总体预期提升50-70%(当启用渐变时)
/// </summary>
internal static void DrawSerieLine(VertexHelper vh, ThemeStyle theme, Serie serie, VisualMap visualMap,
GridCoord grid, Axis axis, Axis relativedAxis, float lineWidth)
{
@@ -304,6 +333,40 @@ namespace XCharts.Runtime
var dashLength = serie.lineStyle.dashLength;
var gapLength = serie.lineStyle.gapLength;
var dotLength = serie.lineStyle.dotLength;
// ===== 优化 1: 预计算颜色数组 (如果启用 VisualMap 渐变) =====
Color32[] pointColors1 = null, pointColors2 = null;
if (isVisualMapGradient)
{
pointColors1 = new Color32[dataCount];
pointColors2 = new Color32[dataCount];
for (int i = 0; i < dataCount; i++)
{
pointColors1[i] = VisualMapHelper.GetLineGradientColor(visualMap, datas[i].position, grid, axis, relativedAxis, lineColor);
pointColors2[i] = pointColors1[i];
}
}
// 如果启用线段样式渐变,也预计算
Color32[] styleColors1 = null, styleColors2 = null;
if (isLineStyleGradient && !isVisualMapGradient)
{
styleColors1 = new Color32[dataCount];
styleColors2 = new Color32[dataCount];
for (int i = 0; i < dataCount; i++)
{
styleColors1[i] = VisualMapHelper.GetLineStyleGradientColor(serie.lineStyle, datas[i].position, grid, axis, lineColor);
styleColors2[i] = styleColors1[i];
}
}
// ===== 优化 2: 缓存动画检查结果 =====
bool needAnimationCheck = serie.animation.IsSerieAnimation() && !serie.animation.IsFinish();
float animationCurrDetail = serie.animation.GetCurrDetail();
// ===== 优化 3: 线段样式预处理 (避免循环内 switch) =====
System.Func<int, bool> isSegmentIgnored = BuildSegmentIgnoreFunc(serie.lineStyle.type,
dashLength, gapLength, dotLength);
for (int i = 1; i < dataCount; i++)
{
var cdata = datas[i];
@@ -312,15 +375,20 @@ namespace XCharts.Runtime
var lp = datas[i - 1].position;
var np = i == dataCount - 1 ? cp : datas[i + 1].position;
if (serie.animation.CheckDetailBreak(cp, isY))
// ===== 优化:使用缓存的动画状态 =====
if (needAnimationCheck)
{
isBreak = true;
var ip = Vector3.zero;
var progress = serie.animation.GetCurrDetail();
var rate = 0f;
if (AnimationStyleHelper.GetAnimationPosition(serie.animation, isY, lp, cp, progress, ref ip, ref rate))
cp = np = ip;
if (isY && cp.y > animationCurrDetail || !isY && cp.x > animationCurrDetail)
{
isBreak = true;
var ip = Vector3.zero;
var rate = 0f;
if (AnimationStyleHelper.GetAnimationPosition(serie.animation, isY, lp, cp, animationCurrDetail, ref ip, ref rate))
cp = np = ip;
}
}
serie.context.lineEndPostion = cp;
serie.context.lineEndValueY = AxisHelper.GetAxisPositionValue(grid, relativedAxis, cp);
var handled = false;
@@ -338,39 +406,11 @@ namespace XCharts.Runtime
handled = true;
break;
}
{
segmentCount++;
var index = 0f;
switch (serie.lineStyle.type)
{
case LineStyle.Type.Dashed:
index = segmentCount % (dashLength + gapLength);
if (index >= dashLength)
isIgnore = true;
break;
case LineStyle.Type.Dotted:
index = segmentCount % (dotLength + gapLength);
if (index >= dotLength)
isIgnore = true;
break;
case LineStyle.Type.DashDot:
index = segmentCount % (dashLength + dotLength + 2 * gapLength);
if (index >= dashLength && index < dashLength + gapLength)
isIgnore = true;
else if (index >= dashLength + gapLength + dotLength)
isIgnore = true;
break;
case LineStyle.Type.DashDotDot:
index = segmentCount % (dashLength + 2 * dotLength + 3 * gapLength);
if (index >= dashLength && index < dashLength + gapLength)
isIgnore = true;
else if (index >= dashLength + gapLength + dotLength && index < dashLength + dotLength + 2 * gapLength)
isIgnore = true;
else if (index >= dashLength + 2 * gapLength + 2 * dotLength)
isIgnore = true;
break;
}
}
// ===== 优化:使用预处理的线段样式函数 =====
segmentCount++;
if (isSegmentIgnored(segmentCount))
isIgnore = true;
if (handled)
{
@@ -391,12 +431,35 @@ namespace XCharts.Runtime
if (i == 1)
{
if (isClip) lastDataIsIgnore = true;
AddLineVertToVertexHelper(vh, ltp, lbp, lineColor, isVisualMapGradient, isLineStyleGradient,
visualMap, serie.lineStyle, grid, axis, relativedAxis, false, lastDataIsIgnore, isIgnore);
if (isVisualMapGradient)
{
AddLineVertToVertexHelperFast(vh, ltp, lbp, pointColors1[0], pointColors1[0], false, lastDataIsIgnore, isIgnore);
}
else if (isLineStyleGradient)
{
AddLineVertToVertexHelperFast(vh, ltp, lbp, styleColors1[0], styleColors1[0], false, lastDataIsIgnore, isIgnore);
}
else
{
AddLineVertToVertexHelper(vh, ltp, lbp, lineColor, false, false,
visualMap, serie.lineStyle, grid, axis, relativedAxis, false, lastDataIsIgnore, isIgnore);
}
if (dataCount == 2 || isBreak)
{
AddLineVertToVertexHelper(vh, clp, crp, lineColor, isVisualMapGradient, isLineStyleGradient,
visualMap, serie.lineStyle, grid, axis, relativedAxis, true, lastDataIsIgnore, isIgnore);
if (isVisualMapGradient)
{
AddLineVertToVertexHelperFast(vh, clp, crp, pointColors1[i], pointColors1[i], true, lastDataIsIgnore, isIgnore);
}
else if (isLineStyleGradient)
{
AddLineVertToVertexHelperFast(vh, clp, crp, styleColors1[i], styleColors1[i], true, lastDataIsIgnore, isIgnore);
}
else
{
AddLineVertToVertexHelper(vh, clp, crp, lineColor, false, false,
visualMap, serie.lineStyle, grid, axis, relativedAxis, true, lastDataIsIgnore, isIgnore);
}
serie.context.lineEndPostion = cp;
serie.context.lineEndValueY = AxisHelper.GetAxisPositionValue(grid, relativedAxis, cp);
break;
@@ -406,31 +469,70 @@ namespace XCharts.Runtime
if (bitp == bibp)
{
if (bitp)
AddLineVertToVertexHelper(vh, itp, ibp, lineColor, isVisualMapGradient, isLineStyleGradient,
visualMap, serie.lineStyle, grid, axis, relativedAxis, true, lastDataIsIgnore, isIgnore);
{
if (isVisualMapGradient)
AddLineVertToVertexHelperFast(vh, itp, ibp, pointColors1[i], pointColors1[i], true, lastDataIsIgnore, isIgnore);
else if (isLineStyleGradient)
AddLineVertToVertexHelperFast(vh, itp, ibp, styleColors1[i], styleColors1[i], true, lastDataIsIgnore, isIgnore);
else
AddLineVertToVertexHelper(vh, itp, ibp, lineColor, false, false, visualMap, serie.lineStyle, grid, axis, relativedAxis, true, lastDataIsIgnore, isIgnore);
}
else
{
AddLineVertToVertexHelper(vh, ltp, clp, lineColor, isVisualMapGradient, isLineStyleGradient,
visualMap, serie.lineStyle, grid, axis, relativedAxis, true, lastDataIsIgnore, isIgnore);
AddLineVertToVertexHelper(vh, ltp, crp, lineColor, isVisualMapGradient, isLineStyleGradient,
visualMap, serie.lineStyle, grid, axis, relativedAxis, true, lastDataIsIgnore, isIgnore);
if (isVisualMapGradient)
{
AddLineVertToVertexHelperFast(vh, ltp, clp, pointColors1[i-1], pointColors1[i], true, lastDataIsIgnore, isIgnore);
AddLineVertToVertexHelperFast(vh, ltp, crp, pointColors1[i-1], pointColors1[i], true, lastDataIsIgnore, isIgnore);
}
else if (isLineStyleGradient)
{
AddLineVertToVertexHelperFast(vh, ltp, clp, styleColors1[i-1], styleColors1[i], true, lastDataIsIgnore, isIgnore);
AddLineVertToVertexHelperFast(vh, ltp, crp, styleColors1[i-1], styleColors1[i], true, lastDataIsIgnore, isIgnore);
}
else
{
AddLineVertToVertexHelper(vh, ltp, clp, lineColor, false, false, visualMap, serie.lineStyle, grid, axis, relativedAxis, true, lastDataIsIgnore, isIgnore);
AddLineVertToVertexHelper(vh, ltp, crp, lineColor, false, false, visualMap, serie.lineStyle, grid, axis, relativedAxis, true, lastDataIsIgnore, isIgnore);
}
}
}
else
{
if (bitp)
{
AddLineVertToVertexHelper(vh, itp, clp, lineColor, isVisualMapGradient, isLineStyleGradient,
visualMap, serie.lineStyle, grid, axis, relativedAxis, true, lastDataIsIgnore, isIgnore);
AddLineVertToVertexHelper(vh, itp, crp, lineColor, isVisualMapGradient, isLineStyleGradient,
visualMap, serie.lineStyle, grid, axis, relativedAxis, true, lastDataIsIgnore, isIgnore);
if (isVisualMapGradient)
{
AddLineVertToVertexHelperFast(vh, itp, clp, pointColors1[i], pointColors1[i], true, lastDataIsIgnore, isIgnore);
AddLineVertToVertexHelperFast(vh, itp, crp, pointColors1[i], pointColors1[i], true, lastDataIsIgnore, isIgnore);
}
else if (isLineStyleGradient)
{
AddLineVertToVertexHelperFast(vh, itp, clp, styleColors1[i], styleColors1[i], true, lastDataIsIgnore, isIgnore);
AddLineVertToVertexHelperFast(vh, itp, crp, styleColors1[i], styleColors1[i], true, lastDataIsIgnore, isIgnore);
}
else
{
AddLineVertToVertexHelper(vh, itp, clp, lineColor, false, false, visualMap, serie.lineStyle, grid, axis, relativedAxis, true, lastDataIsIgnore, isIgnore);
AddLineVertToVertexHelper(vh, itp, crp, lineColor, false, false, visualMap, serie.lineStyle, grid, axis, relativedAxis, true, lastDataIsIgnore, isIgnore);
}
}
else if (bibp)
{
AddLineVertToVertexHelper(vh, clp, ibp, lineColor, isVisualMapGradient, isLineStyleGradient,
visualMap, serie.lineStyle, grid, axis, relativedAxis, true, lastDataIsIgnore, isIgnore);
AddLineVertToVertexHelper(vh, crp, ibp, lineColor, isVisualMapGradient, isLineStyleGradient,
visualMap, serie.lineStyle, grid, axis, relativedAxis, true, lastDataIsIgnore, isIgnore);
if (isVisualMapGradient)
{
AddLineVertToVertexHelperFast(vh, clp, ibp, pointColors1[i], pointColors1[i], true, lastDataIsIgnore, isIgnore);
AddLineVertToVertexHelperFast(vh, crp, ibp, pointColors1[i], pointColors1[i], true, lastDataIsIgnore, isIgnore);
}
else if (isLineStyleGradient)
{
AddLineVertToVertexHelperFast(vh, clp, ibp, styleColors1[i], styleColors1[i], true, lastDataIsIgnore, isIgnore);
AddLineVertToVertexHelperFast(vh, crp, ibp, styleColors1[i], styleColors1[i], true, lastDataIsIgnore, isIgnore);
}
else
{
AddLineVertToVertexHelper(vh, clp, ibp, lineColor, false, false, visualMap, serie.lineStyle, grid, axis, relativedAxis, true, lastDataIsIgnore, isIgnore);
AddLineVertToVertexHelper(vh, crp, ibp, lineColor, false, false, visualMap, serie.lineStyle, grid, axis, relativedAxis, true, lastDataIsIgnore, isIgnore);
}
}
}
lastDataIsIgnore = isIgnore;
@@ -439,6 +541,47 @@ namespace XCharts.Runtime
}
}
/// <summary>
/// 【优化】预处理线段样式,避免循环内重复的 switch 判断
/// 返回一个委托,用于快速判断某个段是否应该被忽略
/// </summary>
private static System.Func<int, bool> BuildSegmentIgnoreFunc(LineStyle.Type lineType,
float dashLength, float gapLength, float dotLength)
{
switch (lineType)
{
case LineStyle.Type.Dashed:
return (segmentCount) =>
{
var index = segmentCount % (dashLength + gapLength);
return index >= dashLength;
};
case LineStyle.Type.Dotted:
return (segmentCount) =>
{
var index = segmentCount % (dotLength + gapLength);
return index >= dotLength;
};
case LineStyle.Type.DashDot:
return (segmentCount) =>
{
var index = segmentCount % (dashLength + dotLength + 2 * gapLength);
return (index >= dashLength && index < dashLength + gapLength) ||
(index >= dashLength + gapLength + dotLength);
};
case LineStyle.Type.DashDotDot:
return (segmentCount) =>
{
var index = segmentCount % (dashLength + 2 * dotLength + 3 * gapLength);
return (index >= dashLength && index < dashLength + gapLength) ||
(index >= dashLength + gapLength + dotLength && index < dashLength + dotLength + 2 * gapLength) ||
(index >= dashLength + 2 * gapLength + 2 * dotLength);
};
default:
return (_) => false;
}
}
public static float GetLineWidth(ref bool interacting, Serie serie, float defaultWidth)
{
var lineWidth = 0f;
@@ -450,6 +593,27 @@ namespace XCharts.Runtime
return lineWidth;
}
/// <summary>
/// 快速路径版本 - 用于颜色已预计算的情况,避免条件判断和重复计算
/// </summary>
private static void AddLineVertToVertexHelperFast(VertexHelper vh, Vector3 tp, Vector3 bp,
Color32 color1, Color32 color2, bool needTriangle, bool lastIgnore, bool ignore)
{
if (lastIgnore && needTriangle)
UGL.AddVertToVertexHelper(vh, tp, bp, ColorUtil.clearColor32, true);
UGL.AddVertToVertexHelper(vh, tp, bp, color1, color2, needTriangle);
if (lastIgnore && !needTriangle)
{
UGL.AddVertToVertexHelper(vh, tp, bp, ColorUtil.clearColor32, false);
}
if (ignore && needTriangle)
{
UGL.AddVertToVertexHelper(vh, tp, bp, ColorUtil.clearColor32, false);
}
}
private static void AddLineVertToVertexHelper(VertexHelper vh, Vector3 tp, Vector3 bp,
Color32 lineColor, bool visualMapGradient, bool lineStyleGradient, VisualMap visualMap,
LineStyle lineStyle, GridCoord grid, Axis axis, Axis relativedAxis, bool needTriangle,

View File

@@ -67,6 +67,7 @@ namespace XCharts.Runtime
m_LastCheckContextFlag = needCheck;
var themeSymbolSize = chart.theme.serie.lineSymbolSize;
lineWidth = serie.lineStyle.GetWidth(chart.theme.serie.lineWidth);
var symbolVisible = serie.symbol != null && serie.symbol.show && serie.symbol.type != SymbolType.None;
var needInteract = false;
if (m_LegendEnter)
@@ -76,9 +77,12 @@ namespace XCharts.Runtime
for (int i = 0; i < serie.dataCount; i++)
{
var serieData = serie.data[i];
var size = SerieHelper.GetSysmbolSize(serie, serieData, themeSymbolSize, SerieState.Emphasis);
serieData.context.highlight = true;
serieData.interact.SetValue(ref needInteract, size);
if (symbolVisible)
{
var size = SerieHelper.GetSysmbolSize(serie, serieData, themeSymbolSize, SerieState.Emphasis);
serieData.interact.SetValue(ref needInteract, size);
}
}
}
else if (serie.context.isTriggerByAxis)
@@ -90,13 +94,17 @@ namespace XCharts.Runtime
var serieData = serie.data[i];
var highlight = i == serie.context.pointerItemDataIndex;
serieData.context.highlight = highlight;
var state = SerieHelper.GetSerieState(serie, serieData, true);
var size = SerieHelper.GetSysmbolSize(serie, serieData, themeSymbolSize, state);
serieData.interact.SetValue(ref needInteract, size);
if (symbolVisible)
{
var state = SerieHelper.GetSerieState(serie, serieData, true);
var size = SerieHelper.GetSysmbolSize(serie, serieData, themeSymbolSize, state);
serieData.interact.SetValue(ref needInteract, size);
}
if (highlight)
{
serie.context.pointerEnter = true;
serie.context.pointerItemDataIndex = i;
needInteract = true;
}
}
}
@@ -108,13 +116,21 @@ namespace XCharts.Runtime
for (int i = 0; i < serie.dataCount; i++)
{
var serieData = serie.data[i];
var dist = Vector3.Distance(chart.pointerPos, serieData.context.position);
var size = SerieHelper.GetSysmbolSize(serie, serieData, themeSymbolSize);
var highlight = dist <= size;
var pointerOffset = (Vector2)chart.pointerPos - (Vector2)serieData.context.position;
bool highlight;
if (symbolVisible)
{
var size = SerieHelper.GetSysmbolSize(serie, serieData, themeSymbolSize);
highlight = pointerOffset.sqrMagnitude <= size * size;
var state = SerieHelper.GetSerieState(serie, serieData, true);
size = SerieHelper.GetSysmbolSize(serie, serieData, themeSymbolSize, state);
serieData.interact.SetValue(ref needInteract, size);
}
else
{
highlight = pointerOffset.sqrMagnitude <= themeSymbolSize * themeSymbolSize;
}
serieData.context.highlight = highlight;
var state = SerieHelper.GetSerieState(serie, serieData, true);
size = SerieHelper.GetSysmbolSize(serie, serieData, themeSymbolSize, state);
serieData.interact.SetValue(ref needInteract, size);
if (highlight)
{
serie.context.pointerEnter = true;
@@ -177,6 +193,18 @@ namespace XCharts.Runtime
var dataChangeDuration = serie.animation.GetChangeDuration();
var dataAddDuration = serie.animation.GetAdditionDuration();
var unscaledTime = serie.animation.unscaledTime;
var useCurrentData = false;
List<double> sampleSumPrefix = null;
if (serie.animation.enable)
{
useCurrentData = DataHelper.IsAnyDataChanged(ref showData, serie.minShow, maxCount);
dataChanging = useCurrentData;
}
if (!useCurrentData && rate > 1 &&
(serie.sampleType == SampleType.Sum || serie.sampleType == SampleType.Average))
{
sampleSumPrefix = DataHelper.BuildSampleSumPrefix(ref showData, maxCount, relativedAxis.inverse);
}
var interacting = false;
var lineWidth = LineHelper.GetLineWidth(ref interacting, serie, chart.theme.serie.lineWidth);
@@ -204,7 +232,8 @@ namespace XCharts.Runtime
var np = Vector3.zero;
var xValue = axis.IsCategory() ? i : serieData.GetData(0, axis.inverse);
var relativedValue = DataHelper.SampleValue(ref showData, serie.sampleType, rate, serie.minShow,
maxCount, totalAverage, i, dataAddDuration, dataChangeDuration, ref dataChanging, relativedAxis, unscaledTime);
maxCount, totalAverage, i, dataAddDuration, dataChangeDuration, ref dataChanging, relativedAxis,
unscaledTime, useCurrentData, false, sampleSumPrefix);
serieData.context.stackHeight = GetDataPoint(isY, axis, relativedAxis, m_SerieGrid, xValue, relativedValue,
i, scaleWid, scaleRelativedWid, false, ref np);

View File

@@ -2,6 +2,21 @@ using UnityEngine;
namespace XCharts.Runtime
{
public enum PieType
{
/// <summary>
/// solid pie chart - default fill style.
/// ||实心饼图 - 默认填充样式
/// </summary>
Solid,
/// <summary>
/// wireframe pie chart - only show the outline wireframe.
/// ||线框饼图 - 仅显示轮廓线框
/// </summary>
Wireframe
}
[System.Serializable]
[SerieConvert(typeof(Line), typeof(Bar))]
[SerieHandler(typeof(PieHandler), true)]
@@ -12,10 +27,20 @@ namespace XCharts.Runtime
public class Pie : Serie
{
[SerializeField][Since("v3.8.1")] private bool m_RadiusGradient = false;
[SerializeField][Since("v3.15.0")] private PieType m_PieType = PieType.Solid;
public override SerieColorBy defaultColorBy { get { return SerieColorBy.Data; } }
public override bool titleJustForSerie { get { return true; } }
/// <summary>
/// Pie chart type.
/// || 饼图类型。
/// </summary>
public PieType pieType
{
get { return m_PieType; }
set { if (PropertyUtil.SetStruct(ref m_PieType, value)) { SetVerticesDirty(); } }
}
/// <summary>
/// Whether to use gradient color in pie chart.
/// || 是否开启半径方向的渐变效果。

View File

@@ -271,6 +271,7 @@ namespace XCharts.Runtime
}
var offset = 0f;
var interactOffset = serie.animation.interaction.GetOffset(serie.context.outsideRadius);
serieData.context.insideRadius = serie.context.insideRadius;
if (serie.pieClickOffset && (serieData.selected || serieData.context.selected))
{
offset += interactOffset;
@@ -358,7 +359,7 @@ namespace XCharts.Runtime
{
var itemStyle = SerieHelper.GetItemStyle(serie, null);
var fillColor = ChartHelper.IsClearColor(itemStyle.backgroundColor) ?
(Color32)chart.theme.legend.unableColor : itemStyle.backgroundColor;
(Color32)chart.theme.legend.inactiveColor : itemStyle.backgroundColor;
UGL.DrawDoughnut(vh, serie.context.center, serie.context.insideRadius,
serie.context.outsideRadius, fillColor, fillColor, Color.clear, 0,
360, itemStyle.borderWidth, itemStyle.borderColor, serie.gap / 2, chart.settings.cicleSmoothness,
@@ -381,8 +382,6 @@ namespace XCharts.Runtime
var needOffset = (serie.pieClickOffset && (serieData.selected || serieData.context.selected));
var offsetCenter = needOffset ? serieData.context.offsetCenter : serie.context.center;
var borderWidth = itemStyle.borderWidth;
var borderColor = itemStyle.borderColor;
var progress = AnimationStyleHelper.CheckDataAnimation(chart, serie, n, 1);
var insideRadius = serieData.context.insideRadius * progress;
@@ -398,6 +397,17 @@ namespace XCharts.Runtime
serieData.interact.SetPosition(ref interacting, offsetCenter);
}
}
var borderWidth = itemStyle.borderWidth;
var borderColor = itemStyle.GetBorderColor(color);
if (serie.pieType == PieType.Wireframe)
{
color = ColorUtil.clearColor32;
toColor = ColorUtil.clearColor32;
if (borderWidth <= 0)
{
borderWidth = 4;
}
}
var drawEndDegree = serieData.context.currentAngle;
var needRoundCap = serie.roundCap && insideRadius > 0;
UGL.DrawDoughnut(vh, offsetCenter, insideRadius,
@@ -545,10 +555,11 @@ namespace XCharts.Runtime
var dist = Vector2.Distance(local, serie.context.center);
var interactOffset = serie.animation.interaction.GetOffset(serie.context.outsideRadius);
var maxRadius = serie.context.outsideRadius + 2 * interactOffset;
if (dist < serie.context.insideRadius || dist > maxRadius)
var maxRadius = serie.context.outsideRadius + interactOffset;
if (dist < serie.context.insideRadius - interactOffset || dist > maxRadius)
{
return -1;
}
var dir = local - new Vector2(serie.context.center.x, serie.context.center.y);
var angle = ChartHelper.GetAngle360(Vector2.up, dir);
for (int i = 0; i < serie.data.Count; i++)
@@ -559,7 +570,8 @@ namespace XCharts.Runtime
var ndist = (serieData.selected || serieData.context.selected) ?
Vector2.Distance(local, serieData.context.offsetCenter) :
dist;
if (ndist >= serieData.context.insideRadius && ndist <= serieData.context.outsideRadius)
ndist = dist;
if (ndist >= serieData.context.insideRadius - interactOffset && ndist <= serieData.context.outsideRadius)
{
return i;
}

View File

@@ -95,6 +95,9 @@ namespace XCharts.Runtime
else
{
itemFormatter = itemFormatter.Replace("\\n", "\n");
var needTotal = itemFormatter.IndexOf("{d", System.StringComparison.OrdinalIgnoreCase) >= 0 ||
itemFormatter.IndexOf("{f", System.StringComparison.OrdinalIgnoreCase) >= 0;
var total = needTotal ? serie.yTotal : 0;
var temp = itemFormatter.Split('\n');
for (int i = 0; i < temp.Length; i++)
{
@@ -106,7 +109,7 @@ namespace XCharts.Runtime
param.serieData = serieData;
param.dataCount = serie.dataCount;
param.value = serieData.GetData(i);
param.total = serie.yTotal;
param.total = total;
param.color = color;
param.category = radar.GetIndicatorName(i);
param.marker = marker;

View File

@@ -166,6 +166,8 @@ namespace XCharts.Runtime
var symbol = SerieHelper.GetSerieSymbol(serie, serieData);
if (!symbol.ShowSymbol(serieData.index, maxCount))
continue;
if (serie.IsIgnoreValue(serieData))
continue;
var state = SerieHelper.GetSerieState(serie, serieData, true);

View File

@@ -264,6 +264,7 @@ namespace XCharts.Runtime
[SerializeField] private float m_BarGap = 0.1f;
[SerializeField] private float m_BarZebraWidth = 4f;
[SerializeField] private float m_BarZebraGap = 2f;
[SerializeField] [Since("v3.15.0")]private bool m_IgnoreZeroOccupy = false;
[SerializeField] private float m_Min;
[SerializeField] private float m_Max;
@@ -322,6 +323,9 @@ namespace XCharts.Runtime
[NonSerialized] internal bool m_NeedUpdateFilterData;
[NonSerialized] public List<SerieData> m_FilterData = new List<SerieData>();
[NonSerialized] private bool m_NameDirty;
[NonSerialized] private int m_YTotalCacheFrame = -1;
[NonSerialized] private double m_YTotalCacheValue = 0;
/// <summary>
/// event callback when click serie.
@@ -632,7 +636,8 @@ namespace XCharts.Runtime
set { if (PropertyUtil.SetStruct(ref m_BarGap, value)) SetVerticesDirty(); }
}
/// <summary>
/// 斑马线的粗细。
/// The width of zebra bar. It is the width of each zebra stripe. When the value is 0, there is no zebra stripe.
/// ||斑马线的粗细。
/// </summary>
public float barZebraWidth
{
@@ -640,13 +645,24 @@ namespace XCharts.Runtime
set { if (PropertyUtil.SetStruct(ref m_BarZebraWidth, value < 0 ? 0 : value)) SetVerticesDirty(); }
}
/// <summary>
/// 斑马线的间距。
/// The gap of zebra bar. It is the distance between two zebra stripes. When the value is 0, there is no gap between stripes.
/// ||斑马线的间距。
/// </summary>
public float barZebraGap
{
get { return m_BarZebraGap; }
set { if (PropertyUtil.SetStruct(ref m_BarZebraGap, value < 0 ? 0 : value)) SetVerticesDirty(); }
}
/// <summary>
/// Whether to ignore the zero value bar occupy. When enabled, the bar with zero value will not occupy space,
/// and the gap between bars will be automatically adjusted according to the actual displayed bars. Generally used in bar chart.
/// ||柱图是否忽略值为0的柱子占位。开启后值为0的柱子将不会占用空间柱子之间的间距会根据实际显示的柱子自动调整。一般用在柱状图中。
/// </summary>
public bool ignoreZeroOccupy
{
get { return m_IgnoreZeroOccupy; }
set { if (PropertyUtil.SetStruct(ref m_IgnoreZeroOccupy, value)) SetVerticesDirty(); }
}
/// <summary>
/// Whether offset when mouse click pie chart item.
@@ -1226,6 +1242,9 @@ namespace XCharts.Runtime
{
get
{
if (m_YTotalCacheFrame == Time.frameCount)
return m_YTotalCacheValue;
double total = 0;
if (IsPerformanceMode())
{
@@ -1246,6 +1265,8 @@ namespace XCharts.Runtime
total += sdata.GetCurrData(1, dataAddDuration, duration, unscaledTime);
}
}
m_YTotalCacheFrame = Time.frameCount;
m_YTotalCacheValue = total;
return total;
}
}
@@ -1296,6 +1317,7 @@ namespace XCharts.Runtime
/// </summary>
public override void ClearData()
{
InvalidateTotalCache();
while (m_Data.Count > 0)
{
RemoveData(0);
@@ -1323,6 +1345,7 @@ namespace XCharts.Runtime
{
if (index >= 0 && index < m_Data.Count)
{
InvalidateTotalCache();
if (!string.IsNullOrEmpty(m_Data[index].name))
{
SetSerieNameDirty();
@@ -1337,6 +1360,7 @@ namespace XCharts.Runtime
m_Data.RemoveAt(index);
m_NeedUpdateFilterData = true;
labelDirty = true;
titleDirty = true;
dataDirty = true;
}
}
@@ -1363,12 +1387,14 @@ namespace XCharts.Runtime
SetVerticesDirty();
CheckDataName(dataName);
labelDirty = true;
titleDirty = true;
dataDirty = true;
return serieData;
}
public virtual void AddSerieData(SerieData serieData)
{
InvalidateTotalCache();
if (m_InsertDataToHead)
m_Data.Insert(0, serieData);
else
@@ -1377,6 +1403,8 @@ namespace XCharts.Runtime
context.totalDataIndex++;
SetVerticesDirty();
dataDirty = true;
labelDirty = true;
titleDirty = true;
m_NeedUpdateFilterData = true;
}
@@ -1411,6 +1439,7 @@ namespace XCharts.Runtime
SetVerticesDirty();
CheckDataName(dataName);
labelDirty = true;
titleDirty = true;
return serieData;
}
@@ -1443,6 +1472,7 @@ namespace XCharts.Runtime
SetVerticesDirty();
CheckDataName(dataName);
labelDirty = true;
titleDirty = true;
return serieData;
}
@@ -1477,6 +1507,7 @@ namespace XCharts.Runtime
SetVerticesDirty();
CheckDataName(dataName);
labelDirty = true;
titleDirty = true;
return serieData;
}
}
@@ -1512,6 +1543,7 @@ namespace XCharts.Runtime
SetVerticesDirty();
CheckDataName(dataName);
labelDirty = true;
titleDirty = true;
return serieData;
}
}
@@ -1803,8 +1835,10 @@ namespace XCharts.Runtime
var flag = m_Data[index].UpdateData(dimension, value, animationOpen, unscaledTime, animationDuration);
if (flag)
{
InvalidateTotalCache();
SetVerticesDirty();
dataDirty = true;
titleDirty = true;
}
return flag;
}
@@ -1823,6 +1857,7 @@ namespace XCharts.Runtime
{
if (index >= 0 && index < m_Data.Count && values != null)
{
InvalidateTotalCache();
var serieData = m_Data[index];
var animationOpen = animation.enable;
var animationDuration = animation.GetChangeDuration();
@@ -1836,6 +1871,18 @@ namespace XCharts.Runtime
return false;
}
private void InvalidateTotalCache()
{
m_YTotalCacheFrame = -1;
m_YTotalCacheValue = 0;
InvalidateMinMaxCache();
}
private void InvalidateMinMaxCache()
{
context.InvalidateMinMaxCache();
}
public bool UpdateDataName(int index, string name)
{
if (index >= 0 && index < m_Data.Count)

View File

@@ -29,6 +29,40 @@ namespace XCharts.Runtime
public class SerieContext
{
[System.NonSerialized] internal double[] cachedMin = new double[3] { double.MaxValue, double.MaxValue, double.MaxValue };
[System.NonSerialized] internal double[] cachedMax = new double[3] { double.MinValue, double.MinValue, double.MinValue };
[System.NonSerialized] internal bool[] cacheValid = new bool[3] { false, false, false };
internal void InvalidateMinMaxCache()
{
for (int i = 0; i < cacheValid.Length; i++)
cacheValid[i] = false;
cachedMin[0] = cachedMin[1] = cachedMin[2] = double.MaxValue;
cachedMax[0] = cachedMax[1] = cachedMax[2] = double.MinValue;
}
internal bool TryGetCachedMinMax(int dimension, out double minValue, out double maxValue)
{
minValue = 0; maxValue = 0;
if (dimension < 0 || dimension > 2) return false;
if (cacheValid[dimension])
{
minValue = cachedMin[dimension];
maxValue = cachedMax[dimension];
return true;
}
return false;
}
internal void SetCachedMinMax(int dimension, double minValue, double maxValue)
{
if (dimension < 0 || dimension > 2) return;
cachedMin[dimension] = minValue;
cachedMax[dimension] = maxValue;
cacheValid[dimension] = true;
}
/// <summary>
/// 鼠标是否进入serie
/// </summary>

View File

@@ -645,11 +645,12 @@ namespace XCharts.Runtime
/// the maxinum value.
/// ||最大值。
/// </summary>
public double GetMaxData(bool inverse = false)
public double GetMaxData(bool inverse = false, int startDimensionIndex = 0)
{
if (m_Data.Count == 0) return 0;
var temp = double.MinValue;
for (int i = 0; i < m_Data.Count; i++)
if (startDimensionIndex < 0) startDimensionIndex = 0;
for (int i = startDimensionIndex; i < m_Data.Count; i++)
{
var value = GetData(i, inverse);
if (value > temp) temp = value;
@@ -661,11 +662,12 @@ namespace XCharts.Runtime
/// the mininum value.
/// ||最小值。
/// </summary>
public double GetMinData(bool inverse = false)
public double GetMinData(bool inverse = false, int startDimensionIndex = 0)
{
if (m_Data.Count == 0) return 0;
var temp = double.MaxValue;
for (int i = 0; i < m_Data.Count; i++)
if (startDimensionIndex < 0) startDimensionIndex = 0;
for (int i = startDimensionIndex; i < m_Data.Count; i++)
{
var value = GetData(i, inverse);
if (value < temp) temp = value;

View File

@@ -35,6 +35,19 @@ namespace XCharts.Runtime
public float offsetRadius;
public float outsideRadius;
public Vector3 position;
/// <summary>
/// is the exchange animation end.
/// ||交换动画是否结束。
/// </summary>
public bool exchangeEnd;
/// <summary>
/// the current position of the exchange animation.
/// ||交换动画的当前位置。
/// </summary>
public Vector3 exchangePosition;
private float exchangeStartTime;
private Vector3 exchangeStartPosition;
private Vector3 exchangeEndPosition;
public List<Vector3> dataPoints = new List<Vector3>();
public List<ChartLabel> dataLabels = new List<ChartLabel>();
public List<SerieData> children = new List<SerieData>();
@@ -77,9 +90,61 @@ namespace XCharts.Runtime
symbol = null;
rect = Rect.zero;
subRect = Rect.zero;
exchangeEnd = true;
exchangeStartPosition = Vector3.zero;
exchangePosition = Vector3.zero;
exchangeEndPosition = Vector3.zero;
children.Clear();
dataPoints.Clear();
dataLabels.Clear();
}
public void UpdateExchangePosition(ref float x, ref float y, float totalTime)
{
if (exchangeEndPosition.x != x || exchangeEndPosition.y != y)
{
if (exchangeStartPosition == Vector3.zero || Time.time - exchangeStartTime < 0.1f)
{
exchangeEnd = true;
exchangeStartTime = Time.time;
exchangeEndPosition.x = x;
exchangeEndPosition.y = y;
exchangeStartPosition = exchangeEndPosition;
exchangePosition = exchangeEndPosition;
return;
}
else
{
exchangeEnd = false;
exchangeStartTime = Time.time;
exchangeStartPosition = exchangePosition;
exchangeEndPosition.x = x;
exchangeEndPosition.y = y;
}
}
if (exchangeStartPosition == exchangeEndPosition)
{
exchangeEnd = true;
exchangePosition = exchangeEndPosition;
x = exchangePosition.x;
y = exchangePosition.y;
return;
}
var spendTime = Time.time - exchangeStartTime;
totalTime /= 1000;
if (spendTime >= totalTime)
{
exchangeEnd = true;
exchangeStartPosition = exchangeEndPosition;
exchangePosition = exchangeEndPosition;
x = exchangePosition.x;
y = exchangePosition.y;
return;
}
exchangePosition = Vector3.Lerp(exchangeStartPosition, exchangeEndPosition, spendTime / totalTime);
x = exchangePosition.x;
y = exchangePosition.y;
return;
}
}
}

View File

@@ -1,3 +1,4 @@
using System;
using System.Collections.Generic;
using System.Text;
using UnityEngine;
@@ -59,6 +60,7 @@ namespace XCharts.Runtime
protected GameObject m_SerieRoot;
protected GameObject m_SerieLabelRoot;
protected bool m_InitedLabel;
protected bool m_InitTitleLabel;
protected bool m_NeedInitComponent;
protected bool m_RefreshLabel;
protected bool m_LastCheckContextFlag = false;
@@ -67,6 +69,7 @@ namespace XCharts.Runtime
protected bool m_ForceUpdateSerieContext = false;
protected int m_LegendEnterIndex;
protected ChartLabel m_EndLabel;
private HashSet<int> m_DataIndexsSet = new HashSet<int>();
private float[] m_LastRadius = new float[2] { 0, 0 };
private float[] m_LastCenter = new float[2] { 0, 0 };
@@ -107,6 +110,7 @@ namespace XCharts.Runtime
m_RefreshLabel = false;
RefreshLabelInternal();
RefreshEndLabelInternal();
RefreshTitleLabelInternal();
}
if (serie.dataDirty)
{
@@ -241,6 +245,8 @@ namespace XCharts.Runtime
public override void InitComponent()
{
m_InitedLabel = false;
m_InitTitleLabel = false;
serie.context.totalDataIndex = serie.dataCount - 1;
InitRoot();
InitSerieLabel();
@@ -428,23 +434,15 @@ namespace XCharts.Runtime
if (titleStyle != null)
{
var color = chart.GetItemColor(serie, null);
var content = string.Empty;
if (string.IsNullOrEmpty(titleStyle.formatter))
{
content = serie.serieName;
}
else
{
content = titleStyle.formatter;
FormatterHelper.ReplaceContent(ref content, -1, titleStyle.numericFormatter, serie, chart);
}
var label = ChartHelper.AddChartLabel("title_" + 0, serieTitleRoot.transform, titleStyle, chart.theme.common,
var content = SerieLabelHelper.GetTitleFormatterContent(serie, null, -1, titleStyle, chart);
var label = ChartHelper.AddChartLabel("title_0", serieTitleRoot.transform, titleStyle, chart.theme.common,
content, color, TextAnchor.MiddleCenter);
serie.context.titleObject = label;
label.SetActive(titleStyle.show, true);
var labelPosition = GetSerieDataTitlePosition(null, titleStyle);
var offset = titleStyle.GetOffset(serie.context.insideRadius);
label.SetPosition(labelPosition + offset);
m_InitTitleLabel = true;
}
}
else
@@ -454,17 +452,9 @@ namespace XCharts.Runtime
var serieData = serie.data[i];
var titleStyle = SerieHelper.GetTitleStyle(serie, serieData);
if (titleStyle == null) continue;
m_InitTitleLabel = true;
var color = chart.GetItemColor(serie, serieData);
var content = string.Empty;
if (string.IsNullOrEmpty(titleStyle.formatter))
{
content = serieData.name;
}
else
{
content = titleStyle.formatter;
FormatterHelper.ReplaceContent(ref content, i, titleStyle.numericFormatter, serie, chart);
}
var content = SerieLabelHelper.GetTitleFormatterContent(serie, serieData, i, titleStyle, chart);
var label = ChartHelper.AddChartLabel("title_" + i, serieTitleRoot.transform, titleStyle, chart.theme.common,
content, color, TextAnchor.MiddleCenter);
serieData.titleObject = label;
@@ -476,6 +466,38 @@ namespace XCharts.Runtime
}
}
public void RefreshTitleLabelInternal()
{
if (!m_InitTitleLabel) return;
if (serie.titleJustForSerie)
{
if (serie.context.titleObject != null)
{
var titleStyle = SerieHelper.GetTitleStyle(serie, null);
var labelPosition = GetSerieDataTitlePosition(null, titleStyle);
var offset = titleStyle.GetOffset(serie.context.insideRadius);
serie.context.titleObject.SetPosition(labelPosition + offset);
var content = SerieLabelHelper.GetTitleFormatterContent(serie, null, -1, titleStyle, chart);
serie.context.titleObject.SetText(content);
}
}
else
{
for (int i = 0; i < serie.dataCount; i++)
{
var serieData = serie.data[i];
if (serieData.titleObject == null) continue;
var titleStyle = SerieHelper.GetTitleStyle(serie, serieData);
if (titleStyle == null) continue;
var labelPosition = GetSerieDataTitlePosition(serieData, titleStyle);
var offset = titleStyle.GetOffset(serie.context.insideRadius);
serieData.titleObject.SetPosition(labelPosition + offset);
var content = SerieLabelHelper.GetTitleFormatterContent(serie, serieData, i, titleStyle, chart);
serieData.titleObject.SetText(content);
}
}
}
public override void RefreshLabelInternal()
{
if (!m_InitedLabel)
@@ -485,15 +507,24 @@ namespace XCharts.Runtime
var dataAddDuration = serie.animation.GetAdditionDuration();
var unscaledTime = serie.animation.unscaledTime;
var needCheck = serie.context.dataIndexs.Count > 0;
if (needCheck)
{
m_DataIndexsSet.Clear();
foreach (var idx in serie.context.dataIndexs)
m_DataIndexsSet.Add(idx);
}
var allLabelZeroPosition = true;
var anyLabelActive = false;
SerieData lastActiveLabelSerieData = null;
var lastActiveLabelPos = Vector3.zero;
double lastActiveLabelValue = 0;
foreach (var serieData in serie.data)
{
if (serieData.labelObject == null && serieData.context.dataLabels.Count <= 0)
{
continue;
}
if (needCheck && !serie.context.dataIndexs.Contains(serieData.index))
if (needCheck && !m_DataIndexsSet.Contains(serieData.index))
{
serieData.SetLabelActive(false);
continue;
@@ -509,7 +540,7 @@ namespace XCharts.Runtime
{
if (serie.multiDimensionLabel)
{
var total = serieData.GetTotalData();
var total = FormatterHelper.NeedTotalContent(currLabel.formatter) ? serieData.GetTotalData() : 0;
var color = chart.GetItemColor(serie, serieData);
for (int i = 0; i < serieData.context.dataLabels.Count; i++)
{
@@ -522,6 +553,7 @@ namespace XCharts.Runtime
currLabel, color, chart);
var offset = GetSerieDataLabelOffset(serieData, currLabel);
var active = currLabel.show && !isIgnore && !serie.IsMinShowLabelValue(value);
if (active) active = CheckLabelVisible(currLabel, serieData.index, value, i);
if (active)
{
anyLabelActive = true;
@@ -545,7 +577,7 @@ namespace XCharts.Runtime
else
{
var value = serieData.GetCurrData(defaultDimension, dataAddDuration, dataChangeDuration, unscaledTime);
var total = serie.GetDataTotal(defaultDimension, serieData);
var total = FormatterHelper.NeedTotalContent(currLabel.formatter) ? serie.GetDataTotal(defaultDimension, serieData) : 0;
var color = chart.GetItemColor(serie, serieData);
var content = string.IsNullOrEmpty(currLabel.formatter) ?
ChartCached.NumberToStr(value, currLabel.numericFormatter) :
@@ -553,6 +585,38 @@ namespace XCharts.Runtime
currLabel, color, chart);
var labelPos = UpdateLabelPosition(serieData, currLabel);
var active = currLabel.show && !isIgnore && !serie.IsMinShowLabelValue(value);
if (active) active = CheckLabelVisible(currLabel, serieData.index, value, defaultDimension);
if (active && currLabel.showMinGap > 0 && lastActiveLabelSerieData != null)
{
var dist = Mathf.Abs(labelPos.x - lastActiveLabelPos.x);
if (dist < currLabel.showMinGap)
{
var currValue = serieData.GetData(1);
if (Math.Abs(currValue) >= Math.Abs(lastActiveLabelValue))
{
lastActiveLabelSerieData.SetLabelActive(false);
lastActiveLabelSerieData = serieData;
lastActiveLabelPos = labelPos;
lastActiveLabelValue = currValue;
}
else
{
active = false;
}
}
else
{
lastActiveLabelSerieData = serieData;
lastActiveLabelPos = labelPos;
lastActiveLabelValue = serieData.GetData(1);
}
}
else if (active)
{
lastActiveLabelSerieData = serieData;
lastActiveLabelPos = labelPos;
lastActiveLabelValue = serieData.GetData(1);
}
if (active)
{
anyLabelActive = true;
@@ -586,6 +650,66 @@ namespace XCharts.Runtime
}
}
private bool CheckLabelVisible(LabelStyle label, int dataIndex, double value, int dimension)
{
// showCondition: 基于阈值的条件检查AND showFilter
bool conditionResult;
switch (label.showCondition)
{
case LabelStyle.ShowCondition.GreaterThan:
conditionResult = value > label.showThreshold;
break;
case LabelStyle.ShowCondition.LessThan:
conditionResult = value < label.showThreshold;
break;
default: // Always
conditionResult = true;
break;
}
if (!conditionResult)
return false;
// showFilter: 基于数据形态的过滤检查
switch (label.showFilter)
{
case LabelStyle.ShowFilter.Peak:
{
bool isPeak = true;
bool hasNeighbor = false;
if (dataIndex > 0)
{
hasNeighbor = true;
isPeak &= value > serie.data[dataIndex - 1].GetData(dimension);
}
if (dataIndex < serie.dataCount - 1)
{
hasNeighbor = true;
isPeak &= value > serie.data[dataIndex + 1].GetData(dimension);
}
return isPeak && hasNeighbor;
}
case LabelStyle.ShowFilter.Valley:
{
bool isValley = true;
bool hasNeighbor = false;
if (dataIndex > 0)
{
hasNeighbor = true;
isValley &= value < serie.data[dataIndex - 1].GetData(dimension);
}
if (dataIndex < serie.dataCount - 1)
{
hasNeighbor = true;
isValley &= value < serie.data[dataIndex + 1].GetData(dimension);
}
return isValley && hasNeighbor;
}
default: // All
return true;
}
}
public virtual void RefreshEndLabelInternal()
{
if (m_EndLabel == null)
@@ -594,7 +718,7 @@ namespace XCharts.Runtime
if (endLabelStyle == null)
return;
var dataCount = serie.context.dataPoints.Count;
var active = endLabelStyle.show && dataCount > 0;
var active = endLabelStyle.show && dataCount > 0 && !ChartHelper.IsZeroVector(serie.context.lineEndPostion);
m_EndLabel.SetActive(active);
if (active)
{
@@ -610,6 +734,8 @@ namespace XCharts.Runtime
protected Vector3 UpdateLabelPosition(SerieData serieData, LabelStyle currLabel)
{
var labelPosition = GetSerieDataLabelPosition(serieData, currLabel);
if (currLabel.fixedX != 0) labelPosition.x = currLabel.fixedX;
if (currLabel.fixedY != 0) labelPosition.y = currLabel.fixedY;
var offset = GetSerieDataLabelOffset(serieData, currLabel);
serieData.labelObject.SetPosition(labelPosition + offset);
if (currLabel.autoRotate && serieData.context.angle != 0)
@@ -672,11 +798,14 @@ namespace XCharts.Runtime
if (itemFormatter == null) itemFormatter = "";
var newItemFormatter = itemFormatter.Replace("\\n", "\n");
var newNumericFormatter = SerieHelper.GetNumericFormatter(serie, serieData, numericFormatter);
var temp = newItemFormatter.Split('\n');
for (int i = 0; i < temp.Length; i++)
var needTotal = newItemFormatter.IndexOf("{d", System.StringComparison.OrdinalIgnoreCase) >= 0 ||
newItemFormatter.IndexOf("{f", System.StringComparison.OrdinalIgnoreCase) >= 0;
var total = needTotal ? serie.yTotal : 0;
int newLinePos = newItemFormatter.IndexOf('\n');
if (newLinePos < 0)
{
var formatter = temp[i];
var param = i == 0 ? serie.context.param : new SerieParams();
var formatter = newItemFormatter;
var param = serie.context.param;
param.serieName = serie.serieName;
param.serieIndex = serie.index;
param.category = category;
@@ -685,7 +814,7 @@ namespace XCharts.Runtime
param.dataCount = serie.dataCount;
param.value = serieData.GetData(dimension);
param.ignore = ignore;
param.total = serie.yTotal;
param.total = total;
param.color = chart.GetMarkColor(serie, serieData);
param.marker = SerieHelper.GetItemMarker(serie, serieData, marker);
param.itemFormatter = formatter;
@@ -698,6 +827,35 @@ namespace XCharts.Runtime
paramList.Add(param);
}
else
{
var temp = newItemFormatter.Split('\n');
for (int i = 0; i < temp.Length; i++)
{
var formatter = temp[i];
var param = i == 0 ? serie.context.param : new SerieParams();
param.serieName = serie.serieName;
param.serieIndex = serie.index;
param.category = category;
param.dimension = dimension;
param.serieData = serieData;
param.dataCount = serie.dataCount;
param.value = serieData.GetData(dimension);
param.ignore = ignore;
param.total = total;
param.color = chart.GetMarkColor(serie, serieData);
param.marker = SerieHelper.GetItemMarker(serie, serieData, marker);
param.itemFormatter = formatter;
param.numericFormatter = newNumericFormatter;
param.columns.Clear();
param.columns.Add(param.marker);
param.columns.Add(showCategory ? category : serie.serieName);
param.columns.Add(ignore ? ignoreDataDefaultContent : ChartCached.NumberToStr(param.value, param.numericFormatter));
paramList.Add(param);
}
}
}
protected void UpdateItemSerieParams(ref List<SerieParams> paramList, ref string title,

View File

@@ -7,7 +7,7 @@ namespace XCharts.Runtime
{
public static partial class SerieHelper
{
public static double GetMinData(Serie serie, int dimension = 1, DataZoom dataZoom = null)
public static double GetMinData(Serie serie, int dimension = 1, DataZoom dataZoom = null, bool inverse = false)
{
double min = double.MaxValue;
var dataList = serie.GetDataList(dataZoom);
@@ -16,7 +16,7 @@ namespace XCharts.Runtime
var serieData = dataList[i];
if (serieData.show && serieData.data.Count > dimension)
{
var value = serieData.data[dimension];
var value = serieData.GetData(dimension, inverse);
if (value < min && !serie.IsIgnoreValue(serieData, value)) min = value;
}
}
@@ -42,7 +42,7 @@ namespace XCharts.Runtime
}
return minData;
}
public static double GetMaxData(Serie serie, int dimension = 1, DataZoom dataZoom = null)
public static double GetMaxData(Serie serie, int dimension = 1, DataZoom dataZoom = null, bool inverse = false)
{
double max = double.MinValue;
var dataList = serie.GetDataList(dataZoom);
@@ -51,7 +51,7 @@ namespace XCharts.Runtime
var serieData = dataList[i];
if (serieData.show && serieData.data.Count > dimension)
{
var value = serieData.data[dimension];
var value = serieData.GetData(dimension, inverse);
if (value > max && !serie.IsIgnoreValue(serieData, value)) max = value;
}
}
@@ -833,13 +833,14 @@ namespace XCharts.Runtime
var data = serie.data;
var startValue = min;
var endValue = max;
var minZoomRatio = (int)((max-min) * dataZoom.minZoomRatio);
if (endValue < startValue) endValue = startValue;
if (startValue != serie.m_FilterStartValue || endValue != serie.m_FilterEndValue ||
dataZoom.minShowNum != serie.m_FilterMinShow || serie.m_NeedUpdateFilterData)
dataZoom.minZoomRatio != serie.m_FilterMinShow || serie.m_NeedUpdateFilterData)
{
serie.m_FilterStartValue = startValue;
serie.m_FilterEndValue = endValue;
serie.m_FilterMinShow = dataZoom.minShowNum;
serie.m_FilterMinShow = minZoomRatio;
serie.m_NeedUpdateFilterData = false;
if (ReferenceEquals(serie.m_FilterData, data))
@@ -868,34 +869,50 @@ namespace XCharts.Runtime
private static void UpdateFilterData_Category(Serie serie, DataZoom dataZoom)
{
var data = serie.data;
var range = Mathf.RoundToInt(data.Count * (dataZoom.end - dataZoom.start) / 100);
if (range <= 0) range = 1;
int start = 0, end = 0;
if (dataZoom.context.invert)
// Use (N-1) intervals so that data point i maps to exactly i/(N-1)*100% of the
// DataZoom width — matching how the shadow draws data via scaleWid = width/(N-1).
// CeilToInt for start ensures we never include a point that lies before the filler.
// FloorToInt for end ensures we never include a point that lies after the filler.
int n = data.Count - 1;
int startIndex, endIndex;
if (n > 0)
{
end = Mathf.RoundToInt(data.Count * dataZoom.end / 100);
start = end - range;
if (start < 0) start = 0;
if (dataZoom.context.invert)
{
startIndex = Mathf.CeilToInt((float)n * (100 - dataZoom.end) / 100);
endIndex = Mathf.FloorToInt((float)n * (100 - dataZoom.start) / 100);
}
else
{
startIndex = Mathf.CeilToInt((float)n * dataZoom.start / 100);
endIndex = Mathf.FloorToInt((float)n * dataZoom.end / 100);
}
}
else
{
start = Mathf.RoundToInt(data.Count * dataZoom.start / 100);
end = start + range;
if (end > data.Count) end = data.Count;
startIndex = 0;
endIndex = 0;
}
var range = endIndex - startIndex + 1;
if (range <= 0) range = 1;
int start = startIndex;
if (start < 0) start = 0;
int end = start + range;
if (end > data.Count) end = data.Count;
var minZoomRatio = (int)(data.Count * dataZoom.minZoomRatio);
if (start != serie.m_FilterStart || end != serie.m_FilterEnd ||
dataZoom.minShowNum != serie.m_FilterMinShow || serie.m_NeedUpdateFilterData)
minZoomRatio != serie.m_FilterMinShow || serie.m_NeedUpdateFilterData)
{
serie.m_FilterStart = start;
serie.m_FilterEnd = end;
serie.m_FilterMinShow = dataZoom.minShowNum;
serie.m_FilterMinShow = minZoomRatio;
serie.m_NeedUpdateFilterData = false;
if (data.Count > 0)
{
if (range < dataZoom.minShowNum)
if (range < minZoomRatio)
{
if (dataZoom.minShowNum > data.Count) range = data.Count;
else range = dataZoom.minShowNum;
if (minZoomRatio > data.Count) range = data.Count;
else range = minZoomRatio;
}
if (range > data.Count - start)
start = data.Count - range;

View File

@@ -324,9 +324,9 @@ namespace XCharts.Runtime
/// <param name="minValue"></param>
/// <param name="maxValue"></param>
public static void GetXMinMaxValue(BaseChart chart, int axisIndex, bool inverse, out double minValue,
out double maxValue, bool isPolar = false, bool filterByDataZoom = true, bool needAnimation = false)
out double maxValue, bool isPolar = false, bool needAnimation = false)
{
GetMinMaxValue(chart, axisIndex, inverse, 0, out minValue, out maxValue, isPolar, filterByDataZoom, needAnimation);
GetMinMaxValue(chart, axisIndex, inverse, 0, out minValue, out maxValue, isPolar, needAnimation);
}
/// <summary>
@@ -337,9 +337,9 @@ namespace XCharts.Runtime
/// <param name="minValue"></param>
/// <param name="maxValue"></param>
public static void GetYMinMaxValue(BaseChart chart, int axisIndex, bool inverse, out double minValue,
out double maxValue, bool isPolar = false, bool filterByDataZoom = true, bool needAnimation = false)
out double maxValue, bool isPolar = false, bool needAnimation = false)
{
GetMinMaxValue(chart, axisIndex, inverse, 1, out minValue, out maxValue, isPolar, filterByDataZoom, needAnimation);
GetMinMaxValue(chart, axisIndex, inverse, 1, out minValue, out maxValue, isPolar, needAnimation);
}
/// <summary>
@@ -350,16 +350,16 @@ namespace XCharts.Runtime
/// <param name="minValue"></param>
/// <param name="maxValue"></param>
public static void GetZMinMaxValue(BaseChart chart, int axisIndex, bool inverse, out double minValue,
out double maxValue, bool isPolar = false, bool filterByDataZoom = true, bool needAnimation = false)
out double maxValue, bool isPolar = false, bool needAnimation = false)
{
GetMinMaxValue(chart, axisIndex, inverse, 2, out minValue, out maxValue, isPolar, filterByDataZoom, needAnimation);
GetMinMaxValue(chart, axisIndex, inverse, 2, out minValue, out maxValue, isPolar, needAnimation);
}
private static Dictionary<int, List<Serie>> _stackSeriesForMinMax = new Dictionary<int, List<Serie>>();
private static Dictionary<int, double> _serieTotalValueForMinMax = new Dictionary<int, double>();
public static void GetMinMaxValue(BaseChart chart, int axisIndex,
bool inverse, int dimension, out double minValue, out double maxValue, bool isPolar = false,
bool filterByDataZoom = true, bool needAnimation = false)
bool needAnimation = false)
{
double min = double.MaxValue;
double max = double.MinValue;
@@ -376,22 +376,48 @@ namespace XCharts.Runtime
var updateDuration = needAnimation ? serie.animation.GetChangeDuration() : 0;
var dataAddDuration = needAnimation ? serie.animation.GetAdditionDuration() : 0;
var unscaledTime = serie.animation.unscaledTime;
// determine whether DataZoom filtering applies for this serie
var dz = chart.GetXDataZoomOfSerie(serie);
// Only apply DataZoom filter for non-X dimensions (dimension > 0, e.g. Y axis
// scaling to visible data). For dimension=0 (X axis whose range is controlled
// by DataZoom), using filtered X data would create a circular dependency:
// rawMin/rawMax would be set from filtered data, making the filter boundary
// relative to an already-filtered range instead of the full data range.
bool useDataZoomFilter = dimension > 0 && dz != null && dz.enable && dz.filterAxisRange;
// try per-serie cache when not filtering by dataZoom and not in animation mode
if (!useDataZoomFilter && !needAnimation)
{
double cmin, cmax;
if (serie.context.TryGetCachedMinMax(dimension, out cmin, out cmax))
{
if (cmax > max) max = cmax;
if (cmin < min) min = cmin;
continue;
}
}
double smin = double.MaxValue;
double smax = double.MinValue;
if (isPercentStack && SeriesHelper.IsPercentStack<Bar>(series, serie.serieName))
{
if (100 > max) max = 100;
if (0 < min) min = 0;
// percent stack per-serie considered as full range
smin = 0;
smax = 100;
}
else
{
var showData = serie.GetDataList(filterByDataZoom ? chart.GetXDataZoomOfSerie(serie) : null);
if (serie is Candlestick || serie is SimplifiedCandlestick)
var showData = serie.GetDataList(useDataZoomFilter ? dz : null);
if (dimension > 0 && (serie is Candlestick || serie is SimplifiedCandlestick))
{
foreach (var data in showData)
{
double dataMin, dataMax;
data.GetMinMaxData(1, inverse, out dataMin, out dataMax);
if (dataMax > max) max = dataMax;
if (dataMin < min) min = dataMin;
if (dataMax > smax) smax = dataMax;
if (dataMin < smin) smin = dataMin;
}
}
else
@@ -403,12 +429,25 @@ namespace XCharts.Runtime
data.GetCurrData(dimension, dataAddDuration, updateDuration, unscaledTime, inverse);
if (!serie.IsIgnoreValue(data, currData))
{
if (currData > max) max = currData;
if (currData < min) min = currData;
if (currData > smax) smax = currData;
if (currData < smin) smin = currData;
}
}
}
}
// if no data found for this serie, skip
if (smax == double.MinValue && smin == double.MaxValue)
continue;
// cache per-serie result for future calls
if (!needAnimation && !useDataZoomFilter)
{
serie.context.SetCachedMinMax(dimension, smin == double.MaxValue ? 0 : smin, smax == double.MinValue ? 0 : smax);
}
if (smax > max) max = smax;
if (smin < min) min = smin;
}
}
else
@@ -423,7 +462,10 @@ namespace XCharts.Runtime
if ((isPolar && serie.polarIndex != axisIndex) ||
(!isPolar && serie.yAxisIndex != axisIndex) ||
!serie.show) continue;
var showData = serie.GetDataList(filterByDataZoom ? chart.GetXDataZoomOfSerie(serie) : null);
var stackDz = chart.GetXDataZoomOfSerie(serie);
// Same rule as non-stack: don't use filtered data for dimension=0 (X axis).
if (stackDz != null && (dimension == 0 || !stackDz.filterAxisRange || !stackDz.enable)) stackDz = null;
var showData = serie.GetDataList(stackDz);
if (SeriesHelper.IsPercentStack<Bar>(series, serie.stack))
{
for (int j = 0; j < showData.Count; j++)
@@ -441,9 +483,9 @@ namespace XCharts.Runtime
if (!_serieTotalValueForMinMax.ContainsKey(j))
_serieTotalValueForMinMax[j] = 0;
double currData = 0;
if (serie is Candlestick)
if (serie is Candlestick || serie is SimplifiedCandlestick)
{
currData = showData[j].GetMaxData(false);
currData = showData[j].GetMaxData(false, dimension);
}
else
{

View File

@@ -1,5 +1,6 @@
using System;
using UnityEngine;
using UnityEngine.Serialization;
#if dUI_TextMeshPro
using TMPro;
#endif
@@ -9,27 +10,37 @@ namespace XCharts.Runtime
[Serializable]
public class LegendTheme : ComponentTheme
{
[SerializeField] protected Color m_UnableColor;
[SerializeField][FormerlySerializedAs("m_UnableColor")] protected Color m_InactiveColor;
/// <summary>
/// the color of text.
/// ||文本颜色。
/// </summary>
[Obsolete("Use inactiveColor instead.", true)]
public Color unableColor
{
get { return m_UnableColor; }
set { if (PropertyUtil.SetColor(ref m_UnableColor, value)) SetComponentDirty(); }
get { return m_InactiveColor; }
set { if (PropertyUtil.SetColor(ref m_InactiveColor, value)) SetComponentDirty(); }
}
/// <summary>
/// the color when the component is inactive.
/// ||非激活状态时的颜色。
/// </summary>
public Color inactiveColor
{
get { return m_InactiveColor; }
set { if (PropertyUtil.SetColor(ref m_InactiveColor, value)) SetComponentDirty(); }
}
public void Copy(LegendTheme theme)
{
base.Copy(theme);
m_UnableColor = theme.unableColor;
m_InactiveColor = theme.inactiveColor;
}
public LegendTheme(ThemeType theme) : base(theme)
{
m_UnableColor = ColorUtil.GetColor("#cccccc");
m_InactiveColor = ColorUtil.GetColor("#cccccc");
}
}

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 529ec33cd4fb6466784b3a682204428c
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using System.Text.RegularExpressions;
using UnityEngine;
namespace XCharts.Runtime
{
@@ -37,9 +36,9 @@ namespace XCharts.Runtime
public static bool IsDateOrTimeRegex(string regex, ref bool date, ref string formatter)
{
if(IsDateOrTimeRegex(regex))
if (IsDateOrTimeRegex(regex))
{
if(regex == "date" || regex == "time")
if (regex == "date" || regex == "time")
{
date = regex == "date";
formatter = "";
@@ -53,24 +52,24 @@ namespace XCharts.Runtime
return false;
}
public static int GetTimestamp()
public static double GetTimestamp()
{
return (int)(DateTime.Now - k_LocalDateTime1970).TotalSeconds;
return (DateTime.Now - k_LocalDateTime1970).TotalSeconds;
}
public static int GetTimestamp(DateTime time, bool local = false)
public static double GetTimestamp(DateTime time, bool local = false)
{
if (local)
{
return (int)(time - k_LocalDateTime1970).TotalSeconds;
return (time - k_LocalDateTime1970).TotalSeconds;
}
else
{
return (int)(time - k_DateTime1970).TotalSeconds;
return (time - k_DateTime1970).TotalSeconds;
}
}
public static int GetTimestamp(string dateTime, bool local = false)
public static double GetTimestamp(string dateTime, bool local = false)
{
try
{
@@ -83,15 +82,16 @@ namespace XCharts.Runtime
}
}
public static DateTime GetDateTime(double timestamp, bool local = true)
public static DateTime GetDateTime(double timestamp, bool local = false)
{
return local ? k_LocalDateTime1970.AddSeconds(timestamp) : k_DateTime1970.AddSeconds(timestamp);
var dateTime = local ? k_LocalDateTime1970.AddSeconds(timestamp) : k_DateTime1970.AddSeconds(timestamp);
return dateTime;
}
public static string GetDefaultDateTimeString(int timestamp, double range = 0)
public static string GetDefaultDateTimeString(double timestamp, double range = 0, bool local = false)
{
var dateString = String.Empty;
var dateTime = GetDateTime(timestamp);
var dateTime = GetDateTime(timestamp, local);
if (range <= 0 || range >= DateTimeUtil.ONE_DAY)
{
dateString = dateTime.ToString("yyyy-MM-dd");
@@ -144,76 +144,130 @@ namespace XCharts.Runtime
/// <param name="minTimestamp"></param>
/// <param name="maxTimestamp"></param>
/// <param name="splitNumber"></param>
internal static float UpdateTimeAxisDateTimeList(List<double> list, int minTimestamp, int maxTimestamp, int splitNumber)
internal static float UpdateTimeAxisDateTimeList(List<double> list, double minTimestamp, double maxTimestamp, int splitNumber, double ceilRate, bool local)
{
var firstValue = list.Count > 0 ? list[0] : 0;
var secondValue = list.Count > 1 ? list[1] : 0;
list.Clear();
var range = maxTimestamp - minTimestamp;
if (range <= 0) return 0;
var dtMin = DateTimeUtil.GetDateTime(minTimestamp);
var dtMax = DateTimeUtil.GetDateTime(maxTimestamp);
int tick = 0;
if (range >= ONE_YEAR * MIN_TIME_SPLIT_NUMBER)
if (range <= 0)
{
var num = splitNumber <= 0 ? GetSplitNumber(range, ONE_YEAR) : Math.Max(range / (splitNumber * ONE_YEAR), 1);
var dtStart = (firstValue == 0 || secondValue == 0 || (minTimestamp > firstValue && minTimestamp > secondValue))
? (new DateTime(dtMin.Year, dtMin.Month, 1).AddMonths(1))
: (minTimestamp > firstValue ? DateTimeUtil.GetDateTime(secondValue) : DateTimeUtil.GetDateTime(firstValue));
tick = num * 365 * 24 * 3600;
dtStart = new DateTime(dtStart.Year, dtStart.Month, 1);
while (dtStart.Ticks < dtMax.Ticks)
list.Clear();
return 0;
}
var dtMin = GetDateTime(minTimestamp, local);
var dtMax = GetDateTime(maxTimestamp, local);
int tick;
if (ceilRate != 0)
{
var tickSecond = (int)ceilRate;
tick = GetTickSecond(range, 0, tickSecond);
var let = minTimestamp % tickSecond;
var defaultTimestamp = let == 0 ? minTimestamp : minTimestamp - let + tickSecond;
var startTimestamp = (int)GetFirstMaxValue(list, minTimestamp, defaultTimestamp);
while (startTimestamp > minTimestamp)
{
list.Add(DateTimeUtil.GetTimestamp(dtStart));
dtStart = dtStart.AddYears(num);
startTimestamp -= tick;
}
}
else if (range >= ONE_MONTH * MIN_TIME_SPLIT_NUMBER)
{
var num = splitNumber <= 0 ? GetSplitNumber(range, ONE_MONTH) : Math.Max(range / (splitNumber * ONE_MONTH), 1);
var dtStart = (firstValue == 0 || secondValue == 0 || (minTimestamp > firstValue && minTimestamp > secondValue))
? (new DateTime(dtMin.Year, dtMin.Month, 1).AddMonths(1))
: (minTimestamp > firstValue ? DateTimeUtil.GetDateTime(secondValue) : DateTimeUtil.GetDateTime(firstValue));
dtStart = new DateTime(dtStart.Year, dtStart.Month, 1);
tick = num * 30 * 24 * 3600;
while (dtStart.Ticks < dtMax.Ticks)
if (startTimestamp < minTimestamp)
{
list.Add(DateTimeUtil.GetTimestamp(dtStart));
dtStart = dtStart.AddMonths(num);
startTimestamp += tick;
}
}
else if (range >= ONE_DAY * MIN_TIME_SPLIT_NUMBER)
{
tick = GetTickSecond(range, splitNumber, ONE_DAY);
var let = minTimestamp % tick;
var startTimestamp = let == 0 ? minTimestamp : (minTimestamp - let) + tick;
AddTickTimestamp(list, startTimestamp, maxTimestamp, tick);
}
else if (range >= ONE_HOUR * MIN_TIME_SPLIT_NUMBER)
{
tick = GetTickSecond(range, splitNumber, ONE_HOUR);
var let = minTimestamp % tick;
var startTimestamp = let == 0 ? minTimestamp : (minTimestamp - let) + tick;
AddTickTimestamp(list, startTimestamp, maxTimestamp, tick);
}
else if (range >= ONE_MINUTE * MIN_TIME_SPLIT_NUMBER)
{
tick = GetTickSecond(range, splitNumber, ONE_MINUTE);
var let = minTimestamp % tick;
var startTimestamp = let == 0 ? minTimestamp : (minTimestamp - let) + tick;
list.Clear();
AddTickTimestamp(list, startTimestamp, maxTimestamp, tick);
}
else
{
tick = GetTickSecond(range, splitNumber, ONE_SECOND);
var let = minTimestamp % tick;
var startTimestamp = let == 0 ? minTimestamp : (minTimestamp - let) + tick;
AddTickTimestamp(list, startTimestamp, maxTimestamp, tick);
if (range >= ONE_YEAR * MIN_TIME_SPLIT_NUMBER)
{
var num = splitNumber <= 0 ? GetSplitNumber(range, ONE_YEAR) : (int)Math.Max(range / (splitNumber * ONE_YEAR), 1);
var dtStart = GetDateTime(GetFirstMaxValue(list, minTimestamp), local);
dtStart = new DateTime(dtStart.Year, dtStart.Month, 1);
while (dtStart > dtMin)
{
dtStart = dtStart.AddYears(-num);
}
if (dtStart < dtMin)
{
dtStart = dtStart.AddYears(num);
}
tick = num * 365 * 24 * 3600;
list.Clear();
while (dtStart.Ticks < dtMax.Ticks)
{
list.Add(DateTimeUtil.GetTimestamp(dtStart, local));
dtStart = dtStart.AddYears(num);
}
}
else if (range >= ONE_MONTH * MIN_TIME_SPLIT_NUMBER)
{
var num = splitNumber <= 0 ? GetSplitNumber(range, ONE_MONTH) : (int)Math.Max(range / (splitNumber * ONE_MONTH), 1);
var dtStart = GetDateTime(GetFirstMaxValue(list, minTimestamp), local);
dtStart = new DateTime(dtStart.Year, dtStart.Month, 1);
while (dtStart > dtMin)
{
dtStart = dtStart.AddMonths(-num);
}
if (dtStart < dtMin)
{
dtStart = dtStart.AddMonths(num);
}
tick = num * 30 * 24 * 3600;
list.Clear();
while (dtStart.Ticks < dtMax.Ticks)
{
list.Add(DateTimeUtil.GetTimestamp(dtStart, local));
dtStart = dtStart.AddMonths(num);
}
}
else
{
int tickSecond;
if (range >= ONE_DAY * MIN_TIME_SPLIT_NUMBER)
{
tickSecond = ONE_DAY;
}
else if (range >= ONE_HOUR * MIN_TIME_SPLIT_NUMBER)
{
tickSecond = ONE_HOUR;
}
else if (range >= ONE_MINUTE * MIN_TIME_SPLIT_NUMBER)
{
tickSecond = ONE_MINUTE;
}
else
{
tickSecond = ONE_SECOND;
}
tick = GetTickSecond(range, splitNumber, tickSecond);
var let = minTimestamp % tickSecond;
var defaultTimestamp = let == 0 ? minTimestamp : minTimestamp - let + tickSecond;
var startTimestamp = (int)GetFirstMaxValue(list, minTimestamp, defaultTimestamp);
while (startTimestamp > minTimestamp)
{
startTimestamp -= tick;
}
if (startTimestamp < minTimestamp)
{
startTimestamp += tick;
}
list.Clear();
AddTickTimestamp(list, startTimestamp, maxTimestamp, tick);
}
}
return tick;
}
private static int GetSplitNumber(int range, int tickSecond)
private static double GetFirstMaxValue(List<double> list, double minTimestamp, double defaultTimestamp = 0)
{
for (int i = 0; i < list.Count; i++)
{
if (list[i] >= minTimestamp)
{
return list[i];
}
}
return defaultTimestamp == 0 ? minTimestamp : defaultTimestamp;
}
private static int GetSplitNumber(double range, int tickSecond)
{
var num = 1;
while (range / (num * tickSecond) > 8)
@@ -223,12 +277,12 @@ namespace XCharts.Runtime
return num;
}
private static int GetTickSecond(int range, int splitNumber, int tickSecond)
private static int GetTickSecond(double range, int splitNumber, int tickSecond)
{
var num = 0;
if (splitNumber > 0)
{
num = Math.Max(range / (splitNumber * tickSecond), 1);
num = (int)Math.Max(range / (splitNumber * tickSecond), 1);
}
else
{
@@ -243,7 +297,7 @@ namespace XCharts.Runtime
return num * tickSecond;
}
private static void AddTickTimestamp(List<double> list, int startTimestamp, int maxTimestamp, int tickSecond)
private static void AddTickTimestamp(List<double> list, double startTimestamp, double maxTimestamp, int tickSecond)
{
while (startTimestamp <= maxTimestamp)
{

View File

@@ -0,0 +1,291 @@
using System;
using System.Collections.Generic;
using UnityEngine;
#if UNITY_EDITOR
using UnityEditor;
#endif
#if dUI_TextMeshPro
using TMPro;
#endif
namespace XCharts.Runtime
{
/// <summary>
/// Portable resource reference that supports a multi-level lookup strategy:
/// GUID → path → name → fallbackName → null/default
/// </summary>
[Serializable]
public class ResourceRef
{
/// <summary>Unity AssetDatabase GUID (editor-only, same project).</summary>
public string guid;
/// <summary>Asset path relative to project root e.g. "Assets/Fonts/Arial.ttf".</summary>
public string path;
/// <summary>Asset.name used for cross-project name search.</summary>
public string name;
/// <summary>Optional secondary name (system font alias, built-in default, etc.).</summary>
public string fallbackName;
/// <summary>Optional Base64-encoded asset bytes for full portability (< 100 KB recommended).</summary>
public string base64;
public bool IsEmpty()
{
return string.IsNullOrEmpty(guid)
&& string.IsNullOrEmpty(path)
&& string.IsNullOrEmpty(name)
&& string.IsNullOrEmpty(fallbackName)
&& string.IsNullOrEmpty(base64);
}
public override string ToString()
{
return string.Format("ResourceRef{{name={0}, path={1}, guid={2}}}", name, path, guid);
}
}
/// <summary>
/// Handles serialization and resolution of Unity asset references for chart JSON export/import.
/// Supports Font, TMP_FontAsset, Sprite, Material, Texture2D.
/// </summary>
public static class ResourceRefHandler
{
// ─── Serialize ─────────────────────────────────────────────────────────────
/// <summary>
/// Serializes a Unity Object into a portable ResourceRef.
/// </summary>
public static ResourceRef Serialize(UnityEngine.Object asset, bool includeBase64 = false)
{
if (asset == null) return null;
var refData = new ResourceRef
{
name = asset.name
};
#if UNITY_EDITOR
var assetPath = AssetDatabase.GetAssetPath(asset);
if (!string.IsNullOrEmpty(assetPath))
{
refData.path = assetPath;
refData.guid = AssetDatabase.AssetPathToGUID(assetPath);
}
#endif
// Optional base64 embedding for portability
if (includeBase64)
{
var b64 = TryEncodeBase64(asset);
if (!string.IsNullOrEmpty(b64))
refData.base64 = b64;
}
return refData;
}
/// <summary>
/// Serializes a Font with a fallback name hint.
/// </summary>
public static ResourceRef SerializeFont(Font font, string fallbackName = null)
{
if (font == null) return null;
var refData = Serialize(font) ?? new ResourceRef();
refData.fallbackName = fallbackName ?? "Arial";
return refData;
}
#if dUI_TextMeshPro
/// <summary>
/// Serializes a TMP_FontAsset with a fallback name hint.
/// </summary>
public static ResourceRef SerializeTMPFont(TMP_FontAsset font, string fallbackName = null)
{
if (font == null) return null;
var refData = Serialize(font) ?? new ResourceRef();
refData.fallbackName = fallbackName ?? "LiberationSans SDF";
return refData;
}
#endif
// ─── Resolve ────────────────────────────────────────────────────────────────
/// <summary>
/// Attempts to resolve a ResourceRef back to a Unity asset using the fallback chain:<br/>
/// GUID → path → name → fallbackName → null
/// </summary>
public static T TryResolve<T>(ResourceRef refData) where T : UnityEngine.Object
{
if (refData == null || refData.IsEmpty()) return null;
#if UNITY_EDITOR
// 1. GUID lookup (same project, exact)
if (!string.IsNullOrEmpty(refData.guid))
{
var guidPath = AssetDatabase.GUIDToAssetPath(refData.guid);
if (!string.IsNullOrEmpty(guidPath))
{
var asset = AssetDatabase.LoadAssetAtPath<T>(guidPath);
if (asset != null) return asset;
}
}
// 2. Path-based lookup
if (!string.IsNullOrEmpty(refData.path))
{
var asset = AssetDatabase.LoadAssetAtPath<T>(refData.path);
if (asset != null) return asset;
}
// 3. Name-based search across project
if (!string.IsNullOrEmpty(refData.name))
{
var found = FindAssetByName<T>(refData.name);
if (found != null) return found;
}
#endif
// 4. Resources.Load by name
if (!string.IsNullOrEmpty(refData.name))
{
var asset = Resources.Load<T>(refData.name);
if (asset != null) return asset;
}
// 5. Fallback name
if (!string.IsNullOrEmpty(refData.fallbackName))
{
#if UNITY_EDITOR
var found = FindAssetByName<T>(refData.fallbackName);
if (found != null) return found;
#endif
var asset = Resources.Load<T>(refData.fallbackName);
if (asset != null) return asset;
}
// 6. Base64 decode
if (!string.IsNullOrEmpty(refData.base64))
{
var decoded = TryDecodeBase64<T>(refData.base64, refData.name ?? "imported_asset");
if (decoded != null) return decoded;
}
if (!IsUnityBuiltinDefaultResourceRef(refData))
Debug.LogWarning(string.Format("[XCharts] ResourceRefHandler: Could not resolve asset '{0}'. Using default.", refData));
return null;
}
private static bool IsUnityBuiltinDefaultResourceRef(ResourceRef refData)
{
if (refData == null) return false;
bool pathIsBuiltin = !string.IsNullOrEmpty(refData.path)
&& refData.path.IndexOf("Library/unity default resources", StringComparison.OrdinalIgnoreCase) >= 0;
bool guidIsBuiltin = !string.IsNullOrEmpty(refData.guid)
&& string.Equals(refData.guid, "0000000000000000e000000000000000", StringComparison.OrdinalIgnoreCase);
bool nameIsBuiltinFont = string.Equals(refData.name, "Arial", StringComparison.OrdinalIgnoreCase)
|| string.Equals(refData.fallbackName, "Arial", StringComparison.OrdinalIgnoreCase)
#if dUI_TextMeshPro
|| string.Equals(refData.name, "LiberationSans SDF", StringComparison.OrdinalIgnoreCase)
|| string.Equals(refData.fallbackName, "LiberationSans SDF", StringComparison.OrdinalIgnoreCase)
#endif
;
return pathIsBuiltin || guidIsBuiltin || nameIsBuiltinFont;
}
#if UNITY_EDITOR
private static T FindAssetByName<T>(string assetName) where T : UnityEngine.Object
{
string typeName = typeof(T).Name;
var guids = AssetDatabase.FindAssets(string.Format("{0} t:{1}", assetName, typeName));
foreach (var g in guids)
{
var p = AssetDatabase.GUIDToAssetPath(g);
var asset = AssetDatabase.LoadAssetAtPath<T>(p);
if (asset != null && asset.name == assetName)
return asset;
}
// Looser match (name contains)
foreach (var g in guids)
{
var p = AssetDatabase.GUIDToAssetPath(g);
var asset = AssetDatabase.LoadAssetAtPath<T>(p);
if (asset != null) return asset;
}
return null;
}
#endif
// ─── Base64 helpers ──────────────────────────────────────────────────────────
private static string TryEncodeBase64(UnityEngine.Object asset)
{
var texture = asset as Texture2D;
if (texture != null)
return Convert.ToBase64String(texture.EncodeToPNG());
// Font/Material: not trivially serializable as bytes at runtime; skip.
return null;
}
private static T TryDecodeBase64<T>(string base64, string assetName) where T : UnityEngine.Object
{
try
{
if (typeof(T) == typeof(Texture2D) || typeof(T) == typeof(Sprite))
{
var bytes = Convert.FromBase64String(base64);
var tex = new Texture2D(2, 2);
if (tex.LoadImage(bytes))
{
tex.name = assetName;
if (typeof(T) == typeof(Sprite))
{
var sprite = Sprite.Create(tex,
new Rect(0, 0, tex.width, tex.height),
new Vector2(0.5f, 0.5f));
sprite.name = assetName;
return sprite as T;
}
return tex as T;
}
}
}
catch (Exception ex)
{
Debug.LogWarning(string.Format("[XCharts] ResourceRefHandler: Base64 decode failed: {0}", ex.Message));
}
return null;
}
// ─── Convenience overloads ───────────────────────────────────────────────────
public static Font TryResolveFont(ResourceRef refData)
{
return TryResolve<Font>(refData);
}
public static Sprite TryResolveSprite(ResourceRef refData)
{
return TryResolve<Sprite>(refData);
}
public static Material TryResolveMaterial(ResourceRef refData)
{
return TryResolve<Material>(refData);
}
public static Texture2D TryResolveTexture(ResourceRef refData)
{
return TryResolve<Texture2D>(refData);
}
#if dUI_TextMeshPro
public static TMP_FontAsset TryResolveTMPFont(ResourceRef refData)
{
return TryResolve<TMP_FontAsset>(refData);
}
#endif
}
}

View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 9c3e7340177cb43e488f9f9547ceea7b
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -0,0 +1,299 @@
using System;
using System.Reflection;
using UnityEngine;
namespace XCharts.Runtime
{
[Serializable]
public class UIComponentJson
{
public string schemaVersion = "1.0";
public string componentType;
public string componentVersion;
public string exportedAt;
public string data;
}
public static class UIComponentJsonSerializer
{
public static string Serialize(UIComponent component, bool prettyPrint = true)
{
if (component == null) throw new ArgumentNullException("component");
var currentJson = JsonUtility.ToJson(component);
var defaultJson = GetDefaultInstanceJson(component.GetType());
var dataJson = BuildDataJson(component.GetType(), currentJson, defaultJson);
var dto = new UIComponentJson
{
schemaVersion = "1.0",
componentType = component.GetType().Name,
componentVersion = XChartsMgr.version,
exportedAt = DateTime.UtcNow.ToString("o"),
data = dataJson
};
var json = JsonUtility.ToJson(dto, prettyPrint);
json = ChartJsonDataFieldCodec.ConvertEscapedDataStringToRawObject(json);
if (prettyPrint)
{
object parsedJson;
if (SimpleJson.TryParse(json, out parsedJson))
json = SimpleJson.Stringify(parsedJson, true);
}
return json;
}
private static string BuildDataJson(Type componentType, string currentJson, string defaultJson)
{
if (componentType == null)
return JsonDiffPruner.PruneDefaults(currentJson, defaultJson);
if (string.Equals(componentType.Name, "UITable", StringComparison.Ordinal))
return PruneUITableData(componentType, currentJson, defaultJson);
return JsonDiffPruner.PruneDefaults(currentJson, defaultJson);
}
private static string PruneUITableData(Type tableType, string currentJson, string defaultJson)
{
object currentParsed;
object defaultParsed;
if (!SimpleJson.TryParse(currentJson, out currentParsed))
return JsonDiffPruner.PruneDefaults(currentJson, defaultJson);
if (!SimpleJson.TryParse(defaultJson, out defaultParsed))
return JsonDiffPruner.PruneDefaults(currentJson, defaultJson);
var currentRoot = currentParsed as System.Collections.Generic.Dictionary<string, object>;
var defaultRoot = defaultParsed as System.Collections.Generic.Dictionary<string, object>;
if (currentRoot == null)
return JsonDiffPruner.PruneDefaults(currentJson, defaultJson);
var prunedRootObj = JsonDiffPruner.PruneParsedDefaults(currentRoot, defaultRoot);
var prunedRoot = prunedRootObj as System.Collections.Generic.Dictionary<string, object>;
if (prunedRoot == null)
prunedRoot = new System.Collections.Generic.Dictionary<string, object>();
object currentRowsObj;
if (!currentRoot.TryGetValue("m_Data", out currentRowsObj))
return SimpleJson.Stringify(prunedRoot);
var currentRows = currentRowsObj as System.Collections.Generic.List<object>;
if (currentRows == null)
return SimpleJson.Stringify(prunedRoot);
var rowDefaultObj = CreateDefaultParsedObject(tableType.Assembly, "XCharts.Runtime.UI.TableRow");
if (rowDefaultObj == null)
return JsonDiffPruner.PruneDefaults(currentJson, defaultJson);
var cellDefaultObj = CreateDefaultParsedObject(tableType.Assembly, "XCharts.Runtime.UI.TableCell");
var prunedRows = new System.Collections.Generic.List<object>(currentRows.Count);
for (int i = 0; i < currentRows.Count; i++)
{
var prunedRow = PruneTableRowKeepCellShape(currentRows[i], rowDefaultObj, cellDefaultObj);
prunedRows.Add(prunedRow ?? new System.Collections.Generic.Dictionary<string, object>());
}
prunedRoot["m_Data"] = prunedRows;
return SimpleJson.Stringify(prunedRoot);
}
private static object PruneTableRowKeepCellShape(object rowObj, object rowDefaultObj, object cellDefaultObj)
{
var rowDict = rowObj as System.Collections.Generic.Dictionary<string, object>;
if (rowDict == null)
return JsonDiffPruner.PruneParsedDefaults(rowObj, rowDefaultObj);
object rawCells;
rowDict.TryGetValue("m_Data", out rawCells);
var currentCells = rawCells as System.Collections.Generic.List<object>;
var prunedRowObj = JsonDiffPruner.PruneParsedDefaults(rowObj, rowDefaultObj);
var prunedRowDict = prunedRowObj as System.Collections.Generic.Dictionary<string, object>;
if (prunedRowDict == null)
prunedRowDict = new System.Collections.Generic.Dictionary<string, object>();
if (currentCells != null)
{
var prunedCells = new System.Collections.Generic.List<object>(currentCells.Count);
for (int i = 0; i < currentCells.Count; i++)
{
var prunedCell = cellDefaultObj != null
? JsonDiffPruner.PruneParsedDefaults(currentCells[i], cellDefaultObj)
: JsonDiffPruner.PruneParsedDefaults(currentCells[i], null);
prunedCells.Add(prunedCell ?? new System.Collections.Generic.Dictionary<string, object>());
}
prunedRowDict["m_Data"] = prunedCells;
}
if (prunedRowDict.Count == 0)
return null;
return prunedRowDict;
}
private static object CreateDefaultParsedObject(Assembly assembly, string fullTypeName)
{
if (assembly == null || string.IsNullOrEmpty(fullTypeName))
return null;
try
{
var type = assembly.GetType(fullTypeName);
if (type == null)
return null;
var instance = Activator.CreateInstance(type);
if (instance == null)
return null;
var json = JsonUtility.ToJson(instance);
object parsed;
if (!SimpleJson.TryParse(json, out parsed))
return null;
return parsed;
}
catch
{
return null;
}
}
private static string GetDefaultInstanceJson(Type type)
{
if (type == null) return "{}";
GameObject tempObject = null;
try
{
if (typeof(MonoBehaviour).IsAssignableFrom(type))
{
tempObject = new GameObject("__XCharts_UIJson_Default__");
tempObject.hideFlags = HideFlags.HideAndDontSave;
var defaultComponent = tempObject.AddComponent(type) as UIComponent;
if (defaultComponent != null)
return JsonUtility.ToJson(defaultComponent);
return "{}";
}
var instance = Activator.CreateInstance(type);
if (instance == null)
return "{}";
return JsonUtility.ToJson(instance);
}
catch
{
return "{}";
}
finally
{
if (tempObject != null)
{
#if UNITY_EDITOR
UnityEngine.Object.DestroyImmediate(tempObject);
#else
UnityEngine.Object.Destroy(tempObject);
#endif
}
}
}
}
public static class UIComponentJsonDeserializer
{
private const string LOG_TAG = "[XCharts] UIComponentJsonDeserializer";
public static void Deserialize(string json, UIComponent target)
{
if (string.IsNullOrEmpty(json)) throw new ArgumentNullException("json");
if (target == null) throw new ArgumentNullException("target");
json = ChartJsonDataFieldCodec.ConvertRawObjectDataToEscapedString(json);
UIComponentJson dto;
try
{
dto = JsonUtility.FromJson<UIComponentJson>(json);
}
catch (Exception ex)
{
throw new ArgumentException(string.Format("Invalid JSON format: {0}", ex.Message), ex);
}
if (dto == null || string.IsNullOrEmpty(dto.schemaVersion))
throw new ArgumentException("JSON does not appear to be a valid XCharts UI component export (missing schemaVersion).");
if (!dto.schemaVersion.StartsWith("1."))
throw new ArgumentException(string.Format("Unsupported schema version '{0}'. This version only supports '1.x'.", dto.schemaVersion));
ValidateComponentType(dto.componentType, target);
if (!string.IsNullOrEmpty(dto.data))
JsonUtility.FromJsonOverwrite(dto.data, target);
target.RefreshAllComponent();
target.RefreshGraph();
#if UNITY_EDITOR
UnityEditor.EditorUtility.SetDirty(target);
#endif
Debug.Log(string.Format("{0}: Import complete for '{1}'.", LOG_TAG, target.GetType().Name));
}
private static void ValidateComponentType(string typeName, UIComponent target)
{
if (string.IsNullOrEmpty(typeName) || target == null) return;
var resolved = ResolveType(typeName);
if (resolved == null) return;
if (!resolved.IsAssignableFrom(target.GetType()))
throw new ArgumentException(string.Format("JSON is for UI component '{0}', target is '{1}'.", resolved.Name, target.GetType().Name));
}
private static Type ResolveType(string typeName)
{
if (string.IsNullOrEmpty(typeName)) return null;
var type = Type.GetType(typeName);
if (type != null) return type;
var shortName = typeName.Split(',')[0].Trim();
var simpleName = shortName.Contains(".") ? shortName.Substring(shortName.LastIndexOf(".") + 1) : shortName;
foreach (var asm in AppDomain.CurrentDomain.GetAssemblies())
{
try
{
type = asm.GetType(shortName);
if (type != null) return type;
var types = asm.GetTypes();
for (int i = 0; i < types.Length; i++)
{
var candidate = types[i];
if (candidate == null) continue;
if (string.Equals(candidate.Name, simpleName, StringComparison.Ordinal))
return candidate;
}
}
catch (ReflectionTypeLoadException rtle)
{
var partialTypes = rtle.Types;
if (partialTypes == null) continue;
for (int i = 0; i < partialTypes.Length; i++)
{
var candidate = partialTypes[i];
if (candidate == null) continue;
if (string.Equals(candidate.Name, simpleName, StringComparison.Ordinal))
return candidate;
}
}
catch
{
}
}
return null;
}
}
}

View File

@@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 20febe04d2ef346e196ab69da9c1d7d4
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -140,19 +140,26 @@ namespace XUGL
public static void DrawLine(VertexHelper vh, List<Vector3> points, float width, Color32 color, bool smooth, bool closepath = false)
{
for (int i = points.Count - 1; i >= 1; i--)
if (points == null || points.Count < 2) return;
// Compact duplicate consecutive points into a reusable buffer to avoid repeated RemoveAt (O(n^2)).
s_CurvesPosList.Clear();
s_CurvesPosList.Add(points[0]);
for (int i = 1; i < points.Count; i++)
{
if (UGLHelper.IsValueEqualsVector3(points[i], points[i - 1]))
points.RemoveAt(i);
if (!UGLHelper.IsValueEqualsVector3(points[i], points[i - 1]))
s_CurvesPosList.Add(points[i]);
}
if (points.Count < 2) return;
else if (points.Count <= 2)
var pts = s_CurvesPosList;
if (pts.Count < 2) return;
else if (pts.Count == 2)
{
DrawLine(vh, points[0], points[1], width, color);
DrawLine(vh, pts[0], pts[1], width, color);
}
else if (smooth)
{
DrawCurves(vh, points, width, color, 2, 2, Direction.XAxis, float.NaN, closepath);
DrawCurves(vh, pts, width, color, 2, 2, Direction.XAxis, float.NaN, closepath);
}
else
{
@@ -164,14 +171,14 @@ namespace XUGL
var ibp = Vector3.zero;
var ctp = Vector3.zero;
var cbp = Vector3.zero;
if (closepath && !UGLHelper.IsValueEqualsVector3(points[points.Count - 1], points[0]))
if (closepath && !UGLHelper.IsValueEqualsVector3(pts[pts.Count - 1], pts[0]))
{
points.Add(points[0]);
pts.Add(pts[0]);
}
for (int i = 1; i < points.Count - 1; i++)
for (int i = 1; i < pts.Count - 1; i++)
{
bool bitp = true, bibp = true;
UGLHelper.GetLinePoints(points[i - 1], points[i], points[i + 1], width,
UGLHelper.GetLinePoints(pts[i - 1], pts[i], pts[i + 1], width,
ref ltp, ref lbp,
ref ntp, ref nbp,
ref itp, ref ibp,
@@ -1446,7 +1453,7 @@ namespace XUGL
var lastP4 = center;
var lastColor = color;
var needBorder = borderWidth != 0;
var needSpace = gap != 0;
var needSpace = gap != 0 || borderWidth != 0;
var borderLineWidth = needSpace ? borderWidth : borderWidth / 2;
var lastPos = Vector3.zero;
var middleDire = UGLHelper.GetDire(startAngle + halfAngle);

Some files were not shown because too many files have changed in this diff Show More