OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-05-16 10:54:53 +03:00
Code

0030866: Visualization - remove map of AIS_Manipulator from ViewerText

Browse Source 
ViewerTest_MapOfAISManipulators and ViewerTest_AISManipulator have been removed from ViewerTest
This commit is contained in:
mzernova 2019-09-13 15:13:29 +03:00 committed by bugmaster
parent cd58de63de
commit 8b037fe4ea
1 changed files with 7 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/ViewerTest/ViewerTest_ViewerCommands.cxx
View File

@ -1346,27 +1346,6 @@ namespace
} // namespace } // namespace
typedef NCollection_Map<AIS_Manipulator*> ViewerTest_MapOfAISManipulators;
Standard_EXPORT ViewerTest_MapOfAISManipulators& GetMapOfAISManipulators()
{
static ViewerTest_MapOfAISManipulators aMap;
return aMap;
}
Standard_EXPORT Handle(AIS_Manipulator) GetActiveAISManipulator()
{
ViewerTest_MapOfAISManipulators::Iterator anIt (GetMapOfAISManipulators());
for (; anIt.More(); anIt.Next())
{
if (anIt.Value()->HasActiveMode())
{
return anIt.Value();
}
}
return NULL;
}
//============================================================================== //==============================================================================
#ifdef _WIN32 #ifdef _WIN32
@ -12477,32 +12456,6 @@ static Standard_Integer VXRotate (Draw_Interpretor& di,
return 0; return 0;
} }
//===============================================================================================
//class : ViewerTest_AISManipulator
//purpose : Proxy class maintaining automated registry map to enlist existing AIS_Manipulator instances
//===============================================================================================
DEFINE_STANDARD_HANDLE (ViewerTest_AISManipulator, AIS_Manipulator)
class ViewerTest_AISManipulator : public AIS_Manipulator
{
public:
ViewerTest_AISManipulator() : AIS_Manipulator()
{
GetMapOfAISManipulators().Add (this);
}
virtual ~ViewerTest_AISManipulator()
{
GetMapOfAISManipulators().Remove (this);
}
DEFINE_STANDARD_RTTIEXT(ViewerTest_AISManipulator, AIS_Manipulator)
};
IMPLEMENT_STANDARD_HANDLE (ViewerTest_AISManipulator, AIS_Manipulator)
IMPLEMENT_STANDARD_RTTIEXT(ViewerTest_AISManipulator, AIS_Manipulator)
//=============================================================================================== //===============================================================================================
//function : VManipulator //function : VManipulator
//purpose : //purpose :
@ -12609,7 +12562,7 @@ static int VManipulator (Draw_Interpretor& theDi,
{ {
std::cout << theArgVec[0] << ": AIS object \"" << aName << "\" has been created.\n"; std::cout << theArgVec[0] << ": AIS object \"" << aName << "\" has been created.\n";
aManipulator = new ViewerTest_AISManipulator(); aManipulator = new AIS_Manipulator();
aManipulator->SetModeActivationOnDetection (true); aManipulator->SetModeActivationOnDetection (true);
aMapAIS.Bind (aManipulator, aName); aMapAIS.Bind (aManipulator, aName);
} }
@ -12715,10 +12668,13 @@ static int VManipulator (Draw_Interpretor& theDi,
return 1; return 1;
} }
for (ViewerTest_MapOfAISManipulators::Iterator anIt (GetMapOfAISManipulators()); anIt.More(); anIt.Next()) for (ViewerTest_DoubleMapIteratorOfDoubleMapOfInteractiveAndName anIter (aMapAIS);
anIter.More(); anIter.Next())
{ {
if (anIt.Value()->IsAttached() Handle(AIS_Manipulator) aManip = Handle(AIS_Manipulator)::DownCast (anIter.Key1());
&& anIt.Value()->Object() == anObject) if (!aManip.IsNull()
&& aManip->IsAttached()
&& aManip->Object() == anObject)
{ {
std::cerr << theArgVec[0] << " error: AIS object \"" << anObjName << "\" already has manipulator.\n"; std::cerr << theArgVec[0] << " error: AIS object \"" << anObjName << "\" already has manipulator.\n";
return 1; return 1;