().color = Color.clear;
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/Examples/Example04_DataZoom.cs.meta b/Examples/Example04_DataZoom.cs.meta
new file mode 100644
index 00000000..e0a5838a
--- /dev/null
+++ b/Examples/Example04_DataZoom.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f2cc0ca220d904377984528de6214b97
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Documentation/README.md b/README-en.md
similarity index 87%
rename from Documentation/README.md
rename to README-en.md
index 49b99f61..3d8045ee 100644
--- a/Documentation/README.md
+++ b/README-en.md
@@ -10,6 +10,7 @@
Unity数据可视化图表插件。
中文
+ 中文
@@ -45,12 +46,14 @@
A powerful, easy-to-use, configurable charting and data visualization library for Unity. Supporting line, bar, pie, radar, scatter, heatmap, ring, candlestick, polar, liquid and other common chart. Also support 3d pie, 3d bar, 3d pyramid, funnel, gauge, liquid, pictorialbar, gantt, treemap and ther extended chart.
-[XCharts3.0 Tutorial](XChartsTutorial01-EN.md)
-[XCharts3.0 API](XChartsAPI-EN.md)
-[XCharts3.0 FAQ](XChartsFAQ-EN.md)
-[XCharts3.0 Configurate](XChartsConfiguration-EN.md)
-[XCharts3.0 Changelog](CHANGELOG.md)
-[XCharts3.0 Support](SUPPORT.md)
+[XCharts3.0 Homepage](https://xcharts-team.github.io)
+
+[XCharts3.0 Tutorial](Documentation~/en/tutorial01.md)
+[XCharts3.0 API](Documentation~/en/api.md)
+[XCharts3.0 FAQ](Documentation~/en/faq.md)
+[XCharts3.0 Configurate](Documentation~/en/configuration.md)
+[XCharts3.0 Changelog](Documentation~/en/changelog.md)
+[XCharts3.0 Support](Documentation~/en/support.md)
## Features
@@ -103,9 +106,9 @@ A powerful, easy-to-use, configurable charting and data visualization library fo
## Screenshots
-
+
-
+
For more examples, see [XCharts-Demo](https://github.com/XCharts-Team/XCharts-Demo), You can also go to [Online Demo](https://xcharts-team.github.io/demo/) to see the running effect of `WebGL`.
@@ -115,7 +118,7 @@ For more examples, see [XCharts-Demo](https://github.com/XCharts-Team/XCharts-De
2. Right-click `Hierarchy` view and choose `XCharts->LineChart` to create a default LineChart.
3. You can adjust the parameters of each component in `Inspector` and see the real-time effects in `Game` view.
-See more tutorial: [XCharts tutorial: 5 minutes overhand tutorial](XChartsTutorial01-EN.md)
+See more tutorial: [XCharts tutorial: 5 minutes overhand tutorial](Documentation~/en/tutorial01.md)
## FAQ
@@ -130,12 +133,12 @@ A: It is currently only supported on Unity. Theoretically any version of Unity t
## Changelog
-[Changelog](CHANGELOG.md)
+[Changelog](Documentation~/en/changelog.md)
## Licenses
-[MIT License](LICENSE.md)
+[MIT License](https://github.com/XCharts-Team/XCharts/blob/master/LICENSE.md)
## Other
-email: `monitor1394@gmail.com`
\ No newline at end of file
+email: `monitor1394@gmail.com`
diff --git a/Documentation/CHANGELOG.md.meta b/README-en.md.meta
similarity index 75%
rename from Documentation/CHANGELOG.md.meta
rename to README-en.md.meta
index eea74aad..66c33d20 100644
--- a/Documentation/CHANGELOG.md.meta
+++ b/README-en.md.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 7425bc5c378354c95bb116c36dc1b5f8
+guid: 7c7e32dee55f747fdba157f6230f52b2
TextScriptImporter:
externalObjects: {}
userData:
diff --git a/README.md b/README.md
index 221f2aaa..dd1d3b8a 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
Unity数据可视化图表插件。
- English README
+ English README
@@ -45,12 +45,14 @@
一款基于`UGUI`的功能强大、简单易用的数据可视化图表插件。支持`折线图`、`柱状图`、`饼图`、`雷达图`、`散点图`、`热力图`、`环形图`、`K线图`、`极坐标`、`平行坐标`等十多种内置图表，以及`3D饼图`、`3D柱图`、`3D金字塔`、`漏斗图`、`仪表盘`、`水位图`、`象形柱图`、`甘特图`、`矩形树图`等扩展图表。
-[XCharts3.0 教程](Documentation/XChartsTutorial01-ZH.md)
-[XCharts3.0 API](Documentation/XChartsAPI-ZH.md)
-[XCharts3.0 问答](Documentation/XChartsFAQ-ZH.md)
-[XCharts3.0 配置项手册](Documentation/XChartsConfiguration-ZH.md)
-[XCharts3.0 更新日志](CHANGELOG.md)
-[XCharts3.0 订阅服务](Documentation/SUPPORT.md)
+[XCharts3.0 官方主页](https://xcharts-team.github.io)
+
+[XCharts3.0 教程](Documentation~/zh/tutorial01.md)
+[XCharts3.0 API](Documentation~/zh/api.md)
+[XCharts3.0 问答](Documentation~/zh/faq.md)
+[XCharts3.0 配置项手册](Documentation~/zh/configuration.md)
+[XCharts3.0 更新日志](Documentation~/zh/changelog.md)
+[XCharts3.0 订阅服务](Documentation~/zh/support.md)
## 特性
@@ -71,9 +73,9 @@
## 截图
-
+
-
+
XCharts不再内置Demo，Demo已独立出单独的仓库 [XCharts-Demo](https://github.com/XCharts-Team/XCharts-Demo)，也可以在浏览器查看`WebGL`下的运行效果 [在线Demo](https://xcharts-team.github.io/demo/) 。
@@ -101,7 +103,7 @@ XCharts不再内置Demo，Demo已独立出单独的仓库 [XCharts-Demo](https:/
- 更高效的二次开发。
- 更丰富的Demo示例。
-
+
## 注意
@@ -116,7 +118,7 @@ XCharts不再内置Demo，Demo已独立出单独的仓库 [XCharts-Demo](https:/
2. 在`Hierarchy`视图下右键选择`XCharts->LineChart`，即可创建一个默认的折线图。
3. 在`Inspector`视图可以调整各个组件的参数，`Game`视图可看到实时效果。
-- 更多使用细节，请看：[XCharts教程：5分钟上手教程](Documentation/XChartsTutorial01-ZH.md)
+- 更多使用细节，请看：[XCharts教程：5分钟上手教程](Documentation~/zh/tutorial01.md)
- 首次使用，建议先认真看一遍教程。
## 分支
@@ -140,22 +142,22 @@ XCharts不再内置Demo，Demo已独立出单独的仓库 [XCharts-Demo](https:/
答：目前只支持在`Unity`平台使用。理论上任何支持`UGUI`的`Unity`版本都能运行`XCharts`。
4. 锯齿怎么解决？支持多大量级的数据？
- 答：`XCharts`是基于`UGUI`实现的，所以`UGUI`中碰到的问题，在`XCharts`中也会存在。比如锯齿问题，比如`Mesh`顶点数超`65535`的问题。这两个问题的解决可参考[问答16](Documentation/XChartsFAQ-ZH.md)和[问答27](Documentation/XChartsFAQ-ZH.md)。
+ 答：`XCharts`是基于`UGUI`实现的，所以`UGUI`中碰到的问题，在`XCharts`中也会存在。比如锯齿问题，比如`Mesh`顶点数超`65535`的问题。这两个问题的解决可参考[问答16](Documentation~/zh/faq.md)和[问答27](Documentation~/zh/faq.md)。
由于`Mesh`的`65535`顶点数的限制，目前`XCharts`的单条`Line`支持约`2万`的数据量，当然开启采样可以支持更多数据的绘制，但同时也会更消耗CPU。
## Licenses
-- [MIT License](LICENSE.md)
+- [MIT License](https://github.com/XCharts-Team/XCharts/blob/master/LICENSE.md)
- 可免费商用，可二次开发
- 扩展图表需单独购买授权
## 日志
-- [更新日志](CHANGELOG.md)
+- [更新日志](Documentation~/zh/changelog.md)
## 其他
- 邮箱：`monitor1394@gmail.com`
- QQ群：XCharts交流群（`202030963`）
- VIP群：XCharts技术支持VIP群（`867291970`）
-- 捐助、合作和技术支持：[☞ 看这里](Documentation/SUPPORT.md)
+- 捐助、合作和技术支持：[☞ 看这里](Documentation~/zh/support.md)
diff --git a/Resources/XCSettings.asset b/Resources/XCSettings.asset
index 5b897015..5587633c 100644
--- a/Resources/XCSettings.asset
+++ b/Resources/XCSettings.asset
@@ -50,3 +50,5 @@ MonoBehaviour:
m_CustomThemes:
- {fileID: 11400000, guid: 289d2fc7f4ce24f73b9ed8ec52639f72, type: 2}
- {fileID: 11400000, guid: e1dc23a10de1e4c5dbfbaf74c4dfd218, type: 2}
+ - {fileID: 11400000, guid: f917f38ce737f4563a377883dccaff8f, type: 2}
+ - {fileID: 11400000, guid: 376d15d5e9b694d75965c837a0fe1222, type: 2}
diff --git a/Runtime/Component/Animation/AnimationStyle.cs b/Runtime/Component/Animation/AnimationStyle.cs
index 367f880c..586e66a3 100644
--- a/Runtime/Component/Animation/AnimationStyle.cs
+++ b/Runtime/Component/Animation/AnimationStyle.cs
@@ -28,7 +28,7 @@ namespace XCharts.Runtime
InsideOut,
///
/// Play the animation along the path.
- /// |沿着路径播放动画。
+ /// |沿着路径播放动画。当折线图从左到右无序或有折返时，可以使用该模式。
///
AlongPath,
///
@@ -275,8 +275,6 @@ namespace XCharts.Runtime
{
if (m_IsInit || m_IsEnd)
return;
- if (curr > dest)
- return;
m_IsInit = true;
m_TotalDetailProgress = dest - curr;
diff --git a/Runtime/Component/Axis/AxisHandler.cs b/Runtime/Component/Axis/AxisHandler.cs
index c419eb6b..0b7f8ae6 100644
--- a/Runtime/Component/Axis/AxisHandler.cs
+++ b/Runtime/Component/Axis/AxisHandler.cs
@@ -421,7 +421,7 @@ namespace XCharts
label.SetActive(axis.axisName.labelStyle.show);
label.SetPosition(axis.position == Axis.AxisPosition.Top ?
new Vector2(zeroPos.x - offset.x, axisStartY + relativedLength + offset.y + axis.offset) :
- new Vector2(zeroPos.x - offset.x, posY));
+ new Vector2(zeroPos.x - offset.x, posY + offset.y));
break;
case LabelStyle.Position.Middle:
@@ -431,7 +431,7 @@ namespace XCharts
label.SetActive(axis.axisName.labelStyle.show);
label.SetPosition(axis.position == Axis.AxisPosition.Top ?
new Vector2(axisStartX + axisLength / 2 + offset.x, axisStartY + relativedLength - offset.y + axis.offset) :
- new Vector2(axisStartX + axisLength / 2 + offset.x, posY));
+ new Vector2(axisStartX + axisLength / 2 + offset.x, posY + offset.y));
break;
default:
@@ -441,7 +441,7 @@ namespace XCharts
label.SetActive(axis.axisName.labelStyle.show);
label.SetPosition(axis.position == Axis.AxisPosition.Top ?
new Vector2(axisStartX + axisLength + offset.x, axisStartY + relativedLength + offset.y + axis.offset) :
- new Vector2(axisStartX + axisLength + offset.x, posY));
+ new Vector2(axisStartX + axisLength + offset.x, posY + offset.y));
break;
}
}
@@ -458,7 +458,7 @@ namespace XCharts
label.SetActive(axis.axisName.labelStyle.show);
label.SetPosition(axis.position == Axis.AxisPosition.Right ?
new Vector2(axisStartX + relativedLength + offset.x + axis.offset, axisStartY - offset.y) :
- new Vector2(posX, axisStartY - offset.y));
+ new Vector2(posX + offset.x, axisStartY - offset.y));
break;
case LabelStyle.Position.Middle:
@@ -468,7 +468,7 @@ namespace XCharts
label.SetActive(axis.axisName.labelStyle.show);
label.SetPosition(axis.position == Axis.AxisPosition.Right ?
new Vector2(axisStartX + relativedLength - offset.x + axis.offset, axisStartY + axisLength / 2 + offset.y) :
- new Vector2(posX, axisStartY + axisLength / 2 + offset.y));
+ new Vector2(posX + offset.x, axisStartY + axisLength / 2 + offset.y));
break;
default:
@@ -478,7 +478,7 @@ namespace XCharts
label.SetActive(axis.axisName.labelStyle.show);
label.SetPosition(axis.position == Axis.AxisPosition.Right ?
new Vector2(axisStartX + relativedLength + offset.x + axis.offset, axisStartY + axisLength + offset.y) :
- new Vector2(posX, axisStartY + axisLength + offset.y));
+ new Vector2(posX + offset.x, axisStartY + axisLength + offset.y));
break;
}
}
diff --git a/Runtime/Component/Axis/RadiusAxis/RadiusAxisHandler.cs b/Runtime/Component/Axis/RadiusAxis/RadiusAxisHandler.cs
index 60382f55..a72e17c5 100644
--- a/Runtime/Component/Axis/RadiusAxis/RadiusAxisHandler.cs
+++ b/Runtime/Component/Axis/RadiusAxis/RadiusAxisHandler.cs
@@ -26,6 +26,8 @@ namespace XCharts.Runtime
protected override void UpdatePointerValue(Axis axis)
{
+ if (axis == null)
+ return;
var polar = chart.GetChartComponent(axis.polarIndex);
if (polar == null)
return;
@@ -47,6 +49,7 @@ namespace XCharts.Runtime
private void UpdateAxisMinMaxValue(RadiusAxis axis, bool updateChart = true)
{
+ if (axis == null) return;
if (axis.IsCategory() || !axis.show) return;
double tempMinValue = 0;
double tempMaxValue = 0;
@@ -70,6 +73,8 @@ namespace XCharts.Runtime
internal void UpdateAxisLabelText(RadiusAxis axis)
{
+ if (axis == null)
+ return;
var polar = chart.GetChartComponent(axis.polarIndex);
if (axis.context.labelObjectList.Count <= 0)
InitRadiusAxis(axis);
@@ -144,6 +149,9 @@ namespace XCharts.Runtime
private void DrawRadiusAxis(VertexHelper vh, RadiusAxis radiusAxis)
{
+ if (radiusAxis == null)
+ return;
+
var polar = chart.GetChartComponent(radiusAxis.polarIndex);
if (polar == null)
return;
diff --git a/Runtime/Component/Child/MarqueeStyle.cs b/Runtime/Component/Child/MarqueeStyle.cs
new file mode 100644
index 00000000..e28ee74d
--- /dev/null
+++ b/Runtime/Component/Child/MarqueeStyle.cs
@@ -0,0 +1,62 @@
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace XCharts.Runtime
+{
+ ///
+ /// Marquee style. It can be used for the DataZoom component.
+ /// 选取框样式。可用于DataZoom组件。
+ ///
+ [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_RealRect = false;
+ [SerializeField][Since("v3.5.0")] private AreaStyle m_AreaStyle = new AreaStyle();
+ [SerializeField][Since("v3.5.0")] private LineStyle m_LineStyle = new LineStyle();
+
+ protected Action m_OnStart;
+ protected Action m_OnGoing;
+ protected Action m_OnEnd;
+
+ ///
+ /// The area style of marquee.
+ /// |选取框区域填充样式。
+ ///
+ public AreaStyle areaStyle { get { return m_AreaStyle; } set { m_AreaStyle = value; } }
+ ///
+ /// The line style of marquee border.
+ /// |选取框区域边框样式。
+ ///
+ public LineStyle lineStyle { get { return m_LineStyle; } set { m_LineStyle = value; } }
+ ///
+ /// Check whether the scope is applied to the DataZoom.
+ /// If this parameter is set to true, the range after the selection is complete is the DataZoom selection range.
+ /// |选取框范围是否应用到DataZoom上。当为true时，框选结束后的范围即为DataZoom的选择范围。
+ ///
+ public bool apply { get { return m_Apply; } set { m_Apply = value; } }
+ ///
+ /// Whether to select the actual box selection area. When true,
+ /// the actual range between the mouse's actual point and the end point is used as the box selection area.
+ /// |是否选取实际框选区域。当为true时，以鼠标的其实点和结束点间的实际范围作为框选区域。
+ ///
+ public bool realRect { get { return m_RealRect; } set { m_RealRect = value; } }
+ ///
+ /// Customize the callback to the start of the selection of the checkbox.
+ /// |自定义选取框开始选取时的回调。
+ ///
+ public Action onStart { set { m_OnStart = value; } get { return m_OnStart; } }
+ ///
+ /// Custom checkboxes select ongoing callbacks.
+ /// |自定义选取框选取进行时的回调。
+ ///
+ public Action onGoing { set { m_OnStart = value; } get { return m_OnStart; } }
+ ///
+ /// Customize the callback at the end of the selection.
+ /// |自定义选取框结束选取时的回调。
+ ///
+ public Action onEnd { set { m_OnEnd = value; } get { return m_OnEnd; } }
+ }
+}
\ No newline at end of file
diff --git a/Runtime/Component/Child/MarqueeStyle.cs.meta b/Runtime/Component/Child/MarqueeStyle.cs.meta
new file mode 100644
index 00000000..5c804f34
--- /dev/null
+++ b/Runtime/Component/Child/MarqueeStyle.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: effa7d6629485469d91d41f896b9de8d
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Runtime/Component/Comment/Comment.cs b/Runtime/Component/Comment/Comment.cs
index 4274a774..f5a8dbef 100644
--- a/Runtime/Component/Comment/Comment.cs
+++ b/Runtime/Component/Comment/Comment.cs
@@ -10,7 +10,7 @@ namespace XCharts.Runtime
///
[Serializable]
[ComponentHandler(typeof(CommentHander), true)]
- public class Comment : MainComponent
+ public class Comment : MainComponent, IPropertyChanged
{
[SerializeField] private bool m_Show = true;
[SerializeField] private LabelStyle m_LabelStyle = new LabelStyle();
@@ -65,5 +65,17 @@ namespace XCharts.Runtime
}
return m_MarkStyle;
}
+
+ ///
+ /// Callback handling when parameters change.
+ /// |参数变更时的回调处理。
+ ///
+ public void OnChanged()
+ {
+ foreach (var item in items)
+ {
+ item.location.OnChanged();
+ }
+ }
}
}
\ No newline at end of file
diff --git a/Runtime/Component/Comment/CommentHander.cs b/Runtime/Component/Comment/CommentHander.cs
index 92c17536..eef0f5d2 100644
--- a/Runtime/Component/Comment/CommentHander.cs
+++ b/Runtime/Component/Comment/CommentHander.cs
@@ -12,6 +12,7 @@ namespace XCharts.Runtime
public override void InitComponent()
{
var comment = component;
+ comment.OnChanged();
comment.painter = null;
comment.refreshComponent = delegate()
{
@@ -30,10 +31,12 @@ namespace XCharts.Runtime
{
var item = comment.items[i];
var labelStyle = comment.GetLabelStyle(i);
+ 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);
- label.SetPosition(item.position + labelStyle.offset);
+ label.SetPosition(labelPos);
+ label.text.SetLocalPosition(labelStyle.offset);
}
};
comment.refreshComponent();
@@ -59,7 +62,7 @@ namespace XCharts.Runtime
{
var item = component.items[i];
var markStyle = component.GetMarkStyle(i);
- if (!markStyle.show) continue;
+ if (markStyle == null || !markStyle.show) continue;
var color = ChartHelper.IsClearColor(markStyle.lineStyle.color) ?
chart.theme.axis.splitLineColor :
markStyle.lineStyle.color;
diff --git a/Runtime/Component/Comment/CommentItem.cs b/Runtime/Component/Comment/CommentItem.cs
index 5a3a891f..2b7ab9dd 100644
--- a/Runtime/Component/Comment/CommentItem.cs
+++ b/Runtime/Component/Comment/CommentItem.cs
@@ -12,10 +12,11 @@ namespace XCharts.Runtime
{
[SerializeField] private bool m_Show = true;
[SerializeField] private string m_Content = "comment";
- [SerializeField] private Vector3 m_Position;
[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 };
+
///
/// Set this to false to prevent this comment item from showing.
@@ -23,11 +24,6 @@ namespace XCharts.Runtime
///
public bool show { get { return m_Show; } set { if (PropertyUtil.SetStruct(ref m_Show, value)) SetComponentDirty(); } }
///
- /// position of comment.
- /// |注解项的位置坐标。
- ///
- public Vector3 position { get { return m_Position; } set { if (PropertyUtil.SetStruct(ref m_Position, value)) SetComponentDirty(); } }
- ///
/// content of comment.
/// |注解的文本内容。支持模板参数，可以参考Tooltip的itemFormatter。
///
@@ -51,5 +47,14 @@ namespace XCharts.Runtime
get { return m_LabelStyle; }
set { if (PropertyUtil.SetClass(ref m_LabelStyle, value)) SetComponentDirty(); }
}
+ ///
+ /// The location of comment.
+ /// |Comment显示的位置。
+ ///
+ public Location location
+ {
+ get { return m_Location; }
+ set { if (PropertyUtil.SetClass(ref m_Location, value)) SetComponentDirty(); }
+ }
}
}
\ No newline at end of file
diff --git a/Runtime/Component/DataZoom/DataZoom.cs b/Runtime/Component/DataZoom/DataZoom.cs
index 14b72be9..030a0c52 100644
--- a/Runtime/Component/DataZoom/DataZoom.cs
+++ b/Runtime/Component/DataZoom/DataZoom.cs
@@ -65,7 +65,7 @@ namespace XCharts.Runtime
[SerializeField] private bool m_SupportInsideScroll = true;
[SerializeField] private bool m_SupportInsideDrag = true;
[SerializeField] private bool m_SupportSlider;
- [SerializeField] private bool m_SupportSelect;
+ [SerializeField] private bool m_SupportMarquee;
[SerializeField] private bool m_ShowDataShadow;
[SerializeField] private bool m_ShowDetail;
[SerializeField] private bool m_ZoomLock;
@@ -90,6 +90,7 @@ namespace XCharts.Runtime
[SerializeField] private LabelStyle m_LabelStyle = new LabelStyle();
[SerializeField] private LineStyle m_LineStyle = new LineStyle(LineStyle.Type.Solid);
[SerializeField] private AreaStyle m_AreaStyle = new AreaStyle();
+ [SerializeField][Since("v3.5.0")] private MarqueeStyle m_MarqueeStyle = new MarqueeStyle();
public DataZoomContext context = new DataZoomContext();
@@ -141,7 +142,8 @@ namespace XCharts.Runtime
set { if (PropertyUtil.SetStruct(ref m_SupportInside, value)) SetVerticesDirty(); }
}
///
- /// 是否支持坐标系内滚动
+ /// Whether inside scrolling is supported.
+ /// |是否支持坐标系内滚动
///
public bool supportInsideScroll
{
@@ -149,7 +151,8 @@ namespace XCharts.Runtime
set { if (PropertyUtil.SetStruct(ref m_SupportInsideScroll, value)) SetVerticesDirty(); }
}
///
- /// 是否支持坐标系内拖拽
+ /// Whether insde drag is supported.
+ /// |是否支持坐标系内拖拽
///
public bool supportInsideDrag
{
@@ -166,12 +169,13 @@ namespace XCharts.Runtime
set { if (PropertyUtil.SetStruct(ref m_SupportSlider, value)) SetVerticesDirty(); }
}
///
- /// 是否支持框选。提供一个选框进行数据区域缩放。
+ /// Supported Box Selected. Provides a marquee for scaling the data area.
+ /// |是否支持框选。提供一个选框进行数据区域缩放。
///
- public bool supportSelect
+ public bool supportMarquee
{
- get { return m_SupportSelect; }
- set { if (PropertyUtil.SetStruct(ref m_SupportSelect, value)) SetVerticesDirty(); }
+ get { return m_SupportMarquee; }
+ set { if (PropertyUtil.SetStruct(ref m_SupportMarquee, value)) SetVerticesDirty(); }
}
///
/// Whether to show data shadow, to indicate the data tendency in brief.
@@ -363,6 +367,14 @@ namespace XCharts.Runtime
get { return m_AreaStyle; }
set { if (PropertyUtil.SetClass(ref m_AreaStyle, value)) SetComponentDirty(); }
}
+ ///
+ /// 选取框样式。
+ ///
+ public MarqueeStyle marqueeStyle
+ {
+ get { return m_MarqueeStyle; }
+ set { if (PropertyUtil.SetClass(ref m_MarqueeStyle, value)) SetAllDirty(); }
+ }
class AxisIndexValueInfo
{
@@ -414,6 +426,7 @@ namespace XCharts.Runtime
show = true,
opacity = 0.3f
};
+ m_MarqueeStyle = new MarqueeStyle();
}
///
@@ -515,6 +528,25 @@ namespace XCharts.Runtime
}
}
+ public bool IsInMarqueeArea(SerieData serieData)
+ {
+ return IsInMarqueeArea(serieData.context.position);
+ }
+
+ public bool IsInMarqueeArea(Vector2 pos)
+ {
+ if (!supportMarquee) return false;
+ if (context.marqueeRect.width >= 0)
+ {
+ return context.marqueeRect.Contains(pos);
+ }
+ else
+ {
+ var rect = context.marqueeRect;
+ return (new Rect(rect.x + rect.width, rect.y, -rect.width, rect.height)).Contains(pos);
+ }
+ }
+
public bool IsContainsAxis(Axis axis)
{
if (axis == null)
diff --git a/Runtime/Component/DataZoom/DataZoomContext.cs b/Runtime/Component/DataZoom/DataZoomContext.cs
index 49cf852c..d856eadc 100644
--- a/Runtime/Component/DataZoom/DataZoomContext.cs
+++ b/Runtime/Component/DataZoom/DataZoomContext.cs
@@ -22,5 +22,10 @@ namespace XCharts.Runtime
///
public double endValue { get; set; }
public bool invert { get; set; }
+
+ public bool isMarqueeDrag { get; set; }
+ public Vector3 marqueeStartPos { get; set; }
+ public Vector3 marqueeEndPos { get; set; }
+ public Rect marqueeRect { get; set; }
}
}
\ No newline at end of file
diff --git a/Runtime/Component/DataZoom/DataZoomHandler.cs b/Runtime/Component/DataZoom/DataZoomHandler.cs
index 8f57bc9b..50f9f755 100644
--- a/Runtime/Component/DataZoom/DataZoomHandler.cs
+++ b/Runtime/Component/DataZoom/DataZoomHandler.cs
@@ -72,9 +72,11 @@ namespace XCharts.Runtime
{
case Orient.Horizonal:
DrawHorizonalDataZoomSlider(vh, dataZoom);
+ DrawMarquee(vh, dataZoom);
break;
case Orient.Vertical:
DrawVerticalDataZoomSlider(vh, dataZoom);
+ DrawMarquee(vh, dataZoom);
break;
}
}
@@ -87,14 +89,14 @@ namespace XCharts.Runtime
if (Input.touchCount > 1)
return;
- Vector2 pos;
- if (!chart.ScreenPointToChartPoint(eventData.position, out pos))
- return;
-
var dataZoom = component;
if (!dataZoom.enable)
return;
+ Vector2 pos;
+ if (!chart.ScreenPointToChartPoint(eventData.position, out pos))
+ return;
+
var grid = chart.GetGridOfDataZoom(dataZoom);
if (dataZoom.supportInside && dataZoom.supportInsideDrag)
{
@@ -103,6 +105,23 @@ namespace XCharts.Runtime
dataZoom.context.isCoordinateDrag = true;
}
}
+ if (dataZoom.supportMarquee)
+ {
+ dataZoom.context.isMarqueeDrag = true;
+ dataZoom.context.marqueeStartPos = pos;
+ dataZoom.context.marqueeEndPos = pos;
+
+ if (dataZoom.marqueeStyle.realRect)
+ dataZoom.context.marqueeRect = new Rect(pos.x, pos.y, 0, 0);
+ else
+ dataZoom.context.marqueeRect = new Rect(pos.x, grid.context.y, 0, grid.context.height);
+
+ if (dataZoom.marqueeStyle.onStart != null)
+ {
+ dataZoom.marqueeStyle.onStart(dataZoom);
+ }
+ return;
+ }
if (dataZoom.supportSlider)
{
if (!dataZoom.zoomLock)
@@ -136,18 +155,40 @@ namespace XCharts.Runtime
var dataZoom = component;
var grid = chart.GetGridOfDataZoom(dataZoom);
- switch (dataZoom.orient)
+ if (dataZoom.supportMarquee)
{
- case Orient.Horizonal:
- var deltaPercent = eventData.delta.x / grid.context.width * 100;
- OnDragInside(dataZoom, deltaPercent);
- OnDragSlider(dataZoom, deltaPercent);
- break;
- case Orient.Vertical:
- deltaPercent = eventData.delta.y / grid.context.height * 100;
- OnDragInside(dataZoom, deltaPercent);
- OnDragSlider(dataZoom, deltaPercent);
- break;
+ Vector2 pos;
+ if (!chart.ScreenPointToChartPoint(eventData.position, out pos))
+ return;
+
+ dataZoom.context.marqueeEndPos = pos;
+ var oldRect = dataZoom.context.marqueeRect;
+ var rectWidth = pos.x - dataZoom.context.marqueeStartPos.x;
+ if (dataZoom.marqueeStyle.realRect)
+ dataZoom.context.marqueeRect = Rect.MinMaxRect(dataZoom.context.marqueeStartPos.x, pos.y, pos.x, dataZoom.context.marqueeStartPos.y);
+ else
+ dataZoom.context.marqueeRect = new Rect(oldRect.x, oldRect.y, rectWidth, oldRect.height);
+
+ dataZoom.SetVerticesDirty();
+ if (dataZoom.marqueeStyle.onGoing != null)
+ dataZoom.marqueeStyle.onGoing(dataZoom);
+ return;
+ }
+ else
+ {
+ switch (dataZoom.orient)
+ {
+ case Orient.Horizonal:
+ var deltaPercent = eventData.delta.x / grid.context.width * 100;
+ OnDragInside(dataZoom, deltaPercent);
+ OnDragSlider(dataZoom, deltaPercent);
+ break;
+ case Orient.Vertical:
+ deltaPercent = eventData.delta.y / grid.context.height * 100;
+ OnDragInside(dataZoom, deltaPercent);
+ OnDragSlider(dataZoom, deltaPercent);
+ break;
+ }
}
}
@@ -157,6 +198,23 @@ namespace XCharts.Runtime
return;
var dataZoom = component;
+
+ if (dataZoom.supportMarquee)
+ {
+ 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);
+ }
+ if (dataZoom.marqueeStyle.onEnd != null)
+ {
+ dataZoom.marqueeStyle.onEnd(dataZoom);
+ }
+ return;
+ }
if (dataZoom.context.isDrag || dataZoom.context.isStartDrag || dataZoom.context.isEndDrag ||
dataZoom.context.isCoordinateDrag)
{
@@ -208,6 +266,7 @@ namespace XCharts.Runtime
UpdateDataZoomRange(dataZoom, start, end);
}
}
+
public override void OnScroll(PointerEventData eventData)
{
if (chart == null)
@@ -215,14 +274,14 @@ namespace XCharts.Runtime
if (Input.touchCount > 1)
return;
- Vector2 pos;
- if (!chart.ScreenPointToChartPoint(eventData.position, out pos))
- return;
-
var dataZoom = component;
if (!dataZoom.enable || dataZoom.zoomLock)
return;
+ Vector2 pos;
+ if (!chart.ScreenPointToChartPoint(eventData.position, out pos))
+ return;
+
var grid = chart.GetGridOfDataZoom(dataZoom);
if ((dataZoom.supportInside && dataZoom.supportInsideScroll && grid.Contains(pos)) ||
dataZoom.IsInZoom(pos))
@@ -614,5 +673,13 @@ namespace XCharts.Runtime
break;
}
}
+
+ private void DrawMarquee(VertexHelper vh, DataZoom dataZoom)
+ {
+ if (!dataZoom.enable || !dataZoom.supportMarquee)
+ return;
+ var areaColor = dataZoom.marqueeStyle.areaStyle.GetColor(chart.theme.dataZoom.dataAreaColor);
+ UGL.DrawRectangle(vh, dataZoom.context.marqueeRect, areaColor);
+ }
}
}
\ No newline at end of file
diff --git a/Runtime/Component/Label/LabelLine.cs b/Runtime/Component/Label/LabelLine.cs
index d092af18..87ae5854 100644
--- a/Runtime/Component/Label/LabelLine.cs
+++ b/Runtime/Component/Label/LabelLine.cs
@@ -36,8 +36,8 @@ namespace XCharts.Runtime
[SerializeField] private float m_LineGap = 1.0f;
[SerializeField] private float m_LineLength1 = 25f;
[SerializeField] private float m_LineLength2 = 15f;
- [SerializeField] private SymbolStyle m_StartSymbol = new SymbolStyle() { type = SymbolType.Circle, size = 3 };
- [SerializeField] private SymbolStyle m_EndSymbol = new SymbolStyle() { type = SymbolType.Circle, size = 3 };
+ [SerializeField] private SymbolStyle m_StartSymbol = new SymbolStyle() { show = false, type = SymbolType.Circle, size = 3 };
+ [SerializeField] private SymbolStyle m_EndSymbol = new SymbolStyle() { show = false, type = SymbolType.Circle, size = 3 };
public void Reset()
{
diff --git a/Runtime/Component/Tooltip/TooltipHandler.cs b/Runtime/Component/Tooltip/TooltipHandler.cs
index bfdd627b..b927fe61 100644
--- a/Runtime/Component/Tooltip/TooltipHandler.cs
+++ b/Runtime/Component/Tooltip/TooltipHandler.cs
@@ -283,8 +283,10 @@ namespace XCharts.Runtime
{
if (isTriggerAxis)
{
+ var index = serie.context.dataZoomStartIndex + (int) xAxis.context.pointerValue;
serie.context.pointerEnter = true;
- serie.context.pointerAxisDataIndexs.Add(serie.context.dataZoomStartIndex + (int) xAxis.context.pointerValue);
+ serie.context.pointerAxisDataIndexs.Add(index);
+ serie.context.pointerItemDataIndex = index;
xAxis.context.axisTooltipValue = xAxis.context.pointerValue;
}
}
@@ -562,7 +564,7 @@ namespace XCharts.Runtime
break;
Vector2 sp = new Vector2(pX, grid.context.y);
Vector2 ep = new Vector2(pX, grid.context.y + grid.context.height);
- var lineColor = TooltipHelper.GetLineColor(tooltip, chart.theme);
+ var lineColor = TooltipHelper.GetLineColor(tooltip, chart.theme.tooltip.lineColor);
ChartDrawer.DrawLineStyle(vh, lineType, lineWidth, sp, ep, lineColor);
if (tooltip.type == Tooltip.Type.Corss)
{
@@ -580,11 +582,12 @@ namespace XCharts.Runtime
if (pX < grid.context.x)
break;
float pY = grid.context.y + grid.context.height;
- Vector3 p1 = new Vector3(pX, grid.context.y);
- Vector3 p2 = new Vector3(pX, pY);
- Vector3 p3 = new Vector3(pX + tooltipSplitWid, pY);
- Vector3 p4 = new Vector3(pX + tooltipSplitWid, grid.context.y);
- UGL.DrawQuadrilateral(vh, p1, p2, p3, p4, chart.theme.tooltip.areaColor);
+ Vector3 p1 = chart.ClampInGrid(grid,new Vector3(pX, grid.context.y));
+ Vector3 p2 = chart.ClampInGrid(grid,new Vector3(pX, pY));
+ Vector3 p3 = chart.ClampInGrid(grid,new Vector3(pX + tooltipSplitWid, pY));
+ Vector3 p4 = chart.ClampInGrid(grid,new Vector3(pX + tooltipSplitWid, grid.context.y));
+ var areaColor = TooltipHelper.GetLineColor(tooltip, chart.theme.tooltip.areaColor);
+ UGL.DrawQuadrilateral(vh, p1, p2, p3, p4, areaColor);
}
break;
}
@@ -625,7 +628,7 @@ namespace XCharts.Runtime
break;
Vector2 sp = new Vector2(grid.context.x, pY);
Vector2 ep = new Vector2(grid.context.x + grid.context.width, pY);
- var lineColor = TooltipHelper.GetLineColor(tooltip, chart.theme);
+ var lineColor = TooltipHelper.GetLineColor(tooltip, chart.theme.tooltip.lineColor);
ChartDrawer.DrawLineStyle(vh, lineType, lineWidth, sp, ep, lineColor);
if (tooltip.type == Tooltip.Type.Corss)
{
@@ -660,7 +663,7 @@ namespace XCharts.Runtime
if (tooltip.context.angle < 0) return;
var theme = chart.theme;
var m_AngleAxis = ComponentHelper.GetAngleAxis(chart.components, m_Polar.index);
- var lineColor = TooltipHelper.GetLineColor(tooltip, theme);
+ var lineColor = TooltipHelper.GetLineColor(tooltip, theme.tooltip.lineColor);
var lineType = tooltip.lineStyle.GetType(theme.tooltip.lineType);
var lineWidth = tooltip.lineStyle.GetWidth(theme.tooltip.lineWidth);
var cenPos = m_Polar.context.center;
diff --git a/Runtime/Component/Tooltip/TooltipHelper.cs b/Runtime/Component/Tooltip/TooltipHelper.cs
index 8f9d729d..eeae3318 100644
--- a/Runtime/Component/Tooltip/TooltipHelper.cs
+++ b/Runtime/Component/Tooltip/TooltipHelper.cs
@@ -87,7 +87,7 @@ namespace XCharts.Runtime
else return tooltip.numericFormatter;
}
- public static Color32 GetLineColor(Tooltip tooltip, ThemeStyle theme)
+ public static Color32 GetLineColor(Tooltip tooltip, Color32 defaultColor)
{
var lineStyle = tooltip.lineStyle;
if (!ChartHelper.IsClearColor(lineStyle.color))
@@ -96,7 +96,7 @@ namespace XCharts.Runtime
}
else
{
- var color = theme.tooltip.lineColor;
+ var color = defaultColor;
ChartHelper.SetColorOpacity(ref color, lineStyle.opacity);
return color;
}
diff --git a/Runtime/Internal/BaseChart.API.cs b/Runtime/Internal/BaseChart.API.cs
index 5a3330ee..84847cca 100644
--- a/Runtime/Internal/BaseChart.API.cs
+++ b/Runtime/Internal/BaseChart.API.cs
@@ -360,8 +360,10 @@ namespace XCharts.Runtime
/// fadeIn animation.
/// |开始渐入动画。
///
- public void AnimationFadeIn()
+ public void AnimationFadeIn(bool reset = true)
{
+ if (reset)
+ AnimationReset();
foreach (var serie in m_Series) serie.AnimationFadeIn();
}
diff --git a/Runtime/Internal/BaseChart.Serie.cs b/Runtime/Internal/BaseChart.Serie.cs
index 7e0f3701..99ec7bc4 100644
--- a/Runtime/Internal/BaseChart.Serie.cs
+++ b/Runtime/Internal/BaseChart.Serie.cs
@@ -705,7 +705,7 @@ namespace XCharts.Runtime
///
///
///
- public void UdpateXAxisIcon(int index, Sprite icon, int xAxisIndex = 0)
+ public void UpdateXAxisIcon(int index, Sprite icon, int xAxisIndex = 0)
{
var xAxis = GetChartComponent(xAxisIndex);
if (xAxis != null)
diff --git a/Runtime/Internal/XChartsMgr.cs b/Runtime/Internal/XChartsMgr.cs
index 654d359d..584ce315 100644
--- a/Runtime/Internal/XChartsMgr.cs
+++ b/Runtime/Internal/XChartsMgr.cs
@@ -20,8 +20,8 @@ namespace XCharts.Runtime
[ExecuteInEditMode]
public static class XChartsMgr
{
- public static readonly string version = "3.4.0";
- public static readonly int versionDate = 20221101;
+ public static readonly string version = "3.5.0";
+ public static readonly int versionDate = 20221201;
public static string fullVersion { get { return version + "-" + versionDate; } }
internal static List chartList = new List();
diff --git a/Runtime/Serie/Pie/PieHandler.cs b/Runtime/Serie/Pie/PieHandler.cs
index 1b8322ae..96b8b017 100644
--- a/Runtime/Serie/Pie/PieHandler.cs
+++ b/Runtime/Serie/Pie/PieHandler.cs
@@ -516,6 +516,7 @@ namespace XCharts.Runtime
break;
}
}
+ DrawLabelLineSymbol(vh, labelLine, pos1, pos5, color);
}
}
diff --git a/Runtime/Serie/Radar/RadarHandler.cs b/Runtime/Serie/Radar/RadarHandler.cs
index df9dbbf5..8fb0d2fb 100644
--- a/Runtime/Serie/Radar/RadarHandler.cs
+++ b/Runtime/Serie/Radar/RadarHandler.cs
@@ -381,7 +381,7 @@ namespace XCharts.Runtime
var lineStyle = SerieHelper.GetLineStyle(serie, serieData);
Color32 areaColor, areaToColor;
var colorIndex = serie.colorByData?j : serie.context.colorIndex;
- var showArea = SerieHelper.GetAreaColor(out areaColor, out areaToColor, serie, serieData, chart.theme, colorIndex);
+ var showArea = SerieHelper.GetAreaColor(out areaColor, out areaToColor, serie, serieData, chart.theme, colorIndex - 1);
var lineColor = SerieHelper.GetLineColor(serie, serieData, chart.theme, colorIndex);
int dataCount = m_RadarCoord.indicatorList.Count;
var index = serieData.index;
@@ -435,6 +435,7 @@ namespace XCharts.Runtime
if (showArea && j == endIndex && !serie.smooth)
{
+ SerieHelper.GetAreaColor(out areaColor, out areaToColor, serie, serieData, chart.theme, colorIndex);
UGL.DrawTriangle(vh, startPoint, firstPoint, centerPos, areaColor, areaColor, areaToColor);
}
if (lineStyle.show && j == endIndex && !serie.smooth)
diff --git a/Runtime/Serie/Ring/RingHandler.cs b/Runtime/Serie/Ring/RingHandler.cs
index 8c7828ba..08fdcd29 100644
--- a/Runtime/Serie/Ring/RingHandler.cs
+++ b/Runtime/Serie/Ring/RingHandler.cs
@@ -407,22 +407,8 @@ namespace XCharts.Runtime
UGL.DrawLine(vh, pos1, pos5, labelLine.lineWidth, color);
break;
}
- if (labelLine.startSymbol != null && labelLine.startSymbol.show)
- {
- DrawSymbol(vh, labelLine.startSymbol, pos1, color);
- }
- if (labelLine.endSymbol != null && labelLine.endSymbol.show)
- {
- DrawSymbol(vh, labelLine.endSymbol, pos5, color);
- }
+ DrawLabelLineSymbol(vh, labelLine, pos1, pos5, color);
}
}
-
- private void DrawSymbol(VertexHelper vh, SymbolStyle symbol, Vector3 pos, Color32 defaultColor)
- {
- var color = symbol.GetColor(defaultColor);
- chart.DrawSymbol(vh, symbol.type, symbol.size, 1, pos,
- color, color, ColorUtil.clearColor32, color, symbol.gap, null);
- }
}
}
\ No newline at end of file
diff --git a/Runtime/Serie/Serie.cs b/Runtime/Serie/Serie.cs
index 478bd67e..5cabe856 100644
--- a/Runtime/Serie/Serie.cs
+++ b/Runtime/Serie/Serie.cs
@@ -252,6 +252,7 @@ namespace XCharts.Runtime
[SerializeField] private BarType m_BarType = BarType.Normal;
[SerializeField] private bool m_BarPercentStack = false;
[SerializeField] private float m_BarWidth = 0;
+ [SerializeField][Since("v3.5.0")] private float m_BarMaxWidth = 0;
[SerializeField] private float m_BarGap = 0.1f;
[SerializeField] private float m_BarZebraWidth = 4f;
[SerializeField] private float m_BarZebraGap = 2f;
@@ -573,6 +574,15 @@ namespace XCharts.Runtime
set { if (PropertyUtil.SetStruct(ref m_BarWidth, value)) SetVerticesDirty(); }
}
///
+ /// The max width of the bar. Adaptive when default 0.
+ /// |柱条的最大宽度，默认为0为不限制最大宽度。支持设置成相对于类目宽度的百分比。
+ ///
+ public float barMaxWidth
+ {
+ get { return m_BarMaxWidth; }
+ set { if (PropertyUtil.SetStruct(ref m_BarMaxWidth, value)) SetVerticesDirty(); }
+ }
+ ///
/// The gap between bars between different series, is a percent value like '0.3f' , which means 30% of the bar width, can be set as a fixed value.
/// Set barGap as '-1' can overlap bars that belong to different series, which is useful when making a series of bar be background.
/// In a single coodinate system, this attribute is shared by multiple 'bar' series.
@@ -1742,17 +1752,32 @@ namespace XCharts.Runtime
public float GetBarWidth(float categoryWidth, int barCount = 0)
{
- if (categoryWidth < 2) return categoryWidth;
- if (m_BarWidth == 0)
+ var realWidth = 0f;
+ if (categoryWidth < 2)
+ {
+ realWidth = categoryWidth;
+ }
+ else if (m_BarWidth == 0)
{
var width = ChartHelper.GetActualValue(0.6f, categoryWidth);
if (barCount == 0)
- return width < 1 ? categoryWidth : width;
+ realWidth = width < 1 ? categoryWidth : width;
else
- return width / barCount;
+ realWidth = width / barCount;
}
else
- return ChartHelper.GetActualValue(m_BarWidth, categoryWidth);
+ {
+ realWidth = ChartHelper.GetActualValue(m_BarWidth, categoryWidth);
+ }
+ if (m_BarMaxWidth == 0)
+ {
+ return realWidth;
+ }
+ else
+ {
+ var maxWidth = ChartHelper.GetActualValue(m_BarMaxWidth, categoryWidth);
+ return realWidth > maxWidth ? maxWidth : realWidth;
+ }
}
public bool IsIgnoreIndex(int index, int dimension = 1)
diff --git a/Runtime/Serie/SerieHandler.cs b/Runtime/Serie/SerieHandler.cs
index ce6eb8e8..401fbb43 100644
--- a/Runtime/Serie/SerieHandler.cs
+++ b/Runtime/Serie/SerieHandler.cs
@@ -579,7 +579,7 @@ namespace XCharts.Runtime
param.dataCount = serie.dataCount;
param.value = serieData.GetData(param.dimension);
param.ignore = ignore;
- param.total = SerieHelper.GetMaxData(serie, dimension);
+ param.total = serie.multiDimensionLabel? serieData.GetTotalData() : serie.GetDataTotal(defaultDimension);
param.color = color;
param.marker = SerieHelper.GetItemMarker(serie, serieData, marker);
param.itemFormatter = itemFormatter;
@@ -593,5 +593,24 @@ namespace XCharts.Runtime
paramList.Add(param);
}
+
+ public void DrawLabelLineSymbol(VertexHelper vh, LabelLine labelLine, Vector3 startPos, Vector3 endPos, Color32 defaultColor)
+ {
+ if (labelLine.startSymbol != null && labelLine.startSymbol.show)
+ {
+ DrawSymbol(vh, labelLine.startSymbol, startPos, defaultColor);
+ }
+ if (labelLine.endSymbol != null && labelLine.endSymbol.show)
+ {
+ DrawSymbol(vh, labelLine.endSymbol, endPos, defaultColor);
+ }
+ }
+
+ private void DrawSymbol(VertexHelper vh, SymbolStyle symbol, Vector3 pos, Color32 defaultColor)
+ {
+ var color = symbol.GetColor(defaultColor);
+ chart.DrawSymbol(vh, symbol.type, symbol.size, 1, pos,
+ color, color, ColorUtil.clearColor32, color, symbol.gap, null);
+ }
}
}
\ No newline at end of file
diff --git a/package.json b/package.json
index d855a1d3..1a863972 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
{
"name": "com.monitor1394.xcharts",
"displayName": "XCharts",
- "version": "3.4.0",
- "date": "20221101",
+ "version": "3.5.0",
+ "date": "20221201",
"checkdate": "20221101",
"desc": "如果 XCharts 对您有帮助，希望您能在 Github 上点 Star 支持，非常感谢！",
"unity": "2018.3",