diff --git a/src/IFSelect/IFSelect_ContextModif.cxx b/src/IFSelect/IFSelect_ContextModif.cxx index 86d80f2106..c69ad559be 100644 --- a/src/IFSelect/IFSelect_ContextModif.cxx +++ b/src/IFSelect/IFSelect_ContextModif.cxx @@ -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:"<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 ("<Length(); - S<<"(List : "<Value(i); - S<<" ["<ToCString())<ToCString())<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<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"<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()) <ToCString()) <IsList(jv)) { Handle(TColStd_HSequenceOfHAsciiString) list= OriginalList (jv); - S <ToCString()) <ToCString()) <ToCString()) <ToCString()) < True : prints Long Names; False : prints Short Names @@ -261,7 +259,7 @@ public: //! = 0 : prints Modified Values (Original + Edited) //! False (D) : lists are printed only as their count //! 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 diff --git a/src/IFSelect/IFSelect_Editor.cxx b/src/IFSelect/IFSelect_Editor.cxx index 2ad5da422e..6c224be4a3 100644 --- a/src/IFSelect/IFSelect_Editor.cxx +++ b/src/IFSelect/IFSelect_Editor.cxx @@ -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 : "< 0) S<<"Short"<Name()<Name(),themaxco)<<" "<Label()<Name()<Name(),themaxco)<<" "<Label()< 0) S<<"Short"<Definition()<Definition()< 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 : //! = -1 : length of short names diff --git a/src/IFSelect/IFSelect_Functions.cxx b/src/IFSelect/IFSelect_Functions.cxx index 183b634cd6..7066c807f3 100644 --- a/src/IFSelect/IFSelect_Functions.cxx +++ b/src/IFSelect/IFSelect_Functions.cxx @@ -111,11 +111,11 @@ static IFSelect_ReturnStatus funstatus { // **** Version & cie **** //#58 rln - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - sout<<"Processor Version : "<Session(); // **** ToggleHandler **** Standard_Boolean hand = !WS->ErrorHandle(); - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - if (hand) sout << " -- Mode Catch Error now Active" <SetErrorHandle(hand); return IFSelect_RetDone; } @@ -139,21 +139,21 @@ static IFSelect_ReturnStatus fun3 Standard_Integer argc = pilot->NbWords(); const Standard_CString arg1 = pilot->Arg(1); // **** XRead / Load **** - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - if (argc < 2) { sout<<"Read/Load : give file name !"<Protocol().IsNull()) { sout<<"Protocol not defined"<WorkLibrary().IsNull()) { sout<<"WorkLibrary not defined"<Protocol().IsNull()) { sout<<"Protocol not defined"<WorkLibrary().IsNull()) { sout<<"WorkLibrary not defined"<ReadFile (arg1); // status : 0 OK, 1 erreur lecture, 2 Fail(try/catch), // -1 fichier non trouve, -2 lecture faite mais resultat vide switch (status) { - case IFSelect_RetVoid : sout<<"file:"<NbWords(); const Standard_CString arg1 = pilot->Arg(1); // **** Write All **** - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - if (argc < 2) { sout<<"Write All : give file name !"<SendAll (arg1); } @@ -181,12 +181,12 @@ static IFSelect_ReturnStatus fun5 const Standard_CString arg1 = pilot->Arg(1); // const Standard_CString arg2 = pilot->Arg(2); // **** Write Selected **** - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - if (argc < 3) { sout<<"Write Selected : give file name + givelist !"<CommandPart( 2)); - if (result.IsNull()) { sout<<"No entity selected"<Length()<Length()<SetList (result); return WS->SendSelected (arg1,sp); @@ -199,20 +199,20 @@ static IFSelect_ReturnStatus fun6 Standard_Integer argc = pilot->NbWords(); const Standard_CString arg1 = pilot->Arg(1); // **** Write Entite(s) **** - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - if (argc < 3) { sout<<"Write Entitie(s) : give file name + n0s entitie(s)!"<Number(pilot->Arg(ia)); if (id > 0) { Handle(Standard_Transient) item = WS->StartingEntity(id); - if (sp->Add(item)) sout<<"Added:no."<Add(item)) sout<<"Added:no."<Arg(ia)<Arg(ia)< 0) { sout< 0) { sout<SendSelected (arg1,sp); } @@ -223,15 +223,15 @@ static IFSelect_ReturnStatus fun7 Standard_Integer argc = pilot->NbWords(); const Standard_CString arg1 = pilot->Arg(1); // **** Entity Label **** - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - if (argc < 2) { sout<<"Give entity number"<HasModel()) { sout<<"No loaded model, abandon"<HasModel()) { sout<<"No loaded model, abandon"<NumberFromLabel (arg1); if (nument <= 0 || nument > WS->NbStartingEntities()) - { sout<<"Not a suitable number: "<Label in Model : "; - WS->Model()->PrintLabel(WS->StartingEntity(nument),sout); - sout<Model()->PrintLabel(WS->StartingEntity(nument), sout); + sout<NbWords(); const Standard_CString arg1 = pilot->Arg(1); // **** Entity Number **** - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - if (argc < 2) { sout<<"Give label to search"<HasModel()) { sout<<"No loaded model, abandon"<HasModel()) { sout<<"No loaded model, abandon"<Model(); Standard_Integer i, cnt = 0; Standard_Boolean exact = Standard_False; - sout<<" ** Search Entity Number for Label : "<NextNumberForLabel (arg1, 0, exact) ; i != 0; i = model->NextNumberForLabel (arg1, i, exact)) { cnt ++; - sout<<" ** Found n0/id:"; model->Print (model->Value(i),sout); sout<Print (model->Value(i), sout); + sout< tout le modele"< cette selection, evaluation normale"< cette selection evaluee sur entite n0 num"< tout le modele"< cette selection, evaluation normale"< cette selection evaluee sur entite n0 num"<NamedItem(arg1)); @@ -322,7 +324,7 @@ static IFSelect_ReturnStatus funcount for (i = 1; i < onflag; i ++) { sel = WS->GiveSelection(pilot->Arg(i)); if (!suite->AddInput(sel)) { - sout<<"Incorrect definition for applied selection"<Arg(1); // **** Sign Type **** Handle(IFSelect_Signature) signtype = WS->SignType(); - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - if (signtype.IsNull()) sout<<"signtype actually undefined"<Name (signtype); Standard_Integer id = WS->ItemIdent (signtype); - sout<Label()<Label()< 0) sout<<"signtype : item n0 "< 0) sout<<"signtype : item n0 "<ToCString()<ToCString()<NamedItem(arg1)); - if (signtype.IsNull()) { sout<<"Not a Signature : "<SetSignType(signtype); return IFSelect_RetDone; @@ -389,23 +391,23 @@ static IFSelect_ReturnStatus funsigncase const Standard_CString arg1 = pilot->Arg(1); // **** Sign Case **** Handle(IFSelect_Signature) signcase = GetCasted(IFSelect_Signature,WS->NamedItem(arg1)); - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - if (signcase.IsNull()) sout<<"Not a Signature : "<IsIntCase(hasmin,valmin,hasmax,valmax)) { sout<<"Signature "<CaseList(); - if (caselist.IsNull()) sout<<"Signature "<Length(); - sout<<"Signature "<Value(i); - sout<Arg(1); // **** Entity Status **** Standard_Integer i,nb; - Handle(Message_Messenger) sout = Message::DefaultMessenger(); + Message_Messenger::StreamBuffer sout = Message::SendInfo(); if (argc < 2) { nb = Interface_Category::NbCategories(); sout<<" Categories defined :"<Number(arg1); if (num <= 0 || num > WS->NbStartingEntities()) - { sout<<"Not a suitable entity number : "<StartingEntity(num); - WS->PrintEntityStatus(ent,sout); + WS->PrintEntityStatus (ent, sout); return IFSelect_RetVoid; } @@ -447,7 +449,7 @@ static IFSelect_ReturnStatus fun11 Standard_Integer niv = 0; // char arg10 = arg1[0]; // if (argc < 2) arg10 = '?'; - Handle(Message_Messenger) sout = Message::DefaultMessenger(); + Message_Messenger::StreamBuffer sout = Message::SendInfo(); switch (arg1[0]) { case '?' : sout<<"? for this help, else give a listing mode (first letter suffices) :\n" @@ -459,7 +461,7 @@ static IFSelect_ReturnStatus fun11 <<" check CheckList (complete) per message (counting)\n" <<" totalcheck CheckList (complete) per message (listing n0 ents)\n" <<" FAILS CheckList (fails) per message (listing complete)\n" - <<" TOTALCHECK CheckList (complete) per message (listing complete)"<TraceDumpModel(niv); return IFSelect_RetVoid; @@ -485,14 +487,14 @@ static IFSelect_ReturnStatus fundumpent Handle(IFSelect_WorkLibrary) WL = WS->WorkLibrary(); Standard_Integer levdef=0,levmax=10,level; WL->DumpLevels (levdef,levmax); - Handle(Message_Messenger) sout = Message::DefaultMessenger(); + Message_Messenger::StreamBuffer sout = Message::SendInfo(); if (argc < 2 || (argc == 2 && levmax < 0)) { sout<<"Give n0 or id of entity"; - if (levmax < 0) sout<<" and dump level"< 2) level = atoi(arg2); Handle(Standard_Transient) ent = WS->StartingEntity(num); if ( ent.IsNull() ) { - sout << "No entity with given id " << arg1 << " (" << num << ") is found in the current model" << Message_EndLine; + sout << "No entity with given id " << arg1 << " (" << num << ") is found in the current model" << std::endl; } else { - sout << " -- DUMP Entity n0 " << num << " level " << level << Message_EndLine; + sout << " -- DUMP Entity n0 " << num << " level " << level << std::endl; WL->DumpEntity (WS->Model(),WS->Protocol(),ent,sout,level); Interface_CheckIterator chl = WS->CheckOne (ent); @@ -526,14 +528,14 @@ static IFSelect_ReturnStatus funsign Standard_Integer argc = pilot->NbWords(); const Standard_CString arg1 = pilot->Arg(1); const Standard_CString arg2 = pilot->Arg(2); - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - if (argc < 3) { sout<<" Give signature name + n0 or id of entity"<NamedItem(arg1)); - if (sign.IsNull()) { sout<<"Not a signature : "<Number(arg2); Handle(Standard_Transient) ent = WS->StartingEntity (num); if (num == 0) return IFSelect_RetError; - sout<<"Entity n0 "<SignValue(sign,ent)<SignValue(sign,ent)<NbWords(); const Standard_CString arg1 = pilot->Arg(1); const Standard_CString arg2 = pilot->Arg(2); - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - if (argc < 3) { sout<<" Give 2 numeros or labels : dad son"<NumberFromLabel(arg1); Standard_Integer n2 = WS->NumberFromLabel(arg2); - sout<<"QueryParent for dad:"<QueryParent(WS->StartingEntity(n1),WS->StartingEntity(n2)); - if (qp < 0) sout<NbWords(); const Standard_CString arg1 = pilot->Arg(1); // **** NewInt **** - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - if (argc < 1) { sout<<"Donner la valeur entiere pour IntParam"<= 1) intpar->SetValue(atoi(arg1)); return pilot->RecordItem (intpar); @@ -596,9 +598,9 @@ static IFSelect_ReturnStatus fun15 const Standard_CString arg1 = pilot->Arg(1); const Standard_CString arg2 = pilot->Arg(2); // **** SetInt **** - Handle(Message_Messenger) sout = Message::DefaultMessenger(); + Message_Messenger::StreamBuffer sout = Message::SendInfo(); if (argc < 3) - { sout<<"Donner 2 arguments : nom Parametre et Valeur"<NamedItem(arg1)); if (!WS->SetIntValue(par,val)) return IFSelect_RetFail; @@ -612,8 +614,8 @@ static IFSelect_ReturnStatus fun16 Standard_Integer argc = pilot->NbWords(); const Standard_CString arg1 = pilot->Arg(1); // **** NewText **** - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - if (argc < 1) { sout<<"Donner la valeur texte pour TextParam"<= 1) textpar->AssignCat(arg1); return pilot->RecordItem (textpar); @@ -627,9 +629,9 @@ static IFSelect_ReturnStatus fun17 const Standard_CString arg1 = pilot->Arg(1); const Standard_CString arg2 = pilot->Arg(2); // **** SetText **** - Handle(Message_Messenger) sout = Message::DefaultMessenger(); + Message_Messenger::StreamBuffer sout = Message::SendInfo(); if (argc < 3) - { sout<<"Donner 2 arguments : nom Parametre et Valeur"<NamedItem(arg1)); if (!WS->SetTextValue(par,arg2)) return IFSelect_RetFail; return IFSelect_RetDone; @@ -642,8 +644,8 @@ static IFSelect_ReturnStatus fun19 Standard_Integer argc = pilot->NbWords(); const Standard_CString arg1 = pilot->Arg(1); // **** DumpSel **** - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - if (argc < 2) { sout<<"Give 1 argument : Selection Name"<DumpSelection (GetCasted(IFSelect_Selection,WS->NamedItem(arg1))); return IFSelect_RetVoid; } @@ -659,8 +661,8 @@ static IFSelect_ReturnStatus fun20 // **** MakeList **** char mode = pilot->Arg(0)[0]; // givelist/makelist if (mode == 'g') mode = pilot->Arg(0)[4]; // l list s short p pointed - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - if (argc < 2) { sout<<"Give Entity ID, or Selection Name [+ optional other selection or entity]"<NamedItem (arg1); pnt = GetCasted(IFSelect_SelectPointed,item); if (!pnt.IsNull()) { - sout<Clear(); } else if (!item.IsNull()) { - sout<CommandPart( (mode == 'm' ? 2 : 1) )<<" : "; - if (mode == 'l') WS->ListEntities (iter,0); - else if (mode == 's' || mode == 'm') WS->ListEntities (iter,2); + if (mode == 'l') WS->ListEntities (iter, 0, sout); + else if (mode == 's' || mode == 'm') WS->ListEntities (iter, 2, sout); else if (mode == 'p') { sout<StartingNumber (iter.Value()); - sout<SetList (result); - sout<<"List set to a SelectPointed : "<Arg(1)<Arg(1)<Session(); Standard_Integer argc = pilot->NbWords(); // **** GiveCount **** - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - if (argc < 2) { sout<<"Give Entity ID, or Selection Name [+ optional other selection or entity]"<EvaluateSelection(GetCasted(IFSelect_Selection,WS->NamedItem(arg1))); Handle(TColStd_HSequenceOfTransient) result = IFSelect_Functions::GiveList (WS,pilot->CommandPart(1)); if (result.IsNull()) return IFSelect_RetError; - sout<CommandPart(1)<<" : List of "<Length()<<" Entities"<CommandPart(1)<<" : List of "<Length()<<" Entities"<Session(); Standard_Integer argc = pilot->NbWords(); // **** SelSuite **** - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - if (argc < 2) { sout<<"Give Entity ID, or Selection Name [+ optional other selection or entity]"<EvaluateSelection(GetCasted(IFSelect_Selection,WS->NamedItem(arg1))); Handle(IFSelect_SelectSuite) selsuite = new IFSelect_SelectSuite; for (Standard_Integer i = 1; i < argc; i ++) { Handle(IFSelect_Selection) sel = WS->GiveSelection(pilot->Arg(i)); if (!selsuite->AddInput(sel)) { - sout<Arg(i-1)<<" : not a SelectDeduct, no more can be added. Abandon"<Arg(i-1)<<" : not a SelectDeduct, no more can be added. Abandon"<ClearData (mode); @@ -784,9 +786,9 @@ static IFSelect_ReturnStatus fun24 Handle(IFSelect_WorkSession) WS = pilot->Session(); Standard_Integer argc = pilot->NbWords(); // **** Item Label **** - Handle(Message_Messenger) sout = Message::DefaultMessenger(); + Message_Messenger::StreamBuffer sout = Message::SendInfo(); TCollection_AsciiString label; - if (argc < 2) { sout<<" Give label to search"<Arg(i)); if (i < argc-1) label.AssignCat(" "); @@ -794,14 +796,14 @@ static IFSelect_ReturnStatus fun24 for (int mode = 0; mode <= 2; mode ++) { int nbitems = 0; int id; sout<<"Searching label : "<NextIdentForLabel(label.ToCString(), 0,mode) ; id != 0; id = WS->NextIdentForLabel(label.ToCString(),id,mode)) { sout<<" "<NbWords(); const Standard_CString arg1 = pilot->Arg(1); // **** Save (Dump) **** - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - if (argc < 2) { sout<<"Donner nom du Fichier"<NbWords(); const Standard_CString arg1 = pilot->Arg(1); // **** Restore (Dump) **** - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - if (argc < 2) { sout<<"Donner nom du Fichier"< 0) sout << "-- Erreur Lecture Fichier "< 0) sout << "-- Erreur Lecture Fichier "<Arg(1); const Standard_CString arg2 = pilot->Arg(2); // **** Param(Value) **** - Handle(Message_Messenger) sout = Message::DefaultMessenger(); + Message_Messenger::StreamBuffer sout = Message::SendInfo(); if (argc < 2) { Handle(TColStd_HSequenceOfHAsciiString) li = Interface_Static::Items(); Standard_Integer i,nb = li->Length(); - sout<<" List of parameters : "<Value(i); - sout<<" : "<Value(i)->ToCString())<Value(i)->String(); + sout<<" : "<Value(i)->ToCString())< 0) { Standard_Integer use = atoi (arg1); WS->TraceStatics (use); } else { - if (argc > 2) sout<<" FORMER STATUS of Static Parameter "< Print(sout); - else sout<<" Value : "< 2) sout<<" FORMER STATUS of Static Parameter "< Print (sout); + else sout<<" Value : "<Session(); // **** SentFiles **** Handle(TColStd_HSequenceOfHAsciiString) list = WS->SentFiles(); - Handle(Message_Messenger) sout = Message::DefaultMessenger(); + Message_Messenger::StreamBuffer sout = Message::SendInfo(); if (list.IsNull()) - { sout<<"List of Sent Files not enabled"<Length(); - sout<<" Sent Files : "<Value(i)->ToCString()<Value(i)->ToCString()<NbWords(); const Standard_CString arg1 = pilot->Arg(1); // **** FilePrefix **** - Handle(Message_Messenger) sout = Message::DefaultMessenger(); + Message_Messenger::StreamBuffer sout = Message::SendInfo(); if (argc < 2) { - if (WS->FilePrefix().IsNull()) sout<<"Pas de prefixe defini"<FilePrefix()->ToCString()<FilePrefix().IsNull()) sout<<"Pas de prefixe defini"<FilePrefix()->ToCString()<SetFilePrefix(arg1); @@ -918,11 +920,11 @@ static IFSelect_ReturnStatus fun31 Standard_Integer argc = pilot->NbWords(); const Standard_CString arg1 = pilot->Arg(1); // **** FileExtension **** - Handle(Message_Messenger) sout = Message::DefaultMessenger(); + Message_Messenger::StreamBuffer sout = Message::SendInfo(); if (argc < 2) { - if (WS->FileExtension().IsNull()) sout<<"Pas d extension definie"<FileExtension()->ToCString()<FileExtension().IsNull()) sout<<"Pas d extension definie"<FileExtension()->ToCString()<SetFileExtension(arg1); @@ -937,13 +939,13 @@ static IFSelect_ReturnStatus fun32 const Standard_CString arg1 = pilot->Arg(1); const Standard_CString arg2 = pilot->Arg(2); // **** FileRoot **** - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - if (argc < 2) { sout<<"Donner Dispatch et nom de Root"<NamedItem(arg1)); if (argc < 3) { - if (WS->FileRoot(disp).IsNull()) sout<<"Pas de racine definie pour "<FileRoot(disp)->ToCString()<FileRoot(disp).IsNull()) sout<<"Pas de racine definie pour "<FileRoot(disp)->ToCString()<SetFileRoot(disp,arg2)) return IFSelect_RetFail; @@ -957,11 +959,11 @@ static IFSelect_ReturnStatus fun33 Standard_Integer argc = pilot->NbWords(); const Standard_CString arg1 = pilot->Arg(1); // **** Default File Root **** - Handle(Message_Messenger) sout = Message::DefaultMessenger(); + Message_Messenger::StreamBuffer sout = Message::SendInfo(); if (argc < 2) { - if (WS->DefaultFileRoot().IsNull()) sout<<"Pas de racine par defaut definie"<DefaultFileRoot()->ToCString()<DefaultFileRoot().IsNull()) sout<<"Pas de racine par defaut definie"<DefaultFileRoot()->ToCString()<SetDefaultFileRoot(arg1); @@ -973,20 +975,20 @@ static IFSelect_ReturnStatus fun34 { Handle(IFSelect_WorkSession) WS = pilot->Session(); // **** EvalFile **** - Handle(Message_Messenger) sout = Message::DefaultMessenger(); + Message_Messenger::StreamBuffer sout = Message::SendInfo(); if (!WS->HasModel()) - { sout<<"Pas de Modele charge, abandon"<EvaluateFile(); Standard_Integer nbf = WS->NbFiles(); for (Standard_Integer i = 1; i <= nbf; i ++) { Handle(Interface_InterfaceModel) mod = WS->FileModel(i); if (mod.IsNull()) - { sout<<"Modele "<FileName(i); sout<<"Fichier n0 "<NbEntities()<<" Nom: "; - sout<Session(); Standard_Integer argc = pilot->NbWords(); // **** Split **** - Handle(Message_Messenger) sout = Message::DefaultMessenger(); + Message_Messenger::StreamBuffer sout = Message::SendInfo(); IFSelect_ReturnStatus stat = IFSelect_RetVoid; - if (argc < 2) sout<<"Split : derniere liste de dispatches definie"<ClearShareOut(Standard_True); for (Standard_Integer i = 1; i < argc; i ++) { DeclareAndCast(IFSelect_Dispatch,disp,WS->NamedItem(pilot->Arg(i))); if (disp.IsNull()) { - sout<<"Pas un dispatch:"<Arg(i)<<", Splitt abandonne"<Arg(i)<<", Splitt abandonne"<SetActive(disp,Standard_True); @@ -1039,9 +1041,9 @@ static IFSelect_ReturnStatus fun37 else if (mode == 'c') numod = IFSelect_RemainCompute; else if (mode == 'f') numod = IFSelect_RemainForget; else { - Handle(Message_Messenger) sout = Message::DefaultMessenger(); + Message_Messenger::StreamBuffer sout = Message::SendInfo(); if (argc<2) sout<<"Donner un Mode - "; - sout<<"Modes possibles : l list, c compute, u undo, f forget"<SetRemaining(numod)) return IFSelect_RetVoid; @@ -1056,18 +1058,18 @@ static IFSelect_ReturnStatus fun38 const Standard_CString arg1 = pilot->Arg(1); const Standard_CString arg2 = pilot->Arg(2); // **** SetModelContent **** - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - if (argc < 3) { sout<<"Donner nom selection et mode (k=keep,r=remove)"<NamedItem(arg1)); if (sel.IsNull()) - { sout<<"Pas de Selection de Nom : "<SetModelContent(sel,keepmode)) sout<<" Done"<SetModelContent(sel,keepmode)) sout<<" Done"<NbWords(); const Standard_CString arg1 = pilot->Arg(1); // **** Modifier **** - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - if (argc < 2) { sout<<"Donner Nom du Modifier"<NamedItem(arg1)); if (modif.IsNull()) - { sout<<"Pas de Modifier de Nom : "<Dispatch(); - sout<<"Modifier : "<Label()<Label()<ModifierRank(modif); if (modif->IsKind(STANDARD_TYPE(IFSelect_Modifier))) sout<< "Model Modifier n0." << rank; else sout<< "File Modifier n0." << rank; - if (disp.IsNull()) sout<<" Applique a tous les Dispatchs" << Message_EndLine; + if (disp.IsNull()) sout<<" Applique a tous les Dispatchs" << std::endl; else { sout << " Dispatch : "<Label(); if (WS->HasName(disp)) sout << " - Nom:"<Name(disp)->ToCString(); - sout<Selection(); if (!sel.IsNull()) sout<<" Selection : "<< sel->Label(); if (WS->HasName(sel)) sout<<" - Nom:"<< WS->Name(sel)->ToCString(); - sout<Arg(1); const Standard_CString arg2 = pilot->Arg(2); // **** ModifSel **** - Handle(Message_Messenger) sout = Message::DefaultMessenger(); + Message_Messenger::StreamBuffer sout = Message::SendInfo(); if (argc < 2) { sout<<"Donner Nom Modifier; + Nom Selection optionnel\n" - <<"Selection pour Mettre une Selection, sinon Annule"<NamedItem(arg1)); if (modif.IsNull()) - { sout<<"Pas un nom de Modifier : "<NamedItem(arg2)); if (sel.IsNull()) - { sout<<"Pas un nom de Selection : "<SetItemSelection(modif,sel)) return IFSelect_RetFail; return IFSelect_RetDone; @@ -1146,19 +1148,19 @@ static IFSelect_ReturnStatus fun43 const Standard_CString arg1 = pilot->Arg(1); const Standard_CString arg2 = pilot->Arg(2); // **** SetAppliedModifier **** - Handle(Message_Messenger) sout = Message::DefaultMessenger(); + Message_Messenger::StreamBuffer sout = Message::SendInfo(); if (argc < 2) { sout<<"Donner Nom Modifier; + Nom Dispatch ou Transformer optionnel :\n" <<" - rien : tous Dispatches\n - Dispatch : ce Dispatch seul\n" - <<" - Transformer : pas un Dispatch mais un Transformer"<NamedItem(arg1)); if (modif.IsNull()) - { sout<<"Pas un nom de Modifier : "<NamedItem(arg2); if (item.IsNull()) - { sout<<"Pas un nom connu : "<ShareOut(); if (!WS->SetAppliedModifier(modif,item)) return IFSelect_RetFail; @@ -1172,11 +1174,11 @@ static IFSelect_ReturnStatus fun44 Standard_Integer argc = pilot->NbWords(); const Standard_CString arg1 = pilot->Arg(1); // **** ResetApplied (modifier) **** - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - if (argc < 2) { sout<<"Designer un modifier"<NamedItem(arg1)); if (modif.IsNull()) - { sout<<"Pas un nom de Modifier : "<ResetAppliedModifier(modif)) return IFSelect_RetFail; return IFSelect_RetDone; } @@ -1190,15 +1192,15 @@ static IFSelect_ReturnStatus fun45 const Standard_CString arg2 = pilot->Arg(2); const Standard_CString arg3 = pilot->Arg(3); // **** ModifMove **** - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - if (argc < 4) { sout<<"modifmove MF rang1 rang2, M pour Model F pour File"<ChangeModifierRank(formodel,before,after)) return IFSelect_RetFail; return IFSelect_RetDone; } @@ -1211,14 +1213,14 @@ static IFSelect_ReturnStatus fun51 const Standard_CString arg1 = pilot->Arg(1); const Standard_CString arg2 = pilot->Arg(2); // **** DispSel **** - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - if (argc < 3) { sout<<"Donner Noms Dispatch et Selection Finale"<NamedItem(arg1)); if (disp.IsNull()) - { sout<<"Pas un nom de Dispatch : "<NamedItem(arg2)); if (sel.IsNull()) - { sout<<"Pas un nom de Selection : "<SetItemSelection(disp,sel)) return IFSelect_RetFail; return IFSelect_RetDone; } @@ -1248,11 +1250,11 @@ static IFSelect_ReturnStatus fun_dispcount Standard_Integer argc = pilot->NbWords(); const Standard_CString arg1 = pilot->Arg(1); // **** DispCount **** - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - if (argc < 2) { sout<<"Donner Nom IntParam pour Count"<NamedItem(arg1)); if (par.IsNull()) - { sout<<"Pas un nom de IntParam : "<SetCount (par); return pilot->RecordItem(disp); @@ -1265,11 +1267,11 @@ static IFSelect_ReturnStatus fun_dispfiles Standard_Integer argc = pilot->NbWords(); const Standard_CString arg1 = pilot->Arg(1); // **** DispFiles **** - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - if (argc < 2) { sout<<"Donner Nom IntParam pour NbFiles"<NamedItem(arg1)); if (par.IsNull()) - { sout<<"Pas un nom de IntParam : "<SetCount (par); return pilot->RecordItem(disp); @@ -1283,11 +1285,11 @@ static IFSelect_ReturnStatus fun_dispsign Standard_Integer argc = pilot->NbWords(); const Standard_CString arg1 = pilot->Arg(1); // **** DispFiles **** - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - if (argc < 2) { sout<<"Donner Nom Signature"<NamedItem(arg1)); if (sig.IsNull()) - { sout<<"Pas un nom de Signature : "<SetSignCounter (new IFSelect_SignCounter(sig)); return pilot->RecordItem(disp); @@ -1301,19 +1303,19 @@ static IFSelect_ReturnStatus fun56 Standard_Integer argc = pilot->NbWords(); const Standard_CString arg1 = pilot->Arg(1); // **** Dispatch **** - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - if (argc < 2) { sout<<"Donner Nom du Dispatch"<NamedItem(arg1)); - if (disp.IsNull()) { sout<<"Pas un dispatch : "<DispatchRank(disp); sout<<"Dispatch de Nom : "<ItemSelection(disp); Handle(TCollection_HAsciiString) selname = WS->Name(sel); - if (sel.IsNull()) sout<<"Pas de Selection Finale"<ItemIdent(sel)<ToCString()<ItemIdent(sel)<ToCString()<HasRootName()) sout<<"-- Racine nom de fichier : " - <RootName()->ToCString()<RootName()->ToCString()<NbWords(); const Standard_CString arg1 = pilot->Arg(1); // **** Remove **** - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - if (argc < 2) { sout<<"Give Name to Remove !"<RemoveNamedItem(arg1)) return IFSelect_RetFail; return IFSelect_RetDone; } @@ -1337,20 +1339,20 @@ static IFSelect_ReturnStatus fun58 Standard_Integer argc = pilot->NbWords(); const Standard_CString arg1 = pilot->Arg(1); // **** EvalDisp **** - Handle(Message_Messenger) sout = Message::DefaultMessenger(); + Message_Messenger::StreamBuffer sout = Message::SendInfo(); if (argc < 3) { sout<<"evaldisp mode disp [disp ...] : Mode + Name(s) of Dispatch(es). Mode:\n" - <<" 0 brief 1 +forgotten ents 2 +duplicata 3 1+2"<NamedItem(pilot->Arg(i))); if (disp.IsNull()) - { sout<<"Not a dispatch:"<Arg(i)<Arg(i)<NbWords(); const Standard_CString arg1 = pilot->Arg(1); // **** EvalADisp [GiveList] **** - Handle(Message_Messenger) sout = Message::DefaultMessenger(); + Message_Messenger::StreamBuffer sout = Message::SendInfo(); if (argc < 3) { sout<<"evaladisp mode(=0-1-2-3) disp [givelist] : Mode + Dispatch [+ GiveList]\n If GiveList not given, computed from Selection of the Dispatch. Mode:\n" - <<" 0 brief 1 +forgotten ents 2 +duplicata 3 1+2"<NamedItem(pilot->Arg(2))); Handle(IFSelect_Dispatch) disp = IFSelect_Functions::GiveDispatch (WS,pilot->Arg(2),Standard_True); if (disp.IsNull()) - { sout<<"Not a dispatch:"<Arg(2)<Arg(2)<FinalSelection(); Handle(IFSelect_Selection) sel; if (argc > 3) { @@ -1394,9 +1396,9 @@ static IFSelect_ReturnStatus fun_evaladisp } if (sel.IsNull() && selsav.IsNull()) - { sout<<"No Selection nor GiveList defined"< 3) sout<<"GiveList is empty, hence computed from the Selection of the Dispatch"< 3) sout<<"GiveList is empty, hence computed from the Selection of the Dispatch"<SetFinalSelection(sel); @@ -1415,23 +1417,23 @@ static IFSelect_ReturnStatus fun_writedisp Standard_Integer argc = pilot->NbWords(); const Standard_CString arg1 = pilot->Arg(1); // **** EvalADisp [GiveList] **** - Handle(Message_Messenger) sout = Message::DefaultMessenger(); + Message_Messenger::StreamBuffer sout = Message::SendInfo(); if (argc < 3) { sout<<"writedisp filename disp [givelist] : FileName + Dispatch [+ GiveList]\n If GiveList not given, computed from Selection of the Dispatch.\n" <<"FileName : rootname.ext will gives rootname_1.ext etc...\n" <<" path/rootname.ext gives path/rootname_1.ext etc...\n" - <<"See also : evaladisp"<NamedItem(pilot->Arg(2))); Handle(IFSelect_Dispatch) disp = IFSelect_Functions::GiveDispatch (WS,pilot->Arg(2),Standard_True); if (disp.IsNull()) - { sout<<"Not a dispatch:"<Arg(2)<Arg(2)<FinalSelection(); Handle(IFSelect_Selection) sel; if (argc > 3) { @@ -1443,9 +1445,9 @@ static IFSelect_ReturnStatus fun_writedisp } if (sel.IsNull() && selsav.IsNull()) - { sout<<"No Selection nor GiveList defined"< 3) sout<<"GiveList is empty, hence computed from the Selection of the Dispatch"< 3) sout<<"GiveList is empty, hence computed from the Selection of the Dispatch"<Arg(1); // **** EvalComplete **** Standard_Integer mode = 0; - Handle(Message_Messenger) sout = Message::DefaultMessenger(); + Message_Messenger::StreamBuffer sout = Message::SendInfo(); if (argc < 2) sout << " -- mode par defaut 0\n"; - else { mode = atoi(arg1); sout << " -- mode : " << mode << Message_EndLine; } + else { mode = atoi(arg1); sout << " -- mode : " << mode << std::endl; } WS->EvaluateComplete(mode); return IFSelect_RetVoid; } @@ -1486,7 +1488,8 @@ static IFSelect_ReturnStatus fun60 Interface_CheckIterator chlist = WS->LastRunCheckList(); Handle(IFSelect_CheckCounter) counter = new IFSelect_CheckCounter(0); counter->Analyse(chlist,WS->Model(),Standard_False); - counter->PrintCount (Message::DefaultMessenger()); + Message_Messenger::StreamBuffer sout = Message::SendInfo(); + counter->PrintCount (sout); return IFSelect_RetVoid; } @@ -1497,24 +1500,24 @@ static IFSelect_ReturnStatus fun61 Standard_Integer argc = pilot->NbWords(); const Standard_CString arg1 = pilot->Arg(1); // **** RunTransformer **** - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - if (argc < 2) { sout<<"Donner Nom de Transformer"<NamedItem(arg1)); Standard_Integer effect = WS->RunTransformer(tsf); switch (effect) { - case -4 : sout<<"Edition sur place, nouveau Protocole, erreur recalcul graphe"< 0) ? IFSelect_RetDone : IFSelect_RetFail); @@ -1554,9 +1557,9 @@ static IFSelect_ReturnStatus fun6465 pilot->Perform(); modif = GetCasted(IFSelect_Modifier,pilot->RecordedItem()); } - Handle(Message_Messenger) sout = Message::DefaultMessenger(); + Message_Messenger::StreamBuffer sout = Message::SendInfo(); if (modif.IsNull()) - { sout<<"Pas un nom de Modifier : "<RunModifierSelected (modif,sp,runcopy); // sout<<"Modifier applique sur TransformStandard #"<ItemIdent(tsf)< 0) ? IFSelect_RetDone : IFSelect_RetFail); @@ -1595,9 +1598,9 @@ static IFSelect_ReturnStatus fun66 char opt = ' '; Standard_Integer argc = pilot->NbWords(); if (argc >= 2) opt = pilot->Word(1).Value(1); - Handle(Message_Messenger) sout = Message::DefaultMessenger(); + Message_Messenger::StreamBuffer sout = Message::SendInfo(); if (opt != 'f' && opt != 'l') - { sout<<"Donner option : f -> root-first l -> root-last"< root-first l -> root-last"<RecordItem(new IFSelect_ModifReorder(opt == 'l')); } @@ -1608,13 +1611,13 @@ static IFSelect_ReturnStatus fun70 Standard_Integer argc = pilot->NbWords(); const Standard_CString arg1 = pilot->Arg(1); // **** SelToggle **** - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - if (argc < 2) { sout<<"Donner Nom de Selection"<NamedItem(arg1)); if (!WS->ToggleSelectExtract(sel)) - { sout<<"Pas une SelectExtract : "<IsReversedSelectExtract(sel)) sout<IsReversedSelectExtract(sel)) sout<Arg(1); const Standard_CString arg2 = pilot->Arg(2); // **** SelInput **** - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - if (argc < 3) { sout<<"Donner Noms Selections cible et input"<NamedItem(arg1)); DeclareAndCast(IFSelect_Selection,sou,WS->NamedItem(arg2)); if (sel.IsNull() || sou.IsNull()) - { sout<<"Incorrect : "<SetInputSelection(sel,sou)) { - sout<<"Nom incorrect ou Selection "<Arg(1); const Standard_CString arg2 = pilot->Arg(2); // **** SelRange **** - Handle(Message_Messenger) sout = Message::DefaultMessenger(); + Message_Messenger::StreamBuffer sout = Message::SendInfo(); if (argc >= 2 && arg1[0] == '?') argc = 1; if (argc < 2) { sout<<"Donner la description du SelectRange" <<" Formes admises :\n : Range de a \n" <<" tout seul : Range n0 \n from : Range From \n" - <<" until : Range Until "< : Range Until "<Word(1).IsEqual("from")) { - if (argc < 3) { sout<<"Forme admise : from "<"<NamedItem(arg2)); sel = new IFSelect_SelectRange; sel->SetFrom (low); // Range Until } else if (pilot->Word(1).IsEqual("until")) { - if (argc < 3) { sout<<"Forme admise : until "<"<NamedItem(arg2)); sel = new IFSelect_SelectRange; sel->SetUntil (up); @@ -1720,16 +1723,16 @@ static IFSelect_ReturnStatus fun76 // **** SelDiff **** Handle(IFSelect_Selection) sel = new IFSelect_SelectDiff; if (sel.IsNull()) return IFSelect_RetFail; - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - if (argc < 3) sout<<"Diff sans input : ne pas oublier de les definir (ctlmain, ctlsec)!"<NamedItem(arg1)); DeclareAndCast(IFSelect_Selection,selsec ,WS->NamedItem(arg2)); if (argc >= 2) if (!WS->SetControl(sel,selmain,Standard_True)) - sout<<"Echec ControlMain:"<= 3) if (!WS->SetControl(sel,selsec,Standard_False)) - sout<<"Echec ControlSecond:"<RecordItem (sel); } @@ -1741,12 +1744,12 @@ static IFSelect_ReturnStatus fun77 const Standard_CString arg1 = pilot->Arg(1); const Standard_CString arg2 = pilot->Arg(2); // **** SelControlMain **** - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - if (argc < 3) { sout<<"Donner Noms de Control et MainInput"<NamedItem(arg1)); DeclareAndCast(IFSelect_Selection,selmain,WS->NamedItem(arg2)); if (WS->SetControl(sel,selmain,Standard_True)) return IFSelect_RetDone; - sout<<"Nom incorrect ou Selection "<Arg(1); const Standard_CString arg2 = pilot->Arg(2); // **** SelControlSecond **** - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - if (argc < 3) { sout<<"Donner Noms de Control et SecondInput"<NamedItem(arg1)); DeclareAndCast(IFSelect_Selection,seldif,WS->NamedItem(arg2)); if (WS->SetControl(sel,seldif,Standard_False)) return IFSelect_RetDone; - sout<<"Nom incorrect ou Selection "<Arg(1); const Standard_CString arg2 = pilot->Arg(2); // **** SelCombAdd **** - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - if (argc < 3) { sout<<"Donner n0 Combine et une Input"<NamedItem(arg1)); DeclareAndCast(IFSelect_Selection,seladd,WS->NamedItem(arg2)); if (WS->CombineAdd(sel,seladd)) return IFSelect_RetDone; - sout<<"Nom incorrect ou Selection "<Arg(1); const Standard_CString arg2 = pilot->Arg(2); // **** SelCombRem **** - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - if (argc < 3) { sout<<"Donner n0 Combine et RANG a supprimer"<NamedItem(arg1)); DeclareAndCast(IFSelect_Selection,inp,WS->NamedItem(arg2)); if (WS->CombineRemove(sel,inp)) return IFSelect_RetDone; - sout<<"Nom incorrect ou Selection "<NbWords(); const Standard_CString arg1 = pilot->Arg(1); // **** SelEntNumber **** - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - if (argc < 2) { sout<<"Donner Nom IntParam pour n0 Entite"<NamedItem(arg1)); Handle(IFSelect_SelectEntityNumber) sel = new IFSelect_SelectEntityNumber; sel->SetNumber(par); @@ -1846,8 +1849,8 @@ static IFSelect_ReturnStatus fun85 Standard_Integer argc = pilot->NbWords(); const Standard_CString arg1 = pilot->Arg(1); // **** SelTextType Exact **** - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - if (argc < 2) { sout<<"Donner le TYPE a selectionner"<RecordItem (new IFSelect_SelectSignature (new IFSelect_SignType,arg1,Standard_True)); } @@ -1879,8 +1882,8 @@ static IFSelect_ReturnStatus fun89 Standard_Integer argc = pilot->NbWords(); const Standard_CString arg1 = pilot->Arg(1); // **** SelTextType Contain ** - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - if (argc < 2) { sout<<"Donner le TYPE a selectionner"<RecordItem (new IFSelect_SelectSignature (new IFSelect_SignType,arg1,Standard_False)); } @@ -1894,8 +1897,8 @@ static IFSelect_ReturnStatus fun90 Handle(TColStd_HSequenceOfTransient) list = IFSelect_Functions::GiveList (pilot->Session(),pilot->CommandPart(1)); if (list.IsNull()) return IFSelect_RetFail; - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - sout<<"SelectPointed : "<Length()<<" entities"<Length()<<" entities"<AddList (list); } return pilot->RecordItem (sp); @@ -1908,26 +1911,26 @@ static IFSelect_ReturnStatus fun91 Standard_Integer argc = pilot->NbWords(); const Standard_CString arg1 = pilot->Arg(1); // **** SetPointed (edit) / SetList (edit) **** - Handle(Message_Messenger) sout = Message::DefaultMessenger(); + Message_Messenger::StreamBuffer sout = Message::SendInfo(); if (argc < 2) { sout<<"Donner NOM SelectPointed + Option(s) :\n" <<" aucune : liste des entites pointees\n" - <<" 0: Clear +nn ajout entite nn -nn enleve nn /nn toggle nn"<NamedItem(arg1)); - if (sp.IsNull()) { sout<<"Pas une SelectPointed:"<Model(); // pour Print if (argc == 2) { // listage simple Standard_Integer nb = sp->NbItems(); - sout<<" SelectPointed : "<Item(i); Standard_Integer id = WS->StartingNumber(pointed); if (id == 0) sout <<" (inconnu)"; - else { sout<<" "; model->Print(pointed,sout); } + else { sout <<" "; model->Print (pointed, sout); } } - if (nb > 0) sout< 0) sout<Word(ia); Standard_Integer id = pilot->Number(&(argi.ToCString())[1]); if (id == 0) { - if (!argi.IsEqual("0")) sout<<"Incorrect,ignore:"<Clear(); } + if (!argi.IsEqual("0")) sout<<"Incorrect,ignore:"<Clear(); } } else if (argi.Value(1) == '-') { Handle(Standard_Transient) item = WS->StartingEntity(id); if (sp->Remove(item)) sout<<"Removed:no."<Print(item,sout); sout<Print (item, sout); } else if (argi.Value(1) == '/') { Handle(Standard_Transient) item = WS->StartingEntity(id); if (sp->Remove(item)) sout<<"Toggled:n0."<Print(item,sout); sout<Print (item, sout); } else if (argi.Value(1) == '+') { Handle(Standard_Transient) item = WS->StartingEntity(id); if (sp->Add(item)) sout<<"Added:no."<Print(item,sout); sout<Print (item, sout); } else { - sout<<"Ignore:"<Arg(2); Handle(IFSelect_WorkSession) WS = pilot->Session(); // **** SelSignature **** - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - if (argc < 3) { sout<<"Give name of Signature or Counter, text + option exact(D) else contains"< 3) { if (pilot->Arg(3)[0] == 'c') exact = Standard_False; } @@ -1987,7 +1993,7 @@ static IFSelect_ReturnStatus fun93 if (!sign.IsNull()) sel = new IFSelect_SelectSignature (sign,arg2,exact); else if (!cnt.IsNull()) sel = new IFSelect_SelectSignature (cnt,arg2,exact); - else { sout<RecordItem(sel); } @@ -1999,10 +2005,10 @@ static IFSelect_ReturnStatus fun94 const Standard_CString arg1 = pilot->Arg(1); Handle(IFSelect_WorkSession) WS = pilot->Session(); // **** SignCounter **** - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - if (argc < 2) { sout<<"Donner nom signature"<NamedItem(arg1)); - if (sign.IsNull()) { sout<RecordItem(cnt); } @@ -2014,10 +2020,10 @@ static IFSelect_ReturnStatus funbselected const Standard_CString arg1 = pilot->Arg(1); Handle(IFSelect_WorkSession) WS = pilot->Session(); // **** NbSelected = GraphCounter **** - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - if (argc < 2) { sout<<"Donner nom selection (deduction) a appliquer"<GiveSelection(arg1)); - if (applied.IsNull()) { sout<SetApplied (applied); return pilot->RecordItem(cnt); @@ -2031,8 +2037,8 @@ static IFSelect_ReturnStatus fun_editlist (const Handle(IFSelect_SessionPilot)& pilot) { Standard_Integer argc = pilot->NbWords(); - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - if (argc < 2) { sout<<"Give the name of an EditForm or an Editor"<Arg(1); const Standard_CString arg2 = pilot->Arg(2); @@ -2043,7 +2049,7 @@ static IFSelect_ReturnStatus fun_editlist DeclareAndCast(IFSelect_EditForm,edf,WS->NamedItem(arg1)); Handle(IFSelect_Editor) edt; if (!edf.IsNull()) { - sout<<"Print EditForm "<Editor(); if (argc < 3) { @@ -2052,14 +2058,14 @@ static IFSelect_ReturnStatus fun_editlist if (edt.IsNull()) edt = GetCasted(IFSelect_Editor,WS->NamedItem(arg1)); if (edt.IsNull()) return IFSelect_RetVoid; - sout<<"Editor, Label : "<Label()<Label()<PrintNames(sout); - sout<PrintDefs (sout); if (!edf.IsNull()) { edf->PrintDefs(sout); - sout<NbWords(); - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - if (argc < 3) { sout<<"Give the name of an EditForm + name of Value [+ newvalue or . to nullify]"<Arg(1); const Standard_CString arg2 = pilot->Arg(2); Handle(IFSelect_WorkSession) WS = pilot->Session(); DeclareAndCast(IFSelect_EditForm,edf,WS->NamedItem(arg1)); if (edf.IsNull()) - { sout<<"Not an EditForm : "<NameNumber (arg2); - if (num == 0) sout<<"Unknown Value Name : "<Editor()->IsList(num); @@ -2103,19 +2109,19 @@ static IFSelect_ReturnStatus fun_editvalue if (islist) { listr = edf->EditedList(num); - if (listr.IsNull()) sout<<"(NULL LIST)"<Length(); - sout<<"(List : "<Value(ilist); - sout<<" ["<ToCString())<ToCString())<EditedValue (num); - sout<<(str.IsNull() ? "(NULL)" : str->ToCString())<ToCString())<Arg(numarg); if (islist) { if (argval[0] == '?') { - sout<<"To Edit, options"<CommandPart(numarg+1)),numset); } if (stated) stated = edf->ModifyList (num,listed,Standard_True); - if (stated) sout<<"List Edition done"<CommandPart(numarg)); if (edf->Modify (num,str,Standard_True)) { - sout<<"Now set to "<<(str.IsNull() ? "(NULL)" : str->ToCString())<ToCString())<NbWords(); - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - if (argc < 2) { sout<<"Give the name of an EditForm [+ name of Value else all]"<Arg(1); const Standard_CString arg2 = pilot->Arg(2); Handle(IFSelect_WorkSession) WS = pilot->Session(); DeclareAndCast(IFSelect_EditForm,edf,WS->NamedItem(arg1)); if (edf.IsNull()) - { sout<<"Not an EditForm : "<ClearEdit(); sout<<"All Modifications Cleared"<ClearEdit(); sout<<"All Modifications Cleared"<NameNumber (arg2); - if (num == 0) sout<<"Unknown Value Name : "<IsModified(num)) - { sout<<"Value "<ClearEdit (num); - sout<<"Modification on Value "<NbWords(); - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - if (argc < 2) { sout<<"Give the name of an EditForm [+ option keep to re-apply edited values]"<Arg(1); const Standard_CString arg2 = pilot->Arg(2); Handle(IFSelect_WorkSession) WS = pilot->Session(); DeclareAndCast(IFSelect_EditForm,edf,WS->NamedItem(arg1)); if (edf.IsNull()) - { sout<<"Not an EditForm : "<Entity(); Handle(Interface_InterfaceModel) model = edf->Model(); if (!model.IsNull()) { - if (ent.IsNull()) sout<<"Applying modifications on loaded model"<PrintLabel (ent,sout); + model->PrintLabel (ent, sout); } } - else sout<<"Applying modifications"<ApplyData (edf->Entity(),edf->Model())) { - sout<<"Modifications could not be applied"< 2 && arg2[0] == 'k') stat = Standard_False; if (stat) { edf->ClearEdit(); - sout<<"Edited values are cleared"<NbWords(); - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - if (argc < 2) { sout<<"Give the name of an EditForm [+ Entity-Ident]"<Arg(1); const Standard_CString arg2 = pilot->Arg(2); Handle(IFSelect_WorkSession) WS = pilot->Session(); DeclareAndCast(IFSelect_EditForm,edf,WS->NamedItem(arg1)); if (edf.IsNull()) - { sout<<"Not an EditForm : "<Number (arg2)); Standard_Boolean stat = Standard_False; if (argc < 3) { - sout<<"EditForm "<LoadModel(WS->Model()); } else if (num <= 0) { - sout<<"Not an entity ident : "<LoadData (WS->StartingEntity(num),WS->Model()); } if (!stat) { - sout<<"Loading not done"<NamedItem( &(nam.ToCString())[paro])); if (sg.IsNull()) { - sout<<"DispPerSignature "<SetSignCounter (new IFSelect_SignCounter(sg)); return ds; } - sout<<"Dispatch : "< 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."<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 "<AddFail ("SendAll (WriteFile) has failed"); // if (!checks.IsEmpty(Standard_False)) { -// Message::DefaultMessenger() << +// Message::SendWarning() << // " ** SendAll has produced Check Messages : **"<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 : **"<DynamicType(); if (!theline.Value(1).IsEqual("!XSTEP") || !theline.Value(2).IsEqual("SESSION") || !theline.Value(4).IsEqual(sesstype->Name()) ) - { sout<<"Lineno."<DynamicType(); if (!theline.Value(1).IsEqual("!XSTEP") || !theline.Value(2).IsEqual("SESSION") || !theline.Value(4).IsEqual(sesstype->Name()) ) - { sout<<"Lineno."<SetErrorHandle(Standard_False); else if (theline.Value(2).IsEqual("1")) thesess->SetErrorHandle(Standard_True); - else { sout<<"Lineno."<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."<SetDirect( (direct > 0) ); } DeclareAndCast(IFSelect_SelectAnyList,sli,item); if (!sli.IsNull()) { - if (numlist == 0) sout<<"Lineno."<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."< 1) - sout<<"Lineno."<SetInput(source); } DeclareAndCast(IFSelect_SelectDeduct,sdt,sel); if (!sdt.IsNull()) { if (nbs > 1) - sout<<"Lineno."<SetInput(GetCasted(IFSelect_Selection,ItemValue(3))); } DeclareAndCast(IFSelect_SelectControl,sct,sel); if (!sct.IsNull()) { if (nbs != 2) - sout<<"Lineno."<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."<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."<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."<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"<ReadOwn(*this,type,item)) break; dumper = dumper->Next(); } - if (dumper.IsNull()) sout<<" -- Lineno."< 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."<Value(id); if (filenum == 0) { if (!par.IsNull()) sout << "Lineno " << thenl << " -- Unknown Item : " - << " Type:" << par->DynamicType()->Name() << Message_EndLine; //sout<DynamicType()->Name() << std::endl; //sout<Item(id); diff --git a/src/IFSelect/IFSelect_SessionPilot.cxx b/src/IFSelect/IFSelect_SessionPilot.cxx index 963d15736e..407f274334 100644 --- a/src/IFSelect/IFSelect_SessionPilot.cxx +++ b/src/IFSelect/IFSelect_SessionPilot.cxx @@ -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; } diff --git a/src/IFSelect/IFSelect_SignatureList.cxx b/src/IFSelect/IFSelect_SignatureList.cxx index 7407ab40bb..a56ab4a48f 100644 --- a/src/IFSelect/IFSelect_SignatureList.cxx +++ b/src/IFSelect/IFSelect_SignatureList.cxx @@ -16,8 +16,6 @@ #include #include #include -#include -#include #include #include #include @@ -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::Iterator iter(thedicount); - S << " Count "<ToCString()<<"\n ----- -----------"<ToCString()<<"\n ----- -----------"< 0) S << thename->ToCString()<< " Nul : " << thenbnuls< 0) S << thename->ToCString()<< " Nul : " << thenbnuls <::Iterator iter(thediclist); for (; iter.More(); iter.Next()) { DeclareAndCast(TColStd_HSequenceOfTransient,list,iter.Value()); - S<Length(); S<<" - 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<<" "<PrintLabel(list->Value(i),S); } + { S<<":"; model->PrintLabel(list->Value(i), S); } } if (nc < nb) S<<" .. etc"; - S<::Iterator iter(thedicount); - S << " Summary "<ToCString()<<"\n ----- -----------"<ToCString()<<"\n ----- -----------"< 0) { - S<<" Summary on Integer Values"< #include 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; diff --git a/src/IFSelect/IFSelect_TransformStandard.cxx b/src/IFSelect/IFSelect_TransformStandard.cxx index a447f2447a..ab4572d329 100644 --- a/src/IFSelect/IFSelect_TransformStandard.cxx +++ b/src/IFSelect/IFSelect_TransformStandard.cxx @@ -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 "< #include #include -#include -#include #include #include #include @@ -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); diff --git a/src/IFSelect/IFSelect_WorkLibrary.hxx b/src/IFSelect/IFSelect_WorkLibrary.hxx index fa19ba190c..ab3bc80689 100644 --- a/src/IFSelect/IFSelect_WorkLibrary.hxx +++ b/src/IFSelect/IFSelect_WorkLibrary.hxx @@ -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. helps to identify, number ... entities. //! 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 diff --git a/src/IFSelect/IFSelect_WorkSession.cxx b/src/IFSelect/IFSelect_WorkSession.cxx index e7992db1ba..fd314e57a4 100644 --- a/src/IFSelect/IFSelect_WorkSession.cxx +++ b/src/IFSelect/IFSelect_WorkSession.cxx @@ -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"<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<Graph(),theprotocol,checks,newmod); if (!checks.IsEmpty(Standard_False)) { - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - sout<<" ** RunTransformer has produced Check Messages : **"<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 : **"<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<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 ***"<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 "<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"<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"<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<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<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<<"******************************************"< 0) if (use == 5) { TraceStatics (-2,mode); - if (mode == 0) sout<Prefix(); - if (!str.IsNull()) sout << "Prefix : "<ToCString()<ToCString()<DefaultRootName(); - if (!str.IsNull()) sout << "Default Root : "<ToCString()<ToCString()<Extension(); - if (!str.IsNull()) sout << "Extension : "<ToCString()<ToCString()< 0) { - if (mode == 0) sout<<"******************************************"<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 << ") : "<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 : "<RootName()->ToCString()<RootName()->ToCString()<NbModifiers(Standard_True); if (nbm > 0) sout<< - " *** "<NbModifiers(Standard_False); if (nbf > 0) sout<< - " *** "<ToCString()<<" - "; else sout<<" - (no name) - "; - sout<DynamicType()->Name()<ToCString()<DynamicType()->Name()<ToCString()<NbModifiers(formodel); sout<< " ********** Modifiers in Session "; sout<<(formodel ? "(For Model)" : "(For File)"); - sout<<": "<GeneralModifier(formodel,i); if (!modif.IsNull()) sout<<"Modifier n0."<Label(); if (HasName(modif)) sout << " Named as : " << Name(modif)->ToCString(); - sout<ToCString(); - sout <<" **********"<Label() << " . Input(s) : "<< Message_EndLine; + sout <<" **********"<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<<" -- "<Label()<Label()< 0) - S << " ******** Loaded File : "<DumpHeader(S); S<DumpHeader (S); S <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 : "<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) ********"< what could be determined is listed"< what could be determined is listed"<Number(ent); - if (num == 0) { S<<" *** Entity to Dump not in the Model ***"<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"<Print(ent,S); + myModel->Print (ent, S); Handle(TCollection_HAsciiString) hname = EntityName(ent); - if (!hname.IsNull() && hname->Length() > 0) S<<" Name:"<ToCString(); - S<Length() > 0) S <<" Name:"<ToCString(); + S <DynamicType()->Name()<Value (ent,myModel)<DynamicType()->Name()<Value (ent,myModel)<Length(); - if (nb == 0) S<<" Root"; - else S<<" Super-entities:"<Print(list->Value(i),S); } - S<Print(list->Value(i), S); } + S <Length(); - if (nb == 0) S<<" No sub-entity"; - else S<<" Sub-entities:"<Print(list->Value(i),S); } - S<Print(list->Value(i), S); } + S <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<Label()<Label()<NbDispatches() < numdisp || numdisp <= 0) - { sout<<"Dispatch : Unknown"<FinalSelection().IsNull()) - { sout<<"Dispatch : No Final Selection"<Label()<Label()<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 : "<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<NbDuplicated(0,Standard_False) == 0) - sout<<" **** All the Model is taken into account ****"<Duplicated(0,Standard_False),2); + sout<<" **** Starting Entities not taken by this Dispatch ****"<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"<NbDuplicated(newcount,Standard_False) == 0) continue; - sout<<" **** Entities put in "<Duplicated(newcount,Standard_False),2); + sout<<" **** Entities put in "<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<Graph()); eval.Evaluate(); sout<<"\n******** Evaluation ShareOutResult (Complete) ********\n"; - sout<<" **** List of Packets **** Count : "<NbPackets(); - sout<<"Nb Packets produced : "<Entities(numpack), (mode ? 2: -1)); + ListEntities (evres->Entities(numpack), (mode ? 2: -1), sout); } if (mode == 0) return; if (mode == 1 || mode == 3) { - sout<NbDuplicated(0,Standard_False) == 0) - sout<<" **** All the Model is taken into account ****"<Duplicated(0,Standard_False),2); + sout<<" **** Starting Entities Forgotten ****"<Duplicated(0,Standard_False), 2, sout); } } if (mode >= 2) { - sout<<" **** Entites in more than one packet ****"<HighestDuplicationCount(); - if (max < 2) sout<<" : There are none"<NbDuplicated(newcount,Standard_False) == 0) continue; - sout<<" **** Entities put in "<Duplicated(newcount,Standard_False),2); + sout<<" **** Entities put in "<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 :"<= 0) sout << " List of " << iter.NbEntities() << " Entities :"<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----------- ----...."<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<<" "<TypeName (ent, Standard_False)<TypeName (ent, Standard_False)< 0) sout<<","; sout<= 10) { sout << Message_EndLine<<"["<= 10) { sout << std::endl<<"["< 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< 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: //! 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 //! 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) diff --git a/src/IGESAppli/IGESAppli_SpecificModule.cxx b/src/IGESAppli/IGESAppli_SpecificModule.cxx index 57583f81d5..3c82890a67 100644 --- a/src/IGESAppli/IGESAppli_SpecificModule.cxx +++ b/src/IGESAppli/IGESAppli_SpecificModule.cxx @@ -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) { diff --git a/src/IGESAppli/IGESAppli_SpecificModule.hxx b/src/IGESAppli/IGESAppli_SpecificModule.hxx index 2e723c6f5f..0577a9b78b 100644 --- a/src/IGESAppli/IGESAppli_SpecificModule.hxx +++ b/src/IGESAppli/IGESAppli_SpecificModule.hxx @@ -25,8 +25,6 @@ #include 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; diff --git a/src/IGESAppli/IGESAppli_ToolDrilledHole.cxx b/src/IGESAppli/IGESAppli_ToolDrilledHole.cxx index 2ac14dd800..8c2d0dd440 100644 --- a/src/IGESAppli/IGESAppli_ToolDrilledHole.cxx +++ b/src/IGESAppli/IGESAppli_ToolDrilledHole.cxx @@ -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; } diff --git a/src/IGESAppli/IGESAppli_ToolDrilledHole.hxx b/src/IGESAppli/IGESAppli_ToolDrilledHole.hxx index 3b46f8f90a..473dfd3056 100644 --- a/src/IGESAppli/IGESAppli_ToolDrilledHole.hxx +++ b/src/IGESAppli/IGESAppli_ToolDrilledHole.hxx @@ -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; diff --git a/src/IGESAppli/IGESAppli_ToolElementResults.cxx b/src/IGESAppli/IGESAppli_ToolElementResults.cxx index b7d27415d1..346bed01c3 100644 --- a/src/IGESAppli/IGESAppli_ToolElementResults.cxx +++ b/src/IGESAppli/IGESAppli_ToolElementResults.cxx @@ -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 << " ["<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 << " ["< 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 diff --git a/src/IGESAppli/IGESAppli_ToolElementResults.hxx b/src/IGESAppli/IGESAppli_ToolElementResults.hxx index 02e7dad33e..e996ebbed9 100644 --- a/src/IGESAppli/IGESAppli_ToolElementResults.hxx +++ b/src/IGESAppli/IGESAppli_ToolElementResults.hxx @@ -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; diff --git a/src/IGESAppli/IGESAppli_ToolFiniteElement.cxx b/src/IGESAppli/IGESAppli_ToolFiniteElement.cxx index fe88aeeb13..022942667d 100644 --- a/src/IGESAppli/IGESAppli_ToolFiniteElement.cxx +++ b/src/IGESAppli/IGESAppli_ToolFiniteElement.cxx @@ -32,7 +32,6 @@ #include #include #include -#include #include #include @@ -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; } diff --git a/src/IGESAppli/IGESAppli_ToolFiniteElement.hxx b/src/IGESAppli/IGESAppli_ToolFiniteElement.hxx index ac0848b82e..978ac7ca35 100644 --- a/src/IGESAppli/IGESAppli_ToolFiniteElement.hxx +++ b/src/IGESAppli/IGESAppli_ToolFiniteElement.hxx @@ -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; diff --git a/src/IGESAppli/IGESAppli_ToolFlow.cxx b/src/IGESAppli/IGESAppli_ToolFlow.cxx index 3ed920c2f1..114047bc41 100644 --- a/src/IGESAppli/IGESAppli_ToolFlow.cxx +++ b/src/IGESAppli/IGESAppli_ToolFlow.cxx @@ -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; } diff --git a/src/IGESAppli/IGESAppli_ToolFlow.hxx b/src/IGESAppli/IGESAppli_ToolFlow.hxx index 0bc31f5015..fc35b3984e 100644 --- a/src/IGESAppli/IGESAppli_ToolFlow.hxx +++ b/src/IGESAppli/IGESAppli_ToolFlow.hxx @@ -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; diff --git a/src/IGESAppli/IGESAppli_ToolFlowLineSpec.cxx b/src/IGESAppli/IGESAppli_ToolFlowLineSpec.cxx index 4d6ff578ee..4252be197d 100644 --- a/src/IGESAppli/IGESAppli_ToolFlowLineSpec.cxx +++ b/src/IGESAppli/IGESAppli_ToolFlowLineSpec.cxx @@ -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"; } diff --git a/src/IGESAppli/IGESAppli_ToolFlowLineSpec.hxx b/src/IGESAppli/IGESAppli_ToolFlowLineSpec.hxx index c9b101fa37..c28a1031d7 100644 --- a/src/IGESAppli/IGESAppli_ToolFlowLineSpec.hxx +++ b/src/IGESAppli/IGESAppli_ToolFlowLineSpec.hxx @@ -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; diff --git a/src/IGESAppli/IGESAppli_ToolLevelFunction.cxx b/src/IGESAppli/IGESAppli_ToolLevelFunction.cxx index 49d806ed0e..e83878ad0e 100644 --- a/src/IGESAppli/IGESAppli_ToolLevelFunction.cxx +++ b/src/IGESAppli/IGESAppli_ToolLevelFunction.cxx @@ -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"; } diff --git a/src/IGESAppli/IGESAppli_ToolLevelFunction.hxx b/src/IGESAppli/IGESAppli_ToolLevelFunction.hxx index ec6c801a4c..7dae8c9608 100644 --- a/src/IGESAppli/IGESAppli_ToolLevelFunction.hxx +++ b/src/IGESAppli/IGESAppli_ToolLevelFunction.hxx @@ -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; diff --git a/src/IGESAppli/IGESAppli_ToolLevelToPWBLayerMap.cxx b/src/IGESAppli/IGESAppli_ToolLevelToPWBLayerMap.cxx index 3371c90b8a..6d8593341a 100644 --- a/src/IGESAppli/IGESAppli_ToolLevelToPWBLayerMap.cxx +++ b/src/IGESAppli/IGESAppli_ToolLevelToPWBLayerMap.cxx @@ -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"; } } diff --git a/src/IGESAppli/IGESAppli_ToolLevelToPWBLayerMap.hxx b/src/IGESAppli/IGESAppli_ToolLevelToPWBLayerMap.hxx index 055b43868e..4b0993b044 100644 --- a/src/IGESAppli/IGESAppli_ToolLevelToPWBLayerMap.hxx +++ b/src/IGESAppli/IGESAppli_ToolLevelToPWBLayerMap.hxx @@ -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; diff --git a/src/IGESAppli/IGESAppli_ToolLineWidening.cxx b/src/IGESAppli/IGESAppli_ToolLineWidening.cxx index 89c0a901c3..46ea98c935 100644 --- a/src/IGESAppli/IGESAppli_ToolLineWidening.cxx +++ b/src/IGESAppli/IGESAppli_ToolLineWidening.cxx @@ -29,7 +29,6 @@ #include #include #include -#include #include 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; } diff --git a/src/IGESAppli/IGESAppli_ToolLineWidening.hxx b/src/IGESAppli/IGESAppli_ToolLineWidening.hxx index a1d37b26d6..d636db929c 100644 --- a/src/IGESAppli/IGESAppli_ToolLineWidening.hxx +++ b/src/IGESAppli/IGESAppli_ToolLineWidening.hxx @@ -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; diff --git a/src/IGESAppli/IGESAppli_ToolNodalConstraint.cxx b/src/IGESAppli/IGESAppli_ToolNodalConstraint.cxx index 1584b2adb7..890526555a 100644 --- a/src/IGESAppli/IGESAppli_ToolNodalConstraint.cxx +++ b/src/IGESAppli/IGESAppli_ToolNodalConstraint.cxx @@ -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; } diff --git a/src/IGESAppli/IGESAppli_ToolNodalConstraint.hxx b/src/IGESAppli/IGESAppli_ToolNodalConstraint.hxx index 33cd7e58fe..d863240d3e 100644 --- a/src/IGESAppli/IGESAppli_ToolNodalConstraint.hxx +++ b/src/IGESAppli/IGESAppli_ToolNodalConstraint.hxx @@ -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; diff --git a/src/IGESAppli/IGESAppli_ToolNodalDisplAndRot.cxx b/src/IGESAppli/IGESAppli_ToolNodalDisplAndRot.cxx index c8a72a9e62..0eaecb9e20 100644 --- a/src/IGESAppli/IGESAppli_ToolNodalDisplAndRot.cxx +++ b/src/IGESAppli/IGESAppli_ToolNodalDisplAndRot.cxx @@ -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 :"<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; } diff --git a/src/IGESAppli/IGESAppli_ToolNodalDisplAndRot.hxx b/src/IGESAppli/IGESAppli_ToolNodalDisplAndRot.hxx index 19222da1dd..e5caf713a2 100644 --- a/src/IGESAppli/IGESAppli_ToolNodalDisplAndRot.hxx +++ b/src/IGESAppli/IGESAppli_ToolNodalDisplAndRot.hxx @@ -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; diff --git a/src/IGESAppli/IGESAppli_ToolNodalResults.cxx b/src/IGESAppli/IGESAppli_ToolNodalResults.cxx index f09002ad1f..3c51f6012e 100644 --- a/src/IGESAppli/IGESAppli_ToolNodalResults.cxx +++ b/src/IGESAppli/IGESAppli_ToolNodalResults.cxx @@ -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"; } } } diff --git a/src/IGESAppli/IGESAppli_ToolNodalResults.hxx b/src/IGESAppli/IGESAppli_ToolNodalResults.hxx index 5ad236c8c6..791c425033 100644 --- a/src/IGESAppli/IGESAppli_ToolNodalResults.hxx +++ b/src/IGESAppli/IGESAppli_ToolNodalResults.hxx @@ -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; diff --git a/src/IGESAppli/IGESAppli_ToolNode.cxx b/src/IGESAppli/IGESAppli_ToolNode.cxx index c4cd87db0a..de6db18512 100644 --- a/src/IGESAppli/IGESAppli_ToolNode.cxx +++ b/src/IGESAppli/IGESAppli_ToolNode.cxx @@ -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() <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; } diff --git a/src/IGESAppli/IGESAppli_ToolNode.hxx b/src/IGESAppli/IGESAppli_ToolNode.hxx index e31b1b9feb..1248c827eb 100644 --- a/src/IGESAppli/IGESAppli_ToolNode.hxx +++ b/src/IGESAppli/IGESAppli_ToolNode.hxx @@ -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; diff --git a/src/IGESAppli/IGESAppli_ToolPWBArtworkStackup.cxx b/src/IGESAppli/IGESAppli_ToolPWBArtworkStackup.cxx index 6379015c89..68425daff3 100644 --- a/src/IGESAppli/IGESAppli_ToolPWBArtworkStackup.cxx +++ b/src/IGESAppli/IGESAppli_ToolPWBArtworkStackup.cxx @@ -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; } diff --git a/src/IGESAppli/IGESAppli_ToolPWBArtworkStackup.hxx b/src/IGESAppli/IGESAppli_ToolPWBArtworkStackup.hxx index ea1bcc7f9c..d0cb039ff3 100644 --- a/src/IGESAppli/IGESAppli_ToolPWBArtworkStackup.hxx +++ b/src/IGESAppli/IGESAppli_ToolPWBArtworkStackup.hxx @@ -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; diff --git a/src/IGESAppli/IGESAppli_ToolPWBDrilledHole.cxx b/src/IGESAppli/IGESAppli_ToolPWBDrilledHole.cxx index a016694ebc..cab5650619 100644 --- a/src/IGESAppli/IGESAppli_ToolPWBDrilledHole.cxx +++ b/src/IGESAppli/IGESAppli_ToolPWBDrilledHole.cxx @@ -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; } diff --git a/src/IGESAppli/IGESAppli_ToolPWBDrilledHole.hxx b/src/IGESAppli/IGESAppli_ToolPWBDrilledHole.hxx index cfcb732187..b15c9cecf7 100644 --- a/src/IGESAppli/IGESAppli_ToolPWBDrilledHole.hxx +++ b/src/IGESAppli/IGESAppli_ToolPWBDrilledHole.hxx @@ -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; diff --git a/src/IGESAppli/IGESAppli_ToolPartNumber.cxx b/src/IGESAppli/IGESAppli_ToolPartNumber.cxx index 907aa5004a..d63f1c8cd6 100644 --- a/src/IGESAppli/IGESAppli_ToolPartNumber.cxx +++ b/src/IGESAppli/IGESAppli_ToolPartNumber.cxx @@ -30,7 +30,6 @@ #include #include #include -#include #include #include @@ -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; } diff --git a/src/IGESAppli/IGESAppli_ToolPartNumber.hxx b/src/IGESAppli/IGESAppli_ToolPartNumber.hxx index 78668b8bdc..748f671e83 100644 --- a/src/IGESAppli/IGESAppli_ToolPartNumber.hxx +++ b/src/IGESAppli/IGESAppli_ToolPartNumber.hxx @@ -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; diff --git a/src/IGESAppli/IGESAppli_ToolPinNumber.cxx b/src/IGESAppli/IGESAppli_ToolPinNumber.cxx index b506c08773..4f33ce8601 100644 --- a/src/IGESAppli/IGESAppli_ToolPinNumber.cxx +++ b/src/IGESAppli/IGESAppli_ToolPinNumber.cxx @@ -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; } diff --git a/src/IGESAppli/IGESAppli_ToolPinNumber.hxx b/src/IGESAppli/IGESAppli_ToolPinNumber.hxx index 1ef373f481..f5476a7df6 100644 --- a/src/IGESAppli/IGESAppli_ToolPinNumber.hxx +++ b/src/IGESAppli/IGESAppli_ToolPinNumber.hxx @@ -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; diff --git a/src/IGESAppli/IGESAppli_ToolPipingFlow.cxx b/src/IGESAppli/IGESAppli_ToolPipingFlow.cxx index b0e40c7fee..f4de6a4e0c 100644 --- a/src/IGESAppli/IGESAppli_ToolPipingFlow.cxx +++ b/src/IGESAppli/IGESAppli_ToolPipingFlow.cxx @@ -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; } diff --git a/src/IGESAppli/IGESAppli_ToolPipingFlow.hxx b/src/IGESAppli/IGESAppli_ToolPipingFlow.hxx index 3e40b4119c..7d0c1bf87c 100644 --- a/src/IGESAppli/IGESAppli_ToolPipingFlow.hxx +++ b/src/IGESAppli/IGESAppli_ToolPipingFlow.hxx @@ -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; diff --git a/src/IGESAppli/IGESAppli_ToolReferenceDesignator.cxx b/src/IGESAppli/IGESAppli_ToolReferenceDesignator.cxx index 939bdcf94f..887ba489f1 100644 --- a/src/IGESAppli/IGESAppli_ToolReferenceDesignator.cxx +++ b/src/IGESAppli/IGESAppli_ToolReferenceDesignator.cxx @@ -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; } diff --git a/src/IGESAppli/IGESAppli_ToolReferenceDesignator.hxx b/src/IGESAppli/IGESAppli_ToolReferenceDesignator.hxx index c47b8f3b84..1e8b5767f8 100644 --- a/src/IGESAppli/IGESAppli_ToolReferenceDesignator.hxx +++ b/src/IGESAppli/IGESAppli_ToolReferenceDesignator.hxx @@ -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; diff --git a/src/IGESAppli/IGESAppli_ToolRegionRestriction.cxx b/src/IGESAppli/IGESAppli_ToolRegionRestriction.cxx index e6197b87e1..549544b6ac 100644 --- a/src/IGESAppli/IGESAppli_ToolRegionRestriction.cxx +++ b/src/IGESAppli/IGESAppli_ToolRegionRestriction.cxx @@ -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; } diff --git a/src/IGESAppli/IGESAppli_ToolRegionRestriction.hxx b/src/IGESAppli/IGESAppli_ToolRegionRestriction.hxx index 0d12ed28f1..cc949d47bf 100644 --- a/src/IGESAppli/IGESAppli_ToolRegionRestriction.hxx +++ b/src/IGESAppli/IGESAppli_ToolRegionRestriction.hxx @@ -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; diff --git a/src/IGESBasic/IGESBasic_SpecificModule.cxx b/src/IGESBasic/IGESBasic_SpecificModule.cxx index 39e3d62d7d..92c9d16c28 100644 --- a/src/IGESBasic/IGESBasic_SpecificModule.cxx +++ b/src/IGESBasic/IGESBasic_SpecificModule.cxx @@ -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) { diff --git a/src/IGESBasic/IGESBasic_SpecificModule.hxx b/src/IGESBasic/IGESBasic_SpecificModule.hxx index 6e464c251b..cef0f17d99 100644 --- a/src/IGESBasic/IGESBasic_SpecificModule.hxx +++ b/src/IGESBasic/IGESBasic_SpecificModule.hxx @@ -25,8 +25,6 @@ #include 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) diff --git a/src/IGESBasic/IGESBasic_ToolAssocGroupType.cxx b/src/IGESBasic/IGESBasic_ToolAssocGroupType.cxx index a180f8d738..e4675e8fc4 100644 --- a/src/IGESBasic/IGESBasic_ToolAssocGroupType.cxx +++ b/src/IGESBasic/IGESBasic_ToolAssocGroupType.cxx @@ -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; } diff --git a/src/IGESBasic/IGESBasic_ToolAssocGroupType.hxx b/src/IGESBasic/IGESBasic_ToolAssocGroupType.hxx index 49072f61c1..0e94b2d3c1 100644 --- a/src/IGESBasic/IGESBasic_ToolAssocGroupType.hxx +++ b/src/IGESBasic/IGESBasic_ToolAssocGroupType.hxx @@ -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; diff --git a/src/IGESBasic/IGESBasic_ToolExternalRefFile.cxx b/src/IGESBasic/IGESBasic_ToolExternalRefFile.cxx index 9cae4ea9c2..a2d1ab6da9 100644 --- a/src/IGESBasic/IGESBasic_ToolExternalRefFile.cxx +++ b/src/IGESBasic/IGESBasic_ToolExternalRefFile.cxx @@ -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; } diff --git a/src/IGESBasic/IGESBasic_ToolExternalRefFile.hxx b/src/IGESBasic/IGESBasic_ToolExternalRefFile.hxx index 1cfd0e815b..c8f39e3668 100644 --- a/src/IGESBasic/IGESBasic_ToolExternalRefFile.hxx +++ b/src/IGESBasic/IGESBasic_ToolExternalRefFile.hxx @@ -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; diff --git a/src/IGESBasic/IGESBasic_ToolExternalRefFileIndex.cxx b/src/IGESBasic/IGESBasic_ToolExternalRefFileIndex.cxx index 8ea02731e5..c35321386e 100644 --- a/src/IGESBasic/IGESBasic_ToolExternalRefFileIndex.cxx +++ b/src/IGESBasic/IGESBasic_ToolExternalRefFileIndex.cxx @@ -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; } diff --git a/src/IGESBasic/IGESBasic_ToolExternalRefFileIndex.hxx b/src/IGESBasic/IGESBasic_ToolExternalRefFileIndex.hxx index a35110182d..637b90448b 100644 --- a/src/IGESBasic/IGESBasic_ToolExternalRefFileIndex.hxx +++ b/src/IGESBasic/IGESBasic_ToolExternalRefFileIndex.hxx @@ -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; diff --git a/src/IGESBasic/IGESBasic_ToolExternalRefFileName.cxx b/src/IGESBasic/IGESBasic_ToolExternalRefFileName.cxx index 2746701b2e..2c89dbe46e 100644 --- a/src/IGESBasic/IGESBasic_ToolExternalRefFileName.cxx +++ b/src/IGESBasic/IGESBasic_ToolExternalRefFileName.cxx @@ -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; } diff --git a/src/IGESBasic/IGESBasic_ToolExternalRefFileName.hxx b/src/IGESBasic/IGESBasic_ToolExternalRefFileName.hxx index d64c188cc0..e74c8f38c4 100644 --- a/src/IGESBasic/IGESBasic_ToolExternalRefFileName.hxx +++ b/src/IGESBasic/IGESBasic_ToolExternalRefFileName.hxx @@ -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; diff --git a/src/IGESBasic/IGESBasic_ToolExternalRefLibName.cxx b/src/IGESBasic/IGESBasic_ToolExternalRefLibName.cxx index 1e6ab195ad..119516de1f 100644 --- a/src/IGESBasic/IGESBasic_ToolExternalRefLibName.cxx +++ b/src/IGESBasic/IGESBasic_ToolExternalRefLibName.cxx @@ -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; } diff --git a/src/IGESBasic/IGESBasic_ToolExternalRefLibName.hxx b/src/IGESBasic/IGESBasic_ToolExternalRefLibName.hxx index 59048e3731..cf6a1007ec 100644 --- a/src/IGESBasic/IGESBasic_ToolExternalRefLibName.hxx +++ b/src/IGESBasic/IGESBasic_ToolExternalRefLibName.hxx @@ -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; diff --git a/src/IGESBasic/IGESBasic_ToolExternalRefName.cxx b/src/IGESBasic/IGESBasic_ToolExternalRefName.cxx index 8979e91d55..ab4daea9d3 100644 --- a/src/IGESBasic/IGESBasic_ToolExternalRefName.cxx +++ b/src/IGESBasic/IGESBasic_ToolExternalRefName.cxx @@ -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; } diff --git a/src/IGESBasic/IGESBasic_ToolExternalRefName.hxx b/src/IGESBasic/IGESBasic_ToolExternalRefName.hxx index 23aba4f052..3afda60316 100644 --- a/src/IGESBasic/IGESBasic_ToolExternalRefName.hxx +++ b/src/IGESBasic/IGESBasic_ToolExternalRefName.hxx @@ -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; diff --git a/src/IGESBasic/IGESBasic_ToolExternalReferenceFile.cxx b/src/IGESBasic/IGESBasic_ToolExternalReferenceFile.cxx index cc3e0ceb64..bdb3af00aa 100644 --- a/src/IGESBasic/IGESBasic_ToolExternalReferenceFile.cxx +++ b/src/IGESBasic/IGESBasic_ToolExternalReferenceFile.cxx @@ -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; } diff --git a/src/IGESBasic/IGESBasic_ToolExternalReferenceFile.hxx b/src/IGESBasic/IGESBasic_ToolExternalReferenceFile.hxx index 7e6b423ab8..a9fae5b3c5 100644 --- a/src/IGESBasic/IGESBasic_ToolExternalReferenceFile.hxx +++ b/src/IGESBasic/IGESBasic_ToolExternalReferenceFile.hxx @@ -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; diff --git a/src/IGESBasic/IGESBasic_ToolGroup.cxx b/src/IGESBasic/IGESBasic_ToolGroup.cxx index 8b6aacf60a..7fb5a56d65 100644 --- a/src/IGESBasic/IGESBasic_ToolGroup.cxx +++ b/src/IGESBasic/IGESBasic_ToolGroup.cxx @@ -32,7 +32,6 @@ #include #include #include -#include #include #include @@ -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; } diff --git a/src/IGESBasic/IGESBasic_ToolGroup.hxx b/src/IGESBasic/IGESBasic_ToolGroup.hxx index be8b364407..9e0654e8d3 100644 --- a/src/IGESBasic/IGESBasic_ToolGroup.hxx +++ b/src/IGESBasic/IGESBasic_ToolGroup.hxx @@ -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; diff --git a/src/IGESBasic/IGESBasic_ToolGroupWithoutBackP.cxx b/src/IGESBasic/IGESBasic_ToolGroupWithoutBackP.cxx index c1c32a5d78..1cf7838161 100644 --- a/src/IGESBasic/IGESBasic_ToolGroupWithoutBackP.cxx +++ b/src/IGESBasic/IGESBasic_ToolGroupWithoutBackP.cxx @@ -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; } diff --git a/src/IGESBasic/IGESBasic_ToolGroupWithoutBackP.hxx b/src/IGESBasic/IGESBasic_ToolGroupWithoutBackP.hxx index ca8dd4a1e4..bb60ec712d 100644 --- a/src/IGESBasic/IGESBasic_ToolGroupWithoutBackP.hxx +++ b/src/IGESBasic/IGESBasic_ToolGroupWithoutBackP.hxx @@ -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; diff --git a/src/IGESBasic/IGESBasic_ToolHierarchy.cxx b/src/IGESBasic/IGESBasic_ToolHierarchy.cxx index 680ee57846..41ab2f7cc2 100644 --- a/src/IGESBasic/IGESBasic_ToolHierarchy.cxx +++ b/src/IGESBasic/IGESBasic_ToolHierarchy.cxx @@ -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; } diff --git a/src/IGESBasic/IGESBasic_ToolHierarchy.hxx b/src/IGESBasic/IGESBasic_ToolHierarchy.hxx index 560c9c600b..bb45ef6439 100644 --- a/src/IGESBasic/IGESBasic_ToolHierarchy.hxx +++ b/src/IGESBasic/IGESBasic_ToolHierarchy.hxx @@ -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; diff --git a/src/IGESBasic/IGESBasic_ToolName.cxx b/src/IGESBasic/IGESBasic_ToolName.cxx index 46758bef42..5d30351eb5 100644 --- a/src/IGESBasic/IGESBasic_ToolName.cxx +++ b/src/IGESBasic/IGESBasic_ToolName.cxx @@ -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; } diff --git a/src/IGESBasic/IGESBasic_ToolName.hxx b/src/IGESBasic/IGESBasic_ToolName.hxx index 18021c2e3c..75e22583a0 100644 --- a/src/IGESBasic/IGESBasic_ToolName.hxx +++ b/src/IGESBasic/IGESBasic_ToolName.hxx @@ -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; diff --git a/src/IGESBasic/IGESBasic_ToolOrderedGroup.cxx b/src/IGESBasic/IGESBasic_ToolOrderedGroup.cxx index 9e13d9b176..75d29fd55a 100644 --- a/src/IGESBasic/IGESBasic_ToolOrderedGroup.cxx +++ b/src/IGESBasic/IGESBasic_ToolOrderedGroup.cxx @@ -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; } diff --git a/src/IGESBasic/IGESBasic_ToolOrderedGroup.hxx b/src/IGESBasic/IGESBasic_ToolOrderedGroup.hxx index 1a3a7bc5c0..1e688686c2 100644 --- a/src/IGESBasic/IGESBasic_ToolOrderedGroup.hxx +++ b/src/IGESBasic/IGESBasic_ToolOrderedGroup.hxx @@ -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; diff --git a/src/IGESBasic/IGESBasic_ToolOrderedGroupWithoutBackP.cxx b/src/IGESBasic/IGESBasic_ToolOrderedGroupWithoutBackP.cxx index c0175740ba..516bd58648 100644 --- a/src/IGESBasic/IGESBasic_ToolOrderedGroupWithoutBackP.cxx +++ b/src/IGESBasic/IGESBasic_ToolOrderedGroupWithoutBackP.cxx @@ -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; } diff --git a/src/IGESBasic/IGESBasic_ToolOrderedGroupWithoutBackP.hxx b/src/IGESBasic/IGESBasic_ToolOrderedGroupWithoutBackP.hxx index ccc9c4d4a0..b5e4c94d7b 100644 --- a/src/IGESBasic/IGESBasic_ToolOrderedGroupWithoutBackP.hxx +++ b/src/IGESBasic/IGESBasic_ToolOrderedGroupWithoutBackP.hxx @@ -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; diff --git a/src/IGESBasic/IGESBasic_ToolSingleParent.cxx b/src/IGESBasic/IGESBasic_ToolSingleParent.cxx index 76c43e7b09..4ea052a72a 100644 --- a/src/IGESBasic/IGESBasic_ToolSingleParent.cxx +++ b/src/IGESBasic/IGESBasic_ToolSingleParent.cxx @@ -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; } diff --git a/src/IGESBasic/IGESBasic_ToolSingleParent.hxx b/src/IGESBasic/IGESBasic_ToolSingleParent.hxx index 852dfb4306..7c41f36de1 100644 --- a/src/IGESBasic/IGESBasic_ToolSingleParent.hxx +++ b/src/IGESBasic/IGESBasic_ToolSingleParent.hxx @@ -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; diff --git a/src/IGESBasic/IGESBasic_ToolSingularSubfigure.cxx b/src/IGESBasic/IGESBasic_ToolSingularSubfigure.cxx index 9aa9fc8da4..5b20a230b8 100644 --- a/src/IGESBasic/IGESBasic_ToolSingularSubfigure.cxx +++ b/src/IGESBasic/IGESBasic_ToolSingularSubfigure.cxx @@ -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; } diff --git a/src/IGESBasic/IGESBasic_ToolSingularSubfigure.hxx b/src/IGESBasic/IGESBasic_ToolSingularSubfigure.hxx index 4f2e5962a3..6c4c764e56 100644 --- a/src/IGESBasic/IGESBasic_ToolSingularSubfigure.hxx +++ b/src/IGESBasic/IGESBasic_ToolSingularSubfigure.hxx @@ -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; diff --git a/src/IGESBasic/IGESBasic_ToolSubfigureDef.cxx b/src/IGESBasic/IGESBasic_ToolSubfigureDef.cxx index f09f0f0287..696c7d7d50 100644 --- a/src/IGESBasic/IGESBasic_ToolSubfigureDef.cxx +++ b/src/IGESBasic/IGESBasic_ToolSubfigureDef.cxx @@ -32,7 +32,6 @@ #include #include #include -#include #include #include #include @@ -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; } diff --git a/src/IGESBasic/IGESBasic_ToolSubfigureDef.hxx b/src/IGESBasic/IGESBasic_ToolSubfigureDef.hxx index b1356b2179..9cf6b87818 100644 --- a/src/IGESBasic/IGESBasic_ToolSubfigureDef.hxx +++ b/src/IGESBasic/IGESBasic_ToolSubfigureDef.hxx @@ -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; diff --git a/src/IGESControl/IGESControl_Reader.cxx b/src/IGESControl/IGESControl_Reader.cxx index 1c0c81277e..8d4142b79d 100644 --- a/src/IGESControl/IGESControl_Reader.cxx +++ b/src/IGESControl/IGESControl_Reader.cxx @@ -247,7 +247,8 @@ void IGESControl_Reader::PrintTransferInfo NCollection_DataMap::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::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; } diff --git a/src/IGESData/IGESData_DefaultSpecific.cxx b/src/IGESData/IGESData_DefaultSpecific.cxx index cc0d0adcb9..93d97d22b6 100644 --- a/src/IGESData/IGESData_DefaultSpecific.cxx +++ b/src/IGESData/IGESData_DefaultSpecific.cxx @@ -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"<ParamType(i); - if (ptyp == Interface_ParamVoid) S<<" ["<IsParamEntity(i)) { DeclareAndCast(IGESData_IGESEntity,anent,cont->ParamEntity(i)); - S<<" ["< 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; diff --git a/src/IGESData/IGESData_Dump.hxx b/src/IGESData/IGESData_Dump.hxx index f94e5266ad..b6d48716f6 100644 --- a/src/IGESData/IGESData_Dump.hxx +++ b/src/IGESData/IGESData_Dump.hxx @@ -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["<String() << '"'; }\ S << "\n";\ }\ } diff --git a/src/IGESData/IGESData_IGESDumper.cxx b/src/IGESData/IGESData_IGESDumper.cxx index 98cbe33c45..ee2efa3166 100644 --- a/src/IGESData/IGESData_IGESDumper.cxx +++ b/src/IGESData/IGESData_IGESDumper.cxx @@ -28,7 +28,6 @@ #include #include #include -#include #include 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<Number(ent); - if (num > 0) S< 0) S <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 "< 0) S <<"**** Dump IGES, level "<= 2) S <<"** Status Number : Blank:"<BlankStatus() @@ -107,50 +107,50 @@ IGESData_IGESDumper::IGESData_IGESDumper <<" UseFlag:"<UseFlag() <<" Hierarchy:"<HierarchyStatus()<<"\n"; if (own >= 1) { - if (ent->HasShortLabel()) S<<"**** Label :"<ShortLabel()->ToCString(); - if (ent->HasSubScriptNumber()) S<<" SubScript:"<SubScriptNumber(); - if (ent->HasShortLabel()) S<HasShortLabel()) S <<"**** Label :"<ShortLabel()->ToCString(); + if (ent->HasSubScriptNumber()) S <<" SubScript:"<SubScriptNumber(); + if (ent->HasShortLabel()) S <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:"<RankLineFont()<<"\n"; } + { S <<"** LineFont Value:"<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 :"<Level()<<"\n"; + if (ent->Level() > 0) S <<"** Level Value :"<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:"<LineWeightNumber(); - if (diratt > 0) S<<" -> Value:"<LineWeight(); - S<LineWeightNumber(); + if (diratt > 0) S <<" -> Value:"<LineWeight(); + S <DefColor() == IGESData_DefValue) - { S<<"** Color Value :"<RankColor(); } + { S <<"** Color Value :"<RankColor(); } else if (ent->DefColor() == IGESData_DefReference) - { S<<"** Color Ref :"; PrintDNum (ent->Color(),S); } - S<Color(),S); } + S < 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:"< 0) iasuit = Standard_True; if (nb > 0) { - S<<"\n**** Associativities (nb:"<OwnDump(CN,ent,*this,S,own); else if (themodel.IsNull()) - S <<" **** Dump impossible. Type "<DynamicType()->Name()<DynamicType()->Name()<Number(ent)<<":D" - <DNum(ent)<<" Type "<DynamicType()->Name()<DNum(ent)<<" Type "<DynamicType()->Name()< is the parameter 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; diff --git a/src/IGESData/IGESData_IGESModel.cxx b/src/IGESData/IGESData_IGESModel.cxx index a620d49d2c..3091718ead 100644 --- a/src/IGESData/IGESData_IGESModel.cxx +++ b/src/IGESData/IGESData_IGESModel.cxx @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include @@ -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 ****"< 0) { S << "**** Start Section : "<Value(i)->ToCString()<Value(i)->ToCString()<ToCString()<ToCString()<ToCString()<ToCString()<ToCString()<ToCString()<ToCString()<ToCString()<ToCString()<<"\n"; + if (!str.IsNull()) S <<"[12] Receiver : "<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 : "<ToCString() + if (!str.IsNull()) S <<"[18] (Creation) Date : "<ToCString() <<" i.e. "<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 : "<ToCString()<<"\n"; + if (!str.IsNull()) S <<"[21] Author : "<ToCString()<<"\n"; str = theheader.CompanyName(); - if (!str.IsNull()) S<<"[22] Company : "<ToCString()<<"\n"; + if (!str.IsNull()) S <<"[22] Company : "<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< 0) S << " -> Name : " << IGESData_BasicEditor::DraftingName(num); + S <ToCString() - <<" i.e. "<ToCString()<ToCString()<ToCString() <ToCString() <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(); } } } diff --git a/src/IGESData/IGESData_IGESModel.hxx b/src/IGESData/IGESData_IGESModel.hxx index 70e114685c..55044e42d3 100644 --- a/src/IGESData/IGESData_IGESModel.hxx +++ b/src/IGESData/IGESData_IGESModel.hxx @@ -17,18 +17,11 @@ #ifndef _IGESData_IGESModel_HeaderFile #define _IGESData_IGESModel_HeaderFile -#include -#include - #include #include #include -#include -#include -#include -#include + 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) diff --git a/src/IGESData/IGESData_IGESWriter.cxx b/src/IGESData/IGESData_IGESWriter.cxx index 8a2b9a9af6..17e0716db8 100644 --- a/src/IGESData/IGESData_IGESWriter.cxx +++ b/src/IGESData/IGESData_IGESWriter.cxx @@ -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."<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."<TypeNumber()<<" Form "<FormNumber()<TypeNumber()<<" Form "<FormNumber()<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 "<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 diff --git a/src/IGESData/IGESData_SpecificModule.cxx b/src/IGESData/IGESData_SpecificModule.cxx index 0eec2f5374..ea93065959 100644 --- a/src/IGESData/IGESData_SpecificModule.cxx +++ b/src/IGESData/IGESData_SpecificModule.cxx @@ -15,8 +15,6 @@ #include #include #include -#include -#include IMPLEMENT_STANDARD_RTTIEXT(IGESData_SpecificModule,Standard_Transient) diff --git a/src/IGESData/IGESData_SpecificModule.hxx b/src/IGESData/IGESData_SpecificModule.hxx index 8eb81a33cc..6f7a3a7d55 100644 --- a/src/IGESData/IGESData_SpecificModule.hxx +++ b/src/IGESData/IGESData_SpecificModule.hxx @@ -25,7 +25,6 @@ #include class IGESData_IGESEntity; class IGESData_IGESDumper; -class Message_Messenger; class IGESData_SpecificModule; @@ -44,7 +43,7 @@ public: //! taken into account by the IGESDumper //! See class IGESDumper for the rules to follow for and //! level - Standard_EXPORT virtual 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 = 0; + Standard_EXPORT virtual void OwnDump (const Standard_Integer CN, const Handle(IGESData_IGESEntity)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const = 0; //! Specific Automatic Correction on own Parameters of an Entity. //! It works by setting in accordance redundant data, if there are diff --git a/src/IGESDefs/IGESDefs_SpecificModule.cxx b/src/IGESDefs/IGESDefs_SpecificModule.cxx index 537d2f92c5..eb76d8cbf7 100644 --- a/src/IGESDefs/IGESDefs_SpecificModule.cxx +++ b/src/IGESDefs/IGESDefs_SpecificModule.cxx @@ -30,7 +30,6 @@ #include #include #include -#include #include IMPLEMENT_STANDARD_RTTIEXT(IGESDefs_SpecificModule,IGESData_SpecificModule) @@ -43,7 +42,7 @@ IGESDefs_SpecificModule::IGESDefs_SpecificModule() { } void IGESDefs_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) { diff --git a/src/IGESDefs/IGESDefs_SpecificModule.hxx b/src/IGESDefs/IGESDefs_SpecificModule.hxx index 68dc1a57ab..f1a94bcbc6 100644 --- a/src/IGESDefs/IGESDefs_SpecificModule.hxx +++ b/src/IGESDefs/IGESDefs_SpecificModule.hxx @@ -24,8 +24,6 @@ #include class IGESData_IGESEntity; class IGESData_IGESDumper; -class Message_Messenger; - class IGESDefs_SpecificModule; DEFINE_STANDARD_HANDLE(IGESDefs_SpecificModule, IGESData_SpecificModule) @@ -41,7 +39,7 @@ public: Standard_EXPORT IGESDefs_SpecificModule(); //! Specific Dump (own parameters) for IGESDefs - 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; diff --git a/src/IGESDefs/IGESDefs_ToolAssociativityDef.cxx b/src/IGESDefs/IGESDefs_ToolAssociativityDef.cxx index 86991d5adc..d4c2a7f357 100644 --- a/src/IGESDefs/IGESDefs_ToolAssociativityDef.cxx +++ b/src/IGESDefs/IGESDefs_ToolAssociativityDef.cxx @@ -177,39 +177,39 @@ void IGESDefs_ToolAssociativityDef::OwnCheck void IGESDefs_ToolAssociativityDef::OwnDump (const Handle(IGESDefs_AssociativityDef)& ent, const IGESData_IGESDumper& /* dumper */, - const Handle(Message_Messenger)& S, const Standard_Integer level) const + Standard_OStream& S, const Standard_Integer level) const { - S << "IGESDefs_AssociativityDef" << Message_EndLine; - S << "Number of Class Definitions : " << ent->NbClassDefs() << Message_EndLine; - S << "Back Pointer Requirement : " << Message_EndLine; - S << "Ordered / Unordered Class : " << Message_EndLine; - S << "Number Of Items per Entry : " << Message_EndLine; - S << "Items : " << Message_EndLine; + S << "IGESDefs_AssociativityDef\n" + << "Number of Class Definitions : " << ent->NbClassDefs() << "\n" + << "Back Pointer Requirement :\n" + << "Ordered / Unordered Class :\n" + << "Number Of Items per Entry :\n" + << "Items :\n"; IGESData_DumpVals(S,-level,1, ent->NbClassDefs(),ent->BackPointerReq); - S << Message_EndLine; + S << std::endl; if (level > 4) { // Warning : Item is a JAGGED Array Standard_Integer upper = ent->NbClassDefs(); for (Standard_Integer i = 1; i <= upper; i ++) { - S << "[" << i << "]: " << Message_EndLine; + S << "[" << i << "]:\n"; S << "Back Pointer Requirement : " << ent->BackPointerReq(i) << " "; if (ent->IsBackPointerReq(i)) S << "(Yes) "; else S << "(No) "; S << " Ordered/Unordered Class : " << ent->ClassOrder(i) << " "; - if (ent->IsOrdered(i)) S << "(Yes)" <IsOrdered(i)) S << "(Yes)\n"; + else S << "(No)\n"; S << "Number Of Items per Entry : " << ent->NbItemsPerClass(i); if (level < 6) { - S << " [ask level > 5 for more]" << Message_EndLine; + S << " [ask level > 5 for more]\n"; continue; } - S << Message_EndLine << " ["; + S << "\n ["; for (Standard_Integer j = 1; j <= ent->NbItemsPerClass(i); j ++) S << " " << ent->Item(i,j); - S << "]" << Message_EndLine; + S << "]\n"; } } - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESDefs/IGESDefs_ToolAssociativityDef.hxx b/src/IGESDefs/IGESDefs_ToolAssociativityDef.hxx index 27b93e0e2e..e00d6fd252 100644 --- a/src/IGESDefs/IGESDefs_ToolAssociativityDef.hxx +++ b/src/IGESDefs/IGESDefs_ToolAssociativityDef.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a AssociativityDef. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESDefs_AssociativityDef)& entfrom, const Handle(IGESDefs_AssociativityDef)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESDefs_AssociativityDef)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESDefs_AssociativityDef)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESDefs/IGESDefs_ToolAttributeDef.cxx b/src/IGESDefs/IGESDefs_ToolAttributeDef.cxx index 6d546f29b7..524fb1474a 100644 --- a/src/IGESDefs/IGESDefs_ToolAttributeDef.cxx +++ b/src/IGESDefs/IGESDefs_ToolAttributeDef.cxx @@ -441,23 +441,23 @@ void IGESDefs_ToolAttributeDef::OwnCheck void IGESDefs_ToolAttributeDef::OwnDump (const Handle(IGESDefs_AttributeDef)& 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 << "IGESDefs_AttributeDef" << Message_EndLine; - S << "Attribute Table Name: "; + S << "IGESDefs_AttributeDef\n" + << "Attribute Table Name: "; IGESData_DumpString(S,ent->TableName()); - S << Message_EndLine; - S << "Attribute List Type : " << ent->ListType() << Message_EndLine; - S << "Number of Attributes : " << ent->NbAttributes() << Message_EndLine; - S << "Attribute Types : " << Message_EndLine; - S << "Attribute Value Data Types : " << Message_EndLine; - S << "Attribute Value Counts : " << Message_EndLine; - if (ent->HasValues()) S << "Attribute Values : " << Message_EndLine; - if (ent->HasTextDisplay()) S << "Attribute Value Entities : " << Message_EndLine; + S << "\n" + << "Attribute List Type : " << ent->ListType() << "\n" + << "Number of Attributes : " << ent->NbAttributes() << "\n" + << "Attribute Types :\n" + << "Attribute Value Data Types :\n" + << "Attribute Value Counts :\n"; + if (ent->HasValues()) S << "Attribute Values :\n"; + if (ent->HasTextDisplay()) S << "Attribute Value Entities :\n"; IGESData_DumpVals(S,-level,1, ent->NbAttributes(),ent->AttributeType); - S << Message_EndLine; + S << "\n"; if (level > 4) { Standard_Integer upper = ent->NbAttributes(); @@ -465,9 +465,9 @@ void IGESDefs_ToolAttributeDef::OwnDump { Standard_Integer avc = ent->AttributeValueCount(i); Standard_Integer typ = ent->AttributeValueDataType(i); - S << "[" << i << "]: "; - S << "Attribute Type : " << ent->AttributeType(i) << " "; - S << "Value Data Type : " << typ; + S << "[" << i << "]: " + << "Attribute Type : " << ent->AttributeType(i) << " " + << "Value Data Type : " << typ; switch (typ) { case 0 : S << " (Void)"; break; case 1 : S << " : Integer "; break; @@ -478,11 +478,11 @@ void IGESDefs_ToolAttributeDef::OwnDump case 6 : S << " : Logical "; break; default : break; } - S << " Count : " << avc << Message_EndLine; + S << " Count : " << avc << "\n"; if (ent->HasValues()) { if (level <= 5) { - S << " [ content (Values) : ask level > 5 ]" << Message_EndLine; + S << " [ content (Values) : ask level > 5 ]\n"; continue; } for (Standard_Integer j = 1; j <= avc; j ++) @@ -512,10 +512,10 @@ void IGESDefs_ToolAttributeDef::OwnDump S << " Attribute Value Pointer : "; dumper.Dump (ent->AttributeTextDisplay(i,j),S, sublevel); } - S << Message_EndLine; + S << std::endl; } } } } - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESDefs/IGESDefs_ToolAttributeDef.hxx b/src/IGESDefs/IGESDefs_ToolAttributeDef.hxx index b0eea36f09..05ea914b44 100644 --- a/src/IGESDefs/IGESDefs_ToolAttributeDef.hxx +++ b/src/IGESDefs/IGESDefs_ToolAttributeDef.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a AttributeDef. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESDefs_AttributeDef)& entfrom, const Handle(IGESDefs_AttributeDef)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESDefs_AttributeDef)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESDefs_AttributeDef)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESDefs/IGESDefs_ToolAttributeTable.cxx b/src/IGESDefs/IGESDefs_ToolAttributeTable.cxx index 9c7d1a779d..f43dbce920 100644 --- a/src/IGESDefs/IGESDefs_ToolAttributeTable.cxx +++ b/src/IGESDefs/IGESDefs_ToolAttributeTable.cxx @@ -301,20 +301,20 @@ void IGESDefs_ToolAttributeTable::OwnCheck void IGESDefs_ToolAttributeTable::OwnDump (const Handle(IGESDefs_AttributeTable)& ent, const IGESData_IGESDumper& dumper, - const Handle(Message_Messenger)& S, const Standard_Integer level) const + Standard_OStream& S, const Standard_Integer level) const { - S << "IGESDefs_AttributeTable" << Message_EndLine; + S << "IGESDefs_AttributeTable\n"; Handle(IGESDefs_AttributeDef) ab = ent->Definition(); Standard_Integer na = ent->NbAttributes(); Standard_Integer nr = ent->NbRows(); if (ent->FormNumber() == 1) - S << "Number of Rows (i.e. complete sets of Attributes) : " << nr << Message_EndLine; - else S << "One set of Attributes" << Message_EndLine; - S << "Number of defined Attributes : " << na << Message_EndLine; + S << "Number of Rows (i.e. complete sets of Attributes) : " << nr << "\n"; + else S << "One set of Attributes\n"; + S << "Number of defined Attributes : " << na << "\n"; if (level <= 4) S << - " [ structure : see Structure in Directory Entry; content : level > 4 ]" < 4 ]\n"; else for (Standard_Integer k = 1; k <= nr; k ++) { @@ -347,8 +347,8 @@ void IGESDefs_ToolAttributeTable::OwnDump default : break; } } - S << Message_EndLine; + S << "\n"; } } - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESDefs/IGESDefs_ToolAttributeTable.hxx b/src/IGESDefs/IGESDefs_ToolAttributeTable.hxx index de2a371855..53c1a547cf 100644 --- a/src/IGESDefs/IGESDefs_ToolAttributeTable.hxx +++ b/src/IGESDefs/IGESDefs_ToolAttributeTable.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a AttributeTable. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESDefs_AttributeTable)& entfrom, const Handle(IGESDefs_AttributeTable)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESDefs_AttributeTable)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESDefs_AttributeTable)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESDefs/IGESDefs_ToolGenericData.cxx b/src/IGESDefs/IGESDefs_ToolGenericData.cxx index 19708e74b3..b13a0e552f 100644 --- a/src/IGESDefs/IGESDefs_ToolGenericData.cxx +++ b/src/IGESDefs/IGESDefs_ToolGenericData.cxx @@ -255,25 +255,25 @@ void IGESDefs_ToolGenericData::OwnCheck void IGESDefs_ToolGenericData::OwnDump (const Handle(IGESDefs_GenericData)& ent, const IGESData_IGESDumper& dumper, - const Handle(Message_Messenger)& S, const Standard_Integer level) const + Standard_OStream& S, const Standard_Integer level) const { - S << "IGESDefs_GenericData" << Message_EndLine; - S << "Number of property values : " << ent->NbPropertyValues() << Message_EndLine; - S << "Property Name : "; + S << "IGESDefs_GenericData\n" + << "Number of property values : " << ent->NbPropertyValues() << "\n" + << "Property Name : "; IGESData_DumpString(S,ent->Name()); - S << Message_EndLine; + S << std::endl; switch (level) { case 4: - S << "Types : " << Message_EndLine; - S << "Values : Count = " << ent->NbTypeValuePairs() << Message_EndLine; - S << " [ as level > 4 for content ]" << Message_EndLine; + S << "Types :\n"; + S << "Values : Count = " << ent->NbTypeValuePairs() << "\n"; + S << " [ as level > 4 for content ]\n"; break; case 5: case 6: { Standard_Integer i, num; - S << "Types & Values : " << Message_EndLine; + S << "Types & Values : " << "\n"; for ( num = ent->NbTypeValuePairs(), i = 1; i <= num; i++ ) { S << "[" << i << "]: "; @@ -293,9 +293,9 @@ void IGESDefs_ToolGenericData::OwnDump << (ent->ValueAsLogical(i) ? "True" : "False"); break; default : break; } - S << Message_EndLine; + S << "\n"; } } } - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESDefs/IGESDefs_ToolGenericData.hxx b/src/IGESDefs/IGESDefs_ToolGenericData.hxx index abfd855102..4f54ec8b3f 100644 --- a/src/IGESDefs/IGESDefs_ToolGenericData.hxx +++ b/src/IGESDefs/IGESDefs_ToolGenericData.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a GenericData. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESDefs_GenericData)& entfrom, const Handle(IGESDefs_GenericData)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESDefs_GenericData)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESDefs_GenericData)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESDefs/IGESDefs_ToolMacroDef.cxx b/src/IGESDefs/IGESDefs_ToolMacroDef.cxx index 1c04816809..6f0049bfc0 100644 --- a/src/IGESDefs/IGESDefs_ToolMacroDef.cxx +++ b/src/IGESDefs/IGESDefs_ToolMacroDef.cxx @@ -143,16 +143,16 @@ void IGESDefs_ToolMacroDef::OwnCheck void IGESDefs_ToolMacroDef::OwnDump (const Handle(IGESDefs_MacroDef)& ent, const IGESData_IGESDumper& /* dumper */, - const Handle(Message_Messenger)& S, const Standard_Integer level) const + Standard_OStream& S, const Standard_Integer level) const { - S << "IGESDefs_MacroDef" << Message_EndLine; - S << "MACRO : "; + S << "IGESDefs_MacroDef\n" + << "MACRO : "; IGESData_DumpString(S,ent->MACRO()); - S << Message_EndLine; - S << "Entity Type ID : " << ent->EntityTypeID() << Message_EndLine; - S << "Language Statement : "; - IGESData_DumpStrings(S ,level,1, ent->NbStatements(),ent->LanguageStatement); + S << "\n" + << "Entity Type ID : " << ent->EntityTypeID() << "\n" + << "Language Statement : "; + IGESData_DumpStrings(S,level,1, ent->NbStatements(),ent->LanguageStatement); S << "END MACRO : "; IGESData_DumpString(S,ent->ENDMACRO()); - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESDefs/IGESDefs_ToolMacroDef.hxx b/src/IGESDefs/IGESDefs_ToolMacroDef.hxx index ccb552865a..ef9a327c51 100644 --- a/src/IGESDefs/IGESDefs_ToolMacroDef.hxx +++ b/src/IGESDefs/IGESDefs_ToolMacroDef.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a MacroDef. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESDefs_MacroDef)& entfrom, const Handle(IGESDefs_MacroDef)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESDefs_MacroDef)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESDefs_MacroDef)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESDefs/IGESDefs_ToolTabularData.cxx b/src/IGESDefs/IGESDefs_ToolTabularData.cxx index 0817534a32..4be7ee6dfd 100644 --- a/src/IGESDefs/IGESDefs_ToolTabularData.cxx +++ b/src/IGESDefs/IGESDefs_ToolTabularData.cxx @@ -223,34 +223,34 @@ void IGESDefs_ToolTabularData::OwnCheck void IGESDefs_ToolTabularData::OwnDump (const Handle(IGESDefs_TabularData)& 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 nbIndeps = ent->NbIndependents(); //szv#4:S4163:12Mar99 i unused Standard_Integer nbDeps = ent->NbDependents(); - S << "IGESDefs_TabularData" << Message_EndLine; - S << "No. of property values : " << ent->NbPropertyValues() << Message_EndLine; - S << "Property type : " << ent->PropertyType() << Message_EndLine; - S << "No. of Dependent variables : " << nbDeps << Message_EndLine; - S << "No. of Independent variables : " << nbIndeps << Message_EndLine; - S << "Type of independent variables : "; - IGESData_DumpVals(S ,level,1, nbIndeps,ent->TypeOfIndependents); - S << Message_EndLine << "Number of values of independent variables : "; - IGESData_DumpVals(S ,level,1, nbIndeps,ent->NbValues); + S << "IGESDefs_TabularData\n" + << "No. of property values : " << ent->NbPropertyValues() << "\n" + << "Property type : " << ent->PropertyType() << "\n" + << "No. of Dependent variables : " << nbDeps << "\n" + << "No. of Independent variables : " << nbIndeps << "\n" + << "Type of independent variables : "; + IGESData_DumpVals(S,level,1, nbIndeps,ent->TypeOfIndependents); + S << "\nNumber of values of independent variables : "; + IGESData_DumpVals(S,level,1, nbIndeps,ent->NbValues); // ?? JAGGED ?? - S << Message_EndLine << "Values of the independent variable : "; + S << std::endl << "Values of the independent variable : "; if (level < 5) S << " [ask level > 4]"; else { for (Standard_Integer ind = 1; ind <= nbIndeps; ind ++) { - S << Message_EndLine << "[" << ind << "]:"; + S << std::endl << "[" << ind << "]:"; Standard_Integer nbi = ent->NbValues(ind); for (Standard_Integer iv = 1; iv <= nbi; iv ++) S << " " << ent->IndependentValue(ind,iv); } } -// IGESData_DumpVals(S ,level,1, nbIndeps,ent->IndependentValue); - S << Message_EndLine << "Values of the dependent variable : "; -// IGESData_DumpVals(S ,level,1, nbDeps,ent->DependentValue); - S << " TO BE DONE"; - S << Message_EndLine; +// IGESData_DumpVals(aSender,level,1, nbIndeps,ent->IndependentValue); + S << std::endl << "Values of the dependent variable : "; +// IGESData_DumpVals(aSender,level,1, nbDeps,ent->DependentValue); + S << " TO BE DONE" + << std::endl; } diff --git a/src/IGESDefs/IGESDefs_ToolTabularData.hxx b/src/IGESDefs/IGESDefs_ToolTabularData.hxx index 5b156e2706..206de7a6c6 100644 --- a/src/IGESDefs/IGESDefs_ToolTabularData.hxx +++ b/src/IGESDefs/IGESDefs_ToolTabularData.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a TabularData. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESDefs_TabularData)& entfrom, const Handle(IGESDefs_TabularData)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESDefs_TabularData)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESDefs_TabularData)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESDefs/IGESDefs_ToolUnitsData.cxx b/src/IGESDefs/IGESDefs_ToolUnitsData.cxx index c92dca5fa5..f42cbf7eba 100644 --- a/src/IGESDefs/IGESDefs_ToolUnitsData.cxx +++ b/src/IGESDefs/IGESDefs_ToolUnitsData.cxx @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include @@ -153,29 +152,29 @@ void IGESDefs_ToolUnitsData::OwnCheck void IGESDefs_ToolUnitsData::OwnDump (const Handle(IGESDefs_UnitsData)& ent, const IGESData_IGESDumper& /* dumper */, - const Handle(Message_Messenger)& S, const Standard_Integer level) const + Standard_OStream& S, const Standard_Integer level) const { - S << "IGESDefs_UnitsData" << Message_EndLine; - S << "Number of Units : " << ent->NbUnits() << Message_EndLine; - S << "Type of Unit : " << Message_EndLine; - S << "Value of Unit : " << Message_EndLine; - S << "Scale Factor : " << Message_EndLine; + S << "IGESDefs_UnitsData\n" + << "Number of Units : " << ent->NbUnits() << "\n" + << "Type of Unit :\n" + << "Value of Unit :\n" + << "Scale Factor :\n"; IGESData_DumpStrings(S,-level,1, ent->NbUnits(),ent->UnitType); - S << Message_EndLine; + S << "\n"; if (level > 4) { - S << "Details of the Units" << Message_EndLine; + S << "Details of the Units\n"; Standard_Integer upper = ent->NbUnits(); for (Standard_Integer i = 1; i <= upper; i++) { S << "[" << i << "] Type : "; IGESData_DumpString(S,ent->UnitType(i)); - S << Message_EndLine; - S << " Value : "; + S << "\n" + << " Value : "; IGESData_DumpString(S,ent->UnitValue(i)); - S << Message_EndLine; - S << " ScaleFactor: " << ent->ScaleFactor(i) << Message_EndLine; + S << "\n" + << " ScaleFactor: " << ent->ScaleFactor(i) << "\n"; } } - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESDefs/IGESDefs_ToolUnitsData.hxx b/src/IGESDefs/IGESDefs_ToolUnitsData.hxx index ea5a62992d..7a6c5e9260 100644 --- a/src/IGESDefs/IGESDefs_ToolUnitsData.hxx +++ b/src/IGESDefs/IGESDefs_ToolUnitsData.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a UnitsData. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESDefs_UnitsData)& entfrom, const Handle(IGESDefs_UnitsData)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESDefs_UnitsData)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESDefs_UnitsData)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESDimen/IGESDimen_SpecificModule.cxx b/src/IGESDimen/IGESDimen_SpecificModule.cxx index 9dd3484b9e..0fd7dfaf52 100644 --- a/src/IGESDimen/IGESDimen_SpecificModule.cxx +++ b/src/IGESDimen/IGESDimen_SpecificModule.cxx @@ -75,7 +75,7 @@ IGESDimen_SpecificModule::IGESDimen_SpecificModule() { } void IGESDimen_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) { diff --git a/src/IGESDimen/IGESDimen_SpecificModule.hxx b/src/IGESDimen/IGESDimen_SpecificModule.hxx index 29bdd57da1..64d51a2af5 100644 --- a/src/IGESDimen/IGESDimen_SpecificModule.hxx +++ b/src/IGESDimen/IGESDimen_SpecificModule.hxx @@ -25,8 +25,6 @@ #include class IGESData_IGESEntity; class IGESData_IGESDumper; -class Message_Messenger; - class IGESDimen_SpecificModule; DEFINE_STANDARD_HANDLE(IGESDimen_SpecificModule, IGESData_SpecificModule) @@ -43,7 +41,7 @@ public: Standard_EXPORT IGESDimen_SpecificModule(); //! Specific Dump (own parameters) for IGESDimen - 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 (BasicDimension,CenterLine,DimensionDisplayData, diff --git a/src/IGESDimen/IGESDimen_ToolAngularDimension.cxx b/src/IGESDimen/IGESDimen_ToolAngularDimension.cxx index 699b06f6f3..01bd4ed74f 100644 --- a/src/IGESDimen/IGESDimen_ToolAngularDimension.cxx +++ b/src/IGESDimen/IGESDimen_ToolAngularDimension.cxx @@ -143,28 +143,28 @@ void IGESDimen_ToolAngularDimension::OwnCheck void IGESDimen_ToolAngularDimension::OwnDump (const Handle(IGESDimen_AngularDimension)& 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 << "IGESDimen_AngularDimension" << Message_EndLine; - S << "General Note Entity : "; + S << "IGESDimen_AngularDimension\n" + << "General Note Entity : "; dumper.Dump(ent->Note(),S, sublevel); - S << Message_EndLine; - S << "First Witness Entity : "; + S << "\n" + << "First Witness Entity : "; dumper.Dump(ent->FirstWitnessLine(),S, sublevel); - S << Message_EndLine; - S << "Second Witness Entity : "; + S << "\n" + << "Second Witness Entity : "; dumper.Dump(ent->SecondWitnessLine(),S, sublevel); - S << Message_EndLine; - S << "Vertex Point Co-ords : "; - IGESData_DumpXYL(S,level, ent->Vertex(), ent->Location()); S << Message_EndLine; - S << "Radius of Leader arcs : " << ent->Radius() << Message_EndLine; - S << "First Leader Entity : "; + S << "\n" + << "Vertex Point Co-ords : "; + IGESData_DumpXYL(S,level, ent->Vertex(), ent->Location()); S << "\n"; + S << "Radius of Leader arcs : " << ent->Radius() << "\n" + << "First Leader Entity : "; dumper.Dump(ent->FirstLeader(),S, sublevel); - S << Message_EndLine; - S << "Second Leader Entity : "; + S << "\n" + << "Second Leader Entity : "; dumper.Dump(ent->SecondLeader(),S, sublevel); - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESDimen/IGESDimen_ToolAngularDimension.hxx b/src/IGESDimen/IGESDimen_ToolAngularDimension.hxx index 3894a253e9..c36a577c77 100644 --- a/src/IGESDimen/IGESDimen_ToolAngularDimension.hxx +++ b/src/IGESDimen/IGESDimen_ToolAngularDimension.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a AngularDimension. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESDimen_AngularDimension)& entfrom, const Handle(IGESDimen_AngularDimension)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESDimen_AngularDimension)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESDimen_AngularDimension)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESDimen/IGESDimen_ToolBasicDimension.cxx b/src/IGESDimen/IGESDimen_ToolBasicDimension.cxx index b440d4a5a2..7ca95b5a0c 100644 --- a/src/IGESDimen/IGESDimen_ToolBasicDimension.cxx +++ b/src/IGESDimen/IGESDimen_ToolBasicDimension.cxx @@ -119,18 +119,18 @@ void IGESDimen_ToolBasicDimension::OwnCheck void IGESDimen_ToolBasicDimension::OwnDump (const Handle(IGESDimen_BasicDimension)& ent, const IGESData_IGESDumper& /* dumper */, - const Handle(Message_Messenger)& S, const Standard_Integer /* level */) const + Standard_OStream& S, const Standard_Integer /* level */) const { - S << "IGESDimen_BasicDimension" << Message_EndLine; - S << "Number of Property Values : " << ent->NbPropertyValues() << Message_EndLine; - S << Message_EndLine << " Lower left corner : " ; + S << "IGESDimen_BasicDimension\n" + << "Number of Property Values : " << ent->NbPropertyValues() << "\n\n" + << " Lower left corner : " ; IGESData_DumpXY(S, ent->LowerLeft()); - S << Message_EndLine << " Lower right corner : " ; + S << "\n Lower right corner : " ; IGESData_DumpXY(S, ent->LowerRight()); - S << Message_EndLine << " Upper right corner : " ; + S << "\n Upper right corner : " ; IGESData_DumpXY(S, ent->UpperRight()); - S << Message_EndLine << " Upper left corner : "; + S << "\n Upper left corner : "; IGESData_DumpXY(S, ent->UpperLeft()); - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESDimen/IGESDimen_ToolBasicDimension.hxx b/src/IGESDimen/IGESDimen_ToolBasicDimension.hxx index a7ea6531cc..98d9529021 100644 --- a/src/IGESDimen/IGESDimen_ToolBasicDimension.hxx +++ b/src/IGESDimen/IGESDimen_ToolBasicDimension.hxx @@ -34,8 +34,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a BasicDimension. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -74,7 +72,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESDimen_BasicDimension)& entfrom, const Handle(IGESDimen_BasicDimension)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESDimen_BasicDimension)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESDimen_BasicDimension)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESDimen/IGESDimen_ToolCenterLine.cxx b/src/IGESDimen/IGESDimen_ToolCenterLine.cxx index e4334fd388..e67cfbd9fc 100644 --- a/src/IGESDimen/IGESDimen_ToolCenterLine.cxx +++ b/src/IGESDimen/IGESDimen_ToolCenterLine.cxx @@ -157,16 +157,16 @@ void IGESDimen_ToolCenterLine::OwnCheck void IGESDimen_ToolCenterLine::OwnDump (const Handle(IGESDimen_CenterLine)& ent, const IGESData_IGESDumper& /* dumper */, - const Handle(Message_Messenger)& S, const Standard_Integer level) const + Standard_OStream& S, const Standard_Integer level) const { - S << "IGESDimen_CenterLine" << Message_EndLine; - if (ent->IsCrossHair()) S << "Cross Hair" << Message_EndLine; - else S << "Through Circle Centers" << Message_EndLine; - S << "Data Type : " << ent->Datatype() << " "; - S << "Number of Data Points : " << ent->NbPoints() << " "; - S << "Common Z displacement : " << ent->ZDisplacement() << " "; - S << "Data Points : " << Message_EndLine; - IGESData_DumpListXYLZ(S ,level,1, ent->NbPoints(),ent->Point, + S << "IGESDimen_CenterLine\n"; + if (ent->IsCrossHair()) S << "Cross Hair\n"; + else S << "Through Circle Centers\n"; + S << "Data Type : " << ent->Datatype() << " " + << "Number of Data Points : " << ent->NbPoints() << " " + << "Common Z displacement : " << ent->ZDisplacement() << " " + << "Data Points :\n"; + IGESData_DumpListXYLZ(S,level,1, ent->NbPoints(),ent->Point, ent->Location(), ent->ZDisplacement()); - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESDimen/IGESDimen_ToolCenterLine.hxx b/src/IGESDimen/IGESDimen_ToolCenterLine.hxx index 7211c31004..04badadcc6 100644 --- a/src/IGESDimen/IGESDimen_ToolCenterLine.hxx +++ b/src/IGESDimen/IGESDimen_ToolCenterLine.hxx @@ -34,8 +34,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a CenterLine. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -74,7 +72,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESDimen_CenterLine)& entfrom, const Handle(IGESDimen_CenterLine)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESDimen_CenterLine)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESDimen_CenterLine)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESDimen/IGESDimen_ToolCurveDimension.cxx b/src/IGESDimen/IGESDimen_ToolCurveDimension.cxx index e3b4314403..75490ef5c9 100644 --- a/src/IGESDimen/IGESDimen_ToolCurveDimension.cxx +++ b/src/IGESDimen/IGESDimen_ToolCurveDimension.cxx @@ -153,30 +153,30 @@ void IGESDimen_ToolCurveDimension::OwnCheck void IGESDimen_ToolCurveDimension::OwnDump (const Handle(IGESDimen_CurveDimension)& 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 << "IGESDimen_CurveDimension" << Message_EndLine; - S << "General Note Entity : "; + S << "IGESDimen_CurveDimension\n" + << "General Note Entity : "; dumper.Dump(ent->Note(),S, sublevel); - S << Message_EndLine; - S << "First Curve Entity : "; + S << "\n" + << "First Curve Entity : "; dumper.Dump(ent->FirstCurve(),S, sublevel); - S << Message_EndLine; - S << "Second Curve Entity : "; + S << "\n" + << "Second Curve Entity : "; dumper.Dump(ent->SecondCurve(),S, sublevel); - S << Message_EndLine; - S << "First Leader Entity : "; + S << "\n" + << "First Leader Entity : "; dumper.Dump(ent->FirstLeader(),S, sublevel); - S << Message_EndLine; - S << "Second Leader Entity : "; + S << "\n" + << "Second Leader Entity : "; dumper.Dump(ent->SecondLeader(),S, sublevel); - S << Message_EndLine; - S << "First Witness Entity : "; + S << "\n" + << "First Witness Entity : "; dumper.Dump(ent->FirstWitnessLine(),S, sublevel); - S << Message_EndLine; - S << "Second Witness Entity : "; + S << "\n" + << "Second Witness Entity : "; dumper.Dump(ent->SecondWitnessLine(),S, sublevel); - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESDimen/IGESDimen_ToolCurveDimension.hxx b/src/IGESDimen/IGESDimen_ToolCurveDimension.hxx index 66a9d1b530..32c4d14139 100644 --- a/src/IGESDimen/IGESDimen_ToolCurveDimension.hxx +++ b/src/IGESDimen/IGESDimen_ToolCurveDimension.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a CurveDimension. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESDimen_CurveDimension)& entfrom, const Handle(IGESDimen_CurveDimension)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESDimen_CurveDimension)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESDimen_CurveDimension)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESDimen/IGESDimen_ToolDiameterDimension.cxx b/src/IGESDimen/IGESDimen_ToolDiameterDimension.cxx index 56082c2944..04aafef618 100644 --- a/src/IGESDimen/IGESDimen_ToolDiameterDimension.cxx +++ b/src/IGESDimen/IGESDimen_ToolDiameterDimension.cxx @@ -119,22 +119,22 @@ void IGESDimen_ToolDiameterDimension::OwnCheck void IGESDimen_ToolDiameterDimension::OwnDump (const Handle(IGESDimen_DiameterDimension)& 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 << "IGESDimen_DiameterDimension" << Message_EndLine; - S << "General Note Entity : "; + S << "IGESDimen_DiameterDimension\n" + << "General Note Entity : "; dumper.Dump(ent->Note(),S, sublevel); - S << Message_EndLine; - S << "First Leader Entity : "; + S << "\n" + << "First Leader Entity : "; dumper.Dump(ent->FirstLeader(),S, sublevel); - S << Message_EndLine; - S << "Second Leader Entity : "; + S << "\n" + << "Second Leader Entity : "; dumper.Dump(ent->SecondLeader(),S, sublevel); - S << Message_EndLine; - S << "Center Point : "; + S << "\n" + << "Center Point : "; IGESData_DumpXYL(S,level, ent->Center(), ent->Location()); - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESDimen/IGESDimen_ToolDiameterDimension.hxx b/src/IGESDimen/IGESDimen_ToolDiameterDimension.hxx index 14489ee319..681f73d09e 100644 --- a/src/IGESDimen/IGESDimen_ToolDiameterDimension.hxx +++ b/src/IGESDimen/IGESDimen_ToolDiameterDimension.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a DiameterDimension. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESDimen_DiameterDimension)& entfrom, const Handle(IGESDimen_DiameterDimension)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESDimen_DiameterDimension)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESDimen_DiameterDimension)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESDimen/IGESDimen_ToolDimensionDisplayData.cxx b/src/IGESDimen/IGESDimen_ToolDimensionDisplayData.cxx index 0802eea002..3d339a67ee 100644 --- a/src/IGESDimen/IGESDimen_ToolDimensionDisplayData.cxx +++ b/src/IGESDimen/IGESDimen_ToolDimensionDisplayData.cxx @@ -269,90 +269,87 @@ void IGESDimen_ToolDimensionDisplayData::OwnCheck void IGESDimen_ToolDimensionDisplayData::OwnDump (const Handle(IGESDimen_DimensionDisplayData)& ent, const IGESData_IGESDumper& /* dumper */, - const Handle(Message_Messenger)& S, const Standard_Integer level) const + Standard_OStream& S, const Standard_Integer level) const { - S << "IGESDimen_DimensionDisplayData" << Message_EndLine; - - S << "No. of property values : " << ent->NbPropertyValues() << Message_EndLine; - - S << "DimensionType : " << ent->DimensionType() ; + S << "IGESDimen_DimensionDisplayData\n" + << "No. of property values : " << ent->NbPropertyValues() << "\n" + << "DimensionType : " << ent->DimensionType() ; switch (ent->DimensionType()) { - case 0 : S << " (Ordinary)" << Message_EndLine; break; - case 1 : S << " (Reference)" << Message_EndLine; break; - case 2 : S << " (Basic)" << Message_EndLine; break; - default : S << " (Incorrect Value)" << Message_EndLine; break; + case 0 : S << " (Ordinary)\n"; break; + case 1 : S << " (Reference)\n"; break; + case 2 : S << " (Basic)\n"; break; + default : S << " (Incorrect Value)\n"; break; } S << "Preferred Label Position : " << ent->LabelPosition(); switch (ent->LabelPosition()) { - case 0 : S << " (Does not exist)" << Message_EndLine; break; - case 1 : S << " (Before Measurement)" << Message_EndLine; break; - case 2 : S << " (After Measurement)" << Message_EndLine; break; - case 3 : S << " (Above Measurement)" << Message_EndLine; break; - case 4 : S << " (Below Measurement)" << Message_EndLine; break; - default : S << " (Incorrect Value)" << Message_EndLine; break; + case 0 : S << " (Does not exist)\n"; break; + case 1 : S << " (Before Measurement)\n"; break; + case 2 : S << " (After Measurement)\n"; break; + case 3 : S << " (Above Measurement)\n"; break; + case 4 : S << " (Below Measurement)\n"; break; + default : S << " (Incorrect Value)\n"; break; } S << "Character set interpretation : " << ent->CharacterSet() ; switch (ent->CharacterSet()) { - case 1 : S << " (Standard ASCII)" << Message_EndLine; break; - case 1001 : S << " (Symbol Font 1)" << Message_EndLine; break; - case 1002 : S << " (Symbol Font 2)" << Message_EndLine; break; - case 1003 : S << " (Drafting Font)" << Message_EndLine; break; - default : S << " (Not meaningful)" << Message_EndLine; break; + case 1 : S << " (Standard ASCII)\n"; break; + case 1001 : S << " (Symbol Font 1)\n"; break; + case 1002 : S << " (Symbol Font 2)\n"; break; + case 1003 : S << " (Drafting Font)\n"; break; + default : S << " (Not meaningful)\n"; break; } S << "LString : "; IGESData_DumpString(S,ent->LString()); - S << Message_EndLine; + S << "\n" + << "Decimal Symbol : "; + if (ent->DecimalSymbol() == 0) S << "0 (.)\n"; + else S << "1 (,)\n"; - S << "Decimal Symbol : "; - if (ent->DecimalSymbol() == 0) S << "0 (.)" << Message_EndLine; - else S << "1 (,)" << Message_EndLine; - - S << "Witness Line Angle : " << ent->WitnessLineAngle() << Message_EndLine; - S << "Text Alignment : " ; - if (ent->TextAlignment() == 0 ) S << "0 (Horizontal)" << Message_EndLine; - else if (ent->TextAlignment() == 1 ) S << "1 (Parallel)" << Message_EndLine; - else S << ent->TextAlignment() << " (Incorrect Value)" << Message_EndLine; + S << "Witness Line Angle : " << ent->WitnessLineAngle() << "\n" + << "Text Alignment : " ; + if (ent->TextAlignment() == 0 ) S << "0 (Horizontal)\n"; + else if (ent->TextAlignment() == 1 ) S << "1 (Parallel)\n"; + else S << ent->TextAlignment() << " (Incorrect Value)\n"; S << "Text Level : " << ent->TextLevel(); switch (ent->TextLevel()) { - case 0 : S << " (Neither above nor below)" << Message_EndLine; break; - case 1 : S << " (Above)" << Message_EndLine; break; - case 2 : S << " (Below)" << Message_EndLine; break; - default : S << " (Incorrect Value)" << Message_EndLine; break; + case 0 : S << " (Neither above nor below)\n"; break; + case 1 : S << " (Above)\n"; break; + case 2 : S << " (Below)\n"; break; + default : S << " (Incorrect Value)\n"; break; } S << "Preferred Text placement : " << ent->TextPlacement(); switch (ent->TextPlacement()) { - case 0 : S << " (Between witness lines)" << Message_EndLine; break; - case 1 : S << " (Outside near the first witness line)" << Message_EndLine; break; - case 2 : S << " (Outside near second witness line)" << Message_EndLine; break; - default : S << " (Incorrect Value)" << Message_EndLine; break; + case 0 : S << " (Between witness lines)\n"; break; + case 1 : S << " (Outside near the first witness line)\n"; break; + case 2 : S << " (Outside near second witness line)\n"; break; + default : S << " (Incorrect Value)\n"; break; } S << "Arrow Head Orientation : " << ent->ArrowHeadOrientation(); - if (ent->ArrowHeadOrientation() == 0) S << " (In, pointing out)" <ArrowHeadOrientation() == 1) S << " (Out, pointing in)" <ArrowHeadOrientation() == 0) S << " (In, pointing out)\n"; + else if (ent->ArrowHeadOrientation() == 1) S << " (Out, pointing in)\n"; + else S << " (Incorrect Value)\n"; Standard_Integer nbnotes = ent->NbSupplementaryNotes(); - S << " Primary Dimension Value : " << ent->InitialValue() << Message_EndLine; - S << " Number of Supplementary Notes : " << nbnotes <InitialValue() << "\n" + << " Number of Supplementary Notes : " << nbnotes << "\n" + << "Supplementary Notes , " + << " Start Index , " + << " End Index :\n"; IGESData_DumpVals(S,-level,1, nbnotes,ent->EndIndex); - S << Message_EndLine; + S << "\n"; if (level > 4) for (Standard_Integer i = 1; i <= nbnotes; i ++) { - S << "[" << i << "]: " << Message_EndLine; - S << "Supplementary Note : " << ent->SupplementaryNote(i); - S << ", Start Index : " << ent->StartIndex(i); - S << ", End Index : " << ent->EndIndex(i) << Message_EndLine; + S << "[" << i << "]:\n" + << "Supplementary Note : " << ent->SupplementaryNote(i) + << ", Start Index : " << ent->StartIndex(i) + << ", End Index : " << ent->EndIndex(i) << "\n"; } - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESDimen/IGESDimen_ToolDimensionDisplayData.hxx b/src/IGESDimen/IGESDimen_ToolDimensionDisplayData.hxx index 4da8605a02..7d6cdb2b06 100644 --- a/src/IGESDimen/IGESDimen_ToolDimensionDisplayData.hxx +++ b/src/IGESDimen/IGESDimen_ToolDimensionDisplayData.hxx @@ -34,8 +34,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a DimensionDisplayData. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -74,7 +72,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESDimen_DimensionDisplayData)& entfrom, const Handle(IGESDimen_DimensionDisplayData)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESDimen_DimensionDisplayData)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESDimen_DimensionDisplayData)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESDimen/IGESDimen_ToolDimensionTolerance.cxx b/src/IGESDimen/IGESDimen_ToolDimensionTolerance.cxx index 6c0e43659a..47a0f5af18 100644 --- a/src/IGESDimen/IGESDimen_ToolDimensionTolerance.cxx +++ b/src/IGESDimen/IGESDimen_ToolDimensionTolerance.cxx @@ -153,17 +153,17 @@ void IGESDimen_ToolDimensionTolerance::OwnCheck void IGESDimen_ToolDimensionTolerance::OwnDump (const Handle(IGESDimen_DimensionTolerance)& ent, const IGESData_IGESDumper& /*dumper*/, - const Handle(Message_Messenger)& S, const Standard_Integer /*level*/) const + Standard_OStream& S, const Standard_Integer /*level*/) const { - S << "IGESDimen_DimensionTolerance" << Message_EndLine; - S << "Number of property values : " << ent->NbPropertyValues() << Message_EndLine; - S << "Secondary Tolerance Flag : " << ent->SecondaryToleranceFlag() << Message_EndLine; - S << "Tolerance Type : " << ent->ToleranceType() << Message_EndLine; - S << "Tolerance Placement Flag : " << ent->TolerancePlacementFlag() << Message_EndLine; - S << "Upper Tolerance : " << ent->UpperTolerance() << Message_EndLine; - S << "Lower Tolerance : " << ent->LowerTolerance() << Message_EndLine; - S << "Sign Suppression Flag : " << ( ent->SignSuppressionFlag() ? "True" : "False" ) << Message_EndLine; - S << "Fraction Flag : " << ent->FractionFlag() << Message_EndLine; - S << "Precision : " << ent->Precision() << Message_EndLine; + S << "IGESDimen_DimensionTolerance\n" + << "Number of property values : " << ent->NbPropertyValues() << "\n" + << "Secondary Tolerance Flag : " << ent->SecondaryToleranceFlag() << "\n" + << "Tolerance Type : " << ent->ToleranceType() << "\n" + << "Tolerance Placement Flag : " << ent->TolerancePlacementFlag() << "\n" + << "Upper Tolerance : " << ent->UpperTolerance() << "\n" + << "Lower Tolerance : " << ent->LowerTolerance() << "\n" + << "Sign Suppression Flag : " << ( ent->SignSuppressionFlag() ? "True" : "False" ) << "\n" + << "Fraction Flag : " << ent->FractionFlag() << "\n" + << "Precision : " << ent->Precision() << std::endl; } diff --git a/src/IGESDimen/IGESDimen_ToolDimensionTolerance.hxx b/src/IGESDimen/IGESDimen_ToolDimensionTolerance.hxx index 32f0ffe889..b7f675e4e7 100644 --- a/src/IGESDimen/IGESDimen_ToolDimensionTolerance.hxx +++ b/src/IGESDimen/IGESDimen_ToolDimensionTolerance.hxx @@ -34,8 +34,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a DimensionTolerance. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -74,7 +72,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESDimen_DimensionTolerance)& entfrom, const Handle(IGESDimen_DimensionTolerance)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESDimen_DimensionTolerance)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESDimen_DimensionTolerance)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESDimen/IGESDimen_ToolDimensionUnits.cxx b/src/IGESDimen/IGESDimen_ToolDimensionUnits.cxx index beeddd408f..653bf09d8d 100644 --- a/src/IGESDimen/IGESDimen_ToolDimensionUnits.cxx +++ b/src/IGESDimen/IGESDimen_ToolDimensionUnits.cxx @@ -149,18 +149,18 @@ void IGESDimen_ToolDimensionUnits::OwnCheck void IGESDimen_ToolDimensionUnits::OwnDump (const Handle(IGESDimen_DimensionUnits)& ent, const IGESData_IGESDumper& /* dumper */, - const Handle(Message_Messenger)& S, const Standard_Integer /* level */) const + Standard_OStream& S, const Standard_Integer /* level */) const { - S << "IGESDimen_DimensionUnits" << Message_EndLine; - S << "Number of property values : " << ent->NbPropertyValues() << Message_EndLine; - S << "Secondary Dimension Position : " << ent->SecondaryDimenPosition() << Message_EndLine; - S << "Units Indicator : " << ent->UnitsIndicator() << Message_EndLine; - S << "Character Set : " << ent->CharacterSet() << Message_EndLine; - S << "Format String : "; + S << "IGESDimen_DimensionUnits\n" + << "Number of property values : " << ent->NbPropertyValues() << "\n" + << "Secondary Dimension Position : " << ent->SecondaryDimenPosition() << "\n" + << "Units Indicator : " << ent->UnitsIndicator() << "\n" + << "Character Set : " << ent->CharacterSet() << "\n" + << "Format String : "; IGESData_DumpString(S,ent->FormatString()); - S << Message_EndLine; - S << "Fraction Flag : " << ent->FractionFlag(); + S << "\n" + << "Fraction Flag : " << ent->FractionFlag(); if (ent->FractionFlag() == 0) S << " Decimal , Precision : "; else S << " Fraction , Denominator : "; - S << ent->PrecisionOrDenominator() << Message_EndLine; + S << ent->PrecisionOrDenominator() << std::endl; } diff --git a/src/IGESDimen/IGESDimen_ToolDimensionUnits.hxx b/src/IGESDimen/IGESDimen_ToolDimensionUnits.hxx index 3ea10e7c5e..da61ff6d5e 100644 --- a/src/IGESDimen/IGESDimen_ToolDimensionUnits.hxx +++ b/src/IGESDimen/IGESDimen_ToolDimensionUnits.hxx @@ -34,8 +34,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a DimensionUnits. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -74,7 +72,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESDimen_DimensionUnits)& entfrom, const Handle(IGESDimen_DimensionUnits)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESDimen_DimensionUnits)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESDimen_DimensionUnits)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESDimen/IGESDimen_ToolDimensionedGeometry.cxx b/src/IGESDimen/IGESDimen_ToolDimensionedGeometry.cxx index 7d1b01a590..b67e7e3271 100644 --- a/src/IGESDimen/IGESDimen_ToolDimensionedGeometry.cxx +++ b/src/IGESDimen/IGESDimen_ToolDimensionedGeometry.cxx @@ -32,7 +32,6 @@ #include #include #include -#include #include IGESDimen_ToolDimensionedGeometry::IGESDimen_ToolDimensionedGeometry () { } @@ -147,18 +146,18 @@ void IGESDimen_ToolDimensionedGeometry::OwnCheck void IGESDimen_ToolDimensionedGeometry::OwnDump (const Handle(IGESDimen_DimensionedGeometry)& ent, const IGESData_IGESDumper& dumper, - const Handle(Message_Messenger)& S, const Standard_Integer level) const + Standard_OStream& S, const Standard_Integer level) const { - S << "IGESDimen_DimensionedGeometry" << Message_EndLine; + S << "IGESDimen_DimensionedGeometry\n"; //Standard_Integer lower = 1; //szv#4:S4163:12Mar99 unused // Standard_Integer upper = ent->NbGeometryEntities(); - S << "Number of Dimensions : " << ent->NbDimensions() << Message_EndLine; - S << "Dimension Entity : "; + S << "Number of Dimensions : " << ent->NbDimensions() << "\n" + << "Dimension Entity : "; dumper.Dump(ent->DimensionEntity(),S,(level <= 4) ? 0 : 1); - S << Message_EndLine; - S << "Geometry Entities : "; + S << "\n" + << "Geometry Entities : "; IGESData_DumpEntities(S,dumper ,level,1, ent->NbGeometryEntities(),ent->GeometryEntity); - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESDimen/IGESDimen_ToolDimensionedGeometry.hxx b/src/IGESDimen/IGESDimen_ToolDimensionedGeometry.hxx index 5908793944..62703d8cab 100644 --- a/src/IGESDimen/IGESDimen_ToolDimensionedGeometry.hxx +++ b/src/IGESDimen/IGESDimen_ToolDimensionedGeometry.hxx @@ -34,8 +34,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a DimensionedGeometry. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -74,7 +72,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESDimen_DimensionedGeometry)& entfrom, const Handle(IGESDimen_DimensionedGeometry)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESDimen_DimensionedGeometry)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESDimen_DimensionedGeometry)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESDimen/IGESDimen_ToolFlagNote.cxx b/src/IGESDimen/IGESDimen_ToolFlagNote.cxx index f6ff385768..355525a5bc 100644 --- a/src/IGESDimen/IGESDimen_ToolFlagNote.cxx +++ b/src/IGESDimen/IGESDimen_ToolFlagNote.cxx @@ -34,7 +34,6 @@ #include #include #include -#include #include IGESDimen_ToolFlagNote::IGESDimen_ToolFlagNote () { } @@ -148,18 +147,18 @@ void IGESDimen_ToolFlagNote::OwnCheck void IGESDimen_ToolFlagNote::OwnDump (const Handle(IGESDimen_FlagNote)& 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 << "IGESDimen_FlagNote" << Message_EndLine; - S << "LowerLeftCorner : "; + S << "IGESDimen_FlagNote\n" + << "LowerLeftCorner : "; IGESData_DumpXYZL(S,level, ent->LowerLeftCorner(), ent->Location()); - S << Message_EndLine << "Rotation Angle: " << ent->Angle() << Message_EndLine; - S << "General Note Entity : "; + S << "\nRotation Angle: " << ent->Angle() << "\n" + << "General Note Entity : "; dumper.Dump(ent->Note(),S, sublevel); - S << Message_EndLine; - S << "Number of Leaders : " << ent->NbLeaders() << " Leaders : "; + S << "\n" + << "Number of Leaders : " << ent->NbLeaders() << " Leaders : "; IGESData_DumpEntities(S,dumper ,level,1, ent->NbLeaders(),ent->Leader); - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESDimen/IGESDimen_ToolFlagNote.hxx b/src/IGESDimen/IGESDimen_ToolFlagNote.hxx index 1e9f41ec4b..83ce5b0be8 100644 --- a/src/IGESDimen/IGESDimen_ToolFlagNote.hxx +++ b/src/IGESDimen/IGESDimen_ToolFlagNote.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a FlagNote. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESDimen_FlagNote)& entfrom, const Handle(IGESDimen_FlagNote)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESDimen_FlagNote)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESDimen_FlagNote)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESDimen/IGESDimen_ToolGeneralLabel.cxx b/src/IGESDimen/IGESDimen_ToolGeneralLabel.cxx index 5b57e17b53..a90e2d516b 100644 --- a/src/IGESDimen/IGESDimen_ToolGeneralLabel.cxx +++ b/src/IGESDimen/IGESDimen_ToolGeneralLabel.cxx @@ -129,17 +129,17 @@ void IGESDimen_ToolGeneralLabel::OwnCheck void IGESDimen_ToolGeneralLabel::OwnDump (const Handle(IGESDimen_GeneralLabel)& 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 << "IGESDimen_GeneralLabel" << Message_EndLine; - S << "General Note Entity : "; + S << "IGESDimen_GeneralLabel\n" + << "General Note Entity : "; dumper.Dump(ent->Note(),S, sublevel); - S << Message_EndLine; - S << "Number of Leaders : " << ent->NbLeaders() << Message_EndLine; - S << "Leaders : "; + S << "\n" + << "Number of Leaders : " << ent->NbLeaders() << "\n" + << "Leaders : "; IGESData_DumpEntities(S,dumper ,level,1, ent->NbLeaders(),ent->Leader); - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESDimen/IGESDimen_ToolGeneralLabel.hxx b/src/IGESDimen/IGESDimen_ToolGeneralLabel.hxx index f841d074e2..990e3ef547 100644 --- a/src/IGESDimen/IGESDimen_ToolGeneralLabel.hxx +++ b/src/IGESDimen/IGESDimen_ToolGeneralLabel.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a GeneralLabel. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESDimen_GeneralLabel)& entfrom, const Handle(IGESDimen_GeneralLabel)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESDimen_GeneralLabel)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESDimen_GeneralLabel)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESDimen/IGESDimen_ToolGeneralNote.cxx b/src/IGESDimen/IGESDimen_ToolGeneralNote.cxx index b8f04fcf04..4f72799f3c 100644 --- a/src/IGESDimen/IGESDimen_ToolGeneralNote.cxx +++ b/src/IGESDimen/IGESDimen_ToolGeneralNote.cxx @@ -332,53 +332,53 @@ void IGESDimen_ToolGeneralNote::OwnCheck void IGESDimen_ToolGeneralNote::OwnDump (const Handle(IGESDimen_GeneralNote)& 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; Standard_Integer upper = ent->NbStrings(); - S << "IGESDimen_GeneralNote" << Message_EndLine; - S << "Number of Text Strings : " << upper << Message_EndLine; - S << "Number of Characters : " << Message_EndLine; - S << "Box Widths : " << Message_EndLine; - S << "Box Heights : " << Message_EndLine; - S << "Font Codes : " << Message_EndLine; - S << "Font Entities : " << Message_EndLine; - S << "Slant Angles : " << Message_EndLine; - S << "Rotation Angles : " << Message_EndLine; - S << "Mirror Flags : " << Message_EndLine; - S << "Rotate Flags : " << Message_EndLine; - S << "Start Points : " << Message_EndLine; - S << "Texts : "; + S << "IGESDimen_GeneralNote\n" + << "Number of Text Strings : " << upper << "\n" + << "Number of Characters :\n" + << "Box Widths :\n" + << "Box Heights :\n" + << "Font Codes :\n" + << "Font Entities :\n" + << "Slant Angles :\n" + << "Rotation Angles :\n" + << "Mirror Flags :\n" + << "Rotate Flags :\n" + << "Start Points :\n" + << "Texts : "; IGESData_DumpVals(S,-level,1, ent->NbStrings(),ent->NbCharacters); - S << Message_EndLine; + S << "\n"; if (level > 4) { - S << "Details of each String" << Message_EndLine; + S << "Details of each String\n"; for ( Standard_Integer i = 1; i <= upper; i++) { - S << "[" << i << "]: " << Message_EndLine; - S << "Number of Characters : " << ent->NbCharacters(i) << " "; - S << "Box Width : " << ent->BoxWidth(i) << " "; - S << "Box Height : " << ent->BoxHeight(i) << Message_EndLine; + S << "[" << i << "]:\n" + << "Number of Characters : " << ent->NbCharacters(i) << " " + << "Box Width : " << ent->BoxWidth(i) << " " + << "Box Height : " << ent->BoxHeight(i) << "\n"; if (ent->IsFontEntity(i)) { S << "Font Entity : "; dumper.Dump (ent->FontEntity(i),S, sublevel); - S << Message_EndLine; + S << "\n"; } else - S << "Font Code : " << ent->FontCode(i) << Message_EndLine; - S << "Slant Angle : " << ent->SlantAngle(i) << " "; - S << "Rotation Angle : " << ent->RotationAngle(i) << " "; - S << "Mirror Flag : " << ent->MirrorFlag(i) << " "; - S << "Rotate Flag : " << ent->RotateFlag(i) << Message_EndLine; - S << "Start Point : "; + S << "Font Code : " << ent->FontCode(i) << "\n" + << "Slant Angle : " << ent->SlantAngle(i) << " " + << "Rotation Angle : " << ent->RotationAngle(i) << " " + << "Mirror Flag : " << ent->MirrorFlag(i) << " " + << "Rotate Flag : " << ent->RotateFlag(i) << "\n" + << "Start Point : "; IGESData_DumpXYZL(S,level, ent->StartPoint(i), ent->Location()); S << "\nText : "; IGESData_DumpString(S,ent->Text(i)); - S << Message_EndLine; + S << "\n"; } } - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESDimen/IGESDimen_ToolGeneralNote.hxx b/src/IGESDimen/IGESDimen_ToolGeneralNote.hxx index c1c0debc71..712c4745a0 100644 --- a/src/IGESDimen/IGESDimen_ToolGeneralNote.hxx +++ b/src/IGESDimen/IGESDimen_ToolGeneralNote.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a GeneralNote. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESDimen_GeneralNote)& entfrom, const Handle(IGESDimen_GeneralNote)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESDimen_GeneralNote)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESDimen_GeneralNote)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESDimen/IGESDimen_ToolGeneralSymbol.cxx b/src/IGESDimen/IGESDimen_ToolGeneralSymbol.cxx index 869047e0c7..b313127b14 100644 --- a/src/IGESDimen/IGESDimen_ToolGeneralSymbol.cxx +++ b/src/IGESDimen/IGESDimen_ToolGeneralSymbol.cxx @@ -173,15 +173,15 @@ void IGESDimen_ToolGeneralSymbol::OwnCheck void IGESDimen_ToolGeneralSymbol::OwnDump (const Handle(IGESDimen_GeneralSymbol)& 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 << "IGESDimen_GeneralSymbol" << Message_EndLine; - S << "General Note : "; + S << "IGESDimen_GeneralSymbol\n" + << "General Note : "; dumper.Dump(ent->Note(),S, sublevel); - S << Message_EndLine << "Geometric Entities : "; + S << "\nGeometric Entities : "; IGESData_DumpEntities(S,dumper ,level,1, ent->NbGeomEntities(),ent->GeomEntity); - S << Message_EndLine << "Leader Arrows : "; + S << "\nLeader Arrows : "; IGESData_DumpEntities(S,dumper ,level,1, ent->NbLeaders(),ent->LeaderArrow); - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESDimen/IGESDimen_ToolGeneralSymbol.hxx b/src/IGESDimen/IGESDimen_ToolGeneralSymbol.hxx index 5c890de71e..1e32272e7c 100644 --- a/src/IGESDimen/IGESDimen_ToolGeneralSymbol.hxx +++ b/src/IGESDimen/IGESDimen_ToolGeneralSymbol.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a GeneralSymbol. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESDimen_GeneralSymbol)& entfrom, const Handle(IGESDimen_GeneralSymbol)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESDimen_GeneralSymbol)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESDimen_GeneralSymbol)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESDimen/IGESDimen_ToolLeaderArrow.cxx b/src/IGESDimen/IGESDimen_ToolLeaderArrow.cxx index 47d5e0a8aa..8745ad73b9 100644 --- a/src/IGESDimen/IGESDimen_ToolLeaderArrow.cxx +++ b/src/IGESDimen/IGESDimen_ToolLeaderArrow.cxx @@ -32,7 +32,6 @@ #include #include #include -#include #include #include @@ -142,17 +141,17 @@ void IGESDimen_ToolLeaderArrow::OwnCheck void IGESDimen_ToolLeaderArrow::OwnDump (const Handle(IGESDimen_LeaderArrow)& ent, const IGESData_IGESDumper& /* dumper */, - const Handle(Message_Messenger)& S, const Standard_Integer level) const + Standard_OStream& S, const Standard_Integer level) const { - S << "IGESDimen_LeaderArrow" << Message_EndLine; - S << "Number of Segments : " << ent->NbSegments() << Message_EndLine; - S << "Arrowhead Height : " << ent->ArrowHeadHeight() << Message_EndLine; - S << "Arrowhead Width : " << ent->ArrowHeadWidth() << Message_EndLine; - S << "Z depth : " << ent->ZDepth() << Message_EndLine; - S << "Arrowhead co-ords : "; + S << "IGESDimen_LeaderArrow\n" + << "Number of Segments : " << ent->NbSegments() << "\n" + << "Arrowhead Height : " << ent->ArrowHeadHeight() << "\n" + << "Arrowhead Width : " << ent->ArrowHeadWidth() << "\n" + << "Z depth : " << ent->ZDepth() << "\n" + << "Arrowhead co-ords : "; IGESData_DumpXYLZ(S,level,ent->ArrowHead(),ent->Location(),ent->ZDepth()); - S << Message_EndLine << "Segment Tails : "; - IGESData_DumpListXYLZ(S ,level,1, ent->NbSegments(),ent->SegmentTail, + S << "\nSegment Tails : "; + IGESData_DumpListXYLZ(S,level,1, ent->NbSegments(),ent->SegmentTail, ent->Location(), ent->ZDepth()); - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESDimen/IGESDimen_ToolLeaderArrow.hxx b/src/IGESDimen/IGESDimen_ToolLeaderArrow.hxx index 56dc806a84..842e37525b 100644 --- a/src/IGESDimen/IGESDimen_ToolLeaderArrow.hxx +++ b/src/IGESDimen/IGESDimen_ToolLeaderArrow.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a LeaderArrow. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESDimen_LeaderArrow)& entfrom, const Handle(IGESDimen_LeaderArrow)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESDimen_LeaderArrow)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESDimen_LeaderArrow)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESDimen/IGESDimen_ToolLinearDimension.cxx b/src/IGESDimen/IGESDimen_ToolLinearDimension.cxx index ec976812db..b539708969 100644 --- a/src/IGESDimen/IGESDimen_ToolLinearDimension.cxx +++ b/src/IGESDimen/IGESDimen_ToolLinearDimension.cxx @@ -32,7 +32,6 @@ #include #include #include -#include #include IGESDimen_ToolLinearDimension::IGESDimen_ToolLinearDimension () { } @@ -130,28 +129,28 @@ void IGESDimen_ToolLinearDimension::OwnCheck void IGESDimen_ToolLinearDimension::OwnDump (const Handle(IGESDimen_LinearDimension)& 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 << "IGESDimen_LinearDimension" << Message_EndLine; - if (ent->FormNumber() == 0) S << " (Undetermined Form)" << Message_EndLine; - else if (ent->FormNumber() == 1) S << " (Diameter Form)" << Message_EndLine; - else if (ent->FormNumber() == 2) S << " (Radius Form)" << Message_EndLine; + S << "IGESDimen_LinearDimension\n"; + if (ent->FormNumber() == 0) S << " (Undetermined Form)\n"; + else if (ent->FormNumber() == 1) S << " (Diameter Form)\n"; + else if (ent->FormNumber() == 2) S << " (Radius Form)\n"; S << "General Note Entity : "; dumper.Dump(ent->Note(),S, sublevel); - S << Message_EndLine; - S << "First Leader Entity : "; + S << "\n" + << "First Leader Entity : "; dumper.Dump(ent->FirstLeader(),S, sublevel); - S << Message_EndLine; - S << "Second Leader Entity : "; + S << "\n" + << "Second Leader Entity : "; dumper.Dump(ent->SecondLeader(),S, sublevel); - S << Message_EndLine; - S << "First Witness Entity : "; + S << "\n" + << "First Witness Entity : "; dumper.Dump(ent->FirstWitness(),S, sublevel); - S << Message_EndLine; - S << "Second Witness Entity : "; + S << "\n" + << "Second Witness Entity : "; dumper.Dump(ent->SecondWitness(),S, sublevel); - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESDimen/IGESDimen_ToolLinearDimension.hxx b/src/IGESDimen/IGESDimen_ToolLinearDimension.hxx index 0f33ccede4..d9b631d597 100644 --- a/src/IGESDimen/IGESDimen_ToolLinearDimension.hxx +++ b/src/IGESDimen/IGESDimen_ToolLinearDimension.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a LinearDimension. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESDimen_LinearDimension)& entfrom, const Handle(IGESDimen_LinearDimension)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESDimen_LinearDimension)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESDimen_LinearDimension)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESDimen/IGESDimen_ToolNewDimensionedGeometry.cxx b/src/IGESDimen/IGESDimen_ToolNewDimensionedGeometry.cxx index ec333b53a3..9f9299f029 100644 --- a/src/IGESDimen/IGESDimen_ToolNewDimensionedGeometry.cxx +++ b/src/IGESDimen/IGESDimen_ToolNewDimensionedGeometry.cxx @@ -212,31 +212,31 @@ void IGESDimen_ToolNewDimensionedGeometry::OwnCheck void IGESDimen_ToolNewDimensionedGeometry::OwnDump (const Handle(IGESDimen_NewDimensionedGeometry)& 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, sublevel = (level > 4) ? 1 : 0; - S << "IGESDimen_NewDimensionedGeometry" << Message_EndLine; - S << "Number of Dimensions : " << ent->NbDimensions() << Message_EndLine; - S << "Dimension Entity : "; + S << "IGESDimen_NewDimensionedGeometry\n" + << "Number of Dimensions : " << ent->NbDimensions() << "\n" + << "Dimension Entity : "; dumper.Dump(ent->DimensionEntity(),S, sublevel); - S << Message_EndLine; - S << "Dimension Orientation Flag : " << ent->DimensionOrientationFlag() << Message_EndLine; - S << "Angle Value Flag : " << ent->AngleValue() << Message_EndLine; - S << "Geometry Entities : " << Message_EndLine; - S << "Dimension Location Flags : " << Message_EndLine; - S << "Points : "; + S << "\n" + << "Dimension Orientation Flag : " << ent->DimensionOrientationFlag() << "\n" + << "Angle Value Flag : " << ent->AngleValue() << "\n" + << "Geometry Entities :\n" + << "Dimension Location Flags :\n" + << "Points : "; IGESData_DumpEntities(S,dumper,-level,1, ent->NbGeometries(),ent->GeometryEntity); - S << Message_EndLine; + S << "\n"; if (level > 4) for ( num = ent->NbGeometries(), i = 1; i <= num; i++ ) { - S << "[" << i << "]: " << Message_EndLine; - S << "Geometry Entity : "; + S << "[" << i << "]:\n" + << "Geometry Entity : "; dumper.Dump (ent->GeometryEntity(i),S, 1); - S << Message_EndLine; - S << "Dimension Location Flag : " << ent->DimensionLocationFlag(i) << Message_EndLine; - S << "Point : "; + S << "\n" + << "Dimension Location Flag : " << ent->DimensionLocationFlag(i) << "\n" + << "Point : "; IGESData_DumpXYZL(S,level, ent->Point(i), ent->Location()); } - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESDimen/IGESDimen_ToolNewDimensionedGeometry.hxx b/src/IGESDimen/IGESDimen_ToolNewDimensionedGeometry.hxx index 3095fc81a5..dc09685bcc 100644 --- a/src/IGESDimen/IGESDimen_ToolNewDimensionedGeometry.hxx +++ b/src/IGESDimen/IGESDimen_ToolNewDimensionedGeometry.hxx @@ -34,8 +34,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a NewDimensionedGeometry. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -74,7 +72,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESDimen_NewDimensionedGeometry)& entfrom, const Handle(IGESDimen_NewDimensionedGeometry)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESDimen_NewDimensionedGeometry)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESDimen_NewDimensionedGeometry)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESDimen/IGESDimen_ToolNewGeneralNote.cxx b/src/IGESDimen/IGESDimen_ToolNewGeneralNote.cxx index d42b25e92f..2dbbd06afb 100644 --- a/src/IGESDimen/IGESDimen_ToolNewGeneralNote.cxx +++ b/src/IGESDimen/IGESDimen_ToolNewGeneralNote.cxx @@ -458,82 +458,82 @@ void IGESDimen_ToolNewGeneralNote::OwnCheck void IGESDimen_ToolNewGeneralNote::OwnDump (const Handle(IGESDimen_NewGeneralNote)& 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; Standard_Integer nbval = ent->NbStrings(); - S << "IGESDimen_NewGeneralNote" << Message_EndLine; - S << "Text Area : Width : " << ent->TextWidth() << " "; - S << "Height : " << ent->TextHeight() << " "; - S << "Justification Code : " << ent->JustifyCode() << Message_EndLine; - S << "Text Area Location Point : "; + S << "IGESDimen_NewGeneralNote\n" + << "Text Area : Width : " << ent->TextWidth() << " " + << "Height : " << ent->TextHeight() << " " + << "Justification Code : " << ent->JustifyCode() << "\n" + << "Text Area Location Point : "; IGESData_DumpXYZL(S,level, ent->AreaLocation(), ent->Location()); - S << "Rotation Angle of Text : " << ent->AreaRotationAngle() << Message_EndLine; - S << "Base Line Position : "; + S << "Rotation Angle of Text : " << ent->AreaRotationAngle() << "\n" + << "Base Line Position : "; IGESData_DumpXYZL(S,level, ent->BaseLinePosition(), ent->Location()); - S << "Normal Interline Spacing : " << ent->NormalInterlineSpace() << Message_EndLine; - S << "Number of Text Strings : " << nbval << Message_EndLine; + S << "Normal Interline Spacing : " << ent->NormalInterlineSpace() << "\n" + << "Number of Text Strings : " << nbval << "\n"; - S << "Character Display : " << Message_EndLine; - S << "Character Width : " << Message_EndLine; - S << "Character Height : " << Message_EndLine; - S << "Inter Character Spacing : " << Message_EndLine; - S << "Interline Spacing : " << Message_EndLine; - S << "Font Styles : " << Message_EndLine; - S << "Character Angle : " << Message_EndLine; - S << "Control Code String : " << Message_EndLine; - S << "Number of Characters : " << Message_EndLine; - S << "Box Widths : " << Message_EndLine; - S << "Box Heights : " << Message_EndLine; - S << "Character Set Codes : " << Message_EndLine; - S << "Character Set Entities : " << Message_EndLine; - S << "Slant Angles : " << Message_EndLine; - S << "Rotation Angles : " << Message_EndLine; - S << "Mirror Flags : " << Message_EndLine; - S << "Rotate Flags : " << Message_EndLine; - S << "Start Points : " << Message_EndLine; - S << "Texts : "; + S << "Character Display :\n" + << "Character Width :\n" + << "Character Height :\n" + << "Inter Character Spacing :\n" + << "Interline Spacing :\n" + << "Font Styles :\n" + << "Character Angle :\n" + << "Control Code String :\n" + << "Number of Characters :\n" + << "Box Widths :\n" + << "Box Heights :\n" + << "Character Set Codes :\n" + << "Character Set Entities :\n" + << "Slant Angles :\n" + << "Rotation Angles :\n" + << "Mirror Flags :\n" + << "Rotate Flags :\n" + << "Start Points :\n" + << "Texts : "; IGESData_DumpVals(S,-level,1, nbval, ent->NbCharacters); - S << Message_EndLine; + S << "\n"; if (level > 4) { - S << "Details of each String" << Message_EndLine; + S << "Details of each String\n"; for ( Standard_Integer i = 1; i <= nbval; i++) { - S << "[" << i << "]: " << Message_EndLine; - S << "Character Display : " << ent->CharacterDisplay(i) << " "; - S << "Character Width : " << ent->CharacterWidth(i) << " "; - S << "Character Height : " << ent->CharacterHeight(i) << Message_EndLine; - S << "Inter Character Spacing : "<InterCharacterSpace(i)<<" "; - S << "Interline Spacing : " << ent->InterlineSpace(i) << Message_EndLine; - S << "Font Styles : " << ent->FontStyle(i) << Message_EndLine; - S << "Character Angle : " << ent->CharacterAngle(i) << Message_EndLine; - S << "Control Code String : " ; + S << "[" << i << "]:\n" + << "Character Display : " << ent->CharacterDisplay(i) << " " + << "Character Width : " << ent->CharacterWidth(i) << " " + << "Character Height : " << ent->CharacterHeight(i) << "\n" + << "Inter Character Spacing : "<InterCharacterSpace(i)<<" " + << "Interline Spacing : " << ent->InterlineSpace(i) << "\n" + << "Font Styles : " << ent->FontStyle(i) << "\n" + << "Character Angle : " << ent->CharacterAngle(i) << "\n" + << "Control Code String : " ; IGESData_DumpString(S,ent->ControlCodeString(i)); - S << Message_EndLine; - S << "Number of Characters : " << ent->NbCharacters(i) << " "; - S << "Box Width : " << ent->BoxWidth(i) << " "; - S << "Box Height : " << ent->BoxHeight(i) << Message_EndLine; + S << "\n" + << "Number of Characters : " << ent->NbCharacters(i) << " " + << "Box Width : " << ent->BoxWidth(i) << " " + << "Box Height : " << ent->BoxHeight(i) << "\n"; if (ent->IsCharSetEntity(i)) { S << "Character Set Entity : "; dumper.Dump (ent->CharSetEntity(i),S, sublevel); - S << Message_EndLine; + S << "\n"; } else - S << "Character Set Code : " << ent->CharSetCode(i) << Message_EndLine; + S << "Character Set Code : " << ent->CharSetCode(i) << "\n" - S << "Slant Angle : " << ent->SlantAngle(i) << " "; - S << "Rotation Angle : " << ent->RotationAngle(i) << " "; - S << "Mirror Flag : " << ent->MirrorFlag(i) << " "; - S << "Rotate Flag : " << ent->RotateFlag(i) << Message_EndLine; - S << "Start Point : "; + << "Slant Angle : " << ent->SlantAngle(i) << " " + << "Rotation Angle : " << ent->RotationAngle(i) << " " + << "Mirror Flag : " << ent->MirrorFlag(i) << " " + << "Rotate Flag : " << ent->RotateFlag(i) << "\n" + << "Start Point : "; IGESData_DumpXYZL(S,level, ent->StartPoint(i), ent->Location()); S << "Text : "; IGESData_DumpString(S,ent->Text(i)); - S << Message_EndLine; + S << "\n"; } } - else S << Message_EndLine; + else S << std::endl; } diff --git a/src/IGESDimen/IGESDimen_ToolNewGeneralNote.hxx b/src/IGESDimen/IGESDimen_ToolNewGeneralNote.hxx index 5ac4ce34da..d6588ddd6f 100644 --- a/src/IGESDimen/IGESDimen_ToolNewGeneralNote.hxx +++ b/src/IGESDimen/IGESDimen_ToolNewGeneralNote.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a NewGeneralNote. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESDimen_NewGeneralNote)& entfrom, const Handle(IGESDimen_NewGeneralNote)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESDimen_NewGeneralNote)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESDimen_NewGeneralNote)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESDimen/IGESDimen_ToolOrdinateDimension.cxx b/src/IGESDimen/IGESDimen_ToolOrdinateDimension.cxx index 32fb62efd9..9b53b23102 100644 --- a/src/IGESDimen/IGESDimen_ToolOrdinateDimension.cxx +++ b/src/IGESDimen/IGESDimen_ToolOrdinateDimension.cxx @@ -151,24 +151,24 @@ void IGESDimen_ToolOrdinateDimension::OwnCheck void IGESDimen_ToolOrdinateDimension::OwnDump (const Handle(IGESDimen_OrdinateDimension)& ent, const IGESData_IGESDumper& dumper, - const Handle(Message_Messenger)& S, const Standard_Integer level) const + Standard_OStream& S, const Standard_Integer level) const { - S << "IGESDimen_OrdinateDimension" << Message_EndLine; + S << "IGESDimen_OrdinateDimension\n"; Standard_Integer sublevel = (level <= 4) ? 0 : 1; S << "General Note : "; dumper.Dump(ent->Note(),S, sublevel); - S << Message_EndLine; + S << "\n"; Handle(IGESDimen_WitnessLine) witLine = ent->WitnessLine(); Handle(IGESDimen_LeaderArrow) leadArr = ent->Leader(); if (!witLine.IsNull()) { S << "Witness line : "; dumper.Dump(witLine,S, sublevel); - S << Message_EndLine; + S << "\n"; } if (!leadArr.IsNull()) { S << "Leader arrow :"; dumper.Dump(leadArr,S, sublevel); - S << Message_EndLine; + S << "\n"; } } diff --git a/src/IGESDimen/IGESDimen_ToolOrdinateDimension.hxx b/src/IGESDimen/IGESDimen_ToolOrdinateDimension.hxx index fbc8914d70..770358a62e 100644 --- a/src/IGESDimen/IGESDimen_ToolOrdinateDimension.hxx +++ b/src/IGESDimen/IGESDimen_ToolOrdinateDimension.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a OrdinateDimension. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESDimen_OrdinateDimension)& entfrom, const Handle(IGESDimen_OrdinateDimension)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESDimen_OrdinateDimension)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESDimen_OrdinateDimension)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESDimen/IGESDimen_ToolPointDimension.cxx b/src/IGESDimen/IGESDimen_ToolPointDimension.cxx index 22e84807c1..55d019f4ac 100644 --- a/src/IGESDimen/IGESDimen_ToolPointDimension.cxx +++ b/src/IGESDimen/IGESDimen_ToolPointDimension.cxx @@ -111,21 +111,21 @@ void IGESDimen_ToolPointDimension::OwnCheck void IGESDimen_ToolPointDimension::OwnDump (const Handle(IGESDimen_PointDimension)& ent, const IGESData_IGESDumper& dumper, - const Handle(Message_Messenger)& S, const Standard_Integer level) const + Standard_OStream& S, const Standard_Integer level) const { - S << "IGESDimen_PointDimension" << Message_EndLine; + S << "IGESDimen_PointDimension\n"; Standard_Integer sublevel = (level <= 4) ? 0 : 1; S << "General Note : "; dumper.Dump(ent->Note(),S , sublevel); - S << Message_EndLine; - S << "Leader Arrow : "; + S << "\n" + << "Leader Arrow : "; dumper.Dump(ent->LeaderArrow(),S , sublevel); - S << Message_EndLine; + S << "\n"; if (!ent->Geom().IsNull()) { S << "Enclosing Entity : "; dumper.Dump(ent->Geom(),S , sublevel); - S << Message_EndLine; + S << "\n"; } } diff --git a/src/IGESDimen/IGESDimen_ToolPointDimension.hxx b/src/IGESDimen/IGESDimen_ToolPointDimension.hxx index 77d6f6d6b2..02a2d512ac 100644 --- a/src/IGESDimen/IGESDimen_ToolPointDimension.hxx +++ b/src/IGESDimen/IGESDimen_ToolPointDimension.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a PointDimension. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESDimen_PointDimension)& entfrom, const Handle(IGESDimen_PointDimension)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESDimen_PointDimension)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESDimen_PointDimension)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESDimen/IGESDimen_ToolRadiusDimension.cxx b/src/IGESDimen/IGESDimen_ToolRadiusDimension.cxx index 4ca9fc74f0..903ba2c55e 100644 --- a/src/IGESDimen/IGESDimen_ToolRadiusDimension.cxx +++ b/src/IGESDimen/IGESDimen_ToolRadiusDimension.cxx @@ -126,24 +126,24 @@ void IGESDimen_ToolRadiusDimension::OwnCheck void IGESDimen_ToolRadiusDimension::OwnDump (const Handle(IGESDimen_RadiusDimension)& ent, const IGESData_IGESDumper& dumper, - const Handle(Message_Messenger)& S,const Standard_Integer level) const + Standard_OStream& S,const Standard_Integer level) const { - S << "IGESDimen_RadiusDimension" << Message_EndLine; + S << "IGESDimen_RadiusDimension\n"; Standard_Integer sublevel = (level <= 4) ? 0 : 1; S << "General note : "; dumper.Dump(ent->Note(),S, sublevel); - S << Message_EndLine; - S << "Leader arrow : "; + S << "\n" + << "Leader arrow : "; dumper.Dump(ent->Leader(),S, sublevel); - S << Message_EndLine; - S << "Arc center : "; + S << "\n" + << "Arc center : "; IGESData_DumpXYLZ(S,level,ent->Center(),ent->Location(),ent->Leader()->ZDepth()); if (ent->HasLeader2()) { - S << Message_EndLine << "Leader arrow 2 : "; + S << "\nLeader arrow 2 : "; dumper.Dump(ent->Leader2(),S, sublevel); - S << Message_EndLine; + S << "\n"; } - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESDimen/IGESDimen_ToolRadiusDimension.hxx b/src/IGESDimen/IGESDimen_ToolRadiusDimension.hxx index 9f5817808d..ecb0ed26b7 100644 --- a/src/IGESDimen/IGESDimen_ToolRadiusDimension.hxx +++ b/src/IGESDimen/IGESDimen_ToolRadiusDimension.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a RadiusDimension. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESDimen_RadiusDimension)& entfrom, const Handle(IGESDimen_RadiusDimension)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESDimen_RadiusDimension)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESDimen_RadiusDimension)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESDimen/IGESDimen_ToolSection.cxx b/src/IGESDimen/IGESDimen_ToolSection.cxx index 7c969925cc..1a1d223f6f 100644 --- a/src/IGESDimen/IGESDimen_ToolSection.cxx +++ b/src/IGESDimen/IGESDimen_ToolSection.cxx @@ -157,14 +157,14 @@ void IGESDimen_ToolSection::OwnCheck void IGESDimen_ToolSection::OwnDump (const Handle(IGESDimen_Section)& ent, const IGESData_IGESDumper& /* dumper */, - const Handle(Message_Messenger)& S, const Standard_Integer level) const + Standard_OStream& S, const Standard_Integer level) const { - S << "IGESDimen_Section" << Message_EndLine; - S << "Data Type : " << ent->Datatype() << " "; - S << "Number of Data Points : " << ent->NbPoints() << " "; - S << "Common Z displacement : " << ent->ZDisplacement() << Message_EndLine; - S << "Data Points : "; - IGESData_DumpListXYLZ(S ,level,1, ent->NbPoints(),ent->Point, + S << "IGESDimen_Section\n" + << "Data Type : " << ent->Datatype() << " " + << "Number of Data Points : " << ent->NbPoints() << " " + << "Common Z displacement : " << ent->ZDisplacement() << "\n" + << "Data Points : "; + IGESData_DumpListXYLZ(S,level,1, ent->NbPoints(),ent->Point, ent->Location(), ent->ZDisplacement()); - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESDimen/IGESDimen_ToolSection.hxx b/src/IGESDimen/IGESDimen_ToolSection.hxx index 04fa88b7de..726dbd369c 100644 --- a/src/IGESDimen/IGESDimen_ToolSection.hxx +++ b/src/IGESDimen/IGESDimen_ToolSection.hxx @@ -34,8 +34,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a Section. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -74,7 +72,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESDimen_Section)& entfrom, const Handle(IGESDimen_Section)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESDimen_Section)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESDimen_Section)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESDimen/IGESDimen_ToolSectionedArea.cxx b/src/IGESDimen/IGESDimen_ToolSectionedArea.cxx index 4789837ce4..e02ca96da6 100644 --- a/src/IGESDimen/IGESDimen_ToolSectionedArea.cxx +++ b/src/IGESDimen/IGESDimen_ToolSectionedArea.cxx @@ -34,7 +34,6 @@ #include #include #include -#include #include IGESDimen_ToolSectionedArea::IGESDimen_ToolSectionedArea () { } @@ -156,22 +155,21 @@ void IGESDimen_ToolSectionedArea::OwnCheck void IGESDimen_ToolSectionedArea::OwnDump (const Handle(IGESDimen_SectionedArea)& 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) ? 0 : 1; - S << "IGESDimen_SectionedArea" << Message_EndLine; - S << (ent->IsInverted() ? "Inverted Cross Hatches" : "Standard Cross Hatches"); - - S << " - Exterior curve : "; + S << "IGESDimen_SectionedArea\n" + << (ent->IsInverted() ? "Inverted Cross Hatches" : "Standard Cross Hatches") + << " - Exterior curve : "; dumper.Dump(ent->ExteriorCurve(),S, sublevel); - S << Message_EndLine; - S << "Fill pattern code : " << ent->Pattern() << Message_EndLine; - S << "Passing point : "; - IGESData_DumpXYZL(S,level, ent->PassingPoint(), ent->Location()); S << Message_EndLine; - S << "Distance between lines : " << ent->Distance() << Message_EndLine; - S << "Angle between lines and X axis : " << ent->Angle() << Message_EndLine; - S << "Island Curve : "; + S << "\n" + << "Fill pattern code : " << ent->Pattern() << "\n" + << "Passing point : "; + IGESData_DumpXYZL(S,level, ent->PassingPoint(), ent->Location()); S << "\n"; + S << "Distance between lines : " << ent->Distance() << "\n" + << "Angle between lines and X axis : " << ent->Angle() << "\n" + << "Island Curve : "; IGESData_DumpEntities(S,dumper ,level,1, ent->NbIslands(),ent->IslandCurve); - S << Message_EndLine; + S << "\n"; } diff --git a/src/IGESDimen/IGESDimen_ToolSectionedArea.hxx b/src/IGESDimen/IGESDimen_ToolSectionedArea.hxx index dfe6437c73..98b826fce9 100644 --- a/src/IGESDimen/IGESDimen_ToolSectionedArea.hxx +++ b/src/IGESDimen/IGESDimen_ToolSectionedArea.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a SectionedArea. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESDimen_SectionedArea)& entfrom, const Handle(IGESDimen_SectionedArea)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESDimen_SectionedArea)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESDimen_SectionedArea)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESDimen/IGESDimen_ToolWitnessLine.cxx b/src/IGESDimen/IGESDimen_ToolWitnessLine.cxx index 3ba0df768c..4f38fc646a 100644 --- a/src/IGESDimen/IGESDimen_ToolWitnessLine.cxx +++ b/src/IGESDimen/IGESDimen_ToolWitnessLine.cxx @@ -158,14 +158,14 @@ void IGESDimen_ToolWitnessLine::OwnCheck void IGESDimen_ToolWitnessLine::OwnDump (const Handle(IGESDimen_WitnessLine)& ent, const IGESData_IGESDumper& /* dumper */, - const Handle(Message_Messenger)& S, const Standard_Integer level) const + Standard_OStream& S, const Standard_Integer level) const { - S << "IGESDimen_WitnessLine" << Message_EndLine; - S << "Data Type : " << ent->Datatype() << " "; - S << "Number of Data Points : " << ent->NbPoints() << " "; - S << "Common Z displacement : " << ent->ZDisplacement() << Message_EndLine; - S << "Data Points : "; - IGESData_DumpListXYLZ(S ,level,1, ent->NbPoints(),ent->Point, + S << "IGESDimen_WitnessLine\n" + << "Data Type : " << ent->Datatype() << " " + << "Number of Data Points : " << ent->NbPoints() << " " + << "Common Z displacement : " << ent->ZDisplacement() << "\n" + << "Data Points : "; + IGESData_DumpListXYLZ(S,level,1, ent->NbPoints(),ent->Point, ent->Location(), ent->ZDisplacement()); - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESDimen/IGESDimen_ToolWitnessLine.hxx b/src/IGESDimen/IGESDimen_ToolWitnessLine.hxx index e7edf191a8..09a4b34be2 100644 --- a/src/IGESDimen/IGESDimen_ToolWitnessLine.hxx +++ b/src/IGESDimen/IGESDimen_ToolWitnessLine.hxx @@ -34,8 +34,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a WitnessLine. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -74,7 +72,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESDimen_WitnessLine)& entfrom, const Handle(IGESDimen_WitnessLine)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESDimen_WitnessLine)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESDimen_WitnessLine)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESDraw/IGESDraw_SpecificModule.cxx b/src/IGESDraw/IGESDraw_SpecificModule.cxx index 7621d9ad96..c825e096ca 100644 --- a/src/IGESDraw/IGESDraw_SpecificModule.cxx +++ b/src/IGESDraw/IGESDraw_SpecificModule.cxx @@ -44,7 +44,6 @@ #include #include #include -#include #include IMPLEMENT_STANDARD_RTTIEXT(IGESDraw_SpecificModule,IGESData_SpecificModule) @@ -57,7 +56,7 @@ IGESDraw_SpecificModule::IGESDraw_SpecificModule() { } void IGESDraw_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) { diff --git a/src/IGESDraw/IGESDraw_SpecificModule.hxx b/src/IGESDraw/IGESDraw_SpecificModule.hxx index ea95d6eb68..4276b141ac 100644 --- a/src/IGESDraw/IGESDraw_SpecificModule.hxx +++ b/src/IGESDraw/IGESDraw_SpecificModule.hxx @@ -25,8 +25,6 @@ #include class IGESData_IGESEntity; class IGESData_IGESDumper; -class Message_Messenger; - class IGESDraw_SpecificModule; DEFINE_STANDARD_HANDLE(IGESDraw_SpecificModule, IGESData_SpecificModule) @@ -43,7 +41,7 @@ public: Standard_EXPORT IGESDraw_SpecificModule(); //! Specific Dump (own parameters) for IGESDraw - 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 (Planar) diff --git a/src/IGESDraw/IGESDraw_ToolCircArraySubfigure.cxx b/src/IGESDraw/IGESDraw_ToolCircArraySubfigure.cxx index d9b87e2843..a19924ced0 100644 --- a/src/IGESDraw/IGESDraw_ToolCircArraySubfigure.cxx +++ b/src/IGESDraw/IGESDraw_ToolCircArraySubfigure.cxx @@ -32,7 +32,6 @@ #include #include #include -#include #include #include @@ -161,25 +160,24 @@ void IGESDraw_ToolCircArraySubfigure::OwnCheck void IGESDraw_ToolCircArraySubfigure::OwnDump (const Handle(IGESDraw_CircArraySubfigure)& 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 tempSubLevel = (level <= 4) ? 0 : 1; - S << "IGESDraw_CircArraySubfigure" << Message_EndLine; - - S << "Base Entity : "; + S << "IGESDraw_CircArraySubfigure\n" + << "Base Entity : "; dumper.Dump(ent->BaseEntity(),S, tempSubLevel); - S << Message_EndLine; - S << "Total Number Of Possible Instance Locations : " << ent->NbLocations() - << Message_EndLine; - S << "Imaginary Circle. Radius : " << ent->CircleRadius() << " Center : "; - IGESData_DumpXYZL(S, level, ent->CenterPoint(), ent->Location()); S << Message_EndLine; - S << "Start Angle (in radians) : " << ent->StartAngle() << " "; - S << "Delta Angle (in radians) : " << ent->DeltaAngle() << Message_EndLine; - S << "Do-Dont Flag : "; - if (ent->DoDontFlag()) S << "Dont" << Message_EndLine; - else S << "Do" << Message_EndLine; + S << "\n" + << "Total Number Of Possible Instance Locations : " << ent->NbLocations() + << "\n" + << "Imaginary Circle. Radius : " << ent->CircleRadius() << " Center : "; + IGESData_DumpXYZL(S, level, ent->CenterPoint(), ent->Location()); S << "\n"; + S << "Start Angle (in radians) : " << ent->StartAngle() << " " + << "Delta Angle (in radians) : " << ent->DeltaAngle() << "\n" + << "Do-Dont Flag : "; + if (ent->DoDontFlag()) S << "Dont\n"; + else S << "Do\n"; S << "The Do-Dont List : "; - IGESData_DumpVals(S ,level,1, ent->ListCount(),ent->ListPosition); - S << Message_EndLine; + IGESData_DumpVals(S,level,1, ent->ListCount(),ent->ListPosition); + S << std::endl; } diff --git a/src/IGESDraw/IGESDraw_ToolCircArraySubfigure.hxx b/src/IGESDraw/IGESDraw_ToolCircArraySubfigure.hxx index 1c5c1fd482..f9a0ff744b 100644 --- a/src/IGESDraw/IGESDraw_ToolCircArraySubfigure.hxx +++ b/src/IGESDraw/IGESDraw_ToolCircArraySubfigure.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a CircArraySubfigure. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESDraw_CircArraySubfigure)& entfrom, const Handle(IGESDraw_CircArraySubfigure)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESDraw_CircArraySubfigure)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESDraw_CircArraySubfigure)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESDraw/IGESDraw_ToolConnectPoint.cxx b/src/IGESDraw/IGESDraw_ToolConnectPoint.cxx index 866f74b184..10900b479f 100644 --- a/src/IGESDraw/IGESDraw_ToolConnectPoint.cxx +++ b/src/IGESDraw/IGESDraw_ToolConnectPoint.cxx @@ -203,32 +203,31 @@ void IGESDraw_ToolConnectPoint::OwnCheck void IGESDraw_ToolConnectPoint::OwnDump (const Handle(IGESDraw_ConnectPoint)& 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 tempSubLevel = (level <= 4) ? 0 : 1; - S << "IGESDraw_ConnectPoint" << Message_EndLine; - - S << "Connection Point Coordinate : "; + S << "IGESDraw_ConnectPoint\n" + << "Connection Point Coordinate : "; IGESData_DumpXYZL(S, level, ent->Point(), ent->Location()); S << "Display Symbol Geometry Entity : "; dumper.Dump(ent->DisplaySymbol(),S, tempSubLevel); - S << Message_EndLine; - S << "Type Flag : " << ent->TypeFlag() << " " - << "Function Flag : " << ent->FunctionFlag() << Message_EndLine; - S << "Function Identifier : "; + S << "\n" + << "Type Flag : " << ent->TypeFlag() << " " + << "Function Flag : " << ent->FunctionFlag() << "\n" + << "Function Identifier : "; IGESData_DumpString(S,ent->FunctionIdentifier()); - S << Message_EndLine << "Text Display Template Entity for CID : "; + S << "\nText Display Template Entity for CID : "; dumper.Dump(ent->IdentifierTemplate(),S, tempSubLevel); - S << Message_EndLine << "Function Name : "; + S << "\nFunction Name : "; IGESData_DumpString(S,ent->FunctionName()); - S << Message_EndLine << "Text Display Template Entity for CFN : "; + S << "\nText Display Template Entity for CFN : "; dumper.Dump(ent->FunctionTemplate(),S, tempSubLevel); - S << Message_EndLine; - S << "Point Identifier : " << ent->PointIdentifier() << Message_EndLine + S << "\n" + << "Point Identifier : " << ent->PointIdentifier() << "\n" << "Function Code : " << ent->FunctionCode() - << "Swap Flag : " << ( ent->SwapFlag() ? "True" : "False" ) << Message_EndLine; - S << "Owner Subfigure Entity : "; + << "Swap Flag : " << ( ent->SwapFlag() ? "True" : "False" ) << "\n" + << "Owner Subfigure Entity : "; dumper.Dump(ent->OwnerSubfigure(),S, tempSubLevel); - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESDraw/IGESDraw_ToolConnectPoint.hxx b/src/IGESDraw/IGESDraw_ToolConnectPoint.hxx index b009c35eea..f11c7f4735 100644 --- a/src/IGESDraw/IGESDraw_ToolConnectPoint.hxx +++ b/src/IGESDraw/IGESDraw_ToolConnectPoint.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a ConnectPoint. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESDraw_ConnectPoint)& entfrom, const Handle(IGESDraw_ConnectPoint)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESDraw_ConnectPoint)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESDraw_ConnectPoint)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESDraw/IGESDraw_ToolDrawing.cxx b/src/IGESDraw/IGESDraw_ToolDrawing.cxx index 200803d0b3..82f635e814 100644 --- a/src/IGESDraw/IGESDraw_ToolDrawing.cxx +++ b/src/IGESDraw/IGESDraw_ToolDrawing.cxx @@ -262,21 +262,20 @@ void IGESDraw_ToolDrawing::OwnCheck void IGESDraw_ToolDrawing::OwnDump (const Handle(IGESDraw_Drawing)& 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) ? 0 : 1; - S << "IGESDraw_Drawing" << Message_EndLine; - - S << "View Entities : " << Message_EndLine - << "Transformed View Origins : "; - S << "Count = " << ent->NbViews(); + S << "IGESDraw_Drawing\n" + << "View Entities :\n" + << "Transformed View Origins : " + << "Count = " << ent->NbViews(); switch (level) { - case 4 : S << " [ ask level > 4 for content ]" << Message_EndLine; + case 4 : S << " [ ask level > 4 for content ]\n"; break; // Nothing to be dumped here case 5 : // Presently level 5 and 6 have the same Dump - S << Message_EndLine; + S << "\n"; Standard_FALLTHROUGH case 6 : { @@ -284,17 +283,17 @@ void IGESDraw_ToolDrawing::OwnDump Standard_Integer up = ent->NbViews(); for (I = 1; I <= up; I++) { - S << Message_EndLine << "[" << I << "] "; - S << "View Entity : "; + S << "\n[" << I << "] " + << "View Entity : "; dumper.Dump (ent->ViewItem(I),S, sublevel); - S << Message_EndLine; - S << "Transformed View Origin : "; + S << "\n" + << "Transformed View Origin : "; IGESData_DumpXY(S, ent->ViewOrigin(I)); } } break; } - S << Message_EndLine << "Annotation Entities : "; + S << "\nAnnotation Entities : "; IGESData_DumpEntities(S,dumper ,level,1, ent->NbAnnotations(),ent->Annotation); - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESDraw/IGESDraw_ToolDrawing.hxx b/src/IGESDraw/IGESDraw_ToolDrawing.hxx index 14fc0d0de4..1110df7264 100644 --- a/src/IGESDraw/IGESDraw_ToolDrawing.hxx +++ b/src/IGESDraw/IGESDraw_ToolDrawing.hxx @@ -34,8 +34,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a Drawing. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -74,7 +72,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESDraw_Drawing)& entfrom, const Handle(IGESDraw_Drawing)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESDraw_Drawing)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESDraw_Drawing)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESDraw/IGESDraw_ToolDrawingWithRotation.cxx b/src/IGESDraw/IGESDraw_ToolDrawingWithRotation.cxx index ea2478571b..940e992ac2 100644 --- a/src/IGESDraw/IGESDraw_ToolDrawingWithRotation.cxx +++ b/src/IGESDraw/IGESDraw_ToolDrawingWithRotation.cxx @@ -282,16 +282,15 @@ void IGESDraw_ToolDrawingWithRotation::OwnCheck void IGESDraw_ToolDrawingWithRotation::OwnDump (const Handle(IGESDraw_DrawingWithRotation)& 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) ? 0 : 1; - S << "IGESDraw_DrawingWithRotation" << Message_EndLine; - - S << "View Entities : " << Message_EndLine - << "Transformed View Origins : " << Message_EndLine - << "Orientation Angles : "; - S << "Count = " << ent->NbViews() << Message_EndLine; + S << "IGESDraw_DrawingWithRotation\n" + << "View Entities :\n" + << "Transformed View Origins :\n" + << "Orientation Angles : " + << "Count = " << ent->NbViews() << "\n"; if (level > 4) // Level = 4 : no Dump. Level = 5 & 6 have same Dump { @@ -299,16 +298,16 @@ void IGESDraw_ToolDrawingWithRotation::OwnDump Standard_Integer up = ent->NbViews(); for (I = 1; I <= up; I++) { - S << "[" << I << "]:" << Message_EndLine; - S << "View Entity : "; + S << "[" << I << "]:\n" + << "View Entity : "; dumper.Dump (ent->ViewItem(I),S, sublevel); - S << Message_EndLine; - S << "Transformed View Origin : "; + S << "\n" + << "Transformed View Origin : "; IGESData_DumpXY(S, ent->ViewOrigin(I)); - S << " Orientation Angle : " << ent->OrientationAngle(I) << Message_EndLine; + S << " Orientation Angle : " << ent->OrientationAngle(I) << "\n"; } } S << "Annotation Entities : "; IGESData_DumpEntities(S,dumper ,level,1, ent->NbAnnotations(),ent->Annotation); - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESDraw/IGESDraw_ToolDrawingWithRotation.hxx b/src/IGESDraw/IGESDraw_ToolDrawingWithRotation.hxx index 2b1bdab8ab..4dab1a66c7 100644 --- a/src/IGESDraw/IGESDraw_ToolDrawingWithRotation.hxx +++ b/src/IGESDraw/IGESDraw_ToolDrawingWithRotation.hxx @@ -34,8 +34,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a DrawingWithRotation. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -74,7 +72,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESDraw_DrawingWithRotation)& entfrom, const Handle(IGESDraw_DrawingWithRotation)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESDraw_DrawingWithRotation)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESDraw_DrawingWithRotation)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESDraw/IGESDraw_ToolLabelDisplay.cxx b/src/IGESDraw/IGESDraw_ToolLabelDisplay.cxx index d4b76bfdfc..2cd6244336 100644 --- a/src/IGESDraw/IGESDraw_ToolLabelDisplay.cxx +++ b/src/IGESDraw/IGESDraw_ToolLabelDisplay.cxx @@ -204,39 +204,38 @@ void IGESDraw_ToolLabelDisplay::OwnCheck void IGESDraw_ToolLabelDisplay::OwnDump (const Handle(IGESDraw_LabelDisplay)& 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) ? 0 : 1; - S << "IGESDraw_LabelDisplay" << Message_EndLine; - - S << "View Entities : " << Message_EndLine - << "Text Locations : " << Message_EndLine - << "Leader Entities : " << Message_EndLine - << "Label Level Numbers : " << Message_EndLine - << "Displayed Entities : "; - S << "Count = " << ent->NbLabels() << Message_EndLine; + S << "IGESDraw_LabelDisplay\n" + << "View Entities :\n" + << "Text Locations :\n" + << "Leader Entities :\n" + << "Label Level Numbers :\n" + << "Displayed Entities : " + << "Count = " << ent->NbLabels() << "\n"; if (level > 4) // Level = 4 : no Dump. Level = 5 & 6 : same Dump { Standard_Integer I; Standard_Integer up = ent->NbLabels(); for (I = 1; I <= up; I ++) { - S << "[" << I << "]:" << Message_EndLine; - S << "View Entity : "; + S << "[" << I << "]:\n" + << "View Entity : "; dumper.Dump (ent->ViewItem(I),S, sublevel); - S << Message_EndLine; - S << "Text Location in View : "; + S << "\n" + << "Text Location in View : "; IGESData_DumpXYZL(S,level, ent->TextLocation(I), ent->Location()); S << " Leader Entity in View : "; dumper.Dump (ent->LeaderEntity(I),S, sublevel); - S << Message_EndLine; - S << "Entity Label Level Number : "; - S << ent->LabelLevel(I) << " "; - S << "Displayed Entity : "; + S << "\n" + << "Entity Label Level Number : " + << ent->LabelLevel(I) << " " + << "Displayed Entity : "; dumper.Dump (ent->DisplayedEntity(I),S, sublevel); - S << Message_EndLine; + S << "\n"; } } - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESDraw/IGESDraw_ToolLabelDisplay.hxx b/src/IGESDraw/IGESDraw_ToolLabelDisplay.hxx index 768dc1e540..1660e7e98c 100644 --- a/src/IGESDraw/IGESDraw_ToolLabelDisplay.hxx +++ b/src/IGESDraw/IGESDraw_ToolLabelDisplay.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a LabelDisplay. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESDraw_LabelDisplay)& entfrom, const Handle(IGESDraw_LabelDisplay)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESDraw_LabelDisplay)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESDraw_LabelDisplay)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESDraw/IGESDraw_ToolNetworkSubfigure.cxx b/src/IGESDraw/IGESDraw_ToolNetworkSubfigure.cxx index c5e1748014..284c53a5ac 100644 --- a/src/IGESDraw/IGESDraw_ToolNetworkSubfigure.cxx +++ b/src/IGESDraw/IGESDraw_ToolNetworkSubfigure.cxx @@ -226,24 +226,23 @@ void IGESDraw_ToolNetworkSubfigure::OwnCheck void IGESDraw_ToolNetworkSubfigure::OwnDump (const Handle(IGESDraw_NetworkSubfigure)& 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) ? 0 : 1; - S << "IGESDraw_NetworkSubfigure" << Message_EndLine; - - S << "Network Subfigure Definition Entity : "; + S << "IGESDraw_NetworkSubfigure\n" + << "Network Subfigure Definition Entity : "; dumper.Dump(ent->SubfigureDefinition(),S, sublevel); - S << Message_EndLine << "Translation Data : "; + S << "\nTranslation Data : "; IGESData_DumpXYZL(S,level, ent->Translation(), ent->Location()); - S << Message_EndLine << "Scale Factors : "; + S << "\nScale Factors : "; IGESData_DumpXYZ(S, ent->ScaleFactors()); - S << Message_EndLine << "Type Flag : " << ent->TypeFlag() << Message_EndLine; - S << "Primary Reference Designator : "; + S << "\nType Flag : " << ent->TypeFlag() << "\n" + << "Primary Reference Designator : "; IGESData_DumpString(S,ent->ReferenceDesignator()); - S << Message_EndLine << "Text Display Template Entity : "; + S << "\nText Display Template Entity : "; dumper.Dump(ent->DesignatorTemplate(),S, sublevel); - S << Message_EndLine << "Connect Points : "; + S << "\nConnect Points : "; IGESData_DumpEntities(S,dumper ,level,1, ent->NbConnectPoints(),ent->ConnectPoint); - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESDraw/IGESDraw_ToolNetworkSubfigure.hxx b/src/IGESDraw/IGESDraw_ToolNetworkSubfigure.hxx index 77d22695d9..0c014bdda0 100644 --- a/src/IGESDraw/IGESDraw_ToolNetworkSubfigure.hxx +++ b/src/IGESDraw/IGESDraw_ToolNetworkSubfigure.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a NetworkSubfigure. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESDraw_NetworkSubfigure)& entfrom, const Handle(IGESDraw_NetworkSubfigure)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESDraw_NetworkSubfigure)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESDraw_NetworkSubfigure)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESDraw/IGESDraw_ToolNetworkSubfigureDef.cxx b/src/IGESDraw/IGESDraw_ToolNetworkSubfigureDef.cxx index faa30fe783..deb628925e 100644 --- a/src/IGESDraw/IGESDraw_ToolNetworkSubfigureDef.cxx +++ b/src/IGESDraw/IGESDraw_ToolNetworkSubfigureDef.cxx @@ -223,23 +223,22 @@ void IGESDraw_ToolNetworkSubfigureDef::OwnCheck void IGESDraw_ToolNetworkSubfigureDef::OwnDump (const Handle(IGESDraw_NetworkSubfigureDef)& 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 tempSubLevel = (level <= 4) ? 0 : 1; - S << "IGESDraw_NetworkSubfigureDef" << Message_EndLine; - - S << "Depth Of Subfigure(Nesting) : " << ent->Depth() << Message_EndLine; - S << "Name Of Subfigure : "; + S << "IGESDraw_NetworkSubfigureDef\n" + << "Depth Of Subfigure(Nesting) : " << ent->Depth() << "\n" + << "Name Of Subfigure : "; IGESData_DumpString(S,ent->Name()); - S << Message_EndLine << "Associated Entities : "; + S << "\nAssociated Entities : "; IGESData_DumpEntities(S,dumper ,level,1, ent->NbEntities(),ent->Entity); - S << Message_EndLine << "Type Flag : " << ent->TypeFlag() << Message_EndLine; - S << "Primary Reference Designator : "; + S << "\nType Flag : " << ent->TypeFlag() << "\n" + << "Primary Reference Designator : "; IGESData_DumpString(S,ent->Designator()); - S << Message_EndLine << "Text Display Template Entity : "; + S << "\nText Display Template Entity : "; dumper.Dump(ent->DesignatorTemplate(),S, tempSubLevel); - S << Message_EndLine << "Connect Point Entities : "; + S << "\nConnect Point Entities : "; IGESData_DumpEntities(S,dumper ,level,1, ent->NbPointEntities(),ent->PointEntity); - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESDraw/IGESDraw_ToolNetworkSubfigureDef.hxx b/src/IGESDraw/IGESDraw_ToolNetworkSubfigureDef.hxx index f27a626a8f..761f56b9a5 100644 --- a/src/IGESDraw/IGESDraw_ToolNetworkSubfigureDef.hxx +++ b/src/IGESDraw/IGESDraw_ToolNetworkSubfigureDef.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a NetworkSubfigureDef. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESDraw_NetworkSubfigureDef)& entfrom, const Handle(IGESDraw_NetworkSubfigureDef)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESDraw_NetworkSubfigureDef)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESDraw_NetworkSubfigureDef)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESDraw/IGESDraw_ToolPerspectiveView.cxx b/src/IGESDraw/IGESDraw_ToolPerspectiveView.cxx index e3c6d40b5c..08399d3c57 100644 --- a/src/IGESDraw/IGESDraw_ToolPerspectiveView.cxx +++ b/src/IGESDraw/IGESDraw_ToolPerspectiveView.cxx @@ -168,34 +168,33 @@ void IGESDraw_ToolPerspectiveView::OwnCheck void IGESDraw_ToolPerspectiveView::OwnDump (const Handle(IGESDraw_PerspectiveView)& ent, const IGESData_IGESDumper& /*dumper*/, - const Handle(Message_Messenger)& S, const Standard_Integer level) const + Standard_OStream& S, const Standard_Integer level) const { - S << "IGESDraw_PerspectiveView" << Message_EndLine; - - S << "View Number : " << ent->ViewNumber() << " "; - S << "Scale Factor : " << ent->ScaleFactor() << Message_EndLine; - S << "View Plane Normal Vector : "; + S << "IGESDraw_PerspectiveView\n" + << "View Number : " << ent->ViewNumber() << " " + << "Scale Factor : " << ent->ScaleFactor() << "\n" + << "View Plane Normal Vector : "; IGESData_DumpXYZL(S,level, ent->ViewNormalVector(), ent->Location()); - S << Message_EndLine << "View Reference Point : "; + S << "\nView Reference Point : "; IGESData_DumpXYZL(S,level, ent->ViewReferencePoint() , ent->Location()); - S << Message_EndLine << "Center Of Projection : "; + S << "\nCenter Of Projection : "; IGESData_DumpXYZL(S,level, ent->CenterOfProjection() , ent->Location()); - S << Message_EndLine << "View Up Vector : "; + S << "\nView Up Vector : "; IGESData_DumpXYZL(S,level, ent->ViewUpVector() , ent->Location()); - S << Message_EndLine << "View Plane Distance : " << ent->ViewPlaneDistance()<TopLeft().X() << Message_EndLine; - S << "Right Side Of Clipping Window : " << ent->BottomRight().X() << Message_EndLine; - S << "Bottom Side Of Clipping Window : " << ent->BottomRight().Y() << Message_EndLine; - S << "Top Side Of Clipping Window : " << ent->TopLeft().Y() << Message_EndLine; - S << "Depth Clipping : " << ent->DepthClip(); + S << "\nView Plane Distance : " << ent->ViewPlaneDistance()<< "\n" + << "Left Side Of Clipping Window : " << ent->TopLeft().X() << "\n" + << "Right Side Of Clipping Window : " << ent->BottomRight().X() << "\n" + << "Bottom Side Of Clipping Window : " << ent->BottomRight().Y() << "\n" + << "Top Side Of Clipping Window : " << ent->TopLeft().Y() << "\n" + << "Depth Clipping : " << ent->DepthClip(); switch (ent->DepthClip()) { - case 0 : S << " (No Depth Clipping)" << Message_EndLine; break; - case 1 : S << " (Back Clipping Plane ON)" << Message_EndLine; break; - case 2 : S << " (Front Clipping Plane ON)" << Message_EndLine; break; - case 3 : S << " (Front and Back Clipping Planes ON)" << Message_EndLine; break; - default : S << " (Invalid Value)" << Message_EndLine; break; + case 0 : S << " (No Depth Clipping)\n"; break; + case 1 : S << " (Back Clipping Plane ON)\n"; break; + case 2 : S << " (Front Clipping Plane ON)\n"; break; + case 3 : S << " (Front and Back Clipping Planes ON)\n"; break; + default : S << " (Invalid Value)\n"; break; } - S << "Back Plane Distance : " << ent->BackPlaneDistance() << " "; - S << "Front Plane Distance : " << ent->FrontPlaneDistance() << Message_EndLine; - S << Message_EndLine; + S << "Back Plane Distance : " << ent->BackPlaneDistance() << " " + << "Front Plane Distance : " << ent->FrontPlaneDistance() << "\n" + << std::endl; } diff --git a/src/IGESDraw/IGESDraw_ToolPerspectiveView.hxx b/src/IGESDraw/IGESDraw_ToolPerspectiveView.hxx index cc6b137e5f..8814f36d66 100644 --- a/src/IGESDraw/IGESDraw_ToolPerspectiveView.hxx +++ b/src/IGESDraw/IGESDraw_ToolPerspectiveView.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a PerspectiveView. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESDraw_PerspectiveView)& entfrom, const Handle(IGESDraw_PerspectiveView)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESDraw_PerspectiveView)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESDraw_PerspectiveView)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESDraw/IGESDraw_ToolPlanar.cxx b/src/IGESDraw/IGESDraw_ToolPlanar.cxx index 83416461b7..e0bd3fc058 100644 --- a/src/IGESDraw/IGESDraw_ToolPlanar.cxx +++ b/src/IGESDraw/IGESDraw_ToolPlanar.cxx @@ -168,20 +168,19 @@ void IGESDraw_ToolPlanar::OwnCheck void IGESDraw_ToolPlanar::OwnDump (const Handle(IGESDraw_Planar)& 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) ? 0 : 1; - S << "IGESDraw_Planar" << Message_EndLine; - - S << "No. of Transformation Matrices : " << ent->NbMatrices() << " "; - S << "i.e. : "; + S << "IGESDraw_Planar\n" + << "No. of Transformation Matrices : " << ent->NbMatrices() << " " + << "i.e. : "; if ( ent->TransformMatrix().IsNull() ) S << "Null Handle"; else dumper.OwnDump (ent->TransformMatrix(),S, sublevel); - S << Message_EndLine; - S << "Array of Entities on the specified plane : "; + S << "\n" + << "Array of Entities on the specified plane : "; IGESData_DumpEntities(S,dumper ,level,1, ent->NbEntities(),ent->Entity); - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESDraw/IGESDraw_ToolPlanar.hxx b/src/IGESDraw/IGESDraw_ToolPlanar.hxx index 4696120d12..90c4dcd922 100644 --- a/src/IGESDraw/IGESDraw_ToolPlanar.hxx +++ b/src/IGESDraw/IGESDraw_ToolPlanar.hxx @@ -34,8 +34,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a Planar. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -74,7 +72,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESDraw_Planar)& entfrom, const Handle(IGESDraw_Planar)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESDraw_Planar)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESDraw_Planar)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESDraw/IGESDraw_ToolRectArraySubfigure.cxx b/src/IGESDraw/IGESDraw_ToolRectArraySubfigure.cxx index 6595a9242e..10a196d39d 100644 --- a/src/IGESDraw/IGESDraw_ToolRectArraySubfigure.cxx +++ b/src/IGESDraw/IGESDraw_ToolRectArraySubfigure.cxx @@ -174,27 +174,26 @@ void IGESDraw_ToolRectArraySubfigure::OwnCheck void IGESDraw_ToolRectArraySubfigure::OwnDump (const Handle(IGESDraw_RectArraySubfigure)& 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 tempSubLevel = (level <= 4) ? 0 : 1; - S << "IGESDraw_RectArraySubfigure" << Message_EndLine; - - S << "Base Entity : "; + S << "IGESDraw_RectArraySubfigure\n" + << "Base Entity : "; dumper.Dump(ent->BaseEntity(),S, tempSubLevel); - S << Message_EndLine; - S << "Scale Factor : " << ent->ScaleFactor() << " "; - S << "Lower Left Corner Of Array : "; + S << "\n" + << "Scale Factor : " << ent->ScaleFactor() << " " + << "Lower Left Corner Of Array : "; IGESData_DumpXYZL(S,level, ent->LowerLeftCorner(),gp_GTrsf()); // no location - S << "Number Of Columns : " << ent->NbColumns() << " "; - S << "Number Of Rows : " << ent->NbRows() << Message_EndLine; - S << "Horizontal Distance Between Columns : " << ent->ColumnSeparation()<RowSeparation() <RotationAngle() <NbColumns() << " " + << "Number Of Rows : " << ent->NbRows() << "\n" + << "Horizontal Distance Between Columns : " << ent->ColumnSeparation()<< "\n" + << "Vertical Distance Between Rows : " << ent->RowSeparation() << "\n" + << "Rotation Angle (in radians) : " << ent->RotationAngle() << "\n" + << "Do-Dont Flag : "; if (ent->DoDontFlag()) S << "(1)Dont "; else S << "(0)Do "; S << "Do-Dont List : "; - IGESData_DumpVals(S ,level,1, ent->ListCount(),ent->ListPosition); - S << Message_EndLine; + IGESData_DumpVals(S,level,1, ent->ListCount(),ent->ListPosition); + S << std::endl; } diff --git a/src/IGESDraw/IGESDraw_ToolRectArraySubfigure.hxx b/src/IGESDraw/IGESDraw_ToolRectArraySubfigure.hxx index 13e077640b..cbf48c8303 100644 --- a/src/IGESDraw/IGESDraw_ToolRectArraySubfigure.hxx +++ b/src/IGESDraw/IGESDraw_ToolRectArraySubfigure.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a RectArraySubfigure. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESDraw_RectArraySubfigure)& entfrom, const Handle(IGESDraw_RectArraySubfigure)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESDraw_RectArraySubfigure)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESDraw_RectArraySubfigure)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESDraw/IGESDraw_ToolSegmentedViewsVisible.cxx b/src/IGESDraw/IGESDraw_ToolSegmentedViewsVisible.cxx index 648ab51e00..24ab423c08 100644 --- a/src/IGESDraw/IGESDraw_ToolSegmentedViewsVisible.cxx +++ b/src/IGESDraw/IGESDraw_ToolSegmentedViewsVisible.cxx @@ -35,7 +35,6 @@ #include #include #include -#include #include #include #include @@ -277,24 +276,23 @@ void IGESDraw_ToolSegmentedViewsVisible::OwnCheck void IGESDraw_ToolSegmentedViewsVisible::OwnDump (const Handle(IGESDraw_SegmentedViewsVisible)& 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) ? 0 : 1; - S << "IGESDraw_SegmentedViewsVisible" << Message_EndLine; - - S << "View Entities : " << Message_EndLine - << "Breakpoint parameters : " << Message_EndLine - << "Display flags : " << Message_EndLine - << "Color Values : " << Message_EndLine - << "Color Definitions : " << Message_EndLine - << "LineFont Values : " << Message_EndLine - << "LineFont Definitions : " << Message_EndLine - << "Line Weights : " << Message_EndLine; - S << "Count Of Blocks = " << ent->NbSegmentBlocks() << Message_EndLine; + S << "IGESDraw_SegmentedViewsVisible\n" + << "View Entities :\n" + << "Breakpoint parameters :\n" + << "Display flags :\n" + << "Color Values :\n" + << "Color Definitions :\n" + << "LineFont Values :\n" + << "LineFont Definitions :\n" + << "Line Weights :\n" + << "Count Of Blocks = " << ent->NbSegmentBlocks() << "\n"; switch (level) { - case 4 : S << " [ for content, ask level > 4 ]" << Message_EndLine; + case 4 : S << " [ for content, ask level > 4 ]\n"; break; // Nothing to be dumped here case 5 : // Presently level 5 and 6 have the same Dump case 6 : @@ -303,23 +301,22 @@ void IGESDraw_ToolSegmentedViewsVisible::OwnDump Standard_Integer up = ent->NbSegmentBlocks(); for (I = 1; I <= up; I++) { - S << "[" << I << "]:" << Message_EndLine; - S << "View Entity : "; + S << "[" << I << "]:\n" + << "View Entity : "; dumper.Dump (ent->ViewItem(I),S, sublevel); - S << Message_EndLine; - S << "Breakpoint parameter : " <BreakpointParameter(I)<DisplayFlag(I) << Message_EndLine; + S << "\n" + << "Breakpoint parameter : " <BreakpointParameter(I)<< "\n" + << "Display Flag : " << ent->DisplayFlag(I) << "\n"; if ( (ent->ColorDefinition(I)).IsNull() ) { - S << "Color Value : "; - S << ent->ColorValue(I); + S << "Color Value : " << ent->ColorValue(I); } else { S << "Color Definition : "; dumper.Dump (ent->ColorDefinition(I),S, sublevel); } - S << Message_EndLine; + S << "\n"; if ( (ent->LineFontDefinition(I)).IsNull() ) { S << "LineFont Value : " << ent->LineFontValue(I); @@ -329,11 +326,11 @@ void IGESDraw_ToolSegmentedViewsVisible::OwnDump S << "LineFont Definition : "; dumper.Dump (ent->LineFontDefinition(I),S, sublevel); } - S << Message_EndLine; - S << "Line Weight : " << ent->LineWeightItem(I) << Message_EndLine; + S << "\n" + << "Line Weight : " << ent->LineWeightItem(I) << "\n"; } } break; } - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESDraw/IGESDraw_ToolSegmentedViewsVisible.hxx b/src/IGESDraw/IGESDraw_ToolSegmentedViewsVisible.hxx index 09980452f4..e835cbf03e 100644 --- a/src/IGESDraw/IGESDraw_ToolSegmentedViewsVisible.hxx +++ b/src/IGESDraw/IGESDraw_ToolSegmentedViewsVisible.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a SegmentedViewsVisible. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESDraw_SegmentedViewsVisible)& entfrom, const Handle(IGESDraw_SegmentedViewsVisible)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESDraw_SegmentedViewsVisible)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESDraw_SegmentedViewsVisible)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESDraw/IGESDraw_ToolView.cxx b/src/IGESDraw/IGESDraw_ToolView.cxx index ae61b4b659..2488fbde3b 100644 --- a/src/IGESDraw/IGESDraw_ToolView.cxx +++ b/src/IGESDraw/IGESDraw_ToolView.cxx @@ -31,7 +31,6 @@ #include #include #include -#include #include IGESDraw_ToolView::IGESDraw_ToolView () { } @@ -153,24 +152,23 @@ void IGESDraw_ToolView::OwnCheck void IGESDraw_ToolView::OwnDump (const Handle(IGESDraw_View)& 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 tempSubLevel = (level <= 4) ? 0 : 1; - S << "IGESDraw_View" << Message_EndLine; - - S << "View Number : " << ent->ViewNumber() << Message_EndLine; - S << "Scale Factor : " << ent->ScaleFactor() << Message_EndLine; - S << "Left Plane Of View Volume : "; - dumper.Dump(ent->LeftPlane(),S, tempSubLevel); S << Message_EndLine; + S << "IGESDraw_View\n" + << "View Number : " << ent->ViewNumber() << "\n" + << "Scale Factor : " << ent->ScaleFactor() << "\n" + << "Left Plane Of View Volume : "; + dumper.Dump(ent->LeftPlane(),S, tempSubLevel); S << "\n"; S << "Top Plane Of View Volume : "; - dumper.Dump(ent->TopPlane(),S, tempSubLevel); S << Message_EndLine; + dumper.Dump(ent->TopPlane(),S, tempSubLevel); S << "\n"; S << "Right Plane Of View Volume : "; - dumper.Dump(ent->RightPlane(),S, tempSubLevel); S << Message_EndLine; + dumper.Dump(ent->RightPlane(),S, tempSubLevel); S << "\n"; S << "Bottom Plane Of View Volume : "; - dumper.Dump(ent->BottomPlane(),S, tempSubLevel); S << Message_EndLine; + dumper.Dump(ent->BottomPlane(),S, tempSubLevel); S << "\n"; S << "Back Plane Of View Volume : "; - dumper.Dump(ent->BackPlane(),S, tempSubLevel); S << Message_EndLine; + dumper.Dump(ent->BackPlane(),S, tempSubLevel); S << "\n"; S << "Front Plane Of View Volume : "; - dumper.Dump(ent->FrontPlane(),S, tempSubLevel); S << Message_EndLine; + dumper.Dump(ent->FrontPlane(),S, tempSubLevel); S << std::endl; } diff --git a/src/IGESDraw/IGESDraw_ToolView.hxx b/src/IGESDraw/IGESDraw_ToolView.hxx index 79b3e378f3..e53c9f427d 100644 --- a/src/IGESDraw/IGESDraw_ToolView.hxx +++ b/src/IGESDraw/IGESDraw_ToolView.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a View. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESDraw_View)& entfrom, const Handle(IGESDraw_View)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESDraw_View)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESDraw_View)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESDraw/IGESDraw_ToolViewsVisible.cxx b/src/IGESDraw/IGESDraw_ToolViewsVisible.cxx index 03f89c671b..728795ab65 100644 --- a/src/IGESDraw/IGESDraw_ToolViewsVisible.cxx +++ b/src/IGESDraw/IGESDraw_ToolViewsVisible.cxx @@ -34,7 +34,6 @@ #include #include #include -#include #include #include @@ -227,17 +226,15 @@ void IGESDraw_ToolViewsVisible::OwnWhenDelete void IGESDraw_ToolViewsVisible::OwnDump (const Handle(IGESDraw_ViewsVisible)& ent, const IGESData_IGESDumper& dumper, - const Handle(Message_Messenger)& S, const Standard_Integer level) const + Standard_OStream& S, const Standard_Integer level) const { - S << "IGESDraw_ViewsVisible" << Message_EndLine; - - S << "Views Visible : "; + S << "IGESDraw_ViewsVisible\n" + << "Views Visible : "; IGESData_DumpEntities(S,dumper ,level,1, ent->NbViews(),ent->ViewItem); - S << Message_EndLine; - S << "Entities Displayed : "; - IGESData_DumpEntities - (S,dumper ,level,1, ent->NbDisplayedEntities(),ent->DisplayedEntity); - S << Message_EndLine; + S << "\n" + << "Entities Displayed : "; + IGESData_DumpEntities(S,dumper ,level,1, ent->NbDisplayedEntities(),ent->DisplayedEntity); + S << std::endl; } Standard_Boolean IGESDraw_ToolViewsVisible::OwnCorrect diff --git a/src/IGESDraw/IGESDraw_ToolViewsVisible.hxx b/src/IGESDraw/IGESDraw_ToolViewsVisible.hxx index 4ae6139f04..f3099cbab8 100644 --- a/src/IGESDraw/IGESDraw_ToolViewsVisible.hxx +++ b/src/IGESDraw/IGESDraw_ToolViewsVisible.hxx @@ -34,8 +34,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a ViewsVisible. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -83,7 +81,7 @@ public: Standard_EXPORT void OwnWhenDelete (const Handle(IGESDraw_ViewsVisible)& ent) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESDraw_ViewsVisible)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESDraw_ViewsVisible)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; //! Sets automatic unambiguous Correction on a ViewsVisible //! (all displayed entities must refer to in directory part, diff --git a/src/IGESDraw/IGESDraw_ToolViewsVisibleWithAttr.cxx b/src/IGESDraw/IGESDraw_ToolViewsVisibleWithAttr.cxx index 99bcfae57a..79c1fc1ac6 100644 --- a/src/IGESDraw/IGESDraw_ToolViewsVisibleWithAttr.cxx +++ b/src/IGESDraw/IGESDraw_ToolViewsVisibleWithAttr.cxx @@ -38,7 +38,6 @@ #include #include #include -#include #include #include @@ -337,48 +336,46 @@ void IGESDraw_ToolViewsVisibleWithAttr::OwnWhenDelete void IGESDraw_ToolViewsVisibleWithAttr::OwnDump (const Handle(IGESDraw_ViewsVisibleWithAttr)& 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 tempSubLevel = (level <= 4) ? 0 : 1; - S << "IGESDraw_ViewsVisibleWithAttr" << Message_EndLine; - - S << "View Entities : " << Message_EndLine - << "Line Font Values : " << Message_EndLine - << "Line Font Definitions : " << Message_EndLine - << "Color Number/Definitions : " << Message_EndLine - << "Line Weights : " << Message_EndLine; - S << "Count of View Blocks : " << ent->NbViews() << Message_EndLine; + S << "IGESDraw_ViewsVisibleWithAttr\n" + << "View Entities :\n" + << "Line Font Values :\n" + << "Line Font Definitions :\n" + << "Color Number/Definitions :\n" + << "Line Weights :\n" + << "Count of View Blocks : " << ent->NbViews() << "\n"; if (level > 4) { // Level = 4 : nothing to Dump. Level = 5 & 6 : same Dump Standard_Integer I; Standard_Integer upper = ent->NbViews(); for (I = 1; I <= upper; I++) { - S << "[" << I << "]: " << Message_EndLine; - S << "View Entity : "; + S << "[" << I << "]:\n" + << "View Entity : "; dumper.Dump (ent->ViewItem(I),S, tempSubLevel); - S << Message_EndLine; + S << "\n"; if (ent->IsFontDefinition(I)) { S << "Line Font Definition : "; dumper.Dump (ent->FontDefinition(I),S, tempSubLevel); - S << Message_EndLine; + S << "\n"; } - else S << "Line Font Value : " << ent->LineFontValue(I) << Message_EndLine; + else S << "Line Font Value : " << ent->LineFontValue(I) << "\n"; if (ent->IsColorDefinition(I)) { S << "Color Definition : "; dumper.Dump (ent->ColorDefinition(I),S, tempSubLevel); - S << Message_EndLine; + S << std::endl; } - else S << "Color Value : " << ent->ColorValue(I) << Message_EndLine; + else S << "Color Value : " << ent->ColorValue(I) << "\n"; - S << "Line Weight : " << ent->LineWeightItem(I) << Message_EndLine; + S << "Line Weight : " << ent->LineWeightItem(I) << "\n"; } } S << "Displayed Entities : "; - IGESData_DumpEntities - (S,dumper ,level,1, ent->NbDisplayedEntities(),ent->DisplayedEntity); - S << Message_EndLine; + IGESData_DumpEntities(S,dumper ,level,1, ent->NbDisplayedEntities(),ent->DisplayedEntity); + S << std::endl; } Standard_Boolean IGESDraw_ToolViewsVisibleWithAttr::OwnCorrect diff --git a/src/IGESDraw/IGESDraw_ToolViewsVisibleWithAttr.hxx b/src/IGESDraw/IGESDraw_ToolViewsVisibleWithAttr.hxx index cd3437d493..15ef55e16e 100644 --- a/src/IGESDraw/IGESDraw_ToolViewsVisibleWithAttr.hxx +++ b/src/IGESDraw/IGESDraw_ToolViewsVisibleWithAttr.hxx @@ -34,8 +34,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a ViewsVisibleWithAttr. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -84,7 +82,7 @@ public: Standard_EXPORT void OwnWhenDelete (const Handle(IGESDraw_ViewsVisibleWithAttr)& ent) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESDraw_ViewsVisibleWithAttr)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESDraw_ViewsVisibleWithAttr)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; //! Sets automatic unambiguous Correction on a ViewsVisibleWithAttr //! (all displayed entities must refer to in directory part, diff --git a/src/IGESGeom/IGESGeom_SpecificModule.cxx b/src/IGESGeom/IGESGeom_SpecificModule.cxx index 316d22ffae..b04c562311 100644 --- a/src/IGESGeom/IGESGeom_SpecificModule.cxx +++ b/src/IGESGeom/IGESGeom_SpecificModule.cxx @@ -62,7 +62,6 @@ #include #include #include -#include #include IMPLEMENT_STANDARD_RTTIEXT(IGESGeom_SpecificModule,IGESData_SpecificModule) @@ -75,7 +74,7 @@ IGESGeom_SpecificModule::IGESGeom_SpecificModule() { } void IGESGeom_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) { diff --git a/src/IGESGeom/IGESGeom_SpecificModule.hxx b/src/IGESGeom/IGESGeom_SpecificModule.hxx index 76d1b6e800..274feb9be1 100644 --- a/src/IGESGeom/IGESGeom_SpecificModule.hxx +++ b/src/IGESGeom/IGESGeom_SpecificModule.hxx @@ -25,8 +25,6 @@ #include class IGESData_IGESEntity; class IGESData_IGESDumper; -class Message_Messenger; - class IGESGeom_SpecificModule; DEFINE_STANDARD_HANDLE(IGESGeom_SpecificModule, IGESData_SpecificModule) @@ -43,7 +41,7 @@ public: Standard_EXPORT IGESGeom_SpecificModule(); //! Specific Dump (own parameters) for IGESGeom - 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 Correction on Entities which support //! them (Boundary,ConicArc,Flash,OffsetCurve,TransformationMatrix) diff --git a/src/IGESGeom/IGESGeom_ToolBSplineCurve.cxx b/src/IGESGeom/IGESGeom_ToolBSplineCurve.cxx index 961ab8ac9b..dcaaf0572d 100644 --- a/src/IGESGeom/IGESGeom_ToolBSplineCurve.cxx +++ b/src/IGESGeom/IGESGeom_ToolBSplineCurve.cxx @@ -401,27 +401,26 @@ void IGESGeom_ToolBSplineCurve::OwnCheck(const Handle(IGESGeom_BSplineCurve)& en void IGESGeom_ToolBSplineCurve::OwnDump(const Handle(IGESGeom_BSplineCurve)& ent, const IGESData_IGESDumper& /* dumper */, - const Handle(Message_Messenger)& S, + Standard_OStream& S, const Standard_Integer level) const { Standard_Integer upind = ent->UpperIndex(); - S << "BSplineCurve from IGESGeom" << Message_EndLine; - S << "Sum UpperIndex : " << upind; - S << " Degree : " << ent->Degree() << " "; - S << (ent->IsPlanar() ? "Planar" : "NonPlanar") << Message_EndLine; - S << (ent->IsClosed() ? "Closed" : "Open") << " "; - S << (ent->IsPeriodic() ? "Periodic" : "NonPeriodic") << " ";//#54 rln 24.12.98 CCI60005 - S << (ent->IsPolynomial(Standard_True) ? "Polynomial" : "Rational"); - - S << Message_EndLine << "Knots : "; - IGESData_DumpVals(S ,level,-ent->Degree(), upind+1,ent->Knot); - S << Message_EndLine << "Weights : "; - IGESData_DumpVals(S ,level,0, upind,ent->Weight); - S << Message_EndLine << "Control Points (Poles) : "; - IGESData_DumpListXYZL(S ,level,0, upind, ent->Pole, ent->Location()); - S << Message_EndLine << "Starting Parameter Value : " << ent->UMin(); - S << " Ending Parameter Value : " << ent->UMax() << Message_EndLine; - S << "Unit Normal : "; + S << "BSplineCurve from IGESGeom\n" + << "Sum UpperIndex : " << upind + << " Degree : " << ent->Degree() << " " + << (ent->IsPlanar() ? "Planar" : "NonPlanar") << "\n" + << (ent->IsClosed() ? "Closed" : "Open") << " " + << (ent->IsPeriodic() ? "Periodic" : "NonPeriodic") << " " //#54 rln 24.12.98 CCI60005 + << (ent->IsPolynomial(Standard_True) ? "Polynomial" : "Rational") + << "\nKnots : "; + IGESData_DumpVals(S,level,-ent->Degree(), upind+1,ent->Knot); + S << "\nWeights : "; + IGESData_DumpVals(S,level,0, upind,ent->Weight); + S << "\nControl Points (Poles) : "; + IGESData_DumpListXYZL(S,level,0, upind, ent->Pole, ent->Location()); + S << "\nStarting Parameter Value : " << ent->UMin() + << " Ending Parameter Value : " << ent->UMax() << "\n" + << "Unit Normal : "; IGESData_DumpXYZL(S,level, ent->Normal(), ent->Location()); - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESGeom/IGESGeom_ToolBSplineCurve.hxx b/src/IGESGeom/IGESGeom_ToolBSplineCurve.hxx index 2c0aa0ffbc..5c0e0d8065 100644 --- a/src/IGESGeom/IGESGeom_ToolBSplineCurve.hxx +++ b/src/IGESGeom/IGESGeom_ToolBSplineCurve.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a BSplineCurve. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESGeom_BSplineCurve)& entfrom, const Handle(IGESGeom_BSplineCurve)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESGeom_BSplineCurve)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESGeom_BSplineCurve)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESGeom/IGESGeom_ToolBSplineSurface.cxx b/src/IGESGeom/IGESGeom_ToolBSplineSurface.cxx index f54d8c9e36..190898c1ac 100644 --- a/src/IGESGeom/IGESGeom_ToolBSplineSurface.cxx +++ b/src/IGESGeom/IGESGeom_ToolBSplineSurface.cxx @@ -466,50 +466,50 @@ void IGESGeom_ToolBSplineSurface::OwnCheck(const Handle(IGESGeom_BSplineSurface) void IGESGeom_ToolBSplineSurface::OwnDump(const Handle(IGESGeom_BSplineSurface)& ent, const IGESData_IGESDumper& /* dumper */, - const Handle(Message_Messenger)& S, + Standard_OStream& S, const Standard_Integer level) const { - S << "BSplineSurface from IGESGeom" << Message_EndLine << Message_EndLine; + S << "BSplineSurface from IGESGeom\n\n"; Standard_Integer indU = ent->UpperIndexU(); Standard_Integer indV = ent->UpperIndexV(); Standard_Integer degU = ent->DegreeU(); Standard_Integer degV = ent->DegreeV(); - S << "In U : Upper Knot Index : " << indU; - S << " Degree : " << degU << " "; - S << (ent->IsClosedU() ? "Closed" : "Open") << " "; - S << (ent->IsPeriodicU() ? "Periodic" : "Non Periodic"); - S << Message_EndLine; - S << "In V : Upper Knot Index : " << indV; - S << " Degree : " << degV << " "; - S << (ent->IsClosedV() ? "Closed" : "Open") << " "; - S << (ent->IsPeriodicV() ? "Periodic" : "Non Periodic") << " "; - S << (ent->IsPolynomial(Standard_True) ? "Polynomial" : "Rational") << Message_EndLine; + S << "In U : Upper Knot Index : " << indU + << " Degree : " << degU << " " + << (ent->IsClosedU() ? "Closed" : "Open") << " " + << (ent->IsPeriodicU() ? "Periodic" : "Non Periodic") + << "\n" + << "In V : Upper Knot Index : " << indV + << " Degree : " << degV << " " + << (ent->IsClosedV() ? "Closed" : "Open") << " " + << (ent->IsPeriodicV() ? "Periodic" : "Non Periodic") << " " + << (ent->IsPolynomial(Standard_True) ? "Polynomial" : "Rational") << "\n"; - S << "Starting Parameter for U direction : " << ent->UMin() << Message_EndLine; - S << "Ending Parameter for U direction : " << ent->UMax() << Message_EndLine; - S << "Starting Parameter for V direction : " << ent->VMin() << Message_EndLine; - S << "Ending Parameter for V direction : " << ent->VMax() << Message_EndLine; + S << "Starting Parameter for U direction : " << ent->UMin() << "\n" + << "Ending Parameter for U direction : " << ent->UMax() << "\n" + << "Starting Parameter for V direction : " << ent->VMin() << "\n" + << "Ending Parameter for V direction : " << ent->VMax() << "\n"; S << " Knots in U : "; - IGESData_DumpVals(S ,level,-degU, indU+1,ent->KnotU); - S << Message_EndLine; - S << " Knots in V : "; - IGESData_DumpVals(S ,level,-degV, indV+1,ent->KnotV); - S << Message_EndLine; - S << "Weights : (Row -> IndexU, Col -> IndexV)"; - IGESData_DumpRectVals(S ,level,0, indU,0,indV,ent->Weight); - S << Message_EndLine; - S << "Control Points (Poles) : "; + IGESData_DumpVals(S,level,-degU, indU+1,ent->KnotU); + S << "\n" + << " Knots in V : "; + IGESData_DumpVals(S,level,-degV, indV+1,ent->KnotV); + S << "\n" + << "Weights : (Row -> IndexU, Col -> IndexV)"; + IGESData_DumpRectVals(S,level,0, indU,0,indV,ent->Weight); + S << "\n" + << "Control Points (Poles) : "; //IGESData_DumpRectXYZL(S,level,1, ent->NbPoles(),ent->Pole, ent->Location()); - if (level < 5) { S << " [ content : ask level > 4 ]" << Message_EndLine; return; } + if (level < 5) { S << " [ content : ask level > 4 ]" << std::endl; return; } gp_GTrsf loca = ent->Location(); for (Standard_Integer JP = 0; JP <= indV; JP ++) for (Standard_Integer IP = 0; IP <= indU; IP ++) { - if (IP == 0) S << Message_EndLine; + if (IP == 0) S << "\n"; S <<" - ["<Pole(IP,JP),loca); } - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESGeom/IGESGeom_ToolBSplineSurface.hxx b/src/IGESGeom/IGESGeom_ToolBSplineSurface.hxx index 7ad8e0bea8..a515656cb8 100644 --- a/src/IGESGeom/IGESGeom_ToolBSplineSurface.hxx +++ b/src/IGESGeom/IGESGeom_ToolBSplineSurface.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a BSplineSurface. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESGeom_BSplineSurface)& entfrom, const Handle(IGESGeom_BSplineSurface)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESGeom_BSplineSurface)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESGeom_BSplineSurface)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESGeom/IGESGeom_ToolBoundary.cxx b/src/IGESGeom/IGESGeom_ToolBoundary.cxx index 5994f1f7e6..6c7de8dc5f 100644 --- a/src/IGESGeom/IGESGeom_ToolBoundary.cxx +++ b/src/IGESGeom/IGESGeom_ToolBoundary.cxx @@ -34,7 +34,6 @@ #include #include #include -#include #include #include #include @@ -430,36 +429,38 @@ void IGESGeom_ToolBoundary::OwnCheck(const Handle(IGESGeom_Boundary)& ent, void IGESGeom_ToolBoundary::OwnDump(const Handle(IGESGeom_Boundary)& ent, const IGESData_IGESDumper& dumper, - const Handle(Message_Messenger)& S, + Standard_OStream& S, const Standard_Integer level) const { Standard_Integer i, num, sublevel = (level > 4) ? 1 : 0; - S << "IGESGeom_Boundary" << Message_EndLine; - S << "Bounded Surface Representation Type : " << ent->BoundaryType() << Message_EndLine; - S << "Trimming Curves Representation : " << ent->PreferenceType() << Message_EndLine; - S << "Bounded Surface : "; + S << "IGESGeom_Boundary\n" + << "Bounded Surface Representation Type : " << ent->BoundaryType() << "\n" + << "Trimming Curves Representation : " << ent->PreferenceType() << "\n" + << "Bounded Surface : "; dumper.Dump(ent->Surface(),S, sublevel); - S << Message_EndLine; - S << "Model Space Curves : " << Message_EndLine; - S << "Orientation Flags : " << Message_EndLine; - S << "Parameter Curves Set : "; - IGESData_DumpEntities - (S,dumper,-level,1,ent->NbModelSpaceCurves(),ent->ModelSpaceCurve); - S << Message_EndLine; + S << "\n" + << "Model Space Curves :\n" + << "Orientation Flags :\n" + << "Parameter Curves Set : "; + IGESData_DumpEntities(S,dumper,-level,1,ent->NbModelSpaceCurves(),ent->ModelSpaceCurve); + S << "\n"; if (level > 4) for ( num = ent->NbModelSpaceCurves(), i = 1; i <= num; i++ ) { - S << "[" << i << "]: "; - S << "Model Space Curve : "; + S << "[" << i << "]: " + << "Model Space Curve : "; dumper.Dump (ent->ModelSpaceCurve(i),S, 1); - S << " Orientation Flags : " << ent->Sense(i) << Message_EndLine; - S << " Parameter Curves : "; + S << " Orientation Flags : " << ent->Sense(i) << "\n" + << " Parameter Curves : "; Handle(IGESData_HArray1OfIGESEntity) curves = ent->ParameterCurves(i); if (!curves.IsNull()) { IGESData_DumpEntities(S,dumper, level,1,curves->Length(),curves->Value); } - else S << " List Empty"; - S << Message_EndLine; + else + { + S << " List Empty"; + } + S << "\n"; } - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESGeom/IGESGeom_ToolBoundary.hxx b/src/IGESGeom/IGESGeom_ToolBoundary.hxx index 8eee7e1e9d..d5b4d78dbf 100644 --- a/src/IGESGeom/IGESGeom_ToolBoundary.hxx +++ b/src/IGESGeom/IGESGeom_ToolBoundary.hxx @@ -34,8 +34,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a Boundary. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -74,7 +72,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESGeom_Boundary)& entfrom, const Handle(IGESGeom_Boundary)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESGeom_Boundary)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESGeom_Boundary)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESGeom/IGESGeom_ToolBoundedSurface.cxx b/src/IGESGeom/IGESGeom_ToolBoundedSurface.cxx index 8080c6b913..3253bc8fa4 100644 --- a/src/IGESGeom/IGESGeom_ToolBoundedSurface.cxx +++ b/src/IGESGeom/IGESGeom_ToolBoundedSurface.cxx @@ -250,16 +250,16 @@ void IGESGeom_ToolBoundedSurface::OwnCheck(const Handle(IGESGeom_BoundedSurface) void IGESGeom_ToolBoundedSurface::OwnDump(const Handle(IGESGeom_BoundedSurface)& ent, const IGESData_IGESDumper& dumper, - const Handle(Message_Messenger)& S, + Standard_OStream& S, const Standard_Integer level) const { Standard_Integer sublevel = (level > 4) ? 1 : 0; - S << "IGESGeom_BoundedSurface" << Message_EndLine; - S << "Representation Type : " << ent->RepresentationType() << Message_EndLine; - S << "Surface to be Bounded : "; + S << "IGESGeom_BoundedSurface\n" + << "Representation Type : " << ent->RepresentationType() << "\n" + << "Surface to be Bounded : "; dumper.Dump(ent->Surface(),S, sublevel); - S << Message_EndLine; - S << "Boundary Entities : "; + S << "\n" + << "Boundary Entities : "; IGESData_DumpEntities(S,dumper ,level,1, ent->NbBoundaries(),ent->Boundary); - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESGeom/IGESGeom_ToolBoundedSurface.hxx b/src/IGESGeom/IGESGeom_ToolBoundedSurface.hxx index 61c6d716c3..96444b19d7 100644 --- a/src/IGESGeom/IGESGeom_ToolBoundedSurface.hxx +++ b/src/IGESGeom/IGESGeom_ToolBoundedSurface.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a BoundedSurface. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESGeom_BoundedSurface)& entfrom, const Handle(IGESGeom_BoundedSurface)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESGeom_BoundedSurface)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESGeom_BoundedSurface)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESGeom/IGESGeom_ToolCircularArc.cxx b/src/IGESGeom/IGESGeom_ToolCircularArc.cxx index 7bdf9d9225..3be1d9f9a5 100644 --- a/src/IGESGeom/IGESGeom_ToolCircularArc.cxx +++ b/src/IGESGeom/IGESGeom_ToolCircularArc.cxx @@ -33,7 +33,6 @@ #include #include #include -#include #include #include @@ -141,20 +140,20 @@ void IGESGeom_ToolCircularArc::OwnCheck void IGESGeom_ToolCircularArc::OwnDump (const Handle(IGESGeom_CircularArc)& ent, const IGESData_IGESDumper& /* dumper */, - const Handle(Message_Messenger)& S, const Standard_Integer level) const + Standard_OStream& S, const Standard_Integer level) const { - S << "CircularArc from IGESGeom" << Message_EndLine; - S << "Z-Plane Displacement : " << ent->ZPlane() << Message_EndLine; - S << "Center : "; + S << "CircularArc from IGESGeom]\n" + << "Z-Plane Displacement : " << ent->ZPlane() << "\n" + << "Center : "; IGESData_DumpXYLZ(S,level, ent->Center(), ent->Location(), ent->ZPlane()); - S << Message_EndLine; - S << "Start Point : "; + S << "\n" + << "Start Point : "; IGESData_DumpXYLZ(S,level, ent->StartPoint(), ent->Location(),ent->ZPlane()); - S << Message_EndLine; - S << "End Point : "; + S << "\n" + << "End Point : "; IGESData_DumpXYLZ(S,level, ent->EndPoint(), ent->Location(), ent->ZPlane()); - S << Message_EndLine; + S << "\n"; if (level <= 5) return; - S<< " Normal Axis : "; IGESData_DumpXYZL(S,level,ent->Axis(),ent->VectorLocation()); - S << Message_EndLine; + S << " Normal Axis : "; IGESData_DumpXYZL(S,level,ent->Axis(),ent->VectorLocation()); + S << std::endl; } diff --git a/src/IGESGeom/IGESGeom_ToolCircularArc.hxx b/src/IGESGeom/IGESGeom_ToolCircularArc.hxx index f0676fef0e..03392da7da 100644 --- a/src/IGESGeom/IGESGeom_ToolCircularArc.hxx +++ b/src/IGESGeom/IGESGeom_ToolCircularArc.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a CircularArc. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESGeom_CircularArc)& entfrom, const Handle(IGESGeom_CircularArc)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESGeom_CircularArc)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESGeom_CircularArc)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESGeom/IGESGeom_ToolCompositeCurve.cxx b/src/IGESGeom/IGESGeom_ToolCompositeCurve.cxx index 7d13962d37..6bca940d04 100644 --- a/src/IGESGeom/IGESGeom_ToolCompositeCurve.cxx +++ b/src/IGESGeom/IGESGeom_ToolCompositeCurve.cxx @@ -121,10 +121,10 @@ void IGESGeom_ToolCompositeCurve::OwnCheck void IGESGeom_ToolCompositeCurve::OwnDump (const Handle(IGESGeom_CompositeCurve)& ent, const IGESData_IGESDumper& dumper, - const Handle(Message_Messenger)& S, const Standard_Integer level) const + Standard_OStream& S, const Standard_Integer level) const { - S << "IGESGeom_CompositeCurve" << Message_EndLine; - S << "Curve Entities : " << Message_EndLine; + S << "IGESGeom_CompositeCurve\n" + << "Curve Entities :\n"; IGESData_DumpEntities(S,dumper ,level,1, ent->NbCurves(),ent->Curve); - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESGeom/IGESGeom_ToolCompositeCurve.hxx b/src/IGESGeom/IGESGeom_ToolCompositeCurve.hxx index 501bc232f0..5f4b819f9e 100644 --- a/src/IGESGeom/IGESGeom_ToolCompositeCurve.hxx +++ b/src/IGESGeom/IGESGeom_ToolCompositeCurve.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a CompositeCurve. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESGeom_CompositeCurve)& entfrom, const Handle(IGESGeom_CompositeCurve)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESGeom_CompositeCurve)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESGeom_CompositeCurve)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESGeom/IGESGeom_ToolConicArc.cxx b/src/IGESGeom/IGESGeom_ToolConicArc.cxx index 6ef8a7385d..7947bd8faf 100644 --- a/src/IGESGeom/IGESGeom_ToolConicArc.cxx +++ b/src/IGESGeom/IGESGeom_ToolConicArc.cxx @@ -278,47 +278,49 @@ void IGESGeom_ToolConicArc::OwnCheck(const Handle(IGESGeom_ConicArc)& ent, void IGESGeom_ToolConicArc::OwnDump(const Handle(IGESGeom_ConicArc)& ent, const IGESData_IGESDumper& /* dumper */, - const Handle(Message_Messenger)& S, + Standard_OStream& S, const Standard_Integer level) const { Standard_Real A,B,C,D,E,F; ent->Equation(A,B,C,D,E,F); - S << "IGESGeom_ConicArc" << Message_EndLine; + S << "IGESGeom_ConicArc\n"; Standard_Integer cf = ent->FormNumber(); if (cf == 0) cf = ent->ComputedFormNumber(); - if (cf == 1) S << " -- Ellipse --" << Message_EndLine; - else if (cf == 2) S << " -- Hyperbola --" << Message_EndLine; - else if (cf == 3) S << " -- Parabola --" << Message_EndLine; - else S << " -- (Undetermined type of Conic) --" << Message_EndLine; - S << "Conic Coefficient A : " << A << Message_EndLine; - S << "Conic Coefficient B : " << B << Message_EndLine; - S << "Conic Coefficient C : " << C << Message_EndLine; - S << "Conic Coefficient D : " << D << Message_EndLine; - S << "Conic Coefficient E : " << E << Message_EndLine; - S << "Conic Coefficient F : " << F << Message_EndLine; - S << "Z-Plane shift : " << ent->ZPlane() << Message_EndLine; - S << "Start Point : "; + if (cf == 1) S << " -- Ellipse --\n"; + else if (cf == 2) S << " -- Hyperbola --\n"; + else if (cf == 3) S << " -- Parabola --\n"; + else S << " -- (Undetermined type of Conic) --\n"; + + S << "Conic Coefficient A : " << A << "\n" + << "Conic Coefficient B : " << B << "\n" + << "Conic Coefficient C : " << C << "\n" + << "Conic Coefficient D : " << D << "\n" + << "Conic Coefficient E : " << E << "\n" + << "Conic Coefficient F : " << F << "\n" + << "Z-Plane shift : " << ent->ZPlane() << "\n" + << "Start Point : "; IGESData_DumpXYLZ(S,level, ent->StartPoint(), ent->Location(),ent->ZPlane()); - S << Message_EndLine; - S << "End Point : "; + S << "\n" + << "End Point : "; IGESData_DumpXYLZ(S,level, ent->EndPoint(), ent->Location(), ent->ZPlane()); - S << Message_EndLine; - if (level <= 4) S<<" -- Computed Definition : ask level > 4" << Message_EndLine; + S << "\n"; + if (level <= 4) S <<" -- Computed Definition : ask level > 4" << std::endl; else { gp_Pnt Cen; gp_Dir Ax; Standard_Real Rmin,Rmax; ent->Definition (Cen,Ax,Rmin,Rmax); - S << " -- Computed Definition (and Transformed if level > 5)" << Message_EndLine; + S << " -- Computed Definition (and Transformed if level > 5)\n"; if (cf != 3) { - S<<" Center : "; IGESData_DumpXYZL(S,level,Cen,ent->Location()); - S<Location()); + S <<"\n"; } S << " Main Axis : "; IGESData_DumpXYZL(S,level,Ax,ent->VectorLocation()); - S<Axis(),ent->VectorLocation()); - S << Message_EndLine; + S <<"\n"; + if (cf == 3) S << " Focal : " << Rmin << "\n"; + else if (Rmin == Rmax) S << " Radius (Major = Minor) : " << Rmin << "\n"; + else S << " Major Radius : " << Rmax << " Minor Radius : " << Rmin <<"\n"; + + S << " Normal Axis : "; IGESData_DumpXYZL(S,level,ent->Axis(),ent->VectorLocation()); + S << std::endl; } } diff --git a/src/IGESGeom/IGESGeom_ToolConicArc.hxx b/src/IGESGeom/IGESGeom_ToolConicArc.hxx index df65fa70b7..362e89a6d3 100644 --- a/src/IGESGeom/IGESGeom_ToolConicArc.hxx +++ b/src/IGESGeom/IGESGeom_ToolConicArc.hxx @@ -34,8 +34,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a ConicArc. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -74,7 +72,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESGeom_ConicArc)& entfrom, const Handle(IGESGeom_ConicArc)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESGeom_ConicArc)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESGeom_ConicArc)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESGeom/IGESGeom_ToolCopiousData.cxx b/src/IGESGeom/IGESGeom_ToolCopiousData.cxx index 5d558a41c5..58ac8d32ce 100644 --- a/src/IGESGeom/IGESGeom_ToolCopiousData.cxx +++ b/src/IGESGeom/IGESGeom_ToolCopiousData.cxx @@ -262,7 +262,7 @@ void IGESGeom_ToolCopiousData::OwnCheck(const Handle(IGESGeom_CopiousData)& ent, void IGESGeom_ToolCopiousData::OwnDump(const Handle(IGESGeom_CopiousData)& ent, const IGESData_IGESDumper& /* dumper */, - const Handle(Message_Messenger)& S, + Standard_OStream& S, const Standard_Integer level) const { Standard_Integer nbPnts = ent->NbPoints(); @@ -272,21 +272,21 @@ void IGESGeom_ToolCopiousData::OwnDump(const Handle(IGESGeom_CopiousData)& ent, gp_GTrsf locv = ent->VectorLocation(); Standard_Boolean yatr = (level > 5 && ent->HasTransf()); - S << "IGESGeom_CopiousData" << Message_EndLine; + S << "IGESGeom_CopiousData\n"; if (ent->IsPointSet()) S << "Point Set "; else if (ent->IsPolyline()) S << "Polyline "; else if (ent->IsClosedPath2D()) S << "Closed Path 2D "; - S << "DataType " << ent->DataType() << " "; - S << "Number of T-uples = " << nbPnts << " "; + S << "DataType " << ent->DataType() << " " + << "Number of T-uples = " << nbPnts << " "; if (dtype == 1) { - S << "(Points 2D) "; - S << "ZPlane = " << ent->ZPlane() << Message_EndLine; + S << "(Points 2D) " + << "ZPlane = " << ent->ZPlane() << "\n"; } else if (dtype == 2) - S << "(Points 3D)" << Message_EndLine; + S << "(Points 3D)\n"; else if (dtype == 3) - S << "(Points 3D + Vectors 3D)" << Message_EndLine; + S << "(Points 3D + Vectors 3D)\n"; if (level > 4) { for (i = 1; i <= nbPnts; i ++) { @@ -309,9 +309,9 @@ void IGESGeom_ToolCopiousData::OwnDump(const Handle(IGESGeom_CopiousData)& ent, S << " Transformed ("<< T.X() << "," << T.Y() << "," << T.Z() << ")"; } } - S << Message_EndLine; + S << std::endl; } } else S << " [ for content, ask level > 4 ]"; - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESGeom/IGESGeom_ToolCopiousData.hxx b/src/IGESGeom/IGESGeom_ToolCopiousData.hxx index f0b66165e8..b043f1f413 100644 --- a/src/IGESGeom/IGESGeom_ToolCopiousData.hxx +++ b/src/IGESGeom/IGESGeom_ToolCopiousData.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a CopiousData. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESGeom_CopiousData)& entfrom, const Handle(IGESGeom_CopiousData)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESGeom_CopiousData)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESGeom_CopiousData)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESGeom/IGESGeom_ToolCurveOnSurface.cxx b/src/IGESGeom/IGESGeom_ToolCurveOnSurface.cxx index e1bbfbb18e..979daaa01b 100644 --- a/src/IGESGeom/IGESGeom_ToolCurveOnSurface.cxx +++ b/src/IGESGeom/IGESGeom_ToolCurveOnSurface.cxx @@ -265,33 +265,33 @@ void IGESGeom_ToolCurveOnSurface::OwnCheck(const Handle(IGESGeom_CurveOnSurface) void IGESGeom_ToolCurveOnSurface::OwnDump(const Handle(IGESGeom_CurveOnSurface)& ent, const IGESData_IGESDumper& dumper, - const Handle(Message_Messenger)& S, + Standard_OStream& S, const Standard_Integer level) const { - S << "IGESGeom_CurveOnSurface" << Message_EndLine << Message_EndLine; + S << "IGESGeom_CurveOnSurface\n\n"; Standard_Integer sublevel = (level <= 4) ? 0 : 1; Standard_Integer crem = ent->CreationMode(); S << "Creation Mode : " << crem << " i.e. "; - if (crem == 0) S << " " << Message_EndLine; - else if (crem == 1) S << " Projection of a Curve on a Surface" << Message_EndLine; - else if (crem == 2) S << " Intersection of two Surfaces" << Message_EndLine; - else if (crem == 3) S << " Isoparametric Curve (either U or V)" << Message_EndLine; - else S << " " << Message_EndLine; + if (crem == 0) S << " \n"; + else if (crem == 1) S << " Projection of a Curve on a Surface\n"; + else if (crem == 2) S << " Intersection of two Surfaces\n"; + else if (crem == 3) S << " Isoparametric Curve (either U or V)\n"; + else S << " \n"; S << "The Surface on which the curve lies : "; dumper.Dump(ent->Surface(),S, sublevel); - S << Message_EndLine; - S << "The curve B (in the parametric space (u, v)) : "; + S << "\n" + "The curve B (in the parametric space (u, v)) : "; dumper.Dump(ent->CurveUV(),S, sublevel); - S << Message_EndLine; - S << "The curve C (in the 3D Space) : "; + S << "\n" + "The curve C (in the 3D Space) : "; dumper.Dump(ent->Curve3D(),S, sublevel); - S << Message_EndLine; + S << "\n"; Standard_Integer pref = ent->PreferenceMode(); S << "Preferred representation mode : " << pref << " i.e. "; - if (pref == 0) S << " " << Message_EndLine; - else if (pref == 1) S << " Curve B on Surface" << Message_EndLine; - else if (pref == 2) S << " Curve C in 3D Space" << Message_EndLine; - else if (pref == 3) S << " Curves B & C equally preferred" << Message_EndLine; - else S << " " << Message_EndLine; + if (pref == 0) S << " \n"; + else if (pref == 1) S << " Curve B on Surface\n"; + else if (pref == 2) S << " Curve C in 3D Space\n"; + else if (pref == 3) S << " Curves B & C equally preferred\n"; + else S << " \n"; } diff --git a/src/IGESGeom/IGESGeom_ToolCurveOnSurface.hxx b/src/IGESGeom/IGESGeom_ToolCurveOnSurface.hxx index db69a033e3..c794925dfb 100644 --- a/src/IGESGeom/IGESGeom_ToolCurveOnSurface.hxx +++ b/src/IGESGeom/IGESGeom_ToolCurveOnSurface.hxx @@ -34,8 +34,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a CurveOnSurface. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -74,7 +72,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESGeom_CurveOnSurface)& entfrom, const Handle(IGESGeom_CurveOnSurface)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESGeom_CurveOnSurface)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESGeom_CurveOnSurface)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESGeom/IGESGeom_ToolDirection.cxx b/src/IGESGeom/IGESGeom_ToolDirection.cxx index 516234e44c..cc99544e21 100644 --- a/src/IGESGeom/IGESGeom_ToolDirection.cxx +++ b/src/IGESGeom/IGESGeom_ToolDirection.cxx @@ -33,7 +33,6 @@ #include #include #include -#include #include IGESGeom_ToolDirection::IGESGeom_ToolDirection () { } @@ -115,11 +114,10 @@ void IGESGeom_ToolDirection::OwnCheck void IGESGeom_ToolDirection::OwnDump (const Handle(IGESGeom_Direction)& ent, const IGESData_IGESDumper& /* dumper */, - const Handle(Message_Messenger)& S, const Standard_Integer level) const + Standard_OStream& S, const Standard_Integer level) const { - S << "IGESGeom_Direction" << Message_EndLine << Message_EndLine; - - S << "Value : "; + S << "IGESGeom_Direction\n\n" + << "Value : "; IGESData_DumpXYZL(S,level, ent->Value(), ent->VectorLocation()); - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESGeom/IGESGeom_ToolDirection.hxx b/src/IGESGeom/IGESGeom_ToolDirection.hxx index 50ab570ed9..f0aacec8c8 100644 --- a/src/IGESGeom/IGESGeom_ToolDirection.hxx +++ b/src/IGESGeom/IGESGeom_ToolDirection.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a Direction. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESGeom_Direction)& entfrom, const Handle(IGESGeom_Direction)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESGeom_Direction)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESGeom_Direction)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESGeom/IGESGeom_ToolFlash.cxx b/src/IGESGeom/IGESGeom_ToolFlash.cxx index de2dfeec88..4d1d4c7ce6 100644 --- a/src/IGESGeom/IGESGeom_ToolFlash.cxx +++ b/src/IGESGeom/IGESGeom_ToolFlash.cxx @@ -173,14 +173,14 @@ void IGESGeom_ToolFlash::OwnCheck void IGESGeom_ToolFlash::OwnDump (const Handle(IGESGeom_Flash)& 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) ? 0 : 1; Standard_Integer fn = ent->FormNumber(); - S << "IGESGeom_Flash" << Message_EndLine; + S << "IGESGeom_Flash\n"; switch (fn) { - case 0 : S << " -- Form defined by reference entity --" << Message_EndLine; break; + case 0 : S << " -- Form defined by reference entity --\n"; break; case 1 : S << " -- Circular -- "; break; case 2 : S << " -- Rectangle -- "; break; case 3 : S << " -- Donut -- "; break; @@ -190,10 +190,10 @@ void IGESGeom_ToolFlash::OwnDump S << "Flash reference point : "; IGESData_DumpXYL(S,level, ent->ReferencePoint(), ent->Location()); - S << " First sizing parameter : " << ent->Dimension1() << " "; - S << " Second sizing parameter : " << ent->Dimension2() << Message_EndLine; - S << " Rotation about reference entity : " << ent->Rotation() << Message_EndLine; - S << "Reference Entity : "; + S << " First sizing parameter : " << ent->Dimension1() << " " + << " Second sizing parameter : " << ent->Dimension2() << "\n" + << " Rotation about reference entity : " << ent->Rotation() << "\n" + << "Reference Entity : "; dumper.Dump(ent->ReferenceEntity(),S, sublevel); - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESGeom/IGESGeom_ToolFlash.hxx b/src/IGESGeom/IGESGeom_ToolFlash.hxx index a73f8f8ebb..27b4ea82ef 100644 --- a/src/IGESGeom/IGESGeom_ToolFlash.hxx +++ b/src/IGESGeom/IGESGeom_ToolFlash.hxx @@ -34,8 +34,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a Flash. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -74,7 +72,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESGeom_Flash)& entfrom, const Handle(IGESGeom_Flash)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESGeom_Flash)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESGeom_Flash)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESGeom/IGESGeom_ToolLine.cxx b/src/IGESGeom/IGESGeom_ToolLine.cxx index 64c81301f8..b501886540 100644 --- a/src/IGESGeom/IGESGeom_ToolLine.cxx +++ b/src/IGESGeom/IGESGeom_ToolLine.cxx @@ -108,20 +108,20 @@ void IGESGeom_ToolLine::OwnCheck void IGESGeom_ToolLine::OwnDump (const Handle(IGESGeom_Line)& 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 infin = ent->Infinite(); switch (infin) { - case 1 : S << "Semi-Infinite Line"<StartPoint(), ent->Location()); - S << Message_EndLine; - S << "End Point : "; + S << "\n" + "End Point : "; IGESData_DumpXYZL(S,level, ent->EndPoint(), ent->Location()); - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESGeom/IGESGeom_ToolLine.hxx b/src/IGESGeom/IGESGeom_ToolLine.hxx index 180764b020..9f34451580 100644 --- a/src/IGESGeom/IGESGeom_ToolLine.hxx +++ b/src/IGESGeom/IGESGeom_ToolLine.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a Line. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESGeom_Line)& entfrom, const Handle(IGESGeom_Line)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESGeom_Line)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESGeom_Line)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESGeom/IGESGeom_ToolOffsetCurve.cxx b/src/IGESGeom/IGESGeom_ToolOffsetCurve.cxx index b3148e6383..23dd13af62 100644 --- a/src/IGESGeom/IGESGeom_ToolOffsetCurve.cxx +++ b/src/IGESGeom/IGESGeom_ToolOffsetCurve.cxx @@ -351,27 +351,26 @@ void IGESGeom_ToolOffsetCurve::OwnCheck(const Handle(IGESGeom_OffsetCurve)& ent, void IGESGeom_ToolOffsetCurve::OwnDump(const Handle(IGESGeom_OffsetCurve)& ent, const IGESData_IGESDumper& dumper, - const Handle(Message_Messenger)& S, + Standard_OStream& S, const Standard_Integer level) const { Standard_Integer sublevel = (level <= 4) ? 0 : 1; - S << "IGESGeom_OffsetCurve" << Message_EndLine; - - S << "The curve to be offset : " << Message_EndLine; + S << "IGESGeom_OffsetCurve\n" + << "The curve to be offset :\n"; dumper.Dump(ent->BaseCurve(),S, sublevel); - S << "Offset Distance Flag : " << ent->OffsetType() << Message_EndLine; - S << "Curve entity whose coordinate defines the offset : "; + S << "Offset Distance Flag : " << ent->OffsetType() << "\n" + << "Curve entity whose coordinate defines the offset : "; dumper.Dump(ent->Function(),S, sublevel); - S << Message_EndLine; - S << "In which Coordinate to use : " << ent->FunctionParameter() << Message_EndLine; - S << "Tapered Offset Type Flag : " << ent->TaperedOffsetType() << Message_EndLine; - S << "First Offset Distance : " << ent->FirstOffsetDistance() << " "; - S << "Arc Length : " << ent->ArcLength1() << Message_EndLine; - S << "Second Offset Distance : " << ent->SecondOffsetDistance() << " "; - S << "Arc Length : " << ent->ArcLength2() << Message_EndLine; - S << "Normal Vector : "; - IGESData_DumpXYZL(S,level, ent->NormalVector(), ent->VectorLocation()); S<StartParameter() << " "; - S << "Ending : " << ent->EndParameter() << Message_EndLine; + S << "\n" + << "In which Coordinate to use : " << ent->FunctionParameter() << "\n" + << "Tapered Offset Type Flag : " << ent->TaperedOffsetType() << "\n" + << "First Offset Distance : " << ent->FirstOffsetDistance() << " " + << "Arc Length : " << ent->ArcLength1() << "\n" + << "Second Offset Distance : " << ent->SecondOffsetDistance() << " " + << "Arc Length : " << ent->ArcLength2() << "\n" + << "Normal Vector : "; + IGESData_DumpXYZL(S,level, ent->NormalVector(), ent->VectorLocation()); S <<"\n"; + S << "Offset curve Parameters. Starting : " << ent->StartParameter() << " " + << "Ending : " << ent->EndParameter() << std::endl; } diff --git a/src/IGESGeom/IGESGeom_ToolOffsetCurve.hxx b/src/IGESGeom/IGESGeom_ToolOffsetCurve.hxx index 75dc1d8148..3302b15d2e 100644 --- a/src/IGESGeom/IGESGeom_ToolOffsetCurve.hxx +++ b/src/IGESGeom/IGESGeom_ToolOffsetCurve.hxx @@ -34,8 +34,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a OffsetCurve. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -74,7 +72,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESGeom_OffsetCurve)& entfrom, const Handle(IGESGeom_OffsetCurve)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESGeom_OffsetCurve)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESGeom_OffsetCurve)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESGeom/IGESGeom_ToolOffsetSurface.cxx b/src/IGESGeom/IGESGeom_ToolOffsetSurface.cxx index 3857c449a8..4a0151b7a2 100644 --- a/src/IGESGeom/IGESGeom_ToolOffsetSurface.cxx +++ b/src/IGESGeom/IGESGeom_ToolOffsetSurface.cxx @@ -147,17 +147,16 @@ void IGESGeom_ToolOffsetSurface::OwnCheck void IGESGeom_ToolOffsetSurface::OwnDump (const Handle(IGESGeom_OffsetSurface)& 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) ? 0 : 1; - S << "IGESGeom_OffsetSurface" << Message_EndLine; - - S << "Offset Indicator : "; + S << "IGESGeom_OffsetSurface\n" + << "Offset Indicator : "; IGESData_DumpXYZL(S,level, ent->OffsetIndicator(), ent->VectorLocation()); - S << Message_EndLine; - S << "Offset Distance : " << ent->Distance() << " "; - S << "Surface to be offset : "; + S << "\n" + << "Offset Distance : " << ent->Distance() << " " + << "Surface to be offset : "; dumper.Dump(ent->Surface(),S, sublevel); - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESGeom/IGESGeom_ToolOffsetSurface.hxx b/src/IGESGeom/IGESGeom_ToolOffsetSurface.hxx index 5aeda5da3d..c93ebdd43a 100644 --- a/src/IGESGeom/IGESGeom_ToolOffsetSurface.hxx +++ b/src/IGESGeom/IGESGeom_ToolOffsetSurface.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a OffsetSurface. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESGeom_OffsetSurface)& entfrom, const Handle(IGESGeom_OffsetSurface)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESGeom_OffsetSurface)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESGeom_OffsetSurface)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESGeom/IGESGeom_ToolPlane.cxx b/src/IGESGeom/IGESGeom_ToolPlane.cxx index 9fa0a8b7d1..57a91718d2 100644 --- a/src/IGESGeom/IGESGeom_ToolPlane.cxx +++ b/src/IGESGeom/IGESGeom_ToolPlane.cxx @@ -266,21 +266,21 @@ void IGESGeom_ToolPlane::OwnCheck(const Handle(IGESGeom_Plane)& ent, void IGESGeom_ToolPlane::OwnDump(const Handle(IGESGeom_Plane)& ent, const IGESData_IGESDumper& dumper, - const Handle(Message_Messenger)& S, + Standard_OStream& S, const Standard_Integer level) const { - S << "IGESGeom_Plane" << Message_EndLine; + S << "IGESGeom_Plane\n"; Standard_Real A,B,C,D; ent->Equation(A,B,C,D); - S << "Plane Coefficient A : " << A << Message_EndLine; - S << "Plane Coefficient B : " << B << Message_EndLine; - S << "Plane Coefficient C : " << C << Message_EndLine; - S << "Plane Coefficient D : " << D << Message_EndLine; - S << "The Bounding Curve : " ; + S << "Plane Coefficient A : " << A << "\n" + << "Plane Coefficient B : " << B << "\n" + << "Plane Coefficient C : " << C << "\n" + << "Plane Coefficient D : " << D << "\n" + << "The Bounding Curve : " ; dumper.Dump(ent->BoundingCurve(),S, (level <= 4) ? 0 : 1); - S << Message_EndLine; - S << "Display Symbol Location : "; + S << "\n" + << "Display Symbol Location : "; IGESData_DumpXYZL(S,level, ent->SymbolAttach(), ent->Location()); - S << " Size : " << ent->SymbolSize() << Message_EndLine; + S << " Size : " << ent->SymbolSize() << std::endl; } diff --git a/src/IGESGeom/IGESGeom_ToolPlane.hxx b/src/IGESGeom/IGESGeom_ToolPlane.hxx index 2d693b73e6..29bf270f13 100644 --- a/src/IGESGeom/IGESGeom_ToolPlane.hxx +++ b/src/IGESGeom/IGESGeom_ToolPlane.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a Plane. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESGeom_Plane)& entfrom, const Handle(IGESGeom_Plane)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESGeom_Plane)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESGeom_Plane)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESGeom/IGESGeom_ToolPoint.cxx b/src/IGESGeom/IGESGeom_ToolPoint.cxx index 677032e664..670f11fc7b 100644 --- a/src/IGESGeom/IGESGeom_ToolPoint.cxx +++ b/src/IGESGeom/IGESGeom_ToolPoint.cxx @@ -142,14 +142,13 @@ void IGESGeom_ToolPoint::OwnCheck void IGESGeom_ToolPoint::OwnDump (const Handle(IGESGeom_Point)& ent, const IGESData_IGESDumper& dumper, - const Handle(Message_Messenger)& S, const Standard_Integer level) const + Standard_OStream& S, const Standard_Integer level) const { - S << "IGESGeom_Point" << Message_EndLine; - - S << " Value : "; + S << "IGESGeom_Point\n" + << " Value : "; IGESData_DumpXYZL(S,level, ent->Value(), ent->Location()); - S << Message_EndLine; - S << " Display Symbol : "; + S << "\n" + << " Display Symbol : "; dumper.Dump(ent->DisplaySymbol(),S, (level <= 4) ? 0 : 1); - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESGeom/IGESGeom_ToolPoint.hxx b/src/IGESGeom/IGESGeom_ToolPoint.hxx index 5eb5a28fec..d8e3c43c2b 100644 --- a/src/IGESGeom/IGESGeom_ToolPoint.hxx +++ b/src/IGESGeom/IGESGeom_ToolPoint.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a Point. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESGeom_Point)& entfrom, const Handle(IGESGeom_Point)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESGeom_Point)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESGeom_Point)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESGeom/IGESGeom_ToolRuledSurface.cxx b/src/IGESGeom/IGESGeom_ToolRuledSurface.cxx index 2dc97ae3d0..92cba6e94e 100644 --- a/src/IGESGeom/IGESGeom_ToolRuledSurface.cxx +++ b/src/IGESGeom/IGESGeom_ToolRuledSurface.cxx @@ -153,21 +153,20 @@ void IGESGeom_ToolRuledSurface::OwnCheck void IGESGeom_ToolRuledSurface::OwnDump (const Handle(IGESGeom_RuledSurface)& 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 tempSubLevel = (level <= 4) ? 0 : 1; - S << "IGESGeom_RuledSurface" << Message_EndLine; - - S << "First Curve : "; + S << "IGESGeom_RuledSurface\n" + << "First Curve : "; dumper.Dump(ent->FirstCurve(),S, tempSubLevel); - S << Message_EndLine; - S << "Second Curve : "; + S << "\n" + << "Second Curve : "; dumper.Dump(ent->SecondCurve(),S, tempSubLevel); - S << Message_EndLine; - S << "Direction Flag : " << ent->DirectionFlag() << " i.e."; - if (ent->DirectionFlag() == 0) S<< "Join First to First, Last to Last"<IsDevelopable()) S << " .. Is Developable" << Message_EndLine; - else S << " .. Is possibly not developable .." << Message_EndLine; + S << "\n" + << "Direction Flag : " << ent->DirectionFlag() << " i.e."; + if (ent->DirectionFlag() == 0) S << "Join First to First, Last to Last\n"; + else S << "Join First to Last, Last to First\n"; + if (ent->IsDevelopable()) S << " .. Is Developable\n"; + else S << " .. Is possibly not developable ..\n"; } diff --git a/src/IGESGeom/IGESGeom_ToolRuledSurface.hxx b/src/IGESGeom/IGESGeom_ToolRuledSurface.hxx index d14c69f339..13e4fd1e12 100644 --- a/src/IGESGeom/IGESGeom_ToolRuledSurface.hxx +++ b/src/IGESGeom/IGESGeom_ToolRuledSurface.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a RuledSurface. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESGeom_RuledSurface)& entfrom, const Handle(IGESGeom_RuledSurface)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESGeom_RuledSurface)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESGeom_RuledSurface)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESGeom/IGESGeom_ToolSplineCurve.cxx b/src/IGESGeom/IGESGeom_ToolSplineCurve.cxx index 246d40f4b5..b4d0a938f9 100644 --- a/src/IGESGeom/IGESGeom_ToolSplineCurve.cxx +++ b/src/IGESGeom/IGESGeom_ToolSplineCurve.cxx @@ -30,7 +30,6 @@ #include #include #include -#include #include #include #include @@ -320,9 +319,9 @@ void IGESGeom_ToolSplineCurve::OwnCheck void IGESGeom_ToolSplineCurve::OwnDump (const Handle(IGESGeom_SplineCurve)& ent, const IGESData_IGESDumper& /* dumper */, - const Handle(Message_Messenger)& S, const Standard_Integer level) const + Standard_OStream& S, const Standard_Integer level) const { - S << "IGESGeom_SplineCurve" << Message_EndLine; + S << "IGESGeom_SplineCurve\n"; Standard_Integer nbSegments = ent->NbSegments(); S << "Spline Type : " << ent->SplineType() << " "; @@ -336,17 +335,17 @@ void IGESGeom_ToolSplineCurve::OwnDump case 6 : S << "(B-Spline)"; break; default : S << "(Invalid value)"; break; } - S << Message_EndLine; - S << "Degree Of Continuity : " << ent->Degree() << Message_EndLine; - S << "Number Of Dimensions : " << ent->NbDimensions() << Message_EndLine; - S << "Number Of Segments : " << ent->NbSegments() << Message_EndLine; - S << "Segment Break Points : "; - IGESData_DumpVals(S ,level,1, nbSegments+1,ent->BreakPoint); + S << "\n" + << "Degree Of Continuity : " << ent->Degree() << "\n" + << "Number Of Dimensions : " << ent->NbDimensions() << "\n" + << "Number Of Segments : " << ent->NbSegments() << "\n" + << "Segment Break Points : "; + IGESData_DumpVals(S,level,1, nbSegments+1,ent->BreakPoint); if (level <= 4) { - S << " [ also ask level > 4 for X-Y-Z Polynomials ]" << Message_EndLine; + S << " [ also ask level > 4 for X-Y-Z Polynomials ]" << std::endl; return; } - S << " -- Polynomial Values --" << Message_EndLine; + S << " -- Polynomial Values --\n"; Standard_Real AX,BX,CX,DX, AY,BY,CY,DY, AZ,BZ,CZ,DZ; for (Standard_Integer I = 1; I <= nbSegments; I++) { //no need to declare (hides the same name in an outer scope) @@ -354,18 +353,18 @@ void IGESGeom_ToolSplineCurve::OwnDump ent->XCoordPolynomial(I,AX,BX,CX,DX); ent->YCoordPolynomial(I,AY,BY,CY,DY); ent->ZCoordPolynomial(I,AZ,BZ,CZ,DZ); - S << "Segment "<XValues(AX,BX,CX,DX); ent->YValues(AY,BY,CY,DY); ent->ZValues(AZ,BZ,CZ,DZ); - S << "Terminate Point : X Y Z"<NbUSegments(); @@ -330,39 +330,38 @@ void IGESGeom_ToolSplineSurface::OwnDump case 6 : S << " (B-Spline)"; break; default : S << " (Invalid value)"; break; } - S << Message_EndLine; - S << "The Patch Type : " << ent->PatchType(); + S << "\n" + << "The Patch Type : " << ent->PatchType(); if (ent->PatchType() == 1) S << " (Cartesian Product)"; else S << " (Unspecified)"; - S << Message_EndLine; - S << "Number Of Segments. In U : " - << nbUSegs << " In V : " << nbVSegs << Message_EndLine; - S << "The U Break Points : "; - IGESData_DumpVals(S ,level,1, nbUSegs+1,ent->UBreakPoint); - S <VBreakPoint); + S << "\n" + << "Number Of Segments. In U : " + << nbUSegs << " In V : " << nbVSegs << "\n" + << "The U Break Points : "; + IGESData_DumpVals(S,level,1, nbUSegs+1,ent->UBreakPoint); + S << "\nThe V Break Points : "; + IGESData_DumpVals(S,level,1, nbVSegs+1,ent->VBreakPoint); - S < 4) { for (I = 1; I <= nbUSegs; I++) for (J = 1; J <= nbVSegs; J++) { - S << "[" << I <<"," << J << "]: " << Message_EndLine; - S << "X Polynomial : "; + S << "[" << I <<"," << J << "]:\n" + << "X Polynomial : "; temp = ent->XPolynomial(I,J); IGESData_DumpVals(S,level,1, temp->Length(),temp->Value); - S << Message_EndLine; - S << "Y Polynomial : "; + S << "\n" + << "Y Polynomial : "; temp = ent->YPolynomial(I,J); IGESData_DumpVals(S,level,1, temp->Length(),temp->Value); - S << Message_EndLine; - S << "Z Polynomial : "; + S << "\n" + << "Z Polynomial : "; temp = ent->ZPolynomial(I,J); IGESData_DumpVals(S,level,1, temp->Length(),temp->Value); - S << Message_EndLine; + S << "\n"; } } - else S << Message_EndLine; + else S << std::endl; } diff --git a/src/IGESGeom/IGESGeom_ToolSplineSurface.hxx b/src/IGESGeom/IGESGeom_ToolSplineSurface.hxx index 27e9a68e08..ba3eb4a38b 100644 --- a/src/IGESGeom/IGESGeom_ToolSplineSurface.hxx +++ b/src/IGESGeom/IGESGeom_ToolSplineSurface.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a SplineSurface. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESGeom_SplineSurface)& entfrom, const Handle(IGESGeom_SplineSurface)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESGeom_SplineSurface)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESGeom_SplineSurface)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESGeom/IGESGeom_ToolSurfaceOfRevolution.cxx b/src/IGESGeom/IGESGeom_ToolSurfaceOfRevolution.cxx index 4a3904cfbe..c5bd1e9953 100644 --- a/src/IGESGeom/IGESGeom_ToolSurfaceOfRevolution.cxx +++ b/src/IGESGeom/IGESGeom_ToolSurfaceOfRevolution.cxx @@ -32,7 +32,6 @@ #include #include #include -#include #include #include @@ -164,18 +163,17 @@ void IGESGeom_ToolSurfaceOfRevolution::OwnCheck void IGESGeom_ToolSurfaceOfRevolution::OwnDump (const Handle(IGESGeom_SurfaceOfRevolution)& ent, const IGESData_IGESDumper& dumper, - const Handle(Message_Messenger)& S, const Standard_Integer level) const + Standard_OStream& S, const Standard_Integer level) const { - - S << "IGESGeom_SurfaceOfRevolution" << Message_EndLine << Message_EndLine; + S << "IGESGeom_SurfaceOfRevolution\n\n"; Standard_Integer sublevel = (level <= 4) ? 0 : 1; S << "Axis Of Revolution : "; dumper.Dump(ent->AxisOfRevolution(),S, sublevel); - S << Message_EndLine; - S << "Generatrix : "; + S << "\n" + << "Generatrix : "; dumper.Dump(ent->Generatrix(),S, sublevel); - S << Message_EndLine; - S << "Start Angle : " << ent->StartAngle() << " "; - S << "End Angle : " << ent->EndAngle() << Message_EndLine; + S << "\n" + << "Start Angle : " << ent->StartAngle() << " " + << "End Angle : " << ent->EndAngle() << std::endl; } diff --git a/src/IGESGeom/IGESGeom_ToolSurfaceOfRevolution.hxx b/src/IGESGeom/IGESGeom_ToolSurfaceOfRevolution.hxx index 9c1acfb1c6..dbd8cd95bd 100644 --- a/src/IGESGeom/IGESGeom_ToolSurfaceOfRevolution.hxx +++ b/src/IGESGeom/IGESGeom_ToolSurfaceOfRevolution.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a SurfaceOfRevolution. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESGeom_SurfaceOfRevolution)& entfrom, const Handle(IGESGeom_SurfaceOfRevolution)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESGeom_SurfaceOfRevolution)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESGeom_SurfaceOfRevolution)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESGeom/IGESGeom_ToolTabulatedCylinder.cxx b/src/IGESGeom/IGESGeom_ToolTabulatedCylinder.cxx index 26079bea74..63799c5471 100644 --- a/src/IGESGeom/IGESGeom_ToolTabulatedCylinder.cxx +++ b/src/IGESGeom/IGESGeom_ToolTabulatedCylinder.cxx @@ -34,7 +34,6 @@ #include #include #include -#include #include #include @@ -133,16 +132,15 @@ void IGESGeom_ToolTabulatedCylinder::OwnCheck void IGESGeom_ToolTabulatedCylinder::OwnDump (const Handle(IGESGeom_TabulatedCylinder)& 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) ? 0 : 1; - S << "IGESGeom_TabulatedCylinder" << Message_EndLine; - - S << "Directrix : "; + S << "IGESGeom_TabulatedCylinder\n" + << "Directrix : "; dumper.Dump(ent->Directrix(),S, sublevel); - S << Message_EndLine; - S << "Terminate Point : "; + S << "\n" + << "Terminate Point : "; IGESData_DumpXYZL(S,level, ent->EndPoint(), ent->Location()); - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESGeom/IGESGeom_ToolTabulatedCylinder.hxx b/src/IGESGeom/IGESGeom_ToolTabulatedCylinder.hxx index f40c7afdff..746e5f52c0 100644 --- a/src/IGESGeom/IGESGeom_ToolTabulatedCylinder.hxx +++ b/src/IGESGeom/IGESGeom_ToolTabulatedCylinder.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a TabulatedCylinder. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESGeom_TabulatedCylinder)& entfrom, const Handle(IGESGeom_TabulatedCylinder)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESGeom_TabulatedCylinder)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESGeom_TabulatedCylinder)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESGeom/IGESGeom_ToolTransformationMatrix.cxx b/src/IGESGeom/IGESGeom_ToolTransformationMatrix.cxx index fc4e73d96e..16d09c5e27 100644 --- a/src/IGESGeom/IGESGeom_ToolTransformationMatrix.cxx +++ b/src/IGESGeom/IGESGeom_ToolTransformationMatrix.cxx @@ -30,7 +30,6 @@ #include #include #include -#include #include #include #include @@ -212,28 +211,25 @@ void IGESGeom_ToolTransformationMatrix::OwnCheck void IGESGeom_ToolTransformationMatrix::OwnDump (const Handle(IGESGeom_TransformationMatrix)& ent, const IGESData_IGESDumper& /*dumper*/, - const Handle(Message_Messenger)& S, const Standard_Integer /*level*/) const + Standard_OStream& S, const Standard_Integer /*level*/) const { - S << "IGESGeom_TransformationMatrix" << Message_EndLine; - - S << "| R11, R12, R13, T1 | " + S << "IGESGeom_TransformationMatrix\n" + << "| R11, R12, R13, T1 | " << ent->Data(1, 1) << ", " << ent->Data(1, 2) << ", " - << ent->Data(1, 3) << ", " << ent->Data(1, 4) << Message_EndLine; - - S << "| R21, R22, R23, T2 | " + << ent->Data(1, 3) << ", " << ent->Data(1, 4) << "\n" + << "| R21, R22, R23, T2 | " << ent->Data(2, 1) << ", " << ent->Data(2, 2) << ", " - << ent->Data(2, 3) << ", " << ent->Data(2, 4) << Message_EndLine; - - S << "| R31, R32, R33, T3 | " + << ent->Data(2, 3) << ", " << ent->Data(2, 4) << "\n" + << "| R31, R32, R33, T3 | " << ent->Data(3, 1) << ", " << ent->Data(3, 2) << ", " - << ent->Data(3, 3) << ", " << ent->Data(3, 4) << Message_EndLine; + << ent->Data(3, 3) << ", " << ent->Data(3, 4) << "\n"; switch (ent->FormNumber()) { - case 0 : S << "-- Direct Orthogonal Matrix" << Message_EndLine; break; - case 1 : S << "-- Reverse Orthogonal Matrix" << Message_EndLine; break; - case 10 : S << "-- Cartesien Coordinate System" << Message_EndLine; break; - case 11 : S << "-- Cylindrical Coordinate System" << Message_EndLine; break; - case 12 : S << "-- Spherical Coordinate System" << Message_EndLine; break; - default : S << "-- (Incorrect Form Number)" << Message_EndLine; break; + case 0 : S << "-- Direct Orthogonal Matrix" << std::endl; break; + case 1 : S << "-- Reverse Orthogonal Matrix" << std::endl; break; + case 10 : S << "-- Cartesien Coordinate System" << std::endl; break; + case 11 : S << "-- Cylindrical Coordinate System" << std::endl; break; + case 12 : S << "-- Spherical Coordinate System" << std::endl; break; + default : S << "-- (Incorrect Form Number)" << std::endl; break; } } diff --git a/src/IGESGeom/IGESGeom_ToolTransformationMatrix.hxx b/src/IGESGeom/IGESGeom_ToolTransformationMatrix.hxx index 6e4be028c3..811d7d8d4e 100644 --- a/src/IGESGeom/IGESGeom_ToolTransformationMatrix.hxx +++ b/src/IGESGeom/IGESGeom_ToolTransformationMatrix.hxx @@ -34,8 +34,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a TransformationMatrix. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -74,7 +72,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESGeom_TransformationMatrix)& entfrom, const Handle(IGESGeom_TransformationMatrix)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESGeom_TransformationMatrix)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESGeom_TransformationMatrix)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESGeom/IGESGeom_ToolTrimmedSurface.cxx b/src/IGESGeom/IGESGeom_ToolTrimmedSurface.cxx index 8c7dd3a0c8..152a0ff84e 100644 --- a/src/IGESGeom/IGESGeom_ToolTrimmedSurface.cxx +++ b/src/IGESGeom/IGESGeom_ToolTrimmedSurface.cxx @@ -34,7 +34,6 @@ #include #include #include -#include #include #include @@ -299,21 +298,20 @@ void IGESGeom_ToolTrimmedSurface::OwnCheck(const Handle(IGESGeom_TrimmedSurface) void IGESGeom_ToolTrimmedSurface::OwnDump(const Handle(IGESGeom_TrimmedSurface)& ent, const IGESData_IGESDumper& dumper, - const Handle(Message_Messenger)& S, + Standard_OStream& S, const Standard_Integer level) const { Standard_Integer tempSubLevel = (level <= 4) ? 0 : 1; - S << "IGESGeom_TrimmedSurface" << Message_EndLine; - - S << "Surface to be trimmed : "; + S << "IGESGeom_TrimmedSurface\n" + << "Surface to be trimmed : "; dumper.Dump(ent->Surface(),S, tempSubLevel); - S << Message_EndLine; - S << "Boundary type : " << ent->OuterBoundaryType() << Message_EndLine; - S << "Outer Boundary : "; + S << "\n" + << "Boundary type : " << ent->OuterBoundaryType() << "\n" + << "Outer Boundary : "; dumper.Dump(ent->OuterContour(),S, tempSubLevel); - S << Message_EndLine; - S << "Inner Boundaries : "; + S << "\n" + << "Inner Boundaries : "; IGESData_DumpEntities(S,dumper ,level,1, ent->NbInnerContours(),ent->InnerContour); - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESGeom/IGESGeom_ToolTrimmedSurface.hxx b/src/IGESGeom/IGESGeom_ToolTrimmedSurface.hxx index 6dfeb3a3fc..87eeb9a3cc 100644 --- a/src/IGESGeom/IGESGeom_ToolTrimmedSurface.hxx +++ b/src/IGESGeom/IGESGeom_ToolTrimmedSurface.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a TrimmedSurface. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESGeom_TrimmedSurface)& entfrom, const Handle(IGESGeom_TrimmedSurface)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESGeom_TrimmedSurface)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESGeom_TrimmedSurface)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESGraph/IGESGraph_SpecificModule.cxx b/src/IGESGraph/IGESGraph_SpecificModule.cxx index d96d195e4f..5b52244b7f 100644 --- a/src/IGESGraph/IGESGraph_SpecificModule.cxx +++ b/src/IGESGraph/IGESGraph_SpecificModule.cxx @@ -57,7 +57,7 @@ IGESGraph_SpecificModule::IGESGraph_SpecificModule() { } void IGESGraph_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) { diff --git a/src/IGESGraph/IGESGraph_SpecificModule.hxx b/src/IGESGraph/IGESGraph_SpecificModule.hxx index d119954854..18440234ae 100644 --- a/src/IGESGraph/IGESGraph_SpecificModule.hxx +++ b/src/IGESGraph/IGESGraph_SpecificModule.hxx @@ -25,8 +25,6 @@ #include class IGESData_IGESEntity; class IGESData_IGESDumper; -class Message_Messenger; - class IGESGraph_SpecificModule; DEFINE_STANDARD_HANDLE(IGESGraph_SpecificModule, IGESData_SpecificModule) @@ -43,7 +41,7 @@ public: Standard_EXPORT IGESGraph_SpecificModule(); //! Specific Dump (own parameters) for IGESGraph - 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 (DrawingSize,DrawingUnits,HighLight,IntercharacterSpacing, diff --git a/src/IGESGraph/IGESGraph_ToolColor.cxx b/src/IGESGraph/IGESGraph_ToolColor.cxx index 94e6a39f2c..be7a710f95 100644 --- a/src/IGESGraph/IGESGraph_ToolColor.cxx +++ b/src/IGESGraph/IGESGraph_ToolColor.cxx @@ -118,16 +118,16 @@ void IGESGraph_ToolColor::OwnCheck void IGESGraph_ToolColor::OwnDump (const Handle(IGESGraph_Color)& ent, const IGESData_IGESDumper& /*dumper*/, - const Handle(Message_Messenger)& S, const Standard_Integer /*level*/) const + Standard_OStream& S, const Standard_Integer /*level*/) const { - S << "IGESGraph_Color" << Message_EndLine; + S << "IGESGraph_Color\n"; Standard_Real Red,Green,Blue; ent->RGBIntensity(Red,Green,Blue); - S << "Red (in % Of Full Intensity) : " << Red << Message_EndLine; - S << "Green (in % Of Full Intensity) : " << Green << Message_EndLine; - S << "Blue (in % Of Full Intensity) : " << Blue << Message_EndLine; - S << "Color Name : "; + S << "Red (in % Of Full Intensity) : " << Red << "\n" + << "Green (in % Of Full Intensity) : " << Green << "\n" + << "Blue (in % Of Full Intensity) : " << Blue << "\n" + << "Color Name : "; IGESData_DumpString(S,ent->ColorName()); - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESGraph/IGESGraph_ToolColor.hxx b/src/IGESGraph/IGESGraph_ToolColor.hxx index 92b650fdc3..8d1bb88195 100644 --- a/src/IGESGraph/IGESGraph_ToolColor.hxx +++ b/src/IGESGraph/IGESGraph_ToolColor.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a Color. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESGraph_Color)& entfrom, const Handle(IGESGraph_Color)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESGraph_Color)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESGraph_Color)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESGraph/IGESGraph_ToolDefinitionLevel.cxx b/src/IGESGraph/IGESGraph_ToolDefinitionLevel.cxx index 03e63814b0..486862f35d 100644 --- a/src/IGESGraph/IGESGraph_ToolDefinitionLevel.cxx +++ b/src/IGESGraph/IGESGraph_ToolDefinitionLevel.cxx @@ -112,12 +112,11 @@ void IGESGraph_ToolDefinitionLevel::OwnCheck void IGESGraph_ToolDefinitionLevel::OwnDump (const Handle(IGESGraph_DefinitionLevel)& ent, const IGESData_IGESDumper& /*dumper*/, - const Handle(Message_Messenger)& S, const Standard_Integer level) const + Standard_OStream& S, const Standard_Integer level) const { - S << "IGESGraph_DefinitionLevel" << Message_EndLine; - - S << "Level Numbers : "; - IGESData_DumpVals(S ,level,1, ent->NbPropertyValues(),ent->LevelNumber); - S << Message_EndLine; + S << "IGESGraph_DefinitionLevel\n" + << "Level Numbers : "; + IGESData_DumpVals(S,level,1, ent->NbPropertyValues(),ent->LevelNumber); + S << std::endl; } diff --git a/src/IGESGraph/IGESGraph_ToolDefinitionLevel.hxx b/src/IGESGraph/IGESGraph_ToolDefinitionLevel.hxx index fbae62d20a..a373d6afbf 100644 --- a/src/IGESGraph/IGESGraph_ToolDefinitionLevel.hxx +++ b/src/IGESGraph/IGESGraph_ToolDefinitionLevel.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a DefinitionLevel. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESGraph_DefinitionLevel)& entfrom, const Handle(IGESGraph_DefinitionLevel)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESGraph_DefinitionLevel)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESGraph_DefinitionLevel)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESGraph/IGESGraph_ToolDrawingSize.cxx b/src/IGESGraph/IGESGraph_ToolDrawingSize.cxx index 83dffafb4b..cd60387ca7 100644 --- a/src/IGESGraph/IGESGraph_ToolDrawingSize.cxx +++ b/src/IGESGraph/IGESGraph_ToolDrawingSize.cxx @@ -111,12 +111,11 @@ void IGESGraph_ToolDrawingSize::OwnCheck void IGESGraph_ToolDrawingSize::OwnDump (const Handle(IGESGraph_DrawingSize)& ent, const IGESData_IGESDumper& /*dumper*/, - const Handle(Message_Messenger)& S, const Standard_Integer /*level*/) const + Standard_OStream& S, const Standard_Integer /*level*/) const { - S << "IGESGraph_DrawingSize" << Message_EndLine; - - S << "No. of property values : " << ent->NbPropertyValues() << Message_EndLine; - S << "Drawing extent along positive X-axis : " << ent->XSize() << Message_EndLine; - S << "Drawing extent along positive Y-axis : " << ent->YSize() << Message_EndLine; - S << Message_EndLine; + S << "IGESGraph_DrawingSize\n" + << "No. of property values : " << ent->NbPropertyValues() << "\n" + << "Drawing extent along positive X-axis : " << ent->XSize() << "\n" + << "Drawing extent along positive Y-axis : " << ent->YSize() << "\n" + << std::endl; } diff --git a/src/IGESGraph/IGESGraph_ToolDrawingSize.hxx b/src/IGESGraph/IGESGraph_ToolDrawingSize.hxx index 3ecce38a80..d5437bbcbe 100644 --- a/src/IGESGraph/IGESGraph_ToolDrawingSize.hxx +++ b/src/IGESGraph/IGESGraph_ToolDrawingSize.hxx @@ -34,8 +34,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a DrawingSize. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -74,7 +72,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESGraph_DrawingSize)& entfrom, const Handle(IGESGraph_DrawingSize)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESGraph_DrawingSize)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESGraph_DrawingSize)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESGraph/IGESGraph_ToolDrawingUnits.cxx b/src/IGESGraph/IGESGraph_ToolDrawingUnits.cxx index 4ab83d2472..a98f2735a4 100644 --- a/src/IGESGraph/IGESGraph_ToolDrawingUnits.cxx +++ b/src/IGESGraph/IGESGraph_ToolDrawingUnits.cxx @@ -221,14 +221,13 @@ void IGESGraph_ToolDrawingUnits::OwnCheck void IGESGraph_ToolDrawingUnits::OwnDump (const Handle(IGESGraph_DrawingUnits)& ent, const IGESData_IGESDumper& /*dumper*/, - const Handle(Message_Messenger)& S, const Standard_Integer /*level*/) const + Standard_OStream& S, const Standard_Integer /*level*/) const { - S << "IGESGraph_DrawingUnits" << Message_EndLine; - - S << "No. of property values : " << ent->NbPropertyValues() << Message_EndLine; - S << " Units Flag : " << ent->Flag(); - S << " Units Name : "; + S << "IGESGraph_DrawingUnits\n" + << "No. of property values : " << ent->NbPropertyValues() << "\n" + << " Units Flag : " << ent->Flag() + << " Units Name : "; IGESData_DumpString(S,ent->Unit()); - S << " computed Value (in meters) : " << ent->UnitValue(); - S << Message_EndLine; + S << " computed Value (in meters) : " << ent->UnitValue() + << std::endl; } diff --git a/src/IGESGraph/IGESGraph_ToolDrawingUnits.hxx b/src/IGESGraph/IGESGraph_ToolDrawingUnits.hxx index dd87f92e9e..414cd6bfb3 100644 --- a/src/IGESGraph/IGESGraph_ToolDrawingUnits.hxx +++ b/src/IGESGraph/IGESGraph_ToolDrawingUnits.hxx @@ -34,8 +34,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a DrawingUnits. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -74,7 +72,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESGraph_DrawingUnits)& entfrom, const Handle(IGESGraph_DrawingUnits)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESGraph_DrawingUnits)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESGraph_DrawingUnits)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESGraph/IGESGraph_ToolHighLight.cxx b/src/IGESGraph/IGESGraph_ToolHighLight.cxx index b9549af9da..b77f83f6ed 100644 --- a/src/IGESGraph/IGESGraph_ToolHighLight.cxx +++ b/src/IGESGraph/IGESGraph_ToolHighLight.cxx @@ -107,11 +107,10 @@ void IGESGraph_ToolHighLight::OwnCheck void IGESGraph_ToolHighLight::OwnDump (const Handle(IGESGraph_HighLight)& ent, const IGESData_IGESDumper& /*dumper*/, - const Handle(Message_Messenger)& S, const Standard_Integer /*level*/) const + Standard_OStream& S, const Standard_Integer /*level*/) const { - S << "IGESGraph_HighLight" << Message_EndLine; - - S << "No. of property values : " << ent->NbPropertyValues() << Message_EndLine; - S << "Highlight Status : " << ent->HighLightStatus() << Message_EndLine; - S << Message_EndLine; + S << "IGESGraph_HighLight\n" + << "No. of property values : " << ent->NbPropertyValues() << "\n" + << "Highlight Status : " << ent->HighLightStatus() << "\n" + << std::endl; } diff --git a/src/IGESGraph/IGESGraph_ToolHighLight.hxx b/src/IGESGraph/IGESGraph_ToolHighLight.hxx index b0820da108..4c8828d170 100644 --- a/src/IGESGraph/IGESGraph_ToolHighLight.hxx +++ b/src/IGESGraph/IGESGraph_ToolHighLight.hxx @@ -34,8 +34,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a HighLight. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -74,7 +72,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESGraph_HighLight)& entfrom, const Handle(IGESGraph_HighLight)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESGraph_HighLight)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESGraph_HighLight)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESGraph/IGESGraph_ToolIntercharacterSpacing.cxx b/src/IGESGraph/IGESGraph_ToolIntercharacterSpacing.cxx index 97948ba58e..d6fef26833 100644 --- a/src/IGESGraph/IGESGraph_ToolIntercharacterSpacing.cxx +++ b/src/IGESGraph/IGESGraph_ToolIntercharacterSpacing.cxx @@ -109,11 +109,10 @@ void IGESGraph_ToolIntercharacterSpacing::OwnCheck void IGESGraph_ToolIntercharacterSpacing::OwnDump (const Handle(IGESGraph_IntercharacterSpacing)& ent, const IGESData_IGESDumper& /*dumper*/, - const Handle(Message_Messenger)& S, const Standard_Integer /*level*/) const + Standard_OStream& S, const Standard_Integer /*level*/) const { - S << "IGESGraph_IntercharacterSpacing" << Message_EndLine; - - S << "No. of property values : " << ent->NbPropertyValues() << Message_EndLine; - S << "Intercharacter space in % of text height : " << ent->ISpace() << Message_EndLine; - S << Message_EndLine; + S << "IGESGraph_IntercharacterSpacing\n" + << "No. of property values : " << ent->NbPropertyValues() << "\n" + << "Intercharacter space in % of text height : " << ent->ISpace() << "\n" + << std::endl; } diff --git a/src/IGESGraph/IGESGraph_ToolIntercharacterSpacing.hxx b/src/IGESGraph/IGESGraph_ToolIntercharacterSpacing.hxx index 735a5dbcb0..27884ecddf 100644 --- a/src/IGESGraph/IGESGraph_ToolIntercharacterSpacing.hxx +++ b/src/IGESGraph/IGESGraph_ToolIntercharacterSpacing.hxx @@ -34,8 +34,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a IntercharacterSpacing. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -74,7 +72,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESGraph_IntercharacterSpacing)& entfrom, const Handle(IGESGraph_IntercharacterSpacing)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESGraph_IntercharacterSpacing)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESGraph_IntercharacterSpacing)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESGraph/IGESGraph_ToolLineFontDefPattern.cxx b/src/IGESGraph/IGESGraph_ToolLineFontDefPattern.cxx index bbda86aafc..e057ef55c3 100644 --- a/src/IGESGraph/IGESGraph_ToolLineFontDefPattern.cxx +++ b/src/IGESGraph/IGESGraph_ToolLineFontDefPattern.cxx @@ -30,7 +30,6 @@ #include #include #include -#include #include #include #include @@ -130,21 +129,20 @@ void IGESGraph_ToolLineFontDefPattern::OwnCheck void IGESGraph_ToolLineFontDefPattern::OwnDump (const Handle(IGESGraph_LineFontDefPattern)& ent, const IGESData_IGESDumper& /*dumper*/, - const Handle(Message_Messenger)& S, const Standard_Integer level) const + Standard_OStream& S, const Standard_Integer level) const { - S << "IGESGraph_LineFontDefPattern" << Message_EndLine; - - S << "Visible-Blank Segments : "; + S << "IGESGraph_LineFontDefPattern\n" + << "Visible-Blank Segments : "; Standard_Integer nb = ent->NbSegments(); - IGESData_DumpVals(S ,level,1, nb,ent->Length); - S <Length); + S << "\nDisplay Pattern : "; IGESData_DumpString(S,ent->DisplayPattern()); - S << Message_EndLine; + S << "\n"; if (level > 4) { - S << " -> Which Segments are Visible (the others are Blank) : " << Message_EndLine; + S << " -> Which Segments are Visible (the others are Blank) :\n"; for (Standard_Integer I = 1; I <= nb; I ++) { if (ent->IsVisible(I)) S << " " << I; } - S << Message_EndLine; + S << std::endl; } } diff --git a/src/IGESGraph/IGESGraph_ToolLineFontDefPattern.hxx b/src/IGESGraph/IGESGraph_ToolLineFontDefPattern.hxx index 0401709a0c..074ceac938 100644 --- a/src/IGESGraph/IGESGraph_ToolLineFontDefPattern.hxx +++ b/src/IGESGraph/IGESGraph_ToolLineFontDefPattern.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a LineFontDefPattern. Called by various //! Modules (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESGraph_LineFontDefPattern)& entfrom, const Handle(IGESGraph_LineFontDefPattern)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESGraph_LineFontDefPattern)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESGraph_LineFontDefPattern)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESGraph/IGESGraph_ToolLineFontDefTemplate.cxx b/src/IGESGraph/IGESGraph_ToolLineFontDefTemplate.cxx index 68d65df8b7..b2d581b0b2 100644 --- a/src/IGESGraph/IGESGraph_ToolLineFontDefTemplate.cxx +++ b/src/IGESGraph/IGESGraph_ToolLineFontDefTemplate.cxx @@ -117,18 +117,17 @@ void IGESGraph_ToolLineFontDefTemplate::OwnCheck void IGESGraph_ToolLineFontDefTemplate::OwnDump (const Handle(IGESGraph_LineFontDefTemplate)& 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 tempSubLevel = (level <= 4) ? 0 : 1; - S << "IGESGraph_LineFontDefTemplate" << Message_EndLine; - - S << "Orientation : " << ent->Orientation() << Message_EndLine; - S << "Subfigure Display Entity For Template Display : "; + S << "IGESGraph_LineFontDefTemplate\n" + << "Orientation : " << ent->Orientation() << "\n" + << "Subfigure Display Entity For Template Display : "; dumper.Dump(ent->TemplateEntity(),S, tempSubLevel); - S << Message_EndLine; - S << "Length Between Successive Template Figure : " << ent->Distance()<Scale() << Message_EndLine; - S << Message_EndLine; + S << "\n" + << "Length Between Successive Template Figure : " << ent->Distance()<< "\n" + << "Scale Factor for Subfigure : " << ent->Scale() << "\n" + << std::endl; } diff --git a/src/IGESGraph/IGESGraph_ToolLineFontDefTemplate.hxx b/src/IGESGraph/IGESGraph_ToolLineFontDefTemplate.hxx index 83be4734ba..0efe63a97f 100644 --- a/src/IGESGraph/IGESGraph_ToolLineFontDefTemplate.hxx +++ b/src/IGESGraph/IGESGraph_ToolLineFontDefTemplate.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a LineFontDefTemplate. Called by various //! Modules (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESGraph_LineFontDefTemplate)& entfrom, const Handle(IGESGraph_LineFontDefTemplate)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESGraph_LineFontDefTemplate)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESGraph_LineFontDefTemplate)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESGraph/IGESGraph_ToolLineFontPredefined.cxx b/src/IGESGraph/IGESGraph_ToolLineFontPredefined.cxx index 6360513bb6..15af838628 100644 --- a/src/IGESGraph/IGESGraph_ToolLineFontPredefined.cxx +++ b/src/IGESGraph/IGESGraph_ToolLineFontPredefined.cxx @@ -106,11 +106,10 @@ void IGESGraph_ToolLineFontPredefined::OwnCheck void IGESGraph_ToolLineFontPredefined::OwnDump (const Handle(IGESGraph_LineFontPredefined)& ent, const IGESData_IGESDumper& /*dumper*/, - const Handle(Message_Messenger)& S, const Standard_Integer /*level*/) const + Standard_OStream& S, const Standard_Integer /*level*/) const { - S << "IGESGraph_LineFontPredefined" << Message_EndLine; - - S << "No. of property values : " << ent->NbPropertyValues() << Message_EndLine; - S << "Line font pattern code : " << ent->LineFontPatternCode() << Message_EndLine; - S << Message_EndLine; + S << "IGESGraph_LineFontPredefined\n" + << "No. of property values : " << ent->NbPropertyValues() << "\n" + << "Line font pattern code : " << ent->LineFontPatternCode() << "\n" + << std::endl; } diff --git a/src/IGESGraph/IGESGraph_ToolLineFontPredefined.hxx b/src/IGESGraph/IGESGraph_ToolLineFontPredefined.hxx index 60300d9fc7..92ea8df41f 100644 --- a/src/IGESGraph/IGESGraph_ToolLineFontPredefined.hxx +++ b/src/IGESGraph/IGESGraph_ToolLineFontPredefined.hxx @@ -34,8 +34,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a LineFontPredefined. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -74,7 +72,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESGraph_LineFontPredefined)& entfrom, const Handle(IGESGraph_LineFontPredefined)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESGraph_LineFontPredefined)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESGraph_LineFontPredefined)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESGraph/IGESGraph_ToolNominalSize.cxx b/src/IGESGraph/IGESGraph_ToolNominalSize.cxx index a7b73c12d2..b7a7d71fc6 100644 --- a/src/IGESGraph/IGESGraph_ToolNominalSize.cxx +++ b/src/IGESGraph/IGESGraph_ToolNominalSize.cxx @@ -144,16 +144,15 @@ void IGESGraph_ToolNominalSize::OwnCheck void IGESGraph_ToolNominalSize::OwnDump (const Handle(IGESGraph_NominalSize)& ent, const IGESData_IGESDumper& /*dumper*/, - const Handle(Message_Messenger)& S, const Standard_Integer /*level*/) const + Standard_OStream& S, const Standard_Integer /*level*/) const { - S << "IGESGraph_NominalSize" << Message_EndLine; - - S << "No. of property values : " << ent->NbPropertyValues() << Message_EndLine; - S << "Nominal size value : " << ent->NominalSizeValue() << Message_EndLine; - S << "Nominal size name : "; + S << "IGESGraph_NominalSize\n" + << "No. of property values : " << ent->NbPropertyValues() << "\n" + << "Nominal size value : " << ent->NominalSizeValue() << "\n" + << "Nominal size name : "; IGESData_DumpString(S,ent->NominalSizeName()); - S << Message_EndLine; - S << "Name of relevant engineering standard : "; + S << "\n" + << "Name of relevant engineering standard : "; IGESData_DumpString(S,ent->StandardName()); - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESGraph/IGESGraph_ToolNominalSize.hxx b/src/IGESGraph/IGESGraph_ToolNominalSize.hxx index fe83b74a59..388c84ebaa 100644 --- a/src/IGESGraph/IGESGraph_ToolNominalSize.hxx +++ b/src/IGESGraph/IGESGraph_ToolNominalSize.hxx @@ -34,8 +34,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a NominalSize. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -74,7 +72,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESGraph_NominalSize)& entfrom, const Handle(IGESGraph_NominalSize)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESGraph_NominalSize)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESGraph_NominalSize)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESGraph/IGESGraph_ToolPick.cxx b/src/IGESGraph/IGESGraph_ToolPick.cxx index 7f8a9ceb2e..b5741f4bdb 100644 --- a/src/IGESGraph/IGESGraph_ToolPick.cxx +++ b/src/IGESGraph/IGESGraph_ToolPick.cxx @@ -109,12 +109,11 @@ void IGESGraph_ToolPick::OwnCheck void IGESGraph_ToolPick::OwnDump (const Handle(IGESGraph_Pick)& ent, const IGESData_IGESDumper& /*dumper*/, - const Handle(Message_Messenger)& S, const Standard_Integer /*level*/) const + Standard_OStream& S, const Standard_Integer /*level*/) const { - S << "IGESGraph_Pick" << Message_EndLine; - - S << "No. of property values : " << ent->NbPropertyValues() << Message_EndLine; - S << "Pick flag : " << ent->PickFlag(); - S << (ent->PickFlag() == 0 ? " NO" : " YES" ); - S << Message_EndLine; + S << "IGESGraph_Pick\n" + << "No. of property values : " << ent->NbPropertyValues() << "\n" + << "Pick flag : " << ent->PickFlag() + << (ent->PickFlag() == 0 ? " NO" : " YES" ) + << std::endl; } diff --git a/src/IGESGraph/IGESGraph_ToolPick.hxx b/src/IGESGraph/IGESGraph_ToolPick.hxx index 4d05caccdb..37d299bfc0 100644 --- a/src/IGESGraph/IGESGraph_ToolPick.hxx +++ b/src/IGESGraph/IGESGraph_ToolPick.hxx @@ -34,8 +34,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a Pick. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -74,7 +72,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESGraph_Pick)& entfrom, const Handle(IGESGraph_Pick)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESGraph_Pick)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESGraph_Pick)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESGraph/IGESGraph_ToolTextDisplayTemplate.cxx b/src/IGESGraph/IGESGraph_ToolTextDisplayTemplate.cxx index d1ed697d33..4f6d857bcc 100644 --- a/src/IGESGraph/IGESGraph_ToolTextDisplayTemplate.cxx +++ b/src/IGESGraph/IGESGraph_ToolTextDisplayTemplate.cxx @@ -182,14 +182,13 @@ void IGESGraph_ToolTextDisplayTemplate::OwnCheck void IGESGraph_ToolTextDisplayTemplate::OwnDump (const Handle(IGESGraph_TextDisplayTemplate)& 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) ? 0 : 1; - S << "IGESGraph_TextDisplayTemplate" << Message_EndLine; - - S << "Character box width : " << ent->BoxWidth() << " "; - S << "Character box height : " << ent->BoxHeight() << Message_EndLine; + S << "IGESGraph_TextDisplayTemplate\n" + << "Character box width : " << ent->BoxWidth() << " " + << "Character box height : " << ent->BoxHeight() << "\n"; if ( ent->IsFontEntity() ) { S << "Font Entity : "; @@ -197,15 +196,16 @@ void IGESGraph_ToolTextDisplayTemplate::OwnDump } else S << "Font code : " << ent->FontCode(); - S << Message_EndLine; - S << "Slant angle : " << ent->SlantAngle() << " "; - S << "Rotation angle : " << ent->RotationAngle() << Message_EndLine; - S << "Mirror flag : " << ent->MirrorFlag() << " "; - S << "Rotate flag : " << ent->RotateFlag() << Message_EndLine; + + S << "\n" + << "Slant angle : " << ent->SlantAngle() << " " + << "Rotation angle : " << ent->RotationAngle() << "\n" + << "Mirror flag : " << ent->MirrorFlag() << " " + << "Rotate flag : " << ent->RotateFlag() << "\n"; if ( ent->FormNumber() == 0 ) S << "Lower Left Corner coordinates : "; else S << "Increments from coordinates : "; IGESData_DumpXYZL(S,level, ent->StartingCorner(), ent->Location()); - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESGraph/IGESGraph_ToolTextDisplayTemplate.hxx b/src/IGESGraph/IGESGraph_ToolTextDisplayTemplate.hxx index 266ba5ceff..67843cd458 100644 --- a/src/IGESGraph/IGESGraph_ToolTextDisplayTemplate.hxx +++ b/src/IGESGraph/IGESGraph_ToolTextDisplayTemplate.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a TextDisplayTemplate. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESGraph_TextDisplayTemplate)& entfrom, const Handle(IGESGraph_TextDisplayTemplate)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESGraph_TextDisplayTemplate)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESGraph_TextDisplayTemplate)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESGraph/IGESGraph_ToolTextFontDef.cxx b/src/IGESGraph/IGESGraph_ToolTextFontDef.cxx index e1be0fb46e..d3ee2af01b 100644 --- a/src/IGESGraph/IGESGraph_ToolTextFontDef.cxx +++ b/src/IGESGraph/IGESGraph_ToolTextFontDef.cxx @@ -288,32 +288,31 @@ void IGESGraph_ToolTextFontDef::OwnCheck void IGESGraph_ToolTextFontDef::OwnDump (const Handle(IGESGraph_TextFontDef)& 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) ? 0 : 1; Standard_Integer nbchars = ent->NbCharacters(); - S << "IGESGraph_TextFontDef" << Message_EndLine; - - S << "Font Code : " << ent->FontCode() << Message_EndLine; - S << "Font Name : "; + S << "IGESGraph_TextFontDef\n" + << "Font Code : " << ent->FontCode() << "\n" + << "Font Name : "; IGESData_DumpString(S,ent->FontName()); - S << Message_EndLine; + S << "\n"; if ( ent->IsSupersededFontEntity() ) { S << "Text Definition Entity : "; dumper.Dump(ent->SupersededFontEntity(),S, sublevel); } else S << "Superseding Font Number : " << ent->SupersededFontCode(); - S << Message_EndLine; - S << "No. of Grid Units eqvt to 1 Text Height : " << ent->Scale() << Message_EndLine; - S << "ASCII Codes : " << Message_EndLine - << "Grid Locations of next character origins : " << Message_EndLine - << "Pen Motions : " << Message_EndLine - << "Pen Positions : " << Message_EndLine - << "Grid Locations the pen moves to : "; - S << "Count = " << nbchars << Message_EndLine; + S << "\n" + << "No. of Grid Units eqvt to 1 Text Height : " << ent->Scale() << "\n" + << "ASCII Codes :\n" + << "Grid Locations of next character origins :\n" + << "Pen Motions :\n" + << "Pen Positions :\n" + << "Grid Locations the pen moves to : " + << "Count = " << nbchars << "\n"; IGESData_DumpVals(S,-level,1,nbchars,ent->ASCIICode); - S << Message_EndLine; + S << "\n"; if (level > 4 ) { Handle(TColgp_HArray1OfXY) arrXY; @@ -321,26 +320,25 @@ void IGESGraph_ToolTextFontDef::OwnDump for (I = 1; I <= nbchars; I++) { Standard_Integer IX,IY; - S << "[" << I << "]: "; - S << "ASCII Code : " << ent->ASCIICode(I) << Message_EndLine; - S << "Grid Location of next character's origin : "; + S << "[" << I << "]: " + << "ASCII Code : " << ent->ASCIICode(I) << "\n" + << "Grid Location of next character's origin : "; ent->NextCharOrigin(I,IX,IY); S << "X=" << IX << " Y=" << IY; nbmotions = ent->NbPenMotions(I); S << " No. of Pen Motions : " << nbmotions; - if (level <= 5) S << " [ ask level > 5 for Details ]" << Message_EndLine; + if (level <= 5) S << " [ ask level > 5 for Details ]\n"; else { - S << Message_EndLine; + S << "\n"; for (J = 1; J <= nbmotions; J++) { - S << "Pen up(1) / down(0) flag : " << (Standard_Integer)ent->IsPenUp(I,J); - S << " Next Pen Position : "; + S << "Pen up(1) / down(0) flag : " << (Standard_Integer)ent->IsPenUp(I,J) + << " Next Pen Position : "; ent->NextPenPosition(I,J, IX,IY); - S << " X="< #include #include -#include #include IGESGraph_ToolUniformRectGrid::IGESGraph_ToolUniformRectGrid () { } @@ -159,19 +158,18 @@ void IGESGraph_ToolUniformRectGrid::OwnCheck void IGESGraph_ToolUniformRectGrid::OwnDump (const Handle(IGESGraph_UniformRectGrid)& ent, const IGESData_IGESDumper& /*dumper*/, - const Handle(Message_Messenger)& S, const Standard_Integer /*level*/) const + Standard_OStream& S, const Standard_Integer /*level*/) const { - S << "IGESGraph_UniformRectGrid" << Message_EndLine; - - S << "No. of property values : " << ent->NbPropertyValues() << Message_EndLine; - S << "Grid : " << ( ent->IsFinite() ? "Finite" : "Infinite"); - S << " - Composed of " << ( ent->IsLine() ? "Lines" : "Points"); - S << " - " << ( ent->IsWeighted() ? "Weighted" : "Unweighted") << Message_EndLine; - S << "Grid Point : "; + S << "IGESGraph_UniformRectGrid\n" + << "No. of property values : " << ent->NbPropertyValues() << "\n" + << "Grid : " << ( ent->IsFinite() ? "Finite" : "Infinite") + << " - Composed of " << ( ent->IsLine() ? "Lines" : "Points") + << " - " << ( ent->IsWeighted() ? "Weighted" : "Unweighted") << "\n" + << "Grid Point : "; IGESData_DumpXY(S, ent->GridPoint()); S << " Grid Spacing : "; - IGESData_DumpXY(S, ent->GridSpacing()); S << Message_EndLine; + IGESData_DumpXY(S, ent->GridSpacing()); S << "\n"; if (ent->IsFinite()) S << "No. of points/lines in direction : X : " << ent->NbPointsX() - << " - Y : " << ent->NbPointsY() << Message_EndLine; + << " - Y : " << ent->NbPointsY() << std::endl; } diff --git a/src/IGESGraph/IGESGraph_ToolUniformRectGrid.hxx b/src/IGESGraph/IGESGraph_ToolUniformRectGrid.hxx index fc46ea5a48..ca642abfb8 100644 --- a/src/IGESGraph/IGESGraph_ToolUniformRectGrid.hxx +++ b/src/IGESGraph/IGESGraph_ToolUniformRectGrid.hxx @@ -34,8 +34,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a UniformRectGrid. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -74,7 +72,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESGraph_UniformRectGrid)& entfrom, const Handle(IGESGraph_UniformRectGrid)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESGraph_UniformRectGrid)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESGraph_UniformRectGrid)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESSelect/IGESSelect_Activator.cxx b/src/IGESSelect/IGESSelect_Activator.cxx index 16ba5583fe..396e877881 100644 --- a/src/IGESSelect/IGESSelect_Activator.cxx +++ b/src/IGESSelect/IGESSelect_Activator.cxx @@ -176,14 +176,14 @@ IGESSelect_Activator::IGESSelect_Activator() std::cout<NbEntities(i)<<" ent.s:"<Entities(i); - WS->ListEntities (iter,0); + WS->ListEntities (iter, 0, std::cout); } std::cout <<" -- Remaining Entities (not yet sorted) :" <NbDuplicated(0,Standard_False)<Duplicated(0,Standard_False); - WS->ListEntities(iter,0); + WS->ListEntities (iter, 0, std::cout); return IFSelect_RetVoid; } diff --git a/src/IGESSelect/IGESSelect_CounterOfLevelNumber.cxx b/src/IGESSelect/IGESSelect_CounterOfLevelNumber.cxx index 2647f3fe31..0adf7e70c9 100644 --- a/src/IGESSelect/IGESSelect_CounterOfLevelNumber.cxx +++ b/src/IGESSelect/IGESSelect_CounterOfLevelNumber.cxx @@ -17,9 +17,6 @@ #include #include #include -#include -#include -#include #include #include @@ -133,10 +130,10 @@ IGESSelect_CounterOfLevelNumber::IGESSelect_CounterOfLevelNumber void IGESSelect_CounterOfLevelNumber::PrintCount - (const Handle(Message_Messenger)& S) const + (Standard_OStream& S) const { - IFSelect_SignatureList::PrintCount(S); - S<<" Highest value : " << thehigh << Message_EndLine; - if (thenblists > 0) S<<"REMARK for LEVEL LIST : Entities are counted in" - <<" \n, and in each Level value of their list"< 0) S <<"REMARK for LEVEL LIST : Entities are counted in" + <<" \n, and in each Level value of their list"< -#include - -#include #include #include -#include #include -class Standard_Transient; + class Interface_InterfaceModel; class TCollection_HAsciiString; -class Message_Messenger; - class IGESSelect_CounterOfLevelNumber; DEFINE_STANDARD_HANDLE(IGESSelect_CounterOfLevelNumber, IFSelect_SignCounter) @@ -85,7 +78,7 @@ public: //! Prints the counts of items (not the list) then the Highest //! Level Number recorded - Standard_EXPORT virtual void PrintCount (const Handle(Message_Messenger)& S) const Standard_OVERRIDE; + Standard_EXPORT virtual void PrintCount (Standard_OStream& S) const Standard_OVERRIDE; diff --git a/src/IGESSelect/IGESSelect_WorkLibrary.cxx b/src/IGESSelect/IGESSelect_WorkLibrary.cxx index 06882d7732..7f7260d67a 100644 --- a/src/IGESSelect/IGESSelect_WorkLibrary.cxx +++ b/src/IGESSelect/IGESSelect_WorkLibrary.cxx @@ -77,15 +77,15 @@ static Handle(IGESData_FileProtocol) IGESProto; Handle(Interface_InterfaceModel)& model, const Handle(Interface_Protocol)& protocol) const { - Handle(Message_Messenger) sout = Message::DefaultMessenger(); + Message_Messenger::StreamBuffer sout = Message::SendInfo(); Handle(IGESData_IGESModel) igesmod = new IGESData_IGESModel; DeclareAndCast(IGESData_Protocol,prot,protocol); char* pname=(char*) name; Standard_Integer status = IGESFile_Read (pname,igesmod,prot); - if (status < 0) sout<<"File not found : "< 0) sout<<"Error when reading file : "< 0) sout<<"Error when reading file : "<AddFail("IGES File could not be created"); - sout<<" - IGES File could not be created : " << ctx.FileName() << Message_EndLine; return 0; + sout<<" - IGES File could not be created : " << ctx.FileName() << std::endl; return 0; } sout<<" IGES File Name : "<Number(igesent); if (num == 0) return; - S<<" --- Entity "<IsRedefinedContent(num); Handle(Standard_Transient) con; if (iserr) con = model->ReportEntity(num)->Content(); - if (entity.IsNull()) { S<<" Null"<DynamicType()->Name(); - else S << "(undefined)" << Message_EndLine; + else S << "(undefined)" << std::endl; igesent = GetCasted(IGESData_IGESEntity,con); con.Nullify(); Handle(Interface_Check) check = model->ReportEntity(num)->Check(); @@ -192,6 +192,6 @@ static Handle(IGESData_FileProtocol) IGESProto; dump.Dump(igesent,S,level,(level-1)/3); } catch (Standard_Failure const&) { - S << " ** Dump Interrupt **" << Message_EndLine; + S << " ** Dump Interrupt **" << std::endl; } } diff --git a/src/IGESSelect/IGESSelect_WorkLibrary.hxx b/src/IGESSelect/IGESSelect_WorkLibrary.hxx index 8021194ada..aeb3fcc249 100644 --- a/src/IGESSelect/IGESSelect_WorkLibrary.hxx +++ b/src/IGESSelect/IGESSelect_WorkLibrary.hxx @@ -29,8 +29,6 @@ class Interface_Protocol; class IFSelect_ContextWrite; class IGESData_Protocol; class Standard_Transient; -class Message_Messenger; - class IGESSelect_WorkLibrary; DEFINE_STANDARD_HANDLE(IGESSelect_WorkLibrary, IFSelect_WorkLibrary) @@ -61,7 +59,7 @@ public: //! Dumps an IGES Entity with an IGES Dumper. is the one //! used by IGESDumper. - 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_Integer level) const Standard_OVERRIDE; + 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 Standard_OVERRIDE; diff --git a/src/IGESSolid/IGESSolid_SpecificModule.cxx b/src/IGESSolid/IGESSolid_SpecificModule.cxx index 88cff12e1f..e10acb77cb 100644 --- a/src/IGESSolid/IGESSolid_SpecificModule.cxx +++ b/src/IGESSolid/IGESSolid_SpecificModule.cxx @@ -64,7 +64,6 @@ #include #include #include -#include #include IMPLEMENT_STANDARD_RTTIEXT(IGESSolid_SpecificModule,IGESData_SpecificModule) @@ -77,7 +76,7 @@ IGESSolid_SpecificModule::IGESSolid_SpecificModule() { } void IGESSolid_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) { diff --git a/src/IGESSolid/IGESSolid_SpecificModule.hxx b/src/IGESSolid/IGESSolid_SpecificModule.hxx index 642adebb12..82c87afd58 100644 --- a/src/IGESSolid/IGESSolid_SpecificModule.hxx +++ b/src/IGESSolid/IGESSolid_SpecificModule.hxx @@ -24,8 +24,6 @@ #include class IGESData_IGESEntity; class IGESData_IGESDumper; -class Message_Messenger; - class IGESSolid_SpecificModule; DEFINE_STANDARD_HANDLE(IGESSolid_SpecificModule, IGESData_SpecificModule) @@ -41,7 +39,7 @@ public: Standard_EXPORT IGESSolid_SpecificModule(); //! Specific Dump (own parameters) for IGESSolid - 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; diff --git a/src/IGESSolid/IGESSolid_ToolBlock.cxx b/src/IGESSolid/IGESSolid_ToolBlock.cxx index eb7421cdf8..0b9aa06508 100644 --- a/src/IGESSolid/IGESSolid_ToolBlock.cxx +++ b/src/IGESSolid/IGESSolid_ToolBlock.cxx @@ -185,17 +185,16 @@ void IGESSolid_ToolBlock::OwnCheck void IGESSolid_ToolBlock::OwnDump (const Handle(IGESSolid_Block)& ent, const IGESData_IGESDumper& /* dumper */, - const Handle(Message_Messenger)& S, const Standard_Integer level) const + Standard_OStream& S, const Standard_Integer level) const { - S << "IGESSolid_Block" << Message_EndLine; - - S << "Size : "; + S << "IGESSolid_Block\n" + << "Size : "; IGESData_DumpXYZ(S, ent->Size()); - S << Message_EndLine << "Corner : "; + S << "\nCorner : "; IGESData_DumpXYZL(S,level, ent->Corner(), ent->Location()); - S << Message_EndLine << "XAxis : "; + S << "\nXAxis : "; IGESData_DumpXYZL(S,level, ent->XAxis(), ent->VectorLocation()); - S << Message_EndLine << "ZAxis : "; + S << "\nZAxis : "; IGESData_DumpXYZL(S,level, ent->ZAxis(), ent->VectorLocation()); - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESSolid/IGESSolid_ToolBlock.hxx b/src/IGESSolid/IGESSolid_ToolBlock.hxx index 1554a48717..2dd4a0849e 100644 --- a/src/IGESSolid/IGESSolid_ToolBlock.hxx +++ b/src/IGESSolid/IGESSolid_ToolBlock.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a Block. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESSolid_Block)& entfrom, const Handle(IGESSolid_Block)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESSolid_Block)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESSolid_Block)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESSolid/IGESSolid_ToolBooleanTree.cxx b/src/IGESSolid/IGESSolid_ToolBooleanTree.cxx index abddb0d71b..4ff431ea27 100644 --- a/src/IGESSolid/IGESSolid_ToolBooleanTree.cxx +++ b/src/IGESSolid/IGESSolid_ToolBooleanTree.cxx @@ -174,35 +174,33 @@ void IGESSolid_ToolBooleanTree::OwnCheck void IGESSolid_ToolBooleanTree::OwnDump (const Handle(IGESSolid_BooleanTree)& 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, length = ent->Length(); - S << "IGESSolid_Boolean Tree" << Message_EndLine; - - S << "Length of the post-order notation :" << length << Message_EndLine; - + S << "IGESSolid_Boolean Tree\n" + << "Length of the post-order notation :" << length << "\n"; if (level > 4) { - S << "Post-order notation of the Boolean Tree :" << Message_EndLine; + S << "Post-order notation of the Boolean Tree :\n"; for (i = 1; i <= length; i++) { if (ent->IsOperand(i)) { S << "[" << i << "] Operand : "; dumper.Dump (ent->Operand(i),S, 1); - S << Message_EndLine; + S << "\n"; } else { Standard_Integer opcode = ent->Operation(i); S << "[" << i << "] Operator : " << opcode; if (opcode == 1) S << " (Union)"; - else if (opcode == 2) S << " (Intersection)" << Message_EndLine; - else if (opcode == 3) S << " (Difference)" << Message_EndLine; - else S << " (incorrect value)" << Message_EndLine; + else if (opcode == 2) S << " (Intersection)\n"; + else if (opcode == 3) S << " (Difference)\n"; + else S << " (incorrect value)\n"; } } } -// S << std::endl; +// aSender << std::endl; } diff --git a/src/IGESSolid/IGESSolid_ToolBooleanTree.hxx b/src/IGESSolid/IGESSolid_ToolBooleanTree.hxx index 9c0796c288..01d609becd 100644 --- a/src/IGESSolid/IGESSolid_ToolBooleanTree.hxx +++ b/src/IGESSolid/IGESSolid_ToolBooleanTree.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a BooleanTree. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESSolid_BooleanTree)& entfrom, const Handle(IGESSolid_BooleanTree)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESSolid_BooleanTree)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESSolid_BooleanTree)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESSolid/IGESSolid_ToolConeFrustum.cxx b/src/IGESSolid/IGESSolid_ToolConeFrustum.cxx index 7008154edd..054e3489a0 100644 --- a/src/IGESSolid/IGESSolid_ToolConeFrustum.cxx +++ b/src/IGESSolid/IGESSolid_ToolConeFrustum.cxx @@ -169,16 +169,15 @@ void IGESSolid_ToolConeFrustum::OwnCheck void IGESSolid_ToolConeFrustum::OwnDump (const Handle(IGESSolid_ConeFrustum)& ent, const IGESData_IGESDumper& /* dumper */, - const Handle(Message_Messenger)& S, const Standard_Integer level) const + Standard_OStream& S, const Standard_Integer level) const { - S << "IGESSolid_ConeFrustum" << Message_EndLine; - - S << "Height : " << ent->Height() << " "; - S << "Larger face Radius : " << ent->LargerRadius() << " "; - S << "Smaller face Radius : " << ent->SmallerRadius() << Message_EndLine; - S << "Face Center : "; + S << "IGESSolid_ConeFrustum\n" + << "Height : " << ent->Height() << " " + << "Larger face Radius : " << ent->LargerRadius() << " " + << "Smaller face Radius : " << ent->SmallerRadius() << "\n" + << "Face Center : "; IGESData_DumpXYZL(S,level, ent->FaceCenter(), ent->Location()); - S << Message_EndLine << "Axis : "; + S << "\nAxis : "; IGESData_DumpXYZL(S,level, ent->Axis(), ent->VectorLocation()); - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESSolid/IGESSolid_ToolConeFrustum.hxx b/src/IGESSolid/IGESSolid_ToolConeFrustum.hxx index 59cd011c70..a3b8b8a164 100644 --- a/src/IGESSolid/IGESSolid_ToolConeFrustum.hxx +++ b/src/IGESSolid/IGESSolid_ToolConeFrustum.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a ConeFrustum. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESSolid_ConeFrustum)& entfrom, const Handle(IGESSolid_ConeFrustum)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESSolid_ConeFrustum)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESSolid_ConeFrustum)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESSolid/IGESSolid_ToolConicalSurface.cxx b/src/IGESSolid/IGESSolid_ToolConicalSurface.cxx index d0559cbc34..c11d25921c 100644 --- a/src/IGESSolid/IGESSolid_ToolConicalSurface.cxx +++ b/src/IGESSolid/IGESSolid_ToolConicalSurface.cxx @@ -141,24 +141,24 @@ void IGESSolid_ToolConicalSurface::OwnCheck void IGESSolid_ToolConicalSurface::OwnDump (const Handle(IGESSolid_ConicalSurface)& ent, const IGESData_IGESDumper& dumper, - const Handle(Message_Messenger)& S, const Standard_Integer level) const + Standard_OStream& S, const Standard_Integer level) const { - S << "IGESSolid_ConicalSurface" << Message_EndLine; + S << "IGESSolid_ConicalSurface\n"; Standard_Integer sublevel = (level <= 4) ? 0 : 1; S << "Point on axis : "; dumper.Dump(ent->LocationPoint(),S, sublevel); - S << Message_EndLine; - S << "Axis direction : "; + S << "\n" + << "Axis direction : "; dumper.Dump(ent->Axis(),S, sublevel); - S << Message_EndLine; - S << "Radius : " << ent->Radius() << " "; - S << "Semi-angle : " << ent->SemiAngle() << Message_EndLine; + S << "\n" + << "Radius : " << ent->Radius() << " " + << "Semi-angle : " << ent->SemiAngle() << "\n"; if (ent->IsParametrised()) { - S << "Surface is Parametrised - Reference direction : " << Message_EndLine; + S << "Surface is Parametrised - Reference direction :\n"; dumper.Dump(ent->ReferenceDir(),S, sublevel); - S << Message_EndLine; + S << std::endl; } - else S << "Surface is UnParametrised" << Message_EndLine; + else S << "Surface is UnParametrised" << std::endl; } diff --git a/src/IGESSolid/IGESSolid_ToolConicalSurface.hxx b/src/IGESSolid/IGESSolid_ToolConicalSurface.hxx index b580d49a11..38dd430405 100644 --- a/src/IGESSolid/IGESSolid_ToolConicalSurface.hxx +++ b/src/IGESSolid/IGESSolid_ToolConicalSurface.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a ConicalSurface. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESSolid_ConicalSurface)& entfrom, const Handle(IGESSolid_ConicalSurface)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESSolid_ConicalSurface)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESSolid_ConicalSurface)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESSolid/IGESSolid_ToolCylinder.cxx b/src/IGESSolid/IGESSolid_ToolCylinder.cxx index 8c72c03a0b..2fd410d2f5 100644 --- a/src/IGESSolid/IGESSolid_ToolCylinder.cxx +++ b/src/IGESSolid/IGESSolid_ToolCylinder.cxx @@ -158,20 +158,19 @@ void IGESSolid_ToolCylinder::OwnCheck void IGESSolid_ToolCylinder::OwnDump (const Handle(IGESSolid_Cylinder)& ent, const IGESData_IGESDumper& /* dumper */, - const Handle(Message_Messenger)& S, const Standard_Integer level) const + Standard_OStream& S, const Standard_Integer level) const { // Standard_Boolean locprint = (ent->HasTransf() && level >=6); // gp_Pnt TCenter = ent->TransformedFaceCenter(); // gp_Dir TAxis = ent->TransformedAxis(); - S << "IGESSolid_Cylinder" << Message_EndLine; - - S << "Height : " << ent->Height() << " "; - S << "Radius : " << ent->Radius() << Message_EndLine; - S << "Center : "; + S << "IGESSolid_Cylinder\n" + << "Height : " << ent->Height() << " " + << "Radius : " << ent->Radius() << "\n" + << "Center : "; IGESData_DumpXYZL(S,level, ent->FaceCenter(), ent->Location()); - S << Message_EndLine << "Axis : "; + S << "\nAxis : "; IGESData_DumpXYZL(S,level, ent->Axis(), ent->VectorLocation()); - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESSolid/IGESSolid_ToolCylinder.hxx b/src/IGESSolid/IGESSolid_ToolCylinder.hxx index b1b2734d72..951c031277 100644 --- a/src/IGESSolid/IGESSolid_ToolCylinder.hxx +++ b/src/IGESSolid/IGESSolid_ToolCylinder.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a Cylinder. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESSolid_Cylinder)& entfrom, const Handle(IGESSolid_Cylinder)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESSolid_Cylinder)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESSolid_Cylinder)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESSolid/IGESSolid_ToolCylindricalSurface.cxx b/src/IGESSolid/IGESSolid_ToolCylindricalSurface.cxx index 1666f8766c..cda68e6b0f 100644 --- a/src/IGESSolid/IGESSolid_ToolCylindricalSurface.cxx +++ b/src/IGESSolid/IGESSolid_ToolCylindricalSurface.cxx @@ -134,23 +134,23 @@ void IGESSolid_ToolCylindricalSurface::OwnCheck void IGESSolid_ToolCylindricalSurface::OwnDump (const Handle(IGESSolid_CylindricalSurface)& ent, const IGESData_IGESDumper& dumper, - const Handle(Message_Messenger)& S, const Standard_Integer level) const + Standard_OStream& S, const Standard_Integer level) const { - S << "IGESSolid_CylindricalSurface" << Message_EndLine; + S << "IGESSolid_CylindricalSurface\n"; Standard_Integer sublevel = (level <= 4) ? 0 : 1; S << "Point on axis : "; dumper.Dump(ent->LocationPoint(),S, sublevel); - S << Message_EndLine; - S << "Axis direction : "; + S << "\n" + << "Axis direction : "; dumper.Dump(ent->Axis(),S, sublevel); - S << Message_EndLine; - S << "Radius : " << ent->Radius() << Message_EndLine; + S << "\n" + << "Radius : " << ent->Radius() << "\n"; if (ent->IsParametrised()) { S << "Surface is Parametrised - Reference direction : "; dumper.Dump(ent->ReferenceDir(),S, sublevel); - S << Message_EndLine; + S << std::endl; } - else S << "Surface is UnParametrised" << Message_EndLine; + else S << "Surface is UnParametrised" << std::endl; } diff --git a/src/IGESSolid/IGESSolid_ToolCylindricalSurface.hxx b/src/IGESSolid/IGESSolid_ToolCylindricalSurface.hxx index 10b2ff317b..29024dd09f 100644 --- a/src/IGESSolid/IGESSolid_ToolCylindricalSurface.hxx +++ b/src/IGESSolid/IGESSolid_ToolCylindricalSurface.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a CylindricalSurface. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESSolid_CylindricalSurface)& entfrom, const Handle(IGESSolid_CylindricalSurface)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESSolid_CylindricalSurface)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESSolid_CylindricalSurface)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESSolid/IGESSolid_ToolEdgeList.cxx b/src/IGESSolid/IGESSolid_ToolEdgeList.cxx index a49d44ef69..31217d1827 100644 --- a/src/IGESSolid/IGESSolid_ToolEdgeList.cxx +++ b/src/IGESSolid/IGESSolid_ToolEdgeList.cxx @@ -346,29 +346,29 @@ void IGESSolid_ToolEdgeList::OwnCheck(const Handle(IGESSolid_EdgeList)& ent, void IGESSolid_ToolEdgeList::OwnDump(const Handle(IGESSolid_EdgeList)& ent, const IGESData_IGESDumper& dumper, - const Handle(Message_Messenger)& S, + Standard_OStream& S, const Standard_Integer level) const { Standard_Integer i, length = ent->NbEdges(); - S << "IGESSolid_EdgeList" << Message_EndLine; - S << "Number of edge tuples : " << length << Message_EndLine; + S << "IGESSolid_EdgeList\n" + << "Number of edge tuples : " << length << "\n"; switch (level) { case 4 : - S << "Curves : "; - S << "Start Vertex List : "; - S << "Start Vertex Index : "; - IGESData_DumpVals(S ,level,1, length,ent->StartVertexIndex); - S << Message_EndLine; - S << "End Vertex List : "; - S << "End Vertex Index : "; - IGESData_DumpVals(S ,level,1, length,ent->EndVertexIndex); - S << Message_EndLine; + S << "Curves : " + << "Start Vertex List : " + << "Start Vertex Index : "; + IGESData_DumpVals(S,level,1, length,ent->StartVertexIndex); + S << "\n" + << "End Vertex List : " + << "End Vertex Index : "; + IGESData_DumpVals(S,level,1, length,ent->EndVertexIndex); + S << "\n"; break; case 5 : case 6 : - S<<" Curve - Vertices. Start : (VertexList,Index) End : (VertexList,Index)"<Curve(i),S, level-5); S <<" - Vertices. Start : ("; dumper.Dump (ent->StartVertexList(i),S, 0); - S << " , " << ent->StartVertexIndex(i); - S << ") End : ("; + S << " , " << ent->StartVertexIndex(i) + << ") End : ("; dumper.Dump (ent->EndVertexList(i),S, 0); - S << " , " << ent->EndVertexIndex(i); - S << ")" << Message_EndLine; + S << " , " << ent->EndVertexIndex(i) + << ")" << "\n"; } break; default : break; } - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESSolid/IGESSolid_ToolEdgeList.hxx b/src/IGESSolid/IGESSolid_ToolEdgeList.hxx index 2f7f856253..4e3c837c59 100644 --- a/src/IGESSolid/IGESSolid_ToolEdgeList.hxx +++ b/src/IGESSolid/IGESSolid_ToolEdgeList.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a EdgeList. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESSolid_EdgeList)& entfrom, const Handle(IGESSolid_EdgeList)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESSolid_EdgeList)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESSolid_EdgeList)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESSolid/IGESSolid_ToolEllipsoid.cxx b/src/IGESSolid/IGESSolid_ToolEllipsoid.cxx index 46e05ae3f2..95ab3359aa 100644 --- a/src/IGESSolid/IGESSolid_ToolEllipsoid.cxx +++ b/src/IGESSolid/IGESSolid_ToolEllipsoid.cxx @@ -188,17 +188,16 @@ void IGESSolid_ToolEllipsoid::OwnCheck void IGESSolid_ToolEllipsoid::OwnDump (const Handle(IGESSolid_Ellipsoid)& ent, const IGESData_IGESDumper& /* dumper */, - const Handle(Message_Messenger)& S, const Standard_Integer level) const + Standard_OStream& S, const Standard_Integer level) const { - S << "IGESSolid_Ellipsoid" << Message_EndLine; - - S << "Size : "; + S << "IGESSolid_Ellipsoid\n" + << "Size : "; IGESData_DumpXYZ(S, ent->Size()); - S << Message_EndLine << "Center : "; + S << "\nCenter : "; IGESData_DumpXYZL(S,level, ent->Center(), ent->Location()); - S << Message_EndLine << "XAxis : "; + S << "\nXAxis : "; IGESData_DumpXYZL(S,level, ent->XAxis(), ent->VectorLocation()); - S << Message_EndLine << "ZAxis : "; + S << "\nZAxis : "; IGESData_DumpXYZL(S,level, ent->ZAxis(), ent->VectorLocation()); - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESSolid/IGESSolid_ToolEllipsoid.hxx b/src/IGESSolid/IGESSolid_ToolEllipsoid.hxx index 822867770b..f246fed084 100644 --- a/src/IGESSolid/IGESSolid_ToolEllipsoid.hxx +++ b/src/IGESSolid/IGESSolid_ToolEllipsoid.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a Ellipsoid. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESSolid_Ellipsoid)& entfrom, const Handle(IGESSolid_Ellipsoid)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESSolid_Ellipsoid)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESSolid_Ellipsoid)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESSolid/IGESSolid_ToolFace.cxx b/src/IGESSolid/IGESSolid_ToolFace.cxx index 3b2053ce56..279eb194fd 100644 --- a/src/IGESSolid/IGESSolid_ToolFace.cxx +++ b/src/IGESSolid/IGESSolid_ToolFace.cxx @@ -246,19 +246,19 @@ void IGESSolid_ToolFace::OwnCheck(const Handle(IGESSolid_Face)& ent, void IGESSolid_ToolFace::OwnDump(const Handle(IGESSolid_Face)& ent, const IGESData_IGESDumper& dumper, - const Handle(Message_Messenger)& S, + Standard_OStream& S, const Standard_Integer level) const { - S << "IGESSolid_Face" << Message_EndLine; + S << "IGESSolid_Face\n"; Standard_Integer sublevel = (level <= 4) ? 0 : 1; S << "Surface : "; dumper.Dump(ent->Surface(),S, sublevel); - S << Message_EndLine; - if (ent->HasOuterLoop()) S << "Outer loop is present (First one)" << Message_EndLine; - else S << "Outer loop is not present" << Message_EndLine; + S << "\n"; + if (ent->HasOuterLoop()) S << "Outer loop is present (First one)\n"; + else S << "Outer loop is not present\n"; S << "Loops : "; IGESData_DumpEntities(S,dumper ,level,1, ent->NbLoops(),ent->Loop); - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESSolid/IGESSolid_ToolFace.hxx b/src/IGESSolid/IGESSolid_ToolFace.hxx index 1ffe331172..b588c1ec62 100644 --- a/src/IGESSolid/IGESSolid_ToolFace.hxx +++ b/src/IGESSolid/IGESSolid_ToolFace.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a Face. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESSolid_Face)& entfrom, const Handle(IGESSolid_Face)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESSolid_Face)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESSolid_Face)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESSolid/IGESSolid_ToolLoop.cxx b/src/IGESSolid/IGESSolid_ToolLoop.cxx index 85385925a0..cc914d86b2 100644 --- a/src/IGESSolid/IGESSolid_ToolLoop.cxx +++ b/src/IGESSolid/IGESSolid_ToolLoop.cxx @@ -38,7 +38,6 @@ #include #include #include -#include #include #include #include @@ -368,31 +367,30 @@ void IGESSolid_ToolLoop::OwnCheck(const Handle(IGESSolid_Loop)& ent, void IGESSolid_ToolLoop::OwnDump(const Handle(IGESSolid_Loop)& ent, const IGESData_IGESDumper& dumper, - const Handle(Message_Messenger)& S, + Standard_OStream& S, const Standard_Integer level) const { Standard_Integer i, j; Standard_Integer nbedges = ent->NbEdges(); Standard_Integer sublevel = (level <= 4) ? 0 : 1; - S << "IGESSolid_Loop" << Message_EndLine; - - S << "Edge types : " << Message_EndLine; - S << "Edges : " << Message_EndLine; - S << "List index : " << Message_EndLine; - S << "Orientation flags : " << Message_EndLine; - S << "Parametric flags : "; + S << "IGESSolid_Loop\n" + << "Edge types :\n" + << "Edges :\n" + << "List index :\n" + << "Orientation flags :\n" + << "Parametric flags : "; IGESData_DumpEntities(S,dumper,-level,1, nbedges,ent->Edge); - S << Message_EndLine; + S << "\n"; if (level > 4) { S << "[ "; for (i = 1; i <= nbedges; i ++) { Standard_Integer nbc = ent->NbParameterCurves(i); - S << "[" << i << "]: "; - S << "Edge type : " << ent->EdgeType(i) << " "; - S << "Edge : "; + S << "[" << i << "]: " + << "Edge type : " << ent->EdgeType(i) << " " + << "Edge : "; dumper.Dump (ent->Edge(i),S, sublevel); S << " - Index : " << ent->ListIndex(i) << ", Orientation flag : " << ( ent->Orientation(i) ? "Positive" : "Negative" ) @@ -404,19 +402,19 @@ void IGESSolid_ToolLoop::OwnDump(const Handle(IGESSolid_Loop)& ent, S << ":\n [ "; for (j = 1; j <= nbc; j ++) { - S << "[" << j << "]: "; - S << "Isoparametric flag : " - << ( ent->IsIsoparametric(i,j) ? "True" : "False" ) << " "; - S << "Parametric curve : "; + S << "[" << j << "]: " + << "Isoparametric flag : " + << ( ent->IsIsoparametric(i,j) ? "True" : "False" ) << " " + << "Parametric curve : "; dumper.Dump (ent->ParametricCurve(i,j),S, sublevel); - S << Message_EndLine; + S << "\n"; } S << " ]"; } } - S << Message_EndLine; + S << "\n"; } S << " ]"; } - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESSolid/IGESSolid_ToolLoop.hxx b/src/IGESSolid/IGESSolid_ToolLoop.hxx index 294bfc62cf..89054688c7 100644 --- a/src/IGESSolid/IGESSolid_ToolLoop.hxx +++ b/src/IGESSolid/IGESSolid_ToolLoop.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a Loop. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESSolid_Loop)& entfrom, const Handle(IGESSolid_Loop)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESSolid_Loop)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESSolid_Loop)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESSolid/IGESSolid_ToolManifoldSolid.cxx b/src/IGESSolid/IGESSolid_ToolManifoldSolid.cxx index d87f164dc4..fd25519794 100644 --- a/src/IGESSolid/IGESSolid_ToolManifoldSolid.cxx +++ b/src/IGESSolid/IGESSolid_ToolManifoldSolid.cxx @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include @@ -207,39 +206,39 @@ void IGESSolid_ToolManifoldSolid::OwnCheck void IGESSolid_ToolManifoldSolid::OwnDump (const Handle(IGESSolid_ManifoldSolid)& ent, const IGESData_IGESDumper& dumper, - const Handle(Message_Messenger)& S, const Standard_Integer level) const + Standard_OStream& S, const Standard_Integer level) const { - S << "IGESSolid_ManifoldSolid" << Message_EndLine; + S << "IGESSolid_ManifoldSolid\n"; Standard_Integer sublevel = (level <= 4) ? 0 : 1; S << "Shell : "; dumper.Dump(ent->Shell(),S, sublevel); - S << Message_EndLine; + S << "\n"; if (ent->OrientationFlag()) - S << "Orientation agrees with the underlying surface" << Message_EndLine; + S << "Orientation agrees with the underlying surface\n"; else - S << "Orientation does not agrees with the underlying surface" << Message_EndLine; - S << "Void shells :" << Message_EndLine << "Orientation flags : "; + S << "Orientation does not agrees with the underlying surface\n"; + S << "Void shells :\nOrientation flags : "; IGESData_DumpEntities(S,dumper,-level,1, ent->NbVoidShells(),ent->VoidShell); - S << Message_EndLine; + S << std::endl; if (level > 4) { - S << "[ " << Message_EndLine; + S << "[\n"; if (ent->NbVoidShells() > 0) { Standard_Integer upper = ent->NbVoidShells(); for (Standard_Integer i = 1; i <= upper; i ++) { - S << "[" << i << "]: "; - S << "Void shell : "; + S << "[" << i << "]: " + << "Void shell : "; dumper.Dump (ent->VoidShell(i),S, sublevel); S << " - Orientation flag : "; - if (ent->VoidOrientationFlag(i)) S << "True" << Message_EndLine; - else S << "False" << Message_EndLine; + if (ent->VoidOrientationFlag(i)) S << "True\n"; + else S << "False\n"; } } - S << " ]" << Message_EndLine; + S << " ]\n"; } - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESSolid/IGESSolid_ToolManifoldSolid.hxx b/src/IGESSolid/IGESSolid_ToolManifoldSolid.hxx index 0ecd1fd3e7..e2419eefa5 100644 --- a/src/IGESSolid/IGESSolid_ToolManifoldSolid.hxx +++ b/src/IGESSolid/IGESSolid_ToolManifoldSolid.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a ManifoldSolid. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESSolid_ManifoldSolid)& entfrom, const Handle(IGESSolid_ManifoldSolid)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESSolid_ManifoldSolid)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESSolid_ManifoldSolid)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESSolid/IGESSolid_ToolPlaneSurface.cxx b/src/IGESSolid/IGESSolid_ToolPlaneSurface.cxx index 02a8806716..d04a0f5ce2 100644 --- a/src/IGESSolid/IGESSolid_ToolPlaneSurface.cxx +++ b/src/IGESSolid/IGESSolid_ToolPlaneSurface.cxx @@ -254,23 +254,23 @@ void IGESSolid_ToolPlaneSurface::OwnCheck(const Handle(IGESSolid_PlaneSurface)& void IGESSolid_ToolPlaneSurface::OwnDump(const Handle(IGESSolid_PlaneSurface)& ent, const IGESData_IGESDumper& dumper, - const Handle(Message_Messenger)& S, + Standard_OStream& S, const Standard_Integer level) const { - S << "IGESSolid_PlaneSurface" << Message_EndLine; + S << "IGESSolid_PlaneSurface\n"; Standard_Integer sublevel = (level <= 4) ? 0 : 1; S << "Point on axis : "; dumper.Dump(ent->LocationPoint(),S, sublevel); - S << Message_EndLine; - S << "Normal direction : "; + S << "\n" + << "Normal direction : "; dumper.Dump(ent->Normal(),S, sublevel); - S << Message_EndLine; + S << "\n"; if (ent->IsParametrised()) { S << "Surface is Parametrised - Reference direction : "; dumper.Dump(ent->ReferenceDir(),S, sublevel); - S << Message_EndLine; + S << std::endl; } - else S << "Surface is UnParametrised" << Message_EndLine; + else S << "Surface is UnParametrised" << std::endl; } diff --git a/src/IGESSolid/IGESSolid_ToolPlaneSurface.hxx b/src/IGESSolid/IGESSolid_ToolPlaneSurface.hxx index 3e6a2185c2..dc5bf05c37 100644 --- a/src/IGESSolid/IGESSolid_ToolPlaneSurface.hxx +++ b/src/IGESSolid/IGESSolid_ToolPlaneSurface.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a PlaneSurface. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESSolid_PlaneSurface)& entfrom, const Handle(IGESSolid_PlaneSurface)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESSolid_PlaneSurface)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESSolid_PlaneSurface)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESSolid/IGESSolid_ToolRightAngularWedge.cxx b/src/IGESSolid/IGESSolid_ToolRightAngularWedge.cxx index c9c698a9ca..616a9a63e3 100644 --- a/src/IGESSolid/IGESSolid_ToolRightAngularWedge.cxx +++ b/src/IGESSolid/IGESSolid_ToolRightAngularWedge.cxx @@ -194,18 +194,17 @@ void IGESSolid_ToolRightAngularWedge::OwnCheck void IGESSolid_ToolRightAngularWedge::OwnDump (const Handle(IGESSolid_RightAngularWedge)& ent, const IGESData_IGESDumper& /* dumper */, - const Handle(Message_Messenger)& S, const Standard_Integer level) const + Standard_OStream& S, const Standard_Integer level) const { - S << "IGESSolid_RightAngularWedge" << Message_EndLine; - - S << "Size : "; + S << "IGESSolid_RightAngularWedge\n" + << "Size : "; IGESData_DumpXYZ(S, ent->Size()); S << " "; - S << "XSmall : " << ent->XSmallLength() << Message_EndLine; - S << "Corner : "; + S << "XSmall : " << ent->XSmallLength() << "\n" + << "Corner : "; IGESData_DumpXYZL(S,level, ent->Corner(), ent->Location()); - S << Message_EndLine << "XAxis : "; + S << "\nXAxis : "; IGESData_DumpXYZL(S,level, ent->XAxis(), ent->VectorLocation()); - S << Message_EndLine << "ZAxis : "; + S << "\nZAxis : "; IGESData_DumpXYZL(S,level, ent->ZAxis(), ent->VectorLocation()); - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESSolid/IGESSolid_ToolRightAngularWedge.hxx b/src/IGESSolid/IGESSolid_ToolRightAngularWedge.hxx index f3b23333ef..84015a3227 100644 --- a/src/IGESSolid/IGESSolid_ToolRightAngularWedge.hxx +++ b/src/IGESSolid/IGESSolid_ToolRightAngularWedge.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a RightAngularWedge. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESSolid_RightAngularWedge)& entfrom, const Handle(IGESSolid_RightAngularWedge)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESSolid_RightAngularWedge)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESSolid_RightAngularWedge)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESSolid/IGESSolid_ToolSelectedComponent.cxx b/src/IGESSolid/IGESSolid_ToolSelectedComponent.cxx index 16c91cd318..6599f01699 100644 --- a/src/IGESSolid/IGESSolid_ToolSelectedComponent.cxx +++ b/src/IGESSolid/IGESSolid_ToolSelectedComponent.cxx @@ -105,14 +105,14 @@ void IGESSolid_ToolSelectedComponent::OwnCheck void IGESSolid_ToolSelectedComponent::OwnDump (const Handle(IGESSolid_SelectedComponent)& ent, const IGESData_IGESDumper& dumper, - const Handle(Message_Messenger)& S, const Standard_Integer level) const + Standard_OStream& S, const Standard_Integer level) const { - S << "IGESSolid_SelectedComponent" << Message_EndLine; + S << "IGESSolid_SelectedComponent\n"; // the heading for boolean tree is in BooleanTree OwnDump - S << "Boolean Tree Entity : " << Message_EndLine; + S << "Boolean Tree Entity :\n"; dumper.Dump(ent->Component(),S, (level <= 4) ? 0 : 1); S << "Seleted Point : "; IGESData_DumpXYZL(S,level, ent->SelectPoint(), ent->Location()); - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESSolid/IGESSolid_ToolSelectedComponent.hxx b/src/IGESSolid/IGESSolid_ToolSelectedComponent.hxx index e1a8bb86a7..2ecc4e2b15 100644 --- a/src/IGESSolid/IGESSolid_ToolSelectedComponent.hxx +++ b/src/IGESSolid/IGESSolid_ToolSelectedComponent.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a SelectedComponent. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESSolid_SelectedComponent)& entfrom, const Handle(IGESSolid_SelectedComponent)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESSolid_SelectedComponent)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESSolid_SelectedComponent)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESSolid/IGESSolid_ToolShell.cxx b/src/IGESSolid/IGESSolid_ToolShell.cxx index dd8466de9a..8922374271 100644 --- a/src/IGESSolid/IGESSolid_ToolShell.cxx +++ b/src/IGESSolid/IGESSolid_ToolShell.cxx @@ -229,28 +229,28 @@ void IGESSolid_ToolShell::OwnCheck(const Handle(IGESSolid_Shell)& ent, void IGESSolid_ToolShell::OwnDump(const Handle(IGESSolid_Shell)& ent, const IGESData_IGESDumper& dumper, - const Handle(Message_Messenger)& S, + Standard_OStream& S, const Standard_Integer level) const { - S << "IGESSolid_Shell" << Message_EndLine; + S << "IGESSolid_Shell\n"; Standard_Integer upper = ent->NbFaces(); Standard_Integer sublevel = (level <= 4) ? 0 : 1; - S << "Faces : " << Message_EndLine << "Orientation flags : "; + S << "Faces :\nOrientation flags : "; IGESData_DumpEntities(S,dumper,-level,1, ent->NbFaces(),ent->Face); - S << Message_EndLine; + S << "\n"; if (level > 4) { - S << "[" << Message_EndLine; + S << "[\n"; for (Standard_Integer i = 1; i <= upper; i ++) { - S << "[" << i << "]: "; - S << "Face : "; + S << "[" << i << "]: " + << "Face : "; dumper.Dump (ent->Face(i),S, sublevel); S << " - Orientation flag : "; - if (ent->Orientation(i)) S << "True" << Message_EndLine; - else S << "False" << Message_EndLine; + if (ent->Orientation(i)) S << "True\n"; + else S << "False\n"; } } - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESSolid/IGESSolid_ToolShell.hxx b/src/IGESSolid/IGESSolid_ToolShell.hxx index 35cfd7418c..3ff3dca816 100644 --- a/src/IGESSolid/IGESSolid_ToolShell.hxx +++ b/src/IGESSolid/IGESSolid_ToolShell.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a Shell. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESSolid_Shell)& entfrom, const Handle(IGESSolid_Shell)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESSolid_Shell)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESSolid_Shell)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESSolid/IGESSolid_ToolSolidAssembly.cxx b/src/IGESSolid/IGESSolid_ToolSolidAssembly.cxx index 4bd250ab6e..c6935f905c 100644 --- a/src/IGESSolid/IGESSolid_ToolSolidAssembly.cxx +++ b/src/IGESSolid/IGESSolid_ToolSolidAssembly.cxx @@ -156,16 +156,14 @@ void IGESSolid_ToolSolidAssembly::OwnCheck void IGESSolid_ToolSolidAssembly::OwnDump (const Handle(IGESSolid_SolidAssembly)& 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 upper = ent->NbItems(); - - S << "IGESSolid_SolidAssembly" << Message_EndLine; - - S << "Items : "; + S << "IGESSolid_SolidAssembly\n" + << "Items : "; IGESData_DumpEntities(S,dumper ,level,1, ent->NbItems(),ent->Item); - S << Message_EndLine; - S << "Matrices : "; + S << "\n" + << "Matrices : "; IGESData_DumpEntities(S,dumper ,level,1, ent->NbItems(),ent->TransfMatrix); - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESSolid/IGESSolid_ToolSolidAssembly.hxx b/src/IGESSolid/IGESSolid_ToolSolidAssembly.hxx index 5e138f2256..791c81b486 100644 --- a/src/IGESSolid/IGESSolid_ToolSolidAssembly.hxx +++ b/src/IGESSolid/IGESSolid_ToolSolidAssembly.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a SolidAssembly. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESSolid_SolidAssembly)& entfrom, const Handle(IGESSolid_SolidAssembly)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESSolid_SolidAssembly)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESSolid_SolidAssembly)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESSolid/IGESSolid_ToolSolidInstance.cxx b/src/IGESSolid/IGESSolid_ToolSolidInstance.cxx index 6825ff9b4a..9c1ab881dd 100644 --- a/src/IGESSolid/IGESSolid_ToolSolidInstance.cxx +++ b/src/IGESSolid/IGESSolid_ToolSolidInstance.cxx @@ -91,11 +91,10 @@ void IGESSolid_ToolSolidInstance::OwnCheck void IGESSolid_ToolSolidInstance::OwnDump (const Handle(IGESSolid_SolidInstance)& ent, const IGESData_IGESDumper& dumper, - const Handle(Message_Messenger)& S, const Standard_Integer level) const + Standard_OStream& S, const Standard_Integer level) const { - S << "IGESSolid_SolidInstance" << Message_EndLine; - - S << "Solid entity : "; + S << "IGESSolid_SolidInstance\n" + << "Solid entity : "; dumper.Dump(ent->Entity(),S, (level <= 4) ? 0 : 1); - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESSolid/IGESSolid_ToolSolidInstance.hxx b/src/IGESSolid/IGESSolid_ToolSolidInstance.hxx index 936698283e..a137cedcfb 100644 --- a/src/IGESSolid/IGESSolid_ToolSolidInstance.hxx +++ b/src/IGESSolid/IGESSolid_ToolSolidInstance.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a SolidInstance. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESSolid_SolidInstance)& entfrom, const Handle(IGESSolid_SolidInstance)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESSolid_SolidInstance)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESSolid_SolidInstance)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESSolid/IGESSolid_ToolSolidOfLinearExtrusion.cxx b/src/IGESSolid/IGESSolid_ToolSolidOfLinearExtrusion.cxx index 144c09c35d..95cb02377e 100644 --- a/src/IGESSolid/IGESSolid_ToolSolidOfLinearExtrusion.cxx +++ b/src/IGESSolid/IGESSolid_ToolSolidOfLinearExtrusion.cxx @@ -135,15 +135,14 @@ void IGESSolid_ToolSolidOfLinearExtrusion::OwnCheck void IGESSolid_ToolSolidOfLinearExtrusion::OwnDump (const Handle(IGESSolid_SolidOfLinearExtrusion)& ent, const IGESData_IGESDumper& dumper, - const Handle(Message_Messenger)& S, const Standard_Integer level) const + Standard_OStream& S, const Standard_Integer level) const { - S << "IGESSolid_SolidOfLinearExtrusion" << Message_EndLine; - - S << "Curve entity : "; + S << "IGESSolid_SolidOfLinearExtrusion\n" + << "Curve entity : "; dumper.Dump(ent->Curve(),S, (level <= 4) ? 0 : 1); - S << Message_EndLine; - S << "Extrusion length : " << ent->ExtrusionLength() << Message_EndLine; - S << "Extrusion direction : "; + S << "\n" + << "Extrusion length : " << ent->ExtrusionLength() << "\n" + << "Extrusion direction : "; IGESData_DumpXYZL(S,level, ent->ExtrusionDirection(), ent->VectorLocation()); - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESSolid/IGESSolid_ToolSolidOfLinearExtrusion.hxx b/src/IGESSolid/IGESSolid_ToolSolidOfLinearExtrusion.hxx index 100802585f..341838fcd3 100644 --- a/src/IGESSolid/IGESSolid_ToolSolidOfLinearExtrusion.hxx +++ b/src/IGESSolid/IGESSolid_ToolSolidOfLinearExtrusion.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a SolidOfLinearExtrusion. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESSolid_SolidOfLinearExtrusion)& entfrom, const Handle(IGESSolid_SolidOfLinearExtrusion)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESSolid_SolidOfLinearExtrusion)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESSolid_SolidOfLinearExtrusion)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESSolid/IGESSolid_ToolSolidOfRevolution.cxx b/src/IGESSolid/IGESSolid_ToolSolidOfRevolution.cxx index 58e2552316..52ad518cd3 100644 --- a/src/IGESSolid/IGESSolid_ToolSolidOfRevolution.cxx +++ b/src/IGESSolid/IGESSolid_ToolSolidOfRevolution.cxx @@ -167,17 +167,16 @@ void IGESSolid_ToolSolidOfRevolution::OwnCheck void IGESSolid_ToolSolidOfRevolution::OwnDump (const Handle(IGESSolid_SolidOfRevolution)& ent, const IGESData_IGESDumper& dumper, - const Handle(Message_Messenger)& S, const Standard_Integer level) const + Standard_OStream& S, const Standard_Integer level) const { - S << "IGESSolid_SolidOfRevolution" << Message_EndLine; - - S << "Curve entity :"; + S << "IGESSolid_SolidOfRevolution\n" + << "Curve entity :"; dumper.Dump(ent->Curve(),S, (level <= 4) ? 0 : 1); - S << Message_EndLine; - S << "Fraction of rotation : " << ent->Fraction() << Message_EndLine; - S << "Axis Point : "; + S << "\n" + << "Fraction of rotation : " << ent->Fraction() << "\n" + << "Axis Point : "; IGESData_DumpXYZL(S,level, ent->AxisPoint(), ent->Location()); - S << Message_EndLine << "Axis direction : "; + S << "\nAxis direction : "; IGESData_DumpXYZL(S,level, ent->Axis(), ent->VectorLocation()); - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESSolid/IGESSolid_ToolSolidOfRevolution.hxx b/src/IGESSolid/IGESSolid_ToolSolidOfRevolution.hxx index 1bde02b2d0..e559b335dc 100644 --- a/src/IGESSolid/IGESSolid_ToolSolidOfRevolution.hxx +++ b/src/IGESSolid/IGESSolid_ToolSolidOfRevolution.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a SolidOfRevolution. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESSolid_SolidOfRevolution)& entfrom, const Handle(IGESSolid_SolidOfRevolution)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESSolid_SolidOfRevolution)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESSolid_SolidOfRevolution)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESSolid/IGESSolid_ToolSphere.cxx b/src/IGESSolid/IGESSolid_ToolSphere.cxx index f260734ba7..0564cac99f 100644 --- a/src/IGESSolid/IGESSolid_ToolSphere.cxx +++ b/src/IGESSolid/IGESSolid_ToolSphere.cxx @@ -120,12 +120,11 @@ void IGESSolid_ToolSphere::OwnCheck void IGESSolid_ToolSphere::OwnDump (const Handle(IGESSolid_Sphere)& ent, const IGESData_IGESDumper& /* dumper */, - const Handle(Message_Messenger)& S, const Standard_Integer level) const + Standard_OStream& S, const Standard_Integer level) const { - S << "IGESSolid_Sphere" << Message_EndLine; - - S << "Radius : " << ent->Radius() << Message_EndLine; - S << "Center : "; + S << "IGESSolid_Sphere\n" + << "Radius : " << ent->Radius() << "\n" + << "Center : "; IGESData_DumpXYZL(S,level, ent->Center(), ent->Location()); - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESSolid/IGESSolid_ToolSphere.hxx b/src/IGESSolid/IGESSolid_ToolSphere.hxx index ba888fef7e..03f445b062 100644 --- a/src/IGESSolid/IGESSolid_ToolSphere.hxx +++ b/src/IGESSolid/IGESSolid_ToolSphere.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a Sphere. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESSolid_Sphere)& entfrom, const Handle(IGESSolid_Sphere)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESSolid_Sphere)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESSolid_Sphere)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESSolid/IGESSolid_ToolSphericalSurface.cxx b/src/IGESSolid/IGESSolid_ToolSphericalSurface.cxx index cbc73c1655..6c4885bdbe 100644 --- a/src/IGESSolid/IGESSolid_ToolSphericalSurface.cxx +++ b/src/IGESSolid/IGESSolid_ToolSphericalSurface.cxx @@ -141,24 +141,24 @@ void IGESSolid_ToolSphericalSurface::OwnCheck void IGESSolid_ToolSphericalSurface::OwnDump (const Handle(IGESSolid_SphericalSurface)& ent, const IGESData_IGESDumper& dumper, - const Handle(Message_Messenger)& S, const Standard_Integer level) const + Standard_OStream& S, const Standard_Integer level) const { - S << "IGESSolid_SphericalSurface" << Message_EndLine; + S << "IGESSolid_SphericalSurface\n"; Standard_Integer sublevel = (level <= 4) ? 0 : 1; S << "Center : "; dumper.Dump(ent->Center(),S, sublevel); - S << Message_EndLine; - S << "Radius : " << ent->Radius() << Message_EndLine; + S << "\n" + << "Radius : " << ent->Radius() << "\n"; if (ent->IsParametrised()) { - S << "Surface is Parametrised" << Message_EndLine; - S << "Axis direction : "; + S << "Surface is Parametrised\n" + << "Axis direction : "; dumper.Dump(ent->Axis(),S, sublevel); - S << Message_EndLine; - S << "Reference direction : "; + S << "\n" + << "Reference direction : "; dumper.Dump(ent->ReferenceDir(),S, sublevel); - S << Message_EndLine; + S << std::endl; } - else S << "Surface is UnParametrised" << Message_EndLine; + else S << "Surface is UnParametrised" << std::endl; } diff --git a/src/IGESSolid/IGESSolid_ToolSphericalSurface.hxx b/src/IGESSolid/IGESSolid_ToolSphericalSurface.hxx index d6236f9821..7700f51784 100644 --- a/src/IGESSolid/IGESSolid_ToolSphericalSurface.hxx +++ b/src/IGESSolid/IGESSolid_ToolSphericalSurface.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a SphericalSurface. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESSolid_SphericalSurface)& entfrom, const Handle(IGESSolid_SphericalSurface)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESSolid_SphericalSurface)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESSolid_SphericalSurface)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESSolid/IGESSolid_ToolToroidalSurface.cxx b/src/IGESSolid/IGESSolid_ToolToroidalSurface.cxx index 4683358147..0f6f3fa573 100644 --- a/src/IGESSolid/IGESSolid_ToolToroidalSurface.cxx +++ b/src/IGESSolid/IGESSolid_ToolToroidalSurface.cxx @@ -31,7 +31,6 @@ #include #include #include -#include #include IGESSolid_ToolToroidalSurface::IGESSolid_ToolToroidalSurface () { } @@ -138,24 +137,24 @@ void IGESSolid_ToolToroidalSurface::OwnCheck void IGESSolid_ToolToroidalSurface::OwnDump (const Handle(IGESSolid_ToroidalSurface)& ent, const IGESData_IGESDumper& dumper, - const Handle(Message_Messenger)& S, const Standard_Integer level) const + Standard_OStream& S, const Standard_Integer level) const { - S << "IGESSolid_ToroidalSurface" << Message_EndLine; + S << "IGESSolid_ToroidalSurface\n"; Standard_Integer sublevel = (level <= 4) ? 0 : 1; S << "Center : "; dumper.Dump(ent->Center(),S, sublevel); - S << Message_EndLine; - S << "Axis direction : "; + S << "\n" + << "Axis direction : "; dumper.Dump(ent->Axis(),S, sublevel); - S << Message_EndLine; - S << "Major Radius : " << ent->MajorRadius() << " "; - S << "Minor Radius : " << ent->MinorRadius() << Message_EndLine; + S << "\n" + << "Major Radius : " << ent->MajorRadius() << " " + << "Minor Radius : " << ent->MinorRadius() << "\n"; if (ent->IsParametrised()) { S << "Surface is Parametrised - Reference direction : "; dumper.Dump(ent->ReferenceDir(),S, sublevel); - S << Message_EndLine; + S << std::endl; } - else S << "Surface is UnParametrised" << Message_EndLine; + else S << "Surface is UnParametrised" << std::endl; } diff --git a/src/IGESSolid/IGESSolid_ToolToroidalSurface.hxx b/src/IGESSolid/IGESSolid_ToolToroidalSurface.hxx index 602e9b6d08..f0ea4411ef 100644 --- a/src/IGESSolid/IGESSolid_ToolToroidalSurface.hxx +++ b/src/IGESSolid/IGESSolid_ToolToroidalSurface.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a ToroidalSurface. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESSolid_ToroidalSurface)& entfrom, const Handle(IGESSolid_ToroidalSurface)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESSolid_ToroidalSurface)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESSolid_ToroidalSurface)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESSolid/IGESSolid_ToolTorus.cxx b/src/IGESSolid/IGESSolid_ToolTorus.cxx index 0fffb8c9c1..c9b99c395d 100644 --- a/src/IGESSolid/IGESSolid_ToolTorus.cxx +++ b/src/IGESSolid/IGESSolid_ToolTorus.cxx @@ -159,15 +159,14 @@ void IGESSolid_ToolTorus::OwnCheck void IGESSolid_ToolTorus::OwnDump (const Handle(IGESSolid_Torus)& ent, const IGESData_IGESDumper& /* dumper */, - const Handle(Message_Messenger)& S, const Standard_Integer level) const + Standard_OStream& S, const Standard_Integer level) const { - S << "IGESSolid_Torus" << Message_EndLine; - - S << "Radius of revolution : " << ent->MajorRadius() << " "; - S << "Radius of the disc : " << ent->DiscRadius() << Message_EndLine; - S << "Center Point : "; + S << "IGESSolid_Torus\n" + << "Radius of revolution : " << ent->MajorRadius() << " " + << "Radius of the disc : " << ent->DiscRadius() << "\n" + << "Center Point : "; IGESData_DumpXYZL(S,level, ent->AxisPoint(), ent->Location()); - S << Message_EndLine << "Axis direction : "; + S << "\nAxis direction : "; IGESData_DumpXYZL(S,level, ent->Axis(), ent->VectorLocation()); - S << Message_EndLine; + S << std::endl; } diff --git a/src/IGESSolid/IGESSolid_ToolTorus.hxx b/src/IGESSolid/IGESSolid_ToolTorus.hxx index de3ca1f6e0..e698dad6eb 100644 --- a/src/IGESSolid/IGESSolid_ToolTorus.hxx +++ b/src/IGESSolid/IGESSolid_ToolTorus.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a Torus. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESSolid_Torus)& entfrom, const Handle(IGESSolid_Torus)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESSolid_Torus)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESSolid_Torus)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESSolid/IGESSolid_ToolVertexList.cxx b/src/IGESSolid/IGESSolid_ToolVertexList.cxx index 60b8d84478..1b4ba8e892 100644 --- a/src/IGESSolid/IGESSolid_ToolVertexList.cxx +++ b/src/IGESSolid/IGESSolid_ToolVertexList.cxx @@ -201,12 +201,11 @@ void IGESSolid_ToolVertexList::OwnCheck(const Handle(IGESSolid_VertexList)& ent, void IGESSolid_ToolVertexList::OwnDump(const Handle(IGESSolid_VertexList)& ent, const IGESData_IGESDumper& /* dumper */, - const Handle(Message_Messenger)& S, + Standard_OStream& S, const Standard_Integer level) const { - S << "IGESSolid_VertexList" << Message_EndLine; - - S << "Vertices : "; - IGESData_DumpListXYZL(S ,level,1, ent->NbVertices(),ent->Vertex,ent->Location()); - S << Message_EndLine; + S << "IGESSolid_VertexList\n" + << "Vertices : "; + IGESData_DumpListXYZL(S,level,1, ent->NbVertices(),ent->Vertex,ent->Location()); + S << std::endl; } diff --git a/src/IGESSolid/IGESSolid_ToolVertexList.hxx b/src/IGESSolid/IGESSolid_ToolVertexList.hxx index b090940537..eff89aa166 100644 --- a/src/IGESSolid/IGESSolid_ToolVertexList.hxx +++ b/src/IGESSolid/IGESSolid_ToolVertexList.hxx @@ -33,8 +33,6 @@ class Interface_ShareTool; class Interface_Check; class Interface_CopyTool; class IGESData_IGESDumper; -class Message_Messenger; - //! Tool to work on a VertexList. Called by various Modules //! (ReadWriteModule, GeneralModule, SpecificModule) @@ -69,7 +67,7 @@ public: Standard_EXPORT void OwnCopy (const Handle(IGESSolid_VertexList)& entfrom, const Handle(IGESSolid_VertexList)& entto, Interface_CopyTool& TC) const; //! Dump of Specific Parameters - Standard_EXPORT void OwnDump (const Handle(IGESSolid_VertexList)& ent, const IGESData_IGESDumper& dumper, const Handle(Message_Messenger)& S, const Standard_Integer own) const; + Standard_EXPORT void OwnDump (const Handle(IGESSolid_VertexList)& ent, const IGESData_IGESDumper& dumper, Standard_OStream& S, const Standard_Integer own) const; diff --git a/src/IGESToBRep/IGESToBRep_CurveAndSurface.cxx b/src/IGESToBRep/IGESToBRep_CurveAndSurface.cxx index 3511d96e21..c3c5f43af8 100644 --- a/src/IGESToBRep/IGESToBRep_CurveAndSurface.cxx +++ b/src/IGESToBRep/IGESToBRep_CurveAndSurface.cxx @@ -194,7 +194,7 @@ void IGESToBRep_CurveAndSurface::SetModel(const Handle(IGESData_IGESModel)& mode if (unitfactor != 1.) { if ( myTP->TraceLevel() > 2 ) - myTP->Messenger() << "UnitFactor = "<< unitfactor << Message_EndLine; + myTP->Messenger()->SendInfo() << "UnitFactor = "<< unitfactor << std::endl; myUnitFactor = unitfactor; } UpdateMinMaxTol(); diff --git a/src/IGESToBRep/IGESToBRep_Reader.cxx b/src/IGESToBRep/IGESToBRep_Reader.cxx index 34d8f0d2f5..c2863d52b9 100644 --- a/src/IGESToBRep/IGESToBRep_Reader.cxx +++ b/src/IGESToBRep/IGESToBRep_Reader.cxx @@ -268,8 +268,13 @@ Standard_Integer IGESToBRep_Reader::LoadFile (const Standard_CString filename) { Interface_CheckTool cht (theModel,protocol); Interface_CheckIterator chl = cht.CompleteCheckList(); - if (withprint && !theProc.IsNull()) - cht.Print(chl, theProc->Messenger()); + if (withprint + && !theProc.IsNull() + && !theProc->Messenger().IsNull()) + { + Message_Messenger::StreamBuffer aBuffer = theProc->Messenger()->SendInfo(); + cht.Print(chl, aBuffer); + } return chl.IsEmpty(Standard_True); } diff --git a/src/IVtkDraw/IVtkDraw_Interactor.cxx b/src/IVtkDraw/IVtkDraw_Interactor.cxx index 0a3b90190b..67bcabe7c1 100644 --- a/src/IVtkDraw/IVtkDraw_Interactor.cxx +++ b/src/IVtkDraw/IVtkDraw_Interactor.cxx @@ -253,7 +253,7 @@ void IVtkDraw_Interactor::MoveTo (Standard_Integer theX, Standard_Integer theY) Handle(Message_Messenger) anOutput = Message::DefaultMessenger(); if (!myPipelines->IsBound(aShapeID)) { - anOutput << "Warning: there is no VTK pipeline registered for highlighted shape" << Message_EndLine; + anOutput->SendWarning() << "Warning: there is no VTK pipeline registered for highlighted shape" << std::endl; continue; } @@ -318,7 +318,7 @@ void IVtkDraw_Interactor::OnSelection() Handle(Message_Messenger) anOutput = Message::DefaultMessenger(); if (!myPipelines->IsBound (aShapeID)) { - anOutput << "Warning: there is no VTK pipeline registered for picked shape" << Message_EndLine; + anOutput->SendWarning() << "Warning: there is no VTK pipeline registered for picked shape" << std::endl; continue; } diff --git a/src/IVtkOCC/IVtkOCC_ShapePickerAlgo.cxx b/src/IVtkOCC/IVtkOCC_ShapePickerAlgo.cxx index 520fdbc77c..fac7391682 100644 --- a/src/IVtkOCC/IVtkOCC_ShapePickerAlgo.cxx +++ b/src/IVtkOCC/IVtkOCC_ShapePickerAlgo.cxx @@ -310,14 +310,14 @@ bool IVtkOCC_ShapePickerAlgo::processPicked() if (aSelectable.IsNull()) { - anOutput << "Error: EntityOwner having null SelectableObject picked!"; + anOutput->SendAlarm() << "Error: EntityOwner having null SelectableObject picked!"; continue; } Handle(IVtkOCC_Shape) aSelShape = aSelectable->GetShape(); if (aSelShape.IsNull()) { - anOutput << "Error: SelectableObject with null OccShape pointer picked!"; + anOutput->SendAlarm() << "Error: SelectableObject with null OccShape pointer picked!"; continue; } @@ -334,12 +334,12 @@ bool IVtkOCC_ShapePickerAlgo::processPicked() TopoDS_Shape aSubShape = anEntityOwner->Shape(); if (aTopLevelShape.IsNull()) { - anOutput << "Error: OccShape with null top-level TopoDS_Shape picked!"; + anOutput->SendAlarm() << "Error: OccShape with null top-level TopoDS_Shape picked!"; continue; } if (aSubShape.IsNull()) { - anOutput << "Error: EntityOwner with null TopoDS_Shape picked!"; + anOutput->SendAlarm() << "Error: EntityOwner with null TopoDS_Shape picked!"; continue; } diff --git a/src/Interface/Interface_Check.cxx b/src/Interface/Interface_Check.cxx index a54d5be7a8..b6ff1aff34 100644 --- a/src/Interface/Interface_Check.cxx +++ b/src/Interface/Interface_Check.cxx @@ -685,7 +685,7 @@ void Interface_Check::GetAsWarning(const Handle(Interface_Check)& other, //purpose : //======================================================================= -void Interface_Check::Print(const Handle(Message_Messenger)& S, const Standard_Integer level, +void Interface_Check::Print(Standard_OStream& S, const Standard_Integer level, const Standard_Integer final) const { Standard_Integer j, nb = NbFails(); @@ -695,9 +695,9 @@ void Interface_Check::Print(const Handle(Message_Messenger)& S, const Standard_I // if (nb > 0) S<<" --> Fails : "<= 0) - S< 0) S<<" --> Warnings : "<= 0) - S< 0) S<<" --> Infos : "<= 0) - S< : if positive (D) prints final values of messages //! if negative, prints originals //! if null, prints both forms - Standard_EXPORT void Print (const Handle(Message_Messenger)& S, const Standard_Integer level, const Standard_Integer final = 1) const; + Standard_EXPORT void Print (Standard_OStream& S, const Standard_Integer level, const Standard_Integer final = 1) const; //! Prints the messages of the check to the default trace file //! By default, according to the default standard level diff --git a/src/Interface/Interface_CheckIterator.cxx b/src/Interface/Interface_CheckIterator.cxx index 07d5fbd072..645be1169c 100644 --- a/src/Interface/Interface_CheckIterator.cxx +++ b/src/Interface/Interface_CheckIterator.cxx @@ -16,7 +16,6 @@ #include #include #include -#include #include #include #include @@ -501,7 +500,7 @@ Standard_Integer Interface_CheckIterator::Number () const //purpose : //======================================================================= -void Interface_CheckIterator::Print(const Handle(Message_Messenger)& S, +void Interface_CheckIterator::Print(Standard_OStream& S, const Standard_Boolean failsonly, const Standard_Integer final) const { @@ -514,7 +513,7 @@ void Interface_CheckIterator::Print(const Handle(Message_Messenger)& S, //purpose : //======================================================================= -void Interface_CheckIterator::Print(const Handle(Message_Messenger)& S, +void Interface_CheckIterator::Print(Standard_OStream& S, const Handle(Interface_InterfaceModel)& model, const Standard_Boolean failsonly, const Standard_Integer /*final*/) const @@ -540,22 +539,22 @@ void Interface_CheckIterator::Print(const Handle(Message_Messenger)& S, // mesnum = mesnum0; // if (yamod) mesnum = (nm0 > 0 ? mesnum1 : mesnum2); - if (!titre) S<<" ** " << Name() << " **"< 9 && i < 10) S<<" "; if (nb > 99 && i < 100) S<<" "; - S< 9 && i < 10) S <<" "; if (nb > 99 && i < 100) S <<" "; + S <Print (ent,S); } - else S<<" -- Entity n0 "<Print (ent, S); } + else S <<" -- Entity n0 "<PrintLabel(ent,S); } - if (num >= 0 && entnul) S<<" (unknown Type)"<= 0 && entnul) S <<" (unknown Type)"<= 0 && !entnul) { - if (yamod) S<<" Type:"<TypeName(ent)<DynamicType()->Name()<TypeName(ent)<DynamicType()->Name()< > 0, prints only final messages //! It uses the recorded Model if it is defined //! Remark : Works apart from the iteration methods (no interference) - Standard_EXPORT void Print (const Handle(Message_Messenger)& S, const Standard_Boolean failsonly, const Standard_Integer final = 0) const; + Standard_EXPORT void Print (Standard_OStream& S, const Standard_Boolean failsonly, const Standard_Integer final = 0) const; //! Works as Print without a model, but for entities which have //! no attached number (Number not positive), tries to compute //! this Number from and displays "original" or "computed" - Standard_EXPORT void Print (const Handle(Message_Messenger)& S, const Handle(Interface_InterfaceModel)& model, const Standard_Boolean failsonly, const Standard_Integer final = 0) const; + Standard_EXPORT void Print (Standard_OStream& S, const Handle(Interface_InterfaceModel)& model, const Standard_Boolean failsonly, const Standard_Integer final = 0) const; //! Clears data of iteration Standard_EXPORT void Destroy(); diff --git a/src/Interface/Interface_CheckTool.cxx b/src/Interface/Interface_CheckTool.cxx index 1a136dff11..52f3c3e154 100644 --- a/src/Interface/Interface_CheckTool.cxx +++ b/src/Interface/Interface_CheckTool.cxx @@ -26,7 +26,6 @@ #include #include #include -#include #include #include #include @@ -155,18 +154,18 @@ void Interface_CheckTool::FillCheck(const Handle(Standard_Transient)& ent, //======================================================================= void Interface_CheckTool::Print(const Handle(Interface_Check)& ach, - const Handle(Message_Messenger)& S) const + Standard_OStream& S) const { Standard_Integer i, nb; nb = ach->NbFails(); if (nb > 0) S << " Fail Messages : " << nb << " :\n"; for (i = 1; i <= nb; i ++) { - S << ach->Fail(i) << "\n"; + S << ach->Fail(i)->String() << "\n"; } nb = ach->NbWarnings(); if (nb > 0) S << " Warning Messages : " << nb << " :\n"; for (i = 1; i <= nb; i ++) { - S << ach->Warning(i) << "\n"; + S << ach->Warning(i)->String() << "\n"; } } @@ -177,7 +176,7 @@ void Interface_CheckTool::Print(const Handle(Interface_Check)& ach, //======================================================================= void Interface_CheckTool::Print(const Interface_CheckIterator& list, - const Handle(Message_Messenger)& S) const + Standard_OStream& S) const { Handle(Interface_InterfaceModel) model = theshare.Model(); list.Print(S,model,Standard_False); diff --git a/src/Interface/Interface_CheckTool.hxx b/src/Interface/Interface_CheckTool.hxx index 663f628f08..f4ac23bedc 100644 --- a/src/Interface/Interface_CheckTool.hxx +++ b/src/Interface/Interface_CheckTool.hxx @@ -33,7 +33,6 @@ class Interface_HGraph; class Standard_Transient; class Interface_ShareTool; class Interface_Check; -class Message_Messenger; class Interface_CheckIterator; class Interface_EntityIterator; @@ -71,12 +70,12 @@ public: Standard_EXPORT void FillCheck (const Handle(Standard_Transient)& ent, const Interface_ShareTool& sh, Handle(Interface_Check)& ach); //! Utility method which Prints the content of a Check - Standard_EXPORT void Print (const Handle(Interface_Check)& ach, const Handle(Message_Messenger)& S) const; + Standard_EXPORT void Print (const Handle(Interface_Check)& ach, Standard_OStream& S) const; //! Simply Lists all the Checks and the Content (messages) and the //! Entity, if there is, of each Check //! (if all Checks are OK, nothing is Printed) - Standard_EXPORT void Print (const Interface_CheckIterator& list, const Handle(Message_Messenger)& S) const; + Standard_EXPORT void Print (const Interface_CheckIterator& list, Standard_OStream& S) const; //! Returns the Check associated to an Entity identified by //! its Number in a Model. diff --git a/src/Interface/Interface_FileReaderTool.cxx b/src/Interface/Interface_FileReaderTool.cxx index bec27975c4..1351fd6fb6 100644 --- a/src/Interface/Interface_FileReaderTool.cxx +++ b/src/Interface/Interface_FileReaderTool.cxx @@ -575,7 +575,10 @@ Handle(Standard_Transient) Interface_FileReaderTool::LoadedEntity thereports->SetValue(irep,rep); if ( thetrace >= 2 && !Messenger().IsNull()) - ach->Print (Messenger(),2); + { + Message_Messenger::StreamBuffer sout = Messenger()->SendInfo(); + ach->Print (sout,2); + } } // Rechargement ? si oui, dans une UnknownEntity fournie par le protocole diff --git a/src/Interface/Interface_InterfaceModel.cxx b/src/Interface/Interface_InterfaceModel.cxx index edfc3c23e8..968ba241e8 100644 --- a/src/Interface/Interface_InterfaceModel.cxx +++ b/src/Interface/Interface_InterfaceModel.cxx @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include @@ -916,18 +915,18 @@ void Interface_InterfaceModel::VerifyCheck (Handle(Interface_Check)& /*ach*/) co //======================================================================= void Interface_InterfaceModel::Print(const Handle(Standard_Transient)& ent, - const Handle(Message_Messenger)& S, + Standard_OStream& S, const Standard_Integer mode) const { - if (ent.IsNull()) { S<<"NULL"; return; } + if (ent.IsNull()) { S << "NULL" ; return; } Standard_Integer num = Number(ent); - if (mode <= 0) S<= 0) { if (num > 0) PrintToLog(ent,S); // PrintLabel (ent,S); - else S<<"??"; + else S <<"??"; } } @@ -938,7 +937,7 @@ void Interface_InterfaceModel::Print(const Handle(Standard_Transient)& ent, //======================================================================= void Interface_InterfaceModel::PrintToLog(const Handle(Standard_Transient)& ent, - const Handle(Message_Messenger)& S) const + Standard_OStream& S) const { PrintLabel (ent,S); } diff --git a/src/Interface/Interface_InterfaceModel.hxx b/src/Interface/Interface_InterfaceModel.hxx index e290857698..9d6be70897 100644 --- a/src/Interface/Interface_InterfaceModel.hxx +++ b/src/Interface/Interface_InterfaceModel.hxx @@ -40,7 +40,6 @@ class Interface_ReportEntity; class Interface_CheckIterator; class Interface_GeneralLib; class Interface_EntityIterator; -class Message_Messenger; class Interface_InterfaceModel; @@ -345,7 +344,7 @@ public: //! Dumps Header in a short, easy to read, form, onto a Stream //! allows to print more or less parts of the header, //! if necessary. 0 for basic print - Standard_EXPORT virtual void DumpHeader (const Handle(Message_Messenger)& S, const Standard_Integer level = 0) const = 0; + Standard_EXPORT virtual void DumpHeader (Standard_OStream& S, const Standard_Integer level = 0) const = 0; //! Prints identification of a given entity in , in order to //! be printed in a list or phrase @@ -354,17 +353,17 @@ public: //! = 0 (D) : prints its number plus '/' plus PrintLabel //! If == , simply prints "Global" //! If is unknown, prints "??/its type" - Standard_EXPORT void Print (const Handle(Standard_Transient)& ent, const Handle(Message_Messenger)& s, const Standard_Integer mode = 0) const; + Standard_EXPORT void Print (const Handle(Standard_Transient)& ent, Standard_OStream& s, const Standard_Integer mode = 0) const; //! Prints label specific to each norm, for a given entity. //! Must only print label itself, in order to be included in a //! phrase. Can call the result of StringLabel, but not obliged. - Standard_EXPORT virtual void PrintLabel (const Handle(Standard_Transient)& ent, const Handle(Message_Messenger)& S) const = 0; + Standard_EXPORT virtual void PrintLabel (const Handle(Standard_Transient)& ent, Standard_OStream& S) const = 0; //! Prints label specific to each norm in log format, for //! a given entity. //! By default, just calls PrintLabel, can be redefined - Standard_EXPORT virtual void PrintToLog (const Handle(Standard_Transient)& ent, const Handle(Message_Messenger)& S) const; + Standard_EXPORT virtual void PrintToLog (const Handle(Standard_Transient)& ent, Standard_OStream& S) const; //! Returns a string with the label attached to a given entity. //! Warning : While this string may be edited on the spot, if it is a read diff --git a/src/Interface/Interface_ShareTool.cxx b/src/Interface/Interface_ShareTool.cxx index e370f81e86..018c5460b7 100644 --- a/src/Interface/Interface_ShareTool.cxx +++ b/src/Interface/Interface_ShareTool.cxx @@ -203,13 +203,13 @@ Interface_ShareTool::Interface_ShareTool (const Handle(Interface_HGraph)& ahgrap return list; } - void Interface_ShareTool::Print - (const Interface_EntityIterator& iter, const Handle(Message_Messenger)& S) const +void Interface_ShareTool::Print (const Interface_EntityIterator& iter, Standard_OStream& S) const { S << " Nb.Entities : " << iter.NbEntities() << " : "; for (iter.Start(); iter.More(); iter.Next()) { Handle(Standard_Transient) ent = iter.Value(); - S << " n0/id:"; Model()->Print(ent,S); + S << " n0/id:"; + Model()->Print (ent, S); } - S< -#include -#include - -#include -#include #include + class Interface_HGraph; class Standard_DomainError; class Interface_InterfaceError; @@ -33,9 +28,6 @@ class Interface_GTool; class Interface_Protocol; class Interface_Graph; class Interface_EntityIterator; -class Standard_Transient; -class Message_Messenger; - //! Builds the Graph of Dependancies, from the General Service //! "Shared" -> builds for each Entity of a Model, the Shared and @@ -113,7 +105,7 @@ public: //! Utility method which Prints the content of an iterator //! (by their Numbers) - Standard_EXPORT void Print (const Interface_EntityIterator& iter, const Handle(Message_Messenger)& S) const; + Standard_EXPORT void Print (const Interface_EntityIterator& iter,Standard_OStream& S) const; diff --git a/src/Interface/Interface_Static.cxx b/src/Interface/Interface_Static.cxx index bc9dd50117..6cd62e1093 100644 --- a/src/Interface/Interface_Static.cxx +++ b/src/Interface/Interface_Static.cxx @@ -11,10 +11,9 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. +#include #include -#include -#include #include #include #include @@ -84,15 +83,15 @@ static char defmess[31]; // ## Print ## -void Interface_Static::PrintStatic (const Handle(Message_Messenger)& S) const +void Interface_Static::PrintStatic (Standard_OStream& S) const { - S<<"--- Static Value : "<Name()<Name()<in_avail() > 0) { - myMessenger->Send (myStream.str().c_str(), myGravity); + if (myMessenger) + { + myMessenger->Send(myStream.str().c_str(), myGravity); + } myStream.str(std::string()); // empty the buffer for possible reuse } } @@ -113,6 +116,12 @@ public: //! Access to the stream object Standard_SStream& Stream () { return myStream; } + //! Cast to OStream& + operator Standard_OStream& () { return myStream; } + + //! Access to the messenger + Message_Messenger* Messenger () { return myMessenger; } + private: friend class Message_Messenger; @@ -221,85 +230,4 @@ private: }; -// CString -inline const Handle(Message_Messenger)& operator<< (const Handle(Message_Messenger)& theMessenger, - const Standard_CString theStr) -{ - theMessenger->Send (theStr, Message_Info, Standard_False); - return theMessenger; -} - -// AsciiString -inline const Handle(Message_Messenger)& operator<< (const Handle(Message_Messenger)& theMessenger, - const TCollection_AsciiString& theStr) -{ - theMessenger->Send (theStr, Message_Info, Standard_False); - return theMessenger; -} - -// HAsciiString -inline const Handle(Message_Messenger)& operator<< (const Handle(Message_Messenger)& theMessenger, - const Handle(TCollection_HAsciiString)& theStr) -{ - theMessenger->Send (theStr->String(), Message_Info, Standard_False); - return theMessenger; -} - -// ExtendedString -inline const Handle(Message_Messenger)& operator<< (const Handle(Message_Messenger)& theMessenger, - const TCollection_ExtendedString& theStr) -{ - theMessenger->Send (theStr, Message_Info, Standard_False); - return theMessenger; -} - -// HExtendedString -inline const Handle(Message_Messenger)& operator<< (const Handle(Message_Messenger)& theMessenger, - const Handle(TCollection_HExtendedString)& theStr) -{ - theMessenger->Send (theStr->String(), Message_Info, Standard_False); - return theMessenger; -} - -// Integer -inline const Handle(Message_Messenger)& operator<< (const Handle(Message_Messenger)& theMessenger, - const Standard_Integer theVal) -{ - TCollection_AsciiString aStr (theVal); - theMessenger->Send (aStr, Message_Info, Standard_False); - return theMessenger; -} - -// Real -inline const Handle(Message_Messenger)& operator<< (const Handle(Message_Messenger)& theMessenger, - const Standard_Real theVal) -{ - TCollection_AsciiString aStr (theVal); - theMessenger->Send (aStr, Message_Info, Standard_False); - return theMessenger; -} - -// Stream -inline const Handle(Message_Messenger)& operator<< (const Handle(Message_Messenger)& theMessenger, - const Standard_SStream& theStream) -{ - theMessenger->Send (theStream.str().c_str(), Message_Info, Standard_False); - return theMessenger; -} - -// manipulators -inline const Handle(Message_Messenger)& - operator << (const Handle(Message_Messenger)& theMessenger, - const Handle(Message_Messenger)& (*pman) (const Handle(Message_Messenger)&)) -{ - return pman (theMessenger); -} - -// Message_EndLine -inline const Handle(Message_Messenger)& Message_EndLine (const Handle(Message_Messenger)& theMessenger) -{ - theMessenger->Send ("", Message_Info, Standard_True); - return theMessenger; -} - #endif // _Message_Messenger_HeaderFile diff --git a/src/MoniTool/MoniTool_TypedValue.cxx b/src/MoniTool/MoniTool_TypedValue.cxx index d964b768aa..84d691502c 100644 --- a/src/MoniTool/MoniTool_TypedValue.cxx +++ b/src/MoniTool/MoniTool_TypedValue.cxx @@ -11,10 +11,9 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. - -#include -#include #include + +#include #include #include #include @@ -228,37 +227,37 @@ static Standard_Boolean StaticPath(const Handle(TCollection_HAsciiString)& val) // ## Print ## - void MoniTool_TypedValue::Print (const Handle(Message_Messenger)& S) const + void MoniTool_TypedValue::Print (Standard_OStream& S) const { - S<<"--- Typed Value : "< 0) S<<" Label : "< 0) S <<" Label : "<DynamicType()->Name(); + S <<" (type) "<DynamicType()->Name(); if (!thehval.IsNull()) - S<<(thetype == MoniTool_ValueIdent ? " : " : "")<ToCString(); + S <<(thetype == MoniTool_ValueIdent ? " : " : "")<ToCString(); if (HasInterpret()) { - S<<" ("; + S <<" ("; Handle(TCollection_HAsciiString) str = Interpret (thehval,Standard_True); - if (!str.IsNull() && str != thehval) S<<"Native:"<ToCString(); + if (!str.IsNull() && str != thehval) S <<"Native:"<ToCString(); str = Interpret (thehval,Standard_False); - if (!str.IsNull() && str != thehval) S<<" Coded:"<ToCString(); - S<<")"; + if (!str.IsNull() && str != thehval) S <<" Coded:"<ToCString(); + S <<")"; } } - else S<<"(not set)"; + else S <<"(not set)"; } diff --git a/src/MoniTool/MoniTool_TypedValue.hxx b/src/MoniTool/MoniTool_TypedValue.hxx index 999c249ffd..efbfd05fa2 100644 --- a/src/MoniTool/MoniTool_TypedValue.hxx +++ b/src/MoniTool/MoniTool_TypedValue.hxx @@ -37,8 +37,6 @@ class TCollection_HAsciiString; class Standard_Transient; class Standard_ConstructionError; class TCollection_AsciiString; -class Message_Messenger; - class MoniTool_TypedValue; DEFINE_STANDARD_HANDLE(MoniTool_TypedValue, Standard_Transient) @@ -93,10 +91,10 @@ public: Standard_EXPORT void SetDefinition (const Standard_CString deftext); //! Prints definition, specification, and actual status and value - Standard_EXPORT virtual void Print (const Handle(Message_Messenger)& S) const; + Standard_EXPORT virtual void Print (Standard_OStream& S) const; //! Prints only the Value - Standard_EXPORT void PrintValue (const Handle(Message_Messenger)& S) const; + Standard_EXPORT void PrintValue (Standard_OStream& S) const; //! Completes the definition of a TypedValue by command , //! once created with its type diff --git a/src/STEPCAFControl/STEPCAFControl_Writer.cxx b/src/STEPCAFControl/STEPCAFControl_Writer.cxx index 2264585b7e..9dba1aea02 100644 --- a/src/STEPCAFControl/STEPCAFControl_Writer.cxx +++ b/src/STEPCAFControl/STEPCAFControl_Writer.cxx @@ -1620,7 +1620,7 @@ Standard_Boolean STEPCAFControl_Writer::WriteLayers (const Handle(XSControl_Work Standard_Integer nb = FindEntities ( FP, oneShape, Loc, seqRI ); if ( nb <=0 ) - FP->Messenger() << "Warning: Cannot find RI for " << oneShape.TShape()->DynamicType()->Name() << Message_EndLine; + FP->Messenger()->SendInfo() << "Warning: Cannot find RI for " << oneShape.TShape()->DynamicType()->Name() << std::endl; } if ( seqRI.Length() <= 0 ) continue; @@ -1632,7 +1632,7 @@ Standard_Boolean STEPCAFControl_Writer::WriteLayers (const Handle(XSControl_Work if (L.FindAttribute(XCAFDoc::InvisibleGUID(), aUAttr)) { descr = new TCollection_HAsciiString ("invisible"); #ifdef OCCT_DEBUG - FP->Messenger() << "\tLayer \"" << hName->String().ToCString() << "\" is invisible"<String().ToCString() << "\" is invisible"<Messenger() << "Warning: Cannot find RI for " << Sh.TShape()->DynamicType()->Name() << Message_EndLine; + std::cout << "Warning: Cannot find RI for " << Sh.TShape()->DynamicType()->Name() << std::endl; #endif item = Handle(StepRepr_RepresentationItem)::DownCast(seqRI(1)); //get overridden styled item @@ -2345,7 +2345,7 @@ Handle(StepRepr_ShapeAspect) STEPCAFControl_Writer::WriteShapeAspect (const Hand TColStd_SequenceOfTransient aSeqRI; FindEntities( FP, theShape, aLoc, aSeqRI ); if ( aSeqRI.Length() <= 0 ) { - FP->Messenger() << "Warning: Cannot find RI for "<DynamicType()->Name()<Messenger()->SendInfo() << "Warning: Cannot find RI for "<DynamicType()->Name()<Messenger() << "Warning: Cannot find RI for " << aShape.TShape()->DynamicType()->Name() << Message_EndLine; + FP->Messenger()->SendInfo() << "Warning: Cannot find RI for " << aShape.TShape()->DynamicType()->Name() << std::endl; continue; } anEnt = aSeqRI.Value(1); @@ -3429,7 +3429,7 @@ Standard_Boolean STEPCAFControl_Writer::WriteDGTs (const Handle(XSControl_WorkSe TColStd_SequenceOfTransient seqRI; FindEntities( FP, aShape, Loc, seqRI ); if ( seqRI.Length() <= 0 ) { - FP->Messenger() << "Warning: Cannot find RI for "<DynamicType()->Name()<Messenger()->SendInfo() << "Warning: Cannot find RI for "<DynamicType()->Name()<Messenger() << "Warning: Cannot find RI for "<DynamicType()->Name()<Messenger()->SendInfo() << "Warning: Cannot find RI for "<DynamicType()->Name()<PrintLabel ( PD, sout ); - sout << Message_EndLine; + Model()->PrintLabel (PD, sout); + sout << std::endl; #endif return ProdDef; } @@ -555,10 +555,10 @@ Handle(StepBasic_ProductDefinition) STEPConstruct_ValidationProps::GetPropPD (co } #ifdef OCCT_DEBUG if ( ProdDef.IsNull() ) { - Handle(Message_Messenger) sout = Message::DefaultMessenger(); + Message_Messenger::StreamBuffer sout = Message::SendInfo(); sout << "Error: Cannot find target entity (SDR) for geometric_validation_property "; - Model()->PrintLabel ( PD, sout ); - sout << Message_EndLine; + Model()->PrintLabel (PD, sout); + sout << std::endl; } #endif return ProdDef; @@ -608,10 +608,10 @@ TopoDS_Shape STEPConstruct_ValidationProps::GetPropShape (const Handle(StepBasic //} #ifdef OCCT_DEBUG if ( S.IsNull() ) { - Handle(Message_Messenger) sout = Message::DefaultMessenger(); + Message_Messenger::StreamBuffer sout = Message::SendInfo(); sout << "Warning: Entity "; - Model()->PrintLabel ( ProdDef, sout ); - sout << " is not mapped to shape" << Message_EndLine; + Model()->PrintLabel (ProdDef, sout); + sout << " is not mapped to shape" << std::endl; } #endif return S; diff --git a/src/STEPControl/STEPControl_ActorRead.cxx b/src/STEPControl/STEPControl_ActorRead.cxx index 78e4d05de0..ca669964ed 100644 --- a/src/STEPControl/STEPControl_ActorRead.cxx +++ b/src/STEPControl/STEPControl_ActorRead.cxx @@ -470,7 +470,7 @@ static void getSDR(const Handle(StepRepr_ProductDefinitionShape)& PDS, const Handle(Transfer_TransientProcess)& TP, const Standard_Boolean theUseTrsf) { - Handle(Message_Messenger) sout = TP->Messenger(); + Message_Messenger::StreamBuffer sout = TP->Messenger()->SendInfo(); Handle(TransferBRep_ShapeBinder) shbinder; TopoDS_Compound Cund; @@ -547,7 +547,7 @@ static void getSDR(const Handle(StepRepr_ProductDefinitionShape)& PDS, #ifdef TRANSLOG if (TP->TraceLevel() > 1) - sout<<" -- Actor : Ent.n0 "<Model()->Number(PD)<<" -> Shared Ent.no"<Model()->Number(NAUO)<Model()->Number(PD)<<" -> Shared Ent.no"<Model()->Number(NAUO)<IsBound(NAUO)) binder = TransferEntity(NAUO,TP); @@ -789,10 +789,10 @@ Handle(TransferBRep_ShapeBinder) STEPControl_ActorRead::TransferEntity( Standard_Integer nb = sr->NbItems(); // Used in XSAlgo::AlgoContainer()->ProcessShape (ssv; 13.11.2010) Standard_Integer nbTPitems = TP->NbMapped(); - Handle(Message_Messenger) sout = TP->Messenger(); + Message_Messenger::StreamBuffer sout = TP->Messenger()->SendInfo(); #ifdef TRANSLOG if (TP->TraceLevel() > 2) - sout<<" -- Actor : case ShapeRepr. NbItems="<ItemsValue(i); if(anitem.IsNull()) @@ -1232,7 +1232,7 @@ static Standard_Boolean IsNeedRepresentation(const Handle(StepRepr_ShapeAspect)& Handle(TransferBRep_ShapeBinder) STEPControl_ActorRead::OldWay(const Handle(Standard_Transient)& start, const Handle(Transfer_TransientProcess)& TP) { - Handle(Message_Messenger) sout = TP->Messenger(); + Message_Messenger::StreamBuffer sout = TP->Messenger()->SendInfo(); const Interface_Graph& graph = TP->Graph(); Handle(TransferBRep_ShapeBinder) shbinder; DeclareAndCast(StepShape_ShapeDefinitionRepresentation,sdr,start); @@ -1252,7 +1252,7 @@ Handle(TransferBRep_ShapeBinder) STEPControl_ActorRead::OldWay(const Handle(Stan #ifdef TRANSLOG if (TP->TraceLevel() > 2) - sout<<" -- Actor : case shape_definition_representation."<Find(rep); if (binder.IsNull()) binder = TP->Transferring(rep); @@ -1293,7 +1293,7 @@ Handle(TransferBRep_ShapeBinder) STEPControl_ActorRead::OldWay(const Handle(Stan // if (anitem.IsNull()) continue; #ifdef TRANSLOG if (TP->TraceLevel() > 1) - sout<<" -- Actor : Ent.n0 "<Model()->Number(start)<<" -> Shared Ent.no"<Model()->Number(anitem)<Model()->Number(start)<<" -> Shared Ent.no"<Model()->Number(anitem)<IsBound(anitem)) binder = TP->Transferring(anitem); @@ -1322,7 +1322,7 @@ Handle(TransferBRep_ShapeBinder) STEPControl_ActorRead::TransferEntity(const Han const Handle(Transfer_TransientProcess)& TP, const Standard_Boolean isManifold) { - Handle(Message_Messenger) sout = TP->Messenger(); + Message_Messenger::StreamBuffer sout = TP->Messenger()->SendInfo(); Handle(TransferBRep_ShapeBinder) shbinder; Standard_Boolean found = Standard_False; StepToTopoDS_Builder myShapeBuilder; @@ -1332,7 +1332,7 @@ Handle(TransferBRep_ShapeBinder) STEPControl_ActorRead::TransferEntity(const Han OSD_Timer chrono; if (TP->TraceLevel() > 2) sout << "Begin transfer STEP -> CASCADE, Type " - << start->DynamicType()->Name() << Message_EndLine; + << start->DynamicType()->Name() << std::endl; chrono.Start(); #endif @@ -1413,7 +1413,7 @@ Handle(TransferBRep_ShapeBinder) STEPControl_ActorRead::TransferEntity(const Han #ifdef TRANSLOG chrono.Stop(); if (TP->TraceLevel() > 2) - sout<<"End transfer STEP -> CASCADE :" << (found ? "OK" : " : no result")< CASCADE :" << (found ? "OK" : " : no result")<TraceLevel() > 2) chrono.Show(); #endif @@ -1570,11 +1570,11 @@ Handle(Transfer_Binder) STEPControl_ActorRead::TransferShape( if (start.IsNull()) return NullResult(); XSAlgo::AlgoContainer()->PrepareForTransfer(); - Handle(Message_Messenger) sout = TP->Messenger(); + Message_Messenger::StreamBuffer sout = TP->Messenger()->SendInfo(); #ifdef TRANSLOG // POUR MISE AU POINT, a supprimer ensuite if (TP->TraceLevel() > 1) - sout<<" -- Actor : Transfer Ent.n0 "<Model()->Number(start)<<" Type "<DynamicType()->Name()<Model()->Number(start)<<" Type "<DynamicType()->Name()<TraceLevel() > 1) - TP->Messenger() <<" Cc1ToTopoDS : Length Unit = "< 0) cdl = " - << ent->DynamicType()->Name() << " (...);" << Message_EndLine; + << ent->DynamicType()->Name() << " (...);" << std::endl; else { Standard_Integer n = listypes.Length(); for (i = 1; i <= n; i ++) S << listypes.Value(i) << " (...)"; - S << Message_EndLine; + S << std::endl; } } - else S << module->StepType(CN) << " (...);" << Message_EndLine; + else S << module->StepType(CN) << " (...);" << std::endl; } else S << "(Unrecognized Type for protocol) cdl = " - << ent->DynamicType()->Name() << " (...);" << Message_EndLine; - if (nlab > 0) S << "/* Ident in file for "<DynamicType()->Name() << " (...);" << std::endl; + if (nlab > 0) S << "/* Ident in file for "< 0) nbi ++; } if (nbe > 0) { -// S <<" -- Displayed nums:"< 0) { - S<<" (no ident): "; + S <<" (no ident): "; for (i = 1; i <= nb; i ++) - { if (ids.Value(i) >= 0) continue; S<<" #"<= 0) continue; S <<" #"< 0) { - S<<" (ident = num): "; - for (i = 1; i <= nb; i ++) { if (ids.Value(i) == i) S<<" #"< 79) { nbl = nbc; S< 79) { nbl = nbc; S < 0; nbr0 --) S << " "; } - S< 79) { S<#"< 5) { nbl = nbr = 0; S< 0) S< 0) S < 0) S<<"In dump, iii:#jjj means : entity rank iii has step ident #jjj"< 0) S <<"In dump, iii:#jjj means : entity rank iii has step ident #jjj"< 0) { - Standard_SStream aStream; - thewriter.Print(aStream); - S << aStream; + thewriter.Print (S); } return Standard_True; } Standard_Boolean StepData_StepDumper::Dump - (const Handle(Message_Messenger)& S, const Standard_Integer num, + (Standard_OStream& S, const Standard_Integer num, const Standard_Integer level) { if (num <= 0 || num > themodel->NbEntities()) return Standard_False; diff --git a/src/StepData/StepData_StepDumper.hxx b/src/StepData/StepData_StepDumper.hxx index 963e792068..646b6ee256 100644 --- a/src/StepData/StepData_StepDumper.hxx +++ b/src/StepData/StepData_StepDumper.hxx @@ -30,9 +30,6 @@ class StepData_StepModel; class Interface_InterfaceMismatch; class StepData_Protocol; class StepData_StepWriter; -class Message_Messenger; -class Standard_Transient; - //! Provides a way to dump entities processed through STEP, with //! these features : @@ -79,12 +76,12 @@ public: //! //! For levels 1,2,3, the numbers displayed (form #nnn) are the //! numbers of the corresponding entities in the Model - Standard_EXPORT Standard_Boolean Dump (const Handle(Message_Messenger)& S, const Handle(Standard_Transient)& ent, const Standard_Integer level); + Standard_EXPORT Standard_Boolean Dump (Standard_OStream& S, const Handle(Standard_Transient)& ent, const Standard_Integer level); //! Works as Dump with a Transient, but directly takes the //! entity designated by its number in the Model //! Returns False, also if is out of range - Standard_EXPORT Standard_Boolean Dump (const Handle(Message_Messenger)& S, const Standard_Integer num, const Standard_Integer level); + Standard_EXPORT Standard_Boolean Dump (Standard_OStream& S, const Standard_Integer num, const Standard_Integer level); diff --git a/src/StepData/StepData_StepModel.cxx b/src/StepData/StepData_StepModel.cxx index 69de9afc1f..c68965372e 100644 --- a/src/StepData/StepData_StepModel.cxx +++ b/src/StepData/StepData_StepModel.cxx @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include @@ -103,14 +102,13 @@ void StepData_StepModel::VerifyCheck(Handle(Interface_Check)& ach) const } -void StepData_StepModel::DumpHeader -(const Handle(Message_Messenger)& S, const Standard_Integer /*level*/) const +void StepData_StepModel::DumpHeader (Standard_OStream& S, const Standard_Integer /*level*/) const { // NB : level n est pas utilise Handle(StepData_Protocol) stepro = StepData::HeaderProtocol(); Standard_Boolean iapro = !stepro.IsNull(); - if (!iapro) S<<" -- WARNING : StepModel DumpHeader, Protocol not defined\n"; + if (!iapro) S <<" -- WARNING : StepModel DumpHeader, Protocol not defined\n"; Interface_EntityIterator iter = Header(); Standard_Integer nb = iter.NbEntities(); @@ -119,16 +117,14 @@ void StepData_StepModel::DumpHeader S << " " << iter.Value()->DynamicType()->Name() << "\n"; } if (!iapro || nb == 0) return; - S << " -- -- STEP MODEL HEADER CONTENT -- --" << Message_EndLine; + S << " -- -- STEP MODEL HEADER CONTENT -- --" << "\n"; S << " -- Dumped with Protocol : " << stepro->DynamicType()->Name() - << " --"<Value(num)); - if (nid > 0) S<<"#"< 0) S<<"(#"< 0) S <<"#"< 0) S <<"(#"< -#include - #include #include #include -#include -#include -#include + class Standard_NoSuchObject; class Standard_Transient; class Interface_InterfaceModel; class Interface_EntityIterator; class Interface_Check; -class Message_Messenger; class TCollection_HAsciiString; - class StepData_StepModel; DEFINE_STANDARD_HANDLE(StepData_StepModel, Interface_InterfaceModel) @@ -83,7 +76,7 @@ public: //! prints its Type. Else sends the Header under the form of //! HEADER Section of an Ascii Step File //! is not used because Header is not so big - 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; //! erases specific labels, i.e. clears the map (entity-ident) Standard_EXPORT void ClearLabels() Standard_OVERRIDE; @@ -98,7 +91,7 @@ public: //! Prints label specific to STEP norm for a given entity, i.e. //! if a LabelIdent has been recorded, its value with '#', else //! the number in the model with '#' and between () - 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; //! Returns a string with the label attached to a given entity, //! same form as for PrintLabel diff --git a/src/StepData/StepData_StepReaderData.cxx b/src/StepData/StepData_StepReaderData.cxx index 69bcda5903..56018e249a 100644 --- a/src/StepData/StepData_StepReaderData.cxx +++ b/src/StepData/StepData_StepReaderData.cxx @@ -187,11 +187,11 @@ void StepData_StepReaderData::SetRecord(const Standard_Integer num, while (theidents(prev) <= 0) { prev--; if (prev <= 0) break; } - Handle(Message_Messenger) sout = Message::DefaultMessenger(); + Message_Messenger::StreamBuffer sout = Message::SendInfo(); sout << " *** Error on Record " << num << " (on " << NbRecords() << " -> " << num * 100 / NbRecords() << " % in File) ***"; if (prev > 0) sout << " Ident #" << theidents(prev); - sout << "\n" << errm << Message_EndLine; + sout << "\n" << errm << std::endl; #endif thecheck->AddWarning(errm.ToCString(), "Complex Type incorrect : "); } @@ -1526,7 +1526,7 @@ Standard_Integer StepData_StepReaderData::FindEntityNumber(const Standard_Intege void StepData_StepReaderData::SetEntityNumbers(const Standard_Boolean withmap) { - Handle(Message_Messenger) sout = Message::DefaultMessenger(); + Message_Messenger::StreamBuffer sout = Message::SendInfo(); // Passe initiale : Resolution directe par Map // si tout passe (pas de collision), OK. Sinon, autres passes a prevoir // On resoud du meme coup les sous-listes @@ -1571,7 +1571,7 @@ void StepData_StepReaderData::SetEntityNumbers(const Standard_Boolean withmap) if (letype == Interface_ParamSub) { Standard_Integer numsub = FP.EntityNumber(); if (numsub > thelastn) { - sout << "Bad Sub.N0, Record " << num << " Param " << na << ":$" << numsub << Message_EndLine; + sout << "Bad Sub.N0, Record " << num << " Param " << na << ":$" << numsub << std::endl; continue; } FP.SetEntityNumber(subn(numsub)); @@ -1596,7 +1596,7 @@ void StepData_StepReaderData::SetEntityNumbers(const Standard_Boolean withmap) // ... Et sortir message un peu plus complet sout << "*** ERR StepReaderData *** Pour Entite #" << ident << "\n Type:" << RecordType(num) - << " Param.n0 " << na << ": #" << id << " Non trouve" << Message_EndLine; + << " Param.n0 " << na << ": #" << id << " Non trouve" << std::endl; } // FIN Mapping } // FIN Traitement Reference } // FIN Boucle Parametres @@ -1663,7 +1663,7 @@ void StepData_StepReaderData::SetEntityNumbers(const Standard_Boolean withmap) char ligne[80]; sprintf(ligne, "Ident defined SEVERAL TIMES : #%d", ident); thecheck->AddFail(ligne, "Ident defined SEVERAL TIMES : #%d"); - sout << "StepReaderData:SetEntityNumbers, " << ligne << Message_EndLine; + sout << "StepReaderData:SetEntityNumbers, " << ligne << std::endl; } if (indm(indmap) > 0) indm(indmap) = -indm(indmap); // Pas pour Map // Cas Normal pour la Map @@ -1856,7 +1856,7 @@ void StepData_StepReaderData::SetEntityNumbers(const Standard_Boolean withmap) sout << "*** ERR StepReaderData *** Pour Entite " << nument << ", a " << (nr * 100) / nbseq << "% de DATA : #" << ident << "\n Type:" << RecordType(num) - << " Param.n0 " << na << ": #" << id << " Non trouve" << Message_EndLine; + << " Param.n0 " << na << ": #" << id << " Non trouve" << std::endl; FP.SetEntityNumber(0); // -> Reference non resolue } } diff --git a/src/StepData/StepData_StepReaderTool.cxx b/src/StepData/StepData_StepReaderTool.cxx index 1751f8e564..7e52ae77dd 100644 --- a/src/StepData/StepData_StepReaderTool.cxx +++ b/src/StepData/StepData_StepReaderTool.cxx @@ -98,7 +98,7 @@ void StepData_StepReaderTool::Prepare (const Standard_Boolean optim) SetEntities(); } catch(Standard_Failure const& anException) { - Handle(Message_Messenger) sout = Message::DefaultMessenger(); + Message_Messenger::StreamBuffer sout = Message::SendInfo(); sout << " Exception Raised during Preparation :\n"; sout << anException.GetMessageString(); sout << "\n Now, trying to continue, but with presomption of failure\n"; @@ -159,7 +159,7 @@ void StepData_StepReaderTool::PrepareHeader void StepData_StepReaderTool::BeginRead (const Handle(Interface_InterfaceModel)& amodel) { - Handle(Message_Messenger) sout = Message::DefaultMessenger(); + Message_Messenger::StreamBuffer sout = Message::SendInfo(); DeclareAndCast(StepData_StepModel,model,amodel); DeclareAndCast(StepData_StepReaderData,stepdat,Data()); @@ -184,7 +184,7 @@ void StepData_StepReaderTool::BeginRead Handle(Interface_Check) mch = model->GlobalCheck(); Standard_Integer nbmess = ach->NbWarnings(); sout<DynamicType()->Name() << Message_EndLine; + if (!ent.IsNull()) sout << ent->DynamicType()->Name() << std::endl; for (Standard_Integer nf = 1; nf <= nbmess; nf ++) sout << ach->CWarning(nf) << "\n"; } @@ -192,7 +192,7 @@ void StepData_StepReaderTool::BeginRead Handle(Interface_Check) mch = model->GlobalCheck(); Standard_Integer nbmess = ach->NbFails(); sout << " Errors on Reading Header Entity N0."<DynamicType()->Name() << Message_EndLine; + if (!ent.IsNull()) sout << ent->DynamicType()->Name() << std::endl; for (Standard_Integer nf = 1; nf <= nbmess; nf ++) sout << ach->CFail(nf) << "\n"; } diff --git a/src/StepFile/StepFile_Read.cxx b/src/StepFile/StepFile_Read.cxx index ca16bd22fc..1a76bac419 100644 --- a/src/StepFile/StepFile_Read.cxx +++ b/src/StepFile/StepFile_Read.cxx @@ -117,7 +117,7 @@ Standard_Integer StepFile_Read const Handle(StepData_FileRecognizer)& recodata) { - Handle(Message_Messenger) sout = Message::DefaultMessenger(); + Message_Messenger::StreamBuffer sout = Message::SendInfo(); char *ficnom = nomfic ; // because const (non reconnu par C) checkread->Clear(); @@ -129,7 +129,7 @@ Standard_Integer StepFile_Read OSD_Timer c ; c.Reset () ; c.Start(); - sout << " ... Step File Reading : " << ficnom << "" << Message_EndLine; + sout << " ... Step File Reading : " << ficnom << "" << std::endl; #endif try { @@ -138,9 +138,9 @@ Standard_Integer StepFile_Read } catch (Standard_Failure const& anException) { #ifdef OCCT_DEBUG - sout << " ... Exception Raised while reading Step File : " << ficnom << ":\n" << Message_EndLine; + sout << " ... Exception Raised while reading Step File : " << ficnom << ":\n" << std::endl; sout << anException.GetMessageString(); - sout << " ..." << Message_EndLine; + sout << " ..." << std::endl; #endif (void)anException; lir_file_fin(3); @@ -150,7 +150,7 @@ Standard_Integer StepFile_Read // Continue reading of file despite of possible fails //if (checkread->HasFailed()) { lir_file_fin(3); stepread_endinput (newin,ficnom); return 1; } #ifdef CHRONOMESURE - sout << " ... STEP File Read ... " << Message_EndLine; + sout << " ... STEP File Read ... " << std::endl; c.Show(); #endif @@ -193,10 +193,10 @@ Standard_Integer StepFile_Read // on a undirec pret pour la suite #ifdef CHRONOMESURE - sout << " ... Step File loaded ... " << Message_EndLine; + sout << " ... Step File loaded ... " << std::endl; c.Show(); sout << " "<< undirec->NbRecords () << - " records (entities,sub-lists,scopes), "<< nbpar << " parameters\n" << Message_EndLine; + " records (entities,sub-lists,scopes), "<< nbpar << " parameters\n" << std::endl; #endif // Analyse : par StepReaderTool @@ -219,10 +219,10 @@ Standard_Integer StepFile_Read readtool.Clear(); undirec.Nullify(); #ifdef CHRONOMESURE - sout << " ... Objets analysed ... " << Message_EndLine; + sout << " ... Objets analysed ... " << std::endl; c.Show(); n = stepmodel->NbEntities() ; - sout << " STEP Loading done : " << n << " Entities" << Message_EndLine; + sout << " STEP Loading done : " << n << " Entities" << std::endl; #endif stepread_endinput (newin,ficnom); return 0 ; @@ -231,8 +231,8 @@ Standard_Integer StepFile_Read void StepFile_Interrupt (char* mess) { #ifdef OCCT_DEBUG - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - sout << " **** StepFile Error : " << mess << " ****" << Message_EndLine; + Message_Messenger::StreamBuffer sout = Message::SendInfo(); + sout << " **** StepFile Error : " << mess << " ****" << std::endl; #endif checkread->AddFail(mess); } diff --git a/src/StepSelect/StepSelect_WorkLibrary.cxx b/src/StepSelect/StepSelect_WorkLibrary.cxx index 03f303c647..1b7d969e97 100644 --- a/src/StepSelect/StepSelect_WorkLibrary.cxx +++ b/src/StepSelect/StepSelect_WorkLibrary.cxx @@ -83,7 +83,7 @@ Standard_Boolean StepSelect_WorkLibrary::WriteFile (IFSelect_ContextWrite& ctx) const { // Preparation - Handle(Message_Messenger) sout = Message::DefaultMessenger(); + Message_Messenger::StreamBuffer sout = Message::SendInfo(); DeclareAndCast(StepData_StepModel,stepmodel,ctx.Model()); DeclareAndCast(StepData_Protocol,stepro,ctx.Protocol()); if (stepmodel.IsNull() || stepro.IsNull()) return Standard_False; @@ -93,7 +93,7 @@ Standard_Boolean StepSelect_WorkLibrary::WriteFile if (!fout || !fout.is_open()) { ctx.CCheck(0)->AddFail("Step File could not be created"); - sout<<" Step File could not be created : " << ctx.FileName() << Message_EndLine; return 0; + sout<<" Step File could not be created : " << ctx.FileName() << std::endl; return 0; } sout << " Step File Name : "<GetMessages(chl.Value()); sout<<" Write "; Standard_Boolean isGood = SW.Print(fout); - sout<<" Done"<Number(entity); if (nument <= 0 || nument > model->NbEntities()) return; Standard_Boolean iserr = model->IsRedefinedContent(nument); Handle(Standard_Transient) ent, con; ent = entity; - S<<" --- (STEP) Entity "; model->Print(entity,S); + S <<" --- (STEP) Entity "; model->Print(entity, S); if (iserr) con = model->ReportEntity(nument)->Content(); - if (entity.IsNull()) { S<<" Null"<DynamicType()->Name() << Message_EndLine; + S << " Type cdl : " << entity->DynamicType()->Name() << std::endl; if (iserr) - S<<" *** NOT WELL LOADED : CONTENT FROM FILE ***"<IsUnknownEntity(nument)) - S<<" *** UNKNOWN TYPE ***"<Messenger(); + Message_Messenger::StreamBuffer sout = TP->Messenger()->SendInfo(); // Initialisation of the Tool StepToTopoDS_Tool myTool; @@ -215,16 +215,16 @@ void StepToTopoDS_Builder::Init if ( TP->TraceLevel() > 2 ) { - sout << "Geometric Statitics : " << Message_EndLine; - sout << " Surface Continuity : - C0 : " << myTool.C0Surf() << Message_EndLine; - sout << " - C1 : " << myTool.C1Surf() << Message_EndLine; - sout << " - C2 : " << myTool.C2Surf() << Message_EndLine; - sout << " Curve Continuity : - C0 : " << myTool.C0Cur3() << Message_EndLine; - sout << " - C1 : " << myTool.C1Cur3() << Message_EndLine; - sout << " - C2 : " << myTool.C2Cur3() << Message_EndLine; - sout << " PCurve Continuity : - C0 : " << myTool.C0Cur2() << Message_EndLine; - sout << " - C1 : " << myTool.C1Cur2() << Message_EndLine; - sout << " - C2 : " << myTool.C2Cur2() << Message_EndLine; + sout << "Geometric Statitics : " << std::endl; + sout << " Surface Continuity : - C0 : " << myTool.C0Surf() << std::endl; + sout << " - C1 : " << myTool.C1Surf() << std::endl; + sout << " - C2 : " << myTool.C2Surf() << std::endl; + sout << " Curve Continuity : - C0 : " << myTool.C0Cur3() << std::endl; + sout << " - C1 : " << myTool.C1Cur3() << std::endl; + sout << " - C2 : " << myTool.C2Cur3() << std::endl; + sout << " PCurve Continuity : - C0 : " << myTool.C0Cur2() << std::endl; + sout << " - C1 : " << myTool.C1Cur2() << std::endl; + sout << " - C2 : " << myTool.C2Cur2() << std::endl; } //:S4136 ShapeFix::SameParameter (S,Standard_False); @@ -246,7 +246,7 @@ void StepToTopoDS_Builder::Init (const Handle(StepShape_BrepWithVoids)& aBRepWithVoids, const Handle(Transfer_TransientProcess)& TP) { - Handle(Message_Messenger) sout = TP->Messenger(); + Message_Messenger::StreamBuffer sout = TP->Messenger()->SendInfo(); // Initialisation of the Tool StepToTopoDS_Tool myTool; StepToTopoDS_DataMapOfTRI aMap; @@ -323,16 +323,16 @@ void StepToTopoDS_Builder::Init if ( TP->TraceLevel() > 2 ) { - sout << "Geometric Statitics : " << Message_EndLine; - sout << " Surface Continuity : - C0 : " << myTool.C0Surf() << Message_EndLine; - sout << " - C1 : " << myTool.C1Surf() << Message_EndLine; - sout << " - C2 : " << myTool.C2Surf() << Message_EndLine; - sout << " Curve Continuity : - C0 : " << myTool.C0Cur3() << Message_EndLine; - sout << " - C1 : " << myTool.C1Cur3() << Message_EndLine; - sout << " - C2 : " << myTool.C2Cur3() << Message_EndLine; - sout << " PCurve Continuity : - C0 : " << myTool.C0Cur2() << Message_EndLine; - sout << " - C1 : " << myTool.C1Cur2() << Message_EndLine; - sout << " - C2 : " << myTool.C2Cur2() << Message_EndLine; + sout << "Geometric Statitics : " << std::endl; + sout << " Surface Continuity : - C0 : " << myTool.C0Surf() << std::endl; + sout << " - C1 : " << myTool.C1Surf() << std::endl; + sout << " - C2 : " << myTool.C2Surf() << std::endl; + sout << " Curve Continuity : - C0 : " << myTool.C0Cur3() << std::endl; + sout << " - C1 : " << myTool.C1Cur3() << std::endl; + sout << " - C2 : " << myTool.C2Cur3() << std::endl; + sout << " PCurve Continuity : - C0 : " << myTool.C0Cur2() << std::endl; + sout << " - C1 : " << myTool.C1Cur2() << std::endl; + sout << " - C2 : " << myTool.C2Cur2() << std::endl; } //:S4136 ShapeFix::SameParameter (S,Standard_False); @@ -464,7 +464,7 @@ void StepToTopoDS_Builder::Init const Handle(Transfer_TransientProcess)& TP, StepToTopoDS_NMTool& NMTool) { - Handle(Message_Messenger) sout = TP->Messenger(); + Message_Messenger::StreamBuffer sout = TP->Messenger()->SendInfo(); // Initialisation of the Tool StepToTopoDS_Tool myTool; @@ -530,16 +530,16 @@ void StepToTopoDS_Builder::Init if ( TP->TraceLevel() > 2 ) { - sout << "Geometric Statitics : " << Message_EndLine; - sout << " Surface Continuity : - C0 : " << myTool.C0Surf() << Message_EndLine; - sout << " - C1 : " << myTool.C1Surf() << Message_EndLine; - sout << " - C2 : " << myTool.C2Surf() << Message_EndLine; - sout << " Curve Continuity : - C0 : " << myTool.C0Cur3() << Message_EndLine; - sout << " - C1 : " << myTool.C1Cur3() << Message_EndLine; - sout << " - C2 : " << myTool.C2Cur3() << Message_EndLine; - sout << " PCurve Continuity : - C0 : " << myTool.C0Cur2() << Message_EndLine; - sout << " - C1 : " << myTool.C1Cur2() << Message_EndLine; - sout << " - C2 : " << myTool.C2Cur2() << Message_EndLine; + sout << "Geometric Statitics : " << std::endl; + sout << " Surface Continuity : - C0 : " << myTool.C0Surf() << std::endl; + sout << " - C1 : " << myTool.C1Surf() << std::endl; + sout << " - C2 : " << myTool.C2Surf() << std::endl; + sout << " Curve Continuity : - C0 : " << myTool.C0Cur3() << std::endl; + sout << " - C1 : " << myTool.C1Cur3() << std::endl; + sout << " - C2 : " << myTool.C2Cur3() << std::endl; + sout << " PCurve Continuity : - C0 : " << myTool.C0Cur2() << std::endl; + sout << " - C1 : " << myTool.C1Cur2() << std::endl; + sout << " - C2 : " << myTool.C2Cur2() << std::endl; } //:S4136 ShapeFix::SameParameter (S,Standard_False); @@ -770,9 +770,9 @@ void StepToTopoDS_Builder::Init aGeomCrv = StepToGeom::MakeCurve(aCrv); } catch (Standard_Failure const& anException) { - Handle(Message_Messenger) sout = TP->Messenger(); + Message_Messenger::StreamBuffer sout = TP->Messenger()->SendInfo(); sout << "StepToTopoDS, GeometricSet, elem " << i << " of " << nbElem << ": exception "; - sout << anException.GetMessageString() << Message_EndLine; + sout << anException.GetMessageString() << std::endl; } if (!aGeomCrv.IsNull()) { BRepBuilderAPI_MakeEdge anEdge(aGeomCrv, aGeomCrv->FirstParameter(), aGeomCrv->LastParameter()); diff --git a/src/Transfer/Transfer_FinderProcess.cxx b/src/Transfer/Transfer_FinderProcess.cxx index b71d83d521..0af1263b30 100644 --- a/src/Transfer/Transfer_FinderProcess.cxx +++ b/src/Transfer/Transfer_FinderProcess.cxx @@ -15,9 +15,6 @@ #include #include #include -#include -#include -#include #include #include #include @@ -58,20 +55,20 @@ Transfer_FinderProcess::Transfer_FinderProcess (const Standard_Integer nb) } - void Transfer_FinderProcess::PrintTrace - (const Handle(Transfer_Finder)& start, const Handle(Message_Messenger)& S) const - { if (!start.IsNull()) S<<" Type:"<ValueTypeName(); } +void Transfer_FinderProcess::PrintTrace (const Handle(Transfer_Finder)& start, Standard_OStream& S) const +{ + if (!start.IsNull()) S << " Type:" << start->ValueTypeName(); +} - void Transfer_FinderProcess::PrintStats - (const Standard_Integer mode, const Handle(Message_Messenger)& S) const +void Transfer_FinderProcess::PrintStats (const Standard_Integer mode, Standard_OStream& S) const { S<<"\n*******************************************************************\n"; if (mode == 1) { // Statistiques de base - S << "******** Basic Statistics ********"< nbroots) - S<<"**** ( Itermediate Results : "< 0) S<<"**** Errors on :"< 0) S<<"**** Warnings on : "< class Message_Messenger; -class Standard_Transient; class Transfer_Binder; class Transfer_ActorOfProcessForTransient; class Message_ProgressIndicator; @@ -338,7 +337,7 @@ public: //! Prints a short information on a starting object. By default //! prints its Dynamic Type. Can be redefined - Standard_EXPORT virtual void PrintTrace (const Handle(Standard_Transient)& start, const Handle(Message_Messenger)& S) const; + Standard_EXPORT virtual void PrintTrace (const Handle(Standard_Transient)& start, Standard_OStream& S) const; //! Returns True if we are surely in a DeadLoop. Evaluation is not //! exact, it is a "majorant" which must be computed fast. diff --git a/src/Transfer/Transfer_TransferProcess.gxx b/src/Transfer/Transfer_TransferProcess.gxx index b42e1c4aa4..a770140023 100644 --- a/src/Transfer/Transfer_TransferProcess.gxx +++ b/src/Transfer/Transfer_TransferProcess.gxx @@ -456,10 +456,11 @@ void Transfer_TransferProcess::SendMsg(const TheStart& start, // Alimente la trace : Regle causant (user messages) if (thetrace > 0) { StartTrace (binder,start,thelevel,6); - themessenger << amsg.Value(); + Message_Messenger::StreamBuffer aSender = themessenger->SendInfo(); + aSender << amsg.Value(); if (amsg.IsEdited()&&thetrace>2) - themessenger << " [from: " << amsg.Original() << "]"; - themessenger << Message_EndLine; + aSender << " [from: " << amsg.Original() << "]"; + aSender << std::endl; } } @@ -481,9 +482,10 @@ void Transfer_TransferProcess::AddFail(const TheStart& start, binder->AddFail (mess,orig); if (thetrace > 0) { StartTrace (binder,start,thelevel,1); - themessenger << " --> Fail : " << mess; - if (orig[0] != '\0'&&thetrace>2) themessenger << " [from: " << orig << "]"; - themessenger << Message_EndLine; + Message_Messenger::StreamBuffer aSender = themessenger->SendFail(); + aSender << " --> Fail : " << mess; + if (orig[0] != '\0'&&thetrace>2) aSender << " [from: " << orig << "]"; + aSender << std::endl; } } @@ -532,9 +534,10 @@ void Transfer_TransferProcess::AddWarning(const TheStart& start, binder->AddWarning(mess,orig); if (thetrace > 1) { StartTrace (binder,start,thelevel,2); - themessenger << " --> Warning : " << mess; - if (orig[0] != '\0'&&thetrace>2) themessenger << " [from: " << orig << "]"; - themessenger << Message_EndLine; + Message_Messenger::StreamBuffer aSender = themessenger->SendWarning(); + aSender << " --> Warning : " << mess; + if (orig[0] != '\0'&&thetrace>2) aSender << " [from: " << orig << "]"; + aSender << std::endl; } } @@ -1007,6 +1010,7 @@ Handle(Transfer_Binder) Transfer_TransferProcess::Transferring(const TheStart& s // .... Etat Initial : peut-etre deja fait ... ou infaisable ! + Message_Messenger::StreamBuffer aSender = themessenger->SendInfo(); //if (!former.IsNull()) { Transfer_StatusExec statex = former->StatusExec(); switch (statex) { @@ -1014,7 +1018,7 @@ Handle(Transfer_Binder) Transfer_TransferProcess::Transferring(const TheStart& s break; case Transfer_StatusDone : // Transfert deja fait //#ifdef TRANSLOG - themessenger << " .. and Transfer done" << Message_EndLine; + aSender << " .. and Transfer done" << std::endl; //#endif // if (former->HasResult()) former->SetAlreadyUsed(); return former; @@ -1023,7 +1027,7 @@ Handle(Transfer_Binder) Transfer_TransferProcess::Transferring(const TheStart& s return former; case Transfer_StatusError : // pas propre, ca ... if (thetrace) { - themessenger << " *** Transfer in Error Status :" << Message_EndLine; + aSender << " *** Transfer in Error Status :" << std::endl; StartTrace (former, start, thelevel,0); // (*themessenger->Out()) << flush; } @@ -1031,7 +1035,7 @@ Handle(Transfer_Binder) Transfer_TransferProcess::Transferring(const TheStart& s throw Transfer_TransferFailure("TransferProcess : Transfer in Error Status"); case Transfer_StatusLoop : // la boucle est bouclee ... if (thetrace) { - themessenger << " *** Transfer Head of Dead Loop :" << Message_EndLine; + aSender << " *** Transfer Head of Dead Loop :" << std::endl; StartTrace (former, start, thelevel,0); // (*themessenger->Out()) << flush; } @@ -1054,6 +1058,8 @@ Handle(Transfer_Binder) Transfer_TransferProcess::Transferring(const TheStart& s Handle(Transfer_Binder) binder; Standard_Boolean newbind = Standard_False; if (theerrh) { + Message_Messenger::StreamBuffer aSender = themessenger->SendInfo(); + // Transfert sous protection pour les exceptions (pour notification en fait) Standard_Integer oldlev = thelevel; try { @@ -1064,13 +1070,13 @@ Handle(Transfer_Binder) Transfer_TransferProcess::Transferring(const TheStart& s // ... Exceptions a Rattraper : elles ne se ressemblent pas toutes ... ! catch (Transfer_TransferDeadLoop const&) { if (binder.IsNull()) { - themessenger << " *** Dead Loop with no Result" << Message_EndLine; + aSender << " *** Dead Loop with no Result" << std::endl; if (thetrace) StartTrace (binder, start, thelevel-1,0); binder = new Transfer_VoidBinder; Bind (start,binder); newbind = Standard_True; } else if (binder->StatusExec() == Transfer_StatusLoop) { if (thetrace) { - themessenger << " *** Dead Loop : Finding head of Loop :" << Message_EndLine; + aSender << " *** Dead Loop : Finding head of Loop :" << std::endl; StartTrace (binder, start, thelevel-1,0); } else StartTrace (binder, start,thelevel-1,4); @@ -1078,7 +1084,7 @@ Handle(Transfer_Binder) Transfer_TransferProcess::Transferring(const TheStart& s // Autrement dit, on change d exception (on est sorti de la boucle) } else { if (thetrace) { - themessenger << " *** Dead Loop : Actor in Loop :" << Message_EndLine; + aSender << " *** Dead Loop : Actor in Loop :" << std::endl; StartTrace (binder, start, thelevel-1,0); } } @@ -1087,13 +1093,13 @@ Handle(Transfer_Binder) Transfer_TransferProcess::Transferring(const TheStart& s } catch (Standard_Failure const& anException) { if (binder.IsNull()) { - themessenger << " *** Exception Raised with no Result" << Message_EndLine; + aSender << " *** Exception Raised with no Result" << std::endl; binder = new Transfer_VoidBinder; Bind (start,binder); newbind = Standard_True; } binder->AddFail("Transfer stopped by exception raising"); if (thetrace) { - themessenger << " *** Raised : " << anException.GetMessageString() << Message_EndLine; + aSender << " *** Raised : " << anException.GetMessageString() << std::endl; StartTrace (binder, start, thelevel-1,4); } thelevel = oldlev; @@ -1158,7 +1164,7 @@ Handle(Transfer_Binder) Transfer_TransferProcess::Transferring(const TheStart& s } if (binder.IsNull()) { // if (thetrace) { -// themessenger << "Transfer has produced no Result" < 0) thelevel --; @@ -1222,21 +1228,22 @@ void Transfer_TransferProcess::StartTrace(const Handle(Transfer_Binder)& binder, const Standard_Integer level, const Standard_Integer mode) const { + Message_Messenger::StreamBuffer aSender = themessenger->SendInfo(); // ### Fail (Roots:50) -- Start start->DynamicType() // ### Fail (Roots:50) -- Start id:#label.. Type:start->DynamicType() if (thetrace > 3) { // Internal to be switch when searching bug (trace >= 4) - if (mode == 1) themessenger << " ### Fail"; - if (mode == 2) themessenger << " ### Warning"; - if (mode == 3) themessenger << " ### New Root n0 " << theroots.Extent(); - if (mode == 4) themessenger << " ### Exception"; - if (mode == 5) themessenger << " ### Substitution"; - if (mode == 6) themessenger << " ### Information"; + if (mode == 1) aSender << " ### Fail"; + if (mode == 2) aSender << " ### Warning"; + if (mode == 3) aSender << " ### New Root n0 " << theroots.Extent(); + if (mode == 4) aSender << " ### Exception"; + if (mode == 5) aSender << " ### Substitution"; + if (mode == 6) aSender << " ### Information"; if (level > 1) - themessenger << " (nested)"; // " at nesting Level:"<= 0 && mode != 3) - themessenger << " at " << theroots.Extent() << " Roots"; + aSender << " at " << theroots.Extent() << " Roots"; } - if (!start.IsNull()) PrintTrace (start,themessenger); + if (!start.IsNull()) PrintTrace (start,aSender); //// sout << endl; if (!binder.IsNull()) { // old: if IsNull sout <Status() != Transfer_StatusVoid) { // --- Result Type: binder->ResultType() --- Binder : binder->DynamicType(); if (!hasres) - themessenger << "\n --- Result Type : "; + aSender << "\n --- Result Type : "; else - themessenger << " , "; - themessenger << bnd->ResultTypeName(); + aSender << " , "; + aSender << bnd->ResultTypeName(); // CKY 9-JAN-1999: waiting for XSTEP Kernel message (not IGES_2075) /* Message_Msg Msg2075("IGES_2075"); Msg2075.AddString(bnd->ResultTypeName()); @@ -1259,7 +1266,7 @@ void Transfer_TransferProcess::StartTrace(const Handle(Transfer_Binder)& binder, bnd = bnd->NextResult(); } if (!hasres && mode > 2) { - themessenger << "\n --- No Result recorded"; + aSender << "\n --- No Result recorded"; // CKY 9-JAN-1999 : waiting for XSTEP Kernel message // (not IGES_2075, no reference to specifically TopoDS_Shape) /* Message_Msg Msg2075("IGES_2075"); @@ -1268,7 +1275,7 @@ void Transfer_TransferProcess::StartTrace(const Handle(Transfer_Binder)& binder, } //old if (isused) sout << " -- (Already Used in another Transfer)"; } - themessenger << Message_EndLine; + aSender << std::endl; } @@ -1277,8 +1284,7 @@ void Transfer_TransferProcess::StartTrace(const Handle(Transfer_Binder)& binder, //purpose : //======================================================================= -void Transfer_TransferProcess::PrintTrace(const TheStart& start, - const Handle(Message_Messenger)& S) const +void Transfer_TransferProcess::PrintTrace(const TheStart& start, Standard_OStream& S) const { if (!start.IsNull()) S <<" Type:" << start->DynamicType()->Name(); } diff --git a/src/Transfer/Transfer_TransientProcess.cxx b/src/Transfer/Transfer_TransientProcess.cxx index 92ac423d9e..85d0e84aac 100644 --- a/src/Transfer/Transfer_TransientProcess.cxx +++ b/src/Transfer/Transfer_TransientProcess.cxx @@ -153,16 +153,16 @@ NCollection_DataMap& Transf //======================================================================= void Transfer_TransientProcess::PrintTrace - (const Handle(Standard_Transient)& start, const Handle(Message_Messenger)& S) const + (const Handle(Standard_Transient)& start, Standard_OStream& S) const { if (!start.IsNull()) { - S << "Entity "; if (!themodel.IsNull()) { - themodel->Print (start,S,1); + S << "Entity "; + themodel->Print (start, S, 1); // S<<"id "; themodel->Print (start,S); // S<<" Type:"<TypeName (start); } - else S<<" Type:"<< Interface_InterfaceModel::ClassName(start->DynamicType()->Name()); + else S<<"Entity Type:"<< Interface_InterfaceModel::ClassName(start->DynamicType()->Name()); // << start (handle) ?? } } @@ -234,20 +234,20 @@ Standard_Boolean Transfer_TransientProcess::IsDataFail //======================================================================= void Transfer_TransientProcess::PrintStats(const Standard_Integer /*mode*/, - const Handle(Message_Messenger)& S) const + Standard_OStream& S) const { S<<"\n*******************************************************************\n"; // if (mode == 1) { // Statistiques de base - S << "******** Basic Statistics ********"<NbEntities()<NbEntities()<Messenger(), theModel, Standard_False); + if (withprint + && !theProc.IsNull() + && !theProc->Messenger().IsNull()) + { + Message_Messenger::StreamBuffer aBuffer = theProc->Messenger()->SendInfo(); + chl.Print (aBuffer, theModel, Standard_False); + } return chl.IsEmpty(Standard_True); } @@ -145,10 +150,10 @@ TransferBRep_Reader::TransferBRep_Reader () Transfer_TransferOutput TP (theProc,theModel); if (theProc->TraceLevel() > 1) { - Handle(Message_Messenger) sout = theProc->Messenger(); + Message_Messenger::StreamBuffer sout = theProc->Messenger()->SendInfo(); sout<<"-- Transfer(Read) : "; - theModel->Print (ent,sout); - sout<Print (ent, sout); + sout<SetRoot(ent); @@ -163,19 +168,19 @@ TransferBRep_Reader::TransferBRep_Reader () if (list.IsNull()) return; Transfer_TransferOutput TP (theProc,theModel); Standard_Integer i, nb = list->Length(); - Handle(Message_Messenger) sout = theProc->Messenger(); + Message_Messenger::StreamBuffer sout = theProc->Messenger()->SendInfo(); if (theProc->TraceLevel() > 1) - sout<<"-- Transfer(Read-List) : "<Value(i); if (theModel->Number(ent) == 0) continue; if (theProc->TraceLevel() > 1) { - sout<<"-- Transfer(Read-List), Item "<Print (ent,sout); - sout<Print (ent, sout); + sout<SetRoot(ent); @@ -237,8 +242,13 @@ TransferBRep_Reader::TransferBRep_Reader () { Interface_CheckIterator chl; if (!theProc.IsNull()) chl = theProc->CheckList(Standard_False); - if (withprint && ! theProc.IsNull()) - chl.Print (theProc->Messenger(), theModel, Standard_False); + if (withprint + && !theProc.IsNull() + && !theProc->Messenger().IsNull()) + { + Message_Messenger::StreamBuffer aBuffer = theProc->Messenger()->SendInfo(); + chl.Print (aBuffer, theModel, Standard_False); + } return chl.IsEmpty(Standard_True); } diff --git a/src/XSControl/XSControl_FuncShape.cxx b/src/XSControl/XSControl_FuncShape.cxx index 2bcf71139e..e0ddb8bbb7 100644 --- a/src/XSControl/XSControl_FuncShape.cxx +++ b/src/XSControl/XSControl_FuncShape.cxx @@ -75,14 +75,14 @@ static IFSelect_ReturnStatus XSControl_tpdraw const Standard_CString arg2 = pilot->Arg(2); const Standard_CString arg3 = pilot->Arg(3); const Handle(Transfer_TransientProcess) &TP = XSControl::Session(pilot)->TransferReader()->TransientProcess(); - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - if (TP.IsNull()) { sout<<"No Transfer Read"<Model(); if (model.IsNull()) { if (mode == 0) { - sout<<"Pas de modele, preciser n0 d item de transfert"<NbRoots(); } if (tout) { n1 = 1; n2 = max; - sout<<", listage de 1 a "< max) { - sout<<" - Num="< 0) binder = TP->MapItem (index); if (binder.IsNull()) index = 0; if (index == 0) { - if (!tout) sout<<"Entite n0 "<HasResult()) { - if (!tout) sout<<"Entite n0 "<Result(); nbvar ++; - if (sh.IsNull()) { sout<<" (no Shape recorded)"< 2 && mode == 0) sprintf (nomvar,"%s_%d",arg2,nbvar); else sprintf (nomvar,"tp_%d",i); } - sout<<" -> 1 DRAW Shape: "< 1 DRAW Shape: "<SetShape(nomvar,sh); continue; } @@ -187,26 +187,26 @@ static IFSelect_ReturnStatus XSControl_tpdraw sout<<" -> "<Shape(j); if (nbvar < 0) nbvar = 0; nbvar ++; - if (sh.IsNull()) { sout<<" (no Shape recorded)"< 3 && mode > 0) sprintf (nomvar,"%s_%d",arg3,nbvar); else if (argc > 2 && mode == 0) sprintf (nomvar,"%s_%d",arg2,nbvar); else sprintf (nomvar,"tp_%d_%d",i,nbvar); sout<<" "<SetShape(nomvar,sh); } - sout<Result(); if (resu.IsNull()) { - sout<<"Entite n0 "<DynamicType()->Name(); - if (geom.IsNull()) { sout< 3 && mode > 0) sprintf (nomvar,"%s",arg3); @@ -219,15 +219,15 @@ static IFSelect_ReturnStatus XSControl_tpdraw } char* nomv = nomvar; XSControl::Vars(pilot)->Set (nomv,geom); - sout<<" -> DRAW Geom : "< DRAW Geom : "<ResultTypeName()<ResultTypeName()<NbWords(); const Standard_CString arg1 = pilot->Arg(1); const Handle(Transfer_TransientProcess) &TP = XSControl::Session(pilot)->TransferReader()->TransientProcess(); - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - if (TP.IsNull()) { sout<<"No Transfer Read"<Session(),pilot->CommandPart(2)); - if (lise.IsNull()) { sout<<"Not a valid entity list : "<CommandPart(2)<CommandPart(2)<Length()<<" Entities, "; } - if (list.IsNull()) { sout<<"No Shape listed"<Length(); - sout<Word(0).Location(1,'s',1,5) > 0); TCollection_AsciiString nomsh, noms; const Handle(XSControl_TransferReader) &TR = XSControl::Session(pilot)->TransferReader(); - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - if (TR.IsNull()) { sout<<" manque init"<Model(); - if (mdl.IsNull()) { sout<<" modele absent"< 1 ? IFSelect_Functions::GiveEntityNumber(XSControl::Session(pilot),arg1) : 0); if (argc > 1) nomsh = arg1; else nomsh = cascomp ? "TREAD_COMP" : "TREAD_LIST"; - if (cassave) sout<<" save shapes -> current directory"< current directory"<ShapeResultList(Standard_True); - sout<<" TOUS RESULTATS par ShapeResultList, soit "<Length()<Length()<Length(); i <= nb; ++i) { noms = nomsh + "_" + i; - if ( (i%1000) == 0) sout<<"("<Value(i), noms.ToCString()); else if (cascomp) B.Add (C,list->Value(i)); } - sout<SetShape (nomsh.ToCString(), C); else if (cascomp && cassave) BRepTools::Write (C, nomsh.ToCString()); } else { - if (num < 1 || num > mdl->NbEntities()) { sout<<" incorrect:"< mdl->NbEntities()) { sout<<" incorrect:"<ShapeResult(mdl->Value(num)); - if (sh.IsNull()) { sout<<" Pas de resultat pour "< 2) nomsh = arg2; else nomsh = TCollection_AsciiString ("TREAD_") + num; if (!cascomp && !cassave) XSControl::Vars(pilot)->SetShape (nomsh.ToCString(), sh); else if (!cascomp && cassave) BRepTools::Write (sh, nomsh.ToCString()); - else sout<<"Option non comprise"<NbWords(); const Standard_CString arg1 = pilot->Arg(1); // **** fromshape (tread) **** - Handle(Message_Messenger) sout = Message::DefaultMessenger(); + Message_Messenger::StreamBuffer sout = Message::SendInfo(); if (argc < 2) { - sout<<"Give name of a DRAW Shape"<GetShape(a1); if (Shape.IsNull()) { - sout<<"Not a DRAW Shape:"<Model()->Print(ent,sout); - if ( silent ) sout << " in file " << XSControl::Session(pilot)->LoadedFile() << Message_EndLine; + sout<<"imported from entity "; + XSControl::Session(pilot)->Model()->Print (ent, sout); + if ( silent ) sout << " in file " << XSControl::Session(pilot)->LoadedFile() << std::endl; } - if ( ! silent ) sout<FindTransient (fnd); if (!ent.IsNull()) { sout<<"Shape "<Model()->Print(ent,sout); + XSControl::Session(pilot)->Model()->Print (ent, sout); if ( silent ) sout << " in file " << XSControl::Session(pilot)->LoadedFile(); - sout<NbTransients(); if (nb > 0) sout<<"Shape "<Model()->Print( TransientListBinder->Transient(i), sout ); + XSControl::Session(pilot)->Model()->Print( TransientListBinder->Transient(i), sout); if (i < nb) sout<<", "; } if (nb > 0) { if ( silent ) sout << " in file " << XSControl::Session(pilot)->LoadedFile(); - sout<TransferReader(); Handle(Transfer_TransientProcess) TP; if (!TR.IsNull()) TP = TR->TransientProcess(); - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - if (TP.IsNull()) { sout<<"no transfer map"<GetShape(a1); - if (Shape.IsNull()) { sout<<"Not a DRAW Shape:"<Length(); - sout<Model(); sout<<"("; for (i = 1; i <= nb; i ++) { if (i > 1) sout<<","; sout<Number(list->Value(i)); } - sout<<")"<NbWords(); - Handle(Message_Messenger) sout = Message::DefaultMessenger(); + Message_Messenger::StreamBuffer sout = Message::SendInfo(); if (argc < 4) { - sout<<"Give : filename or . for current model; varname or . to take fileroot\n GiveList, * for all transferrable roots"<Arg(1); @@ -582,9 +582,9 @@ static IFSelect_ReturnStatus XSControl_trimport TCollection_AsciiString fnom,rnom; Standard_Boolean modfic = XSControl_FuncShape::FileAndVar (WS,arg1,arg2,"IMPORT",fnom,rnom); - if (modfic) sout<<" File to read : "<CommandPart (3); @@ -596,9 +596,9 @@ static IFSelect_ReturnStatus XSControl_trimport comload.AssignCat(arg1); IFSelect_ReturnStatus status = pilot->Execute(comload); if (status != IFSelect_RetDone) - { sout<<"Abandon import"<GiveList (compart.ToCString()); } - if (list.IsNull()) { sout<<"No list defined. Abandon"<Length(); - sout<<"Nb entities selected : "<InitTransferReader (0); const Handle(XSControl_TransferReader) &TR = WS->TransferReader(); - if (TR.IsNull()) { sout<<" init not done or failed"<BeginTransfer(); // Transferring Standard_Integer nbt = TR->TransferList(list); - sout<<"Nb Entities Selected : "<Arg(0)[5] == 'c'); @@ -635,7 +635,7 @@ static IFSelect_ReturnStatus XSControl_trimport BRep_Builder B; B.MakeCompound (C); Handle(Interface_InterfaceModel) mdl = TR->Model(); - if (mdl.IsNull()) { sout<<" modele absent"<Value(il); sh = TR->ShapeResult(ent); @@ -648,15 +648,15 @@ static IFSelect_ReturnStatus XSControl_trimport XSControl::Vars(pilot)->SetShape(nomsh,sh); } } - if (nbs == 0) sout<<"No Shape produced"<SetShape(rnom.ToCString(),sh); } else if (iscomp) { - sout<<"One compound made of "<SetShape(rnom.ToCString(),C); } else { // several individual shapes - sout<NbWords(); const Standard_CString arg1 = pilot->Arg(1); // **** twrite **** - Handle(Message_Messenger) sout = Message::DefaultMessenger(); + Message_Messenger::StreamBuffer sout = Message::SendInfo(); Handle(XSControl_TransferWriter) TW = XSControl::Session(pilot)->TransferWriter(); - if (argc < 2) { sout<<" donner nom de shape draw"<Arg(i); TopoDS_Shape Shape = XSControl::Vars(pilot)->GetShape(ai); - if (Shape.IsNull()) { sout<<"pas un nom de shape draw:"<TransferWriteShape (XSControl::Session(pilot)->Model(),Shape); - sout<<" Transfer Write Status = "< tous les transferts du TP : VRAIMENT TOUS // name = "." -> reperage graphique (not yet impl) // name = nom(n1-n2) avec n1,n2 entiers : les variables de nom nomn1 a nomn2 - Handle(Message_Messenger) sout = Message::DefaultMessenger(); + Message_Messenger::StreamBuffer sout = Message::SendInfo(); if (list.IsNull()) list = new TopTools_HSequenceOfShape(); if (name[0] == '*' && (name[1] == '\0' || (name[1] == '*' && name[2] == '\0'))) { const Handle(Transfer_TransientProcess) &TP = session->TransferReader()->TransientProcess(); - if (TP.IsNull()) { sout<<"last transfer : unknown"<Append (li); @@ -799,12 +799,12 @@ Standard_Integer XSControl_FuncShape::MoreShapes list->Append(Shape); nbsh ++; } - sout<<" -> taken "< taken "<Vars()->GetShape(a1); - if (Shape.IsNull()) { sout<<"not a shape draw:"<Append(Shape); return 1; } diff --git a/src/XSControl/XSControl_Functions.cxx b/src/XSControl/XSControl_Functions.cxx index a13094488c..0a9d9221d0 100644 --- a/src/XSControl/XSControl_Functions.cxx +++ b/src/XSControl/XSControl_Functions.cxx @@ -55,8 +55,8 @@ static IFSelect_ReturnStatus XSControl_xinit(const Handle(IFSelect_SessionPilot) // **** xinit **** if (argc > 1) return (XSControl::Session(pilot)->SelectNorm(arg1) ? IFSelect_RetDone : IFSelect_RetFail); - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - sout<<"Selected Norm:"<SelectedNorm()<SelectedNorm()<NormAdaptor(); - Handle(Message_Messenger) sout = Message::DefaultMessenger(); + Message_Messenger::StreamBuffer sout = Message::SendInfo(); if (argc == 1) - sout<<"Current Norm. xnorm newnorm to change"<Name(Standard_False)<Name(Standard_True)<Name(Standard_False)<Name(Standard_True)<SetController(control); - sout<<"new norm : "<Name()<Name()<NewModel().IsNull()) return IFSelect_RetDone; - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - sout<<"No new Model produced"<Word(0).Value(2) == 'w'); const Handle(Transfer_FinderProcess) &FP = XSControl::Session(pilot)->TransferWriter()->FinderProcess(); const Handle(Transfer_TransientProcess) &TP = XSControl::Session(pilot)->TransferReader()->TransientProcess(); - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - if (modew) { if(!FP.IsNull()) FP->Clear(); else sout<<"No Transfer Write"<Clear(); else sout<<"No Transfer Read"<Clear(); else sout<<"No Transfer Write"<Clear(); else sout<<"No Transfer Read"<Arg(1); //const Standard_CString arg2 = pilot->Arg(2); const Handle(Transfer_TransientProcess) &TP = XSControl::Session(pilot)->TransferReader()->TransientProcess(); - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - if (TP.IsNull()) { sout<<"No Transfer Read"<PrintStats (1,sout); } - else sout<<"TransferRead : not defined"<Arg(1); const Handle(Transfer_TransientProcess) &TP = XSControl::Session(pilot)->TransferReader()->TransientProcess(); // **** tpent **** - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - if (TP.IsNull()) { sout<<"No Transfer Read"<Model(); if (model.IsNull()) return IFSelect_RetFail; - if (argc < 2) { sout<<"Give ENTITY NUMBER (IN MODEL TransferProcess)"< model->NbEntities()) { sout<<"Number not in [1 - "<NbEntities()<<"]"< model->NbEntities()) { sout<<"Number not in [1 - "<NbEntities()<<"]"<Value(num); Standard_Integer index = TP->MapIndex (ent); - if (index == 0) sout<<"Entity "<PrintTransferStatus (index,Standard_False,sout); return IFSelect_RetVoid; } @@ -235,8 +235,8 @@ static IFSelect_ReturnStatus XSControl_tpitem(const Handle(IFSelect_SessionPilot Standard_Integer argc = pilot->NbWords(); const Standard_CString arg1 = pilot->Arg(1); // **** tpitem/tproot/twitem/twroot **** - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - if (argc < 2) { sout<<"Give ITEM NUMBER (in TransferProcess)"<Word(0).Value(3) == 'r') num = -num; Standard_Boolean modew = Standard_False; @@ -245,7 +245,9 @@ static IFSelect_ReturnStatus XSControl_tpitem(const Handle(IFSelect_SessionPilot Handle(Transfer_Finder) finder; Handle(Standard_Transient) ent; if (!XSControl::Session(pilot)->PrintTransferStatus(num,modew,sout)) - sout<<" - Num="<Model(); const Handle(XSControl_TransferReader) &TR = XSControl::Session(pilot)->TransferReader(); Handle(Standard_Transient) ent; - Handle(Message_Messenger) sout = Message::DefaultMessenger(); + Message_Messenger::StreamBuffer sout = Message::SendInfo(); if (mdl.IsNull() || TR.IsNull() || TP.IsNull()) - { sout<<" init not done"<NbRoots(); - sout<<" Recording "<Root(i); - if (TR->RecordResult (ent)) sout<<" Root n0."<RecordResult (ent)) sout<<" Root n0."< mdl->NbEntities()) sout<<"incorrect number:"<RecordResult(mdl->Value(num))) sout<<" Entity n0."< mdl->NbEntities()) sout<<"incorrect number:"<RecordResult(mdl->Value(num))) sout<<" Entity n0."<NbWords(); const Standard_CString arg1 = pilot->Arg(1); - Handle(Message_Messenger) sout = Message::DefaultMessenger(); + Message_Messenger::StreamBuffer sout = Message::SendInfo(); // **** trstat : TransferReader **** const Handle(XSControl_TransferReader) &TR = XSControl::Session(pilot)->TransferReader(); - if (TR.IsNull()) { sout<<" init not done"<Model(); - if (mdl.IsNull()) { sout<<" No model"<FileName()<FileName()<PrintStats(10,0); + TR->PrintStats (sout, 10, 0); } else { // stats unitaires Standard_Integer num = atoi(arg1); - if (num < 1 || num > mdl->NbEntities()) { sout<<" incorrect number:"< mdl->NbEntities()) { sout<<" incorrect number:"<Value(num); - if (!TR->IsRecorded(ent)) { sout<<" Entity "<IsRecorded(ent)) { sout<<" Entity "<FinalResult(ent); Handle(TColStd_HSequenceOfTransient) list = TR->CheckedList(ent); Standard_Integer i, nb = list->Length(); if (nb > 0) sout<<" Entities implied by Check/Result :"<Print(list->Value(i),sout); } - sout<Print(list->Value(i), sout); } + sout<CheckList(Standard_False); - pilot->Session()->PrintCheckList(chl,Standard_False,IFSelect_EntitiesByItem); + pilot->Session()->PrintCheckList (sout, chl, Standard_False, IFSelect_EntitiesByItem); } return IFSelect_RetVoid; } @@ -336,8 +338,8 @@ static IFSelect_ReturnStatus XSControl_trbegin(const Handle(IFSelect_SessionPilo XSControl::Session(pilot)->InitTransferReader (0); TR = XSControl::Session(pilot)->TransferReader(); if (TR.IsNull()) { - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - sout<<" init not done or failed"<NbWords(); //const Standard_CString arg1 = pilot->Arg(1); // **** tread : TransferReader **** - Handle(Message_Messenger) sout = Message::DefaultMessenger(); + Message_Messenger::StreamBuffer sout = Message::SendInfo(); const Handle(XSControl_TransferReader) &TR = XSControl::Session(pilot)->TransferReader(); - if (TR.IsNull()) { sout<<" init not done"<Model(); - if (mdl.IsNull()) { sout<<" No model"<Session()->NamedItem("xst-model-roots")); Handle(Standard_Transient) sel = pilot->Session()->NamedItem("xst-model-roots"); - if (sel.IsNull()) { sout<<"Select Roots absent"<Session()->GiveList(sel); - sout<<" Transferring all roots i.e. : "<TransferList(list)<TransferList(list)<Session(),pilot->CommandPart(1)); - sout<<" Transfer of "<Length()<<" entities"<Length()<<" entities"<TransferList(list); - sout<<" Gives "< TProcess **** const Handle(XSControl_TransferReader) &TR = XSControl::Session(pilot)->TransferReader(); - Handle(Message_Messenger) sout = Message::DefaultMessenger(); - if (TR.IsNull()) sout<<" No TransferReader"<TransientProcess().IsNull()) sout<<" Transfer Reader without Process"<TransientProcess().IsNull()) sout<<" Transfer Reader without Process"<TransferWriter(); Handle(XSControl_Controller) control = XSControl::Session(pilot)->NormAdaptor(); Standard_Integer modemin,modemax; - Handle(Message_Messenger) sout = Message::DefaultMessenger(); + Message_Messenger::StreamBuffer sout = Message::SendInfo(); if (control->ModeWriteBounds (modemin,modemax)) { - sout<<"Write Mode : allowed values "<ModeWriteHelp (modd)<ModeWriteHelp (modd)< "< "<SetTransferMode(mod); - if (!control->IsModeWrite (mod)) sout<<"Warning : this new value is not supported"<IsModeWrite (mod)) sout<<"Warning : this new value is not supported"<TransferWriter()->FinderProcess(); // **** twstat **** // Pour Write - Handle(Message_Messenger) sout = Message::DefaultMessenger(); + Message_Messenger::StreamBuffer sout = Message::SendInfo(); if (!FP.IsNull()) { sout<<"TransferWrite:"; // XSControl_TransferWriter::PrintStatsProcess (FP,mod1,mod2); FP->PrintStats (1,sout); } - else sout<<"TransferWrite: not defined"< #include #include +#include +#include #include #include #include @@ -368,43 +370,72 @@ TopoDS_Shape XSControl_Reader::OneShape () const return C; } +//======================================================================= +//function : PrintCheckLoad +//purpose : +//======================================================================= +void XSControl_Reader::PrintCheckLoad (Standard_OStream& theStream, + const Standard_Boolean failsonly, + const IFSelect_PrintCount mode) const +{ + thesession->PrintCheckList (theStream, thesession->ModelCheckList(),failsonly, mode); +} //======================================================================= //function : PrintCheckLoad -//purpose : +//purpose : //======================================================================= - void XSControl_Reader::PrintCheckLoad (const Standard_Boolean failsonly, const IFSelect_PrintCount mode) const { - thesession->PrintCheckList (thesession->ModelCheckList(),failsonly, mode); + Message_Messenger::StreamBuffer aBuffer = Message::SendInfo(); + PrintCheckLoad (aBuffer, failsonly, mode); } - //======================================================================= //function : PrintCheckTransfer -//purpose : +//purpose : //======================================================================= +void XSControl_Reader::PrintCheckTransfer(Standard_OStream& theStream, + const Standard_Boolean failsonly, + const IFSelect_PrintCount mode) const +{ + thesession->PrintCheckList (theStream, thesession->TransferReader()->LastCheckList(), failsonly, mode); +} +//======================================================================= +//function : PrintCheckTransfer +//purpose : +//======================================================================= void XSControl_Reader::PrintCheckTransfer(const Standard_Boolean failsonly, const IFSelect_PrintCount mode) const { - thesession->PrintCheckList (thesession->TransferReader()->LastCheckList(),failsonly, mode); + Message_Messenger::StreamBuffer aBuffer = Message::SendInfo(); + PrintCheckTransfer(aBuffer, failsonly, mode); } - //======================================================================= //function : PrintStatsTransfer -//purpose : +//purpose : //======================================================================= +void XSControl_Reader::PrintStatsTransfer (Standard_OStream& theStream, + const Standard_Integer what, + const Standard_Integer mode) const +{ + thesession->TransferReader()->PrintStats (theStream, what,mode); +} +//======================================================================= +//function : PrintStatsTransfer +//purpose : +//======================================================================= void XSControl_Reader::PrintStatsTransfer (const Standard_Integer what, const Standard_Integer mode) const { - thesession->TransferReader()->PrintStats (what,mode); + Message_Messenger::StreamBuffer aBuffer = Message::SendInfo(); + PrintStatsTransfer (aBuffer, what, mode); } - //======================================================================= //function : GetStatsTransfer //purpose : diff --git a/src/XSControl/XSControl_Reader.hxx b/src/XSControl/XSControl_Reader.hxx index 2e21e00927..ff1ca98446 100644 --- a/src/XSControl/XSControl_Reader.hxx +++ b/src/XSControl/XSControl_Reader.hxx @@ -203,6 +203,9 @@ public: //! mode = 1 : per message, just gives count of entities per check //! mode = 2 : also gives entity numbers Standard_EXPORT void PrintCheckLoad (const Standard_Boolean failsonly, const IFSelect_PrintCount mode) const; + + //! Prints the check list attached to loaded data. + Standard_EXPORT void PrintCheckLoad (Standard_OStream& theStream, const Standard_Boolean failsonly, const IFSelect_PrintCount mode) const; //! Displays check results for the //! last translation of IGES or STEP entities to Open CASCADE @@ -211,6 +214,9 @@ public: //! false. mode determines the contents and the order of the //! messages according to the terms of the IFSelect_PrintCount enumeration. Standard_EXPORT void PrintCheckTransfer (const Standard_Boolean failsonly, const IFSelect_PrintCount mode) const; + + //! Displays check results for the last translation of IGES or STEP entities to Open CASCADE entities. + Standard_EXPORT void PrintCheckTransfer (Standard_OStream& theStream, const Standard_Boolean failsonly, const IFSelect_PrintCount mode) const; //! Displays the statistics for //! the last translation. what defines the kind of @@ -240,6 +246,9 @@ public: //! - if mode is 2 the list of entities per warning is returned. //! If mode is not set, only the list of all entities per warning is given. Standard_EXPORT void PrintStatsTransfer (const Standard_Integer what, const Standard_Integer mode = 0) const; + + //! Displays the statistics for the last translation. + Standard_EXPORT void PrintStatsTransfer (Standard_OStream& theStream, const Standard_Integer what, const Standard_Integer mode = 0) const; //! Gives statistics about Transfer Standard_EXPORT void GetStatsTransfer (const Handle(TColStd_HSequenceOfTransient)& list, Standard_Integer& nbMapped, Standard_Integer& nbWithResult, Standard_Integer& nbWithFail) const; diff --git a/src/XSControl/XSControl_TransferReader.cxx b/src/XSControl/XSControl_TransferReader.cxx index 0b23c92571..1347323f33 100644 --- a/src/XSControl/XSControl_TransferReader.cxx +++ b/src/XSControl/XSControl_TransferReader.cxx @@ -52,6 +52,7 @@ #include #include #include +#include #include IMPLEMENT_STANDARD_RTTIEXT(XSControl_TransferReader,Standard_Transient) @@ -785,7 +786,7 @@ Standard_Integer XSControl_TransferReader::TransferOne if (myTP.IsNull()) { if (!BeginTransfer()) return 0; } - Handle(Message_Messenger) sout = myTP->Messenger(); + Message_Messenger::StreamBuffer sout = myTP->Messenger()->SendInfo(); Standard_Integer level = myTP->TraceLevel(); @@ -798,7 +799,7 @@ Standard_Integer XSControl_TransferReader::TransferOne Standard_Integer num = myModel->Number(ent); Handle(TCollection_HAsciiString) lab = myModel->StringLabel(ent); sout<<"\n*******************************************************************\n"; - sout << "****** Transferring one Entity ******"<ToCString() @@ -839,7 +840,6 @@ Standard_Integer XSControl_TransferReader::TransferList if (myTP.IsNull()) { if (!BeginTransfer()) return 0; } - Handle(Message_Messenger) sout = myTP->Messenger(); Standard_Integer level = myTP->TraceLevel(); Transfer_TransferOutput TP (myTP,myModel); @@ -850,8 +850,9 @@ Standard_Integer XSControl_TransferReader::TransferList // Pour le log-file if (level > 0) { + Message_Messenger::StreamBuffer sout = myTP->Messenger()->SendInfo(); sout<<"\n*******************************************************************\n"; - sout << "****** Transferring a list of "<Messenger(); Standard_Integer level = myTP->TraceLevel(); Transfer_TransferOutput TP (myTP,myModel); @@ -907,8 +907,9 @@ Standard_Integer XSControl_TransferReader::TransferRoots(const Interface_Graph& if (level > 0) { Interface_EntityIterator roots = G.RootEntities(); Standard_Integer nb = roots.NbEntities(); + Message_Messenger::StreamBuffer sout = myTP->Messenger()->SendInfo(); sout<<"\n*******************************************************************\n"; - sout << "****** Transferring the "<Messenger(); // A ameliorer ... ! sout<<"\n*******************************************************************\n"; - sout << "****** Statistics on Transfer (Read) ******"< 10) { sout<<" *** Not yet implemented"< 10) { sout<<" *** Not yet implemented"<Length(); Handle(IFSelect_SignatureList) counter; @@ -988,16 +989,16 @@ void XSControl_TransferReader::PrintStats if (mode == 0) { sout<<" "<Number(ent); continue; } if (mode == 1 || mode == 2) { sout<<"[ "<Print (ent,sout); + myModel->Print (ent, sout); sout<<" Type:"<TypeName(ent,Standard_False); } if (mode >= 3 && mode <= 6) { counter->Add (ent,myModel->TypeName(ent,Standard_False)); } } - if (!counter.IsNull()) counter->PrintList(sout,myModel,pcm); + if (!counter.IsNull()) counter->PrintList (sout, myModel, pcm); - sout<SendInfo(); + aSender<<"****** "<Messenger(); + Message_Messenger::StreamBuffer sout = TP->Messenger()->SendInfo(); + char mess[250]; if (TP.IsNull()) return; if (what == 0) { TP->PrintStats(0,sout); return; } sout<<"\n*******************************************************************\n"; - sout << "****** Statistics on Transfer Process (Read) ******"<NbEntities()<NbEntities()<Add(ent,"(not recorded)"); else if (mode == 1 || mode == 2) { sout<<"["<Print (ent,sout); - sout<<" "<TypeName(ent,Standard_False)<<" (not recorded)"<Print (ent, sout); + sout<<" "<TypeName(ent,Standard_False)<<" (not recorded)"<Print (ent,sout); + model->Print (ent, sout); sout<<" "<TypeName(ent,Standard_False); - sout<<" Result:"<Check(); @@ -1229,11 +1232,11 @@ void XSControl_TransferReader::PrintStatsOnList(const Handle(Transfer_TransientP if (newnbw > 0) { sout<<" - Warnings : "<CWarning(newi)<CWarning(newi)< 0) { sout<<" - Fails : "<CFail(newi)<CFail(newi)<PrintList(sout,model,pcm); - else sout<PrintList (sout, model, pcm); + else sout< 0) { - sout << "****** Percentages according Transfer Status ******"<Messenger(),"Result ",nbr+nbrw,nl); + PrintPercent (TP->Messenger(),"Result + FAIL ",nbrf,nl); + PrintPercent (TP->Messenger(),"FAIL, no Result ",nbf,nl); + PrintPercent (TP->Messenger(),"Just Warning ",nbw,nl); + PrintPercent (TP->Messenger(),"Nothing Recorded",nbnr,nl); /* if (nbr+nbrw > 0) sout<<"****** Result : "<< (nbr+nbrw)*100/nl<<" %"< 0) @@ -1289,13 +1292,16 @@ void XSControl_TransferReader::PrintStatsOnList(const Handle(Transfer_TransientP Interface_CheckIterator chl = TP->CheckList(Standard_False); chl.SetName("** TRANSFER READ CHECK **"); - if (mode == 0) chl.Print (sout,model,(what == 5)); + if (mode == 0) + { + chl.Print (sout, model, (what == 5)); + } else { IFSelect_PrintCount pcm = IFSelect_CountByItem; if (mode == 2) pcm = IFSelect_ListByItem; Handle(IFSelect_CheckCounter) counter = new IFSelect_CheckCounter(Standard_True); counter->Analyse (chl,model,Standard_True,(what == 5)); - counter->PrintList (sout,model,pcm); + counter->PrintList (sout, model, pcm); } } diff --git a/src/XSControl/XSControl_TransferReader.hxx b/src/XSControl/XSControl_TransferReader.hxx index 7c4034a356..b840373289 100644 --- a/src/XSControl/XSControl_TransferReader.hxx +++ b/src/XSControl/XSControl_TransferReader.hxx @@ -286,7 +286,7 @@ class XSControl_TransferReader : public Standard_Transient //! Prints statistics on current Trace File, according and //! . See PrintStatsProcess for details - Standard_EXPORT void PrintStats (const Standard_Integer theWhat, const Standard_Integer theMode = 0) const; + Standard_EXPORT void PrintStats (Standard_OStream& theStream, const Standard_Integer theWhat, const Standard_Integer theMode = 0) const; //! Returns the CheckList resulting from last TransferRead //! i.e. from TransientProcess itself, recorded from last Clear diff --git a/src/XSControl/XSControl_TransferWriter.cxx b/src/XSControl/XSControl_TransferWriter.cxx index 4e072e0acd..5532d3a740 100644 --- a/src/XSControl/XSControl_TransferWriter.cxx +++ b/src/XSControl/XSControl_TransferWriter.cxx @@ -52,15 +52,15 @@ void XSControl_TransferWriter::Clear (const Standard_Integer mode) void XSControl_TransferWriter::PrintStats (const Standard_Integer , const Standard_Integer ) const { - Handle(Message_Messenger) sout = myTransferWriter->Messenger(); + Message_Messenger::StreamBuffer sout = myTransferWriter->Messenger()->SendInfo(); // A ameliorer ... ! sout<<"\n*******************************************************************\n"; - sout << "****** Statistics on Transfer (Write) ******"<SetActor (nulact); Handle(Standard_Transient) resultat; - Handle(Message_Messenger) sout = myTransferWriter->Messenger(); + Message_Messenger::StreamBuffer sout = myTransferWriter->Messenger()->SendInfo(); try { OCC_CATCH_SIGNALS PrintStats(myTransferMode); sout << "****** Transferring Transient, CDL Type = "; - sout<DynamicType()->Name()<<" ******"<DynamicType()->Name()<<" ******"<TransferWriteTransient (obj,myTransferWriter,model,myTransferMode); } catch(Standard_Failure const& anException) { sout<<"**** **** TransferWriteShape, EXCEPTION : "; sout<SetActor (nulact); Handle(Standard_Transient) resultat; - Handle(Message_Messenger) sout = myTransferWriter->Messenger(); + Message_Messenger::StreamBuffer sout = myTransferWriter->Messenger()->SendInfo(); try { OCC_CATCH_SIGNALS PrintStats(myTransferMode); sout << "****** Transferring Shape, ShapeType = " << shape.ShapeType(); - sout<<" ******"<TransferWriteShape (shape,myTransferWriter,model,myTransferMode); } catch(Standard_Failure const& anException) { sout<<"**** **** TransferWriteShape, EXCEPTION : "; sout<Length(); for (i = 1; i <= nb; i ++) - if (!linha->Value(i).IsNull()) sout<Value(i)->ToCString()<Value(i).IsNull()) sout<Value(i)->ToCString()<Length(); for (i = 1; i <= nb; i ++) - sout<Value(i).ToCString()<Value(i).ToCString()<Length(); for (i = 1; i <= nb; i ++) if (!linhe->Value(i).IsNull()) - sout << linhe->Value(i) << Message_EndLine; + sout << linhe->Value(i)->String() << std::endl; return; } DeclareAndCast(TColStd_HSequenceOfExtendedString,linee,lines); if (!linee.IsNull()) { nb = linee->Length(); for (i = 1; i <= nb; i ++) - sout << linee->Value(i) << Message_EndLine; + sout << linee->Value(i) << std::endl; return; } DeclareAndCast(TCollection_HAsciiString,lin1a,lines); - if (!lin1a.IsNull()) sout<String(); DeclareAndCast(TCollection_HExtendedString,lin1e,lines); - if (!lin1e.IsNull()) sout<String(); } diff --git a/src/XSControl/XSControl_WorkSession.cxx b/src/XSControl/XSControl_WorkSession.cxx index 6cf05457de..e36152e6f2 100644 --- a/src/XSControl/XSControl_WorkSession.cxx +++ b/src/XSControl/XSControl_WorkSession.cxx @@ -177,7 +177,7 @@ void XSControl_WorkSession::ClearContext () Standard_Boolean XSControl_WorkSession::PrintTransferStatus(const Standard_Integer num, const Standard_Boolean wri, - const Handle(Message_Messenger)& S) const + Standard_OStream& S) const { const Handle(Transfer_FinderProcess) &FP = myTransferWriter->FinderProcess(); Handle(Transfer_TransientProcess) TP = myTransferReader->TransientProcess(); @@ -209,16 +209,16 @@ Standard_Boolean XSControl_WorkSession::PrintTransferStatus(const Standard_Inte { S<<" ** Transfer Root n0."<FindTransient(finder); - S<<" -> Type "<DynamicType()->Name()< Type "<DynamicType()->Name()<StartTrace (binder,finder,0,0); // pb sout/S if (!ent.IsNull()) { S<<" ** Resultat Transient, type "<DynamicType()->Name(); const Handle(Interface_InterfaceModel) &model = Model(); if (!model.IsNull()) - { S<<" In output Model, Entity "; model->Print(ent,S); } - S<Print(ent, S); } + S<Print(ent,S); } + S<Print(ent, S); } binder = TP->MapItem (ne); - S<StartTrace (binder,ent,0,0); } @@ -262,11 +262,11 @@ Standard_Boolean XSControl_WorkSession::PrintTransferStatus(const Standard_Inte Standard_Integer i,nbw = ch->NbWarnings(), nbf = ch->NbFails(); if (nbw > 0) { S<<" - Warnings : "<CWarning(i)<CWarning(i)< 0) { S<<" - Fails : "<CFail(i)<CFail(i)<, from MapWriter if is True, or //! from MapReader if is False //! Returns True when done, False else (i.e. num out of range) - Standard_EXPORT Standard_Boolean PrintTransferStatus (const Standard_Integer theNum, const Standard_Boolean theWri, const Handle(Message_Messenger)& theS) const; + Standard_EXPORT Standard_Boolean PrintTransferStatus (const Standard_Integer theNum, const Standard_Boolean theWri, Standard_OStream& theS) const; //! Sets a Transfer Reader, by internal ways, according mode : //! 0 recreates it clear, 1 clears it (does not recreate) diff --git a/src/XSDRAW/XSDRAW.cxx b/src/XSDRAW/XSDRAW.cxx index 0114302f5f..da26af4e59 100644 --- a/src/XSDRAW/XSDRAW.cxx +++ b/src/XSDRAW/XSDRAW.cxx @@ -279,7 +279,7 @@ Standard_Integer XSDRAW_WHAT (const Handle(Standard_Transient)& ent) Handle(Interface_InterfaceModel) model = XSDRAW::Model(); if (model.IsNull()) { std::cout<<"(No model) Type:"<DynamicType()->Name()<Print (ent, Message::DefaultMessenger(), 0); + model->Print (ent, std::cout, 0); std::cout<<" -- Recorded Type:"<TypeName (ent)<Number(ent); } diff --git a/src/XSDRAWIGES/XSDRAWIGES.cxx b/src/XSDRAWIGES/XSDRAWIGES.cxx index fdc0e829fa..ab174f753d 100644 --- a/src/XSDRAWIGES/XSDRAWIGES.cxx +++ b/src/XSDRAWIGES/XSDRAWIGES.cxx @@ -601,10 +601,12 @@ static Standard_Integer XSDRAWIGES_tplosttrim (Draw_Interpretor& di, Standard_In } TColStd_MapIteratorOfMapOfTransient itmap; + Standard_SStream aTmpStream; for(itmap.Initialize(aMap); itmap.More(); itmap.Next()) { - XSDRAW::Model()->Print (itmap.Key(), Message::DefaultMessenger()); - di << " "; + XSDRAW::Model()->Print (itmap.Key(), aTmpStream); + aTmpStream << " "; } + di << aTmpStream.str().c_str(); di << "\n"; di << "\nNumber:"<< nbFaces << "\n"; totFaces += nbFaces; diff --git a/src/XSDRAWSTEP/XSDRAWSTEP.cxx b/src/XSDRAWSTEP/XSDRAWSTEP.cxx index e7662a8b9d..bd800972c9 100644 --- a/src/XSDRAWSTEP/XSDRAWSTEP.cxx +++ b/src/XSDRAWSTEP/XSDRAWSTEP.cxx @@ -162,7 +162,9 @@ static Standard_Integer stepread (Draw_Interpretor& di/*theCommands*/, Standard_ di<<"NbRootsForTransfer="<Print (sr.RootForTransfer(i), Message::DefaultMessenger()); + Standard_SStream aTmpStream; + sr.Model()->Print (sr.RootForTransfer(i), aTmpStream); + di << aTmpStream.str().c_str(); di<<" Type:"<DynamicType()->Name()<<"\n"; }