X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FStdMeshers_I%2FStdMeshers_FixedPoints1D_i.cxx;h=ad954cb9b6675257b580aecf0baf38431e4ca6a1;hp=e11ceb98787e6ab91ee4df332f97db2fffadbc41;hb=b09372829929f8f561495d6c16527134971a1909;hpb=a17b36970bc61da1d664453c615754997c925b18 diff --git a/src/StdMeshers_I/StdMeshers_FixedPoints1D_i.cxx b/src/StdMeshers_I/StdMeshers_FixedPoints1D_i.cxx index e11ceb987..ad954cb9b 100644 --- a/src/StdMeshers_I/StdMeshers_FixedPoints1D_i.cxx +++ b/src/StdMeshers_I/StdMeshers_FixedPoints1D_i.cxx @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2021 CEA/DEN, EDF R&D, OPEN CASCADE // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -17,7 +17,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_FixedPoints1D_i.cxx // Author : Damien COQUERET, OCC // Module : SMESH @@ -44,14 +44,12 @@ using namespace std; //============================================================================= StdMeshers_FixedPoints1D_i::StdMeshers_FixedPoints1D_i( PortableServer::POA_ptr thePOA, - int theStudyId, ::SMESH_Gen* theGenImpl ) - : SALOME::GenericObj_i( thePOA ), - SMESH_Hypothesis_i( thePOA ) + : SALOME::GenericObj_i( thePOA ), + SMESH_Hypothesis_i( thePOA ), + StdMeshers_Reversible1D_i( this ) { - MESSAGE( "StdMeshers_FixedPoints1D_i::StdMeshers_FixedPoints1D_i" ); myBaseImpl = new ::StdMeshers_FixedPoints1D(theGenImpl->GetANewId(), - theStudyId, theGenImpl); } @@ -65,7 +63,6 @@ StdMeshers_FixedPoints1D_i::StdMeshers_FixedPoints1D_i( PortableServer::POA_ptr StdMeshers_FixedPoints1D_i::~StdMeshers_FixedPoints1D_i() { - MESSAGE( "StdMeshers_FixedPoints1D_i::~StdMeshers_FixedPoints1D_i" ); } //============================================================================= @@ -74,15 +71,14 @@ StdMeshers_FixedPoints1D_i::~StdMeshers_FixedPoints1D_i() */ //============================================================================= -void StdMeshers_FixedPoints1D_i::SetNbSegments(const SMESH::long_array& listNbSeg) - throw ( SALOME::SALOME_Exception ) +void StdMeshers_FixedPoints1D_i::SetNbSegments(const SMESH::smIdType_array& listNbSeg) + { - MESSAGE( "StdMeshers_FixedPoints1D_i::SetNbSegments" ); ASSERT( myBaseImpl ); try { - std::vector nbsegs( listNbSeg.length() ); - CORBA::Long iEnd = listNbSeg.length(); - for ( CORBA::Long i = 0; i < iEnd; i++ ) + std::vector nbsegs( listNbSeg.length() ); + CORBA::ULong iEnd = listNbSeg.length(); + for ( CORBA::ULong i = 0; i < iEnd; i++ ) nbsegs[ i ] = listNbSeg[ i ]; this->GetImpl()->SetNbSegments( nbsegs ); } @@ -102,9 +98,8 @@ void StdMeshers_FixedPoints1D_i::SetNbSegments(const SMESH::long_array& listNbSe //============================================================================= void StdMeshers_FixedPoints1D_i::SetPoints(const SMESH::double_array& listParams) - throw ( SALOME::SALOME_Exception ) + { - MESSAGE( "StdMeshers_FixedPoints1D_i::SetPoints" ); ASSERT( myBaseImpl ); try { std::vector params( listParams.length() ); @@ -132,11 +127,10 @@ void StdMeshers_FixedPoints1D_i::SetPoints(const SMESH::double_array& listParams SMESH::double_array* StdMeshers_FixedPoints1D_i::GetPoints() { - MESSAGE( "StdMeshers_FixedPoints1D_i::GetPoints" ); ASSERT( myBaseImpl ); SMESH::double_array_var anArray = new SMESH::double_array; std::vector params = this->GetImpl()->GetPoints(); - anArray->length( params.size() ); + anArray->length( static_cast( params.size() )); for ( CORBA::ULong i = 0; i < params.size(); i++) anArray [ i ] = params [ i ]; @@ -151,113 +145,18 @@ SMESH::double_array* StdMeshers_FixedPoints1D_i::GetPoints() */ //============================================================================= -SMESH::long_array* StdMeshers_FixedPoints1D_i::GetNbSegments() +SMESH::smIdType_array* StdMeshers_FixedPoints1D_i::GetNbSegments() { - MESSAGE( "StdMeshers_FixedPoints1D_i::GetNbSegments" ); ASSERT( myBaseImpl ); - SMESH::long_array_var anArray = new SMESH::long_array; - std::vector nbsegs = this->GetImpl()->GetNbSegments(); - anArray->length( nbsegs.size() ); + SMESH::smIdType_array_var anArray = new SMESH::smIdType_array; + std::vector nbsegs = this->GetImpl()->GetNbSegments(); + anArray->length( static_cast( nbsegs.size() )); for ( CORBA::ULong i = 0; i < nbsegs.size(); i++) anArray [ i ] = nbsegs [ i ]; return anArray._retn(); } -//============================================================================= -/*! - * StdMeshers_FixedPoints1D_i::SetReversedEdges - * - * Set edges to reverse - */ -//============================================================================= - -void StdMeshers_FixedPoints1D_i::SetReversedEdges( const SMESH::long_array& theIds ) -{ - ASSERT( myBaseImpl ); - try { - std::vector ids( theIds.length() ); - CORBA::Long iEnd = theIds.length(); - for ( CORBA::Long i = 0; i < iEnd; i++ ) - ids[ i ] = theIds[ i ]; - - this->GetImpl()->SetReversedEdges( ids ); - } - catch ( SALOME_Exception& S_ex ) { - THROW_SALOME_CORBA_EXCEPTION( S_ex.what(), - SALOME::BAD_PARAM ); - } - - // Update Python script - SMESH::TPythonDump() << _this() << ".SetReversedEdges( " << theIds << " )"; -} - -//============================================================================= -/*! - * StdMeshers_FixedPoints1D_i::SetObjectEntry - * - * Set the Entry for the Main Object - */ -//============================================================================= - -void StdMeshers_FixedPoints1D_i::SetObjectEntry( const char* theEntry ) -{ - ASSERT( myBaseImpl ); - string entry(theEntry); // actually needed as theEntry is spoiled by moment of dumping - try { - this->GetImpl()->SetObjectEntry( entry.c_str() ); - // Update Python script - SMESH::TPythonDump() << _this() << ".SetObjectEntry( \"" << entry.c_str() << "\" )"; - } - catch ( SALOME_Exception& S_ex ) { - THROW_SALOME_CORBA_EXCEPTION( S_ex.what(),SALOME::BAD_PARAM ); - } -} - -//============================================================================= -/*! - * StdMeshers_FixedPoints1D_i::GetObjectEntry - * - * Set the Entry for the Main Object - */ -//============================================================================= - -char* StdMeshers_FixedPoints1D_i::GetObjectEntry() -{ - MESSAGE( "StdMeshers_FixedPoints1D_i::SetObjectEntry" ); - ASSERT( myBaseImpl ); - const char* entry; - try { - entry = this->GetImpl()->GetObjectEntry(); - } - catch ( SALOME_Exception& S_ex ) { - THROW_SALOME_CORBA_EXCEPTION( S_ex.what(), - SALOME::BAD_PARAM ); - } - return CORBA::string_dup( entry ); -} - -//============================================================================= -/*! - * StdMeshers_FixedPoints1D_i::GetReversedEdges - * - * Get reversed edges - */ -//============================================================================= - -SMESH::long_array* StdMeshers_FixedPoints1D_i::GetReversedEdges() -{ - MESSAGE( "StdMeshers_FixedPoints1D_i::GetReversedEdges" ); - ASSERT( myBaseImpl ); - SMESH::long_array_var anArray = new SMESH::long_array; - std::vector ids = this->GetImpl()->GetReversedEdges(); - anArray->length( ids.size() ); - for ( CORBA::ULong i = 0; i < ids.size(); i++) - anArray [ i ] = ids [ i ]; - - return anArray._retn(); -} - //============================================================================= /*! * StdMeshers_FixedPoints1D_i::GetImpl @@ -268,7 +167,6 @@ SMESH::long_array* StdMeshers_FixedPoints1D_i::GetReversedEdges() ::StdMeshers_FixedPoints1D* StdMeshers_FixedPoints1D_i::GetImpl() { - MESSAGE( "StdMeshers_FixedPoints1D_i::GetImpl" ); return ( ::StdMeshers_FixedPoints1D* )myBaseImpl; } @@ -280,9 +178,34 @@ SMESH::long_array* StdMeshers_FixedPoints1D_i::GetReversedEdges() * * Verify whether hypothesis supports given entity type (see SMESH::Dimension enumeration) */ -//================================================================================ +//================================================================================ CORBA::Boolean StdMeshers_FixedPoints1D_i::IsDimSupported( SMESH::Dimension type ) { return type == SMESH::DIM_1D; } +//================================================================================ +/*! + * \brief Return geometry this hypothesis depends on. Return false if there is no geometry parameter + */ +//================================================================================ + +bool +StdMeshers_FixedPoints1D_i::getObjectsDependOn( std::vector< std::string > & entryArray, + std::vector< int > & subIDArray ) const +{ + return StdMeshers_Reversible1D_i::getObjectsDependOn( entryArray, subIDArray ); +} + +//================================================================================ +/*! + * \brief Set new geometry instead of that returned by getObjectsDependOn() + */ +//================================================================================ + +bool +StdMeshers_FixedPoints1D_i::setObjectsDependOn( std::vector< std::string > & entryArray, + std::vector< int > & subIDArray ) +{ + return StdMeshers_Reversible1D_i::setObjectsDependOn( entryArray, subIDArray ); +}