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

Fixed a duplicated assignment compared with obj-c code. #3179

Merged
merged 3 commits into from
Jan 23, 2018

Conversation

canapio
Copy link
Contributor

@canapio canapio commented Jan 14, 2018

No description provided.

@canapio canapio changed the title fixed duplicated assignment compared with obj-c code. Fixed duplicated assignment compared with obj-c code. Jan 14, 2018
@canapio canapio changed the title Fixed duplicated assignment compared with obj-c code. Fixed a duplicated assignment compared with obj-c code. Jan 14, 2018
@codecov-io
Copy link

codecov-io commented Jan 14, 2018

Codecov Report

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

Impacted file tree graph

@@            Coverage Diff            @@
##           master   #3179      +/-   ##
=========================================
- Coverage   22.99%   22.9%   -0.09%     
=========================================
  Files         116     116              
  Lines       15541   15602      +61     
  Branches      272     272              
=========================================
  Hits         3573    3573              
- Misses      11932   11993      +61     
  Partials       36      36
Impacted Files Coverage Δ
Source/Charts/Renderers/AxisRendererBase.swift 57.3% <0%> (-0.34%) ⬇️
Source/Charts/Charts/ChartViewBase.swift 22.61% <0%> (-0.05%) ⬇️
Source/Charts/Charts/HorizontalBarChartView.swift 0% <0%> (ø) ⬆️

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 0011c35...ef0ac25. Read the comment docs.

Copy link
Collaborator

@jjatie jjatie left a comment

Choose a reason for hiding this comment

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

Why is the .xcscheme changed at all?

@jjatie jjatie added this to the 3.1 milestone Jan 15, 2018
@canapio
Copy link
Contributor Author

canapio commented Jan 16, 2018

@jjatie thanks for reply. It’s my mistake. I removed the unnecessary changed file.

@@ -126,7 +126,7 @@ class LineChart1ViewController: DemoBaseViewController {
set1.valueFont = .systemFont(ofSize: 9)
set1.formLineDashLengths = [5, 2.5]
set1.formLineWidth = 1
set1.formLineWidth = 15
set1.formSize = 15
Copy link
Member

Choose a reason for hiding this comment

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

why set formSize here but not just delete it?

Copy link
Collaborator

Choose a reason for hiding this comment

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

The objective-c version sets formSize

Copy link
Member

Choose a reason for hiding this comment

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

oh I don't see it's swift controller.

@jjatie jjatie merged commit 9a1838a into ChartsOrg:master Jan 23, 2018
FreddyZeng added a commit to FreddyZeng/Charts that referenced this pull request Jan 25, 2018
* 'master' of https://github.com/danielgindi/Charts:
  Fixed a duplicated assignment compared with obj-c code. (ChartsOrg#3179)
  Updated README for 3.0.5 (ChartsOrg#3183)
  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)
kzyryanov pushed a commit to fishbrain/Charts that referenced this pull request Feb 20, 2018
* fixed duplicated assignment compared with obj-c code.
kalmurzayev pushed a commit to kalmurzayev/Charts that referenced this pull request Feb 26, 2018
* fixed duplicated assignment compared with obj-c code.
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
None yet
Development

Successfully merging this pull request may close these issues.

4 participants