Changeset 928

Timestamp:

Dec 2, 2009, 8:43:57 AM (14 years ago)

Author:

Jari Häkkinen

Message:

Addresses #413. Same colour for authors for all blame output and plots. Colours from config used.

Location:

trunk/lib

Files:

• Colours.cc (modified) (3 diffs)
• Colours.h (modified) (1 diff)
• Configuration.cc (modified) (2 diffs)
• Configuration.h (modified) (2 diffs)

trunk/lib/Colours.cc

@@ -22 +22 @@
 #include "Colours.h"
 
+#include "Configuration.h"
+
 #include <cstdlib>
+#include <ctype.h>
 
 namespace theplu {
@@ -60 +63 @@
     colour_map_[12].label="black";
     colour_map_[12].r=  0; colour_map_[12].g=  0; colour_map_[12].b=  0;
+
+    typedef std::map<std::string, std::string> ACmap;
+    const ACmap& authcols=Configuration::instance().author_colors();
+    std::map<std::string,std::vector<colour>::iterator>::iterator j;
+    for (ACmap::const_iterator i=authcols.begin(); i!=authcols.end(); i++) {
+      colour c;
+      c.label=i->first;
+      c.r= 16*to_decimal(i->second[0]) + to_decimal(i->second[1]);
+      c.g= 16*to_decimal(i->second[2]) + to_decimal(i->second[3]);
+      c.b= 16*to_decimal(i->second[4]) + to_decimal(i->second[5]);
+      next_colour_=colour_map_.insert(next_colour_,c);
+      author_map_.insert(std::make_pair(c.label, next_colour_++));
+    }
   }
 
@@ -88 +104 @@
   }
 
+
+  int Colours::to_decimal(int hex)
+  {
+    hex=toupper(hex);
+    if (hex>47 && hex<58) // 0--9
+      return hex-48;
+    if (hex>64 && hex<71) // A--F
+      return hex-55;
+    return -1;
+  }
+
 }} // end of namespace svndigest and namespace theplu

trunk/lib/Colours.h

@@ -65 +65 @@
     Colours(const Colours&);
 
+    // Convert char from hexadecimal to decimal, if char is out of
+    // range -1 is returned.
+    int to_decimal(int);
+
     // Assignment not implemented because assignment is always self-assignment
     Colours& operator=(const Colours&);

trunk/lib/Configuration.cc

@@ -2 +2 @@
 
 /*
-  Copyright (C) 2007, 2008 Jari Häkkinen, Peter Johansson
-  Copyright (C) 2009 Peter Johansson
+  Copyright (C) 2007, 2008, 2009 Jari Häkkinen, Peter Johansson
 
   This file is part of svndigest, http://dev.thep.lu.se/svndigest
@@ -60 +59 @@
   }
 
+
+  const std::map<std::string, std::string>&
+  Configuration::author_colors(void) const
+  {
+    return author_color_;
+  }
 
   std::string Configuration::author_str_color(const std::string& author) const

trunk/lib/Configuration.h

@@ -5 +5 @@
 
 /*
-  Copyright (C) 2007, 2008 Jari Häkkinen, Peter Johansson
-  Copyright (C) 2009 Peter Johansson
+  Copyright (C) 2007, 2008, 2009 Jari Häkkinen, Peter Johansson
 
   This file is part of svndigest, http://dev.thep.lu.se/svndigest
@@ -46 +45 @@
 
     /**
-       \return hexadecimal color code (e.g. 5aee4a) that is used in
-       blame output. If no color is configured for \a author, an empty
-       string is returned.
+       \return Hexadecimal color code (e.g. 5aee4a) that is used in
+       blame output and as line colors in plots. If no color is
+       configured for \a author, an empty string is returned.
      */
     std::string author_str_color(const std::string& author) const;
+
+    /**
+       The map to lookup the author-color mapping set in the
+       configuration file. The color code is a six digit hexadecimal
+       number rrggbb.
+
+       \return The author-color map
+    */
+    const std::map<std::string, std::string>& author_colors(void) const;
 
     /**