Changeset 941 for trunk/lib

Timestamp:

Dec 3, 2009, 7:05:39 AM (13 years ago)

Author:

Peter Johansson

Message:

refs #419. Lifted some functions/code from Colors' privacy to be reachable also from Configuration class.

Location:

trunk/lib

Files:

• Colors.cc (modified) (3 diffs)
• Colors.h (modified) (2 diffs)

trunk/lib/Colors.cc

@@ -73 +73 @@
       color c;
       c.label=i->first;
-      if (i->second.size()==6) {
-        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]);
-      }
-      else if (i->second.size()==3) {
-        c.r= 16*to_decimal(i->second[0]) + to_decimal(i->second[0]);
-        c.g= 16*to_decimal(i->second[1]) + to_decimal(i->second[1]);
-        c.b= 16*to_decimal(i->second[2]) + to_decimal(i->second[2]);
-      }
-      else 
-        throw std::runtime_error("invalid color format: " + i->second);
+      str2rgb(i->second, c.r, c.g, c.b);
       next_color_=color_map_.insert(next_color_,c);
       author_map_.insert(std::make_pair(c.label, next_color_++));
@@ -117 +106 @@
 
 
-  int Colors::to_decimal(int hex)
+  int to_decimal(int hex)
   {
     hex=toupper(hex);
@@ -127 +116 @@
   }
 
+  void str2rgb(const std::string& str, unsigned char& r, unsigned char& g,
+               unsigned char& b)
+  {
+    if (str.size()==6) {
+      r = 16*to_decimal(str[0]) + to_decimal(str[1]);
+      g = 16*to_decimal(str[2]) + to_decimal(str[3]);
+      b = 16*to_decimal(str[4]) + to_decimal(str[5]);
+    }
+    else if (str.size()==3) {
+      r = 17*to_decimal(str[0]);
+      g = 17*to_decimal(str[1]);
+      b = 17*to_decimal(str[2]);
+    }
+    else 
+      throw std::runtime_error("invalid color format: " + str);
+  }
+
+
 }} // end of namespace svndigest and namespace theplu

trunk/lib/Colors.h

@@ -65 +65 @@
     Colors(const Colors&);
 
-    // 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
     Colors& operator=(const Colors&);
@@ -86 +82 @@
   };
 
+  /**
+     Convert a string to color rgb values. The input str must be
+     either of length 3 or 6 and each character should be a
+     hexadecimal.
+   */
+  void str2rgb(const std::string& str, unsigned char& r, unsigned char& g,
+               unsigned char& b);
+
+  // Convert char from hexadecimal to decimal, if char is out of
+  // range -1 is returned.
+  int to_decimal(int);
+
 }} // end of namespace svndigest and namespace theplu