OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0023649: Visualization, AIS_LocalContext - make highlighting of already selected objects consistent with and without Shift modifier

Browse Source 
1) Add SelectMgr_EntityOwner::IsSelected() and  SelectMgr_EntityOwner::SetSelected() methods to determine if corresponding  entity is selected.
    They replace functionality of SelectMgr_EntityOwner::State() methods that are deprecated now.
2) AIS_InteractiveContext::ToHilightSelected() and AIS_InteractiveContext::SetToHilightSelected() is to be used to enable highlighting of selected objects.
3) By default selected objects are highlighted (new behavior)
4) Add ViewerTest_ViewerCommands: vhighlightselected command to enable/disable 'highlight selected objects' mode.
5) AIS_LocalContext, AIS_InteractiveContext : style changes in Select and ShiftSelect methods.
6) Add test cases /bugs/vis bug23649_1 and  /bugs/vis bug23649_2 to test highlighting of selected objects in local context.
7) Add test cases /bugs/vis bug23649_3 and  /bugs/vis bug23649_4  to test highlighting of selected objects in neutral point.

Updated test case
This commit is contained in:
aba 2014-08-14 12:20:09 +04:00 committed by bugmaster
parent 5b98e25d8e
commit c398b00ed8
17 changed files with 803 additions and 570 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/AIS/AIS_InteractiveContext.cxx
View File

@ -121,7 +121,7 @@ mgrSelector(new SelectMgr_SelectionManager()),
myMainPM(new PrsMgr_PresentationManager3d(MainViewer->Viewer())), myMainPM(new PrsMgr_PresentationManager3d(MainViewer->Viewer())),
myMainVwr(MainViewer), myMainVwr(MainViewer),
myMainSel(new StdSelect_ViewerSelector3d()), myMainSel(new StdSelect_ViewerSelector3d()),
myToHilightSelected( Standard_False ), myToHilightSelected( Standard_True ),
myFilters(new SelectMgr_OrFilter()), myFilters(new SelectMgr_OrFilter()),
myDefaultDrawer(new Prs3d_Drawer()), myDefaultDrawer(new Prs3d_Drawer()),
myDefaultColor(Quantity_NOC_GOLDENROD), myDefaultColor(Quantity_NOC_GOLDENROD),

389
src/AIS/AIS_InteractiveContext_1.cxx
View File

@ -267,67 +267,61 @@ AIS_StatusOfDetection AIS_InteractiveContext::MoveTo (const Standard_Integer th
//function : Select //function : Select
//purpose : //purpose :
//======================================================================= //=======================================================================
AIS_StatusOfPick AIS_InteractiveContext::Select (const Standard_Integer theXPMin,
AIS_StatusOfPick AIS_InteractiveContext::Select(const Standard_Integer XPMin, const Standard_Integer theYPMin,
const Standard_Integer YPMin, const Standard_Integer theXPMax,
const Standard_Integer XPMax, const Standard_Integer theYPMax,
const Standard_Integer YPMax, const Handle(V3d_View)& theView,
const Handle(V3d_View)& aView, const Standard_Boolean toUpdateViewer)
const Standard_Boolean updateviewer)
{ {
// all objects detected by the selector are taken, previous current objects are emptied, // all objects detected by the selector are taken, previous current objects are emptied,
// new objects are put... // new objects are put...
if (HasOpenedContext()) if (HasOpenedContext())
return myLocalContexts(myCurLocalIndex)->Select(XPMin,YPMin,XPMax,YPMax,aView,updateviewer); {
return myLocalContexts(myCurLocalIndex)->Select (theXPMin, theYPMin,
theXPMax, theYPMax,
theView, toUpdateViewer);
}
ClearCurrents (Standard_False); ClearCurrents (Standard_False);
// OCC11904 - local variables made non-static - it looks and works better like this
Handle(StdSelect_ViewerSelector3d) selector;
if(aView->Viewer()== myMainVwr) { Handle(StdSelect_ViewerSelector3d) aSelector;
selector= myMainSel;
myWasLastMain = Standard_True;}
selector->Pick(XPMin,YPMin,XPMax,YPMax,aView); if (theView->Viewer() == myMainVwr)
{
aSelector = myMainSel;
myWasLastMain = Standard_True;
}
aSelector->Pick (theXPMin, theYPMin, theXPMax, theYPMax, theView);
AIS_Selection::SetCurrentSelection (myCurrentName.ToCString()); AIS_Selection::SetCurrentSelection (myCurrentName.ToCString());
#ifdef OCC9657 AIS_MapOfInteractive anObjectsToSelect;
AIS_MapOfInteractive theSelectedObj; for (aSelector->Init(); aSelector->More(); aSelector->Next())
for( selector->Init(); selector->More(); selector->Next() )
{ {
Handle(AIS_InteractiveObject) anObj = Handle(AIS_InteractiveObject) anObj =
Handle( AIS_InteractiveObject )::DownCast( selector->Picked()->Selectable() ); Handle(AIS_InteractiveObject)::DownCast (aSelector->Picked()->Selectable());
if (!anObj.IsNull()) if (!anObj.IsNull())
theSelectedObj.Add( anObj ); {
anObjectsToSelect.Add (anObj);
} }
AIS_MapIteratorOfMapOfInteractive anIt( theSelectedObj ); }
AIS_MapIteratorOfMapOfInteractive anIt (anObjectsToSelect);
for ( ; anIt.More(); anIt.Next()) for ( ; anIt.More(); anIt.Next())
{ {
AIS_Selection::Select (anIt.Key()); AIS_Selection::Select (anIt.Key());
anIt.Key()->State (1); anIt.Key()->State (1);
} }
#else
for(selector->Init();selector->More();selector->Next()){
const Handle(SelectMgr_SelectableObject)& SO = selector->Picked()->Selectable();
if(!SO.IsNull()){
#ifdef OCC138
AIS_Selection::Select(SO);
(*((Handle(AIS_InteractiveObject)*)&SO))->State(1);
#else
(*((Handle(AIS_InteractiveObject)*)&SO))->State(1);
AIS_Selection::Select(SO);
#endif //OCC138
}
}
#endif //OCC9657 HilightCurrents (toUpdateViewer);
HilightCurrents(updateviewer);
Standard_Integer NS = NbCurrents(); Standard_Integer aSelNum = NbCurrents();
if(NS==0) return AIS_SOP_NothingSelected;
if(NS==1) return AIS_SOP_OneSelected; return (aSelNum == 0) ? AIS_SOP_NothingSelected
return AIS_SOP_SeveralSelected; : (aSelNum == 1) ? AIS_SOP_OneSelected
: AIS_SOP_SeveralSelected;
} }
@ -335,64 +329,56 @@ AIS_StatusOfPick AIS_InteractiveContext::Select(const Standard_Integer XPMin,
//function : Select //function : Select
//purpose : Selection by polyline //purpose : Selection by polyline
//======================================================================= //=======================================================================
AIS_StatusOfPick AIS_InteractiveContext::Select (const TColgp_Array1OfPnt2d& thePolyline,
AIS_StatusOfPick AIS_InteractiveContext::Select(const TColgp_Array1OfPnt2d& aPolyline, const Handle(V3d_View)& theView,
const Handle(V3d_View)& aView, const Standard_Boolean toUpdateViewer)
const Standard_Boolean updateviewer)
{ {
// all objects detected by the selector are taken, previous current objects are emptied, // all objects detected by the selector are taken, previous current objects are emptied,
// new objects are put... // new objects are put...
if (HasOpenedContext()) if (HasOpenedContext())
return myLocalContexts(myCurLocalIndex)->Select(aPolyline,aView,updateviewer); {
return myLocalContexts(myCurLocalIndex)->Select (thePolyline, theView, toUpdateViewer);
}
ClearCurrents (Standard_False); ClearCurrents (Standard_False);
// OCC11904 - local variables made non-static - it looks and works better like this
Handle(StdSelect_ViewerSelector3d) selector;
if(aView->Viewer()== myMainVwr) { Handle(StdSelect_ViewerSelector3d) aSelector;
selector= myMainSel;
myWasLastMain = Standard_True;}
selector->Pick(aPolyline,aView); if (theView->Viewer() == myMainVwr)
{
aSelector = myMainSel;
myWasLastMain = Standard_True;
}
aSelector->Pick (thePolyline, theView);
AIS_Selection::SetCurrentSelection (myCurrentName.ToCString()); AIS_Selection::SetCurrentSelection (myCurrentName.ToCString());
AIS_MapOfInteractive anObjectsToSelect;
#ifdef OCC9657 for (aSelector->Init(); aSelector->More(); aSelector->Next())
AIS_MapOfInteractive theSelectedObj;
for( selector->Init(); selector->More(); selector->Next() )
{ {
Handle(AIS_InteractiveObject) anObj = Handle(AIS_InteractiveObject) anObj =
Handle( AIS_InteractiveObject )::DownCast( selector->Picked()->Selectable() ); Handle( AIS_InteractiveObject )::DownCast (aSelector->Picked()->Selectable());
if (!anObj.IsNull()) if (!anObj.IsNull())
theSelectedObj.Add( anObj ); {
anObjectsToSelect.Add (anObj);
} }
AIS_MapIteratorOfMapOfInteractive anIt( theSelectedObj ); }
AIS_MapIteratorOfMapOfInteractive anIt (anObjectsToSelect);
for ( ; anIt.More(); anIt.Next()) for ( ; anIt.More(); anIt.Next())
{ {
AIS_Selection::Select (anIt.Key()); AIS_Selection::Select (anIt.Key());
anIt.Key()->State (1); anIt.Key()->State (1);
} }
#else
for(selector->Init();selector->More();selector->Next()){
const Handle(SelectMgr_SelectableObject)& SO = selector->Picked()->Selectable();
if(!SO.IsNull()){
#ifdef OCC138
AIS_Selection::Select(SO);
(*((Handle(AIS_InteractiveObject)*)&SO))->State(1);
#else
(*((Handle(AIS_InteractiveObject)*)&SO))->State(1);
AIS_Selection::Select(SO);
#endif //OCC138
}
}
#endif //OCC9657
HilightCurrents(updateviewer);
Standard_Integer NS = NbCurrents(); HilightCurrents (toUpdateViewer);
if(NS==0) return AIS_SOP_NothingSelected;
if(NS==1) return AIS_SOP_OneSelected; Standard_Integer aSelNum = NbCurrents();
return AIS_SOP_SeveralSelected;
return (aSelNum == 0) ? AIS_SOP_NothingSelected
: (aSelNum == 1) ? AIS_SOP_OneSelected
: AIS_SOP_SeveralSelected;
} }
@ -400,175 +386,204 @@ AIS_StatusOfPick AIS_InteractiveContext::Select(const TColgp_Array1OfPnt2d& aPol
//function : Select //function : Select
//purpose : //purpose :
//======================================================================= //=======================================================================
AIS_StatusOfPick AIS_InteractiveContext::Select (const Standard_Boolean toUpdateViewer)
AIS_StatusOfPick AIS_InteractiveContext::Select(const Standard_Boolean updateviewer) {
if (HasOpenedContext())
{ {
if(HasOpenedContext()){
if(myWasLastMain) if(myWasLastMain)
return myLocalContexts(myCurLocalIndex)->Select(updateviewer); {
return myLocalContexts(myCurLocalIndex)->Select (toUpdateViewer);
}
else else
{ {
myLocalContexts(myCurLocalIndex)->SetSelected(myLastPicked,updateviewer); myLocalContexts(myCurLocalIndex)->SetSelected (myLastPicked, toUpdateViewer);
return AIS_SOP_OneSelected; return AIS_SOP_OneSelected;
} }
} }
// AIS_StatusOfPick PS(AIS_SOP_NothingSelected);
if(myWasLastMain && !myLastinMain.IsNull()){
if(myLastinMain->State()!=1){
SetCurrentObject(myLastinMain,Standard_False);
if(updateviewer)
UpdateCurrentViewer();}
}
else{
AIS_Selection::SetCurrentSelection(myCurrentName.ToCString());
Handle(AIS_Selection) S = AIS_Selection::CurrentSelection();
Handle(Standard_Transient) Tr;
Handle(AIS_InteractiveObject) IO;
for(S->Init();S->More();S->Next()){ if (myWasLastMain && !myLastinMain.IsNull())
Tr = S->Value(); {
IO = (*((Handle(AIS_InteractiveObject)*)&Tr)); if(myLastinMain->State() != 1)
IO->State(0); {
Unhilight(IO,Standard_False); SetCurrentObject (myLastinMain,Standard_False);
if(myObjects.IsBound(IO)){ // anti-plantage-rob if(toUpdateViewer)
if(myObjects(IO)->IsSubIntensityOn()) {
HilightWithColor(IO,mySubIntensity,Standard_False); UpdateCurrentViewer();
}
}
}
else
{
AIS_Selection::SetCurrentSelection (myCurrentName.ToCString());
Handle(AIS_Selection) aSelection = AIS_Selection::CurrentSelection();
Handle(AIS_InteractiveObject) anObj;
for (aSelection->Init(); aSelection->More(); aSelection->Next())
{
anObj = Handle(AIS_InteractiveObject)::DownCast (aSelection->Value());
anObj->State (0);
Unhilight (anObj,Standard_False);
if (myObjects.IsBound (anObj) && myObjects(anObj)->IsSubIntensityOn())
{
HilightWithColor (anObj, mySubIntensity, Standard_False);
} }
} }
AIS_Selection::Select(); AIS_Selection::Select();
if(updateviewer){ if (toUpdateViewer && myWasLastMain)
if(myWasLastMain) {
UpdateCurrentViewer(); UpdateCurrentViewer();
} }
} }
Standard_Integer NS = NbCurrents();
if(NS==0) return AIS_SOP_NothingSelected; Standard_Integer aSelNum = NbCurrents();
if(NS==1) return AIS_SOP_OneSelected;
return AIS_SOP_SeveralSelected; return (aSelNum == 0) ? AIS_SOP_NothingSelected
: (aSelNum == 1) ? AIS_SOP_OneSelected
: AIS_SOP_SeveralSelected;
} }
//======================================================================= //=======================================================================
//function : ShiftSelect //function : ShiftSelect
//purpose : //purpose :
//======================================================================= //=======================================================================
AIS_StatusOfPick AIS_InteractiveContext::ShiftSelect (const Standard_Boolean toUpdateViewer)
AIS_StatusOfPick AIS_InteractiveContext::ShiftSelect(const Standard_Boolean updateviewer) {
if (HasOpenedContext())
{ {
if(HasOpenedContext()){
if(myWasLastMain) if(myWasLastMain)
return myLocalContexts(myCurLocalIndex)->ShiftSelect(updateviewer);
else{
myLocalContexts(myCurLocalIndex)->AddOrRemoveSelected(myLastPicked,updateviewer);
Standard_Integer NS =NbSelected();
if(NS==0) return AIS_SOP_NothingSelected;
if(NS==1) return AIS_SOP_OneSelected;
return AIS_SOP_SeveralSelected;
}
}
if(myWasLastMain && !myLastinMain.IsNull())
AddOrRemoveCurrentObject(myLastinMain,updateviewer);
Standard_Integer NS = NbCurrents();
if(NS==0) return AIS_SOP_NothingSelected;
if(NS==1) return AIS_SOP_OneSelected;
return AIS_SOP_SeveralSelected;
}
//=======================================================================
//function : ShiftSelect
//purpose :
//=======================================================================
AIS_StatusOfPick AIS_InteractiveContext::ShiftSelect(const Standard_Integer XPMin,
const Standard_Integer YPMin,
const Standard_Integer XPMax,
const Standard_Integer YPMax,
const Handle(V3d_View)& aView,
const Standard_Boolean updateviewer)
{ {
return myLocalContexts (myCurLocalIndex)->ShiftSelect (toUpdateViewer);
if(HasOpenedContext()) }
return myLocalContexts(myCurLocalIndex)->ShiftSelect(XPMin,YPMin,XPMax,YPMax,aView,updateviewer);
UnhilightCurrents(Standard_False);
// OCC11904 - local variables made non-static - it looks and works better like this
Handle(StdSelect_ViewerSelector3d) selector;
if(aView->Viewer()== myMainVwr) {
selector= myMainSel;
myWasLastMain = Standard_True;}
else else
return AIS_SOP_NothingSelected; {
myLocalContexts (myCurLocalIndex)->AddOrRemoveSelected (myLastPicked, toUpdateViewer);
selector->Pick(XPMin,YPMin,XPMax,YPMax,aView); Standard_Integer aSelNum = NbSelected();
AIS_Selection::SetCurrentSelection(myCurrentName.ToCString()); return (aSelNum == 0) ? AIS_SOP_NothingSelected
for(selector->Init();selector->More();selector->Next()){ : (aSelNum == 1) ? AIS_SOP_OneSelected
const Handle(SelectMgr_SelectableObject)& SO = selector->Picked()->Selectable(); : AIS_SOP_SeveralSelected;
if(!SO.IsNull()){
AIS_SelectStatus SelStat = AIS_Selection::Select(SO);
Standard_Integer mod = (SelStat==AIS_SS_Added)?1:0;
(*((Handle(AIS_InteractiveObject)*)&SO))->State(mod);
} }
} }
HilightCurrents(updateviewer); if (myWasLastMain && !myLastinMain.IsNull())
{
AddOrRemoveCurrentObject (myLastinMain, toUpdateViewer);
}
Standard_Integer NS =NbCurrents(); Standard_Integer aCurrentSelNum = NbCurrents();
if(NS==0) return AIS_SOP_NothingSelected;
if(NS==1) return AIS_SOP_OneSelected;
return AIS_SOP_SeveralSelected;
return (aCurrentSelNum == 0) ? AIS_SOP_NothingSelected
: (aCurrentSelNum == 1) ? AIS_SOP_OneSelected
: AIS_SOP_SeveralSelected;
} }
//======================================================================= //=======================================================================
//function : ShiftSelect //function : ShiftSelect
//purpose : //purpose :
//======================================================================= //=======================================================================
AIS_StatusOfPick AIS_InteractiveContext::ShiftSelect (const Standard_Integer theXPMin,
AIS_StatusOfPick AIS_InteractiveContext::ShiftSelect( const TColgp_Array1OfPnt2d& aPolyline, const Standard_Integer theYPMin,
const Handle(V3d_View)& aView, const Standard_Integer theXPMax,
const Standard_Boolean updateviewer ) const Standard_Integer theYPMax,
const Handle(V3d_View)& theView,
const Standard_Boolean toUpdateViewer)
{ {
if (HasOpenedContext()) if (HasOpenedContext())
return myLocalContexts( myCurLocalIndex )->ShiftSelect( aPolyline, aView, updateviewer ); {
return myLocalContexts(myCurLocalIndex)->ShiftSelect (theXPMin, theYPMin, theXPMax, theYPMax,
theView, toUpdateViewer);
}
UnhilightCurrents (Standard_False); UnhilightCurrents (Standard_False);
// OCC11904 - local variables made non-static - it looks and works better like this
Handle(StdSelect_ViewerSelector3d) selector;
if( aView->Viewer() == myMainVwr ) { Handle(StdSelect_ViewerSelector3d) aSelector;
selector= myMainSel; if (theView->Viewer() == myMainVwr)
{
aSelector = myMainSel;
myWasLastMain = Standard_True; myWasLastMain = Standard_True;
} }
else else
{
return AIS_SOP_NothingSelected; return AIS_SOP_NothingSelected;
}
selector->Pick( aPolyline, aView ); aSelector->Pick (theXPMin, theYPMin, theXPMax, theYPMax, theView);
AIS_Selection::SetCurrentSelection (myCurrentName.ToCString());
for (aSelector->Init(); aSelector->More(); aSelector->Next())
{
Handle(AIS_InteractiveObject) anObjToSelect = Handle(AIS_InteractiveObject)::DownCast (aSelector->Picked()->Selectable());
if (!anObjToSelect.IsNull())
{
AIS_SelectStatus aSelStatus = AIS_Selection::Select (anObjToSelect);
Standard_Integer aState = (aSelStatus == AIS_SS_Added) ? 1 : 0;
anObjToSelect->State (aState);
}
}
HilightCurrents (toUpdateViewer);
Standard_Integer aSelNum = NbCurrents();
return (aSelNum == 0) ? AIS_SOP_NothingSelected
: (aSelNum == 1) ? AIS_SOP_OneSelected
: AIS_SOP_SeveralSelected;
}
//=======================================================================
//function : ShiftSelect
//purpose :
//=======================================================================
AIS_StatusOfPick AIS_InteractiveContext::ShiftSelect (const TColgp_Array1OfPnt2d& thePolyline,
const Handle(V3d_View)& theView,
const Standard_Boolean toUpdateViewer)
{
if (HasOpenedContext())
{
return myLocalContexts(myCurLocalIndex)->ShiftSelect (thePolyline, theView, toUpdateViewer);
}
UnhilightCurrents (Standard_False);
Handle(StdSelect_ViewerSelector3d) aSelector;
if (theView->Viewer() == myMainVwr)
{
aSelector= myMainSel;
myWasLastMain = Standard_True;
}
else
{
return AIS_SOP_NothingSelected;
}
aSelector->Pick (thePolyline, theView);
AIS_Selection::SetCurrentSelection (myCurrentName.ToCString()); AIS_Selection::SetCurrentSelection (myCurrentName.ToCString());
for( selector->Init(); selector->More(); selector->Next() ) { for (aSelector->Init(); aSelector->More(); aSelector->Next())
const Handle(SelectMgr_SelectableObject)& SO = selector->Picked()->Selectable(); {
if( !SO.IsNull() ) { Handle(AIS_InteractiveObject) anObjToSelect = Handle(AIS_InteractiveObject)::DownCast (aSelector->Picked()->Selectable());
AIS_SelectStatus SelStat = AIS_Selection::Select( SO ); if (!anObjToSelect.IsNull())
Standard_Integer mod = ( SelStat == AIS_SS_Added ) ? 1 : 0; {
(*((Handle(AIS_InteractiveObject)*)&SO))->State( mod ); AIS_SelectStatus aSelStatus = AIS_Selection::Select (anObjToSelect);
Standard_Integer aState = (aSelStatus == AIS_SS_Added ) ? 1 : 0;
anObjToSelect->State (aState);
} }
} }
HilightCurrents( updateviewer ); HilightCurrents (toUpdateViewer);
Standard_Integer NS = NbCurrents();
if( NS == 0 ) return AIS_SOP_NothingSelected; Standard_Integer aSelNum = NbCurrents();
if( NS == 1 ) return AIS_SOP_OneSelected;
return AIS_SOP_SeveralSelected; return (aSelNum == 0) ? AIS_SOP_NothingSelected
: (aSelNum == 1) ? AIS_SOP_OneSelected
: AIS_SOP_SeveralSelected;
} }
//======================================================================= //=======================================================================
//function : SetCurrentObject //function : SetCurrentObject
//purpose : //purpose :
//======================================================================= //=======================================================================
void AIS_InteractiveContext::SetCurrentObject(const Handle(AIS_InteractiveObject)& anIObj, void AIS_InteractiveContext::SetCurrentObject(const Handle(AIS_InteractiveObject)& anIObj,
const Standard_Boolean updateviewer) const Standard_Boolean updateviewer)
{ {

4
src/AIS/AIS_LocalContext.cdl
View File

@ -324,8 +324,8 @@ is
updateviewer : Boolean from Standard=Standard_True); updateviewer : Boolean from Standard=Standard_True);
AddOrRemoveSelected(me : mutable; AddOrRemoveSelected(me : mutable;
Ownr : EntityOwner from SelectMgr; theOwner : EntityOwner from SelectMgr;
updateviewer : Boolean from Standard=Standard_True); toUpdateViewer : Boolean from Standard = Standard_True);

2
src/AIS/AIS_LocalContext.cxx
View File

@ -712,7 +712,7 @@ void AIS_LocalContext::Terminate (const Standard_Boolean theToUpdate)
Handle(Standard_Transient) Tr; Handle(Standard_Transient) Tr;
for(S->Init();S->More();S->Next()){ for(S->Init();S->More();S->Next()){
Tr = S->Value(); Tr = S->Value();
(*((Handle(SelectMgr_EntityOwner)*)&Tr))->State(0); (*((Handle(SelectMgr_EntityOwner)*)&Tr))->SetSelected (Standard_False);
} }

604
src/AIS/AIS_LocalContext_1.cxx
View File

@ -181,332 +181,336 @@ AIS_StatusOfDetection AIS_LocalContext::MoveTo (const Standard_Integer theXpix,
} }
} }
//================================================== //=======================================================================
// Function: //function : Select
// Purpose : //purpose :
//================================================== //=======================================================================
AIS_StatusOfPick AIS_LocalContext::Select(const Standard_Boolean updateviewer) AIS_StatusOfPick AIS_LocalContext::Select (const Standard_Boolean toUpdateViewer)
{ {
if (myAutoHilight) if (myAutoHilight)
{
UnhilightPicked (Standard_False); UnhilightPicked (Standard_False);
}
Standard_Integer DI = DetectedIndex();
AIS_Selection::SetCurrentSelection (mySelName.ToCString()); AIS_Selection::SetCurrentSelection (mySelName.ToCString());
Standard_Integer NbSel = AIS_Selection::Extent();
if(DI<=0){ Standard_Integer aDetIndex = DetectedIndex();
ClearSelected(updateviewer); if (aDetIndex <= 0)
return NbSel== 0 ? AIS_SOP_NothingSelected : AIS_SOP_Removed; {
ClearSelected (toUpdateViewer);
return (AIS_Selection::Extent() == 0) ? AIS_SOP_NothingSelected : AIS_SOP_Removed;
} }
const Handle(SelectMgr_EntityOwner)& EO = myMapOfOwner(DI); const Handle(SelectMgr_EntityOwner)& anOwner = myMapOfOwner (aDetIndex);
#ifdef BUC60569
ClearSelected (Standard_False); ClearSelected (Standard_False);
Standard_Integer state = EO->State();
if( state < 1 ){ if (!anOwner->IsSelected()) // anOwner is not selected
EO->State(1); {
if( state == 0 ) AIS_Selection::Select(EO); anOwner->SetSelected (Standard_True);
AIS_Selection::Select (anOwner);
} }
#else
if(!IsSelected(EO))
AIS_Selection::ClearAndSelect(EO);
#endif
if (myAutoHilight) if (myAutoHilight)
{ {
const Handle(V3d_Viewer)& aViewer = myCTX->CurrentViewer(); const Handle(V3d_Viewer)& aViewer = myCTX->CurrentViewer();
for (aViewer->InitActiveViews(); aViewer->MoreActiveViews(); aViewer->NextActiveViews()) for (aViewer->InitActiveViews(); aViewer->MoreActiveViews(); aViewer->NextActiveViews())
{ {
Unhilight (EO, aViewer->ActiveView()); Unhilight (anOwner, aViewer->ActiveView());
} }
// advanced selection highlighting mechanism // advanced selection highlighting mechanism
if (!EO->IsAutoHilight() && EO->HasSelectable()) if (!anOwner->IsAutoHilight() && anOwner->HasSelectable())
{ {
Handle(AIS_InteractiveObject) anIO = Handle(AIS_InteractiveObject)::DownCast(EO->Selectable()); Handle(AIS_InteractiveObject) anIO = Handle(AIS_InteractiveObject)::DownCast(anOwner->Selectable());
UpdateSelected (anIO, Standard_False); UpdateSelected (anIO, Standard_False);
} }
if (updateviewer) if (toUpdateViewer)
{ {
myCTX->CurrentViewer()->Update(); myCTX->CurrentViewer()->Update();
} }
} }
return (AIS_Selection::Extent() == 1) ? AIS_SOP_OneSelected : AIS_SOP_SeveralSelected; return (AIS_Selection::Extent() == 1) ? AIS_SOP_OneSelected : AIS_SOP_SeveralSelected;
} }
//==================================================
// Function: //=======================================================================
// Purpose : //function : Select
//================================================== //purpose :
AIS_StatusOfPick AIS_LocalContext::Select(const Standard_Integer XPMin, //=======================================================================
const Standard_Integer YPMin, AIS_StatusOfPick AIS_LocalContext::Select (const Standard_Integer theXPMin,
const Standard_Integer XPMax, const Standard_Integer theYPMin,
const Standard_Integer YPMax, const Standard_Integer theXPMax,
const Handle(V3d_View)& aView, const Standard_Integer theYPMax,
const Standard_Boolean updateviewer) const Handle(V3d_View)& theView,
const Standard_Boolean toUpdateViewer)
{ {
if(aView->Viewer()== myCTX->CurrentViewer()){ if (theView->Viewer() == myCTX->CurrentViewer())
myMainVS->Pick( XPMin,YPMin,XPMax,YPMax,aView); {
if (myAutoHilight) UnhilightPicked(Standard_False); myMainVS->Pick (theXPMin, theYPMin, theXPMax, theYPMax, theView);
if (myAutoHilight)
{
UnhilightPicked (Standard_False);
}
AIS_Selection::SetCurrentSelection (mySelName.ToCString()); AIS_Selection::SetCurrentSelection (mySelName.ToCString());
Standard_Integer LastExt = AIS_Selection::Extent(); Standard_Integer aSelNum = AIS_Selection::Extent();
myMainVS->Init(); myMainVS->Init();
if(!myMainVS->More()) { if (!myMainVS->More())
ClearSelected(updateviewer); {
ClearSelected (toUpdateViewer);
mylastindex = 0; mylastindex = 0;
return LastExt == 0 ? AIS_SOP_NothingSelected:AIS_SOP_Removed; return aSelNum == 0 ? AIS_SOP_NothingSelected : AIS_SOP_Removed;
} }
ClearSelected (Standard_False); ClearSelected (Standard_False);
for(myMainVS->Init();myMainVS->More();myMainVS->Next()){ for (myMainVS->Init(); myMainVS->More(); myMainVS->Next())
const Handle(SelectMgr_EntityOwner)& OWNR = myMainVS->Picked();
if(myFilters->IsOk(OWNR)){
// it can be helpfil to classify this owner immediately...
#ifdef BUC60569
Standard_Integer state = OWNR->State();
if( state < 1 ){
#ifdef BUC60953
if( state == 0 ) AIS_Selection::Select(OWNR);
OWNR->State(1);
#else
OWNR->State(1);
if( state == 0 ) AIS_Selection::Select(OWNR);
#endif //BUC60953
}
#else //BUC60569
if(!IsSelected(OWNR)){
OWNR->State(1);
AIS_Selection::Select(OWNR);
}
#endif //BUC60569
}
}
if (myAutoHilight)
HilightPicked(updateviewer);
}
#ifdef BUC60774
Standard_Integer NS = AIS_Selection::Extent();
if( NS == 1 ) return AIS_SOP_OneSelected;
else if( NS > 1 ) return AIS_SOP_SeveralSelected;
#endif
return AIS_SOP_Error;
}
//==================================================
// Function:
// Purpose :
//==================================================
AIS_StatusOfPick AIS_LocalContext::ShiftSelect(const Standard_Boolean updateviewer)
{ {
Standard_Integer I = DetectedIndex(); const Handle(SelectMgr_EntityOwner)& anOwner = myMainVS->Picked();
if(I>0){ if (myFilters->IsOk (anOwner))
{
// it can be helpful to classify this owner immediately...
if (!anOwner->IsSelected())
{
anOwner->SetSelected (Standard_True);
AIS_Selection::Select (anOwner);
}
}
}
if (myAutoHilight)
{
HilightPicked (toUpdateViewer);
}
}
Standard_Integer aSelNum = AIS_Selection::Extent();
return (aSelNum == 1) ? AIS_SOP_OneSelected
: (aSelNum > 1) ? AIS_SOP_SeveralSelected
: AIS_SOP_Error;
}
//==================================================
// Function: Select
// Purpose : Selection by polyline
//==================================================
AIS_StatusOfPick AIS_LocalContext::Select (const TColgp_Array1OfPnt2d& thePolyline,
const Handle(V3d_View)& theView,
const Standard_Boolean toUpdateViewer)
{
if (theView->Viewer() == myCTX->CurrentViewer())
{
myMainVS->Pick (thePolyline, theView);
AIS_Selection::SetCurrentSelection (mySelName.ToCString()); AIS_Selection::SetCurrentSelection (mySelName.ToCString());
#ifdef BUC60774
Standard_Integer NbSel = AIS_Selection::Extent();
#endif
const Handle(SelectMgr_EntityOwner)& EO = myMapOfOwner(I);
#ifdef BUC60569
Standard_Integer mod = EO->State()==0 ? -1 : 0;
#else
Standard_Integer mod = EO->State()==0 ? 1 : 0;
#endif
#ifdef BUC60953 Standard_Integer aLastSelNum = AIS_Selection::Extent();
AIS_Selection::Select(EO); myMainVS->Init();
EO->State(mod); if (!myMainVS->More())
#else {
EO->State(mod); // Nothing is selected clear selection.
ClearSelected (toUpdateViewer);
mylastindex = 0;
AIS_Selection::Select(EO); // Return state to know if something was unselected
#endif return aLastSelNum == 0 ? AIS_SOP_NothingSelected : AIS_SOP_Removed;
}
if (myAutoHilight)
{
UnhilightPicked (Standard_False);
}
// Clear previous selection without update to process this selection
ClearSelected (Standard_False);
for (myMainVS->Init(); myMainVS->More(); myMainVS->Next())
{
const Handle(SelectMgr_EntityOwner)& anOwner = myMainVS->Picked();
if (myFilters->IsOk (anOwner))
{
// it can be helpful to classify this owner immediately...
if (!anOwner->IsSelected())
{
AIS_Selection::AddSelect (anOwner);
anOwner->SetSelected (Standard_True);
}
}
}
if (myAutoHilight)
{
HilightPicked (toUpdateViewer);
}
}
Standard_Integer aSelNum = AIS_Selection::Extent();
return (aSelNum == 1) ? AIS_SOP_OneSelected
: (aSelNum > 1) ? AIS_SOP_SeveralSelected
: AIS_SOP_Error;
}
//=======================================================================
//function : ShiftSelect
//purpose :
//=======================================================================
AIS_StatusOfPick AIS_LocalContext::ShiftSelect (const Standard_Boolean toUpdateViewer)
{
Standard_Integer aDetIndex = DetectedIndex();
AIS_Selection::SetCurrentSelection (mySelName.ToCString());
if(aDetIndex > 0)
{
AIS_Selection::SetCurrentSelection (mySelName.ToCString());
Standard_Integer aSelNum = AIS_Selection::Extent();
const Handle(SelectMgr_EntityOwner)& anOwner = myMapOfOwner (aDetIndex);
Standard_Boolean toSelect = anOwner->IsSelected() ? Standard_False : Standard_True;
AIS_Selection::Select (anOwner);
anOwner->SetSelected (toSelect);
if(myAutoHilight) if(myAutoHilight)
{ {
const Handle(V3d_Viewer)& aViewer = myCTX->CurrentViewer(); const Handle(V3d_Viewer)& aViewer = myCTX->CurrentViewer();
for (aViewer->InitActiveViews(); aViewer->MoreActiveViews(); aViewer->NextActiveViews()) for (aViewer->InitActiveViews(); aViewer->MoreActiveViews(); aViewer->NextActiveViews())
{ {
Unhilight (EO, aViewer->ActiveView()); Unhilight (anOwner, aViewer->ActiveView());
} }
// advanced selection highlighting mechanism // advanced selection highlighting mechanism
if (!EO->IsAutoHilight() && EO->HasSelectable()) if (!anOwner->IsAutoHilight() && anOwner->HasSelectable())
{ {
Handle(AIS_InteractiveObject) anIO = Handle(AIS_InteractiveObject)::DownCast (EO->Selectable()); Handle(AIS_InteractiveObject) anIO = Handle(AIS_InteractiveObject)::DownCast (anOwner->Selectable());
UpdateSelected (anIO, Standard_False); UpdateSelected (anIO, Standard_False);
} }
if (updateviewer) if (toUpdateViewer)
{ {
myCTX->CurrentViewer()->Update(); myCTX->CurrentViewer()->Update();
} }
} }
#ifdef BUC60774 #ifdef BUC60774
Standard_Integer NS = AIS_Selection::Extent(); Standard_Integer NS = AIS_Selection::Extent();
if( NS == 1 ) return AIS_SOP_OneSelected; if( NS == 1 ) return AIS_SOP_OneSelected;
else if( NS > 1 ) return AIS_SOP_SeveralSelected; else if( NS > 1 ) return AIS_SOP_SeveralSelected;
return NbSel== 0 ? AIS_SOP_NothingSelected : AIS_SOP_Removed; return aSelNum == 0 ? AIS_SOP_NothingSelected : AIS_SOP_Removed;
#endif #endif
} }
return AIS_SOP_Error; return AIS_SOP_Error;
} }
//==================================================
// Function: the already selected objects are unselected //=======================================================================
// Purpose : others are selected. //function : ShiftSelect
//================================================== //purpose :
AIS_StatusOfPick AIS_LocalContext::ShiftSelect(const Standard_Integer XPMin, //=======================================================================
const Standard_Integer YPMin, AIS_StatusOfPick AIS_LocalContext::ShiftSelect (const Standard_Integer theXPMin,
const Standard_Integer XPMax, const Standard_Integer theYPMin,
const Standard_Integer YPMax, const Standard_Integer theXPMax,
const Handle(V3d_View)& aView, const Standard_Integer theYPMax,
const Standard_Boolean updateviewer) const Handle(V3d_View)& theView,
const Standard_Boolean toUpdateViewer)
{ {
myMainPM->ClearImmediateDraw(); myMainPM->ClearImmediateDraw();
if(aView->Viewer()== myCTX->CurrentViewer()) { if (theView->Viewer() == myCTX->CurrentViewer())
myMainVS->Pick( XPMin,YPMin,XPMax,YPMax,aView); {
#ifdef BUC60774 myMainVS->Pick (theXPMin, theYPMin, theXPMax, theYPMax, theView);
AIS_Selection::SetCurrentSelection (mySelName.ToCString()); AIS_Selection::SetCurrentSelection (mySelName.ToCString());
Standard_Integer LastExt = AIS_Selection::Extent(); Standard_Integer aLastSelNum = AIS_Selection::Extent();
#endif
myMainVS->Init(); myMainVS->Init();
if (!myMainVS->More()) if (!myMainVS->More())
#ifdef BUC60774
return LastExt == 0 ? AIS_SOP_NothingSelected:AIS_SOP_Removed;
#else
return AIS_SOP_NothingSelected; // no effet if click on empty space
#endif
AIS_Selection::SetCurrentSelection(mySelName.ToCString());
if (myAutoHilight) UnhilightPicked(Standard_False);
for(myMainVS->Init();myMainVS->More();myMainVS->Next()){
const Handle(SelectMgr_EntityOwner)& EO = myMainVS->Picked();
if(myFilters->IsOk(EO)){
#ifdef BUC60569
Standard_Integer mod = EO->State()==0 ? -1 : 0;
#else
Standard_Integer mod = EO->State()==0 ? 1 : 0;
#endif
#ifdef BUC60953
AIS_Selection::Select(EO);
EO->State(mod);
#else
EO->State(mod);
AIS_Selection::Select(EO);
#endif
}
}
if (myAutoHilight) HilightPicked(updateviewer);
}
#ifdef BUC60774
Standard_Integer NS = AIS_Selection::Extent();
if( NS == 1 ) return AIS_SOP_OneSelected;
else if( NS > 1 ) return AIS_SOP_SeveralSelected;
#endif
return AIS_SOP_Error;
}
//==================================================
// Function: Select
// Purpose : Selection by polyline
//==================================================
AIS_StatusOfPick AIS_LocalContext::Select(const TColgp_Array1OfPnt2d& aPolyline,
const Handle(V3d_View)& aView,
const Standard_Boolean updateviewer)
{ {
if(aView->Viewer()== myCTX->CurrentViewer()){ // Nothing is selected clear selection, but don't clear the selection
myMainVS->Pick(aPolyline,aView); // as it is shift selection and previous selection matters.
if (myAutoHilight) UnhilightPicked(Standard_False); // Return state to know if something was unselected
return aLastSelNum == 0 ? AIS_SOP_NothingSelected : AIS_SOP_Removed;
AIS_Selection::SetCurrentSelection(mySelName.ToCString());
Standard_Integer LastExt = AIS_Selection::Extent();
myMainVS->Init();
if(!myMainVS->More()) {
ClearSelected(updateviewer);
mylastindex=0;
return LastExt == 0 ? AIS_SOP_NothingSelected:AIS_SOP_Removed;
}
ClearSelected(Standard_False);
for(myMainVS->Init();myMainVS->More();myMainVS->Next()){
const Handle(SelectMgr_EntityOwner)& OWNR = myMainVS->Picked();
if(myFilters->IsOk(OWNR)){
// it can be helpfil to classify this owner immediately...
#ifdef BUC60953
Standard_Integer state = OWNR->State();
if( state < 1 ){
if( state == 0 ) AIS_Selection::AddSelect(OWNR);
OWNR->State(1);
}
#else
if(!IsSelected(OWNR)){
OWNR->State(1);
AIS_Selection::AddSelect(OWNR);
}
#endif //BUC60953
}
} }
if (myAutoHilight) if (myAutoHilight)
HilightPicked(updateviewer);
}
#ifdef BUC60774
Standard_Integer NS = AIS_Selection::Extent();
if( NS == 1 ) return AIS_SOP_OneSelected;
else if( NS > 1 ) return AIS_SOP_SeveralSelected;
#endif
return AIS_SOP_Error;
}
//==================================================
// Function: Select
// Purpose : Selection by polyline
//==================================================
AIS_StatusOfPick AIS_LocalContext::ShiftSelect( const TColgp_Array1OfPnt2d& aPolyline,
const Handle(V3d_View)& aView,
const Standard_Boolean updateviewer )
{ {
if( aView->Viewer() == myCTX->CurrentViewer() ) {
myMainVS->Pick( aPolyline, aView );
AIS_Selection::SetCurrentSelection( mySelName.ToCString() );
Standard_Integer LastExt = AIS_Selection::Extent();
myMainVS->Init();
if( !myMainVS->More() )
return LastExt == 0 ? AIS_SOP_NothingSelected : AIS_SOP_Removed;
AIS_Selection::SetCurrentSelection( mySelName.ToCString() );
if ( myAutoHilight )
UnhilightPicked (Standard_False); UnhilightPicked (Standard_False);
for( myMainVS->Init(); myMainVS->More(); myMainVS->Next() ) { }
const Handle(SelectMgr_EntityOwner)& EO = myMainVS->Picked();
if( myFilters->IsOk( EO ) ) { for (myMainVS->Init(); myMainVS->More(); myMainVS->Next())
Standard_Integer mod = EO->State() == 0 ? -1 : 0; {
AIS_Selection::Select(EO); const Handle(SelectMgr_EntityOwner)& anOwner = myMainVS->Picked();
EO->State( mod ); if(myFilters->IsOk (anOwner))
{
Standard_Boolean toSelect = anOwner->IsSelected() ? Standard_False : Standard_True;
AIS_Selection::Select (anOwner);
anOwner->SetSelected (toSelect);
}
}
if (myAutoHilight)
{
HilightPicked (toUpdateViewer);
}
}
Standard_Integer aSelNum = AIS_Selection::Extent();
return (aSelNum == 1) ? AIS_SOP_OneSelected
: (aSelNum > 1) ? AIS_SOP_SeveralSelected
: AIS_SOP_Error;
}
//==================================================
// Function: Select
// Purpose : Selection by polyline
//==================================================
AIS_StatusOfPick AIS_LocalContext::ShiftSelect (const TColgp_Array1OfPnt2d& thePolyline,
const Handle(V3d_View)& theView,
const Standard_Boolean toUpdateViewer)
{
if (theView->Viewer() == myCTX->CurrentViewer())
{
myMainVS->Pick (thePolyline, theView);
AIS_Selection::SetCurrentSelection (mySelName.ToCString());
Standard_Integer aLastSelNum = AIS_Selection::Extent();
myMainVS->Init();
if(!myMainVS->More())
{
// Nothing is selected clear selection, but don't clear the selection
// as it is shift selection and previous selection matters.
// Return state to know if something was unselected
return aLastSelNum == 0 ? AIS_SOP_NothingSelected : AIS_SOP_Removed;
}
if (myAutoHilight)
{
UnhilightPicked (Standard_False);
}
for (myMainVS->Init(); myMainVS->More(); myMainVS->Next())
{
const Handle(SelectMgr_EntityOwner)& anOwner = myMainVS->Picked();
if (myFilters->IsOk (anOwner))
{
Standard_Boolean toSelect = anOwner->IsSelected() ? Standard_False : Standard_True;
AIS_Selection::Select (anOwner);
anOwner->SetSelected (toSelect);
} }
} }
if (myAutoHilight) if (myAutoHilight)
HilightPicked( updateviewer ); {
HilightPicked (toUpdateViewer);
} }
Standard_Integer NS = AIS_Selection::Extent(); }
if( NS == 1 )
return AIS_SOP_OneSelected; Standard_Integer aSelNum = AIS_Selection::Extent();
else if( NS > 1 )
return AIS_SOP_SeveralSelected; return (aSelNum == 1) ? AIS_SOP_OneSelected
return AIS_SOP_Error; : (aSelNum > 1) ? AIS_SOP_SeveralSelected
: AIS_SOP_Error;
} }
//================================================== //==================================================
@ -713,15 +717,9 @@ Standard_Boolean AIS_LocalContext::IsSelected(const Handle(AIS_InteractiveObject
//purpose : //purpose :
//======================================================================= //=======================================================================
Standard_Boolean AIS_LocalContext::IsSelected(const Handle(SelectMgr_EntityOwner)& Ownr) const Standard_Boolean AIS_LocalContext::IsSelected (const Handle(SelectMgr_EntityOwner)& theOwner) const
{ {
if (Ownr.IsNull()) return Standard_False; return !theOwner.IsNull() && theOwner->IsSelected();
#ifdef BUC60569
Standard_Boolean state = (Ownr->State()!=0);
#else
Standard_Boolean state = (Ownr->State()==1);
#endif
return state;
} }
//================================================== //==================================================
@ -909,8 +907,9 @@ void AIS_LocalContext::ClearSelected(const Standard_Boolean updateviewer)
for(; anIter.More(); anIter.Next()){ for(; anIter.More(); anIter.Next()){
const Handle(Standard_Transient)& Tr = anIter.Value(); const Handle(Standard_Transient)& Tr = anIter.Value();
#endif #endif
if(!Tr.IsNull()){ if(!Tr.IsNull())
(*((const Handle(SelectMgr_EntityOwner)*)&Tr))->State(0); {
(*((const Handle(SelectMgr_EntityOwner)*)&Tr))->SetSelected (Standard_False);
} }
} }
AIS_Selection::Select(); AIS_Selection::Select();
@ -950,13 +949,10 @@ void AIS_LocalContext::SetSelected(const Handle(AIS_InteractiveObject)& anIObj,
} }
ClearSelected(Standard_False); ClearSelected(Standard_False);
#ifdef OCC138
AIS_Selection::Select(EO); AIS_Selection::Select(EO);
EO->State(1); EO->SetSelected (Standard_True);
#else
EO->State(1);
AIS_Selection::Select(EO);
#endif
HilightPicked(updateviewer); HilightPicked(updateviewer);
} }
@ -974,42 +970,34 @@ void AIS_LocalContext::AddOrRemoveSelected(const Handle(AIS_InteractiveObject)&
Handle(SelectMgr_EntityOwner) EO; Handle(SelectMgr_EntityOwner) EO;
EO = FindSelectedOwnerFromIO(anIObj); EO = FindSelectedOwnerFromIO(anIObj);
#ifndef OCC138
if(!EO.IsNull()) if (EO.IsNull())
EO->State(0); {
else{ if(anIObj->HasSelection(0))
#else {
if(EO.IsNull()) {
#endif
if(anIObj->HasSelection(0)){
const Handle(SelectMgr_Selection)& SIOBJ = anIObj->Selection(0); const Handle(SelectMgr_Selection)& SIOBJ = anIObj->Selection(0);
SIOBJ->Init(); SIOBJ->Init();
if(SIOBJ->More()){ if(SIOBJ->More())
{
Handle(SelectBasics_EntityOwner) BO = SIOBJ->Sensitive()->OwnerId(); Handle(SelectBasics_EntityOwner) BO = SIOBJ->Sensitive()->OwnerId();
EO = *((Handle(SelectMgr_EntityOwner)*)&BO); EO = *((Handle(SelectMgr_EntityOwner)*)&BO);
} }
} }
if(EO.IsNull()) if(EO.IsNull())
{
EO = new SelectMgr_EntityOwner(anIObj); EO = new SelectMgr_EntityOwner(anIObj);
#ifndef OCC138 }
EO->State(1);
#endif
} }
// cout<<"AIS_LocalContext::AddOrRemoveSelected : Selection = "<<mySelName<<endl; // cout<<"AIS_LocalContext::AddOrRemoveSelected : Selection = "<<mySelName<<endl;
const Handle(AIS_Selection)& S = AIS_Selection::Selection(mySelName.ToCString()); const Handle(AIS_Selection)& S = AIS_Selection::Selection(mySelName.ToCString());
#ifdef OCC138
if(!S.IsNull()) {
AIS_SelectStatus aStatus = S->Select(EO);
if(aStatus == AIS_SS_Added)
EO->State(1);
else
EO->State(0);
}
#else
if (!S.IsNull()) if (!S.IsNull())
S->Select(EO); {
#endif AIS_SelectStatus aStatus = S->Select(EO);
EO->SetSelected (aStatus == AIS_SS_Added);
}
HilightPicked(updateviewer); HilightPicked(updateviewer);
} }
@ -1022,42 +1010,33 @@ void AIS_LocalContext::AddOrRemoveSelected(const TopoDS_Shape& Sh,
{ {
UnhilightPicked (Standard_False); UnhilightPicked (Standard_False);
Handle(SelectMgr_EntityOwner) EO = FindSelectedOwnerFromShape(Sh); Handle(SelectMgr_EntityOwner) EO = FindSelectedOwnerFromShape(Sh);
if(!EO.IsNull()){ if (!EO.IsNull())
// cout<<"AIS_LocalContext::AddOrRemoveSelected(sh) : Selection = "<<mySelName<<endl;
#ifdef OCC138
AIS_Selection::Selection(mySelName.ToCString())->Select(EO);
EO->State(1);
#else
EO->State(1);
AIS_Selection::Selection(mySelName.ToCString())->Select(EO);
#endif
}
HilightPicked(updateviewer);
}
void AIS_LocalContext::AddOrRemoveSelected(const Handle(SelectMgr_EntityOwner)& Ownr,
const Standard_Boolean updateviewer)
{ {
//Not Yet Implemented AIS_Selection::Selection(mySelName.ToCString())->Select(EO);
if(myAutoHilight) EO->SetSelected (Standard_True);
UnhilightPicked(Standard_False); }
// cout<<"AIS_LocalContext::AddOrRemoveSelected(ownr) : Selection = "<<mySelName<<endl;
Standard_Integer mod = Ownr->State()==0 ? 1 : 0;
#ifdef OCC138
AIS_Selection::Selection(mySelName.ToCString())->Select(Ownr);
Ownr->State(mod);
#else
Ownr->State(mod);
AIS_Selection::Selection(mySelName.ToCString())->Select(Ownr);
#endif
if(myAutoHilight)
HilightPicked (updateviewer); HilightPicked (updateviewer);
} }
void AIS_LocalContext::AddOrRemoveSelected (const Handle(SelectMgr_EntityOwner)& theOwner,
const Standard_Boolean toUpdateViewer)
{
if(myAutoHilight)
{
UnhilightPicked (Standard_False);
}
Standard_Boolean toSelect = theOwner->IsSelected() ? Standard_False : Standard_True;
AIS_Selection::Selection (mySelName.ToCString())->Select (theOwner);
theOwner->SetSelected (toSelect);
if(myAutoHilight)
{
HilightPicked (toUpdateViewer);
}
}
//================================================== //==================================================
// Function: manageDetected // Function: manageDetected
// Purpose : // Purpose :
@ -1128,8 +1107,7 @@ void AIS_LocalContext::manageDetected (const Handle(SelectMgr_EntityOwner)& theP
if (myAutoHilight) if (myAutoHilight)
{ {
if (thePickOwner->State() <= 0 if (!thePickOwner->IsSelected() || myCTX->ToHilightSelected())
|| myCTX->ToHilightSelected())
{ {
Hilight (thePickOwner, theView); Hilight (thePickOwner, theView);
} }

2
src/MeshVS/MeshVS_MeshOwner.cxx
View File

@ -123,7 +123,7 @@ void MeshVS_MeshOwner::SetDetectedEntities (const Handle(TColStd_HPackedMapOfInt
{ {
myDetectedNodes = Nodes; myDetectedNodes = Nodes;
myDetectedElems = Elems; myDetectedElems = Elems;
if( State() ) State( 0 ); if (IsSelected()) SetSelected (Standard_False);
} }
//================================================================ //================================================================

20
src/SelectMgr/SelectMgr_EntityOwner.cdl
View File

@ -130,10 +130,23 @@ is
--very Internal method (to be used in selection process only...) --very Internal method (to be used in selection process only...)
SetSelected(me:mutable;theIsSelected : Boolean from Standard);
---C++: inline
---Purpose:Set the state of the owner.
-- @param theIsSelected [in] shows if owner is selected.
IsSelected(me) returns Boolean from Standard;
---C++: inline
---Purpose: @return Standard_True if the owner is selected.
State(me:mutable;aStatus:Integer from Standard); State(me:mutable;aStatus:Integer from Standard);
---C++: inline ---C++: inline
---Purpose:Set the state of the owner.
-- The method is deprecated. Use SetSelected() instead.
State(me) returns Integer from Standard; State(me) returns Integer from Standard;
---C++: inline ---C++: inline
-- @return 1 if the owner is selected and 0 otherwise.
-- The method is deprecated. Use IsSelected() instead.
IsAutoHilight ( me ) returns Boolean from Standard is virtual; IsAutoHilight ( me ) returns Boolean from Standard is virtual;
---Purpose: if owner is not auto hilighted, for group contains many such owners ---Purpose: if owner is not auto hilighted, for group contains many such owners
@ -153,6 +166,11 @@ is
fields fields
mySelectable : SOPtr; mySelectable : SOPtr;
mystate : Integer from Standard;
myIsSelected : Boolean from Standard;
---Purpose: Describes selection state of this owner:
-- Standard_False: the owner not selected
-- Standard_True: the owner is selected.
end EntityOwner; end EntityOwner;

4
src/SelectMgr/SelectMgr_EntityOwner.cxx
View File

@ -25,14 +25,14 @@
SelectMgr_EntityOwner::SelectMgr_EntityOwner(const Standard_Integer aPriority): SelectMgr_EntityOwner::SelectMgr_EntityOwner(const Standard_Integer aPriority):
SelectBasics_EntityOwner(aPriority), SelectBasics_EntityOwner(aPriority),
mySelectable(NULL), mySelectable(NULL),
mystate(0) myIsSelected (Standard_False)
{ {
} }
SelectMgr_EntityOwner::SelectMgr_EntityOwner(const Handle(SelectMgr_SelectableObject)& aSO, SelectMgr_EntityOwner::SelectMgr_EntityOwner(const Handle(SelectMgr_SelectableObject)& aSO,
const Standard_Integer aPriority): const Standard_Integer aPriority):
SelectBasics_EntityOwner(aPriority), SelectBasics_EntityOwner(aPriority),
mystate(0) myIsSelected (Standard_False)
{ {
mySelectable = aSO.operator->(); mySelectable = aSO.operator->();
} }

10
src/SelectMgr/SelectMgr_EntityOwner.lxx
View File

@ -15,7 +15,13 @@
// commercial license or contractual agreement. // commercial license or contractual agreement.
inline Standard_Integer SelectMgr_EntityOwner::State() const inline Standard_Integer SelectMgr_EntityOwner::State() const
{return mystate;} { return myIsSelected ? 1 : 0; }
inline void SelectMgr_EntityOwner::State(const Standard_Integer aStatus) inline void SelectMgr_EntityOwner::State(const Standard_Integer aStatus)
{mystate = aStatus;} { myIsSelected = (aStatus == 1);}
inline Standard_Boolean SelectMgr_EntityOwner::IsSelected() const
{ return myIsSelected; }
inline void SelectMgr_EntityOwner::SetSelected (const Standard_Boolean theIsSelected)
{ myIsSelected = theIsSelected; }

3
src/ViewerTest/ViewerTest_EventManager.cdl
View File

@ -49,6 +49,9 @@ is
---C++: inline ---C++: inline
---C++: return const& ---C++: return const&
GetCurrentPosition (me; theXPix, theYPix: out Integer from Standard);
---Purpose: Gets current mouse position. It tracks change of mouse position
-- with mouse drugging or with DRAW command call (vmoveto).
fields fields
myCtx : InteractiveContext from AIS; myCtx : InteractiveContext from AIS;

6
src/ViewerTest/ViewerTest_EventManager.cxx
View File

@ -242,3 +242,9 @@ void ViewerTest_EventManager::ShiftSelect (const TColgp_Array1OfPnt2d& thePolyli
} }
myView->Redraw(); myView->Redraw();
} }
void ViewerTest_EventManager::GetCurrentPosition (Standard_Integer& theXPix, Standard_Integer& theYPix) const
{
theXPix = myX;
theYPix = myY;
}

69
src/ViewerTest/ViewerTest_ViewerCommands.cxx
View File

@ -6649,6 +6649,70 @@ static int VFrustumCulling (Draw_Interpretor& theDI,
return 0; return 0;
} }
//=======================================================================
//function : VHighlightSelected
//purpose :
//=======================================================================
static int VHighlightSelected (Draw_Interpretor& theDI,
Standard_Integer theArgNb,
const char** theArgVec)
{
if (ViewerTest::GetAISContext().IsNull())
{
std::cout << theArgVec[0] << " error : Context is not created. Please call vinit before.\n";
return 1;
}
const Handle(AIS_InteractiveContext) aContext = ViewerTest::GetAISContext();
if (theArgNb < 2)
{
theDI << (aContext->ToHilightSelected() ? "on" : "off");
return 0;
}
if (theArgNb != 2)
{
std::cout << theArgVec[0] << " error : wrong number of parameters."
<< "Type 'help" << theArgVec[0] << "' for more information.";
return 1;
}
// Parse parameter
TCollection_AsciiString aMode (theArgVec[1]);
aMode.LowerCase();
Standard_Boolean toEnable = Standard_False;
if (aMode.IsEqual ("on"))
{
toEnable = Standard_True;
}
else if (aMode.IsEqual ("off"))
{
toEnable = Standard_False;
}
else
{
toEnable = Draw::Atoi (theArgVec[1]) != 0;
}
if (toEnable != aContext->ToHilightSelected())
{
aContext->SetToHilightSelected (toEnable);
// Move cursor to null position and back to process updating of detection
// and highlighting of selected object immediatly.
Standard_Integer aPixX = 0;
Standard_Integer aPixY = 0;
const Handle(ViewerTest_EventManager)& anEventManager = ViewerTest::CurrentEventManager();
anEventManager->GetCurrentPosition (aPixX, aPixY);
anEventManager->MoveTo (0, 0);
anEventManager->MoveTo (aPixX, aPixY);
}
return 0;
}
//======================================================================= //=======================================================================
//function : ViewerCommands //function : ViewerCommands
//purpose : //purpose :
@ -7017,4 +7081,9 @@ void ViewerTest::ViewerCommands(Draw_Interpretor& theCommands)
theCommands.Add("vfrustumculling", theCommands.Add("vfrustumculling",
"vfrustumculling [toEnable]: enables/disables objects clipping", "vfrustumculling [toEnable]: enables/disables objects clipping",
__FILE__,VFrustumCulling,group); __FILE__,VFrustumCulling,group);
theCommands.Add("vhighlightselected",
"vhighlightselected [0|1] or vhighlightselected [on|off]: enables/disables highlighting of selected objects.\n"
"Without arguments it shows if highlighting of selected objects is enabled now.",
__FILE__,VHighlightSelected,group);
} }

34
tests/bugs/vis/bug23649_1 Normal file
View File

@ -0,0 +1,34 @@
puts "============"
puts "CR23649"
puts "============"
puts ""
#######################################################################
# 0023649: Different behaviour of highlighting after shift selection.
# It tests default functionality of highlighting
# during shift selection of sub-shapes (local context).
#######################################################################
set anImage1 $imagedir/${casename}_Selection.png
set anImage2 $imagedir/${casename}_HighlightFirst.png
set anImage3 $imagedir/${casename}_HighlightSecond.png
box b 1 2 3
vinit
vdisplay b
vfit
vselmode b 2 1
#select the first edge
vselect 232 368
#select the second edge
vselect 165 278 1
vmoveto 0 0
vdump ${anImage1}
#highlight the first edge - it should NOT be highlightable by default
vmoveto 232 368
vdump ${anImage2}
#highlight the second edge - it should NOT be highlightable by default
vmoveto 165 278
vdump ${anImage3}

35
tests/bugs/vis/bug23649_2 Normal file
View File

@ -0,0 +1,35 @@
puts "============"
puts "CR23649"
puts "============"
puts ""
#######################################################################
# 0023649: Different behaviour of highlighting after shift selection
# It tests highlighting of selected sub-shapes.
# This mode is option of interactive context.
#######################################################################
set anImage1 $imagedir/${casename}_HighlightFirst.png
set anImage2 $imagedir/${casename}_HighlightSecond.png
box b 1 2 3
vinit
vdisplay b
vfit
vselmode b 2 1
#select the first edge
vselect 232 368
#select the second edge
vselect 165 278 1
vmoveto 0 0
#enable 'highlight selected' mode
vhighlightselected on
#highlight the first edge - it should be highlightable by default
vmoveto 232 368
vdump ${anImage1}
#highlight the second edge - it should be highlightable by default
vmoveto 165 278
vdump ${anImage2}

34
tests/bugs/vis/bug23649_3 Normal file
View File

@ -0,0 +1,34 @@
puts "============"
puts "CR23649"
puts "============"
puts ""
#######################################################################
# 0023649: Different behaviour of highlighting after shift selection.
# It tests default functionality of highlighting
# during shift selection of shapes (neutral point).
#######################################################################
set anImage1 $imagedir/${casename}_Selection.png
set anImage2 $imagedir/${casename}_HighlightFirst.png
set anImage3 $imagedir/${casename}_HighlightSecond.png
box a 2 0 0 3 2 1
box b 1 2 3
vinit
vdisplay a b
vfit
#select the first shape
vselect 70 230
#select the second shape
vselect 200 360 1
vmoveto 0 0
vdump ${anImage1}
#highlight the first edge - it should NOT be highlightable by default
vmoveto 70 230
vdump ${anImage2}
#highlight the second edge - it should NOT be highlightable by default
vmoveto 200 360
vdump ${anImage3}

35
tests/bugs/vis/bug23649_4 Normal file
View File

@ -0,0 +1,35 @@
puts "============"
puts "CR23649"
puts "============"
puts ""
#######################################################################
# 0023649: Different behaviour of highlighting after shift selection
# It tests highlighting of selected shapes (neutral point).
# This mode is option of interactive context.
#######################################################################
set anImage1 $imagedir/${casename}_HighlightFirst.png
set anImage2 $imagedir/${casename}_HighlightSecond.png
box a 2 0 0 3 2 1
box b 1 2 3
vinit
vdisplay a b
vfit
#select the first shape
vselect 70 230
#select the second shape
vselect 200 360 1
vmoveto 0 0
#enable 'highlight selected' mode
vhighlightselected on
#highlight the first edge - it should be highlightable by default
vmoveto 70 230
vdump ${anImage1}
#highlight the second edge - it should be highlightable by default
vmoveto 200 360
vdump ${anImage2}

2
tests/bugs/vis/bug597_2
View File

@ -15,7 +15,7 @@ puts ""
restore [locate_data_file buc60569a.rle] result restore [locate_data_file buc60569a.rle] result
tclean result tclean result
vinit vinit
vhighlightselected 0
checkshape result checkshape result
BUC60569 result BUC60569 result