X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHOMARD_I%2FHOMARD_Boundary_i.cxx;h=d1f829ce4521696956dbb968cdc7f848621566b0;hb=refs%2Ftags%2FV9_13_0b1;hp=84346e0d122c2d3604f1a232d461197ced3fc69f;hpb=633ecb2c6133ab4f266d218ff13da5e46310c90f;p=modules%2Fhomard.git diff --git a/src/HOMARD_I/HOMARD_Boundary_i.cxx b/src/HOMARD_I/HOMARD_Boundary_i.cxx index 84346e0d..d1f829ce 100644 --- a/src/HOMARD_I/HOMARD_Boundary_i.cxx +++ b/src/HOMARD_I/HOMARD_Boundary_i.cxx @@ -1,9 +1,9 @@ -// Copyright (C) 2011-2012 CEA/DEN, EDF R&D +// Copyright (C) 2011-2024 CEA, EDF // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public // License as published by the Free Software Foundation; either -// version 2.1 of the License. +// version 2.1 of the License, or (at your option) any later version. // // This library is distributed in the hope that it will be useful, // but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -16,6 +16,7 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // + // Remarques : // L'ordre de description des fonctions est le meme dans tous les fichiers // HOMARD_aaaa.idl, HOMARD_aaaa.hxx, HOMARD_aaaa.cxx, HOMARD_aaaa_i.hxx, HOMARD_aaaa_i.cxx : @@ -42,7 +43,6 @@ HOMARD_Boundary_i::HOMARD_Boundary_i() MESSAGE( "Default constructor, not for use" ); ASSERT( 0 ); } - //============================================================================= /*! * standard constructor @@ -62,7 +62,6 @@ HOMARD_Boundary_i::HOMARD_Boundary_i( CORBA::ORB_ptr orb, * standard destructor */ //============================================================================= - HOMARD_Boundary_i::~HOMARD_Boundary_i() { } @@ -101,7 +100,6 @@ std::string HOMARD_Boundary_i::Dump() const { return HOMARD::Dump( *myHomardBoundary ); } - //============================================================================= bool HOMARD_Boundary_i::Restore( const std::string& stream ) { @@ -136,17 +134,18 @@ char* HOMARD_Boundary_i::GetMeshName() return CORBA::string_dup( myHomardBoundary->GetMeshName().c_str() ); } //============================================================================= -void HOMARD_Boundary_i::SetMeshFile( const char* MeshFile ) +void HOMARD_Boundary_i::SetDataFile( const char* DataFile ) { ASSERT( myHomardBoundary ); - myHomardBoundary->SetMeshFile( MeshFile ); - _gen_i->PublishResultInSmesh(MeshFile, 0); + myHomardBoundary->SetDataFile( DataFile ); + int PublisMeshIN = _gen_i->GetPublisMeshIN () ; + if ( PublisMeshIN != 0 ) { _gen_i->PublishResultInSmesh(DataFile, 0); } } //============================================================================= -char* HOMARD_Boundary_i::GetMeshFile() +char* HOMARD_Boundary_i::GetDataFile() { ASSERT( myHomardBoundary ); - return CORBA::string_dup( myHomardBoundary->GetMeshFile().c_str() ); + return CORBA::string_dup( myHomardBoundary->GetDataFile().c_str() ); } //============================================================================= void HOMARD_Boundary_i::SetCylinder( double X0, double X1, double X2, double X3, double X4, double X5, double X6 ) @@ -173,6 +172,12 @@ void HOMARD_Boundary_i::SetConeA( double Xaxe, double Yaxe, double Zaxe, double myHomardBoundary->SetConeA( Xaxe, Yaxe, Zaxe, Angle, Xcentre, Ycentre, Zcentre ); } //============================================================================= +void HOMARD_Boundary_i::SetTorus( double X0, double X1, double X2, double X3, double X4, double X5, double X6, double X7 ) +{ + ASSERT( myHomardBoundary ); + myHomardBoundary->SetTorus( X0, X1, X2, X3, X4, X5, X6, X7 ); +} +//============================================================================= HOMARD::double_array* HOMARD_Boundary_i::GetCoords() { ASSERT( myHomardBoundary );