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

Replace string axis_type with boolean with_internal_axis

Browse source
This commit is contained in:
Thomas Lauf 2019-01-22 23:29:41 +01:00
parent 5c320e78b4
commit 3feb1b5c5a
1 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/commands/CmdChart.cpp
View file

@ -44,7 +44,7 @@ static std::string renderWeekday (Datetime&, const Color&);
static std::string renderDay (Datetime&, const 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 Color&, const Color&, bool);
static void renderInterval (std::vector<Composite>&, const Datetime&, const Interval&, std::map<std::string, Color>&, int, time_t&, bool, int, int); static void renderInterval (std::vector<Composite>&, const Datetime&, const Interval&, std::map<std::string, Color>&, int, time_t&, bool, int, int);
std::string renderHolidays (const std::map <Datetime, std::string>&); std::string renderHolidays (const std::map <Datetime, std::string>&);
static std::string renderSummary (const std::string&, const Interval&, const std::vector <Range>&, const std::vector <Interval>&, bool); static std::string renderSummary (const std::string&, const Interval&, const std::vector <Range>&, const std::vector <Interval>&, bool);
@ -180,11 +180,12 @@ int renderChart (
const auto padding_size = indent_size + ((last_hour - first_hour + 1) * (cell_size)) + 1; const auto padding_size = indent_size + ((last_hour - first_hour + 1) * (cell_size)) + 1;
auto axis_type = rules.get ("reports." + type + ".axis"); auto axis_type = rules.get ("reports." + type + ".axis");
const auto with_internal_axis = axis_type == "internal";
// Render the axis.
std::cout << '\n'; std::cout << '\n';
if (axis_type != "internal") // Render the axis.
if (!with_internal_axis)
{ {
std::cout << indent std::cout << indent
<< renderAxis ( << renderAxis (
@ -213,7 +214,7 @@ int renderChart (
for (int i = 0; i < num_lines; ++i) for (int i = 0; i < num_lines; ++i)
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, minutes_per_char, spacing, axis_type, color_exclusion, color_label); renderExclusionBlocks (lines, day, first_hour, last_hour, exclusions, minutes_per_char, spacing, color_exclusion, color_label, with_internal_axis);
time_t work = 0; time_t work = 0;
if (! blank) if (! blank)
@ -523,12 +524,12 @@ static void 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 int minutes_per_char, const int minutes_per_char,
const int spacing, const int spacing,
const std::string& axis_type,
const Color& color_exclusion, const Color& color_exclusion,
const Color& color_label) const Color& color_label,
const bool with_internal_axis)
{ {
const auto chars_per_hour = 60 / minutes_per_char; const auto chars_per_hour = 60 / minutes_per_char;
const auto cell_width = chars_per_hour + spacing; const auto cell_width = chars_per_hour + spacing;
@ -540,7 +541,7 @@ static void renderExclusionBlocks (
Range r (Datetime (day.year (), day.month (), day.day (), hour, 0, 0), Range r (Datetime (day.year (), day.month (), day.day (), hour, 0, 0),
Datetime (day.year (), day.month (), day.day (), hour + 1, 0, 0)); Datetime (day.year (), day.month (), day.day (), hour + 1, 0, 0));
if (axis_type == "internal") if (with_internal_axis)
{ {
auto label = format ("{1}", hour); auto label = format ("{1}", hour);
int offset = (hour - first_hour) * cell_width; int offset = (hour - first_hour) * cell_width;
@ -563,7 +564,7 @@ static void renderExclusionBlocks (
for (auto& line : lines) for (auto& line : lines)
line.add (block, offset, color_exclusion); line.add (block, offset, color_exclusion);
if (axis_type == "internal") if (with_internal_axis)
{ {
auto label = format ("{1}", hour); auto label = format ("{1}", hour);
if (start_block == 0 && if (start_block == 0 &&