X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_CreatePolyhedralVolumeDlg.cxx;h=f4050368807cdd51a4f4dd4afdcb6194672f3b6a;hp=8fdd03e6fdd00bf16b03ce7ddd2965e6edb9ecd2;hb=dcfc66bbfa976f8fa007dfdadd13a72b5e438cd4;hpb=88b3dbe23b236bd1746405155ae33a76aaf59ecd diff --git a/src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.cxx b/src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.cxx index 8fdd03e6f..f40503688 100644 --- a/src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.cxx +++ b/src/SMESHGUI/SMESHGUI_CreatePolyhedralVolumeDlg.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE // // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -6,7 +6,7 @@ // 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 @@ -49,6 +49,8 @@ #include #include +#include "utilities.h" + #include // OCCT includes @@ -106,7 +108,7 @@ namespace SMESH // Create and display actor myMapper = vtkDataSetMapper::New(); - myMapper->SetInput( myGrid ); + myMapper->SetInputData( myGrid ); myPreviewActor = SALOME_Actor::New(); myPreviewActor->PickableOff(); @@ -114,12 +116,12 @@ namespace SMESH myPreviewActor->SetMapper( myMapper ); myPreviewActor->SetRepresentation( 3 ); - vtkFloatingPointType anRGB[3]; + double anRGB[3]; vtkProperty* aProp = vtkProperty::New(); GetColor( "SMESH", "selection_element_color", anRGB[0], anRGB[1], anRGB[2], QColor( 0, 170, 255 ) ); aProp->SetColor(anRGB[0],anRGB[1],anRGB[2]); myPreviewActor->SetProperty( aProp ); - vtkFloatingPointType aFactor,aUnits; + double aFactor,aUnits; myPreviewActor->SetResolveCoincidentTopology(true); myPreviewActor->GetPolygonOffsetParameters(aFactor,aUnits); myPreviewActor->SetPolygonOffsetParameters(aFactor,0.2*aUnits);