X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHEXABLOCK%2FHexNewShape.hxx;h=b356abb6389c440849b9e95c7be011e17ced92ae;hb=0ebe741f3ee8a69f147a5c02b41f33d3f3f02e0f;hp=1793f85214996753ff47773580d799c957f0c752;hpb=ab53385205fe062af0e87d4e14296b1492fe3611;p=modules%2Fhexablock.git

diff --git a/src/HEXABLOCK/HexNewShape.hxx b/src/HEXABLOCK/HexNewShape.hxx
index 1793f85..b356abb 100644
--- a/src/HEXABLOCK/HexNewShape.hxx
+++ b/src/HEXABLOCK/HexNewShape.hxx
@@ -1,19 +1,40 @@
 
 // class : Gestion des formes associees (Hexa 5)
 
+// Copyright (C) 2009-2019  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, 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
+// 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 __NEW_SHAPE_H_
 #define __NEW_SHAPE_H_
 
 #include "HexEltBase.hxx"
 
+#ifndef SWIG
 #include <TopTools_IndexedMapOfShape.hxx>
 #include <TopoDS_Shape.hxx>
 #include <TopoDS_Compound.hxx>
 #include <BRep_Builder.hxx>
+#endif
 
 BEGIN_NAMESPACE_HEXA
 
-class NewShape : public EltBase
+class HexaExport NewShape : public EltBase
 {
 public :         // for TUI
    virtual int countVertex ()   { return tab_vertex.size ();  }
@@ -28,17 +49,19 @@ public :         // for TUI
    cpchar getNameEdge    (int nro);
    cpchar getNameFace    (int nro);
 
-   const string&       getBrep ();
-   const TopoDS_Shape& getShape ();
+   NewShape (Document* dad, EnumShape type=SH_NONE);
 
+#ifndef SWIG
 public :         // for GUI
+   cpchar              getBrep ();
+   const TopoDS_Shape& getShape ();
+
    EnumShape    getOrigin ()        { return sh_origin ; }
    VertexShape* getVertexShape (int nro);
    EdgeShape*   getEdgeShape (int nro);
    FaceShape*   getFaceShape (int nro);
 
 public :         // for Others
-   NewShape (Document* dad, EnumShape type=SH_NONE);
    void  setShape (const TopoDS_Shape& shape, EnumShape type=SH_IMPORT);
    void  setBrep  (rcstring brep);
    int   addPoint (double* coord);
@@ -47,11 +70,14 @@ public :         // for Others
    void  addAssociation (Quad*   elt, int subid);
 
    VertexShape* findVertex   (int subid);
+   VertexShape* findVertex   (double point[]);
    EdgeShape*   findEdge     (int subid);
+   EdgeShape*   findEdge     (double p1[], double p2[]);
    FaceShape*   findFace     (int subid);
 
    SubShape*    findSubShape (int subid);
 
+
    const TopoDS_Shape& getGeoShape (int subid);
 
    int   saveBrep ();
@@ -101,6 +127,7 @@ private :     // ________________________________________________________
    int sh_face_max;
    int sh_edge_max;
    int sh_vertex_max;
+#endif
 };
 END_NAMESPACE_HEXA
 #endif