OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-09 13:22:24 +03:00
Code Activity

0025418: Debug output to be limited to OCC development environment

Browse Source 
Macros ending on "DEB" are replaced by OCCT_DEBUG across OCCT code; new macros described in documentation.
Macros starting with DEB are changed to start with "OCCT_DEBUG_".
Some code cleaned.
This commit is contained in:
abv
2014-10-28 12:41:04 +03:00
committed by bugmaster
parent a507ffd9d7
commit 0797d9d30a
700 changed files with 3932 additions and 4250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/STEPControl/STEPControl_ActorRead.cxx
View File

@@ -128,10 +128,10 @@
// ============================================================================
// Function: DumpWhatIs
// Purpose: Use it in DEB mode to dump your shapes
// Purpose: Use it in debug mode to dump your shapes
// ============================================================================
#ifdef STEPCONTROL_DEB
#ifdef OCCT_DEBUG
static void DumpWhatIs(const TopoDS_Shape& S) {
TopTools_MapOfShape aMapOfShape;
@@ -287,12 +287,12 @@ Handle(Transfer_Binder) STEPControl_ActorRead::Transfer
Handle(TCollection_HAsciiString) aPPVersion = aFileNameEntity->PreprocessorVersion();
if(aPPVersion.IsNull())
continue;
#ifdef STEPCONTROL_DEB
#ifdef OCCT_DEBUG
cout << "Preprocessor version detected: " << aPPVersion->ToCString() << endl;
#endif
Standard_Integer anIDeasResult = aPPVersion->Search("I-DEAS");
if (anIDeasResult != -1) {
#ifdef STEPCONTROL_DEB
#ifdef OCCT_DEBUG
cout << "Recognized as I-DEAS STP" << endl;
#endif
myNMTool.SetIDEASCase(Standard_True);
@@ -783,7 +783,7 @@ Handle(TransferBRep_ShapeBinder) STEPControl_ActorRead::TransferEntity(const Han
if ( isNMMode && sr->IsKind(STANDARD_TYPE(StepShape_NonManifoldSurfaceShapeRepresentation)) ) {
isManifold = Standard_False;
NM_DETECTED = Standard_True;
#ifdef STEPCONTROL_DEB
#ifdef OCCT_DEBUG
Standard_Integer NMSSRItemsLen = sr->Items()->Length();
cout << "NMSSR with " << NMSSRItemsLen << " items detected" << endl;
#endif
@@ -794,11 +794,11 @@ Handle(TransferBRep_ShapeBinder) STEPControl_ActorRead::TransferEntity(const Han
if (isNMMode && myNMTool.IsIDEASCase() && isIDeasMode) {
isManifold = Standard_False;
NM_DETECTED = Standard_True;
#ifdef STEPCONTROL_DEB
#ifdef OCCT_DEBUG
cout << "I-DEAS post processing for non-manifold topology ENABLED" << endl;
#endif
}
#ifdef STEPCONTROL_DEB
#ifdef OCCT_DEBUG
else if ( myNMTool.IsIDEASCase() )
cout << "I-DEAS post processing for non-manifold topology DISABLED" << endl;
#endif
@@ -910,7 +910,7 @@ Handle(TransferBRep_ShapeBinder) STEPControl_ActorRead::TransferEntity(const Han
TP->Bind(sr, shbinder);
#ifdef STEPCONTROL_DEB
#ifdef OCCT_DEBUG
DumpWhatIs(comp);
#endif
@@ -1775,7 +1775,7 @@ TopoDS_Shell STEPControl_ActorRead::closeIDEASShell(const TopoDS_Shell& shell,
if (subCheckStatus != BRepCheck_NoError)
brepBuilder.Add(result, currentFace);
else {
#ifdef STEPCONTROL_DEB
#ifdef OCCT_DEBUG
cout << "Redundant closing face detected: REMOVED from shell";
#endif
}

38
src/STEPControl/STEPControl_ActorWrite.cxx
View File

@@ -117,10 +117,10 @@
// ============================================================================
// Function: DumpWhatIs
// Purpose: Use it in DEB mode to dump your shapes
// Purpose: Use it in debug mode to dump your shapes
// ============================================================================
#ifdef STEPCONTROL_DEB
#ifdef OCCT_DEBUG
static void DumpWhatIs(const TopoDS_Shape& S) {
TopTools_MapOfShape aMapOfShape;
@@ -194,7 +194,7 @@ static Standard_Boolean IsManifoldShape(const TopoDS_Shape& theShape) {
aBrepBuilder.Add(aDirectShapes, aDirectChild);
}
#ifdef STEPCONTROL_DEB
#ifdef OCCT_DEBUG
DumpWhatIs(aDirectShapes);
#endif
@@ -202,7 +202,7 @@ static Standard_Boolean IsManifoldShape(const TopoDS_Shape& theShape) {
TopExp::MapShapesAndAncestors(aDirectShapes, TopAbs_EDGE, TopAbs_FACE, aMapEdgeFaces);
Standard_Integer aNbEdges = aMapEdgeFaces.Extent();
#ifdef STEPCONTROL_DEB
#ifdef OCCT_DEBUG
cout << "Checking whether the topology passed is manifold..." << endl;
#endif
@@ -218,33 +218,13 @@ static Standard_Boolean IsManifoldShape(const TopoDS_Shape& theShape) {
}
}
#ifdef STEPCONTROL_DEB
#ifdef OCCT_DEBUG
cout << "Check result: "
<< (aResult ? "TRUE" : "FALSE") << endl;
#endif
return aResult;
}
/* this is a start of a comment! */
#ifdef DEB
void DumpBinder (const Handle(Transfer_Binder) &binder)
{
Handle(Transfer_Binder) bbb = binder;
while ( ! bbb.IsNull() ) {
Handle(Transfer_SimpleBinderOfTransient) bx =
Handle(Transfer_SimpleBinderOfTransient)::DownCast ( bbb );
cout << (void*)&bx;
if ( ! bx.IsNull() ) {
cout << "--> " << bx->ResultTypeName() << " " << *(void**)&bx->Result() << endl;
}
else cout << "--> ???" << endl;
bbb = bbb->NextResult();
}
cout << endl;
}
#endif
/* this is a end of a comment */
//=======================================================================
//function : STEPControl_ActorWrite
@@ -279,13 +259,13 @@ Handle(StepShape_NonManifoldSurfaceShapeRepresentation) STEPControl_ActorWrite::
}
if ( aResult.IsNull() ) {
#ifdef STEPCONTROL_DEB
#ifdef OCCT_DEBUG
cout << "\nNew NMSSR created" << endl;
#endif
aResult = new StepShape_NonManifoldSurfaceShapeRepresentation;
isNMSSRCreated = Standard_True;
} else {
#ifdef STEPCONTROL_DEB
#ifdef OCCT_DEBUG
cout << "\nExisting NMSSR is used" << endl;
#endif
isNMSSRCreated = Standard_False;
@@ -628,7 +608,7 @@ Handle(Transfer_Binder) STEPControl_ActorWrite::TransferShape (const Handle(Tran
//:abv 20.05.02: writing box & face from it (shared) in one compound
// as assembly - while face already translated, it should be
// re-translated to break sharing
#ifdef STEPCONTROL_DEB
#ifdef OCCT_DEBUG
cout << "Warning: STEPControl_ActorWrite::TransferShape(): shape already translated" << endl;
#endif
// return binder;
@@ -1294,7 +1274,7 @@ Handle(Transfer_Binder) STEPControl_ActorWrite::TransferCompound (const Handle(T
BRep_Builder aB;
aB.MakeCompound(aCompOfVrtx);
#ifdef STEPCONTROL_DEB
#ifdef OCCT_DEBUG
if (!isManifold)
cout << "Exploding Solids to Shells if any..." << endl;
#endif

2
src/STEPControl/STEPControl_Reader.cxx
View File

@@ -150,7 +150,7 @@ Standard_Integer STEPControl_Reader::NbRootsForTransfer()
break;
}
if (iSexclude) {
#ifdef STEPCONTROL_DEB
#ifdef OCCT_DEBUG
cout << "Warning: STEPControl_Reader::NbRootsForTransfer exclude PDWAD from roots" << endl;
#endif
continue;