Merge branch 'transfer_function_editors'

* transfer_function_editors:
  Don't synchronize the axes in real time
  Unnecessary boundsChanged signals
  ctkVTKChartView was not supporting user bounds correctly
  Forgot to remove ColorPointsFunction

Conflicts:
	Libs/Visualization/VTK/Widgets/ctkVTKChartView.cpp

Libs/Visualization/VTK/Widgets/ctkVTKChartView.cpp

@@ -54,6 +54,7 @@ public:
   vtkSmartPointer<vtkContextView> ContextView;
   vtkSmartPointer<vtkChartXY> Chart;
   double UserBounds[8];
+  mutable double OldBounds[8];
 };
 
 // ----------------------------------------------------------------------------
@@ -68,6 +69,8 @@ ctkVTKChartViewPrivate::ctkVTKChartViewPrivate(ctkVTKChartView& object)
   this->ContextView->GetScene()->AddItem(this->Chart);
   this->UserBounds[0] = this->UserBounds[2] = this->UserBounds[4] = this->UserBounds[6] = 0.;
   this->UserBounds[1] = this->UserBounds[3] = this->UserBounds[5] = this->UserBounds[7] = -1.;
+  this->OldBounds[0] = this->OldBounds[2] = this->OldBounds[4] = this->OldBounds[6] = 0.;
+  this->OldBounds[1] = this->OldBounds[3] = this->OldBounds[5] = this->OldBounds[7] = -1.;
 }
 
 // ----------------------------------------------------------------------------
@@ -215,7 +218,22 @@ void ctkVTKChartView::addPlot(vtkPlot* plot)
 // ----------------------------------------------------------------------------
 void ctkVTKChartView::onChartUpdated()
 {
-  emit boundsChanged();
+  Q_D(ctkVTKChartView);
+  double oldBounds[8];
+  memcpy(oldBounds, d->OldBounds, 8 * sizeof(double));
+  double newBounds[8];
+  this->chartBounds(newBounds);
+  if (oldBounds[0] != newBounds[0] ||
+      oldBounds[1] != newBounds[1] ||
+      oldBounds[2] != newBounds[2] ||
+      oldBounds[3] != newBounds[3] ||
+      oldBounds[4] != newBounds[4] ||
+      oldBounds[5] != newBounds[5] ||
+      oldBounds[6] != newBounds[6] ||
+      oldBounds[7] != newBounds[7])
+    {
+    emit boundsChanged();
+    }
 }
 
 // ----------------------------------------------------------------------------
@@ -226,9 +244,12 @@ void ctkVTKChartView::chartBounds(double* bounds)const
     {
     // Invalid user bounds, return the real chart bounds
     d->chartBounds(bounds);
-    return;
     }
-  this->chartUserBounds(bounds);
+  else
+    {
+    this->chartUserBounds(bounds);
+    }
+  memcpy(d->OldBounds, bounds, 8 * sizeof(double));
 }
 
 // ----------------------------------------------------------------------------

Libs/Visualization/VTK/Widgets/ctkVTKScalarsToColorsView.cpp

@@ -74,6 +74,7 @@ void ctkVTKScalarsToColorsViewPrivate::init()
     {
     chart->GetAxis(i)->SetVisible(false);
     }
+  QObject::connect(q, SIGNAL(boundsChanged()), q, SLOT(onBoundsChanged()));
   q->onChartUpdated();
 }
 
@@ -106,7 +107,7 @@ void ctkVTKScalarsToColorsView::addPlot(vtkPlot* plot)
 }
 
 // ----------------------------------------------------------------------------
-void ctkVTKScalarsToColorsView::onChartUpdated()
+void ctkVTKScalarsToColorsView::onBoundsChanged()
 {
   this->boundAxesToChartBounds();
   this->setAxesToChartBounds();

Libs/Visualization/VTK/Widgets/ctkVTKScalarsToColorsView.h

@@ -83,11 +83,12 @@ public:
 public slots:
   void editPoint(vtkObject* plot, void * pointId);
 
+protected slots:
+  void onBoundsChanged();
+
 protected:
   QScopedPointer<ctkVTKScalarsToColorsViewPrivate> d_ptr;
 
-  virtual void onChartUpdated();
-
 private:
   Q_DECLARE_PRIVATE(ctkVTKScalarsToColorsView);
   Q_DISABLE_COPY(ctkVTKScalarsToColorsView);

Libs/Visualization/VTK/Widgets/ctkVTKScalarsToColorsWidget.h

@@ -67,6 +67,8 @@ public slots:
   void setYRange(double min, double max);
 
 signals:
+  /// Be carefull, axesModified() can be fired inside the Render() function
+  /// of the view. You might want to connect the slot using Qt::QueuedConnection
   void axesModified();
 
 protected slots:

Libs/Visualization/VTK/Widgets/ctkVTKVolumePropertyWidget.cpp

@@ -93,11 +93,11 @@ void ctkVTKVolumePropertyWidgetPrivate::setupUi(QWidget* widget)
   this->ScalarOpacityThresholdWidget->setVisible(false);
 
   QObject::connect(this->ScalarOpacityWidget, SIGNAL(axesModified()),
-                   q, SLOT(onAxesModified()));//, Qt::QueuedConnection);
+                   q, SLOT(onAxesModified()), Qt::QueuedConnection);
   QObject::connect(this->ScalarColorWidget, SIGNAL(axesModified()),
-                   q, SLOT(onAxesModified()));//, Qt::QueuedConnection);
+                   q, SLOT(onAxesModified()), Qt::QueuedConnection);
   QObject::connect(this->GradientWidget, SIGNAL(axesModified()),
-                   q, SLOT(onAxesModified()));//, Qt::QueuedConnection);
+                   q, SLOT(onAxesModified()), Qt::QueuedConnection);
 
   this->GradientGroupBox->setCollapsed(true);
   this->AdvancedGroupBox->setCollapsed(true);