From c4e6a870cc48dfdc17793904efcd23b388e98c8a Mon Sep 17 00:00:00 2001
From: fps <fps@opencascade.com>
Date: Wed, 26 Sep 2012 14:27:07 +0000
Subject: [PATCH] Abu : suppression des traces en mode nominal

---
 src/HEXABLOCKPlugin/HEXABLOCKPlugin_FromSkin_3D.cxx  | 2 +-
 src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK_i.cxx  | 3 ++-
 src/HEXABLOCKPlugin/HEXABLOCKPlugin_Hypothesis_i.cxx | 2 +-
 src/HEXABLOCKPlugin/HEXABLOCKPlugin_i.cxx            | 3 ++-
 src/HEXABLOCKPlugin/HEXABLOCKPlugin_mesh.cxx         | 6 +++---
 5 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/HEXABLOCKPlugin/HEXABLOCKPlugin_FromSkin_3D.cxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_FromSkin_3D.cxx
index 1dc0e31..83cac7d 100755
--- 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_HEXABLOCK_i.cxx b/src/HEXABLOCKPlugin/HEXABLOCKPlugin_HEXABLOCK_i.cxx
index 65428ab..45a7390 100755
--- 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 4e864ea..ee28583 100755
--- 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 01c0968..6431635 100755
--- 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 b0a2c6a..6d94b97 100755
--- 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;
       }
     }
-- 
2.39.2