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

0031188: Draw Harness - enable colorized messages output to console by default

Browse Source 
Message_PrinterOStream now uses colorized output by default.
DRAWEXE has been corrected to disabled colorized output
when it is called with -f argument to avoid spoiling testgrid HTML logs.
This commit is contained in:
kgv 2019-11-23 00:08:22 +03:00 committed by bugmaster
parent 8c2d331426
commit e513a6c538
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Draw/Draw.cxx
View File

@ -23,6 +23,9 @@
#include <Draw_ProgressIndicator.hxx> #include <Draw_ProgressIndicator.hxx>
#include <Draw_Window.hxx> #include <Draw_Window.hxx>
#include <gp_Pnt2d.hxx> #include <gp_Pnt2d.hxx>
#include <Message.hxx>
#include <Message_Messenger.hxx>
#include <Message_PrinterOStream.hxx>
#include <OSD.hxx> #include <OSD.hxx>
#include <OSD_Environment.hxx> #include <OSD_Environment.hxx>
#include <OSD_File.hxx> #include <OSD_File.hxx>
@ -496,7 +499,20 @@ void Draw_Appli(int argc, char** argv, const FDraw_InitAppli Draw_InitAppli)
} }
// read commands from file // read commands from file
if (!aRunFile.IsEmpty()) { if (!aRunFile.IsEmpty())
{
if (!isInteractiveForced)
{
// disable console messages colorization to avoid spoiling log with color codes
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);
}
}
}
ReadInitFile (aRunFile); ReadInitFile (aRunFile);
// provide a clean exit, this is useful for some analysis tools // provide a clean exit, this is useful for some analysis tools
if ( ! isInteractiveForced ) if ( ! isInteractiveForced )

5
src/Message/Message_PrinterOStream.cxx
View File

@ -37,7 +37,7 @@ Message_PrinterOStream::Message_PrinterOStream (const Message_Gravity theTraceLe
: myStream (&std::cout), : myStream (&std::cout),
myIsFile (Standard_False), myIsFile (Standard_False),
myUseUtf8 (Standard_False), myUseUtf8 (Standard_False),
myToColorize (Standard_False) myToColorize (Standard_True)
{ {
myTraceLevel = theTraceLevel; myTraceLevel = theTraceLevel;
} }
@ -53,7 +53,7 @@ Message_PrinterOStream::Message_PrinterOStream (const Standard_CString theFileNa
: myStream (&std::cout), : myStream (&std::cout),
myIsFile (Standard_False), myIsFile (Standard_False),
myUseUtf8 (Standard_False), myUseUtf8 (Standard_False),
myToColorize (Standard_False) myToColorize (Standard_True)
{ {
myTraceLevel = theTraceLevel; myTraceLevel = theTraceLevel;
if (strcasecmp(theFileName, "cerr") == 0) if (strcasecmp(theFileName, "cerr") == 0)
@ -78,6 +78,7 @@ Message_PrinterOStream::Message_PrinterOStream (const Standard_CString theFileNa
{ {
myStream = (Standard_OStream* )aFile; myStream = (Standard_OStream* )aFile;
myIsFile = Standard_True; myIsFile = Standard_True;
myToColorize = Standard_False;
} }
else else
{ {

2
src/Message/Message_PrinterOStream.hxx
View File

@ -74,7 +74,7 @@ public:
//! Returns reference to the output stream //! Returns reference to the output stream
Standard_OStream& GetStream() const { return *(Standard_OStream*)myStream; } Standard_OStream& GetStream() const { return *(Standard_OStream*)myStream; }
//! Returns TRUE if text output into console should be colorized depending on message gravity. //! Returns TRUE if text output into console should be colorized depending on message gravity; TRUE by default.
Standard_Boolean ToColorize() const { return myToColorize; } Standard_Boolean ToColorize() const { return myToColorize; }
//! Set if text output into console should be colorized depending on message gravity. //! Set if text output into console should be colorized depending on message gravity.