cleaned up dead code and removed outdated comments

Author: Haydelj

src/Core/Datatypes/ColorMap.cc

@@ -192,11 +192,8 @@ double ColorMap::getTransformedValue(double f) const
 ColorRGB ColorMap::getColorMapVal(double v) const
 {
   double f = getTransformedValue(v);
-  //now grab the RGB
   auto colorWithoutAlpha = color_->getColorMapVal(f);
-  //TODO:
   return applyAlpha(f, colorWithoutAlpha);
-  //return colorWithoutAlpha;
 }
 
 ColorRGB ColorMap::applyAlpha(double transformed, ColorRGB colorWithoutAlpha) const
@@ -207,7 +204,6 @@ ColorRGB ColorMap::applyAlpha(double transformed, ColorRGB colorWithoutAlpha) co
 
 double ColorMap::alpha(double transformedValue) const
 {
-  //transformedValue *= 365.0f;
   if(alphaLookup_.size() == 0) return 0.5;
   int i;
   for(i = 0; (i < alphaLookup_.size()) && (alphaLookup_[i] < transformedValue); i += 2);

src/Core/Datatypes/ColorMap.h

@@ -52,7 +52,7 @@ namespace Datatypes {
       const std::string& name = "Rainbow", const size_t resolution = 256,
                         const double shift = 0.0, const bool invert = false,
                         const double rescale_scale = .5, const double rescale_shift = 1.0,
-                        const std::vector<double>& alphaPoints = std::vector<double>());
+                        const std::vector<double>& alphaPoints = {});
                         //TODO cbright: pass in alpha vector
     virtual ColorMap* clone() const override;
 
@@ -117,7 +117,7 @@ namespace Datatypes {
     static ColorMapHandle create(const std::string& name = "Rainbow", const size_t &resolution = 256,
                                     const double &shift = 0.0, const bool &invert = false,
                                     const double &rescale_scale = .5, const double &rescale_shift = 1.0,
-                                    const std::vector<double>& alphaPoints = std::vector<double>());
+                                    const std::vector<double>& alphaPoints = {});
     typedef std::vector<std::string> NameList;
     static NameList getList();
   private:

src/Interface/Modules/Visualization/CreateStandardColorMapDialog.cc

@@ -160,7 +160,6 @@ void CreateStandardColorMapDialog::onInvertCheck(bool b)
 AlphaFunctionManager::AlphaFunctionManager(const QPointF& start, const QPointF& end, ModuleStateHandle state, const boost::atomic<bool>& pulling) :
   state_(state),
   defaultStart_(start), defaultEnd_(end),
-  alphaFunction_(ALPHA_VECTOR_LENGTH, DEFAULT_ALPHA),
   dialogPulling_(pulling)
 {
 }
@@ -229,14 +228,12 @@ bool AlphaFunctionManager::alreadyExists(const QPointF& point) const
 void AlphaFunctionManager::insert(const QPointF& p)
 {
   alphaPoints_.insert(p);
-  updateAlphaFunction();
   pushToState();
 }
 
 void AlphaFunctionManager::clear()
 {
   alphaPoints_.clear();
-  alphaFunction_.assign(ALPHA_VECTOR_LENGTH, DEFAULT_ALPHA);
   pushToState();
 }
 
@@ -247,7 +244,6 @@ void AlphaFunctionManager::pushToState()
     if (!alphaPoints_.empty())
     {
       Variable::List alphaPointsVec;
-      //strip endpoints before saving user-added points
       auto begin = alphaPoints_.begin(), end = alphaPoints_.end();
       std::for_each(begin, end, [&](const QPointF& p) { alphaPointsVec.emplace_back(Name("alphaPoint"),
         makeAnonymousVariableList(p.x()/colormapPreviewWidth, 1.0f - p.y()/colormapPreviewHeight)); });
@@ -257,8 +253,6 @@ void AlphaFunctionManager::pushToState()
     {
       state_->setValue(Parameters::AlphaUserPointsVector, Variable::List());
     }
-
-    state_->setTransientValue(Parameters::AlphaFunctionVector, alphaFunction_);
   }
 }
 
@@ -295,26 +289,6 @@ void ColormapPreview::clearAlphaPointGraphics()
   addDefaultLine();
 }
 
-void AlphaFunctionManager::updateAlphaFunction()
-{
-  //from v4, color endpoints (0 and 1) are fixed at alpha = 0.5.
-  // alphaFunction_ will sample from in between these endpoints, evenly spaced throughout open interval (0,1)
-
-  for (int i = 0; i < static_cast<int>(alphaFunction_.size()); ++i)
-  {
-    if (false && i > 0 && i < alphaFunction_.size() - 1)
-    {
-      double color = i / static_cast<double>(ALPHA_SAMPLES + 1);
-      auto between = alphaLineEndpointsAtColor(color);
-      alphaFunction_[i] = interpolateAlphaLineValue(between.first, between.second, color);
-    }
-    else
-    {
-      alphaFunction_[i] = DEFAULT_ALPHA;
-    }
-  }
-}
-
 std::pair<QPointF,QPointF> AlphaFunctionManager::alphaLineEndpointsAtColor(double color) const
 {
   auto rightIter = alphaPoints_.upper_bound(colorToPoint(color));

src/Interface/Modules/Visualization/CreateStandardColorMapDialog.h

@@ -67,7 +67,6 @@ namespace SCIRun {
       const double DEFAULT_ALPHA = 0.5;
       const QPointF defaultStart_;
       const QPointF defaultEnd_;
-      std::vector<double> alphaFunction_;
       const boost::atomic<bool>& dialogPulling_;
     public:
       auto begin() const -> decltype(alphaPoints_.begin()) { return alphaPoints_.begin(); }