Merge branch 'V9_9_BR'

[modules/smesh.git] / src / StdMeshers_I / StdMeshers_NumberOfSegments_i.hxx

diff --git a/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.hxx b/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.hxx
index 05be9d24d88e0bca5888bb4c8db903ea7c72ec73..646de8b59e58c0f3440714c2c28d60b65ffea4e1 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.hxx
+++ b/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.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
@@ -20,7 +20,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-//  SMESH SMESH_I : idl implementation based on 'SMESH' unit's calsses
+//  SMESH SMESH_I : idl implementation based on 'SMESH' unit's classes
 //  File   : StdMeshers_NumberOfSegments_i.hxx
 //           Moved here from SMESH_NumberOfSegments_i.hxx
 //  Author : Paul RASCLE, EDF
@@ -35,7 +35,7 @@
 #include CORBA_SERVER_HEADER(SMESH_Mesh)
 #include CORBA_SERVER_HEADER(SMESH_BasicHypothesis)
 
-#include "SMESH_Hypothesis_i.hxx"
+#include "StdMeshers_Reversible1D_i.hxx"
 #include "StdMeshers_NumberOfSegments.hxx"
 
 // ======================================================
@@ -43,61 +43,49 @@
 // ======================================================
 class STDMESHERS_I_EXPORT StdMeshers_NumberOfSegments_i:
   public virtual POA_StdMeshers::StdMeshers_NumberOfSegments,
-  public virtual SMESH_Hypothesis_i
+  public virtual SMESH_Hypothesis_i,
+  public virtual StdMeshers_Reversible1D_i
 {
 public:
   // Constructor
   StdMeshers_NumberOfSegments_i( PortableServer::POA_ptr thePOA,
-                            int                     theStudyId,
-                            ::SMESH_Gen*            theGenImpl );
+                                 ::SMESH_Gen*            theGenImpl );
   // Destructor
   virtual ~StdMeshers_NumberOfSegments_i();
 
   // Builds point distribution according to passed function
-  SMESH::double_array* BuildDistributionExpr( const char*, CORBA::Long, CORBA::Long )
-    throw ( SALOME::SALOME_Exception );
-  SMESH::double_array* BuildDistributionTab( const SMESH::double_array&, CORBA::Long, CORBA::Long )
-    throw ( SALOME::SALOME_Exception );
+  SMESH::double_array* BuildDistributionExpr( const char*, CORBA::Long, CORBA::Long );
+  SMESH::double_array* BuildDistributionTab( const SMESH::double_array&, CORBA::Long, CORBA::Long );
 
   // Set number of segments
-  void SetNumberOfSegments( CORBA::Long theSegmentsNumber )
-    throw ( SALOME::SALOME_Exception );
+  void SetNumberOfSegments( SMESH::smIdType theSegmentsNumber );
   // Get number of segments
   CORBA::Long GetNumberOfSegments();
 
   // Set distribution type
-  void SetDistrType(CORBA::Long typ)
-    throw ( SALOME::SALOME_Exception );
+  void SetDistrType(CORBA::Long typ);
   // Get distribution type
   CORBA::Long GetDistrType();
 
   // Set scalar factor
-  void SetScaleFactor( CORBA::Double theScaleFactor )
-    throw ( SALOME::SALOME_Exception );
+  void SetScaleFactor( CORBA::Double theScaleFactor );
   // Get scalar factor
-  CORBA::Double GetScaleFactor()
-    throw ( SALOME::SALOME_Exception );
+  CORBA::Double GetScaleFactor();
 
   // Set table function for distribution DT_TabFunc
-  void SetTableFunction(const SMESH::double_array& table)
-    throw ( SALOME::SALOME_Exception );
+  void SetTableFunction(const SMESH::double_array& table);
   // Get table function for distribution DT_TabFunc
-  SMESH::double_array* GetTableFunction()
-    throw ( SALOME::SALOME_Exception );
+  SMESH::double_array* GetTableFunction();
 
   // Set expression function for distribution DT_ExprFunc
-  void SetExpressionFunction(const char* expr)
-    throw ( SALOME::SALOME_Exception );
+  void SetExpressionFunction(const char* expr);
   // Get expression function for distribution DT_ExprFunc
-  char* GetExpressionFunction()
-    throw ( SALOME::SALOME_Exception );
+  char* GetExpressionFunction();
 
   // Set the exponent mode on/off
-  void SetConversionMode( CORBA::Long conv )
-    throw ( SALOME::SALOME_Exception );
+  void SetConversionMode( CORBA::Long conv );
   // Returns true if the exponent mode is set
-  CORBA::Long ConversionMode()
-    throw ( SALOME::SALOME_Exception );
+  CORBA::Long ConversionMode();
 
   // Get implementation
   ::StdMeshers_NumberOfSegments* GetImpl();
@@ -105,18 +93,16 @@ public:
   // Verify whether hypothesis supports given entity type 
   CORBA::Boolean IsDimSupported( SMESH::Dimension type );
 
-  //Set Reversed Edges
-  void SetReversedEdges( const SMESH::long_array& theIDs);
 
-  //Get Reversed Edges
-  SMESH::long_array*  GetReversedEdges();
+  // Methods for copying mesh definition to other geometry
 
-  //Set Object Entry
-  void SetObjectEntry( const char* entry);
-
-  //Get Object Entry
-  char* GetObjectEntry();
+  // Return geometry this hypothesis depends on. Return false if there is no geometry parameter
+  virtual bool getObjectsDependOn( std::vector< std::string > & entryArray,
+                                   std::vector< int >         & subIDArray ) const;
 
+  // Set new geometry instead of that returned by getObjectsDependOn()
+  virtual bool setObjectsDependOn( std::vector< std::string > & entryArray,
+                                   std::vector< int >         & subIDArray );
  protected:
   virtual std::string getMethodOfParameter(const int paramIndex, int nbVars) const;
 };