Merge from V6_main (04/10/2012)

diff --git a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_FromSkin_3D.cxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_FromSkin_3D.cxx
index 1dc0e31dc90052c99486750b9b920c1a88df4cba..83cac7d25757001e0cf19082b3b40b085a27a9c6 100755 (executable)
--- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_FromSkin_3D.cxx
+++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_FromSkin_3D.cxx
@@ -53,7 +53,7 @@
 
 
 #ifdef _DEBUG_
-static int MYDEBUG = 1;
+static int MYDEBUG = HEXA_NS::on_debug ();
 #else
 static int MYDEBUG = 0;
 #endif

diff --git a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_FromSkin_3D.hxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_FromSkin_3D.hxx
index aac1fa806184709672a4e6defb76f384ecd47fdd..1c9a6232956349ed2138e04ecab6dab96f685644 100755 (executable)
--- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_FromSkin_3D.hxx
+++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_FromSkin_3D.hxx
@@ -25,7 +25,7 @@
 #define __SMESH_HexaFromSkin_3D_HXX__
 
 #include "SMESH_StdMeshers.hxx"
-#include "SMESH_3D_Algo.hxx"
+#include "SMESH_Algo.hxx"
 
 // from HexaBlocks
 #include "hexa_base.hxx" 

diff --git a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK.cxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK.cxx
index 9c5fdca2f75ce9da8ad418504b6b1d0f36351af9..227d77b3f865275e8bd1e67bca92739f7b436448 100755 (executable)
--- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK.cxx
+++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK.cxx
@@ -34,6 +34,7 @@
 
 #include "SMESH_Gen.hxx"
 #include "SMESH_Mesh.hxx"
+#include "SMESH_subMesh.hxx"
 #include "SMESH_MesherHelper.hxx"
 
 #include "HEXABLOCKPlugin_mesh.hxx"
@@ -151,6 +152,7 @@ bool HEXABLOCKPlugin_HEXABLOCK::Compute(SMESH_Mesh& theMesh, const TopoDS_Shape&
       default: return( Compute3D(theMesh) );
     };
   }
+  return false;
 }
 
 //=============================================================================

diff --git a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK.hxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK.hxx
index 5817a42e87456ef66f49b44f098adb5e9e3cb700..2bef9c9e05708d55d125652cc3281869e1380617 100755 (executable)
--- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK.hxx
+++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK.hxx
@@ -27,7 +27,7 @@
 #ifndef _HEXABLOCKPlugin_HEXABLOCK_HXX_
 #define _HEXABLOCKPlugin_HEXABLOCK_HXX_
 
-#include "SMESH_3D_Algo.hxx"
+#include "SMESH_Algo.hxx"
 #include "SMESH_Mesh.hxx"
 
 class SMESH_Mesh;

diff --git a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK_i.cxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK_i.cxx
index 65428ab272c785ff5fbef7a8b9fdc6f213d24186..45a73906eeb5f4dff04c4c5d81987d1638a00046 100755 (executable)
--- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK_i.cxx
+++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK_i.cxx
@@ -28,9 +28,10 @@
 #include "HEXABLOCKPlugin_HEXABLOCK.hxx"
 
 #include "utilities.h"
+#include "hexa_base.hxx"
 
 #ifdef _DEBUG_
-static int MYDEBUG = 1;
+static int MYDEBUG = HEXA_NS::on_debug ();
 #else
 static int MYDEBUG = 0;
 #endif

diff --git a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis_i.cxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis_i.cxx
index 4e864eaffcd17d4d12f96d86e3f9f04b3454eb71..ee285830659ea36281a7246b9691a07502720b20 100755 (executable)
--- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis_i.cxx
+++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis_i.cxx
@@ -33,7 +33,7 @@
 #include <utilities.h>
 
 #ifdef _DEBUG_
-static int MYDEBUG = 1;
+static int MYDEBUG = HEXA_NS::on_debug ();
 #else
 static int MYDEBUG = 0;
 #endif

diff --git a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_i.cxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_i.cxx
index 01c0968ff2c9cc11b24981304a87c72ba0909854..6431635c44d6262e2065762890103b28a4b7e2b3 100755 (executable)
--- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_i.cxx
+++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_i.cxx
@@ -30,9 +30,10 @@
 #include "HEXABLOCKPlugin_HEXABLOCK_i.hxx"
 #include "HEXABLOCKPlugin_Hypothesis_i.hxx"
 
+#include "hexa_base.hxx"
 
 #ifdef _DEBUG_
-static int MYDEBUG = 1;
+static int MYDEBUG = HEXA_NS::on_debug ();
 #else
 static int MYDEBUG = 0;
 #endif

diff --git a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_mesh.cxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_mesh.cxx
index b0a2c6afd982e4b46104cb48744e0f7fb0aefaab..6d94b9740905deaba646ec3056761805ec0f4b62 100755 (executable)
--- a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_mesh.cxx
+++ b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_mesh.cxx
@@ -89,7 +89,7 @@
 #endif
 
 #ifdef _DEBUG_
-static int MYDEBUG = 1;
+static int MYDEBUG = HEXA_NS::on_debug ();
 #else
 static int MYDEBUG = 0;
 #endif
@@ -496,8 +496,8 @@ std::map<HEXA_NS::Quad*, bool>  SMESH_HexaBlocks::computeQuadWays( HEXA_NS::Docu
     if(MYDEBUG) MESSAGE("INITIAL QUAD FOUND!" );
     for ( int j=0 ; j < 4 ; ++j ){
       e = q->getEdge(j);
-      if  ( (e_0 == e->getVertex(0)) and (e_1 == e->getVertex(1)) or 
-            (e_0 == e->getVertex(1)) and (e_1 == e->getVertex(0)) ){
+      if  (    ((e_0 == e->getVertex(0)) && (e_1 == e->getVertex(1)))
+            || ((e_0 == e->getVertex(1)) && (e_1 == e->getVertex(0))) ){
         break;
       }
     }