From: Paul RASCLE <paul.rascle@edf.fr>
Date: Fri, 15 Nov 2019 11:44:40 +0000 (+0100)
Subject: mask traces
X-Git-Tag: SH_V2_2_0~99^2~3
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=f09552db523068b952c3e6e64c5f8acb165d243d;p=modules%2Fhydro.git

mask traces
---

diff --git a/src/HYDROData/HYDROData_AltitudeObject.cxx b/src/HYDROData/HYDROData_AltitudeObject.cxx
index 6a28d989..d5753462 100644
--- a/src/HYDROData/HYDROData_AltitudeObject.cxx
+++ b/src/HYDROData/HYDROData_AltitudeObject.cxx
@@ -21,7 +21,7 @@
 
 #include <QStringList>
 
-#define _DEVDEBUG_
+//#define _DEVDEBUG_
 #include "HYDRO_trace.hxx"
 
 IMPLEMENT_STANDARD_RTTIEXT(HYDROData_AltitudeObject, HYDROData_IAltitudeObject)
diff --git a/src/HYDROData/HYDROData_Channel.cxx b/src/HYDROData/HYDROData_Channel.cxx
index 0f31fc1f..cfaeaf92 100644
--- a/src/HYDROData/HYDROData_Channel.cxx
+++ b/src/HYDROData/HYDROData_Channel.cxx
@@ -72,7 +72,7 @@
 #include <QColor>
 #include <QStringList>
 
-#define _DEVDEBUG_
+//#define _DEVDEBUG_
 #include "HYDRO_trace.hxx"
 
 IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Channel,HYDROData_ArtificialObject)
diff --git a/src/HYDROData/HYDROData_ChannelAltitude.cxx b/src/HYDROData/HYDROData_ChannelAltitude.cxx
index 214c6bf1..5467a236 100644
--- a/src/HYDROData/HYDROData_ChannelAltitude.cxx
+++ b/src/HYDROData/HYDROData_ChannelAltitude.cxx
@@ -28,7 +28,7 @@
 #include "HYDROData_Profile.h"
 #include <TDataStd_Integer.hxx>
 
-#define _DEVDEBUG_
+//#define _DEVDEBUG_
 #include "HYDRO_trace.hxx"
 #include <QString>
 
diff --git a/src/HYDROData/HYDROData_Entity.cxx b/src/HYDROData/HYDROData_Entity.cxx
index 370c7167..16d303da 100644
--- a/src/HYDROData/HYDROData_Entity.cxx
+++ b/src/HYDROData/HYDROData_Entity.cxx
@@ -39,7 +39,7 @@
 #include <QStringList>
 #include <QVariant>
 
-#define _DEVDEBUG_
+//#define _DEVDEBUG_
 #include "HYDRO_trace.hxx"
 
 HYDROData_SequenceOfObjects::HYDROData_SequenceOfObjects()
diff --git a/src/HYDROData/HYDROData_IInterpolator.cxx b/src/HYDROData/HYDROData_IInterpolator.cxx
index 2e3f3e87..4910982d 100644
--- a/src/HYDROData/HYDROData_IInterpolator.cxx
+++ b/src/HYDROData/HYDROData_IInterpolator.cxx
@@ -20,7 +20,7 @@
 
 #include <gp_XY.hxx>
 
-#define _DEVDEBUG_
+//#define _DEVDEBUG_
 #include "HYDRO_trace.hxx"
 
 HYDROData_IInterpolator::HYDROData_IInterpolator()
diff --git a/src/HYDROData/HYDROData_ImmersibleZone.cxx b/src/HYDROData/HYDROData_ImmersibleZone.cxx
index 0c08bffb..f3f8e386 100644
--- a/src/HYDROData/HYDROData_ImmersibleZone.cxx
+++ b/src/HYDROData/HYDROData_ImmersibleZone.cxx
@@ -44,7 +44,7 @@
 
 #define DEB_IMZ
 #include <BRepTools.hxx>
-#define _DEVDEBUG_
+//#define _DEVDEBUG_
 #include "HYDRO_trace.hxx"
 
 //#define HYDRODATA_IMZONE_DEB 1
diff --git a/src/HYDROData/HYDROData_Iterator.cxx b/src/HYDROData/HYDROData_Iterator.cxx
index ef160756..8db54cb6 100644
--- a/src/HYDROData/HYDROData_Iterator.cxx
+++ b/src/HYDROData/HYDROData_Iterator.cxx
@@ -52,7 +52,7 @@
 
 #include <NCollection_DataMap.hxx>
 
-#define _DEVDEBUG_
+//#define _DEVDEBUG_
 #include "HYDRO_trace.hxx"
 
 //! Returns label by root objects kind and the kind of the object
diff --git a/src/HYDROData/HYDROData_LandCoverMap.cxx b/src/HYDROData/HYDROData_LandCoverMap.cxx
index fcb89b42..76dfe69a 100755
--- a/src/HYDROData/HYDROData_LandCoverMap.cxx
+++ b/src/HYDROData/HYDROData_LandCoverMap.cxx
@@ -72,7 +72,7 @@
 #include <QTextStream>
 #include <QFileInfo>
 
-#define _DEVDEBUG_
+//#define _DEVDEBUG_
 #include "HYDRO_trace.hxx"
 
 const char TELEMAC_FORMAT = 'f';
diff --git a/src/HYDROData/HYDROData_Object.cxx b/src/HYDROData/HYDROData_Object.cxx
index 0fcae54f..993519ab 100644
--- a/src/HYDROData/HYDROData_Object.cxx
+++ b/src/HYDROData/HYDROData_Object.cxx
@@ -29,7 +29,7 @@
 
 #include <QColor>
 
-#define _DEVDEBUG_
+//#define _DEVDEBUG_
 #include "HYDRO_trace.hxx"
 
 IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Object,HYDROData_Entity)
diff --git a/src/HYDROData/HYDROData_Obstacle.cxx b/src/HYDROData/HYDROData_Obstacle.cxx
index eeb847bb..3fadecaf 100644
--- a/src/HYDROData/HYDROData_Obstacle.cxx
+++ b/src/HYDROData/HYDROData_Obstacle.cxx
@@ -75,7 +75,7 @@
 
 #include <HYDROData_Projection.h>
 
-#define _DEVDEBUG_
+//#define _DEVDEBUG_
 #include "HYDRO_trace.hxx"
 
 IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Obstacle,HYDROData_ArtificialObject)
diff --git a/src/HYDROData/HYDROData_ObstacleAltitude.cxx b/src/HYDROData/HYDROData_ObstacleAltitude.cxx
index 7bc4ed00..0016b087 100644
--- a/src/HYDROData/HYDROData_ObstacleAltitude.cxx
+++ b/src/HYDROData/HYDROData_ObstacleAltitude.cxx
@@ -22,7 +22,7 @@
 #include "HYDROData_Object.h"
 #include "HYDROData_Projection.h"
 
-#define _DEVDEBUG_
+//#define _DEVDEBUG_
 #include "HYDRO_trace.hxx"
 #include <QString>
 
diff --git a/src/HYDROData/HYDROData_Polyline3D.cxx b/src/HYDROData/HYDROData_Polyline3D.cxx
index ea6841d8..7ce105bb 100644
--- a/src/HYDROData/HYDROData_Polyline3D.cxx
+++ b/src/HYDROData/HYDROData_Polyline3D.cxx
@@ -50,7 +50,7 @@
 
 #include <TopTools_SequenceOfShape.hxx>
 
-#define _DEVDEBUG_
+//#define _DEVDEBUG_
 #include "HYDRO_trace.hxx"
 
 #include <QColor>
diff --git a/src/HYDROData/HYDROData_Region.cxx b/src/HYDROData/HYDROData_Region.cxx
index 15bb8160..a381e208 100644
--- a/src/HYDROData/HYDROData_Region.cxx
+++ b/src/HYDROData/HYDROData_Region.cxx
@@ -51,7 +51,7 @@
 #include "gp_Pln.hxx"
 #include "BRepTools_ReShape.hxx"
 
-#define _DEVDEBUG_
+//#define _DEVDEBUG_
 #include "HYDRO_trace.hxx"
 
 //#define DEB_GET_REGION_SHAPE
diff --git a/src/HYDROData/HYDROData_Stream.cxx b/src/HYDROData/HYDROData_Stream.cxx
index 431e22ae..79b948c3 100644
--- a/src/HYDROData/HYDROData_Stream.cxx
+++ b/src/HYDROData/HYDROData_Stream.cxx
@@ -94,7 +94,7 @@
 #include <TCollection_AsciiString.hxx>
 #endif
 
-#define _DEVDEBUG_
+//#define _DEVDEBUG_
 #include "HYDRO_trace.hxx"
 
 #include <assert.h>
diff --git a/src/HYDROData/HYDROData_StreamAltitude.cxx b/src/HYDROData/HYDROData_StreamAltitude.cxx
index 2360eddd..2bcf4a6d 100644
--- a/src/HYDROData/HYDROData_StreamAltitude.cxx
+++ b/src/HYDROData/HYDROData_StreamAltitude.cxx
@@ -53,7 +53,7 @@
 #include <QStringList>
 #include <cmath>
 
-#define _DEVDEBUG_
+//#define _DEVDEBUG_
 #include "HYDRO_trace.hxx"
 
 #ifdef DEB_CLASS2D
diff --git a/src/HYDROData/HYDROData_Zone.cxx b/src/HYDROData/HYDROData_Zone.cxx
index 9edf3051..29407a90 100644
--- a/src/HYDROData/HYDROData_Zone.cxx
+++ b/src/HYDROData/HYDROData_Zone.cxx
@@ -26,7 +26,7 @@
 #include <TDataStd_Integer.hxx>
 #include <TopoDS_Shape.hxx>
 
-#define _DEVDEBUG_
+//#define _DEVDEBUG_
 #include "HYDRO_trace.hxx"
 
 IMPLEMENT_STANDARD_RTTIEXT(HYDROData_Zone, HYDROData_Entity)
diff --git a/src/HYDROData/HYDRO_trace.hxx b/src/HYDROData/HYDRO_trace.hxx
index 55f08176..affbf837 100644
--- a/src/HYDROData/HYDRO_trace.hxx
+++ b/src/HYDROData/HYDRO_trace.hxx
@@ -3,9 +3,11 @@
 
 #include <iostream>
 #include <sstream>
+//#include <pthread.h>
 
 #ifdef _DEVDEBUG_
-#define DEBTRACE(msg) {std::cerr<<std::flush<<__FILE__<<" ["<<__LINE__<<"] : "<<msg<<std::endl<<std::flush;}
+//#define DEBTRACE(msg) {std::cerr<<std::flush<<pthread_self()<<":"__FILE__<<" ["<<__LINE__<<"] : "<<msg<<std::endl<<std::flush;}
+#define DEBTRACE(msg) {std::cerr<<std::flush<<":"__FILE__<<" ["<<__LINE__<<"] : "<<msg<<std::endl<<std::flush;}
 #else
 #define DEBTRACE(msg)
 #endif
diff --git a/src/HYDROGUI/HYDROGUI_ImmersibleZoneOp.cxx b/src/HYDROGUI/HYDROGUI_ImmersibleZoneOp.cxx
index d34c908e..e3cba24d 100644
--- a/src/HYDROGUI/HYDROGUI_ImmersibleZoneOp.cxx
+++ b/src/HYDROGUI/HYDROGUI_ImmersibleZoneOp.cxx
@@ -45,7 +45,7 @@
 #include <TopoDS_Wire.hxx>
 
 #include <QApplication>
-#define _DEVDEBUG_
+//#define _DEVDEBUG_
 #include "HYDRO_trace.hxx"
 
 HYDROGUI_ImmersibleZoneOp::HYDROGUI_ImmersibleZoneOp( HYDROGUI_Module* theModule,
diff --git a/src/HYDROGUI/HYDROGUI_Module.cxx b/src/HYDROGUI/HYDROGUI_Module.cxx
index 5ef49f3d..f52320a7 100755
--- a/src/HYDROGUI/HYDROGUI_Module.cxx
+++ b/src/HYDROGUI/HYDROGUI_Module.cxx
@@ -109,7 +109,7 @@
 #include <QStatusBar>
 #include <QCursor>
 
-#define _DEVDEBUG_
+//#define _DEVDEBUG_
 #include "HYDRO_trace.hxx"
 
 static int ViewManagerId = 0;
diff --git a/src/HYDROGUI/HYDROGUI_Zone.cxx b/src/HYDROGUI/HYDROGUI_Zone.cxx
index 9be83f89..821c86e0 100644
--- a/src/HYDROGUI/HYDROGUI_Zone.cxx
+++ b/src/HYDROGUI/HYDROGUI_Zone.cxx
@@ -25,7 +25,7 @@
 #include <SUIT_DataObject.h>
 #include <QSet>
 
-#define _DEVDEBUG_
+//#define _DEVDEBUG_
 #include "HYDRO_trace.hxx"
 
 HYDROGUI_Zone::HYDROGUI_Zone( SUIT_DataObject* theParent,