OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-09 13:22:24 +03:00
Code Activity

0023654: Problem with displaying vertices in OCC view after closing all OCC views and opening new one

Browse Source 
Fixed graphic structure recompute after closing view.
Removed collector and all corresponding logic and methods from AIS_InteractiveContext.
Method AIS_InteractiveContext::Erase() now hide object from viewer without deleting resources.
Erased objects now properly recomputed after closing view.
Samples update
Removed useless method AIS_InteractiveContext::EraseMode()
Documentation update
Warnings fix
Regressions fix
This commit is contained in:
dbv
2013-10-03 14:11:13 +04:00
committed by bugmaster
parent 3ed30348aa
commit eb4320f2d9
45 changed files with 826 additions and 1256 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/AIS/AIS_InteractiveContext_1.cxx
View File

@@ -146,7 +146,7 @@ AIS_StatusOfDetection AIS_InteractiveContext::MoveTo(const Standard_Integer XPix
const Standard_Integer YPix,
const Handle(V3d_View)& aView)
{
if(HasOpenedContext()&& aView->Viewer()!=myCollectorVwr){
if(HasOpenedContext()){
myWasLastMain = Standard_True;
return myLocalContexts(myCurLocalIndex)->MoveTo(XPix,YPix,aView);
}
@@ -169,13 +169,6 @@ AIS_StatusOfDetection AIS_InteractiveContext::MoveTo(const Standard_Integer XPix
myLastPicked = myLastinMain;
myWasLastMain = Standard_True;
}
else if (aView->Viewer()== myCollectorVwr){
pmgr = myCollectorPM;
selector=myCollectorSel;
myLastPicked = myLastinColl;
ismain = Standard_False;
myWasLastMain = Standard_False;
}
else
return AIS_SOD_Error;
@@ -247,8 +240,6 @@ AIS_StatusOfDetection AIS_InteractiveContext::MoveTo(const Standard_Integer XPix
if ( ismain )
myLastinMain = myLastPicked;
else
myLastinColl = myLastPicked;
#ifdef IMP191001
// Highlight detected object if it is not selected or myToHilightSelected flag is true
if ( !myLastPicked.IsNull() &&
@@ -289,8 +280,6 @@ AIS_StatusOfDetection AIS_InteractiveContext::MoveTo(const Standard_Integer XPix
if ( ismain )
myLastinMain.Nullify();
else
myLastinColl.Nullify();
}
if(UpdVwr) aView->Viewer()->Update();
@@ -325,12 +314,7 @@ AIS_StatusOfPick AIS_InteractiveContext::Select(const Standard_Integer XPMin,
if(aView->Viewer()== myMainVwr) {
selector= myMainSel;
myWasLastMain = Standard_True;}
else if (aView->Viewer()==myCollectorVwr){
selector= myCollectorSel;
myWasLastMain = Standard_False;}
selector->Pick(XPMin,YPMin,XPMax,YPMax,aView);
AIS_Selection::SetCurrentSelection(myCurrentName.ToCString());
@@ -395,12 +379,7 @@ AIS_StatusOfPick AIS_InteractiveContext::Select(const TColgp_Array1OfPnt2d& aPol
if(aView->Viewer()== myMainVwr) {
selector= myMainSel;
myWasLastMain = Standard_True;}
else if (aView->Viewer()==myCollectorVwr){
selector= myCollectorSel;
myWasLastMain = Standard_False;}
selector->Pick(aPolyline,aView);
AIS_Selection::SetCurrentSelection(myCurrentName.ToCString());
@@ -467,12 +446,6 @@ AIS_StatusOfPick AIS_InteractiveContext::Select(const Standard_Boolean updatevie
if(updateviewer)
UpdateCurrentViewer();}
}
else if (!myWasLastMain && !myLastinColl.IsNull()){
if(myLastinColl->State()!=1){
SetCurrentObject(myLastinColl,Standard_False);
if(updateviewer)
UpdateCollector();}
}
else{
AIS_Selection::SetCurrentSelection(myCurrentName.ToCString());
Handle(AIS_Selection) S = AIS_Selection::CurrentSelection();
@@ -493,9 +466,7 @@ AIS_StatusOfPick AIS_InteractiveContext::Select(const Standard_Boolean updatevie
AIS_Selection::Select();
if(updateviewer){
if(myWasLastMain)
UpdateCurrentViewer();
else
UpdateCollector();
UpdateCurrentViewer();
}
}
Standard_Integer NS = NbCurrents();
@@ -524,10 +495,7 @@ AIS_StatusOfPick AIS_InteractiveContext::ShiftSelect(const Standard_Boolean upda
}
if(myWasLastMain && !myLastinMain.IsNull())
AddOrRemoveCurrentObject(myLastinMain,updateviewer);
else if (!myWasLastMain && !myLastinColl.IsNull())
AddOrRemoveCurrentObject(myLastinColl,updateviewer);
Standard_Integer NS = NbCurrents();
if(NS==0) return AIS_SOP_NothingSelected;
if(NS==1) return AIS_SOP_OneSelected;
@@ -558,10 +526,6 @@ AIS_StatusOfPick AIS_InteractiveContext::ShiftSelect(const Standard_Integer XPMi
if(aView->Viewer()== myMainVwr) {
selector= myMainSel;
myWasLastMain = Standard_True;}
else if (aView->Viewer()==myCollectorVwr){
selector= myCollectorSel;
myWasLastMain = Standard_False;}
else
return AIS_SOP_NothingSelected;
@@ -605,10 +569,6 @@ AIS_StatusOfPick AIS_InteractiveContext::ShiftSelect( const TColgp_Array1OfPnt2d
selector= myMainSel;
myWasLastMain = Standard_True;
}
else if ( aView->Viewer() == myCollectorVwr ) {
selector= myCollectorSel;
myWasLastMain = Standard_False;
}
else
return AIS_SOP_NothingSelected;