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

Make renderAxis return string instead of writing to std::out

Browse source
This commit is contained in:
Thomas Lauf 2018-12-28 21:51:27 +01:00
parent 3d473e0447
commit 56b18954df
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/commands/CmdChart.cpp
View file

@ -37,7 +37,7 @@
int renderChart (const CLI&, const std::string&, Interval&, Rules&, Database&); int renderChart (const CLI&, const std::string&, Interval&, Rules&, Database&);
static std::pair <int, int> determineHourRange (const Interval&, const std::vector <Interval>&); static std::pair <int, int> determineHourRange (const Interval&, const std::vector <Interval>&);
static void renderAxis (const std::string&, int, int, bool, const Color&, const Color&, int); static std::string renderAxis (const std::string&, int, int, bool, const Color&, const Color&, int);
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 (const Rules&, Datetime&, Color&, Color&); static std::string renderWeekday (const Rules&, Datetime&, Color&, Color&);
@ -178,7 +178,7 @@ int renderChart (
if (axis_type != "internal") if (axis_type != "internal")
{ {
renderAxis ( std::cout << renderAxis (
indent, indent,
first_hour, first_hour,
last_hour, last_hour,
@ -320,7 +320,7 @@ static std::pair <int, int> determineHourRange (
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
static void renderAxis ( static std::string renderAxis (
const std::string& indent, const std::string& indent,
int first_hour, int first_hour,
int last_hour, int last_hour,
@ -329,27 +329,29 @@ static void renderAxis (
const Color& colorToday, const Color& colorToday,
const int cell_size) const int cell_size)
{ {
std::stringstream out;
auto current_hour = Datetime ().hour (); auto current_hour = Datetime ().hour ();
std::cout << indent; out << indent;
for (int hour = first_hour; hour <= last_hour; hour++) for (int hour = first_hour; hour <= last_hour; hour++)
{ {
if (hour == current_hour) if (hour == current_hour)
{ {
std::cout << colorToday.colorize (leftJustify (hour, cell_size)); out << colorToday.colorize (leftJustify (hour, cell_size));
} }
else else
{ {
std::cout << colorLabel.colorize (leftJustify (hour, cell_size)); out << colorLabel.colorize (leftJustify (hour, cell_size));
} }
} }
if (with_totals) if (with_totals)
{ {
std::cout << " " << colorLabel.colorize ("Total"); out << " " << colorLabel.colorize ("Total");
} }
std::cout << '\n'; out << '\n';
return out.str ();
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////