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

0026628: Button Erase (Delete where erase algorythm is used) works incorrect

Browse Source 
Update AIS_InteractiveContext::EraseSelected() method.

Fix HLR sample

Fix samples.
This commit is contained in:
isk 2015-09-10 17:26:45 +03:00 committed by bugmaster
parent 8a53d1c486
commit 7140edaf8e
6 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
samples/CSharp/OCCTProxy/OCCTProxy.cpp
View File

@ -579,10 +579,8 @@ public:
{
return;
}
for(myAISContext()->InitCurrent();myAISContext()->MoreCurrent();myAISContext()->NextCurrent())
{
myAISContext()->Erase(myAISContext()->Current(),Standard_True);
}
myAISContext()->EraseSelected (Standard_True);
myAISContext()->ClearCurrents();
}

6
samples/CSharp/OCCTProxy_D3D/OCCTProxyD3D.cpp
View File

@ -581,10 +581,8 @@ public:
{
return;
}
for(myAISContext()->InitCurrent(); myAISContext()->MoreCurrent(); myAISContext()->NextCurrent())
{
myAISContext()->Erase (myAISContext()->Current(), Standard_True);
}
myAISContext()->EraseSelected (Standard_True);
myAISContext()->ClearCurrents();
}

7
samples/mfc/standard/08_HLR/src/HLRDoc.cpp
View File

@ -188,14 +188,17 @@ void CHLRDoc::Fit()
void CHLRDoc::OnObjectErase()
{
Standard_Boolean toUpdateDisplayable = Standard_False;
for (myAISContext->InitCurrent(); myAISContext->MoreCurrent(); myAISContext->NextCurrent())
myAISContext->InitCurrent();
while (myAISContext->MoreCurrent())
{
myAISContext->Erase (myAISContext->Current(), Standard_True);
if (myAISContext->Current()->Type() == AIS_KOI_Shape && myCSelectionDialogIsCreated)
{
myCSelectionDialog->DiplayableShape()->Remove (Handle(AIS_Shape)::DownCast (myAISContext->Current())->Shape());
toUpdateDisplayable = Standard_True;
}
myAISContext->Erase (myAISContext->Current(), Standard_True);
myAISContext->InitCurrent();
}
myAISContext->ClearCurrents();

5
samples/mfc/standard/Common/OCC_3dBaseDoc.cpp
View File

@ -293,10 +293,7 @@ void OCC_3dBaseDoc::OnUpdateObjectColor(CCmdUI* pCmdUI)
void OCC_3dBaseDoc::OnObjectErase()
{
for (myAISContext->InitCurrent(); myAISContext->MoreCurrent(); myAISContext->NextCurrent())
{
myAISContext->Erase (myAISContext->Current(), Standard_True);
}
myAISContext->EraseSelected();
myAISContext->ClearCurrents();
}
void OCC_3dBaseDoc::OnUpdateObjectErase(CCmdUI* pCmdUI)

3
samples/qt/Common/src/DocumentCommon.cxx
View File

@ -234,8 +234,7 @@ void DocumentCommon::onTransparency()
void DocumentCommon::onDelete()
{
for ( myContext->InitCurrent(); myContext->MoreCurrent(); myContext->NextCurrent() )
myContext->Erase( myContext->Current(), false);
myContext->EraseSelected (Standard_False);
myContext->ClearSelected();
getApplication()->onSelectionChanged();
}

10
src/AIS/AIS_InteractiveContext.cxx
View File

@ -724,11 +724,17 @@ void AIS_InteractiveContext::EraseSelected (const Standard_Boolean theToUpdateVi
Standard_Boolean isFound = Standard_False;
Handle(AIS_Selection) aSelIter = AIS_Selection::Selection(myCurrentName.ToCString());
for (aSelIter->Init(); aSelIter->More(); aSelIter->Next())
aSelIter->Init();
while (aSelIter->More())
{
Handle(AIS_InteractiveObject) anObj = Handle(AIS_InteractiveObject)::DownCast (aSelIter->Value());
Handle(SelectMgr_EntityOwner) anOwner = Handle(SelectMgr_EntityOwner)::DownCast (aSelIter->Value());
Handle(AIS_InteractiveObject) anObj = Handle(AIS_InteractiveObject)::DownCast (anOwner->Selectable());
Erase (anObj, Standard_False);
isFound = Standard_True;
aSelIter->Init();
}
if (isFound && theToUpdateViewer)