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

0030452: Visualization - SelectMgr_ViewerSelector::Deactivate() raises exception when called twice

Browse Source 
Removed unused SelectMgr_SOS_Sleeping enumeration value.
SelectMgr_ViewerSelector::Deactivate() now checks activation status before updating tolerance map.
This commit is contained in:
kgv 2019-01-21 15:31:02 +03:00 committed by bugmaster
parent c29c0ad0a2
commit 82d23ad590
3 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/SelectMgr/SelectMgr_StateOfSelection.hxx
View File

@ -20,11 +20,10 @@
//! different state of a Selection in a ViewerSelector... //! different state of a Selection in a ViewerSelector...
enum SelectMgr_StateOfSelection enum SelectMgr_StateOfSelection
{ {
SelectMgr_SOS_Activated, SelectMgr_SOS_Any = -2, //!< ANY selection state (for querying selections)
SelectMgr_SOS_Deactivated, SelectMgr_SOS_Unknown = -1, //!< selection, which has never been in SelectMgr_SOS_Activated state (almost the same thing as SelectMgr_SOS_Deactivated)
SelectMgr_SOS_Sleeping, SelectMgr_SOS_Deactivated = 0, //!< deactivated selection, once been in SelectMgr_SOS_Activated state
SelectMgr_SOS_Any, SelectMgr_SOS_Activated, //!< activated selection
SelectMgr_SOS_Unknown
}; };
#endif // _SelectMgr_StateOfSelection_HeaderFile #endif // _SelectMgr_StateOfSelection_HeaderFile

34
src/SelectMgr/SelectMgr_ViewerSelector.cxx
View File

@ -137,10 +137,13 @@ void SelectMgr_ViewerSelector::Activate (const Handle(SelectMgr_Selection)& theS
aSelEntIter.Value()->SetActiveForSelection(); aSelEntIter.Value()->SetActiveForSelection();
} }
theSelection->SetSelectionState (SelectMgr_SOS_Activated); if (theSelection->GetSelectionState() != SelectMgr_SOS_Activated)
{
theSelection->SetSelectionState (SelectMgr_SOS_Activated);
myTolerances.Add (theSelection->Sensitivity()); myTolerances.Add (theSelection->Sensitivity());
myToUpdateTolerance = Standard_True; myToUpdateTolerance = Standard_True;
}
} }
//================================================== //==================================================
@ -154,10 +157,13 @@ void SelectMgr_ViewerSelector::Deactivate (const Handle(SelectMgr_Selection)& th
aSelEntIter.Value()->ResetSelectionActiveStatus(); aSelEntIter.Value()->ResetSelectionActiveStatus();
} }
theSelection->SetSelectionState (SelectMgr_SOS_Deactivated); if (theSelection->GetSelectionState() == SelectMgr_SOS_Activated)
{
theSelection->SetSelectionState (SelectMgr_SOS_Deactivated);
myTolerances.Decrement (theSelection->Sensitivity()); myTolerances.Decrement (theSelection->Sensitivity());
myToUpdateTolerance = Standard_True; myToUpdateTolerance = Standard_True;
}
} }
//================================================== //==================================================
@ -721,14 +727,14 @@ Standard_Boolean SelectMgr_ViewerSelector::Modes (const Handle(SelectMgr_Selecta
Standard_Boolean hasActivatedStates = Contains (theSelectableObject); Standard_Boolean hasActivatedStates = Contains (theSelectableObject);
for (SelectMgr_SequenceOfSelection::Iterator aSelIter (theSelectableObject->Selections()); aSelIter.More(); aSelIter.Next()) for (SelectMgr_SequenceOfSelection::Iterator aSelIter (theSelectableObject->Selections()); aSelIter.More(); aSelIter.Next())
{ {
if (theWantedState == SelectMgr_SOS_Any) if (theWantedState == SelectMgr_SOS_Any)
{ {
theModeList.Append (aSelIter.Value()->Mode()); theModeList.Append (aSelIter.Value()->Mode());
} }
else if (theWantedState == aSelIter.Value()->GetSelectionState()) else if (theWantedState == aSelIter.Value()->GetSelectionState())
{ {
theModeList.Append (aSelIter.Value()->Mode()); theModeList.Append (aSelIter.Value()->Mode());
} }
} }
return hasActivatedStates; return hasActivatedStates;

5
tools/VInspector/VInspector_Tools.cxx
View File

@ -402,11 +402,10 @@ TCollection_AsciiString VInspector_Tools::ToName (const VInspector_SelectionType
{ {
switch (theValue) switch (theValue)
{ {
case SelectMgr_SOS_Activated: return "Activated";
case SelectMgr_SOS_Deactivated: return "Deactivated";
case SelectMgr_SOS_Sleeping: return "Sleeping";
case SelectMgr_SOS_Any: return "Any"; case SelectMgr_SOS_Any: return "Any";
case SelectMgr_SOS_Unknown: return "Unknown"; case SelectMgr_SOS_Unknown: return "Unknown";
case SelectMgr_SOS_Activated: return "Activated";
case SelectMgr_SOS_Deactivated: return "Deactivated";
default: break; default: break;
} }
} }