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

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

Browse Source 
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
This commit is contained in:
vpa 2015-03-19 16:02:42 +03:00 committed by bugmaster
parent a79f67f8d8
commit 36132a2ec8
6 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/AIS/AIS_InteractiveContext.cxx
View File

@ -1693,7 +1693,8 @@ void AIS_InteractiveContext::redisplayPrsRecModes (const Handle(AIS_InteractiveO
{ {
if (theIObj->RecomputeEveryPrs()) if (theIObj->RecomputeEveryPrs())
{ {
theIObj->Redisplay(); theIObj->Update (Standard_True);
theIObj->UpdateSelection();
} }
else else
{ {
@ -1719,7 +1720,8 @@ void AIS_InteractiveContext::redisplayPrsModes (const Handle(AIS_InteractiveObje
{ {
if (theIObj->RecomputeEveryPrs()) if (theIObj->RecomputeEveryPrs())
{ {
theIObj->Redisplay(); theIObj->Update (Standard_True);
theIObj->UpdateSelection();
} }
else else
{ {
@ -1904,7 +1906,8 @@ void AIS_InteractiveContext::SetAngleAndDeviation (const Handle(AIS_InteractiveO
if (theIObj->RecomputeEveryPrs()) if (theIObj->RecomputeEveryPrs())
{ {
theIObj->Redisplay(); theIObj->Update (Standard_True);
theIObj->UpdateSelection();
} }
else else
{ {

4
src/AIS/AIS_InteractiveObject.cdl
View File

@ -176,6 +176,10 @@ is
Redisplay (me:mutable; AllModes:Boolean from Standard =Standard_False); Redisplay (me:mutable; AllModes:Boolean from Standard =Standard_False);
---Purpose: Updates the active presentation; if <AllModes> = Standard_True ---Purpose: Updates the active presentation; if <AllModes> = Standard_True
-- all the presentations inside are recomputed. -- 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); SetInfiniteState(me:mutable;aFlag:Boolean from Standard = Standard_True);

9
src/AIS/AIS_InteractiveObject.cxx
View File

@ -70,11 +70,12 @@ mystate(0)
//function : Redisplay //function : Redisplay
//purpose : //purpose :
//======================================================================= //=======================================================================
void AIS_InteractiveObject::Redisplay (const Standard_Boolean AllModes)
void AIS_InteractiveObject::Redisplay(const Standard_Boolean AllModes)
{ {
Update(AllModes); if (myCTXPtr == NULL)
UpdateSelection(); return;
myCTXPtr->Redisplay (this, Standard_False, AllModes);
} }
//======================================================================= //=======================================================================

2
src/ViewerTest/ViewerTest.cxx
View File

@ -2182,7 +2182,7 @@ static Standard_Integer VAspects (Draw_Interpretor& /*theDI*/,
} }
else if (!aColoredPrs.IsNull()) else if (!aColoredPrs.IsNull())
{ {
aColoredPrs->Redisplay(); aCtx->Redisplay (aColoredPrs, Standard_False);
} }
} }
else else

10
src/ViewerTest/ViewerTest_ViewerCommands.cxx
View File

@ -893,7 +893,7 @@ static int VHLR (Draw_Interpretor& di, Standard_Integer argc, const char** argv)
{ {
continue; 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) if (aShape->TypeOfHLR() != aTypeOfHLR)
aShape->SetTypeOfHLR (aTypeOfHLR); aShape->SetTypeOfHLR (aTypeOfHLR);
if (MyHLRIsOn) if (MyHLRIsOn)
aShape->Redisplay(); ViewerTest::GetAISContext()->Redisplay (aShape, Standard_False);
} }
ViewerTest::CurrentView()->Update(); ViewerTest::CurrentView()->Update();
return 0; return 0;
@ -962,7 +962,7 @@ static int VHLRType (Draw_Interpretor& di, Standard_Integer argc, const char** a
continue; continue;
anAISObject->SetTypeOfHLR (aTypeOfHLR); anAISObject->SetTypeOfHLR (aTypeOfHLR);
if (MyHLRIsOn) if (MyHLRIsOn)
anAISObject->Redisplay(); ViewerTest::GetAISContext()->Redisplay (anAISObject, Standard_False);
} }
ViewerTest::CurrentView()->Update(); ViewerTest::CurrentView()->Update();
} }
@ -1386,7 +1386,7 @@ void VT_ProcessKeyPress (const char* buf_ret)
aShape->SetTypeOfHLR (Prs3d_TOH_Algo); aShape->SetTypeOfHLR (Prs3d_TOH_Algo);
else else
aShape->SetTypeOfHLR (Prs3d_TOH_PolyAlgo); aShape->SetTypeOfHLR (Prs3d_TOH_PolyAlgo);
aShape->Redisplay(); aContext->Redisplay (aShape, Standard_False);
} }
} }
else else
@ -1400,7 +1400,7 @@ void VT_ProcessKeyPress (const char* buf_ret)
aShape->SetTypeOfHLR (Prs3d_TOH_Algo); aShape->SetTypeOfHLR (Prs3d_TOH_Algo);
else else
aShape->SetTypeOfHLR (Prs3d_TOH_PolyAlgo); aShape->SetTypeOfHLR (Prs3d_TOH_PolyAlgo);
aShape->Redisplay(); aContext->Redisplay (aShape, Standard_False);
} }
} }

4
tests/bugs/fclasses/bug63
View File

@ -1,5 +1,5 @@
puts "TODO OCC23626 Windows: Tcl Exception" puts "TODO OCC23626 Debian60-64 Windows: Tcl Exception"
puts "TODO OCC23626 Windows: TEST INCOMPLETE" puts "TODO OCC23626 Debian60-64 Windows: TEST INCOMPLETE"
puts "================" puts "================"
puts "OCC63" puts "OCC63"