Merge branch 'master' into modules_V

Author: dcwhite

src/CMakeLists.txt

@@ -729,6 +729,8 @@ SET_PROPERTY(TARGET Core_Application         PROPERTY FOLDER "Core")
 SET_PROPERTY(TARGET Core_Application_Preferences         PROPERTY FOLDER "Core")
 SET_PROPERTY(TARGET Core_Application_Session         PROPERTY FOLDER "Core")
 SET_PROPERTY(TARGET Core_Utils         PROPERTY FOLDER "Core")
+SET_PROPERTY(TARGET Core_ICom         PROPERTY FOLDER "Core")
+SET_PROPERTY(TARGET Core_Services         PROPERTY FOLDER "Core")
 SET_PROPERTY(TARGET Core_Math         PROPERTY FOLDER "Core")
 SET_PROPERTY(TARGET Core_Matlab         PROPERTY FOLDER "Core")
 SET_PROPERTY(TARGET Core_Parser         PROPERTY FOLDER "Core")

src/Core/Datatypes/Color.cc

@@ -36,16 +36,21 @@
 using namespace SCIRun::Core::Datatypes;
 
 ColorRGB::ColorRGB()
-  : r_(1.0), g_(1.0), b_(1.0)
+  : r_(1.0), g_(1.0), b_(1.0), a_(1.0)
 {
 }
 
 ColorRGB::ColorRGB(double r, double g, double b)
-  : r_(r), g_(g), b_(b)
+  : r_(r), g_(g), b_(b), a_(1.0)
 {
 }
 
-ColorRGB::ColorRGB(const std::string& rgb) : r_(1.0), g_(1.0), b_(1.0)
+ColorRGB::ColorRGB(double r, double g, double b, double a)
+  : r_(r), g_(g), b_(b), a_(a)
+{
+}
+
+ColorRGB::ColorRGB(const std::string& rgb) : r_(1.0), g_(1.0), b_(1.0), a_(1.0)
 {
   try
   {

src/Core/Datatypes/Color.h

@@ -42,15 +42,16 @@ namespace Datatypes {
   class SCISHARE ColorRGB
   {
   private:
-    double r_, g_, b_;
+    double r_, g_, b_, a_;
   public:
     ColorRGB();
     explicit ColorRGB(const std::string& rgb);
     ColorRGB(double r, double g, double b);
+    ColorRGB(double r, double g, double b, double a);
 
     // These equality operations should use floating point comparisons.
     inline bool operator==(const ColorRGB& c) const {
-      return ((r_==c.r_)&&(g_==c.g_)&&(b_==c.b_));
+      return ((r_==c.r_)&&(g_==c.g_)&&(b_==c.b_)&&(a_==c.a_));
     }
 
     inline bool operator!=(const ColorRGB& c) const {
@@ -63,6 +64,7 @@ namespace Datatypes {
     inline double r() const {return r_;}
     inline double g() const {return g_;}
     inline double b() const {return b_;}
+    inline double a() const {return a_;}
 
     std::string toString() const;
   };

src/Core/Datatypes/ColorMap.cc

@@ -173,9 +173,12 @@ ColorRGB ColorMap::valueToColor(double scalar) const {
  */
 ColorRGB ColorMap::valueToColor(const Tensor &tensor) const {
     //TODO this is probably not implemented correctly.
-    return ColorRGB(getTransformedColor(fabs(tensor.xx())),
-                    getTransformedColor(fabs(tensor.yy())),
-                    getTransformedColor(fabs(tensor.zz())));
+    //return ColorRGB(getTransformedColor(fabs(tensor.xx())), getTransformedColor(fabs(tensor.yy())), getTransformedColor(fabs(tensor.zz())));
+  double eigen1, eigen2, eigen3;
+  Tensor ten = tensor;
+  ten.get_eigenvalues(eigen1, eigen2, eigen3);
+  double primaryEigen = std::max(std::max(eigen1, eigen2), eigen3);
+  return getColorMapVal(primaryEigen);
 }
 /**
  * @name valueToColor
@@ -185,10 +188,8 @@ ColorRGB ColorMap::valueToColor(const Tensor &tensor) const {
  */
 ColorRGB ColorMap::valueToColor(const Vector &vector) const {
     //TODO this is probably not implemented correctly.
-    return ColorRGB(getTransformedColor(fabs(vector.x())),
-                    getTransformedColor(fabs(vector.y())),
-                    getTransformedColor(fabs(vector.z())));
-
+   // return ColorRGB(getTransformedColor(fabs(vector.x())),getTransformedColor(fabs(vector.y())), getTransformedColor(fabs(vector.z())));
+  return getColorMapVal(vector.length());
 }
 
 std::string ColorMap::getColorMapName() const { return name_; }