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 1

Extract color from renderDay/renderWeekday

Browse source
This commit is contained in:
Thomas Lauf 2018-12-31 15:46:32 +01:00
parent 34d022d374
commit c30f4b1e66
1 changed files with 27 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

60
src/commands/CmdChart.cpp
View file

@ -40,8 +40,8 @@ static std::pair <int, int> determineHourRange (const Interval&, const std::vect
static std::string renderAxis (int, int, const Color&, const Color&, int, bool); static std::string renderAxis (int, int, const Color&, const Color&, int, bool);
static std::string renderMonth (const Datetime&, const Datetime&); static std::string renderMonth (const Datetime&, const Datetime&);
static std::string renderWeek (const Datetime&, const Datetime&); static std::string renderWeek (const Datetime&, const Datetime&);
static std::string renderWeekday (Datetime&, const std::vector<std::string>&, Color&, Color&); static std::string renderWeekday (Datetime&, const Color&);
static std::string renderDay (Datetime&, const std::vector<std::string>&, Color&, Color&); static std::string renderDay (Datetime&, const Color&);
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 (std::vector<Composite>&, const Datetime&, int, int, const std::vector<Range>&, int, int, const std::string&, const Color&, const Color&); static void renderExclusionBlocks (std::vector<Composite>&, const Datetime&, int, int, const std::vector<Range>&, int, int, const std::string&, const Color&, const Color&);
@ -51,6 +51,8 @@ static std::string renderSummary (const std::string&, const Interval&, c
unsigned long getIndentSize (const std::string &type, const Rules &rules); unsigned long getIndentSize (const std::string &type, const Rules &rules);
Color getDayColor (const Datetime&, const std::vector <std::string>&, const Color&, const Color&);
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
int CmdChartDay ( int CmdChartDay (
const CLI& cli, const CLI& cli,
@ -220,11 +222,13 @@ int renderChart (
work += interval_work; work += interval_work;
} }
} }
auto color_day = getDayColor (day, holidays, color_today, color_holiday);
auto labelMonth = with_month ? renderMonth (previous, day) : ""; auto labelMonth = with_month ? renderMonth (previous, day) : "";
auto labelWeek = with_week ? renderWeek (previous, day) : ""; auto labelWeek = with_week ? renderWeek (previous, day) : "";
auto labelWeekday = with_weekday ? renderWeekday (day, holidays, color_today, color_holiday) : ""; auto labelWeekday = with_weekday ? renderWeekday (day, color_day) : "";
auto labelDay = with_day ? renderDay (day, holidays, color_today, color_holiday) : ""; auto labelDay = with_day ? renderDay (day, color_day) : "";
std::cout << labelMonth std::cout << labelMonth
<< labelWeek << labelWeek
@ -386,27 +390,10 @@ static std::string renderWeek (const Datetime &previous, const Datetime &day)
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Today should be highlighted. // Today should be highlighted.
// Includes trailing separator space. // Includes trailing separator space.
static std::string renderWeekday ( static std::string renderWeekday (Datetime& day, const Color& color)
Datetime& day,
const std::vector <std::string>& holidays,
Color& colorToday,
Color& colorHoliday)
{ {
Color color;
if (day.sameDay (Datetime ()))
{
color = colorToday;
}
else
{
if (dayIsHoliday (day, holidays))
{
color = colorHoliday;
}
}
std::stringstream out; std::stringstream out;
out << color.colorize (Datetime::dayNameShort (day.dayOfWeek ())) out << color.colorize (Datetime::dayNameShort (day.dayOfWeek ()))
<< ' '; << ' ';
@ -414,11 +401,22 @@ static std::string renderWeekday (
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
static std::string renderDay ( static std::string renderDay (Datetime& day, const Color& color)
Datetime& day, {
std::stringstream out;
out << color.colorize (rightJustify (day.day (), 2))
<< ' ';
return out.str ();
}
////////////////////////////////////////////////////////////////////////////////
Color getDayColor (
const Datetime& day,
const std::vector <std::string>& holidays, const std::vector <std::string>& holidays,
Color& colorToday, const Color& colorToday,
Color& colorHoliday) const Color& colorHoliday)
{ {
Color color; Color color;
@ -434,11 +432,7 @@ static std::string renderDay (
} }
} }
std::stringstream out; return color;
out << color.colorize (rightJustify (day.day (), 2))
<< ' ';
return out.str ();
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////