@nativescript-community/ui-chart 1.2.36 → 2.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (365) hide show
  1. package/README.md +6 -0
  2. package/animation/ChartAnimator.d.ts +47 -4
  3. package/animation/ChartAnimator.js +49 -11
  4. package/animation/ChartAnimator.js.map +1 -1
  5. package/animation/Tween.d.ts +1 -1
  6. package/animation/Tween.js +4 -2
  7. package/animation/Tween.js.map +1 -1
  8. package/buffer/AbstractBuffer.d.ts +28 -3
  9. package/buffer/AbstractBuffer.js +22 -3
  10. package/buffer/AbstractBuffer.js.map +1 -1
  11. package/buffer/BarBuffer.d.ts +8 -12
  12. package/buffer/BarBuffer.js +33 -36
  13. package/buffer/BarBuffer.js.map +1 -1
  14. package/buffer/HorizontalBarBuffer.js +13 -10
  15. package/buffer/HorizontalBarBuffer.js.map +1 -1
  16. package/charts/BarChart.d.ts +70 -15
  17. package/charts/BarChart.js +92 -63
  18. package/charts/BarChart.js.map +1 -1
  19. package/charts/BarLineChartBase.d.ts +494 -73
  20. package/charts/BarLineChartBase.js +788 -407
  21. package/charts/BarLineChartBase.js.map +1 -1
  22. package/charts/BubbleChart.d.ts +11 -5
  23. package/charts/BubbleChart.js +10 -8
  24. package/charts/BubbleChart.js.map +1 -1
  25. package/charts/CandleStickChart.d.ts +8 -5
  26. package/charts/CandleStickChart.js +9 -10
  27. package/charts/CandleStickChart.js.map +1 -1
  28. package/charts/Chart.d.ts +420 -91
  29. package/charts/Chart.js +590 -290
  30. package/charts/Chart.js.map +1 -1
  31. package/charts/CombinedChart.d.ts +59 -29
  32. package/charts/CombinedChart.js +74 -67
  33. package/charts/CombinedChart.js.map +1 -1
  34. package/charts/HorizontalBarChart.d.ts +37 -7
  35. package/charts/HorizontalBarChart.js +97 -59
  36. package/charts/HorizontalBarChart.js.map +1 -1
  37. package/charts/LineChart.d.ts +3 -5
  38. package/charts/LineChart.js +6 -10
  39. package/charts/LineChart.js.map +1 -1
  40. package/charts/PieChart.d.ts +218 -64
  41. package/charts/PieChart.js +278 -168
  42. package/charts/PieChart.js.map +1 -1
  43. package/charts/PieRadarChartBase.d.ts +107 -18
  44. package/charts/PieRadarChartBase.js +156 -73
  45. package/charts/PieRadarChartBase.js.map +1 -1
  46. package/charts/RadarChart.d.ts +75 -35
  47. package/charts/RadarChart.js +114 -103
  48. package/charts/RadarChart.js.map +1 -1
  49. package/charts/ScatterChart.d.ts +10 -5
  50. package/charts/ScatterChart.js +11 -10
  51. package/charts/ScatterChart.js.map +1 -1
  52. package/components/AxisBase.d.ts +271 -101
  53. package/components/AxisBase.js +264 -254
  54. package/components/AxisBase.js.map +1 -1
  55. package/components/ComponentBase.d.ts +54 -19
  56. package/components/ComponentBase.js +60 -48
  57. package/components/ComponentBase.js.map +1 -1
  58. package/components/Description.d.ts +18 -9
  59. package/components/Description.js +12 -26
  60. package/components/Description.js.map +1 -1
  61. package/components/IMarker.d.ts +30 -1
  62. package/components/IMarker.js.map +1 -1
  63. package/components/Legend.d.ts +155 -58
  64. package/components/Legend.js +208 -172
  65. package/components/Legend.js.map +1 -1
  66. package/components/LegendEntry.d.ts +38 -0
  67. package/components/LegendEntry.js +34 -0
  68. package/components/LegendEntry.js.map +1 -1
  69. package/components/LimitLine.d.ts +40 -22
  70. package/components/LimitLine.js +44 -56
  71. package/components/LimitLine.js.map +1 -1
  72. package/components/MarkerImage.d.ts +1 -0
  73. package/components/MarkerImage.js +97 -0
  74. package/components/MarkerImage.js.map +1 -0
  75. package/components/XAxis.d.ts +41 -10
  76. package/components/XAxis.js +42 -24
  77. package/components/XAxis.js.map +1 -1
  78. package/components/YAxis.d.ts +114 -37
  79. package/components/YAxis.js +138 -106
  80. package/components/YAxis.js.map +1 -1
  81. package/data/BarData.d.ts +32 -4
  82. package/data/BarData.js +92 -24
  83. package/data/BarData.js.map +1 -1
  84. package/data/BarDataSet.d.ts +35 -18
  85. package/data/BarDataSet.js +42 -47
  86. package/data/BarDataSet.js.map +1 -1
  87. package/data/BarEntry.d.ts +3 -0
  88. package/data/BarEntry.js.map +1 -1
  89. package/data/BarLineScatterCandleBubbleData.d.ts +5 -0
  90. package/data/BarLineScatterCandleBubbleData.js +5 -0
  91. package/data/BarLineScatterCandleBubbleData.js.map +1 -1
  92. package/data/BarLineScatterCandleBubbleDataSet.d.ts +11 -3
  93. package/data/BarLineScatterCandleBubbleDataSet.js +11 -7
  94. package/data/BarLineScatterCandleBubbleDataSet.js.map +1 -1
  95. package/data/BaseDataSet.d.ts +129 -71
  96. package/data/BaseDataSet.js +146 -169
  97. package/data/BaseDataSet.js.map +1 -1
  98. package/data/BaseEntry.d.ts +3 -0
  99. package/data/BaseEntry.js.map +1 -1
  100. package/data/BubbleData.d.ts +7 -1
  101. package/data/BubbleData.js +8 -2
  102. package/data/BubbleData.js.map +1 -1
  103. package/data/BubbleDataSet.d.ts +7 -7
  104. package/data/BubbleDataSet.js +8 -15
  105. package/data/BubbleDataSet.js.map +1 -1
  106. package/data/BubbleEntry.d.ts +1 -0
  107. package/data/BubbleEntry.js.map +1 -1
  108. package/data/CandleData.js.map +1 -1
  109. package/data/CandleDataSet.d.ts +64 -30
  110. package/data/CandleDataSet.js +67 -74
  111. package/data/CandleDataSet.js.map +1 -1
  112. package/data/CandleEntry.d.ts +4 -0
  113. package/data/CandleEntry.js.map +1 -1
  114. package/data/ChartData.d.ts +275 -20
  115. package/data/ChartData.js +400 -95
  116. package/data/ChartData.js.map +1 -1
  117. package/data/CombinedData.d.ts +39 -12
  118. package/data/CombinedData.js +87 -71
  119. package/data/CombinedData.js.map +1 -1
  120. package/data/DataSet.d.ts +59 -8
  121. package/data/DataSet.js +114 -26
  122. package/data/DataSet.js.map +1 -1
  123. package/data/Entry.js.map +1 -1
  124. package/data/LineData.d.ts +5 -0
  125. package/data/LineData.js +5 -0
  126. package/data/LineData.js.map +1 -1
  127. package/data/LineDataSet.d.ts +84 -49
  128. package/data/LineDataSet.js +94 -135
  129. package/data/LineDataSet.js.map +1 -1
  130. package/data/LineRadarDataSet.d.ts +27 -17
  131. package/data/LineRadarDataSet.js +22 -35
  132. package/data/LineRadarDataSet.js.map +1 -1
  133. package/data/LineScatterCandleRadarDataSet.d.ts +30 -15
  134. package/data/LineScatterCandleRadarDataSet.js +36 -39
  135. package/data/LineScatterCandleRadarDataSet.js.map +1 -1
  136. package/data/PieData.d.ts +26 -0
  137. package/data/PieData.js +28 -2
  138. package/data/PieData.js.map +1 -1
  139. package/data/PieDataSet.d.ts +40 -36
  140. package/data/PieDataSet.js +36 -88
  141. package/data/PieDataSet.js.map +1 -1
  142. package/data/PieEntry.d.ts +3 -0
  143. package/data/PieEntry.js.map +1 -1
  144. package/data/RadarData.d.ts +10 -4
  145. package/data/RadarData.js +5 -6
  146. package/data/RadarData.js.map +1 -1
  147. package/data/RadarDataSet.d.ts +7 -21
  148. package/data/RadarDataSet.js +10 -49
  149. package/data/RadarDataSet.js.map +1 -1
  150. package/data/RadarEntry.js.map +1 -1
  151. package/data/ScatterData.d.ts +4 -1
  152. package/data/ScatterData.js +5 -2
  153. package/data/ScatterData.js.map +1 -1
  154. package/data/ScatterDataSet.d.ts +24 -14
  155. package/data/ScatterDataSet.js +26 -31
  156. package/data/ScatterDataSet.js.map +1 -1
  157. package/formatter/DefaultAxisValueFormatter.d.ts +17 -3
  158. package/formatter/DefaultAxisValueFormatter.js +12 -5
  159. package/formatter/DefaultAxisValueFormatter.js.map +1 -1
  160. package/formatter/DefaultFillFormatter.js +7 -7
  161. package/formatter/DefaultFillFormatter.js.map +1 -1
  162. package/formatter/DefaultValueFormatter.js.map +1 -1
  163. package/formatter/IAxisValueFormatter.d.ts +20 -2
  164. package/formatter/IAxisValueFormatter.js.map +1 -1
  165. package/formatter/IFillFormatter.d.ts +25 -0
  166. package/formatter/IFillFormatter.js.map +1 -1
  167. package/formatter/IValueFormatter.d.ts +21 -0
  168. package/formatter/IValueFormatter.js.map +1 -1
  169. package/formatter/ValueFormatter.d.ts +60 -0
  170. package/formatter/ValueFormatter.js +60 -0
  171. package/formatter/ValueFormatter.js.map +1 -1
  172. package/highlight/BarHighlighter.d.ts +22 -2
  173. package/highlight/BarHighlighter.js +43 -17
  174. package/highlight/BarHighlighter.js.map +1 -1
  175. package/highlight/ChartHighlighter.d.ts +87 -5
  176. package/highlight/ChartHighlighter.js +129 -25
  177. package/highlight/ChartHighlighter.js.map +1 -1
  178. package/highlight/CombinedHighlighter.d.ts +6 -0
  179. package/highlight/CombinedHighlighter.js +31 -16
  180. package/highlight/CombinedHighlighter.js.map +1 -1
  181. package/highlight/Highlight.d.ts +54 -1
  182. package/highlight/Highlight.js +5 -0
  183. package/highlight/Highlight.js.map +1 -1
  184. package/highlight/HorizontalBarHighlighter.d.ts +1 -1
  185. package/highlight/HorizontalBarHighlighter.js +14 -13
  186. package/highlight/HorizontalBarHighlighter.js.map +1 -1
  187. package/highlight/IHighlighter.d.ts +11 -1
  188. package/highlight/IHighlighter.js.map +1 -1
  189. package/highlight/PieHighlighter.js +2 -2
  190. package/highlight/PieHighlighter.js.map +1 -1
  191. package/highlight/PieRadarHighlighter.d.ts +12 -1
  192. package/highlight/PieRadarHighlighter.js +12 -4
  193. package/highlight/PieRadarHighlighter.js.map +1 -1
  194. package/highlight/RadarHighlighter.d.ts +12 -0
  195. package/highlight/RadarHighlighter.js +24 -10
  196. package/highlight/RadarHighlighter.js.map +1 -1
  197. package/index.d.ts +11 -0
  198. package/index.js +15 -0
  199. package/index.js.map +1 -0
  200. package/interfaces/dataprovider/BarDataProvider.d.ts +4 -4
  201. package/interfaces/dataprovider/BarLineScatterCandleBubbleDataProvider.d.ts +8 -3
  202. package/interfaces/dataprovider/BubbleDataProvider.d.ts +1 -1
  203. package/interfaces/dataprovider/CandleDataProvider.d.ts +1 -1
  204. package/interfaces/dataprovider/ChartInterface.d.ts +17 -22
  205. package/interfaces/dataprovider/CombinedDataProvider.d.ts +1 -1
  206. package/interfaces/dataprovider/LineDataProvider.d.ts +1 -1
  207. package/interfaces/dataprovider/ScatterDataProvider.d.ts +1 -1
  208. package/interfaces/datasets/IBarDataSet.d.ts +8 -22
  209. package/interfaces/datasets/IBarLineScatterCandleBubbleDataSet.d.ts +1 -3
  210. package/interfaces/datasets/IBubbleDataSet.d.ts +3 -9
  211. package/interfaces/datasets/ICandleDataSet.d.ts +44 -41
  212. package/interfaces/datasets/IDataSet.d.ts +35 -151
  213. package/interfaces/datasets/ILineDataSet.d.ts +15 -54
  214. package/interfaces/datasets/ILineRadarDataSet.d.ts +7 -28
  215. package/interfaces/datasets/ILineScatterCandleRadarDataSet.d.ts +5 -4
  216. package/interfaces/datasets/IPieDataSet.d.ts +22 -40
  217. package/interfaces/datasets/IRadarDataSet.d.ts +7 -13
  218. package/interfaces/datasets/IScatterDataSet.d.ts +17 -16
  219. package/jobs/AnimatedMoveViewJob.d.ts +3 -0
  220. package/jobs/AnimatedMoveViewJob.js +12 -8
  221. package/jobs/AnimatedMoveViewJob.js.map +1 -1
  222. package/jobs/AnimatedViewPortJob.d.ts +7 -8
  223. package/jobs/AnimatedViewPortJob.js +16 -23
  224. package/jobs/AnimatedViewPortJob.js.map +1 -1
  225. package/jobs/AnimatedZoomJob.d.ts +8 -5
  226. package/jobs/AnimatedZoomJob.js +30 -26
  227. package/jobs/AnimatedZoomJob.js.map +1 -1
  228. package/jobs/MoveViewJob.d.ts +3 -0
  229. package/jobs/MoveViewJob.js +10 -7
  230. package/jobs/MoveViewJob.js.map +1 -1
  231. package/jobs/ViewPortJob.d.ts +3 -5
  232. package/jobs/ViewPortJob.js +5 -11
  233. package/jobs/ViewPortJob.js.map +1 -1
  234. package/jobs/ZoomJob.js +14 -14
  235. package/jobs/ZoomJob.js.map +1 -1
  236. package/listener/BarLineChartTouchListener.d.ts +82 -1
  237. package/listener/BarLineChartTouchListener.js +169 -67
  238. package/listener/BarLineChartTouchListener.js.map +1 -1
  239. package/listener/ChartTouchListener.d.ts +39 -5
  240. package/listener/ChartTouchListener.js +38 -11
  241. package/listener/ChartTouchListener.js.map +1 -1
  242. package/listener/PieRadarChartTouchListener.d.ts +56 -1
  243. package/listener/PieRadarChartTouchListener.js +201 -17
  244. package/listener/PieRadarChartTouchListener.js.map +1 -1
  245. package/model/GradientColor.js.map +1 -1
  246. package/package.json +23 -15
  247. package/renderer/AxisRenderer.d.ts +66 -7
  248. package/renderer/AxisRenderer.js +69 -21
  249. package/renderer/AxisRenderer.js.map +1 -1
  250. package/renderer/BarChartRenderer.d.ts +11 -0
  251. package/renderer/BarChartRenderer.js +99 -71
  252. package/renderer/BarChartRenderer.js.map +1 -1
  253. package/renderer/BarLineScatterCandleBubbleRenderer.d.ts +37 -0
  254. package/renderer/BarLineScatterCandleBubbleRenderer.js +36 -8
  255. package/renderer/BarLineScatterCandleBubbleRenderer.js.map +1 -1
  256. package/renderer/BubbleChartRenderer.d.ts +6 -2
  257. package/renderer/BubbleChartRenderer.js +51 -40
  258. package/renderer/BubbleChartRenderer.js.map +1 -1
  259. package/renderer/CandleStickChartRenderer.d.ts +1 -1
  260. package/renderer/CandleStickChartRenderer.js +64 -50
  261. package/renderer/CandleStickChartRenderer.js.map +1 -1
  262. package/renderer/CombinedChartRenderer.d.ts +20 -1
  263. package/renderer/CombinedChartRenderer.js +72 -42
  264. package/renderer/CombinedChartRenderer.js.map +1 -1
  265. package/renderer/DataRenderer.d.ts +78 -4
  266. package/renderer/DataRenderer.js +65 -6
  267. package/renderer/DataRenderer.js.map +1 -1
  268. package/renderer/HorizontalBarChartRenderer.d.ts +5 -2
  269. package/renderer/HorizontalBarChartRenderer.js +87 -66
  270. package/renderer/HorizontalBarChartRenderer.js.map +1 -1
  271. package/renderer/LegendRenderer.d.ts +32 -0
  272. package/renderer/LegendRenderer.js +98 -59
  273. package/renderer/LegendRenderer.js.map +1 -1
  274. package/renderer/LineChartRenderer.d.ts +38 -1
  275. package/renderer/LineChartRenderer.js +198 -113
  276. package/renderer/LineChartRenderer.js.map +1 -1
  277. package/renderer/LineRadarRenderer.d.ts +19 -0
  278. package/renderer/LineRadarRenderer.js +25 -1
  279. package/renderer/LineRadarRenderer.js.map +1 -1
  280. package/renderer/LineScatterCandleRadarRenderer.d.ts +11 -0
  281. package/renderer/LineScatterCandleRadarRenderer.js +26 -9
  282. package/renderer/LineScatterCandleRadarRenderer.js.map +1 -1
  283. package/renderer/PieChartRenderer.d.ts +45 -1
  284. package/renderer/PieChartRenderer.js +195 -122
  285. package/renderer/PieChartRenderer.js.map +1 -1
  286. package/renderer/RadarChartRenderer.d.ts +10 -0
  287. package/renderer/RadarChartRenderer.js +119 -77
  288. package/renderer/RadarChartRenderer.js.map +1 -1
  289. package/renderer/Renderer.d.ts +8 -0
  290. package/renderer/Renderer.js +5 -0
  291. package/renderer/Renderer.js.map +1 -1
  292. package/renderer/ScatterChartRenderer.d.ts +5 -5
  293. package/renderer/ScatterChartRenderer.js +51 -37
  294. package/renderer/ScatterChartRenderer.js.map +1 -1
  295. package/renderer/XAxisRenderer.d.ts +29 -4
  296. package/renderer/XAxisRenderer.js +128 -95
  297. package/renderer/XAxisRenderer.js.map +1 -1
  298. package/renderer/XAxisRendererHorizontalBarChart.d.ts +11 -0
  299. package/renderer/XAxisRendererHorizontalBarChart.js +75 -57
  300. package/renderer/XAxisRendererHorizontalBarChart.js.map +1 -1
  301. package/renderer/XAxisRendererRadarChart.d.ts +5 -0
  302. package/renderer/XAxisRendererRadarChart.js +26 -13
  303. package/renderer/XAxisRendererRadarChart.js.map +1 -1
  304. package/renderer/YAxisRenderer.d.ts +42 -5
  305. package/renderer/YAxisRenderer.js +126 -69
  306. package/renderer/YAxisRenderer.js.map +1 -1
  307. package/renderer/YAxisRendererHorizontalBarChart.d.ts +22 -1
  308. package/renderer/YAxisRendererHorizontalBarChart.js +80 -58
  309. package/renderer/YAxisRendererHorizontalBarChart.js.map +1 -1
  310. package/renderer/YAxisRendererRadarChart.js +62 -32
  311. package/renderer/YAxisRendererRadarChart.js.map +1 -1
  312. package/renderer/scatter/ChevronDownShapeRenderer.d.ts +4 -0
  313. package/renderer/scatter/ChevronDownShapeRenderer.js +5 -1
  314. package/renderer/scatter/ChevronDownShapeRenderer.js.map +1 -1
  315. package/renderer/scatter/ChevronUpShapeRenderer.d.ts +4 -0
  316. package/renderer/scatter/ChevronUpShapeRenderer.js +5 -1
  317. package/renderer/scatter/ChevronUpShapeRenderer.js.map +1 -1
  318. package/renderer/scatter/CircleShapeRenderer.d.ts +4 -0
  319. package/renderer/scatter/CircleShapeRenderer.js +8 -5
  320. package/renderer/scatter/CircleShapeRenderer.js.map +1 -1
  321. package/renderer/scatter/CrossShapeRenderer.d.ts +4 -0
  322. package/renderer/scatter/CrossShapeRenderer.js +5 -1
  323. package/renderer/scatter/CrossShapeRenderer.js.map +1 -1
  324. package/renderer/scatter/IShapeRenderer.d.ts +14 -0
  325. package/renderer/scatter/IShapeRenderer.js.map +1 -1
  326. package/renderer/scatter/SquareShapeRenderer.d.ts +4 -0
  327. package/renderer/scatter/SquareShapeRenderer.js +8 -5
  328. package/renderer/scatter/SquareShapeRenderer.js.map +1 -1
  329. package/renderer/scatter/TriangleShapeRenderer.d.ts +4 -0
  330. package/renderer/scatter/TriangleShapeRenderer.js +9 -5
  331. package/renderer/scatter/TriangleShapeRenderer.js.map +1 -1
  332. package/renderer/scatter/XShapeRenderer.d.ts +4 -0
  333. package/renderer/scatter/XShapeRenderer.js +5 -1
  334. package/renderer/scatter/XShapeRenderer.js.map +1 -1
  335. package/utils/ColorTemplate.d.ts +21 -1
  336. package/utils/ColorTemplate.js +21 -3
  337. package/utils/ColorTemplate.js.map +1 -1
  338. package/utils/HorizontalViewPortHandler.d.ts +3 -0
  339. package/utils/HorizontalViewPortHandler.js +3 -0
  340. package/utils/HorizontalViewPortHandler.js.map +1 -1
  341. package/utils/MPSize.d.ts +7 -0
  342. package/utils/ObjectPool.d.ts +56 -0
  343. package/utils/ObjectPool.js +66 -8
  344. package/utils/ObjectPool.js.map +1 -1
  345. package/utils/Transformer.d.ts +118 -0
  346. package/utils/Transformer.js +141 -7
  347. package/utils/Transformer.js.map +1 -1
  348. package/utils/TransformerHorizontalBarChart.d.ts +10 -0
  349. package/utils/TransformerHorizontalBarChart.js +18 -2
  350. package/utils/TransformerHorizontalBarChart.js.map +1 -1
  351. package/utils/Utils.d.ts +139 -17
  352. package/utils/Utils.js +185 -60
  353. package/utils/Utils.js.map +1 -1
  354. package/utils/ViewPortHandler.d.ts +234 -19
  355. package/utils/ViewPortHandler.js +306 -63
  356. package/utils/ViewPortHandler.js.map +1 -1
  357. package/utils/colors/colorful.js.map +1 -1
  358. package/utils/colors/joyful.js.map +1 -1
  359. package/utils/colors/liberty.js.map +1 -1
  360. package/utils/colors/material.js.map +1 -1
  361. package/utils/colors/pastel.js.map +1 -1
  362. package/utils/colors/vordiplom.js.map +1 -1
  363. package/charts/index.d.ts +0 -11
  364. package/charts/index.js +0 -15
  365. package/charts/index.js.map +0 -1
@@ -7,30 +7,31 @@ import { ILineScatterCandleRadarDataSet } from './ILineScatterCandleRadarDataSet
7
7
  */
8
8
  export interface IScatterDataSet extends ILineScatterCandleRadarDataSet<Entry> {
9
9
  /**
10
- * Returns the currently set scatter shape size
11
- *
12
- * @return
10
+ * the size the scattershape will have, in density pixels
13
11
  */
14
- getScatterShapeSize(): number;
12
+ scatterShapeSize: number;
15
13
 
16
14
  /**
17
- * Returns radius of the hole in the shape
18
- *
19
- * @return
15
+ * Sets the ScatterShape this DataSet should be drawn with. This will search for an available IShapeRenderer and set this
16
+ * renderer for the DataSet.
20
17
  */
21
- getScatterShapeHoleRadius(): number;
18
+ scatterShape: ScatterShape;
22
19
 
23
20
  /**
24
- * Returns the color for the hole in the shape
25
- *
26
- * @return
21
+ * Renderer responsible for rendering this DataSet, default: square
27
22
  */
28
- getScatterShapeHoleColor(): string | Color;
23
+ shapeRenderer: IShapeRenderer;
29
24
 
30
25
  /**
31
- * Returns the IShapeRenderer responsible for rendering this DataSet.
32
- *
33
- * @return
26
+ * The radius of the hole in the shape (applies to Square, Circle and Triangle)
27
+ * - default: 0.0
34
28
  */
35
- getShapeRenderer(): IShapeRenderer;
29
+ scatterShapeHoleRadius: number;
30
+
31
+ /**
32
+ * Color for the hole in the shape.
33
+ * Setting to `ColorTemplate.COLOR_NONE` will behave as transparent.
34
+ * - default: ColorTemplate.COLOR_NONE
35
+ */
36
+ scatterShapeHoleColor: string | Color;
36
37
  }
@@ -2,6 +2,9 @@ import { BarLineChartBase } from '../charts/BarLineChartBase';
2
2
  import { Transformer } from '../utils/Transformer';
3
3
  import { ViewPortHandler } from '../utils/ViewPortHandler';
4
4
  import { AnimatedViewPortJob } from './AnimatedViewPortJob';
5
+ /**
6
+ * Created by Philipp Jahoda on 19/02/16.
7
+ */
5
8
  export declare class AnimatedMoveViewJob extends AnimatedViewPortJob {
6
9
  static getInstance(viewPortHandler: ViewPortHandler, xValue: any, yValue: any, trans: Transformer, v: BarLineChartBase<any, any, any>, xOrigin: any, yOrigin: any, duration: any): AnimatedMoveViewJob;
7
10
  static recycleInstance(instance: AnimatedMoveViewJob): void;
@@ -1,16 +1,20 @@
1
1
  import { ObjectPool } from '../utils/ObjectPool';
2
2
  import { Utils } from '../utils/Utils';
3
3
  import { AnimatedViewPortJob } from './AnimatedViewPortJob';
4
+ /**
5
+ * Created by Philipp Jahoda on 19/02/16.
6
+ */
4
7
  export class AnimatedMoveViewJob extends AnimatedViewPortJob {
5
8
  static getInstance(viewPortHandler, xValue, yValue, trans, v, xOrigin, yOrigin, duration) {
6
9
  const result = pool.get();
7
10
  result.mViewPortHandler = viewPortHandler;
8
- result.mXValue = xValue;
9
- result.mYValue = yValue;
10
- result.mTrans = trans;
11
+ result.xValue = xValue;
12
+ result.yValue = yValue;
13
+ result.transformer = trans;
11
14
  result.mView = v;
12
- result.mXOrigin = xOrigin;
13
- result.mYOrigin = yOrigin;
15
+ result.xOrigin = xOrigin;
16
+ result.yOrigin = yOrigin;
17
+ //result.resetAnimator();
14
18
  result.createAnimator(duration);
15
19
  return result;
16
20
  }
@@ -22,9 +26,9 @@ export class AnimatedMoveViewJob extends AnimatedViewPortJob {
22
26
  }
23
27
  onAnimationUpdate(animation) {
24
28
  const pts = Utils.getTempArray(2);
25
- pts[0] = this.mXOrigin + (this.mXValue - this.mXOrigin) * this.mPhase;
26
- pts[1] = this.mYOrigin + (this.mYValue - this.mYOrigin) * this.mPhase;
27
- this.mTrans.pointValuesToPixel(pts);
29
+ pts[0] = this.xOrigin + (this.xValue - this.xOrigin) * this.phase;
30
+ pts[1] = this.yOrigin + (this.yValue - this.yOrigin) * this.phase;
31
+ this.transformer.pointValuesToPixel(pts);
28
32
  this.mViewPortHandler.centerViewPort(pts, this.mView);
29
33
  }
30
34
  recycleSelf() {
@@ -1 +1 @@
1
- {"version":3,"file":"AnimatedMoveViewJob.js","sourceRoot":"../src/","sources":["jobs/AnimatedMoveViewJob.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAEvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAI5D,MAAM,OAAO,mBAAoB,SAAQ,mBAAmB;IACjD,MAAM,CAAC,WAAW,CAAC,eAAgC,EAAE,MAAM,EAAE,MAAM,EAAE,KAAkB,EAAE,CAAkC,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ;QAC1J,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC1B,MAAM,CAAC,gBAAgB,GAAG,eAAe,CAAC;QAC1C,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC;QACxB,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC;QACxB,MAAM,CAAC,MAAM,GAAG,KAAK,CAAC;QACtB,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC;QACjB,MAAM,CAAC,QAAQ,GAAG,OAAO,CAAC;QAC1B,MAAM,CAAC,QAAQ,GAAG,OAAO,CAAC;QAE1B,MAAM,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;QAChC,OAAO,MAAM,CAAC;IAClB,CAAC;IAEM,MAAM,CAAC,eAAe,CAAC,QAA6B;QACvD,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC3B,CAAC;IAED,YAAY,eAAgC,EAAE,MAAM,EAAE,MAAM,EAAE,KAAkB,EAAE,CAAkC,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ;QAC5I,KAAK,CAAC,eAAe,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;IACjF,CAAC;IAEM,iBAAiB,CAAC,SAAS;QAC9B,MAAM,GAAG,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAClC,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,GAAG,CAAC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC;QACtE,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,QAAQ,GAAG,CAAC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC;QAEtE,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;QACpC,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IAC1D,CAAC;IAEM,WAAW;QACd,mBAAmB,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;IAC9C,CAAC;IAEM,WAAW;QACd,OAAO,IAAI,mBAAmB,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IACpE,CAAC;CACJ;AACD,MAAM,IAAI,GAAG,UAAU,CAAC,MAAM,CAAsB,CAAC,EAAE,IAAI,mBAAmB,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC"}
1
+ {"version":3,"file":"AnimatedMoveViewJob.js","sourceRoot":"","sources":["../../../src/ui-chart/jobs/AnimatedMoveViewJob.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAEvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D;;GAEG;AACH,MAAM,OAAO,mBAAoB,SAAQ,mBAAmB;IACjD,MAAM,CAAC,WAAW,CAAC,eAAgC,EAAE,MAAM,EAAE,MAAM,EAAE,KAAkB,EAAE,CAAkC,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ;QAC1J,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC1B,MAAM,CAAC,gBAAgB,GAAG,eAAe,CAAC;QAC1C,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC;QACvB,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC;QACvB,MAAM,CAAC,WAAW,GAAG,KAAK,CAAC;QAC3B,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC;QACjB,MAAM,CAAC,OAAO,GAAG,OAAO,CAAC;QACzB,MAAM,CAAC,OAAO,GAAG,OAAO,CAAC;QACzB,yBAAyB;QACzB,MAAM,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;QAChC,OAAO,MAAM,CAAC;IAClB,CAAC;IAEM,MAAM,CAAC,eAAe,CAAC,QAA6B;QACvD,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC3B,CAAC;IAED,YAAY,eAAgC,EAAE,MAAM,EAAE,MAAM,EAAE,KAAkB,EAAE,CAAkC,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ;QAC5I,KAAK,CAAC,eAAe,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;IACjF,CAAC;IAEM,iBAAiB,CAAC,SAAS;QAC9B,MAAM,GAAG,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAClC,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,OAAO,GAAG,CAAC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QAClE,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,OAAO,GAAG,CAAC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QAElE,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;QACzC,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IAC1D,CAAC;IAEM,WAAW;QACd,mBAAmB,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;IAC9C,CAAC;IAEM,WAAW;QACd,OAAO,IAAI,mBAAmB,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IACpE,CAAC;CACJ;AACD,MAAM,IAAI,GAAG,UAAU,CAAC,MAAM,CAAsB,CAAC,EAAE,IAAI,mBAAmB,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC"}
@@ -10,19 +10,18 @@ export interface AnimatorListener {
10
10
  onAnimationEnd(animation: Tween<any>): any;
11
11
  onAnimationCancel(animation: Tween<any>): any;
12
12
  }
13
+ /**
14
+ * Created by Philipp Jahoda on 19/02/16.
15
+ */
13
16
  export declare abstract class AnimatedViewPortJob extends ViewPortJob implements AnimatorUpdateListener, AnimatorListener {
14
17
  private duration;
15
- protected mAnimator: Tween<any>;
16
- protected mPhase: any;
17
- protected mXOrigin: number;
18
- protected mYOrigin: number;
18
+ animator: Tween<any>;
19
+ phase: any;
20
+ xOrigin: number;
21
+ yOrigin: number;
19
22
  constructor(viewPortHandler: ViewPortHandler, xValue: any, yValue: any, trans: Transformer, v: BarLineChartBase<any, any, any>, xOrigin: number, yOrigin: number, duration: number);
20
23
  createAnimator(duration: any): void;
21
24
  run(): void;
22
- getPhase(): any;
23
- setPhase(phase: any): void;
24
- getXOrigin(): number;
25
- getYOrigin(): number;
26
25
  abstract recycleSelf(): any;
27
26
  protected resetAnimator(): void;
28
27
  onAnimationStart(animation: Tween<any>): void;
@@ -1,43 +1,34 @@
1
1
  import { ViewPortJob } from './ViewPortJob';
2
2
  import { Tween } from '../animation/Tween';
3
+ /**
4
+ * Created by Philipp Jahoda on 19/02/16.
5
+ */
3
6
  export class AnimatedViewPortJob extends ViewPortJob {
4
7
  constructor(viewPortHandler, xValue, yValue, trans, v, xOrigin, yOrigin, duration) {
5
8
  super(viewPortHandler, xValue, yValue, trans, v);
6
9
  this.duration = duration;
7
- this.mXOrigin = xOrigin;
8
- this.mYOrigin = yOrigin;
10
+ this.xOrigin = xOrigin;
11
+ this.yOrigin = yOrigin;
9
12
  }
10
13
  createAnimator(duration) {
11
- this.mAnimator = new Tween({
14
+ this.animator = new Tween({
12
15
  onRender: (state) => {
13
- this.mPhase = state.value;
14
- this.onAnimationUpdate(this.mAnimator);
16
+ this.phase = state.value;
17
+ this.onAnimationUpdate(this.animator);
15
18
  },
16
- onFinish: () => this.onAnimationEnd(this.mAnimator),
17
- onCancel: () => this.onAnimationCancel(this.mAnimator)
19
+ onFinish: () => this.onAnimationEnd(this.animator),
20
+ onCancel: () => this.onAnimationCancel(this.animator)
18
21
  });
19
- this.mAnimator['duration'] = duration;
22
+ this.animator['duration'] = duration;
20
23
  }
21
24
  run() {
22
- if (!this.mAnimator) {
25
+ if (!this.animator) {
23
26
  this.createAnimator(this.duration);
24
27
  }
25
- this.mAnimator.tween({ value: 0 }, { value: 1 }, this.mAnimator['duration']);
26
- }
27
- getPhase() {
28
- return this.mPhase;
29
- }
30
- setPhase(phase) {
31
- this.mPhase = phase;
32
- }
33
- getXOrigin() {
34
- return this.mXOrigin;
35
- }
36
- getYOrigin() {
37
- return this.mYOrigin;
28
+ this.animator.tween({ value: 0 }, { value: 1 }, this.animator['duration']);
38
29
  }
39
30
  resetAnimator() {
40
- this.mAnimator.cancel();
31
+ this.animator.cancel();
41
32
  }
42
33
  onAnimationStart(animation) { }
43
34
  onAnimationEnd(animation) {
@@ -45,6 +36,7 @@ export class AnimatedViewPortJob extends ViewPortJob {
45
36
  this.recycleSelf();
46
37
  }
47
38
  catch (e) {
39
+ // don't worry about it.
48
40
  }
49
41
  }
50
42
  onAnimationCancel(animation) {
@@ -52,6 +44,7 @@ export class AnimatedViewPortJob extends ViewPortJob {
52
44
  this.recycleSelf();
53
45
  }
54
46
  catch (e) {
47
+ // don't worry about it.
55
48
  }
56
49
  }
57
50
  onAnimationUpdate(animation) { }
@@ -1 +1 @@
1
- {"version":3,"file":"AnimatedViewPortJob.js","sourceRoot":"../src/","sources":["jobs/AnimatedViewPortJob.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAkB,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAY3D,MAAM,OAAgB,mBAAoB,SAAQ,WAAW;IAQzD,YAAY,eAAgC,EAAE,MAAM,EAAE,MAAM,EAAE,KAAkB,EAAE,CAAkC,EAAE,OAAe,EAAE,OAAe,EAAU,QAAgB;QAC5K,KAAK,CAAC,eAAe,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;QAD2G,aAAQ,GAAR,QAAQ,CAAQ;QAE5K,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;QACxB,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;IAC5B,CAAC;IAED,cAAc,CAAC,QAAQ;QACnB,IAAI,CAAC,SAAS,GAAG,IAAI,KAAK,CAAC;YACvB,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE;gBAChB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC;gBAC1B,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC3C,CAAC;YACD,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC;YACnD,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,SAAS,CAAC;SACzD,CAAC,CAAC;QACH,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,GAAG,QAAQ,CAAC;IAC1C,CAAC;IAEM,GAAG;QACN,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;YACjB,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SACtC;QAED,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,CAAC;IACjF,CAAC;IAEM,QAAQ;QACX,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IAEM,QAAQ,CAAC,KAAK;QACjB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;IACxB,CAAC;IAEM,UAAU;QACb,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IAEM,UAAU;QACb,OAAO,IAAI,CAAC,QAAQ,CAAC;IACzB,CAAC;IAIS,aAAa;QACnB,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;IAC5B,CAAC;IAEM,gBAAgB,CAAC,SAAqB,IAAG,CAAC;IAE1C,cAAc,CAAC,SAAqB;QACvC,IAAI;YACA,IAAI,CAAC,WAAW,EAAE,CAAC;SACtB;QAAC,OAAO,CAAC,EAAE;SAEX;IACL,CAAC;IAEM,iBAAiB,CAAC,SAAqB;QAC1C,IAAI;YACA,IAAI,CAAC,WAAW,EAAE,CAAC;SACtB;QAAC,OAAO,CAAC,EAAE;SAEX;IACL,CAAC;IAEM,iBAAiB,CAAC,SAAqB,IAAG,CAAC;CACrD"}
1
+ {"version":3,"file":"AnimatedViewPortJob.js","sourceRoot":"","sources":["../../../src/ui-chart/jobs/AnimatedViewPortJob.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAkB,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAS3D;;GAEG;AACH,MAAM,OAAgB,mBAAoB,SAAQ,WAAW;IAQzD,YACI,eAAgC,EAChC,MAAM,EACN,MAAM,EACN,KAAkB,EAClB,CAAkC,EAClC,OAAe,EACf,OAAe,EACP,QAAgB;QAExB,KAAK,CAAC,eAAe,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;QAFzC,aAAQ,GAAR,QAAQ,CAAQ;QAGxB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IAED,cAAc,CAAC,QAAQ;QACnB,IAAI,CAAC,QAAQ,GAAG,IAAI,KAAK,CAAC;YACtB,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE;gBAChB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;gBACzB,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC1C,CAAC;YACD,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC;YAClD,QAAQ,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC;SACxD,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,QAAQ,CAAC;IACzC,CAAC;IAEM,GAAG;QACN,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACjB,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACvC,CAAC;QAED,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC;IAC/E,CAAC;IAIS,aAAa;QACnB,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;IAC3B,CAAC;IAEM,gBAAgB,CAAC,SAAqB,IAAG,CAAC;IAE1C,cAAc,CAAC,SAAqB;QACvC,IAAI,CAAC;YACD,IAAI,CAAC,WAAW,EAAE,CAAC;QACvB,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,wBAAwB;QAC5B,CAAC;IACL,CAAC;IAEM,iBAAiB,CAAC,SAAqB;QAC1C,IAAI,CAAC;YACD,IAAI,CAAC,WAAW,EAAE,CAAC;QACvB,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,wBAAwB;QAC5B,CAAC;IACL,CAAC;IAEM,iBAAiB,CAAC,SAAqB,IAAG,CAAC;CACrD"}
@@ -3,13 +3,16 @@ import { YAxis } from '../components/YAxis';
3
3
  import { Transformer } from '../utils/Transformer';
4
4
  import { ViewPortHandler } from '../utils/ViewPortHandler';
5
5
  import { AnimatedViewPortJob } from './AnimatedViewPortJob';
6
+ /**
7
+ * Created by Philipp Jahoda on 19/02/16.
8
+ */
6
9
  export declare class AnimatedZoomJob extends AnimatedViewPortJob {
7
- protected mZoomOriginX: number;
8
- protected mZoomOriginY: number;
9
- protected mZoomCenterX: number;
10
- protected mZoomCenterY: number;
10
+ zoomOriginX: number;
11
+ zoomOriginY: number;
12
+ zoomCenterX: number;
13
+ zoomCenterY: number;
11
14
  protected mYAxis: YAxis;
12
- protected mXAxisRange: any;
15
+ xAxisRange: any;
13
16
  static getInstance(viewPortHandler: ViewPortHandler, v: BarLineChartBase<any, any, any>, trans: Transformer, axis: YAxis, xAxisRange: any, scaleX: number, scaleY: number, xOrigin: number, yOrigin: number, zoomCenterX: number, zoomCenterY: number, zoomOriginX: number, zoomOriginY: number, duration: number): AnimatedZoomJob;
14
17
  constructor(viewPortHandler: ViewPortHandler, v: BarLineChartBase<any, any, any>, trans: Transformer, axis: YAxis, xAxisRange: any, scaleX: number, scaleY: number, xOrigin: number, yOrigin: number, zoomCenterX: number, zoomCenterY: number, zoomOriginX: number, zoomOriginY: number, duration: number);
15
18
  onAnimationUpdate(animation: any): void;
@@ -1,47 +1,51 @@
1
1
  import { ObjectPool } from '../utils/ObjectPool';
2
2
  import { Utils } from '../utils/Utils';
3
3
  import { AnimatedViewPortJob } from './AnimatedViewPortJob';
4
+ /**
5
+ * Created by Philipp Jahoda on 19/02/16.
6
+ */
4
7
  export class AnimatedZoomJob extends AnimatedViewPortJob {
5
- constructor(viewPortHandler, v, trans, axis, xAxisRange, scaleX, scaleY, xOrigin, yOrigin, zoomCenterX, zoomCenterY, zoomOriginX, zoomOriginY, duration) {
6
- super(viewPortHandler, scaleX, scaleY, trans, v, xOrigin, yOrigin, duration);
7
- this.mZoomCenterX = zoomCenterX;
8
- this.mZoomCenterY = zoomCenterY;
9
- this.mZoomOriginX = zoomOriginX;
10
- this.mZoomOriginY = zoomOriginY;
11
- this.mYAxis = axis;
12
- this.mXAxisRange = xAxisRange;
13
- }
14
8
  static getInstance(viewPortHandler, v, trans, axis, xAxisRange, scaleX, scaleY, xOrigin, yOrigin, zoomCenterX, zoomCenterY, zoomOriginX, zoomOriginY, duration) {
15
9
  const result = pool.get();
16
10
  result.mViewPortHandler = viewPortHandler;
17
- result.mXValue = scaleX;
18
- result.mYValue = scaleY;
19
- result.mTrans = trans;
11
+ result.xValue = scaleX;
12
+ result.yValue = scaleY;
13
+ result.transformer = trans;
20
14
  result.mView = v;
21
- result.mXOrigin = xOrigin;
22
- result.mYOrigin = yOrigin;
23
- result.mZoomCenterX = zoomCenterX;
24
- result.mZoomCenterY = zoomCenterY;
25
- result.mZoomOriginX = zoomOriginX;
26
- result.mZoomOriginY = zoomOriginY;
15
+ result.xOrigin = xOrigin;
16
+ result.yOrigin = yOrigin;
17
+ result.zoomCenterX = zoomCenterX;
18
+ result.zoomCenterY = zoomCenterY;
19
+ result.zoomOriginX = zoomOriginX;
20
+ result.zoomOriginY = zoomOriginY;
27
21
  result.mYAxis = axis;
28
- result.mXAxisRange = xAxisRange;
22
+ result.xAxisRange = xAxisRange;
29
23
  result.createAnimator(duration);
30
24
  return result;
31
25
  }
26
+ constructor(viewPortHandler, v, trans, axis, xAxisRange, scaleX, scaleY, xOrigin, yOrigin, zoomCenterX, zoomCenterY, zoomOriginX, zoomOriginY, duration) {
27
+ super(viewPortHandler, scaleX, scaleY, trans, v, xOrigin, yOrigin, duration);
28
+ this.zoomCenterX = zoomCenterX;
29
+ this.zoomCenterY = zoomCenterY;
30
+ this.zoomOriginX = zoomOriginX;
31
+ this.zoomOriginY = zoomOriginY;
32
+ // this.animator.addListener(this);
33
+ this.mYAxis = axis;
34
+ this.xAxisRange = xAxisRange;
35
+ }
32
36
  onAnimationUpdate(animation) {
33
- const scaleX = this.mXOrigin + (this.mXValue - this.mXOrigin) * this.mPhase;
34
- const scaleY = this.mYOrigin + (this.mYValue - this.mYOrigin) * this.mPhase;
37
+ const scaleX = this.xOrigin + (this.xValue - this.xOrigin) * this.phase;
38
+ const scaleY = this.yOrigin + (this.yValue - this.yOrigin) * this.phase;
35
39
  const save = Utils.getTempMatrix();
36
40
  const viewPortHanlder = this.mViewPortHandler;
37
41
  viewPortHanlder.setZoom(scaleX, scaleY, save);
38
42
  viewPortHanlder.refresh(save, this.mView, false);
39
- const valsInView = this.mYAxis.mAxisRange / viewPortHanlder.getScaleY();
40
- const xsInView = this.mXAxisRange / viewPortHanlder.getScaleX();
43
+ const valsInView = this.mYAxis.axisRange / viewPortHanlder.getScaleY();
44
+ const xsInView = this.xAxisRange / viewPortHanlder.getScaleX();
41
45
  const pts = Utils.getTempArray(2);
42
- pts[0] = this.mZoomOriginX + (this.mZoomCenterX - xsInView / 2 - this.mZoomOriginX) * this.mPhase;
43
- pts[1] = this.mZoomOriginY + (this.mZoomCenterY + valsInView / 2 - this.mZoomOriginY) * this.mPhase;
44
- this.mTrans.pointValuesToPixel(pts);
46
+ pts[0] = this.zoomOriginX + (this.zoomCenterX - xsInView / 2 - this.zoomOriginX) * this.phase;
47
+ pts[1] = this.zoomOriginY + (this.zoomCenterY + valsInView / 2 - this.zoomOriginY) * this.phase;
48
+ this.transformer.pointValuesToPixel(pts);
45
49
  viewPortHanlder.translate(pts, save);
46
50
  viewPortHanlder.refresh(save, this.mView, true);
47
51
  }
@@ -1 +1 @@
1
- {"version":3,"file":"AnimatedZoomJob.js","sourceRoot":"../src/","sources":["jobs/AnimatedZoomJob.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"AnimatedZoomJob.js","sourceRoot":"","sources":["../../../src/ui-chart/jobs/AnimatedZoomJob.ts"],"names":[],"mappings":"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"}
@@ -2,6 +2,9 @@ import { BarLineChartBase } from '../charts/BarLineChartBase';
2
2
  import { Transformer } from '../utils/Transformer';
3
3
  import { ViewPortHandler } from '../utils/ViewPortHandler';
4
4
  import { ViewPortJob } from './ViewPortJob';
5
+ /**
6
+ * Created by Philipp Jahoda on 19/02/16.
7
+ */
5
8
  export declare class MoveViewJob extends ViewPortJob {
6
9
  static getInstance(viewPortHandler: ViewPortHandler, xValue: any, yValue: any, trans: Transformer, v: BarLineChartBase<any, any, any>): MoveViewJob;
7
10
  static recycleInstance(instance: MoveViewJob): void;
@@ -1,13 +1,16 @@
1
1
  import { ObjectPool } from '../utils/ObjectPool';
2
2
  import { Utils } from '../utils/Utils';
3
3
  import { ViewPortJob } from './ViewPortJob';
4
+ /**
5
+ * Created by Philipp Jahoda on 19/02/16.
6
+ */
4
7
  export class MoveViewJob extends ViewPortJob {
5
8
  static getInstance(viewPortHandler, xValue, yValue, trans, v) {
6
9
  const result = pool.get();
7
10
  result.mViewPortHandler = viewPortHandler;
8
- result.mXValue = xValue;
9
- result.mYValue = yValue;
10
- result.mTrans = trans;
11
+ result.xValue = xValue;
12
+ result.yValue = yValue;
13
+ result.transformer = trans;
11
14
  result.mView = v;
12
15
  return result;
13
16
  }
@@ -19,14 +22,14 @@ export class MoveViewJob extends ViewPortJob {
19
22
  }
20
23
  run() {
21
24
  const pts = Utils.getTempArray(2);
22
- pts[0] = this.mXValue;
23
- pts[1] = this.mYValue;
24
- this.mTrans.pointValuesToPixel(pts);
25
+ pts[0] = this.xValue;
26
+ pts[1] = this.yValue;
27
+ this.transformer.pointValuesToPixel(pts);
25
28
  this.mViewPortHandler.centerViewPort(pts, this.mView);
26
29
  MoveViewJob.recycleInstance(this);
27
30
  }
28
31
  instantiate() {
29
- return new MoveViewJob(this.mViewPortHandler, this.mXValue, this.mYValue, this.mTrans, this.mView);
32
+ return new MoveViewJob(this.mViewPortHandler, this.xValue, this.yValue, this.transformer, this.mView);
30
33
  }
31
34
  }
32
35
  const pool = ObjectPool.create(2, new MoveViewJob(null, 0, 0, null, null)).setReplenishPercentage(0.5);
@@ -1 +1 @@
1
- {"version":3,"file":"MoveViewJob.js","sourceRoot":"../src/","sources":["jobs/MoveViewJob.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAEvC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAI5C,MAAM,OAAO,WAAY,SAAQ,WAAW;IACjC,MAAM,CAAC,WAAW,CAAC,eAAgC,EAAE,MAAM,EAAE,MAAM,EAAE,KAAkB,EAAE,CAAkC;QAC9H,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC1B,MAAM,CAAC,gBAAgB,GAAG,eAAe,CAAC;QAC1C,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC;QACxB,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC;QACxB,MAAM,CAAC,MAAM,GAAG,KAAK,CAAC;QACtB,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC;QACjB,OAAO,MAAM,CAAC;IAClB,CAAC;IAEM,MAAM,CAAC,eAAe,CAAC,QAAqB;QAC/C,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC3B,CAAC;IAED,YAAY,eAAgC,EAAE,MAAM,EAAE,MAAM,EAAE,KAAkB,EAAE,CAAkC;QAChH,KAAK,CAAC,eAAe,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;IACrD,CAAC;IAEM,GAAG;QACN,MAAM,GAAG,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAClC,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC;QACtB,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC;QAEtB,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;QACpC,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QAEtD,WAAW,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;IACtC,CAAC;IAEM,WAAW;QACd,OAAO,IAAI,WAAW,CAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IACvG,CAAC;CACJ;AACD,MAAM,IAAI,GAAG,UAAU,CAAC,MAAM,CAAc,CAAC,EAAE,IAAI,WAAW,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC"}
1
+ {"version":3,"file":"MoveViewJob.js","sourceRoot":"","sources":["../../../src/ui-chart/jobs/MoveViewJob.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAEvC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C;;GAEG;AACH,MAAM,OAAO,WAAY,SAAQ,WAAW;IACjC,MAAM,CAAC,WAAW,CAAC,eAAgC,EAAE,MAAM,EAAE,MAAM,EAAE,KAAkB,EAAE,CAAkC;QAC9H,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC1B,MAAM,CAAC,gBAAgB,GAAG,eAAe,CAAC;QAC1C,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC;QACvB,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC;QACvB,MAAM,CAAC,WAAW,GAAG,KAAK,CAAC;QAC3B,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC;QACjB,OAAO,MAAM,CAAC;IAClB,CAAC;IAEM,MAAM,CAAC,eAAe,CAAC,QAAqB;QAC/C,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC3B,CAAC;IAED,YAAY,eAAgC,EAAE,MAAM,EAAE,MAAM,EAAE,KAAkB,EAAE,CAAkC;QAChH,KAAK,CAAC,eAAe,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;IACrD,CAAC;IAEM,GAAG;QACN,MAAM,GAAG,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAClC,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC;QACrB,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC;QAErB,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;QACzC,IAAI,CAAC,gBAAgB,CAAC,cAAc,CAAC,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QAEtD,WAAW,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;IACtC,CAAC;IAEM,WAAW;QACd,OAAO,IAAI,WAAW,CAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IAC1G,CAAC;CACJ;AACD,MAAM,IAAI,GAAG,UAAU,CAAC,MAAM,CAAc,CAAC,EAAE,IAAI,WAAW,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC"}
@@ -4,12 +4,10 @@ import { Transformer } from '../utils/Transformer';
4
4
  import { ViewPortHandler } from '../utils/ViewPortHandler';
5
5
  export declare abstract class ViewPortJob extends Poolable {
6
6
  protected mViewPortHandler: ViewPortHandler;
7
- protected mXValue: number;
8
- protected mYValue: number;
9
- protected mTrans: Transformer;
7
+ xValue: number;
8
+ yValue: number;
9
+ transformer: Transformer;
10
10
  protected mView: BarLineChartBase<any, any, any>;
11
11
  abstract run(): any;
12
12
  constructor(viewPortHandler: ViewPortHandler, xValue: any, yValue: any, trans: Transformer, v: any);
13
- getXValue(): number;
14
- getYValue(): number;
15
13
  }
@@ -2,19 +2,13 @@ import { Poolable } from '../utils/ObjectPool';
2
2
  export class ViewPortJob extends Poolable {
3
3
  constructor(viewPortHandler, xValue, yValue, trans, v) {
4
4
  super();
5
- this.mXValue = 0;
6
- this.mYValue = 0;
5
+ this.xValue = 0;
6
+ this.yValue = 0;
7
7
  this.mViewPortHandler = viewPortHandler;
8
- this.mXValue = xValue;
9
- this.mYValue = yValue;
10
- this.mTrans = trans;
8
+ this.xValue = xValue;
9
+ this.yValue = yValue;
10
+ this.transformer = trans;
11
11
  this.mView = v;
12
12
  }
13
- getXValue() {
14
- return this.mXValue;
15
- }
16
- getYValue() {
17
- return this.mYValue;
18
- }
19
13
  }
20
14
  //# sourceMappingURL=ViewPortJob.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"ViewPortJob.js","sourceRoot":"../src/","sources":["jobs/ViewPortJob.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAK/C,MAAM,OAAgB,WAAY,SAAQ,QAAQ;IAU9C,YAAY,eAAgC,EAAE,MAAM,EAAE,MAAM,EAAE,KAAkB,EAAE,CAAC;QAC/E,KAAK,EAAE,CAAC;QARF,YAAO,GAAG,CAAC,CAAC;QACZ,YAAO,GAAG,CAAC,CAAC;QAQlB,IAAI,CAAC,gBAAgB,GAAG,eAAe,CAAC;QACxC,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC;QACpB,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;IACnB,CAAC;IAEM,SAAS;QACZ,OAAO,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;IAEM,SAAS;QACZ,OAAO,IAAI,CAAC,OAAO,CAAC;IACxB,CAAC;CACJ"}
1
+ {"version":3,"file":"ViewPortJob.js","sourceRoot":"","sources":["../../../src/ui-chart/jobs/ViewPortJob.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAI/C,MAAM,OAAgB,WAAY,SAAQ,QAAQ;IAS9C,YAAY,eAAgC,EAAE,MAAM,EAAE,MAAM,EAAE,KAAkB,EAAE,CAAC;QAC/E,KAAK,EAAE,CAAC;QARZ,WAAM,GAAG,CAAC,CAAC;QACX,WAAM,GAAG,CAAC,CAAC;QAQP,IAAI,CAAC,gBAAgB,GAAG,eAAe,CAAC;QACxC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;QACzB,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;IACnB,CAAC;CACJ"}
package/jobs/ZoomJob.js CHANGED
@@ -2,20 +2,14 @@ import { ObjectPool } from '../utils/ObjectPool';
2
2
  import { Utils } from '../utils/Utils';
3
3
  import { ViewPortJob } from './ViewPortJob';
4
4
  export class ZoomJob extends ViewPortJob {
5
- constructor(viewPortHandler, scaleX, scaleY, xValue, yValue, trans, axis, v) {
6
- super(viewPortHandler, xValue, yValue, trans, v);
7
- this.mScaleX = scaleX;
8
- this.mScaleY = scaleY;
9
- this.mAxisDependency = axis;
10
- }
11
5
  static getInstance(viewPortHandler, scaleX, scaleY, xValue, yValue, trans, axis, v) {
12
6
  const result = pool.get();
13
- result.mXValue = xValue;
14
- result.mYValue = yValue;
7
+ result.xValue = xValue;
8
+ result.yValue = yValue;
15
9
  result.mScaleX = scaleX;
16
10
  result.mScaleY = scaleY;
17
11
  result.mViewPortHandler = viewPortHandler;
18
- result.mTrans = trans;
12
+ result.transformer = trans;
19
13
  result.mAxisDependency = axis;
20
14
  result.mView = v;
21
15
  return result;
@@ -23,17 +17,23 @@ export class ZoomJob extends ViewPortJob {
23
17
  static recycleInstance(instance) {
24
18
  pool.recycle(instance);
25
19
  }
20
+ constructor(viewPortHandler, scaleX, scaleY, xValue, yValue, trans, axis, v) {
21
+ super(viewPortHandler, xValue, yValue, trans, v);
22
+ this.mScaleX = scaleX;
23
+ this.mScaleY = scaleY;
24
+ this.mAxisDependency = axis;
25
+ }
26
26
  run() {
27
27
  const save = Utils.getTempMatrix();
28
28
  const viewPortHanlder = this.mViewPortHandler;
29
29
  viewPortHanlder.zoom(this.mScaleX, this.mScaleY, save);
30
30
  viewPortHanlder.refresh(save, this.mView, false);
31
- const yValsInView = this.mView.getAxis(this.mAxisDependency).mAxisRange / viewPortHanlder.getScaleY();
32
- const xValsInView = this.mView.getXAxis().mAxisRange / viewPortHanlder.getScaleX();
31
+ const yValsInView = this.mView.getAxis(this.mAxisDependency).axisRange / viewPortHanlder.getScaleY();
32
+ const xValsInView = this.mView.xAxis.axisRange / viewPortHanlder.getScaleX();
33
33
  const pts = Utils.getTempArray(2);
34
- pts[0] = this.mXValue - xValsInView / 2;
35
- pts[1] = this.mYValue + yValsInView / 2;
36
- this.mTrans.pointValuesToPixel(pts);
34
+ pts[0] = this.xValue - xValsInView / 2;
35
+ pts[1] = this.yValue + yValsInView / 2;
36
+ this.transformer.pointValuesToPixel(pts);
37
37
  viewPortHanlder.translate(pts, save);
38
38
  viewPortHanlder.refresh(save, this.mView, false);
39
39
  this.mView.calculateOffsets();
@@ -1 +1 @@
1
- {"version":3,"file":"ZoomJob.js","sourceRoot":"../src/","sources":["jobs/ZoomJob.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ZoomJob.js","sourceRoot":"","sources":["../../../src/ui-chart/jobs/ZoomJob.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAEvC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,MAAM,OAAO,OAAQ,SAAQ,WAAW;IAM7B,MAAM,CAAC,WAAW,CAAC,eAAgC,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAkB,EAAE,IAAoB,EAAE,CAAkC;QACpK,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAC1B,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC;QACvB,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC;QACvB,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC;QACxB,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC;QACxB,MAAM,CAAC,gBAAgB,GAAG,eAAe,CAAC;QAC1C,MAAM,CAAC,WAAW,GAAG,KAAK,CAAC;QAC3B,MAAM,CAAC,eAAe,GAAG,IAAI,CAAC;QAC9B,MAAM,CAAC,KAAK,GAAG,CAAC,CAAC;QACjB,OAAO,MAAM,CAAC;IAClB,CAAC;IAEM,MAAM,CAAC,eAAe,CAAC,QAAiB;QAC3C,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC3B,CAAC;IAED,YAAY,eAAgC,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAkB,EAAE,IAAoB,EAAE,CAAkC;QACtJ,KAAK,CAAC,eAAe,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;QAEjD,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;IAChC,CAAC;IAEM,GAAG;QACN,MAAM,IAAI,GAAG,KAAK,CAAC,aAAa,EAAE,CAAC;QACnC,MAAM,eAAe,GAAG,IAAI,CAAC,gBAAgB,CAAC;QAC9C,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QACvD,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAEjD,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,SAAS,GAAG,eAAe,CAAC,SAAS,EAAE,CAAC;QACrG,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,SAAS,GAAG,eAAe,CAAC,SAAS,EAAE,CAAC;QAC7E,MAAM,GAAG,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAElC,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,GAAG,WAAW,GAAG,CAAC,CAAC;QACvC,GAAG,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,GAAG,WAAW,GAAG,CAAC,CAAC;QAEvC,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;QAEzC,eAAe,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QACrC,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAEjD,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC;QAC9B,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC;QAExB,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;IAEM,WAAW;QACd,OAAO,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IAC3D,CAAC;CACJ;AACD,MAAM,IAAI,GAAG,UAAU,CAAC,MAAM,CAAU,CAAC,EAAE,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,sBAAsB,CAAC,GAAG,CAAC,CAAC"}