Salome HOME
projects
/
modules
/
gui.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upgrade to paraview 5.4
[modules/gui.git]
/
src
/
VTKViewer
/
VTKViewer_ConvexTool.cxx
diff --git
a/src/VTKViewer/VTKViewer_ConvexTool.cxx
b/src/VTKViewer/VTKViewer_ConvexTool.cxx
index 32df8fe50b6cbbb15961e9d29d3454227468617d..f15527b73d83c9aae6ab574adfecafc8b3c4cf2a 100644
(file)
--- a/
src/VTKViewer/VTKViewer_ConvexTool.cxx
+++ b/
src/VTKViewer/VTKViewer_ConvexTool.cxx
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-201
3
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-201
6
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
//
// 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
// 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
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-81,9
+81,9
@@
namespace
VTKViewer_Triangulator
::VTKViewer_Triangulator():
myCellIds(vtkIdList::New()),
VTKViewer_Triangulator
::VTKViewer_Triangulator():
myCellIds(vtkIdList::New()),
+ myPointIds(NULL),
myFaceIds(vtkIdList::New()),
myFaceIds(vtkIdList::New()),
- myPoints(vtkPoints::New()),
- myPointIds(NULL)
+ myPoints(vtkPoints::New())
{}
{}
@@
-200,7
+200,7
@@
VTKViewer_Triangulator
vtkCellData* theOutputCD,
int theStoreMapping,
std::vector<vtkIdType>& theVTK2ObjIds,
vtkCellData* theOutputCD,
int theStoreMapping,
std::vector<vtkIdType>& theVTK2ObjIds,
- std::
map< vtkIdType,
std::vector<vtkIdType> >& theDimension2VTK2ObjIds,
+ std::
vector<
std::vector<vtkIdType> >& theDimension2VTK2ObjIds,
bool theIsCheckConvex)
{
vtkPoints *aPoints = InitPoints(theInput, theCellId);
bool theIsCheckConvex)
{
vtkPoints *aPoints = InitPoints(theInput, theCellId);
@@
-573,7
+573,7
@@
VTKViewer_Triangulator
if(DEBUG_TRIA_EXECUTE) cout << "PoilygonId="<<aPolygonId<<" | ";
TConnectivities& aConnectivities = aPolygon.myConnectivities;
if(DEBUG_TRIA_EXECUTE) {
if(DEBUG_TRIA_EXECUTE) cout << "PoilygonId="<<aPolygonId<<" | ";
TConnectivities& aConnectivities = aPolygon.myConnectivities;
if(DEBUG_TRIA_EXECUTE) {
- for(
in
t i=0;i<aConnectivities.size();i++)
+ for(
size_
t i=0;i<aConnectivities.size();i++)
cout << aConnectivities[i] << ",";
cout << endl;
}
cout << aConnectivities[i] << ",";
cout << endl;
}