diff --git a/src/BRepTest/BRepTest_BasicCommands.cxx b/src/BRepTest/BRepTest_BasicCommands.cxx index 3e104a3333..d12d9da8f1 100644 --- a/src/BRepTest/BRepTest_BasicCommands.cxx +++ b/src/BRepTest/BRepTest_BasicCommands.cxx @@ -39,6 +39,7 @@ #include #include #include +#include #include #include #include @@ -176,7 +177,7 @@ static Standard_Integer transform(Draw_Interpretor& ,Standard_Integer n,const ch TopoDS_Shape S = DBRep::Get(a[i]); if (S.IsNull()) { - std::cerr << "Error: " << a[i] << " is not a valid shape\n"; + Message::SendFail() << "Error: " << a[i] << " is not a valid shape"; return 1; } else @@ -188,7 +189,7 @@ static Standard_Integer transform(Draw_Interpretor& ,Standard_Integer n,const ch for (Standard_Integer i = 1; i < last; i++) { TopoDS_Shape S = DBRep::Get(a[i]); if (S.IsNull()) { - std::cerr << "Error: " << a[i] << " is not a valid shape\n"; + Message::SendFail() << "Error: " << a[i] << " is not a valid shape"; return 1; } else { @@ -271,9 +272,9 @@ static Standard_Integer tcopy(Draw_Interpretor& di,Standard_Integer n,const char } if (n < 3 || (n - iFirst) % 2) { - std::cout << "Use: " << a[0] << " [-n(ogeom)] [-m(esh)] shape1 copy1 [shape2 copy2 [...]]" << std::endl; - std::cout << "Option -n forbids copying of geometry (it will be shared)" << std::endl; - std::cout << "Option -m forces copying of mesh (disabled by default)" << std::endl; + Message::SendFail() << "Use: " << a[0] << " [-n(ogeom)] [-m(esh)] shape1 copy1 [shape2 copy2 [...]]\n" + << "Option -n forbids copying of geometry (it will be shared)\n" + << "Option -m forces copying of mesh (disabled by default)"; return 1; } @@ -584,7 +585,7 @@ static Standard_Integer BoundBox(Draw_Interpretor& theDI, } else { - std::cout << "Syntax error at argument '" << theArgVal[anArgIter] << "'.\n"; + Message::SendFail() << "Syntax error at argument '" << theArgVal[anArgIter] << "'"; return 1; } } @@ -592,19 +593,19 @@ static Standard_Integer BoundBox(Draw_Interpretor& theDI, if (anAABB.IsVoid() && aShape.IsNull()) { - std::cout << "Syntax error: input is not specified (neither shape nor coordinates)\n"; + Message::SendFail() << "Syntax error: input is not specified (neither shape nor coordinates)"; return 1; } else if (!anAABB.IsVoid() && (isOBB || isOptimal || isTolerUsed)) { - std::cout << "Syntax error: Options -obb, -optimal and -extToler cannot be used for explicitly defined AABB.\n"; + Message::SendFail() << "Syntax error: Options -obb, -optimal and -extToler cannot be used for explicitly defined AABB"; return 1; } else if (isOBB && !anOutVars[0].IsEmpty()) { - std::cout << "Error: Option -save works only with axes-aligned boxes.\n"; + Message::SendFail() << "Error: Option -save works only with axes-aligned boxes"; return 1; } diff --git a/src/BRepTest/BRepTest_ExtremaCommands.cxx b/src/BRepTest/BRepTest_ExtremaCommands.cxx index 135356f278..0ca2fa983b 100644 --- a/src/BRepTest/BRepTest_ExtremaCommands.cxx +++ b/src/BRepTest/BRepTest_ExtremaCommands.cxx @@ -14,8 +14,6 @@ // Alternatively, this file may be used under the terms of Open CASCADE // commercial license or contractual agreement. -// modified by mps (juillet 96) : ajout de la commande distmini - #include #include #include @@ -28,15 +26,13 @@ #include #include #include +#include #include #include #include #include - -//#ifdef _MSC_VER #include -//#endif //======================================================================= //function : distance @@ -150,9 +146,7 @@ static int ShapeProximity (Draw_Interpretor& theDI, Standard_Integer theNbArgs, { if (theNbArgs < 3 || theNbArgs > 6) { - std::cout << "Usage: " << theArgs[0] << - " Shape1 Shape2 [-tol ] [-profile]" << std::endl; - + Message::SendFail() << "Usage: " << theArgs[0] << " Shape1 Shape2 [-tol ] [-profile]"; return 1; } @@ -161,7 +155,7 @@ static int ShapeProximity (Draw_Interpretor& theDI, Standard_Integer theNbArgs, if (aShape1.IsNull() || aShape2.IsNull()) { - std::cout << "Error: Failed to find specified shapes" << std::endl; + Message::SendFail() << "Error: Failed to find specified shapes"; return 1; } @@ -178,14 +172,14 @@ static int ShapeProximity (Draw_Interpretor& theDI, Standard_Integer theNbArgs, { if (++anArgIdx >= theNbArgs) { - std::cout << "Error: wrong syntax at argument '" << aFlag << std::endl; + Message::SendFail() << "Error: wrong syntax at argument '" << aFlag; return 1; } const Standard_Real aTolerance = Draw::Atof (theArgs[anArgIdx]); if (aTolerance < 0.0) { - std::cout << "Error: Tolerance value should be non-negative" << std::endl; + Message::SendFail() << "Error: Tolerance value should be non-negative"; return 1; } else @@ -231,7 +225,7 @@ static int ShapeProximity (Draw_Interpretor& theDI, Standard_Integer theNbArgs, if (!aTool.IsDone()) { - std::cout << "Error: Failed to perform proximity test" << std::endl; + Message::SendFail() << "Error: Failed to perform proximity test"; return 1; } @@ -287,17 +281,14 @@ static int ShapeSelfIntersection (Draw_Interpretor& theDI, Standard_Integer theN { if (theNbArgs < 2 || theNbArgs > 5) { - std::cout << "Usage: " << theArgs[0] << - " Shape [-tol ] [-profile]" << std::endl; - + Message::SendFail() << "Usage: " << theArgs[0] << " Shape [-tol ] [-profile]"; return 1; } TopoDS_Shape aShape = DBRep::Get (theArgs[1]); - if (aShape.IsNull()) { - std::cout << "Error: Failed to find specified shape" << std::endl; + Message::SendFail() << "Error: Failed to find specified shape"; return 1; } @@ -313,14 +304,14 @@ static int ShapeSelfIntersection (Draw_Interpretor& theDI, Standard_Integer theN { if (++anArgIdx >= theNbArgs) { - std::cout << "Error: wrong syntax at argument '" << aFlag << std::endl; + Message::SendFail() << "Error: wrong syntax at argument '" << aFlag; return 1; } const Standard_Real aValue = Draw::Atof (theArgs[anArgIdx]); if (aValue < 0.0) { - std::cout << "Error: Tolerance value should be non-negative" << std::endl; + Message::SendFail() << "Error: Tolerance value should be non-negative"; return 1; } else @@ -360,7 +351,7 @@ static int ShapeSelfIntersection (Draw_Interpretor& theDI, Standard_Integer theN if (!aTool.IsDone()) { - std::cout << "Error: Failed to perform proximity test" << std::endl; + Message::SendFail() << "Error: Failed to perform proximity test"; return 1; } diff --git a/src/BRepTest/BRepTest_FeatureCommands.cxx b/src/BRepTest/BRepTest_FeatureCommands.cxx index d673ed7790..09f3551df4 100644 --- a/src/BRepTest/BRepTest_FeatureCommands.cxx +++ b/src/BRepTest/BRepTest_FeatureCommands.cxx @@ -65,6 +65,7 @@ #include #include +#include #include @@ -756,16 +757,16 @@ static Standard_Integer SPLS(Draw_Interpretor&, if (narg < 3) { - std::cout << "Invalid number of arguments. Should be : splitshape result shape [splitedges] \ - [face wire/edge/compound [wire/edge/compound ...] \ - [face wire/edge/compound [wire/edge/compound...] ...] \ - [@ edgeonshape edgeonwire [edgeonshape edgeonwire...]]" << std::endl; + Message::SendFail() << "Invalid number of arguments. Should be : splitshape result shape [splitedges] " + "[face wire/edge/compound [wire/edge/compound ...] " + "[face wire/edge/compound [wire/edge/compound...] ...] " + "[@ edgeonshape edgeonwire [edgeonshape edgeonwire...]]"; return 1; } TopoDS_Shape S = DBRep::Get(a[2]); if (S.IsNull()) { - std::cout << "Invalid input shape " << a[2] << std::endl; + Message::SendFail() << "Invalid input shape " << a[2]; return 1; } BRepFeat_SplitShape Spls(S); @@ -792,7 +793,7 @@ static Standard_Integer SPLS(Draw_Interpretor&, TopoDS_Shape aSh = DBRep::Get(a[i]); if (aSh.IsNull()) { - std::cout << "Invalid input shape " << a[i] << std::endl; + Message::SendFail() << "Invalid input shape " << a[i]; return 1; } @@ -871,7 +872,7 @@ static Standard_Integer SPLS(Draw_Interpretor&, TopoDS_Shape aSh = DBRep::Get(a[i]); if (aSh.IsNull()) { - std::cout << "Invalid input shape " << a[i] << std::endl; + Message::SendFail() << "Invalid input shape " << a[i]; return 1; } TopExp_Explorer aExpE(aSh, TopAbs_EDGE, TopAbs_FACE); @@ -880,10 +881,10 @@ static Standard_Integer SPLS(Draw_Interpretor&, } else { - std::cout << "Invalid input arguments. Should be : splitshape result shape [splitedges] \ - [face wire/edge/compound [wire/edge/compound ...] \ - [face wire/edge/compound [wire/edge/compound...] ...] \ - [@ edgeonshape edgeonwire [edgeonshape edgeonwire...]]" << std::endl; + Message::SendFail() << "Invalid input arguments. Should be : splitshape result shape [splitedges] " + "[face wire/edge/compound [wire/edge/compound ...] " + "[face wire/edge/compound [wire/edge/compound...] ...] " + "[@ edgeonshape edgeonwire [edgeonshape edgeonwire...]]"; return 1; } } @@ -906,7 +907,7 @@ static Standard_Integer SPLS(Draw_Interpretor&, Ew = TopoDS::Edge(aLocalShape); // Ew = TopoDS::Edge(DBRep::Get(a[i+1],TopAbs_EDGE)); if (Ew.IsNull()) { - std::cout << "Invalid input shape " << a[i + 1] << std::endl; + Message::SendFail() << "Invalid input shape " << a[i + 1]; return 1; } Spls.Add(TopoDS::Edge(Ew), TopoDS::Edge(Es)); diff --git a/src/BRepTest/BRepTest_FilletCommands.cxx b/src/BRepTest/BRepTest_FilletCommands.cxx index 17559fa3bd..a9af23106d 100644 --- a/src/BRepTest/BRepTest_FilletCommands.cxx +++ b/src/BRepTest/BRepTest_FilletCommands.cxx @@ -51,6 +51,7 @@ #include #include #include +#include #include @@ -333,7 +334,7 @@ Standard_Integer boptopoblend(Draw_Interpretor& di, Standard_Integer narg, const printtolblend(di); if(narg < 5) { - std::cout << "Use result shape1 shape2 radius [-d]" << std::endl; + Message::SendFail() << "Use result shape1 shape2 radius [-d]"; return 1; } @@ -341,7 +342,7 @@ Standard_Integer boptopoblend(Draw_Interpretor& di, Standard_Integer narg, const TopoDS_Shape S1 = DBRep::Get(a[2]); TopoDS_Shape S2 = DBRep::Get(a[3]); if (S1.IsNull() || S2.IsNull()) { - printf(" Null shapes are not allowed \n"); + Message::SendFail() << " Null shapes are not allowed"; return 1; } Standard_Real Rad = Draw::Atof(a[4]); @@ -363,7 +364,7 @@ Standard_Integer boptopoblend(Draw_Interpretor& di, Standard_Integer narg, const // theDSFiller.Perform(); if (theDSFiller.HasErrors()) { - printf("Check types of the arguments, please\n"); + Message::SendFail() << "Check types of the arguments, please"; return 1; } @@ -377,7 +378,7 @@ Standard_Integer boptopoblend(Draw_Interpretor& di, Standard_Integer narg, const Standard_Boolean anIsDone = pBuilder->IsDone(); if (!anIsDone) { - printf("boolean operation not done HasErrors()=%d\n", pBuilder->HasErrors()); + Message::SendFail() << "boolean operation not done HasErrors()=" << pBuilder->HasErrors(); return 1; } diff --git a/src/BRepTest/BRepTest_OtherCommands.cxx b/src/BRepTest/BRepTest_OtherCommands.cxx index 1bed4e20cc..682d7243ea 100644 --- a/src/BRepTest/BRepTest_OtherCommands.cxx +++ b/src/BRepTest/BRepTest_OtherCommands.cxx @@ -75,6 +75,7 @@ #include #include #include +#include static void SampleEdges (const TopoDS_Shape& theShape, @@ -277,7 +278,7 @@ Standard_Integer brepintcs(Draw_Interpretor& di, Standard_Integer n, const char* { if (n <= 2) { - std::cout<<"Invalid input arguments. Should be: curve1 [curve2 ...] shape [result] [tol]"< #include #include - +#include //======================================================================= // box @@ -129,7 +129,7 @@ static Standard_Integer box(Draw_Interpretor& , Standard_Integer n, const char** } else { - std::cout<<"Syntax error\n"; + Message::SendFail() << "Syntax error"; return 1; } } diff --git a/src/BRepTest/BRepTest_SurfaceCommands.cxx b/src/BRepTest/BRepTest_SurfaceCommands.cxx index 8c925cbcbb..735c26ff20 100644 --- a/src/BRepTest/BRepTest_SurfaceCommands.cxx +++ b/src/BRepTest/BRepTest_SurfaceCommands.cxx @@ -46,6 +46,7 @@ #include #include +#include #ifdef _WIN32 //#define strcasecmp strcmp Already defined @@ -75,7 +76,7 @@ static Standard_Integer mkface(Draw_Interpretor& , Standard_Integer n, const cha Handle(Geom_Surface) S = DrawTrSurf::GetSurface(a[2]); if (S.IsNull()) { - std::cout << a[2] << " is not a surface" << std::endl; + Message::SendFail() << a[2] << " is not a surface"; return 1; } @@ -580,7 +581,7 @@ static Standard_Integer getedgeregul { if( argc < 3) { - std::cout<<"Invalid number of arguments. Should be: checkedgeregularity edge face1 [face2]"< 3 ? DBRep::Get(argv[3],TopAbs_FACE) : aFace1); if( anEdge.IsNull() || aFace1.IsNull() || aFace2.IsNull()) { - std::cout<<"Invalid number of arguments. Should be: getedgeregularity edge face1 [face2]"< #include #include - +#include //======================================================================= // prism @@ -244,7 +244,7 @@ static Standard_Integer geompipe(Draw_Interpretor&, aPipe.Perform(Standard_True); if (!aPipe.IsDone()) { - std::cout << "GeomFill_Pipe cannot make a surface" << std::endl; + Message::SendFail() << "GeomFill_Pipe cannot make a surface"; return 1; } @@ -550,16 +550,6 @@ static Standard_Integer setsweep(Draw_Interpretor& di, Standard_Integer n, const char** a) { if (n == 1) { - //std::cout << "setsweep options [arg1 [arg2 [...]]] : options are :" << std::endl; - //std::cout << " -FR : Tangent and Normal are given by Frenet trihedron" <> command !"<< std::endl; di << "You have forgotten the <> command !\n"; return 1; } @@ -589,14 +578,12 @@ static Standard_Integer setsweep(Draw_Interpretor& di, } else if (!strcmp(a[1], "-DX")) { if (n != 3) { - //std::cout << "bad arguments !" << std::endl; di << "bad arguments !\n"; return 1; } TopoDS_Shape Surf; Surf = DBRep::Get(a[2], TopAbs_SHAPE); if (Surf.IsNull()) { - //std::cout << a[2] <<"is not a shape !" << std::endl; di << a[2] << "is not a shape !\n"; return 1; } @@ -604,7 +591,6 @@ static Standard_Integer setsweep(Draw_Interpretor& di, } else if (!strcmp(a[1], "-CN")) { if (n != 5) { - //std::cout << "bad arguments !" << std::endl; di << "bad arguments !\n"; return 1; } @@ -613,7 +599,6 @@ static Standard_Integer setsweep(Draw_Interpretor& di, } else if (!strcmp(a[1], "-FX")) { if ((n != 5) && (n != 8)) { - //std::cout << "bad arguments !" << std::endl; di << "bad arguments !\n"; return 1; } @@ -632,7 +617,6 @@ static Standard_Integer setsweep(Draw_Interpretor& di, { if (n != 5) { - //std::cout << "bad arguments !" << std::endl; di << "bad arguments !\n"; return 1; } @@ -648,7 +632,6 @@ static Standard_Integer setsweep(Draw_Interpretor& di, } else { - //std::cout << "The option "<< a[1] << " is unknown !" << std::endl; di << "The option " << a[1] << " is unknown !\n"; return 1; } @@ -663,11 +646,6 @@ static Standard_Integer addsweep(Draw_Interpretor& di, Standard_Integer n, const char** a) { if (n == 1) { - //std::cout << "addsweep wire/vertex [Vertex] [-T] [-R] [u0 v0 u1 v1 [...[uN vN]]] : options are :" << std::endl; - //std::cout << " -T : the wire/vertex have to be translated to assume contact"<< std::endl; - //std::cout << " with the spine" <> command !"<< std::endl; di << "You have forgotten the <> command !\n"; return 1; } @@ -691,7 +668,6 @@ static Standard_Integer addsweep(Draw_Interpretor& di, (Section.ShapeType() != TopAbs_WIRE && Section.ShapeType() != TopAbs_VERTEX)) { - //std::cout << a[1] <<"is not a wire and is not a vertex!" << std::endl; di << a[1] << " is not a wire and is not a vertex!\n"; return 1; } @@ -705,7 +681,6 @@ static Standard_Integer addsweep(Draw_Interpretor& di, // Reading of Vertex TopoDS_Shape InputVertex(DBRep::Get(a[cur], TopAbs_VERTEX)); Vertex = TopoDS::Vertex(InputVertex); - // Vertex = TopoDS::Vertex(DBRep::Get(a[cur],TopAbs_VERTEX)); if (!Vertex.IsNull()) { cur++; HasVertex = Standard_True; @@ -768,15 +743,12 @@ static Standard_Integer deletesweep(Draw_Interpretor& di, TopoDS_Wire Section; TopoDS_Shape InputShape(DBRep::Get(a[1], TopAbs_SHAPE)); Section = TopoDS::Wire(InputShape); - // Section = TopoDS::Wire(DBRep::Get(a[1],TopAbs_SHAPE)); if (Section.IsNull()) { - //std::cout << a[1] <<"is not a wire !" << std::endl; di << a[1] << "is not a wire !\n"; return 1; } Sweep->Delete(Section); - return 0; } @@ -787,14 +759,6 @@ static Standard_Integer buildsweep(Draw_Interpretor& di, Standard_Integer n, const char** a) { if (n == 1) { - //std::cout << "build sweep result [-M/-C/-R] [-S] [tol] : options are" << std::endl; - //std::cout << " -M : Discontinuities are treated by Modfication of"<< std::endl; - //std::cout << " the sweeping mode : it is the default" <> command !"<< std::endl; di << "You have forgotten the <> command !\n"; return 1; } if (!Sweep->IsReady()) { - //std::cout << "You have forgotten the <> command !"<< std::endl; di << "You have forgotten the <> command !\n"; return 1; } @@ -841,15 +803,12 @@ static Standard_Integer buildsweep(Draw_Interpretor& di, // Calcul le resultat Sweep->Build(); if (!Sweep->IsDone()) { - //std::cout << "Buildsweep : Not Done" << std::endl; di << "Buildsweep : Not Done\n"; BRepBuilderAPI_PipeError Stat = Sweep->GetStatus(); if (Stat == BRepBuilderAPI_PlaneNotIntersectGuide) { - //std::cout << "Buildsweep : One Plane not intersect the guide" << std::endl; di << "Buildsweep : One Plane not intersect the guide\n"; } if (Stat == BRepBuilderAPI_ImpossibleContact) { - //std::cout << "BuildSweep : One section can not be in contact with the guide" << std::endl; di << "BuildSweep : One section can not be in contact with the guide\n"; } } @@ -857,7 +816,6 @@ static Standard_Integer buildsweep(Draw_Interpretor& di, if (mksolid) { Standard_Boolean B; B = Sweep->MakeSolid(); - //if (!B) std::cout << " BuildSweep : It is impossible to make a solid !" << std::endl; if (!B) di << " BuildSweep : It is impossible to make a solid !\n"; } result = Sweep->Shape(); @@ -903,13 +861,11 @@ static Standard_Integer simulsweep(Draw_Interpretor& di, if ((n != 3) && (n != 4)) return 1; if (Sweep == 0) { - //std::cout << "You have forgotten the <> command !"<< std::endl; di << "You have forgotten the <> command !\n"; return 1; } if (!Sweep->IsReady()) { - //std::cout << "You have forgotten the <> command !"<< std::endl; di << "You have forgotten the <> command !\n"; return 1; } diff --git a/src/BRepTest/BRepTest_TopologyCommands.cxx b/src/BRepTest/BRepTest_TopologyCommands.cxx index 6465b838bb..7016f9a71e 100644 --- a/src/BRepTest/BRepTest_TopologyCommands.cxx +++ b/src/BRepTest/BRepTest_TopologyCommands.cxx @@ -42,6 +42,7 @@ #include #include #include +#include #include #include @@ -118,7 +119,7 @@ static Standard_Integer section(Draw_Interpretor& , Standard_Integer n, const ch Sec.Approximation(Standard_True); else if (strcasecmp(a[i], "-p")) { - std::cout << "Unknown option: " << a[i] << std::endl; + Message::SendFail() << "Unknown option: " << a[i]; return 1; } } @@ -170,7 +171,6 @@ static Standard_Integer halfspace(Draw_Interpretor& di, if ( Face.IsNull()) { TopoDS_Shape Shell = DBRep::Get(a[2],TopAbs_SHELL); if (Shell.IsNull()) { - //std::cout << a[2] << " must be a face or a shell" << std::endl; di << a[2] << " must be a face or a shell\n"; return 1; } @@ -180,7 +180,6 @@ static Standard_Integer halfspace(Draw_Interpretor& di, DBRep::Set(a[1],Half.Solid()); } else { - //std::cout << " HalfSpace NotDone" << std::endl; di << " HalfSpace NotDone\n"; return 1; } @@ -192,7 +191,6 @@ static Standard_Integer halfspace(Draw_Interpretor& di, DBRep::Set(a[1],Half.Solid()); } else { - //std::cout << " HalfSpace NotDone" << std::endl; di << " HalfSpace NotDone\n"; return 1; } @@ -211,14 +209,12 @@ static Standard_Integer buildfaces(Draw_Interpretor& , Standard_Integer narg, co TopoDS_Shape InputShape(DBRep::Get( a[2] ,TopAbs_FACE)); TopoDS_Face F = TopoDS::Face(InputShape); -// TopoDS_Face F = TopoDS::Face(DBRep::Get(a[2],TopAbs_FACE)); BRepAlgo_FaceRestrictor FR; FR.Init(F); for (Standard_Integer i = 3 ; i < narg ; i++) { TopoDS_Shape InputWire(DBRep::Get(a[i],TopAbs_WIRE)); TopoDS_Wire W = TopoDS::Wire(InputWire); -// TopoDS_Wire W = TopoDS::Wire(DBRep::Get(a[i],TopAbs_WIRE)); FR.Add(W); } FR.Perform(); diff --git a/src/DDF/DDF_BrowserCommands.cxx b/src/DDF/DDF_BrowserCommands.cxx index e4c027bdd8..83e187fde1 100644 --- a/src/DDF/DDF_BrowserCommands.cxx +++ b/src/DDF/DDF_BrowserCommands.cxx @@ -23,6 +23,7 @@ #include #include #include +#include #include #include @@ -50,14 +51,14 @@ static Standard_Integer DFBrowse (Draw_Interpretor& di, { if (n<2) { - std::cout << "Use: " << a[0] << " document [brower_name]" << std::endl; + Message::SendFail() << "Use: " << a[0] << " document [brower_name]"; return 1; } Handle(TDF_Data) DF; if (!DDF::GetDF (a[1], DF)) { - std::cout << "Error: document " << a[1] << " is not found" << std::endl; + Message::SendFail() << "Error: document " << a[1] << " is not found"; return 1; } @@ -78,8 +79,8 @@ static Standard_Integer DFBrowse (Draw_Interpretor& di, } else { - std::cout << "Error: Could not load script " << aTclScript << std::endl; - std::cout << "Check environment variable CSF_DrawPluginDefaults" << std::endl; + Message::SendFail() << "Error: Could not load script " << aTclScript << "\n" + << "Check environment variable CSF_DrawPluginDefaults"; } // Call command dftree defined in dftree.tcl @@ -106,7 +107,7 @@ static Standard_Integer DFOpenLabel (Draw_Interpretor& di, Handle(DDF_Browser) browser = Handle(DDF_Browser)::DownCast (Draw::GetExisting (a[1])); if (browser.IsNull()) { - std::cout << "Syntax error: browser '" << a[1] << "' not found\n"; + Message::SendFail() << "Syntax error: browser '" << a[1] << "' not found"; return 1; } @@ -135,7 +136,7 @@ static Standard_Integer DFOpenAttributeList(Draw_Interpretor& di, Handle(DDF_Browser) browser = Handle(DDF_Browser)::DownCast (Draw::GetExisting (a[1])); if (browser.IsNull()) { - std::cout << "Syntax error: browser '" << a[1] << "' not found\n"; + Message::SendFail() << "Syntax error: browser '" << a[1] << "' not found"; return 1; } @@ -168,7 +169,7 @@ static Standard_Integer DFOpenAttribute (Draw_Interpretor& di, Handle(DDF_Browser) browser = Handle(DDF_Browser)::DownCast (Draw::GetExisting (a[1])); if (browser.IsNull()) { - std::cout << "Syntax error: browser '" << a[1] << "' not found\n"; + Message::SendFail() << "Syntax error: browser '" << a[1] << "' not found"; return 1; } diff --git a/src/DDataStd/DDataStd_BasicCommands.cxx b/src/DDataStd/DDataStd_BasicCommands.cxx index 36245edc0d..69476a3797 100644 --- a/src/DDataStd/DDataStd_BasicCommands.cxx +++ b/src/DDataStd/DDataStd_BasicCommands.cxx @@ -24,6 +24,7 @@ #include #include +#include #include #include @@ -614,7 +615,6 @@ static Standard_Integer DDataStd_GetIntArray (Draw_Interpretor& di, } for(Standard_Integer i = A->Lower(); i<=A->Upper(); i++){ - //std::cout << A->Value(i) << std::endl; di << A->Value(i); if(iUpper()) di<<" "; @@ -1425,7 +1425,7 @@ static Standard_Integer DDataStd_KeepUTF (Draw_Interpretor& di, #endif if (!anIS) { // Can not open file - std::cout << "Error: can't open file " << aFileName <SetValue(i, ival != 0); @@ -1856,7 +1856,7 @@ static Standard_Integer DDataStd_SetBooleanList (Draw_Interpretor& di, Standard_Integer ival = Draw::Atoi(arg[i]); if(ival > 1) { - std::cout << "Bad value = " << ival<< ". 0 or 1 is expected." << std::endl; + Message::SendFail() << "Bad value = " << ival<< ". 0 or 1 is expected."; return 1; } A->Append (ival != 0); @@ -2479,7 +2479,6 @@ static Standard_Integer DDataStd_GetByteArray (Draw_Interpretor& di, } for(Standard_Integer i = A->Lower(); i<=A->Upper(); i++){ - //std::cout << A->Value(i) << std::endl; di << A->Value(i); if(iUpper()) di<<" "; @@ -3242,7 +3241,7 @@ static Standard_Integer DDataStd_SetNDataIntAr2 (Draw_Interpretor& di, if(!aLabel.FindAttribute(TDataStd_NamedData::GetID(), anAtt)) anAtt = TDataStd_NamedData::Set(aLabel); if(anAtt.IsNull()) { - std::cout<< "NamedData attribute is not found or not set" << std::endl; + Message::SendFail() << "NamedData attribute is not found or not set"; return 1;} j = 15; @@ -3322,7 +3321,7 @@ static Standard_Integer DDataStd_GetAsciiString (Draw_Interpretor& di, } Handle(TDataStd_AsciiString) anAtt; if( !aLabel.FindAttribute(aGuid, anAtt) ) { - std::cout << "AsciiString attribute is not found or not set" << std::endl; + Message::SendFail() << "AsciiString attribute is not found or not set"; return 1; } @@ -3399,9 +3398,12 @@ static Standard_Integer DDataStd_GetNDIntegers (Draw_Interpretor& di, Handle(TDataStd_NamedData) anAtt; - if(!aLabel.FindAttribute(TDataStd_NamedData::GetID(), anAtt)) { - std::cout << "NamedData attribute is not found or not set" << std::endl; - return 1;} + if(!aLabel.FindAttribute(TDataStd_NamedData::GetID(), anAtt)) + { + Message::SendFail() << "NamedData attribute is not found or not set"; + return 1; + } + std::cout <LoadDeferredData(); @@ -3512,9 +3518,11 @@ static Standard_Integer DDataStd_GetNDReals (Draw_Interpretor& di, std::cout <LoadDeferredData(); const TDataStd_DataMapOfStringReal& aMap = anAtt->GetRealsContainer(); @@ -3547,15 +3555,17 @@ static Standard_Integer DDataStd_GetNDReal (Draw_Interpretor& di, Handle(TDataStd_NamedData) anAtt; - if(!aLabel.FindAttribute(TDataStd_NamedData::GetID(), anAtt)) { - std::cout << "NamedData attribute is not found or not set" << std::endl; - return 1;} + if(!aLabel.FindAttribute(TDataStd_NamedData::GetID(), anAtt)) + { + Message::SendFail() << "NamedData attribute is not found or not set"; + return 1; + } std::cout <LoadDeferredData(); @@ -3753,9 +3771,12 @@ static Standard_Integer DDataStd_GetNDBytes (Draw_Interpretor& di, Handle(TDataStd_NamedData) anAtt; - if(!aLabel.FindAttribute(TDataStd_NamedData::GetID(), anAtt)) { - std::cout << "NamedData attribute is not found or not set" << std::endl; - return 1;} + if (!aLabel.FindAttribute(TDataStd_NamedData::GetID(), anAtt)) + { + Message::SendFail() << "NamedData attribute is not found or not set"; + return 1; + } + std::cout < #include #include +#include #include #include #include @@ -350,7 +351,7 @@ static Standard_Integer DDataStd_OpenNode (Draw_Interpretor& di, Handle(DDataStd_TreeBrowser) browser = Handle(DDataStd_TreeBrowser)::DownCast (Draw::GetExisting (a[1])); if (browser.IsNull()) { - std::cout << "Syntax error: browser '" << a[1] << "' not found\n"; + Message::SendFail() << "Syntax error: browser '" << a[1] << "' not found"; return 1; } @@ -461,11 +462,9 @@ static Standard_Integer DDataStd_ChildNodeMore (Draw_Interpretor& di, const char** /*a*/) { if (cni.More()) { - //std::cout<<"TRUE"<Label(), entry); - //std::cout< #include #include +#include #include #include #include @@ -333,7 +334,7 @@ static Standard_Integer DNaming_AddBox (Draw_Interpretor& theDI, DDF::ReturnLabel(theDI, anObj->Label()); return 0; } - std::cout << "DNaming_AddBox : Error" << std::endl; + Message::SendFail() << "DNaming_AddBox : Error"; return 1; } @@ -385,7 +386,7 @@ static Standard_Integer DNaming_BoxDX (Draw_Interpretor& theDI, return 0; } } - std::cout << "DNaming_BoxDX : Error" << std::endl; + Message::SendFail() << "DNaming_BoxDX : Error"; return 1; } @@ -418,7 +419,7 @@ static Standard_Integer DNaming_BoxDY (Draw_Interpretor& theDI, return 0; } } - std::cout << "DNaming_BoxDY : Error" << std::endl; + Message::SendFail() << "DNaming_BoxDY : Error"; return 1; } @@ -451,7 +452,7 @@ static Standard_Integer DNaming_BoxDZ (Draw_Interpretor& theDI, return 0; } } - std::cout << "DNaming_BoxDZ : Error" << std::endl; + Message::SendFail() << "DNaming_BoxDZ : Error"; return 1; } @@ -525,7 +526,7 @@ static Standard_Integer DNaming_SolveFlatFrom (Draw_Interpretor& /*theDI*/, logbook->Clear(); Standard_Integer aRes = ComputeFunction(aFun, logbook); if(aRes != 0) { - std::cout << "DNaming_SolveFlatFrom: Driver failed at label = " << entry << std::endl; + Message::SendFail() << "DNaming_SolveFlatFrom: Driver failed at label = " << entry; return 1; } #ifdef OCCT_DEBUG @@ -539,7 +540,7 @@ static Standard_Integer DNaming_SolveFlatFrom (Draw_Interpretor& /*theDI*/, return 0; } ERR: - std::cout << "DNaming_SolveFlatFrom : Error" << std::endl; + Message::SendFail() << "DNaming_SolveFlatFrom : Error"; return 1; } @@ -569,7 +570,7 @@ static Standard_Integer DNaming_InitLogBook (Draw_Interpretor& /*theDI*/, } return 0; } - std::cout << "DNaming_InitLogBook : Error - No document ==> " < " << theNb; return 1; } @@ -600,7 +601,7 @@ static Standard_Integer DNaming_CheckLogBook (Draw_Interpretor& /*theDI*/, } return 0; } - std::cout << "DNaming_CheckLogBook : Error - No document ==> " < " << theNb; return 1; } @@ -625,17 +626,18 @@ static Standard_Integer DNaming_ComputeFun (Draw_Interpretor& /*theDI*/, if(!aFun.IsNull()) { Handle(TFunction_Logbook) logbook = TFunction_Logbook::Set(funLabel); Standard_Integer aRes = ComputeFunction(aFun, logbook); - if(aRes != 0) { - std::cout << "DNaming_ComputeFun : No Driver or Driver failed" << std::endl; - return 1; - } + if(aRes != 0) + { + Message::SendFail() << "DNaming_ComputeFun : No Driver or Driver failed"; + return 1; + } #ifdef OCCT_DEBUG std::cout <<"DNaming_ComputeFun : function from label " << theArg[2] << " is recomputed" << std::endl; #endif return 0; } } - std::cout << "DNaming_ComputeFun : Error" << std::endl; + Message::SendFail() << "DNaming_ComputeFun : Error"; return 1; } @@ -723,7 +725,7 @@ static Standard_Integer DNaming_AttachShape (Draw_Interpretor& di, } } //### } - std::cout << "DNaming_AttachShape : Error" << std::endl; + Message::SendFail() << "DNaming_AttachShape : Error"; return 1; } @@ -788,7 +790,7 @@ static Standard_Integer DNaming_XAttachShape (Draw_Interpretor& di, } } } - std::cout << "DNaming_XAttachShape : Error" << std::endl; + Message::SendFail() << "DNaming_XAttachShape : Error"; return 1; } @@ -829,7 +831,7 @@ static Standard_Integer DNaming_AddCylinder (Draw_Interpretor& theDI, DDF::ReturnLabel(theDI, anObj->Label()); return 0; } - std::cout << "DNaming_AddCylinder : Error" << std::endl; + Message::SendFail() << "DNaming_AddCylinder : Error"; return 1; } @@ -862,7 +864,7 @@ static Standard_Integer DNaming_CylRad (Draw_Interpretor& theDI, return 0; } } - std::cout << "DNaming_CylRadius : Error" << std::endl; + Message::SendFail() << "DNaming_CylRadius : Error"; return 1; } @@ -895,7 +897,7 @@ static Standard_Integer DNaming_CylRad (Draw_Interpretor& theDI, DDF::ReturnLabel(theDI, aFun->Label()); return 0; } - std::cout << "DModel_AddFuse : Error" << std::endl; + Message::SendFail() << "DModel_AddFuse : Error"; return 1; } @@ -929,7 +931,7 @@ static Standard_Integer DNaming_CylRad (Draw_Interpretor& theDI, DDF::ReturnLabel(theDI, aFun->Label()); return 0; } - std::cout << "DModel_AddCut : Error" << std::endl; + Message::SendFail() << "DModel_AddCut : Error"; return 1; } @@ -962,7 +964,7 @@ static Standard_Integer DNaming_CylRad (Draw_Interpretor& theDI, DDF::ReturnLabel(theDI, aFun->Label()); return 0; } - std::cout << "DModel_AddComm : Error" << std::endl; + Message::SendFail() << "DModel_AddComm : Error"; return 1; } @@ -994,7 +996,7 @@ static Standard_Integer DNaming_CylRad (Draw_Interpretor& theDI, DDF::ReturnLabel(theDI, aFun->Label()); return 0; } - std::cout << "DModel_AddSection : Error" << std::endl; + Message::SendFail() << "DModel_AddSection : Error"; return 1; } @@ -1007,7 +1009,7 @@ static Standard_Integer DNaming_AddFillet (Draw_Interpretor& theDI, const char** theArg) { if (theNb < 5) { - std::cout<<"DNaming_AddFillet(): Wrong number of arguments"<Label()); return 0; } - std::cout << "DNaming_Translate : Error" << std::endl; + Message::SendFail() << "DNaming_Translate : Error"; return 1; } //======================================================================= @@ -1118,7 +1120,7 @@ static Standard_Integer DNaming_PTranslateLine (Draw_Interpretor& di, DDF::ReturnLabel(di, aFun->Label()); return 0; } - std::cout << "DNaming_PTranslateAlongLine : Error" << std::endl; + Message::SendFail() << "DNaming_PTranslateAlongLine : Error"; return 1; } @@ -1157,7 +1159,7 @@ static Standard_Integer DNaming_PRotateLine(Draw_Interpretor& di, DDF::ReturnLabel(di, aFun->Label()); return 0; } - std::cout << "DNaming_PRotateRoundLine : Error" << std::endl; + Message::SendFail() << "DNaming_PRotateRoundLine : Error"; return 1; } @@ -1190,7 +1192,7 @@ static Standard_Integer DNaming_PMirrorObject(Draw_Interpretor& di, DDF::ReturnLabel(di, aFun->Label()); return 0; } - std::cout << "DNaming_PMirrorObject : Error" << std::endl; + Message::SendFail() << "DNaming_PMirrorObject : Error"; return 1; } //======================================================================= @@ -1202,7 +1204,7 @@ static Standard_Integer DNaming_AddPrism (Draw_Interpretor& theDI, const char** theArg) { if (theNb < 5 ) { - std::cout<<"DNaming_AddPrism(): Wrong number of arguments"<Label()); return 0; } - std::cout << "DNaming_AddPoint : Error" << std::endl; + + Message::SendFail() << "DNaming_AddPoint : Error"; return 1; } @@ -1504,7 +1507,8 @@ static Standard_Integer DNaming_AddPointRlt (Draw_Interpretor& theDI, DDF::ReturnLabel(theDI, anObj->Label()); return 0; } - std::cout << "DNaming_AddPoint : Error" << std::endl; + + Message::SendFail() << "DNaming_AddPoint : Error"; return 1; } @@ -1558,7 +1562,8 @@ static Standard_Integer DNaming_PntOffset (Draw_Interpretor& theDI, return 0; } } - std::cout << "DNaming_PntOffset : Error" << std::endl; + + Message::SendFail() << "DNaming_PntOffset : Error"; return 1; } @@ -1572,7 +1577,7 @@ static Standard_Integer DNaming_Line3D (Draw_Interpretor& theDI, const char** theArg) { if (theNb < 5) { - std::cout<<"DNaming_AddLine3D: Wrong number of arguments"<Printers()); - aPrinterIter.More(); aPrinterIter.Next()) - { - if (Handle(Message_PrinterOStream) aPrinter = Handle(Message_PrinterOStream)::DownCast (aPrinterIter.Value())) - { - aPrinter->SetToColorize (Standard_False); - } - } + theCommands.SetToColorize (Standard_False); } ReadInitFile (aRunFile); // provide a clean exit, this is useful for some analysis tools @@ -637,7 +630,15 @@ Standard_Boolean Draw_Interprete(const char* com) if (*theCommands.Result()) { + if (c > 0 && theCommands.ToColorize()) + { + Message_PrinterOStream::SetConsoleTextColor (&std::cout, Message_ConsoleColor_Red, true); + } std::cout << theCommands.Result() << std::endl; + if (c > 0 && theCommands.ToColorize()) + { + Message_PrinterOStream::SetConsoleTextColor (&std::cout, Message_ConsoleColor_Default, false); + } } if (Draw_Chrono && hadchrono) { diff --git a/src/Draw/Draw_BasicCommands.cxx b/src/Draw/Draw_BasicCommands.cxx index c2ef187bb0..98d793a8ab 100644 --- a/src/Draw/Draw_BasicCommands.cxx +++ b/src/Draw/Draw_BasicCommands.cxx @@ -259,9 +259,9 @@ static Standard_Integer dlog(Draw_Interpretor& di, Standard_Integer n, const cha { if (n != 2 && n != 3) { - std::cout << "Enable or disable logging: " << a[0] << " {on|off}" << std::endl; - std::cout << "Reset log: " << a[0] << " reset" << std::endl; - std::cout << "Get log content: " << a[0] << " get" << std::endl; + Message::SendFail() << "Enable or disable logging: " << a[0] << " {on|off}\n" + << "Reset log: " << a[0] << " reset\n" + << "Get log content: " << a[0] << " get"; return 1; } @@ -292,7 +292,7 @@ static Standard_Integer dlog(Draw_Interpretor& di, Standard_Integer n, const cha di << (di.GetDoLog() ? "on" : "off"); } else { - std::cout << "Unrecognized option(s): " << a[1] << std::endl; + Message::SendFail() << "Unrecognized option(s): " << a[1]; return 1; } return 0; @@ -302,7 +302,7 @@ static Standard_Integer decho(Draw_Interpretor& di, Standard_Integer n, const ch { if (n != 2) { - std::cout << "Enable or disable echoing: " << a[0] << " {on|off}" << std::endl; + Message::SendFail() << "Enable or disable echoing: " << a[0] << " {on|off}"; return 1; } @@ -315,7 +315,7 @@ static Standard_Integer decho(Draw_Interpretor& di, Standard_Integer n, const ch di.SetDoEcho (Standard_False); } else { - std::cout << "Unrecognized option: " << a[1] << std::endl; + Message::SendFail() << "Unrecognized option: " << a[1]; return 1; } return 0; @@ -762,7 +762,7 @@ static int dlocale (Draw_Interpretor& di, Standard_Integer n, const char** argv) else if ( ! strcmp (cat, "LC_TIME") ) category = LC_TIME; else { - std::cout << "Error: cannot recognize argument " << cat << " as one of LC_ macros" << std::endl; + Message::SendFail() << "Error: cannot recognize argument " << cat << " as one of LC_ macros"; return 1; } } @@ -884,7 +884,7 @@ static int dparallel (Draw_Interpretor& theDI, const Standard_Integer aVal = Draw::Atoi (theArgVec[++anIter]); if (aVal <= 0 || aVal > aDefPool->NbThreads()) { - std::cout << "Syntax error: maximum number of threads to use should be <= of threads in the pool\n"; + Message::SendFail() << "Syntax error: maximum number of threads to use should be <= of threads in the pool"; return 1; } aDefPool->SetNbDefaultThreadsToLaunch (aVal); @@ -915,7 +915,7 @@ static int dparallel (Draw_Interpretor& theDI, } else { - std::cout << "Syntax error: unknown argument '" << anArg << "'\n"; + Message::SendFail() << "Syntax error: unknown argument '" << anArg << "'"; return 1; } } @@ -989,7 +989,7 @@ static int dsetsignal (Draw_Interpretor& theDI, Standard_Integer theArgNb, const } else { - std::cout << "Syntax error: unknown argument '" << anArg << "'\n"; + Message::SendFail() << "Syntax error: unknown argument '" << anArg << "'"; return 1; } } @@ -1023,7 +1023,7 @@ static int dtracelevel (Draw_Interpretor& theDI, Message_Gravity aLevel = Message_Info; if (theArgNb < 1 || theArgNb > 2) { - std::cout << "Error: wrong number of arguments! See usage:\n"; + Message::SendFail() << "Error: wrong number of arguments! See usage:"; theDI.PrintHelp (theArgVec[0]); return 1; } @@ -1054,7 +1054,7 @@ static int dtracelevel (Draw_Interpretor& theDI, } else { - std::cout << "Error: unknown gravity '" << theArgVec[1] << "'!\n"; + Message::SendFail() << "Error: unknown gravity '" << theArgVec[1] << "'"; return 1; } } @@ -1062,14 +1062,14 @@ static int dtracelevel (Draw_Interpretor& theDI, Handle(Message_Messenger) aMessenger = Message::DefaultMessenger(); if (aMessenger.IsNull()) { - std::cout << "Error: default messenger is unavailable!\n"; + Message::SendFail() << "Error: default messenger is unavailable"; return 1; } Message_SequenceOfPrinters& aPrinters = aMessenger->ChangePrinters(); if (aPrinters.Length() < 1) { - std::cout << "Error: no printers registered in default Messenger!\n"; + Message::SendFail() << "Error: no printers registered in default Messenger"; return 0; } @@ -1108,7 +1108,7 @@ static int dtracelevel (Draw_Interpretor& theDI, //function : dputs //purpose : //============================================================================== -static int dputs (Draw_Interpretor& , +static int dputs (Draw_Interpretor& theDI, Standard_Integer theArgNb, const char** theArgVec) { @@ -1169,6 +1169,11 @@ static int dputs (Draw_Interpretor& , } else if (anArgIter + 1 == theArgNb) { + if (!theDI.ToColorize()) + { + toIntense = false; + aColor = Message_ConsoleColor_Default; + } if (toIntense || aColor != Message_ConsoleColor_Default) { Message_PrinterOStream::SetConsoleTextColor (aStream, aColor, toIntense); diff --git a/src/Draw/Draw_GraphicCommands.cxx b/src/Draw/Draw_GraphicCommands.cxx index 4a0aa4c89d..d7b7b1b9cf 100644 --- a/src/Draw/Draw_GraphicCommands.cxx +++ b/src/Draw/Draw_GraphicCommands.cxx @@ -25,6 +25,7 @@ #include #include #include +#include #include #include @@ -195,12 +196,12 @@ static Standard_Integer wzoom(Draw_Interpretor& di, Standard_Integer argc, const id = atoi(argv[1]); if ((id < 0) || (id >= MAXVIEW)) { - std::cout << "Incorrect view-id, must be in 0.."< + #include +#include +#include +#include +#include +#include +#include #include #include #include #include - #include #include -#include -#include -#include -#include #include #include @@ -114,8 +116,7 @@ namespace { static Standard_Integer CommandCmd (ClientData theClientData, Tcl_Interp* interp, Standard_Integer argc, const char* argv[]) { - static Standard_Integer code; - code = TCL_OK; + Standard_Integer code = TCL_OK; Draw_Interpretor::CallBackData* aCallback = (Draw_Interpretor::CallBackData* )theClientData; Draw_Interpretor& di = *(aCallback->myDI); @@ -143,24 +144,26 @@ static Standard_Integer CommandCmd (ClientData theClientData, Tcl_Interp* interp dumpArgs (std::cout, argc, argv); // run command - try { + try + { OCC_CATCH_SIGNALS // get exception if control-break has been pressed OSD::ControlBreak(); - // OCC680: Transfer UTF-8 directly to OCC commands without locale usage - Standard_Integer fres = aCallback->Invoke ( di, argc, argv /*anArgs.GetArgv()*/ ); - if (fres != 0) + if (fres != 0) + { code = TCL_ERROR; + } } - catch (Standard_Failure const& anException) { + catch (Standard_Failure const& anException) + { // fail if Draw_ExitOnCatch is set - std::cout << "An exception was caught " << anException << std::endl; const char* toExitOnCatch = Tcl_GetVar (interp, "Draw_ExitOnCatch", TCL_GLOBAL_ONLY); if (toExitOnCatch != NULL && Draw::Atoi (toExitOnCatch)) { + Message::SendFail() << "An exception was caught " << anException; #ifdef _WIN32 Tcl_Exit(0); #else @@ -168,18 +171,17 @@ static Standard_Integer CommandCmd (ClientData theClientData, Tcl_Interp* interp #endif } - // get the error message Standard_SStream ss; - ss << "** Exception ** " << anException << std::ends; + ss << "An exception was caught " << anException << std::ends; Tcl_SetResult(interp,(char*)(ss.str().c_str()),TCL_VOLATILE); code = TCL_ERROR; } catch (std::exception const& theStdException) { - std::cout << "An exception was caught " << theStdException.what() << " [" << typeid(theStdException).name() << "]" << std::endl; const char* toExitOnCatch = Tcl_GetVar (interp, "Draw_ExitOnCatch", TCL_GLOBAL_ONLY); if (toExitOnCatch != NULL && Draw::Atoi (toExitOnCatch)) { + Message::SendFail() << "An exception was caught " << theStdException.what() << " [" << typeid(theStdException).name() << "]"; #ifdef _WIN32 Tcl_Exit (0); #else @@ -187,18 +189,17 @@ static Standard_Integer CommandCmd (ClientData theClientData, Tcl_Interp* interp #endif } - // get the error message Standard_SStream ss; - ss << "** Exception ** " << theStdException.what() << " [" << typeid(theStdException).name() << "]" << std::ends; - Tcl_SetResult (interp, (char*)(ss.str().c_str()), TCL_VOLATILE); + ss << "An exception was caught " << theStdException.what() << " [" << typeid(theStdException).name() << "]" << std::ends; + Tcl_SetResult(interp,(char*)(ss.str().c_str()),TCL_VOLATILE); code = TCL_ERROR; } catch (...) { - std::cout << "UNKNOWN exception was caught " << std::endl; const char* toExitOnCatch = Tcl_GetVar (interp, "Draw_ExitOnCatch", TCL_GLOBAL_ONLY); if (toExitOnCatch != NULL && Draw::Atoi (toExitOnCatch)) { + Message::SendFail() << "UNKNOWN exception was caught "; #ifdef _WIN32 Tcl_Exit (0); #else @@ -206,10 +207,9 @@ static Standard_Integer CommandCmd (ClientData theClientData, Tcl_Interp* interp #endif } - // get the error message Standard_SStream ss; - ss << "** Exception ** UNKNOWN" << std::ends; - Tcl_SetResult (interp, (char* )(ss.str().c_str()), TCL_VOLATILE); + ss << "UNKNOWN exception was caught " << std::ends; + Tcl_SetResult(interp,(char*)(ss.str().c_str()),TCL_VOLATILE); code = TCL_ERROR; } @@ -244,15 +244,34 @@ static void CommandDelete (ClientData theClientData) //======================================================================= //function : Draw_Interpretor -//purpose : +//purpose : //======================================================================= - -Draw_Interpretor::Draw_Interpretor() : - isAllocated(Standard_False), myDoLog(Standard_False), myDoEcho(Standard_False), myFDLog(-1) +Draw_Interpretor::Draw_Interpretor() +: // the tcl interpreter is not created immediately as it is kept + // by a global variable and created and deleted before the main() + myInterp (NULL), + isAllocated (Standard_False), + myDoLog (Standard_False), + myDoEcho (Standard_False), + myToColorize (Standard_True), + myFDLog (-1) { -// The tcl interpreter is not created immediately as it is kept -// by a global variable and created and deleted before the main(). - myInterp = NULL; + // +} + +//======================================================================= +//function : Draw_Interpretor +//purpose : +//======================================================================= +Draw_Interpretor::Draw_Interpretor (const Draw_PInterp& theInterp) +: myInterp (theInterp), + isAllocated (Standard_False), + myDoLog (Standard_False), + myDoEcho (Standard_False), + myToColorize (Standard_True), + myFDLog (-1) +{ + // } //======================================================================= @@ -269,17 +288,20 @@ void Draw_Interpretor::Init() } //======================================================================= -//function : Draw_Interpretor -//purpose : +//function : SetToColorize +//purpose : //======================================================================= - -Draw_Interpretor::Draw_Interpretor(const Draw_PInterp& p) : - isAllocated(Standard_False), - myInterp(p), - myDoLog(Standard_False), - myDoEcho(Standard_False), - myFDLog(-1) +void Draw_Interpretor::SetToColorize (Standard_Boolean theToColorize) { + myToColorize = theToColorize; + for (Message_SequenceOfPrinters::Iterator aPrinterIter (Message::DefaultMessenger()->Printers()); + aPrinterIter.More(); aPrinterIter.Next()) + { + if (Handle(Message_PrinterOStream) aPrinter = Handle(Message_PrinterOStream)::DownCast (aPrinterIter.Value())) + { + aPrinter->SetToColorize (Standard_False); + } + } } //======================================================================= diff --git a/src/Draw/Draw_Interpretor.hxx b/src/Draw/Draw_Interpretor.hxx index 579f6f94f8..aa707f971d 100644 --- a/src/Draw/Draw_Interpretor.hxx +++ b/src/Draw/Draw_Interpretor.hxx @@ -251,6 +251,12 @@ public: //! Returns current value of the log file descriptor Standard_Integer GetLogFileDescriptor() { return myFDLog; } + //! Return TRUE if console output should be colorized; TRUE by default. + Standard_Boolean ToColorize() const { return myToColorize; } + + //! Set if console output should be colorized. + Standard_EXPORT void SetToColorize (Standard_Boolean theToColorize); + protected: Standard_EXPORT void add (Standard_CString theCommandName, @@ -261,10 +267,11 @@ protected: private: - Standard_Boolean isAllocated; Draw_PInterp myInterp; + Standard_Boolean isAllocated; Standard_Boolean myDoLog; Standard_Boolean myDoEcho; + Standard_Boolean myToColorize; Standard_Integer myFDLog; //!< file descriptor of log file public: diff --git a/src/Draw/Draw_PloadCommands.cxx b/src/Draw/Draw_PloadCommands.cxx index 0f99a9709b..e34b9167f9 100644 --- a/src/Draw/Draw_PloadCommands.cxx +++ b/src/Draw/Draw_PloadCommands.cxx @@ -258,7 +258,7 @@ static Standard_Integer dtryload (Draw_Interpretor& di, Standard_Integer n, cons { if (n != 2) { - std::cout << "Error: specify path to library to be loaded" << std::endl; + Message::SendFail() << "Error: specify path to library to be loaded"; return 1; } diff --git a/src/Draw/Draw_VariableCommands.cxx b/src/Draw/Draw_VariableCommands.cxx index f7ea808496..9b50b2cd11 100644 --- a/src/Draw/Draw_VariableCommands.cxx +++ b/src/Draw/Draw_VariableCommands.cxx @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -388,7 +389,7 @@ static Standard_Integer draw(Draw_Interpretor& , Standard_Integer n, const char* if (n < 3) return 1; Standard_Integer id = Draw::Atoi(a[1]); if (!dout.HasView(id)) { - std::cout << "bad view number in draw"< #include #include +#include #include #include #include @@ -90,7 +91,7 @@ static Standard_Integer proj (Draw_Interpretor& di, Standard_Integer n, const ch { if ( n < 5) { - std::cout << " Use proj curve/surf x y z [{extrema algo: g(grad)/t(tree)}|{u v}]" << std::endl; + Message::SendFail() << " Use proj curve/surf x y z [{extrema algo: g(grad)/t(tree)}|{u v}]"; return 1; } diff --git a/src/GeometryTest/GeometryTest_ContinuityCommands.cxx b/src/GeometryTest/GeometryTest_ContinuityCommands.cxx index 0cf62d6790..36782bb2d9 100644 --- a/src/GeometryTest/GeometryTest_ContinuityCommands.cxx +++ b/src/GeometryTest/GeometryTest_ContinuityCommands.cxx @@ -27,6 +27,7 @@ #include #include #include +#include /*********************************************************************************/ void InitEpsSurf(Standard_Real& epsnl,Standard_Real& epsdis, Standard_Real& epsangk1, @@ -106,7 +107,7 @@ static Standard_Integer surfaceCcontinuity (Draw_Interpretor& di, Standard_Integ Standard_FALLTHROUGH case 8 : break; default : - std::cerr << "Error: invalid number of arguments: expected to get 8 - 10 parameters" << std::endl; + Message::SendFail() << "Error: invalid number of arguments: expected to get 8 - 10 parameters"; return 1; } } @@ -125,7 +126,7 @@ static Standard_Integer surfaceCcontinuity (Draw_Interpretor& di, Standard_Integ Standard_FALLTHROUGH case 8 : break; default : - std::cerr << "Error: invalid number of arguments: expected to get 8 - 11 parameters" << std::endl; + Message::SendFail() << "Error: invalid number of arguments: expected to get 8 - 11 parameters"; return 1; } } @@ -146,13 +147,13 @@ static Standard_Integer surfaceCcontinuity (Draw_Interpretor& di, Standard_Integ Standard_FALLTHROUGH case 8 : break; default : - std::cerr << "Error: invalid number of arguments: expected to get 8 - 12 parameters" << std::endl; + Message::SendFail() << "Error: invalid number of arguments: expected to get 8 - 12 parameters"; return 1; } } break; default: - std::cerr << "Error: invalid value of parameter 1 (" << a[1] << "): should be 0, 1, or 2" << std::endl; + Message::SendFail() << "Error: invalid value of parameter 1 (" << a[1] << "): should be 0, 1, or 2"; return 1; } @@ -217,7 +218,7 @@ static Standard_Integer surfaceGcontinuity (Draw_Interpretor& di, Standard_Integ Standard_FALLTHROUGH case 8 : break; default : - std::cerr << "Error: invalid number of arguments: expected to get 8 - 11 parameters" << std::endl; + Message::SendFail() << "Error: invalid number of arguments: expected to get 8 - 11 parameters"; return 1; } } @@ -240,13 +241,13 @@ static Standard_Integer surfaceGcontinuity (Draw_Interpretor& di, Standard_Integ Standard_FALLTHROUGH case 8 : break; default : - std::cerr << "Error: invalid number of arguments: expected to get 8 - 13 parameters" << std::endl; + Message::SendFail() << "Error: invalid number of arguments: expected to get 8 - 13 parameters"; return 1; } } break; default: - std::cerr << "Error: invalid value of parameter 1 (" << a[1] << "): should be 1 or 2" << std::endl; + Message::SendFail() << "Error: invalid value of parameter 1 (" << a[1] << "): should be 1 or 2"; return 1; } @@ -306,7 +307,7 @@ static Standard_Integer curveGcontinuity(Draw_Interpretor& di, Standard_Integer Standard_FALLTHROUGH case 6 : break; default : - std::cerr << "Error: invalid number of arguments: expected to get 6 - 8 parameters" << std::endl; + Message::SendFail() << "Error: invalid number of arguments: expected to get 6 - 8 parameters"; return 1; } } @@ -330,14 +331,14 @@ static Standard_Integer curveGcontinuity(Draw_Interpretor& di, Standard_Integer Standard_FALLTHROUGH case 6 : break; default : - std::cerr << "Error: invalid number of arguments: expected to get 6 - 12 parameters" << std::endl; + Message::SendFail() << "Error: invalid number of arguments: expected to get 6 - 12 parameters"; return 1; } } break; default: - std::cerr << "Error: invalid value of parameter 1 (" << a[1] << "): should be 1 or 2" << std::endl; + Message::SendFail() << "Error: invalid value of parameter 1 (" << a[1] << "): should be 1 or 2"; return 1; } @@ -395,7 +396,7 @@ static Standard_Integer curveCcontinuity(Draw_Interpretor& di, Standard_Integer Standard_FALLTHROUGH case 6 : break; default : - std::cerr << "Error: invalid number of arguments: expected to get 6 - 8 parameters" << std::endl; + Message::SendFail() << "Error: invalid number of arguments: expected to get 6 - 8 parameters"; return 1; } } @@ -413,7 +414,7 @@ static Standard_Integer curveCcontinuity(Draw_Interpretor& di, Standard_Integer Standard_FALLTHROUGH case 6 : break; default : - std::cerr << "Error: invalid number of arguments: expected to get 6 - 9 parameters" << std::endl; + Message::SendFail() << "Error: invalid number of arguments: expected to get 6 - 9 parameters"; return 1; } } @@ -434,14 +435,14 @@ static Standard_Integer curveCcontinuity(Draw_Interpretor& di, Standard_Integer Standard_FALLTHROUGH case 6 : break; default : - std::cerr << "Error: invalid number of arguments: expected to get 6 - 10 parameters" << std::endl; + Message::SendFail() << "Error: invalid number of arguments: expected to get 6 - 10 parameters"; return 1; } } break; default: - std::cerr << "Error: invalid value of parameter 1 (" << a[1] << "): should be 0, 1, or 2" << std::endl; + Message::SendFail() << "Error: invalid value of parameter 1 (" << a[1] << "): should be 0, 1, or 2"; return 1; } diff --git a/src/GeometryTest/GeometryTest_CurveCommands.cxx b/src/GeometryTest/GeometryTest_CurveCommands.cxx index 3aa06fb96d..4a48303eca 100644 --- a/src/GeometryTest/GeometryTest_CurveCommands.cxx +++ b/src/GeometryTest/GeometryTest_CurveCommands.cxx @@ -98,7 +98,7 @@ #include #include #include - +#include #include @@ -944,7 +944,7 @@ static Standard_Integer crvpoints (Draw_Interpretor& di, Standard_Integer /*n*/, TopoDS_Wire aWire = TopoDS::Wire(DBRep::Get(a[2], TopAbs_WIRE)); if (aWire.IsNull()) { - std::cout << "cannot evaluate the argument " << a[2] << " as a curve" << std::endl; + Message::SendFail() << "cannot evaluate the argument " << a[2] << " as a curve"; return 1; } BRepAdaptor_CompCurve aCompCurve(aWire); @@ -1018,7 +1018,7 @@ static Standard_Integer crvtpoints (Draw_Interpretor& di, Standard_Integer n, co TopoDS_Wire aWire = TopoDS::Wire(DBRep::Get(a[2], TopAbs_WIRE)); if (aWire.IsNull()) { - std::cout << "cannot evaluate the argument " << a[2] << " as a curve" << std::endl; + Message::SendFail() << "cannot evaluate the argument " << a[2] << " as a curve"; return 1; } BRepAdaptor_CompCurve aCompCurve(aWire); diff --git a/src/GeometryTest/GeometryTest_CurveTanCommands.cxx b/src/GeometryTest/GeometryTest_CurveTanCommands.cxx index 5871aeb0d4..3a0205c420 100644 --- a/src/GeometryTest/GeometryTest_CurveTanCommands.cxx +++ b/src/GeometryTest/GeometryTest_CurveTanCommands.cxx @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -37,7 +38,7 @@ static Standard_Integer qcurve (Draw_Interpretor&, Standard_Integer theArgsNb, c { if (theArgsNb < 5) { - std::cout << "Error: wrong number of arguments.\n"; + Message::SendFail() << "Error: wrong number of argument"; return 1; } @@ -61,7 +62,7 @@ static Standard_Integer qcurve (Draw_Interpretor&, Standard_Integer theArgsNb, c { if (theArgsNb < 6) { - std::cout << "Error: wrong number of arguments.\n"; + Message::SendFail() << "Error: wrong number of arguments"; return 1; } aResult2d = new Geom2d_Line (gp_Pnt2d (Draw::Atof (theArgVec[2]), Draw::Atof (theArgVec[3])), @@ -71,7 +72,7 @@ static Standard_Integer qcurve (Draw_Interpretor&, Standard_Integer theArgsNb, c } else { - std::cout << "Error: wrong command name.\n"; + Message::SendFail() << "Error: wrong command name"; return 1; } @@ -95,7 +96,7 @@ static Standard_Integer solutions (Draw_Interpretor& theDI, GccAna_Circ2d3Tan& t { if (!theCirTan3.IsDone()) { - std::cout << "GccAna_Circ2d3Tan is not done"; + Message::SendFail() << "GccAna_Circ2d3Tan is not done"; return 1; } @@ -159,7 +160,7 @@ static Standard_Integer circ2d3Tan (Draw_Interpretor& theDI, Standard_Integer th { if (theArgsNb < 5) { - std::cout << "Error: wrong number of arguments.\n"; + Message::SendFail() << "Error: wrong number of arguments"; return 1; } @@ -183,7 +184,7 @@ static Standard_Integer circ2d3Tan (Draw_Interpretor& theDI, Standard_Integer th { if (!anIsPoint1 || !anIsPoint2 || !anIsPoint3) { - std::cout << "Error: wrong points definition.\n"; + Message::SendFail() << "Error: wrong points definition"; return 1; } GccAna_Circ2d3Tan aCircBuilder (aPoint1, aPoint2, aPoint3, aTolerance); @@ -195,7 +196,7 @@ static Standard_Integer circ2d3Tan (Draw_Interpretor& theDI, Standard_Integer th { if (!anIsPoint2 || !anIsPoint3) { - std::cout << "Error: wrong points definition.\n"; + Message::SendFail() << "Error: wrong points definition"; return 1; } Geom2dAdaptor_Curve anAdaptorCurve1 (aQCurve1->GetCurve()); @@ -211,7 +212,7 @@ static Standard_Integer circ2d3Tan (Draw_Interpretor& theDI, Standard_Integer th GccAna_Circ2d3Tan aCircBuilder (aQualifiedLin1, aPoint2, aPoint3, aTolerance); return solutions (theDI, aCircBuilder, theArgVec[1]); } - std::cout << "Error: wrong curve type.\n"; + Message::SendFail() << "Error: wrong curve type"; return 1; } @@ -220,7 +221,7 @@ static Standard_Integer circ2d3Tan (Draw_Interpretor& theDI, Standard_Integer th { if (!anIsPoint3) { - std::cout << "Error: wrong point definition.\n"; + Message::SendFail() << "Error: wrong point definition"; return 1; } Geom2dAdaptor_Curve anAdaptorCurve1 (aQCurve1->GetCurve()); @@ -246,7 +247,7 @@ static Standard_Integer circ2d3Tan (Draw_Interpretor& theDI, Standard_Integer th GccAna_Circ2d3Tan aCircBuilder (aQualifiedLin1, aQualifiedLin2, aPoint3, aTolerance); return solutions (theDI, aCircBuilder, theArgVec[1]); } - std::cout << "Error: wrong curve type.\n"; + Message::SendFail() << "Error: wrong curve type"; return 1; } @@ -292,7 +293,7 @@ static Standard_Integer circ2d3Tan (Draw_Interpretor& theDI, Standard_Integer th return solutions (theDI, aCircBuilder, theArgVec[1]); } - std::cout << "Error: wrong curve type.\n"; + Message::SendFail() << "Error: wrong curve type"; return 1; } diff --git a/src/GeomliteTest/GeomliteTest_API2dCommands.cxx b/src/GeomliteTest/GeomliteTest_API2dCommands.cxx index 8c0a304954..a0a69ca9e5 100644 --- a/src/GeomliteTest/GeomliteTest_API2dCommands.cxx +++ b/src/GeomliteTest/GeomliteTest_API2dCommands.cxx @@ -45,8 +45,9 @@ #include #include #include -#include +#include +#include #include #ifdef _WIN32 Standard_IMPORT Draw_Viewer dout; @@ -442,7 +443,7 @@ static Standard_Integer intersect_ana(Draw_Interpretor& di, Standard_Integer n, { if (n < 2) { - std::cout << "2dintana circle circle " << std::endl; + Message::SendFail() << "2dintana circle circle"; return 1; } @@ -483,21 +484,21 @@ static Standard_Integer intconcon(Draw_Interpretor& di, Standard_Integer n, cons { if( n < 2) { - std::cout<< "intconcon con1 con2 "< #include #include +#include #ifdef _MSC_VER #include @@ -143,7 +144,7 @@ static Standard_Integer setweight(Draw_Interpretor& /*di*/, Standard_Integer n, { if (n < 4 || n > 5) { - std::cout << "Wrong parameters" << std::endl; + Message::SendFail() << "Syntax error: Wrong parameters"; return 1; } @@ -183,7 +184,7 @@ static Standard_Integer setweight(Draw_Interpretor& /*di*/, Standard_Integer n, Handle(Geom_BezierSurface) aBezSurf = DrawTrSurf::GetBezierSurface(a[1]); if (n != 5 && (!aBSplSurf.IsNull() || !aBezSurf.IsNull())) { - std::cout << "Incorrect parameters" << std::endl; + Message::SendFail() << "Syntax error: Incorrect parameters"; return 1; } @@ -199,7 +200,7 @@ static Standard_Integer setweight(Draw_Interpretor& /*di*/, Standard_Integer n, return 0; } - std::cout << a[1] << " is not a B-spline nor a Bezier curve/surface" << std::endl; + Message::SendFail() << a[1] << " is not a B-spline nor a Bezier curve/surface"; return 1; } diff --git a/src/GeomliteTest/GeomliteTest_SurfaceCommands.cxx b/src/GeomliteTest/GeomliteTest_SurfaceCommands.cxx index 8e76d21fed..be942fb046 100644 --- a/src/GeomliteTest/GeomliteTest_SurfaceCommands.cxx +++ b/src/GeomliteTest/GeomliteTest_SurfaceCommands.cxx @@ -81,6 +81,7 @@ #include #include #include +#include #include #ifdef _WIN32 @@ -1381,14 +1382,14 @@ static Standard_Integer compBsplSur (Draw_Interpretor& , Standard_Integer n, con { if (n < 2) { - std::cout<<"Invalid number of parameters"< #include #include +#include #include #include #include @@ -217,7 +218,7 @@ static Standard_Integer tessellate (Draw_Interpretor& /*di*/, Standard_Integer n { if (nbarg != 5) { - std::cerr << "Builds regular triangulation with specified number of triangles\n" + Message::SendFail() << "Builds regular triangulation with specified number of triangles\n" " Usage: tessellate result {surface|face} nbu nbv\n" " Triangulation is put into the face with natural bounds (result);\n" " it will have 2*nbu*nbv triangles and (nbu+1)*(nbv+1) nodes"; @@ -231,7 +232,7 @@ static Standard_Integer tessellate (Draw_Interpretor& /*di*/, Standard_Integer n if (aNbU <= 0 || aNbV <= 0) { - std::cerr << "Error: Arguments nbu and nbv must be both greater than 0\n"; + Message::SendFail() << "Error: Arguments nbu and nbv must be both greater than 0"; return 1; } @@ -246,14 +247,14 @@ static Standard_Integer tessellate (Draw_Interpretor& /*di*/, Standard_Integer n TopoDS_Shape aShape = DBRep::Get(aSrcName); if (aShape.IsNull() || aShape.ShapeType() != TopAbs_FACE) { - std::cerr << "Error: " << aSrcName << " is not a face\n"; + Message::SendFail() << "Error: " << aSrcName << " is not a face"; return 1; } TopoDS_Face aFace = TopoDS::Face (aShape); aSurf = BRep_Tool::Surface (aFace); if (aSurf.IsNull()) { - std::cerr << "Error: Face " << aSrcName << " has no surface\n"; + Message::SendFail() << "Error: Face " << aSrcName << " has no surface"; return 1; } @@ -262,14 +263,14 @@ static Standard_Integer tessellate (Draw_Interpretor& /*di*/, Standard_Integer n if (Precision::IsInfinite (aUMin) || Precision::IsInfinite (aUMax) || Precision::IsInfinite (aVMin) || Precision::IsInfinite (aVMax)) { - std::cerr << "Error: surface has infinite parametric range, aborting\n"; + Message::SendFail() << "Error: surface has infinite parametric range, aborting"; return 1; } BRepBuilderAPI_MakeFace aFaceMaker (aSurf, aUMin, aUMax, aVMin, aVMax, Precision::Confusion()); if (! aFaceMaker.IsDone()) { - std::cerr << "Error: cannot build face with natural bounds, aborting\n"; + Message::SendFail() << "Error: cannot build face with natural bounds, aborting"; return 1; } TopoDS_Face aFace = aFaceMaker; diff --git a/src/SWDRAW/SWDRAW_ShapeFix.cxx b/src/SWDRAW/SWDRAW_ShapeFix.cxx index faf0c01dff..5a79e2e1a6 100644 --- a/src/SWDRAW/SWDRAW_ShapeFix.cxx +++ b/src/SWDRAW/SWDRAW_ShapeFix.cxx @@ -643,7 +643,7 @@ Standard_Integer fixsmallfaces (Draw_Interpretor& theDI, Standard_Integer theArg { if (theArgc < 3) { - std::cerr << "Use: " << theArgv[0] << " result shape [tolerance]" << std::endl; + theDI << "Use: " << theArgv[0] << " result shape [tolerance]"; return 1; } diff --git a/src/SWDRAW/SWDRAW_ShapeUpgrade.cxx b/src/SWDRAW/SWDRAW_ShapeUpgrade.cxx index 291728bb85..5deb94b018 100644 --- a/src/SWDRAW/SWDRAW_ShapeUpgrade.cxx +++ b/src/SWDRAW/SWDRAW_ShapeUpgrade.cxx @@ -36,6 +36,7 @@ #include #include #include +#include #include #include #include @@ -1401,14 +1402,14 @@ static Standard_Integer reshape(Draw_Interpretor& /*theDI*/, { if ( theArgc < 4 ) { - std::cout << "Error: wrong number of arguments. Type 'help " << theArgv[0] << "'\n"; + Message::SendFail() << "Error: wrong number of arguments. Type 'help " << theArgv[0] << "'"; return 1; } TopoDS_Shape aSource = DBRep::Get(theArgv[2]); if ( aSource.IsNull() ) { - std::cout << "Error: source shape ('" << theArgv[2] << "') is null\n"; + Message::SendFail() << "Error: source shape ('" << theArgv[2] << "') is null"; return 1; } @@ -1427,21 +1428,21 @@ static Standard_Integer reshape(Draw_Interpretor& /*theDI*/, { if ( theArgc - i < 3 ) { - std::cout << "Error: not enough arguments for replacement\n"; + Message::SendFail() << "Error: not enough arguments for replacement"; return 1; } TopoDS_Shape aWhat = DBRep::Get(theArgv[++i]); if ( aWhat.IsNull() ) { - std::cout << "Error: argument shape ('" << theArgv[i] << "') is null\n"; + Message::SendFail() << "Error: argument shape ('" << theArgv[i] << "') is null"; return 1; } TopoDS_Shape aWith = DBRep::Get(theArgv[++i]); if ( aWith.IsNull() ) { - std::cout << "Error: replacement shape ('" << theArgv[i] << "') is null\n"; + Message::SendFail() << "Error: replacement shape ('" << theArgv[i] << "') is null"; return 1; } @@ -1451,14 +1452,14 @@ static Standard_Integer reshape(Draw_Interpretor& /*theDI*/, { if ( theArgc - i < 2 ) { - std::cout << "Error: not enough arguments for removal\n"; + Message::SendFail() << "Error: not enough arguments for removal"; return 1; } TopoDS_Shape aWhat = DBRep::Get(theArgv[++i]); if ( aWhat.IsNull() ) { - std::cout << "Error: shape to remove ('" << theArgv[i] << "') is null\n"; + Message::SendFail() << "Error: shape to remove ('" << theArgv[i] << "') is null"; return 1; } @@ -1468,7 +1469,7 @@ static Standard_Integer reshape(Draw_Interpretor& /*theDI*/, { if (theArgc - i < 2) { - std::cout << "Error: not enough arguments for level specification\n"; + Message::SendFail() << "Error: not enough arguments for level specification"; return 1; } @@ -1504,13 +1505,13 @@ static Standard_Integer reshape(Draw_Interpretor& /*theDI*/, aShapeLevel = TopAbs_SHAPE; else { - std::cout << "Error: unknown shape type '" << theArgv[i] << "'\n"; + Message::SendFail() << "Error: unknown shape type '" << theArgv[i] << "'"; return 1; } } else { - std::cout << "Error: invalid syntax at " << anOpt << "\n" ; + Message::SendFail() << "Error: invalid syntax at " << anOpt; return 1; } } @@ -1519,7 +1520,7 @@ static Standard_Integer reshape(Draw_Interpretor& /*theDI*/, TopoDS_Shape aResult = aReShaper->Apply(aSource, aShapeLevel); if ( aResult.IsNull() ) { - std::cout << "Error: result shape is null\n"; + Message::SendFail() << "Error: result shape is null"; return 1; } diff --git a/src/XDEDRAW/XDEDRAW_Colors.cxx b/src/XDEDRAW/XDEDRAW_Colors.cxx index 3efa23be43..1baa41b13d 100644 --- a/src/XDEDRAW/XDEDRAW_Colors.cxx +++ b/src/XDEDRAW/XDEDRAW_Colors.cxx @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -167,7 +168,7 @@ static Standard_Integer setColor (Draw_Interpretor& , Standard_Integer argc, con { if (argc < 4) { - std::cout << "Syntax error: wrong number of arguments\n"; + Message::SendFail() << "Syntax error: wrong number of arguments"; return 1; } @@ -175,7 +176,7 @@ static Standard_Integer setColor (Draw_Interpretor& , Standard_Integer argc, con DDocStd::GetDocument (argv[1], aDoc); if (aDoc.IsNull()) { - std::cout << "Syntax error: " << argv[1] << " is not a document\n"; + Message::SendFail() << "Syntax error: " << argv[1] << " is not a document"; return 1; } @@ -187,7 +188,7 @@ static Standard_Integer setColor (Draw_Interpretor& , Standard_Integer argc, con aShape = DBRep::Get (argv[2]); if (aShape.IsNull()) { - std::cout << "Syntax error: " << argv[2] << " is not a label nor shape\n"; + Message::SendFail() << "Syntax error: " << argv[2] << " is not a label nor shape"; return 1; } } @@ -209,20 +210,20 @@ static Standard_Integer setColor (Draw_Interpretor& , Standard_Integer argc, con aColor); if (aNbParsed == 0) { - std::cout << "Syntax error at '" << argv[anArgIter] << "'\n"; + Message::SendFail() << "Syntax error at '" << argv[anArgIter] << "'"; return 1; } anArgIter += aNbParsed - 1; } else { - std::cout << "Syntax error at '" << argv[anArgIter] << "'\n"; + Message::SendFail() << "Syntax error at '" << argv[anArgIter] << "'"; return 1; } } if (!isColorDefined) { - std::cout << "Syntax error: wrong number of arguments\n"; + Message::SendFail() << "Syntax error: wrong number of arguments"; return 1; } @@ -233,7 +234,7 @@ static Standard_Integer setColor (Draw_Interpretor& , Standard_Integer argc, con } else if (!aColorTool->SetColor (aShape, aColor, aColType)) { - std::cout << "Syntax error: " << argv[2] << " is not a label nor shape\n"; + Message::SendFail() << "Syntax error: " << argv[2] << " is not a label nor shape"; return 1; } return 0; @@ -243,7 +244,7 @@ static Standard_Integer getColor (Draw_Interpretor& di, Standard_Integer argc, c { if (argc != 3) { - std::cout << "Syntax error: wrong number of arguments\n"; + Message::SendFail() << "Syntax error: wrong number of arguments"; return 1; } @@ -251,7 +252,7 @@ static Standard_Integer getColor (Draw_Interpretor& di, Standard_Integer argc, c DDocStd::GetDocument (argv[1], aDoc); if (aDoc.IsNull()) { - std::cout << "Syntax error: " << argv[1] << " is not a document\n"; + Message::SendFail() << "Syntax error: " << argv[1] << " is not a document"; return 1; } @@ -279,7 +280,7 @@ static Standard_Integer getShapeColor (Draw_Interpretor& di, Standard_Integer ar { if (argc != 3 && argc != 4) { - std::cout << "Syntax error: wrong number of arguments\n"; + Message::SendFail() << "Syntax error: wrong number of arguments"; return 1; } @@ -287,7 +288,7 @@ static Standard_Integer getShapeColor (Draw_Interpretor& di, Standard_Integer ar DDocStd::GetDocument (argv[1], aDoc); if (aDoc.IsNull()) { - std::cout << "Syntax error: " << argv[1] << " is not a document\n"; + Message::SendFail() << "Syntax error: " << argv[1] << " is not a document"; return 1; } @@ -295,7 +296,7 @@ static Standard_Integer getShapeColor (Draw_Interpretor& di, Standard_Integer ar TDF_Tool::Label (aDoc->GetData(), argv[2], aLabel); if (aLabel.IsNull()) { - std::cout << "Syntax error: '" << argv[2] << "' label is not found in the document\n"; + Message::SendFail() << "Syntax error: '" << argv[2] << "' label is not found in the document"; return 1; } @@ -303,7 +304,7 @@ static Standard_Integer getShapeColor (Draw_Interpretor& di, Standard_Integer ar XCAFDoc_ColorType aColType = XCAFDoc_ColorGen; if (argc > 3 && !parseXDocColorType (argv[3], aColType)) { - std::cout << "Syntax error: unknown color type '" << argv[3] << "'\n"; + Message::SendFail() << "Syntax error: unknown color type '" << argv[3] << "'"; return 1; } @@ -329,7 +330,7 @@ static Standard_Integer getAllColors (Draw_Interpretor& di, Standard_Integer arg { if (argc != 2) { - std::cout << "Syntax error: wrong number of arguments\n"; + Message::SendFail() << "Syntax error: wrong number of arguments"; return 1; } @@ -337,7 +338,7 @@ static Standard_Integer getAllColors (Draw_Interpretor& di, Standard_Integer arg DDocStd::GetDocument (argv[1], aDoc); if (aDoc.IsNull()) { - std::cout << "Syntax error: " << argv[1] << " is not a document\n"; + Message::SendFail() << "Syntax error: " << argv[1] << " is not a document"; return 1; } @@ -371,7 +372,7 @@ static Standard_Integer addColor (Draw_Interpretor& di, Standard_Integer argc, c { if (argc < 3) { - std::cout << "Syntax error: wrong number of arguments\n"; + Message::SendFail() << "Syntax error: wrong number of arguments"; return 1; } @@ -379,7 +380,7 @@ static Standard_Integer addColor (Draw_Interpretor& di, Standard_Integer argc, c DDocStd::GetDocument (argv[1], aDoc); if (aDoc.IsNull()) { - std::cout << "Syntax error: " << argv[1] << " is not a document\n"; + Message::SendFail() << "Syntax error: " << argv[1] << " is not a document"; return 1; } @@ -387,7 +388,7 @@ static Standard_Integer addColor (Draw_Interpretor& di, Standard_Integer argc, c Standard_Integer aNbParsed = Draw::ParseColor (argc - 2, argv + 2, aColRGBA); if (aNbParsed != argc - 2) { - std::cout << "Syntax error at '" << argv[2] << "'\n"; + Message::SendFail() << "Syntax error at '" << argv[2] << "'"; return 1; } @@ -403,7 +404,7 @@ static Standard_Integer removeColor (Draw_Interpretor& , Standard_Integer argc, { if (argc != 3) { - std::cout << "Syntax error: wrong number of arguments\n"; + Message::SendFail() << "Syntax error: wrong number of arguments"; return 1; } @@ -412,13 +413,13 @@ static Standard_Integer removeColor (Draw_Interpretor& , Standard_Integer argc, DDocStd::GetDocument (argv[1], aDoc); if (aDoc.IsNull()) { - std::cout << "Syntax error: " << argv[1] << " is not a document\n"; + Message::SendFail() << "Syntax error: " << argv[1] << " is not a document"; return 1; } TDF_Tool::Label (aDoc->GetData(), argv[2], aLabel); if (aLabel.IsNull()) { - std::cout << "Syntax error: " << argv[2] << " label is not found in the document\n"; + Message::SendFail() << "Syntax error: " << argv[2] << " label is not found in the document"; return 1; } @@ -431,7 +432,7 @@ static Standard_Integer findColor (Draw_Interpretor& di, Standard_Integer argc, { if (argc < 3) { - std::cout << "Syntax error: wrong number of arguments\n"; + Message::SendFail() << "Syntax error: wrong number of arguments"; return 1; } @@ -439,7 +440,7 @@ static Standard_Integer findColor (Draw_Interpretor& di, Standard_Integer argc, DDocStd::GetDocument (argv[1], aDoc); if (aDoc.IsNull()) { - std::cout << "Syntax error: " << argv[1] << " is not a document\n"; + Message::SendFail() << "Syntax error: " << argv[1] << " is not a document"; return 1; } @@ -447,7 +448,7 @@ static Standard_Integer findColor (Draw_Interpretor& di, Standard_Integer argc, Standard_Integer aNbParsed = Draw::ParseColor (argc - 2, argv + 2, aColRGBA); if (aNbParsed != argc - 2) { - std::cout << "Syntax error at '" << argv[2] << "'\n"; + Message::SendFail() << "Syntax error at '" << argv[2] << "'"; return 1; } @@ -462,7 +463,7 @@ static Standard_Integer unsetColor (Draw_Interpretor& , Standard_Integer argc, c { if (argc != 4) { - std::cout << "Syntax error: wrong number of arguments\n"; + Message::SendFail() << "Syntax error: wrong number of arguments"; return 1; } @@ -470,14 +471,14 @@ static Standard_Integer unsetColor (Draw_Interpretor& , Standard_Integer argc, c DDocStd::GetDocument (argv[1], aDoc); if (aDoc.IsNull()) { - std::cout << "Syntax error: " << argv[1] << " is not a document\n"; + Message::SendFail() << "Syntax error: " << argv[1] << " is not a document"; return 1; } XCAFDoc_ColorType aColType = XCAFDoc_ColorGen; if (!parseXDocColorType (argv[3], aColType)) { - std::cout << "Syntax error: unknown color type '" << argv[3] << "'\n"; + Message::SendFail() << "Syntax error: unknown color type '" << argv[3] << "'"; return 1; } @@ -493,7 +494,7 @@ static Standard_Integer unsetColor (Draw_Interpretor& , Standard_Integer argc, c TopoDS_Shape aShape = DBRep::Get (argv[2]); if (aShape.IsNull()) { - std::cout << "Syntax error: " << argv[2] << " is not a label nor shape\n"; + Message::SendFail() << "Syntax error: " << argv[2] << " is not a label nor shape"; return 1; } myColors->UnSetColor (aShape, aColType); @@ -504,7 +505,7 @@ static Standard_Integer setVisibility (Draw_Interpretor& , Standard_Integer argc { if (argc != 3 && argc != 4) { - std::cout << "Syntax error: wrong number of arguments\n"; + Message::SendFail() << "Syntax error: wrong number of arguments"; return 1; } @@ -513,7 +514,7 @@ static Standard_Integer setVisibility (Draw_Interpretor& , Standard_Integer argc DDocStd::GetDocument (argv[1], aDoc); if (aDoc.IsNull()) { - std::cout << "Syntax error: " << argv[1] << " is not a document\n"; + Message::SendFail() << "Syntax error: " << argv[1] << " is not a document"; return 1; } @@ -530,7 +531,7 @@ static Standard_Integer setVisibility (Draw_Interpretor& , Standard_Integer argc } if (aLabel.IsNull()) { - std::cout << "Syntax error: " << argv[2] << " is not a label not shape\n"; + Message::SendFail() << "Syntax error: " << argv[2] << " is not a label not shape"; return 1; } @@ -548,7 +549,7 @@ static Standard_Integer setVisibility (Draw_Interpretor& , Standard_Integer argc } else { - std::cout << "Syntax error: unknown argument '" << argv[3] << "'\n"; + Message::SendFail() << "Syntax error: unknown argument '" << argv[3] << "'"; return 1; } } @@ -560,7 +561,7 @@ static Standard_Integer getVisibility (Draw_Interpretor& di, Standard_Integer ar { if (argc != 3) { - std::cout << "Syntax error: wrong number of arguments\n"; + Message::SendFail() << "Syntax error: wrong number of arguments"; return 1; } @@ -568,7 +569,7 @@ static Standard_Integer getVisibility (Draw_Interpretor& di, Standard_Integer ar DDocStd::GetDocument (argv[1], aDoc); if (aDoc.IsNull()) { - std::cout << "Syntax error: " << argv[1] << " is not a document\n"; + Message::SendFail() << "Syntax error: " << argv[1] << " is not a document"; return 1; } @@ -586,7 +587,7 @@ static Standard_Integer getVisibility (Draw_Interpretor& di, Standard_Integer ar } if (aLabel.IsNull()) { - std::cout << "Syntax error: " << argv[2] << " is not a label not shape\n"; + Message::SendFail() << "Syntax error: " << argv[2] << " is not a label not shape"; return 1; } @@ -598,7 +599,7 @@ static Standard_Integer getStyledVisibility (Draw_Interpretor& di, Standard_Inte { if (argc != 3) { - std::cout << "Syntax error: wrong number of arguments\n"; + Message::SendFail() << "Syntax error: wrong number of arguments"; return 1; } @@ -607,12 +608,12 @@ static Standard_Integer getStyledVisibility (Draw_Interpretor& di, Standard_Inte TopoDS_Shape aShape = DBRep::Get(argv[2]); if (aDoc.IsNull()) { - std::cout << "Syntax error: " << argv[1] << " is not a document\n"; + Message::SendFail() << "Syntax error: " << argv[1] << " is not a document"; return 1; } if (aShape.IsNull()) { - std::cout << "Syntax error: " << argv[2] << " is not a shape\n"; + Message::SendFail() << "Syntax error: " << argv[2] << " is not a shape"; return 1; } @@ -625,7 +626,7 @@ static Standard_Integer getStyledcolor (Draw_Interpretor& di, Standard_Integer a { if (argc != 3 && argc != 4) { - std::cout << "Syntax error: wrong number of arguments\n"; + Message::SendFail() << "Syntax error: wrong number of arguments"; return 1; } @@ -635,17 +636,17 @@ static Standard_Integer getStyledcolor (Draw_Interpretor& di, Standard_Integer a TopoDS_Shape aShape = DBRep::Get (argv[2]); if (aDoc.IsNull()) { - std::cout << "Syntax error: " << argv[1] << " is not a document\n"; + Message::SendFail() << "Syntax error: " << argv[1] << " is not a document"; return 1; } if (aShape.IsNull()) { - std::cout << "Syntax error: " << argv[2] << " is not a shape\n"; + Message::SendFail() << "Syntax error: " << argv[2] << " is not a shape"; return 1; } if (argc > 3 && !parseXDocColorType (argv[3], aColType)) { - std::cout << "Syntax error: unknown color type '" << argv[3] << "'\n"; + Message::SendFail() << "Syntax error: unknown color type '" << argv[3] << "'"; return 1; } @@ -669,7 +670,7 @@ static Standard_Integer setStyledcolor (Draw_Interpretor& , Standard_Integer arg { if (argc < 3) { - std::cout << "Syntax error: wrong number of arguments\n"; + Message::SendFail() << "Syntax error: wrong number of arguments"; return 1; } @@ -677,14 +678,14 @@ static Standard_Integer setStyledcolor (Draw_Interpretor& , Standard_Integer arg DDocStd::GetDocument (argv[1], aDoc); if (aDoc.IsNull()) { - std::cout << "Syntax error: " << argv[1] << " is not a document\n"; + Message::SendFail() << "Syntax error: " << argv[1] << " is not a document"; return 1; } TopoDS_Shape aShape = DBRep::Get (argv[2]); if (aShape.IsNull()) { - std::cout << "Syntax error: " << argv[2] << " is not a shape\n"; + Message::SendFail() << "Syntax error: " << argv[2] << " is not a shape"; return 1; } @@ -703,7 +704,7 @@ static Standard_Integer setStyledcolor (Draw_Interpretor& , Standard_Integer arg aColRGBA); if (aNbParsed == 0) { - std::cout << "Syntax error at '" << argv[anArgIter] << "'\n"; + Message::SendFail() << "Syntax error at '" << argv[anArgIter] << "'"; return 1; } anArgIter += aNbParsed - 1; @@ -713,7 +714,7 @@ static Standard_Integer setStyledcolor (Draw_Interpretor& , Standard_Integer arg Handle(XCAFDoc_ColorTool) aColorTool = XCAFDoc_DocumentTool::ColorTool (aDoc->Main()); if (!aColorTool->SetInstanceColor (aShape, aColorType, aColRGBA)) { - std::cout << "Error: cannot set color for the indicated component\n"; + Message::SendFail() << "Error: cannot set color for the indicated component"; return 1; } return 0; @@ -727,7 +728,7 @@ static Standard_Integer XGetAllVisMaterials (Draw_Interpretor& theDI, Standard_I { if (theNbArgs != 2 && theNbArgs != 3) { - std::cout << "Syntax error: wrong number of arguments\n"; + Message::SendFail() << "Syntax error: wrong number of arguments"; return 1; } @@ -735,7 +736,7 @@ static Standard_Integer XGetAllVisMaterials (Draw_Interpretor& theDI, Standard_I DDocStd::GetDocument (theArgVec[1], aDoc); if (aDoc.IsNull()) { - std::cout << "Syntax error: " << theArgVec[1] << " is not a document\n"; + Message::SendFail() << "Syntax error: " << theArgVec[1] << " is not a document"; return 1; } @@ -791,7 +792,7 @@ static Standard_Integer XGetVisMaterial (Draw_Interpretor& theDI, Standard_Integ { if (theNbArgs != 3) { - std::cout << "Syntax error: wrong number of arguments\n"; + Message::SendFail() << "Syntax error: wrong number of arguments"; return 1; } @@ -799,7 +800,7 @@ static Standard_Integer XGetVisMaterial (Draw_Interpretor& theDI, Standard_Integ DDocStd::GetDocument (theArgVec[1], aDoc); if (aDoc.IsNull()) { - std::cout << "Syntax error: " << theArgVec[1] << " is not a document\n"; + Message::SendFail() << "Syntax error: " << theArgVec[1] << " is not a document"; return 1; } @@ -829,7 +830,7 @@ static Standard_Integer XGetVisMaterial (Draw_Interpretor& theDI, Standard_Integ } if (aShapeLab.IsNull()) { - std::cout << "Syntax error: " << theArgVec[2] << " is not material nor shape\n"; + Message::SendFail() << "Syntax error: " << theArgVec[2] << " is not material nor shape"; return 1; } @@ -914,7 +915,7 @@ static Standard_Integer XAddVisMaterial (Draw_Interpretor& , Standard_Integer th { if (theNbArgs < 3) { - std::cout << "Syntax error: wrong number of arguments\n"; + Message::SendFail() << "Syntax error: wrong number of arguments"; return 1; } @@ -922,7 +923,7 @@ static Standard_Integer XAddVisMaterial (Draw_Interpretor& , Standard_Integer th DDocStd::GetDocument (theArgVec[1], aDoc); if (aDoc.IsNull()) { - std::cout << "Syntax error: " << theArgVec[1] << " is not a document\n"; + Message::SendFail() << "Syntax error: " << theArgVec[1] << " is not a document"; return 1; } @@ -959,7 +960,7 @@ static Standard_Integer XAddVisMaterial (Draw_Interpretor& , Standard_Integer th aMatPbr.RefractionIndex = (Standard_ShortReal )Draw::Atof (theArgVec[anArgIter + 1]); if (aMatPbr.RefractionIndex < 1.0f || aMatPbr.RefractionIndex > 3.0f) { - std::cout << "Syntax error at '" << anArg << "'\n"; + Message::SendFail() << "Syntax error at '" << anArg << "'"; return 1; } @@ -991,7 +992,7 @@ static Standard_Integer XAddVisMaterial (Draw_Interpretor& , Standard_Integer th } else { - std::cerr << "Syntax error at '" << anArg << "'\n"; + Message::SendFail() << "Syntax error at '" << anArg << "'"; return 1; } aMat->SetAlphaMode (anAlphaMode, aRealValue); @@ -1007,7 +1008,7 @@ static Standard_Integer XAddVisMaterial (Draw_Interpretor& , Standard_Integer th aColorRGBA); if (aNbParsed == 0) { - std::cout << "Syntax error at '" << theArgVec[anArgIter] << "'\n"; + Message::SendFail() << "Syntax error at '" << theArgVec[anArgIter] << "'"; return 1; } anArgIter += aNbParsed; @@ -1059,7 +1060,7 @@ static Standard_Integer XAddVisMaterial (Draw_Interpretor& , Standard_Integer th aMatCom.Shininess = (float )Draw::Atof (theArgVec[++anArgIter]); if (aMatCom.Shininess < 0.0f || aMatCom.Shininess > 1.0f) { - std::cout << "Syntax error at '" << anArg << "'\n"; + Message::SendFail() << "Syntax error at '" << anArg << "'"; return 1; } } @@ -1141,7 +1142,7 @@ static Standard_Integer XAddVisMaterial (Draw_Interpretor& , Standard_Integer th } else { - std::cout << "Syntax error at '" << theArgVec[anArgIter] << "'\n"; + Message::SendFail() << "Syntax error at '" << theArgVec[anArgIter] << "'"; return 1; } } @@ -1159,7 +1160,7 @@ static Standard_Integer XRemoveVisMaterial (Draw_Interpretor& , Standard_Integer { if (theNbArgs != 3) { - std::cout << "Syntax error: wrong number of arguments\n"; + Message::SendFail() << "Syntax error: wrong number of arguments"; return 1; } @@ -1167,14 +1168,14 @@ static Standard_Integer XRemoveVisMaterial (Draw_Interpretor& , Standard_Integer DDocStd::GetDocument (theArgVec[1], aDoc); if (aDoc.IsNull()) { - std::cout << "Syntax error: " << theArgVec[1] << " is not a document\n"; + Message::SendFail() << "Syntax error: " << theArgVec[1] << " is not a document"; return 1; } TDF_Label aMatLab = findVisMaterial (aDoc, theArgVec[2]); if (aMatLab.IsNull()) { - std::cout << "Syntax error: " << theArgVec[2] << " is not a material\n"; + Message::SendFail() << "Syntax error: " << theArgVec[2] << " is not a material"; return 1; } @@ -1191,7 +1192,7 @@ static Standard_Integer XSetVisMaterial (Draw_Interpretor& , Standard_Integer th { if (theNbArgs != 3 && theNbArgs != 4) { - std::cout << "Syntax error: wrong number of arguments\n"; + Message::SendFail() << "Syntax error: wrong number of arguments"; return 1; } @@ -1200,7 +1201,7 @@ static Standard_Integer XSetVisMaterial (Draw_Interpretor& , Standard_Integer th DDocStd::GetDocument (theArgVec[1], aDoc); if (aDoc.IsNull()) { - std::cout << "Syntax error: " << theArgVec[1] << " is not a document\n"; + Message::SendFail() << "Syntax error: " << theArgVec[1] << " is not a document"; return 1; } @@ -1217,7 +1218,7 @@ static Standard_Integer XSetVisMaterial (Draw_Interpretor& , Standard_Integer th } if (aShapeLab.IsNull()) { - std::cout << "Syntax error: " << theArgVec[2] << " is not a label not shape\n"; + Message::SendFail() << "Syntax error: " << theArgVec[2] << " is not a label not shape"; return 1; } @@ -1227,7 +1228,7 @@ static Standard_Integer XSetVisMaterial (Draw_Interpretor& , Standard_Integer th aMatLab = findVisMaterial (aDoc, theArgVec[3]); if (aMatLab.IsNull()) { - std::cout << "Syntax error: " << theArgVec[3] << " is not a material\n"; + Message::SendFail() << "Syntax error: " << theArgVec[3] << " is not a material"; return 1; } } diff --git a/src/XDEDRAW/XDEDRAW_Common.cxx b/src/XDEDRAW/XDEDRAW_Common.cxx index 07d71d165c..a84d43962d 100644 --- a/src/XDEDRAW/XDEDRAW_Common.cxx +++ b/src/XDEDRAW/XDEDRAW_Common.cxx @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -330,7 +331,7 @@ static Standard_Integer ReadStep (Draw_Interpretor& di, Standard_Integer argc, c } else { - std::cout << "Syntax error at '" << argv[anArgIter] << "'\n"; + Message::SendFail() << "Syntax error at '" << argv[anArgIter] << "'"; return 1; } } @@ -357,7 +358,7 @@ static Standard_Integer ReadStep (Draw_Interpretor& di, Standard_Integer argc, c case 'v' : reader.SetPropsMode (mode); break; default: { - std::cout << "Syntax error at '" << aModeStr << "'\n"; + Message::SendFail() << "Syntax error at '" << aModeStr << "'\n"; return 1; } } diff --git a/src/XDEDRAW/XDEDRAW_Shapes.cxx b/src/XDEDRAW/XDEDRAW_Shapes.cxx index b68dcbfc2b..a1351b2631 100644 --- a/src/XDEDRAW/XDEDRAW_Shapes.cxx +++ b/src/XDEDRAW/XDEDRAW_Shapes.cxx @@ -52,7 +52,7 @@ static Standard_Integer addShape (Draw_Interpretor& di, Standard_Integer argc, c TopoDS_Shape aShape = DBRep::Get(argv[2]); if (aShape.IsNull()) { - std::cout << "Syntax error: shape '" << argv[2] << "' is undefined\n"; + di << "Syntax error: shape '" << argv[2] << "' is undefined\n"; return 1; } @@ -932,7 +932,7 @@ static Standard_Integer XGetProperties(Draw_Interpretor& di, Standard_Integer ar { if (argc != 3) { - std::cout << "Syntax error: wrong number of arguments\nUse: " << argv[0] << " Doc Label\n"; + di << "Syntax error: wrong number of arguments\nUse: " << argv[0] << " Doc Label\n"; return 1; } @@ -940,7 +940,7 @@ static Standard_Integer XGetProperties(Draw_Interpretor& di, Standard_Integer ar DDocStd::GetDocument(argv[1], aDoc); if (aDoc.IsNull()) { - std::cout << "Syntax error: " << argv[1] << " is not a document\n"; + di << "Syntax error: " << argv[1] << " is not a document\n"; return 1; } diff --git a/src/XSDRAWSTEP/XSDRAWSTEP.cxx b/src/XSDRAWSTEP/XSDRAWSTEP.cxx index bd800972c9..b4faf08b6d 100644 --- a/src/XSDRAWSTEP/XSDRAWSTEP.cxx +++ b/src/XSDRAWSTEP/XSDRAWSTEP.cxx @@ -502,7 +502,7 @@ static Standard_Integer stepfileunits (Draw_Interpretor& di, Standard_Integer ar if( argc < 2) { - std::cout<<"Error: Invalid number of parameters. Should be: getfileunits name_file"<NewDocument (TCollection_ExtendedString ("BinXCAF"), aDoc); } else if (!toUseExistingDoc) { - std::cout << "Error: document with name " << aDestName << " already exists\n"; + Message::SendFail() << "Error: document with name " << aDestName << " already exists"; return 1; } } @@ -265,7 +265,7 @@ static Standard_Integer WriteGltf (Draw_Interpretor& theDI, } else { - std::cout << "Syntax error at '" << anArgCase << "'\n"; + Message::SendFail() << "Syntax error at '" << anArgCase << "'"; return 1; } } @@ -278,7 +278,7 @@ static Standard_Integer WriteGltf (Draw_Interpretor& theDI, TopoDS_Shape aShape = DBRep::Get (aNameVar); if (aShape.IsNull()) { - std::cout << "Syntax error: '" << aNameVar << "' is not a shape nor document\n"; + Message::SendFail() << "Syntax error: '" << aNameVar << "' is not a shape nor document"; return 1; } @@ -293,13 +293,13 @@ static Standard_Integer WriteGltf (Draw_Interpretor& theDI, } else { - std::cout << "Syntax error at '" << theArgVec[anArgIter] << "'\n"; + Message::SendFail() << "Syntax error at '" << theArgVec[anArgIter] << "'"; return 1; } } if (aGltfFilePath.IsEmpty()) { - std::cout << "Syntax error: wrong number of arguments\n"; + Message::SendFail() << "Syntax error: wrong number of arguments"; return 1; } @@ -374,13 +374,13 @@ static Standard_Integer readstl(Draw_Interpretor& theDI, } else { - std::cout << "Syntax error: unknown argument '" << theArgv[anArgIter] << "'\n"; + Message::SendFail() << "Syntax error: unknown argument '" << theArgv[anArgIter] << "'"; return 1; } } if (aFilePath.IsEmpty()) { - std::cout << "Syntax error: not enough arguments\n"; + Message::SendFail() << "Syntax error: not enough arguments"; return 1; } @@ -456,7 +456,7 @@ static Standard_Integer ReadObj (Draw_Interpretor& theDI, aFileUnitFactor = UnitsAPI::AnyToSI (1.0, aUnitStr.ToCString()); if (aFileUnitFactor <= 0.0) { - std::cout << "Syntax error: wrong length unit '" << aUnitStr << "'\n"; + Message::SendFail() << "Syntax error: wrong length unit '" << aUnitStr << "'"; return 1; } } @@ -467,7 +467,7 @@ static Standard_Integer ReadObj (Draw_Interpretor& theDI, { if (!parseCoordinateSystem (theArgVec[++anArgIter], aFileCoordSys)) { - std::cout << "Syntax error: unknown coordinate system '" << theArgVec[anArgIter] << "'\n"; + Message::SendFail() << "Syntax error: unknown coordinate system '" << theArgVec[anArgIter] << "'"; return 1; } } @@ -479,7 +479,7 @@ static Standard_Integer ReadObj (Draw_Interpretor& theDI, { if (!parseCoordinateSystem (theArgVec[++anArgIter], aResultCoordSys)) { - std::cout << "Syntax error: unknown coordinate system '" << theArgVec[anArgIter] << "'\n"; + Message::SendFail() << "Syntax error: unknown coordinate system '" << theArgVec[anArgIter] << "'"; return 1; } } @@ -528,13 +528,13 @@ static Standard_Integer ReadObj (Draw_Interpretor& theDI, } else { - std::cout << "Syntax error at '" << theArgVec[anArgIter] << "'\n"; + Message::SendFail() << "Syntax error at '" << theArgVec[anArgIter] << "'"; return 1; } } if (aFilePath.IsEmpty()) { - std::cout << "Syntax error: wrong number of arguments\n"; + Message::SendFail() << "Syntax error: wrong number of arguments"; return 1; } @@ -550,14 +550,14 @@ static Standard_Integer ReadObj (Draw_Interpretor& theDI, { if (toUseExistingDoc) { - std::cout << "Error: document with name " << aDestName << " does not exist\n"; + Message::SendFail() << "Error: document with name " << aDestName << " does not exist"; return 1; } anApp->NewDocument (TCollection_ExtendedString ("BinXCAF"), aDoc); } else if (!toUseExistingDoc) { - std::cout << "Error: document with name " << aDestName << " already exists\n"; + Message::SendFail() << "Error: document with name " << aDestName << " already exists"; return 1; } } diff --git a/tests/blend/complex/F9 b/tests/blend/complex/F9 index 841346b852..997456cc69 100644 --- a/tests/blend/complex/F9 +++ b/tests/blend/complex/F9 @@ -4,7 +4,6 @@ ## Comment : from pro13893 ## ==================================== puts "TODO OCC22817 All:exception.+There are no suitable edges" -puts "TODO OCC22817 All:\\*\\* Exception \\*\\*" puts "TODO OCC22817 All:TEST INCOMPLETE" restore [locate_data_file pro13893.rle] a diff --git a/tests/blend/complex/G6 b/tests/blend/complex/G6 index 6f6f697ac4..3af44d2317 100644 --- a/tests/blend/complex/G6 +++ b/tests/blend/complex/G6 @@ -4,7 +4,6 @@ ## Comment : from cts21363 ## ==================================== puts "TODO OCC22817 All:exception.+There are no suitable edges" -puts "TODO OCC22817 All:\\*\\* Exception \\*\\*" puts "TODO OCC22817 All:TEST INCOMPLETE" restore [locate_data_file cts21363.rle] a diff --git a/tests/bugs/caf/bug669 b/tests/bugs/caf/bug669 index 4851cae612..253f40a1bb 100755 --- a/tests/bugs/caf/bug669 +++ b/tests/bugs/caf/bug669 @@ -1,14 +1,10 @@ puts "All exceptions is OK" puts "TODO OCC12345 ALL: An exception was caught" -puts "TODO OCC12345 ALL: \\*\\* Exception \\*\\*.*" puts "========" -puts "OCC669" +puts "0000669: Standard_GUID(HoleFeature) cause stack overwrite" puts "========" puts "" -######################################### -## Standard_GUID("HoleFeature") cause stack overwrite -######################################### pload QAcommands diff --git a/tests/bugs/fclasses/bug23497 b/tests/bugs/fclasses/bug23497 index 524a5385b8..64b68c92f4 100644 --- a/tests/bugs/fclasses/bug23497 +++ b/tests/bugs/fclasses/bug23497 @@ -1,13 +1,9 @@ -puts "TODO OCC23497 ALL: Exception" puts "TODO OCC23497 ALL: exception" puts "============" -puts "OCC23497" +puts "0023497: Units package raises e x c e p t i o n for composite units" puts "============" puts "" -####################################################################### -# Units package raises exception for composite units -####################################################################### set UnitString "sq.km" diff --git a/tests/bugs/filling/bug22783 b/tests/bugs/filling/bug22783 index ad4fdaff3f..fdb5cd4542 100644 --- a/tests/bugs/filling/bug22783 +++ b/tests/bugs/filling/bug22783 @@ -1,14 +1,10 @@ -puts "TODO OCC24156 MacOS: \\*\\* Exception \\*\\*.*" puts "TODO OCC24156 MacOS: An exception was caught" puts "TODO OCC24156 MacOS: TEST INCOMPLETE" puts "===========" -puts "OCC22783" +puts "0022783: Improvement of BRepOffsetAPI_MakeFilling: keep old and new boundary edges with all pcurves" puts "===========" puts "" -####################################################################### -# Improvement of BRepOffsetAPI_MakeFilling: keep old and new boundary edges with all pcurves -####################################################################### catch {pload XDE} diff --git a/tests/bugs/filling/bug22786 b/tests/bugs/filling/bug22786 index 569348d927..af33d025d3 100644 --- a/tests/bugs/filling/bug22786 +++ b/tests/bugs/filling/bug22786 @@ -1,14 +1,10 @@ -puts "TODO OCC24156 MacOS: \\*\\* Exception \\*\\*.*" puts "TODO OCC24156 MacOS: An exception was caught" puts "TODO OCC24156 MacOS: TEST INCOMPLETE" puts "============" -puts "OCC22786" +puts "0022786: 64bit issue in AdvApp2Var" puts "============" puts "" -####################################################################### -# 64bit issue in AdvApp2Var -####################################################################### set BugNumber OCC22786 diff --git a/tests/bugs/filling/bug23343 b/tests/bugs/filling/bug23343 index 8b3f4956b2..7a749d552b 100644 --- a/tests/bugs/filling/bug23343 +++ b/tests/bugs/filling/bug23343 @@ -1,14 +1,10 @@ -puts "TODO OCC23343 ALL: \\*\\* Exception \\*\\*.*" puts "TODO OCC23343 ALL: An exception was caught" puts "TODO OCC23343 ALL: Faulty OCC23343" puts "============" -puts "OCC23343" +puts "0023343: Crash (A C C E S S V I O L A T I O N) in GeomPlate_BuildPlateSurface / MakeApprox if init Surface is set" puts "============" puts "" -####################################################################### -# Crash (ACCESS VIOLATION) in GeomPlate_BuildPlateSurface / MakeApprox if init Surface is set -####################################################################### restore [locate_data_file bug23343_initFace.brep] initFace restore [locate_data_file bug23343_edge_constraint.brep] edge_constraint diff --git a/tests/bugs/modalg_2/bug293 b/tests/bugs/modalg_2/bug293 index 11c43f3d37..07744e7d37 100755 --- a/tests/bugs/modalg_2/bug293 +++ b/tests/bugs/modalg_2/bug293 @@ -1,8 +1,3 @@ -#by apn on master-master 03.12.2012 -#puts "TODO OCC12345 ALL: An exception was caught" -#puts "TODO OCC12345 ALL: \\*\\* Exception *\\*\\*.*" -#puts "TODO OCC12345 ALL: TEST INCOMPLETE" - puts "================" puts "OCC293" puts "================" diff --git a/tests/bugs/modalg_2/bug426 b/tests/bugs/modalg_2/bug426 index 447701c3b5..3828591fe6 100755 --- a/tests/bugs/modalg_2/bug426 +++ b/tests/bugs/modalg_2/bug426 @@ -1,18 +1,12 @@ -puts "TODO OCC24156 MacOS: \\*\\* Exception \\*\\*.*" puts "TODO OCC24156 MacOS: An exception was caught" puts "TODO OCC24156 MacOS: TEST INCOMPLETE" pload QAcommands puts "========" -puts "OCC426" -puts "OCC50" +puts "0000426: The result of fuse operation is invalid" +puts "0000050: BRepFilletAPI_MakeFillet presents a bug on fillet computation (build())" puts "========" -############################################################################# -## The result of fuse operation is invalid -############################################################################# -## BRepFilletAPI_MakeFillet presents a bug on fillet computation (build()) -############################################################################# OCC426 result rs1 rs2 rs3 fuse32 fuse321 fuseUnif diff --git a/tests/bugs/modalg_4/bug8842_11 b/tests/bugs/modalg_4/bug8842_11 index d7a1fb4b88..55fb7187b5 100755 --- a/tests/bugs/modalg_4/bug8842_11 +++ b/tests/bugs/modalg_4/bug8842_11 @@ -1,15 +1,10 @@ -puts "TODO OCC24156 MacOS: \\*\\* Exception \\*\\*.*" puts "TODO OCC24156 MacOS: An exception was caught" puts "TODO OCC24156 MacOS: OCC8842: Faulty" - puts "============" -puts "OCC8842" +puts "00008842: E r r o r s in Offset Shape algorithm working with bspline and surface of revolution" puts "============" puts "" -####################################################################### -# Errors in Offset Shape algorithm working with bspline and surface of revolution -####################################################################### set BugNumber OCC8842 diff --git a/tests/bugs/modalg_4/bug8842_12 b/tests/bugs/modalg_4/bug8842_12 index fba22ab781..0852f3afe4 100755 --- a/tests/bugs/modalg_4/bug8842_12 +++ b/tests/bugs/modalg_4/bug8842_12 @@ -1,14 +1,10 @@ -puts "TODO OCC24156 MacOS: \\*\\* Exception \\*\\*.*" puts "TODO OCC24156 MacOS: An exception was caught" puts "TODO OCC24156 MacOS: OCC8842: Faulty" puts "============" -puts "OCC8842" +puts "00008842: E r r o r s in Offset Shape algorithm working with bspline and surface of revolution" puts "============" puts "" -####################################################################### -# Errors in Offset Shape algorithm working with bspline and surface of revolution -####################################################################### set BugNumber OCC8842 diff --git a/tests/bugs/modalg_4/bug8842_2 b/tests/bugs/modalg_4/bug8842_2 index e6c89f1e3d..29a054a7fe 100755 --- a/tests/bugs/modalg_4/bug8842_2 +++ b/tests/bugs/modalg_4/bug8842_2 @@ -1,14 +1,10 @@ puts "TODO OCC25913 ALL: OCC8842: Faulty" -puts "TODO OCC25913 ALL: \\*\\* Exception" puts "TODO OCC25913 ALL: An exception was caught" puts "============" -puts "OCC8842" +puts "00008842: E r r o r s in Offset Shape algorithm working with bspline and surface of revolution" puts "============" puts "" -####################################################################### -# Errors in Offset Shape algorithm working with bspline and surface of revolution -####################################################################### set BugNumber OCC8842 diff --git a/tests/bugs/modalg_4/bug8842_3 b/tests/bugs/modalg_4/bug8842_3 index 0154bdd5c9..b21c170049 100755 --- a/tests/bugs/modalg_4/bug8842_3 +++ b/tests/bugs/modalg_4/bug8842_3 @@ -1,16 +1,12 @@ puts "TODO OCC25913 ALL: Error : is WRONG because number of" puts "TODO OCC25913 ALL: Error : The area of result shape is" -puts "TODO OCC24156 MacOS: \\*\\* Exception \\*\\*.*" puts "TODO OCC24156 MacOS: An exception was caught" puts "TODO OCC24156 MacOS: OCC8842: Faulty" puts "============" -puts "OCC8842" +puts "00008842: E r r o r s in Offset Shape algorithm working with bspline and surface of revolution" puts "============" puts "" -####################################################################### -# Errors in Offset Shape algorithm working with bspline and surface of revolution -####################################################################### set BugNumber OCC8842 diff --git a/tests/bugs/modalg_4/bug8842_4 b/tests/bugs/modalg_4/bug8842_4 index e0312cf00a..f315de1a74 100755 --- a/tests/bugs/modalg_4/bug8842_4 +++ b/tests/bugs/modalg_4/bug8842_4 @@ -1,14 +1,10 @@ puts "TODO OCC25913 ALL: OCC8842: Faulty" -puts "TODO OCC25913 ALL: \\*\\* Exception" puts "TODO OCC25913 ALL: An exception was caught" puts "============" -puts "OCC8842" +puts "00008842: E r r o r s in Offset Shape algorithm working with bspline and surface of revolution" puts "============" puts "" -####################################################################### -# Errors in Offset Shape algorithm working with bspline and surface of revolution -####################################################################### set BugNumber OCC8842 diff --git a/tests/bugs/modalg_5/bug23870_1 b/tests/bugs/modalg_5/bug23870_1 index affc5dc84d..de363679f7 100755 --- a/tests/bugs/modalg_5/bug23870_1 +++ b/tests/bugs/modalg_5/bug23870_1 @@ -1,14 +1,10 @@ -puts "TODO OCC24156 MacOS: \\*\\* Exception \\*\\*.*" puts "TODO OCC24156 MacOS: An exception was caught" puts "TODO OCC24156 MacOS: TEST INCOMPLETE" puts "============" -puts "OCC23870" +puts "0023870: Integration of new options of sweeping into BRepOffsetAPI_MakePipe algorithm" puts "============" puts "" -####################################################################### -# Integration of new options of sweeping into BRepOffsetAPI_MakePipe algorithm. -####################################################################### set BugNumber OCC23870 diff --git a/tests/bugs/modalg_5/bug23870_2 b/tests/bugs/modalg_5/bug23870_2 index 8b35a04230..aedc90ba13 100755 --- a/tests/bugs/modalg_5/bug23870_2 +++ b/tests/bugs/modalg_5/bug23870_2 @@ -1,14 +1,10 @@ -puts "TODO OCC24156 MacOS: \\*\\* Exception \\*\\*.*" puts "TODO OCC24156 MacOS: An exception was caught" puts "TODO OCC24156 MacOS: TEST INCOMPLETE" puts "============" -puts "OCC23870" +puts "0023870: Integration of new options of sweeping into BRepOffsetAPI_MakePipe algorithm" puts "============" puts "" -####################################################################### -# Integration of new options of sweeping into BRepOffsetAPI_MakePipe algorithm. -####################################################################### set BugNumber OCC23870 diff --git a/tests/bugs/modalg_5/bug23870_4 b/tests/bugs/modalg_5/bug23870_4 index 7f25f1fabc..84e6107b5b 100755 --- a/tests/bugs/modalg_5/bug23870_4 +++ b/tests/bugs/modalg_5/bug23870_4 @@ -1,14 +1,10 @@ -puts "TODO OCC24156 MacOS: \\*\\* Exception \\*\\*.*" puts "TODO OCC24156 MacOS: An exception was caught" puts "TODO OCC24156 MacOS: TEST INCOMPLETE" puts "============" -puts "OCC23870" +puts "0023870: Integration of new options of sweeping into BRepOffsetAPI_MakePipe algorithm" puts "============" puts "" -####################################################################### -# Integration of new options of sweeping into BRepOffsetAPI_MakePipe algorithm. -####################################################################### set BugNumber OCC23870 diff --git a/tests/bugs/modalg_7/bug25939 b/tests/bugs/modalg_7/bug25939 index 56befd7987..e32651d9ce 100755 --- a/tests/bugs/modalg_7/bug25939 +++ b/tests/bugs/modalg_7/bug25939 @@ -1,13 +1,9 @@ puts "TODO OCC25939 ALL: An exception was caught" -puts "TODO OCC25939 ALL: \\*\\* Exception \\*\\*.*" puts "============" -puts "OCC25939" +puts "0025939: S I G S E G V in MakeThickSolid" puts "============" puts "" -###################################################### -# SIGSEGV in MakeThickSolid -###################################################### psphere Sphere 5 pcylinder Cylinder 83 100 diff --git a/tests/bugs/modalg_7/bug26295 b/tests/bugs/modalg_7/bug26295 index bc9ba13f34..683dfb65b1 100644 --- a/tests/bugs/modalg_7/bug26295 +++ b/tests/bugs/modalg_7/bug26295 @@ -1,14 +1,10 @@ puts "TODO OCC26295 ALL: An exception was caught" -puts "TODO OCC26295 ALL: \\*\\* Exception \\*\\*.*" puts "TODO OCC26295 ALL: TEST INCOMPLETE" puts "========" -puts "OCC26295" +puts "0026295: Sweep fails with BRepFill_ContactOnBorder" puts "========" puts "" -############################################# -# Sweep fails with BRepFill_ContactOnBorder -############################################# restore [locate_data_file bug26295_section.brep] section restore [locate_data_file bug26295_profile1.brep] profile1 diff --git a/tests/bugs/modalg_7/bug26558 b/tests/bugs/modalg_7/bug26558 index ec64c72f67..82b72572ed 100644 --- a/tests/bugs/modalg_7/bug26558 +++ b/tests/bugs/modalg_7/bug26558 @@ -1,14 +1,10 @@ puts "TODO OCC26558 ALL: An exception was caught" -puts "TODO OCC26558 ALL: \\*\\* Exception \\*\\*.*" puts "TODO OCC26558 ALL: TEST INCOMPLETE" puts "========" -puts "OCC26558" +puts "0026558: Failing to build isoline for offset surface" puts "========" puts "" -############################################### -# Failing to build isoline for offset surface -############################################### restore [locate_data_file bug26558_s.brep] s diff --git a/tests/bugs/modalg_7/bug30787 b/tests/bugs/modalg_7/bug30787 index 1fc401c409..6014d096bf 100644 --- a/tests/bugs/modalg_7/bug30787 +++ b/tests/bugs/modalg_7/bug30787 @@ -1,4 +1,3 @@ -puts "TODO OCC30808 ALL: \\*\\* Exception \\*\\*.*" puts "TODO OCC30808 ALL: An exception was caught" puts "TODO OCC30808 ALL:TEST INCOMPLETE" diff --git a/tests/bugs/moddata_1/bug103 b/tests/bugs/moddata_1/bug103 index c35c1f60ef..44283a7088 100755 --- a/tests/bugs/moddata_1/bug103 +++ b/tests/bugs/moddata_1/bug103 @@ -1,5 +1,4 @@ puts "TODO OCC12345 ALL: An exception was caught" -puts "TODO OCC12345 ALL: \\*\\* Exception \\*\\*.*" puts "================" puts "BUC60961" diff --git a/tests/bugs/moddata_2/bug22910_1 b/tests/bugs/moddata_2/bug22910_1 index 109c39fdc4..0e4842289a 100755 --- a/tests/bugs/moddata_2/bug22910_1 +++ b/tests/bugs/moddata_2/bug22910_1 @@ -1,15 +1,11 @@ puts "TODO OCC11111 ALL: An exception was caught" -puts "TODO OCC11111 ALL: \\*\\* Exception" puts "TODO OCC11111 ALL: Faulty OCC22910" puts "TODO OCC11111 ALL: Error: The command cannot be built" puts "================" -puts "OCC22910" +puts "0022910: F a i l u r e to compute iso-line for NURBS surface" puts "================" puts "" -####################################################################################### -# Failure to compute iso-line for NURBS surface -###################################################################################### set BugNumber OCC22910 diff --git a/tests/bugs/moddata_2/bug2569_2 b/tests/bugs/moddata_2/bug2569_2 index 6c996849a0..7bef991f71 100755 --- a/tests/bugs/moddata_2/bug2569_2 +++ b/tests/bugs/moddata_2/bug2569_2 @@ -1,19 +1,15 @@ # Incompleted behavior of test case is OK. # Exception should be thrown. -puts "TODO OCC11111 ALL: \\*\\* Exception" puts "TODO OCC11111 ALL: An exception was caught" pload QAcommands puts "============" -puts "OCC2569" +puts "0002569: If it is not possible to create the bezier curve, it should throw an e x c e p t i o n." puts "============" puts "" -###################################################### -# If it is not possible to create the bezier curve, -# it should throw an exception. -###################################################### + cpulimit 60 vinit diff --git a/tests/bugs/vis/bug346 b/tests/bugs/vis/bug346 index 9aea57cf0f..6f704c9c40 100755 --- a/tests/bugs/vis/bug346 +++ b/tests/bugs/vis/bug346 @@ -1,13 +1,9 @@ puts "TODO OCC12345 ALL: An exception was caught" -puts "TODO OCC12345 ALL: \\*\\* Exception \\*\\*.*" puts "TODO OCC12345 ALL: TEST INCOMPLETE" puts "================" -puts "OCC346" +puts "0000346: Avoiding e x c e p t i o n when the 2 vertices of the edge are the same" puts "================" puts "" -##################################################### -## Avoiding exception when the 2 vertices of the edge are the same. -##################################################### set x 10 set y 10 diff --git a/tests/offset/faces_type_i/D7 b/tests/offset/faces_type_i/D7 index 237836c906..dd9383af54 100644 --- a/tests/offset/faces_type_i/D7 +++ b/tests/offset/faces_type_i/D7 @@ -1,4 +1,3 @@ -puts "TODO OCC24156 MacOS: \\*\\* Exception \\*\\*.*" puts "TODO OCC24156 MacOS: An exception was caught" puts "TODO OCC24156 MacOS: TEST INCOMPLETE" diff --git a/tests/offset/faces_type_i/E7 b/tests/offset/faces_type_i/E7 index 7a80a1f2dd..0be2810d3a 100755 --- a/tests/offset/faces_type_i/E7 +++ b/tests/offset/faces_type_i/E7 @@ -1,4 +1,3 @@ -puts "TODO OCC24156 MacOS: \\*\\* Exception \\*\\*.*" puts "TODO OCC24156 MacOS: An exception was caught" puts "TODO OCC24156 MacOS: TEST INCOMPLETE" puts "TODO OCC23748 ALL: ERROR. offsetperform operation not done." diff --git a/tests/offset/faces_type_i/E8 b/tests/offset/faces_type_i/E8 index 3f87e040ab..a11a388ca7 100644 --- a/tests/offset/faces_type_i/E8 +++ b/tests/offset/faces_type_i/E8 @@ -1,4 +1,3 @@ -puts "TODO OCC24156 MacOS: \\*\\* Exception \\*\\*.*" puts "TODO OCC24156 MacOS: An exception was caught" puts "TODO OCC24156 MacOS: TEST INCOMPLETE" puts "TODO OCC23748 ALL: ERROR. offsetperform operation not done." diff --git a/tests/offset/faces_type_i/E9 b/tests/offset/faces_type_i/E9 index bd5e04510c..ec5307350f 100644 --- a/tests/offset/faces_type_i/E9 +++ b/tests/offset/faces_type_i/E9 @@ -1,4 +1,3 @@ -puts "TODO OCC24156 MacOS: \\*\\* Exception \\*\\*.*" puts "TODO OCC24156 MacOS: An exception was caught" puts "TODO OCC24156 MacOS: TEST INCOMPLETE" puts "TODO OCC23748 ALL: ERROR. offsetperform operation not done." diff --git a/tests/offset/faces_type_i/F2 b/tests/offset/faces_type_i/F2 index 6637066bd3..0d23b75d5f 100755 --- a/tests/offset/faces_type_i/F2 +++ b/tests/offset/faces_type_i/F2 @@ -1,4 +1,3 @@ -puts "TODO OCC24156 MacOS: \\*\\* Exception \\*\\*.*" puts "TODO OCC24156 MacOS: An exception was caught" puts "TODO OCC24156 MacOS: TEST INCOMPLETE" puts "TODO OCC23748 ALL: ERROR. offsetperform operation not done." diff --git a/tests/offset/faces_type_i/F3 b/tests/offset/faces_type_i/F3 index 727afa99b6..6243913d5b 100644 --- a/tests/offset/faces_type_i/F3 +++ b/tests/offset/faces_type_i/F3 @@ -1,4 +1,3 @@ -puts "TODO OCC24156 MacOS: \\*\\* Exception \\*\\*.*" puts "TODO OCC24156 MacOS: An exception was caught" puts "TODO OCC24156 MacOS: TEST INCOMPLETE" puts "TODO OCC23748 ALL: ERROR. offsetperform operation not done." diff --git a/tests/offset/faces_type_i/F4 b/tests/offset/faces_type_i/F4 index 7e26ded919..8fcbf2bd36 100644 --- a/tests/offset/faces_type_i/F4 +++ b/tests/offset/faces_type_i/F4 @@ -1,4 +1,3 @@ -puts "TODO OCC24156 MacOS: \\*\\* Exception \\*\\*.*" puts "TODO OCC24156 MacOS: An exception was caught" puts "TODO OCC24156 MacOS: TEST INCOMPLETE" puts "TODO OCC23748 ALL: ERROR. offsetperform operation not done." diff --git a/tests/offset/faces_type_i/F5 b/tests/offset/faces_type_i/F5 index b643d5c7c4..8441586e46 100644 --- a/tests/offset/faces_type_i/F5 +++ b/tests/offset/faces_type_i/F5 @@ -1,4 +1,3 @@ -puts "TODO OCC24156 MacOS: \\*\\* Exception \\*\\*.*" puts "TODO OCC24156 MacOS: An exception was caught" puts "TODO OCC24156 MacOS: TEST INCOMPLETE" puts "TODO OCC23748 ALL: ERROR. offsetperform operation not done." diff --git a/tests/offset/faces_type_i/G5 b/tests/offset/faces_type_i/G5 index 74da62193b..1a7f05e893 100644 --- a/tests/offset/faces_type_i/G5 +++ b/tests/offset/faces_type_i/G5 @@ -1,4 +1,3 @@ -puts "TODO OCC24156 MacOS: \\*\\* Exception \\*\\*.*" puts "TODO OCC24156 MacOS: An exception was caught" puts "TODO OCC24156 MacOS: TEST INCOMPLETE" diff --git a/tests/offset/faces_type_i/L1 b/tests/offset/faces_type_i/L1 index c88fd2c000..37e058c409 100644 --- a/tests/offset/faces_type_i/L1 +++ b/tests/offset/faces_type_i/L1 @@ -1,4 +1,3 @@ -puts "TODO OCC24156 MacOS: \\*\\* Exception \\*\\*.*" puts "TODO OCC24156 MacOS: An exception was caught" puts "TODO OCC24156 MacOS: TEST INCOMPLETE" diff --git a/tests/offset/faces_type_i/L2 b/tests/offset/faces_type_i/L2 index 8eeaa61e25..fdae0a42bf 100644 --- a/tests/offset/faces_type_i/L2 +++ b/tests/offset/faces_type_i/L2 @@ -1,4 +1,3 @@ -puts "TODO OCC24156 MacOS: \\*\\* Exception \\*\\*.*" puts "TODO OCC24156 MacOS: An exception was caught" puts "TODO OCC24156 MacOS: TEST INCOMPLETE" diff --git a/tests/offset/faces_type_i/L3 b/tests/offset/faces_type_i/L3 index 60bc01e850..337e9f019b 100644 --- a/tests/offset/faces_type_i/L3 +++ b/tests/offset/faces_type_i/L3 @@ -1,4 +1,3 @@ -puts "TODO OCC24156 MacOS: \\*\\* Exception \\*\\*.*" puts "TODO OCC24156 MacOS: An exception was caught" puts "TODO OCC24156 MacOS: TEST INCOMPLETE" diff --git a/tests/offset/faces_type_i/L4 b/tests/offset/faces_type_i/L4 index b06c2d8715..8ab2418c93 100644 --- a/tests/offset/faces_type_i/L4 +++ b/tests/offset/faces_type_i/L4 @@ -1,4 +1,3 @@ -puts "TODO OCC24156 MacOS: \\*\\* Exception \\*\\*.*" puts "TODO OCC24156 MacOS: An exception was caught" puts "TODO OCC24156 MacOS: TEST INCOMPLETE" diff --git a/tests/offset/faces_type_i/L5 b/tests/offset/faces_type_i/L5 index 010e6a806c..7741b82d8f 100644 --- a/tests/offset/faces_type_i/L5 +++ b/tests/offset/faces_type_i/L5 @@ -1,4 +1,3 @@ -puts "TODO OCC24156 MacOS: \\*\\* Exception \\*\\*.*" puts "TODO OCC24156 MacOS: An exception was caught" puts "TODO OCC24156 MacOS: TEST INCOMPLETE" diff --git a/tests/offset/faces_type_i/L6 b/tests/offset/faces_type_i/L6 index eb2de9f732..1d9941aec7 100644 --- a/tests/offset/faces_type_i/L6 +++ b/tests/offset/faces_type_i/L6 @@ -1,4 +1,3 @@ -puts "TODO OCC24156 MacOS: \\*\\* Exception \\*\\*.*" puts "TODO OCC24156 MacOS: An exception was caught" puts "TODO OCC24156 MacOS: TEST INCOMPLETE" diff --git a/tests/offset/faces_type_i/L7 b/tests/offset/faces_type_i/L7 index 66ad0d872b..700bf53df1 100644 --- a/tests/offset/faces_type_i/L7 +++ b/tests/offset/faces_type_i/L7 @@ -1,4 +1,3 @@ -puts "TODO OCC24156 MacOS: \\*\\* Exception \\*\\*.*" puts "TODO OCC24156 MacOS: An exception was caught" puts "TODO OCC24156 MacOS: TEST INCOMPLETE" diff --git a/tests/offset/faces_type_i/L8 b/tests/offset/faces_type_i/L8 index 6ef4dbd2a5..8393f94745 100644 --- a/tests/offset/faces_type_i/L8 +++ b/tests/offset/faces_type_i/L8 @@ -1,4 +1,3 @@ -puts "TODO OCC24156 MacOS: \\*\\* Exception \\*\\*.*" puts "TODO OCC24156 MacOS: An exception was caught" puts "TODO OCC24156 MacOS: TEST INCOMPLETE" diff --git a/tests/offset/faces_type_i/L9 b/tests/offset/faces_type_i/L9 index 5ef0777815..f902f4c5c5 100644 --- a/tests/offset/faces_type_i/L9 +++ b/tests/offset/faces_type_i/L9 @@ -1,4 +1,3 @@ -puts "TODO OCC24156 MacOS: \\*\\* Exception \\*\\*.*" puts "TODO OCC24156 MacOS: An exception was caught" puts "TODO OCC24156 MacOS: TEST INCOMPLETE" diff --git a/tests/offset/faces_type_i/M1 b/tests/offset/faces_type_i/M1 index 21fc508fdc..5678bbb730 100644 --- a/tests/offset/faces_type_i/M1 +++ b/tests/offset/faces_type_i/M1 @@ -1,4 +1,3 @@ -puts "TODO OCC24156 MacOS: \\*\\* Exception \\*\\*.*" puts "TODO OCC24156 MacOS: An exception was caught" puts "TODO OCC24156 MacOS: TEST INCOMPLETE" diff --git a/tests/offset/faces_type_i/M3 b/tests/offset/faces_type_i/M3 index fdfcb20e39..a196f13a9f 100644 --- a/tests/offset/faces_type_i/M3 +++ b/tests/offset/faces_type_i/M3 @@ -1,4 +1,3 @@ -puts "TODO OCC24156 MacOS: \\*\\* Exception \\*\\*.*" puts "TODO OCC24156 MacOS: An exception was caught" puts "TODO OCC24156 MacOS: TEST INCOMPLETE" diff --git a/tests/offset/faces_type_i/N1 b/tests/offset/faces_type_i/N1 index c1d6e5cdd4..da57c569ca 100644 --- a/tests/offset/faces_type_i/N1 +++ b/tests/offset/faces_type_i/N1 @@ -1,4 +1,3 @@ -puts "TODO OCC24156 MacOS: \\*\\* Exception \\*\\*.*" puts "TODO OCC24156 MacOS: An exception was caught" puts "TODO OCC24156 MacOS: TEST INCOMPLETE" puts "TODO OCC23748 ALL: ERROR. offsetperform operation not done." diff --git a/tests/offset/faces_type_i/N2 b/tests/offset/faces_type_i/N2 index de34b7b218..ba67fa81c4 100644 --- a/tests/offset/faces_type_i/N2 +++ b/tests/offset/faces_type_i/N2 @@ -1,4 +1,3 @@ -puts "TODO OCC24156 MacOS: \\*\\* Exception \\*\\*.*" puts "TODO OCC24156 MacOS: An exception was caught" puts "TODO OCC24156 MacOS: TEST INCOMPLETE" diff --git a/tests/offset/shape_type_i/C5 b/tests/offset/shape_type_i/C5 index 551b6a5c52..36129be940 100644 --- a/tests/offset/shape_type_i/C5 +++ b/tests/offset/shape_type_i/C5 @@ -1,4 +1,3 @@ -puts "TODO OCC24156 MacOS: \\*\\* Exception \\*\\*.*" puts "TODO OCC24156 MacOS: An exception was caught" puts "TODO OCC24156 MacOS: TEST INCOMPLETE" puts "TODO OCC23068 ALL: Faulty shapes in variables faulty_1 to faulty_" diff --git a/tests/offset/shape_type_i/D6 b/tests/offset/shape_type_i/D6 index 86411c5277..3bf8a67723 100755 --- a/tests/offset/shape_type_i/D6 +++ b/tests/offset/shape_type_i/D6 @@ -1,4 +1,3 @@ -puts "TODO OCC24156 MacOS: \\*\\* Exception \\*\\*.*" puts "TODO OCC24156 MacOS: An exception was caught" puts "TODO OCC24156 MacOS: TEST INCOMPLETE" diff --git a/tests/offset/shape_type_i/D7 b/tests/offset/shape_type_i/D7 index 237836c906..dd9383af54 100755 --- a/tests/offset/shape_type_i/D7 +++ b/tests/offset/shape_type_i/D7 @@ -1,4 +1,3 @@ -puts "TODO OCC24156 MacOS: \\*\\* Exception \\*\\*.*" puts "TODO OCC24156 MacOS: An exception was caught" puts "TODO OCC24156 MacOS: TEST INCOMPLETE" diff --git a/tests/offset/shape_type_i/G2 b/tests/offset/shape_type_i/G2 index 84334edc63..bc83d058f4 100644 --- a/tests/offset/shape_type_i/G2 +++ b/tests/offset/shape_type_i/G2 @@ -1,4 +1,3 @@ -puts "TODO OCC24156 MacOS: \\*\\* Exception \\*\\*.*" puts "TODO OCC24156 MacOS: An exception was caught" puts "TODO OCC24156 MacOS: TEST INCOMPLETE" diff --git a/tests/offset/shape_type_i/G3 b/tests/offset/shape_type_i/G3 index c5cdcf770a..8c6c29b743 100644 --- a/tests/offset/shape_type_i/G3 +++ b/tests/offset/shape_type_i/G3 @@ -1,4 +1,3 @@ -puts "TODO OCC24156 MacOS: \\*\\* Exception \\*\\*.*" puts "TODO OCC24156 MacOS: An exception was caught" puts "TODO OCC24156 MacOS: TEST INCOMPLETE" diff --git a/tests/offset/shape_type_i/G4 b/tests/offset/shape_type_i/G4 index 8b3b931d6f..05427f1500 100644 --- a/tests/offset/shape_type_i/G4 +++ b/tests/offset/shape_type_i/G4 @@ -1,4 +1,3 @@ -puts "TODO OCC24156 MacOS: \\*\\* Exception \\*\\*.*" puts "TODO OCC24156 MacOS: An exception was caught" puts "TODO OCC24156 MacOS: TEST INCOMPLETE" diff --git a/tests/pipe/bugs/bug24909_1 b/tests/pipe/bugs/bug24909_1 index de4e431b85..204ee56c3c 100755 --- a/tests/pipe/bugs/bug24909_1 +++ b/tests/pipe/bugs/bug24909_1 @@ -1,15 +1,11 @@ puts "TODO ?OCC24909 ALL: An exception was caught" -puts "TODO ?OCC24909 ALL: \\*\\* Exception \\*\\*.*" puts "TODO ?OCC24909 ALL: TEST INCOMPLETE" puts "TODO ?OCC24909 ALL: Tcl Exception: Buildsweep : Not Done" puts "========" -puts "OCC24909" +puts "0024909: S I G S E G V in buildsweep" puts "========" puts "" -################################## -# 0024909: SIGSEGV in buildsweep -################################## restore [locate_data_file bug24909_sweep3-draw-Sweep-0-spine.brep] Sweep-0-spine diff --git a/tests/pipe/bugs/bug24909_2 b/tests/pipe/bugs/bug24909_2 index 25784a151b..215b2539d9 100755 --- a/tests/pipe/bugs/bug24909_2 +++ b/tests/pipe/bugs/bug24909_2 @@ -1,15 +1,11 @@ puts "TODO ?OCC24909 ALL: An exception was caught" -puts "TODO ?OCC24909 ALL: \\*\\* Exception \\*\\*.*" puts "TODO ?OCC24909 ALL: TEST INCOMPLETE" puts "TODO ?OCC24909 ALL: Tcl Exception: Buildsweep : Not Done" puts "========" -puts "OCC24909" +puts "0024909: S I G S E G V in buildsweep" puts "========" puts "" -################################## -# 0024909: SIGSEGV in buildsweep -################################## circle c1 0 0 0 40 mkedge e1 c1 diff --git a/tests/pipe/bugs/bug25110 b/tests/pipe/bugs/bug25110 index ea49e844da..1e18bebc52 100755 --- a/tests/pipe/bugs/bug25110 +++ b/tests/pipe/bugs/bug25110 @@ -1,14 +1,10 @@ puts "TODO OCC25110 ALL: An exception was caught" -puts "TODO OCC25110 ALL: \\*\\* Exception \\*\\*.*" puts "TODO OCC25110 ALL: TEST INCOMPLETE" puts "========" -puts "OCC25110" +puts "0025110: TCollection_IndexedDataMap::FindFromKey e r r o r when sweeping circle along BezierCurve" puts "========" puts "" -######################################################################################## -# TCollection_IndexedDataMap::FindFromKey error when sweeping circle along BezierCurve -######################################################################################## restore [locate_data_file bug25110_unsweepable1-draw-Sweep-0-spine.brep] Sweep-0-spine restore [locate_data_file bug25110_unsweepable1-draw-Sweep-0-section-00-Circle.brep] Sweep-0-section-00-Circle diff --git a/tests/pipe/bugs/bug26088 b/tests/pipe/bugs/bug26088 index d8358a80b9..20dffdf22f 100755 --- a/tests/pipe/bugs/bug26088 +++ b/tests/pipe/bugs/bug26088 @@ -1,14 +1,10 @@ puts "TODO OCC26088 ALL: An exception was caught" -puts "TODO OCC26088 ALL: \\*\\* Exception \\*\\*.*" puts "TODO OCC26088 ALL: TEST INCOMPLETE" puts "========" -puts "OCC26088" +puts "0026088: E x c e p t i o n in pipe algorithm" puts "========" puts "" -############################### -# Exception in pipe algorithm -############################### restore [locate_data_file bug26088_path0.brep] p restore [locate_data_file bug26088_profile0.brep] pr diff --git a/tests/thrusection/bugs/bug24997 b/tests/thrusection/bugs/bug24997 index 5a8bb5fc04..e859880cc7 100755 --- a/tests/thrusection/bugs/bug24997 +++ b/tests/thrusection/bugs/bug24997 @@ -1,14 +1,10 @@ puts "TODO OCC24997 ALL: An exception was caught" -puts "TODO OCC24997 ALL: \\*\\* Exception \\*\\*.*" puts "TODO OCC24997 ALL: TEST INCOMPLETE" puts "========" -puts "OCC24997" +puts "0024997: S I G S E G V in BRepOffsetAPI_ThruSections" puts "========" puts "" -######################################### -# SIGSEGV in BRepOffsetAPI_ThruSections -######################################### restore [locate_data_file bug24997_loft3-draw-Loft-00-section.brep] Loft-00-section restore [locate_data_file bug24997_loft3-draw-Loft-01-section.brep] Loft-01-section