Fix colorRGB string parsing

Default white color in ShowField resurrected.

Author: dcwhite

src/Core/Datatypes/Color.cc

@@ -49,16 +49,12 @@ ColorRGB::ColorRGB(const std::string& rgb) : r_(1.0), g_(1.0), b_(1.0)
 {
   try
   {
-    static boost::regex r("Color\\((\\d+),(\\d+),(\\d+)\\)");
+    static boost::regex r("Color\\((.+),(.+),(.+)\\)");
     boost::smatch what;
     regex_match(rgb, what, r);
-    int red = boost::lexical_cast<int>(what[1]);
-    int green = boost::lexical_cast<int>(what[2]);
-    int blue = boost::lexical_cast<int>(what[3]);
-
-    r_ = static_cast<double>(red) / 255.0f;
-    g_ = static_cast<double>(green) / 255.0f;
-    b_ = static_cast<double>(blue) / 255.0f;
+    r_ = boost::lexical_cast<double>(what[1]);
+    g_ = boost::lexical_cast<double>(what[2]);
+    b_ = boost::lexical_cast<double>(what[3]);
   }
   catch (...)
   {

src/Core/Datatypes/Color.h

@@ -6,7 +6,7 @@
    Copyright (c) 2012 Scientific Computing and Imaging Institute,
    University of Utah.
 
-   
+
    Permission is hereby granted, free of charge, to any person obtaining a
    copy of this software and associated documentation files (the "Software"),
    to deal in the Software without restriction, including without limitation
@@ -26,10 +26,10 @@
    DEALINGS IN THE SOFTWARE.
 */
 
-/// @todo Documentation Core/Datatypes/Color.h 
+/// @todo Documentation Core/Datatypes/Color.h
 
 #ifndef CORE_DATATYPES_COLORRGB_H
-#define CORE_DATATYPES_COLORRGB_H 
+#define CORE_DATATYPES_COLORRGB_H
 
 #include <iosfwd>
 #include <Core/Datatypes/Datatype.h>
@@ -39,14 +39,14 @@ namespace SCIRun {
 namespace Core {
 namespace Datatypes {
 
-  class SCISHARE ColorRGB 
+  class SCISHARE ColorRGB
   {
   private:
     double r_, g_, b_;
   public:
     ColorRGB();
     explicit ColorRGB(const std::string& rgb);
-    ColorRGB(double, double, double);
+    ColorRGB(double r, double g, double b);
 
     // These equality operations should use floating point comparisons.
     inline bool operator==(const ColorRGB& c) const {

src/Core/Datatypes/Tests/ScalarTests.cc

@@ -36,21 +36,27 @@ using ::testing::DefaultValue;
 using ::testing::Return;
 using namespace SCIRun::Core::Datatypes;
 
-/// @todo DAN
-///       Re-enable tests below to take into account floating point colors.
-
 TEST(ColorTests, CanParseString)
 {
-  // ColorRGB c(1.0,2.0,3.0);
-  // const std::string expected = "Color(1,2,3)";
-  // EXPECT_EQ(expected, c.toString());
-  // ColorRGB c2(expected);
-  // EXPECT_EQ(c, c2);
+  ColorRGB c(1.0,2.0,3.0);
+  const std::string expected = "Color(1,2,3)";
+  EXPECT_EQ(expected, c.toString());
+  ColorRGB c2(expected);
+  EXPECT_EQ(c, c2);
+}
+
+TEST(ColorTests, CanParseStringFloating)
+{
+  ColorRGB c(1.3,2.9,3.00014);
+  const std::string expected = "Color(1.3,2.9,3.00014)";
+  EXPECT_EQ(expected, c.toString());
+  ColorRGB c2(expected);
+  EXPECT_EQ(c, c2);
 }
 
 TEST(ColorTests, EmptyStringYieldsWhite)
 {
-  // ColorRGB c(255.0,255.0,255.0);
-  // ColorRGB c2("");
-  // EXPECT_EQ(c, c2);
+  ColorRGB c(1.0,1.0,1.0);
+  ColorRGB c2("");
+  EXPECT_EQ(c, c2);
 }