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

Combine color definitions

Browse source
This commit is contained in:
Thomas Lauf 2018-12-28 21:38:37 +01:00
parent fdecf9b6b1
commit 654a209cb2
1 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/commands/CmdChart.cpp
View file

@ -125,8 +125,9 @@ int renderChart (
auto tag_colors = createTagColorMap (rules, palette, tracked);
auto with_colors = rules.getBoolean ("color");
Color colorToday (with_colors ? rules.get ("theme.colors.today") : "");
Color colorHoliday (with_colors ? rules.get ("theme.colors.holiday") : "");
Color color_today (with_colors ? rules.get ("theme.colors.today") : "");
Color color_holiday (with_colors ? rules.get ("theme.colors.holiday") : "");
Color color_label (with_colors ? rules.get ("theme.colors.label") : "");
const auto not_full_day = rules.get ("reports." + type + ".hours") == "auto";
@ -164,10 +165,7 @@ int renderChart (
const auto num_lines = rules.getInteger ("reports." + type + ".lines", 1);
if (num_lines < 1)
throw format ("Invalid value for 'reports.{1}.lines': '{2}'", type, rules.get ("reports." + type + ".lines"));
auto color_today = Color (with_colors ? rules.get ("theme.colors.today") : "");
auto color_label = Color (with_colors ? rules.get ("theme.colors.label") : "");
throw format ("Invalid value for 'reports.{1}.lines': '{2}'", type, num_lines);
const auto chars_per_hour = 60 / minutes_per_char;
const auto cell_size = chars_per_hour + spacing;
@ -193,9 +191,9 @@ int renderChart (
// For rendering labels on edge detection.
Datetime previous {0};
// Each day is rendered separately.
time_t total_work = 0;
for (Datetime day = filter.start; day < filter.end; day++)
{
// Render the exclusion blocks.
@ -222,8 +220,8 @@ int renderChart (
auto labelMonth = with_month ? renderMonth (previous, day) : "";
auto labelWeek = with_week ? renderWeek (previous, day) : "";
auto labelWeekday = with_weekday ? renderWeekday (rules, day, colorToday, colorHoliday) : "";
auto labelDay = with_day ? renderDay (rules, day, colorToday, colorHoliday) : "";
auto labelWeekday = with_weekday ? renderWeekday (rules, day, color_today, color_holiday) : "";
auto labelDay = with_day ? renderDay (rules, day, color_today, color_holiday) : "";
std::cout << labelMonth
<< labelWeek