0025933: Visualization - Forward AIS_InteractiveObject::Redisplay() execution to...

AIS_InteractiveObject::Redisplay now redirects the execution to interactive context;
All calls to AIS_InteractiveObject::Redisplay were replaced by AIS_InteractiveContext::Redisplay

Small correction of test case

diff --git a/src/AIS/AIS_InteractiveContext.cxx b/src/AIS/AIS_InteractiveContext.cxx
index d026bceb91ab255f0d93da8fbd9df8de9a3e7d87..ffe89cfd72733466981fcd3fbcbb9d658f591324 100644 (file)
--- a/src/AIS/AIS_InteractiveContext.cxx
+++ b/src/AIS/AIS_InteractiveContext.cxx
@@ -1693,7 +1693,8 @@ void AIS_InteractiveContext::redisplayPrsRecModes (const Handle(AIS_InteractiveO
 {
   if (theIObj->RecomputeEveryPrs())
   {
-    theIObj->Redisplay();
+    theIObj->Update (Standard_True);
+    theIObj->UpdateSelection();
   }
   else
   {
@@ -1719,7 +1720,8 @@ void AIS_InteractiveContext::redisplayPrsModes (const Handle(AIS_InteractiveObje
 {
   if (theIObj->RecomputeEveryPrs())
   {
-    theIObj->Redisplay();
+    theIObj->Update (Standard_True);
+    theIObj->UpdateSelection();
   }
   else
   {
@@ -1904,7 +1906,8 @@ void AIS_InteractiveContext::SetAngleAndDeviation (const Handle(AIS_InteractiveO
 
   if (theIObj->RecomputeEveryPrs())
   {
-    theIObj->Redisplay();
+    theIObj->Update (Standard_True);
+    theIObj->UpdateSelection();
   }
   else
   {

diff --git a/src/AIS/AIS_InteractiveObject.cdl b/src/AIS/AIS_InteractiveObject.cdl
index 3bcaab262ac2f6d93eee6bc67971226f3adddb21..5134ed6e1a4716dc0e3acc97768f935e68196cfb 100644 (file)
--- a/src/AIS/AIS_InteractiveObject.cdl
+++ b/src/AIS/AIS_InteractiveObject.cdl
@@ -173,9 +173,13 @@ is
        -- be implemented when the main mode is not mode 0.
 
 
-    Redisplay (me:mutable; AllModes:Boolean from Standard =Standard_False); 
-       ---Purpose: Updates the active presentation; if <AllModes> = Standard_True
-       --          all the presentations inside are recomputed. 
+    Redisplay (me:mutable; AllModes:Boolean from Standard =Standard_False);
+       ---Purpose: Updates the active presentation; if <AllModes> = Standard_True
+       --          all the presentations inside are recomputed.
+       --          IMPORTANT: It is preferable to call Redisplay method of
+       --          corresponding AIS_InteractiveContext instance for cases when it
+       --          is accessible. This method just redirects call to myCTXPtr,
+       --          so this class field must be up to date for proper result.
     
 
     SetInfiniteState(me:mutable;aFlag:Boolean from Standard = Standard_True);

diff --git a/src/AIS/AIS_InteractiveObject.cxx b/src/AIS/AIS_InteractiveObject.cxx
index 638729dc05a9ce597533dec96692903e74f9c1ac..639c75c434976fe4b1ac90ec30e966fdef7dafe6 100644 (file)
--- a/src/AIS/AIS_InteractiveObject.cxx
+++ b/src/AIS/AIS_InteractiveObject.cxx
@@ -68,13 +68,14 @@ mystate(0)
 
 //=======================================================================
 //function : Redisplay
-//purpose  : 
+//purpose  :
 //=======================================================================
-
-void AIS_InteractiveObject::Redisplay(const Standard_Boolean AllModes)
+void AIS_InteractiveObject::Redisplay (const Standard_Boolean AllModes)
 {
-  Update(AllModes);
-  UpdateSelection();
+  if (myCTXPtr == NULL)
+    return;
+
+  myCTXPtr->Redisplay (this, Standard_False, AllModes);
 }
 
 //=======================================================================

diff --git a/src/ViewerTest/ViewerTest.cxx b/src/ViewerTest/ViewerTest.cxx
index 15008ec52c0353cc12336222e260f0eec9a34d04..410cc3c0665467427e2b70d1e67be11af7496bc1 100644 (file)
--- a/src/ViewerTest/ViewerTest.cxx
+++ b/src/ViewerTest/ViewerTest.cxx
@@ -2182,7 +2182,7 @@ static Standard_Integer VAspects (Draw_Interpretor& /*theDI*/,
       }
       else if (!aColoredPrs.IsNull())
       {
-        aColoredPrs->Redisplay();
+        aCtx->Redisplay (aColoredPrs, Standard_False);
       }
     }
     else

diff --git a/src/ViewerTest/ViewerTest_ViewerCommands.cxx b/src/ViewerTest/ViewerTest_ViewerCommands.cxx
index f6d3d3dc5e711f1400b319794b60a5f10c020072..e1d466e720336f7dc8fa59462e0a4db29b1ef140 100644 (file)
--- a/src/ViewerTest/ViewerTest_ViewerCommands.cxx
+++ b/src/ViewerTest/ViewerTest_ViewerCommands.cxx
@@ -893,7 +893,7 @@ static int VHLR (Draw_Interpretor& di, Standard_Integer argc, const char** argv)
         {
           continue;
         }
-        aShape->Redisplay();
+        ViewerTest::GetAISContext()->Redisplay (aShape, Standard_False);
       }
     }
   }
@@ -939,7 +939,7 @@ static int VHLRType (Draw_Interpretor& di, Standard_Integer argc, const char** a
       if (aShape->TypeOfHLR() != aTypeOfHLR)
         aShape->SetTypeOfHLR (aTypeOfHLR);
       if (MyHLRIsOn)
-        aShape->Redisplay();
+        ViewerTest::GetAISContext()->Redisplay (aShape, Standard_False);
     }
     ViewerTest::CurrentView()->Update();
     return 0;
@@ -962,7 +962,7 @@ static int VHLRType (Draw_Interpretor& di, Standard_Integer argc, const char** a
         continue;
       anAISObject->SetTypeOfHLR (aTypeOfHLR);
       if (MyHLRIsOn)
-        anAISObject->Redisplay();
+        ViewerTest::GetAISContext()->Redisplay (anAISObject, Standard_False);
     }
     ViewerTest::CurrentView()->Update();
   }
@@ -1386,7 +1386,7 @@ void VT_ProcessKeyPress (const char* buf_ret)
           aShape->SetTypeOfHLR (Prs3d_TOH_Algo);
         else
           aShape->SetTypeOfHLR (Prs3d_TOH_PolyAlgo);
-        aShape->Redisplay();
+        aContext->Redisplay (aShape, Standard_False);
       }
     }
     else
@@ -1400,7 +1400,7 @@ void VT_ProcessKeyPress (const char* buf_ret)
           aShape->SetTypeOfHLR (Prs3d_TOH_Algo);
         else
           aShape->SetTypeOfHLR (Prs3d_TOH_PolyAlgo);
-        aShape->Redisplay();
+        aContext->Redisplay (aShape, Standard_False);
       }
     }
 

diff --git a/tests/bugs/fclasses/bug63 b/tests/bugs/fclasses/bug63
index 87bf2e197aed2f9b39a108e04910be07f8e8e157..757646eafb71e6882e7411414be666d66b56489a 100755 (executable)
--- a/tests/bugs/fclasses/bug63
+++ b/tests/bugs/fclasses/bug63
@@ -1,5 +1,5 @@
-puts "TODO OCC23626 Windows: Tcl Exception"
-puts "TODO OCC23626 Windows: TEST INCOMPLETE"
+puts "TODO OCC23626 Debian60-64 Windows: Tcl Exception"
+puts "TODO OCC23626 Debian60-64 Windows: TEST INCOMPLETE"
 
 puts "================"
 puts "OCC63"