Merge branch 'OCCT780'

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

diff --git a/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx b/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx
index f715416c79295bf360a8a39c0f500f0320030f18..597f7a5c93a0eb9430aee5ca1b030cd1508bc864 100644 (file)
--- a/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2020  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
@@ -76,7 +76,6 @@ StdMeshers_NumberOfSegments_i::~StdMeshers_NumberOfSegments_i()
 SMESH::double_array* StdMeshers_NumberOfSegments_i::BuildDistributionExpr( const char* func, 
                                                                            CORBA::Long nbSeg, 
                                                                            CORBA::Long conv )
-  throw ( SALOME::SALOME_Exception )
 {
   ASSERT( myBaseImpl );
   try
@@ -98,7 +97,6 @@ SMESH::double_array*
 StdMeshers_NumberOfSegments_i::BuildDistributionTab( const SMESH::double_array& func,
                                                      CORBA::Long                nbSeg,
                                                      CORBA::Long                conv )
-  throw ( SALOME::SALOME_Exception )
 {
   ASSERT( myBaseImpl );
 
@@ -129,8 +127,7 @@ StdMeshers_NumberOfSegments_i::BuildDistributionTab( const SMESH::double_array&
  */
 //=============================================================================
 
-void StdMeshers_NumberOfSegments_i::SetNumberOfSegments( CORBA::Long theSegmentsNumber )
-     throw ( SALOME::SALOME_Exception )
+void StdMeshers_NumberOfSegments_i::SetNumberOfSegments( SMESH::smIdType theSegmentsNumber )
 {
   ASSERT( myBaseImpl );
   try {
@@ -165,7 +162,6 @@ CORBA::Long StdMeshers_NumberOfSegments_i::GetNumberOfSegments()
 //=============================================================================
 
 void StdMeshers_NumberOfSegments_i::SetDistrType(CORBA::Long typ)
-  throw ( SALOME::SALOME_Exception )
 {
   ASSERT( myBaseImpl );
   try {
@@ -203,7 +199,6 @@ CORBA::Long StdMeshers_NumberOfSegments_i::GetDistrType()
 //=============================================================================
 
 void StdMeshers_NumberOfSegments_i::SetScaleFactor( CORBA::Double theScaleFactor )
-     throw ( SALOME::SALOME_Exception )
 {
   ASSERT( myBaseImpl );
   try {
@@ -226,7 +221,6 @@ void StdMeshers_NumberOfSegments_i::SetScaleFactor( CORBA::Double theScaleFactor
 //=============================================================================
 
 CORBA::Double StdMeshers_NumberOfSegments_i::GetScaleFactor()
-  throw ( SALOME::SALOME_Exception )
 {
   ASSERT( myBaseImpl );
   double scale;
@@ -240,13 +234,56 @@ CORBA::Double StdMeshers_NumberOfSegments_i::GetScaleFactor()
   return scale;
 }
 
+//=============================================================================
+/*!
+ *  StdMeshers_NumberOfSegments_i::SetBeta
+ *
+ *  Set beta coefficient for Beta Law distribution
+ */
+//=============================================================================
+
+void StdMeshers_NumberOfSegments_i::SetBeta(CORBA::Double beta)
+{
+  ASSERT(myBaseImpl);
+  try {
+    this->GetImpl()->SetBeta(beta);
+    // Update Python script
+    SMESH::TPythonDump() << _this() << ".SetBeta( " << SMESH::TVar(beta) << " )";
+  }
+  catch (SALOME_Exception& S_ex) {
+    THROW_SALOME_CORBA_EXCEPTION(S_ex.what(), SALOME::BAD_PARAM);
+  }
+}
+
+//=============================================================================
+/*!
+ *  StdMeshers_NumberOfSegments_i::GetBeta
+ *
+ *  Get beta coefficient for Beta Law distribution
+ */
+//=============================================================================
+
+CORBA::Double StdMeshers_NumberOfSegments_i::GetBeta()
+{
+  ASSERT(myBaseImpl);
+
+  double beta = 1.0;
+  try {
+    beta = this->GetImpl()->GetBeta();
+  }
+  catch (SALOME_Exception& S_ex) {
+    THROW_SALOME_CORBA_EXCEPTION(S_ex.what(), SALOME::BAD_PARAM);
+  }
+
+  return beta;
+}
+
 //=============================================================================
 /*!
  */
 //=============================================================================
 
 void StdMeshers_NumberOfSegments_i::SetTableFunction(const SMESH::double_array& table)
-  throw ( SALOME::SALOME_Exception )
 {
   ASSERT( myBaseImpl );
   std::vector<double> tbl( table.length() );
@@ -269,7 +306,6 @@ void StdMeshers_NumberOfSegments_i::SetTableFunction(const SMESH::double_array&
 //=============================================================================
 
 SMESH::double_array* StdMeshers_NumberOfSegments_i::GetTableFunction()
-  throw ( SALOME::SALOME_Exception )
 {
   ASSERT( myBaseImpl );
   const std::vector<double>* tbl;
@@ -292,7 +328,6 @@ SMESH::double_array* StdMeshers_NumberOfSegments_i::GetTableFunction()
 //=============================================================================
 
 void StdMeshers_NumberOfSegments_i::SetExpressionFunction(const char* expr)
-  throw ( SALOME::SALOME_Exception )
 {
   ASSERT( myBaseImpl );
   try {
@@ -312,7 +347,6 @@ void StdMeshers_NumberOfSegments_i::SetExpressionFunction(const char* expr)
 //=============================================================================
 
 char* StdMeshers_NumberOfSegments_i::GetExpressionFunction()
-  throw ( SALOME::SALOME_Exception )
 {
   ASSERT( myBaseImpl );
   const char* expr;
@@ -332,7 +366,6 @@ char* StdMeshers_NumberOfSegments_i::GetExpressionFunction()
 //=============================================================================
 
 void StdMeshers_NumberOfSegments_i::SetConversionMode(CORBA::Long conv )
-  throw ( SALOME::SALOME_Exception )
 {
   ASSERT( myBaseImpl );
   try {
@@ -352,7 +385,6 @@ void StdMeshers_NumberOfSegments_i::SetConversionMode(CORBA::Long conv )
 //=============================================================================
 
 CORBA::Long StdMeshers_NumberOfSegments_i::ConversionMode()
-  throw ( SALOME::SALOME_Exception )
 {
   ASSERT( myBaseImpl );
   int conv;