From a9e12f6c508810604c8c91ee15451776b08ce1a1 Mon Sep 17 00:00:00 2001
From: Normand Briere <nbriere@noware.ca>
Date: Mon, 22 Apr 2019 07:41:56 -0400
Subject: [PATCH] Camera capslock fix
---
timeflow/vis/timeline/AxisTicMarks.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/timeflow/vis/timeline/AxisTicMarks.java b/timeflow/vis/timeline/AxisTicMarks.java
index edbd96b..8c786e4 100755
--- a/timeflow/vis/timeline/AxisTicMarks.java
+++ b/timeflow/vis/timeline/AxisTicMarks.java
@@ -10,7 +10,7 @@
public List<Long> tics;
private static final TimeUnit[] units =
{
- TimeUnit.YEAR, TimeUnit.MONTH, TimeUnit.DAY, TimeUnit.HOUR, TimeUnit.MINUTE, TimeUnit.SECOND
+ TimeUnit.YEAR, TimeUnit.MONTH, TimeUnit.DAY, TimeUnit.HOUR, TimeUnit.MINUTE, TimeUnit.SECOND, TimeUnit.REALTIME
};
private static final TimeUnit[] histUnits =
{
@@ -20,7 +20,8 @@
TimeUnit.WEEK, TimeUnit.DAY.times(2), TimeUnit.DAY,
TimeUnit.HOUR,
TimeUnit.MINUTE,
- TimeUnit.SECOND
+ TimeUnit.SECOND,
+ TimeUnit.REALTIME
};
public AxisTicMarks(TimeUnit unit, long start, long end)
@@ -43,17 +44,20 @@
public static List<AxisTicMarks> allRelevant(long start, long end)
{
- return allRelevant(start, end, 40);
+ return allRelevant(start, end, 4000);
}
public static AxisTicMarks histoTics(long start, long end)
{
- for (int i = histUnits.length - 1; i >= 0; i--)
+ for (int i = histUnits.length; --i >= 0;)
{
TimeUnit u = histUnits[i];
long estimate = u.approxNumInRange(start, end);
if (estimate < 200 || i == 0)
{
+ if (i == 17)
+ i = 17;
+
AxisTicMarks t = new AxisTicMarks(u, start, end);
return t;
}
@@ -64,7 +68,6 @@
public static List<AxisTicMarks> allRelevant(long start, long end, long maxTics)
{
List<AxisTicMarks> list = new ArrayList<AxisTicMarks>();
-
for (int i = 0; i < units.length; i++)
{
--
Gitblit v1.6.2