Refs #4741. Fixing all representation call to new convention.

mantidproject · Feb 23, 2012 · 115f325 · 115f325
1 parent 46299dd
commit 115f325
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/MultisliceView.cpp b/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/MultisliceView.cpp
@@ -198,7 +198,7 @@ void MultiSliceView::setupData()
 
   pqDataRepresentation *drep = builder->createDataRepresentation(\
         this->origSrc->getOutputPort(0), this->mainView);
-  vtkSMPropertyHelper(drep->getProxy(), "Representation").Set(VTK_SURFACE);
+  vtkSMPropertyHelper(drep->getProxy(), "Representation").Set("Surface");
   drep->getProxy()->UpdateVTKObjects();
   this->origRep = qobject_cast<pqPipelineRepresentation*>(drep);
   this->origRep->colorByArray("signal",

diff --git a/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/SplatterPlotView.cpp b/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/SplatterPlotView.cpp
@@ -62,7 +62,7 @@ void SplatterPlotView::render()
   pqPipelineSource *src = NULL;
   src = pqActiveObjects::instance().activeSource();
 
-  int renderType = VTK_SURFACE;
+  QString renderType = "Surface";
   pqObjectBuilder* builder = pqApplicationCore::instance()->getObjectBuilder();
 
   if (!this->isPeaksWorkspace(src))
@@ -76,13 +76,13 @@ void SplatterPlotView::render()
   else
   {
     this->peaksSource = src;
-    renderType = VTK_WIREFRAME;
+    renderType = "Wireframe";
   }
 
   // Show the data
   pqDataRepresentation *drep = builder->createDataRepresentation(\
            src->getOutputPort(0), this->view);
-  vtkSMPropertyHelper(drep->getProxy(), "Representation").Set(renderType);
+  vtkSMPropertyHelper(drep->getProxy(), "Representation").Set(renderType.toStdString().c_str());
   drep->getProxy()->UpdateVTKObjects();
   pqPipelineRepresentation *prep = NULL;
   prep = qobject_cast<pqPipelineRepresentation*>(drep);

diff --git a/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/StandardView.cpp b/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/StandardView.cpp
@@ -83,12 +83,12 @@ void StandardView::render()
   // Show the data
   pqDataRepresentation *drep = builder->createDataRepresentation(\
         this->origSrc->getOutputPort(0), this->view);
-  int reptype = VTK_SURFACE;
+  QString reptype = "Surface";
   if (this->isPeaksWorkspace(this->origSrc))
   {
-    reptype = VTK_WIREFRAME;
+    reptype = "Wireframe";
   }
-  vtkSMPropertyHelper(drep->getProxy(), "Representation").Set(reptype);
+  vtkSMPropertyHelper(drep->getProxy(), "Representation").Set(reptype.toStdString().c_str());
   drep->getProxy()->UpdateVTKObjects();
   this->origRep = qobject_cast<pqPipelineRepresentation*>(drep);
   this->origRep->colorByArray("signal", vtkDataObject::FIELD_ASSOCIATION_CELLS);

diff --git a/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/ThreesliceView.cpp b/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/src/ThreesliceView.cpp
@@ -146,7 +146,7 @@ void ThreeSliceView::makeThreeSlice()
   pqObjectBuilder *builder = pqApplicationCore::instance()->getObjectBuilder();
   pqDataRepresentation *drep = builder->createDataRepresentation(\
         this->origSrc->getOutputPort(0), this->mainView);
-  vtkSMPropertyHelper(drep->getProxy(), "Representation").Set(VTK_SURFACE);
+  vtkSMPropertyHelper(drep->getProxy(), "Representation").Set("Surface");
   drep->getProxy()->UpdateVTKObjects();
   this->origRep = qobject_cast<pqPipelineRepresentation*>(drep);
   this->origRep->colorByArray("signal", vtkDataObject::FIELD_ASSOCIATION_CELLS);