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: Added determineHourRange

Browse source
This commit is contained in:
Paul Beckingham 2016-05-21 15:48:36 -05:00
parent 2dd50d5f9a
commit 71ccf8584a
1 changed files with 29 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/commands/CmdChart.cpp
View file

@ -38,6 +38,7 @@
#include <iomanip> #include <iomanip>
int renderChart (const std::string&, Interval&, Rules&, Database&); int renderChart (const std::string&, Interval&, Rules&, Database&);
static void determineHourRange (const std::string&, const Rules&, 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&); static std::string renderDayName (const std::string&, const Rules&, Datetime&, Color&);
@ -108,23 +109,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;
if (! rules.getBoolean ("reports." + type + ".24h")) determineHourRange (type, rules, tracked, first_hour, last_hour);
{
// Get the extreme time range for the filtered data.
first_hour = 23;
last_hour = 0;
for (auto& track : tracked)
{
if (track.range.start.hour () < first_hour)
first_hour = track.range.start.hour ();
if (track.range.end.hour () > last_hour)
last_hour = track.range.end.hour ();
}
first_hour = std::max (first_hour - 1, 0);
last_hour = std::min (last_hour + 1, 23);
}
// Render the axis. // Render the axis.
std::cout << '\n'; std::cout << '\n';
@ -189,6 +174,33 @@ int renderChart (
return 0; return 0;
} }
////////////////////////////////////////////////////////////////////////////////
static void determineHourRange (
const std::string& type,
const Rules& rules,
const std::vector <Interval>& tracked,
int& first_hour,
int& last_hour)
{
if (! rules.getBoolean ("reports." + type + ".24h"))
{
// Get the extreme time range for the filtered data.
first_hour = 23;
last_hour = 0;
for (auto& track : tracked)
{
if (track.range.start.hour () < first_hour)
first_hour = track.range.start.hour ();
if (track.range.end.hour () > last_hour)
last_hour = track.range.end.hour ();
}
first_hour = std::max (first_hour - 1, 0);
last_hour = std::min (last_hour + 1, 23);
}
}
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
static void renderAxis ( static void renderAxis (
const std::string& type, const std::string& type,