From 5347e8abe119e8704d59c83638836f0fd94c732e Mon Sep 17 00:00:00 2001 From: abuhsing Date: Tue, 17 Dec 2013 15:08:28 +0000 Subject: [PATCH] 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 ---------------------------------------------------------------------- --- src/HEXABLOCK/HexDocument.hxx | 1 + src/HEXABLOCK/HexDocument_asso.cxx | 13 + src/HEXABLOCK/HexDocument_quads.cxx | 17 +- src/HEXABLOCK/HexDocument_trans.cxx | 26 +- src/HEXABLOCK/HexDummyCad.hxx | 1 + src/HEXABLOCK/HexElements.hxx | 14 +- src/HEXABLOCK/HexElements_check.cxx | 170 +++- src/HEXABLOCK/HexElements_piq.cxx | 496 ++-------- src/HEXABLOCK/HexElements_ter.cxx | 7 +- src/HEXABLOCK/HexHexa.cxx | 48 +- src/HEXABLOCK/HexHexa.hxx | 7 +- src/HEXABLOCK/HexNewShape.cxx | 8 + src/HEXABLOCK/HexNewShape.hxx | 2 +- src/HEXABLOCK/HexQpattern.cxx | 334 +++++++ src/HEXABLOCK/HexQpattern.hxx | 115 +++ src/HEXABLOCK/HexQuad.cxx | 12 + src/HEXABLOCK/HexQuad.hxx | 1 + src/HEXABLOCK/HexVertex.cxx | 28 + src/HEXABLOCK/HexVertex.hxx | 2 + src/HEXABLOCK/hexa_base.hxx | 7 +- src/HEXABLOCK/test_quads.cxx | 146 ++- src/HEXABLOCKGUI/HEXABLOCKGUI.cxx | 2 +- .../HEXABLOCKGUI_DocumentModel.cxx | 42 +- .../HEXABLOCKGUI_DocumentModel.hxx | 8 +- .../HEXABLOCKGUI_DocumentPanel.cxx | 75 +- .../HEXABLOCKGUI_DocumentPanel.hxx | 12 +- src/HEXABLOCKGUI/MyBasicGUI_PointDlg.cxx | 16 +- src/HEXABLOCKGUI/MyBasicGUI_PointDlg.hxx | 22 +- src/HEXABLOCKGUI/MyDlgRef/DlgRef.cxx | 853 ----------------- src/HEXABLOCKGUI/MyDlgRef/DlgRef.hxx | 899 ------------------ .../MyDlgRef/DlgRef_1List1Spin1Btn_QTD.ui | 98 -- .../MyDlgRef/DlgRef_1Sel1Check1List_QTD.ui | 122 --- .../MyDlgRef/DlgRef_1Sel1Check1Sel_QTD.ui | 148 --- .../MyDlgRef/DlgRef_1Sel1Check_QTD.ui | 91 -- .../DlgRef_1Sel1List1Check3Btn_QTD.ui | 154 --- .../MyDlgRef/DlgRef_1Sel1Spin1Check_QTD.ui | 128 --- .../MyDlgRef/DlgRef_1Sel1Spin_QTD.ui | 114 --- .../DlgRef_1Sel2Spin1View1Check_QTD.ui | 147 --- .../MyDlgRef/DlgRef_1Sel2Spin_QTD.ui | 6 +- .../MyDlgRef/DlgRef_1Sel3Check_QTD.ui | 107 --- .../MyDlgRef/DlgRef_1Sel3Spin1Check_QTD.ui | 175 ---- .../MyDlgRef/DlgRef_1Sel3Spin_QTD.ui | 6 +- .../MyDlgRef/DlgRef_1Sel4Spin2Check_QTD.ui | 211 ---- .../MyDlgRef/DlgRef_1Sel4Spin_QTD.ui | 210 ---- .../MyDlgRef/DlgRef_1Sel5Spin1Check_QTD.ui | 243 ----- .../MyDlgRef/DlgRef_1Sel5Spin_QTD.ui | 232 ----- .../MyDlgRef/DlgRef_1SelExt_QTD.ui | 94 -- src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel_QTD.ui | 91 -- src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Spin_QTD.ui | 77 -- .../MyDlgRef/DlgRef_2Sel1List1Check_QTD.ui | 153 --- .../MyDlgRef/DlgRef_2Sel1List2Check_QTD.ui | 151 --- .../MyDlgRef/DlgRef_2Sel1List_QTD.ui | 152 --- .../MyDlgRef/DlgRef_2Sel1Spin2Check_QTD.ui | 176 ---- .../MyDlgRef/DlgRef_2Sel1SpinInt_QTD.ui | 150 --- .../MyDlgRef/DlgRef_2Sel1Spin_QTD.ui | 6 +- .../MyDlgRef/DlgRef_2Sel2List_QTD.ui | 166 ---- .../MyDlgRef/DlgRef_2Sel2Spin1Check_QTD.ui | 185 ---- .../MyDlgRef/DlgRef_2Sel2Spin3Check_QTD.ui | 199 ---- .../MyDlgRef/DlgRef_2Sel2Spin_QTD.ui | 175 ---- .../MyDlgRef/DlgRef_2Sel3Spin2Rb_QTD.ui | 219 ----- .../MyDlgRef/DlgRef_2Sel3Spin_QTD.ui | 202 ---- .../MyDlgRef/DlgRef_2Sel4Spin1Check_QTD.ui | 236 ----- .../MyDlgRef/DlgRef_2SelExt_QTD.ui | 132 --- src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel_QTD.ui | 99 +- src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Spin_QTD.ui | 103 -- .../MyDlgRef/DlgRef_3Check_QTD.ui | 69 -- .../MyDlgRef/DlgRef_3Radio1Sel1Spin_QTD.ui | 156 --- .../MyDlgRef/DlgRef_3Radio_QTD.ui | 75 -- .../MyDlgRef/DlgRef_3Sel1Check_QTD.ui | 182 ---- .../MyDlgRef/DlgRef_3Sel1Spin_QTD.ui | 194 ---- .../MyDlgRef/DlgRef_3Sel2Spin_QTD.ui | 214 ----- .../MyDlgRef/DlgRef_3Sel3Spin1Check_QTD.ui | 256 ----- .../MyDlgRef/DlgRef_3Sel3Spin2Check_QTD.ui | 243 ----- .../MyDlgRef/DlgRef_3Sel4Spin2Check_QTD.ui | 278 ------ src/HEXABLOCKGUI/MyDlgRef/DlgRef_3Sel_QTD.ui | 167 ---- .../MyDlgRef/DlgRef_3Spin1Check_QTD.ui | 142 --- src/HEXABLOCKGUI/MyDlgRef/DlgRef_3Spin_QTD.ui | 8 +- .../MyDlgRef/DlgRef_4Sel1List1Check_QTD.ui | 244 ----- .../MyDlgRef/DlgRef_4Sel1List_QTD.ui | 228 ----- .../MyDlgRef/DlgRef_4Sel1Spin2Check_QTD.ui | 243 ----- .../MyDlgRef/DlgRef_4Sel1Spin3Check_QTD.ui | 273 ------ src/HEXABLOCKGUI/MyDlgRef/DlgRef_6Sel_QTD.ui | 281 ------ .../MyDlgRef/DlgRef_Skeleton_QTD.ui | 32 +- src/HEXABLOCKGUI/MyDlgRef/MyDlgRef.cxx | 765 +-------------- src/HEXABLOCKGUI/MyDlgRef/MyDlgRef.hxx | 828 +--------------- src/HEXABLOCKGUI/ReplaceHexa_QTD.ui | 134 +-- src/HEXABLOCK_SWIG/hexablock.py | 7 +- 87 files changed, 1182 insertions(+), 12179 deletions(-) create mode 100644 src/HEXABLOCK/HexQpattern.cxx create mode 100644 src/HEXABLOCK/HexQpattern.hxx delete mode 100755 src/HEXABLOCKGUI/MyDlgRef/DlgRef.cxx delete mode 100644 src/HEXABLOCKGUI/MyDlgRef/DlgRef.hxx delete mode 100755 src/HEXABLOCKGUI/MyDlgRef/DlgRef_1List1Spin1Btn_QTD.ui delete mode 100755 src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel1Check1List_QTD.ui delete mode 100755 src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel1Check1Sel_QTD.ui delete mode 100755 src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel1Check_QTD.ui delete mode 100755 src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel1List1Check3Btn_QTD.ui delete mode 100755 src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel1Spin1Check_QTD.ui delete mode 100755 src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel1Spin_QTD.ui delete mode 100755 src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel2Spin1View1Check_QTD.ui delete mode 100755 src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel3Check_QTD.ui delete mode 100755 src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel3Spin1Check_QTD.ui delete mode 100755 src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel4Spin2Check_QTD.ui delete mode 100755 src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel4Spin_QTD.ui delete mode 100755 src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel5Spin1Check_QTD.ui delete mode 100755 src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel5Spin_QTD.ui delete mode 100755 src/HEXABLOCKGUI/MyDlgRef/DlgRef_1SelExt_QTD.ui delete mode 100755 src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Sel_QTD.ui delete mode 100755 src/HEXABLOCKGUI/MyDlgRef/DlgRef_1Spin_QTD.ui delete mode 100755 src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel1List1Check_QTD.ui delete mode 100755 src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel1List2Check_QTD.ui delete mode 100755 src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel1List_QTD.ui delete mode 100755 src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel1Spin2Check_QTD.ui delete mode 100755 src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel1SpinInt_QTD.ui delete mode 100755 src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel2List_QTD.ui delete mode 100755 src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel2Spin1Check_QTD.ui delete mode 100755 src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel2Spin3Check_QTD.ui delete mode 100755 src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel2Spin_QTD.ui delete mode 100755 src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel3Spin2Rb_QTD.ui delete mode 100755 src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel3Spin_QTD.ui delete mode 100755 src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Sel4Spin1Check_QTD.ui delete mode 100755 src/HEXABLOCKGUI/MyDlgRef/DlgRef_2SelExt_QTD.ui delete mode 100755 src/HEXABLOCKGUI/MyDlgRef/DlgRef_2Spin_QTD.ui delete mode 100755 src/HEXABLOCKGUI/MyDlgRef/DlgRef_3Check_QTD.ui delete mode 100755 src/HEXABLOCKGUI/MyDlgRef/DlgRef_3Radio1Sel1Spin_QTD.ui delete mode 100755 src/HEXABLOCKGUI/MyDlgRef/DlgRef_3Radio_QTD.ui delete mode 100755 src/HEXABLOCKGUI/MyDlgRef/DlgRef_3Sel1Check_QTD.ui delete mode 100755 src/HEXABLOCKGUI/MyDlgRef/DlgRef_3Sel1Spin_QTD.ui delete mode 100755 src/HEXABLOCKGUI/MyDlgRef/DlgRef_3Sel2Spin_QTD.ui delete mode 100755 src/HEXABLOCKGUI/MyDlgRef/DlgRef_3Sel3Spin1Check_QTD.ui delete mode 100755 src/HEXABLOCKGUI/MyDlgRef/DlgRef_3Sel3Spin2Check_QTD.ui delete mode 100755 src/HEXABLOCKGUI/MyDlgRef/DlgRef_3Sel4Spin2Check_QTD.ui delete mode 100755 src/HEXABLOCKGUI/MyDlgRef/DlgRef_3Sel_QTD.ui delete mode 100755 src/HEXABLOCKGUI/MyDlgRef/DlgRef_3Spin1Check_QTD.ui delete mode 100755 src/HEXABLOCKGUI/MyDlgRef/DlgRef_4Sel1List1Check_QTD.ui delete mode 100755 src/HEXABLOCKGUI/MyDlgRef/DlgRef_4Sel1List_QTD.ui delete mode 100755 src/HEXABLOCKGUI/MyDlgRef/DlgRef_4Sel1Spin2Check_QTD.ui delete mode 100755 src/HEXABLOCKGUI/MyDlgRef/DlgRef_4Sel1Spin3Check_QTD.ui delete mode 100755 src/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_count; + map :: iterator iter; + int nbre = tquad.size(); + for (int nq=0 ; nqgetNbrParents() != 1) + { + setError (HERR); + Mess << " Target quad nr " << nq+1 + << " must be an external face"; + return; + } + + for (int ned=0 ; nedgetEdge (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 ; nedgetParent(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_count; + map :: iterator iter; + int nbre = tquad.size(); + for (int nq=0 ; nqgetNbrParents() != 1) + { + setError (HERR); + Mess << " Target quad nr " << nq+1 + << " must be an external face"; + return; + } + + for (int ned=0 ; nedgetEdge (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 ; nedgetParent(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 #include @@ -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 pat_vertex; - vector pat_edge; - vector 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 ; nrogetEdge (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; nroindexEdge (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; nrogetX() - 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 ; nqgetOpposedQuad (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 ; nhgetPerpendicularEdge (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 ; nrocont_nbnodes; + for (int nro=0 ; nrofindEdge (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 ; ncgetPoint (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 ; nronbr_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 ; nronbr_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 ; nronbr_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 ; nroindex (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 ; nroindexEdge (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 +#include + +BEGIN_NAMESPACE_HEXA + +static bool db = false; + +// =================================================== Construc QpatQuad +QpatQuad::QpatQuad (Quad* elt) +{ + refer = elt; + cible = oppos = NULL; + for (int nro=0 ; nroindexVertex(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 ; ncgetPoint (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 ; npgetPoint (point); + for (int nc=0 ; ncgetParent (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; nrogetEdge (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; nrogetVertex (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 (%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 ; nroopposedVertex (quad, old_contour[nro]); + old_contour[nro] = vertex; + } + + int nbquads = old_top.size(); + for (int nq=0 ; nqopposedHexa (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 +#include + +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 pat_vertex; + vector pat_edge; + vector 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 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 ; ncgetPoint (pmin); + cont[0]->getPoint (pmax); + for (int nro=1 ; nrogetPoint (point); + for (int nc=0 ; nc 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; nagetQuadIJ (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; nagetQuadIJ (0, na, 1); + quad->setColor (2); + qpattern.push_back (quad); + } + + for (int ni=1; nigetQuad (" << 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 +#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(ip1); - HEXA_NS::Vertex* hc1 = getHexaPtr(ic1); - HEXA_NS::Vertex* hp2 = getHexaPtr(ip2); - HEXA_NS::Vertex* hc2 = getHexaPtr(ic2); - HEXA_NS::Vertex* hp3 = getHexaPtr(ip3); - HEXA_NS::Vertex* hc3 = getHexaPtr(ic3); - - HEXA_NS::Quads hquads; - HEXA_NS::Quad* hquad = NULL; - foreach( const QModelIndex& iquad, iquadsPattern ){ - hquad = getHexaPtr(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(ip1_source); HEXA_NS::Vertex* hp2 = getHexaPtr(ip2_source); - HEXA_NS::Vertex* hp3 = getHexaPtr(ip3_source); HEXA_NS::Vertex* hc1 = getHexaPtr(ic1_dest); HEXA_NS::Vertex* hc2 = getHexaPtr(ic2_dest); - HEXA_NS::Vertex* hc3 = getHexaPtr(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() ); + 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() ); - 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 -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 @@ - - - DlgRef_1List1Spin1Btn_QTD - - - - 0 - 0 - 213 - 116 - - - - - - - - 0 - - - 0 - - - - - - - - - 9 - - - 6 - - - - - - 1 - - - - - - - - Qt::Vertical - - - QSizePolicy::Expanding - - - - 16 - 120 - - - - - - - - - - - - - - - 1000000 - - - - - - - TL1 - - - false - - - - - - - - - - qPixmapFromMimeSource - - ListView1 - SpinBox1 - PushButton1 - - - - 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 @@ - - DlgRef_1Sel1Check1List_QTD - - - - 0 - 0 - 156 - 94 - - - - - - - - 0 - - - 0 - - - - - - - - - 9 - - - 6 - - - - - - 0 - 0 - 0 - 0 - - - - TL1 - - - false - - - - - - - - 0 - 0 - 0 - 0 - - - - - - - - - - - - - - - 0 - 0 - 0 - 0 - - - - TL2 - - - false - - - - - - - - 7 - 0 - 0 - 0 - - - - - - - - - - - - - - - - - - qPixmapFromMimeSource - - PushButton1 - LineEdit1 - ComboBox1 - CheckButton1 - - - - 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 @@ - - DlgRef_1Sel1Check1Sel_QTD - - - - 0 - 0 - 156 - 99 - - - - - 5 - 5 - 0 - 0 - - - - - - - - 0 - - - 0 - - - - - - 5 - 5 - 0 - 0 - - - - - - - - 9 - - - 6 - - - - - - - - - 0 - 0 - 0 - 0 - - - - TL2 - - - false - - - - - - - - - - - - - - - - - - 0 - 0 - 0 - 0 - - - - - - - - - - - - 0 - 0 - 0 - 0 - - - - - - - - - - - - 0 - 0 - 0 - 0 - - - - TL1 - - - false - - - - - - - - - - - - - qPixmapFromMimeSource - - PushButton1 - LineEdit1 - CheckButton1 - PushButton2 - LineEdit2 - - - - 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 @@ - - DlgRef_1Sel1Check_QTD - - - - 0 - 0 - 155 - 64 - - - - - - - - 0 - - - 6 - - - - - - - - - 9 - - - 6 - - - - - - - - - - - - - - - - 0 - 0 - 0 - 0 - - - - TL1 - - - false - - - - - - - - 0 - 0 - 0 - 0 - - - - - - - - - - - - - - qPixmapFromMimeSource - - PushButton1 - LineEdit1 - CheckButton1 - - - - 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 @@ - - DlgRef_1Sel1List1Check3Btn_QTD - - - - 0 - 0 - 156 - 180 - - - - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 6 - - - 6 - - - - - - 0 - 0 - - - - - - - - - - - 0 - 0 - - - - TL1 - - - false - - - - - - - - 0 - 0 - - - - - - - - - - - - - - - 0 - 0 - 0 - 0 - - - - TL2 - - - false - - - - - - - - 7 - 0 - 0 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - qPixmapFromMimeSource - - PushButton1 - LineEdit1 - CheckButton1 - ListView1 - PushButton2 - PushButton3 - PushButton4 - - - - 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 @@ - - - DlgRef_1Sel1Spin1Check_QTD - - - - 0 - 0 - 207 - 93 - - - - - - - - 0 - - - 6 - - - - - - - - - 9 - - - 6 - - - - - - - - - - - - - 0 - 0 - - - - TL2 - - - false - - - - - - - 6 - - - 0.000000000000000 - - - 1000000000.000000000000000 - - - 0.000000000000000 - - - - - - - - 0 - 0 - - - - TL1 - - - false - - - - - - - - - - - 0 - 0 - - - - - - - - - - - - - - qPixmapFromMimeSource - - - SalomeApp_DoubleSpinBox - QDoubleSpinBox -
SalomeApp_DoubleSpinBox.h
- - - - PushButton1 - LineEdit1 - SpinBox_DX - CheckButton1 - - - - 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 @@ - - - DlgRef_1Sel1Spin_QTD - - - - 0 - 0 - 156 - 74 - - - - - - - - 0 - - - 0 - - - - - - - - - 9 - - - 6 - - - - - - 0 - 0 - - - - TL1 - - - false - - - - - - - - - - - 0 - 0 - - - - - - - - - - - - 0 - 0 - - - - TL2 - - - false - - - - - - - 6 - - - 1000000000.000000000000000 - - - - - - - - - - qPixmapFromMimeSource - - - SalomeApp_DoubleSpinBox - QDoubleSpinBox -
SalomeApp_DoubleSpinBox.h
- - - - PushButton1 - LineEdit1 - SpinBox_DX - - - - 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 @@ - - - DlgRef_1Sel2Spin1View1Check_QTD - - - - 0 - 0 - 176 - 227 - - - - - - - - 0 - - - 6 - - - - - - - - - 9 - - - 6 - - - - - - - - 1000000 - - - - - - - 1000000 - - - - - - - Check - - - - - - - - 0 - 0 - - - - TL3 - - - false - - - - - - - - 0 - 0 - - - - TL2 - - - false - - - - - - - - - - - 0 - 0 - - - - - - - - - - - - 0 - 0 - - - - TL1 - - - false - - - - - - - - - - qPixmapFromMimeSource - - - SalomeApp_IntSpinBox - QSpinBox -
SalomeApp_IntSpinBox.h
- - - - PushButton1 - LineEdit1 - SpinBox1 - SpinBox2 - TextBrowser1 - CheckBox1 - - - - 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 @@ - DlgRef_1Sel2Spin_QTD - + MyDlgRef_1Sel2Spin_QTD + 0 0 219 - 124 + 129 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 @@ - - DlgRef_1Sel3Check_QTD - - - - 0 - 0 - 155 - 114 - - - - - - - - 0 - - - 0 - - - - - - - - - 9 - - - 6 - - - - - - 0 - 0 - 0 - 0 - - - - TL1 - - - false - - - - - - - - 0 - 0 - 0 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - qPixmapFromMimeSource - - PushButton1 - LineEdit1 - CheckButton1 - CheckButton2 - CheckButton3 - - - - 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 @@ - - - DlgRef_1Sel3Spin1Check_QTD - - - - 0 - 0 - 156 - 147 - - - - - - - - 0 - - - 6 - - - - - - - - - 9 - - - 6 - - - - - 6 - - - 1000000000.000000000000000 - - - - - - - 6 - - - 1000000000.000000000000000 - - - - - - - 6 - - - 1000000000.000000000000000 - - - - - - - - - - - - - - - 0 - 0 - - - - TL2 - - - false - - - - - - - - 0 - 0 - - - - TL4 - - - false - - - - - - - - 0 - 0 - - - - TL3 - - - false - - - - - - - - - - - 0 - 0 - - - - TL1 - - - false - - - - - - - - 0 - 0 - - - - - - - - - - - - - - qPixmapFromMimeSource - - - SalomeApp_DoubleSpinBox - QDoubleSpinBox -
SalomeApp_DoubleSpinBox.h
- - - - PushButton1 - LineEdit1 - SpinBox_DX - SpinBox_DY - SpinBox_DZ - - - - 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 @@ - DlgRef_1Sel3Spin_QTD - + MyDlgRef_1Sel3Spin_QTD + 0 0 219 - 158 + 162 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 @@ - - - DlgRef_1Sel4Spin2Check_QTD - - - - 0 - 0 - 156 - 193 - - - - - - - - 0 - - - 6 - - - - - - - - - 9 - - - 6 - - - - - - 0 - 0 - - - - TL1 - - - false - - - - - - - - 0 - 0 - - - - - - - - - - - - - - - 0 - 0 - - - - TL2 - - - false - - - - - - - 6 - - - 1000000000.000000000000000 - - - - - - - - 0 - 0 - - - - TL3 - - - false - - - - - - - 6 - - - 1000000000.000000000000000 - - - - - - - - 0 - 0 - - - - TL4 - - - false - - - - - - - 6 - - - 1000000000.000000000000000 - - - - - - - - 0 - 0 - - - - TL5 - - - false - - - - - - - 6 - - - 1000000000.000000000000000 - - - - - - - - - - - - - - - - - - - - - - - - qPixmapFromMimeSource - - - SalomeApp_DoubleSpinBox - QDoubleSpinBox -
SalomeApp_DoubleSpinBox.h
- - - - PushButton1 - LineEdit1 - SpinBox_DX - SpinBox_DY - SpinBox_DZ - SpinBox_SC - CheckBox1 - CheckBox2 - - - - 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 @@ - - - DlgRef_1Sel4Spin_QTD - - - - 0 - 0 - 323 - 123 - - - - - - - - 0 - - - 6 - - - - - - - - - 9 - - - 6 - - - - - - 0 - 0 - - - - TL6 - - - false - - - - - - - 6 - - - 1000000000.000000000000000 - - - - - - - - - - - 6 - - - 9 - - - - - - 0 - 0 - - - - TL3 - - - false - - - - - - - 6 - - - 1000000000.000000000000000 - - - - - - - - 0 - 0 - - - - TL4 - - - false - - - - - - - 6 - - - 1000000000.000000000000000 - - - - - - - - 0 - 0 - - - - TL5 - - - false - - - - - - - 6 - - - 1000000000.000000000000000 - - - - - - - - - - - - - - 0 - 0 - - - - - - - - - - - - 0 - 0 - - - - TL1 - - - false - - - - - - - - - - qPixmapFromMimeSource - - - SalomeApp_DoubleSpinBox - QDoubleSpinBox -
SalomeApp_DoubleSpinBox.h
- - - - PushButton1 - LineEdit1 - SpinBox_DX - SpinBox_DY - SpinBox_DZ - SpinBox_S - - - - 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 @@ - - - DlgRef_1Sel5Spin1Check_QTD - - - - 0 - 0 - 204 - 163 - - - - - - - - 0 - - - - - - - - - - - - 0 - 0 - - - - TL1 - - - false - - - - - - - - - - 0 - 0 - - - - - - - - - - - - - - - - - 0 - 0 - - - - TL7 - - - false - - - - - - - - - - - - - 0 - 0 - - - - TL2 - - - false - - - - - - - - 0 - 0 - - - - TL3 - - - false - - - - - - - 6 - - - 1000000000.000000000000000 - - - - - - - - 0 - 0 - - - - TL5 - - - false - - - - - - - - 0 - 0 - - - - TL6 - - - false - - - - - - - 6 - - - 1000000000.000000000000000 - - - - - - - - 0 - 0 - - - - TL4 - - - false - - - - - - - - - - - - - - 1000000 - - - - - - - 1000000 - - - - - - - 1000000 - - - - - - - - - - - - - SalomeApp_DoubleSpinBox - QDoubleSpinBox -
SalomeApp_DoubleSpinBox.h
- - - SalomeApp_IntSpinBox - QSpinBox -
SalomeApp_IntSpinBox.h
- - - - PushButton1 - LineEdit1 - ComboBox1 - SpinBox1 - SpinBox2 - SpinBox4 - SpinBox5 - SpinBox3 - CheckBox1 - - - - 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 @@ - - - DlgRef_1Sel5Spin_QTD - - - - 0 - 0 - 208 - 130 - - - - - - - - 0 - - - 0 - - - - - - - - - 9 - - - 6 - - - - - 0 - - - 6 - - - - - - 0 - 0 - - - - TL4 - - - false - - - - - - - - 0 - 0 - - - - TL3 - - - false - - - - - - - 6 - - - 1000000000.000000000000000 - - - - - - - - 0 - 0 - - - - TL2 - - - false - - - - - - - 6 - - - 1000000000.000000000000000 - - - - - - - - 0 - 0 - - - - TL6 - - - false - - - - - - - 6 - - - 1000000000.000000000000000 - - - - - - - 6 - - - 1000000000.000000000000000 - - - - - - - 6 - - - 1000000000.000000000000000 - - - - - - - - 0 - 0 - - - - TL5 - - - false - - - - - - - - - - 0 - 0 - - - - - - - - - - - - 0 - 0 - - - - TL1 - - - false - - - - - - - - - - - - - qPixmapFromMimeSource - - - SalomeApp_DoubleSpinBox - QDoubleSpinBox -
SalomeApp_DoubleSpinBox.h
- - - - PushButton1 - LineEdit1 - SpinBox1 - SpinBox2 - SpinBox4 - SpinBox5 - SpinBox3 - - - - 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 @@ - - DlgRef_1SelExt_QTD - - - - 0 - 0 - 155 - 51 - - - - - - - - 0 - - - 0 - - - - - - 7 - 7 - 0 - 0 - - - - - - - - 9 - - - 6 - - - - - - - - - 0 - 0 - 0 - 0 - - - - TL1 - - - false - - - - - - - - 0 - 0 - 0 - 0 - - - - - - - - - - - - - - - - - qPixmapFromMimeSource - - PushButton1 - LineEdit1 - - - - 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 @@ - - DlgRef_1Sel_QTD - - - - 0 - 0 - 155 - 45 - - - - - - - - 0 - - - 0 - - - - - - 7 - 7 - 0 - 0 - - - - - - - - 9 - - - 6 - - - - - - - - - 0 - 0 - 0 - 0 - - - - - - - - - - - - 0 - 0 - 0 - 0 - - - - TL1 - - - false - - - - - - - - - - qPixmapFromMimeSource - - PushButton1 - LineEdit1 - - - - 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 @@ - - - DlgRef_1Spin_QTD - - - - 0 - 0 - 111 - 43 - - - - - - - - 0 - - - 0 - - - - - - - - - 9 - - - 6 - - - - - - 0 - 0 - - - - TL1 - - - false - - - - - - - 6 - - - 1000000000.000000000000000 - - - - - - - - - - qPixmapFromMimeSource - - - SalomeApp_DoubleSpinBox - QDoubleSpinBox -
SalomeApp_DoubleSpinBox.h
- - - - - 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 @@ - - DlgRef_2Sel1List1Check_QTD - - - - 0 - 0 - 211 - 121 - - - - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - - - - - - - 0 - 0 - - - - TL1 - - - false - - - - - - - - 0 - 0 - - - - - - - - - - - - - - - 0 - 0 - - - - TL2 - - - false - - - - - - - - 0 - 0 - - - - - - - - - - - - - - - 0 - 0 - - - - TL3 - - - false - - - - - - - - 0 - 0 - - - - - - - - - - - - - - - - - - qPixmapFromMimeSource - - PushButton1 - LineEdit1 - PushButton2 - LineEdit2 - ComboBox1 - - - - 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 @@ - - - DlgRef_2Sel1List2Check_QTD - - - - 0 - 0 - 127 - 140 - - - - - - - - 0 - - - 0 - - - - - - - - - - - - 0 - 0 - - - - TL1 - - - false - - - - - - - - 0 - 0 - - - - - - - - - - - - - - - 0 - 0 - - - - TL2 - - - false - - - - - - - - 0 - 0 - - - - - - - - - - - - - - - 0 - 0 - - - - TL3 - - - false - - - - - - - - 0 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - qPixmapFromMimeSource - - PushButton1 - LineEdit1 - PushButton2 - LineEdit2 - ComboBox1 - CheckButton1 - CheckButton2 - - - - 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 @@ - - DlgRef_2Sel1List_QTD - - - - 0 - 0 - 156 - 100 - - - - - - - - 0 - - - 0 - - - - - - - - - 9 - - - 6 - - - - - - 7 - 0 - 0 - 0 - - - - - - - - - 0 - 0 - 0 - 0 - - - - TL3 - - - false - - - - - - - - 0 - 0 - 0 - 0 - - - - TL2 - - - false - - - - - - - - - - - 0 - 0 - 0 - 0 - - - - TL1 - - - false - - - - - - - - 0 - 0 - 0 - 0 - - - - - - - - - - - - - - - 0 - 0 - 0 - 0 - - - - - - - - - - - - - - qPixmapFromMimeSource - - PushButton1 - LineEdit1 - PushButton2 - LineEdit2 - ComboBox1 - - - - 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 @@ - - - DlgRef_2Sel1Spin2Check_QTD - - - - 0 - 0 - 170 - 124 - - - - - - - - 0 - - - 0 - - - - - - - - - 9 - - - 6 - - - - - - 0 - 0 - - - - 6 - - - 1000000000.000000000000000 - - - - - - - - 0 - 0 - - - - - - - - - - - - 0 - 0 - - - - TL1 - - - false - - - - - - - - 0 - 0 - - - - TL3 - - - false - - - - - - - - 0 - 0 - - - - - - - - - - - - 0 - 0 - - - - TL2 - - - false - - - - - - - - - - - 0 - 0 - - - - - - - - - - - - - - - - - - - - - - - - qPixmapFromMimeSource - - - SalomeApp_DoubleSpinBox - QDoubleSpinBox -
SalomeApp_DoubleSpinBox.h
- - - - PushButton1 - LineEdit1 - PushButton2 - LineEdit2 - SpinBox_DX - CheckButton2 - CheckButton1 - - - - 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 @@ - - - DlgRef_2Sel1SpinInt_QTD - - - - 0 - 0 - 156 - 105 - - - - - - - - 0 - - - 0 - - - - - - - - - 9 - - - 6 - - - - - 1000000 - - - - - - - - 0 - 0 - - - - TL3 - - - false - - - - - - - - 0 - 0 - - - - QFrame::NoFrame - - - QFrame::Plain - - - TL2 - - - false - - - - - - - - 0 - 0 - - - - - - - - - - - - - - - 0 - 0 - - - - TL1 - - - false - - - - - - - - 0 - 0 - - - - - - - - - - - - - - - - - qPixmapFromMimeSource - - - SalomeApp_IntSpinBox - QSpinBox -
SalomeApp_IntSpinBox.h
- - - - PushButton1 - LineEdit1 - PushButton2 - LineEdit2 - - - - 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 @@ - DlgRef_2Sel1Spin_QTD - + MyDlgRef_2Sel1Spin_QTD + 0 0 219 - 124 + 129 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 @@ - - DlgRef_2Sel2List_QTD - - - - 0 - 0 - 128 - 144 - - - - - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - - - - - - - 0 - 0 - - - - TL1 - - - false - - - - - - - - 0 - 0 - - - - - - - - - - - - - - - 0 - 0 - - - - TL2 - - - false - - - - - - - - 0 - 0 - - - - - - - - - - - - - - - 0 - 0 - - - - TL3 - - - false - - - - - - - - 0 - 0 - - - - - - - - - 0 - 0 - - - - TL4 - - - false - - - - - - - - 0 - 0 - - - - - - - - - - - qPixmapFromMimeSource - - PushButton1 - LineEdit1 - PushButton2 - LineEdit2 - ComboBox1 - - - - 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 @@ - - - DlgRef_2Sel2Spin1Check_QTD - - - - 0 - 0 - 156 - 151 - - - - - - - - 0 - - - 0 - - - - - - - - - 9 - - - 6 - - - - - - - - - - - - 1000000 - - - - - - - 6 - - - 1000000000.000000000000000 - - - - - - - - 0 - 0 - - - - TL4 - - - false - - - - - - - - 0 - 0 - - - - TL3 - - - false - - - - - - - - 0 - 0 - - - - - - - - - - - - 0 - 0 - - - - - - - - - - - - - - - - - - 0 - 0 - - - - TL1 - - - false - - - - - - - - 0 - 0 - - - - TL2 - - - false - - - - - - - - - - qPixmapFromMimeSource - - - SalomeApp_DoubleSpinBox - QDoubleSpinBox -
SalomeApp_DoubleSpinBox.h
- - - SalomeApp_IntSpinBox - QSpinBox -
SalomeApp_IntSpinBox.h
- - - - PushButton1 - LineEdit1 - PushButton2 - LineEdit2 - SpinBox_DX - SpinBox_DY - CheckButton1 - - - - 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 @@ - - - DlgRef_2Sel2Spin3Check_QTD - - - - 0 - 0 - 156 - 197 - - - - - - - - 0 - - - 0 - - - - - - - - - 9 - - - 6 - - - - - - 0 - 0 - - - - TL1 - - - false - - - - - - - - 0 - 0 - - - - - - - - - - - - - - - 0 - 0 - - - - TL2 - - - false - - - - - - - - 0 - 0 - - - - - - - - - - - - - - - 0 - 0 - - - - TL3 - - - false - - - - - - - 6 - - - 1000000000.000000000000000 - - - - - - - - 0 - 0 - - - - TL4 - - - false - - - - - - - 6 - - - 1000000000.000000000000000 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - qPixmapFromMimeSource - - - SalomeApp_DoubleSpinBox - QDoubleSpinBox -
SalomeApp_DoubleSpinBox.h
- - - - PushButton1 - LineEdit1 - PushButton2 - LineEdit2 - SpinBox_DX - SpinBox_DY - CheckBox1 - CheckBox2 - CheckBox3 - - - - 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 @@ - - - DlgRef_2Sel2Spin_QTD - - - - 0 - 0 - 156 - 132 - - - - - - - - 0 - - - 0 - - - - - - - - - 9 - - - 6 - - - - - 6 - - - 1000000000.000000000000000 - - - - - - - 6 - - - 1000000000.000000000000000 - - - - - - - - 0 - 0 - - - - TL4 - - - false - - - - - - - - 0 - 0 - - - - TL3 - - - false - - - - - - - - - - - 0 - 0 - - - - - - - - - - - - 0 - 0 - - - - TL1 - - - false - - - - - - - - 0 - 0 - - - - - - - - - - - - 0 - 0 - - - - TL2 - - - false - - - - - - - - - - - - - qPixmapFromMimeSource - - - SalomeApp_DoubleSpinBox - QDoubleSpinBox -
SalomeApp_DoubleSpinBox.h
- - - - PushButton1 - LineEdit1 - PushButton2 - LineEdit2 - SpinBox_DX - SpinBox_DY - - - - 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 @@ - - - DlgRef_2Sel3Spin2Rb_QTD - - - - 0 - 0 - 256 - 135 - - - - DlgRef_2Sel3Spin2Rb_QTD - - - - 0 - - - 0 - - - - - - - - - - - - 0 - 0 - - - - TL1 - - - false - - - - - - - - 0 - 0 - - - - - - - - - - - - - - - 0 - 0 - - - - TL2 - - - false - - - - - - - - 0 - 0 - - - - - - - - - - - - - - - - - true - - - - - - - - 0 - 0 - - - - TL3 - - - false - - - - - - - 6 - - - 1000000000.000000000000000 - - - - - - - - - - - - - - - 0 - 0 - - - - TL4 - - - false - - - - - - - false - - - 6 - - - 1000000000.000000000000000 - - - - - - - - 0 - 0 - - - - TL5 - - - false - - - - - - - false - - - 6 - - - 1000000000.000000000000000 - - - - - - - - - - - SalomeApp_DoubleSpinBox - QDoubleSpinBox -
SalomeApp_DoubleSpinBox.h
- - - - PushButton1 - LineEdit1 - PushButton2 - LineEdit2 - RadioButton1 - SpinBox_DX - RadioButton2 - SpinBox_DY - SpinBox_DZ - - - - 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 @@ - - - DlgRef_2Sel3Spin_QTD - - - - 0 - 0 - 156 - 159 - - - - - - - - 0 - - - 6 - - - - - - - - - 9 - - - 6 - - - - - - 0 - 0 - - - - TL5 - - - false - - - - - - - - 0 - 0 - - - - TL4 - - - false - - - - - - - - 0 - 0 - - - - TL3 - - - false - - - - - - - - 0 - 0 - - - - TL1 - - - false - - - - - - - - - - - 0 - 0 - - - - TL2 - - - false - - - - - - - - 0 - 0 - - - - - - - - - - - - - - - 0 - 0 - - - - - - - - - - - 6 - - - 1000000000.000000000000000 - - - - - - - 6 - - - 1000000000.000000000000000 - - - - - - - 6 - - - 1000000000.000000000000000 - - - - - - - - - - qPixmapFromMimeSource - - - SalomeApp_DoubleSpinBox - QDoubleSpinBox -
SalomeApp_DoubleSpinBox.h
- - - - PushButton1 - LineEdit1 - PushButton2 - LineEdit2 - SpinBox_DX - SpinBox_DY - SpinBox_DZ - - - - 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 @@ - - - DlgRef_2Sel4Spin1Check_QTD - - - - 0 - 0 - 156 - 205 - - - - - - - - 0 - - - 0 - - - - - - - - - 9 - - - 6 - - - - - - - - - - - - 1000000 - - - - - - - 6 - - - 1000000000.000000000000000 - - - - - - - 1000000 - - - - - - - 6 - - - 1000000000.000000000000000 - - - - - - - - 0 - 0 - - - - TL6 - - - false - - - - - - - - 0 - 0 - - - - TL5 - - - false - - - - - - - - 0 - 0 - - - - TL4 - - - false - - - - - - - - 0 - 0 - - - - TL3 - - - false - - - - - - - - 0 - 0 - - - - TL2 - - - false - - - - - - - - 0 - 0 - - - - - - - - - - - - - - - 0 - 0 - - - - TL1 - - - false - - - - - - - - - - - 0 - 0 - - - - - - - - - - - - - - qPixmapFromMimeSource - - - SalomeApp_DoubleSpinBox - QDoubleSpinBox -
SalomeApp_DoubleSpinBox.h
- - - SalomeApp_IntSpinBox - QSpinBox -
SalomeApp_IntSpinBox.h
- - - - PushButton1 - LineEdit1 - PushButton2 - LineEdit2 - SpinBox_DX1 - SpinBox_DY1 - CheckButton1 - SpinBox_DX2 - SpinBox_DY2 - - - - 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 @@ - - DlgRef_2SelExt_QTD - - - - 0 - 0 - 155 - 80 - - - - - - - - 0 - - - 6 - - - - - - 7 - 7 - 0 - 0 - - - - - - - - 9 - - - 6 - - - - - - - - - - - - 0 - 0 - 0 - 0 - - - - - - - - - - - - 0 - 0 - 0 - 0 - - - - - - - - - - - - 0 - 0 - 0 - 0 - - - - TL1 - - - false - - - - - - - - 0 - 0 - 0 - 0 - - - - TL1 - - - false - - - - - - - - - - - - - qPixmapFromMimeSource - - PushButton1 - LineEdit1 - PushButton2 - LineEdit2 - - - - 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 @@ - - DlgRef_2Sel_QTD - - + + + MyDlgRef_2Sel_QTD + + 0 0 156 - 74 + 96 - - - 5 - 7 + + 0 0 - + - - + + 0 - + 6 - - - + + + - - + + 9 - + 6 - - + + - - - - - 0 - 0 + + + + 0 0 - + - - - - - 0 - 0 + + + + 0 0 - + TL1 - + false - - - - - 0 - 0 + + + + 0 0 - + - - - - - 0 - 0 + + + + 0 0 - + TL2 - + false - - + + - + qPixmapFromMimeSource PushButton1 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 @@ - - - DlgRef_2Spin_QTD - - - - 0 - 0 - 114 - 70 - - - - - - - - 0 - - - 0 - - - - - - - - - 9 - - - 6 - - - - - - 0 - 0 - - - - TL1 - - - false - - - - - - - 6 - - - 1000000000.000000000000000 - - - - - - - - 0 - 0 - - - - TL2 - - - false - - - - - - - 6 - - - 1000000000.000000000000000 - - - - - - - - - - qPixmapFromMimeSource - - - SalomeApp_DoubleSpinBox - QDoubleSpinBox -
SalomeApp_DoubleSpinBox.h
- - - - - 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 @@ - - DlgRef_3Check_QTD - - - - 0 - 0 - 118 - 88 - - - - - - - - 0 - - - 6 - - - - - - - - - 9 - - - 6 - - - - - RadioButton2 - - - - - - - RadioButton1 - - - - - - - RadioButton3 - - - - - - - - - - qPixmapFromMimeSource - - RadioButton1 - RadioButton2 - RadioButton3 - - - - 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 @@ - - - DlgRef_3Radio1Sel1Spin_QTD - - - - 0 - 0 - 357 - 131 - - - - - - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - 357 - 131 - - - - - - - - - - - - RadioButton1 - - - - - - - RadioButton2 - - - - - - - RadioButton3 - - - - - - - - - Qt::Vertical - - - - 256 - 19 - - - - - - - - - 0 - 0 - - - - TL2 - - - false - - - - - - - 6 - - - 1000000000.000000000000000 - - - - - - - - - - - 0 - 0 - - - - TL1 - - - false - - - - - - - - 0 - 0 - - - - - - - - - - - - - - qPixmapFromMimeSource - - - SalomeApp_DoubleSpinBox - QDoubleSpinBox -
SalomeApp_DoubleSpinBox.h
- - - - SpinBox_DX - - - - 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 @@ - - DlgRef_3Radio_QTD - - - - 0 - 0 - 335 - 44 - - - - - - - - 0 - - - 0 - - - 0 - - - 0 - - - 6 - - - 6 - - - - - - - - - - - RadioButton1 - - - - - - - RadioButton2 - - - - - - - RadioButton3 - - - - - - - - - - qPixmapFromMimeSource - - RadioButton1 - RadioButton2 - RadioButton3 - - - - 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 @@ - - DlgRef_3Sel1Check_QTD - - - - 0 - 0 - 156 - 126 - - - - - 5 - 5 - 0 - 0 - - - - - - - - 0 - - - 0 - - - - - - 5 - 5 - 0 - 0 - - - - - - - - 9 - - - 6 - - - - - - - - - - - - - - - - 0 - 0 - 0 - 0 - - - - TL3 - - - false - - - - - - - - - - - 0 - 0 - 0 - 0 - - - - - - - - - - - - 0 - 0 - 0 - 0 - - - - TL2 - - - false - - - - - - - - - - - 0 - 0 - 0 - 0 - - - - - - - - - - - - 0 - 0 - 0 - 0 - - - - TL1 - - - false - - - - - - - - 0 - 0 - 0 - 0 - - - - - - - - - - - - - - qPixmapFromMimeSource - - PushButton1 - LineEdit1 - PushButton2 - LineEdit2 - PushButton3 - LineEdit3 - - - - 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 @@ - - - DlgRef_3Sel1Spin_QTD - - - - 0 - 0 - 156 - 136 - - - - - 0 - 0 - - - - - - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - - - - 9 - - - 6 - - - - - - 0 - 0 - - - - TL1 - - - false - - - - - - - - - - - 0 - 0 - - - - TL3 - - - false - - - - - - - - 0 - 0 - - - - - - - - - - - - 0 - 0 - - - - TL4 - - - false - - - - - - - - - - - 0 - 0 - - - - - - - - - - - - 0 - 0 - - - - TL2 - - - false - - - - - - - - - - - 0 - 0 - - - - - - - - - - - 6 - - - 1000000000.000000000000000 - - - - - - - - - - qPixmapFromMimeSource - - - SalomeApp_DoubleSpinBox - QDoubleSpinBox -
SalomeApp_DoubleSpinBox.h
- - - - PushButton1 - LineEdit1 - PushButton2 - LineEdit2 - PushButton3 - LineEdit3 - SpinBox_DX - - - - 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 @@ - - - DlgRef_3Sel2Spin_QTD - - - - 0 - 0 - 120 - 177 - - - - - 0 - 0 - - - - - - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - - - - - - - 0 - 0 - - - - TL1 - - - false - - - - - - - - 0 - 0 - - - - - - - - - - - - - - - 0 - 0 - - - - TL2 - - - false - - - - - - - - 0 - 0 - - - - - - - - - - - - - - - 0 - 0 - - - - TL3 - - - false - - - - - - - - 0 - 0 - - - - - - - - - - - - - - - 0 - 0 - - - - TL4 - - - false - - - - - - - 6 - - - 1000000000.000000000000000 - - - - - - - - 0 - 0 - - - - TL5 - - - false - - - - - - - 6 - - - 1000000000.000000000000000 - - - - - - - - - - qPixmapFromMimeSource - - - SalomeApp_DoubleSpinBox - QDoubleSpinBox -
SalomeApp_DoubleSpinBox.h
- - - - PushButton1 - LineEdit1 - PushButton2 - LineEdit2 - PushButton3 - LineEdit3 - SpinBox_DX - - - - 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 @@ - - - DlgRef_3Sel3Spin1Check_QTD - - - - 0 - 0 - 156 - 216 - - - - - 0 - 0 - - - - - - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - - - - 9 - - - 6 - - - - - Check - - - - - - - 6 - - - 1000000000.000000000000000 - - - - - - - 6 - - - 1000000000.000000000000000 - - - - - - - 6 - - - 1000000000.000000000000000 - - - - - - - - 0 - 0 - - - - - - - - - - - - - - - 0 - 0 - - - - TL2 - - - false - - - - - - - - 0 - 0 - - - - - - - - - - - - - - - 0 - 0 - - - - TL4 - - - false - - - - - - - - 0 - 0 - - - - - - - - - - - - 0 - 0 - - - - TL3 - - - false - - - - - - - - - - - 0 - 0 - - - - TL1 - - - false - - - - - - - - 0 - 0 - - - - TL5 - - - false - - - - - - - - 0 - 0 - - - - TL6 - - - false - - - - - - - - - - qPixmapFromMimeSource - - - SalomeApp_DoubleSpinBox - QDoubleSpinBox -
SalomeApp_DoubleSpinBox.h
- - - - PushButton1 - LineEdit1 - PushButton2 - LineEdit2 - PushButton3 - LineEdit3 - SpinBox1 - SpinBox2 - SpinBox3 - CheckBox1 - - - - 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 @@ - - - DlgRef_3Sel3Spin2Check_QTD - - - - 0 - 0 - 120 - 242 - - - - - - - - 0 - - - - - - - - - - - - 0 - 0 - - - - TL1 - - - false - - - - - - - - 0 - 0 - - - - - - - - - - - - - - - 0 - 0 - - - - TL2 - - - false - - - - - - - - 0 - 0 - - - - - - - - - - - - - - - 0 - 0 - - - - TL3 - - - false - - - - - - - - 0 - 0 - - - - - - - - - - - - - - - 0 - 0 - - - - TL4 - - - false - - - - - - - 6 - - - 1000000000.000000000000000 - - - - - - - - 0 - 0 - - - - TL5 - - - false - - - - - - - 6 - - - 1000000000.000000000000000 - - - - - - - - 0 - 0 - - - - TL6 - - - false - - - - - - - 6 - - - 1000000000.000000000000000 - - - - - - - - - - - - - - - - - - - - - - - - qPixmapFromMimeSource - - - SalomeApp_DoubleSpinBox - QDoubleSpinBox -
SalomeApp_DoubleSpinBox.h
- - - - PushButton1 - LineEdit1 - PushButton2 - LineEdit2 - PushButton3 - LineEdit3 - SpinBox1 - SpinBox2 - SpinBox3 - CheckBox1 - CheckBox2 - - - - 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 @@ - - - DlgRef_3Sel4Spin2Check_QTD - - - - 0 - 0 - 156 - 255 - - - - - - - - 0 - - - 0 - - - - - - - - - 9 - - - 6 - - - - - 1000000 - - - - - - - 6 - - - 1000000000.000000000000000 - - - - - - - 1000000 - - - - - - - 6 - - - 1000000000.000000000000000 - - - - - - - - - - - - - - - 0 - 0 - - - - TL6 - - - false - - - - - - - - 0 - 0 - - - - TL7 - - - false - - - - - - - - 0 - 0 - - - - TL4 - - - false - - - - - - - - 0 - 0 - - - - TL5 - - - false - - - - - - - - 0 - 0 - - - - TL2 - - - false - - - - - - - - 0 - 0 - - - - TL1 - - - false - - - - - - - - 0 - 0 - - - - - - - - - - - - 0 - 0 - - - - - - - - - - - - - - - 0 - 0 - - - - - - - - - - - - 0 - 0 - - - - TL3 - - - false - - - - - - - - - - - - - - - - - - - - - - - qPixmapFromMimeSource - - - SalomeApp_DoubleSpinBox - QDoubleSpinBox -
SalomeApp_DoubleSpinBox.h
- - - SalomeApp_IntSpinBox - QSpinBox -
SalomeApp_IntSpinBox.h
- - - - PushButton1 - LineEdit1 - PushButton2 - LineEdit2 - PushButton3 - LineEdit3 - SpinBox_DX1 - SpinBox_DY1 - CheckButton1 - SpinBox_DX2 - SpinBox_DY2 - CheckButton2 - - - - 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 @@ - - DlgRef_3Sel_QTD - - - - 0 - 0 - 156 - 103 - - - - - 5 - 7 - 0 - 0 - - - - - - - - 0 - - - 6 - - - - - - - - - 9 - - - 6 - - - - - - - - - 0 - 0 - 0 - 0 - - - - TL1 - - - false - - - - - - - - 0 - 0 - 0 - 0 - - - - TL2 - - - false - - - - - - - - 0 - 0 - 0 - 0 - - - - - - - - - - - - 0 - 0 - 0 - 0 - - - - - - - - - - - - 0 - 0 - 0 - 0 - - - - TL3 - - - false - - - - - - - - - - - 0 - 0 - 0 - 0 - - - - - - - - - - - - - - - - - qPixmapFromMimeSource - - PushButton1 - LineEdit1 - PushButton2 - LineEdit2 - PushButton3 - LineEdit3 - - - - 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 @@ - - - DlgRef_3Spin1Check_QTD - - - - 0 - 0 - 114 - 116 - - - - - - - - 0 - - - 0 - - - - - - - - - 9 - - - 6 - - - - - - - - - - - - - 0 - 0 - - - - TL3 - - - false - - - - - - - - 0 - 0 - - - - TL2 - - - false - - - - - - - - 0 - 0 - - - - TL1 - - - false - - - - - - - 6 - - - 1000000000.000000000000000 - - - - - - - 6 - - - 1000000000.000000000000000 - - - - - - - 6 - - - 1000000000.000000000000000 - - - - - - - - - - qPixmapFromMimeSource - - - SalomeApp_DoubleSpinBox - QDoubleSpinBox -
SalomeApp_DoubleSpinBox.h
- - - - SpinBox_DX - SpinBox_DY - SpinBox_DZ - CheckButton1 - - - - 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 @@ - DlgRef_3Spin_QTD - + MyDlgRef_3Spin_QTD + 0 0 - 114 - 97 + 213 + 129 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 @@ - - DlgRef_4Sel1List1Check_QTD - - - - 0 - 0 - 216 - 187 - - - - - - - - 0 - - - 0 - - - - - - - - - 9 - - - 6 - - - - - - 7 - 0 - 0 - 0 - - - - - - - - - - - - 0 - 0 - 0 - 0 - - - - - - - - - - - - 0 - 0 - 0 - 0 - - - - - - - - - - - - - - - 0 - 0 - 0 - 0 - - - - - - - - - - - - 0 - 0 - 0 - 0 - - - - - - - - - - - - 0 - 0 - 0 - 0 - - - - TL1 - - - false - - - - - - - - 0 - 0 - 0 - 0 - - - - TL4 - - - false - - - - - - - - - - - 0 - 0 - 0 - 0 - - - - TL5 - - - false - - - - - - - - - - - 0 - 0 - 0 - 0 - - - - TL2 - - - false - - - - - - - - 0 - 0 - 0 - 0 - - - - TL3 - - - false - - - - - - - - - - - - - - - - - - - - - - - - qPixmapFromMimeSource - - PushButton1 - LineEdit1 - PushButton2 - LineEdit2 - ComboBox1 - PushButton3 - LineEdit3 - PushButton4 - LineEdit4 - CheckBox1 - PushButton5 - - - - 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 @@ - - DlgRef_4Sel1List_QTD - - - - 0 - 0 - 156 - 158 - - - - - - - - 0 - - - 6 - - - - - - - - - 9 - - - 6 - - - - - - 0 - 0 - 0 - 0 - - - - - - - - - - - - 0 - 0 - 0 - 0 - - - - - - - - - - - - - - - 0 - 0 - 0 - 0 - - - - - - - - - - - - 0 - 0 - 0 - 0 - - - - - - - - - - - - 0 - 0 - 0 - 0 - - - - TL1 - - - false - - - - - - - - 0 - 0 - 0 - 0 - - - - TL4 - - - false - - - - - - - - - - - 0 - 0 - 0 - 0 - - - - TL5 - - - false - - - - - - - - - - - 0 - 0 - 0 - 0 - - - - TL2 - - - false - - - - - - - - 0 - 0 - 0 - 0 - - - - TL3 - - - false - - - - - - - - - - - 7 - 0 - 0 - 0 - - - - - - - - - - - qPixmapFromMimeSource - - PushButton1 - LineEdit1 - PushButton2 - LineEdit2 - ComboBox1 - PushButton3 - LineEdit3 - PushButton4 - LineEdit4 - - - - 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 @@ - - - DlgRef_4Sel1Spin2Check_QTD - - - - 0 - 0 - 225 - 306 - - - - - - - - 0 - - - 6 - - - - - - - - - 9 - - - 6 - - - - - - 0 - 0 - - - - 6 - - - 1000000000.000000000000000 - - - - - - - - 0 - 0 - - - - TL3 - - - false - - - - - - - - 0 - 0 - - - - TL5 - - - false - - - - - - - - 0 - 0 - - - - TL4 - - - false - - - - - - - - 0 - 0 - - - - TL2 - - - false - - - - - - - - 0 - 0 - - - - TL1 - - - false - - - - - - - - 0 - 0 - - - - - - - - - - - - - - - - - - 0 - 0 - - - - - - - - - - - - 0 - 0 - - - - - - - - - - - - 0 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - 0 - 0 - - - - - - - - - - - - - - qPixmapFromMimeSource - - - SalomeApp_DoubleSpinBox - QDoubleSpinBox -
SalomeApp_DoubleSpinBox.h
- - - - PushButton1 - LineEdit1 - PushButton2 - LineEdit2 - PushButton4 - LineEdit4 - PushButton5 - LineEdit5 - SpinBox_DX - CheckButton1 - - - - 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 @@ - - - DlgRef_4Sel1Spin3Check_QTD - - - - 0 - 0 - 225 - 306 - - - - - - - - 0 - - - 6 - - - - - - - - - 9 - - - 6 - - - - - - 0 - 0 - - - - - - - - - - - - 0 - 0 - - - - 6 - - - 1000000000.000000000000000 - - - - - - - - 0 - 0 - - - - TL3 - - - false - - - - - - - - 0 - 0 - - - - TL5 - - - false - - - - - - - - 0 - 0 - - - - TL4 - - - false - - - - - - - - 0 - 0 - - - - TL2 - - - false - - - - - - - - 0 - 0 - - - - TL1 - - - false - - - - - - - - 0 - 0 - - - - - - - - - - - - - - - - - - 0 - 0 - - - - - - - - - - - - 0 - 0 - - - - - - - - - - - - 0 - 0 - - - - - - - - - - - - - - - - - - - - - - - - - 0 - 0 - - - - - - - - - CheckButton3 - SpinBox_DX - TextLabel3 - TextLabel5 - TextLabel4 - TextLabel2 - TextLabel1 - PushButton2 - LineEdit5 - LineEdit1 - PushButton5 - PushButton4 - PushButton1 - LineEdit4 - LineEdit2 - CheckButton1 - CheckButton2 - - - - - - qPixmapFromMimeSource - - - SalomeApp_DoubleSpinBox - QDoubleSpinBox -
SalomeApp_DoubleSpinBox.h
- - - - PushButton1 - LineEdit1 - PushButton2 - LineEdit2 - PushButton4 - LineEdit4 - PushButton5 - LineEdit5 - SpinBox_DX - CheckButton1 - - - - 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 @@ - - DlgRef_6Sel_QTD - - - - 0 - 0 - 156 - 190 - - - - - 5 - 7 - 0 - 0 - - - - - - - - 0 - - - 0 - - - - - - - - - 9 - - - 6 - - - - - - - - - - - - - - - - - - - - - - - - 0 - 0 - 0 - 0 - - - - - - - - - - - - 0 - 0 - 0 - 0 - - - - - - - - - - - - 0 - 0 - 0 - 0 - - - - - - - - - - - - 0 - 0 - 0 - 0 - - - - - - - - - - - - 0 - 0 - 0 - 0 - - - - - - - - - - - - 0 - 0 - 0 - 0 - - - - - - - - - - - - 0 - 0 - 0 - 0 - - - - TL1 - - - false - - - - - - - - 0 - 0 - 0 - 0 - - - - TL6 - - - false - - - - - - - - 0 - 0 - 0 - 0 - - - - TL3 - - - false - - - - - - - - 0 - 0 - 0 - 0 - - - - TL5 - - - false - - - - - - - - 0 - 0 - 0 - 0 - - - - TL4 - - - false - - - - - - - - 0 - 0 - 0 - 0 - - - - TL2 - - - false - - - - - - - - - - qPixmapFromMimeSource - - PushButton1 - LineEdit1 - PushButton2 - LineEdit2 - PushButton3 - LineEdit3 - PushButton4 - LineEdit4 - PushButton5 - LineEdit5 - PushButton6 - LineEdit6 - - - - 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 @@ 0 0 345 - 401 + 538 @@ -16,24 +16,12 @@ 0 - - - 5 - 0 - - - - - 0 - 0 - - Qt::ScrollBarAsNeeded @@ -46,18 +34,12 @@ 0 0 325 - 381 + 518 - - - 5 - 0 - - Vertex of the model @@ -77,12 +59,6 @@ - - - 5 - 0 - - Point of the geometry @@ -178,14 +154,14 @@ - + Qt::Vertical 20 - 16777215 + 10 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 @@ Replace Hexahedron - - - - - 0 - 0 - - - - - - - - - - - 0 - 0 - - - - Hexa - - - - - - - - 0 - 0 - - - - Hexas - - - - - - @@ -78,7 +37,7 @@ 0 0 265 - 585 + 649 @@ -122,6 +81,9 @@ + + QFormLayout::AllNonFixedFieldsGrow + @@ -174,32 +136,6 @@ - - - - Point c - - - - - - - - 0 - 0 - - - - Select vertex - - - - - - false - - - @@ -295,32 +231,6 @@ - - - - Point c - - - - - - - - 0 - 0 - - - - Select vertex - - - - - - false - - - @@ -337,41 +247,7 @@ quads_lw p1_le p2_le - p3_le - - - radioButton - clicked() - quads_lw_2 - hide() - - - 109 - 44 - - - 146 - 453 - - - - - radioButton_2 - clicked() - quads_lw_2 - show() - - - 232 - 44 - - - 146 - 453 - - - - + 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) -- 2.39.2