GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-09-01 18:27:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Bug

Browse source 
- Fixed problem where burndown chart titles were displayed in postfix,
  rather than original form.
This commit is contained in:
Paul Beckingham 2011-10-22 23:04:36 -04:00
parent 56f33cf96a
commit dc3470a9a8
1 changed files with 25 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

56
src/commands/CmdBurndown.cpp
View file

@ -147,7 +147,6 @@ public:
Chart& operator= (const Chart&); // Unimplemented Chart& operator= (const Chart&); // Unimplemented
~Chart (); ~Chart ();
void description (const std::string&);
void scan (std::vector <Task>&); void scan (std::vector <Task>&);
std::string render (); std::string render ();
@ -207,6 +206,31 @@ Chart::Chart (char type)
// Rates are calculated last. // Rates are calculated last.
find_rate = 0.0; find_rate = 0.0;
fix_rate = 0.0; fix_rate = 0.0;
// Set the title.
title = "(";
bool before_command = true;
std::vector <Arg>::const_iterator arg;
for (arg = context.a3.begin (); arg != context.a3.end (); ++arg)
{
if (arg->_category == Arg::cat_command)
before_command = false;
if (arg->_category == Arg::cat_program ||
arg->_category == Arg::cat_rc ||
arg->_category == Arg::cat_override ||
arg->_category == Arg::cat_command ||
arg->_category == Arg::cat_terminator)
;
else
{
if (title.length () > 1)
title += " ";
title += arg->_raw;
}
}
title += ")";
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@ -214,12 +238,6 @@ Chart::~Chart ()
{ {
} }
////////////////////////////////////////////////////////////////////////////////
void Chart::description (const std::string& value)
{
title = value;
}
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
void Chart::scan (std::vector <Task>& tasks) void Chart::scan (std::vector <Task>& tasks)
{ {
@ -956,14 +974,6 @@ int CmdBurndownMonthly::execute (std::string& output)
// Create a chart, scan the tasks, then render. // Create a chart, scan the tasks, then render.
Chart chart ('M'); Chart chart ('M');
// Use any filter as a title.
if (context.a3.size () > 2)
{
std::string combined = "(" + context.a3.extract_filter ().combine () + ")";
chart.description (combined);
}
chart.scan (filtered); chart.scan (filtered);
output = chart.render (); output = chart.render ();
return rc; return rc;
@ -992,14 +1002,6 @@ int CmdBurndownWeekly::execute (std::string& output)
// Create a chart, scan the tasks, then render. // Create a chart, scan the tasks, then render.
Chart chart ('W'); Chart chart ('W');
// Use any filter as a title.
if (context.a3.size () > 2)
{
std::string combined = "(" + context.a3.extract_filter ().combine () + ")";
chart.description (combined);
}
chart.scan (filtered); chart.scan (filtered);
output = chart.render (); output = chart.render ();
return rc; return rc;
@ -1028,14 +1030,6 @@ int CmdBurndownDaily::execute (std::string& output)
// Create a chart, scan the tasks, then render. // Create a chart, scan the tasks, then render.
Chart chart ('D'); Chart chart ('D');
// Use any filter as a title.
if (context.a3.size () > 2)
{
std::string combined = "(" + context.a3.extract_filter ().combine () + ")";
chart.description (combined);
}
chart.scan (filtered); chart.scan (filtered);
output = chart.render (); output = chart.render ();
return rc; return rc;