#include <TopExp_Explorer.hxx>
#include <BRepAdaptor_Curve.hxx>
#include <StdSelect_ShapeTypeFilter.hxx>
-#include <AIS.hxx>
#include <AIS_ColoredShape.hxx>
#include <AIS_InteractiveObject.hxx>
#include <AIS_Trihedron.hxx>
#include <AIS_Axis.hxx>
-#include <AIS_Relation.hxx>
+#include <PrsDim.hxx>
+#include <PrsDim_Relation.hxx>
#include <AIS_TypeFilter.hxx>
#include <AIS_SignatureFilter.hxx>
#include <AIS_ListOfInteractive.hxx>
#include <Graphic3d_GraphicDriver.hxx>
#include <Graphic3d_MediaTextureSet.hxx>
#include <Image_AlienPixMap.hxx>
+#include <Message.hxx>
#include <OSD_File.hxx>
#include <Prs3d_Drawer.hxx>
#include <Prs3d_ShadingAspect.hxx>
#include <StdSelect_ViewerSelector3d.hxx>
#include <TopTools_MapOfShape.hxx>
#include <ViewerTest_AutoUpdater.hxx>
+#include <Aspect_XRSession.hxx>
#include <stdio.h>
#define DEFAULT_FREEBOUNDARY_COLOR Quantity_NOC_GREEN
#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
// purpose : get the Quantity_NameOfColor from a string
}
//=======================================================================
-// function : parseColor
+// function : ParseColor
// purpose :
//=======================================================================
-Standard_Integer ViewerTest::parseColor (const Standard_Integer theArgNb,
+Standard_Integer ViewerTest::ParseColor (const Standard_Integer theArgNb,
const char* const* const theArgVec,
- Quantity_ColorRGBA& theColor,
- const bool theToParseAlpha)
+ Quantity_ColorRGBA& theColor)
{
- 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;
+ return Draw::ParseColor (theArgNb, theArgVec, theColor);
+}
+
+//=======================================================================
+// function : ParseColor
+// purpose :
+//=======================================================================
+Standard_Integer ViewerTest::ParseColor (const Standard_Integer theArgNb,
+ const char* const* const theArgVec,
+ Quantity_Color& theColor)
+{
+ return Draw::ParseColor (theArgNb, theArgVec, theColor);
}
//=======================================================================
Standard_Boolean ViewerTest::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;
+ return Draw::ParseOnOff (theArg, theIsOn);
}
//=======================================================================
//function : ParseLineType
//purpose :
//=======================================================================
-Standard_Boolean ViewerTest::ParseLineType (Standard_CString theArg,
- Aspect_TypeOfLine& theType)
+Standard_Boolean ViewerTest::ParseLineType (Standard_CString theArg,
+ Aspect_TypeOfLine& theType,
+ uint16_t& thePattern)
{
TCollection_AsciiString aTypeStr (theArg);
aTypeStr.LowerCase();
- if (aTypeStr == "empty")
+ if (aTypeStr == "empty"
+ || aTypeStr == "-1")
{
theType = Aspect_TOL_EMPTY;
+ thePattern = Graphic3d_Aspects::DefaultLinePatternForType (theType);
}
- else if (aTypeStr == "solid")
+ else if (aTypeStr == "solid"
+ || aTypeStr == "0")
{
theType = Aspect_TOL_SOLID;
+ thePattern = Graphic3d_Aspects::DefaultLinePatternForType (theType);
}
- else if (aTypeStr == "dot")
+ else if (aTypeStr == "dot"
+ || aTypeStr == "2")
{
theType = Aspect_TOL_DOT;
+ thePattern = Graphic3d_Aspects::DefaultLinePatternForType (theType);
}
- else if (aTypeStr == "dash")
+ else if (aTypeStr == "dash"
+ || aTypeStr == "1")
{
theType = Aspect_TOL_DASH;
+ thePattern = Graphic3d_Aspects::DefaultLinePatternForType (theType);
}
- else if (aTypeStr == "dotdash")
+ else if (aTypeStr == "dotdash"
+ || aTypeStr == "3")
{
theType = Aspect_TOL_DOTDASH;
+ thePattern = Graphic3d_Aspects::DefaultLinePatternForType (theType);
}
- else if (aTypeStr.IsIntegerValue())
+ else
{
- const int aTypeInt = aTypeStr.IntegerValue();
- if (aTypeInt < -1 || aTypeInt >= Aspect_TOL_USERDEFINED)
+ if (aTypeStr.StartsWith ("0x"))
+ {
+ aTypeStr = aTypeStr.SubString (3, aTypeStr.Length());
+ }
+
+ if (aTypeStr.Length() != 4
+ || !std::isxdigit (static_cast<unsigned char> (aTypeStr.Value (1)))
+ || !std::isxdigit (static_cast<unsigned char> (aTypeStr.Value (2)))
+ || !std::isxdigit (static_cast<unsigned char> (aTypeStr.Value (3)))
+ || !std::isxdigit (static_cast<unsigned char> (aTypeStr.Value (4))))
{
return Standard_False;
}
- theType = (Aspect_TypeOfLine )aTypeInt;
- }
- else
- {
- return Standard_False;
+
+ std::stringstream aStream;
+ aStream << std::setbase (16) << aTypeStr.ToCString();
+ if (aStream.fail())
+ {
+ return Standard_False;
+ }
+
+ Standard_Integer aNumber = -1;
+ aStream >> aNumber;
+ if (aStream.fail())
+ {
+ return Standard_False;
+ }
+
+ thePattern = (uint16_t )aNumber;
+ theType = Graphic3d_Aspects::DefaultLineTypeForPattern (thePattern);
}
return Standard_True;
}
Handle(AIS_InteractiveContext) aCtx = ViewerTest::GetAISContext();
if (aCtx.IsNull())
{
- std::cout << "Error: AIS context is not available.\n";
+ Message::SendFail ("Error: AIS context is not available.");
return Standard_False;
}
{
if (!theReplaceIfExists)
{
- std::cout << "Error: other interactive object has been already registered with name: " << theName << ".\n"
- << "Please use another name.\n";
+ Message::SendFail() << "Error: other interactive object has been already registered with name: " << theName << ".\n"
+ << "Please use another name.";
return Standard_False;
}
if (theCtx.IsNull()
|| theView.IsNull())
{
- std::cout << "Error: cannot find an active view!\n";
+ Message::SendFail ("Error: cannot find an active view!");
return Standard_False;
}
return Standard_True;
continue;
}
- std::cout << "Remove " << anObjIter.Key2() << std::endl;
+ Message::SendInfo() << "Remove " << anObjIter.Key2();
TheAISContext()->Remove (anObj, Standard_False);
aListRemoved.Append (anObj);
}
GetMapOfAIS().Find2(name, aShape);
if (aShape.IsNull())
{
- std::cout << "Syntax error: object '" << name << "' is not found\n";
+ Message::SendFail() << "Syntax error: object '" << name << "' is not found";
return 1;
}
{
if (theArgNb > 1)
{
- std::cout << "Error: wrong syntax!\n";
+ Message::SendFail ("Error: wrong syntax!");
return 1;
}
{
if (theArgNb > 1)
{
- std::cout << "Error: wrong syntax!\n";
+ Message::SendFail ("Error: wrong syntax!");
return 1;
}
}
else
{
- std::cout << "Syntax error at '" << theArgVec[anArgIter] << "'\n";
+ Message::SendFail() << "Syntax error at '" << theArgVec[anArgIter] << "'";
return 1;
}
}
Standard_Integer theArgNb,
Standard_CString* theArgVec)
{
+ Handle(V3d_View) aView = ViewerTest::CurrentView();
if (theArgNb < 2)
{
- std::cout << "Error: wrong number of arguments! Image file name should be specified at least.\n";
+ Message::SendFail ("Error: wrong number of arguments! Image file name should be specified at least.");
+ return 1;
+ }
+ if (aView.IsNull())
+ {
+ Message::SendFail() << "Error: cannot find an active view!";
return 1;
}
Standard_CString aFilePath = theArgVec[anArgIter++];
ViewerTest_StereoPair aStereoPair = ViewerTest_SP_Single;
V3d_ImageDumpOptions aParams;
+ Handle(Graphic3d_Camera) aCustomCam;
aParams.BufferType = Graphic3d_BT_RGB;
aParams.StereoOptions = V3d_SDO_MONO;
for (; anArgIter < theArgNb; ++anArgIter)
{
if (++anArgIter >= theArgNb)
{
- std::cout << "Error: wrong syntax at '" << anArg << "'\n";
+ Message::SendFail() << "Error: wrong syntax at '" << anArg << "'";
return 1;
}
}
else
{
- std::cout << "Error: unknown buffer '" << aBufArg << "'\n";
+ Message::SendFail() << "Error: unknown buffer '" << aBufArg << "'";
return 1;
}
}
+ else if (anArgIter + 1 < theArgNb
+ && anArg == "-xrpose")
+ {
+ TCollection_AsciiString anXRArg (theArgVec[++anArgIter]);
+ anXRArg.LowerCase();
+ if (anXRArg == "base")
+ {
+ aCustomCam = aView->View()->BaseXRCamera();
+ }
+ else if (anXRArg == "head")
+ {
+ aCustomCam = aView->View()->PosedXRCamera();
+ }
+ else if (anXRArg == "handleft"
+ || anXRArg == "handright")
+ {
+ if (aView->View()->IsActiveXR())
+ {
+ aCustomCam = new Graphic3d_Camera();
+ aView->View()->ComputeXRPosedCameraFromBase (*aCustomCam, anXRArg == "handleft"
+ ? aView->View()->XRSession()->LeftHandPose()
+ : aView->View()->XRSession()->RightHandPose());
+ }
+ }
+ else
+ {
+ Message::SendFail() << "Syntax error: unknown XR pose '" << anXRArg << "'";
+ return 1;
+ }
+ if (aCustomCam.IsNull())
+ {
+ Message::SendFail() << "Error: undefined XR pose";
+ return 0;
+ }
+ }
else if (anArg == "-stereo")
{
if (++anArgIter >= theArgNb)
{
- std::cout << "Error: wrong syntax at '" << anArg << "'\n";
+ Message::SendFail() << "Error: wrong syntax at '" << anArg << "'";
return 1;
}
}
else
{
- std::cout << "Error: unknown stereo format '" << aStereoArg << "'\n";
+ Message::SendFail() << "Error: unknown stereo format '" << aStereoArg << "'";
return 1;
}
}
{
if (aParams.Width != 0)
{
- std::cout << "Error: wrong syntax at " << theArgVec[anArgIter] << "\n";
+ Message::SendFail() << "Error: wrong syntax at " << theArgVec[anArgIter];
return 1;
}
else if (++anArgIter >= theArgNb)
{
- std::cout << "Error: integer value is expected right after 'width'\n";
+ Message::SendFail() << "Error: integer value is expected right after 'width'";
return 1;
}
aParams.Width = Draw::Atoi (theArgVec[anArgIter]);
{
if (aParams.Height != 0)
{
- std::cout << "Error: wrong syntax at " << theArgVec[anArgIter] << "\n";
+ Message::SendFail() << "Error: wrong syntax at " << theArgVec[anArgIter];
return 1;
}
else if (++anArgIter >= theArgNb)
{
- std::cout << "Error: integer value is expected right after 'height'\n";
+ Message::SendFail() << "Error: integer value is expected right after 'height'";
return 1;
}
aParams.Height = Draw::Atoi (theArgVec[anArgIter]);
{
if (++anArgIter >= theArgNb)
{
- std::cout << "Error: integer value is expected right after 'tileSize'\n";
+ Message::SendFail() << "Error: integer value is expected right after 'tileSize'";
return 1;
}
aParams.TileSize = Draw::Atoi (theArgVec[anArgIter]);
}
else
{
- std::cout << "Error: unknown argument '" << theArgVec[anArgIter] << "'\n";
+ Message::SendFail() << "Error: unknown argument '" << theArgVec[anArgIter] << "'";
return 1;
}
}
if ((aParams.Width <= 0 && aParams.Height > 0)
|| (aParams.Width > 0 && aParams.Height <= 0))
{
- std::cout << "Error: dimensions " << aParams.Width << "x" << aParams.Height << " are incorrect\n";
- return 1;
- }
-
- Handle(V3d_View) aView = ViewerTest::CurrentView();
- if (aView.IsNull())
- {
- std::cout << "Error: cannot find an active view!\n";
+ Message::SendFail() << "Error: dimensions " << aParams.Width << "x" << aParams.Height << " are incorrect";
return 1;
}
case Graphic3d_BT_Red: aFormat = Image_Format_Gray; break;
}
+ const bool wasImmUpdate = aView->SetImmediateUpdate (false);
+ Handle(Graphic3d_Camera) aCamBack = aView->Camera();
+ if (!aCustomCam.IsNull())
+ {
+ aView->SetCamera (aCustomCam);
+ }
switch (aStereoPair)
{
case ViewerTest_SP_Single:
break;
}
}
+ if (!aCustomCam.IsNull())
+ {
+ aView->SetCamera (aCamBack);
+ }
+ aView->SetImmediateUpdate (wasImmUpdate);
if (!aPixMap.Save (aFilePath))
{
if (argc < 1
|| argc > 3)
{
- std::cout << "Syntax error: wrong number of arguments\n";
+ Message::SendFail() << "Syntax error: wrong number of arguments";
return 1;
}
{
if (!GetMapOfAIS().IsBound2 (mySeqIter.Value()))
{
- std::cout << "Error: object " << mySeqIter.Value() << " is not displayed!\n";
+ Message::SendFail() << "Error: object " << mySeqIter.Value() << " is not displayed!";
return;
}
myCurrentName = mySeqIter.Value();
Standard_Real LineWidth;
Standard_Integer ToSetTypeOfLine;
- Aspect_TypeOfLine TypeOfLine;
+ uint16_t StippleLinePattern;
+ uint16_t StippleLineFactor;
Standard_Integer ToSetTypeOfMarker;
Aspect_TypeOfMarker TypeOfMarker;
ToSetLineWidth (0),
LineWidth (1.0),
ToSetTypeOfLine (0),
- TypeOfLine (Aspect_TOL_SOLID),
+ StippleLinePattern(0xFFFF),
+ StippleLineFactor (1),
ToSetTypeOfMarker (0),
TypeOfMarker (Aspect_TOM_PLUS),
ToSetMarkerSize (0),
Standard_Boolean isOk = Standard_True;
if (Visibility != 0 && Visibility != 1)
{
- std::cout << "Error: the visibility should be equal to 0 or 1 (0 - invisible; 1 - visible) (specified " << Visibility << ")\n";
+ Message::SendFail() << "Error: the visibility should be equal to 0 or 1 (0 - invisible; 1 - visible) (specified " << Visibility << ")";
isOk = Standard_False;
}
if (LineWidth <= 0.0
|| LineWidth > 10.0)
{
- std::cout << "Error: the width should be within [1; 10] range (specified " << LineWidth << ")\n";
+ Message::SendFail() << "Error: the width should be within [1; 10] range (specified " << LineWidth << ")";
isOk = Standard_False;
}
if (Transparency < 0.0
|| Transparency > 1.0)
{
- std::cout << "Error: the transparency should be within [0; 1] range (specified " << Transparency << ")\n";
+ Message::SendFail() << "Error: the transparency should be within [0; 1] range (specified " << Transparency << ")";
isOk = Standard_False;
}
if (ToSetAlphaMode == 1
&& (AlphaCutoff <= 0.0f || AlphaCutoff >= 1.0f))
{
- std::cout << "Error: alpha cutoff value should be within (0; 1) range (specified " << AlphaCutoff << ")\n";
+ Message::SendFail() << "Error: alpha cutoff value should be within (0; 1) range (specified " << AlphaCutoff << ")";
isOk = Standard_False;
}
if (FreeBoundaryWidth <= 0.0
|| FreeBoundaryWidth > 10.0)
{
- std::cout << "Error: the free boundary width should be within [1; 10] range (specified " << FreeBoundaryWidth << ")\n";
+ Message::SendFail() << "Error: the free boundary width should be within [1; 10] range (specified " << FreeBoundaryWidth << ")";
isOk = Standard_False;
}
if (MaxParamValue < 0.0)
{
- std::cout << "Error: the max parameter value should be greater than zero (specified " << MaxParamValue << ")\n";
+ Message::SendFail() << "Error: the max parameter value should be greater than zero (specified " << MaxParamValue << ")";
isOk = Standard_False;
}
if (Sensitivity <= 0 && ToSetSensitivity)
{
- std::cout << "Error: sensitivity parameter value should be positive (specified " << Sensitivity << ")\n";
+ Message::SendFail() << "Error: sensitivity parameter value should be positive (specified " << Sensitivity << ")";
isOk = Standard_False;
}
if (ToSetHatch == 1 && StdHatchStyle < 0 && PathToHatchPattern == "")
{
- std::cout << "Error: hatch style must be specified\n";
+ Message::SendFail ("Error: hatch style must be specified");
isOk = Standard_False;
}
if (ToSetShadingModel == 1
&& (ShadingModel < Graphic3d_TOSM_DEFAULT || ShadingModel > Graphic3d_TOSM_PBR_FACET))
{
- std::cout << "Error: unknown shading model " << ShadingModelName << ".\n";
+ Message::SendFail() << "Error: unknown shading model " << ShadingModelName << ".";
isOk = Standard_False;
}
return isOk;
|| theDrawer->HasOwnSeenLineAspect())
{
toRecompute = theDrawer->SetOwnLineAspects() || toRecompute;
- theDrawer->LineAspect()->SetTypeOfLine (TypeOfLine);
- theDrawer->WireAspect()->SetTypeOfLine (TypeOfLine);
- theDrawer->FreeBoundaryAspect()->SetTypeOfLine (TypeOfLine);
- theDrawer->UnFreeBoundaryAspect()->SetTypeOfLine (TypeOfLine);
- theDrawer->SeenLineAspect()->SetTypeOfLine (TypeOfLine);
+ theDrawer->LineAspect()->Aspect()->SetLinePattern (StippleLinePattern);
+ theDrawer->LineAspect()->Aspect()->SetLineStippleFactor (StippleLineFactor);
+ theDrawer->WireAspect()->Aspect()->SetLinePattern (StippleLinePattern);
+ theDrawer->WireAspect()->Aspect()->SetLineStippleFactor (StippleLineFactor);
+ theDrawer->FreeBoundaryAspect()->Aspect()->SetLinePattern (StippleLinePattern);
+ theDrawer->FreeBoundaryAspect()->Aspect()->SetLineStippleFactor (StippleLineFactor);
+ theDrawer->UnFreeBoundaryAspect()->Aspect()->SetLinePattern (StippleLinePattern);
+ theDrawer->UnFreeBoundaryAspect()->Aspect()->SetLineStippleFactor (StippleLineFactor);
+ theDrawer->SeenLineAspect()->Aspect()->SetLinePattern (StippleLinePattern);
+ theDrawer->SeenLineAspect()->Aspect()->SetLineStippleFactor (StippleLineFactor);
}
}
if (ToSetTypeOfMarker != 0)
}
else
{
- std::cout << "Error: cannot load the following image: " << PathToHatchPattern << "\n";
+ Message::SendFail() << "Error: cannot load the following image: " << PathToHatchPattern;
}
}
else if (StdHatchStyle != -1)
ViewerTest_AutoUpdater anUpdateTool (aCtx, ViewerTest::CurrentView());
if (aCtx.IsNull())
{
- std::cerr << "Error: no active view!\n";
+ Message::SendFail ("Error: no active view!");
return 1;
}
if (!aNames.IsEmpty() && isDefaults)
{
- std::cout << "Error: wrong syntax. If -defaults is used there should not be any objects' names!\n";
+ Message::SendFail ("Error: wrong syntax. If -defaults is used there should not be any objects' names!");
return 1;
}
if (aNames.IsEmpty()
|| !aNames.Last().IsRealValue())
{
- std::cout << "Error: not enough arguments!\n";
+ Message::SendFail ("Error: not enough arguments!");
return 1;
}
aChangeSet->ToSetLineWidth = 1;
{
if (aNames.IsEmpty())
{
- std::cout << "Error: not enough arguments!\n";
+ Message::SendFail ("Error: not enough arguments!");
return 1;
}
aChangeSet->ToSetColor = 1;
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;
aNames.Remove (aNames.Length());
aNames.Remove (aNames.Length());
}
if (!isOk)
{
- std::cout << "Error: not enough arguments!\n";
+ Message::SendFail ("Error: not enough arguments!");
return 1;
}
}
if (aNames.IsEmpty()
|| !aNames.Last().IsRealValue())
{
- std::cout << "Error: not enough arguments!\n";
+ Message::SendFail ("Error: not enough arguments!");
return 1;
}
aChangeSet->ToSetTransparency = 1;
{
if (aNames.IsEmpty())
{
- std::cout << "Error: not enough arguments!\n";
+ Message::SendFail ("Error: not enough arguments!");
return 1;
}
aChangeSet->ToSetMaterial = 1;
aNames.Remove (aNames.Length());
if (!Graphic3d_MaterialAspect::MaterialFromName (aChangeSet->MatName.ToCString(), aChangeSet->Material))
{
- std::cout << "Syntax error: unknown material '" << aChangeSet->MatName << "'.\n";
+ Message::SendFail() << "Syntax error: unknown material '" << aChangeSet->MatName << "'.";
return 1;
}
}
if (aNames.IsEmpty()
|| !aNames.Last().IsRealValue())
{
- std::cout << "Error: not enough arguments!\n";
+ Message::SendFail ("Error: not enough arguments!");
return 1;
}
aChangeSet->ToSetInterior = 1;
if (!parseInteriorStyle (aNames.Last(), aChangeSet->InteriorStyle))
{
- std::cout << "Error: wrong syntax at " << aNames.Last() << "\n";
+ Message::SendFail() << "Error: wrong syntax at " << aNames.Last();
return 1;
}
aNames.Remove (aNames.Length());
}
else if (anArgIter >= theArgNb)
{
- std::cout << "Error: not enough arguments!\n";
+ Message::SendFail ("Error: not enough arguments!");
return 1;
}
{
if (++anArgIter >= theArgNb)
{
- std::cout << "Error: wrong syntax at " << anArg << "\n";
+ Message::SendFail() << "Error: wrong syntax at " << anArg;
return 1;
}
{
if (++anArgIter >= theArgNb)
{
- std::cout << "Error: wrong syntax at " << anArg << "\n";
+ Message::SendFail() << "Error: wrong syntax at " << anArg;
return 1;
}
aChangeSet->ToSetTransparency = 1;
{
if (++anArgIter >= theArgNb)
{
- std::cout << "Error: wrong syntax at " << anArg << "\n";
+ Message::SendFail() << "Error: wrong syntax at " << anArg;
return 1;
}
aChangeSet->ToSetAlphaMode = 1;
}
else
{
- std::cout << "Error: wrong syntax at " << aParam << "\n";
+ Message::SendFail() << "Error: wrong syntax at " << aParam;
return 1;
}
}
{
if (++anArgIter >= theArgNb)
{
- std::cout << "Error: wrong syntax at " << anArg << "\n";
+ Message::SendFail() << "Error: wrong syntax at " << anArg;
return 1;
}
{
if (++anArgIter >= theArgNb)
{
- std::cout << "Error: wrong syntax at " << anArg << "\n";
+ Message::SendFail() << "Error: wrong syntax at " << anArg;
return 1;
}
aChangeSet->ToSetTransparency = 1;
if (aChangeSet->Transparency < 0.0
|| aChangeSet->Transparency > 1.0)
{
- std::cout << "Error: the transparency should be within [0; 1] range (specified " << aChangeSet->Transparency << ")\n";
+ Message::SendFail() << "Error: the transparency should be within [0; 1] range (specified " << aChangeSet->Transparency << ")";
return 1;
}
aChangeSet->Transparency = 1.0 - aChangeSet->Transparency;
|| anArg == "-boundarycolor")
{
Quantity_Color aColor;
- Standard_Integer aNbParsed = ViewerTest::ParseColor (theArgNb - anArgIter - 1,
- theArgVec + anArgIter + 1,
- aColor);
+ Standard_Integer aNbParsed = Draw::ParseColor (theArgNb - anArgIter - 1,
+ theArgVec + anArgIter + 1,
+ aColor);
if (aNbParsed == 0)
{
- std::cout << "Syntax error at '" << anArg << "'\n";
+ Message::SendFail() << "Syntax error at '" << anArg << "'";
return 1;
}
anArgIter += aNbParsed;
{
if (++anArgIter >= theArgNb)
{
- std::cout << "Error: wrong syntax at " << anArg << "\n";
+ Message::SendFail() << "Error: wrong syntax at " << anArg;
return 1;
}
Aspect_TypeOfLine aLineType = Aspect_TOL_EMPTY;
- if (!ViewerTest::ParseLineType (theArgVec[anArgIter], aLineType))
+ uint16_t aLinePattern = 0xFFFF;
+ if (!ViewerTest::ParseLineType (theArgVec[anArgIter], aLineType, aLinePattern))
{
- std::cout << "Error: wrong syntax at " << anArg << "\n";
+ Message::SendFail() << "Error: wrong syntax at " << anArg;
return 1;
}
+
if (anArg == "-setedgetype"
|| anArg == "-setedgestype"
|| anArg == "-edgetype"
|| anArg == "-edgestype"
|| aCmdName == "vsetedgetype")
{
- aChangeSet->TypeOfEdge = aLineType;
+ aChangeSet->TypeOfEdge = Graphic3d_Aspects::DefaultLineTypeForPattern (aLinePattern);
aChangeSet->ToSetTypeOfEdge = 1;
}
else if (anArg == "-setfaceboundarystyle"
|| anArg == "-boundarytype"
|| aCmdName == "vshowfaceboundary")
{
- aChangeSet->TypeOfFaceBoundaryLine = aLineType;
+ aChangeSet->TypeOfFaceBoundaryLine = Graphic3d_Aspects::DefaultLineTypeForPattern (aLinePattern);
aChangeSet->ToSetTypeOfFaceBoundaryLine = 1;
}
else
{
- aChangeSet->TypeOfLine = aLineType;
+ aChangeSet->StippleLinePattern = aLinePattern;
aChangeSet->ToSetTypeOfLine = 1;
}
}
aChangeSet->ToSetTypeOfLine = -1;
}
}
+ else if (anArg == "-setstipplelinefactor"
+ || anArg == "-setstipplefactor"
+ || anArg == "-setlinefactor"
+ || anArg == "-stipplelinefactor"
+ || anArg == "-stipplefactor"
+ || anArg == "-linefactor")
+ {
+ if (aChangeSet->ToSetTypeOfLine == -1)
+ {
+ Message::SendFail() << "Error: -setStippleLineFactor requires -setLineType";
+ return 1;
+ }
+ if (++anArgIter >= theArgNb)
+ {
+ Message::SendFail() << "Error: wrong syntax at " << anArg;
+ return 1;
+ }
+ aChangeSet->StippleLineFactor = (uint16_t )Draw::Atoi (theArgVec[anArgIter]);
+ }
else if (anArg == "-setmarkertype"
|| anArg == "-markertype"
|| anArg == "-setpointtype"
{
if (++anArgIter >= theArgNb)
{
- std::cout << "Error: wrong syntax at " << anArg << "\n";
+ Message::SendFail() << "Error: wrong syntax at " << anArg;
return 1;
}
if (!ViewerTest::ParseMarkerType (theArgVec[anArgIter], aChangeSet->TypeOfMarker, aChangeSet->MarkerImage))
{
- std::cout << "Error: wrong syntax at " << anArg << "\n";
+ Message::SendFail() << "Error: wrong syntax at " << anArg;
return 1;
}
{
if (++anArgIter >= theArgNb)
{
- std::cout << "Error: wrong syntax at " << anArg << "\n";
+ Message::SendFail() << "Error: wrong syntax at " << anArg;
return 1;
}
aChangeSet->ToSetMarkerSize = 1;
{
if (++anArgIter >= theArgNb)
{
- std::cout << "Error: wrong syntax at " << anArg << "\n";
+ Message::SendFail() << "Error: wrong syntax at " << anArg;
return 1;
}
aChangeSet->ToSetMaterial = 1;
aChangeSet->MatName = theArgVec[anArgIter];
if (!Graphic3d_MaterialAspect::MaterialFromName (aChangeSet->MatName.ToCString(), aChangeSet->Material))
{
- std::cout << "Syntax error: unknown material '" << aChangeSet->MatName << "'.\n";
+ Message::SendFail() << "Syntax error: unknown material '" << aChangeSet->MatName << "'.";
return 1;
}
}
{
if (isDefaults)
{
- std::cout << "Error: wrong syntax. -subshapes can not be used together with -defaults call!\n";
+ Message::SendFail() << "Error: wrong syntax. -subshapes can not be used together with -defaults call!";
return 1;
}
if (aNames.IsEmpty())
{
- std::cout << "Error: main objects should specified explicitly when -subshapes is used!\n";
+ Message::SendFail() << "Error: main objects should specified explicitly when -subshapes is used!";
return 1;
}
TopoDS_Shape aSubShape = DBRep::Get (aSubShapeName);
if (aSubShape.IsNull())
{
- std::cerr << "Error: shape " << aSubShapeName << " doesn't found!\n";
+ Message::SendFail() << "Error: shape " << aSubShapeName << " doesn't found!";
return 1;
}
aChangeSet->SubShapes.Append (aSubShape);
if (aChangeSet->SubShapes.IsEmpty())
{
- std::cerr << "Error: empty list is specified after -subshapes!\n";
+ Message::SendFail() << "Error: empty list is specified after -subshapes!";
return 1;
}
}
|| anArg == "-fb")
{
bool toEnable = true;
- if (!ViewerTest::ParseOnOff (anArgIter + 1 < theArgNb ? theArgVec[anArgIter + 1] : "", toEnable))
+ if (!Draw::ParseOnOff (anArgIter + 1 < theArgNb ? theArgVec[anArgIter + 1] : "", toEnable))
{
- std::cout << "Error: wrong syntax at " << anArg << "\n";
+ Message::SendFail() << "Error: wrong syntax at " << anArg;
return 1;
}
++anArgIter;
{
if (++anArgIter >= theArgNb)
{
- std::cout << "Error: wrong syntax at " << anArg << "\n";
+ Message::SendFail() << "Error: wrong syntax at " << anArg;
return 1;
}
aChangeSet->ToSetFreeBoundaryWidth = 1;
|| anArg == "-setfbcolor"
|| anArg == "-fbcolor")
{
- Standard_Integer aNbParsed = ViewerTest::ParseColor (theArgNb - anArgIter - 1,
- theArgVec + anArgIter + 1,
- aChangeSet->FreeBoundaryColor);
+ Standard_Integer aNbParsed = Draw::ParseColor (theArgNb - anArgIter - 1,
+ theArgVec + anArgIter + 1,
+ aChangeSet->FreeBoundaryColor);
if (aNbParsed == 0)
{
- std::cout << "Syntax error at '" << anArg << "'\n";
+ Message::SendFail() << "Syntax error at '" << anArg << "'";
return 1;
}
anArgIter += aNbParsed;
|| anArg == "-isoontriang")
{
bool toEnable = true;
- if (!ViewerTest::ParseOnOff (anArgIter + 1 < theArgNb ? theArgVec[anArgIter + 1] : "", toEnable))
+ if (!Draw::ParseOnOff (anArgIter + 1 < theArgNb ? theArgVec[anArgIter + 1] : "", toEnable))
{
- std::cout << "Error: wrong syntax at " << anArg << "\n";
+ Message::SendFail() << "Error: wrong syntax at " << anArg;
return 1;
}
++anArgIter;
|| anArg == "-faceedges")
{
bool toEnable = true;
- if (!ViewerTest::ParseOnOff (anArgIter + 1 < theArgNb ? theArgVec[anArgIter + 1] : "", toEnable))
+ if (!Draw::ParseOnOff (anArgIter + 1 < theArgNb ? theArgVec[anArgIter + 1] : "", toEnable))
{
- std::cout << "Error: wrong syntax at " << anArg << "\n";
+ Message::SendFail() << "Error: wrong syntax at " << anArg;
return 1;
}
++anArgIter;
}
else
{
- std::cout << "Syntax error at '" << anArg << "'\n";
+ Message::SendFail() << "Syntax error at '" << anArg << "'";
return 1;
}
{
if (++anArgIter >= theArgNb)
{
- std::cout << "Error: wrong syntax at " << anArg << "\n";
+ Message::SendFail() << "Error: wrong syntax at " << anArg;
return 1;
}
aChangeSet->ToSetMaxParamValue = 1;
{
if (isDefaults)
{
- std::cout << "Error: wrong syntax. -setSensitivity can not be used together with -defaults call!\n";
+ Message::SendFail() << "Error: wrong syntax. -setSensitivity can not be used together with -defaults call!";
return 1;
}
if (aNames.IsEmpty())
{
- std::cout << "Error: object and selection mode should specified explicitly when -setSensitivity is used!\n";
+ Message::SendFail() << "Error: object and selection mode should specified explicitly when -setSensitivity is used!";
return 1;
}
if (anArgIter + 2 >= theArgNb)
{
- std::cout << "Error: wrong syntax at " << anArg << "\n";
+ Message::SendFail() << "Error: wrong syntax at " << anArg;
return 1;
}
aChangeSet->ToSetSensitivity = 1;
{
if (isDefaults)
{
- std::cout << "Error: wrong syntax. -setHatch can not be used together with -defaults call!\n";
+ Message::SendFail() << "Error: wrong syntax. -setHatch can not be used together with -defaults call!";
return 1;
}
if (aNames.IsEmpty())
{
- std::cout << "Error: object should be specified explicitly when -setHatch is used!\n";
+ Message::SendFail() << "Error: object should be specified explicitly when -setHatch is used!";
return 1;
}
if (anIntStyle < 0
|| anIntStyle >= Aspect_HS_NB)
{
- std::cout << "Error: hatch style is out of range [0, " << (Aspect_HS_NB - 1) << "]!\n";
+ Message::SendFail() << "Error: hatch style is out of range [0, " << (Aspect_HS_NB - 1) << "]!";
return 1;
}
aChangeSet->StdHatchStyle = anIntStyle;
{
if (++anArgIter >= theArgNb)
{
- std::cout << "Error: wrong syntax at " << anArg << "\n";
+ Message::SendFail() << "Error: wrong syntax at " << anArg;
return 1;
}
aChangeSet->ToSetShadingModel = 1;
aChangeSet->ShadingModelName = theArgVec[anArgIter];
if (!ViewerTest::ParseShadingModel (theArgVec[anArgIter], aChangeSet->ShadingModel))
{
- std::cout << "Error: wrong syntax at " << anArg << "\n";
+ Message::SendFail() << "Error: wrong syntax at " << anArg;
return 1;
}
}
{
if (++anArgIter >= theArgNb)
{
- std::cout << "Error: wrong syntax at " << anArg << "\n";
+ Message::SendFail() << "Error: wrong syntax at " << anArg;
return 1;
}
aChangeSet->ToSetInterior = 1;
if (!parseInteriorStyle (theArgVec[anArgIter], aChangeSet->InteriorStyle))
{
- std::cout << "Error: wrong syntax at " << anArg << "\n";
+ Message::SendFail() << "Error: wrong syntax at " << anArg;
return 1;
}
}
{
bool toDrawOutline = true;
if (anArgIter + 1 < theArgNb
- && ViewerTest::ParseOnOff (theArgVec[anArgIter + 1], toDrawOutline))
+ && Draw::ParseOnOff (theArgVec[anArgIter + 1], toDrawOutline))
{
++anArgIter;
}
{
bool toDrawEdges = true;
if (anArgIter + 1 < theArgNb
- && ViewerTest::ParseOnOff (theArgVec[anArgIter + 1], toDrawEdges))
+ && Draw::ParseOnOff (theArgVec[anArgIter + 1], toDrawEdges))
{
++anArgIter;
}
{
bool isQuadMode = true;
if (anArgIter + 1 < theArgNb
- && ViewerTest::ParseOnOff (theArgVec[anArgIter + 1], isQuadMode))
+ && Draw::ParseOnOff (theArgVec[anArgIter + 1], isQuadMode))
{
++anArgIter;
}
|| anArg == "-edgecolor"
|| anArg == "-edgescolor")
{
- Standard_Integer aNbParsed = ViewerTest::ParseColor (theArgNb - anArgIter - 1,
- theArgVec + anArgIter + 1,
- aChangeSet->EdgeColor);
+ Standard_Integer aNbParsed = Draw::ParseColor (theArgNb - anArgIter - 1,
+ theArgVec + anArgIter + 1,
+ aChangeSet->EdgeColor);
if (aNbParsed == 0)
{
- std::cout << "Syntax error at '" << anArg << "'\n";
+ Message::SendFail() << "Syntax error at '" << anArg << "'";
return 1;
}
anArgIter += aNbParsed;
aChangeSet->ToSetLineWidth = -1;
aChangeSet->LineWidth = 1.0;
aChangeSet->ToSetTypeOfLine = -1;
- aChangeSet->TypeOfLine = Aspect_TOL_SOLID;
+ aChangeSet->StippleLinePattern = 0xFFFF;
+ aChangeSet->StippleLineFactor = 1;
aChangeSet->ToSetTypeOfMarker = -1;
aChangeSet->TypeOfMarker = Aspect_TOM_PLUS;
aChangeSet->ToSetMarkerSize = -1;
else if (anArg == "-dumpcompact")
{
toCompactDump = Standard_False;
- if (++anArgIter >= theArgNb && ViewerTest::ParseOnOff (theArgVec[anArgIter + 1], toCompactDump))
+ if (++anArgIter >= theArgNb && Draw::ParseOnOff (theArgVec[anArgIter + 1], toCompactDump))
++anArgIter;
}
else if (anArg == "-dumpdepth")
{
if (++anArgIter >= theArgNb)
{
- std::cout << "Error: wrong syntax at " << anArg << "\n";
+ Message::SendFail() << "Error: wrong syntax at " << anArg;
return 1;
}
aDumpDepth = Draw::Atoi (theArgVec[anArgIter]);
}
else
{
- std::cout << "Error: wrong syntax at " << anArg << "\n";
+ Message::SendFail() << "Error: wrong syntax at " << anArg;
return 1;
}
}
Handle(AIS_Shape) aShapePrs = Handle(AIS_Shape)::DownCast (aPrs);
if (aShapePrs.IsNull())
{
- std::cout << "Error: an object " << aName << " is not an AIS_Shape presentation!\n";
+ Message::SendFail() << "Error: an object " << aName << " is not an AIS_Shape presentation!";
return 1;
}
aColoredPrs = Handle(AIS_ColoredShape)::DownCast (aShapePrs);
ViewerTest_AutoUpdater anUpdateTool (aCtx, ViewerTest::CurrentView());
if (aCtx.IsNull())
{
- std::cerr << "Error: no active view!\n";
+ Message::SendFail ("Error: no active view!");
return 1;
}
ViewerTest_AutoUpdater anUpdateTool (aCtx, ViewerTest::CurrentView());
if (aCtx.IsNull())
{
- std::cerr << "Error: no active view!\n";
+ Message::SendFail ("Error: no active view!");
return 1;
}
if (toRemoveAll
&& anArgIter < theArgNb)
{
- std::cerr << "Error: wrong syntax!\n";
+ Message::SendFail ("Error: wrong syntax!");
return 1;
}
{
if (toFailOnError)
{
- std::cout << "Syntax error: '" << aName << "' was not bound to some object.\n";
+ Message::SendFail() << "Syntax error: '" << aName << "' was not bound to some object.";
return 1;
}
}
{
if (toFailOnError)
{
- std::cout << "Syntax error: '" << aName << "' was not displayed in current context.\n"
- << "Please activate view with this object displayed and try again.\n";
+ Message::SendFail() << "Syntax error: '" << aName << "' was not displayed in current context.\n"
+ << "Please activate view with this object displayed and try again.";
return 1;
}
}
ViewerTest_AutoUpdater anUpdateTool (aCtx, aView);
if (aCtx.IsNull())
{
- std::cerr << "Error: no active view!\n";
+ Message::SendFail ("Error: no active view!");
return 1;
}
if (!aNamesOfEraseIO.IsEmpty() && toEraseAll)
{
- std::cerr << "Error: wrong syntax, " << theArgVec[0] << " too much arguments.\n";
+ Message::SendFail() << "Error: wrong syntax, " << theArgVec[0] << " too much arguments.";
return 1;
}
{
if (toFailOnError)
{
- std::cout << "Syntax error: '" << aName << "' is not found\n";
+ Message::SendFail() << "Syntax error: '" << aName << "' is not found";
return 1;
}
}
ViewerTest_AutoUpdater anUpdateTool (aCtx, ViewerTest::CurrentView());
if (aCtx.IsNull())
{
- std::cerr << "Error: no active view!\n";
+ Message::SendFail ("Error: no active view!");
return 1;
}
}
if (anArgIter < theArgNb)
{
- std::cout << theArgVec[0] << "Error: wrong syntax\n";
+ Message::SendFail() << theArgVec[0] << "Error: wrong syntax";
return 1;
}
ViewerTest_AutoUpdater anUpdateTool (aCtx, ViewerTest::CurrentView());
if (aCtx.IsNull())
{
- std::cout << "Error: no active view!\n";
+ Message::SendFail ("Error: no active view!");
return 1;
}
{
if (++anArgIter >= theArgNb)
{
- std::cout << "Error: wrong syntax at " << anArg << "\n";
+ Message::SendFail() << "Error: wrong syntax at " << anArg;
return 1;
}
aMode = Draw::Atoi (theArgVec[anArgIter]);
Handle(AIS_InteractiveObject) anIO;
if (!GetMapOfAIS().Find2 (aName, anIO))
{
- std::cout << "Error: presentation " << aName << " does not exist\n";
+ Message::SendFail() << "Error: presentation " << aName << " does not exist";
return 1;
}
aHighlightedMode = checkMode (aCtx, anIO, aMode);
if (aHighlightedMode == -1)
{
- std::cout << "Error: object " << aName << " has no presentation with mode " << aMode << std::endl;
+ Message::SendFail() << "Error: object " << aName << " has no presentation with mode " << aMode;
return 1;
}
bndPresentation (theDI, aCtx->MainPrsMgr(), anIO, aHighlightedMode, aName, anAction, aStyle);
const Handle(AIS_InteractiveContext)& aCtx = ViewerTest::GetAISContext();
if (aCtx.IsNull())
{
- std::cout << "Error: no active view!\n";
+ Message::SendFail() << "Error: no active view!";
return 1;
}
}
if (aTexturedIO.IsNull())
{
- std::cout << "Syntax error: shape " << aName << " does not exists in the viewer.\n";
+ Message::SendFail() << "Syntax error: shape " << aName << " does not exists in the viewer.";
return 1;
}
}
}
}
- std::cout << "Syntax error: unexpected argument '" << aName << "'\n";
+ Message::SendFail() << "Syntax error: unexpected argument '" << aName << "'";
return 1;
}
else if (!aTexturedShape.IsNull()
}
}
}
- std::cout << "Syntax error: unexpected argument '" << aName << "'\n";
+ Message::SendFail() << "Syntax error: unexpected argument '" << aName << "'";
return 1;
}
else if (!aTexturedShape.IsNull()
}
}
}
- std::cout << "Syntax error: unexpected argument '" << aName << "'\n";
+ Message::SendFail() << "Syntax error: unexpected argument '" << aName << "'";
return 1;
}
else if (aNameCase == "-modulate")
{
bool toModulateBool = true;
if (anArgIter + 1 < theArgsNb
- && ViewerTest::ParseOnOff (theArgVec[anArgIter + 1], toModulateBool))
+ && Draw::ParseOnOff (theArgVec[anArgIter + 1], toModulateBool))
{
++anArgIter;
}
}
else
{
- std::cout << "Syntax error: unexpected argument '" << aValue << "'\n";
+ Message::SendFail() << "Syntax error: unexpected argument '" << aValue << "'";
return 1;
}
}
}
else
{
- std::cout << "Syntax error: unexpected argument '" << aValue << "'\n";
+ Message::SendFail() << "Syntax error: unexpected argument '" << aValue << "'";
return 1;
}
}
if (anArgIter + 1 >= theArgsNb
|| aNameCase.Length() < 5)
{
- std::cout << "Syntax error: invalid argument '" << theArgVec[anArgIter] << "'\n";
+ Message::SendFail() << "Syntax error: invalid argument '" << theArgVec[anArgIter] << "'";
return 1;
}
TCollection_AsciiString aTexIndexStr = aNameCase.SubString (5, aNameCase.Length());
if (!aTexIndexStr.IsIntegerValue())
{
- std::cout << "Syntax error: invalid argument '" << theArgVec[anArgIter] << "'\n";
+ Message::SendFail() << "Syntax error: invalid argument '" << theArgVec[anArgIter] << "'";
return 1;
}
if (aTexIndex >= Graphic3d_TextureUnit_NB
|| aTexIndex >= aCtx->CurrentViewer()->Driver()->InquireLimit (Graphic3d_TypeOfLimit_MaxCombinedTextureUnits))
{
- std::cout << "Error: too many textures specified\n";
+ Message::SendFail ("Error: too many textures specified");
return 1;
}
const Standard_Integer aValue = aTexName.IntegerValue();
if (aValue < 0 || aValue >= Graphic3d_Texture2D::NumberOfTextures())
{
- std::cout << "Syntax error: texture with ID " << aValue << " is undefined!\n";
+ Message::SendFail() << "Syntax error: texture with ID " << aValue << " is undefined!";
return 1;
}
aTextureVecNew.SetValue (aTexIndex, new Graphic3d_Texture2Dmanual (Graphic3d_NameOfTexture2D (aValue)));
{
if (!OSD_File (aTexName).Exists())
{
- std::cout << "Syntax error: non-existing image file has been specified '" << aTexName << "'.\n";
+ Message::SendFail() << "Syntax error: non-existing image file has been specified '" << aTexName << "'.";
return 1;
}
aTextureVecNew.SetValue (aTexIndex, new Graphic3d_Texture2Dmanual (aTexName));
}
else
{
- std::cout << "Syntax error: invalid argument '" << theArgVec[anArgIter] << "'\n";
+ Message::SendFail() << "Syntax error: invalid argument '" << theArgVec[anArgIter] << "'";
return 1;
}
}
{
if (theArgNb < 2)
{
- std::cerr << theArgVec[0] << "Error: wrong number of arguments.\n";
+ Message::SendFail ("Syntax error: wrong number of arguments.");
return 1;
}
if (theArgNb == 2
{
if (++anArgIter >= theArgNb)
{
- std::cerr << "Error: wrong syntax at " << aName << ".\n";
+ Message::SendFail() << "Error: wrong syntax at " << aName << ".";
return 1;
}
{
if (++anArgIter >= theArgNb)
{
- std::cerr << "Error: wrong syntax at " << aName << ".\n";
+ Message::SendFail() << "Error: wrong syntax at " << aName << ".";
return 1;
}
if (++anArgIter >= theArgNb
|| !aTrsfPers.IsNull())
{
- std::cerr << "Error: wrong syntax at " << aName << ".\n";
+ Message::SendFail() << "Error: wrong syntax at " << aName << ".";
return 1;
}
aPersFlags.LowerCase();
if (!parseTrsfPersFlag (aPersFlags, aTrsfPersFlags))
{
- std::cerr << "Error: wrong transform persistence flags " << theArgVec [anArgIter] << ".\n";
+ Message::SendFail() << "Error: wrong transform persistence flags " << theArgVec [anArgIter] << ".";
return 1;
}
if (anArgIter + 2 >= theArgNb
|| aTrsfPers.IsNull())
{
- std::cerr << "Error: wrong syntax at " << aName << ".\n";
+ Message::SendFail() << "Error: wrong syntax at " << aName << ".";
return 1;
}
if (!aX.IsRealValue()
|| !aY.IsRealValue())
{
- std::cerr << "Error: wrong syntax at " << aName << ".\n";
+ Message::SendFail() << "Error: wrong syntax at " << aName << ".";
return 1;
}
if (anArgIter + 1 < theArgNb)
|| !ViewerTest::ParseZLayer (theArgVec[anArgIter], aZLayer)
|| aZLayer == Graphic3d_ZLayerId_UNKNOWN)
{
- std::cerr << "Error: wrong syntax at " << aName << ".\n";
+ Message::SendFail() << "Error: wrong syntax at " << aName << ".";
return 1;
}
}
if (aNamesOfDisplayIO.IsEmpty())
{
- std::cerr << theArgVec[0] << "Error: wrong number of arguments.\n";
+ Message::SendFail ("Syntax error: wrong number of arguments.");
return 1;
}
}
if (!aShape->AcceptDisplayMode (anObjDispMode))
{
- std::cout << "Syntax error: " << aShape->DynamicType()->Name() << " rejects " << anObjDispMode << " display mode\n";
+ Message::SendFail() << "Syntax error: " << aShape->DynamicType()->Name() << " rejects " << anObjDispMode << " display mode";
return 1;
}
else
if (anObjHighMode != -1
&& !aShape->AcceptDisplayMode (anObjHighMode))
{
- std::cout << "Syntax error: " << aShape->DynamicType()->Name() << " rejects " << anObjHighMode << " display mode\n";
+ Message::SendFail() << "Syntax error: " << aShape->DynamicType()->Name() << " rejects " << anObjHighMode << " display mode";
return 1;
}
aShape->SetHilightMode (anObjHighMode);
}
else
{
- std::cerr << "Error: object with name '" << aName << "' does not exist!\n";
+ Message::SendFail() << "Error: object with name '" << aName << "' does not exist!";
}
continue;
}
Handle(AIS_InteractiveContext) aContextAIS = ViewerTest::GetAISContext();
if (aContextAIS.IsNull())
{
- std::cout << theArgVec[0] << "AIS context is not available.\n";
+ Message::SendFail ("Syntax error: AIS context is not available.");
return 1;
}
Handle(AIS_InteractiveContext) aContextAIS = ViewerTest::GetAISContext();
if (aContextAIS.IsNull())
{
- std::cout << theArgVec[0] << "AIS context is not available.\n";
+ Message::SendFail ("Syntax error: AIS context is not available.");
return 1;
}
if (theArgsNb < 2)
{
- std::cout << theArgVec[0] << ": insufficient arguments. Type help for more information.\n";
+ Message::SendFail ("Syntax error: insufficient arguments. Type help for more information.");
return 1;
}
GetMapOfAIS().Find2 (aName, anAISObj);
if (anAISObj.IsNull())
{
- std::cout << theArgVec[0] << ": no AIS interactive object named \"" << aName << "\".\n";
+ Message::SendFail() << theArgVec[0] << ": no AIS interactive object named \"" << aName << "\".";
return 1;
}
}
else if (theObj->Type() == AIS_KOI_Relation)
{
- // AIS_Dimention and AIS_Relation
- Handle(AIS_Relation) aRelation = Handle(AIS_Relation)::DownCast (theObj);
+ // PrsDim_Dimention and AIS_Relation
+ Handle(PrsDim_Relation) aRelation = Handle(PrsDim_Relation)::DownCast (theObj);
switch (aRelation->KindOfDimension())
{
- case AIS_KOD_PLANEANGLE: theDI << " AIS_AngleDimension"; break;
- case AIS_KOD_LENGTH: theDI << " AIS_Chamf2/3dDimension/AIS_LengthDimension"; break;
- case AIS_KOD_DIAMETER: theDI << " AIS_DiameterDimension"; break;
- case AIS_KOD_ELLIPSERADIUS: theDI << " AIS_EllipseRadiusDimension"; break;
- //case AIS_KOD_FILLETRADIUS: theDI << " AIS_FilletRadiusDimension "; break;
- case AIS_KOD_OFFSET: theDI << " AIS_OffsetDimension"; break;
- case AIS_KOD_RADIUS: theDI << " AIS_RadiusDimension"; break;
+ case PrsDim_KOD_PLANEANGLE: theDI << " PrsDim_AngleDimension"; break;
+ case PrsDim_KOD_LENGTH: theDI << " PrsDim_Chamf2/3dDimension/PrsDim_LengthDimension"; break;
+ case PrsDim_KOD_DIAMETER: theDI << " PrsDim_DiameterDimension"; break;
+ case PrsDim_KOD_ELLIPSERADIUS: theDI << " PrsDim_EllipseRadiusDimension"; break;
+ //case PrsDim_KOD_FILLETRADIUS: theDI << " PrsDim_FilletRadiusDimension "; break;
+ case PrsDim_KOD_OFFSET: theDI << " PrsDim_OffsetDimension"; break;
+ case PrsDim_KOD_RADIUS: theDI << " PrsDim_RadiusDimension"; break;
default: theDI << " UNKNOWN dimension"; break;
}
}
Handle(AIS_InteractiveContext) aCtx = TheAISContext();
if (aCtx.IsNull())
{
- std::cerr << "Error: No opened viewer!\n";
+ Message::SendFail ("Error: No opened viewer!");
return 1;
}
GetMapOfAIS().Find1 (anObj, aName);
aName.LeftJustify (20, ' ');
char anInfoStr[512];
- Sprintf (anInfoStr,
- " Depth: %g Distance: %g Point: %g %g %g",
- aPickData.Depth,
- aPickData.MinDist,
- aPickData.Point.X(), aPickData.Point.Y(), aPickData.Point.Z());
+ if (aPickData.Normal.SquareModulus() > ShortRealEpsilon())
+ {
+ Sprintf (anInfoStr,
+ " Depth: %g Distance: %g Point: %g %g %g Normal: %g %g %g",
+ aPickData.Depth,
+ aPickData.MinDist,
+ aPickData.Point.X(), aPickData.Point.Y(), aPickData.Point.Z(),
+ aPickData.Normal.x(), aPickData.Normal.y(), aPickData.Normal.z());
+ }
+ else
+ {
+ Sprintf (anInfoStr,
+ " Depth: %g Distance: %g Point: %g %g %g",
+ aPickData.Depth,
+ aPickData.MinDist,
+ aPickData.Point.X(), aPickData.Point.Y(), aPickData.Point.Z());
+ }
theDI << " " << aName
<< anInfoStr
<< " (" << anEntity->DynamicType()->Name() << ")"
const Standard_Integer aNbToReach = theResArray->Length();
if (aNbToReach > 1)
{
- std::cout << " WARNING : Pick with Shift+ MB1 for Selection of more than 1 object\n";
+ Message::SendWarning ("WARNING : Pick with Shift+ MB1 for Selection of more than 1 object");
}
// step 1: prepare the data
{
++aNbPickFail;
}
- std::cout << "NbPicked = " << aNbPickGood << " | Nb Pick Fail :" << aNbPickFail << "\n";
+ Message::SendInfo() << "NbPicked = " << aNbPickGood << " | Nb Pick Fail :" << aNbPickFail;
}
// step3 get result.
else if (aShapeArg == "solid") aShapeType = TopAbs_SOLID;
else
{
- std::cout << "Syntax error at '" << argv[1] << "'\n";
+ Message::SendFail() << "Syntax error at '" << argv[1] << "'";
return 1;
}
}
Handle(AIS_InteractiveContext) aContext = ViewerTest::GetAISContext();
if (aContext.IsNull())
{
- std::cout << "Error: AIS context is not available.\n";
+ Message::SendFail ("Error: AIS context is not available.");
return 1;
}
{
aContext->RemoveFilters();
}
+ else if (anArg == "-contextfilter" && anArgIter + 1 < theArgc)
+ {
+ TCollection_AsciiString aVal (theArgv[++anArgIter]);
+ aVal.LowerCase();
+ if (aVal == "and")
+ {
+ aContext->SetFilterType (SelectMgr_FilterType_AND);
+ }
+ else if (aVal == "or")
+ {
+ aContext->SetFilterType (SelectMgr_FilterType_OR);
+ }
+ else
+ {
+ Message::SendFail() << "Syntax error: wrong command attribute value '" << aVal << "'";
+ return 1;
+ }
+ }
else if (anArg == "-type"
&& anArgIter + 1 < theArgc)
{
TopAbs_ShapeEnum aShapeType = TopAbs_COMPOUND;
if (!TopAbs::ShapeTypeFromString (aVal.ToCString(), aShapeType))
{
- std::cout << "Syntax error: wrong command attribute value '" << aVal << "'\n";
+ Message::SendFail() << "Syntax error: wrong command attribute value '" << aVal << "'";
+ return 1;
+ }
+
+ Handle(SelectMgr_Filter) aFilter;
+ if (aShapeType == TopAbs_SHAPE)
+ {
+ aFilter = new AIS_TypeFilter (AIS_KOI_Shape);
+ }
+ else
+ {
+ aFilter = new StdSelect_ShapeTypeFilter (aShapeType);
+ }
+ aContext->AddFilter (aFilter);
+ }
+ else if (anArg == "-secondtype"
+ && anArgIter + 1 < theArgc)
+ {
+ TCollection_AsciiString aVal (theArgv[++anArgIter]);
+ TopAbs_ShapeEnum aShapeType = TopAbs_COMPOUND;
+ if (!TopAbs::ShapeTypeFromString (aVal.ToCString(), aShapeType))
+ {
+ Message::SendFail() << "Syntax error: wrong command attribute value '" << aVal << "'";
return 1;
}
}
else
{
- std::cout << "Syntax error: unknown argument '" << theArgv[anArgIter] << "'\n";
+ Message::SendFail() << "Syntax error: unknown argument '" << theArgv[anArgIter] << "'";
return 1;
}
}
if(dimension_status == -1)
TheAISContext()->Erase(curio,Standard_False);
else {
- AIS_KindOfDimension KOD = Handle(AIS_Relation)::DownCast (curio)->KindOfDimension();
- if ((dimension_status==0 && KOD == AIS_KOD_NONE)||
- (dimension_status==1 && KOD != AIS_KOD_NONE))
+ PrsDim_KindOfDimension KOD = Handle(PrsDim_Relation)::DownCast (curio)->KindOfDimension();
+ if ((dimension_status==0 && KOD == PrsDim_KOD_NONE)||
+ (dimension_status==1 && KOD != PrsDim_KOD_NONE))
TheAISContext()->Erase(curio,Standard_False);
}
}
if(dimension_status == -1)
TheAISContext()->Display(curio,Standard_False);
else {
- AIS_KindOfDimension KOD = Handle(AIS_Relation)::DownCast (curio)->KindOfDimension();
- if ((dimension_status==0 && KOD == AIS_KOD_NONE)||
- (dimension_status==1 && KOD != AIS_KOD_NONE))
+ PrsDim_KindOfDimension KOD = Handle(PrsDim_Relation)::DownCast (curio)->KindOfDimension();
+ if ((dimension_status==0 && KOD == PrsDim_KOD_NONE)||
+ (dimension_status==1 && KOD != PrsDim_KOD_NONE))
TheAISContext()->Display(curio,Standard_False);
}
if (aView.IsNull()
|| aViewer.IsNull())
{
- std::cerr << "No active viewer!\n";
+ Message::SendFail ("Error: No active viewer!");
return 1;
}
Handle(AIS_InteractiveObject) anIObj;
if (!GetMapOfAIS().Find2 (aName, anIObj))
{
- std::cerr << "Use 'vdisplay' before\n";
+ Message::SendFail ("Error: no active viewer");
return 1;
}
{
if (theArgNb < 2)
{
- std::cerr << theArgVec[0] << "Error: wrong number of arguments.\n";
+ Message::SendFail ("Syntax error: wrong number of arguments.");
return 1;
}
}
if (aShape.IsNull())
{
- std::cout << "Syntax error: presentation '" << aName << "' not found\n";
+ Message::SendFail() << "Syntax error: presentation '" << aName << "' not found";
return 1;
}
"vdump <filename>." DUMP_FORMATS " [-width Width -height Height]"
"\n\t\t: [-buffer rgb|rgba|depth=rgb]"
"\n\t\t: [-stereo mono|left|right|blend|sideBySide|overUnder=mono]"
+ "\n\t\t: [-xrPose base|head|handLeft|handRight=base]"
"\n\t\t: [-tileSize Size=0]"
"\n\t\t: Dumps content of the active view into image file",
__FILE__,VDump,group);
__FILE__,VSubInt,group);
theCommands.Add("vaspects",
- "vaspects [-noupdate|-update] [name1 [name2 [...]] | -defaults]"
- "\n\t\t: [-setVisibility 0|1]"
- "\n\t\t: [-setColor ColorName] [-setcolor R G B] [-unsetColor]"
- "\n\t\t: [-setBackFaceColor Color]"
- "\n\t\t: [-setMaterial MatName] [-unsetMaterial]"
- "\n\t\t: [-setTransparency Transp] [-unsetTransparency]"
- "\n\t\t: [-setWidth LineWidth] [-unsetWidth]"
- "\n\t\t: [-setLineType {solid|dash|dot|dotDash}] [-unsetLineType]"
- "\n\t\t: [-setMarkerType {.|+|x|O|xcircle|pointcircle|ring1|ring2|ring3|ball|ImagePath}]"
+ "vaspects [-noupdate|-update] [name1 [name2 [...]] | -defaults] [-subshapes subname1 [subname2 [...]]]"
+ "\n\t\t: [-visibility {0|1}]"
+ "\n\t\t: [-color {ColorName | R G B}] [-unsetColor]"
+ "\n\t\t: [-backfaceColor Color]"
+ "\n\t\t: [-material MatName] [-unsetMaterial]"
+ "\n\t\t: [-transparency Transp] [-unsetTransparency]"
+ "\n\t\t: [-width LineWidth] [-unsetWidth]"
+ "\n\t\t: [-lineType {solid|dash|dot|dotDash|0xHexPattern} [-stippleFactor factor]]"
+ "\n\t\t: [-unsetLineType]"
+ "\n\t\t: [-markerType {.|+|x|O|xcircle|pointcircle|ring1|ring2|ring3|ball|ImagePath}]"
"\n\t\t: [-unsetMarkerType]"
- "\n\t\t: [-setMarkerSize Scale] [-unsetMarkerSize]"
- "\n\t\t: [-freeBoundary {off/on | 0/1}]"
- "\n\t\t: [-setFreeBoundaryWidth Width] [-unsetFreeBoundaryWidth]"
- "\n\t\t: [-setFreeBoundaryColor {ColorName | R G B}] [-unsetFreeBoundaryColor]"
- "\n\t\t: [-subshapes subname1 [subname2 [...]]]"
- "\n\t\t: [-isoontriangulation 0|1]"
- "\n\t\t: [-setMaxParamValue {value}]"
- "\n\t\t: [-setSensitivity {selection_mode} {value}]"
- "\n\t\t: [-setShadingModel {unlit|flat|gouraud|phong}]"
+ "\n\t\t: [-markerSize Scale] [-unsetMarkerSize]"
+ "\n\t\t: [-freeBoundary {0|1}]"
+ "\n\t\t: [-freeBoundaryWidth Width] [-unsetFreeBoundaryWidth]"
+ "\n\t\t: [-freeBoundaryColor {ColorName | R G B}] [-unsetFreeBoundaryColor]"
+ "\n\t\t: [-isoOnTriangulation 0|1]"
+ "\n\t\t: [-maxParamValue {value}]"
+ "\n\t\t: [-sensitivity {selection_mode} {value}]"
+ "\n\t\t: [-shadingModel {unlit|flat|gouraud|phong|pbr|pbr_facet}]"
"\n\t\t: [-unsetShadingModel]"
- "\n\t\t: [-setInterior {solid|hatch|hidenline|point}]"
- "\n\t\t: [-unsetInterior] [-setHatch HatchStyle]"
- "\n\t\t: [-setFaceBoundaryDraw {0|1}] [-setMostContinuity {c0|c1|c2|c3|cn}"
- "\n\t\t: [-setFaceBoundaryWidth LineWidth] [-setFaceBoundaryColor R G B] [-setFaceBoundaryType LineType]"
- "\n\t\t: [-setDrawEdges {0|1}] [-setEdgeType LineType] [-setEdgeColor R G B] [-setQuadEdges {0|1}]"
- "\n\t\t: [-setDrawSilhouette {0|1}]"
- "\n\t\t: [-setAlphaMode {opaque|mask|blend|blendauto} [alphaCutOff=0.5]]"
+ "\n\t\t: [-interior {solid|hatch|hidenline|point}] [-setHatch HatchStyle]"
+ "\n\t\t: [-unsetInterior]"
+ "\n\t\t: [-faceBoundaryDraw {0|1}] [-mostContinuity {c0|c1|c2|c3|cn}]"
+ "\n\t\t: [-faceBoundaryWidth LineWidth] [-faceBoundaryColor R G B] [-faceBoundaryType LineType]"
+ "\n\t\t: [-drawEdges {0|1}] [-edgeType LineType] [-edgeColor R G B] [-quadEdges {0|1}]"
+ "\n\t\t: [-drawSilhouette {0|1}]"
+ "\n\t\t: [-alphaMode {opaque|mask|blend|blendauto} [alphaCutOff=0.5]]"
"\n\t\t: [-dumpJson]"
"\n\t\t: [-dumpCompact {0|1}]"
"\n\t\t: [-dumpDepth depth]"
- "\n\t\t: [-freeBoundary {off/on | 0/1}]"
"\n\t\t: Manage presentation properties of all, selected or named objects."
- "\n\t\t: When -subshapes is specified than following properties will be"
- "\n\t\t: assigned to specified sub-shapes."
+ "\n\t\t: When -subshapes is specified than following properties will be assigned to specified sub-shapes."
"\n\t\t: When -defaults is specified than presentation properties will be"
"\n\t\t: assigned to all objects that have not their own specified properties"
"\n\t\t: and to all objects to be displayed in the future."
- "\n\t\t: If -defaults is used there should not be any objects' names and -subshapes specifier."
+ "\n\t\t: If -defaults is used there should not be any objects' names nor -subshapes specifier."
"\n\t\t: See also vlistcolors and vlistmaterials to list named colors and materials"
- "\n\t\t: accepted by arguments -setMaterial and -setColor",
+ "\n\t\t: accepted by arguments -material and -color",
__FILE__,VAspects,group);
theCommands.Add("vsetcolor",
__FILE__,vr, group);
theCommands.Add("vselfilter",
- "vselfilter [-type {VERTEX|EDGE|WIRE|FACE|SHAPE|SHELL|SOLID}] [-clear]"
+ "vselfilter [-contextfilter {AND|OR}]"
+ "\n [-type {VERTEX|EDGE|WIRE|FACE|SHAPE|SHELL|SOLID}]"
+ "\n [-secondtype {VERTEX|EDGE|WIRE|FACE|SHAPE|SHELL|SOLID}]"
+ "\n [-clear]"
"\nSets selection shape type filter in context or remove all filters."
+ "\n : Option -contextfilter : To define a selection filter for two or more types of entity,"
+ "\n use value AND (OR by default)."
"\n : Option -type set type of selection filter. Filters are applyed with Or combination."
"\n : Option -clear remove all filters in context",
__FILE__,VSelFilter,group);
#include <DBRep.hxx>
#include <TopoDS_Face.hxx>
#include <gp_Pln.hxx>
-#include <AIS_KindOfSurface.hxx>
#include <BRepOffsetAPI_DraftAngle.hxx>
#include <Precision.hxx>
#include <BRepAlgo.hxx>
#include <OSD_Environment.hxx>
#include <DrawTrSurf.hxx>
-//#include <DbgTools.hxx>
-//#include <FeatAlgo_MakeLinearForm.hxx>
-
-
-
//=======================================================================
//function : IsValid
anAngle = 2*M_PI * anAngle / 360.0;
gp_Pln aPln;
Handle( Geom_Surface )aSurf;
- AIS_KindOfSurface aSurfType;
+ PrsDim_KindOfSurface aSurfType;
Standard_Real Offset;
gp_Dir aDir;
if(argc > 4) { // == 5
}
TopoDS_Face face2 = TopoDS::Face(Plane);
- if(!AIS::GetPlaneFromFace(face2, aPln, aSurf, aSurfType, Offset))
+ if(!PrsDim::GetPlaneFromFace(face2, aPln, aSurf, aSurfType, Offset))
{
di << "TEST : Can't find plane\n";
return 1;
projects / occt.git / blobdiff