GothenburgBitFactory/timewarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/timewarrior.git synced 2025-07-07 20:06:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

CmdChart: Fixed bug determineHourRange was not properly clipping intervals to days

Browse source
This commit is contained in:
Paul Beckingham 2016-06-11 14:05:08 -04:00
parent f25e9cb5ec
commit 83e9f3d688
1 changed files with 21 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/commands/CmdChart.cpp
View file

@ -38,7 +38,7 @@
#include <iomanip> #include <iomanip>
int renderChart (const CLI&, const std::string&, Interval&, Rules&, Database&); int renderChart (const CLI&, const std::string&, Interval&, Rules&, Database&);
static void determineHourRange (const std::string&, const Rules&, const std::vector <Interval>&, int&, int&); static void determineHourRange (const std::string&, const Rules&, const Interval&, const std::vector <Interval>&, int&, int&);
static void renderAxis (const std::string&, const Rules&, Palette&, const std::string&, int, int); static void renderAxis (const std::string&, const Rules&, Palette&, const std::string&, int, int);
static std::string renderMonth (const std::string&, const Rules&, const Datetime&, const Datetime&); static std::string renderMonth (const std::string&, const Rules&, const Datetime&, const Datetime&);
static std::string renderDayName (const std::string&, const Rules&, Datetime&, Color&, Color&); static std::string renderDayName (const std::string&, const Rules&, Datetime&, Color&, Color&);
@ -127,7 +127,7 @@ int renderChart (
// Determine hours shown. // Determine hours shown.
int first_hour = 0; int first_hour = 0;
int last_hour = 23; int last_hour = 23;
determineHourRange (type, rules, tracked, first_hour, last_hour); determineHourRange (type, rules, filter, tracked, first_hour, last_hour);
// Render the axis. // Render the axis.
std::cout << '\n'; std::cout << '\n';
@ -213,6 +213,7 @@ int renderChart (
static void determineHourRange ( static void determineHourRange (
const std::string& type, const std::string& type,
const Rules& rules, const Rules& rules,
const Interval& filter,
const std::vector <Interval>& tracked, const std::vector <Interval>& tracked,
int& first_hour, int& first_hour,
int& last_hour) int& last_hour)
@ -229,14 +230,26 @@ static void determineHourRange (
// Get the extreme time range for the filtered data. // Get the extreme time range for the filtered data.
first_hour = 23; first_hour = 23;
last_hour = 0; last_hour = 0;
for (auto& track : tracked) for (Datetime day = filter.range.start; day < filter.range.end; day++)
{ {
if (track.range.start.hour () < first_hour) auto day_range = getFullDay (day);
first_hour = track.range.start.hour ();
if (! track.range.is_open () && for (auto& track : tracked)
track.range.end.hour () > last_hour) {
last_hour = track.range.end.hour (); if (day_range.overlap (track.range))
{
Interval clipped = clip (track, day_range);
if (track.range.is_open ())
clipped.range.end = Datetime ();
if (clipped.range.start.hour () < first_hour)
first_hour = clipped.range.start.hour ();
if (! clipped.range.is_open () &&
clipped.range.end.hour () > last_hour)
last_hour = clipped.range.end.hour ();
}
}
} }
first_hour = std::max (first_hour - 1, 0); first_hour = std::max (first_hour - 1, 0);