Refs #6315. Adding update calls.

mantidproject · Dec 13, 2012 · d49a749 · d49a749
1 parent 36b8e0e
commit d49a749
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/MdViewerWidget.cpp b/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/MdViewerWidget.cpp
@@ -394,7 +394,7 @@ void MdViewerWidget::setParaViewComponentsForView()
  */
 void MdViewerWidget::onDataLoaded(pqPipelineSource* source)
 {
-  UNUSED_ARG(source);
+  source->updatePipeline();
   this->renderAndFinalSetup();
 }
 

diff --git a/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/MultisliceView.cpp b/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/MultisliceView.cpp
@@ -298,7 +298,7 @@ void MultiSliceView::makeCut(double origin[], double orient[])
 
   vtkSMPropertyHelper(plane, "Origin").Set(origin, 3);
   vtkSMPropertyHelper(plane, "Normal").Set(orient, 3);
-  trepr->getProxy()->UpdateVTKObjects();
+  repr->getProxy()->UpdateVTKObjects();
 }
 
 void MultiSliceView::selectIndicator()
@@ -351,9 +351,9 @@ void MultiSliceView::indicatorSelected(const QString &name)
 void MultiSliceView::updateCutPosition(double position)
 {
   vtkSMProxySelectionModel *selection = pqActiveObjects::instance().activeSourcesSelectionModel();
-  pqServerManagerModel* pqModel = pqApplicationCore::instance()->getServerManagerModel();
+  //pqServerManagerModel* pqModel = pqApplicationCore::instance()->getServerManagerModel();
   vtkSMProxy* smProxy = selection->GetSelectedProxy(0);
-  pqPipelineSource *cut = pqModel->findItem<pqPipelineSource*>(smProxy);
+  //pqPipelineSource *cut = pqModel->findItem<pqPipelineSource*>(smProxy);
 
   vtkSMProxy *plane = vtkSMPropertyHelper(smProxy, "CutFunction").GetAsProxy();
   double origin[3] = {0.0, 0.0, 0.0};
@@ -370,7 +370,7 @@ void MultiSliceView::updateCutPosition(double position)
     origin[2] = position;
   }
   vtkSMPropertyHelper(plane, "Origin").Set(origin, 3);
-  cut->getProxy()->UpdateVTKObjects();
+  plane->UpdateVTKObjects();
 }
 
 void MultiSliceView::deleteCut(const QString &name)

diff --git a/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/ThreesliceView.cpp b/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/ThreesliceView.cpp
@@ -102,6 +102,7 @@ void ThreeSliceView::makeSlice(ViewBase::Direction i, pqRenderView *view,
                                           "CutFunction").GetAsProxy();
 
   repr->colorByArray("signal", vtkDataObject::FIELD_ASSOCIATION_CELLS);
+  repr->getProxy()->UpdateVTKObjects();
 
   double orient[3] = {0.0, 0.0, 0.0};
   double up[3] = {0.0, 0.0, 0.0};
@@ -133,7 +134,7 @@ void ThreeSliceView::makeSlice(ViewBase::Direction i, pqRenderView *view,
     break;
   }
   vtkSMPropertyHelper(plane, "Normal").Set(orient, 3);
-  repr->getProxy()->UpdateVTKObjects();
+  plane->UpdateVTKObjects();
 
   view->resetViewDirection(orient[0], orient[1], orient[2],
                            up[0], up[1], up[2]);
@@ -167,6 +168,7 @@ void ThreeSliceView::makeThreeSlice()
   drep->getProxy()->UpdateVTKObjects();
   this->origRep = qobject_cast<pqPipelineRepresentation*>(drep);
   this->origRep->colorByArray("signal", vtkDataObject::FIELD_ASSOCIATION_CELLS);
+  this->origRep->getProxy()->UpdateVTKObjects();
 
   // Have to create the cuts and cut representations up here to keep
   // them around

diff --git a/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/ViewBase.cpp b/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/ViewBase.cpp
@@ -184,7 +184,8 @@ void ViewBase::setPluginSource(QString pluginName, QString wsName)
   vtkSMSourceProxy *srcProxy = vtkSMSourceProxy::SafeDownCast(src->getProxy());
   srcProxy->UpdateVTKObjects();
   srcProxy->Modified();
-  srcProxy->UpdatePipelineInformation();;
+  srcProxy->UpdatePipelineInformation();
+  src->updatePipeline();
 }
 
 /**