Merge branch 'master' into plot-matrix-settings

Conflicts:
	ParaViewCore/ClientServerCore/vtkPVPlotMatrixRepresentation.h
	VTK

Change-Id: Ic4c200b49c225cda93d8c7b92da69ed70728ec54

Author: cryos

ParaViewCore/ClientServerCore/vtkPVPlotMatrixRepresentation.h

@@ -105,6 +105,9 @@ class VTK_EXPORT vtkPVPlotMatrixRepresentation : public vtkChartRepresentation
   virtual bool RemoveFromView(vtkView *view);
 
 private:
+  vtkPVPlotMatrixRepresentation(const vtkPVPlotMatrixRepresentation&); // Not implemented
+  void operator=(const vtkPVPlotMatrixRepresentation&); // Not implemented
+
   vtkColor4ub ActivePlotColor;
   vtkColor4ub ScatterPlotColor;
   vtkColor4ub HistogramColor;

Qt/Components/pqPipelineBrowserWidget.cxx

@@ -102,7 +102,7 @@ pqPipelineBrowserWidget::pqPipelineBrowserWidget(QWidget* parentObject)
   // Make sure the tree items get expanded when new descendents
   // are added.
   QObject::connect(this->PipelineModel, SIGNAL(firstChildAdded(const QModelIndex &)),
-      this, SLOT(expand(const QModelIndex &)));
+      this, SLOT(expandWithModelIndexTranslation(const QModelIndex &)));
 }
 
 //-----------------------------------------------------------------------------
@@ -288,3 +288,9 @@ const pqPipelineModel* pqPipelineBrowserWidget::getPipelineModel(const QModelInd
   // Make a recusrive call to support unknown filter depth
   return this->getPipelineModel(filterModel->mapToSource(index));
 }
+
+//----------------------------------------------------------------------------
+void pqPipelineBrowserWidget::expandWithModelIndexTranslation(const QModelIndex &index)
+{
+  this->expand(this->FilteredPipelineModel->mapFromSource(index));
+}

Qt/Components/pqPipelineBrowserWidget.h

@@ -75,6 +75,7 @@ public slots:
 
 protected slots:
   void handleIndexClicked(const QModelIndex& index);
+  void expandWithModelIndexTranslation(const QModelIndex &);
 
 protected:
   /// sets the visibility for items in the indices list.