X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fcolor.cpp;h=d70ed3f752b1020d87ec7f726a48df31de959360;hb=76bc5e374b4f97da13e0ec38f3bd47f2704f864a;hp=9b861b733b1d6947dbb20870bc08df9b0c0fca4f;hpb=5ddcf36f04cfbd10fabda4e3c5633cb27cdd4c0a;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/color.cpp b/synfig-core/trunk/src/synfig/color.cpp
index 9b861b7..d70ed3f 100644
--- a/synfig-core/trunk/src/synfig/color.cpp
+++ b/synfig-core/trunk/src/synfig/color.cpp
@@ -1,8 +1,8 @@
 /* === S Y N F I G ========================================================= */
-/*!	\file color.h
+/*!	\file color.cpp
 **	\brief Color Class
 **
-**	$Id: color.cpp,v 1.2 2005/01/23 04:03:21 darco Exp $
+**	$Id$
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
@@ -32,6 +32,8 @@
 #include <ETL/angle>
 #include "color.h"
 #include <cstdio>
+#include <sstream>
+#include <iostream>
 
 #endif
 
@@ -45,12 +47,70 @@ using namespace std;
 
 /* === G L O B A L S ======================================================= */
 
+String Color::hex_;
+
 /* === P R O C E D U R E S ================================================= */
 
 /* === M E T H O D S ======================================================= */
 
 
 
+ColorReal
+Color::hex2real(String s)
+{
+	std::istringstream i(s);
+	int n;
+	i.fill('0');
+	if (!(i >> hex >> n))
+		throw String("bad conversion from hex string \"") + s + String("\"");
+	return n / 255.0f;
+}
+
+const String
+Color::real2hex(ColorReal c)
+{
+	std::ostringstream o;
+	o.width(2);
+	o.fill('0');
+	if (c<0) c = 0;
+	if (c>1) c = 1;
+	o << hex << int(c*255.0f);
+	return o.str();
+}
+
+void
+Color::set_hex(String& hex)
+{
+	value_type r, g, b;
+	try
+	{
+		if (hex.size() == 1)
+		{
+			r = hex2real(hex.substr(0,1)+hex.substr(0,1));
+			r_ = g_ = b_ = r;
+		}
+		else if (hex.size() == 3)
+		{
+			r = hex2real(hex.substr(0,1)+hex.substr(0,1));
+			g = hex2real(hex.substr(1,1)+hex.substr(1,1));
+			b = hex2real(hex.substr(2,1)+hex.substr(2,1));
+			r_ = r; g_ = g; b_ = b;
+		}
+		else if (hex.size() == 6)
+		{
+			r = hex2real(hex.substr(0,2));
+			g = hex2real(hex.substr(2,2));
+			b = hex2real(hex.substr(4,2));
+			r_ = r; g_ = g; b_ = b;
+		}
+	}
+	catch (string s)
+	{
+		printf("caught <%s>\n", s.c_str());
+		return;
+	}
+}
+
 #if 0
 Color&
 Color::rotate_uv(const Angle& theta)const