Compare commits

...

35 Commits

Author SHA1 Message Date
monitor1394
419c704b23 v3.0.0-preivew8 2022-04-26 08:26:37 +08:00
monitor1394
9dedc1db68 v3.0.0-preivew8 2022-04-26 08:24:45 +08:00
monitor1394
f11ee84517 [optimize][label] support label rotate 2022-04-19 13:30:24 +08:00
monitor1394
dfa978afe0 [optimize][visualmap] support horizontal gradient 2022-04-19 07:22:47 +08:00
monitor1394
4e6658ad70 [optimize][bar] optimize border and capsule 2022-04-18 08:20:16 +08:00
monitor1394
ef5988a851 [enhancement][liquid] support round rect vessel 2022-04-15 13:12:19 +08:00
monitor1394
5d6c5b5f79 [doc] update api doc 2022-04-14 21:42:40 +08:00
monitor1394
80e4475f65 [enhancement][line] line support end label 2022-04-14 21:32:44 +08:00
monitor1394
84cf39df4d [doc] update doc 2022-04-13 22:04:45 +08:00
monitor1394
d44bf55a87 [add][VisualMap] add workOnLine and workOnArea (#191) 2022-04-13 22:03:23 +08:00
monitor1394
ad273cf1b1 [optimize] optimize interact and performance 2022-04-13 13:33:09 +08:00
monitor1394
a3d2d3f1d5 [optimize] optimize interact and performance 2022-04-13 13:26:46 +08:00
monitor1394
7ca4ddcb88 [optimize] radar support area tooltip 2022-04-12 08:09:18 +08:00
monitor1394
9a3461084c [doc] update readme 2022-04-11 21:54:09 +08:00
monitor1394
09df6fa73d [doc] update doc 2022-04-11 21:49:18 +08:00
monitor1394
be4ed41ca6 [optimize] visualmap 2022-04-09 21:30:28 +08:00
monitor1394
e2b0c935e0 [optimize] tooltip 2022-04-09 11:03:41 +08:00
monitor1394
e4fac71987 v3.0.0-preivew7 2022-04-07 08:38:17 +08:00
monitor1394
20825c148f [doc] update api and configuration 2022-04-07 08:36:14 +08:00
monitor1394
5476fa8d09 [setting] update setting 2022-04-07 08:35:20 +08:00
monitor1394
80c77fc69a [optimize] Pie support startAngle 2022-04-07 08:35:03 +08:00
monitor1394
621bc3dcfd [bug] Fix pie color 2022-04-07 08:16:50 +08:00
monitor1394
1ed0ff377a fix add main component error 2022-03-31 21:54:34 +08:00
monitor1394
426d437e6d fixed axis label custom color 2022-03-30 13:15:24 +08:00
monitor1394
6c0dcbbcbb 3.0 2022-03-30 08:25:48 +08:00
monitor1394
4ade064266 3.0 2022-03-30 08:24:47 +08:00
monitor1394
1ad87920d0 3.0 2022-03-29 22:06:10 +08:00
monitor1394
b784900fda 3.0 2022-03-28 19:28:39 +08:00
monitor1394
acba2f5c1e 3.0 2022-03-27 12:49:20 +08:00
monitor1394
3bccbd0ab2 3.0 2022-03-26 22:28:23 +08:00
monitor1394
327661bfdd Create FUNDING.yml 2022-03-26 22:05:59 +08:00
monitor1394
ed393ea560 3.0 2022-03-26 21:34:38 +08:00
monitor1394
3fbf5bc906 3.0 2022-03-26 18:30:55 +08:00
monitor1394
b7efcf87cf 3.0 2022-03-26 18:26:34 +08:00
monitor1394
1aea9f3cfe 3.0 2022-03-26 17:20:52 +08:00
144 changed files with 3404 additions and 3250 deletions

13
.github/FUNDING.yml vendored Normal file
View File

@@ -0,0 +1,13 @@
# These are supported funding model platforms
github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
patreon: # Replace with a single Patreon username
open_collective: # Replace with a single Open Collective username
ko_fi: # Replace with a single Ko-fi username
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
liberapay: # Replace with a single Liberapay username
issuehunt: # Replace with a single IssueHunt username
otechie: # Replace with a single Otechie username
lfx_crowdfunding: # Replace with a single LFX Crowdfunding project-name e.g., cloud-foundry
custom: ['https://www.paypal.com/paypalme/monitor1394','https://github.com/XCharts-Team/XCharts/blob/master/Documentation/res/alipay.png']

View File

@@ -1,11 +1,19 @@
# 更新日志
[master](#master)
[master](#master)
[v3.0.0-preivew8](#v3.0.0-preivew8)
[v3.0.0-preivew7](#v3.0.0-preivew7)
[v3.0.0-preivew6](#v3.0.0-preivew6)
[v3.0.0-preivew5](#v3.0.0-preivew5)
[v3.0.0-preivew4](#v3.0.0-preivew4)
[v3.0.0-preivew3](#v3.0.0-preivew3)
[v3.0.0-preivew2](#v3.0.0-preivew2)
[v3.0.0-preivew1](#v3.0.0-preivew1)
[v2.7.0](#v2.7.0)
[v2.6.0](#v2.6.0)
[v2.5.0](#v2.5.0)
[v2.4.0](#v2.4.0)
[v2.4.0](#v2.4.0)
[v2.3.0](#v2.3.0)
[v2.2.3](#v2.2.3)
[v2.2.2](#v2.2.2)
@@ -43,6 +51,53 @@
## master
## v3.0.0-preivew8
* (2022.04.26) 发布`v3.0.0-preivew8`版本
* (2022.04.23) 移除`Serie``IconStyle`组件
* (2022.04.23) 强化`LabelStyle`,所有组件的`TextStyle`都升级为`LabelStyle`
* (2022.04.19) 增加`Label``rotate`支持设置旋转
* (2022.04.17) 修复`Bar`在数值为负数时动画无效的问题
* (2022.04.17) 增加`ItemStyle``BorderGap`支持设置边框间距
* (2022.04.16) 优化`Bar``Border``Capsule`胶囊柱图
* (2022.04.15) 增加`Liquid``Round Rect`圆角矩形水位图的支持
* (2022.04.14) 增加`Line``EndLabel`的支持
* (2022.04.13) 增加`VisualMap``workOnLine``workOnArea`支持折线和区域映射功能 (#191)
* (2022.04.12) 优化`Radar`支持`Area`区域触发`Tooltip`
* (2022.04.09) 优化`VisualMap`
* (2022.04.09) 优化`Tooltip`
## v3.0.0-preivew7
* (2022.04.07) 发布`v3.0.0-preivew7`版本
* (2022.04.07) 修复`Pie`颜色不刷新的问题
* (2022.03.31) 修复`Add Main Component`添加组件异常的问题
* (2022.03.30) 修复`Axis`无法自定义`Label`颜色的问题
## v3.0.0-preivew6
* (2022.03.30) 发布`v3.0.0-preivew6`版本
## v3.0.0-preivew5
* (2022.03.26) 发布`v3.0.0-preivew5`版本
## v3.0.0-preivew4
* (2022.03.21) 发布`v3.0.0-preivew4`版本
## v3.0.0-preivew3
* (2022.03.09) 发布`v3.0.0-preivew3`版本
## v3.0.0-preivew2
* (2022.01.08) 发布`v3.0.0-preivew2`版本
## v3.0.0-preivew1
* (2022.01.07) 发布`v3.0.0-preivew1`版本
## v2.7.0
* (2022.03.20) 发布`v2.7.0`版本
@@ -269,7 +324,7 @@
## v1.6.0
* (2020.08.24) 发布`v1.6.0`版本
* (2020.08.23) 重构代码,将与绘制相关的`Color`改为`Color32`,减少隐式转换(更新后会导致自定义的颜色丢失,可参考[问答29](https://github.com/XCharts-Team/XCharts/blob/master/Assets/XCharts/Documentation/XChartsFQA-ZH.md)进行升级)
* (2020.08.23) 重构代码,将与绘制相关的`Color`改为`Color32`,减少隐式转换(更新后会导致自定义的颜色丢失,可参考[问答29](https://github.com/XCharts-Team/XCharts/blob/master/Assets/XCharts/Documentation/XChartsFAQ-ZH.md)进行升级)
* (2020.08.15) 优化`PieChart`绘制表现效果#85
* (2020.08.11) 增加`LiquidChart`数据变更动画#83
* (2020.08.11) 优化`PieChart`文本堆叠和引线效果#85

View File

@@ -39,6 +39,12 @@
## master
* (2022.04.23) Remove `Serie` `IconStyle` component
* (2022.04.23) Enhance `LabelStyle`, all components `TextStyle` will be upgraded to `LabelStyle`
* (2022.04.19) Added `Label` `rotate` to support setting rotation
* (2022.04.17) Fixed animation invalidation of `Bar` when the value is negative
* (2022.04.17) Added `BorderGap` support for `ItemStyle` to set border spacing
* (2022.04.16) Optimize the `Border` and `Capsule` histogram of `Bar`
* (2021.08.15) Fixed the problem of displaying exceptions after adding data again when `DataZoom` is enable (#163)
* (2021.08.15) Improved `Axis`'s `AxisLabel` text rotate setting to avoid inconsistency offset in `DataZoom` (#163)
* (2021.08.14) Added `Legend`'s `textAutoColor` to set the text color match with `Serie` color (#163)
@@ -215,7 +221,7 @@ Since the data type is upgraded to `double`, the implicit conversion of `float`
## v1.6.0
* (2020.08.24) Release `v1.6.0` version
* (2020.08.23) Refactor code, replace `Color` with `Color32` for reduce implicit conversion (Can cause custom colors to lose, reference [Q&A 29](https://github.com/XCharts-Team/XCharts/blob/master/Assets/XCharts/Documentation/XChartsFQA-ZH.md) to upgrade)
* (2020.08.23) Refactor code, replace `Color` with `Color32` for reduce implicit conversion (Can cause custom colors to lose, reference [FAQ 29](https://github.com/XCharts-Team/XCharts/blob/master/Assets/XCharts/Documentation/XChartsFAQ-ZH.md) to upgrade)
* (2020.08.15) Optimized `PieChart` drawing performance effect #85
* (2020.08.11) Added `LiquidChart` data change animation#83
* (2020.08.11) Optimized `PieChart` text stack and lead line effects#85

View File

@@ -4,34 +4,34 @@
## 订阅服务
| |免费用户|个人`1``VIP`|个人`2``VIP` | 个人长期`VIP` |
| ----- |--|--|--|--|
| 订阅费用 | -- | `298`¥ | `498`¥ | `888`¥ |
| 席位时长 | -- | `1`个席位<br>`1`年 | `1`个席位<br>`2`年 | `1`个席位<br>`长期` |
||
| |免费用户|付费咨询|个人`1``VIP`|个人`2``VIP` | 个人长期`VIP` |
| ----- |--|--|--|--|--|
| 订阅费用 | -- | `98`¥ | `298`¥ | `498`¥ | `888`¥ |
| 席位时长 | -- | `1`个席位<br>`7`天,`7`小时* | `1`个席位<br>`1`年 | `1`个席位<br>`2`年 | `1`个席位<br>`长期` |
| <b>`服务方式:`</b>|
| 官方QQ群交流 | √ | √ | √ | √ |
| 专属VIP群交流 | | √ | √ | √ |
| 即时一对一交流 | | √ | √ | √ |
||
| 官方QQ群交流 | √ | √ | √ | √ | √ |
| 即时一对一交流 | | √ | √ | √ | √ |
| 专属VIP群交流 | | | √ | √ | √ |
| <b>`服务内容:`</b>|
| 可商用 | √ | √ | √ | √ |
| 可二次开发 | √ | √ | √ | √ |
| 有问必答 | | √ | √ | √ |
| 新手指导 | | √ | √ | √ |
| 开发指导 | | √ | √ | √ |
| 优化指导 | | √ | √ | √ |
| 其他技术支持 | | √ | √ | √ |
| 问题及时处理 | | √ | √ | √ |
| 需求优先考虑 | | √ | √ | √ |
| 可另付费定制 | | √ | √ | √ |
| 可另付费加急 | | √ | √ | √ |
| 付费模块85折 | | | | √ |
| 可商用 | √ | √ | √ | √ | √ |
| 可二次开发 | √ | √ | √ | √ | √ |
| 有问必答 | | √ | √ | √ | √ |
| 即时回应 | | √ | √ | √ | √ |
| 新手指导 | | √ | √ | √ | √ |
| 开发指导 | | √ | √ | √ | √ |
| 优化指导 | | √ | √ | √ | √ |
| 其他技术支持 | | | √ | √ | √ |
| 问题及时处理 | | | √ | √ | √ |
| 需求优先考虑 | | | √ | √ | √ |
| 可另付费定制 | | | √ | √ | √ |
| 可另付费加急 | | | √ | √ | √ |
| 付费图表优惠 | | | 95折 | 95折 | 85折 |
## 备注说明
1. __`付费定制`__ 是指用户可根据自己的需求定制不同的图表或新功能,只有`VIP`用户才享有`付费定制`权利。
2. __`付费加急`__ 是指用户可对自己非常紧急的需求进行付费,将开发优先级提到最高,并指定`Deadline`内交付,只有`VIP`用户才享有`付费加急`权利。
2. __`付费加急`__ 是指用户可对自己非常紧急的需求进行付费,将开发优先级提到最高,并可要求在`Deadline`内交付,只有`VIP`用户才享有`付费加急`权利。
3. __`付费咨询`__ 付费咨询有效期`7`天,且总咨询时长不超过`7`个小时。
## 捐助支持

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -2,7 +2,7 @@
[XCharts Homepage](https://github.com/XCharts-Team/XCharts)</br>
[XCharts API](XChartsAPI-EN.md)</br>
[XCharts Q&A](XChartsFQA-EN.md)
[XCharts FAQ](XChartsFAQ-EN.md)
## Serie
@@ -22,6 +22,25 @@
- [SimplifiedCandlestick](#SimplifiedCandlestick)
- [SimplifiedLine](#SimplifiedLine)
## Theme
- [AngleAxisTheme](#AngleAxisTheme)
- [AxisTheme](#AxisTheme)
- [BaseAxisTheme](#BaseAxisTheme)
- [ComponentTheme](#ComponentTheme)
- [DataZoomTheme](#DataZoomTheme)
- [LegendTheme](#LegendTheme)
- [PolarAxisTheme](#PolarAxisTheme)
- [RadarAxisTheme](#RadarAxisTheme)
- [RadiusAxisTheme](#RadiusAxisTheme)
- [SerieTheme](#SerieTheme)
- [SubTitleTheme](#SubTitleTheme)
- [Theme](#Theme)
- [ThemeStyle](#ThemeStyle)
- [TitleTheme](#TitleTheme)
- [TooltipTheme](#TooltipTheme)
- [VisualMapTheme](#VisualMapTheme)
## MainComponent
- [AngleAxis](#AngleAxis)
@@ -68,6 +87,7 @@
- [Emphasis](#Emphasis)
- [EndLabelStyle](#EndLabelStyle)
- [IconStyle](#IconStyle)
- [ImageStyle](#ImageStyle)
- [ItemStyle](#ItemStyle)
- [LabelLine](#LabelLine)
- [LabelStyle](#LabelStyle)
@@ -76,6 +96,7 @@
- [LevelStyle](#LevelStyle)
- [LineArrow](#LineArrow)
- [LineStyle](#LineStyle)
- [Location](#Location)
- [MarkAreaData](#MarkAreaData)
- [MarkLineData](#MarkLineData)
- [PolarAxisTheme](#PolarAxisTheme)
@@ -87,6 +108,7 @@
- [SubTitleTheme](#SubTitleTheme)
- [SymbolStyle](#SymbolStyle)
- [TextLimit](#TextLimit)
- [TextPadding](#TextPadding)
- [TextStyle](#TextStyle)
- [ThemeStyle](#ThemeStyle)
- [TitleStyle](#TitleStyle)
@@ -99,7 +121,7 @@
- [AreaStyle](#AreaStyle)
- [Emphasis](#Emphasis)
- [IconStyle](#IconStyle)
- [ImageStyle](#ImageStyle)
- [LabelLine](#LabelLine)
- [LabelStyle](#LabelStyle)
- [LineArrow](#LineArrow)
@@ -109,7 +131,7 @@
- [AreaStyle](#AreaStyle)
- [Emphasis](#Emphasis)
- [IconStyle](#IconStyle)
- [ImageStyle](#ImageStyle)
- [ItemStyle](#ItemStyle)
- [LabelLine](#LabelLine)
- [LabelStyle](#LabelStyle)
@@ -125,9 +147,9 @@
- [DebugInfo](#DebugInfo)
- [Indicator](#Indicator)
- [Lang](#Lang)
- [LangCandlestick](#LangCandlestick)
- [LangTime](#LangTime)
- [MainComponent](#MainComponent)
- [Theme](#Theme)
- [XCResourcesImporter](#XCResourcesImporter)
- [XCSettings](#XCSettings)
@@ -223,7 +245,6 @@ The axis in rectangular coordinate.
| `inverse` |false | Whether the axis are reversed or not. Invalid in `Category` axis. |
| `clockwise` |true | Whether the positive position of axis is in clockwise. True for clockwise by default. |
| `insertDataToHead` | | Whether to add new data at the head or at the end of the list. |
| `iconStyle` | | 图标样式。 [IconStyle](IconStyle)|
| `icons` | | 类目数据对应的图标。 |
| `data` | | Category data, available in type: 'Category' axis. |
| `axisLine` | | [AxisLine](AxisLine)|
@@ -235,26 +256,19 @@ The axis in rectangular coordinate.
## `AxisLabel`
Inherits or Implemented: [ChildComponent](#ChildComponent)
Inherits or Implemented: [LabelStyle](#LabelStyle)
Settings related to axis label.
|field|default|comment|
|--|--|--|
| `show` |true | Set this to false to prevent the axis label from appearing. |
| `formatter` | | |
| `interval` |0 | The display interval of the axis label. |
| `inside` |false | Set this to true so the axis labels face the inside direction. |
| `distance` | | The distance between the axis label and the axis line. |
| `numericFormatter` | | Standard numeric format strings. |
| `showAsPositiveNumber` |false | Show negative number as positive number. |
| `onZero` |false | 刻度标签显示在0刻度上。 |
| `width` |0f | 文本的宽。为0时会自动匹配。 |
| `height` |0f | 文本的高。为0时会自动匹配。 |
| `showStartLabel` |true | Whether to display the first label. |
| `showEndLabel` |true | Whether to display the last label. |
| `textLimit` | | 文本限制。 [TextLimit](TextLimit)|
| `textStyle` | | The text style of axis name. [TextStyle](TextStyle)|
## `AxisLine`
@@ -278,9 +292,7 @@ the name of axis.
|--|--|--|
| `show` | | Whether to show axis name. |
| `name` | | the name of axis. |
| `formatter` | | The formatter of indicator's name. |
| `location` | | Location of axis name.</br>`AxisName.Location`:</br>- `Start`: the location of axis name.</br>- `Middle`: the location of axis name.</br>- `End`: the location of axis name.</br>- `align`: 对齐方式。</br>- `left`: Distance between component and the left side of the container.</br>- `right`: Distance between component and the left side of the container.</br>- `top`: Distance between component and the left side of the container.</br>- `bottom`: Distance between component and the left side of the container.</br>|
| `textStyle` | | The text style of axis name. [TextStyle](TextStyle)|
| `labelStyle` | | The text style of axis name. [LabelStyle](LabelStyle)|
## `AxisSplitArea`
@@ -430,7 +442,7 @@ DataZoom component is used for zooming a specific area, which enables user to in
| `filterMode` | | The mode of data filter.</br>`DataZoom.FilterMode`:</br>- `Filter`: data that outside the window will be filtered, which may lead to some changes of windows of other axes. For each data item, it will be filtered if one of the relevant dimensions is out of the window.</br>- `WeakFilter`: data that outside the window will be filtered, which may lead to some changes of windows of other axes. For each data item, it will be filtered only if all of the relevant dimensions are out of the same side of the window.</br>- `Empty`: data that outside the window will be set to NaN, which will not lead to changes of windows of other axes.</br>- `None`: Do not filter data.</br>|
| `xAxisIndexs` | | Specify which xAxis is controlled by the dataZoom. |
| `yAxisIndexs` | | Specify which yAxis is controlled by the dataZoom. |
| `supportInside` | | Whether built-in support is supported. |
| `supportInside` | | Whether built-in support is supported. Built into the coordinate system to allow the user to zoom in and out of the coordinate system by mouse dragging, mouse wheel, finger swiping (on the touch screen). |
| `supportInsideScroll` |true | 是否支持坐标系内滚动 |
| `supportInsideDrag` |true | 是否支持坐标系内拖拽 |
| `supportSlider` | | Whether a slider is supported. There are separate sliders on which the user zooms or roams. |
@@ -449,13 +461,13 @@ DataZoom component is used for zooming a specific area, which enables user to in
| `bottom` | | Distance between dataZoom component and the bottom side of the container. bottom value is a instant pixel value like 10 or float value [0-1]. |
| `rangeMode` | | Use absolute value or percent value in DataZoom.start and DataZoom.end.</br>`DataZoom.RangeMode`:</br>- `//Value`: The value type of start and end.取值类型</br>- `Percent`: percent value.</br>|
| `start` | | The start percentage of the window out of the data extent, in the range of 0 ~ 100. |
| `end` | | The end percentage of the window out of the data extent, in the range of 0 ~ 100. 数据窗口范围的结束百分比。范围是0 ~ 100。 |
| `end` | | The end percentage of the window out of the data extent, in the range of 0 ~ 100. |
| `startValue` | | |
| `endValue` | | |
| `minShowNum` |1 | Minimum number of display data. Minimum number of data displayed when DataZoom is enlarged to maximum. |
| `scrollSensitivity` |1.1f | The sensitivity of dataZoom scroll. The larger the number, the more sensitive it is. |
| `orient` | | Specify whether the layout of dataZoom component is horizontal or vertical. What's more, it indicates whether the horizontal axis or vertical axis is controlled by default in catesian coordinate system.</br>`Orient`:</br>- `Horizonal`: 水平</br>- `Vertical`: 垂直</br>|
| `textStyle` | | font style. [TextStyle](TextStyle)|
| `labelStyle` | | label style. [LabelStyle](LabelStyle)|
| `lineStyle` | | 阴影线条样式。 [LineStyle](LineStyle)|
| `areaStyle` | | 阴影填充样式。 [AreaStyle](AreaStyle)|
@@ -481,7 +493,7 @@ Inherits or Implemented: [ComponentTheme](#ComponentTheme)
| `showDebugInfo` |false | |
| `showAllChartObject` |false | |
| `foldSeries` |false | |
| `debugInfoTextStyle` | | [TextStyle](TextStyle)|
| `labelStyle` | | [LabelStyle](LabelStyle)|
## `EffectScatter`
@@ -531,20 +543,35 @@ Inherits or Implemented: [Serie](#Serie),[INeedSerieContainer](#INeedSerieContai
## `IconStyle`
Inherits or Implemented: [ChildComponent](#ChildComponent),[ISerieExtraComponent](#ISerieExtraComponent),[ISerieDataComponent](#ISerieDataComponent)
Inherits or Implemented: [ChildComponent](#ChildComponent)
|field|default|comment|
|--|--|--|
| `show` |false | Whether the data icon is show. |
| `layer` | | 显示在上层还是在下层。</br>`IconStyle.Layer`:</br>- `UnderLabel`: </br>- `AboveLabel`: </br>|
| `layer` | | 显示在上层还是在下层。</br>`IconStyle.Layer`:</br>- `UnderText`: The icon is display under the label text. 图标在标签文字下</br>- `AboveText`: The icon is display above the label text. 图标在标签文字上</br>|
| `align` | | 水平方向对齐方式。</br>`Align`:</br>- `Center`: 对齐方式</br>- `Left`: 对齐方式</br>- `Right`: 对齐方式</br>|
| `sprite` | | The image of icon. |
| `type` | | How to display the icon. |
| `color` | | 图标颜色。 |
| `width` |20 | 图标宽。 |
| `height` |20 | 图标高。 |
| `offset` | | 图标偏移。 |
| `autoHideWhenLabelEmpty` |false | 当label内容为空时是否自动隐藏图标 |
## `ImageStyle`
Inherits or Implemented: [ChildComponent](#ChildComponent),[ISerieExtraComponent](#ISerieExtraComponent),[ISerieDataComponent](#ISerieDataComponent)
|field|default|comment|
|--|--|--|
| `show` |true | Whether the data icon is show. |
| `sprite` | | The image of icon. |
| `type` | | How to display the image. |
| `autoColor` | | 是否自动颜色。 |
| `color` | | 图标颜色。 |
| `width` |0 | 图标宽。 |
| `height` |0 | 图标高。 |
## `Indicator`
Indicator of radar chart, which is used to assign multiple variables(dimensions) in radar chart.
@@ -592,6 +619,7 @@ Inherits or Implemented: [ChildComponent](#ChildComponent),[ISerieDataComponent]
| `centerColor` | | 中心区域颜色。 |
| `centerGap` | | 中心区域间隙。 |
| `borderWidth` |0 | 边框宽。 |
| `borderGap` |0 | 边框间隙。 |
| `borderColor` | | 边框的颜色。 |
| `borderColor0` | | 边框的颜色。 |
| `borderToColor` | | 边框的渐变色。 |
@@ -625,16 +653,17 @@ Text label of chart, to explain some data information about graphic item like va
|--|--|--|
| `show` |true | Whether the label is showed. |
| `Position` | | |
| `autoOffset` |false | 是否开启自动偏移。当开启时Y的偏移会自动判断曲线的开口来决定向上还是向下偏移。 |
| `offset` | | offset to the host graphic element. |
| `rotate` | | Rotation of label. |
| `distance` | | 距离轴线的距离。 |
| `formatter` | | |
| `paddingLeftRight` |2f | the text padding of left and right. defaut:2. |
| `paddingTopBottom` |2f | the text padding of top and bottom. defaut:2. |
| `backgroundWidth` |0 | the width of background. If set as default value 0, it means than the background width auto set as the text width. |
| `backgroundHeight` |0 | the height of background. If set as default value 0, it means than the background height auto set as the text height. |
| `numericFormatter` | | Standard numeric format strings. |
| `autoOffset` |false | 是否开启自动偏移。当开启时Y的偏移会自动判断曲线的开口来决定向上还是向下偏移。 |
| `autoColor` |false | 是否开启自动颜色。当开启时会根据已支持的serie自动设置颜色。 |
| `width` |0 | the width of label. If set as default value 0, it means than the label width auto set as the text width. |
| `height` |0 | the height of label. If set as default value 0, it means than the label height auto set as the text height. |
| `icon` | | the sytle of icon. [IconStyle](IconStyle)|
| `background` | | the sytle of background. [ImageStyle](ImageStyle)|
| `textPadding` | | the text padding of label. [TextPadding](TextPadding)|
| `textStyle` | | the sytle of text. [TextStyle](TextStyle)|
## `Lang`
@@ -644,6 +673,9 @@ Inherits or Implemented: [ScriptableObject](#ScriptableObject)
Language.
## `LangCandlestick`
## `LangTime`
@@ -659,14 +691,14 @@ Legend component.The legend component shows different sets of tags, colors, and
| `iconType` | | Type of legend.</br>`Painter.Type`:</br>- `Base`: </br>- `Serie`: </br>- `Top`: </br>|
| `selectedMode` | | Selected mode of legend, which controls whether series can be toggled displaying by clicking legends.</br>`VisualMap.SelectedMode`:</br>- `Multiple`: 多选。</br>- `Single`: 单选。</br>|
| `orient` | | Specify whether the layout of legend component is horizontal or vertical.</br>`Orient`:</br>- `Horizonal`: 水平</br>- `Vertical`: 垂直</br>|
| `location` | | The location of legend.</br>`AxisName.Location`:</br>- `Start`: the location of axis name.</br>- `Middle`: the location of axis name.</br>- `End`: the location of axis name.</br>- `align`: 对齐方式。</br>- `left`: Distance between component and the left side of the container.</br>- `right`: Distance between component and the left side of the container.</br>- `top`: Distance between component and the left side of the container.</br>- `bottom`: Distance between component and the left side of the container.</br>|
| `location` | | The location of legend. [Location](Location)|
| `itemWidth` |25.0f | Image width of legend symbol. |
| `itemHeight` |12.0f | Image height of legend symbol. |
| `itemGap` |10f | The distance between each legend, horizontal distance in horizontal layout, and vertical distance in vertical layout. |
| `itemAutoColor` |true | Whether the legend symbol matches the color automatically. |
| `textAutoColor` |false | Whether the legend text matches the color automatically. |
| `formatter` | | |
| `textStyle` | | the style of text. [TextStyle](TextStyle)|
| `labelStyle` | | the style of text. [LabelStyle](LabelStyle)|
| `data` | | Data array of legend. An array item is usually a name representing string. (If it is a pie chart, it could also be the name of a single data in the pie chart) of a series. |
| `icons` | | 自定义的图例标记图形。 |
@@ -709,7 +741,7 @@ Inherits or Implemented: [ChildComponent](#ChildComponent),[ISerieExtraComponent
|field|default|comment|
|--|--|--|
| `show` | | Whether to show the arrow. |
| `Position` | | |
| `position` | | The position of arrow.</br>`LineArrow.Position`:</br>- `End`: 末端箭头</br>- `Start`: 头端箭头</br>|
| `arrow` | | the arrow of line. [ArrowStyle](ArrowStyle)|
## `LineStyle`
@@ -729,6 +761,20 @@ The style of line.
| `length` |0 | |
| `opacity` |1 | Opacity of the line. Supports value from 0 to 1, and the line will not be drawn when set to 0. |
## `Location`
Inherits or Implemented: [ChildComponent](#ChildComponent),[IPropertyChanged](#IPropertyChanged)
Location type. Quick to set the general location.
|field|default|comment|
|--|--|--|
| `align` | | 对齐方式。</br>`Align`:</br>- `Center`: 对齐方式</br>- `Left`: 对齐方式</br>- `Right`: 对齐方式</br>|
| `left` | | Distance between component and the left side of the container. |
| `right` | | Distance between component and the left side of the container. |
| `top` | | Distance between component and the left side of the container. |
| `bottom` | | Distance between component and the left side of the container. |
## `MainComponent`
Inherits or Implemented: [IComparable](#IComparable)
@@ -843,9 +889,9 @@ Polar coordinate can be used in scatter and line chart. Every polar coordinate h
|field|default|comment|
|--|--|--|
| `show` |true | Whether to show the polor component. |
| `center` | | [default:[0.5f,0.45f]]The center of ploar. The center[0] is the x-coordinate, and the center[1] is the y-coordinate. |
| `radius` |0.35f | [default:0.35f]the radius of polar. |
| `backgroundColor` | | [default:Color.clear]Background color of polar, which is transparent by default. |
| `center` | | The center of ploar. The center[0] is the x-coordinate, and the center[1] is the y-coordinate. When value between 0 and 1 represents a percentage relative to the chart. |
| `radius` |0.35f | the radius of polar. |
| `backgroundColor` | | Background color of polar, which is transparent by default. |
## `Radar`
@@ -899,7 +945,6 @@ Inherits or Implemented: [BaseSerie](#BaseSerie),[IComparable](#IComparable)
| `endLabels` | | |
| `lineArrows` | | |
| `areaStyles` | | |
| `iconStyles` | | |
| `titleStyles` | | |
| `emphases` | | |
| `index` | | The index of serie. |
@@ -987,7 +1032,6 @@ A data item of serie.
| `labelLines` | | |
| `emphases` | | |
| `symbols` | | |
| `iconStyles` | | |
| `lineStyles` | | |
| `areaStyles` | | |
| `titleStyles` | | |
@@ -1124,6 +1168,20 @@ Text character limitation and adaptation component. When the length of the text
| `gap` |1 | White pixel distance at both ends. |
| `suffix` | | Suffixes when the length exceeds. |
## `TextPadding`
Inherits or Implemented: [ChildComponent](#ChildComponent)
Settings related to text.
|field|default|comment|
|--|--|--|
| `show` |true | |
| `top` |2 | |
| `right` |4 | |
| `left` |4 | |
| `bottom` |2 | |
## `TextStyle`
Inherits or Implemented: [ChildComponent](#ChildComponent)
@@ -1132,15 +1190,13 @@ Settings related to text.
|field|default|comment|
|--|--|--|
| `show` |true | Settings related to text. |
| `font` | | the font of text. When `null`, the theme's font is used by default. |
| `autoWrap` |false | 是否自动换行。 |
| `autoAlign` |true | 文本是否让系统自动选对齐方式。为false时才会用alignment。 |
| `rotate` |0 | Rotation of text. |
| `extraWidth` |0 | Extra width of text preferred width. |
| `offset` |Vector2.zero | the offset of position. |
| `autoColor` |false | 是否开启自动颜色。当开启时,会自动设置颜色。 |
| `color` | | the color of text. |
| `autoBackgroundColor` |false | |
| `backgroundColor` | | the color of text. |
| `fontSize` |0 | font size. |
| `fontStyle` | | font style. |
| `lineSpacing` |1f | text line spacing. |
@@ -1184,7 +1240,8 @@ Theme.
|--|--|--|
| `show` |true | |
| `sharedTheme` | | [Theme](Theme)|
| `enableCustomTheme` | | |
| `transparentBackground` |false | Whether the background color is transparent. When true, the background color is not drawn. 是否透明背景颜色。当设置为true时不绘制背景颜色。 |
| `enableCustomTheme` |false | Whether to customize theme colors. When set to true, you can use 'sync color to custom' to synchronize the theme color to the custom color. It can also be set manually. |
| `customFont` | | |
| `customBackgroundColor` | | the custom background color of chart. |
| `customColorPalette` | | |
@@ -1199,23 +1256,18 @@ Title component, including main title and subtitle.
|--|--|--|
| `show` |true | [default:true] Set this to false to prevent the title from showing. |
| `text` | | The main title text, supporting \n for newlines. |
| `textStyle` | | The text style of main title. [TextStyle](TextStyle)|
| `subText` | | Subtitle text, supporting for \n for newlines. |
| `subTextStyle` | | The text style of sub title. [TextStyle](TextStyle)|
| `labelStyle` | | The text style of main title. [LabelStyle](LabelStyle)|
| `subLabelStyle` | | The text style of sub title. [LabelStyle](LabelStyle)|
| `itemGap` |0 | [default:8] The gap between the main title and subtitle. |
| `location` | | The location of title component.</br>`AxisName.Location`:</br>- `Start`: the location of axis name.</br>- `Middle`: the location of axis name.</br>- `End`: the location of axis name.</br>- `align`: 对齐方式。</br>- `left`: Distance between component and the left side of the container.</br>- `right`: Distance between component and the left side of the container.</br>- `top`: Distance between component and the left side of the container.</br>- `bottom`: Distance between component and the left side of the container.</br>|
| `location` | | The location of title component. [Location](Location)|
## `TitleStyle`
Inherits or Implemented: [ChildComponent](#ChildComponent),[ISerieDataComponent](#ISerieDataComponent),[ISerieExtraComponent](#ISerieExtraComponent)
Inherits or Implemented: [LabelStyle](#LabelStyle),[ISerieDataComponent](#ISerieDataComponent),[ISerieExtraComponent](#ISerieExtraComponent)
the title of serie.
|field|default|comment|
|--|--|--|
| `show` |true | Whether to show title. |
| `offsetCenter` |Vector2(0, -0.2f) | The offset position relative to the center. |
| `textStyle` | | the color of text. [TextStyle](TextStyle)|
## `TitleTheme`
@@ -1259,9 +1311,9 @@ Tooltip component.
| `itemHeight` |25f | |
| `borderColor` |Color32(230, 230, 230, 255) | the color of tooltip border. |
| `lineStyle` | | the line style of indicator line. [LineStyle](LineStyle)|
| `labelTextStyle` | | the text style of content. [TextStyle](TextStyle)|
| `titleTextStyle` | | 标题的文本样式。 [TextStyle](TextStyle)|
| `columnsTextStyle` | | |
| `indicatorLabelStyle` | | the label style of tooltip axis indicator label. [LabelStyle](LabelStyle)|
| `titleLabelStyle` | | 标题的文本样式。 [LabelStyle](LabelStyle)|
| `contentLabelStyles` | | |
## `TooltipTheme`
@@ -1284,7 +1336,8 @@ VisualMap component. Mapping data to visual elements such as colors.
|field|default|comment|
|--|--|--|
| `show` |true | Whether to display components. If set to false, it will not show up, but the data mapping function still exists. |
| `show` |true | Whether to enable components. |
| `showUI` |false | Whether to display components. If set to false, it will not show up, but the data mapping function still exists. |
| `type` | | the type of visualmap component.</br>`Painter.Type`:</br>- `Base`: </br>- `Serie`: </br>- `Top`: </br>|
| `selectedMode` | | the selected mode for Piecewise visualMap.</br>`VisualMap.SelectedMode`:</br>- `Multiple`: 多选。</br>- `Single`: 单选。</br>|
| `serieIndex` |0 | the serie index of visualMap. |
@@ -1304,7 +1357,9 @@ VisualMap component. Mapping data to visual elements such as colors.
| `hoverLink` |true | When the hoverLink function is turned on, when the mouse hovers over the visualMap component, the corresponding value of the mouse position is highlighted in the corresponding graphic element in the diagram. |
| `autoMinMax` |true | Automatically set min, Max value 自动设置minmax的值 |
| `orient` | | Specify whether the layout of component is horizontal or vertical.</br>`Orient`:</br>- `Horizonal`: 水平</br>- `Vertical`: 垂直</br>|
| `location` | | The location of component.</br>`AxisName.Location`:</br>- `Start`: the location of axis name.</br>- `Middle`: the location of axis name.</br>- `End`: the location of axis name.</br>- `align`: 对齐方式。</br>- `left`: Distance between component and the left side of the container.</br>- `right`: Distance between component and the left side of the container.</br>- `top`: Distance between component and the left side of the container.</br>- `bottom`: Distance between component and the left side of the container.</br>|
| `location` | | The location of component. [Location](Location)|
| `workOnLine` |true | Whether the visualmap is work on linestyle of linechart. |
| `workOnArea` |false | Whether the visualmap is work on areaStyle of linechart. |
| `inRange` | | Defines the visual color in the selected range. |
| `outOfRange` | | Defines a visual color outside of the selected range. |
| `pieces` | | 分段式每一段的相关配置。 |
@@ -1394,4 +1449,4 @@ The x axis in cartesian(rectangular) coordinate.
[XCharts Homepage](https://github.com/XCharts-Team/XCharts)</br>
[XCharts API](XChartsAPI-EN.md)</br>
[XCharts Q&A](XChartsFQA-EN.md)
[XCharts FAQ](XChartsFAQ-EN.md)

View File

@@ -2,7 +2,7 @@
[XCharts主页](https://github.com/XCharts-Team/XCharts)</br>
[XChartsAPI接口](XChartsAPI-ZH.md)</br>
[XCharts问答](XChartsFQA-ZH.md)
[XCharts问答](XChartsFAQ-ZH.md)
## Serie 系列
@@ -22,6 +22,25 @@
- [SimplifiedCandlestick](#SimplifiedCandlestick)
- [SimplifiedLine](#SimplifiedLine)
## Theme 主题
- [AngleAxisTheme](#AngleAxisTheme)
- [AxisTheme](#AxisTheme)
- [BaseAxisTheme](#BaseAxisTheme)
- [ComponentTheme](#ComponentTheme)
- [DataZoomTheme](#DataZoomTheme)
- [LegendTheme](#LegendTheme)
- [PolarAxisTheme](#PolarAxisTheme)
- [RadarAxisTheme](#RadarAxisTheme)
- [RadiusAxisTheme](#RadiusAxisTheme)
- [SerieTheme](#SerieTheme)
- [SubTitleTheme](#SubTitleTheme)
- [Theme](#Theme)
- [ThemeStyle](#ThemeStyle)
- [TitleTheme](#TitleTheme)
- [TooltipTheme](#TooltipTheme)
- [VisualMapTheme](#VisualMapTheme)
## MainComponent 主组件
- [AngleAxis](#AngleAxis)
@@ -68,6 +87,7 @@
- [Emphasis](#Emphasis)
- [EndLabelStyle](#EndLabelStyle)
- [IconStyle](#IconStyle)
- [ImageStyle](#ImageStyle)
- [ItemStyle](#ItemStyle)
- [LabelLine](#LabelLine)
- [LabelStyle](#LabelStyle)
@@ -76,6 +96,7 @@
- [LevelStyle](#LevelStyle)
- [LineArrow](#LineArrow)
- [LineStyle](#LineStyle)
- [Location](#Location)
- [MarkAreaData](#MarkAreaData)
- [MarkLineData](#MarkLineData)
- [PolarAxisTheme](#PolarAxisTheme)
@@ -87,6 +108,7 @@
- [SubTitleTheme](#SubTitleTheme)
- [SymbolStyle](#SymbolStyle)
- [TextLimit](#TextLimit)
- [TextPadding](#TextPadding)
- [TextStyle](#TextStyle)
- [ThemeStyle](#ThemeStyle)
- [TitleStyle](#TitleStyle)
@@ -99,7 +121,7 @@
- [AreaStyle](#AreaStyle)
- [Emphasis](#Emphasis)
- [IconStyle](#IconStyle)
- [ImageStyle](#ImageStyle)
- [LabelLine](#LabelLine)
- [LabelStyle](#LabelStyle)
- [LineArrow](#LineArrow)
@@ -109,7 +131,7 @@
- [AreaStyle](#AreaStyle)
- [Emphasis](#Emphasis)
- [IconStyle](#IconStyle)
- [ImageStyle](#ImageStyle)
- [ItemStyle](#ItemStyle)
- [LabelLine](#LabelLine)
- [LabelStyle](#LabelStyle)
@@ -125,9 +147,9 @@
- [DebugInfo](#DebugInfo)
- [Indicator](#Indicator)
- [Lang](#Lang)
- [LangCandlestick](#LangCandlestick)
- [LangTime](#LangTime)
- [MainComponent](#MainComponent)
- [Theme](#Theme)
- [XCResourcesImporter](#XCResourcesImporter)
- [XCSettings](#XCSettings)
@@ -223,7 +245,6 @@ Inherits or Implemented: [MainComponent](#MainComponent)
| `inverse` |false | 是否反向坐标轴。在类目轴中无效。 |
| `clockwise` |true | 刻度增长是否按顺时针,默认顺时针。 |
| `insertDataToHead` | | 添加新数据时是在列表的头部还是尾部加入。 |
| `iconStyle` | | 图标样式。 [IconStyle](IconStyle)|
| `icons` | | 类目数据对应的图标。 |
| `data` | | 类目数据在类目轴type: 'category')中有效。 |
| `axisLine` | | [AxisLine](AxisLine)|
@@ -235,26 +256,19 @@ Inherits or Implemented: [MainComponent](#MainComponent)
## `AxisLabel`
Inherits or Implemented: [ChildComponent](#ChildComponent)
Inherits or Implemented: [LabelStyle](#LabelStyle)
坐标轴刻度标签的相关设置。
|field|default|comment|
|--|--|--|
| `show` |true | 是否显示刻度标签。 |
| `formatter` | | |
| `interval` |0 | 坐标轴刻度标签的显示间隔在类目轴中有效。0表示显示所有标签1表示隔一个隔显示一个标签以此类推。 |
| `inside` |false | 刻度标签是否朝内,默认朝外。 |
| `distance` | | 刻度标签与轴线之间的距离。 |
| `numericFormatter` | | 标准数字格式字符串。用于将数值格式化显示为字符串。 使用Axx的形式A是格式说明符的单字符支持C货币、D十进制、E指数、F定点数、G常规、N数字、P百分比、R往返、X十六进制的。xx是精度说明从0-99。 参考https://docs.microsoft.com/zh-cn/dotnet/standard/base-types/standard-numeric-format-strings |
| `showAsPositiveNumber` |false | 将负数数值显示为正数。一般和`Serie``showAsPositiveNumber`配合使用。 |
| `onZero` |false | 刻度标签显示在0刻度上。 |
| `width` |0f | 文本的宽。为0时会自动匹配。 |
| `height` |0f | 文本的高。为0时会自动匹配。 |
| `showStartLabel` |true | 是否显示第一个文本。 |
| `showEndLabel` |true | 是否显示最后一个文本。 |
| `textLimit` | | 文本限制。 [TextLimit](TextLimit)|
| `textStyle` | | 文本样式。 [TextStyle](TextStyle)|
## `AxisLine`
@@ -278,9 +292,7 @@ Inherits or Implemented: [ChildComponent](#ChildComponent)
|--|--|--|
| `show` | | 是否显示坐标名称。 |
| `name` | | 坐标轴名称。 |
| `formatter` | | 指示器名称显示的格式器。可用在雷达图。 |
| `location` | | 坐标轴名称显示位置。</br>`AxisName.Location`:</br>- `Start`: 坐标轴名称显示位置。</br>- `Middle`: 坐标轴名称显示位置。</br>- `End`: 坐标轴名称显示位置。</br>- `align`: 对齐方式。</br>- `left`: 离容器左侧的距离。</br>- `right`: 离容器右侧的距离。</br>- `top`: 离容器上侧的距离。</br>- `bottom`: 离容器下侧的距离。</br>|
| `textStyle` | | 文本样式。 [TextStyle](TextStyle)|
| `labelStyle` | | 文本样式。 [LabelStyle](LabelStyle)|
## `AxisSplitArea`
@@ -422,7 +434,7 @@ Inherits or Implemented: [MainComponent](#MainComponent)
Inherits or Implemented: [MainComponent](#MainComponent),[IUpdateRuntimeData](#IUpdateRuntimeData)
<para>DataZoom 组件 用于区域缩放,从而能自由关注细节的数据信息,或者概览数据整体,或者去除离群点的影响。</para>
DataZoom 组件 用于区域缩放,从而能自由关注细节的数据信息,或者概览数据整体,或者去除离群点的影响。
|field|default|comment|
|--|--|--|
@@ -430,7 +442,7 @@ Inherits or Implemented: [MainComponent](#MainComponent),[IUpdateRuntimeData](#I
| `filterMode` | | 数据过滤类型。</br>`DataZoom.FilterMode`:</br>- `Filter`: 当前数据窗口外的数据,被 过滤掉。即 会 影响其他轴的数据范围。每个数据项,只要有一个维度在数据窗口外,整个数据项就会被过滤掉。</br>- `WeakFilter`: 当前数据窗口外的数据,被 过滤掉。即 会 影响其他轴的数据范围。每个数据项,只有当全部维度都在数据窗口同侧外部,整个数据项才会被过滤掉。</br>- `Empty`: 当前数据窗口外的数据,被 设置为空。即 不会 影响其他轴的数据范围。</br>- `None`: 不过滤数据,只改变数轴范围。</br>|
| `xAxisIndexs` | | 控制的 x 轴索引列表。 |
| `yAxisIndexs` | | 控制的 y 轴索引列表。 |
| `supportInside` | | Built into the coordinate system to allow the user to zoom in and out of the coordinate system by mouse dragging, mouse wheel, finger swiping (on the touch screen). |
| `supportInside` | | 是否支持内置。内置于坐标系中,使用户可以在坐标系上通过鼠标拖拽、鼠标滚轮、手指滑动(触屏上)来缩放或漫游坐标系。 |
| `supportInsideScroll` |true | 是否支持坐标系内滚动 |
| `supportInsideDrag` |true | 是否支持坐标系内拖拽 |
| `supportSlider` | | 是否支持滑动条。有单独的滑动条,用户在滑动条上进行缩放或漫游。 |
@@ -449,13 +461,13 @@ Inherits or Implemented: [MainComponent](#MainComponent),[IUpdateRuntimeData](#I
| `bottom` | | 组件离容器下侧的距离。 |
| `rangeMode` | | 取绝对值还是百分比。</br>`DataZoom.RangeMode`:</br>- `//Value`: The value type of start and end.取值类型</br>- `Percent`: 百分比。</br>|
| `start` | | 数据窗口范围的起始百分比。范围是0 ~ 100。 |
| `end` | | The end percentage of the window out of the data extent, in the range of 0 ~ 100. 数据窗口范围的结束百分比。范围是0 ~ 100。 |
| `end` | | 数据窗口范围的结束百分比。范围是0 ~ 100。 |
| `startValue` | | |
| `endValue` | | |
| `minShowNum` |1 | 最小显示数据个数。当DataZoom放大到最大时最小显示的数据个数。 |
| `scrollSensitivity` |1.1f | 缩放区域组件的敏感度。值越高每次缩放所代表的数据越多。 |
| `orient` | | 布局方式是横还是竖。不仅是布局方式,对于直角坐标系而言,也决定了,缺省情况控制横向数轴还是纵向数轴。</br>`Orient`:</br>- `Horizonal`: 水平</br>- `Vertical`: 垂直</br>|
| `textStyle` | | 文格式。 [TextStyle](TextStyle)|
| `labelStyle` | | 文本标签格式。 [LabelStyle](LabelStyle)|
| `lineStyle` | | 阴影线条样式。 [LineStyle](LineStyle)|
| `areaStyle` | | 阴影填充样式。 [AreaStyle](AreaStyle)|
@@ -481,7 +493,7 @@ Inherits or Implemented: [ComponentTheme](#ComponentTheme)
| `showDebugInfo` |false | |
| `showAllChartObject` |false | |
| `foldSeries` |false | |
| `debugInfoTextStyle` | | [TextStyle](TextStyle)|
| `labelStyle` | | [LabelStyle](LabelStyle)|
## `EffectScatter`
@@ -531,20 +543,35 @@ Inherits or Implemented: [Serie](#Serie),[INeedSerieContainer](#INeedSerieContai
## `IconStyle`
Inherits or Implemented: [ChildComponent](#ChildComponent),[ISerieExtraComponent](#ISerieExtraComponent),[ISerieDataComponent](#ISerieDataComponent)
Inherits or Implemented: [ChildComponent](#ChildComponent)
|field|default|comment|
|--|--|--|
| `show` |false | 是否显示图标。 |
| `layer` | | 显示在上层还是在下层。</br>`IconStyle.Layer`:</br>- `UnderLabel`: </br>- `AboveLabel`: </br>|
| `layer` | | 显示在上层还是在下层。</br>`IconStyle.Layer`:</br>- `UnderText`: The icon is display under the label text. 图标在标签文字下</br>- `AboveText`: The icon is display above the label text. 图标在标签文字上</br>|
| `align` | | 水平方向对齐方式。</br>`Align`:</br>- `Center`: 对齐方式</br>- `Left`: 对齐方式</br>- `Right`: 对齐方式</br>|
| `sprite` | | 图标的图片。 |
| `type` | | 图片的显示类型。 |
| `color` | | 图标颜色。 |
| `width` |20 | 图标宽。 |
| `height` |20 | 图标高。 |
| `offset` | | 图标偏移。 |
| `autoHideWhenLabelEmpty` |false | 当label内容为空时是否自动隐藏图标 |
## `ImageStyle`
Inherits or Implemented: [ChildComponent](#ChildComponent),[ISerieExtraComponent](#ISerieExtraComponent),[ISerieDataComponent](#ISerieDataComponent)
|field|default|comment|
|--|--|--|
| `show` |true | 是否显示图标。 |
| `sprite` | | 图标的图片。 |
| `type` | | 图片的显示类型。 |
| `autoColor` | | 是否自动颜色。 |
| `color` | | 图标颜色。 |
| `width` |0 | 图标宽。 |
| `height` |0 | 图标高。 |
## `Indicator`
雷达图的指示器,用来指定雷达图中的多个变量(维度)。
@@ -592,6 +619,7 @@ Inherits or Implemented: [ChildComponent](#ChildComponent),[ISerieDataComponent]
| `centerColor` | | 中心区域颜色。 |
| `centerGap` | | 中心区域间隙。 |
| `borderWidth` |0 | 边框宽。 |
| `borderGap` |0 | 边框间隙。 |
| `borderColor` | | 边框的颜色。 |
| `borderColor0` | | 边框的颜色。 |
| `borderToColor` | | 边框的渐变色。 |
@@ -625,16 +653,17 @@ Inherits or Implemented: [ChildComponent](#ChildComponent),[ISerieExtraComponent
|--|--|--|
| `show` |true | 是否显示文本标签。 |
| `Position` | | |
| `autoOffset` |false | 是否开启自动偏移。当开启时Y的偏移会自动判断曲线的开口来决定向上还是向下偏移。 |
| `offset` | | 距离图形元素的偏移 |
| `rotate` | | 文本的旋转。 |
| `distance` | | 距离轴线的距离。 |
| `formatter` | | |
| `paddingLeftRight` |2f | 左右边距。 |
| `paddingTopBottom` |2f | 上下边距。 |
| `backgroundWidth` |0 | 标签的背景宽度。一般不用指定,不指定时则自动是文字的宽度。 |
| `backgroundHeight` |0 | 标签的背景高度。一般不用指定,不指定时则自动是文字的高度。 |
| `numericFormatter` | | 标准数字格式字符串。用于将数值格式化显示为字符串。 使用Axx的形式A是格式说明符的单字符支持C货币、D十进制、E指数、F定点数、G常规、N数字、P百分比、R往返、X十六进制的。xx是精度说明从0-99。 参考https://docs.microsoft.com/zh-cn/dotnet/standard/base-types/standard-numeric-format-strings |
| `autoOffset` |false | 是否开启自动偏移。当开启时Y的偏移会自动判断曲线的开口来决定向上还是向下偏移。 |
| `autoColor` |false | 是否开启自动颜色。当开启时会根据已支持的serie自动设置颜色。 |
| `width` |0 | 标签的宽度。一般不用指定,不指定时则自动是文字的宽度。 |
| `height` |0 | 标签的高度。一般不用指定,不指定时则自动是文字的高度。 |
| `icon` | | 图标样式。 [IconStyle](IconStyle)|
| `background` | | 背景图样式。 [ImageStyle](ImageStyle)|
| `textPadding` | | 文本的边距。 [TextPadding](TextPadding)|
| `textStyle` | | 文本样式。 [TextStyle](TextStyle)|
## `Lang`
@@ -644,6 +673,9 @@ Inherits or Implemented: [ScriptableObject](#ScriptableObject)
国际化语言表。
## `LangCandlestick`
## `LangTime`
@@ -659,14 +691,14 @@ Inherits or Implemented: [MainComponent](#MainComponent),[IPropertyChanged](#IPr
| `iconType` | | 图例类型。 [default:Type.Auto]</br>`Painter.Type`:</br>- `Base`: </br>- `Serie`: </br>- `Top`: </br>|
| `selectedMode` | | 选择模式。控制是否可以通过点击图例改变系列的显示状态。默认开启图例选择,可以设成 None 关闭。 [default:SelectedMode.Multiple]</br>`VisualMap.SelectedMode`:</br>- `Multiple`: 多选。</br>- `Single`: 单选。</br>|
| `orient` | | 布局方式是横还是竖。 [default:Orient.Horizonal]</br>`Orient`:</br>- `Horizonal`: 水平</br>- `Vertical`: 垂直</br>|
| `location` | | 图例显示的位置。 [default:Location.defaultTop]</br>`AxisName.Location`:</br>- `Start`: 坐标轴名称显示位置。</br>- `Middle`: 坐标轴名称显示位置。</br>- `End`: 坐标轴名称显示位置。</br>- `align`: 对齐方式。</br>- `left`: 离容器左侧的距离。</br>- `right`: 离容器右侧的距离。</br>- `top`: 离容器上侧的距离。</br>- `bottom`: 离容器下侧的距离。</br>|
| `location` | | 图例显示的位置。 [default:Location.defaultTop] [Location](Location)|
| `itemWidth` |25.0f | 图例标记的图形宽度。 [default:24f] |
| `itemHeight` |12.0f | 图例标记的图形高度。 [default:12f] |
| `itemGap` |10f | 图例每项之间的间隔。横向布局时为水平间隔,纵向布局时为纵向间隔。 [default:10f] |
| `itemAutoColor` |true | 图例标记的图形是否自动匹配颜色。 [default:true] |
| `textAutoColor` |false | 图例标记的文本是否自动匹配颜色。 [default:false] |
| `formatter` | | |
| `textStyle` | | 文本样式。 [TextStyle](TextStyle)|
| `labelStyle` | | 文本样式。 [LabelStyle](LabelStyle)|
| `data` | | If data is not specified, it will be auto collected from series. |
| `icons` | | 自定义的图例标记图形。 |
@@ -709,7 +741,7 @@ Inherits or Implemented: [ChildComponent](#ChildComponent),[ISerieExtraComponent
|field|default|comment|
|--|--|--|
| `show` | | 是否显示箭头。 |
| `Position` | | |
| `position` | | 箭头位置。</br>`LineArrow.Position`:</br>- `End`: 末端箭头</br>- `Start`: 头端箭头</br>|
| `arrow` | | 箭头。 [ArrowStyle](ArrowStyle)|
## `LineStyle`
@@ -729,6 +761,20 @@ Inherits or Implemented: [ChildComponent](#ChildComponent),[ISerieDataComponent]
| `length` |0 | |
| `opacity` |1 | 线的透明度。支持从 0 到 1 的数字,为 0 时不绘制该图形。 |
## `Location`
Inherits or Implemented: [ChildComponent](#ChildComponent),[IPropertyChanged](#IPropertyChanged)
位置类型。通过Align快速设置大体位置再通过leftrighttopbottom微调具体位置。
|field|default|comment|
|--|--|--|
| `align` | | 对齐方式。</br>`Align`:</br>- `Center`: 对齐方式</br>- `Left`: 对齐方式</br>- `Right`: 对齐方式</br>|
| `left` | | 离容器左侧的距离。 |
| `right` | | 离容器右侧的距离。 |
| `top` | | 离容器上侧的距离。 |
| `bottom` | | 离容器下侧的距离。 |
## `MainComponent`
Inherits or Implemented: [IComparable](#IComparable)
@@ -843,7 +889,7 @@ Inherits or Implemented: [CoordSystem](#CoordSystem),[ISerieContainer](#ISerieCo
|field|default|comment|
|--|--|--|
| `show` |true | 是否显示极坐标。 |
| `center` | | When value between 0 and 1 represents a percentage relative to the chart. |
| `center` | | 极坐标的中心点。数组的第一项是横坐标,第二项是纵坐标。 当值为0-1之间时表示百分比设置成百分比时第一项是相对于容器宽度第二项是相对于容器高度。 |
| `radius` |0.35f | 极坐标的半径。 |
| `backgroundColor` | | 极坐标的背景色,默认透明。 |
@@ -899,7 +945,6 @@ Inherits or Implemented: [BaseSerie](#BaseSerie),[IComparable](#IComparable)
| `endLabels` | | |
| `lineArrows` | | |
| `areaStyles` | | |
| `iconStyles` | | |
| `titleStyles` | | |
| `emphases` | | |
| `index` | | 系列索引。 |
@@ -987,7 +1032,6 @@ Inherits or Implemented: [ChildComponent](#ChildComponent)
| `labelLines` | | |
| `emphases` | | |
| `symbols` | | |
| `iconStyles` | | |
| `lineStyles` | | |
| `areaStyles` | | |
| `titleStyles` | | |
@@ -1124,6 +1168,20 @@ Inherits or Implemented: [ChildComponent](#ChildComponent)
| `gap` |1 | 两边留白像素距离。 [default:10f] |
| `suffix` | | 长度超出时的后缀。 [default: "..."] |
## `TextPadding`
Inherits or Implemented: [ChildComponent](#ChildComponent)
文本的内边距设置。
|field|default|comment|
|--|--|--|
| `show` |true | |
| `top` |2 | |
| `right` |4 | |
| `left` |4 | |
| `bottom` |2 | |
## `TextStyle`
Inherits or Implemented: [ChildComponent](#ChildComponent)
@@ -1132,15 +1190,13 @@ Inherits or Implemented: [ChildComponent](#ChildComponent)
|field|default|comment|
|--|--|--|
| `show` |true | 文本的相关设置。 |
| `font` | | 文本字体。 [default: null] |
| `autoWrap` |false | 是否自动换行。 |
| `autoAlign` |true | 文本是否让系统自动选对齐方式。为false时才会用alignment。 |
| `rotate` |0 | 文本的旋转。 [default: `0f`] |
| `extraWidth` |0 | 额外的宽度 |
| `offset` |Vector2.zero | 坐标偏移。 [Default: `Vector2.zero`] |
| `autoColor` |false | 是否开启自动颜色。当开启时,会自动设置颜色。 |
| `color` | | 文本的颜色。 [default: `Color.clear`] |
| `autoBackgroundColor` |false | |
| `backgroundColor` | | 文本的背景颜色。 [default: `Color.clear`] |
| `fontSize` |0 | 文本字体大小。 [default: 18] |
| `fontStyle` | | 文本字体的风格。 [default: FontStyle.Normal] |
| `lineSpacing` |1f | 行间距。 [default: 1f] |
@@ -1184,7 +1240,8 @@ Inherits or Implemented: [ChildComponent](#ChildComponent)
|--|--|--|
| `show` |true | |
| `sharedTheme` | | [Theme](Theme)|
| `enableCustomTheme` | | |
| `transparentBackground` |false | Whether the background color is transparent. When true, the background color is not drawn. 是否透明背景颜色。当设置为true时不绘制背景颜色。 |
| `enableCustomTheme` |false | 是否自定义主题颜色。当设置为true时可以用sync color to custom同步主题的颜色到自定义颜色。也可以手动设置。 |
| `customFont` | | |
| `customBackgroundColor` | | 自定义的背景颜色。 |
| `customColorPalette` | | |
@@ -1199,23 +1256,18 @@ Inherits or Implemented: [MainComponent](#MainComponent),[IPropertyChanged](#IPr
|--|--|--|
| `show` |true | 是否显示标题组件。 |
| `text` | | 主标题文本,支持使用 \n 换行。 |
| `textStyle` | | 主标题文本样式。 [TextStyle](TextStyle)|
| `subText` | | 副标题文本,支持使用 \n 换行。 |
| `subTextStyle` | | 标题文本样式。 [TextStyle](TextStyle)|
| `labelStyle` | | 标题文本样式。 [LabelStyle](LabelStyle)|
| `subLabelStyle` | | 副标题文本样式。 [LabelStyle](LabelStyle)|
| `itemGap` |0 | 主副标题之间的间距。 |
| `location` | | 标题显示位置。</br>`AxisName.Location`:</br>- `Start`: 坐标轴名称显示位置。</br>- `Middle`: 坐标轴名称显示位置。</br>- `End`: 坐标轴名称显示位置。</br>- `align`: 对齐方式。</br>- `left`: 离容器左侧的距离。</br>- `right`: 离容器右侧的距离。</br>- `top`: 离容器上侧的距离。</br>- `bottom`: 离容器下侧的距离。</br>|
| `location` | | 标题显示位置。 [Location](Location)|
## `TitleStyle`
Inherits or Implemented: [ChildComponent](#ChildComponent),[ISerieDataComponent](#ISerieDataComponent),[ISerieExtraComponent](#ISerieExtraComponent)
Inherits or Implemented: [LabelStyle](#LabelStyle),[ISerieDataComponent](#ISerieDataComponent),[ISerieExtraComponent](#ISerieExtraComponent)
标题相关设置。
|field|default|comment|
|--|--|--|
| `show` |true | 是否显示标题。 |
| `offsetCenter` |Vector2(0, -0.2f) | 相对于中心的偏移位置。 |
| `textStyle` | | 文本的颜色。 [TextStyle](TextStyle)|
## `TitleTheme`
@@ -1259,9 +1311,9 @@ Inherits or Implemented: [MainComponent](#MainComponent)
| `itemHeight` |25f | |
| `borderColor` |Color32(230, 230, 230, 255) | 边框颜色。 |
| `lineStyle` | | 指示线样式。 [LineStyle](LineStyle)|
| `labelTextStyle` | | 提示框标签的文本样式。 [TextStyle](TextStyle)|
| `titleTextStyle` | | 标题的文本样式。 [TextStyle](TextStyle)|
| `columnsTextStyle` | | |
| `indicatorLabelStyle` | | 提示框的坐标轴指示器文本样式。 [LabelStyle](LabelStyle)|
| `titleLabelStyle` | | 标题的文本样式。 [LabelStyle](LabelStyle)|
| `contentLabelStyles` | | |
## `TooltipTheme`
@@ -1284,7 +1336,8 @@ Inherits or Implemented: [MainComponent](#MainComponent)
|field|default|comment|
|--|--|--|
| `show` |true | 是否显示组件。如果设置为 false不会显示但是数据映射的功能还存在。 [default: true] |
| `show` |true | 组件是否生效。 |
| `showUI` |false | 是否显示组件。如果设置为 false不会显示但是数据映射的功能还存在。 |
| `type` | | 组件类型。</br>`Painter.Type`:</br>- `Base`: </br>- `Serie`: </br>- `Top`: </br>|
| `selectedMode` | | 选择模式。</br>`VisualMap.SelectedMode`:</br>- `Multiple`: 多选。</br>- `Single`: 单选。</br>|
| `serieIndex` |0 | 影响的serie索引。 |
@@ -1304,7 +1357,9 @@ Inherits or Implemented: [MainComponent](#MainComponent)
| `hoverLink` |true | Conversely, when the mouse hovers over a graphic element in a diagram, the corresponding value of the visualMap component is triangulated in the corresponding position. |
| `autoMinMax` |true | Automatically set min, Max value 自动设置minmax的值 |
| `orient` | | 布局方式是横还是竖。</br>`Orient`:</br>- `Horizonal`: 水平</br>- `Vertical`: 垂直</br>|
| `location` | | 组件显示的位置。</br>`AxisName.Location`:</br>- `Start`: 坐标轴名称显示位置。</br>- `Middle`: 坐标轴名称显示位置。</br>- `End`: 坐标轴名称显示位置。</br>- `align`: 对齐方式。</br>- `left`: 离容器左侧的距离。</br>- `right`: 离容器右侧的距离。</br>- `top`: 离容器上侧的距离。</br>- `bottom`: 离容器下侧的距离。</br>|
| `location` | | 组件显示的位置。 [Location](Location)|
| `workOnLine` |true | 组件是否对LineChart的LineStyle有效。 |
| `workOnArea` |false | 组件是否对LineChart的AreaStyle有效。 |
| `inRange` | | 定义 在选中范围中 的视觉颜色。 |
| `outOfRange` | | 定义 在选中范围外 的视觉颜色。 |
| `pieces` | | 分段式每一段的相关配置。 |
@@ -1394,4 +1449,4 @@ Inherits or Implemented: [Axis](#Axis)
[XCharts主页](https://github.com/XCharts-Team/XCharts)</br>
[XChartsAPI接口](XChartsAPI-ZH.md)</br>
[XCharts问答](XChartsFQA-ZH.md)
[XCharts问答](XChartsFAQ-ZH.md)

View File

@@ -1,4 +1,4 @@
# XCharts Q&A
# XCharts FAQ
[XCharts Homepage](https://github.com/XCharts-Team/XCharts)</br>
[XCharts API](XChartsAPI-EN.md)</br>

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 2929481916a9540ed9ecc270be6a3b0e
guid: e803ae0ae73794ec6891fed7551fe01d
TextScriptImporter:
externalObjects: {}
userData:

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: f2d61cadf902a4e20a2690f3c7d2ceea
guid: 4df833a2a1e6c4a7da37a08379dd2e18
TextScriptImporter:
externalObjects: {}
userData:

View File

@@ -1,7 +1,7 @@
# 教程5分钟上手 XCharts 3.0
[XCharts主页](https://github.com/XCharts-Team/XCharts)</br>
[XCharts问答](XChartsFQA-ZH.md)</br>
[XCharts问答](XChartsFAQ-ZH.md)</br>
[XChartsAPI接口](XChartsAPI-ZH.md)</br>
[XCharts配置项手册](XChartsConfiguration-ZH.md)
@@ -226,6 +226,6 @@ itemStyle.color = Color.blue;
```
[XCharts主页](https://github.com/XCharts-Team/XCharts)</br>
[XCharts问答](XChartsFQA-ZH.md)</br>
[XCharts问答](XChartsFAQ-ZH.md)</br>
[XChartsAPI接口](XChartsAPI-ZH.md)</br>
[XCharts配置项手册](XChartsConfiguration-ZH.md)

View File

@@ -1,7 +1,7 @@
# 教程5分钟上手 XCharts 3.0
[XCharts主页](https://github.com/XCharts-Team/XCharts)</br>
[XCharts问答](XChartsFQA-ZH.md)</br>
[XCharts问答](XChartsFAQ-ZH.md)</br>
[XChartsAPI接口](XChartsAPI-ZH.md)</br>
[XCharts配置项手册](XChartsConfiguration-ZH.md)
@@ -226,6 +226,6 @@ itemStyle.color = Color.blue;
```
[XCharts主页](https://github.com/XCharts-Team/XCharts)</br>
[XCharts问答](XChartsFQA-ZH.md)</br>
[XCharts问答](XChartsFAQ-ZH.md)</br>
[XChartsAPI接口](XChartsAPI-ZH.md)</br>
[XCharts配置项手册](XChartsConfiguration-ZH.md)

View File

@@ -11,6 +11,15 @@ namespace XCharts.Editor
[CustomEditor(typeof(BaseChart), true)]
public class BaseChartEditor : UnityEditor.Editor
{
class Styles
{
public static readonly GUIContent btnAddSerie = new GUIContent("Add Serie", "");
public static readonly GUIContent btnAddComponent = new GUIContent("Add Main Component", "");
public static readonly GUIContent btnCovertXYAxis = new GUIContent("Covert XY Axis", "");
public static readonly GUIContent btnRebuildChartObject = new GUIContent("Rebuild Chart Object", "");
public static readonly GUIContent btnCheckWarning = new GUIContent("Check Warning", "");
public static readonly GUIContent btnHideWarning = new GUIContent("Hide Warning", "");
}
protected BaseChart m_Chart;
protected SerializedProperty m_Script;
protected SerializedProperty m_EnableTextMeshPro;
@@ -28,6 +37,7 @@ namespace XCharts.Editor
private bool m_CheckWarning = false;
private int m_LastComponentCount = 0;
private int m_LastSerieCount = 0;
private string m_VersionString = "";
private StringBuilder sb = new StringBuilder();
MainComponentListEditor m_ComponentList;
SerieListEditor m_SerieList;
@@ -51,6 +61,10 @@ namespace XCharts.Editor
RefreshSeries();
m_SerieList = new SerieListEditor(this);
m_SerieList.Init(m_Chart, serializedObject, m_Series);
m_VersionString = "v" + XChartsMgr.fullVersion;
if (m_EnableTextMeshPro.boolValue)
m_VersionString += "-tmp";
}
public List<SerializedProperty> RefreshComponent()
@@ -97,8 +111,6 @@ namespace XCharts.Editor
m_SerieList.UpdateSeriesProperty(m_Series);
}
OnStartInspectorGUI();
EditorGUILayout.Space();
OnDebugInspectorGUI();
EditorGUILayout.Space();
serializedObject.ApplyModifiedProperties();
@@ -113,18 +125,23 @@ namespace XCharts.Editor
EditorGUILayout.PropertyField(m_Script);
EditorGUILayout.PropertyField(m_ChartName);
EditorGUILayout.PropertyField(m_RaycastTarget);
if (XChartsMgr.IsRepeatChartName(m_Chart, m_ChartName.stringValue))
{
EditorGUILayout.BeginHorizontal();
EditorGUILayout.HelpBox("chart name is repeated: " + m_ChartName.stringValue, MessageType.Error);
EditorGUILayout.EndHorizontal();
}
}
EditorGUILayout.PropertyField(m_Theme);
EditorGUILayout.PropertyField(m_Settings);
m_ComponentList.OnGUI();
m_SerieList.OnGUI();
}
protected virtual void OnDebugInspectorGUI()
{
EditorGUILayout.PropertyField(m_DebugInfo, true);
EditorGUILayout.Space();
AddSerie();
AddComponent();
CheckWarning();
@@ -165,16 +182,12 @@ namespace XCharts.Editor
private void ShowVersion()
{
sb.Length = 0;
sb.AppendFormat("v{0}", XChartsMgr.fullVersion);
if(m_EnableTextMeshPro.boolValue)
sb.Append("-tmp");
EditorGUILayout.HelpBox(sb.ToString(), MessageType.None);
EditorGUILayout.HelpBox(m_VersionString, MessageType.None);
}
private void AddComponent()
{
if (GUILayout.Button("Add Component"))
if (GUILayout.Button(Styles.btnAddComponent))
{
var menu = new GenericMenu();
foreach (var type in GetMainComponentTypeNames())
@@ -197,7 +210,7 @@ namespace XCharts.Editor
}
private void AddSerie()
{
if (GUILayout.Button("Add Serie"))
if (GUILayout.Button(Styles.btnAddSerie))
{
var menu = new GenericMenu();
foreach (var type in GetSerieTypeNames())
@@ -260,22 +273,22 @@ namespace XCharts.Editor
{
if (m_Chart.HasChartComponent<XAxis>() && m_Chart.HasChartComponent<YAxis>())
{
if (GUILayout.Button("Covert XY Axis"))
if (GUILayout.Button(Styles.btnCovertXYAxis))
m_Chart.CovertXYAxis(0);
}
if (GUILayout.Button("Rebuild Chart Object"))
if (GUILayout.Button(Styles.btnRebuildChartObject))
{
m_Chart.RebuildChartObject();
}
if (m_CheckWarning)
{
EditorGUILayout.BeginHorizontal();
if (GUILayout.Button("Check Warning"))
if (GUILayout.Button(Styles.btnCheckWarning))
{
m_CheckWarning = true;
m_Chart.CheckWarning();
}
if (GUILayout.Button("Hide Warning"))
if (GUILayout.Button(Styles.btnHideWarning))
{
m_CheckWarning = false;
}
@@ -296,7 +309,7 @@ namespace XCharts.Editor
}
else
{
if (GUILayout.Button("Check warning"))
if (GUILayout.Button(Styles.btnCheckWarning))
{
m_CheckWarning = true;
m_Chart.CheckWarning();

View File

@@ -18,7 +18,7 @@ namespace XCharts.Editor
PropertyField(prop, "m_FoldSeries");
PropertyField(prop, "m_ShowDebugInfo");
PropertyField(prop, "m_ShowAllChartObject");
PropertyField(prop, "m_DebugInfoTextStyle");
PropertyField(prop, "m_LabelStyle");
--EditorGUI.indentLevel;
}
}

View File

@@ -18,6 +18,7 @@ namespace XCharts.Editor
PropertyField(prop, "m_Layer");
PropertyField(prop, "m_Align");
PropertyField(prop, "m_Sprite");
PropertyField(prop, "m_Type");
PropertyField(prop, "m_Color");
PropertyField(prop, "m_Width");
PropertyField(prop, "m_Height");

View File

@@ -0,0 +1,28 @@

using UnityEditor;
using UnityEngine;
using XCharts.Runtime;
namespace XCharts.Editor
{
[CustomPropertyDrawer(typeof(ImageStyle), true)]
public class ImageStyleDrawer : BasePropertyDrawer
{
public override string ClassName { get { return "ImageStyle"; } }
public override void OnGUI(Rect pos, SerializedProperty prop, GUIContent label)
{
base.OnGUI(pos, prop, label);
if (MakeComponentFoldout(prop, "m_Show", true))
{
++EditorGUI.indentLevel;
PropertyField(prop, "m_Sprite");
PropertyField(prop, "m_Type");
PropertyField(prop, "m_AutoColor");
PropertyField(prop, "m_Color");
PropertyField(prop, "m_Width");
PropertyField(prop, "m_Height");
--EditorGUI.indentLevel;
}
}
}
}

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 6e994b64b93384ae4bfa9a7a85ba8914
guid: 4649856b17dfd4f628eb975040fb791c
MonoImporter:
externalObjects: {}
serializedVersion: 2

View File

@@ -24,6 +24,7 @@ namespace XCharts.Editor
PropertyField(prop, "m_CenterColor");
PropertyField(prop, "m_CenterGap");
PropertyField(prop, "m_BorderWidth");
PropertyField(prop, "m_BorderGap");
PropertyField(prop, "m_BorderColor");
PropertyField(prop, "m_BorderColor0");
PropertyField(prop, "m_BorderToColor");

View File

@@ -16,19 +16,26 @@ namespace XCharts.Editor
{
++EditorGUI.indentLevel;
PropertyField(prop, "m_Position");
PropertyField(prop, "m_Offset");
PropertyField(prop, "m_AutoOffset");
PropertyField(prop, "m_AutoColor");
PropertyField(prop, "m_Distance");
PropertyField(prop, "m_Formatter");
PropertyField(prop, "m_NumericFormatter");
PropertyField(prop, "m_BackgroundWidth");
PropertyField(prop, "m_BackgroundHeight");
PropertyField(prop, "m_PaddingLeftRight");
PropertyField(prop, "m_PaddingTopBottom");
PropertyField(prop, "m_AutoOffset");
PropertyField(prop, "m_Offset");
PropertyField(prop, "m_Distance");
PropertyField(prop, "m_Rotate");
PropertyField(prop, "m_Width");
PropertyField(prop, "m_Height");
PropertyField(prop, "m_Icon");
PropertyField(prop, "m_Background");
PropertyField(prop, "m_TextStyle");
PropertyField(prop, "m_TextPadding");
--EditorGUI.indentLevel;
}
}
}
[CustomPropertyDrawer(typeof(EndLabelStyle), true)]
public class EndLabelStyleDrawer : LabelStyleDrawer
{
public override string ClassName { get { return "End Label"; } }
}
}

View File

@@ -0,0 +1,26 @@

using UnityEditor;
using UnityEngine;
using XCharts.Runtime;
namespace XCharts.Editor
{
[CustomPropertyDrawer(typeof(TextPadding), true)]
public class TextPaddingDrawer : BasePropertyDrawer
{
public override string ClassName { get { return "Padding"; } }
public override void OnGUI(Rect pos, SerializedProperty prop, GUIContent label)
{
base.OnGUI(pos, prop, label);
if (MakeComponentFoldout(prop, "m_Show", true))
{
++EditorGUI.indentLevel;
PropertyField(prop, "m_Top");
PropertyField(prop, "m_Right");
PropertyField(prop, "m_Bottom");
PropertyField(prop, "m_Left");
--EditorGUI.indentLevel;
}
}
}
}

View File

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

View File

@@ -15,7 +15,7 @@ namespace XCharts.Editor
public override void OnGUI(Rect pos, SerializedProperty prop, GUIContent label)
{
base.OnGUI(pos, prop, label);
if (MakeComponentFoldout(prop, "", true))
if (MakeComponentFoldout(prop, "m_Show", true))
{
++EditorGUI.indentLevel;
#if dUI_TextMeshPro
@@ -24,11 +24,8 @@ namespace XCharts.Editor
PropertyField(prop, "m_Font");
#endif
PropertyField(prop, "m_Rotate");
PropertyField(prop, "m_Offset");
PropertyField(prop, "m_ExtraWidth");
PropertyField(prop, "m_AutoColor");
PropertyField(prop, "m_Color");
PropertyField(prop, "m_AutoBackgroundColor");
PropertyField(prop, "m_BackgroundColor");
PropertyField(prop, "m_FontSize");
PropertyField(prop, "m_LineSpacing");
#if dUI_TextMeshPro
@@ -37,8 +34,8 @@ namespace XCharts.Editor
#else
PropertyField(prop, "m_FontStyle");
PropertyField(prop, "m_Alignment");
PropertyField(prop, "m_AutoWrap");
PropertyField(prop, "m_AutoAlign");
PropertyField(prop, "m_AutoWrap");
#endif
--EditorGUI.indentLevel;
}

View File

@@ -44,6 +44,7 @@ namespace XCharts.Editor
XCThemeMgr.SwitchTheme(chart, chartNameList[selectedIndex]);
}
PropertyField(prop, "m_SharedTheme");
PropertyField(prop, "m_TransparentBackground");
PropertyField(prop, "m_EnableCustomTheme");
using (new EditorGUI.DisabledScope(!prop.FindPropertyRelative("m_EnableCustomTheme").boolValue))
{

View File

@@ -5,19 +5,8 @@ using XCharts.Runtime;
namespace XCharts.Editor
{
[CustomPropertyDrawer(typeof(TitleStyle), true)]
public class TitleStyleDrawer : BasePropertyDrawer
public class TitleStyleDrawer : LabelStyleDrawer
{
public override string ClassName { get { return "TitleStyle"; } }
public override void OnGUI(Rect pos, SerializedProperty prop, GUIContent label)
{
base.OnGUI(pos, prop, label);
if (MakeComponentFoldout(prop, "m_Show", true))
{
++EditorGUI.indentLevel;
PropertyField(prop, "m_OffsetCenter");
PropertyField(prop, "m_TextStyle");
--EditorGUI.indentLevel;
}
}
}
}

View File

@@ -80,7 +80,6 @@ namespace XCharts.Editor
PropertyField("m_AxisLabel");
PropertyField("m_SplitLine");
PropertyField("m_SplitArea");
PropertyField("m_IconStyle");
PropertyListField("m_Icons", true);
if (type == Axis.AxisType.Category)
{
@@ -153,17 +152,22 @@ namespace XCharts.Editor
++EditorGUI.indentLevel;
PropertyField(prop, "m_Inside");
PropertyField(prop, "m_Interval");
PropertyField(prop, "m_Distance");
PropertyField(prop, "m_Width");
PropertyField(prop, "m_Height");
PropertyField(prop, "m_Formatter");
PropertyField(prop, "m_NumericFormatter");
PropertyField(prop, "m_ShowAsPositiveNumber");
PropertyField(prop, "m_OnZero");
PropertyField(prop, "m_ShowStartLabel");
PropertyField(prop, "m_ShowEndLabel");
PropertyField(prop, "m_TextLimit");
PropertyField(prop, "m_Rotate");
PropertyField(prop, "m_Distance");
PropertyField(prop, "m_Formatter");
PropertyField(prop, "m_NumericFormatter");
PropertyField(prop, "m_Width");
PropertyField(prop, "m_Height");
PropertyField(prop, "m_Icon");
PropertyField(prop, "m_Background");
PropertyField(prop, "m_TextStyle");
PropertyField(prop, "m_TextPadding");
--EditorGUI.indentLevel;
}
}
@@ -180,9 +184,7 @@ namespace XCharts.Editor
{
++EditorGUI.indentLevel;
PropertyField(prop, "m_Name");
PropertyField(prop, "m_Formatter");
PropertyField(prop, "m_Location");
PropertyField(prop, "m_TextStyle");
PropertyField(prop, "m_LabelStyle");
--EditorGUI.indentLevel;
}
}

View File

@@ -46,9 +46,9 @@ namespace XCharts.Editor
PropertyField("m_Bottom");
PropertyField("m_LineStyle");
PropertyField("m_AreaStyle");
PropertyField("m_LabelStyle");
PropertyListField("m_XAxisIndexs", true);
PropertyListField("m_YAxisIndexs", true);
PropertyField("m_TextStyle");
}
else
{

View File

@@ -19,7 +19,7 @@ namespace XCharts.Editor
PropertyField("m_Orient");
PropertyField("m_Formatter");
PropertyField("m_Location");
PropertyField("m_TextStyle");
PropertyField("m_LabelStyle");
PropertyListField("m_Icons");
PropertyListField("m_Data");
--EditorGUI.indentLevel;

View File

@@ -14,8 +14,8 @@ namespace XCharts.Editor
PropertyField("m_SubText");
PropertyField("m_ItemGap");
PropertyField("m_Location");
PropertyField("m_TextStyle");
PropertyField("m_SubTextStyle");
PropertyField("m_LabelStyle");
PropertyField("m_SubLabelStyle");
--EditorGUI.indentLevel;
}
}

View File

@@ -17,10 +17,10 @@ namespace XCharts.Editor
PropertyField("m_TitleFormatter");
PropertyField("m_ItemFormatter");
PropertyField("m_NumericFormatter");
PropertyField("m_TitleHeight");
PropertyField("m_ItemHeight");
PropertyFiledMore(() =>
{
PropertyField("m_TitleHeight");
PropertyField("m_ItemHeight");
PropertyField("m_Marker");
PropertyField("m_BorderWidth");
PropertyField("m_BorderColor");
@@ -40,9 +40,9 @@ namespace XCharts.Editor
PropertyField("m_FixedY");
});
PropertyField("m_LineStyle");
PropertyField("m_LabelTextStyle");
PropertyField("m_TitleTextStyle");
PropertyListField("m_ColumnsTextStyle");
PropertyField("m_IndicatorLabelStyle");
PropertyField("m_TitleLabelStyle");
PropertyListField("m_ContentLabelStyles");
--EditorGUI.indentLevel;
}
}

View File

@@ -20,8 +20,10 @@ namespace XCharts.Editor
PropertyField("m_Max");
PropertyField("m_SplitNumber");
PropertyField("m_Dimension");
PropertyField("m_Show");
if (baseProperty.FindPropertyRelative("m_Show").boolValue)
PropertyField("m_WorkOnLine");
PropertyField("m_WorkOnArea");
PropertyField("m_ShowUI");
if (baseProperty.FindPropertyRelative("m_ShowUI").boolValue)
{
PropertyField("m_SelectedMode");
PropertyTwoFiled("m_Range");

View File

@@ -11,6 +11,7 @@ namespace XCharts.Editor
PropertyField("m_Gap");
PropertyTwoFiled("m_Center");
PropertyTwoFiled("m_Radius");
//PropertyField("m_StartAngle");
PropertyFiledMore(() =>
{

View File

@@ -195,7 +195,6 @@ namespace XCharts.Editor
var m_Id = serieData.FindPropertyRelative("m_Id");
var m_ParentId = serieData.FindPropertyRelative("m_ParentId");
var m_IconStyle = serieData.FindPropertyRelative("m_IconStyles");
var m_Label = serieData.FindPropertyRelative("m_Labels");
var m_ItemStyle = serieData.FindPropertyRelative("m_ItemStyles");
var m_Emphasis = serieData.FindPropertyRelative("m_Emphases");
@@ -208,7 +207,7 @@ namespace XCharts.Editor
PropertyField(m_Id);
PropertyField(m_ParentId);
var componentNum = m_IconStyle.arraySize + m_Label.arraySize + m_ItemStyle.arraySize + m_Emphasis.arraySize
var componentNum = m_Label.arraySize + m_ItemStyle.arraySize + m_Emphasis.arraySize
+ m_Symbol.arraySize + m_LineStyle.arraySize + m_AreaStyle.arraySize;
var title = "Component";
if (componentNum == 0) title += " (None)";
@@ -217,10 +216,6 @@ namespace XCharts.Editor
{
serie.GetSerieData(index).GetOrAddComponent<ItemStyle>();
}, m_ItemStyle.arraySize == 0),
new HeaderMenuInfo("Add IconStyle", () =>
{
serie.GetSerieData(index).GetOrAddComponent<IconStyle>();
}, m_IconStyle.arraySize == 0),
new HeaderMenuInfo("Add Label", () =>
{
serie.GetSerieData(index).GetOrAddComponent<LabelStyle>();
@@ -249,10 +244,6 @@ namespace XCharts.Editor
{
serie.GetSerieData(index).RemoveComponent<ItemStyle>();
}, m_ItemStyle.arraySize > 0),
new HeaderMenuInfo("Remove IconStyle", () =>
{
serie.GetSerieData(index).RemoveComponent<IconStyle>();
}, m_IconStyle.arraySize > 0),
new HeaderMenuInfo("Remove Label", () =>
{
serie.GetSerieData(index).RemoveComponent<LabelStyle>();
@@ -283,8 +274,6 @@ namespace XCharts.Editor
}, componentNum > 0));
if (m_DataComponentFoldout)
{
if (m_IconStyle.arraySize > 0)
PropertyField(m_IconStyle.GetArrayElementAtIndex(0));
if (m_Label.arraySize > 0)
PropertyField(m_Label.GetArrayElementAtIndex(0));
if (m_ItemStyle.arraySize > 0)

View File

@@ -43,6 +43,7 @@ namespace XCharts.Editor
public static void CheckDeletedAsset(string assetPath)
{
if (!IsThemeAsset(assetPath)) return;
if (XCSettings.Instance == null) return;
var themes = XCSettings.customThemes;
var changed = false;

View File

@@ -48,7 +48,6 @@ namespace XCharts.Editor
static SettingsProvider[] CreateXCSettingsProvider()
{
var providers = new System.Collections.Generic.List<SettingsProvider> { new XCResourceImporterProvider() };
if (GetSettings() != null)
{
var provider = new AssetSettingsProvider("Project/XCharts/Settings", GetSettings);

View File

@@ -193,20 +193,5 @@ namespace XCharts.Editor
XChartsMgr.ModifyTMPRefence(true);
XChartsMgr.DisableTextMeshPro();
}
[MenuItem("XCharts/Theme/Export Default Theme")]
public static void ExportDefaultTheme()
{
var profile = ScriptableObject.CreateInstance<Theme>();
profile.name = "Default";
profile.themeName = "Default";
profile.themeType = ThemeType.Default;
var themeName = XCSettings.THEME_ASSET_NAME_PREFIX + profile.themeName;
var path = XCSettings.THEME_ASSET_FOLDER + "/" + themeName + ".asset";
AssetDatabase.CreateAsset(profile, path);
AssetDatabase.SaveAssets();
AssetDatabase.Refresh();
}
}
}

View File

@@ -270,6 +270,7 @@ namespace XCharts.Example
var visualMap = chart.GetOrAddChartComponent<VisualMap>();
visualMap.show = true;
visualMap.showUI = true;
visualMap.orient = Orient.Vertical;
visualMap.calculable = true;
visualMap.min = 0;

View File

@@ -222,7 +222,7 @@ namespace XCharts.Example
yield return new WaitForSeconds(1);
serie.label.textStyle.color = Color.white;
serie.label.textStyle.backgroundColor = Color.grey;
serie.label.background.color = Color.grey;
serie.labelDirty = true;
chart.RefreshChart();
yield return new WaitForSeconds(1);

View File

@@ -8,7 +8,16 @@ namespace XCharts.Example
[ExecuteInEditMode]
public class Example13_LineSimple : MonoBehaviour
{
void Awake()
void Update()
{
if (Input.GetKeyDown(KeyCode.Space))
{
AddData();
//OnTestBtn();
}
}
void AddData()
{
var chart = gameObject.GetComponent<LineChart>();
if (chart == null)

View File

@@ -47,60 +47,78 @@
[XCharts3.0 教程](Documentation/XChartsTutorial01-ZH.md)
[XCharts3.0 API](Documentation/XChartsAPI-ZH.md)
[XCharts3.0 问答](Documentation/XChartsFQA-ZH.md)
[XCharts3.0 问答](Documentation/XChartsFAQ-ZH.md)
[XCharts3.0 配置项手册](Documentation/XChartsConfiguration-ZH.md)
[XCharts3.0 更新日志](CHANGELOG.md)
## 特性
* 参数可视化配置,效果实时预览,纯代码绘制,无需额外资源。
* 支持折线图、柱状图、饼图、雷达图、散点图、热力图、环形图、K线图、极坐标、平行坐标等十种常见免费内置图表。
* 支持3D柱图、漏斗图、金字塔、仪表盘、水位图、象形柱图、甘特图、矩形树图等多种付费扩展图表。
* 支持直线图、曲线图、面积图、阶梯线图等折线图。
* 支持并列柱图、堆叠柱图、堆积百分比柱图、斑马柱图等柱状图。
* 支持环形图、玫瑰图等饼图。
* 支持内置图表的任意组合,同一图表中可同时显示多个相同或不同类型的图表。
* 支持实线、曲线、阶梯线、虚线、点线、点划线、双点划线等线条。
* 支持主题定制、导入和导出,内置两种默认主题。
* 支持自定义图表内容绘制提供绘制点、直线、曲线、三角形、四边形、圆形、环形、扇形、边框、箭头等强大的绘图API。
* 支持PC端和手机端上的数据筛选、视图缩放、细节展示等交互操作。
* 支持万级大数据绘制。
* 支持`TexMeshPro`
## XCharts3.0 比 2.0 的改进
* 更健壮的底层框架。
* 更小的序列化文件。
* 更强大的性能。
* 更好的交互体验。
* 更多的组件支持。
* 更合理的组件调整。
* 更灵活的组件插拔。
* 更方便的二次开发。
* 更丰富的Demo示例。
- 参数可视化配置,效果实时预览,纯代码绘制,无需额外资源。
- 支持折线图、柱状图、饼图、雷达图、散点图、热力图、环形图、K线图、极坐标、平行坐标等十种常见免费内置图表。
- 支持3D柱图、漏斗图、金字塔、仪表盘、水位图、象形柱图、甘特图、矩形树图等多种付费扩展图表。
- 支持直线图、曲线图、面积图、阶梯线图等折线图。
- 支持并列柱图、堆叠柱图、堆积百分比柱图、斑马柱图等柱状图。
- 支持环形图、玫瑰图等饼图。
- 支持内置图表的任意组合,同一图表中可同时显示多个相同或不同类型的图表。
- 支持实线、曲线、阶梯线、虚线、点线、点划线、双点划线等线条。
- 支持主题定制、导入和导出,内置两种默认主题。
- 支持自定义图表内容绘制提供绘制点、直线、曲线、三角形、四边形、圆形、环形、扇形、边框、箭头等强大的绘图API。
- 支持PC端和手机端上的数据筛选、视图缩放、细节展示等交互操作。
- 支持万级大数据绘制。
- 支持`TexMeshPro`
## XCharts3.0 新功能
* 增加Time时间轴。
* 增加SingleAxis单轴。
* 增加多种坐标系Grid、Polar、Radar、SingleAxis。
* 增加多种动画方式。
* 增加多种图表交互。
* 增加国际化支持。
* 增加Widgets小组件。
* 增加多种扩展图表。
- 增加Time时间轴。
- 增加SingleAxis单轴。
- 增加多种坐标系Grid、Polar、Radar、SingleAxis。
- 增加多种动画方式。
- 增加多种图表交互。
- 增加国际化支持。
- 增加Widgets小组件。
- 增加多种扩展图表。
## XCharts3.0 相比 XCharts2.0 的改进
- 更健壮的底层框架。
- 更强大的性能。
- 更小的序列化文件。
- 更好的交互体验。
- 更多的组件支持。
- 更合理的组件调整。
- 更灵活的组件插拔。
- 更方便的二次开发。
- 更丰富的Demo示例。
## XCharts3.0 和 2.0 数据对比
| Case | XCharts2.0 | XCharts3.0 | Note |
| -- | -- | -- | -- |
| 2000数据折线图的帧频 | 20 | 83 | 性能提升 3 倍 |
| 2000数据折线图的顶点数 | 36.5k | 6.7k | 顶点数减少 4 倍 |
| 2000数据折线图的Prefab大小 | 11.1MB | 802KB | 序列化文件大小减少 10 倍 |
| 单条折线图数据最大容量 | 4.1k | 19k | 单Serie数据容量提升 4 倍 |
| 支持的图表 | 11种 |23种 | 支持的图表多 1 倍 |
## 注意
- XCharts3.0 不兼容 XCharts2.0 版本建议旧项目还是继续使用XCharts2.0新项目使用XCharts3.0。
- XCharts2.0 进入维护阶段后续只修复严重bug理论上不再加新功能。
- XCharts 理论上支持Unity 5.6及以上版本但由于版本测试有限难免疏漏发现版本兼容问题可提Issue。
- XCharts 内置图表都为常见的图表可以免费使用扩展图表大部分为不常使用的图表有需要的可付费获取感谢对XCharts的支持。
- 本仓库只包含XCharts源码不包含Demo示例部分。需要查看Demo示例请到[XCharts-Demo](https://github.com/XCharts-Team/XCharts-Demo)
## 截图
[XCharts Demo 项目](https://github.com/XCharts-Team/XCharts-Demo)
![buildinchart](https://github.com/XCharts-Team/XCharts-Demo/blob/master/buildinchart.png)
![extendchart](https://github.com/XCharts-Team/XCharts-Demo/blob/master/extendchart.png)
更多示例请看 [XCharts-Demo](https://github.com/XCharts-Team/XCharts-Demo),也可以到 [在线Demo](https://xcharts-team.github.io/demo/) 查看WebGL下的运行效果。
## 使用
[XCharts教程5分钟上手教程](Documentation/XChartsTutorial01-ZH.md)
[XCharts教程5分钟上手教程](Documentation/XChartsTutorial01-ZH.md)
## 日志

View File

@@ -48,10 +48,5 @@ MonoBehaviour:
m_PieTooltipExtraRadius: 8
m_PieSelectedOffset: 8
m_CustomThemes:
- {fileID: 0}
- {fileID: 11400000, guid: 289d2fc7f4ce24f73b9ed8ec52639f72, type: 2}
- {fileID: 11400000, guid: e1dc23a10de1e4c5dbfbaf74c4dfd218, type: 2}
- {fileID: 0}
- {fileID: 0}
- {fileID: 11400000, guid: 0a4f01779f9b24f48846f968fe013a57, type: 2}
- {fileID: 11400000, guid: 4d093c897dc514d12aca94b6b17cb4fa, type: 2}

View File

@@ -13,6 +13,8 @@ namespace XCharts.Runtime
protected override void DefaultChart()
{
AddChartComponentWhenNoExist<PolarCoord>();
AddChartComponentWhenNoExist<AngleAxis>();
AddChartComponentWhenNoExist<RadiusAxis>();
var tooltip = GetChartComponent<Tooltip>();
tooltip.type = Tooltip.Type.Corss;

View File

@@ -532,18 +532,21 @@ namespace XCharts.Runtime
isEnd = true;
}
}
else if (currHig - destProgress > 0)
else
{
currHig = destProgress;
isEnd = true;
if ((destProgress - startProgress > 0 && currHig > destProgress)
|| (destProgress - startProgress < 0 && currHig < destProgress))
{
currHig = destProgress;
isEnd = true;
}
}
SetDataCurrProgress(dataIndex, currHig);
return currHig;
}
}
internal void CheckSymbol(float dest)
public void CheckSymbol(float dest)
{
if (!enable || m_IsEnd || m_IsPause || !m_IsInit)
return;

View File

@@ -18,7 +18,7 @@ namespace XCharts.Runtime
return destProgress;
}
var isDataAnimationEnd = true;
float currHig = serie.animation.CheckItemProgress(dataIndex, destProgress, ref isDataAnimationEnd, startPorgress);
var currHig = serie.animation.CheckItemProgress(dataIndex, destProgress, ref isDataAnimationEnd, startPorgress);
if (!isDataAnimationEnd)
{
serie.animation.context.isAllItemAnimationEnd = false;

View File

@@ -9,6 +9,7 @@ namespace XCharts.Runtime
/// |极坐标系的角度轴。
/// </summary>
[System.Serializable]
[RequireChartComponent(typeof(PolarCoord))]
[ComponentHandler(typeof(AngleAxisHandler), true)]
public class AngleAxis : Axis
{

View File

@@ -86,14 +86,14 @@ namespace XCharts.Runtime
bool inside = axis.axisLabel.inside;
var labelName = AxisHelper.GetLabelName(axis, total, i, axis.context.minValue, axis.context.maxValue,
null, isPercentStack);
var label = ChartHelper.AddAxisLabelObject(splitNumber, i, objName + i, axisObj.transform, new Vector2(0.5f, 0.5f),
new Vector2(0.5f, 0.5f), new Vector2(0.5f, 0.5f), new Vector2(scaleAngle, txtHig), axis,
chart.theme.axis, labelName);
label.label.SetAlignment(axis.axisLabel.textStyle.GetAlignment(TextAnchor.MiddleCenter));
var label = ChartHelper.AddAxisLabelObject(splitNumber, i, objName + i, axisObj.transform,
new Vector2(scaleAngle, txtHig), axis,
chart.theme.axis, labelName, Color.clear);
label.text.SetAlignment(axis.axisLabel.textStyle.GetAlignment(TextAnchor.MiddleCenter));
var pos = ChartHelper.GetPos(cenPos, radius + margin,
isCategory ? (totalAngle + scaleAngle / 2) : totalAngle, true);
AxisHelper.AdjustCircleLabelPos(label, pos, cenPos, txtHig, Vector3.zero);
if (i == 0) axis.axisLabel.SetRelatedText(label.label, scaleAngle);
if (i == 0) axis.axisLabel.SetRelatedText(label.text, scaleAngle);
axis.context.labelObjectList.Add(label);
totalAngle += scaleAngle;

View File

@@ -94,7 +94,6 @@ namespace XCharts.Runtime
[SerializeField] protected bool m_Inverse = false;
[SerializeField] private bool m_Clockwise = true;
[SerializeField] private bool m_InsertDataToHead;
[SerializeField] private IconStyle m_IconStyle = new IconStyle();
[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;
@@ -362,14 +361,6 @@ namespace XCharts.Runtime
get { return m_InsertDataToHead; }
set { if (PropertyUtil.SetStruct(ref m_InsertDataToHead, value)) SetAllDirty(); }
}
/// <summary>
/// 图标样式。
/// </summary>
public IconStyle iconStyle
{
get { return m_IconStyle; }
set { if (PropertyUtil.SetClass(ref m_IconStyle, value)) SetAllDirty(); }
}
public override bool vertsDirty
{
@@ -432,7 +423,6 @@ namespace XCharts.Runtime
axis.logBaseE = logBaseE;
axis.ceilRate = ceilRate;
axis.insertDataToHead = insertDataToHead;
axis.iconStyle = iconStyle.Clone();
axis.axisLine = axisLine.Clone();
axis.axisName = axisName.Clone();
axis.axisTick = axisTick.Clone();
@@ -461,7 +451,6 @@ namespace XCharts.Runtime
logBaseE = axis.logBaseE;
ceilRate = axis.ceilRate;
insertDataToHead = axis.insertDataToHead;
iconStyle.Copy(axis.iconStyle);
axisLine.Copy(axis.axisLine);
axisName.Copy(axis.axisName);
axisTick.Copy(axis.axisTick);

View File

@@ -7,43 +7,43 @@ namespace XCharts.Runtime
{
public class AxisContext : MainComponentContext
{
internal Orient orient { get; set; }
public float x { get; internal set; }
public float y { get; internal set; }
public float width { get; internal set; }
public float height { get; internal set; }
public Vector3 position { get; internal set; }
public float left { get; internal set; }
public float right { get; internal set; }
public float bottom { get; internal set; }
public float top { get; internal set; }
public Orient orient;
public float x;
public float y;
public float width;
public float height;
public Vector3 position;
public float left;
public float right;
public float bottom;
public float top;
/// <summary>
/// the current minimun value.
/// |当前最小值。
/// </summary>
public double minValue { get; internal set; }
public double minValue;
/// <summary>
/// the current maximum value.
/// |当前最大值。
/// </summary>
public double maxValue { get; internal set; }
public double maxValue;
/// <summary>
/// the offset of zero position.
/// |坐标轴原点在坐标轴的偏移。
/// </summary>
public float offset { get; internal set; }
public double minMaxRange { get; internal set; }
public float scaleWidth { get; internal set; }
public float startAngle { get; set; }
public double pointerValue { get; internal set; }
public Vector3 pointerLabelPosition { get; internal set; }
public double axisTooltipValue { get; internal set; }
public float offset;
public double minMaxRange;
public float scaleWidth;
public float startAngle;
public double pointerValue;
public Vector3 pointerLabelPosition;
public double axisTooltipValue;
public List<string> runtimeData { get { return m_RuntimeData; } }
public List<double> labelValueList { get { return m_LabelValueList; } }
public List<ChartLabel> labelObjectList { get { return m_AxisLabelList; } }
internal List<string> filterData;
internal bool lastCheckInverse { get; set; }
internal bool lastCheckInverse;
internal bool isNeedUpdateFilterData;
private int filterStart;
@@ -104,7 +104,12 @@ namespace XCharts.Runtime
else
range = dataZoom.minShowNum;
}
filterData = data.GetRange(start, range);
if (range > data.Count - start - 1)
start = data.Count - range - 1;
if (start >= 0)
filterData = data.GetRange(start, range);
else
filterData = data;
}
else
{

View File

@@ -34,7 +34,7 @@ namespace XCharts
return;
if (!grid.context.isPointerEnter)
{
axis.context.pointerValue = 0;
axis.context.pointerValue = double.PositiveInfinity;
}
else
{
@@ -296,12 +296,12 @@ namespace XCharts
if (i == 0)
{
var dist = GetLabelPosition(0, 1).x - pos.x;
label.SetLabelActive(dist > label.label.GetPreferredWidth());
label.SetTextActive(dist > label.text.GetPreferredWidth());
}
else if (i == axis.context.labelValueList.Count - 1)
{
var dist = pos.x - GetLabelPosition(0, i - 1).x;
label.SetLabelActive(dist > label.label.GetPreferredWidth());
label.SetTextActive(dist > label.text.GetPreferredWidth());
}
}
else
@@ -309,12 +309,12 @@ namespace XCharts
if (i == 0)
{
var dist = GetLabelPosition(0, 1).y - pos.y;
label.SetLabelActive(dist > label.label.GetPreferredHeight());
label.SetTextActive(dist > label.text.GetPreferredHeight());
}
else if (i == axis.context.labelValueList.Count - 1)
{
var dist = pos.y - GetLabelPosition(0, i - 1).y;
label.SetLabelActive(dist > label.label.GetPreferredHeight());
label.SetTextActive(dist > label.text.GetPreferredHeight());
}
}
}
@@ -361,82 +361,36 @@ namespace XCharts
? axis.axisLabel.height
: 20f;
var isPercentStack = SeriesHelper.IsPercentStack<Bar>(chart.series);
var inside = axis.axisLabel.inside;
var defaultAlignment = orient == Orient.Horizonal ? TextAnchor.MiddleCenter :
((inside && axis.IsLeft()) || (!inside && axis.IsRight())
? TextAnchor.MiddleLeft
: TextAnchor.MiddleRight);
if (axis.IsCategory() && axis.boundaryGap)
{
splitNumber -= 1;
}
for (int i = 0; i < splitNumber; i++)
{
ChartLabel label;
var labelWidth = AxisHelper.GetScaleWidth(axis, axisLength, i + 1, dataZoom);
var inside = axis.axisLabel.inside;
var isPercentStack = SeriesHelper.IsPercentStack<Bar>(chart.series);
var labelName = AxisHelper.GetLabelName(axis, axisLength, i,
axis.context.minValue,
axis.context.maxValue,
dataZoom, isPercentStack);
if (orient == Orient.Horizonal)
{
label = ChartHelper.AddAxisLabelObject(splitNumber, i,
ChartCached.GetAxisLabelName(i),
axisObj.transform,
new Vector2(0.5f, 0.5f),
new Vector2(0.5f, 0.5f),
new Vector2(0.5f, 0.5f),
new Vector2(textWidth, textHeight),
axis, chart.theme.axis, labelName);
}
else
{
if ((inside && axis.IsLeft()) || (!inside && axis.IsRight()))
{
label = ChartHelper.AddAxisLabelObject(splitNumber, i,
ChartCached.GetAxisLabelName(i),
axisObj.transform,
Vector2.zero,
Vector2.zero,
new Vector2(0, 0.5f),
new Vector2(textWidth, textHeight),
axis, chart.theme.axis, labelName);
label.label.SetAlignment(axisLabelTextStyle.GetAlignment(TextAnchor.MiddleLeft));
}
else
{
label = ChartHelper.AddAxisLabelObject(splitNumber, i,
ChartCached.GetAxisLabelName(i),
axisObj.transform,
Vector2.zero,
Vector2.zero,
new Vector2(1, 0.5f),
new Vector2(textWidth, textHeight),
axis, chart.theme.axis, labelName);
label.label.SetAlignment(axisLabelTextStyle.GetAlignment(TextAnchor.MiddleRight));
}
}
var label = ChartHelper.AddAxisLabelObject(splitNumber, i,
ChartCached.GetAxisLabelName(i),
axisObj.transform,
new Vector2(textWidth, textHeight),
axis, chart.theme.axis, labelName,
Color.clear,
defaultAlignment);
if (i == 0)
axis.axisLabel.SetRelatedText(label.label, labelWidth);
axis.axisLabel.SetRelatedText(label.text, labelWidth);
var pos = handler.GetLabelPosition(totalWidth + gapWidth, i);
if (orient == Orient.Horizonal)
{
label.label.SetAlignment(axisLabelTextStyle.GetAlignment(TextAnchor.MiddleCenter));
}
else
{
if (axis.IsRight())
label.label.SetAlignment(axisLabelTextStyle.GetAlignment(TextAnchor.MiddleLeft));
else
label.label.SetAlignment(axisLabelTextStyle.GetAlignment(TextAnchor.MiddleRight));
}
label.SetPosition(pos);
handler.CheckValueLabelActive(axis, i, label, pos);
@@ -446,59 +400,41 @@ namespace XCharts
}
if (axis.axisName.show)
{
ChartText axisName = null;
var axisNameTextStyle = axis.axisName.textStyle;
var offset = axisNameTextStyle.offset;
ChartLabel label = null;
var relativedDist = (relativedAxis == null ? 0 : relativedAxis.context.offset);
var zeroPos = new Vector3(axisStartX, axisStartY + relativedDist);
var offset = axis.axisName.labelStyle.offset;
var autoColor = axis.axisLine.GetColor(chart.theme.axis.lineColor);
if (orient == Orient.Horizonal)
{
switch (axis.axisName.location)
switch (axis.axisName.labelStyle.position)
{
case AxisName.Location.Start:
case LabelStyle.Position.Start:
axisName = ChartHelper.AddTextObject(s_DefaultAxisName, axisObj.transform,
new Vector2(1, 0.5f),
new Vector2(1, 0.5f),
new Vector2(1, 0.5f),
new Vector2(100, 20),
axisNameTextStyle, chart.theme.axis);
axisName.SetAlignment(axisNameTextStyle.GetAlignment(TextAnchor.MiddleRight));
axisName.SetLocalPosition(axis.position == Axis.AxisPosition.Top
label = ChartHelper.AddChartLabel(s_DefaultAxisName, axisObj.transform, axis.axisName.labelStyle,
chart.theme.axis, axis.axisName.name, autoColor, TextAnchor.MiddleRight);
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, zeroPos.y + offset.y + axis.offset));
break;
case AxisName.Location.Middle:
case LabelStyle.Position.Middle:
axisName = ChartHelper.AddTextObject(s_DefaultAxisName, axisObj.transform,
new Vector2(0.5f, 0.5f),
new Vector2(0.5f, 0.5f),
new Vector2(0.5f, 0.5f),
new Vector2(100, 20),
axisNameTextStyle, chart.theme.axis);
axisName.SetAlignment(axisNameTextStyle.GetAlignment(TextAnchor.MiddleCenter));
axisName.SetLocalPosition(axis.position == Axis.AxisPosition.Top
label = ChartHelper.AddChartLabel(s_DefaultAxisName, axisObj.transform, axis.axisName.labelStyle,
chart.theme.axis, axis.axisName.name, autoColor, TextAnchor.MiddleCenter);
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, axisStartY - offset.y + axis.offset));
break;
case AxisName.Location.End:
default:
axisName = ChartHelper.AddTextObject(s_DefaultAxisName, axisObj.transform,
new Vector2(0, 0.5f),
new Vector2(0, 0.5f),
new Vector2(0, 0.5f),
new Vector2(100, 20),
axisNameTextStyle, chart.theme.axis);
axisName.SetAlignment(axisNameTextStyle.GetAlignment(TextAnchor.MiddleLeft));
axisName.SetLocalPosition(axis.position == Axis.AxisPosition.Top
label = ChartHelper.AddChartLabel(s_DefaultAxisName, axisObj.transform, axis.axisName.labelStyle,
chart.theme.axis, axis.axisName.name, autoColor, TextAnchor.MiddleLeft);
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, zeroPos.y + offset.y + axis.offset));
break;
@@ -506,43 +442,39 @@ namespace XCharts
}
else
{
switch (axis.axisName.location)
switch (axis.axisName.labelStyle.position)
{
case AxisName.Location.Start:
case LabelStyle.Position.Start:
axisName = ChartHelper.AddTextObject(s_DefaultAxisName, axisObj.transform, new Vector2(0.5f, 0.5f),
new Vector2(0.5f, 0.5f), new Vector2(0.5f, 0.5f), new Vector2(100, 20), axisNameTextStyle,
chart.theme.axis);
axisName.SetAlignment(axisNameTextStyle.GetAlignment(TextAnchor.MiddleCenter));
axisName.SetLocalPosition(axis.position == Axis.AxisPosition.Right ?
label = ChartHelper.AddChartLabel(s_DefaultAxisName, axisObj.transform, axis.axisName.labelStyle,
chart.theme.axis, axis.axisName.name, autoColor, TextAnchor.MiddleCenter);
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(zeroPos.x + offset.x + axis.offset, axisStartY - offset.y));
break;
case AxisName.Location.Middle:
case LabelStyle.Position.Middle:
axisName = ChartHelper.AddTextObject(s_DefaultAxisName, axisObj.transform, new Vector2(1, 0.5f),
new Vector2(1, 0.5f), new Vector2(1, 0.5f), new Vector2(100, 20), axisNameTextStyle,
chart.theme.axis);
axisName.SetAlignment(axisNameTextStyle.GetAlignment(TextAnchor.MiddleRight));
axisName.SetLocalPosition(axis.position == Axis.AxisPosition.Right ?
new Vector2(axisStartX + relativedLength - offset.x + axis.offset, axisStartY + axisLength / 2 + offset.y) :
new Vector2(axisStartX - offset.x + axis.offset, axisStartY + axisLength / 2 + offset.y));
label = ChartHelper.AddChartLabel(s_DefaultAxisName, axisObj.transform, axis.axisName.labelStyle,
chart.theme.axis, axis.axisName.name, autoColor, TextAnchor.MiddleCenter);
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(axisStartX - offset.x + axis.offset, axisStartY + axisLength / 2 + offset.y));
break;
case AxisName.Location.End:
axisName = ChartHelper.AddTextObject(s_DefaultAxisName, axisObj.transform, new Vector2(0.5f, 0.5f),
new Vector2(0.5f, 0.5f), new Vector2(0.5f, 0.5f), new Vector2(100, 20), axisNameTextStyle,
chart.theme.axis);
axisName.SetAlignment(axisNameTextStyle.GetAlignment(TextAnchor.MiddleCenter));
axisName.SetLocalPosition(axis.position == Axis.AxisPosition.Right ?
default:
//LabelStyle.Position
label = ChartHelper.AddChartLabel(s_DefaultAxisName, axisObj.transform, axis.axisName.labelStyle,
chart.theme.axis, axis.axisName.name, autoColor, TextAnchor.MiddleCenter);
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(zeroPos.x + offset.x + axis.offset, axisStartY + axisLength + offset.y));
break;
}
}
axisName.SetText(axis.axisName.name);
}
}
@@ -573,7 +505,7 @@ namespace XCharts
else
current += axisStartY - axis.axisLabel.distance - fontSize / 2;
return new Vector3(axisStartX + scaleWid, current) + axis.axisLabel.textStyle.offsetv3;
return new Vector3(axisStartX + scaleWid, current);
}
else
{
@@ -588,7 +520,7 @@ namespace XCharts
else
current += axisStartX - axis.axisLabel.distance;
return new Vector3(current, axisStartY + scaleWid) + axis.axisLabel.textStyle.offsetv3;
return new Vector3(current, axisStartY + scaleWid);
}
}

View File

@@ -403,33 +403,11 @@ namespace XCharts.Runtime
return true;
}
public static void AdjustCircleLabelPos(ChartText txt, Vector3 pos, Vector3 cenPos, float txtHig, Vector3 offset)
{
var txtWidth = txt.GetPreferredWidth();
var sizeDelta = new Vector2(txtWidth, txt.GetPreferredHeight());
txt.SetSizeDelta(sizeDelta);
var diff = pos.x - cenPos.x;
if (diff < -1f) //left
{
pos = new Vector3(pos.x - txtWidth / 2, pos.y);
}
else if (diff > 1f) //right
{
pos = new Vector3(pos.x + txtWidth / 2, pos.y);
}
else
{
float y = pos.y > cenPos.y ? pos.y + txtHig / 2 : pos.y - txtHig / 2;
pos = new Vector3(pos.x, y);
}
txt.SetLocalPosition(pos + offset);
}
public static void AdjustCircleLabelPos(ChartLabel txt, Vector3 pos, Vector3 cenPos, float txtHig, Vector3 offset)
{
var txtWidth = txt.label.GetPreferredWidth();
var sizeDelta = new Vector2(txtWidth, txt.label.GetPreferredHeight());
txt.label.SetSizeDelta(sizeDelta);
var txtWidth = txt.text.GetPreferredWidth();
var sizeDelta = new Vector2(txtWidth, txt.text.GetPreferredHeight());
txt.text.SetSizeDelta(sizeDelta);
var diff = pos.x - cenPos.x;
if (diff < -1f) //left
{
@@ -447,11 +425,11 @@ namespace XCharts.Runtime
txt.SetPosition(pos + offset);
}
public static void AdjustRadiusAxisLabelPos(ChartText txt, Vector3 pos, Vector3 cenPos, float txtHig, Vector3 offset)
public static void AdjustRadiusAxisLabelPos(ChartLabel txt, Vector3 pos, Vector3 cenPos, float txtHig, Vector3 offset)
{
var txtWidth = txt.GetPreferredWidth();
var sizeDelta = new Vector2(txtWidth, txt.GetPreferredHeight());
txt.SetSizeDelta(sizeDelta);
var txtWidth = txt.text.GetPreferredWidth();
var sizeDelta = new Vector2(txtWidth, txt.text.GetPreferredHeight());
txt.text.SetSizeDelta(sizeDelta);
var diff = pos.y - cenPos.y;
if (diff > 20f) //left
{
@@ -466,7 +444,7 @@ namespace XCharts.Runtime
float y = pos.y > cenPos.y ? pos.y + txtHig / 2 : pos.y - txtHig / 2;
pos = new Vector3(pos.x, y);
}
txt.SetLocalPosition(pos);
txt.SetPosition(pos);
}
public static float GetAxisPosition(GridCoord grid, Axis axis, double value, int dataCount = 0, DataZoom dataZoom = null)
@@ -490,6 +468,22 @@ 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);
else if (axis is XAxis)
return GetAxisPositionValue(pos.x, grid.context.width, axis.context.minMaxRange, grid.context.x, axis.context.offset);
else
return 0;
}
public static double GetAxisPositionValue(float xy, float axisLength, double axisRange, float axisStart, float axisOffset)
{
var yRate = axisRange / axisLength;
return yRate * (xy - axisStart - axisOffset);
}
/// <summary>
/// 获得数值value在坐标轴上的坐标位置
/// </summary>

View File

@@ -10,33 +10,16 @@ namespace XCharts.Runtime
/// |坐标轴刻度标签的相关设置。
/// </summary>
[Serializable]
public class AxisLabel : ChildComponent
public class AxisLabel : LabelStyle
{
[SerializeField] private bool m_Show = true;
[SerializeField] private string m_Formatter;
[SerializeField] private int m_Interval = 0;
[SerializeField] private bool m_Inside = false;
[SerializeField] private float m_Distance;
[SerializeField] private string m_NumericFormatter = "";
[SerializeField] private bool m_ShowAsPositiveNumber = false;
[SerializeField] private bool m_OnZero = false;
[SerializeField] private float m_Width = 0f;
[SerializeField] private float m_Height = 0f;
[SerializeField] private bool m_ShowStartLabel = true;
[SerializeField] private bool m_ShowEndLabel = true;
[SerializeField] private TextLimit m_TextLimit = new TextLimit();
[SerializeField] private TextStyle m_TextStyle = new TextStyle();
private AxisLabelFormatterFunction m_FormatterFunction;
/// <summary>
/// Set this to false to prevent the axis label from appearing.
/// |是否显示刻度标签。
/// </summary>
public bool show
{
get { return m_Show; }
set { if (PropertyUtil.SetStruct(ref m_Show, value)) SetComponentDirty(); }
}
/// <summary>
/// The display interval of the axis label.
/// |坐标轴刻度标签的显示间隔在类目轴中有效。0表示显示所有标签1表示隔一个隔显示一个标签以此类推。
@@ -55,38 +38,6 @@ namespace XCharts.Runtime
get { return m_Inside; }
set { if (PropertyUtil.SetStruct(ref m_Inside, value)) SetComponentDirty(); }
}
/// <summary>
/// The distance between the axis label and the axis line.
/// |刻度标签与轴线之间的距离。
/// </summary>
public float distance
{
get { return m_Distance; }
set { if (PropertyUtil.SetStruct(ref m_Distance, value)) SetComponentDirty(); }
}
/// <summary>
/// 图例内容字符串模版格式器。支持用 \n 换行。
/// 模板变量为图例名称 {value}。
/// </summary>
public string formatter
{
get { return m_Formatter; }
set { if (PropertyUtil.SetClass(ref m_Formatter, value)) SetComponentDirty(); }
}
/// <summary>
/// Standard numeric format strings.
/// |标准数字格式字符串。用于将数值格式化显示为字符串。
/// 使用Axx的形式A是格式说明符的单字符支持C货币、D十进制、E指数、F定点数、G常规、N数字、P百分比、R往返、X十六进制的。xx是精度说明从0-99。
/// 参考https://docs.microsoft.com/zh-cn/dotnet/standard/base-types/standard-numeric-format-strings
/// </summary>
/// <value></value>
public string numericFormatter
{
get { return m_NumericFormatter; }
set { if (PropertyUtil.SetClass(ref m_NumericFormatter, value)) SetComponentDirty(); }
}
/// <summary>
/// Show negative number as positive number.
/// |将负数数值显示为正数。一般和`Serie`的`showAsPositiveNumber`配合使用。
@@ -106,22 +57,6 @@ namespace XCharts.Runtime
set { if (PropertyUtil.SetStruct(ref m_OnZero, value)) SetComponentDirty(); }
}
/// <summary>
/// 文本的宽。为0时会自动匹配。
/// </summary>
public float width
{
get { return m_Width; }
set { if (PropertyUtil.SetStruct(ref m_Width, value)) SetComponentDirty(); }
}
/// <summary>
/// 文本的高。为0时会自动匹配。
/// </summary>
public float height
{
get { return m_Height; }
set { if (PropertyUtil.SetStruct(ref m_Height, value)) SetComponentDirty(); }
}
/// <summary>
/// Whether to display the first label.
/// |是否显示第一个文本。
/// </summary>
@@ -148,21 +83,6 @@ namespace XCharts.Runtime
set { if (value != null) { m_TextLimit = value; SetComponentDirty(); } }
}
/// <summary>
/// The text style of axis name.
/// |文本样式。
/// </summary>
public TextStyle textStyle
{
get { return m_TextStyle; }
set { if (PropertyUtil.SetClass(ref m_TextStyle, value)) SetComponentDirty(); }
}
public AxisLabelFormatterFunction formatterFunction
{
set { m_FormatterFunction = value; }
}
public override bool componentDirty { get { return m_ComponentDirty || m_TextLimit.componentDirty; } }
public override void ClearComponentDirty()
{
@@ -185,7 +105,7 @@ namespace XCharts.Runtime
}
}
public AxisLabel Clone()
public new AxisLabel Clone()
{
var axisLabel = new AxisLabel();
axisLabel.show = show;

View File

@@ -11,21 +11,9 @@ namespace XCharts.Runtime
[Serializable]
public class AxisName : ChildComponent
{
/// <summary>
/// the location of axis name.
/// |坐标轴名称显示位置。
/// </summary>
public enum Location
{
Start,
Middle,
End
}
[SerializeField] private bool m_Show;
[SerializeField] private string m_Name;
[SerializeField] private string m_Formatter;
[SerializeField] private Location m_Location;
[SerializeField] private TextStyle m_TextStyle = new TextStyle();
[SerializeField] private LabelStyle m_LabelStyle = new LabelStyle();
/// <summary>
/// Whether to show axis name.
@@ -45,46 +33,28 @@ namespace XCharts.Runtime
get { return m_Name; }
set { if (PropertyUtil.SetClass(ref m_Name, value)) SetComponentDirty(); }
}
/// <summary>
/// The formatter of indicator's name.
/// |指示器名称显示的格式器。可用在雷达图。
/// </summary>
public string formatter
{
get { return m_Formatter; }
set { if (PropertyUtil.SetClass(ref m_Formatter, value)) SetComponentDirty(); }
}
/// <summary>
/// Location of axis name.
/// |坐标轴名称显示位置。
/// </summary>
public Location location
{
get { return m_Location; }
set { if (PropertyUtil.SetStruct(ref m_Location, value)) SetComponentDirty(); }
}
/// <summary>
/// The text style of axis name.
/// |文本样式。
/// </summary>
public TextStyle textStyle
public LabelStyle labelStyle
{
get { return m_TextStyle; }
set { if (PropertyUtil.SetClass(ref m_TextStyle, value)) SetComponentDirty(); }
get { return m_LabelStyle; }
set { if (PropertyUtil.SetClass(ref m_LabelStyle, value)) SetComponentDirty(); }
}
public static AxisName defaultAxisName
{
get
{
return new AxisName()
var axisName = new AxisName()
{
m_Show = false,
m_Name = "axisName",
m_Location = Location.End,
m_TextStyle = new TextStyle(),
m_LabelStyle = new LabelStyle()
};
axisName.labelStyle.position = LabelStyle.Position.End;
return axisName;
}
}
@@ -93,8 +63,7 @@ namespace XCharts.Runtime
var axisName = new AxisName();
axisName.show = show;
axisName.name = name;
axisName.location = location;
axisName.textStyle.Copy(textStyle);
axisName.m_LabelStyle.Copy(m_LabelStyle);
return axisName;
}
@@ -102,8 +71,7 @@ namespace XCharts.Runtime
{
show = axisName.show;
name = axisName.name;
location = axisName.location;
textStyle.Copy(axisName.textStyle);
m_LabelStyle.Copy(axisName.labelStyle);
}
}
}

View File

@@ -24,7 +24,6 @@ namespace XCharts.Runtime
splitLine.show = false;
splitLine.lineStyle.type = LineStyle.Type.None;
axisLabel.textLimit.enable = true;
iconStyle.show = false;
}

View File

@@ -8,6 +8,7 @@ namespace XCharts.Runtime
/// |极坐标系的径向轴。
/// </summary>
[System.Serializable]
[RequireChartComponent(typeof(PolarCoord))]
[ComponentHandler(typeof(RadiusAxisHandler), true)]
public class RadiusAxis : Axis
{

View File

@@ -36,12 +36,11 @@ namespace XCharts.Runtime
axis.context.pointerValue = double.PositiveInfinity;
return;
}
var angleAxis = ComponentHelper.GetAngleAxis(chart.components, polar.index);
if (angleAxis == null)
return;
var startAngle = angleAxis.context.startAngle;
var dist = Vector3.Distance(chart.pointerPos, polar.context.center);
axis.context.pointerValue = axis.context.minValue + (dist / polar.context.radius) * axis.context.minMaxRange;
axis.context.pointerLabelPosition = GetLabelPosition(polar, axis, angleAxis.context.startAngle, dist);
@@ -110,18 +109,17 @@ namespace XCharts.Runtime
var isPercentStack = SeriesHelper.IsPercentStack<Bar>(chart.series);
var labelName = AxisHelper.GetLabelName(axis, radius, i, axis.context.minValue, axis.context.maxValue,
null, isPercentStack);
var label = ChartHelper.AddAxisLabelObject(splitNumber, i, objName + i, axisObj.transform, new Vector2(0.5f, 0.5f),
new Vector2(0.5f, 0.5f), new Vector2(0.5f, 0.5f), new Vector2(labelWidth, txtHig), axis, chart.theme.axis,
labelName);
var label = ChartHelper.AddAxisLabelObject(splitNumber, i, objName + i, axisObj.transform,
new Vector2(labelWidth, txtHig), axis, chart.theme.axis, labelName, Color.clear);
if (i == 0)
axis.axisLabel.SetRelatedText(label.label, labelWidth);
axis.axisLabel.SetRelatedText(label.text, labelWidth);
label.label.SetAlignment(textStyle.GetAlignment(TextAnchor.MiddleCenter));
label.text.SetAlignment(textStyle.GetAlignment(TextAnchor.MiddleCenter));
label.SetText(labelName);
label.SetPosition(GetLabelPosition(polar, axis, angleAxis.context.startAngle, totalWidth));
label.SetActive(true);
label.SetLabelActive(true);
label.SetTextActive(true);
axis.context.labelObjectList.Add(label);

View File

@@ -140,7 +140,6 @@ namespace XCharts.Runtime
axisLabel.textLimit.enable = true;
axisTick.showStartTick = true;
axisTick.showEndTick = true;
iconStyle.show = false;
}
}
}

View File

@@ -28,7 +28,6 @@ namespace XCharts.Runtime
splitLine.show = false;
splitLine.lineStyle.type = LineStyle.Type.None;
axisLabel.textLimit.enable = true;
iconStyle.show = false;
}
}
}

View File

@@ -26,7 +26,6 @@ namespace XCharts.Runtime
splitLine.lineStyle.type = LineStyle.Type.None;
axisLabel.textLimit.enable = false;
axisTick.showStartTick = true;
iconStyle.show = false;
}
}
}

View File

@@ -71,7 +71,7 @@ namespace XCharts.Runtime
public override void SetDefaultValue()
{
m_Show = false;
m_Show = true;
m_Image = null;
m_ImageType = Image.Type.Sliced;
m_ImageColor = Color.white;

View File

@@ -33,32 +33,6 @@ namespace XCharts.Runtime
component.refreshComponent();
}
//protected void DrawBackground(VertexHelper vh)
//{
//TODO: CooridateChart
// if (SeriesHelper.IsAnyClipSerie(m_Series))
// {
// var xLineDiff = xAxis0.axisLine.GetWidth(m_Theme.axis.lineWidth);
// var yLineDiff = yAxis0.axisLine.GetWidth(m_Theme.axis.lineWidth);
// var xSplitDiff = xAxis0.splitLine.GetWidth(m_Theme.axis.splitLineWidth);
// var ySplitDiff = yAxis0.splitLine.GetWidth(m_Theme.axis.splitLineWidth);
// foreach (var grid in m_Grids)
// {
// var cpty = grid.context.runtimeY + grid.context.runtimeHeight + ySplitDiff;
// var cp1 = new Vector3(grid.context.runtimeX - yLineDiff, grid.context.runtimeY - xLineDiff);
// var cp2 = new Vector3(grid.context.runtimeX - yLineDiff, cpty);
// var cp3 = new Vector3(grid.context.runtimeX + grid.context.runtimeWidth + xSplitDiff, cpty);
// var cp4 = new Vector3(grid.context.runtimeX + grid.context.runtimeWidth + xSplitDiff, grid.context.runtimeY - xLineDiff);
// var backgroundColor = ThemeHelper.GetBackgroundColor(m_Theme, m_Background);
// UGL.DrawQuadrilateral(vh, cp1, cp2, cp3, cp4, backgroundColor);
// }
// }
// else
// {
// base.DrawBackground(vh);
// }
// }
public override void DrawBase(VertexHelper vh)
{
if (!component.show)

View File

@@ -7,5 +7,12 @@ namespace XCharts.Runtime
[System.Serializable]
public class EndLabelStyle : LabelStyle
{
public EndLabelStyle()
{
m_Offset = new Vector3(5, 0, 0);
m_TextStyle.alignment = TextAnchor.MiddleLeft;
m_NumericFormatter = "f0";
m_Formatter = "{a}:{c}";
}
}
}

View File

@@ -5,17 +5,26 @@ using UnityEngine.UI;
namespace XCharts.Runtime
{
[System.Serializable]
public class IconStyle : ChildComponent, ISerieExtraComponent, ISerieDataComponent
public class IconStyle : ChildComponent
{
public enum Layer
{
UnderLabel,
AboveLabel
/// <summary>
/// The icon is display under the label text.
/// 图标在标签文字下
/// </summary>
UnderText,
/// <summary>
/// The icon is display above the label text.
/// 图标在标签文字上
/// </summary>
AboveText
}
[SerializeField] private bool m_Show = false;
[SerializeField] private Layer m_Layer;
[SerializeField] private Align m_Align = Align.Left;
[SerializeField] private Sprite m_Sprite;
[SerializeField] private Image.Type m_Type;
[SerializeField] private Color m_Color = Color.white;
[SerializeField] private float m_Width = 20;
[SerializeField] private float m_Height = 20;
@@ -25,7 +34,7 @@ namespace XCharts.Runtime
public void Reset()
{
m_Show = false;
m_Layer = Layer.UnderLabel;
m_Layer = Layer.UnderText;
m_Sprite = null;
m_Color = Color.white;
m_Width = 20;
@@ -48,6 +57,11 @@ namespace XCharts.Runtime
/// </summary>
public Sprite sprite { get { return m_Sprite; } set { m_Sprite = value; } }
/// <summary>
/// How to display the icon.
/// |图片的显示类型。
/// </summary>
public Image.Type type { get { return m_Type; } set { m_Type = value; } }
/// <summary>
/// 图标颜色。
/// </summary>
public Color color { get { return m_Color; } set { m_Color = value; } }
@@ -77,6 +91,7 @@ namespace XCharts.Runtime
iconStyle.show = show;
iconStyle.layer = layer;
iconStyle.sprite = sprite;
iconStyle.type = type;
iconStyle.color = color;
iconStyle.width = width;
iconStyle.height = height;
@@ -91,6 +106,7 @@ namespace XCharts.Runtime
show = iconStyle.show;
layer = iconStyle.layer;
sprite = iconStyle.sprite;
type = iconStyle.type;
color = iconStyle.color;
width = iconStyle.width;
height = iconStyle.height;

View File

@@ -0,0 +1,82 @@

using UnityEngine;
using UnityEngine.UI;
namespace XCharts.Runtime
{
[System.Serializable]
public class ImageStyle : ChildComponent, ISerieExtraComponent, ISerieDataComponent
{
[SerializeField] private bool m_Show = true;
[SerializeField] private Sprite m_Sprite;
[SerializeField] private Image.Type m_Type;
[SerializeField] private bool m_AutoColor;
[SerializeField] private Color m_Color = Color.clear;
[SerializeField] private float m_Width = 0;
[SerializeField] private float m_Height = 0;
public void Reset()
{
m_Show = false;
m_Type = Image.Type.Simple;
m_Sprite = null;
m_AutoColor = false;
m_Color = Color.white;
m_Width = 0;
m_Height = 0;
}
/// <summary>
/// Whether the data icon is show.
/// |是否显示图标。
/// </summary>
public bool show { get { return m_Show; } set { m_Show = value; } }
/// <summary>
/// The image of icon.
/// |图标的图片。
/// </summary>
public Sprite sprite { get { return m_Sprite; } set { m_Sprite = value; } }
/// <summary>
/// How to display the image.
/// |图片的显示类型。
/// </summary>
public Image.Type type { get { return m_Type; } set { m_Type = value; } }
/// <summary>
/// 是否自动颜色。
/// </summary>
public bool autoColor { get { return m_AutoColor; } set { m_AutoColor = value; } }
/// <summary>
/// 图标颜色。
/// </summary>
public Color color { get { return m_Color; } set { m_Color = value; } }
/// <summary>
/// 图标宽。
/// </summary>
public float width { get { return m_Width; } set { m_Width = value; } }
/// <summary>
/// 图标高。
/// </summary>
public float height { get { return m_Height; } set { m_Height = value; } }
public ImageStyle Clone()
{
var imageStyle = new ImageStyle();
imageStyle.type = type;
imageStyle.sprite = sprite;
imageStyle.autoColor = autoColor;
imageStyle.color = color;
imageStyle.width = width;
imageStyle.height = height;
return imageStyle;
}
public void Copy(ImageStyle imageStyle)
{
type = imageStyle.type;
sprite = imageStyle.sprite;
autoColor = imageStyle.autoColor;
color = imageStyle.color;
width = imageStyle.width;
height = imageStyle.height;
}
}
}

View File

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

View File

@@ -18,6 +18,7 @@ namespace XCharts.Runtime
[SerializeField] private Color32 m_CenterColor;
[SerializeField] private float m_CenterGap;
[SerializeField] private float m_BorderWidth = 0;
[SerializeField] private float m_BorderGap = 0;
[SerializeField] private Color32 m_BorderColor;
[SerializeField] private Color32 m_BorderColor0;
[SerializeField] private Color32 m_BorderToColor;
@@ -39,6 +40,7 @@ namespace XCharts.Runtime
m_CenterColor = Color.clear;
m_CenterGap = 0;
m_BorderWidth = 0;
m_BorderGap = 0;
m_BorderColor = Color.clear;
m_BorderColor0 = Color.clear;
m_BorderToColor = Color.clear;
@@ -164,6 +166,14 @@ namespace XCharts.Runtime
set { if (PropertyUtil.SetStruct(ref m_BorderWidth, value)) SetVerticesDirty(); }
}
/// <summary>
/// 边框间隙。
/// </summary>
public float borderGap
{
get { return m_BorderGap; }
set { if (PropertyUtil.SetStruct(ref m_BorderGap, value)) SetVerticesDirty(); }
}
/// <summary>
/// 透明度。支持从 0 到 1 的数字,为 0 时不绘制该图形。
/// </summary>
public float opacity
@@ -231,6 +241,16 @@ namespace XCharts.Runtime
return color;
}
public Color32 GetToColor()
{
if (m_Opacity == 1 || m_ToColor.a == 0)
return m_ToColor;
var color = m_ToColor;
color.a = (byte)(color.a * m_Opacity);
return color;
}
public Color32 GetColor0()
{
if (m_Opacity == 1 || m_Color0.a == 0)
@@ -316,14 +336,11 @@ namespace XCharts.Runtime
}
return color;
}
}
public static class ItemStyleHelper
{
public static bool IsNeedCorner(ItemStyle itemStyle)
public bool IsNeedCorner()
{
if (itemStyle.cornerRadius == null) return false;
foreach (var value in itemStyle.cornerRadius)
if (m_CornerRadius == null) return false;
foreach (var value in m_CornerRadius)
{
if (value != 0) return true;
}

View File

@@ -1,6 +1,4 @@

using System;
using UnityEngine;
using UnityEngine;
namespace XCharts.Runtime
{
@@ -17,6 +15,7 @@ namespace XCharts.Runtime
/// </summary>
public enum Position
{
Default,
/// <summary>
/// Outside of sectors of pie chart, which relates to corresponding sector through visual guide line.
/// |饼图扇区外侧,通过视觉引导线连到相应的扇区。
@@ -69,35 +68,34 @@ namespace XCharts.Runtime
End
}
[SerializeField] protected bool m_Show = true;
[SerializeField] Position m_Position = Position.Default;
[SerializeField] protected bool m_AutoOffset = false;
[SerializeField] protected Vector3 m_Offset;
[SerializeField] protected float m_Rotate;
[SerializeField] protected float m_Distance;
[SerializeField] protected string m_Formatter;
[SerializeField] protected string m_NumericFormatter = "";
[SerializeField] protected float m_Width = 0;
[SerializeField] protected float m_Height = 0;
[SerializeField] private bool m_Show = true;
[SerializeField] Position m_Position = Position.Outside;
[SerializeField] private Vector3 m_Offset;
[SerializeField] private float m_Distance;
[SerializeField] private string m_Formatter;
[SerializeField] private float m_PaddingLeftRight = 2f;
[SerializeField] private float m_PaddingTopBottom = 2f;
[SerializeField] private float m_BackgroundWidth = 0;
[SerializeField] private float m_BackgroundHeight = 0;
[SerializeField] private string m_NumericFormatter = "";
[SerializeField] private bool m_AutoOffset = false;
[SerializeField] private bool m_AutoColor = false;
[SerializeField] private TextStyle m_TextStyle = new TextStyle();
private SerieLabelFormatterFunction m_FormatterFunction;
[SerializeField] protected IconStyle m_Icon = new IconStyle();
[SerializeField] protected ImageStyle m_Background = new ImageStyle();
[SerializeField] protected TextPadding m_TextPadding = new TextPadding();
[SerializeField] protected TextStyle m_TextStyle = new TextStyle();
protected LabelFormatterFunction m_FormatterFunction;
public void Reset()
{
m_Show = false;
m_Position = Position.Outside;
m_Position = Position.Default;
m_Offset = Vector3.zero;
m_Distance = 0;
m_PaddingLeftRight = 2f;
m_PaddingTopBottom = 2f;
m_BackgroundWidth = 0;
m_BackgroundHeight = 0;
m_Rotate = 0;
m_Width = 0;
m_Height = 0;
m_NumericFormatter = "";
m_AutoOffset = false;
m_AutoColor = false;
}
/// <summary>
@@ -146,6 +144,15 @@ namespace XCharts.Runtime
set { if (PropertyUtil.SetStruct(ref m_Offset, value)) SetVerticesDirty(); }
}
/// <summary>
/// Rotation of label.
/// |文本的旋转。
/// </summary>
public float rotate
{
get { return m_Rotate; }
set { if (PropertyUtil.SetStruct(ref m_Rotate, value)) SetComponentDirty(); }
}
/// <summary>
/// 距离轴线的距离。
/// </summary>
public float distance
@@ -154,42 +161,33 @@ namespace XCharts.Runtime
set { if (PropertyUtil.SetStruct(ref m_Distance, value)) SetVerticesDirty(); }
}
/// <summary>
/// the width of background. If set as default value 0, it means than the background width auto set as the text width.
/// |标签的背景宽度。一般不用指定,不指定时则自动是文字的宽度。
/// the width of label. If set as default value 0, it means than the label width auto set as the text width.
/// |标签的宽度。一般不用指定,不指定时则自动是文字的宽度。
/// </summary>
/// <value></value>
public float backgroundWidth
public float width
{
get { return m_BackgroundWidth; }
set { if (PropertyUtil.SetStruct(ref m_BackgroundWidth, value)) SetComponentDirty(); }
get { return m_Width; }
set { if (PropertyUtil.SetStruct(ref m_Width, value)) SetComponentDirty(); }
}
/// <summary>
/// the height of background. If set as default value 0, it means than the background height auto set as the text height.
/// |标签的背景高度。一般不用指定,不指定时则自动是文字的高度。
/// the height of label. If set as default value 0, it means than the label height auto set as the text height.
/// |标签的高度。一般不用指定,不指定时则自动是文字的高度。
/// </summary>
/// <value></value>
public float backgroundHeight
public float height
{
get { return m_BackgroundHeight; }
set { if (PropertyUtil.SetStruct(ref m_BackgroundHeight, value)) SetComponentDirty(); }
get { return m_Height; }
set { if (PropertyUtil.SetStruct(ref m_Height, value)) SetComponentDirty(); }
}
/// <summary>
/// the text padding of left and right. defaut:2.
/// |左右边距。
/// the text padding of label.
/// |文本的边距。
/// </summary>
public float paddingLeftRight
public TextPadding textPadding
{
get { return m_PaddingLeftRight; }
set { if (PropertyUtil.SetStruct(ref m_PaddingLeftRight, value)) SetComponentDirty(); }
}
/// <summary>
/// the text padding of top and bottom. defaut:2.
/// |上下边距。
/// </summary>
public float paddingTopBottom
{
get { return m_PaddingTopBottom; }
set { if (PropertyUtil.SetStruct(ref m_PaddingTopBottom, value)) SetComponentDirty(); }
get { return m_TextPadding; }
set { if (PropertyUtil.SetClass(ref m_TextPadding, value)) SetComponentDirty(); }
}
/// <summary>
/// Standard numeric format strings.
@@ -212,14 +210,23 @@ namespace XCharts.Runtime
set { if (PropertyUtil.SetStruct(ref m_AutoOffset, value)) SetAllDirty(); }
}
/// <summary>
/// 是否开启自动颜色。当开启时会根据已支持的serie自动设置颜色。
/// the sytle of background.
/// |背景图样式。
/// </summary>
public bool autoColor
public ImageStyle background
{
get { return m_AutoColor; }
set { if (PropertyUtil.SetStruct(ref m_AutoColor, value)) SetAllDirty(); }
get { return m_Background; }
set { if (PropertyUtil.SetClass(ref m_Background, value)) SetAllDirty(); }
}
/// <summary>
/// the sytle of icon.
/// |图标样式。
/// </summary>
public IconStyle icon
{
get { return m_Icon; }
set { if (PropertyUtil.SetClass(ref m_Icon, value)) SetAllDirty(); }
}
/// <summary>
/// the sytle of text.
/// |文本样式。
@@ -229,8 +236,7 @@ namespace XCharts.Runtime
get { return m_TextStyle; }
set { if (PropertyUtil.SetClass(ref m_TextStyle, value)) SetAllDirty(); }
}
public SerieLabelFormatterFunction formatterFunction
public LabelFormatterFunction formatterFunction
{
get { return m_FormatterFunction; }
set { m_FormatterFunction = value; }
@@ -241,6 +247,11 @@ namespace XCharts.Runtime
return position == Position.Inside || position == Position.Center;
}
public bool IsAutoSize()
{
return width == 0 && height == 0;
}
public Vector3 GetOffset(float radius)
{
var x = ChartHelper.GetActualValue(m_Offset.x, radius);
@@ -261,29 +272,42 @@ namespace XCharts.Runtime
}
}
public TextAnchor GetAutoAlignment()
public virtual LabelStyle Clone()
{
if (textStyle.autoAlign) return textStyle.alignment;
else
{
switch (position)
{
case LabelStyle.Position.Inside:
case LabelStyle.Position.Center:
case LabelStyle.Position.Top:
case LabelStyle.Position.Bottom:
return TextAnchor.MiddleCenter;
case LabelStyle.Position.Outside:
case LabelStyle.Position.Right:
return TextAnchor.MiddleLeft;
case LabelStyle.Position.Left:
return TextAnchor.MiddleRight;
default:
return TextAnchor.MiddleCenter;
}
}
var label = new LabelStyle();
label.m_Show = m_Show;
label.m_Position = m_Position;
label.m_Offset = m_Offset;
label.m_Rotate = m_Rotate;
label.m_Distance = m_Distance;
label.m_Formatter = m_Formatter;
label.m_Width = m_Width;
label.m_Height = m_Height;
label.m_NumericFormatter = m_NumericFormatter;
label.m_AutoOffset = m_AutoOffset;
label.m_Icon.Copy(m_Icon);
label.m_Background.Copy(m_Background);
label.m_TextPadding = m_TextPadding;
label.m_TextStyle.Copy(m_TextStyle);
return label;
}
public virtual void Copy(LabelStyle label)
{
m_Show = label.m_Show;
m_Position = label.m_Position;
m_Offset = label.m_Offset;
m_Rotate = label.m_Rotate;
m_Distance = label.m_Distance;
m_Formatter = label.m_Formatter;
m_Width = label.m_Width;
m_Height = label.m_Height;
m_NumericFormatter = label.m_NumericFormatter;
m_AutoOffset = label.m_AutoOffset;
m_Icon.Copy(label.m_Icon);
m_Background.Copy(label.m_Background);
m_TextPadding = label.m_TextPadding;
m_TextStyle.Copy(label.m_TextStyle);
}
}
}

View File

@@ -21,7 +21,7 @@ namespace XCharts.Runtime
Start
}
[SerializeField] private bool m_Show;
[SerializeField] Position m_Position;
[SerializeField] private Position m_Position;
[SerializeField]
private ArrowStyle m_Arrow = new ArrowStyle()
{

View File

@@ -0,0 +1,61 @@
using System;
using UnityEngine;
namespace XCharts.Runtime
{
/// <summary>
/// Settings related to text.
/// |文本的内边距设置。
/// </summary>
[Serializable]
public class TextPadding : ChildComponent
{
[SerializeField] private bool m_Show = true;
[SerializeField] private float m_Top = 2;
[SerializeField] private float m_Right = 4;
[SerializeField] private float m_Left = 4;
[SerializeField] private float m_Bottom = 2;
public TextPadding() { }
public TextPadding(float top, float right, float bottom, float left)
{
SetPadding(top, right, bottom, left);
}
public void SetPadding(float top, float right, float bottom, float left)
{
m_Top = top; ;
m_Right = right;
m_Bottom = bottom;
m_Left = left;
}
public bool show
{
get { return m_Show; }
set { if (PropertyUtil.SetStruct(ref m_Show, value)) SetComponentDirty(); }
}
public float top
{
get { return m_Top; }
set { if (PropertyUtil.SetStruct(ref m_Top, value)) SetComponentDirty(); }
}
public float right
{
get { return m_Right; }
set { if (PropertyUtil.SetStruct(ref m_Right, value)) SetComponentDirty(); }
}
public float bottom
{
get { return m_Bottom; }
set { if (PropertyUtil.SetStruct(ref m_Bottom, value)) SetComponentDirty(); }
}
public float left
{
get { return m_Left; }
set { if (PropertyUtil.SetStruct(ref m_Left, value)) SetComponentDirty(); }
}
}
}

View File

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

View File

@@ -14,15 +14,13 @@ namespace XCharts.Runtime
[Serializable]
public class TextStyle : ChildComponent
{
[SerializeField] private bool m_Show = true;
[SerializeField] private Font m_Font;
[SerializeField] private bool m_AutoWrap = false;
[SerializeField] private bool m_AutoAlign = true;
[SerializeField] private float m_Rotate = 0;
[SerializeField] private float m_ExtraWidth = 0;
[SerializeField] private Vector2 m_Offset = Vector2.zero;
[SerializeField] private bool m_AutoColor = false;
[SerializeField] private Color m_Color = Color.clear;
[SerializeField] private bool m_AutoBackgroundColor = false;
[SerializeField] private Color m_BackgroundColor = Color.clear;
[SerializeField] private int m_FontSize = 0;
[SerializeField] private FontStyle m_FontStyle = FontStyle.Normal;
[SerializeField] private float m_LineSpacing = 1f;
@@ -32,6 +30,11 @@ namespace XCharts.Runtime
[SerializeField] private FontStyles m_TMPFontStyle = FontStyles.Normal;
[SerializeField] private TextAlignmentOptions m_TMPAlignment = TextAlignmentOptions.Left;
#endif
public bool show
{
get { return m_Show; }
set { if (PropertyUtil.SetStruct(ref m_Show, value)) SetComponentDirty(); }
}
/// <summary>
/// Rotation of text.
/// |文本的旋转。
@@ -43,27 +46,13 @@ namespace XCharts.Runtime
set { if (PropertyUtil.SetStruct(ref m_Rotate, value)) SetComponentDirty(); }
}
/// <summary>
/// Extra width of text preferred width.
/// |额外的宽度
/// 是否开启自动颜色。当开启时,会自动设置颜色。
/// </summary>
public float extraWidth
public bool autoColor
{
get { return m_ExtraWidth; }
set { if (PropertyUtil.SetStruct(ref m_ExtraWidth, value)) SetComponentDirty(); }
get { return m_AutoColor; }
set { if (PropertyUtil.SetStruct(ref m_AutoColor, value)) SetAllDirty(); }
}
/// <summary>
/// the offset of position.
/// |坐标偏移。
/// [Default: `Vector2.zero`]
/// </summary>
public Vector2 offset
{
get { return m_Offset; }
set { if (PropertyUtil.SetStruct(ref m_Offset, value)) SetComponentDirty(); }
}
public Vector3 offsetv3 { get { return new Vector3(m_Offset.x, m_Offset.y, 0); } }
/// <summary>
/// the color of text.
/// |文本的颜色。
@@ -74,21 +63,6 @@ namespace XCharts.Runtime
get { return m_Color; }
set { if (PropertyUtil.SetColor(ref m_Color, value)) SetComponentDirty(); }
}
public bool autoBackgroundColor
{
get { return m_AutoBackgroundColor; }
set { if (PropertyUtil.SetStruct(ref m_AutoBackgroundColor, value)) SetComponentDirty(); }
}
/// <summary>
/// the color of text.
/// |文本的背景颜色。
/// [default: `Color.clear`]
/// </summary>
public Color backgroundColor
{
get { return m_BackgroundColor; }
set { if (PropertyUtil.SetColor(ref m_BackgroundColor, value)) SetComponentDirty(); }
}
/// <summary>
/// the font of text. When `null`, the theme's font is used by default.
/// |文本字体。
@@ -165,11 +139,6 @@ namespace XCharts.Runtime
get { return m_TMPFontStyle; }
set { if (PropertyUtil.SetStruct(ref m_TMPFontStyle, value)) SetComponentDirty(); }
}
public TextAlignmentOptions tmpAlignment
{
get { return m_TMPAlignment; }
set { if (PropertyUtil.SetStruct(ref m_TMPAlignment, value)) SetComponentDirty(); }
}
#endif
public TextStyle()
@@ -206,9 +175,7 @@ namespace XCharts.Runtime
{
font = textStyle.font;
rotate = textStyle.rotate;
offset = textStyle.offset;
color = textStyle.color;
backgroundColor = textStyle.backgroundColor;
fontSize = textStyle.fontSize;
fontStyle = textStyle.fontStyle;
lineSpacing = textStyle.lineSpacing;
@@ -217,7 +184,6 @@ namespace XCharts.Runtime
autoAlign = textStyle.autoAlign;
#if dUI_TextMeshPro
m_TMPFont = textStyle.tmpFont;
m_TMPAlignment = textStyle.tmpAlignment;
m_TMPFontStyle = textStyle.tmpFontStyle;
#endif
}
@@ -247,9 +213,9 @@ namespace XCharts.Runtime
return fontSize;
}
public TextAnchor GetAlignment(TextAnchor systemAlignment)
public TextAnchor GetAlignment(TextAnchor defaultAlignment)
{
return m_AutoAlign ? systemAlignment : alignment;
return m_AutoAlign ? defaultAlignment : alignment;
}
}
}

View File

@@ -8,8 +8,7 @@ namespace XCharts.Runtime
/// DataZoom component is used for zooming a specific area,
/// which enables user to investigate data in detail,
/// or get an overview of the data, or get rid of outlier points.
/// |
/// <para>DataZoom 组件 用于区域缩放,从而能自由关注细节的数据信息,或者概览数据整体,或者去除离群点的影响。</para>
/// |DataZoom 组件 用于区域缩放,从而能自由关注细节的数据信息,或者概览数据整体,或者去除离群点的影响。
/// </summary>
[System.Serializable]
[ComponentHandler(typeof(DataZoomHandler), true)]
@@ -88,7 +87,7 @@ namespace XCharts.Runtime
[Range(1f, 20f)]
[SerializeField] private float m_ScrollSensitivity = 1.1f;
[SerializeField] private Orient m_Orient = Orient.Horizonal;
[SerializeField] private TextStyle m_TextStyle = new TextStyle();
[SerializeField] private LabelStyle m_LabelStyle = new LabelStyle();
[SerializeField] private LineStyle m_LineStyle = new LineStyle(LineStyle.Type.Solid);
[SerializeField] private AreaStyle m_AreaStyle = new AreaStyle();
@@ -132,7 +131,7 @@ namespace XCharts.Runtime
}
/// <summary>
/// Whether built-in support is supported.
/// |Built into the coordinate system to allow the user to zoom in and out of the coordinate system by mouse dragging,
/// Built into the coordinate system to allow the user to zoom in and out of the coordinate system by mouse dragging,
/// mouse wheel, finger swiping (on the touch screen).
/// |是否支持内置。内置于坐标系中,使用户可以在坐标系上通过鼠标拖拽、鼠标滚轮、手指滑动(触屏上)来缩放或漫游坐标系。
/// </summary>
@@ -303,7 +302,7 @@ namespace XCharts.Runtime
}
/// <summary>
/// The end percentage of the window out of the data extent, in the range of 0 ~ 100.
/// 数据窗口范围的结束百分比。范围是0 ~ 100。
/// |数据窗口范围的结束百分比。范围是0 ~ 100。
/// </summary>
public float end
{
@@ -340,13 +339,13 @@ namespace XCharts.Runtime
set { if (PropertyUtil.SetStruct(ref m_Orient, value)) SetVerticesDirty(); }
}
/// <summary>
/// font style.
/// |文格式。
/// label style.
/// |文本标签格式。
/// </summary>
public TextStyle textStyle
public LabelStyle labelStyle
{
get { return m_TextStyle; }
set { if (PropertyUtil.SetClass(ref m_TextStyle, value)) SetComponentDirty(); }
get { return m_LabelStyle; }
set { if (PropertyUtil.SetClass(ref m_LabelStyle, value)) SetComponentDirty(); }
}
/// <summary>
/// 阴影线条样式。
@@ -377,12 +376,12 @@ namespace XCharts.Runtime
/// The start label.
/// |组件的开始信息文本。
/// </summary>
private ChartText m_StartLabel { get; set; }
private ChartLabel m_StartLabel { get; set; }
/// <summary>
/// The end label.
/// |组件的结束信息文本。
/// </summary>
private ChartText m_EndLabel { get; set; }
private ChartLabel m_EndLabel { get; set; }
public override void SetDefaultValue()
{
@@ -403,7 +402,7 @@ namespace XCharts.Runtime
end = 70;
m_Orient = Orient.Horizonal;
m_ScrollSensitivity = 10;
m_TextStyle = new TextStyle();
m_LabelStyle = new LabelStyle();
m_LineStyle = new LineStyle(LineStyle.Type.Solid)
{
opacity = 0.3f
@@ -563,14 +562,8 @@ namespace XCharts.Runtime
/// <param name="flag"></param>
internal void SetLabelActive(bool flag)
{
if (m_StartLabel != null && m_StartLabel.gameObject.activeInHierarchy != flag)
{
m_StartLabel.gameObject.SetActive(flag);
}
if (m_EndLabel != null && m_EndLabel.gameObject.activeInHierarchy != flag)
{
m_EndLabel.gameObject.SetActive(flag);
}
m_StartLabel.SetActive(flag);
m_EndLabel.SetActive(flag);
}
/// <summary>
@@ -591,24 +584,24 @@ namespace XCharts.Runtime
if (m_EndLabel != null) m_EndLabel.SetText(text);
}
internal void SetStartLabel(ChartText startLabel)
internal void SetStartLabel(ChartLabel startLabel)
{
m_StartLabel = startLabel;
}
internal void SetEndLabel(ChartText endLabel)
internal void SetEndLabel(ChartLabel endLabel)
{
m_EndLabel = endLabel;
}
internal void UpdateStartLabelPosition(Vector3 pos)
{
m_StartLabel.SetLocalPosition(pos);
m_StartLabel.SetPosition(pos);
}
internal void UpdateEndLabelPosition(Vector3 pos)
{
m_EndLabel.SetLocalPosition(pos);
m_EndLabel.SetPosition(pos);
}
public void UpdateRuntimeData(float chartX, float chartY, float chartWidth, float chartHeight)

View File

@@ -29,15 +29,13 @@ namespace XCharts.Runtime
dataZoomObject.hideFlags = chart.chartHideFlags;
ChartHelper.HideAllObject(dataZoomObject);
var startLabel = ChartHelper.AddTextObject(s_DefaultDataZoom + "start", dataZoomObject.transform,
Vector2.zero, Vector2.zero, new Vector2(1, 0.5f), new Vector2(200, 20), dataZoom.textStyle,
chart.theme.dataZoom);
startLabel.SetAlignment(TextAnchor.MiddleRight);
var startLabel = ChartHelper.AddChartLabel(s_DefaultDataZoom + "start", dataZoomObject.transform,
dataZoom.labelStyle, chart.theme.dataZoom, "", Color.clear, TextAnchor.MiddleRight);
startLabel.gameObject.SetActive(true);
var endLabel = ChartHelper.AddTextObject(s_DefaultDataZoom + "end", dataZoomObject.transform,
Vector2.zero, Vector2.zero, new Vector2(0, 0.5f), new Vector2(200, 20), dataZoom.textStyle,
chart.theme.dataZoom);
endLabel.SetAlignment(TextAnchor.MiddleLeft);
var endLabel = ChartHelper.AddChartLabel(s_DefaultDataZoom + "end", dataZoomObject.transform,
dataZoom.labelStyle, chart.theme.dataZoom, "", Color.clear, TextAnchor.MiddleLeft);
endLabel.gameObject.SetActive(true);
dataZoom.SetStartLabel(startLabel);
dataZoom.SetEndLabel(endLabel);

View File

@@ -9,18 +9,24 @@ namespace XCharts.Runtime
[Serializable]
public class DebugInfo
{
#pragma warning disable 0414
#pragma warning disable 0414
[SerializeField] private bool m_Show = true;
#pragma warning restore 0414
#pragma warning restore 0414
[SerializeField] private bool m_ShowDebugInfo = false;
[SerializeField] protected bool m_ShowAllChartObject = false;
[SerializeField] protected bool m_FoldSeries = false;
[SerializeField]
private TextStyle m_DebugInfoTextStyle = new TextStyle()
private LabelStyle m_LabelStyle = new LabelStyle()
{
fontSize = 18,
backgroundColor = new Color32(32, 32, 32, 170),
color = Color.white
background = new ImageStyle()
{
color = new Color32(32, 32, 32, 170)
},
textStyle = new TextStyle()
{
fontSize = 18,
color = Color.white
}
};
private static StringBuilder s_Sb = new StringBuilder();
@@ -45,7 +51,7 @@ namespace XCharts.Runtime
public void Init(BaseChart chart)
{
m_Chart = chart;
m_Label = AddDebugInfoObject("debug", chart.transform, m_DebugInfoTextStyle, chart.theme);
m_Label = AddDebugInfoObject("debug", chart.transform, m_LabelStyle, chart.theme);
}
public void Update()
@@ -124,7 +130,7 @@ namespace XCharts.Runtime
return total / list.Count;
}
private ChartLabel AddDebugInfoObject(string name, Transform parent, TextStyle textStyle,
private ChartLabel AddDebugInfoObject(string name, Transform parent, LabelStyle labelStyle,
ThemeStyle theme)
{
var anchorMax = new Vector2(0, 1);
@@ -137,16 +143,9 @@ namespace XCharts.Runtime
labelGameObject.hideFlags = m_Chart.chartHideFlags;
ChartHelper.SetActive(labelGameObject, m_ShowDebugInfo);
var label = ChartHelper.GetOrAddComponent<ChartLabel>(labelGameObject);
label.labelBackground = label;
label.labelBackground.color = textStyle.backgroundColor;
label.labelBackground.raycastTarget = false;
label.label = ChartHelper.AddTextObject("Text", label.gameObject.transform, anchorMin, anchorMax, pivot, sizeDelta, textStyle, theme.common);
label.SetAutoSize(true);
label.label.SetAlignment(textStyle.GetAlignment(TextAnchor.UpperLeft));
label.label.SetLocalPosition(new Vector2(3, -3));
label.SetText("30");
label.SetTextColor(textStyle.color);
var label = ChartHelper.AddChartLabel("info", labelGameObject.transform, labelStyle, theme.common,
"", Color.clear, TextAnchor.UpperLeft);
label.SetActive(labelStyle.show);
return label;
}
}

View File

@@ -75,7 +75,7 @@ namespace XCharts.Runtime
[SerializeField] private bool m_ItemAutoColor = true;
[SerializeField] private bool m_TextAutoColor = false;
[SerializeField] private string m_Formatter;
[SerializeField] private TextStyle m_TextStyle = new TextStyle() { offset = new Vector2(2f, 0), fontSize = 0 };
[SerializeField] private LabelStyle m_LabelStyle = new LabelStyle();
[SerializeField] private List<string> m_Data = new List<string>();
[SerializeField] private List<Sprite> m_Icons = new List<Sprite>();
@@ -195,10 +195,10 @@ namespace XCharts.Runtime
/// the style of text.
/// |文本样式。
/// </summary>
public TextStyle textStyle
public LabelStyle labelStyle
{
get { return m_TextStyle; }
set { if (PropertyUtil.SetClass(ref m_TextStyle, value)) SetComponentDirty(); }
get { return m_LabelStyle; }
set { if (PropertyUtil.SetClass(ref m_LabelStyle, value)) SetComponentDirty(); }
}
/// <summary>
/// Data array of legend. An array item is usually a name representing string. (If it is a pie chart,
@@ -229,14 +229,14 @@ namespace XCharts.Runtime
/// </summary>
public override bool componentDirty
{
get { return m_ComponentDirty || location.componentDirty || textStyle.componentDirty; }
get { return m_ComponentDirty || location.componentDirty || labelStyle.componentDirty; }
}
public override void ClearComponentDirty()
{
base.ClearComponentDirty();
location.ClearComponentDirty();
textStyle.ClearComponentDirty();
labelStyle.ClearComponentDirty();
}
/// <summary>

View File

@@ -21,7 +21,7 @@ namespace XCharts.Runtime
public override void CheckComponent(System.Text.StringBuilder sb)
{
var legend = component;
if (ChartHelper.IsColorAlphaZero(legend.textStyle.color))
if (ChartHelper.IsColorAlphaZero(legend.labelStyle.textStyle.color))
sb.AppendFormat("warning:legend{0}->textStyle->color alpha is 0\n", legend.index);
var serieNameList = SeriesHelper.GetLegalSerieNameList(chart.series);
if (serieNameList.Count == 0)
@@ -198,7 +198,7 @@ namespace XCharts.Runtime
UGL.DrawDiamond(vh, rect.center, radius, color);
break;
case Legend.Type.EmptyCircle:
var backgroundColor = chart.theme.GetBackgroundColor(chart.GetChartComponent<Background>());
var backgroundColor = chart.GetChartBackgroundColor();
UGL.DrawEmptyCricle(vh, rect.center, radius, 2 * chart.settings.legendIconLineWidth,
color, color, backgroundColor, 1f);
break;

View File

@@ -8,7 +8,7 @@ namespace XCharts.Runtime
{
public static Color GetContentColor(int legendIndex, Legend legend, ThemeStyle theme, bool active)
{
var textStyle = legend.textStyle;
var textStyle = legend.labelStyle.textStyle;
if (active)
{
if (legend.textAutoColor) return theme.GetColor(legendIndex);
@@ -40,7 +40,7 @@ namespace XCharts.Runtime
var pivot = new Vector2(0, 0.5f);
var sizeDelta = new Vector2(100, 30);
var iconSizeDelta = new Vector2(legend.itemWidth, legend.itemHeight);
var textStyle = legend.textStyle;
var textStyle = legend.labelStyle.textStyle;
var contentColor = GetContentColor(legendIndex, legend, theme, active);
var objAnchorMin = new Vector2(0, 1);
@@ -48,16 +48,15 @@ namespace XCharts.Runtime
var objPivot = new Vector2(0, 1);
var btnObj = ChartHelper.AddObject(objName, parent, objAnchorMin, objAnchorMax, objPivot, sizeDelta, i);
var iconObj = ChartHelper.AddObject("icon", btnObj.transform, anchorMin, anchorMax, pivot, iconSizeDelta);
var contentObj = ChartHelper.AddObject("content", btnObj.transform, anchorMin, anchorMax, pivot, sizeDelta);
var img = ChartHelper.GetOrAddComponent<Image>(btnObj);
img.color = Color.clear;
ChartHelper.GetOrAddComponent<Button>(btnObj);
ChartHelper.GetOrAddComponent<Image>(iconObj);
ChartHelper.GetOrAddComponent<Image>(contentObj);
var txt = ChartHelper.AddTextObject("Text", contentObj.transform, anchorMin, anchorMax, pivot, sizeDelta,
textStyle, theme.legend);
txt.SetAlignment(textStyle.GetAlignment(TextAnchor.MiddleLeft));
txt.SetColor(contentColor);
var label = ChartHelper.AddChartLabel("content", btnObj.transform, legend.labelStyle, theme.legend,
content, contentColor, TextAnchor.MiddleLeft);
label.SetActive(true);
var item = new LegendItem();
item.index = i;
item.name = objName;
@@ -66,9 +65,8 @@ namespace XCharts.Runtime
item.SetIconSize(legend.itemWidth, legend.itemHeight);
item.SetIconColor(itemColor);
item.SetIconImage(legend.GetIcon(i));
item.SetContentPosition(textStyle.offsetv3);
item.SetContentPosition(legend.labelStyle.offset);
item.SetContent(content);
item.SetContentBackgroundColor(textStyle.backgroundColor);
return item;
}

View File

@@ -10,7 +10,6 @@ namespace XCharts.Runtime
internal sealed class MarkAreaHandler : MainComponentHandler<MarkArea>
{
private GameObject m_MarkLineLabelRoot;
private bool m_LabelShow;
private bool m_NeedUpdateLabelPosition;
public override void InitComponent()
@@ -41,23 +40,16 @@ namespace XCharts.Runtime
private void InitMarkArea(MarkArea markArea)
{
m_LabelShow = markArea.label.show && !string.IsNullOrEmpty(component.text);
markArea.painter = chart.m_PainterTop;
markArea.refreshComponent = delegate ()
{
var label = markArea.label;
var color = !ChartHelper.IsClearColor(label.textStyle.color) ? label.textStyle.color : chart.theme.axis.textColor;
var element = ChartHelper.AddSerieLabel("label", m_MarkLineLabelRoot.transform, label.backgroundWidth,
label.backgroundHeight, color, label.textStyle, chart.theme);
var isAutoSize = label.backgroundWidth == 0 || label.backgroundHeight == 0;
var item = ChartHelper.GetOrAddComponent<ChartLabel>(element);
var label = ChartHelper.AddChartLabel("label", m_MarkLineLabelRoot.transform, markArea.label, chart.theme.axis,
component.text, Color.clear, TextAnchor.MiddleCenter);
UpdateRuntimeData(component);
item.SetLabel(element, isAutoSize, label.paddingLeftRight, label.paddingTopBottom);
item.SetIconActive(false);
item.SetActive(m_LabelShow);
item.SetPosition(component.runtimeLabelPosition);
item.SetText(component.text);
markArea.runtimeLabel = item;
label.SetActive(markArea.label.show);
label.SetPosition(component.runtimeLabelPosition);
label.SetText(component.text);
markArea.runtimeLabel = label;
};
markArea.refreshComponent();
}
@@ -96,7 +88,7 @@ namespace XCharts.Runtime
private void UpdateLabelPosition(MarkArea markArea)
{
if (!m_LabelShow) return;
if (!markArea.label.show) return;
m_NeedUpdateLabelPosition = true;
var rect = markArea.runtimeRect;
switch (markArea.label.position)
@@ -120,7 +112,7 @@ namespace XCharts.Runtime
markArea.runtimeLabelPosition = rect.center + new Vector2(0, rect.height / 2);
break;
}
markArea.runtimeLabelPosition += markArea.label.offset + markArea.label.textStyle.offsetv3;
markArea.runtimeLabelPosition += markArea.label.offset;
}
private Vector3 GetPosition(MarkAreaData data, Serie serie, DataZoom dataZoom, XAxis xAxis, YAxis yAxis,

View File

@@ -72,19 +72,16 @@ namespace XCharts.Runtime
data.painter = chart.m_PainterTop;
data.refreshComponent = delegate ()
{
var label = data.label;
var textName = string.Format("markLine_{0}_{1}", serie.index, data.index);
var color = !ChartHelper.IsClearColor(label.textStyle.color) ? label.textStyle.color : chart.theme.axis.textColor;
var element = ChartHelper.AddSerieLabel(textName, m_MarkLineLabelRoot.transform, label.backgroundWidth,
label.backgroundHeight, color, label.textStyle, chart.theme);
var isAutoSize = label.backgroundWidth == 0 || label.backgroundHeight == 0;
var item = ChartHelper.GetOrAddComponent<ChartLabel>(element);
item.SetLabel(element, isAutoSize, label.paddingLeftRight, label.paddingTopBottom);
item.SetIconActive(false);
item.SetActive(data.label.show);
item.SetPosition(MarkLineHelper.GetLabelPosition(data));
item.SetText(MarkLineHelper.GetFormatterContent(serie, data));
data.runtimeLabel = item;
var content = MarkLineHelper.GetFormatterContent(serie, data);
var label = ChartHelper.AddChartLabel(textName, m_MarkLineLabelRoot.transform, data.label, chart.theme.axis,
content, Color.clear, TextAnchor.MiddleCenter);
label.SetActive(data.label.show);
label.SetIconActive(false);
label.SetActive(data.label.show);
label.SetPosition(MarkLineHelper.GetLabelPosition(data));
data.runtimeLabel = label;
};
data.refreshComponent();
}

View File

@@ -11,7 +11,7 @@ namespace XCharts.Runtime
var numericFormatter = serieLabel.numericFormatter;
if (serieLabel.formatterFunction != null)
{
return serieLabel.formatterFunction(data.index, data.runtimeValue);
return serieLabel.formatterFunction(data.index, data.runtimeValue, null);
}
if (string.IsNullOrEmpty(serieLabel.formatter))
return ChartCached.NumberToStr(data.runtimeValue, numericFormatter);
@@ -29,8 +29,8 @@ namespace XCharts.Runtime
if (!data.label.show) return Vector3.zero;
var dir = (data.runtimeEndPosition - data.runtimeStartPosition).normalized;
var horizontal = Mathf.Abs(Vector3.Dot(dir, Vector3.right)) == 1;
var labelWidth = data.runtimeLabel == null ? 50 : data.runtimeLabel.GetLabelWidth();
var labelHeight = data.runtimeLabel == null ? 20 : data.runtimeLabel.GetLabelHeight();
var labelWidth = data.runtimeLabel == null ? 50 : data.runtimeLabel.GetTextWidth();
var labelHeight = data.runtimeLabel == null ? 20 : data.runtimeLabel.GetTextHeight();
switch (data.label.position)
{
case LabelStyle.Position.Start:

View File

@@ -431,13 +431,13 @@ namespace XCharts.Runtime
if (string.IsNullOrEmpty(indicatorName))
return indicatorName;
if (string.IsNullOrEmpty(m_AxisName.formatter))
if (string.IsNullOrEmpty(m_AxisName.labelStyle.formatter))
{
return indicatorName;
}
else
{
var content = m_AxisName.formatter;
var content = m_AxisName.labelStyle.formatter;
FormatterHelper.ReplaceAxisLabelContent(ref content, indicatorName);
return content;
}

View File

@@ -35,7 +35,6 @@ namespace XCharts.Runtime
private void InitRadarCoord(RadarCoord radar)
{
float txtWid = 100;
float txtHig = 20;
radar.painter = chart.GetPainter(radar.index);
radar.refreshComponent = delegate ()
@@ -45,7 +44,6 @@ namespace XCharts.Runtime
chart.chartMaxAnchor, chart.chartPivot, chart.chartSizeDelta);
radar.gameObject = radarObject;
radar.gameObject.hideFlags = chart.chartHideFlags;
var textStyle = radar.axisName.textStyle;
ChartHelper.HideAllObject(radarObject.transform, INDICATOR_TEXT);
for (int i = 0; i < radar.indicatorList.Count; i++)
{
@@ -53,19 +51,10 @@ namespace XCharts.Runtime
var pos = radar.GetIndicatorPosition(i);
var objName = INDICATOR_TEXT + "_" + i;
var labelGameObject = ChartHelper.AddObject(objName, radarObject.transform, new Vector2(0.5f, 0.5f),
new Vector2(0.5f, 0.5f), new Vector2(0.5f, 0.5f), new Vector2(txtWid, txtHig));
var label = ChartHelper.GetOrAddComponent<ChartLabel>(labelGameObject);
label.label = ChartHelper.AddTextObject("Text", label.gameObject.transform, new Vector2(0.5f, 0.5f),
new Vector2(0.5f, 0.5f), new Vector2(0.5f, 0.5f), new Vector2(txtWid, txtHig), textStyle, chart.theme.common);
label.SetAutoSize(true);
label.label.SetAlignment(textStyle.GetAlignment(TextAnchor.MiddleCenter));
label.SetText(radar.GetFormatterIndicatorContent(i));
label.SetActive(radar.indicator);
label.color = textStyle.backgroundColor;
var offset = new Vector3(textStyle.offset.x, textStyle.offset.y);
AxisHelper.AdjustCircleLabelPos(label, pos, radar.context.center, txtHig, offset);
var label = ChartHelper.AddChartLabel(objName, radarObject.transform, radar.axisName.labelStyle,
chart.theme.common, radar.GetFormatterIndicatorContent(i), Color.clear, TextAnchor.MiddleCenter);
label.SetActive(radar.indicator && radar.axisName.labelStyle.show);
AxisHelper.AdjustCircleLabelPos(label, pos, radar.context.center, txtHig, radar.axisName.labelStyle.offset);
}
chart.RefreshBasePainter();
};

View File

@@ -14,9 +14,9 @@ namespace XCharts.Runtime
{
[SerializeField] private bool m_Show = true;
[SerializeField] private string m_Text = "Chart Title";
[SerializeField] private TextStyle m_TextStyle = new TextStyle();
[SerializeField] private string m_SubText = "";
[SerializeField] private TextStyle m_SubTextStyle = new TextStyle();
[SerializeField] private LabelStyle m_LabelStyle = new LabelStyle();
[SerializeField] private LabelStyle m_SubLabelStyle = new LabelStyle();
[SerializeField] private float m_ItemGap = 0;
[SerializeField] private Location m_Location = Location.defaultTop;
@@ -35,10 +35,10 @@ namespace XCharts.Runtime
/// The text style of main title.
/// |主标题文本样式。
/// </summary>
public TextStyle textStyle
public LabelStyle labelStyle
{
get { return m_TextStyle; }
set { if (PropertyUtil.SetClass(ref m_TextStyle, value)) SetComponentDirty(); }
get { return m_LabelStyle; }
set { if (PropertyUtil.SetClass(ref m_LabelStyle, value)) SetComponentDirty(); }
}
/// <summary>
/// Subtitle text, supporting for \n for newlines.
@@ -53,10 +53,10 @@ namespace XCharts.Runtime
/// The text style of sub title.
/// |副标题文本样式。
/// </summary>
public TextStyle subTextStyle
public LabelStyle subLabelStyle
{
get { return m_SubTextStyle; }
set { if (PropertyUtil.SetClass(ref m_SubTextStyle, value)) SetComponentDirty(); }
get { return m_SubLabelStyle; }
set { if (PropertyUtil.SetClass(ref m_SubLabelStyle, value)) SetComponentDirty(); }
}
/// <summary>
/// [default:8]
@@ -85,8 +85,8 @@ namespace XCharts.Runtime
{
return m_ComponentDirty
|| location.componentDirty
|| textStyle.componentDirty
|| subTextStyle.componentDirty;
|| m_LabelStyle.componentDirty
|| m_SubLabelStyle.componentDirty;
}
}
@@ -94,8 +94,8 @@ namespace XCharts.Runtime
{
base.ClearComponentDirty();
location.ClearComponentDirty();
textStyle.ClearComponentDirty();
subTextStyle.ClearComponentDirty();
m_LabelStyle.ClearComponentDirty();
m_SubLabelStyle.ClearComponentDirty();
}
public void OnChanged()

View File

@@ -27,30 +27,23 @@ namespace XCharts.Runtime
anchorMin = title.location.runtimeAnchorMin;
anchorMax = title.location.runtimeAnchorMax;
pivot = title.location.runtimePivot;
title.textStyle.UpdateAlignmentByLocation(title.location);
title.subTextStyle.UpdateAlignmentByLocation(title.location);
var fontSize = title.textStyle.GetFontSize(chart.theme.title);
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 titleWid = chart.chartWidth;
titleObject.transform.localPosition = titlePosition;
titleObject.hideFlags = chart.chartHideFlags;
ChartHelper.HideAllObject(titleObject);
var titleText = ChartHelper.AddTextObject(s_TitleObjectName, titleObject.transform, anchorMin, anchorMax,
pivot, new Vector2(titleWid, fontSize), title.textStyle, chart.theme.title);
titleText.SetActive(title.show);
titleText.SetLocalPosition(Vector3.zero + title.textStyle.offsetv3);
titleText.SetText(title.text);
var label = ChartHelper.AddChartLabel(s_TitleObjectName, titleObject.transform, title.labelStyle, chart.theme.title,
title.text, Color.clear, title.location.runtimeTextAlignment);
label.SetActive(title.show && title.labelStyle.show);
var subText = ChartHelper.AddTextObject(s_SubTitleObjectName, titleObject.transform, anchorMin, anchorMax,
pivot, new Vector2(titleWid, title.subTextStyle.GetFontSize(chart.theme.subTitle)), title.subTextStyle,
chart.theme.subTitle);
subText.SetActive(title.show && !string.IsNullOrEmpty(title.subText));
subText.SetLocalPosition(subTitlePosition + title.subTextStyle.offsetv3);
subText.SetText(title.subText);
var subLabel = ChartHelper.AddChartLabel(s_SubTitleObjectName, titleObject.transform, title.subLabelStyle, chart.theme.subTitle,
title.subText, Color.clear, title.location.runtimeTextAlignment);
subLabel.SetActive(title.show && title.subLabelStyle.show);
subLabel.transform.localPosition = subTitlePosition + title.subLabelStyle.offset;
};
title.refreshComponent();
}

View File

@@ -9,54 +9,8 @@ namespace XCharts.Runtime
/// |标题相关设置。
/// </summary>
[Serializable]
public class TitleStyle : ChildComponent, ISerieDataComponent, ISerieExtraComponent
public class TitleStyle : LabelStyle, ISerieDataComponent, ISerieExtraComponent
{
[SerializeField] private bool m_Show = true;
[SerializeField] private Vector2 m_OffsetCenter = new Vector2(0, -0.2f);
[SerializeField] private TextStyle m_TextStyle = new TextStyle();
/// <summary>
/// Whether to show title.
/// |是否显示标题。
/// </summary>
public bool show
{
get { return m_Show; }
set { if (PropertyUtil.SetStruct(ref m_Show, value)) SetComponentDirty(); }
}
/// <summary>
/// The offset position relative to the center.
/// |相对于中心的偏移位置。
/// </summary>
public Vector2 offsetCenter
{
get { return m_OffsetCenter; }
set { if (PropertyUtil.SetStruct(ref m_OffsetCenter, value)) SetComponentDirty(); }
}
/// <summary>
/// the color of text.
/// |文本的颜色。
/// </summary>
public TextStyle textStyle
{
get { return m_TextStyle; }
set { if (PropertyUtil.SetClass(ref m_TextStyle, value, true)) SetComponentDirty(); }
}
public override bool componentDirty { get { return m_ComponentDirty || textStyle.componentDirty; } }
public override void ClearComponentDirty()
{
base.ClearComponentDirty();
textStyle.ClearComponentDirty();
}
public Vector3 GetOffset(float radius)
{
var x = ChartHelper.GetActualValue(m_OffsetCenter.x, radius);
var y = ChartHelper.GetActualValue(m_OffsetCenter.y, radius);
return new Vector3(x, y, 0);
}
}
}

View File

@@ -91,13 +91,18 @@ namespace XCharts.Runtime
[SerializeField] private float m_ItemHeight = 25f;
[SerializeField] private Color32 m_BorderColor = new Color32(230, 230, 230, 255);
[SerializeField] private LineStyle m_LineStyle = new LineStyle(LineStyle.Type.None);
[SerializeField] private TextStyle m_LabelTextStyle = new TextStyle();
[SerializeField] private TextStyle m_TitleTextStyle = new TextStyle() { alignment = TextAnchor.MiddleLeft };
[SerializeField] private LabelStyle m_IndicatorLabelStyle = new LabelStyle();
[SerializeField]
private List<TextStyle> m_ColumnsTextStyle = new List<TextStyle>() {
new TextStyle() { alignment = TextAnchor.MiddleLeft, extraWidth = 5 },
new TextStyle() { alignment = TextAnchor.MiddleLeft, extraWidth = 20 },
new TextStyle() { alignment = TextAnchor.MiddleRight, extraWidth = 5 }
private LabelStyle m_TitleLabelStyle = new LabelStyle()
{
textStyle = new TextStyle() { alignment = TextAnchor.MiddleLeft }
};
[SerializeField]
private List<LabelStyle> m_ContentLabelStyles = new List<LabelStyle>()
{
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 }}
};
public TooltipContext context = new TooltipContext();
@@ -305,27 +310,27 @@ namespace XCharts.Runtime
set { if (PropertyUtil.SetStruct(ref m_ItemHeight, value)) SetComponentDirty(); }
}
/// <summary>
/// the text style of content.
/// |提示框标签的文本样式。
/// the label style of tooltip axis indicator label.
/// |提示框的坐标轴指示器文本样式。
/// </summary>
public TextStyle labelTextStyle
public LabelStyle indicatorLabelStyle
{
get { return m_LabelTextStyle; }
set { if (value != null) { m_LabelTextStyle = value; SetComponentDirty(); } }
get { return m_IndicatorLabelStyle; }
set { if (value != null) { m_IndicatorLabelStyle = value; SetComponentDirty(); } }
}
/// <summary>
/// 标题的文本样式。
/// </summary>
public TextStyle titleTextStyle
public LabelStyle titleLabelStyle
{
get { return m_TitleTextStyle; }
set { if (value != null) { m_TitleTextStyle = value; SetComponentDirty(); } }
get { return m_TitleLabelStyle; }
set { if (value != null) { m_TitleLabelStyle = value; SetComponentDirty(); } }
}
public List<TextStyle> columnsTextStyle
public List<LabelStyle> contentLabelStyles
{
get { return m_ColumnsTextStyle; }
set { if (value != null) { m_ColumnsTextStyle = value; SetComponentDirty(); } }
get { return m_ContentLabelStyles; }
set { if (value != null) { m_ContentLabelStyles = value; SetComponentDirty(); } }
}
/// <summary>
@@ -343,14 +348,14 @@ namespace XCharts.Runtime
/// </summary>
public override bool componentDirty
{
get { return m_ComponentDirty || lineStyle.componentDirty || labelTextStyle.componentDirty; }
get { return m_ComponentDirty || lineStyle.componentDirty || indicatorLabelStyle.componentDirty; }
}
public override void ClearComponentDirty()
{
base.ClearComponentDirty();
lineStyle.ClearComponentDirty();
labelTextStyle.ClearComponentDirty();
indicatorLabelStyle.ClearComponentDirty();
}
/// <summary>
/// 当前提示框所指示的Serie索引目前只对散点图有效
@@ -429,7 +434,7 @@ namespace XCharts.Runtime
{
if (view == null)
return;
view.SetActive(alwayShowContent ? true : flag);
}
@@ -492,17 +497,17 @@ namespace XCharts.Runtime
return trigger == Trigger.Axis;
}
public TextStyle GetColumnTextStyle(int index)
public LabelStyle GetContentLabelStyle(int index)
{
if (m_ColumnsTextStyle.Count == 0)
if (m_ContentLabelStyles.Count == 0)
return null;
if (index < 0)
index = 0;
else if (index > m_ColumnsTextStyle.Count - 1)
index = m_ColumnsTextStyle.Count - 1;
else if (index > m_ContentLabelStyles.Count - 1)
index = m_ContentLabelStyles.Count - 1;
return m_ColumnsTextStyle[index];
return m_ContentLabelStyles[index];
}
}
}

View File

@@ -56,7 +56,8 @@ namespace XCharts.Runtime
for (int i = 0; i < 2; i++)
{
var labelName = "label_" + i;
var item = ChartHelper.AddTooltipLabel(component, labelName, m_LabelRoot.transform, chart.theme, new Vector2(0.5f, 0.5f));
var item = ChartHelper.AddTooltipIndicatorLabel(component, labelName, m_LabelRoot.transform,
chart.theme, TextAnchor.MiddleCenter);
item.SetActive(false);
m_IndicatorLabels.Add(item);
}
@@ -71,7 +72,8 @@ namespace XCharts.Runtime
else
{
var labelName = "label_" + index;
var item = ChartHelper.AddTooltipLabel(component, labelName, m_LabelRoot.transform, chart.theme, new Vector2(0.5f, 0.5f));
var item = ChartHelper.AddTooltipIndicatorLabel(component, labelName, m_LabelRoot.transform,
chart.theme, TextAnchor.MiddleCenter);
m_IndicatorLabels.Add(item);
return item;
}
@@ -150,7 +152,7 @@ namespace XCharts.Runtime
if (axis.gridIndex == grid.index)
{
var label = GetIndicatorLabel(labelCount++);
SetTooltipIndicatorLabel(axis, label);
SetTooltipIndicatorLabel(tooltip, axis, label);
}
}
}
@@ -167,7 +169,7 @@ namespace XCharts.Runtime
if (axis.polarIndex == polar.index)
{
var label = GetIndicatorLabel(labelCount++);
SetTooltipIndicatorLabel(axis, label);
SetTooltipIndicatorLabel(tooltip, axis, label);
}
}
}
@@ -176,18 +178,22 @@ namespace XCharts.Runtime
}
}
private void SetTooltipIndicatorLabel(Axis axis, ChartLabel label)
private void SetTooltipIndicatorLabel(Tooltip tooltip, Axis axis, ChartLabel label)
{
if (label == null) return;
if (double.IsPositiveInfinity(axis.context.pointerValue)) return;
label.SetActive(true);
label.SetLabelActive(true);
label.SetTextActive(true);
label.SetPosition(axis.context.pointerLabelPosition);
if (axis.IsCategory())
label.SetText(axis.GetData((int)axis.context.pointerValue));
else
label.SetText(axis.context.pointerValue.ToString("f2"));
var textColor = axis.axisLabel.textStyle.GetColor(chart.theme.axis.textColor);
label.labelBackground.color = textColor;
if (ChartHelper.IsClearColor(tooltip.indicatorLabelStyle.background.color))
label.color = textColor;
else
label.color = tooltip.indicatorLabelStyle.background.color;
label.SetTextColor(Color.white);
}
@@ -207,37 +213,32 @@ namespace XCharts.Runtime
if (serie is INeedSerieContainer
&& (serie as INeedSerieContainer).containterInstanceId == component.instanceId)
{
if (tooltip.IsTriggerAxis())
var isTriggerAxis = tooltip.IsTriggerAxis();
if (container is GridCoord)
{
if (container is GridCoord)
{
var xAxis = chart.GetChartComponent<XAxis>(serie.xAxisIndex);
var yAxis = chart.GetChartComponent<YAxis>(serie.yAxisIndex);
serie.context.pointerEnter = true;
UpdateAxisPointerDataIndex(serie, xAxis, yAxis, container as GridCoord);
}
else if (container is PolarCoord)
{
var m_AngleAxis = ComponentHelper.GetAngleAxis(chart.components, container.index);
tooltip.context.angle = (float)m_AngleAxis.context.pointerValue;
}
list.Add(serie);
var xAxis = chart.GetChartComponent<XAxis>(serie.xAxisIndex);
var yAxis = chart.GetChartComponent<YAxis>(serie.yAxisIndex);
serie.context.pointerEnter = true;
UpdateAxisPointerDataIndex(serie, xAxis, yAxis, container as GridCoord, isTriggerAxis);
}
else if (serie.context.pointerEnter)
else if (container is PolarCoord)
{
list.Add(serie);
return component as ISerieContainer;
var m_AngleAxis = ComponentHelper.GetAngleAxis(chart.components, container.index);
tooltip.context.angle = (float)m_AngleAxis.context.pointerValue;
}
list.Add(serie);
if (!isTriggerAxis)
chart.RefreshTopPainter();
}
}
return component as ISerieContainer;
return container;
}
}
}
return null;
}
private void UpdateAxisPointerDataIndex(Serie serie, XAxis xAxis, YAxis yAxis, GridCoord grid)
private void UpdateAxisPointerDataIndex(Serie serie, XAxis xAxis, YAxis yAxis, GridCoord grid, bool isTriggerAxis)
{
serie.context.pointerAxisDataIndexs.Clear();
if (yAxis.IsCategory())
@@ -247,7 +248,10 @@ namespace XCharts.Runtime
}
else if (yAxis.IsTime())
{
GetSerieDataIndexByValue(serie, yAxis, grid);
if (isTriggerAxis)
GetSerieDataIndexByAxis(serie, yAxis, grid);
else
GetSerieDataIndexByItem(serie, yAxis, grid);
}
else if (xAxis.IsCategory())
{
@@ -256,11 +260,14 @@ namespace XCharts.Runtime
}
else
{
GetSerieDataIndexByValue(serie, xAxis, grid);
if (isTriggerAxis)
GetSerieDataIndexByAxis(serie, xAxis, grid);
else
GetSerieDataIndexByItem(serie, xAxis, grid);
}
}
private void GetSerieDataIndexByValue(Serie serie, Axis axis, GridCoord grid, int dimension = 0)
private void GetSerieDataIndexByAxis(Serie serie, Axis axis, GridCoord grid, int dimension = 0)
{
var currValue = 0d;
var lastValue = 0d;
@@ -269,62 +276,77 @@ namespace XCharts.Runtime
var isTimeAxis = axis.IsTime();
var dataCount = serie.dataCount;
var themeSymbolSize = chart.theme.serie.scatterSymbolSize;
var data = serie.data;
if (!isTimeAxis)
{
serie.context.sortedData.Clear();
for (int i = 0; i < dataCount; i++)
{
var serieData = serie.data[i];
serieData.index = i;
serie.context.sortedData.Add(serieData);
}
serie.context.sortedData.Sort(delegate (SerieData a, SerieData b)
{
return a.GetData(dimension).CompareTo(b.GetData(dimension));
});
data = serie.context.sortedData;
}
serie.context.pointerAxisDataIndexs.Clear();
var axisValueDistance = axis.GetDistance(axisValue, grid.context.width);
for (int i = 0; i < dataCount; i++)
{
var serieData = serie.data[i];
var serieData = data[i];
currValue = serieData.GetData(dimension);
if (isTimeAxis)
if (i == 0)
{
if (i == 0)
nextValue = data[i + 1].GetData(dimension);
if (axisValue <= currValue + (nextValue - currValue) / 2)
{
nextValue = serie.GetSerieData(i + 1).GetData(dimension);
if (axisValue <= currValue + (nextValue - currValue) / 2)
{
serie.context.pointerAxisDataIndexs.Add(i);
break;
}
serie.context.pointerAxisDataIndexs.Add(serieData.index);
break;
}
else if (i == dataCount - 1)
}
else if (i == dataCount - 1)
{
if (axisValue > lastValue + (currValue - lastValue) / 2)
{
if (axisValue > lastValue + (currValue - lastValue) / 2)
{
serie.context.pointerAxisDataIndexs.Add(i);
break;
}
serie.context.pointerAxisDataIndexs.Add(serieData.index);
break;
}
else
{
nextValue = serie.GetSerieData(i + 1).GetData(dimension);
if (axisValue > (currValue - (currValue - lastValue) / 2) && axisValue <= currValue + (nextValue - currValue) / 2)
{
serie.context.pointerAxisDataIndexs.Add(i);
break;
}
}
lastValue = currValue;
}
else
{
var symbol = SerieHelper.GetSerieSymbol(serie, serieData);
var symbolSize = symbol.GetSize(serieData.data, themeSymbolSize);
var dist = axis.GetDistance(currValue, grid.context.width) - axisValueDistance;
if (System.Math.Abs(dist) <= symbolSize)
nextValue = data[i + 1].GetData(dimension);
if (axisValue > (currValue - (currValue - lastValue) / 2) && axisValue <= currValue + (nextValue - currValue) / 2)
{
serie.context.pointerAxisDataIndexs.Add(i);
serieData.context.highlight = true;
}
else
{
serieData.context.highlight = false;
serie.context.pointerAxisDataIndexs.Add(serieData.index);
break;
}
}
lastValue = currValue;
}
if (serie.context.pointerAxisDataIndexs.Count > 0)
{
var index = serie.context.pointerAxisDataIndexs[0];
axis.context.axisTooltipValue = serie.GetSerieData(index).GetData(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);
}
else if (component.type == Tooltip.Type.Corss)
{
axis.context.axisTooltipValue = axis.context.pointerValue;
}
else
{
@@ -389,7 +411,6 @@ namespace XCharts.Runtime
serie.context.isTriggerByAxis = isTriggerByAxis;
if (isTriggerByAxis && dataIndex >= 0)
serie.context.pointerItemDataIndex = dataIndex;
serie.handler.UpdateTooltipSerieParams(dataIndex, showCategory, category,
tooltip.marker, tooltip.itemFormatter, tooltip.numericFormatter,
ref tooltip.context.data.param,
@@ -399,7 +420,8 @@ namespace XCharts.Runtime
if (tooltip.context.data.param.Count > 0)
{
tooltip.SetActive(true);
tooltip.view.Refresh();
if (tooltip.view != null)
tooltip.view.Refresh();
TooltipHelper.LimitInRect(tooltip, chart.chartRect);
return true;
}
@@ -475,7 +497,6 @@ namespace XCharts.Runtime
pX += xAxis.IsCategory()
? (float)(xAxis.context.pointerValue * splitWidth + (xAxis.boundaryGap ? splitWidth / 2 : 0))
: xAxis.GetDistance(xAxis.context.axisTooltipValue, grid.context.width);
//if (xAxis.IsValue()) pX = chart.pointerPos.x;
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);

View File

@@ -10,7 +10,7 @@ namespace XCharts.Runtime
public class TooltipViewItem
{
public GameObject gameObject;
public List<ChartText> columns = new List<ChartText>();
public List<ChartLabel> columns = new List<ChartLabel>();
}
public class TooltipView
{
@@ -26,7 +26,7 @@ namespace XCharts.Runtime
public Image background;
public Outline border;
public VerticalLayoutGroup layout;
public ChartText title;
public ChartLabel title;
private List<TooltipViewItem> m_Items = new List<TooltipViewItem>();
private List<float> m_ColumnMaxWidth = new List<float>();
private bool m_Active = false;
@@ -89,12 +89,12 @@ namespace XCharts.Runtime
column.SetText(param.columns[j]);
if (j == 0)
column.SetColor(param.color);
column.text.SetColor(param.color);
if (j >= m_ColumnMaxWidth.Count)
m_ColumnMaxWidth.Add(0);
var columnWidth = column.GetPreferredWidth();
var columnWidth = column.GetWidth();
if (m_ColumnMaxWidth[j] < columnWidth)
m_ColumnMaxWidth[j] = columnWidth;
}
@@ -128,7 +128,7 @@ namespace XCharts.Runtime
else
{
maxWid = TotalMaxWidth();
var titleWid = title.GetPreferredWidth();
var titleWid = title.GetTextWidth();
if (maxWid < titleWid)
maxWid = titleWid;
}
@@ -139,7 +139,7 @@ namespace XCharts.Runtime
}
else
{
if (!string.IsNullOrEmpty(title.GetText()))
if (!string.IsNullOrEmpty(title.text.GetText()))
maxHig += tooltip.titleHeight;
maxHig += tooltip.itemHeight * tooltip.context.data.param.Count;
maxHig += tooltip.paddingTopBottom * 2;
@@ -159,7 +159,7 @@ namespace XCharts.Runtime
for (int j = 0; j < m_ColumnMaxWidth.Count; j++)
{
var deltaX = j == m_ColumnMaxWidth.Count - 1 ? maxWid - xPos : m_ColumnMaxWidth[j];
item.columns[j].SetSizeDelta(new Vector2(deltaX, tooltip.itemHeight));
item.columns[j].text.SetSizeDelta(new Vector2(deltaX, tooltip.itemHeight));
item.columns[j].SetRectPosition(new Vector3(xPos, 0));
xPos += m_ColumnMaxWidth[j];
}
@@ -192,7 +192,7 @@ namespace XCharts.Runtime
}
}
private ChartText GetItemColumn(TooltipViewItem item, int i)
private ChartLabel GetItemColumn(TooltipViewItem item, int i)
{
if (i < 0) i = 0;
if (i < item.columns.Count)
@@ -236,10 +236,8 @@ namespace XCharts.Runtime
tooltip.paddingTopBottom,
tooltip.paddingTopBottom);
view.title = ChartHelper.AddTextObject("title", view.gameObject.transform, anchorMin, anchorMax, v2_0_05,
new Vector2(10, tooltip.titleHeight), tooltip.titleTextStyle, theme.tooltip);
view.title.SetText("");
view.title.SetLocalPosition(new Vector2(3, -3));
view.title = ChartHelper.AddChartLabel("title", view.gameObject.transform, tooltip.titleLabelStyle, theme.tooltip,
"", Color.clear, TextAnchor.MiddleLeft);
var item = CreateViewItem(0, view.gameObject.transform, tooltip, theme.tooltip);
view.m_Items.Add(item);
@@ -261,14 +259,12 @@ namespace XCharts.Runtime
return item;
}
private static ChartText CreateViewItemColumn(int i, Transform parent, Tooltip tooltip, ComponentTheme theme)
private static ChartLabel CreateViewItemColumn(int i, Transform parent, Tooltip tooltip, ComponentTheme theme)
{
var value = ChartHelper.AddTextObject("column" + i, parent,
v2_0_05, v2_0_05, v2_0_05, new Vector2(100, tooltip.itemHeight),
tooltip.GetColumnTextStyle(i), theme);
value.SetRectPosition(new Vector3(0, 0));
value.SetText("");
return value;
var labelStyle = tooltip.GetContentLabelStyle(i);
var label = ChartHelper.AddChartLabel("column" + i, parent, labelStyle, theme,
"", Color.clear, TextAnchor.MiddleLeft);
return label;
}
}
}

View File

@@ -76,6 +76,7 @@ namespace XCharts.Runtime
}
[SerializeField] private bool m_Show = true;
[SerializeField] private bool m_ShowUI = false;
[SerializeField] private Type m_Type = Type.Continuous;
[SerializeField] private SelectedMode m_SelectedMode = SelectedMode.Multiple;
[SerializeField] private int m_SerieIndex = 0;
@@ -97,6 +98,9 @@ namespace XCharts.Runtime
[SerializeField] private bool m_AutoMinMax = true;
[SerializeField] private Orient m_Orient = Orient.Horizonal;
[SerializeField] private Location m_Location = Location.defaultLeft;
[SerializeField] private bool m_WorkOnLine = true;
[SerializeField] private bool m_WorkOnArea = false;
[SerializeField] private List<Color32> m_InRange = new List<Color32>();
[SerializeField] private List<Color32> m_OutOfRange = new List<Color32>() { Color.gray };
[SerializeField] private List<VisualMapPieces> m_Pieces = new List<VisualMapPieces>();
@@ -104,11 +108,8 @@ namespace XCharts.Runtime
public VisualMapContext context = new VisualMapContext();
/// <summary>
/// Whether to display components. If set to false, it will not show up, but the data mapping function still exists.
/// |
/// 是否显示组件。如果设置为 false不会显示但是数据映射的功能还存在。
///
/// [default: true]
/// Whether to enable components.
/// |组件是否生效。
/// </summary>
public bool show
{
@@ -116,6 +117,15 @@ namespace XCharts.Runtime
set { if (PropertyUtil.SetStruct(ref m_Show, value)) SetVerticesDirty(); }
}
/// <summary>
/// Whether to display components. If set to false, it will not show up, but the data mapping function still exists.
/// |是否显示组件。如果设置为 false不会显示但是数据映射的功能还存在。
/// </summary>
public bool showUI
{
get { return m_ShowUI; }
set { if (PropertyUtil.SetStruct(ref m_ShowUI, value)) SetVerticesDirty(); }
}
/// <summary>
/// the type of visualmap component.
/// |组件类型。
/// </summary>
@@ -303,6 +313,24 @@ namespace XCharts.Runtime
set { if (PropertyUtil.SetClass(ref m_Location, value)) SetVerticesDirty(); }
}
/// <summary>
/// Whether the visualmap is work on linestyle of linechart.
/// |组件是否对LineChart的LineStyle有效。
/// </summary>
public bool workOnLine
{
get { return m_WorkOnLine; }
set { if (PropertyUtil.SetStruct(ref m_WorkOnLine, value)) SetVerticesDirty(); }
}
/// <summary>
/// Whether the visualmap is work on areaStyle of linechart.
/// |组件是否对LineChart的AreaStyle有效。
/// </summary>
public bool workOnArea
{
get { return m_WorkOnArea; }
set { if (PropertyUtil.SetStruct(ref m_WorkOnArea, value)) SetVerticesDirty(); }
}
/// <summary>
/// Defines the visual color in the selected range.
/// |定义 在选中范围中 的视觉颜色。
/// </summary>

View File

@@ -32,7 +32,7 @@ namespace XCharts.Runtime
public override void DrawBase(VertexHelper vh)
{
var visualMap = component;
if (!visualMap.show) return;
if (!visualMap.show || !visualMap.showUI) return;
switch (visualMap.type)
{
case VisualMap.Type.Continuous:
@@ -319,7 +319,7 @@ namespace XCharts.Runtime
private void OnDragVisualMapStart(VisualMap visualMap)
{
if (!visualMap.show || !visualMap.calculable)
if (!visualMap.show || !visualMap.showUI || !visualMap.calculable)
return;
var inMinRect = visualMap.IsInRangeMinRect(chart.pointerPos, chart.chartRect, chart.theme.visualMap.triangeLen);
@@ -340,7 +340,7 @@ namespace XCharts.Runtime
private void OnDragVisualMap(VisualMap visualMap)
{
if (!visualMap.show || !visualMap.calculable)
if (!visualMap.show || !visualMap.showUI || !visualMap.calculable)
return;
if (!visualMap.context.minDrag && !visualMap.context.maxDrag)
@@ -360,7 +360,7 @@ namespace XCharts.Runtime
private void OnDragVisualMapEnd(VisualMap visualMap)
{
if (!visualMap.show || !visualMap.calculable)
if (!visualMap.show || !visualMap.showUI || !visualMap.calculable)
return;
if (visualMap.context.minDrag || visualMap.context.maxDrag)

View File

@@ -76,7 +76,9 @@ namespace XCharts.Runtime
if (axis.IsCategory() && axis.boundaryGap)
{
float startX = grid.context.x + axis.context.scaleWidth / 2;
value = (int)(min + (pos.x - startX) / (grid.context.width - axis.context.scaleWidth) * (max - min));
value = (min + (pos.x - startX) / (grid.context.width - axis.context.scaleWidth) * (max - min));
if (visualMap.IsPiecewise())
value = (int)value;
}
else
{
@@ -87,17 +89,19 @@ namespace XCharts.Runtime
{
min = relativedAxis.context.minValue;
max = relativedAxis.context.maxValue;
if (relativedAxis.IsCategory() && relativedAxis.boundaryGap)
{
float startY = grid.context.y + relativedAxis.context.scaleWidth / 2;
value = (int)(min + (pos.y - startY) / (grid.context.height - relativedAxis.context.scaleWidth) * (max - min));
value = (min + (pos.y - startY) / (grid.context.height - relativedAxis.context.scaleWidth) * (max - min));
if (visualMap.IsPiecewise())
value = (int)value;
}
else
{
value = min + (pos.y - grid.context.y) / grid.context.height * (max - min);
}
}
var color = visualMap.GetColor(value);
if (ChartHelper.IsClearColor(color))
{
@@ -147,10 +151,30 @@ namespace XCharts.Runtime
{
if (visualMap == null)
return false;
if (!visualMap.show || (!visualMap.workOnLine && !visualMap.workOnArea))
return false;
if (visualMap.inRange.Count <= 0 && visualMap.pieces.Count <= 0)
return false;
return true;
}
public static bool IsNeedLineGradient(VisualMap visualMap)
{
if (visualMap == null)
return false;
if (!visualMap.show || !visualMap.workOnLine)
return false;
if (visualMap.inRange.Count <= 0 && visualMap.pieces.Count <= 0)
return false;
return true;
}
public static bool IsNeedAreaGradient(VisualMap visualMap)
{
if (visualMap == null)
return false;
if (!visualMap.show || !visualMap.workOnArea)
return false;
if (visualMap.inRange.Count <= 0 && visualMap.pieces.Count <= 0)
return false;
return true;
}

View File

@@ -1,20 +1,22 @@
using System.Collections.Generic;
using UnityEngine;
namespace XCharts.Runtime
{
public class GridCoordContext : MainComponentContext, IRectContext
public class GridCoordContext : MainComponentContext
{
public float x { get; internal set; }
public float y { get; internal set; }
public float width { get; internal set; }
public float height { get; internal set; }
public Vector3 position { get; internal set; }
public Vector3 center { get; internal set; }
public float left { get; internal set; }
public float right { get; internal set; }
public float bottom { get; internal set; }
public float top { get; internal set; }
public bool isPointerEnter { get; set; }
public float x;
public float y;
public float width;
public float height;
public Vector3 position;
public Vector3 center;
public float left;
public float right;
public float bottom;
public float top;
public bool isPointerEnter;
public List<ChartLabel> endLabelList = new List<ChartLabel>();
}
}

View File

@@ -6,16 +6,16 @@ namespace XCharts.Runtime
{
public class ParallelCoordContext : MainComponentContext
{
public float x { get; internal set; }
public float y { get; internal set; }
public float width { get; internal set; }
public float height { get; internal set; }
public Vector3 position { get; internal set; }
public float left { get; internal set; }
public float right { get; internal set; }
public float bottom { get; internal set; }
public float top { get; internal set; }
public bool runtimeIsPointerEnter { get; set; }
public float x;
public float y;
public float width;
public float height;
public Vector3 position;
public float left;
public float right;
public float bottom;
public float top;
public bool runtimeIsPointerEnter;
internal List<ParallelAxis> parallelAxes = new List<ParallelAxis>();
}
}

View File

@@ -11,7 +11,6 @@ namespace XCharts.Runtime
/// </summary>
[Serializable]
[ComponentHandler(typeof(PolarCoordHandler), true)]
[RequireChartComponent(typeof(AngleAxis), typeof(RadiusAxis))]
public class PolarCoord : CoordSystem, ISerieContainer
{
[SerializeField] private bool m_Show = true;
@@ -32,8 +31,8 @@ namespace XCharts.Runtime
set { if (PropertyUtil.SetStruct(ref m_Show, value)) SetVerticesDirty(); }
}
/// <summary>
/// [default:[0.5f,0.45f]]The center of ploar. The center[0] is the x-coordinate, and the center[1] is the y-coordinate.
/// |When value between 0 and 1 represents a percentage relative to the chart.
/// The center of ploar. The center[0] is the x-coordinate, and the center[1] is the y-coordinate.
/// When value between 0 and 1 represents a percentage relative to the chart.
/// |极坐标的中心点。数组的第一项是横坐标,第二项是纵坐标。
/// 当值为0-1之间时表示百分比设置成百分比时第一项是相对于容器宽度第二项是相对于容器高度。
/// </summary>
@@ -43,7 +42,7 @@ namespace XCharts.Runtime
set { if (value != null) { m_Center = value; SetAllDirty(); } }
}
/// <summary>
/// [default:0.35f]the radius of polar.
/// the radius of polar.
/// |极坐标的半径。
/// </summary>
public float radius
@@ -52,7 +51,7 @@ namespace XCharts.Runtime
set { if (PropertyUtil.SetStruct(ref m_Radius, value)) SetAllDirty(); }
}
/// <summary>
/// [default:Color.clear]Background color of polar, which is transparent by default.
/// Background color of polar, which is transparent by default.
/// |极坐标的背景色,默认透明。
/// </summary>
public Color backgroundColor

View File

@@ -10,12 +10,12 @@ namespace XCharts.Runtime
/// the center position of polar in container.
/// |极坐标在容器中的具体中心点。
/// </summary>
public Vector3 center { get; internal set; }
public Vector3 center;
/// <summary>
/// the true radius of polar.
/// |极坐标的运行时实际半径。
/// </summary>
public float radius { get; internal set; }
public bool isPointerEnter { get; set; }
public float radius;
public bool isPointerEnter;
}
}

View File

@@ -277,90 +277,71 @@ namespace XCharts.Runtime
public static Color32 GetItemColor(Serie serie, SerieData serieData, ThemeStyle theme, int index, bool highlight)
{
if (serie == null) return ChartConst.clearColor32;
if (serie == null)
return ChartConst.clearColor32;
ItemStyle itemStyle = null;
if (highlight)
{
var itemStyleEmphasis = GetItemStyleEmphasis(serie, serieData);
if (itemStyleEmphasis != null && !ChartHelper.IsClearColor(itemStyleEmphasis.color))
{
var color = itemStyleEmphasis.color;
ChartHelper.SetColorOpacity(ref color, itemStyleEmphasis.opacity);
return color;
}
}
var itemStyle = GetItemStyle(serie, serieData);
if (!ChartHelper.IsClearColor(itemStyle.color))
{
return itemStyle.GetColor();
}
else
{
var color = theme.GetColor(index);
if (highlight) color = ChartHelper.GetHighlightColor(color);
ChartHelper.SetColorOpacity(ref color, itemStyle.opacity);
return color;
}
itemStyle = GetItemStyleEmphasis(serie, serieData);
if (itemStyle == null)
itemStyle = GetItemStyle(serie, serieData);
var color = ChartHelper.IsClearColor(itemStyle.color)
? theme.GetColor(index)
: itemStyle.color;
if (highlight)
color = ChartHelper.GetHighlightColor(color);
ChartHelper.SetColorOpacity(ref color, itemStyle.opacity);
return color;
}
public static Color32 GetItemColor0(Serie serie, SerieData serieData, ThemeStyle theme, bool highlight, Color32 defaultColor)
{
if (serie == null) return ChartConst.clearColor32;
if (serie == null)
return ChartConst.clearColor32;
ItemStyle itemStyle = null;
if (highlight)
{
var itemStyleEmphasis = GetItemStyleEmphasis(serie, serieData);
if (itemStyleEmphasis != null && !ChartHelper.IsClearColor(itemStyleEmphasis.color))
{
var color = itemStyleEmphasis.color0;
ChartHelper.SetColorOpacity(ref color, itemStyleEmphasis.opacity);
return color;
}
}
var itemStyle = GetItemStyle(serie, serieData);
if (!ChartHelper.IsClearColor(itemStyle.color0))
{
return itemStyle.GetColor0();
}
else
{
var color = defaultColor;
if (highlight) color = ChartHelper.GetHighlightColor(color);
ChartHelper.SetColorOpacity(ref color, itemStyle.opacity);
return color;
}
itemStyle = GetItemStyleEmphasis(serie, serieData);
if (itemStyle == null)
itemStyle = GetItemStyle(serie, serieData);
var color = ChartHelper.IsClearColor(itemStyle.color0)
? defaultColor
: itemStyle.color0;
if (highlight)
color = ChartHelper.GetHighlightColor(color);
ChartHelper.SetColorOpacity(ref color, itemStyle.opacity);
return color;
}
public static Color32 GetItemToColor(Serie serie, SerieData serieData, ThemeStyle theme, int index, bool highlight)
{
if (serie == null)
return ChartConst.clearColor32;
ItemStyle itemStyle = null;
if (highlight)
itemStyle = GetItemStyleEmphasis(serie, serieData);
if (itemStyle == null)
itemStyle = GetItemStyle(serie, serieData);
var color = itemStyle.toColor;
if (ChartHelper.IsClearColor(color))
{
var itemStyleEmphasis = GetItemStyleEmphasis(serie, serieData);
if (itemStyleEmphasis != null && !ChartHelper.IsClearColor(itemStyleEmphasis.toColor))
{
return itemStyleEmphasis.GetColor();
}
}
var itemStyle = GetItemStyle(serie, serieData, highlight);
if (itemStyle == null) itemStyle = serieData.itemStyle;
if (!ChartHelper.IsClearColor(itemStyle.toColor))
{
var color = itemStyle.toColor;
if (highlight) color = ChartHelper.GetHighlightColor(color);
ChartHelper.SetColorOpacity(ref color, itemStyle.opacity);
return color;
}
if (!ChartHelper.IsClearColor(itemStyle.color))
{
var color = itemStyle.color;
if (highlight) color = ChartHelper.GetHighlightColor(color);
ChartHelper.SetColorOpacity(ref color, itemStyle.opacity);
return color;
}
else
{
var color = theme.GetColor(index);
if (highlight) color = ChartHelper.GetHighlightColor(color);
ChartHelper.SetColorOpacity(ref color, itemStyle.opacity);
return color;
color = ChartHelper.IsClearColor(itemStyle.color)
? theme.GetColor(index)
: itemStyle.color;
}
if (highlight)
color = ChartHelper.GetHighlightColor(color);
ChartHelper.SetColorOpacity(ref color, itemStyle.opacity);
return color;
}
public static bool IsDownPoint(Serie serie, int index)
@@ -422,7 +403,7 @@ namespace XCharts.Runtime
}
else
{
if (!serie.IsPerformanceMode() && serieData.label != null) return serieData.label;
if (!serie.IsPerformanceMode() && serieData.labelStyle != null) return serieData.labelStyle;
else return serie.label;
}
}
@@ -451,12 +432,6 @@ namespace XCharts.Runtime
}
}
public static IconStyle GetIconStyle(Serie serie, SerieData serieData)
{
if (serieData != null && serieData.iconStyle != null) return serieData.iconStyle;
else return serie.iconStyle;
}
public static SymbolStyle GetSerieSymbol(Serie serie, SerieData serieData)
{
if (!serie.IsPerformanceMode() && serieData.symbol != null) return serieData.symbol;
@@ -729,7 +704,12 @@ namespace XCharts.Runtime
if (dataZoom.minShowNum > data.Count) range = data.Count;
else range = dataZoom.minShowNum;
}
serie.m_FilterData = data.GetRange(start, range);
if (range > data.Count - start - 1)
start = data.Count - range - 1;
if (start >= 0)
serie.m_FilterData = data.GetRange(start, range);
else
serie.m_FilterData = data;
}
else
{

View File

@@ -45,7 +45,7 @@ namespace XCharts.Runtime
var dataName = serieData != null ? serieData.name : null;
if (serieLabel.formatterFunction != null)
{
return serieLabel.formatterFunction(serieData.index, dataValue);
return serieLabel.formatterFunction(serieData.index, dataValue, null);
}
if (string.IsNullOrEmpty(serieLabel.formatter))
return ChartCached.NumberToStr(dataValue, numericFormatter);
@@ -69,16 +69,17 @@ namespace XCharts.Runtime
var total = serie.max;
var content = SerieLabelHelper.GetFormatterContent(serie, serieData, value, total, null, Color.clear);
serieData.labelObject.SetText(content);
serieData.labelObject.SetLabelPosition(serie.context.center + label.offset);
serieData.labelObject.SetPosition(serie.context.center + label.offset);
if (!ChartHelper.IsClearColor(label.textStyle.color))
{
serieData.labelObject.label.SetColor(label.textStyle.color);
serieData.labelObject.text.SetColor(label.textStyle.color);
}
}
public static void UpdatePieLabelPosition(Serie serie, SerieData serieData)
{
if (serieData.labelObject == null) return;
var startAngle = serie.context.startAngle;
var currAngle = serieData.context.halfAngle;
var currRad = currAngle * Mathf.Deg2Rad;
var offsetRadius = serieData.context.offsetRadius;
@@ -97,7 +98,8 @@ namespace XCharts.Runtime
serie.context.center.y + labelRadius * Mathf.Cos(currRad));
serieData.context.labelPosition = labelCenter;
break;
case LabelStyle.Position.Outside:
default:
//LabelStyle.Position.Outside
if (labelLine != null && labelLine.lineType == LabelLine.LineType.HorizontalLine)
{
var radius1 = serie.context.outsideRadius;
@@ -105,15 +107,15 @@ namespace XCharts.Runtime
var currSin = Mathf.Sin(currRad);
var currCos = Mathf.Cos(currRad);
var pos0 = new Vector3(serie.context.center.x + radius3 * currSin, serie.context.center.y + radius3 * currCos);
if (currAngle > 180)
if ((currAngle - startAngle) % 360 > 180)
{
currSin = Mathf.Sin((360 - currAngle) * Mathf.Deg2Rad);
currCos = Mathf.Cos((360 - currAngle) * Mathf.Deg2Rad);
}
var r4 = Mathf.Sqrt(radius1 * radius1 - Mathf.Pow(currCos * radius3, 2)) - currSin * radius3;
r4 += labelLine.lineLength1 + labelLine.lineWidth * 4;
r4 += serieData.labelObject.label.GetPreferredWidth() / 2;
serieData.context.labelPosition = pos0 + (currAngle > 180 ? Vector3.left : Vector3.right) * r4;
r4 += serieData.labelObject.text.GetPreferredWidth() / 2;
serieData.context.labelPosition = pos0 + ((currAngle - startAngle) % 360 > 180 ? Vector3.left : Vector3.right) * r4;
}
else
{
@@ -164,8 +166,10 @@ namespace XCharts.Runtime
var serieLabel = SerieHelper.GetSerieLabel(serie, serieData);
var labelLine = SerieHelper.GetSerieLabelLine(serie, serieData);
var fontSize = serieLabel.textStyle.GetFontSize(theme);
var isOutside = serieLabel.position == LabelStyle.Position.Outside
|| serieLabel.position == LabelStyle.Position.Default;
if (!serieLabel.show) return;
if (serieLabel.position != LabelStyle.Position.Outside) return;
if (!isOutside) return;
if (lastCheckPos == Vector3.zero)
{
lastCheckPos = serieData.context.labelPosition;
@@ -184,20 +188,21 @@ namespace XCharts.Runtime
serieData.context.labelPosition = new Vector3(x1, y1);
}
lastCheckPos = serieData.context.labelPosition;
serieData.labelObject.SetPosition(SerieLabelHelper.GetRealLabelPosition(serieData, serieLabel, labelLine));
serieData.labelObject.SetPosition(SerieLabelHelper.GetRealLabelPosition(serie, serieData, serieLabel, labelLine));
}
}
public static Vector3 GetRealLabelPosition(SerieData serieData, LabelStyle label, LabelLine labelLine)
public static Vector3 GetRealLabelPosition(Serie serie, SerieData serieData, LabelStyle label, LabelLine labelLine)
{
if (label == null || labelLine == null)
return serieData.context.labelPosition;
if (label.position == LabelStyle.Position.Outside && labelLine.lineType != LabelLine.LineType.HorizontalLine)
var isOutside = label.position == LabelStyle.Position.Outside
|| label.position == LabelStyle.Position.Default;
if (isOutside && labelLine.lineType != LabelLine.LineType.HorizontalLine)
{
var currAngle = serieData.context.halfAngle;
var offset = labelLine.lineLength2 + serieData.labelObject.GetLabelWidth() / 2;
if (currAngle > 180)
var offset = labelLine.lineLength2 + serieData.labelObject.GetTextWidth() / 2;
if ((currAngle - serie.context.startAngle) % 360 > 180)
return serieData.context.labelPosition + new Vector3(-offset, 0, 0);
else
return serieData.context.labelPosition + new Vector3(offset, 0, 0);

View File

@@ -58,11 +58,12 @@ namespace XCharts.Runtime
{
for (int i = 0; i < serie.data.Count; i++)
{
if (serie is Pie && serie.IsIgnoreValue(serie.data[i])) continue;
if (string.IsNullOrEmpty(serie.data[i].name))
var serieData = serie.data[i];
if (serie is Pie && serie.IsIgnoreValue(serieData)) continue;
if (string.IsNullOrEmpty(serieData.name))
serieNameList.Add(ChartCached.IntToStr(i));
else if (!serieNameList.Contains(serie.data[i].name))
serieNameList.Add(serie.data[i].name);
else if (!serieNameList.Contains(serieData.name))
serieNameList.Add(serieData.name);
}
}
else
@@ -109,26 +110,6 @@ namespace XCharts.Runtime
return SerieHelper.GetItemColor(destSerie, destSerieData, chart.theme, index, false);
}
/// <summary>
/// 同堆叠的serie是否有渐变色的。
/// </summary>
/// <param name="stack"></param>
/// <returns></returns>
public static bool IsAnyGradientSerie(List<Serie> series, string stack)
{
if (string.IsNullOrEmpty(stack)) return false;
foreach (var serie in series)
{
if (serie.show && serie.areaStyle != null && serie.areaStyle.show && stack.Equals(serie.stack))
{
if (!ChartHelper.IsValueEqualsColor(serie.areaStyle.color, serie.areaStyle.toColor)
&& !ChartHelper.IsClearColor(serie.areaStyle.toColor))
return true;
}
}
return false;
}
/// <summary>
/// 是否有需裁剪的serie。
/// </summary>
@@ -142,18 +123,6 @@ namespace XCharts.Runtime
return false;
}
public static bool IsAnyUpdateAnimationSerie(List<Serie> series)
{
foreach (var serie in series)
{
if (serie.animation.enable && serie.animation.dataChangeEnable)
{
return true;
}
}
return false;
}
/// <summary>
/// 获得上一个同堆叠且显示的serie。
/// </summary>
@@ -170,17 +139,6 @@ namespace XCharts.Runtime
return null;
}
/// <summary>
/// 获得上一个同堆叠且显示的serie。
/// </summary>
/// <param name="index"></param>
/// <returns></returns>
public static Serie GetLastStackSerie(List<Serie> series, int index)
{
var serie = series[index];
return GetLastStackSerie(series, serie);
}
public static Serie GetSerieByVesselIndex(List<Serie> series, int vesselIndex)
{
foreach (var serie in series)

View File

@@ -2,17 +2,15 @@
using System.Collections.Generic;
using UnityEngine;
using System;
using System.Text;
namespace XCharts.Runtime
{
[Serializable]
[CreateAssetMenu(menuName = "XCharts/Export Lang")]
/// <summary>
/// Language.
/// |国际化语言表。
/// </summary>
[Serializable]
[CreateAssetMenu(menuName = "XCharts/Export Lang")]
public class Lang : ScriptableObject
{
public string langName = "EN";
@@ -58,6 +56,7 @@ namespace XCharts.Runtime
"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" };
}
[Serializable]
public class LangCandlestick
{
public List<string> dimensionNames = new List<string>() { "open", "close", "lowest", "highest" };

View File

@@ -481,5 +481,11 @@ namespace XCharts.Runtime
m_PainterTop.material = material;
}
}
public Color32 GetChartBackgroundColor()
{
var background = GetChartComponent<Background>();
return theme.GetBackgroundColor(background);
}
}
}

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