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.

Sign up for GitHub

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

Jump to bottom

Stop axis labels duplicating. #315 [Pending squash and cleanup] #640

Closed
wants to merge 13 commits into from
Closed

Stop axis labels duplicating. #315 [Pending squash and cleanup] #640

wants to merge 13 commits into from

Conversation

noais
Copy link
Contributor

@noais noais commented Dec 31, 2015

No description provided.

noais and others added 12 commits September 22, 2015 23:43
@noais
Repeated line removed from example
b84df21
@noais
adding MaximumScaleX
bbf7251
@noais
Repeated line removed from example
0576dd1 
adding MaximumScaleX
@noais
Merge branch 'master' of https://github.com/noais/ios-charts
944a5f6 
* 'master' of https://github.com/noais/ios-charts:
  adding MaximumScaleX
  Repeated line removed from example
Merge commit 'bf7d7ff729c417b414059933c8b44b877e365743'
e34dfbd 
* commit 'bf7d7ff729c417b414059933c8b44b877e365743':
  Update README.md
  be explicit on how to install 'Charts' when using CocoaPods since there is another Pod called 'ios-charts'
@avishaan
be explicit on how to install 'Charts' when using CocoaPods since
1721089 
there is another Pod called 'ios-charts'
@noais
Repeated line removed from example
2c9d0a2 
adding MaximumScaleX
@danielgindi
Update README.md
f656578
Merge remote-tracking branch 'origin/master'
eb38549
@noais
Bug fix setMaximumScaleY should be setMaximumScaleX
b01fa5d
Merge branch 'master' of https://github.com/noais/ios-charts
f1005f0 
# By Daniel Cohen Gindi (1) and david ferreira (1)
# Via david ferreira
* 'master' of https://github.com/noais/ios-charts:
  Bug fix setMaximumScaleY should be setMaximumScaleX
  Update README.md
Merge commit '3f88894f31683888862cf14312db74b05c1a0101'
7f0010b 
* commit '3f88894f31683888862cf14312db74b05c1a0101': (84 commits)
  Bar chart tests
  Make getBarBounds callable from Objective-C code (Fixes #570)
  round the float value before we cast to Int
  Update README.md
  Bumped to 2.1.6
  Fixed possible out-of-bounds exception when no ranges are present
  fix Scroll issue when the graph is in a UITableView
  Fixed (again...) the highlight vs. drag issue (Closes #520, closes #521)
  Update README.md
  Updated test snapshots for latest x-axis label offset changes
  A comment on how to record in tests
  Removed extraneous "y" (#512)
  Carthage folders should be ignored
  Implemented support for rotated labels on the x-axis
  Support for customizing description text position (Fixed #512)
  Match code styling to new-line brackets
  Adds test support without cocoapods
  Fixed conditions for hasNoDragOffset (Fixes #499, fixes #498)
  update targets to build framework with same name
  Fixed drag offset panning bug
  ...
danielgindi
danielgindi reviewed Jan 3, 2016
View reviewed changes
Charts/Classes/Renderers/ChartYAxisRenderer.swift
@@ -70,6 +70,9 @@ public class ChartYAxisRenderer: ChartAxisRendererBase

let rawInterval = range / Double(labelCount)
var interval = ChartUtils.roundToNextSignificant(number: Double(rawInterval))
if(!_yAxis.allowRepeatedValues){
Copy link
Collaborator

Choose a reason for hiding this comment

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

Please match the code styling of the library

@danielgindi
Copy link
Collaborator

Friend, all of this should be in a single commit, there's too much noise. Please squash it :-)

@danielgindi danielgindi changed the title Stop axis labels duplicating. #315 Stop axis labels duplicating. #315 [Pending squash and cleanup] Jan 3, 2016
@noais
Copy link
Contributor Author

noais commented Jan 4, 2016

@danielgindi I made the changes you ask,
But about the squash I have some problems, my log is:

commit 8885bfa98936a6c1f0c166c2923cada05dc435e0
Merge: 7f0010b cbe0bac
Author: David Miguel Vicente Ferreira <david.viceteferreira@gmail.com>
Date:   Wed Dec 30 08:51:49 2015 +0000

    Stop axis labels duplicating.

commit cbe0bac08b0f7a2df43dc38e921c4609f29e3450
Merge: da03c94 d02783a
Author: Daniel Cohen Gindi <Danielgindi@gmail.com>
Date:   Wed Dec 30 07:56:28 2015 +0200

    Merge pull request #605 from skywinder/add-change-log-file

    Add change log file.

In the source tree is:

screen shot 2016-01-04 at 00 46 32
And in this pull request I have 13 commits. What i'm doing wrong? Why on github appears so many commits?

@noais noais mentioned this pull request Jan 4, 2016
Closed
@noais noais closed this Jan 4, 2016
@liuxuan30
Copy link
Member

I think you can click on "Merge pull request #605 from skywinder/add-change-log-file" from your screen shot to rebase/squash interactively using sourceTree. Just create a test project to pratice some. copy-past code sometimes will have unexpected errors.

If you are using SourceTree, you could right click the latest commit, Rebase, and let it rebase the code on the latest commit.
In order to squash, you need to right click the commit before your first commit, and Rebase Interactively. There you have a squash option :-)

@noais
Copy link
Contributor Author

noais commented Jan 5, 2016

The problem was my master wasn't synchronised with the origin.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@noais @danielgindi @liuxuan30 @avishaan