Merge pull request #762 from finetjul/fix-discretizable-transfer-function-widget

Fix discretizable transfer function widget

Libs/Visualization/VTK/Core/vtkDiscretizableColorTransferChart.cpp

@@ -454,6 +454,13 @@ double* vtkDiscretizableColorTransferChart::GetCurrentRange()
 void vtkDiscretizableColorTransferChart::CenterRange(double center)
 {
   double width = this->CurrentRange[1] - this->CurrentRange[0];
+  double limitRange[2];
+  limitRange[0] = std::min(this->OriginalRange[0], this->DataRange[0]);
+  limitRange[1] = std::max(this->OriginalRange[1], this->DataRange[1]);
+  double limitWidth = 2.0 * std::min(center - limitRange[0], limitRange[1] - center);
+
+  width = width < limitWidth ? width : limitWidth;
+
   double newMin = center - width / 2;
   double newMax = newMin + width;
 

Libs/Visualization/VTK/Widgets/ctkVTKDiscretizableColorTransferWidget.cpp

@@ -260,6 +260,9 @@ void
 ctkVTKDiscretizableColorTransferWidgetPrivate::colorTransferFunctionModifiedCallback(
   vtkObject *caller, unsigned long eid, void *clientdata, void *calldata)
 {
+  Q_UNUSED(caller);
+  Q_UNUSED(eid);
+  Q_UNUSED(calldata);
   ctkVTKDiscretizableColorTransferWidgetPrivate* self =
     reinterpret_cast<ctkVTKDiscretizableColorTransferWidgetPrivate*>(
       clientdata);
@@ -514,7 +517,11 @@ void ctkVTKDiscretizableColorTransferWidget::setColorTransferFunctionRange(
   double minValue, double maxValue)
 {
   Q_D(ctkVTKDiscretizableColorTransferWidget);
-
+  if (minValue == d->scalarsToColorsContextItem->GetCurrentRange()[0] &&
+      maxValue == d->scalarsToColorsContextItem->GetCurrentRange()[1])
+  {
+    return;
+  }
   d->scalarsToColorsContextItem->SetCurrentRange(minValue, maxValue);
 }
 
@@ -544,8 +551,7 @@ void ctkVTKDiscretizableColorTransferWidget::resetColorTransferFunctionRange()
   Q_D(ctkVTKDiscretizableColorTransferWidget);
   if (d->dataRange[0] <= d->dataRange[1])
   {
-    d->scalarsToColorsContextItem->SetCurrentRange(
-      d->dataRange[0], d->dataRange[1]);
+    setColorTransferFunctionRange(d->dataRange[0], d->dataRange[1]);
   }
 }
 

Libs/Widgets/ctkRangeSlider.cpp

@@ -625,12 +625,16 @@ void ctkRangeSlider::paintEvent( QPaintEvent* )
   //
   if (this->isMinimumSliderDown())
     {
+    painter.setClipRect(ur);
     d->drawMaximumSlider( &painter );
+    painter.setClipRect(lr);
     d->drawMinimumSlider( &painter );
     }
   else
     {
+    painter.setClipRect(lr);
     d->drawMinimumSlider( &painter );
+    painter.setClipRect(ur);
     d->drawMaximumSlider( &painter );
     }
 }