X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSMESH_I%2FSMESH_2smeshpy.hxx;h=b62e1203fe49fb91f0443b2bb7d909161fbcebf7;hb=HEAD;hp=fa86d86826f46e40ea098425d21c79aec5a23bb4;hpb=8d297d6698f361d4f2dde723050bcfbaea050920;p=modules%2Fsmesh.git

diff --git a/src/SMESH_I/SMESH_2smeshpy.hxx b/src/SMESH_I/SMESH_2smeshpy.hxx
index fa86d8682..b5363cc4e 100644
--- a/src/SMESH_I/SMESH_2smeshpy.hxx
+++ b/src/SMESH_I/SMESH_2smeshpy.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2024  CEA, EDF, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -53,7 +53,7 @@
  * The creation reason is that smeshBuilder.py commands defining hypotheses encapsulate
  * several SMESH engine method calls. As well, the dependencies between smeshBuilder.py
  * classes differ from ones between corresponding SMESH IDL interfaces.
- * 
+ *
  * Everything here is for internal usage by SMESH_2smeshpy::ConvertScript()
  * declared in SMESH_PythonDump.hxx
  */
@@ -74,16 +74,16 @@ class _pyHypothesis;
 class _pyAlgorithm;
 class _pyHypothesisReader;
 
-DEFINE_STANDARD_HANDLE (_pyCommand         ,Standard_Transient);
-DEFINE_STANDARD_HANDLE (_pyObject          ,Standard_Transient);
-DEFINE_STANDARD_HANDLE (_pyHypothesisReader,Standard_Transient);
-DEFINE_STANDARD_HANDLE (_pyGen             ,_pyObject);
-DEFINE_STANDARD_HANDLE (_pyMesh            ,_pyObject);
-DEFINE_STANDARD_HANDLE (_pySubMesh         ,_pyObject);
-DEFINE_STANDARD_HANDLE (_pyGroup           ,_pySubMesh);
-DEFINE_STANDARD_HANDLE (_pyMeshEditor      ,_pyObject);
-DEFINE_STANDARD_HANDLE (_pyHypothesis      ,_pyObject);
-DEFINE_STANDARD_HANDLE (_pyAlgorithm       ,_pyHypothesis);
+DEFINE_STANDARD_HANDLE (_pyCommand         ,Standard_Transient)
+DEFINE_STANDARD_HANDLE (_pyObject          ,Standard_Transient)
+DEFINE_STANDARD_HANDLE (_pyHypothesisReader,Standard_Transient)
+DEFINE_STANDARD_HANDLE (_pyGen             ,_pyObject)
+DEFINE_STANDARD_HANDLE (_pyMesh            ,_pyObject)
+DEFINE_STANDARD_HANDLE (_pySubMesh         ,_pyObject)
+DEFINE_STANDARD_HANDLE (_pyGroup           ,_pySubMesh)
+DEFINE_STANDARD_HANDLE (_pyMeshEditor      ,_pyObject)
+DEFINE_STANDARD_HANDLE (_pyHypothesis      ,_pyObject)
+DEFINE_STANDARD_HANDLE (_pyAlgorithm       ,_pyHypothesis)
 
 typedef TCollection_AsciiString _pyID;
 typedef TCollection_AsciiString _AString;
@@ -323,7 +323,10 @@ private:
   Handle(_pyCommand)                        myLastCommand;
   int                                       myNbFilters;
   bool                                      myToKeepAllCommands;
+  // difference of entry and index of this difference
   int                                       myGeomIDNb, myGeomIDIndex;
+  // difference of entry and index of this difference, specific for the SHAPER study
+  int                                       myShaperIDNb, myShaperIDIndex;
   std::map< _AString, ExportedMeshData >    myFile2ExportedMesh;
   Handle( _pyHypothesisReader )             myHypReader;
 
@@ -347,6 +350,7 @@ class _pyMesh: public _pyObject
   std::list< Handle(_pyMesh) >       myChildMeshes; // depending on me
   bool                               myGeomNotInStudy;
   Handle(_pyCommand)                 myLastComputeCmd;
+  Handle(_pyCommand)                 myLastCheckCmd;
 public:
   _pyMesh(const Handle(_pyCommand) creationCmd);
   _pyMesh(const Handle(_pyCommand) theCreationCmd, const _pyID & id);
@@ -370,7 +374,7 @@ private:
 
   DEFINE_STANDARD_RTTIEXT(_pyMesh,_pyObject)
 };
-#undef _pyMesh_ACCESS_METHOD 
+#undef _pyMesh_ACCESS_METHOD
 
 // -------------------------------------------------------------------------------------
 /*!
@@ -419,7 +423,7 @@ protected:
   std::list<Handle(_pyCommand)> myUnusedCommands;
   std::list<Handle(_pyObject) > myReferredObjs;
   // maps used to clear commands setting parameters if result of setting is
-  // discared (e.g. by mesh.Clear())
+  // discarded (e.g. by mesh.Clear())
   std::map<_AString, std::list<Handle(_pyCommand)> >            myMeth2Commands;
   std::map< _pyCommand::TAddr, std::list<Handle(_pyCommand) > > myComputeAddr2Cmds;
   std::list<Handle(_pyCommand) >                                myComputeCmds;
@@ -487,7 +491,7 @@ public:
   virtual bool Addition2Creation( const Handle(_pyCommand)& theAdditionCmd,
                                   const _pyID&              theMesh);
   virtual const char* AccessorMethod() const { return "GetAlgorithm()"; }
-  virtual bool IsWrappable(const _pyID& theMesh) { return !myIsWrapped; }
+  virtual bool IsWrappable(const _pyID& /*theMesh*/) { return !myIsWrapped; }
 
   DEFINE_STANDARD_RTTIEXT(_pyAlgorithm,_pyHypothesis)
 };
@@ -506,7 +510,7 @@ public:
 
   DEFINE_STANDARD_RTTIEXT(_pyComplexParamHypo,_pyHypothesis)
 };
-DEFINE_STANDARD_HANDLE (_pyComplexParamHypo, _pyHypothesis);
+DEFINE_STANDARD_HANDLE (_pyComplexParamHypo, _pyHypothesis)
 
 // -------------------------------------------------------------------------------------
 /*!
@@ -528,7 +532,7 @@ public:
 
   DEFINE_STANDARD_RTTIEXT(_pyLayerDistributionHypo,_pyHypothesis)
 };
-DEFINE_STANDARD_HANDLE (_pyLayerDistributionHypo, _pyHypothesis);
+DEFINE_STANDARD_HANDLE (_pyLayerDistributionHypo, _pyHypothesis)
 
 // -------------------------------------------------------------------------------------
 /*!
@@ -545,7 +549,7 @@ public:
 
   DEFINE_STANDARD_RTTIEXT(_pyNumberOfSegmentsHyp,_pyHypothesis)
 };
-DEFINE_STANDARD_HANDLE (_pyNumberOfSegmentsHyp, _pyHypothesis);
+DEFINE_STANDARD_HANDLE (_pyNumberOfSegmentsHyp, _pyHypothesis)
 
 // -------------------------------------------------------------------------------------
 /*!
@@ -560,7 +564,7 @@ public:
                                   const _pyID&              theMesh);
   DEFINE_STANDARD_RTTIEXT(_pySegmentLengthAroundVertexHyp,_pyHypothesis)
 };
-DEFINE_STANDARD_HANDLE (_pySegmentLengthAroundVertexHyp, _pyHypothesis);
+DEFINE_STANDARD_HANDLE (_pySegmentLengthAroundVertexHyp, _pyHypothesis)
 
 // -------------------------------------------------------------------------------------
 /*!
@@ -579,7 +583,7 @@ public:
 
   DEFINE_STANDARD_RTTIEXT(_pySelfEraser,_pyObject)
 };
-DEFINE_STANDARD_HANDLE (_pySelfEraser, _pyObject);
+DEFINE_STANDARD_HANDLE (_pySelfEraser, _pyObject)
 
 // -------------------------------------------------------------------------------------
 /*!
@@ -621,7 +625,7 @@ public:
 
   DEFINE_STANDARD_RTTIEXT(_pyFilter,_pyObject)
 };
-DEFINE_STANDARD_HANDLE (_pyFilter, _pyObject);
+DEFINE_STANDARD_HANDLE (_pyFilter, _pyObject)
 
 // -------------------------------------------------------------------------------------
 /*!