ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-01-26 16:00:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

GEOM in debug mode on Windows 10 with VS 2017.

Browse Source
This commit is contained in:
rnv 2019-10-30 20:36:28 +03:00
parent 000dfcbd77
commit 33502d28ed
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/GEOM/GEOM_Engine.cxx
View File

@ -1302,13 +1302,13 @@ void ReplaceVariables(TCollection_AsciiString& theCommand,
const TVariablesList& theVariables) const TVariablesList& theVariables)
{ {
if (MYDEBUG) if (MYDEBUG)
cout<<"Command : "<<theCommand<<endl; std::cout<<"Command : "<<theCommand<<std::endl;
if (MYDEBUG) { if (MYDEBUG) {
cout<<"All Entries:"<<endl; std::cout<<"All Entries:"<<std::endl;
TVariablesList::const_iterator it = theVariables.begin(); TVariablesList::const_iterator it = theVariables.begin();
for(;it != theVariables.end();it++) for(;it != theVariables.end();it++)
cout<<"\t'"<<(*it).first<<"'"<<endl; std::cout<<"\t'"<<(*it).first<<"'"<<std::endl;
} }
//Additional case - multi-row commands //Additional case - multi-row commands
@ -1319,7 +1319,7 @@ void ReplaceVariables(TCollection_AsciiString& theCommand,
break; break;
if (MYDEBUG) if (MYDEBUG)
cout<<"Sub-command : "<<aCommand<<endl; std::cout<<"Sub-command : "<<aCommand<<std::endl;
Standard_Integer aStartCommandPos = theCommand.Location(aCommand,1,theCommand.Length()); Standard_Integer aStartCommandPos = theCommand.Location(aCommand,1,theCommand.Length());
Standard_Integer aEndCommandPos = aStartCommandPos + aCommand.Length(); Standard_Integer aEndCommandPos = aStartCommandPos + aCommand.Length();
@ -1337,7 +1337,7 @@ void ReplaceVariables(TCollection_AsciiString& theCommand,
anEntry.RightAdjust(); anEntry.RightAdjust();
anEntry.LeftAdjust(); anEntry.LeftAdjust();
if(MYDEBUG) if(MYDEBUG)
cout<<"Result entry : '" <<anEntry<<"'"<<endl; std::cout<<"Result entry : '" <<anEntry<<"'"<<std::endl;
if ( anEntry.IsEmpty() ) { if ( anEntry.IsEmpty() ) {
aCommandIndex++; aCommandIndex++;
@ -1355,7 +1355,7 @@ void ReplaceVariables(TCollection_AsciiString& theCommand,
anEntry.RightAdjust(); anEntry.RightAdjust();
anEntry.LeftAdjust(); anEntry.LeftAdjust();
if(MYDEBUG) if(MYDEBUG)
cout<<"Sub-entry : '" <<anEntry<<"'"<<endl; std::cout<<"Sub-entry : '" <<anEntry<<"'"<<std::endl;
} }
//Find variables used for object construction //Find variables used for object construction
@ -1366,7 +1366,7 @@ void ReplaceVariables(TCollection_AsciiString& theCommand,
if(!aStates) { if(!aStates) {
if(MYDEBUG) if(MYDEBUG)
cout<<"Valiables list empty!!!"<<endl; std::cout<<"Valiables list empty!!!"<<std::endl;
aCommandIndex++; aCommandIndex++;
continue; continue;
} }
@ -1374,9 +1374,9 @@ void ReplaceVariables(TCollection_AsciiString& theCommand,
TState aVariables = aStates->GetCurrectState(); TState aVariables = aStates->GetCurrectState();
if(MYDEBUG) { if(MYDEBUG) {
cout<<"Variables from SObject:"<<endl; std::cout<<"Variables from SObject:"<<std::endl;
for (size_t i = 0; i < aVariables.size();i++) for (size_t i = 0; i < aVariables.size();i++)
cout<<"\t Variable["<<i<<"] = "<<aVariables[i].myVariable<<endl; std::cout<<"\t Variable["<<i<<"] = "<<aVariables[i].myVariable<<std::endl;
} }
//Calculate total number of parameters //Calculate total number of parameters
@ -1385,7 +1385,7 @@ void ReplaceVariables(TCollection_AsciiString& theCommand,
aTotalNbParams++; aTotalNbParams++;
if(MYDEBUG) if(MYDEBUG)
cout<<"aTotalNbParams = "<<aTotalNbParams<<endl; std::cout<<"aTotalNbParams = "<<aTotalNbParams<<std::endl;
Standard_Integer aFirstParam = aNbEntries; Standard_Integer aFirstParam = aNbEntries;
@ -1427,14 +1427,14 @@ void ReplaceVariables(TCollection_AsciiString& theCommand,
continue; // PAL20889: for "[]" continue; // PAL20889: for "[]"
if(MYDEBUG) if(MYDEBUG)
cout<<"aStartPos = "<<aStartPos<<", aEndPos = "<<aEndPos<<endl; std::cout<<"aStartPos = "<<aStartPos<<", aEndPos = "<<aEndPos<<std::endl;
aVar = aCommand.SubString(aStartPos, aEndPos-1); aVar = aCommand.SubString(aStartPos, aEndPos-1);
aVar.RightAdjust(); aVar.RightAdjust();
aVar.LeftAdjust(); aVar.LeftAdjust();
if(MYDEBUG) if(MYDEBUG)
cout<<"Variable: '"<< aVar <<"'"<<endl; std::cout<<"Variable: '"<< aVar <<"'"<<std::endl;
// specific case for sketcher // specific case for sketcher
if(aVar.Location( TCollection_AsciiString("Sketcher:"), 1, aVar.Length() ) != 0) { if(aVar.Location( TCollection_AsciiString("Sketcher:"), 1, aVar.Length() ) != 0) {
@ -1454,7 +1454,7 @@ void ReplaceVariables(TCollection_AsciiString& theCommand,
aSection = aVar.SubString(aStartSectionPos, aEndSectionPos-1); aSection = aVar.SubString(aStartSectionPos, aEndSectionPos-1);
if(MYDEBUG) if(MYDEBUG)
cout<<"aSection: "<<aSection<<endl; std::cout<<"aSection: "<<aSection<<std::endl;
Standard_Integer aNbParams = 1; Standard_Integer aNbParams = 1;
while( aSection.Location( aNbParams, ' ', 1, aSection.Length() ) ) while( aSection.Location( aNbParams, ' ', 1, aSection.Length() ) )
@ -1471,14 +1471,14 @@ void ReplaceVariables(TCollection_AsciiString& theCommand,
aEndParamPos = aSection.Length() + 1; aEndParamPos = aSection.Length() + 1;
if(MYDEBUG) if(MYDEBUG)
cout<<"aParamIndex: "<<aParamIndex<<" aStartParamPos: " <<aStartParamPos<<" aEndParamPos: "<<aEndParamPos<<endl; std::cout<<"aParamIndex: "<<aParamIndex<<" aStartParamPos: " <<aStartParamPos<<" aEndParamPos: "<<aEndParamPos<<std::endl;
if ( aStartParamPos == aEndParamPos) if ( aStartParamPos == aEndParamPos)
continue; continue;
aParameter = aSection.SubString(aStartParamPos, aEndParamPos-1); aParameter = aSection.SubString(aStartParamPos, aEndParamPos-1);
if(MYDEBUG) if(MYDEBUG)
cout<<"aParameter: "<<aParameter<<endl; std::cout<<"aParameter: "<<aParameter<<std::endl;
if(iVar >= aVariables.size()) if(iVar >= aVariables.size())
continue; continue;
@ -1495,27 +1495,27 @@ void ReplaceVariables(TCollection_AsciiString& theCommand,
} }
if(MYDEBUG) if(MYDEBUG)
cout<<"aSection before : "<<aSection<<endl; std::cout<<"aSection before : "<<aSection<< std::endl;
aSection.Remove(aStartParamPos, aEndParamPos - aStartParamPos); aSection.Remove(aStartParamPos, aEndParamPos - aStartParamPos);
aSection.Insert(aStartParamPos, aReplacedParameter); aSection.Insert(aStartParamPos, aReplacedParameter);
if(MYDEBUG) if(MYDEBUG)
cout<<"aSection after : "<<aSection<<endl<<endl; std::cout<<"aSection after : "<<aSection<<std::endl<<std::endl;
iVar++; iVar++;
} }
if(MYDEBUG) if(MYDEBUG)
cout<<"aVar before : "<<aVar<<endl; std::cout<<"aVar before : "<<aVar<<std::endl;
aVar.Remove(aStartSectionPos, aEndSectionPos - aStartSectionPos); aVar.Remove(aStartSectionPos, aEndSectionPos - aStartSectionPos);
aVar.Insert(aStartSectionPos, aSection); aVar.Insert(aStartSectionPos, aSection);
if(MYDEBUG) if(MYDEBUG)
cout<<"aVar after : "<<aVar<<endl<<endl; std::cout<<"aVar after : "<<aVar<<std::endl<<std::endl;
} }
if(MYDEBUG) if(MYDEBUG)
cout<<"aCommand before : "<<aCommand<<endl; std::cout<<"aCommand before : "<<aCommand<<std::endl;
aCommand.Remove(aStartPos, aEndPos - aStartPos); aCommand.Remove(aStartPos, aEndPos - aStartPos);
aCommand.Insert(aStartPos, aVar); aCommand.Insert(aStartPos, aVar);
if(MYDEBUG) if(MYDEBUG)
cout<<"aCommand after : "<<aCommand<<endl; std::cout<<"aCommand after : "<<aCommand<<std::endl;
break; break;
} // end of specific case for sketcher } // end of specific case for sketcher
@ -1552,7 +1552,7 @@ void ReplaceVariables(TCollection_AsciiString& theCommand,
} }
if (MYDEBUG) if (MYDEBUG)
cout<<"Command : "<<theCommand<<endl; std::cout<<"Command : "<<theCommand<<std::endl;
} }
//============================================================================= //=============================================================================