Timeline: fix low zoom limit for huge simultion tmes - prevent crashe… #583
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
…s and blank screen
enhance max zoom levels to 1sec/pixel, for event activity on secnds scale
* if suimulation time to huge on current zoom level, try adjust to higher zoom, keeping timeline still functional.
pjonsson
reviewed
Oct 3, 2022
| final long focusTime, | ||
| final double focusCenter) { | ||
| currentPixelDivisor = zoomDivisor; | ||
| final double focusCenter) |
There was a problem hiding this comment.
Keep the opening brace where it was (this is how almost all code in Cooja is formatted).
pjonsson
reviewed
Oct 3, 2022
| long now = simulation.getSimulationTime(); | ||
| if (now/zoomDivisor > Integer.MAX_VALUE) { | ||
| // limit zoom to fits sim-time in timeline | ||
| int min_level = zoomGetLevel( now/Integer.MAX_VALUE ); |
There was a problem hiding this comment.
Other variables use camelCase for naming, and remove the space before/after the method argument.
pjonsson
reviewed
Oct 3, 2022
|
|
||
| long now = simulation.getSimulationTime(); | ||
| if (now/zoomDivisor > Integer.MAX_VALUE) { | ||
| // limit zoom to fits sim-time in timeline |
There was a problem hiding this comment.
Use the same indentation size as the rest of the file, in this file the code uses 2 spaces.
pjonsson
reviewed
Oct 3, 2022
| @@ -604,6 +616,8 @@ private void zoomFinish (final double zoomDivisor, | |||
| if (zoomDivisor != currentPixelDivisor) { | |||
| logger.info("Zoom level: adjusted out-of-range " + zoomDivisor + " us/pixel"); | |||
| } | |||
|
|
|||
| if (note != "") | |||
| logger.info("Zoom level: " + currentPixelDivisor + " microseconds/pixel " + note); | |||
There was a problem hiding this comment.
I thought I removed the noise in commit 83c13a9, just remove this line instead of making it conditional.
pjonsson
reviewed
Oct 3, 2022
| @@ -124,7 +124,9 @@ public class TimeLine extends VisPlugin implements HasQuickHelp { | |||
| private static final long[] ZOOM_LEVELS = { | |||
| 1, 2, 5, 10, | |||
| 20, 50, 100, 200, 500, 1000, | |||
| 2000, 5000, 10000, 20000, 50000, 100000 }; | |||
| 2000, 5000, 10000, 20000, 50000, 100000, | |||
| 100000*2, 100000*5, 100000*10 | |||
There was a problem hiding this comment.
Is the crash related to zoom levels not containing enough values, or is this change for usability?
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.
Timeline: fix low zoom limit for huge simultion tmes - prevent crashes and blank screen