Added value text rotation #2200

chinh-tran · 2017-02-25T18:20:52Z

I've implemented the option to rotate value texts, which looks like below:

Usage:

let ds = LineChartDataSet(values: yse1, label: "Hello")
ds.valueRotationAngle = 270.0

There is a new attribute in IChartDataSet:

var valueRotationAngle: CGFloat { get set }

and ChartBaseDataSet:

open var valueRotationAngle: CGFloat = CGFloat(0.0)

In order to rotate the values, I'm reusing the drawText function in ChartUtils, which is already being used to rotate the labels:

open func drawText(_ text: String, at point: CGPoint, anchor: CGPoint, angleRadians: CGFloat, attributes: [NSAttributedStringKey : Any]?)

codecov-io · 2017-02-25T19:51:03Z

Codecov Report

Merging #2200 into 4.0.0 will increase coverage by 0.2%.
The diff coverage is 48%.

@@            Coverage Diff            @@
##            4.0.0    #2200     +/-   ##
=========================================
+ Coverage   29.98%   30.18%   +0.2%     
=========================================
  Files         116      116             
  Lines       13197    13252     +55     
=========================================
+ Hits         3957     4000     +43     
- Misses       9240     9252     +12

Impacted Files	Coverage Δ
...Charts/Data/Implementations/ChartBaseDataSet.swift	`13.86% <ø> (ø)`	⬆️
.../Charts/Renderers/HorizontalBarChartRenderer.swift	`0% <0%> (ø)`	⬆️
Source/Charts/Renderers/BubbleChartRenderer.swift	`0% <0%> (ø)`	⬆️
...ce/Charts/Renderers/CandleStickChartRenderer.swift	`0% <0%> (ø)`	⬆️
Source/Charts/Renderers/RadarChartRenderer.swift	`0% <0%> (ø)`	⬆️
Source/Charts/Renderers/ScatterChartRenderer.swift	`0% <0%> (ø)`	⬆️
Source/Charts/Renderers/LineChartRenderer.swift	`56.34% <100%> (+0.11%)`	⬆️
Source/Charts/Renderers/PieChartRenderer.swift	`52.61% <30%> (-0.3%)`	⬇️
Source/Charts/Renderers/BarChartRenderer.swift	`53.58% <57.89%> (+0.16%)`	⬆️
Source/Charts/Utils/ChartUtils.swift	`60.2% <95%> (+12.86%)`	⬆️
... and 1 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 73183d5...aadc3a8. Read the comment docs.

jjatie · 2018-01-23T10:35:25Z

@chinh-tran are you able to rebase on master?

chinh-tran · 2018-01-23T11:54:09Z

@jjatie yes, rebase done :)

liuxuan30 · 2018-02-16T01:59:07Z

if this is a good feature to have, let's target 4.0 branch?
master branch currently won't accept any feature PRs until 3.1 is released.
You better switch to 4.0 branch for merging. Thanks you :)

jjatie · 2018-02-21T00:02:34Z

I think this is good for 4.0
@chinh-tran Thank you for your work. I'm sorry to ask this of you again, but can you please rebase on 4.0.0 and change the PR target to 4.0.0?
We can merge it in right away then and you won't have to keep updating the PR.

chinh-tran · 2018-02-22T19:59:16Z

Alright, I replayed the changes onto 4.0.0.

jjatie · 2018-03-11T16:16:11Z

Source/Charts/Data/Implementations/ChartBaseDataSet.swift

@@ -302,6 +302,9 @@ open class ChartBaseDataSet: NSObject, ChartDataSetProtocol
    /// the font for the value-text labels
    open var valueFont: NSUIFont = NSUIFont.systemFont(ofSize: 7.0)

+    /// the rotation angle for value-text labels


Please change to "The rotation angle (in degrees) for value-text labels

If you change it in the protocol, you can delete the documentation comment here and Xcode will use the one from the protocol.

jjatie · 2018-03-11T16:16:25Z

Source/Charts/Data/Implementations/ChartBaseDataSet.swift

@@ -302,6 +302,9 @@ open class ChartBaseDataSet: NSObject, ChartDataSetProtocol
    /// the font for the value-text labels
    open var valueFont: NSUIFont = NSUIFont.systemFont(ofSize: 7.0)

+    /// the rotation angle for value-text labels
+    open var valueRotationAngle: CGFloat = CGFloat(0.0)


valueLabelAngle

jjatie · 2018-03-11T16:16:42Z

Source/Charts/Data/Interfaces/ChartDataSetProtocol.swift

@@ -200,6 +200,9 @@ public protocol ChartDataSetProtocol
    /// the font for the value-text labels
    var valueFont: NSUIFont { get set }

+    /// the rotation angle for value-text labels
+    var valueRotationAngle: CGFloat { get set }


valueLabelAngle

jjatie · 2018-03-11T16:19:28Z

Source/Charts/Utils/ChartUtils.swift

@@ -209,6 +207,21 @@ extension CGContext {
        NSUIGraphicsPopContext()
    }

+    func getDrawPoint(text: String, point: CGPoint, align: NSTextAlignment, attributes: [NSAttributedStringKey : Any]?) -> CGPoint


private func

jjatie · 2018-03-11T16:27:44Z

Source/Charts/Renderers/BarChartRenderer.swift

+        {
+            // align left to center text with rotation
+            context.drawText(value, at: CGPoint(x: xPos, y: yPos), align: align, anchor: anchor,
+                             angleRadians: angleRadians, attributes: [.font: font, .foregroundColor: color])


no line break please

jjatie · 2018-03-15T01:41:10Z

Ah! Sorry, I thought I had submitted this review ages ago. @chinh-tran please take a look

chinh-tran · 2018-03-16T11:06:38Z

@jjatie It's updated now, however the CI build is failing but it's not related to this PR I guess.

jjatie · 2018-03-16T11:37:42Z

No, it’s my fault. I moved 4.0.0 to swift 4.1 and forgot to update the Travis script. It’s done in a different branch atm, but @liuxuan30 is busy this week. I’ll let you know when it’s merged.

liuxuan30 · 2018-03-20T02:05:59Z

@jjatie I'm seeing many PRs you updated and many conflicts. Is this caused by new commits on 4.0 branch?

jjatie · 2018-03-20T02:12:29Z

@liuxuan30 4.0.0 is updated for Swift 4.1, but I forgot to update the travis ci file. It's updated in the top ticket in the 4.0 project, so when that's merged everything will be good to go again.

liuxuan30 · 2018-03-20T02:16:22Z

Can you send me the link. I didn't see a similar one neither in More Swift nor 4.0 project

yuldong · 2019-03-25T08:42:42Z

would love to see in this feature in master，is there any plan on master to archive this?

chinh-tran closed this Feb 25, 2017

chinh-tran reopened this Feb 25, 2017

chinh-tran mentioned this pull request Sep 7, 2017

Value text rotation #2181

Open

liuxuan30 requested a review from danielgindi September 12, 2017 01:53

jjatie added the needs rebase label Jan 23, 2018

chinh-tran force-pushed the master branch from 1cf837c to 417379a Compare January 23, 2018 11:43

jjatie added this to the 4.0.0 milestone Feb 21, 2018

jjatie added the ★★★ label Feb 21, 2018

ctran added 3 commits February 21, 2018 19:03

Add option to rotate value text for line charts

ef21083

Add value text rotation for bar charts

5a1a46e

Add value text rotation for other charts

31f7ad5

chinh-tran force-pushed the master branch from b8cf084 to 31f7ad5 Compare February 22, 2018 19:57

chinh-tran changed the base branch from master to 4.0.0 February 22, 2018 19:57

liuxuan30 requested review from liuxuan30 and jjatie February 23, 2018 02:38

jjatie reviewed Mar 15, 2018

View reviewed changes

Chinh Tran added 2 commits March 15, 2018 15:57

Rename valueRotationAngle -> valueLabelAngle

ea87d1f

Make function private & remove line break

66cd435

Merge branch '4.0.0' into master

aadc3a8

pmairoldi removed the needs rebase label Jul 14, 2018

pmairoldi merged commit 1d44ab3 into ChartsOrg:4.0.0 Jul 14, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added value text rotation #2200

Added value text rotation #2200

chinh-tran commented Feb 25, 2017 •

edited

Loading

codecov-io commented Feb 25, 2017 •

edited

Loading

jjatie commented Jan 23, 2018

chinh-tran commented Jan 23, 2018

liuxuan30 commented Feb 16, 2018 •

edited

Loading

jjatie commented Feb 21, 2018

chinh-tran commented Feb 22, 2018

jjatie Mar 11, 2018

jjatie Mar 11, 2018

jjatie Mar 11, 2018

jjatie Mar 11, 2018

jjatie Mar 11, 2018

jjatie Mar 11, 2018

jjatie commented Mar 15, 2018

chinh-tran commented Mar 16, 2018

jjatie commented Mar 16, 2018

liuxuan30 commented Mar 20, 2018

jjatie commented Mar 20, 2018

liuxuan30 commented Mar 20, 2018

yuldong commented Mar 25, 2019

Added value text rotation #2200

Added value text rotation #2200

Conversation

chinh-tran commented Feb 25, 2017 • edited Loading

codecov-io commented Feb 25, 2017 • edited Loading

Codecov Report

jjatie commented Jan 23, 2018

chinh-tran commented Jan 23, 2018

liuxuan30 commented Feb 16, 2018 • edited Loading

jjatie commented Feb 21, 2018

chinh-tran commented Feb 22, 2018

jjatie Mar 11, 2018

Choose a reason for hiding this comment

jjatie Mar 11, 2018

Choose a reason for hiding this comment

jjatie Mar 11, 2018

Choose a reason for hiding this comment

jjatie Mar 11, 2018

Choose a reason for hiding this comment

jjatie Mar 11, 2018

Choose a reason for hiding this comment

jjatie Mar 11, 2018

Choose a reason for hiding this comment

jjatie commented Mar 15, 2018

chinh-tran commented Mar 16, 2018

jjatie commented Mar 16, 2018

liuxuan30 commented Mar 20, 2018

jjatie commented Mar 20, 2018

liuxuan30 commented Mar 20, 2018

yuldong commented Mar 25, 2019

chinh-tran commented Feb 25, 2017 •

edited

Loading

codecov-io commented Feb 25, 2017 •

edited

Loading

liuxuan30 commented Feb 16, 2018 •

edited

Loading