From: abuhsing <abuhsing>
Date: Tue, 17 Dec 2013 15:08:28 +0000 (+0000)
Subject: Mise a jour M.Barry
X-Git-Tag: V7_4_0a1~15
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=5347e8abe119e8704d59c83638836f0fd94c732e;p=modules%2Fhexablock.git

Mise a jour M.Barry
 Committing in .

 Modified Files:
  Tag: V7_main
 	HEXABLOCK/HexDocument.hxx HEXABLOCK/HexDocument_asso.cxx
 	HEXABLOCK/HexDocument_quads.cxx
 	HEXABLOCK/HexDocument_trans.cxx HEXABLOCK/HexDummyCad.hxx
 	HEXABLOCK/HexElements.hxx HEXABLOCK/HexElements_check.cxx
 	HEXABLOCK/HexElements_piq.cxx HEXABLOCK/HexElements_ter.cxx
 	HEXABLOCK/HexHexa.cxx HEXABLOCK/HexHexa.hxx
 	HEXABLOCK/HexNewShape.cxx HEXABLOCK/HexNewShape.hxx
 	HEXABLOCK/HexQuad.cxx HEXABLOCK/HexQuad.hxx
 	HEXABLOCK/HexVertex.cxx HEXABLOCK/HexVertex.hxx
 	HEXABLOCK/hexa_base.hxx HEXABLOCK/test_quads.cxx
 	HEXABLOCKGUI/HEXABLOCKGUI.cxx
 	HEXABLOCKGUI/HEXABLOCKGUI_DocumentModel.cxx
 	HEXABLOCKGUI/HEXABLOCKGUI_DocumentModel.hxx
 	HEXABLOCKGUI/HEXABLOCKGUI_DocumentPanel.cxx
 	HEXABLOCKGUI/HEXABLOCKGUI_DocumentPanel.hxx
 	HEXABLOCKGUI/MyBasicGUI_PointDlg.cxx
 	HEXABLOCKGUI/MyBasicGUI_PointDlg.hxx
 	HEXABLOCKGUI/ReplaceHexa_QTD.ui
 	HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel2Spin_QTD.ui
 	HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel3Spin_QTD.ui
 	HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel1Spin_QTD.ui
 	HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel_QTD.ui
 	HEXABLOCKGUI/MyDlgRef/DlgRef_3Spin_QTD.ui
 	HEXABLOCKGUI/MyDlgRef/DlgRef_Skeleton_QTD.ui
 	HEXABLOCKGUI/MyDlgRef/MyDlgRef.cxx
 	HEXABLOCKGUI/MyDlgRef/MyDlgRef.hxx HEXABLOCK_SWIG/hexablock.py
 Added Files:
  Tag: V7_main
 	HEXABLOCK/HexQpattern.cxx HEXABLOCK/HexQpattern.hxx
 Removed Files:
  Tag: V7_main
 	HEXABLOCKGUI/MyDlgRef/DlgRef.cxx
 	HEXABLOCKGUI/MyDlgRef/DlgRef.hxx
 	HEXABLOCKGUI/MyDlgRef/DlgRef_1List1Spin1Btn_QTD.ui
 	HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel1Check1List_QTD.ui
 	HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel1Check1Sel_QTD.ui
 	HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel1Check_QTD.ui
 	HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel1List1Check3Btn_QTD.ui
 	HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel1Spin1Check_QTD.ui
 	HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel1Spin_QTD.ui
 	HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel2Spin1View1Check_QTD.ui
 	HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel3Check_QTD.ui
 	HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel3Spin1Check_QTD.ui
 	HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel4Spin2Check_QTD.ui
 	HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel4Spin_QTD.ui
 	HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel5Spin1Check_QTD.ui
 	HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel5Spin_QTD.ui
 	HEXABLOCKGUI/MyDlgRef/DlgRef_1SelExt_QTD.ui
 	HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel_QTD.ui
 	HEXABLOCKGUI/MyDlgRef/DlgRef_1Spin_QTD.ui
 	HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel1List1Check_QTD.ui
 	HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel1List2Check_QTD.ui
 	HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel1List_QTD.ui
 	HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel1Spin2Check_QTD.ui
 	HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel1SpinInt_QTD.ui
 	HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel2List_QTD.ui
 	HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel2Spin1Check_QTD.ui
 	HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel2Spin3Check_QTD.ui
 	HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel2Spin_QTD.ui
 	HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel3Spin2Rb_QTD.ui
 	HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel3Spin_QTD.ui
 	HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel4Spin1Check_QTD.ui
 	HEXABLOCKGUI/MyDlgRef/DlgRef_2SelExt_QTD.ui
 	HEXABLOCKGUI/MyDlgRef/DlgRef_2Spin_QTD.ui
 	HEXABLOCKGUI/MyDlgRef/DlgRef_3Check_QTD.ui
 	HEXABLOCKGUI/MyDlgRef/DlgRef_3Radio1Sel1Spin_QTD.ui
 	HEXABLOCKGUI/MyDlgRef/DlgRef_3Radio_QTD.ui
 	HEXABLOCKGUI/MyDlgRef/DlgRef_3Sel1Check_QTD.ui
 	HEXABLOCKGUI/MyDlgRef/DlgRef_3Sel1Spin_QTD.ui
 	HEXABLOCKGUI/MyDlgRef/DlgRef_3Sel2Spin_QTD.ui
 	HEXABLOCKGUI/MyDlgRef/DlgRef_3Sel3Spin1Check_QTD.ui
 	HEXABLOCKGUI/MyDlgRef/DlgRef_3Sel3Spin2Check_QTD.ui
 	HEXABLOCKGUI/MyDlgRef/DlgRef_3Sel4Spin2Check_QTD.ui
 	HEXABLOCKGUI/MyDlgRef/DlgRef_3Sel_QTD.ui
 	HEXABLOCKGUI/MyDlgRef/DlgRef_3Spin1Check_QTD.ui
 	HEXABLOCKGUI/MyDlgRef/DlgRef_4Sel1List1Check_QTD.ui
 	HEXABLOCKGUI/MyDlgRef/DlgRef_4Sel1List_QTD.ui
 	HEXABLOCKGUI/MyDlgRef/DlgRef_4Sel1Spin2Check_QTD.ui
 	HEXABLOCKGUI/MyDlgRef/DlgRef_4Sel1Spin3Check_QTD.ui
 	HEXABLOCKGUI/MyDlgRef/DlgRef_6Sel_QTD.ui
 ----------------------------------------------------------------------
---

diff --git a/src/HEXABLOCK/HexDocument.hxx b/src/HEXABLOCK/HexDocument.hxx
index 4a02ca5..d9a10ed 100755
--- a/src/HEXABLOCK/HexDocument.hxx
+++ b/src/HEXABLOCK/HexDocument.hxx
@@ -156,6 +156,7 @@ public :
    Group*       getGroup    (int nro);
    Law*         getLaw      (int nro);
    Propagation* getPropagation   (int nro);
+   cpchar       getFirstExplicitShape();
 
                                  // ----------------- find
    Vertex* findVertex (double  vx, double  vy, double vz);
diff --git a/src/HEXABLOCK/HexDocument_asso.cxx b/src/HEXABLOCK/HexDocument_asso.cxx
index b0e9211..11cf322 100755
--- a/src/HEXABLOCK/HexDocument_asso.cxx
+++ b/src/HEXABLOCK/HexDocument_asso.cxx
@@ -151,6 +151,19 @@ NewShape* Document::getShape (int nro)
 
    return doc_tab_shape [nro];
 }
+// ====================================================== getFirstExplicitShape
+cpchar Document::getFirstExplicitShape()
+{
+   int nbre = doc_tab_shape.size ();
+   for (int nro=0 ; nro < nbre ; ++nro)
+       {
+       NewShape* shape = doc_tab_shape [nro];
+       if (shape!= NULL && shape->getOrigin()==SH_IMPORT)
+          return shape->getBrep ();
+       }
+
+   return NULL;
+}
 // ====================================================== findShape
 NewShape* Document::findShape (rcstring nom)
 {
diff --git a/src/HEXABLOCK/HexDocument_quads.cxx b/src/HEXABLOCK/HexDocument_quads.cxx
index 746d4a4..56496f2 100755
--- a/src/HEXABLOCK/HexDocument_quads.cxx
+++ b/src/HEXABLOCK/HexDocument_quads.cxx
@@ -598,27 +598,24 @@ Elements* Document::replaceHexa (Quads pattern, Vertex* p1, Vertex* c1,
    DumpStart ("replaceHexa", pattern << p1 << c1 << p2 << c2 << p3 << c3);
 
    Elements* t_hexas = new Elements (this);
-   int ier = t_hexas->replaceHexas (pattern, p1, c1, p2, c2, p3, c3);
-   if (ier!=HOK)
-      {
-      Mess << " **** Error in Document::replace" ;
-      t_hexas->setError (ier);
-      }
+   Mess << " **** This syntax is deprecated" ;
+   t_hexas->setError (HERR);
 
    DumpReturn (t_hexas);
    return      t_hexas;
 }
-// ========================================================= repla
-Elements* Document::replace (Quads motif, Quads cible, Vertex* p1, Vertex* c1,                               Vertex* p2, Vertex* c2)
+// ========================================================= replace
+Elements* Document::replace (Quads motif, Quads cible, Vertex* p1, Vertex* c1,                             Vertex* p2, Vertex* c2)
 {
    DumpStart ("replace", motif << cible << p1 << c1 << p2 << c2);
 
    Elements* t_hexas = new Elements (this);
+   int ier = t_hexas->replaceHexas (motif, cible, p1, c1, p2, c2);
 
-   //if (BadElement (edge))
+   if (ier!=HOK)
       {
+      Mess << " **** Error in Document::replace" ;
       t_hexas->setError (HERR);
-      Mess << "This function is not yet implemented";
       }
 
    DumpReturn (t_hexas);
diff --git a/src/HEXABLOCK/HexDocument_trans.cxx b/src/HEXABLOCK/HexDocument_trans.cxx
index 856d895..3a2c2a1 100755
--- a/src/HEXABLOCK/HexDocument_trans.cxx
+++ b/src/HEXABLOCK/HexDocument_trans.cxx
@@ -220,13 +220,29 @@ int Document::removeHexa (Hexa* cell)
    DumpStart ("removeHexa", cell);
 
    int ier = HOK;
-   if (cell==NULL)
+   if (BadElement (cell))
+      {
       ier = HERR;
-   else
-      cell->remove ();
+      DumpReturn (ier);
+      return ier;
+      }
 
-   DumpReturn (ier);
-   return ier;
+   update ();
+   Quads menage;
+   for (int nro = 0 ; nro < HQ_MAXI ; ++nro)
+       {
+       Quad* quad = cell->getQuad (nro);
+       if (EltIsValid(quad) && quad->getNbrParents()<=1)
+          menage.push_back (quad);
+       }
+
+   cell->remove ();
+   int nbdel = menage.size();
+   for (int nro = 0 ; nro < nbdel ; ++nro)
+       menage[nro]->remove();
+
+   DumpReturn (HOK);
+   return HOK;
 }
 // ========================================================= removeQuad
 int Document::removeQuad (Quad* cell)
diff --git a/src/HEXABLOCK/HexDummyCad.hxx b/src/HEXABLOCK/HexDummyCad.hxx
index db0a318..af9726e 100644
--- a/src/HEXABLOCK/HexDummyCad.hxx
+++ b/src/HEXABLOCK/HexDummyCad.hxx
@@ -163,6 +163,7 @@ class GeomAdaptor_Curve
 {
 public :
 GeomAdaptor_Curve (int)   {}
+int GetType ()   { return 0 ;}
 };
 // -----------------------------------------------------------
 class BRepPrimAPI_MakeCylinder
diff --git a/src/HEXABLOCK/HexElements.hxx b/src/HEXABLOCK/HexElements.hxx
index 1373c28..6f539bc 100755
--- a/src/HEXABLOCK/HexElements.hxx
+++ b/src/HEXABLOCK/HexElements.hxx
@@ -30,6 +30,7 @@
 
 BEGIN_NAMESPACE_HEXA
 
+class Qpattern;
 class HexaExport Elements : public EltBase
 {
 public:
@@ -112,13 +113,20 @@ public:
                            int nrad, int nang, int nhaut,
                            double &phi0, double &phi1);
 
-   int replaceHexas (Quads& pattern, Vertex* p1, Vertex* c1,
+   int replaceHexas (Quads& pattern, Vertex* p1, Vertex* c1, // To Delete
                      Vertex* p2, Vertex* c2,  Vertex* p3, Vertex* c3);
 
+   int replaceHexas (Quads& pattern, Quads& target, Vertex* p1, Vertex* c1,
+                     Vertex* p2, Vertex* c2);
+
    int replaceHexa  (int nh, Pattern* pat, Hexa* hexa);
    int replaceQuad  (int nh, Pattern* pat, Quad* quad, Vertex* tvert[]);
    int extrudeQuad  (Pattern* pat);
 
+   int replaceHexa  (int nh, Qpattern* pat);
+   int replaceQuad  (int nh, Qpattern* pat);
+   int extrudeQuad  (Qpattern* pat);
+
    void repVertex (int nh, int nro, Vertex* node);
    void repEdgeH  (int nh, int nro, Edge* node);
    void repEdgeV  (int nh, int nro, Edge* node);
@@ -194,6 +202,10 @@ public:
    void checkDisco  (Hexa* cell,    Quad*   element);
    void checkDisco  (Hexa* cell,    Edge*   element);
    void checkDisco  (Hexa* cell,    Vertex* element);
+   void checkContour (Quads& tquad, Vertex* v1, Vertex* v2, bool target, 
+                      Edges& tedge);
+   void checkContour (Quads& tquad, Vertex* v1, Vertex* v2, bool target, 
+                      Vertices& tvertex);
 
 protected :
                                         // Evols Hexa3
diff --git a/src/HEXABLOCK/HexElements_check.cxx b/src/HEXABLOCK/HexElements_check.cxx
index 4fe03ed..c1e6311 100644
--- a/src/HEXABLOCK/HexElements_check.cxx
+++ b/src/HEXABLOCK/HexElements_check.cxx
@@ -20,9 +20,9 @@
 //  See http://www.salome-platform.org/
 //  or email : webmaster.salome@opencascade.com
 
-#include "HexDocument.hxx"
-
 #include "HexElements.hxx"
+
+#include "HexDocument.hxx"
 #include "HexVector.hxx"
 #include "HexHexa.hxx"
 #include "HexQuad.hxx"
@@ -545,6 +545,172 @@ void Elements::checkDisco (Hexas& thexas, Edges& tedges)
           }
        }
 }
+// ====================================================== checkContour 
+void Elements::checkContour (Quads& tquad, Vertex* v1, Vertex* v2, bool target,
+                             Edges& tedge)
+{
+   tedge.clear ();
+   cpchar who    = target ? "Target" : "Pattern";
+   string nmedge = target ? "Vertices of target (args 5 and 6)" 
+                          : "Vertices of pattern (args 3 and 4)" ;
+   nmedge += "don't define an edge" ;
+
+   Edge*  edge1 = el_root->findEdge (v1, v2);
+   if (BadElement (edge1))
+      {
+      setError (HERR);
+      Mess << nmedge;
+      return;
+      }
+
+   map <Edge*, int> edge_count;
+   map <Edge*, int> :: iterator iter;
+   int nbre = tquad.size();
+   for (int nq=0 ; nq<nbre ; ++nq)
+        {
+        Quad* quad = tquad [nq];
+        if (BadElement (quad)) 
+           {
+           setError (HERR);
+           Mess << who << " quad nr " << nq+1 << " is not valid";
+           return;
+           }
+         else if (target && quad->getNbrParents() != 1)
+           {
+           setError (HERR);
+           Mess << " Target quad nr " << nq+1 
+                << " must be an external face";
+           return;
+           }
+       
+        for (int ned=0 ; ned<QUAD4 ; ++ned)
+            {
+            Edge* edge = quad->getEdge (ned);
+            edge_count [edge] += 1;
+            }
+        }
+   
+   int pos1 = edge_count [edge1];
+   if (pos1==0)
+       {
+       setError (HERR);
+       Mess << nmedge << " of the " << who << " quads";
+       return;
+       }
+   else if (pos1==2)
+       {
+       setError (HERR);
+       Mess << nmedge << " of the " << who << " contour";
+       return;
+       }
+
+   tedge.push_back (edge1);
+   Vertex* vlast = v2;
+   Edge*   elast = edge1;
+   while (vlast != v1)
+         {
+         int   nbre  = vlast->getNbrParents(); 
+         Edge* enext = NULL;
+         for (int ned=0 ; ned<nbre && enext == NULL; ++ned)
+             {
+             Edge* edge = vlast->getParent(ned);
+             if (edge != elast && edge_count [edge]==1)
+                 enext = edge;
+             }
+         if (enext==NULL)
+            {
+            setError (HERR);
+            Mess << who << " as an unclosed contour";
+            return;
+            }
+         tedge.push_back (enext);
+         vlast = enext->opposedVertex (vlast);
+         elast = enext;
+         }
+}
+// ====================================================== checkContour 
+void Elements::checkContour (Quads& tquad, Vertex* v1, Vertex* v2, bool target,
+                             Vertices& tvertex)
+{
+   tvertex.clear ();
+   cpchar who    = target ? "Target" : "Pattern";
+   string nmedge = target ? "Vertices of target (args 4 and 6)" 
+                          : "Vertices of pattern (args 3 and 5)" ;
+   nmedge += "don't define an edge" ;
+
+   Edge*  edge1 = el_root->findEdge (v1, v2);
+   if (BadElement (edge1))
+      {
+      setError (HERR);
+      Mess << nmedge;
+      return;
+      }
+
+   map <Edge*, int> edge_count;
+   map <Edge*, int> :: iterator iter;
+   int nbre = tquad.size();
+   for (int nq=0 ; nq<nbre ; ++nq)
+        {
+        Quad* quad = tquad [nq];
+        if (BadElement (quad)) 
+           {
+           setError (HERR);
+           Mess << who << " quad nr " << nq+1 << " is not valid";
+           return;
+           }
+         else if (target && quad->getNbrParents() != 1)
+           {
+           setError (HERR);
+           Mess << " Target quad nr " << nq+1 
+                << " must be an external face";
+           return;
+           }
+       
+        for (int ned=0 ; ned<QUAD4 ; ++ned)
+            {
+            Edge* edge = quad->getEdge (ned);
+            edge_count [edge] += 1;
+            }
+        }
+   
+   int pos1 = edge_count [edge1];
+   if (pos1==0)
+       {
+       setError (HERR);
+       Mess << nmedge << " of the " << who << " quads";
+       return;
+       }
+   else if (pos1==2)
+       {
+       setError (HERR);
+       Mess << nmedge << " of the " << who << " contour";
+       return;
+       }
+
+   tvertex.push_back (v1);
+   Vertex* vlast = v2;
+   Edge*   elast = edge1;
+   while (vlast != v1)
+         {
+         tvertex.push_back (vlast);
+         int   nbre  = vlast->getNbrParents(); 
+         Edge* enext = NULL;
+         for (int ned=0 ; ned<nbre && enext == NULL; ++ned)
+             {
+             Edge* edge = vlast->getParent(ned);
+             if (edge != elast && edge_count [edge]==1)
+                 enext = edge;
+             }
+         if (enext==NULL)
+            {
+            setError (HERR);
+            Mess << who << " as an unclosed contour";
+            return;
+            }
+         vlast = enext->opposedVertex (vlast);
+         elast = enext;
+         }
+}
 // ======================================================== calcul_phimax
 double calcul_phimax (double radhole, double radext, bool sphere)
 {
diff --git a/src/HEXABLOCK/HexElements_piq.cxx b/src/HEXABLOCK/HexElements_piq.cxx
index cd51d14..e2921a5 100755
--- a/src/HEXABLOCK/HexElements_piq.cxx
+++ b/src/HEXABLOCK/HexElements_piq.cxx
@@ -28,6 +28,8 @@
 #include "HexDiagnostics.hxx"
 #include "HexDocument.hxx"
 #include "HexHexa.hxx"
+#include "HexGlobale.hxx"
+#include "HexQpattern.hxx"
 
 #include <cmath>
 #include <map>
@@ -36,421 +38,67 @@ BEGIN_NAMESPACE_HEXA
 
 static bool db = false;
 
-// --------------------------------------------------------
-struct PatQuad
+// ====================================================== opposed_edge
+Edge* opposed_edge (Edge* edge, Hexas& thexas, Quads& tquads)
 {
-   int   q_edge [QUAD4];
-   Quad* refer;
-}; 
-// --------------------------------------------------------
-struct PatVertex
-{
-   double  v_x, v_y;
-   Vertex* refer;
-}; 
-// --------------------------------------------------------
-struct PatEdge
-{
-   int   v_amont, v_aval;
-   Edge* refer;
-   int   nbr_refer;
-}; 
-
-// --------------------------------------------------------
-class Pattern 
-{
-friend class Elements;
-public  :
-    int initialize (Vertex* v1, Vertex* v2, Vertex* v3);
-    int addQuad    (Quad* quad);
-    int verify     (int &nbed, int &nbver);
-
-private :
-    int addEdge   (Edge*   edge);
-    int addVertex (Vertex* vertex);
-
-private :
-   enum EnumProj { ProjXY, ProjYZ, ProjZX };
-
-   vector <PatVertex> pat_vertex;
-   vector <PatEdge  > pat_edge;
-   vector <PatQuad  > pat_quad;
-
-   int      nbr_vertex, nbr_edges, nbr_quads;
-   double   determinant;
-   EnumProj projection;
-   Real3    base_i, base_j, origine;
-
-   int pos_vertex4;
-   int pos_edge3, pos_edge4;
-};
-
-// ====================================================== initialize
-int Pattern::initialize (Vertex* v1, Vertex* v2, Vertex* v3)
-{
-   nbr_vertex  = nbr_edges = nbr_quads = 0;
-   projection  = ProjXY;
-   determinant = 1;
-   base_i[0]   = base_i[1] =  base_i[2] = 0; 
-   base_j[0]   = base_j[1] =  base_j[2] = 0; 
-
-   if (v1==NULL || v2==NULL || v3==NULL) 
-      return HERR;
-
-   addVertex (v1);
-   addVertex (v2);
-   addVertex (v3);
-   if (nbr_vertex!=3)
-      return HERR;
-
-   Document* doc = v1->dad ();
-   Edge* edc1  = doc->findEdge (v1, v2);
-   Edge* edc2  = doc->findEdge (v2, v3);
-   if (edc1==NULL || edc2==NULL)
-      return HERR;
-
-   addEdge (edc1);
-   addEdge (edc2);
-   if (nbr_edges!=2)
-      return HERR;
-
-   pat_edge[0].nbr_refer = pat_edge[1].nbr_refer = 0; 
-
-   pat_vertex[0].v_x = pat_vertex[1].v_x = 0;
-   pat_vertex[2].v_x = 1; 
-   pat_vertex[0].v_y = 1;
-   pat_vertex[1].v_y = pat_vertex[2].v_y = 0; 
-
-   Real3 pb, pc;
-   v1->getPoint (pc);
-   v2->getPoint (origine);
-   v3->getPoint (pb);
-
-   calc_vecteur (origine, pb, base_i);
-   calc_vecteur (origine, pc, base_j);
-
-   if (db)
-      {
-      PutCoord (origine);
-      PutCoord (base_i);
-      PutCoord (base_j);
-      PutData (determinant);
-      }
-
-/* ******************************
- * AB = pu.vI + pv.vJ
- * 
- * vx = pu.vI[0] + pv.vJ[0]   (1) *+vJ[1] ) };
- *
- * (1 & 2 ) : pu =  (vx.vJ[1] - vy.vJ[0]) / detxy
- *            pv = -(vx.vI[1] - vy.vI[0]) / detxy
- *x
- * (2 & 3 ) : pu =  (vy.vJ[2] - vz.vJ[1]) / detyz
- *            pv = -(vy.vI[2] - vz.vI[1]) / detyz
- *
- * (3 & 1 ) : pu =  (vz.vJ[0] - vx.vJ[2]) / detzx
- *            pv = -(vz.vI[0] - vx.vI[2]) / detzx
- *
- *  Les 3 systemes d'equations sont valides. 
- *  On va choisir celui dont la valeur absolue du determinant est maximale
-   ****************************** */
-
-   double detxy = base_i[dir_x]*base_j[dir_y] - base_i[dir_y]*base_j[dir_x];
-   double detyz = base_i[dir_y]*base_j[dir_z] - base_i[dir_z]*base_j[dir_y];
-   double detzx = base_i[dir_z]*base_j[dir_x] - base_i[dir_x]*base_j[dir_z];
-
-   determinant = detxy;
-   projection  = ProjXY;
-
-   if (fabs (detyz) > fabs (determinant))
-      {
-      determinant = detyz;
-      projection  = ProjYZ;
-      }
-   if (fabs (detzx) > fabs (determinant))
-      {
-      determinant = detzx;
-      projection  = ProjZX;
-      }
-
-   return HOK;
-}
-// ====================================================== verify
-int Pattern::verify (int &nbed, int &nbver)
-{
-   nbed  = nbr_edges;
-   nbver = nbr_vertex;
-   pos_edge3 = pos_edge4 = pos_vertex4 = NOTHING;
-   
-   if (pat_edge[0].nbr_refer!=1 || pat_edge[1].nbr_refer!=1) 
-      return HERR;
-
-   for (int nro=2 ; nro<nbr_edges; nro++)
-       {
-       if (pat_edge[nro].nbr_refer==1)
-          {
-          int pv1 = pat_edge[nro].v_amont;
-          int pv2 = pat_edge[nro].v_aval;
-          
-          if (pv1==2)
-             {
-             pos_edge3   = nro;
-             if (pos_vertex4 == NOTHING)
-                 pos_vertex4 =  pv2;
-             else if (pos_vertex4 != pv2)
-                 {
-                 return HERR;
-                 }
-             }
-          else if (pv2==2)
-             {
-             pos_edge3   = nro;
-             if (pos_vertex4 == NOTHING)
-                 pos_vertex4 =  pv1;
-             else if (pos_vertex4 != pv1)
-                 {
-                 return HERR;
-                 }
-             }
-          else if (pv1==0)
-             {
-             pos_edge4   = nro;
-             if (pos_vertex4 == NOTHING)
-                 pos_vertex4 =  pv2;
-             else if (pos_vertex4 != pv2)
-                 {
-                 return HERR;
-                 }
-             }
-          else if (pv2==0)
-             {
-             pos_edge4   = nro;
-             if (pos_vertex4 == NOTHING)
-                 pos_vertex4 =  pv1;
-             else if (pos_vertex4 != pv1)
-                 {
-                 return HERR;
-                 }
-             }
-          }
-       }
-
-   if (pos_edge3==NOTHING || pos_edge4==NOTHING)
-      return HERR;
-
-   return HOK;
-}
-// ====================================================== addQuad
-int Pattern::addQuad (Quad* elt)
-{
-   if (elt==NULL)
-      return HERR;
-
-   PatQuad quad;
-   quad.refer = elt;
-   for (int nro=0; nro<QUAD4 ; nro++)
-       {
-       Edge* edge = elt->getEdge (nro);
-       quad.q_edge [nro] = addEdge (edge); 
-       }
-
-   pat_quad.push_back (quad);
-   nbr_quads++;
-   return HOK;
-}
-// ====================================================== addEdge
-int Pattern::addEdge (Edge* elt)
-{
-   for (int nro=0; nro<nbr_edges ; nro++)
+   int nbquads = tquads.size();
+   for (int nq = 0 ; nq<nbquads ; ++nq)
        {
-       if (elt==pat_edge [nro].refer)
+       Quad* quad = tquads[nq];
+       int nro = quad->indexEdge (edge);
+       if (nro>=0)
           {
-          pat_edge [nro].nbr_refer++;
-          return nro;
+          Quad*  perp  = thexas[nro]->perpendicularQuad (quad, edge);
+          Edge*  oppos = perp->getOpposEdge (edge);
+          return oppos;
           }
        }
-
-   PatEdge edge;
-   edge.nbr_refer = 1;
-   edge.refer    = elt;
-   edge.v_amont  = addVertex (elt->getVertex (V_AMONT));
-   edge.v_aval   = addVertex (elt->getVertex (V_AVAL));
-
-   pat_edge.push_back (edge);
-   nbr_edges++;
-   return nbr_edges-1;
-}
-// ====================================================== addVertex
-int Pattern::addVertex (Vertex* elt)
-{
-   for (int nro=0; nro<nbr_vertex ; nro++)
-       {
-       if (elt==pat_vertex [nro].refer)
-          return nro;
-       }
-
-   PatVertex vertex;
-   vertex.refer = elt;
-   double vx = elt->getX() - origine [dir_x];
-   double vy = elt->getY() - origine [dir_y];
-   double vz = elt->getZ() - origine [dir_z];
-   switch (projection)
-      {
-      case ProjXY :  default :
-           vertex.v_x =  (vx*base_j[dir_y] - vy*base_j[dir_x]) / determinant;
-           vertex.v_y = -(vx*base_i[dir_y] - vy*base_i[dir_x]) / determinant;
-           break;
-
-      case ProjYZ : 
-           vertex.v_y =  (vy*base_j[dir_z] - vz*base_j[dir_y]) / determinant;
-           vertex.v_x = -(vy*base_i[dir_z] - vz*base_i[dir_y]) / determinant;
-           break;
-
-      case ProjZX : 
-           vertex.v_x =  (vz*base_j[dir_x] - vx*base_j[dir_z]) / determinant;
-           vertex.v_y = -(vz*base_i[dir_x] - vx*base_i[dir_z]) / determinant;
-           break;
-      }
-
-   if (db)
-      printf (" Vertex nro %d : (%g, %g, %g)\t -> (%g, %g)\n", 
-                        nbr_vertex, vx, vy, vz, vertex.v_x, vertex.v_y);
-   pat_vertex.push_back (vertex);
-   nbr_vertex++;
-   return nbr_vertex-1;
+   return NULL;
 }
-// -------------------------------------------------------------------
-// -------------------------------------------------------------------
-// -------------------------------------------------------------------
-// -------------------------------------------------------------------
 // ====================================================== replaceHexas 
-int Elements::replaceHexas (Quads& liste, Vertex* p1, Vertex* c1, 
-                            Vertex* p2, Vertex* c2, Vertex* p3, Vertex* c3)
+int Elements::replaceHexas (Quads& motif, Quads& cible, Vertex* p1, 
+                            Vertex* c1, Vertex* p2, Vertex* c2)
 {
-    Edge* edp1  = el_root->findEdge (p1, p2);
-    Edge* edp2  = el_root->findEdge (p2, p3);
-    Edge* edc1  = el_root->findEdge (c1, c2);
-    Edge* edc2  = el_root->findEdge (c2, c3);
-
-    Quad* quadc = el_root->findQuad (c1, c3);
-
-    if (edp1==NULL || edp2==NULL || edc1==NULL || edc2==NULL || quadc==NULL)  
+    Vertices ed_motif, ed_cible;
+    checkContour (motif, p1, p2, false, ed_motif);
+    checkContour (cible, c1, c2, true , ed_cible);
+    if (el_status != HOK)
+        return el_status;
+
+    int nbedp   = ed_motif.size();
+    int nbedges = ed_cible.size();
+    if (nbedp != nbedges)
        {
-       printf ("... Error in HexaBlock function \n");
-       printf ("... doc.replace (lquads, p1,c1, p2,c2, p3,c3)\n");
-       if (edp1==NULL)
-           printf ("Vertices p1 and p2 don't define an edge\n");
-       else if (edp2==NULL)
-           printf ("Vertices p2 and p3 don't define an edge\n");
-       else if (edc1==NULL)
-           printf ("Vertices c1 and c2 don't define an edge\n");
-       else if (edc2==NULL)
-           printf ("Vertices c2 and c3 don't define an edge\n");
-       else if (quadc==NULL)
-           printf ("Vertices c1 and c3 don't define a quad\n");
-       return HERR;
+       setError (HERR);
+       Mess << " Contour of pattern ("  << nbedp << " edges) and target ("
+            << nbedges << " edges) must have the same size ";
+       return el_status;
        }
+                        // Constitution du pattern 
+    Qpattern pattern;
+    pattern.setPattern (ed_motif, motif);
+    pattern.setTarget  (ed_cible, cible);
+    int nbq, nbed, nbv, prof;
+    pattern.getSize (nbq, nbed, nbv, prof);
 
-    int np = quadc->getNbrParents ();
-    Hexa* hexac = quadc->getParent (0);
+    resize (GR_REPLACE, nbq, prof+1, nbv, nbed);
 
-    if (np!=1 || hexac==NULL)  
-       {
-       printf ("... Error in HexaBlock function \n");
-       printf ("... doc.replace (lquads, p1,c1, p2,c2, p3,c3)\n");
-       printf ("Quad (c1,c2,c3) is not an external quad\n");
-       return HERR;
-       }
-                              // Analyse du pattern
-    int nbquads = liste.size();
-    Pattern   pattern;
-    int ier = pattern.initialize (p1, p2, p3);
-    if (ier!=HOK)
-       {
-       printf ("... Error in HexaBlock function \n");
-       printf ("... doc.replace (lquads, p1,c1, p2,c2, p3,c3)\n");
-       printf ("Vertices (p1,p2,p3) don't define a virtual quad\n");
-       return HERR;
-       }
-
-    for (int nq=0 ; nq<nbquads ; nq++)
+    replaceQuad (1, &pattern);
+    for (int nh=1 ; nh<=prof ; ++nh)
         {
-        ier = pattern.addQuad (liste[nq]);
-        if (ier!=HOK)
-           {
-           printf ("... Error in HexaBlock function \n");
-           printf ("... doc.replace (lquads, p1,c1, p2,c2, p3,c3)\n");
-           printf ("Quad nr %d of the list is NULL\n", nq+1);
-           return HERR;
-           }
+        pattern.stepDown();
+        replaceQuad (nh+1, &pattern);
+        replaceHexa (nh,   &pattern);
         }
-    int nbv  = 0;
-    int nbed = 0;
-    int nbh  = 0;
-    ier = pattern.verify (nbed, nbv);
-    if (ier!=HOK)
-       {
-       printf ("... Error in HexaBlock function \n");
-       printf ("... doc.replace (lquads, p1,c1, p2,c2, p3,c3)\n");
-       printf ("Vertices (p1,p2,p3) don't define a virtual quad\n");
-       return HERR;
-       }
-                              // Analyse de la cible
-    Quads pil_quad;
-    Hexas pil_hexa;
- 
-    pil_hexa.push_back (hexac);
-    pil_quad.push_back (quadc);
-    bool more = true;
-                              // Constitution de la pile des hexaedres
-    while (more)
-          {
-          nbh ++;
-          Quad* oppos = hexac->getOpposedQuad (quadc);
-          pil_quad.push_back (oppos);
-          more = oppos->getNbrParents() == 2;
-
-          if (more)
-             {
-             if (oppos->getParent (0)==hexac)
-                 hexac = oppos->getParent(1);
-             else
-                 hexac = oppos->getParent(0);
-             pil_hexa.push_back (hexac);
-             }
-          quadc = oppos;
-          }
-
-    resize (GR_REPLACE, nbquads, nbh, nbv, nbed);
-
-                // 1) Constitution des 4 coins de la cible
-                // 2) Quadriller la face du haut
-                // 3) Trouver les 4 coins de la face du bas
-                // 4) Quadriller la face du bas
-                // 6) Decouper l'hexaedre defini par ces 2 faces
-                // 7) S'il y a un hexaedre dessous goto 3) 
-
-    Vertex* tvert[QUAD4] = { c1, c2, c3, pil_quad[0]->getOpposVertex(c2) };
-    replaceQuad (1, &pattern, pil_quad[0], tvert);
-    for (int nh=1 ; nh<gr_hauteur ; nh++)
-        {
-        for (int nro=0 ; nro<QUAD4 ; nro++)
-            {
-            Edge*  edv  = pil_hexa[nh-1]->getPerpendicularEdge (pil_quad[nh-1],
-                                                                tvert[nro]);
-            tvert [nro] = edv ->opposedVertex(tvert[nro]);
-            }
-        replaceQuad (nh+1, &pattern, pil_quad[nh], tvert);
-        replaceHexa (nh,   &pattern, pil_hexa[nh-1]);
-        }
-
-    for (int nh=0 ; nh<=nbh ; nh++)
-        pil_quad[nh]->remove ();
 
     extrudeQuad (&pattern);
-    replaceHexa (0, &pattern, NULL);
+    replaceHexa (0, &pattern);
     return HOK;
 }
+// -------------------------------------------------------------------
+// -------------------------------------------------------------------
+// -------------------------------------------------------------------
+// -------------------------------------------------------------------
 // ====================================================== repVertex 
 void Elements::repVertex (int nh, int nro, Vertex* elt)
 {
@@ -567,43 +215,43 @@ Hexa* Elements::repHexa (int nh, int nro, Quad* qa, Quad* qb, Quad* qc,
    int addr = nh * nbr_orig  + nro;
    if (tab_hexa[addr] == NULL)
        tab_hexa[addr]  = el_root->addHexa (qa, qb, qc, qd, qe, qf);
+
    return tab_hexa [addr];
 }
 // ====================================================== replaceQuad 
 // ==== Creation des quads horizontaux
-int Elements::replaceQuad (int nh, Pattern* pat, Quad* quad, Vertex* tvert[])
+int Elements::replaceQuad (int nh, Qpattern* pat)
 {
-   Vertex* pvert[QUAD4] = { tvert[0],  tvert[1],  tvert[2],  tvert[3] };
-
-   int vnro [4] = { 0, 1, 2, pat->pos_vertex4};
-   int ednro[4] = { 0, 1, pat->pos_edge3, pat->pos_edge4 };
-
-                              // Enregistrement des vertex & edges existant
-   for (int nro=0 ; nro<QUAD4 ; nro++)
+                              // Enregistrement des vertex existant
+   int size_contour = pat->cont_nbnodes;
+   for (int nro=0 ; nro<size_contour ; nro++)
        {
-       Vertex* vh    = pvert [nro];
-       Vertex* vh1   = pvert [(nro+1) MODULO QUAD4];
-       Edge*   edh   = quad->findEdge (vh, vh1);
-
-       repVertex (nh,   vnro  [nro], vh);
-       repEdgeH  (nh,   ednro [nro], edh);
+       Vertex* vh = pat->getTargetVertex (nro);
+       repVertex (nh,  nro, vh);
        }
 
-   Real3 orig, ib, jb, pb, pc;
+   Real3 orig, pmin, pmax, cg, delta, ib, jb, kb;
+   pat->anaTarget (pmin, pmax, cg);
+   for (int nc=0 ; nc<DIM3 ; nc++)
+       delta[nc] = pmax[nc] - pmin[nc];
+
                               // Creation des vertex
-   tvert[0]->getPoint (pc);
-   tvert[1]->getPoint (orig);
-   tvert[2]->getPoint (pb);
-   calc_vecteur (orig, pb, ib);
-   calc_vecteur (orig, pc, jb);
+   pat->getTargetVertex (0)->getPoint (orig);
+   pat->getTargetVertex (1)->getPoint (kb);
+   calc_vecteur (orig, kb, ib);
+   calc_vecteur (orig, cg, jb);
+   normer_vecteur (ib);
+   normer_vecteur (jb);
+   prod_vectoriel (ib, jb, kb);
+   prod_vectoriel (kb, ib, jb);
 
    for (int nro=0 ; nro<pat->nbr_vertex ; nro++)
        {
        double lambda = pat->pat_vertex [nro].v_x;
        double mu     = pat->pat_vertex [nro].v_y;
-       double px = orig[dir_x] + lambda*ib[dir_x] + mu*jb[dir_x];
-       double py = orig[dir_y] + lambda*ib[dir_y] + mu*jb[dir_y];
-       double pz = orig[dir_z] + lambda*ib[dir_z] + mu*jb[dir_z];
+       double px = pmin[dir_x] + (lambda*ib[dir_x] + mu*jb[dir_x])*delta[dir_x];
+       double py = pmin[dir_y] + (lambda*ib[dir_y] + mu*jb[dir_y])*delta[dir_y];
+       double pz = pmin[dir_z] + (lambda*ib[dir_z] + mu*jb[dir_z])*delta[dir_z];
        repVertex (nh, nro, px, py, pz);
        }
                               // Creation des edges horizontaux
@@ -629,7 +277,7 @@ int Elements::replaceQuad (int nh, Pattern* pat, Quad* quad, Vertex* tvert[])
 }
 // ====================================================== extrudeQuad 
 // ==== Creation des quads horizontaux
-int Elements::extrudeQuad (Pattern* pat)
+int Elements::extrudeQuad (Qpattern* pat)
 {
                               // Creation des vertex de niveau 0
    for (int nro=0 ; nro<pat->nbr_vertex ; nro++)
@@ -663,13 +311,14 @@ int Elements::extrudeQuad (Pattern* pat)
    return HOK;
 }
 // ====================================================== replaceHexa 
-int Elements::replaceHexa (int nh, Pattern* pat, Hexa* hexa)
+int Elements::replaceHexa (int nh, Qpattern* pat)
 {
+ /* *************************************************
    int vnro [4] = { 0, 1, 2, pat->pos_vertex4};
    int ednro[4] = { 0, 1, pat->pos_edge3, pat->pos_edge4 };
 
                               // Enregistrement des edges & quads existants
-   if (hexa!=NULL)
+   if (nh!=0)
        {
        for (int nro=0 ; nro<QUAD4 ; nro++)
            {
@@ -684,6 +333,7 @@ int Elements::replaceHexa (int nh, Pattern* pat, Hexa* hexa)
            repQuadV (nh, ednro [nro], quadv);
            }
        }
+    ************************************************* */
                               // Creation des edges verticaux
    for (int nro=0 ; nro<pat->nbr_vertex ; nro++)
        {
diff --git a/src/HEXABLOCK/HexElements_ter.cxx b/src/HEXABLOCK/HexElements_ter.cxx
index e3f2aa4..1c129cb 100755
--- a/src/HEXABLOCK/HexElements_ter.cxx
+++ b/src/HEXABLOCK/HexElements_ter.cxx
@@ -37,7 +37,7 @@
 
 BEGIN_NAMESPACE_HEXA
 
-// static bool db=false;
+static bool db=false;
 
 // ====================================================== getCylPoint
 int Elements::getCylPoint (int nr, int na, int nh, double& px, double& py,
@@ -203,8 +203,9 @@ void Elements::assoCylinders (double* ori, double* vk, double angle,
                double pmax = t_angles [ny+1]/360;
                Edge*  edge = getEdgeJ (nx, ny, nz);
                geom->addAssociation (edge, subid, pmin, pmax);
-               cout << " assoCylinders : ny= " << ny << ", nz= " << nz 
-                    << " param = (" << pmin << ", " << pmax  << ")\n";
+               if (db) cout << " assoCylinders : ny= " << ny 
+                            << ", nz= " << nz << " param = (" 
+                            << pmin << ", " << pmax  << ")\n";
                }
            }
        }
diff --git a/src/HEXABLOCK/HexHexa.cxx b/src/HEXABLOCK/HexHexa.cxx
index c1d859d..ededa53 100755
--- a/src/HEXABLOCK/HexHexa.cxx
+++ b/src/HEXABLOCK/HexHexa.cxx
@@ -1106,8 +1106,29 @@ Edge* Hexa::findEdge (Vertex* v1, Vertex* v2)
 
    return NULL;
 }
-// ====================================================== getPerpendicularEdge
-Edge* Hexa::getPerpendicularEdge (Quad* quad, Vertex* vertex)
+// ====================================================== opposedVertex
+Vertex* Hexa::opposedVertex (Quad* quad, Vertex* vertex)
+{
+   if (quad==NULL || vertex==NULL)
+      return NULL;
+
+   int nv = quad->indexVertex (vertex);
+   int nq = findQuad (quad);
+   if (nv<0 || nq<0)
+      return NULL;
+
+   for (int nro=0 ; nro<HE_MAXI ; nro++)
+       {
+       Edge* edge = h_edge [nro];
+       int   nv   = edge->index (vertex);
+       if (nv>=0 && quad->indexEdge(edge) <0)
+          return edge->getVertex (1-nv);
+       }
+
+   return NULL;
+}
+// ====================================================== perpendicularEdge
+Edge* Hexa::perpendicularEdge (Quad* quad, Vertex* vertex)
 {
    if (quad==NULL || vertex==NULL)
       return NULL;
@@ -1125,6 +1146,29 @@ Edge* Hexa::getPerpendicularEdge (Quad* quad, Vertex* vertex)
 
    return NULL;
 }
+// ====================================================== perpendicularQuad
+Quad* Hexa::perpendicularQuad (Quad* quad, Edge* edge)
+{
+   if (BadElement (quad) || BadElement (edge))
+      return NULL;
+
+   int qed = quad->indexEdge (edge);
+   int ned = findEdge (edge);
+   int nq  = findQuad (quad);
+   if (qed <0 || ned<0 || nq<0)
+      return NULL;
+
+   for (int nro=0 ; nro<HQ_MAXI ; nro++)
+       {
+       if (nro != nq)
+          {   
+          Quad* face = h_quad[nro];
+          if (EltIsValid(face) && face->indexEdge (edge)>=0)
+             return face;
+          }
+       }
+   return NULL;
+}
 // ============================================================  getQuad
 Quad* Hexa::getQuad (int nro)
 {
diff --git a/src/HEXABLOCK/HexHexa.hxx b/src/HEXABLOCK/HexHexa.hxx
index a00569a..a26ff5a 100755
--- a/src/HEXABLOCK/HexHexa.hxx
+++ b/src/HEXABLOCK/HexHexa.hxx
@@ -115,8 +115,11 @@ public:
     virtual void   duplicate ();
     Hexa* getClone ()               {  return h_clone ; }
     Quad*   getOpposedQuad   (Quad* face);
-    // Vertex* getOpposedVertex (Quad* face, Vertex* vertex);
-    Edge* getPerpendicularEdge (Quad* face, Vertex* vertex);
+    Vertex* opposedVertex     (Quad* face, Vertex* vertex);
+    Edge*   perpendicularEdge (Quad* face, Vertex* vertex);
+    Quad*   perpendicularQuad (Quad* face, Edge* edge);
+    Edge*   getPerpendicularEdge (Quad* face, Vertex* vertex)
+          { return perpendicularEdge (face, vertex); }
     // Edge* getParallelEdge      (Quad* face, Edge*   edge);
     Quad* findQuad             (Edge* e1, Edge* e2);
     Edge* findEdge             (Vertex* v1, Vertex* v2);
diff --git a/src/HEXABLOCK/HexNewShape.cxx b/src/HEXABLOCK/HexNewShape.cxx
index 3018526..17ca499 100755
--- a/src/HEXABLOCK/HexNewShape.cxx
+++ b/src/HEXABLOCK/HexNewShape.cxx
@@ -463,6 +463,14 @@ int NewShape::saveBrep ()
    fclose  (fic);
    return HOK;
 }
+// ===================================================== getBrep
+cpchar NewShape::getBrep ()
+{
+   int ier   = updateBrep ();
+   if (ier != HOK)
+      return NULL;
+   return geo_brep.c_str();
+}
 // ====================================================== saveXml
 void NewShape::saveXml (XmlWriter* xml)
 {
diff --git a/src/HEXABLOCK/HexNewShape.hxx b/src/HEXABLOCK/HexNewShape.hxx
index 2dec047..db3e360 100644
--- a/src/HEXABLOCK/HexNewShape.hxx
+++ b/src/HEXABLOCK/HexNewShape.hxx
@@ -34,7 +34,7 @@ public :         // for TUI
 
 #ifndef SWIG
 public :         // for GUI
-   const string&       getBrep ();
+   cpchar              getBrep ();
    const TopoDS_Shape& getShape ();
 
    EnumShape    getOrigin ()        { return sh_origin ; }
diff --git a/src/HEXABLOCK/HexQpattern.cxx b/src/HEXABLOCK/HexQpattern.cxx
new file mode 100644
index 0000000..812371e
--- /dev/null
+++ b/src/HEXABLOCK/HexQpattern.cxx
@@ -0,0 +1,334 @@
+
+// C++ : Table d'hexaedres (Evol Versions 3)
+
+// 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
+//
+
+#include "HexQpattern.hxx"
+
+#include "HexVector.hxx"
+#include "HexVertex.hxx"
+#include "HexEdge.hxx"
+#include "HexDiagnostics.hxx"
+#include "HexDocument.hxx"
+#include "HexHexa.hxx"
+#include "HexGlobale.hxx"
+
+#include <cmath>
+#include <map>
+
+BEGIN_NAMESPACE_HEXA
+
+static bool db = false;
+
+// =================================================== Construc QpatQuad
+QpatQuad::QpatQuad (Quad* elt)
+{
+   refer = elt;
+   cible = oppos = NULL;
+   for (int nro=0 ; nro<QUAD4 ; ++nro)
+       q_edge [nro] = NOTHING;
+}
+// =================================================== operator=
+void QpatQuad::operator= (const QpatQuad& other)
+{
+   refer = other.refer;
+   cible = other.cible;
+   oppos = other.oppos;
+   for (int nro=0;nro<QUAD4;++nro) q_edge[nro] = other.q_edge[nro];
+}
+// =================================================== Construc QpatEdge
+QpatEdge::QpatEdge (Edge* elt)
+{
+   refer   = elt;
+   cible   = oppos = NULL;
+   v_amont = v_aval = NOTHING;
+}
+// =================================================== operator=
+void QpatEdge::operator= (const QpatEdge& other)
+{
+   refer   = other.refer;
+   cible   = other.cible;
+   oppos   = other.oppos;
+   v_amont = other.v_amont;
+   v_aval  = other.v_aval;
+}
+// =================================================== Construc QpatVertex
+QpatVertex::QpatVertex (Vertex* elt)
+{
+   refer = elt;
+   cible = oppos = NULL;
+   v_x   = v_y   = 0.0;
+   on_contour    = true;
+   quad_cible    = NOTHING;
+}
+// =================================================== operator=
+void QpatVertex::operator= (const QpatVertex& other)
+{
+   refer  = other.refer;
+   cible  = other.cible;
+   oppos  = other.oppos;
+   v_x    = other.v_x;
+   v_y    = other.v_y;
+   on_contour = other.on_contour;
+   quad_cible = other.quad_cible;
+}
+// =================================================== find_quad
+int find_quad (Quads& table, Vertex* vertex)
+{
+   int nbre = table.size();
+   for (int nro=0 ; nro < nbre ; nro++)
+       if (table[nro]->indexVertex(vertex)>=0)
+          return nro;
+
+   return NOTHING;
+}
+// -----------------------------------------------------------------------
+// -----------------------------------------------------------------------
+// -----------------------------------------------------------------------
+// -----------------------------------------------------------------------
+// ===================================================== Constructeur
+Qpattern::Qpattern ()
+{
+   nbr_vertex   = nbr_edges = nbr_quads = 0;
+   cont_nbnodes = 0;
+   pos_vertex4 = pos_edge3 = pos_edge4 = NOTHING;
+   for (int nc=0 ; nc<DIM3 ; nc++)
+       origine[nc] = base_i[nc]  = base_j[nc] = 0;
+
+   base_i[0]  = 1; 
+   base_j[1]  = 1;
+   nbr_layers = 0;
+   ux_mini  = uy_mini  = 0;
+   ux_delta = uy_delta = 1;
+}
+// ====================================================== setPattern
+void Qpattern::setPattern (Vertices& contour, Quads& motif)
+{
+    cont_nbnodes = contour.size();
+    Real3 cg, point, pmax;
+    Vertex::anaVertices (contour, point, pmax, cg);
+    for (int nro=0 ; nro<cont_nbnodes ; ++nro)
+        addVertex (contour[nro]);
+
+    contour[0]->getPoint (origine);
+    contour[1]->getPoint (point);
+    setOrigin (origine, point, cg);
+
+   double vxmin = pat_vertex[0].v_x;
+   double vymin = pat_vertex[0].v_y;
+   double vxmax = vxmin;
+   double vymax = vymin;
+   for (int np=0 ; np<cont_nbnodes ; ++np)
+       {
+       double ux, uy;
+       projeter (contour[np], ux, uy);
+       vxmin = std::min (ux, vxmin);
+       vxmax = std::max (ux, vxmax);
+       vymin = std::min (uy, vymin);
+       vymax = std::max (uy, vymax);
+       }
+
+    ux_mini  = vxmin;
+    uy_mini  = vymin;
+    ux_delta = vxmax-vxmin;
+    uy_delta = vymax-vymin;
+
+    int nbre = motif.size();
+    for (int nro=0 ; nro<nbre ; ++nro)
+        addQuad (motif[nro]);
+
+    for (int nro=0 ; nro<cont_nbnodes ; ++nro)
+        {
+        contour[nro]->getPoint (point);
+        for (int nc=0 ; nc<DIM3 ; nc++) cg[nc] += point[nc];
+        addVertex (contour[nro]);
+        }
+}
+// ====================================================== setTarget
+void Qpattern::setTarget (Vertices& contour, Quads& cible)
+{
+   old_contour = contour;
+
+   for (int nro=0 ; nro<cont_nbnodes ; ++nro)
+       {
+       Vertex* vertex = contour[nro];
+       pat_vertex[nro].cible = vertex;
+       pat_vertex[nro].quad_cible = find_quad (cible, vertex);
+       }
+
+   int nbre = cible.size();
+   nbr_layers = 999999;
+   for (int nro=0 ; nro<nbre ; ++nro)
+       {
+       Quad* quad  = cible [nro];
+       Hexa* hexa  = quad->getParent (0); 
+       Quad* oppos = hexa->getOpposedQuad (quad);
+
+       old_top   .push_back (quad);
+       old_bottom.push_back (oppos);
+       old_hexa  .push_back (hexa);
+
+       int prof = 0;
+       while (oppos!=NULL)
+          {
+          prof ++;
+          hexa  = oppos->opposedHexa (hexa);
+          oppos = hexa==NULL ? NULL : hexa->getOpposedQuad (oppos);
+          }
+       nbr_layers = std::min (prof, nbr_layers);
+       }
+}
+// ====================================================== setOrigin
+int Qpattern::setOrigin (double* orig, double* p1, double* cg)
+{
+   base_i[1]   = base_i[2] = 0; 
+   base_j[0]   = base_j[2] = 0; 
+   base_i[0]   = base_j[1] = 1;
+
+   pat_vertex[0].v_x = pat_vertex[1].v_x = 0;
+   pat_vertex[2].v_x = 1; 
+   pat_vertex[0].v_y = 1;
+   pat_vertex[1].v_y = pat_vertex[2].v_y = 0; 
+
+   calc_vecteur (orig, p1, base_i);
+   calc_vecteur (orig, cg, base_j);
+   normer_vecteur (base_i);
+   normer_vecteur (base_j);
+   Real3 vk;
+   prod_vectoriel (base_i, base_j, vk);
+   prod_vectoriel (vk, base_i, base_j);
+
+   if (db)
+      {
+      PutCoord (orig);
+      PutCoord (base_i);
+      PutCoord (base_j);
+      }
+
+   return HOK;
+}
+// ====================================================== addQuad
+int Qpattern::addQuad (Quad* elt)
+{
+   if (elt==NULL)
+      return HERR;
+
+   QpatQuad quad (elt);
+   for (int nro=0; nro<QUAD4 ; nro++)
+       {
+       Edge* edge = elt->getEdge (nro);
+       quad.q_edge [nro] = addEdge (edge); 
+       }
+
+   pat_quad.push_back (quad);
+   nbr_quads++;
+   return HOK;
+}
+// ====================================================== addEdge
+int Qpattern::addEdge (Edge* elt)
+{
+   for (int nro=0; nro<nbr_edges ; nro++)
+       {
+       if (elt==pat_edge [nro].refer)
+          return nro;
+       }
+
+   QpatEdge edge (elt);
+   edge.v_amont  = addVertex (elt->getVertex (V_AMONT));
+   edge.v_aval   = addVertex (elt->getVertex (V_AVAL));
+
+   pat_edge.push_back (edge);
+   nbr_edges++;
+   return nbr_edges-1;
+}
+
+// ====================================================== projeter
+void Qpattern::projeter (Vertex* elt, double& ux, double& uy)
+{
+   Real3 point, local;
+   elt->getPoint (point);
+   calc_vecteur  (origine, point, local); 
+   ux = (prod_scalaire (base_i, local) - ux_mini)/ux_delta ;
+   uy = (prod_scalaire (base_j, local) - uy_mini)/uy_delta ;
+}
+// ====================================================== addVertex
+int Qpattern::addVertex (Vertex* elt, Vertex* ref)
+{
+   for (int nro=0; nro<nbr_vertex ; nro++)
+       {
+       if (elt==pat_vertex [nro].refer)
+          {
+          if (ref != NULL) 
+              pat_vertex [nro].on_contour = true;
+          return nro;
+          }
+       }
+
+   QpatVertex vertex (elt);
+   projeter (elt, vertex.v_x, vertex.v_y);
+
+   if (db)
+      printf (" Vertex nro %d : (%g, %g, %g)\t -> (%g, %g)\n", 
+                nbr_vertex, elt->getX(),  elt->getY(),  elt->getZ(), 
+                vertex.v_x, vertex.v_y);
+   pat_vertex.push_back (vertex);
+   nbr_vertex++;
+   return nbr_vertex-1;
+}
+// ====================================================== getSize
+void Qpattern::getSize (int& nbq, int& nbed, int& nbv, int& prof)
+{
+   nbv  = nbr_vertex; 
+   nbed = nbr_edges; 
+   nbq  = nbr_quads; 
+   prof = nbr_layers; 
+}
+// ====================================================== stepDown
+void Qpattern::stepDown ()
+{
+   int nbnodes = old_contour.size();
+   for (int nro=0 ; nro<nbnodes ; ++nro)
+       {
+       int nq = pat_vertex[nro].quad_cible;
+
+       Hexa*   hexa     = old_hexa [nq];
+       Quad*   quad     = old_top  [nq];
+       Vertex* vertex   = hexa->opposedVertex (quad, old_contour[nro]);
+       old_contour[nro] = vertex;
+       }
+
+   int nbquads = old_top.size();
+   for (int nq=0 ; nq<nbquads ; ++nq)
+       {
+       Quad* oppos = old_bottom[nq];
+       Hexa* hexa  = oppos->opposedHexa (old_hexa[nq]);
+
+       old_top    [nq] -> remove ();
+       old_top    [nq] = oppos;
+       old_bottom [nq] = hexa==NULL ? NULL : hexa->getOpposedQuad (oppos);
+       old_hexa   [nq] = hexa;
+       }
+}
+// ====================================================== anaTarget
+void Qpattern::anaTarget  (double tmin[], double tmax[], double centre[])
+{
+   Vertex::anaVertices (old_contour, tmin, tmax, centre);
+}
+END_NAMESPACE_HEXA
diff --git a/src/HEXABLOCK/HexQpattern.hxx b/src/HEXABLOCK/HexQpattern.hxx
new file mode 100644
index 0000000..1c0a4bc
--- /dev/null
+++ b/src/HEXABLOCK/HexQpattern.hxx
@@ -0,0 +1,115 @@
+
+// C++ : Quads Pattern (for replaceHexas)
+
+// 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 __HEX_QPATTERN_H_
+
+#include "HexGlobale.hxx"
+
+#include <cmath>
+#include <map>
+
+BEGIN_NAMESPACE_HEXA
+
+// --------------------------------------------------------
+class HexaExport QpatQuad
+{
+public :
+   QpatQuad (Quad* refer=NULL);
+   void operator= (const QpatQuad& other);
+public :
+   int   q_edge [QUAD4];
+   Quad* refer;
+   Quad* cible;
+   Quad* oppos;
+}; 
+// --------------------------------------------------------
+class HexaExport QpatEdge
+{
+public :
+   QpatEdge (Edge* refer=NULL);
+   void operator= (const QpatEdge& other);
+
+public :
+   int   v_amont, v_aval;
+   Edge* refer;
+   Edge* cible;
+   Edge* oppos;
+}; 
+// --------------------------------------------------------
+class HexaExport QpatVertex
+{
+public :
+   QpatVertex (Vertex* refer=NULL);
+   void operator= (const QpatVertex& other);
+
+public :
+   double  v_x, v_y;
+   Vertex* refer;
+   Vertex* cible;
+   Vertex* oppos;
+   bool    on_contour;
+   int     quad_cible;
+}; 
+
+// --------------------------------------------------------
+class HexaExport Qpattern 
+{
+friend class Elements;
+public  :
+    Qpattern();
+    void setPattern (Vertices& contour, Quads& pattern);
+    void setTarget  (Vertices& contour, Quads& target);
+    void stepDown ();
+    void extrude  ();
+    void getSize  (int& nbq, int& nbed, int& nbv, int& prof);
+
+    void anaTarget  (double tmin[], double tmax[], double centre[]);
+    Vertex* getTargetVertex (int nro)
+           { return old_contour [nro] ; }
+
+private :
+    int  setOrigin (double* v1, double* v2, double* v3);
+    int  addQuad   (Quad* quad);
+    int  addEdge   (Edge*   edge);
+    int  addVertex (Vertex* vertex, Vertex* ref=NULL);
+    void projeter  (Vertex* vertex, double& ux, double& uy);
+
+private :
+   vector <QpatVertex> pat_vertex;
+   vector <QpatEdge  > pat_edge;
+   vector <QpatQuad  > pat_quad;
+
+   Quads    old_top, old_bottom;
+   Hexas    old_hexa;
+   Vertices old_contour;
+
+   int      nbr_vertex, nbr_edges, nbr_quads;
+   int      cont_nbnodes;
+   Real3    base_i, base_j, origine;
+   double   ux_mini, uy_mini, ux_delta, uy_delta;
+
+   int pos_vertex4;
+   int pos_edge3, pos_edge4;
+   int nbr_layers;
+};
+END_NAMESPACE_HEXA
+#endif
diff --git a/src/HEXABLOCK/HexQuad.cxx b/src/HEXABLOCK/HexQuad.cxx
index 0b6b5eb..202bcae 100755
--- a/src/HEXABLOCK/HexQuad.cxx
+++ b/src/HEXABLOCK/HexQuad.cxx
@@ -858,4 +858,16 @@ double Quad::dist2 (double* point)
              + carre (point[dir_z] - center[dir_z]) ;
    return d2;
 }
+// =============================================================== getCenter
+Hexa* Quad::opposedHexa (Hexa* hexa)
+{
+   int nbre = getNbrParents ();
+   for (int nro=0 ; nro <nbre ; ++nro)
+       { 
+       Hexa* dad = getParent (nro);
+       if (dad!= NULL && dad->isValid() && dad != hexa)
+           return dad;
+       }
+   return NULL;
+}
 END_NAMESPACE_HEXA
diff --git a/src/HEXABLOCK/HexQuad.hxx b/src/HEXABLOCK/HexQuad.hxx
index 47e9848..8c543f1 100755
--- a/src/HEXABLOCK/HexQuad.hxx
+++ b/src/HEXABLOCK/HexQuad.hxx
@@ -89,6 +89,7 @@ public:
 
     Edge*   getOpposEdge   (Edge* arete, int &sens);
     Vertex* getOpposVertex (Vertex* sommet);
+    Hexa*   opposedHexa (Hexa* hexa);
 
     virtual void majReferences();            // M.A.J relation "utilise par"
     virtual void dump ();
diff --git a/src/HEXABLOCK/HexVertex.cxx b/src/HEXABLOCK/HexVertex.cxx
index 795c9f0..1ef88ef 100755
--- a/src/HEXABLOCK/HexVertex.cxx
+++ b/src/HEXABLOCK/HexVertex.cxx
@@ -268,4 +268,32 @@ double Vertex::dist2 (Vertex* other)
                                         + carre (v_z-other->v_z);
    return dist;
 }
+// ========================================================= anaVertices
+void Vertex::anaVertices (Vertices& cont, double pmin[], double pmax[], 
+                                                         double center[])
+{
+    Real3 point;
+    int nbre = cont.size();
+    if (nbre==0)
+       {
+       for (int nc=0 ; nc<DIM3 ; nc++)
+            pmin [nc] = pmax[nc] =  center[nc] = 0;
+       return;
+       }
+
+    cont[0]->getPoint (pmin);
+    cont[0]->getPoint (pmax);
+    for (int nro=1 ; nro<nbre ; ++nro)
+        {
+        cont[nro]->getPoint (point);
+        for (int nc=0 ; nc<DIM3 ; nc++)
+            {
+            pmin [nc] = std::min (pmin[nc], point[nc]);
+            pmax [nc] = std::max (pmax[nc], point[nc]);
+            }
+        }
+
+    for (int nc=0 ; nc<DIM3 ; nc++)
+        center [nc] = (pmin[nc] + pmax[nc])/2;
+}
 END_NAMESPACE_HEXA
diff --git a/src/HEXABLOCK/HexVertex.hxx b/src/HEXABLOCK/HexVertex.hxx
index a57efbd..565af90 100755
--- a/src/HEXABLOCK/HexVertex.hxx
+++ b/src/HEXABLOCK/HexVertex.hxx
@@ -66,6 +66,8 @@ public :
    void   getAssoCoord (double &x, double &y, double &z);
    void   getAssoCoord (double* point);
 
+   static void anaVertices (Vertices& cont, double tmin[], double tmax[], double center[]);
+
 public :
    Vertex (Vertex* other);
    virtual ~Vertex () {}
diff --git a/src/HEXABLOCK/hexa_base.hxx b/src/HEXABLOCK/hexa_base.hxx
index 32065ea..c0dfcbe 100755
--- a/src/HEXABLOCK/hexa_base.hxx
+++ b/src/HEXABLOCK/hexa_base.hxx
@@ -254,7 +254,7 @@ typedef double Real3 [DIM3];
 HexaExport pchar   get_temp_name (cpchar format, pchar nomfic);
 HexaExport void    fatal_error   (cpchar format, cpchar info1=NULL, cpchar info2=NULL);
 
-HexaExport double   prod_scalaire  (double v1[], double v2[]);
+HexaExport double  prod_scalaire  (double v1[], double v2[]);
 HexaExport double* prod_vectoriel (double v1[], double v2[], double v3[]);
 HexaExport double  prod_mixte     (double vi[], double vj[], double vk[]);
 
@@ -262,7 +262,8 @@ HexaExport inline  double deg2radians (double angle) {  return (angle*M_PI/180.0
 HexaExport inline  double rad2degres  (double angle) {  return (angle*180.0/M_PI); }
 
 HexaExport double  calc_norme     (double v1[]);
-HexaExport double  calc_distance  (double v1[], double v2[]);
+HexaExport double  calc_distance  (double v1[],  double v2[]);
+HexaExport double  calc_d2        (double v1[],  double v2[]);
 HexaExport double  calc_d2        (double v1[], double v2[]);
 HexaExport void    calc_vecteur   (double pta[], double ptb[], double vab[]);
 HexaExport void    copy_vecteur   (double va [], double vb []);
@@ -275,7 +276,7 @@ HexaExport bool    same_coords (double* pa, double* pb, double epsilon=1e-6);
 HexaExport bool requals (const double  v1, const double  v2);
 HexaExport bool requals (const double* v1, const double* v2);
 
-HexaExport bool    on_debug();     // == getenv ("HEXA_DB") > 0
+HexaExport bool   on_debug();     // == getenv ("HEXA_DB") > 0
 HexaExport bool   in_test ();     // == getenv ("HEXA_TEST") > 0
 HexaExport int    niv_debug();    // Implemente prochainement
 
diff --git a/src/HEXABLOCK/test_quads.cxx b/src/HEXABLOCK/test_quads.cxx
index edb4d98..295c6f3 100644
--- a/src/HEXABLOCK/test_quads.cxx
+++ b/src/HEXABLOCK/test_quads.cxx
@@ -59,7 +59,7 @@ int test_hexa_quads_5 (int nbargs, cpchar tabargs[])
    Hex::Quad* qe = hexa->getQuad (Hex::Q_E);
    Hex::Quad* qf = hexa->getQuad (Hex::Q_F);
 
-   qb->setScalar (5);
+   qb->setColor (5);
    doc->saveVtk (fic_vtk, nvtk);
 
    qb->remove ();
@@ -462,13 +462,13 @@ int test_piquage (int nbargs, cpchar tabargs[])
    Hex::Vertex* p2 = grid2->getVertexIJK (1, 1, 1);
    Hex::Vertex* p3 = grid2->getVertexIJK (1, 2, 1);
 
-   c1->setScalar (4);
-   c2->setScalar (6);
-   c3->setScalar (6);
+   c1->setColor (4);
+   c2->setColor (6);
+   c3->setColor (6);
 
-   p1->setScalar (4);
-   p2->setScalar (6);
-   p3->setScalar (6);
+   p1->setColor (4);
+   p2->setColor (6);
+   p3->setColor (6);
 
    int nvtk=0;
    doc->saveVtk ("piquage", nvtk);
@@ -477,7 +477,7 @@ int test_piquage (int nbargs, cpchar tabargs[])
    for (int ny=0; ny<4 ; ny++)
        {
        Hex::Quad* quad = grid2->getQuadIJ (0, ny, 1);
-       quad->setScalar(5);
+       quad->setColor(5);
        qpattern.push_back (quad);
        }
    
@@ -488,8 +488,8 @@ int test_piquage (int nbargs, cpchar tabargs[])
 
    return HOK;
 }
-// ======================================================== test_replace
-int test_replace (int nbargs, cpchar tabargs[])
+// ======================================================== test_replace0
+int test_replace0 (int nbargs, cpchar tabargs[])
 {
    const int size_x = 3;
    const int size_y = 3;
@@ -540,13 +540,133 @@ int test_replace (int nbargs, cpchar tabargs[])
 
    doc->replace (qpattern, pd2,c1, pa2,c2, pb2,c3);
 
-   c1->setScalar (4);
-   c2->setScalar (6);
-   c3->setScalar (6);
+   c1->setColor (4);
+   c2->setColor (6);
+   c3->setColor (6);
    doc->saveVtk ("replace1.vtk");
 
    return HOK;
 }
+// ======================================================== test_replace1
+int test_replace1 (int nbargs, cpchar tabargs[])
+{
+   const int size_x   = 3;
+   const int size_y   = 3;
+   const int size_z   = 3;
+   const int size_cyl = 4;
+
+   Hex::Hex mon_ex;
+   Hex::Document* doc = mon_ex.addDocument ();
+   Hex::Vector*   vx  = doc->addVector (1, 0, 0);
+   Hex::Vector*   vz  = doc->addVector (0, 0, 1);
+   Hex::Vertex*   ori = doc->addVertex (8, 0, 0);
+   const double   rint  = 1;
+   const double   rext  = 3;
+   const double   angle = 360;
+   const double   haut  = 1;
+   const int      nr    = 1;
+   const int      nh    = 1;
+
+   Hex::Elements* grid = doc->makeCartesianTop (size_x,size_y,size_z);
+   Hex::Elements* pipe = doc->makePipeUni  (ori, vx, vz, rint, rext, angle,
+                                            haut, nr, size_cyl, nh); 
+
+   Hex::Vertex* c1 = grid->getVertexIJK (1, 2, size_z);
+   Hex::Vertex* c2 = grid->getVertexIJK (1, 1, size_z);
+   Hex::Vertex* c3 = grid->getVertexIJK (2, 1, size_z);
+
+   Hex::Vertex* p1 = pipe->getVertexIJK (1, 1, 1);
+   Hex::Vertex* p2 = pipe->getVertexIJK (1, 2, 1);
+   Hex::Vertex* p3 = pipe->getVertexIJK (1, 3, 1);
+
+   Hex::Quads qpattern;
+   for (int na=0; na<size_cyl;  ++na)
+       {
+       Hex::Quad* quad =pipe->getQuadIJ (0, na, 1);
+       quad->setColor (2);
+       qpattern.push_back (quad);
+       }
+
+   c1->setColor (6);
+   c2->setColor (4);
+   c3->setColor (2);
+
+   p1->setColor (6);
+   p2->setColor (5);
+   p3->setColor (4);
+   doc->saveVtk ("replace0.vtk");
+
+   Hex::Elements* rep = doc->replaceHexa (qpattern, p1,c1, p2,c2, p3,c3);
+   HexDisplay (rep->isValid());
+   Hex::what ();
+
+   doc->saveVtk ("replace1.vtk");
+   doc->saveVtk ("replace2.vtk");
+   doc->saveVtk ("replace3.vtk");
+   return HOK;
+}
+// ======================================================== test_replace
+int test_replace (int nbargs, cpchar tabargs[])
+{
+   const int size_x   = 5;
+   const int size_y   = 5;
+   const int size_z   = 3;
+   const int size_cyl = 12;
+
+   Hex::Hex mon_ex;
+   Hex::Document* doc = mon_ex.addDocument ();
+   Hex::Vector*   vx  = doc->addVector (1, 0, 0);
+   Hex::Vector*   vz  = doc->addVector (0, 0, 1);
+   Hex::Vertex*   ori = doc->addVertex (8, 0, 0);
+   const double   rint  = 2;
+   const double   rext  = 3;
+   const double   angle = 360;
+   const double   haut  = 1;
+   const int      nr    = 1;
+   const int      nh    = 1;
+
+   Hex::Elements* grid = doc->makeCartesianTop (size_x,size_y,size_z);
+   Hex::Elements* pipe = doc->makePipeUni  (ori, vx, vz, rint, rext, angle,
+                                            haut, nr, size_cyl, nh); 
+
+   Hex::Vertex* c1 = grid->getVertexIJK (2, 1, size_z);
+   Hex::Vertex* c2 = grid->getVertexIJK (3, 1, size_z);
+
+   Hex::Vertex* p1 = pipe->getVertexIJK (1, 7, 1);
+   Hex::Vertex* p2 = pipe->getVertexIJK (1, 8, 1);
+
+   Hex::Quads qpattern, qtarget;
+   for (int na=0; na<size_cyl;  ++na)
+       {
+       Hex::Quad* quad =pipe->getQuadIJ (0, na, 1);
+       quad->setColor (2);
+       qpattern.push_back (quad);
+       }
+
+   for (int ni=1; ni<size_x-1;  ++ni)
+       for (int nj=1; nj<size_y-1;  ++nj)
+           {
+           cout << " grid->getQuad (" << ni << "," << nj << ")\n";
+           Hex::Quad* quad = grid->getQuadIJ (ni, nj, size_z);
+           quad->setColor (2);
+           qtarget.push_back (quad);
+           }
+
+   c1->setColor (6);
+   c2->setColor (4);
+
+   p1->setColor (6);
+   p2->setColor (4);
+   doc->saveVtk ("replace0.vtk");
+
+   Hex::Elements* rep = doc->replace (qpattern, qtarget, p1,c1, p2,c2);
+   HexDisplay (rep->isValid());
+   Hex::what ();
+
+   doc->saveVtk ("replace1.vtk");
+   doc->saveVtk ("replace2.vtk");
+   return HOK;
+}
 // ======================================================== test_quads
 int test_quads (int nbargs, cpchar tabargs[])
 {
diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI.cxx b/src/HEXABLOCKGUI/HEXABLOCKGUI.cxx
index 4acadca..a928adb 100755
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI.cxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI.cxx
@@ -98,7 +98,7 @@
 #include "HEXABLOCKGUI_OccGraphicView.hxx"
 #include "HEXABLOCKGUI_GraphicViewsHandler.hxx"
 
-#include <HEXABLOCK_version.h>
+#include "HEXABLOCK_version.h"
 
 #include "MyBasicGUI_PointDlg.hxx"
 
diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentModel.cxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentModel.cxx
index 80fc85e..0858c66 100755
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentModel.cxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentModel.cxx
@@ -1683,53 +1683,17 @@ bool DocumentModel::performSymmetryPlane( const QModelIndex& ielts,
     return false;
 }
 
-QModelIndex DocumentModel::replace( const QModelIndexList& iquadsPattern,
-        const QModelIndex& ip1, const QModelIndex& ic1,
-        const QModelIndex& ip2, const QModelIndex& ic2,
-        const QModelIndex& ip3, const QModelIndex& ic3 )
-{
-    QModelIndex ielts;
-
-    HEXA_NS::Vertex* hp1 = getHexaPtr<HEXA_NS::Vertex*>(ip1);
-    HEXA_NS::Vertex* hc1 = getHexaPtr<HEXA_NS::Vertex*>(ic1);
-    HEXA_NS::Vertex* hp2 = getHexaPtr<HEXA_NS::Vertex*>(ip2);
-    HEXA_NS::Vertex* hc2 = getHexaPtr<HEXA_NS::Vertex*>(ic2);
-    HEXA_NS::Vertex* hp3 = getHexaPtr<HEXA_NS::Vertex*>(ip3);
-    HEXA_NS::Vertex* hc3 = getHexaPtr<HEXA_NS::Vertex*>(ic3);
-
-    HEXA_NS::Quads   hquads;
-    HEXA_NS::Quad*   hquad = NULL;
-    foreach( const QModelIndex& iquad, iquadsPattern ){
-        hquad = getHexaPtr<HEXA_NS::Quad*>(iquad);
-        hquads.push_back( hquad );
-    }
-
-    HEXA_NS::Elements* helts = _hexaDocument->replace( hquads,
-                                                       hp1, hc1, hp2, hc2, hp3, hc3 );
-    if ( BadElement(helts) ) return ielts;
-
-    updateData();
-    ElementsItem* eltsItem = new ElementsItem(helts);
-    _elementsDirItem->appendRow(eltsItem);
-    ielts = eltsItem->index();
-
-    return ielts;
-}
-
 QModelIndex DocumentModel::replace( const QModelIndexList& iquads_source,
                                     const QModelIndexList& iquads_dest,
                                     const QModelIndex& ip1_source, const QModelIndex& ic1_dest,
-                                    const QModelIndex& ip2_source, const QModelIndex& ic2_dest,
-                                    const QModelIndex& ip3_source, const QModelIndex& ic3_dest)
+                                    const QModelIndex& ip2_source, const QModelIndex& ic2_dest)
 {
     QModelIndex ielts;
 
     HEXA_NS::Vertex* hp1 = getHexaPtr<HEXA_NS::Vertex*>(ip1_source);
     HEXA_NS::Vertex* hp2 = getHexaPtr<HEXA_NS::Vertex*>(ip2_source);
-    HEXA_NS::Vertex* hp3 = getHexaPtr<HEXA_NS::Vertex*>(ip3_source);
     HEXA_NS::Vertex* hc1 = getHexaPtr<HEXA_NS::Vertex*>(ic1_dest);
     HEXA_NS::Vertex* hc2 = getHexaPtr<HEXA_NS::Vertex*>(ic2_dest);
-    HEXA_NS::Vertex* hc3 = getHexaPtr<HEXA_NS::Vertex*>(ic3_dest);
 
     HEXA_NS::Quads   hquads_source, hquads_dest;
     HEXA_NS::Quad*   hquad = NULL;
@@ -1743,9 +1707,9 @@ QModelIndex DocumentModel::replace( const QModelIndexList& iquads_source,
         hquads_dest.push_back(hquad);
     }
 
-    HEXA_NS::Elements* helts = _hexaDocument->replaceHexas( hquads_source,
+    HEXA_NS::Elements* helts = _hexaDocument->replace( hquads_source,
                                                             hquads_dest,
-                                                            hp1, hc1, hp2, hc2, hp3, hc3);
+                                                            hp1, hc1, hp2, hc2);
     if ( BadElement(helts) )
         return ielts;
 
diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentModel.hxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentModel.hxx
index a44306e..129d54a 100755
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentModel.hxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentModel.hxx
@@ -366,15 +366,9 @@ namespace HEXABLOCK
       bool performSymmetryLine( const QModelIndex& elts, const QModelIndex& v, const QModelIndex& vec );
       bool performSymmetryPlane( const QModelIndex& elts, const QModelIndex& v, const QModelIndex& vec );
 
-      QModelIndex replace( const QModelIndexList& quadsPattern,
-                           const QModelIndex& ip1, const QModelIndex& ic1,
-                           const QModelIndex& ip2, const QModelIndex& ic2,
-                           const QModelIndex& ip3, const QModelIndex& ic3 ); //NEW HEXA3
-
       QModelIndex replace( const QModelIndexList& iquads_source, const QModelIndexList& iquads_dest,
                            const QModelIndex& ip1_source, const QModelIndex& ic1_dest,
-                           const QModelIndex& ip2_source, const QModelIndex& ic2_dest,
-                           const QModelIndex& ip3_source, const QModelIndex& ic3_dest );
+                           const QModelIndex& ip2_source, const QModelIndex& ic2_dest);
 
 
       // ************  ASSOCIATION ************
diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentPanel.cxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentPanel.cxx
index 0c4db33..086dd1d 100755
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentPanel.cxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentPanel.cxx
@@ -1789,9 +1789,9 @@ bool HexaDialog::apply(QModelIndex& result)
     }
 
     nbItems = iElts.count();
-    if ( quads_rb->isChecked() and (nbItems>=2 and nbItems<=6) ){ // build from quads iElts.count() should be between [2,6]
+    if ( quads_rb->isChecked() && (nbItems>=2 && nbItems<=6) ){ // build from quads iElts.count() should be between [2,6]
         iHexa = getDocumentModel()->addHexaQuads( iElts );
-    } else if ( vertices_rb->isChecked() and nbItems== 8 ){ // build from vertices
+    } else if ( vertices_rb->isChecked() && nbItems== 8 ){ // build from vertices
         iHexa = getDocumentModel()->addHexaVertices( iElts[0], iElts[1], iElts[2], iElts[3],
                 iElts[4], iElts[5], iElts[6], iElts[7] );
     }
@@ -5899,8 +5899,6 @@ HexaBaseDialog(parent, editmode, f)
     _helpFileName = "gui_replace_hexa.html";
     setupUi( this );
     _initWidget(editmode);
-
-    radioButton->click();
 }
 
 // ============================================================== Destructeur
@@ -5928,16 +5926,13 @@ QModelIndexList ReplaceHexaDialog::getAssocsVTK()
             assocs << iQuad;
     }
 
-    if (radioButton_2->isChecked())
+    nbQuads = quads_lw_2->count();
+    for( int i = 0; i < nbQuads; ++i)
     {
-        nbQuads = quads_lw_2->count();
-        for( int i = 0; i < nbQuads; ++i)
-        {
-            item = quads_lw_2->item(i);
-            iQuad = getPatternDataSelectionModel()->indexBy(HEXA_DATA_ROLE, item->data(LW_DATA_ROLE));
-            if (iQuad.isValid())
-                assocs << iQuad;
-        }
+        item = quads_lw_2->item(i);
+        iQuad = getPatternDataSelectionModel()->indexBy(HEXA_DATA_ROLE, item->data(LW_DATA_ROLE));
+        if (iQuad.isValid())
+            assocs << iQuad;
     }
 
     return assocs;
@@ -5952,19 +5947,15 @@ void ReplaceHexaDialog::_initInputWidget( Mode editmode )
 
     c1_le->setProperty( "HexaWidgetType",  QVariant::fromValue(VERTEX_TREE) );
     c2_le->setProperty( "HexaWidgetType",  QVariant::fromValue(VERTEX_TREE) );
-    c3_le->setProperty( "HexaWidgetType",  QVariant::fromValue(VERTEX_TREE) );
 
     p1_le->setProperty( "HexaWidgetType",  QVariant::fromValue(VERTEX_TREE) );
     p2_le->setProperty( "HexaWidgetType",  QVariant::fromValue(VERTEX_TREE) );
-    p3_le->setProperty( "HexaWidgetType",  QVariant::fromValue(VERTEX_TREE) );
 
     c1_le->installEventFilter(this);
     c2_le->installEventFilter(this);
-    c3_le->installEventFilter(this);
 
     p1_le->installEventFilter(this);
     p2_le->installEventFilter(this);
-    p3_le->installEventFilter(this);
 
     quads_lw->setProperty( "HexaWidgetType",  QVariant::fromValue(QUAD_TREE) );
     quads_lw->installEventFilter(this);
@@ -5985,11 +5976,9 @@ void ReplaceHexaDialog::_initInputWidget( Mode editmode )
 
     c1_le->setReadOnly(true);
     c2_le->setReadOnly(true);
-    c3_le->setReadOnly(true);
 
     p1_le->setReadOnly(true);
     p2_le->setReadOnly(true);
-    p3_le->setReadOnly(true);
 
     connect(quads_lw,    SIGNAL(itemSelectionChanged()),
             this, SLOT(selectElementOfModel()), Qt::UniqueConnection);
@@ -6004,24 +5993,21 @@ void ReplaceHexaDialog::clear()
     quads_lw->clear();
     modelUnregister(quads_lw);
 
+    quads_lw_2->clear();
+    modelUnregister(quads_lw_2);
+
     p1_le->clear();
     modelUnregister(p1_le);
 
     p2_le->clear();
     modelUnregister(p2_le);
 
-    p3_le->clear();
-    modelUnregister(p3_le);
-
     c1_le->clear();
     modelUnregister(c1_le);
 
     c2_le->clear();
     modelUnregister(c2_le);
 
-    c3_le->clear();
-    modelUnregister(c3_le);
-
     modelUnregister(this);
 }
 
@@ -6075,43 +6061,30 @@ bool ReplaceHexaDialog::apply(QModelIndex& result)
             iquads_source << iquad;
     }
 
+    QModelIndexList iquads_dest;
+    nbQuads = quads_lw_2->count();
+    for (int i = 0; i < nbQuads; ++i)
+    {
+        item = quads_lw_2->item(i);
+        iquad = patternDataModel->mapToSource( item->data(LW_QMODELINDEX_ROLE).value<QModelIndex>() );
+        if (iquad.isValid())
+            iquads_dest << iquad;
+    }
+
     QModelIndex ip1_source = patternDataModel->mapToSource( _index[p1_le] );
     QModelIndex ip2_source = patternDataModel->mapToSource( _index[p2_le] );
-    QModelIndex ip3_source = patternDataModel->mapToSource( _index[p3_le] );
 
     QModelIndex ic1_dest = patternDataModel->mapToSource( _index[c1_le] );
     QModelIndex ic2_dest = patternDataModel->mapToSource( _index[c2_le] );
-    QModelIndex ic3_dest = patternDataModel->mapToSource( _index[c3_le] );
 
-    bool ipts_ok = ip1_source.isValid() && ip2_source.isValid() && ip3_source.isValid() &&
-                      ic1_dest.isValid() && ic2_dest.isValid() && ic3_dest.isValid();
+    bool ipts_ok = ip1_source.isValid() && ip2_source.isValid() &&
+                      ic1_dest.isValid() && ic2_dest.isValid();
 
     if (ipts_ok)
     {
-        if (radioButton->isChecked())
-        {
-            ielts = getDocumentModel()->replace( iquads_source,
-                                                 ip1_source, ic1_dest,
-                                                 ip2_source, ic2_dest,
-                                                 ip3_source, ic3_dest );
-        }
-        else if (radioButton_2->isChecked())
-        {
-            QModelIndexList iquads_dest;
-            nbQuads = quads_lw_2->count();
-            for (int i = 0; i < nbQuads; ++i)
-            {
-                item = quads_lw_2->item(i);
-                iquad = patternDataModel->mapToSource( item->data(LW_QMODELINDEX_ROLE).value<QModelIndex>() );
-                if (iquad.isValid())
-                    iquads_dest << iquad;
-            }
-
             ielts = getDocumentModel()->replace( iquads_source, iquads_dest,
                                                  ip1_source, ic1_dest,
-                                                 ip2_source, ic2_dest,
-                                                 ip3_source, ic3_dest);
-        }
+                                                 ip2_source, ic2_dest );
     }
 
     if ( !ielts.isValid() ){
diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentPanel.hxx b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentPanel.hxx
index 5f52285..9f0f635 100755
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentPanel.hxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentPanel.hxx
@@ -553,9 +553,9 @@ namespace HEXABLOCK
     void updateHelpFileName();
 
     private slots:
-    void addQuad();
+    //void addQuad();
     void removeQuad();
-    void clearQuads();
+    //void clearQuads();
 
     };
 
@@ -583,9 +583,9 @@ namespace HEXABLOCK
     void updateHelpFileName();
 
     private slots:
-    void addQuad();
+    //void addQuad();
     void removeQuad();
-    void clearQuads();
+    //void clearQuads();
 
     };
 
@@ -902,7 +902,7 @@ class HEXABLOCK_EXPORT EdgeAssocDialog : public HexaBaseDialog,
     void _initInputWidget( Mode editmode );
 
     protected slots:
-    void updateHelpFileName();
+    //void updateHelpFileName();
     void deletePropagationItem();
     virtual void selectElementOfModel();
 
@@ -958,7 +958,7 @@ class HEXABLOCK_EXPORT EdgeAssocDialog : public HexaBaseDialog,
     void deleteQuadItem();
     void deleteQuadItem2();
     void updateButtonBox();
-    void updateHelpFileName();
+    //void updateHelpFileName();
 
     private:
     HEXA_NS::Elements *_value;
diff --git a/src/HEXABLOCKGUI/MyBasicGUI_PointDlg.cxx b/src/HEXABLOCKGUI/MyBasicGUI_PointDlg.cxx
index 5270548..f2007d9 100644
--- a/src/HEXABLOCKGUI/MyBasicGUI_PointDlg.cxx
+++ b/src/HEXABLOCKGUI/MyBasicGUI_PointDlg.cxx
@@ -127,7 +127,7 @@ MyBasicGUI_PointDlg::MyBasicGUI_PointDlg(QWidget* parent, Qt::WindowFlags fl)
     myParamCoord->setExclusive(true);
     myParamCoord->button(PARAM_VALUE)->setChecked(true);
 
-    GroupXYZ = new DlgRef_3Spin(centralWidget());
+    GroupXYZ = new MyDlgRef_3Spin(centralWidget());
     GroupXYZ->GroupBox1->setTitle(tr("GEOM_COORDINATES"));
     GroupXYZ->TextLabel1->setText(tr("GEOM_X"));
     GroupXYZ->TextLabel2->setText(tr("GEOM_Y"));
@@ -136,7 +136,7 @@ MyBasicGUI_PointDlg::MyBasicGUI_PointDlg(QWidget* parent, Qt::WindowFlags fl)
     coordsInputValue[GEOM_POINT_EDGE] = new QVector3D(0, 0, 0);
     coordsInputValue[GEOM_POINT_SURF] = new QVector3D(0, 0, 0);
 
-    GroupOnCurve = new DlgRef_2Sel1Spin(centralWidget());
+    GroupOnCurve = new MyDlgRef_2Sel1Spin(centralWidget());
     GroupOnCurve->GroupBox1->setTitle(tr("GEOM_POINT_ON_EDGE"));
     GroupOnCurve->TextLabel1->setText(tr("GEOM_EDGE"));
     GroupOnCurve->TextLabel2->setText(tr("GEOM_START_POINT"));
@@ -144,13 +144,13 @@ MyBasicGUI_PointDlg::MyBasicGUI_PointDlg(QWidget* parent, Qt::WindowFlags fl)
     paramInputValue[PARAM_VALUE] = 0.5;
     paramInputValue[LENGTH_VALUE] = 0.5;
 
-    GroupOnSurface = new DlgRef_1Sel2Spin(centralWidget());
+    GroupOnSurface = new MyDlgRef_1Sel2Spin(centralWidget());
     GroupOnSurface->GroupBox1->setTitle(tr("GEOM_POINT_ON_FACE"));
     GroupOnSurface->TextLabel1->setText(tr("GEOM_FACE"));
     GroupOnSurface->TextLabel2->setText(tr("GEOM_UPARAMETER"));
     GroupOnSurface->TextLabel3->setText(tr("GEOM_VPARAMETER"));
 
-    GroupRefPoint = new DlgRef_1Sel3Spin(centralWidget());
+    GroupRefPoint = new MyDlgRef_1Sel3Spin(centralWidget());
     GroupRefPoint->GroupBox1->setTitle(tr("GEOM_REF_POINT"));
     GroupRefPoint->TextLabel1->setText(tr("GEOM_POINT"));
     GroupRefPoint->TextLabel2->setText(tr("GEOM_DX"));
@@ -170,7 +170,7 @@ MyBasicGUI_PointDlg::MyBasicGUI_PointDlg(QWidget* parent, Qt::WindowFlags fl)
     action_line2_edge = myBtnPopup2->addAction(ico_line, tr("GEOM_EDGE"));
     action_line2_wire = myBtnPopup2->addAction(ico_wire, tr("GEOM_WIRE"));
 
-    GroupLineIntersection = new DlgRef_2Sel(centralWidget());
+    GroupLineIntersection = new MyDlgRef_2Sel(centralWidget());
     GroupLineIntersection->GroupBox1->setTitle(tr("GEOM_LINE_INTERSECTION"));
     GroupLineIntersection->TextLabel1->setText(tr("GEOM_LINE1"));
     GroupLineIntersection->TextLabel2->setText(tr("GEOM_LINE2"));
@@ -671,9 +671,9 @@ void MyBasicGUI_PointDlg::onUpdateResults(const QString& data)
         return;
     }
     gp_Pnt pnt = BRep_Tool::Pnt(vertex);
-    myX->setText(DlgRef::PrintDoubleValue(pnt.X(), 6));
-    myY->setText(DlgRef::PrintDoubleValue(pnt.Y(), 6));
-    myZ->setText(DlgRef::PrintDoubleValue(pnt.Z(), 6));
+    myX->setText(MyDlgRef::PrintDoubleValue(pnt.X(), 6));
+    myY->setText(MyDlgRef::PrintDoubleValue(pnt.Y(), 6));
+    myZ->setText(MyDlgRef::PrintDoubleValue(pnt.Z(), 6));
 }
 
 TopoDS_Vertex MyBasicGUI_PointDlg::computeGeomVertex(bool preview)
diff --git a/src/HEXABLOCKGUI/MyBasicGUI_PointDlg.hxx b/src/HEXABLOCKGUI/MyBasicGUI_PointDlg.hxx
index 6278d9c..1698266 100755
--- a/src/HEXABLOCKGUI/MyBasicGUI_PointDlg.hxx
+++ b/src/HEXABLOCKGUI/MyBasicGUI_PointDlg.hxx
@@ -21,16 +21,16 @@
 #ifndef MYBASICGUI_POINTDLG_H
 #define MYBASICGUI_POINTDLG_H
 
-#include "HEXABLOCKGUI_Export.hxx"
+#include "HEXABLOCKGUI_Export.hxx"
 
 #include "MyGEOMBase_Skeleton.hxx"
 #include <QMap>
 
-class DlgRef_2Sel1Spin;
-class DlgRef_3Spin;
-class DlgRef_2Sel;
-class DlgRef_1Sel3Spin;
-class DlgRef_1Sel2Spin;
+class MyDlgRef_2Sel1Spin;
+class MyDlgRef_3Spin;
+class MyDlgRef_2Sel;
+class MyDlgRef_1Sel3Spin;
+class MyDlgRef_1Sel2Spin;
 
 class QLineEdit;
 class QGroupBox;
@@ -82,11 +82,11 @@ private:
 private:
   bool                               myBusy;
 
-  DlgRef_3Spin*                      GroupXYZ;
-  DlgRef_1Sel3Spin*                  GroupRefPoint;
-  DlgRef_2Sel1Spin*                  GroupOnCurve;
-  DlgRef_2Sel*                       GroupLineIntersection;
-  DlgRef_1Sel2Spin*                  GroupOnSurface;
+  MyDlgRef_3Spin*                      GroupXYZ;
+  MyDlgRef_1Sel3Spin*                  GroupRefPoint;
+  MyDlgRef_2Sel1Spin*                  GroupOnCurve;
+  MyDlgRef_2Sel*                       GroupLineIntersection;
+  MyDlgRef_1Sel2Spin*                  GroupOnSurface;
 
   QGroupBox*                         myCoordGrp;
   QLineEdit*                         myX;
diff --git a/src/HEXABLOCKGUI/MyDlgRef/DlgRef.cxx b/src/HEXABLOCKGUI/MyDlgRef/DlgRef.cxx
deleted file mode 100755
index db73412..0000000
--- a/src/HEXABLOCKGUI/MyDlgRef/DlgRef.cxx
+++ /dev/null
@@ -1,853 +0,0 @@
-// 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
-//
-
-
-#include "DlgRef.hxx"
-
-//////////////////////////////////////////
-// DlgRef_1List1Spin1Btn
-//////////////////////////////////////////
-
-DlgRef_1List1Spin1Btn::DlgRef_1List1Spin1Btn( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_1List1Spin1Btn::~DlgRef_1List1Spin1Btn()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_1Sel1Check1List
-//////////////////////////////////////////
-
-DlgRef_1Sel1Check1List::DlgRef_1Sel1Check1List( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_1Sel1Check1List::~DlgRef_1Sel1Check1List()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_1Sel1Check1Sel
-//////////////////////////////////////////
-
-DlgRef_1Sel1Check1Sel::DlgRef_1Sel1Check1Sel( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_1Sel1Check1Sel::~DlgRef_1Sel1Check1Sel()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_1Sel1Check
-//////////////////////////////////////////
-
-DlgRef_1Sel1Check::DlgRef_1Sel1Check( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_1Sel1Check::~DlgRef_1Sel1Check()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_1Sel1List1Check3Btn
-//////////////////////////////////////////
-
-DlgRef_1Sel1List1Check3Btn::DlgRef_1Sel1List1Check3Btn( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_1Sel1List1Check3Btn::~DlgRef_1Sel1List1Check3Btn()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_1Sel1Spin1Check
-//////////////////////////////////////////
-
-DlgRef_1Sel1Spin1Check::DlgRef_1Sel1Spin1Check( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_1Sel1Spin1Check::~DlgRef_1Sel1Spin1Check()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_1Sel1Spin
-//////////////////////////////////////////
-
-DlgRef_1Sel1Spin::DlgRef_1Sel1Spin( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_1Sel1Spin::~DlgRef_1Sel1Spin()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_1Sel2Spin1View1Check
-//////////////////////////////////////////
-
-DlgRef_1Sel2Spin1View1Check::DlgRef_1Sel2Spin1View1Check( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_1Sel2Spin1View1Check::~DlgRef_1Sel2Spin1View1Check()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_1Sel2Spin
-//////////////////////////////////////////
-
-DlgRef_1Sel2Spin::DlgRef_1Sel2Spin( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_1Sel2Spin::~DlgRef_1Sel2Spin()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_1Sel3Check
-//////////////////////////////////////////
-
-DlgRef_1Sel3Check::DlgRef_1Sel3Check( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_1Sel3Check::~DlgRef_1Sel3Check()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_1Sel3Spin
-//////////////////////////////////////////
-
-DlgRef_1Sel3Spin::DlgRef_1Sel3Spin( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_1Sel3Spin::~DlgRef_1Sel3Spin()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_1Sel3Spin1Check
-//////////////////////////////////////////
-
-DlgRef_1Sel3Spin1Check::DlgRef_1Sel3Spin1Check( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_1Sel3Spin1Check::~DlgRef_1Sel3Spin1Check()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_1Sel4Spin2Check
-//////////////////////////////////////////
-
-DlgRef_1Sel4Spin2Check::DlgRef_1Sel4Spin2Check( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_1Sel4Spin2Check::~DlgRef_1Sel4Spin2Check()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_1Sel4Spin
-//////////////////////////////////////////
-
-DlgRef_1Sel4Spin::DlgRef_1Sel4Spin( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_1Sel4Spin::~DlgRef_1Sel4Spin()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_1Sel5Spin1Check
-//////////////////////////////////////////
-
-DlgRef_1Sel5Spin1Check::DlgRef_1Sel5Spin1Check( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_1Sel5Spin1Check::~DlgRef_1Sel5Spin1Check()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_1Sel5Spin
-//////////////////////////////////////////
-
-DlgRef_1Sel5Spin::DlgRef_1Sel5Spin( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_1Sel5Spin::~DlgRef_1Sel5Spin()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_1Spin
-//////////////////////////////////////////
-
-DlgRef_1Spin::DlgRef_1Spin( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_1Spin::~DlgRef_1Spin()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_1Sel
-//////////////////////////////////////////
-
-DlgRef_1Sel::DlgRef_1Sel( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_1Sel::~DlgRef_1Sel()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_1SelExt
-//////////////////////////////////////////
-
-DlgRef_1SelExt::DlgRef_1SelExt( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_1SelExt::~DlgRef_1SelExt()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_2Sel1List1Check
-//////////////////////////////////////////
-
-DlgRef_2Sel1List1Check::DlgRef_2Sel1List1Check( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_2Sel1List1Check::~DlgRef_2Sel1List1Check()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_2Sel1List2Check
-//////////////////////////////////////////
-
-DlgRef_2Sel1List2Check::DlgRef_2Sel1List2Check( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_2Sel1List2Check::~DlgRef_2Sel1List2Check()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_2Sel1List
-//////////////////////////////////////////
-
-DlgRef_2Sel1List::DlgRef_2Sel1List( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_2Sel1List::~DlgRef_2Sel1List()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_2Sel1Spin2Check
-//////////////////////////////////////////
-
-DlgRef_2Sel1Spin2Check::DlgRef_2Sel1Spin2Check( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_2Sel1Spin2Check::~DlgRef_2Sel1Spin2Check()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_2Sel1Spin
-//////////////////////////////////////////
-
-DlgRef_2Sel1Spin::DlgRef_2Sel1Spin( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_2Sel1Spin::~DlgRef_2Sel1Spin()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_2Sel1SpinInt
-//////////////////////////////////////////
-
-DlgRef_2Sel1SpinInt::DlgRef_2Sel1SpinInt( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_2Sel1SpinInt::~DlgRef_2Sel1SpinInt()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_2Sel2List
-//////////////////////////////////////////
-
-DlgRef_2Sel2List::DlgRef_2Sel2List( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_2Sel2List::~DlgRef_2Sel2List()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_2Sel2Spin1Check
-//////////////////////////////////////////
-
-DlgRef_2Sel2Spin1Check::DlgRef_2Sel2Spin1Check( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_2Sel2Spin1Check::~DlgRef_2Sel2Spin1Check()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_2Sel2Spin3Check
-//////////////////////////////////////////
-
-DlgRef_2Sel2Spin3Check::DlgRef_2Sel2Spin3Check( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_2Sel2Spin3Check::~DlgRef_2Sel2Spin3Check()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_2Sel2Spin
-//////////////////////////////////////////
-
-DlgRef_2Sel2Spin::DlgRef_2Sel2Spin( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_2Sel2Spin::~DlgRef_2Sel2Spin()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_2Sel3Spin2Rb
-//////////////////////////////////////////
-
-DlgRef_2Sel3Spin2Rb::DlgRef_2Sel3Spin2Rb( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_2Sel3Spin2Rb::~DlgRef_2Sel3Spin2Rb()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_2Sel3Spin
-//////////////////////////////////////////
-
-DlgRef_2Sel3Spin::DlgRef_2Sel3Spin( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_2Sel3Spin::~DlgRef_2Sel3Spin()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_2Sel4Spin1Check
-//////////////////////////////////////////
-
-DlgRef_2Sel4Spin1Check::DlgRef_2Sel4Spin1Check( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_2Sel4Spin1Check::~DlgRef_2Sel4Spin1Check()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_2Sel
-//////////////////////////////////////////
-
-DlgRef_2Sel::DlgRef_2Sel( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_2Sel::~DlgRef_2Sel()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_2SelExt
-//////////////////////////////////////////
-
-DlgRef_2SelExt::DlgRef_2SelExt( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_2SelExt::~DlgRef_2SelExt()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_2Spin
-//////////////////////////////////////////
-
-DlgRef_2Spin::DlgRef_2Spin( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_2Spin::~DlgRef_2Spin()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_3Check
-//////////////////////////////////////////
-
-DlgRef_3Check::DlgRef_3Check( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_3Check::~DlgRef_3Check()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_3Radio
-//////////////////////////////////////////
-
-DlgRef_3Radio::DlgRef_3Radio( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_3Radio::~DlgRef_3Radio()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_3Radio1Sel1Spin
-//////////////////////////////////////////
-
-DlgRef_3Radio1Sel1Spin::DlgRef_3Radio1Sel1Spin( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_3Radio1Sel1Spin::~DlgRef_3Radio1Sel1Spin()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_3Sel1Check
-//////////////////////////////////////////
-
-DlgRef_3Sel1Check::DlgRef_3Sel1Check( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_3Sel1Check::~DlgRef_3Sel1Check()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_3Sel1Spin
-//////////////////////////////////////////
-
-DlgRef_3Sel1Spin::DlgRef_3Sel1Spin( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_3Sel1Spin::~DlgRef_3Sel1Spin()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_3Sel2Spin
-//////////////////////////////////////////
-
-DlgRef_3Sel2Spin::DlgRef_3Sel2Spin( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_3Sel2Spin::~DlgRef_3Sel2Spin()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_3Sel3Spin1Check
-//////////////////////////////////////////
-
-DlgRef_3Sel3Spin1Check::DlgRef_3Sel3Spin1Check( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_3Sel3Spin1Check::~DlgRef_3Sel3Spin1Check()
-{
-}
-
-void DlgRef_3Sel3Spin1Check::ShowRows( int fromRow, int toRow, bool toShow )
-{
-  const int maxRows = 7;
-  
-  if ( toRow >= fromRow && fromRow >= 0 && toRow <= maxRows ) {
-    int c = gridLayout1->count();
-    for ( int i = 0; i < c; i++ ) {
-      QWidget* w = gridLayout1->itemAt( i )->widget();
-      int row, col, rowspan, colspan;
-      gridLayout1->getItemPosition( i, &row, &col, &rowspan, &colspan );
-      if ( w && row >= fromRow && row <= toRow )
-        w->setVisible( toShow );
-    }
-  }
-}
-
-//////////////////////////////////////////
-// DlgRef_3Sel3Spin2Check
-//////////////////////////////////////////
-
-DlgRef_3Sel3Spin2Check::DlgRef_3Sel3Spin2Check( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_3Sel3Spin2Check::~DlgRef_3Sel3Spin2Check()
-{
-}
-
-void DlgRef_3Sel3Spin2Check::ShowRows( int fromRow, int toRow, bool toShow )
-{
-  const int maxRows = 8;
-  
-  if ( toRow >= fromRow && fromRow >= 0 && toRow <= maxRows ) {
-    int c = gridLayout1->count();
-    for ( int i = 0; i < c; i++ ) {
-      QWidget* w = gridLayout1->itemAt( i )->widget();
-      int row, col, rowspan, colspan;
-      gridLayout1->getItemPosition( i, &row, &col, &rowspan, &colspan );
-      if ( w && row >= fromRow && row <= toRow )
-        w->setVisible( toShow );
-    }
-  }
-}
-
-//////////////////////////////////////////
-// DlgRef_3Sel4Spin2Check
-//////////////////////////////////////////
-
-DlgRef_3Sel4Spin2Check::DlgRef_3Sel4Spin2Check( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_3Sel4Spin2Check::~DlgRef_3Sel4Spin2Check()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_3Sel
-//////////////////////////////////////////
-
-DlgRef_3Sel::DlgRef_3Sel( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_3Sel::~DlgRef_3Sel()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_3Spin1Check
-//////////////////////////////////////////
-
-DlgRef_3Spin1Check::DlgRef_3Spin1Check( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_3Spin1Check::~DlgRef_3Spin1Check()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_3Spin
-//////////////////////////////////////////
-
-DlgRef_3Spin::DlgRef_3Spin( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_3Spin::~DlgRef_3Spin()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_4Sel1List1Check
-//////////////////////////////////////////
-
-DlgRef_4Sel1List1Check::DlgRef_4Sel1List1Check( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_4Sel1List1Check::~DlgRef_4Sel1List1Check()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_4Sel1List
-//////////////////////////////////////////
-
-DlgRef_4Sel1List::DlgRef_4Sel1List( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_4Sel1List::~DlgRef_4Sel1List()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_4Sel1Spin2Check
-//////////////////////////////////////////
-
-DlgRef_4Sel1Spin2Check::DlgRef_4Sel1Spin2Check( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_4Sel1Spin2Check::~DlgRef_4Sel1Spin2Check()
-{
-}
-
-void DlgRef_4Sel1Spin2Check::ShowRows( int fromRow, int toRow, bool toShow )
-{
-  const int maxRows = 6;
-  
-  if ( toRow >= fromRow && fromRow >= 0 && toRow <= maxRows ) {
-    int c = gridLayout1->count();
-    for ( int i = 0; i < c; i++ ) {
-      QWidget* w = gridLayout1->itemAt( i )->widget();
-      int row, col, rowspan, colspan;
-      gridLayout1->getItemPosition( i, &row, &col, &rowspan, &colspan );
-      if ( w && row >= fromRow && row <= toRow )
-        w->setVisible( toShow );
-    }
-  }
-}
-
-//////////////////////////////////////////
-// DlgRef_4Sel1Spin3Check
-//////////////////////////////////////////
-
-DlgRef_4Sel1Spin3Check::DlgRef_4Sel1Spin3Check( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_4Sel1Spin3Check::~DlgRef_4Sel1Spin3Check()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_6Sel
-//////////////////////////////////////////
-
-DlgRef_6Sel::DlgRef_6Sel( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_6Sel::~DlgRef_6Sel()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_Skeleton
-//////////////////////////////////////////
-
-DlgRef_Skeleton::DlgRef_Skeleton( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_Skeleton::~DlgRef_Skeleton()
-{
-}
-
-//////////////////////////////////////////
-// Utility functions
-//////////////////////////////////////////
-
-QString DlgRef::PrintDoubleValue( double theValue, int thePrecision )
-{
-  const double prec = 1e-12;
-  
-  if ( qAbs(theValue) < prec )
-    return "0";
-
-  QString aRes = QLocale().toString( theValue, thePrecision >= 0 ? 'f' : 'g', qAbs( thePrecision ) );
-
-  if ( prec > 0 ) {
-    int p = 0;
-    while ( p < thePrecision ) {
-      QString aRes = QLocale().toString( theValue, thePrecision >= 0 ? 'f' : 'g', qAbs( p++ ) );
-      double v = aRes.toDouble();
-      double err = qAbs( theValue - v );
-      if ( err > 0 && err <= prec )
-        break;
-    }
-  }
-
-  // remove trailing zeroes
-
-  QRegExp expre( QString( "(%1|%2)[+-]?[0-9]+$" ).arg( QLocale().exponential().toLower(), 
-						       QLocale().exponential().toUpper() ) );
-
-  int idx = aRes.indexOf( expre );
-  QString aResExp = "";
-  if ( idx >= 0 ) {
-    aResExp = aRes.mid( idx );
-    aRes = aRes.left( idx );
-  }
-
-  if ( aRes.contains( QLocale().decimalPoint() ) )
-    aRes.remove( QRegExp( QString( "(\\%1|0)0*$" ).arg( QLocale().decimalPoint() ) ) );
-
-  return aRes == "-0" ? QString( "0" ) : aRes + aResExp;
-}
diff --git a/src/HEXABLOCKGUI/MyDlgRef/DlgRef.hxx b/src/HEXABLOCKGUI/MyDlgRef/DlgRef.hxx
deleted file mode 100644
index 7b3309c..0000000
--- a/src/HEXABLOCKGUI/MyDlgRef/DlgRef.hxx
+++ /dev/null
@@ -1,899 +0,0 @@
-// 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 GEOM_DLGREF_HXX
-#define GEOM_DLGREF_HXX
-
-#if defined WIN32
-#  if defined MYDLGREF_EXPORTS || defined MyDlgRef_EXPORTS
-#    define MYDLGREF_EXPORT __declspec( dllexport )
-#  else
-#    define MYDLGREF_EXPORT __declspec( dllimport )
-#  endif
-#else
-#  define MYMYDLGREF_EXPORT
-#endif
-
-//////////////////////////////////////////
-// DlgRef_1List1Spin1Btn
-//////////////////////////////////////////
-
-#include "ui_DlgRef_1List1Spin1Btn_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_1List1Spin1Btn : public QWidget, 
-                                            public Ui::DlgRef_1List1Spin1Btn_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_1List1Spin1Btn( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_1List1Spin1Btn();
-};
-
-//////////////////////////////////////////
-// DlgRef_1Sel1Check1List
-//////////////////////////////////////////
-
-#include "ui_DlgRef_1Sel1Check1List_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_1Sel1Check1List : public QWidget, 
-                                             public Ui::DlgRef_1Sel1Check1List_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_1Sel1Check1List( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_1Sel1Check1List();
-};
-
-//////////////////////////////////////////
-// DlgRef_1Sel1Check1Sel
-//////////////////////////////////////////
-
-#include "ui_DlgRef_1Sel1Check1Sel_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_1Sel1Check1Sel : public QWidget, 
-                                            public Ui::DlgRef_1Sel1Check1Sel_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_1Sel1Check1Sel( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_1Sel1Check1Sel();
-};
-
-//////////////////////////////////////////
-// DlgRef_1Sel1Check
-//////////////////////////////////////////
-
-#include "ui_DlgRef_1Sel1Check_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_1Sel1Check : public QWidget, 
-                                        public Ui::DlgRef_1Sel1Check_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_1Sel1Check( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_1Sel1Check();
-};
-
-//////////////////////////////////////////
-// DlgRef_1Sel1List1Check3Btn
-//////////////////////////////////////////
-
-#include "ui_DlgRef_1Sel1List1Check3Btn_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_1Sel1List1Check3Btn : public QWidget, 
-                                                 public Ui::DlgRef_1Sel1List1Check3Btn_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_1Sel1List1Check3Btn( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_1Sel1List1Check3Btn();
-};
-
-//////////////////////////////////////////
-// DlgRef_1Sel1Spin1Check
-//////////////////////////////////////////
-
-#include "ui_DlgRef_1Sel1Spin1Check_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_1Sel1Spin1Check : public QWidget, 
-                                             public Ui::DlgRef_1Sel1Spin1Check_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_1Sel1Spin1Check( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_1Sel1Spin1Check();
-};
-
-//////////////////////////////////////////
-// DlgRef_1Sel1Spin
-//////////////////////////////////////////
-
-#include "ui_DlgRef_1Sel1Spin_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_1Sel1Spin : public QWidget, 
-                                       public Ui::DlgRef_1Sel1Spin_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_1Sel1Spin( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_1Sel1Spin();
-};
-
-//////////////////////////////////////////
-// DlgRef_1Sel2Spin1View1Check
-//////////////////////////////////////////
-
-#include "ui_DlgRef_1Sel2Spin1View1Check_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_1Sel2Spin1View1Check : public QWidget, 
-                                                  public Ui::DlgRef_1Sel2Spin1View1Check_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_1Sel2Spin1View1Check( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_1Sel2Spin1View1Check();
-};
-
-//////////////////////////////////////////
-// DlgRef_1Sel2Spin
-//////////////////////////////////////////
-
-#include "ui_DlgRef_1Sel2Spin_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_1Sel2Spin : public QWidget, 
-                                       public Ui::DlgRef_1Sel2Spin_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_1Sel2Spin( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_1Sel2Spin();
-};
-
-//////////////////////////////////////////
-// DlgRef_1Sel3Check
-//////////////////////////////////////////
-
-#include "ui_DlgRef_1Sel3Check_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_1Sel3Check : public QWidget, 
-                                        public Ui::DlgRef_1Sel3Check_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_1Sel3Check( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_1Sel3Check();
-};
-
-
-
-//////////////////////////////////////////
-// DlgRef_1Sel3Spin
-//////////////////////////////////////////
-
-#include "ui_DlgRef_1Sel3Spin_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_1Sel3Spin : public QWidget, 
-                                       public Ui::DlgRef_1Sel3Spin_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_1Sel3Spin( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_1Sel3Spin();
-};
-
-//////////////////////////////////////////
-// DlgRef_1Sel3Spin1Check
-//////////////////////////////////////////
-
-#include "ui_DlgRef_1Sel3Spin1Check_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_1Sel3Spin1Check : public QWidget, 
-                                             public Ui::DlgRef_1Sel3Spin1Check_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_1Sel3Spin1Check( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_1Sel3Spin1Check();
-};
-
-//////////////////////////////////////////
-// DlgRef_1Sel4Spin2Check
-//////////////////////////////////////////
-
-#include "ui_DlgRef_1Sel4Spin2Check_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_1Sel4Spin2Check : public QWidget, 
-                                             public Ui::DlgRef_1Sel4Spin2Check_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_1Sel4Spin2Check( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_1Sel4Spin2Check();
-};
-
-//////////////////////////////////////////
-// DlgRef_1Sel4Spin
-//////////////////////////////////////////
-
-#include "ui_DlgRef_1Sel4Spin_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_1Sel4Spin : public QWidget, 
-                                       public Ui::DlgRef_1Sel4Spin_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_1Sel4Spin( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_1Sel4Spin();
-};
-
-//////////////////////////////////////////
-// DlgRef_1Sel5Spin1Check
-//////////////////////////////////////////
-
-#include "ui_DlgRef_1Sel5Spin1Check_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_1Sel5Spin1Check : public QWidget, 
-                                             public Ui::DlgRef_1Sel5Spin1Check_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_1Sel5Spin1Check( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_1Sel5Spin1Check();
-};
-
-//////////////////////////////////////////
-// DlgRef_1Sel5Spin
-//////////////////////////////////////////
-
-#include "ui_DlgRef_1Sel5Spin_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_1Sel5Spin : public QWidget, 
-                                       public Ui::DlgRef_1Sel5Spin_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_1Sel5Spin( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_1Sel5Spin();
-};
-
-//////////////////////////////////////////
-// DlgRef_1Spin
-//////////////////////////////////////////
-
-#include "ui_DlgRef_1Spin_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_1Spin : public QWidget, 
-                                   public Ui::DlgRef_1Spin_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_1Spin( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_1Spin();
-};
-
-//////////////////////////////////////////
-// DlgRef_1Sel
-//////////////////////////////////////////
-
-#include "ui_DlgRef_1Sel_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_1Sel : public QWidget, 
-                                   public Ui::DlgRef_1Sel_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_1Sel( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_1Sel();
-};
-
-//////////////////////////////////////////
-// DlgRef_1SelExt
-//////////////////////////////////////////
-
-#include "ui_DlgRef_1SelExt_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_1SelExt : public QWidget, 
-                                     public Ui::DlgRef_1SelExt_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_1SelExt( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_1SelExt();
-};
-
-//////////////////////////////////////////
-// DlgRef_2Sel1List1Check
-//////////////////////////////////////////
-
-#include "ui_DlgRef_2Sel1List1Check_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_2Sel1List1Check : public QWidget, 
-                                             public Ui::DlgRef_2Sel1List1Check_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_2Sel1List1Check( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_2Sel1List1Check();
-};
-
-//////////////////////////////////////////
-// DlgRef_2Sel1List2Check
-//////////////////////////////////////////
-
-#include "ui_DlgRef_2Sel1List2Check_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_2Sel1List2Check : public QWidget, 
-                                             public Ui::DlgRef_2Sel1List2Check_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_2Sel1List2Check( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_2Sel1List2Check();
-};
-
-//////////////////////////////////////////
-// DlgRef_2Sel1List
-//////////////////////////////////////////
-
-#include "ui_DlgRef_2Sel1List_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_2Sel1List : public QWidget, 
-                                       public Ui::DlgRef_2Sel1List_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_2Sel1List( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_2Sel1List();
-};
-
-//////////////////////////////////////////
-// DlgRef_2Sel1Spin2Check
-//////////////////////////////////////////
-
-#include "ui_DlgRef_2Sel1Spin2Check_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_2Sel1Spin2Check : public QWidget, 
-                                             public Ui::DlgRef_2Sel1Spin2Check_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_2Sel1Spin2Check( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_2Sel1Spin2Check();
-};
-
-//////////////////////////////////////////
-// DlgRef_2Sel1Spin
-//////////////////////////////////////////
-
-#include "ui_DlgRef_2Sel1Spin_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_2Sel1Spin : public QWidget, 
-                                       public Ui::DlgRef_2Sel1Spin_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_2Sel1Spin( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_2Sel1Spin();
-};
-
-//////////////////////////////////////////
-// DlgRef_2Sel1SpinInt
-//////////////////////////////////////////
-
-#include "ui_DlgRef_2Sel1SpinInt_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_2Sel1SpinInt : public QWidget, 
-                                          public Ui::DlgRef_2Sel1SpinInt_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_2Sel1SpinInt( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_2Sel1SpinInt();
-};
-
-//////////////////////////////////////////
-// DlgRef_2Sel2List
-//////////////////////////////////////////
-
-#include "ui_DlgRef_2Sel2List_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_2Sel2List : public QWidget, 
-                                       public Ui::DlgRef_2Sel2List_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_2Sel2List( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_2Sel2List();
-};
-
-//////////////////////////////////////////
-// DlgRef_2Sel2Spin1Check
-//////////////////////////////////////////
-
-#include "ui_DlgRef_2Sel2Spin1Check_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_2Sel2Spin1Check : public QWidget, 
-                                             public Ui::DlgRef_2Sel2Spin1Check_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_2Sel2Spin1Check( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_2Sel2Spin1Check();
-};
-
-//////////////////////////////////////////
-// DlgRef_2Sel2Spin3Check
-//////////////////////////////////////////
-
-#include "ui_DlgRef_2Sel2Spin3Check_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_2Sel2Spin3Check : public QWidget, 
-                                             public Ui::DlgRef_2Sel2Spin3Check_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_2Sel2Spin3Check( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_2Sel2Spin3Check();
-};
-
-//////////////////////////////////////////
-// DlgRef_2Sel2Spin
-//////////////////////////////////////////
-
-#include "ui_DlgRef_2Sel2Spin_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_2Sel2Spin : public QWidget, 
-                                       public Ui::DlgRef_2Sel2Spin_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_2Sel2Spin( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_2Sel2Spin();
-};
-
-//////////////////////////////////////////
-// DlgRef_2Sel3Spin2Rb
-//////////////////////////////////////////
-
-#include "ui_DlgRef_2Sel3Spin2Rb_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_2Sel3Spin2Rb : public QWidget, 
-                                          public Ui::DlgRef_2Sel3Spin2Rb_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_2Sel3Spin2Rb( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_2Sel3Spin2Rb();
-};
-
-//////////////////////////////////////////
-// DlgRef_2Sel3Spin
-//////////////////////////////////////////
-
-#include "ui_DlgRef_2Sel3Spin_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_2Sel3Spin : public QWidget, 
-                                       public Ui::DlgRef_2Sel3Spin_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_2Sel3Spin( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_2Sel3Spin();
-};
-
-//////////////////////////////////////////
-// DlgRef_2Sel4Spin1Check
-//////////////////////////////////////////
-
-#include "ui_DlgRef_2Sel4Spin1Check_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_2Sel4Spin1Check : public QWidget, 
-                                             public Ui::DlgRef_2Sel4Spin1Check_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_2Sel4Spin1Check( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_2Sel4Spin1Check();
-};
-
-//////////////////////////////////////////
-// DlgRef_2Sel
-//////////////////////////////////////////
-
-#include "ui_DlgRef_2Sel_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_2Sel : public QWidget, 
-                                  public Ui::DlgRef_2Sel_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_2Sel( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_2Sel();
-};
-
-//////////////////////////////////////////
-// DlgRef_2SelExt
-//////////////////////////////////////////
-
-#include "ui_DlgRef_2SelExt_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_2SelExt : public QWidget, 
-                                     public Ui::DlgRef_2SelExt_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_2SelExt( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_2SelExt();
-};
-
-//////////////////////////////////////////
-// DlgRef_2Spin
-//////////////////////////////////////////
-
-#include "ui_DlgRef_2Spin_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_2Spin : public QWidget, 
-                                   public Ui::DlgRef_2Spin_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_2Spin( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_2Spin();
-};
-
-//////////////////////////////////////////
-// DlgRef_3Check
-//////////////////////////////////////////
-
-#include "ui_DlgRef_3Check_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_3Check : public QWidget, 
-                                    public Ui::DlgRef_3Check_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_3Check( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_3Check();
-};
-
-//////////////////////////////////////////
-// DlgRef_1Sel3Radio
-//////////////////////////////////////////
-
-#include "ui_DlgRef_3Radio_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_3Radio : public QWidget, 
-                                    public Ui::DlgRef_3Radio_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_3Radio( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_3Radio();
-};
-
-//////////////////////////////////////////
-// DlgRef_1Sel3Radio1Sel1Spin
-//////////////////////////////////////////
-
-#include "ui_DlgRef_3Radio1Sel1Spin_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_3Radio1Sel1Spin : public QWidget, 
-                                             public Ui::DlgRef_3Radio1Sel1Spin_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_3Radio1Sel1Spin( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_3Radio1Sel1Spin();
-};
-
-//////////////////////////////////////////
-// DlgRef_3Sel1Check
-//////////////////////////////////////////
-
-#include "ui_DlgRef_3Sel1Check_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_3Sel1Check : public QWidget, 
-                                        public Ui::DlgRef_3Sel1Check_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_3Sel1Check( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_3Sel1Check();
-};
-
-//////////////////////////////////////////
-// DlgRef_3Sel1Spin
-//////////////////////////////////////////
-
-#include "ui_DlgRef_3Sel1Spin_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_3Sel1Spin : public QWidget, 
-                                       public Ui::DlgRef_3Sel1Spin_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_3Sel1Spin( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_3Sel1Spin();
-};
-
-//////////////////////////////////////////
-// DlgRef_3Sel2Spin
-//////////////////////////////////////////
-
-#include "ui_DlgRef_3Sel2Spin_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_3Sel2Spin : public QWidget, 
-                                       public Ui::DlgRef_3Sel2Spin_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_3Sel2Spin( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_3Sel2Spin();
-};
-
-//////////////////////////////////////////
-// DlgRef_3Sel3Spin1Check
-//////////////////////////////////////////
-
-#include "ui_DlgRef_3Sel3Spin1Check_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_3Sel3Spin1Check : public QWidget, 
-                                             public Ui::DlgRef_3Sel3Spin1Check_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_3Sel3Spin1Check( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_3Sel3Spin1Check();
-
-  void ShowRows( int, int, bool = true );
-};
-
-//////////////////////////////////////////
-// DlgRef_3Sel3Spin2Check
-//////////////////////////////////////////
-
-#include "ui_DlgRef_3Sel3Spin2Check_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_3Sel3Spin2Check : public QWidget, 
-                                             public Ui::DlgRef_3Sel3Spin2Check_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_3Sel3Spin2Check( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_3Sel3Spin2Check();
-
-  void ShowRows( int, int, bool = true );
-};
-
-//////////////////////////////////////////
-// DlgRef_3Sel4Spin2Check
-//////////////////////////////////////////
-
-#include "ui_DlgRef_3Sel4Spin2Check_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_3Sel4Spin2Check : public QWidget, 
-                                             public Ui::DlgRef_3Sel4Spin2Check_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_3Sel4Spin2Check( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_3Sel4Spin2Check();
-};
-
-//////////////////////////////////////////
-// DlgRef_3Sel
-//////////////////////////////////////////
-
-#include "ui_DlgRef_3Sel_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_3Sel : public QWidget, 
-                                  public Ui::DlgRef_3Sel_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_3Sel( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_3Sel();
-};
-
-//////////////////////////////////////////
-// DlgRef_3Spin1Check
-//////////////////////////////////////////
-
-#include "ui_DlgRef_3Spin1Check_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_3Spin1Check : public QWidget, 
-                                         public Ui::DlgRef_3Spin1Check_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_3Spin1Check( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_3Spin1Check();
-};
-
-//////////////////////////////////////////
-// DlgRef_3Spin
-//////////////////////////////////////////
-
-#include "ui_DlgRef_3Spin_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_3Spin : public QWidget, 
-                                   public Ui::DlgRef_3Spin_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_3Spin( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_3Spin();
-};
-
-//////////////////////////////////////////
-// DlgRef_4Sel1List1Check
-//////////////////////////////////////////
-
-#include "ui_DlgRef_4Sel1List1Check_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_4Sel1List1Check : public QWidget, 
-                                             public Ui::DlgRef_4Sel1List1Check_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_4Sel1List1Check( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_4Sel1List1Check();
-};
-
-//////////////////////////////////////////
-// DlgRef_4Sel1List
-//////////////////////////////////////////
-
-#include "ui_DlgRef_4Sel1List_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_4Sel1List : public QWidget, 
-                                       public Ui::DlgRef_4Sel1List_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_4Sel1List( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_4Sel1List();
-};
-
-//////////////////////////////////////////
-// DlgRef_4Sel1Spin2Check
-//////////////////////////////////////////
-
-#include "ui_DlgRef_4Sel1Spin2Check_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_4Sel1Spin2Check : public QWidget, 
-                                             public Ui::DlgRef_4Sel1Spin2Check_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_4Sel1Spin2Check( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_4Sel1Spin2Check();
-
-  void ShowRows( int, int, bool = true );
-};
-
-//////////////////////////////////////////
-// DlgRef_4Sel1Spin2Check
-//////////////////////////////////////////
-
-#include "ui_DlgRef_4Sel1Spin3Check_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_4Sel1Spin3Check : public QWidget, 
-                                             public Ui::DlgRef_4Sel1Spin3Check_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_4Sel1Spin3Check( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_4Sel1Spin3Check();
-};
-
-//////////////////////////////////////////
-// DlgRef_6Sel
-//////////////////////////////////////////
-
-#include "ui_DlgRef_6Sel_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_6Sel : public QWidget, 
-                                  public Ui::DlgRef_6Sel_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_6Sel( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_6Sel();
-};
-
-//////////////////////////////////////////
-// DlgRef_Skeleton
-//////////////////////////////////////////
-
-#include "ui_DlgRef_Skeleton_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_Skeleton : public QWidget, 
-                                      public Ui::DlgRef_Skeleton_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_Skeleton( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_Skeleton();
-};
-
-//////////////////////////////////////////
-// Utility functions
-//////////////////////////////////////////
-
-namespace DlgRef
-{
-  MYDLGREF_EXPORT QString PrintDoubleValue( double, int = 16 );
-};
-
-#endif // GEOM_DLGREF_H
diff --git a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_1List1Spin1Btn_QTD.ui b/src/HEXABLOCKGUI/MyDlgRef/DlgRef_1List1Spin1Btn_QTD.ui
deleted file mode 100755
index 4982dca..0000000
--- a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_1List1Spin1Btn_QTD.ui
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DlgRef_1List1Spin1Btn_QTD</class>
- <widget class="QWidget" name="DlgRef_1List1Spin1Btn_QTD">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>213</width>
-    <height>116</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string/>
-  </property>
-  <layout class="QGridLayout">
-   <property name="margin">
-    <number>0</number>
-   </property>
-   <property name="spacing">
-    <number>0</number>
-   </property>
-   <item row="0" column="0">
-    <widget class="QGroupBox" name="GroupBox1">
-     <property name="title">
-      <string/>
-     </property>
-     <layout class="QGridLayout">
-      <property name="margin">
-       <number>9</number>
-      </property>
-      <property name="spacing">
-       <number>6</number>
-      </property>
-      <item row="0" column="0" rowspan="4">
-       <widget class="QTreeWidget" name="ListView1">
-        <column>
-         <property name="text">
-          <string notr="true">1</string>
-         </property>
-        </column>
-       </widget>
-      </item>
-      <item row="3" column="1">
-       <spacer>
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeType">
-         <enum>QSizePolicy::Expanding</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>16</width>
-          <height>120</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="2" column="1">
-       <widget class="QPushButton" name="PushButton1">
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QSpinBox" name="SpinBox1">
-        <property name="maximum">
-         <number>1000000</number>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QLabel" name="TextLabel1">
-        <property name="text">
-         <string>TL1</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <layoutdefault spacing="6" margin="11"/>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <tabstops>
-  <tabstop>ListView1</tabstop>
-  <tabstop>SpinBox1</tabstop>
-  <tabstop>PushButton1</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel1Check1List_QTD.ui b/src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel1Check1List_QTD.ui
deleted file mode 100755
index a1d5853..0000000
--- a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel1Check1List_QTD.ui
+++ /dev/null
@@ -1,122 +0,0 @@
-<ui version="4.0" >
- <class>DlgRef_1Sel1Check1List_QTD</class>
- <widget class="QWidget" name="DlgRef_1Sel1Check1List_QTD" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>156</width>
-    <height>94</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string/>
-  </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>0</number>
-   </property>
-   <property name="spacing" >
-    <number>0</number>
-   </property>
-   <item row="0" column="0" >
-    <widget class="QGroupBox" name="GroupBox1" >
-     <property name="title" >
-      <string/>
-     </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item row="0" column="0" >
-       <widget class="QLabel" name="TextLabel1" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string>TL1</string>
-        </property>
-        <property name="wordWrap" >
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1" >
-       <widget class="QPushButton" name="PushButton1" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="2" >
-       <widget class="QLineEdit" name="LineEdit1" />
-      </item>
-      <item row="1" column="0" >
-       <widget class="QLabel" name="TextLabel2" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string>TL2</string>
-        </property>
-        <property name="wordWrap" >
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1" colspan="2" >
-       <widget class="QComboBox" name="ComboBox1" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>7</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0" colspan="3" >
-       <widget class="QCheckBox" name="CheckButton1" >
-        <property name="text" >
-         <string/>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <layoutdefault spacing="6" margin="11" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <tabstops>
-  <tabstop>PushButton1</tabstop>
-  <tabstop>LineEdit1</tabstop>
-  <tabstop>ComboBox1</tabstop>
-  <tabstop>CheckButton1</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel1Check1Sel_QTD.ui b/src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel1Check1Sel_QTD.ui
deleted file mode 100755
index a8b9443..0000000
--- a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel1Check1Sel_QTD.ui
+++ /dev/null
@@ -1,148 +0,0 @@
-<ui version="4.0" >
- <class>DlgRef_1Sel1Check1Sel_QTD</class>
- <widget class="QWidget" name="DlgRef_1Sel1Check1Sel_QTD" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>156</width>
-    <height>99</height>
-   </rect>
-  </property>
-  <property name="sizePolicy" >
-   <sizepolicy>
-    <hsizetype>5</hsizetype>
-    <vsizetype>5</vsizetype>
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="windowTitle" >
-   <string/>
-  </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>0</number>
-   </property>
-   <property name="spacing" >
-    <number>0</number>
-   </property>
-   <item row="0" column="0" >
-    <widget class="QGroupBox" name="GroupBox1" >
-     <property name="sizePolicy" >
-      <sizepolicy>
-       <hsizetype>5</hsizetype>
-       <vsizetype>5</vsizetype>
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="title" >
-      <string/>
-     </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item row="3" column="0" colspan="3" >
-       <widget class="QWidget" native="1" name="Box" />
-      </item>
-      <item row="2" column="0" >
-       <widget class="QLabel" name="TextLabel2" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string>TL2</string>
-        </property>
-        <property name="wordWrap" >
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="2" >
-       <widget class="QLineEdit" name="LineEdit2" />
-      </item>
-      <item row="1" column="0" colspan="3" >
-       <widget class="QCheckBox" name="CheckButton1" >
-        <property name="text" >
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1" >
-       <widget class="QPushButton" name="PushButton2" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1" >
-       <widget class="QPushButton" name="PushButton1" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0" >
-       <widget class="QLabel" name="TextLabel1" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string>TL1</string>
-        </property>
-        <property name="wordWrap" >
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="2" >
-       <widget class="QLineEdit" name="LineEdit1" />
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <layoutdefault spacing="6" margin="11" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <tabstops>
-  <tabstop>PushButton1</tabstop>
-  <tabstop>LineEdit1</tabstop>
-  <tabstop>CheckButton1</tabstop>
-  <tabstop>PushButton2</tabstop>
-  <tabstop>LineEdit2</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel1Check_QTD.ui b/src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel1Check_QTD.ui
deleted file mode 100755
index ca24f20..0000000
--- a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel1Check_QTD.ui
+++ /dev/null
@@ -1,91 +0,0 @@
-<ui version="4.0" >
- <class>DlgRef_1Sel1Check_QTD</class>
- <widget class="QWidget" name="DlgRef_1Sel1Check_QTD" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>155</width>
-    <height>64</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string/>
-  </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>0</number>
-   </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
-   <item row="0" column="0" >
-    <widget class="QGroupBox" name="GroupBox1" >
-     <property name="title" >
-      <string/>
-     </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item row="0" column="2" >
-       <widget class="QLineEdit" name="LineEdit1" />
-      </item>
-      <item row="1" column="0" colspan="3" >
-       <widget class="QCheckBox" name="CheckButton1" >
-        <property name="text" >
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0" >
-       <widget class="QLabel" name="TextLabel1" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string>TL1</string>
-        </property>
-        <property name="wordWrap" >
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1" >
-       <widget class="QPushButton" name="PushButton1" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string/>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <layoutdefault spacing="6" margin="11" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <tabstops>
-  <tabstop>PushButton1</tabstop>
-  <tabstop>LineEdit1</tabstop>
-  <tabstop>CheckButton1</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel1List1Check3Btn_QTD.ui b/src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel1List1Check3Btn_QTD.ui
deleted file mode 100755
index 562f2ce..0000000
--- a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel1List1Check3Btn_QTD.ui
+++ /dev/null
@@ -1,154 +0,0 @@
-<ui version="4.0" >
- <class>DlgRef_1Sel1List1Check3Btn_QTD</class>
- <widget class="QWidget" name="DlgRef_1Sel1List1Check3Btn_QTD" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>156</width>
-    <height>180</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string/>
-  </property>
-  <layout class="QGridLayout" >
-   <property name="leftMargin" >
-    <number>0</number>
-   </property>
-   <property name="topMargin" >
-    <number>0</number>
-   </property>
-   <property name="rightMargin" >
-    <number>0</number>
-   </property>
-   <property name="bottomMargin" >
-    <number>0</number>
-   </property>
-   <property name="horizontalSpacing" >
-    <number>6</number>
-   </property>
-   <property name="verticalSpacing" >
-    <number>6</number>
-   </property>
-   <item row="0" column="0" >
-    <widget class="QGroupBox" name="GroupBox1" >
-     <property name="sizePolicy" >
-      <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="title" >
-      <string/>
-     </property>
-     <layout class="QGridLayout" >
-      <item row="0" column="0" >
-       <widget class="QLabel" name="TextLabel1" >
-        <property name="sizePolicy" >
-         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string>TL1</string>
-        </property>
-        <property name="wordWrap" >
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1" >
-       <widget class="QPushButton" name="PushButton1" >
-        <property name="sizePolicy" >
-         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="2" >
-       <widget class="QLineEdit" name="LineEdit1" />
-      </item>
-      <item row="1" column="0" >
-       <widget class="QLabel" name="TextLabel2" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string>TL2</string>
-        </property>
-        <property name="wordWrap" >
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1" colspan="2" >
-       <widget class="QComboBox" name="ComboBox1" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>7</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-       </widget>
-      </item>
-      <item row="2" rowspan="3" column="0" colspan="2" >
-       <widget class="QCheckBox" name="CheckButton1" >
-        <property name="text" >
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="2" >
-       <widget class="QPushButton" name="PushButton2" >
-        <property name="text" >
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="2" >
-       <widget class="QPushButton" name="PushButton3" >
-        <property name="text" >
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="2" >
-       <widget class="QPushButton" name="PushButton4" >
-        <property name="text" >
-         <string/>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <layoutdefault spacing="6" margin="11" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <tabstops>
-  <tabstop>PushButton1</tabstop>
-  <tabstop>LineEdit1</tabstop>
-  <tabstop>CheckButton1</tabstop>
-  <tabstop>ListView1</tabstop>
-  <tabstop>PushButton2</tabstop>
-  <tabstop>PushButton3</tabstop>
-  <tabstop>PushButton4</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel1Spin1Check_QTD.ui b/src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel1Spin1Check_QTD.ui
deleted file mode 100755
index 57ae745..0000000
--- a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel1Spin1Check_QTD.ui
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DlgRef_1Sel1Spin1Check_QTD</class>
- <widget class="QWidget" name="DlgRef_1Sel1Spin1Check_QTD">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>207</width>
-    <height>93</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string/>
-  </property>
-  <layout class="QGridLayout">
-   <property name="margin">
-    <number>0</number>
-   </property>
-   <property name="spacing">
-    <number>6</number>
-   </property>
-   <item row="0" column="0">
-    <widget class="QGroupBox" name="GroupBox1">
-     <property name="title">
-      <string/>
-     </property>
-     <layout class="QGridLayout">
-      <property name="margin">
-       <number>9</number>
-      </property>
-      <property name="spacing">
-       <number>6</number>
-      </property>
-      <item row="2" column="0" colspan="3">
-       <widget class="QCheckBox" name="CheckButton1">
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="TextLabel2">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL2</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1" colspan="2">
-       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX">
-        <property name="decimals">
-         <number>6</number>
-        </property>
-        <property name="minimum">
-         <double>0.000000000000000</double>
-        </property>
-        <property name="maximum">
-         <double>1000000000.000000000000000</double>
-        </property>
-        <property name="value">
-         <double>0.000000000000000</double>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="TextLabel1">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL1</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="2">
-       <widget class="QLineEdit" name="LineEdit1"/>
-      </item>
-      <item row="0" column="1">
-       <widget class="QPushButton" name="PushButton1">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <layoutdefault spacing="6" margin="11"/>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <customwidgets>
-  <customwidget>
-   <class>SalomeApp_DoubleSpinBox</class>
-   <extends>QDoubleSpinBox</extends>
-   <header location="global">SalomeApp_DoubleSpinBox.h</header>
-  </customwidget>
- </customwidgets>
- <tabstops>
-  <tabstop>PushButton1</tabstop>
-  <tabstop>LineEdit1</tabstop>
-  <tabstop>SpinBox_DX</tabstop>
-  <tabstop>CheckButton1</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel1Spin_QTD.ui b/src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel1Spin_QTD.ui
deleted file mode 100755
index 2cebc84..0000000
--- a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel1Spin_QTD.ui
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DlgRef_1Sel1Spin_QTD</class>
- <widget class="QWidget" name="DlgRef_1Sel1Spin_QTD">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>156</width>
-    <height>74</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string/>
-  </property>
-  <layout class="QGridLayout">
-   <property name="margin">
-    <number>0</number>
-   </property>
-   <property name="spacing">
-    <number>0</number>
-   </property>
-   <item row="0" column="0">
-    <widget class="QGroupBox" name="GroupBox1">
-     <property name="title">
-      <string/>
-     </property>
-     <layout class="QGridLayout">
-      <property name="margin">
-       <number>9</number>
-      </property>
-      <property name="spacing">
-       <number>6</number>
-      </property>
-      <item row="0" column="0">
-       <widget class="QLabel" name="TextLabel1">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL1</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="2">
-       <widget class="QLineEdit" name="LineEdit1"/>
-      </item>
-      <item row="0" column="1">
-       <widget class="QPushButton" name="PushButton1">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="TextLabel2">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL2</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1" colspan="2">
-       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX">
-        <property name="decimals">
-         <number>6</number>
-        </property>
-        <property name="maximum">
-         <double>1000000000.000000000000000</double>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <layoutdefault spacing="6" margin="11"/>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <customwidgets>
-  <customwidget>
-   <class>SalomeApp_DoubleSpinBox</class>
-   <extends>QDoubleSpinBox</extends>
-   <header location="global">SalomeApp_DoubleSpinBox.h</header>
-  </customwidget>
- </customwidgets>
- <tabstops>
-  <tabstop>PushButton1</tabstop>
-  <tabstop>LineEdit1</tabstop>
-  <tabstop>SpinBox_DX</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel2Spin1View1Check_QTD.ui b/src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel2Spin1View1Check_QTD.ui
deleted file mode 100755
index 1a71d85..0000000
--- a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel2Spin1View1Check_QTD.ui
+++ /dev/null
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DlgRef_1Sel2Spin1View1Check_QTD</class>
- <widget class="QWidget" name="DlgRef_1Sel2Spin1View1Check_QTD">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>176</width>
-    <height>227</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string/>
-  </property>
-  <layout class="QGridLayout">
-   <property name="margin">
-    <number>0</number>
-   </property>
-   <property name="spacing">
-    <number>6</number>
-   </property>
-   <item row="0" column="0">
-    <widget class="QGroupBox" name="GroupBox1">
-     <property name="title">
-      <string/>
-     </property>
-     <layout class="QGridLayout">
-      <property name="margin">
-       <number>9</number>
-      </property>
-      <property name="spacing">
-       <number>6</number>
-      </property>
-      <item row="3" column="0" colspan="3">
-       <widget class="QTextBrowser" name="TextBrowser1"/>
-      </item>
-      <item row="2" column="2">
-       <widget class="SalomeApp_IntSpinBox" name="SpinBox2">
-        <property name="maximum">
-         <number>1000000</number>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="2">
-       <widget class="SalomeApp_IntSpinBox" name="SpinBox1">
-        <property name="maximum">
-         <number>1000000</number>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="0" colspan="3">
-       <widget class="QCheckBox" name="CheckBox1">
-        <property name="text">
-         <string>Check</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="TextLabel3">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL3</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="TextLabel2">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL2</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="2">
-       <widget class="QLineEdit" name="LineEdit1"/>
-      </item>
-      <item row="0" column="1">
-       <widget class="QPushButton" name="PushButton1">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="TextLabel1">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL1</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <layoutdefault spacing="6" margin="11"/>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <customwidgets>
-  <customwidget>
-   <class>SalomeApp_IntSpinBox</class>
-   <extends>QSpinBox</extends>
-   <header location="global">SalomeApp_IntSpinBox.h</header>
-  </customwidget>
- </customwidgets>
- <tabstops>
-  <tabstop>PushButton1</tabstop>
-  <tabstop>LineEdit1</tabstop>
-  <tabstop>SpinBox1</tabstop>
-  <tabstop>SpinBox2</tabstop>
-  <tabstop>TextBrowser1</tabstop>
-  <tabstop>CheckBox1</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel2Spin_QTD.ui b/src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel2Spin_QTD.ui
index 3684983..f80648f 100755
--- a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel2Spin_QTD.ui
+++ b/src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel2Spin_QTD.ui
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>DlgRef_1Sel2Spin_QTD</class>
- <widget class="QWidget" name="DlgRef_1Sel2Spin_QTD">
+ <class>MyDlgRef_1Sel2Spin_QTD</class>
+ <widget class="QWidget" name="MyDlgRef_1Sel2Spin_QTD">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>219</width>
-    <height>124</height>
+    <height>129</height>
    </rect>
   </property>
   <property name="windowTitle">
diff --git a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel3Check_QTD.ui b/src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel3Check_QTD.ui
deleted file mode 100755
index bcc2e30..0000000
--- a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel3Check_QTD.ui
+++ /dev/null
@@ -1,107 +0,0 @@
-<ui version="4.0" >
- <class>DlgRef_1Sel3Check_QTD</class>
- <widget class="QWidget" name="DlgRef_1Sel3Check_QTD" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>155</width>
-    <height>114</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string/>
-  </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>0</number>
-   </property>
-   <property name="spacing" >
-    <number>0</number>
-   </property>
-   <item row="0" column="0" >
-    <widget class="QGroupBox" name="GroupBox1" >
-     <property name="title" >
-      <string/>
-     </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item row="0" column="0" >
-       <widget class="QLabel" name="TextLabel1" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string>TL1</string>
-        </property>
-        <property name="wordWrap" >
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1" >
-       <widget class="QPushButton" name="PushButton1" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0" colspan="3" >
-       <widget class="QCheckBox" name="CheckButton3" >
-        <property name="text" >
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0" colspan="3" >
-       <widget class="QCheckBox" name="CheckButton2" >
-        <property name="text" >
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="2" >
-       <widget class="QLineEdit" name="LineEdit1" />
-      </item>
-      <item row="1" column="0" colspan="3" >
-       <widget class="QCheckBox" name="CheckButton1" >
-        <property name="text" >
-         <string/>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <layoutdefault spacing="6" margin="11" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <tabstops>
-  <tabstop>PushButton1</tabstop>
-  <tabstop>LineEdit1</tabstop>
-  <tabstop>CheckButton1</tabstop>
-  <tabstop>CheckButton2</tabstop>
-  <tabstop>CheckButton3</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel3Spin1Check_QTD.ui b/src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel3Spin1Check_QTD.ui
deleted file mode 100755
index fa397a4..0000000
--- a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel3Spin1Check_QTD.ui
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DlgRef_1Sel3Spin1Check_QTD</class>
- <widget class="QWidget" name="DlgRef_1Sel3Spin1Check_QTD">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>156</width>
-    <height>147</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string/>
-  </property>
-  <layout class="QGridLayout">
-   <property name="margin">
-    <number>0</number>
-   </property>
-   <property name="spacing">
-    <number>6</number>
-   </property>
-   <item row="0" column="0">
-    <widget class="QGroupBox" name="GroupBox1">
-     <property name="title">
-      <string/>
-     </property>
-     <layout class="QGridLayout">
-      <property name="margin">
-       <number>9</number>
-      </property>
-      <property name="spacing">
-       <number>6</number>
-      </property>
-      <item row="2" column="1" colspan="2">
-       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DY">
-        <property name="decimals">
-         <number>6</number>
-        </property>
-        <property name="maximum">
-         <double>1000000000.000000000000000</double>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="1" colspan="2">
-       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DZ">
-        <property name="decimals">
-         <number>6</number>
-        </property>
-        <property name="maximum">
-         <double>1000000000.000000000000000</double>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1" colspan="2">
-       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX">
-        <property name="decimals">
-         <number>6</number>
-        </property>
-        <property name="maximum">
-         <double>1000000000.000000000000000</double>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="0" colspan="2">
-       <widget class="QCheckBox" name="CheckButton1">
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="TextLabel2">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL2</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0">
-       <widget class="QLabel" name="TextLabel4">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL4</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="TextLabel3">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL3</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="2">
-       <widget class="QLineEdit" name="LineEdit1"/>
-      </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="TextLabel1">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL1</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QPushButton" name="PushButton1">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <layoutdefault spacing="6" margin="11"/>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <customwidgets>
-  <customwidget>
-   <class>SalomeApp_DoubleSpinBox</class>
-   <extends>QDoubleSpinBox</extends>
-   <header location="global">SalomeApp_DoubleSpinBox.h</header>
-  </customwidget>
- </customwidgets>
- <tabstops>
-  <tabstop>PushButton1</tabstop>
-  <tabstop>LineEdit1</tabstop>
-  <tabstop>SpinBox_DX</tabstop>
-  <tabstop>SpinBox_DY</tabstop>
-  <tabstop>SpinBox_DZ</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel3Spin_QTD.ui b/src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel3Spin_QTD.ui
index d676cc1..d22c2ba 100755
--- a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel3Spin_QTD.ui
+++ b/src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel3Spin_QTD.ui
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>DlgRef_1Sel3Spin_QTD</class>
- <widget class="QWidget" name="DlgRef_1Sel3Spin_QTD">
+ <class>MyDlgRef_1Sel3Spin_QTD</class>
+ <widget class="QWidget" name="MyDlgRef_1Sel3Spin_QTD">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>219</width>
-    <height>158</height>
+    <height>162</height>
    </rect>
   </property>
   <property name="windowTitle">
diff --git a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel4Spin2Check_QTD.ui b/src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel4Spin2Check_QTD.ui
deleted file mode 100755
index e387687..0000000
--- a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel4Spin2Check_QTD.ui
+++ /dev/null
@@ -1,211 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DlgRef_1Sel4Spin2Check_QTD</class>
- <widget class="QWidget" name="DlgRef_1Sel4Spin2Check_QTD">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>156</width>
-    <height>193</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string/>
-  </property>
-  <layout class="QGridLayout">
-   <property name="margin">
-    <number>0</number>
-   </property>
-   <property name="spacing">
-    <number>6</number>
-   </property>
-   <item row="0" column="0">
-    <widget class="QGroupBox" name="GroupBox1">
-     <property name="title">
-      <string/>
-     </property>
-     <layout class="QGridLayout">
-      <property name="margin">
-       <number>9</number>
-      </property>
-      <property name="spacing">
-       <number>6</number>
-      </property>
-      <item row="0" column="0">
-       <widget class="QLabel" name="TextLabel1">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL1</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QPushButton" name="PushButton1">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="2">
-       <widget class="QLineEdit" name="LineEdit1"/>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="TextLabel2">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL2</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1" colspan="2">
-       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX">
-        <property name="decimals">
-         <number>6</number>
-        </property>
-        <property name="maximum">
-         <double>1000000000.000000000000000</double>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="TextLabel3">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL3</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1" colspan="2">
-       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DY">
-        <property name="decimals">
-         <number>6</number>
-        </property>
-        <property name="maximum">
-         <double>1000000000.000000000000000</double>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0">
-       <widget class="QLabel" name="TextLabel4">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL4</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="1" colspan="2">
-       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DZ">
-        <property name="decimals">
-         <number>6</number>
-        </property>
-        <property name="maximum">
-         <double>1000000000.000000000000000</double>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="0">
-       <widget class="QLabel" name="TextLabel5">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL5</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="1" colspan="2">
-       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_SC">
-        <property name="decimals">
-         <number>6</number>
-        </property>
-        <property name="maximum">
-         <double>1000000000.000000000000000</double>
-        </property>
-       </widget>
-      </item>
-      <item row="5" column="0" colspan="3">
-       <widget class="QCheckBox" name="CheckBox1">
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="6" column="0" colspan="3">
-       <widget class="QCheckBox" name="CheckBox2">
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <layoutdefault spacing="6" margin="11"/>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <customwidgets>
-  <customwidget>
-   <class>SalomeApp_DoubleSpinBox</class>
-   <extends>QDoubleSpinBox</extends>
-   <header location="global">SalomeApp_DoubleSpinBox.h</header>
-  </customwidget>
- </customwidgets>
- <tabstops>
-  <tabstop>PushButton1</tabstop>
-  <tabstop>LineEdit1</tabstop>
-  <tabstop>SpinBox_DX</tabstop>
-  <tabstop>SpinBox_DY</tabstop>
-  <tabstop>SpinBox_DZ</tabstop>
-  <tabstop>SpinBox_SC</tabstop>
-  <tabstop>CheckBox1</tabstop>
-  <tabstop>CheckBox2</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel4Spin_QTD.ui b/src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel4Spin_QTD.ui
deleted file mode 100755
index cc6e51b..0000000
--- a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel4Spin_QTD.ui
+++ /dev/null
@@ -1,210 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DlgRef_1Sel4Spin_QTD</class>
- <widget class="QWidget" name="DlgRef_1Sel4Spin_QTD">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>323</width>
-    <height>123</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string/>
-  </property>
-  <layout class="QGridLayout">
-   <property name="margin">
-    <number>0</number>
-   </property>
-   <property name="spacing">
-    <number>6</number>
-   </property>
-   <item row="0" column="0">
-    <widget class="QGroupBox" name="GroupBox1">
-     <property name="title">
-      <string/>
-     </property>
-     <layout class="QGridLayout">
-      <property name="margin">
-       <number>9</number>
-      </property>
-      <property name="spacing">
-       <number>6</number>
-      </property>
-      <item row="2" column="0">
-       <widget class="QLabel" name="TextLabel6">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL6</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1" colspan="2">
-       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_S">
-        <property name="decimals">
-         <number>6</number>
-        </property>
-        <property name="maximum">
-         <double>1000000000.000000000000000</double>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0" colspan="3">
-       <widget class="QGroupBox" name="groupBox">
-        <property name="title">
-         <string/>
-        </property>
-        <layout class="QHBoxLayout">
-         <property name="spacing">
-          <number>6</number>
-         </property>
-         <property name="margin">
-          <number>9</number>
-         </property>
-         <item>
-          <widget class="QLabel" name="TextLabel3">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="text">
-            <string>TL3</string>
-           </property>
-           <property name="wordWrap">
-            <bool>false</bool>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX">
-           <property name="decimals">
-            <number>6</number>
-           </property>
-           <property name="maximum">
-            <double>1000000000.000000000000000</double>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLabel" name="TextLabel4">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="text">
-            <string>TL4</string>
-           </property>
-           <property name="wordWrap">
-            <bool>false</bool>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DY">
-           <property name="decimals">
-            <number>6</number>
-           </property>
-           <property name="maximum">
-            <double>1000000000.000000000000000</double>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLabel" name="TextLabel5">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="text">
-            <string>TL5</string>
-           </property>
-           <property name="wordWrap">
-            <bool>false</bool>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DZ">
-           <property name="decimals">
-            <number>6</number>
-           </property>
-           <property name="maximum">
-            <double>1000000000.000000000000000</double>
-           </property>
-          </widget>
-         </item>
-        </layout>
-       </widget>
-      </item>
-      <item row="0" column="2">
-       <widget class="QLineEdit" name="LineEdit1"/>
-      </item>
-      <item row="0" column="1">
-       <widget class="QPushButton" name="PushButton1">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="TextLabel1">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL1</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <layoutdefault spacing="6" margin="11"/>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <customwidgets>
-  <customwidget>
-   <class>SalomeApp_DoubleSpinBox</class>
-   <extends>QDoubleSpinBox</extends>
-   <header location="global">SalomeApp_DoubleSpinBox.h</header>
-  </customwidget>
- </customwidgets>
- <tabstops>
-  <tabstop>PushButton1</tabstop>
-  <tabstop>LineEdit1</tabstop>
-  <tabstop>SpinBox_DX</tabstop>
-  <tabstop>SpinBox_DY</tabstop>
-  <tabstop>SpinBox_DZ</tabstop>
-  <tabstop>SpinBox_S</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel5Spin1Check_QTD.ui b/src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel5Spin1Check_QTD.ui
deleted file mode 100755
index 3fe2c7c..0000000
--- a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel5Spin1Check_QTD.ui
+++ /dev/null
@@ -1,243 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DlgRef_1Sel5Spin1Check_QTD</class>
- <widget class="QWidget" name="DlgRef_1Sel5Spin1Check_QTD">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>204</width>
-    <height>163</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string/>
-  </property>
-  <layout class="QGridLayout" name="gridLayout_2">
-   <property name="margin">
-    <number>0</number>
-   </property>
-   <item row="0" column="0">
-    <widget class="QGroupBox" name="GroupBox1">
-     <property name="title">
-      <string/>
-     </property>
-     <layout class="QGridLayout" name="gridLayout">
-      <item row="0" column="0">
-       <widget class="QLabel" name="TextLabel1">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL1</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <layout class="QHBoxLayout" name="horizontalLayout">
-        <item>
-         <widget class="QPushButton" name="PushButton1">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLineEdit" name="LineEdit1"/>
-        </item>
-       </layout>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="TextLabel7">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL7</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QComboBox" name="ComboBox1"/>
-      </item>
-      <item row="2" column="0" colspan="2">
-       <layout class="QGridLayout">
-        <item row="0" column="0">
-         <widget class="QLabel" name="TextLabel2">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="text">
-           <string>TL2</string>
-          </property>
-          <property name="wordWrap">
-           <bool>false</bool>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="2">
-         <widget class="QLabel" name="TextLabel3">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="text">
-           <string>TL3</string>
-          </property>
-          <property name="wordWrap">
-           <bool>false</bool>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="3">
-         <widget class="SalomeApp_DoubleSpinBox" name="SpinBox2">
-          <property name="decimals">
-           <number>6</number>
-          </property>
-          <property name="maximum">
-           <double>1000000000.000000000000000</double>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="0">
-         <widget class="QLabel" name="TextLabel5">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="text">
-           <string>TL5</string>
-          </property>
-          <property name="wordWrap">
-           <bool>false</bool>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="2">
-         <widget class="QLabel" name="TextLabel6">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="text">
-           <string>TL6</string>
-          </property>
-          <property name="wordWrap">
-           <bool>false</bool>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="3">
-         <widget class="SalomeApp_DoubleSpinBox" name="SpinBox5">
-          <property name="decimals">
-           <number>6</number>
-          </property>
-          <property name="maximum">
-           <double>1000000000.000000000000000</double>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="0">
-         <widget class="QLabel" name="TextLabel4">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="text">
-           <string>TL4</string>
-          </property>
-          <property name="wordWrap">
-           <bool>false</bool>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="2" colspan="2">
-         <widget class="QCheckBox" name="CheckBox1">
-          <property name="text">
-           <string/>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="1">
-         <widget class="SalomeApp_IntSpinBox" name="SpinBox1">
-          <property name="maximum">
-           <number>1000000</number>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="1">
-         <widget class="SalomeApp_IntSpinBox" name="SpinBox4">
-          <property name="maximum">
-           <number>1000000</number>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="1">
-         <widget class="SalomeApp_IntSpinBox" name="SpinBox3">
-          <property name="maximum">
-           <number>1000000</number>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>SalomeApp_DoubleSpinBox</class>
-   <extends>QDoubleSpinBox</extends>
-   <header location="global">SalomeApp_DoubleSpinBox.h</header>
-  </customwidget>
-  <customwidget>
-   <class>SalomeApp_IntSpinBox</class>
-   <extends>QSpinBox</extends>
-   <header location="global">SalomeApp_IntSpinBox.h</header>
-  </customwidget>
- </customwidgets>
- <tabstops>
-  <tabstop>PushButton1</tabstop>
-  <tabstop>LineEdit1</tabstop>
-  <tabstop>ComboBox1</tabstop>
-  <tabstop>SpinBox1</tabstop>
-  <tabstop>SpinBox2</tabstop>
-  <tabstop>SpinBox4</tabstop>
-  <tabstop>SpinBox5</tabstop>
-  <tabstop>SpinBox3</tabstop>
-  <tabstop>CheckBox1</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel5Spin_QTD.ui b/src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel5Spin_QTD.ui
deleted file mode 100755
index 8d19cdf..0000000
--- a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel5Spin_QTD.ui
+++ /dev/null
@@ -1,232 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DlgRef_1Sel5Spin_QTD</class>
- <widget class="QWidget" name="DlgRef_1Sel5Spin_QTD">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>208</width>
-    <height>130</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string/>
-  </property>
-  <layout class="QGridLayout">
-   <property name="margin">
-    <number>0</number>
-   </property>
-   <property name="spacing">
-    <number>0</number>
-   </property>
-   <item row="0" column="0">
-    <widget class="QGroupBox" name="GroupBox1">
-     <property name="title">
-      <string/>
-     </property>
-     <layout class="QGridLayout">
-      <property name="margin">
-       <number>9</number>
-      </property>
-      <property name="spacing">
-       <number>6</number>
-      </property>
-      <item row="1" column="0" colspan="3">
-       <layout class="QGridLayout">
-        <property name="margin">
-         <number>0</number>
-        </property>
-        <property name="spacing">
-         <number>6</number>
-        </property>
-        <item row="2" column="0">
-         <widget class="QLabel" name="TextLabel4">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="text">
-           <string>TL4</string>
-          </property>
-          <property name="wordWrap">
-           <bool>false</bool>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="2">
-         <widget class="QLabel" name="TextLabel3">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="text">
-           <string>TL3</string>
-          </property>
-          <property name="wordWrap">
-           <bool>false</bool>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="3">
-         <widget class="SalomeApp_DoubleSpinBox" name="SpinBox5">
-          <property name="decimals">
-           <number>6</number>
-          </property>
-          <property name="maximum">
-           <double>1000000000.000000000000000</double>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="0">
-         <widget class="QLabel" name="TextLabel2">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="text">
-           <string>TL2</string>
-          </property>
-          <property name="wordWrap">
-           <bool>false</bool>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="1">
-         <widget class="SalomeApp_DoubleSpinBox" name="SpinBox1">
-          <property name="decimals">
-           <number>6</number>
-          </property>
-          <property name="maximum">
-           <double>1000000000.000000000000000</double>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="2">
-         <widget class="QLabel" name="TextLabel6">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="text">
-           <string>TL6</string>
-          </property>
-          <property name="wordWrap">
-           <bool>false</bool>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="3">
-         <widget class="SalomeApp_DoubleSpinBox" name="SpinBox2">
-          <property name="decimals">
-           <number>6</number>
-          </property>
-          <property name="maximum">
-           <double>1000000000.000000000000000</double>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="1">
-         <widget class="SalomeApp_DoubleSpinBox" name="SpinBox3">
-          <property name="decimals">
-           <number>6</number>
-          </property>
-          <property name="maximum">
-           <double>1000000000.000000000000000</double>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="1">
-         <widget class="SalomeApp_DoubleSpinBox" name="SpinBox4">
-          <property name="decimals">
-           <number>6</number>
-          </property>
-          <property name="maximum">
-           <double>1000000000.000000000000000</double>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="0">
-         <widget class="QLabel" name="TextLabel5">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="text">
-           <string>TL5</string>
-          </property>
-          <property name="wordWrap">
-           <bool>false</bool>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-      <item row="0" column="1">
-       <widget class="QPushButton" name="PushButton1">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="TextLabel1">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL1</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="2">
-       <widget class="QLineEdit" name="LineEdit1"/>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <layoutdefault spacing="6" margin="11"/>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <customwidgets>
-  <customwidget>
-   <class>SalomeApp_DoubleSpinBox</class>
-   <extends>QDoubleSpinBox</extends>
-   <header location="global">SalomeApp_DoubleSpinBox.h</header>
-  </customwidget>
- </customwidgets>
- <tabstops>
-  <tabstop>PushButton1</tabstop>
-  <tabstop>LineEdit1</tabstop>
-  <tabstop>SpinBox1</tabstop>
-  <tabstop>SpinBox2</tabstop>
-  <tabstop>SpinBox4</tabstop>
-  <tabstop>SpinBox5</tabstop>
-  <tabstop>SpinBox3</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_1SelExt_QTD.ui b/src/HEXABLOCKGUI/MyDlgRef/DlgRef_1SelExt_QTD.ui
deleted file mode 100755
index 6b285a1..0000000
--- a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_1SelExt_QTD.ui
+++ /dev/null
@@ -1,94 +0,0 @@
-<ui version="4.0" >
- <class>DlgRef_1SelExt_QTD</class>
- <widget class="QWidget" name="DlgRef_1SelExt_QTD" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>155</width>
-    <height>51</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string/>
-  </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>0</number>
-   </property>
-   <property name="spacing" >
-    <number>0</number>
-   </property>
-   <item row="0" column="0" >
-    <widget class="QGroupBox" name="GroupBox1" >
-     <property name="sizePolicy" >
-      <sizepolicy>
-       <hsizetype>7</hsizetype>
-       <vsizetype>7</vsizetype>
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="title" >
-      <string/>
-     </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item row="1" column="0" colspan="3" >
-       <widget class="QWidget" native="1" name="Box" />
-      </item>
-      <item row="0" column="0" >
-       <widget class="QLabel" name="TextLabel1" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string>TL1</string>
-        </property>
-        <property name="wordWrap" >
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1" >
-       <widget class="QPushButton" name="PushButton1" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="2" >
-       <widget class="QLineEdit" name="LineEdit1" />
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <layoutdefault spacing="6" margin="11" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <tabstops>
-  <tabstop>PushButton1</tabstop>
-  <tabstop>LineEdit1</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel_QTD.ui b/src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel_QTD.ui
deleted file mode 100755
index ffcb8aa..0000000
--- a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel_QTD.ui
+++ /dev/null
@@ -1,91 +0,0 @@
-<ui version="4.0" >
- <class>DlgRef_1Sel_QTD</class>
- <widget class="QWidget" name="DlgRef_1Sel_QTD" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>155</width>
-    <height>45</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string/>
-  </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>0</number>
-   </property>
-   <property name="spacing" >
-    <number>0</number>
-   </property>
-   <item row="0" column="0" >
-    <widget class="QGroupBox" name="GroupBox1" >
-     <property name="sizePolicy" >
-      <sizepolicy>
-       <hsizetype>7</hsizetype>
-       <vsizetype>7</vsizetype>
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="title" >
-      <string/>
-     </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item row="0" column="2" >
-       <widget class="QLineEdit" name="LineEdit1" />
-      </item>
-      <item row="0" column="1" >
-       <widget class="QPushButton" name="PushButton1" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0" >
-       <widget class="QLabel" name="TextLabel1" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string>TL1</string>
-        </property>
-        <property name="wordWrap" >
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <layoutdefault spacing="6" margin="11" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <tabstops>
-  <tabstop>PushButton1</tabstop>
-  <tabstop>LineEdit1</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Spin_QTD.ui b/src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Spin_QTD.ui
deleted file mode 100755
index cbf89a1..0000000
--- a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Spin_QTD.ui
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DlgRef_1Spin_QTD</class>
- <widget class="QWidget" name="DlgRef_1Spin_QTD">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>111</width>
-    <height>43</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string/>
-  </property>
-  <layout class="QGridLayout">
-   <property name="margin">
-    <number>0</number>
-   </property>
-   <property name="spacing">
-    <number>0</number>
-   </property>
-   <item row="0" column="0">
-    <widget class="QGroupBox" name="GroupBox1">
-     <property name="title">
-      <string/>
-     </property>
-     <layout class="QGridLayout">
-      <property name="margin">
-       <number>9</number>
-      </property>
-      <property name="spacing">
-       <number>6</number>
-      </property>
-      <item row="0" column="0">
-       <widget class="QLabel" name="TextLabel1">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL1</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX">
-        <property name="decimals">
-         <number>6</number>
-        </property>
-        <property name="maximum">
-         <double>1000000000.000000000000000</double>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <layoutdefault spacing="6" margin="11"/>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <customwidgets>
-  <customwidget>
-   <class>SalomeApp_DoubleSpinBox</class>
-   <extends>QDoubleSpinBox</extends>
-   <header location="global">SalomeApp_DoubleSpinBox.h</header>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel1List1Check_QTD.ui b/src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel1List1Check_QTD.ui
deleted file mode 100755
index 4633930..0000000
--- a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel1List1Check_QTD.ui
+++ /dev/null
@@ -1,153 +0,0 @@
-<ui version="4.0" >
- <class>DlgRef_2Sel1List1Check_QTD</class>
- <widget class="QWidget" name="DlgRef_2Sel1List1Check_QTD" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>211</width>
-    <height>121</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string/>
-  </property>
-  <layout class="QGridLayout" >
-   <property name="leftMargin" >
-    <number>0</number>
-   </property>
-   <property name="topMargin" >
-    <number>0</number>
-   </property>
-   <property name="rightMargin" >
-    <number>0</number>
-   </property>
-   <property name="bottomMargin" >
-    <number>0</number>
-   </property>
-   <property name="horizontalSpacing" >
-    <number>0</number>
-   </property>
-   <property name="verticalSpacing" >
-    <number>0</number>
-   </property>
-   <item row="0" column="0" >
-    <widget class="QGroupBox" name="GroupBox1" >
-     <property name="title" >
-      <string/>
-     </property>
-     <layout class="QGridLayout" >
-      <item row="0" column="0" >
-       <widget class="QLabel" name="TextLabel1" >
-        <property name="sizePolicy" >
-         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string>TL1</string>
-        </property>
-        <property name="wordWrap" >
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1" >
-       <widget class="QPushButton" name="PushButton1" >
-        <property name="sizePolicy" >
-         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="2" >
-       <widget class="QLineEdit" name="LineEdit1" />
-      </item>
-      <item row="1" column="0" >
-       <widget class="QLabel" name="TextLabel2" >
-        <property name="sizePolicy" >
-         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string>TL2</string>
-        </property>
-        <property name="wordWrap" >
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1" >
-       <widget class="QPushButton" name="PushButton2" >
-        <property name="sizePolicy" >
-         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="2" >
-       <widget class="QLineEdit" name="LineEdit2" />
-      </item>
-      <item row="2" column="0" >
-       <widget class="QLabel" name="TextLabel3" >
-        <property name="sizePolicy" >
-         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string>TL3</string>
-        </property>
-        <property name="wordWrap" >
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1" colspan="2" >
-       <widget class="QComboBox" name="ComboBox1" >
-        <property name="sizePolicy" >
-         <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0" colspan="3" >
-       <widget class="QCheckBox" name="CheckButton1" >
-        <property name="text" >
-         <string/>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <layoutdefault spacing="6" margin="11" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <tabstops>
-  <tabstop>PushButton1</tabstop>
-  <tabstop>LineEdit1</tabstop>
-  <tabstop>PushButton2</tabstop>
-  <tabstop>LineEdit2</tabstop>
-  <tabstop>ComboBox1</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel1List2Check_QTD.ui b/src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel1List2Check_QTD.ui
deleted file mode 100755
index 8cc018c..0000000
--- a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel1List2Check_QTD.ui
+++ /dev/null
@@ -1,151 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DlgRef_2Sel1List2Check_QTD</class>
- <widget class="QWidget" name="DlgRef_2Sel1List2Check_QTD">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>127</width>
-    <height>140</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string/>
-  </property>
-  <layout class="QGridLayout">
-   <property name="margin">
-    <number>0</number>
-   </property>
-   <property name="spacing">
-    <number>0</number>
-   </property>
-   <item row="0" column="0">
-    <widget class="QGroupBox" name="GroupBox1">
-     <property name="title">
-      <string/>
-     </property>
-     <layout class="QGridLayout" name="gridLayout">
-      <item row="0" column="0">
-       <widget class="QLabel" name="TextLabel1">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL1</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QPushButton" name="PushButton1">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="2">
-       <widget class="QLineEdit" name="LineEdit1"/>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="TextLabel2">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL2</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QPushButton" name="PushButton2">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="2">
-       <widget class="QLineEdit" name="LineEdit2"/>
-      </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="TextLabel3">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL3</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1" colspan="2">
-       <widget class="QComboBox" name="ComboBox1">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0" colspan="3">
-       <widget class="QCheckBox" name="CheckButton1">
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="0" colspan="3">
-       <widget class="QCheckBox" name="CheckButton2">
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <layoutdefault spacing="6" margin="11"/>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <tabstops>
-  <tabstop>PushButton1</tabstop>
-  <tabstop>LineEdit1</tabstop>
-  <tabstop>PushButton2</tabstop>
-  <tabstop>LineEdit2</tabstop>
-  <tabstop>ComboBox1</tabstop>
-  <tabstop>CheckButton1</tabstop>
-  <tabstop>CheckButton2</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel1List_QTD.ui b/src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel1List_QTD.ui
deleted file mode 100755
index 53ba9da..0000000
--- a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel1List_QTD.ui
+++ /dev/null
@@ -1,152 +0,0 @@
-<ui version="4.0" >
- <class>DlgRef_2Sel1List_QTD</class>
- <widget class="QWidget" name="DlgRef_2Sel1List_QTD" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>156</width>
-    <height>100</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string/>
-  </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>0</number>
-   </property>
-   <property name="spacing" >
-    <number>0</number>
-   </property>
-   <item row="0" column="0" >
-    <widget class="QGroupBox" name="GroupBox1" >
-     <property name="title" >
-      <string/>
-     </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item row="2" column="1" colspan="2" >
-       <widget class="QComboBox" name="ComboBox1" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>7</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0" >
-       <widget class="QLabel" name="TextLabel3" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string>TL3</string>
-        </property>
-        <property name="wordWrap" >
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0" >
-       <widget class="QLabel" name="TextLabel2" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string>TL2</string>
-        </property>
-        <property name="wordWrap" >
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="2" >
-       <widget class="QLineEdit" name="LineEdit1" />
-      </item>
-      <item row="0" column="0" >
-       <widget class="QLabel" name="TextLabel1" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string>TL1</string>
-        </property>
-        <property name="wordWrap" >
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1" >
-       <widget class="QPushButton" name="PushButton2" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="2" >
-       <widget class="QLineEdit" name="LineEdit2" />
-      </item>
-      <item row="0" column="1" >
-       <widget class="QPushButton" name="PushButton1" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string/>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <layoutdefault spacing="6" margin="11" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <tabstops>
-  <tabstop>PushButton1</tabstop>
-  <tabstop>LineEdit1</tabstop>
-  <tabstop>PushButton2</tabstop>
-  <tabstop>LineEdit2</tabstop>
-  <tabstop>ComboBox1</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel1Spin2Check_QTD.ui b/src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel1Spin2Check_QTD.ui
deleted file mode 100755
index e35fec1..0000000
--- a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel1Spin2Check_QTD.ui
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DlgRef_2Sel1Spin2Check_QTD</class>
- <widget class="QWidget" name="DlgRef_2Sel1Spin2Check_QTD">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>170</width>
-    <height>124</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string/>
-  </property>
-  <layout class="QGridLayout">
-   <property name="margin">
-    <number>0</number>
-   </property>
-   <property name="spacing">
-    <number>0</number>
-   </property>
-   <item row="0" column="0">
-    <widget class="QGroupBox" name="GroupBox1">
-     <property name="title">
-      <string/>
-     </property>
-     <layout class="QGridLayout">
-      <property name="margin">
-       <number>9</number>
-      </property>
-      <property name="spacing">
-       <number>6</number>
-      </property>
-      <item row="2" column="1" colspan="2">
-       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="decimals">
-         <number>6</number>
-        </property>
-        <property name="maximum">
-         <double>1000000000.000000000000000</double>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="3">
-       <widget class="QCheckBox" name="CheckButton2">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="TextLabel1">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL1</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="TextLabel3">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL3</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QPushButton" name="PushButton2">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="TextLabel2">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL2</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="2" colspan="2">
-       <widget class="QLineEdit" name="LineEdit2"/>
-      </item>
-      <item row="0" column="1">
-       <widget class="QPushButton" name="PushButton1">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="2" colspan="2">
-       <widget class="QLineEdit" name="LineEdit1"/>
-      </item>
-      <item row="3" column="0" colspan="4">
-       <widget class="QCheckBox" name="CheckButton1">
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <layoutdefault spacing="6" margin="11"/>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <customwidgets>
-  <customwidget>
-   <class>SalomeApp_DoubleSpinBox</class>
-   <extends>QDoubleSpinBox</extends>
-   <header location="global">SalomeApp_DoubleSpinBox.h</header>
-  </customwidget>
- </customwidgets>
- <tabstops>
-  <tabstop>PushButton1</tabstop>
-  <tabstop>LineEdit1</tabstop>
-  <tabstop>PushButton2</tabstop>
-  <tabstop>LineEdit2</tabstop>
-  <tabstop>SpinBox_DX</tabstop>
-  <tabstop>CheckButton2</tabstop>
-  <tabstop>CheckButton1</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel1SpinInt_QTD.ui b/src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel1SpinInt_QTD.ui
deleted file mode 100755
index c14fb7a..0000000
--- a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel1SpinInt_QTD.ui
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DlgRef_2Sel1SpinInt_QTD</class>
- <widget class="QWidget" name="DlgRef_2Sel1SpinInt_QTD">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>156</width>
-    <height>105</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string/>
-  </property>
-  <layout class="QGridLayout">
-   <property name="margin">
-    <number>0</number>
-   </property>
-   <property name="spacing">
-    <number>0</number>
-   </property>
-   <item row="0" column="0">
-    <widget class="QGroupBox" name="GroupBox1">
-     <property name="title">
-      <string/>
-     </property>
-     <layout class="QGridLayout">
-      <property name="margin">
-       <number>9</number>
-      </property>
-      <property name="spacing">
-       <number>6</number>
-      </property>
-      <item row="2" column="1" colspan="2">
-       <widget class="SalomeApp_IntSpinBox" name="SpinBox_DX">
-        <property name="maximum">
-         <number>1000000</number>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="TextLabel3">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL3</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="TextLabel2">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="frameShape">
-         <enum>QFrame::NoFrame</enum>
-        </property>
-        <property name="frameShadow">
-         <enum>QFrame::Plain</enum>
-        </property>
-        <property name="text">
-         <string>TL2</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QPushButton" name="PushButton1">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="2">
-       <widget class="QLineEdit" name="LineEdit2"/>
-      </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="TextLabel1">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL1</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QPushButton" name="PushButton2">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="2">
-       <widget class="QLineEdit" name="LineEdit1"/>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <layoutdefault spacing="6" margin="11"/>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <customwidgets>
-  <customwidget>
-   <class>SalomeApp_IntSpinBox</class>
-   <extends>QSpinBox</extends>
-   <header location="global">SalomeApp_IntSpinBox.h</header>
-  </customwidget>
- </customwidgets>
- <tabstops>
-  <tabstop>PushButton1</tabstop>
-  <tabstop>LineEdit1</tabstop>
-  <tabstop>PushButton2</tabstop>
-  <tabstop>LineEdit2</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel1Spin_QTD.ui b/src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel1Spin_QTD.ui
index bcaccca..a4b2311 100755
--- a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel1Spin_QTD.ui
+++ b/src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel1Spin_QTD.ui
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>DlgRef_2Sel1Spin_QTD</class>
- <widget class="QWidget" name="DlgRef_2Sel1Spin_QTD">
+ <class>MyDlgRef_2Sel1Spin_QTD</class>
+ <widget class="QWidget" name="MyDlgRef_2Sel1Spin_QTD">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>219</width>
-    <height>124</height>
+    <height>129</height>
    </rect>
   </property>
   <property name="windowTitle">
diff --git a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel2List_QTD.ui b/src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel2List_QTD.ui
deleted file mode 100755
index b54bca5..0000000
--- a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel2List_QTD.ui
+++ /dev/null
@@ -1,166 +0,0 @@
-<ui version="4.0" >
- <class>DlgRef_2Sel2List_QTD</class>
- <widget class="QWidget" name="DlgRef_2Sel2List_QTD" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>128</width>
-    <height>144</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string/>
-  </property>
-  <layout class="QGridLayout" >
-   <property name="leftMargin" >
-    <number>0</number>
-   </property>
-   <property name="topMargin" >
-    <number>0</number>
-   </property>
-   <property name="rightMargin" >
-    <number>0</number>
-   </property>
-   <property name="bottomMargin" >
-    <number>0</number>
-   </property>
-   <item row="0" column="0" >
-    <widget class="QGroupBox" name="GroupBox1" >
-     <property name="title" >
-      <string/>
-     </property>
-     <layout class="QGridLayout" >
-      <item row="0" column="0" >
-       <widget class="QLabel" name="TextLabel1" >
-        <property name="sizePolicy" >
-         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string>TL1</string>
-        </property>
-        <property name="wordWrap" >
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1" >
-       <widget class="QPushButton" name="PushButton1" >
-        <property name="sizePolicy" >
-         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="2" >
-       <widget class="QLineEdit" name="LineEdit1" />
-      </item>
-      <item row="1" column="0" >
-       <widget class="QLabel" name="TextLabel2" >
-        <property name="sizePolicy" >
-         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string>TL2</string>
-        </property>
-        <property name="wordWrap" >
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1" >
-       <widget class="QPushButton" name="PushButton2" >
-        <property name="sizePolicy" >
-         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="2" >
-       <widget class="QLineEdit" name="LineEdit2" />
-      </item>
-      <item row="2" column="0" >
-       <widget class="QLabel" name="TextLabel3" >
-        <property name="sizePolicy" >
-         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string>TL3</string>
-        </property>
-        <property name="wordWrap" >
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1" colspan="2" >
-       <widget class="QComboBox" name="ComboBox1" >
-        <property name="sizePolicy" >
-         <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0" >
-       <widget class="QLabel" name="TextLabel4" >
-        <property name="sizePolicy" >
-         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string>TL4</string>
-        </property>
-        <property name="wordWrap" >
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="1" colspan="2" >
-       <widget class="QComboBox" name="ComboBox2" >
-        <property name="sizePolicy" >
-         <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <layoutdefault spacing="6" margin="11" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <tabstops>
-  <tabstop>PushButton1</tabstop>
-  <tabstop>LineEdit1</tabstop>
-  <tabstop>PushButton2</tabstop>
-  <tabstop>LineEdit2</tabstop>
-  <tabstop>ComboBox1</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel2Spin1Check_QTD.ui b/src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel2Spin1Check_QTD.ui
deleted file mode 100755
index 4107b05..0000000
--- a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel2Spin1Check_QTD.ui
+++ /dev/null
@@ -1,185 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DlgRef_2Sel2Spin1Check_QTD</class>
- <widget class="QWidget" name="DlgRef_2Sel2Spin1Check_QTD">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>156</width>
-    <height>151</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string/>
-  </property>
-  <layout class="QGridLayout">
-   <property name="margin">
-    <number>0</number>
-   </property>
-   <property name="spacing">
-    <number>0</number>
-   </property>
-   <item row="0" column="0">
-    <widget class="QGroupBox" name="GroupBox1">
-     <property name="title">
-      <string/>
-     </property>
-     <layout class="QGridLayout">
-      <property name="margin">
-       <number>9</number>
-      </property>
-      <property name="spacing">
-       <number>6</number>
-      </property>
-      <item row="4" column="0" colspan="3">
-       <widget class="QCheckBox" name="CheckButton1">
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="1" colspan="2">
-       <widget class="SalomeApp_IntSpinBox" name="SpinBox_DY">
-        <property name="maximum">
-         <number>1000000</number>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1" colspan="2">
-       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX">
-        <property name="decimals">
-         <number>6</number>
-        </property>
-        <property name="maximum">
-         <double>1000000000.000000000000000</double>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0">
-       <widget class="QLabel" name="TextLabel4">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL4</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="TextLabel3">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL3</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QPushButton" name="PushButton1">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QPushButton" name="PushButton2">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="2">
-       <widget class="QLineEdit" name="LineEdit2"/>
-      </item>
-      <item row="0" column="2">
-       <widget class="QLineEdit" name="LineEdit1"/>
-      </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="TextLabel1">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL1</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="TextLabel2">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL2</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <layoutdefault spacing="6" margin="11"/>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <customwidgets>
-  <customwidget>
-   <class>SalomeApp_DoubleSpinBox</class>
-   <extends>QDoubleSpinBox</extends>
-   <header location="global">SalomeApp_DoubleSpinBox.h</header>
-  </customwidget>
-  <customwidget>
-   <class>SalomeApp_IntSpinBox</class>
-   <extends>QSpinBox</extends>
-   <header location="global">SalomeApp_IntSpinBox.h</header>
-  </customwidget>
- </customwidgets>
- <tabstops>
-  <tabstop>PushButton1</tabstop>
-  <tabstop>LineEdit1</tabstop>
-  <tabstop>PushButton2</tabstop>
-  <tabstop>LineEdit2</tabstop>
-  <tabstop>SpinBox_DX</tabstop>
-  <tabstop>SpinBox_DY</tabstop>
-  <tabstop>CheckButton1</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel2Spin3Check_QTD.ui b/src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel2Spin3Check_QTD.ui
deleted file mode 100755
index 28fb859..0000000
--- a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel2Spin3Check_QTD.ui
+++ /dev/null
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DlgRef_2Sel2Spin3Check_QTD</class>
- <widget class="QWidget" name="DlgRef_2Sel2Spin3Check_QTD">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>156</width>
-    <height>197</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string/>
-  </property>
-  <layout class="QGridLayout">
-   <property name="margin">
-    <number>0</number>
-   </property>
-   <property name="spacing">
-    <number>0</number>
-   </property>
-   <item row="0" column="0">
-    <widget class="QGroupBox" name="GroupBox1">
-     <property name="title">
-      <string/>
-     </property>
-     <layout class="QGridLayout">
-      <property name="margin">
-       <number>9</number>
-      </property>
-      <property name="spacing">
-       <number>6</number>
-      </property>
-      <item row="0" column="0">
-       <widget class="QLabel" name="TextLabel1">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL1</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QPushButton" name="PushButton1">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="2">
-       <widget class="QLineEdit" name="LineEdit1"/>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="TextLabel2">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL2</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QPushButton" name="PushButton2">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="2">
-       <widget class="QLineEdit" name="LineEdit2"/>
-      </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="TextLabel3">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL3</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1" colspan="2">
-       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX">
-        <property name="decimals">
-         <number>6</number>
-        </property>
-        <property name="maximum">
-         <double>1000000000.000000000000000</double>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0">
-       <widget class="QLabel" name="TextLabel4">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL4</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="1" colspan="2">
-       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DY">
-        <property name="decimals">
-         <number>6</number>
-        </property>
-        <property name="maximum">
-         <double>1000000000.000000000000000</double>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="0" colspan="3">
-       <widget class="QCheckBox" name="CheckBox1">
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="5" column="0" colspan="3">
-       <widget class="QCheckBox" name="CheckBox2">
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="6" column="0" colspan="3">
-       <widget class="QCheckBox" name="CheckBox3">
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <layoutdefault spacing="6" margin="11"/>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <customwidgets>
-  <customwidget>
-   <class>SalomeApp_DoubleSpinBox</class>
-   <extends>QDoubleSpinBox</extends>
-   <header location="global">SalomeApp_DoubleSpinBox.h</header>
-  </customwidget>
- </customwidgets>
- <tabstops>
-  <tabstop>PushButton1</tabstop>
-  <tabstop>LineEdit1</tabstop>
-  <tabstop>PushButton2</tabstop>
-  <tabstop>LineEdit2</tabstop>
-  <tabstop>SpinBox_DX</tabstop>
-  <tabstop>SpinBox_DY</tabstop>
-  <tabstop>CheckBox1</tabstop>
-  <tabstop>CheckBox2</tabstop>
-  <tabstop>CheckBox3</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel2Spin_QTD.ui b/src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel2Spin_QTD.ui
deleted file mode 100755
index 56bbbfd..0000000
--- a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel2Spin_QTD.ui
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DlgRef_2Sel2Spin_QTD</class>
- <widget class="QWidget" name="DlgRef_2Sel2Spin_QTD">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>156</width>
-    <height>132</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string/>
-  </property>
-  <layout class="QGridLayout">
-   <property name="margin">
-    <number>0</number>
-   </property>
-   <property name="spacing">
-    <number>0</number>
-   </property>
-   <item row="0" column="0">
-    <widget class="QGroupBox" name="GroupBox1">
-     <property name="title">
-      <string/>
-     </property>
-     <layout class="QGridLayout">
-      <property name="margin">
-       <number>9</number>
-      </property>
-      <property name="spacing">
-       <number>6</number>
-      </property>
-      <item row="3" column="1" colspan="2">
-       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DY">
-        <property name="decimals">
-         <number>6</number>
-        </property>
-        <property name="maximum">
-         <double>1000000000.000000000000000</double>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1" colspan="2">
-       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX">
-        <property name="decimals">
-         <number>6</number>
-        </property>
-        <property name="maximum">
-         <double>1000000000.000000000000000</double>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0">
-       <widget class="QLabel" name="TextLabel4">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL4</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="TextLabel3">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL3</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="2">
-       <widget class="QLineEdit" name="LineEdit2"/>
-      </item>
-      <item row="0" column="1">
-       <widget class="QPushButton" name="PushButton1">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="TextLabel1">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL1</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QPushButton" name="PushButton2">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="TextLabel2">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL2</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="2">
-       <widget class="QLineEdit" name="LineEdit1"/>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <layoutdefault spacing="6" margin="11"/>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <customwidgets>
-  <customwidget>
-   <class>SalomeApp_DoubleSpinBox</class>
-   <extends>QDoubleSpinBox</extends>
-   <header location="global">SalomeApp_DoubleSpinBox.h</header>
-  </customwidget>
- </customwidgets>
- <tabstops>
-  <tabstop>PushButton1</tabstop>
-  <tabstop>LineEdit1</tabstop>
-  <tabstop>PushButton2</tabstop>
-  <tabstop>LineEdit2</tabstop>
-  <tabstop>SpinBox_DX</tabstop>
-  <tabstop>SpinBox_DY</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel3Spin2Rb_QTD.ui b/src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel3Spin2Rb_QTD.ui
deleted file mode 100755
index 19df9b9..0000000
--- a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel3Spin2Rb_QTD.ui
+++ /dev/null
@@ -1,219 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DlgRef_2Sel3Spin2Rb_QTD</class>
- <widget class="QWidget" name="DlgRef_2Sel3Spin2Rb_QTD">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>256</width>
-    <height>135</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>DlgRef_2Sel3Spin2Rb_QTD</string>
-  </property>
-  <layout class="QGridLayout">
-   <property name="margin">
-    <number>0</number>
-   </property>
-   <property name="spacing">
-    <number>0</number>
-   </property>
-   <item row="0" column="0">
-    <widget class="QGroupBox" name="GroupBox1">
-     <property name="title">
-      <string/>
-     </property>
-     <layout class="QGridLayout">
-      <item row="0" column="0">
-       <widget class="QLabel" name="TextLabel1">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL1</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QPushButton" name="PushButton1">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="2" colspan="3">
-       <widget class="QLineEdit" name="LineEdit1"/>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="TextLabel2">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL2</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QPushButton" name="PushButton2">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="2" colspan="3">
-       <widget class="QLineEdit" name="LineEdit2"/>
-      </item>
-      <item row="2" column="0">
-       <widget class="QRadioButton" name="RadioButton1">
-        <property name="text">
-         <string/>
-        </property>
-        <property name="checked">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1">
-       <widget class="QLabel" name="TextLabel3">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL3</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="2">
-       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX">
-        <property name="decimals">
-         <number>6</number>
-        </property>
-        <property name="maximum">
-         <double>1000000000.000000000000000</double>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0">
-       <widget class="QRadioButton" name="RadioButton2">
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="1">
-       <widget class="QLabel" name="TextLabel4">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL4</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="2">
-       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DY">
-        <property name="enabled">
-         <bool>false</bool>
-        </property>
-        <property name="decimals">
-         <number>6</number>
-        </property>
-        <property name="maximum">
-         <double>1000000000.000000000000000</double>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="3">
-       <widget class="QLabel" name="TextLabel5">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL5</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="4">
-       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DZ">
-        <property name="enabled">
-         <bool>false</bool>
-        </property>
-        <property name="decimals">
-         <number>6</number>
-        </property>
-        <property name="maximum">
-         <double>1000000000.000000000000000</double>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>SalomeApp_DoubleSpinBox</class>
-   <extends>QDoubleSpinBox</extends>
-   <header location="global">SalomeApp_DoubleSpinBox.h</header>
-  </customwidget>
- </customwidgets>
- <tabstops>
-  <tabstop>PushButton1</tabstop>
-  <tabstop>LineEdit1</tabstop>
-  <tabstop>PushButton2</tabstop>
-  <tabstop>LineEdit2</tabstop>
-  <tabstop>RadioButton1</tabstop>
-  <tabstop>SpinBox_DX</tabstop>
-  <tabstop>RadioButton2</tabstop>
-  <tabstop>SpinBox_DY</tabstop>
-  <tabstop>SpinBox_DZ</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel3Spin_QTD.ui b/src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel3Spin_QTD.ui
deleted file mode 100755
index 111c095..0000000
--- a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel3Spin_QTD.ui
+++ /dev/null
@@ -1,202 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DlgRef_2Sel3Spin_QTD</class>
- <widget class="QWidget" name="DlgRef_2Sel3Spin_QTD">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>156</width>
-    <height>159</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string/>
-  </property>
-  <layout class="QGridLayout">
-   <property name="margin">
-    <number>0</number>
-   </property>
-   <property name="spacing">
-    <number>6</number>
-   </property>
-   <item row="0" column="0">
-    <widget class="QGroupBox" name="GroupBox1">
-     <property name="title">
-      <string/>
-     </property>
-     <layout class="QGridLayout">
-      <property name="margin">
-       <number>9</number>
-      </property>
-      <property name="spacing">
-       <number>6</number>
-      </property>
-      <item row="4" column="0">
-       <widget class="QLabel" name="TextLabel5">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL5</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0">
-       <widget class="QLabel" name="TextLabel4">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL4</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="TextLabel3">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL3</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="TextLabel1">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL1</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="2">
-       <widget class="QLineEdit" name="LineEdit1"/>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="TextLabel2">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL2</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QPushButton" name="PushButton1">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="2">
-       <widget class="QLineEdit" name="LineEdit2"/>
-      </item>
-      <item row="1" column="1">
-       <widget class="QPushButton" name="PushButton2">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1" colspan="2">
-       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX">
-        <property name="decimals">
-         <number>6</number>
-        </property>
-        <property name="maximum">
-         <double>1000000000.000000000000000</double>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="1" colspan="2">
-       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DZ">
-        <property name="decimals">
-         <number>6</number>
-        </property>
-        <property name="maximum">
-         <double>1000000000.000000000000000</double>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="1" colspan="2">
-       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DY">
-        <property name="decimals">
-         <number>6</number>
-        </property>
-        <property name="maximum">
-         <double>1000000000.000000000000000</double>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <layoutdefault spacing="6" margin="11"/>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <customwidgets>
-  <customwidget>
-   <class>SalomeApp_DoubleSpinBox</class>
-   <extends>QDoubleSpinBox</extends>
-   <header location="global">SalomeApp_DoubleSpinBox.h</header>
-  </customwidget>
- </customwidgets>
- <tabstops>
-  <tabstop>PushButton1</tabstop>
-  <tabstop>LineEdit1</tabstop>
-  <tabstop>PushButton2</tabstop>
-  <tabstop>LineEdit2</tabstop>
-  <tabstop>SpinBox_DX</tabstop>
-  <tabstop>SpinBox_DY</tabstop>
-  <tabstop>SpinBox_DZ</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel4Spin1Check_QTD.ui b/src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel4Spin1Check_QTD.ui
deleted file mode 100755
index fb294c2..0000000
--- a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel4Spin1Check_QTD.ui
+++ /dev/null
@@ -1,236 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DlgRef_2Sel4Spin1Check_QTD</class>
- <widget class="QWidget" name="DlgRef_2Sel4Spin1Check_QTD">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>156</width>
-    <height>205</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string/>
-  </property>
-  <layout class="QGridLayout">
-   <property name="margin">
-    <number>0</number>
-   </property>
-   <property name="spacing">
-    <number>0</number>
-   </property>
-   <item row="0" column="0">
-    <widget class="QGroupBox" name="GroupBox1">
-     <property name="title">
-      <string/>
-     </property>
-     <layout class="QGridLayout">
-      <property name="margin">
-       <number>9</number>
-      </property>
-      <property name="spacing">
-       <number>6</number>
-      </property>
-      <item row="4" column="0" colspan="3">
-       <widget class="QCheckBox" name="CheckButton1">
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="6" column="1" colspan="2">
-       <widget class="SalomeApp_IntSpinBox" name="SpinBox_DY2">
-        <property name="maximum">
-         <number>1000000</number>
-        </property>
-       </widget>
-      </item>
-      <item row="5" column="1" colspan="2">
-       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX2">
-        <property name="decimals">
-         <number>6</number>
-        </property>
-        <property name="maximum">
-         <double>1000000000.000000000000000</double>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="1" colspan="2">
-       <widget class="SalomeApp_IntSpinBox" name="SpinBox_DY1">
-        <property name="maximum">
-         <number>1000000</number>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1" colspan="2">
-       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX1">
-        <property name="decimals">
-         <number>6</number>
-        </property>
-        <property name="maximum">
-         <double>1000000000.000000000000000</double>
-        </property>
-       </widget>
-      </item>
-      <item row="6" column="0">
-       <widget class="QLabel" name="TextLabel6">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL6</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="5" column="0">
-       <widget class="QLabel" name="TextLabel5">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL5</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0">
-       <widget class="QLabel" name="TextLabel4">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL4</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="TextLabel3">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL3</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="TextLabel2">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL2</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QPushButton" name="PushButton2">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="2">
-       <widget class="QLineEdit" name="LineEdit1"/>
-      </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="TextLabel1">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL1</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="2">
-       <widget class="QLineEdit" name="LineEdit2"/>
-      </item>
-      <item row="0" column="1">
-       <widget class="QPushButton" name="PushButton1">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <layoutdefault spacing="6" margin="11"/>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <customwidgets>
-  <customwidget>
-   <class>SalomeApp_DoubleSpinBox</class>
-   <extends>QDoubleSpinBox</extends>
-   <header location="global">SalomeApp_DoubleSpinBox.h</header>
-  </customwidget>
-  <customwidget>
-   <class>SalomeApp_IntSpinBox</class>
-   <extends>QSpinBox</extends>
-   <header location="global">SalomeApp_IntSpinBox.h</header>
-  </customwidget>
- </customwidgets>
- <tabstops>
-  <tabstop>PushButton1</tabstop>
-  <tabstop>LineEdit1</tabstop>
-  <tabstop>PushButton2</tabstop>
-  <tabstop>LineEdit2</tabstop>
-  <tabstop>SpinBox_DX1</tabstop>
-  <tabstop>SpinBox_DY1</tabstop>
-  <tabstop>CheckButton1</tabstop>
-  <tabstop>SpinBox_DX2</tabstop>
-  <tabstop>SpinBox_DY2</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_2SelExt_QTD.ui b/src/HEXABLOCKGUI/MyDlgRef/DlgRef_2SelExt_QTD.ui
deleted file mode 100755
index a5ab1a4..0000000
--- a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_2SelExt_QTD.ui
+++ /dev/null
@@ -1,132 +0,0 @@
-<ui version="4.0" >
- <class>DlgRef_2SelExt_QTD</class>
- <widget class="QWidget" name="DlgRef_2SelExt_QTD" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>155</width>
-    <height>80</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string/>
-  </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>0</number>
-   </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
-   <item row="0" column="0" >
-    <widget class="QGroupBox" name="GroupBox1" >
-     <property name="sizePolicy" >
-      <sizepolicy>
-       <hsizetype>7</hsizetype>
-       <vsizetype>7</vsizetype>
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="title" >
-      <string/>
-     </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item row="2" column="0" colspan="3" >
-       <widget class="QWidget" native="1" name="Box" />
-      </item>
-      <item row="1" column="2" >
-       <widget class="QLineEdit" name="LineEdit2" />
-      </item>
-      <item row="1" column="1" >
-       <widget class="QPushButton" name="PushButton2" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1" >
-       <widget class="QPushButton" name="PushButton1" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0" >
-       <widget class="QLabel" name="TextLabel2" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string>TL1</string>
-        </property>
-        <property name="wordWrap" >
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0" >
-       <widget class="QLabel" name="TextLabel1" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string>TL1</string>
-        </property>
-        <property name="wordWrap" >
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="2" >
-       <widget class="QLineEdit" name="LineEdit1" />
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <layoutdefault spacing="6" margin="11" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <tabstops>
-  <tabstop>PushButton1</tabstop>
-  <tabstop>LineEdit1</tabstop>
-  <tabstop>PushButton2</tabstop>
-  <tabstop>LineEdit2</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel_QTD.ui b/src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel_QTD.ui
index 753d958..d7618fb 100755
--- a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel_QTD.ui
+++ b/src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel_QTD.ui
@@ -1,122 +1,113 @@
-<ui version="4.0" >
- <class>DlgRef_2Sel_QTD</class>
- <widget class="QWidget" name="DlgRef_2Sel_QTD" >
-  <property name="geometry" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MyDlgRef_2Sel_QTD</class>
+ <widget class="QWidget" name="MyDlgRef_2Sel_QTD">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>156</width>
-    <height>74</height>
+    <height>96</height>
    </rect>
   </property>
-  <property name="sizePolicy" >
-   <sizepolicy>
-    <hsizetype>5</hsizetype>
-    <vsizetype>7</vsizetype>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string/>
   </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
+  <layout class="QGridLayout">
+   <property name="margin">
     <number>0</number>
    </property>
-   <property name="spacing" >
+   <property name="spacing">
     <number>6</number>
    </property>
-   <item row="0" column="0" >
-    <widget class="QGroupBox" name="GroupBox1" >
-     <property name="title" >
+   <item row="0" column="0">
+    <widget class="QGroupBox" name="GroupBox1">
+     <property name="title">
       <string/>
      </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
+     <layout class="QGridLayout">
+      <property name="margin">
        <number>9</number>
       </property>
-      <property name="spacing" >
+      <property name="spacing">
        <number>6</number>
       </property>
-      <item row="1" column="2" >
-       <widget class="QLineEdit" name="LineEdit2" />
+      <item row="1" column="2">
+       <widget class="QLineEdit" name="LineEdit2"/>
       </item>
-      <item row="1" column="1" >
-       <widget class="QPushButton" name="PushButton2" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
+      <item row="1" column="1">
+       <widget class="QPushButton" name="PushButton2">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
-        <property name="text" >
+        <property name="text">
          <string/>
         </property>
        </widget>
       </item>
-      <item row="0" column="0" >
-       <widget class="QLabel" name="TextLabel1" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
+      <item row="0" column="0">
+       <widget class="QLabel" name="TextLabel1">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
-        <property name="text" >
+        <property name="text">
          <string>TL1</string>
         </property>
-        <property name="wordWrap" >
+        <property name="wordWrap">
          <bool>false</bool>
         </property>
        </widget>
       </item>
-      <item row="0" column="1" >
-       <widget class="QPushButton" name="PushButton1" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
+      <item row="0" column="1">
+       <widget class="QPushButton" name="PushButton1">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
-        <property name="text" >
+        <property name="text">
          <string/>
         </property>
        </widget>
       </item>
-      <item row="1" column="0" >
-       <widget class="QLabel" name="TextLabel2" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
+      <item row="1" column="0">
+       <widget class="QLabel" name="TextLabel2">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
-        <property name="text" >
+        <property name="text">
          <string>TL2</string>
         </property>
-        <property name="wordWrap" >
+        <property name="wordWrap">
          <bool>false</bool>
         </property>
        </widget>
       </item>
-      <item row="0" column="2" >
-       <widget class="QLineEdit" name="LineEdit1" />
+      <item row="0" column="2">
+       <widget class="QLineEdit" name="LineEdit1"/>
       </item>
      </layout>
     </widget>
    </item>
   </layout>
  </widget>
- <layoutdefault spacing="6" margin="11" />
+ <layoutdefault spacing="6" margin="11"/>
  <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
  <tabstops>
   <tabstop>PushButton1</tabstop>
diff --git a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Spin_QTD.ui b/src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Spin_QTD.ui
deleted file mode 100755
index 74e340d..0000000
--- a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Spin_QTD.ui
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DlgRef_2Spin_QTD</class>
- <widget class="QWidget" name="DlgRef_2Spin_QTD">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>114</width>
-    <height>70</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string/>
-  </property>
-  <layout class="QGridLayout">
-   <property name="margin">
-    <number>0</number>
-   </property>
-   <property name="spacing">
-    <number>0</number>
-   </property>
-   <item row="0" column="0">
-    <widget class="QGroupBox" name="GroupBox1">
-     <property name="title">
-      <string/>
-     </property>
-     <layout class="QGridLayout">
-      <property name="margin">
-       <number>9</number>
-      </property>
-      <property name="spacing">
-       <number>6</number>
-      </property>
-      <item row="0" column="0">
-       <widget class="QLabel" name="TextLabel1">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL1</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX">
-        <property name="decimals">
-         <number>6</number>
-        </property>
-        <property name="maximum">
-         <double>1000000000.000000000000000</double>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="TextLabel2">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL2</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DY">
-        <property name="decimals">
-         <number>6</number>
-        </property>
-        <property name="maximum">
-         <double>1000000000.000000000000000</double>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <layoutdefault spacing="6" margin="11"/>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <customwidgets>
-  <customwidget>
-   <class>SalomeApp_DoubleSpinBox</class>
-   <extends>QDoubleSpinBox</extends>
-   <header location="global">SalomeApp_DoubleSpinBox.h</header>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_3Check_QTD.ui b/src/HEXABLOCKGUI/MyDlgRef/DlgRef_3Check_QTD.ui
deleted file mode 100755
index aa9a707..0000000
--- a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_3Check_QTD.ui
+++ /dev/null
@@ -1,69 +0,0 @@
-<ui version="4.0" >
- <class>DlgRef_3Check_QTD</class>
- <widget class="QWidget" name="DlgRef_3Check_QTD" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>118</width>
-    <height>88</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string/>
-  </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>0</number>
-   </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
-   <item row="0" column="0" >
-    <widget class="QGroupBox" name="GroupBox1" >
-     <property name="title" >
-      <string/>
-     </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item row="1" column="0" >
-       <widget class="QRadioButton" name="RadioButton2" >
-        <property name="text" >
-         <string>RadioButton2</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0" >
-       <widget class="QRadioButton" name="RadioButton1" >
-        <property name="text" >
-         <string>RadioButton1</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0" >
-       <widget class="QRadioButton" name="RadioButton3" >
-        <property name="text" >
-         <string>RadioButton3</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <layoutdefault spacing="6" margin="11" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <tabstops>
-  <tabstop>RadioButton1</tabstop>
-  <tabstop>RadioButton2</tabstop>
-  <tabstop>RadioButton3</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_3Radio1Sel1Spin_QTD.ui b/src/HEXABLOCKGUI/MyDlgRef/DlgRef_3Radio1Sel1Spin_QTD.ui
deleted file mode 100755
index e17614e..0000000
--- a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_3Radio1Sel1Spin_QTD.ui
+++ /dev/null
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DlgRef_3Radio1Sel1Spin_QTD</class>
- <widget class="QWidget" name="DlgRef_3Radio1Sel1Spin_QTD">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>357</width>
-    <height>131</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string/>
-  </property>
-  <layout class="QGridLayout">
-   <property name="margin">
-    <number>0</number>
-   </property>
-   <property name="spacing">
-    <number>0</number>
-   </property>
-   <item row="0" column="0">
-    <widget class="QGroupBox" name="GroupBox1">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>357</width>
-       <height>131</height>
-      </size>
-     </property>
-     <property name="title">
-      <string/>
-     </property>
-     <layout class="QGridLayout" name="gridLayout">
-      <item row="3" column="0" colspan="4">
-       <layout class="QHBoxLayout" name="horizontalLayout">
-        <item>
-         <widget class="QRadioButton" name="RadioButton1">
-          <property name="text">
-           <string>RadioButton1</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QRadioButton" name="RadioButton2">
-          <property name="text">
-           <string>RadioButton2</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QRadioButton" name="RadioButton3">
-          <property name="text">
-           <string>RadioButton3</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-      <item row="6" column="3">
-       <spacer name="verticalSpacer">
-        <property name="orientation">
-         <enum>Qt::Vertical</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>256</width>
-          <height>19</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="5" column="0">
-       <widget class="QLabel" name="TextLabel2">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL2</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="5" column="1" colspan="3">
-       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX">
-        <property name="decimals">
-         <number>6</number>
-        </property>
-        <property name="maximum">
-         <double>1000000000.000000000000000</double>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="3">
-       <widget class="QLineEdit" name="LineEdit1"/>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="TextLabel1">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL1</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QPushButton" name="PushButton1">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <layoutdefault spacing="6" margin="11"/>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <customwidgets>
-  <customwidget>
-   <class>SalomeApp_DoubleSpinBox</class>
-   <extends>QDoubleSpinBox</extends>
-   <header location="global">SalomeApp_DoubleSpinBox.h</header>
-  </customwidget>
- </customwidgets>
- <tabstops>
-  <tabstop>SpinBox_DX</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_3Radio_QTD.ui b/src/HEXABLOCKGUI/MyDlgRef/DlgRef_3Radio_QTD.ui
deleted file mode 100755
index e55899e..0000000
--- a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_3Radio_QTD.ui
+++ /dev/null
@@ -1,75 +0,0 @@
-<ui version="4.0" >
- <class>DlgRef_3Radio_QTD</class>
- <widget class="QWidget" name="DlgRef_3Radio_QTD" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>335</width>
-    <height>44</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string/>
-  </property>
-  <layout class="QGridLayout" >
-   <property name="leftMargin" >
-    <number>0</number>
-   </property>
-   <property name="topMargin" >
-    <number>0</number>
-   </property>
-   <property name="rightMargin" >
-    <number>0</number>
-   </property>
-   <property name="bottomMargin" >
-    <number>0</number>
-   </property>
-   <property name="horizontalSpacing" >
-    <number>6</number>
-   </property>
-   <property name="verticalSpacing" >
-    <number>6</number>
-   </property>
-   <item row="0" column="0" >
-    <widget class="QGroupBox" name="GroupBox1" >
-     <property name="title" >
-      <string/>
-     </property>
-     <layout class="QHBoxLayout" >
-      <item>
-       <widget class="QRadioButton" name="RadioButton1" >
-        <property name="text" >
-         <string>RadioButton1</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QRadioButton" name="RadioButton2" >
-        <property name="text" >
-         <string>RadioButton2</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QRadioButton" name="RadioButton3" >
-        <property name="text" >
-         <string>RadioButton3</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <layoutdefault spacing="6" margin="11" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <tabstops>
-  <tabstop>RadioButton1</tabstop>
-  <tabstop>RadioButton2</tabstop>
-  <tabstop>RadioButton3</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_3Sel1Check_QTD.ui b/src/HEXABLOCKGUI/MyDlgRef/DlgRef_3Sel1Check_QTD.ui
deleted file mode 100755
index 91d9258..0000000
--- a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_3Sel1Check_QTD.ui
+++ /dev/null
@@ -1,182 +0,0 @@
-<ui version="4.0" >
- <class>DlgRef_3Sel1Check_QTD</class>
- <widget class="QWidget" name="DlgRef_3Sel1Check_QTD" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>156</width>
-    <height>126</height>
-   </rect>
-  </property>
-  <property name="sizePolicy" >
-   <sizepolicy>
-    <hsizetype>5</hsizetype>
-    <vsizetype>5</vsizetype>
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="windowTitle" >
-   <string/>
-  </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>0</number>
-   </property>
-   <property name="spacing" >
-    <number>0</number>
-   </property>
-   <item row="0" column="0" >
-    <widget class="QGroupBox" name="GroupBox1" >
-     <property name="sizePolicy" >
-      <sizepolicy>
-       <hsizetype>5</hsizetype>
-       <vsizetype>5</vsizetype>
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="title" >
-      <string/>
-     </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item row="3" column="0" colspan="3" >
-       <widget class="QCheckBox" name="CheckButton1" >
-        <property name="text" >
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="2" >
-       <widget class="QLineEdit" name="LineEdit1" />
-      </item>
-      <item row="2" column="0" >
-       <widget class="QLabel" name="TextLabel3" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string>TL3</string>
-        </property>
-        <property name="wordWrap" >
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="2" >
-       <widget class="QLineEdit" name="LineEdit3" />
-      </item>
-      <item row="2" column="1" >
-       <widget class="QPushButton" name="PushButton3" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0" >
-       <widget class="QLabel" name="TextLabel2" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string>TL2</string>
-        </property>
-        <property name="wordWrap" >
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="2" >
-       <widget class="QLineEdit" name="LineEdit2" />
-      </item>
-      <item row="1" column="1" >
-       <widget class="QPushButton" name="PushButton2" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0" >
-       <widget class="QLabel" name="TextLabel1" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string>TL1</string>
-        </property>
-        <property name="wordWrap" >
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1" >
-       <widget class="QPushButton" name="PushButton1" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string/>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <layoutdefault spacing="6" margin="11" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <tabstops>
-  <tabstop>PushButton1</tabstop>
-  <tabstop>LineEdit1</tabstop>
-  <tabstop>PushButton2</tabstop>
-  <tabstop>LineEdit2</tabstop>
-  <tabstop>PushButton3</tabstop>
-  <tabstop>LineEdit3</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_3Sel1Spin_QTD.ui b/src/HEXABLOCKGUI/MyDlgRef/DlgRef_3Sel1Spin_QTD.ui
deleted file mode 100755
index 067340a..0000000
--- a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_3Sel1Spin_QTD.ui
+++ /dev/null
@@ -1,194 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DlgRef_3Sel1Spin_QTD</class>
- <widget class="QWidget" name="DlgRef_3Sel1Spin_QTD">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>156</width>
-    <height>136</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="windowTitle">
-   <string/>
-  </property>
-  <layout class="QGridLayout">
-   <property name="margin">
-    <number>0</number>
-   </property>
-   <property name="spacing">
-    <number>0</number>
-   </property>
-   <item row="0" column="0">
-    <widget class="QGroupBox" name="GroupBox1">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="title">
-      <string/>
-     </property>
-     <layout class="QGridLayout">
-      <property name="margin">
-       <number>9</number>
-      </property>
-      <property name="spacing">
-       <number>6</number>
-      </property>
-      <item row="0" column="0">
-       <widget class="QLabel" name="TextLabel1">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL1</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="2">
-       <widget class="QLineEdit" name="LineEdit3"/>
-      </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="TextLabel3">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL3</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QPushButton" name="PushButton1">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0">
-       <widget class="QLabel" name="TextLabel4">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL4</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="2">
-       <widget class="QLineEdit" name="LineEdit2"/>
-      </item>
-      <item row="2" column="1">
-       <widget class="QPushButton" name="PushButton3">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="TextLabel2">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL2</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="2">
-       <widget class="QLineEdit" name="LineEdit1"/>
-      </item>
-      <item row="1" column="1">
-       <widget class="QPushButton" name="PushButton2">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="1" colspan="2">
-       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX">
-        <property name="decimals">
-         <number>6</number>
-        </property>
-        <property name="maximum">
-         <double>1000000000.000000000000000</double>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <layoutdefault spacing="6" margin="11"/>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <customwidgets>
-  <customwidget>
-   <class>SalomeApp_DoubleSpinBox</class>
-   <extends>QDoubleSpinBox</extends>
-   <header location="global">SalomeApp_DoubleSpinBox.h</header>
-  </customwidget>
- </customwidgets>
- <tabstops>
-  <tabstop>PushButton1</tabstop>
-  <tabstop>LineEdit1</tabstop>
-  <tabstop>PushButton2</tabstop>
-  <tabstop>LineEdit2</tabstop>
-  <tabstop>PushButton3</tabstop>
-  <tabstop>LineEdit3</tabstop>
-  <tabstop>SpinBox_DX</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_3Sel2Spin_QTD.ui b/src/HEXABLOCKGUI/MyDlgRef/DlgRef_3Sel2Spin_QTD.ui
deleted file mode 100755
index 199727b..0000000
--- a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_3Sel2Spin_QTD.ui
+++ /dev/null
@@ -1,214 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DlgRef_3Sel2Spin_QTD</class>
- <widget class="QWidget" name="DlgRef_3Sel2Spin_QTD">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>120</width>
-    <height>177</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="windowTitle">
-   <string/>
-  </property>
-  <layout class="QGridLayout">
-   <property name="margin">
-    <number>0</number>
-   </property>
-   <property name="spacing">
-    <number>0</number>
-   </property>
-   <item row="0" column="0">
-    <widget class="QGroupBox" name="GroupBox1">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="title">
-      <string/>
-     </property>
-     <layout class="QGridLayout" name="gridLayout">
-      <item row="0" column="0">
-       <widget class="QLabel" name="TextLabel1">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL1</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QPushButton" name="PushButton1">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="2">
-       <widget class="QLineEdit" name="LineEdit1"/>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="TextLabel2">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL2</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QPushButton" name="PushButton2">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="2">
-       <widget class="QLineEdit" name="LineEdit2"/>
-      </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="TextLabel3">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL3</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1">
-       <widget class="QPushButton" name="PushButton3">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="2">
-       <widget class="QLineEdit" name="LineEdit3"/>
-      </item>
-      <item row="3" column="0">
-       <widget class="QLabel" name="TextLabel4">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL4</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="1" colspan="2">
-       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX">
-        <property name="decimals">
-         <number>6</number>
-        </property>
-        <property name="maximum">
-         <double>1000000000.000000000000000</double>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="0">
-       <widget class="QLabel" name="TextLabel5">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL5</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="1" colspan="2">
-       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DY">
-        <property name="decimals">
-         <number>6</number>
-        </property>
-        <property name="maximum">
-         <double>1000000000.000000000000000</double>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <layoutdefault spacing="6" margin="11"/>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <customwidgets>
-  <customwidget>
-   <class>SalomeApp_DoubleSpinBox</class>
-   <extends>QDoubleSpinBox</extends>
-   <header location="global">SalomeApp_DoubleSpinBox.h</header>
-  </customwidget>
- </customwidgets>
- <tabstops>
-  <tabstop>PushButton1</tabstop>
-  <tabstop>LineEdit1</tabstop>
-  <tabstop>PushButton2</tabstop>
-  <tabstop>LineEdit2</tabstop>
-  <tabstop>PushButton3</tabstop>
-  <tabstop>LineEdit3</tabstop>
-  <tabstop>SpinBox_DX</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_3Sel3Spin1Check_QTD.ui b/src/HEXABLOCKGUI/MyDlgRef/DlgRef_3Sel3Spin1Check_QTD.ui
deleted file mode 100755
index d31515e..0000000
--- a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_3Sel3Spin1Check_QTD.ui
+++ /dev/null
@@ -1,256 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DlgRef_3Sel3Spin1Check_QTD</class>
- <widget class="QWidget" name="DlgRef_3Sel3Spin1Check_QTD">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>156</width>
-    <height>216</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="windowTitle">
-   <string/>
-  </property>
-  <layout class="QGridLayout">
-   <property name="margin">
-    <number>0</number>
-   </property>
-   <property name="spacing">
-    <number>0</number>
-   </property>
-   <item row="0" column="0">
-    <widget class="QGroupBox" name="GroupBox1">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="title">
-      <string/>
-     </property>
-     <layout class="QGridLayout">
-      <property name="margin">
-       <number>9</number>
-      </property>
-      <property name="spacing">
-       <number>6</number>
-      </property>
-      <item row="6" column="0" colspan="3">
-       <widget class="QCheckBox" name="CheckBox1">
-        <property name="text">
-         <string>Check</string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="1" colspan="2">
-       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox1">
-        <property name="decimals">
-         <number>6</number>
-        </property>
-        <property name="maximum">
-         <double>1000000000.000000000000000</double>
-        </property>
-       </widget>
-      </item>
-      <item row="5" column="1" colspan="2">
-       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox3">
-        <property name="decimals">
-         <number>6</number>
-        </property>
-        <property name="maximum">
-         <double>1000000000.000000000000000</double>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="1" colspan="2">
-       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox2">
-        <property name="decimals">
-         <number>6</number>
-        </property>
-        <property name="maximum">
-         <double>1000000000.000000000000000</double>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QPushButton" name="PushButton2">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="2">
-       <widget class="QLineEdit" name="LineEdit1"/>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="TextLabel2">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL2</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1">
-       <widget class="QPushButton" name="PushButton3">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="2">
-       <widget class="QLineEdit" name="LineEdit2"/>
-      </item>
-      <item row="3" column="0">
-       <widget class="QLabel" name="TextLabel4">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL4</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QPushButton" name="PushButton1">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="TextLabel3">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL3</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="2">
-       <widget class="QLineEdit" name="LineEdit3"/>
-      </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="TextLabel1">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL1</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="0">
-       <widget class="QLabel" name="TextLabel5">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL5</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="5" column="0">
-       <widget class="QLabel" name="TextLabel6">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL6</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <layoutdefault spacing="6" margin="11"/>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <customwidgets>
-  <customwidget>
-   <class>SalomeApp_DoubleSpinBox</class>
-   <extends>QDoubleSpinBox</extends>
-   <header location="global">SalomeApp_DoubleSpinBox.h</header>
-  </customwidget>
- </customwidgets>
- <tabstops>
-  <tabstop>PushButton1</tabstop>
-  <tabstop>LineEdit1</tabstop>
-  <tabstop>PushButton2</tabstop>
-  <tabstop>LineEdit2</tabstop>
-  <tabstop>PushButton3</tabstop>
-  <tabstop>LineEdit3</tabstop>
-  <tabstop>SpinBox1</tabstop>
-  <tabstop>SpinBox2</tabstop>
-  <tabstop>SpinBox3</tabstop>
-  <tabstop>CheckBox1</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_3Sel3Spin2Check_QTD.ui b/src/HEXABLOCKGUI/MyDlgRef/DlgRef_3Sel3Spin2Check_QTD.ui
deleted file mode 100755
index 103fdec..0000000
--- a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_3Sel3Spin2Check_QTD.ui
+++ /dev/null
@@ -1,243 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DlgRef_3Sel3Spin2Check_QTD</class>
- <widget class="QWidget" name="DlgRef_3Sel3Spin2Check_QTD">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>120</width>
-    <height>242</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string/>
-  </property>
-  <layout class="QGridLayout">
-   <property name="margin">
-    <number>0</number>
-   </property>
-   <item row="0" column="0">
-    <widget class="QGroupBox" name="GroupBox1">
-     <property name="title">
-      <string/>
-     </property>
-     <layout class="QGridLayout">
-      <item row="0" column="0">
-       <widget class="QLabel" name="TextLabel1">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL1</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QPushButton" name="PushButton1">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="2">
-       <widget class="QLineEdit" name="LineEdit1"/>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="TextLabel2">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL2</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QPushButton" name="PushButton2">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="2">
-       <widget class="QLineEdit" name="LineEdit2"/>
-      </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="TextLabel3">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL3</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1">
-       <widget class="QPushButton" name="PushButton3">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="2">
-       <widget class="QLineEdit" name="LineEdit3"/>
-      </item>
-      <item row="3" column="0">
-       <widget class="QLabel" name="TextLabel4">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL4</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="1" colspan="2">
-       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox1">
-        <property name="decimals">
-         <number>6</number>
-        </property>
-        <property name="maximum">
-         <double>1000000000.000000000000000</double>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="0">
-       <widget class="QLabel" name="TextLabel5">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL5</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="1" colspan="2">
-       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox2">
-        <property name="decimals">
-         <number>6</number>
-        </property>
-        <property name="maximum">
-         <double>1000000000.000000000000000</double>
-        </property>
-       </widget>
-      </item>
-      <item row="5" column="0">
-       <widget class="QLabel" name="TextLabel6">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL6</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="5" column="1" colspan="2">
-       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox3">
-        <property name="decimals">
-         <number>6</number>
-        </property>
-        <property name="maximum">
-         <double>1000000000.000000000000000</double>
-        </property>
-       </widget>
-      </item>
-      <item row="6" column="0" colspan="3">
-       <widget class="QCheckBox" name="CheckBox1">
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="7" column="0" colspan="3">
-       <widget class="QCheckBox" name="CheckBox2">
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <layoutdefault spacing="6" margin="11"/>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <customwidgets>
-  <customwidget>
-   <class>SalomeApp_DoubleSpinBox</class>
-   <extends>QDoubleSpinBox</extends>
-   <header location="global">SalomeApp_DoubleSpinBox.h</header>
-  </customwidget>
- </customwidgets>
- <tabstops>
-  <tabstop>PushButton1</tabstop>
-  <tabstop>LineEdit1</tabstop>
-  <tabstop>PushButton2</tabstop>
-  <tabstop>LineEdit2</tabstop>
-  <tabstop>PushButton3</tabstop>
-  <tabstop>LineEdit3</tabstop>
-  <tabstop>SpinBox1</tabstop>
-  <tabstop>SpinBox2</tabstop>
-  <tabstop>SpinBox3</tabstop>
-  <tabstop>CheckBox1</tabstop>
-  <tabstop>CheckBox2</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_3Sel4Spin2Check_QTD.ui b/src/HEXABLOCKGUI/MyDlgRef/DlgRef_3Sel4Spin2Check_QTD.ui
deleted file mode 100755
index 80035d4..0000000
--- a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_3Sel4Spin2Check_QTD.ui
+++ /dev/null
@@ -1,278 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DlgRef_3Sel4Spin2Check_QTD</class>
- <widget class="QWidget" name="DlgRef_3Sel4Spin2Check_QTD">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>156</width>
-    <height>255</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string/>
-  </property>
-  <layout class="QGridLayout">
-   <property name="margin">
-    <number>0</number>
-   </property>
-   <property name="spacing">
-    <number>0</number>
-   </property>
-   <item row="0" column="0">
-    <widget class="QGroupBox" name="GroupBox1">
-     <property name="title">
-      <string/>
-     </property>
-     <layout class="QGridLayout">
-      <property name="margin">
-       <number>9</number>
-      </property>
-      <property name="spacing">
-       <number>6</number>
-      </property>
-      <item row="7" column="1" colspan="2">
-       <widget class="SalomeApp_IntSpinBox" name="SpinBox_DY2">
-        <property name="maximum">
-         <number>1000000</number>
-        </property>
-       </widget>
-      </item>
-      <item row="6" column="1" colspan="2">
-       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX2">
-        <property name="decimals">
-         <number>6</number>
-        </property>
-        <property name="maximum">
-         <double>1000000000.000000000000000</double>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="1" colspan="2">
-       <widget class="SalomeApp_IntSpinBox" name="SpinBox_DY1">
-        <property name="maximum">
-         <number>1000000</number>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="1" colspan="2">
-       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX1">
-        <property name="decimals">
-         <number>6</number>
-        </property>
-        <property name="maximum">
-         <double>1000000000.000000000000000</double>
-        </property>
-       </widget>
-      </item>
-      <item row="5" column="0" colspan="3">
-       <widget class="QCheckBox" name="CheckButton1">
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="6" column="0">
-       <widget class="QLabel" name="TextLabel6">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL6</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="7" column="0">
-       <widget class="QLabel" name="TextLabel7">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL7</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0">
-       <widget class="QLabel" name="TextLabel4">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL4</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="0">
-       <widget class="QLabel" name="TextLabel5">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL5</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="TextLabel2">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL2</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="TextLabel1">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL1</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1">
-       <widget class="QPushButton" name="PushButton3">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QPushButton" name="PushButton1">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="2">
-       <widget class="QLineEdit" name="LineEdit3"/>
-      </item>
-      <item row="1" column="1">
-       <widget class="QPushButton" name="PushButton2">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="TextLabel3">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL3</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="2">
-       <widget class="QLineEdit" name="LineEdit1"/>
-      </item>
-      <item row="1" column="2">
-       <widget class="QLineEdit" name="LineEdit2"/>
-      </item>
-      <item row="8" column="0" colspan="3">
-       <widget class="QCheckBox" name="CheckButton2">
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <layoutdefault spacing="6" margin="11"/>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <customwidgets>
-  <customwidget>
-   <class>SalomeApp_DoubleSpinBox</class>
-   <extends>QDoubleSpinBox</extends>
-   <header location="global">SalomeApp_DoubleSpinBox.h</header>
-  </customwidget>
-  <customwidget>
-   <class>SalomeApp_IntSpinBox</class>
-   <extends>QSpinBox</extends>
-   <header location="global">SalomeApp_IntSpinBox.h</header>
-  </customwidget>
- </customwidgets>
- <tabstops>
-  <tabstop>PushButton1</tabstop>
-  <tabstop>LineEdit1</tabstop>
-  <tabstop>PushButton2</tabstop>
-  <tabstop>LineEdit2</tabstop>
-  <tabstop>PushButton3</tabstop>
-  <tabstop>LineEdit3</tabstop>
-  <tabstop>SpinBox_DX1</tabstop>
-  <tabstop>SpinBox_DY1</tabstop>
-  <tabstop>CheckButton1</tabstop>
-  <tabstop>SpinBox_DX2</tabstop>
-  <tabstop>SpinBox_DY2</tabstop>
-  <tabstop>CheckButton2</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_3Sel_QTD.ui b/src/HEXABLOCKGUI/MyDlgRef/DlgRef_3Sel_QTD.ui
deleted file mode 100755
index b16200b..0000000
--- a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_3Sel_QTD.ui
+++ /dev/null
@@ -1,167 +0,0 @@
-<ui version="4.0" >
- <class>DlgRef_3Sel_QTD</class>
- <widget class="QWidget" name="DlgRef_3Sel_QTD" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>156</width>
-    <height>103</height>
-   </rect>
-  </property>
-  <property name="sizePolicy" >
-   <sizepolicy>
-    <hsizetype>5</hsizetype>
-    <vsizetype>7</vsizetype>
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="windowTitle" >
-   <string/>
-  </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>0</number>
-   </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
-   <item row="0" column="0" >
-    <widget class="QGroupBox" name="GroupBox1" >
-     <property name="title" >
-      <string/>
-     </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item row="0" column="2" >
-       <widget class="QLineEdit" name="LineEdit1" />
-      </item>
-      <item row="0" column="0" >
-       <widget class="QLabel" name="TextLabel1" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string>TL1</string>
-        </property>
-        <property name="wordWrap" >
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0" >
-       <widget class="QLabel" name="TextLabel2" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string>TL2</string>
-        </property>
-        <property name="wordWrap" >
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1" >
-       <widget class="QPushButton" name="PushButton3" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1" >
-       <widget class="QPushButton" name="PushButton2" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0" >
-       <widget class="QLabel" name="TextLabel3" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string>TL3</string>
-        </property>
-        <property name="wordWrap" >
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="2" >
-       <widget class="QLineEdit" name="LineEdit3" />
-      </item>
-      <item row="0" column="1" >
-       <widget class="QPushButton" name="PushButton1" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="2" >
-       <widget class="QLineEdit" name="LineEdit2" />
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <layoutdefault spacing="6" margin="11" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <tabstops>
-  <tabstop>PushButton1</tabstop>
-  <tabstop>LineEdit1</tabstop>
-  <tabstop>PushButton2</tabstop>
-  <tabstop>LineEdit2</tabstop>
-  <tabstop>PushButton3</tabstop>
-  <tabstop>LineEdit3</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_3Spin1Check_QTD.ui b/src/HEXABLOCKGUI/MyDlgRef/DlgRef_3Spin1Check_QTD.ui
deleted file mode 100755
index 0fa2adb..0000000
--- a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_3Spin1Check_QTD.ui
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DlgRef_3Spin1Check_QTD</class>
- <widget class="QWidget" name="DlgRef_3Spin1Check_QTD">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>114</width>
-    <height>116</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string/>
-  </property>
-  <layout class="QGridLayout">
-   <property name="margin">
-    <number>0</number>
-   </property>
-   <property name="spacing">
-    <number>0</number>
-   </property>
-   <item row="0" column="0">
-    <widget class="QGroupBox" name="GroupBox1">
-     <property name="title">
-      <string/>
-     </property>
-     <layout class="QGridLayout">
-      <property name="margin">
-       <number>9</number>
-      </property>
-      <property name="spacing">
-       <number>6</number>
-      </property>
-      <item row="3" column="0" colspan="2">
-       <widget class="QCheckBox" name="CheckButton1">
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="TextLabel3">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL3</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="TextLabel2">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL2</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="TextLabel1">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL1</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX">
-        <property name="decimals">
-         <number>6</number>
-        </property>
-        <property name="maximum">
-         <double>1000000000.000000000000000</double>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DY">
-        <property name="decimals">
-         <number>6</number>
-        </property>
-        <property name="maximum">
-         <double>1000000000.000000000000000</double>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1">
-       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DZ">
-        <property name="decimals">
-         <number>6</number>
-        </property>
-        <property name="maximum">
-         <double>1000000000.000000000000000</double>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <layoutdefault spacing="6" margin="11"/>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <customwidgets>
-  <customwidget>
-   <class>SalomeApp_DoubleSpinBox</class>
-   <extends>QDoubleSpinBox</extends>
-   <header location="global">SalomeApp_DoubleSpinBox.h</header>
-  </customwidget>
- </customwidgets>
- <tabstops>
-  <tabstop>SpinBox_DX</tabstop>
-  <tabstop>SpinBox_DY</tabstop>
-  <tabstop>SpinBox_DZ</tabstop>
-  <tabstop>CheckButton1</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_3Spin_QTD.ui b/src/HEXABLOCKGUI/MyDlgRef/DlgRef_3Spin_QTD.ui
index 3aafa4a..f316e3b 100755
--- a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_3Spin_QTD.ui
+++ b/src/HEXABLOCKGUI/MyDlgRef/DlgRef_3Spin_QTD.ui
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>DlgRef_3Spin_QTD</class>
- <widget class="QWidget" name="DlgRef_3Spin_QTD">
+ <class>MyDlgRef_3Spin_QTD</class>
+ <widget class="QWidget" name="MyDlgRef_3Spin_QTD">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>114</width>
-    <height>97</height>
+    <width>213</width>
+    <height>129</height>
    </rect>
   </property>
   <property name="windowTitle">
diff --git a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_4Sel1List1Check_QTD.ui b/src/HEXABLOCKGUI/MyDlgRef/DlgRef_4Sel1List1Check_QTD.ui
deleted file mode 100755
index 516d9a2..0000000
--- a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_4Sel1List1Check_QTD.ui
+++ /dev/null
@@ -1,244 +0,0 @@
-<ui version="4.0" >
- <class>DlgRef_4Sel1List1Check_QTD</class>
- <widget class="QWidget" name="DlgRef_4Sel1List1Check_QTD" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>216</width>
-    <height>187</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string/>
-  </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>0</number>
-   </property>
-   <property name="spacing" >
-    <number>0</number>
-   </property>
-   <item row="0" column="0" >
-    <widget class="QGroupBox" name="GroupBox1" >
-     <property name="title" >
-      <string/>
-     </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item row="2" column="1" colspan="2" >
-       <widget class="QComboBox" name="ComboBox1" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>7</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="2" >
-       <widget class="QLineEdit" name="LineEdit2" />
-      </item>
-      <item row="4" column="1" >
-       <widget class="QPushButton" name="PushButton4" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1" >
-       <widget class="QPushButton" name="PushButton1" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="2" >
-       <widget class="QLineEdit" name="LineEdit4" />
-      </item>
-      <item row="3" column="1" >
-       <widget class="QPushButton" name="PushButton3" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1" >
-       <widget class="QPushButton" name="PushButton2" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0" >
-       <widget class="QLabel" name="TextLabel1" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string>TL1</string>
-        </property>
-        <property name="wordWrap" >
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0" >
-       <widget class="QLabel" name="TextLabel4" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string>TL4</string>
-        </property>
-        <property name="wordWrap" >
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="2" >
-       <widget class="QLineEdit" name="LineEdit1" />
-      </item>
-      <item row="4" column="0" >
-       <widget class="QLabel" name="TextLabel5" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string>TL5</string>
-        </property>
-        <property name="wordWrap" >
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="2" >
-       <widget class="QLineEdit" name="LineEdit3" />
-      </item>
-      <item row="1" column="0" >
-       <widget class="QLabel" name="TextLabel2" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string>TL2</string>
-        </property>
-        <property name="wordWrap" >
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0" >
-       <widget class="QLabel" name="TextLabel3" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string>TL3</string>
-        </property>
-        <property name="wordWrap" >
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="5" column="0" colspan="2" >
-       <widget class="QCheckBox" name="CheckBox1" >
-        <property name="text" >
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="5" column="2" >
-       <widget class="QPushButton" name="PushButton5" >
-        <property name="text" >
-         <string/>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <layoutdefault spacing="6" margin="11" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <tabstops>
-  <tabstop>PushButton1</tabstop>
-  <tabstop>LineEdit1</tabstop>
-  <tabstop>PushButton2</tabstop>
-  <tabstop>LineEdit2</tabstop>
-  <tabstop>ComboBox1</tabstop>
-  <tabstop>PushButton3</tabstop>
-  <tabstop>LineEdit3</tabstop>
-  <tabstop>PushButton4</tabstop>
-  <tabstop>LineEdit4</tabstop>
-  <tabstop>CheckBox1</tabstop>
-  <tabstop>PushButton5</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_4Sel1List_QTD.ui b/src/HEXABLOCKGUI/MyDlgRef/DlgRef_4Sel1List_QTD.ui
deleted file mode 100755
index 5388836..0000000
--- a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_4Sel1List_QTD.ui
+++ /dev/null
@@ -1,228 +0,0 @@
-<ui version="4.0" >
- <class>DlgRef_4Sel1List_QTD</class>
- <widget class="QWidget" name="DlgRef_4Sel1List_QTD" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>156</width>
-    <height>158</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string/>
-  </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>0</number>
-   </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
-   <item row="0" column="0" >
-    <widget class="QGroupBox" name="GroupBox1" >
-     <property name="title" >
-      <string/>
-     </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item row="0" column="1" >
-       <widget class="QPushButton" name="PushButton1" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="1" >
-       <widget class="QPushButton" name="PushButton4" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="2" >
-       <widget class="QLineEdit" name="LineEdit4" />
-      </item>
-      <item row="3" column="1" >
-       <widget class="QPushButton" name="PushButton3" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1" >
-       <widget class="QPushButton" name="PushButton2" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0" >
-       <widget class="QLabel" name="TextLabel1" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string>TL1</string>
-        </property>
-        <property name="wordWrap" >
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0" >
-       <widget class="QLabel" name="TextLabel4" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string>TL4</string>
-        </property>
-        <property name="wordWrap" >
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="2" >
-       <widget class="QLineEdit" name="LineEdit1" />
-      </item>
-      <item row="4" column="0" >
-       <widget class="QLabel" name="TextLabel5" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string>TL5</string>
-        </property>
-        <property name="wordWrap" >
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="2" >
-       <widget class="QLineEdit" name="LineEdit3" />
-      </item>
-      <item row="1" column="0" >
-       <widget class="QLabel" name="TextLabel2" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string>TL2</string>
-        </property>
-        <property name="wordWrap" >
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0" >
-       <widget class="QLabel" name="TextLabel3" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string>TL3</string>
-        </property>
-        <property name="wordWrap" >
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="2" >
-       <widget class="QLineEdit" name="LineEdit2" />
-      </item>
-      <item row="2" column="1" colspan="2" >
-       <widget class="QComboBox" name="ComboBox1" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>7</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <layoutdefault spacing="6" margin="11" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <tabstops>
-  <tabstop>PushButton1</tabstop>
-  <tabstop>LineEdit1</tabstop>
-  <tabstop>PushButton2</tabstop>
-  <tabstop>LineEdit2</tabstop>
-  <tabstop>ComboBox1</tabstop>
-  <tabstop>PushButton3</tabstop>
-  <tabstop>LineEdit3</tabstop>
-  <tabstop>PushButton4</tabstop>
-  <tabstop>LineEdit4</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_4Sel1Spin2Check_QTD.ui b/src/HEXABLOCKGUI/MyDlgRef/DlgRef_4Sel1Spin2Check_QTD.ui
deleted file mode 100755
index fa1361c..0000000
--- a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_4Sel1Spin2Check_QTD.ui
+++ /dev/null
@@ -1,243 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DlgRef_4Sel1Spin2Check_QTD</class>
- <widget class="QWidget" name="DlgRef_4Sel1Spin2Check_QTD">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>225</width>
-    <height>306</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string/>
-  </property>
-  <layout class="QGridLayout">
-   <property name="margin">
-    <number>0</number>
-   </property>
-   <property name="spacing">
-    <number>6</number>
-   </property>
-   <item row="0" column="0">
-    <widget class="QGroupBox" name="GroupBox1">
-     <property name="title">
-      <string/>
-     </property>
-     <layout class="QGridLayout">
-      <property name="margin">
-       <number>9</number>
-      </property>
-      <property name="spacing">
-       <number>6</number>
-      </property>
-      <item row="4" column="1" colspan="2">
-       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="decimals">
-         <number>6</number>
-        </property>
-        <property name="maximum">
-         <double>1000000000.000000000000000</double>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="0">
-       <widget class="QLabel" name="TextLabel3">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL3</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0">
-       <widget class="QLabel" name="TextLabel5">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL5</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="TextLabel4">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL4</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="TextLabel2">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL2</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="TextLabel1">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL1</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QPushButton" name="PushButton2">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="2" colspan="2">
-       <widget class="QLineEdit" name="LineEdit5"/>
-      </item>
-      <item row="0" column="2" colspan="2">
-       <widget class="QLineEdit" name="LineEdit1"/>
-      </item>
-      <item row="3" column="1">
-       <widget class="QPushButton" name="PushButton5">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1">
-       <widget class="QPushButton" name="PushButton4">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QPushButton" name="PushButton1">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="2" colspan="2">
-       <widget class="QLineEdit" name="LineEdit4"/>
-      </item>
-      <item row="1" column="2" colspan="2">
-       <widget class="QLineEdit" name="LineEdit2"/>
-      </item>
-      <item row="6" column="0" colspan="4">
-       <widget class="QCheckBox" name="CheckButton1">
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="7" column="0" colspan="4">
-       <widget class="QCheckBox" name="CheckButton2">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <layoutdefault spacing="6" margin="11"/>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <customwidgets>
-  <customwidget>
-   <class>SalomeApp_DoubleSpinBox</class>
-   <extends>QDoubleSpinBox</extends>
-   <header location="global">SalomeApp_DoubleSpinBox.h</header>
-  </customwidget>
- </customwidgets>
- <tabstops>
-  <tabstop>PushButton1</tabstop>
-  <tabstop>LineEdit1</tabstop>
-  <tabstop>PushButton2</tabstop>
-  <tabstop>LineEdit2</tabstop>
-  <tabstop>PushButton4</tabstop>
-  <tabstop>LineEdit4</tabstop>
-  <tabstop>PushButton5</tabstop>
-  <tabstop>LineEdit5</tabstop>
-  <tabstop>SpinBox_DX</tabstop>
-  <tabstop>CheckButton1</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_4Sel1Spin3Check_QTD.ui b/src/HEXABLOCKGUI/MyDlgRef/DlgRef_4Sel1Spin3Check_QTD.ui
deleted file mode 100755
index 1828502..0000000
--- a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_4Sel1Spin3Check_QTD.ui
+++ /dev/null
@@ -1,273 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>DlgRef_4Sel1Spin3Check_QTD</class>
- <widget class="QWidget" name="DlgRef_4Sel1Spin3Check_QTD">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>225</width>
-    <height>306</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string/>
-  </property>
-  <layout class="QGridLayout">
-   <property name="margin">
-    <number>0</number>
-   </property>
-   <property name="spacing">
-    <number>6</number>
-   </property>
-   <item row="0" column="0">
-    <widget class="QGroupBox" name="GroupBox1">
-     <property name="title">
-      <string/>
-     </property>
-     <layout class="QGridLayout">
-      <property name="margin">
-       <number>9</number>
-      </property>
-      <property name="spacing">
-       <number>6</number>
-      </property>
-      <item row="8" column="0" colspan="4">
-       <widget class="QCheckBox" name="CheckButton3">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="1" colspan="2">
-       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="decimals">
-         <number>6</number>
-        </property>
-        <property name="maximum">
-         <double>1000000000.000000000000000</double>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="0">
-       <widget class="QLabel" name="TextLabel3">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL3</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0">
-       <widget class="QLabel" name="TextLabel5">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL5</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="TextLabel4">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL4</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="TextLabel2">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL2</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="TextLabel1">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>TL1</string>
-        </property>
-        <property name="wordWrap">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QPushButton" name="PushButton2">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="2" colspan="2">
-       <widget class="QLineEdit" name="LineEdit5"/>
-      </item>
-      <item row="0" column="2" colspan="2">
-       <widget class="QLineEdit" name="LineEdit1"/>
-      </item>
-      <item row="3" column="1">
-       <widget class="QPushButton" name="PushButton5">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1">
-       <widget class="QPushButton" name="PushButton4">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QPushButton" name="PushButton1">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="2" colspan="2">
-       <widget class="QLineEdit" name="LineEdit4"/>
-      </item>
-      <item row="1" column="2" colspan="2">
-       <widget class="QLineEdit" name="LineEdit2"/>
-      </item>
-      <item row="6" column="0" colspan="4">
-       <widget class="QCheckBox" name="CheckButton1">
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="7" column="0" colspan="4">
-       <widget class="QCheckBox" name="CheckButton2">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
-      </item>
-     </layout>
-     <zorder>CheckButton3</zorder>
-     <zorder>SpinBox_DX</zorder>
-     <zorder>TextLabel3</zorder>
-     <zorder>TextLabel5</zorder>
-     <zorder>TextLabel4</zorder>
-     <zorder>TextLabel2</zorder>
-     <zorder>TextLabel1</zorder>
-     <zorder>PushButton2</zorder>
-     <zorder>LineEdit5</zorder>
-     <zorder>LineEdit1</zorder>
-     <zorder>PushButton5</zorder>
-     <zorder>PushButton4</zorder>
-     <zorder>PushButton1</zorder>
-     <zorder>LineEdit4</zorder>
-     <zorder>LineEdit2</zorder>
-     <zorder>CheckButton1</zorder>
-     <zorder>CheckButton2</zorder>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <layoutdefault spacing="6" margin="11"/>
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <customwidgets>
-  <customwidget>
-   <class>SalomeApp_DoubleSpinBox</class>
-   <extends>QDoubleSpinBox</extends>
-   <header location="global">SalomeApp_DoubleSpinBox.h</header>
-  </customwidget>
- </customwidgets>
- <tabstops>
-  <tabstop>PushButton1</tabstop>
-  <tabstop>LineEdit1</tabstop>
-  <tabstop>PushButton2</tabstop>
-  <tabstop>LineEdit2</tabstop>
-  <tabstop>PushButton4</tabstop>
-  <tabstop>LineEdit4</tabstop>
-  <tabstop>PushButton5</tabstop>
-  <tabstop>LineEdit5</tabstop>
-  <tabstop>SpinBox_DX</tabstop>
-  <tabstop>CheckButton1</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_6Sel_QTD.ui b/src/HEXABLOCKGUI/MyDlgRef/DlgRef_6Sel_QTD.ui
deleted file mode 100755
index 22ce904..0000000
--- a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_6Sel_QTD.ui
+++ /dev/null
@@ -1,281 +0,0 @@
-<ui version="4.0" >
- <class>DlgRef_6Sel_QTD</class>
- <widget class="QWidget" name="DlgRef_6Sel_QTD" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>156</width>
-    <height>190</height>
-   </rect>
-  </property>
-  <property name="sizePolicy" >
-   <sizepolicy>
-    <hsizetype>5</hsizetype>
-    <vsizetype>7</vsizetype>
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <property name="windowTitle" >
-   <string/>
-  </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>0</number>
-   </property>
-   <property name="spacing" >
-    <number>0</number>
-   </property>
-   <item row="0" column="0" >
-    <widget class="QGroupBox" name="GroupBox1" >
-     <property name="title" >
-      <string/>
-     </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item row="5" column="2" >
-       <widget class="QLineEdit" name="LineEdit6" />
-      </item>
-      <item row="4" column="2" >
-       <widget class="QLineEdit" name="LineEdit5" />
-      </item>
-      <item row="3" column="2" >
-       <widget class="QLineEdit" name="LineEdit4" />
-      </item>
-      <item row="2" column="2" >
-       <widget class="QLineEdit" name="LineEdit3" />
-      </item>
-      <item row="1" column="2" >
-       <widget class="QLineEdit" name="LineEdit2" />
-      </item>
-      <item row="0" column="2" >
-       <widget class="QLineEdit" name="LineEdit1" />
-      </item>
-      <item row="5" column="1" >
-       <widget class="QPushButton" name="PushButton6" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="1" >
-       <widget class="QPushButton" name="PushButton5" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="1" >
-       <widget class="QPushButton" name="PushButton4" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1" >
-       <widget class="QPushButton" name="PushButton3" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1" >
-       <widget class="QPushButton" name="PushButton2" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1" >
-       <widget class="QPushButton" name="PushButton1" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string/>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="0" >
-       <widget class="QLabel" name="TextLabel1" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string>TL1</string>
-        </property>
-        <property name="wordWrap" >
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="5" column="0" >
-       <widget class="QLabel" name="TextLabel6" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string>TL6</string>
-        </property>
-        <property name="wordWrap" >
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0" >
-       <widget class="QLabel" name="TextLabel3" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string>TL3</string>
-        </property>
-        <property name="wordWrap" >
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="4" column="0" >
-       <widget class="QLabel" name="TextLabel5" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string>TL5</string>
-        </property>
-        <property name="wordWrap" >
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="0" >
-       <widget class="QLabel" name="TextLabel4" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string>TL4</string>
-        </property>
-        <property name="wordWrap" >
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0" >
-       <widget class="QLabel" name="TextLabel2" >
-        <property name="sizePolicy" >
-         <sizepolicy>
-          <hsizetype>0</hsizetype>
-          <vsizetype>0</vsizetype>
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text" >
-         <string>TL2</string>
-        </property>
-        <property name="wordWrap" >
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <layoutdefault spacing="6" margin="11" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
- <tabstops>
-  <tabstop>PushButton1</tabstop>
-  <tabstop>LineEdit1</tabstop>
-  <tabstop>PushButton2</tabstop>
-  <tabstop>LineEdit2</tabstop>
-  <tabstop>PushButton3</tabstop>
-  <tabstop>LineEdit3</tabstop>
-  <tabstop>PushButton4</tabstop>
-  <tabstop>LineEdit4</tabstop>
-  <tabstop>PushButton5</tabstop>
-  <tabstop>LineEdit5</tabstop>
-  <tabstop>PushButton6</tabstop>
-  <tabstop>LineEdit6</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_Skeleton_QTD.ui b/src/HEXABLOCKGUI/MyDlgRef/DlgRef_Skeleton_QTD.ui
index 8a6ec71..4254a82 100755
--- a/src/HEXABLOCKGUI/MyDlgRef/DlgRef_Skeleton_QTD.ui
+++ b/src/HEXABLOCKGUI/MyDlgRef/DlgRef_Skeleton_QTD.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>345</width>
-    <height>401</height>
+    <height>538</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -16,24 +16,12 @@
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
-  <property name="minimumSize">
-   <size>
-    <width>5</width>
-    <height>0</height>
-   </size>
-  </property>
   <property name="windowTitle">
    <string/>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
    <item>
     <widget class="QScrollArea" name="scrollArea">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
      <property name="horizontalScrollBarPolicy">
       <enum>Qt::ScrollBarAsNeeded</enum>
      </property>
@@ -46,18 +34,12 @@
         <x>0</x>
         <y>0</y>
         <width>325</width>
-        <height>381</height>
+        <height>518</height>
        </rect>
       </property>
       <layout class="QVBoxLayout" name="verticalLayout_3">
        <item>
         <widget class="QGroupBox" name="groupBox_2">
-         <property name="minimumSize">
-          <size>
-           <width>5</width>
-           <height>0</height>
-          </size>
-         </property>
          <property name="title">
           <string>Vertex of the model</string>
          </property>
@@ -77,12 +59,6 @@
        </item>
        <item>
         <widget class="QGroupBox" name="groupBox">
-         <property name="minimumSize">
-          <size>
-           <width>5</width>
-           <height>0</height>
-          </size>
-         </property>
          <property name="title">
           <string>Point of the geometry</string>
          </property>
@@ -178,14 +154,14 @@
            </widget>
           </item>
           <item>
-           <spacer name="verticalSpacer">
+           <spacer name="verticalSpacer_2">
             <property name="orientation">
              <enum>Qt::Vertical</enum>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
               <width>20</width>
-              <height>16777215</height>
+              <height>10</height>
              </size>
             </property>
            </spacer>
diff --git a/src/HEXABLOCKGUI/MyDlgRef/MyDlgRef.cxx b/src/HEXABLOCKGUI/MyDlgRef/MyDlgRef.cxx
index 87e7dc6..6fc2e57 100755
--- a/src/HEXABLOCKGUI/MyDlgRef/MyDlgRef.cxx
+++ b/src/HEXABLOCKGUI/MyDlgRef/MyDlgRef.cxx
@@ -1,803 +1,98 @@
-// Copyright (C) 2009-2013  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
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+//  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.
+//  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
+//  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
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
 
 #include "MyDlgRef.hxx"
 
-//////////////////////////////////////////
-// DlgRef_1List1Spin1Btn
-//////////////////////////////////////////
-
-DlgRef_1List1Spin1Btn::DlgRef_1List1Spin1Btn( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_1List1Spin1Btn::~DlgRef_1List1Spin1Btn()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_1Sel1Check1List
-//////////////////////////////////////////
-
-DlgRef_1Sel1Check1List::DlgRef_1Sel1Check1List( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_1Sel1Check1List::~DlgRef_1Sel1Check1List()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_1Sel1Check1Sel
-//////////////////////////////////////////
-
-DlgRef_1Sel1Check1Sel::DlgRef_1Sel1Check1Sel( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_1Sel1Check1Sel::~DlgRef_1Sel1Check1Sel()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_1Sel1Check
-//////////////////////////////////////////
-
-DlgRef_1Sel1Check::DlgRef_1Sel1Check( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_1Sel1Check::~DlgRef_1Sel1Check()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_1Sel1List1Check3Btn
-//////////////////////////////////////////
-
-DlgRef_1Sel1List1Check3Btn::DlgRef_1Sel1List1Check3Btn( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_1Sel1List1Check3Btn::~DlgRef_1Sel1List1Check3Btn()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_1Sel1Spin1Check
-//////////////////////////////////////////
-
-DlgRef_1Sel1Spin1Check::DlgRef_1Sel1Spin1Check( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_1Sel1Spin1Check::~DlgRef_1Sel1Spin1Check()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_1Sel1Spin
-//////////////////////////////////////////
-
-DlgRef_1Sel1Spin::DlgRef_1Sel1Spin( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_1Sel1Spin::~DlgRef_1Sel1Spin()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_1Sel2Spin1View1Check
-//////////////////////////////////////////
-
-DlgRef_1Sel2Spin1View1Check::DlgRef_1Sel2Spin1View1Check( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_1Sel2Spin1View1Check::~DlgRef_1Sel2Spin1View1Check()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_1Sel2Spin
-//////////////////////////////////////////
-
-DlgRef_1Sel2Spin::DlgRef_1Sel2Spin( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_1Sel2Spin::~DlgRef_1Sel2Spin()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_1Sel3Check
-//////////////////////////////////////////
-
-DlgRef_1Sel3Check::DlgRef_1Sel3Check( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_1Sel3Check::~DlgRef_1Sel3Check()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_1Sel3Spin
-//////////////////////////////////////////
-
-DlgRef_1Sel3Spin::DlgRef_1Sel3Spin( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_1Sel3Spin::~DlgRef_1Sel3Spin()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_1Sel3Spin1Check
-//////////////////////////////////////////
-
-DlgRef_1Sel3Spin1Check::DlgRef_1Sel3Spin1Check( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_1Sel3Spin1Check::~DlgRef_1Sel3Spin1Check()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_1Sel4Spin2Check
-//////////////////////////////////////////
-
-DlgRef_1Sel4Spin2Check::DlgRef_1Sel4Spin2Check( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_1Sel4Spin2Check::~DlgRef_1Sel4Spin2Check()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_1Sel4Spin
-//////////////////////////////////////////
-
-DlgRef_1Sel4Spin::DlgRef_1Sel4Spin( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_1Sel4Spin::~DlgRef_1Sel4Spin()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_1Sel5Spin1Check
-//////////////////////////////////////////
-
-DlgRef_1Sel5Spin1Check::DlgRef_1Sel5Spin1Check( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_1Sel5Spin1Check::~DlgRef_1Sel5Spin1Check()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_1Sel5Spin
-//////////////////////////////////////////
-
-DlgRef_1Sel5Spin::DlgRef_1Sel5Spin( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_1Sel5Spin::~DlgRef_1Sel5Spin()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_1Spin
-//////////////////////////////////////////
-
-DlgRef_1Spin::DlgRef_1Spin( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_1Spin::~DlgRef_1Spin()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_1Sel
-//////////////////////////////////////////
-
-DlgRef_1Sel::DlgRef_1Sel( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_1Sel::~DlgRef_1Sel()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_1SelExt
-//////////////////////////////////////////
-
-DlgRef_1SelExt::DlgRef_1SelExt( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_1SelExt::~DlgRef_1SelExt()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_2Sel1List1Check
-//////////////////////////////////////////
-
-DlgRef_2Sel1List1Check::DlgRef_2Sel1List1Check( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_2Sel1List1Check::~DlgRef_2Sel1List1Check()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_2Sel1List2Check
-//////////////////////////////////////////
-
-DlgRef_2Sel1List2Check::DlgRef_2Sel1List2Check( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_2Sel1List2Check::~DlgRef_2Sel1List2Check()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_2Sel1List
-//////////////////////////////////////////
-
-DlgRef_2Sel1List::DlgRef_2Sel1List( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_2Sel1List::~DlgRef_2Sel1List()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_2Sel1Spin2Check
-//////////////////////////////////////////
-
-DlgRef_2Sel1Spin2Check::DlgRef_2Sel1Spin2Check( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_2Sel1Spin2Check::~DlgRef_2Sel1Spin2Check()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_2Sel1Spin
-//////////////////////////////////////////
-
-DlgRef_2Sel1Spin::DlgRef_2Sel1Spin( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_2Sel1Spin::~DlgRef_2Sel1Spin()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_2Sel1SpinInt
-//////////////////////////////////////////
-
-DlgRef_2Sel1SpinInt::DlgRef_2Sel1SpinInt( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_2Sel1SpinInt::~DlgRef_2Sel1SpinInt()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_2Sel2List
-//////////////////////////////////////////
-
-DlgRef_2Sel2List::DlgRef_2Sel2List( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_2Sel2List::~DlgRef_2Sel2List()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_2Sel2Spin1Check
-//////////////////////////////////////////
-
-DlgRef_2Sel2Spin1Check::DlgRef_2Sel2Spin1Check( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_2Sel2Spin1Check::~DlgRef_2Sel2Spin1Check()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_2Sel2Spin3Check
-//////////////////////////////////////////
-
-DlgRef_2Sel2Spin3Check::DlgRef_2Sel2Spin3Check( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_2Sel2Spin3Check::~DlgRef_2Sel2Spin3Check()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_2Sel2Spin
-//////////////////////////////////////////
-
-DlgRef_2Sel2Spin::DlgRef_2Sel2Spin( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_2Sel2Spin::~DlgRef_2Sel2Spin()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_2Sel3Spin2Rb
-//////////////////////////////////////////
-
-DlgRef_2Sel3Spin2Rb::DlgRef_2Sel3Spin2Rb( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_2Sel3Spin2Rb::~DlgRef_2Sel3Spin2Rb()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_2Sel3Spin
-//////////////////////////////////////////
-
-DlgRef_2Sel3Spin::DlgRef_2Sel3Spin( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_2Sel3Spin::~DlgRef_2Sel3Spin()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_2Sel4Spin1Check
-//////////////////////////////////////////
-
-DlgRef_2Sel4Spin1Check::DlgRef_2Sel4Spin1Check( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_2Sel4Spin1Check::~DlgRef_2Sel4Spin1Check()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_2Sel
-//////////////////////////////////////////
-
-DlgRef_2Sel::DlgRef_2Sel( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_2Sel::~DlgRef_2Sel()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_2SelExt
-//////////////////////////////////////////
-
-DlgRef_2SelExt::DlgRef_2SelExt( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_2SelExt::~DlgRef_2SelExt()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_2Spin
-//////////////////////////////////////////
-
-DlgRef_2Spin::DlgRef_2Spin( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_2Spin::~DlgRef_2Spin()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_3Check
-//////////////////////////////////////////
-
-DlgRef_3Check::DlgRef_3Check( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_3Check::~DlgRef_3Check()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_3Radio
-//////////////////////////////////////////
-
-DlgRef_3Radio::DlgRef_3Radio( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_3Radio::~DlgRef_3Radio()
-{
-}
 
 //////////////////////////////////////////
-// DlgRef_3Radio1Sel1Spin
+// MyDlgRef_1Sel2Spin
 //////////////////////////////////////////
 
-DlgRef_3Radio1Sel1Spin::DlgRef_3Radio1Sel1Spin( QWidget* parent, Qt::WindowFlags f )
+MyDlgRef_1Sel2Spin::MyDlgRef_1Sel2Spin( QWidget* parent, Qt::WindowFlags f )
 : QWidget( parent, f )
 {
   setupUi( this );
 }
 
-DlgRef_3Radio1Sel1Spin::~DlgRef_3Radio1Sel1Spin()
+MyDlgRef_1Sel2Spin::~MyDlgRef_1Sel2Spin()
 {
 }
 
 //////////////////////////////////////////
-// DlgRef_3Sel1Check
+// MyDlgRef_1Sel3Spin
 //////////////////////////////////////////
 
-DlgRef_3Sel1Check::DlgRef_3Sel1Check( QWidget* parent, Qt::WindowFlags f )
+MyDlgRef_1Sel3Spin::MyDlgRef_1Sel3Spin( QWidget* parent, Qt::WindowFlags f )
 : QWidget( parent, f )
 {
   setupUi( this );
 }
 
-DlgRef_3Sel1Check::~DlgRef_3Sel1Check()
+MyDlgRef_1Sel3Spin::~MyDlgRef_1Sel3Spin()
 {
 }
 
 //////////////////////////////////////////
-// DlgRef_3Sel1Spin
+// MyDlgRef_2Sel1Spin
 //////////////////////////////////////////
 
-DlgRef_3Sel1Spin::DlgRef_3Sel1Spin( QWidget* parent, Qt::WindowFlags f )
+MyDlgRef_2Sel1Spin::MyDlgRef_2Sel1Spin( QWidget* parent, Qt::WindowFlags f )
 : QWidget( parent, f )
 {
   setupUi( this );
 }
 
-DlgRef_3Sel1Spin::~DlgRef_3Sel1Spin()
+MyDlgRef_2Sel1Spin::~MyDlgRef_2Sel1Spin()
 {
 }
 
 //////////////////////////////////////////
-// DlgRef_3Sel2Spin
-//////////////////////////////////////////
-
-DlgRef_3Sel2Spin::DlgRef_3Sel2Spin( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_3Sel2Spin::~DlgRef_3Sel2Spin()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_3Sel3Spin1Check
-//////////////////////////////////////////
-
-DlgRef_3Sel3Spin1Check::DlgRef_3Sel3Spin1Check( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_3Sel3Spin1Check::~DlgRef_3Sel3Spin1Check()
-{
-}
-
-void DlgRef_3Sel3Spin1Check::ShowRows( int fromRow, int toRow, bool toShow )
-{
-  const int maxRows = 7;
-  
-  if ( toRow >= fromRow && fromRow >= 0 && toRow <= maxRows ) {
-    int c = gridLayout1->count();
-    for ( int i = 0; i < c; i++ ) {
-      QWidget* w = gridLayout1->itemAt( i )->widget();
-      int row, col, rowspan, colspan;
-      gridLayout1->getItemPosition( i, &row, &col, &rowspan, &colspan );
-      if ( w && row >= fromRow && row <= toRow )
-        w->setVisible( toShow );
-    }
-  }
-}
-
-//////////////////////////////////////////
-// DlgRef_3Sel3Spin2Check
-//////////////////////////////////////////
-
-DlgRef_3Sel3Spin2Check::DlgRef_3Sel3Spin2Check( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_3Sel3Spin2Check::~DlgRef_3Sel3Spin2Check()
-{
-}
-
-void DlgRef_3Sel3Spin2Check::ShowRows( int fromRow, int toRow, bool toShow )
-{
-  const int maxRows = 8;
-  
-  if ( toRow >= fromRow && fromRow >= 0 && toRow <= maxRows ) {
-    int c = gridLayout1->count();
-    for ( int i = 0; i < c; i++ ) {
-      QWidget* w = gridLayout1->itemAt( i )->widget();
-      int row, col, rowspan, colspan;
-      gridLayout1->getItemPosition( i, &row, &col, &rowspan, &colspan );
-      if ( w && row >= fromRow && row <= toRow )
-        w->setVisible( toShow );
-    }
-  }
-}
-
-//////////////////////////////////////////
-// DlgRef_3Sel4Spin2Check
-//////////////////////////////////////////
-
-DlgRef_3Sel4Spin2Check::DlgRef_3Sel4Spin2Check( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_3Sel4Spin2Check::~DlgRef_3Sel4Spin2Check()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_3Sel
-//////////////////////////////////////////
-
-DlgRef_3Sel::DlgRef_3Sel( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_3Sel::~DlgRef_3Sel()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_3Spin1Check
-//////////////////////////////////////////
-
-DlgRef_3Spin1Check::DlgRef_3Spin1Check( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_3Spin1Check::~DlgRef_3Spin1Check()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_3Spin
-//////////////////////////////////////////
-
-DlgRef_3Spin::DlgRef_3Spin( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_3Spin::~DlgRef_3Spin()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_4Sel1List1Check
-//////////////////////////////////////////
-
-DlgRef_4Sel1List1Check::DlgRef_4Sel1List1Check( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_4Sel1List1Check::~DlgRef_4Sel1List1Check()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_4Sel1List
-//////////////////////////////////////////
-
-DlgRef_4Sel1List::DlgRef_4Sel1List( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_4Sel1List::~DlgRef_4Sel1List()
-{
-}
-
-//////////////////////////////////////////
-// DlgRef_4Sel1Spin2Check
-//////////////////////////////////////////
-
-DlgRef_4Sel1Spin2Check::DlgRef_4Sel1Spin2Check( QWidget* parent, Qt::WindowFlags f )
-: QWidget( parent, f )
-{
-  setupUi( this );
-}
-
-DlgRef_4Sel1Spin2Check::~DlgRef_4Sel1Spin2Check()
-{
-}
-
-void DlgRef_4Sel1Spin2Check::ShowRows( int fromRow, int toRow, bool toShow )
-{
-  const int maxRows = 6;
-  
-  if ( toRow >= fromRow && fromRow >= 0 && toRow <= maxRows ) {
-    int c = gridLayout1->count();
-    for ( int i = 0; i < c; i++ ) {
-      QWidget* w = gridLayout1->itemAt( i )->widget();
-      int row, col, rowspan, colspan;
-      gridLayout1->getItemPosition( i, &row, &col, &rowspan, &colspan );
-      if ( w && row >= fromRow && row <= toRow )
-        w->setVisible( toShow );
-    }
-  }
-}
-
-//////////////////////////////////////////
-// DlgRef_4Sel1Spin3Check
+// MyDlgRef_2Sel
 //////////////////////////////////////////
 
-DlgRef_4Sel1Spin3Check::DlgRef_4Sel1Spin3Check( QWidget* parent, Qt::WindowFlags f )
+MyDlgRef_2Sel::MyDlgRef_2Sel( QWidget* parent, Qt::WindowFlags f )
 : QWidget( parent, f )
 {
   setupUi( this );
 }
 
-DlgRef_4Sel1Spin3Check::~DlgRef_4Sel1Spin3Check()
+MyDlgRef_2Sel::~MyDlgRef_2Sel()
 {
 }
 
 //////////////////////////////////////////
-// DlgRef_6Sel
+// MyDlgRef_3Spin
 //////////////////////////////////////////
 
-DlgRef_6Sel::DlgRef_6Sel( QWidget* parent, Qt::WindowFlags f )
+MyDlgRef_3Spin::MyDlgRef_3Spin( QWidget* parent, Qt::WindowFlags f )
 : QWidget( parent, f )
 {
   setupUi( this );
 }
 
-DlgRef_6Sel::~DlgRef_6Sel()
+MyDlgRef_3Spin::~MyDlgRef_3Spin()
 {
 }
 
 //////////////////////////////////////////
-// DlgRef_Skeleton
+// MyDlgRef_Skeleton
 //////////////////////////////////////////
 
 MyDlgRef_Skeleton::MyDlgRef_Skeleton( QWidget* parent, Qt::WindowFlags f )
@@ -814,7 +109,7 @@ MyDlgRef_Skeleton::~MyDlgRef_Skeleton()
 // Utility functions
 //////////////////////////////////////////
 
-QString DlgRef::PrintDoubleValue( double theValue, int thePrecision )
+QString MyDlgRef::PrintDoubleValue( double theValue, int thePrecision )
 {
   const double prec = 1e-12;
   
diff --git a/src/HEXABLOCKGUI/MyDlgRef/MyDlgRef.hxx b/src/HEXABLOCKGUI/MyDlgRef/MyDlgRef.hxx
index 70bc5f6..2b28da7 100644
--- a/src/HEXABLOCKGUI/MyDlgRef/MyDlgRef.hxx
+++ b/src/HEXABLOCKGUI/MyDlgRef/MyDlgRef.hxx
@@ -1,20 +1,20 @@
-// Copyright (C) 2009-2013  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
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+//  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.
+//  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
+//  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
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
 
@@ -22,7 +22,7 @@
 #define MYGEOM_MYDLGREF_HXX
 
 #if defined WIN32
-#  if defined MYMYDLGREF_EXPORTS || defined MyDlgRef_EXPORTS
+#  if defined MYDLGREF_EXPORTS || defined MYDlgRef_EXPORTS
 #    define MYDLGREF_EXPORT __declspec( dllexport )
 #  else
 #    define MYDLGREF_EXPORT __declspec( dllimport )
@@ -31,133 +31,6 @@
 #  define MYDLGREF_EXPORT
 #endif
 
-//////////////////////////////////////////
-// DlgRef_1List1Spin1Btn
-//////////////////////////////////////////
-
-#include "ui_DlgRef_1List1Spin1Btn_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_1List1Spin1Btn : public QWidget, 
-                                            public Ui::DlgRef_1List1Spin1Btn_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_1List1Spin1Btn( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_1List1Spin1Btn();
-};
-
-//////////////////////////////////////////
-// DlgRef_1Sel1Check1List
-//////////////////////////////////////////
-
-#include "ui_DlgRef_1Sel1Check1List_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_1Sel1Check1List : public QWidget, 
-                                             public Ui::DlgRef_1Sel1Check1List_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_1Sel1Check1List( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_1Sel1Check1List();
-};
-
-//////////////////////////////////////////
-// DlgRef_1Sel1Check1Sel
-//////////////////////////////////////////
-
-#include "ui_DlgRef_1Sel1Check1Sel_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_1Sel1Check1Sel : public QWidget, 
-                                            public Ui::DlgRef_1Sel1Check1Sel_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_1Sel1Check1Sel( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_1Sel1Check1Sel();
-};
-
-//////////////////////////////////////////
-// DlgRef_1Sel1Check
-//////////////////////////////////////////
-
-#include "ui_DlgRef_1Sel1Check_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_1Sel1Check : public QWidget, 
-                                        public Ui::DlgRef_1Sel1Check_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_1Sel1Check( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_1Sel1Check();
-};
-
-//////////////////////////////////////////
-// DlgRef_1Sel1List1Check3Btn
-//////////////////////////////////////////
-
-#include "ui_DlgRef_1Sel1List1Check3Btn_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_1Sel1List1Check3Btn : public QWidget, 
-                                                 public Ui::DlgRef_1Sel1List1Check3Btn_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_1Sel1List1Check3Btn( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_1Sel1List1Check3Btn();
-};
-
-//////////////////////////////////////////
-// DlgRef_1Sel1Spin1Check
-//////////////////////////////////////////
-
-#include "ui_DlgRef_1Sel1Spin1Check_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_1Sel1Spin1Check : public QWidget, 
-                                             public Ui::DlgRef_1Sel1Spin1Check_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_1Sel1Spin1Check( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_1Sel1Spin1Check();
-};
-
-//////////////////////////////////////////
-// DlgRef_1Sel1Spin
-//////////////////////////////////////////
-
-#include "ui_DlgRef_1Sel1Spin_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_1Sel1Spin : public QWidget, 
-                                       public Ui::DlgRef_1Sel1Spin_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_1Sel1Spin( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_1Sel1Spin();
-};
-
-//////////////////////////////////////////
-// DlgRef_1Sel2Spin1View1Check
-//////////////////////////////////////////
-
-#include "ui_DlgRef_1Sel2Spin1View1Check_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_1Sel2Spin1View1Check : public QWidget, 
-                                                  public Ui::DlgRef_1Sel2Spin1View1Check_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_1Sel2Spin1View1Check( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_1Sel2Spin1View1Check();
-};
 
 //////////////////////////////////////////
 // DlgRef_1Sel2Spin
@@ -165,33 +38,16 @@ public:
 
 #include "ui_DlgRef_1Sel2Spin_QTD.h"
 
-class MYDLGREF_EXPORT DlgRef_1Sel2Spin : public QWidget, 
-                                       public Ui::DlgRef_1Sel2Spin_QTD
+class MYDLGREF_EXPORT MyDlgRef_1Sel2Spin : public QWidget, 
+                                       public Ui::MyDlgRef_1Sel2Spin_QTD
 {
   Q_OBJECT
 
 public:
-  DlgRef_1Sel2Spin( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_1Sel2Spin();
+  MyDlgRef_1Sel2Spin( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~MyDlgRef_1Sel2Spin();
 };
 
-//////////////////////////////////////////
-// DlgRef_1Sel3Check
-//////////////////////////////////////////
-
-#include "ui_DlgRef_1Sel3Check_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_1Sel3Check : public QWidget, 
-                                        public Ui::DlgRef_1Sel3Check_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_1Sel3Check( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_1Sel3Check();
-};
-
-
 
 //////////////////////////////////////////
 // DlgRef_1Sel3Spin
@@ -199,206 +55,14 @@ public:
 
 #include "ui_DlgRef_1Sel3Spin_QTD.h"
 
-class MYDLGREF_EXPORT DlgRef_1Sel3Spin : public QWidget, 
-                                       public Ui::DlgRef_1Sel3Spin_QTD
+class MYDLGREF_EXPORT MyDlgRef_1Sel3Spin : public QWidget, 
+                                       public Ui::MyDlgRef_1Sel3Spin_QTD
 {
   Q_OBJECT
 
 public:
-  DlgRef_1Sel3Spin( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_1Sel3Spin();
-};
-
-//////////////////////////////////////////
-// DlgRef_1Sel3Spin1Check
-//////////////////////////////////////////
-
-#include "ui_DlgRef_1Sel3Spin1Check_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_1Sel3Spin1Check : public QWidget, 
-                                             public Ui::DlgRef_1Sel3Spin1Check_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_1Sel3Spin1Check( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_1Sel3Spin1Check();
-};
-
-//////////////////////////////////////////
-// DlgRef_1Sel4Spin2Check
-//////////////////////////////////////////
-
-#include "ui_DlgRef_1Sel4Spin2Check_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_1Sel4Spin2Check : public QWidget, 
-                                             public Ui::DlgRef_1Sel4Spin2Check_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_1Sel4Spin2Check( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_1Sel4Spin2Check();
-};
-
-//////////////////////////////////////////
-// DlgRef_1Sel4Spin
-//////////////////////////////////////////
-
-#include "ui_DlgRef_1Sel4Spin_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_1Sel4Spin : public QWidget, 
-                                       public Ui::DlgRef_1Sel4Spin_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_1Sel4Spin( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_1Sel4Spin();
-};
-
-//////////////////////////////////////////
-// DlgRef_1Sel5Spin1Check
-//////////////////////////////////////////
-
-#include "ui_DlgRef_1Sel5Spin1Check_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_1Sel5Spin1Check : public QWidget, 
-                                             public Ui::DlgRef_1Sel5Spin1Check_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_1Sel5Spin1Check( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_1Sel5Spin1Check();
-};
-
-//////////////////////////////////////////
-// DlgRef_1Sel5Spin
-//////////////////////////////////////////
-
-#include "ui_DlgRef_1Sel5Spin_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_1Sel5Spin : public QWidget, 
-                                       public Ui::DlgRef_1Sel5Spin_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_1Sel5Spin( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_1Sel5Spin();
-};
-
-//////////////////////////////////////////
-// DlgRef_1Spin
-//////////////////////////////////////////
-
-#include "ui_DlgRef_1Spin_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_1Spin : public QWidget, 
-                                   public Ui::DlgRef_1Spin_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_1Spin( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_1Spin();
-};
-
-//////////////////////////////////////////
-// DlgRef_1Sel
-//////////////////////////////////////////
-
-#include "ui_DlgRef_1Sel_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_1Sel : public QWidget, 
-                                   public Ui::DlgRef_1Sel_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_1Sel( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_1Sel();
-};
-
-//////////////////////////////////////////
-// DlgRef_1SelExt
-//////////////////////////////////////////
-
-#include "ui_DlgRef_1SelExt_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_1SelExt : public QWidget, 
-                                     public Ui::DlgRef_1SelExt_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_1SelExt( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_1SelExt();
-};
-
-//////////////////////////////////////////
-// DlgRef_2Sel1List1Check
-//////////////////////////////////////////
-
-#include "ui_DlgRef_2Sel1List1Check_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_2Sel1List1Check : public QWidget, 
-                                             public Ui::DlgRef_2Sel1List1Check_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_2Sel1List1Check( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_2Sel1List1Check();
-};
-
-//////////////////////////////////////////
-// DlgRef_2Sel1List2Check
-//////////////////////////////////////////
-
-#include "ui_DlgRef_2Sel1List2Check_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_2Sel1List2Check : public QWidget, 
-                                             public Ui::DlgRef_2Sel1List2Check_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_2Sel1List2Check( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_2Sel1List2Check();
-};
-
-//////////////////////////////////////////
-// DlgRef_2Sel1List
-//////////////////////////////////////////
-
-#include "ui_DlgRef_2Sel1List_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_2Sel1List : public QWidget, 
-                                       public Ui::DlgRef_2Sel1List_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_2Sel1List( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_2Sel1List();
-};
-
-//////////////////////////////////////////
-// DlgRef_2Sel1Spin2Check
-//////////////////////////////////////////
-
-#include "ui_DlgRef_2Sel1Spin2Check_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_2Sel1Spin2Check : public QWidget, 
-                                             public Ui::DlgRef_2Sel1Spin2Check_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_2Sel1Spin2Check( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_2Sel1Spin2Check();
+  MyDlgRef_1Sel3Spin( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~MyDlgRef_1Sel3Spin();
 };
 
 //////////////////////////////////////////
@@ -407,142 +71,14 @@ public:
 
 #include "ui_DlgRef_2Sel1Spin_QTD.h"
 
-class MYDLGREF_EXPORT DlgRef_2Sel1Spin : public QWidget, 
-                                       public Ui::DlgRef_2Sel1Spin_QTD
+class MYDLGREF_EXPORT MyDlgRef_2Sel1Spin : public QWidget, 
+                                       public Ui::MyDlgRef_2Sel1Spin_QTD
 {
   Q_OBJECT
 
 public:
-  DlgRef_2Sel1Spin( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_2Sel1Spin();
-};
-
-//////////////////////////////////////////
-// DlgRef_2Sel1SpinInt
-//////////////////////////////////////////
-
-#include "ui_DlgRef_2Sel1SpinInt_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_2Sel1SpinInt : public QWidget, 
-                                          public Ui::DlgRef_2Sel1SpinInt_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_2Sel1SpinInt( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_2Sel1SpinInt();
-};
-
-//////////////////////////////////////////
-// DlgRef_2Sel2List
-//////////////////////////////////////////
-
-#include "ui_DlgRef_2Sel2List_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_2Sel2List : public QWidget, 
-                                       public Ui::DlgRef_2Sel2List_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_2Sel2List( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_2Sel2List();
-};
-
-//////////////////////////////////////////
-// DlgRef_2Sel2Spin1Check
-//////////////////////////////////////////
-
-#include "ui_DlgRef_2Sel2Spin1Check_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_2Sel2Spin1Check : public QWidget, 
-                                             public Ui::DlgRef_2Sel2Spin1Check_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_2Sel2Spin1Check( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_2Sel2Spin1Check();
-};
-
-//////////////////////////////////////////
-// DlgRef_2Sel2Spin3Check
-//////////////////////////////////////////
-
-#include "ui_DlgRef_2Sel2Spin3Check_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_2Sel2Spin3Check : public QWidget, 
-                                             public Ui::DlgRef_2Sel2Spin3Check_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_2Sel2Spin3Check( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_2Sel2Spin3Check();
-};
-
-//////////////////////////////////////////
-// DlgRef_2Sel2Spin
-//////////////////////////////////////////
-
-#include "ui_DlgRef_2Sel2Spin_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_2Sel2Spin : public QWidget, 
-                                       public Ui::DlgRef_2Sel2Spin_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_2Sel2Spin( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_2Sel2Spin();
-};
-
-//////////////////////////////////////////
-// DlgRef_2Sel3Spin2Rb
-//////////////////////////////////////////
-
-#include "ui_DlgRef_2Sel3Spin2Rb_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_2Sel3Spin2Rb : public QWidget, 
-                                          public Ui::DlgRef_2Sel3Spin2Rb_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_2Sel3Spin2Rb( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_2Sel3Spin2Rb();
-};
-
-//////////////////////////////////////////
-// DlgRef_2Sel3Spin
-//////////////////////////////////////////
-
-#include "ui_DlgRef_2Sel3Spin_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_2Sel3Spin : public QWidget, 
-                                       public Ui::DlgRef_2Sel3Spin_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_2Sel3Spin( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_2Sel3Spin();
-};
-
-//////////////////////////////////////////
-// DlgRef_2Sel4Spin1Check
-//////////////////////////////////////////
-
-#include "ui_DlgRef_2Sel4Spin1Check_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_2Sel4Spin1Check : public QWidget, 
-                                             public Ui::DlgRef_2Sel4Spin1Check_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_2Sel4Spin1Check( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_2Sel4Spin1Check();
+ MyDlgRef_2Sel1Spin( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~MyDlgRef_2Sel1Spin();
 };
 
 //////////////////////////////////////////
@@ -551,226 +87,14 @@ public:
 
 #include "ui_DlgRef_2Sel_QTD.h"
 
-class MYDLGREF_EXPORT DlgRef_2Sel : public QWidget, 
-                                  public Ui::DlgRef_2Sel_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_2Sel( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_2Sel();
-};
-
-//////////////////////////////////////////
-// DlgRef_2SelExt
-//////////////////////////////////////////
-
-#include "ui_DlgRef_2SelExt_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_2SelExt : public QWidget, 
-                                     public Ui::DlgRef_2SelExt_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_2SelExt( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_2SelExt();
-};
-
-//////////////////////////////////////////
-// DlgRef_2Spin
-//////////////////////////////////////////
-
-#include "ui_DlgRef_2Spin_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_2Spin : public QWidget, 
-                                   public Ui::DlgRef_2Spin_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_2Spin( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_2Spin();
-};
-
-//////////////////////////////////////////
-// DlgRef_3Check
-//////////////////////////////////////////
-
-#include "ui_DlgRef_3Check_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_3Check : public QWidget, 
-                                    public Ui::DlgRef_3Check_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_3Check( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_3Check();
-};
-
-//////////////////////////////////////////
-// DlgRef_1Sel3Radio
-//////////////////////////////////////////
-
-#include "ui_DlgRef_3Radio_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_3Radio : public QWidget, 
-                                    public Ui::DlgRef_3Radio_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_3Radio( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_3Radio();
-};
-
-//////////////////////////////////////////
-// DlgRef_1Sel3Radio1Sel1Spin
-//////////////////////////////////////////
-
-#include "ui_DlgRef_3Radio1Sel1Spin_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_3Radio1Sel1Spin : public QWidget, 
-                                             public Ui::DlgRef_3Radio1Sel1Spin_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_3Radio1Sel1Spin( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_3Radio1Sel1Spin();
-};
-
-//////////////////////////////////////////
-// DlgRef_3Sel1Check
-//////////////////////////////////////////
-
-#include "ui_DlgRef_3Sel1Check_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_3Sel1Check : public QWidget, 
-                                        public Ui::DlgRef_3Sel1Check_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_3Sel1Check( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_3Sel1Check();
-};
-
-//////////////////////////////////////////
-// DlgRef_3Sel1Spin
-//////////////////////////////////////////
-
-#include "ui_DlgRef_3Sel1Spin_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_3Sel1Spin : public QWidget, 
-                                       public Ui::DlgRef_3Sel1Spin_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_3Sel1Spin( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_3Sel1Spin();
-};
-
-//////////////////////////////////////////
-// DlgRef_3Sel2Spin
-//////////////////////////////////////////
-
-#include "ui_DlgRef_3Sel2Spin_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_3Sel2Spin : public QWidget, 
-                                       public Ui::DlgRef_3Sel2Spin_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_3Sel2Spin( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_3Sel2Spin();
-};
-
-//////////////////////////////////////////
-// DlgRef_3Sel3Spin1Check
-//////////////////////////////////////////
-
-#include "ui_DlgRef_3Sel3Spin1Check_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_3Sel3Spin1Check : public QWidget, 
-                                             public Ui::DlgRef_3Sel3Spin1Check_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_3Sel3Spin1Check( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_3Sel3Spin1Check();
-
-  void ShowRows( int, int, bool = true );
-};
-
-//////////////////////////////////////////
-// DlgRef_3Sel3Spin2Check
-//////////////////////////////////////////
-
-#include "ui_DlgRef_3Sel3Spin2Check_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_3Sel3Spin2Check : public QWidget, 
-                                             public Ui::DlgRef_3Sel3Spin2Check_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_3Sel3Spin2Check( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_3Sel3Spin2Check();
-
-  void ShowRows( int, int, bool = true );
-};
-
-//////////////////////////////////////////
-// DlgRef_3Sel4Spin2Check
-//////////////////////////////////////////
-
-#include "ui_DlgRef_3Sel4Spin2Check_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_3Sel4Spin2Check : public QWidget, 
-                                             public Ui::DlgRef_3Sel4Spin2Check_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_3Sel4Spin2Check( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_3Sel4Spin2Check();
-};
-
-//////////////////////////////////////////
-// DlgRef_3Sel
-//////////////////////////////////////////
-
-#include "ui_DlgRef_3Sel_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_3Sel : public QWidget, 
-                                  public Ui::DlgRef_3Sel_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_3Sel( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_3Sel();
-};
-
-//////////////////////////////////////////
-// DlgRef_3Spin1Check
-//////////////////////////////////////////
-
-#include "ui_DlgRef_3Spin1Check_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_3Spin1Check : public QWidget, 
-                                         public Ui::DlgRef_3Spin1Check_QTD
+class MYDLGREF_EXPORT MyDlgRef_2Sel : public QWidget, 
+                                  public Ui::MyDlgRef_2Sel_QTD
 {
   Q_OBJECT
 
 public:
-  DlgRef_3Spin1Check( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_3Spin1Check();
+  MyDlgRef_2Sel( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~MyDlgRef_2Sel();
 };
 
 //////////////////////////////////////////
@@ -779,96 +103,14 @@ public:
 
 #include "ui_DlgRef_3Spin_QTD.h"
 
-class MYDLGREF_EXPORT DlgRef_3Spin : public QWidget, 
-                                   public Ui::DlgRef_3Spin_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_3Spin( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_3Spin();
-};
-
-//////////////////////////////////////////
-// DlgRef_4Sel1List1Check
-//////////////////////////////////////////
-
-#include "ui_DlgRef_4Sel1List1Check_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_4Sel1List1Check : public QWidget, 
-                                             public Ui::DlgRef_4Sel1List1Check_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_4Sel1List1Check( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_4Sel1List1Check();
-};
-
-//////////////////////////////////////////
-// DlgRef_4Sel1List
-//////////////////////////////////////////
-
-#include "ui_DlgRef_4Sel1List_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_4Sel1List : public QWidget, 
-                                       public Ui::DlgRef_4Sel1List_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_4Sel1List( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_4Sel1List();
-};
-
-//////////////////////////////////////////
-// DlgRef_4Sel1Spin2Check
-//////////////////////////////////////////
-
-#include "ui_DlgRef_4Sel1Spin2Check_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_4Sel1Spin2Check : public QWidget, 
-                                             public Ui::DlgRef_4Sel1Spin2Check_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_4Sel1Spin2Check( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_4Sel1Spin2Check();
-
-  void ShowRows( int, int, bool = true );
-};
-
-//////////////////////////////////////////
-// DlgRef_4Sel1Spin2Check
-//////////////////////////////////////////
-
-#include "ui_DlgRef_4Sel1Spin3Check_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_4Sel1Spin3Check : public QWidget, 
-                                             public Ui::DlgRef_4Sel1Spin3Check_QTD
-{
-  Q_OBJECT
-
-public:
-  DlgRef_4Sel1Spin3Check( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_4Sel1Spin3Check();
-};
-
-//////////////////////////////////////////
-// DlgRef_6Sel
-//////////////////////////////////////////
-
-#include "ui_DlgRef_6Sel_QTD.h"
-
-class MYDLGREF_EXPORT DlgRef_6Sel : public QWidget, 
-                                  public Ui::DlgRef_6Sel_QTD
+class MYDLGREF_EXPORT MyDlgRef_3Spin : public QWidget, 
+                                   public Ui::MyDlgRef_3Spin_QTD
 {
   Q_OBJECT
 
 public:
-  DlgRef_6Sel( QWidget* = 0, Qt::WindowFlags = 0 );
-  ~DlgRef_6Sel();
+  MyDlgRef_3Spin( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~MyDlgRef_3Spin();
 };
 
 //////////////////////////////////////////
@@ -891,7 +133,7 @@ public:
 // Utility functions
 //////////////////////////////////////////
 
-namespace DlgRef
+namespace MyDlgRef
 {
   MYDLGREF_EXPORT QString PrintDoubleValue( double, int = 16 );
 };
diff --git a/src/HEXABLOCKGUI/ReplaceHexa_QTD.ui b/src/HEXABLOCKGUI/ReplaceHexa_QTD.ui
index 451e657..19aaca2 100644
--- a/src/HEXABLOCKGUI/ReplaceHexa_QTD.ui
+++ b/src/HEXABLOCKGUI/ReplaceHexa_QTD.ui
@@ -20,47 +20,6 @@
    <string>Replace Hexahedron</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QGroupBox" name="groupBox">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="title">
-      <string/>
-     </property>
-     <layout class="QHBoxLayout" name="horizontalLayout">
-      <item>
-       <widget class="QRadioButton" name="radioButton">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>Hexa</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QRadioButton" name="radioButton_2">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>Hexas</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
    <item>
     <widget class="QScrollArea" name="scrollArea">
      <property name="sizePolicy">
@@ -78,7 +37,7 @@
         <x>0</x>
         <y>0</y>
         <width>265</width>
-        <height>585</height>
+        <height>649</height>
        </rect>
       </property>
       <layout class="QVBoxLayout" name="verticalLayout_4">
@@ -122,6 +81,9 @@
              </sizepolicy>
             </property>
             <layout class="QFormLayout" name="formLayout_2">
+             <property name="fieldGrowthPolicy">
+              <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+             </property>
              <item row="0" column="0">
               <widget class="QLabel" name="label_4">
                <property name="text">
@@ -174,32 +136,6 @@
                </property>
               </widget>
              </item>
-             <item row="2" column="0">
-              <widget class="QLabel" name="label_6">
-               <property name="text">
-                <string>Point c</string>
-               </property>
-              </widget>
-             </item>
-             <item row="2" column="1">
-              <widget class="QLineEdit" name="p3_le">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="toolTip">
-                <string>Select vertex</string>
-               </property>
-               <property name="text">
-                <string/>
-               </property>
-               <property name="readOnly">
-                <bool>false</bool>
-               </property>
-              </widget>
-             </item>
             </layout>
            </widget>
           </item>
@@ -295,32 +231,6 @@
                </property>
               </widget>
              </item>
-             <item row="3" column="0">
-              <widget class="QLabel" name="label_3">
-               <property name="text">
-                <string>Point c</string>
-               </property>
-              </widget>
-             </item>
-             <item row="3" column="1">
-              <widget class="QLineEdit" name="c3_le">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="toolTip">
-                <string>Select vertex</string>
-               </property>
-               <property name="text">
-                <string/>
-               </property>
-               <property name="readOnly">
-                <bool>false</bool>
-               </property>
-              </widget>
-             </item>
             </layout>
            </widget>
           </item>
@@ -337,41 +247,7 @@
   <tabstop>quads_lw</tabstop>
   <tabstop>p1_le</tabstop>
   <tabstop>p2_le</tabstop>
-  <tabstop>p3_le</tabstop>
  </tabstops>
  <resources/>
- <connections>
-  <connection>
-   <sender>radioButton</sender>
-   <signal>clicked()</signal>
-   <receiver>quads_lw_2</receiver>
-   <slot>hide()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>109</x>
-     <y>44</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>146</x>
-     <y>453</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>radioButton_2</sender>
-   <signal>clicked()</signal>
-   <receiver>quads_lw_2</receiver>
-   <slot>show()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>232</x>
-     <y>44</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>146</x>
-     <y>453</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
+ <connections/>
 </ui>
diff --git a/src/HEXABLOCK_SWIG/hexablock.py b/src/HEXABLOCK_SWIG/hexablock.py
index 531290d..5b42284 100644
--- a/src/HEXABLOCK_SWIG/hexablock.py
+++ b/src/HEXABLOCK_SWIG/hexablock.py
@@ -106,8 +106,14 @@ def mesh (doc, name=None, dim=3, container="FactoryServer"):
        ####  shape = geompy.MakeBox(0, 0, 0,  1, 1, 1)
     ####  else :
        ####  shape = doc.getShape (0)
+    ###   shape = geompy.MakeBox(0, 0, 0,  1, 1, 1)
 
+    ###  stream = doc.getFirstExplicitShape ()
+    ###  if stream != None :
+       ###  shape = geompy.RestoreShape (stream)
+    ###  else :
     shape = geompy.MakeBox(0, 0, 0,  1, 1, 1)
+
     if (name == None) or (name == ""):
         name = docname
 
@@ -125,7 +131,6 @@ def mesh (doc, name=None, dim=3, container="FactoryServer"):
     meshexa.mesh.AddHypothesis(shape, hypo)
 
     ### hypo.SetDocument(doc.getXml())   ## Hexa6 TODO et a verifier
-    print " Maillage du document "
     print " Maillage du document ", docname
     hypo.SetDocument (docname);
     hypo.SetDimension(dim)