OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-04 18:06:22 +03:00
Code Packages Releases Activity

0031501: Foundation Classes, Message_Printer - remove theToPutEndl argument -- preparation

Browse Source 
Operators << for Handle(Message_Messenger) are removed; their use is replaced by use of Message_Messenger::StreamBuffer
Message_Messenger has been replaced by Standard_OStream within Interface_InterfaceModel,IFSelect,IGES,STEP dump interfaces.
This commit is contained in:
abv 2020-04-30 15:45:31 +03:00 committed by bugmaster
parent 39c8dc708f
commit 0ebe5b0a7f
382 changed files with 3109 additions and 3576 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/IFSelect/IFSelect_ContextModif.cxx
View File

@ -348,8 +348,8 @@ void IFSelect_ContextModif::TraceModifier
{
if (modif.IsNull()) return;
Handle(Message_Messenger) sout = Message::DefaultMessenger();
sout << "--- Run Modifier:" << Message_EndLine;
Message_Messenger::StreamBuffer sout = Message::SendInfo();
sout << "--- Run Modifier:" << std::endl;
Handle(IFSelect_Selection) sel = modif->Selection();
if (!sel.IsNull()) sout<<" Selection:"<<sel->Label();
else sout<<" (no Selection)";
@ -359,8 +359,8 @@ void IFSelect_ContextModif::TraceModifier
for (Standard_Integer i = 1; i <= nb; i ++) {
if (thelist.Value(i) != ' ') ne ++;
}
if (nb == ne) sout<<" All Model ("<<nb<<" Entities)"<<Message_EndLine;
else sout<<" Entities,Total:"<<nb<<" Concerned:"<<ne<<Message_EndLine;
if (nb == ne) sout<<" All Model ("<<nb<<" Entities)"<<std::endl;
else sout<<" Entities,Total:"<<nb<<" Concerned:"<<ne<<std::endl;
}
@ -373,13 +373,13 @@ void IFSelect_ContextModif::Trace (const Standard_CString mess)
{
// Trace courante
if (thecurr <= 0) return;
Handle(Message_Messenger) sout = Message::DefaultMessenger();
Message_Messenger::StreamBuffer sout = Message::SendInfo();
if (ValueOriginal() == ValueResult())
sout<<"-- ContextModif. Entity n0 "<<thecurr<<Message_EndLine;
sout<<"-- ContextModif. Entity n0 "<<thecurr<<std::endl;
else
sout<<"-- ContextModif. Entity in Original, n0 "<<thecurr<<" in Result, n0 "
<<thecurt<<Message_EndLine;
if (mess[0] != '\0') sout<<"-- Message:"<<mess<<Message_EndLine;
<<thecurt<<std::endl;
if (mess[0] != '\0') sout<<"-- Message:"<<mess<<std::endl;
}

52
src/IFSelect/IFSelect_EditForm.cxx
View File

@ -405,46 +405,46 @@ IFSelect_EditForm::IFSelect_EditForm
}
void IFSelect_EditForm::PrintDefs (const Handle(Message_Messenger)& S) const
void IFSelect_EditForm::PrintDefs (Standard_OStream& S) const
{
Standard_Integer iv, nbv = NbValues(Standard_True);
S<<"***** EditForm, Label : "<<Label()<<Message_EndLine;
if (IsComplete()) S<<"Complete, "<<nbv<<" Values"<<Message_EndLine;
S<<"***** EditForm, Label : "<<Label()<<std::endl;
if (IsComplete()) S<<"Complete, "<<nbv<<" Values"<<std::endl;
else {
S<<"Extraction on "<<nbv<<" Values : (extracted<-editor)"<<Message_EndLine;
S<<"Extraction on "<<nbv<<" Values : (extracted<-editor)"<<std::endl;
for (iv = 1; iv <= nbv; iv ++) S<<" "<<iv<<"<-"<<NumberFromRank(iv);
S<<Message_EndLine;
S<<std::endl;
}
S<<"*****"<<Message_EndLine;
S<<"*****"<<std::endl;
}
static void PrintList
(const Handle(TColStd_HSequenceOfHAsciiString)& list,
const Handle(Message_Messenger)& S, const Standard_Boolean alsolist)
Standard_OStream& S, const Standard_Boolean alsolist)
{
if (list.IsNull()) { S<<"(NULL LIST)"<<Message_EndLine; return; }
if (list.IsNull()) { S<<"(NULL LIST)"<<std::endl; return; }
Standard_Integer i,nb = list->Length();
S<<"(List : "<<nb<<" Items)"<<Message_EndLine;
S<<"(List : "<<nb<<" Items)"<<std::endl;
if (!alsolist) return;
for (i = 1; i <= nb; i ++) {
Handle(TCollection_HAsciiString) str = list->Value(i);
S<<" ["<<i<<"] "<< (str.IsNull() ? "(NULL)" : str->ToCString())<<Message_EndLine;
S<<" ["<<i<<"] "<< (str.IsNull() ? "(NULL)" : str->ToCString())<<std::endl;
}
}
void IFSelect_EditForm::PrintValues
(const Handle(Message_Messenger)& S, const Standard_Integer what,
(Standard_OStream& S, const Standard_Integer what,
const Standard_Boolean names, const Standard_Boolean alsolist) const
{
Standard_Integer iv, nbv = NbValues(Standard_True);
S<< "****************************************************"<<Message_EndLine;
S<<"***** "<<Label()<<Interface_MSG::Blanks(Label(),40)<<"*****"<<Message_EndLine;
S<<"***** *****"<<Message_EndLine;
S<< "****************************************************"<<std::endl;
S<<"***** "<<Label()<<Interface_MSG::Blanks(Label(),40)<<"*****"<<std::endl;
S<<"***** *****"<<std::endl;
if (!theloaded)
S<<"***** Values are NOT loaded *****"<<Message_EndLine;
S<<"***** Values are NOT loaded *****"<<std::endl;
else {
// Donnees sur lesquelles on a travaille
@ -453,18 +453,18 @@ static void PrintList
else S<<"***** No loaded Model. Loaded object : type "<<theent->DynamicType()->Name();
} else {
if (theent.IsNull()) S<<"***** No loaded entity";
else { S<<"***** Loaded entity : "; themodel->PrintLabel (theent,S); }
else { S<<"***** Loaded entity : "; themodel->PrintLabel (theent, S); }
}
}
S<<Message_EndLine<<"****************************************************"<<Message_EndLine<<Message_EndLine;
S<<std::endl<<"****************************************************"<<std::endl<<std::endl;
// Affichage des valeurs
Standard_Boolean nams = names;
Standard_Integer maxnam = theeditor->MaxNameLength (names ? 0 : -1);
if (maxnam == 0) { maxnam = theeditor->MaxNameLength (0); nams = Standard_True; }
Standard_Integer nbmod = 0;
if (what != 0) S<<"Mod N0 Name Value"<<Message_EndLine;
else S<<" N0 Name Value"<<Message_EndLine;
if (what != 0) S<<"Mod N0 Name Value"<<std::endl;
else S<<" N0 Name Value"<<std::endl;
for (iv = 1; iv <= nbv; iv ++) {
Standard_Integer jv = NumberFromRank(iv);
@ -475,7 +475,7 @@ static void PrintList
Handle(TCollection_HAsciiString) str;
if (IsModified(jv)) S<<"* ";
else S<<" ";
S <<Interface_MSG::Blanks(iv,3)<<iv<<" "
S<<Interface_MSG::Blanks(iv,3)<<iv<<" "
<<name<<Interface_MSG::Blanks(name,maxnam)<<" ";
if (theeditor->IsList(jv)) {
@ -489,7 +489,7 @@ static void PrintList
if (what < 0) str = OriginalValue (jv);
if (what > 0) str = EditedValue (jv);
S << (str.IsNull() ? "(NULL)" : str->ToCString()) <<Message_EndLine;
S<< (str.IsNull() ? "(NULL)" : str->ToCString()) <<std::endl;
// Modified only
} else {
@ -497,7 +497,7 @@ static void PrintList
nbmod ++;
if (theeditor->IsList(jv)) {
Handle(TColStd_HSequenceOfHAsciiString) list= OriginalList (jv);
S <<Interface_MSG::Blanks(iv,3)<<iv<<" "
S<<Interface_MSG::Blanks(iv,3)<<iv<<" "
<<name<<Interface_MSG::Blanks(name,maxnam)<<" ORIG:";
PrintList (list,S,alsolist);
@ -509,14 +509,14 @@ static void PrintList
}
Handle(TCollection_HAsciiString) str = OriginalValue (jv);
S <<Interface_MSG::Blanks(iv,3)<<iv<<" "
S<<Interface_MSG::Blanks(iv,3)<<iv<<" "
<<name<<Interface_MSG::Blanks(name,maxnam)<<" ORIG:"
<< (str.IsNull() ? "(NULL)" : str->ToCString()) <<Message_EndLine;
<< (str.IsNull() ? "(NULL)" : str->ToCString()) <<std::endl;
str = EditedValue (jv);
S<<Interface_MSG::Blanks("",maxnam+4)<<" MOD :"<< (str.IsNull() ? "(NULL)" : str->ToCString()) <<Message_EndLine;
S<<Interface_MSG::Blanks("",maxnam+4)<<" MOD :"<< (str.IsNull() ? "(NULL)" : str->ToCString()) <<std::endl;
}
}
if (what == 0) S<<"On "<<nbv<<" Values, "<<nbmod<<" Modified"<<Message_EndLine;
if (what == 0) S<<"On "<<nbv<<" Values, "<<nbmod<<" Modified"<<std::endl;
}

6
src/IFSelect/IFSelect_EditForm.hxx
View File

@ -34,8 +34,6 @@ class Standard_Transient;
class Interface_InterfaceModel;
class IFSelect_ListEditor;
class TCollection_HAsciiString;
class Message_Messenger;
class IFSelect_EditForm;
DEFINE_STANDARD_HANDLE(IFSelect_EditForm, Standard_Transient)
@ -252,7 +250,7 @@ public:
Standard_EXPORT void ClearEdit (const Standard_Integer num = 0);
//! Prints Definitions, relative to the Editor
Standard_EXPORT void PrintDefs (const Handle(Message_Messenger)& S) const;
Standard_EXPORT void PrintDefs (Standard_OStream& S) const;
//! Prints Values, according to what and alsolist
//! <names> True : prints Long Names; False : prints Short Names
@ -261,7 +259,7 @@ public:
//! <what> = 0 : prints Modified Values (Original + Edited)
//! <alsolist> False (D) : lists are printed only as their count
//! <alsolist> True : lists are printed for all their items
Standard_EXPORT void PrintValues (const Handle(Message_Messenger)& S, const Standard_Integer what, const Standard_Boolean names, const Standard_Boolean alsolist = Standard_False) const;
Standard_EXPORT void PrintValues (Standard_OStream& S, const Standard_Integer what, const Standard_Boolean names, const Standard_Boolean alsolist = Standard_False) const;
//! Applies modifications to own data
//! Calls ApplyData then Clears Status according EditKeepStatus

20
src/IFSelect/IFSelect_Editor.cxx
View File

@ -103,14 +103,14 @@ Standard_Integer IFSelect_Editor::MaxList (const Standard_Integer num) const
return (IFSelect_EditValue) edm;
}
void IFSelect_Editor::PrintNames (const Handle(Message_Messenger)& S) const
void IFSelect_Editor::PrintNames (Standard_OStream& S) const
{
Standard_Integer i, nb = NbValues();
S<<"**** Editor : "<<Label()<<Message_EndLine;
S<<"**** Nb Values = "<<nb<<" **** Names / Labels"<<Message_EndLine;
S<<"**** Editor : "<<Label()<<std::endl;
S<<"**** Nb Values = "<<nb<<" **** Names / Labels"<<std::endl;
S<<" Num ";
if (themaxsh > 0) S<<"Short"<<Interface_MSG::Blanks("Short",themaxsh)<<" ";
S<<"Complete"<<Interface_MSG::Blanks("Complete",themaxco)<<" Label"<<Message_EndLine;
S<<"Complete"<<Interface_MSG::Blanks("Complete",themaxco)<<" Label"<<std::endl;
for (i = 1; i <= nb; i ++) {
Handle(Interface_TypedValue) tv = TypedValue(i);
@ -120,23 +120,23 @@ Standard_Integer IFSelect_Editor::MaxList (const Standard_Integer num) const
const TCollection_AsciiString& sho = theshorts(i);
S<<sho<<Interface_MSG::Blanks(sho.ToCString(),themaxsh)<<" ";
}
S<<tv->Name()<<Interface_MSG::Blanks(tv->Name(),themaxco)<<" "<<tv->Label()<<Message_EndLine;
S<<tv->Name()<<Interface_MSG::Blanks(tv->Name(),themaxco)<<" "<<tv->Label()<<std::endl;
}
}
void IFSelect_Editor::PrintDefs
(const Handle(Message_Messenger)& S, const Standard_Boolean labels) const
(Standard_OStream& S, const Standard_Boolean labels) const
{
Standard_Integer i, nb = NbValues();
S<<"**** Editor : "<<Label()<<Message_EndLine;
S<<"**** Nb Values = "<<nb<<" **** "<<(labels ? "Labels" : "Names")<<" / Definitions"<<Message_EndLine;
S<<"**** Editor : "<<Label()<<std::endl;
S<<"**** Nb Values = "<<nb<<" **** "<<(labels ? "Labels" : "Names")<<" / Definitions"<<std::endl;
S<<" Num ";
if (labels) S<<"Label"<<Interface_MSG::Blanks("Label",themaxla);
else {
if (themaxsh > 0) S<<"Short"<<Interface_MSG::Blanks("Short",themaxsh+1);
S<<"Complete"<<Interface_MSG::Blanks("Complete",themaxco);
}
S<<" Edit Mode & Definition"<<Message_EndLine;
S<<" Edit Mode & Definition"<<std::endl;
for (i = 1; i <= nb; i ++) {
Handle(Interface_TypedValue) tv = TypedValue(i);
@ -167,7 +167,7 @@ Standard_Integer IFSelect_Editor::MaxList (const Standard_Integer num) const
default : S<<"?????????"; break;
}
S<<" "<<tv->Definition()<<Message_EndLine;
S<<" "<<tv->Definition()<<std::endl;
}
}

5
src/IFSelect/IFSelect_Editor.hxx
View File

@ -33,7 +33,6 @@
#include <NCollection_DataMap.hxx>
class Standard_OutOfRange;
class Interface_TypedValue;
class Message_Messenger;
class IFSelect_EditForm;
class TCollection_HAsciiString;
class IFSelect_ListEditor;
@ -91,9 +90,9 @@ public:
//! complete. If not found, returns 0
Standard_EXPORT Standard_Integer NameNumber (const Standard_CString name) const;
Standard_EXPORT void PrintNames (const Handle(Message_Messenger)& S) const;
Standard_EXPORT void PrintNames (Standard_OStream& S) const;
Standard_EXPORT void PrintDefs (const Handle(Message_Messenger)& S, const Standard_Boolean labels = Standard_False) const;
Standard_EXPORT void PrintDefs (Standard_OStream& S, const Standard_Boolean labels = Standard_False) const;
//! Returns the MaxLength of, according to what :
//! <what> = -1 : length of short names

776
src/IFSelect/IFSelect_Functions.cxx
View File

File diff suppressed because it is too large Load Diff

27
src/IFSelect/IFSelect_ModelCopier.cxx
View File

@ -133,8 +133,7 @@ IFSelect_ModelCopier::IFSelect_ModelCopier () { }
const Handle(Interface_Protocol)& protocol,
Interface_CopyTool& TC)
{
Message::DefaultMessenger() <<
"** WorkSession : Copying split data before sending"<<Message_EndLine;
Message::SendInfo() << "** WorkSession : Copying split data before sending"<<std::endl;
const Interface_Graph& G = eval.Graph();
Interface_CheckIterator checks;
theshareout = eval.ShareOut();
@ -163,8 +162,7 @@ IFSelect_ModelCopier::IFSelect_ModelCopier () { }
(const Handle(IFSelect_WorkLibrary)& WL,
const Handle(Interface_Protocol)& protocol)
{
Message::DefaultMessenger() <<
"** WorkSession : Sending split data already copied"<<Message_EndLine;
Message::SendInfo() << "** WorkSession : Sending split data already copied"<<std::endl;
Standard_Integer nb = NbFiles();
Interface_CheckIterator checks;
if (nb > 0) {
@ -183,8 +181,7 @@ IFSelect_ModelCopier::IFSelect_ModelCopier () { }
if (!res) {
char mess[100]; sprintf(mess,"Split Send (WriteFile) abandon on file n0.%d",i);
checks.CCheck(0)->AddFail (mess);
Message::DefaultMessenger() <<
" ** Sending File n0."<<i<<" has failed, abandon **"<<Message_EndLine;
Message::SendInfo() << " ** Sending File n0."<<i<<" has failed, abandon **"<<std::endl;
return checks;
}
AddSentFile (FileName(i).ToCString());
@ -216,8 +213,7 @@ IFSelect_ModelCopier::IFSelect_ModelCopier () { }
const Interface_Graph& G = eval.Graph();
Interface_CheckIterator checks;
Standard_Integer i = 0;
Message::DefaultMessenger() <<
"** WorkSession : Copying then sending split data"<<Message_EndLine;
Message::SendInfo() << "** WorkSession : Copying then sending split data"<<std::endl;
theshareout = eval.ShareOut();
theremain = new TColStd_HArray1OfInteger(0,G.Size()); theremain->Init(0);
for (eval.Evaluate(); eval.More(); eval.Next()) {
@ -242,8 +238,7 @@ IFSelect_ModelCopier::IFSelect_ModelCopier () { }
if (!res) {
char mess[100]; sprintf(mess,"Split Send (WriteFile) abandon on file n0.%d",i);
checks.CCheck(0)->AddFail (mess);
Message::DefaultMessenger() <<
" ** Sending File "<<filename<<" has failed, abandon **"<<Message_EndLine;
Message::SendInfo() << " ** Sending File "<<filename<<" has failed, abandon **"<<std::endl;
checks.SetName ("X-STEP WorkSession : Split Send (only Write)");
return checks;
}
@ -264,8 +259,7 @@ IFSelect_ModelCopier::IFSelect_ModelCopier () { }
{
Interface_CheckIterator checks;
checks.SetName ("X-STEP WorkSession : Send All");
Message::DefaultMessenger() <<
"** WorkSession : Sending all data"<<Message_EndLine;
Message::SendInfo() << "** WorkSession : Sending all data"<<std::endl;
Handle(Interface_InterfaceModel) model = G.Model();
if (model.IsNull() || protocol.IsNull() || WL.IsNull()) return checks;
@ -285,7 +279,7 @@ IFSelect_ModelCopier::IFSelect_ModelCopier () { }
checks.Merge(checklst);
if (!res) checks.CCheck(0)->AddFail ("SendAll (WriteFile) has failed");
// if (!checks.IsEmpty(Standard_False)) {
// Message::DefaultMessenger() <<
// Message::SendWarning() <<
// " ** SendAll has produced Check Messages : **"<<std::endl;
// checks.Print (sout,model,Standard_False);
// }
@ -304,8 +298,7 @@ IFSelect_ModelCopier::IFSelect_ModelCopier () { }
{
Interface_CheckIterator checks;
checks.SetName ("X-STEP WorkSession : Send Selected");
Message::DefaultMessenger() <<
"** WorkSession : Sending selected data"<<Message_EndLine;
Message::SendInfo() << "** WorkSession : Sending selected data"<<std::endl;
Handle(Interface_InterfaceModel) original = G.Model();
if (original.IsNull() || protocol.IsNull() || WL.IsNull()) return checks;
Handle(Interface_InterfaceModel) newmod = original->NewEmptyModel();
@ -339,7 +332,7 @@ IFSelect_ModelCopier::IFSelect_ModelCopier () { }
checks.Merge(checklst);
if (!res) checks.CCheck(0)->AddFail ("SendSelected (WriteFile) has failed");
// if (!checks.IsEmpty(Standard_False)) {
// Message::DefaultMessenger() <<
// Message::SendWarning() <<
// " ** SendSelected has produced Check Messages : **"<<std::endl;
// checks.Print (sout,original,Standard_False);
// }
@ -409,7 +402,7 @@ IFSelect_ModelCopier::IFSelect_ModelCopier () { }
// Faut-il enregistrer les erreurs dans newmod ? bonne question
// if (!checks.IsEmpty(Standard_False)) {
// Message::DefaultMessenger() <<
// Message::SendWarning() <<
// " Messages on Copied Model n0 "<<numod<<", Dispatch Rank "<<dispnum<<std::endl;
// checks.Print(sout,newmod,Standard_False);
// }

76
src/IFSelect/IFSelect_SessionFile.cxx
View File

@ -137,15 +137,15 @@ static int deja = 0;
Standard_Boolean IFSelect_SessionFile::RecognizeFile
(const Standard_CString headerline)
{
Handle(Message_Messenger) sout = Message::DefaultMessenger();
Message_Messenger::StreamBuffer sout = Message::SendInfo();
SplitLine (headerline);
if (theline.Length() != 4) { sout<<"File Form Incorrect"<<Message_EndLine; return Standard_False; }
if (theline.Length() != 4) { sout<<"File Form Incorrect"<<std::endl; return Standard_False; }
Handle(Standard_Type) sesstype = thesess->DynamicType();
if (!theline.Value(1).IsEqual("!XSTEP") ||
!theline.Value(2).IsEqual("SESSION") ||
!theline.Value(4).IsEqual(sesstype->Name()) )
{ sout<<"Lineno."<<thenl<<" : File Header Description Incorrect"<<Message_EndLine; return Standard_False; }
{ sout<<"Lineno."<<thenl<<" : File Header Description Incorrect"<<std::endl; return Standard_False; }
// Value(3) definit la VERSION du format de fichier
return Standard_True;
}
@ -417,7 +417,7 @@ static int deja = 0;
Standard_Integer IFSelect_SessionFile::ReadSession ()
{
Handle(Message_Messenger) sout = Message::DefaultMessenger();
Message_Messenger::StreamBuffer sout = Message::SendInfo();
thedone = Standard_True;
// ... Preparation Specifique
@ -425,12 +425,12 @@ static int deja = 0;
thenames.Clear();
// .. Donnees generales, controle
if (!ReadLine()) return 1;
if (theline.Length() != 4) { sout<<"File Form Incorrect"<<Message_EndLine; return 1; }
if (theline.Length() != 4) { sout<<"File Form Incorrect"<<std::endl; return 1; }
Handle(Standard_Type) sesstype = thesess->DynamicType();
if (!theline.Value(1).IsEqual("!XSTEP") ||
!theline.Value(2).IsEqual("SESSION") ||
!theline.Value(4).IsEqual(sesstype->Name()) )
{ sout<<"Lineno."<<thenl<<" : File Header Description Incorrect"<<Message_EndLine; return 1; }
{ sout<<"Lineno."<<thenl<<" : File Header Description Incorrect"<<std::endl; return 1; }
// Value(3) definit la VERSION du format de fichier
if (!ReadLine()) return 1;
@ -444,15 +444,15 @@ static int deja = 0;
if (ungen.Value(1) == '!') break; // fin des generaux
if (ungen.IsEqual("ErrorHandle")) {
if (theline.Length() != 2)
{ sout<<"Lineno."<<thenl<<" : ErrorHandle Description Incorrect"<<Message_EndLine; continue; }
{ sout<<"Lineno."<<thenl<<" : ErrorHandle Description Incorrect"<<std::endl; continue; }
if (theline.Value(2).IsEqual("0"))
thesess->SetErrorHandle(Standard_False);
else if (theline.Value(2).IsEqual("1"))
thesess->SetErrorHandle(Standard_True);
else { sout<<"Lineno."<<thenl<<" : ErrorHandle Incorrect : "<<theline.Value(2)<<Message_EndLine; continue; }
else { sout<<"Lineno."<<thenl<<" : ErrorHandle Incorrect : "<<theline.Value(2)<<std::endl; continue; }
continue;
}
else sout<<"Lineno."<<thenl<<" : Unknown General Parameter : "<<ungen<<" , ignored"<<Message_EndLine;
else sout<<"Lineno."<<thenl<<" : Unknown General Parameter : "<<ungen<<" , ignored"<<std::endl;
}
// .. IntParams
@ -462,7 +462,7 @@ static int deja = 0;
if (!ReadLine()) return 1;
if (theline.Value(1).Value(1) == '!') break; // liste suivante
if (theline.Length() != 2)
{ sout<<"Lineno."<<thenl<<" : An Integer Parameter is badly defined"<<Message_EndLine; continue; }
{ sout<<"Lineno."<<thenl<<" : An Integer Parameter is badly defined"<<std::endl; continue; }
Handle(IFSelect_IntParam) par = new IFSelect_IntParam;
par->SetValue ( atoi(theline.Value(2).ToCString()) );
AddItem (par);
@ -474,7 +474,7 @@ static int deja = 0;
if (!ReadLine()) return 1;
if (theline.Value(1).Value(1) == '!') break; // liste suivante
if (theline.Length() != 2)
{ sout<<"Lineno."<<thenl<<" : A Text Parameter is badly defined"<<Message_EndLine; continue; }
{ sout<<"Lineno."<<thenl<<" : A Text Parameter is badly defined"<<std::endl; continue; }
// Attention, un texte peut contenir des blancs ... repartir de line(thenl)
TCollection_AsciiString oneline = thelist.Value(thenl);
Standard_Integer iw = 0, inc = 0;
@ -494,7 +494,7 @@ static int deja = 0;
if (!ReadLine()) return 1;
if (theline.Value(1).Value(1) == '!') break; // liste suivante
if (theline.Length() < 2)
{ sout<<"Lineno."<<thenl<<" : A Selection is badly defined"<<Message_EndLine; continue; }
{ sout<<"Lineno."<<thenl<<" : A Selection is badly defined"<<std::endl; continue; }
// .. Analyse de certains cas generaux
Handle(IFSelect_IntParam) low,up;
Standard_Integer firstown = 3;
@ -518,12 +518,12 @@ static int deja = 0;
if (item.IsNull()) continue;
DeclareAndCast(IFSelect_SelectExtract,sxt,item);
if (!sxt.IsNull()) {
if (direct == 0) sout<<"Lineno."<<thenl<<" : A SelectExtract is badly defined"<<Message_EndLine;
if (direct == 0) sout<<"Lineno."<<thenl<<" : A SelectExtract is badly defined"<<std::endl;
else sxt->SetDirect( (direct > 0) );
}
DeclareAndCast(IFSelect_SelectAnyList,sli,item);
if (!sli.IsNull()) {
if (numlist == 0) sout<<"Lineno."<<thenl<<" : A SelectAnyList is badly defined"<<Message_EndLine;
if (numlist == 0) sout<<"Lineno."<<thenl<<" : A SelectAnyList is badly defined"<<std::endl;
else sli->SetRange(low,up);
}
AddItem(item);
@ -535,29 +535,29 @@ static int deja = 0;
if (!ReadLine()) return 1;
if (theline.Value(1).Value(1) == '!') break; // liste suivante
if (theline.Length() < 3)
{ sout<<"Lineno."<<thenl<<" : A Selection Source List is badly defined"<<Message_EndLine; continue; }
{ sout<<"Lineno."<<thenl<<" : A Selection Source List is badly defined"<<std::endl; continue; }
DeclareAndCast(IFSelect_Selection,sel,ItemValue(1));
if (sel.IsNull())
{ sout<<"Lineno."<<thenl<<" : A Source List is not for a Selection"<<Message_EndLine; continue; }
{ sout<<"Lineno."<<thenl<<" : A Source List is not for a Selection"<<std::endl; continue; }
Standard_Integer nbs = atoi(theline.Value(2).ToCString());
// .. Differents cas reconnus
DeclareAndCast(IFSelect_SelectExtract,sxt,sel);
if (!sxt.IsNull()) {
if (nbs > 1)
sout<<"Lineno."<<thenl<<" : SelectExtract, more than one source, followings ignored"<<Message_EndLine;
sout<<"Lineno."<<thenl<<" : SelectExtract, more than one source, followings ignored"<<std::endl;
DeclareAndCast(IFSelect_Selection,source,ItemValue(3));
sxt->SetInput(source);
}
DeclareAndCast(IFSelect_SelectDeduct,sdt,sel);
if (!sdt.IsNull()) {
if (nbs > 1)
sout<<"Lineno."<<thenl<<" : SelectDeduct, more than one source, followings ignored"<<Message_EndLine;
sout<<"Lineno."<<thenl<<" : SelectDeduct, more than one source, followings ignored"<<std::endl;
sdt->SetInput(GetCasted(IFSelect_Selection,ItemValue(3)));
}
DeclareAndCast(IFSelect_SelectControl,sct,sel);
if (!sct.IsNull()) {
if (nbs != 2)
sout<<"Lineno."<<thenl<<" : SelectControl, not two sources, followings ignored"<<Message_EndLine;
sout<<"Lineno."<<thenl<<" : SelectControl, not two sources, followings ignored"<<std::endl;
sct->SetMainInput (GetCasted(IFSelect_Selection,ItemValue(3)));
sct->SetSecondInput (GetCasted(IFSelect_Selection,ItemValue(4)));
}
@ -574,13 +574,13 @@ static int deja = 0;
if (!ReadLine()) return 1;
if (theline.Value(1).Value(1) == '!') break; // liste suivante
if (theline.Length() < 2)
{ sout<<"Lineno."<<thenl<<" : A Modifier is badly defined"<<Message_EndLine; continue; }
{ sout<<"Lineno."<<thenl<<" : A Modifier is badly defined"<<std::endl; continue; }
Handle(Standard_Transient) item; // a fournir ...
ReadOwn(item);
if (item.IsNull()) continue;
DeclareAndCast(IFSelect_GeneralModifier,modif,item);
if (modif.IsNull())
{ sout<<"Lineno."<<thenl<<" : A Modifier has not been Recognized"<<Message_EndLine; continue; }
{ sout<<"Lineno."<<thenl<<" : A Modifier has not been Recognized"<<std::endl; continue; }
AddItem(modif,Standard_False); // active plus tard
}
@ -590,13 +590,13 @@ static int deja = 0;
if (!ReadLine()) return 1;
if (theline.Value(1).Value(1) == '!') break; // liste suivante
if (theline.Length() < 2)
{ sout<<"Lineno."<<thenl<<" : A Transformer is badly defined"<<Message_EndLine; continue; }
{ sout<<"Lineno."<<thenl<<" : A Transformer is badly defined"<<std::endl; continue; }
Handle(Standard_Transient) item; // a fournir ...
ReadOwn(item);
if (item.IsNull()) continue;
DeclareAndCast(IFSelect_Transformer,trf,item);
if (trf.IsNull())
{ sout<<"Lineno."<<thenl<<" : A Transformer has not been Recognized"<<Message_EndLine; continue; }
{ sout<<"Lineno."<<thenl<<" : A Transformer has not been Recognized"<<std::endl; continue; }
AddItem(trf,Standard_False); // active plus tard
}
@ -606,7 +606,7 @@ static int deja = 0;
if (!ReadLine()) return 1;
if (theline.Value(1).Value(1) == '!') break; // liste suivante
if (theline.Length() < 3)
{ sout<<"Lineno."<<thenl<<" : A Dispatch is badly defined"<<Message_EndLine; continue; }
{ sout<<"Lineno."<<thenl<<" : A Dispatch is badly defined"<<std::endl; continue; }
DeclareAndCast(IFSelect_Selection,input,ItemValue(3));
SetLastGeneral(3);
Handle(Standard_Transient) item; // a fournir ...
@ -614,7 +614,7 @@ static int deja = 0;
if (item.IsNull()) continue;
DeclareAndCast(IFSelect_Dispatch,disp,item);
if (disp.IsNull())
{ sout<<"Lineno."<<thenl<<" : A Dispatch has not been Recognized"<<Message_EndLine; continue; }
{ sout<<"Lineno."<<thenl<<" : A Dispatch has not been Recognized"<<std::endl; continue; }
AddItem(disp);
thesess->SetItemSelection(disp,input);
}
@ -631,7 +631,7 @@ static int deja = 0;
if (!ReadLine()) return 1;
if (theline.Value(1).Value(1) == '!') break; // liste suivante
if (theline.Length() != 2)
{ sout<<"Lineno."<<thenl<<" : A File Root is badly defined"<<Message_EndLine; continue; }
{ sout<<"Lineno."<<thenl<<" : A File Root is badly defined"<<std::endl; continue; }
DeclareAndCast(IFSelect_Dispatch,disp,ItemValue(1));
thesess->SetFileRoot (disp,theline.Value(2).ToCString());
}
@ -652,12 +652,12 @@ static int deja = 0;
if (!ReadLine()) return 1;
if (theline.Value(1).Value(1) == '!') break; // liste suivante
if (theline.Length() < 3)
{ sout<<"Lineno."<<thenl<<" : A General Modifier is badly defined"<<Message_EndLine; continue; }
{ sout<<"Lineno."<<thenl<<" : A General Modifier is badly defined"<<std::endl; continue; }
DeclareAndCast(IFSelect_GeneralModifier,modif,ItemValue(1));
DeclareAndCast(IFSelect_Selection,input,ItemValue(2));
DeclareAndCast(IFSelect_Dispatch,disp,ItemValue(3));
if (modif.IsNull())
{ sout<<"Lineno."<<thenl<<" : A General Modifier has not been Recognized"<<Message_EndLine; continue; }
{ sout<<"Lineno."<<thenl<<" : A General Modifier has not been Recognized"<<std::endl; continue; }
thesess->SetItemSelection (modif,input);
if (!disp.IsNull()) thesess->SetAppliedModifier (modif,disp);
else thesess->SetAppliedModifier (modif,thesess->ShareOut());
@ -670,11 +670,11 @@ static int deja = 0;
Standard_Integer IFSelect_SessionFile::ReadEnd ()
{
Handle(Message_Messenger) sout = Message::DefaultMessenger();
Message_Messenger::StreamBuffer sout = Message::SendInfo();
if ( theline.Length() != 2 ||
!theline.Value(1).IsEqual("!XSTEP") ||
!theline.Value(2).IsEqual("END"))
{ sout<<"End of File Incorrect, lineno"<<thenl<<Message_EndLine; return 1; }
{ sout<<"End of File Incorrect, lineno"<<thenl<<std::endl; return 1; }
return 0;
}
@ -716,7 +716,7 @@ static int deja = 0;
Standard_Boolean IFSelect_SessionFile::ReadOwn
(Handle(Standard_Transient)& item)
{
Handle(Message_Messenger) sout = Message::DefaultMessenger();
Message_Messenger::StreamBuffer sout = Message::SendInfo();
if (theline.Length() < 2) return Standard_False;
const TCollection_AsciiString& type = theline.Value(2);
@ -730,7 +730,7 @@ static int deja = 0;
if (dumper->ReadOwn(*this,type,item)) break;
dumper = dumper->Next();
}
if (dumper.IsNull()) sout<<" -- Lineno."<<thenl<<" : an Item could not be read"<<Message_EndLine;
if (dumper.IsNull()) sout<<" -- Lineno."<<thenl<<" : an Item could not be read"<<std::endl;
return (!dumper.IsNull()); // IsNull -> echec
}
@ -738,7 +738,7 @@ static int deja = 0;
void IFSelect_SessionFile::AddItem
(const Handle(Standard_Transient)& item, const Standard_Boolean active)
{
Handle(Message_Messenger) sout = Message::DefaultMessenger();
Message_Messenger::StreamBuffer sout = Message::SendInfo();
const TCollection_AsciiString& name = theline.Value(1);
Standard_Integer id = 0;
@ -749,7 +749,7 @@ static int deja = 0;
else id = thesess->AddNamedItem(name.ToCString(),item,active);
}
else sout<<"Lineno."<<thenl<<" -- Name : "<<name
<<" : Item could not be defined" << Message_EndLine;
<<" : Item could not be defined" << std::endl;
thenames.Bind(name,id);
}
@ -785,7 +785,7 @@ static int deja = 0;
void IFSelect_SessionFile::SendItem (const Handle(Standard_Transient)& par)
{
Handle(Message_Messenger) sout = Message::DefaultMessenger();
Message_Messenger::StreamBuffer sout = Message::SendInfo();
char laligne[100];
Standard_Integer filenum = 0;
@ -793,7 +793,7 @@ static int deja = 0;
if (id != 0) filenum = thenums->Value(id);
if (filenum == 0) {
if (!par.IsNull()) sout << "Lineno " << thenl << " -- Unknown Item : "
<< " Type:" << par->DynamicType()->Name() << Message_EndLine; //sout<<Handle par
<< " Type:" << par->DynamicType()->Name() << std::endl; //sout<<Handle par
SendVoid();
thedone = Standard_False;
return;
@ -865,7 +865,7 @@ static int deja = 0;
Handle(Standard_Transient) IFSelect_SessionFile::ItemValue
(const Standard_Integer num) const
{
Handle(Message_Messenger) sout = Message::DefaultMessenger();
Message_Messenger::StreamBuffer sout = Message::SendInfo();
Handle(Standard_Transient) res;
Standard_Integer nm = num + thelastgen;
@ -876,7 +876,7 @@ static int deja = 0;
if (name.IsEqual("$")) return res; // item non-defini justement
if (!thenames.Find(name, id)) {
sout << " -- Item Unknown in File : " << name
<< " lineno " << thenl << " param." << nm << Message_EndLine;
<< " lineno " << thenl << " param." << nm << std::endl;
id = 0;
}
return thesess->Item(id);

3
src/IFSelect/IFSelect_SessionPilot.cxx
View File

@ -344,7 +344,8 @@ IFSelect_SessionPilot::IFSelect_SessionPilot (const Standard_CString prompt)
}
counter->AddWithGraph (list,thesession->Graph());
}
counter->PrintList(Message::DefaultMessenger(),thesession->Model(),mode);
Message_Messenger::StreamBuffer sout = Message::SendInfo();
counter->PrintList (sout, thesession->Model(), mode);
return IFSelect_RetVoid;
}

51
src/IFSelect/IFSelect_SignatureList.cxx
View File

@ -16,8 +16,6 @@
#include <Interface_InterfaceModel.hxx>
#include <Interface_Macros.hxx>
#include <Interface_MSG.hxx>
#include <Message.hxx>
#include <Message_Messenger.hxx>
#include <Standard_Transient.hxx>
#include <Standard_Type.hxx>
#include <TCollection_HAsciiString.hxx>
@ -147,30 +145,30 @@ IFSelect_SignatureList::IFSelect_SignatureList
{ return thename->ToCString(); }
void IFSelect_SignatureList::PrintCount (const Handle(Message_Messenger)& S) const
void IFSelect_SignatureList::PrintCount (Standard_OStream& S) const
{
Standard_Integer nbtot = 0, nbsign = 0;
NCollection_IndexedDataMap<TCollection_AsciiString, Standard_Integer>::Iterator iter(thedicount);
S << " Count "<<thename->ToCString()<<"\n ----- -----------"<<Message_EndLine;
S << " Count "<<thename->ToCString()<<"\n ----- -----------"<<std::endl;
for (; iter.More(); iter.Next()) {
Standard_Integer val = iter.Value();
S << Interface_MSG::Blanks(val,6) << val <<" "<<iter.Key()<<Message_EndLine;
S << Interface_MSG::Blanks(val,6) << val <<" "<<iter.Key()<<std::endl;
nbtot += val;
nbsign ++;
}
if (thenbnuls > 0) S << thename->ToCString()<< " Nul : " << thenbnuls<<Message_EndLine;
S<<" Nb Total:"<<nbtot<<" for "<<nbsign<<" items"<<Message_EndLine;
if (thenbnuls > 0) S << thename->ToCString()<< " Nul : " << thenbnuls <<std::endl;
S << " Nb Total:"<<nbtot<<" for "<<nbsign<<" items"<<std::endl;
}
void IFSelect_SignatureList::PrintList
(const Handle(Message_Messenger)& S, const Handle(Interface_InterfaceModel)& model,
(Standard_OStream& S, const Handle(Interface_InterfaceModel)& model,
const IFSelect_PrintCount mod) const
{
if (mod == IFSelect_ItemsByEntity) return;
if (mod == IFSelect_CountByItem) { PrintCount (S); return; }
if (mod == IFSelect_CountSummary) { PrintSum (S); return; }
if (!HasEntities()) {
S <<" SignatureList "<<Name()<<" : PrintList, list not available"<<Message_EndLine;
S <<" SignatureList "<<Name()<<" : PrintList, list not available"<<std::endl;
PrintCount(S);
return;
}
@ -178,35 +176,36 @@ IFSelect_SignatureList::IFSelect_SignatureList
NCollection_IndexedDataMap<TCollection_AsciiString, Handle(Standard_Transient)>::Iterator iter(thediclist);
for (; iter.More(); iter.Next()) {
DeclareAndCast(TColStd_HSequenceOfTransient,list,iter.Value());
S<<Name()<<" : "<<iter.Key()<<Message_EndLine;
if (list.IsNull()) { S<<" - (empty list)"<<Message_EndLine; continue; }
S<<Name()<<" : "<<iter.Key()<<std::endl;
if (list.IsNull()) { S<<" - (empty list)"<<std::endl; continue; }
Standard_Integer nb = list->Length();
S<<" - Nb: "<<nb<<" : ";
Standard_Integer nc = nb; if (nb > 5 && mod == IFSelect_ShortByItem) nc = 5;
for (Standard_Integer i = 1; i <= nc; i ++) {
if (list->Value(i).IsNull()) {
S<<" 0"; if (mod == IFSelect_EntitiesByItem) S<<":(Global)";
S << " 0";
if (mod == IFSelect_EntitiesByItem) S<<":(Global)";
continue;
}
Standard_Integer num = model->Number(list->Value(i));
if (num == IFSelect_ShortByItem) { S<<" ??"; continue; }
S<<" "<<num;
if (mod == IFSelect_EntitiesByItem)
{ S<<":"; model->PrintLabel(list->Value(i),S); }
{ S<<":"; model->PrintLabel(list->Value(i), S); }
}
if (nc < nb) S<<" .. etc";
S<<Message_EndLine;
S<<std::endl;
nbtot += nb;
nbsign ++;
}
S<<" Nb Total:"<<nbtot<<" for "<<nbsign<<" items"<<Message_EndLine;
S <<" Nb Total:"<<nbtot<<" for "<<nbsign<<" items"<<std::endl;
}
void IFSelect_SignatureList::PrintSum (const Handle(Message_Messenger)& S) const
void IFSelect_SignatureList::PrintSum (Standard_OStream& S) const
{
NCollection_IndexedDataMap<TCollection_AsciiString, Standard_Integer>::Iterator iter(thedicount);
S << " Summary "<<thename->ToCString()<<"\n ----- -----------"<<Message_EndLine;
S << " Summary "<<thename->ToCString()<<"\n ----- -----------"<<std::endl;
Standard_Integer nbtot = 0, nbsign = 0, maxent = 0, nbval = 0, nbve = 0, minval = 0, maxval = 0, totval = 0;
for (; iter.More(); iter.Next()) {
Standard_Integer nbent = iter.Value();
@ -232,18 +231,18 @@ IFSelect_SignatureList::IFSelect_SignatureList
nbve += nbent;
totval += (val*nbent);
}
S << " Nb Total:"<<nbtot<<" for "<<nbsign<<" items"<<Message_EndLine;
S << " Highest count of entities : "<<maxent<<" on one item"<<Message_EndLine;
S << " Nb Total:"<<nbtot<<" for "<<nbsign<<" items"<<std::endl;
S << " Highest count of entities : "<<maxent<<" on one item"<<std::endl;
if (nbval > 0) {
S<<" Summary on Integer Values"<<Message_EndLine;
S<<" Nb Integer Items : "<<nbval<<Message_EndLine;
S<<" For Nb Entities : "<<nbve<<Message_EndLine;
S<<" Cumulated Values : "<<totval<<Message_EndLine;
S<<" Maximum Value : "<<maxval<<Message_EndLine;
S<<" Summary on Integer Values"<<std::endl;
S<<" Nb Integer Items : "<<nbval<<std::endl;
S<<" For Nb Entities : "<<nbve<<std::endl;
S<<" Cumulated Values : "<<totval<<std::endl;
S <<" Maximum Value : "<<maxval<<std::endl;
Standard_Integer avg1, avg2;
avg1 = totval/nbve;
avg2 = ((totval - (avg1*nbve)) * 10) / nbve;
S<<" Average Value : "<<avg1<<" "<<avg2<<"/10"<<Message_EndLine;
S<<" Minimum Value : "<<minval<<Message_EndLine;
S <<" Average Value : "<<avg1<<" "<<avg2<<"/10"<<std::endl;
S <<" Minimum Value : "<<minval<<std::endl;
}
}

7
src/IFSelect/IFSelect_SignatureList.hxx
View File

@ -31,7 +31,6 @@
#include <Standard_Transient.hxx>
#include <NCollection_IndexedDataMap.hxx>
class TCollection_HAsciiString;
class Message_Messenger;
class Interface_InterfaceModel;
@ -117,7 +116,7 @@ public:
Standard_EXPORT virtual Standard_CString Name() const;
//! Prints the counts of items (not the list)
Standard_EXPORT virtual void PrintCount (const Handle(Message_Messenger)& S) const;
Standard_EXPORT virtual void PrintCount (Standard_OStream& S) const;
//! Prints the lists of items, if they are present (else, prints
//! a message "no list available")
@ -129,13 +128,13 @@ public:
//! - ShortByItem(D) complete list of entity numbers (0: "Global")
//! - EntitiesByItem : list of (entity number/PrintLabel from the model)
//! other modes are ignored
Standard_EXPORT virtual void PrintList (const Handle(Message_Messenger)& S, const Handle(Interface_InterfaceModel)& model, const IFSelect_PrintCount mod = IFSelect_ListByItem) const;
Standard_EXPORT virtual void PrintList (Standard_OStream& S, const Handle(Interface_InterfaceModel)& model, const IFSelect_PrintCount mod = IFSelect_ListByItem) const;
//! Prints a summary
//! Item which has the greatest count of entities
//! For items which are numeric values : their count, maximum,
//! minimum values, cumul, average
Standard_EXPORT virtual void PrintSum (const Handle(Message_Messenger)& S) const;
Standard_EXPORT virtual void PrintSum (Standard_OStream& S) const;

6
src/IFSelect/IFSelect_TransformStandard.cxx
View File

@ -146,7 +146,7 @@ IFSelect_TransformStandard::IFSelect_TransformStandard ()
Interface_CopyTool& TC, Interface_CheckIterator& checks,
Handle(Interface_InterfaceModel)& newmod) const
{
Handle(Message_Messenger) sout = Message::DefaultMessenger();
Message_Messenger::StreamBuffer sout = Message::SendInfo();
Standard_Boolean res = Standard_True;
Standard_Boolean chg = Standard_False;
Standard_Integer nb = NbModifiers();
@ -176,11 +176,11 @@ IFSelect_TransformStandard::IFSelect_TransformStandard ()
Interface_CheckIterator checklist = ctx.CheckList();
if (!checklist.IsEmpty(Standard_False)) {
checks.Merge(checklist);
sout<<"IFSelect_TransformStandard : Messages from Modifier n0 "<<i<<" of "<<nb<<Message_EndLine;
sout<<"IFSelect_TransformStandard : Messages from Modifier n0 "<<i<<" of "<<nb<<std::endl;
checklist.Print(sout,newmod,Standard_False);
}
if (!checklist.IsEmpty(Standard_True)) {
sout<<" -- Abandon TransformStandard --"<<Message_EndLine;
sout<<" -- Abandon TransformStandard --"<<std::endl;
res = Standard_False; break;
}
}

4
src/IFSelect/IFSelect_WorkLibrary.cxx
View File

@ -18,8 +18,6 @@
#include <Interface_EntityIterator.hxx>
#include <Interface_InterfaceModel.hxx>
#include <Interface_Protocol.hxx>
#include <Message.hxx>
#include <Message_Messenger.hxx>
#include <Standard_Transient.hxx>
#include <Standard_Type.hxx>
#include <TCollection_HAsciiString.hxx>
@ -48,7 +46,7 @@ IFSelect_WorkLibrary::IFSelect_WorkLibrary () { thelevdef = 0; }
(const Handle(Interface_InterfaceModel)& model,
const Handle(Interface_Protocol)& protocol,
const Handle(Standard_Transient)& entity,
const Handle(Message_Messenger)& S) const
Standard_OStream& S) const
{
if (thelevhlp.IsNull()) DumpEntity (model,protocol,entity,S,0);
else DumpEntity (model,protocol,entity,S,thelevdef);

6
src/IFSelect/IFSelect_WorkLibrary.hxx
View File

@ -31,8 +31,6 @@ class IFSelect_ContextWrite;
class Interface_EntityIterator;
class Interface_CopyTool;
class Standard_Transient;
class Message_Messenger;
class IFSelect_WorkLibrary;
DEFINE_STANDARD_HANDLE(IFSelect_WorkLibrary, Standard_Transient)
@ -98,10 +96,10 @@ public:
//! for each norm. <model> helps to identify, number ... entities.
//! <level> is to be interpreted for each norm (because of the
//! formats which can be very different)
Standard_EXPORT virtual void DumpEntity (const Handle(Interface_InterfaceModel)& model, const Handle(Interface_Protocol)& protocol, const Handle(Standard_Transient)& entity, const Handle(Message_Messenger)& S, const Standard_Integer level) const = 0;
Standard_EXPORT virtual void DumpEntity (const Handle(Interface_InterfaceModel)& model, const Handle(Interface_Protocol)& protocol, const Handle(Standard_Transient)& entity, Standard_OStream& S, const Standard_Integer level) const = 0;
//! Calls deferred DumpEntity with the recorded default level
Standard_EXPORT void DumpEntity (const Handle(Interface_InterfaceModel)& model, const Handle(Interface_Protocol)& protocol, const Handle(Standard_Transient)& entity, const Handle(Message_Messenger)& S) const;
Standard_EXPORT void DumpEntity (const Handle(Interface_InterfaceModel)& model, const Handle(Interface_Protocol)& protocol, const Handle(Standard_Transient)& entity, Standard_OStream& S) const;
//! Records a default level and a maximum value for level
//! level for DumpEntity can go between 0 and <max>

380
src/IFSelect/IFSelect_WorkSession.cxx
View File

@ -222,10 +222,10 @@ IFSelect_ReturnStatus IFSelect_WorkSession::ReadFile
else status = IFSelect_RetFail;
}
catch(Standard_Failure const& anException) {
Handle(Message_Messenger) sout = Message::DefaultMessenger();
Message_Messenger::StreamBuffer sout = Message::SendInfo();
sout<<" **** Interruption ReadFile par Exception : ****\n";
sout << anException.GetMessageString();
sout<<"\n Abandon"<<Message_EndLine;
sout<<"\n Abandon"<<std::endl;
status = IFSelect_RetFail;
}
if (status != IFSelect_RetDone) return status;
@ -1245,10 +1245,10 @@ Interface_EntityIterator IFSelect_WorkSession::EvalSelection
iter = EvalSelection(sel); // appel normal (donc, code pas duplique)
}
catch (Standard_Failure const& anException) {
Handle(Message_Messenger) sout = Message::DefaultMessenger();
Message_Messenger::StreamBuffer sout = Message::SendInfo();
sout<<" **** Interruption EvalSelection par Exception : ****\n";
sout<<anException.GetMessageString();
sout<<"\n Abandon"<<Message_EndLine;
sout<<"\n Abandon"<<std::endl;
}
errhand = theerrhand;
return iter;
@ -1288,10 +1288,10 @@ Handle(TColStd_HSequenceOfTransient) IFSelect_WorkSession::SelectionResult
res = SelectionResult(sel); // appel normal (->code unique)
}
catch (Standard_Failure const& anException) {
Handle(Message_Messenger) sout = Message::DefaultMessenger();
Message_Messenger::StreamBuffer sout = Message::SendInfo();
sout<<" **** Interruption SelectionResult par Exception : ****\n";
sout<<anException.GetMessageString();
sout<<"\n Abandon"<<Message_EndLine;
sout<<"\n Abandon"<<std::endl;
}
errhand = theerrhand;
return res;
@ -1708,8 +1708,8 @@ Standard_Integer IFSelect_WorkSession::RunTransformer
(thegraph->Graph(),theprotocol,checks,newmod);
if (!checks.IsEmpty(Standard_False)) {
Handle(Message_Messenger) sout = Message::DefaultMessenger();
sout<<" ** RunTransformer has produced Check Messages : **"<<Message_EndLine;
Message_Messenger::StreamBuffer sout = Message::SendInfo();
sout<<" ** RunTransformer has produced Check Messages : **"<<std::endl;
checks.Print (sout,myModel,Standard_False);
}
thecheckdone = Standard_False;
@ -2021,10 +2021,10 @@ void IFSelect_WorkSession::EvaluateFile ()
EvaluateFile(); // appel normal (donc, code pas duplique)
}
catch (Standard_Failure const& anException) {
Handle(Message_Messenger) sout = Message::DefaultMessenger();
Message_Messenger::StreamBuffer sout = Message::SendInfo();
sout<<" **** Interruption EvaluateFile par Exception : ****\n";
sout<<anException.GetMessageString();
sout<<"\n Abandon"<<Message_EndLine;
sout<<"\n Abandon"<<std::endl;
checks.CCheck(0)->AddFail ("Exception Raised -> Abandon");
}
errhand = theerrhand;
@ -2035,8 +2035,8 @@ void IFSelect_WorkSession::EvaluateFile ()
IFSelect_ShareOutResult R(theshareout,thegraph->Graph());
checks = thecopier->Copy (R,thelibrary,theprotocol);
if (!checks.IsEmpty(Standard_False)) {
Handle(Message_Messenger) sout = Message::DefaultMessenger();
sout<<" ** EvaluateFile has produced Check Messages : **"<<Message_EndLine;
Message_Messenger::StreamBuffer sout = Message::SendInfo();
sout<<" ** EvaluateFile has produced Check Messages : **"<<std::endl;
checks.Print (sout,myModel,Standard_False);
}
thecopier->SetRemaining (thegraph->CGraph());
@ -2125,10 +2125,10 @@ Standard_Boolean IFSelect_WorkSession::SendSplit ()
return SendSplit(); // appel normal (donc, code pas duplique)
}
catch (Standard_Failure const& anException) {
Handle(Message_Messenger) sout = Message::DefaultMessenger();
Message_Messenger::StreamBuffer sout = Message::SendInfo();
sout<<" **** Interruption SendSplit par Exception : ****\n";
sout<<anException.GetMessageString();
sout<<"\n Abandon"<<Message_EndLine;
sout<<"\n Abandon"<<std::endl;
checks.CCheck(0)->AddFail ("Exception Raised -> Abandon");
}
errhand = theerrhand;
@ -2142,8 +2142,8 @@ Standard_Boolean IFSelect_WorkSession::SendSplit ()
return Standard_False;
}
if (!IsLoaded()) {
Handle(Message_Messenger) sout = Message::DefaultMessenger();
sout<< " *** Data for SendSplit not available ***"<<Message_EndLine;
Message_Messenger::StreamBuffer sout = Message::SendInfo();
sout<< " *** Data for SendSplit not available ***"<<std::endl;
checks.CCheck(0)->AddFail("Data not available");
thecheckrun = checks;
return Standard_False;
@ -2160,7 +2160,7 @@ Standard_Boolean IFSelect_WorkSession::SendSplit ()
if (theshareout.IsNull()) return Standard_False;
Standard_Integer i, nbd = theshareout->NbDispatches();
Standard_Integer nf = 0;
Handle(Message_Messenger) sout = Message::DefaultMessenger();
Message_Messenger::StreamBuffer sout = Message::SendInfo();
sout<<" SendSplit .. ";
for (i = 1; i <= nbd; i ++) {
Handle(IFSelect_Dispatch) disp = theshareout->Dispatch(i);
@ -2187,7 +2187,7 @@ Standard_Boolean IFSelect_WorkSession::SendSplit ()
if (stat != IFSelect_RetDone) std::cout<<"File "<<filnam<<" failed"<<std::endl;
}
}
sout<<" .. Files Written : "<<nf<<Message_EndLine;
sout<<" .. Files Written : "<<nf<<std::endl;
}
thecheckrun = checks;
return Standard_True;
@ -2258,7 +2258,7 @@ Standard_Integer IFSelect_WorkSession::MaxSendingCount () const
Standard_Boolean IFSelect_WorkSession::SetRemaining
(const IFSelect_RemainMode mode)
{
Handle(Message_Messenger) sout = Message::DefaultMessenger();
Message_Messenger::StreamBuffer sout = Message::SendInfo();
if (!IsLoaded()) return Standard_False;
if (mode == IFSelect_RemainForget) {
Standard_Integer nb = thegraph->Graph().Size();
@ -2271,9 +2271,9 @@ Standard_Boolean IFSelect_WorkSession::SetRemaining
Interface_CopyTool TC(myModel,theprotocol);
thecopier->CopiedRemaining (thegraph->Graph(),thelibrary,TC,newmod);
if (newmod.IsNull()) {
sout<<" No Remaining Data recorded"<<Message_EndLine; return Standard_False;
sout<<" No Remaining Data recorded"<<std::endl; return Standard_False;
} else if (newmod == myModel) {
sout<<" Remaining causes all original data to be kept"<<Message_EndLine;
sout<<" Remaining causes all original data to be kept"<<std::endl;
thecopier->SetRemaining (thegraph->CGraph());
return Standard_False;
} else {
@ -2295,17 +2295,17 @@ Standard_Boolean IFSelect_WorkSession::SetRemaining
for (Standard_Integer i = 1; i <= nb; i ++)
{ if (thegraph->Graph().Status(i) >= 0) ne ++; }
if (ne == 0) {
sout<<" - All entities are remaining, none yet sent"<<Message_EndLine; return Standard_True;
sout<<" - All entities are remaining, none yet sent"<<std::endl; return Standard_True;
}
Interface_EntityIterator iter = SentList(0);
nb = iter.NbEntities();
if (nb == 0) {
sout<<" - No recorded remaining entities"<<Message_EndLine; return Standard_True;
sout<<" - No recorded remaining entities"<<std::endl; return Standard_True;
}
sout <<" -- Recorded Remaining (not yet sent) Entities --"<<Message_EndLine;
ListEntities(iter,2);
sout <<" -- Recorded Remaining (not yet sent) Entities --"<<std::endl;
ListEntities (iter, 2, sout);
sout << " -- Maximum Sending Count (i.e. duplication in files) "<<
MaxSendingCount() << Message_EndLine;
MaxSendingCount() << std::endl;
/*
sout<< " - Now, dispatches are deactivated"<<std::endl;
@ -2348,10 +2348,10 @@ IFSelect_ReturnStatus IFSelect_WorkSession::SendAll
checks = thecopier->SendAll(filename,thegraph->Graph(),thelibrary,theprotocol);
}
catch (Standard_Failure const& anException) {
Handle(Message_Messenger) sout = Message::DefaultMessenger();
Message_Messenger::StreamBuffer sout = Message::SendInfo();
sout<<" **** Interruption SendAll par Exception : ****\n";
sout<<anException.GetMessageString();
sout<<"\n Abandon"<<Message_EndLine;
sout<<"\n Abandon"<<std::endl;
errhand = theerrhand;
checks.CCheck(0)->AddFail ("Exception Raised -> Abandon");
thecheckrun = checks;
@ -2398,10 +2398,10 @@ IFSelect_ReturnStatus IFSelect_WorkSession::SendSelected
return SendSelected (filename,sel); // appel normal
}
catch (Standard_Failure const& anException) {
Handle(Message_Messenger) sout = Message::DefaultMessenger();
Message_Messenger::StreamBuffer sout = Message::SendInfo();
sout<<" **** Interruption SendSelected par Exception : ****\n";
sout<<anException.GetMessageString();
sout<<"\n Abandon"<<Message_EndLine;
sout<<"\n Abandon"<<std::endl;
checks.CCheck(0)->AddFail ("Exception Raised -> Abandon");
errhand = theerrhand;
thecheckrun = checks;
@ -2844,32 +2844,32 @@ void IFSelect_WorkSession::SetParams
void IFSelect_WorkSession::TraceStatics
(const Standard_Integer use, const Standard_Integer mode) const
{
Handle(Message_Messenger) sout = Message::DefaultMessenger();
Message_Messenger::StreamBuffer sout = Message::SendInfo();
if (use > 0) {
if (mode == 0) sout<<"******************************************"<<Message_EndLine;
if (mode == 0) sout<<"******************************************"<<std::endl;
if (use == 1) {
if (mode == 0) sout<<"***** General Parameters *****"<<Message_EndLine;
if (mode == 0) sout<<"***** General Parameters *****"<<std::endl;
} else if (use == 2) {
if (mode == 0) sout<<"***** Load File *****"<<Message_EndLine;
if (mode == 0) sout<<"***** Load File *****"<<std::endl;
} else if (use == 3) {
if (mode == 0) sout<<"***** Write File *****"<<Message_EndLine;
if (mode == 0) sout<<"***** Write File *****"<<std::endl;
} else if (use == 4) {
if (mode == 0) sout<<"***** Split File *****"<<Message_EndLine;
if (mode == 0) sout<<"***** Split File *****"<<std::endl;
} else if (use == 5) {
if (mode == 0) sout<<"***** Transfer (Read) *****"<<Message_EndLine;
if (mode == 0) sout<<"***** Transfer (Read) *****"<<std::endl;
} else if (use == 6) {
if (mode == 0) sout<<"***** Transfer (Write) *****"<<Message_EndLine;
if (mode == 0) sout<<"***** Transfer (Write) *****"<<std::endl;
}
if (mode == 0) sout<<"******************************************"<<Message_EndLine<<Message_EndLine;
if (mode == 0) sout<<"******************************************"<<std::endl<<std::endl;
}
// Echainements particuliers (use > 0)
if (use == 5) {
TraceStatics (-2,mode);
if (mode == 0) sout<<Message_EndLine;
if (mode == 0) sout<<std::endl;
} else if (use == 4 || use == 6) {
TraceStatics (-3,mode);
if (mode == 0) sout<<Message_EndLine;
if (mode == 0) sout<<std::endl;
}
// Valeurs particulieres
@ -2880,14 +2880,14 @@ void IFSelect_WorkSession::TraceStatics
} else if (use == 4 || use == -4) { // Split : Prefix & cie
if (mode == 0) {
Handle(TCollection_HAsciiString) str = theshareout->Prefix();
if (!str.IsNull()) sout << "Prefix : "<<str->ToCString()<<Message_EndLine;
else sout << "Prefix not Defined" << Message_EndLine;
if (!str.IsNull()) sout << "Prefix : "<<str->ToCString()<<std::endl;
else sout << "Prefix not Defined" << std::endl;
str = theshareout->DefaultRootName();
if (!str.IsNull()) sout << "Default Root : "<<str->ToCString()<<Message_EndLine;
else sout << "Default Root not Defined" << Message_EndLine;
if (!str.IsNull()) sout << "Default Root : "<<str->ToCString()<<std::endl;
else sout << "Default Root not Defined" << std::endl;
str = theshareout->Extension();
if (!str.IsNull()) sout << "Extension : "<<str->ToCString()<<Message_EndLine;
else sout << "Extension not defined" << Message_EndLine;
if (!str.IsNull()) sout << "Extension : "<<str->ToCString()<<std::endl;
else sout << "Extension not defined" << std::endl;
}
}
@ -2896,7 +2896,7 @@ void IFSelect_WorkSession::TraceStatics
// Fin
if (use > 0) {
if (mode == 0) sout<<"******************************************"<<Message_EndLine<<Message_EndLine;
if (mode == 0) sout<<"******************************************"<<std::endl<<std::endl;
}
}
@ -2908,43 +2908,43 @@ void IFSelect_WorkSession::TraceStatics
void IFSelect_WorkSession::DumpShare () const
{
Handle(Message_Messenger) sout = Message::DefaultMessenger();
sout<<" ********** Definition ShareOut (Complete) **********"<<Message_EndLine;
Message_Messenger::StreamBuffer sout = Message::SendInfo();
sout<<" ********** Definition ShareOut (Complete) **********"<<std::endl;
Handle(TCollection_HAsciiString) str = theshareout->Prefix();
if (!str.IsNull()) sout << "Prefix : " << str->ToCString() << Message_EndLine;
else sout << "Prefix not Defined" << Message_EndLine;
if (!str.IsNull()) sout << "Prefix : " << str->ToCString() << std::endl;
else sout << "Prefix not Defined" << std::endl;
str = theshareout->DefaultRootName();
if (!str.IsNull()) sout << "Default Root : " << str->ToCString() << Message_EndLine;
else sout << "Default Root not Defined" << Message_EndLine;
if (!str.IsNull()) sout << "Default Root : " << str->ToCString() << std::endl;
else sout << "Default Root not Defined" << std::endl;
str = theshareout->Extension();
if (!str.IsNull()) sout << "Extension : " << str->ToCString() << Message_EndLine;
else sout << "Extension not defined" << Message_EndLine;
if (!str.IsNull()) sout << "Extension : " << str->ToCString() << std::endl;
else sout << "Extension not defined" << std::endl;
Standard_Integer lr = theshareout->LastRun();
Standard_Integer nb = theshareout->NbDispatches();
sout << "Nb Dispatches : " << nb <<" (Last Run : " << lr << ") : "<<Message_EndLine;
sout << "Nb Dispatches : " << nb <<" (Last Run : " << lr << ") : "<<std::endl;
for (Standard_Integer i = 1; i <= nb; i ++) {
Handle(IFSelect_Dispatch) disp = theshareout->Dispatch(i);
sout << "Dispatch n0 " << i;
if (HasName(disp)) sout << " Name:"<< Name(disp)->ToCString();
sout << " Label:" << disp->Label() << Message_EndLine;
sout << " Label:" << disp->Label() << std::endl;
Handle(IFSelect_Selection) sel = disp->FinalSelection();
if (sel.IsNull()) sout << " No Final Selection Defined" << Message_EndLine;
if (sel.IsNull()) sout << " No Final Selection Defined" << std::endl;
else if (HasName(sel)) sout << " Final Selection : Name:"
<< Name(sel)->ToCString() << " Label:" << sel->Label() << Message_EndLine;
else sout << " Final Selection : " << sel->Label() << Message_EndLine;
<< Name(sel)->ToCString() << " Label:" << sel->Label() << std::endl;
else sout << " Final Selection : " << sel->Label() << std::endl;
if (disp->HasRootName())
sout<<" File Root Name : "<<disp->RootName()->ToCString()<<Message_EndLine;
else sout<<" No specific file root name (see Default Root)"<<Message_EndLine;
sout<<" File Root Name : "<<disp->RootName()->ToCString()<<std::endl;
else sout<<" No specific file root name (see Default Root)"<<std::endl;
}
Standard_Integer nbm = theshareout->NbModifiers(Standard_True);
if (nbm > 0) sout<<
" *** "<<nbm<<" active Model Modifiers : see ListModifiers ***"<<Message_EndLine;
" *** "<<nbm<<" active Model Modifiers : see ListModifiers ***"<<std::endl;
Standard_Integer nbf = theshareout->NbModifiers(Standard_False);
if (nbf > 0) sout<<
" *** "<<nbf<<" active File Modifiers : see ListModifiers ***"<<Message_EndLine;
if (nbm+nbf == 0) sout<<" *** No active Modifiers ***"<<Message_EndLine;
" *** "<<nbf<<" active File Modifiers : see ListModifiers ***"<<std::endl;
if (nbm+nbf == 0) sout<<" *** No active Modifiers ***"<<std::endl;
}
// #### #### #### #### #### #### #### #### ####
@ -2957,8 +2957,8 @@ void IFSelect_WorkSession::DumpShare () const
void IFSelect_WorkSession::ListItems (const Standard_CString lab) const
{
Handle(Message_Messenger) sout = Message::DefaultMessenger();
sout<< " ********** Items in Session **********"<<Message_EndLine;
Message_Messenger::StreamBuffer sout = Message::SendInfo();
sout<< " ********** Items in Session **********"<<std::endl;
Standard_Integer nb = MaxIdent();
Handle(TCollection_HAsciiString) str;
if (lab[0] != '\0') str = new TCollection_HAsciiString (lab);
@ -2970,7 +2970,7 @@ void IFSelect_WorkSession::ListItems (const Standard_CString lab) const
sout<<"#"<<i;
if (HasName(var)) sout<<" - Named : "<<Name(var)->ToCString()<<" - ";
else sout<<" - (no name) - ";
sout<<var->DynamicType()->Name()<<Message_EndLine<<" "<<label->ToCString()<<Message_EndLine;
sout<<var->DynamicType()->Name()<<std::endl<<" "<<label->ToCString()<<std::endl;
}
}
@ -2985,17 +2985,17 @@ void IFSelect_WorkSession::ListItems (const Standard_CString lab) const
void IFSelect_WorkSession::ListFinalModifiers
(const Standard_Boolean formodel) const
{
Handle(Message_Messenger) sout = Message::DefaultMessenger();
Message_Messenger::StreamBuffer sout = Message::SendInfo();
Standard_Integer nb = theshareout->NbModifiers(formodel);
sout<< " ********** Modifiers in Session ";
sout<<(formodel ? "(For Model)" : "(For File)");
sout<<": "<<nb<<" **********"<<Message_EndLine;
sout<<": "<<nb<<" **********"<<std::endl;
for (Standard_Integer i = 1; i <= nb; i ++) {
Handle(IFSelect_GeneralModifier) modif =
theshareout->GeneralModifier(formodel,i);
if (!modif.IsNull()) sout<<"Modifier n0."<<i<<" : "<<modif->Label();
if (HasName(modif)) sout << " Named as : " << Name(modif)->ToCString();
sout<<Message_EndLine;
sout<<std::endl;
}
}
@ -3010,23 +3010,23 @@ void IFSelect_WorkSession::ListFinalModifiers
void IFSelect_WorkSession::DumpSelection
(const Handle(IFSelect_Selection)& sel) const
{
Handle(Message_Messenger) sout = Message::DefaultMessenger();
Message_Messenger::StreamBuffer sout = Message::SendInfo();
if (ItemIdent(sel) == 0) {
sout << "Selection : Unknown"<<Message_EndLine; //sout<<Handle
sout << "Selection : Unknown"<<std::endl; //sout<<Handle
return;
}
sout << " ********** Selection";
if (HasName(sel)) sout << " , Name : " << Name(sel)->ToCString();
sout <<" **********"<<Message_EndLine;
sout<< "Label : " << sel->Label() << " . Input(s) : "<< Message_EndLine;
sout <<" **********"<<std::endl;
sout<< "Label : " << sel->Label() << " . Input(s) : "<< std::endl;
Standard_Integer nb = 0;
IFSelect_SelectionIterator iter; sel->FillIterator(iter);
for (; iter.More(); iter.Next()) {
nb ++;
Handle(IFSelect_Selection) newsel = iter.Value();
sout<<" -- "<<newsel->Label()<<Message_EndLine;
sout<<" -- "<<newsel->Label()<<std::endl;
}
sout << " Nb Inputs:"<<nb<<Message_EndLine;
sout << " Nb Inputs:"<<nb<<std::endl;
}
@ -3276,18 +3276,18 @@ Handle(TColStd_HSequenceOfTransient) IFSelect_WorkSession::GiveListCombined
//=======================================================================
void IFSelect_WorkSession::DumpModel
(const Standard_Integer level, const Handle(Message_Messenger)& S)
(const Standard_Integer level, Standard_OStream& S)
{
if (!IsLoaded())
{ S<< " *** Data for List not available ***"<<Message_EndLine; return; }
{ S << " *** Data for List not available ***"<<std::endl; return; }
S << "\n *****************************************************************\n";
if (theloaded.Length() > 0)
S << " ******** Loaded File : "<<theloaded.ToCString()<<Interface_MSG::Blanks(32-theloaded.Length())<<" ********"<<Message_EndLine;
else S << " ******** No name for Loaded File"<<Message_EndLine;
S << " ******** Loaded File : "<<theloaded.ToCString()<<Interface_MSG::Blanks(32-theloaded.Length())<<" ********"<<std::endl;
else S << " ******** No name for Loaded File"<<std::endl;
if (level == 0) {
S<<" ******** Short Dump of Header ********\n";
S <<" ******** Short Dump of Header ********\n";
S << " *****************************************************************\n\n";
myModel->DumpHeader(S); S<<Message_EndLine;
myModel->DumpHeader (S); S <<std::endl;
}
Standard_Integer nbent = myModel->NbEntities();
@ -3297,26 +3297,26 @@ void IFSelect_WorkSession::DumpModel
for (Standard_Integer i = 1; i <= nbent; i ++) {
if (!shar.IsShared(myModel->Value(i))) nbr ++;
}
S << " *****************************************************************\n";
S << " ******** Model : "<<nbent<<" Entities, of which "<<nbr<<" Root(s)\n";
S << " *****************************************************************\n"<<Message_EndLine;
S << " *****************************************************************\n"
<< " ******** Model : "<<nbent<<" Entities, of which "<<nbr<<" Root(s)\n"
<< " *****************************************************************\n"<<std::endl;
if (level <= 0) return;
else if (level == 1) {
S<<" ******** Root Entities ******** ";
ListEntities (shar.RootEntities(),1);
S <<" ******** Root Entities ******** ";
ListEntities (shar.RootEntities(), 1, S);
} else if (level == 2) {
S<<" ******** Complete List ******** ";
ListEntities (myModel->Entities(),1);
S <<" ******** Complete List ******** ";
ListEntities (myModel->Entities(), 1, S);
} else if (level > 2) {
IFSelect_PrintCount mode = IFSelect_ItemsByEntity;
if (level == 5 || level == 8) mode = IFSelect_CountByItem;
if (level == 6 || level == 9) mode = IFSelect_ListByItem;
if (level == 7 || level == 10) mode = IFSelect_EntitiesByItem;
PrintCheckList (ModelCheckList(),Standard_False, mode);
PrintCheckList (S, ModelCheckList(),Standard_False, mode);
} else {
if (level == 3) S << " ******** Check Model (Fails) ********"<<Message_EndLine;
else S << " ******** Check Model (Complete) ********"<<Message_EndLine;
if (level == 3) S << " ******** Check Model (Fails) ********"<<std::endl;
else S << " ******** Check Model (Complete) ********"<<std::endl;
Interface_CheckTool CT (Graph());
Interface_CheckIterator C;
if (theerrhand) {
@ -3326,10 +3326,10 @@ void IFSelect_WorkSession::DumpModel
else C = CT.CompleteCheckList();
}
catch (Standard_Failure const&) {
Handle(Message_Messenger) sout = Message::DefaultMessenger();
Message_Messenger::StreamBuffer sout = Message::SendInfo();
sout<<" **** Interruption DumpModel (Check) par Exception ****\n";
S<<" ** ** Exception Raised during Check ! ** **\n";
S<<" --> what could be determined is listed"<<Message_EndLine;
S <<" ** ** Exception Raised during Check ! ** **\n";
S <<" --> what could be determined is listed"<<std::endl;
}
}
else if (level == 3) C = CT.CheckList();
@ -3341,14 +3341,14 @@ void IFSelect_WorkSession::DumpModel
C.Print(S,myModel, (level == 3));
}
catch (Standard_Failure const& anException) {
Handle(Message_Messenger) sout = Message::DefaultMessenger();
Message_Messenger::StreamBuffer sout = Message::SendInfo();
sout<<" **** Interruption DumpModel par Exception : ****\n";
sout<<anException.GetMessageString();
sout<<"\n Abandon"<<Message_EndLine;
sout<<"\n Abandon"<<std::endl;
}
}
S<<Message_EndLine<<"There are "<<nbent<<" Entities, of which "<<nbr<<" Root(s)"<<Message_EndLine;
S <<std::endl<<"There are "<<nbent<<" Entities, of which "<<nbr<<" Root(s)"<<std::endl;
}
// .... TraceDumpModel .... (Model + CheckList)
@ -3361,8 +3361,8 @@ void IFSelect_WorkSession::DumpModel
void IFSelect_WorkSession::TraceDumpModel
(const Standard_Integer mode)
{
Handle(Message_Messenger) sout = Message::DefaultMessenger();
DumpModel (mode,sout);
Message_Messenger::StreamBuffer sout = Message::SendInfo(); // should it be changed to SendTrace()?
DumpModel (mode, sout);
// if (mode <= 4) { DumpModel (mode,sout); return; }
// else if (mode <= 7) PrintCheckList (ModelCheckList(),Standard_False, mode-5);
@ -3378,15 +3378,15 @@ void IFSelect_WorkSession::TraceDumpModel
void IFSelect_WorkSession::DumpEntity
(const Handle(Standard_Transient)& ent, const Standard_Integer level,
const Handle(Message_Messenger)& S) const
Standard_OStream& S) const
{
if (!IsLoaded())
{ S<< " *** Data for List not available ***"<<Message_EndLine; return; }
{ S << " *** Data for List not available ***"<<std::endl; return; }
Standard_Integer num = myModel->Number(ent);
if (num == 0) { S<<" *** Entity to Dump not in the Model ***"<<Message_EndLine; return; }
if (thelibrary.IsNull()) { S<<" *** WorkLibrary not defined ***"<<Message_EndLine; return; }
if (num == 0) { S <<" *** Entity to Dump not in the Model ***"<<std::endl; return; }
if (thelibrary.IsNull()) { S <<" *** WorkLibrary not defined ***"<<std::endl; return; }
S << " ******** Dumping Entity n0 "<<num
<<" level:"<<level<<" ********"<<Message_EndLine;
<<" level:"<<level<<" ********"<<std::endl;
thelibrary->DumpEntity (myModel,theprotocol,ent,S,level);
}
@ -3400,8 +3400,8 @@ void IFSelect_WorkSession::DumpEntity
void IFSelect_WorkSession::TraceDumpEntity
(const Handle(Standard_Transient)& ent, const Standard_Integer level) const
{
Handle(Message_Messenger) sout = Message::DefaultMessenger();
DumpEntity (ent,level,sout);
Message_Messenger::StreamBuffer sout = Message::SendInfo(); // should it be changed to SendTrace()?
DumpEntity (ent, level, sout);
}
// .... PrintEntityStatus ....
@ -3412,42 +3412,42 @@ void IFSelect_WorkSession::TraceDumpEntity
//=======================================================================
void IFSelect_WorkSession::PrintEntityStatus
(const Handle(Standard_Transient)& ent, const Handle(Message_Messenger)& S)
(const Handle(Standard_Transient)& ent, Standard_OStream& S)
{
Standard_Integer i,nb;
Standard_Integer num = StartingNumber(ent);
if (num == 0) { std::cout<<" -- PrintEntityStatus : unknown"<<std::endl; return; }
S <<" Ent. n0/id: ";
myModel->Print(ent,S);
myModel->Print (ent, S);
Handle(TCollection_HAsciiString) hname = EntityName(ent);
if (!hname.IsNull() && hname->Length() > 0) S<<" Name:"<<hname->ToCString();
S<<Message_EndLine;
if (!hname.IsNull() && hname->Length() > 0) S <<" Name:"<<hname->ToCString();
S <<std::endl;
Handle(IFSelect_Signature) signtype = SignType();
if (signtype.IsNull()) S<<" Type(CDL):"<<ent->DynamicType()->Name()<<Message_EndLine;
else S <<" Type:"<<signtype->Value (ent,myModel)<<Message_EndLine;
if (signtype.IsNull()) S <<" Type(CDL):"<<ent->DynamicType()->Name()<<std::endl;
else S <<" Type:"<<signtype->Value (ent,myModel)<<std::endl;
S <<" Category : " <<CategoryName (ent)
<<" Validity : " <<ValidityName (ent) << Message_EndLine;
<<" Validity : " <<ValidityName (ent) << std::endl;
Interface_CheckIterator chl = CheckOne (ent);
chl.Print (S,myModel,Standard_False,Standard_False);
Handle(TColStd_HSequenceOfTransient) list = Sharings(ent);
if (list.IsNull()) S<<" Root"<<Message_EndLine;
if (list.IsNull()) S <<" Root"<<std::endl;
else {
nb = list->Length();
if (nb == 0) S<<" Root";
else S<<" Super-entities:"<<nb<<" : (n0/id):";
for (i = 1; i <= nb; i ++) { S<<" "; myModel->Print(list->Value(i),S); }
S<<Message_EndLine;
if (nb == 0) S <<" Root";
else S <<" Super-entities:"<<nb<<" : (n0/id):";
for (i = 1; i <= nb; i ++) { S <<" "; myModel->Print(list->Value(i), S); }
S <<std::endl;
}
list = Shareds (ent);
if (list.IsNull()) S<<" No sub-entity"<<Message_EndLine;
if (list.IsNull()) S <<" No sub-entity"<<std::endl;
else {
nb = list->Length();
if (nb == 0) S<<" No sub-entity";
else S<<" Sub-entities:"<<nb<<" , i.e. (n0/id):";
for (i = 1; i <= nb; i ++) { S<<" "; myModel->Print(list->Value(i),S); }
S<<Message_EndLine;
if (nb == 0) S <<" No sub-entity";
else S <<" Sub-entities:"<<nb<<" , i.e. (n0/id):";
for (i = 1; i <= nb; i ++) { S <<" "; myModel->Print(list->Value(i), S); }
S <<std::endl;
}
}
@ -3458,19 +3458,19 @@ void IFSelect_WorkSession::PrintEntityStatus
//purpose :
//=======================================================================
void IFSelect_WorkSession::PrintCheckList
(const Interface_CheckIterator& checklist,
const Standard_Boolean failsonly, const IFSelect_PrintCount mode) const
void IFSelect_WorkSession::PrintCheckList (Standard_OStream& S,
const Interface_CheckIterator& checklist,
const Standard_Boolean failsonly,
const IFSelect_PrintCount mode) const
{
// mode : 0 comptage 1 n0s entites 2 n0s+id ents
Handle(Message_Messenger) sout = Message::DefaultMessenger();
if (mode == IFSelect_ItemsByEntity) checklist.Print (sout,myModel,failsonly);
if (mode == IFSelect_ItemsByEntity) checklist.Print (S,myModel,failsonly);
else {
Interface_CheckIterator chks = checklist;
Handle(IFSelect_CheckCounter) counter =
new IFSelect_CheckCounter (mode>1 && mode != IFSelect_CountSummary);
counter->Analyse (chks,myModel,Standard_True,failsonly);
counter->PrintList (sout,myModel,mode);
counter->PrintList (S, myModel, mode);
}
}
@ -3481,13 +3481,12 @@ void IFSelect_WorkSession::PrintCheckList
//purpose :
//=======================================================================
void IFSelect_WorkSession::PrintSignatureList
(const Handle(IFSelect_SignatureList)& signlist,
const IFSelect_PrintCount mode) const
void IFSelect_WorkSession::PrintSignatureList (Standard_OStream& S,
const Handle(IFSelect_SignatureList)& signlist,
const IFSelect_PrintCount mode) const
{
Handle(Message_Messenger) sout = Message::DefaultMessenger();
if (signlist.IsNull()) return;
signlist->PrintList (sout,myModel,mode);
signlist->PrintList (S, myModel, mode);
}
// #### #### #### #### #### #### #### #### ####
@ -3501,7 +3500,7 @@ void IFSelect_WorkSession::PrintSignatureList
void IFSelect_WorkSession::EvaluateSelection
(const Handle(IFSelect_Selection)& sel) const
{
Handle(Message_Messenger) sout = Message::DefaultMessenger();
Message_Messenger::StreamBuffer sout = Message::SendInfo();
if (errhand) {
errhand = Standard_False;
try {
@ -3511,20 +3510,20 @@ void IFSelect_WorkSession::EvaluateSelection
catch (Standard_Failure const& anException) {
sout<<" **** Interruption EvaluateSelection par Exception **** Intitule\n";
sout<<anException.GetMessageString();
sout<<"\n Abandon"<<Message_EndLine;
sout<<"\n Abandon"<<std::endl;
}
errhand = theerrhand;
return;
}
if (!IsLoaded())
{ sout<< " *** Data for Evaluation not available ***"<<Message_EndLine; return; }
{ sout<< " *** Data for Evaluation not available ***"<<std::endl; return; }
if (ItemIdent(sel) == 0)
{ sout << " Selection : Unknown"<<Message_EndLine; return; } //sout<<Handle
{ sout << " Selection : Unknown"<<std::endl; return; } //sout<<Handle
Interface_EntityIterator iter = EvalSelection (sel);
ListEntities (iter,1);
ListEntities (iter, 1, sout);
sout << "**** (Unique) RootResult, Selection : "
<<sel->Label()<<Message_EndLine;
<<sel->Label()<<std::endl;
}
@ -3539,7 +3538,7 @@ void IFSelect_WorkSession::EvaluateSelection
void IFSelect_WorkSession::EvaluateDispatch
(const Handle(IFSelect_Dispatch)& disp, const Standard_Integer mode) const
{
Handle(Message_Messenger) sout = Message::DefaultMessenger();
Message_Messenger::StreamBuffer sout = Message::SendInfo();
if (errhand) {
errhand = Standard_False;
try {
@ -3549,7 +3548,7 @@ void IFSelect_WorkSession::EvaluateDispatch
catch (Standard_Failure const& anException) {
sout<<" **** Interruption EvaluateDispatch par Exception **** Intitule\n";
sout<<anException.GetMessageString();
sout<<"\n Abandon"<<Message_EndLine;
sout<<"\n Abandon"<<std::endl;
}
errhand = theerrhand;
return;
@ -3557,12 +3556,12 @@ void IFSelect_WorkSession::EvaluateDispatch
Standard_Integer numdisp = DispatchRank(disp);
if (!IsLoaded())
{ sout<< " *** Data for List not available ***"<<Message_EndLine; return; }
{ sout<< " *** Data for List not available ***"<<std::endl; return; }
if (theshareout->NbDispatches() < numdisp || numdisp <= 0)
{ sout<<"Dispatch : Unknown"<<Message_EndLine; return; } //sout<<Handle
{ sout<<"Dispatch : Unknown"<<std::endl; return; } //sout<<Handle
if (disp->FinalSelection().IsNull())
{ sout<<"Dispatch : No Final Selection"<<Message_EndLine; return; }//sout<<Handle
sout<<" --- Dispatch Label : "<<disp->Label()<<Message_EndLine;
{ sout<<"Dispatch : No Final Selection"<<std::endl; return; }//sout<<Handle
sout<<" --- Dispatch Label : "<<disp->Label()<<std::endl;
IFSelect_ShareOutResult eval(disp,thegraph->Graph());
eval.Evaluate();
@ -3571,35 +3570,35 @@ void IFSelect_WorkSession::EvaluateDispatch
eval.Packets (mode ? Standard_True : Standard_False);
Standard_Integer nbpack = evres->NbPackets();
sout<<"Nb Packets produced : "<<nbpack<<" :"<<Message_EndLine;
sout<<"Nb Packets produced : "<<nbpack<<" :"<<std::endl;
for (numpack = 1; numpack <= nbpack; numpack ++) {
sout<<"\n **** Packet n0 : "<<numpack<<" ****"<<Message_EndLine;
sout<<"\n **** Packet n0 : "<<numpack<<" ****"<<std::endl;
if (!mode) std::cout<<"Root Entities :"<<std::endl;
ListEntities (evres->Entities(numpack), (mode ? 2 : -1));
ListEntities (evres->Entities(numpack), (mode ? 2 : -1), sout);
}
//// Interface_EntityIterator iterem = disp->Remainder(thegraph->Graph());
if (mode == 0) return;
if (mode == 1 || mode == 3) {
sout<<Message_EndLine;
sout<<std::endl;
if (evres->NbDuplicated(0,Standard_False) == 0)
sout<<" **** All the Model is taken into account ****"<<Message_EndLine;
sout<<" **** All the Model is taken into account ****"<<std::endl;
else {
sout<<" **** Starting Entities not taken by this Dispatch ****"<<Message_EndLine;
ListEntities (evres->Duplicated(0,Standard_False),2);
sout<<" **** Starting Entities not taken by this Dispatch ****"<<std::endl;
ListEntities (evres->Duplicated(0,Standard_False), 2, sout);
}
}
if (mode >= 2) {
sout<<" **** Entites in more than one packet ****";
Standard_Integer max = evres->HighestDuplicationCount();
if (max < 2) sout<<" : There are none"<<Message_EndLine;
if (max < 2) sout<<" : There are none"<<std::endl;
else {
Standard_Integer newcount;
sout<<Message_EndLine;
sout<<std::endl;
for (newcount = 2; newcount <= max; newcount ++) {
if (evres->NbDuplicated(newcount,Standard_False) == 0) continue;
sout<<" **** Entities put in "<<newcount<<" packets ****"<<Message_EndLine;
ListEntities (evres->Duplicated(newcount,Standard_False),2);
sout<<" **** Entities put in "<<newcount<<" packets ****"<<std::endl;
ListEntities (evres->Duplicated(newcount,Standard_False), 2, sout);
}
}
}
@ -3617,7 +3616,7 @@ void IFSelect_WorkSession::EvaluateDispatch
void IFSelect_WorkSession::EvaluateComplete
(const Standard_Integer mode) const
{
Handle(Message_Messenger) sout = Message::DefaultMessenger();
Message_Messenger::StreamBuffer sout = Message::SendInfo();
if (errhand) {
errhand = Standard_False;
try {
@ -3627,53 +3626,53 @@ void IFSelect_WorkSession::EvaluateComplete
catch (Standard_Failure const& anException) {
sout<<" **** Interruption EvaluateComplete par Exception : ****\n";
sout<<anException.GetMessageString();
sout<<"\n Abandon"<<Message_EndLine;
sout<<"\n Abandon"<<std::endl;
}
errhand = theerrhand;
return;
}
if (!IsLoaded())
{ sout<< " *** Data for List not available ***"<<Message_EndLine; return; }
{ sout<< " *** Data for List not available ***"<<std::endl; return; }
IFSelect_ShareOutResult eval(theshareout,thegraph->Graph());
eval.Evaluate();
sout<<"\n******** Evaluation ShareOutResult (Complete) ********\n";
sout<<" **** List of Packets **** Count : "<<eval.NbPackets()<<Message_EndLine;
if (mode == 0) sout << " ** (for each one : Root Entities) **"<<Message_EndLine;
else sout << " ** (for each one : Evaluated Content) **"<<Message_EndLine;
sout<<" **** List of Packets **** Count : "<<eval.NbPackets()<<std::endl;
if (mode == 0) sout << " ** (for each one : Root Entities) **"<<std::endl;
else sout << " ** (for each one : Evaluated Content) **"<<std::endl;
Standard_Integer numpack = 0;
Handle(IFSelect_PacketList) evres =
eval.Packets (mode ? Standard_True : Standard_False);
Standard_Integer nbpack = evres->NbPackets();
sout<<"Nb Packets produced : "<<nbpack<<" :"<<Message_EndLine;
sout<<"Nb Packets produced : "<<nbpack<<" :"<<std::endl;
for (numpack = 1; numpack <= nbpack; numpack ++) {
sout<<"\n **** Packet n0 : "<<numpack<<" ****"<<Message_EndLine;
sout<<"\n **** Packet n0 : "<<numpack<<" ****"<<std::endl;
if (!mode) std::cout<<"Root Entities :"<<std::endl;
ListEntities (evres->Entities(numpack), (mode ? 2: -1));
ListEntities (evres->Entities(numpack), (mode ? 2: -1), sout);
}
if (mode == 0) return;
if (mode == 1 || mode == 3) {
sout<<Message_EndLine;
sout<<std::endl;
if (evres->NbDuplicated(0,Standard_False) == 0)
sout<<" **** All the Model is taken into account ****"<<Message_EndLine;
sout<<" **** All the Model is taken into account ****"<<std::endl;
else {
sout<<" **** Starting Entities Forgotten ****"<<Message_EndLine;
ListEntities (evres->Duplicated(0,Standard_False),2);
sout<<" **** Starting Entities Forgotten ****"<<std::endl;
ListEntities (evres->Duplicated(0,Standard_False), 2, sout);
}
}
if (mode >= 2) {
sout<<" **** Entites in more than one packet ****"<<Message_EndLine;
sout<<" **** Entites in more than one packet ****"<<std::endl;
Standard_Integer max = evres->HighestDuplicationCount();
if (max < 2) sout<<" : There are none"<<Message_EndLine;
if (max < 2) sout<<" : There are none"<<std::endl;
else {
Standard_Integer newcount;
sout<<Message_EndLine;
sout<<std::endl;
for (newcount = 2; newcount <= max; newcount ++) {
if (evres->NbDuplicated(newcount,Standard_False) == 0) continue;
sout<<" **** Entities put in "<<newcount<<" packets ****"<<Message_EndLine;
ListEntities (evres->Duplicated(newcount,Standard_False),2);
sout<<" **** Entities put in "<<newcount<<" packets ****"<<std::endl;
ListEntities (evres->Duplicated(newcount,Standard_False), 2, sout);
}
}
}
@ -3689,14 +3688,13 @@ void IFSelect_WorkSession::EvaluateComplete
//=======================================================================
void IFSelect_WorkSession::ListEntities
(const Interface_EntityIterator& iter, const Standard_Integer mmode) const
(const Interface_EntityIterator& iter, const Standard_Integer mmode, Standard_OStream& sout) const
{
Handle(Message_Messenger) sout = Message::DefaultMessenger();
int titre = 0;
Standard_Integer mode = (mmode < 0 ? -mmode : mmode);
if (mmode >= 0) sout << " List of " << iter.NbEntities() << " Entities :"<<Message_EndLine;
if (mmode >= 0) sout << " List of " << iter.NbEntities() << " Entities :"<<std::endl;
if (!IsLoaded())
{ sout<< " *** Data for List not available ***"<<Message_EndLine; return; }
{ sout<< " *** Data for List not available ***"<<std::endl; return; }
Interface_ShareFlags tool(thegraph->Graph());
try {
@ -3704,9 +3702,9 @@ void IFSelect_WorkSession::ListEntities
int newcount = -1; int mods = 0; int cnt = 0;
for (iter.Start(); iter.More(); iter.Next()) {
if (!titre && mode == 1) sout
<< "Number/Id. Category Validity Type\n----------- ----...."<<Message_EndLine;
<< "Number/Id. Category Validity Type\n----------- ----...."<<std::endl;
// 123456789 123456789 123456 123456789 123456789 123456
if (!titre && mode == 0) sout<<" Keys : R Root ? Unknown * Unloaded"<<Message_EndLine;
if (!titre && mode == 0) sout<<" Keys : R Root ? Unknown * Unloaded"<<std::endl;
if (!titre && mode == 2) sout<<"(";
titre = 1;
Handle(Standard_Transient) ent = iter.Value();
@ -3714,35 +3712,35 @@ void IFSelect_WorkSession::ListEntities
if (mode == 1) {
// n0 id (root?) category validity tracetype
sout<<Interface_MSG::Blanks (num,6);
myModel->Print(ent,sout,0);
myModel->Print (ent, sout, 0);
if (!tool.IsShared(ent)) sout << " #ROOT#";
else sout << " ";
Standard_Integer catnum = myModel->CategoryNumber(num);
if (catnum > 0) sout<<" "<<Interface_Category::Name (catnum);
sout << " (" << ValidityName (ent) << ") ";
sout<<" Type:"<<myModel->TypeName (ent, Standard_False)<<Message_EndLine;
sout<<" Type:"<<myModel->TypeName (ent, Standard_False)<<std::endl;
} else if (mode == 2) {
newcount ++;
if (newcount > 0) sout<<",";
sout<<num;
} else {
newcount ++; mods = 0; cnt ++;
if (newcount >= 10) { sout << Message_EndLine<<"["<<cnt<<"]:"; newcount = 1; }
if (newcount >= 10) { sout << std::endl<<"["<<cnt<<"]:"; newcount = 1; }
if (newcount > 0) sout << " ";
myModel->Print(ent,sout,0);
myModel->Print (ent, sout, 0);
if (!tool.IsShared(ent)) { if(mods == 0) sout<<"("; sout<<"R"; mods++; }
if (myModel->IsUnknownEntity(num)) { sout<<(mods==0 ? '(' : ' ')<<"?"; mods ++; }
if (myModel->IsRedefinedContent(num)) { sout<<(mods==0 ? '(' : ' ')<<"*"; mods ++; }
if (mods) { sout<<")"; newcount ++; }
}
}
if (mode == 0) sout<<Message_EndLine;
if (mode == 2) sout<<")"<<Message_EndLine;
if (mode == 0) sout<<std::endl;
if (mode == 2) sout<<")"<<std::endl;
}
catch (Standard_Failure const& anException) {
sout<<" **** Interruption ListEntities par Exception : ****\n";
sout<<anException.GetMessageString();
sout<<"\n Abandon"<<Message_EndLine;
sout<<"\n Abandon"<<std::endl;
}
}

18
src/IFSelect/IFSelect_WorkSession.hxx
View File

@ -63,7 +63,6 @@ class IFSelect_GeneralModifier;
class IFSelect_Modifier;
class IFSelect_Transformer;
class IFSelect_PacketList;
class Message_Messenger;
class IFSelect_SignatureList;
@ -1018,7 +1017,7 @@ public:
//! 4 -> as 3 but all CheckList (Fails + Warnings)
//! 5,6,7 : as 3 but resp. Count,List,Labels by Fail
//! 8,9,10 : as 4 but resp. Count,List,Labels by message
Standard_EXPORT void DumpModel (const Standard_Integer level, const Handle(Message_Messenger)& S);
Standard_EXPORT void DumpModel (const Standard_Integer level, Standard_OStream& S);
//! Dumps the current Model (as inherited DumpModel), on currently
//! defined Default Trace File (default is standard output)
@ -1029,12 +1028,12 @@ public:
//! <level> is to be interpreted for each norm : see specific
//! classes of WorkLibrary for it. Generally, 0 if for very basic
//! (only type ...), greater values give more and more details.
Standard_EXPORT void DumpEntity (const Handle(Standard_Transient)& ent, const Standard_Integer level, const Handle(Message_Messenger)& S) const;
Standard_EXPORT void DumpEntity (const Handle(Standard_Transient)& ent, const Standard_Integer level, Standard_OStream& S) const;
//! Prints main informations about an entity : its number, type,
//! validity (and checks if any), category, shareds and sharings..
//! mutable because it can recompute checks as necessary
Standard_EXPORT void PrintEntityStatus (const Handle(Standard_Transient)& ent, const Handle(Message_Messenger)& S);
Standard_EXPORT void PrintEntityStatus (const Handle(Standard_Transient)& ent, Standard_OStream& S);
//! Dumps an entity from the current Model as inherited DumpEntity
//! on currently defined Default Trace File
@ -1049,12 +1048,17 @@ public:
//! 1 : according messages, count of entities
//! 2 : id but with list of entities, designated by their numbers
//! 3 : as 2 but with labels of entities
Standard_EXPORT void PrintCheckList (const Interface_CheckIterator& checklist, const Standard_Boolean failsonly, const IFSelect_PrintCount mode) const;
Standard_EXPORT void PrintCheckList (Standard_OStream& S,
const Interface_CheckIterator& checklist,
const Standard_Boolean failsonly,
const IFSelect_PrintCount mode) const;
//! Prints a SignatureList to the current Trace File, controlled
//! with the current Model
//! <mode> defines the mode of printing (see SignatureList)
Standard_EXPORT void PrintSignatureList (const Handle(IFSelect_SignatureList)& signlist, const IFSelect_PrintCount mode) const;
Standard_EXPORT void PrintSignatureList (Standard_OStream& S,
const Handle(IFSelect_SignatureList)& signlist,
const IFSelect_PrintCount mode) const;
//! Displays the list of Entities selected by a Selection (i.e.
//! the result of EvalSelection).
@ -1086,7 +1090,7 @@ public:
//! 1 gives a more complete trace (1 line per Entity)
//! (can be used each time a trace has to be output from a list)
//! 2 gives a form suitable for givelist : (n1,n2,n3...)
Standard_EXPORT void ListEntities (const Interface_EntityIterator& iter, const Standard_Integer mode) const;
Standard_EXPORT void ListEntities (const Interface_EntityIterator& iter, const Standard_Integer mode, Standard_OStream& S) const;
DEFINE_STANDARD_RTTIEXT(IFSelect_WorkSession,Standard_Transient)

2
src/IGESAppli/IGESAppli_SpecificModule.cxx
View File

@ -67,7 +67,7 @@ IGESAppli_SpecificModule::IGESAppli_SpecificModule() { }
void IGESAppli_SpecificModule::OwnDump
(const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent,
const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S,
const IGESData_IGESDumper& dumper, Standard_OStream& S,
const Standard_Integer own) const
{
switch (CN) {

4
src/IGESAppli/IGESAppli_SpecificModule.hxx
View File

@ -25,8 +25,6 @@
#include <Standard_Boolean.hxx>
class IGESData_IGESEntity;
class IGESData_IGESDumper;
class Message_Messenger;
class IGESAppli_SpecificModule;
DEFINE_STANDARD_HANDLE(IGESAppli_SpecificModule, IGESData_SpecificModule)
@ -43,7 +41,7 @@ public:
Standard_EXPORT IGESAppli_SpecificModule();
//! Specific Dump (own parameters) for IGESAppli
Standard_EXPORT void OwnDump (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const Standard_OVERRIDE;
Standard_EXPORT void OwnDump (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const Standard_OVERRIDE;
//! ---Purpose
Standard_EXPORT virtual Standard_Boolean OwnCorrect (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent) const Standard_OVERRIDE;

10
src/IGESAppli/IGESAppli_ToolDrilledHole.cxx
View File

@ -128,16 +128,16 @@ void IGESAppli_ToolDrilledHole::OwnCheck
void IGESAppli_ToolDrilledHole::OwnDump
(const Handle(IGESAppli_DrilledHole)& ent, const IGESData_IGESDumper& /*dumper*/,
const Handle(Message_Messenger)& S, const Standard_Integer /*level*/) const
Standard_OStream& S, const Standard_Integer /*level*/) const
{
S << "IGESAppli_DrilledHole" << Message_EndLine;
S << "IGESAppli_DrilledHole" << std::endl;
S << "Number of property values : " << ent->NbPropertyValues() << Message_EndLine;
S << "Number of property values : " << ent->NbPropertyValues() << std::endl;
S << "Drill diameter size :" << ent->DrillDiaSize() << " ";
S << "Finish diameter size : " << ent->FinishDiaSize() << Message_EndLine;
S << "Finish diameter size : " << ent->FinishDiaSize() << std::endl;
S << "Plating indication flag : ";
if (!ent->IsPlating()) S << "NO" << " - ";
else S << "YES - ";
S << "Lower Numbered Layer : " << ent->NbLowerLayer() << " ";
S << "Higher Numbered Layer : " << ent->NbHigherLayer() << Message_EndLine;
S << "Higher Numbered Layer : " << ent->NbHigherLayer() << std::endl;
}

3
src/IGESAppli/IGESAppli_ToolDrilledHole.hxx
View File

@ -34,7 +34,6 @@ class Interface_ShareTool;
class Interface_Check;
class Interface_CopyTool;
class IGESData_IGESDumper;
class Message_Messenger;
//! Tool to work on a DrilledHole. Called by various Modules
@ -74,7 +73,7 @@ public:
Standard_EXPORT void OwnCopy (const Handle(IGESAppli_DrilledHole)& entfrom, const Handle(IGESAppli_DrilledHole)& entto, Interface_CopyTool& TC) const;
//! Dump of Specific Parameters
Standard_EXPORT void OwnDump (const Handle(IGESAppli_DrilledHole)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const;
Standard_EXPORT void OwnDump (const Handle(IGESAppli_DrilledHole)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const;

42
src/IGESAppli/IGESAppli_ToolElementResults.cxx
View File

@ -303,34 +303,34 @@ void IGESAppli_ToolElementResults::OwnCheck
void IGESAppli_ToolElementResults::OwnDump
(const Handle(IGESAppli_ElementResults)& ent, const IGESData_IGESDumper& dumper,
const Handle(Message_Messenger)& S, const Standard_Integer level) const // UNFINISHED
Standard_OStream& S, const Standard_Integer level) const // UNFINISHED
{
Standard_Integer sublevel = (level > 4) ? 1 : 0;
S << "IGESAppli_ElementResults" << Message_EndLine;
S << "IGESAppli_ElementResults\n";
S << "General Note : ";
dumper.Dump(ent->Note(),S, sublevel);
S << Message_EndLine;
S << "Subcase Number : " << ent->SubCaseNumber() << Message_EndLine;
S << "Time : " << ent->Time() << Message_EndLine;
S << "Number of Result Values : " << ent->NbResultValues() << Message_EndLine;
S << "Result Report Flag : " << ent->ResultReportFlag() << Message_EndLine;
S << "\n";
S << "Subcase Number : " << ent->SubCaseNumber() << "\n";
S << "Time : " << ent->Time() << "\n";
S << "Number of Result Values : " << ent->NbResultValues() << "\n";
S << "Result Report Flag : " << ent->ResultReportFlag() << "\n";
S << "Element Identifiers : ";
IGESData_DumpVals(S ,level,1, ent->NbElements(),ent->ElementIdentifier);
S << Message_EndLine << "Elements : ";
IGESData_DumpVals(S,level,1, ent->NbElements(),ent->ElementIdentifier);
S << "\nElements : ";
IGESData_DumpEntities(S,dumper ,level,1, ent->NbElements(),ent->Element);
S << Message_EndLine << "Element Topology Types : ";
IGESData_DumpVals(S ,level,1, ent->NbElements(),ent->ElementTopologyType);
S << Message_EndLine << "Numbers of Layers : ";
IGESData_DumpVals(S ,level,1, ent->NbElements(),ent->NbLayers);
S << Message_EndLine << "Data Layer Flags : ";
IGESData_DumpVals(S ,level,1, ent->NbElements(),ent->DataLayerFlag);
S << Message_EndLine << "Numbers of Result Data Locations : ";
IGESData_DumpVals(S ,level,1, ent->NbElements(),ent->NbResultDataLocs);
S << Message_EndLine << "Result Data Locations : "; S << " TO BE DONE ";
S << "\nElement Topology Types : ";
IGESData_DumpVals(S,level,1, ent->NbElements(),ent->ElementTopologyType);
S << "\nNumbers of Layers : ";
IGESData_DumpVals(S,level,1, ent->NbElements(),ent->NbLayers);
S << "\nData Layer Flags : ";
IGESData_DumpVals(S,level,1, ent->NbElements(),ent->DataLayerFlag);
S << "\nNumbers of Result Data Locations : ";
IGESData_DumpVals(S,level,1, ent->NbElements(),ent->NbResultDataLocs);
S << "\nResult Data Locations : "; S << " TO BE DONE ";
// ?? A VERIFIER DE PRES, pas du tout sur que ce soit bon
// cf aussi Write et Copy
if (level <= 4) S << " [ ask level > 4 for more, > 5 for complete ]" << Message_EndLine;
if (level <= 4) S << " [ ask level > 4 for more, > 5 for complete ]\n";
else {
Standard_Integer i;// svv Jan 10 2000 : porting on DEC
for (i = 1; i <= ent->NbElements(); i ++) {
@ -338,14 +338,14 @@ void IGESAppli_ToolElementResults::OwnDump
S << " ["<<i<<":NbLoc="<<nloc<<"]:";
for (Standard_Integer j = 1; j <= nloc; j ++)
S << " " << ent->ResultDataLoc (i,j);
S << Message_EndLine;
S << "\n";
}
S << "Result Data : ";
for (i = 1; i <= ent->NbElements(); i ++) {
Standard_Integer nres = ent->NbResults(i);
S << " ["<<i<<":NbRes="<<nres<<"]:";
if (level <= 5) S << " [ ask level > 5 for complete Data ]" << Message_EndLine;
if (level <= 5) S << " [ ask level > 5 for complete Data ]\n";
else {
for (Standard_Integer j = 1; j <= nres; j ++)
S << " " << ent->ResultData(i,j); // ?? is it all ?? UNFINISHED

4
src/IGESAppli/IGESAppli_ToolElementResults.hxx
View File

@ -33,8 +33,6 @@ class Interface_ShareTool;
class Interface_Check;
class Interface_CopyTool;
class IGESData_IGESDumper;
class Message_Messenger;
//! Tool to work on a ElementResults. Called by various Modules
//! (ReadWriteModule, GeneralModule, SpecificModule)
@ -69,7 +67,7 @@ public:
Standard_EXPORT void OwnCopy (const Handle(IGESAppli_ElementResults)& entfrom, const Handle(IGESAppli_ElementResults)& entto, Interface_CopyTool& TC) const;
//! Dump of Specific Parameters
Standard_EXPORT void OwnDump (const Handle(IGESAppli_ElementResults)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const;
Standard_EXPORT void OwnDump (const Handle(IGESAppli_ElementResults)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const;

11
src/IGESAppli/IGESAppli_ToolFiniteElement.cxx
View File

@ -32,7 +32,6 @@
#include <Interface_EntityIterator.hxx>
#include <Interface_Macros.hxx>
#include <Interface_ShareTool.hxx>
#include <Message_Messenger.hxx>
#include <Standard_DomainError.hxx>
#include <TCollection_HAsciiString.hxx>
@ -126,13 +125,13 @@ void IGESAppli_ToolFiniteElement::OwnCheck
void IGESAppli_ToolFiniteElement::OwnDump
(const Handle(IGESAppli_FiniteElement)& ent, const IGESData_IGESDumper& dumper,
const Handle(Message_Messenger)& S, const Standard_Integer level) const
Standard_OStream& S, const Standard_Integer level) const
{
S << "IGESAppli_FiniteElement" << Message_EndLine;
S << "IGESAppli_FiniteElement\n";
S << "Topology type : " << ent->Topology() << Message_EndLine;
S << "Topology type : " << ent->Topology() << "\n";
S << "Nodes : ";
IGESData_DumpEntities(S,dumper ,level,1, ent->NbNodes(),ent->Node);
S << Message_EndLine << "Element Name : " << ent->Name();
S << Message_EndLine;
S << "\nElement Name : " << ent->Name()->String();
S << std::endl;
}

4
src/IGESAppli/IGESAppli_ToolFiniteElement.hxx
View File

@ -33,8 +33,6 @@ class Interface_ShareTool;
class Interface_Check;
class Interface_CopyTool;
class IGESData_IGESDumper;
class Message_Messenger;
//! Tool to work on a FiniteElement. Called by various Modules
//! (ReadWriteModule, GeneralModule, SpecificModule)
@ -69,7 +67,7 @@ public:
Standard_EXPORT void OwnCopy (const Handle(IGESAppli_FiniteElement)& entfrom, const Handle(IGESAppli_FiniteElement)& entto, Interface_CopyTool& TC) const;
//! Dump of Specific Parameters
Standard_EXPORT void OwnDump (const Handle(IGESAppli_FiniteElement)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const;
Standard_EXPORT void OwnDump (const Handle(IGESAppli_FiniteElement)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const;

30
src/IGESAppli/IGESAppli_ToolFlow.cxx
View File

@ -295,36 +295,36 @@ void IGESAppli_ToolFlow::OwnCheck
void IGESAppli_ToolFlow::OwnDump
(const Handle(IGESAppli_Flow)& ent, const IGESData_IGESDumper& dumper,
const Handle(Message_Messenger)& S, const Standard_Integer level) const
Standard_OStream& S, const Standard_Integer level) const
{
S << "IGESAppli_Flow" << Message_EndLine;
S << "Number of Context Flags : " << ent->NbContextFlags() << Message_EndLine;
S << "IGESAppli_Flow\n";
S << "Number of Context Flags : " << ent->NbContextFlags() << "\n";
Standard_Integer tf = ent->TypeOfFlow();
S << "Type of Flow : " << tf;
if (tf == 1) S << " (logical)" << Message_EndLine;
else if (tf == 2) S << " (physical)" << Message_EndLine;
else S << " (not specified)" << Message_EndLine;
if (tf == 1) S << " (logical)\n";
else if (tf == 2) S << " (physical)\n";
else S << " (not specified)\n";
tf = ent->FunctionFlag();
S << "Function Flag : " << tf;
if (tf == 1) S << " (electrical signal)" << Message_EndLine;
else if (tf == 2) S << " (fluid flow path)" << Message_EndLine;
else S << " (not specified)" << Message_EndLine;
if (tf == 1) S << " (electrical signal)\n";
else if (tf == 2) S << " (fluid flow path)\n";
else S << " (not specified)\n";
S << "Flow Associativities : ";
IGESData_DumpEntities(S,dumper ,level,1, ent->NbFlowAssociativities(),
ent->FlowAssociativity);
S << Message_EndLine << "Connect Points : ";
S << "\nConnect Points : ";
IGESData_DumpEntities(S,dumper ,level,1, ent->NbConnectPoints(),
ent->ConnectPoint);
S << Message_EndLine << "Joins : ";
S << "\nJoins : ";
IGESData_DumpEntities(S,dumper ,level,1, ent->NbJoins(),ent->Join);
S << Message_EndLine << "Flow Names : ";
S << "\nFlow Names : ";
IGESData_DumpStrings(S ,level,1, ent->NbFlowNames(),ent->FlowName);
S << Message_EndLine << "Text Display Templates : ";
S << "\nText Display Templates : ";
IGESData_DumpEntities(S,dumper ,level,1, ent->NbTextDisplayTemplates(),
ent->TextDisplayTemplate);
S << Message_EndLine << "Continuation Flow Associativities : ";
S << "\nContinuation Flow Associativities : ";
IGESData_DumpEntities(S,dumper ,level,1, ent->NbContFlowAssociativities(),
ent->ContFlowAssociativity);
S << Message_EndLine;
S << std::endl;
}

4
src/IGESAppli/IGESAppli_ToolFlow.hxx
View File

@ -34,8 +34,6 @@ class Interface_ShareTool;
class Interface_Check;
class Interface_CopyTool;
class IGESData_IGESDumper;
class Message_Messenger;
//! Tool to work on a Flow. Called by various Modules
//! (ReadWriteModule, GeneralModule, SpecificModule)
@ -74,7 +72,7 @@ public:
Standard_EXPORT void OwnCopy (const Handle(IGESAppli_Flow)& entfrom, const Handle(IGESAppli_Flow)& entto, Interface_CopyTool& TC) const;
//! Dump of Specific Parameters
Standard_EXPORT void OwnDump (const Handle(IGESAppli_Flow)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const;
Standard_EXPORT void OwnDump (const Handle(IGESAppli_Flow)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const;

6
src/IGESAppli/IGESAppli_ToolFlowLineSpec.cxx
View File

@ -106,11 +106,11 @@ void IGESAppli_ToolFlowLineSpec::OwnCheck
void IGESAppli_ToolFlowLineSpec::OwnDump
(const Handle(IGESAppli_FlowLineSpec)& ent, const IGESData_IGESDumper& /* dumper */,
const Handle(Message_Messenger)& S, const Standard_Integer level) const
Standard_OStream& S, const Standard_Integer level) const
{
S << "IGESAppli_FlowLineSpec" << Message_EndLine;
S << "IGESAppli_FlowLineSpec\n";
S << "Name and Modifiers : ";
IGESData_DumpStrings(S ,level,1, ent->NbPropertyValues(),ent->Modifier);
S << Message_EndLine;
S << "\n";
}

4
src/IGESAppli/IGESAppli_ToolFlowLineSpec.hxx
View File

@ -33,8 +33,6 @@ class Interface_ShareTool;
class Interface_Check;
class Interface_CopyTool;
class IGESData_IGESDumper;
class Message_Messenger;
//! Tool to work on a FlowLineSpec. Called by various Modules
//! (ReadWriteModule, GeneralModule, SpecificModule)
@ -69,7 +67,7 @@ public:
Standard_EXPORT void OwnCopy (const Handle(IGESAppli_FlowLineSpec)& entfrom, const Handle(IGESAppli_FlowLineSpec)& entto, Interface_CopyTool& TC) const;
//! Dump of Specific Parameters
Standard_EXPORT void OwnDump (const Handle(IGESAppli_FlowLineSpec)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const;
Standard_EXPORT void OwnDump (const Handle(IGESAppli_FlowLineSpec)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const;

10
src/IGESAppli/IGESAppli_ToolLevelFunction.cxx
View File

@ -120,13 +120,13 @@ void IGESAppli_ToolLevelFunction::OwnCheck
void IGESAppli_ToolLevelFunction::OwnDump
(const Handle(IGESAppli_LevelFunction)& ent, const IGESData_IGESDumper& /* dumper */,
const Handle(Message_Messenger)& S, const Standard_Integer /* level */) const
Standard_OStream& S, const Standard_Integer /* level */) const
{
S << "IGESAppli_LevelFunction" << Message_EndLine;
S << "IGESAppli_LevelFunction\n";
S << "Number of property values : " << ent->NbPropertyValues() << Message_EndLine;
S << "Function Description code : " << ent->FuncDescriptionCode() << Message_EndLine;
S << "Number of property values : " << ent->NbPropertyValues() << "\n";
S << "Function Description code : " << ent->FuncDescriptionCode() << "\n";
S << "Function Description : ";
IGESData_DumpString(S,ent->FuncDescription());
S << Message_EndLine;
S << "\n";
}

4
src/IGESAppli/IGESAppli_ToolLevelFunction.hxx
View File

@ -34,8 +34,6 @@ class Interface_ShareTool;
class Interface_Check;
class Interface_CopyTool;
class IGESData_IGESDumper;
class Message_Messenger;
//! Tool to work on a LevelFunction. Called by various Modules
//! (ReadWriteModule, GeneralModule, SpecificModule)
@ -74,7 +72,7 @@ public:
Standard_EXPORT void OwnCopy (const Handle(IGESAppli_LevelFunction)& entfrom, const Handle(IGESAppli_LevelFunction)& entto, Interface_CopyTool& TC) const;
//! Dump of Specific Parameters
Standard_EXPORT void OwnDump (const Handle(IGESAppli_LevelFunction)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const;
Standard_EXPORT void OwnDump (const Handle(IGESAppli_LevelFunction)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const;

24
src/IGESAppli/IGESAppli_ToolLevelToPWBLayerMap.cxx
View File

@ -158,30 +158,30 @@ void IGESAppli_ToolLevelToPWBLayerMap::OwnCheck
void IGESAppli_ToolLevelToPWBLayerMap::OwnDump
(const Handle(IGESAppli_LevelToPWBLayerMap)& ent, const IGESData_IGESDumper& /* dumper */,
const Handle(Message_Messenger)& S, const Standard_Integer level) const
Standard_OStream& S, const Standard_Integer level) const
{
Standard_Integer i, num;
S << "IGESAppli_LevelToPWBLayerMap" << Message_EndLine;
S << "Number of property values : " << ent->NbPropertyValues() << Message_EndLine;
S << "Exchange File Level Number : " << Message_EndLine;
S << "Native Level Identification : " << Message_EndLine;
S << "Physical Layer Number : " << Message_EndLine;
S << "IGESAppli_LevelToPWBLayerMap\n";
S << "Number of property values : " << ent->NbPropertyValues() << "\n";
S << "Exchange File Level Number :\n";
S << "Native Level Identification :\n";
S << "Physical Layer Number :\n";
S << "Exchange File Level Identification : ";
IGESData_DumpStrings
(S,-level,1, ent->NbLevelToLayerDefs(),ent->ExchangeFileLevelIdent);
S << Message_EndLine;
S << "\n";
if (level > 4)
for ( num = ent->NbLevelToLayerDefs(), i = 1; i <= num; i++ )
{
S << "[" << i << "]: " << Message_EndLine;
S << "[" << i << "]:\n";
S << "Exchange File Level Number : "
<< ent->ExchangeFileLevelNumber(i) << Message_EndLine;
<< ent->ExchangeFileLevelNumber(i) << "\n";
S << "Native Level Identification : ";
IGESData_DumpString(S,ent->NativeLevel(i));
S << Message_EndLine;
S << "Physical Layer Number : " << ent->PhysicalLayerNumber(i) << Message_EndLine;
S << "\n";
S << "Physical Layer Number : " << ent->PhysicalLayerNumber(i) << "\n";
S << "Exchange File Level Identification : ";
IGESData_DumpString(S,ent->ExchangeFileLevelIdent(i));
S << Message_EndLine;
S << "\n";
}
}

4
src/IGESAppli/IGESAppli_ToolLevelToPWBLayerMap.hxx
View File

@ -33,8 +33,6 @@ class Interface_ShareTool;
class Interface_Check;
class Interface_CopyTool;
class IGESData_IGESDumper;
class Message_Messenger;
//! Tool to work on a LevelToPWBLayerMap. Called by various Modules
//! (ReadWriteModule, GeneralModule, SpecificModule)
@ -69,7 +67,7 @@ public:
Standard_EXPORT void OwnCopy (const Handle(IGESAppli_LevelToPWBLayerMap)& entfrom, const Handle(IGESAppli_LevelToPWBLayerMap)& entto, Interface_CopyTool& TC) const;
//! Dump of Specific Parameters
Standard_EXPORT void OwnDump (const Handle(IGESAppli_LevelToPWBLayerMap)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const;
Standard_EXPORT void OwnDump (const Handle(IGESAppli_LevelToPWBLayerMap)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const;

35
src/IGESAppli/IGESAppli_ToolLineWidening.cxx
View File

@ -29,7 +29,6 @@
#include <Interface_CopyTool.hxx>
#include <Interface_EntityIterator.hxx>
#include <Interface_ShareTool.hxx>
#include <Message_Messenger.hxx>
#include <Standard_DomainError.hxx>
IGESAppli_ToolLineWidening::IGESAppli_ToolLineWidening () { }
@ -136,36 +135,36 @@ void IGESAppli_ToolLineWidening::OwnCheck
void IGESAppli_ToolLineWidening::OwnDump
(const Handle(IGESAppli_LineWidening)& ent, const IGESData_IGESDumper& /*dumper*/,
const Handle(Message_Messenger)& S, const Standard_Integer /*level*/) const
Standard_OStream& S, const Standard_Integer /*level*/) const
{
S << "IGESAppli_LineWidening" << Message_EndLine;
S << "IGESAppli_LineWidening\n";
S << "Number of property values : " << ent->NbPropertyValues() << Message_EndLine;
S << "Width of metalization : " << ent->WidthOfMetalization() << Message_EndLine;
S << "Number of property values : " << ent->NbPropertyValues() << "\n";
S << "Width of metalization : " << ent->WidthOfMetalization() << "\n";
S << "Cornering Code : " ;
if (ent->CorneringCode() == 0) S << "0 (rounded)" << Message_EndLine;
else if (ent->CorneringCode() == 1) S << "1 (squared)" << Message_EndLine;
else S << "incorrect value" << Message_EndLine;
if (ent->CorneringCode() == 0) S << "0 (rounded)\n";
else if (ent->CorneringCode() == 1) S << "1 (squared)\n";
else S << "incorrect value\n";
S << "Extension Flag : " ;
if (ent->ExtensionFlag() == 0) S << "0 (No Extension)" << Message_EndLine;
else if (ent->ExtensionFlag() == 1) S << "1 (One-half width extension)" << Message_EndLine;
else if (ent->ExtensionFlag() == 2) S << "2 (Extension set by ExtensionValue)" << Message_EndLine;
else S << "incorrect value" << Message_EndLine;
if (ent->ExtensionFlag() == 0) S << "0 (No Extension)\n";
else if (ent->ExtensionFlag() == 1) S << "1 (One-half width extension)\n";
else if (ent->ExtensionFlag() == 2) S << "2 (Extension set by ExtensionValue)\n";
else S << "incorrect value\n";
S << "Justification Flag : " ;
if (ent->JustificationFlag() == 0)
S << "0 (Centre justified)" << Message_EndLine;
S << "0 (Centre justified)\n";
else if (ent->JustificationFlag() == 1)
S << "1 (left justified)" << Message_EndLine;
S << "1 (left justified)\n";
else if (ent->JustificationFlag() == 2)
S << "2 (right justified)" << Message_EndLine;
S << "2 (right justified)\n";
else
S << "incorrect value" << Message_EndLine;
S << "incorrect value\n";
if (ent->ExtensionFlag() == 2)
S << "Extension Value : " << ent->ExtensionValue() << Message_EndLine;
S << "Extension Value : " << ent->ExtensionValue() << std::endl;
else
S << "No Extension Value (Extension Flag != 2)" << Message_EndLine;
S << "No Extension Value (Extension Flag != 2)" << std::endl;
}

4
src/IGESAppli/IGESAppli_ToolLineWidening.hxx
View File

@ -34,8 +34,6 @@ class Interface_ShareTool;
class Interface_Check;
class Interface_CopyTool;
class IGESData_IGESDumper;
class Message_Messenger;
//! Tool to work on a LineWidening. Called by various Modules
//! (ReadWriteModule, GeneralModule, SpecificModule)
@ -74,7 +72,7 @@ public:
Standard_EXPORT void OwnCopy (const Handle(IGESAppli_LineWidening)& entfrom, const Handle(IGESAppli_LineWidening)& entto, Interface_CopyTool& TC) const;
//! Dump of Specific Parameters
Standard_EXPORT void OwnDump (const Handle(IGESAppli_LineWidening)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const;
Standard_EXPORT void OwnDump (const Handle(IGESAppli_LineWidening)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const;

10
src/IGESAppli/IGESAppli_ToolNodalConstraint.cxx
View File

@ -130,15 +130,15 @@ void IGESAppli_ToolNodalConstraint::OwnCheck
void IGESAppli_ToolNodalConstraint::OwnDump
(const Handle(IGESAppli_NodalConstraint)& ent, const IGESData_IGESDumper& dumper,
const Handle(Message_Messenger)& S, const Standard_Integer level) const
Standard_OStream& S, const Standard_Integer level) const
{
Standard_Integer sublevel = (level > 4) ? 1 : 0;
S << "IGESAppli_NodalConstraint" << Message_EndLine;
S << "Type of Constraint : " << ent->Type() << Message_EndLine;
S << "IGESAppli_NodalConstraint\n";
S << "Type of Constraint : " << ent->Type() << "\n";
S << "Node : ";
dumper.Dump(ent->NodeEntity(),S, sublevel);
S << Message_EndLine;
S << "\n";
S << "Tabular Data Properties : ";
IGESData_DumpEntities(S,dumper ,level,1, ent->NbCases(),ent->TabularData);
S << Message_EndLine;
S << std::endl;
}

4
src/IGESAppli/IGESAppli_ToolNodalConstraint.hxx
View File

@ -33,8 +33,6 @@ class Interface_ShareTool;
class Interface_Check;
class Interface_CopyTool;
class IGESData_IGESDumper;
class Message_Messenger;
//! Tool to work on a NodalConstraint. Called by various Modules
//! (ReadWriteModule, GeneralModule, SpecificModule)
@ -69,7 +67,7 @@ public:
Standard_EXPORT void OwnCopy (const Handle(IGESAppli_NodalConstraint)& entfrom, const Handle(IGESAppli_NodalConstraint)& entto, Interface_CopyTool& TC) const;
//! Dump of Specific Parameters
Standard_EXPORT void OwnDump (const Handle(IGESAppli_NodalConstraint)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const;
Standard_EXPORT void OwnDump (const Handle(IGESAppli_NodalConstraint)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const;

32
src/IGESAppli/IGESAppli_ToolNodalDisplAndRot.cxx
View File

@ -207,17 +207,17 @@ void IGESAppli_ToolNodalDisplAndRot::OwnCheck
void IGESAppli_ToolNodalDisplAndRot::OwnDump
(const Handle(IGESAppli_NodalDisplAndRot)& ent, const IGESData_IGESDumper& dumper,
const Handle(Message_Messenger)& S, const Standard_Integer level) const
Standard_OStream& S, const Standard_Integer level) const
{
S << "IGESAppli_NodalDisplAndRot" << Message_EndLine;
S << "IGESAppli_NodalDisplAndRot\n";
Standard_Integer nbcases = ent->NbCases();
Standard_Integer nbnodes = ent->NbNodes();
S << "No. of analysis cases : " << nbcases << Message_EndLine;
S << "No. of analysis cases : " << nbcases << "\n";
S << "General Notes : ";
IGESData_DumpEntities(S,dumper ,level,1, nbcases,ent->Note);
S << Message_EndLine;
S << "\n";
// gp_GTrsf loca; // true location n.u.
switch (level)
@ -232,7 +232,7 @@ void IGESAppli_ToolNodalDisplAndRot::OwnDump
// IGESData_DumpListXYZL(S,-level,1,nbcases,ent->TranslationParameter,loca);
S << "Rotational Parameters : ";
// IGESData_DumpListXYZL(S,-level,1,nbcases,ent->RotationalParameter,loca);
S << " TO BE DONE" << Message_EndLine;
S << " TO BE DONE" << std::endl;
break;
case 5:
case 6: {
@ -240,39 +240,39 @@ void IGESAppli_ToolNodalDisplAndRot::OwnDump
{
S << "[" << i << "]: ";
dumper.Dump (ent->Note(i),S, 1);
S << Message_EndLine;
S << std::endl;
}
S << "Nodes : " << Message_EndLine;
S << "Node Identifiers : " << Message_EndLine;
S << "Translation Parameters : " << Message_EndLine;
S << "Nodes :\n";
S << "Node Identifiers :\n";
S << "Translation Parameters :\n";
S << "Rotational Parameters : Count = " << nbcases;
// IGESData_DumpListXYZL(S,-level,1,nbcases,ent->RotationalParameter,loca);
S << Message_EndLine;
S << "\n";
for (Standard_Integer j = 1; j <= nbnodes; j ++)
{
S << "[" << j << "]: - NodeIdentifier : "
<< ent->NodeIdentifier(j) << " - Node :"<<Message_EndLine;
<< ent->NodeIdentifier(j) << " - Node :\n";
S << "Node : ";
dumper.Dump (ent->Node(j),S, 1);
S << " - Parameters : " << Message_EndLine;
S << " - Parameters :\n";
for (Standard_Integer k = 1; k <= nbcases; k ++)
{
S << " [" << k << "]: " << Message_EndLine;
S << " [" << k << "]:\n";
S << "Translational Parameter : X="
<< ent->TranslationParameter(j,k).X() << ", Y="
<< ent->TranslationParameter(j,k).Y() << ", Z="
<< ent->TranslationParameter(j,k).Z() << Message_EndLine;
<< ent->TranslationParameter(j,k).Z() << "\n";
S << "Rotational Parameter : X="
<< ent->RotationalParameter(j,k).X() << ", Y="
<< ent->RotationalParameter(j,k).Y() << ", Z="
<< ent->RotationalParameter(j,k).Z();
if (k == nbcases) S << "] ";
S << Message_EndLine;
S << "\n";
}
}
}
break;
default: break;
}
S << Message_EndLine;
S << std::endl;
}

4
src/IGESAppli/IGESAppli_ToolNodalDisplAndRot.hxx
View File

@ -33,8 +33,6 @@ class Interface_ShareTool;
class Interface_Check;
class Interface_CopyTool;
class IGESData_IGESDumper;
class Message_Messenger;
//! Tool to work on a NodalDisplAndRot. Called by various Modules
//! (ReadWriteModule, GeneralModule, SpecificModule)
@ -69,7 +67,7 @@ public:
Standard_EXPORT void OwnCopy (const Handle(IGESAppli_NodalDisplAndRot)& entfrom, const Handle(IGESAppli_NodalDisplAndRot)& entto, Interface_CopyTool& TC) const;
//! Dump of Specific Parameters
Standard_EXPORT void OwnDump (const Handle(IGESAppli_NodalDisplAndRot)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const;
Standard_EXPORT void OwnDump (const Handle(IGESAppli_NodalDisplAndRot)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const;

20
src/IGESAppli/IGESAppli_ToolNodalResults.cxx
View File

@ -212,24 +212,24 @@ void IGESAppli_ToolNodalResults::OwnCheck
void IGESAppli_ToolNodalResults::OwnDump
(const Handle(IGESAppli_NodalResults)& ent, const IGESData_IGESDumper& dumper,
const Handle(Message_Messenger)& S, const Standard_Integer level) const
Standard_OStream& S, const Standard_Integer level) const
{
// Standard_Integer nbnodes = ent->NbNodes();
// Standard_Integer nbdata = ent->NbData ();
S << "IGESAppli_NodalResults" << Message_EndLine;
S << "IGESAppli_NodalResults\n";
S << "General Note : ";
dumper.Dump(ent->Note(),S, (level <= 4) ? 0 : 1);
S << Message_EndLine;
S << "\n";
S << "Analysis subcase number : " << ent->SubCaseNumber() << " ";
S << "Time used : " << ent->Time() << Message_EndLine;
S << "Time used : " << ent->Time() << "\n";
S << "No. of nodes : " << ent->NbNodes() << " ";
S << "No. of values for a node : " << ent->NbData() << Message_EndLine;
S << "Node Identifiers : " << Message_EndLine;
S << "Nodes : " << Message_EndLine;
S << "No. of values for a node : " << ent->NbData() << "\n";
S << "Node Identifiers :\n";
S << "Nodes :\n";
S << "Data : "; if (level < 6) S << " [ask level > 5]";
// IGESData_DumpRectVals(S ,-level,1, ent->NbData(),ent->Data);
S << Message_EndLine;
S << "\n";
if (level > 4)
{
for (Standard_Integer i=1; i <= ent->NbNodes(); i++)
@ -238,12 +238,12 @@ void IGESAppli_ToolNodalResults::OwnDump
S << "NodeIdentifier : " << ent->NodeIdentifier(i) << " ";
S << "Node : ";
dumper.Dump (ent->Node(i),S, 1);
S << Message_EndLine;
S << "\n";
if (level < 6) continue;
S << "Data : [ ";
for (Standard_Integer j = 1; j <= ent->NbData(); j ++)
S << " " << ent->Data(i,j);
S << " ]" << Message_EndLine;
S << " ]\n";
}
}
}

4
src/IGESAppli/IGESAppli_ToolNodalResults.hxx
View File

@ -33,8 +33,6 @@ class Interface_ShareTool;
class Interface_Check;
class Interface_CopyTool;
class IGESData_IGESDumper;
class Message_Messenger;
//! Tool to work on a NodalResults. Called by various Modules
//! (ReadWriteModule, GeneralModule, SpecificModule)
@ -69,7 +67,7 @@ public:
Standard_EXPORT void OwnCopy (const Handle(IGESAppli_NodalResults)& entfrom, const Handle(IGESAppli_NodalResults)& entto, Interface_CopyTool& TC) const;
//! Dump of Specific Parameters
Standard_EXPORT void OwnDump (const Handle(IGESAppli_NodalResults)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const;
Standard_EXPORT void OwnDump (const Handle(IGESAppli_NodalResults)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const;

8
src/IGESAppli/IGESAppli_ToolNode.cxx
View File

@ -110,15 +110,15 @@ void IGESAppli_ToolNode::OwnCheck
void IGESAppli_ToolNode::OwnDump
(const Handle(IGESAppli_Node)& ent, const IGESData_IGESDumper& dumper,
const Handle(Message_Messenger)& S, const Standard_Integer level) const
Standard_OStream& S, const Standard_Integer level) const
{
S << "IGESAppli_Node" << Message_EndLine;
S << "IGESAppli_Node\n";
S << " Nodal Coords : 1st " << ent->Coord().X()
<< " 2nd : " << ent->Coord().Y() << " 3rd : " << ent->Coord().Z() <<Message_EndLine;
<< " 2nd : " << ent->Coord().Y() << " 3rd : " << ent->Coord().Z() << "\n";
S << "Nodal Displacement Coordinate System : ";
if (!ent->System().IsNull())
dumper.Dump(ent->System(),S, level);
else
S << "Global Cartesian Coordinate System (default)";
S << Message_EndLine;
S << std::endl;
}

4
src/IGESAppli/IGESAppli_ToolNode.hxx
View File

@ -33,8 +33,6 @@ class Interface_ShareTool;
class Interface_Check;
class Interface_CopyTool;
class IGESData_IGESDumper;
class Message_Messenger;
//! Tool to work on a Node. Called by various Modules
//! (ReadWriteModule, GeneralModule, SpecificModule)
@ -69,7 +67,7 @@ public:
Standard_EXPORT void OwnCopy (const Handle(IGESAppli_Node)& entfrom, const Handle(IGESAppli_Node)& entto, Interface_CopyTool& TC) const;
//! Dump of Specific Parameters
Standard_EXPORT void OwnDump (const Handle(IGESAppli_Node)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const;
Standard_EXPORT void OwnDump (const Handle(IGESAppli_Node)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const;

12
src/IGESAppli/IGESAppli_ToolPWBArtworkStackup.cxx
View File

@ -114,14 +114,14 @@ void IGESAppli_ToolPWBArtworkStackup::OwnCheck
void IGESAppli_ToolPWBArtworkStackup::OwnDump
(const Handle(IGESAppli_PWBArtworkStackup)& ent, const IGESData_IGESDumper& /* dumper */,
const Handle(Message_Messenger)& S, const Standard_Integer level) const
Standard_OStream& S, const Standard_Integer level) const
{
S << "IGESAppli_PWBArtworkStackup" << Message_EndLine;
S << "Number of property values : " << ent->NbPropertyValues() << Message_EndLine;
S << "IGESAppli_PWBArtworkStackup\n";
S << "Number of property values : " << ent->NbPropertyValues() << "\n";
S << "Artwork Stackup Identification : ";
IGESData_DumpString(S,ent->Identification());
S << Message_EndLine;
S << "\n";
S << "Level Numbers : ";
IGESData_DumpVals(S ,level,1, ent->NbLevelNumbers(),ent->LevelNumber);
S << Message_EndLine;
IGESData_DumpVals(S,level,1, ent->NbLevelNumbers(),ent->LevelNumber);
S << std::endl;
}

4
src/IGESAppli/IGESAppli_ToolPWBArtworkStackup.hxx
View File

@ -33,8 +33,6 @@ class Interface_ShareTool;
class Interface_Check;
class Interface_CopyTool;
class IGESData_IGESDumper;
class Message_Messenger;
//! Tool to work on a PWBArtworkStackup. Called by various Modules
//! (ReadWriteModule, GeneralModule, SpecificModule)
@ -69,7 +67,7 @@ public:
Standard_EXPORT void OwnCopy (const Handle(IGESAppli_PWBArtworkStackup)& entfrom, const Handle(IGESAppli_PWBArtworkStackup)& entto, Interface_CopyTool& TC) const;
//! Dump of Specific Parameters
Standard_EXPORT void OwnDump (const Handle(IGESAppli_PWBArtworkStackup)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const;
Standard_EXPORT void OwnDump (const Handle(IGESAppli_PWBArtworkStackup)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const;

12
src/IGESAppli/IGESAppli_ToolPWBDrilledHole.cxx
View File

@ -118,11 +118,11 @@ void IGESAppli_ToolPWBDrilledHole::OwnCheck
void IGESAppli_ToolPWBDrilledHole::OwnDump
(const Handle(IGESAppli_PWBDrilledHole)& ent, const IGESData_IGESDumper& /*dumper*/,
const Handle(Message_Messenger)& S, const Standard_Integer /*level*/) const
Standard_OStream& S, const Standard_Integer /*level*/) const
{
S << "IGESAppli_PWBDrilledHole" << Message_EndLine;
S << "Number of property values : " << ent->NbPropertyValues() << Message_EndLine;
S << "Drill Diameter Size : " << ent->DrillDiameterSize() << Message_EndLine;
S << "Finish Diameter Size : " << ent->FinishDiameterSize() << Message_EndLine;
S << "Drilled Hole Function Code : " << ent->FunctionCode() << Message_EndLine;
S << "IGESAppli_PWBDrilledHole\n"
<< "Number of property values : " << ent->NbPropertyValues() << "\n"
<< "Drill Diameter Size : " << ent->DrillDiameterSize() << "\n"
<< "Finish Diameter Size : " << ent->FinishDiameterSize() << "\n"
<< "Drilled Hole Function Code : " << ent->FunctionCode() << std::endl;
}

4
src/IGESAppli/IGESAppli_ToolPWBDrilledHole.hxx
View File

@ -34,8 +34,6 @@ class Interface_ShareTool;
class Interface_Check;
class Interface_CopyTool;
class IGESData_IGESDumper;
class Message_Messenger;
//! Tool to work on a PWBDrilledHole. Called by various Modules
//! (ReadWriteModule, GeneralModule, SpecificModule)
@ -74,7 +72,7 @@ public:
Standard_EXPORT void OwnCopy (const Handle(IGESAppli_PWBDrilledHole)& entfrom, const Handle(IGESAppli_PWBDrilledHole)& entto, Interface_CopyTool& TC) const;
//! Dump of Specific Parameters
Standard_EXPORT void OwnDump (const Handle(IGESAppli_PWBDrilledHole)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const;
Standard_EXPORT void OwnDump (const Handle(IGESAppli_PWBDrilledHole)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const;

15
src/IGESAppli/IGESAppli_ToolPartNumber.cxx
View File

@ -30,7 +30,6 @@
#include <Interface_EntityIterator.hxx>
#include <Interface_Macros.hxx>
#include <Interface_ShareTool.hxx>
#include <Message_Messenger.hxx>
#include <Standard_DomainError.hxx>
#include <TCollection_HAsciiString.hxx>
@ -130,21 +129,21 @@ void IGESAppli_ToolPartNumber::OwnCheck
void IGESAppli_ToolPartNumber::OwnDump
(const Handle(IGESAppli_PartNumber)& ent, const IGESData_IGESDumper& /* dumper */,
const Handle(Message_Messenger)& S, const Standard_Integer /* level */) const
Standard_OStream& S, const Standard_Integer /* level */) const
{
//Standard_Integer sublevel = (level > 4) ? 1 : 0; //szv#4:S4163:12Mar99 unused
S << "IGESAppli_PartNumber" << Message_EndLine;
S << "Number of property values : " << ent->NbPropertyValues() << Message_EndLine;
S << "IGESAppli_PartNumber\n";
S << "Number of property values : " << ent->NbPropertyValues() << "\n";
S << "Generic Number or Name : ";
IGESData_DumpString(S,ent->GenericNumber());
S << Message_EndLine;
S << "\n";
S << "Military Number or Name : ";
IGESData_DumpString(S,ent->MilitaryNumber());
S << Message_EndLine;
S << "\n";
S << "Vendor Number or Name : ";
IGESData_DumpString(S,ent->VendorNumber());
S << Message_EndLine;
S << "\n";
S << "Internal Number or Name : ";
IGESData_DumpString(S,ent->InternalNumber());
S << Message_EndLine;
S << std::endl;
}

4
src/IGESAppli/IGESAppli_ToolPartNumber.hxx
View File

@ -34,8 +34,6 @@ class Interface_ShareTool;
class Interface_Check;
class Interface_CopyTool;
class IGESData_IGESDumper;
class Message_Messenger;
//! Tool to work on a PartNumber. Called by various Modules
//! (ReadWriteModule, GeneralModule, SpecificModule)
@ -74,7 +72,7 @@ public:
Standard_EXPORT void OwnCopy (const Handle(IGESAppli_PartNumber)& entfrom, const Handle(IGESAppli_PartNumber)& entto, Interface_CopyTool& TC) const;
//! Dump of Specific Parameters
Standard_EXPORT void OwnDump (const Handle(IGESAppli_PartNumber)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const;
Standard_EXPORT void OwnDump (const Handle(IGESAppli_PartNumber)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const;

8
src/IGESAppli/IGESAppli_ToolPinNumber.cxx
View File

@ -116,11 +116,11 @@ void IGESAppli_ToolPinNumber::OwnCheck
void IGESAppli_ToolPinNumber::OwnDump
(const Handle(IGESAppli_PinNumber)& ent, const IGESData_IGESDumper& /* dumper */,
const Handle(Message_Messenger)& S, const Standard_Integer /* level */) const
Standard_OStream& S, const Standard_Integer /* level */) const
{
S << "IGESAppli_PinNumber" << Message_EndLine;
S << "Number of Property Values : " << ent->NbPropertyValues() << Message_EndLine;
S << "IGESAppli_PinNumber\n";
S << "Number of Property Values : " << ent->NbPropertyValues() << "\n";
S << "PinNumber : ";
IGESData_DumpString(S,ent->PinNumberVal());
S << Message_EndLine;
S << std::endl;
}

4
src/IGESAppli/IGESAppli_ToolPinNumber.hxx
View File

@ -34,8 +34,6 @@ class Interface_ShareTool;
class Interface_Check;
class Interface_CopyTool;
class IGESData_IGESDumper;
class Message_Messenger;
//! Tool to work on a PinNumber. Called by various Modules
//! (ReadWriteModule, GeneralModule, SpecificModule)
@ -74,7 +72,7 @@ public:
Standard_EXPORT void OwnCopy (const Handle(IGESAppli_PinNumber)& entfrom, const Handle(IGESAppli_PinNumber)& entto, Interface_CopyTool& TC) const;
//! Dump of Specific Parameters
Standard_EXPORT void OwnDump (const Handle(IGESAppli_PinNumber)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const;
Standard_EXPORT void OwnDump (const Handle(IGESAppli_PinNumber)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const;

10
src/IGESAppli/IGESAppli_ToolPipingFlow.cxx
View File

@ -282,11 +282,11 @@ void IGESAppli_ToolPipingFlow::OwnCheck
void IGESAppli_ToolPipingFlow::OwnDump
(const Handle(IGESAppli_PipingFlow)& ent, const IGESData_IGESDumper& dumper,
const Handle(Message_Messenger)& S, const Standard_Integer level) const
Standard_OStream& S, const Standard_Integer level) const
{
S << "IGESAppli_PipingFlow" << Message_EndLine;
S << "Number of Context Flags : " << ent->NbContextFlags() << Message_EndLine;
S << "Type of Flow : " << ent->TypeOfFlow() << Message_EndLine;
S << "IGESAppli_PipingFlow\n";
S << "Number of Context Flags : " << ent->NbContextFlags() << "\n";
S << "Type of Flow : " << ent->TypeOfFlow() << "\n";
S << "Flow Associativities : ";
IGESData_DumpEntities(S,dumper ,level,1, ent->NbFlowAssociativities(),
ent->FlowAssociativity);
@ -303,6 +303,6 @@ void IGESAppli_ToolPipingFlow::OwnDump
S << "Continuation Flow Associativities : ";
IGESData_DumpEntities(S,dumper ,level,1, ent->NbContFlowAssociativities(),
ent->ContFlowAssociativity);
S << Message_EndLine;
S << std::endl;
}

4
src/IGESAppli/IGESAppli_ToolPipingFlow.hxx
View File

@ -34,8 +34,6 @@ class Interface_ShareTool;
class Interface_Check;
class Interface_CopyTool;
class IGESData_IGESDumper;
class Message_Messenger;
//! Tool to work on a PipingFlow. Called by various Modules
//! (ReadWriteModule, GeneralModule, SpecificModule)
@ -74,7 +72,7 @@ public:
Standard_EXPORT void OwnCopy (const Handle(IGESAppli_PipingFlow)& entfrom, const Handle(IGESAppli_PipingFlow)& entto, Interface_CopyTool& TC) const;
//! Dump of Specific Parameters
Standard_EXPORT void OwnDump (const Handle(IGESAppli_PipingFlow)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const;
Standard_EXPORT void OwnDump (const Handle(IGESAppli_PipingFlow)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const;

8
src/IGESAppli/IGESAppli_ToolReferenceDesignator.cxx
View File

@ -121,11 +121,11 @@ void IGESAppli_ToolReferenceDesignator::OwnCheck
void IGESAppli_ToolReferenceDesignator::OwnDump
(const Handle(IGESAppli_ReferenceDesignator)& ent, const IGESData_IGESDumper& /* dumper */,
const Handle(Message_Messenger)& S, const Standard_Integer /* level */) const
Standard_OStream& S, const Standard_Integer /* level */) const
{
S << "IGESAppli_ReferenceDesignator" << Message_EndLine;
S << "Number of Property Values : " << ent->NbPropertyValues() << Message_EndLine;
S << "IGESAppli_ReferenceDesignator\n";
S << "Number of Property Values : " << ent->NbPropertyValues() << "\n";
S << "ReferenceDesignator : ";
IGESData_DumpString(S,ent->RefDesignatorText());
S << Message_EndLine;
S << std::endl;
}

4
src/IGESAppli/IGESAppli_ToolReferenceDesignator.hxx
View File

@ -34,8 +34,6 @@ class Interface_ShareTool;
class Interface_Check;
class Interface_CopyTool;
class IGESData_IGESDumper;
class Message_Messenger;
//! Tool to work on a ReferenceDesignator. Called by various Modules
//! (ReadWriteModule, GeneralModule, SpecificModule)
@ -74,7 +72,7 @@ public:
Standard_EXPORT void OwnCopy (const Handle(IGESAppli_ReferenceDesignator)& entfrom, const Handle(IGESAppli_ReferenceDesignator)& entto, Interface_CopyTool& TC) const;
//! Dump of Specific Parameters
Standard_EXPORT void OwnDump (const Handle(IGESAppli_ReferenceDesignator)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const;
Standard_EXPORT void OwnDump (const Handle(IGESAppli_ReferenceDesignator)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const;

18
src/IGESAppli/IGESAppli_ToolRegionRestriction.cxx
View File

@ -126,14 +126,14 @@ void IGESAppli_ToolRegionRestriction::OwnCheck
void IGESAppli_ToolRegionRestriction::OwnDump
(const Handle(IGESAppli_RegionRestriction)& ent, const IGESData_IGESDumper& /*dumper*/,
const Handle(Message_Messenger)& S, const Standard_Integer /*level*/) const
Standard_OStream& S, const Standard_Integer /*level*/) const
{
S << "IGESAppli_RegionRestriction" << Message_EndLine;
S << "Number of property values : " << ent->NbPropertyValues() << Message_EndLine;
S << "Electrical vias restriction : "
<< ent->ElectricalViasRestriction() << Message_EndLine;
S << "Electrical components restriction : "
<< ent->ElectricalComponentRestriction() << Message_EndLine;
S << "Electrical circuitary restriction : "
<< ent->ElectricalCktRestriction() << Message_EndLine;
S << "IGESAppli_RegionRestriction\n"
<< "Number of property values : " << ent->NbPropertyValues() << "\n"
<< "Electrical vias restriction : "
<< ent->ElectricalViasRestriction() << "\n"
<< "Electrical components restriction : "
<< ent->ElectricalComponentRestriction() << "\n"
<< "Electrical circuitary restriction : "
<< ent->ElectricalCktRestriction() << std::endl;
}

4
src/IGESAppli/IGESAppli_ToolRegionRestriction.hxx
View File

@ -34,8 +34,6 @@ class Interface_ShareTool;
class Interface_Check;
class Interface_CopyTool;
class IGESData_IGESDumper;
class Message_Messenger;
//! Tool to work on a RegionRestriction. Called by various Modules
//! (ReadWriteModule, GeneralModule, SpecificModule)
@ -74,7 +72,7 @@ public:
Standard_EXPORT void OwnCopy (const Handle(IGESAppli_RegionRestriction)& entfrom, const Handle(IGESAppli_RegionRestriction)& entto, Interface_CopyTool& TC) const;
//! Dump of Specific Parameters
Standard_EXPORT void OwnDump (const Handle(IGESAppli_RegionRestriction)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const;
Standard_EXPORT void OwnDump (const Handle(IGESAppli_RegionRestriction)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const;

2
src/IGESBasic/IGESBasic_SpecificModule.cxx
View File

@ -61,7 +61,7 @@ IGESBasic_SpecificModule::IGESBasic_SpecificModule() { }
void IGESBasic_SpecificModule::OwnDump
(const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent,
const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S,
const IGESData_IGESDumper& dumper, Standard_OStream& S,
const Standard_Integer own) const
{
switch (CN) {

4
src/IGESBasic/IGESBasic_SpecificModule.hxx
View File

@ -25,8 +25,6 @@
#include <Standard_Boolean.hxx>
class IGESData_IGESEntity;
class IGESData_IGESDumper;
class Message_Messenger;
class IGESBasic_SpecificModule;
DEFINE_STANDARD_HANDLE(IGESBasic_SpecificModule, IGESData_SpecificModule)
@ -43,7 +41,7 @@ public:
Standard_EXPORT IGESBasic_SpecificModule();
//! Specific Dump (own parameters) for IGESBasic
Standard_EXPORT void OwnDump (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const Standard_OVERRIDE;
Standard_EXPORT void OwnDump (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const Standard_OVERRIDE;
//! Performs non-ambiguous Corrections on Entities which support
//! them (AssocGroupType,Hierarchy,Name,SingleParent)

12
src/IGESBasic/IGESBasic_ToolAssocGroupType.cxx
View File

@ -112,12 +112,12 @@ void IGESBasic_ToolAssocGroupType::OwnCheck
void IGESBasic_ToolAssocGroupType::OwnDump
(const Handle(IGESBasic_AssocGroupType)& ent, const IGESData_IGESDumper& /* dumper */,
const Handle(Message_Messenger)& S, const Standard_Integer /* level */) const
Standard_OStream& S, const Standard_Integer /* level */) const
{
S << "IGESBasic_AssocGroupType" << Message_EndLine;
S << "Number of data fields : " << ent->NbData() << Message_EndLine;
S << "Type of attached associativity : " << ent->AssocType() << Message_EndLine;
S << "Name of attached associativity : ";
S << "IGESBasic_AssocGroupType\n"
<< "Number of data fields : " << ent->NbData() << "\n"
<< "Type of attached associativity : " << ent->AssocType() << "\n"
<< "Name of attached associativity : ";
IGESData_DumpString(S,ent->Name());
S << Message_EndLine;
S << std::endl;
}

4
src/IGESBasic/IGESBasic_ToolAssocGroupType.hxx
View File

@ -34,8 +34,6 @@ class Interface_ShareTool;
class Interface_Check;
class Interface_CopyTool;
class IGESData_IGESDumper;
class Message_Messenger;
//! Tool to work on a AssocGroupType. Called by various Modules
//! (ReadWriteModule, GeneralModule, SpecificModule)
@ -74,7 +72,7 @@ public:
Standard_EXPORT void OwnCopy (const Handle(IGESBasic_AssocGroupType)& entfrom, const Handle(IGESBasic_AssocGroupType)& entto, Interface_CopyTool& TC) const;
//! Dump of Specific Parameters
Standard_EXPORT void OwnDump (const Handle(IGESBasic_AssocGroupType)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const;
Standard_EXPORT void OwnDump (const Handle(IGESBasic_AssocGroupType)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const;

8
src/IGESBasic/IGESBasic_ToolExternalRefFile.cxx
View File

@ -92,10 +92,10 @@ void IGESBasic_ToolExternalRefFile::OwnCheck
void IGESBasic_ToolExternalRefFile::OwnDump
(const Handle(IGESBasic_ExternalRefFile)& ent, const IGESData_IGESDumper& /* dumper */,
const Handle(Message_Messenger)& S, const Standard_Integer /* level */) const
Standard_OStream& S, const Standard_Integer /* level */) const
{
S << "IGESBasic_ExternalRefFile" << Message_EndLine;
S << "External Reference File Identifier : ";
S << "IGESBasic_ExternalRefFile\n"
<< "External Reference File Identifier : ";
IGESData_DumpString(S,ent->FileId());
S << Message_EndLine;
S << std::endl;
}

4
src/IGESBasic/IGESBasic_ToolExternalRefFile.hxx
View File

@ -33,8 +33,6 @@ class Interface_ShareTool;
class Interface_Check;
class Interface_CopyTool;
class IGESData_IGESDumper;
class Message_Messenger;
//! Tool to work on a ExternalRefFile. Called by various Modules
//! (ReadWriteModule, GeneralModule, SpecificModule)
@ -69,7 +67,7 @@ public:
Standard_EXPORT void OwnCopy (const Handle(IGESBasic_ExternalRefFile)& entfrom, const Handle(IGESBasic_ExternalRefFile)& entto, Interface_CopyTool& TC) const;
//! Dump of Specific Parameters
Standard_EXPORT void OwnDump (const Handle(IGESBasic_ExternalRefFile)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const;
Standard_EXPORT void OwnDump (const Handle(IGESBasic_ExternalRefFile)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const;

18
src/IGESBasic/IGESBasic_ToolExternalRefFileIndex.cxx
View File

@ -132,23 +132,23 @@ void IGESBasic_ToolExternalRefFileIndex::OwnCheck
void IGESBasic_ToolExternalRefFileIndex::OwnDump
(const Handle(IGESBasic_ExternalRefFileIndex)& ent, const IGESData_IGESDumper& dumper,
const Handle(Message_Messenger)& S, const Standard_Integer level) const
Standard_OStream& S, const Standard_Integer level) const
{
Standard_Integer i, num;
S << "IGESBasic_ExternalRefFileIndex" << Message_EndLine;
S << "External Reference Names : " << Message_EndLine;
S << "Internal Entities : ";
S << "IGESBasic_ExternalRefFileIndex\n"
<< "External Reference Names :\n"
<< "Internal Entities : ";
IGESData_DumpEntities(S,dumper,-level,1, ent->NbEntries(),ent->Entity);
S << Message_EndLine;
S << "\n";
if (level > 4)
for ( num = ent->NbEntries(), i = 1; i <= num; i++ )
{
S << "[" << i << "]: ";
S << "External Reference Name : ";
S << "[" << i << "]: "
<< "External Reference Name : ";
IGESData_DumpString(S,ent->Name(i));
S << " Internal Entity : ";
dumper.Dump (ent->Entity(i),S, 1);
S << Message_EndLine;
S << "\n";
}
S << Message_EndLine;
S << std::endl;
}

4
src/IGESBasic/IGESBasic_ToolExternalRefFileIndex.hxx
View File

@ -33,8 +33,6 @@ class Interface_ShareTool;
class Interface_Check;
class Interface_CopyTool;
class IGESData_IGESDumper;
class Message_Messenger;
//! Tool to work on a ExternalRefFileIndex. Called by various Modules
//! (ReadWriteModule, GeneralModule, SpecificModule)
@ -69,7 +67,7 @@ public:
Standard_EXPORT void OwnCopy (const Handle(IGESBasic_ExternalRefFileIndex)& entfrom, const Handle(IGESBasic_ExternalRefFileIndex)& entto, Interface_CopyTool& TC) const;
//! Dump of Specific Parameters
Standard_EXPORT void OwnDump (const Handle(IGESBasic_ExternalRefFileIndex)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const;
Standard_EXPORT void OwnDump (const Handle(IGESBasic_ExternalRefFileIndex)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const;

12
src/IGESBasic/IGESBasic_ToolExternalRefFileName.cxx
View File

@ -100,13 +100,13 @@ void IGESBasic_ToolExternalRefFileName::OwnCheck
void IGESBasic_ToolExternalRefFileName::OwnDump
(const Handle(IGESBasic_ExternalRefFileName)& ent, const IGESData_IGESDumper& /* dumper */,
const Handle(Message_Messenger)& S, const Standard_Integer /* level */) const
Standard_OStream& S, const Standard_Integer /* level */) const
{
S << "IGESBasic_ExternalRefFileName" << Message_EndLine;
S << "External Reference File Identifier : ";
S << "IGESBasic_ExternalRefFileName\n"
<< "External Reference File Identifier : ";
IGESData_DumpString(S,ent->FileId());
S << Message_EndLine;
S << "External Reference Symbolic Name : ";
S << "\n"
<< "External Reference Symbolic Name : ";
IGESData_DumpString(S,ent->ReferenceName());
S << Message_EndLine;
S << std::endl;
}

4
src/IGESBasic/IGESBasic_ToolExternalRefFileName.hxx
View File

@ -33,8 +33,6 @@ class Interface_ShareTool;
class Interface_Check;
class Interface_CopyTool;
class IGESData_IGESDumper;
class Message_Messenger;
//! Tool to work on a ExternalRefFileName. Called by various Modules
//! (ReadWriteModule, GeneralModule, SpecificModule)
@ -69,7 +67,7 @@ public:
Standard_EXPORT void OwnCopy (const Handle(IGESBasic_ExternalRefFileName)& entfrom, const Handle(IGESBasic_ExternalRefFileName)& entto, Interface_CopyTool& TC) const;
//! Dump of Specific Parameters
Standard_EXPORT void OwnDump (const Handle(IGESBasic_ExternalRefFileName)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const;
Standard_EXPORT void OwnDump (const Handle(IGESBasic_ExternalRefFileName)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const;

12
src/IGESBasic/IGESBasic_ToolExternalRefLibName.cxx
View File

@ -97,13 +97,13 @@ void IGESBasic_ToolExternalRefLibName::OwnCheck
void IGESBasic_ToolExternalRefLibName::OwnDump
(const Handle(IGESBasic_ExternalRefLibName)& ent, const IGESData_IGESDumper& /* dumper */,
const Handle(Message_Messenger)& S,const Standard_Integer /* level */) const
Standard_OStream& S,const Standard_Integer /* level */) const
{
S << "IGESBasic_ExternalRefLibName" << Message_EndLine;
S << "Name of Library : ";
S << "IGESBasic_ExternalRefLibName\n"
<< "Name of Library : ";
IGESData_DumpString(S,ent->LibraryName());
S << Message_EndLine;
S << "External Reference Symbolic Name : ";
S << "\n"
<< "External Reference Symbolic Name : ";
IGESData_DumpString(S,ent->ReferenceName());
S << Message_EndLine;
S << std::endl;
}

4
src/IGESBasic/IGESBasic_ToolExternalRefLibName.hxx
View File

@ -33,8 +33,6 @@ class Interface_ShareTool;
class Interface_Check;
class Interface_CopyTool;
class IGESData_IGESDumper;
class Message_Messenger;
//! Tool to work on a ExternalRefLibName. Called by various Modules
//! (ReadWriteModule, GeneralModule, SpecificModule)
@ -69,7 +67,7 @@ public:
Standard_EXPORT void OwnCopy (const Handle(IGESBasic_ExternalRefLibName)& entfrom, const Handle(IGESBasic_ExternalRefLibName)& entto, Interface_CopyTool& TC) const;
//! Dump of Specific Parameters
Standard_EXPORT void OwnDump (const Handle(IGESBasic_ExternalRefLibName)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const;
Standard_EXPORT void OwnDump (const Handle(IGESBasic_ExternalRefLibName)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const;

8
src/IGESBasic/IGESBasic_ToolExternalRefName.cxx
View File

@ -92,10 +92,10 @@ void IGESBasic_ToolExternalRefName::OwnCheck
void IGESBasic_ToolExternalRefName::OwnDump
(const Handle(IGESBasic_ExternalRefName)& ent, const IGESData_IGESDumper& /* dumper */,
const Handle(Message_Messenger)& S, const Standard_Integer /* level */) const
Standard_OStream& S, const Standard_Integer /* level */) const
{
S << "IGESBasic_ExternalRefName" << Message_EndLine;
S << "External Reference Symbolic Name : ";
S << "IGESBasic_ExternalRefName\n"
<< "External Reference Symbolic Name : ";
IGESData_DumpString(S,ent->ReferenceName());
S << Message_EndLine;
S << std::endl;
}

4
src/IGESBasic/IGESBasic_ToolExternalRefName.hxx
View File

@ -33,8 +33,6 @@ class Interface_ShareTool;
class Interface_Check;
class Interface_CopyTool;
class IGESData_IGESDumper;
class Message_Messenger;
//! Tool to work on a ExternalRefName. Called by various Modules
//! (ReadWriteModule, GeneralModule, SpecificModule)
@ -69,7 +67,7 @@ public:
Standard_EXPORT void OwnCopy (const Handle(IGESBasic_ExternalRefName)& entfrom, const Handle(IGESBasic_ExternalRefName)& entto, Interface_CopyTool& TC) const;
//! Dump of Specific Parameters
Standard_EXPORT void OwnDump (const Handle(IGESBasic_ExternalRefName)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const;
Standard_EXPORT void OwnDump (const Handle(IGESBasic_ExternalRefName)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const;

10
src/IGESBasic/IGESBasic_ToolExternalReferenceFile.cxx
View File

@ -105,10 +105,10 @@ void IGESBasic_ToolExternalReferenceFile::OwnCheck
void IGESBasic_ToolExternalReferenceFile::OwnDump
(const Handle(IGESBasic_ExternalReferenceFile)& ent, const IGESData_IGESDumper& /* dumper */,
const Handle(Message_Messenger)& S, const Standard_Integer level) const
Standard_OStream& S, const Standard_Integer level) const
{
S << "IGESBasic_ExternalReferenceFile" << Message_EndLine;
S << "External Reference Names : ";
IGESData_DumpStrings(S ,level,1, ent->NbListEntries(),ent->Name);
S << Message_EndLine;
S << "IGESBasic_ExternalReferenceFile\n"
<< "External Reference Names : ";
IGESData_DumpStrings(S,level,1, ent->NbListEntries(),ent->Name);
S << std::endl;
}

4
src/IGESBasic/IGESBasic_ToolExternalReferenceFile.hxx
View File

@ -33,8 +33,6 @@ class Interface_ShareTool;
class Interface_Check;
class Interface_CopyTool;
class IGESData_IGESDumper;
class Message_Messenger;
//! Tool to work on a ExternalReferenceFile. Called by various Modules
//! (ReadWriteModule, GeneralModule, SpecificModule)
@ -69,7 +67,7 @@ public:
Standard_EXPORT void OwnCopy (const Handle(IGESBasic_ExternalReferenceFile)& entfrom, const Handle(IGESBasic_ExternalReferenceFile)& entto, Interface_CopyTool& TC) const;
//! Dump of Specific Parameters
Standard_EXPORT void OwnDump (const Handle(IGESBasic_ExternalReferenceFile)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const;
Standard_EXPORT void OwnDump (const Handle(IGESBasic_ExternalReferenceFile)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const;

9
src/IGESBasic/IGESBasic_ToolGroup.cxx
View File

@ -32,7 +32,6 @@
#include <Interface_EntityIterator.hxx>
#include <Interface_Macros.hxx>
#include <Interface_ShareTool.hxx>
#include <Message_Messenger.hxx>
#include <Message_Msg.hxx>
#include <Standard_DomainError.hxx>
@ -163,11 +162,11 @@ void IGESBasic_ToolGroup::OwnCheck(const Handle(IGESBasic_Group)& ent,
void IGESBasic_ToolGroup::OwnDump
(const Handle(IGESBasic_Group)& ent, const IGESData_IGESDumper& dumper,
const Handle(Message_Messenger)& S, const Standard_Integer level) const
Standard_OStream& S, const Standard_Integer level) const
{
S << "IGESBasic_Group" << Message_EndLine;
S << "Entries in the Group : ";
S << "IGESBasic_Group\n"
<< "Entries in the Group : ";
IGESData_DumpEntities(S,dumper ,level,1, ent->NbEntities(),ent->Entity);
S << Message_EndLine;
S << std::endl;
}

2
src/IGESBasic/IGESBasic_ToolGroup.hxx
View File

@ -74,7 +74,7 @@ public:
Standard_EXPORT void OwnCopy (const Handle(IGESBasic_Group)& entfrom, const Handle(IGESBasic_Group)& entto, Interface_CopyTool& TC) const;
//! Dump of Specific Parameters
Standard_EXPORT void OwnDump (const Handle(IGESBasic_Group)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const;
Standard_EXPORT void OwnDump (const Handle(IGESBasic_Group)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const;

8
src/IGESBasic/IGESBasic_ToolGroupWithoutBackP.cxx
View File

@ -160,11 +160,11 @@ void IGESBasic_ToolGroupWithoutBackP::OwnCheck
void IGESBasic_ToolGroupWithoutBackP::OwnDump
(const Handle(IGESBasic_GroupWithoutBackP)& ent, const IGESData_IGESDumper& dumper,
const Handle(Message_Messenger)& S, const Standard_Integer level) const
Standard_OStream& S, const Standard_Integer level) const
{
S << "IGESBasic_GroupWithoutBackP" << Message_EndLine;
S << "Entries in the Group : ";
S << "IGESBasic_GroupWithoutBackP\n"
<< "Entries in the Group : ";
IGESData_DumpEntities(S,dumper ,level,1, ent->NbEntities(),ent->Entity);
S << Message_EndLine;
S << std::endl;
}

4
src/IGESBasic/IGESBasic_ToolGroupWithoutBackP.hxx
View File

@ -34,8 +34,6 @@ class Interface_ShareTool;
class Interface_Check;
class Interface_CopyTool;
class IGESData_IGESDumper;
class Message_Messenger;
//! Tool to work on a GroupWithoutBackP. Called by various Modules
//! (ReadWriteModule, GeneralModule, SpecificModule)
@ -74,7 +72,7 @@ public:
Standard_EXPORT void OwnCopy (const Handle(IGESBasic_GroupWithoutBackP)& entfrom, const Handle(IGESBasic_GroupWithoutBackP)& entto, Interface_CopyTool& TC) const;
//! Dump of Specific Parameters
Standard_EXPORT void OwnDump (const Handle(IGESBasic_GroupWithoutBackP)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const;
Standard_EXPORT void OwnDump (const Handle(IGESBasic_GroupWithoutBackP)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const;

19
src/IGESBasic/IGESBasic_ToolHierarchy.cxx
View File

@ -130,15 +130,14 @@ void IGESBasic_ToolHierarchy::OwnCheck
void IGESBasic_ToolHierarchy::OwnDump
(const Handle(IGESBasic_Hierarchy)& ent, const IGESData_IGESDumper& /*dumper*/,
const Handle(Message_Messenger)& S, const Standard_Integer /*level*/) const
Standard_OStream& S, const Standard_Integer /*level*/) const
{
S << "IGESBasic_Hierarchy" << Message_EndLine;
S << "Number of property values : " << ent->NbPropertyValues() << Message_EndLine;
S << "Line Font : " << ent->NewLineFont() << Message_EndLine;
S << "View Number : " << ent->NewView() << Message_EndLine;
S << "Entity level : " << ent->NewEntityLevel() << Message_EndLine;
S << "Blank status : " << ent->NewBlankStatus() << Message_EndLine;
S << "Line weight : " << ent->NewLineWeight() << Message_EndLine;
S << "Color number : " << ent->NewColorNum() << Message_EndLine;
S << "IGESBasic_Hierarchy\n"
<< "Number of property values : " << ent->NbPropertyValues() << "\n"
<< "Line Font : " << ent->NewLineFont() << "\n"
<< "View Number : " << ent->NewView() << "\n"
<< "Entity level : " << ent->NewEntityLevel() << "\n"
<< "Blank status : " << ent->NewBlankStatus() << "\n"
<< "Line weight : " << ent->NewLineWeight() << "\n"
<< "Color number : " << ent->NewColorNum() << std::endl;
}

4
src/IGESBasic/IGESBasic_ToolHierarchy.hxx
View File

@ -34,8 +34,6 @@ class Interface_ShareTool;
class Interface_Check;
class Interface_CopyTool;
class IGESData_IGESDumper;
class Message_Messenger;
//! Tool to work on a Hierarchy. Called by various Modules
//! (ReadWriteModule, GeneralModule, SpecificModule)
@ -74,7 +72,7 @@ public:
Standard_EXPORT void OwnCopy (const Handle(IGESBasic_Hierarchy)& entfrom, const Handle(IGESBasic_Hierarchy)& entto, Interface_CopyTool& TC) const;
//! Dump of Specific Parameters
Standard_EXPORT void OwnDump (const Handle(IGESBasic_Hierarchy)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const;
Standard_EXPORT void OwnDump (const Handle(IGESBasic_Hierarchy)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const;

11
src/IGESBasic/IGESBasic_ToolName.cxx
View File

@ -105,12 +105,11 @@ void IGESBasic_ToolName::OwnCheck
void IGESBasic_ToolName::OwnDump
(const Handle(IGESBasic_Name)& ent, const IGESData_IGESDumper& /* dumper */,
const Handle(Message_Messenger)& S, const Standard_Integer /* level */) const
Standard_OStream& S, const Standard_Integer /* level */) const
{
S << "IGESBasic_Name" << Message_EndLine;
S << "Number of property values : " << ent->NbPropertyValues() << Message_EndLine;
S << "Name : ";
S << "IGESBasic_Name\n"
<< "Number of property values : " << ent->NbPropertyValues() << "\n"
<< "Name : ";
IGESData_DumpString(S,ent->Value());
S << Message_EndLine;
S << std::endl;
}

4
src/IGESBasic/IGESBasic_ToolName.hxx
View File

@ -34,8 +34,6 @@ class Interface_ShareTool;
class Interface_Check;
class Interface_CopyTool;
class IGESData_IGESDumper;
class Message_Messenger;
//! Tool to work on a Name. Called by various Modules
//! (ReadWriteModule, GeneralModule, SpecificModule)
@ -74,7 +72,7 @@ public:
Standard_EXPORT void OwnCopy (const Handle(IGESBasic_Name)& entfrom, const Handle(IGESBasic_Name)& entto, Interface_CopyTool& TC) const;
//! Dump of Specific Parameters
Standard_EXPORT void OwnDump (const Handle(IGESBasic_Name)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const;
Standard_EXPORT void OwnDump (const Handle(IGESBasic_Name)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const;

9
src/IGESBasic/IGESBasic_ToolOrderedGroup.cxx
View File

@ -151,12 +151,11 @@ void IGESBasic_ToolOrderedGroup::OwnCheck
void IGESBasic_ToolOrderedGroup::OwnDump
(const Handle(IGESBasic_OrderedGroup)& ent, const IGESData_IGESDumper& dumper,
const Handle(Message_Messenger)& S, const Standard_Integer level) const
Standard_OStream& S, const Standard_Integer level) const
{
S << "IGESBasic_OrderedGroup" << Message_EndLine;
S << "Entries in the Group : ";
S << "IGESBasic_OrderedGroup\n"
<< "Entries in the Group : ";
IGESData_DumpEntities(S,dumper ,level,1, ent->NbEntities(),ent->Entity);
S << Message_EndLine;
S << std::endl;
}

4
src/IGESBasic/IGESBasic_ToolOrderedGroup.hxx
View File

@ -34,8 +34,6 @@ class Interface_ShareTool;
class Interface_Check;
class Interface_CopyTool;
class IGESData_IGESDumper;
class Message_Messenger;
//! Tool to work on a OrderedGroup. Called by various Modules
//! (ReadWriteModule, GeneralModule, SpecificModule)
@ -74,7 +72,7 @@ public:
Standard_EXPORT void OwnCopy (const Handle(IGESBasic_OrderedGroup)& entfrom, const Handle(IGESBasic_OrderedGroup)& entto, Interface_CopyTool& TC) const;
//! Dump of Specific Parameters
Standard_EXPORT void OwnDump (const Handle(IGESBasic_OrderedGroup)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const;
Standard_EXPORT void OwnDump (const Handle(IGESBasic_OrderedGroup)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const;

9
src/IGESBasic/IGESBasic_ToolOrderedGroupWithoutBackP.cxx
View File

@ -152,12 +152,11 @@ void IGESBasic_ToolOrderedGroupWithoutBackP::OwnCheck
void IGESBasic_ToolOrderedGroupWithoutBackP::OwnDump
(const Handle(IGESBasic_OrderedGroupWithoutBackP)& ent, const IGESData_IGESDumper& dumper,
const Handle(Message_Messenger)& S, const Standard_Integer level) const
Standard_OStream& S, const Standard_Integer level) const
{
S << "IGESBasic_OrderedGroupWithoutBackP" << Message_EndLine;
S << "Entries in the Group : ";
S << "IGESBasic_OrderedGroupWithoutBackP\n"
<< "Entries in the Group : ";
IGESData_DumpEntities(S,dumper ,level,1, ent->NbEntities(),ent->Entity);
S << Message_EndLine;
S << std::endl;
}

4
src/IGESBasic/IGESBasic_ToolOrderedGroupWithoutBackP.hxx
View File

@ -34,8 +34,6 @@ class Interface_ShareTool;
class Interface_Check;
class Interface_CopyTool;
class IGESData_IGESDumper;
class Message_Messenger;
//! Tool to work on a OrderedGroupWithoutBackP. Called by various Modules
//! (ReadWriteModule, GeneralModule, SpecificModule)
@ -74,7 +72,7 @@ public:
Standard_EXPORT void OwnCopy (const Handle(IGESBasic_OrderedGroupWithoutBackP)& entfrom, const Handle(IGESBasic_OrderedGroupWithoutBackP)& entto, Interface_CopyTool& TC) const;
//! Dump of Specific Parameters
Standard_EXPORT void OwnDump (const Handle(IGESBasic_OrderedGroupWithoutBackP)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const;
Standard_EXPORT void OwnDump (const Handle(IGESBasic_OrderedGroupWithoutBackP)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const;

15
src/IGESBasic/IGESBasic_ToolSingleParent.cxx
View File

@ -176,15 +176,14 @@ void IGESBasic_ToolSingleParent::OwnCheck
void IGESBasic_ToolSingleParent::OwnDump
(const Handle(IGESBasic_SingleParent)& ent, const IGESData_IGESDumper& dumper,
const Handle(Message_Messenger)& S, const Standard_Integer level) const
Standard_OStream& S, const Standard_Integer level) const
{
S << "IGESBasic_SingleParent" << Message_EndLine;
S << "Number of ParentEntities : " << ent->NbParentEntities() << Message_EndLine;
S << "ParentEntity : ";
S << "IGESBasic_SingleParent\n"
<< "Number of ParentEntities : " << ent->NbParentEntities() << "\n"
<< "ParentEntity : ";
dumper.Dump(ent->SingleParent(),S,(level <= 4) ? 0 : 1);
S << Message_EndLine;
S << "Children : ";
S << "\n"
<< "Children : ";
IGESData_DumpEntities(S,dumper ,level,1, ent->NbChildren(),ent->Child);
S << Message_EndLine;
S << std::endl;
}

4
src/IGESBasic/IGESBasic_ToolSingleParent.hxx
View File

@ -34,8 +34,6 @@ class Interface_ShareTool;
class Interface_Check;
class Interface_CopyTool;
class IGESData_IGESDumper;
class Message_Messenger;
//! Tool to work on a SingleParent. Called by various Modules
//! (ReadWriteModule, GeneralModule, SpecificModule)
@ -74,7 +72,7 @@ public:
Standard_EXPORT void OwnCopy (const Handle(IGESBasic_SingleParent)& entfrom, const Handle(IGESBasic_SingleParent)& entto, Interface_CopyTool& TC) const;
//! Dump of Specific Parameters
Standard_EXPORT void OwnDump (const Handle(IGESBasic_SingleParent)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const;
Standard_EXPORT void OwnDump (const Handle(IGESBasic_SingleParent)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const;

15
src/IGESBasic/IGESBasic_ToolSingularSubfigure.cxx
View File

@ -159,15 +159,14 @@ void IGESBasic_ToolSingularSubfigure::OwnCheck
void IGESBasic_ToolSingularSubfigure::OwnDump
(const Handle(IGESBasic_SingularSubfigure)& ent, const IGESData_IGESDumper& dumper,
const Handle(Message_Messenger)& S, const Standard_Integer level) const
Standard_OStream& S, const Standard_Integer level) const
{
S << "IGESBasic_SingularSubfigure" << Message_EndLine;
S << "Subfigure Definition Entity : " ;
S << "IGESBasic_SingularSubfigure\n"
<< "Subfigure Definition Entity : " ;
dumper.Dump(ent->Subfigure(),S,(level <= 4) ? 0 : 1);
S << Message_EndLine;
S << " Translation Data : ";
S << "\n"
<< " Translation Data : ";
IGESData_DumpXYZL(S,level, ent->Translation(), ent->Location());
S << " Scale Factors : " << ent->ScaleFactor() << Message_EndLine;
S << Message_EndLine;
S << " Scale Factors : " << ent->ScaleFactor() << "\n"
<< std::endl;
}

4
src/IGESBasic/IGESBasic_ToolSingularSubfigure.hxx
View File

@ -33,8 +33,6 @@ class Interface_ShareTool;
class Interface_Check;
class Interface_CopyTool;
class IGESData_IGESDumper;
class Message_Messenger;
//! Tool to work on a SingularSubfigure. Called by various Modules
//! (ReadWriteModule, GeneralModule, SpecificModule)
@ -69,7 +67,7 @@ public:
Standard_EXPORT void OwnCopy (const Handle(IGESBasic_SingularSubfigure)& entfrom, const Handle(IGESBasic_SingularSubfigure)& entto, Interface_CopyTool& TC) const;
//! Dump of Specific Parameters
Standard_EXPORT void OwnDump (const Handle(IGESBasic_SingularSubfigure)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const;
Standard_EXPORT void OwnDump (const Handle(IGESBasic_SingularSubfigure)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const;

16
src/IGESBasic/IGESBasic_ToolSubfigureDef.cxx
View File

@ -32,7 +32,6 @@
#include <Interface_EntityIterator.hxx>
#include <Interface_Macros.hxx>
#include <Interface_ShareTool.hxx>
#include <Message_Messenger.hxx>
#include <Message_Msg.hxx>
#include <Standard_DomainError.hxx>
#include <TCollection_HAsciiString.hxx>
@ -142,15 +141,14 @@ void IGESBasic_ToolSubfigureDef::OwnCheck
void IGESBasic_ToolSubfigureDef::OwnDump
(const Handle(IGESBasic_SubfigureDef)& ent, const IGESData_IGESDumper& dumper,
const Handle(Message_Messenger)& S, const Standard_Integer level) const
Standard_OStream& S, const Standard_Integer level) const
{
S << "IGESBasic_SubfigureDef" << Message_EndLine;
S << "Depth of the subfigure : " << ent->Depth() << Message_EndLine;
S << "Name of subfigure : ";
S << "IGESBasic_SubfigureDef\n"
<< "Depth of the subfigure : " << ent->Depth() << "\n"
<< "Name of subfigure : ";
IGESData_DumpString(S,ent->Name());
S << Message_EndLine;
S << "The Associated Entities : " ;
S << "\n"
<< "The Associated Entities : ";
IGESData_DumpEntities(S,dumper,level,1,ent->NbEntities(),ent->AssociatedEntity);
S << Message_EndLine;
S << std::endl;
}

4
src/IGESBasic/IGESBasic_ToolSubfigureDef.hxx
View File

@ -33,8 +33,6 @@ class Interface_ShareTool;
class Interface_Check;
class Interface_CopyTool;
class IGESData_IGESDumper;
class Message_Messenger;
//! Tool to work on a SubfigureDef. Called by various Modules
//! (ReadWriteModule, GeneralModule, SpecificModule)
@ -69,7 +67,7 @@ public:
Standard_EXPORT void OwnCopy (const Handle(IGESBasic_SubfigureDef)& entfrom, const Handle(IGESBasic_SubfigureDef)& entto, Interface_CopyTool& TC) const;
//! Dump of Specific Parameters
Standard_EXPORT void OwnDump (const Handle(IGESBasic_SubfigureDef)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const;
Standard_EXPORT void OwnDump (const Handle(IGESBasic_SubfigureDef)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const;

15
src/IGESControl/IGESControl_Reader.cxx
View File

@ -247,7 +247,8 @@ void IGESControl_Reader::PrintTransferInfo
NCollection_DataMap<TCollection_AsciiString, Handle(TColStd_HSequenceOfInteger)>::Iterator aMapListIter(aMapList);
for(; aMapCountIter.More() && aMapListIter.More();
aMapCountIter.Next(), aMapListIter.Next()) {
TF << aMapCountIter.Value() << aMapCountIter.Key() << Message_EndLine;
Message_Messenger::StreamBuffer aSender = TF->SendInfo();
aSender << aMapCountIter.Value() << aMapCountIter.Key() << std::endl;
if (mode == IFSelect_ListByItem) {
Handle(TColStd_HSequenceOfInteger) entityList = aMapListIter.Value();
Standard_Integer length = entityList->Length();
@ -255,19 +256,19 @@ void IGESControl_Reader::PrintTransferInfo
TF->Send(msg3035, Message_Info);
char line[80];
sprintf(line, "\t\t\t");
TF << line;
aSender << line;
Standard_Integer nbInLine = 0;
for (Standard_Integer i = 1; i <= length; i++) {
// IDT_Out << (entityList->Value(i)) << " ";
sprintf(line, "\t %d", entityList->Value(i));
TF << line;
aSender << line;
if (++nbInLine == 6) {
nbInLine = 0;
sprintf(line, "\n\t\t\t");
TF << line;
aSender << line;
}
}
TF << Message_EndLine;
aSender << std::endl;
}
}
break;
@ -281,7 +282,7 @@ void IGESControl_Reader::PrintTransferInfo
NCollection_DataMap<TCollection_AsciiString, Standard_Integer>::Iterator aMapIter(aMapCountResult);
for (; aMapIter.More(); aMapIter.Next())
{
TF << aMapIter.Key() << aMapIter.Value() << Message_EndLine;
TF->SendInfo() << aMapIter.Key() << aMapIter.Value() << std::endl;
}
break;
}
@ -311,7 +312,7 @@ void IGESControl_Reader::PrintTransferInfo
for(; aMapCountIter.More(); aMapCountIter.Next()) {
char mess[80];
sprintf(mess, aMapCountIter.Key().ToCString(), aMapCountIter.Value());
TF << mess << Message_EndLine; //dicoCountIter.Value() << dicoCountIter.Name() << std::endl;
TF->SendInfo() << mess << std::endl; //dicoCountIter.Value() << dicoCountIter.Name() << std::endl;
}
break;
}

16
src/IGESData/IGESData_DefaultSpecific.cxx
View File

@ -32,29 +32,29 @@ IGESData_DefaultSpecific::IGESData_DefaultSpecific ()
void IGESData_DefaultSpecific::OwnDump
(const Standard_Integer /*CN*/, const Handle(IGESData_IGESEntity)& ent,
const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S,
const IGESData_IGESDumper& dumper, Standard_OStream& S,
const Standard_Integer /*own*/) const
{
DeclareAndCast(IGESData_UndefinedEntity,lent,ent);
if (lent.IsNull()) return;
Standard_Integer dstat = lent->DirStatus();
if (dstat != 0) S
<< " -- Directory Entry Error Status = " << dstat << " --" << Message_EndLine;
if (dstat != 0)
S << " -- Directory Entry Error Status = " << dstat << " --\n";
Handle(Interface_UndefinedContent) cont = lent->UndefinedContent();
Standard_Integer nb = cont->NbParams();
S << " UNDEFINED ENTITY ...\n"<<nb
<<" Parameters (WARNING : Odd Integer Values Interpreted as Entities)\n";
for (Standard_Integer i = 1; i <= nb; i ++) {
Interface_ParamType ptyp = cont->ParamType(i);
if (ptyp == Interface_ParamVoid) S<<" ["<<i<<":Void]";
if (ptyp == Interface_ParamVoid) S <<" ["<<i<<":Void]";
else if (cont->IsParamEntity(i)) {
DeclareAndCast(IGESData_IGESEntity,anent,cont->ParamEntity(i));
S<<" ["<<i<<":IGES]=";
S <<" ["<<i<<":IGES]=";
dumper.PrintDNum(anent,S);
}
else { S<<" ["<<i<<"]=" << cont->ParamValue(i); }
if ( i == (i%5)*5) S << Message_EndLine;
else { S <<" ["<<i<<"]=" << cont->ParamValue(i)->String(); }
if ( i == (i%5)*5) S << "\n";
}
S << Message_EndLine;
S << std::endl;
}

4
src/IGESData/IGESData_DefaultSpecific.hxx
View File

@ -24,8 +24,6 @@
#include <Standard_Integer.hxx>
class IGESData_IGESEntity;
class IGESData_IGESDumper;
class Message_Messenger;
class IGESData_DefaultSpecific;
DEFINE_STANDARD_HANDLE(IGESData_DefaultSpecific, IGESData_SpecificModule)
@ -43,7 +41,7 @@ public:
//! Specific Dump for UndefinedEntity : it concerns only
//! own parameters, the general data (Directory Part, Lists) are
//! taken into account by the IGESDumper
Standard_EXPORT void OwnDump (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const Standard_OVERRIDE;
Standard_EXPORT void OwnDump (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const Standard_OVERRIDE;

16
src/IGESData/IGESData_Dump.hxx
View File

@ -96,7 +96,7 @@
#define IGESData_DumpString(S,str) \
if (str.IsNull()) S << "(undefined)";\
else { S << '"' << str << '"'; }
else { S << '"' << str->String() << '"'; }
#define IGESData_DumpXY(S,XYval) \
S << " (" << XYval.X() << "," << XYval.Y() << ")"
@ -211,8 +211,8 @@ if (str.IsNull()) S << "(undefined)";\
S << " :";\
for (Standard_Integer iopa = lo; iopa <= up; iopa ++) IGESData_DumpXY(S,item(iopa));\
if (Trsf.Form() != gp_Identity) {\
S<< "\n Transformed :";\
if (Level == 5) S<<" [ask level > 5]";\
S << "\n Transformed :";\
if (Level == 5) S <<" [ask level > 5]";\
else\
for (Standard_Integer jopa = lo; jopa <= up; jopa ++)\
IGESData_DumpXYT(S,item(jopa),Trsf);\
@ -231,8 +231,8 @@ if (str.IsNull()) S << "(undefined)";\
S << " :";\
for (Standard_Integer iopa = lo; iopa <= up; iopa ++) IGESData_DumpXY(S,item(iopa));\
if (Trsf.Form() != gp_Identity) {\
S<< "\n Transformed :";\
if (Level == 5) S<<" [ask level > 5]";\
S << "\n Transformed :";\
if (Level == 5) S <<" [ask level > 5]";\
else\
for (Standard_Integer jopa = lo; jopa <= up; jopa ++)\
IGESData_DumpXYTZ(S,item(jopa),Trsf,Z);\
@ -252,8 +252,8 @@ if (str.IsNull()) S << "(undefined)";\
S << " :";\
for (Standard_Integer iopa = lo; iopa <= up; iopa ++) IGESData_DumpXYZ(S,item(iopa));\
if (Trsf.Form() != gp_Identity) {\
S<< "\n Transformed :";\
if (Level == 5) S<<" [ask level > 5]";\
S << "\n Transformed :";\
if (Level == 5) S <<" [ask level > 5]";\
else\
for (Standard_Integer jopa = lo; jopa <= up; jopa ++)\
IGESData_DumpXYZT(S,item(jopa),Trsf);\
@ -271,7 +271,7 @@ if (str.IsNull()) S << "(undefined)";\
else if (Level > 0) {\
S << " :";\
for (Standard_Integer iopa = lo; iopa <= up; iopa ++)\
{ S << "\n["<<Interface_MSG::Blanks(iopa,3)<<iopa<<"]:\"" << item(iopa) << '"'; }\
{ S << "\n["<<Interface_MSG::Blanks(iopa,3)<<iopa<<"]:\"" << item(iopa)->String() << '"'; }\
S << "\n";\
}\
}

94
src/IGESData/IGESData_IGESDumper.cxx
View File

@ -28,7 +28,6 @@
#include <Interface_InterfaceError.hxx>
#include <Interface_Macros.hxx>
#include <Interface_MSG.hxx>
#include <Message_Messenger.hxx>
#include <TCollection_HAsciiString.hxx>
IGESData_IGESDumper::IGESData_IGESDumper
@ -39,29 +38,29 @@ IGESData_IGESDumper::IGESData_IGESDumper
void IGESData_IGESDumper::PrintDNum
(const Handle(IGESData_IGESEntity)& ent, const Handle(Message_Messenger)& S) const
(const Handle(IGESData_IGESEntity)& ent, Standard_OStream& S) const
{
// Affichage garanti sur 12 caracteres 12345/D24689
Standard_Integer num = 0;
if (!ent.IsNull()) {
if (themodel.IsNull()) S<<" D??? ";
else if ( (num = themodel->Number(ent)) == 0) S<<" 0:D?????";
if (themodel.IsNull()) S <<" D??? ";
else if ( (num = themodel->Number(ent)) == 0) S <<" 0:D?????";
// throw Interface_InterfaceError("IGESDumper : PrintDNum");
else {
S<<Interface_MSG::Blanks(num,9)<<num<<":D"<<2*num-1<<Interface_MSG::Blanks(2*num-1,9);
S <<Interface_MSG::Blanks(num,9)<<num<<":D"<<2*num-1<<Interface_MSG::Blanks(2*num-1,9);
}
}
else S<<" D0(Null) ";
else S <<" D0(Null) ";
}
void IGESData_IGESDumper::PrintShort
(const Handle(IGESData_IGESEntity)& ent, const Handle(Message_Messenger)& S) const
(const Handle(IGESData_IGESEntity)& ent, Standard_OStream& S) const
{
// PrintDNum(ent,S);
if (!ent.IsNull()) {
Standard_Integer num = 0;
if (!themodel.IsNull()) num = themodel->Number(ent);
if (num > 0) S<<num<<":D"<<2*num-1;
if (num > 0) S <<num<<":D"<<2*num-1;
S << " Type:" << ent->TypeNumber() << " Form:" << ent->FormNumber()
<< Interface_MSG::Blanks (ent->FormNumber(),3)
<< " Class:"<< Interface_InterfaceModel::ClassName(ent->DynamicType()->Name());
@ -70,7 +69,7 @@ IGESData_IGESDumper::IGESData_IGESDumper
void IGESData_IGESDumper::Dump
(const Handle(IGESData_IGESEntity)& ent, const Handle(Message_Messenger)& S,
(const Handle(IGESData_IGESEntity)& ent, Standard_OStream& S,
const Standard_Integer own, const Standard_Integer attached) const
{
Standard_Integer att = attached;
@ -79,27 +78,28 @@ IGESData_IGESDumper::IGESData_IGESDumper
if (att == 0) att = diratt; // -1 signifie : ne rien sortir
if (own < 0) return;
if (own > 1) S<<"\n";
if (ent.IsNull()) { S<<"(Null)"; if (own > 1) S<<"\n"; return; }
if (own > 1) S <<"\n";
if (ent.IsNull()) { S <<"(Null)"; if (own > 1) S <<"\n"; return; }
if (own == 0) { PrintDNum (ent,S); return; } // affichage auxiliaire
if (own == 1) { PrintShort (ent,S); return; } // affichage auxiliaire
if (own > 0) S<<"**** Dump IGES, level "<<own<<" ( ";
if (own > 0) S <<"**** Dump IGES, level "<<own<<" ( ";
switch (own) {
case 0 : break;
case 1 : S<<"D.E. Number + Type + Name"; break;
case 2 : S<<"D.E. Number + Type, Name + Transf, View"; break;
case 3 : S<<"Complete Directory Part"; break;
case 4 : S<<"Directory Part + Parameters, no Arrays"; break;
case 5 : S<<"Complete"; break;
default : S<<"Complete + Transformed Values"; break;
case 1 : S <<"D.E. Number + Type + Name"; break;
case 2 : S <<"D.E. Number + Type, Name + Transf, View"; break;
case 3 : S <<"Complete Directory Part"; break;
case 4 : S <<"Directory Part + Parameters, no Arrays"; break;
case 5 : S <<"Complete"; break;
default : S <<"Complete + Transformed Values"; break;
}
S<<" ) ****"<<Message_EndLine;
S <<" ) ****\n";
// **** Entity 1234:D2467 ** Type:102 Form:56 ** CompositeCurve **
S<<"\n**** Entity "; PrintShort (ent,S); S<<Message_EndLine;
S <<"\n**** Entity "; PrintShort (ent,S); S << "\n";
S<<" Directory Part\n";
S <<" Directory Part\n";
// ** Status : Blank:1 Subordinate:2 UseFlag:3 Hierarchy:4
if (own >= 2)
S <<"** Status Number : Blank:"<<ent->BlankStatus()
@ -107,50 +107,50 @@ IGESData_IGESDumper::IGESData_IGESDumper
<<" UseFlag:"<<ent->UseFlag()
<<" Hierarchy:"<<ent->HierarchyStatus()<<"\n";
if (own >= 1) {
if (ent->HasShortLabel()) S<<"**** Label :"<<ent->ShortLabel()->ToCString();
if (ent->HasSubScriptNumber()) S<<" SubScript:"<<ent->SubScriptNumber();
if (ent->HasShortLabel()) S<<Message_EndLine;
if (ent->HasShortLabel()) S <<"**** Label :"<<ent->ShortLabel()->ToCString();
if (ent->HasSubScriptNumber()) S <<" SubScript:"<<ent->SubScriptNumber();
if (ent->HasShortLabel()) S <<std::endl;
if (ent->HasTransf())
{ S<<"** Transf.Matrix :"; PrintDNum(ent->Transf(),S); S<<"\n"; }
{ S <<"** Transf.Matrix :"; PrintDNum(ent->Transf(),S); S <<"\n"; }
IGESData_DefList viewkind = ent->DefView();
if (viewkind == IGESData_DefOne)
{ S<<"** View :"; PrintDNum (ent->View(),S); S<<"\n"; }
{ S <<"** View :"; PrintDNum (ent->View(),S); S <<"\n"; }
if (viewkind == IGESData_DefSeveral)
{ S<<"** View (List) :"; PrintDNum (ent->ViewList(),S); S<<"\n"; }
{ S <<"** View (List) :"; PrintDNum (ent->ViewList(),S); S <<"\n"; }
}
if (own >= 2) {
if (ent->HasStructure())
{ S<<"** Structure :"; PrintDNum (ent->Structure(),S); S<<"\n"; }
{ S <<"** Structure :"; PrintDNum (ent->Structure(),S); S <<"\n"; }
S<<"\n Graphic Attributes\n";
S <<"\n Graphic Attributes\n";
if (ent->DefLineFont() == IGESData_DefValue)
{ S<<"** LineFont Value:"<<ent->RankLineFont()<<"\n"; }
{ S <<"** LineFont Value:"<<ent->RankLineFont()<<"\n"; }
else if (ent->DefLineFont() == IGESData_DefReference)
{ S<<"** LineFont Ref :"; PrintDNum (ent->LineFont(),S); S<<"\n"; }
{ S <<"** LineFont Ref :"; PrintDNum (ent->LineFont(),S); S <<"\n"; }
if (ent->Level() > 0) S<<"** Level Value :"<<ent->Level()<<"\n";
if (ent->Level() > 0) S <<"** Level Value :"<<ent->Level()<<"\n";
else if (ent->Level() < 0)
{ S<<"** Level List :"; PrintDNum(ent->LevelList(),S); S<<"\n"; }
{ S <<"** Level List :"; PrintDNum(ent->LevelList(),S); S <<"\n"; }
if (ent->HasLabelDisplay())
{ S<<"** Label Display :"; PrintDNum (ent->LabelDisplay(),S); S<<"\n"; }
{ S <<"** Label Display :"; PrintDNum (ent->LabelDisplay(),S); S <<"\n"; }
if (ent->LineWeightNumber() != 0) {
S <<"** LineWeight Num:"<<ent->LineWeightNumber();
if (diratt > 0) S<<" -> Value:"<<ent->LineWeight();
S<<Message_EndLine;
S <<"** LineWeight Num:"<<ent->LineWeightNumber();
if (diratt > 0) S <<" -> Value:"<<ent->LineWeight();
S <<std::endl;
}
if (ent->DefColor() == IGESData_DefValue)
{ S<<"** Color Value :"<<ent->RankColor(); }
{ S <<"** Color Value :"<<ent->RankColor(); }
else if (ent->DefColor() == IGESData_DefReference)
{ S<<"** Color Ref :"; PrintDNum (ent->Color(),S); }
S<<Message_EndLine;
{ S <<"** Color Ref :"; PrintDNum (ent->Color(),S); }
S <<std::endl;
if (own > 3) {
S<<"**** Own Data ****\n\n";
S <<"**** Own Data ****\n\n";
OwnDump(ent,S,own);
}
}
@ -161,7 +161,7 @@ IGESData_IGESDumper::IGESData_IGESDumper
Standard_Integer nb = iter.NbEntities();
Standard_Boolean iasuit = (nb > 0);
if (nb > 0) {
S<<"\n**** Properties (nb:"<<nb<<") ****\n";
S <<"\n**** Properties (nb:"<<nb<<") ****\n";
for (;iter.More(); iter.Next()) {
DeclareAndCast(IGESData_IGESEntity,ent2,iter.Value());
Dump (ent2,S,att,-1);
@ -171,28 +171,28 @@ IGESData_IGESDumper::IGESData_IGESDumper
nb = iter.NbEntities();
if (nb > 0) iasuit = Standard_True;
if (nb > 0) {
S<<"\n**** Associativities (nb:"<<nb<<") ****\n";
S <<"\n**** Associativities (nb:"<<nb<<") ****\n";
for (;iter.More(); iter.Next()) {
DeclareAndCast(IGESData_IGESEntity,ent2,iter.Value());
Dump(ent2,S,att,-1);
}
}
if (iasuit) { if (att <= 1) S << "\n"; }
S<<"\n**** End of Dump ****\n"<<Message_EndLine;
S <<"\n**** End of Dump ****\n"<<std::endl;
}
void IGESData_IGESDumper::OwnDump
(const Handle(IGESData_IGESEntity)& ent, const Handle(Message_Messenger)& S,
(const Handle(IGESData_IGESEntity)& ent, Standard_OStream& S,
const Standard_Integer own) const
{
Handle(IGESData_SpecificModule) module; Standard_Integer CN;
if (thelib.Select(ent,module,CN))
module->OwnDump(CN,ent,*this,S,own);
else if (themodel.IsNull())
S <<" **** Dump impossible. Type "<<ent->DynamicType()->Name()<<Message_EndLine;
S <<" **** Dump impossible. Type "<<ent->DynamicType()->Name()<<std::endl;
else
S <<" **** Dump Impossible, n0:id:"<<themodel->Number(ent)<<":D"
<<themodel->DNum(ent)<<" Type "<<ent->DynamicType()->Name()<<Message_EndLine;
<<themodel->DNum(ent)<<" Type "<<ent->DynamicType()->Name()<<std::endl;
}

10
src/IGESData/IGESData_IGESDumper.hxx
View File

@ -27,8 +27,6 @@ class IGESData_IGESModel;
class Interface_InterfaceError;
class IGESData_Protocol;
class IGESData_IGESEntity;
class Message_Messenger;
//! Provides a way to obtain a clear Dump of an IGESEntity
//! (distinct from normalized output). It works with tools
@ -55,18 +53,18 @@ public:
//! Prints onto an output, the "Number of Directory Entry" which
//! corresponds to an IGESEntity in the IGESModel, under the form
//! "D#nnn" (a Null Handle gives D#0)
Standard_EXPORT void PrintDNum (const Handle(IGESData_IGESEntity)& ent, const Handle(Message_Messenger)& S) const;
Standard_EXPORT void PrintDNum (const Handle(IGESData_IGESEntity)& ent, Standard_OStream& S) const;
//! Prints onto an output, the "Number of Directory Entry" (see
//! PrintDNum) plus IGES Type and Form Numbers, which gives
//! "D#nnn Type nnn Form nnn"
Standard_EXPORT void PrintShort (const Handle(IGESData_IGESEntity)& ent, const Handle(Message_Messenger)& S) const;
Standard_EXPORT void PrintShort (const Handle(IGESData_IGESEntity)& ent, Standard_OStream& S) const;
Standard_EXPORT void Dump (const Handle(IGESData_IGESEntity)& ent, const Handle(Message_Messenger)& S, const Standard_Integer own, const Standard_Integer attached = -1) const;
Standard_EXPORT void Dump (const Handle(IGESData_IGESEntity)& ent, Standard_OStream& S, const Standard_Integer own, const Standard_Integer attached = -1) const;
//! Specific Dump for each IGES Entity, call by Dump (just above)
//! <own> is the parameter <own> from Dump
Standard_EXPORT void OwnDump (const Handle(IGESData_IGESEntity)& ent, const Handle(Message_Messenger)& S, const Standard_Integer own) const;
Standard_EXPORT void OwnDump (const Handle(IGESData_IGESEntity)& ent, Standard_OStream& S, const Standard_Integer own) const;

71
src/IGESData/IGESData_IGESModel.cxx
View File

@ -25,7 +25,6 @@
#include <Interface_InterfaceModel.hxx>
#include <Interface_Macros.hxx>
#include <Interface_Static.hxx>
#include <Message_Messenger.hxx>
#include <Message_Msg.hxx>
#include <Standard_Transient.hxx>
#include <Standard_Type.hxx>
@ -75,14 +74,14 @@ void IGESData_IGESModel::ClearHeader ()
//=======================================================================
void IGESData_IGESModel::DumpHeader
(const Handle(Message_Messenger)& S, const Standard_Integer ) const
(Standard_OStream& S, const Standard_Integer ) const
{
Standard_Integer ns = thestart->Length();
S<<"**** Dump of IGES Model , Start and Global Sections ****"<<Message_EndLine;
S <<"**** Dump of IGES Model , Start and Global Sections ****"<<std::endl;
if (ns > 0) {
S << "**** Start Section : "<<ns<<" Line(s) ****\n";
for (Standard_Integer i = 1; i <= ns; i ++)
S<<"["<<(i<10 ? " ": "")<<i<<"]:"<<thestart->Value(i)->ToCString()<<Message_EndLine;
S <<"["<<(i<10 ? " ": "")<<i<<"]:"<<thestart->Value(i)->ToCString()<<std::endl;
}
S << "\n**** Global Section ****\n";
char sep = theheader.Separator();
@ -91,73 +90,73 @@ void IGESData_IGESModel::DumpHeader
char emk = theheader.EndMark();
if (emk == ';') S << " [ 2] Default End Mark : " << emk;
else S << " [ 2] Non Default End Mark : " << emk;
S<<"\n";
S <<"\n";
Handle(TCollection_HAsciiString) str;
str = theheader.SendName();
if (!str.IsNull()) S<<"[ 3] Sender : "<<str->ToCString()<<Message_EndLine;
if (!str.IsNull()) S <<"[ 3] Sender : "<<str->ToCString()<<std::endl;
str = theheader.FileName();
if (!str.IsNull()) S<<"[ 4] (recorded) File Name : "<<str->ToCString()<<Message_EndLine;
if (!str.IsNull()) S <<"[ 4] (recorded) File Name : "<<str->ToCString()<<std::endl;
str = theheader.SystemId();
if (!str.IsNull()) S<<"[ 5] System Identification : "<<str->ToCString()<<Message_EndLine;
if (!str.IsNull()) S <<"[ 5] System Identification : "<<str->ToCString()<<std::endl;
str = theheader.InterfaceVersion();
if (!str.IsNull()) S<<"[ 6] Interface Version : "<<str->ToCString()<<Message_EndLine;
S<<Message_EndLine;
if (!str.IsNull()) S <<"[ 6] Interface Version : "<<str->ToCString()<<std::endl;
S <<std::endl;
S << "[ 7] Integer Bits : " << theheader.IntegerBits()
<< " Features for Reals : " << Message_EndLine;
<< " Features for Reals : " << std::endl;
S << "[ 8] Single Max.Power(10) : " << theheader.MaxPower10Single();
S << " [ 9] Digits : " << theheader.MaxDigitsSingle()<<"\n";
S << "[10] Double Max.Power(10) : " << theheader.MaxPower10Double();
S << " [11] Digits : " << theheader.MaxDigitsDouble() << "\n\n";
str = theheader.ReceiveName();
if (!str.IsNull()) S<<"[12] Receiver : "<<str->ToCString()<<"\n";
if (!str.IsNull()) S <<"[12] Receiver : "<<str->ToCString()<<"\n";
S << "[13] Scale : " << theheader.Scale()<<"\n";
S << "[14] Unit Flag : " << theheader.UnitFlag();
// if (Interface_Static::IVal("read.scale.unit") == 1)
//#73 rln 10.03.99 S4135: "read.scale.unit" does not affect GlobalSection
// S << " -> Value (in Meter) = " << theheader.UnitValue() / 1000 <<"\n";
// S << " -> Value (in Meter) = " << theheader.UnitValue() / 1000 <<"\n";
// else S << " -> Value (in Millimeter) = " << theheader.UnitValue()<<"\n";
//abv 02 Mar 00: no unit parameter in OCC
S << " -> Value (in CASCADE units) = " << theheader.UnitValue() <<"\n";
str = theheader.UnitName();
if (!str.IsNull()) S<<"[15] Unit Name : " << str->ToCString()<<"\n\n";
if (!str.IsNull()) S <<"[15] Unit Name : " << str->ToCString()<<"\n\n";
S << "[16] Line Weight Gradient : " << theheader.LineWeightGrad()<<"\n";
S << "[17] Line Weight Max Value: " << theheader.MaxLineWeight()<<"\n";
str = theheader.Date();
if (!str.IsNull()) S<<"[18] (Creation) Date : "<<str->ToCString()
if (!str.IsNull()) S <<"[18] (Creation) Date : "<<str->ToCString()
<<" i.e. "<<IGESData_GlobalSection::NewDateString(str,1)->ToCString()<<"\n";
S << "[19] Resolution : " << theheader.Resolution()<<"\n";
if (theheader.HasMaxCoord())
S<<"[20] Maximum Coord : " << theheader.MaxCoord() << "\n\n";
else S<<"[20] Maximum Coord not defined\n\n";
S <<"[20] Maximum Coord : " << theheader.MaxCoord() << "\n\n";
else S <<"[20] Maximum Coord not defined\n\n";
str = theheader.AuthorName();
if (!str.IsNull()) S<<"[21] Author : "<<str->ToCString()<<"\n";
if (!str.IsNull()) S <<"[21] Author : "<<str->ToCString()<<"\n";
str = theheader.CompanyName();
if (!str.IsNull()) S<<"[22] Company : "<<str->ToCString()<<"\n";
if (!str.IsNull()) S <<"[22] Company : "<<str->ToCString()<<"\n";
Standard_Integer num = theheader.IGESVersion();
S << "[23] IGES Version Number : " << num << " -> Name : "
<< IGESData_BasicEditor::IGESVersionName(num);
num = theheader.DraftingStandard();
S << "\n[24] Drafting Standard : " << num;
if (num > 0) S<< " -> Name : " << IGESData_BasicEditor::DraftingName(num);
S<<Message_EndLine;
if (num > 0) S << " -> Name : " << IGESData_BasicEditor::DraftingName(num);
S <<std::endl;
if (theheader.HasLastChangeDate()) {
str = theheader.LastChangeDate();
S << "[25] Last Change Date : " << str->ToCString()
<<" i.e. "<<IGESData_GlobalSection::NewDateString(str,1)->ToCString()<<Message_EndLine;
<<" i.e. "<<IGESData_GlobalSection::NewDateString(str,1)->ToCString()<<std::endl;
}
else S<<"[25] Last Change Date not defined (version IGES < 5.1)" << Message_EndLine;
else S <<"[25] Last Change Date not defined (version IGES < 5.1)" << std::endl;
if (theheader.HasApplicationProtocol()) {
str = theheader.ApplicationProtocol();
S << "[26] Application Protocol : " << str->ToCString() <<Message_EndLine;
S << "[26] Application Protocol : " << str->ToCString() <<std::endl;
}
S << " **** End of Dump ****"<<Message_EndLine;
S << " **** End of Dump ****"<<std::endl;
}
@ -565,14 +564,14 @@ void IGESData_IGESModel::ClearLabels ()
//=======================================================================
void IGESData_IGESModel::PrintLabel
(const Handle(Standard_Transient)& ent, const Handle(Message_Messenger)& S) const
(const Handle(Standard_Transient)& ent, Standard_OStream& S) const
{
DeclareAndCast(IGESData_IGESEntity,igesent,ent);
if (igesent.IsNull()) S<<"Null";
if (igesent.IsNull()) S <<"Null";
else {
Standard_Integer num = Number(ent);
if (num == 0) S<<"??";
else S<<"D"<<(2*num-1);
if (num == 0) S <<"??";
else S <<"D"<<(2*num-1);
}
}
@ -583,14 +582,14 @@ void IGESData_IGESModel::PrintLabel
//=======================================================================
void IGESData_IGESModel::PrintToLog
(const Handle(Standard_Transient)& ent, const Handle(Message_Messenger)& S) const
(const Handle(Standard_Transient)& ent, Standard_OStream& S) const
{
DeclareAndCast(IGESData_IGESEntity,igesent,ent);
if (!igesent.IsNull()) {
Standard_Integer num = Number(ent);
if (num == 0) S<<"??";
if (num == 0) S <<"??";
else {
S<<" DE : "<<(2*num-1) << " type : " << igesent->TypeNumber();
S <<" DE : "<<(2*num-1) << " type : " << igesent->TypeNumber();
// Standard_Integer num2 = igesent->TypeNumber();
}
}
@ -603,15 +602,15 @@ void IGESData_IGESModel::PrintToLog
//=======================================================================
void IGESData_IGESModel::PrintInfo
(const Handle(Standard_Transient)& ent, const Handle(Message_Messenger)& S) const
(const Handle(Standard_Transient)& ent, Standard_OStream& S) const
{
DeclareAndCast(IGESData_IGESEntity,igesent,ent);
if (igesent.IsNull()) S<<"(NOT IGES)";
if (igesent.IsNull()) S <<"(NOT IGES)";
else {
Standard_Integer num = Number(ent);
if (num == 0) S<<"??";
if (num == 0) S <<"??";
else {
S<<(2*num-1) << "type " << Type(ent)->Name();
S <<(2*num-1) << "type " << Type(ent)->Name();
}
}
}

17
src/IGESData/IGESData_IGESModel.hxx
View File

@ -17,18 +17,11 @@
#ifndef _IGESData_IGESModel_HeaderFile
#define _IGESData_IGESModel_HeaderFile
#include <Standard.hxx>
#include <Standard_Type.hxx>
#include <TColStd_HSequenceOfHAsciiString.hxx>
#include <IGESData_GlobalSection.hxx>
#include <Interface_InterfaceModel.hxx>
#include <Standard_Integer.hxx>
#include <Standard_CString.hxx>
#include <Standard_Boolean.hxx>
#include <Standard_Real.hxx>
class Interface_InterfaceError;
class Message_Messenger;
class IGESData_GlobalSection;
class IGESData_IGESEntity;
class Interface_InterfaceModel;
@ -67,7 +60,7 @@ public:
//! Prints the IGES file header
//! (Start and Global Sections) to the log file. The integer
//! parameter is intended to be used as a level indicator but is not used at present.
Standard_EXPORT void DumpHeader (const Handle(Message_Messenger)& S, const Standard_Integer level = 0) const Standard_OVERRIDE;
Standard_EXPORT void DumpHeader (Standard_OStream& S, const Standard_Integer level = 0) const Standard_OVERRIDE;
//! Returns Model's Start Section (list of comment lines)
Standard_EXPORT Handle(TColStd_HSequenceOfHAsciiString) StartSection() const;
@ -144,16 +137,16 @@ public:
//! Prints label specific to IGES norm for a given entity, i.e.
//! its directory entry number (2*Number-1)
Standard_EXPORT void PrintLabel (const Handle(Standard_Transient)& ent, const Handle(Message_Messenger)& S) const Standard_OVERRIDE;
Standard_EXPORT void PrintLabel (const Handle(Standard_Transient)& ent, Standard_OStream& S) const Standard_OVERRIDE;
//! Prints label specific to IGES norm for a given -- --
//! entity, i.e. its directory entry number (2*Number-1)
//! in the log file format.
Standard_EXPORT virtual void PrintToLog (const Handle(Standard_Transient)& ent, const Handle(Message_Messenger)& S) const Standard_OVERRIDE;
Standard_EXPORT virtual void PrintToLog (const Handle(Standard_Transient)& ent, Standard_OStream& S) const Standard_OVERRIDE;
//! Prints label specific to IGES norm for a given entity, i.e.
//! its directory entry number (2*Number-1)
Standard_EXPORT void PrintInfo (const Handle(Standard_Transient)& ent, const Handle(Message_Messenger)& S) const;
Standard_EXPORT void PrintInfo (const Handle(Standard_Transient)& ent, Standard_OStream& S) const;
//! Returns a string with the label attached to a given entity,
//! i.e. a string "Dnn" with nn = directory entry number (2*N-1)

24
src/IGESData/IGESData_IGESWriter.cxx
View File

@ -116,7 +116,7 @@ void IGESData_IGESWriter::SendStartLine (const Standard_CString startline)
void IGESData_IGESWriter::SendModel
(const Handle(IGESData_Protocol)& protocol)
{
Handle(Message_Messenger) sout = Message::DefaultMessenger();
Message_Messenger::StreamBuffer sout = Message::SendInfo();
IGESData_WriterLib lib(protocol);
Standard_Integer nb = themodel->NbEntities();
@ -137,7 +137,7 @@ void IGESData_IGESWriter::SendStartLine (const Standard_CString startline)
#endif
// Attention aux cas d erreur : contenu redefini
if (themodel->IsRedefinedContent(i)) {
sout << " -- IGESWriter : Erroneous Entity N0."<<i<<" --"<<Message_EndLine;
sout << " -- IGESWriter : Erroneous Entity N0."<<i<<" --"<<std::endl;
Handle(Interface_ReportEntity) rep = themodel->ReportEntity(i);
if (!rep.IsNull()) cnt = GetCasted(IGESData_IGESEntity,rep->Content());
if (cnt.IsNull()) cnt = ent; // secours
@ -156,7 +156,7 @@ void IGESData_IGESWriter::SendStartLine (const Standard_CString startline)
undent->WriteOwnParams (*this);
}
else sout<<" -- IGESWriter : Not Processed for n0."<<i<<" in file, Type "
<<cnt->TypeNumber()<<" Form "<<cnt->FormNumber()<<Message_EndLine;
<<cnt->TypeNumber()<<" Form "<<cnt->FormNumber()<<std::endl;
Associativities (cnt);
Properties (cnt);
@ -505,7 +505,7 @@ Standard_Boolean IGESData_IGESWriter::Print (Standard_OStream& S) const
S << " *** EUCLID/STRIM DESKTOP CLIPBOARD ***"<<std::endl;
writefnes (S," S0000001");
}
else S<<" S0000001";
else S <<" S0000001";
// 123456789 123456789 123456789 123456789 123456789 123456789 123456789 12
S << std::endl;
} else {
@ -517,7 +517,7 @@ Standard_Boolean IGESData_IGESWriter::Print (Standard_OStream& S) const
if (fnes) writefnes (S,line->ToCString());
else S << line->ToCString();
// for (Standard_Integer k = line->Length()+1; k <= MaxcarsG; k ++) S<<' ';
// for (Standard_Integer k = line->Length()+1; k <= MaxcarsG; k ++) aSender <<' ';
S << &blancs[line->Length()];
if (fnes) writefnes (S,finlin);
else S << finlin;
@ -537,7 +537,7 @@ Standard_Boolean IGESData_IGESWriter::Print (Standard_OStream& S) const
if (fnes) writefnes (S,line->ToCString());
else S << line->ToCString();
// for (Standard_Integer k = line->Length()+1; k <= MaxcarsG; k ++) S<<' ';
// for (Standard_Integer k = line->Length()+1; k <= MaxcarsG; k ++) aSender <<' ';
S << &blancs[line->Length()];
if (fnes) writefnes (S,finlin);
else S << finlin;
@ -567,16 +567,16 @@ Standard_Boolean IGESData_IGESWriter::Print (Standard_OStream& S) const
v[8],v[9],v[10],v[11] ,2*i-1);
if (fnes) writefnes (S,ligne);
else S << ligne;
S<< "\n";
S << "\n";
sprintf(ligne,"%8d%8d%8d%8d%8d%8s%8s%8s%8sD%7.7d",
v[0],v[13],v[14],v[15],v[16],res1,res2,lab,num,2*i);
if (fnes) writefnes (S,ligne);
else S << ligne;
S<< "\n";
S << "\n";
// std::cout << "Ent.no "<<i<<" No en P "<<thepnum.Value(i)<<
// " Lignes P:"<<thepnum.Value(i+1)-thepnum.Value(i)<<std::endl;
// for (j = 0; j < 17; j ++) S<<v[j]<<" ";
// S<<res1<<res2<<" label:"<<lab<<" subnum:"<<num<<std::endl;
// for (j = 0; j < 17; j ++) S <<v[j]<<" ";
// S <<res1<<res2<<" label:"<<lab<<" subnum:"<<num<<std::endl;
isGood = S.good();
}
if(!isGood)
@ -597,7 +597,7 @@ Standard_Boolean IGESData_IGESWriter::Print (Standard_OStream& S) const
if (fnes) writefnes (S,line->ToCString());
else S << line->ToCString();
// for (Standard_Integer k = line->Length()+1; k <= MaxcarsP; k ++)S<<' ';
// for (Standard_Integer k = line->Length()+1; k <= MaxcarsP; k ++)aSender <<' ';
S << &blancs[line->Length()];
if (fnes) writefnes (S,finlin);
else S << finlin;
@ -618,7 +618,7 @@ Standard_Boolean IGESData_IGESWriter::Print (Standard_OStream& S) const
// 12345678- 16- 24- 32 56789 123456789 123456789 123456789 12
if (fnes) writefnes (S,ligne);
else S << ligne;
S<< "\n";
S << "\n";
S.flush();
isGood = S.good();
#ifdef PATIENCELOG

2
src/IGESData/IGESData_SpecificModule.cxx
View File

@ -15,8 +15,6 @@
#include <IGESData_IGESDumper.hxx>
#include <IGESData_IGESEntity.hxx>
#include <IGESData_SpecificModule.hxx>
#include <Message_Messenger.hxx>
#include <Standard_Type.hxx>
IMPLEMENT_STANDARD_RTTIEXT(IGESData_SpecificModule,Standard_Transient)

Some files were not shown because too many files have changed in this diff Show More