ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-02-12 00:53:06 +05:00
Code Issues Packages Projects Releases Wiki Activity

[bos #32517][EDF] Dynamic logging: Removed MYDEBUG.

Browse Source
This commit is contained in:
Konstantin LEONTEV 2022-10-14 12:44:56 +03:00
parent 7b66fb096e
commit f028e1d7bf
21 changed files with 322 additions and 475 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/DriverMED/DriverMED_R_SMESHDS_Mesh.cxx
View File

@ -42,13 +42,6 @@
//#include <stdlib.h> //#include <stdlib.h>
#ifdef _DEBUG_
static int MYDEBUG = 0;
//#define _DEXCEPT_
#else
static int MYDEBUG = 0;
#endif
#define _EDF_NODE_IDS_ #define _EDF_NODE_IDS_
using namespace MED; using namespace MED;
@ -110,7 +103,7 @@ Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform()
try { try {
#endif #endif
myFamilies.clear(); myFamilies.clear();
if(MYDEBUG) MESSAGE("Perform - myFile : "<<myFile); MESSAGE("Perform - myFile : "<<myFile);
PWrapper aMed = CrWrapperR(myFile); PWrapper aMed = CrWrapperR(myFile);
aResult = DRS_EMPTY; aResult = DRS_EMPTY;
@ -125,7 +118,7 @@ Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform()
if (myMeshId != -1) aMeshName = SMESH_Comment( myMeshId ); if (myMeshId != -1) aMeshName = SMESH_Comment( myMeshId );
else aMeshName = myMeshName; else aMeshName = myMeshName;
if(MYDEBUG) MESSAGE("Perform - aMeshName : "<<aMeshName<<"; "<<aMeshInfo->GetName()); MESSAGE("Perform - aMeshName : "<<aMeshName<<"; "<<aMeshInfo->GetName());
if ( aMeshName != aMeshInfo->GetName() ) continue; if ( aMeshName != aMeshInfo->GetName() ) continue;
aResult = DRS_OK; aResult = DRS_OK;
@ -133,18 +126,18 @@ Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform()
//------------------------------------------------ //------------------------------------------------
TErr anErr; TErr anErr;
TInt aNbFams = aMed->GetNbFamilies(aMeshInfo); TInt aNbFams = aMed->GetNbFamilies(aMeshInfo);
if(MYDEBUG) MESSAGE("Read " << aNbFams << " families"); MESSAGE("Read " << aNbFams << " families");
for (TInt iFam = 0; iFam < aNbFams; iFam++) for (TInt iFam = 0; iFam < aNbFams; iFam++)
{ {
PFamilyInfo aFamilyInfo = aMed->GetPFamilyInfo(aMeshInfo,iFam+1,&anErr); PFamilyInfo aFamilyInfo = aMed->GetPFamilyInfo(aMeshInfo,iFam+1,&anErr);
if(anErr >= 0){ if(anErr >= 0){
TInt aFamId = aFamilyInfo->GetId(); TInt aFamId = aFamilyInfo->GetId();
if(MYDEBUG) MESSAGE("Family " << aFamId << " :"); MESSAGE("Family " << aFamId << " :");
DriverMED_FamilyPtr aFamily (new DriverMED_Family); DriverMED_FamilyPtr aFamily (new DriverMED_Family);
TInt aNbGrp = aFamilyInfo->GetNbGroup(); TInt aNbGrp = aFamilyInfo->GetNbGroup();
if(MYDEBUG) MESSAGE("belong to " << aNbGrp << " groups"); MESSAGE("belong to " << aNbGrp << " groups");
bool isAttrOk = false; bool isAttrOk = false;
if(aFamilyInfo->GetNbAttr() == aNbGrp) if(aFamilyInfo->GetNbAttr() == aNbGrp)
isAttrOk = true; isAttrOk = true;
@ -155,7 +148,7 @@ Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform()
TInt anAttrVal = aFamilyInfo->GetAttrVal(iGr); TInt anAttrVal = aFamilyInfo->GetAttrVal(iGr);
aFamily->SetGroupAttributVal(anAttrVal); aFamily->SetGroupAttributVal(anAttrVal);
} }
if(MYDEBUG) MESSAGE(aGroupName); MESSAGE(aGroupName);
if ( strncmp( aGroupName.c_str(), NIG_GROUP_PREFIX, strlen(NIG_GROUP_PREFIX) ) != 0 ) if ( strncmp( aGroupName.c_str(), NIG_GROUP_PREFIX, strlen(NIG_GROUP_PREFIX) ) != 0 )
aFamily->AddGroupName( fixUTF8( aGroupName )); aFamily->AddGroupName( fixUTF8( aGroupName ));
} }
@ -182,7 +175,7 @@ Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform()
EBooleen anIsNodeNum = aNodeInfo->IsElemNum(); EBooleen anIsNodeNum = aNodeInfo->IsElemNum();
TInt aNbElems = aNodeInfo->GetNbElem(); TInt aNbElems = aNodeInfo->GetNbElem();
if(MYDEBUG) MESSAGE("Perform - aNodeInfo->GetNbElem() = "<<aNbElems<<"; anIsNodeNum = "<<anIsNodeNum); MESSAGE("Perform - aNodeInfo->GetNbElem() = "<<aNbElems<<"; anIsNodeNum = "<<anIsNodeNum);
DriverMED_FamilyPtr aFamily; DriverMED_FamilyPtr aFamily;
for ( TInt iElem = 0; iElem < aNbElems; iElem++ ) for ( TInt iElem = 0; iElem < aNbElems; iElem++ )
{ {
@ -475,8 +468,8 @@ Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform()
PCellInfo aCellInfo = aMed->GetPCellInfo(aMeshInfo,anEntity,aGeom); PCellInfo aCellInfo = aMed->GetPCellInfo(aMeshInfo,anEntity,aGeom);
EBooleen anIsElemNum = takeNumbers ? aCellInfo->IsElemNum() : eFAUX; EBooleen anIsElemNum = takeNumbers ? aCellInfo->IsElemNum() : eFAUX;
TInt aNbElems = aCellInfo->GetNbElem(); TInt aNbElems = aCellInfo->GetNbElem();
if(MYDEBUG) MESSAGE("Perform - anEntity = "<<anEntity<<"; anIsElemNum = "<<anIsElemNum); MESSAGE("Perform - anEntity = "<<anEntity<<"; anIsElemNum = "<<anIsElemNum);
if(MYDEBUG) MESSAGE("Perform - aGeom = "<<aGeom<<"; aNbElems = "<<aNbElems); MESSAGE("Perform - aGeom = "<<aGeom<<"; aNbElems = "<<aNbElems);
TInt aNbNodes = -1; TInt aNbNodes = -1;
switch(aGeom){ switch(aGeom){
@ -1046,7 +1039,7 @@ Driver_Mesh::Status DriverMED_R_SMESHDS_Mesh::Perform()
aResult = DRS_WARN_DESCENDING; aResult = DRS_WARN_DESCENDING;
} }
if(MYDEBUG) MESSAGE("Perform - aResult status = "<<aResult); MESSAGE("Perform - aResult status = "<<aResult);
return aResult; return aResult;
} }
@ -1055,7 +1048,7 @@ list<string> DriverMED_R_SMESHDS_Mesh::GetMeshNames(Status& theStatus)
list<string> aMeshNames; list<string> aMeshNames;
try { try {
if(MYDEBUG) MESSAGE("GetMeshNames - myFile : " << myFile); MESSAGE("GetMeshNames - myFile : " << myFile);
theStatus = DRS_OK; theStatus = DRS_OK;
PWrapper aMed = CrWrapperR(myFile); PWrapper aMed = CrWrapperR(myFile);
@ -1132,7 +1125,7 @@ void DriverMED_R_SMESHDS_Mesh::GetGroup(SMESHDS_Group* theGroup)
} }
const char* aGroupName = theGroup->GetStoreName(); const char* aGroupName = theGroup->GetStoreName();
if(MYDEBUG) MESSAGE("Get Group " << aGroupName); MESSAGE("Get Group " << aGroupName);
if (( famVecPtr = myGroups2FamiliesMap.ChangeSeek( aGroupName ))) if (( famVecPtr = myGroups2FamiliesMap.ChangeSeek( aGroupName )))
{ {

13
src/DriverUNV/DriverUNV_R_SMDS_Mesh.cxx
View File

@ -37,13 +37,6 @@
using namespace std; using namespace std;
#ifdef _DEBUG_
static int MYDEBUG = 0;
#else
static int MYDEBUG = 0;
#endif
namespace namespace
{ {
/*! /*!
@ -123,7 +116,7 @@ Driver_Mesh::Status DriverUNV_R_SMDS_Mesh::Perform()
using namespace UNV2411; using namespace UNV2411;
TDataSet aDataSet2411; TDataSet aDataSet2411;
UNV2411::Read(in_stream,aDataSet2411); UNV2411::Read(in_stream,aDataSet2411);
if(MYDEBUG) MESSAGE("Perform - aDataSet2411.size() = "<<aDataSet2411.size()); MESSAGE("Perform - aDataSet2411.size() = "<<aDataSet2411.size());
// Move nodes in a global CS // Move nodes in a global CS
if ( !aCoordSysDataSet.empty() ) if ( !aCoordSysDataSet.empty() )
@ -168,7 +161,7 @@ Driver_Mesh::Status DriverUNV_R_SMDS_Mesh::Perform()
TDataSet aDataSet2412; TDataSet aDataSet2412;
UNV2412::Read(in_stream,aDataSet2412); UNV2412::Read(in_stream,aDataSet2412);
TDataSet::const_iterator anIter = aDataSet2412.begin(); TDataSet::const_iterator anIter = aDataSet2412.begin();
if(MYDEBUG) MESSAGE("Perform - aDataSet2412.size() = "<<aDataSet2412.size()); MESSAGE("Perform - aDataSet2412.size() = "<<aDataSet2412.size());
for(; anIter != aDataSet2412.end(); anIter++) for(; anIter != aDataSet2412.end(); anIter++)
{ {
SMDS_MeshElement* anElement = NULL; SMDS_MeshElement* anElement = NULL;
@ -404,7 +397,7 @@ Driver_Mesh::Status DriverUNV_R_SMDS_Mesh::Perform()
using namespace UNV2417; using namespace UNV2417;
TDataSet aDataSet2417; TDataSet aDataSet2417;
UNV2417::Read(in_stream,aDataSet2417); UNV2417::Read(in_stream,aDataSet2417);
if(MYDEBUG) MESSAGE("Perform - aDataSet2417.size() = "<<aDataSet2417.size()); MESSAGE("Perform - aDataSet2417.size() = "<<aDataSet2417.size());
if (aDataSet2417.size() > 0) if (aDataSet2417.size() > 0)
{ {
TDataSet::const_iterator anIter = aDataSet2417.begin(); TDataSet::const_iterator anIter = aDataSet2417.begin();

80
src/MEDWrapper/MED_Algorithm.cxx
View File

@ -24,14 +24,6 @@
#include "MED_Wrapper.hxx" #include "MED_Wrapper.hxx"
#include "MED_Utilities.hxx" #include "MED_Utilities.hxx"
#ifdef _DEBUG_
static int MYDEBUG = 0;
static int MYVALUEDEBUG = 0;
#else
// static int MYDEBUG = 0;
// static int MYVALUEDEBUG = 0;
#endif
namespace MED namespace MED
{ {
//--------------------------------------------------------------- //---------------------------------------------------------------
@ -40,7 +32,7 @@ namespace MED
const PMeshInfo& theMeshInfo, const PMeshInfo& theMeshInfo,
const MED::TEntityInfo& theEntityInfo) const MED::TEntityInfo& theEntityInfo)
{ {
MSG(MYDEBUG,"GetElemsByEntity(...)"); MSG("GetElemsByEntity(...)");
TEntity2TGeom2ElemInfo anEntity2TGeom2ElemInfo; TEntity2TGeom2ElemInfo anEntity2TGeom2ElemInfo;
MED::TEntityInfo::const_iterator anIter = theEntityInfo.begin(); MED::TEntityInfo::const_iterator anIter = theEntityInfo.begin();
PElemInfo anElemInfo; PElemInfo anElemInfo;
@ -61,7 +53,7 @@ namespace MED
aGeom2ElemInfo[aGeom] = theWrapper->GetPElemInfo(theMeshInfo,anEntity,aGeom,MED::eNOD,&anErr); aGeom2ElemInfo[aGeom] = theWrapper->GetPElemInfo(theMeshInfo,anEntity,aGeom,MED::eNOD,&anErr);
} }
} }
ADDMSG(MYDEBUG,"\n"); ADDMSG("\n");
return anEntity2TGeom2ElemInfo; return anEntity2TGeom2ElemInfo;
} }
@ -70,17 +62,17 @@ namespace MED
GetFamilyInfoSet(const PWrapper& theWrapper, GetFamilyInfoSet(const PWrapper& theWrapper,
const PMeshInfo& theMeshInfo) const PMeshInfo& theMeshInfo)
{ {
MSG(MYDEBUG,"GetFamilies(...)"); MSG("GetFamilies(...)");
TErr anErr; TErr anErr;
TFamilyInfoSet aFamilyInfoSet; TFamilyInfoSet aFamilyInfoSet;
TInt aNbFam = theWrapper->GetNbFamilies(*theMeshInfo); TInt aNbFam = theWrapper->GetNbFamilies(*theMeshInfo);
INITMSG(MYDEBUG,"GetNbFamilies() = "<<aNbFam<<"\n"); INITMSG("GetNbFamilies() = "<<aNbFam<<"\n");
for(TInt iFam = 1; iFam <= aNbFam; iFam++){ for(TInt iFam = 1; iFam <= aNbFam; iFam++){
PFamilyInfo aFamilyInfo = theWrapper->GetPFamilyInfo(theMeshInfo,iFam,&anErr); PFamilyInfo aFamilyInfo = theWrapper->GetPFamilyInfo(theMeshInfo,iFam,&anErr);
if(anErr >= 0) if(anErr >= 0)
aFamilyInfoSet.insert(aFamilyInfo); aFamilyInfoSet.insert(aFamilyInfo);
} }
ADDMSG(MYDEBUG,"\n"); ADDMSG("\n");
return aFamilyInfoSet; return aFamilyInfoSet;
} }
@ -88,7 +80,7 @@ namespace MED
TGroupInfo TGroupInfo
GetGroupInfo(const TFamilyInfoSet& theFamilyInfoSet) GetGroupInfo(const TFamilyInfoSet& theFamilyInfoSet)
{ {
MSG(MYDEBUG,"GetFamiliesByGroup(...)"); MSG("GetFamiliesByGroup(...)");
TGroupInfo aGroup; TGroupInfo aGroup;
TFamilyInfoSet::const_iterator anIter = theFamilyInfoSet.begin(); TFamilyInfoSet::const_iterator anIter = theFamilyInfoSet.begin();
for(; anIter != theFamilyInfoSet.end(); anIter++){ for(; anIter != theFamilyInfoSet.end(); anIter++){
@ -99,22 +91,20 @@ namespace MED
} }
} }
#ifdef _DEBUG_ if(SALOME::VerbosityActivated()){
if(MYDEBUG){
TGroupInfo::const_iterator anIter = aGroup.begin(); TGroupInfo::const_iterator anIter = aGroup.begin();
for(; anIter != aGroup.end(); anIter++){ for(; anIter != aGroup.end(); anIter++){
const std::string& aName = anIter->first; const std::string& aName = anIter->first;
INITMSG(MYDEBUG,"aGroupName = '"<<aName<<"'\n"); INITMSG("aGroupName = '"<<aName<<"'\n");
const TFamilyInfoSet& aFamilyInfoSet = anIter->second; const TFamilyInfoSet& aFamilyInfoSet = anIter->second;
TFamilyInfoSet::const_iterator anFamIter = aFamilyInfoSet.begin(); TFamilyInfoSet::const_iterator anFamIter = aFamilyInfoSet.begin();
for(; anFamIter != aFamilyInfoSet.end(); anFamIter++){ for(; anFamIter != aFamilyInfoSet.end(); anFamIter++){
const PFamilyInfo& aFamilyInfo = *anFamIter; const PFamilyInfo& aFamilyInfo = *anFamIter;
INITMSG(MYDEBUG,"aFamilyName = '"<<aFamilyInfo->GetName()<<"'\n"); INITMSG("aFamilyName = '"<<aFamilyInfo->GetName()<<"'\n");
} }
} }
ADDMSG(MYDEBUG,"\n"); ADDMSG("\n");
} }
#endif
return aGroup; return aGroup;
} }
@ -125,28 +115,26 @@ namespace MED
const PMeshInfo& theMeshInfo, const PMeshInfo& theMeshInfo,
const MED::TEntityInfo& theEntityInfo) const MED::TEntityInfo& theEntityInfo)
{ {
MSG(MYDEBUG,"GetFieldsByEntity(...)"); MSG("GetFieldsByEntity(...)");
TFieldInfo2TimeStampInfoSet aFieldInfo2TimeStampInfoSet; TFieldInfo2TimeStampInfoSet aFieldInfo2TimeStampInfoSet;
TInt aNbFields = theWrapper->GetNbFields(); TInt aNbFields = theWrapper->GetNbFields();
INITMSG(MYDEBUG,"GetNbFields() = "<<aNbFields<<"\n"); INITMSG("GetNbFields() = "<<aNbFields<<"\n");
for(TInt iField = 1; iField <= aNbFields; iField++){ for(TInt iField = 1; iField <= aNbFields; iField++){
PFieldInfo aFieldInfo = theWrapper->GetPFieldInfo(theMeshInfo,iField); PFieldInfo aFieldInfo = theWrapper->GetPFieldInfo(theMeshInfo,iField);
INITMSG(MYDEBUG,"aFieldName = '"<<aFieldInfo->GetName()<< INITMSG("aFieldName = '"<<aFieldInfo->GetName()<<
"'; aNbComp = "<<aFieldInfo->GetNbComp()<<"; "); "'; aNbComp = "<<aFieldInfo->GetNbComp()<<"; ");
TGeom2Size aGeom2Size; TGeom2Size aGeom2Size;
EEntiteMaillage anEntity = EEntiteMaillage(-1); EEntiteMaillage anEntity = EEntiteMaillage(-1);
TInt aNbTimeStamps = theWrapper->GetNbTimeStamps(aFieldInfo,theEntityInfo,anEntity,aGeom2Size); TInt aNbTimeStamps = theWrapper->GetNbTimeStamps(aFieldInfo,theEntityInfo,anEntity,aGeom2Size);
ADDMSG(MYDEBUG,"anEntity = "<<anEntity<<"; GetNbTimeStamps = "<<aNbTimeStamps<<"\n"); ADDMSG("anEntity = "<<anEntity<<"; GetNbTimeStamps = "<<aNbTimeStamps<<"\n");
for(TInt iTimeStamp = 1; iTimeStamp <= aNbTimeStamps; iTimeStamp++){ for(TInt iTimeStamp = 1; iTimeStamp <= aNbTimeStamps; iTimeStamp++){
PTimeStampInfo aTimeStamp = PTimeStampInfo aTimeStamp =
theWrapper->GetPTimeStampInfo(aFieldInfo,anEntity,aGeom2Size,iTimeStamp); theWrapper->GetPTimeStampInfo(aFieldInfo,anEntity,aGeom2Size,iTimeStamp);
aFieldInfo2TimeStampInfoSet[aFieldInfo].insert(aTimeStamp); aFieldInfo2TimeStampInfoSet[aFieldInfo].insert(aTimeStamp);
INITMSG(MYDEBUG, INITMSG("aDt = "<<aTimeStamp->GetDt()<<", Unit = \'"<<aTimeStamp->GetUnitDt()<<"\n");
"aDt = "<<aTimeStamp->GetDt()<<
", Unit = \'"<<aTimeStamp->GetUnitDt()<<"\n");
} }
} }
ADDMSG(MYDEBUG,"\n"); ADDMSG("\n");
return aFieldInfo2TimeStampInfoSet; return aFieldInfo2TimeStampInfoSet;
} }
@ -182,7 +170,7 @@ namespace MED
const TEntity2TGeom2ElemInfo& theEntity2TGeom2ElemInfo, const TEntity2TGeom2ElemInfo& theEntity2TGeom2ElemInfo,
const TFamilyInfoSet& theFamilyInfoSet) const TFamilyInfoSet& theFamilyInfoSet)
{ {
MSG(MYDEBUG,"GetFamiliesByEntity(...)"); MSG("GetFamiliesByEntity(...)");
TEntity2FamilySet anEntity2FamilySet; TEntity2FamilySet anEntity2FamilySet;
typedef std::map<TInt,PFamilyInfo> TId2Family; typedef std::map<TInt,PFamilyInfo> TId2Family;
@ -220,7 +208,7 @@ namespace MED
TEntity2FamilyID::const_iterator anIter = anEntity2FamilyID.begin(); TEntity2FamilyID::const_iterator anIter = anEntity2FamilyID.begin();
for(; anIter != anEntity2FamilyID.end(); anIter++){ for(; anIter != anEntity2FamilyID.end(); anIter++){
const EEntiteMaillage& anEntity = anIter->first; const EEntiteMaillage& anEntity = anIter->first;
INITMSG(MYDEBUG,"anEntity = "<<anEntity<<":\n"); INITMSG("anEntity = "<<anEntity<<":\n");
const TFamilyID2Size& aFamilyID2Size = anIter->second; const TFamilyID2Size& aFamilyID2Size = anIter->second;
TFamilyID2Size::const_iterator anIter2 = aFamilyID2Size.begin(); TFamilyID2Size::const_iterator anIter2 = aFamilyID2Size.begin();
for(; anIter2 != aFamilyID2Size.end(); anIter2++){ for(; anIter2 != aFamilyID2Size.end(); anIter2++){
@ -230,15 +218,14 @@ namespace MED
if(anIter3 != anId2Family.end()){ if(anIter3 != anId2Family.end()){
const PFamilyInfo& aFamilyInfo = anIter3->second; const PFamilyInfo& aFamilyInfo = anIter3->second;
anEntity2FamilySet[anEntity].insert(TFamilyTSize(aFamilyInfo,aSize)); anEntity2FamilySet[anEntity].insert(TFamilyTSize(aFamilyInfo,aSize));
INITMSG(MYDEBUG, INITMSG("aFamilyName = '"<<aFamilyInfo->GetName()<<
"aFamilyName = '"<<aFamilyInfo->GetName()<<
"' anId = "<<aFamilyInfo->GetId()<<"\n"); "' anId = "<<aFamilyInfo->GetId()<<"\n");
} }
} }
} }
} }
} }
ADDMSG(MYDEBUG,"\n"); ADDMSG("\n");
return anEntity2FamilySet; return anEntity2FamilySet;
} }
@ -248,7 +235,7 @@ namespace MED
TErr* theErr, TErr* theErr,
EModeSwitch theMode) EModeSwitch theMode)
{ {
INITMSG(MYDEBUG,"GetKey2Gauss - theMode = "<<theMode<<std::endl); INITMSG("GetKey2Gauss - theMode = "<<theMode<<std::endl);
TKey2Gauss aKey2Gauss; TKey2Gauss aKey2Gauss;
TInt aNbGauss = theWrapper->GetNbGauss(theErr); TInt aNbGauss = theWrapper->GetNbGauss(theErr);
for(TInt anId = 1; anId <= aNbGauss; anId++){ for(TInt anId = 1; anId <= aNbGauss; anId++){
@ -261,10 +248,7 @@ namespace MED
#ifdef _DEBUG_ #ifdef _DEBUG_
const EGeometrieElement& aGeom = boost::get<0>(aKey); const EGeometrieElement& aGeom = boost::get<0>(aKey);
const std::string& aName = boost::get<1>(aKey); const std::string& aName = boost::get<1>(aKey);
INITMSG(MYDEBUG, INITMSG("- aGeom = "<<aGeom<<"; aName = '"<<aName<<"'"<<std::endl);
"- aGeom = "<<aGeom<<
"; aName = '"<<aName<<"'"<<
std::endl);
#endif #endif
} }
@ -295,7 +279,7 @@ namespace MED
TErr* theErr, TErr* theErr,
EModeProfil theMode) EModeProfil theMode)
{ {
INITMSG(MYDEBUG,"GetMKey2Profile - theMode = "<<theMode<<std::endl); INITMSG("GetMKey2Profile - theMode = "<<theMode<<std::endl);
TKey2Profile aKey2Profile; TKey2Profile aKey2Profile;
TInt aNbProfiles = theWrapper->GetNbProfiles(theErr); TInt aNbProfiles = theWrapper->GetNbProfiles(theErr);
for(TInt anId = 1; anId <= aNbProfiles; anId++){ for(TInt anId = 1; anId <= aNbProfiles; anId++){
@ -304,18 +288,16 @@ namespace MED
const std::string& aName = boost::get<0>(aPreInfo); const std::string& aName = boost::get<0>(aPreInfo);
aKey2Profile[aName] = anInfo; aKey2Profile[aName] = anInfo;
#ifdef _DEBUG_ if(SALOME::VerbosityActivated()){
INITMSG(MYDEBUG, INITMSG("- aName = '"<<aName<<"'"<<" : "<<std::endl);
"- aName = '"<<aName<<"'"<<
" : "<<
std::endl);
TInt aNbElem = anInfo->GetSize(); TInt aNbElem = anInfo->GetSize();
for(TInt iElem = 0; iElem < aNbElem; iElem++){
ADDMSG(MYVALUEDEBUG,anInfo->GetElemNum(iElem)<<", ");
}
ADDMSG(MYVALUEDEBUG, std::endl);
#endif
for(TInt iElem = 0; iElem < aNbElem; iElem++){
ADDMSG(anInfo->GetElemNum(iElem)<<", ");
}
ADDMSG(std::endl);
}
} }
return TMKey2Profile(theMode,aKey2Profile); return TMKey2Profile(theMode,aKey2Profile);
} }

111
src/MEDWrapper/MED_GaussUtils.cxx
View File

@ -23,14 +23,6 @@
#include "MED_GaussUtils.hxx" #include "MED_GaussUtils.hxx"
#include "MED_Utilities.hxx" #include "MED_Utilities.hxx"
#ifdef _DEBUG_
static int MYDEBUG = 0;
static int MYVALUEDEBUG = 0;
#else
// static int MYDEBUG = 0; // unused in release mode
// static int MYVALUEDEBUG = 0; // unused in release mode
#endif
namespace MED namespace MED
{ {
//--------------------------------------------------------------- //---------------------------------------------------------------
@ -209,7 +201,7 @@ namespace MED
{ {
TInt aNbRef = theRefCoord.size(); TInt aNbRef = theRefCoord.size();
TInt aNbRef2 = GetNbRef(); TInt aNbRef2 = GetNbRef();
INITMSG(MYDEBUG,"TShapeFun::IsSatisfy "<< INITMSG("TShapeFun::IsSatisfy "<<
"- aNbRef("<<aNbRef<<")"<< "- aNbRef("<<aNbRef<<")"<<
"; aNbRef2("<<aNbRef2<<")\n"); "; aNbRef2("<<aNbRef2<<")\n");
bool anIsSatisfy = (aNbRef == aNbRef2); bool anIsSatisfy = (aNbRef == aNbRef2);
@ -227,27 +219,26 @@ namespace MED
} }
} }
if(!anIsEqual){ if(!anIsEqual){
#ifdef _DEBUG_ if(SALOME::VerbosityActivated()){
TCCoordSlice aCoord = GetCoord(aRefId); TCCoordSlice aCoord = GetCoord(aRefId);
INITMSG(MYDEBUG,aRefId + 1<<": aCoord = {"); INITMSG(aRefId + 1<<": aCoord = {");
TInt aDim = aCoord.size(); TInt aDim = aCoord.size();
for(TInt anId = 0; anId < aDim; anId++) for(TInt anId = 0; anId < aDim; anId++)
ADDMSG(MYDEBUG,"\t"<<aCoord[anId]); ADDMSG("\t"<<aCoord[anId]);
const TCCoordSlice& aCoord2 = theRefCoord[aRefId]; const TCCoordSlice& aCoord2 = theRefCoord[aRefId];
ADDMSG(MYDEBUG,"}\t!=\taCoord2 = {"); ADDMSG("}\t!=\taCoord2 = {");
for(TInt anId = 0; anId < aDim; anId++) for(TInt anId = 0; anId < aDim; anId++)
ADDMSG(MYDEBUG,"\t"<<aCoord2[anId]); ADDMSG("\t"<<aCoord2[anId]);
ADDMSG(MYDEBUG,"}\n"); ADDMSG("}\n");
#endif }
#ifndef _DEBUG_
BEGMSG(MYDEBUG,"anIsSatisfy = "<<anIsSatisfy<<"\n"); BEGMSG("anIsSatisfy = "<<anIsSatisfy<<"\n");
return anIsSatisfy; return anIsSatisfy;
#endif
} }
} }
} }
BEGMSG(MYDEBUG,"anIsSatisfy = "<<anIsSatisfy<<"\n"); BEGMSG("anIsSatisfy = "<<anIsSatisfy<<"\n");
return anIsSatisfy; return anIsSatisfy;
} }
@ -260,7 +251,7 @@ namespace MED
TGaussCoord& theGaussCoord, TGaussCoord& theGaussCoord,
EModeSwitch theMode) EModeSwitch theMode)
{ {
INITMSG(MYDEBUG,"TShapeFun::Eval"<<std::endl); INITMSG("TShapeFun::Eval"<<std::endl);
if(IsSatisfy(theRef)){ if(IsSatisfy(theRef)){
const PMeshInfo& aMeshInfo = theCellInfo.GetMeshInfo(); const PMeshInfo& aMeshInfo = theCellInfo.GetMeshInfo();
@ -280,7 +271,7 @@ namespace MED
InitFun(theRef,theGauss,aFun); InitFun(theRef,theGauss,aFun);
TInt aConnDim = theCellInfo.GetConnDim(); TInt aConnDim = theCellInfo.GetConnDim();
INITMSG(MYDEBUG,"aDim = "<<aDim<< INITMSG("aDim = "<<aDim<<
"; aNbGauss = "<<aNbGauss<< "; aNbGauss = "<<aNbGauss<<
"; aNbElem = "<<aNbElem<< "; aNbElem = "<<aNbElem<<
"; aNbNodes = "<<theNodeInfo.GetNbElem()<< "; aNbNodes = "<<theNodeInfo.GetNbElem()<<
@ -308,29 +299,29 @@ namespace MED
#ifdef _DEBUG_ #ifdef _DEBUG_
{ {
INITMSG(MYVALUEDEBUG,"theGauss: "); INITMSG("theGauss: ");
for(TInt aGaussId = 0; aGaussId < aNbGauss; aGaussId++){ for(TInt aGaussId = 0; aGaussId < aNbGauss; aGaussId++){
TCCoordSlice aCoordSlice = theGauss[aGaussId]; TCCoordSlice aCoordSlice = theGauss[aGaussId];
ADDMSG(MYVALUEDEBUG,"{"); ADDMSG("{");
for(TInt aDimId = 0; aDimId < aDim; aDimId++){ for(TInt aDimId = 0; aDimId < aDim; aDimId++){
ADDMSG(MYVALUEDEBUG,aCoordSlice[aDimId]<<" "); ADDMSG(aCoordSlice[aDimId]<<" ");
} }
ADDMSG(MYVALUEDEBUG,"} "); ADDMSG("} ");
} }
ADDMSG(MYVALUEDEBUG,std::endl); ADDMSG(std::endl);
} }
for(TInt anElemId = 0; anElemId < aNbElem; anElemId++){ for(TInt anElemId = 0; anElemId < aNbElem; anElemId++){
TCCoordSliceArr aCoordSliceArr = theGaussCoord.GetCoordSliceArr(anElemId); TCCoordSliceArr aCoordSliceArr = theGaussCoord.GetCoordSliceArr(anElemId);
INITMSG(MYVALUEDEBUG,""); INITMSG("");
for(TInt aGaussId = 0; aGaussId < aNbGauss; aGaussId++){ for(TInt aGaussId = 0; aGaussId < aNbGauss; aGaussId++){
TCCoordSlice aCoordSlice = aCoordSliceArr[aGaussId]; TCCoordSlice aCoordSlice = aCoordSliceArr[aGaussId];
ADDMSG(MYVALUEDEBUG,"{"); ADDMSG("{");
for(TInt aDimId = 0; aDimId < aDim; aDimId++){ for(TInt aDimId = 0; aDimId < aDim; aDimId++){
ADDMSG(MYVALUEDEBUG,aCoordSlice[aDimId]<<" "); ADDMSG(aCoordSlice[aDimId]<<" ");
} }
ADDMSG(MYVALUEDEBUG,"} "); ADDMSG("} ");
} }
ADDMSG(MYVALUEDEBUG,std::endl); ADDMSG(std::endl);
} }
#endif #endif
return true; return true;
@ -1727,7 +1718,7 @@ namespace MED
const TElemNum& theElemNum, const TElemNum& theElemNum,
EModeSwitch theMode) EModeSwitch theMode)
{ {
INITMSG(MYDEBUG,"GetGaussCoord3D\n"); INITMSG("GetGaussCoord3D\n");
if(theGaussInfo.myGeom == theCellInfo.myGeom){ if(theGaussInfo.myGeom == theCellInfo.myGeom){
EGeometrieElement aGeom = theGaussInfo.myGeom; EGeometrieElement aGeom = theGaussInfo.myGeom;
@ -1744,7 +1735,7 @@ namespace MED
switch(aGeom){ switch(aGeom){
case eSEG2: { case eSEG2: {
INITMSG(MYDEBUG,"eSEG2"<<std::endl); INITMSG("eSEG2"<<std::endl);
if(TSeg2a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode)) if(TSeg2a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode))
return true; return true;
@ -1752,7 +1743,7 @@ namespace MED
break; break;
} }
case eSEG3: { case eSEG3: {
INITMSG(MYDEBUG,"eSEG3"<<std::endl); INITMSG("eSEG3"<<std::endl);
if(TSeg3a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode)) if(TSeg3a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode))
return true; return true;
@ -1760,7 +1751,7 @@ namespace MED
break; break;
} }
case eTRIA3: { case eTRIA3: {
INITMSG(MYDEBUG,"eTRIA3"<<std::endl); INITMSG("eTRIA3"<<std::endl);
if(TTria3a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode)) if(TTria3a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode))
return true; return true;
@ -1771,7 +1762,7 @@ namespace MED
break; break;
} }
case eTRIA6: { case eTRIA6: {
INITMSG(MYDEBUG,"eTRIA6"<<std::endl); INITMSG("eTRIA6"<<std::endl);
if(TTria6a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode)) if(TTria6a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode))
return true; return true;
@ -1782,7 +1773,7 @@ namespace MED
break; break;
} }
case eQUAD4: { case eQUAD4: {
INITMSG(MYDEBUG,"eQUAD4"<<std::endl); INITMSG("eQUAD4"<<std::endl);
if(TQuad4a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode)) if(TQuad4a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode))
return true; return true;
@ -1793,7 +1784,7 @@ namespace MED
break; break;
} }
case eQUAD8: { case eQUAD8: {
INITMSG(MYDEBUG,"eQUAD8"<<std::endl); INITMSG("eQUAD8"<<std::endl);
if(TQuad8a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode)) if(TQuad8a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode))
return true; return true;
@ -1804,7 +1795,7 @@ namespace MED
break; break;
} }
case eQUAD9: { case eQUAD9: {
INITMSG(MYDEBUG,"eQUAD9"<<std::endl); INITMSG("eQUAD9"<<std::endl);
if(TQuad9a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode)) if(TQuad9a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode))
return true; return true;
@ -1815,7 +1806,7 @@ namespace MED
break; break;
} }
case eTETRA4: { case eTETRA4: {
INITMSG(MYDEBUG,"eTETRA4"<<std::endl); INITMSG("eTETRA4"<<std::endl);
if(TTetra4a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode)) if(TTetra4a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode))
return true; return true;
@ -1826,7 +1817,7 @@ namespace MED
break; break;
} }
case ePYRA5: { case ePYRA5: {
INITMSG(MYDEBUG,"ePYRA5"<<std::endl); INITMSG("ePYRA5"<<std::endl);
if(TPyra5a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode)) if(TPyra5a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode))
return true; return true;
@ -1837,7 +1828,7 @@ namespace MED
break; break;
} }
case ePENTA6: { case ePENTA6: {
INITMSG(MYDEBUG,"ePENTA6"<<std::endl); INITMSG("ePENTA6"<<std::endl);
if(TPenta6a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode)) if(TPenta6a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode))
return true; return true;
@ -1848,7 +1839,7 @@ namespace MED
break; break;
} }
case eHEXA8: { case eHEXA8: {
INITMSG(MYDEBUG,"eHEXA8"<<std::endl); INITMSG("eHEXA8"<<std::endl);
if(THexa8a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode)) if(THexa8a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode))
return true; return true;
@ -1859,7 +1850,7 @@ namespace MED
break; break;
} }
case eTETRA10: { case eTETRA10: {
INITMSG(MYDEBUG,"eTETRA10"<<std::endl); INITMSG("eTETRA10"<<std::endl);
if(TTetra10a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode)) if(TTetra10a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode))
return true; return true;
@ -1870,7 +1861,7 @@ namespace MED
break; break;
} }
case ePYRA13: { case ePYRA13: {
INITMSG(MYDEBUG,"ePYRA13"<<std::endl); INITMSG("ePYRA13"<<std::endl);
if(TPyra13a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode)) if(TPyra13a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode))
return true; return true;
@ -1881,7 +1872,7 @@ namespace MED
break; break;
} }
case ePENTA15: { case ePENTA15: {
INITMSG(MYDEBUG,"ePENTA15"<<std::endl); INITMSG("ePENTA15"<<std::endl);
if(TPenta15a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode)) if(TPenta15a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode))
return true; return true;
@ -1892,7 +1883,7 @@ namespace MED
break; break;
} }
case eHEXA20: { case eHEXA20: {
INITMSG(MYDEBUG,"eHEXA20"<<std::endl); INITMSG("eHEXA20"<<std::endl);
if(THexa20a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode)) if(THexa20a().Eval(theCellInfo,theNodeInfo,theElemNum,aRefSlice,aGaussSlice,theGaussCoord,theMode))
return true; return true;
@ -1903,7 +1894,7 @@ namespace MED
break; break;
} }
default: default:
INITMSG(MYDEBUG,"eNONE"<<std::endl); INITMSG("eNONE"<<std::endl);
return false; return false;
} }
} }
@ -1919,7 +1910,7 @@ namespace MED
const TElemNum& theElemNum, const TElemNum& theElemNum,
EModeSwitch theMode) EModeSwitch theMode)
{ {
INITMSG(MYDEBUG,"GetBaryCenter\n"); INITMSG("GetBaryCenter\n");
const PMeshInfo& aMeshInfo = theCellInfo.GetMeshInfo(); const PMeshInfo& aMeshInfo = theCellInfo.GetMeshInfo();
TInt aDim = aMeshInfo->GetDim(); TInt aDim = aMeshInfo->GetDim();
static TInt aNbGauss = 1; static TInt aNbGauss = 1;
@ -1935,7 +1926,7 @@ namespace MED
TInt aConnDim = theCellInfo.GetConnDim(); TInt aConnDim = theCellInfo.GetConnDim();
INITMSGA(MYDEBUG,0, INITMSGA(0,
"- aDim = "<<aDim<< "- aDim = "<<aDim<<
"; aNbGauss = "<<aNbGauss<< "; aNbGauss = "<<aNbGauss<<
"; aNbElem = "<<aNbElem<< "; aNbElem = "<<aNbElem<<
@ -1968,16 +1959,16 @@ namespace MED
#ifdef _DEBUG_ #ifdef _DEBUG_
for(TInt anElemId = 0; anElemId < aNbElem; anElemId++){ for(TInt anElemId = 0; anElemId < aNbElem; anElemId++){
TCoordSliceArr aCoordSliceArr = theGaussCoord.GetCoordSliceArr(anElemId); TCoordSliceArr aCoordSliceArr = theGaussCoord.GetCoordSliceArr(anElemId);
INITMSG(MYVALUEDEBUG,""); INITMSG("");
for(TInt aGaussId = 0; aGaussId < aNbGauss; aGaussId++){ for(TInt aGaussId = 0; aGaussId < aNbGauss; aGaussId++){
TCoordSlice& aCoordSlice = aCoordSliceArr[aGaussId]; TCoordSlice& aCoordSlice = aCoordSliceArr[aGaussId];
ADDMSG(MYVALUEDEBUG,"{"); ADDMSG("{");
for(TInt aDimId = 0; aDimId < aDim; aDimId++){ for(TInt aDimId = 0; aDimId < aDim; aDimId++){
ADDMSG(MYVALUEDEBUG,aCoordSlice[aDimId]<<" "); ADDMSG(aCoordSlice[aDimId]<<" ");
} }
ADDMSG(MYVALUEDEBUG,"} "); ADDMSG("} ");
} }
ADDMSG(MYVALUEDEBUG,std::endl); ADDMSG(std::endl);
} }
#endif #endif
@ -1992,7 +1983,7 @@ namespace MED
const TElemNum& theElemNum, const TElemNum& theElemNum,
EModeSwitch theMode) EModeSwitch theMode)
{ {
INITMSG(MYDEBUG,"GetBaryCenter\n"); INITMSG("GetBaryCenter\n");
const PMeshInfo& aMeshInfo = thePolygoneInfo.GetMeshInfo(); const PMeshInfo& aMeshInfo = thePolygoneInfo.GetMeshInfo();
TInt aDim = aMeshInfo->GetDim(); TInt aDim = aMeshInfo->GetDim();
static TInt aNbGauss = 1; static TInt aNbGauss = 1;
@ -2006,7 +1997,7 @@ namespace MED
theGaussCoord.Init(aNbElem,aNbGauss,aDim,theMode); theGaussCoord.Init(aNbElem,aNbGauss,aDim,theMode);
INITMSGA(MYDEBUG,0, INITMSGA(0,
"- aDim = "<<aDim<< "- aDim = "<<aDim<<
"; aNbGauss = "<<aNbGauss<< "; aNbGauss = "<<aNbGauss<<
"; aNbElem = "<<aNbElem<< "; aNbElem = "<<aNbElem<<
@ -2050,7 +2041,7 @@ namespace MED
const TElemNum& theElemNum, const TElemNum& theElemNum,
EModeSwitch theMode) EModeSwitch theMode)
{ {
INITMSG(MYDEBUG,"GetBaryCenter\n"); INITMSG("GetBaryCenter\n");
const PMeshInfo& aMeshInfo = thePolyedreInfo.GetMeshInfo(); const PMeshInfo& aMeshInfo = thePolyedreInfo.GetMeshInfo();
TInt aDim = aMeshInfo->GetDim(); TInt aDim = aMeshInfo->GetDim();
static TInt aNbGauss = 1; static TInt aNbGauss = 1;
@ -2064,7 +2055,7 @@ namespace MED
theGaussCoord.Init(aNbElem,aNbGauss,aDim,theMode); theGaussCoord.Init(aNbElem,aNbGauss,aDim,theMode);
INITMSGA(MYDEBUG,0, INITMSGA(0,
"- aDim = "<<aDim<< "- aDim = "<<aDim<<
"; aNbGauss = "<<aNbGauss<< "; aNbGauss = "<<aNbGauss<<
"; aNbElem = "<<aNbElem<< "; aNbElem = "<<aNbElem<<

9
src/MEDWrapper/MED_Utilities.cxx
View File

@ -23,12 +23,6 @@
#include "MED_Utilities.hxx" #include "MED_Utilities.hxx"
#include "MED_Common.hxx" #include "MED_Common.hxx"
#ifdef _DEBUG_
static int MYDEBUG = 0;
#else
//static int MYDEBUG = 0; // unused in release mode
#endif
int MED::PrefixPrinter::myCounter = 0; int MED::PrefixPrinter::myCounter = 0;
MED::PrefixPrinter::PrefixPrinter(bool theIsActive): MED::PrefixPrinter::PrefixPrinter(bool theIsActive):
@ -36,7 +30,8 @@ MED::PrefixPrinter::PrefixPrinter(bool theIsActive):
{ {
if(myIsActive) if(myIsActive)
myCounter++; myCounter++;
MSG(MYDEBUG,"MED::PrefixPrinter::PrefixPrinter(...)- "<<myCounter);
MSG("MED::PrefixPrinter::PrefixPrinter(...)- "<<myCounter);
} }
MED::PrefixPrinter::~PrefixPrinter() noexcept(false) MED::PrefixPrinter::~PrefixPrinter() noexcept(false)

19
src/MEDWrapper/MED_Utilities.hxx
View File

@ -24,6 +24,7 @@
#define MED_Utilities_HeaderFile #define MED_Utilities_HeaderFile
#include "MED_WrapperDef.hxx" #include "MED_WrapperDef.hxx"
#include "utilities.h"
#include <iostream> #include <iostream>
#include <sstream> #include <sstream>
@ -45,19 +46,11 @@ namespace MED
}; };
} }
#ifdef _DEBUG_ #define MSG(msg) if(SALOME::VerbosityActivated()) std::cout<<MED::PrefixPrinter::GetPrefix()<<msg<<" ("<<__FILE__<<" ["<<__LINE__<<"])\n"; else (void)0
#define MSG(deb,msg) if(deb) std::cout<<MED::PrefixPrinter::GetPrefix()<<msg<<" ("<<__FILE__<<" ["<<__LINE__<<"])\n" #define BEGMSG(msg) if(SALOME::VerbosityActivated()) std::cout<<MED::PrefixPrinter::GetPrefix()<<msg; else (void)0
#define BEGMSG(deb,msg) if(deb) std::cout<<MED::PrefixPrinter::GetPrefix()<<msg #define INITMSGA(lev,msg) if(SALOME::VerbosityActivated()) { MED::PrefixPrinter aPrefixPrinter_##lev(true); BEGMSG(msg); } else (void)0
#define INITMSGA(deb,lev,msg) MED::PrefixPrinter aPrefixPrinter_##lev(deb); BEGMSG(deb,msg) #define INITMSG(msg) INITMSGA(,msg)
#define INITMSG(deb,msg) INITMSGA(deb,,msg) #define ADDMSG(msg) if(SALOME::VerbosityActivated()) std::cout<<msg; else (void)0
#define ADDMSG(deb,msg) if(deb) std::cout<<msg
#else // _DEBUG_
#define MSG(deb,msg)
#define BEGMSG(deb,msg)
#define INITMSGA(deb,lev,msg)
#define INITMSG(deb,msg)
#define ADDMSG(deb,msg)
#endif // _DEBUG_
#ifndef EXCEPTION #ifndef EXCEPTION

146
src/MEDWrapper/MED_Wrapper.cxx
View File

@ -36,14 +36,6 @@
#include <boost/version.hpp> #include <boost/version.hpp>
#ifdef _DEBUG_
static int MYDEBUG = 0;
static int MYVALUEDEBUG = 0;
#else
// static int MYDEBUG = 0; // unused in release mode
// static int MYVALUEDEBUG = 0; // unused in release mode
#endif
namespace MED namespace MED
{ {
//--------------------------------------------------------------- //---------------------------------------------------------------
@ -56,13 +48,13 @@ namespace MED
#else #else
boost::detail::thread::lock_ops<TWrapper::TMutex>::lock(myWrapper->myMutex); boost::detail::thread::lock_ops<TWrapper::TMutex>::lock(myWrapper->myMutex);
#endif #endif
INITMSG(MYDEBUG, "TLockProxy() - this -"<<this<<"; myWrapper = "<<myWrapper<<std::endl); INITMSG("TLockProxy() - this -"<<this<<"; myWrapper = "<<myWrapper<<std::endl);
} }
TLockProxy TLockProxy
::~TLockProxy() ::~TLockProxy()
{ {
INITMSG(MYDEBUG, "~TLockProxy() - this -"<<this<<"; myWrapper = "<<myWrapper<<std::endl); INITMSG("~TLockProxy() - this -"<<this<<"; myWrapper = "<<myWrapper<<std::endl);
#if BOOST_VERSION >= 103500 #if BOOST_VERSION >= 103500
myWrapper->myMutex.unlock(); myWrapper->myMutex.unlock();
#else #else
@ -168,7 +160,7 @@ namespace MED
void void
Print(SharedPtr<TimeStampValueType> theTimeStampValue) Print(SharedPtr<TimeStampValueType> theTimeStampValue)
{ {
INITMSG(MYDEBUG,"Print - TimeStampValue\n"); INITMSG("Print - TimeStampValue\n");
typename TimeStampValueType::TTGeom2Value& aGeom2Value = theTimeStampValue->myGeom2Value; typename TimeStampValueType::TTGeom2Value& aGeom2Value = theTimeStampValue->myGeom2Value;
typename TimeStampValueType::TTGeom2Value::const_iterator anIter = aGeom2Value.begin(); typename TimeStampValueType::TTGeom2Value::const_iterator anIter = aGeom2Value.begin();
for (; anIter != aGeom2Value.end(); anIter++) { for (; anIter != aGeom2Value.end(); anIter++) {
@ -177,22 +169,22 @@ namespace MED
TInt aNbElem = aMeshValue.myNbElem; TInt aNbElem = aMeshValue.myNbElem;
TInt aNbGauss = aMeshValue.myNbGauss; TInt aNbGauss = aMeshValue.myNbGauss;
TInt aNbComp = aMeshValue.myNbComp; TInt aNbComp = aMeshValue.myNbComp;
INITMSG(MYDEBUG, "aGeom = "<<aGeom<<" - "<<aNbElem<<": "); INITMSG("aGeom = "<<aGeom<<" - "<<aNbElem<<": ");
for (TInt iElem = 0; iElem < aNbElem; iElem++) { for (TInt iElem = 0; iElem < aNbElem; iElem++) {
typename TimeStampValueType::TTMeshValue::TCValueSliceArr aValueSliceArr = typename TimeStampValueType::TTMeshValue::TCValueSliceArr aValueSliceArr =
aMeshValue.GetGaussValueSliceArr(iElem); aMeshValue.GetGaussValueSliceArr(iElem);
ADDMSG(MYVALUEDEBUG, "{"); ADDMSG("{");
for (TInt iGauss = 0; iGauss < aNbGauss; iGauss++) { for (TInt iGauss = 0; iGauss < aNbGauss; iGauss++) {
const typename TimeStampValueType::TTMeshValue::TCValueSlice& aValueSlice = const typename TimeStampValueType::TTMeshValue::TCValueSlice& aValueSlice =
aValueSliceArr[iGauss]; aValueSliceArr[iGauss];
for (TInt iComp = 0; iComp < aNbComp; iComp++) { for (TInt iComp = 0; iComp < aNbComp; iComp++) {
ADDMSG(MYVALUEDEBUG, aValueSlice[iComp]<<" "); ADDMSG(aValueSlice[iComp]<<" ");
} }
ADDMSG(MYVALUEDEBUG, "| "); ADDMSG("| ");
} }
ADDMSG(MYVALUEDEBUG, "} "); ADDMSG("} ");
} }
ADDMSG(MYDEBUG, "\n"); ADDMSG("\n");
} }
} }
@ -341,7 +333,7 @@ namespace MED
//if (aRet == 0) //if (aRet == 0)
// aRet = MEDunvCr(myFile->Id(),&aMeshName); // aRet = MEDunvCr(myFile->Id(),&aMeshName);
INITMSG(MYDEBUG, "TWrapper::SetMeshInfo - MED_MODE_ACCES = "<<theMode<<"; aRet = "<<aRet<<std::endl); INITMSG("TWrapper::SetMeshInfo - MED_MODE_ACCES = "<<theMode<<"; aRet = "<<aRet<<std::endl);
if (theErr) if (theErr)
*theErr = aRet; *theErr = aRet;
@ -529,7 +521,7 @@ namespace MED
aNbGroup, aNbGroup,
&aGroupNames); &aGroupNames);
INITMSG(MYDEBUG, "TWrapper::SetFamilyInfo - MED_MODE_ACCES = "<<theMode<<"; aRet = "<<aRet<<std::endl); INITMSG("TWrapper::SetFamilyInfo - MED_MODE_ACCES = "<<theMode<<"; aRet = "<<aRet<<std::endl);
if (theErr) if (theErr)
*theErr = aRet; *theErr = aRet;
@ -604,13 +596,13 @@ namespace MED
#ifdef _DEBUG_ #ifdef _DEBUG_
std::string aName = anInfo->GetName(); std::string aName = anInfo->GetName();
INITMSG(MYDEBUG, "GetPFamilyInfo - aFamilyName = '"<<aName<< INITMSG("GetPFamilyInfo - aFamilyName = '"<<aName<<
"'; andId = "<<anInfo->GetId()<< "'; andId = "<<anInfo->GetId()<<
"; aNbAttr = "<<aNbAttr<< "; aNbAttr = "<<aNbAttr<<
"; aNbGroup = "<<aNbGroup<<"\n"); "; aNbGroup = "<<aNbGroup<<"\n");
for (TInt iGroup = 0; iGroup < aNbGroup; iGroup++) { for (TInt iGroup = 0; iGroup < aNbGroup; iGroup++) {
aName = anInfo->GetGroupName(iGroup); aName = anInfo->GetGroupName(iGroup);
INITMSG(MYDEBUG, "aGroupName = '"<<aName<<"'\n"); INITMSG("aGroupName = '"<<aName<<"'\n");
} }
#endif #endif
@ -1166,33 +1158,33 @@ namespace MED
#ifdef _DEBUG_ #ifdef _DEBUG_
TInt aDim = theMeshInfo->myDim; TInt aDim = theMeshInfo->myDim;
TInt aNbElem = anInfo->GetNbElem(); TInt aNbElem = anInfo->GetNbElem();
INITMSG(MYDEBUG, "GetPNodeInfo: "); INITMSG("GetPNodeInfo: ");
{ {
INITMSG(MYDEBUG, "aCoords: "<<aNbElem<<": "); INITMSG("aCoords: "<<aNbElem<<": ");
TNodeCoord& aCoord = anInfo->myCoord; TNodeCoord& aCoord = anInfo->myCoord;
for (TInt iElem = 0; iElem < aNbElem; iElem++) { for (TInt iElem = 0; iElem < aNbElem; iElem++) {
for (TInt iDim = 0, anId = iElem*aDim; iDim < aDim; iDim++, anId++) { for (TInt iDim = 0, anId = iElem*aDim; iDim < aDim; iDim++, anId++) {
ADDMSG(MYVALUEDEBUG, aCoord[anId]<<","); ADDMSG(aCoord[anId]<<",");
} }
ADDMSG(MYVALUEDEBUG, " "); ADDMSG(" ");
} }
ADDMSG(MYDEBUG, std::endl); ADDMSG(std::endl);
BEGMSG(MYVALUEDEBUG, "GetFamNum: "); BEGMSG("GetFamNum: ");
for (TInt iElem = 0; iElem < aNbElem; iElem++) { for (TInt iElem = 0; iElem < aNbElem; iElem++) {
ADDMSG(MYVALUEDEBUG, anInfo->GetFamNum(iElem)<<", "); ADDMSG(anInfo->GetFamNum(iElem)<<", ");
} }
ADDMSG(MYVALUEDEBUG, std::endl); ADDMSG(std::endl);
if (anInfo->IsElemNum()) { if (anInfo->IsElemNum()) {
BEGMSG(MYVALUEDEBUG, "GetElemNum: "); BEGMSG("GetElemNum: ");
for (TInt iElem = 0; iElem < aNbElem; iElem++) { for (TInt iElem = 0; iElem < aNbElem; iElem++) {
ADDMSG(MYVALUEDEBUG, anInfo->GetElemNum(iElem)<<", "); ADDMSG(anInfo->GetElemNum(iElem)<<", ");
} }
ADDMSG(MYVALUEDEBUG, std::endl); ADDMSG(std::endl);
} }
} }
ADDMSG(MYDEBUG, std::endl); ADDMSG(std::endl);
#endif #endif
return anInfo; return anInfo;
@ -1549,18 +1541,18 @@ namespace MED
GetPolygoneInfo(anInfo); GetPolygoneInfo(anInfo);
#ifdef _DEBUG_ #ifdef _DEBUG_
INITMSG(MYDEBUG, "GetPPolygoneInfo"<< INITMSG("GetPPolygoneInfo"<<
" - theGeom = "<<theGeom<< " - theGeom = "<<theGeom<<
"; aNbElem = "<<aNbElem<<": "); "; aNbElem = "<<aNbElem<<": ");
for (TInt iElem = 1; iElem < aNbElem; iElem++) { for (TInt iElem = 1; iElem < aNbElem; iElem++) {
TCConnSlice aConnSlice = anInfo->GetConnSlice(iElem); TCConnSlice aConnSlice = anInfo->GetConnSlice(iElem);
TInt aConnDim = aConnSlice.size(); TInt aConnDim = aConnSlice.size();
for (TInt iConn = 0; iConn < aConnDim; iConn++) { for (TInt iConn = 0; iConn < aConnDim; iConn++) {
ADDMSG(MYVALUEDEBUG, aConnSlice[iConn]<<","); ADDMSG(aConnSlice[iConn]<<",");
} }
ADDMSG(MYDEBUG, " "); ADDMSG(" ");
} }
ADDMSG(MYDEBUG, std::endl); ADDMSG(std::endl);
#endif #endif
return anInfo; return anInfo;
@ -1859,25 +1851,25 @@ namespace MED
GetPolyedreInfo(anInfo); GetPolyedreInfo(anInfo);
#ifdef _DEBUG_ #ifdef _DEBUG_
INITMSG(MYDEBUG, "GetPPolyedreInfo"<< INITMSG("GetPPolyedreInfo"<<
" - theGeom = "<<theGeom<< " - theGeom = "<<theGeom<<
"; aNbElem = "<<aNbElem<<": "); "; aNbElem = "<<aNbElem<<": ");
for (TInt iElem = 0; iElem < aNbElem; iElem++) { for (TInt iElem = 0; iElem < aNbElem; iElem++) {
TCConnSliceArr aConnSliceArr = anInfo->GetConnSliceArr(iElem); TCConnSliceArr aConnSliceArr = anInfo->GetConnSliceArr(iElem);
TInt aNbFaces = aConnSliceArr.size(); TInt aNbFaces = aConnSliceArr.size();
ADDMSG(MYDEBUG, "{"); ADDMSG("{");
for (TInt iFace = 0; iFace < aNbFaces; iFace++) { for (TInt iFace = 0; iFace < aNbFaces; iFace++) {
TCConnSlice aConnSlice = aConnSliceArr[iFace]; TCConnSlice aConnSlice = aConnSliceArr[iFace];
TInt aNbConn = aConnSlice.size(); TInt aNbConn = aConnSlice.size();
ADDMSG(MYDEBUG, "["); ADDMSG("[");
for (TInt iConn = 0; iConn < aNbConn; iConn++) { for (TInt iConn = 0; iConn < aNbConn; iConn++) {
ADDMSG(MYVALUEDEBUG, aConnSlice[iConn]<<","); ADDMSG(aConnSlice[iConn]<<",");
} }
ADDMSG(MYDEBUG, "] "); ADDMSG("] ");
} }
ADDMSG(MYDEBUG, "} "); ADDMSG("} ");
} }
ADDMSG(MYDEBUG, std::endl); ADDMSG(std::endl);
#endif #endif
return anInfo; return anInfo;
@ -2281,31 +2273,31 @@ namespace MED
#ifdef _DEBUG_ #ifdef _DEBUG_
TInt aConnDim = anInfo->GetConnDim(); TInt aConnDim = anInfo->GetConnDim();
INITMSG(MYDEBUG, "GetPCellInfo - theEntity = "<<theEntity<<"; theGeom = "<<theGeom<<"; aConnDim: "<<aConnDim<<"\n"); INITMSG("GetPCellInfo - theEntity = "<<theEntity<<"; theGeom = "<<theGeom<<"; aConnDim: "<<aConnDim<<"\n");
BEGMSG(MYDEBUG, "GetPCellInfo - aNbElem: "<<aNbElem<<": "); BEGMSG("GetPCellInfo - aNbElem: "<<aNbElem<<": ");
for (TInt iElem = 0; iElem < aNbElem; iElem++) { for (TInt iElem = 0; iElem < aNbElem; iElem++) {
TCConnSlice aConnSlice = anInfo->GetConnSlice(iElem); TCConnSlice aConnSlice = anInfo->GetConnSlice(iElem);
for (TInt iConn = 0; iConn < aConnDim; iConn++) { for (TInt iConn = 0; iConn < aConnDim; iConn++) {
ADDMSG(MYVALUEDEBUG, aConnSlice[iConn]<<","); ADDMSG(aConnSlice[iConn]<<",");
} }
ADDMSG(MYVALUEDEBUG, " "); ADDMSG(" ");
} }
ADDMSG(MYDEBUG, std::endl); ADDMSG(std::endl);
BEGMSG(MYVALUEDEBUG, "GetPCellInfo - GetFamNum: "); BEGMSG("GetPCellInfo - GetFamNum: ");
for (TInt iElem = 0; iElem < aNbElem; iElem++) { for (TInt iElem = 0; iElem < aNbElem; iElem++) {
ADDMSG(MYVALUEDEBUG, anInfo->GetFamNum(iElem)<<", "); ADDMSG(anInfo->GetFamNum(iElem)<<", ");
} }
ADDMSG(MYVALUEDEBUG, std::endl); ADDMSG(std::endl);
if (anInfo->IsElemNum()) { if (anInfo->IsElemNum()) {
BEGMSG(MYVALUEDEBUG, "GetPCellInfo - GetElemNum: "); BEGMSG("GetPCellInfo - GetElemNum: ");
for (TInt iElem = 0; iElem < aNbElem; iElem++) { for (TInt iElem = 0; iElem < aNbElem; iElem++) {
ADDMSG(MYVALUEDEBUG, anInfo->GetElemNum(iElem)<<", "); ADDMSG(anInfo->GetElemNum(iElem)<<", ");
} }
ADDMSG(MYVALUEDEBUG, std::endl); ADDMSG(std::endl);
} }
ADDMSG(MYDEBUG, std::endl); ADDMSG(std::endl);
#endif #endif
return anInfo; return anInfo;
@ -2688,8 +2680,7 @@ namespace MED
GetFieldInfo(theId, *anInfo, theErr); GetFieldInfo(theId, *anInfo, theErr);
#ifdef _DEBUG_ #ifdef _DEBUG_
INITMSG(MYDEBUG, INITMSG("GetPFieldInfo "<<
"GetPFieldInfo "<<
"- aName = '"<<anInfo->GetName()<<"'"<< "- aName = '"<<anInfo->GetName()<<"'"<<
"; aType = "<<anInfo->GetType()<< "; aType = "<<anInfo->GetType()<<
"; aNbComp = "<<aNbComp<< "; aNbComp = "<<aNbComp<<
@ -2896,14 +2887,12 @@ namespace MED
} }
bool anIsSatisfied =(nval > 0); bool anIsSatisfied =(nval > 0);
if (anIsSatisfied) { if (anIsSatisfied) {
INITMSG(MYDEBUG, INITMSG("GetNbTimeStamps aNbTimeStamps = "<<aNbStamps<<
"GetNbTimeStamps aNbTimeStamps = "<<aNbStamps<<
"; aGeom = "<<aGeom<<"; anEntity = "<<anEntity<<"\n"); "; aGeom = "<<aGeom<<"; anEntity = "<<anEntity<<"\n");
if (anIsPerformAdditionalCheck) { if (anIsPerformAdditionalCheck) {
anIsSatisfied = !strcmp(&aMeshName[0], &aMeshInfo.myName[0]); anIsSatisfied = !strcmp(&aMeshName[0], &aMeshInfo.myName[0]);
if (!anIsSatisfied) { if (!anIsSatisfied) {
INITMSG(MYDEBUG, INITMSG("GetNbTimeStamps aMeshName = '"<<&aMeshName[0]<<"' != "<<
"GetNbTimeStamps aMeshName = '"<<&aMeshName[0]<<"' != "<<
"; aMeshInfo.myName = '"<<&aMeshInfo.myName[0]<<"'\n"); "; aMeshInfo.myName = '"<<&aMeshInfo.myName[0]<<"'\n");
} }
} }
@ -3063,12 +3052,12 @@ namespace MED
GetTimeStampInfo(theId, *anInfo, theErr); GetTimeStampInfo(theId, *anInfo, theErr);
#ifdef _DEBUG_ #ifdef _DEBUG_
INITMSG(MYDEBUG, "GetPTimeStampInfo - anEntity = "<<anInfo->GetEntity()<<"\n"); INITMSG("GetPTimeStampInfo - anEntity = "<<anInfo->GetEntity()<<"\n");
TGeom2NbGauss& aGeom2NbGauss = anInfo->myGeom2NbGauss; TGeom2NbGauss& aGeom2NbGauss = anInfo->myGeom2NbGauss;
TGeom2NbGauss::const_iterator anIter = aGeom2NbGauss.begin(); TGeom2NbGauss::const_iterator anIter = aGeom2NbGauss.begin();
for (; anIter != aGeom2NbGauss.end(); anIter++) { for (; anIter != aGeom2NbGauss.end(); anIter++) {
const EGeometrieElement& aGeom = anIter->first; const EGeometrieElement& aGeom = anIter->first;
INITMSG(MYDEBUG, "aGeom = "<<aGeom<<" - "<<aGeom2NbGauss[aGeom]<<";\n"); INITMSG("aGeom = "<<aGeom<<" - "<<aGeom2NbGauss[aGeom]<<";\n");
} }
#endif #endif
@ -3285,8 +3274,7 @@ namespace MED
aNbComp); aNbComp);
TInt aValueSize = theTimeStampValue->GetValueSize(aGeom); TInt aValueSize = theTimeStampValue->GetValueSize(aGeom);
INITMSG(MYDEBUG, INITMSG("TWrapper::GetTimeStampValue - aGeom = "<<aGeom<<
"TWrapper::GetTimeStampValue - aGeom = "<<aGeom<<
"; aNbVal = "<<aNbVal<< "; aNbVal = "<<aNbVal<<
"; aNbValue = "<<aNbValue<< "; aNbValue = "<<aNbValue<<
"; aNbGauss = "<<aNbGauss<< "; aNbGauss = "<<aNbGauss<<
@ -3476,7 +3464,7 @@ namespace MED
} }
INITMSG(MYDEBUG, "TWrapper::SetTimeStampValue - MED_MODE_ACCES = "<<theMode<<"; aRet = "<<aRet<<std::endl); INITMSG("TWrapper::SetTimeStampValue - MED_MODE_ACCES = "<<theMode<<"; aRet = "<<aRet<<std::endl);
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
@ -3695,29 +3683,29 @@ namespace MED
anInfo->SetGrilleType(type); anInfo->SetGrilleType(type);
#ifdef _DEBUG_ #ifdef _DEBUG_
INITMSG(MYDEBUG, "GetPGrilleInfo: "); INITMSG("GetPGrilleInfo: ");
{ {
TInt aNbElem = anInfo->GetNbNodes(); TInt aNbElem = anInfo->GetNbNodes();
BEGMSG(MYVALUEDEBUG, "GetFamNumNode: "); BEGMSG("GetFamNumNode: ");
for (TInt iElem = 0; iElem < aNbElem; iElem++) { for (TInt iElem = 0; iElem < aNbElem; iElem++) {
ADDMSG(MYVALUEDEBUG, anInfo->GetFamNumNode(iElem)<<", "); ADDMSG(anInfo->GetFamNumNode(iElem)<<", ");
} }
TInt aNbCells = anInfo->GetNbCells(); TInt aNbCells = anInfo->GetNbCells();
BEGMSG(MYVALUEDEBUG, "GetFamNum: "); BEGMSG("GetFamNum: ");
for (TInt iElem = 0; iElem < aNbCells; iElem++) { for (TInt iElem = 0; iElem < aNbCells; iElem++) {
ADDMSG(MYVALUEDEBUG, anInfo->GetFamNum(iElem)<<", "); ADDMSG(anInfo->GetFamNum(iElem)<<", ");
} }
ADDMSG(MYVALUEDEBUG, std::endl); ADDMSG(std::endl);
BEGMSG(MYVALUEDEBUG, "GetCoordName: "); BEGMSG("GetCoordName: ");
for (TInt iElem = 0; iElem < theMeshInfo->GetDim(); iElem++) { for (TInt iElem = 0; iElem < theMeshInfo->GetDim(); iElem++) {
ADDMSG(MYVALUEDEBUG, anInfo->GetCoordName(iElem)<<", "); ADDMSG(anInfo->GetCoordName(iElem)<<", ");
} }
ADDMSG(MYVALUEDEBUG, std::endl); ADDMSG(std::endl);
BEGMSG(MYVALUEDEBUG, "GetCoordUnit: "); BEGMSG("GetCoordUnit: ");
for (TInt iElem = 0; iElem < theMeshInfo->GetDim(); iElem++) { for (TInt iElem = 0; iElem < theMeshInfo->GetDim(); iElem++) {
ADDMSG(MYVALUEDEBUG, anInfo->GetCoordUnit(iElem)<<", "); ADDMSG(anInfo->GetCoordUnit(iElem)<<", ");
} }
ADDMSG(MYVALUEDEBUG, std::endl); ADDMSG(std::endl);
} }
#endif #endif

13
src/OBJECT/SMESH_Actor.cxx
View File

@ -82,11 +82,6 @@
#include "utilities.h" #include "utilities.h"
#ifdef _DEBUG_
static int MYDEBUG = 0;
#else
static int MYDEBUG = 0;
#endif
SMESH_ActorDef* SMESH_ActorDef::New(){ SMESH_ActorDef* SMESH_ActorDef::New(){
return new SMESH_ActorDef(); return new SMESH_ActorDef();
@ -114,7 +109,7 @@ SMESH_Actor* SMESH_Actor::New(TVisualObjPtr theVisualObj,
SMESH_ActorDef::SMESH_ActorDef() SMESH_ActorDef::SMESH_ActorDef()
{ {
if(MYDEBUG) MESSAGE("SMESH_ActorDef - "<<this); MESSAGE("SMESH_ActorDef - "<<this);
SALOME_Actor::SetVisibility(false); // avoid update of pipelines SALOME_Actor::SetVisibility(false); // avoid update of pipelines
@ -589,7 +584,7 @@ SMESH_ActorDef::SMESH_ActorDef()
SMESH_ActorDef::~SMESH_ActorDef() SMESH_ActorDef::~SMESH_ActorDef()
{ {
if(MYDEBUG) MESSAGE("~SMESH_ActorDef - "<<this); MESSAGE("~SMESH_ActorDef - "<<this);
// Please keep the order same as one in the header file // Please keep the order same as one in the header file
@ -1927,7 +1922,7 @@ void SMESH_ActorDef::Render(vtkRenderer* /*ren*/)
void SMESH_ActorDef::Update() void SMESH_ActorDef::Update()
{ {
if(MYDEBUG) MESSAGE("SMESH_ActorDef::Update"); MESSAGE("SMESH_ActorDef::Update");
myVisualObj->Update(); myVisualObj->Update();
@ -2657,7 +2652,7 @@ void SMESH_ActorDef::UpdateFilter()
} }
if ( GetVisibility() ) if ( GetVisibility() )
aFilter->Update(); aFilter->Update();
if (MYDEBUG) MESSAGE(aFilter->GetOutput()->GetNumberOfCells()); MESSAGE(aFilter->GetOutput()->GetNumberOfCells());
} }
#ifndef DISABLE_PLOT2DVIEWER #ifndef DISABLE_PLOT2DVIEWER

5
src/OBJECT/SMESH_ActorUtils.cxx
View File

@ -46,11 +46,6 @@
#include <vtkUnstructuredGridWriter.h> #include <vtkUnstructuredGridWriter.h>
#include <vtkUnsignedCharArray.h> #include <vtkUnsignedCharArray.h>
//#ifdef _DEBUG_
//static int MYDEBUG = 1;
//#else
//static int MYDEBUG = 0;
//#endif
namespace SMESH namespace SMESH
{ {

17
src/OBJECT/SMESH_DeviceActor.cxx
View File

@ -68,11 +68,6 @@
#include "utilities.h" #include "utilities.h"
#ifdef _DEBUG_
static int MYDEBUG = 0;
#else
static int MYDEBUG = 0;
#endif
using namespace std; using namespace std;
@ -83,7 +78,7 @@ vtkStandardNewMacro(SMESH_DeviceActor)
SMESH_DeviceActor SMESH_DeviceActor
::SMESH_DeviceActor() ::SMESH_DeviceActor()
{ {
if(MYDEBUG) MESSAGE("SMESH_DeviceActor - "<<this); MESSAGE("SMESH_DeviceActor - "<<this);
myIsShrinkable = false; myIsShrinkable = false;
myIsShrunk = false; myIsShrunk = false;
@ -140,7 +135,7 @@ SMESH_DeviceActor
SMESH_DeviceActor SMESH_DeviceActor
::~SMESH_DeviceActor() ::~SMESH_DeviceActor()
{ {
if(MYDEBUG) MESSAGE("~SMESH_DeviceActor - "<<this); MESSAGE("~SMESH_DeviceActor - "<<this);
myMapper->Delete(); myMapper->Delete();
// myPlaneCollection->Delete(); -- it is vtkSmartPointer // myPlaneCollection->Delete(); -- it is vtkSmartPointer
@ -851,7 +846,7 @@ SMESH_DeviceActor
anID = myExtractGeometry->GetNodeObjId(theVtkID); anID = myExtractGeometry->GetNodeObjId(theVtkID);
vtkIdType aRetID = myVisualObj->GetNodeObjId(anID); vtkIdType aRetID = myVisualObj->GetNodeObjId(anID);
if(MYDEBUG) MESSAGE("GetNodeObjId - theVtkID = "<<theVtkID<<"; anID = "<<anID<<"; aRetID = "<<aRetID); MESSAGE("GetNodeObjId - theVtkID = "<<theVtkID<<"; anID = "<<anID<<"; aRetID = "<<aRetID);
return aRetID; return aRetID;
} }
@ -862,7 +857,7 @@ SMESH_DeviceActor
vtkDataSet* aDataSet = myMergeFilter->GetOutput(); vtkDataSet* aDataSet = myMergeFilter->GetOutput();
vtkIdType anID = myVisualObj->GetNodeVTKId(theObjID); vtkIdType anID = myVisualObj->GetNodeVTKId(theObjID);
double* aCoord = (anID >=0 && anID < aDataSet->GetNumberOfPoints()) ? aDataSet->GetPoint(anID) : NULL; double* aCoord = (anID >=0 && anID < aDataSet->GetNumberOfPoints()) ? aDataSet->GetPoint(anID) : NULL;
if(MYDEBUG) MESSAGE("GetNodeCoord - theObjID = "<<theObjID<<"; anID = "<<anID); MESSAGE("GetNodeCoord - theObjID = "<<theObjID<<"; anID = "<<anID);
return aCoord; return aCoord;
} }
@ -892,7 +887,7 @@ SMESH_DeviceActor
return -1; return -1;
vtkIdType aRetID = myVisualObj->GetElemObjId(anId3); vtkIdType aRetID = myVisualObj->GetElemObjId(anId3);
if(MYDEBUG)
MESSAGE("GetElemObjId - theVtkID = "<<theVtkID<<"; anId2 = "<<anId2<<"; anId3 = "<<anId3<<"; aRetID = "<<aRetID); MESSAGE("GetElemObjId - theVtkID = "<<theVtkID<<"; anId2 = "<<anId2<<"; anId3 = "<<anId3<<"; aRetID = "<<aRetID);
return aRetID; return aRetID;
} }
@ -904,7 +899,7 @@ SMESH_DeviceActor
vtkDataSet* aDataSet = myVisualObj->GetUnstructuredGrid(); vtkDataSet* aDataSet = myVisualObj->GetUnstructuredGrid();
vtkIdType aGridID = myVisualObj->GetElemVTKId(theObjID); vtkIdType aGridID = myVisualObj->GetElemVTKId(theObjID);
vtkCell* aCell = (aGridID >= 0 ) ? aDataSet->GetCell(aGridID) : NULL; vtkCell* aCell = (aGridID >= 0 ) ? aDataSet->GetCell(aGridID) : NULL;
if(MYDEBUG)
MESSAGE("GetElemCell - theObjID = "<<theObjID<<"; aGridID = "<<aGridID); MESSAGE("GetElemCell - theObjID = "<<theObjID<<"; aGridID = "<<aGridID);
return aCell; return aCell;
} }

6
src/OBJECT/SMESH_ExtractGeometry.cxx
View File

@ -35,12 +35,6 @@
using namespace std; using namespace std;
//#ifdef _DEBUG_
//static int MYDEBUG = 0;
//#else
//static int MYDEBUG = 0;
//#endif
#if defined __GNUC__ #if defined __GNUC__
#if __GNUC__ == 2 #if __GNUC__ == 2
#define __GNUC_2__ #define __GNUC_2__

41
src/OBJECT/SMESH_Object.cxx
View File

@ -67,14 +67,7 @@ using namespace std;
} }
#endif #endif
#ifdef _DEBUG_
static int MYDEBUG = 0;
static int MYDEBUGWITHFILES = 0;//1; static int MYDEBUGWITHFILES = 0;//1;
#else
static int MYDEBUG = 0;
static int MYDEBUGWITHFILES = 0;
#endif
/* /*
Class : SMESH_VisualObjDef Class : SMESH_VisualObjDef
@ -86,7 +79,7 @@ static int MYDEBUGWITHFILES = 0;
//================================================================================= //=================================================================================
SMESH_VisualObjDef::SMESH_VisualObjDef() SMESH_VisualObjDef::SMESH_VisualObjDef()
{ {
if ( MYDEBUG ) MESSAGE("-------------------------------SMESH_VisualObjDef::SMESH_VisualObjDef"); MESSAGE("-------------------------------SMESH_VisualObjDef::SMESH_VisualObjDef");
myGrid = vtkUnstructuredGrid::New(); myGrid = vtkUnstructuredGrid::New();
myLocalGrid = false; myLocalGrid = false;
ClearEntitiesFlags(); ClearEntitiesFlags();
@ -94,8 +87,8 @@ SMESH_VisualObjDef::SMESH_VisualObjDef()
} }
SMESH_VisualObjDef::~SMESH_VisualObjDef() SMESH_VisualObjDef::~SMESH_VisualObjDef()
{ {
if ( MYDEBUG ) MESSAGE("--------------------------------SMESH_VisualObjDef::~SMESH_VisualObjDef"); MESSAGE("--------------------------------SMESH_VisualObjDef::~SMESH_VisualObjDef");
if ( MYDEBUG ) MESSAGE( "myGrid->GetReferenceCount() = " << myGrid->GetReferenceCount() ); MESSAGE( "myGrid->GetReferenceCount() = " << myGrid->GetReferenceCount() );
myGrid->Delete(); myGrid->Delete();
} }
@ -200,7 +193,7 @@ void SMESH_VisualObjDef::createPoints( vtkPoints* thePoints )
//================================================================================= //=================================================================================
void SMESH_VisualObjDef::buildPrs(bool buildGrid) void SMESH_VisualObjDef::buildPrs(bool buildGrid)
{ {
if ( MYDEBUG ) MESSAGE("---------------------------SMESH_VisualObjDef::buildPrs " << buildGrid); MESSAGE("---------------------------SMESH_VisualObjDef::buildPrs " << buildGrid);
if (buildGrid) if (buildGrid)
{ {
myLocalGrid = true; myLocalGrid = true;
@ -234,7 +227,7 @@ void SMESH_VisualObjDef::buildPrs(bool buildGrid)
if (!GetMesh()->IsCompacted()) if (!GetMesh()->IsCompacted())
{ {
NulData(); // detach from the SMDS grid to allow immediate memory de-allocation in compactMesh() NulData(); // detach from the SMDS grid to allow immediate memory de-allocation in compactMesh()
if ( MYDEBUG ) MESSAGE("*** buildPrs ==> compactMesh!"); MESSAGE("*** buildPrs ==> compactMesh!");
GetMesh()->CompactMesh(); GetMesh()->CompactMesh();
if ( SMESHDS_Mesh* m = dynamic_cast<SMESHDS_Mesh*>( GetMesh() )) // IPAL53915 if ( SMESHDS_Mesh* m = dynamic_cast<SMESHDS_Mesh*>( GetMesh() )) // IPAL53915
m->GetScript()->SetModified(false); // drop IsModified set in compactMesh() m->GetScript()->SetModified(false); // drop IsModified set in compactMesh()
@ -309,7 +302,6 @@ void SMESH_VisualObjDef::buildElemPrs()
myGrid->SetPoints( aPoints ); myGrid->SetPoints( aPoints );
aPoints->Delete(); aPoints->Delete();
if ( MYDEBUG )
MESSAGE("Update - myGrid->GetNumberOfPoints() = "<<myGrid->GetNumberOfPoints()); MESSAGE("Update - myGrid->GetNumberOfPoints() = "<<myGrid->GetNumberOfPoints());
// Calculate cells size // Calculate cells size
@ -361,7 +353,7 @@ void SMESH_VisualObjDef::buildElemPrs()
} }
} }
} }
if ( MYDEBUG )
MESSAGE( "Update - aNbCells = "<<aNbCells<<"; aCellsSize = "<<aCellsSize ); MESSAGE( "Update - aNbCells = "<<aNbCells<<"; aCellsSize = "<<aCellsSize );
// Create cells // Create cells
@ -628,7 +620,7 @@ SMESH_MeshObj::SMESH_MeshObj(SMESH::SMESH_Mesh_ptr theMesh):
myClient(SalomeApp_Application::orb(),theMesh) myClient(SalomeApp_Application::orb(),theMesh)
{ {
myEmptyGrid = 0; myEmptyGrid = 0;
if ( MYDEBUG )
MESSAGE("SMESH_MeshObj - this = "<<this<<"; theMesh->_is_nil() = "<<theMesh->_is_nil()); MESSAGE("SMESH_MeshObj - this = "<<this<<"; theMesh->_is_nil() = "<<theMesh->_is_nil());
} }
@ -638,7 +630,6 @@ SMESH_MeshObj::SMESH_MeshObj(SMESH::SMESH_Mesh_ptr theMesh):
//================================================================================= //=================================================================================
SMESH_MeshObj::~SMESH_MeshObj() SMESH_MeshObj::~SMESH_MeshObj()
{ {
if ( MYDEBUG )
MESSAGE("SMESH_MeshObj - this = "<<this<<"\n"); MESSAGE("SMESH_MeshObj - this = "<<this<<"\n");
if ( myEmptyGrid ) if ( myEmptyGrid )
myEmptyGrid->Delete(); myEmptyGrid->Delete();
@ -651,9 +642,9 @@ SMESH_MeshObj::~SMESH_MeshObj()
bool SMESH_MeshObj::Update( int theIsClear ) bool SMESH_MeshObj::Update( int theIsClear )
{ {
// Update SMDS_Mesh on client part // Update SMDS_Mesh on client part
if ( MYDEBUG ) MESSAGE("SMESH_MeshObj::Update " << this); MESSAGE("SMESH_MeshObj::Update " << this);
if ( myClient.Update(theIsClear) || GetUnstructuredGrid()->GetNumberOfPoints()==0) { if ( myClient.Update(theIsClear) || GetUnstructuredGrid()->GetNumberOfPoints()==0) {
if ( MYDEBUG ) MESSAGE("buildPrs"); MESSAGE("buildPrs");
buildPrs(); // Fill unstructured grid buildPrs(); // Fill unstructured grid
return true; return true;
} }
@ -662,7 +653,7 @@ bool SMESH_MeshObj::Update( int theIsClear )
bool SMESH_MeshObj::NulData() bool SMESH_MeshObj::NulData()
{ {
if ( MYDEBUG ) MESSAGE ("SMESH_MeshObj::NulData() ============================================="); MESSAGE ("SMESH_MeshObj::NulData() =============================================");
if (!myEmptyGrid) if (!myEmptyGrid)
{ {
myEmptyGrid = SMDS_UnstructuredGrid::New(); myEmptyGrid = SMDS_UnstructuredGrid::New();
@ -821,7 +812,7 @@ bool SMESH_MeshObj::IsNodePrs() const
//================================================================================= //=================================================================================
SMESH_SubMeshObj::SMESH_SubMeshObj( SMESH_MeshObj* theMeshObj ) SMESH_SubMeshObj::SMESH_SubMeshObj( SMESH_MeshObj* theMeshObj )
{ {
if ( MYDEBUG ) MESSAGE( "SMESH_SubMeshObj - theMeshObj = " << theMeshObj ); MESSAGE( "SMESH_SubMeshObj - theMeshObj = " << theMeshObj );
myMeshObj = theMeshObj; myMeshObj = theMeshObj;
} }
@ -855,7 +846,7 @@ void SMESH_SubMeshObj::UpdateFunctor( const SMESH::Controls::FunctorPtr& theFunc
//================================================================================= //=================================================================================
bool SMESH_SubMeshObj::Update( int theIsClear ) bool SMESH_SubMeshObj::Update( int theIsClear )
{ {
if ( MYDEBUG ) MESSAGE("SMESH_SubMeshObj::Update " << this); MESSAGE("SMESH_SubMeshObj::Update " << this);
bool changed = myMeshObj->Update( theIsClear ); bool changed = myMeshObj->Update( theIsClear );
buildPrs(true); buildPrs(true);
return changed; return changed;
@ -876,13 +867,13 @@ SMESH_GroupObj::SMESH_GroupObj( SMESH::SMESH_GroupBase_ptr theGroup,
: SMESH_SubMeshObj( theMeshObj ), : SMESH_SubMeshObj( theMeshObj ),
myGroupServer( SMESH::SMESH_GroupBase::_duplicate(theGroup) ) myGroupServer( SMESH::SMESH_GroupBase::_duplicate(theGroup) )
{ {
if ( MYDEBUG ) MESSAGE("SMESH_GroupObj - theGroup->_is_nil() = "<<theGroup->_is_nil()); MESSAGE("SMESH_GroupObj - theGroup->_is_nil() = "<<theGroup->_is_nil());
myGroupServer->Register(); myGroupServer->Register();
} }
SMESH_GroupObj::~SMESH_GroupObj() SMESH_GroupObj::~SMESH_GroupObj()
{ {
if ( MYDEBUG ) MESSAGE("~SMESH_GroupObj"); MESSAGE("~SMESH_GroupObj");
myGroupServer->UnRegister(); myGroupServer->UnRegister();
} }
@ -1011,14 +1002,14 @@ SMESH_subMeshObj::SMESH_subMeshObj( SMESH::SMESH_subMesh_ptr theSubMesh,
: SMESH_SubMeshObj( theMeshObj ), : SMESH_SubMeshObj( theMeshObj ),
mySubMeshServer( SMESH::SMESH_subMesh::_duplicate( theSubMesh ) ) mySubMeshServer( SMESH::SMESH_subMesh::_duplicate( theSubMesh ) )
{ {
if ( MYDEBUG ) MESSAGE( "SMESH_subMeshObj - theSubMesh->_is_nil() = " << theSubMesh->_is_nil() ); MESSAGE( "SMESH_subMeshObj - theSubMesh->_is_nil() = " << theSubMesh->_is_nil() );
mySubMeshServer->Register(); mySubMeshServer->Register();
} }
SMESH_subMeshObj::~SMESH_subMeshObj() SMESH_subMeshObj::~SMESH_subMeshObj()
{ {
if ( MYDEBUG ) MESSAGE( "~SMESH_subMeshObj" ); MESSAGE( "~SMESH_subMeshObj" );
mySubMeshServer->UnRegister(); mySubMeshServer->UnRegister();
} }

10
src/OBJECT/SMESH_PreviewActorsCollection.cxx
View File

@ -44,23 +44,17 @@
#include <SUIT_ResourceMgr.h> #include <SUIT_ResourceMgr.h>
#include <SUIT_Session.h> #include <SUIT_Session.h>
#ifdef _DEBUG_
static int MYDEBUG = 0;
#else
static int MYDEBUG = 0;
#endif
SMESH_PreviewActorsCollection::SMESH_PreviewActorsCollection() : SMESH_PreviewActorsCollection::SMESH_PreviewActorsCollection() :
mySelector( 0 ), myRenderer( 0 ), myCurrentChunk( 0 ), myChunkSize( 0 ), myIsShown( true ) mySelector( 0 ), myRenderer( 0 ), myCurrentChunk( 0 ), myChunkSize( 0 ), myIsShown( true )
{ {
if(MYDEBUG) MESSAGE("SMESH_PreviewActorsCollection - "<<this); MESSAGE("SMESH_PreviewActorsCollection - "<<this);
} }
SMESH_PreviewActorsCollection::~SMESH_PreviewActorsCollection() SMESH_PreviewActorsCollection::~SMESH_PreviewActorsCollection()
{ {
if(MYDEBUG) MESSAGE("~SMESH_PreviewActorsCollection - "<<this); MESSAGE("~SMESH_PreviewActorsCollection - "<<this);
clearActors(); clearActors();
} }

30
src/SMESH/SMESH_Mesh.cxx
View File

@ -83,12 +83,6 @@
// maximum stored group name length in MED file // maximum stored group name length in MED file
#define MAX_MED_GROUP_NAME_LENGTH 80 #define MAX_MED_GROUP_NAME_LENGTH 80
#ifdef _DEBUG_
static int MYDEBUG = 0;
#else
static int MYDEBUG = 0;
#endif
#define cSMESH_Hyp(h) static_cast<const SMESH_Hypothesis*>(h) #define cSMESH_Hyp(h) static_cast<const SMESH_Hypothesis*>(h)
typedef SMESH_HypoFilter THypType; typedef SMESH_HypoFilter THypType;
@ -109,7 +103,7 @@ SMESH_Mesh::SMESH_Mesh(int theLocalId,
SMESHDS_Document* theDocument): SMESHDS_Document* theDocument):
_groupId( 0 ), _nbSubShapes( 0 ) _groupId( 0 ), _nbSubShapes( 0 )
{ {
if(MYDEBUG) MESSAGE("SMESH_Mesh::SMESH_Mesh(int localId)"); MESSAGE("SMESH_Mesh::SMESH_Mesh(int localId)");
_id = theLocalId; _id = theLocalId;
_gen = theGen; _gen = theGen;
_document = theDocument; _document = theDocument;
@ -192,7 +186,7 @@ namespace
SMESH_Mesh::~SMESH_Mesh() SMESH_Mesh::~SMESH_Mesh()
{ {
if(MYDEBUG) MESSAGE("SMESH_Mesh::~SMESH_Mesh"); MESSAGE("SMESH_Mesh::~SMESH_Mesh");
if ( _document ) // avoid destructing _meshDS from ~SMESH_Gen() if ( _document ) // avoid destructing _meshDS from ~SMESH_Gen()
_document->RemoveMesh( _id ); _document->RemoveMesh( _id );
@ -276,7 +270,7 @@ SMESH_Mesh* SMESH_Mesh::FindMesh( int meshId ) const
void SMESH_Mesh::ShapeToMesh(const TopoDS_Shape & aShape) void SMESH_Mesh::ShapeToMesh(const TopoDS_Shape & aShape)
{ {
if(MYDEBUG) MESSAGE("SMESH_Mesh::ShapeToMesh"); MESSAGE("SMESH_Mesh::ShapeToMesh");
if ( !aShape.IsNull() && _isShapeToMesh ) { if ( !aShape.IsNull() && _isShapeToMesh ) {
if ( aShape.ShapeType() != TopAbs_COMPOUND && // group contents is allowed to change if ( aShape.ShapeType() != TopAbs_COMPOUND && // group contents is allowed to change
@ -638,7 +632,7 @@ SMESH_Mesh::AddHypothesis(const TopoDS_Shape & aSubShape,
int anHypId, int anHypId,
std::string* anError ) std::string* anError )
{ {
if(MYDEBUG) MESSAGE("SMESH_Mesh::AddHypothesis"); MESSAGE("SMESH_Mesh::AddHypothesis");
if ( anError ) if ( anError )
anError->clear(); anError->clear();
@ -662,7 +656,7 @@ SMESH_Mesh::AddHypothesis(const TopoDS_Shape & aSubShape,
std::string hypName = anHyp->GetName(); std::string hypName = anHyp->GetName();
if ( hypName == "NotConformAllowed" ) if ( hypName == "NotConformAllowed" )
{ {
if(MYDEBUG) MESSAGE( "Hypothesis <NotConformAllowed> can be only global" ); MESSAGE( "Hypothesis <NotConformAllowed> can be only global" );
return SMESH_Hypothesis::HYP_INCOMPATIBLE; return SMESH_Hypothesis::HYP_INCOMPATIBLE;
} }
} }
@ -717,8 +711,8 @@ SMESH_Mesh::AddHypothesis(const TopoDS_Shape & aSubShape,
HasModificationsToDiscard(); // to reset _isModified flag if a mesh becomes empty HasModificationsToDiscard(); // to reset _isModified flag if a mesh becomes empty
GetMeshDS()->Modified(); GetMeshDS()->Modified();
if(MYDEBUG) subMesh->DumpAlgoState(true); if(SALOME::VerbosityActivated()) subMesh->DumpAlgoState(true);
if(MYDEBUG) SCRUTE(ret); SCRUTE(ret);
return ret; return ret;
} }
@ -732,14 +726,14 @@ SMESH_Hypothesis::Hypothesis_Status
SMESH_Mesh::RemoveHypothesis(const TopoDS_Shape & aSubShape, SMESH_Mesh::RemoveHypothesis(const TopoDS_Shape & aSubShape,
int anHypId) int anHypId)
{ {
if(MYDEBUG) MESSAGE("SMESH_Mesh::RemoveHypothesis"); MESSAGE("SMESH_Mesh::RemoveHypothesis");
StudyContextStruct *sc = _gen->GetStudyContext(); StudyContextStruct *sc = _gen->GetStudyContext();
if (sc->mapHypothesis.find(anHypId) == sc->mapHypothesis.end()) if (sc->mapHypothesis.find(anHypId) == sc->mapHypothesis.end())
throw SALOME_Exception(LOCALIZED("hypothesis does not exist")); throw SALOME_Exception(LOCALIZED("hypothesis does not exist"));
SMESH_Hypothesis *anHyp = sc->mapHypothesis[anHypId]; SMESH_Hypothesis *anHyp = sc->mapHypothesis[anHypId];
if(MYDEBUG) { SCRUTE(anHyp->GetType()); } SCRUTE(anHyp->GetType());
// shape // shape
@ -787,8 +781,8 @@ SMESH_Mesh::RemoveHypothesis(const TopoDS_Shape & aSubShape,
HasModificationsToDiscard(); // to reset _isModified flag if mesh become empty HasModificationsToDiscard(); // to reset _isModified flag if mesh become empty
GetMeshDS()->Modified(); GetMeshDS()->Modified();
if(MYDEBUG) subMesh->DumpAlgoState(true); if(SALOME::VerbosityActivated()) subMesh->DumpAlgoState(true);
if(MYDEBUG) SCRUTE(ret); SCRUTE(ret);
return ret; return ret;
} }
@ -2027,7 +2021,7 @@ int SMESH_Mesh::NbMeshes() const // nb meshes in the Study
bool SMESH_Mesh::IsNotConformAllowed() const bool SMESH_Mesh::IsNotConformAllowed() const
{ {
if(MYDEBUG) MESSAGE("SMESH_Mesh::IsNotConformAllowed"); MESSAGE("SMESH_Mesh::IsNotConformAllowed");
static SMESH_HypoFilter filter( SMESH_HypoFilter::HasName( "NotConformAllowed" )); static SMESH_HypoFilter filter( SMESH_HypoFilter::HasName( "NotConformAllowed" ));
return GetHypothesis( _meshDS->ShapeToMesh(), filter, false ); return GetHypothesis( _meshDS->ShapeToMesh(), filter, false );

22
src/SMESHClient/SMESH_Client.cxx
View File

@ -59,12 +59,6 @@
} }
#endif #endif
#ifdef _DEBUG_
static int MYDEBUG = 0;
#else
static int MYDEBUG = 0;
#endif
namespace namespace
{ {
using std::runtime_error; using std::runtime_error;
@ -829,19 +823,19 @@ SMESH_Client::SMESH_Client(CORBA::ORB_ptr theORB,
mySMESHDSMesh(NULL), mySMESHDSMesh(NULL),
mySMDSMesh(NULL) mySMDSMesh(NULL)
{ {
if ( MYDEBUG ) MESSAGE("SMESH_Client::SMESH_Client"); MESSAGE("SMESH_Client::SMESH_Client");
myMeshServer->Register(); myMeshServer->Register();
CORBA::Boolean anIsEmbeddedMode; CORBA::Boolean anIsEmbeddedMode;
GetSMESHGen(theORB,anIsEmbeddedMode); GetSMESHGen(theORB,anIsEmbeddedMode);
if(anIsEmbeddedMode){ if(anIsEmbeddedMode){
if ( MYDEBUG ) MESSAGE("Info: The same process, update mesh by pointer "); MESSAGE("Info: The same process, update mesh by pointer ");
// just set client mesh pointer to server mesh pointer // just set client mesh pointer to server mesh pointer
//SMESH_Mesh* aMesh = reinterpret_cast<SMESH_Mesh*>(theMesh->GetMeshPtr()); //SMESH_Mesh* aMesh = reinterpret_cast<SMESH_Mesh*>(theMesh->GetMeshPtr());
CORBA::LongLong pointeur = theMesh->GetMeshPtr(); CORBA::LongLong pointeur = theMesh->GetMeshPtr();
if( MYDEBUG ) MESSAGE("SMESH_Client::SMESH_Client pointeur "<<pointeur); MESSAGE("SMESH_Client::SMESH_Client pointeur "<<pointeur);
SMESH_Mesh* aMesh = reinterpret_cast<SMESH_Mesh*> (pointeur); SMESH_Mesh* aMesh = reinterpret_cast<SMESH_Mesh*> (pointeur);
if ( MYDEBUG ) MESSAGE("SMESH_Client::SMESH_Client aMesh "<<aMesh); MESSAGE("SMESH_Client::SMESH_Client aMesh "<<aMesh);
//if(aMesh->GetMeshDS()->IsEmbeddedMode()){ //if(aMesh->GetMeshDS()->IsEmbeddedMode()){
if(anIsEmbeddedMode){ if(anIsEmbeddedMode){
mySMESHDSMesh = aMesh->GetMeshDS(); mySMESHDSMesh = aMesh->GetMeshDS();
@ -899,18 +893,18 @@ SMESH_Client::Update(bool theIsClear)
bool anIsModified = true; bool anIsModified = true;
if(mySMESHDSMesh) if(mySMESHDSMesh)
{ {
if ( MYDEBUG ) MESSAGE("Update mySMESHDSMesh"); MESSAGE("Update mySMESHDSMesh");
SMESHDS_Script* aScript = mySMESHDSMesh->GetScript(); SMESHDS_Script* aScript = mySMESHDSMesh->GetScript();
anIsModified = aScript->IsModified(); anIsModified = aScript->IsModified();
aScript->SetModified(false); aScript->SetModified(false);
} }
else else
{ {
if ( MYDEBUG ) MESSAGE("Update CORBA"); MESSAGE("Update CORBA");
SMESH::log_array_var aSeq = myMeshServer->GetLog( theIsClear ); SMESH::log_array_var aSeq = myMeshServer->GetLog( theIsClear );
CORBA::Long aLength = aSeq->length(); CORBA::Long aLength = aSeq->length();
anIsModified = aLength > 0; anIsModified = aLength > 0;
if ( MYDEBUG ) MESSAGE( "Update: length of the script is "<<aLength ); MESSAGE( "Update: length of the script is "<<aLength );
if ( !anIsModified ) if ( !anIsModified )
return false; return false;
@ -1021,7 +1015,7 @@ SMESH_Client::Update(bool theIsClear)
INFOS("Unknown exception was cought !!!"); INFOS("Unknown exception was cought !!!");
} }
if ( MYDEBUG && mySMDSMesh ) if (mySMDSMesh )
{ {
MESSAGE("Update - mySMDSMesh->NbNodes() = "<<mySMDSMesh->NbNodes()); MESSAGE("Update - mySMDSMesh->NbNodes() = "<<mySMDSMesh->NbNodes());
MESSAGE("Update - mySMDSMesh->Nb0DElements() = "<<mySMDSMesh->Nb0DElements()); MESSAGE("Update - mySMDSMesh->Nb0DElements() = "<<mySMDSMesh->Nb0DElements());

30
src/SMESHGUI/SMESHGUI_HypothesesUtils.cxx
View File

@ -81,12 +81,6 @@
#define env_sep ":" #define env_sep ":"
#endif // WIN32 #endif // WIN32
#ifdef _DEBUG_
static int MYDEBUG = 0;
#else
static int MYDEBUG = 0;
#endif
namespace SMESH namespace SMESH
{ {
typedef IMap<QString,HypothesisData*> THypothesisDataMap; typedef IMap<QString,HypothesisData*> THypothesisDataMap;
@ -497,7 +491,7 @@ namespace SMESH
SMESHGUI_GenericHypothesisCreator* GetHypothesisCreator(const QString& aHypType) SMESHGUI_GenericHypothesisCreator* GetHypothesisCreator(const QString& aHypType)
{ {
if(MYDEBUG) MESSAGE("Get HypothesisCreator for " << aHypType.toLatin1().data()); MESSAGE("Get HypothesisCreator for " << aHypType.toLatin1().data());
SMESHGUI_GenericHypothesisCreator* aCreator = 0; SMESHGUI_GenericHypothesisCreator* aCreator = 0;
@ -522,7 +516,7 @@ namespace SMESH
// 3. Load Client Plugin Library // 3. Load Client Plugin Library
try { try {
// load plugin library // load plugin library
if(MYDEBUG) MESSAGE("Loading client meshers plugin library ..."); MESSAGE("Loading client meshers plugin library ...");
#ifdef WIN32 #ifdef WIN32
#ifdef UNICODE #ifdef UNICODE
LPTSTR path = new TCHAR[aClientLibName.length() + 1]; LPTSTR path = new TCHAR[aClientLibName.length() + 1];
@ -552,21 +546,21 @@ namespace SMESH
} }
else { else {
// get method, returning hypothesis creator // get method, returning hypothesis creator
if(MYDEBUG) MESSAGE("Find GetHypothesisCreator() method ..."); MESSAGE("Find GetHypothesisCreator() method ...");
typedef SMESHGUI_GenericHypothesisCreator* (*GetHypothesisCreator) \ typedef SMESHGUI_GenericHypothesisCreator* (*GetHypothesisCreator) \
( const QString& ); ( const QString& );
GetHypothesisCreator procHandle = GetHypothesisCreator procHandle =
(GetHypothesisCreator)GetProc(libHandle, "GetHypothesisCreator"); (GetHypothesisCreator)GetProc(libHandle, "GetHypothesisCreator");
if (!procHandle) { if (!procHandle) {
if(MYDEBUG) MESSAGE("bad hypothesis client plugin library"); MESSAGE("bad hypothesis client plugin library");
UnLoadLib(libHandle); UnLoadLib(libHandle);
} }
else { else {
// get hypothesis creator // get hypothesis creator
if(MYDEBUG) MESSAGE("Get Hypothesis Creator for " << aHypType.toLatin1().data()); MESSAGE("Get Hypothesis Creator for " << aHypType.toLatin1().data());
aCreator = procHandle( aHypType ); aCreator = procHandle( aHypType );
if (!aCreator) { if (!aCreator) {
if(MYDEBUG) MESSAGE("no such a hypothesis in this plugin"); MESSAGE("no such a hypothesis in this plugin");
} }
else { else {
// map hypothesis creator to a hypothesis name // map hypothesis creator to a hypothesis name
@ -595,7 +589,7 @@ namespace SMESH
const QString& aHypName, const QString& aHypName,
const bool /*isAlgo*/) const bool /*isAlgo*/)
{ {
if(MYDEBUG) MESSAGE("Create " << aHypType.toLatin1().data() << MESSAGE("Create " << aHypType.toLatin1().data() <<
" with name " << aHypName.toLatin1().data()); " with name " << aHypName.toLatin1().data());
HypothesisData* aHypData = GetHypothesisData(aHypType); HypothesisData* aHypData = GetHypothesisData(aHypType);
QString aServLib = aHypData->ServerLibName; QString aServLib = aHypData->ServerLibName;
@ -641,7 +635,7 @@ namespace SMESH
bool AddHypothesisOnMesh (SMESH::SMESH_Mesh_ptr aMesh, SMESH::SMESH_Hypothesis_ptr aHyp) bool AddHypothesisOnMesh (SMESH::SMESH_Mesh_ptr aMesh, SMESH::SMESH_Hypothesis_ptr aHyp)
{ {
if(MYDEBUG) MESSAGE ("SMESHGUI::AddHypothesisOnMesh"); MESSAGE ("SMESHGUI::AddHypothesisOnMesh");
int res = SMESH::HYP_UNKNOWN_FATAL; int res = SMESH::HYP_UNKNOWN_FATAL;
SUIT_OverrideCursor wc; SUIT_OverrideCursor wc;
@ -669,7 +663,7 @@ namespace SMESH
bool AddHypothesisOnSubMesh (SMESH::SMESH_subMesh_ptr aSubMesh, SMESH::SMESH_Hypothesis_ptr aHyp) bool AddHypothesisOnSubMesh (SMESH::SMESH_subMesh_ptr aSubMesh, SMESH::SMESH_Hypothesis_ptr aHyp)
{ {
if(MYDEBUG) MESSAGE("SMESHGUI::AddHypothesisOnSubMesh() "); MESSAGE("SMESHGUI::AddHypothesisOnSubMesh() ");
int res = SMESH::HYP_UNKNOWN_FATAL; int res = SMESH::HYP_UNKNOWN_FATAL;
SUIT_OverrideCursor wc; SUIT_OverrideCursor wc;
@ -797,7 +791,7 @@ namespace SMESH
if (SO_Hypothesis) { if (SO_Hypothesis) {
SObjectList listSO = SMESH::getStudy()->FindDependances(SO_Hypothesis); SObjectList listSO = SMESH::getStudy()->FindDependances(SO_Hypothesis);
if(MYDEBUG) MESSAGE("SMESHGUI::GetMeshesUsingAlgoOrHypothesis(): dependency number ="<<listSO.size()); MESSAGE("SMESHGUI::GetMeshesUsingAlgoOrHypothesis(): dependency number ="<<listSO.size());
for (unsigned int i = 0; i < listSO.size(); i++) { for (unsigned int i = 0; i < listSO.size(); i++) {
_PTR(SObject) SO = listSO[i]; _PTR(SObject) SO = listSO[i];
if (SO) { if (SO) {
@ -805,7 +799,7 @@ namespace SMESH
if (aFather) { if (aFather) {
_PTR(SObject) SOfatherFather = aFather->GetFather(); _PTR(SObject) SOfatherFather = aFather->GetFather();
if (SOfatherFather) { if (SOfatherFather) {
if(MYDEBUG) MESSAGE("SMESHGUI::GetMeshesUsingAlgoOrHypothesis(): dependency added to list"); MESSAGE("SMESHGUI::GetMeshesUsingAlgoOrHypothesis(): dependency added to list");
index++; index++;
listSOmesh.resize(index); listSOmesh.resize(index);
listSOmesh[index - 1] = SOfatherFather; listSOmesh[index - 1] = SOfatherFather;
@ -815,7 +809,7 @@ namespace SMESH
} }
} }
} }
if (MYDEBUG) MESSAGE("SMESHGUI::GetMeshesUsingAlgoOrHypothesis(): completed"); MESSAGE("SMESHGUI::GetMeshesUsingAlgoOrHypothesis(): completed");
return listSOmesh; return listSOmesh;
} }

87
src/SMESH_I/SMESH_Gen_i.cxx
View File

@ -154,12 +154,6 @@ using SMESH::TVar;
#define NUM_TMP_FILES 2 #define NUM_TMP_FILES 2
#ifdef _DEBUG_
static int MYDEBUG = 0;
#else
static int MYDEBUG = 0;
#endif
// Static variables definition // Static variables definition
GEOM::GEOM_Gen_var SMESH_Gen_i::myGeomGen; GEOM::GEOM_Gen_var SMESH_Gen_i::myGeomGen;
CORBA::ORB_var SMESH_Gen_i::myOrb; CORBA::ORB_var SMESH_Gen_i::myOrb;
@ -448,7 +442,7 @@ GenericHypothesisCreator_i* SMESH_Gen_i::getHypothesisCreator(const char* theHyp
thePlatformLibName = aPlatformLibName; thePlatformLibName = aPlatformLibName;
Unexpect aCatch(SALOME_SalomeException); Unexpect aCatch(SALOME_SalomeException);
if(MYDEBUG) MESSAGE( "Create Hypothesis <" << theHypName << "> from " << aPlatformLibName); MESSAGE( "Create Hypothesis <" << theHypName << "> from " << aPlatformLibName);
typedef GenericHypothesisCreator_i* (*GetHypothesisCreator)(const char* ); typedef GenericHypothesisCreator_i* (*GetHypothesisCreator)(const char* );
GenericHypothesisCreator_i* aCreator; GenericHypothesisCreator_i* aCreator;
@ -458,7 +452,7 @@ GenericHypothesisCreator_i* SMESH_Gen_i::getHypothesisCreator(const char* theHyp
if (myHypCreatorMap.find(string(theHypName)) == myHypCreatorMap.end()) if (myHypCreatorMap.find(string(theHypName)) == myHypCreatorMap.end())
{ {
// load plugin library // load plugin library
if(MYDEBUG) MESSAGE("Loading server meshers plugin library ..."); MESSAGE("Loading server meshers plugin library ...");
#ifdef WIN32 #ifdef WIN32
# ifdef UNICODE # ifdef UNICODE
const wchar_t* path = Kernel_Utils::decode_s(aPlatformLibName); const wchar_t* path = Kernel_Utils::decode_s(aPlatformLibName);
@ -484,7 +478,7 @@ GenericHypothesisCreator_i* SMESH_Gen_i::getHypothesisCreator(const char* theHyp
} }
// get method, returning hypothesis creator // get method, returning hypothesis creator
if(MYDEBUG) MESSAGE("Find GetHypothesisCreator() method ..."); MESSAGE("Find GetHypothesisCreator() method ...");
GetHypothesisCreator procHandle = GetHypothesisCreator procHandle =
(GetHypothesisCreator)GetProc( libHandle, "GetHypothesisCreator" ); (GetHypothesisCreator)GetProc( libHandle, "GetHypothesisCreator" );
if (!procHandle) if (!procHandle)
@ -495,7 +489,7 @@ GenericHypothesisCreator_i* SMESH_Gen_i::getHypothesisCreator(const char* theHyp
} }
// get hypothesis creator // get hypothesis creator
if(MYDEBUG) MESSAGE("Get Hypothesis Creator for " << theHypName); MESSAGE("Get Hypothesis Creator for " << theHypName);
aCreator = procHandle(theHypName); aCreator = procHandle(theHypName);
if (!aCreator) if (!aCreator)
{ {
@ -546,8 +540,7 @@ SMESH::SMESH_Hypothesis_ptr SMESH_Gen_i::createHypothesis(const char* theHypName
// activate the CORBA servant of hypothesis // activate the CORBA servant of hypothesis
hypothesis_i = myHypothesis_i->_this(); hypothesis_i = myHypothesis_i->_this();
int nextId = RegisterObject( hypothesis_i ); int nextId = RegisterObject( hypothesis_i );
if(MYDEBUG) { MESSAGE( "Add hypo to map with id = "<< nextId ); } MESSAGE( "Add hypo to map with id = "<< nextId );
else { (void)nextId; } // avoid "unused variable" warning in release mode
} }
return hypothesis_i._retn(); return hypothesis_i._retn();
} }
@ -563,21 +556,21 @@ SMESH::SMESH_Hypothesis_ptr SMESH_Gen_i::createHypothesis(const char* theHypName
SMESH::SMESH_Mesh_ptr SMESH_Gen_i::createMesh() SMESH::SMESH_Mesh_ptr SMESH_Gen_i::createMesh()
{ {
Unexpect aCatch(SALOME_SalomeException); Unexpect aCatch(SALOME_SalomeException);
if(MYDEBUG) MESSAGE( "SMESH_Gen_i::createMesh" ); MESSAGE( "SMESH_Gen_i::createMesh" );
// Get or create the GEOM_Client instance // Get or create the GEOM_Client instance
try { try {
// create a new mesh object servant, store it in a map in study context // create a new mesh object servant, store it in a map in study context
SMESH_Mesh_i* meshServant = new SMESH_Mesh_i( GetPOA(), this ); SMESH_Mesh_i* meshServant = new SMESH_Mesh_i( GetPOA(), this );
// create a new mesh object // create a new mesh object
if(MYDEBUG) MESSAGE("myIsEmbeddedMode " << myIsEmbeddedMode); MESSAGE("myIsEmbeddedMode " << myIsEmbeddedMode);
meshServant->SetImpl( myGen.CreateMesh( myIsEmbeddedMode )); meshServant->SetImpl( myGen.CreateMesh( myIsEmbeddedMode ));
// activate the CORBA servant of Mesh // activate the CORBA servant of Mesh
SMESH::SMESH_Mesh_var mesh = SMESH::SMESH_Mesh::_narrow( meshServant->_this() ); SMESH::SMESH_Mesh_var mesh = SMESH::SMESH_Mesh::_narrow( meshServant->_this() );
int nextId = RegisterObject( mesh ); int nextId = RegisterObject( mesh );
if(MYDEBUG) { MESSAGE( "Add mesh to map with id = "<< nextId); } MESSAGE( "Add mesh to map with id = "<< nextId);
else { (void)nextId; } // avoid "unused variable" warning in release mode
return mesh._retn(); return mesh._retn();
} }
catch (SALOME_Exception& S_ex) { catch (SALOME_Exception& S_ex) {
@ -1193,7 +1186,7 @@ char* SMESH_Gen_i::GetOption(const char* name)
SMESH::SMESH_Mesh_ptr SMESH_Gen_i::CreateMesh( GEOM::GEOM_Object_ptr theShapeObject ) SMESH::SMESH_Mesh_ptr SMESH_Gen_i::CreateMesh( GEOM::GEOM_Object_ptr theShapeObject )
{ {
Unexpect aCatch(SALOME_SalomeException); Unexpect aCatch(SALOME_SalomeException);
if(MYDEBUG) MESSAGE( "SMESH_Gen_i::CreateMesh" ); MESSAGE( "SMESH_Gen_i::CreateMesh" );
// create mesh // create mesh
SMESH::SMESH_Mesh_var mesh = this->createMesh(); SMESH::SMESH_Mesh_var mesh = this->createMesh();
// set shape // set shape
@ -1227,7 +1220,7 @@ SMESH::SMESH_Mesh_ptr SMESH_Gen_i::CreateMesh( GEOM::GEOM_Object_ptr theShapeObj
SMESH::SMESH_Mesh_ptr SMESH_Gen_i::CreateEmptyMesh() SMESH::SMESH_Mesh_ptr SMESH_Gen_i::CreateEmptyMesh()
{ {
Unexpect aCatch(SALOME_SalomeException); Unexpect aCatch(SALOME_SalomeException);
if(MYDEBUG) MESSAGE( "SMESH_Gen_i::CreateMesh" ); MESSAGE( "SMESH_Gen_i::CreateMesh" );
// create mesh // create mesh
SMESH::SMESH_Mesh_var mesh = this->createMesh(); SMESH::SMESH_Mesh_var mesh = this->createMesh();
@ -1579,7 +1572,7 @@ CORBA::Boolean SMESH_Gen_i::IsReadyToCompute( SMESH::SMESH_Mesh_ptr theMesh,
GEOM::GEOM_Object_ptr theShapeObject ) GEOM::GEOM_Object_ptr theShapeObject )
{ {
Unexpect aCatch(SALOME_SalomeException); Unexpect aCatch(SALOME_SalomeException);
if(MYDEBUG) MESSAGE( "SMESH_Gen_i::IsReadyToCompute" ); MESSAGE( "SMESH_Gen_i::IsReadyToCompute" );
if ( CORBA::is_nil( theShapeObject ) ) if ( CORBA::is_nil( theShapeObject ) )
THROW_SALOME_CORBA_EXCEPTION( "bad shape object reference", THROW_SALOME_CORBA_EXCEPTION( "bad shape object reference",
@ -1653,7 +1646,7 @@ SMESH::compute_error_array* SMESH_Gen_i::GetComputeErrors( SMESH::SMESH_Mesh_ptr
GEOM::GEOM_Object_ptr theSubObject ) GEOM::GEOM_Object_ptr theSubObject )
{ {
Unexpect aCatch(SALOME_SalomeException); Unexpect aCatch(SALOME_SalomeException);
if(MYDEBUG) MESSAGE( "SMESH_Gen_i::GetComputeErrors()" ); MESSAGE( "SMESH_Gen_i::GetComputeErrors()" );
if ( CORBA::is_nil( theSubObject ) && theMesh->HasShapeToMesh()) if ( CORBA::is_nil( theSubObject ) && theMesh->HasShapeToMesh())
THROW_SALOME_CORBA_EXCEPTION( "bad shape object reference", SALOME::BAD_PARAM ); THROW_SALOME_CORBA_EXCEPTION( "bad shape object reference", SALOME::BAD_PARAM );
@ -1727,7 +1720,7 @@ SMESH_Gen_i::GetBadInputElements( SMESH::SMESH_Mesh_ptr theMesh,
CORBA::Short theSubShapeID ) CORBA::Short theSubShapeID )
{ {
Unexpect aCatch(SALOME_SalomeException); Unexpect aCatch(SALOME_SalomeException);
if(MYDEBUG) MESSAGE( "SMESH_Gen_i::GetBadInputElements()" ); MESSAGE( "SMESH_Gen_i::GetBadInputElements()" );
if ( CORBA::is_nil( theMesh ) ) if ( CORBA::is_nil( theMesh ) )
THROW_SALOME_CORBA_EXCEPTION( "bad Mesh reference",SALOME::BAD_PARAM ); THROW_SALOME_CORBA_EXCEPTION( "bad Mesh reference",SALOME::BAD_PARAM );
@ -1848,7 +1841,7 @@ SMESH::algo_error_array* SMESH_Gen_i::GetAlgoState( SMESH::SMESH_Mesh_ptr theMes
GEOM::GEOM_Object_ptr theSubObject ) GEOM::GEOM_Object_ptr theSubObject )
{ {
Unexpect aCatch(SALOME_SalomeException); Unexpect aCatch(SALOME_SalomeException);
if(MYDEBUG) MESSAGE( "SMESH_Gen_i::GetAlgoState()" ); MESSAGE( "SMESH_Gen_i::GetAlgoState()" );
if ( CORBA::is_nil( theSubObject ) && theMesh->HasShapeToMesh()) if ( CORBA::is_nil( theSubObject ) && theMesh->HasShapeToMesh())
THROW_SALOME_CORBA_EXCEPTION( "bad shape object reference", SALOME::BAD_PARAM ); THROW_SALOME_CORBA_EXCEPTION( "bad shape object reference", SALOME::BAD_PARAM );
@ -1909,7 +1902,7 @@ SMESH_Gen_i::GetSubShapesId( GEOM::GEOM_Object_ptr theMainShapeObject,
const SMESH::object_array& theListOfSubShapeObject ) const SMESH::object_array& theListOfSubShapeObject )
{ {
Unexpect aCatch(SALOME_SalomeException); Unexpect aCatch(SALOME_SalomeException);
if(MYDEBUG) MESSAGE( "SMESH_Gen_i::GetSubShapesId" ); MESSAGE( "SMESH_Gen_i::GetSubShapesId" );
SMESH::long_array_var shapesId = new SMESH::long_array; SMESH::long_array_var shapesId = new SMESH::long_array;
set<int> setId; set<int> setId;
@ -1936,19 +1929,19 @@ SMESH_Gen_i::GetSubShapesId( GEOM::GEOM_Object_ptr theMainShapeObject,
{ {
const TopoDS_Face& F = TopoDS::Face(exp.Current()); const TopoDS_Face& F = TopoDS::Face(exp.Current());
setId.insert(myIndexToShape.FindIndex(F)); setId.insert(myIndexToShape.FindIndex(F));
if(MYDEBUG) SCRUTE(myIndexToShape.FindIndex(F)); SCRUTE(myIndexToShape.FindIndex(F));
} }
for (TopExp_Explorer exp(locShape,TopAbs_EDGE); exp.More(); exp.Next()) for (TopExp_Explorer exp(locShape,TopAbs_EDGE); exp.More(); exp.Next())
{ {
const TopoDS_Edge& E = TopoDS::Edge(exp.Current()); const TopoDS_Edge& E = TopoDS::Edge(exp.Current());
setId.insert(myIndexToShape.FindIndex(E)); setId.insert(myIndexToShape.FindIndex(E));
if(MYDEBUG) SCRUTE(myIndexToShape.FindIndex(E)); SCRUTE(myIndexToShape.FindIndex(E));
} }
for (TopExp_Explorer exp(locShape,TopAbs_VERTEX); exp.More(); exp.Next()) for (TopExp_Explorer exp(locShape,TopAbs_VERTEX); exp.More(); exp.Next())
{ {
const TopoDS_Vertex& V = TopoDS::Vertex(exp.Current()); const TopoDS_Vertex& V = TopoDS::Vertex(exp.Current());
setId.insert(myIndexToShape.FindIndex(V)); setId.insert(myIndexToShape.FindIndex(V));
if(MYDEBUG) SCRUTE(myIndexToShape.FindIndex(V)); SCRUTE(myIndexToShape.FindIndex(V));
} }
} }
shapesId->length(setId.size()); shapesId->length(setId.size());
@ -1956,9 +1949,9 @@ SMESH_Gen_i::GetSubShapesId( GEOM::GEOM_Object_ptr theMainShapeObject,
int i=0; int i=0;
for (iind = setId.begin(); iind != setId.end(); iind++) for (iind = setId.begin(); iind != setId.end(); iind++)
{ {
if(MYDEBUG) SCRUTE((*iind)); SCRUTE((*iind));
shapesId[i] = (*iind); shapesId[i] = (*iind);
if(MYDEBUG) SCRUTE(shapesId[i]); SCRUTE(shapesId[i]);
i++; i++;
} }
} }
@ -1983,7 +1976,7 @@ CORBA::Boolean SMESH_Gen_i::Compute( SMESH::SMESH_Mesh_ptr theMesh,
{ {
//MEMOSTAT; //MEMOSTAT;
Unexpect aCatch(SALOME_SalomeException); Unexpect aCatch(SALOME_SalomeException);
if(MYDEBUG) MESSAGE( "SMESH_Gen_i::Compute" ); MESSAGE( "SMESH_Gen_i::Compute" );
if ( CORBA::is_nil( theShapeObject ) && theMesh->HasShapeToMesh()) if ( CORBA::is_nil( theShapeObject ) && theMesh->HasShapeToMesh())
THROW_SALOME_CORBA_EXCEPTION( "bad shape object reference", THROW_SALOME_CORBA_EXCEPTION( "bad shape object reference",
@ -2078,7 +2071,7 @@ SMESH::MeshPreviewStruct* SMESH_Gen_i::Precompute( SMESH::SMESH_Mesh_ptr theMesh
SMESH::long_array& theShapesId) SMESH::long_array& theShapesId)
{ {
Unexpect aCatch(SALOME_SalomeException); Unexpect aCatch(SALOME_SalomeException);
if(MYDEBUG) MESSAGE( "SMESH_Gen_i::Precompute" ); MESSAGE( "SMESH_Gen_i::Precompute" );
if ( CORBA::is_nil( theShapeObject ) && theMesh->HasShapeToMesh()) if ( CORBA::is_nil( theShapeObject ) && theMesh->HasShapeToMesh())
THROW_SALOME_CORBA_EXCEPTION( "bad shape object reference", THROW_SALOME_CORBA_EXCEPTION( "bad shape object reference",
@ -2264,7 +2257,7 @@ SMESH::smIdType_array* SMESH_Gen_i::Evaluate(SMESH::SMESH_Mesh_ptr theMesh,
GEOM::GEOM_Object_ptr theShapeObject) GEOM::GEOM_Object_ptr theShapeObject)
{ {
Unexpect aCatch(SALOME_SalomeException); Unexpect aCatch(SALOME_SalomeException);
if(MYDEBUG) MESSAGE( "SMESH_Gen_i::Evaluate" ); MESSAGE( "SMESH_Gen_i::Evaluate" );
if ( CORBA::is_nil( theShapeObject ) && theMesh->HasShapeToMesh()) if ( CORBA::is_nil( theShapeObject ) && theMesh->HasShapeToMesh())
THROW_SALOME_CORBA_EXCEPTION( "bad shape object reference", SALOME::BAD_PARAM ); THROW_SALOME_CORBA_EXCEPTION( "bad shape object reference", SALOME::BAD_PARAM );
@ -5087,7 +5080,7 @@ SALOMEDS::TMPFile* SMESH_Gen_i::Save( SALOMEDS::SComponent_ptr theComponent,
SALOMEDS::TMPFile* SMESH_Gen_i::SaveASCII( SALOMEDS::SComponent_ptr theComponent, SALOMEDS::TMPFile* SMESH_Gen_i::SaveASCII( SALOMEDS::SComponent_ptr theComponent,
const char* theURL, const char* theURL,
bool isMultiFile ) { bool isMultiFile ) {
if(MYDEBUG) MESSAGE( "SMESH_Gen_i::SaveASCII" ); MESSAGE( "SMESH_Gen_i::SaveASCII" );
SALOMEDS::TMPFile_var aStreamFile = Save( theComponent, theURL, isMultiFile ); SALOMEDS::TMPFile_var aStreamFile = Save( theComponent, theURL, isMultiFile );
return aStreamFile._retn(); return aStreamFile._retn();
@ -5227,7 +5220,7 @@ bool SMESH_Gen_i::Load( SALOMEDS::SComponent_ptr theComponent,
size = aDataset->GetSize(); size = aDataset->GetSize();
char* libname_str = new char[ size ]; char* libname_str = new char[ size ];
aDataset->ReadFromDisk( libname_str ); aDataset->ReadFromDisk( libname_str );
if(MYDEBUG) SCRUTE( libname_str ); SCRUTE( libname_str );
libname = string( libname_str ); libname = string( libname_str );
delete [] libname_str; delete [] libname_str;
aDataset->CloseOnDisk(); aDataset->CloseOnDisk();
@ -5249,7 +5242,7 @@ bool SMESH_Gen_i::Load( SALOMEDS::SComponent_ptr theComponent,
// --> restore hypothesis from data // --> restore hypothesis from data
if ( id > 0 && !hypname.empty()/* && !hypdata.empty()*/ ) { // VSR : persistent data can be empty if ( id > 0 && !hypname.empty()/* && !hypdata.empty()*/ ) { // VSR : persistent data can be empty
if(MYDEBUG) MESSAGE("VSR - load hypothesis : id = " << id << MESSAGE("VSR - load hypothesis : id = " << id <<
", name = " << hypname.c_str() << ", persistent string = " << hypdata.c_str()); ", name = " << hypname.c_str() << ", persistent string = " << hypdata.c_str());
SMESH::SMESH_Hypothesis_var myHyp; SMESH::SMESH_Hypothesis_var myHyp;
@ -5269,7 +5262,7 @@ bool SMESH_Gen_i::Load( SALOMEDS::SComponent_ptr theComponent,
myStudyContext->mapOldToNew( id, newId ); myStudyContext->mapOldToNew( id, newId );
} }
else else
if(MYDEBUG) MESSAGE( "VSR - SMESH_Gen::Load - can't get servant" ); MESSAGE( "VSR - SMESH_Gen::Load - can't get servant" );
} }
} }
} }
@ -5326,7 +5319,7 @@ bool SMESH_Gen_i::Load( SALOMEDS::SComponent_ptr theComponent,
size = aDataset->GetSize(); size = aDataset->GetSize();
char* libname_str = new char[ size ]; char* libname_str = new char[ size ];
aDataset->ReadFromDisk( libname_str ); aDataset->ReadFromDisk( libname_str );
if(MYDEBUG) SCRUTE( libname_str ); SCRUTE( libname_str );
libname = string( libname_str ); libname = string( libname_str );
delete [] libname_str; delete [] libname_str;
aDataset->CloseOnDisk(); aDataset->CloseOnDisk();
@ -5338,7 +5331,7 @@ bool SMESH_Gen_i::Load( SALOMEDS::SComponent_ptr theComponent,
size = aDataset->GetSize(); size = aDataset->GetSize();
char* hypdata_str = new char[ size ]; char* hypdata_str = new char[ size ];
aDataset->ReadFromDisk( hypdata_str ); aDataset->ReadFromDisk( hypdata_str );
if(MYDEBUG) SCRUTE( hypdata_str ); SCRUTE( hypdata_str );
hypdata = string( hypdata_str ); hypdata = string( hypdata_str );
delete [] hypdata_str; delete [] hypdata_str;
aDataset->CloseOnDisk(); aDataset->CloseOnDisk();
@ -5349,7 +5342,7 @@ bool SMESH_Gen_i::Load( SALOMEDS::SComponent_ptr theComponent,
// --> restore algorithm from data // --> restore algorithm from data
if ( id > 0 && !hypname.empty()/* && !hypdata.empty()*/ ) { // VSR : persistent data can be empty if ( id > 0 && !hypname.empty()/* && !hypdata.empty()*/ ) { // VSR : persistent data can be empty
if(MYDEBUG) MESSAGE("VSR - load algo : id = " << id << MESSAGE("VSR - load algo : id = " << id <<
", name = " << hypname.c_str() << ", persistent string = " << hypdata.c_str()); ", name = " << hypname.c_str() << ", persistent string = " << hypdata.c_str());
SMESH::SMESH_Hypothesis_var myHyp; SMESH::SMESH_Hypothesis_var myHyp;
@ -5373,7 +5366,7 @@ bool SMESH_Gen_i::Load( SALOMEDS::SComponent_ptr theComponent,
myStudyContext->mapOldToNew( id, newId ); myStudyContext->mapOldToNew( id, newId );
} }
else else
if(MYDEBUG) MESSAGE( "VSR - SMESH_Gen::Load - can't get servant" ); MESSAGE( "VSR - SMESH_Gen::Load - can't get servant" );
} }
} }
} }
@ -5402,7 +5395,7 @@ bool SMESH_Gen_i::Load( SALOMEDS::SComponent_ptr theComponent,
int aNbObjects = aTopGroup->nInternalObjects(); int aNbObjects = aTopGroup->nInternalObjects();
if ( aNbObjects > 0 ) { if ( aNbObjects > 0 ) {
// create mesh // create mesh
if(MYDEBUG) MESSAGE( "VSR - load mesh : id = " << id ); MESSAGE( "VSR - load mesh : id = " << id );
SMESH::SMESH_Mesh_var myNewMesh = this->createMesh(); SMESH::SMESH_Mesh_var myNewMesh = this->createMesh();
SMESH_Mesh_i* myNewMeshImpl = dynamic_cast<SMESH_Mesh_i*>( GetServant( myNewMesh ).in() ); SMESH_Mesh_i* myNewMeshImpl = dynamic_cast<SMESH_Mesh_i*>( GetServant( myNewMesh ).in() );
if ( !myNewMeshImpl ) if ( !myNewMeshImpl )
@ -5538,7 +5531,7 @@ bool SMESH_Gen_i::Load( SALOMEDS::SComponent_ptr theComponent,
aGroup->OpenOnDisk(); aGroup->OpenOnDisk();
// get number of applied algorithms // get number of applied algorithms
int aNbSubObjects = aGroup->nInternalObjects(); int aNbSubObjects = aGroup->nInternalObjects();
if(MYDEBUG) MESSAGE( "VSR - number of applied algos " << aNbSubObjects ); MESSAGE( "VSR - number of applied algos " << aNbSubObjects );
for ( int j = 0; j < aNbSubObjects; j++ ) { for ( int j = 0; j < aNbSubObjects; j++ ) {
char name_dataset[ HDF_NAME_MAX_LEN+1 ]; char name_dataset[ HDF_NAME_MAX_LEN+1 ];
aGroup->InternalObjectIndentify( j, name_dataset ); aGroup->InternalObjectIndentify( j, name_dataset );
@ -6041,7 +6034,7 @@ bool SMESH_Gen_i::LoadASCII( SALOMEDS::SComponent_ptr theComponent,
const SALOMEDS::TMPFile& theStream, const SALOMEDS::TMPFile& theStream,
const char* theURL, const char* theURL,
bool isMultiFile ) { bool isMultiFile ) {
if(MYDEBUG) MESSAGE( "SMESH_Gen_i::LoadASCII" ); MESSAGE( "SMESH_Gen_i::LoadASCII" );
return Load( theComponent, theStream, theURL, isMultiFile ); return Load( theComponent, theStream, theURL, isMultiFile );
//before call main ::Load method it's need for decipher text format to //before call main ::Load method it's need for decipher text format to
@ -6078,7 +6071,7 @@ bool SMESH_Gen_i::LoadASCII( SALOMEDS::SComponent_ptr theComponent,
void SMESH_Gen_i::Close( SALOMEDS::SComponent_ptr theComponent ) void SMESH_Gen_i::Close( SALOMEDS::SComponent_ptr theComponent )
{ {
if(MYDEBUG) MESSAGE( "SMESH_Gen_i::Close" ); MESSAGE( "SMESH_Gen_i::Close" );
// Clear study contexts data // Clear study contexts data
myStudyContext->Clear(); myStudyContext->Clear();
@ -6102,7 +6095,7 @@ void SMESH_Gen_i::Close( SALOMEDS::SComponent_ptr theComponent )
char* SMESH_Gen_i::ComponentDataType() char* SMESH_Gen_i::ComponentDataType()
{ {
if(MYDEBUG) MESSAGE( "SMESH_Gen_i::ComponentDataType" ); MESSAGE( "SMESH_Gen_i::ComponentDataType" );
return CORBA::string_dup( "SMESH" ); return CORBA::string_dup( "SMESH" );
} }
@ -6120,12 +6113,12 @@ char* SMESH_Gen_i::IORToLocalPersistentID( SALOMEDS::SObject_ptr /*theSObject*/,
CORBA::Boolean /*isMultiFile*/, CORBA::Boolean /*isMultiFile*/,
CORBA::Boolean /*isASCII*/ ) CORBA::Boolean /*isASCII*/ )
{ {
if(MYDEBUG) MESSAGE( "SMESH_Gen_i::IORToLocalPersistentID" ); MESSAGE( "SMESH_Gen_i::IORToLocalPersistentID" );
if ( myStudyContext && strcmp( IORString, "" ) != 0 ) { if ( myStudyContext && strcmp( IORString, "" ) != 0 ) {
int anId = myStudyContext->findId( IORString ); int anId = myStudyContext->findId( IORString );
if ( anId ) { if ( anId ) {
if(MYDEBUG) MESSAGE( "VSR " << anId ); MESSAGE( "VSR " << anId );
char strId[ 20 ]; char strId[ 20 ];
sprintf( strId, "%d", anId ); sprintf( strId, "%d", anId );
return CORBA::string_dup( strId ); return CORBA::string_dup( strId );
@ -6147,7 +6140,7 @@ char* SMESH_Gen_i::LocalPersistentIDToIOR( SALOMEDS::SObject_ptr /*theSObject*/,
CORBA::Boolean /*isMultiFile*/, CORBA::Boolean /*isMultiFile*/,
CORBA::Boolean /*isASCII*/ ) CORBA::Boolean /*isASCII*/ )
{ {
if(MYDEBUG) MESSAGE( "SMESH_Gen_i::LocalPersistentIDToIOR(): id = " << aLocalPersistentID ); MESSAGE( "SMESH_Gen_i::LocalPersistentIDToIOR(): id = " << aLocalPersistentID );
if ( myStudyContext && strcmp( aLocalPersistentID, "" ) != 0 ) { if ( myStudyContext && strcmp( aLocalPersistentID, "" ) != 0 ) {
int anId = atoi( aLocalPersistentID ); int anId = atoi( aLocalPersistentID );

34
src/SMESH_I/SMESH_Gen_i_1.cxx
View File

@ -46,12 +46,6 @@
#include <cctype> #include <cctype>
#ifdef _DEBUG_
static int MYDEBUG = 0;
#else
static int MYDEBUG = 0;
#endif
using namespace std; using namespace std;
//============================================================================= //=============================================================================
@ -162,7 +156,7 @@ long SMESH_Gen_i::GetBallElementsGroupsTag()
bool SMESH_Gen_i::CanPublishInStudy(CORBA::Object_ptr theIOR) bool SMESH_Gen_i::CanPublishInStudy(CORBA::Object_ptr theIOR)
{ {
if(MYDEBUG) MESSAGE("CanPublishInStudy - "<<!CORBA::is_nil(getStudyServant())); MESSAGE("CanPublishInStudy - "<<!CORBA::is_nil(getStudyServant()));
if ( !myIsEnablePublish ) if ( !myIsEnablePublish )
return false; return false;
@ -183,7 +177,7 @@ bool SMESH_Gen_i::CanPublishInStudy(CORBA::Object_ptr theIOR)
if( !aGroup->_is_nil() ) if( !aGroup->_is_nil() )
return true; return true;
if(MYDEBUG) MESSAGE("CanPublishInStudy--CANT"); MESSAGE("CanPublishInStudy--CANT");
return false; return false;
} }
@ -501,7 +495,7 @@ SALOMEDS::SObject_ptr SMESH_Gen_i::PublishInStudy(SALOMEDS::SObject_ptr /*theSOb
return aSO._retn(); return aSO._retn();
if ( CORBA::is_nil( theIOR )) if ( CORBA::is_nil( theIOR ))
return aSO._retn(); return aSO._retn();
if(MYDEBUG) MESSAGE("PublishInStudy"); MESSAGE("PublishInStudy");
// Publishing a mesh // Publishing a mesh
SMESH::SMESH_Mesh_var aMesh = SMESH::SMESH_Mesh::_narrow( theIOR ); SMESH::SMESH_Mesh_var aMesh = SMESH::SMESH_Mesh::_narrow( theIOR );
@ -528,7 +522,7 @@ SALOMEDS::SObject_ptr SMESH_Gen_i::PublishInStudy(SALOMEDS::SObject_ptr /*theSOb
aMesh = aGroup->GetMesh(); aMesh = aGroup->GetMesh();
aSO = PublishGroup( aMesh, aGroup, aShapeObject, theName ); aSO = PublishGroup( aMesh, aGroup, aShapeObject, theName );
} }
if(MYDEBUG) MESSAGE("PublishInStudy_END"); MESSAGE("PublishInStudy_END");
return aSO._retn(); return aSO._retn();
} }
@ -540,7 +534,7 @@ SALOMEDS::SObject_ptr SMESH_Gen_i::PublishInStudy(SALOMEDS::SObject_ptr /*theSOb
SALOMEDS::SComponent_ptr SMESH_Gen_i::PublishComponent() SALOMEDS::SComponent_ptr SMESH_Gen_i::PublishComponent()
{ {
if(MYDEBUG) MESSAGE("PublishComponent"); MESSAGE("PublishComponent");
if ( !myIsEnablePublish ) if ( !myIsEnablePublish )
return SALOMEDS::SComponent::_nil(); return SALOMEDS::SComponent::_nil();
@ -602,7 +596,7 @@ SALOMEDS::SComponent_ptr SMESH_Gen_i::PublishComponent()
// (to support tree representation customization and drag-n-drop) // (to support tree representation customization and drag-n-drop)
useCaseBuilder->SetRootCurrent(); useCaseBuilder->SetRootCurrent();
useCaseBuilder->Append( father ); // component object is added as the top level item useCaseBuilder->Append( father ); // component object is added as the top level item
if(MYDEBUG) MESSAGE("PublishComponent--END"); MESSAGE("PublishComponent--END");
return father._retn(); return father._retn();
} }
@ -619,7 +613,7 @@ SALOMEDS::SObject_ptr SMESH_Gen_i::PublishMesh (SMESH::SMESH_Mesh_ptr theMesh,
return SALOMEDS::SObject::_nil(); return SALOMEDS::SObject::_nil();
if ( CORBA::is_nil( theMesh )) if ( CORBA::is_nil( theMesh ))
return SALOMEDS::SObject::_nil(); return SALOMEDS::SObject::_nil();
if(MYDEBUG) MESSAGE("PublishMesh--IN"); MESSAGE("PublishMesh--IN");
// find or publish a mesh // find or publish a mesh
@ -690,7 +684,7 @@ SALOMEDS::SObject_ptr SMESH_Gen_i::PublishMesh (SMESH::SMESH_Mesh_ptr theMesh,
} }
} }
if(MYDEBUG) MESSAGE("PublishMesh_END"); MESSAGE("PublishMesh_END");
return aMeshSO._retn(); return aMeshSO._retn();
} }
@ -900,7 +894,7 @@ SALOMEDS::SObject_ptr
SMESH_Gen_i::PublishHypothesis (SMESH::SMESH_Hypothesis_ptr theHyp, SMESH_Gen_i::PublishHypothesis (SMESH::SMESH_Hypothesis_ptr theHyp,
const char* theName) const char* theName)
{ {
if(MYDEBUG) MESSAGE("PublishHypothesis"); MESSAGE("PublishHypothesis");
if ( !myIsEnablePublish ) if ( !myIsEnablePublish )
return SALOMEDS::SObject::_nil(); return SALOMEDS::SObject::_nil();
if (theHyp->_is_nil()) if (theHyp->_is_nil())
@ -935,7 +929,7 @@ SMESH_Gen_i::PublishHypothesis (SMESH::SMESH_Hypothesis_ptr theHyp,
SetName( aHypSO, theName, hypType.in() ); SetName( aHypSO, theName, hypType.in() );
if(MYDEBUG) MESSAGE("PublishHypothesis--END"); MESSAGE("PublishHypothesis--END");
return aHypSO._retn(); return aHypSO._retn();
} }
@ -1097,7 +1091,7 @@ SALOMEDS::SObject_ptr
SMESH_Gen_i::GetMeshOrSubmeshByShape (SMESH::SMESH_Mesh_ptr theMesh, SMESH_Gen_i::GetMeshOrSubmeshByShape (SMESH::SMESH_Mesh_ptr theMesh,
GEOM::GEOM_Object_ptr theShape) GEOM::GEOM_Object_ptr theShape)
{ {
if(MYDEBUG) MESSAGE("GetMeshOrSubmeshByShape"); MESSAGE("GetMeshOrSubmeshByShape");
SALOMEDS::SObject_wrap aMeshOrSubMesh; SALOMEDS::SObject_wrap aMeshOrSubMesh;
if (theMesh->_is_nil() || ( theShape->_is_nil() && theMesh->HasShapeToMesh())) if (theMesh->_is_nil() || ( theShape->_is_nil() && theMesh->HasShapeToMesh()))
return aMeshOrSubMesh._retn(); return aMeshOrSubMesh._retn();
@ -1121,7 +1115,7 @@ SMESH_Gen_i::GetMeshOrSubmeshByShape (SMESH::SMESH_Mesh_ptr theMesh,
aMeshOrSubMesh = ObjectToSObject( aSubMesh ); aMeshOrSubMesh = ObjectToSObject( aSubMesh );
} }
} }
if(MYDEBUG) MESSAGE("GetMeshOrSubmeshByShape--END"); MESSAGE("GetMeshOrSubmeshByShape--END");
return aMeshOrSubMesh._retn(); return aMeshOrSubMesh._retn();
} }
@ -1134,7 +1128,7 @@ bool SMESH_Gen_i::AddHypothesisToShape(SMESH::SMESH_Mesh_ptr theMesh,
GEOM::GEOM_Object_ptr theShape, GEOM::GEOM_Object_ptr theShape,
SMESH::SMESH_Hypothesis_ptr theHyp) SMESH::SMESH_Hypothesis_ptr theHyp)
{ {
if(MYDEBUG) MESSAGE("AddHypothesisToShape"); MESSAGE("AddHypothesisToShape");
if (theMesh->_is_nil() || if (theMesh->_is_nil() ||
theHyp->_is_nil() || (theShape->_is_nil() theHyp->_is_nil() || (theShape->_is_nil()
&& theMesh->HasShapeToMesh()) ) && theMesh->HasShapeToMesh()) )
@ -1175,7 +1169,7 @@ bool SMESH_Gen_i::AddHypothesisToShape(SMESH::SMESH_Mesh_ptr theMesh,
addReference( AHR, theHyp ); addReference( AHR, theHyp );
if(MYDEBUG) MESSAGE("AddHypothesisToShape--END"); MESSAGE("AddHypothesisToShape--END");
return true; return true;
} }

37
src/SMESH_I/SMESH_Mesh_i.cxx
View File

@ -96,12 +96,6 @@
#include "SMESH_TryCatch.hxx" // include after OCCT headers! #include "SMESH_TryCatch.hxx" // include after OCCT headers!
#ifdef _DEBUG_
static int MYDEBUG = 0;
#else
static int MYDEBUG = 0;
#endif
using namespace std; using namespace std;
using SMESH::TPythonDump; using SMESH::TPythonDump;
using SMESH::TVar; using SMESH::TVar;
@ -664,7 +658,7 @@ SMESH_Mesh_i::AddHypothesis(GEOM::GEOM_Object_ptr aSubShape,
if ( prevNbMeshEnt > 0 /*newNbMeshEnt != prevNbMeshEnt*/ ) if ( prevNbMeshEnt > 0 /*newNbMeshEnt != prevNbMeshEnt*/ )
_gen_i->UpdateIcons( mesh ); _gen_i->UpdateIcons( mesh );
} }
if(MYDEBUG) MESSAGE( " AddHypothesis(): status = " << status ); MESSAGE( " AddHypothesis(): status = " << status );
// Update Python script // Update Python script
TPythonDump() << "status = " << mesh << ".AddHypothesis( " TPythonDump() << "status = " << mesh << ".AddHypothesis( "
@ -684,7 +678,7 @@ SMESH_Mesh_i::addHypothesis(GEOM::GEOM_Object_ptr aSubShape,
SMESH::SMESH_Hypothesis_ptr anHyp, SMESH::SMESH_Hypothesis_ptr anHyp,
std::string* anErrorText) std::string* anErrorText)
{ {
if(MYDEBUG) MESSAGE("addHypothesis"); MESSAGE("addHypothesis");
if (CORBA::is_nil( aSubShape ) && HasShapeToMesh()) if (CORBA::is_nil( aSubShape ) && HasShapeToMesh())
THROW_SALOME_CORBA_EXCEPTION("bad Sub-shape reference",SALOME::BAD_PARAM); THROW_SALOME_CORBA_EXCEPTION("bad Sub-shape reference",SALOME::BAD_PARAM);
@ -770,7 +764,7 @@ SMESH_Hypothesis::Hypothesis_Status
SMESH_Mesh_i::removeHypothesis(GEOM::GEOM_Object_ptr aSubShape, SMESH_Mesh_i::removeHypothesis(GEOM::GEOM_Object_ptr aSubShape,
SMESH::SMESH_Hypothesis_ptr anHyp) SMESH::SMESH_Hypothesis_ptr anHyp)
{ {
if(MYDEBUG) MESSAGE("removeHypothesis()"); MESSAGE("removeHypothesis()");
if (CORBA::is_nil( aSubShape ) && HasShapeToMesh()) if (CORBA::is_nil( aSubShape ) && HasShapeToMesh())
THROW_SALOME_CORBA_EXCEPTION("bad Sub-shape reference", SALOME::BAD_PARAM); THROW_SALOME_CORBA_EXCEPTION("bad Sub-shape reference", SALOME::BAD_PARAM);
@ -816,7 +810,7 @@ SMESH::ListOfHypothesis *
SMESH_Mesh_i::GetHypothesisList(GEOM::GEOM_Object_ptr aSubShape) SMESH_Mesh_i::GetHypothesisList(GEOM::GEOM_Object_ptr aSubShape)
{ {
Unexpect aCatch(SALOME_SalomeException); Unexpect aCatch(SALOME_SalomeException);
if (MYDEBUG) MESSAGE("GetHypothesisList"); MESSAGE("GetHypothesisList");
if (_impl->HasShapeToMesh() && CORBA::is_nil(aSubShape)) if (_impl->HasShapeToMesh() && CORBA::is_nil(aSubShape))
THROW_SALOME_CORBA_EXCEPTION("bad Sub-shape reference", SALOME::BAD_PARAM); THROW_SALOME_CORBA_EXCEPTION("bad Sub-shape reference", SALOME::BAD_PARAM);
@ -856,7 +850,7 @@ SMESH_Mesh_i::GetHypothesisList(GEOM::GEOM_Object_ptr aSubShape)
SMESH::submesh_array* SMESH_Mesh_i::GetSubMeshes() SMESH::submesh_array* SMESH_Mesh_i::GetSubMeshes()
{ {
Unexpect aCatch(SALOME_SalomeException); Unexpect aCatch(SALOME_SalomeException);
if (MYDEBUG) MESSAGE("GetSubMeshes"); MESSAGE("GetSubMeshes");
SMESH::submesh_array_var aList = new SMESH::submesh_array(); SMESH::submesh_array_var aList = new SMESH::submesh_array();
@ -1220,7 +1214,7 @@ void SMESH_Mesh_i::RemoveGroupWithContents( SMESH::SMESH_GroupBase_ptr theGroup
SMESH::ListOfGroups * SMESH_Mesh_i::GetGroups() SMESH::ListOfGroups * SMESH_Mesh_i::GetGroups()
{ {
Unexpect aCatch(SALOME_SalomeException); Unexpect aCatch(SALOME_SalomeException);
if (MYDEBUG) MESSAGE("GetGroups"); MESSAGE("GetGroups");
SMESH::ListOfGroups_var aList = new SMESH::ListOfGroups(); SMESH::ListOfGroups_var aList = new SMESH::ListOfGroups();
@ -3122,7 +3116,7 @@ SMESH::SMESH_Group_ptr SMESH_Mesh_i::ConvertToStandalone( SMESH::SMESH_GroupBase
SMESH::SMESH_subMesh_ptr SMESH_Mesh_i::createSubMesh( GEOM::GEOM_Object_ptr theSubShapeObject ) SMESH::SMESH_subMesh_ptr SMESH_Mesh_i::createSubMesh( GEOM::GEOM_Object_ptr theSubShapeObject )
{ {
if(MYDEBUG) MESSAGE( "createSubMesh" ); MESSAGE( "createSubMesh" );
TopoDS_Shape myLocSubShape = _gen_i->GeomObjectToShape(theSubShapeObject); TopoDS_Shape myLocSubShape = _gen_i->GeomObjectToShape(theSubShapeObject);
::SMESH_subMesh * mySubMesh = _impl->GetSubMesh(myLocSubShape); ::SMESH_subMesh * mySubMesh = _impl->GetSubMesh(myLocSubShape);
int subMeshId = 0; int subMeshId = 0;
@ -3154,8 +3148,7 @@ SMESH::SMESH_subMesh_ptr SMESH_Mesh_i::createSubMesh( GEOM::GEOM_Object_ptr theS
// register CORBA object for persistence // register CORBA object for persistence
int nextId = _gen_i->RegisterObject( subMesh ); int nextId = _gen_i->RegisterObject( subMesh );
if(MYDEBUG) { MESSAGE( "Add submesh to map with id = "<< nextId); } MESSAGE( "Add submesh to map with id = "<< nextId);
else { (void)nextId; } // avoid "unused variable" warning
// to track changes of GEOM groups // to track changes of GEOM groups
if ( subMeshId > 0 ) if ( subMeshId > 0 )
@ -3291,8 +3284,7 @@ SMESH::SMESH_GroupBase_ptr SMESH_Mesh_i::createGroup (SMESH::ElementType
// register CORBA object for persistence // register CORBA object for persistence
int nextId = _gen_i->RegisterObject( aGroup ); int nextId = _gen_i->RegisterObject( aGroup );
if(MYDEBUG) { MESSAGE( "Add group to map with id = "<< nextId); } MESSAGE( "Add group to map with id = "<< nextId);
else { nextId = ( nextId > 0 ); } // avoid "unused variable" warning in release mode
// to track changes of GEOM groups // to track changes of GEOM groups
if ( !theShape.IsNull() ) { if ( !theShape.IsNull() ) {
@ -3313,7 +3305,7 @@ SMESH::SMESH_GroupBase_ptr SMESH_Mesh_i::createGroup (SMESH::ElementType
void SMESH_Mesh_i::removeGroup( const int theId ) void SMESH_Mesh_i::removeGroup( const int theId )
{ {
if(MYDEBUG) MESSAGE("SMESH_Mesh_i::removeGroup()" ); MESSAGE("SMESH_Mesh_i::removeGroup()");
if ( _mapGroups.find( theId ) != _mapGroups.end() ) { if ( _mapGroups.find( theId ) != _mapGroups.end() ) {
SMESH::SMESH_GroupBase_var group = _mapGroups[theId]; SMESH::SMESH_GroupBase_var group = _mapGroups[theId];
_mapGroups.erase( theId ); _mapGroups.erase( theId );
@ -3480,7 +3472,7 @@ void SMESH_Mesh_i::onHypothesisModified(int theHypID, bool theUpdateIcons)
void SMESH_Mesh_i::SetImpl(::SMESH_Mesh * impl) void SMESH_Mesh_i::SetImpl(::SMESH_Mesh * impl)
{ {
if(MYDEBUG) MESSAGE("SMESH_Mesh_i::SetImpl"); MESSAGE("SMESH_Mesh_i::SetImpl");
_impl = impl; _impl = impl;
if ( _impl ) if ( _impl )
_impl->SetCallUp( new TCallUp_i(this)); _impl->SetCallUp( new TCallUp_i(this));
@ -3494,7 +3486,7 @@ void SMESH_Mesh_i::SetImpl(::SMESH_Mesh * impl)
::SMESH_Mesh & SMESH_Mesh_i::GetImpl() ::SMESH_Mesh & SMESH_Mesh_i::GetImpl()
{ {
if(MYDEBUG) MESSAGE("SMESH_Mesh_i::GetImpl()"); MESSAGE("SMESH_Mesh_i::GetImpl()");
return *_impl; return *_impl;
} }
@ -5189,7 +5181,7 @@ CORBA::LongLong SMESH_Mesh_i::GetMeshPtr()
_preMeshInfo->FullLoadFromFile(); _preMeshInfo->FullLoadFromFile();
CORBA::LongLong pointeur = CORBA::LongLong(_impl); CORBA::LongLong pointeur = CORBA::LongLong(_impl);
if ( MYDEBUG ) MESSAGE("CORBA::LongLong SMESH_Mesh_i::GetMeshPtr() "<<pointeur); MESSAGE("CORBA::LongLong SMESH_Mesh_i::GetMeshPtr() "<<pointeur);
return pointeur; return pointeur;
} }
@ -5931,8 +5923,7 @@ void SMESH_Mesh_i::CreateGroupServants()
// register CORBA object for persistence // register CORBA object for persistence
int nextId = _gen_i->RegisterObject( groupVar ); int nextId = _gen_i->RegisterObject( groupVar );
if(MYDEBUG) { MESSAGE( "Add group to map with id = "<< nextId); } MESSAGE( "Add group to map with id = "<< nextId);
else { (void)nextId; } // avoid "unused variable" warning in release mode
// publishing the groups in the study // publishing the groups in the study
GEOM::GEOM_Object_var shapeVar = _gen_i->ShapeToGeomObject( shape ); GEOM::GEOM_Object_var shapeVar = _gen_i->ShapeToGeomObject( shape );

24
src/SMESH_I/SMESH_NoteBook.cxx
View File

@ -36,12 +36,6 @@
#include <vector> #include <vector>
#include <string> #include <string>
#ifdef _DEBUG_
static int MYDEBUG = 0;
#else
static int MYDEBUG = 0;
#endif
using namespace std; using namespace std;
@ -242,7 +236,7 @@ void SMESH_NoteBook::ReplaceVariables()
TCollection_AsciiString aMethod = aCmd->GetMethod(); TCollection_AsciiString aMethod = aCmd->GetMethod();
TCollection_AsciiString aObject = aCmd->GetObject(); TCollection_AsciiString aObject = aCmd->GetObject();
TCollection_AsciiString aResultValue = aCmd->GetResultValue(); TCollection_AsciiString aResultValue = aCmd->GetResultValue();
if(MYDEBUG) { if(SALOME::VerbosityActivated()) {
cout<<"Command before : "<< aCmd->GetString()<<endl; cout<<"Command before : "<< aCmd->GetString()<<endl;
cout<<"Method : "<< aMethod<<endl; cout<<"Method : "<< aMethod<<endl;
cout<<"Object : "<< aObject<<endl; cout<<"Object : "<< aObject<<endl;
@ -329,7 +323,7 @@ void SMESH_NoteBook::ReplaceVariables()
} }
if(it != _objectMap.end()) { if(it != _objectMap.end()) {
if(MYDEBUG) if(SALOME::VerbosityActivated())
cout << "Found object : " << (*it).first << endl; cout << "Found object : " << (*it).first << endl;
SMESH_ObjectStates *aStates = (*it).second; SMESH_ObjectStates *aStates = (*it).second;
// Case for LocalLength hypothesis // Case for LocalLength hypothesis
@ -384,7 +378,7 @@ void SMESH_NoteBook::ReplaceVariables()
if(aMethod == "SetLayerDistribution"){ if(aMethod == "SetLayerDistribution"){
LayerDistributionStates* aLDStates = (LayerDistributionStates*)(aStates); LayerDistributionStates* aLDStates = (LayerDistributionStates*)(aStates);
aLDStates->AddDistribution(aCmd->GetArg(1)); aLDStates->AddDistribution(aCmd->GetArg(1));
if(MYDEBUG) if(SALOME::VerbosityActivated())
cout<<"Add Distribution :"<<aCmd->GetArg(1)<<endl; cout<<"Add Distribution :"<<aCmd->GetArg(1)<<endl;
} }
} }
@ -723,10 +717,10 @@ void SMESH_NoteBook::ReplaceVariables()
} }
} }
else { else {
if(MYDEBUG) if(SALOME::VerbosityActivated())
cout << "Object not found" << endl; cout << "Object not found" << endl;
} }
if(MYDEBUG) { if(SALOME::VerbosityActivated()) {
cout<<"Command after: "<< aCmd->GetString()<<endl; cout<<"Command after: "<< aCmd->GetString()<<endl;
} }
} }
@ -766,7 +760,7 @@ void SMESH_NoteBook::InitObjectMap()
std::vector< std::string > allVars = aGen->GetAllParameters( anID.in() ); std::vector< std::string > allVars = aGen->GetAllParameters( anID.in() );
SALOMEDS::ListOfListOfStrings_var aSections = aStudy->ParseVariables(aParameters.in()); SALOMEDS::ListOfListOfStrings_var aSections = aStudy->ParseVariables(aParameters.in());
_entry2VarsMap[ TCollection_AsciiString( anID.in() )] = allVars; _entry2VarsMap[ TCollection_AsciiString( anID.in() )] = allVars;
if(MYDEBUG) { if(SALOME::VerbosityActivated()) {
cout<<"Entry : "<< anID<<endl; cout<<"Entry : "<< anID<<endl;
cout<<"aParameters : "<<aParameters<<endl; cout<<"aParameters : "<<aParameters<<endl;
} }
@ -781,7 +775,7 @@ void SMESH_NoteBook::InitObjectMap()
else if (!aMesh->_is_nil() ) { else if (!aMesh->_is_nil() ) {
anObjType = "Mesh"; anObjType = "Mesh";
} }
if(MYDEBUG) if(SALOME::VerbosityActivated())
cout<<"The object Type : "<<anObjType<<endl; cout<<"The object Type : "<<anObjType<<endl;
SMESH_ObjectStates *aState = NULL; SMESH_ObjectStates *aState = NULL;
if(anObjType == "LayerDistribution") if(anObjType == "LayerDistribution")
@ -800,7 +794,7 @@ void SMESH_NoteBook::InitObjectMap()
aVar.InsertAfter(aVar.Length(), SMESH::TVar::Quote() ); aVar.InsertAfter(aVar.Length(), SMESH::TVar::Quote() );
} }
aVars.push_back(aVar); aVars.push_back(aVar);
if(MYDEBUG) { if(SALOME::VerbosityActivated()) {
cout<<"Variable: '"<<aVar<<"'"<<endl; cout<<"Variable: '"<<aVar<<"'"<<endl;
} }
} }
@ -826,7 +820,7 @@ void SMESH_NoteBook::InitObjectMap()
//================================================================================ //================================================================================
void SMESH_NoteBook::AddCommand(const TCollection_AsciiString& theString) void SMESH_NoteBook::AddCommand(const TCollection_AsciiString& theString)
{ {
if(MYDEBUG) if(SALOME::VerbosityActivated())
cout<<theString<<endl; cout<<theString<<endl;
Handle(_pyCommand) aCommand = new _pyCommand( theString, -1); Handle(_pyCommand) aCommand = new _pyCommand( theString, -1);
_commands.push_back(aCommand); _commands.push_back(aCommand);

8
src/SMESH_I/SMESH_PythonDump.cxx
View File

@ -46,12 +46,6 @@
#include <cstring> #include <cstring>
#ifdef _DEBUG_
static int MYDEBUG = 0;
#else
static int MYDEBUG = 0;
#endif
#include "SMESH_TryCatch.hxx" #include "SMESH_TryCatch.hxx"
namespace SMESH namespace SMESH
@ -92,7 +86,7 @@ namespace SMESH
if ( !objEntry.empty() ) if ( !objEntry.empty() )
aCollection += (TVar::ObjPrefix() + objEntry ).c_str(); aCollection += (TVar::ObjPrefix() + objEntry ).c_str();
aSMESHGen->AddToPythonScript(aCollection); aSMESHGen->AddToPythonScript(aCollection);
if(MYDEBUG) MESSAGE(aString); MESSAGE(aString);
// prevent misuse of already treated variables // prevent misuse of already treated variables
aSMESHGen->UpdateParameters(CORBA::Object_var().in(),""); aSMESHGen->UpdateParameters(CORBA::Object_var().in(),"");
} }