Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Balloon Marker indicates position of data #3181

Merged
merged 3 commits into from
Jan 26, 2018
Merged

Conversation

jjatie
Copy link
Collaborator

@jjatie jjatie commented Jan 15, 2018

Reimplemented #1741

@jjatie jjatie added this to the 3.1 milestone Jan 15, 2018
@codecov-io
Copy link

codecov-io commented Jan 16, 2018

Codecov Report

Merging #3181 into master will decrease coverage by 0.03%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #3181      +/-   ##
==========================================
- Coverage   22.98%   22.95%   -0.04%     
==========================================
  Files         116      116              
  Lines       15542    15786     +244     
  Branches      272      282      +10     
==========================================
+ Hits         3573     3623      +50     
- Misses      11933    12127     +194     
  Partials       36       36
Impacted Files Coverage Δ
Source/Charts/Charts/HorizontalBarChartView.swift 0% <0%> (ø) ⬆️
Source/Charts/Charts/ChartViewBase.swift 24.16% <0%> (+1.51%) ⬆️

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 43ccf8e...fe7c08b. Read the comment docs.

x: rect.origin.x,
y: rect.origin.y))
context.fillPath()
if offset.y > 0 {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

code style :)

point.x -= size.width / 2.0
point.y -= size.height
return super.offsetForDrawing(atPoint: point)
var offset = self.offset
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So you just port the new marker for both Objc and Swift? Any new content based on #1741 ?
seems good to go

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yea, I didn't make any changes to what #1741 provided. Just wanted to get the example merged and the author wasn't responding.

@liuxuan30 liuxuan30 added this to To Do in 3.1 release Jan 23, 2018
@liuxuan30 liuxuan30 moved this from To Do to In progress in 3.1 release Jan 23, 2018
@liuxuan30 liuxuan30 moved this from In progress to Waiting CI in 3.1 release Jan 23, 2018
@liuxuan30 liuxuan30 merged commit c41d59b into master Jan 26, 2018
3.1 release automation moved this from Waiting CI to Done Jan 26, 2018
@jjatie jjatie deleted the balloon-marker-fix branch January 26, 2018 10:32
FreddyZeng added a commit to FreddyZeng/Charts that referenced this pull request Jan 31, 2018
* 'master' of https://github.com/danielgindi/Charts:
  Restored old performance (ChartsOrg#3216)
  Support other bundle than main MarkerView.viewFromXib() (ChartsOrg#3215)
  For ChartsOrg#2840. add dataIndex parameter in `highlightValue()` calls (ChartsOrg#2852)
  Balloon Marker indicates position of data (ChartsOrg#3181)
  bump Info.plist version
  BubbleChart uses correct colour for index now.

# Conflicts:
#	Source/Charts/Mark/BalloonMarker.swift
kzyryanov pushed a commit to fishbrain/Charts that referenced this pull request Feb 20, 2018
kalmurzayev pushed a commit to kalmurzayev/Charts that referenced this pull request Feb 26, 2018
FreddyZeng added a commit to FreddyZeng/Charts that referenced this pull request Mar 14, 2018
* master: (55 commits)
  Refactors -[tableView:cellForRowAtIndexPath:] (ChartsOrg#3326)
  fix ChartsOrg#3311. Need one more key for iOS 11 camera roll saving
  revert a mistake, fix ChartsOrg#3299
  add pie chart unit tests (ChartsOrg#3297)
  ChartsOrg#3287: align Objc and Swift demos balloon marker
  update changelog
  Min and Max reset when clearing ChartDataSet (Fixes ChartsOrg#3260)
  Restored old performance (ChartsOrg#3216)
  Support other bundle than main MarkerView.viewFromXib() (ChartsOrg#3215)
  For ChartsOrg#2840. add dataIndex parameter in `highlightValue()` calls (ChartsOrg#2852)
  Balloon Marker indicates position of data (ChartsOrg#3181)
  bump Info.plist version
  Fixed a duplicated assignment compared with obj-c code. (ChartsOrg#3179)
  Updated README for 3.0.5 (ChartsOrg#3183)
  BubbleChart uses correct colour for index now.
  Added custom text alignment for noData
  Fixes the distance issue between the legend and the horizontal bar chart (Fixes ChartsOrg#2138) (ChartsOrg#2214)
  call setNeedsDisplay() here to trigger render noDataText (ChartsOrg#3198)
  添加定制TY的Mark
  添加修改过的Mark到工程中
  ...

# Conflicts:
#	ICXCharts.podspec
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
3.1 release
  
Done
Development

Successfully merging this pull request may close these issues.

None yet

3 participants