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

0023432: Connected Interactive Objects computed without Interactive Context

Browse Source 
Setup interactive context for reference(s) in Compute() method of classes AIS_ConnectedInteractive and AIS_MultipleConnectedInteractive
Extend vconnectsh and vconnect to process several input objects, added displaying color for result object
Fixed errors in QAGetPixelColor DRAW command
Edit QAGetPixelColor command and test case
ViewerTest::GetColorFromName() - fixed iteration bounds
QAAISGetPixelColor() - removed redundant conversions
Turn back QAGetPixelColor output syntax in case of 3 arguments
Integration of test script to new test system
This commit is contained in:
kgv 2012-11-15 13:27:18 +04:00
parent f6f03db9d0
commit 792c785cfb
8 changed files with 405 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/AIS/AIS_ConnectedInteractive.cxx
View File

@ -105,30 +105,39 @@ void AIS_ConnectedInteractive::Disconnect()
} }
//======================================================================= //=======================================================================
//function : Compute //function : Compute
//purpose : //purpose :
//======================================================================= //=======================================================================
void AIS_ConnectedInteractive::Compute (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr,
void AIS_ConnectedInteractive:: const Handle(Prs3d_Presentation)& thePrs,
Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Standard_Integer theMode)
const Handle(Prs3d_Presentation)& aPresentation,
const Standard_Integer aMode)
{ {
static Handle(Geom_Transformation) myPrsTrans ; if (!(HasLocation() || HasConnection()))
{
if(!(HasLocation() ||HasConnection())) return; return;
if(HasConnection()){
aPresentation->Clear(Standard_False);
aPresentation->RemoveAll();
aPresentationManager->Connect( this,myReference, aMode, aMode);
if(aPresentationManager->Presentation(myReference,aMode)->MustBeUpdated())
aPresentationManager->Update(myReference,aMode);
} }
if(HasLocation()){
myPrsTrans = new Geom_Transformation(myLocation.Transformation()); if (HasConnection())
aPresentationManager->Transform(this, myPrsTrans, aMode); } {
aPresentation->ReCompute(); thePrs->Clear (Standard_False);
thePrs->RemoveAll();
if (!myReference->HasInteractiveContext())
{
myReference->SetContext (GetContext());
}
thePrsMgr->Connect (this, myReference, theMode, theMode);
if (thePrsMgr->Presentation (myReference, theMode)->MustBeUpdated())
{
thePrsMgr->Update (myReference, theMode);
}
}
if (HasLocation())
{
Handle(Geom_Transformation) aPrsTrans = new Geom_Transformation (myLocation.Transformation());
thePrsMgr->Transform (this, aPrsTrans, theMode);
}
thePrs->ReCompute();
} }
void AIS_ConnectedInteractive::Compute(const Handle_Prs3d_Projector& aProjector, const Handle_Geom_Transformation& aTransformation, const Handle_Prs3d_Presentation& aPresentation) void AIS_ConnectedInteractive::Compute(const Handle_Prs3d_Projector& aProjector, const Handle_Geom_Transformation& aTransformation, const Handle_Prs3d_Presentation& aPresentation)

2
src/AIS/AIS_MultipleConnectedInteractive.cdl
View File

@ -95,7 +95,7 @@ is
-- compute anything, but just uses the -- compute anything, but just uses the
-- presentation of this last object, with -- presentation of this last object, with
-- a transformation if there's one stored. -- a transformation if there's one stored.
is redefined virtual private; is redefined virtual protected;
Compute(me:mutable; Compute(me:mutable;
aPresentationManager: PresentationManager2d from PrsMgr; aPresentationManager: PresentationManager2d from PrsMgr;

41
src/AIS/AIS_MultipleConnectedInteractive.cxx
View File

@ -130,32 +130,35 @@ void AIS_MultipleConnectedInteractive::DisconnectAll ()
//======================================================================= //=======================================================================
//function : Compute //function : Compute
//purpose : //purpose :
//======================================================================= //=======================================================================
void AIS_MultipleConnectedInteractive::Compute (const Handle(PrsMgr_PresentationManager3d)& thePrsMgr,
void AIS_MultipleConnectedInteractive::Compute const Handle(Prs3d_Presentation)& thePrs,
(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, const Standard_Integer theMode)
const Handle(Prs3d_Presentation)& aPresentation,
const Standard_Integer aMode)
{ {
//cout<<"AIS_MultipleConnectedInteractive::Compute"<<endl; thePrs->Clear (Standard_False);
thePrs->RemoveAll();
if (HasConnection())
{
for (Standard_Integer aRefIter = 1; aRefIter <= myReferences.Length(); ++aRefIter)
{
const Handle (AIS_InteractiveObject)& aRef = myReferences.Value (aRefIter);
if (!aRef->HasInteractiveContext())
{
aRef->SetContext (GetContext());
}
aPresentation->Clear(Standard_False); thePrsMgr->Connect (this, aRef, theMode, theMode);
aPresentation->RemoveAll(); if (thePrsMgr->Presentation (aRef, theMode)->MustBeUpdated())
if(HasConnection()) { {
for (Standard_Integer I=1 ; I<= myReferences.Length(); I++) { thePrsMgr->Update (aRef, theMode);
const Handle (AIS_InteractiveObject)& aReference = myReferences.Value (I); }
aPresentationManager->Connect( this, aReference, aMode, aMode);
if(aPresentationManager->Presentation(aReference,aMode)->MustBeUpdated())
aPresentationManager->Update(aReference,aMode);
} }
} }
aPresentation->ReCompute(); thePrs->ReCompute();
} }
//======================================================================= //=======================================================================
//function : Compute //function : Compute
//purpose : //purpose :

9
src/AIS/AIS_MultipleConnectedShape.cxx
View File

@ -164,12 +164,11 @@ void AIS_MultipleConnectedShape::Compute(const Handle(Prs3d_Projector)& aProject
//purpose : //purpose :
//======================================================================= //=======================================================================
void AIS_MultipleConnectedShape::Compute(const Handle_PrsMgr_PresentationManager3d& /*aPresentationManager3d*/, void AIS_MultipleConnectedShape::Compute(const Handle_PrsMgr_PresentationManager3d& aPresentationManager3d,
const Handle_Prs3d_Presentation& /*aPresentation*/, const Handle_Prs3d_Presentation& aPresentation,
const int /*anint*/) const int anint)
{ {
Standard_NotImplemented::Raise("AIS_MultipleConnectedShape::Compute(const Handle_PrsMgr_PresentationManager3d&, const Handle_Prs3d_Presentation&, const int)"); AIS_MultipleConnectedInteractive::Compute( aPresentationManager3d , aPresentation , anint ) ;
// AIS_MultipleConnectedInteractive::Compute( aPresentationManager3d , aPresentation , anint ) ; Not accessible
} }
//======================================================================= //=======================================================================

123
src/QADraw/QADraw.cxx
View File

@ -464,79 +464,80 @@ Handle(TColStd_HSequenceOfReal) GetColorOfPixel (const Image_PixMap& theImage
return aSeq; return aSeq;
} }
static Standard_Integer QAAISGetPixelColor (Draw_Interpretor& di, Standard_Integer argc, const char ** argv) static Standard_Integer QAAISGetPixelColor (Draw_Interpretor& theDi,
Standard_Integer theArgsNb,
const char** theArgs)
{ {
if ( argc != 3 ) { if (theArgsNb != 3 && theArgsNb != 6)
if ( argc != 6 ) { {
di << "Usage : " << argv[0] << " coordinate_X coordinate_Y [color_R color_G color_B]" << "\n"; theDi << "Usage : " << theArgs[0] << " coordinate_X coordinate_Y [color_R color_G color_B]" << "\n";
return 1; return 1; // TCL_ERROR
}
}
Handle (V3d_View) QAAISView = ViewerTest::CurrentView ();
if ( QAAISView.IsNull () ) {
di << "You must initialize AISViewer before this command." << "\n";
return 1;
}
Handle (Aspect_Window) QAAISWindow = QAAISView->Window ();
Standard_Integer QAAISXWindowSize_X = 0;
Standard_Integer QAAISXWindowSize_Y = 0;
QAAISWindow->Size(QAAISXWindowSize_X, QAAISXWindowSize_Y);
Standard_Integer QAAISCoordinateX = atoi (argv [1]);
Standard_Integer QAAISCoordinateY = atoi (argv [2]);
Standard_Real QAAISColorRED_V = 0;
Standard_Real QAAISColorGRN_V = 0;
Standard_Real QAAISColorBLU_V = 0;
if ( argc == 6 ) {
QAAISColorRED_V = atof (argv [3]);
QAAISColorGRN_V = atof (argv [4]);
QAAISColorBLU_V = atof (argv [5]);
di << "Begin aColorRED_User = " << QAAISColorRED_V << "\n";
di << "Begin aColorGRN_User = " << QAAISColorRED_V << "\n";
di << "Begin aColorBLU_User = " << QAAISColorRED_V << "\n";
} }
Standard_Integer aRadius = 1; Handle(V3d_View) aView3d = ViewerTest::CurrentView();
if ( argc == 3 ) { if (aView3d.IsNull())
aRadius=0; {
theDi << "You must initialize AISViewer before this command.\n";
return 1; // TCL_ERROR
}
const Handle(Aspect_Window) anAISWindow = aView3d->Window();
Standard_Integer aWindowSizeX = 0;
Standard_Integer aWindowSizeY = 0;
anAISWindow->Size (aWindowSizeX, aWindowSizeY);
Standard_Integer anArgIter = 1;
const Standard_Integer aPickCoordX = atoi (theArgs[anArgIter++]);
const Standard_Integer aPickCoordY = atoi (theArgs[anArgIter++]);
const Standard_Integer aRadius = (theArgsNb == 3) ? 0 : 1;
Image_ColorRGBF aColorInput = {{ 0.0f, 0.0f, 0.0f }};
if (theArgsNb == 6)
{
aColorInput.r() = (Standard_ShortReal )atof (theArgs[anArgIter++]);
aColorInput.g() = (Standard_ShortReal )atof (theArgs[anArgIter++]);
aColorInput.b() = (Standard_ShortReal )atof (theArgs[anArgIter++]);
} }
Image_PixMap anImage; Image_PixMap anImage;
QAAISView->ToPixMap (anImage, QAAISXWindowSize_X, QAAISXWindowSize_Y); aView3d->ToPixMap (anImage, aWindowSizeX, aWindowSizeY);
Handle(TColStd_HSequenceOfReal) aSeq = GetColorOfPixel (anImage, QAAISCoordinateX, QAAISCoordinateY, aRadius); const Handle(TColStd_HSequenceOfReal) aSeq = GetColorOfPixel (anImage, aPickCoordX, aPickCoordY, aRadius);
cout << "Length = " << aSeq->Length() << endl; cout << "Length = " << aSeq->Length() << endl;
Standard_Boolean IsNotEqual = Standard_True; Image_ColorRGBF aColorPicked = {{ 0.0f, 0.0f, 0.0f }};
Standard_Integer i; Standard_Boolean isNotEqual = Standard_True;
for(i=1; i<=aSeq->Length();i+=3) { for (Standard_Integer i = 1; i <= aSeq->Length(); i += 3)
// mkv 29.04.03 {
Standard_Real QAAISColorRED_R = (Floor(aSeq->Value(i+0) * 1000000.)) / 1000000.; aColorPicked.r() = (Standard_ShortReal )aSeq->Value (i + 0);
Standard_Real QAAISColorGRN_R = (Floor(aSeq->Value(i+1) * 1000000.)) / 1000000.; aColorPicked.g() = (Standard_ShortReal )aSeq->Value (i + 1);
Standard_Real QAAISColorBLU_R = (Floor(aSeq->Value(i+2) * 1000000.)) / 1000000.; aColorPicked.b() = (Standard_ShortReal )aSeq->Value (i + 2);
// mkv 29.04.03
if ( argc == 3 ) { if (theArgsNb == 3 ||
di << "RED : " << QAAISColorRED_R ((Abs (aColorPicked.r() - aColorInput.r()) <= Precision::Confusion())
<< " GREEN : " << QAAISColorGRN_R && (Abs (aColorPicked.g() - aColorInput.g()) <= Precision::Confusion())
<< " BLUE : " << QAAISColorBLU_R && (Abs (aColorPicked.b() - aColorInput.b()) <= Precision::Confusion())))
<< "\n"; {
IsNotEqual = Standard_False; isNotEqual = Standard_False;
break;
}
if ( QAAISColorRED_R == QAAISColorRED_V
&& QAAISColorGRN_R == QAAISColorGRN_V
&& QAAISColorBLU_R == QAAISColorBLU_V
) {
IsNotEqual = Standard_False;
break; break;
} }
} }
if (IsNotEqual) {
di << "Faulty : colors are not equal." << "\n"; theDi << "RED : " << aColorPicked.r() << " "
return 1; << "GREEN : " << aColorPicked.g() << " "
<< "BLUE : " << aColorPicked.b() << "\n";
if (theArgsNb == 6)
{
theDi << "User color: \n"
<< "RED : " << aColorInput.r() << " "
<< "GREEN : " << aColorInput.g() << " "
<< "BLUE : " << aColorInput.b() << "\n";
}
if (isNotEqual)
{
theDi << "Faulty : colors are not equal.\n";
return 1; // TCL_ERROR
} }
return 0; return 0;
} }

6
src/ViewerTest/ViewerTest.cdl
View File

@ -35,7 +35,8 @@ uses
V3d, V3d,
AIS, AIS,
NIS, NIS,
MMgt MMgt,
Quantity
is is
@ -171,6 +172,9 @@ is
StandardModeActivation(Mode : Integer from Standard); StandardModeActivation(Mode : Integer from Standard);
GetColorFromName(name: CString from Standard)
returns NameOfColor from Quantity;
end; end;

43
src/ViewerTest/ViewerTest.cxx
View File

@ -82,12 +82,6 @@
#include <NIS_Triangulated.hxx> #include <NIS_Triangulated.hxx>
extern int ViewerMainLoop(Standard_Integer argc, const char** argv); extern int ViewerMainLoop(Standard_Integer argc, const char** argv);
//=======================================================================
//function : GetColorFromName
//purpose : get the Quantity_NameOfColor from a string
//=======================================================================
#include <Quantity_NameOfColor.hxx>
#include <Quantity_Color.hxx> #include <Quantity_Color.hxx>
#include <Quantity_NameOfColor.hxx> #include <Quantity_NameOfColor.hxx>
@ -96,22 +90,23 @@ extern int ViewerMainLoop(Standard_Integer argc, const char** argv);
#define DEFAULT_COLOR Quantity_NOC_GOLDENROD #define DEFAULT_COLOR Quantity_NOC_GOLDENROD
#define DEFAULT_MATERIAL Graphic3d_NOM_BRASS #define DEFAULT_MATERIAL Graphic3d_NOM_BRASS
static Quantity_NameOfColor GetColorFromName( const char *name ) //=======================================================================
//function : GetColorFromName
//purpose : get the Quantity_NameOfColor from a string
//=======================================================================
Quantity_NameOfColor ViewerTest::GetColorFromName (const Standard_CString theName)
{ {
Quantity_NameOfColor ret = DEFAULT_COLOR; for (Standard_Integer anIter = Quantity_NOC_BLACK; anIter <= Quantity_NOC_WHITE; ++anIter)
{
Standard_Boolean Found = Standard_False; Standard_CString aColorName = Quantity_Color::StringName (Quantity_NameOfColor (anIter));
Standard_CString colstring; if (strcasecmp (theName, aColorName) == 0)
for(Standard_Integer i=0;i<=514 && !Found;i++)
{ {
colstring = Quantity_Color::StringName(Quantity_NameOfColor(i)); return Quantity_NameOfColor (anIter);
if (!strcasecmp(name,colstring)) {
ret = (Quantity_NameOfColor)i;
Found = Standard_True;
}
} }
}
return ret; return DEFAULT_COLOR;
} }
//======================================================================= //=======================================================================
@ -1107,20 +1102,20 @@ static int VColor2 (Draw_Interpretor& di, Standard_Integer argc, const char** ar
Handle(AIS_InteractiveObject)::DownCast (anObj); Handle(AIS_InteractiveObject)::DownCast (anObj);
#ifdef DEB #ifdef DEB
if (HaveToSet) if (HaveToSet)
di << "HaveToSet "<< "1" <<" Color Given "<< argv[2] << " Color returned "<< GetColorFromName(argv[2]) << "\n"; di << "HaveToSet "<< "1" <<" Color Given "<< argv[2] << " Color returned "<< ViewerTest::GetColorFromName(argv[2]) << "\n";
else else
di << "HaveToSet 0\n"; di << "HaveToSet 0\n";
#endif #endif
if(HaveToSet) if(HaveToSet)
TheAISContext()->SetColor(ashape,GetColorFromName(argv[2]) ); TheAISContext()->SetColor(ashape,ViewerTest::GetColorFromName(argv[2]) );
else else
TheAISContext()->UnsetColor(ashape); TheAISContext()->UnsetColor(ashape);
} else if (anObj->IsKind(STANDARD_TYPE(NIS_InteractiveObject))) { } else if (anObj->IsKind(STANDARD_TYPE(NIS_InteractiveObject))) {
Handle(NIS_Triangulated) ashape = Handle(NIS_Triangulated) ashape =
Handle(NIS_Triangulated)::DownCast (anObj); Handle(NIS_Triangulated)::DownCast (anObj);
if (!ashape.IsNull()) if (!ashape.IsNull())
ashape->SetColor (GetColorFromName(argv[2])); ashape->SetColor (ViewerTest::GetColorFromName(argv[2]));
} }
} }
@ -1139,12 +1134,12 @@ static int VColor2 (Draw_Interpretor& di, Standard_Integer argc, const char** ar
continue; continue;
#ifdef DEB #ifdef DEB
if (HaveToSet) if (HaveToSet)
di << "HaveToSet "<< "1" <<" Color Given "<< argv[2] << " Color returned "<< GetColorFromName(argv[2]) << "\n"; di << "HaveToSet "<< "1" <<" Color Given "<< argv[2] << " Color returned "<< ViewerTest::GetColorFromName(argv[2]) << "\n";
else else
di << "HaveToSet 0\n"; di << "HaveToSet 0\n";
#endif #endif
if(HaveToSet) if(HaveToSet)
TheAISContext()->SetColor(ashape,GetColorFromName(argv[1]),Standard_False); TheAISContext()->SetColor(ashape,ViewerTest::GetColorFromName(argv[1]),Standard_False);
else else
TheAISContext()->UnsetColor(ashape,Standard_False); TheAISContext()->UnsetColor(ashape,Standard_False);
} }
@ -1163,7 +1158,7 @@ static int VColor2 (Draw_Interpretor& di, Standard_Integer argc, const char** ar
Handle(AIS_InteractiveObject)::DownCast(it.Key1()); Handle(AIS_InteractiveObject)::DownCast(it.Key1());
if (!ashape.IsNull()) if (!ashape.IsNull())
if(HaveToSet) if(HaveToSet)
TheAISContext()->SetColor(ashape,GetColorFromName(argv[1]),Standard_False); TheAISContext()->SetColor(ashape,ViewerTest::GetColorFromName(argv[1]),Standard_False);
else else
TheAISContext()->UnsetColor(ashape,Standard_False); TheAISContext()->UnsetColor(ashape,Standard_False);
it.Next(); it.Next();

326
src/ViewerTest/ViewerTest_ObjectCommands.cxx
View File

@ -126,6 +126,8 @@
#include <TopoDS_Wire.hxx> #include <TopoDS_Wire.hxx>
#include <AIS_ConnectedShape.hxx> #include <AIS_ConnectedShape.hxx>
#include <AIS_MultipleConnectedInteractive.hxx>
#include <AIS_MultipleConnectedShape.hxx>
#include <TopLoc_Location.hxx> #include <TopLoc_Location.hxx>
#include <TColStd_ListOfInteger.hxx> #include <TColStd_ListOfInteger.hxx>
#include <TColStd_ListIteratorOfListOfInteger.hxx> #include <TColStd_ListIteratorOfListOfInteger.hxx>
@ -3504,50 +3506,138 @@ static Standard_Integer VSetLocation (Draw_Interpretor& di,
//=============================================================================================== //===============================================================================================
//function : VConnect //function : VConnect
//purpose : Creates and displays AIS_ConnectedInteractive object from input object and location //purpose : Creates and displays AIS_ConnectedInteractive object from input object and location
//Draw arg : vconnect name object Xo Yo Zo Xu Xv Xw Zu Zv Zw //Draw arg : vconnect name Xo Yo Zo Xu Xv Xw Zu Zv Zw object1 object2 ... [color=NAME]
//=============================================================================================== //===============================================================================================
static Standard_Integer VConnect(Draw_Interpretor& di, static Standard_Integer VConnect(Draw_Interpretor& di,
Standard_Integer argc, Standard_Integer argc,
const char ** argv) const char ** argv)
{ {
// Check the viewer
Handle(AIS_InteractiveContext) aContext = ViewerTest::GetAISContext();
if (aContext.IsNull())
{
std::cout << "vconnect error : call vinit before\n";
return 1; // TCL_ERROR
}
// Check argumnets // Check argumnets
if(argc != 12) if (argc < 12)
{ {
std::cout << "vconnect error: expect 11 argumnets\n"; std::cout << "vconnect error: expect at least 11 arguments\n";
return 1; // TCL_ERROR return 1; // TCL_ERROR
} }
// Get values
TCollection_AsciiString aName(argv[1]); // Get values
TCollection_AsciiString anOriginObjectName(argv[2]); Standard_Integer anArgIter = 1;
if(aName.IsEqual(anOriginObjectName)) TCollection_AsciiString aName (argv[anArgIter++]);
{
std::cout << "vconnect error: equal names for connected objects\n";
return 1; // TCL_ERROR
}
// Check if the origin shape is not null
Handle(AIS_InteractiveObject) anOriginObject; Handle(AIS_InteractiveObject) anOriginObject;
if(GetMapOfAIS().IsBound2(anOriginObjectName)) TCollection_AsciiString aColorString (argv[argc-1]);
Standard_CString aColorName;
Standard_Boolean hasColor = Standard_False;
if (aColorString.Search ("color=") != -1)
{ {
Handle(Standard_Transient) anObj = GetMapOfAIS().Find2(anOriginObjectName); hasColor = Standard_True;
anOriginObject = Handle(AIS_InteractiveObject)::DownCast(anObj); aColorString.Remove (1, 6);
if(anOriginObject.IsNull()) aColorName = aColorString.ToCString();
}
Handle(AIS_InteractiveObject) anObject;
// AIS_ConnectedInteractive
if (argc == 12 || (argc == 13 && hasColor))
{
TCollection_AsciiString anOriginObjectName(argv[11]);
if (aName.IsEqual (anOriginObjectName))
{ {
std::cout << "Object " << anOriginObjectName << " is used for non AIS viewer\n!"; std::cout << "vconnect error: equal names for connected objects\n";
return 1; // TCL_ERROR
}
if (GetMapOfAIS().IsBound2 (anOriginObjectName))
{
Handle(Standard_Transient) anObj = GetMapOfAIS().Find2 (anOriginObjectName);
anOriginObject = Handle(AIS_InteractiveObject)::DownCast(anObj);
if (anOriginObject.IsNull())
{
std::cout << "Object " << anOriginObjectName << " is used for non AIS viewer\n";
return 1; // TCL_ERROR
}
}
else
{
Standard_CString aName = anOriginObjectName.ToCString();
TopoDS_Shape aTDShape = DBRep::Get (aName);
if (aTDShape.IsNull())
{
std::cout << "vconnect error: object " << anOriginObjectName << " doesn't exist\n";
return 1; // TCL_ERROR
}
anOriginObject = new AIS_Shape (aTDShape);
if (hasColor)
{
anOriginObject->SetColor (ViewerTest::GetColorFromName (aColorName));
}
}
}
// AIS_MultipleConnectedInteractive
else
{
const Standard_Integer aNbShapes = hasColor ? (argc - 1) : argc;
for (Standard_Integer i = 11; i < aNbShapes; ++i)
{
TCollection_AsciiString anOriginObjectName (argv[i]);
if (aName.IsEqual (anOriginObjectName))
{
std::cout << "vconnect error: equal names for connected objects\n";
continue;
}
if (GetMapOfAIS().IsBound2 (anOriginObjectName))
{
Handle(Standard_Transient) anObj = GetMapOfAIS().Find2 (anOriginObjectName);
anObject = Handle(AIS_InteractiveObject)::DownCast(anObj);
if (anObject.IsNull())
{
std::cout << "Object " << anOriginObjectName << " is used for non AIS viewer\n";
continue;
}
}
else
{
Standard_CString aName = anOriginObjectName.ToCString();
TopoDS_Shape aTDShape = DBRep::Get (aName);
if (aTDShape.IsNull())
{
std::cout << "vconnect error: object " << anOriginObjectName << " doesn't exist\n";
continue;
}
anObject = new AIS_Shape (aTDShape);
anObject->SetColor (ViewerTest::GetColorFromName (aColorName));
}
if (anOriginObject.IsNull())
{
anOriginObject = new AIS_MultipleConnectedInteractive();
Handle(AIS_MultipleConnectedInteractive)::DownCast(anOriginObject)->Connect (anObject);
}
else
{
Handle(AIS_MultipleConnectedInteractive)::DownCast(anOriginObject)->Connect (anObject);
}
}
if (anOriginObject.IsNull())
{
std::cout << "vconect error : can't connect input objects\n";
return 1; // TCL_ERROR return 1; // TCL_ERROR
} }
} }
// Get location data // Get location data
Standard_Real aXo = atof(argv[3]); Standard_Real aXo = atof (argv[anArgIter++]);
Standard_Real aYo = atof(argv[4]); Standard_Real aYo = atof (argv[anArgIter++]);
Standard_Real aZo = atof(argv[5]); Standard_Real aZo = atof (argv[anArgIter++]);
Standard_Real aXu = atof(argv[6]); Standard_Real aXu = atof (argv[anArgIter++]);
Standard_Real aXv = atof(argv[7]); Standard_Real aXv = atof (argv[anArgIter++]);
Standard_Real aXw = atof(argv[8]); Standard_Real aXw = atof (argv[anArgIter++]);
Standard_Real aZu = atof(argv[9]); Standard_Real aZu = atof (argv[anArgIter++]);
Standard_Real aZv = atof(argv[10]); Standard_Real aZv = atof (argv[anArgIter++]);
Standard_Real aZw = atof(argv[11]); Standard_Real aZw = atof (argv[anArgIter++]);
// Create transformation // Create transformation
gp_Pnt aPoint(aXo, aYo, aZo); gp_Pnt aPoint(aXo, aYo, aZo);
@ -3563,8 +3653,16 @@ static Standard_Integer VConnect(Draw_Interpretor& di,
TopLoc_Location aLocation(aTrsf); TopLoc_Location aLocation(aTrsf);
// Create connected object // Create connected object
Handle(AIS_ConnectedInteractive) aConnectedObject = new AIS_ConnectedInteractive(); Handle(AIS_ConnectedInteractive) aConnected = new AIS_ConnectedInteractive();
aConnectedObject->Connect(anOriginObject, aLocation); Handle(AIS_MultipleConnectedInteractive) anOrigin = Handle(AIS_MultipleConnectedInteractive)::DownCast(anOriginObject);
if (anOrigin.IsNull())
{
aConnected->Connect (anOriginObject, aLocation);
}
else
{
aConnected->Connect (anOrigin, aLocation);
}
// Check if there is another object with given name // Check if there is another object with given name
// and remove it from context // and remove it from context
@ -3576,11 +3674,11 @@ static Standard_Integer VConnect(Draw_Interpretor& di,
GetMapOfAIS().UnBind2(aName); GetMapOfAIS().UnBind2(aName);
} }
// Bind connected object to its name // Bind connected object to its name
GetMapOfAIS().Bind(aConnectedObject, aName); GetMapOfAIS().Bind (aConnected, aName);
// Display connected object // Display connected object
TheAISContext()->Display(aConnectedObject); TheAISContext()->Display (aConnected);
return 0; return 0;
} }
@ -3588,50 +3686,141 @@ static Standard_Integer VConnect(Draw_Interpretor& di,
//=============================================================================================== //===============================================================================================
//function : VConnectShape //function : VConnectShape
//purpose : Creates and displays AIS_ConnectedShape from input shape and location //purpose : Creates and displays AIS_ConnectedShape from input shape and location
//Draw arg : vconnectsh name shape Xo Yo Zo Xu Xv Xw Zu Zv Zw //Draw arg : vconnectsh name Xo Yo Zo Xu Xv Xw Zu Zv Zw shape1 shape2 ... [color=NAME]
//=============================================================================================== //===============================================================================================
static Standard_Integer VConnectShape(Draw_Interpretor& di, static Standard_Integer VConnectShape(Draw_Interpretor& di,
Standard_Integer argc, Standard_Integer argc,
const char ** argv) const char ** argv)
{ {
// Check argumnets // Check the viewer
if(argc != 12) Handle(AIS_InteractiveContext) aContext = ViewerTest::GetAISContext();
if (aContext.IsNull())
{ {
std::cout << "vconnectsh error: expect 11 argumnets\n"; std::cout << "vconnectsh error : call vinit before\n";
return 1; // TCL_ERROR return 1; // TCL_ERROR
} }
// Get values // Check argumnets
TCollection_AsciiString aName(argv[1]); if (argc < 12)
TCollection_AsciiString anOriginShapeName(argv[2]);
if(aName.IsEqual(anOriginShapeName))
{ {
std::cout << "vconnectsh error: equal names for connected shapes\n"; std::cout << "vconnectsh error: expect at least 11 arguments\n";
return 1; // TCL_ERROR return 1; // TCL_ERROR
} }
// Check if the origin shape is not null
// Get values
Standard_Integer anArgIter = 1;
TCollection_AsciiString aName (argv[anArgIter++]);
Handle(AIS_InteractiveObject) anOriginShape; Handle(AIS_InteractiveObject) anOriginShape;
if(GetMapOfAIS().IsBound2(anOriginShapeName)) TCollection_AsciiString aColorString(argv[argc-1]);
Standard_CString aColorName;
Standard_Boolean hasColor = Standard_False;
if (aColorString.Search ("color=") != -1)
{ {
Handle(Standard_Transient) anObj = GetMapOfAIS().Find2(anOriginShapeName); hasColor = Standard_True;
anOriginShape = Handle(AIS_InteractiveObject)::DownCast(anObj); aColorString.Remove (1, 6);
if(anOriginShape.IsNull()) aColorName = aColorString.ToCString();
}
Handle(AIS_Shape) aShape;
// AIS_ConnectedShape
if (argc == 12 || (argc == 13 && hasColor))
{
TCollection_AsciiString anOriginShapeName (argv[11]);
if (aName.IsEqual (anOriginShapeName))
{ {
std::cout << "Shape " << anOriginShapeName << " is used for non AIS viewer\n!"; std::cout << "vconnectsh error: equal names for connected shapes\n";
return 1; // TCL_ERROR
}
if (GetMapOfAIS().IsBound2 (anOriginShapeName))
{
Handle(Standard_Transient) anObj = GetMapOfAIS().Find2 (anOriginShapeName);
anOriginShape = Handle(AIS_Shape)::DownCast(anObj);
if (anOriginShape.IsNull())
{
std::cout << "Shape " << anOriginShapeName << " is used for non AIS viewer\n!";
return 1; // TCL_ERROR
}
}
else
{
Standard_CString aName = anOriginShapeName.ToCString();
TopoDS_Shape aTDShape = DBRep::Get (aName);
if (aTDShape.IsNull())
{
std::cout << "vconnectsh error: object " << anOriginShapeName << " doesn't exist\n";
return 1; // TCL_ERROR
}
anOriginShape = new AIS_Shape (aTDShape);
if (hasColor)
{
anOriginShape->SetColor (ViewerTest::GetColorFromName (aColorName));
}
}
}
// AIS_MultipleConnectedShape
else
{
const Standard_Integer aNbShapes = hasColor ? (argc - 1) : argc;
for (Standard_Integer i = 11; i < aNbShapes; ++i)
{
TCollection_AsciiString anOriginShapeName (argv[i]);
if (aName.IsEqual (anOriginShapeName))
{
std::cout << "vconnectsh error: equal names for connected shapes\n";
continue;
}
if (GetMapOfAIS().IsBound2 (anOriginShapeName))
{
Handle(Standard_Transient) anObj = GetMapOfAIS().Find2 (anOriginShapeName);
aShape = Handle(AIS_Shape)::DownCast(anObj);
if (aShape.IsNull())
{
std::cout << "Shape " << anOriginShapeName << " is used for non AIS viewer\n";
continue;
}
}
else
{
Standard_CString aName = anOriginShapeName.ToCString();
TopoDS_Shape aTDShape = DBRep::Get (aName);
if (aTDShape.IsNull())
{
std::cout << "vconnectsh error: object " << anOriginShapeName << " doesn't exist\n";
continue;
}
aShape = new AIS_Shape (aTDShape);
if (hasColor)
{
aShape->SetColor (ViewerTest::GetColorFromName (aColorName));
}
}
if (anOriginShape.IsNull())
{
anOriginShape = new AIS_MultipleConnectedShape (aShape->Shape());
Handle(AIS_MultipleConnectedShape)::DownCast(anOriginShape)->Connect (aShape);
}
else
{
Handle(AIS_MultipleConnectedShape)::DownCast(anOriginShape)->Connect (aShape);
}
}
if (anOriginShape.IsNull())
{
std::cout << "vconectsh error : can't connect input objects\n";
return 1; // TCL_ERROR return 1; // TCL_ERROR
} }
} }
// Get location data // Get location data
Standard_Real aXo = atof(argv[3]); Standard_Real aXo = atof (argv[anArgIter++]);
Standard_Real aYo = atof(argv[4]); Standard_Real aYo = atof (argv[anArgIter++]);
Standard_Real aZo = atof(argv[5]); Standard_Real aZo = atof (argv[anArgIter++]);
Standard_Real aXu = atof(argv[6]); Standard_Real aXu = atof (argv[anArgIter++]);
Standard_Real aXv = atof(argv[7]); Standard_Real aXv = atof (argv[anArgIter++]);
Standard_Real aXw = atof(argv[8]); Standard_Real aXw = atof (argv[anArgIter++]);
Standard_Real aZu = atof(argv[9]); Standard_Real aZu = atof (argv[anArgIter++]);
Standard_Real aZv = atof(argv[10]); Standard_Real aZv = atof (argv[anArgIter++]);
Standard_Real aZw = atof(argv[11]); Standard_Real aZw = atof (argv[anArgIter++]);
// Create transformation // Create transformation
gp_Pnt aPoint(aXo, aYo, aZo); gp_Pnt aPoint(aXo, aYo, aZo);
@ -3647,9 +3836,18 @@ static Standard_Integer VConnectShape(Draw_Interpretor& di,
TopLoc_Location aLocation(aTrsf); TopLoc_Location aLocation(aTrsf);
// Create connected shape // Create connected shape
Handle(AIS_Shape) aShape = Handle(AIS_Shape)::DownCast(anOriginShape); Handle(AIS_ConnectedInteractive) aConnected;
Handle(AIS_ConnectedShape) aConnectedShape = new AIS_ConnectedShape(aShape); Handle(AIS_Shape) anOrigin = Handle(AIS_Shape)::DownCast(anOriginShape);
aConnectedShape->Connect(anOriginShape, aLocation); if (!anOrigin.IsNull())
{
aConnected = new AIS_ConnectedShape (anOrigin);
aConnected->Connect (anOrigin, aLocation);
}
else
{
aConnected = new AIS_ConnectedInteractive();
aConnected->Connect (anOriginShape, aLocation);
}
// Check if there is another object with given name // Check if there is another object with given name
// and remove it from context // and remove it from context
@ -3661,11 +3859,11 @@ static Standard_Integer VConnectShape(Draw_Interpretor& di,
GetMapOfAIS().UnBind2(aName); GetMapOfAIS().UnBind2(aName);
} }
// Bind connected shape to its name // Bind connected shape to its name
GetMapOfAIS().Bind(aConnectedShape, aName); GetMapOfAIS().Bind (aConnected, aName);
// Display connected shape // Display connected shape
TheAISContext()->Display(aConnectedShape); TheAISContext()->Display (aConnected);
return 0; return 0;
} }
@ -4487,11 +4685,11 @@ void ViewerTest::ObjectCommands(Draw_Interpretor& theCommands)
__FILE__,VDrawPArray,group); __FILE__,VDrawPArray,group);
theCommands.Add("vconnect", theCommands.Add("vconnect",
"vconnect : name object Xo Yo Zo Xu Xv Xw Zu Zv Zw", "vconnect : name Xo Yo Zo Xu Xv Xw Zu Zv Zw object1 object2 ... [color=NAME]",
__FILE__, VConnect, group); __FILE__, VConnect, group);
theCommands.Add("vconnectsh", theCommands.Add("vconnectsh",
"vconnectsh : name shape Xo Yo Zo Xu Xv Xw Zu Zv Zw", "vconnectsh : name Xo Yo Zo Xu Xv Xw Zu Zv Zw shape1 shape2 ... [color=NAME]",
__FILE__, VConnectShape, group); __FILE__, VConnectShape, group);
theCommands.Add("vselmode", theCommands.Add("vselmode",