#include <Font_FontMgr.hxx>
#include <OSD_Chronometer.hxx>
#include <TCollection_AsciiString.hxx>
-#include <Visual3d_View.hxx>
#include <V3d_Viewer.hxx>
#include <V3d_View.hxx>
#include <V3d.hxx>
#include <BRepExtrema_ExtPC.hxx>
#include <BRepExtrema_ExtPF.hxx>
+#include <Prs3d_DatumAspect.hxx>
#include <Prs3d_Drawer.hxx>
#include <Prs3d_VertexDrawMode.hxx>
#include <Prs3d_LineAspect.hxx>
#include <Image_AlienPixMap.hxx>
#include <TColStd_HArray1OfAsciiString.hxx>
+#include <TColStd_HSequenceOfAsciiString.hxx>
-#ifdef _WIN32
+#if defined(_MSC_VER)
# define _CRT_SECURE_NO_DEPRECATE
# pragma warning (disable:4996)
#endif
Standard_Boolean theReplaceIfExists = Standard_True);
extern int ViewerMainLoop(Standard_Integer argc, const char** argv);
extern Handle(AIS_InteractiveContext)& TheAISContext();
-extern Standard_Boolean parseOnOff (Standard_CString theArg,
- Standard_Boolean& theIsOn);
//==============================================================================
{
// Verification des arguments
- if ( argc!=2) {di<<argv[0]<<" error"<<"\n"; return 1;}
+ if ( argc!=2) {di<<argv[0]<<" error\n"; return 1;}
// Declarations
Standard_Integer myCurrentIndex;
myCurrentIndex=TheAISContext()->IndexOfCurrentLocal();
// On active les modes de selections faces.
TheAISContext()->ActivateStandardMode (AIS_Shape::SelectionType(4) );
- di<<" Select a face ."<<"\n";
+ di<<" Select a face .\n";
// Boucle d'attente waitpick.
Standard_Integer argccc = 5;
//Draw arg : vtrihedron name [Xo] [Yo] [Zo] [Zu] [Zv] [Zw] [Xu] [Xv] [Xw]
//==============================================================================
-static int VTrihedron (Draw_Interpretor& theDi,
+static int VTrihedron (Draw_Interpretor& /*theDi*/,
Standard_Integer theArgsNb,
const char** theArgVec)
{
- if (theArgsNb != 2 && theArgsNb != 5 && theArgsNb != 11)
+ if (theArgsNb < 2 || theArgsNb > 11)
{
- theDi << theArgVec[0] << " Syntax error\n";
+ std::cout << theArgVec[0] << " syntax error\n";
return 1;
}
+ // Parse parameters
+ NCollection_DataMap<TCollection_AsciiString, Handle(TColStd_HSequenceOfAsciiString)> aMapOfArgs;
+ TCollection_AsciiString aParseKey;
+ for (Standard_Integer anArgIt = 1; anArgIt < theArgsNb; ++anArgIt)
+ {
+ TCollection_AsciiString anArg (theArgVec [anArgIt]);
+
+ if (anArg.Value (1) == '-' && !anArg.IsRealValue())
+ {
+ aParseKey = anArg;
+ aParseKey.Remove (1);
+ aParseKey.LowerCase();
+ aMapOfArgs.Bind (aParseKey, new TColStd_HSequenceOfAsciiString);
+ continue;
+ }
+
+ if (aParseKey.IsEmpty())
+ {
+ continue;
+ }
+
+ aMapOfArgs(aParseKey)->Append (anArg);
+ }
+
+ // Check parameters
+ if ( (aMapOfArgs.IsBound ("xaxis") && !aMapOfArgs.IsBound ("zaxis"))
+ || (!aMapOfArgs.IsBound ("xaxis") && aMapOfArgs.IsBound ("zaxis")) )
+ {
+ std::cout << theArgVec[0] << " error: -xaxis and -yaxis parameters are to set together.\n";
+ return 1;
+ }
+
+ for (NCollection_DataMap<TCollection_AsciiString, Handle(TColStd_HSequenceOfAsciiString)>::Iterator aMapIt (aMapOfArgs);
+ aMapIt.More(); aMapIt.Next())
+ {
+ const TCollection_AsciiString& aKey = aMapIt.Key();
+ const Handle(TColStd_HSequenceOfAsciiString)& anArgs = aMapIt.Value();
+
+ // Bool key, without arguments
+ if (aKey.IsEqual ("hidelabels") && anArgs->IsEmpty())
+ {
+ continue;
+ }
+
+ if ( (aKey.IsEqual ("xaxis") || aKey.IsEqual ("zaxis") || aKey.IsEqual ("origin")) && anArgs->Length() == 3
+ && anArgs->Value(1).IsRealValue() && anArgs->Value(2).IsRealValue() && anArgs->Value(3).IsRealValue() )
+ {
+ continue;
+ }
+ }
+
+ // Process parameters
gp_Pnt anOrigin (0.0, 0.0, 0.0);
gp_Dir aDirZ = gp::DZ();
gp_Dir aDirX = gp::DX();
- Standard_Integer anArgIter = 2; // 1st is an IO name
- if (anArgIter < theArgsNb)
+
+ Handle(TColStd_HSequenceOfAsciiString) aValues;
+
+ if (aMapOfArgs.Find ("origin", aValues))
{
- anOrigin.SetX (Draw::Atof (theArgVec[anArgIter++]));
- anOrigin.SetY (Draw::Atof (theArgVec[anArgIter++]));
- anOrigin.SetZ (Draw::Atof (theArgVec[anArgIter++]));
- if (anArgIter < theArgsNb)
- {
- Standard_Real aX = Draw::Atof (theArgVec[anArgIter++]);
- Standard_Real aY = Draw::Atof (theArgVec[anArgIter++]);
- Standard_Real aZ = Draw::Atof (theArgVec[anArgIter++]);
- aDirZ.SetCoord (aX, aY, aZ);
+ anOrigin.SetX (aValues->Value(1).RealValue());
+ anOrigin.SetY (aValues->Value(2).RealValue());
+ anOrigin.SetZ (aValues->Value(3).RealValue());
+ }
- aX = Draw::Atof (theArgVec[anArgIter++]);
- aY = Draw::Atof (theArgVec[anArgIter++]);
- aZ = Draw::Atof (theArgVec[anArgIter++]);
- aDirX.SetCoord (aX, aY, aZ);
- }
+ Handle(TColStd_HSequenceOfAsciiString) aValues2;
+ if (aMapOfArgs.Find ("xaxis", aValues) && aMapOfArgs.Find ("zaxis", aValues2))
+ {
+ Standard_Real aX = aValues->Value(1).RealValue();
+ Standard_Real aY = aValues->Value(2).RealValue();
+ Standard_Real aZ = aValues->Value(3).RealValue();
+ aDirX.SetCoord (aX, aY, aZ);
+
+ aX = aValues->Value(1).RealValue();
+ aY = aValues->Value(2).RealValue();
+ aZ = aValues->Value(3).RealValue();
+ aDirZ.SetCoord (aX, aY, aZ);
}
if (!aDirZ.IsNormal (aDirX, M_PI / 180.0))
{
- theDi << theArgVec[0] << " - VectorX is not normal to VectorZ\n";
+ std::cout << theArgVec[0] << " error - VectorX is not normal to VectorZ\n";
return 1;
}
Handle(Geom_Axis2Placement) aPlacement = new Geom_Axis2Placement (anOrigin, aDirZ, aDirX);
Handle(AIS_Trihedron) aShape = new AIS_Trihedron (aPlacement);
+
+ if (aMapOfArgs.Find ("hidelabels", aValues))
+ {
+ const Handle(Prs3d_Drawer)& aDrawer = aShape->Attributes();
+
+ if(!aDrawer->HasOwnDatumAspect())
+ {
+ Handle(Prs3d_DatumAspect) aDefAspect = ViewerTest::GetAISContext()->DefaultDrawer()->DatumAspect();
+
+ Handle(Prs3d_DatumAspect) aDatumAspect = new Prs3d_DatumAspect();
+ aDatumAspect->FirstAxisAspect()->SetAspect (aDefAspect->FirstAxisAspect()->Aspect());
+ aDatumAspect->SecondAxisAspect()->SetAspect (aDefAspect->SecondAxisAspect()->Aspect());
+ aDatumAspect->ThirdAxisAspect()->SetAspect (aDefAspect->ThirdAxisAspect()->Aspect());
+ aDatumAspect->SetAxisLength (aDefAspect->FirstAxisLength(),
+ aDefAspect->SecondAxisLength(),
+ aDefAspect->ThirdAxisLength());
+
+ aDrawer->SetDatumAspect (aDatumAspect);
+ }
+
+ aDrawer->DatumAspect()->SetToDrawLabels (Standard_False);
+ }
+
VDisplayAISObject (theArgVec[1], aShape);
return 0;
}
Quantity_NameOfColor col = Quantity_NOC_BLACK ;
// Verification des arguments
- if ( argc>3 ) {di<<argv[0]<<" Syntaxe error"<<"\n"; return 1;}
+ if ( argc>3 ) {di<<argv[0]<<" Syntaxe error\n"; return 1;}
// Verification du nombre d'arguments
if (argc==1) {ThereIsName=Standard_False;value=100;}
{
// Verification des arguments
- if ( argc!=2) {di<<argv[0]<<" error"<<"\n"; return 1;}
+ if ( argc!=2) {di<<argv[0]<<" error\n"; return 1;}
// Declarations
Standard_Integer myCurrentIndex;
it.Next();
}
- di<<" Select a plane."<<"\n";
+ di<<" Select a plane.\n";
// Boucle d'attente waitpick.
Standard_Integer argccc = 5;
const char *bufff[] = { "VPick", "X", "VPickY","VPickZ", "VPickShape" };
Standard_Integer MyCurrentIndex;
// Verification
- if (argc<2 || argc>8 ) {di<<" Syntaxe error"<<"\n";return 1;}
+ if (argc<2 || argc>8 ) {di<<" Syntaxe error\n";return 1;}
if (argc==8) HasArg=Standard_True;
else HasArg=Standard_False;
// Active le mode edge et le mode vertex
TheAISContext()->ActivateStandardMode(AIS_Shape::SelectionType(1) );
TheAISContext()->ActivateStandardMode(AIS_Shape::SelectionType(2) );
- di<<" Select an edge or a vertex."<<"\n";
+ di<<" Select an edge or a vertex.\n";
// Boucle d'attente waitpick.
Standard_Integer argcc = 5;
if (ShapeA.ShapeType()==TopAbs_VERTEX) {
// on desactive le mode edge
TheAISContext()->DeactivateStandardMode(AIS_Shape::SelectionType(2) );
- di<<" Select a different vertex."<<"\n";
+ di<<" Select a different vertex.\n";
TopoDS_Shape ShapeB;
do {
// Active le mode edge
TheAISContext()->ActivateStandardMode(AIS_Shape::SelectionType(2) );
- di<<" Select an edge."<<"\n";
+ di<<" Select an edge.\n";
// Boucle d'attente waitpick.
Standard_Integer argcc = 5;
// Active le mode vertex et deactive edges
TheAISContext()->DeactivateStandardMode(AIS_Shape::SelectionType(2) );
TheAISContext()->ActivateStandardMode(AIS_Shape::SelectionType(1) );
- di<<" Select a vertex."<<"\n";
+ di<<" Select a vertex.\n";
// Boucle d'attente waitpick.
Standard_Integer argccc = 5;
// Active le mode edge
TheAISContext()->ActivateStandardMode(AIS_Shape::SelectionType(2) );
- di<<" Select an edge."<<"\n";
+ di<<" Select an edge.\n";
// Boucle d'attente waitpick.
Standard_Integer argcc = 5;
// Active le mode vertex et deactive edges
TheAISContext()->DeactivateStandardMode(AIS_Shape::SelectionType(2) );
TheAISContext()->ActivateStandardMode(AIS_Shape::SelectionType(1) );
- di<<" Slect a vertex."<<"\n";
+ di<<" Slect a vertex.\n";
// Boucle d'attente waitpick.
Standard_Integer argccc = 5;
Standard_Integer myCurrentIndex;
// Verification
- if (argc<2 || argc>5 ) {di<<" Syntaxe error"<<"\n";return 1;}
+ if (argc<2 || argc>5 ) {di<<" Syntaxe error\n";return 1;}
if (argc==5) HasArg=Standard_True;
else HasArg=Standard_False;
// Active le mode Vertex et Edges
TheAISContext()->ActivateStandardMode (AIS_Shape::SelectionType(1) );
TheAISContext()->ActivateStandardMode (AIS_Shape::SelectionType(2) );
- di<<" Select a vertex or an edge(build the middle)"<<"\n";
+ di<<" Select a vertex or an edge(build the middle)\n";
// Boucle d'attente waitpick.
Standard_Integer argcc = 5;
Abs(aCartPointB->Z()-aCartPointA->Z())<=Precision::Confusion())
{
// B=A
- std::cout<<"vplane error: same points"<<"\n";return 1;
+ std::cout<<"vplane error: same points\n";return 1;
}
if(Abs(aCartPointC->X()-aCartPointA->X())<=Precision::Confusion() &&
Abs(aCartPointC->Y()-aCartPointA->Y())<=Precision::Confusion() &&
Abs(aCartPointC->Z()-aCartPointA->Z())<=Precision::Confusion())
{
// C=A
- std::cout<<"vplane error: same points"<<"\n";return 1;
+ std::cout<<"vplane error: same points\n";return 1;
}
if(Abs(aCartPointC->X()-aCartPointB->X())<=Precision::Confusion() &&
Abs(aCartPointC->Y()-aCartPointB->Y())<=Precision::Confusion() &&
Abs(aCartPointC->Z()-aCartPointB->Z())<=Precision::Confusion())
{
// C=B
- std::cout<<"vplane error: same points"<<"\n";return 1;
+ std::cout<<"vplane error: same points\n";return 1;
}
gp_Pnt A = aCartPointA->Pnt();
}
else
{
- std::cout<<" vplanepara: error"<<"\n";return 1;
+ std::cout<<" vplanepara: error\n";return 1;
}
}
}
{
Standard_Integer myCurrentIndex;
// Verifications
- if (argc!=4 && argc!=8 && argc!=2 ) {di<<"vline error: number of arguments not correct "<<"\n";return 1; }
+ if (argc!=4 && argc!=8 && argc!=2 ) {di<<"vline error: number of arguments not correct \n";return 1; }
// Fermeture des contextes
TheAISContext()->CloseAllContexts();
if (theShapeA.IsNull() ||
(!(theShapeB->Type()==AIS_KOI_Datum && theShapeB->Signature()==1)))
{
- di <<"vline error: wrong type of 2de argument."<<"\n";
+ di <<"vline error: wrong type of 2de argument.\n";
return 1;
}
}
- else {di <<"vline error: wrong type of 1st argument."<<"\n";return 1; }
+ else {di <<"vline error: wrong type of 1st argument.\n";return 1; }
// Les deux parametres sont du bon type. On verifie que les points ne sont pas confondus
Handle(AIS_Point) theAISPointA= Handle(AIS_Point)::DownCast (theShapeA);
Handle(AIS_Point) theAISPointB= Handle(AIS_Point)::DownCast (theShapeB);
if (myCartPointB->X()==myCartPointA->X() && myCartPointB->Y()==myCartPointA->Y() && myCartPointB->Z()==myCartPointA->Z() ) {
// B=A
- di<<"vline error: same points"<<"\n";return 1;
+ di<<"vline error: same points\n";return 1;
}
// Les deux points sont OK...Construction de l'AIS_Line (en faite, le segment AB)
Handle(AIS_Line) theAISLine= new AIS_Line(myCartPointA,myCartPointB );
// Active le mode Vertex.
TheAISContext()->ActivateStandardMode (AIS_Shape::SelectionType(1) );
- di<<" Select a vertex "<<"\n";
+ di<<" Select a vertex \n";
// Boucle d'attente waitpick.
Standard_Integer argcc = 5;
// ShapeA est un Vertex
if (ShapeA.ShapeType()==TopAbs_VERTEX ) {
- di<<" Select a different vertex."<<"\n";
+ di<<" Select a different vertex.\n";
TopoDS_Shape ShapeB;
do {
}
else {
- di<<"vline error."<<"\n";
+ di<<"vline error.\n";
}
}
{
public:
// CASCADE RTTI
- DEFINE_STANDARD_RTTI(FilledCircle, AIS_InteractiveObject);
+ DEFINE_STANDARD_RTTI_INLINE(FilledCircle,AIS_InteractiveObject);
FilledCircle(gp_Pnt theCenter, Standard_Real theRadius);
FilledCircle(Handle(Geom_Circle) theCircle);
// Virtual methods implementation
void Compute ( const Handle(PrsMgr_PresentationManager3d)& thePresentationManager,
const Handle(Prs3d_Presentation)& thePresentation,
- const Standard_Integer theMode);
+ const Standard_Integer theMode) Standard_OVERRIDE;
void ComputeSelection ( const Handle(SelectMgr_Selection)& theSelection,
- const Standard_Integer theMode);
+ const Standard_Integer theMode) Standard_OVERRIDE;
protected:
Handle(Geom_Circle) myCircle;
gp_Pnt aTPPosition;
Aspect_TypeOfDisplayText aDisplayType = Aspect_TODT_NORMAL;
+
+ Standard_Boolean aHasPlane = Standard_False;
+ gp_Dir aNormal;
+ gp_Dir aDirection;
+ gp_Pnt aPos;
+
for (; anArgIt < theArgsNb; ++anArgIt)
{
TCollection_AsciiString aParam (theArgVec[anArgIt]);
return 1;
}
- gp_Pnt aPos;
aPos.SetX (Draw::Atof (theArgVec[++anArgIt]));
aPos.SetY (Draw::Atof (theArgVec[++anArgIt]));
aPos.SetZ (Draw::Atof (theArgVec[++anArgIt]));
aTextPrs->SetFont (theArgVec[anArgIt]);
}
+ else if (aParam == "-plane")
+ {
+ if (anArgIt + 6 >= theArgsNb)
+ {
+ std::cout << "Error: wrong number of values for parameter '" << aParam.ToCString() << "'.\n";
+ return 1;
+ }
+
+ Standard_Real aX = Draw::Atof (theArgVec[++anArgIt]);
+ Standard_Real aY = Draw::Atof (theArgVec[++anArgIt]);
+ Standard_Real aZ = Draw::Atof (theArgVec[++anArgIt]);
+ aNormal.SetCoord (aX, aY, aZ);
+
+ aX = Draw::Atof (theArgVec[++anArgIt]);
+ aY = Draw::Atof (theArgVec[++anArgIt]);
+ aZ = Draw::Atof (theArgVec[++anArgIt]);
+ aDirection.SetCoord (aX, aY, aZ);
+
+ aHasPlane = Standard_True;
+ }
+ else if (aParam == "-flipping")
+ {
+ aTextPrs->SetFlipping (Standard_True);
+ }
else if (aParam == "-disptype"
|| aParam == "-displaytype")
{
}
}
+ if (aHasPlane)
+ {
+ aTextPrs->SetOrientation3D (gp_Ax2 (aPos, aNormal, aDirection));
+ }
+
+ aTextPrs->SetDisplayType (aDisplayType);
+
if (aTrsfPersFlags != Graphic3d_TMF_None)
{
aTextPrs->SetTransformPersistence (aTrsfPersFlags, aTPPosition);
- aTextPrs->SetDisplayType (aDisplayType);
aTextPrs->SetZLayer(Graphic3d_ZLayerId_TopOSD);
- if (aTextPrs->GetPosition().Z() != 0)
+ if (aTextPrs->Position().Z() != 0)
{
- aTextPrs->SetPosition (gp_Pnt(aTextPrs->GetPosition().X(), aTextPrs->GetPosition().Y(), 0));
+ aTextPrs->SetPosition (gp_Pnt(aTextPrs->Position().X(), aTextPrs->Position().Y(), 0));
}
}
else if (aTrsfPersFlags != aTextPrs->TransformPersistence().Flags)
{
aTextPrs->SetTransformPersistence (aTrsfPersFlags);
- aTextPrs->SetDisplayType (Aspect_TODT_NORMAL);
}
ViewerTest::Display (aName, aTextPrs, Standard_False);
return 0;
Nor = gp_Dir(eqPlan);
else
Nor = gp_Dir(0., 0., 1.);
-
- Standard_Integer j = (i - PointsOfArray.Lower()) * 3;
- Normals->SetValue(j + 1, (Standard_ShortReal)Nor.X());
- Normals->SetValue(j + 2, (Standard_ShortReal)Nor.Y());
- Normals->SetValue(j + 3, (Standard_ShortReal)Nor.Z());
+
+ Standard_Integer k = (i - PointsOfArray.Lower()) * 3;
+ Normals->SetValue(k + 1, (Standard_ShortReal)Nor.X());
+ Normals->SetValue(k + 2, (Standard_ShortReal)Nor.Y());
+ Normals->SetValue(k + 3, (Standard_ShortReal)Nor.Z());
}
delete pc;
if ( argc != 3 && argc != 12 )
{
di << "Usage: " << argv[0] << " ShapeName HlrName "
- << "[ eye_x eye_y eye_z dir_x dir_y dir_z upx upy upz ]" << "\n"
+ << "[ eye_x eye_y eye_z dir_x dir_y dir_z upx upy upz ]\n"
<< " ShapeName - name of the initial shape\n"
<< " HlrName - result hlr object from initial shape\n"
<< " eye, dir are eye position and look direction\n"
myMarkerAspect = theMarkerAspect;
}
- DEFINE_STANDARD_RTTI(MyPArrayObject, AIS_InteractiveObject);
+ DEFINE_STANDARD_RTTI_INLINE(MyPArrayObject,AIS_InteractiveObject);
private:
void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,
const Handle(Prs3d_Presentation)& aPresentation,
- const Standard_Integer aMode);
+ const Standard_Integer aMode) Standard_OVERRIDE;
void ComputeSelection (const Handle(SelectMgr_Selection)& theSelection,
- const Standard_Integer /*theMode*/);
+ const Standard_Integer /*theMode*/) Standard_OVERRIDE;
bool CheckInputCommand (const TCollection_AsciiString theCommand,
const Handle(TColStd_HArray1OfAsciiString) theArgsArray,
}
else
{
- Standard_CString aName = anOriginObjectName.ToCString();
- TopoDS_Shape aTDShape = DBRep::Get (aName);
+ Standard_CString aOriginName = anOriginObjectName.ToCString();
+ TopoDS_Shape aTDShape = DBRep::Get (aOriginName);
if (aTDShape.IsNull())
{
std::cout << "vconnect error: object " << anOriginObjectName << " doesn't exist\n";
}
else
{
- Standard_CString aName = anOriginObjectName.ToCString();
- TopoDS_Shape aTDShape = DBRep::Get (aName);
+ Standard_CString aOriginName = anOriginObjectName.ToCString();
+ TopoDS_Shape aTDShape = DBRep::Get (aOriginName);
if (aTDShape.IsNull())
{
std::cout << "vconnect error: object " << anOriginObjectName << " doesn't exist\n";
Handle(AIS_InteractiveContext) aContext = ViewerTest::GetAISContext();
if (aContext.IsNull())
{
- std::cout << argv[0] << "ERROR : use 'vinit' command before " << "\n";
+ std::cout << argv[0] << "ERROR : use 'vinit' command before \n";
return 1;
}
if (argc != 3)
{
- std::cout << "ERROR : Usage : " << argv[0] << " name object" << "\n";
+ std::cout << "ERROR : Usage : " << argv[0] << " name object\n";
return 1;
}
Handle(AIS_MultipleConnectedInteractive) anAssembly;
if (!aMap.IsBound2 (aName) )
{
- std::cout << "Use 'vdisplay' before" << "\n";
+ std::cout << "Use 'vdisplay' before\n";
return 1;
}
anAssembly = Handle(AIS_MultipleConnectedInteractive)::DownCast (aMap.Find2 (aName));
if (anAssembly.IsNull())
{
- di << "Not an assembly" << "\n";
+ di << "Not an assembly\n";
return 1;
}
}
else
{
- std::cout << "Use 'vdisplay' before" << "\n";
+ std::cout << "Use 'vdisplay' before\n";
return 1;
}
}
Handle(AIS_InteractiveContext) aContext = ViewerTest::GetAISContext();
if (aContext.IsNull())
{
- std::cout << argv[0] << "error : use 'vinit' command before " << "\n";
+ std::cout << argv[0] << "error : use 'vinit' command before \n";
return 1;
}
Handle(AIS_MultipleConnectedInteractive) anAssembly;
if (!aMap.IsBound2 (aName) )
{
- std::cout << "Use 'vdisplay' before" << "\n";
+ std::cout << "Use 'vdisplay' before\n";
return 1;
}
anAssembly = Handle(AIS_MultipleConnectedInteractive)::DownCast (aMap.Find2 (aName));
if (anAssembly.IsNull())
{
- di << "Not an assembly" << "\n";
+ di << "Not an assembly\n";
return 1;
}
Handle(AIS_InteractiveObject) anIObj;
if (!aMap.IsBound2 (anObject))
{
- std::cout << "Use 'vdisplay' before" << "\n";
+ std::cout << "Use 'vdisplay' before\n";
return 1;
}
Handle(AIS_InteractiveContext) aContext = ViewerTest::GetAISContext();
if (aContext.IsNull())
{
- std::cout << argv[0] << "ERROR : use 'vinit' command before " << "\n";
+ std::cout << argv[0] << "ERROR : use 'vinit' command before \n";
return 1;
}
if (argc != 2)
{
- std::cout << "ERROR : Usage : " << argv[0] << " name" << "\n";
+ std::cout << "ERROR : Usage : " << argv[0] << " name\n";
return 1;
}
Handle(AIS_MultipleConnectedInteractive) anAssembly;
if (!aMap.IsBound2 (aName) )
{
- std::cout << "Use 'vdisplay' before" << "\n";
+ std::cout << "Use 'vdisplay' before\n";
return 1;
}
anAssembly = Handle(AIS_MultipleConnectedInteractive)::DownCast (aMap.Find2 (aName));
if (anAssembly.IsNull())
{
- std::cout << "Not an assembly" << "\n";
+ std::cout << "Not an assembly\n";
return 1;
}
{
if (GetMapOfAIS().IsBound1 (anIter.Value()))
{
- TCollection_AsciiString aName = GetMapOfAIS().Find1 (anIter.Value());
- std::cout << aCounter << ") " << aName << " (" << anIter.Value()->DynamicType()->Name() << ")";
+ TCollection_AsciiString aCuurrentName = GetMapOfAIS().Find1 (anIter.Value());
+ std::cout << aCounter << ") " << aCuurrentName << " (" << anIter.Value()->DynamicType()->Name() << ")";
}
std::cout << aCounter << ") " << anIter.Value()->DynamicType()->Name();
}
return Standard_False;
}
-};
+}
//===============================================================================================
//function : VSetSelectionMode
{
public:
// CASCADE RTTI
- DEFINE_STANDARD_RTTI(Triangle, AIS_InteractiveObject);
+ DEFINE_STANDARD_RTTI_INLINE(Triangle,AIS_InteractiveObject);
Triangle (const gp_Pnt& theP1,
const gp_Pnt& theP2,
const gp_Pnt& theP3);
protected:
void Compute ( const Handle(PrsMgr_PresentationManager3d)& thePresentationManager,
const Handle(Prs3d_Presentation)& thePresentation,
- const Standard_Integer theMode);
+ const Standard_Integer theMode) Standard_OVERRIDE;
void ComputeSelection ( const Handle(SelectMgr_Selection)& theSelection,
- const Standard_Integer theMode);
+ const Standard_Integer theMode) Standard_OVERRIDE;
private:
gp_Pnt myPoint1;
gp_Pnt myPoint2;
{
public:
// CASCADE RTTI
- DEFINE_STANDARD_RTTI(SegmentObject, AIS_InteractiveObject);
+ DEFINE_STANDARD_RTTI_INLINE(SegmentObject,AIS_InteractiveObject);
SegmentObject (const gp_Pnt& thePnt1, const gp_Pnt& thePnt2);
protected:
void Compute (const Handle(PrsMgr_PresentationManager3d)& thePresentationManager,
const Handle(Prs3d_Presentation)& thePresentation,
- const Standard_Integer theMode);
+ const Standard_Integer theMode) Standard_OVERRIDE;
void ComputeSelection (const Handle(SelectMgr_Selection)& theSelection,
- const Standard_Integer theMode);
+ const Standard_Integer theMode) Standard_OVERRIDE;
private:
gp_Pnt myPoint1;
gp_Pnt myPoint2;
ViewerTest_DoubleMapOfInteractiveAndName& aMap = GetMapOfAIS();
if (!aMap.IsBound2 (aName))
{
- di << "Use 'vdisplay' before" << "\n";
+ di << "Use 'vdisplay' before\n";
return 1;
}
myMarkerAspect = theMarkerAspect;
}
- DEFINE_STANDARD_RTTI(MyPArrayObject, AIS_InteractiveObject);
+ DEFINE_STANDARD_RTTI_INLINE(MyPArrayObject,AIS_InteractiveObject);
private:
void Compute (const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,
const Handle(Prs3d_Presentation)& aPresentation,
- const Standard_Integer aMode);
+ const Standard_Integer aMode) Standard_OVERRIDE;
void ComputeSelection (const Handle(SelectMgr_Selection)& theSelection,
- const Standard_Integer /*theMode*/);
+ const Standard_Integer /*theMode*/) Standard_OVERRIDE;
protected:
return 1;
}
- parseOnOff (theArgVec[anArgIt], anIsCompositeCurve);
+ ViewerTest::ParseOnOff (theArgVec[anArgIt], anIsCompositeCurve);
}
else if (aParam == "-plane")
{
{
const char *group ="AISObjects";
theCommands.Add("vtrihedron",
- "vtrihedron : vtrihedron name [Xo] [Yo] [Zo] [Zu] [Zv] [Zw] [Xu] [Xv] [Xw] ",
+ "vtrihedron : vtrihedron name [ -origin x y z ] [ -zaxis u v w -xaxis u v w ] [ -hidelabels ]"
+ "\n\t\t: Creates a new *AIS_Trihedron* object. If no argument is set, the default trihedron (0XYZ) is created."
+ "\n\t\t: -hidelabels allows to draw trihedron without axes labels. By default, they are displayed.",
__FILE__,VTrihedron,group);
theCommands.Add("vtri2d",
- "vtri2d Name Selection in the viewer only ",
+ "vtri2d Name"
+ "\n\t\t: Creates a plane with a 2D trihedron from an interactively selected face.",
__FILE__,VTrihedron2D ,group);
theCommands.Add("vplanetri",
- "vplanetri Name Selection in the viewer only ",
+ "vplanetri name"
+ "\n\t\t: Create a plane from a trihedron selection. If no arguments are set, the default",
__FILE__,VPlaneTrihedron ,group);
theCommands.Add("vsize",
- "vsize : vsize [name(Default=Current)] [size(Default=100)] ",
+ "vsize : vsize [name(Default=Current)] [size(Default=100)] "
+ "\n\t\t: Changes the size of a named or selected trihedron."
+ "\n\t\t: If the name is not defined: it affects the selected trihedrons otherwise nothing is done."
+ "\n\t\t: If the value is not defined: it is set to 100 by default.",
__FILE__,VSize,group);
theCommands.Add("vaxis",
- "vaxis nom [Xa] [Ya] [Za] [Xb] [Yb] [Zb]",
+ "vaxis name [Xa] [Ya] [Za] [Xb] [Yb] [Zb]"
+ "\n\t\t: Creates an axis. If the values are not defined, an axis is created by interactive selection of two vertices or one edge",
__FILE__,VAxisBuilder,group);
theCommands.Add("vaxispara",
- "vaxispara nom ",
+ "vaxispara name "
+ "\n\t\t: Creates an axis by interactive selection of an edge and a vertex.",
__FILE__,VAxisBuilder,group);
theCommands.Add("vaxisortho",
- "vaxisotho nom ",
+ "vaxisortho name "
+ "\n\t\t: Creates an axis by interactive selection of an edge and a vertex. The axis will be orthogonal to the selected edge.",
__FILE__,VAxisBuilder,group);
theCommands.Add("vpoint",
- "vpoint PointName [Xa] [Ya] [Za] ",
+ "vpoint PointName [Xa] [Ya] [Za] "
+ "\n\t\t: Creates a point from coordinates. If the values are not defined,"
+ "\n\t\t: a point is created by interactive selection of a vertice or an edge (in the center of the edge).",
__FILE__,VPointBuilder,group);
theCommands.Add("vplane",
- "vplane PlaneName [AxisName/PlaneName/PointName] [PointName/PointName/PointName] [Nothing/Nothing/PointName] [TypeOfSensitivity]",
+ "vplane PlaneName [AxisName/PlaneName/PointName] [PointName/PointName/PointName] [Nothing/Nothing/PointName] [TypeOfSensitivity {0|1}]"
+ "\n\t\t: Creates a plane from named or interactively selected entities."
+ "\n\t\t: TypeOfSensitivity:"
+ "\n\t\t: 0 - Interior"
+ "\n\t\t: 1 - Boundary",
__FILE__,VPlaneBuilder,group);
theCommands.Add ("vchangeplane", "vchangeplane usage: \n"
__FILE__, VChangePlane, group);
theCommands.Add("vplanepara",
- "vplanepara PlaneName ",
+ "vplanepara PlaneName "
+ "\n\t\t: Creates a plane from interactively selected vertex and face.",
__FILE__,VPlaneBuilder,group);
theCommands.Add("vplaneortho",
- "vplaneortho PlaneName ",
+ "vplaneortho PlaneName "
+ "\n\t\t: Creates a plane from interactive selected face and coplanar edge. ",
__FILE__,VPlaneBuilder,group);
theCommands.Add("vline",
- "vline: vline LineName [Xa/PointName] [Ya/PointName] [Za] [Xb] [Yb] [Zb] ",
+ "vline LineName [Xa/PointName] [Ya/PointName] [Za] [Xb] [Yb] [Zb] "
+ "\n\t\t: Creates a line from coordinates, named or interactively selected vertices. ",
__FILE__,VLineBuilder,group);
theCommands.Add("vcircle",
- "vcircle CircleName [PointName PointName PointName IsFilled]\n\t\t\t\t\t[PlaneName PointName Radius IsFilled]",
+ "vcircle CircleName [PointName PointName PointName IsFilled]\n\t\t\t\t\t[PlaneName PointName Radius IsFilled]"
+ "\n\t\t: Creates a circle from named or interactively selected entities."
+ "\n\t\t: Parameter IsFilled is defined as 0 or 1.",
__FILE__,VCircleBuilder,group);
theCommands.Add ("vdrawtext",
"\n\t\t: [-disptype {blend|decal|subtitle|dimension|normal}=normal}"
"\n\t\t: [-subcolor {R G B|name}=white]"
"\n\t\t: [-noupdate]"
+ "\n\t\t: [-plane NormX NormY NormZ DirX DirY DirZ]"
+ "\n\t\t: [-flipping]"
"\n\t\t: Display text label at specified position.",
__FILE__, VDrawText, group);
__FILE__,VDrawPArray,group);
theCommands.Add("vconnect",
- "vconnect : assembly_name Xo Yo Zo object1 object2 ..."
- " Makes an assembly of object instances located in point (Xo Yo Zo).",
+ "vconnect name Xo Yo Zo object1 object2 ... [color=NAME]"
+ "\n\t\t: Creates and displays AIS_ConnectedInteractive object from input object and location.",
__FILE__, VConnect, group);
theCommands.Add("vconnectto",
__FILE__, VSelectionPrevious, group);
theCommands.Add("vtriangle",
- "vtriangle Name PointName PointName PointName",
+ "vtriangle Name PointName PointName PointName"
+ "\n\t\t: Creates and displays a filled triangle from named points.",
__FILE__, VTriangle,group);
theCommands.Add("vsegment",
- "vsegment Name PointName PointName",
+ "vsegment Name PointName PointName"
+ "\n\t\t: Creates and displays a segment from named points.",
__FILE__, VSegment,group);
theCommands.Add("vobjzlayer",