Changeset 916

Timestamp:

Nov 30, 2009, 9:02:40 PM (14 years ago)

Author:

Jari Häkkinen

Message:

Addresses #75. Added author colouring. Currently jari and peter gets non-black hard-coded colour.

Location:

trunk/lib

Files:

• Colours.cc (added)
• Colours.h (added)
• Graph.h (modified) (2 diffs)
• Makefile.am (modified) (2 diffs)
• Stats.cc (modified) (2 diffs)

trunk/lib/Graph.h

@@ -59 +59 @@
     ~Graph(void);
 
-    static bool date_xticks(void);
-
     /**
        \brief Set the pen colour to use in next drawing call
     */
     void current_colour(unsigned char r, unsigned char g, unsigned char b);
+
+    static bool date_xticks(void);
 
     /**
@@ -111 +111 @@
   private:
 
+    // Copy constructor not implemented
+    Graph(const Graph&);
+
     struct legend_data {
       std::string label;

trunk/lib/Makefile.am

@@ -33 +33 @@
 
 noinst_HEADERS = AddStats.h Alias.h BlameStats.h ClassicStats.h \
-  Commitment.h Configuration.h css.h \
+  Colours.h Commitment.h Configuration.h css.h \
   Date.h Directory.h File.h first_page.h Functor.h \
   Graph.h \
@@ -43 +43 @@
 
 libsvndigest_a_SOURCES = AddStats.cc Alias.cc BlameStats.cc \
-  ClassicStats.cc \
+  ClassicStats.cc Colours.cc \
   Commitment.cc Configuration.cc \
   css.cc Date.cc Directory.cc File.cc first_page.cc\

trunk/lib/Stats.cc

@@ -24 +24 @@
 #include "Stats.h"
 
+#include "Colours.h"
 #include "Functor.h"
 #include "Graph.h"
@@ -385 +386 @@
     std::sort(author_cont.begin(), author_cont.end(), compare);
 
-    size_t plotno=author_cont.size();
     vec_type::iterator end(author_cont.end());
     for (vec_type::iterator i(author_cont.begin()); i!=end; ++i) {
-      // the RGB values below must be replaced ... seg fault will
-      // happen! plotno will probably become unused when below row is
-      // removed or fixed.
-      gp.current_colour(25*plotno,255-25*plotno,75);
+      unsigned char r, g, b;
+      Colours::instance().get_colour(i->first,r,g,b);
+      gp.current_colour(r,g,b);
       gp.plot(i->second, i->first, get_back(*stat, i->first));
     }