Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ChartsOrg/Charts
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: FreddyZeng/Charts
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
2 contributors

Commits on Oct 31, 2017

  1. Merge pull request #1 from danielgindi/master 

    同步代码
    @FreddyZeng
    FreddyZeng authored Oct 31, 2017

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f9d9863 View commit details

  2. 添加 bar的圆角

    @FreddyZeng
    FreddyZeng committed Oct 31, 2017
    Copy the full SHA
    ca884f6 View commit details

Commits on Nov 2, 2017

  1. 如果 是 在StackBar，设置了UIColor.clear 颜色。那将不可点击，不可高亮

    @FreddyZeng
    FreddyZeng committed Nov 2, 2017
    Copy the full SHA
    1545155 View commit details

  2. 柱形图，每个数据对象，添加 渐变颜色

    @FreddyZeng
    FreddyZeng committed Nov 2, 2017
    Copy the full SHA
    ccd5246 View commit details

  3. 修复异常bug

    @FreddyZeng
    FreddyZeng committed Nov 2, 2017
    Copy the full SHA
    0b79ffe View commit details

Commits on Nov 4, 2017

  1. fix数组索引越界

    @FreddyZeng
    FreddyZeng committed Nov 4, 2017
    Copy the full SHA
    927731a View commit details

Commits on Nov 7, 2017

  1. Merge pull request #2 from danielgindi/master 

    同步代码
    @FreddyZeng
    FreddyZeng authored Nov 7, 2017

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    3e8758f View commit details

  2. Merge branch 'master' of http://github.com/FreddyZeng/Charts into dev… 

    …elop

* 'master' of http://github.com/FreddyZeng/Charts:
  [modify] modify for Character Alert
    @FreddyZeng
    FreddyZeng committed Nov 7, 2017
    Copy the full SHA
    0b5c2ba View commit details

Commits on Nov 15, 2017

  1. 折线图虚线

    @FreddyZeng
    FreddyZeng committed Nov 15, 2017
    Copy the full SHA
    0743886 View commit details

  2. 增加绘制虚线判断条件

    @FreddyZeng
    FreddyZeng committed Nov 15, 2017
    Copy the full SHA
    c7dd3b4 View commit details

  3. fix 虚线顶点远离圆心

    @FreddyZeng
    FreddyZeng committed Nov 15, 2017
    Copy the full SHA
    fe7971e View commit details

Commits on Nov 22, 2017

  1. Merge pull request #3 from danielgindi/master 

    同步代码
    @FreddyZeng
    FreddyZeng authored Nov 22, 2017

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    65a80e1 View commit details

  2. [tapd_] 合代码

    @FreddyZeng
    FreddyZeng committed Nov 22, 2017
    Copy the full SHA
    a5adf86 View commit details

Commits on Dec 1, 2017

  1. 添加 自定义Mark

    @FreddyZeng
    FreddyZeng committed Dec 1, 2017
    Copy the full SHA
    12a76c3 View commit details

  2. 添加极限线之间的颜色

    @FreddyZeng
    FreddyZeng committed Dec 1, 2017
    Copy the full SHA
    28a2fed View commit details

  3. Merge branch 'feature/LimitSpaceColor' into develop 

    * feature/LimitSpaceColor:
  添加极限线之间的颜色
    @FreddyZeng
    FreddyZeng committed Dec 1, 2017
    Copy the full SHA
    e1ebdc9 View commit details

  4. bugfix

    @FreddyZeng
    FreddyZeng committed Dec 1, 2017
    Copy the full SHA
    04bc28a View commit details

  5. Merge branch 'feature/LimitSpaceColor' into develop 

    * feature/LimitSpaceColor:
  bugfix
    @FreddyZeng
    FreddyZeng committed Dec 1, 2017
    Copy the full SHA
    d781a35 View commit details

  6. 添加mark改动

    @FreddyZeng
    FreddyZeng committed Dec 1, 2017
    Copy the full SHA
    3be39da View commit details

  7. Merge branch 'feature/Mark' into develop 

    * feature/Mark:
  添加mark改动
    @FreddyZeng
    FreddyZeng committed Dec 1, 2017
    Copy the full SHA
    47a7997 View commit details

  8. NSUIColor

    @FreddyZeng
    FreddyZeng committed Dec 1, 2017
    Copy the full SHA
    c8aba28 View commit details

  9. Demo接入 TYMark

    @FreddyZeng
    FreddyZeng committed Dec 1, 2017
    Copy the full SHA
    6cac021 View commit details

  10. Merge branch 'develop' 

    * develop:
  Demo接入 TYMark
  NSUIColor
  添加mark改动
  bugfix
  添加极限线之间的颜色
  添加 自定义Mark
    @FreddyZeng
    FreddyZeng committed Dec 1, 2017
    Copy the full SHA
    42347c4 View commit details

  11. Merge pull request #4 from danielgindi/master 

    合并charts最新代码
    @FreddyZeng
    FreddyZeng authored Dec 1, 2017

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    3f6f600 View commit details

  12. 向OC暴露属性

    @FreddyZeng
    FreddyZeng committed Dec 1, 2017
    Copy the full SHA
    3f4452b View commit details

  13. Merge branch 'feature/LimitSpaceColor' into develop 

    * feature/LimitSpaceColor:
  向OC暴露属性

# Conflicts:
#	Source/Charts/Data/Implementations/Standard/LineChartDataSet.swift
    @FreddyZeng
    FreddyZeng committed Dec 1, 2017
    Copy the full SHA
    39436d1 View commit details

  14. 区间默认颜色

    @FreddyZeng
    FreddyZeng committed Dec 1, 2017
    Copy the full SHA
    0bbf930 View commit details

Commits on Dec 12, 2017

  1. 折线图 底部线条定制增加属性控制

    @FreddyZeng
    FreddyZeng committed Dec 12, 2017
    Copy the full SHA
    0337b01 View commit details

  2. 空心圆高亮颜色

    @FreddyZeng
    FreddyZeng committed Dec 12, 2017
    Copy the full SHA
    0085d0e View commit details

  3. 圆心高亮bugfix mark消失时候，圆心高亮取消

    @FreddyZeng
    FreddyZeng committed Dec 12, 2017
    Copy the full SHA
    146afb7 View commit details

Commits on Dec 14, 2017

  1. [bugfix] fix avoidFirstLastClippingEnabled 最后一个X轴无效bug

    @FreddyZeng
    FreddyZeng committed Dec 14, 2017
    Copy the full SHA
    b2aadfe View commit details

  2. Merge pull request #5 from FreddyZeng/develop 

    合并dev代码
    @FreddyZeng
    FreddyZeng authored Dec 14, 2017

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0fa16c9 View commit details

Commits on Dec 15, 2017

  1. Y轴线条 增加延长 接口

    @FreddyZeng
    FreddyZeng committed Dec 15, 2017
    Copy the full SHA
    4fb2f60 View commit details

  2. Merge pull request #6 from FreddyZeng/feature/zengfanrong 

    Y轴线条 增加延长 接口
    @FreddyZeng
    FreddyZeng authored Dec 15, 2017

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    821120e View commit details

Commits on Jan 20, 2018

  1. Merge branch 'master' of https://github.com/danielgindi/Charts 

    * 'master' of https://github.com/danielgindi/Charts: (34 commits)
  Fixed X-Axis Labels Not Showing (#3154) (#3174)
  fix programatical unhighlighting for BarCharView (#3159)
  Give the users customizable axis label limits (Fixes #2085) (#2894)
  bump pod version
  chart views now use open legend renderer property instead of internal one (#3149)
  Fix axis label disappear when zooming in deep enough (#3132)
  added DataApproximator+N extension (#2848)
  Minor cleanup to Highlighter types (#3003)
  Refactored ChartUtils method into CGPoint extension (#3087)
  Update ViewPortHandler.swift (#3143)
  add option to build demo projects unit tests on iOS (#3121)
  Replaced relevant `ChartUtils` methods with `Double` extensions (#2994)
  Update 4.0.0 with master (#3135)
  Removed redundant ivars in BarLineChartViewBase (#3043)
  fix #1830. credit from #2049 (#2874)
  Makes ChartsDemo compiling again (#3117)
  Fixed using wrong axis (Issue #2257)
  Removed methods and properties deprecated in 1.0 (#2996)
  for #3061 revert animationUpdate() and animationEnd() not trigger crash if subclass does nothing
  The backing var is not necessary. (#3000)
  ...

# Conflicts:
#	Source/Charts/Data/Implementations/Standard/LineChartDataSet.swift
#	Source/Charts/Highlight/BarHighlighter.swift
#	Source/Charts/Renderers/BarChartRenderer.swift
    @FreddyZeng
    FreddyZeng committed Jan 20, 2018
    Copy the full SHA
    84123e9 View commit details

  2. 删除被破坏的 demo代码。从源工程拷贝新的demo实例代码

    @FreddyZeng
    FreddyZeng committed Jan 20, 2018
    Copy the full SHA
    9230695 View commit details

  3. 添加修改过的Mark到工程中

    @FreddyZeng
    FreddyZeng committed Jan 20, 2018
    Copy the full SHA
    710195e View commit details

  4. 添加定制TY的Mark

    @FreddyZeng
    FreddyZeng committed Jan 20, 2018
    Copy the full SHA
    85ae518 View commit details

  5. 删除被破坏的 demo代码。从源工程拷贝新的demo实例代码

    @FreddyZeng
    FreddyZeng committed Jan 20, 2018
    Copy the full SHA
    7af7cb6 View commit details

  6. 添加修改过的Mark到工程中

    @FreddyZeng
    FreddyZeng committed Jan 20, 2018
    Copy the full SHA
    41dc53e View commit details

  7. 解决合并冲突

    @FreddyZeng
    FreddyZeng committed Jan 20, 2018
    Copy the full SHA
    2ef3288 View commit details

Commits on Jan 22, 2018

  1. 添加ICXCharts

    @FreddyZeng
    FreddyZeng committed Jan 22, 2018
    Copy the full SHA
    a8e0dd9 View commit details

  2. 更改podsepc

    @FreddyZeng
    FreddyZeng committed Jan 22, 2018
    Copy the full SHA
    9d3db19 View commit details

  3. 修正podspec

    @FreddyZeng
    FreddyZeng committed Jan 22, 2018
    Copy the full SHA
    81a374c View commit details

  4. 修正 podspec

    @FreddyZeng
    FreddyZeng committed Jan 22, 2018
    Copy the full SHA
    5119fca View commit details

Commits on Jan 23, 2018

  1. 修正spec

    @FreddyZeng
    FreddyZeng committed Jan 23, 2018
    Copy the full SHA
    131c2e2 View commit details

  2. 修正 podspec

    @FreddyZeng
    FreddyZeng committed Jan 23, 2018
    Copy the full SHA
    8a31f68 View commit details

  3. 开放 delegate权限

    @FreddyZeng
    FreddyZeng committed Jan 23, 2018
    Copy the full SHA
    9524306 View commit details

  4. 更新podspec

    @FreddyZeng
    FreddyZeng committed Jan 23, 2018
    Copy the full SHA
    291b6f8 View commit details

  5. 修改正确权限

    @FreddyZeng
    FreddyZeng committed Jan 23, 2018
    Copy the full SHA
    b17ea50 View commit details
Showing with 3,141 additions and 50 deletions.
  1. +45 −0 Charts.xcodeproj/project.pbxproj
  2. +0 −20 ChartsDemo-iOS/ChartsDemo-iOS.xcodeproj/project.pbxproj
  3. 0 ChartsDemo-iOS/Objective-C/AppDelegate.h
  4. 0 ChartsDemo-iOS/Objective-C/AppDelegate.m
  5. 0 ChartsDemo-iOS/Objective-C/DemoBaseViewController.h
  6. 0 ChartsDemo-iOS/Objective-C/DemoBaseViewController.m
  7. 0 ChartsDemo-iOS/Objective-C/DemoListViewController.h
  8. 0 ChartsDemo-iOS/Objective-C/DemoListViewController.m
  9. 0 ChartsDemo-iOS/Objective-C/Demos/AnotherBarChartViewController.h
  10. 0 ChartsDemo-iOS/Objective-C/Demos/AnotherBarChartViewController.m
  11. 0 ChartsDemo-iOS/Objective-C/Demos/BarChartViewController.h
  12. 0 ChartsDemo-iOS/Objective-C/Demos/BarChartViewController.m
  13. 0 ChartsDemo-iOS/Objective-C/Demos/BubbleChartViewController.h
  14. 0 ChartsDemo-iOS/Objective-C/Demos/BubbleChartViewController.m
  15. 0 ChartsDemo-iOS/Objective-C/Demos/CandleStickChartViewController.h
  16. 0 ChartsDemo-iOS/Objective-C/Demos/CandleStickChartViewController.m
  17. 0 ChartsDemo-iOS/Objective-C/Demos/ColoredLineChartViewController.h
  18. 0 ChartsDemo-iOS/Objective-C/Demos/ColoredLineChartViewController.m
  19. 0 ChartsDemo-iOS/Objective-C/Demos/CombinedChartViewController.h
  20. 0 ChartsDemo-iOS/Objective-C/Demos/CombinedChartViewController.m
  21. 0 ChartsDemo-iOS/Objective-C/Demos/CubicLineChartViewController.h
  22. 0 ChartsDemo-iOS/Objective-C/Demos/CubicLineChartViewController.m
  23. 0 ChartsDemo-iOS/Objective-C/Demos/HalfPieChartViewController.h
  24. 0 ChartsDemo-iOS/Objective-C/Demos/HalfPieChartViewController.m
  25. 0 ChartsDemo-iOS/Objective-C/Demos/HorizontalBarChartViewController.h
  26. 0 ChartsDemo-iOS/Objective-C/Demos/HorizontalBarChartViewController.m
  27. 0 ChartsDemo-iOS/Objective-C/Demos/LineChart1ViewController.h
  28. 0 ChartsDemo-iOS/Objective-C/Demos/LineChart1ViewController.m
  29. 0 ChartsDemo-iOS/Objective-C/Demos/LineChart2ViewController.h
  30. 0 ChartsDemo-iOS/Objective-C/Demos/LineChart2ViewController.m
  31. 0 ChartsDemo-iOS/Objective-C/Demos/LineChartFilledViewController.h
  32. 0 ChartsDemo-iOS/Objective-C/Demos/LineChartFilledViewController.m
  33. 0 ChartsDemo-iOS/Objective-C/Demos/LineChartTimeViewController.h
  34. 0 ChartsDemo-iOS/Objective-C/Demos/LineChartTimeViewController.m
  35. 0 ChartsDemo-iOS/Objective-C/Demos/MultipleBarChartViewController.h
  36. 0 ChartsDemo-iOS/Objective-C/Demos/MultipleBarChartViewController.m
  37. 0 ChartsDemo-iOS/Objective-C/Demos/MultipleLinesChartViewController.h
  38. 0 ChartsDemo-iOS/Objective-C/Demos/MultipleLinesChartViewController.m
  39. 0 ChartsDemo-iOS/Objective-C/Demos/NegativeStackedBarChartViewController.h
  40. 0 ChartsDemo-iOS/Objective-C/Demos/NegativeStackedBarChartViewController.m
  41. 0 ChartsDemo-iOS/Objective-C/Demos/PieChartViewController.h
  42. 0 ChartsDemo-iOS/Objective-C/Demos/PieChartViewController.m
  43. 0 ChartsDemo-iOS/Objective-C/Demos/PiePolylineChartViewController.h
  44. 0 ChartsDemo-iOS/Objective-C/Demos/PiePolylineChartViewController.m
  45. 0 ChartsDemo-iOS/Objective-C/Demos/PositiveNegativeBarChartViewController.h
  46. 0 ChartsDemo-iOS/Objective-C/Demos/PositiveNegativeBarChartViewController.m
  47. 0 ChartsDemo-iOS/Objective-C/Demos/RadarChartViewController.h
  48. 0 ChartsDemo-iOS/Objective-C/Demos/RadarChartViewController.m
  49. 0 ChartsDemo-iOS/Objective-C/Demos/ScatterChartViewController.h
  50. 0 ChartsDemo-iOS/Objective-C/Demos/ScatterChartViewController.m
  51. 0 ChartsDemo-iOS/Objective-C/Demos/SinusBarChartViewController.h
  52. 0 ChartsDemo-iOS/Objective-C/Demos/SinusBarChartViewController.m
  53. 0 ChartsDemo-iOS/Objective-C/Demos/StackedBarChartViewController.h
  54. 0 ChartsDemo-iOS/Objective-C/Demos/StackedBarChartViewController.m
  55. 0 ChartsDemo-iOS/Objective-C/Formatters/DateValueFormatter.h
  56. 0 ChartsDemo-iOS/Objective-C/Formatters/DateValueFormatter.m
  57. 0 ChartsDemo-iOS/Objective-C/Formatters/DayAxisValueFormatter.h
  58. 0 ChartsDemo-iOS/Objective-C/Formatters/DayAxisValueFormatter.m
  59. 0 ChartsDemo-iOS/Objective-C/Formatters/IntAxisValueFormatter.h
  60. 0 ChartsDemo-iOS/Objective-C/Formatters/IntAxisValueFormatter.m
  61. 0 ChartsDemo-iOS/Objective-C/Formatters/LargeValueFormatter.swift
  62. 0 ChartsDemo-iOS/Resources/Images.xcassets/AppIcon.appiconset/Contents.json
  63. BIN ChartsDemo-iOS/Resources/Images.xcassets/AppIcon.appiconset/Icon-29@2x.png
  64. BIN ChartsDemo-iOS/Resources/Images.xcassets/AppIcon.appiconset/Icon-29@3x.png
  65. BIN ChartsDemo-iOS/Resources/Images.xcassets/AppIcon.appiconset/Icon-40@2x.png
  66. BIN ChartsDemo-iOS/Resources/Images.xcassets/AppIcon.appiconset/Icon-40@3x.png
  67. BIN ChartsDemo-iOS/Resources/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png
  68. BIN ChartsDemo-iOS/Resources/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png
  69. BIN ChartsDemo-iOS/Resources/Images.xcassets/AppIcon.appiconset/iTunesArtwork@2x.png
  70. 0 ChartsDemo-iOS/Resources/Images.xcassets/Contents.json
  71. 0 ChartsDemo-iOS/Resources/Images.xcassets/icon.imageset/Contents.json
  72. BIN ChartsDemo-iOS/Resources/Images.xcassets/icon.imageset/star-1.png
  73. BIN ChartsDemo-iOS/Resources/Images.xcassets/icon.imageset/star-2.png
  74. BIN ChartsDemo-iOS/Resources/Images.xcassets/icon.imageset/star.png
  75. 0 ChartsDemo-iOS/Resources/Launch Screen.storyboard
  76. BIN ChartsDemo-iOS/Resources/markers/radar_marker@3x.png
  77. 0 ChartsDemo-iOS/Supporting Files/ChartsDemo-Bridging-Header.h
  78. 0 ChartsDemo-iOS/Supporting Files/Info.plist
  79. 0 ChartsDemo-iOS/Supporting Files/main.m
  80. 0 ChartsDemo-iOS/Swift/AppDelegate.swift
  81. 0 ChartsDemo-iOS/Swift/Components/BalloonMarker.swift
  82. 0 ChartsDemo-iOS/Swift/Components/RadarMarkerView.swift
  83. 0 ChartsDemo-iOS/Swift/Components/XYMarkerView.swift
  84. 0 ChartsDemo-iOS/Swift/DemoBaseViewController.swift
  85. 0 ChartsDemo-iOS/Swift/DemoListViewController.swift
  86. 0 ChartsDemo-iOS/Swift/Demos/AnotherBarChartViewController.swift
  87. 0 ChartsDemo-iOS/Swift/Demos/BarChartViewController.swift
  88. 0 ChartsDemo-iOS/Swift/Demos/BubbleChartViewController.swift
  89. 0 ChartsDemo-iOS/Swift/Demos/CandleStickChartViewController.swift
  90. 0 ChartsDemo-iOS/Swift/Demos/ColoredLineChartViewController.swift
  91. 0 ChartsDemo-iOS/Swift/Demos/CombinedChartViewController.swift
  92. 0 ChartsDemo-iOS/Swift/Demos/CubicLineChartViewController.swift
  93. 0 ChartsDemo-iOS/Swift/Demos/HalfPieChartViewController.swift
  94. 0 ChartsDemo-iOS/Swift/Demos/HorizontalBarChartViewController.swift
  95. 0 ChartsDemo-iOS/Swift/Demos/LineChart1ViewController.swift
  96. 0 ChartsDemo-iOS/Swift/Demos/LineChart2ViewController.swift
  97. 0 ChartsDemo-iOS/Swift/Demos/LineChartFilledViewController.swift
  98. 0 ChartsDemo-iOS/Swift/Demos/LineChartTimeViewController.swift
  99. 0 ChartsDemo-iOS/Swift/Demos/MultipleBarChartViewController.swift
  100. 0 ChartsDemo-iOS/Swift/Demos/MultipleLinesChartViewController.swift
  101. 0 ChartsDemo-iOS/Swift/Demos/NegativeStackedBarChartViewController.swift
  102. 0 ChartsDemo-iOS/Swift/Demos/PieChartViewController.swift
  103. 0 ChartsDemo-iOS/Swift/Demos/PiePolylineChartViewController.swift
  104. 0 ChartsDemo-iOS/Swift/Demos/PositiveNegativeBarChartViewController.swift
  105. 0 ChartsDemo-iOS/Swift/Demos/RadarChartViewController.swift
  106. 0 ChartsDemo-iOS/Swift/Demos/ScatterChartViewController.swift
  107. 0 ChartsDemo-iOS/Swift/Demos/SinusBarChartViewController.swift
  108. 0 ChartsDemo-iOS/Swift/Demos/StackedBarChartViewController.swift
  109. 0 ChartsDemo-iOS/Swift/Formatters/DateValueFormatter.swift
  110. 0 ChartsDemo-iOS/Swift/Formatters/DayAxisValueFormatter.swift
  111. 0 ChartsDemo-iOS/Swift/Formatters/IntAxisValueFormatter.swift
  112. 0 ChartsDemo-iOS/Swift/Formatters/LargeValueFormatter.swift
  113. 0 ChartsDemo-iOS/XIBs/DemoListViewController.xib
  114. 0 ChartsDemo-iOS/XIBs/Demos/AnotherBarChartViewController.xib
  115. 0 ChartsDemo-iOS/XIBs/Demos/BarChartViewController.xib
  116. 0 ChartsDemo-iOS/XIBs/Demos/BubbleChartViewController.xib
  117. 0 ChartsDemo-iOS/XIBs/Demos/CandleStickChartViewController.xib
  118. 0 ChartsDemo-iOS/XIBs/Demos/ColoredLineChartViewController.xib
  119. 0 ChartsDemo-iOS/XIBs/Demos/CombinedChartViewController.xib
  120. 0 ChartsDemo-iOS/XIBs/Demos/CubicLineChartViewController.xib
  121. 0 ChartsDemo-iOS/XIBs/Demos/HalfPieChartViewController.xib
  122. 0 ChartsDemo-iOS/XIBs/Demos/HorizontalBarChartViewController.xib
  123. 0 ChartsDemo-iOS/XIBs/Demos/LineChart1ViewController.xib
  124. 0 ChartsDemo-iOS/XIBs/Demos/LineChart2ViewController.xib
  125. 0 ChartsDemo-iOS/XIBs/Demos/LineChartFilledViewController.xib
  126. 0 ChartsDemo-iOS/XIBs/Demos/LineChartTimeViewController.xib
  127. 0 ChartsDemo-iOS/XIBs/Demos/MultipleBarChartViewController.xib
  128. 0 ChartsDemo-iOS/XIBs/Demos/MultipleLinesChartViewController.xib
  129. 0 ChartsDemo-iOS/XIBs/Demos/NegativeStackedBarChartViewController.xib
  130. 0 ChartsDemo-iOS/XIBs/Demos/PieChartViewController.xib
  131. 0 ChartsDemo-iOS/XIBs/Demos/PiePolylineChartViewController.xib
  132. 0 ChartsDemo-iOS/XIBs/Demos/PositiveNegativeBarChartViewController.xib
  133. 0 ChartsDemo-iOS/XIBs/Demos/RadarChartViewController.xib
  134. 0 ChartsDemo-iOS/XIBs/Demos/RealmDemosViewController.xib
  135. 0 ChartsDemo-iOS/XIBs/Demos/ScatterChartViewController.xib
  136. 0 ChartsDemo-iOS/XIBs/Demos/SinusBarChartViewController.xib
  137. 0 ChartsDemo-iOS/XIBs/Demos/StackedBarChartViewController.xib
  138. 0 ChartsDemo-iOS/XIBs/RadarMarkerView.xib
  139. 0 ChartsDemo-macOS/ChartsDemo-macOS.xcodeproj/project.pbxproj
  140. 0 ChartsDemo-macOS/ChartsDemo-macOS/AppDelegate.swift
  141. 0 ChartsDemo-macOS/ChartsDemo-macOS/Assets.xcassets/AppIcon.appiconset/Contents.json
  142. 0 ChartsDemo-macOS/ChartsDemo-macOS/Base.lproj/Main.storyboard
  143. 0 ChartsDemo-macOS/ChartsDemo-macOS/Demos/BarDemoViewController.swift
  144. 0 ChartsDemo-macOS/ChartsDemo-macOS/Demos/LineDemoViewController.swift
  145. 0 ChartsDemo-macOS/ChartsDemo-macOS/Demos/PieDemoViewController.swift
  146. 0 ChartsDemo-macOS/ChartsDemo-macOS/Demos/RadarDemoViewController.swift
  147. 0 ChartsDemo-macOS/ChartsDemo-macOS/Info.plist
  148. 0 ChartsDemo-macOS/PlaygroundChart.playground/Pages/BarChart.xcplaygroundpage/Contents.swift
  149. 0 ChartsDemo-macOS/PlaygroundChart.playground/Pages/BubbleChart.xcplaygroundpage/Contents.swift
  150. 0 ChartsDemo-macOS/PlaygroundChart.playground/Pages/CandleChart.xcplaygroundpage/Contents.swift
  151. 0 ChartsDemo-macOS/PlaygroundChart.playground/Pages/CombinedChart.xcplaygroundpage/Contents.swift
  152. 0 ChartsDemo-macOS/PlaygroundChart.playground/Pages/HorizontalBarChart.xcplaygroundpage/Contents.swift
  153. 0 ChartsDemo-macOS/PlaygroundChart.playground/Pages/LineChart.xcplaygroundpage/Contents.swift
  154. 0 ChartsDemo-macOS/PlaygroundChart.playground/Pages/Menu.xcplaygroundpage/Contents.swift
  155. BIN ...tsDemo-macOS/PlaygroundChart.playground/Pages/Menu.xcplaygroundpage/Resources/feature_graphic.png
  156. 0 ChartsDemo-macOS/PlaygroundChart.playground/Pages/PieChart.xcplaygroundpage/Contents.swift
  157. 0 ChartsDemo-macOS/PlaygroundChart.playground/Pages/RadarChart.xcplaygroundpage/Contents.swift
  158. 0 ChartsDemo-macOS/PlaygroundChart.playground/Pages/ScatterChart.xcplaygroundpage/Contents.swift
  159. 0 ChartsDemo-macOS/PlaygroundChart.playground/Pages/StackedBarChart.xcplaygroundpage/Contents.swift
  160. 0 ChartsDemo-macOS/PlaygroundChart.playground/contents.xcplayground
  161. 0 Charts.podspec → ICXCharts.podspec
  162. +2 −0 Source/Charts/Charts/BarLineChartViewBase.swift
  163. +7 −1 Source/Charts/Components/ChartLimitLine.swift
  164. +5 −0 Source/Charts/Components/YAxis.swift
  165. +3 −0 Source/Charts/Data/Implementations/Standard/BarChartDataEntry.swift
  166. +6 −0 Source/Charts/Data/Implementations/Standard/BarChartDataSet.swift
  167. +6 −1 Source/Charts/Data/Implementations/Standard/LineChartDataSet.swift
  168. +20 −0 Source/Charts/Data/Interfaces/IBarChartDataSet.swift
  169. +7 −3 Source/Charts/Highlight/BarHighlighter.swift
  170. +23 −0 Source/Charts/ICXCharts/ChartViewHeartManage.h
  171. +245 −0 Source/Charts/ICXCharts/ChartViewHeartManage.m
  172. +20 −0 Source/Charts/ICXCharts/ChartViewSMHistoryChartViewLayout.h
  173. +310 −0 Source/Charts/ICXCharts/ChartViewSMHistoryChartViewLayout.m
  174. +23 −0 Source/Charts/ICXCharts/ChartViewSleepManage.h
  175. +221 −0 Source/Charts/ICXCharts/ChartViewSleepManage.m
  176. +21 −0 Source/Charts/ICXCharts/ChartViewSportManage.h
  177. +224 −0 Source/Charts/ICXCharts/ChartViewSportManage.m
  178. +35 −0 Source/Charts/ICXCharts/NSMutableAttributedString+Attributes.h
  179. +161 −0 Source/Charts/ICXCharts/NSMutableAttributedString+Attributes.m
  180. +39 −0 Source/Charts/ICXCharts/TYBaseChartViewLayout.h
  181. +165 −0 Source/Charts/ICXCharts/TYBaseChartViewLayout.m
  182. +16 −0 Source/Charts/ICXCharts/TYBloodRealTimeChartViewLayout.h
  183. +247 −0 Source/Charts/ICXCharts/TYBloodRealTimeChartViewLayout.m
  184. +56 −0 Source/Charts/ICXCharts/TYCombinedChartView.h
  185. +334 −0 Source/Charts/ICXCharts/TYCombinedChartView.m
  186. +17 −0 Source/Charts/ICXCharts/TYCombinedChartViewCollectionViewCell.h
  187. +97 −0 Source/Charts/ICXCharts/TYCombinedChartViewCollectionViewCell.m
  188. +15 −0 Source/Charts/ICXCharts/TYCombinedDateCollectionViewCell.h
  189. +68 −0 Source/Charts/ICXCharts/TYCombinedDateCollectionViewCell.m
  190. +230 −0 Source/Charts/Mark/BalloonMarker.swift
  191. +29 −0 Source/Charts/Mark/RadarMarkerView.swift
  192. +44 −0 Source/Charts/Mark/RadarMarkerView.xib
  193. +47 −0 Source/Charts/Mark/TYMarkerView.swift
  194. +42 −0 Source/Charts/Mark/XYMarkerView.swift
  195. +46 −0 Source/Charts/Mark/YMarkerView.swift
  196. +154 −7 Source/Charts/Renderers/BarChartRenderer.swift
  197. +19 −2 Source/Charts/Renderers/LineChartRenderer.swift
  198. +34 −1 Source/Charts/Renderers/LineScatterCandleRadarRenderer.swift
  199. +7 −5 Source/Charts/Renderers/XAxisRenderer.swift
  200. +6 −4 Source/Charts/Renderers/XAxisRendererHorizontalBarChart.swift
  201. +45 −6 Source/Charts/Renderers/YAxisRenderer.swift
45 changes: 45 additions & 0 deletions Charts.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
@@ -117,6 +117,18 @@
BEFD9518F3A74ACF8FA33308 /* Charts.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F9922F0641F7955DC6CD324 /* Charts.h */; settings = {ATTRIBUTES = (Public, ); }; };
C04D269AD4A373FD2B621C43 /* LineChartData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C978F31F23C7D21197DC2A1 /* LineChartData.swift */; };
C09E91F67A4AC43C277E7D82 /* BubbleChartDataEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = DD8ED233775EEC31243A6919 /* BubbleChartDataEntry.swift */; };
C20349BB201344430076234B /* RadarMarkerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C20349B5201344430076234B /* RadarMarkerView.swift */; };
C20349BC201344430076234B /* RadarMarkerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C20349B5201344430076234B /* RadarMarkerView.swift */; };
C20349BD201344430076234B /* BalloonMarker.swift in Sources */ = {isa = PBXBuildFile; fileRef = C20349B6201344430076234B /* BalloonMarker.swift */; };
C20349BE201344430076234B /* BalloonMarker.swift in Sources */ = {isa = PBXBuildFile; fileRef = C20349B6201344430076234B /* BalloonMarker.swift */; };
C20349BF201344430076234B /* RadarMarkerView.xib in Resources */ = {isa = PBXBuildFile; fileRef = C20349B7201344430076234B /* RadarMarkerView.xib */; };
C20349C0201344430076234B /* RadarMarkerView.xib in Resources */ = {isa = PBXBuildFile; fileRef = C20349B7201344430076234B /* RadarMarkerView.xib */; };
C20349C1201344430076234B /* TYMarkerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C20349B8201344430076234B /* TYMarkerView.swift */; };
C20349C2201344430076234B /* TYMarkerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C20349B8201344430076234B /* TYMarkerView.swift */; };
C20349C3201344430076234B /* XYMarkerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C20349B9201344430076234B /* XYMarkerView.swift */; };
C20349C4201344430076234B /* XYMarkerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C20349B9201344430076234B /* XYMarkerView.swift */; };
C20349C5201344430076234B /* YMarkerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C20349BA201344430076234B /* YMarkerView.swift */; };
C20349C6201344430076234B /* YMarkerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C20349BA201344430076234B /* YMarkerView.swift */; };
C20A62D8CB9120523D5FB650 /* LegendEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9E7C673B9ED4340F550A9283 /* LegendEntry.swift */; };
C2EFB4EC8C97FA9987F1B50D /* RadarChartDataEntry.swift in Sources */ = {isa = PBXBuildFile; fileRef = 91EEEDE2AB8F2DA3AFCF0733 /* RadarChartDataEntry.swift */; };
C33E1AF5471A60BA42DAF52E /* RadarHighlighter.swift in Sources */ = {isa = PBXBuildFile; fileRef = F368CF209744D8F3B85B1028 /* RadarHighlighter.swift */; };
@@ -278,6 +290,12 @@
BD02157CF8CEE1189BF681DA /* PieChartDataEntry.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = PieChartDataEntry.swift; path = Source/Charts/Data/Implementations/Standard/PieChartDataEntry.swift; sourceTree = "<group>"; };
BD5C6D20243EC2F19069AACD /* CandleStickChartRenderer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = CandleStickChartRenderer.swift; path = Source/Charts/Renderers/CandleStickChartRenderer.swift; sourceTree = "<group>"; };
BFABD027DAF6851088F002AC /* LineChartDataProvider.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = LineChartDataProvider.swift; path = Source/Charts/Interfaces/LineChartDataProvider.swift; sourceTree = "<group>"; };
C20349B5201344430076234B /* RadarMarkerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RadarMarkerView.swift; sourceTree = "<group>"; };
C20349B6201344430076234B /* BalloonMarker.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BalloonMarker.swift; sourceTree = "<group>"; };
C20349B7201344430076234B /* RadarMarkerView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = RadarMarkerView.xib; sourceTree = "<group>"; };
C20349B8201344430076234B /* TYMarkerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TYMarkerView.swift; sourceTree = "<group>"; };
C20349B9201344430076234B /* XYMarkerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = XYMarkerView.swift; sourceTree = "<group>"; };
C20349BA201344430076234B /* YMarkerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YMarkerView.swift; sourceTree = "<group>"; };
C31AA65EA27776F8C653C7E8 /* BarChartDataSet.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = BarChartDataSet.swift; path = Source/Charts/Data/Implementations/Standard/BarChartDataSet.swift; sourceTree = "<group>"; };
C52E8344160B5E689DA3C25C /* ChevronDownShapeRenderer.swift */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.swift; name = ChevronDownShapeRenderer.swift; path = Source/Charts/Renderers/Scatter/ChevronDownShapeRenderer.swift; sourceTree = "<group>"; };
C574E1BC7E12D937A5471EF8 /* Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; name = Info.plist; path = "Tests/Supporting Files/Info.plist"; sourceTree = "<group>"; };
@@ -377,6 +395,7 @@
2647844720BC6574A544A337 /* Charts */ = {
isa = PBXGroup;
children = (
C20349B42013440F0076234B /* Mark */,
A49C1F0F9CCD6E5C143C29F4 /* Animation */,
8C531E3F3C3DE5843C93C3DA /* Charts */,
51EF1986C9884C25EED1C2CB /* Components */,
@@ -577,6 +596,20 @@
name = "Supporting Files";
sourceTree = "<group>";
};
C20349B42013440F0076234B /* Mark */ = {
isa = PBXGroup;
children = (
C20349B6201344430076234B /* BalloonMarker.swift */,
C20349B5201344430076234B /* RadarMarkerView.swift */,
C20349B7201344430076234B /* RadarMarkerView.xib */,
C20349B8201344430076234B /* TYMarkerView.swift */,
C20349B9201344430076234B /* XYMarkerView.swift */,
C20349BA201344430076234B /* YMarkerView.swift */,
);
name = Mark;
path = Source/Charts/Mark;
sourceTree = "<group>";
};
D047819AB7170595896D6FE8 /* Utils */ = {
isa = PBXGroup;
children = (
@@ -765,13 +798,15 @@
buildActionMask = 2147483647;
files = (
00B8BF5901C2D220357B0B2A /* Media.xcassets in Resources */,
C20349C0201344430076234B /* RadarMarkerView.xib in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
E257C254E738A8AE047C6FB6 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
C20349BF201344430076234B /* RadarMarkerView.xib in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -877,6 +912,8 @@
146EE16342C2BADC92E45BF2 /* ILineScatterCandleRadarChartDataSet.swift in Sources */,
FAAD9FF6565DED2652188584 /* IPieChartDataSet.swift in Sources */,
83BBAF3EDC31FD452F8BF1DB /* IRadarChartDataSet.swift in Sources */,
C20349BD201344430076234B /* BalloonMarker.swift in Sources */,
C20349C3201344430076234B /* XYMarkerView.swift in Sources */,
50476F8E6662CAFC1EFE0723 /* IScatterChartDataSet.swift in Sources */,
97E033CC0ABEF0F448DAFA8E /* DataApproximator.swift in Sources */,
779B46E9F13A087BFA47D539 /* DefaultAxisValueFormatter.swift in Sources */,
@@ -898,6 +935,7 @@
9C91C151608E2D6E19B1EAD1 /* Range.swift in Sources */,
00BC23EF0E04E17188344403 /* BarChartDataProvider.swift in Sources */,
28FEE609C5B22FD64C7E5D10 /* BarLineScatterCandleBubbleChartDataProvider.swift in Sources */,
C20349C1201344430076234B /* TYMarkerView.swift in Sources */,
4272DA5D44AF7DA05A5A8287 /* BubbleChartDataProvider.swift in Sources */,
30DCC4BAA5601B154ABADA13 /* CandleChartDataProvider.swift in Sources */,
FD37AAC0270F390FFC470A65 /* ChartDataProvider.swift in Sources */,
@@ -931,6 +969,8 @@
0529DD51622C8769C1121F90 /* CrossShapeRenderer.swift in Sources */,
8A9FF54E2075A9047CC8E953 /* IShapeRenderer.swift in Sources */,
8EF7B3FBE37F72CC030CD865 /* SquareShapeRenderer.swift in Sources */,
C20349C5201344430076234B /* YMarkerView.swift in Sources */,
C20349BB201344430076234B /* RadarMarkerView.swift in Sources */,
8F4B1A9060472764073DFA0B /* TriangleShapeRenderer.swift in Sources */,
93A94E1FF55041A6032891FE /* XShapeRenderer.swift in Sources */,
5DC9BC1B6C128B2C9995AB84 /* ScatterChartRenderer.swift in Sources */,
@@ -954,13 +994,18 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
C20349C6201344430076234B /* YMarkerView.swift in Sources */,
C20349C2201344430076234B /* TYMarkerView.swift in Sources */,
3B11556EB7DC034E2FC958E4 /* BarChartTests.swift in Sources */,
C20349BC201344430076234B /* RadarMarkerView.swift in Sources */,
8E1192F7A7152E9DA92C56A9 /* ChartUtilsTests.swift in Sources */,
B6BF9A561F91993A00E62A5D /* CombinedChartTests.swift in Sources */,
2BF85BEA981B359A65E9BF67 /* LineChartTests.swift in Sources */,
135F11CE20425AF600D655A3 /* PieChartTests.swift in Sources */,
064989461F5C99C7006E8BB3 /* Snapshot.swift in Sources */,
C20349C4201344430076234B /* XYMarkerView.swift in Sources */,
224EFF991FBAAC4700CF9B3B /* EquatableTests.swift in Sources */,
C20349BE201344430076234B /* BalloonMarker.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
20 changes: 0 additions & 20 deletions ChartsDemo-iOS/ChartsDemo-iOS.xcodeproj/project.pbxproj
100644 → 100755
View file
Original file line number Diff line number Diff line change
@@ -84,16 +84,13 @@
5B57BBB81A9B26AA0036A6CC /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B57BBB71A9B26AA0036A6CC /* AppDelegate.m */; };
5B57BBBB1A9B26AA0036A6CC /* DemoListViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B57BBBA1A9B26AA0036A6CC /* DemoListViewController.m */; };
5B613DA41D526AD5000F1E98 /* radar_marker@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 5B613DA31D526AD5000F1E98 /* radar_marker@3x.png */; };
5B613DB31D526DED000F1E98 /* RadarMarkerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B613DB21D526DED000F1E98 /* RadarMarkerView.swift */; };
5B613DB51D526EA8000F1E98 /* RadarMarkerView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5B613DB41D526EA8000F1E98 /* RadarMarkerView.xib */; };
5B613DF01D5A50B6000F1E98 /* XYMarkerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B613DEF1D5A50B6000F1E98 /* XYMarkerView.swift */; };
5B613DF21D5A60DF000F1E98 /* LargeValueFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5B613DF11D5A60DF000F1E98 /* LargeValueFormatter.swift */; };
5B8EAF241AB3271B009697AA /* DemoListViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5B8EAF231AB3271B009697AA /* DemoListViewController.xib */; };
5B8EAF281AB32CF5009697AA /* DemoBaseViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B8EAF261AB32CF5009697AA /* DemoBaseViewController.m */; };
5B8EAF301AB32E15009697AA /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5B8EAF2F1AB32E15009697AA /* Images.xcassets */; };
5B9624411B38608C007763E2 /* NegativeStackedBarChartViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5B96243F1B38608C007763E2 /* NegativeStackedBarChartViewController.m */; };
5B9624421B38608C007763E2 /* NegativeStackedBarChartViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5B9624401B38608C007763E2 /* NegativeStackedBarChartViewController.xib */; };
5BD47E5B1ABB0263008FCEC6 /* BalloonMarker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BD47E5A1ABB0263008FCEC6 /* BalloonMarker.swift */; };
5BD47E601ABB3C91008FCEC6 /* LineChart2ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5BD47E5E1ABB3C91008FCEC6 /* LineChart2ViewController.m */; };
5BD47E611ABB3C91008FCEC6 /* LineChart2ViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 5BD47E5F1ABB3C91008FCEC6 /* LineChart2ViewController.xib */; };
5BD47E651ABB424E008FCEC6 /* BarChartViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5BD47E631ABB424E008FCEC6 /* BarChartViewController.m */; };
@@ -248,9 +245,7 @@
5B57BBB91A9B26AA0036A6CC /* DemoListViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = DemoListViewController.h; sourceTree = "<group>"; };
5B57BBBA1A9B26AA0036A6CC /* DemoListViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DemoListViewController.m; sourceTree = "<group>"; };
5B613DA31D526AD5000F1E98 /* radar_marker@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "radar_marker@3x.png"; sourceTree = "<group>"; };
5B613DB21D526DED000F1E98 /* RadarMarkerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RadarMarkerView.swift; sourceTree = "<group>"; };
5B613DB41D526EA8000F1E98 /* RadarMarkerView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = RadarMarkerView.xib; sourceTree = "<group>"; };
5B613DEF1D5A50B6000F1E98 /* XYMarkerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = XYMarkerView.swift; sourceTree = "<group>"; };
5B613DF11D5A60DF000F1E98 /* LargeValueFormatter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LargeValueFormatter.swift; sourceTree = "<group>"; };
5B8EAF231AB3271B009697AA /* DemoListViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DemoListViewController.xib; sourceTree = "<group>"; };
5B8EAF251AB32CF5009697AA /* DemoBaseViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DemoBaseViewController.h; sourceTree = "<group>"; };
@@ -259,7 +254,6 @@
5B96243E1B38608C007763E2 /* NegativeStackedBarChartViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NegativeStackedBarChartViewController.h; sourceTree = "<group>"; };
5B96243F1B38608C007763E2 /* NegativeStackedBarChartViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NegativeStackedBarChartViewController.m; sourceTree = "<group>"; };
5B9624401B38608C007763E2 /* NegativeStackedBarChartViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = NegativeStackedBarChartViewController.xib; sourceTree = "<group>"; };
5BD47E5A1ABB0263008FCEC6 /* BalloonMarker.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BalloonMarker.swift; sourceTree = "<group>"; };
5BD47E5C1ABB0273008FCEC6 /* ChartsDemo-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "ChartsDemo-Bridging-Header.h"; sourceTree = "<group>"; };
5BD47E5D1ABB3C91008FCEC6 /* LineChart2ViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LineChart2ViewController.h; sourceTree = "<group>"; };
5BD47E5E1ABB3C91008FCEC6 /* LineChart2ViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LineChart2ViewController.m; sourceTree = "<group>"; };
@@ -493,7 +487,6 @@
5B8EAF251AB32CF5009697AA /* DemoBaseViewController.h */,
5B8EAF261AB32CF5009697AA /* DemoBaseViewController.m */,
5BE377D41D42511A006EB34F /* Formatters */,
5BD47E541ABB0177008FCEC6 /* Components */,
5BD8F06F1AB89C7100566E05 /* Demos */,
);
path = "Objective-C";
@@ -527,16 +520,6 @@
path = Resources;
sourceTree = "<group>";
};
5BD47E541ABB0177008FCEC6 /* Components */ = {
isa = PBXGroup;
children = (
5BD47E5A1ABB0263008FCEC6 /* BalloonMarker.swift */,
5B613DB21D526DED000F1E98 /* RadarMarkerView.swift */,
5B613DEF1D5A50B6000F1E98 /* XYMarkerView.swift */,
);
path = Components;
sourceTree = "<group>";
};
5BD8F06F1AB89C7100566E05 /* Demos */ = {
isa = PBXGroup;
children = (
@@ -840,19 +823,16 @@
5BE377DE1D425151006EB34F /* DayAxisValueFormatter.m in Sources */,
5BEAED401ABC1AC60013F194 /* SinusBarChartViewController.m in Sources */,
5BE7E7621C693098000A0377 /* PositiveNegativeBarChartViewController.m in Sources */,
5B613DB31D526DED000F1E98 /* RadarMarkerView.swift in Sources */,
5BEAED251ABC0BE20013F194 /* MultipleBarChartViewController.m in Sources */,
5B57BBB81A9B26AA0036A6CC /* AppDelegate.m in Sources */,
55E356511ADC638F00A57971 /* BubbleChartViewController.m in Sources */,
5BD47E5B1ABB0263008FCEC6 /* BalloonMarker.swift in Sources */,
5BEAED2C1ABC160F0013F194 /* CandleStickChartViewController.m in Sources */,
5BEAED271ABC0BE20013F194 /* MultipleLinesChartViewController.m in Sources */,
5BE6739A1D5BAD7E00A87BA2 /* DateValueFormatter.m in Sources */,
5BE673801D5B496500A87BA2 /* HalfPieChartViewController.m in Sources */,
5BE673921D5B4E0900A87BA2 /* LineChartFilledViewController.m in Sources */,
5B8EAF281AB32CF5009697AA /* DemoBaseViewController.m in Sources */,
5BE673941D5B4E0900A87BA2 /* LineChartTimeViewController.m in Sources */,
5B613DF01D5A50B6000F1E98 /* XYMarkerView.swift in Sources */,
5BEAED3B1ABC199F0013F194 /* ColoredLineChartViewController.m in Sources */,
5BDEDC411ABB7F73007D3A60 /* HorizontalBarChartViewController.m in Sources */,
5BEAED121ABBFB2B0013F194 /* AnotherBarChartViewController.m in Sources */,
Empty file modified ChartsDemo-iOS/Objective-C/AppDelegate.h
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Objective-C/AppDelegate.m
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Objective-C/DemoBaseViewController.h
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Objective-C/DemoBaseViewController.m
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Objective-C/DemoListViewController.h
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Objective-C/DemoListViewController.m
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Objective-C/Demos/AnotherBarChartViewController.h
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Objective-C/Demos/AnotherBarChartViewController.m
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Objective-C/Demos/BarChartViewController.h
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Objective-C/Demos/BarChartViewController.m
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Objective-C/Demos/BubbleChartViewController.h
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Objective-C/Demos/BubbleChartViewController.m
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Objective-C/Demos/CandleStickChartViewController.h
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Objective-C/Demos/CandleStickChartViewController.m
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Objective-C/Demos/ColoredLineChartViewController.h
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Objective-C/Demos/ColoredLineChartViewController.m
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Objective-C/Demos/CombinedChartViewController.h
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Objective-C/Demos/CombinedChartViewController.m
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Objective-C/Demos/CubicLineChartViewController.h
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Objective-C/Demos/CubicLineChartViewController.m
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Objective-C/Demos/HalfPieChartViewController.h
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Objective-C/Demos/HalfPieChartViewController.m
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Objective-C/Demos/HorizontalBarChartViewController.h
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Objective-C/Demos/HorizontalBarChartViewController.m
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Objective-C/Demos/LineChart1ViewController.h
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Objective-C/Demos/LineChart1ViewController.m
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Objective-C/Demos/LineChart2ViewController.h
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Objective-C/Demos/LineChart2ViewController.m
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Objective-C/Demos/LineChartFilledViewController.h
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Objective-C/Demos/LineChartFilledViewController.m
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Objective-C/Demos/LineChartTimeViewController.h
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Objective-C/Demos/LineChartTimeViewController.m
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Objective-C/Demos/MultipleBarChartViewController.h
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Objective-C/Demos/MultipleBarChartViewController.m
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Objective-C/Demos/MultipleLinesChartViewController.h
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Objective-C/Demos/MultipleLinesChartViewController.m
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Objective-C/Demos/NegativeStackedBarChartViewController.h
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Objective-C/Demos/NegativeStackedBarChartViewController.m
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Objective-C/Demos/PieChartViewController.h
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Objective-C/Demos/PieChartViewController.m
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Objective-C/Demos/PiePolylineChartViewController.h
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Objective-C/Demos/PiePolylineChartViewController.m
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Objective-C/Demos/PositiveNegativeBarChartViewController.h
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Objective-C/Demos/PositiveNegativeBarChartViewController.m
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Objective-C/Demos/RadarChartViewController.h
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Objective-C/Demos/RadarChartViewController.m
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Objective-C/Demos/ScatterChartViewController.h
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Objective-C/Demos/ScatterChartViewController.m
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Objective-C/Demos/SinusBarChartViewController.h
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Objective-C/Demos/SinusBarChartViewController.m
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Objective-C/Demos/StackedBarChartViewController.h
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Objective-C/Demos/StackedBarChartViewController.m
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Objective-C/Formatters/DateValueFormatter.h
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Objective-C/Formatters/DateValueFormatter.m
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Objective-C/Formatters/DayAxisValueFormatter.h
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Objective-C/Formatters/DayAxisValueFormatter.m
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Objective-C/Formatters/IntAxisValueFormatter.h
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Objective-C/Formatters/IntAxisValueFormatter.m
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Objective-C/Formatters/LargeValueFormatter.swift
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Resources/Images.xcassets/AppIcon.appiconset/Contents.json
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Resources/Images.xcassets/AppIcon.appiconset/Icon-29@2x.png
100644 → 100755
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified ChartsDemo-iOS/Resources/Images.xcassets/AppIcon.appiconset/Icon-29@3x.png
100644 → 100755
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified ChartsDemo-iOS/Resources/Images.xcassets/AppIcon.appiconset/Icon-40@2x.png
100644 → 100755
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified ChartsDemo-iOS/Resources/Images.xcassets/AppIcon.appiconset/Icon-40@3x.png
100644 → 100755
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified ChartsDemo-iOS/Resources/Images.xcassets/AppIcon.appiconset/Icon-60@2x.png
100644 → 100755
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified ChartsDemo-iOS/Resources/Images.xcassets/AppIcon.appiconset/Icon-60@3x.png
100644 → 100755
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified ChartsDemo-iOS/Resources/Images.xcassets/AppIcon.appiconset/iTunesArtwork@2x.png
100644 → 100755
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified ChartsDemo-iOS/Resources/Images.xcassets/Contents.json
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Resources/Images.xcassets/icon.imageset/Contents.json
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Resources/Images.xcassets/icon.imageset/star-1.png
100644 → 100755
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified ChartsDemo-iOS/Resources/Images.xcassets/icon.imageset/star-2.png
100644 → 100755
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified ChartsDemo-iOS/Resources/Images.xcassets/icon.imageset/star.png
100644 → 100755
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified ChartsDemo-iOS/Resources/Launch Screen.storyboard
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Resources/markers/radar_marker@3x.png
100644 → 100755
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified ChartsDemo-iOS/Supporting Files/ChartsDemo-Bridging-Header.h
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Supporting Files/Info.plist
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Supporting Files/main.m
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Swift/AppDelegate.swift
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Swift/Components/BalloonMarker.swift
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Swift/Components/RadarMarkerView.swift
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Swift/Components/XYMarkerView.swift
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Swift/DemoBaseViewController.swift
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Swift/DemoListViewController.swift
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Swift/Demos/AnotherBarChartViewController.swift
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Swift/Demos/BarChartViewController.swift
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Swift/Demos/BubbleChartViewController.swift
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Swift/Demos/CandleStickChartViewController.swift
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Swift/Demos/ColoredLineChartViewController.swift
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Swift/Demos/CombinedChartViewController.swift
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Swift/Demos/CubicLineChartViewController.swift
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Swift/Demos/HalfPieChartViewController.swift
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Swift/Demos/HorizontalBarChartViewController.swift
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Swift/Demos/LineChart1ViewController.swift
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Swift/Demos/LineChart2ViewController.swift
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Swift/Demos/LineChartFilledViewController.swift
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Swift/Demos/LineChartTimeViewController.swift
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Swift/Demos/MultipleBarChartViewController.swift
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Swift/Demos/MultipleLinesChartViewController.swift
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Swift/Demos/NegativeStackedBarChartViewController.swift
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Swift/Demos/PieChartViewController.swift
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Swift/Demos/PiePolylineChartViewController.swift
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Swift/Demos/PositiveNegativeBarChartViewController.swift
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Swift/Demos/RadarChartViewController.swift
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Swift/Demos/ScatterChartViewController.swift
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Swift/Demos/SinusBarChartViewController.swift
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Swift/Demos/StackedBarChartViewController.swift
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Swift/Formatters/DateValueFormatter.swift
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Swift/Formatters/DayAxisValueFormatter.swift
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Swift/Formatters/IntAxisValueFormatter.swift
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/Swift/Formatters/LargeValueFormatter.swift
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/XIBs/DemoListViewController.xib
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/XIBs/Demos/AnotherBarChartViewController.xib
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/XIBs/Demos/BarChartViewController.xib
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/XIBs/Demos/BubbleChartViewController.xib
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/XIBs/Demos/CandleStickChartViewController.xib
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/XIBs/Demos/ColoredLineChartViewController.xib
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/XIBs/Demos/CombinedChartViewController.xib
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/XIBs/Demos/CubicLineChartViewController.xib
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/XIBs/Demos/HalfPieChartViewController.xib
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/XIBs/Demos/HorizontalBarChartViewController.xib
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/XIBs/Demos/LineChart1ViewController.xib
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/XIBs/Demos/LineChart2ViewController.xib
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/XIBs/Demos/LineChartFilledViewController.xib
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/XIBs/Demos/LineChartTimeViewController.xib
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/XIBs/Demos/MultipleBarChartViewController.xib
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/XIBs/Demos/MultipleLinesChartViewController.xib
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/XIBs/Demos/NegativeStackedBarChartViewController.xib
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/XIBs/Demos/PieChartViewController.xib
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/XIBs/Demos/PiePolylineChartViewController.xib
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/XIBs/Demos/PositiveNegativeBarChartViewController.xib
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/XIBs/Demos/RadarChartViewController.xib
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/XIBs/Demos/RealmDemosViewController.xib
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/XIBs/Demos/ScatterChartViewController.xib
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/XIBs/Demos/SinusBarChartViewController.xib
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/XIBs/Demos/StackedBarChartViewController.xib
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-iOS/XIBs/RadarMarkerView.xib
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-macOS/ChartsDemo-macOS.xcodeproj/project.pbxproj
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-macOS/ChartsDemo-macOS/AppDelegate.swift
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-macOS/ChartsDemo-macOS/Assets.xcassets/AppIcon.appiconset/Contents.json
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-macOS/ChartsDemo-macOS/Base.lproj/Main.storyboard
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-macOS/ChartsDemo-macOS/Demos/BarDemoViewController.swift
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-macOS/ChartsDemo-macOS/Demos/LineDemoViewController.swift
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-macOS/ChartsDemo-macOS/Demos/PieDemoViewController.swift
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-macOS/ChartsDemo-macOS/Demos/RadarDemoViewController.swift
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-macOS/ChartsDemo-macOS/Info.plist
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-macOS/PlaygroundChart.playground/Pages/BarChart.xcplaygroundpage/Contents.swift
100644 → 100755
View file
Empty file.
Empty file modified ...tsDemo-macOS/PlaygroundChart.playground/Pages/BubbleChart.xcplaygroundpage/Contents.swift
100644 → 100755
View file
Empty file.
Empty file modified ...tsDemo-macOS/PlaygroundChart.playground/Pages/CandleChart.xcplaygroundpage/Contents.swift
100644 → 100755
View file
Empty file.
Empty file modified ...Demo-macOS/PlaygroundChart.playground/Pages/CombinedChart.xcplaygroundpage/Contents.swift
100644 → 100755
View file
Empty file.
Empty file modified ...macOS/PlaygroundChart.playground/Pages/HorizontalBarChart.xcplaygroundpage/Contents.swift
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-macOS/PlaygroundChart.playground/Pages/LineChart.xcplaygroundpage/Contents.swift
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-macOS/PlaygroundChart.playground/Pages/Menu.xcplaygroundpage/Contents.swift
100644 → 100755
View file
Empty file.
Empty file modified ...roundChart.playground/Pages/Menu.xcplaygroundpage/Resources/feature_graphic.png
100644 → 100755
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified ChartsDemo-macOS/PlaygroundChart.playground/Pages/PieChart.xcplaygroundpage/Contents.swift
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-macOS/PlaygroundChart.playground/Pages/RadarChart.xcplaygroundpage/Contents.swift
100644 → 100755
View file
Empty file.
Empty file modified ...sDemo-macOS/PlaygroundChart.playground/Pages/ScatterChart.xcplaygroundpage/Contents.swift
100644 → 100755
View file
Empty file.
Empty file modified ...mo-macOS/PlaygroundChart.playground/Pages/StackedBarChart.xcplaygroundpage/Contents.swift
100644 → 100755
View file
Empty file.
Empty file modified ChartsDemo-macOS/PlaygroundChart.playground/contents.xcplayground
100644 → 100755
View file
Empty file.
0 Charts.podspec → ICXCharts.podspec
View file
File renamed without changes.
2 changes: 2 additions & 0 deletions Source/Charts/Charts/BarLineChartViewBase.swift
View file
Original file line number Diff line number Diff line change
@@ -234,6 +234,8 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD
if (valuesToHighlight())
{
renderer.drawHighlighted(context: context, indices: _indicesToHighlight)
}else {
renderer.drawHighlighted(context: context, indices: [])
}

context.restoreGState()
8 changes: 7 additions & 1 deletion Source/Charts/Components/ChartLimitLine.swift
View file
Original file line number Diff line number Diff line change
@@ -15,6 +15,7 @@ import CoreGraphics

/// The limit line is an additional feature for all Line, Bar and ScatterCharts.
/// It allows the displaying of an additional line in the chart that marks a certain maximum / limit on the specified axis (x- or y-axis).
@objc
open class ChartLimitLine: ComponentBase
{
@objc(ChartLimitLabelPosition)
@@ -33,7 +34,12 @@ open class ChartLimitLine: ComponentBase
@objc open var lineColor = NSUIColor(red: 237.0/255.0, green: 91.0/255.0, blue: 91.0/255.0, alpha: 1.0)
@objc open var lineDashPhase = CGFloat(0.0)
@objc open var lineDashLengths: [CGFloat]?

/// 线下面的颜色
@objc public var lineBottomSpaceColor = NSUIColor.init(red: 68/255.0, green: 229/255.0, blue: 255/255.0, alpha: 1.0)
/// 是否把Label渲染在内容区域外，默认false
@objc public var isAllowDrawLabelOutContentRect = false
/// 是否把label的中心对齐极限线
@objc public var isLabelOffsetCenter = true;
@objc open var valueTextColor = NSUIColor.black
@objc open var valueFont = NSUIFont.systemFont(ofSize: 13.0)

5 changes: 5 additions & 0 deletions Source/Charts/Components/YAxis.swift
View file
Original file line number Diff line number Diff line change
@@ -47,6 +47,11 @@ open class YAxis: AxisBase
/// flag that indicates if the axis is inverted or not
@objc open var inverted = false

/// axis Y轴水平线，左边长线
@objc open var lineFirstSpace: CGFloat = 0.0;
/// axis Y轴水平线，右边长线
@objc open var lineLastSpace: CGFloat = 0.0;

/// flag that indicates if the zero-line should be drawn regardless of other grid lines
@objc open var drawZeroLineEnabled = false

3 changes: 3 additions & 0 deletions Source/Charts/Data/Implementations/Standard/BarChartDataEntry.swift
View file
Original file line number Diff line number Diff line change
@@ -30,6 +30,9 @@ open class BarChartDataEntry: ChartDataEntry
super.init()
}

/// 设置柱状图的线性渐变色
@objc public var linearGradientColors = [NSUIColor]()

/// Constructor for normal bars (not stacked).
public override init(x: Double, y: Double)
{
Loading