Merge from BR_PORTING_VTK6 01/03/2013

[modules/smesh.git] / src / SMESHGUI / SMESHGUI_MeshEditPreview.cxx

diff --git a/src/SMESHGUI/SMESHGUI_MeshEditPreview.cxx b/src/SMESHGUI/SMESHGUI_MeshEditPreview.cxx
index ac71ddbc44e1231fca74c8b0f742ef99ccf5f677..25cae2f0da93e38a5cc5340a2cb15538c7785c63 100644 (file)
--- a/src/SMESHGUI/SMESHGUI_MeshEditPreview.cxx
+++ b/src/SMESHGUI/SMESHGUI_MeshEditPreview.cxx
@@ -66,19 +66,19 @@ SMESHGUI_MeshEditPreview::SMESHGUI_MeshEditPreview(SVTK_ViewWindow* theViewWindo
 
   // Create and display actor
   vtkDataSetMapper* aMapper = vtkDataSetMapper::New();
-  aMapper->SetInput( myGrid );
+  aMapper->SetInputData( myGrid );
 
   myPreviewActor = SALOME_Actor::New();
   myPreviewActor->SetInfinitive(true);
   myPreviewActor->VisibilityOn();
   myPreviewActor->PickableOff();
 
-  vtkFloatingPointType aFactor,aUnits;
+  double aFactor,aUnits;
   myPreviewActor->SetResolveCoincidentTopology(true);
   myPreviewActor->GetPolygonOffsetParameters(aFactor,aUnits);
   myPreviewActor->SetPolygonOffsetParameters(aFactor,0.2*aUnits);
 
-  vtkFloatingPointType anRGB[3];
+  double anRGB[3];
   SMESH::GetColor( "SMESH", "selection_element_color", anRGB[0], anRGB[1], anRGB[2], QColor( 0, 170, 255 ) );
   SetColor( anRGB[0], anRGB[1], anRGB[2] );