removed preview size dependency from the internal representation of colormaps

Author: Haydelj

src/Core/Datatypes/ColorMap.cc

@@ -207,12 +207,12 @@ ColorRGB ColorMap::applyAlpha(double transformed, ColorRGB colorWithoutAlpha) co
 
 double ColorMap::alpha(double transformedValue) const
 {
-  transformedValue *= 365.0f;
+  //transformedValue *= 365.0f;
   if(alphaLookup_.size() == 0) return 0.5;
   int i;
   for(i = 0; (i < alphaLookup_.size()) && (alphaLookup_[i] < transformedValue); i += 2);
 
-  double startx = 0.0f, starty, endx = 365.0f, endy;
+  double startx = 0.0f, starty, endx = 1.0f, endy;
   if(i == 0)
   {
     endx = alphaLookup_[0];
@@ -232,7 +232,7 @@ double ColorMap::alpha(double transformedValue) const
   }
 
   double interp = (transformedValue - startx) / (endx - startx);
-  double value = 1.0f - ((1.0f - interp) * starty + (interp) * endy) * (1.0f / 83.0f);
+  double value = ((1.0f - interp) * starty + (interp) * endy);
   return value;
 }
 

src/Interface/Modules/Visualization/CreateStandardColorMapDialog.cc

@@ -38,6 +38,12 @@ using namespace SCIRun::Core::Datatypes;
 
 typedef SCIRun::Modules::Visualization::CreateStandardColorMap CreateStandardColorMapModule;
 
+namespace
+{
+  const double colormapPreviewHeight = 83;
+  const double colormapPreviewWidth = 365;
+  const QRectF colorMapPreviewRect(0, 0, colormapPreviewWidth, colormapPreviewHeight);
+}
 
 CreateStandardColorMapDialog::CreateStandardColorMapDialog(const std::string& name, ModuleStateHandle state,
   QWidget* parent /* = 0 */)
@@ -97,7 +103,7 @@ void CreateStandardColorMapDialog::pullSpecial()
     for (const auto& p : pointsVec)
     {
       auto pVec = p.toVector();
-      previewColorMap_->addPoint(QPointF(pVec[0].toDouble(), pVec[1].toDouble()));
+      previewColorMap_->addPoint(QPointF(pVec[0].toDouble() * colormapPreviewWidth, (1.0f - pVec[1].toDouble()) * colormapPreviewHeight));
     }
   }
 }
@@ -159,13 +165,6 @@ AlphaFunctionManager::AlphaFunctionManager(const QPointF& start, const QPointF&
 {
 }
 
-namespace
-{
-  const double colormapPreviewHeight = 83;
-  const double colormapPreviewWidth = 365;
-  const QRectF colorMapPreviewRect(0, 0, colormapPreviewWidth, colormapPreviewHeight);
-}
-
 ColormapPreview::ColormapPreview(QGraphicsScene* scene, ModuleStateHandle state,
   const boost::atomic<bool>& pulling,
   QWidget* parent)
@@ -250,7 +249,8 @@ void AlphaFunctionManager::pushToState()
       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(), p.y())); });
+      std::for_each(begin, end, [&](const QPointF& p) { alphaPointsVec.emplace_back(Name("alphaPoint"),
+        makeAnonymousVariableList(p.x()/colormapPreviewWidth, 1.0f - p.y()/colormapPreviewHeight)); });
       state_->setValue(Parameters::AlphaUserPointsVector, alphaPointsVec);
     }
     else