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

0032487: Visualization - synchronize myHasEntityWithPersistence with such entities number

Browse Source 
Changed myHasEntityWithPersistence to a counter.
Renamed variable to myNbEntityWithPersistence.
Modified HasEntityWithPersistence() method.
Modified logical test in SelectMgr_ViewerSelector::traverseObject.
This commit is contained in:
drochalo 2023-10-26 11:43:19 +01:00 committed by mzernova
parent bd2a789f15
commit f2462e26e4
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/SelectMgr/SelectMgr_SensitiveEntitySet.cxx
View File

@ -28,7 +28,7 @@ IMPLEMENT_STANDARD_RTTIEXT(SelectMgr_SensitiveEntitySet, BVH_PrimitiveSet3d)
SelectMgr_SensitiveEntitySet::SelectMgr_SensitiveEntitySet (const Handle(Select3D_BVHBuilder3d)& theBuilder) SelectMgr_SensitiveEntitySet::SelectMgr_SensitiveEntitySet (const Handle(Select3D_BVHBuilder3d)& theBuilder)
: BVH_PrimitiveSet3d (theBuilder) : BVH_PrimitiveSet3d (theBuilder)
{ {
// myNbEntityWithPersistence = 0;
} }
//======================================================================= //=======================================================================
@ -42,7 +42,6 @@ void SelectMgr_SensitiveEntitySet::Append (const Handle(SelectMgr_SensitiveEntit
theEntity->ResetSelectionActiveStatus(); theEntity->ResetSelectionActiveStatus();
return; return;
} }
const Standard_Integer anExtent = mySensitives.Extent(); const Standard_Integer anExtent = mySensitives.Extent();
if (mySensitives.Add (theEntity) > anExtent) if (mySensitives.Add (theEntity) > anExtent)
{ {
@ -50,7 +49,7 @@ void SelectMgr_SensitiveEntitySet::Append (const Handle(SelectMgr_SensitiveEntit
} }
if (!theEntity->BaseSensitive()->TransformPersistence().IsNull()) if (!theEntity->BaseSensitive()->TransformPersistence().IsNull())
{ {
myHasEntityWithPersistence = Standard_True; ++myNbEntityWithPersistence;
} }
MarkDirty(); MarkDirty();
} }
@ -78,7 +77,7 @@ void SelectMgr_SensitiveEntitySet::Append (const Handle(SelectMgr_Selection)& th
} }
if (!aSensEnt->BaseSensitive()->TransformPersistence().IsNull()) if (!aSensEnt->BaseSensitive()->TransformPersistence().IsNull())
{ {
myHasEntityWithPersistence = Standard_True; ++myNbEntityWithPersistence;
} }
} }
MarkDirty(); MarkDirty();
@ -93,7 +92,8 @@ void SelectMgr_SensitiveEntitySet::Remove (const Handle(SelectMgr_Selection)& th
{ {
for (NCollection_Vector<Handle(SelectMgr_SensitiveEntity)>::Iterator aSelEntIter (theSelection->Entities()); aSelEntIter.More(); aSelEntIter.Next()) for (NCollection_Vector<Handle(SelectMgr_SensitiveEntity)>::Iterator aSelEntIter (theSelection->Entities()); aSelEntIter.More(); aSelEntIter.Next())
{ {
const Standard_Integer anEntIdx = mySensitives.FindIndex (aSelEntIter.Value()); const Handle(SelectMgr_SensitiveEntity)& aSensEnt = aSelEntIter.Value();
const Standard_Integer anEntIdx = mySensitives.FindIndex (aSensEnt);
if (anEntIdx == 0) if (anEntIdx == 0)
{ {
continue; continue;
@ -103,9 +103,13 @@ void SelectMgr_SensitiveEntitySet::Remove (const Handle(SelectMgr_Selection)& th
{ {
Swap (anEntIdx - 1, mySensitives.Size() - 1); Swap (anEntIdx - 1, mySensitives.Size() - 1);
} }
if (!aSensEnt->BaseSensitive()->TransformPersistence().IsNull())
{
--myNbEntityWithPersistence;
}
mySensitives.RemoveLast(); mySensitives.RemoveLast();
removeOwner (aSelEntIter.Value()->BaseSensitive()->OwnerId()); removeOwner (aSensEnt->BaseSensitive()->OwnerId());
} }
MarkDirty(); MarkDirty();

8
src/SelectMgr/SelectMgr_SensitiveEntitySet.hxx
View File

@ -77,7 +77,7 @@ public:
const SelectMgr_MapOfOwners& Owners() const { return myOwnersMap; } const SelectMgr_MapOfOwners& Owners() const { return myOwnersMap; }
//! Returns map of entities. //! Returns map of entities.
Standard_Boolean HasEntityWithPersistence() const { return myHasEntityWithPersistence; } Standard_Boolean HasEntityWithPersistence() const { return myNbEntityWithPersistence > 0; }
protected: protected:
@ -89,9 +89,9 @@ protected:
private: private:
SelectMgr_IndexedMapOfHSensitive mySensitives; //!< Map of entities and its corresponding index in BVH SelectMgr_IndexedMapOfHSensitive mySensitives; //!< Map of entities and its corresponding index in BVH
SelectMgr_MapOfOwners myOwnersMap; //!< Map of entity owners and its corresponding number of sensitives SelectMgr_MapOfOwners myOwnersMap; //!< Map of entity owners and its corresponding number of sensitives
Standard_Boolean myHasEntityWithPersistence; //!< flag if some of sensitive entity has own transform persistence Standard_Integer myNbEntityWithPersistence; //!< number of sensitive entities that have own transform persistence
}; };
#endif // _SelectMgr_SensitiveEntitySet_HeaderFile #endif // _SelectMgr_SensitiveEntitySet_HeaderFile