| .. | .. |
|---|
| 10 | 10 | public List<Long> tics; |
|---|
| 11 | 11 | private static final TimeUnit[] units = |
|---|
| 12 | 12 | { |
|---|
| 13 | | - TimeUnit.YEAR, TimeUnit.MONTH, TimeUnit.DAY, TimeUnit.HOUR, TimeUnit.MINUTE, TimeUnit.SECOND |
|---|
| 13 | + TimeUnit.YEAR, TimeUnit.MONTH, TimeUnit.DAY, TimeUnit.HOUR, TimeUnit.MINUTE, TimeUnit.SECOND, TimeUnit.REALTIME |
|---|
| 14 | 14 | }; |
|---|
| 15 | 15 | private static final TimeUnit[] histUnits = |
|---|
| 16 | 16 | { |
|---|
| .. | .. |
|---|
| 20 | 20 | TimeUnit.WEEK, TimeUnit.DAY.times(2), TimeUnit.DAY, |
|---|
| 21 | 21 | TimeUnit.HOUR, |
|---|
| 22 | 22 | TimeUnit.MINUTE, |
|---|
| 23 | | - TimeUnit.SECOND |
|---|
| 23 | + TimeUnit.SECOND, |
|---|
| 24 | + TimeUnit.REALTIME |
|---|
| 24 | 25 | }; |
|---|
| 25 | 26 | |
|---|
| 26 | 27 | public AxisTicMarks(TimeUnit unit, long start, long end) |
|---|
| .. | .. |
|---|
| 43 | 44 | |
|---|
| 44 | 45 | public static List<AxisTicMarks> allRelevant(long start, long end) |
|---|
| 45 | 46 | { |
|---|
| 46 | | - return allRelevant(start, end, 40); |
|---|
| 47 | + return allRelevant(start, end, 4000); |
|---|
| 47 | 48 | } |
|---|
| 48 | 49 | |
|---|
| 49 | 50 | public static AxisTicMarks histoTics(long start, long end) |
|---|
| 50 | 51 | { |
|---|
| 51 | | - for (int i = histUnits.length - 1; i >= 0; i--) |
|---|
| 52 | + for (int i = histUnits.length; --i >= 0;) |
|---|
| 52 | 53 | { |
|---|
| 53 | 54 | TimeUnit u = histUnits[i]; |
|---|
| 54 | 55 | long estimate = u.approxNumInRange(start, end); |
|---|
| 55 | 56 | if (estimate < 200 || i == 0) |
|---|
| 56 | 57 | { |
|---|
| 58 | + if (i == 17) |
|---|
| 59 | + i = 17; |
|---|
| 60 | + |
|---|
| 57 | 61 | AxisTicMarks t = new AxisTicMarks(u, start, end); |
|---|
| 58 | 62 | return t; |
|---|
| 59 | 63 | } |
|---|
| .. | .. |
|---|
| 64 | 68 | public static List<AxisTicMarks> allRelevant(long start, long end, long maxTics) |
|---|
| 65 | 69 | { |
|---|
| 66 | 70 | List<AxisTicMarks> list = new ArrayList<AxisTicMarks>(); |
|---|
| 67 | | - |
|---|
| 68 | 71 | |
|---|
| 69 | 72 | for (int i = 0; i < units.length; i++) |
|---|
| 70 | 73 | { |
|---|