Synchronize adm files

[samples/atomsolv.git] / src / ATOMSOLVGUI / ATOMSOLVGUI_Displayer.cxx

diff --git a/src/ATOMSOLVGUI/ATOMSOLVGUI_Displayer.cxx b/src/ATOMSOLVGUI/ATOMSOLVGUI_Displayer.cxx
old mode 100644 (file)
new mode 100755 (executable)
index aa993bf..f7da151
--- a/src/ATOMSOLVGUI/ATOMSOLVGUI_Displayer.cxx
+++ b/src/ATOMSOLVGUI/ATOMSOLVGUI_Displayer.cxx
@@ -1,9 +1,9 @@
-// Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -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.) );
          }