mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-14 13:30:48 +03:00
0030895: Coding Rules - specify std namespace explicitly for std::cout and streams
"endl" manipulator for Message_Messenger is renamed to "Message_EndLine". The following entities from std namespace are now used with std:: explicitly specified (from Standard_Stream.hxx): std::istream,std::ostream,std::ofstream,std::ifstream,std::fstream, std::filebuf,std::streambuf,std::streampos,std::ios,std::cout,std::cerr, std::cin,std::endl,std::ends,std::flush,std::setw,std::setprecision, std::hex,std::dec.
This commit is contained in:
@@ -76,13 +76,13 @@ static IFSelect_ReturnStatus XSControl_tpdraw
|
||||
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"<<endl; return IFSelect_RetError;}
|
||||
if (TP.IsNull()) { sout<<"No Transfer Read"<<Message_EndLine; return IFSelect_RetError;}
|
||||
// **** tpdraw ****
|
||||
if (argc < 2) {
|
||||
sout<<"Donner [mode facultatif : item ou root] , NUMERO , nom DRAW facultatif"<<endl;
|
||||
sout<<" mode si present : item ou root, sinon n0 d entite modele"<<endl;
|
||||
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<<" NUMERO entier : d entite, d item transfert ou de root transfert\n"
|
||||
<< " ou * pour dire tous"<<endl;
|
||||
<< " ou * pour dire tous"<<Message_EndLine;
|
||||
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 *"<<endl; return IFSelect_RetError; }
|
||||
if (argc < 2) { sout<<"Donner au moins un NUMERO ou *"<<Message_EndLine; 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"<<endl;
|
||||
sout<<"Pas de modele, preciser n0 d item de transfert"<<Message_EndLine;
|
||||
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<<endl;
|
||||
sout<<", listage de 1 a "<<max<<Message_EndLine;
|
||||
}
|
||||
else if (num <= 0 || num > max) {
|
||||
sout<<" - Num="<<num<<" hors limite (de 1 a "<<max<<")"<<endl;
|
||||
sout<<" - Num="<<num<<" hors limite (de 1 a "<<max<<")"<<Message_EndLine;
|
||||
return IFSelect_RetError;
|
||||
} else {
|
||||
n1 = n2 = num; nbvar = -1; // nbvar : 1ere shape simple = pas de n0
|
||||
sout<<", n0 "<<num<<endl;
|
||||
sout<<", n0 "<<num<<Message_EndLine;
|
||||
}
|
||||
|
||||
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"<<endl;
|
||||
if (!tout) sout<<"Entite n0 "<<num<<" : non repertoriee"<<Message_EndLine;
|
||||
continue;
|
||||
}
|
||||
if (!binder->HasResult()) {
|
||||
if (!tout) sout<<"Entite n0 "<<num<<" : pas de resultat"<<endl;
|
||||
if (!tout) sout<<"Entite n0 "<<num<<" : pas de resultat"<<Message_EndLine;
|
||||
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)"<<endl; continue; }
|
||||
if (sh.IsNull()) { sout<<" (no Shape recorded)"<<Message_EndLine; 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<<endl;
|
||||
sout<<" -> 1 DRAW Shape: "<<nomvar<<Message_EndLine;
|
||||
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)"<<endl; continue; }
|
||||
if (sh.IsNull()) { sout<<" (no Shape recorded)"<<Message_EndLine; 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<<endl;
|
||||
sout<<Message_EndLine;
|
||||
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"<<endl;
|
||||
sout<<"Entite n0 "<<num<<" : pas de resultat"<<Message_EndLine;
|
||||
continue;
|
||||
}
|
||||
DeclareAndCast(Geom_Geometry,geom,resu);
|
||||
sout<<"Entite n0 "<<num<<" : resultat "<<resu->DynamicType()->Name();
|
||||
if (geom.IsNull()) { sout<<endl; continue; }
|
||||
if (geom.IsNull()) { sout<<Message_EndLine; 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<<endl;
|
||||
sout<<" -> DRAW Geom : "<<nomvar<<Message_EndLine;
|
||||
continue;
|
||||
}
|
||||
|
||||
if (sh.IsNull() && trb.IsNull())
|
||||
if (!tout) sout<<"Entite n0 "<<num<<" : resultat pas une Shape mais "<<binder->ResultTypeName()<<endl;
|
||||
if (!tout) sout<<"Entite n0 "<<num<<" : resultat pas une Shape mais "<<binder->ResultTypeName()<<Message_EndLine;
|
||||
}
|
||||
|
||||
if (sh.IsNull()) sout<<" (No Shape)"<<endl;
|
||||
if (sh.IsNull()) sout<<" (No Shape)"<<Message_EndLine;
|
||||
return IFSelect_RetDone;
|
||||
}
|
||||
|
||||
@@ -242,20 +242,20 @@ static IFSelect_ReturnStatus XSControl_tpcompound
|
||||
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"<<endl; return IFSelect_RetError;}
|
||||
if (TP.IsNull()) { sout<<"No Transfer Read"<<Message_EndLine; return IFSelect_RetError;}
|
||||
// **** tpcompound ****
|
||||
if (argc < 2) { sout<<"Give a NAME for the Compound + optional givelist, else roots are taken"<<endl; return IFSelect_RetError; }
|
||||
if (argc < 2) { sout<<"Give a NAME for the Compound + optional givelist, else roots are taken"<<Message_EndLine; 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)<<endl; return IFSelect_RetError; }
|
||||
if (lise.IsNull()) { sout<<"Not a valid entity list : "<<pilot->CommandPart(2)<<Message_EndLine; return IFSelect_RetError; }
|
||||
list = TransferBRep::Shapes (TP,lise);
|
||||
sout<<lise->Length()<<" Entities, ";
|
||||
}
|
||||
if (list.IsNull()) { sout<<"No Shape listed"<<endl; return IFSelect_RetError; }
|
||||
if (list.IsNull()) { sout<<"No Shape listed"<<Message_EndLine; return IFSelect_RetError; }
|
||||
Standard_Integer nb = list->Length();
|
||||
sout<<nb<<" Shape(s) listed"<<endl;
|
||||
sout<<nb<<" Shape(s) listed"<<Message_EndLine;
|
||||
TopoDS_Compound C;
|
||||
BRep_Builder B;
|
||||
B.MakeCompound(C);
|
||||
@@ -285,14 +285,14 @@ static IFSelect_ReturnStatus XSControl_traccess
|
||||
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"<<endl; return IFSelect_RetError; }
|
||||
if (TR.IsNull()) { sout<<" manque init"<<Message_EndLine; return IFSelect_RetError; }
|
||||
const Handle(Interface_InterfaceModel) &mdl = TR->Model();
|
||||
if (mdl.IsNull()) { sout<<" modele absent"<<endl; return IFSelect_RetError; }
|
||||
if (mdl.IsNull()) { sout<<" modele absent"<<Message_EndLine; 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"<<endl;
|
||||
if (cassave) sout<<" save shapes -> current directory"<<Message_EndLine;
|
||||
|
||||
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()<<endl;
|
||||
sout<<" TOUS RESULTATS par ShapeResultList, soit "<<list->Length()<<Message_EndLine;
|
||||
for (Standard_Integer i = 1, nb = list->Length(); i <= nb; ++i)
|
||||
{
|
||||
noms = nomsh + "_" + i;
|
||||
if ( (i%1000) == 0) sout<<"("<<i<<")"<<endl;
|
||||
if ( (i%1000) == 0) sout<<"("<<i<<")"<<Message_EndLine;
|
||||
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<<endl;
|
||||
sout<<Message_EndLine;
|
||||
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<<endl; return IFSelect_RetError; }
|
||||
if (num < 1 || num > mdl->NbEntities()) { sout<<" incorrect:"<<arg1<<Message_EndLine; return IFSelect_RetError; }
|
||||
TopoDS_Shape sh = TR->ShapeResult(mdl->Value(num));
|
||||
if (sh.IsNull()) { sout<<" Pas de resultat pour "<<arg1<<endl; return IFSelect_RetError; }
|
||||
if (sh.IsNull()) { sout<<" Pas de resultat pour "<<arg1<<Message_EndLine; 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"<<endl;
|
||||
else sout<<"Option non comprise"<<Message_EndLine;
|
||||
}
|
||||
return IFSelect_RetDone;
|
||||
}
|
||||
@@ -362,13 +362,13 @@ static IFSelect_ReturnStatus XSControl_fromshape
|
||||
// **** fromshape (tread) ****
|
||||
Handle(Message_Messenger) sout = Message::DefaultMessenger();
|
||||
if (argc < 2) {
|
||||
sout<<"Give name of a DRAW Shape"<<endl;
|
||||
sout<<"Give name of a DRAW Shape"<<Message_EndLine;
|
||||
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<<endl;
|
||||
sout<<"Not a DRAW Shape:"<<arg1<<Message_EndLine;
|
||||
return IFSelect_RetError;
|
||||
}
|
||||
Standard_Boolean yena = Standard_False;
|
||||
@@ -383,7 +383,7 @@ static IFSelect_ReturnStatus XSControl_fromshape
|
||||
|
||||
// IMPORT
|
||||
const Handle(XSControl_TransferReader) &TR = XSControl::Session(pilot)->TransferReader();
|
||||
if (TR.IsNull()) { } // sout<<"No read transfer (import) recorded"<<endl;
|
||||
if (TR.IsNull()) { } // sout<<"No read transfer (import) recorded"<<std::endl;
|
||||
else {
|
||||
yena = Standard_True;
|
||||
if ( ! silent ) sout<<"Shape "<<arg1<<" : ";
|
||||
@@ -399,7 +399,7 @@ static IFSelect_ReturnStatus XSControl_fromshape
|
||||
if (TP.IsNull()) {
|
||||
if ( silent )
|
||||
sout << "Shape "<<arg1<<" : ";
|
||||
sout<<"no map"<<endl;
|
||||
sout<<"no map"<<Message_EndLine;
|
||||
}
|
||||
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<<endl<<"Subshapes imported from entities:";
|
||||
sout<<Message_EndLine<<"Subshapes imported from entities:";
|
||||
TopoDS_Iterator Iter(Shape);
|
||||
for (; Iter.More(); Iter.Next()) {
|
||||
TopoDS_Shape subsh = Iter.Value();
|
||||
@@ -453,9 +453,9 @@ 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() << endl;
|
||||
if ( silent ) sout << " in file " << XSControl::Session(pilot)->LoadedFile() << Message_EndLine;
|
||||
}
|
||||
if ( ! silent ) sout<<endl;
|
||||
if ( ! silent ) sout<<Message_EndLine;
|
||||
}
|
||||
|
||||
// ET EN EXPORT ?
|
||||
@@ -470,7 +470,7 @@ static IFSelect_ReturnStatus XSControl_fromshape
|
||||
sout<<"Shape "<<arg1<<": exported to entity ";
|
||||
XSControl::Session(pilot)->Model()->Print(ent,sout);
|
||||
if ( silent ) sout << " in file " << XSControl::Session(pilot)->LoadedFile();
|
||||
sout<<endl;
|
||||
sout<<Message_EndLine;
|
||||
}
|
||||
// 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
|
||||
@@ -489,7 +489,7 @@ static IFSelect_ReturnStatus XSControl_fromshape
|
||||
}
|
||||
if (nb > 0) {
|
||||
if ( silent ) sout << " in file " << XSControl::Session(pilot)->LoadedFile();
|
||||
sout<<endl;
|
||||
sout<<Message_EndLine;
|
||||
}
|
||||
}
|
||||
/* else {
|
||||
@@ -507,13 +507,13 @@ static IFSelect_ReturnStatus XSControl_fromshape
|
||||
start = Standard_False;
|
||||
XSControl::Session(pilot)->Model()->Print(cent,sout);
|
||||
}
|
||||
if ( ! start ) sout<<endl;
|
||||
if ( ! start ) sout<<std::endl;
|
||||
}
|
||||
} */
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!yena) sout<<"No transfer (either import or export) recorded"<<endl;
|
||||
if (!yena) sout<<"No transfer (either import or export) recorded"<<Message_EndLine;
|
||||
|
||||
return IFSelect_RetVoid;
|
||||
}
|
||||
@@ -532,27 +532,27 @@ static IFSelect_ReturnStatus XSControl_trconnexentities
|
||||
Handle(Transfer_TransientProcess) TP;
|
||||
if (!TR.IsNull()) TP = TR->TransientProcess();
|
||||
Handle(Message_Messenger) sout = Message::DefaultMessenger();
|
||||
if (TP.IsNull()) { sout<<"no transfer map"<<endl; return IFSelect_RetVoid; }
|
||||
if (TP.IsNull()) { sout<<"no transfer map"<<Message_EndLine; return IFSelect_RetVoid; }
|
||||
if (argc < 2) {
|
||||
sout<<"Give name of a DRAW Shape + optional shape type v-e-w-f(D)-s"<<endl;
|
||||
sout<<"Give name of a DRAW Shape + optional shape type v-e-w-f(D)-s"<<Message_EndLine;
|
||||
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<<endl; return IFSelect_RetError; }
|
||||
if (Shape.IsNull()) { sout<<"Not a DRAW Shape:"<<arg1<<Message_EndLine; 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 :"<<endl;
|
||||
sout<<nb<<" Entities produced Connected Shapes :"<<Message_EndLine;
|
||||
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<<")"<<endl;
|
||||
sout<<")"<<Message_EndLine;
|
||||
return IFSelect_RetDone;
|
||||
}
|
||||
|
||||
@@ -570,7 +570,7 @@ static IFSelect_ReturnStatus XSControl_trimport
|
||||
Standard_Integer argc = pilot->NbWords();
|
||||
Handle(Message_Messenger) sout = Message::DefaultMessenger();
|
||||
if (argc < 4) {
|
||||
sout<<"Give : filename or . for current model; varname or . to take fileroot\n GiveList, * for all transferrable roots"<<endl;
|
||||
sout<<"Give : filename or . for current model; varname or . to take fileroot\n GiveList, * for all transferrable roots"<<Message_EndLine;
|
||||
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<<endl;
|
||||
else sout<<" Model taken from the session : "<<fnom<<endl;
|
||||
sout<<" -- Names of variables BREP-DRAW prefixed by : "<<rnom<<endl;
|
||||
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;
|
||||
|
||||
// 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"<<endl; return status; }
|
||||
{ sout<<"Abandon import"<<Message_EndLine; return status; }
|
||||
} else {
|
||||
sout<<"Currently Loaded Model"<<endl;
|
||||
sout<<"Currently Loaded Model"<<Message_EndLine;
|
||||
}
|
||||
|
||||
// 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"<<endl; return IFSelect_RetError; }
|
||||
if (list.IsNull()) { sout<<"No list defined. Abandon"<<Message_EndLine; return IFSelect_RetError; }
|
||||
Standard_Integer nbl = list->Length();
|
||||
sout<<"Nb entities selected : "<<nbl<<endl;
|
||||
sout<<"Nb entities selected : "<<nbl<<Message_EndLine;
|
||||
|
||||
// Starting Transfer
|
||||
|
||||
WS->InitTransferReader (0);
|
||||
const Handle(XSControl_TransferReader) &TR = WS->TransferReader();
|
||||
if (TR.IsNull()) { sout<<" init not done or failed"<<endl; return IFSelect_RetError; }
|
||||
if (TR.IsNull()) { sout<<" init not done or failed"<<Message_EndLine; return IFSelect_RetError; }
|
||||
|
||||
TR->BeginTransfer();
|
||||
|
||||
// Transferring
|
||||
Standard_Integer nbt = TR->TransferList(list);
|
||||
sout<<"Nb Entities Selected : "<<nbl<<" have given "<<nbt<<" results"<<endl;
|
||||
sout<<"Nb Entities Selected : "<<nbl<<" have given "<<nbt<<" results"<<Message_EndLine;
|
||||
|
||||
// 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"<<endl; return IFSelect_RetError; }
|
||||
if (mdl.IsNull()) { sout<<" modele absent"<<Message_EndLine; 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"<<endl;
|
||||
if (nbs == 0) sout<<"No Shape produced"<<Message_EndLine;
|
||||
else if (nbs == 1) {
|
||||
sout<<"One Shape produced, named "<<rnom.ToCString()<<endl;
|
||||
sout<<"One Shape produced, named "<<rnom.ToCString()<<Message_EndLine;
|
||||
XSControl::Vars(pilot)->SetShape(rnom.ToCString(),sh);
|
||||
} else if (iscomp) {
|
||||
sout<<"One compound made of "<<nbs<<" Shapes, named "<<rnom.ToCString()<<endl;
|
||||
sout<<"One compound made of "<<nbs<<" Shapes, named "<<rnom.ToCString()<<Message_EndLine;
|
||||
XSControl::Vars(pilot)->SetShape(rnom.ToCString(),C);
|
||||
} else { // several individual shapes
|
||||
sout<<nbs<<" Shapes, named "<<rnom.ToCString()<<"_1 to "<<rnom.ToCString()<<"_"<<nbs<<endl;
|
||||
sout<<nbs<<" Shapes, named "<<rnom.ToCString()<<"_1 to "<<rnom.ToCString()<<"_"<<nbs<<Message_EndLine;
|
||||
}
|
||||
|
||||
return IFSelect_RetDone;
|
||||
@@ -674,17 +674,17 @@ static IFSelect_ReturnStatus XSControl_twrite
|
||||
// **** twrite ****
|
||||
Handle(Message_Messenger) sout = Message::DefaultMessenger();
|
||||
Handle(XSControl_TransferWriter) TW = XSControl::Session(pilot)->TransferWriter();
|
||||
if (argc < 2) { sout<<" donner nom de shape draw"<<endl; return IFSelect_RetError; }
|
||||
sout<<"Attention, on alimente le modele courant ..."<<endl;
|
||||
if (argc < 2) { sout<<" donner nom de shape draw"<<Message_EndLine; return IFSelect_RetError; }
|
||||
sout<<"Attention, on alimente le modele courant ..."<<Message_EndLine;
|
||||
|
||||
// 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<<endl; continue; }
|
||||
if (Shape.IsNull()) { sout<<"pas un nom de shape draw:"<<arg1<<Message_EndLine; continue; }
|
||||
sout<<"Pour Shape : "<<ai;
|
||||
Standard_Integer stat = TW->TransferWriteShape (XSControl::Session(pilot)->Model(),Shape);
|
||||
sout<<" Transfer Write Status = "<<stat<<endl;
|
||||
sout<<" Transfer Write Status = "<<stat<<Message_EndLine;
|
||||
}
|
||||
pilot->Session()->ComputeGraph();
|
||||
// Transient ? (Geom) : ignore
|
||||
@@ -766,7 +766,7 @@ Standard_Integer XSControl_FuncShape::MoreShapes
|
||||
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"<<endl;return 0; }
|
||||
if (TP.IsNull()) { sout<<"last transfer : unknown"<<Message_EndLine;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"<<endl;
|
||||
sout<<" -> taken "<<nbsh<<" Shapes"<<Message_EndLine;
|
||||
return nbsh;
|
||||
}
|
||||
const char* a1 = (const char *)name;
|
||||
TopoDS_Shape Shape = session->Vars()->GetShape(a1);
|
||||
if (Shape.IsNull()) { sout<<"not a shape draw:"<<a1<<endl; return 0; }
|
||||
if (Shape.IsNull()) { sout<<"not a shape draw:"<<a1<<Message_EndLine; return 0; }
|
||||
list->Append(Shape);
|
||||
return 1;
|
||||
}
|
||||
|
@@ -56,7 +56,7 @@ static IFSelect_ReturnStatus XSControl_xinit(const Handle(IFSelect_SessionPilot)
|
||||
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()<<endl;
|
||||
sout<<"Selected Norm:"<<XSControl::Session(pilot)->SelectedNorm()<<Message_EndLine;
|
||||
return IFSelect_RetVoid;
|
||||
}
|
||||
|
||||
@@ -73,22 +73,22 @@ static IFSelect_ReturnStatus XSControl_xnorm(const Handle(IFSelect_SessionPilot)
|
||||
Handle(XSControl_Controller) control = WS->NormAdaptor();
|
||||
Handle(Message_Messenger) sout = Message::DefaultMessenger();
|
||||
if (argc == 1)
|
||||
sout<<"Current Norm. xnorm newnorm to change"<<endl;
|
||||
else sout<<"Current Norm :"<<endl;
|
||||
if (control.IsNull()) sout<<"no norm currently defined"<<endl;
|
||||
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;
|
||||
else
|
||||
sout<<" Long Name (complete) : "<<control->Name(Standard_False)<<endl
|
||||
<< " Short name (resource) : "<<control->Name(Standard_True)<<endl;
|
||||
sout<<" Long Name (complete) : "<<control->Name(Standard_False)<<Message_EndLine
|
||||
<< " Short name (resource) : "<<control->Name(Standard_True)<<Message_EndLine;
|
||||
if (argc == 1) return IFSelect_RetVoid;
|
||||
|
||||
control = XSControl_Controller::Recorded(arg1);
|
||||
if (control.IsNull()) {
|
||||
sout<<" No norm named : "<<arg1<<endl;
|
||||
sout<<" No norm named : "<<arg1<<Message_EndLine;
|
||||
return IFSelect_RetError;
|
||||
}
|
||||
|
||||
WS->SetController(control);
|
||||
sout<<"new norm : "<<control->Name()<<endl;
|
||||
sout<<"new norm : "<<control->Name()<<Message_EndLine;
|
||||
return IFSelect_RetDone;
|
||||
}
|
||||
|
||||
@@ -101,7 +101,7 @@ 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"<<endl;
|
||||
sout<<"No new Model produced"<<Message_EndLine;
|
||||
return IFSelect_RetFail;
|
||||
}
|
||||
|
||||
@@ -116,8 +116,8 @@ static IFSelect_ReturnStatus XSControl_tpclear(const Handle(IFSelect_SessionPilo
|
||||
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"<<endl; }
|
||||
else { if(!TP.IsNull()) TP->Clear(); else sout<<"No Transfer Read"<<endl; }
|
||||
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; }
|
||||
return IFSelect_RetDone;
|
||||
}
|
||||
|
||||
@@ -132,7 +132,7 @@ static IFSelect_ReturnStatus XSControl_tpstat(const Handle(IFSelect_SessionPilot
|
||||
//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"<<endl; return IFSelect_RetError;}
|
||||
if (TP.IsNull()) { sout<<"No Transfer Read"<<Message_EndLine; 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"<<endl;
|
||||
if (mod1 < -1) sout<<"Unknown Mode"<<Message_EndLine;
|
||||
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"<<endl;
|
||||
<<" n select : n applied on a selection idem for s b t r l"<<Message_EndLine;
|
||||
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"<<endl;
|
||||
else sout<<"TransferRead : not defined"<<Message_EndLine;
|
||||
return IFSelect_RetVoid;
|
||||
}
|
||||
|
||||
@@ -212,16 +212,16 @@ static IFSelect_ReturnStatus XSControl_tpent(const Handle(IFSelect_SessionPilot)
|
||||
const Handle(Transfer_TransientProcess) &TP = XSControl::Session(pilot)->TransferReader()->TransientProcess();
|
||||
// **** tpent ****
|
||||
Handle(Message_Messenger) sout = Message::DefaultMessenger();
|
||||
if (TP.IsNull()) { sout<<"No Transfer Read"<<endl; return IFSelect_RetError;}
|
||||
if (TP.IsNull()) { sout<<"No Transfer Read"<<Message_EndLine; 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)"<<endl; return IFSelect_RetError; }
|
||||
if (argc < 2) { sout<<"Give ENTITY NUMBER (IN MODEL TransferProcess)"<<Message_EndLine; return IFSelect_RetError; }
|
||||
Standard_Integer num = atoi(arg1);
|
||||
if (num <= 0 || num > model->NbEntities()) { sout<<"Number not in [1 - "<<model->NbEntities()<<"]"<<endl; return IFSelect_RetError; }
|
||||
if (num <= 0 || num > model->NbEntities()) { sout<<"Number not in [1 - "<<model->NbEntities()<<"]"<<Message_EndLine; 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"<<endl;
|
||||
if (index == 0) sout<<"Entity "<<num<<" not recorded in transfer"<<Message_EndLine;
|
||||
else XSControl::Session(pilot)->PrintTransferStatus (index,Standard_False,sout);
|
||||
return IFSelect_RetVoid;
|
||||
}
|
||||
@@ -236,7 +236,7 @@ static IFSelect_ReturnStatus XSControl_tpitem(const Handle(IFSelect_SessionPilot
|
||||
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)"<<endl; return IFSelect_RetError; }
|
||||
if (argc < 2) { sout<<"Give ITEM NUMBER (in TransferProcess)"<<Message_EndLine; 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,7 @@ 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"<<endl;
|
||||
sout<<" - Num="<<num<<" incorrect"<<Message_EndLine;
|
||||
return IFSelect_RetVoid;
|
||||
}
|
||||
|
||||
@@ -266,21 +266,21 @@ static IFSelect_ReturnStatus XSControl_trecord(const Handle(IFSelect_SessionPilo
|
||||
Handle(Standard_Transient) ent;
|
||||
Handle(Message_Messenger) sout = Message::DefaultMessenger();
|
||||
if (mdl.IsNull() || TR.IsNull() || TP.IsNull())
|
||||
{ sout<<" init not done"<<endl; return IFSelect_RetError; }
|
||||
{ sout<<" init not done"<<Message_EndLine; return IFSelect_RetError; }
|
||||
if (!tous) num = atoi(arg1);
|
||||
// Enregistrer les racines
|
||||
if (tous) {
|
||||
Standard_Integer nb = TP->NbRoots();
|
||||
sout<<" Recording "<<nb<<" Roots"<<endl;
|
||||
sout<<" Recording "<<nb<<" Roots"<<Message_EndLine;
|
||||
for (Standard_Integer i = 1; i <= nb; i ++) {
|
||||
ent = TP->Root(i);
|
||||
if (TR->RecordResult (ent)) sout<<" Root n0."<<i<<endl;
|
||||
else sout<<" Root n0."<<i<<" not recorded"<<endl;
|
||||
if (TR->RecordResult (ent)) sout<<" Root n0."<<i<<Message_EndLine;
|
||||
else sout<<" Root n0."<<i<<" not recorded"<<Message_EndLine;
|
||||
}
|
||||
} else {
|
||||
if (num < 1 || num > mdl->NbEntities()) sout<<"incorrect number:"<<num<<endl;
|
||||
else if (TR->RecordResult(mdl->Value(num))) sout<<" Entity n0."<<num<<endl;
|
||||
else sout<<" Entity n0."<<num<<" not recorded"<<endl;
|
||||
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;
|
||||
}
|
||||
return IFSelect_RetDone;
|
||||
}
|
||||
@@ -296,26 +296,26 @@ static IFSelect_ReturnStatus XSControl_trstat(const Handle(IFSelect_SessionPilot
|
||||
Handle(Message_Messenger) sout = Message::DefaultMessenger();
|
||||
// **** trstat : TransferReader ****
|
||||
const Handle(XSControl_TransferReader) &TR = XSControl::Session(pilot)->TransferReader();
|
||||
if (TR.IsNull()) { sout<<" init not done"<<endl; return IFSelect_RetError; }
|
||||
if (TR.IsNull()) { sout<<" init not done"<<Message_EndLine; return IFSelect_RetError; }
|
||||
Handle(Interface_InterfaceModel) mdl = TR->Model();
|
||||
if (mdl.IsNull()) { sout<<" No model"<<endl; return IFSelect_RetError; }
|
||||
sout<<" Statistics : FileName : "<<TR->FileName()<<endl;
|
||||
if (mdl.IsNull()) { sout<<" No model"<<Message_EndLine; return IFSelect_RetError; }
|
||||
sout<<" Statistics : FileName : "<<TR->FileName()<<Message_EndLine;
|
||||
if (argc == 1) {
|
||||
// stats generales
|
||||
TR->PrintStats(10,0);
|
||||
} else {
|
||||
// stats unitaires
|
||||
Standard_Integer num = atoi(arg1);
|
||||
if (num < 1 || num > mdl->NbEntities()) { sout<<" incorrect number:"<<arg1<<endl; return IFSelect_RetError; }
|
||||
if (num < 1 || num > mdl->NbEntities()) { sout<<" incorrect number:"<<arg1<<Message_EndLine; return IFSelect_RetError; }
|
||||
Handle(Standard_Transient) ent = mdl->Value(num);
|
||||
if (!TR->IsRecorded(ent)) { sout<<" Entity "<<num<<" not recorded"<<endl; return IFSelect_RetError; }
|
||||
if (!TR->IsRecorded(ent)) { sout<<" Entity "<<num<<" not recorded"<<Message_EndLine; 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<<endl;
|
||||
if (RM.IsNull()) { sout<<" no other info"<<endl; return IFSelect_RetVoid; }
|
||||
sout<<Message_EndLine;
|
||||
if (RM.IsNull()) { sout<<" no other info"<<Message_EndLine; return IFSelect_RetVoid; }
|
||||
Interface_CheckIterator chl = RM->CheckList(Standard_False);
|
||||
pilot->Session()->PrintCheckList(chl,Standard_False,IFSelect_EntitiesByItem);
|
||||
}
|
||||
@@ -337,7 +337,7 @@ static IFSelect_ReturnStatus XSControl_trbegin(const Handle(IFSelect_SessionPilo
|
||||
TR = XSControl::Session(pilot)->TransferReader();
|
||||
if (TR.IsNull()) {
|
||||
Handle(Message_Messenger) sout = Message::DefaultMessenger();
|
||||
sout<<" init not done or failed"<<endl;
|
||||
sout<<" init not done or failed"<<Message_EndLine;
|
||||
return IFSelect_RetError;
|
||||
}
|
||||
}
|
||||
@@ -356,21 +356,21 @@ static IFSelect_ReturnStatus XSControl_tread(const Handle(IFSelect_SessionPilot)
|
||||
// **** tread : TransferReader ****
|
||||
Handle(Message_Messenger) sout = Message::DefaultMessenger();
|
||||
const Handle(XSControl_TransferReader) &TR = XSControl::Session(pilot)->TransferReader();
|
||||
if (TR.IsNull()) { sout<<" init not done"<<endl; return IFSelect_RetError; }
|
||||
if (TR.IsNull()) { sout<<" init not done"<<Message_EndLine; return IFSelect_RetError; }
|
||||
const Handle(Interface_InterfaceModel) &mdl = TR->Model();
|
||||
if (mdl.IsNull()) { sout<<" No model"<<endl; return IFSelect_RetError; }
|
||||
if (mdl.IsNull()) { sout<<" No model"<<Message_EndLine; 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"<<endl; return IFSelect_RetError; }
|
||||
if (sel.IsNull()) { sout<<"Select Roots absent"<<Message_EndLine; return IFSelect_RetError; }
|
||||
Handle(TColStd_HSequenceOfTransient) list = pilot->Session()->GiveList(sel);
|
||||
sout<<" Transferring all roots i.e. : "<<TR->TransferList(list)<<endl;
|
||||
sout<<" Transferring all roots i.e. : "<<TR->TransferList(list)<<Message_EndLine;
|
||||
} else {
|
||||
Handle(TColStd_HSequenceOfTransient) list =
|
||||
IFSelect_Functions::GiveList(pilot->Session(),pilot->CommandPart(1));
|
||||
sout<<" Transfer of "<<list->Length()<<" entities"<<endl;
|
||||
sout<<" Transfer of "<<list->Length()<<" entities"<<Message_EndLine;
|
||||
Standard_Integer nb = TR->TransferList(list);
|
||||
sout<<" Gives "<<nb<<" results"<<endl;
|
||||
sout<<" Gives "<<nb<<" results"<<Message_EndLine;
|
||||
}
|
||||
return IFSelect_RetDone;
|
||||
}
|
||||
@@ -384,8 +384,8 @@ 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"<<endl;
|
||||
else if (TR->TransientProcess().IsNull()) sout<<" Transfer Reader without Process"<<endl;
|
||||
if (TR.IsNull()) sout<<" No TransferReader"<<Message_EndLine;
|
||||
else if (TR->TransientProcess().IsNull()) sout<<" Transfer Reader without Process"<<Message_EndLine;
|
||||
return IFSelect_RetVoid;
|
||||
}
|
||||
|
||||
@@ -414,17 +414,17 @@ static IFSelect_ReturnStatus XSControl_twmode(const Handle(IFSelect_SessionPilot
|
||||
Standard_Integer modemin,modemax;
|
||||
Handle(Message_Messenger) sout = Message::DefaultMessenger();
|
||||
if (control->ModeWriteBounds (modemin,modemax)) {
|
||||
sout<<"Write Mode : allowed values "<<modemin<<" to "<<modemax<<endl;
|
||||
sout<<"Write Mode : allowed values "<<modemin<<" to "<<modemax<<Message_EndLine;
|
||||
for (Standard_Integer modd = modemin; modd <= modemax; modd ++) {
|
||||
sout<<modd<<" : "<<control->ModeWriteHelp (modd)<<endl;;
|
||||
sout<<modd<<" : "<<control->ModeWriteHelp (modd)<<Message_EndLine;;
|
||||
}
|
||||
}
|
||||
sout<<"Write Mode : actual = "<<TW->TransferMode()<<endl;
|
||||
sout<<"Write Mode : actual = "<<TW->TransferMode()<<Message_EndLine;
|
||||
if (argc <= 1) return IFSelect_RetVoid;
|
||||
Standard_Integer mod = atoi(arg1);
|
||||
sout<<"New value -> "<<arg1<<endl;
|
||||
sout<<"New value -> "<<arg1<<Message_EndLine;
|
||||
TW->SetTransferMode(mod);
|
||||
if (!control->IsModeWrite (mod)) sout<<"Warning : this new value is not supported"<<endl;
|
||||
if (!control->IsModeWrite (mod)) sout<<"Warning : this new value is not supported"<<Message_EndLine;
|
||||
return IFSelect_RetDone;
|
||||
}
|
||||
|
||||
@@ -446,7 +446,7 @@ static IFSelect_ReturnStatus XSControl_twstat(const Handle(IFSelect_SessionPilot
|
||||
// XSControl_TransferWriter::PrintStatsProcess (FP,mod1,mod2);
|
||||
FP->PrintStats (1,sout);
|
||||
}
|
||||
else sout<<"TransferWrite: not defined"<<endl;
|
||||
else sout<<"TransferWrite: not defined"<<Message_EndLine;
|
||||
return IFSelect_RetVoid;
|
||||
}
|
||||
|
||||
|
@@ -197,7 +197,7 @@ public:
|
||||
Standard_EXPORT TopoDS_Shape OneShape() const;
|
||||
|
||||
//! Prints the check list attached to loaded data, on the Standard
|
||||
//! Trace File (starts at cout)
|
||||
//! Trace File (starts at std::cout)
|
||||
//! All messages or fails only, according to <failsonly>
|
||||
//! mode = 0 : per entity, prints messages
|
||||
//! mode = 1 : per message, just gives count of entities per check
|
||||
|
@@ -798,7 +798,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 ******"<<endl;
|
||||
sout << "****** Transferring one Entity ******"<<Message_EndLine;
|
||||
if (!lab.IsNull())
|
||||
sout<<"****** N0 in file : "<<Interface_MSG::Blanks(num,5)<<num
|
||||
<<" Ident : "<<lab->ToCString()
|
||||
@@ -851,7 +851,7 @@ Standard_Integer XSControl_TransferReader::TransferList
|
||||
// Pour le log-file
|
||||
if (level > 0) {
|
||||
sout<<"\n*******************************************************************\n";
|
||||
sout << "****** Transferring a list of "<<Interface_MSG::Blanks(nb,5)<<" Entities ******"<<endl;
|
||||
sout << "****** Transferring a list of "<<Interface_MSG::Blanks(nb,5)<<" Entities ******"<<Message_EndLine;
|
||||
sout<<"\n*******************************************************************\n";
|
||||
|
||||
Handle(IFSelect_SignatureList) sl = new IFSelect_SignatureList;
|
||||
@@ -908,7 +908,7 @@ Standard_Integer XSControl_TransferReader::TransferRoots(const Interface_Graph&
|
||||
Interface_EntityIterator roots = G.RootEntities();
|
||||
Standard_Integer nb = roots.NbEntities();
|
||||
sout<<"\n*******************************************************************\n";
|
||||
sout << "****** Transferring the "<<Interface_MSG::Blanks(nb,5)<<" Root Entities ******"<<endl;
|
||||
sout << "****** Transferring the "<<Interface_MSG::Blanks(nb,5)<<" Root Entities ******"<<Message_EndLine;
|
||||
sout<<"\n*******************************************************************\n";
|
||||
Handle(IFSelect_SignatureList) sl = new IFSelect_SignatureList;
|
||||
for (roots.Start(); roots.More(); roots.Next())
|
||||
@@ -965,16 +965,16 @@ void XSControl_TransferReader::PrintStats
|
||||
Handle(Message_Messenger) sout = myTP->Messenger();
|
||||
// A ameliorer ... !
|
||||
sout<<"\n*******************************************************************\n";
|
||||
sout << "****** Statistics on Transfer (Read) ******"<<endl;
|
||||
sout << "****** Statistics on Transfer (Read) ******"<<Message_EndLine;
|
||||
sout<<"\n*******************************************************************\n";
|
||||
if (what > 10) { sout<<" *** Not yet implemented"<<endl; return; }
|
||||
if (what > 10) { sout<<" *** Not yet implemented"<<Message_EndLine; return; }
|
||||
if (what < 10) {
|
||||
sout << "****** Data recorded on Last Transfer ******"<<endl;
|
||||
sout << "****** Data recorded on Last Transfer ******"<<Message_EndLine;
|
||||
PrintStatsProcess (myTP,what,mode);
|
||||
}
|
||||
// reste what = 10 : on liste les racines des final results
|
||||
sout << "****** Final Results ******"<<endl;
|
||||
if (myModel.IsNull()) { sout<<"**** Model unknown"<<endl; return; }
|
||||
sout << "****** Final Results ******"<<Message_EndLine;
|
||||
if (myModel.IsNull()) { sout<<"**** Model unknown"<<Message_EndLine; return; }
|
||||
Handle(TColStd_HSequenceOfTransient) list = RecordedList();
|
||||
Standard_Integer i, nb = list->Length();
|
||||
Handle(IFSelect_SignatureList) counter;
|
||||
@@ -997,7 +997,7 @@ void XSControl_TransferReader::PrintStats
|
||||
}
|
||||
if (!counter.IsNull()) counter->PrintList(sout,myModel,pcm);
|
||||
|
||||
sout<<endl;
|
||||
sout<<Message_EndLine;
|
||||
}
|
||||
|
||||
|
||||
@@ -1110,9 +1110,9 @@ static void PrintPercent(const Handle(Message_Messenger)& sout, const Standard_C
|
||||
{
|
||||
if (nb <= 0 || nl == 0) return;
|
||||
sout<<"****** "<<mess<<": ";
|
||||
if (nb == nl) sout<<"100 %"<<endl;
|
||||
else if (nb*100/nl == 0) sout<<"< 1 %"<<endl;
|
||||
else sout<<(nb*100/nl < 10 ? " " : " ")<<nb*100/nl<<" %"<<endl;
|
||||
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;
|
||||
}
|
||||
|
||||
|
||||
@@ -1146,7 +1146,7 @@ void XSControl_TransferReader::PrintStatsOnList(const Handle(Transfer_TransientP
|
||||
if (what == 0) { TP->PrintStats(0,sout); return; }
|
||||
|
||||
sout<<"\n*******************************************************************\n";
|
||||
sout << "****** Statistics on Transfer Process (Read) ******"<<endl;
|
||||
sout << "****** Statistics on Transfer Process (Read) ******"<<Message_EndLine;
|
||||
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 +1184,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()<<endl;
|
||||
sout <<"**** Nb Items (Transfer) : "<<nb<<endl;
|
||||
sout <<"**** Entities in Model : "<<model->NbEntities()<<Message_EndLine;
|
||||
sout <<"**** Nb Items (Transfer) : "<<nb<<Message_EndLine;
|
||||
if (!nolist)
|
||||
sout<<"**** Nb Items (Listed) : "<<nl<<endl;
|
||||
sout<<"**** Nb Items (Listed) : "<<nl<<Message_EndLine;
|
||||
|
||||
for (itrp.Start(); itrp.More(); itrp.Next()) {
|
||||
nbi ++;
|
||||
@@ -1199,7 +1199,7 @@ void XSControl_TransferReader::PrintStatsOnList(const Handle(Transfer_TransientP
|
||||
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)"<<endl;
|
||||
sout<<" "<<model->TypeName(ent,Standard_False)<<" (not recorded)"<<Message_EndLine;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
@@ -1221,7 +1221,7 @@ void XSControl_TransferReader::PrintStatsOnList(const Handle(Transfer_TransientP
|
||||
sout<<"["<<Interface_MSG::Blanks (i,4)<<i<<" ]:";
|
||||
model->Print (ent,sout);
|
||||
sout<<" "<<model->TypeName(ent,Standard_False);
|
||||
sout<<" Result:"<<mess<<endl;
|
||||
sout<<" Result:"<<mess<<Message_EndLine;
|
||||
if (mode == 1) continue;
|
||||
|
||||
const Handle(Interface_Check)& ch = binder->Check();
|
||||
@@ -1229,11 +1229,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)<<endl;
|
||||
for (newi = 1; newi <= newnbw; newi ++) sout<<ch->CWarning(newi)<<Message_EndLine;
|
||||
}
|
||||
if (newnbf > 0) {
|
||||
sout<<" - Fails : "<<newnbf<<":\n";
|
||||
for (newi = 1; newi <= newnbf; newi ++) sout<<ch->CFail(newi)<<endl;
|
||||
for (newi = 1; newi <= newnbf; newi ++) sout<<ch->CFail(newi)<<Message_EndLine;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
@@ -1260,25 +1260,25 @@ void XSControl_TransferReader::PrintStatsOnList(const Handle(Transfer_TransientP
|
||||
// Fin de l iteration
|
||||
}
|
||||
if (!counter.IsNull()) counter->PrintList(sout,model,pcm);
|
||||
else sout<<endl;
|
||||
else sout<<Message_EndLine;
|
||||
// Pourcentages
|
||||
if (mode != 3 && nbi > 0) {
|
||||
sout << "****** Percentages according Transfer Status ******"<<endl;
|
||||
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);
|
||||
/* if (nbr+nbrw > 0)
|
||||
sout<<"****** Result : "<< (nbr+nbrw)*100/nl<<" %"<<endl;
|
||||
sout<<"****** Result : "<< (nbr+nbrw)*100/nl<<" %"<<std::endl;
|
||||
if (nbrf > 0)
|
||||
sout<<"****** Result + FAIL : "<< (nbrf)*100/nl<<" %"<<endl;
|
||||
sout<<"****** Result + FAIL : "<< (nbrf)*100/nl<<" %"<<std::endl;
|
||||
if (nbf > 0)
|
||||
sout<<"****** FAIL, no Result : "<< (nbf)*100/nl<<" %"<<endl;
|
||||
sout<<"****** FAIL, no Result : "<< (nbf)*100/nl<<" %"<<std::endl;
|
||||
if (nbw > 0)
|
||||
sout<<"****** Just Warning : "<< (nbw)*100/nl<<" %"<<endl;
|
||||
sout<<"****** Just Warning : "<< (nbw)*100/nl<<" %"<<std::endl;
|
||||
if (nbnr > 0)
|
||||
sout<<"****** Nothing Recorded: "<< (nbnr)*100/nl<<" %"<<endl; */
|
||||
sout<<"****** Nothing Recorded: "<< (nbnr)*100/nl<<" %"<<std::endl; */
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
@@ -55,12 +55,12 @@ void XSControl_TransferWriter::PrintStats (const Standard_Integer , const Standa
|
||||
Handle(Message_Messenger) sout = myTransferWriter->Messenger();
|
||||
// A ameliorer ... !
|
||||
sout<<"\n*******************************************************************\n";
|
||||
sout << "****** Statistics on Transfer (Write) ******"<<endl;
|
||||
sout << "****** Statistics on Transfer (Write) ******"<<Message_EndLine;
|
||||
sout<<"\n*******************************************************************\n";
|
||||
sout << "****** Transfer Mode = "<<myTransferMode;
|
||||
Standard_CString modehelp = myController->ModeWriteHelp (myTransferMode);
|
||||
if (modehelp && modehelp[0] != 0) sout<<" I.E. "<<modehelp;
|
||||
sout<<" ******"<<endl;
|
||||
sout<<" ******"<<Message_EndLine;
|
||||
}
|
||||
|
||||
|
||||
@@ -102,14 +102,14 @@ IFSelect_ReturnStatus XSControl_TransferWriter::TransferWriteTransient
|
||||
OCC_CATCH_SIGNALS
|
||||
PrintStats(myTransferMode);
|
||||
sout << "****** Transferring Transient, CDL Type = ";
|
||||
sout<<obj->DynamicType()->Name()<<" ******"<<endl;
|
||||
sout<<obj->DynamicType()->Name()<<" ******"<<Message_EndLine;
|
||||
status = myController->TransferWriteTransient
|
||||
(obj,myTransferWriter,model,myTransferMode);
|
||||
}
|
||||
catch(Standard_Failure const& anException) {
|
||||
sout<<"**** **** TransferWriteShape, EXCEPTION : ";
|
||||
sout<<anException.GetMessageString();
|
||||
sout<<endl;
|
||||
sout<<Message_EndLine;
|
||||
status = IFSelect_RetFail;
|
||||
}
|
||||
return status;
|
||||
@@ -150,14 +150,14 @@ IFSelect_ReturnStatus XSControl_TransferWriter::TransferWriteShape
|
||||
OCC_CATCH_SIGNALS
|
||||
PrintStats(myTransferMode);
|
||||
sout << "****** Transferring Shape, ShapeType = " << shape.ShapeType();
|
||||
sout<<" ******"<<endl;
|
||||
sout<<" ******"<<Message_EndLine;
|
||||
status = myController->TransferWriteShape
|
||||
(shape,myTransferWriter,model,myTransferMode);
|
||||
}
|
||||
catch(Standard_Failure const& anException) {
|
||||
sout<<"**** **** TransferWriteShape, EXCEPTION : ";
|
||||
sout<<anException.GetMessageString();
|
||||
sout<<endl;
|
||||
sout<<Message_EndLine;
|
||||
status = IFSelect_RetFail;
|
||||
}
|
||||
return status;
|
||||
|
@@ -55,7 +55,7 @@ static const Standard_ExtString voidext = { 0 };
|
||||
void XSControl_Utils::TraceLine (const Standard_CString line) const
|
||||
{
|
||||
Handle(Message_Messenger) sout = Message::DefaultMessenger();
|
||||
sout<<line<<endl;
|
||||
sout<<line<<Message_EndLine;
|
||||
}
|
||||
|
||||
void XSControl_Utils::TraceLines (const Handle(Standard_Transient)& lines) const
|
||||
@@ -66,14 +66,14 @@ static const Standard_ExtString voidext = { 0 };
|
||||
if (!linha.IsNull()) {
|
||||
nb = linha->Length();
|
||||
for (i = 1; i <= nb; i ++)
|
||||
if (!linha->Value(i).IsNull()) sout<<linha->Value(i)->ToCString()<<endl;
|
||||
if (!linha->Value(i).IsNull()) sout<<linha->Value(i)->ToCString()<<Message_EndLine;
|
||||
return;
|
||||
}
|
||||
DeclareAndCast(TColStd_HSequenceOfAsciiString,lina,lines);
|
||||
if (!lina.IsNull()) {
|
||||
nb = lina->Length();
|
||||
for (i = 1; i <= nb; i ++)
|
||||
sout<<lina->Value(i).ToCString()<<endl;
|
||||
sout<<lina->Value(i).ToCString()<<Message_EndLine;
|
||||
return;
|
||||
}
|
||||
DeclareAndCast(TColStd_HSequenceOfHExtendedString,linhe,lines);
|
||||
@@ -81,14 +81,14 @@ static const Standard_ExtString voidext = { 0 };
|
||||
nb = linhe->Length();
|
||||
for (i = 1; i <= nb; i ++)
|
||||
if (!linhe->Value(i).IsNull())
|
||||
sout << linhe->Value(i) << endl;
|
||||
sout << linhe->Value(i) << Message_EndLine;
|
||||
return;
|
||||
}
|
||||
DeclareAndCast(TColStd_HSequenceOfExtendedString,linee,lines);
|
||||
if (!linee.IsNull()) {
|
||||
nb = linee->Length();
|
||||
for (i = 1; i <= nb; i ++)
|
||||
sout << linee->Value(i) << endl;
|
||||
sout << linee->Value(i) << Message_EndLine;
|
||||
return;
|
||||
}
|
||||
DeclareAndCast(TCollection_HAsciiString,lin1a,lines);
|
||||
|
@@ -209,16 +209,16 @@ Standard_Boolean XSControl_WorkSession::PrintTransferStatus(const Standard_Inte
|
||||
{
|
||||
S<<" ** Transfer Root n0."<<ne;
|
||||
}
|
||||
S<<endl;
|
||||
S<<Message_EndLine;
|
||||
ent = FP->FindTransient(finder);
|
||||
S<<" -> Type "<<finder->DynamicType()->Name()<<endl;
|
||||
S<<" -> Type "<<finder->DynamicType()->Name()<<Message_EndLine;
|
||||
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<<endl;
|
||||
S<<Message_EndLine;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -226,8 +226,8 @@ Standard_Boolean XSControl_WorkSession::PrintTransferStatus(const Standard_Inte
|
||||
else {
|
||||
if (TP.IsNull()) return Standard_False;
|
||||
Handle(Interface_InterfaceModel) model = TP->Model();
|
||||
if (model.IsNull()) cout<<"No Model"<<endl;
|
||||
else if (model != Model()) cout<<"Model different from the session"<<endl;
|
||||
if (model.IsNull()) std::cout<<"No Model"<<std::endl;
|
||||
else if (model != Model()) std::cout<<"Model different from the session"<<std::endl;
|
||||
if (num == 0) return Standard_False;
|
||||
|
||||
Standard_Integer ne=0, nr=0, max = TP->NbMapped() ,maxr = TP->NbRoots();
|
||||
@@ -248,10 +248,10 @@ Standard_Boolean XSControl_WorkSession::PrintTransferStatus(const Standard_Inte
|
||||
{
|
||||
S<<" ** Transfer Root n0."<<ne;
|
||||
}
|
||||
S<<endl;
|
||||
S<<Message_EndLine;
|
||||
if (!model.IsNull()) { S<<" In Model, Entity "; model->Print(ent,S); }
|
||||
binder = TP->MapItem (ne);
|
||||
S<<endl;
|
||||
S<<Message_EndLine;
|
||||
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)<<endl;
|
||||
for (i = 1; i <= nbw; i ++) S<<ch->CWarning(i)<<Message_EndLine;
|
||||
}
|
||||
if (nbf > 0) {
|
||||
S<<" - Fails : "<<nbf<<" :\n";
|
||||
for (i = 1; i <= nbf; i ++) S<<ch->CFail(i)<<endl;
|
||||
for (i = 1; i <= nbf; i ++) S<<ch->CFail(i)<<Message_EndLine;
|
||||
}
|
||||
}
|
||||
return Standard_True;
|
||||
|
Reference in New Issue
Block a user