X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2FVTKViewer%2FVTKViewer_ArcBuilder.h;h=13f68ec8b58a2492e2ab8ce4f34156647ca1966d;hb=e7ede3527d1022d9df3cc38cd9d00d2eefb9f80f;hp=c5f47a2c4798a0fa45bd692f17d6203f084491d3;hpb=3593b4d1585d69f34034e5c678dc97b6e92a85cf;p=modules%2Fgui.git diff --git a/src/VTKViewer/VTKViewer_ArcBuilder.h b/src/VTKViewer/VTKViewer_ArcBuilder.h index c5f47a2c4..13f68ec8b 100644 --- a/src/VTKViewer/VTKViewer_ArcBuilder.h +++ b/src/VTKViewer/VTKViewer_ArcBuilder.h @@ -1,9 +1,9 @@ -// Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2016 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 @@ -25,6 +25,9 @@ #include #include +#include +#include + class vtkCell; class vtkDataArray; class vtkPoints; @@ -35,7 +38,7 @@ class Pnt; typedef std::list PntList; -vtkIdType MergevtkPoints(const std::vector& theCollection, +vtkIdType MergevtkPoints(const std::vector< vtkSmartPointer< vtkPoints > >& theCollection, const std::vector< std::vector >& theScalarCollection, vtkPoints* thePoints, std::map& thePntId2ScalarValue, @@ -45,7 +48,7 @@ vtkIdType Build1DArc(vtkIdType cellId, vtkUnstructuredGrid* input, vtkPolyData *output, vtkIdType *pts, - vtkFloatingPointType myMaxArcAngle); + double myMaxArcAngle); Pnt CreatePnt(vtkCell* cell, vtkDataArray* scalars, @@ -182,7 +185,7 @@ class VTKViewer_ArcBuilder{ double myAngle; ArcStatus myStatus; - vtkPoints* myPoints; + vtkSmartPointer myPoints; std::vector myScalarValues; };