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

Partially extract rules from renderInterval

Browse source
This commit is contained in:
Thomas Lauf 2018-12-29 11:11:24 +01:00
parent abe7f5f655
commit 16356a3270
1 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/commands/CmdChart.cpp
View file

@ -45,7 +45,7 @@ static std::string renderDay (Datetime&, const std::vector<std::stri
static std::string renderTotal (time_t); static std::string renderTotal (time_t);
static std::string renderSubTotal (time_t, unsigned long); static std::string renderSubTotal (time_t, unsigned long);
static void renderExclusionBlocks (const std::string&, const Rules&, std::vector <Composite>&, bool, const Datetime&, int, int, const std::vector <Range>&); static void renderExclusionBlocks (const std::string&, const Rules&, std::vector <Composite>&, bool, const Datetime&, int, int, const std::vector <Range>&);
static void renderInterval (const std::string&, const Rules&, std::vector <Composite>&, const Datetime&, const Interval&, std::map <std::string, Color>&, int, time_t&, bool); static void renderInterval (const Rules&, std::vector<Composite>&, const Datetime&, const Interval&, std::map<std::string, Color>&, int, time_t&, bool, int, int);
std::string renderHolidays (const Rules&, const Interval&, const std::vector<std::string>&); std::string renderHolidays (const Rules&, const Interval&, const std::vector<std::string>&);
static std::string renderSummary (const std::string&, const Interval&, const std::vector <Range>&, const std::vector <Interval>&, bool); static std::string renderSummary (const std::string&, const Interval&, const std::vector <Range>&, const std::vector <Interval>&, bool);
@ -215,7 +215,7 @@ int renderChart (
for (auto& track : tracked) for (auto& track : tracked)
{ {
time_t interval_work = 0; time_t interval_work = 0;
renderInterval (type, rules, lines, day, track, tag_colors, first_hour, interval_work, ids); renderInterval (rules, lines, day, track, tag_colors, first_hour, interval_work, ids, minutes_per_char, spacing);
work += interval_work; work += interval_work;
} }
} }
@ -549,7 +549,6 @@ static void renderExclusionBlocks (
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
static void renderInterval ( static void renderInterval (
const std::string& type,
const Rules& rules, const Rules& rules,
std::vector <Composite>& lines, std::vector <Composite>& lines,
const Datetime& day, const Datetime& day,
@ -557,13 +556,11 @@ static void renderInterval (
std::map <std::string, Color>& tag_colors, std::map <std::string, Color>& tag_colors,
int first_hour, int first_hour,
time_t& work, time_t& work,
bool ids) bool ids,
const int minutes_per_char,
const int spacing)
{ {
Datetime now; Datetime now;
auto minutes_per_char = rules.getInteger ("reports." + type + ".cell");
if (minutes_per_char < 1)
throw format ("The value for 'reports.{1}.cell' must be at least 1.", type);
auto spacing = rules.getInteger ("reports." + type + ".spacing");
// Ignore any track that doesn't overlap with day. // Ignore any track that doesn't overlap with day.
auto day_range = getFullDay (day); auto day_range = getFullDay (day);