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

0031709: Draw Harness - move methods ViewerTest::ParseOnOff()/ParseColor() to package Draw

Browse Source 
Methods ParseOnOff()/ParseColor() have been moved from package ViewerTest to Draw.
Command "vlight -color" now accepts RGB values, not only name.
Implementation of pload command has been cleaned up.
This commit is contained in:
kgv 2020-08-12 15:58:22 +03:00 committed by bugmaster
parent 76fada6839
commit dae2a92241
14 changed files with 851 additions and 774 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

296
src/Draw/Draw.cxx
View File

@ -675,31 +675,29 @@ Standard_Integer Draw_Call (char *c)
//================================================================================= //=================================================================================
// //
//================================================================================= //=================================================================================
void Draw::Load(Draw_Interpretor& theDI, const TCollection_AsciiString& theKey, void Draw::Load (Draw_Interpretor& theDI,
const TCollection_AsciiString& theKey,
const TCollection_AsciiString& theResourceFileName, const TCollection_AsciiString& theResourceFileName,
TCollection_AsciiString& theDefaultsDirectory, const TCollection_AsciiString& theDefaultsDirectory,
TCollection_AsciiString& theUserDefaultsDirectory, const TCollection_AsciiString& theUserDefaultsDirectory,
const Standard_Boolean Verbose ) { const Standard_Boolean theIsVerbose)
{
static Plugin_MapOfFunctions theMapOfFunctions; static Plugin_MapOfFunctions theMapOfFunctions;
OSD_Function f; OSD_Function aFunc = NULL;
if (!theMapOfFunctions.Find (theKey, aFunc))
if(!theMapOfFunctions.IsBound(theKey)) { {
TCollection_AsciiString aPluginLibrary;
Handle(Resource_Manager) aPluginResource = new Resource_Manager(theResourceFileName.ToCString(), theDefaultsDirectory, theUserDefaultsDirectory, Verbose); Handle(Resource_Manager) aPluginResource = new Resource_Manager (theResourceFileName, theDefaultsDirectory, theUserDefaultsDirectory, theIsVerbose);
if (!aPluginResource->Find (theKey, aPluginLibrary))
if(!aPluginResource->Find(theKey.ToCString())) { {
Standard_SStream aMsg; aMsg << "Could not find the resource:"; Message::SendFail() << "could not find the resource:" << theKey;
aMsg << theKey.ToCString()<< std::endl; Standard_SStream aMsg; aMsg << "Could not find the resource:" << theKey << std::endl;
std::cout << "could not find the resource:"<<theKey.ToCString()<< std::endl; throw Draw_Failure (aMsg.str().c_str());
throw Draw_Failure(aMsg.str().c_str());
} }
TCollection_AsciiString aPluginLibrary("");
#if !defined(_WIN32) || defined(__MINGW32__) #if !defined(_WIN32) || defined(__MINGW32__)
aPluginLibrary += "lib"; aPluginLibrary = TCollection_AsciiString ("lib") + aPluginLibrary;
#endif #endif
aPluginLibrary += aPluginResource->Value(theKey.ToCString());
#ifdef _WIN32 #ifdef _WIN32
aPluginLibrary += ".dll"; aPluginLibrary += ".dll";
#elif __APPLE__ #elif __APPLE__
@ -709,37 +707,251 @@ void Draw::Load(Draw_Interpretor& theDI, const TCollection_AsciiString& theKey,
#else #else
aPluginLibrary += ".so"; aPluginLibrary += ".so";
#endif #endif
OSD_SharedLibrary aSharedLibrary(aPluginLibrary.ToCString()); OSD_SharedLibrary aSharedLibrary (aPluginLibrary.ToCString());
if(!aSharedLibrary.DlOpen(OSD_RTLD_LAZY)) { if (!aSharedLibrary.DlOpen (OSD_RTLD_LAZY))
TCollection_AsciiString error(aSharedLibrary.DlError()); {
Standard_SStream aMsg; aMsg << "Could not open: "; const TCollection_AsciiString anError (aSharedLibrary.DlError());
aMsg << aPluginResource->Value(theKey.ToCString()); Standard_SStream aMsg;
aMsg << "; reason: "; aMsg << "Could not open: " << aPluginLibrary << "; reason: " << anError;
aMsg << error.ToCString();
#ifdef OCCT_DEBUG #ifdef OCCT_DEBUG
std::cout << "could not open: " << aPluginResource->Value(theKey.ToCString())<< " ; reason: "<< error.ToCString() << std::endl; std::cout << "could not open: " << aPluginLibrary << " ; reason: "<< anError << std::endl;
#endif #endif
throw Draw_Failure(aMsg.str().c_str()); throw Draw_Failure(aMsg.str().c_str());
} }
f = aSharedLibrary.DlSymb("PLUGINFACTORY");
if( f == NULL ) { aFunc = aSharedLibrary.DlSymb ("PLUGINFACTORY");
TCollection_AsciiString error(aSharedLibrary.DlError()); if (aFunc == NULL)
Standard_SStream aMsg; aMsg << "Could not find the factory in: "; {
aMsg << aPluginResource->Value(theKey.ToCString()); const TCollection_AsciiString anError (aSharedLibrary.DlError());
aMsg << error.ToCString(); Standard_SStream aMsg;
aMsg << "Could not find the factory in: " << aPluginLibrary << anError;
throw Draw_Failure(aMsg.str().c_str()); throw Draw_Failure(aMsg.str().c_str());
} }
theMapOfFunctions.Bind(theKey, f); theMapOfFunctions.Bind (theKey, aFunc);
} }
else
f = theMapOfFunctions(theKey);
// void (*fp) (Draw_Interpretor&, const TCollection_AsciiString&) = NULL;
// fp = (void (*)(Draw_Interpretor&, const TCollection_AsciiString&)) f;
// (*fp) (theDI, theKey);
void (*fp) (Draw_Interpretor&) = NULL; void (*fp) (Draw_Interpretor&) = NULL;
fp = (void (*)(Draw_Interpretor&)) f; fp = (void (*)(Draw_Interpretor&) )aFunc;
(*fp) (theDI); (*fp) (theDI);
}
namespace
{
const Standard_Integer THE_MAX_INTEGER_COLOR_COMPONENT = 255;
const Standard_ShortReal THE_MAX_REAL_COLOR_COMPONENT = 1.0f;
//! Parses string and get an integer color component (only values within range 0 .. 255 are allowed)
//! @param theColorComponentString the string representing the color component
//! @param theIntegerColorComponent an integer color component that is a result of parsing
//! @return true if parsing was successful, or false otherwise
static bool parseNumericalColorComponent (const Standard_CString theColorComponentString,
Standard_Integer& theIntegerColorComponent)
{
Standard_Integer anIntegerColorComponent;
if (!Draw::ParseInteger (theColorComponentString, anIntegerColorComponent))
{
return false;
}
if ((anIntegerColorComponent < 0) || (anIntegerColorComponent > THE_MAX_INTEGER_COLOR_COMPONENT))
{
return false;
}
theIntegerColorComponent = anIntegerColorComponent;
return true;
}
//! Parses the string and gets a real color component from it (only values within range 0.0 .. 1.0 are allowed)
//! @param theColorComponentString the string representing the color component
//! @param theRealColorComponent a real color component that is a result of parsing
//! @return true if parsing was successful, or false otherwise
static bool parseNumericalColorComponent (const Standard_CString theColorComponentString,
Standard_ShortReal& theRealColorComponent)
{
Standard_Real aRealColorComponent;
if (!Draw::ParseReal (theColorComponentString, aRealColorComponent))
{
return false;
}
const Standard_ShortReal aShortRealColorComponent = static_cast<Standard_ShortReal> (aRealColorComponent);
if ((aShortRealColorComponent < 0.0f) || (aShortRealColorComponent > THE_MAX_REAL_COLOR_COMPONENT))
{
return false;
}
theRealColorComponent = aShortRealColorComponent;
return true;
}
//! Parses the string and gets a real color component from it (integer values 2 .. 255 are scaled to the 0.0 .. 1.0
//! range, values 0 and 1 are leaved as they are)
//! @param theColorComponentString the string representing the color component
//! @param theColorComponent a color component that is a result of parsing
//! @return true if parsing was successful, or false otherwise
static bool parseColorComponent (const Standard_CString theColorComponentString,
Standard_ShortReal& theColorComponent)
{
Standard_Integer anIntegerColorComponent;
if (parseNumericalColorComponent (theColorComponentString, anIntegerColorComponent))
{
if (anIntegerColorComponent == 1)
{
theColorComponent = THE_MAX_REAL_COLOR_COMPONENT;
}
else
{
theColorComponent = anIntegerColorComponent * 1.0f / THE_MAX_INTEGER_COLOR_COMPONENT;
}
return true;
}
return parseNumericalColorComponent (theColorComponentString, theColorComponent);
}
//! Parses the array of strings and gets an integer color (only values within range 0 .. 255 are allowed and at least
//! one of components must be greater than 1)
//! @tparam TheNumber the type of resulting color vector elements
//! @param theNumberOfColorComponents the number of color components
//! @param theColorComponentStrings the array of strings representing color components
//! @param theNumericalColor a 4-component vector that is a result of parsing
//! @return true if parsing was successful, or false otherwise
template <typename TheNumber>
static bool parseNumericalColor (Standard_Integer& theNumberOfColorComponents,
const char* const* const theColorComponentStrings,
NCollection_Vec4<TheNumber>& theNumericalColor)
{
for (Standard_Integer aColorComponentIndex = 0; aColorComponentIndex < theNumberOfColorComponents;
++aColorComponentIndex)
{
const char* const aColorComponentString = theColorComponentStrings[aColorComponentIndex];
TheNumber aNumericalColorComponent;
if (parseNumericalColorComponent (aColorComponentString, aNumericalColorComponent))
{
theNumericalColor[aColorComponentIndex] = aNumericalColorComponent;
}
else
{
if (aColorComponentIndex == 3)
{
theNumberOfColorComponents = 3;
}
else
{
return false;
}
}
}
return true;
}
//! Parses an array of strings and get an integer color (only values within range 0 .. 255 are allowed and at least
//! one of components must be greater than 1)
//! @param theNumberOfColorComponents the number of color components
//! @param theColorComponentStrings the array of strings representing color components
//! @param theColor a color that is a result of parsing
//! @return true if parsing was successful, or false otherwise
static bool parseIntegerColor (Standard_Integer& theNumberOfColorComponents,
const char* const* const theColorComponentStrings,
Quantity_ColorRGBA& theColor)
{
const Standard_Integer THE_COLOR_COMPONENT_NOT_PARSED = -1;
NCollection_Vec4<int> anIntegerColor (THE_COLOR_COMPONENT_NOT_PARSED);
if (!parseNumericalColor (theNumberOfColorComponents, theColorComponentStrings, anIntegerColor)
|| anIntegerColor.maxComp() <= 1)
{
return false;
}
if (anIntegerColor.a() == THE_COLOR_COMPONENT_NOT_PARSED)
{
anIntegerColor.a() = THE_MAX_INTEGER_COLOR_COMPONENT;
}
const NCollection_Vec4<float> aRealColor = NCollection_Vec4<float> (anIntegerColor) / static_cast<float> (THE_MAX_INTEGER_COLOR_COMPONENT);
theColor = Quantity_ColorRGBA (Quantity_ColorRGBA::Convert_sRGB_To_LinearRGB (aRealColor));
return true;
}
//! Parses an array of strings and get a real color (only values within range 0.0 .. 1.0 are allowed)
//! @param theNumberOfColorComponents the number of color components
//! @param theColorComponentStrings the array of strings representing color components
//! @param theColor a color that is a result of parsing
//! @return true if parsing was successful, or false otherwise
static bool parseRealColor (Standard_Integer& theNumberOfColorComponents,
const char* const* const theColorComponentStrings,
Quantity_ColorRGBA& theColor)
{
NCollection_Vec4<float> aRealColor (THE_MAX_REAL_COLOR_COMPONENT);
if (!parseNumericalColor (theNumberOfColorComponents, theColorComponentStrings, aRealColor))
{
return false;
}
theColor = Quantity_ColorRGBA (aRealColor);
return true;
}
}
//=======================================================================
// function : parseColor
// purpose :
//=======================================================================
Standard_Integer Draw::parseColor (const Standard_Integer theArgNb,
const char* const* const theArgVec,
Quantity_ColorRGBA& theColor,
const bool theToParseAlpha)
{
if ((theArgNb >= 1) && Quantity_ColorRGBA::ColorFromHex (theArgVec[0], theColor, !theToParseAlpha))
{
return 1;
}
if (theArgNb >= 1 && Quantity_ColorRGBA::ColorFromName (theArgVec[0], theColor))
{
if (theArgNb >= 2 && theToParseAlpha)
{
const Standard_CString anAlphaStr = theArgVec[1];
Standard_ShortReal anAlphaComponent;
if (parseColorComponent (anAlphaStr, anAlphaComponent))
{
theColor.SetAlpha (anAlphaComponent);
return 2;
}
}
return 1;
}
if (theArgNb >= 3)
{
const Standard_Integer aNumberOfColorComponentsToParse = Min (theArgNb, theToParseAlpha ? 4 : 3);
Standard_Integer aNumberOfColorComponentsParsed = aNumberOfColorComponentsToParse;
if (parseIntegerColor (aNumberOfColorComponentsParsed, theArgVec, theColor))
{
return aNumberOfColorComponentsParsed;
}
aNumberOfColorComponentsParsed = aNumberOfColorComponentsToParse;
if (parseRealColor (aNumberOfColorComponentsParsed, theArgVec, theColor))
{
return aNumberOfColorComponentsParsed;
}
return 0;
}
return 0;
}
//=======================================================================
//function : ParseOnOff
//purpose :
//=======================================================================
Standard_Boolean Draw::ParseOnOff (Standard_CString theArg,
Standard_Boolean& theIsOn)
{
TCollection_AsciiString aFlag(theArg);
aFlag.LowerCase();
if (aFlag == "on"
|| aFlag == "1")
{
theIsOn = Standard_True;
return Standard_True;
}
else if (aFlag == "off"
|| aFlag == "0")
{
theIsOn = Standard_False;
return Standard_True;
}
return Standard_False;
} }

174
src/Draw/Draw.hxx
View File

@ -17,39 +17,12 @@
#ifndef _Draw_HeaderFile #ifndef _Draw_HeaderFile
#define _Draw_HeaderFile #define _Draw_HeaderFile
#include <Standard.hxx> #include <Draw_Interpretor.hxx>
#include <Standard_DefineAlloc.hxx> #include <Quantity_ColorRGBA.hxx>
#include <Standard_Handle.hxx> #include <Standard_Handle.hxx>
#include <Draw_Interpretor.hxx>
#include <Standard_Boolean.hxx>
#include <Standard_CString.hxx>
#include <Standard_Real.hxx>
#include <Standard_Integer.hxx>
class TCollection_AsciiString;
class Draw_Drawable3D; class Draw_Drawable3D;
class Draw_ProgressIndicator; class Draw_ProgressIndicator;
class Draw_Drawable3D;
class Draw_Drawable2D;
class Draw_Color;
class Draw_Display;
class Draw_Segment3D;
class Draw_Segment2D;
class Draw_Marker3D;
class Draw_Marker2D;
class Draw_Axis3D;
class Draw_Axis2D;
class Draw_Text3D;
class Draw_Text2D;
class Draw_Circle3D;
class Draw_Circle2D;
class Draw_Number;
class Draw_Chronometer;
class Draw_Grid;
class Draw_Box;
class Draw_ProgressIndicator;
class Draw_Printer;
//! MAQUETTE DESSIN MODELISATION //! MAQUETTE DESSIN MODELISATION
class Draw class Draw
@ -58,8 +31,21 @@ public:
DEFINE_STANDARD_ALLOC DEFINE_STANDARD_ALLOC
//! (Re)Load a Draw Harness plugin.
//! @param theDI [in] [out] Tcl interpretor to append loaded commands
//! @param theKey [in] plugin code name to be resolved in resource file
//! @param theResourceFileName [in] description file name
//! @param theDefaultsDirectory [in] default folder for looking description file
//! @param theUserDefaultsDirectory [in] user folder for looking description file
//! @param theIsVerbose [in] print verbose messages
Standard_EXPORT static void Load (Draw_Interpretor& theDI,
const TCollection_AsciiString& theKey,
const TCollection_AsciiString& theResourceFileName,
const TCollection_AsciiString& theDefaultsDirectory,
const TCollection_AsciiString& theUserDefaultsDirectory,
const Standard_Boolean theIsVerbose = Standard_False);
Standard_EXPORT static void Load (Draw_Interpretor& theDI, const TCollection_AsciiString& theKey, const TCollection_AsciiString& theResourceFileName, TCollection_AsciiString& theDefaultsDirectory, TCollection_AsciiString& theUserDefaultsDirectory, const Standard_Boolean Verbose = Standard_False); public: //! @name Tcl variables management tools
//! Sets a variable. Display it if <Disp> is true. //! Sets a variable. Display it if <Disp> is true.
Standard_EXPORT static void Set (const Standard_CString Name, const Handle(Draw_Drawable3D)& D, const Standard_Boolean Disp); Standard_EXPORT static void Set (const Standard_CString Name, const Handle(Draw_Drawable3D)& D, const Standard_Boolean Disp);
@ -92,14 +78,16 @@ public:
//! Sets a TCL sting variable //! Sets a TCL sting variable
Standard_EXPORT static void Set (const Standard_CString Name, const Standard_CString val); Standard_EXPORT static void Set (const Standard_CString Name, const Standard_CString val);
public: //! @name argument parsing tools
//! Converts numeric expression, that can involve DRAW //! Converts numeric expression, that can involve DRAW
//! variables, to real value. //! variables, to real value.
Standard_EXPORT static Standard_Real Atof (const Standard_CString Name); Standard_EXPORT static Standard_Real Atof (const Standard_CString Name);
//! Converts the numeric expression, that can involve DRAW variables, to a real value //! Converts the numeric expression, that can involve DRAW variables, to a real value
//! @param theExpressionString the strings that containes the expression involving DRAW variables to be parsed //! @param theExpressionString the strings that contains the expression involving DRAW variables to be parsed
//! @param theParsedRealValue a real value that is a result of parsing //! @param theParsedRealValue a real value that is a result of parsing
//! @return true if parsing was successfull, or false otherwise //! @return true if parsing was successful, or false otherwise
Standard_EXPORT static bool ParseReal (const Standard_CString theExpressionString, Standard_Real& theParsedRealValue); Standard_EXPORT static bool ParseReal (const Standard_CString theExpressionString, Standard_Real& theParsedRealValue);
//! Converts numeric expression, that can involve DRAW //! Converts numeric expression, that can involve DRAW
@ -108,12 +96,91 @@ public:
Standard_EXPORT static Standard_Integer Atoi (const Standard_CString Name); Standard_EXPORT static Standard_Integer Atoi (const Standard_CString Name);
//! Converts the numeric expression, that can involve DRAW variables, to an integer value //! Converts the numeric expression, that can involve DRAW variables, to an integer value
//! @param theExpressionString the strings that containes the expression involving DRAW variables to be parsed //! @param theExpressionString the strings that contains the expression involving DRAW variables to be parsed
//! @param theParsedIntegerValue an integer value that is a result of parsing //! @param theParsedIntegerValue an integer value that is a result of parsing
//! @return true if parsing was successfull, or false otherwise //! @return true if parsing was successful, or false otherwise
Standard_EXPORT static bool ParseInteger (const Standard_CString theExpressionString, Standard_EXPORT static bool ParseInteger (const Standard_CString theExpressionString,
Standard_Integer& theParsedIntegerValue); Standard_Integer& theParsedIntegerValue);
//! Parses RGB(A) color argument(s) specified within theArgVec[0], theArgVec[1], theArgVec[2] and theArgVec[3].
//! Handles either color specified by name (single argument) or by RGB(A) components (3-4 arguments) in range 0..1.
//! The result is stored in theColor on success.
//!
//! Usage code sample for command argument in form "cmd -color {ColorName|R G B [A]|ColorHex}":
//! @code
//! for (int anArgIter = 1; anArgIter < theNbArgs; ++anArgIter)
//! {
//! TCollection_AsciiString aParam (theArgVec[anArgIter]);
//! aParam.LowerCase();
//! if (aParam == "-color")
//! {
//! Quantity_ColorRGBA aColor;
//! Standard_Integer aNbParsed = Draw::ParseColor (theArgNb - anArgIter - 1,
//! theArgVec + anArgIter + 1, aColor);
//! anArgIter += aNbParsed;
//! if (aNbParsed == 0) { std::cerr << "Syntax error at '" << aParam << "'"; return 1; }
//! // process color
//! }
//! }
//! @endcode
//!
//! @param theArgNb [in] number of available arguments in theArgVec (array limits)
//! @param theArgVec [in] argument list
//! @param theColor [out] retrieved color
//! @return number of handled arguments (1, 2, 3 or 4) or 0 on syntax error
static Standard_Integer ParseColor (const Standard_Integer theArgNb,
const char* const* const theArgVec,
Quantity_ColorRGBA& theColor)
{
return parseColor (theArgNb, theArgVec, theColor, true);
}
//! Parses RGB color argument(s).
//! @param theArgNb [in] number of available arguments in theArgVec (array limits)
//! @param theArgVec [in] argument list
//! @param theColor [out] retrieved color
//! @return number of handled arguments (1 or 3) or 0 on syntax error.
static Standard_Integer ParseColor (const Standard_Integer theArgNb,
const char* const* const theArgVec,
Quantity_Color& theColor)
{
Quantity_ColorRGBA anRgba;
const Standard_Integer aNbParsed = parseColor (theArgNb, theArgVec, anRgba, false);
if (aNbParsed != 0)
{
theColor = anRgba.GetRGB();
}
return aNbParsed;
}
//! Parses boolean argument. Handles either flag specified by 0|1 or on|off.
//!
//! Usage code sample for command argument in form "cmd -usefeature [on|off|1|0]=on":
//! @code
//! for (int anArgIter = 1; anArgIter < theNbArgs; ++anArgIter)
//! {
//! TCollection_AsciiString aParam (theArgVec[anArgIter]);
//! aParam.LowerCase();
//! if (aParam == "-usefeature")
//! {
//! bool toUseFeature = true;
//! if (anArgIter + 1 < theNbArgs && Draw::ParseOnOff (theArgVec[anArgIter + 1]))
//! {
//! ++anArgIter;
//! }
//! // process feature
//! }
//! }
//! @endcode
//!
//! @param theArg [in] argument value
//! @param theIsOn [out] decoded Boolean flag
//! @return FALSE on syntax error
Standard_EXPORT static Standard_Boolean ParseOnOff (Standard_CString theArg,
Standard_Boolean& theIsOn);
public:
//! Returns last graphic selection description. //! Returns last graphic selection description.
Standard_EXPORT static void LastPick (Standard_Integer& view, Standard_Integer& X, Standard_Integer& Y, Standard_Integer& button); Standard_EXPORT static void LastPick (Standard_Integer& view, Standard_Integer& X, Standard_Integer& Y, Standard_Integer& button);
@ -126,6 +193,8 @@ public:
//! gets progress indicator //! gets progress indicator
Standard_EXPORT static Handle(Draw_ProgressIndicator) GetProgressBar(); Standard_EXPORT static Handle(Draw_ProgressIndicator) GetProgressBar();
public: //! @name methods loading standard command sets
//! Defines all Draw commands //! Defines all Draw commands
Standard_EXPORT static void Commands (Draw_Interpretor& I); Standard_EXPORT static void Commands (Draw_Interpretor& I);
@ -152,35 +221,16 @@ protected:
Standard_EXPORT static Handle(Draw_Drawable3D) getDrawable (Standard_CString& theName, Standard_EXPORT static Handle(Draw_Drawable3D) getDrawable (Standard_CString& theName,
Standard_Boolean theToAllowPick); Standard_Boolean theToAllowPick);
private: //! Parses RGB(A) color argument(s) specified within theArgVec[0], theArgVec[1], theArgVec[2] and theArgVec[3].
//! Handles either color specified by name (single argument)
friend class Draw_Drawable3D; //! or by RGB(A) components (3-4 arguments) in range 0..1.
friend class Draw_Drawable2D; //! The result is stored in theColor on success.
friend class Draw_Color; //! Returns number of handled arguments (1, 2, 3 or 4) or 0 on syntax error.
friend class Draw_Display; Standard_EXPORT static Standard_Integer parseColor (Standard_Integer theArgNb,
friend class Draw_Segment3D; const char* const* theArgVec,
friend class Draw_Segment2D; Quantity_ColorRGBA& theColor,
friend class Draw_Marker3D; bool theToParseAlpha);
friend class Draw_Marker2D;
friend class Draw_Axis3D;
friend class Draw_Axis2D;
friend class Draw_Text3D;
friend class Draw_Text2D;
friend class Draw_Circle3D;
friend class Draw_Circle2D;
friend class Draw_Number;
friend class Draw_Chronometer;
friend class Draw_Grid;
friend class Draw_Box;
friend class Draw_ProgressIndicator;
friend class Draw_Printer;
}; };
#endif // _Draw_HeaderFile #endif // _Draw_HeaderFile

327
src/Draw/Draw_PloadCommands.cxx
View File

@ -13,152 +13,156 @@
// Alternatively, this file may be used under the terms of Open CASCADE // Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement. // commercial license or contractual agreement.
#include <TCollection_AsciiString.hxx> #include <Draw_Interpretor.hxx>
#include <Draw_MapOfAsciiString.hxx>
#include <Draw.hxx>
#include <Message.hxx>
#include <OSD_Path.hxx> #include <OSD_Path.hxx>
#include <OSD_Directory.hxx> #include <OSD_Directory.hxx>
#include <OSD_File.hxx> #include <OSD_File.hxx>
#include <OSD_Environment.hxx> #include <OSD_Environment.hxx>
#include <OSD_SharedLibrary.hxx> #include <OSD_SharedLibrary.hxx>
#include <Resource_Manager.hxx> #include <Resource_Manager.hxx>
#include <Draw_Interpretor.hxx> #include <TCollection_AsciiString.hxx>
#include <Draw_MapOfAsciiString.hxx>
#include <Draw.hxx>
static Handle(Resource_Manager) myResources; //! Searches for the existence of the plugin file according to its name thePluginName:
//! - if thePluginName is empty then it defaults to DrawPlugin
//======================================================================= //! - the search directory is defined according to the variable
//function : FindPluginFile //! CSF_<filename>Defaults (if it is omitted then it defaults to
//purpose : Searches for the existence of the plugin file according to its name thePluginName: //! $CASROOT/src/DrawResources)
// - if thePluginName is empty then it defaults to DrawPlugin //! - finally existence of the file is verified in the search directory
// - the search directory is defined according to the variable //! - if the file exists but corresponding variable (CSF_...) has not been
// CSF_<filename>Defaults (if it is omitted then it defaults to //! explicitly set, it is forced to (for further reuse by Resource_Manager)
// $CASROOT/src/DrawResources) //! @return TRUE if the file exists, otherwise - False
// - finally existence of the file is verified in the search directory static Standard_Boolean findPluginFile (TCollection_AsciiString& thePluginName,
// - if the file exists but corresponding variable (CSF_...) has not been TCollection_AsciiString& thePluginDir)
// explicitly set, it is forced to (for further reuse by Resource_Manager)
// Returns True if the file exists, otherwise - False.
//=======================================================================
#define FAILSTR "Failed to load plugin: "
//static Standard_Boolean FindPluginFile (TCollection_AsciiString& thePluginName)
static Standard_Boolean FindPluginFile (TCollection_AsciiString& thePluginName, TCollection_AsciiString& aPluginDir)
{ {
Standard_Boolean aResult = Standard_True;
// check if the file name has been specified and use default value if not // check if the file name has been specified and use default value if not
if (thePluginName.IsEmpty()) { if (thePluginName.IsEmpty())
{
thePluginName += "DrawPlugin"; thePluginName += "DrawPlugin";
#ifdef OCCT_DEBUG #ifdef OCCT_DEBUG
std::cout << "Plugin file name has not been specified. Defaults to " << thePluginName.ToCString() << std::endl; std::cout << "Plugin file name has not been specified. Defaults to " << thePluginName.ToCString() << std::endl;
#endif #endif
} }
//TCollection_AsciiString aPluginDir; // the search directory Standard_Boolean aToSetCSFVariable = Standard_False;
Standard_Boolean aDirFound = Standard_True, aToSetCSFVariable = Standard_False;
// the order of search : by CSF_<PluginFileName>Defaults and then by CASROOT // the order of search : by CSF_<PluginFileName>Defaults and then by CASROOT
TCollection_AsciiString aCSFVariable = TCollection_AsciiString ("CSF_") + thePluginName + "Defaults"; const TCollection_AsciiString aCSFVariable = TCollection_AsciiString ("CSF_") + thePluginName + "Defaults";
aPluginDir = OSD_Environment (aCSFVariable).Value(); thePluginDir = OSD_Environment (aCSFVariable).Value();
if (aPluginDir.IsEmpty()) if (thePluginDir.IsEmpty())
{ {
aPluginDir = OSD_Environment ("DRAWHOME").Value(); thePluginDir = OSD_Environment ("DRAWHOME").Value();
if (!aPluginDir.IsEmpty()) if (!thePluginDir.IsEmpty())
{ {
aToSetCSFVariable = Standard_True; //CSF variable to be set later aToSetCSFVariable = Standard_True; //CSF variable to be set later
} }
else else
{ {
// now try by CASROOT // now try by CASROOT
aPluginDir = OSD_Environment ("CASROOT").Value(); thePluginDir = OSD_Environment ("CASROOT").Value();
if (!aPluginDir.IsEmpty()) if (!thePluginDir.IsEmpty())
{ {
aPluginDir += "/src/DrawResources"; thePluginDir += "/src/DrawResources";
aToSetCSFVariable = Standard_True; //CSF variable to be set later aToSetCSFVariable = Standard_True; //CSF variable to be set later
} }
else else
{ {
aResult = aDirFound = Standard_False; Message::SendFail() << "Failed to load plugin: Neither " << aCSFVariable << ", nor CASROOT variables have been set";
std::cout << FAILSTR "Neither " << aCSFVariable << ", nor CASROOT variables have been set\n"; return Standard_False;
} }
} }
} }
if (aDirFound) {
// search directory name has been constructed, now check whether it and the file exist // search directory name has been constructed, now check whether it and the file exist
const TCollection_AsciiString aPluginFileName = thePluginDir + "/" + thePluginName;
OSD_File aPluginFile (aPluginFileName);
if (!aPluginFile.Exists())
{
Message::SendFail() << "Failed to load plugin: File " << aPluginFileName << " not found";
return Standard_False;
}
TCollection_AsciiString aPluginFileName = aPluginDir + "/" + thePluginName; if (aToSetCSFVariable)
OSD_File PluginFile ( aPluginFileName ); {
if ( PluginFile.Exists() ) { OSD_Environment aCSFVarEnv (aCSFVariable, thePluginDir);
if (aToSetCSFVariable) {
OSD_Environment aCSFVarEnv ( aCSFVariable, aPluginDir );
aCSFVarEnv.Build(); aCSFVarEnv.Build();
#ifdef OCCT_DEBUG #ifdef OCCT_DEBUG
std::cout << "Variable " << aCSFVariable.ToCString() << " has not been explicitly defined. Set to " << aPluginDir.ToCString() << std::endl; std::cout << "Variable " << aCSFVariable << " has not been explicitly defined. Set to " << thePluginDir << std::endl;
#endif #endif
if ( aCSFVarEnv.Failed() ) { if (aCSFVarEnv.Failed())
aResult = Standard_False; {
std::cout << FAILSTR "Failed to initialize " << aCSFVariable.ToCString() << " with " << aPluginDir.ToCString() << std::endl; Message::SendFail() << "Failed to load plugin: Failed to initialize " << aCSFVariable << " with " << thePluginDir;
} return Standard_False;
}
} else {
aResult = Standard_False;
std::cout << FAILSTR "File " << aPluginFileName.ToCString() << " not found" << std::endl;
} }
} }
return aResult; return Standard_True;
} }
//======================================================================= //! Resolve keys within input map (groups, aliases and toolkits) to the list of destination toolkits (plugins to load).
//function : Parse //! @param theMap [in] [out] map to resolve (will be rewritten)
//purpose : Parse the input keys to atomic keys (<key> --> <akey>[<akey> ..]) //! @param theResMgr [in] resource manager to resolve keys
//======================================================================= static void resolveKeys (Draw_MapOfAsciiString& theMap,
const Handle(Resource_Manager)& theResMgr)
static void Parse (Draw_MapOfAsciiString& theMap)
{ {
if (theResMgr.IsNull())
{
return;
}
Draw_MapOfAsciiString aMap, aMap2; Draw_MapOfAsciiString aMap, aMap2;
Standard_Integer j, k; const Standard_Integer aMapExtent = theMap.Extent();
Standard_Integer aMapExtent, aMap2Extent; for (Standard_Integer j = 1; j <= aMapExtent; ++j)
aMapExtent = theMap.Extent(); {
for(j = 1; j <= aMapExtent; j++) { TCollection_AsciiString aValue;
if (!myResources.IsNull()) { const TCollection_AsciiString aResource = theMap.FindKey (j);
const TCollection_AsciiString& aKey = theMap.FindKey(j); if (theResMgr->Find (aResource, aValue))
TCollection_AsciiString aResource = aKey; {
if(myResources->Find(aResource.ToCString())) { #ifdef OCCT_DEBUG
#ifdef OCCT_DEBUG std::cout << "Parse Value ==> " << aValue << std::endl;
std::cout << "Parse Value ==> " << myResources->Value(aResource.ToCString()) << std::endl; #endif
#endif for (Standard_Integer aKeyIter = 1;; ++aKeyIter)
TCollection_AsciiString aValue(myResources->Value(aResource.ToCString())); {
// parse aValue string const TCollection_AsciiString aCurKey = aValue.Token (" \t,", aKeyIter);
Standard_Integer i=1; #ifdef OCCT_DEBUG
for(;;) { std::cout << "Parse aCurKey = " << aCurKey << std::endl;
TCollection_AsciiString aCurKey = aValue.Token(" \t,", i++); #endif
#ifdef OCCT_DEBUG if (aCurKey.IsEmpty())
std::cout << "Parse aCurKey = " << aCurKey.ToCString() << std::endl; {
#endif break;
if(aCurKey.IsEmpty()) break; }
if(!myResources->Find(aCurKey.ToCString())) {
// It is toolkit if (theResMgr->Find (aCurKey.ToCString()))
aMap.Add(aResource); {
aMap2.Add (aCurKey);
} }
else else
aMap2.Add(aCurKey); {
aMap.Add (aResource); // It is toolkit
} }
} else }
std::cout <<"Pload : Resource = " << aResource << " is not found" << std::endl; }
if(!aMap2.IsEmpty()) else
Parse(aMap2); {
Message::SendFail() << "Pload : Resource = " << aResource << " is not found";
}
if (!aMap2.IsEmpty())
{
resolveKeys (aMap2, theResMgr);
}
// //
aMap2Extent = aMap2.Extent(); const Standard_Integer aMap2Extent = aMap2.Extent();
for(k = 1; k <= aMap2Extent; k++) { for (Standard_Integer k = 1; k <= aMap2Extent; ++k)
aMap.Add(aMap2.FindKey(k)); {
} aMap.Add (aMap2.FindKey (k));
} }
} }
theMap.Assign(aMap); theMap.Assign (aMap);
} }
//======================================================================= //=======================================================================
@ -166,98 +170,81 @@ static void Parse (Draw_MapOfAsciiString& theMap)
//purpose : //purpose :
//======================================================================= //=======================================================================
static Standard_Integer Pload (Draw_Interpretor& di, static Standard_Integer Pload (Draw_Interpretor& theDI,
Standard_Integer n, Standard_Integer theNbArgs,
const char** argv) const char** theArgVec)
{ {
char adef[] = "-"; Draw_MapOfAsciiString aMap;
TCollection_AsciiString aPluginFileName(""); TCollection_AsciiString aPluginFileName;
TCollection_AsciiString aPluginDir(""), aPluginDir2(""); for (Standard_Integer anArgIter = 1; anArgIter < theNbArgs; ++anArgIter)
Standard_Integer aStart = 0; {
Standard_Integer aFinish = n - 1; const TCollection_AsciiString aTK (theArgVec[anArgIter]);
if (anArgIter == 1
if (n == 1) { && aTK.Value (1) == '-')
// Load DEFAULT key {
aStart = 0; aPluginFileName = aTK.SubString (2, aTK.Length());
} else {
if(argv[1][0] == adef[0]) {
aPluginFileName = argv[1];
aPluginFileName.Remove(1,1);
if (n == 2) {
// Load DEFAULT key from aPluginFileName file
aStart = 0;
aFinish = n - 2;
} else {
aStart = 2;
} }
} else { else
aStart = 1; {
aMap.Add (aTK);
} }
} }
if (aMap.IsEmpty())
{
aMap.Add ("DEFAULT"); // Load DEFAULT key
}
//if ( !FindPluginFile (aPluginFileName) ) { TCollection_AsciiString aPluginDir, aPluginDir2;
if ( !FindPluginFile (aPluginFileName, aPluginDir) ) { if (!findPluginFile (aPluginFileName, aPluginDir))
{
return 1; return 1;
} }
Draw_MapOfAsciiString aMap; Handle(Resource_Manager) aResMgr = new Resource_Manager (aPluginFileName.ToCString(), aPluginDir, aPluginDir2, Standard_False);
TCollection_AsciiString aDEFAULT("DEFAULT"); resolveKeys (aMap, aResMgr);
//for(Standard_Integer i = aStart; i < n; i++)
for(Standard_Integer i = aStart; i <= aFinish; i++) const Standard_Integer aMapExtent = aMap.Extent();
if (i == 0) { for (Standard_Integer aResIter = 1; aResIter <= aMapExtent; ++aResIter)
// Load DEFAULT key {
aMap.Add(aDEFAULT); const TCollection_AsciiString aResource = aMap.FindKey (aResIter);
} else { #ifdef OCCT_DEBUG
TCollection_AsciiString aTK(argv[i]); std::cout << "aResource = " << aResource << std::endl;
aMap.Add(aTK); #endif
TCollection_AsciiString aValue;
if (!aResMgr->Find (aResource, aValue))
{
Message::SendWarning() <<"Pload : Resource = " << aResource << " is not found";
continue;
} }
//myResources = new Resource_Manager(aPluginFileName.ToCString()); #ifdef OCCT_DEBUG
myResources = new Resource_Manager(aPluginFileName.ToCString(), aPluginDir, aPluginDir2, Standard_False);
Parse(aMap);
Standard_Integer j;
Standard_Integer aMapExtent;
aMapExtent = aMap.Extent();
for(j = 1; j <= aMapExtent; j++) {
const TCollection_AsciiString& aKey = aMap.FindKey(j);
TCollection_AsciiString aResource = aKey;
#ifdef OCCT_DEBUG
std::cout << "aResource = " << aResource << std::endl;
#endif
if(myResources->Find(aResource.ToCString())) {
const TCollection_AsciiString& aValue = myResources->Value(aResource.ToCString());
#ifdef OCCT_DEBUG
std::cout << "Value ==> " << aValue << std::endl; std::cout << "Value ==> " << aValue << std::endl;
#endif #endif
//Draw::Load(di, aKey, aPluginFileName); Draw::Load (theDI, aResource, aPluginFileName, aPluginDir, aPluginDir2, Standard_False);
Draw::Load(di, aKey, aPluginFileName, aPluginDir, aPluginDir2, Standard_False);
// Load TclScript // Load TclScript
TCollection_AsciiString aCSFVariable ("CSF_DrawPluginTclDir"); const TCollection_AsciiString aTclScriptDir = OSD_Environment ("CSF_DrawPluginTclDir").Value();
TCollection_AsciiString aTclScriptDir; const TCollection_AsciiString aTclScriptFileName = aTclScriptDir + "/" + aValue + ".tcl";
aTclScriptDir = getenv (aCSFVariable.ToCString()); const TCollection_AsciiString aTclScriptFileNameDefaults = aPluginDir + "/" + aValue + ".tcl";
TCollection_AsciiString aTclScriptFileName; OSD_File aTclScriptFile (aTclScriptFileName);
TCollection_AsciiString aTclScriptFileNameDefaults; OSD_File aTclScriptFileDefaults (aTclScriptFileNameDefaults);
aTclScriptFileName = aTclScriptDir + "/" + aValue + ".tcl"; if (!aTclScriptDir.IsEmpty()
aTclScriptFileNameDefaults = aPluginDir + "/" + aValue + ".tcl"; && aTclScriptFile.Exists())
OSD_File aTclScriptFile ( aTclScriptFileName ); {
OSD_File aTclScriptFileDefaults ( aTclScriptFileNameDefaults ); #ifdef OCCT_DEBUG
if (!aTclScriptDir.IsEmpty() && aTclScriptFile.Exists()) {
#ifdef OCCT_DEBUG
std::cout << "Load " << aTclScriptFileName << " TclScript" << std::endl; std::cout << "Load " << aTclScriptFileName << " TclScript" << std::endl;
#endif #endif
di.EvalFile( aTclScriptFileName.ToCString() ); theDI.EvalFile (aTclScriptFileName.ToCString());
} else if (!aPluginDir.IsEmpty() && aTclScriptFileDefaults.Exists()) { }
#ifdef OCCT_DEBUG else if (!aPluginDir.IsEmpty()
std::cout << "Load " << aTclScriptFileNameDefaults << " TclScript" << std::endl; && aTclScriptFileDefaults.Exists())
#endif {
di.EvalFile( aTclScriptFileNameDefaults.ToCString() ); #ifdef OCCT_DEBUG
std::cout << "Load " << aTclScriptFileNameDefaults << " TclScript" << std::endl;
#endif
theDI.EvalFile (aTclScriptFileNameDefaults.ToCString());
} }
} else
std::cout <<"Pload : Resource = " << aResource << " is not found" << std::endl;
} }
return 0; return 0;
} }

75
src/Resource/Resource_Manager.cxx
View File

@ -12,6 +12,7 @@
// Alternatively, this file may be used under the terms of Open CASCADE // Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement. // commercial license or contractual agreement.
#include <Resource_Manager.hxx>
#include <OSD_Directory.hxx> #include <OSD_Directory.hxx>
#include <OSD_Environment.hxx> #include <OSD_Environment.hxx>
@ -20,7 +21,6 @@
#include <OSD_Protection.hxx> #include <OSD_Protection.hxx>
#include <Resource_DataMapIteratorOfDataMapOfAsciiStringAsciiString.hxx> #include <Resource_DataMapIteratorOfDataMapOfAsciiStringAsciiString.hxx>
#include <Resource_LexicalCompare.hxx> #include <Resource_LexicalCompare.hxx>
#include <Resource_Manager.hxx>
#include <Resource_NoSuchResource.hxx> #include <Resource_NoSuchResource.hxx>
#include <Resource_Unicode.hxx> #include <Resource_Unicode.hxx>
#include <Standard_ErrorHandler.hxx> #include <Standard_ErrorHandler.hxx>
@ -54,42 +54,52 @@ static Standard_Integer GetLine(OSD_File& aFile,TCollection_AsciiString& aLine);
static Standard_Boolean Debug; static Standard_Boolean Debug;
Resource_Manager::Resource_Manager(const Standard_CString aName, // =======================================================================
TCollection_AsciiString& aDefaultsDirectory, // function : Resource_Manager
TCollection_AsciiString& anUserDefaultsDirectory, // purpose :
const Standard_Boolean Verbose) : myName(aName), myVerbose(Verbose) // =======================================================================
Resource_Manager::Resource_Manager (const TCollection_AsciiString& theName,
const TCollection_AsciiString& theDefaultsDirectory,
const TCollection_AsciiString& theUserDefaultsDirectory,
const Standard_Boolean theIsVerbose)
: myName (theName),
myVerbose (theIsVerbose)
{ {
if ( !aDefaultsDirectory.IsEmpty() ) { if (!theDefaultsDirectory.IsEmpty())
OSD_Path anOSDPath(aDefaultsDirectory); {
OSD_Path anOSDPath (theDefaultsDirectory);
if (!anOSDPath.Name().IsEmpty()) if (!anOSDPath.Name().IsEmpty())
{ {
anOSDPath.DownTrek (anOSDPath.Name () + anOSDPath.Extension ()); anOSDPath.DownTrek (anOSDPath.Name() + anOSDPath.Extension());
} }
anOSDPath.SetName(aName); anOSDPath.SetName (theName);
anOSDPath.SetExtension(""); anOSDPath.SetExtension ("");
TCollection_AsciiString aPath; TCollection_AsciiString aPath;
anOSDPath.SystemName(aPath); anOSDPath.SystemName (aPath);
Load(aPath,myRefMap); Load (aPath, myRefMap);
} }
else else if (myVerbose)
if (myVerbose) {
std::cout << "Resource Manager Warning: aDefaultsDirectory is empty." << std::endl; std::cout << "Resource Manager Warning: aDefaultsDirectory is empty." << std::endl;
}
if ( !anUserDefaultsDirectory.IsEmpty() ) { if (!theUserDefaultsDirectory.IsEmpty())
OSD_Path anOSDPath(anUserDefaultsDirectory); {
OSD_Path anOSDPath (theUserDefaultsDirectory);
if (!anOSDPath.Name().IsEmpty()) if (!anOSDPath.Name().IsEmpty())
{ {
anOSDPath.DownTrek (anOSDPath.Name () + anOSDPath.Extension ()); anOSDPath.DownTrek (anOSDPath.Name() + anOSDPath.Extension());
} }
anOSDPath.SetName(aName); anOSDPath.SetName (theName);
anOSDPath.SetExtension(""); anOSDPath.SetExtension ("");
TCollection_AsciiString aPath; TCollection_AsciiString aPath;
anOSDPath.SystemName(aPath); anOSDPath.SystemName (aPath);
Load(aPath,myRefMap); Load (aPath, myRefMap);
} }
else else if (myVerbose)
if (myVerbose) {
std::cout << "Resource Manager Warning: anUserDefaultsDirectory is empty." << std::endl; std::cout << "Resource Manager Warning: anUserDefaultsDirectory is empty." << std::endl;
}
} }
Resource_Manager::Resource_Manager(const Standard_CString aName, Resource_Manager::Resource_Manager(const Standard_CString aName,
@ -119,12 +129,16 @@ Resource_Manager::Resource_Manager(const Standard_CString aName,
std::cout << "Resource Manager Warning: Environment variable \"CSF_" << aName << "UserDefaults\" not set." << std::endl; std::cout << "Resource Manager Warning: Environment variable \"CSF_" << aName << "UserDefaults\" not set." << std::endl;
} }
void Resource_Manager::Load(TCollection_AsciiString& aPath, // =======================================================================
// function : Load
// purpose :
// =======================================================================
void Resource_Manager::Load(const TCollection_AsciiString& thePath,
Resource_DataMapOfAsciiStringAsciiString& aMap) Resource_DataMapOfAsciiStringAsciiString& aMap)
{ {
Resource_KindOfLine aKind; Resource_KindOfLine aKind;
TCollection_AsciiString Token1, Token2; TCollection_AsciiString Token1, Token2;
OSD_Path Path(aPath); OSD_Path Path (thePath);
OSD_File File = Path; OSD_File File = Path;
TCollection_AsciiString FileName = Path.Name(); TCollection_AsciiString FileName = Path.Name();
File.Open(OSD_ReadOnly,OSD_Protection()); File.Open(OSD_ReadOnly,OSD_Protection());
@ -482,6 +496,17 @@ Standard_Boolean Resource_Manager::Find(const Standard_CString aResource) const
return Standard_False; return Standard_False;
} }
//=======================================================================
//function : Find
//purpose :
//=======================================================================
Standard_Boolean Resource_Manager::Find (const TCollection_AsciiString& theResource,
TCollection_AsciiString& theValue) const
{
return myUserMap.Find (theResource, theValue)
|| myRefMap .Find (theResource, theValue);
}
//======================================================================= //=======================================================================
//function : GetResourcePath //function : GetResourcePath
//purpose : //purpose :

38
src/Resource/Resource_Manager.hxx
View File

@ -41,10 +41,9 @@ DEFINE_STANDARD_HANDLE(Resource_Manager, Standard_Transient)
//! Defines a resource structure and its management methods. //! Defines a resource structure and its management methods.
class Resource_Manager : public Standard_Transient class Resource_Manager : public Standard_Transient
{ {
DEFINE_STANDARD_RTTIEXT(Resource_Manager,Standard_Transient)
public: public:
//! Create a Resource manager. //! Create a Resource manager.
//! Attempts to find the two following files: //! Attempts to find the two following files:
//! $CSF_`aName`Defaults/aName //! $CSF_`aName`Defaults/aName
@ -59,7 +58,15 @@ public:
//! syntax of an individual resource line is: //! syntax of an individual resource line is:
Standard_EXPORT Resource_Manager(const Standard_CString aName, const Standard_Boolean Verbose = Standard_False); Standard_EXPORT Resource_Manager(const Standard_CString aName, const Standard_Boolean Verbose = Standard_False);
Standard_EXPORT Resource_Manager(const Standard_CString aName, TCollection_AsciiString& aDefaultsDirectory, TCollection_AsciiString& anUserDefaultsDirectory, const Standard_Boolean Verbose = Standard_False); //! Create a Resource manager.
//! @param theName [in] description file name
//! @param theDefaultsDirectory [in] default folder for looking description file
//! @param theUserDefaultsDirectory [in] user folder for looking description file
//! @param theIsVerbose [in] print verbose messages
Standard_EXPORT Resource_Manager (const TCollection_AsciiString& theName,
const TCollection_AsciiString& theDefaultsDirectory,
const TCollection_AsciiString& theUserDefaultsDirectory,
const Standard_Boolean theIsVerbose = Standard_False);
//! Save the user resource structure in the specified file. //! Save the user resource structure in the specified file.
//! Creates the file if it does not exist. //! Creates the file if it does not exist.
@ -68,6 +75,10 @@ public:
//! returns True if the Resource does exist. //! returns True if the Resource does exist.
Standard_EXPORT Standard_Boolean Find (const Standard_CString aResource) const; Standard_EXPORT Standard_Boolean Find (const Standard_CString aResource) const;
//! returns True if the Resource does exist.
Standard_EXPORT Standard_Boolean Find (const TCollection_AsciiString& theResource,
TCollection_AsciiString& theValue) const;
//! Gets the value of an integer resource according to its //! Gets the value of an integer resource according to its
//! instance and its type. //! instance and its type.
Standard_EXPORT virtual Standard_Integer Integer (const Standard_CString aResourceName) const; Standard_EXPORT virtual Standard_Integer Integer (const Standard_CString aResourceName) const;
@ -105,20 +116,12 @@ public:
//! or file doesn't exist returns empty string. //! or file doesn't exist returns empty string.
Standard_EXPORT static void GetResourcePath (TCollection_AsciiString& aPath, const Standard_CString aName, const Standard_Boolean isUserDefaults); Standard_EXPORT static void GetResourcePath (TCollection_AsciiString& aPath, const Standard_CString aName, const Standard_Boolean isUserDefaults);
DEFINE_STANDARD_RTTIEXT(Resource_Manager,Standard_Transient)
protected:
private: private:
Standard_EXPORT void Load (const TCollection_AsciiString& thePath,
Resource_DataMapOfAsciiStringAsciiString& aMap);
Standard_EXPORT void Load (TCollection_AsciiString& aPath, Resource_DataMapOfAsciiStringAsciiString& aMap); private:
TCollection_AsciiString myName; TCollection_AsciiString myName;
Resource_DataMapOfAsciiStringAsciiString myRefMap; Resource_DataMapOfAsciiStringAsciiString myRefMap;
@ -126,13 +129,6 @@ private:
Resource_DataMapOfAsciiStringExtendedString myExtStrMap; Resource_DataMapOfAsciiStringExtendedString myExtStrMap;
Standard_Boolean myVerbose; Standard_Boolean myVerbose;
}; };
#endif // _Resource_Manager_HeaderFile #endif // _Resource_Manager_HeaderFile

248
src/ViewerTest/ViewerTest.cxx
View File

@ -84,161 +84,6 @@ extern int ViewerMainLoop(Standard_Integer argc, const char** argv);
#define DEFAULT_FREEBOUNDARY_COLOR Quantity_NOC_GREEN #define DEFAULT_FREEBOUNDARY_COLOR Quantity_NOC_GREEN
#define DEFAULT_MATERIAL Graphic3d_NOM_BRASS #define DEFAULT_MATERIAL Graphic3d_NOM_BRASS
namespace
{
const Standard_Integer THE_MAX_INTEGER_COLOR_COMPONENT = 255;
const Standard_ShortReal THE_MAX_REAL_COLOR_COMPONENT = 1.0f;
//! Parses string and get an integer color component (only values within range 0 .. 255 are allowed)
//! @param theColorComponentString the string representing the color component
//! @param theIntegerColorComponent an integer color component that is a result of parsing
//! @return true if parsing was successful, or false otherwise
static bool parseNumericalColorComponent (const Standard_CString theColorComponentString,
Standard_Integer& theIntegerColorComponent)
{
Standard_Integer anIntegerColorComponent;
if (!Draw::ParseInteger (theColorComponentString, anIntegerColorComponent))
{
return false;
}
if ((anIntegerColorComponent < 0) || (anIntegerColorComponent > THE_MAX_INTEGER_COLOR_COMPONENT))
{
return false;
}
theIntegerColorComponent = anIntegerColorComponent;
return true;
}
//! Parses the string and gets a real color component from it (only values within range 0.0 .. 1.0 are allowed)
//! @param theColorComponentString the string representing the color component
//! @param theRealColorComponent a real color component that is a result of parsing
//! @return true if parsing was successful, or false otherwise
static bool parseNumericalColorComponent (const Standard_CString theColorComponentString,
Standard_ShortReal& theRealColorComponent)
{
Standard_Real aRealColorComponent;
if (!Draw::ParseReal (theColorComponentString, aRealColorComponent))
{
return false;
}
const Standard_ShortReal aShortRealColorComponent = static_cast<Standard_ShortReal> (aRealColorComponent);
if ((aShortRealColorComponent < 0.0f) || (aShortRealColorComponent > THE_MAX_REAL_COLOR_COMPONENT))
{
return false;
}
theRealColorComponent = aShortRealColorComponent;
return true;
}
//! Parses the string and gets a real color component from it (integer values 2 .. 255 are scaled to the 0.0 .. 1.0
//! range, values 0 and 1 are leaved as they are)
//! @param theColorComponentString the string representing the color component
//! @param theColorComponent a color component that is a result of parsing
//! @return true if parsing was successful, or false otherwise
static bool parseColorComponent (const Standard_CString theColorComponentString,
Standard_ShortReal& theColorComponent)
{
Standard_Integer anIntegerColorComponent;
if (parseNumericalColorComponent (theColorComponentString, anIntegerColorComponent))
{
if (anIntegerColorComponent == 1)
{
theColorComponent = THE_MAX_REAL_COLOR_COMPONENT;
}
else
{
theColorComponent = anIntegerColorComponent * 1.0f / THE_MAX_INTEGER_COLOR_COMPONENT;
}
return true;
}
return parseNumericalColorComponent (theColorComponentString, theColorComponent);
}
//! Parses the array of strings and gets an integer color (only values within range 0 .. 255 are allowed and at least
//! one of components must be greater than 1)
//! @tparam TheNumber the type of resulting color vector elements
//! @param theNumberOfColorComponents the number of color components
//! @param theColorComponentStrings the array of strings representing color components
//! @param theNumericalColor a 4-component vector that is a result of parsing
//! @return true if parsing was successful, or false otherwise
template <typename TheNumber>
static bool parseNumericalColor (Standard_Integer& theNumberOfColorComponents,
const char* const* const theColorComponentStrings,
NCollection_Vec4<TheNumber>& theNumericalColor)
{
for (Standard_Integer aColorComponentIndex = 0; aColorComponentIndex < theNumberOfColorComponents;
++aColorComponentIndex)
{
const char* const aColorComponentString = theColorComponentStrings[aColorComponentIndex];
TheNumber aNumericalColorComponent;
if (parseNumericalColorComponent (aColorComponentString, aNumericalColorComponent))
{
theNumericalColor[aColorComponentIndex] = aNumericalColorComponent;
}
else
{
if (aColorComponentIndex == 3)
{
theNumberOfColorComponents = 3;
}
else
{
return false;
}
}
}
return true;
}
//! Parses an array of strings and get an integer color (only values within range 0 .. 255 are allowed and at least
//! one of components must be greater than 1)
//! @param theNumberOfColorComponents the number of color components
//! @param theColorComponentStrings the array of strings representing color components
//! @param theColor a color that is a result of parsing
//! @return true if parsing was successful, or false otherwise
static bool parseIntegerColor (Standard_Integer& theNumberOfColorComponents,
const char* const* const theColorComponentStrings,
Quantity_ColorRGBA& theColor)
{
const Standard_Integer THE_COLOR_COMPONENT_NOT_PARSED = -1;
Graphic3d_Vec4i anIntegerColor (THE_COLOR_COMPONENT_NOT_PARSED);
if (!parseNumericalColor (theNumberOfColorComponents, theColorComponentStrings, anIntegerColor)
|| anIntegerColor.maxComp() <= 1)
{
return false;
}
if (anIntegerColor.a() == THE_COLOR_COMPONENT_NOT_PARSED)
{
anIntegerColor.a() = THE_MAX_INTEGER_COLOR_COMPONENT;
}
const Graphic3d_Vec4 aRealColor = Graphic3d_Vec4 (anIntegerColor) / static_cast<Standard_ShortReal> (THE_MAX_INTEGER_COLOR_COMPONENT);
theColor = Quantity_ColorRGBA (Quantity_ColorRGBA::Convert_sRGB_To_LinearRGB (aRealColor));
return true;
}
//! Parses an array of strings and get a real color (only values within range 0.0 .. 1.0 are allowed)
//! @param theNumberOfColorComponents the number of color components
//! @param theColorComponentStrings the array of strings representing color components
//! @param theColor a color that is a result of parsing
//! @return true if parsing was successful, or false otherwise
static bool parseRealColor (Standard_Integer& theNumberOfColorComponents,
const char* const* const theColorComponentStrings,
Quantity_ColorRGBA& theColor)
{
Graphic3d_Vec4 aRealColor (THE_MAX_REAL_COLOR_COMPONENT);
if (!parseNumericalColor (theNumberOfColorComponents, theColorComponentStrings, aRealColor))
{
return false;
}
theColor = Quantity_ColorRGBA (aRealColor);
return true;
}
} // namespace
//======================================================================= //=======================================================================
// function : GetColorFromName // function : GetColorFromName
// purpose : get the Quantity_NameOfColor from a string // purpose : get the Quantity_NameOfColor from a string
@ -252,48 +97,25 @@ Quantity_NameOfColor ViewerTest::GetColorFromName (const Standard_CString theNam
} }
//======================================================================= //=======================================================================
// function : parseColor // function : ParseColor
// purpose : // purpose :
//======================================================================= //=======================================================================
Standard_Integer ViewerTest::parseColor (const Standard_Integer theArgNb, Standard_Integer ViewerTest::ParseColor (const Standard_Integer theArgNb,
const char* const* const theArgVec, const char* const* const theArgVec,
Quantity_ColorRGBA& theColor, Quantity_ColorRGBA& theColor)
const bool theToParseAlpha)
{ {
if ((theArgNb >= 1) && Quantity_ColorRGBA::ColorFromHex (theArgVec[0], theColor, !theToParseAlpha)) return Draw::ParseColor (theArgNb, theArgVec, theColor);
{ }
return 1;
} //=======================================================================
if (theArgNb >= 1 && Quantity_ColorRGBA::ColorFromName (theArgVec[0], theColor)) // function : ParseColor
{ // purpose :
if (theArgNb >= 2 && theToParseAlpha) //=======================================================================
{ Standard_Integer ViewerTest::ParseColor (const Standard_Integer theArgNb,
const Standard_CString anAlphaStr = theArgVec[1]; const char* const* const theArgVec,
Standard_ShortReal anAlphaComponent; Quantity_Color& theColor)
if (parseColorComponent (anAlphaStr, anAlphaComponent)) {
{ return Draw::ParseColor (theArgNb, theArgVec, theColor);
theColor.SetAlpha (anAlphaComponent);
return 2;
}
}
return 1;
}
if (theArgNb >= 3)
{
const Standard_Integer aNumberOfColorComponentsToParse = Min (theArgNb, theToParseAlpha ? 4 : 3);
Standard_Integer aNumberOfColorComponentsParsed = aNumberOfColorComponentsToParse;
if (parseIntegerColor (aNumberOfColorComponentsParsed, theArgVec, theColor))
{
return aNumberOfColorComponentsParsed;
}
aNumberOfColorComponentsParsed = aNumberOfColorComponentsToParse;
if (parseRealColor (aNumberOfColorComponentsParsed, theArgVec, theColor))
{
return aNumberOfColorComponentsParsed;
}
return 0;
}
return 0;
} }
//======================================================================= //=======================================================================
@ -303,21 +125,7 @@ Standard_Integer ViewerTest::parseColor (const Standard_Integer theArgNb,
Standard_Boolean ViewerTest::ParseOnOff (Standard_CString theArg, Standard_Boolean ViewerTest::ParseOnOff (Standard_CString theArg,
Standard_Boolean& theIsOn) Standard_Boolean& theIsOn)
{ {
TCollection_AsciiString aFlag(theArg); return Draw::ParseOnOff (theArg, theIsOn);
aFlag.LowerCase();
if (aFlag == "on"
|| aFlag == "1")
{
theIsOn = Standard_True;
return Standard_True;
}
else if (aFlag == "off"
|| aFlag == "0")
{
theIsOn = Standard_False;
return Standard_True;
}
return Standard_False;
} }
//======================================================================= //=======================================================================
@ -2483,7 +2291,7 @@ static Standard_Integer VAspects (Draw_Interpretor& theDI,
aNames.Value (aNames.Upper() - 0).ToCString(), aNames.Value (aNames.Upper() - 0).ToCString(),
}; };
Standard_Integer aNbParsed = ViewerTest::ParseColor (3, anArgVec, aChangeSet->Color); Standard_Integer aNbParsed = Draw::ParseColor (3, anArgVec, aChangeSet->Color);
isOk = aNbParsed == 3; isOk = aNbParsed == 3;
aNames.Remove (aNames.Length()); aNames.Remove (aNames.Length());
aNames.Remove (aNames.Length()); aNames.Remove (aNames.Length());
@ -2805,7 +2613,7 @@ static Standard_Integer VAspects (Draw_Interpretor& theDI,
|| anArg == "-boundarycolor") || anArg == "-boundarycolor")
{ {
Quantity_Color aColor; Quantity_Color aColor;
Standard_Integer aNbParsed = ViewerTest::ParseColor (theArgNb - anArgIter - 1, Standard_Integer aNbParsed = Draw::ParseColor (theArgNb - anArgIter - 1,
theArgVec + anArgIter + 1, theArgVec + anArgIter + 1,
aColor); aColor);
if (aNbParsed == 0) if (aNbParsed == 0)
@ -3049,7 +2857,7 @@ static Standard_Integer VAspects (Draw_Interpretor& theDI,
|| anArg == "-fb") || anArg == "-fb")
{ {
bool toEnable = true; bool toEnable = true;
if (!ViewerTest::ParseOnOff (anArgIter + 1 < theArgNb ? theArgVec[anArgIter + 1] : "", toEnable)) if (!Draw::ParseOnOff (anArgIter + 1 < theArgNb ? theArgVec[anArgIter + 1] : "", toEnable))
{ {
Message::SendFail() << "Error: wrong syntax at " << anArg; Message::SendFail() << "Error: wrong syntax at " << anArg;
return 1; return 1;
@ -3081,7 +2889,7 @@ static Standard_Integer VAspects (Draw_Interpretor& theDI,
|| anArg == "-setfbcolor" || anArg == "-setfbcolor"
|| anArg == "-fbcolor") || anArg == "-fbcolor")
{ {
Standard_Integer aNbParsed = ViewerTest::ParseColor (theArgNb - anArgIter - 1, Standard_Integer aNbParsed = Draw::ParseColor (theArgNb - anArgIter - 1,
theArgVec + anArgIter + 1, theArgVec + anArgIter + 1,
aChangeSet->FreeBoundaryColor); aChangeSet->FreeBoundaryColor);
if (aNbParsed == 0) if (aNbParsed == 0)
@ -3104,7 +2912,7 @@ static Standard_Integer VAspects (Draw_Interpretor& theDI,
|| anArg == "-isoontriang") || anArg == "-isoontriang")
{ {
bool toEnable = true; bool toEnable = true;
if (!ViewerTest::ParseOnOff (anArgIter + 1 < theArgNb ? theArgVec[anArgIter + 1] : "", toEnable)) if (!Draw::ParseOnOff (anArgIter + 1 < theArgNb ? theArgVec[anArgIter + 1] : "", toEnable))
{ {
Message::SendFail() << "Error: wrong syntax at " << anArg; Message::SendFail() << "Error: wrong syntax at " << anArg;
return 1; return 1;
@ -3129,7 +2937,7 @@ static Standard_Integer VAspects (Draw_Interpretor& theDI,
|| anArg == "-faceedges") || anArg == "-faceedges")
{ {
bool toEnable = true; bool toEnable = true;
if (!ViewerTest::ParseOnOff (anArgIter + 1 < theArgNb ? theArgVec[anArgIter + 1] : "", toEnable)) if (!Draw::ParseOnOff (anArgIter + 1 < theArgNb ? theArgVec[anArgIter + 1] : "", toEnable))
{ {
Message::SendFail() << "Error: wrong syntax at " << anArg; Message::SendFail() << "Error: wrong syntax at " << anArg;
return 1; return 1;
@ -3307,7 +3115,7 @@ static Standard_Integer VAspects (Draw_Interpretor& theDI,
{ {
bool toDrawOutline = true; bool toDrawOutline = true;
if (anArgIter + 1 < theArgNb if (anArgIter + 1 < theArgNb
&& ViewerTest::ParseOnOff (theArgVec[anArgIter + 1], toDrawOutline)) && Draw::ParseOnOff (theArgVec[anArgIter + 1], toDrawOutline))
{ {
++anArgIter; ++anArgIter;
} }
@ -3321,7 +3129,7 @@ static Standard_Integer VAspects (Draw_Interpretor& theDI,
{ {
bool toDrawEdges = true; bool toDrawEdges = true;
if (anArgIter + 1 < theArgNb if (anArgIter + 1 < theArgNb
&& ViewerTest::ParseOnOff (theArgVec[anArgIter + 1], toDrawEdges)) && Draw::ParseOnOff (theArgVec[anArgIter + 1], toDrawEdges))
{ {
++anArgIter; ++anArgIter;
} }
@ -3334,7 +3142,7 @@ static Standard_Integer VAspects (Draw_Interpretor& theDI,
{ {
bool isQuadMode = true; bool isQuadMode = true;
if (anArgIter + 1 < theArgNb if (anArgIter + 1 < theArgNb
&& ViewerTest::ParseOnOff (theArgVec[anArgIter + 1], isQuadMode)) && Draw::ParseOnOff (theArgVec[anArgIter + 1], isQuadMode))
{ {
++anArgIter; ++anArgIter;
} }
@ -3345,7 +3153,7 @@ static Standard_Integer VAspects (Draw_Interpretor& theDI,
|| anArg == "-edgecolor" || anArg == "-edgecolor"
|| anArg == "-edgescolor") || anArg == "-edgescolor")
{ {
Standard_Integer aNbParsed = ViewerTest::ParseColor (theArgNb - anArgIter - 1, Standard_Integer aNbParsed = Draw::ParseColor (theArgNb - anArgIter - 1,
theArgVec + anArgIter + 1, theArgVec + anArgIter + 1,
aChangeSet->EdgeColor); aChangeSet->EdgeColor);
if (aNbParsed == 0) if (aNbParsed == 0)
@ -3421,7 +3229,7 @@ static Standard_Integer VAspects (Draw_Interpretor& theDI,
else if (anArg == "-dumpcompact") else if (anArg == "-dumpcompact")
{ {
toCompactDump = Standard_False; toCompactDump = Standard_False;
if (++anArgIter >= theArgNb && ViewerTest::ParseOnOff (theArgVec[anArgIter + 1], toCompactDump)) if (++anArgIter >= theArgNb && Draw::ParseOnOff (theArgVec[anArgIter + 1], toCompactDump))
++anArgIter; ++anArgIter;
} }
else if (anArg == "-dumpdepth") else if (anArg == "-dumpdepth")
@ -4467,7 +4275,7 @@ Standard_Integer VTexture (Draw_Interpretor& theDi, Standard_Integer theArgsNb,
{ {
bool toModulateBool = true; bool toModulateBool = true;
if (anArgIter + 1 < theArgsNb if (anArgIter + 1 < theArgsNb
&& ViewerTest::ParseOnOff (theArgVec[anArgIter + 1], toModulateBool)) && Draw::ParseOnOff (theArgVec[anArgIter + 1], toModulateBool))
{ {
++anArgIter; ++anArgIter;
} }

66
src/ViewerTest/ViewerTest.hxx
View File

@ -148,35 +148,6 @@ public:
Standard_EXPORT static void RemoveSelected(); Standard_EXPORT static void RemoveSelected();
Standard_EXPORT static Quantity_NameOfColor GetColorFromName (const Standard_CString name);
//! Parses RGB(A) color argument(s) specified within theArgVec[0], theArgVec[1], theArgVec[2] and theArgVec[3].
//! Handles either color specified by name (single argument)
//! or by RGB(A) components (3-4 arguments) in range 0..1.
//! The result is stored in theColor on success.
//! Returns number of handled arguments (1, 2, 3 or 4) or 0 on syntax error.
static Standard_Integer ParseColor (const Standard_Integer theArgNb,
const char* const* const theArgVec,
Quantity_ColorRGBA& theColor)
{
return parseColor (theArgNb, theArgVec, theColor, true);
}
//! Parses RGB color argument(s).
//! Returns number of handled arguments (1 or 3) or 0 on syntax error.
static Standard_Integer ParseColor (const Standard_Integer theArgNb,
const char* const* const theArgVec,
Quantity_Color& theColor)
{
Quantity_ColorRGBA anRgba;
const Standard_Integer aNbParsed = parseColor (theArgNb, theArgVec, anRgba, false);
if (aNbParsed != 0)
{
theColor = anRgba.GetRGB();
}
return aNbParsed;
}
//! redraws all defined views. //! redraws all defined views.
Standard_EXPORT static void RedrawAllViews(); Standard_EXPORT static void RedrawAllViews();
@ -187,11 +158,6 @@ public:
TCollection_AsciiString& theName, TCollection_AsciiString& theName,
TCollection_AsciiString& theValue); TCollection_AsciiString& theValue);
//! Parses boolean argument.
//! Handles either flag specified by 0|1 or on|off.
Standard_EXPORT static Standard_Boolean ParseOnOff (Standard_CString theArg,
Standard_Boolean& theIsOn);
//! Returns list of selected shapes. //! Returns list of selected shapes.
Standard_EXPORT static void GetSelectedShapes (TopTools_ListOfShape& theShapes); Standard_EXPORT static void GetSelectedShapes (TopTools_ListOfShape& theShapes);
@ -241,17 +207,31 @@ public:
return parseZLayer (theArg, true, theLayer); return parseZLayer (theArg, true, theLayer);
} }
private: public: //! @name deprecated methods
//! Parses RGB(A) color argument(s) specified within theArgVec[0], theArgVec[1], theArgVec[2] and theArgVec[3]. //! Parses RGB(A) color argument(s) specified within theArgVec[0], theArgVec[1], theArgVec[2] and theArgVec[3].
//! Handles either color specified by name (single argument) Standard_DEPRECATED("Method has been moved to Draw::ParseColor()")
//! or by RGB(A) components (3-4 arguments) in range 0..1. Standard_EXPORT static Standard_Integer ParseColor (const Standard_Integer theArgNb,
//! The result is stored in theColor on success. const char* const* const theArgVec,
//! Returns number of handled arguments (1, 2, 3 or 4) or 0 on syntax error. Quantity_ColorRGBA& theColor);
Standard_EXPORT static Standard_Integer parseColor (Standard_Integer theArgNb,
const char* const* theArgVec, //! Parses RGB color argument(s).
Quantity_ColorRGBA& theColor, //! Returns number of handled arguments (1 or 3) or 0 on syntax error.
bool theToParseAlpha); Standard_DEPRECATED("Method has been moved to Draw::ParseColor()")
Standard_EXPORT static Standard_Integer ParseColor (const Standard_Integer theArgNb,
const char* const* const theArgVec,
Quantity_Color& theColor);
//! Parses boolean argument.
//! Handles either flag specified by 0|1 or on|off.
Standard_DEPRECATED("Method has been moved to Draw::ParseOnOff()")
Standard_EXPORT static Standard_Boolean ParseOnOff (Standard_CString theArg,
Standard_Boolean& theIsOn);
Standard_DEPRECATED("Method has been moved to Quantity_Color::ColorFromName()")
Standard_EXPORT static Quantity_NameOfColor GetColorFromName (const Standard_CString name);
private:
//! Parses ZLayer name. //! Parses ZLayer name.
//! @param theArg [in] layer name, enumeration alias or index (of existing Layer) //! @param theArg [in] layer name, enumeration alias or index (of existing Layer)

2
src/ViewerTest/ViewerTest_CmdParser.cxx
View File

@ -507,7 +507,7 @@ bool ViewerTest_CmdParser::ArgColor (const ViewerTest_CommandOptionKey theOption
false); false);
const Standard_Integer aNumberOfAvailableArguments = aNumberOfArguments - theArgumentIndex; const Standard_Integer aNumberOfAvailableArguments = aNumberOfArguments - theArgumentIndex;
TheColor aColor; TheColor aColor;
const Standard_Integer aNumberOfParsedArguments = ViewerTest::ParseColor (aNumberOfAvailableArguments, const Standard_Integer aNumberOfParsedArguments = Draw::ParseColor (aNumberOfAvailableArguments,
&aRawStringArguments[theArgumentIndex], &aRawStringArguments[theArgumentIndex],
aColor); aColor);
if (aNumberOfParsedArguments == 0) if (aNumberOfParsedArguments == 0)

38
src/ViewerTest/ViewerTest_ObjectCommands.cxx
View File

@ -170,7 +170,7 @@ namespace
theColorValues->Size() >= 2 ? theColorValues->Value (2).ToCString() : "", theColorValues->Size() >= 2 ? theColorValues->Value (2).ToCString() : "",
theColorValues->Size() >= 3 ? theColorValues->Value (3).ToCString() : "" theColorValues->Size() >= 3 ? theColorValues->Value (3).ToCString() : ""
}; };
return ViewerTest::ParseColor (theColorValues->Size(), anArgs, theColor) != 0; return Draw::ParseColor (theColorValues->Size(), anArgs, theColor) != 0;
} }
static bool convertToDatumPart (const TCollection_AsciiString& theValue, static bool convertToDatumPart (const TCollection_AsciiString& theValue,
@ -354,7 +354,7 @@ namespace
Standard_Boolean toHideLabels = Standard_True; Standard_Boolean toHideLabels = Standard_True;
if (aValues->Size() == 1) if (aValues->Size() == 1)
{ {
ViewerTest::ParseOnOff (aValues->First().ToCString(), toHideLabels); Draw::ParseOnOff (aValues->First().ToCString(), toHideLabels);
} }
else if (aValues->Size() != 0) else if (aValues->Size() != 0)
{ {
@ -374,7 +374,7 @@ namespace
Standard_Boolean toHideArrows = Standard_True; Standard_Boolean toHideArrows = Standard_True;
if (aValues->Size() == 1) if (aValues->Size() == 1)
{ {
ViewerTest::ParseOnOff (aValues->First().ToCString(), toHideArrows); Draw::ParseOnOff (aValues->First().ToCString(), toHideArrows);
} }
else if (aValues->Size() != 0) else if (aValues->Size() != 0)
{ {
@ -2416,7 +2416,7 @@ static int VDrawText (Draw_Interpretor& theDI,
else if (aParam == "-color") else if (aParam == "-color")
{ {
Quantity_Color aColor; Quantity_Color aColor;
Standard_Integer aNbParsed = ViewerTest::ParseColor (theArgsNb - anArgIt - 1, Standard_Integer aNbParsed = Draw::ParseColor (theArgsNb - anArgIt - 1,
theArgVec + anArgIt + 1, theArgVec + anArgIt + 1,
aColor); aColor);
if (aNbParsed == 0) if (aNbParsed == 0)
@ -2610,7 +2610,7 @@ static int VDrawText (Draw_Interpretor& theDI,
|| aParam == "-subtitlecolor") || aParam == "-subtitlecolor")
{ {
Quantity_Color aColor; Quantity_Color aColor;
Standard_Integer aNbParsed = ViewerTest::ParseColor (theArgsNb - anArgIt - 1, Standard_Integer aNbParsed = Draw::ParseColor (theArgsNb - anArgIt - 1,
theArgVec + anArgIt + 1, theArgVec + anArgIt + 1,
aColor); aColor);
if (aNbParsed == 0) if (aNbParsed == 0)
@ -3124,7 +3124,7 @@ static int VComputeHLR (Draw_Interpretor& ,
{ {
toShowHiddenEdges = true; toShowHiddenEdges = true;
if (anArgIter + 1 < theArgNb if (anArgIter + 1 < theArgNb
&& ViewerTest::ParseOnOff (theArgVec[anArgIter + 1], toShowHiddenEdges)) && Draw::ParseOnOff (theArgVec[anArgIter + 1], toShowHiddenEdges))
{ {
++anArgIter; ++anArgIter;
} }
@ -3135,7 +3135,7 @@ static int VComputeHLR (Draw_Interpretor& ,
{ {
toShowCNEdges = true; toShowCNEdges = true;
if (anArgIter + 1 < theArgNb if (anArgIter + 1 < theArgNb
&& ViewerTest::ParseOnOff (theArgVec[anArgIter + 1], toShowCNEdges)) && Draw::ParseOnOff (theArgVec[anArgIter + 1], toShowCNEdges))
{ {
++anArgIter; ++anArgIter;
} }
@ -4320,13 +4320,17 @@ static Standard_Integer VConnect (Draw_Interpretor& /*di*/,
const TCollection_AsciiString aName (argv[anArgIter++]); const TCollection_AsciiString aName (argv[anArgIter++]);
Handle(AIS_MultipleConnectedInteractive) aMultiConObject; Handle(AIS_MultipleConnectedInteractive) aMultiConObject;
TCollection_AsciiString aColorString (argv[argc-1]); TCollection_AsciiString aColorString (argv[argc-1]);
Standard_CString aColorName = ""; Quantity_Color aColor;
Standard_Boolean hasColor = Standard_False; Standard_Boolean hasColor = Standard_False;
if (aColorString.Search ("color=") != -1) if (aColorString.Search ("color=") != -1)
{ {
hasColor = Standard_True; hasColor = Standard_True;
aColorString.Remove (1, 6); aColorString.Remove (1, 6);
aColorName = aColorString.ToCString(); if (!Quantity_Color::ColorFromName (aColorString.ToCString(), aColor))
{
Message::SendFail() << "Syntax error at " << aColorString;
return 1;
}
} }
const Standard_Integer aNbShapes = hasColor ? (argc - 1) : argc; const Standard_Integer aNbShapes = hasColor ? (argc - 1) : argc;
@ -4355,7 +4359,7 @@ static Standard_Integer VConnect (Draw_Interpretor& /*di*/,
anObject = aConnectedOrig; anObject = aConnectedOrig;
aContext->Load (anObject); aContext->Load (anObject);
anObject->SetColor (ViewerTest::GetColorFromName (aColorName)); anObject->SetColor (aColor);
} }
if (aMultiConObject.IsNull()) if (aMultiConObject.IsNull())
@ -4718,7 +4722,7 @@ static Standard_Integer VChild (Draw_Interpretor& ,
{ {
bool aVal = true; bool aVal = true;
if (anArgIter + 1 < theNbArgs if (anArgIter + 1 < theNbArgs
&& ViewerTest::ParseOnOff(theArgVec[anArgIter + 1], aVal)) && Draw::ParseOnOff(theArgVec[anArgIter + 1], aVal))
{ {
++anArgIter; ++anArgIter;
} }
@ -4863,7 +4867,7 @@ static Standard_Integer VSetSelectionMode (Draw_Interpretor& /*di*/,
} }
} }
if (anObjNames.Size() < 2 if (anObjNames.Size() < 2
|| !ViewerTest::ParseOnOff (anObjNames.Last().ToCString(), toTurnOn)) || !Draw::ParseOnOff (anObjNames.Last().ToCString(), toTurnOn))
{ {
Message::SendFail ("Syntax error: wrong number of arguments"); Message::SendFail ("Syntax error: wrong number of arguments");
return 1; return 1;
@ -5504,7 +5508,7 @@ static int TextToBRep (Draw_Interpretor& /*theDI*/,
return 1; return 1;
} }
ViewerTest::ParseOnOff (theArgVec[anArgIt], anIsCompositeCurve); Draw::ParseOnOff (theArgVec[anArgIt], anIsCompositeCurve);
} }
else if (aParam == "-plane") else if (aParam == "-plane")
{ {
@ -5743,7 +5747,7 @@ static int VFont (Draw_Interpretor& theDI,
{ {
bool toEnable = true; bool toEnable = true;
if (anArgIter + 1 < theArgNb if (anArgIter + 1 < theArgNb
&& ViewerTest::ParseOnOff (theArgVec[anArgIter + 1], toEnable)) && Draw::ParseOnOff (theArgVec[anArgIter + 1], toEnable))
{ {
++anArgIter; ++anArgIter;
} }
@ -5755,7 +5759,7 @@ static int VFont (Draw_Interpretor& theDI,
{ {
bool toEnable = true; bool toEnable = true;
if (anArgIter + 1 < theArgNb if (anArgIter + 1 < theArgNb
&& ViewerTest::ParseOnOff (theArgVec[anArgIter + 1], toEnable)) && Draw::ParseOnOff (theArgVec[anArgIter + 1], toEnable))
{ {
++anArgIter; ++anArgIter;
} }
@ -6341,7 +6345,7 @@ static int VNormals (Draw_Interpretor& theDI,
TCollection_AsciiString aParam (theArgs[anArgIter]); TCollection_AsciiString aParam (theArgs[anArgIter]);
aParam.LowerCase(); aParam.LowerCase();
if (anArgIter == 2 if (anArgIter == 2
&& ViewerTest::ParseOnOff (aParam.ToCString(), isOn)) && Draw::ParseOnOff (aParam.ToCString(), isOn))
{ {
continue; continue;
} }
@ -6366,7 +6370,7 @@ static int VNormals (Draw_Interpretor& theDI,
{ {
isOriented = Standard_True; isOriented = Standard_True;
if (anArgIter + 1 < theArgNum if (anArgIter + 1 < theArgNum
&& ViewerTest::ParseOnOff (theArgs[anArgIter + 1], isOriented)) && Draw::ParseOnOff (theArgs[anArgIter + 1], isOriented))
{ {
++anArgIter; ++anArgIter;
} }

12
src/ViewerTest/ViewerTest_RelationCommands.cxx
View File

@ -399,7 +399,17 @@ static int ParseDimensionParams (Standard_Integer theArgNum,
} }
else if (aParam.IsEqual ("-color")) else if (aParam.IsEqual ("-color"))
{ {
theAspect->SetCommonColor (Quantity_Color (ViewerTest::GetColorFromName (theArgVec[++anIt]))); Quantity_Color aColor;
Standard_Integer aNbParsed = Draw::ParseColor (theArgNum - anIt - 1,
theArgVec + anIt + 1,
aColor);
anIt += aNbParsed;
if (aNbParsed == 0)
{
Message::SendFail() << "Error: wrong syntax at '" << aParam << "'";
return 1;
}
theAspect->SetCommonColor (aColor);
} }
else if (aParam.IsEqual ("-extension")) else if (aParam.IsEqual ("-extension"))
{ {

179
src/ViewerTest/ViewerTest_ViewerCommands.cxx
View File

@ -1964,7 +1964,7 @@ static int VInit (Draw_Interpretor& theDi, Standard_Integer theArgsNb, const cha
{ {
ViewerTest_EventManager::ToExitOnCloseView() = true; ViewerTest_EventManager::ToExitOnCloseView() = true;
if (anArgIt + 1 < theArgsNb if (anArgIt + 1 < theArgsNb
&& ViewerTest::ParseOnOff (theArgVec[anArgIt + 1], ViewerTest_EventManager::ToExitOnCloseView())) && Draw::ParseOnOff (theArgVec[anArgIt + 1], ViewerTest_EventManager::ToExitOnCloseView()))
{ {
++anArgIt; ++anArgIt;
} }
@ -1974,7 +1974,7 @@ static int VInit (Draw_Interpretor& theDi, Standard_Integer theArgsNb, const cha
{ {
ViewerTest_EventManager::ToCloseViewOnEscape() = true; ViewerTest_EventManager::ToCloseViewOnEscape() = true;
if (anArgIt + 1 < theArgsNb if (anArgIt + 1 < theArgsNb
&& ViewerTest::ParseOnOff (theArgVec[anArgIt + 1], ViewerTest_EventManager::ToCloseViewOnEscape())) && Draw::ParseOnOff (theArgVec[anArgIt + 1], ViewerTest_EventManager::ToCloseViewOnEscape()))
{ {
++anArgIt; ++anArgIt;
} }
@ -1985,7 +1985,7 @@ static int VInit (Draw_Interpretor& theDi, Standard_Integer theArgsNb, const cha
{ {
bool toEnable = true; bool toEnable = true;
if (anArgIt + 1 < theArgsNb if (anArgIt + 1 < theArgsNb
&& ViewerTest::ParseOnOff (theArgVec[anArgIt + 1], toEnable)) && Draw::ParseOnOff (theArgVec[anArgIt + 1], toEnable))
{ {
++anArgIt; ++anArgIt;
} }
@ -2138,7 +2138,7 @@ static int VHLR (Draw_Interpretor& di, Standard_Integer argc, const char** argv)
} }
else if (anArg == "-showhidden" else if (anArg == "-showhidden"
&& anArgIter + 1 < argc && anArgIter + 1 < argc
&& ViewerTest::ParseOnOff (argv[anArgIter + 1], toShowHidden)) && Draw::ParseOnOff (argv[anArgIter + 1], toShowHidden))
{ {
++anArgIter; ++anArgIter;
hasShowHiddenArg = Standard_True; hasShowHiddenArg = Standard_True;
@ -2154,14 +2154,14 @@ static int VHLR (Draw_Interpretor& di, Standard_Integer argc, const char** argv)
continue; continue;
} }
else if (!hasHlrOnArg else if (!hasHlrOnArg
&& ViewerTest::ParseOnOff (argv[anArgIter], isHLROn)) && Draw::ParseOnOff (argv[anArgIter], isHLROn))
{ {
hasHlrOnArg = Standard_True; hasHlrOnArg = Standard_True;
continue; continue;
} }
// old syntax // old syntax
else if (!hasShowHiddenArg else if (!hasShowHiddenArg
&& ViewerTest::ParseOnOff(argv[anArgIter], toShowHidden)) && Draw::ParseOnOff(argv[anArgIter], toShowHidden))
{ {
hasShowHiddenArg = Standard_True; hasShowHiddenArg = Standard_True;
continue; continue;
@ -3832,7 +3832,7 @@ static int VRepaint (Draw_Interpretor& , Standard_Integer theArgNb, const char**
{ {
isImmediateUpdate = Standard_True; isImmediateUpdate = Standard_True;
if (anArgIter + 1 < theArgNb if (anArgIter + 1 < theArgNb
&& ViewerTest::ParseOnOff (theArgVec[anArgIter + 1], isImmediateUpdate)) && Draw::ParseOnOff (theArgVec[anArgIter + 1], isImmediateUpdate))
{ {
++anArgIter; ++anArgIter;
} }
@ -4133,7 +4133,7 @@ static int VZBuffTrihedron (Draw_Interpretor& /*theDI*/,
else if (aFlag == "-colorlabel" else if (aFlag == "-colorlabel"
|| aFlag == "-colorlabels") || aFlag == "-colorlabels")
{ {
Standard_Integer aNbParsed = ViewerTest::ParseColor (theArgNb - anArgIter - 1, Standard_Integer aNbParsed = Draw::ParseColor (theArgNb - anArgIter - 1,
theArgVec + anArgIter + 1, theArgVec + anArgIter + 1,
aLabelsColor); aLabelsColor);
if (aNbParsed == 0) if (aNbParsed == 0)
@ -4145,7 +4145,7 @@ static int VZBuffTrihedron (Draw_Interpretor& /*theDI*/,
} }
else if (aFlag == "-colorarrowx") else if (aFlag == "-colorarrowx")
{ {
Standard_Integer aNbParsed = ViewerTest::ParseColor (theArgNb - anArgIter - 1, Standard_Integer aNbParsed = Draw::ParseColor (theArgNb - anArgIter - 1,
theArgVec + anArgIter + 1, theArgVec + anArgIter + 1,
anArrowColorX); anArrowColorX);
if (aNbParsed == 0) if (aNbParsed == 0)
@ -4157,7 +4157,7 @@ static int VZBuffTrihedron (Draw_Interpretor& /*theDI*/,
} }
else if (aFlag == "-colorarrowy") else if (aFlag == "-colorarrowy")
{ {
Standard_Integer aNbParsed = ViewerTest::ParseColor (theArgNb - anArgIter - 1, Standard_Integer aNbParsed = Draw::ParseColor (theArgNb - anArgIter - 1,
theArgVec + anArgIter + 1, theArgVec + anArgIter + 1,
anArrowColorY); anArrowColorY);
if (aNbParsed == 0) if (aNbParsed == 0)
@ -4169,7 +4169,7 @@ static int VZBuffTrihedron (Draw_Interpretor& /*theDI*/,
} }
else if (aFlag == "-colorarrowz") else if (aFlag == "-colorarrowz")
{ {
Standard_Integer aNbParsed = ViewerTest::ParseColor (theArgNb - anArgIter - 1, Standard_Integer aNbParsed = Draw::ParseColor (theArgNb - anArgIter - 1,
theArgVec + anArgIter + 1, theArgVec + anArgIter + 1,
anArrowColorZ); anArrowColorZ);
if (aNbParsed == 0) if (aNbParsed == 0)
@ -4512,7 +4512,7 @@ static int VColorScale (Draw_Interpretor& theDI,
} }
Standard_Boolean IsLog; Standard_Boolean IsLog;
if (!ViewerTest::ParseOnOff(theArgVec[++anArgIter], IsLog)) if (!Draw::ParseOnOff(theArgVec[++anArgIter], IsLog))
{ {
Message::SendFail() << "Syntax error at argument '" << anArg << "'"; Message::SendFail() << "Syntax error at argument '" << anArg << "'";
return 1; return 1;
@ -4535,11 +4535,11 @@ static int VColorScale (Draw_Interpretor& theDI,
else if (aFlag == "-colorrange") else if (aFlag == "-colorrange")
{ {
Quantity_Color aColorMin, aColorMax; Quantity_Color aColorMin, aColorMax;
Standard_Integer aNbParsed1 = ViewerTest::ParseColor (theArgNb - (anArgIter + 1), Standard_Integer aNbParsed1 = Draw::ParseColor (theArgNb - (anArgIter + 1),
theArgVec + (anArgIter + 1), theArgVec + (anArgIter + 1),
aColorMin); aColorMin);
anArgIter += aNbParsed1; anArgIter += aNbParsed1;
Standard_Integer aNbParsed2 = ViewerTest::ParseColor (theArgNb - (anArgIter + 1), Standard_Integer aNbParsed2 = Draw::ParseColor (theArgNb - (anArgIter + 1),
theArgVec + (anArgIter + 1), theArgVec + (anArgIter + 1),
aColorMax); aColorMax);
anArgIter += aNbParsed2; anArgIter += aNbParsed2;
@ -4559,7 +4559,7 @@ static int VColorScale (Draw_Interpretor& theDI,
{ {
Standard_Boolean toEnable = Standard_True; Standard_Boolean toEnable = Standard_True;
if (anArgIter + 1 < theArgNb if (anArgIter + 1 < theArgNb
&& ViewerTest::ParseOnOff(theArgVec[anArgIter + 1], toEnable)) && Draw::ParseOnOff(theArgVec[anArgIter + 1], toEnable))
{ {
++anArgIter; ++anArgIter;
} }
@ -4570,7 +4570,7 @@ static int VColorScale (Draw_Interpretor& theDI,
{ {
Standard_Boolean toEnable = Standard_True; Standard_Boolean toEnable = Standard_True;
if (anArgIter + 1 < theArgNb if (anArgIter + 1 < theArgNb
&& ViewerTest::ParseOnOff (theArgVec[anArgIter + 1], toEnable)) && Draw::ParseOnOff (theArgVec[anArgIter + 1], toEnable))
{ {
++anArgIter; ++anArgIter;
} }
@ -4657,7 +4657,7 @@ static int VColorScale (Draw_Interpretor& theDI,
} }
Quantity_Color aColor; Quantity_Color aColor;
Standard_Integer aNbParsed = ViewerTest::ParseColor (theArgNb - (anArgIter + 1), Standard_Integer aNbParsed = Draw::ParseColor (theArgNb - (anArgIter + 1),
theArgVec + (anArgIter + 1), theArgVec + (anArgIter + 1),
aColor); aColor);
if (aNbParsed == 0) if (aNbParsed == 0)
@ -4727,7 +4727,7 @@ static int VColorScale (Draw_Interpretor& theDI,
toEnable = (aLabAtBorder == 1); toEnable = (aLabAtBorder == 1);
} }
else if (anArgIter + 1 < theArgNb else if (anArgIter + 1 < theArgNb
&& ViewerTest::ParseOnOff (theArgVec[anArgIter + 1], toEnable)) && Draw::ParseOnOff (theArgVec[anArgIter + 1], toEnable))
{ {
++anArgIter; ++anArgIter;
} }
@ -4742,7 +4742,7 @@ static int VColorScale (Draw_Interpretor& theDI,
for (;;) for (;;)
{ {
Quantity_Color aColor; Quantity_Color aColor;
Standard_Integer aNbParsed = ViewerTest::ParseColor (theArgNb - (anArgIter + 1), Standard_Integer aNbParsed = Draw::ParseColor (theArgNb - (anArgIter + 1),
theArgVec + (anArgIter + 1), theArgVec + (anArgIter + 1),
aColor); aColor);
if (aNbParsed == 0) if (aNbParsed == 0)
@ -6551,7 +6551,7 @@ static int VGlDebug (Draw_Interpretor& theDI,
{ {
Standard_Boolean toShowWarns = Standard_True; Standard_Boolean toShowWarns = Standard_True;
if (++anArgIter < theArgNb if (++anArgIter < theArgNb
&& !ViewerTest::ParseOnOff (theArgVec[anArgIter], toShowWarns)) && !Draw::ParseOnOff (theArgVec[anArgIter], toShowWarns))
{ {
--anArgIter; --anArgIter;
} }
@ -6567,7 +6567,7 @@ static int VGlDebug (Draw_Interpretor& theDI,
{ {
Standard_Boolean toShow = Standard_True; Standard_Boolean toShow = Standard_True;
if (++anArgIter < theArgNb if (++anArgIter < theArgNb
&& !ViewerTest::ParseOnOff (theArgVec[anArgIter], toShow)) && !Draw::ParseOnOff (theArgVec[anArgIter], toShow))
{ {
--anArgIter; --anArgIter;
} }
@ -6583,7 +6583,7 @@ static int VGlDebug (Draw_Interpretor& theDI,
{ {
Standard_Boolean toSuppress = Standard_True; Standard_Boolean toSuppress = Standard_True;
if (++anArgIter < theArgNb if (++anArgIter < theArgNb
&& !ViewerTest::ParseOnOff (theArgVec[anArgIter], toSuppress)) && !Draw::ParseOnOff (theArgVec[anArgIter], toSuppress))
{ {
--anArgIter; --anArgIter;
} }
@ -6597,7 +6597,7 @@ static int VGlDebug (Draw_Interpretor& theDI,
{ {
Standard_Boolean toSync = Standard_True; Standard_Boolean toSync = Standard_True;
if (++anArgIter < theArgNb if (++anArgIter < theArgNb
&& !ViewerTest::ParseOnOff (theArgVec[anArgIter], toSync)) && !Draw::ParseOnOff (theArgVec[anArgIter], toSync))
{ {
--anArgIter; --anArgIter;
} }
@ -6625,13 +6625,13 @@ static int VGlDebug (Draw_Interpretor& theDI,
else if (anArgCase == "-debug") else if (anArgCase == "-debug")
{ {
if (++anArgIter < theArgNb if (++anArgIter < theArgNb
&& !ViewerTest::ParseOnOff (theArgVec[anArgIter], toEnableDebug)) && !Draw::ParseOnOff (theArgVec[anArgIter], toEnableDebug))
{ {
--anArgIter; --anArgIter;
} }
aDefCaps->contextDebug = toEnableDebug; aDefCaps->contextDebug = toEnableDebug;
} }
else if (ViewerTest::ParseOnOff (anArg, toEnableDebug) else if (Draw::ParseOnOff (anArg, toEnableDebug)
&& (anArgIter + 1 == theArgNb)) && (anArgIter + 1 == theArgNb))
{ {
// simple alias to turn on almost everything // simple alias to turn on almost everything
@ -6758,7 +6758,7 @@ static int VCaps (Draw_Interpretor& theDI,
{ {
Standard_Boolean toEnable = Standard_True; Standard_Boolean toEnable = Standard_True;
if (++anArgIter < theArgNb if (++anArgIter < theArgNb
&& !ViewerTest::ParseOnOff (theArgVec[anArgIter], toEnable)) && !Draw::ParseOnOff (theArgVec[anArgIter], toEnable))
{ {
--anArgIter; --anArgIter;
} }
@ -6768,7 +6768,7 @@ static int VCaps (Draw_Interpretor& theDI,
{ {
Standard_Boolean toEnable = Standard_True; Standard_Boolean toEnable = Standard_True;
if (++anArgIter < theArgNb if (++anArgIter < theArgNb
&& !ViewerTest::ParseOnOff (theArgVec[anArgIter], toEnable)) && !Draw::ParseOnOff (theArgVec[anArgIter], toEnable))
{ {
--anArgIter; --anArgIter;
} }
@ -6778,7 +6778,7 @@ static int VCaps (Draw_Interpretor& theDI,
{ {
Standard_Boolean toEnable = Standard_True; Standard_Boolean toEnable = Standard_True;
if (++anArgIter < theArgNb if (++anArgIter < theArgNb
&& !ViewerTest::ParseOnOff (theArgVec[anArgIter], toEnable)) && !Draw::ParseOnOff (theArgVec[anArgIter], toEnable))
{ {
--anArgIter; --anArgIter;
} }
@ -6788,7 +6788,7 @@ static int VCaps (Draw_Interpretor& theDI,
{ {
Standard_Boolean toEnable = Standard_True; Standard_Boolean toEnable = Standard_True;
if (++anArgIter < theArgNb if (++anArgIter < theArgNb
&& !ViewerTest::ParseOnOff (theArgVec[anArgIter], toEnable)) && !Draw::ParseOnOff (theArgVec[anArgIter], toEnable))
{ {
--anArgIter; --anArgIter;
} }
@ -6798,7 +6798,7 @@ static int VCaps (Draw_Interpretor& theDI,
{ {
Standard_Boolean toEnable = Standard_True; Standard_Boolean toEnable = Standard_True;
if (++anArgIter < theArgNb if (++anArgIter < theArgNb
&& !ViewerTest::ParseOnOff (theArgVec[anArgIter], toEnable)) && !Draw::ParseOnOff (theArgVec[anArgIter], toEnable))
{ {
--anArgIter; --anArgIter;
} }
@ -6808,7 +6808,7 @@ static int VCaps (Draw_Interpretor& theDI,
{ {
Standard_Boolean toEnable = Standard_True; Standard_Boolean toEnable = Standard_True;
if (++anArgIter < theArgNb if (++anArgIter < theArgNb
&& !ViewerTest::ParseOnOff (theArgVec[anArgIter], toEnable)) && !Draw::ParseOnOff (theArgVec[anArgIter], toEnable))
{ {
--anArgIter; --anArgIter;
} }
@ -6819,7 +6819,7 @@ static int VCaps (Draw_Interpretor& theDI,
{ {
Standard_Boolean toEnable = Standard_True; Standard_Boolean toEnable = Standard_True;
if (++anArgIter < theArgNb if (++anArgIter < theArgNb
&& !ViewerTest::ParseOnOff (theArgVec[anArgIter], toEnable)) && !Draw::ParseOnOff (theArgVec[anArgIter], toEnable))
{ {
--anArgIter; --anArgIter;
} }
@ -6829,7 +6829,7 @@ static int VCaps (Draw_Interpretor& theDI,
{ {
Standard_Boolean toEnable = Standard_True; Standard_Boolean toEnable = Standard_True;
if (++anArgIter < theArgNb if (++anArgIter < theArgNb
&& !ViewerTest::ParseOnOff (theArgVec[anArgIter], toEnable)) && !Draw::ParseOnOff (theArgVec[anArgIter], toEnable))
{ {
--anArgIter; --anArgIter;
} }
@ -6843,7 +6843,7 @@ static int VCaps (Draw_Interpretor& theDI,
{ {
Standard_Boolean toEnable = Standard_True; Standard_Boolean toEnable = Standard_True;
if (++anArgIter < theArgNb if (++anArgIter < theArgNb
&& !ViewerTest::ParseOnOff (theArgVec[anArgIter], toEnable)) && !Draw::ParseOnOff (theArgVec[anArgIter], toEnable))
{ {
--anArgIter; --anArgIter;
} }
@ -6854,7 +6854,7 @@ static int VCaps (Draw_Interpretor& theDI,
{ {
Standard_Boolean toEnable = Standard_True; Standard_Boolean toEnable = Standard_True;
if (++anArgIter < theArgNb if (++anArgIter < theArgNb
&& !ViewerTest::ParseOnOff (theArgVec[anArgIter], toEnable)) && !Draw::ParseOnOff (theArgVec[anArgIter], toEnable))
{ {
--anArgIter; --anArgIter;
} }
@ -6867,7 +6867,7 @@ static int VCaps (Draw_Interpretor& theDI,
{ {
Standard_Boolean toEnable = Standard_True; Standard_Boolean toEnable = Standard_True;
if (++anArgIter < theArgNb if (++anArgIter < theArgNb
&& !ViewerTest::ParseOnOff (theArgVec[anArgIter], toEnable)) && !Draw::ParseOnOff (theArgVec[anArgIter], toEnable))
{ {
--anArgIter; --anArgIter;
} }
@ -6882,7 +6882,7 @@ static int VCaps (Draw_Interpretor& theDI,
{ {
Standard_Boolean toEnable = Standard_True; Standard_Boolean toEnable = Standard_True;
if (++anArgIter < theArgNb if (++anArgIter < theArgNb
&& !ViewerTest::ParseOnOff (theArgVec[anArgIter], toEnable)) && !Draw::ParseOnOff (theArgVec[anArgIter], toEnable))
{ {
--anArgIter; --anArgIter;
} }
@ -6897,7 +6897,7 @@ static int VCaps (Draw_Interpretor& theDI,
{ {
Standard_Boolean toEnable = Standard_True; Standard_Boolean toEnable = Standard_True;
if (++anArgIter < theArgNb if (++anArgIter < theArgNb
&& !ViewerTest::ParseOnOff (theArgVec[anArgIter], toEnable)) && !Draw::ParseOnOff (theArgVec[anArgIter], toEnable))
{ {
--anArgIter; --anArgIter;
} }
@ -6909,7 +6909,7 @@ static int VCaps (Draw_Interpretor& theDI,
{ {
Standard_Boolean toDisable = Standard_True; Standard_Boolean toDisable = Standard_True;
if (++anArgIter < theArgNb if (++anArgIter < theArgNb
&& !ViewerTest::ParseOnOff (theArgVec[anArgIter], toDisable)) && !Draw::ParseOnOff (theArgVec[anArgIter], toDisable))
{ {
--anArgIter; --anArgIter;
} }
@ -7328,7 +7328,7 @@ static int VDiffImage (Draw_Interpretor& theDI, Standard_Integer theArgNb, const
{ {
Standard_Boolean toEnable = Standard_True; Standard_Boolean toEnable = Standard_True;
if (anArgIter + 1 < theArgNb if (anArgIter + 1 < theArgNb
&& ViewerTest::ParseOnOff (theArgVec[anArgIter + 1], toEnable)) && Draw::ParseOnOff (theArgVec[anArgIter + 1], toEnable))
{ {
++anArgIter; ++anArgIter;
} }
@ -7338,7 +7338,7 @@ static int VDiffImage (Draw_Interpretor& theDI, Standard_Integer theArgNb, const
{ {
Standard_Boolean toEnable = Standard_True; Standard_Boolean toEnable = Standard_True;
if (anArgIter + 1 < theArgNb if (anArgIter + 1 < theArgNb
&& ViewerTest::ParseOnOff (theArgVec[anArgIter + 1], toEnable)) && Draw::ParseOnOff (theArgVec[anArgIter + 1], toEnable))
{ {
++anArgIter; ++anArgIter;
} }
@ -7348,7 +7348,7 @@ static int VDiffImage (Draw_Interpretor& theDI, Standard_Integer theArgNb, const
{ {
ViewerTest_EventManager::ToExitOnCloseView() = true; ViewerTest_EventManager::ToExitOnCloseView() = true;
if (anArgIter + 1 < theArgNb if (anArgIter + 1 < theArgNb
&& ViewerTest::ParseOnOff (theArgVec[anArgIter + 1], ViewerTest_EventManager::ToExitOnCloseView())) && Draw::ParseOnOff (theArgVec[anArgIter + 1], ViewerTest_EventManager::ToExitOnCloseView()))
{ {
++anArgIter; ++anArgIter;
} }
@ -7358,7 +7358,7 @@ static int VDiffImage (Draw_Interpretor& theDI, Standard_Integer theArgNb, const
{ {
ViewerTest_EventManager::ToCloseViewOnEscape() = true; ViewerTest_EventManager::ToCloseViewOnEscape() = true;
if (anArgIter + 1 < theArgNb if (anArgIter + 1 < theArgNb
&& ViewerTest::ParseOnOff (theArgVec[anArgIter + 1], ViewerTest_EventManager::ToCloseViewOnEscape())) && Draw::ParseOnOff (theArgVec[anArgIter + 1], ViewerTest_EventManager::ToCloseViewOnEscape()))
{ {
++anArgIter; ++anArgIter;
} }
@ -7555,7 +7555,7 @@ static Standard_Integer VSelect (Draw_Interpretor& ,
{ {
toAllowOverlap = true; toAllowOverlap = true;
if (anArgIter + 1 < theNbArgs if (anArgIter + 1 < theNbArgs
&& ViewerTest::ParseOnOff (theArgVec[anArgIter + 1], toAllowOverlap)) && Draw::ParseOnOff (theArgVec[anArgIter + 1], toAllowOverlap))
{ {
++anArgIter; ++anArgIter;
} }
@ -8115,12 +8115,12 @@ static Standard_Integer V2DMode (Draw_Interpretor&, Standard_Integer theArgsNb,
else if (anArgCase == "-mode") else if (anArgCase == "-mode")
{ {
if (anArgIt + 1 < theArgsNb if (anArgIt + 1 < theArgsNb
&& ViewerTest::ParseOnOff (theArgVec[anArgIt + 1], is2dMode)) && Draw::ParseOnOff (theArgVec[anArgIt + 1], is2dMode))
{ {
++anArgIt; ++anArgIt;
} }
} }
else if (ViewerTest::ParseOnOff (theArgVec[anArgIt], is2dMode)) else if (Draw::ParseOnOff (theArgVec[anArgIt], is2dMode))
{ {
// //
} }
@ -9418,7 +9418,7 @@ static int VClipPlane (Draw_Interpretor& theDi, Standard_Integer theArgsNb, cons
aChangeArg.LowerCase(); aChangeArg.LowerCase();
Standard_Boolean toEnable = Standard_True; Standard_Boolean toEnable = Standard_True;
if (ViewerTest::ParseOnOff (aChangeArgs[0], toEnable)) if (Draw::ParseOnOff (aChangeArgs[0], toEnable))
{ {
aClipPlane->SetOn (toEnable); aClipPlane->SetOn (toEnable);
} }
@ -9508,7 +9508,7 @@ static int VClipPlane (Draw_Interpretor& theDi, Standard_Integer theArgsNb, cons
return 1; return 1;
} }
if (ViewerTest::ParseOnOff (aChangeArgs[1], toEnable)) if (Draw::ParseOnOff (aChangeArgs[1], toEnable))
{ {
aClipPlane->SetCapping (toEnable); aClipPlane->SetCapping (toEnable);
anArgIter += 1; anArgIter += 1;
@ -9529,7 +9529,7 @@ static int VClipPlane (Draw_Interpretor& theDi, Standard_Integer theArgsNb, cons
return 1; return 1;
} }
if (ViewerTest::ParseOnOff (aChangeArgs[1], toEnable)) if (Draw::ParseOnOff (aChangeArgs[1], toEnable))
{ {
aClipPlane->SetUseObjectMaterial (toEnable == Standard_True); aClipPlane->SetUseObjectMaterial (toEnable == Standard_True);
anArgIter += 1; anArgIter += 1;
@ -9546,7 +9546,7 @@ static int VClipPlane (Draw_Interpretor& theDi, Standard_Integer theArgsNb, cons
return 1; return 1;
} }
if (ViewerTest::ParseOnOff (aChangeArgs[1], toEnable)) if (Draw::ParseOnOff (aChangeArgs[1], toEnable))
{ {
aClipPlane->SetUseObjectTexture (toEnable == Standard_True); aClipPlane->SetUseObjectTexture (toEnable == Standard_True);
anArgIter += 1; anArgIter += 1;
@ -9561,7 +9561,7 @@ static int VClipPlane (Draw_Interpretor& theDi, Standard_Integer theArgsNb, cons
return 1; return 1;
} }
if (ViewerTest::ParseOnOff (aChangeArgs[1], toEnable)) if (Draw::ParseOnOff (aChangeArgs[1], toEnable))
{ {
aClipPlane->SetUseObjectShader (toEnable == Standard_True); aClipPlane->SetUseObjectShader (toEnable == Standard_True);
anArgIter += 1; anArgIter += 1;
@ -9571,7 +9571,7 @@ static int VClipPlane (Draw_Interpretor& theDi, Standard_Integer theArgsNb, cons
|| aChangeArg == "color") || aChangeArg == "color")
{ {
Quantity_Color aColor; Quantity_Color aColor;
Standard_Integer aNbParsed = ViewerTest::ParseColor (aNbChangeArgs - 1, Standard_Integer aNbParsed = Draw::ParseColor (aNbChangeArgs - 1,
aChangeArgs + 1, aChangeArgs + 1,
aColor); aColor);
if (aNbParsed == 0) if (aNbParsed == 0)
@ -10124,7 +10124,7 @@ static int VCamera (Draw_Interpretor& theDI,
{ {
bool toLockUp = true; bool toLockUp = true;
if (++anArgIter < theArgsNb if (++anArgIter < theArgsNb
&& !ViewerTest::ParseOnOff (theArgVec[anArgIter], toLockUp)) && !Draw::ParseOnOff (theArgVec[anArgIter], toLockUp))
{ {
--anArgIter; --anArgIter;
} }
@ -10453,7 +10453,7 @@ static int VStereo (Draw_Interpretor& theDI,
{ {
Standard_Boolean toEnable = Standard_True; Standard_Boolean toEnable = Standard_True;
if (++anArgIter < theArgNb if (++anArgIter < theArgNb
&& !ViewerTest::ParseOnOff (theArgVec[anArgIter], toEnable)) && !Draw::ParseOnOff (theArgVec[anArgIter], toEnable))
{ {
--anArgIter; --anArgIter;
} }
@ -10464,7 +10464,7 @@ static int VStereo (Draw_Interpretor& theDI,
{ {
Standard_Boolean toDisable = Standard_True; Standard_Boolean toDisable = Standard_True;
if (++anArgIter < theArgNb if (++anArgIter < theArgNb
&& !ViewerTest::ParseOnOff (theArgVec[anArgIter], toDisable)) && !Draw::ParseOnOff (theArgVec[anArgIter], toDisable))
{ {
--anArgIter; --anArgIter;
} }
@ -10522,7 +10522,7 @@ static int VStereo (Draw_Interpretor& theDI,
{ {
Standard_Boolean toEnable = Standard_True; Standard_Boolean toEnable = Standard_True;
if (++anArgIter < theArgNb if (++anArgIter < theArgNb
&& !ViewerTest::ParseOnOff (theArgVec[anArgIter], toEnable)) && !Draw::ParseOnOff (theArgVec[anArgIter], toEnable))
{ {
--anArgIter; --anArgIter;
} }
@ -10636,7 +10636,7 @@ static int VDefaults (Draw_Interpretor& theDi,
++anArgIter; ++anArgIter;
bool toTurnOn = true; bool toTurnOn = true;
if (anArgIter >= theArgsNb if (anArgIter >= theArgsNb
|| !ViewerTest::ParseOnOff (theArgVec[anArgIter], toTurnOn)) || !Draw::ParseOnOff (theArgVec[anArgIter], toTurnOn))
{ {
Message::SendFail() << "Syntax error at '" << anArg << "'"; Message::SendFail() << "Syntax error at '" << anArg << "'";
return 1; return 1;
@ -11062,16 +11062,17 @@ static int VLight (Draw_Interpretor& theDi,
|| anArgCase.IsEqual ("-COLOR") || anArgCase.IsEqual ("-COLOR")
|| anArgCase.IsEqual ("-COLOUR")) || anArgCase.IsEqual ("-COLOUR"))
{ {
if (++anArgIt >= theArgsNb Quantity_Color aColor;
Standard_Integer aNbParsed = Draw::ParseColor (theArgsNb - anArgIt - 1,
theArgVec + anArgIt + 1,
aColor);
anArgIt += aNbParsed;
if (aNbParsed == 0
|| aLightCurr.IsNull()) || aLightCurr.IsNull())
{ {
Message::SendFail() << "Syntax error at argument '" << anArg << "'"; Message::SendFail() << "Syntax error at argument '" << anArg << "'";
return 1; return 1;
} }
TCollection_AsciiString anArgNext (theArgVec[anArgIt]);
anArgNext.UpperCase();
const Quantity_Color aColor = ViewerTest::GetColorFromName (anArgNext.ToCString());
aLightCurr->SetColor (aColor); aLightCurr->SetColor (aColor);
} }
else if (anArgCase.IsEqual ("POS") else if (anArgCase.IsEqual ("POS")
@ -11264,7 +11265,7 @@ static int VLight (Draw_Interpretor& theDi,
Standard_Boolean isHeadLight = Standard_True; Standard_Boolean isHeadLight = Standard_True;
if (anArgIt + 1 < theArgsNb if (anArgIt + 1 < theArgsNb
&& ViewerTest::ParseOnOff (theArgVec[anArgIt + 1], isHeadLight)) && Draw::ParseOnOff (theArgVec[anArgIt + 1], isHeadLight))
{ {
++anArgIt; ++anArgIt;
} }
@ -11671,7 +11672,7 @@ static Standard_Integer VRenderParams (Draw_Interpretor& theDI,
bool isRayTrace = true; bool isRayTrace = true;
if (anArgIter + 1 < theArgNb if (anArgIter + 1 < theArgNb
&& ViewerTest::ParseOnOff (theArgVec[anArgIter + 1], isRayTrace)) && Draw::ParseOnOff (theArgVec[anArgIter + 1], isRayTrace))
{ {
++anArgIter; ++anArgIter;
} }
@ -11689,7 +11690,7 @@ static Standard_Integer VRenderParams (Draw_Interpretor& theDI,
bool isRaster = true; bool isRaster = true;
if (anArgIter + 1 < theArgNb if (anArgIter + 1 < theArgNb
&& ViewerTest::ParseOnOff (theArgVec[anArgIter + 1], isRaster)) && Draw::ParseOnOff (theArgVec[anArgIter + 1], isRaster))
{ {
++anArgIter; ++anArgIter;
} }
@ -11796,7 +11797,7 @@ static Standard_Integer VRenderParams (Draw_Interpretor& theDI,
} }
aParams.ToEnableDepthPrepass = Standard_True; aParams.ToEnableDepthPrepass = Standard_True;
if (anArgIter + 1 < theArgNb if (anArgIter + 1 < theArgNb
&& ViewerTest::ParseOnOff (theArgVec[anArgIter + 1], aParams.ToEnableDepthPrepass)) && Draw::ParseOnOff (theArgVec[anArgIter + 1], aParams.ToEnableDepthPrepass))
{ {
++anArgIter; ++anArgIter;
} }
@ -11811,7 +11812,7 @@ static Standard_Integer VRenderParams (Draw_Interpretor& theDI,
} }
aParams.ToEnableAlphaToCoverage = Standard_True; aParams.ToEnableAlphaToCoverage = Standard_True;
if (anArgIter + 1 < theArgNb if (anArgIter + 1 < theArgNb
&& ViewerTest::ParseOnOff (theArgVec[anArgIter + 1], aParams.ToEnableAlphaToCoverage)) && Draw::ParseOnOff (theArgVec[anArgIter + 1], aParams.ToEnableAlphaToCoverage))
{ {
++anArgIter; ++anArgIter;
} }
@ -11880,7 +11881,7 @@ static Standard_Integer VRenderParams (Draw_Interpretor& theDI,
Standard_Boolean toEnable = Standard_True; Standard_Boolean toEnable = Standard_True;
if (++anArgIter < theArgNb if (++anArgIter < theArgNb
&& !ViewerTest::ParseOnOff (theArgVec[anArgIter], toEnable)) && !Draw::ParseOnOff (theArgVec[anArgIter], toEnable))
{ {
--anArgIter; --anArgIter;
} }
@ -11897,7 +11898,7 @@ static Standard_Integer VRenderParams (Draw_Interpretor& theDI,
Standard_Boolean toEnable = Standard_True; Standard_Boolean toEnable = Standard_True;
if (++anArgIter < theArgNb if (++anArgIter < theArgNb
&& !ViewerTest::ParseOnOff (theArgVec[anArgIter], toEnable)) && !Draw::ParseOnOff (theArgVec[anArgIter], toEnable))
{ {
--anArgIter; --anArgIter;
} }
@ -11913,7 +11914,7 @@ static Standard_Integer VRenderParams (Draw_Interpretor& theDI,
Standard_Boolean toEnable = Standard_True; Standard_Boolean toEnable = Standard_True;
if (++anArgIter < theArgNb if (++anArgIter < theArgNb
&& !ViewerTest::ParseOnOff (theArgVec[anArgIter], toEnable)) && !Draw::ParseOnOff (theArgVec[anArgIter], toEnable))
{ {
--anArgIter; --anArgIter;
} }
@ -11929,7 +11930,7 @@ static Standard_Integer VRenderParams (Draw_Interpretor& theDI,
Standard_Boolean toEnable = Standard_True; Standard_Boolean toEnable = Standard_True;
if (++anArgIter < theArgNb if (++anArgIter < theArgNb
&& !ViewerTest::ParseOnOff (theArgVec[anArgIter], toEnable)) && !Draw::ParseOnOff (theArgVec[anArgIter], toEnable))
{ {
--anArgIter; --anArgIter;
} }
@ -11945,7 +11946,7 @@ static Standard_Integer VRenderParams (Draw_Interpretor& theDI,
Standard_Boolean toEnable = Standard_True; Standard_Boolean toEnable = Standard_True;
if (++anArgIter < theArgNb if (++anArgIter < theArgNb
&& !ViewerTest::ParseOnOff (theArgVec[anArgIter], toEnable)) && !Draw::ParseOnOff (theArgVec[anArgIter], toEnable))
{ {
--anArgIter; --anArgIter;
} }
@ -11966,7 +11967,7 @@ static Standard_Integer VRenderParams (Draw_Interpretor& theDI,
Standard_Boolean toEnable = Standard_True; Standard_Boolean toEnable = Standard_True;
if (++anArgIter < theArgNb if (++anArgIter < theArgNb
&& !ViewerTest::ParseOnOff (theArgVec[anArgIter], toEnable)) && !Draw::ParseOnOff (theArgVec[anArgIter], toEnable))
{ {
--anArgIter; --anArgIter;
} }
@ -12013,7 +12014,7 @@ static Standard_Integer VRenderParams (Draw_Interpretor& theDI,
Standard_Boolean toEnable = Standard_True; Standard_Boolean toEnable = Standard_True;
if (++anArgIter < theArgNb if (++anArgIter < theArgNb
&& !ViewerTest::ParseOnOff (theArgVec[anArgIter], toEnable)) && !Draw::ParseOnOff (theArgVec[anArgIter], toEnable))
{ {
--anArgIter; --anArgIter;
} }
@ -12029,7 +12030,7 @@ static Standard_Integer VRenderParams (Draw_Interpretor& theDI,
Standard_Boolean toEnable = Standard_True; Standard_Boolean toEnable = Standard_True;
if (++anArgIter < theArgNb if (++anArgIter < theArgNb
&& !ViewerTest::ParseOnOff (theArgVec[anArgIter], toEnable)) && !Draw::ParseOnOff (theArgVec[anArgIter], toEnable))
{ {
--anArgIter; --anArgIter;
} }
@ -12045,7 +12046,7 @@ static Standard_Integer VRenderParams (Draw_Interpretor& theDI,
Standard_Boolean toEnable = Standard_True; Standard_Boolean toEnable = Standard_True;
if (++anArgIter < theArgNb if (++anArgIter < theArgNb
&& !ViewerTest::ParseOnOff (theArgVec[anArgIter], toEnable)) && !Draw::ParseOnOff (theArgVec[anArgIter], toEnable))
{ {
--anArgIter; --anArgIter;
} }
@ -12109,7 +12110,7 @@ static Standard_Integer VRenderParams (Draw_Interpretor& theDI,
Standard_Boolean toEnable = Standard_True; Standard_Boolean toEnable = Standard_True;
if (++anArgIter < theArgNb if (++anArgIter < theArgNb
&& !ViewerTest::ParseOnOff (theArgVec[anArgIter], toEnable)) && !Draw::ParseOnOff (theArgVec[anArgIter], toEnable))
{ {
--anArgIter; --anArgIter;
} }
@ -12125,7 +12126,7 @@ static Standard_Integer VRenderParams (Draw_Interpretor& theDI,
Standard_Boolean toEnable = Standard_True; Standard_Boolean toEnable = Standard_True;
if (++anArgIter < theArgNb if (++anArgIter < theArgNb
&& !ViewerTest::ParseOnOff (theArgVec[anArgIter], toEnable)) && !Draw::ParseOnOff (theArgVec[anArgIter], toEnable))
{ {
--anArgIter; --anArgIter;
} }
@ -12141,7 +12142,7 @@ static Standard_Integer VRenderParams (Draw_Interpretor& theDI,
Standard_Boolean toEnable = Standard_True; Standard_Boolean toEnable = Standard_True;
if (++anArgIter < theArgNb if (++anArgIter < theArgNb
&& !ViewerTest::ParseOnOff (theArgVec[anArgIter], toEnable)) && !Draw::ParseOnOff (theArgVec[anArgIter], toEnable))
{ {
--anArgIter; --anArgIter;
} }
@ -12304,7 +12305,7 @@ static Standard_Integer VRenderParams (Draw_Interpretor& theDI,
Standard_Boolean toEnable = Standard_True; Standard_Boolean toEnable = Standard_True;
if (++anArgIter < theArgNb if (++anArgIter < theArgNb
&& !ViewerTest::ParseOnOff (theArgVec[anArgIter], toEnable)) && !Draw::ParseOnOff (theArgVec[anArgIter], toEnable))
{ {
--anArgIter; --anArgIter;
} }
@ -12493,7 +12494,7 @@ static Standard_Integer VRenderParams (Draw_Interpretor& theDI,
TCollection_AsciiString aStateStr(theArgVec[anArgIter]); TCollection_AsciiString aStateStr(theArgVec[anArgIter]);
aStateStr.LowerCase(); aStateStr.LowerCase();
bool toEnable = true; bool toEnable = true;
if (ViewerTest::ParseOnOff (aStateStr.ToCString(), toEnable)) if (Draw::ParseOnOff (aStateStr.ToCString(), toEnable))
{ {
aState = toEnable ? Graphic3d_RenderingParams::FrustumCulling_On : Graphic3d_RenderingParams::FrustumCulling_Off; aState = toEnable ? Graphic3d_RenderingParams::FrustumCulling_On : Graphic3d_RenderingParams::FrustumCulling_Off;
} }
@ -13154,7 +13155,7 @@ static int VSelectionProperties (Draw_Interpretor& theDi,
return 0; return 0;
} }
else if (theArgsNb != 2 else if (theArgsNb != 2
|| !ViewerTest::ParseOnOff (theArgVec[1], toEnable)) || !Draw::ParseOnOff (theArgVec[1], toEnable))
{ {
Message::SendFail ("Syntax error: wrong number of parameters"); Message::SendFail ("Syntax error: wrong number of parameters");
return 1; return 1;
@ -13226,7 +13227,7 @@ static int VSelectionProperties (Draw_Interpretor& theDi,
{ {
Standard_Boolean toEnable = Standard_True; Standard_Boolean toEnable = Standard_True;
if (anArgIter + 1 < theArgsNb if (anArgIter + 1 < theArgsNb
&& ViewerTest::ParseOnOff (theArgVec[anArgIter + 1], toEnable)) && Draw::ParseOnOff (theArgVec[anArgIter + 1], toEnable))
{ {
++anArgIter; ++anArgIter;
} }
@ -13239,7 +13240,7 @@ static int VSelectionProperties (Draw_Interpretor& theDi,
{ {
Standard_Boolean toEnable = Standard_True; Standard_Boolean toEnable = Standard_True;
if (anArgIter + 1 < theArgsNb if (anArgIter + 1 < theArgsNb
&& ViewerTest::ParseOnOff (theArgVec[anArgIter + 1], toEnable)) && Draw::ParseOnOff (theArgVec[anArgIter + 1], toEnable))
{ {
++anArgIter; ++anArgIter;
} }
@ -13253,7 +13254,7 @@ static int VSelectionProperties (Draw_Interpretor& theDi,
{ {
Standard_Boolean toEnable = Standard_True; Standard_Boolean toEnable = Standard_True;
if (anArgIter + 1 < theArgsNb if (anArgIter + 1 < theArgsNb
&& ViewerTest::ParseOnOff (theArgVec[anArgIter + 1], toEnable)) && Draw::ParseOnOff (theArgVec[anArgIter + 1], toEnable))
{ {
++anArgIter; ++anArgIter;
} }
@ -13352,7 +13353,7 @@ static int VSelectionProperties (Draw_Interpretor& theDi,
} }
Quantity_Color aColor; Quantity_Color aColor;
Standard_Integer aNbParsed = ViewerTest::ParseColor (theArgsNb - anArgIter - 1, Standard_Integer aNbParsed = Draw::ParseColor (theArgsNb - anArgIter - 1,
theArgVec + anArgIter + 1, theArgVec + anArgIter + 1,
aColor); aColor);
if (aNbParsed == 0) if (aNbParsed == 0)
@ -13695,7 +13696,7 @@ static int VViewCube (Draw_Interpretor& ,
|| anArg == "-innercolor" || anArg == "-innercolor"
|| anArg == "-textcolor") || anArg == "-textcolor")
{ {
Standard_Integer aNbParsed = ViewerTest::ParseColor (theNbArgs - anArgIter - 1, Standard_Integer aNbParsed = Draw::ParseColor (theNbArgs - anArgIter - 1,
theArgVec + anArgIter + 1, theArgVec + anArgIter + 1,
aColorRgb); aColorRgb);
if (aNbParsed == 0) if (aNbParsed == 0)
@ -13767,7 +13768,7 @@ static int VViewCube (Draw_Interpretor& ,
{ {
bool toShow = true; bool toShow = true;
if (anArgIter + 1 < theNbArgs if (anArgIter + 1 < theNbArgs
&& ViewerTest::ParseOnOff (theArgVec[anArgIter + 1], toShow)) && Draw::ParseOnOff (theArgVec[anArgIter + 1], toShow))
{ {
++anArgIter; ++anArgIter;
} }
@ -13793,7 +13794,7 @@ static int VViewCube (Draw_Interpretor& ,
{ {
bool isOn = true; bool isOn = true;
if (anArgIter + 1 < theNbArgs if (anArgIter + 1 < theNbArgs
&& ViewerTest::ParseOnOff (theArgVec[anArgIter + 1], isOn)) && Draw::ParseOnOff (theArgVec[anArgIter + 1], isOn))
{ {
++anArgIter; ++anArgIter;
} }

6
src/XDEDRAW/XDEDRAW.cxx
View File

@ -748,7 +748,7 @@ private:
{ {
myToPrefixDocName = Standard_True; myToPrefixDocName = Standard_True;
if (anArgIter + 1 < theNbArgs if (anArgIter + 1 < theNbArgs
&& ViewerTest::ParseOnOff (theArgVec[anArgIter + 1], myToPrefixDocName)) && Draw::ParseOnOff (theArgVec[anArgIter + 1], myToPrefixDocName))
{ {
++anArgIter; ++anArgIter;
} }
@ -762,7 +762,7 @@ private:
{ {
myToGetNames = Standard_True; myToGetNames = Standard_True;
if (anArgIter + 1 < theNbArgs if (anArgIter + 1 < theNbArgs
&& ViewerTest::ParseOnOff (theArgVec[anArgIter + 1], myToGetNames)) && Draw::ParseOnOff (theArgVec[anArgIter + 1], myToGetNames))
{ {
++anArgIter; ++anArgIter;
} }
@ -776,7 +776,7 @@ private:
{ {
myToExplore = Standard_True; myToExplore = Standard_True;
if (anArgIter + 1 < theNbArgs if (anArgIter + 1 < theNbArgs
&& ViewerTest::ParseOnOff (theArgVec[anArgIter + 1], myToExplore)) && Draw::ParseOnOff (theArgVec[anArgIter + 1], myToExplore))
{ {
++anArgIter; ++anArgIter;
} }

14
src/XDEDRAW/XDEDRAW_Colors.cxx
View File

@ -135,7 +135,7 @@ static bool parseRgbColor (Standard_Integer& theArgIter,
Standard_Integer theNbArgs, Standard_Integer theNbArgs,
const char** theArgVec) const char** theArgVec)
{ {
Standard_Integer aNbParsed = ViewerTest::ParseColor (theNbArgs - theArgIter - 1, Standard_Integer aNbParsed = Draw::ParseColor (theNbArgs - theArgIter - 1,
theArgVec + theArgIter + 1, theArgVec + theArgIter + 1,
theColor); theColor);
if (aNbParsed == 0) if (aNbParsed == 0)
@ -204,7 +204,7 @@ static Standard_Integer setColor (Draw_Interpretor& , Standard_Integer argc, con
else if (!isColorDefined) else if (!isColorDefined)
{ {
isColorDefined = true; isColorDefined = true;
Standard_Integer aNbParsed = ViewerTest::ParseColor (argc - anArgIter, Standard_Integer aNbParsed = Draw::ParseColor (argc - anArgIter,
argv + anArgIter, argv + anArgIter,
aColor); aColor);
if (aNbParsed == 0) if (aNbParsed == 0)
@ -384,7 +384,7 @@ static Standard_Integer addColor (Draw_Interpretor& di, Standard_Integer argc, c
} }
Quantity_ColorRGBA aColRGBA; Quantity_ColorRGBA aColRGBA;
Standard_Integer aNbParsed = ViewerTest::ParseColor (argc - 2, argv + 2, aColRGBA); Standard_Integer aNbParsed = Draw::ParseColor (argc - 2, argv + 2, aColRGBA);
if (aNbParsed != argc - 2) if (aNbParsed != argc - 2)
{ {
std::cout << "Syntax error at '" << argv[2] << "'\n"; std::cout << "Syntax error at '" << argv[2] << "'\n";
@ -444,7 +444,7 @@ static Standard_Integer findColor (Draw_Interpretor& di, Standard_Integer argc,
} }
Quantity_ColorRGBA aColRGBA; Quantity_ColorRGBA aColRGBA;
Standard_Integer aNbParsed = ViewerTest::ParseColor (argc - 2, argv + 2, aColRGBA); Standard_Integer aNbParsed = Draw::ParseColor (argc - 2, argv + 2, aColRGBA);
if (aNbParsed != argc - 2) if (aNbParsed != argc - 2)
{ {
std::cout << "Syntax error at '" << argv[2] << "'\n"; std::cout << "Syntax error at '" << argv[2] << "'\n";
@ -698,7 +698,7 @@ static Standard_Integer setStyledcolor (Draw_Interpretor& , Standard_Integer arg
} }
else else
{ {
Standard_Integer aNbParsed = ViewerTest::ParseColor (argc - anArgIter, Standard_Integer aNbParsed = Draw::ParseColor (argc - anArgIter,
argv + anArgIter, argv + anArgIter,
aColRGBA); aColRGBA);
if (aNbParsed == 0) if (aNbParsed == 0)
@ -1002,7 +1002,7 @@ static Standard_Integer XAddVisMaterial (Draw_Interpretor& , Standard_Integer th
|| anArg == "-albedo") || anArg == "-albedo")
{ {
Quantity_ColorRGBA aColorRGBA; Quantity_ColorRGBA aColorRGBA;
Standard_Integer aNbParsed = ViewerTest::ParseColor (theNbArgs - anArgIter - 1, Standard_Integer aNbParsed = Draw::ParseColor (theNbArgs - anArgIter - 1,
theArgVec + anArgIter + 1, theArgVec + anArgIter + 1,
aColorRGBA); aColorRGBA);
if (aNbParsed == 0) if (aNbParsed == 0)
@ -1119,7 +1119,7 @@ static Standard_Integer XAddVisMaterial (Draw_Interpretor& , Standard_Integer th
aMatPbr.IsDefined = true; aMatPbr.IsDefined = true;
bool isDoubleSided = true; bool isDoubleSided = true;
if (anArgIter + 1 < theNbArgs if (anArgIter + 1 < theNbArgs
&& ViewerTest::ParseOnOff (theArgVec[anArgIter + 1], isDoubleSided)) && Draw::ParseOnOff (theArgVec[anArgIter + 1], isDoubleSided))
{ {
++anArgIter; ++anArgIter;
} }

18
src/XSDRAWSTLVRML/XSDRAWSTLVRML.cxx
View File

@ -112,7 +112,7 @@ static Standard_Integer ReadGltf (Draw_Interpretor& theDI,
{ {
toUseExistingDoc = Standard_True; toUseExistingDoc = Standard_True;
if (anArgIter + 1 < theNbArgs if (anArgIter + 1 < theNbArgs
&& ViewerTest::ParseOnOff (theArgVec[anArgIter + 1], toUseExistingDoc)) && Draw::ParseOnOff (theArgVec[anArgIter + 1], toUseExistingDoc))
{ {
++anArgIter; ++anArgIter;
} }
@ -121,7 +121,7 @@ static Standard_Integer ReadGltf (Draw_Interpretor& theDI,
{ {
isParallel = Standard_True; isParallel = Standard_True;
if (anArgIter + 1 < theNbArgs if (anArgIter + 1 < theNbArgs
&& ViewerTest::ParseOnOff (theArgVec[anArgIter + 1], isParallel)) && Draw::ParseOnOff (theArgVec[anArgIter + 1], isParallel))
{ {
++anArgIter; ++anArgIter;
} }
@ -241,7 +241,7 @@ static Standard_Integer WriteGltf (Draw_Interpretor& theDI,
{ {
toForceUVExport = true; toForceUVExport = true;
if (anArgIter + 1 < theNbArgs if (anArgIter + 1 < theNbArgs
&& ViewerTest::ParseOnOff (theArgVec[anArgIter + 1], toForceUVExport)) && Draw::ParseOnOff (theArgVec[anArgIter + 1], toForceUVExport))
{ {
++anArgIter; ++anArgIter;
} }
@ -367,7 +367,7 @@ static Standard_Integer readstl(Draw_Interpretor& theDI,
{ {
toCreateCompOfTris = true; toCreateCompOfTris = true;
if (anArgIter + 1 < theArgc if (anArgIter + 1 < theArgc
&& ViewerTest::ParseOnOff (theArgv[anArgIter + 1], toCreateCompOfTris)) && Draw::ParseOnOff (theArgv[anArgIter + 1], toCreateCompOfTris))
{ {
++anArgIter; ++anArgIter;
} }
@ -488,7 +488,7 @@ static Standard_Integer ReadObj (Draw_Interpretor& theDI,
{ {
isSinglePrecision = Standard_True; isSinglePrecision = Standard_True;
if (anArgIter + 1 < theNbArgs if (anArgIter + 1 < theNbArgs
&& ViewerTest::ParseOnOff (theArgVec[anArgIter + 1], isSinglePrecision)) && Draw::ParseOnOff (theArgVec[anArgIter + 1], isSinglePrecision))
{ {
++anArgIter; ++anArgIter;
} }
@ -505,7 +505,7 @@ static Standard_Integer ReadObj (Draw_Interpretor& theDI,
{ {
toUseExistingDoc = Standard_True; toUseExistingDoc = Standard_True;
if (anArgIter + 1 < theNbArgs if (anArgIter + 1 < theNbArgs
&& ViewerTest::ParseOnOff (theArgVec[anArgIter + 1], toUseExistingDoc)) && Draw::ParseOnOff (theArgVec[anArgIter + 1], toUseExistingDoc))
{ {
++anArgIter; ++anArgIter;
} }
@ -1402,7 +1402,11 @@ static Standard_Integer meshvectors( Draw_Interpretor& di,
} }
else if (aParam == "-color") else if (aParam == "-color")
{ {
aColor = ViewerTest::GetColorFromName(argv[anIdx]); if (!Quantity_Color::ColorFromName (argv[anIdx], aColor))
{
Message::SendFail() << "Syntax error at " << aParam;
return 1;
}
} }
else if (aParam == "-arrowpart") else if (aParam == "-arrowpart")
{ {