OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-03 17:56:21 +03:00
Code Packages Releases Activity

0031189: Draw Harness, ViewerTest - send messages to Message::DefaultMessenger()

Browse Source 
Added short-cuts methods in Message_Messenger for sending message with specified gravity,
and stream buffer class for using stream-like interface for that.
Similar short-cuts to DefaultMessenger() are added in Message package.

ViewerTest has been updated to send messages to Message::DefaultMessenger()
instead of direct output to std::cout/std::cerr.

Off-topic: spelling error (duplicate "and") is corrected in two places

Added test bugs fclasses bug31189
This commit is contained in:
kgv 2019-11-24 15:02:39 +03:00 committed by bugmaster
parent 331bcfc0d0
commit 23fe70ec52
13 changed files with 1125 additions and 968 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
src/Message/Message.hxx
View File

@ -17,41 +17,58 @@
#ifndef _Message_HeaderFile
#define _Message_HeaderFile
#include <Standard.hxx>
#include <Standard_DefineAlloc.hxx>
#include <Standard_Handle.hxx>
#include <Standard_Integer.hxx>
#include <Standard_Real.hxx>
class Message_Messenger;
class TCollection_AsciiString;
class Message_Msg;
class Message_MsgFile;
class Message_Messenger;
class Message_Algorithm;
class Message_Printer;
class Message_PrinterOStream;
class Message_ProgressIndicator;
class Message_ProgressScale;
class Message_ProgressSentry;
#include <Message_Messenger.hxx>
//! Defines
//! - tools to work with messages
//! - basic tools intended for progress indication
class Message
class Message
{
public:
DEFINE_STANDARD_ALLOC
//! Defines default messenger for OCCT applications.
//! This is global static instance of the messenger.
//! By default, it contains single printer directed to std::cout.
//! It can be customized according to the application needs.
//!
//! The following syntax can be used to print messages:
//! @begincode
//! Message::DefaultMessenger()->Send ("My Warning", Message_Warning);
//! Message::SendWarning ("My Warning"); // short-cut for Message_Warning
//! Message::SendWarning() << "My Warning with " << theCounter << " arguments";
//! Message::SendFail ("My Failure"); // short-cut for Message_Fail
//! @endcode
Standard_EXPORT static const Handle(Message_Messenger)& DefaultMessenger();
public:
//!@name Short-cuts to DefaultMessenger
static Message_Messenger::StreamBuffer Send(Message_Gravity theGravity)
{
return DefaultMessenger()->Send (theGravity);
}
static void Send(const TCollection_AsciiString& theMessage, Message_Gravity theGravity)
{
DefaultMessenger()->Send (theMessage, theGravity);
}
static Message_Messenger::StreamBuffer SendFail() { return DefaultMessenger()->SendFail (); }
static Message_Messenger::StreamBuffer SendAlarm() { return DefaultMessenger()->SendAlarm (); }
static Message_Messenger::StreamBuffer SendWarning() { return DefaultMessenger()->SendWarning (); }
static Message_Messenger::StreamBuffer SendInfo() { return DefaultMessenger()->SendInfo (); }
static Message_Messenger::StreamBuffer SendTrace() { return DefaultMessenger()->SendTrace (); }
static void SendFail (const TCollection_AsciiString& theMessage) { return DefaultMessenger()->SendFail (theMessage); }
static void SendAlarm (const TCollection_AsciiString& theMessage) { return DefaultMessenger()->SendAlarm (theMessage); }
static void SendWarning (const TCollection_AsciiString& theMessage) { return DefaultMessenger()->SendWarning (theMessage); }
static void SendInfo (const TCollection_AsciiString& theMessage) { return DefaultMessenger()->SendInfo (theMessage); }
static void SendTrace (const TCollection_AsciiString& theMessage) { return DefaultMessenger()->SendTrace (theMessage); }
public:
//! Returns the string filled with values of hours, minutes and seconds.
//! Example:
//! 1. (5, 12, 26.3345) returns "05h:12m:26.33s",
@ -59,36 +76,6 @@ public:
//! 3. (0, 0, 4.5 ) returns "4.50s"
Standard_EXPORT static TCollection_AsciiString FillTime (const Standard_Integer Hour, const Standard_Integer Minute, const Standard_Real Second);
protected:
private:
friend class Message_Msg;
friend class Message_MsgFile;
friend class Message_Messenger;
friend class Message_Algorithm;
friend class Message_Printer;
friend class Message_PrinterOStream;
friend class Message_ProgressIndicator;
friend class Message_ProgressScale;
friend class Message_ProgressSentry;
};
#endif // _Message_HeaderFile

141
src/Message/Message_Messenger.hxx
View File

@ -18,11 +18,7 @@
#include <Message_Gravity.hxx>
#include <Message_SequenceOfPrinters.hxx>
#include <Standard_Transient.hxx>
#include <Standard_Boolean.hxx>
#include <Standard_Integer.hxx>
#include <Standard_Type.hxx>
#include <Standard_CString.hxx>
#include <TCollection_HAsciiString.hxx>
#include <TCollection_HExtendedString.hxx>
@ -44,13 +40,95 @@ DEFINE_STANDARD_HANDLE(Message_Messenger, Standard_Transient)
//! customized by the application, and dispatches every received
//! message to all the printers.
//!
//! For convenience, a number of operators << are defined with left
//! argument being Handle(Message_Messenger); thus it can be used
//! with syntax similar to C++ streams.
//! Note that all these operators use trace level Warning.
//! For convenience, a set of methods Send...() returning a string
//! stream buffer is defined for use of stream-like syntax with operator <<
//!
//! Example:
//! ~~~~~
//! Messenger->SendFail() << " Unknown fail at line " << aLineNo << " in file " << aFile;
//! ~~~~~
//!
//! The message is sent to messenger on destruction of the stream buffer,
//! call to Flush(), or passing manipulator std::ends, std::endl, or std::flush.
//! Empty messages are not sent except if manipulator is used.
class Message_Messenger : public Standard_Transient
{
DEFINE_STANDARD_RTTIEXT(Message_Messenger, Standard_Transient)
public:
//! Auxiliary class wrapping std::stringstream thus allowing constructing
//! message via stream interface, and putting result into its creator
//! Message_Messenger within destructor.
//!
//! It is intended to be used either as temporary object or as local
//! variable, note that content will be lost if it is copied.
class StreamBuffer
{
public:
//! Destructor flushing constructed message.
~StreamBuffer() { Flush(); }
//! Flush collected string to messenger
void Flush(Standard_Boolean doForce = Standard_False)
{
myStream.flush();
if (doForce || myStream.rdbuf()->in_avail() > 0)
{
myMessenger->Send (myStream.str().c_str(), myGravity);
myStream.str(std::string()); // empty the buffer for possible reuse
}
}
//! Formal copy constructor.
//!
//! Since buffer is intended for use as temporary object or local
//! variable, copy (or move) is needed only formally to be able to
//! return the new instance from relevant creation method.
//! In practice it should never be called because modern compilers
//! create such instances in place.
//! However note that if this constructor is called, the buffer
//! content (string) will not be copied (move is not supported for
//! std::stringstream class on old compilers such as gcc 4.4, msvc 9).
StreamBuffer (const StreamBuffer& theOther)
: myMessenger(theOther.myMessenger), myGravity(theOther.myGravity)
{
}
//! Wrapper for operator << of the stream
template <typename T>
StreamBuffer& operator << (const T& theArg)
{
myStream << theArg;
return *this;
}
//! Operator << for manipulators of ostream (ends, endl, flush),
//! flushes the buffer (sends the message)
StreamBuffer& operator << (std::ostream& (*)(std::ostream&))
{
Flush(Standard_True);
return *this;
}
//! Access to the stream object
Standard_SStream& Stream () { return myStream; }
private:
friend class Message_Messenger;
//! Main constructor creating temporary buffer.
//! Accessible only to Messenger class.
StreamBuffer (Message_Messenger* theMessenger, Message_Gravity theGravity)
: myMessenger (theMessenger),
myGravity (theGravity)
{}
private:
Message_Messenger* myMessenger; // don't make a Handle since this object should be created on stack
Message_Gravity myGravity;
Standard_SStream myStream;
};
public:
//! Empty constructor; initializes by single printer directed to std::cout.
@ -90,13 +168,52 @@ public:
//! The parameter putEndl specifies whether the new line should
//! be started after this message (default) or not (may have
//! sense in some conditions).
Standard_EXPORT void Send (const Standard_CString theString, const Message_Gravity theGravity = Message_Warning, const Standard_Boolean putEndl = Standard_True) const;
Standard_EXPORT void Send (const Standard_CString theString,
const Message_Gravity theGravity = Message_Warning,
const Standard_Boolean putEndl = Standard_True) const;
//! See above
Standard_EXPORT void Send (const TCollection_AsciiString& theString, const Message_Gravity theGravity = Message_Warning, const Standard_Boolean putEndl = Standard_True) const;
Standard_EXPORT void Send (const TCollection_AsciiString& theString,
const Message_Gravity theGravity = Message_Warning,
const Standard_Boolean putEndl = Standard_True) const;
//! See above
Standard_EXPORT void Send (const TCollection_ExtendedString& theString, const Message_Gravity theGravity = Message_Warning, const Standard_Boolean putEndl = Standard_True) const;
Standard_EXPORT void Send (const TCollection_ExtendedString& theString,
const Message_Gravity theGravity = Message_Warning,
const Standard_Boolean putEndl = Standard_True) const;
//! Create string buffer for message of specified type
StreamBuffer Send (Message_Gravity theGravity) { return StreamBuffer (this, theGravity); }
//! Create string buffer for sending Fail message
StreamBuffer SendFail () { return Send (Message_Fail); }
//! Create string buffer for sending Alarm message
StreamBuffer SendAlarm () { return Send (Message_Alarm); }
//! Create string buffer for sending Warning message
StreamBuffer SendWarning () { return Send (Message_Warning); }
//! Create string buffer for sending Info message
StreamBuffer SendInfo () { return Send (Message_Info); }
//! Create string buffer for sending Trace message
StreamBuffer SendTrace () { return Send (Message_Trace); }
//! Short-cut to Send (theMessage, Message_Fail)
void SendFail (const TCollection_AsciiString& theMessage) { Send (theMessage, Message_Fail); }
//! Short-cut to Send (theMessage, Message_Alarm)
void SendAlarm (const TCollection_AsciiString& theMessage) { Send (theMessage, Message_Alarm); }
//! Short-cut to Send (theMessage, Message_Warning)
void SendWarning (const TCollection_AsciiString& theMessage) { Send (theMessage, Message_Warning); }
//! Short-cut to Send (theMessage, Message_Info)
void SendInfo (const TCollection_AsciiString& theMessage) { Send (theMessage, Message_Info); }
//! Short-cut to Send (theMessage, Message_Trace)
void SendTrace (const TCollection_AsciiString& theMessage) { Send (theMessage, Message_Trace); }
private:

2
src/OSD/OSD_Parallel.cxx
View File

@ -140,7 +140,7 @@ namespace {
return aCpuMask;
}
// if we're not at the end of the item, expect a dash and and integer; extract end value.
// if we're not at the end of the item, expect a dash and integer; extract end value.
int anIndexUpper = anIndexLower;
if (aCharIter < aChunkEnd && *aCharIter == '-')
{

48
src/QABugs/QABugs_11.cxx
View File

@ -91,6 +91,8 @@
#include <BRepFeat_SplitShape.hxx>
#include <BRepAlgoAPI_Section.hxx>
#include <TColStd_PackedMapOfInteger.hxx>
#include <Message.hxx>
#include <Draw_Printer.hxx>
#if ! defined(_WIN32)
extern ViewerTest_DoubleMapOfInteractiveAndName& GetMapOfAIS();
@ -4770,6 +4772,43 @@ Standard_Integer OCC28478 (Draw_Interpretor& di, Standard_Integer argc, const ch
return 0;
}
Standard_Integer OCC31189 (Draw_Interpretor& theDI, Standard_Integer /*argc*/, const char ** /*argv*/)
{
// redirect output of default messenger to DRAW (temporarily)
const Handle(Message_Messenger)& aMsgMgr = Message::DefaultMessenger();
Message_SequenceOfPrinters aPrinters;
aPrinters.Append (aMsgMgr->ChangePrinters());
aMsgMgr->AddPrinter (new Draw_Printer (theDI));
// scope block to test output of message on destruction of a stream buffer
{
Message_Messenger::StreamBuffer aSender = Message::SendInfo();
// check that messages output to sender and directly to messenger do not intermix
aSender << "Sender message 1: start ...";
aMsgMgr->Send ("Direct message 1");
aSender << "... end" << std::endl; // endl should send the message
// check that empty stream buffer does not produce output on destruction
Message::SendInfo();
// additional message to check that they go in expected order
aMsgMgr->Send ("Direct message 2");
// check that empty stream buffer does produce empty line if std::endl is passed
Message::SendInfo() << std::endl;
// last message should be sent on destruction of a sender
aSender << "Sender message 2";
}
// restore initial output queue
aMsgMgr->RemovePrinters (STANDARD_TYPE(Draw_Printer));
aMsgMgr->ChangePrinters().Append (aPrinters);
return 0;
}
void QABugs::Commands_11(Draw_Interpretor& theCommands) {
const char *group = "QABugs";
@ -4781,14 +4820,6 @@ void QABugs::Commands_11(Draw_Interpretor& theCommands) {
theCommands.Add("OCC136", "OCC136", __FILE__, OCC136, group);
theCommands.Add("BUC60610","BUC60610 iges_input [name]",__FILE__,BUC60610,group);
//====================================================
//
// Following commands are inserted from
// /dn03/KAS/dev/QAopt/src/QADraw/QADraw_TOPOLOGY.cxx
// ( 75455 Apr 16 18:59)
//
//====================================================
theCommands.Add("OCC105","OCC105 shape",__FILE__,OCC105,group);
theCommands.Add("OCC9"," result path cur1 cur2 radius [tolerance]:\t test GeomFill_Pipe", __FILE__, pipe_OCC9,group);
@ -4873,5 +4904,6 @@ void QABugs::Commands_11(Draw_Interpretor& theCommands) {
theCommands.Add("CR23403", "CR23403 string", __FILE__, CR23403, group);
theCommands.Add("OCC23429", "OCC23429 res shape tool [appr]", __FILE__, OCC23429, group);
theCommands.Add("OCC28478", "OCC28478 [nb_outer=3 [nb_inner=2] [-inf]: test progress indicator on nested cycles", __FILE__, OCC28478, group);
theCommands.Add("OCC31189", "OCC31189: check stream buffer interface of Message_Messenger", __FILE__, OCC31189, group);
return;
}

281
src/ViewerTest/ViewerTest.cxx
View File

File diff suppressed because it is too large Load Diff

9
src/ViewerTest/ViewerTest_CmdParser.cxx
View File

@ -16,6 +16,7 @@
#include <ViewerTest_CmdParser.hxx>
#include <Draw.hxx>
#include <Message.hxx>
#include <ViewerTest.hxx>
#include <algorithm>
@ -157,7 +158,7 @@ void ViewerTest_CmdParser::Parse (const Standard_Integer theArgsNb, const char*
}
else
{
std::cerr << "Error: unknown argument '" << anOptionName << "'\n";
Message::SendFail() << "Error: unknown argument '" << anOptionName << "'";
return;
}
}
@ -261,9 +262,9 @@ bool ViewerTest_CmdParser::HasOption (const ViewerTest_CommandOptionKey theOptio
const bool aResult = (anOptionArguments.size() >= theMandatoryArgsNb);
if (isFatal && !aResult)
{
std::cerr << "Error: wrong syntax at option '" << myOptionStorage[theOptionKey].Name << "'\n"
<< "At least " << theMandatoryArgsNb << "expected, but only " << anOptionArguments.size()
<< "provided.\n";
Message::SendFail() << "Error: wrong syntax at option '" << myOptionStorage[theOptionKey].Name << "'\n"
<< "At least " << theMandatoryArgsNb << "expected, but only " << anOptionArguments.size()
<< "provided.";
}
return aResult;
}

502
src/ViewerTest/ViewerTest_ObjectCommands.cxx
View File

File diff suppressed because it is too large Load Diff

87
src/ViewerTest/ViewerTest_OpenGlCommands.cxx
View File

@ -186,27 +186,27 @@ void VUserDrawObj::Render(const Handle(OpenGl_Workspace)& theWorkspace) const
} // end of anonymous namespace
static Standard_Integer VUserDraw (Draw_Interpretor& di,
static Standard_Integer VUserDraw (Draw_Interpretor& ,
Standard_Integer argc,
const char ** argv)
{
Handle(AIS_InteractiveContext) aContext = ViewerTest::GetAISContext();
if (aContext.IsNull())
{
di << argv[0] << "Call 'vinit' before!\n";
Message::SendFail ("Error: no active viewer");
return 1;
}
Handle(OpenGl_GraphicDriver) aDriver = Handle(OpenGl_GraphicDriver)::DownCast (aContext->CurrentViewer()->Driver());
if (aDriver.IsNull())
{
std::cerr << "Graphic driver not available.\n";
Message::SendFail ("Error: Graphic driver not available.");
return 1;
}
if (argc > 2)
{
di << argv[0] << "Wrong number of arguments, only the object name expected\n";
Message::SendFail ("Syntax error: wrong number of arguments");
return 1;
}
@ -233,7 +233,7 @@ static int VFeedback (Draw_Interpretor& theDI,
Handle(V3d_View) aView = ViewerTest::CurrentView();
if (aView.IsNull())
{
std::cerr << "No active view. Please call vinit.\n";
Message::SendFail ("Error: no active viewer");
return 1;
}
@ -244,9 +244,9 @@ static int VFeedback (Draw_Interpretor& theDI,
if (aBytes / sizeof(GLfloat) != (size_t )aBufferSize)
{
// finito la commedia
std::cerr << "Can not allocate buffer - requested size ("
<< (double(aBufferSize / (1024 * 1024)) * double(sizeof(GLfloat)))
<< " MiB) is out of address space\n";
Message::SendFail() << "Can not allocate buffer - requested size ("
<< (double(aBufferSize / (1024 * 1024)) * double(sizeof(GLfloat)))
<< " MiB) is out of address space";
return 1;
}
@ -254,9 +254,9 @@ static int VFeedback (Draw_Interpretor& theDI,
if (aBuffer == NULL)
{
// finito la commedia
std::cerr << "Can not allocate buffer with size ("
<< (double(aBufferSize / (1024 * 1024)) * double(sizeof(GLfloat)))
<< " MiB)\n";
Message::SendFail() << "Can not allocate buffer with size ("
<< (double(aBufferSize / (1024 * 1024)) * double(sizeof(GLfloat)))
<< " MiB)";
return 1;
}
@ -390,21 +390,20 @@ static int VImmediateFront (Draw_Interpretor& /*theDI*/,
Handle(AIS_InteractiveContext) aContextAIS = ViewerTest::GetAISContext();
if (aContextAIS.IsNull())
{
std::cerr << "No active view. Please call vinit.\n";
Message::SendFail ("Error: no active viewer");
return 1;
}
Handle(Graphic3d_GraphicDriver) aDriver = aContextAIS->CurrentViewer()->Driver();
if (aDriver.IsNull())
{
std::cerr << "Graphic driver not available.\n";
Message::SendFail ("Error: graphic driver not available.");
return 1;
}
if (theArgNb < 2)
{
std::cerr << "Wrong number of arguments.\n";
Message::SendFail ("Syntax error: wrong number of arguments.");
return 1;
}
@ -440,7 +439,7 @@ static int VGlInfo (Draw_Interpretor& theDI,
Handle(V3d_View) aView = ViewerTest::CurrentView();
if (aView.IsNull())
{
std::cerr << "No active view. Please call vinit.\n";
Message::SendFail ("No active viewer");
return 1;
}
@ -517,7 +516,7 @@ static int VGlInfo (Draw_Interpretor& theDI,
}
else
{
std::cerr << "Unknown key '" << aName.ToCString() << "'\n";
Message::SendFail() << "Syntax error: unknown key '" << aName.ToCString() << "'";
return 1;
}
@ -590,12 +589,12 @@ static Standard_Integer VShaderProg (Draw_Interpretor& theDI,
Handle(AIS_InteractiveContext) aCtx = ViewerTest::GetAISContext();
if (aCtx.IsNull())
{
std::cout << "Error: no active view.\n";
Message::SendFail ("Error: no active viewer");
return 1;
}
else if (theArgNb < 2)
{
std::cout << "Syntax error: lack of arguments\n";
Message::SendFail ("Syntax error: lack of arguments");
return 1;
}
@ -631,7 +630,7 @@ static Standard_Integer VShaderProg (Draw_Interpretor& theDI,
}
if (aGlCtx.IsNull())
{
std::cout << "Error: no OpenGl_Context\n";
Message::SendFail ("Error: no OpenGl_Context");
return 1;
}
@ -651,7 +650,7 @@ static Standard_Integer VShaderProg (Draw_Interpretor& theDI,
Handle(OpenGl_ShaderProgram) aResProg;
if (!aGlCtx->GetResource (aShaderName, aResProg))
{
std::cout << "Syntax error: shader resource '" << aShaderName << "' is not found\n";
Message::SendFail() << "Syntax error: shader resource '" << aShaderName << "' is not found";
return 1;
}
if (aResProg->UpdateDebugDump (aGlCtx, "", false, anArg == "-dump"))
@ -661,7 +660,7 @@ static Standard_Integer VShaderProg (Draw_Interpretor& theDI,
}
if (anArgIter + 1 < theArgNb)
{
std::cout << "Syntax error: wrong number of arguments\n";
Message::SendFail ("Syntax error: wrong number of arguments");
return 1;
}
return 0;
@ -681,8 +680,8 @@ static Standard_Integer VShaderProg (Draw_Interpretor& theDI,
const TCollection_AsciiString& aShadersRoot = Graphic3d_ShaderProgram::ShadersFolder();
if (aShadersRoot.IsEmpty())
{
std::cout << "Error: both environment variables CSF_ShadersDirectory and CASROOT are undefined!\n"
"At least one should be defined to load Phong program.\n";
Message::SendFail("Error: both environment variables CSF_ShadersDirectory and CASROOT are undefined!\n"
"At least one should be defined to load Phong program.");
return 1;
}
@ -691,13 +690,13 @@ static Standard_Integer VShaderProg (Draw_Interpretor& theDI,
if (!aSrcVert.IsEmpty()
&& !OSD_File (aSrcVert).Exists())
{
std::cout << "Error: PhongShading.vs is not found\n";
Message::SendFail ("Error: PhongShading.vs is not found");
return 1;
}
if (!aSrcFrag.IsEmpty()
&& !OSD_File (aSrcFrag).Exists())
{
std::cout << "Error: PhongShading.fs is not found\n";
Message::SendFail ("Error: PhongShading.fs is not found");
return 1;
}
@ -745,7 +744,7 @@ static Standard_Integer VShaderProg (Draw_Interpretor& theDI,
}
else
{
std::cerr << "Syntax error at '" << aPrimTypeStr << "'\n";
Message::SendFail() << "Syntax error at '" << aPrimTypeStr << "'";
return 1;
}
}
@ -770,7 +769,7 @@ static Standard_Integer VShaderProg (Draw_Interpretor& theDI,
Handle(AIS_InteractiveObject) anIO = GetMapOfAIS().Find2 (theArgVec[anArgIter]);
if (anIO.IsNull())
{
std::cerr << "Syntax error: " << theArgVec[anArgIter] << " is not an AIS object\n";
Message::SendFail() << "Syntax error: " << theArgVec[anArgIter] << " is not an AIS object";
return 1;
}
aPrsList.Append (anIO);
@ -813,7 +812,7 @@ static Standard_Integer VShaderProg (Draw_Interpretor& theDI,
}
if (aShaderType == Graphic3d_TypeOfShaderObject(-1))
{
std::cerr << "Error: non-existing or invalid shader source\n";
Message::SendFail() << "Error: non-existing or invalid shader source";
return 1;
}
@ -821,7 +820,7 @@ static Standard_Integer VShaderProg (Draw_Interpretor& theDI,
}
else
{
std::cerr << "Syntax error at '" << anArg << "'\n";
Message::SendFail() << "Syntax error at '" << anArg << "'";
return 1;
}
}
@ -946,7 +945,7 @@ static Standard_Integer VListMaterials (Draw_Interpretor& theDI,
}
else
{
std::cout << "Syntax error: unknown argument '" << theArgVec[anArgIter] << "'\n";
Message::SendFail() << "Syntax error: unknown argument '" << theArgVec[anArgIter] << "'";
return 1;
}
}
@ -1000,7 +999,7 @@ static Standard_Integer VListMaterials (Draw_Interpretor& theDI,
OSD_OpenStream (aMatFile, aMatFilePath.ToCString(), std::ios::out | std::ios::binary);
if (!aMatFile.is_open())
{
std::cout << "Error: unable creating material file\n";
Message::SendFail ("Error: unable creating material file");
return 0;
}
if (!aDumpFile.EndsWith (".mtl"))
@ -1008,7 +1007,7 @@ static Standard_Integer VListMaterials (Draw_Interpretor& theDI,
OSD_OpenStream (anObjFile, anObjFilePath.ToCString(), std::ios::out | std::ios::binary);
if (!anObjFile.is_open())
{
std::cout << "Error: unable creating OBJ file\n";
Message::SendFail ("Error: unable creating OBJ file");
return 0;
}
@ -1023,7 +1022,7 @@ static Standard_Integer VListMaterials (Draw_Interpretor& theDI,
OSD_OpenStream (anHtmlFile, aDumpFile.ToCString(), std::ios::out | std::ios::binary);
if (!anHtmlFile.is_open())
{
std::cout << "Error: unable creating HTML file\n";
Message::SendFail ("Error: unable creating HTML file");
return 0;
}
anHtmlFile << "<html>\n"
@ -1082,7 +1081,7 @@ static Standard_Integer VListMaterials (Draw_Interpretor& theDI,
}
else if (!aDumpFile.IsEmpty())
{
std::cout << "Syntax error: unknown output file format\n";
Message::SendFail ("Syntax error: unknown output file format");
return 1;
}
@ -1224,7 +1223,7 @@ static Standard_Integer VListColors (Draw_Interpretor& theDI,
}
else
{
std::cout << "Syntax error: unknown argument '" << theArgVec[anArgIter] << "'\n";
Message::SendFail() << "Syntax error: unknown argument '" << theArgVec[anArgIter] << "'";
return 1;
}
}
@ -1255,7 +1254,7 @@ static Standard_Integer VListColors (Draw_Interpretor& theDI,
}
else if (!aDumpFile.IsEmpty())
{
std::cout << "Syntax error: unknown output file format\n";
Message::SendFail ("Syntax error: unknown output file format");
return 1;
}
@ -1285,7 +1284,7 @@ static Standard_Integer VListColors (Draw_Interpretor& theDI,
OSD_OpenStream (anHtmlFile, aDumpFile.ToCString(), std::ios::out | std::ios::binary);
if (!anHtmlFile.is_open())
{
std::cout << "Error: unable creating HTML file\n";
Message::SendFail ("Error: unable creating HTML file");
return 0;
}
anHtmlFile << "<html>\n"
@ -1392,7 +1391,7 @@ static Standard_Integer VGenEnvLUT (Draw_Interpretor&,
{
if (anArgIter + 1 >= theArgNb)
{
std::cerr << "Syntax error: size of PBR environment look up table is undefined" << "\n";
Message::SendFail ("Syntax error: size of PBR environment look up table is undefined");
return 1;
}
@ -1400,7 +1399,7 @@ static Standard_Integer VGenEnvLUT (Draw_Interpretor&,
if (aTableSize < 16)
{
std::cerr << "Error: size of PBR environment look up table must be greater or equal 16\n";
Message::SendFail ("Error: size of PBR environment look up table must be greater or equal 16");
return 1;
}
}
@ -1409,7 +1408,7 @@ static Standard_Integer VGenEnvLUT (Draw_Interpretor&,
{
if (anArgIter + 1 >= theArgNb)
{
std::cerr << "Syntax error: number of samples to generate PBR environment look up table is undefined" << "\n";
Message::SendFail ("Syntax error: number of samples to generate PBR environment look up table is undefined");
return 1;
}
@ -1417,13 +1416,13 @@ static Standard_Integer VGenEnvLUT (Draw_Interpretor&,
if (aNbSamples < 1)
{
std::cerr << "Syntax error: number of samples to generate PBR environment look up table must be greater than 1\n" << "\n";
Message::SendFail ("Syntax error: number of samples to generate PBR environment look up table must be greater than 1");
return 1;
}
}
else
{
std::cerr << "Syntax error: unknown argument " << anArg << ";\n";
Message::SendFail() << "Syntax error: unknown argument " << anArg;
return 1;
}
}
@ -1444,7 +1443,7 @@ static Standard_Integer VGenEnvLUT (Draw_Interpretor&,
if (!aFile.good())
{
std::cerr << "Error: unable to write to " << aFilePath << "\n";
Message::SendFail() << "Error: unable to write to " << aFilePath;
return 1;
}

131
src/ViewerTest/ViewerTest_RelationCommands.cxx
View File

@ -69,6 +69,7 @@
#include <gp_Pln.hxx>
#include <IntAna_IntConicQuad.hxx>
#include <IntAna_Quadric.hxx>
#include <Message.hxx>
#include <Precision.hxx>
#include <StdSelect.hxx>
#include <TCollection_AsciiString.hxx>
@ -251,7 +252,7 @@ static int ParseDimensionParams (Standard_Integer theArgNum,
{
if (!theShapeList)
{
std::cerr << "Error: unknown parameter '" << aParam << "'\n";
Message::SendFail() << "Error: unknown parameter '" << aParam << "'";
return 1;
}
@ -269,7 +270,7 @@ static int ParseDimensionParams (Standard_Integer theArgNum,
// Before all non-boolean flags parsing check if a flag have at least one value.
if (anIt + 1 >= theArgNum)
{
std::cerr << "Error: "<< aParam <<" flag should have value.\n";
Message::SendFail() << "Error: "<< aParam <<" flag should have value.";
return 1;
}
@ -279,7 +280,7 @@ static int ParseDimensionParams (Standard_Integer theArgNum,
{
if (!theShapeList)
{
std::cerr << "Error: unknown parameter '" << aParam << "'\n";
Message::SendFail() << "Error: unknown parameter '" << aParam << "'";
return 1;
}
@ -297,7 +298,7 @@ static int ParseDimensionParams (Standard_Integer theArgNum,
else if (!GetMapOfAIS().Find2 (anArgString, anAISObject)
|| anAISObject.IsNull())
{
std::cerr << "Error: shape with name '" << aStr << "' is not found.\n";
Message::SendFail() << "Error: shape with name '" << aStr << "' is not found.";
return 1;
}
theShapeList->Append (anAISObject);
@ -338,7 +339,7 @@ static int ParseDimensionParams (Standard_Integer theArgNum,
{
if (anIt + 1 >= theArgNum)
{
std::cout << "Error: wrong number of values for parameter '" << aParam << "'.\n";
Message::SendFail() << "Error: wrong number of values for parameter '" << aParam << "'";
return 1;
}
@ -361,7 +362,7 @@ static int ParseDimensionParams (Standard_Integer theArgNum,
else if (aParamValue == "vcenter") { theAspect->SetTextVerticalPosition (Prs3d_DTVP_Center);}
else
{
std::cerr << "Error: invalid label position: '" << aParamValue << "'.\n";
Message::SendFail() << "Error: invalid label position: '" << aParamValue << "'.";
return 1;
}
}
@ -381,7 +382,7 @@ static int ParseDimensionParams (Standard_Integer theArgNum,
TCollection_AsciiString aValue (theArgVec[++anIt]);
if (!aValue.IsRealValue())
{
std::cerr << "Error: arrow lenght should be float degree value.\n";
Message::SendFail() << "Error: arrow lenght should be float degree value.";
return 1;
}
theAspect->ArrowAspect()->SetLength (Draw::Atof (aValue.ToCString()));
@ -391,7 +392,7 @@ static int ParseDimensionParams (Standard_Integer theArgNum,
TCollection_AsciiString aValue (theArgVec[++anIt]);
if (!aValue.IsRealValue())
{
std::cerr << "Error: arrow angle should be float degree value.\n";
Message::SendFail ("Error: arrow angle should be float degree value.");
return 1;
}
theAspect->ArrowAspect()->SetAngle (Draw::Atof (aValue.ToCString()));
@ -405,7 +406,7 @@ static int ParseDimensionParams (Standard_Integer theArgNum,
TCollection_AsciiString aLocalParam(theArgVec[++anIt]);
if (!aLocalParam.IsRealValue())
{
std::cerr << "Error: extension size for dimension should be real value.\n";
Message::SendFail ("Error: extension size for dimension should be real value.");
return 1;
}
theAspect->SetExtensionSize (Draw::Atof (aLocalParam.ToCString()));
@ -431,7 +432,7 @@ static int ParseDimensionParams (Standard_Integer theArgNum,
}
else
{
std::cerr << "Error: wrong plane '" << aValue << "'.\n";
Message::SendFail() << "Error: wrong plane '" << aValue << "'";
return 1;
}
}
@ -440,7 +441,7 @@ static int ParseDimensionParams (Standard_Integer theArgNum,
TCollection_AsciiString aLocalParam(theArgVec[++anIt]);
if (!aLocalParam.IsRealValue())
{
std::cerr << "Error: flyout for dimension should be real value.\n";
Message::SendFail ("Error: flyout for dimension should be real value.");
return 1;
}
@ -451,7 +452,7 @@ static int ParseDimensionParams (Standard_Integer theArgNum,
TCollection_AsciiString aLocalParam(theArgVec[++anIt]);
if (!aLocalParam.IsRealValue())
{
std::cerr << "Error: dimension value for dimension should be real value.\n";
Message::SendFail ("Error: dimension value for dimension should be real value");
return 1;
}
@ -477,7 +478,7 @@ static int ParseDimensionParams (Standard_Integer theArgNum,
}
else
{
std::cerr << "Error: unknown parameter '" << aParam << "'.\n";
Message::SendFail() << "Error: unknown parameter '" << aParam << "'";
return 1;
}
}
@ -546,14 +547,14 @@ static int ParseAngleDimensionParams (Standard_Integer theArgNum,
if (aParam.Search ("-") == -1)
{
std::cerr << "Error: wrong parameter '" << aParam << "'.\n";
Message::SendFail() << "Error: wrong parameter '" << aParam << "'.";
return 1;
}
// Before all non-boolean flags parsing check if a flag have at least one value.
if (anIt + 1 >= theArgNum)
{
std::cerr << "Error: "<< aParam <<" flag should have value.\n";
Message::SendFail() << "Error: "<< aParam <<" flag should have value.";
return 1;
}
@ -571,7 +572,7 @@ static int ParseAngleDimensionParams (Standard_Integer theArgNum,
}
else
{
std::cerr << "Error: unknown parameter '" << aParam << "'.\n";
Message::SendFail() << "Error: unknown parameter '" << aParam << "'.";
return 1;
}
}
@ -607,7 +608,7 @@ static void SetAngleDimensionParams (const Handle(PrsDim_Dimension)& theDim,
}
else
{
std::cerr << "Error: wrong angle type.\n";
Message::SendFail() << "Error: wrong angle type.";
}
anAngleDim->SetType(anAngleType);
}
@ -634,7 +635,7 @@ static void SetAngleDimensionParams (const Handle(PrsDim_Dimension)& theDim,
}
else
{
std::cerr << "Error: wrong showarrow type.\n";
Message::SendFail() << "Error: wrong showarrow type.";
}
anAngleDim->SetArrowsVisibility(anArrowType);
}
@ -651,7 +652,7 @@ static int VDimBuilder (Draw_Interpretor& /*theDi*/,
{
if (theArgsNb < 2)
{
std::cerr << "Error: wrong number of arguments.\n";
Message::SendFail ("Syntax error: wrong number of arguments");
return 1;
}
@ -687,7 +688,7 @@ static int VDimBuilder (Draw_Interpretor& /*theDi*/,
}
else
{
std::cerr << "Error: wrong type of dimension.\n";
Message::SendFail ("Error: wrong type of dimension");
return 1;
}
@ -710,12 +711,12 @@ static int VDimBuilder (Draw_Interpretor& /*theDi*/,
if (aShapes.First()->Type() == AIS_KOI_Shape
&& (Handle(AIS_Shape)::DownCast(aShapes.First()))->Shape().ShapeType() != TopAbs_EDGE)
{
std::cerr << theArgs[0] << ": wrong shape type.\n";
Message::SendFail ("Error: wrong shape type");
return 1;
}
if (!isPlaneCustom)
{
std::cerr << theArgs[0] << ": can not build dimension without working plane.\n";
Message::SendFail ("Error: can not build dimension without working plane");
return 1;
}
@ -753,7 +754,7 @@ static int VDimBuilder (Draw_Interpretor& /*theDi*/,
if (aShape1.IsNull() || aShape2.IsNull())
{
std::cerr << theArgs[0] << ": wrong shape type.\n";
Message::SendFail ("Error: wrong shape type.");
return 1;
}
@ -774,7 +775,7 @@ static int VDimBuilder (Draw_Interpretor& /*theDi*/,
{
if (!isPlaneCustom)
{
std::cerr << theArgs[0] << ": can not build dimension without working plane.\n";
Message::SendFail ("Error: can not build dimension without working plane.");
return 1;
}
// Vertex-Vertex case
@ -792,7 +793,7 @@ static int VDimBuilder (Draw_Interpretor& /*theDi*/,
}
else
{
std::cerr << theArgs[0] << ": wrong number of shapes to build dimension.\n";
Message::SendFail ("Error: wrong number of shapes to build dimension");
return 1;
}
@ -816,7 +817,7 @@ static int VDimBuilder (Draw_Interpretor& /*theDi*/,
aDim = new PrsDim_AngleDimension (TopoDS::Edge(aShape1->Shape()),TopoDS::Edge(aShape2->Shape()));
else
{
std::cerr << theArgs[0] << ": wrong shapes for angle dimension.\n";
Message::SendFail ("Error: wrong shapes for angle dimension");
return 1;
}
}
@ -841,7 +842,7 @@ static int VDimBuilder (Draw_Interpretor& /*theDi*/,
}
else
{
std::cerr << theArgs[0] << ": wrong number of shapes to build dimension.\n";
Message::SendFail ("Error: wrong number of shapes to build dimension");
return 1;
}
@ -863,7 +864,7 @@ static int VDimBuilder (Draw_Interpretor& /*theDi*/,
}
if (aShapes.Extent() != 1)
{
std::cout << "Syntax error: wrong number of shapes to build dimension.\n";
Message::SendFail ("Syntax error: wrong number of shapes to build dimension");
return 1;
}
@ -890,7 +891,7 @@ static int VDimBuilder (Draw_Interpretor& /*theDi*/,
}
else
{
std::cout << "Error: shape for radius has wrong type.\n";
Message::SendFail ("Error: shape for radius has wrong type");
return 1;
}
break;
@ -910,7 +911,7 @@ static int VDimBuilder (Draw_Interpretor& /*theDi*/,
Handle(AIS_Shape) aShape = Handle(AIS_Shape)::DownCast (aShapes.First());
if (aShape.IsNull())
{
std::cerr << "Error: shape for radius is of wrong type.\n";
Message::SendFail ("Error: shape for radius is of wrong type");
return 1;
}
aDim = new PrsDim_DiameterDimension (aShape->Shape());
@ -918,7 +919,7 @@ static int VDimBuilder (Draw_Interpretor& /*theDi*/,
}
else
{
std::cerr << theArgs[0] << ": wrong number of shapes to build dimension.\n";
Message::SendFail ("Error: wrong number of shapes to build dimension");
return 1;
}
@ -926,7 +927,7 @@ static int VDimBuilder (Draw_Interpretor& /*theDi*/,
}
default:
{
std::cerr << theArgs[0] << ": wrong type of dimension. Type help for more information.\n";
Message::SendFail ("Error: wrong type of dimension. Type help for more information");
return 1;
}
}
@ -934,8 +935,8 @@ static int VDimBuilder (Draw_Interpretor& /*theDi*/,
// Check dimension geometry
if (!aDim->IsValid())
{
std::cerr << theArgs[0] << ":dimension geometry is invalid, " << aDimType.ToCString()
<< " dimension can't be built on input shapes.\n";
Message::SendFail() << "Error: dimension geometry is invalid, " << aDimType
<< " dimension can't be built on input shapes.";
return 1;
}
@ -975,7 +976,7 @@ static int VRelationBuilder (Draw_Interpretor& /*theDi*/,
{
if (theArgsNb < 2)
{
std::cerr << "Error: wrong number of arguments.\n";
Message::SendFail ("Error: wrong number of arguments");
return 1;
}
@ -1035,7 +1036,7 @@ static int VRelationBuilder (Draw_Interpretor& /*theDi*/,
{
if (aShapes.Extent() != 2)
{
std::cerr << "Error: Wrong number of selected shapes.\n";
Message::SendFail ("Error: Wrong number of selected shapes");
return 1;
}
@ -1045,7 +1046,7 @@ static int VRelationBuilder (Draw_Interpretor& /*theDi*/,
if (!(aShape1.ShapeType() == TopAbs_EDGE
&& aShape2.ShapeType() == TopAbs_EDGE))
{
std::cerr << "Syntax error: selected shapes are not edges.\n";
Message::SendFail ("Syntax error: selected shapes are not edges");
return 1;
}
@ -1064,7 +1065,7 @@ static int VRelationBuilder (Draw_Interpretor& /*theDi*/,
{
if (aShapes.Extent() != 4)
{
std::cerr << "Error: Wrong number of selected shapes.\n";
Message::SendFail ("Error: Wrong number of selected shapes");
return 1;
}
@ -1080,7 +1081,7 @@ static int VRelationBuilder (Draw_Interpretor& /*theDi*/,
if (!IsParallel (aSelectedShapes[0], aSelectedShapes[1])
|| !IsParallel (aSelectedShapes[2], aSelectedShapes[3]))
{
std::cerr << "Syntax error: non parallel edges.\n";
Message::SendFail ("Syntax error: non parallel edges");
return 1;
}
@ -1134,7 +1135,7 @@ static int VRelationBuilder (Draw_Interpretor& /*theDi*/,
{
if (aShapes.Extent() != 2 && aShapes.Extent() != 1)
{
std::cerr << "Error: Wrong number of selected shapes.\n";
Message::SendFail ("Error: Wrong number of selected shapes");
return 1;
}
@ -1143,7 +1144,7 @@ static int VRelationBuilder (Draw_Interpretor& /*theDi*/,
if (!(aShape1.ShapeType() == TopAbs_EDGE
&& aShape2.ShapeType() == TopAbs_EDGE))
{
std::cerr << "Syntax error: selected shapes are not edges.\n";
Message::SendFail ("Syntax error: selected shapes are not edges");
return 1;
}
@ -1162,14 +1163,14 @@ static int VRelationBuilder (Draw_Interpretor& /*theDi*/,
{
if (aShapes.Extent() != 1)
{
std::cerr << "Error: Wrong number of selected shapes.\n";
Message::SendFail ("Error: Wrong number of selected shapes");
return 1;
}
const TopoDS_Shape& aShape = aShapes.First();
if (aShape.ShapeType() != TopAbs_EDGE)
{
std::cerr << "Syntax error: selected shapes are not edges.\n";
Message::SendFail ("Syntax error: selected shapes are not edges");
return 1;
}
@ -1188,7 +1189,7 @@ static int VRelationBuilder (Draw_Interpretor& /*theDi*/,
{
if (aShapes.Extent() != 2)
{
std::cerr << "Error: Wrong number of selected shapes.\n";
Message::SendFail ("Error: Wrong number of selected shapes");
return 1;
}
@ -1258,7 +1259,7 @@ static int VRelationBuilder (Draw_Interpretor& /*theDi*/,
{
if (aShapes.Extent() != 2)
{
std::cerr << "Error: Wrong number of selected shapes.\n";
Message::SendFail ("Error: Wrong number of selected shapes");
return 1;
}
@ -1267,7 +1268,7 @@ static int VRelationBuilder (Draw_Interpretor& /*theDi*/,
if (!(aShape1.ShapeType() == TopAbs_FACE
&& aShape2.ShapeType() == TopAbs_FACE))
{
std::cerr << "Syntax error: selected shapes are not faces.\n";
Message::SendFail ("Syntax error: selected shapes are not faces");
return 1;
}
@ -1277,7 +1278,7 @@ static int VRelationBuilder (Draw_Interpretor& /*theDi*/,
BRepExtrema_ExtFF aDelta (aFace1, aFace2);
if (!aDelta.IsParallel())
{
std::cerr << "Syntax error: the faces are not parallel.\n";
Message::SendFail ("Syntax error: the faces are not parallel");
return 1;
}
@ -1290,7 +1291,7 @@ static int VRelationBuilder (Draw_Interpretor& /*theDi*/,
{
if (aShapes.Extent() != 2)
{
std::cerr << "Error: wrong number of selected shapes.\n";
Message::SendFail ("Error: wrong number of selected shapes");
return 1;
}
@ -1304,7 +1305,7 @@ static int VRelationBuilder (Draw_Interpretor& /*theDi*/,
if (!aDeltaEdge.IsParallel())
{
std::cerr << "Error: the edges are not parallel.\n";
Message::SendFail ("Error: the edges are not parallel");
return 1;
}
@ -1327,7 +1328,7 @@ static int VRelationBuilder (Draw_Interpretor& /*theDi*/,
BRepExtrema_ExtFF aDeltaFace (aFaceA, aFaceB);
if (!aDeltaFace.IsParallel())
{
std::cerr << "Error: the faces are not parallel.\n";
Message::SendFail ("Error: the faces are not parallel");
return 1;
}
@ -1353,7 +1354,7 @@ static int VRelationBuilder (Draw_Interpretor& /*theDi*/,
{
if (aShapes.Extent() != 2)
{
std::cerr << "Error: Wrong number of selected shapes.\n";
Message::SendFail ("Error: Wrong number of selected shapes");
return 1;
}
@ -1405,7 +1406,7 @@ static int VRelationBuilder (Draw_Interpretor& /*theDi*/,
{
if (aShapes.Extent() != 2)
{
std::cerr << "Error: Wrong number of selected shapes.\n";
Message::SendFail ("Error: Wrong number of selected shapes");
return 1;
}
@ -1456,7 +1457,7 @@ static int VRelationBuilder (Draw_Interpretor& /*theDi*/,
{
if (aShapes.Extent() != 3)
{
std::cerr << "Error: Wrong number of selected shapes.\n";
Message::SendFail ("Error: Wrong number of selected shapes");
return 1;
}
@ -1480,12 +1481,12 @@ static int VRelationBuilder (Draw_Interpretor& /*theDi*/,
if (!aDeltaEdgeAB.IsParallel())
{
std::cerr << "Syntax error: the edges are not parallel.\n";
Message::SendFail ("Syntax error: the edges are not parallel");
return 1;
}
if (!aDeltaEdgeAC.IsParallel())
{
std::cerr << "Syntax error: the edges are not parallel.\n";
Message::SendFail ("Syntax error: the edges are not parallel");
return 1;
}
@ -1521,7 +1522,7 @@ static int VRelationBuilder (Draw_Interpretor& /*theDi*/,
}
case PrsDim_KOR_NONE:
{
std::cerr << "Error: Unknown type of relation!\n";
Message::SendFail ("Error: Unknown type of relation!");
return 1;
}
}
@ -1582,7 +1583,7 @@ static int VDimParam (Draw_Interpretor& theDi, Standard_Integer theArgNum, const
if (!aDim->IsValid())
{
std::cerr << "Error: Dimension geometry or plane is not valid.\n";
Message::SendFail ("Error: Dimension geometry or plane is not valid");
return 1;
}
@ -1603,7 +1604,7 @@ static int VLengthParam (Draw_Interpretor&, Standard_Integer theArgNum, const ch
{
if (theArgNum < 3)
{
std::cout << theArgVec[0] << " error: the wrong number of input parameters.\n";
Message::SendFail ("Syntax error: the wrong number of input parameters");
return 1;
}
@ -1611,14 +1612,14 @@ static int VLengthParam (Draw_Interpretor&, Standard_Integer theArgNum, const ch
Handle(AIS_InteractiveObject) anObject;
if (!GetMapOfAIS().Find2 (aName, anObject))
{
std::cout << theArgVec[0] << "error: no object with this name.\n";
Message::SendFail() << "Syntax error: no object with name '" << aName << "'";
return 1;
}
Handle(PrsDim_LengthDimension) aLengthDim = Handle(PrsDim_LengthDimension)::DownCast (anObject);
if (aLengthDim.IsNull())
{
std::cout << theArgVec[0] << "error: no length dimension with this name.\n";
Message::SendFail() << "Syntax error: no length dimension with name '" << aName << "'";
return 1;
}
@ -1633,7 +1634,7 @@ static int VLengthParam (Draw_Interpretor&, Standard_Integer theArgNum, const ch
{
if (anArgumentIt + 1 >= theArgNum)
{
std::cout << "Error: "<< aParam <<" direction should have value.\n";
Message::SendFail() << "Error: "<< aParam <<" direction should have value";
return 1;
}
anArgumentIt++;
@ -1652,7 +1653,7 @@ static int VLengthParam (Draw_Interpretor&, Standard_Integer theArgNum, const ch
{
if (anArgumentIt + 2 >= theArgNum)
{
std::cout << "Error: wrong number of values for parameter '" << aParam << "'.\n";
Message::SendFail() << "Error: wrong number of values for parameter '" << aParam << "'";
return 1;
}
// access coordinate arguments
@ -1669,7 +1670,7 @@ static int VLengthParam (Draw_Interpretor&, Standard_Integer theArgNum, const ch
// non-numeric argument too early
if (aCoords.IsEmpty() || aCoords.Size() != 3)
{
std::cout << "Error: wrong number of direction arguments.\n";
Message::SendFail ("Error: wrong number of direction arguments");
return 1;
}
aDirection = gp_Dir (aCoords.Value (1), aCoords.Value (2), aCoords.Value (3));
@ -1679,7 +1680,7 @@ static int VLengthParam (Draw_Interpretor&, Standard_Integer theArgNum, const ch
aLengthDim->SetDirection (aDirection, isCustomDirection);
if (!aLengthDim->IsValid())
{
std::cout << "Error: Dimension geometry or plane is not valid.\n";
Message::SendFail ("Error: Dimension geometry or plane is not valid");
return 1;
}
@ -1734,7 +1735,7 @@ static int VAngleParam (Draw_Interpretor& theDi, Standard_Integer theArgNum, con
if (!aDim->IsValid())
{
std::cerr << "Error: Dimension geometry or plane is not valid.\n";
Message::SendFail ("Error: Dimension geometry or plane is not valid");
return 1;
}

776
src/ViewerTest/ViewerTest_ViewerCommands.cxx
View File

File diff suppressed because it is too large Load Diff

4
src/gce/gce_MakeCone.hxx
View File

@ -85,7 +85,7 @@ public:
//! "NullAngle".
Standard_EXPORT gce_MakeCone(const gp_Pnt& P1, const gp_Pnt& P2, const gp_Pnt& P3, const gp_Pnt& P4);
//! Makes a Cone by its axis <Axis> and and two points.
//! Makes a Cone by its axis <Axis> and two points.
//! The distance between <P1> and the axis is the radius
//! of the section passing through <P1>.
//! The distance between <P2> and the axis is the radius
@ -98,7 +98,7 @@ public:
//! "ConfusedPoints"
Standard_EXPORT gce_MakeCone(const gp_Ax1& Axis, const gp_Pnt& P1, const gp_Pnt& P2);
//! Makes a Cone by its axis <Axis> and and two points.
//! Makes a Cone by its axis <Axis> and two points.
//! The distance between <P1> and the axis is the radius
//! of the section passing through <P1>
//! The distance between <P2> and the axis is the radius

22
tests/bugs/fclasses/bug31189 Normal file
View File

@ -0,0 +1,22 @@
puts "# ============"
puts "# 0031189: Draw Harness, ViewerTest - send messages to Message::DefaultMessenger()"
puts "# ============"
puts ""
puts "# Test consistency of messages output using stream buffer interface"
pload QAcommands
set out [OCC31189]
set expected {
{Direct message 1}
{Sender message 1: start ...... end}
{Direct message 2}
{}
{Sender message 2}
}
if { [string compare [string trim $out] [join $expected "\n"]] } {
puts "Error: output (see above) does not match expected one:"
puts "[join $expected "\n"]"
puts ""
}

1
tests/bugs/vis/bug26035_2
View File

@ -5,6 +5,7 @@ puts ""
#######################################################################
# Exception when trying to draw dimension between face and point
#######################################################################
puts "REQUIRED All: Error: dimension geometry is invalid, -length dimension can't be built on input shapes"
vfont add [locate_data_file DejaVuSans.ttf] SansFont