bos #20256: [CEA 18523] Porting SMESH to int 64 bits

[modules/smesh.git] / src / SMESHGUI / SMESHGUI_VTKUtils.h

diff --git a/src/SMESHGUI/SMESHGUI_VTKUtils.h b/src/SMESHGUI/SMESHGUI_VTKUtils.h
index 7a6f4e6c529c02257315a85cce0f96eaa60ded56..dec7bdc656f3c6da8471664d512909c972d577d4 100644 (file)
--- 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-2021  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 <SMESH_Object.h>
 
 // SALOME KERNEL includes
@@ -43,7 +40,8 @@
 #include <SALOME_InteractiveObject.hxx>
 #include <VTKViewer_Filter.h>
 
-class TColStd_IndexedMapOfInteger;
+// OCCT includes
+#include <TColStd_IndexedMapOfInteger.hxx>
 
 class SALOMEDSClient_Study;
 
@@ -61,22 +59,13 @@ 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
 {
   //----------------------------------------------------------------------------
-  typedef std::pair<int,std::string> TKeyOfVisualObj;
   
 SMESHGUI_EXPORT
-  TVisualObjPtr GetVisualObj( int, const char*, bool nulData =false );
+  TVisualObjPtr GetVisualObj( const char*, bool nulData =false );
 SMESHGUI_EXPORT
   void OnVisuException(); // PAL16631
 
@@ -113,13 +102,13 @@ SMESHGUI_EXPORT
 
   //----------------------------------------------------------------------------
 SMESHGUI_EXPORT  
-  SMESH_Actor* CreateActor( _PTR(Study), const char*, int = false );
+  SMESH_Actor* CreateActor( const char*, int = false );
 SMESHGUI_EXPORT
   void DisplayActor( SUIT_ViewWindow*, SMESH_Actor* );
 SMESHGUI_EXPORT
   void RemoveActor( SUIT_ViewWindow*, SMESH_Actor* );
 SMESHGUI_EXPORT
-  void RemoveVisuData( int );
+  void RemoveVisuData();
 
   //----------------------------------------------------------------------------
   enum EDisplaing { eDisplayAll, eDisplay, eDisplayOnly, eErase, eEraseAll };
@@ -130,7 +119,7 @@ SMESHGUI_EXPORT
   bool UpdateView( EDisplaing, const char* = "" );
 
 SMESHGUI_EXPORT
-  void UpdateView();
+  void UpdateView( bool withChildrenOfSelected = false );
 
 SMESHGUI_EXPORT
   bool UpdateNulData( const Handle(SALOME_InteractiveObject)& theIO, bool theDisplay);
@@ -172,12 +161,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& );
@@ -186,7 +169,7 @@ SMESHGUI_EXPORT
                                  const Handle(SALOME_InteractiveObject)&,
                                  QString& );
 SMESHGUI_EXPORT
-  int GetEdgeNodes( SVTK_Selector*, const TVisualObjPtr&, int&, int& );
+  int GetEdgeNodes( SVTK_Selector*, const TVisualObjPtr&, smIdType&, smIdType& );
 
   //----------------------------------------------------------------------------
 SMESHGUI_EXPORT  
@@ -206,7 +189,7 @@ SMESHGUI_EXPORT
                    const bool = true );
 
 SMESHGUI_EXPORT
-  int GetEdgeNodes( LightApp_SelectionMgr*, int&, int& );
+  int GetEdgeNodes( LightApp_SelectionMgr*, smIdType&, smIdType& );
 
 SMESHGUI_EXPORT
   void SetControlsPrecision( const long );
@@ -231,46 +214,18 @@ SMESHGUI_EXPORT
                            double theDirection[3],
                            double thePos[3],
                            double& theDist );
-  typedef std::pair<SMESH_TNodeXYZ, double> TNodeOfDist;
-  typedef std::pair<SMESH_TNodeXYZ, std::pair<double, double> > TNodeOfAngleAndDist, TNodeOfDistToPlaneAndDist;
-  typedef std::pair<int, std::pair<double, double> > TIdOfDistToPlaneAndDist;
-  bool CreatePlaneOnThreePoints( const gp_Pnt& thePoint1,
-                                 const gp_Pnt& thePoint2,
-                                 const gp_Pnt& thePoint3,
-                                 gp_Pln& thePlane );
-
-  void FindNbLowestPoint( std::list<gp_Pnt2d> theList, gp_Pnt2d& theNode );
-  bool IsNotPlaneIntersection( std::vector<SMESH_TNodeXYZ>& theVector,
-                               const gp_Pln& thePlane );
-  bool GetCorrectSequenceOfId( std::vector<SMESH_TNodeXYZ>& theVector );
-  void GetCorrectSequenceTwoPlaneOfId( std::vector<SMESH_TNodeXYZ>& thePlane1,
-                                       std::vector<SMESH_TNodeXYZ>& thePlane2,
-                                       std::list<int>& theResultListId );
-  void GetSortedNodesOnPolygon( std::vector<SMESH_TNodeXYZ>& theVectorOfNode,
-                                std::list<int>& theResultListId );
-  void GetSortedNodesOnPyramid( std::vector<SMESH_TNodeXYZ>& theVectorOfNode,
-                                std::list<int>& theResultListId );
-  void GetSortedNodesOnPrism( std::vector<SMESH_TNodeXYZ>& theVectorOfNode,
-                              std::list<int>& theResultListId );
-  bool Get2BasePlane( std::vector<SMESH_TNodeXYZ>& theVector,
-                      std::vector<SMESH_TNodeXYZ>& thePlane1,
-                      std::vector<SMESH_TNodeXYZ>& thePlane2);
-  bool GetNextCombination ( std::vector<int> & theVector1,
-                            std::vector<int> & 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 );
-};
+
+  SMESHGUI_EXPORT
+  void UpdateActorsAfterUpdateStudy( SUIT_ViewWindow* wnd );
+
+  SMESHGUI_EXPORT
+  void UpdateActorsAfterUpdateStudy();
+
+  SMESHGUI_EXPORT
+  bool NoSmeshActors(SUIT_ViewWindow *theWnd=nullptr);
+
+}
 
 #endif // SMESHGUI_VTKUTILS_H