This repository was archived by the owner on Dec 2, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 376
New TestBed App and multiple bug fixes/cleanups #295
Merged
Merged
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit
Hold shift + click to select a range
59f25dd
Add encoder/decoder for BEMLineGraph properties
mackworth 9bfe179
Add Types to all Arrays
mackworth 7823735
Create new TestBed app to manipulate almost all parameters
mackworth 7dc9f3a
Add colors, gradients, and alphas to TestBed
mackworth 78c8cac
Fix assorted bugs in BEMSimpleLineGraph, especially null-data related
mackworth a10ad12
Allow use on iPhone and Split View
mackworth 1169854
Fix bug with TouchLineInput color (doesn't change after initial setting)
mackworth 019aa1e
Bug fixes:
mackworth 0e33b98
Requested changes to PR 3295
mackworth c107658
Further fixes for more substantive comments on PR #295
mackworth e69998a
Add "Graph" button to Compact devices
mackworth 212058f
Update .travis.yml
Boris-Em 3dd033d
Remove unuseful breaking test
Boris-Em b2aff57
Merge pull request #1 from Boris-Em/PR295
mackworth fa2c33e
Fix space nit in comment
mackworth 2072327
Merge remote-tracking branch 'origin/feature' into feature
mackworth e1c6fd6
Ensure circleDots always same length as dataPoints
mackworth File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -487,6 +487,10 @@ IB_DESIGNABLE @interface BEMSimpleLineGraphView : UIView <UIGestureRecognizerDel | |
| @return The minimum value of the Y-Axis. */ | ||
| - (CGFloat)minValueForLineGraph:(BEMSimpleLineGraphView *)graph; | ||
|
|
||
| /** Optional method to set the average value for the Average line. If not implemented, the value will be the average point of the graph. | ||
| @param graph The graph object requesting the minimum value. | ||
| @return The average value of the Y-Axis. */ | ||
| - (CGFloat)averageValueForLineGraph:(BEMSimpleLineGraphView *)graph; | ||
|
|
||
| /** Optional method to control whether a label indicating NO DATA will be shown while number of data is zero | ||
| @param graph The graph object for the NO DATA label | ||
|
|
@@ -516,7 +520,7 @@ IB_DESIGNABLE @interface BEMSimpleLineGraphView : UIView <UIGestureRecognizerDel | |
| @param graph The graph object requesting the padding value. | ||
| @param popupView The popup view owned by the graph that needs to be modified | ||
| @param index The index of the element associated with the popup view */ | ||
| - (void)lineGraph:(BEMSimpleLineGraphView *)graph modifyPopupView:(UIView *)popupView forIndex:(NSUInteger)index __unavailable; | ||
| - (void)lineGraph:(BEMSimpleLineGraphView *)graph modifyPopupView:(UIView *)popupView forIndex:(NSUInteger)index; | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Potential misunderstanding here... why has this been marked as available again?
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Hmm, never saw it as unavailable. Why was it taken out? How are you supposed to use the custom Popup if it stays the same on every point? |
||
|
|
||
|
|
||
| //----- TOUCH EVENTS -----// | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The comment for the graph parameter is not correct.