X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHEXABLOCK%2FHexVertex.hxx;h=4cfc41bd982868651dfb3d0bee123b6561964c0c;hb=a2834d297d501f7350ff00a36221dc1d53326a32;hp=6b534e9faa5f002f1cd06675a6bfc105120b32d8;hpb=3362101497b1bc0ded71b74c0806ac06c64d49d3;p=modules%2Fhexablock.git

diff --git a/src/HEXABLOCK/HexVertex.hxx b/src/HEXABLOCK/HexVertex.hxx
index 6b534e9..4cfc41b 100755
--- a/src/HEXABLOCK/HexVertex.hxx
+++ b/src/HEXABLOCK/HexVertex.hxx
@@ -1,14 +1,34 @@
 
-// Class : Gestion des sommets 
+// Class : Gestion des sommets
+
+// Copyright (C) 2009-2013  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 __VERTEX_H_
 #define __VERTEX_H_
 
+#include "Hex_defines.hxx"
 #include "HexEltBase.hxx"
 
 BEGIN_NAMESPACE_HEXA
 
-class Vertex : public EltBase 
+class HEXABLOCKENGINE_EXPORT Vertex : public EltBase
 {
 public :
    double getX()   { return v_x; }
@@ -19,69 +39,70 @@ public :
    void setY (double v)   { v_y = v ; }
    void setZ (double v)   { v_z = v ; }
 
+   double getAssoX ()   { return is_associated ? gc_x : v_x ; }
+   double getAssoY ()   { return is_associated ? gc_y : v_y ; }
+   double getAssoZ ()   { return is_associated ? gc_z : v_z ; }
+
+   int  setAssociation   (NewShape* geom, int subid);
+   void clearAssociation ();
+
+   void setColor (double valeur)       { v_scalar = valeur ; }
+
+   Vertex (Document* prev, double x, double y, double z);
+
+#ifndef SWIG
+public : 
+   double getCoord (int dir);
+   virtual int     countVertex ()       { return 1; }
+   virtual Vertex* getVertex (int nro)  { return this; }
+
+                                                   // Hexa5
+   int  setAssociation (VertexShape* forme);
+   int  setAssociation (double* point);
+   int  setAssociation (double px, double py, double pz);
+
+   VertexShape* getAssoVertex ()              { return v_shape ;}
+   VertexShape* getAssociation ()             { return v_shape ;}
+
+   void   getAssoCoord (double &x, double &y, double &z);
+   void   getAssoCoord (double* point);
+
 public :
-   Vertex (Document* prev, double x=0.0, double y=0.0, double z=0.0); 
    Vertex (Vertex* other);
    virtual ~Vertex () {}
    virtual void dump () ;
-   virtual void saveXml (XmlWriter& xml);
+   virtual void saveXml (XmlWriter* xml);
 
-   void   setScalar (double val)             { v_scalar = val ; }
-   double getScalar ()                       { return v_scalar ; }
+   void    setScalar (double val)             { setColor (val) ; }
+   double  getScalar ()                       { return v_scalar ; }
+   double* getPoint (double point[]);
 
    void setCoord  (double x, double y, double z);
-   bool isin      (double xmin, double xmax, double ymin, double ymax, 
+   void setCoord  (double point[]) { setCoord (point[0], point[1], point[2]); }
+
+   bool isin      (double xmin, double xmax, double ymin, double ymax,
                                             double zmin, double zmax);
-   Edge* getParent (int nro); 
-   Vertex* makeSymetric (Vertex* other);
-   void    translate  (Vector* vecteur, double fact=1.0);
+   Edge* getParent (int nro);
+   void  translate (Vector* vecteur, double fact=1.0);
+   void  replace   (Vertex* old);
+
+   Vertex* getClone ()              {  return v_clone ; }
+   void    duplicate (Document* doc);
 
    static Vertex* createMiddle (Vertex* left, Vertex* right);
+   bool   definedBy (double px, double py, double pz, double eps2=1e-4);
+   double dist2 (Vertex* other);
 
 private :
     double v_x;
     double v_y;
     double v_z;
 
-    double v_scalar;
+    double  v_scalar;
+    Vertex* v_clone;
+    double  gc_x, gc_y, gc_z;
+    VertexShape*  v_shape;
+#endif
 };
-// ========================================================= Constructeur bis 
-inline Vertex::Vertex (Vertex* other)
-      : EltBase (other->dad(), EL_VERTEX)
-{
-   v_x = other->v_x;
-   v_y = other->v_y;
-   v_z = other->v_z;
-   v_scalar = 0;
-}
-// ========================================================= dump 
-inline void Vertex::dump ()
-{
-   printName (" = ");
-   if (NOT isHere ())
-      {
-      printf ("(*** deleted ***)\n");
-      return;
-      }
-
-   printf ("(%g, %g, %g)", v_x,v_y,v_z);
-   dumpRef ();
-}
-// ========================================================= setCoord 
-inline void Vertex::setCoord (double x, double y, double z)
-{
-   v_x = x;
-   v_y = y;
-   v_z = z;
-}
-// ========================================================= isin 
-inline bool Vertex::isin  (double xmin, double xmax, double ymin, double ymax, 
-                                             double zmin, double zmax)
-{
-   bool   rep =   v_x >= xmin && v_x <= xmax
-               && v_y >= ymin && v_y <= ymax
-               && v_z >= zmin && v_z <= zmax;
-   return rep;
-}
 END_NAMESPACE_HEXA
 #endif