Columns: Consistency

This commit is contained in:
Paul Beckingham 2017-01-07 10:46:40 -05:00
parent 8c0bfb030a
commit f8578ecc28
9 changed files with 3 additions and 12 deletions

View file

@ -45,7 +45,6 @@ ColumnIMask::ColumnIMask ()
void ColumnIMask::measure (Task& task, unsigned int& minimum, unsigned int& maximum) void ColumnIMask::measure (Task& task, unsigned int& minimum, unsigned int& maximum)
{ {
minimum = maximum = 0; minimum = maximum = 0;
if (task.has (_name)) if (task.has (_name))
{ {
minimum = maximum = task.get (_name).length (); minimum = maximum = task.get (_name).length ();

View file

@ -45,7 +45,6 @@ ColumnParent::ColumnParent ()
void ColumnParent::measure (Task& task, unsigned int& minimum, unsigned int& maximum) void ColumnParent::measure (Task& task, unsigned int& minimum, unsigned int& maximum)
{ {
minimum = maximum = 0; minimum = maximum = 0;
if (task.has (_name)) if (task.has (_name))
{ {
if (_style == "default" || _style == "long") minimum = maximum = 36; if (_style == "default" || _style == "long") minimum = maximum = 36;

View file

@ -59,7 +59,6 @@ ColumnProject::ColumnProject ()
void ColumnProject::measure (Task& task, unsigned int& minimum, unsigned int& maximum) void ColumnProject::measure (Task& task, unsigned int& minimum, unsigned int& maximum)
{ {
minimum = maximum = 0; minimum = maximum = 0;
if (task.has (_name)) if (task.has (_name))
{ {
std::string project = task.get (_name); std::string project = task.get (_name);

View file

@ -68,7 +68,6 @@ void ColumnRecur::setStyle (const std::string& value)
void ColumnRecur::measure (Task& task, unsigned int& minimum, unsigned int& maximum) void ColumnRecur::measure (Task& task, unsigned int& minimum, unsigned int& maximum)
{ {
minimum = maximum = 0; minimum = maximum = 0;
if (task.has (_name)) if (task.has (_name))
{ {
if (_style == "default" || if (_style == "default" ||

View file

@ -58,13 +58,14 @@ void ColumnStart::setStyle (const std::string& value)
void ColumnStart::measure (Task& task, unsigned int& minimum, unsigned int& maximum) void ColumnStart::measure (Task& task, unsigned int& minimum, unsigned int& maximum)
{ {
minimum = maximum = 0; minimum = maximum = 0;
if (task.has (_name)) if (task.has (_name))
{ {
if (_style == "active") if (_style == "active")
minimum = maximum = utf8_width (context.config.get ("active.indicator")); minimum = maximum = utf8_width (context.config.get ("active.indicator"));
else else
ColumnTypeDate::measure (task, minimum, maximum); ColumnTypeDate::measure (task, minimum, maximum);
// TODO Throw on bad format.
} }
} }

View file

@ -75,7 +75,6 @@ void ColumnTags::setStyle (const std::string& value)
void ColumnTags::measure (Task& task, unsigned int& minimum, unsigned int& maximum) void ColumnTags::measure (Task& task, unsigned int& minimum, unsigned int& maximum)
{ {
minimum = maximum = 0; minimum = maximum = 0;
if (task.has (_name)) if (task.has (_name))
{ {
if (_style == "indicator") if (_style == "indicator")

View file

@ -72,7 +72,6 @@ ColumnTypeDate::ColumnTypeDate ()
void ColumnTypeDate::measure (Task& task, unsigned int& minimum, unsigned int& maximum) void ColumnTypeDate::measure (Task& task, unsigned int& minimum, unsigned int& maximum)
{ {
minimum = maximum = 0; minimum = maximum = 0;
if (task.has (_name)) if (task.has (_name))
{ {
Datetime date (task.get_date (_name)); Datetime date (task.get_date (_name));

View file

@ -71,7 +71,6 @@ bool ColumnUDAString::validate (const std::string& value) const
void ColumnUDAString::measure (Task& task, unsigned int& minimum, unsigned int& maximum) void ColumnUDAString::measure (Task& task, unsigned int& minimum, unsigned int& maximum)
{ {
minimum = maximum = 0; minimum = maximum = 0;
if (task.has (_name)) if (task.has (_name))
{ {
if (_style == "default") if (_style == "default")
@ -159,7 +158,6 @@ bool ColumnUDANumeric::validate (const std::string& value) const
void ColumnUDANumeric::measure (Task& task, unsigned int& minimum, unsigned int& maximum) void ColumnUDANumeric::measure (Task& task, unsigned int& minimum, unsigned int& maximum)
{ {
minimum = maximum = 0; minimum = maximum = 0;
if (task.has (_name)) if (task.has (_name))
{ {
if (_style == "default") if (_style == "default")
@ -239,7 +237,6 @@ bool ColumnUDADate::validate (const std::string& value) const
void ColumnUDADate::measure (Task& task, unsigned int& minimum, unsigned int& maximum) void ColumnUDADate::measure (Task& task, unsigned int& minimum, unsigned int& maximum)
{ {
minimum = maximum = 0; minimum = maximum = 0;
if (task.has (_name)) if (task.has (_name))
{ {
if (_style == "default") if (_style == "default")
@ -345,7 +342,6 @@ bool ColumnUDADuration::validate (const std::string& value) const
void ColumnUDADuration::measure (Task& task, unsigned int& minimum, unsigned int& maximum) void ColumnUDADuration::measure (Task& task, unsigned int& minimum, unsigned int& maximum)
{ {
minimum = maximum = 0; minimum = maximum = 0;
if (task.has (_name)) if (task.has (_name))
{ {
if (_style == "default") if (_style == "default")

View file

@ -145,7 +145,7 @@ void Column::factory (std::map <std::string, Column*>& all)
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
void Column::uda (std::map <std::string, Column*>& all) void Column::uda (std::map <std::string, Column*>& all)
{ {
// For each UDA, instantiate and initialize ColumnUDA(). // For each UDA, instantiate and initialize ColumnUDA.
std::set <std::string> udas; std::set <std::string> udas;
for (const auto& i : context.config) for (const auto& i : context.config)