X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FHEXABLOCK%2FHexEltBase.hxx;h=4d5bf8e8b6a18c0f8e9389dd9ea80e4efa68e723;hb=7e372bca8f08bce752e415ebf847d0a93fa703dc;hp=a95a290607c81e03c1389821beb664bdd64db23c;hpb=8681e72f844274a0c2fc2cd64bbf2451bd8db77b;p=modules%2Fhexablock.git

diff --git a/src/HEXABLOCK/HexEltBase.hxx b/src/HEXABLOCK/HexEltBase.hxx
index a95a290..4d5bf8e 100755
--- a/src/HEXABLOCK/HexEltBase.hxx
+++ b/src/HEXABLOCK/HexEltBase.hxx
@@ -1,7 +1,7 @@
 
-// Class : Element de base des Vertex/Edge/Quad, etc... 
+// Class : Element de base des Vertex/Edge/Quad, etc...
 
-// 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
@@ -24,7 +24,6 @@
 #define __ELT_BASE_H
 
 #include "hexa_base.hxx"
-#include "HexDocument.hxx"
 #include <vector>
 
 #define HexDump(x) {printf(#x " = "); if (x) x->dump(); else printf("NULL\n");}
@@ -33,18 +32,17 @@
 
 #define GetClone(elt) ((elt)==NULL ? NULL : elt->getClone())
 #define BadElement(elt) (elt)==NULL || (elt)->isBad()
-#define ABR_TYPES  "xveqhw????"
+#define EltIsValid(elt)    (elt)!=NULL && (elt)->isValid()
+
+#if defined WIN32
+#pragma warning ( disable: 4251 )
+#endif
 
 BEGIN_NAMESPACE_HEXA
 
-class EltBase 
+class HexaExport EltBase
 {
 public :
-   virtual Hexa*   getHexa   (int nro)  { return NULL; }
-   virtual Quad*   getQuad   (int nro)  { return NULL; }
-   virtual Edge*   getEdge   (int nro)  { return NULL; }
-   virtual Vertex* getVertex (int nro)  { return NULL; }
-
    virtual int     countHexa   ()  { return 0; }
    virtual int     countQuad   ()  { return 0; }
    virtual int     countEdge   ()  { return 0; }
@@ -55,18 +53,16 @@ public :
    virtual bool    isValid     ()              { return el_status==HOK; }
    virtual bool    isBad       ()              { return el_status!=HOK; }
 
-   virtual void    setAssociation (Shape* forme);
-   virtual void    clearAssociation ()            { el_assoc = NULL  ; }
    virtual void    duplicate ()                   {}
-   virtual Shape*  getAssociation ()              { return el_assoc  ; }
+   virtual void    clearAssociation ()            {}
 
-   void copyAssociation    (EltBase* orig);
-   void replaceAssociation (EltBase* orig);
+   // void copyAssociation    (EltBase* orig);
+   // void replaceAssociation (EltBase* orig);
 
 public :
-   virtual void replaceEdge   (Edge* old, Edge* nouveau) 
+   virtual void replaceEdge   (Edge* old, Edge* nouveau)
                                { printf ("rep-edge\n") ; }
-   virtual void replaceVertex (Vertex* old, Vertex* nouveau) 
+   virtual void replaceVertex (Vertex* old, Vertex* nouveau)
                                { printf ("rep-vertex\n") ; }
 
    EltBase (Document* doc, EnumElt type=EL_NONE);
@@ -78,23 +74,26 @@ public :
    virtual  void dump ();
    virtual  void saveXml (XmlWriter* xml)   {}
    virtual  void majReferences () { }
+   virtual  char*  makeVarName (char* nom);
+
+   static   char* makeName  (int type, int id, char* name);
 
    EltBase*  next ()                        { return el_next; }
    void      setNext (EltBase* suivant)     { el_next = suivant; }
    int       getId ()                       { return el_id; }
-   void      setId (int ln)                 { el_id = ln; }
+   void      setId (int ln);
    Document* dad ()                         { return el_root; }
    EnumElt   getType ()                     { return el_type; }
    bool      isHere ()                      { return el_type!=EL_REMOVED; }
    bool      isDeleted ()                   { return el_type==EL_REMOVED; }
-             
-                 // On s'occupe des parents 
+
+                 // On s'occupe des parents
 
    void  razReferences ()         { el_parent.clear() ; }
    void  addParent (EltBase* dad) { if (dad) el_parent.push_back(dad) ; }
    int   getNbrParents ()         { return el_parent.size() ; }
    bool  hasParents ();
-   EltBase* getFather  (int nro);  
+   EltBase* getFather  (int nro);
 
    int   getMark ()                   { return el_mark; }
    void  setMark (int ln)             { el_mark = ln ; }
@@ -106,52 +105,48 @@ public :
    void   setName (const string& nom) { el_name = nom ; }
    void   setName (cpchar nom)        { el_name = nom ; }
 
-   bool   debug (int niv=0) { return el_root->getLevel() > niv ; } 
+   bool    debug (int niv=0);
+   bool    isAssociated ()            { return is_associated ; }
+   string  getNextName ();
 
 protected :
    EnumElt   el_type;
    EltBase*  el_next;
    int       el_id;
    Document* el_root;
-   Shape*    el_assoc;
    string    el_name;
 
    int       el_status;
    int       el_mark;
+   bool      is_associated;
    std::vector <EltBase*> el_parent;
 };
 // ========================================================= dump
 inline void EltBase::dump ()
 {
    printf ("Elt%d  Nro=%04d", el_type, el_id);
-   dumpRef() ; 
+   dumpRef() ;
 }
 
-// ========================================================= getFather 
+// ========================================================= getFather
 inline EltBase* EltBase::getFather  (int nro)
 {
    EltBase* elt = NULL;
-   if (nro >= 0 && nro < (int) el_parent.size() && isHere() 
+   if (nro >= 0 && nro < (int) el_parent.size() && isHere()
                 && el_parent[nro]->isHere())
       elt = el_parent[nro];
 
    return elt;
 }
-// ========================================================= hasParents 
+// ========================================================= hasParents
 inline bool EltBase::hasParents ()
 {
    int nbp = el_parent.size();
-   for (int nro=0 ; nro<nbp ; nro++)	      
+   for (int nro=0 ; nro<nbp ; nro++)
        if (el_parent[nro]!=NULL && el_parent[nro]->isHere())
           return true;
 
    return false;
 }
-// ========================================================= clear_association
-inline void clear_association (EltBase* elt)
-{
-   if (elt != NULL && elt->isHere() && elt->isValid())
-       elt -> clearAssociation ();
-}
 END_NAMESPACE_HEXA
 #endif