OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-14 13:30:48 +03:00
Code Activity

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

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

164
src/XSControl/XSControl_FuncShape.cxx
View File

@@ -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"<<Message_EndLine; return IFSelect_RetError;}
Message_Messenger::StreamBuffer sout = Message::SendInfo();
if (TP.IsNull()) { sout<<"No Transfer Read"<<std::endl; return IFSelect_RetError;}
// **** tpdraw ****
if (argc < 2) {
sout<<"Donner [mode facultatif : item ou root] , NUMERO , nom DRAW facultatif"<<Message_EndLine;
sout<<" mode si present : item ou root, sinon n0 d entite modele"<<Message_EndLine;
sout<<"Donner [mode facultatif : item ou root] , NUMERO , nom DRAW facultatif"<<std::endl;
sout<<" mode si present : item ou root, sinon n0 d entite modele"<<std::endl;
sout<<" NUMERO entier : d entite, d item transfert ou de root transfert\n"
<< " ou * pour dire tous"<<Message_EndLine;
<< " ou * pour dire tous"<<std::endl;
return IFSelect_RetError;
}
Standard_Integer mode = 0, num=0;
@@ -90,7 +90,7 @@ static IFSelect_ReturnStatus XSControl_tpdraw
else if (arg1[0] == 'r') mode = 2;
Standard_Boolean tout = Standard_False;
if (mode == 0) {
if (argc < 2) { sout<<"Donner au moins un NUMERO ou *"<<Message_EndLine; return IFSelect_RetError; }
if (argc < 2) { sout<<"Donner au moins un NUMERO ou *"<<std::endl; return IFSelect_RetError; }
if (arg1[0] == '*') tout = Standard_True;
else num = IFSelect_Functions::GiveEntityNumber(XSControl::Session(pilot),arg1);
} else {
@@ -108,7 +108,7 @@ static IFSelect_ReturnStatus XSControl_tpdraw
Handle(Interface_InterfaceModel) model = TP->Model();
if (model.IsNull()) {
if (mode == 0) {
sout<<"Pas de modele, preciser n0 d item de transfert"<<Message_EndLine;
sout<<"Pas de modele, preciser n0 d item de transfert"<<std::endl;
return IFSelect_RetError;
}
}
@@ -117,14 +117,14 @@ static IFSelect_ReturnStatus XSControl_tpdraw
if (mode == 2) { sout<<"Racine de transfert"; max = TP->NbRoots(); }
if (tout) {
n1 = 1; n2 = max;
sout<<", listage de 1 a "<<max<<Message_EndLine;
sout<<", listage de 1 a "<<max<<std::endl;
}
else if (num <= 0 || num > max) {
sout<<" - Num="<<num<<" hors limite (de 1 a "<<max<<")"<<Message_EndLine;
sout<<" - Num="<<num<<" hors limite (de 1 a "<<max<<")"<<std::endl;
return IFSelect_RetError;
} else {
n1 = n2 = num; nbvar = -1; // nbvar : 1ere shape simple = pas de n0
sout<<", n0 "<<num<<Message_EndLine;
sout<<", n0 "<<num<<std::endl;
}
for (i = n1; i <= n2; i ++) {
@@ -147,11 +147,11 @@ static IFSelect_ReturnStatus XSControl_tpdraw
if (index > 0) binder = TP->MapItem (index);
if (binder.IsNull()) index = 0;
if (index == 0) {
if (!tout) sout<<"Entite n0 "<<num<<" : non repertoriee"<<Message_EndLine;
if (!tout) sout<<"Entite n0 "<<num<<" : non repertoriee"<<std::endl;
continue;
}
if (!binder->HasResult()) {
if (!tout) sout<<"Entite n0 "<<num<<" : pas de resultat"<<Message_EndLine;
if (!tout) sout<<"Entite n0 "<<num<<" : pas de resultat"<<std::endl;
continue;
}
sh = TransferBRep::ShapeResult (binder);
@@ -159,7 +159,7 @@ static IFSelect_ReturnStatus XSControl_tpdraw
if (!sh.IsNull()) {
//sh = shb->Result();
nbvar ++;
if (sh.IsNull()) { sout<<" (no Shape recorded)"<<Message_EndLine; continue; }
if (sh.IsNull()) { sout<<" (no Shape recorded)"<<std::endl; continue; }
if (tout) sout<<"[ "<<i<<" ]:";
if (num == 0) sout<<" pas dans le modele";
else sout<<" ent.n0 "<<num;
@@ -173,7 +173,7 @@ static IFSelect_ReturnStatus XSControl_tpdraw
else if (argc > 2 && mode == 0) sprintf (nomvar,"%s_%d",arg2,nbvar);
else sprintf (nomvar,"tp_%d",i);
}
sout<<" -> 1 DRAW Shape: "<<nomvar<<Message_EndLine;
sout<<" -> 1 DRAW Shape: "<<nomvar<<std::endl;
XSControl::Vars(pilot)->SetShape(nomvar,sh);
continue;
}
@@ -187,26 +187,26 @@ static IFSelect_ReturnStatus XSControl_tpdraw
sout<<" -> "<<nbs<<" DRAW Shapes :";
for (Standard_Integer j = 1; j <= nbs; j ++) {
sh = slb->Shape(j); if (nbvar < 0) nbvar = 0; nbvar ++;
if (sh.IsNull()) { sout<<" (no Shape recorded)"<<Message_EndLine; continue; }
if (sh.IsNull()) { sout<<" (no Shape recorded)"<<std::endl; continue; }
if (argc > 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<<" "<<nomvar;
XSControl::Vars(pilot)->SetShape(nomvar,sh);
}
sout<<Message_EndLine;
sout<<std::endl;
continue;
}
DeclareAndCast(Transfer_SimpleBinderOfTransient,trb,binder);
if (!trb.IsNull()) {
Handle(Standard_Transient) resu = trb->Result();
if (resu.IsNull()) {
sout<<"Entite n0 "<<num<<" : pas de resultat"<<Message_EndLine;
sout<<"Entite n0 "<<num<<" : pas de resultat"<<std::endl;
continue;
}
DeclareAndCast(Geom_Geometry,geom,resu);
sout<<"Entite n0 "<<num<<" : resultat "<<resu->DynamicType()->Name();
if (geom.IsNull()) { sout<<Message_EndLine; continue; }
if (geom.IsNull()) { sout<<std::endl; continue; }
nbvar ++;
if (nbvar == 0) {
if (argc > 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 : "<<nomvar<<Message_EndLine;
sout<<" -> DRAW Geom : "<<nomvar<<std::endl;
continue;
}
if (sh.IsNull() && trb.IsNull())
if (!tout) sout<<"Entite n0 "<<num<<" : resultat pas une Shape mais "<<binder->ResultTypeName()<<Message_EndLine;
if (!tout) sout<<"Entite n0 "<<num<<" : resultat pas une Shape mais "<<binder->ResultTypeName()<<std::endl;
}
if (sh.IsNull()) sout<<" (No Shape)"<<Message_EndLine;
if (sh.IsNull()) sout<<" (No Shape)"<<std::endl;
return IFSelect_RetDone;
}
@@ -241,21 +241,21 @@ static IFSelect_ReturnStatus XSControl_tpcompound
Standard_Integer argc = pilot->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"<<Message_EndLine; return IFSelect_RetError;}
Message_Messenger::StreamBuffer sout = Message::SendInfo();
if (TP.IsNull()) { sout<<"No Transfer Read"<<std::endl; return IFSelect_RetError;}
// **** tpcompound ****
if (argc < 2) { sout<<"Give a NAME for the Compound + optional givelist, else roots are taken"<<Message_EndLine; return IFSelect_RetError; }
if (argc < 2) { sout<<"Give a NAME for the Compound + optional givelist, else roots are taken"<<std::endl; return IFSelect_RetError; }
Handle(TopTools_HSequenceOfShape) list;
if (argc == 2) list = TransferBRep::Shapes(TP);
else {
Handle(TColStd_HSequenceOfTransient) lise = IFSelect_Functions::GiveList(pilot->Session(),pilot->CommandPart(2));
if (lise.IsNull()) { sout<<"Not a valid entity list : "<<pilot->CommandPart(2)<<Message_EndLine; return IFSelect_RetError; }
if (lise.IsNull()) { sout<<"Not a valid entity list : "<<pilot->CommandPart(2)<<std::endl; return IFSelect_RetError; }
list = TransferBRep::Shapes (TP,lise);
sout<<lise->Length()<<" Entities, ";
}
if (list.IsNull()) { sout<<"No Shape listed"<<Message_EndLine; return IFSelect_RetError; }
if (list.IsNull()) { sout<<"No Shape listed"<<std::endl; return IFSelect_RetError; }
Standard_Integer nb = list->Length();
sout<<nb<<" Shape(s) listed"<<Message_EndLine;
sout<<nb<<" Shape(s) listed"<<std::endl;
TopoDS_Compound C;
BRep_Builder B;
B.MakeCompound(C);
@@ -284,15 +284,15 @@ static IFSelect_ReturnStatus XSControl_traccess
Standard_Boolean cassave = (pilot->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"<<Message_EndLine; return IFSelect_RetError; }
Message_Messenger::StreamBuffer sout = Message::SendInfo();
if (TR.IsNull()) { sout<<" manque init"<<std::endl; return IFSelect_RetError; }
const Handle(Interface_InterfaceModel) &mdl = TR->Model();
if (mdl.IsNull()) { sout<<" modele absent"<<Message_EndLine; return IFSelect_RetError; }
if (mdl.IsNull()) { sout<<" modele absent"<<std::endl; return IFSelect_RetError; }
Standard_Integer num = (argc > 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"<<Message_EndLine;
if (cassave) sout<<" save shapes -> current directory"<<std::endl;
if (num == 0 || cascomp) {
TopoDS_Compound C; // pour cas compound
@@ -300,11 +300,11 @@ static IFSelect_ReturnStatus XSControl_traccess
B.MakeCompound(C);
const Handle(TopTools_HSequenceOfShape) &list = TR->ShapeResultList(Standard_True);
sout<<" TOUS RESULTATS par ShapeResultList, soit "<<list->Length()<<Message_EndLine;
sout<<" TOUS RESULTATS par ShapeResultList, soit "<<list->Length()<<std::endl;
for (Standard_Integer i = 1, nb = list->Length(); i <= nb; ++i)
{
noms = nomsh + "_" + i;
if ( (i%1000) == 0) sout<<"("<<i<<")"<<Message_EndLine;
if ( (i%1000) == 0) sout<<"("<<i<<")"<<std::endl;
else if ( (i%100) == 0) sout<<"*";
else if ( (i%10) == 0) sout<<"0";
else sout<<".";
@@ -313,18 +313,18 @@ static IFSelect_ReturnStatus XSControl_traccess
else if (!cascomp && cassave) BRepTools::Write (list->Value(i), noms.ToCString());
else if (cascomp) B.Add (C,list->Value(i));
}
sout<<Message_EndLine;
sout<<std::endl;
if (cascomp && !cassave) XSControl::Vars(pilot)->SetShape (nomsh.ToCString(), C);
else if (cascomp && cassave) BRepTools::Write (C, nomsh.ToCString());
} else {
if (num < 1 || num > mdl->NbEntities()) { sout<<" incorrect:"<<arg1<<Message_EndLine; return IFSelect_RetError; }
if (num < 1 || num > mdl->NbEntities()) { sout<<" incorrect:"<<arg1<<std::endl; return IFSelect_RetError; }
TopoDS_Shape sh = TR->ShapeResult(mdl->Value(num));
if (sh.IsNull()) { sout<<" Pas de resultat pour "<<arg1<<Message_EndLine; return IFSelect_RetError; }
if (sh.IsNull()) { sout<<" Pas de resultat pour "<<arg1<<std::endl; return IFSelect_RetError; }
if (argc > 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"<<Message_EndLine;
else sout<<"Option non comprise"<<std::endl;
}
return IFSelect_RetDone;
}
@@ -360,15 +360,15 @@ static IFSelect_ReturnStatus XSControl_fromshape
Standard_Integer argc = pilot->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"<<Message_EndLine;
sout<<"Give name of a DRAW Shape"<<std::endl;
return IFSelect_RetError;
}
const char* a1 = (char *)arg1;
TopoDS_Shape Shape = XSControl::Vars(pilot)->GetShape(a1);
if (Shape.IsNull()) {
sout<<"Not a DRAW Shape:"<<arg1<<Message_EndLine;
sout<<"Not a DRAW Shape:"<<arg1<<std::endl;
return IFSelect_RetError;
}
Standard_Boolean yena = Standard_False;
@@ -399,7 +399,7 @@ static IFSelect_ReturnStatus XSControl_fromshape
if (TP.IsNull()) {
if ( silent )
sout << "Shape "<<arg1<<" : ";
sout<<"no map"<<Message_EndLine;
sout<<"no map"<<std::endl;
}
else {
TopoDS_Shape S0 = Shape;
@@ -434,7 +434,7 @@ static IFSelect_ReturnStatus XSControl_fromshape
// skl 11.05.2004
// if Shape is a compound try to make "fromshape" for its subshapes
if(Shape.ShapeType()==TopAbs_COMPOUND) {
sout<<Message_EndLine<<"Subshapes imported from entities:";
sout<<std::endl<<"Subshapes imported from entities:";
TopoDS_Iterator Iter(Shape);
for (; Iter.More(); Iter.Next()) {
TopoDS_Shape subsh = Iter.Value();
@@ -451,11 +451,11 @@ static IFSelect_ReturnStatus XSControl_fromshape
}
}
else {
sout<<"imported from entity ";
XSControl::Session(pilot)->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<<Message_EndLine;
if ( ! silent ) sout<<std::endl;
}
// ET EN EXPORT ?
@@ -468,9 +468,9 @@ static IFSelect_ReturnStatus XSControl_fromshape
if (!fnd.IsNull()) ent = FP->FindTransient (fnd);
if (!ent.IsNull()) {
sout<<"Shape "<<arg1<<": exported to entity ";
XSControl::Session(pilot)->Model()->Print(ent,sout);
XSControl::Session(pilot)->Model()->Print (ent, sout);
if ( silent ) sout << " in file " << XSControl::Session(pilot)->LoadedFile();
sout<<Message_EndLine;
sout<<std::endl;
}
// abv 31.08.00: treat case of splitted shape (several results)
// it is supposed that results are of the same type and lie in one-level comp
@@ -484,12 +484,12 @@ static IFSelect_ReturnStatus XSControl_fromshape
Standard_Integer i = 1, nb = TransientListBinder->NbTransients();
if (nb > 0) sout<<"Shape "<<arg1<<": exported to entities ";
for (; i<=nb; i++) {
XSControl::Session(pilot)->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<<Message_EndLine;
sout<<std::endl;
}
}
/* else {
@@ -513,7 +513,7 @@ static IFSelect_ReturnStatus XSControl_fromshape
}
}
}
if (!yena) sout<<"No transfer (either import or export) recorded"<<Message_EndLine;
if (!yena) sout<<"No transfer (either import or export) recorded"<<std::endl;
return IFSelect_RetVoid;
}
@@ -531,28 +531,28 @@ static IFSelect_ReturnStatus XSControl_trconnexentities
const Handle(XSControl_TransferReader) &TR = XSControl::Session(pilot)->TransferReader();
Handle(Transfer_TransientProcess) TP;
if (!TR.IsNull()) TP = TR->TransientProcess();
Handle(Message_Messenger) sout = Message::DefaultMessenger();
if (TP.IsNull()) { sout<<"no transfer map"<<Message_EndLine; return IFSelect_RetVoid; }
Message_Messenger::StreamBuffer sout = Message::SendInfo();
if (TP.IsNull()) { sout<<"no transfer map"<<std::endl; return IFSelect_RetVoid; }
if (argc < 2) {
sout<<"Give name of a DRAW Shape + optional shape type v-e-w-f(D)-s"<<Message_EndLine;
sout<<"Give name of a DRAW Shape + optional shape type v-e-w-f(D)-s"<<std::endl;
return IFSelect_RetError;
}
const char* a1 = (const char *)arg1;
TopoDS_Shape Shape = XSControl::Vars(pilot)->GetShape(a1);
if (Shape.IsNull()) { sout<<"Not a DRAW Shape:"<<arg1<<Message_EndLine; return IFSelect_RetError; }
if (Shape.IsNull()) { sout<<"Not a DRAW Shape:"<<arg1<<std::endl; return IFSelect_RetError; }
sout<<"Shape "<<arg1<<" : ";
Handle(TColStd_HSequenceOfTransient) list =
XSControl_ConnectedShapes::AdjacentEntities (Shape,TP,TopAbs_FACE);
Standard_Integer i, nb = list->Length();
sout<<nb<<" Entities produced Connected Shapes :"<<Message_EndLine;
sout<<nb<<" Entities produced Connected Shapes :"<<std::endl;
const Handle(Interface_InterfaceModel) &model = XSControl::Session(pilot)->Model();
sout<<"(";
for (i = 1; i <= nb; i ++) {
if (i > 1) sout<<",";
sout<<model->Number(list->Value(i));
}
sout<<")"<<Message_EndLine;
sout<<")"<<std::endl;
return IFSelect_RetDone;
}
@@ -568,9 +568,9 @@ static IFSelect_ReturnStatus XSControl_trimport
Handle(XSControl_WorkSession) WS = XSControl::Session(pilot);
Standard_Integer argc = pilot->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"<<Message_EndLine;
sout<<"Give : filename or . for current model; varname or . to take fileroot\n GiveList, * for all transferrable roots"<<std::endl;
return IFSelect_RetError;
}
const Standard_CString arg1 = pilot->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 : "<<fnom<<Message_EndLine;
else sout<<" Model taken from the session : "<<fnom<<Message_EndLine;
sout<<" -- Names of variables BREP-DRAW prefixed by : "<<rnom<<Message_EndLine;
if (modfic) sout<<" File to read : "<<fnom<<std::endl;
else sout<<" Model taken from the session : "<<fnom<<std::endl;
sout<<" -- Names of variables BREP-DRAW prefixed by : "<<rnom<<std::endl;
// keep the current command, because sub-commands will be called
TCollection_AsciiString compart = pilot->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"<<Message_EndLine; return status; }
{ sout<<"Abandon import"<<std::endl; return status; }
} else {
sout<<"Currently Loaded Model"<<Message_EndLine;
sout<<"Currently Loaded Model"<<std::endl;
}
// Selecting Entities
@@ -611,21 +611,21 @@ static IFSelect_ReturnStatus XSControl_trimport
sout<<"List given by "<<compart.ToCString()<<" : ";
list = WS->GiveList (compart.ToCString());
}
if (list.IsNull()) { sout<<"No list defined. Abandon"<<Message_EndLine; return IFSelect_RetError; }
if (list.IsNull()) { sout<<"No list defined. Abandon"<<std::endl; return IFSelect_RetError; }
Standard_Integer nbl = list->Length();
sout<<"Nb entities selected : "<<nbl<<Message_EndLine;
sout<<"Nb entities selected : "<<nbl<<std::endl;
// Starting Transfer
WS->InitTransferReader (0);
const Handle(XSControl_TransferReader) &TR = WS->TransferReader();
if (TR.IsNull()) { sout<<" init not done or failed"<<Message_EndLine; return IFSelect_RetError; }
if (TR.IsNull()) { sout<<" init not done or failed"<<std::endl; return IFSelect_RetError; }
TR->BeginTransfer();
// Transferring
Standard_Integer nbt = TR->TransferList(list);
sout<<"Nb Entities Selected : "<<nbl<<" have given "<<nbt<<" results"<<Message_EndLine;
sout<<"Nb Entities Selected : "<<nbl<<" have given "<<nbt<<" results"<<std::endl;
// Filling VARS. one compound (trimpcomp) or one shape per ent (trimport)
Standard_Boolean iscomp = (pilot->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"<<Message_EndLine; return IFSelect_RetError; }
if (mdl.IsNull()) { sout<<" modele absent"<<std::endl; return IFSelect_RetError; }
for (Standard_Integer il= 1; il <= nbl; il ++) {
Handle(Standard_Transient) ent = list->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"<<Message_EndLine;
if (nbs == 0) sout<<"No Shape produced"<<std::endl;
else if (nbs == 1) {
sout<<"One Shape produced, named "<<rnom.ToCString()<<Message_EndLine;
sout<<"One Shape produced, named "<<rnom.ToCString()<<std::endl;
XSControl::Vars(pilot)->SetShape(rnom.ToCString(),sh);
} else if (iscomp) {
sout<<"One compound made of "<<nbs<<" Shapes, named "<<rnom.ToCString()<<Message_EndLine;
sout<<"One compound made of "<<nbs<<" Shapes, named "<<rnom.ToCString()<<std::endl;
XSControl::Vars(pilot)->SetShape(rnom.ToCString(),C);
} else { // several individual shapes
sout<<nbs<<" Shapes, named "<<rnom.ToCString()<<"_1 to "<<rnom.ToCString()<<"_"<<nbs<<Message_EndLine;
sout<<nbs<<" Shapes, named "<<rnom.ToCString()<<"_1 to "<<rnom.ToCString()<<"_"<<nbs<<std::endl;
}
return IFSelect_RetDone;
@@ -672,19 +672,19 @@ static IFSelect_ReturnStatus XSControl_twrite
Standard_Integer argc = pilot->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"<<Message_EndLine; return IFSelect_RetError; }
sout<<"Attention, on alimente le modele courant ..."<<Message_EndLine;
if (argc < 2) { sout<<" donner nom de shape draw"<<std::endl; return IFSelect_RetError; }
sout<<"Attention, on alimente le modele courant ..."<<std::endl;
// Shape
for (Standard_Integer i = 1; i < argc; i ++) {
const char* ai = (const char *)pilot->Arg(i);
TopoDS_Shape Shape = XSControl::Vars(pilot)->GetShape(ai);
if (Shape.IsNull()) { sout<<"pas un nom de shape draw:"<<arg1<<Message_EndLine; continue; }
if (Shape.IsNull()) { sout<<"pas un nom de shape draw:"<<arg1<<std::endl; continue; }
sout<<"Pour Shape : "<<ai;
Standard_Integer stat = TW->TransferWriteShape (XSControl::Session(pilot)->Model(),Shape);
sout<<" Transfer Write Status = "<<stat<<Message_EndLine;
sout<<" Transfer Write Status = "<<stat<<std::endl;
}
pilot->Session()->ComputeGraph();
// Transient ? (Geom) : ignore
@@ -762,11 +762,11 @@ Standard_Integer XSControl_FuncShape::MoreShapes
// name = "**" -> 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"<<Message_EndLine;return 0; }
if (TP.IsNull()) { sout<<"last transfer : unknown"<<std::endl;return 0; }
Handle(TopTools_HSequenceOfShape) li = TransferBRep::Shapes(TP,(name[1] == '\0'));
if (li.IsNull()) return 0;
list->Append (li);
@@ -799,12 +799,12 @@ Standard_Integer XSControl_FuncShape::MoreShapes
list->Append(Shape);
nbsh ++;
}
sout<<" -> taken "<<nbsh<<" Shapes"<<Message_EndLine;
sout<<" -> taken "<<nbsh<<" Shapes"<<std::endl;
return nbsh;
}
const char* a1 = (const char *)name;
TopoDS_Shape Shape = session->Vars()->GetShape(a1);
if (Shape.IsNull()) { sout<<"not a shape draw:"<<a1<<Message_EndLine; return 0; }
if (Shape.IsNull()) { sout<<"not a shape draw:"<<a1<<std::endl; return 0; }
list->Append(Shape);
return 1;
}

136
src/XSControl/XSControl_Functions.cxx
View File

@@ -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:"<<XSControl::Session(pilot)->SelectedNorm()<<Message_EndLine;
Message_Messenger::StreamBuffer sout = Message::SendInfo();
sout<<"Selected Norm:"<<XSControl::Session(pilot)->SelectedNorm()<<std::endl;
return IFSelect_RetVoid;
}
@@ -71,24 +71,24 @@ static IFSelect_ReturnStatus XSControl_xnorm(const Handle(IFSelect_SessionPilot)
// **** xnorm ****
Handle(XSControl_WorkSession) WS = XSControl::Session(pilot);
Handle(XSControl_Controller) control = WS->NormAdaptor();
Handle(Message_Messenger) sout = Message::DefaultMessenger();
Message_Messenger::StreamBuffer sout = Message::SendInfo();
if (argc == 1)
sout<<"Current Norm. xnorm newnorm to change"<<Message_EndLine;
else sout<<"Current Norm :"<<Message_EndLine;
if (control.IsNull()) sout<<"no norm currently defined"<<Message_EndLine;
sout<<"Current Norm. xnorm newnorm to change"<<std::endl;
else sout<<"Current Norm :"<<std::endl;
if (control.IsNull()) sout<<"no norm currently defined"<<std::endl;
else
sout<<" Long Name (complete) : "<<control->Name(Standard_False)<<Message_EndLine
<< " Short name (resource) : "<<control->Name(Standard_True)<<Message_EndLine;
sout<<" Long Name (complete) : "<<control->Name(Standard_False)<<std::endl
<< " Short name (resource) : "<<control->Name(Standard_True)<<std::endl;
if (argc == 1) return IFSelect_RetVoid;
control = XSControl_Controller::Recorded(arg1);
if (control.IsNull()) {
sout<<" No norm named : "<<arg1<<Message_EndLine;
sout<<" No norm named : "<<arg1<<std::endl;
return IFSelect_RetError;
}
WS->SetController(control);
sout<<"new norm : "<<control->Name()<<Message_EndLine;
sout<<"new norm : "<<control->Name()<<std::endl;
return IFSelect_RetDone;
}
@@ -100,8 +100,8 @@ static IFSelect_ReturnStatus XSControl_newmodel(const Handle(IFSelect_SessionPil
{
// **** newmodel ****
if (!XSControl::Session(pilot)->NewModel().IsNull()) return IFSelect_RetDone;
Handle(Message_Messenger) sout = Message::DefaultMessenger();
sout<<"No new Model produced"<<Message_EndLine;
Message_Messenger::StreamBuffer sout = Message::SendInfo();
sout<<"No new Model produced"<<std::endl;
return IFSelect_RetFail;
}
@@ -115,9 +115,9 @@ static IFSelect_ReturnStatus XSControl_tpclear(const Handle(IFSelect_SessionPilo
const Standard_Boolean modew = (pilot->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"<<Message_EndLine; }
else { if(!TP.IsNull()) TP->Clear(); else sout<<"No Transfer Read"<<Message_EndLine; }
Message_Messenger::StreamBuffer sout = Message::SendInfo();
if (modew) { if(!FP.IsNull()) FP->Clear(); else sout<<"No Transfer Write"<<std::endl; }
else { if(!TP.IsNull()) TP->Clear(); else sout<<"No Transfer Read"<<std::endl; }
return IFSelect_RetDone;
}
@@ -131,8 +131,8 @@ static IFSelect_ReturnStatus XSControl_tpstat(const Handle(IFSelect_SessionPilot
const Standard_CString arg1 = pilot->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"<<Message_EndLine; return IFSelect_RetError;}
Message_Messenger::StreamBuffer sout = Message::SendInfo();
if (TP.IsNull()) { sout<<"No Transfer Read"<<std::endl; return IFSelect_RetError;}
// **** tpstat ****
Standard_Integer mod1 = -1;
@@ -171,7 +171,7 @@ static IFSelect_ReturnStatus XSControl_tpstat(const Handle(IFSelect_SessionPilot
}
}
// A present help eventuel
if (mod1 < -1) sout<<"Unknown Mode"<<Message_EndLine;
if (mod1 < -1) sout<<"Unknown Mode"<<std::endl;
if (mod1 < 0) {
sout<<"Modes available :\n"
<<"g : general c : checks (count) C (list)\n"
@@ -184,7 +184,7 @@ static IFSelect_ReturnStatus XSControl_tpstat(const Handle(IFSelect_SessionPilot
<<" L : list per couple type entity/result\n"
<<" *n *s *b *t *r *l *L : idem on ALL recorded items\n"
<<" ?n ?s ?b ?t ... : idem on abnormal items\n"
<<" n select : n applied on a selection idem for s b t r l"<<Message_EndLine;
<<" n select : n applied on a selection idem for s b t r l"<<std::endl;
if (mod1 < -1) return IFSelect_RetError;
return IFSelect_RetVoid;
}
@@ -197,7 +197,7 @@ static IFSelect_ReturnStatus XSControl_tpstat(const Handle(IFSelect_SessionPilot
XSControl_TransferReader::PrintStatsOnList (TP,list,mod1,mod2);
// TP->PrintStats (1,sout);
}
else sout<<"TransferRead : not defined"<<Message_EndLine;
else sout<<"TransferRead : not defined"<<std::endl;
return IFSelect_RetVoid;
}
@@ -211,17 +211,17 @@ static IFSelect_ReturnStatus XSControl_tpent(const Handle(IFSelect_SessionPilot)
const Standard_CString arg1 = pilot->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"<<Message_EndLine; return IFSelect_RetError;}
Message_Messenger::StreamBuffer sout = Message::SendInfo();
if (TP.IsNull()) { sout<<"No Transfer Read"<<std::endl; return IFSelect_RetError;}
Handle(Interface_InterfaceModel) model = TP->Model();
if (model.IsNull()) return IFSelect_RetFail;
if (argc < 2) { sout<<"Give ENTITY NUMBER (IN MODEL TransferProcess)"<<Message_EndLine; return IFSelect_RetError; }
if (argc < 2) { sout<<"Give ENTITY NUMBER (IN MODEL TransferProcess)"<<std::endl; return IFSelect_RetError; }
Standard_Integer num = atoi(arg1);
if (num <= 0 || num > model->NbEntities()) { sout<<"Number not in [1 - "<<model->NbEntities()<<"]"<<Message_EndLine; return IFSelect_RetError; }
if (num <= 0 || num > model->NbEntities()) { sout<<"Number not in [1 - "<<model->NbEntities()<<"]"<<std::endl; return IFSelect_RetError; }
Handle(Standard_Transient) ent = model->Value(num);
Standard_Integer index = TP->MapIndex (ent);
if (index == 0) sout<<"Entity "<<num<<" not recorded in transfer"<<Message_EndLine;
if (index == 0) sout<<"Entity "<<num<<" not recorded in transfer"<<std::endl;
else XSControl::Session(pilot)->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)"<<Message_EndLine; return IFSelect_RetError; }
Message_Messenger::StreamBuffer sout = Message::SendInfo();
if (argc < 2) { sout<<"Give ITEM NUMBER (in TransferProcess)"<<std::endl; return IFSelect_RetError; }
Standard_Integer num = atoi(arg1);
if (pilot->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="<<num<<" incorrect"<<Message_EndLine;
{
sout<<" - Num="<<num<<" incorrect"<<std::endl;
}
return IFSelect_RetVoid;
}
@@ -264,23 +266,23 @@ static IFSelect_ReturnStatus XSControl_trecord(const Handle(IFSelect_SessionPilo
const Handle(Interface_InterfaceModel) &mdl = XSControl::Session(pilot)->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"<<Message_EndLine; return IFSelect_RetError; }
{ sout<<" init not done"<<std::endl; return IFSelect_RetError; }
if (!tous) num = atoi(arg1);
// Enregistrer les racines
if (tous) {
Standard_Integer nb = TP->NbRoots();
sout<<" Recording "<<nb<<" Roots"<<Message_EndLine;
sout<<" Recording "<<nb<<" Roots"<<std::endl;
for (Standard_Integer i = 1; i <= nb; i ++) {
ent = TP->Root(i);
if (TR->RecordResult (ent)) sout<<" Root n0."<<i<<Message_EndLine;
else sout<<" Root n0."<<i<<" not recorded"<<Message_EndLine;
if (TR->RecordResult (ent)) sout<<" Root n0."<<i<<std::endl;
else sout<<" Root n0."<<i<<" not recorded"<<std::endl;
}
} else {
if (num < 1 || num > mdl->NbEntities()) sout<<"incorrect number:"<<num<<Message_EndLine;
else if (TR->RecordResult(mdl->Value(num))) sout<<" Entity n0."<<num<<Message_EndLine;
else sout<<" Entity n0."<<num<<" not recorded"<<Message_EndLine;
if (num < 1 || num > mdl->NbEntities()) sout<<"incorrect number:"<<num<<std::endl;
else if (TR->RecordResult(mdl->Value(num))) sout<<" Entity n0."<<num<<std::endl;
else sout<<" Entity n0."<<num<<" not recorded"<<std::endl;
}
return IFSelect_RetDone;
}
@@ -293,31 +295,31 @@ static IFSelect_ReturnStatus XSControl_trstat(const Handle(IFSelect_SessionPilot
{
Standard_Integer argc = pilot->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"<<Message_EndLine; return IFSelect_RetError; }
if (TR.IsNull()) { sout<<" init not done"<<std::endl; return IFSelect_RetError; }
Handle(Interface_InterfaceModel) mdl = TR->Model();
if (mdl.IsNull()) { sout<<" No model"<<Message_EndLine; return IFSelect_RetError; }
sout<<" Statistics : FileName : "<<TR->FileName()<<Message_EndLine;
if (mdl.IsNull()) { sout<<" No model"<<std::endl; return IFSelect_RetError; }
sout<<" Statistics : FileName : "<<TR->FileName()<<std::endl;
if (argc == 1) {
// stats generales
TR->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:"<<arg1<<Message_EndLine; return IFSelect_RetError; }
if (num < 1 || num > mdl->NbEntities()) { sout<<" incorrect number:"<<arg1<<std::endl; return IFSelect_RetError; }
Handle(Standard_Transient) ent = mdl->Value(num);
if (!TR->IsRecorded(ent)) { sout<<" Entity "<<num<<" not recorded"<<Message_EndLine; return IFSelect_RetError; }
if (!TR->IsRecorded(ent)) { sout<<" Entity "<<num<<" not recorded"<<std::endl; return IFSelect_RetError; }
Handle(Transfer_ResultFromModel) RM = TR->FinalResult(ent);
Handle(TColStd_HSequenceOfTransient) list = TR->CheckedList(ent);
Standard_Integer i, nb = list->Length();
if (nb > 0) sout<<" Entities implied by Check/Result :"<<nb<<" i.e.:";
for (i = 1; i <= nb; i ++) { sout<<" "; mdl->Print(list->Value(i),sout); }
sout<<Message_EndLine;
if (RM.IsNull()) { sout<<" no other info"<<Message_EndLine; return IFSelect_RetVoid; }
for (i = 1; i <= nb; i ++) { sout<<" "; mdl->Print(list->Value(i), sout); }
sout<<std::endl;
if (RM.IsNull()) { sout<<" no other info"<<std::endl; return IFSelect_RetVoid; }
Interface_CheckIterator chl = RM->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"<<Message_EndLine;
Message_Messenger::StreamBuffer sout = Message::SendInfo();
sout<<" init not done or failed"<<std::endl;
return IFSelect_RetError;
}
}
@@ -354,23 +356,23 @@ static IFSelect_ReturnStatus XSControl_tread(const Handle(IFSelect_SessionPilot)
Standard_Integer argc = pilot->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"<<Message_EndLine; return IFSelect_RetError; }
if (TR.IsNull()) { sout<<" init not done"<<std::endl; return IFSelect_RetError; }
const Handle(Interface_InterfaceModel) &mdl = TR->Model();
if (mdl.IsNull()) { sout<<" No model"<<Message_EndLine; return IFSelect_RetError; }
if (mdl.IsNull()) { sout<<" No model"<<std::endl; return IFSelect_RetError; }
if (argc < 2) {
// DeclareAndCast(IFSelect_Selection,sel,pilot->Session()->NamedItem("xst-model-roots"));
Handle(Standard_Transient) sel = pilot->Session()->NamedItem("xst-model-roots");
if (sel.IsNull()) { sout<<"Select Roots absent"<<Message_EndLine; return IFSelect_RetError; }
if (sel.IsNull()) { sout<<"Select Roots absent"<<std::endl; return IFSelect_RetError; }
Handle(TColStd_HSequenceOfTransient) list = pilot->Session()->GiveList(sel);
sout<<" Transferring all roots i.e. : "<<TR->TransferList(list)<<Message_EndLine;
sout<<" Transferring all roots i.e. : "<<TR->TransferList(list)<<std::endl;
} else {
Handle(TColStd_HSequenceOfTransient) list =
IFSelect_Functions::GiveList(pilot->Session(),pilot->CommandPart(1));
sout<<" Transfer of "<<list->Length()<<" entities"<<Message_EndLine;
sout<<" Transfer of "<<list->Length()<<" entities"<<std::endl;
Standard_Integer nb = TR->TransferList(list);
sout<<" Gives "<<nb<<" results"<<Message_EndLine;
sout<<" Gives "<<nb<<" results"<<std::endl;
}
return IFSelect_RetDone;
}
@@ -383,9 +385,9 @@ static IFSelect_ReturnStatus XSControl_trtp(const Handle(IFSelect_SessionPilot)&
{
// **** TReader -> TProcess ****
const Handle(XSControl_TransferReader) &TR = XSControl::Session(pilot)->TransferReader();
Handle(Message_Messenger) sout = Message::DefaultMessenger();
if (TR.IsNull()) sout<<" No TransferReader"<<Message_EndLine;
else if (TR->TransientProcess().IsNull()) sout<<" Transfer Reader without Process"<<Message_EndLine;
Message_Messenger::StreamBuffer sout = Message::SendInfo();
if (TR.IsNull()) sout<<" No TransferReader"<<std::endl;
else if (TR->TransientProcess().IsNull()) sout<<" Transfer Reader without Process"<<std::endl;
return IFSelect_RetVoid;
}
@@ -412,19 +414,19 @@ static IFSelect_ReturnStatus XSControl_twmode(const Handle(IFSelect_SessionPilot
Handle(XSControl_TransferWriter) TW = XSControl::Session(pilot)->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 "<<modemin<<" to "<<modemax<<Message_EndLine;
sout<<"Write Mode : allowed values "<<modemin<<" to "<<modemax<<std::endl;
for (Standard_Integer modd = modemin; modd <= modemax; modd ++) {
sout<<modd<<" : "<<control->ModeWriteHelp (modd)<<Message_EndLine;
sout<<modd<<" : "<<control->ModeWriteHelp (modd)<<std::endl;
}
}
sout<<"Write Mode : actual = "<<TW->TransferMode()<<Message_EndLine;
sout<<"Write Mode : actual = "<<TW->TransferMode()<<std::endl;
if (argc <= 1) return IFSelect_RetVoid;
Standard_Integer mod = atoi(arg1);
sout<<"New value -> "<<arg1<<Message_EndLine;
sout<<"New value -> "<<arg1<<std::endl;
TW->SetTransferMode(mod);
if (!control->IsModeWrite (mod)) sout<<"Warning : this new value is not supported"<<Message_EndLine;
if (!control->IsModeWrite (mod)) sout<<"Warning : this new value is not supported"<<std::endl;
return IFSelect_RetDone;
}
@@ -440,13 +442,13 @@ static IFSelect_ReturnStatus XSControl_twstat(const Handle(IFSelect_SessionPilot
const Handle(Transfer_FinderProcess) &FP = XSControl::Session(pilot)->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"<<Message_EndLine;
else sout<<"TransferWrite: not defined"<<std::endl;
return IFSelect_RetVoid;
}

51
src/XSControl/XSControl_Reader.cxx
View File

@@ -20,6 +20,8 @@
#include <Interface_InterfaceModel.hxx>
#include <Interface_ShareFlags.hxx>
#include <Interface_Static.hxx>
#include <Message.hxx>
#include <Message_Messenger.hxx>
#include <Message_ProgressSentry.hxx>
#include <ShapeExtend_Explorer.hxx>
#include <Standard_Transient.hxx>
@@ -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 :

9
src/XSControl/XSControl_Reader.hxx
View File

@@ -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;

90
src/XSControl/XSControl_TransferReader.cxx
View File

@@ -52,6 +52,7 @@
#include <XSControl_Controller.hxx>
#include <XSControl_TransferReader.hxx>
#include <XSControl_Utils.hxx>
#include <Message.hxx>
#include <stdio.h>
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 ******"<<Message_EndLine;
sout << "****** Transferring one Entity ******"<<std::endl;
if (!lab.IsNull())
sout<<"****** N0 in file : "<<Interface_MSG::Blanks(num,5)<<num
<<" Ident : "<<lab->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 "<<Interface_MSG::Blanks(nb,5)<<" Entities ******"<<Message_EndLine;
sout << "****** Transferring a list of "<<Interface_MSG::Blanks(nb,5)<<" Entities ******"<<std::endl;
sout<<"\n*******************************************************************\n";
Handle(IFSelect_SignatureList) sl = new IFSelect_SignatureList;
@@ -896,7 +897,6 @@ Standard_Integer XSControl_TransferReader::TransferRoots(const Interface_Graph&
{
if (myModel != G.Model()) return -1;
if (!BeginTransfer()) return -1;
Handle(Message_Messenger) sout = myTP->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 "<<Interface_MSG::Blanks(nb,5)<<" Root Entities ******"<<Message_EndLine;
sout << "****** Transferring the "<<Interface_MSG::Blanks(nb,5)<<" Root Entities ******"<<std::endl;
sout<<"\n*******************************************************************\n";
Handle(IFSelect_SignatureList) sl = new IFSelect_SignatureList;
for (roots.Start(); roots.More(); roots.Next())
@@ -959,22 +960,22 @@ void XSControl_TransferReader::TransferClear(const Handle(Standard_Transient)& e
//purpose :
//=======================================================================
void XSControl_TransferReader::PrintStats
(const Standard_Integer what, const Standard_Integer mode) const
void XSControl_TransferReader::PrintStats (Standard_OStream& sout,
const Standard_Integer what,
const Standard_Integer mode) const
{
Handle(Message_Messenger) sout = myTP->Messenger();
// A ameliorer ... !
sout<<"\n*******************************************************************\n";
sout << "****** Statistics on Transfer (Read) ******"<<Message_EndLine;
sout << "****** Statistics on Transfer (Read) ******"<<std::endl;
sout<<"\n*******************************************************************\n";
if (what > 10) { sout<<" *** Not yet implemented"<<Message_EndLine; return; }
if (what > 10) { sout<<" *** Not yet implemented"<<std::endl; return; }
if (what < 10) {
sout << "****** Data recorded on Last Transfer ******"<<Message_EndLine;
sout << "****** Data recorded on Last Transfer ******"<<std::endl;
PrintStatsProcess (myTP,what,mode);
}
// reste what = 10 : on liste les racines des final results
sout << "****** Final Results ******"<<Message_EndLine;
if (myModel.IsNull()) { sout<<"**** Model unknown"<<Message_EndLine; return; }
sout << "****** Final Results ******"<<std::endl;
if (myModel.IsNull()) { sout<<"**** Model unknown"<<std::endl; return; }
Handle(TColStd_HSequenceOfTransient) list = RecordedList();
Standard_Integer i, nb = list->Length();
Handle(IFSelect_SignatureList) counter;
@@ -988,16 +989,16 @@ void XSControl_TransferReader::PrintStats
if (mode == 0) { sout<<" "<<myModel->Number(ent); continue; }
if (mode == 1 || mode == 2) {
sout<<"[ "<<Interface_MSG::Blanks (i,6)<<" ]:";
myModel->Print (ent,sout);
myModel->Print (ent, sout);
sout<<" Type:"<<myModel->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<<Message_EndLine;
sout<<std::endl;
}
@@ -1109,10 +1110,11 @@ static void PrintPercent(const Handle(Message_Messenger)& sout, const Standard_C
const Standard_Integer nb, const Standard_Integer nl)
{
if (nb <= 0 || nl == 0) return;
sout<<"****** "<<mess<<": ";
if (nb == nl) sout<<"100 %"<<Message_EndLine;
else if (nb*100/nl == 0) sout<<"< 1 %"<<Message_EndLine;
else sout<<(nb*100/nl < 10 ? " " : " ")<<nb*100/nl<<" %"<<Message_EndLine;
Message_Messenger::StreamBuffer aSender = sout->SendInfo();
aSender<<"****** "<<mess<<": ";
if (nb == nl) aSender<<"100 %"<<std::endl;
else if (nb*100/nl == 0) aSender<<"< 1 %"<<std::endl;
else aSender<<(nb*100/nl < 10 ? " " : " ")<<nb*100/nl<<" %"<<std::endl;
}
@@ -1140,13 +1142,14 @@ void XSControl_TransferReader::PrintStatsOnList(const Handle(Transfer_TransientP
const Standard_Integer what,
const Standard_Integer mode)
{
Handle(Message_Messenger) sout = TP->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) ******"<<Message_EndLine;
sout << "****** Statistics on Transfer Process (Read) ******"<<std::endl;
if (what == 1) sout << "****** Individual Transfers (Roots) ******\n";
if (what == 2) sout << "****** All recorded data about Transfer ******\n";
if (what == 3) sout << "****** Abnormal records ******\n";
@@ -1184,10 +1187,10 @@ void XSControl_TransferReader::PrintStatsOnList(const Handle(Transfer_TransientP
IFSelect_PrintCount pcm = IFSelect_CountByItem;
if (mode == 6) pcm = IFSelect_ListByItem;
sout <<"**** Entities in Model : "<<model->NbEntities()<<Message_EndLine;
sout <<"**** Nb Items (Transfer) : "<<nb<<Message_EndLine;
sout <<"**** Entities in Model : "<<model->NbEntities()<<std::endl;
sout <<"**** Nb Items (Transfer) : "<<nb<<std::endl;
if (!nolist)
sout<<"**** Nb Items (Listed) : "<<nl<<Message_EndLine;
sout<<"**** Nb Items (Listed) : "<<nl<<std::endl;
for (itrp.Start(); itrp.More(); itrp.Next()) {
nbi ++;
@@ -1198,8 +1201,8 @@ void XSControl_TransferReader::PrintStatsOnList(const Handle(Transfer_TransientP
if (notrec) counter->Add(ent,"(not recorded)");
else if (mode == 1 || mode == 2) {
sout<<"["<<Interface_MSG::Blanks (nbi,4)<<nbi<<" ]:";
model->Print (ent,sout);
sout<<" "<<model->TypeName(ent,Standard_False)<<" (not recorded)"<<Message_EndLine;
model->Print (ent, sout);
sout<<" "<<model->TypeName(ent,Standard_False)<<" (not recorded)"<<std::endl;
continue;
}
}
@@ -1219,9 +1222,9 @@ void XSControl_TransferReader::PrintStatsOnList(const Handle(Transfer_TransientP
// mode : 0 list num; 1 : num+label + type + result (abrege); 2 : complet
if (mode == 1 || mode == 2) {
sout<<"["<<Interface_MSG::Blanks (i,4)<<i<<" ]:";
model->Print (ent,sout);
model->Print (ent, sout);
sout<<" "<<model->TypeName(ent,Standard_False);
sout<<" Result:"<<mess<<Message_EndLine;
sout<<" Result:"<<mess<<std::endl;
if (mode == 1) continue;
const Handle(Interface_Check)& ch = binder->Check();
@@ -1229,11 +1232,11 @@ void XSControl_TransferReader::PrintStatsOnList(const Handle(Transfer_TransientP
if (newnbw > 0) {
sout<<" - Warnings : "<<newnbw<<":\n";
for (newi = 1; newi <= newnbw; newi ++) sout<<ch->CWarning(newi)<<Message_EndLine;
for (newi = 1; newi <= newnbw; newi ++) sout<<ch->CWarning(newi)<<std::endl;
}
if (newnbf > 0) {
sout<<" - Fails : "<<newnbf<<":\n";
for (newi = 1; newi <= newnbf; newi ++) sout<<ch->CFail(newi)<<Message_EndLine;
for (newi = 1; newi <= newnbf; newi ++) sout<<ch->CFail(newi)<<std::endl;
}
continue;
}
@@ -1259,16 +1262,16 @@ void XSControl_TransferReader::PrintStatsOnList(const Handle(Transfer_TransientP
// Fin de l iteration
}
if (!counter.IsNull()) counter->PrintList(sout,model,pcm);
else sout<<Message_EndLine;
if (!counter.IsNull()) counter->PrintList (sout, model, pcm);
else sout<<std::endl;
// Pourcentages
if (mode != 3 && nbi > 0) {
sout << "****** Percentages according Transfer Status ******"<<Message_EndLine;
PrintPercent (sout,"Result ",nbr+nbrw,nl);
PrintPercent (sout,"Result + FAIL ",nbrf,nl);
PrintPercent (sout,"FAIL, no Result ",nbf,nl);
PrintPercent (sout,"Just Warning ",nbw,nl);
PrintPercent (sout,"Nothing Recorded",nbnr,nl);
sout << "****** Percentages according Transfer Status ******"<<std::endl;
PrintPercent (TP->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<<" %"<<std::endl;
if (nbrf > 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);
}
}

2
src/XSControl/XSControl_TransferReader.hxx
View File

@@ -286,7 +286,7 @@ class XSControl_TransferReader : public Standard_Transient
//! Prints statistics on current Trace File, according <what> and
//! <mode>. 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

18
src/XSControl/XSControl_TransferWriter.cxx
View File

@@ -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) ******"<<Message_EndLine;
sout << "****** Statistics on Transfer (Write) ******"<<std::endl;
sout<<"\n*******************************************************************\n";
sout << "****** Transfer Mode = "<<myTransferMode;
Standard_CString modehelp = myController->ModeWriteHelp (myTransferMode);
if (modehelp && modehelp[0] != 0) sout<<" I.E. "<<modehelp;
sout<<" ******"<<Message_EndLine;
sout<<" ******"<<std::endl;
}
@@ -97,19 +97,19 @@ IFSelect_ReturnStatus XSControl_TransferWriter::TransferWriteTransient
Handle(Transfer_ActorOfFinderProcess) nulact;
myTransferWriter->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<<obj->DynamicType()->Name()<<" ******"<<Message_EndLine;
sout<<obj->DynamicType()->Name()<<" ******"<<std::endl;
status = myController->TransferWriteTransient
(obj,myTransferWriter,model,myTransferMode);
}
catch(Standard_Failure const& anException) {
sout<<"**** **** TransferWriteShape, EXCEPTION : ";
sout<<anException.GetMessageString();
sout<<Message_EndLine;
sout<<std::endl;
status = IFSelect_RetFail;
}
return status;
@@ -145,19 +145,19 @@ IFSelect_ReturnStatus XSControl_TransferWriter::TransferWriteShape
Handle(Transfer_ActorOfFinderProcess) nulact;
myTransferWriter->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<<" ******"<<Message_EndLine;
sout<<" ******"<<std::endl;
status = myController->TransferWriteShape
(shape,myTransferWriter,model,myTransferMode);
}
catch(Standard_Failure const& anException) {
sout<<"**** **** TransferWriteShape, EXCEPTION : ";
sout<<anException.GetMessageString();
sout<<Message_EndLine;
sout<<std::endl;
status = IFSelect_RetFail;
}
return status;

18
src/XSControl/XSControl_Utils.cxx
View File

@@ -54,26 +54,26 @@ static const Standard_ExtString voidext = { 0 };
void XSControl_Utils::TraceLine (const Standard_CString line) const
{
Handle(Message_Messenger) sout = Message::DefaultMessenger();
sout<<line<<Message_EndLine;
Message_Messenger::StreamBuffer sout = Message::SendInfo();
sout<<line<<std::endl;
}
void XSControl_Utils::TraceLines (const Handle(Standard_Transient)& lines) const
{
Handle(Message_Messenger) sout = Message::DefaultMessenger();
Message_Messenger::StreamBuffer sout = Message::SendInfo();
Standard_Integer i,nb;
DeclareAndCast(TColStd_HSequenceOfHAsciiString,linha,lines);
if (!linha.IsNull()) {
nb = linha->Length();
for (i = 1; i <= nb; i ++)
if (!linha->Value(i).IsNull()) sout<<linha->Value(i)->ToCString()<<Message_EndLine;
if (!linha->Value(i).IsNull()) sout<<linha->Value(i)->ToCString()<<std::endl;
return;
}
DeclareAndCast(TColStd_HSequenceOfAsciiString,lina,lines);
if (!lina.IsNull()) {
nb = lina->Length();
for (i = 1; i <= nb; i ++)
sout<<lina->Value(i).ToCString()<<Message_EndLine;
sout<<lina->Value(i).ToCString()<<std::endl;
return;
}
DeclareAndCast(TColStd_HSequenceOfHExtendedString,linhe,lines);
@@ -81,20 +81,20 @@ static const Standard_ExtString voidext = { 0 };
nb = linhe->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<<lin1a;
if (!lin1a.IsNull()) sout<<lin1a->String();
DeclareAndCast(TCollection_HExtendedString,lin1e,lines);
if (!lin1e.IsNull()) sout<<lin1e;
if (!lin1e.IsNull()) sout<<lin1e->String();
}

20
src/XSControl/XSControl_WorkSession.cxx
View File

@@ -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."<<ne;
}
S<<Message_EndLine;
S<<std::endl;
ent = FP->FindTransient(finder);
S<<" -> Type "<<finder->DynamicType()->Name()<<Message_EndLine;
S<<" -> Type "<<finder->DynamicType()->Name()<<std::endl;
FP->StartTrace (binder,finder,0,0); // pb sout/S
if (!ent.IsNull()) {
S<<" ** Resultat Transient, type "<<ent->DynamicType()->Name();
const Handle(Interface_InterfaceModel) &model = Model();
if (!model.IsNull())
{ S<<" In output Model, Entity "; model->Print(ent,S); }
S<<Message_EndLine;
{ S<<" In output Model, Entity "; model->Print(ent, S); }
S<<std::endl;
}
}
@@ -248,10 +248,10 @@ Standard_Boolean XSControl_WorkSession::PrintTransferStatus(const Standard_Inte
{
S<<" ** Transfer Root n0."<<ne;
}
S<<Message_EndLine;
if (!model.IsNull()) { S<<" In Model, Entity "; model->Print(ent,S); }
S<<std::endl;
if (!model.IsNull()) { S<<" In Model, Entity "; model->Print(ent, S); }
binder = TP->MapItem (ne);
S<<Message_EndLine;
S<<std::endl;
TP->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 : "<<nbw<<" :\n";
for (i = 1; i <= nbw; i ++) S<<ch->CWarning(i)<<Message_EndLine;
for (i = 1; i <= nbw; i ++) S<<ch->CWarning(i)<<std::endl;
}
if (nbf > 0) {
S<<" - Fails : "<<nbf<<" :\n";
for (i = 1; i <= nbf; i ++) S<<ch->CFail(i)<<Message_EndLine;
for (i = 1; i <= nbf; i ++) S<<ch->CFail(i)<<std::endl;
}
}
return Standard_True;

2
src/XSControl/XSControl_WorkSession.hxx
View File

@@ -98,7 +98,7 @@ class XSControl_WorkSession : public IFSelect_WorkSession
//! the Mapped n0 <num>, from MapWriter if <wri> is True, or
//! from MapReader if <wri> 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)