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

Use fields directly instead of passing them as function parameters

Browse source 
Signed-off-by: Thomas Lauf <thomas.lauf@tngtech.com>
This commit is contained in:
Thomas Lauf 2019-04-11 22:43:27 +02:00
parent 0510b59460
commit a6b9e4204c
2 changed files with 10 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/Chart.cpp
View file

@ -89,12 +89,7 @@ std::string Chart::render (
// Render the axis. // Render the axis.
if (!with_internal_axis) if (!with_internal_axis)
{ {
out << indent out << indent << renderAxis (first_hour, last_hour);
<< renderAxis (
first_hour,
last_hour,
color_label,
color_today);
} }
// For rendering labels on edge detection. // For rendering labels on edge detection.
@ -115,7 +110,7 @@ std::string Chart::render (
lines[i].add (std::string (total_width, ' '), 0, Color ()); lines[i].add (std::string (total_width, ' '), 0, Color ());
} }
renderExclusionBlocks (lines, day, first_hour, last_hour, exclusions, color_exclusion, color_label); renderExclusionBlocks (lines, day, first_hour, last_hour, exclusions);
time_t work = 0; time_t work = 0;
if (!show_intervals) if (!show_intervals)
@ -236,11 +231,7 @@ std::pair<int, int> Chart::determineHourRange (
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
std::string Chart::renderAxis ( std::string Chart::renderAxis (const int first_hour, const int last_hour)
const int first_hour,
const int last_hour,
const Color &colorLabel,
const Color &colorToday)
{ {
std::stringstream out; std::stringstream out;
auto current_hour = reference_datetime.hour (); auto current_hour = reference_datetime.hour ();
@ -249,17 +240,17 @@ std::string Chart::renderAxis (
{ {
if (hour == current_hour) if (hour == current_hour)
{ {
out << colorToday.colorize (leftJustify (hour, cell_width)); out << color_today.colorize (leftJustify (hour, cell_width));
} }
else else
{ {
out << colorLabel.colorize (leftJustify (hour, cell_width)); out << color_label.colorize (leftJustify (hour, cell_width));
} }
} }
if (with_totals) if (with_totals)
{ {
out << " " << colorLabel.colorize ("Total"); out << " " << color_label.colorize ("Total");
} }
out << '\n'; out << '\n';
@ -384,9 +375,7 @@ void Chart::renderExclusionBlocks (
const Datetime &day, const Datetime &day,
int first_hour, int first_hour,
int last_hour, int last_hour,
const std::vector<Range> &excluded, const std::vector <Range>& excluded)
const Color &color_exclusion,
const Color &color_label)
{ {
// Render the exclusion blocks. // Render the exclusion blocks.
for (int hour = first_hour; hour <= last_hour; hour++) for (int hour = first_hour; hour <= last_hour; hour++)
@ -409,9 +398,7 @@ void Chart::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 (), minutes_per_char) / minutes_per_char; auto start_block = quantizeToNMinutes (sub_hour.start.minute (), minutes_per_char) / minutes_per_char;
auto end_block = auto end_block = quantizeToNMinutes (sub_hour.end.minute () == 0 ? 60 : sub_hour.end.minute (), minutes_per_char) / minutes_per_char;
quantizeToNMinutes (sub_hour.end.minute () == 0 ? 60 : sub_hour.end.minute (), minutes_per_char) /
minutes_per_char;
int offset = (hour - first_hour) * cell_width + start_block; int offset = (hour - first_hour) * cell_width + start_block;
int width = end_block - start_block; int width = end_block - start_block;

4
src/Chart.h
View file

@ -40,7 +40,7 @@ public:
std::string render (const Interval&, const std::vector <Interval>&, const std::vector <Range>&, const std::map <Datetime, std::string>&); std::string render (const Interval&, const std::vector <Interval>&, const std::vector <Range>&, const std::map <Datetime, std::string>&);
private: private:
std::string renderAxis (int, int, const Color&, const Color&); std::string renderAxis (int, int);
std::string renderDay (Datetime&, const Color&); std::string renderDay (Datetime&, const Color&);
std::string renderHolidays (const std::map <Datetime, std::string>&); std::string renderHolidays (const std::map <Datetime, std::string>&);
std::string renderMonth (const Datetime&, const Datetime&); std::string renderMonth (const Datetime&, const Datetime&);
@ -50,7 +50,7 @@ private:
std::string renderWeek (const Datetime&, const Datetime&); std::string renderWeek (const Datetime&, const Datetime&);
std::string renderWeekday (Datetime&, const Color&); std::string renderWeekday (Datetime&, const Color&);
void renderExclusionBlocks (std::vector<Composite>&, const Datetime&, int, int, const std::vector<Range>&, const Color&, const Color&); void renderExclusionBlocks (std::vector <Composite>&, const Datetime&, int, int, const std::vector <Range>&);
void renderInterval (std::vector<Composite>&, const Datetime&, const Interval&, int, time_t&); void renderInterval (std::vector<Composite>&, const Datetime&, const Interval&, int, time_t&);
unsigned long getIndentSize (); unsigned long getIndentSize ();