Add Elapsed Time to Timer #16
Merged
Conversation
This file contains 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
owenca
suggested changes
Dec 4, 2018
TimerView.cpp
Outdated
| @@ -5,7 +5,8 @@ | |||
| TimerView::TimerView() | |||
| : | |||
| BTextView("timer"), | |||
| fRunning(false) | |||
| fRunning(false), | |||
| elapsedTime(0) | |||
There was a problem hiding this comment.
Suggested change
| elapsedTime(0) | |
| fElapsedTime(0) |
There was a problem hiding this comment.
From Haiku Coding Guidelines:
TimerView.cpp
Outdated
| @@ -30,16 +31,17 @@ bool TimerView::Running() | |||
| void TimerView::Stop() | |||
| { | |||
| fRunning = false; | |||
| elapsedTime = Elapsed(); | |||
There was a problem hiding this comment.
Suggested change
| elapsedTime = Elapsed(); | |
| fElapsedTime = Elapsed(); |
TimerView.cpp
Outdated
| } | ||
|
|
||
| void TimerView::Pulse() | ||
| { | ||
| bigtime_t elapsed = Elapsed(); | ||
| bigtime_t elapsed = fRunning ? Elapsed() : elapsedTime; |
There was a problem hiding this comment.
Suggested change
| bigtime_t elapsed = fRunning ? Elapsed() : elapsedTime; | |
| bigtime_t elapsed = fRunning ? Elapsed() : fElapsedTime; |
TimerView.h
Outdated
| @@ -19,6 +19,7 @@ class TimerView : public BTextView { | |||
| private: | |||
| bool fRunning; | |||
| bigtime_t fStartTime; | |||
| int elapsedTime; | |||
There was a problem hiding this comment.
Suggested change
| int elapsedTime; | |
| int fElapsedTime; |
|
Hi! I have changed the code a little bit, since I found a simpler way to fix the issue. I was having problems with committing onto GitHub, but I recloned it and changed the code again, so now it works. Thanks! |
|
Thanks for making the fix even better! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes Issue #12