All Charts Icons Support Swift3 [Dub #629, #624, #1261] #1793

abjurato · 2016-11-06T09:17:18Z

Finally, implemented Icons (Nodal Image) feature for all charts and updated to Swift3.

I've chosen to store image in data parameter of ChartDataEntry to allow icons to be specified per-value (example of use: to sign personal records in running application). Dataset can specify if it will draw icons and customise offset from default placement. IconOffset is CGSize, but for radial Radar and Pie only height value matters — as distance from centre.

ChartBaseDataSet, IChartDataSet:

drawIconsEnabled:Bool flag and isDrawIconsEnabled() accessor for it
iconsOffset:CGSize which allows to influence at placement of icon on chart in relation to value's text (wether it is visible or not)

ChartUtils:

drawImage(context:CGContext, image:NSUIImage, point:CGPoint, expectedSize:CGSize, offset:CGSize) - draws image in context

All xxxChartRenderers:

code to draw icon (if data set's isDrawIconsEnabled and image is included to entry's data) in drawValues() method

BarChartDataEntry:

initialiser for stacked bar with data parameter — one data for whole stack

Demos: included star image to project, for stacked bar, pie, line, candle stick, bubble, bar and horizontal bar added Toggle Icon button and star to be drawn.

…consEnabled() and var iconOffset

…a property and dataset allows

ghost · 2016-11-06T12:25:37Z

Okay, how do I fix these checks to be green? On my mac everything is built successfully for all platforms (iOS, OSX, tvOS)

liuxuan30 · 2016-11-07T01:33:55Z

@AnatolyRosencrantz update the test cases? In setup add record = true from ##500
@petester42 could help

ghost · 2016-11-07T07:27:23Z

I've already generated those test images, put them to appropriate Tests/ReferenceImages_64/ folders (which is the only place I've found other test images). By some reason FBSnapshotTestCase was saving them under /Library/Developer/Xcode/DerivedData by default, btw.

anfriis · 2016-11-09T14:45:50Z

Really looking forward to this! :)

ghost · 2016-11-09T16:12:42Z

Guys, does somebody know where travis expects FBSnapshotTestCase's images to be? There are dozen of folders called "Tests" in project's directory

pmairoldi · 2016-11-09T16:14:40Z

You don't have to move anything anywhere. When you record the tests they images will be placed in the right place. The setting for the path is an environment variable in the test scheme.

farazhaider88 · 2016-11-10T10:28:09Z

any update on this ??

ghost · 2016-11-10T11:19:33Z

@farazhaider88 fighting with Travis to accept pr

codecov-io · 2016-11-10T11:56:30Z

Current coverage is 18.80% (diff: 28.11%)

Merging #1793 into master will increase coverage by 0.13%

@@             master      #1793   diff @@
==========================================
  Files           124        124          
  Lines         14083      14239   +156   
  Methods           0          0          
  Messages          0          0          
  Branches          0          0          
==========================================
+ Hits           2629       2677    +48   
- Misses        11454      11562   +108   
  Partials          0          0

Powered by Codecov. Last update 5d9c81a...ccaa966

liuxuan30 · 2016-11-11T05:02:53Z

all pass! @danielgindi seems we can put this higher priority?

anfriis · 2016-11-18T09:01:12Z

I tried out the pull request in my project and I am having trouble aligning the icons in the center of the chart piece. I have tried some different values for the iconOffset but it doesn't help.

# Conflicts: # Charts.xcodeproj/project.pbxproj

ghost · 2016-11-19T16:06:47Z

@Anders123fr, fixed that incorrect misplacement. So in case of Pie chart iconOffset's x value stands for distance from center, so it should be 0 if you want icon's center to be placed where value's text is drawn by default. Could you check again and confirm if everything works as expected?

anfriis · 2016-11-21T09:02:58Z

Awesome, you just made my day!
It works perfectly, and i am able to adjust how close the icon should be to the center of the pie chart using the height of the iconOffset.
The screenshot shows a chart with iconOffset set to CGSize(width: 0, height: -10)

Thank you!

danielgindi · 2016-11-21T10:50:51Z

This is getting better, and it seems like people are enjoying it :-)
I hope to get sometime to take a closer look soon, merge it, and port to Android

AntonioFM92 · 2016-11-25T12:44:58Z

Why can't I see the file changed when I download this project from master? thanks

ghost · 2016-11-28T09:13:14Z

@AntonioFM92 cuz it was not merged to master yet

MrMage · 2016-12-05T13:33:13Z

This just saved me a ton of work (was going to implement this my self), thanks a ton!

One question, though: Is it possible in a pie chart view to render the icons below the label text so that the two don't overlap? As was said before, at the moment, changing the offset draws the labels further outside rather than below.

…(in addition to distance from center)

ghost · 2016-12-05T19:47:05Z

@MrMage pushed a fix. Now iconsOffset for Pie and Radar charts represents (vertical offset; distance form center offset).

So if you want icon to be rendered below the value text label, you should use something like CGSize(width: 15, height: 0).
If you want icon to be rendered closer to center, you should use something like CGSize(width: 0, height: -15).
Sure, you can combine these two things like CGSize(15, -15) and icon will be 15 points below text label and 15 points closer to center. Looks strange, as for me, but legit.

ghost · 2016-12-12T07:32:27Z

@danielgindi still not a time? :)

sashalondon · 2017-02-05T20:51:08Z

Is this not going to be in the main release?

liuxuan30 · 2017-02-13T01:31:37Z

I believe they are busy :(

danielgindi · 2017-02-20T06:48:57Z

Yeah time is precious, but the good news is I'm working on this one :-)
You haven't by any chance coded this for Android yet, have you?

danielgindi · 2017-02-20T06:55:15Z

There are a few coding style inconsistencies, but I'm not going to bug you about them right now; It's in the best interest of the users that we don't introduce any extra delays for this right now.

I'm actually surprised on how clean and little code this PR is, which means you understand how the library works.

danielgindi · 2017-02-20T06:56:15Z

There are a few bugs to polish though

jainrohit2292 · 2017-03-27T11:53:02Z

I have updated my pods - pod update Charts but I can't find any property or method related to icon such as drawIconsEnabled

askielboe · 2017-03-27T11:58:34Z

This pull request hasn't been released yet.

To use non-released features on the master branch you can install using:

pod 'Charts', :git => 'git@github.com:danielgindi/Charts.git', :branch => 'master'

sashalondon · 2017-04-13T22:20:23Z

Any advice I have tried pod update and also askeilboe's advice but still cannot see this? I am using swift.
pod 'Charts', :git => 'git@github.com:danielgindi/Charts.git', :branch => 'master'

* added test image to demo project * all datasets via superclass: added var drawIconsEnabled, func isDrawIconsEnabled() and var iconOffset * utils: drawImage(context:image:point:expectedSize:offset:) * all renderers are drawing icon image if it is stored in entitie's data property and dataset allows * some demos updated to toggle icons * unit tests * fix: misplacement of icon. Now icon is drawn correctly centered. * allow to make vertical-only offset for icons on Pie and Radar charts (in addition to distance from center) * drawBottomYLabelEntryEnabled (Closes ChartsOrg#1006) * resetZoom() (Closes ChartsOrg#1179) * Correctly position 0 in stacked bar (Closes ChartsOrg#1195, #closes ChartsOrg#1191) * Update "Usage" section of README Updates README.md to reflect changes made to "Build Options" in Xcode 8.2+. * Removed embedded Realm leftover from repo * Use realm-cocoa 2.1.1 for ObjectiveCSupport (Closes ChartsOrg#898, resolves ChartsOrg#1594) * Updated project settings * Add support for extensions * Fix NSCopying implementation in CandleChartDataEntry * Update RealmSwift Dependency * update configurations for xcode 8.2 * fix a typo, as orientation is horizontal by default * close ChartsOrg#2066 * update rakefile for ios 10.x simulators * Adds NSPhotoLibraryUsageDescription to plist of ChartsDemo to prevent crash on iOS 10 on try to store shot of char to photo library. * 'backgroundColor' is inaccessible due to 'internal' protection level on mac OS X ChartsOrg#2135 * Fixes index out of range crash. * add github token to .travis.yml to fix builds? * Code styling * Fixed dependency of drawing values on isDrawIconsEnabled * CGPoint is more appropriate here * Do not repeat the scaling procedure if we can cache it * Docs * Deprecated weird constructor * Use a designated icon property and constructors * More refactoring to icons drawing * Disabled icons by default in examples * Fixes for icon tests * Reverted basic test images from pr (ChartsOrg#1793) * Improved feb29 formula * Fixed the inconsistency of AxisMax and AxisMin When enabled autoScale. `data.calcMinMaxY(fromX: self.lowestVisibleX, toX: self.highestVisibleX)` is called after ` _leftYAxisRenderer?.computeAxis(min: _leftAxis._axisMinimum, max: _leftAxis._axisMaximum, inverted: _leftAxis.isInverted)` `_rightYAxisRenderer?.computeAxis(min: _rightAxis._axisMinimum, max: _rightAxis._axisMaximum, inverted: _rightAxis.isInverted)` `_xAxisRenderer?.computeAxis(min: _xAxis._axisMinimum, max: _xAxis._axisMaximum, inverted: false)` that means _leftAxisRenderer and _rightAxisRenderer will render AxisLines and Values based on old values of _axisMinimum, _axisMaximum * Tell Travis to wait more time when building carthage * Always respect isEnabled * Consider _yAxis.isDrawLimitLinesBehindDataEnabled for radar chart * Updated to use Realm version 2.4.3 * fix Xcode 8.3 compiler warnings * loosen realm version requirement * Updated build-dependencies.sh * Remove line width minimum constraint * Moved Realm stuff to https://github.com/danielgindi/ChartsRealm * Added @discardableResult to silence warnings when it’s safe to ignore result * gitignore updates * Removed unrequited script * v3.0.2 * Removed leftover scheme * Removed leftover script from the combined Realm era * Converted swift 3.0 DBL_MIN leftover

Anatoly Rosencrantz and others added 5 commits November 3, 2016 17:05

added test image to demo project

dc1d1b2

all datasets via superclass: added var drawIconsEnabled, func isDrawI…

7bc0835

…consEnabled() and var iconOffset

utils: drawImage(context:image:point:expectedSize:offset:)

b64fa1b

all renderers are drawing icon image if it is stored in entitie's dat…

5161890

…a property and dataset allows

some demos updated to toggle icons

fbba515

abjurato mentioned this pull request Nov 6, 2016

All Charts Icons Support [Dub #629, #624] #1261

Closed

ghost force-pushed the icons3 branch 4 times, most recently from 56a8712 to fbba515 Compare November 10, 2016 09:38

unit tests

574813b

ghost force-pushed the icons3 branch from 86b5823 to fbba515 Compare November 10, 2016 11:22

farazhaider88 approved these changes Nov 10, 2016

View reviewed changes

abjurato added 2 commits November 19, 2016 17:55

fix: misplacement of icon. Now icon is drawn correctly centered.

3784b31

Merge branch 'master' into icons3

ebfb1dc

# Conflicts: # Charts.xcodeproj/project.pbxproj

allow to make vertical-only offset for icons on Pie and Radar charts …

ccaa966

…(in addition to distance from center)

liuxuan30 mentioned this pull request Dec 8, 2016

How to achieve this effect? #1918

Closed

danielgindi mentioned this pull request Feb 20, 2017

Entry cons in all chart types PhilJay/MPAndroidChart#2825

Merged

danielgindi merged commit ccaa966 into ChartsOrg:master Feb 20, 2017

danielgindi added a commit that referenced this pull request Feb 20, 2017

Reverted basic test images from pr (#1793)

9288c2c

liuxuan30 mentioned this pull request Mar 27, 2017

place image at top of each bar in bar graph #2271

Closed

liuxuan30 mentioned this pull request May 3, 2017

PieChart with Image Value #2328

Closed

liuxuan30 mentioned this pull request Jun 30, 2017

How to show LineChart with icon #2566

Closed

PeterSrost pushed a commit to sokol8/Charts that referenced this pull request Oct 31, 2018

Reverted basic test images from pr (ChartsOrg#1793)

1da9ff5

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

All Charts Icons Support Swift3 [Dub #629, #624, #1261] #1793

All Charts Icons Support Swift3 [Dub #629, #624, #1261] #1793

abjurato commented Nov 6, 2016

ghost commented Nov 6, 2016 •

edited by ghost

Loading

liuxuan30 commented Nov 7, 2016 •

edited

Loading

ghost commented Nov 7, 2016

anfriis commented Nov 9, 2016

ghost commented Nov 9, 2016

pmairoldi commented Nov 9, 2016

farazhaider88 commented Nov 10, 2016

ghost commented Nov 10, 2016

codecov-io commented Nov 10, 2016 •

edited

Loading

liuxuan30 commented Nov 11, 2016

anfriis commented Nov 18, 2016

ghost commented Nov 19, 2016

anfriis commented Nov 21, 2016

danielgindi commented Nov 21, 2016

AntonioFM92 commented Nov 25, 2016

ghost commented Nov 28, 2016

MrMage commented Dec 5, 2016

ghost commented Dec 5, 2016

ghost commented Dec 12, 2016

sashalondon commented Feb 5, 2017 •

edited

Loading

liuxuan30 commented Feb 13, 2017

danielgindi commented Feb 20, 2017 •

edited by liuxuan30

Loading

danielgindi commented Feb 20, 2017 •

edited

Loading

danielgindi commented Feb 20, 2017

jainrohit2292 commented Mar 27, 2017

askielboe commented Mar 27, 2017

sashalondon commented Apr 13, 2017

All Charts Icons Support Swift3 [Dub #629, #624, #1261] #1793

All Charts Icons Support Swift3 [Dub #629, #624, #1261] #1793

Conversation

abjurato commented Nov 6, 2016

ghost commented Nov 6, 2016 • edited by ghost Loading

liuxuan30 commented Nov 7, 2016 • edited Loading

ghost commented Nov 7, 2016

anfriis commented Nov 9, 2016

ghost commented Nov 9, 2016

pmairoldi commented Nov 9, 2016

farazhaider88 commented Nov 10, 2016

ghost commented Nov 10, 2016

codecov-io commented Nov 10, 2016 • edited Loading

Current coverage is 18.80% (diff: 28.11%)

liuxuan30 commented Nov 11, 2016

anfriis commented Nov 18, 2016

ghost commented Nov 19, 2016

anfriis commented Nov 21, 2016

danielgindi commented Nov 21, 2016

AntonioFM92 commented Nov 25, 2016

ghost commented Nov 28, 2016

MrMage commented Dec 5, 2016

ghost commented Dec 5, 2016

ghost commented Dec 12, 2016

sashalondon commented Feb 5, 2017 • edited Loading

liuxuan30 commented Feb 13, 2017

danielgindi commented Feb 20, 2017 • edited by liuxuan30 Loading

danielgindi commented Feb 20, 2017 • edited Loading

danielgindi commented Feb 20, 2017

jainrohit2292 commented Mar 27, 2017

askielboe commented Mar 27, 2017

sashalondon commented Apr 13, 2017

ghost commented Nov 6, 2016 •

edited by ghost

Loading

liuxuan30 commented Nov 7, 2016 •

edited

Loading

codecov-io commented Nov 10, 2016 •

edited

Loading

sashalondon commented Feb 5, 2017 •

edited

Loading

danielgindi commented Feb 20, 2017 •

edited by liuxuan30

Loading

danielgindi commented Feb 20, 2017 •

edited

Loading