Merge from BR_PORTING_VTK6 01/03/2013

diff --git a/src/ATOMSOLVGUI/ATOMSOLVGUI_Displayer.cxx b/src/ATOMSOLVGUI/ATOMSOLVGUI_Displayer.cxx
index aa993bf373945759636eacda39e9f522e9d8814a..940f9a9d69c7eab9c5e8af3640b34b7a13badcc5 100644 (file)
--- a/src/ATOMSOLVGUI/ATOMSOLVGUI_Displayer.cxx
+++ b/src/ATOMSOLVGUI/ATOMSOLVGUI_Displayer.cxx
@@ -138,7 +138,7 @@ SALOME_Prs* ATOMSOLVGUI_Displayer::buildPresentation( const QString& entry, SALO
     vtkObj->SetPhiResolution( (int)( vtkObj->GetEndPhi() * quality_coefficient ) );
 
     vtkPolyDataMapper* vtkMapper = vtkPolyDataMapper::New();
-    vtkMapper->SetInput( vtkObj->GetOutput() );
+    vtkMapper->SetInputConnection( vtkObj->GetOutputPort() );
     
     vtkObj->Delete();
     
@@ -221,7 +221,7 @@ QColor ATOMSOLVGUI_Displayer::getColor( const QString& entry )
        lst->InitTraversal();
        while ( vtkActor* actor = lst->GetNextActor() )
          if ( SALOME_Actor* salomeActor = SALOME_Actor::SafeDownCast( actor ) ) {
-           vtkFloatingPointType r, g, b;
+           double r, g, b;
            salomeActor->GetColor( r, g, b );
            return QColor( (int)(r * 255.), (int)(g * 255.), (int)(b * 255.) );
          }