From 9849b4082dbd0b4df6f2e34b30bd8585873d5f82 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Fri, 29 Apr 2011 20:06:21 -0400
Subject: [PATCH] View

- Removed debugging code.
- Implemented intra, extra and alternate colorization.
- Column::factory now parses <type>.<style> and properly initializes
  the column objects.
---
 src/Context.cpp        |  5 ++--
 src/Context.h          |  2 +-
 src/View.cpp           | 59 +++++++++++++++++++-----------------------
 src/columns/Column.cpp | 53 ++++++++++++++++++++++++++++++-------
 test/view.t.cpp        |  8 +++---
 5 files changed, 78 insertions(+), 49 deletions(-)

diff --git a/src/Context.cpp b/src/Context.cpp
index 7e9ac7384..5b7d8677e 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -823,12 +823,13 @@ void Context::clear ()
   subst.clear ();
 //  task.clear ();
   task = Task ();
-  tdb.clear ();
+  tdb.clear ();            // TODO Obsolete
+//  tdb2.clear ();
   program = "";
   args.clear ();
   file_override = "";
   var_overrides = "";
-  cmd.command = "";
+  cmd.command = "";        // TODO Obsolete
   tagAdditions.clear ();
   tagRemovals.clear ();
 
diff --git a/src/Context.h b/src/Context.h
index 45d19ac27..47f4c3675 100644
--- a/src/Context.h
+++ b/src/Context.h
@@ -49,7 +49,7 @@ public:
   Context (const Context&);
   Context& operator= (const Context&);
 
-  void initialize (int, char**);       // all startup
+  void initialize (int, char**);       // all startup  TODO Obsolete
   void initialize2 (int, char**);      // all startup
   void initialize ();                  // for reinitializing
   int run ();                          // task classic
diff --git a/src/View.cpp b/src/View.cpp
index 125abfa2b..2a4bf7783 100644
--- a/src/View.cpp
+++ b/src/View.cpp
@@ -25,9 +25,9 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-//#include <iostream> // TODO Remove
 #include <View.h>
 #include <text.h>
+#include <main.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 View::View ()
@@ -83,6 +83,9 @@ View::View ()
 //     among all columns, one character at a time, while the column width is
 //     less than the maximum width, and while there is overage remaining.
 //
+// Note: a possible enhancement is to proportionally distribute the overage
+//       according to average data length.
+//
 std::string View::render (std::vector <Task>& data, std::vector <int>& sequence)
 {
   // Determine minimal, ideal column widths.
@@ -112,48 +115,32 @@ std::string View::render (std::vector <Task>& data, std::vector <int>& sequence)
     ideal.push_back (global_ideal);
   }
 
-//  // TODO Remove
-//  std::string combined;
-//  join (combined, ",", minimal);
-//  std::cout << "# minimal " << combined << "\n";
-//  join (combined, ",", ideal);
-//  std::cout << "# ideal " << combined << "\n";
-
   // Sum the minimal widths.
   int sum_minimal = 0;
   std::vector <int>::iterator c;
   for (c = minimal.begin (); c != minimal.end (); ++c)
     sum_minimal += *c;
-//  std::cout << "# sum_minimal " << sum_minimal << "\n";
 
   // Sum the ideal widths.
   int sum_ideal = 0;
   for (c = ideal.begin (); c != ideal.end (); ++c)
     sum_ideal += *c;
-//  std::cout << "# sum_ideal " << sum_ideal << "\n";
 
   // Calculate final column widths.
   int overage = _width
               - _left_margin
               - (2 * _extra_padding)
               - ((_columns.size () - 1) * _intra_padding);
-//  std::cout << "# width " << _width << "\n";
 
   std::vector <int> widths;
   if (sum_ideal <= overage)
-//  {
-//    std::cout << "# ideal case: " << sum_ideal << " <= " << overage << "\n";
     widths = ideal;
-//  }
   else if (sum_minimal > overage)
-//  {
     throw std::string ("There is not enough horizontal width to display the results.");
-//  }
   else
   {
     widths = minimal;
     overage -= sum_minimal;
-//    std::cout << "# overage " << overage << "\n";
 
     // Spread 'overage' among columns where width[i] < ideal[i]
     while (overage)
@@ -167,9 +154,6 @@ std::string View::render (std::vector <Task>& data, std::vector <int>& sequence)
         }
       }
     }
-//
-//    join (combined, ",", widths);
-//    std::cout << "# final widths " << combined << "\n";
   }
 
   // Compose column headers.
@@ -184,18 +168,19 @@ std::string View::render (std::vector <Task>& data, std::vector <int>& sequence)
       max_lines = headers[c].size ();
   }
 
-//  for (int i = 0; i < headers.size (); ++i)
-//    for (int j = 0; j < headers[i].size (); ++j)
-//      std::cout << "# headers[" << i << "][" << j << "]=<" << headers[i][j] << ">\n";
-
   // Output string.
   std::string out;
   _lines = 0;
 
   // Render column headers.
   std::string left_margin = std::string (_left_margin, ' ');
-  std::string extra = std::string (_extra_padding, ' ');
-  std::string intra = std::string (_intra_padding, ' ');
+  std::string extra       = std::string (_extra_padding, ' ');
+  std::string intra       = std::string (_intra_padding, ' ');
+
+  std::string extra_odd   = _extra_odd.colorize  (extra);
+  std::string extra_even  = _extra_even.colorize (extra);
+  std::string intra_odd   = _intra_odd.colorize  (intra);
+  std::string intra_even  = _intra_even.colorize (intra);
 
   for (int i = 0; i < max_lines; ++i)
   {
@@ -217,17 +202,25 @@ std::string View::render (std::vector <Task>& data, std::vector <int>& sequence)
   }
 
   // Compose, render columns, in sequence.
-  Color color ("cyan");
   std::vector <std::vector <std::string> > cells;
   std::vector <int>::iterator s;
-  for (s = sequence.begin (); s != sequence.end (); ++s)
+  for (int s = 0; s < sequence.size (); ++s)
   {
     max_lines = 0;
 
+    // Apply color rules to task.
+    Color rule_color;
+    autoColorize (data[s], rule_color);
+
+    // Alternate rows based on |s % 2|
+    bool odd = (s % 2) ? true : false;
+    Color row_color = odd ? _odd : _even;
+    row_color.blend (rule_color);
+
     for (int c = 0; c < _columns.size (); ++c)
     {
       cells.push_back (std::vector <std::string> ());
-      _columns[c]->render (cells[c], data[*s], widths[c], color);
+      _columns[c]->render (cells[c], data[s], widths[c], row_color);
 
       if (cells[c].size () > max_lines)
         max_lines = cells[c].size ();
@@ -235,20 +228,20 @@ std::string View::render (std::vector <Task>& data, std::vector <int>& sequence)
 
     for (int i = 0; i < max_lines; ++i)
     {
-      out += left_margin + extra;
+      out += left_margin + (odd ? extra_odd : extra_even);
 
       for (int c = 0; c < _columns.size (); ++c)
       {
         if (c)
-          out += intra;
+          out += (odd ? intra_odd : intra_even);
 
         if (i < cells[c].size ())
           out += cells[c][i];
         else
-          out += color.colorize (std::string (widths[c], ' '));
+          out += row_color.colorize (std::string (widths[c], ' '));
       }
 
-      out += extra + "\n";
+      out += (odd ? extra_odd : extra_even) + "\n";
       ++_lines;
     }
 
diff --git a/src/columns/Column.cpp b/src/columns/Column.cpp
index d59663ef2..84a37b940 100644
--- a/src/columns/Column.cpp
+++ b/src/columns/Column.cpp
@@ -41,19 +41,54 @@ extern Context context;
 //
 Column* Column::factory (const std::string& name)
 {
-  // TODO Decompose name into type, format, key, direction and break.
+  // Decompose name into type and style.
+  std::string::size_type dot = name.find ('.');
+  std::string column_name;
+  std::string column_style;
+  if (dot != std::string::npos)
+  {
+    column_name = name.substr (0, dot);
+    column_style = name.substr (dot + 1);
+  }
+  else
+  {
+    column_name = name;
+    column_style = "default";
+  }
 
   Column* column;
-       if (name == "id")       column = new ColumnID ();
-  else if (name == "priority") column = new ColumnPriority ();
-  else if (name == "project")  column = new ColumnProject ();
+       if (column_name == "id")       column = new ColumnID ();
+  else if (column_name == "priority") column = new ColumnPriority ();
+  else if (column_name == "project")  column = new ColumnProject ();
   else
-    throw std::string ("Unrecognized column type '") + name + "'";
+    throw std::string ("Unrecognized column type '") + column_name + "'";
 
-  // TODO Set format.
-  // TODO Set key.
-  // TODO Set direction.
-  // TODO Set break.
+  column->setStyle (column_style);
+
+/*
+  // TODO Load the report column def from config
+  // TODO Parse column defs
+  // TODO   Create column object
+  // TODO   Column: name
+  // TODO   Column: style
+  // TODO   Column: break
+
+  // TODO Color: odd
+  // TODO Color: even
+  // TODO Color: intra_odd
+  // TODO Color: intra_even
+  // TODO Color: extra_odd
+  // TODO Color: extra_even
+  // TODO Color: header
+
+  // Terminal width.
+  view.width (getWidth ());
+
+  // TODO Intra padding.
+  // TODO Extra padding.
+  // TODO Margin.
+  // TODO Truncate lines/page.
+*/
 
   return column;
 }
diff --git a/test/view.t.cpp b/test/view.t.cpp
index ca0347502..a8ddf4ef7 100644
--- a/test/view.t.cpp
+++ b/test/view.t.cpp
@@ -44,7 +44,7 @@ int main (int argc, char** argv)
     context.config.set ("fontunderline", true);
 
     // Two sample tasks.
-    Task t1 ("[project:\"Home\"]");
+    Task t1 ("[project:\"Home\" priority:\"H\"]");
     t1.id = 1;
     Task t2 ("[project:\"Garden Care\"]");
     t2.id = 11;
@@ -65,15 +65,15 @@ int main (int argc, char** argv)
     View view;
     view.add (Column::factory ("id"));
     view.add (Column::factory ("project"));
-    view.width (16);
+    view.add (Column::factory ("priority"));
+    view.width (20);
     view.leftMargin (4);
     view.extraPadding (0);
     view.intraPadding (1);
     view.colorHeader (header_color);
 
     // Render the view.
-    std::cout << view.render (data, sequence)
-              << std::endl;
+    std::cout << view.render (data, sequence);
 
     t.is (view.lines (), 4, "View::lines == 4");
   }