Changeset 919

Timestamp:

Dec 1, 2009, 12:03:31 AM (14 years ago)

Author:

Jari Häkkinen

Message:

Addresses #75. Colours are dynamically assigned to authors. Removed white from the colour map.

Location:

trunk

Files:

• lib/Colours.cc (modified) (2 diffs)
• lib/Colours.h (modified) (2 diffs)
• test/Makefile.am (modified) (2 diffs)
• test/colour_test.cc (added)

trunk/lib/Colours.cc

@@ -31 +31 @@
 
   Colours::Colours(void)
-    : colour_map_(14)
+    : colour_map_(13), next_colour_(colour_map_.begin())
+
   {
     colour_map_[ 0].label="green";
@@ -59 +60 @@
     colour_map_[12].label="black";
     colour_map_[12].r=  0; colour_map_[12].g=  0; colour_map_[12].b=  0;
-    colour_map_[13].label="white";
-    colour_map_[13].r=255; colour_map_[13].g=255; colour_map_[13].b=255;
-
-    // temporary until proper configuration is implemented
-    std::vector<colour>::iterator i=colour_map_.begin();
-    author_map_["jari"]=i++;
-    author_map_["peter"]=i++;
   }
 
 
   void Colours::get_colour(const std::string& label, unsigned char& r,
-                           unsigned char& g, unsigned char& b) const
+                           unsigned char& g, unsigned char& b)
   {
-    r=g=b=0;
     std::map<std::string,std::vector<colour>::iterator>::const_iterator i;
-    if ((i=author_map_.find(label)) == author_map_.end())
-      // no colour defined for label
-      return;
-    r=i->second->r; g=i->second->g; b=i->second->b;
+    if ((i=author_map_.find(label)) == author_map_.end()) {
+      // no colour defined for label, set colour for label
+      author_map_[label]=next_colour_++;
+      if (next_colour_==colour_map_.end())
+        // end of colour map reach, start over
+        next_colour_=colour_map_.begin();
+    }
+    r=author_map_[label]->r;
+    g=author_map_[label]->g;
+    b=author_map_[label]->b;
   }
 

trunk/lib/Colours.h

@@ -30 +30 @@
 namespace svndigest {
 
+  /**
+     The author-colour mapping is provided by the Colours class.
+
+     Colours use the singleton design pattern.
+   */
   class Colours
   {
   public:
 
+    /**
+       \brief Get RGB colour for \a label
+
+       If \a label has no assigned colour, the next unused colour is
+       automatically assigned to \a label. The number of available
+       unique colours is low, when all colours are used mapped with a
+       \a label once, the colours are reused.
+
+       \see To be written. If a specific colour is to be assigned for
+       a label, use function TBA.
+     */
     void get_colour(const std::string& label, unsigned char& r,
-                    unsigned char& g, unsigned char& b) const;
+                    unsigned char& g, unsigned char& b);
 
+    /**
+       \brief Get an instance of Colour
+     */
     static Colours& instance(void);
 
@@ -57 +76 @@
     };
 
+    std::map<std::string, std::vector<colour>::iterator> author_map_;
+    std::vector<colour> colour_map_;
     static Colours* instance_;
-    std::vector<colour> colour_map_;
-    std::map<std::string, std::vector<colour>::iterator> author_map_;
+    std::vector<colour>::iterator next_colour_;
   };
 

trunk/test/Makefile.am

@@ -22 +22 @@
 check_SCRIPTS = svn_update.sh
 
-check_PROGRAMS = cache_partial_test \
+check_PROGRAMS = cache_partial_test colour_test \
   config_test copyright_test date_test \
   parser_test stats_test trac_test utility_test
@@ -54 +54 @@
 
 cache_partial_test_SOURCES = cache_partial_test.cc
+colour_test_SOURCES = colour_test.cc
 config_test_SOURCES = config_test.cc
 copyright_test_SOURCES = copyright_test.cc