0029007: Visualization, AIS_InteractiveContext - the method for accessing Detected owners iterator is missing

Added new method AIS_InteractiveContext::DetectedCurrentOwner().
AIS_InteractiveContext header has been restructured (methods moved into groups)
and description has been cleaned up.

src/AIS/AIS_InteractiveContext.cxx

@@ -2779,24 +2779,6 @@ Standard_Boolean AIS_InteractiveContext::PlaneSize (Standard_Real& theX,
   return (Abs (theX - theY) <= Precision::Confusion());
 }
 
-//=======================================================================
-//function : SetAutoActivateSelection
-//purpose  :
-//=======================================================================
-void AIS_InteractiveContext::SetAutoActivateSelection (const Standard_Boolean theIsAuto)
-{
-  myIsAutoActivateSelMode = theIsAuto;
-}
-
-//=======================================================================
-//function : GetAutoActivateSelection
-//purpose  :
-//=======================================================================
-Standard_Boolean AIS_InteractiveContext::GetAutoActivateSelection() const
-{
-  return myIsAutoActivateSelMode;
-}
-
 //=======================================================================
 //function : SetZLayer
 //purpose  :

src/AIS/AIS_InteractiveContext_1.cxx

@@ -1661,6 +1661,22 @@ void AIS_InteractiveContext::NextDetected()
   myCurDetected++;
 }
 
+//=======================================================================
+//function : DetectedCurrentOwner
+//purpose  :
+//=======================================================================
+Handle(SelectMgr_EntityOwner) AIS_InteractiveContext::DetectedCurrentOwner() const
+{
+  if (HasOpenedContext())
+  {
+    return myLocalContexts (myCurLocalIndex)->DetectedCurrentOwner();
+  }
+
+  return MoreDetected()
+       ? myMainSel->Picked (myDetectedSeq (myCurDetected))
+       : Handle(SelectMgr_EntityOwner)();
+}
+
 //=======================================================================
 //function : DetectedCurrentShape
 //purpose  :

src/AIS/AIS_LocalContext.hxx

@@ -238,12 +238,13 @@ public:
   //! interactive objects.
   Standard_EXPORT void NextDetected();
 
+  //! @return current mouse-detected Owner or null object if there is no current detected.
+  Standard_EXPORT Handle(SelectMgr_EntityOwner) DetectedCurrentOwner() const;
 
   //! @return current mouse-detected shape or empty (null) shape, if current interactive object
   //! is not a shape (AIS_Shape) or there is no current mouse-detected interactive object at all.
   Standard_EXPORT const TopoDS_Shape& DetectedCurrentShape() const;
 
-
   //! @return current mouse-detected interactive object or null object if there is no current detected.
   Standard_EXPORT Handle(AIS_InteractiveObject) DetectedCurrentObject() const;
   
@@ -424,7 +425,6 @@ private:
   Standard_Integer myCurrentOwner;
   TColStd_SequenceOfInteger myDetectedSeq;
   Standard_Integer myCurDetected;
-  AIS_SequenceOfInteractive myAISDetectedSeq;
   Standard_Integer myAISCurDetected;
   Handle(Prs3d_Drawer) mySubintStyle;
 

src/AIS/AIS_LocalContext_1.cxx

@@ -73,7 +73,6 @@ AIS_StatusOfDetection AIS_LocalContext::MoveTo (const Standard_Integer  theXpix,
   }
 
   myAISCurDetected = 0;
-  myAISDetectedSeq.Clear();
 
   myCurDetected = 0;
   myDetectedSeq.Clear();
@@ -84,17 +83,10 @@ AIS_StatusOfDetection AIS_LocalContext::MoveTo (const Standard_Integer  theXpix,
   for (Standard_Integer aDetIter = 1; aDetIter <= aDetectedNb; ++aDetIter)
   {
     Handle(SelectMgr_EntityOwner) anOwner = myMainVS->Picked (aDetIter);
-    if (anOwner.IsNull()
+    if (!anOwner.IsNull()
-     || !myFilters->IsOk (anOwner))
+      && myFilters->IsOk (anOwner))
     {
-      continue;
+      myDetectedSeq.Append (aDetIter); // normally they are already arranged in correct order...
-    }
-
-    myDetectedSeq.Append (aDetIter); // normally they are already arranged in correct order...
-    Handle(AIS_InteractiveObject) anObj = Handle(AIS_InteractiveObject)::DownCast (anOwner->Selectable());
-    if (!anObj.IsNull())
-    {
-      myAISDetectedSeq.Append (anObj);
     }
   }
 
@@ -868,15 +860,17 @@ void AIS_LocalContext::ClearOutdatedSelection (const Handle(AIS_InteractiveObjec
     }
 
     myDetectedSeq.Remove (anIdx--);
-
+    if (myCurDetected > anIdx)
-    if (anIdx < myCurDetected)
     {
-      myCurDetected--;
+      --myCurDetected;
+    }
+    if (myAISCurDetected > anIdx)
+    {
+      --myAISCurDetected;
     }
   }
-  myCurDetected = Max (myCurDetected, 1);
+  myCurDetected    = Max (myCurDetected,    1);
-
+  myAISCurDetected = Max (myAISCurDetected, 1);
-  Standard_Boolean isAISRemainsDetected = Standard_False;
 
   // 3. AIS_Selection : remove entity owners from AIS_Selection
   const Handle(V3d_Viewer)& aViewer = myCTX->CurrentViewer();
@@ -889,11 +883,7 @@ void AIS_LocalContext::ClearOutdatedSelection (const Handle(AIS_InteractiveObjec
       continue;
     }
 
-    if (aValidOwners.Contains (anOwner))
+    if (!aValidOwners.Contains (anOwner))
-    {
-      isAISRemainsDetected = Standard_True;
-    }
-    else
     {
       aRemoveEntites.Append (anOwner);
       anOwner->SetSelected (Standard_False);
@@ -968,28 +958,6 @@ void AIS_LocalContext::ClearOutdatedSelection (const Handle(AIS_InteractiveObjec
                       Standard_False);
     }
   }
-
-  // Renew iterator of ::DetectedCurrentObject()
-  if (!isAISRemainsDetected)
-  {
-    // Remove the interactive object from detected sequences
-    for (Standard_Integer anIdx = 1; anIdx <= myAISDetectedSeq.Length(); ++anIdx)
-    {
-      Handle(AIS_InteractiveObject) aDetectedIO = myAISDetectedSeq.Value (anIdx);
-      if (aDetectedIO.IsNull() || aDetectedIO != theIO)
-      {
-        continue;
-      }
-
-      myAISDetectedSeq.Remove (anIdx--);
-
-      if (anIdx < myAISCurDetected)
-      {
-        myAISCurDetected--;
-      }
-    }
-    myAISCurDetected = Max (myAISCurDetected, 1);
-  }
 }
 
 //=======================================================================
@@ -1454,7 +1422,7 @@ Handle(SelectMgr_EntityOwner) AIS_LocalContext::FindSelectedOwnerFromShape(const
 //=======================================================================
 void AIS_LocalContext::InitDetected()
 {
-  myAISCurDetected = myAISDetectedSeq.Length()? 1 : 0;
+  myAISCurDetected = !myDetectedSeq.IsEmpty() ? myDetectedSeq.Lower() : 0;
 }
 
 //=======================================================================
@@ -1463,7 +1431,8 @@ void AIS_LocalContext::InitDetected()
 //=======================================================================
 Standard_Boolean AIS_LocalContext::MoreDetected() const
 {
-  return (myAISCurDetected > 0 && myAISCurDetected <= myAISDetectedSeq.Length());
+  return myAISCurDetected >= myDetectedSeq.Lower()
+      && myAISCurDetected <= myDetectedSeq.Upper();
 }
 
 //=======================================================================
@@ -1490,13 +1459,29 @@ const TopoDS_Shape& AIS_LocalContext::DetectedCurrentShape() const
 
   return aCurrentShape->Shape();
 }
+
+//=======================================================================
+//function : DetectedCurrentOwner
+//purpose  :
+//=======================================================================
+Handle(SelectMgr_EntityOwner) AIS_LocalContext::DetectedCurrentOwner() const
+{
+  return MoreDetected()
+       ? myMainVS->Picked (myDetectedSeq (myAISCurDetected))
+       : Handle(SelectMgr_EntityOwner)();
+}
+
 //=======================================================================
 //function : DetectedCurrentObject
 //purpose  :
 //=======================================================================
 Handle(AIS_InteractiveObject) AIS_LocalContext::DetectedCurrentObject() const
 {
-  return MoreDetected() ? myAISDetectedSeq(myAISCurDetected) : NULL;
+  if (!MoreDetected())
+  {
+    return Handle(AIS_InteractiveObject)();
+  }
+  return Handle(AIS_InteractiveObject)::DownCast (myMainVS->Picked (myDetectedSeq (myAISCurDetected))->Selectable());
 }
 
 //=======================================================================