Changeset 963

Timestamp:

Dec 9, 2009, 3:58:28 AM (14 years ago)

Author:

Peter Johansson

Message:

fixes #420 - use same color in blame output as in plots.

Location:

trunk/lib

Files:

• Colors.cc (modified) (4 diffs)
• Colors.h (modified) (2 diffs)
• File.cc (modified) (2 diffs)

trunk/lib/Colors.cc

@@ -37 +37 @@
   {
     color_map_[ 0].label="green";
-    color_map_[ 0].r=  0; color_map_[ 0].g=146; color_map_[ 0].b= 72;
+    color_map_[ 0].str="009248";
     color_map_[ 1].label="blue";
-    color_map_[ 1].r= 27; color_map_[ 1].g=117; color_map_[ 1].b=186;
+    color_map_[ 1].str="1b75ba";
     color_map_[ 2].label="red";
-    color_map_[ 2].r=189; color_map_[ 2].g= 32; color_map_[ 2].b= 46;
+    color_map_[ 2].str="bd202e";
     color_map_[ 3].label="grey";
-    color_map_[ 3].r=131; color_map_[ 3].g=131; color_map_[ 3].b=131;
+    color_map_[ 3].str="838383";
     color_map_[ 4].label="orange";
-    color_map_[ 4].r=245; color_map_[ 4].g=145; color_map_[ 4].b= 32;
+    color_map_[ 4].str="f59120";
     color_map_[ 5].label="brown";
-    color_map_[ 5].r=117; color_map_[ 5].g= 77; color_map_[ 5].b= 41;
+    color_map_[ 5].str="754d29";
     color_map_[ 6].label="cyan";
-    color_map_[ 6].r= 40; color_map_[ 6].g=170; color_map_[ 6].b=225;
+    color_map_[ 6].str="28aae1";
     color_map_[ 7].label="lime";
-    color_map_[ 7].r=213; color_map_[ 7].g=221; color_map_[ 7].b= 38;
+    color_map_[ 7].str="d5dd26";
     color_map_[ 8].label="purple";
-    color_map_[ 8].r=143; color_map_[ 8].g= 40; color_map_[ 8].b=140;
+    color_map_[ 8].str="8f288c";
     color_map_[ 9].label="lgrey";
-    color_map_[ 9].r=220; color_map_[ 9].g=220; color_map_[ 9].b=220;
+    color_map_[ 9].str="dcdcdc";
     color_map_[10].label="lbrown";
-    color_map_[10].r=194; color_map_[10].g=151; color_map_[10].b=106;
+    color_map_[10].str="c2976a";
     color_map_[11].label="pink";
-    color_map_[11].r=230; color_map_[11].g=125; color_map_[11].b=230;
+    color_map_[11].str="e67de6";
     color_map_[12].label="black";
-    color_map_[12].r=  0; color_map_[12].g=  0; color_map_[12].b=  0;
+    color_map_[12].str="000000";
+    // calculate corresponding rgb values
+    for (std::vector<color>::iterator col = color_map_.begin(); 
+         col!=color_map_.end(); ++col) {
+      str2rgb(col->str, col->r, col->g, col->b);
+    }
 
     typedef std::map<std::string, std::string> ACmap;
@@ -73 +78 @@
       c.label=i->first;
       str2rgb(i->second, c.r, c.g, c.b);
+      c.str = i->second;
       next_color_=color_map_.insert(next_color_,c);
       author_map_.insert(std::make_pair(c.label, next_color_++));
@@ -79 +85 @@
 
 
-  void Colors::get_color(const std::string& label, unsigned char& r,
-                           unsigned char& g, unsigned char& b)
+  const std::string& Colors::color_str(const std::string& label)
+  {
+    return get_color(label).str;
+  }
+
+
+  const Colors::color& Colors::get_color(const std::string& label)
   {
     std::map<std::string,std::vector<color>::iterator>::iterator i;
@@ -91 +102 @@
         next_color_=color_map_.begin();
     }
-    r = i->second->r;
-    g = i->second->g;
-    b = i->second->b;
+    return *(i->second);
+  }
+
+
+  void Colors::get_color(const std::string& label, unsigned char& r,
+                           unsigned char& g, unsigned char& b)
+  {
+    const color& col(get_color(label));
+    r = col.r;
+    g = col.g;
+    b = col.b;
   }
 

trunk/lib/Colors.h

@@ -43 +43 @@
 
     /**
+       Same as get_color(4) but color is returned as a hexadecimal
+       string rather than in rgb.
+
+       \return color string associated with label
+     */
+    const std::string& color_str(const std::string& label);
+
+    /**
        \brief Get RGB color for \a label
 
@@ -74 +82 @@
       std::string label;
       unsigned char r,g,b;
+      std::string str;
     };
+
+    const color& get_color(const std::string& label);
 
     std::map<std::string, std::vector<color>::iterator> author_map_;

trunk/lib/File.cc

@@ -23 +23 @@
 
 #include "Alias.h"
+#include "Colors.h"
 #include "Configuration.h"
 #include "Date.h"
@@ -290 +291 @@
       hs << Date(blame.date())("%d %b %y");
       os << "</font></td>\n<td class=\"author\">";
-      std::string author_color = 
-        Configuration::instance().author_str_color(blame.author()); 
-      if (!author_color.empty())
-        os << "<font color=\"#" << author_color << "\">";
+      const std::string& author_color = 
+        Colors::instance().color_str(blame.author());
+      assert(!author_color.empty());
+      os << "<font color=\"#" << author_color << "\">";
       hs << blame.author();
       os << "</td>\n<td class=\"";