X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESHGUI%2FSMESHGUI_VTKUtils.h;h=b1159bd139ede160bfcaf7dff4b1451f8a89603b;hp=7a6f4e6c529c02257315a85cce0f96eaa60ded56;hb=30ce546b0c5099ad1112929e2db94810e683e54b;hpb=ea8a0289f14641c23d515de68aa4fdc24a6208ba diff --git a/src/SMESHGUI/SMESHGUI_VTKUtils.h b/src/SMESHGUI/SMESHGUI_VTKUtils.h index 7a6f4e6c5..b1159bd13 100644 --- a/src/SMESHGUI/SMESHGUI_VTKUtils.h +++ b/src/SMESHGUI/SMESHGUI_VTKUtils.h @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2014 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2016 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 @@ -29,11 +29,8 @@ // SMESH includes #include "SMESH_SMESHGUI.hxx" -#include "SMESH_TypeDefs.hxx" -#include "SMDS_MeshNode.hxx" #include "SMESHGUI_Utils.h" - #include // SALOME KERNEL includes @@ -43,7 +40,8 @@ #include #include -class TColStd_IndexedMapOfInteger; +// OCCT includes +#include class SALOMEDSClient_Study; @@ -61,15 +59,7 @@ class SMESH_Actor; class SALOME_Actor; class vtkActor; -class SMDS_Mesh; -class SMDS_MeshNode; -class gp_Pln; -class gp_Lin; -class gp_Dir; -class gp_Pnt2d; -class gp_Vec2d; -class Handle(Geom_Line); -class Handle(Geom_Plane); + namespace SMESH { //---------------------------------------------------------------------------- @@ -172,12 +162,6 @@ SMESHGUI_EXPORT //---------------------------------------------------------------------------- SMESHGUI_EXPORT - int GetNameOfSelectedSortedNodes( SMDSAbs_EntityType, - SVTK_Selector*, - SMESH_Actor*, - int, - QString& ); -SMESHGUI_EXPORT int GetNameOfSelectedNodes( SVTK_Selector*, const Handle(SALOME_InteractiveObject)&, QString& ); @@ -231,44 +215,6 @@ SMESHGUI_EXPORT double theDirection[3], double thePos[3], double& theDist ); - typedef std::pair TNodeOfDist; - typedef std::pair > TNodeOfAngleAndDist, TNodeOfDistToPlaneAndDist; - typedef std::pair > TIdOfDistToPlaneAndDist; - bool CreatePlaneOnThreePoints( const gp_Pnt& thePoint1, - const gp_Pnt& thePoint2, - const gp_Pnt& thePoint3, - gp_Pln& thePlane ); - - void FindNbLowestPoint( std::list theList, gp_Pnt2d& theNode ); - bool IsNotPlaneIntersection( std::vector& theVector, - const gp_Pln& thePlane ); - bool GetCorrectSequenceOfId( std::vector& theVector ); - void GetCorrectSequenceTwoPlaneOfId( std::vector& thePlane1, - std::vector& thePlane2, - std::list& theResultListId ); - void GetSortedNodesOnPolygon( std::vector& theVectorOfNode, - std::list& theResultListId ); - void GetSortedNodesOnPyramid( std::vector& theVectorOfNode, - std::list& theResultListId ); - void GetSortedNodesOnPrism( std::vector& theVectorOfNode, - std::list& theResultListId ); - bool Get2BasePlane( std::vector& theVector, - std::vector& thePlane1, - std::vector& thePlane2); - bool GetNextCombination ( std::vector & theVector1, - std::vector & theVector2, - int theNbPoint ); - static bool CompareNodeOfAngleAndDist ( const TNodeOfAngleAndDist& first, - const TNodeOfAngleAndDist& second ); - static bool CompareNodeOfDist ( const TNodeOfAngleAndDist& first, - const TNodeOfAngleAndDist& second ); - static bool CompareDistOfPlane ( const TNodeOfDistToPlaneAndDist& first, - const TNodeOfDistToPlaneAndDist& second ); - static bool CompareDistOfPlaneById ( const TIdOfDistToPlaneAndDist& first, - const TIdOfDistToPlaneAndDist& second ); - static bool CompareDistForCorrectPlane ( const TNodeOfDist& first, - const TNodeOfDist& second ); - SMESHGUI_EXPORT void RemoveVisualObjectWithActors( const char* theEntry, bool fromAllViews = false ); };