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

Refactor renderExclusionBlocks

Browse source 
- rename variable cell to minutes_per_char
- introduce local variable cell_width
This commit is contained in:
Thomas Lauf 2018-12-28 20:40:58 +01:00
parent 211eaf3f94
commit f7b342cd50
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/commands/CmdChart.cpp
View file

@ -482,14 +482,15 @@ static void renderExclusionBlocks (
int last_hour, int last_hour,
const std::vector <Range>& excluded) const std::vector <Range>& excluded)
{ {
auto cell = rules.getInteger ("reports." + type + ".cell"); auto minutes_per_char = rules.getInteger ("reports." + type + ".cell");
if (cell < 1) if (minutes_per_char < 1)
throw format ("The value for 'reports.{1}.cell' must be at least 1.", type); throw format ("The value for 'reports.{1}.cell' must be at least 1.", type);
auto chars_per_hour = 60 / cell; auto chars_per_hour = 60 / minutes_per_char;
auto spacing = rules.getInteger ("reports." + type + ".spacing"); auto spacing = rules.getInteger ("reports." + type + ".spacing");
auto axis_type = rules.get ("reports." + type + ".axis"); auto axis_type = rules.get ("reports." + type + ".axis");
const auto cell_width = chars_per_hour + spacing;
Color colorExc (with_colors ? rules.get ("theme.colors.exclusion") : ""); Color colorExc (with_colors ? rules.get ("theme.colors.exclusion") : "");
Color colorLabel (with_colors ? rules.get ("theme.colors.label") : ""); Color colorLabel (with_colors ? rules.get ("theme.colors.label") : "");
@ -503,7 +504,7 @@ static void renderExclusionBlocks (
if (axis_type == "internal") if (axis_type == "internal")
{ {
auto label = format ("{1}", hour); auto label = format ("{1}", hour);
int offset = (hour - first_hour) * (chars_per_hour + spacing); int offset = (hour - first_hour) * cell_width;
lines[0].add (label, offset, colorLabel); lines[0].add (label, offset, colorLabel);
} }
@ -513,10 +514,10 @@ static void renderExclusionBlocks (
{ {
// Determine which of the character blocks included. // Determine which of the character blocks included.
auto sub_hour = exc.intersect (r); auto sub_hour = exc.intersect (r);
auto start_block = quantizeToNMinutes (sub_hour.start.minute (), cell) / cell; auto start_block = quantizeToNMinutes (sub_hour.start.minute (), minutes_per_char) / minutes_per_char;
auto end_block = quantizeToNMinutes (sub_hour.end.minute () == 0 ? 60 : sub_hour.end.minute (), cell) / cell; auto end_block = quantizeToNMinutes (sub_hour.end.minute () == 0 ? 60 : sub_hour.end.minute (), minutes_per_char) / minutes_per_char;
int offset = (hour - first_hour) * (chars_per_hour + spacing) + start_block; int offset = (hour - first_hour) * cell_width + start_block;
int width = end_block - start_block; int width = end_block - start_block;
std::string block (width, ' '); std::string block (width, ' ');