mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-09 13:22:24 +03:00
0025418: Debug output to be limited to OCC development environment
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:
@@ -23,7 +23,7 @@
|
||||
#include <TColStd_ListIteratorOfListOfInteger.hxx>
|
||||
#include <TDF_AttributeIterator.hxx>
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
#define MAXUP 1000
|
||||
#endif
|
||||
//=======================================================================
|
||||
@@ -40,7 +40,7 @@ TDataStd_DeltaOnModificationOfByteArray::TDataStd_DeltaOnModificationOfByteArray
|
||||
Handle(TColStd_HArray1OfByte) Arr1, Arr2;
|
||||
Arr1 = OldAtt->InternalArray();
|
||||
Arr2 = CurrAtt->InternalArray();
|
||||
#ifdef DEB_DELTA
|
||||
#ifdef OCCT_DEBUG_DELTA
|
||||
if(Arr1.IsNull())
|
||||
cout <<"DeltaOnModificationOfByteArray:: Old ByteArray is Null" <<endl;
|
||||
if(Arr2.IsNull())
|
||||
@@ -80,7 +80,7 @@ TDataStd_DeltaOnModificationOfByteArray::TDataStd_DeltaOnModificationOfByteArray
|
||||
}
|
||||
}
|
||||
OldAtt->RemoveArray();
|
||||
#ifdef TDATASTD_DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if(OldAtt->InternalArray().IsNull())
|
||||
cout << "BackUp Arr is Nullified" << endl;
|
||||
#endif
|
||||
@@ -99,7 +99,7 @@ void TDataStd_DeltaOnModificationOfByteArray::Apply()
|
||||
Handle(TDF_Attribute) TDFAttribute = Attribute();
|
||||
Handle(TDataStd_ByteArray) BackAtt = (*((Handle(TDataStd_ByteArray)*)&TDFAttribute));
|
||||
if(BackAtt.IsNull()) {
|
||||
#ifdef TDATASTD_DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
cout << "DeltaOnModificationOfByteArray::Apply: OldAtt is Null" <<endl;
|
||||
#endif
|
||||
return;
|
||||
@@ -112,7 +112,7 @@ void TDataStd_DeltaOnModificationOfByteArray::Apply()
|
||||
}
|
||||
|
||||
if(aCurAtt.IsNull()) {
|
||||
#ifdef TDATASTD_DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
cout << "DeltaOnModificationOfByteArray::Apply: CurAtt is Null" <<endl;
|
||||
#endif
|
||||
return;
|
||||
@@ -153,7 +153,7 @@ void TDataStd_DeltaOnModificationOfByteArray::Apply()
|
||||
byteArr->SetValue(i, BArr->Value(i));
|
||||
if(!myIndxes.IsNull() && !myValues.IsNull())
|
||||
for(i = 1; i <= myIndxes->Upper();i++) {
|
||||
#ifdef TDATASTD_DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
cout << "i = " << i << " myIndxes->Upper = " << myIndxes->Upper() << endl;
|
||||
cout << "myIndxes->Value(i) = " << myIndxes->Value(i) << endl;
|
||||
cout << "myValues->Value(i) = " << myValues->Value(i) << endl;
|
||||
@@ -163,7 +163,7 @@ void TDataStd_DeltaOnModificationOfByteArray::Apply()
|
||||
aCurAtt->myValue = byteArr;
|
||||
}
|
||||
|
||||
#ifdef TDATASTD_DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
cout << " << Array Dump after Delta Apply >>" <<endl;
|
||||
Handle(TColStd_HArray1OfByte) BArr2 = aCurAtt->InternalArray();
|
||||
for(i=BArr2->Lower(); i<=BArr2->Upper() && i<= MAXUP;i++)
|
||||
|
@@ -22,7 +22,7 @@
|
||||
#include <TColStd_ListIteratorOfListOfInteger.hxx>
|
||||
#include <TDF_AttributeIterator.hxx>
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
#define MAXUP 1000
|
||||
#endif
|
||||
//=======================================================================
|
||||
@@ -39,7 +39,7 @@ TDataStd_DeltaOnModificationOfExtStringArray::TDataStd_DeltaOnModificationOfExtS
|
||||
Handle(TColStd_HArray1OfExtendedString) Arr1, Arr2;
|
||||
Arr1 = OldAtt->Array();
|
||||
Arr2 = CurrAtt->Array();
|
||||
#ifdef TDATASTD_DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if(Arr1.IsNull())
|
||||
cout <<"DeltaOnModificationOfExtStringArray:: Old IntArray is Null" <<endl;
|
||||
if(Arr2.IsNull())
|
||||
@@ -79,7 +79,7 @@ TDataStd_DeltaOnModificationOfExtStringArray::TDataStd_DeltaOnModificationOfExtS
|
||||
}
|
||||
}
|
||||
OldAtt->RemoveArray();
|
||||
#ifdef TDATASTD_DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if(OldAtt->Array().IsNull())
|
||||
cout << "BackUp Arr is Nullified" << endl;
|
||||
#endif
|
||||
@@ -98,7 +98,7 @@ void TDataStd_DeltaOnModificationOfExtStringArray::Apply()
|
||||
Handle(TDF_Attribute) TDFAttribute = Attribute();
|
||||
Handle(TDataStd_ExtStringArray) BackAtt = (*((Handle(TDataStd_ExtStringArray)*)&TDFAttribute));
|
||||
if(BackAtt.IsNull()) {
|
||||
#ifdef TDATASTD_DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
cout << "DeltaOnModificationOfExtStringArray::Apply: OldAtt is Null" <<endl;
|
||||
#endif
|
||||
return;
|
||||
@@ -111,7 +111,7 @@ void TDataStd_DeltaOnModificationOfExtStringArray::Apply()
|
||||
}
|
||||
|
||||
if(aCurAtt.IsNull()) {
|
||||
#ifdef TDATASTD_DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
cout << "DeltaOnModificationOfExtStringArray::Apply: CurAtt is Null" <<endl;
|
||||
#endif
|
||||
return;
|
||||
@@ -155,7 +155,7 @@ void TDataStd_DeltaOnModificationOfExtStringArray::Apply()
|
||||
strArr->SetValue(i, aStrArr->Value(i));
|
||||
if(!myIndxes.IsNull() && !myValues.IsNull())
|
||||
for(i = 1; i <= myIndxes->Upper();i++) {
|
||||
#ifdef TDATASTD_DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
cout << "i = " << i << " myIndxes->Upper = " << myIndxes->Upper() << endl;
|
||||
cout << "myIndxes->Value(i) = " << myIndxes->Value(i) << endl;
|
||||
cout << "myValues->Value(i) = " << myValues->Value(i) << endl;
|
||||
@@ -166,7 +166,7 @@ void TDataStd_DeltaOnModificationOfExtStringArray::Apply()
|
||||
}
|
||||
|
||||
|
||||
#ifdef TDATASTD_DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
cout << " << Array Dump after Delta Apply >>" <<endl;
|
||||
Handle(TColStd_HArray1OfExtendedString) aStrArr2 = aCurAtt->Array();
|
||||
for(i=aStrArr2->Lower(); i<= aStrArr2->Upper() && i<= MAXUP;i++)
|
||||
|
@@ -21,7 +21,7 @@
|
||||
#include <TColStd_ListOfInteger.hxx>
|
||||
#include <TColStd_ListIteratorOfListOfInteger.hxx>
|
||||
#include <TDF_AttributeIterator.hxx>
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
#define MAXUP 1000
|
||||
#endif
|
||||
//=======================================================================
|
||||
@@ -38,7 +38,7 @@ TDataStd_DeltaOnModificationOfIntArray::TDataStd_DeltaOnModificationOfIntArray(c
|
||||
Handle(TColStd_HArray1OfInteger) Arr1, Arr2;
|
||||
Arr1 = OldAtt->Array();
|
||||
Arr2 = CurrAtt->Array();
|
||||
#ifdef TDATASTD_DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if(Arr1.IsNull())
|
||||
cout <<"DeltaOnModificationOfIntArray:: Old IntArray is Null" <<endl;
|
||||
if(Arr2.IsNull())
|
||||
@@ -77,7 +77,7 @@ TDataStd_DeltaOnModificationOfIntArray::TDataStd_DeltaOnModificationOfIntArray(c
|
||||
}
|
||||
}
|
||||
OldAtt->RemoveArray();
|
||||
#ifdef TDATASTD_DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if(OldAtt->Array().IsNull())
|
||||
cout << "BackUp Arr is Nullified" << endl;
|
||||
#endif
|
||||
@@ -96,7 +96,7 @@ void TDataStd_DeltaOnModificationOfIntArray::Apply()
|
||||
Handle(TDF_Attribute) TDFAttribute = Attribute();
|
||||
Handle(TDataStd_IntegerArray) BackAtt = (*((Handle(TDataStd_IntegerArray)*)&TDFAttribute));
|
||||
if(BackAtt.IsNull()) {
|
||||
#ifdef TDATASTD_DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
cout << "DeltaOnModificationOfIntArray::Apply: OldAtt is Null" <<endl;
|
||||
#endif
|
||||
return;
|
||||
@@ -109,7 +109,7 @@ void TDataStd_DeltaOnModificationOfIntArray::Apply()
|
||||
}
|
||||
|
||||
if(aCurAtt.IsNull()) {
|
||||
#ifdef TDATASTD_DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
cout << "DeltaOnModificationOfIntArray::Apply: CurAtt is Null" <<endl;
|
||||
#endif
|
||||
return;
|
||||
@@ -150,7 +150,7 @@ void TDataStd_DeltaOnModificationOfIntArray::Apply()
|
||||
intArr->SetValue(i, IntArr->Value(i));
|
||||
if(!myIndxes.IsNull() && !myValues.IsNull())
|
||||
for(i = 1; i <= myIndxes->Upper();i++) {
|
||||
#ifdef TDATASTD_DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
cout << "i = " << i << " myIndxes->Upper = " << myIndxes->Upper() << endl;
|
||||
cout << "myIndxes->Value(i) = " << myIndxes->Value(i) << endl;
|
||||
cout << "myValues->Value(i) = " << myValues->Value(i) << endl;
|
||||
@@ -160,7 +160,7 @@ void TDataStd_DeltaOnModificationOfIntArray::Apply()
|
||||
aCurAtt->myValue = intArr;
|
||||
}
|
||||
|
||||
#ifdef TDATASTD_DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
cout << " << Array Dump after Delta Apply >>" <<endl;
|
||||
Handle(TColStd_HArray1OfInteger) IntArr2 = aCurAtt->Array();
|
||||
for(i=IntArr2->Lower(); i<=IntArr2->Upper() && i <= MAXUP;i++)
|
||||
|
@@ -20,7 +20,7 @@
|
||||
#include <TColStd_HPackedMapOfInteger.hxx>
|
||||
#include <TColStd_MapIteratorOfPackedMapOfInteger.hxx>
|
||||
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
#define MAXUP 1000
|
||||
#endif
|
||||
|
||||
@@ -39,7 +39,7 @@ TDataStd_DeltaOnModificationOfIntPackedMap::TDataStd_DeltaOnModificationOfIntPac
|
||||
Handle(TColStd_HPackedMapOfInteger) aMap1, aMap2;
|
||||
aMap1 = OldAtt->GetHMap();
|
||||
aMap2 = CurrAtt->GetHMap();
|
||||
#ifdef DEB_disable
|
||||
#ifdef OCCT_DEBUG_disable
|
||||
if (aMap1.IsNull())
|
||||
cout <<"DeltaOnModificationOfIntPackedMap:: Old Map is Null" <<endl;
|
||||
if (aMap2.IsNull())
|
||||
@@ -81,7 +81,7 @@ void TDataStd_DeltaOnModificationOfIntPackedMap::Apply()
|
||||
Handle(TDF_Attribute) aTDFAttribute = Attribute();
|
||||
Handle(TDataStd_IntPackedMap) aBackAtt = (*((Handle(TDataStd_IntPackedMap)*)&aTDFAttribute));
|
||||
if(aBackAtt.IsNull()) {
|
||||
#ifdef TDATASTD_DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
cout << "DeltaOnModificationOfIntPAckedMap::Apply: OldAtt is Null" <<endl;
|
||||
#endif
|
||||
return;
|
||||
@@ -94,7 +94,7 @@ void TDataStd_DeltaOnModificationOfIntPackedMap::Apply()
|
||||
}
|
||||
|
||||
if(aCurAtt.IsNull()) {
|
||||
#ifdef TDATASTD_DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
cout << "DeltaOnModificationOfIntAPckedMAp::Apply: CurAtt is Null" <<endl;
|
||||
#endif
|
||||
return;
|
||||
@@ -119,7 +119,7 @@ void TDataStd_DeltaOnModificationOfIntPackedMap::Apply()
|
||||
IntMap->ChangeMap().Unite(myAddition->Map());
|
||||
}
|
||||
|
||||
#ifdef DEB_disable
|
||||
#ifdef OCCT_DEBUG_disable
|
||||
cout << " << Map Dump after Delta Apply >>" <<endl;
|
||||
Handle(TColStd_HPackedMapOfInteger) aIntMap = aCurAtt->GetHMap();
|
||||
TColStd_MapIteratorOfPackedMapOfInteger it(aIntMap->Map());
|
||||
|
@@ -21,7 +21,7 @@
|
||||
#include <TColStd_ListOfInteger.hxx>
|
||||
#include <TColStd_ListIteratorOfListOfInteger.hxx>
|
||||
#include <TDF_AttributeIterator.hxx>
|
||||
#ifdef DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
#define MAXUP 1000
|
||||
#endif
|
||||
//=======================================================================
|
||||
@@ -38,7 +38,7 @@ TDataStd_DeltaOnModificationOfRealArray::
|
||||
Handle(TColStd_HArray1OfReal) Arr1, Arr2;
|
||||
Arr1 = OldAtt->Array();
|
||||
Arr2 = CurrAtt->Array();
|
||||
#ifdef TDATASTD_DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if(Arr1.IsNull())
|
||||
cout <<"DeltaOnModificationOfRealArray:: Old Array is Null" <<endl;
|
||||
if(Arr2.IsNull())
|
||||
@@ -76,7 +76,7 @@ TDataStd_DeltaOnModificationOfRealArray::
|
||||
}
|
||||
}
|
||||
OldAtt->RemoveArray();
|
||||
#ifdef TDATASTD_DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
if(OldAtt->Array().IsNull())
|
||||
cout << "BackUp Arr is Nullified" << endl;
|
||||
#endif
|
||||
@@ -95,7 +95,7 @@ void TDataStd_DeltaOnModificationOfRealArray::Apply()
|
||||
Handle(TDF_Attribute) TDFAttribute = Attribute();
|
||||
Handle(TDataStd_RealArray) BackAtt = (*((Handle(TDataStd_RealArray)*)&TDFAttribute));
|
||||
if(BackAtt.IsNull()) {
|
||||
#ifdef TDATASTD_DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
cout << "DeltaOnModificationOfRealArray::Apply: OldAtt is Null" <<endl;
|
||||
#endif
|
||||
return;
|
||||
@@ -108,7 +108,7 @@ void TDataStd_DeltaOnModificationOfRealArray::Apply()
|
||||
}
|
||||
|
||||
if(aCurAtt.IsNull()) {
|
||||
#ifdef TDATASTD_DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
cout << "DeltaOnModificationOfRealArray::Apply: CurAtt is Null" <<endl;
|
||||
#endif
|
||||
return;
|
||||
@@ -149,7 +149,7 @@ void TDataStd_DeltaOnModificationOfRealArray::Apply()
|
||||
realArr->SetValue(i, aRealArr->Value(i));
|
||||
if(!myIndxes.IsNull() && !myValues.IsNull())
|
||||
for(i = 1; i <= myIndxes->Upper();i++) {
|
||||
#ifdef TDATASTD_DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
cout << "i = " << i << " myIndxes->Upper = " << myIndxes->Upper() << endl;
|
||||
cout << "myIndxes->Value(i) = " << myIndxes->Value(i) << endl;
|
||||
cout << "myValues->Value(i) = " << myValues->Value(i) << endl;
|
||||
@@ -160,7 +160,7 @@ void TDataStd_DeltaOnModificationOfRealArray::Apply()
|
||||
}
|
||||
|
||||
|
||||
#ifdef TDATASTD_DEB
|
||||
#ifdef OCCT_DEBUG
|
||||
cout << " << RealArray Dump after Delta Apply >>" <<endl;
|
||||
Handle(TColStd_HArray1OfReal) aRArr = aCurAtt->Array();
|
||||
for(i=aRArr->Lower(); i<=aRArr->Upper() && i <= MAXUP;i++)
|
||||
|
Reference in New Issue
Block a user