X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESH_I%2FSMESH_2smeshpy.hxx;h=e218e8f8220a4da2035f932a99b4f77e9d352e66;hp=3c01f79bf78e77b6ac325d7c865fc869d41ea8ee;hb=499f29d24922cec66e41b41a0039a954993bc6df;hpb=41bd7f736490d50132daaba123bf79050bbd5824

diff --git a/src/SMESH_I/SMESH_2smeshpy.hxx b/src/SMESH_I/SMESH_2smeshpy.hxx
index 3c01f79bf..e218e8f82 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-2022  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
@@ -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;
@@ -253,7 +253,6 @@ public:
   _pyGen(Resource_DataMapOfAsciiStringAsciiString& theEntry2AccessorMethod,
          Resource_DataMapOfAsciiStringAsciiString& theObjectNames,
          std::set< TCollection_AsciiString >&      theRemovedObjIDs,
-         SALOMEDS::Study_ptr&                      theStudy,
          const bool                                theToKeepAllCommands);
   Handle(_pyCommand) AddCommand( const _AString& theCommand );
   void ExchangeCommands( Handle(_pyCommand) theCmd1, Handle(_pyCommand) theCmd2 );
@@ -324,8 +323,10 @@ private:
   Handle(_pyCommand)                        myLastCommand;
   int                                       myNbFilters;
   bool                                      myToKeepAllCommands;
-  SALOMEDS::Study_var                       myStudy;
+  // 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;
 
@@ -421,7 +422,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;
@@ -489,7 +490,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)
 };
@@ -508,7 +509,7 @@ public:
 
   DEFINE_STANDARD_RTTIEXT(_pyComplexParamHypo,_pyHypothesis)
 };
-DEFINE_STANDARD_HANDLE (_pyComplexParamHypo, _pyHypothesis);
+DEFINE_STANDARD_HANDLE (_pyComplexParamHypo, _pyHypothesis)
 
 // -------------------------------------------------------------------------------------
 /*!
@@ -530,7 +531,7 @@ public:
 
   DEFINE_STANDARD_RTTIEXT(_pyLayerDistributionHypo,_pyHypothesis)
 };
-DEFINE_STANDARD_HANDLE (_pyLayerDistributionHypo, _pyHypothesis);
+DEFINE_STANDARD_HANDLE (_pyLayerDistributionHypo, _pyHypothesis)
 
 // -------------------------------------------------------------------------------------
 /*!
@@ -547,7 +548,7 @@ public:
 
   DEFINE_STANDARD_RTTIEXT(_pyNumberOfSegmentsHyp,_pyHypothesis)
 };
-DEFINE_STANDARD_HANDLE (_pyNumberOfSegmentsHyp, _pyHypothesis);
+DEFINE_STANDARD_HANDLE (_pyNumberOfSegmentsHyp, _pyHypothesis)
 
 // -------------------------------------------------------------------------------------
 /*!
@@ -562,7 +563,7 @@ public:
                                   const _pyID&              theMesh);
   DEFINE_STANDARD_RTTIEXT(_pySegmentLengthAroundVertexHyp,_pyHypothesis)
 };
-DEFINE_STANDARD_HANDLE (_pySegmentLengthAroundVertexHyp, _pyHypothesis);
+DEFINE_STANDARD_HANDLE (_pySegmentLengthAroundVertexHyp, _pyHypothesis)
 
 // -------------------------------------------------------------------------------------
 /*!
@@ -581,7 +582,7 @@ public:
 
   DEFINE_STANDARD_RTTIEXT(_pySelfEraser,_pyObject)
 };
-DEFINE_STANDARD_HANDLE (_pySelfEraser, _pyObject);
+DEFINE_STANDARD_HANDLE (_pySelfEraser, _pyObject)
 
 // -------------------------------------------------------------------------------------
 /*!
@@ -623,7 +624,7 @@ public:
 
   DEFINE_STANDARD_RTTIEXT(_pyFilter,_pyObject)
 };
-DEFINE_STANDARD_HANDLE (_pyFilter, _pyObject);
+DEFINE_STANDARD_HANDLE (_pyFilter, _pyObject)
 
 // -------------------------------------------------------------------------------------
 /*!