ui fixed

Author: Haydelj

src/Core/Datatypes/ColorMap.cc

@@ -207,16 +207,12 @@ ColorRGB ColorMap::applyAlpha(double transformed, ColorRGB colorWithoutAlpha) co
 
 double ColorMap::alpha(double transformedValue) const
 {
-  transformedValue *= 364.0;
+  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.0;
-  double starty = 41.0;
-  double endx = 364.0;
-  double endy = starty;
-
+  double startx = 0.0f, starty, endx = 365.0f, endy;
   if(i == 0)
   {
     endx = alphaLookup_[0];
@@ -236,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) / 82.0f;
+  double value = 1.0f - ((1.0f - interp) * starty + (interp) * endy) * (1.0f / 83.0f);
   return value;
 }
 

src/Interface/Modules/Visualization/CreateStandardColorMapDialog.cc

@@ -94,7 +94,6 @@ void CreateStandardColorMapDialog::pullSpecial()
   }
   else
   {
-    previewColorMap_->addEndpoints();
     for (const auto& p : pointsVec)
     {
       auto pVec = p.toVector();
@@ -189,7 +188,6 @@ void ColormapPreview::mousePressEvent(QMouseEvent* event)
   }
 
   //TODO: remove point if event & RightMouseButton
-
   //TODO: points are movable!
 }
 
@@ -201,13 +199,6 @@ void ColormapPreview::addDefaultLine()
   alphaPath_ = scene()->addLine(defaultStart_.x(), defaultStart_.y(),
     defaultEnd_.x(), defaultEnd_.y(),
     alphaLinePen);
-  alphaManager_.insertEndpoints();
-}
-
-void AlphaFunctionManager::insertEndpoints()
-{
-  alphaPoints_.insert(defaultStart_);
-  insert(defaultEnd_); // only update function and state after both endpoints are added
 }
 
 void ColormapPreview::removeDefaultLine()
@@ -218,18 +209,13 @@ void ColormapPreview::removeDefaultLine()
 
 void ColormapPreview::addPoint(const QPointF& point)
 {
-  if (alphaManager_.alreadyExists(point))
-    return;
+  if (alphaManager_.alreadyExists(point)) return;
 
   removeDefaultLine();
 
   static QPen pointPen(Qt::white, 1);
   auto item = scene()->addEllipse(point.x() - 4, point.y() - 4, 8, 8, pointPen, QBrush(Qt::black));
   item->setZValue(1);
-  // QString toolTip;
-  // QDebug tt(&toolTip);
-  // tt << "Alpha point " << point.x() << ", " << point.y() << " y% " << (1 - point.y() / sceneRect().height());
-  // item->setToolTip(toolTip);
   alphaManager_.insert(point);
 
   drawAlphaPolyline();
@@ -264,8 +250,6 @@ void AlphaFunctionManager::pushToState()
       Variable::List alphaPointsVec;
       //strip endpoints before saving user-added points
       auto begin = alphaPoints_.begin(), end = alphaPoints_.end();
-      std::advance(begin, 1);
-      std::advance(end, -1);
       std::for_each(begin, end, [&](const QPointF& p) { alphaPointsVec.emplace_back(Name("alphaPoint"), makeAnonymousVariableList(p.x(), p.y())); });
       state_->setValue(Parameters::AlphaUserPointsVector, alphaPointsVec);
     }
@@ -284,15 +268,16 @@ void ColormapPreview::drawAlphaPolyline()
   auto pathItem = new QGraphicsPathItem();
   alphaPath_ = pathItem;
   pathItem->setPen(alphaLinePen);
+
   QPainterPath path;
-  QPointF from = defaultStart_;
-  path.moveTo(from);
+  auto start = alphaManager_.begin();
+  auto end = alphaManager_.end(); std::advance(end, -1);
+  QPointF from = QPointF(defaultStart_.x(), start->y());
+  QPointF to = QPointF(defaultEnd_.x(), end->y());
 
-  for (const auto& point : alphaManager_)
-  {
-    path.lineTo(point);
-    path.moveTo(point);
-  }
+  path.moveTo(from);
+  for (const auto& point : alphaManager_) path.lineTo(point);
+  path.lineTo(to);
 
   pathItem->setPath(path);
   pathItem->setZValue(0);
@@ -317,12 +302,11 @@ void AlphaFunctionManager::updateAlphaFunction()
 
   for (int i = 0; i < static_cast<int>(alphaFunction_.size()); ++i)
   {
-    if (i > 0 && i < alphaFunction_.size() - 1)
+    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);
-      // qDebug() << "Color: " << color << "Alpha: " << alphaFunction_[i] << "between points" << between.first << between.second;
     }
     else
     {
@@ -353,7 +337,7 @@ double AlphaFunctionManager::interpolateAlphaLineValue(const QPointF& leftEndpoi
 
 double AlphaFunctionManager::pointYToAlpha(double y) const
 {
-  return 1 - y / colorMapPreviewRect.height();
+  return 1.0f - y / colorMapPreviewRect.height();
 }
 
 QPointF AlphaFunctionManager::colorToPoint(double color) const

src/Interface/Modules/Visualization/CreateStandardColorMapDialog.h

@@ -50,7 +50,6 @@ namespace SCIRun {
     public:
       AlphaFunctionManager(const QPointF& start, const QPointF& end, SCIRun::Dataflow::Networks::ModuleStateHandle state, const boost::atomic<bool>& pulling);
       void clear();
-      void insertEndpoints();
       void insert(const QPointF& p);
       bool alreadyExists(const QPointF& p) const;
     private:
@@ -85,7 +84,6 @@ namespace SCIRun {
         QWidget* parent = nullptr);
     void addDefaultLine();
     void addPoint(const QPointF& point);
-    void addEndpoints() { alphaManager_.insertEndpoints(); }
     public Q_SLOTS:
       void clearAlphaPointGraphics();
     Q_SIGNALS:

src/Modules/Visualization/CreateStandardColorMap.cc

@@ -66,7 +66,6 @@ void CreateStandardColorMap::execute()
 
     //TODO cbright: pass computed alpha function from transient state to factory
     auto alphaPoints = state->getValue(Parameters::AlphaUserPointsVector).toVector();
-    std::cout << alphaPoints << "\n";
     std::vector<double> points;
     for(auto point : alphaPoints)
     {