X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FStdMeshers_I%2FStdMeshers_NumberOfSegments_i.cxx;h=a5390229476285e7fdd480b097273ace420c0417;hb=07ec002dfd20ec187228e11533e8e2135eca08fd;hp=b4355a2ecfe90fe1fe3517d9432290a6ca01561f;hpb=8672ad3e7621ac25fffa8517599afa84ffea509a;p=modules%2Fsmesh.git

diff --git a/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx b/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx
index b4355a2ec..a53902294 100644
--- a/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx
+++ b/src/StdMeshers_I/StdMeshers_NumberOfSegments_i.cxx
@@ -17,7 +17,7 @@
 //  License along with this library; if not, write to the Free Software 
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
 // 
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //
 //
@@ -31,6 +31,7 @@ using namespace std;
 #include "StdMeshers_NumberOfSegments_i.hxx"
 #include "SMESH_Gen_i.hxx"
 #include "SMESH_Gen.hxx"
+#include "SMESH_PythonDump.hxx"
 
 #include "Utils_CorbaException.hxx"
 #include "utilities.h"
@@ -70,6 +71,60 @@ StdMeshers_NumberOfSegments_i::~StdMeshers_NumberOfSegments_i()
   MESSAGE( "StdMeshers_NumberOfSegments_i::~StdMeshers_NumberOfSegments_i" );
 }
 
+//=============================================================================
+/*!
+ *  StdMeshers_NumberOfSegments_i::BuildDistribution
+ *
+ *  Builds point distribution according to passed function
+ */
+//=============================================================================
+SMESH::double_array* StdMeshers_NumberOfSegments_i::BuildDistributionExpr( const char* func, 
+									   CORBA::Long nbSeg, 
+									   CORBA::Long conv )
+  throw ( SALOME::SALOME_Exception )
+{
+  ASSERT( myBaseImpl );
+  try
+  {
+    SMESH::double_array_var aRes = new SMESH::double_array();
+    const std::vector<double>& res = this->GetImpl()->BuildDistributionExpr( func, nbSeg, conv );
+    aRes->length( res.size() );
+    for (int i = 0; i < res.size(); i++)
+      aRes[i] = res[i];
+    return aRes._retn();
+  }
+  catch( SALOME_Exception& S_ex )
+  {
+    THROW_SALOME_CORBA_EXCEPTION( S_ex.what(), SALOME::BAD_PARAM );
+  }
+}
+
+SMESH::double_array* StdMeshers_NumberOfSegments_i::BuildDistributionTab( const SMESH::double_array& func,
+									  CORBA::Long nbSeg, 
+									  CORBA::Long conv )
+  throw ( SALOME::SALOME_Exception )
+{
+  ASSERT( myBaseImpl );
+
+  std::vector<double> tbl( func.length() );
+  for (int i = 0; i < func.length(); i++)
+    tbl[i] = func[i];
+
+  try
+  {
+    SMESH::double_array_var aRes = new SMESH::double_array();
+    const std::vector<double>& res = this->GetImpl()->BuildDistributionTab( tbl, nbSeg, conv );
+    aRes->length( res.size() );
+    for (int i = 0; i < res.size(); i++)
+      aRes[i] = res[i];
+    return aRes._retn();
+  }
+  catch( SALOME_Exception& S_ex )
+  {
+    THROW_SALOME_CORBA_EXCEPTION( S_ex.what(), SALOME::BAD_PARAM );
+  }
+}
+
 //=============================================================================
 /*!
  *  StdMeshers_NumberOfSegments_i::SetNumberOfSegments
@@ -81,7 +136,6 @@ StdMeshers_NumberOfSegments_i::~StdMeshers_NumberOfSegments_i()
 void StdMeshers_NumberOfSegments_i::SetNumberOfSegments( CORBA::Long theSegmentsNumber )
      throw ( SALOME::SALOME_Exception )
 {
-  MESSAGE( "StdMeshers_NumberOfSegments_i::SetNumberOfSegments" );
   ASSERT( myBaseImpl );
   try {
     this->GetImpl()->SetNumberOfSegments( theSegmentsNumber );
@@ -92,11 +146,7 @@ void StdMeshers_NumberOfSegments_i::SetNumberOfSegments( CORBA::Long theSegments
   }
 
   // Update Python script
-  TCollection_AsciiString aStr, aStrNb ((int)theSegmentsNumber);
-  SMESH_Gen_i::AddObject(aStr, _this()) += ".SetNumberOfSegments(";
-  aStr += aStrNb + ")";
-
-  SMESH_Gen_i::AddToCurrentPyScript(aStr);
+  SMESH::TPythonDump() << _this() << ".SetNumberOfSegments( " << theSegmentsNumber << " )";
 }
 
 //=============================================================================
@@ -109,7 +159,6 @@ void StdMeshers_NumberOfSegments_i::SetNumberOfSegments( CORBA::Long theSegments
 
 CORBA::Long StdMeshers_NumberOfSegments_i::GetNumberOfSegments()
 {
-  MESSAGE( "StdMeshers_NumberOfSegments_i::GetNumberOfSegments" );
   ASSERT( myBaseImpl );
   return this->GetImpl()->GetNumberOfSegments();
 }
@@ -122,10 +171,12 @@ CORBA::Long StdMeshers_NumberOfSegments_i::GetNumberOfSegments()
 void StdMeshers_NumberOfSegments_i::SetDistrType(CORBA::Long typ)
   throw ( SALOME::SALOME_Exception )
 {
-  MESSAGE( "StdMeshers_NumberOfSegments_i::SetDistrType" );
   ASSERT( myBaseImpl );
   try {
     this->GetImpl()->SetDistrType( (::StdMeshers_NumberOfSegments::DistrType) typ );
+
+    // Update Python script
+    SMESH::TPythonDump() << _this() << ".SetDistrType( " << typ << " )";
   }
   catch ( SALOME_Exception& S_ex ) {
     THROW_SALOME_CORBA_EXCEPTION( S_ex.what(),
@@ -140,7 +191,6 @@ void StdMeshers_NumberOfSegments_i::SetDistrType(CORBA::Long typ)
 
 CORBA::Long StdMeshers_NumberOfSegments_i::GetDistrType()
 {
-  MESSAGE( "StdMeshers_NumberOfSegments_i::GetDistrType" );
   ASSERT( myBaseImpl );
   return this->GetImpl()->GetDistrType();
 }
@@ -156,10 +206,11 @@ CORBA::Long StdMeshers_NumberOfSegments_i::GetDistrType()
 void StdMeshers_NumberOfSegments_i::SetScaleFactor( CORBA::Double theScaleFactor )
      throw ( SALOME::SALOME_Exception )
 {
-  MESSAGE( "StdMeshers_NumberOfSegments_i::SetScaleFactor" );
   ASSERT( myBaseImpl );
   try {
     this->GetImpl()->SetScaleFactor( theScaleFactor );
+    // Update Python script
+    SMESH::TPythonDump() << _this() << ".SetScaleFactor( " << theScaleFactor << " )";
   }
   catch ( SALOME_Exception& S_ex ) {
     THROW_SALOME_CORBA_EXCEPTION( S_ex.what(),
@@ -178,7 +229,6 @@ void StdMeshers_NumberOfSegments_i::SetScaleFactor( CORBA::Double theScaleFactor
 CORBA::Double StdMeshers_NumberOfSegments_i::GetScaleFactor()
   throw ( SALOME::SALOME_Exception )
 {
-  MESSAGE( "StdMeshers_NumberOfSegments_i::GetScaleFactor" );
   ASSERT( myBaseImpl );
   double scale;
   try {
@@ -199,13 +249,14 @@ CORBA::Double StdMeshers_NumberOfSegments_i::GetScaleFactor()
 void StdMeshers_NumberOfSegments_i::SetTableFunction(const SMESH::double_array& table)
   throw ( SALOME::SALOME_Exception )
 {
-  MESSAGE( "StdMeshers_NumberOfSegments_i::SetTableFunction" );
   ASSERT( myBaseImpl );
   std::vector<double> tbl( table.length() );
   for (int i = 0; i < table.length(); i++)
     tbl[i] = table[i];
   try {
     this->GetImpl()->SetTableFunction( tbl );
+    // Update Python script
+    SMESH::TPythonDump() << _this() << ".SetTableFunction( " << table << " )";
   }
   catch ( SALOME_Exception& S_ex ) {
     THROW_SALOME_CORBA_EXCEPTION( S_ex.what(),
@@ -221,7 +272,6 @@ void StdMeshers_NumberOfSegments_i::SetTableFunction(const SMESH::double_array&
 SMESH::double_array* StdMeshers_NumberOfSegments_i::GetTableFunction()
   throw ( SALOME::SALOME_Exception )
 {
-  MESSAGE( "StdMeshers_NumberOfSegments_i::GetTableFunction" );
   ASSERT( myBaseImpl );
   const std::vector<double>* tbl;
   try {
@@ -246,10 +296,11 @@ SMESH::double_array* StdMeshers_NumberOfSegments_i::GetTableFunction()
 void StdMeshers_NumberOfSegments_i::SetExpressionFunction(const char* expr)
   throw ( SALOME::SALOME_Exception )
 {
-  MESSAGE( "StdMeshers_NumberOfSegments_i::SetExpressionFunction" );
   ASSERT( myBaseImpl );
   try {
     this->GetImpl()->SetExpressionFunction( expr );
+    // Update Python script
+    SMESH::TPythonDump() << _this() << ".SetExpressionFunction( '" << expr << "' )";
   }
   catch ( SALOME_Exception& S_ex ) {
     THROW_SALOME_CORBA_EXCEPTION( S_ex.what(),
@@ -265,7 +316,6 @@ void StdMeshers_NumberOfSegments_i::SetExpressionFunction(const char* expr)
 char* StdMeshers_NumberOfSegments_i::GetExpressionFunction()
   throw ( SALOME::SALOME_Exception )
 {
-  MESSAGE( "StdMeshers_NumberOfSegments_i::GetExpressionFunction" );
   ASSERT( myBaseImpl );
   const char* expr;
   try {
@@ -283,13 +333,14 @@ char* StdMeshers_NumberOfSegments_i::GetExpressionFunction()
  */
 //=============================================================================
 
-void StdMeshers_NumberOfSegments_i::SetExponentMode(CORBA::Boolean isExp)
+void StdMeshers_NumberOfSegments_i::SetConversionMode(CORBA::Long conv )
   throw ( SALOME::SALOME_Exception )
 {
-  MESSAGE( "StdMeshers_NumberOfSegments_i::SetExponentMode" );
   ASSERT( myBaseImpl );
   try {
-    this->GetImpl()->SetExponentMode( isExp );
+    this->GetImpl()->SetConversionMode( conv );
+    // Update Python script
+    SMESH::TPythonDump() << _this() << ".SetConversionMode( " << conv << " )";
   }
   catch ( SALOME_Exception& S_ex ) {
     THROW_SALOME_CORBA_EXCEPTION( S_ex.what(),
@@ -302,20 +353,19 @@ void StdMeshers_NumberOfSegments_i::SetExponentMode(CORBA::Boolean isExp)
  */
 //=============================================================================
 
-CORBA::Boolean StdMeshers_NumberOfSegments_i::IsExponentMode()
+CORBA::Long StdMeshers_NumberOfSegments_i::ConversionMode()
   throw ( SALOME::SALOME_Exception )
 {
-  MESSAGE( "StdMeshers_NumberOfSegments_i::IsExponentMode" );
   ASSERT( myBaseImpl );
-  bool isExp;
+  int conv;
   try {
-    isExp = this->GetImpl()->IsExponentMode();
+    conv = this->GetImpl()->ConversionMode();
   }
   catch ( SALOME_Exception& S_ex ) {
     THROW_SALOME_CORBA_EXCEPTION( S_ex.what(),
 				  SALOME::BAD_PARAM );
   }
-  return isExp;
+  return conv;
 }
 
 //=============================================================================
@@ -328,7 +378,20 @@ CORBA::Boolean StdMeshers_NumberOfSegments_i::IsExponentMode()
 
 ::StdMeshers_NumberOfSegments* StdMeshers_NumberOfSegments_i::GetImpl()
 {
-  MESSAGE( "StdMeshers_NumberOfSegments_i::GetImpl" );
   return ( ::StdMeshers_NumberOfSegments* )myBaseImpl;
 }
 
+//================================================================================
+/*!
+ * \brief Verify whether hypothesis supports given entity type 
+  * \param type - dimension (see SMESH::Dimension enumeration)
+  * \retval CORBA::Boolean - TRUE if dimension is supported, FALSE otherwise
+ * 
+ * Verify whether hypothesis supports given entity type (see SMESH::Dimension enumeration)
+ */
+//================================================================================  
+CORBA::Boolean StdMeshers_NumberOfSegments_i::IsDimSupported( SMESH::Dimension type )
+{
+  return type == SMESH::DIM_1D;
+}
+