X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHEXABLOCK%2FHexVertex.cxx;h=795c9f0c6870894c2e54a4fe008de9f76cd03589;hb=65fe90d82be36b706e2f267441b8e580ead1a802;hp=0c6bee6cc286d6cb6bcf3ff91d51ab97f4b0c958;hpb=8681e72f844274a0c2fc2cd64bbf2451bd8db77b;p=modules%2Fhexablock.git

diff --git a/src/HEXABLOCK/HexVertex.cxx b/src/HEXABLOCK/HexVertex.cxx
index 0c6bee6..795c9f0 100755
--- a/src/HEXABLOCK/HexVertex.cxx
+++ b/src/HEXABLOCK/HexVertex.cxx
@@ -1,7 +1,7 @@
 
 //  C++ Les noeuds
 
-// Copyright (C) 2009-2012  CEA/DEN, EDF R&D
+// 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
@@ -25,10 +25,15 @@
 #include "HexVector.hxx"
 
 #include "HexXmlWriter.hxx"
-#include "HexShape.hxx"
+#include "HexDocument.hxx"
+#include "HexNewShape.hxx"
+#include "HexVertexShape.hxx"
+#include "HexKas_functions.hxx"
 
 BEGIN_NAMESPACE_HEXA
 
+static bool db =  on_debug ();  // == getenv ("HEXA_DB") > 0
+
 // ====================================================== Constructeur
 Vertex::Vertex  (Document* doc, double x, double y, double z)
       : EltBase (doc, EL_VERTEX)
@@ -37,38 +42,75 @@ Vertex::Vertex  (Document* doc, double x, double y, double z)
    gc_y = v_y = y;
    gc_z = v_z = z;
 
+   v_shape  = NULL;
    v_scalar = 0;
    v_clone  = NULL;
+
+   if (el_root != NULL)
+       el_root->addVertex (this);
+}
+// ========================================================= Constructeur bis
+Vertex::Vertex (Vertex* other)
+      : EltBase (other->dad(), EL_VERTEX)
+{
+   if (other!= NULL)
+      {
+      v_x = other->v_x;
+      v_y = other->v_y;
+      v_z = other->v_z;
+      v_scalar = other->v_scalar;
+      gc_x   = other->gc_x;
+      gc_y   = other->gc_y;
+      gc_z   = other->gc_z;
+      v_clone  = NULL;
+      v_shape  = other->v_shape;
+      }
+   else
+      {
+      v_x  = v_y  = v_z  = 0;
+      gc_x = gc_y = gc_z = 0;
+      v_scalar = 0;
+      v_shape  = NULL;
+      v_clone  = NULL;
+      }
 }
-// ========================================================= getParent 
+// ========================================================= getParent
 Edge* Vertex::getParent  (int nro)
 {
    return static_cast <Edge*> (getFather (nro));
 }
-// ========================================================= saveXml 
+// ========================================================= saveXml
 void Vertex::saveXml  (XmlWriter* xml)
 {
    char buffer[12], coord[80];
 
-   sprintf (coord, "%g %g %g", v_x,v_y,v_z);
+   sprintf (coord, "%g %g %g", v_x, v_y, v_z);
 
    xml->openMark     ("Vertex");
    xml->addAttribute ("id",    getName (buffer));
    xml->addAttribute ("coord", coord);
-   if (el_name!=buffer) 
+   if (el_name!=buffer)
        xml->addAttribute ("name", el_name);
-   if (el_assoc!=NULL)
-      xml->addAttribute ("shape", el_assoc->getBrep().c_str());
    xml->closeMark ();
+
+   if (v_shape != NULL)
+      {
+      sprintf (coord, "%g %g %g", gc_x, gc_y, gc_z);
+      v_shape->callXml (xml);
+      xml->addAttribute ("coord", coord);
+      xml->closeMark ();
+      }
+
+// if (el_assoc!=NULL) xml->addAttribute ("shape", el_assoc->getBrep().c_str());
 }
-// ========================================================= translate 
+// ========================================================= translate
 void  Vertex::translate  (Vector* vecteur, double fact)
 {
     v_x += fact*vecteur->getDx ();
     v_y += fact*vecteur->getDy ();
     v_z += fact*vecteur->getDz ();
 }
-// ========================================================= createMiddle 
+// ========================================================= createMiddle
 Vertex* Vertex::createMiddle  (Vertex* left, Vertex* right)
 {
     Vertex* milieu = new Vertex (left);
@@ -79,4 +121,151 @@ Vertex* Vertex::createMiddle  (Vertex* left, Vertex* right)
 
     return milieu;
 }
+// ========================================================= setAssociation
+int Vertex::setAssociation (VertexShape* forme)
+{
+   if (forme==NULL)
+      return HERR;
+
+   forme->addAssociation (this);
+   forme->getCoords (gc_x, gc_y, gc_z);
+   v_shape = forme;
+
+   if (db) cout << " Vertex "           << el_name
+                << " setAssociation-> " << forme->getName ()
+                << " = (" << gc_x << ", " << gc_y << ", " << gc_z << ") \n" ;
+
+   is_associated = true;
+   return HOK;
+}
+// ========================================================= setAssociation
+int Vertex::setAssociation (NewShape* geom, int subid)
+{
+   if (geom==NULL)
+      return HERR;
+
+   VertexShape* shape = geom->findVertex (subid);
+   if (shape==NULL)
+      return HERR;
+
+   int ier = setAssociation (shape);
+   return ier;
+}
+// ========================================================= setAssociation
+int Vertex::setAssociation (double* point)
+{
+   NewShape* cloud = el_root->getCloud();
+
+   int subid = cloud->addPoint (point);
+   int ier   = setAssociation  (cloud, subid);
+   return ier;
+}
+// ========================================================= setAssociation
+int Vertex::setAssociation (double px, double py, double pz)
+{
+   Real3 point = { px, py, pz };
+   int   ier   = setAssociation (point);
+   return ier;
+}
+// ========================================================= clearAssociation
+void Vertex::clearAssociation ()
+{
+   v_shape = NULL;
+   is_associated = false;
+}
+// ========================================================= getAssoCoord
+void Vertex::getAssoCoord (double &px, double &py, double &pz)
+{
+   if (is_associated)
+      {
+      px = gc_x;
+      py = gc_y;
+      pz = gc_z;
+      }
+   else
+      {
+      px = v_x;
+      py = v_y;
+      pz = v_z;
+      }
+}
+// ========================================================= getAssoCoord
+void Vertex::getAssoCoord (double* point)
+{
+   getAssoCoord (point[dir_x], point[dir_y], point[dir_z]);
+}
+// ===================================================== getCoord
+double Vertex::getCoord (int dir)
+{
+   double val = 0;
+   switch (dir)
+          {
+          case dir_x : val = v_x;
+               break;
+          case dir_y : val = v_y;
+               break;
+          case dir_z : val = v_z;
+               break;
+          }
+   return val;
+}
+// ========================================================= dump
+void Vertex::dump ()
+{
+   printName (" = ");
+   if (NOT isHere ())
+      {
+      printf ("(*** deleted ***)\n");
+      return;
+      }
+
+   printf ("(%g, %g, %g)", v_x,v_y,v_z);
+   dumpRef ();
+}
+// ========================================================= setCoord
+void Vertex::setCoord (double x, double y, double z)
+{
+   v_x = x;
+   v_y = y;
+   v_z = z;
+}
+// ========================================================= isin
+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;
+}
+// ========================================================= getPoint
+double* Vertex::getPoint (double point[])
+{
+   point [dir_x] = v_x;
+   point [dir_y] = v_y;
+   point [dir_z] = v_z;
+   return point;
+}
+// ========================================================= duplicate
+void Vertex::duplicate (Document* cible)
+{
+   v_clone = new Vertex (cible, v_x, v_y, v_z);
+   v_clone->v_scalar = v_scalar;
+}
+// ========================================================= definedBy
+bool Vertex::definedBy (double px, double py, double pz, double eps2)
+{
+   double dist2 = carre (v_x-px) + carre (v_y-py) + carre (v_z-pz);
+   return dist2 < eps2;
+}
+// ========================================================= dist2
+double Vertex::dist2 (Vertex* other)
+{
+   if (BadElement (other))
+      return 1e+77;
+
+   double dist = carre (v_x-other->v_x) + carre (v_y-other->v_y) 
+                                        + carre (v_z-other->v_z);
+   return dist;
+}
 END_NAMESPACE_HEXA