integration of modifications from Gérald Nicolas

[modules/homard.git] / src / HOMARD_I / HOMARD_Boundary_i.hxx

diff --git a/src/HOMARD_I/HOMARD_Boundary_i.hxx b/src/HOMARD_I/HOMARD_Boundary_i.hxx
index 081753e2c03e41c49d1235ae07cb7d85256cb1db..6c6caf81333a14bb6d8045cab7aec855076a8327 100644 (file)
--- a/src/HOMARD_I/HOMARD_Boundary_i.hxx
+++ b/src/HOMARD_I/HOMARD_Boundary_i.hxx
@@ -1,3 +1,22 @@
+// Copyright (C) 2011-2012  CEA/DEN, EDF R&D
+//
+// 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.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
 #ifndef _HOMARD_Boundary_I_HXX_
 #define _HOMARD_Boundary_I_HXX_
 
@@ -5,46 +24,50 @@
 #include CORBA_SERVER_HEADER(HOMARD_Gen)
 #include CORBA_SERVER_HEADER(HOMARD_Boundary)
 
+#include "SALOME_Component_i.hxx"
+#include "SALOME_NamingService.hxx"
+#include "Utils_CorbaException.hxx"
+
 #include <string>
 
 class HOMARD_Boundary;
 
-class HOMARD_Boundary_i: public virtual POA_HOMARD::HOMARD_Boundary,
-                         public virtual PortableServer::ServantBase
-{ 
+class HOMARD_Boundary_i:
+  public virtual Engines_Component_i,
+  public virtual POA_HOMARD::HOMARD_Boundary,
+  public virtual PortableServer::ServantBase
+{
 public:
   HOMARD_Boundary_i( CORBA::ORB_ptr orb, HOMARD::HOMARD_Gen_var gen_i );
   HOMARD_Boundary_i();
-  
+
   virtual ~HOMARD_Boundary_i();
 
-  void                   SetName( const char* NomBoundary );
+  void                   SetName( const char* Name );
   char*                  GetName();
   char*                  GetDumpPython();
-  
-  void                   SetBoundaryType( CORBA::Long BoundaryType );
-  
-  CORBA::Long            GetBoundaryType();
+
+  void                   SetType( CORBA::Long Type );
+
+  CORBA::Long            GetType();
 
   void                   SetMeshFile( const char* MeshFile );
   char*                  GetMeshFile();
 
   void                   SetMeshName( const char* MeshName );
   char*                  GetMeshName();
-  
-  HOMARD::double_array*  GetCylinder();
+
   void                   SetCylinder( double Xcentre, double Ycentre, double ZCentre,
                                       double Xaxe, double Yaxe, double Zaxe,
                                       double rayon );
-  
-  HOMARD::double_array*  GetSphere();
   void                   SetSphere( double Xcentre, double Ycentre, double ZCentre,
                                     double rayon );
-  
+  HOMARD::double_array*  GetCoords();
+
   HOMARD::double_array*  GetLimit();
   void                   SetLimit( double Xincr, double Yincr, double Zincr);
-  
-  
+
+
   std::string            Dump() const;
   bool                   Restore( const std::string& stream );
 
@@ -58,7 +81,7 @@ public:
 
 private:
   ::HOMARD_Boundary*     myHomardBoundary;
-  
+
   CORBA::ORB_ptr         _orb;
   HOMARD::HOMARD_Gen_var _gen_i;
 };