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

0028162: Draw Harness - eliminate usage of deprecated Local Context

Browse Source 
Create a general draw command 'VRelation' and drop the old 'relation' commands.
Add test cases for new draw command "vrelation".
Add two new methods: Activate and Deactivate which activate/deactivate the given selection mode for all displayed objects.
Eliminate deprecated local context methods in ObjectCommands, QABugs.
Eliminate deprecated local context methods in mfc standard sample and qt samples.
This commit is contained in:
isk 2016-11-28 12:11:43 +03:00 committed by apn
parent 0a8630615d
commit 404c893694
55 changed files with 1886 additions and 3290 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
samples/mfc/standard/01_Geometry/src/GeometryDoc.cpp
View File

@ -325,8 +325,8 @@ void CGeometryDoc::Popup (const Standard_Integer theMouseX,
const Handle(V3d_View)& theView) const Handle(V3d_View)& theView)
{ {
Standard_Integer PopupMenuNumber=0; Standard_Integer PopupMenuNumber=0;
GetAISContext()->InitCurrent(); GetAISContext()->InitSelected();
if (GetAISContext()->MoreCurrent()) if (GetAISContext()->MoreSelected())
{ {
PopupMenuNumber=1; PopupMenuNumber=1;
} }

178
samples/mfc/standard/02_Modeling/src/ModelingDoc.cpp
View File

@ -1093,7 +1093,8 @@ myAISContext->SetDisplayMode(ais1,1,Standard_False);
myAISContext->SetColor(ais1,Quantity_NOC_GREEN,Standard_False); myAISContext->SetColor(ais1,Quantity_NOC_GREEN,Standard_False);
myAISContext->SetMaterial(ais1,Graphic3d_NOM_PLASTIC,Standard_False); myAISContext->SetMaterial(ais1,Graphic3d_NOM_PLASTIC,Standard_False);
myAISContext->Display(ais1,Standard_False); myAISContext->Display(ais1,Standard_False);
myAISContext->SetCurrentObject(ais1,Standard_False); const Handle(AIS_InteractiveObject)& anIO1 = ais1;
myAISContext->SetSelected (anIO1, Standard_False);
Fit(); Fit();
Sleep(1000); Sleep(1000);
@ -1104,7 +1105,8 @@ myAISContext->SetDisplayMode(ais2,1,Standard_False);
myAISContext->SetColor(ais2,Quantity_NOC_YELLOW,Standard_False); myAISContext->SetColor(ais2,Quantity_NOC_YELLOW,Standard_False);
myAISContext->SetMaterial(ais2,Graphic3d_NOM_PLASTIC,Standard_False); myAISContext->SetMaterial(ais2,Graphic3d_NOM_PLASTIC,Standard_False);
myAISContext->Display(ais2,Standard_False); myAISContext->Display(ais2,Standard_False);
myAISContext->SetCurrentObject(ais2,Standard_False); const Handle(AIS_InteractiveObject)& anIO2 = ais2;
myAISContext->SetSelected (anIO2, Standard_False);
Fit(); Fit();
Sleep(1000); Sleep(1000);
@ -1118,7 +1120,8 @@ myAISContext->SetDisplayMode(aSection,1,Standard_False);
myAISContext->SetColor(aSection,Quantity_NOC_RED,Standard_False); myAISContext->SetColor(aSection,Quantity_NOC_RED,Standard_False);
myAISContext->SetMaterial(aSection,Graphic3d_NOM_PLASTIC,Standard_False); myAISContext->SetMaterial(aSection,Graphic3d_NOM_PLASTIC,Standard_False);
myAISContext->Display(aSection,Standard_False); myAISContext->Display(aSection,Standard_False);
myAISContext->SetCurrentObject(aSection,Standard_False); const Handle(AIS_InteractiveObject)& anIOSection = aSection;
myAISContext->SetSelected (anIOSection, Standard_False);
Fit(); Fit();
TCollection_AsciiString Message ("\ TCollection_AsciiString Message ("\
@ -1158,7 +1161,8 @@ Handle (AIS_Shape) ais1 = new AIS_Shape(theBox1);
myAISContext->SetColor(ais1,Quantity_NOC_GREEN,Standard_False); myAISContext->SetColor(ais1,Quantity_NOC_GREEN,Standard_False);
myAISContext->SetMaterial(ais1,Graphic3d_NOM_PLASTIC,Standard_False); myAISContext->SetMaterial(ais1,Graphic3d_NOM_PLASTIC,Standard_False);
myAISContext->Display(ais1,Standard_False); myAISContext->Display(ais1,Standard_False);
myAISContext->SetCurrentObject(ais1,Standard_False); const Handle(AIS_InteractiveObject)& anIO1 = ais1;
myAISContext->SetSelected (anIO1, Standard_False);
Fit(); Fit();
Sleep(1000); Sleep(1000);
@ -1167,7 +1171,8 @@ Handle (AIS_Shape) ais2 = new AIS_Shape(theBox2);
myAISContext->SetColor(ais2,Quantity_NOC_YELLOW,Standard_False); myAISContext->SetColor(ais2,Quantity_NOC_YELLOW,Standard_False);
myAISContext->SetMaterial(ais2,Graphic3d_NOM_PLASTIC,Standard_False); myAISContext->SetMaterial(ais2,Graphic3d_NOM_PLASTIC,Standard_False);
myAISContext->Display(ais2,Standard_False); myAISContext->Display(ais2,Standard_False);
myAISContext->SetCurrentObject(ais2,Standard_False); const Handle(AIS_InteractiveObject)& anIO2 = ais2;
myAISContext->SetSelected (anIO2, Standard_False);
Fit(); Fit();
Sleep(1000); Sleep(1000);
@ -1181,7 +1186,8 @@ myAISContext->SetDisplayMode(aFusion,1,Standard_False);
myAISContext->SetColor(aFusion,Quantity_NOC_RED,Standard_False); myAISContext->SetColor(aFusion,Quantity_NOC_RED,Standard_False);
myAISContext->SetMaterial(aFusion,Graphic3d_NOM_PLASTIC,Standard_False); myAISContext->SetMaterial(aFusion,Graphic3d_NOM_PLASTIC,Standard_False);
myAISContext->Display(aFusion,Standard_False); myAISContext->Display(aFusion,Standard_False);
myAISContext->SetCurrentObject(aFusion,Standard_False); const Handle(AIS_InteractiveObject)& anIOFusion = aFusion;
myAISContext->SetSelected (anIOFusion, Standard_False);
Fit(); Fit();
TCollection_AsciiString Message ("\ TCollection_AsciiString Message ("\
@ -1213,7 +1219,8 @@ myAISContext->SetMaterial(aboxshape,Graphic3d_NOM_PLASTIC,Standard_False);
myAISContext->SetDisplayMode(aboxshape,1,Standard_False); myAISContext->SetDisplayMode(aboxshape,1,Standard_False);
myAISContext->SetTransparency(aboxshape,0.2,Standard_False); myAISContext->SetTransparency(aboxshape,0.2,Standard_False);
myAISContext->Display(aboxshape,Standard_False); myAISContext->Display(aboxshape,Standard_False);
myAISContext->SetCurrentObject(aboxshape,Standard_False); const Handle(AIS_InteractiveObject)& anIOBoxShape = aboxshape;
myAISContext->SetSelected (anIOBoxShape, Standard_False);
Fit(); Fit();
Sleep(500); Sleep(500);
@ -1224,7 +1231,8 @@ myAISContext->SetColor(awedge,Quantity_NOC_RED,Standard_False);
myAISContext->SetMaterial(awedge,Graphic3d_NOM_PLASTIC,Standard_False); myAISContext->SetMaterial(awedge,Graphic3d_NOM_PLASTIC,Standard_False);
myAISContext->SetTransparency(awedge,0.0,Standard_False); myAISContext->SetTransparency(awedge,0.0,Standard_False);
myAISContext->Display(awedge,Standard_False); myAISContext->Display(awedge,Standard_False);
myAISContext->SetCurrentObject(awedge,Standard_False); const Handle(AIS_InteractiveObject)& anIOWedge = awedge;
myAISContext->SetSelected (anIOWedge, Standard_False);
Fit(); Fit();
Sleep(500); Sleep(500);
@ -1237,7 +1245,8 @@ Handle(AIS_Shape) acommon = new AIS_Shape(theCommonSurface);
myAISContext->SetColor(acommon,Quantity_NOC_GREEN,Standard_False); myAISContext->SetColor(acommon,Quantity_NOC_GREEN,Standard_False);
myAISContext->SetMaterial(acommon,Graphic3d_NOM_PLASTIC,Standard_False); myAISContext->SetMaterial(acommon,Graphic3d_NOM_PLASTIC,Standard_False);
myAISContext->Display(acommon,Standard_False); myAISContext->Display(acommon,Standard_False);
myAISContext->SetCurrentObject(acommon); const Handle(AIS_InteractiveObject)& anIOCommon = acommon;
myAISContext->SetSelected (anIOCommon, Standard_False);
TCollection_AsciiString Message ("\ TCollection_AsciiString Message ("\
\n\ \n\
@ -1336,7 +1345,8 @@ myAISContext->SetColor(atorus,Quantity_NOC_YELLOW,Standard_False);
myAISContext->SetMaterial(atorus,Graphic3d_NOM_PLASTIC,Standard_False); myAISContext->SetMaterial(atorus,Graphic3d_NOM_PLASTIC,Standard_False);
myAISContext->SetTransparency(atorus,0.1,Standard_False); myAISContext->SetTransparency(atorus,0.1,Standard_False);
myAISContext->Display(atorus,Standard_False); myAISContext->Display(atorus,Standard_False);
myAISContext->SetCurrentObject(atorus,Standard_False); const Handle(AIS_InteractiveObject)& anIOTorus = atorus;
myAISContext->SetSelected (anIOTorus, Standard_False);
Fit(); Fit();
Sleep(500); Sleep(500);
@ -1344,7 +1354,8 @@ gp_Pln aplane(1,0.25,3,4);
Handle (Geom_Plane) thePlane = new Geom_Plane(aplane); Handle (Geom_Plane) thePlane = new Geom_Plane(aplane);
Handle (AIS_Plane) ais1 = new AIS_Plane(thePlane); Handle (AIS_Plane) ais1 = new AIS_Plane(thePlane);
myAISContext->Display(ais1,Standard_False); myAISContext->Display(ais1,Standard_False);
myAISContext->SetCurrentObject(ais1,Standard_False); const Handle(AIS_InteractiveObject)& anIO1 = ais1;
myAISContext->SetSelected (anIO1, Standard_False);
Fit(); Fit();
Sleep(300); Sleep(300);
@ -1386,7 +1397,8 @@ Handle(AIS_Shape) ais1 = new AIS_Shape(Box);
myAISContext->SetColor(ais1,Quantity_NOC_YELLOW,Standard_False); myAISContext->SetColor(ais1,Quantity_NOC_YELLOW,Standard_False);
myAISContext->SetMaterial(ais1,Graphic3d_NOM_PLASTIC,Standard_False); myAISContext->SetMaterial(ais1,Graphic3d_NOM_PLASTIC,Standard_False);
myAISContext->Display(ais1,Standard_False); myAISContext->Display(ais1,Standard_False);
myAISContext->SetCurrentObject(ais1,Standard_False); const Handle(AIS_InteractiveObject)& anIO1 = ais1;
myAISContext->SetSelected (anIO1, Standard_False);
Fit(); Fit();
Sleep(500); Sleep(500);
@ -1404,7 +1416,8 @@ Handle(AIS_Shape) aBlendbox = new AIS_Shape(blendedBox);
myAISContext->SetColor(aBlendbox,Quantity_NOC_YELLOW,Standard_False); myAISContext->SetColor(aBlendbox,Quantity_NOC_YELLOW,Standard_False);
myAISContext->SetMaterial(aBlendbox,Graphic3d_NOM_PLASTIC,Standard_False); myAISContext->SetMaterial(aBlendbox,Graphic3d_NOM_PLASTIC,Standard_False);
myAISContext->Display(aBlendbox,Standard_False); myAISContext->Display(aBlendbox,Standard_False);
myAISContext->SetCurrentObject(aBlendbox,Standard_False); const Handle(AIS_InteractiveObject)& anIOBlendBox = aBlendbox;
myAISContext->SetSelected (anIOBlendBox, Standard_False);
Fit(); Fit();
Sleep(500); Sleep(500);
@ -1418,7 +1431,8 @@ Handle(AIS_Shape) ais2 = new AIS_Shape(fusedShape);
myAISContext->SetColor(ais2,Quantity_NOC_RED,Standard_False); myAISContext->SetColor(ais2,Quantity_NOC_RED,Standard_False);
myAISContext->SetMaterial(ais2,Graphic3d_NOM_PLASTIC,Standard_False); myAISContext->SetMaterial(ais2,Graphic3d_NOM_PLASTIC,Standard_False);
myAISContext->Display(ais2,Standard_False); myAISContext->Display(ais2,Standard_False);
myAISContext->SetCurrentObject(ais2,Standard_False); const Handle(AIS_InteractiveObject)& anIO2 = ais2;
myAISContext->SetSelected (anIO2, Standard_False);
Fit(); Fit();
BRepFilletAPI_MakeFillet fill(fusedShape); BRepFilletAPI_MakeFillet fill(fusedShape);
@ -1503,7 +1517,8 @@ Handle(AIS_Shape) ais1 = new AIS_Shape(theBox);
myAISContext->SetColor(ais1,Quantity_NOC_BROWN,Standard_False); myAISContext->SetColor(ais1,Quantity_NOC_BROWN,Standard_False);
myAISContext->SetMaterial(ais1,Graphic3d_NOM_PLASTIC,Standard_False); myAISContext->SetMaterial(ais1,Graphic3d_NOM_PLASTIC,Standard_False);
myAISContext->Display(ais1,Standard_False); myAISContext->Display(ais1,Standard_False);
myAISContext->SetCurrentObject(ais1,Standard_False); const Handle(AIS_InteractiveObject)& anIO1 = ais1;
myAISContext->SetSelected (anIO1, Standard_False);
Fit(); Fit();
Sleep(500); Sleep(500);
@ -1520,7 +1535,7 @@ if (Rake.IsDone() ){
TopoDS_Shape evolvedBox = Rake.Shape(); TopoDS_Shape evolvedBox = Rake.Shape();
ais1->Set(evolvedBox); ais1->Set(evolvedBox);
myAISContext->Redisplay(ais1,Standard_False); myAISContext->Redisplay(ais1,Standard_False);
myAISContext->SetCurrentObject(ais1,Standard_False); myAISContext->SetSelected(anIO1, Standard_False);
Fit(); Fit();
Sleep(500); Sleep(500);
@ -1531,7 +1546,8 @@ Handle(AIS_Shape) ais3 = new AIS_Shape(theCylinder);
myAISContext->SetColor(ais3,Quantity_NOC_GREEN,Standard_False); myAISContext->SetColor(ais3,Quantity_NOC_GREEN,Standard_False);
myAISContext->SetMaterial(ais3,Graphic3d_NOM_PLASTIC,Standard_False); myAISContext->SetMaterial(ais3,Graphic3d_NOM_PLASTIC,Standard_False);
myAISContext->Display(ais3,Standard_False); myAISContext->Display(ais3,Standard_False);
myAISContext->SetCurrentObject(ais3,Standard_False); const Handle(AIS_InteractiveObject)& anIO3 = ais3;
myAISContext->SetSelected (anIO3, Standard_False);
Fit(); Fit();
Sleep(500); Sleep(500);
@ -1551,7 +1567,7 @@ if (fillet.IsDone() ){
TopoDS_Shape LawEvolvedCylinder = fillet.Shape(); TopoDS_Shape LawEvolvedCylinder = fillet.Shape();
ais3->Set(LawEvolvedCylinder); ais3->Set(LawEvolvedCylinder);
myAISContext->Redisplay(ais3,Standard_False); myAISContext->Redisplay(ais3,Standard_False);
myAISContext->SetCurrentObject(ais3,Standard_False); myAISContext->SetSelected(anIO3,Standard_False);
Fit(); Fit();
Sleep(500); Sleep(500);
} }
@ -1562,7 +1578,8 @@ Handle(AIS_Shape) ais2 = new AIS_Shape(theBox2);
myAISContext->SetColor(ais2,Quantity_NOC_RED,Standard_False); myAISContext->SetColor(ais2,Quantity_NOC_RED,Standard_False);
myAISContext->SetMaterial(ais2,Graphic3d_NOM_PLASTIC,Standard_False); myAISContext->SetMaterial(ais2,Graphic3d_NOM_PLASTIC,Standard_False);
myAISContext->Display(ais2,Standard_False); myAISContext->Display(ais2,Standard_False);
myAISContext->SetCurrentObject(ais2,Standard_False); const Handle(AIS_InteractiveObject)& anIO2 = ais2;
myAISContext->SetSelected (anIO2, Standard_False);
Fit(); Fit();
Sleep(500); Sleep(500);
@ -1597,7 +1614,7 @@ if (afillet.IsDone() ){
TopoDS_Shape LawevolvedBox = afillet.Shape(); TopoDS_Shape LawevolvedBox = afillet.Shape();
ais2->Set(LawevolvedBox); ais2->Set(LawevolvedBox);
myAISContext->Redisplay(ais2,Standard_False); myAISContext->Redisplay(ais2,Standard_False);
myAISContext->SetCurrentObject(ais2,Standard_False); myAISContext->SetSelected(anIO2,Standard_False);
Fit(); Fit();
} }
@ -1698,7 +1715,8 @@ Handle(AIS_Shape) ais1 = new AIS_Shape(theBox);
myAISContext->SetColor(ais1,Quantity_NOC_YELLOW,Standard_False); myAISContext->SetColor(ais1,Quantity_NOC_YELLOW,Standard_False);
myAISContext->SetMaterial(ais1,Graphic3d_NOM_PLASTIC,Standard_False); myAISContext->SetMaterial(ais1,Graphic3d_NOM_PLASTIC,Standard_False);
myAISContext->Display(ais1,Standard_False); myAISContext->Display(ais1,Standard_False);
myAISContext->SetCurrentObject(ais1,Standard_False); const Handle(AIS_InteractiveObject)& anIO1 = ais1;
myAISContext->SetSelected (anIO1, Standard_False);
Fit(); Fit();
Sleep(500); Sleep(500);
@ -1717,7 +1735,8 @@ Handle(AIS_Shape) aBlendedBox = new AIS_Shape(ChanfrenedBox);
myAISContext->SetColor(aBlendedBox,Quantity_NOC_YELLOW,Standard_False); myAISContext->SetColor(aBlendedBox,Quantity_NOC_YELLOW,Standard_False);
myAISContext->SetMaterial(aBlendedBox,Graphic3d_NOM_PLASTIC,Standard_False); myAISContext->SetMaterial(aBlendedBox,Graphic3d_NOM_PLASTIC,Standard_False);
myAISContext->Display(aBlendedBox,Standard_False); myAISContext->Display(aBlendedBox,Standard_False);
myAISContext->SetCurrentObject(aBlendedBox,Standard_False); const Handle(AIS_InteractiveObject)& anIOBlendedBox = aBlendedBox;
myAISContext->SetSelected (anIOBlendedBox, Standard_False);
Fit(); Fit();
Sleep(500); Sleep(500);
@ -1757,7 +1776,8 @@ void CModelingDoc::OnPrismLocal()
myAISContext->SetColor(ais1,Quantity_NOC_GREEN,Standard_False); myAISContext->SetColor(ais1,Quantity_NOC_GREEN,Standard_False);
myAISContext->SetMaterial(ais1,Graphic3d_NOM_PLASTIC,Standard_False); myAISContext->SetMaterial(ais1,Graphic3d_NOM_PLASTIC,Standard_False);
myAISContext->Display(ais1,Standard_False); myAISContext->Display(ais1,Standard_False);
myAISContext->SetCurrentObject(ais1,Standard_False); const Handle(AIS_InteractiveObject)& anIO1 = ais1;
myAISContext->SetSelected (anIO1, Standard_False);
Fit(); Fit();
Sleep(500); Sleep(500);
@ -1800,7 +1820,7 @@ void CModelingDoc::OnPrismLocal()
ais1->Set(res1); ais1->Set(res1);
myAISContext->Redisplay(ais1,Standard_False); myAISContext->Redisplay(ais1,Standard_False);
myAISContext->SetCurrentObject(ais1,Standard_False); myAISContext->SetSelected(anIO1,Standard_False);
Fit(); Fit();
Sleep(500); Sleep(500);
@ -1834,7 +1854,7 @@ void CModelingDoc::OnPrismLocal()
ais1->Set(res2); ais1->Set(res2);
myAISContext->Redisplay(ais1); myAISContext->Redisplay(ais1);
myAISContext->SetCurrentObject(ais1,Standard_False); myAISContext->SetSelected(anIO1,Standard_False);
Fit(); Fit();
TCollection_AsciiString Message ("\ TCollection_AsciiString Message ("\
@ -1954,14 +1974,15 @@ void CModelingDoc::OnDprismLocal()
TopoDS_Shape res1 = MKDP.Shape(); TopoDS_Shape res1 = MKDP.Shape();
myAISContext->Display(ais1,Standard_False); myAISContext->Display(ais1,Standard_False);
myAISContext->SetCurrentObject(ais1,Standard_False); const Handle(AIS_InteractiveObject)& anIO1 = ais1;
myAISContext->SetSelected (anIO1, Standard_False);
Fit(); Fit();
Sleep(500); Sleep(500);
ais1->Set(res1); ais1->Set(res1);
myAISContext->Redisplay(ais1,Standard_False); myAISContext->Redisplay(ais1,Standard_False);
myAISContext->SetCurrentObject(ais1,Standard_False); myAISContext->SetSelected(anIO1,Standard_False);
Fit(); Fit();
@ -2011,7 +2032,8 @@ void CModelingDoc::OnRevolLocal()
myAISContext->SetColor(ais1,Quantity_NOC_CORAL,Standard_False); myAISContext->SetColor(ais1,Quantity_NOC_CORAL,Standard_False);
myAISContext->SetMaterial(ais1,Graphic3d_NOM_PLASTIC,Standard_False); myAISContext->SetMaterial(ais1,Graphic3d_NOM_PLASTIC,Standard_False);
myAISContext->Display(ais1,Standard_False); myAISContext->Display(ais1,Standard_False);
myAISContext->SetCurrentObject(ais1,Standard_False); const Handle(AIS_InteractiveObject)& anIO1 = ais1;
myAISContext->SetSelected (anIO1, Standard_False);
Fit(); Fit();
Sleep(500); Sleep(500);
@ -2053,7 +2075,8 @@ void CModelingDoc::OnRevolLocal()
myAISContext->Remove(ais1); myAISContext->Remove(ais1);
Handle(AIS_Shape) ais2 = new AIS_Shape(res1); Handle(AIS_Shape) ais2 = new AIS_Shape(res1);
myAISContext->Display(ais2,Standard_False); myAISContext->Display(ais2,Standard_False);
myAISContext->SetCurrentObject(ais2,Standard_False); const Handle(AIS_InteractiveObject)& anIO2 = ais2;
myAISContext->SetSelected (anIO2, Standard_False);
Fit(); Fit();
TCollection_AsciiString Message ("\ TCollection_AsciiString Message ("\
@ -2109,7 +2132,8 @@ void CModelingDoc::OnGlueLocal()
myAISContext->SetColor(ais1,Quantity_NOC_ORANGE,Standard_False); myAISContext->SetColor(ais1,Quantity_NOC_ORANGE,Standard_False);
myAISContext->SetMaterial(ais1,Graphic3d_NOM_PLASTIC,Standard_False); myAISContext->SetMaterial(ais1,Graphic3d_NOM_PLASTIC,Standard_False);
myAISContext->Display(ais1,Standard_False); myAISContext->Display(ais1,Standard_False);
myAISContext->SetCurrentObject(ais1,Standard_False); const Handle(AIS_InteractiveObject)& anIO1 = ais1;
myAISContext->SetSelected (anIO1, Standard_False);
Fit(); Fit();
Sleep(1000); Sleep(1000);
@ -2127,7 +2151,8 @@ void CModelingDoc::OnGlueLocal()
myAISContext->SetColor(ais2,Quantity_NOC_AZURE,Standard_False); myAISContext->SetColor(ais2,Quantity_NOC_AZURE,Standard_False);
myAISContext->SetMaterial(ais2,Graphic3d_NOM_PLASTIC,Standard_False); myAISContext->SetMaterial(ais2,Graphic3d_NOM_PLASTIC,Standard_False);
myAISContext->Display(ais2,Standard_False); myAISContext->Display(ais2,Standard_False);
myAISContext->SetCurrentObject(ais2,Standard_False); const Handle(AIS_InteractiveObject)& anIO2 = ais2;
myAISContext->SetSelected (anIO2, Standard_False);
Fit(); Fit();
Sleep(1000); Sleep(1000);
@ -2146,7 +2171,7 @@ void CModelingDoc::OnGlueLocal()
ais1->Set(res1); ais1->Set(res1);
myAISContext->Redisplay(ais1); myAISContext->Redisplay(ais1);
myAISContext->SetCurrentObject(ais1,Standard_False); myAISContext->SetSelected(anIO1,Standard_False);
Fit(); Fit();
Sleep(1000); Sleep(1000);
@ -2156,7 +2181,8 @@ void CModelingDoc::OnGlueLocal()
myAISContext->SetColor(ais3,Quantity_NOC_ORANGE,Standard_False); myAISContext->SetColor(ais3,Quantity_NOC_ORANGE,Standard_False);
myAISContext->SetMaterial(ais3,Graphic3d_NOM_PLASTIC,Standard_False); myAISContext->SetMaterial(ais3,Graphic3d_NOM_PLASTIC,Standard_False);
myAISContext->Display(ais3,Standard_False); myAISContext->Display(ais3,Standard_False);
myAISContext->SetCurrentObject(ais3,Standard_False); const Handle(AIS_InteractiveObject)& anIO3 = ais3;
myAISContext->SetSelected (anIO3, Standard_False);
Fit(); Fit();
Sleep(1000); Sleep(1000);
@ -2174,7 +2200,8 @@ void CModelingDoc::OnGlueLocal()
myAISContext->SetColor(ais4,Quantity_NOC_AZURE,Standard_False); myAISContext->SetColor(ais4,Quantity_NOC_AZURE,Standard_False);
myAISContext->SetMaterial(ais4,Graphic3d_NOM_PLASTIC,Standard_False); myAISContext->SetMaterial(ais4,Graphic3d_NOM_PLASTIC,Standard_False);
myAISContext->Display(ais4,Standard_False); myAISContext->Display(ais4,Standard_False);
myAISContext->SetCurrentObject(ais4,Standard_False); const Handle(AIS_InteractiveObject)& anIO4 = ais4;
myAISContext->SetSelected (anIO4, Standard_False);
Fit(); Fit();
Sleep(1000); Sleep(1000);
@ -2196,7 +2223,7 @@ void CModelingDoc::OnGlueLocal()
ais4->Set(res2); ais4->Set(res2);
myAISContext->Redisplay(ais4,Standard_False); myAISContext->Redisplay(ais4,Standard_False);
myAISContext->SetCurrentObject(ais4,Standard_False); myAISContext->SetSelected(anIO4,Standard_False);
Fit(); Fit();
Sleep(1000); Sleep(1000);
@ -2269,7 +2296,8 @@ void CModelingDoc::OnPipeLocal()
myAISContext->SetColor(ais1,Quantity_NOC_CORAL,Standard_False); myAISContext->SetColor(ais1,Quantity_NOC_CORAL,Standard_False);
myAISContext->SetMaterial(ais1,Graphic3d_NOM_PLASTIC,Standard_False); myAISContext->SetMaterial(ais1,Graphic3d_NOM_PLASTIC,Standard_False);
myAISContext->Display(ais1,Standard_False); myAISContext->Display(ais1,Standard_False);
myAISContext->SetCurrentObject(ais1,Standard_False); const Handle(AIS_InteractiveObject)& anIO1 = ais1;
myAISContext->SetSelected (anIO1, Standard_False);
Fit(); Fit();
Sleep(500); Sleep(500);
@ -2314,7 +2342,7 @@ void CModelingDoc::OnPipeLocal()
ais1->Set(res1); ais1->Set(res1);
myAISContext->Redisplay(ais1,Standard_False); myAISContext->Redisplay(ais1,Standard_False);
myAISContext->SetCurrentObject(ais1,Standard_False); myAISContext->SetSelected(anIO1,Standard_False);
Fit(); Fit();
TCollection_AsciiString Message ("\ TCollection_AsciiString Message ("\
@ -2396,7 +2424,8 @@ void CModelingDoc::OnLinearLocal()
myAISContext->SetColor(ais1,Quantity_NOC_CYAN2,Standard_False); myAISContext->SetColor(ais1,Quantity_NOC_CYAN2,Standard_False);
myAISContext->SetMaterial(ais1,Graphic3d_NOM_PLASTIC,Standard_False); myAISContext->SetMaterial(ais1,Graphic3d_NOM_PLASTIC,Standard_False);
myAISContext->Display(ais1,Standard_False); myAISContext->Display(ais1,Standard_False);
myAISContext->SetCurrentObject(ais1,Standard_False); const Handle(AIS_InteractiveObject)& anIO1 = ais1;
myAISContext->SetSelected (anIO1, Standard_False);
Fit(); Fit();
Sleep(500); Sleep(500);
@ -2410,7 +2439,7 @@ void CModelingDoc::OnLinearLocal()
TopoDS_Shape res = aform.Shape(); TopoDS_Shape res = aform.Shape();
ais1->Set(res); ais1->Set(res);
myAISContext->Redisplay(ais1,Standard_False); myAISContext->Redisplay(ais1,Standard_False);
myAISContext->SetCurrentObject(ais1); myAISContext->SetSelected(anIO1);
Fit(); Fit();
TCollection_AsciiString Message ("\ TCollection_AsciiString Message ("\
@ -2462,7 +2491,8 @@ void CModelingDoc::OnSplitLocal()
myAISContext->SetColor(ais1,Quantity_NOC_RED,Standard_False); myAISContext->SetColor(ais1,Quantity_NOC_RED,Standard_False);
myAISContext->SetMaterial(ais1,Graphic3d_NOM_PLASTIC,Standard_False); myAISContext->SetMaterial(ais1,Graphic3d_NOM_PLASTIC,Standard_False);
myAISContext->Display(ais1,Standard_False); myAISContext->Display(ais1,Standard_False);
myAISContext->SetCurrentObject(ais1,Standard_False); const Handle(AIS_InteractiveObject)& anIO1 = ais1;
myAISContext->SetSelected (anIO1, Standard_False);
Fit(); Fit();
Sleep(500); Sleep(500);
@ -2499,7 +2529,8 @@ void CModelingDoc::OnSplitLocal()
myAISContext->SetMaterial(ais2,Graphic3d_NOM_PLASTIC,Standard_False); myAISContext->SetMaterial(ais2,Graphic3d_NOM_PLASTIC,Standard_False);
myAISContext->SetDisplayMode(ais2,1,Standard_False); myAISContext->SetDisplayMode(ais2,1,Standard_False);
myAISContext->Display(ais2,Standard_False); myAISContext->Display(ais2,Standard_False);
myAISContext->SetCurrentObject(ais2,Standard_False); const Handle(AIS_InteractiveObject)& anIO2 = ais2;
myAISContext->SetSelected (anIO2, Standard_False);
Fit(); Fit();
TCollection_AsciiString Message ("\ TCollection_AsciiString Message ("\
\n\ \n\
@ -2549,7 +2580,8 @@ void CModelingDoc::OnThickLocal()
myAISContext->SetColor(abox1,Quantity_NOC_WHITE); myAISContext->SetColor(abox1,Quantity_NOC_WHITE);
myAISContext->SetMaterial(abox1,Graphic3d_NOM_PLASTIC,Standard_False); myAISContext->SetMaterial(abox1,Graphic3d_NOM_PLASTIC,Standard_False);
myAISContext->Display(abox1,Standard_False); myAISContext->Display(abox1,Standard_False);
myAISContext->SetCurrentObject(abox1,Standard_False); const Handle(AIS_InteractiveObject)& anIOBox1 = abox1;
myAISContext->SetSelected (anIOBox1, Standard_False);
Fit(); Fit();
Sleep(1000); Sleep(1000);
@ -2567,7 +2599,8 @@ void CModelingDoc::OnThickLocal()
myAISContext->SetColor(ais1,Quantity_NOC_RED,Standard_False); myAISContext->SetColor(ais1,Quantity_NOC_RED,Standard_False);
myAISContext->SetMaterial(ais1,Graphic3d_NOM_PLASTIC,Standard_False); myAISContext->SetMaterial(ais1,Graphic3d_NOM_PLASTIC,Standard_False);
myAISContext->Display(ais1,Standard_False); myAISContext->Display(ais1,Standard_False);
myAISContext->SetCurrentObject(ais1,Standard_False); const Handle(AIS_InteractiveObject)& anIO1 = ais1;
myAISContext->SetSelected (anIO1, Standard_False);
Fit(); Fit();
Sleep(1000); Sleep(1000);
@ -3286,7 +3319,7 @@ void CModelingDoc::OnShell()
Handle(AIS_Shape) anAISShell = new AIS_Shape(aShell); Handle(AIS_Shape) anAISShell = new AIS_Shape(aShell);
myAISContext->SetDisplayMode(anAISShell,0); myAISContext->SetDisplayMode(anAISShell,0);
myAISContext->Display(anAISShell,Standard_False); myAISContext->Display(anAISShell,Standard_False);
//myAISContext->SetCurrentObject(anAISShell); //myAISContext->SetSelected(anAISShell);
Fit(); Fit();
@ -4598,10 +4631,9 @@ gp_Mat I = System.MatrixOfInertia();\n\
void CModelingDoc::OnButtonFill() void CModelingDoc::OnButtonFill()
{ {
// TODO: Add your command handler code here // TODO: Add your command handler code here
myAISContext->InitCurrent(); myAISContext->InitSelected();
if (myAISContext->MoreCurrent()) { if (myAISContext->MoreSelected()) {
AIS1 = Handle(AIS_Shape)::DownCast(myAISContext->Current()); AIS1 = Handle(AIS_Shape)::DownCast(myAISContext->SelectedInteractive());
myAISContext->OpenLocalContext();
myAISContext->Unhilight(AIS1); myAISContext->Unhilight(AIS1);
myAISContext->Activate(AIS1,2); myAISContext->Activate(AIS1,2);
myState = SELECT_EDGE_PLATE; myState = SELECT_EDGE_PLATE;
@ -4613,7 +4645,7 @@ void CModelingDoc::OnButtonFill()
if(OnFileImportBrep_WithInitDir (L"HoleFilling") == 1) if(OnFileImportBrep_WithInitDir (L"HoleFilling") == 1)
return; return;
myAISContext->DisplayedObjects(LI); myAISContext->DisplayedObjects(LI);
myAISContext->SetCurrentObject(LI.First()); myAISContext->SetSelected(LI.First());
OnButtonFill(); OnButtonFill();
return; return;
} }
@ -4725,7 +4757,6 @@ void CModelingDoc::OnStopStop()
} }
if (!BRepAlgo::IsValid(aface)) if (!BRepAlgo::IsValid(aface))
MessageBoxW (AfxGetApp()->m_pMainWnd->m_hWnd, L"Error : The plate face is not valid!", L"CasCade Error", MB_ICONERROR); MessageBoxW (AfxGetApp()->m_pMainWnd->m_hWnd, L"Error : The plate face is not valid!", L"CasCade Error", MB_ICONERROR);
myAISContext->CloseLocalContext();
myState = -1; myState = -1;
Handle(AIS_Shape) anAISShape = new AIS_Shape(aface); Handle(AIS_Shape) anAISShape = new AIS_Shape(aface);
myAISContext->SetColor(anAISShape,Quantity_NOC_AZURE); myAISContext->SetColor(anAISShape,Quantity_NOC_AZURE);
@ -4741,9 +4772,9 @@ void CModelingDoc::OnFillwithtang()
if (flag == 1){ if (flag == 1){
flag = 0; flag = 0;
Handle(AIS_InteractiveObject) aObject; Handle(AIS_InteractiveObject) aObject;
myAISContext ->InitCurrent(); myAISContext ->InitSelected();
if(myAISContext->MoreCurrent()) if(myAISContext->MoreSelected())
aObject = myAISContext->Current(); aObject = myAISContext->SelectedInteractive();
((OCC_MainFrame*)AfxGetMainWnd())->SetStatusMessage("Select a file with second face"); ((OCC_MainFrame*)AfxGetMainWnd())->SetStatusMessage("Select a file with second face");
if(OnFileImportBrep_WithInitDir (L"TangentSurface") == 1){ if(OnFileImportBrep_WithInitDir (L"TangentSurface") == 1){
((OCC_MainFrame*)AfxGetMainWnd())->SetStatusMessage(""); ((OCC_MainFrame*)AfxGetMainWnd())->SetStatusMessage("");
@ -4755,12 +4786,12 @@ void CModelingDoc::OnFillwithtang()
} }
return; return;
} }
myAISContext->SetCurrentObject(aObject); myAISContext->SetSelected(aObject);
} }
myAISContext->InitCurrent(); myAISContext->InitSelected();
if (myAISContext->MoreCurrent()) { if (myAISContext->MoreSelected()) {
Handle(AIS_Shape) ashape = Handle(AIS_Shape)::DownCast(myAISContext->Current()); Handle(AIS_Shape) ashape = Handle(AIS_Shape)::DownCast(myAISContext->SelectedInteractive());
try { try {
THE_F1 = TopoDS::Face(ashape->Shape()); THE_F1 = TopoDS::Face(ashape->Shape());
} }
@ -4771,7 +4802,6 @@ void CModelingDoc::OnFillwithtang()
Please, select a face to continue\nthe creation of a tangent surface."); Please, select a face to continue\nthe creation of a tangent surface.");
return; return;
} }
myAISContext->OpenLocalContext();
myAISContext->Activate(ashape,2); myAISContext->Activate(ashape,2);
myState = SELECT_EDGE_PLATE_TGTES_1; myState = SELECT_EDGE_PLATE_TGTES_1;
@ -4795,7 +4825,7 @@ Please, select a face to continue\nthe creation of a tangent surface.");
} }
((OCC_MainFrame*)AfxGetMainWnd())->SetStatusMessage(""); ((OCC_MainFrame*)AfxGetMainWnd())->SetStatusMessage("");
myAISContext->DisplayedObjects(LI); myAISContext->DisplayedObjects(LI);
myAISContext->SetCurrentObject(LI.First()); myAISContext->SetSelected(LI.First());
Sleep(700); Sleep(700);
flag = 1; flag = 1;
OnFillwithtang(); OnFillwithtang();
@ -4814,21 +4844,19 @@ void CModelingDoc::InputEvent(const Standard_Integer /*x*/,
myAISContext->InitSelected(); myAISContext->InitSelected();
if (myAISContext->MoreSelected()) { if (myAISContext->MoreSelected()) {
THE_E1 = TopoDS::Edge(myAISContext->SelectedShape()); THE_E1 = TopoDS::Edge(myAISContext->SelectedShape());
myAISContext->CloseLocalContext();
myState = SELECT_EDGE_PLATE_TGTES_2; myState = SELECT_EDGE_PLATE_TGTES_2;
AIS_ListOfInteractive aLI; AIS_ListOfInteractive aLI;
myAISContext->DisplayedObjects(aLI); myAISContext->DisplayedObjects(aLI);
if(aLI.Extent() == 2){ if(aLI.Extent() == 2){
myState = SELECT_EDGE_PLATE_TGTES_2; myState = SELECT_EDGE_PLATE_TGTES_2;
if (myAISContext->IsCurrent(aLI.First())) if (myAISContext->IsSelected(aLI.First()))
myAISContext->SetCurrentObject(aLI.Last()); myAISContext->SetSelected(aLI.Last());
else else
myAISContext->SetCurrentObject(aLI.First()); myAISContext->SetSelected(aLI.First());
myAISContext->InitCurrent(); myAISContext->InitSelected();
Handle(AIS_Shape) ashape = Handle(AIS_Shape)::DownCast(myAISContext->Current()); Handle(AIS_Shape) ashape = Handle(AIS_Shape)::DownCast(myAISContext->SelectedInteractive());
THE_F2 = TopoDS::Face(ashape->Shape()); THE_F2 = TopoDS::Face(ashape->Shape());
myAISContext->OpenLocalContext();
myAISContext->Activate(ashape,2); myAISContext->Activate(ashape,2);
myState = SELECT_EDGE_PLATE_TGTES_3; myState = SELECT_EDGE_PLATE_TGTES_3;
((OCC_MainFrame*)AfxGetMainWnd())->SetStatusMessage("Select an edge on the second face"); ((OCC_MainFrame*)AfxGetMainWnd())->SetStatusMessage("Select an edge on the second face");
@ -4848,11 +4876,10 @@ void CModelingDoc::InputEvent(const Standard_Integer /*x*/,
} }
else if (myState == SELECT_EDGE_PLATE_TGTES_2) { else if (myState == SELECT_EDGE_PLATE_TGTES_2) {
myAISContext->InitCurrent(); myAISContext->InitSelected();
if (myAISContext->MoreCurrent()) { if (myAISContext->MoreSelected()) {
Handle(AIS_Shape) ashape = Handle(AIS_Shape)::DownCast(myAISContext->Current()); Handle(AIS_Shape) ashape = Handle(AIS_Shape)::DownCast(myAISContext->SelectedInteractive());
THE_F2 = TopoDS::Face(ashape->Shape()); THE_F2 = TopoDS::Face(ashape->Shape());
myAISContext->OpenLocalContext();
myAISContext->Activate(ashape,2); myAISContext->Activate(ashape,2);
myState = SELECT_EDGE_PLATE_TGTES_3; myState = SELECT_EDGE_PLATE_TGTES_3;
((OCC_MainFrame*)AfxGetMainWnd())->SetStatusMessage("Select an edge on the second face"); ((OCC_MainFrame*)AfxGetMainWnd())->SetStatusMessage("Select an edge on the second face");
@ -4864,7 +4891,6 @@ void CModelingDoc::InputEvent(const Standard_Integer /*x*/,
myAISContext->InitSelected(); myAISContext->InitSelected();
if (myAISContext->MoreSelected()) { if (myAISContext->MoreSelected()) {
THE_E2 = TopoDS::Edge(myAISContext->SelectedShape()); THE_E2 = TopoDS::Edge(myAISContext->SelectedShape());
myAISContext->CloseLocalContext();
Standard_Integer i, nbPntsOnFaces=10; Standard_Integer i, nbPntsOnFaces=10;
Standard_Real u,First, Last, Delta, Tol=0.001, TolProj; Standard_Real u,First, Last, Delta, Tol=0.001, TolProj;
@ -5042,10 +5068,10 @@ void CModelingDoc::Popup(const Standard_Integer x,
const Handle(V3d_View)& aView) const Handle(V3d_View)& aView)
{ {
Standard_Integer PopupMenuNumber=0; Standard_Integer PopupMenuNumber=0;
myAISContext->InitCurrent(); myAISContext->InitSelected();
if (myState == SELECT_EDGE_PLATE) if (myState == SELECT_EDGE_PLATE)
PopupMenuNumber=2; PopupMenuNumber=2;
else if (myAISContext->MoreCurrent()) else if (myAISContext->MoreSelected())
PopupMenuNumber=1; PopupMenuNumber=1;
CMenu menu; CMenu menu;
@ -5056,8 +5082,8 @@ void CModelingDoc::Popup(const Standard_Integer x,
if (PopupMenuNumber == 1) // more than 1 object. if (PopupMenuNumber == 1) // more than 1 object.
{ {
bool OneOrMoreInShading = false; bool OneOrMoreInShading = false;
for (myAISContext->InitCurrent();myAISContext->MoreCurrent ();myAISContext->NextCurrent ()) for (myAISContext->InitSelected();myAISContext->MoreSelected ();myAISContext->NextSelected ())
if (myAISContext->IsDisplayed(myAISContext->Current(),1)) OneOrMoreInShading=true; if (myAISContext->IsDisplayed(myAISContext->SelectedInteractive(),1)) OneOrMoreInShading=true;
if(!OneOrMoreInShading) if(!OneOrMoreInShading)
pPopup->EnableMenuItem(5, MF_BYPOSITION | MF_DISABLED | MF_GRAYED); pPopup->EnableMenuItem(5, MF_BYPOSITION | MF_DISABLED | MF_GRAYED);
} }

9
samples/mfc/standard/03_Viewer2d/src/Viewer2dDoc.cpp
View File

@ -56,8 +56,6 @@ void CViewer2dDoc::Dump(CDumpContext& dc) const
void CViewer2dDoc::OnBUTTONErase() void CViewer2dDoc::OnBUTTONErase()
{ {
if(myAISContext->HasOpenedContext())
myAISContext->CloseAllContexts();
myAISContext->EraseAll(); myAISContext->EraseAll();
} }
@ -214,8 +212,6 @@ void CViewer2dDoc::OnBUTTONTestLine()
void CViewer2dDoc::OnBUTTONTestFace() void CViewer2dDoc::OnBUTTONTestFace()
{ {
//erase all //erase all
if(myAISContext->HasOpenedContext())
myAISContext->CloseAllContexts();
myAISContext->EraseAll(); myAISContext->EraseAll();
CFileDialog dlg(TRUE, CFileDialog dlg(TRUE,
@ -255,7 +251,6 @@ void CViewer2dDoc::OnBUTTONTestFace()
Handle(Sample2D_Face) anAISFace = new Sample2D_Face(aFaceShape); Handle(Sample2D_Face) anAISFace = new Sample2D_Face(aFaceShape);
myAISContext->Display(anAISFace,Standard_True); myAISContext->Display(anAISFace,Standard_True);
//activate selection mode for edges selection //activate selection mode for edges selection
myAISContext->OpenLocalContext();
myAISContext->Activate(anAISFace,2); myAISContext->Activate(anAISFace,2);
FitAll2DViews(Standard_False); FitAll2DViews(Standard_False);
@ -328,8 +323,6 @@ void CViewer2dDoc::OnBUTTONTestImage()
TCollection_AsciiString aFileName ((const wchar_t* )aFilePath); TCollection_AsciiString aFileName ((const wchar_t* )aFilePath);
//erase viewer //erase viewer
if(myAISContext->HasOpenedContext())
myAISContext->CloseAllContexts();
myAISContext->EraseAll(); myAISContext->EraseAll();
Handle(Sample2D_Image) anImage = new Sample2D_Image (aFileName); Handle(Sample2D_Image) anImage = new Sample2D_Image (aFileName);
@ -362,8 +355,6 @@ void CViewer2dDoc::OnBUTTONMultipleImage()
TCollection_AsciiString aFileName ((const wchar_t* )aFilePath); TCollection_AsciiString aFileName ((const wchar_t* )aFilePath);
//erase viewer //erase viewer
if(myAISContext->HasOpenedContext())
myAISContext->CloseAllContexts();
myAISContext->EraseAll(); myAISContext->EraseAll();
//create images //create images

42
samples/mfc/standard/04_Viewer3d/src/OffsetDlg.cpp
View File

@ -135,25 +135,34 @@ void COffsetDlg::SetOffsets(Standard_Real theFactor, Standard_Real theUnits)
Standard_ShortReal aFactor = (Standard_ShortReal)theFactor; Standard_ShortReal aFactor = (Standard_ShortReal)theFactor;
Standard_ShortReal aUnits = (Standard_ShortReal)theUnits; Standard_ShortReal aUnits = (Standard_ShortReal)theUnits;
for (aAISContext->InitCurrent();aAISContext->MoreCurrent ();aAISContext->NextCurrent ()) for (aAISContext->InitSelected(); aAISContext->MoreSelected(); aAISContext->NextSelected())
if (aAISContext->IsDisplayed(aAISContext->Current())) OneOrMoreCurrentIsDisplayed=true; if (aAISContext->IsDisplayed(aAISContext->SelectedInteractive())) OneOrMoreCurrentIsDisplayed=true;
if(OneOrMoreCurrentIsDisplayed){ if(OneOrMoreCurrentIsDisplayed){
if((aAISContext->IsCurrent(aOverlappedBox) || aAISContext->IsCurrent(aBox)) // A small trick to avoid complier error (C2668).
const Handle(AIS_InteractiveObject)& anIOOverlappedBox = aOverlappedBox;
const Handle(AIS_InteractiveObject)& anIOBox = aBox;
if((aAISContext->IsSelected(anIOOverlappedBox) || aAISContext->IsSelected(anIOBox))
&& aAISContext->IsDisplayed(aOverlappedBox)){ && aAISContext->IsDisplayed(aOverlappedBox)){
aOverlappedBox->SetPolygonOffsets(Aspect_POM_Fill,aFactor,aUnits); aOverlappedBox->SetPolygonOffsets(Aspect_POM_Fill,aFactor,aUnits);
Message = "Box2 -> SetPolygonOffsets(Aspect_POM_Fill, Factor, Units);\n"; Message = "Box2 -> SetPolygonOffsets(Aspect_POM_Fill, Factor, Units);\n";
//myDoc -> AddTextInDialog(Message); //myDoc -> AddTextInDialog(Message);
} }
if((aAISContext->IsCurrent(aOverlappedCylinder) || aAISContext->IsCurrent(aCylinder)) // A small trick to avoid complier error (C2668).
const Handle(AIS_InteractiveObject)& anIOOverlappedCylinder = aOverlappedCylinder;
const Handle(AIS_InteractiveObject)& anIOCylinder = aCylinder;
if((aAISContext->IsSelected(anIOOverlappedCylinder) || aAISContext->IsSelected(anIOCylinder))
&& aAISContext->IsDisplayed(aOverlappedCylinder)){ && aAISContext->IsDisplayed(aOverlappedCylinder)){
aOverlappedCylinder->SetPolygonOffsets(Aspect_POM_Fill,aFactor,aUnits); aOverlappedCylinder->SetPolygonOffsets(Aspect_POM_Fill,aFactor,aUnits);
Message = Message + "Cylinder2 -> SetPolygonOffsets(Aspect_POM_Fill, Factor, Units);\n"; Message = Message + "Cylinder2 -> SetPolygonOffsets(Aspect_POM_Fill, Factor, Units);\n";
//myDoc -> AddTextInDialog(Message); //myDoc -> AddTextInDialog(Message);
} }
if((aAISContext->IsCurrent(aOverlappedSphere) || aAISContext->IsCurrent(aSphere)) // A small trick to avoid complier error (C2668).
const Handle(AIS_InteractiveObject)& anIOOverlappedSphere = aOverlappedSphere;
const Handle(AIS_InteractiveObject)& anIOSphere = aSphere;
if((aAISContext->IsSelected(anIOOverlappedSphere) || aAISContext->IsSelected(anIOSphere))
&& aAISContext->IsDisplayed(aOverlappedSphere)){ && aAISContext->IsDisplayed(aOverlappedSphere)){
aOverlappedSphere->SetPolygonOffsets(Aspect_POM_Fill,aFactor,aUnits); aOverlappedSphere->SetPolygonOffsets(Aspect_POM_Fill,aFactor,aUnits);
Message = Message + "Sphere2 -> SetPolygonOffsets(Aspect_POM_Fill, Factor, Units);\n"; Message = Message + "Sphere2 -> SetPolygonOffsets(Aspect_POM_Fill, Factor, Units);\n";
@ -209,18 +218,23 @@ void COffsetDlg::UpdateValues()
BOOL IsOverlappedSphereDisplayed = aAISContext->IsDisplayed(aOverlappedSphere); BOOL IsOverlappedSphereDisplayed = aAISContext->IsDisplayed(aOverlappedSphere);
BOOL IsOverlappedBoxDisplayed = aAISContext->IsDisplayed(aOverlappedBox); BOOL IsOverlappedBoxDisplayed = aAISContext->IsDisplayed(aOverlappedBox);
BOOL IsOverlappedCylinderCurrent = aAISContext->IsCurrent(aOverlappedCylinder); const Handle(AIS_InteractiveObject)& anIOOverlappedCylinder = aOverlappedCylinder;
BOOL IsOverlappedSphereCurrent = aAISContext->IsCurrent(aOverlappedSphere); const Handle(AIS_InteractiveObject)& anIOOverlappedSphere = aOverlappedSphere;
BOOL IsOverlappedBoxCurrent = aAISContext->IsCurrent(aOverlappedBox); const Handle(AIS_InteractiveObject)& anIOOverlappedBox = aOverlappedBox;
BOOL IsOverlappedCylinderCurrent = aAISContext->IsSelected(anIOOverlappedCylinder);
BOOL IsOverlappedSphereCurrent = aAISContext->IsSelected(anIOOverlappedSphere);
BOOL IsOverlappedBoxCurrent = aAISContext->IsSelected(anIOOverlappedBox);
/*BOOL IsAnyOverlappedObjectCurrent = /*BOOL IsAnyOverlappedObjectCurrent =
IsOverlappedCylinderCurrent || IsOverlappedSphereCurrent || IsOverlappedBoxCurrent;*/ IsOverlappedCylinderCurrent || IsOverlappedSphereCurrent || IsOverlappedBoxCurrent;*/
const Handle(AIS_InteractiveObject)& anIOCylinder = aCylinder;
BOOL IsCylinderCurrent = aAISContext->IsCurrent(aCylinder); const Handle(AIS_InteractiveObject)& anIOSphere = aSphere;
BOOL IsSphereCurrent = aAISContext->IsCurrent(aSphere); const Handle(AIS_InteractiveObject)& anIOBox = aBox;
BOOL IsBoxCurrent = aAISContext->IsCurrent(aBox); BOOL IsCylinderCurrent = aAISContext->IsSelected(anIOCylinder);
BOOL IsSphereCurrent = aAISContext->IsSelected(anIOSphere);
BOOL IsBoxCurrent = aAISContext->IsSelected(anIOBox);
BOOL IsAnyObjectCurrent = BOOL IsAnyObjectCurrent =
IsOverlappedCylinderCurrent || IsOverlappedSphereCurrent || IsOverlappedBoxCurrent IsOverlappedCylinderCurrent || IsOverlappedSphereCurrent || IsOverlappedBoxCurrent
@ -230,8 +244,8 @@ void COffsetDlg::UpdateValues()
IsOverlappedCylinderDisplayed || IsOverlappedSphereDisplayed || IsOverlappedBoxDisplayed; IsOverlappedCylinderDisplayed || IsOverlappedSphereDisplayed || IsOverlappedBoxDisplayed;
Standard_Boolean OneOrMoreCurrentIsDisplayed=false; Standard_Boolean OneOrMoreCurrentIsDisplayed=false;
for (aAISContext->InitCurrent();aAISContext->MoreCurrent ();aAISContext->NextCurrent ()) for (aAISContext->InitSelected();aAISContext->MoreSelected ();aAISContext->NextSelected ())
if (aAISContext->IsDisplayed(aAISContext->Current())) OneOrMoreCurrentIsDisplayed=true; if (aAISContext->IsDisplayed(aAISContext->SelectedInteractive())) OneOrMoreCurrentIsDisplayed=true;
if(OneOrMoreCurrentIsDisplayed){ if(OneOrMoreCurrentIsDisplayed){
if(IsOverlappedBoxDisplayed && (IsBoxCurrent || IsOverlappedBoxCurrent)){ if(IsOverlappedBoxDisplayed && (IsBoxCurrent || IsOverlappedBoxCurrent)){

76
samples/mfc/standard/04_Viewer3d/src/Viewer3dDoc.cpp
View File

@ -403,27 +403,34 @@ void CViewer3dDoc::OnUpdateOverlappedBox(CCmdUI* pCmdUI)
void CViewer3dDoc::OnObjectRemove() void CViewer3dDoc::OnObjectRemove()
{ {
if(myAISContext->IsCurrent(myBox)) // A small trick to avoid complier error (C2668).
const Handle(AIS_InteractiveObject)& aBox = myBox;
if(myAISContext->IsSelected (aBox))
myBox.Nullify(); myBox.Nullify();
if(myAISContext->IsCurrent(myCylinder)) const Handle(AIS_InteractiveObject)& aCylinder = myCylinder;
if(myAISContext->IsSelected (aCylinder))
myCylinder.Nullify(); myCylinder.Nullify();
if(myAISContext->IsCurrent(mySphere)) const Handle(AIS_InteractiveObject)& aSphere = mySphere;
if(myAISContext->IsSelected (aSphere))
mySphere.Nullify(); mySphere.Nullify();
if(myAISContext->IsCurrent(myOverlappedBox)) const Handle(AIS_InteractiveObject)& anOverlappedBox = myOverlappedBox;
if(myAISContext->IsSelected (anOverlappedBox))
myOverlappedBox.Nullify(); myOverlappedBox.Nullify();
if(myAISContext->IsCurrent(myOverlappedCylinder)) const Handle(AIS_InteractiveObject)& anOverlappedCylinder = myOverlappedCylinder;
if(myAISContext->IsSelected (anOverlappedCylinder))
myOverlappedCylinder.Nullify(); myOverlappedCylinder.Nullify();
if(myAISContext->IsCurrent(myOverlappedSphere)) const Handle(AIS_InteractiveObject)& anOverlappedSphere = myOverlappedSphere;
if(myAISContext->IsSelected (anOverlappedSphere))
myOverlappedSphere.Nullify(); myOverlappedSphere.Nullify();
for(myAISContext->InitCurrent();myAISContext->MoreCurrent();myAISContext->InitCurrent()) for(myAISContext->InitSelected();myAISContext->MoreSelected();myAISContext->InitSelected())
myAISContext->Remove(myAISContext->Current(),Standard_True); myAISContext->Remove(myAISContext->SelectedInteractive(),Standard_True);
if(myOffsetDlg && myOffsetDlg->IsWindowVisible()) if(myOffsetDlg && myOffsetDlg->IsWindowVisible())
myOffsetDlg->UpdateValues(); myOffsetDlg->UpdateValues();
@ -532,7 +539,6 @@ void CViewer3dDoc::InputEvent(const Standard_Integer /*x*/,
myAISContext->Redisplay (aSelectedObject); myAISContext->Redisplay (aSelectedObject);
myState = -1; myState = -1;
myAISContext->CloseLocalContext();
} }
} }
@ -588,20 +594,20 @@ void CViewer3dDoc::ShiftInputEvent (const Standard_Integer theX,
void CViewer3dDoc::OnObjectColoredMesh() void CViewer3dDoc::OnObjectColoredMesh()
{ {
for(myAISContext->InitCurrent();myAISContext->MoreCurrent();myAISContext->NextCurrent()) for(myAISContext->InitSelected();myAISContext->MoreSelected();myAISContext->NextSelected())
if (myAISContext->Current()->IsKind(STANDARD_TYPE(User_Cylinder))) if (myAISContext->SelectedInteractive()->IsKind(STANDARD_TYPE(User_Cylinder)))
{ {
myAISContext->ClearPrs(myAISContext->Current(),6,Standard_False); myAISContext->ClearPrs(myAISContext->SelectedInteractive(),6,Standard_False);
myAISContext->RecomputePrsOnly(myAISContext->Current(),Standard_False); myAISContext->RecomputePrsOnly(myAISContext->SelectedInteractive(), Standard_False);
myAISContext->SetDisplayMode(myAISContext->Current(),6); myAISContext->SetDisplayMode(myAISContext->SelectedInteractive(), 6);
} }
} }
void CViewer3dDoc::OnUpdateObjectColoredMesh(CCmdUI* pCmdUI) void CViewer3dDoc::OnUpdateObjectColoredMesh(CCmdUI* pCmdUI)
{ {
bool CylinderIsCurrentAndDisplayed = false; bool CylinderIsCurrentAndDisplayed = false;
for (myAISContext->InitCurrent();myAISContext->MoreCurrent ();myAISContext->NextCurrent ()) for (myAISContext->InitSelected();myAISContext->MoreSelected ();myAISContext->NextSelected ())
if(myAISContext->Current()->IsKind(STANDARD_TYPE(User_Cylinder))) if(myAISContext->SelectedInteractive()->IsKind(STANDARD_TYPE(User_Cylinder)))
CylinderIsCurrentAndDisplayed=true; CylinderIsCurrentAndDisplayed=true;
pCmdUI->Enable (CylinderIsCurrentAndDisplayed); pCmdUI->Enable (CylinderIsCurrentAndDisplayed);
} }
@ -609,8 +615,8 @@ void CViewer3dDoc::OnUpdateObjectColoredMesh(CCmdUI* pCmdUI)
void CViewer3dDoc::OnUpdateObjectWireframe(CCmdUI* pCmdUI) void CViewer3dDoc::OnUpdateObjectWireframe(CCmdUI* pCmdUI)
{ {
bool OneOrMoreInShadingOrColoredMesh = false; bool OneOrMoreInShadingOrColoredMesh = false;
for (myAISContext->InitCurrent();myAISContext->MoreCurrent ();myAISContext->NextCurrent ()) for (myAISContext->InitSelected();myAISContext->MoreSelected ();myAISContext->NextSelected ())
if (myAISContext->IsDisplayed(myAISContext->Current(),1) || myAISContext->IsDisplayed(myAISContext->Current(),6)) if (myAISContext->IsDisplayed(myAISContext->SelectedInteractive(), 1) || myAISContext->IsDisplayed(myAISContext->SelectedInteractive(), 6))
OneOrMoreInShadingOrColoredMesh=true; OneOrMoreInShadingOrColoredMesh=true;
pCmdUI->Enable (OneOrMoreInShadingOrColoredMesh); pCmdUI->Enable (OneOrMoreInShadingOrColoredMesh);
} }
@ -619,8 +625,8 @@ void CViewer3dDoc::OnUpdateObjectWireframe(CCmdUI* pCmdUI)
void CViewer3dDoc::OnUpdateObjectShading(CCmdUI* pCmdUI) void CViewer3dDoc::OnUpdateObjectShading(CCmdUI* pCmdUI)
{ {
bool OneOrMoreInWireframeOrColoredMesh = false; bool OneOrMoreInWireframeOrColoredMesh = false;
for (myAISContext->InitCurrent();myAISContext->MoreCurrent ();myAISContext->NextCurrent ()) for (myAISContext->InitSelected();myAISContext->MoreSelected ();myAISContext->NextSelected ())
if (myAISContext->IsDisplayed(myAISContext->Current(),0) || myAISContext->IsDisplayed(myAISContext->Current(),6)) if (myAISContext->IsDisplayed(myAISContext->SelectedInteractive(),0) || myAISContext->IsDisplayed(myAISContext->SelectedInteractive(),6))
OneOrMoreInWireframeOrColoredMesh=true; OneOrMoreInWireframeOrColoredMesh=true;
pCmdUI->Enable (OneOrMoreInWireframeOrColoredMesh); pCmdUI->Enable (OneOrMoreInWireframeOrColoredMesh);
} }
@ -668,10 +674,10 @@ void CViewer3dDoc::Popup (const Standard_Integer x,
{ {
myPopupMenuNumber=0; myPopupMenuNumber=0;
// Specified check for context menu number to call // Specified check for context menu number to call
myAISContext->InitCurrent(); myAISContext->InitSelected();
if (myAISContext->MoreCurrent()) if (myAISContext->MoreSelected())
{ {
if (myAISContext->Current()->IsKind(STANDARD_TYPE(User_Cylinder))) if (myAISContext->SelectedInteractive()->IsKind(STANDARD_TYPE(User_Cylinder)))
{ {
myPopupMenuNumber = 2; myPopupMenuNumber = 2;
//return; //return;
@ -683,9 +689,7 @@ void CViewer3dDoc::Popup (const Standard_Integer x,
//Set faces selection mode //Set faces selection mode
void CViewer3dDoc::OnFaces() void CViewer3dDoc::OnFaces()
{ {
myAISContext->CloseAllContexts(); myAISContext->Activate (AIS_Shape::SelectionMode (TopAbs_FACE));
myAISContext->OpenLocalContext();
myAISContext->ActivateStandardMode (TopAbs_FACE);
myCResultDialog.SetTitle("Standard mode: TopAbs_FACE"); myCResultDialog.SetTitle("Standard mode: TopAbs_FACE");
myCResultDialog.SetText(" myAISContext->OpenLocalContext(); \n" myCResultDialog.SetText(" myAISContext->OpenLocalContext(); \n"
@ -698,9 +702,7 @@ void CViewer3dDoc::OnFaces()
//Set edges selection mode //Set edges selection mode
void CViewer3dDoc::OnEdges() void CViewer3dDoc::OnEdges()
{ {
myAISContext->CloseAllContexts(); myAISContext->Activate (AIS_Shape::SelectionMode (TopAbs_EDGE));
myAISContext->OpenLocalContext();
myAISContext->ActivateStandardMode(TopAbs_EDGE);
myCResultDialog.SetTitle("Standard mode: TopAbs_EDGE"); myCResultDialog.SetTitle("Standard mode: TopAbs_EDGE");
myCResultDialog.SetText(" myAISContext->OpenLocalContext(); \n" myCResultDialog.SetText(" myAISContext->OpenLocalContext(); \n"
@ -713,9 +715,7 @@ void CViewer3dDoc::OnEdges()
// Set vertices selection mode // Set vertices selection mode
void CViewer3dDoc::OnVertices() void CViewer3dDoc::OnVertices()
{ {
myAISContext->CloseAllContexts(); myAISContext->Activate (AIS_Shape::SelectionMode (TopAbs_VERTEX));
myAISContext->OpenLocalContext();
myAISContext->ActivateStandardMode (TopAbs_VERTEX);
myCResultDialog.SetTitle("Standard mode: TopAbs_VERTEX"); myCResultDialog.SetTitle("Standard mode: TopAbs_VERTEX");
myCResultDialog.SetText(" myAISContext->OpenLocalContext(); \n" myCResultDialog.SetText(" myAISContext->OpenLocalContext(); \n"
@ -728,8 +728,6 @@ void CViewer3dDoc::OnVertices()
//Neutral selection mode //Neutral selection mode
void CViewer3dDoc::OnNeutral() void CViewer3dDoc::OnNeutral()
{ {
myAISContext->CloseAllContexts();
myCResultDialog.SetTitle("Standard mode: Neutral"); myCResultDialog.SetTitle("Standard mode: Neutral");
myCResultDialog.SetText(" myAISContext->CloseAllContexts(); \n" myCResultDialog.SetText(" myAISContext->CloseAllContexts(); \n"
" \n"); " \n");
@ -739,8 +737,7 @@ void CViewer3dDoc::OnNeutral()
// Change the color of faces on a user cylinder // Change the color of faces on a user cylinder
void CViewer3dDoc::OnUsercylinderChangefacecolor() void CViewer3dDoc::OnUsercylinderChangefacecolor()
{ {
myAISContext->OpenLocalContext(); myAISContext->Activate(myAISContext->SelectedInteractive(), 4);
myAISContext->Activate(myAISContext->Current(),4);
myState = FACE_COLOR; myState = FACE_COLOR;
// see the following of treatment in inputevent // see the following of treatment in inputevent
} }
@ -750,13 +747,6 @@ void CViewer3dDoc::OnUsercylinderChangefacecolor()
// before running this function // before running this function
void CViewer3dDoc::OnFillet3d() void CViewer3dDoc::OnFillet3d()
{ {
if (!myAISContext->HasOpenedContext())
{
AfxMessageBox (L"It is necessary to activate the edges selection mode\n"
L"and select edges on an object before \nrunning this function");
return;
}
myAISContext->InitSelected(); myAISContext->InitSelected();
if (myAISContext->MoreSelected()) if (myAISContext->MoreSelected())
{ {

8
samples/mfc/standard/04_Viewer3d/src/Viewer3dView.cpp
View File

@ -401,7 +401,6 @@ void CViewer3dView::OnLButtonDown(UINT nFlags, CPoint point)
{ {
p1 = ConvertClickToPoint(point.x,point.y,myView); p1 = ConvertClickToPoint(point.x,point.y,myView);
myCurrent_PositionalLight->SetPosition(p1.X(),p1.Y(),p1.Z()) ; myCurrent_PositionalLight->SetPosition(p1.X(),p1.Y(),p1.Z()) ;
GetDocument()->GetAISContext()->CloseLocalContext();
((OCC_MainFrame*)AfxGetMainWnd())->SetStatusMessage("Ready"); ((OCC_MainFrame*)AfxGetMainWnd())->SetStatusMessage("Ready");
myCurrentMode = CurAction3d_Nothing; myCurrentMode = CurAction3d_Nothing;
@ -449,7 +448,6 @@ GetDocument()->UpdateResultMessageDlg("SetAngle",Message);
break; break;
case CurAction3d_EndSpotLight : case CurAction3d_EndSpotLight :
GetDocument()->GetAISContext()->Erase(spotConeShape); GetDocument()->GetAISContext()->Erase(spotConeShape);
GetDocument()->GetAISContext()->CloseLocalContext();
((OCC_MainFrame*)AfxGetMainWnd())->SetStatusMessage("Ready"); ((OCC_MainFrame*)AfxGetMainWnd())->SetStatusMessage("Ready");
myCurrentMode = CurAction3d_Nothing; myCurrentMode = CurAction3d_Nothing;
break; break;
@ -477,7 +475,6 @@ GetDocument()->UpdateResultMessageDlg("SetDirection",Message);
break; break;
case CurAction3d_EndDirectionalLight: case CurAction3d_EndDirectionalLight:
GetDocument()->GetAISContext()->Erase(directionalEdgeShape); GetDocument()->GetAISContext()->Erase(directionalEdgeShape);
GetDocument()->GetAISContext()->CloseLocalContext();
((OCC_MainFrame*)AfxGetMainWnd())->SetStatusMessage("Ready"); ((OCC_MainFrame*)AfxGetMainWnd())->SetStatusMessage("Ready");
myCurrentMode = CurAction3d_Nothing; myCurrentMode = CurAction3d_Nothing;
break; break;
@ -888,7 +885,6 @@ void CViewer3dView::OnDirectionalLight()
UpdateData(TRUE); UpdateData(TRUE);
((OCC_MainFrame*)AfxGetMainWnd())->SetStatusMessage("Pick a first point"); ((OCC_MainFrame*)AfxGetMainWnd())->SetStatusMessage("Pick a first point");
GetDocument()->GetAISContext()->OpenLocalContext();
myCurrentMode = CurAction3d_BeginDirectionalLight; myCurrentMode = CurAction3d_BeginDirectionalLight;
TCollection_AsciiString Message("\ TCollection_AsciiString Message("\
@ -914,7 +910,6 @@ void CViewer3dView::OnSpotLight()
return; return;
} }
GetDocument()->GetAISContext()->OpenLocalContext();
((OCC_MainFrame*)AfxGetMainWnd())->SetStatusMessage("Pick the light position"); ((OCC_MainFrame*)AfxGetMainWnd())->SetStatusMessage("Pick the light position");
myCurrentMode = CurAction3d_BeginSpotLight; myCurrentMode = CurAction3d_BeginSpotLight;
@ -941,7 +936,6 @@ void CViewer3dView::OnPositionalLight()
return; return;
} }
GetDocument()->GetAISContext()->OpenLocalContext();
myCurrent_PositionalLight=new V3d_PositionalLight(myView->Viewer(),0,0,0,Quantity_NOC_GREEN,1,0); myCurrent_PositionalLight=new V3d_PositionalLight(myView->Viewer(),0,0,0,Quantity_NOC_GREEN,1,0);
myView->SetLightOn(myCurrent_PositionalLight); myView->SetLightOn(myCurrent_PositionalLight);
NbActiveLights++; NbActiveLights++;
@ -971,11 +965,9 @@ void CViewer3dView::OnAmbientLight()
return; return;
} }
GetDocument()->GetAISContext()->OpenLocalContext();
myCurrent_AmbientLight=new V3d_AmbientLight(myView->Viewer(), Quantity_NOC_GRAY); myCurrent_AmbientLight=new V3d_AmbientLight(myView->Viewer(), Quantity_NOC_GRAY);
myView->SetLightOn(myCurrent_AmbientLight) ; myView->SetLightOn(myCurrent_AmbientLight) ;
NbActiveLights++; NbActiveLights++;
GetDocument()->GetAISContext()->CloseLocalContext();
myView->UpdateLights(); myView->UpdateLights();

16
samples/mfc/standard/05_ImportExport/src/ImportExportDoc.cpp
View File

@ -190,8 +190,8 @@ void CImportExportDoc::Popup(const Standard_Integer x,
const Handle(V3d_View)& aView ) const Handle(V3d_View)& aView )
{ {
Standard_Integer PopupMenuNumber=0; Standard_Integer PopupMenuNumber=0;
myAISContext->InitCurrent(); myAISContext->InitSelected();
if (myAISContext->MoreCurrent()) if (myAISContext->MoreSelected())
PopupMenuNumber=1; PopupMenuNumber=1;
CMenu menu; CMenu menu;
@ -202,8 +202,8 @@ void CImportExportDoc::Popup(const Standard_Integer x,
if (PopupMenuNumber == 1) // more than 1 object. if (PopupMenuNumber == 1) // more than 1 object.
{ {
bool OneOrMoreInShading = false; bool OneOrMoreInShading = false;
for (myAISContext->InitCurrent();myAISContext->MoreCurrent ();myAISContext->NextCurrent ()) for (myAISContext->InitSelected();myAISContext->MoreSelected ();myAISContext->NextSelected ())
if (myAISContext->IsDisplayed(myAISContext->Current(),1)) OneOrMoreInShading=true; if (myAISContext->IsDisplayed(myAISContext->SelectedInteractive(),1)) OneOrMoreInShading=true;
if(!OneOrMoreInShading) if(!OneOrMoreInShading)
pPopup->EnableMenuItem(5, MF_BYPOSITION | MF_DISABLED | MF_GRAYED); pPopup->EnableMenuItem(5, MF_BYPOSITION | MF_DISABLED | MF_GRAYED);
} }
@ -260,8 +260,8 @@ void CImportExportDoc::OnCylinder()
void CImportExportDoc::OnObjectRemove() void CImportExportDoc::OnObjectRemove()
{ {
for(GetAISContext()->InitCurrent();GetAISContext()->MoreCurrent();GetAISContext()->NextCurrent()) { for(GetAISContext()->InitSelected();GetAISContext()->MoreSelected();GetAISContext()->NextSelected()) {
Handle(AIS_Shape) aShape = Handle(AIS_Shape)::DownCast(GetAISContext()->Current()); Handle(AIS_Shape) aShape = Handle(AIS_Shape)::DownCast(GetAISContext()->SelectedInteractive());
if(!aShape.IsNull()) { if(!aShape.IsNull()) {
m_pcoloredshapeList->Remove(aShape->Shape()); m_pcoloredshapeList->Remove(aShape->Shape());
} }
@ -272,8 +272,8 @@ void CImportExportDoc::OnObjectRemove()
void CImportExportDoc::OnObjectErase() void CImportExportDoc::OnObjectErase()
{ {
for(GetAISContext()->InitCurrent();GetAISContext()->MoreCurrent();GetAISContext()->NextCurrent()) { for(GetAISContext()->InitSelected();GetAISContext()->MoreSelected();GetAISContext()->NextSelected()) {
Handle(AIS_Shape) aShape = Handle(AIS_Shape)::DownCast(GetAISContext()->Current()); Handle(AIS_Shape) aShape = Handle(AIS_Shape)::DownCast(GetAISContext()->SelectedInteractive());
if(!aShape.IsNull()) { if(!aShape.IsNull()) {
m_pcoloredshapeList->Remove(aShape->Shape()); m_pcoloredshapeList->Remove(aShape->Shape());
} }

32
samples/mfc/standard/06_Ocaf/src/OcafDoc.cpp
View File

@ -316,8 +316,8 @@ D->CommitCommand(); \n\
void COcafDoc::OnModify() void COcafDoc::OnModify()
{ {
// Get the selected interactive object // Get the selected interactive object
myAISContext->InitCurrent(); myAISContext->InitSelected();
Handle(AIS_InteractiveObject) curAISObject = myAISContext->Current(); Handle(AIS_InteractiveObject) curAISObject = myAISContext->SelectedInteractive();
// Get the main label of the selected object // Get the main label of the selected object
@ -678,17 +678,17 @@ D->CommitCommand(); \n\
void COcafDoc::OnUpdateModify(CCmdUI* pCmdUI) void COcafDoc::OnUpdateModify(CCmdUI* pCmdUI)
{ {
// Disable the "modify" button if there is no selected object or several selected objects // Disable the "modify" button if there is no selected object or several selected objects
myAISContext->InitCurrent(); myAISContext->InitSelected();
if(myAISContext->NbCurrents()!=1) if(myAISContext->NbSelected()!=1)
{ {
pCmdUI->Enable(Standard_False); pCmdUI->Enable(Standard_False);
return; return;
} }
// Get the root label of the selected object using its TPrsStd_AISPresentation // Get the root label of the selected object using its TPrsStd_AISPresentation
myAISContext->InitCurrent(); myAISContext->InitSelected();
Handle(TPrsStd_AISPresentation) ObjectPrs = Handle(TPrsStd_AISPresentation) ObjectPrs =
Handle(TPrsStd_AISPresentation)::DownCast(myAISContext->Current()->GetOwner()); Handle(TPrsStd_AISPresentation)::DownCast(myAISContext->SelectedInteractive()->GetOwner());
if (!ObjectPrs.IsNull()){ if (!ObjectPrs.IsNull()){
TDF_Label LabObject = ObjectPrs->Label(); TDF_Label LabObject = ObjectPrs->Label();
@ -815,10 +815,10 @@ void COcafDoc::OnObjectDelete()
D->NewCommand(); D->NewCommand();
AIS_SequenceOfInteractive aSequence; AIS_SequenceOfInteractive aSequence;
for(myAISContext->InitCurrent(); for(myAISContext->InitSelected();
myAISContext->MoreCurrent(); myAISContext->MoreSelected();
myAISContext->NextCurrent()) myAISContext->NextSelected())
aSequence.Append(myAISContext->Current()); aSequence.Append(myAISContext->SelectedInteractive());
for(int iter=1;iter <=aSequence.Length();iter++) for(int iter=1;iter <=aSequence.Length();iter++)
{ {
@ -860,8 +860,8 @@ void COcafDoc::OnObjectDelete()
void COcafDoc::OnUpdateObjectDelete(CCmdUI* pCmdUI) void COcafDoc::OnUpdateObjectDelete(CCmdUI* pCmdUI)
{ {
myAISContext->InitCurrent(); myAISContext->InitSelected();
pCmdUI->Enable (myAISContext->MoreCurrent()); pCmdUI->Enable (myAISContext->MoreSelected());
} }
void COcafDoc::DisplayPrs() void COcafDoc::DisplayPrs()
@ -1172,8 +1172,8 @@ void COcafDoc::Popup(const Standard_Integer x,
const Handle(V3d_View)& aView ) const Handle(V3d_View)& aView )
{ {
Standard_Integer PopupMenuNumber=0; Standard_Integer PopupMenuNumber=0;
myAISContext->InitCurrent(); myAISContext->InitSelected();
if (myAISContext->MoreCurrent()) if (myAISContext->MoreSelected())
PopupMenuNumber=1; PopupMenuNumber=1;
CMenu menu; CMenu menu;
@ -1184,8 +1184,8 @@ void COcafDoc::Popup(const Standard_Integer x,
if (PopupMenuNumber == 1) // more than 1 object. if (PopupMenuNumber == 1) // more than 1 object.
{ {
bool OneOrMoreInShading = false; bool OneOrMoreInShading = false;
for (myAISContext->InitCurrent();myAISContext->MoreCurrent ();myAISContext->NextCurrent ()) for (myAISContext->InitSelected();myAISContext->MoreSelected ();myAISContext->NextSelected ())
if (myAISContext->IsDisplayed(myAISContext->Current(),1)) OneOrMoreInShading=true; if (myAISContext->IsDisplayed(myAISContext->SelectedInteractive(),1)) OneOrMoreInShading=true;
if(!OneOrMoreInShading) if(!OneOrMoreInShading)
pPopup->EnableMenuItem(5, MF_BYPOSITION | MF_DISABLED | MF_GRAYED); pPopup->EnableMenuItem(5, MF_BYPOSITION | MF_DISABLED | MF_GRAYED);
} }

14
samples/mfc/standard/08_HLR/src/HLRDoc.cpp
View File

@ -182,20 +182,20 @@ void CHLRDoc::Fit()
void CHLRDoc::OnObjectErase() void CHLRDoc::OnObjectErase()
{ {
Standard_Boolean toUpdateDisplayable = Standard_False; Standard_Boolean toUpdateDisplayable = Standard_False;
myAISContext->InitCurrent(); myAISContext->InitSelected();
while (myAISContext->MoreCurrent()) while (myAISContext->MoreSelected())
{ {
if (myAISContext->Current()->Type() == AIS_KOI_Shape && myCSelectionDialogIsCreated) if (myAISContext->SelectedInteractive()->Type() == AIS_KOI_Shape && myCSelectionDialogIsCreated)
{ {
myCSelectionDialog->DiplayableShape()->Remove (Handle(AIS_Shape)::DownCast (myAISContext->Current())->Shape()); myCSelectionDialog->DiplayableShape()->Remove (Handle(AIS_Shape)::DownCast (myAISContext->SelectedInteractive())->Shape());
toUpdateDisplayable = Standard_True; toUpdateDisplayable = Standard_True;
} }
myAISContext->Erase (myAISContext->Current(), Standard_True); myAISContext->Erase (myAISContext->SelectedInteractive(), Standard_True);
myAISContext->InitCurrent(); myAISContext->InitSelected();
} }
myAISContext->ClearCurrents(); myAISContext->ClearSelected();
if (toUpdateDisplayable) if (toUpdateDisplayable)
{ {

16
samples/mfc/standard/08_HLR/src/SelectionDialog.cpp
View File

@ -174,11 +174,11 @@ void CSelectionDialog::UpdateViews()
// Display chosen shapes in the HLR dialog view. // Display chosen shapes in the HLR dialog view.
Standard_Boolean OneOrMoreFound = Standard_False; Standard_Boolean OneOrMoreFound = Standard_False;
for (myDoc->GetAISContext()->InitCurrent(); for (myDoc->GetAISContext()->InitSelected();
myDoc->GetAISContext()->MoreCurrent(); myDoc->GetAISContext()->MoreSelected();
myDoc->GetAISContext()->NextCurrent()) myDoc->GetAISContext()->NextSelected())
{ {
Handle(AIS_Shape) anAISShape = Handle(AIS_Shape)::DownCast (myDoc->GetAISContext()->Current()); Handle(AIS_Shape) anAISShape = Handle(AIS_Shape)::DownCast (myDoc->GetAISContext()->SelectedInteractive());
if (!anAISShape.IsNull()) if (!anAISShape.IsNull())
{ {
OneOrMoreFound = Standard_True; OneOrMoreFound = Standard_True;
@ -207,11 +207,11 @@ void CSelectionDialog::OnGetSelectedShapes()
myInteractiveContext->Display (myTrihedron); myInteractiveContext->Display (myTrihedron);
Standard_Boolean OneOrMoreFound = Standard_False; Standard_Boolean OneOrMoreFound = Standard_False;
for (myDoc->GetAISContext()->InitCurrent(); for (myDoc->GetAISContext()->InitSelected();
myDoc->GetAISContext()->MoreCurrent(); myDoc->GetAISContext()->MoreSelected();
myDoc->GetAISContext()->NextCurrent()) myDoc->GetAISContext()->NextSelected())
{ {
Handle(AIS_Shape) anAISShape = Handle(AIS_Shape)::DownCast (myDoc->GetAISContext()->Current()); Handle(AIS_Shape) anAISShape = Handle(AIS_Shape)::DownCast (myDoc->GetAISContext()->SelectedInteractive());
if (!anAISShape.IsNull()) if (!anAISShape.IsNull())
{ {

40
samples/mfc/standard/Common/AISDialogs.cpp
View File

@ -312,10 +312,10 @@ void CDialogMaterial::OnMaterial(UINT nID)
void CDialogMaterial::SetMaterial(Graphic3d_NameOfMaterial Material) void CDialogMaterial::SetMaterial(Graphic3d_NameOfMaterial Material)
{ {
Standard_Real aTransparency; Standard_Real aTransparency;
for (myCurrentIC->InitCurrent();myCurrentIC->MoreCurrent ();myCurrentIC->NextCurrent ()){ for (myCurrentIC->InitSelected();myCurrentIC->MoreSelected ();myCurrentIC->NextSelected ()){
aTransparency = myCurrentIC->Current()->Transparency(); aTransparency = myCurrentIC->SelectedInteractive()->Transparency();
myCurrentIC->SetMaterial (myCurrentIC->Current(),(Graphic3d_NameOfMaterial)(Material)); myCurrentIC->SetMaterial (myCurrentIC->SelectedInteractive(),(Graphic3d_NameOfMaterial)(Material));
myCurrentIC->SetTransparency (myCurrentIC->Current(),aTransparency); myCurrentIC->SetTransparency (myCurrentIC->SelectedInteractive(),aTransparency);
} }
} }
@ -358,11 +358,11 @@ CDialogTransparency::CDialogTransparency(Handle(AIS_InteractiveContext) CurrentI
Standard_Real temp = 10; Standard_Real temp = 10;
Standard_Real t; Standard_Real t;
for (myCurrentIC->InitCurrent(); for (myCurrentIC->InitSelected();
myCurrentIC->MoreCurrent (); myCurrentIC->MoreSelected ();
myCurrentIC->NextCurrent ()) myCurrentIC->NextSelected ())
{ {
t = CurrentIC->Current()->Transparency(); t = CurrentIC->SelectedInteractive()->Transparency();
if (temp > t) if (temp > t)
temp = t; temp = t;
//myCurrentIC->SetTransparency (myCurrentIC->Current(), m_TransValue); //myCurrentIC->SetTransparency (myCurrentIC->Current(), m_TransValue);
@ -372,11 +372,11 @@ CDialogTransparency::CDialogTransparency(Handle(AIS_InteractiveContext) CurrentI
if (Abs(m_TransValue - temp * 10) > 0.01) if (Abs(m_TransValue - temp * 10) > 0.01)
m_TransValue = int (temp * 10) + 1; m_TransValue = int (temp * 10) + 1;
for (myCurrentIC->InitCurrent(); for (myCurrentIC->InitSelected();
myCurrentIC->MoreCurrent (); myCurrentIC->MoreSelected ();
myCurrentIC->NextCurrent ()) myCurrentIC->NextSelected ())
{ {
myCurrentIC->SetTransparency (myCurrentIC->Current(), temp); myCurrentIC->SetTransparency (myCurrentIC->SelectedInteractive(), temp);
} }
@ -414,11 +414,11 @@ void CDialogTransparency::OnDeltaposSpinaistransp(NMHDR* pNMHDR, LRESULT* pResul
UpdateData (false); UpdateData (false);
for (myCurrentIC->InitCurrent(); for (myCurrentIC->InitSelected();
myCurrentIC->MoreCurrent (); myCurrentIC->MoreSelected ();
myCurrentIC->NextCurrent()) myCurrentIC->NextSelected())
{ {
myCurrentIC->SetTransparency (myCurrentIC->Current(), m_TransValue/10.0); myCurrentIC->SetTransparency (myCurrentIC->SelectedInteractive(), m_TransValue/10.0);
} }
*pResult = 0; *pResult = 0;
@ -431,11 +431,11 @@ void CDialogTransparency::OnChangeEditaistransp()
// TODO: Add your control notification handler code here // TODO: Add your control notification handler code here
int temp = m_TransValue; int temp = m_TransValue;
if (UpdateData (true)){ if (UpdateData (true)){
for (myCurrentIC->InitCurrent(); for (myCurrentIC->InitSelected();
myCurrentIC->MoreCurrent (); myCurrentIC->MoreSelected ();
myCurrentIC->NextCurrent()) myCurrentIC->NextSelected())
{ {
myCurrentIC->SetTransparency (myCurrentIC->Current(), m_TransValue/10.0); myCurrentIC->SetTransparency (myCurrentIC->SelectedInteractive(), m_TransValue/10.0);
} }
} }
else{ else{

40
samples/mfc/standard/Common/AngleParamsVerticesPage.cpp
View File

@ -63,20 +63,12 @@ END_MESSAGE_MAP()
void CAngleParamsVerticesPage::OnBnClickedVertex1Btn() void CAngleParamsVerticesPage::OnBnClickedVertex1Btn()
{ {
// Open local context and choose the vertex for angle dimensions myAISContext->Activate (AIS_Shape::SelectionMode (TopAbs_VERTEX));
if (!myAISContext->HasOpenedContext())
{
myAISContext->OpenLocalContext();
myAISContext->ActivateStandardMode(TopAbs_VERTEX);
AfxMessageBox (_T ("Local context was not opened. Choose the edge and press the button again"),
MB_ICONINFORMATION | MB_OK);
return;
}
// Now it's ok, local context is opened and edge selection mode is activated // Now it's ok, edge selection mode is activated
// Check if some vertex is selected // Check if some vertex is selected
myAISContext->LocalContext()->InitSelected(); myAISContext->InitSelected();
if (!myAISContext->LocalContext()->MoreSelected() || if (!myAISContext->MoreSelected() ||
myAISContext->SelectedShape().ShapeType() != TopAbs_VERTEX) myAISContext->SelectedShape().ShapeType() != TopAbs_VERTEX)
{ {
AfxMessageBox (_T ("Choose the vertex and press the button again"), AfxMessageBox (_T ("Choose the vertex and press the button again"),
@ -84,8 +76,8 @@ void CAngleParamsVerticesPage::OnBnClickedVertex1Btn()
return; return;
} }
myFirstVertex = TopoDS::Vertex (myAISContext->LocalContext()->SelectedShape()); myFirstVertex = TopoDS::Vertex (myAISContext->SelectedShape());
myAISContext->LocalContext()->ClearSelected(); myAISContext->ClearSelected();
} }
//======================================================================= //=======================================================================
@ -95,17 +87,17 @@ void CAngleParamsVerticesPage::OnBnClickedVertex1Btn()
void CAngleParamsVerticesPage::OnBnClickedVertex2Btn() void CAngleParamsVerticesPage::OnBnClickedVertex2Btn()
{ {
myAISContext->LocalContext()->InitSelected(); myAISContext->InitSelected();
if (!myAISContext->LocalContext()->MoreSelected() || if (!myAISContext->MoreSelected() ||
myAISContext->SelectedShape().ShapeType() != TopAbs_VERTEX) myAISContext->SelectedShape().ShapeType() != TopAbs_VERTEX)
{ {
AfxMessageBox ( _T("Choose the vertex and press the button again"), MB_ICONINFORMATION | MB_OK); AfxMessageBox ( _T("Choose the vertex and press the button again"), MB_ICONINFORMATION | MB_OK);
return; return;
} }
mySecondVertex = TopoDS::Vertex (myAISContext->LocalContext()->SelectedShape()); mySecondVertex = TopoDS::Vertex (myAISContext->SelectedShape());
myAISContext->LocalContext()->ClearSelected(); myAISContext->ClearSelected();
} }
//======================================================================= //=======================================================================
@ -115,15 +107,15 @@ void CAngleParamsVerticesPage::OnBnClickedVertex2Btn()
void CAngleParamsVerticesPage::OnBnClickedVertex3Btn() void CAngleParamsVerticesPage::OnBnClickedVertex3Btn()
{ {
myAISContext->LocalContext()->InitSelected(); myAISContext->InitSelected();
if (!myAISContext->LocalContext()->MoreSelected()) if (!myAISContext->MoreSelected())
{ {
AfxMessageBox (_T ("Choose the vertex and press the button again"), MB_ICONINFORMATION | MB_OK); AfxMessageBox (_T ("Choose the vertex and press the button again"), MB_ICONINFORMATION | MB_OK);
return; return;
} }
myThirdVertex = TopoDS::Vertex (myAISContext->LocalContext()->SelectedShape()); myThirdVertex = TopoDS::Vertex (myAISContext->SelectedShape());
myAISContext->LocalContext()->ClearSelected(); myAISContext->ClearSelected();
//Build dimension here //Build dimension here
TopoDS_Edge anEdge12 = BRepBuilderAPI_MakeEdge (myFirstVertex, mySecondVertex); TopoDS_Edge anEdge12 = BRepBuilderAPI_MakeEdge (myFirstVertex, mySecondVertex);
@ -159,8 +151,6 @@ void CAngleParamsVerticesPage::OnBnClickedVertex3Btn()
} }
} }
anAngleDim->SetDimensionAspect (anAspect); anAngleDim->SetDimensionAspect (anAspect);
myAISContext->CloseAllContexts();
myAISContext->Display (anAngleDim); myAISContext->Display (anAngleDim);
myAISContext->OpenLocalContext(); myAISContext->Activate (AIS_Shape::SelectionMode (TopAbs_VERTEX));
myAISContext->ActivateStandardMode (TopAbs_VERTEX);
} }

44
samples/mfc/standard/Common/DimensionDlg.cpp
View File

@ -139,11 +139,6 @@ void CDimensionDlg::DoDataExchange (CDataExchange* pDX)
void CDimensionDlg::OnBnClickedOk() void CDimensionDlg::OnBnClickedOk()
{ {
if (myAISContext->HasOpenedContext())
{
myAISContext->CloseAllContexts();
}
OnOK(); OnOK();
} }
@ -297,8 +292,6 @@ void CDimensionDlg::CreateDiameterParamsTab()
void CDimensionDlg::UpdateStandardModeForAngle() void CDimensionDlg::UpdateStandardModeForAngle()
{ {
int aTabNum = ((CTabCtrl*) GetDlgItem (IDC_AngleTab))->GetCurSel(); int aTabNum = ((CTabCtrl*) GetDlgItem (IDC_AngleTab))->GetCurSel();
myAISContext->CloseAllContexts();
myAISContext->OpenLocalContext();
TopAbs_ShapeEnum aMode; TopAbs_ShapeEnum aMode;
if (aTabNum == 1) if (aTabNum == 1)
@ -314,7 +307,7 @@ void CDimensionDlg::UpdateStandardModeForAngle()
aMode = TopAbs_EDGE; aMode = TopAbs_EDGE;
} }
myAISContext->ActivateStandardMode (aMode); myAISContext->Activate (AIS_Shape::SelectionMode (aMode));
} }
//======================================================================= //=======================================================================
@ -325,8 +318,7 @@ void CDimensionDlg::UpdateStandardModeForAngle()
void CDimensionDlg::UpdateStandardModeForLength() void CDimensionDlg::UpdateStandardModeForLength()
{ {
int aTabNum = ((CTabCtrl*) GetDlgItem (IDC_LengthTab))->GetCurSel(); int aTabNum = ((CTabCtrl*) GetDlgItem (IDC_LengthTab))->GetCurSel();
myAISContext->CloseAllContexts();
myAISContext->OpenLocalContext();
TopAbs_ShapeEnum aMode; TopAbs_ShapeEnum aMode;
if (aTabNum == 1) if (aTabNum == 1)
@ -341,7 +333,7 @@ void CDimensionDlg::UpdateStandardModeForLength()
{ {
aMode = TopAbs_EDGE; aMode = TopAbs_EDGE;
} }
myAISContext->ActivateStandardMode (aMode); myAISContext->Activate (AIS_Shape::SelectionMode (aMode));
} }
//======================================================================= //=======================================================================
@ -363,8 +355,7 @@ void CDimensionDlg::UpdateStandardMode()
case IDC_DimRadius: case IDC_DimRadius:
case IDC_DimDiameter: case IDC_DimDiameter:
{ {
myAISContext->OpenLocalContext(); myAISContext->Activate (AIS_Shape::SelectionMode (TopAbs_EDGE));
myAISContext->ActivateStandardMode (TopAbs_EDGE);
} }
break; break;
} }
@ -414,9 +405,7 @@ void CDimensionDlg::OnBnClickedDimAngle()
void CDimensionDlg::OnBnClickedDimDiameter() void CDimensionDlg::OnBnClickedDimDiameter()
{ {
// Update parameters // Update parameters
myAISContext->CloseAllContexts(); myAISContext->Activate (AIS_Shape::SelectionMode (TopAbs_EDGE));
myAISContext->OpenLocalContext();
myAISContext->ActivateStandardMode (TopAbs_EDGE);
GetDlgItem (IDC_LengthTab)->ShowWindow (SW_HIDE); GetDlgItem (IDC_LengthTab)->ShowWindow (SW_HIDE);
GetDlgItem (IDC_AngleTab)->ShowWindow (SW_HIDE); GetDlgItem (IDC_AngleTab)->ShowWindow (SW_HIDE);
@ -435,9 +424,7 @@ void CDimensionDlg::OnBnClickedDimDiameter()
void CDimensionDlg::OnBnClickedDimRadius() void CDimensionDlg::OnBnClickedDimRadius()
{ {
// Update parameters // Update parameters
myAISContext->CloseAllContexts(); myAISContext->Activate (AIS_Shape::SelectionMode (TopAbs_EDGE));
myAISContext->OpenLocalContext();
myAISContext->ActivateStandardMode (TopAbs_EDGE);
GetDlgItem (IDC_LengthTab)->ShowWindow (SW_HIDE); GetDlgItem (IDC_LengthTab)->ShowWindow (SW_HIDE);
GetDlgItem (IDC_AngleTab)->ShowWindow (SW_HIDE); GetDlgItem (IDC_AngleTab)->ShowWindow (SW_HIDE);
GetDlgItem (IDC_RadiusTab)->ShowWindow (SW_SHOW); GetDlgItem (IDC_RadiusTab)->ShowWindow (SW_SHOW);
@ -530,16 +517,7 @@ void CDimensionDlg::OnTcnSelChangingAngleTab (NMHDR * /*pNMHDR*/, LRESULT *pResu
void CDimensionDlg::DeactivateAllStandardModes() void CDimensionDlg::DeactivateAllStandardModes()
{ {
if (myAISContext->HasOpenedContext()) myAISContext->Deactivate();
{
myAISContext->CloseAllContexts();
for (TColStd_ListIteratorOfListOfInteger anIt (myAISContext->LocalContext()->StandardModes());
anIt.More();
anIt.Next())
{
myAISContext->LocalContext()->DeactivateStandardMode ((TopAbs_ShapeEnum)anIt.Value());
}
}
} }
//======================================================================= //=======================================================================
@ -549,10 +527,6 @@ void CDimensionDlg::DeactivateAllStandardModes()
void CDimensionDlg::OnDestroy() void CDimensionDlg::OnDestroy()
{ {
if (myAISContext->HasOpenedContext())
{
myAISContext->CloseAllContexts();
}
CWnd *aWnd; CWnd *aWnd;
TC_ITEM anItem; TC_ITEM anItem;
anItem.mask = TCIF_PARAM; anItem.mask = TCIF_PARAM;
@ -754,9 +728,5 @@ const Quantity_Color CDimensionDlg::GetDimensionColor() const
void CDimensionDlg::OnClose() void CDimensionDlg::OnClose()
{ {
if (myAISContext->HasOpenedContext())
{
myAISContext->CloseAllContexts();
}
CDialog::OnClose(); CDialog::OnClose();
} }

31
samples/mfc/standard/Common/ImportExport/ImportExport.cpp
View File

@ -56,7 +56,7 @@ Handle(TopTools_HSequenceOfShape) CImportExport::BuildSequenceFromContext(const
Handle(TColStd_HArray1OfReal)& anArrayOfTransparencies) Handle(TColStd_HArray1OfReal)& anArrayOfTransparencies)
{ {
Handle(TopTools_HSequenceOfShape) aSequence; Handle(TopTools_HSequenceOfShape) aSequence;
Standard_Integer nb = anInteractiveContext->NbCurrents(), i = 1; Standard_Integer nb = anInteractiveContext->NbSelected(), i = 1;
if (!nb) if (!nb)
return aSequence; return aSequence;
@ -65,10 +65,10 @@ Handle(TopTools_HSequenceOfShape) CImportExport::BuildSequenceFromContext(const
anArrayOfTransparencies = new TColStd_HArray1OfReal (1, nb); anArrayOfTransparencies = new TColStd_HArray1OfReal (1, nb);
Handle(AIS_InteractiveObject) picked; Handle(AIS_InteractiveObject) picked;
for(anInteractiveContext->InitCurrent();anInteractiveContext->MoreCurrent();anInteractiveContext->NextCurrent()) for (anInteractiveContext->InitSelected(); anInteractiveContext->MoreSelected(); anInteractiveContext->NextSelected())
{ {
picked = anInteractiveContext->Current(); picked = anInteractiveContext->SelectedInteractive();
if (anInteractiveContext->Current()->IsKind(STANDARD_TYPE(AIS_Shape))) if (picked->IsKind (STANDARD_TYPE (AIS_Shape)))
{ {
Handle(AIS_Shape) aisShape = Handle(AIS_Shape)::DownCast(picked); Handle(AIS_Shape) aisShape = Handle(AIS_Shape)::DownCast(picked);
TopoDS_Shape aShape = aisShape->Shape(); TopoDS_Shape aShape = aisShape->Shape();
@ -103,7 +103,8 @@ int CImportExport::ReadBREP (const Handle(AIS_InteractiveContext)& anInteractive
aShape = new AIS_Shape(aSequence->Value(i)); aShape = new AIS_Shape(aSequence->Value(i));
anInteractiveContext->SetDisplayMode(aShape, 1, Standard_False); anInteractiveContext->SetDisplayMode(aShape, 1, Standard_False);
anInteractiveContext->Display(aShape, Standard_False); anInteractiveContext->Display(aShape, Standard_False);
anInteractiveContext->SetCurrentObject(aShape, Standard_False); const Handle(AIS_InteractiveObject)& aPrs = aShape; // A small trick to avoid compiler error (C2668).
anInteractiveContext->SetSelected (aPrs, Standard_False);
} }
return 0; return 0;
} }
@ -167,8 +168,8 @@ Standard_Boolean CImportExport::ReadBREP(CString aFileName,
void CImportExport::SaveBREP(const Handle(AIS_InteractiveContext)& anInteractiveContext) void CImportExport::SaveBREP(const Handle(AIS_InteractiveContext)& anInteractiveContext)
{ {
anInteractiveContext->InitCurrent(); anInteractiveContext->InitSelected();
if (anInteractiveContext->NbCurrents() == 0){ if (anInteractiveContext->NbSelected() == 0){
AfxMessageBox (L"No shape selected for export!"); AfxMessageBox (L"No shape selected for export!");
return; return;
} }
@ -305,8 +306,8 @@ Standard_Integer CImportExport::ReadIGES(const Standard_CString& aFileName,
void CImportExport::SaveIGES(const Handle(AIS_InteractiveContext)& anInteractiveContext) void CImportExport::SaveIGES(const Handle(AIS_InteractiveContext)& anInteractiveContext)
{ {
anInteractiveContext->InitCurrent(); anInteractiveContext->InitSelected();
if (anInteractiveContext->NbCurrents() == 0){ if (anInteractiveContext->NbSelected() == 0){
AfxMessageBox (L"No shape selected for export!"); AfxMessageBox (L"No shape selected for export!");
return; return;
} }
@ -456,8 +457,8 @@ IFSelect_ReturnStatus CImportExport::ReadSTEP(const Standard_CString& aFileName,
//---------------------------------------------------------------------- //----------------------------------------------------------------------
void CImportExport::SaveSTEP(const Handle(AIS_InteractiveContext)& anInteractiveContext) void CImportExport::SaveSTEP(const Handle(AIS_InteractiveContext)& anInteractiveContext)
{ {
anInteractiveContext->InitCurrent(); anInteractiveContext->InitSelected();
if (anInteractiveContext->NbCurrents() == 0){ if (anInteractiveContext->NbSelected() == 0){
AfxMessageBox (L"No shape selected for export!"); AfxMessageBox (L"No shape selected for export!");
return; return;
} }
@ -576,8 +577,8 @@ const STEPControl_StepModelType aValue /* =TopoDSToCc1Act_ManifoldSolidBrep */ )
void CImportExport::SaveSTL(const Handle(AIS_InteractiveContext)& anInteractiveContext) void CImportExport::SaveSTL(const Handle(AIS_InteractiveContext)& anInteractiveContext)
{ {
anInteractiveContext->InitCurrent(); anInteractiveContext->InitSelected();
if (anInteractiveContext->NbCurrents() == 0){ if (anInteractiveContext->NbSelected() == 0){
AfxMessageBox (L"No shape selected for export!"); AfxMessageBox (L"No shape selected for export!");
return; return;
} }
@ -663,8 +664,8 @@ Standard_Boolean CImportExport::SaveSTL(const Standard_CString& aFileName,
void CImportExport::SaveVRML(const Handle(AIS_InteractiveContext)& anInteractiveContext) void CImportExport::SaveVRML(const Handle(AIS_InteractiveContext)& anInteractiveContext)
{ {
anInteractiveContext->InitCurrent(); anInteractiveContext->InitSelected();
if (anInteractiveContext->NbCurrents() == 0){ if (anInteractiveContext->NbSelected() == 0){
AfxMessageBox (L"No shape selected for export!"); AfxMessageBox (L"No shape selected for export!");
return; return;
} }

10
samples/mfc/standard/Common/LengthParamsEdgePage.cpp
View File

@ -67,9 +67,9 @@ CButton* CLengthParamsEdgePage::GetButton()
void CLengthParamsEdgePage::OnBnClickedChooseEdgeBtn() void CLengthParamsEdgePage::OnBnClickedChooseEdgeBtn()
{ {
myAISContext->LocalContext()->InitSelected(); myAISContext->InitSelected();
if (!myAISContext->LocalContext()->MoreSelected() || if (!myAISContext->MoreSelected() ||
myAISContext->SelectedShape().ShapeType() != TopAbs_EDGE) myAISContext->SelectedShape().ShapeType() != TopAbs_EDGE)
{ {
AfxMessageBox ( _T("Choose the edge and press the button again"), MB_ICONINFORMATION | MB_OK); AfxMessageBox ( _T("Choose the edge and press the button again"), MB_ICONINFORMATION | MB_OK);
@ -79,7 +79,7 @@ void CLengthParamsEdgePage::OnBnClickedChooseEdgeBtn()
TopoDS_Shape aSelShape = myAISContext->SelectedShape(); TopoDS_Shape aSelShape = myAISContext->SelectedShape();
const TopoDS_Edge& anEdge = TopoDS::Edge (aSelShape); const TopoDS_Edge& anEdge = TopoDS::Edge (aSelShape);
myAISContext->LocalContext()->ClearSelected(); myAISContext->ClearSelected();
TopoDS_Vertex aFirstVertex, aSecondVertex; TopoDS_Vertex aFirstVertex, aSecondVertex;
TopExp::Vertices (TopoDS::Edge (anEdge), aFirstVertex, aSecondVertex); TopExp::Vertices (TopoDS::Edge (anEdge), aFirstVertex, aSecondVertex);
@ -108,8 +108,6 @@ void CLengthParamsEdgePage::OnBnClickedChooseEdgeBtn()
aLenDim->SetDimensionAspect (anAspect); aLenDim->SetDimensionAspect (anAspect);
aLenDim->SetFlyout (aDimDlg->GetFlyout()); aLenDim->SetFlyout (aDimDlg->GetFlyout());
myAISContext->CloseAllContexts();
myAISContext->Display (aLenDim); myAISContext->Display (aLenDim);
myAISContext->OpenLocalContext(); myAISContext->Activate (AIS_Shape::SelectionMode (TopAbs_EDGE));
myAISContext->ActivateStandardMode(TopAbs_EDGE);
} }

29
samples/mfc/standard/Common/LengthParamsEdgesPage.cpp
View File

@ -58,20 +58,12 @@ END_MESSAGE_MAP()
void CLengthParamsEdgesPage::OnBnClickedEdge1Btn() void CLengthParamsEdgesPage::OnBnClickedEdge1Btn()
{ {
// Open local context and choose the edge for length dimensions myAISContext->Activate (AIS_Shape::SelectionMode (TopAbs_EDGE));
if (!myAISContext->HasOpenedContext())
{
myAISContext->OpenLocalContext();
myAISContext->ActivateStandardMode (TopAbs_EDGE);
AfxMessageBox (_T("Local context was not opened. Choose the edge and press the button again"),
MB_ICONINFORMATION | MB_OK);
return;
}
// Now it's ok, local context is opened and edge selection mode is activated // Now it's ok, edge selection mode is activated
// Check if some edge is selected // Check if some edge is selected
myAISContext->LocalContext()->InitSelected(); myAISContext->InitSelected();
if (!myAISContext->LocalContext()->MoreSelected() || if (!myAISContext->MoreSelected() ||
myAISContext->SelectedShape().ShapeType() != TopAbs_EDGE) myAISContext->SelectedShape().ShapeType() != TopAbs_EDGE)
{ {
AfxMessageBox(_T("Choose the edge and press the button again"), AfxMessageBox(_T("Choose the edge and press the button again"),
@ -81,7 +73,7 @@ void CLengthParamsEdgesPage::OnBnClickedEdge1Btn()
myFirstEdge = TopoDS::Edge (myAISContext->SelectedShape()); myFirstEdge = TopoDS::Edge (myAISContext->SelectedShape());
myAISContext->LocalContext()->ClearSelected(); myAISContext->ClearSelected();
} }
//======================================================================= //=======================================================================
@ -91,8 +83,8 @@ void CLengthParamsEdgesPage::OnBnClickedEdge1Btn()
void CLengthParamsEdgesPage::OnBnClickedEdge2Btn() void CLengthParamsEdgesPage::OnBnClickedEdge2Btn()
{ {
myAISContext->LocalContext()->InitSelected(); myAISContext->InitSelected();
if (!myAISContext->LocalContext()->MoreSelected() || if (!myAISContext->MoreSelected() ||
myAISContext->SelectedShape().ShapeType() != TopAbs_EDGE) myAISContext->SelectedShape().ShapeType() != TopAbs_EDGE)
{ {
AfxMessageBox (_T("Choose the edge and press the button again"), AfxMessageBox (_T("Choose the edge and press the button again"),
@ -102,7 +94,7 @@ void CLengthParamsEdgesPage::OnBnClickedEdge2Btn()
mySecondEdge = TopoDS::Edge (myAISContext->SelectedShape()); mySecondEdge = TopoDS::Edge (myAISContext->SelectedShape());
myAISContext->LocalContext()->ClearSelected(); myAISContext->ClearSelected();
// Build plane through three points // Build plane through three points
BRepAdaptor_Curve aCurve1 (myFirstEdge); BRepAdaptor_Curve aCurve1 (myFirstEdge);
@ -118,8 +110,6 @@ void CLengthParamsEdgesPage::OnBnClickedEdge2Btn()
CDimensionDlg *aDimDlg = (CDimensionDlg*)(GetParentOwner()); CDimensionDlg *aDimDlg = (CDimensionDlg*)(GetParentOwner());
myAISContext->CloseAllContexts();
Handle(Prs3d_DimensionAspect) anAspect = new Prs3d_DimensionAspect(); Handle(Prs3d_DimensionAspect) anAspect = new Prs3d_DimensionAspect();
anAspect->MakeArrows3d (Standard_False); anAspect->MakeArrows3d (Standard_False);
anAspect->MakeText3d (aDimDlg->GetTextType()); anAspect->MakeText3d (aDimDlg->GetTextType());
@ -162,6 +152,5 @@ void CLengthParamsEdgesPage::OnBnClickedEdge2Btn()
myAISContext->Display (aLenDim); myAISContext->Display (aLenDim);
} }
myAISContext->OpenLocalContext(); myAISContext->Activate (AIS_Shape::SelectionMode (TopAbs_EDGE));
myAISContext->ActivateStandardMode (TopAbs_EDGE);
} }

32
samples/mfc/standard/Common/LengthParamsVerticesPage.cpp
View File

@ -59,29 +59,21 @@ END_MESSAGE_MAP()
void CLengthParamsVerticesPage::OnBnClickedVertex1Btn() void CLengthParamsVerticesPage::OnBnClickedVertex1Btn()
{ {
// Open local context and choose the edge for length dimensions myAISContext->Activate (AIS_Shape::SelectionMode (TopAbs_VERTEX));
if (!myAISContext->HasOpenedContext())
{
myAISContext->OpenLocalContext();
myAISContext->ActivateStandardMode(TopAbs_VERTEX);
AfxMessageBox(_T("Local context was not opened. Choose the vertices and press the button again"),
MB_ICONINFORMATION | MB_OK);
return;
}
// Now it's ok, local context is opened and edge selection mode is activated // Now it's ok, edge selection mode is activated
// Check if some edge is selected // Check if some edge is selected
myAISContext->LocalContext()->InitSelected(); myAISContext->InitSelected();
if (!myAISContext->LocalContext()->MoreSelected() || if (!myAISContext->MoreSelected() ||
myAISContext->SelectedShape().ShapeType() != TopAbs_VERTEX) myAISContext->SelectedShape().ShapeType() != TopAbs_VERTEX)
{ {
AfxMessageBox (_T ("Choose the vertex and press the button again"), MB_ICONINFORMATION | MB_OK); AfxMessageBox (_T ("Choose the vertex and press the button again"), MB_ICONINFORMATION | MB_OK);
return; return;
} }
myFirstVertex = TopoDS::Vertex (myAISContext->LocalContext()->SelectedShape()); myFirstVertex = TopoDS::Vertex (myAISContext->SelectedShape());
myAISContext->LocalContext()->ClearSelected(); myAISContext->ClearSelected();
} }
//======================================================================= //=======================================================================
@ -91,16 +83,16 @@ void CLengthParamsVerticesPage::OnBnClickedVertex1Btn()
void CLengthParamsVerticesPage::OnBnClickedVertex2Btn() void CLengthParamsVerticesPage::OnBnClickedVertex2Btn()
{ {
myAISContext->LocalContext()->InitSelected(); myAISContext->InitSelected();
if (!myAISContext->LocalContext()->MoreSelected() || if (!myAISContext->MoreSelected() ||
myAISContext->SelectedShape().ShapeType() != TopAbs_VERTEX) myAISContext->SelectedShape().ShapeType() != TopAbs_VERTEX)
{ {
AfxMessageBox (_T ("Choose the vertex and press the button again"), MB_ICONINFORMATION | MB_OK); AfxMessageBox (_T ("Choose the vertex and press the button again"), MB_ICONINFORMATION | MB_OK);
return; return;
} }
mySecondVertex = TopoDS::Vertex (myAISContext->LocalContext()->SelectedShape()); mySecondVertex = TopoDS::Vertex (myAISContext->SelectedShape());
myAISContext->LocalContext()->ClearSelected(); myAISContext->ClearSelected();
//Build dimension here //Build dimension here
gp_Pnt aP1=BRep_Tool::Pnt (myFirstVertex); gp_Pnt aP1=BRep_Tool::Pnt (myFirstVertex);
@ -128,10 +120,8 @@ void CLengthParamsVerticesPage::OnBnClickedVertex2Btn()
aLenDim->SetDimensionAspect (anAspect); aLenDim->SetDimensionAspect (anAspect);
aLenDim->SetFlyout (aDimDlg->GetFlyout()); aLenDim->SetFlyout (aDimDlg->GetFlyout());
myAISContext->CloseAllContexts();
myAISContext->Display (aLenDim); myAISContext->Display (aLenDim);
myAISContext->OpenLocalContext(); myAISContext->Activate (AIS_Shape::SelectionMode (TopAbs_VERTEX));
myAISContext->ActivateStandardMode (TopAbs_VERTEX);
} }
//======================================================================= //=======================================================================

82
samples/mfc/standard/Common/OCC_3dBaseDoc.cpp
View File

@ -202,8 +202,8 @@ void OCC_3dBaseDoc::Popup (const Standard_Integer theMouseX,
// Base check which context menu to call // Base check which context menu to call
if (!myPopupMenuNumber) if (!myPopupMenuNumber)
{ {
myAISContext->InitCurrent(); myAISContext->InitSelected();
if (myAISContext->MoreCurrent()) if (myAISContext->MoreSelected())
myPopupMenuNumber=1; myPopupMenuNumber=1;
} }
@ -215,8 +215,8 @@ void OCC_3dBaseDoc::Popup (const Standard_Integer theMouseX,
if (myPopupMenuNumber == 1) // more than 1 object. if (myPopupMenuNumber == 1) // more than 1 object.
{ {
bool OneOrMoreInShading = false; bool OneOrMoreInShading = false;
for (myAISContext->InitCurrent();myAISContext->MoreCurrent ();myAISContext->NextCurrent ()) for (myAISContext->InitSelected();myAISContext->MoreSelected ();myAISContext->NextSelected ())
if (myAISContext->IsDisplayed(myAISContext->Current(),1)) OneOrMoreInShading=true; if (myAISContext->IsDisplayed(myAISContext->SelectedInteractive(),1)) OneOrMoreInShading=true;
if(!OneOrMoreInShading) if(!OneOrMoreInShading)
pPopup->EnableMenuItem(5, MF_BYPOSITION | MF_DISABLED | MF_GRAYED); pPopup->EnableMenuItem(5, MF_BYPOSITION | MF_DISABLED | MF_GRAYED);
} }
@ -261,10 +261,10 @@ void OCC_3dBaseDoc::OnObjectColor()
COLORREF MSColor ; COLORREF MSColor ;
Quantity_Color CSFColor ; Quantity_Color CSFColor ;
myAISContext->InitCurrent(); myAISContext->InitSelected();
Current = myAISContext->Current(); Current = myAISContext->SelectedInteractive();
if ( Current->HasColor () ) { if ( Current->HasColor () ) {
CSFColor = myAISContext->Color(myAISContext->Current()); CSFColor = myAISContext->Color(Current);
MSColor = RGB (CSFColor.Red()*255.,CSFColor.Green()*255.,CSFColor.Blue()*255.); MSColor = RGB (CSFColor.Red()*255.,CSFColor.Green()*255.,CSFColor.Blue()*255.);
} }
else { else {
@ -277,16 +277,16 @@ void OCC_3dBaseDoc::OnObjectColor()
MSColor = dlgColor.GetColor(); MSColor = dlgColor.GetColor();
CSFColor = Quantity_Color (GetRValue(MSColor)/255.,GetGValue(MSColor)/255., CSFColor = Quantity_Color (GetRValue(MSColor)/255.,GetGValue(MSColor)/255.,
GetBValue(MSColor)/255.,Quantity_TOC_RGB); GetBValue(MSColor)/255.,Quantity_TOC_RGB);
for (;myAISContext->MoreCurrent ();myAISContext->NextCurrent ()) for (;myAISContext->MoreSelected ();myAISContext->NextSelected ())
myAISContext->SetColor (myAISContext->Current(),CSFColor.Name()); myAISContext->SetColor (myAISContext->SelectedInteractive(),CSFColor.Name());
} }
} }
void OCC_3dBaseDoc::OnUpdateObjectColor(CCmdUI* pCmdUI) void OCC_3dBaseDoc::OnUpdateObjectColor(CCmdUI* pCmdUI)
{ {
bool OneOrMoreIsShadingOrWireframe = false; bool OneOrMoreIsShadingOrWireframe = false;
for (myAISContext->InitCurrent();myAISContext->MoreCurrent ();myAISContext->NextCurrent ()) for (myAISContext->InitSelected();myAISContext->MoreSelected ();myAISContext->NextSelected ())
if (myAISContext->IsDisplayed(myAISContext->Current(),0) if (myAISContext->IsDisplayed(myAISContext->SelectedInteractive(),0)
||myAISContext->IsDisplayed(myAISContext->Current(),1)) ||myAISContext->IsDisplayed(myAISContext->SelectedInteractive(),1))
OneOrMoreIsShadingOrWireframe=true; OneOrMoreIsShadingOrWireframe=true;
pCmdUI->Enable (OneOrMoreIsShadingOrWireframe); pCmdUI->Enable (OneOrMoreIsShadingOrWireframe);
} }
@ -294,14 +294,14 @@ void OCC_3dBaseDoc::OnUpdateObjectColor(CCmdUI* pCmdUI)
void OCC_3dBaseDoc::OnObjectErase() void OCC_3dBaseDoc::OnObjectErase()
{ {
myAISContext->EraseSelected(); myAISContext->EraseSelected();
myAISContext->ClearCurrents(); myAISContext->ClearSelected();
} }
void OCC_3dBaseDoc::OnUpdateObjectErase(CCmdUI* pCmdUI) void OCC_3dBaseDoc::OnUpdateObjectErase(CCmdUI* pCmdUI)
{ {
bool OneOrMoreIsDisplayed = false; bool OneOrMoreIsDisplayed = false;
for (myAISContext->InitCurrent(); myAISContext->MoreCurrent(); myAISContext->NextCurrent()) for (myAISContext->InitSelected(); myAISContext->MoreSelected(); myAISContext->NextSelected())
{ {
if (myAISContext->IsDisplayed (myAISContext->Current())) if (myAISContext->IsDisplayed (myAISContext->SelectedInteractive()))
OneOrMoreIsDisplayed = true; OneOrMoreIsDisplayed = true;
} }
pCmdUI->Enable (OneOrMoreIsDisplayed); pCmdUI->Enable (OneOrMoreIsDisplayed);
@ -309,28 +309,28 @@ void OCC_3dBaseDoc::OnUpdateObjectErase(CCmdUI* pCmdUI)
void OCC_3dBaseDoc::OnObjectWireframe() void OCC_3dBaseDoc::OnObjectWireframe()
{ {
for(myAISContext->InitCurrent();myAISContext->MoreCurrent();myAISContext->NextCurrent()) for(myAISContext->InitSelected();myAISContext->MoreSelected();myAISContext->NextSelected())
myAISContext->SetDisplayMode(myAISContext->Current(),0); myAISContext->SetDisplayMode(myAISContext->SelectedInteractive(),0);
} }
void OCC_3dBaseDoc::OnUpdateObjectWireframe(CCmdUI* pCmdUI) void OCC_3dBaseDoc::OnUpdateObjectWireframe(CCmdUI* pCmdUI)
{ {
bool OneOrMoreInShading = false; bool OneOrMoreInShading = false;
for (myAISContext->InitCurrent();myAISContext->MoreCurrent ();myAISContext->NextCurrent ()) for (myAISContext->InitSelected();myAISContext->MoreSelected ();myAISContext->NextSelected ())
if (myAISContext->IsDisplayed(myAISContext->Current(),1)) OneOrMoreInShading=true; if (myAISContext->IsDisplayed(myAISContext->SelectedInteractive(),1)) OneOrMoreInShading=true;
pCmdUI->Enable (OneOrMoreInShading); pCmdUI->Enable (OneOrMoreInShading);
} }
void OCC_3dBaseDoc::OnObjectShading() void OCC_3dBaseDoc::OnObjectShading()
{ {
for(myAISContext->InitCurrent();myAISContext->MoreCurrent();myAISContext->NextCurrent()) for(myAISContext->InitSelected();myAISContext->MoreSelected();myAISContext->NextSelected())
myAISContext->SetDisplayMode(myAISContext->Current(),1); myAISContext->SetDisplayMode(myAISContext->SelectedInteractive(),1);
} }
void OCC_3dBaseDoc::OnUpdateObjectShading(CCmdUI* pCmdUI) void OCC_3dBaseDoc::OnUpdateObjectShading(CCmdUI* pCmdUI)
{ {
bool OneOrMoreInWireframe = false; bool OneOrMoreInWireframe = false;
for (myAISContext->InitCurrent();myAISContext->MoreCurrent ();myAISContext->NextCurrent ()) for (myAISContext->InitSelected();myAISContext->MoreSelected ();myAISContext->NextSelected ())
if (myAISContext->IsDisplayed(myAISContext->Current(),0)) OneOrMoreInWireframe=true; if (myAISContext->IsDisplayed(myAISContext->SelectedInteractive(),0)) OneOrMoreInWireframe=true;
pCmdUI->Enable (OneOrMoreInWireframe); pCmdUI->Enable (OneOrMoreInWireframe);
} }
@ -346,8 +346,8 @@ void OCC_3dBaseDoc::OnObjectMaterial()
void OCC_3dBaseDoc::OnUpdateObjectMaterial(CCmdUI* pCmdUI) void OCC_3dBaseDoc::OnUpdateObjectMaterial(CCmdUI* pCmdUI)
{ {
bool OneOrMoreInShading = false; bool OneOrMoreInShading = false;
for (myAISContext->InitCurrent();myAISContext->MoreCurrent ();myAISContext->NextCurrent ()) for (myAISContext->InitSelected();myAISContext->MoreSelected ();myAISContext->NextSelected ())
if (myAISContext->IsDisplayed(myAISContext->Current(),1)) OneOrMoreInShading=true; if (myAISContext->IsDisplayed(myAISContext->SelectedInteractive(),1)) OneOrMoreInShading=true;
pCmdUI->Enable (OneOrMoreInShading); pCmdUI->Enable (OneOrMoreInShading);
} }
@ -357,10 +357,10 @@ BOOL OCC_3dBaseDoc::OnObjectMaterialRange(UINT nID)
// continue with the same values as enumeration Type Of Material // continue with the same values as enumeration Type Of Material
Standard_Real aTransparency; Standard_Real aTransparency;
for (myAISContext->InitCurrent();myAISContext->MoreCurrent ();myAISContext->NextCurrent ()){ for (myAISContext->InitSelected();myAISContext->MoreSelected ();myAISContext->NextSelected ()){
aTransparency = myAISContext->Current()->Transparency(); aTransparency = myAISContext->SelectedInteractive()->Transparency();
myAISContext->SetMaterial (myAISContext->Current(),(Graphic3d_NameOfMaterial)(nID-ID_OBJECT_MATERIAL_BRASS)); myAISContext->SetMaterial (myAISContext->SelectedInteractive(),(Graphic3d_NameOfMaterial)(nID-ID_OBJECT_MATERIAL_BRASS));
myAISContext->SetTransparency (myAISContext->Current(),aTransparency); myAISContext->SetTransparency (myAISContext->SelectedInteractive(),aTransparency);
} }
return true; return true;
@ -369,11 +369,11 @@ BOOL OCC_3dBaseDoc::OnObjectMaterialRange(UINT nID)
void OCC_3dBaseDoc::OnUpdateObjectMaterialRange(CCmdUI* pCmdUI) void OCC_3dBaseDoc::OnUpdateObjectMaterialRange(CCmdUI* pCmdUI)
{ {
bool OneOrMoreInShading = false; bool OneOrMoreInShading = false;
for (myAISContext->InitCurrent();myAISContext->MoreCurrent ();myAISContext->NextCurrent ()) for (myAISContext->InitSelected();myAISContext->MoreSelected ();myAISContext->NextSelected ())
if (myAISContext->IsDisplayed(myAISContext->Current(),1)) OneOrMoreInShading=true; if (myAISContext->IsDisplayed(myAISContext->SelectedInteractive(),1)) OneOrMoreInShading=true;
pCmdUI->Enable (OneOrMoreInShading); pCmdUI->Enable (OneOrMoreInShading);
for (myAISContext->InitCurrent();myAISContext->MoreCurrent ();myAISContext->NextCurrent ()) for (myAISContext->InitSelected();myAISContext->MoreSelected ();myAISContext->NextSelected ())
if (myAISContext->Current()->Material() - (pCmdUI->m_nID - ID_OBJECT_MATERIAL_BRASS) == 0) if (myAISContext->SelectedInteractive()->Material() - (pCmdUI->m_nID - ID_OBJECT_MATERIAL_BRASS) == 0)
pCmdUI->SetCheck(1); pCmdUI->SetCheck(1);
} }
@ -391,8 +391,8 @@ void OCC_3dBaseDoc::OnObjectTransparency()
void OCC_3dBaseDoc::OnUpdateObjectTransparency(CCmdUI* pCmdUI) void OCC_3dBaseDoc::OnUpdateObjectTransparency(CCmdUI* pCmdUI)
{ {
bool OneOrMoreInShading = false; bool OneOrMoreInShading = false;
for (myAISContext->InitCurrent();myAISContext->MoreCurrent ();myAISContext->NextCurrent ()) for (myAISContext->InitSelected();myAISContext->MoreSelected ();myAISContext->NextSelected ())
if (myAISContext->IsDisplayed(myAISContext->Current(),1)) OneOrMoreInShading=true; if (myAISContext->IsDisplayed(myAISContext->SelectedInteractive(),1)) OneOrMoreInShading=true;
pCmdUI->Enable (OneOrMoreInShading); pCmdUI->Enable (OneOrMoreInShading);
} }
@ -419,22 +419,22 @@ void OCC_3dBaseDoc::OnUpdateObjectDisplayall(CCmdUI* pCmdUI)
void OCC_3dBaseDoc::OnObjectRemove() void OCC_3dBaseDoc::OnObjectRemove()
{ {
for(myAISContext->InitCurrent();myAISContext->MoreCurrent();myAISContext->InitCurrent()) for(myAISContext->InitSelected();myAISContext->MoreSelected();myAISContext->InitSelected())
myAISContext->Remove(myAISContext->Current(),Standard_True); myAISContext->Remove(myAISContext->SelectedInteractive(),Standard_True);
} }
void OCC_3dBaseDoc::OnUpdateObjectRemove(CCmdUI* pCmdUI) void OCC_3dBaseDoc::OnUpdateObjectRemove(CCmdUI* pCmdUI)
{ {
bool OneOrMoreIsDisplayed = false; bool OneOrMoreIsDisplayed = false;
for (myAISContext->InitCurrent();myAISContext->MoreCurrent ();myAISContext->NextCurrent ()) for (myAISContext->InitSelected();myAISContext->MoreSelected ();myAISContext->NextSelected ())
if (myAISContext->IsDisplayed(myAISContext->Current())) OneOrMoreIsDisplayed=true; if (myAISContext->IsDisplayed(myAISContext->SelectedInteractive())) OneOrMoreIsDisplayed=true;
pCmdUI->Enable (OneOrMoreIsDisplayed); pCmdUI->Enable (OneOrMoreIsDisplayed);
} }
void OCC_3dBaseDoc::SetMaterial(Graphic3d_NameOfMaterial Material) void OCC_3dBaseDoc::SetMaterial(Graphic3d_NameOfMaterial Material)
{ {
for (myAISContext->InitCurrent();myAISContext->MoreCurrent ();myAISContext->NextCurrent ()) for (myAISContext->InitSelected();myAISContext->MoreSelected ();myAISContext->NextSelected ())
myAISContext->SetMaterial (myAISContext->Current(), myAISContext->SetMaterial (myAISContext->SelectedInteractive(),
(Graphic3d_NameOfMaterial)(Material)); (Graphic3d_NameOfMaterial)(Material));
} }

21
samples/mfc/standard/Common/ParamsFacesPage.cpp
View File

@ -5,7 +5,6 @@
#include "ParamsFacesPage.h" #include "ParamsFacesPage.h"
#include "DimensionDlg.h" #include "DimensionDlg.h"
#include <AIS_InteractiveContext.hxx> #include <AIS_InteractiveContext.hxx>
#include <AIS_LocalContext.hxx>
#include <AIS_LengthDimension.hxx> #include <AIS_LengthDimension.hxx>
#include <AIS_AngleDimension.hxx> #include <AIS_AngleDimension.hxx>
@ -43,8 +42,8 @@ END_MESSAGE_MAP()
void CParamsFacesPage::OnBnClickedFacesbtn1() void CParamsFacesPage::OnBnClickedFacesbtn1()
{ {
// Check if face is selected // Check if face is selected
myAISContext->LocalContext()->InitSelected(); myAISContext->InitSelected();
if (!myAISContext->LocalContext()->MoreSelected() || if (!myAISContext->MoreSelected() ||
myAISContext->SelectedShape().ShapeType() != TopAbs_FACE) myAISContext->SelectedShape().ShapeType() != TopAbs_FACE)
{ {
AfxMessageBox(_T("Choose the face and press the button again"), AfxMessageBox(_T("Choose the face and press the button again"),
@ -54,14 +53,16 @@ void CParamsFacesPage::OnBnClickedFacesbtn1()
myFirstFace = TopoDS::Face (myAISContext->SelectedShape()); myFirstFace = TopoDS::Face (myAISContext->SelectedShape());
myAISContext->LocalContext()->ClearSelected(); myAISContext->ClearSelected();
} }
void CParamsFacesPage::OnBnClickedFacesbtn2() void CParamsFacesPage::OnBnClickedFacesbtn2()
{ {
const Standard_Integer aSelectionMode = AIS_Shape::SelectionMode (TopAbs_FACE);
// Check if face is selected // Check if face is selected
myAISContext->LocalContext()->InitSelected(); myAISContext->InitSelected();
if (!myAISContext->LocalContext()->MoreSelected() || if (!myAISContext->MoreSelected() ||
myAISContext->SelectedShape().ShapeType() != TopAbs_FACE) myAISContext->SelectedShape().ShapeType() != TopAbs_FACE)
{ {
AfxMessageBox(_T("Choose the face and press the button again"), AfxMessageBox(_T("Choose the face and press the button again"),
@ -70,12 +71,11 @@ void CParamsFacesPage::OnBnClickedFacesbtn2()
} }
mySecondFace = TopoDS::Face (myAISContext->SelectedShape()); mySecondFace = TopoDS::Face (myAISContext->SelectedShape());
myAISContext->ClearSelected();
myAISContext->LocalContext()->ClearSelected();
CDimensionDlg *aDimDlg = (CDimensionDlg*)(GetParentOwner()); CDimensionDlg *aDimDlg = (CDimensionDlg*)(GetParentOwner());
myAISContext->CloseAllContexts(); myAISContext->Deactivate (aSelectionMode);
Handle(Prs3d_DimensionAspect) anAspect = new Prs3d_DimensionAspect(); Handle(Prs3d_DimensionAspect) anAspect = new Prs3d_DimensionAspect();
anAspect->MakeArrows3d (Standard_False); anAspect->MakeArrows3d (Standard_False);
@ -120,6 +120,5 @@ void CParamsFacesPage::OnBnClickedFacesbtn2()
myAISContext->Display (aLenDim); myAISContext->Display (aLenDim);
} }
myAISContext->OpenLocalContext(); myAISContext->Activate (aSelectionMode);
myAISContext->ActivateStandardMode (TopAbs_FACE);
} }

11
samples/mfc/standard/Common/RadiusParamsPage.cpp
View File

@ -58,8 +58,8 @@ END_MESSAGE_MAP()
void CRadiusParamsPage::OnBnClickedObjectBtn() void CRadiusParamsPage::OnBnClickedObjectBtn()
{ {
//Build dimension here //Build dimension here
myAISContext->LocalContext()->InitSelected(); myAISContext->InitSelected();
if (!myAISContext->LocalContext()->MoreSelected() || if (!myAISContext->MoreSelected() ||
myAISContext->SelectedShape().ShapeType() != TopAbs_EDGE) myAISContext->SelectedShape().ShapeType() != TopAbs_EDGE)
{ {
AfxMessageBox (_T ("Choose the edge and press the button again"), MB_ICONINFORMATION | MB_OK); AfxMessageBox (_T ("Choose the edge and press the button again"), MB_ICONINFORMATION | MB_OK);
@ -94,7 +94,7 @@ void CRadiusParamsPage::OnBnClickedObjectBtn()
} }
} }
myAISContext->LocalContext()->ClearSelected(); myAISContext->ClearSelected();
CDimensionDlg *aDimDlg = (CDimensionDlg*)(this->GetParentOwner()); CDimensionDlg *aDimDlg = (CDimensionDlg*)(this->GetParentOwner());
// Try to create dimension if it is possible // Try to create dimension if it is possible
Handle(AIS_Dimension) aDim; Handle(AIS_Dimension) aDim;
@ -124,10 +124,7 @@ void CRadiusParamsPage::OnBnClickedObjectBtn()
aDim->SetDimensionAspect (anAspect); aDim->SetDimensionAspect (anAspect);
// Display dimension in the neutral point // Display dimension in the neutral point
myAISContext->CloseAllContexts();
myAISContext->Display (aDim); myAISContext->Display (aDim);
myAISContext->Activate (AIS_Shape::SelectionMode (TopAbs_EDGE));
myAISContext->OpenLocalContext();
myAISContext->ActivateStandardMode (TopAbs_EDGE);
} }

6
samples/qt/Common/src/ApplicationCommon.cxx
View File

@ -544,11 +544,11 @@ void ApplicationCommonWindow::onSelectionChanged()
int numSel = context->NbSelected(); int numSel = context->NbSelected();
if ( numSel ) if ( numSel )
{ {
for ( context->InitCurrent(); context->MoreCurrent(); context->NextCurrent() ) for ( context->InitSelected(); context->MoreSelected(); context->NextSelected() )
{ {
if ( context->IsDisplayed( context->Current(), 1 ) ) if ( context->IsDisplayed( context->SelectedInteractive(), 1 ) )
OneOrMoreInShading = true; OneOrMoreInShading = true;
if ( context->IsDisplayed( context->Current(), 0 ) ) if ( context->IsDisplayed( context->SelectedInteractive(), 0 ) )
OneOrMoreInWireframe = true; OneOrMoreInWireframe = true;
} }
myToolActions.at( ToolWireframeId )->setEnabled( OneOrMoreInShading ); myToolActions.at( ToolWireframeId )->setEnabled( OneOrMoreInShading );

24
samples/qt/Common/src/DocumentCommon.cxx
View File

@ -159,8 +159,8 @@ void DocumentCommon::fitAll()
void DocumentCommon::onWireframe() void DocumentCommon::onWireframe()
{ {
QApplication::setOverrideCursor( Qt::WaitCursor ); QApplication::setOverrideCursor( Qt::WaitCursor );
for( myContext->InitCurrent(); myContext->MoreCurrent(); myContext->NextCurrent() ) for( myContext->InitSelected(); myContext->MoreSelected(); myContext->NextSelected() )
myContext->SetDisplayMode( myContext->Current(), 0, false ); myContext->SetDisplayMode( myContext->SelectedInteractive(), 0, false );
myContext->UpdateCurrentViewer(); myContext->UpdateCurrentViewer();
getApplication()->onSelectionChanged(); getApplication()->onSelectionChanged();
QApplication::restoreOverrideCursor(); QApplication::restoreOverrideCursor();
@ -169,8 +169,8 @@ void DocumentCommon::onWireframe()
void DocumentCommon::onShading() void DocumentCommon::onShading()
{ {
QApplication::setOverrideCursor( Qt::WaitCursor ); QApplication::setOverrideCursor( Qt::WaitCursor );
for( myContext->InitCurrent(); myContext->MoreCurrent(); myContext->NextCurrent() ) for( myContext->InitSelected(); myContext->MoreSelected(); myContext->NextSelected() )
myContext->SetDisplayMode( myContext->Current(), 1, false ); myContext->SetDisplayMode( myContext->SelectedInteractive(), 1, false );
myContext->UpdateCurrentViewer(); myContext->UpdateCurrentViewer();
getApplication()->onSelectionChanged(); getApplication()->onSelectionChanged();
QApplication::restoreOverrideCursor(); QApplication::restoreOverrideCursor();
@ -180,8 +180,8 @@ void DocumentCommon::onColor()
{ {
QColor aColor ; QColor aColor ;
Quantity_Color aShapeColor; Quantity_Color aShapeColor;
myContext->InitCurrent(); myContext->InitSelected();
Handle(AIS_InteractiveObject) Current = myContext->Current() ; Handle(AIS_InteractiveObject) Current = myContext->SelectedInteractive() ;
if ( Current->HasColor () ) if ( Current->HasColor () )
{ {
aShapeColor = myContext->Color( Current ); aShapeColor = myContext->Color( Current );
@ -195,15 +195,15 @@ void DocumentCommon::onColor()
{ {
Quantity_Color color( aRetColor.red() / 255., aRetColor.green() / 255., Quantity_Color color( aRetColor.red() / 255., aRetColor.green() / 255.,
aRetColor.blue() / 255., Quantity_TOC_RGB ); aRetColor.blue() / 255., Quantity_TOC_RGB );
for (; myContext->MoreCurrent(); myContext->NextCurrent() ) for (; myContext->MoreSelected(); myContext->NextSelected() )
myContext->SetColor( myContext->Current(), color.Name() ); myContext->SetColor( myContext->SelectedInteractive(), color.Name() );
} }
} }
void DocumentCommon::onMaterial( int theMaterial ) void DocumentCommon::onMaterial( int theMaterial )
{ {
for ( myContext->InitCurrent(); myContext->MoreCurrent (); myContext->NextCurrent () ) for ( myContext->InitSelected(); myContext->MoreSelected (); myContext->NextSelected () )
myContext->SetMaterial( myContext->Current(), (Graphic3d_NameOfMaterial)theMaterial ); myContext->SetMaterial( myContext->SelectedInteractive(), (Graphic3d_NameOfMaterial)theMaterial );
} }
void DocumentCommon::onMaterial() void DocumentCommon::onMaterial()
@ -215,8 +215,8 @@ void DocumentCommon::onMaterial()
void DocumentCommon::onTransparency( int theTrans ) void DocumentCommon::onTransparency( int theTrans )
{ {
for( myContext->InitCurrent(); myContext->MoreCurrent(); myContext->NextSelected() ) for( myContext->InitSelected(); myContext->MoreSelected(); myContext->NextSelected() )
myContext->SetTransparency( myContext->Current(), ((Standard_Real)theTrans) / 10.0 ); myContext->SetTransparency( myContext->SelectedInteractive(), ((Standard_Real)theTrans) / 10.0 );
} }
void DocumentCommon::onTransparency() void DocumentCommon::onTransparency()

4
samples/qt/Interface/src/Translate.cxx
View File

@ -275,9 +275,9 @@ Handle(TopTools_HSequenceOfShape) Translate::getShapes( const Handle(AIS_Interac
{ {
Handle(TopTools_HSequenceOfShape) aSequence; Handle(TopTools_HSequenceOfShape) aSequence;
Handle(AIS_InteractiveObject) picked; Handle(AIS_InteractiveObject) picked;
for ( ic->InitCurrent(); ic->MoreCurrent(); ic->NextCurrent() ) for ( ic->InitSelected(); ic->MoreSelected(); ic->NextSelected() )
{ {
Handle(AIS_InteractiveObject) obj = ic->Current(); Handle(AIS_InteractiveObject) obj = ic->SelectedInteractive();
if ( obj->IsKind( STANDARD_TYPE( AIS_Shape ) ) ) if ( obj->IsKind( STANDARD_TYPE( AIS_Shape ) ) )
{ {
TopoDS_Shape shape = Handle(AIS_Shape)::DownCast(obj)->Shape(); TopoDS_Shape shape = Handle(AIS_Shape)::DownCast(obj)->Shape();

3
samples/qt/Tutorial/src/DocumentTut.cxx
View File

@ -27,7 +27,8 @@ void DocumentTut::onMakeBottle()
getContext()->SetMaterial(AISBottle,Graphic3d_NOM_GOLD); getContext()->SetMaterial(AISBottle,Graphic3d_NOM_GOLD);
getContext()->SetDisplayMode(AISBottle,1,Standard_False); getContext()->SetDisplayMode(AISBottle,1,Standard_False);
getContext()->Display(AISBottle, Standard_False); getContext()->Display(AISBottle, Standard_False);
getContext()->SetCurrentObject(AISBottle,Standard_False); const Handle(AIS_InteractiveObject)& anIOAISBottle = AISBottle;
getContext()->SetSelected(anIOAISBottle,Standard_False);
emit selectionChanged(); emit selectionChanged();
fitAll(); fitAll();
QApplication::restoreOverrideCursor(); QApplication::restoreOverrideCursor();

9
src/AIS/AIS_InteractiveContext.cxx
View File

@ -928,7 +928,10 @@ Standard_Boolean AIS_InteractiveContext::IsHilighted (const Handle(AIS_Interacti
return myObjects (theObj)->IsHilighted(); return myObjects (theObj)->IsHilighted();
} }
for (Standard_Integer aCtxIdx = HighestIndex(); aCtxIdx >= 1; aCtxIdx--) Standard_DISABLE_DEPRECATION_WARNINGS
Standard_Integer aCtxIdx = HighestIndex();
Standard_ENABLE_DEPRECATION_WARNINGS
for (; aCtxIdx >= 1; aCtxIdx--)
{ {
if (myLocalContexts.IsBound (aCtxIdx)) if (myLocalContexts.IsBound (aCtxIdx))
{ {
@ -2268,6 +2271,7 @@ void AIS_InteractiveContext::EraseGlobal (const Handle(AIS_InteractiveObject)& t
if (aStatus->IsHilighted()) if (aStatus->IsHilighted())
{ {
Standard_DISABLE_DEPRECATION_WARNINGS
if (IsCurrent (theIObj)) if (IsCurrent (theIObj))
{ {
AddOrRemoveCurrentObject (theIObj, Standard_False); AddOrRemoveCurrentObject (theIObj, Standard_False);
@ -2276,6 +2280,7 @@ void AIS_InteractiveContext::EraseGlobal (const Handle(AIS_InteractiveObject)& t
{ {
unhighlightGlobal (theIObj, aStatus->DisplayMode()); unhighlightGlobal (theIObj, aStatus->DisplayMode());
} }
Standard_ENABLE_DEPRECATION_WARNINGS
} }
myMainPM->SetVisibility (theIObj, aStatus->DisplayMode(), Standard_False); myMainPM->SetVisibility (theIObj, aStatus->DisplayMode(), Standard_False);
@ -2354,6 +2359,7 @@ void AIS_InteractiveContext::ClearGlobal (const Handle(AIS_InteractiveObject)& t
myMainPM->Erase (theIObj, -1); myMainPM->Erase (theIObj, -1);
// Object removes from Detected sequence // Object removes from Detected sequence
Standard_DISABLE_DEPRECATION_WARNINGS
for (Standard_Integer aDetIter = myDetectedSeq.Lower(); aDetIter <= myDetectedSeq.Upper(); ++aDetIter) for (Standard_Integer aDetIter = myDetectedSeq.Lower(); aDetIter <= myDetectedSeq.Upper(); ++aDetIter)
{ {
Handle(AIS_InteractiveObject) anObj = DetectedCurrentObject(); Handle(AIS_InteractiveObject) anObj = DetectedCurrentObject();
@ -2363,6 +2369,7 @@ void AIS_InteractiveContext::ClearGlobal (const Handle(AIS_InteractiveObject)& t
myDetectedSeq.Remove (aDetIter); myDetectedSeq.Remove (aDetIter);
} }
} }
Standard_ENABLE_DEPRECATION_WARNINGS
// remove IO from the selection manager to avoid memory leaks // remove IO from the selection manager to avoid memory leaks
const Handle(SelectMgr_SelectableObject)& anObj = theIObj; // to avoid ambiguity const Handle(SelectMgr_SelectableObject)& anObj = theIObj; // to avoid ambiguity

61
src/AIS/AIS_InteractiveContext.hxx
View File

@ -237,6 +237,7 @@ public:
//! inWhichLocal gives the local context in which anIObj //! inWhichLocal gives the local context in which anIObj
//! is displayed. By default, the index -1 refers to the last //! is displayed. By default, the index -1 refers to the last
//! Local Context opened. //! Local Context opened.
Standard_DEPRECATED ("Local Context is deprecated - local selection should be used without Local Context")
Standard_EXPORT Standard_Boolean KeepTemporary (const Handle(AIS_InteractiveObject)& anIObj, const Standard_Integer InWhichLocal = -1); Standard_EXPORT Standard_Boolean KeepTemporary (const Handle(AIS_InteractiveObject)& anIObj, const Standard_Integer InWhichLocal = -1);
//! Empties the graphic presentation of the mode //! Empties the graphic presentation of the mode
@ -966,6 +967,7 @@ public:
//! Standard_False, the presentation of the Interactive //! Standard_False, the presentation of the Interactive
//! Object activates the selection mode; the object is //! Object activates the selection mode; the object is
//! displayed but no viewer will be updated. //! displayed but no viewer will be updated.
Standard_DEPRECATED ("Local Context is deprecated - local selection should be used without Local Context")
Standard_EXPORT void SetCurrentObject (const Handle(AIS_InteractiveObject)& aniobj, const Standard_Boolean updateviewer = Standard_True); Standard_EXPORT void SetCurrentObject (const Handle(AIS_InteractiveObject)& aniobj, const Standard_Boolean updateviewer = Standard_True);
@ -973,6 +975,7 @@ public:
//! correspondingly. Is valid for global context only; for local context use method AddOrRemoveSelected. //! correspondingly. Is valid for global context only; for local context use method AddOrRemoveSelected.
//! Since this method makes sence only for neutral point selection of a whole object, if 0 selection //! Since this method makes sence only for neutral point selection of a whole object, if 0 selection
//! of the object is empty this method simply does nothing. //! of the object is empty this method simply does nothing.
Standard_DEPRECATED ("Local Context is deprecated - local selection should be used without Local Context")
Standard_EXPORT void AddOrRemoveCurrentObject (const Handle(AIS_InteractiveObject)& theObj, Standard_EXPORT void AddOrRemoveCurrentObject (const Handle(AIS_InteractiveObject)& theObj,
const Standard_Boolean theIsToUpdateViewer = Standard_True); const Standard_Boolean theIsToUpdateViewer = Standard_True);
@ -981,6 +984,7 @@ public:
//! Objects selected when there is no open local context //! Objects selected when there is no open local context
//! are called current objects; those selected in open //! are called current objects; those selected in open
//! local context, selected objects. //! local context, selected objects.
Standard_DEPRECATED ("Local Context is deprecated - local selection should be used without Local Context")
Standard_EXPORT void UpdateCurrent(); Standard_EXPORT void UpdateCurrent();
@ -988,14 +992,17 @@ public:
//! Objects selected when there is no open local context //! Objects selected when there is no open local context
//! are called current objects; those selected in open //! are called current objects; those selected in open
//! local context, selected objects. //! local context, selected objects.
Standard_Boolean WasCurrentTouched() const; Standard_DEPRECATED ("Local Context is deprecated - local selection should be used without Local Context")
Standard_Boolean WasCurrentTouched() const;
void SetOkCurrent(); Standard_DEPRECATED ("Local Context is deprecated - local selection should be used without Local Context")
void SetOkCurrent();
//! Returns true if there is a non-null interactive object in Neutral Point. //! Returns true if there is a non-null interactive object in Neutral Point.
//! Objects selected when there is no open local context are called current objects; //! Objects selected when there is no open local context are called current objects;
//! those selected in open local context, selected objects. //! those selected in open local context, selected objects.
Standard_DEPRECATED ("Local Context is deprecated - local selection should be used without Local Context")
Standard_EXPORT Standard_Boolean IsCurrent (const Handle(AIS_InteractiveObject)& theObject) const; Standard_EXPORT Standard_Boolean IsCurrent (const Handle(AIS_InteractiveObject)& theObject) const;
@ -1004,6 +1011,7 @@ public:
//! Objects selected when there is no open local context //! Objects selected when there is no open local context
//! are called current objects; those selected in open //! are called current objects; those selected in open
//! local context, selected objects. //! local context, selected objects.
Standard_DEPRECATED ("Local Context is deprecated - local selection should be used without Local Context")
Standard_EXPORT void InitCurrent(); Standard_EXPORT void InitCurrent();
@ -1012,6 +1020,7 @@ public:
//! Objects selected when there is no open local context //! Objects selected when there is no open local context
//! are called current objects; those selected in open //! are called current objects; those selected in open
//! local context, selected objects. //! local context, selected objects.
Standard_DEPRECATED ("Local Context is deprecated - local selection should be used without Local Context")
Standard_EXPORT Standard_Boolean MoreCurrent() const; Standard_EXPORT Standard_Boolean MoreCurrent() const;
@ -1020,6 +1029,7 @@ public:
//! Objects selected when there is no open local context //! Objects selected when there is no open local context
//! are called current objects; those selected in open //! are called current objects; those selected in open
//! local context, selected objects. //! local context, selected objects.
Standard_DEPRECATED ("Local Context is deprecated - local selection should be used without Local Context")
Standard_EXPORT void NextCurrent(); Standard_EXPORT void NextCurrent();
@ -1027,8 +1037,10 @@ public:
//! Objects selected when there is no open local context //! Objects selected when there is no open local context
//! are called current objects; those selected in open //! are called current objects; those selected in open
//! local context, selected objects. //! local context, selected objects.
Standard_DEPRECATED ("Local Context is deprecated - local selection should be used without Local Context")
Standard_EXPORT Handle(AIS_InteractiveObject) Current() const; Standard_EXPORT Handle(AIS_InteractiveObject) Current() const;
Standard_DEPRECATED ("Local Context is deprecated - local selection should be used without Local Context")
Standard_EXPORT Standard_Integer NbCurrents(); Standard_EXPORT Standard_Integer NbCurrents();
//! Highlights current objects. //! Highlights current objects.
@ -1039,6 +1051,7 @@ public:
//! Standard_False, the presentation of the Interactive //! Standard_False, the presentation of the Interactive
//! Object activates the selection mode; the object is //! Object activates the selection mode; the object is
//! displayed but no viewer will be updated. //! displayed but no viewer will be updated.
Standard_DEPRECATED ("Local Context is deprecated - local selection should be used without Local Context")
Standard_EXPORT void HilightCurrents (const Standard_Boolean theToUpdateViewer = Standard_True); Standard_EXPORT void HilightCurrents (const Standard_Boolean theToUpdateViewer = Standard_True);
//! Removes highlighting from current objects. //! Removes highlighting from current objects.
@ -1049,6 +1062,7 @@ public:
//! Standard_False, the presentation of the Interactive //! Standard_False, the presentation of the Interactive
//! Object activates the selection mode; the object is //! Object activates the selection mode; the object is
//! displayed but no viewer will be updated. //! displayed but no viewer will be updated.
Standard_DEPRECATED ("Local Context is deprecated - local selection should be used without Local Context")
Standard_EXPORT void UnhilightCurrents (const Standard_Boolean updateviewer = Standard_True); Standard_EXPORT void UnhilightCurrents (const Standard_Boolean updateviewer = Standard_True);
//! Empties previous current objects in order to get the //! Empties previous current objects in order to get the
@ -1061,14 +1075,16 @@ public:
//! Standard_False, the presentation of the Interactive //! Standard_False, the presentation of the Interactive
//! Object activates the selection mode; the object is //! Object activates the selection mode; the object is
//! displayed but no viewer will be updated. //! displayed but no viewer will be updated.
Standard_DEPRECATED ("Local Context is deprecated - local selection should be used without Local Context")
Standard_EXPORT void ClearCurrents (const Standard_Boolean theToUpdateViewer = Standard_True); Standard_EXPORT void ClearCurrents (const Standard_Boolean theToUpdateViewer = Standard_True);
//! @return current mouse-detected shape or empty (null) shape, if current interactive object //! @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. //! is not a shape (AIS_Shape) or there is no current mouse-detected interactive object at all.
Standard_DEPRECATED ("Local Context is deprecated - local selection should be used without Local Context")
Standard_EXPORT const TopoDS_Shape& DetectedCurrentShape() const; Standard_EXPORT const TopoDS_Shape& DetectedCurrentShape() const;
//! @return current mouse-detected interactive object or null object, if there is no //! @return current mouse-detected interactive object or null object, if there is no currently detected interactives
//! currently detected interactives Standard_DEPRECATED ("Local Context is deprecated - local selection should be used without Local Context")
Standard_EXPORT Handle(AIS_InteractiveObject) DetectedCurrentObject() const; Standard_EXPORT Handle(AIS_InteractiveObject) DetectedCurrentObject() const;
//! @name COMMON SELECTION METHODS VALID FOR BOTH GLOBAL AND LOCAL CONTEXT //! @name COMMON SELECTION METHODS VALID FOR BOTH GLOBAL AND LOCAL CONTEXT
@ -1123,6 +1139,7 @@ public:
//! No right to Add a selected Shape (Internal Management //! No right to Add a selected Shape (Internal Management
//! of shape Selection). //! of shape Selection).
//! A Previous selected shape may only be removed. //! A Previous selected shape may only be removed.
Standard_DEPRECATED ("Local Context is deprecated - local selection should be used without Local Context")
Standard_EXPORT void AddOrRemoveSelected (const TopoDS_Shape& aShape, const Standard_Boolean updateviewer = Standard_True); Standard_EXPORT void AddOrRemoveSelected (const TopoDS_Shape& aShape, const Standard_Boolean updateviewer = Standard_True);
//! Allows to highlight or unhighlight the owner given depending on its selection status //! Allows to highlight or unhighlight the owner given depending on its selection status
@ -1268,6 +1285,7 @@ public:
//! selections which will disappear once the local context is closed. //! selections which will disappear once the local context is closed.
//! You can open several local contexts, but only the last //! You can open several local contexts, but only the last
//! one will be active. //! one will be active.
Standard_DEPRECATED ("Local Context is deprecated - local selection should be used without Local Context")
Standard_EXPORT Standard_Integer OpenLocalContext (const Standard_Boolean UseDisplayedObjects = Standard_True, const Standard_Boolean AllowShapeDecomposition = Standard_True, const Standard_Boolean AcceptEraseOfObjects = Standard_False, const Standard_Boolean BothViewers = Standard_False); Standard_EXPORT Standard_Integer OpenLocalContext (const Standard_Boolean UseDisplayedObjects = Standard_True, const Standard_Boolean AllowShapeDecomposition = Standard_True, const Standard_Boolean AcceptEraseOfObjects = Standard_False, const Standard_Boolean BothViewers = Standard_False);
//! Allows you to close local contexts. For greater //! Allows you to close local contexts. For greater
@ -1285,9 +1303,11 @@ public:
//! is closed. This option can be dangerous, as other //! is closed. This option can be dangerous, as other
//! Interactive Functions can open local contexts //! Interactive Functions can open local contexts
//! without necessarily warning the user. //! without necessarily warning the user.
Standard_DEPRECATED ("Local Context is deprecated - local selection should be used without Local Context")
Standard_EXPORT void CloseLocalContext (const Standard_Integer Index = -1, const Standard_Boolean updateviewer = Standard_True); Standard_EXPORT void CloseLocalContext (const Standard_Integer Index = -1, const Standard_Boolean updateviewer = Standard_True);
//! returns -1 if no opened local context. //! returns -1 if no opened local context.
Standard_DEPRECATED ("Local Context is deprecated - local selection should be used without Local Context")
Standard_EXPORT Standard_Integer IndexOfCurrentLocal() const; Standard_EXPORT Standard_Integer IndexOfCurrentLocal() const;
@ -1297,6 +1317,7 @@ public:
//! Standard_False, the presentation of the Interactive //! Standard_False, the presentation of the Interactive
//! Object activates the selection mode; the object is //! Object activates the selection mode; the object is
//! displayed but no viewer will be updated. //! displayed but no viewer will be updated.
Standard_DEPRECATED ("Local Context is deprecated - local selection should be used without Local Context")
Standard_EXPORT void CloseAllContexts (const Standard_Boolean updateviewer = Standard_True); Standard_EXPORT void CloseAllContexts (const Standard_Boolean updateviewer = Standard_True);
//! to be used only with no opened //! to be used only with no opened
@ -1304,15 +1325,17 @@ public:
//! original state before local contexts were opened... //! original state before local contexts were opened...
Standard_EXPORT void ResetOriginalState (const Standard_Boolean updateviewer = Standard_True); Standard_EXPORT void ResetOriginalState (const Standard_Boolean updateviewer = Standard_True);
//! clears Objects/Filters/Activated Modes list in the current opened //! clears Objects/Filters/Activated Modes list in the current opened local context.
//! local context. Standard_DEPRECATED ("Local Context is deprecated - local selection should be used without Local Context")
Standard_EXPORT void ClearLocalContext (const AIS_ClearMode TheMode = AIS_CM_All); Standard_EXPORT void ClearLocalContext (const AIS_ClearMode TheMode = AIS_CM_All);
Standard_DEPRECATED ("Local Context is deprecated - local selection should be used without Local Context")
Standard_EXPORT void UseDisplayedObjects(); Standard_EXPORT void UseDisplayedObjects();
//! when a local Context is opened, one is able to //! when a local Context is opened, one is able to
//! use/not use the displayed objects at neutral point //! use/not use the displayed objects at neutral point
//! at anytime. //! at anytime.
Standard_DEPRECATED ("Local Context is deprecated - local selection should be used without Local Context")
Standard_EXPORT void NotUseDisplayedObjects(); Standard_EXPORT void NotUseDisplayedObjects();
//! initializes the list of presentations to be displayed //! initializes the list of presentations to be displayed
@ -1355,6 +1378,10 @@ public:
//! Activates the selection mode aMode whose index is //! Activates the selection mode aMode whose index is
//! given, for the given interactive entity anIobj. //! given, for the given interactive entity anIobj.
Standard_EXPORT void Activate (const Handle(AIS_InteractiveObject)& anIobj, const Standard_Integer aMode = 0, const Standard_Boolean theIsForce = Standard_False); Standard_EXPORT void Activate (const Handle(AIS_InteractiveObject)& anIobj, const Standard_Integer aMode = 0, const Standard_Boolean theIsForce = Standard_False);
//! Activates the given selection mode for the all displayed objects.
Standard_EXPORT void Activate (const Standard_Integer theMode,
const Standard_Boolean theIsForce = Standard_False);
//! Deactivates all the activated selection modes //! Deactivates all the activated selection modes
//! of an object. //! of an object.
@ -1364,7 +1391,12 @@ public:
//! Deactivates all the activated selection modes of the //! Deactivates all the activated selection modes of the
//! interactive object anIobj with a given selection mode aMode. //! interactive object anIobj with a given selection mode aMode.
Standard_EXPORT void Deactivate (const Handle(AIS_InteractiveObject)& anIobj, const Standard_Integer aMode); Standard_EXPORT void Deactivate (const Handle(AIS_InteractiveObject)& anIobj, const Standard_Integer aMode);
//! Deactivates the given selection mode for all displayed objects.
Standard_EXPORT void Deactivate (const Standard_Integer theMode);
//! Deactivates all the activated selection mode at all displayed objects.
Standard_EXPORT void Deactivate();
//! Returns the list of activated selection modes in an open context. //! Returns the list of activated selection modes in an open context.
Standard_EXPORT void ActivatedModes (const Handle(AIS_InteractiveObject)& anIobj, TColStd_ListOfInteger& theList) const; Standard_EXPORT void ActivatedModes (const Handle(AIS_InteractiveObject)& anIobj, TColStd_ListOfInteger& theList) const;
@ -1375,6 +1407,7 @@ public:
//! shape selection modes activation. //! shape selection modes activation.
//! = False, <anIobj> will not be senstive //! = False, <anIobj> will not be senstive
//! any more. //! any more.
Standard_DEPRECATED ("Local Context is deprecated - local selection should be used without Local Context")
Standard_EXPORT void SetShapeDecomposition (const Handle(AIS_InteractiveObject)& anIobj, const Standard_Boolean aStatus); Standard_EXPORT void SetShapeDecomposition (const Handle(AIS_InteractiveObject)& anIobj, const Standard_Boolean aStatus);
@ -1385,6 +1418,7 @@ public:
//! Standard_False, the presentation of the Interactive //! Standard_False, the presentation of the Interactive
//! Object activates the selection mode; the object is //! Object activates the selection mode; the object is
//! displayed but no viewer will be updated. //! displayed but no viewer will be updated.
Standard_DEPRECATED ("Local Context is deprecated - local selection should be used without Local Context")
Standard_EXPORT void SetTemporaryAttributes (const Handle(AIS_InteractiveObject)& anObj, const Handle(Prs3d_Drawer)& aDrawer, const Standard_Boolean updateviewer = Standard_True); Standard_EXPORT void SetTemporaryAttributes (const Handle(AIS_InteractiveObject)& anObj, const Handle(Prs3d_Drawer)& aDrawer, const Standard_Boolean updateviewer = Standard_True);
@ -1447,6 +1481,7 @@ public:
//! objects of the "Shape" type are also activated with //! objects of the "Shape" type are also activated with
//! the same modes. You can act on the state of these //! the same modes. You can act on the state of these
//! "Standard" objects by using SetShapeDecomposition(Status). //! "Standard" objects by using SetShapeDecomposition(Status).
Standard_DEPRECATED ("Local Context is deprecated - local selection should be used without Local Context")
Standard_EXPORT void ActivateStandardMode (const TopAbs_ShapeEnum aStandardActivation); Standard_EXPORT void ActivateStandardMode (const TopAbs_ShapeEnum aStandardActivation);
@ -1455,11 +1490,13 @@ public:
//! effect of deactivating the corresponding selection //! effect of deactivating the corresponding selection
//! mode aStandardActivation for all objects in Local //! mode aStandardActivation for all objects in Local
//! Context which accept decomposition into sub-shapes. //! Context which accept decomposition into sub-shapes.
Standard_DEPRECATED ("Local Context is deprecated - local selection should be used without Local Context")
Standard_EXPORT void DeactivateStandardMode (const TopAbs_ShapeEnum aStandardActivation); Standard_EXPORT void DeactivateStandardMode (const TopAbs_ShapeEnum aStandardActivation);
//! Returns the list of activated standard selection modes //! Returns the list of activated standard selection modes
//! available in a local context. //! available in a local context.
Standard_DEPRECATED ("Local Context is deprecated - local selection should be used without Local Context")
Standard_EXPORT const TColStd_ListOfInteger& ActivatedStandardModes() const; Standard_EXPORT const TColStd_ListOfInteger& ActivatedStandardModes() const;
@ -1530,7 +1567,8 @@ public:
//! together. Otherwise, you should use other (non-internal) methods of //! together. Otherwise, you should use other (non-internal) methods of
//! class AIS_InteractiveContext without trying to obtain an instance of //! class AIS_InteractiveContext without trying to obtain an instance of
//! AIS_LocalContext. //! AIS_LocalContext.
Handle(AIS_LocalContext) LocalContext() const; Standard_DEPRECATED ("Local Context is deprecated - local selection should be used without Local Context")
Handle(AIS_LocalContext) LocalContext() const;
const Handle(SelectMgr_SelectionManager)& SelectionManager() const; const Handle(SelectMgr_SelectionManager)& SelectionManager() const;
@ -1538,6 +1576,7 @@ public:
const Handle(StdSelect_ViewerSelector3d)& MainSelector() const; const Handle(StdSelect_ViewerSelector3d)& MainSelector() const;
Standard_DEPRECATED ("Local Context is deprecated - local selection should be used without Local Context")
Standard_EXPORT Handle(StdSelect_ViewerSelector3d) LocalSelector() const; Standard_EXPORT Handle(StdSelect_ViewerSelector3d) LocalSelector() const;
//! Clears all the structures which don't //! Clears all the structures which don't
@ -1546,6 +1585,7 @@ public:
//! returns the number of removed structures from the viewers. //! returns the number of removed structures from the viewers.
Standard_EXPORT Standard_Integer PurgeDisplay(); Standard_EXPORT Standard_Integer PurgeDisplay();
Standard_DEPRECATED ("Local Context is deprecated - local selection should be used without Local Context")
Standard_EXPORT Standard_Integer HighestIndex() const; Standard_EXPORT Standard_Integer HighestIndex() const;
Standard_EXPORT void DisplayActiveSensitive (const Handle(V3d_View)& aView); Standard_EXPORT void DisplayActiveSensitive (const Handle(V3d_View)& aView);
@ -1561,6 +1601,7 @@ public:
//! returns if possible, //! returns if possible,
//! the first local context where the object is seen //! the first local context where the object is seen
Standard_DEPRECATED ("Local Context is deprecated - local selection should be used without Local Context")
Standard_EXPORT Standard_Boolean IsInLocal (const Handle(AIS_InteractiveObject)& anObject, Standard_Integer& TheIndex) const; Standard_EXPORT Standard_Boolean IsInLocal (const Handle(AIS_InteractiveObject)& anObject, Standard_Integer& TheIndex) const;
//! Rebuilds 1st level of BVH selection forcibly //! Rebuilds 1st level of BVH selection forcibly

2
src/AIS/AIS_InteractiveContext_1.cxx
View File

@ -1685,7 +1685,9 @@ const TopoDS_Shape& AIS_InteractiveContext::DetectedCurrentShape() const
return myLocalContexts(myCurLocalIndex)->DetectedCurrentShape(); return myLocalContexts(myCurLocalIndex)->DetectedCurrentShape();
} }
Standard_DISABLE_DEPRECATION_WARNINGS
Handle(AIS_Shape) aCurrentShape = Handle(AIS_Shape)::DownCast (DetectedCurrentObject()); Handle(AIS_Shape) aCurrentShape = Handle(AIS_Shape)::DownCast (DetectedCurrentObject());
Standard_ENABLE_DEPRECATION_WARNINGS
if (aCurrentShape.IsNull()) if (aCurrentShape.IsNull())
{ {

58
src/AIS/AIS_InteractiveContext_2.cxx
View File

@ -74,7 +74,9 @@ OpenLocalContext(const Standard_Boolean UseDisplayedObjects,
myLastPicked.Nullify(); myLastPicked.Nullify();
myWasLastMain = Standard_True; myWasLastMain = Standard_True;
Standard_DISABLE_DEPRECATION_WARNINGS
myCurLocalIndex = HighestIndex() + 1; myCurLocalIndex = HighestIndex() + 1;
Standard_ENABLE_DEPRECATION_WARNINGS
Handle(AIS_LocalContext) NewLocal= new AIS_LocalContext(this,myCurLocalIndex, Handle(AIS_LocalContext) NewLocal= new AIS_LocalContext(this,myCurLocalIndex,
UseDisplayedObjects, UseDisplayedObjects,
@ -144,7 +146,9 @@ void AIS_InteractiveContext::CloseLocalContext(const Standard_Integer Index,
myLocalContexts.UnBind(GoodIndex); myLocalContexts.UnBind(GoodIndex);
// the current is closed... // the current is closed...
if(GoodIndex==myCurLocalIndex){ if(GoodIndex==myCurLocalIndex){
Standard_DISABLE_DEPRECATION_WARNINGS
myCurLocalIndex = HighestIndex(); myCurLocalIndex = HighestIndex();
Standard_ENABLE_DEPRECATION_WARNINGS
} }
else if(debugmode) else if(debugmode)
cout<<"a No Current Local Context WasClosed"<<endl; cout<<"a No Current Local Context WasClosed"<<endl;
@ -164,18 +168,18 @@ void AIS_InteractiveContext::CloseLocalContext(const Standard_Integer Index,
//function : CloseAllContexts //function : CloseAllContexts
//purpose : //purpose :
//======================================================================= //=======================================================================
Standard_DISABLE_DEPRECATION_WARNINGS
void AIS_InteractiveContext::CloseAllContexts(const Standard_Boolean updateviewer) void AIS_InteractiveContext::CloseAllContexts(const Standard_Boolean updateviewer)
{ {
while(!myLocalContexts.IsEmpty()){ while(!myLocalContexts.IsEmpty()){
CloseLocalContext(myCurLocalIndex,Standard_False); CloseLocalContext(myCurLocalIndex,Standard_False);
} }
ResetOriginalState(Standard_False); ResetOriginalState(Standard_False);
if(updateviewer) myMainVwr->Update(); if(updateviewer) myMainVwr->Update();
} }
Standard_ENABLE_DEPRECATION_WARNINGS
//======================================================================= //=======================================================================
//function : IndexOfCurrentLocal //function : IndexOfCurrentLocal
@ -237,6 +241,24 @@ Activate(const Handle(AIS_InteractiveObject)& anIObj,
} }
} }
// ============================================================================
// function : Activate
// purpose :
// ============================================================================
void AIS_InteractiveContext::Activate (const Standard_Integer theMode,
const Standard_Boolean theIsForce)
{
AIS_ListOfInteractive aDisplayedObjects;
DisplayedObjects (aDisplayedObjects);
for (AIS_ListIteratorOfListOfInteractive anIter (aDisplayedObjects); anIter.More(); anIter.Next())
{
Load (anIter.Value(), -1, Standard_True);
Activate (anIter.Value(), theMode, theIsForce);
}
}
//======================================================================= //=======================================================================
//function : LocalSelector //function : LocalSelector
//purpose : //purpose :
@ -295,6 +317,36 @@ void AIS_InteractiveContext::Deactivate(const Handle(AIS_InteractiveObject)& anI
} }
} }
// ============================================================================
// function : Deactivate
// purpose :
// ============================================================================
void AIS_InteractiveContext::Deactivate (const Standard_Integer theMode)
{
AIS_ListOfInteractive aDisplayedObjects;
DisplayedObjects (aDisplayedObjects);
for (AIS_ListIteratorOfListOfInteractive anIter (aDisplayedObjects); anIter.More(); anIter.Next())
{
Deactivate (anIter.Value(), theMode);
}
}
// ============================================================================
// function : Deactivate
// purpose :
// ============================================================================
void AIS_InteractiveContext::Deactivate()
{
AIS_ListOfInteractive aDisplayedObjects;
DisplayedObjects (aDisplayedObjects);
for (AIS_ListIteratorOfListOfInteractive anIter (aDisplayedObjects); anIter.More(); anIter.Next())
{
Deactivate (anIter.Value());
}
}
//======================================================================= //=======================================================================
//function : ActivatedModes //function : ActivatedModes
//purpose : //purpose :

33
src/AIS/AIS_KindOfRelation.hxx Normal file
View File

@ -0,0 +1,33 @@
// Created on: 2016-11-25
// Copyright (c) 2016 OPEN CASCADE SAS
//
// This file is part of Open CASCADE Technology software library.
//
// This library is free software; you can redistribute it and/or modify it under
// the terms of the GNU Lesser General Public License version 2.1 as published
// by the Free Software Foundation, with special exception defined in the file
// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
// distribution for complete text of the license and disclaimer of any warranty.
//
// Alternatively, this file may be used under the terms of Open CASCADE
// commercial license or contractual agreement.
#ifndef _AIS_KindOfRelation_HeaderFile
#define _AIS_KindOfRelation_HeaderFile
enum AIS_KindOfRelation
{
AIS_KOR_NONE = 0,
AIS_KOR_CONCENTRIC,
AIS_KOR_EQUALDISTANCE,
AIS_KOR_EQUALRADIUS,
AIS_KOR_FIX,
AIS_KOR_IDENTIC,
AIS_KOR_OFFSET,
AIS_KOR_PARALLEL,
AIS_KOR_PERPENDICULAR,
AIS_KOR_TANGENT,
AIS_KOR_SYMMETRIC
};
#endif

2
src/AIS/AIS_LocalContext.cxx
View File

@ -715,8 +715,10 @@ void AIS_LocalContext::Unhilight(const Handle(AIS_InteractiveObject)& anObject)
// chieck if by hazard the object is somewhere else... // chieck if by hazard the object is somewhere else...
Standard_Integer Indx; Standard_Integer Indx;
Standard_DISABLE_DEPRECATION_WARNINGS
Standard_Boolean IsSomeWhereElse = Standard_Boolean IsSomeWhereElse =
myCTX->IsInLocal(anObject,Indx) && Indx != myCTX->IndexOfCurrentLocal(); myCTX->IsInLocal(anObject,Indx) && Indx != myCTX->IndexOfCurrentLocal();
Standard_ENABLE_DEPRECATION_WARNINGS
const Handle(AIS_LocalStatus)& Att = myActiveObjects(anObject); const Handle(AIS_LocalStatus)& Att = myActiveObjects(anObject);
myMainPM->Unhighlight(anObject,Att->HilightMode()); myMainPM->Unhighlight(anObject,Att->HilightMode());

1
src/AIS/FILES
View File

@ -92,6 +92,7 @@ AIS_InteractiveObject.hxx
AIS_InteractiveObject.lxx AIS_InteractiveObject.lxx
AIS_KindOfDimension.hxx AIS_KindOfDimension.hxx
AIS_KindOfInteractive.hxx AIS_KindOfInteractive.hxx
AIS_KindOfRelation.hxx
AIS_KindOfSurface.hxx AIS_KindOfSurface.hxx
AIS_KindOfUnit.hxx AIS_KindOfUnit.hxx
AIS_LengthDimension.cxx AIS_LengthDimension.cxx

6
src/PrsMgr/PrsMgr_PresentationManager.cxx
View File

@ -153,7 +153,11 @@ void PrsMgr_PresentationManager::SetVisibility (const Handle(PrsMgr_PresentableO
return; return;
} }
Presentation (thePrsObj, theMode)->SetVisible (theValue); Handle(PrsMgr_Presentation) aPrs = Presentation (thePrsObj, theMode);
if (!aPrs.IsNull())
{
aPrs->SetVisible (theValue);
}
} }
// ======================================================================= // =======================================================================

5
src/QABugs/QABugs_1.cxx
View File

@ -66,6 +66,7 @@ static TColStd_MapOfInteger theactivatedmodes(8);
#include <BRepAdaptor_Curve.hxx> #include <BRepAdaptor_Curve.hxx>
#include <GC_MakePlane.hxx> #include <GC_MakePlane.hxx>
Standard_DISABLE_DEPRECATION_WARNINGS
static Standard_Integer OCC328bug (Draw_Interpretor& di, Standard_Integer argc, const char ** argv) static Standard_Integer OCC328bug (Draw_Interpretor& di, Standard_Integer argc, const char ** argv)
{ {
Handle(AIS_InteractiveContext) aContext = ViewerTest::GetAISContext(); Handle(AIS_InteractiveContext) aContext = ViewerTest::GetAISContext();
@ -178,6 +179,7 @@ static Standard_Integer OCC328bug (Draw_Interpretor& di, Standard_Integer argc,
return 0; return 0;
} }
Standard_ENABLE_DEPRECATION_WARNINGS
static Standard_Integer OCC159bug (Draw_Interpretor& di, Standard_Integer argc, const char ** argv) static Standard_Integer OCC159bug (Draw_Interpretor& di, Standard_Integer argc, const char ** argv)
{ {
@ -415,9 +417,6 @@ static Standard_Integer OCC74bug_set (Draw_Interpretor& di, Standard_Integer arg
if(AISObj.IsNull()){ if(AISObj.IsNull()){
di << argv[1] << " : No interactive object\n"; di << argv[1] << " : No interactive object\n";
return 1; return 1;
}
if (!aContext->HasOpenedContext()) {
aContext->OpenLocalContext();
} }
aContext->Erase(AISObj, updateviewer); aContext->Erase(AISObj, updateviewer);
aContext->UpdateCurrentViewer(); aContext->UpdateCurrentViewer();

64
src/QABugs/QABugs_11.cxx
View File

@ -215,7 +215,6 @@ static Standard_Integer OCC136 (Draw_Interpretor& di, Standard_Integer argc, con
return 1; return 1;
} }
if(anAISCtx->HasOpenedContext()) anAISCtx->CloseAllContexts();
anAISCtx->EraseAll(); anAISCtx->EraseAll();
//load primitives to context //load primitives to context
@ -747,8 +746,7 @@ static Standard_Integer OCC166 (Draw_Interpretor& di, Standard_Integer /*argc*/,
Handle(AIS_Shape) anAISBox = new AIS_Shape(aBox.Shape()); Handle(AIS_Shape) anAISBox = new AIS_Shape(aBox.Shape());
myAISContext->SetAutoActivateSelection (Standard_False); myAISContext->SetAutoActivateSelection (Standard_False);
myAISContext->Display(anAISBox, 1); myAISContext->Display(anAISBox, 1);
Standard_Integer myLocContInd = myAISContext->OpenLocalContext();
myAISContext->CloseLocalContext(myLocContInd);
TColStd_ListOfInteger anActivatedModes; TColStd_ListOfInteger anActivatedModes;
myAISContext->ActivatedModes (anAISBox, anActivatedModes); myAISContext->ActivatedModes (anAISBox, anActivatedModes);
if(anActivatedModes.Extent() != 1 || anActivatedModes.First() != -1 ) if(anActivatedModes.Extent() != 1 || anActivatedModes.First() != -1 )
@ -1687,9 +1685,7 @@ static Standard_Integer OCC708 (Draw_Interpretor& di, Standard_Integer argc, con
return 1; return 1;
} }
AISObj->ResetTransformation(); AISObj->ResetTransformation();
if (!aContext->HasOpenedContext()) {
aContext->OpenLocalContext();
}
aContext->Erase(AISObj, updateviewer); aContext->Erase(AISObj, updateviewer);
aContext->UpdateCurrentViewer(); aContext->UpdateCurrentViewer();
aContext->Display(AISObj, updateviewer); aContext->Display(AISObj, updateviewer);
@ -5254,61 +5250,6 @@ Standard_Integer CR23403 (Draw_Interpretor& di, Standard_Integer argc, const cha
return 0; return 0;
} }
#include <Quantity_NameOfColor.hxx>
#include <TopAbs_ShapeEnum.hxx>
#include <Geom_Curve.hxx>
#include <AIS_InteractiveObject.hxx>
Standard_Integer CR23234 (Draw_Interpretor& di, Standard_Integer argc, const char ** argv)
{
// Check the command arguments
if (argc != 2)
{
di <<"Error: "<<argv[0]<<" - invalid number of arguments\n";
di << "Usage : " << argv[0] << " mode(0/1)\n";
return 1; //TCL_ERROR
}
const Standard_Integer aMode = Draw::Atoi(argv[1]);
//===================================================================
Handle(AIS_InteractiveContext) aisContext = ViewerTest::GetAISContext();
if (aisContext.IsNull())
{
di <<"Error: call 'vinit' first\n";
return 1; //TCL_ERROR
}
if (aisContext->HasOpenedContext())
{
aisContext->CloseAllContexts();
aisContext->RemoveAll(false);
aisContext->EraseSelected(false);
}
aisContext->EraseAll(false);
Handle(Geom_Axis2Placement) trihedronAxis = new Geom_Axis2Placement(gp::XOY());
Handle(AIS_Trihedron) trihedron = new AIS_Trihedron(trihedronAxis);
if (aMode)
aisContext->SetAutoActivateSelection (Standard_False); // if selection must not be activated
trihedron->SetSize(20);
trihedron->SetColor(Quantity_NOC_GRAY30);
trihedron->SetArrowColor(Quantity_NOC_GRAY30);
trihedron->SetTextColor(Quantity_NOC_DARKSLATEBLUE);
//trihedron->SetColor(Quantity_NameOfColor::Quantity_NOC_GRAY30);
//trihedron->SetArrowColor(Quantity_NameOfColor::Quantity_NOC_GRAY30);
//trihedron->SetTextColor(Quantity_NameOfColor::Quantity_NOC_DARKSLATEBLUE);
aisContext->Display(trihedron, true);
aisContext->OpenLocalContext();
//aisContext->ActivateStandardMode(TopAbs_ShapeEnum::TopAbs_EDGE);
aisContext->ActivateStandardMode(TopAbs_EDGE);
aisContext->SetPixelTolerance(8);
return 0; //TCL_OK
}
void QABugs::Commands_11(Draw_Interpretor& theCommands) { void QABugs::Commands_11(Draw_Interpretor& theCommands) {
const char *group = "QABugs"; const char *group = "QABugs";
@ -5416,6 +5357,5 @@ void QABugs::Commands_11(Draw_Interpretor& theCommands) {
theCommands.Add("OCC22558", "OCC22558 x_vec y_vec z_vec x_dir y_dir z_dit x_pnt y_pnt z_pnt", __FILE__, OCC22558, group); theCommands.Add("OCC22558", "OCC22558 x_vec y_vec z_vec x_dir y_dir z_dit x_pnt y_pnt z_pnt", __FILE__, OCC22558, group);
theCommands.Add("CR23403", "CR23403 string", __FILE__, CR23403, group); theCommands.Add("CR23403", "CR23403 string", __FILE__, CR23403, group);
theCommands.Add("OCC23429", "OCC23429 res shape tool [appr]", __FILE__, OCC23429, group); theCommands.Add("OCC23429", "OCC23429 res shape tool [appr]", __FILE__, OCC23429, group);
theCommands.Add("CR23234", "CR23234 mode(0/1)", __FILE__, CR23234, group);
return; return;
} }

84
src/QABugs/QABugs_17.cxx
View File

@ -262,7 +262,9 @@ static Standard_Integer BUC60818(Draw_Interpretor& di, Standard_Integer argc, c
aTrihedron=new AIS_Trihedron(aTrihedronAxis); aTrihedron=new AIS_Trihedron(aTrihedronAxis);
myAISContext->Display(aTrihedron); myAISContext->Display(aTrihedron);
Standard_DISABLE_DEPRECATION_WARNINGS
myAISContext->OpenLocalContext(); myAISContext->OpenLocalContext();
Standard_ENABLE_DEPRECATION_WARNINGS
myAISContext->Load(aTrihedron,0); myAISContext->Load(aTrihedron,0);
myAISContext->SetAutomaticHilight( Standard_False ); myAISContext->SetAutomaticHilight( Standard_False );
@ -586,10 +588,11 @@ static Standard_Integer OCC232 (Draw_Interpretor& di, Standard_Integer /*argc*/
Handle (StdSelect_ShapeTypeFilter) filt = new StdSelect_ShapeTypeFilter(TopAbs_COMPSOLID); Handle (StdSelect_ShapeTypeFilter) filt = new StdSelect_ShapeTypeFilter(TopAbs_COMPSOLID);
aContext->AddFilter(filt); aContext->AddFilter(filt);
Standard_DISABLE_DEPRECATION_WARNINGS
aContext->CloseAllContexts(); aContext->CloseAllContexts();
aContext->OpenLocalContext(); aContext->OpenLocalContext();
aContext->ActivateStandardMode(TopAbs_SOLID); aContext->ActivateStandardMode(TopAbs_SOLID);
Standard_ENABLE_DEPRECATION_WARNINGS
return 0; return 0;
} }
@ -633,84 +636,6 @@ static Standard_Integer OCC138LC (Draw_Interpretor& di, Standard_Integer /*argc
return 0; return 0;
} }
static Standard_Integer OCC189 (Draw_Interpretor& di, Standard_Integer /*argc*/, const char ** argv)
{
Handle(AIS_InteractiveContext) aContext1 = ViewerTest::GetAISContext();
if(aContext1.IsNull()) {
di << "use 'vinit' command before " << argv[0] << "\n";
return 1;
}
Handle(AIS_InteractiveContext) aContext2 = ViewerTest::GetAISContext();
if(aContext2.IsNull()) {
di << "use 'vinit' command before " << argv[0] << "\n";
return 1;
}
BRepPrimAPI_MakeBox box1(gp_Pnt(0, 0, 0), gp_Pnt(100, 100, 100));
BRepPrimAPI_MakeBox box2(gp_Pnt(120, 120, 120), gp_Pnt(300, 300, 300));
BRepPrimAPI_MakeBox box3(gp_Pnt(320, 320, 320), gp_Pnt(500, 500, 500));
Handle(AIS_InteractiveObject) ais1 = new AIS_Shape(box1.Shape());
Handle(AIS_InteractiveObject) ais2 = new AIS_Shape(box2.Shape());
Handle(AIS_InteractiveObject) ais3 = new AIS_Shape(box3.Shape());
aContext1->Display(ais1);
aContext1->Display(ais2);
aContext1->Display(ais3);
aContext2->Display(ais1);
aContext2->Display(ais2);
aContext2->Display(ais3);
aContext1->AddOrRemoveSelected(ais1);
aContext1->AddOrRemoveSelected(ais2);
aContext1->AddOrRemoveSelected(ais3);
di << "\n Stage : 1";
di << "\n \t No of currents on aContext1 = " << aContext1->NbSelected();
di << "\n \t No of currents on aContext2 = " << aContext2->NbSelected() << "\n\n";
di << "\n aContext1->IsSelected = " << (Standard_Integer) aContext1->IsCurrent(ais1) << ", aContext2->IsCurrent = " << (Standard_Integer) aContext2->IsCurrent(ais1) << " ";
aContext2->AddOrRemoveSelected(ais1);
aContext2->AddOrRemoveSelected(ais2);
aContext2->AddOrRemoveSelected(ais3);
di << "\n Stage : 2";
di << "\n \t No of currents on aContext1 = " << aContext1->NbSelected();
di << "\n \t No of currents on aContext2 = " << aContext2->NbSelected() << "\n\n";
aContext1->InitSelected();
int count1 = 1;
while(aContext1->MoreSelected())
{
di << "\n count1 is = " << count1++;
Handle(AIS_InteractiveObject) ais = aContext1->SelectedInteractive();
aContext1->AddOrRemoveSelected(ais);
aContext1->InitSelected();
}
di << "\n Stage : 3";
di << "\n \t No of currents on aContext1 = " << aContext1->NbSelected();
di << "\n \t No of currents on aContext2 = " << aContext2->NbSelected() << "\n\n";
aContext2->InitSelected();
int count2 = 1;
while(aContext2->MoreSelected())
{
di << "\n count2 is = " << count2++;
Handle(AIS_InteractiveObject) ais = aContext2->SelectedInteractive();
aContext2->AddOrRemoveSelected(ais);
aContext2->InitSelected();
}
di << "\n\n Stage : 4";
di << "\n \t No of currents on aContext1 = " << aContext1->NbSelected();
di << "\n \t No of currents on aContext2 = " << aContext2->NbSelected();
return 0;
}
#include <BRepBndLib.hxx> #include <BRepBndLib.hxx>
#include <Draw.hxx> #include <Draw.hxx>
//======================================================================= //=======================================================================
@ -1755,7 +1680,6 @@ void QABugs::Commands_17(Draw_Interpretor& theCommands) {
theCommands.Add ("OCC280","OCC280 hlr=0/1 setsurfecedetail=0/1; set perspecrive view",__FILE__,OCC280,group); theCommands.Add ("OCC280","OCC280 hlr=0/1 setsurfecedetail=0/1; set perspecrive view",__FILE__,OCC280,group);
theCommands.Add ("OCC232", "OCC232", __FILE__, OCC232 , group); theCommands.Add ("OCC232", "OCC232", __FILE__, OCC232 , group);
theCommands.Add ("OCC138LC", "OCC138LC", __FILE__, OCC138LC, group); theCommands.Add ("OCC138LC", "OCC138LC", __FILE__, OCC138LC, group);
theCommands.Add ("OCC189", "OCC189", __FILE__, OCC189, group);
theCommands.Add ("OCC566", "OCC566 shape [ xmin ymin zmin xmax ymax zmax] ; print bounding box", __FILE__, OCC566, group); theCommands.Add ("OCC566", "OCC566 shape [ xmin ymin zmin xmax ymax zmax] ; print bounding box", __FILE__, OCC566, group);
theCommands.Add ("OCC570", "OCC570 result", __FILE__, OCC570, group); theCommands.Add ("OCC570", "OCC570 result", __FILE__, OCC570, group);

18
src/QABugs/QABugs_19.cxx
View File

@ -3311,7 +3311,9 @@ static Standard_Integer OCC26172 (Draw_Interpretor& theDI, Standard_Integer theA
aModes.Append (AIS_Shape::SelectionMode ((TopAbs_ShapeEnum) TopAbs_VERTEX)); aModes.Append (AIS_Shape::SelectionMode ((TopAbs_ShapeEnum) TopAbs_VERTEX));
aModes.Append (AIS_Shape::SelectionMode ((TopAbs_ShapeEnum) TopAbs_EDGE)); aModes.Append (AIS_Shape::SelectionMode ((TopAbs_ShapeEnum) TopAbs_EDGE));
Standard_DISABLE_DEPRECATION_WARNINGS
anAISContext->OpenLocalContext(); anAISContext->OpenLocalContext();
Standard_ENABLE_DEPRECATION_WARNINGS
anAISContext->Deactivate (aTestAISShape); anAISContext->Deactivate (aTestAISShape);
anAISContext->Load (aTestAISShape, -1, true); anAISContext->Load (aTestAISShape, -1, true);
for (Standard_Integer anIt = 1; anIt <= aModes.Length(); ++anIt) for (Standard_Integer anIt = 1; anIt <= aModes.Length(); ++anIt)
@ -3321,6 +3323,7 @@ static Standard_Integer OCC26172 (Draw_Interpretor& theDI, Standard_Integer theA
// select entities in vertex selection mode // select entities in vertex selection mode
Handle(SelectMgr_Selection) aSelection = aTestAISShape->Selection (aModes (1)); Handle(SelectMgr_Selection) aSelection = aTestAISShape->Selection (aModes (1));
Standard_DISABLE_DEPRECATION_WARNINGS
for (aSelection->Init(); aSelection->More(); aSelection->Next()) for (aSelection->Init(); aSelection->More(); aSelection->Next())
{ {
Handle(SelectBasics_SensitiveEntity) anEntity = aSelection->Sensitive()->BaseSensitive(); Handle(SelectBasics_SensitiveEntity) anEntity = aSelection->Sensitive()->BaseSensitive();
@ -3339,9 +3342,11 @@ static Standard_Integer OCC26172 (Draw_Interpretor& theDI, Standard_Integer theA
anAISContext->LocalContext()->AddOrRemoveSelected (anOwner); anAISContext->LocalContext()->AddOrRemoveSelected (anOwner);
} }
Standard_ENABLE_DEPRECATION_WARNINGS
// select entities in edge selection mode // select entities in edge selection mode
aSelection = aTestAISShape->Selection (aModes (2)); aSelection = aTestAISShape->Selection (aModes (2));
Standard_DISABLE_DEPRECATION_WARNINGS
for (aSelection->Init(); aSelection->More(); aSelection->Next()) for (aSelection->Init(); aSelection->More(); aSelection->Next())
{ {
Handle(SelectBasics_SensitiveEntity) anEntity = aSelection->Sensitive()->BaseSensitive(); Handle(SelectBasics_SensitiveEntity) anEntity = aSelection->Sensitive()->BaseSensitive();
@ -3360,10 +3365,13 @@ static Standard_Integer OCC26172 (Draw_Interpretor& theDI, Standard_Integer theA
anAISContext->LocalContext()->AddOrRemoveSelected (anOwner); anAISContext->LocalContext()->AddOrRemoveSelected (anOwner);
} }
Standard_ENABLE_DEPRECATION_WARNINGS
// deactivate vertex mode and check clearing of outdated selection // deactivate vertex mode and check clearing of outdated selection
anAISContext->Deactivate (aTestAISShape, aModes (1)); anAISContext->Deactivate (aTestAISShape, aModes (1));
Standard_DISABLE_DEPRECATION_WARNINGS
anAISContext->LocalContext()->ClearOutdatedSelection (aTestAISShape, true); anAISContext->LocalContext()->ClearOutdatedSelection (aTestAISShape, true);
Standard_ENABLE_DEPRECATION_WARNINGS
return 0; return 0;
} }
@ -4162,7 +4170,6 @@ static Standard_Integer OCC26462 (Draw_Interpretor& theDI, Standard_Integer /*th
Handle(AIS_InteractiveObject) aBox2 = new AIS_Shape (aBuilder2.Shape()); Handle(AIS_InteractiveObject) aBox2 = new AIS_Shape (aBuilder2.Shape());
const Handle(AIS_InteractiveContext) aCtx = ViewerTest::GetAISContext(); const Handle(AIS_InteractiveContext) aCtx = ViewerTest::GetAISContext();
aCtx->OpenLocalContext();
aCtx->Display (aBox1, 0, 2); aCtx->Display (aBox1, 0, 2);
aCtx->Display (aBox2, 0, 2); aCtx->Display (aBox2, 0, 2);
ViewerTest::CurrentView()->FitAll(); ViewerTest::CurrentView()->FitAll();
@ -4857,7 +4864,9 @@ static Standard_Integer BUC26658 (Draw_Interpretor& theDI,
// visualization of the box in the local mode with possibility to // visualization of the box in the local mode with possibility to
// select box vertices // select box vertices
Standard_DISABLE_DEPRECATION_WARNINGS
aContext->OpenLocalContext(); aContext->OpenLocalContext();
Standard_ENABLE_DEPRECATION_WARNINGS
int aDispMode = 0;// wireframe int aDispMode = 0;// wireframe
anAISIO->SetDisplayMode(aDispMode); anAISIO->SetDisplayMode(aDispMode);
@ -4898,7 +4907,9 @@ static Standard_Integer BUC26658 (Draw_Interpretor& theDI,
aContext->AddFilter(aFilter); aContext->AddFilter(aFilter);
// update previous selection by hand // update previous selection by hand
Standard_DISABLE_DEPRECATION_WARNINGS
aContext->LocalContext()->ClearOutdatedSelection(anAISIO, true); aContext->LocalContext()->ClearOutdatedSelection(anAISIO, true);
Standard_ENABLE_DEPRECATION_WARNINGS
// check that there are no selected vertices // check that there are no selected vertices
aContext->Select(); aContext->Select();
@ -4941,8 +4952,10 @@ static Standard_Integer OCC26945_open (Draw_Interpretor& theDI, Standard_Integer
} }
const TopAbs_ShapeEnum aSelType = AIS_Shape::SelectionType (Draw::Atoi (theArgv[1])); const TopAbs_ShapeEnum aSelType = AIS_Shape::SelectionType (Draw::Atoi (theArgv[1]));
Standard_DISABLE_DEPRECATION_WARNINGS
Standard_Integer aLocalCtxIdx = aCtx->OpenLocalContext(); Standard_Integer aLocalCtxIdx = aCtx->OpenLocalContext();
aCtx->ActivateStandardMode (aSelType); aCtx->ActivateStandardMode (aSelType);
Standard_ENABLE_DEPRECATION_WARNINGS
theDI << aLocalCtxIdx; theDI << aLocalCtxIdx;
return 0; return 0;
@ -4969,7 +4982,9 @@ static Standard_Integer OCC26945_close (Draw_Interpretor& theDI, Standard_Intege
} }
const Standard_Integer aCtxToClose = Draw::Atoi (theArgv[1]); const Standard_Integer aCtxToClose = Draw::Atoi (theArgv[1]);
Standard_DISABLE_DEPRECATION_WARNINGS
aCtx->CloseLocalContext (aCtxToClose); aCtx->CloseLocalContext (aCtxToClose);
Standard_ENABLE_DEPRECATION_WARNINGS
return 0; return 0;
} }
@ -5140,7 +5155,6 @@ static Standard_Integer OCC27523 (Draw_Interpretor& theDI, Standard_Integer theA
TColStd_SequenceOfInteger aModes; TColStd_SequenceOfInteger aModes;
aModes.Append (AIS_Shape::SelectionMode ((TopAbs_ShapeEnum) TopAbs_VERTEX)); aModes.Append (AIS_Shape::SelectionMode ((TopAbs_ShapeEnum) TopAbs_VERTEX));
anAISContext->OpenLocalContext();
anAISContext->Deactivate (aTestAISShape); anAISContext->Deactivate (aTestAISShape);
anAISContext->Load (aTestAISShape, -1, true); anAISContext->Load (aTestAISShape, -1, true);
anAISContext->Activate (aTestAISShape, 0); anAISContext->Activate (aTestAISShape, 0);

82
src/QABugs/QABugs_3.cxx
View File

@ -86,8 +86,12 @@ static int BUC60569(Draw_Interpretor& di, Standard_Integer argc, const char ** a
Handle(AIS_Shape) anAISShape = new AIS_Shape( theShape ); Handle(AIS_Shape) anAISShape = new AIS_Shape( theShape );
myAISContext->Display( anAISShape, Standard_True ); myAISContext->Display( anAISShape, Standard_True );
Standard_DISABLE_DEPRECATION_WARNINGS
myAISContext->OpenLocalContext(); myAISContext->OpenLocalContext();
myAISContext->ActivateStandardMode(TopAbs_FACE); myAISContext->ActivateStandardMode(TopAbs_FACE);
Standard_ENABLE_DEPRECATION_WARNINGS
return 0; return 0;
} }
@ -111,8 +115,11 @@ static int BUC60614(Draw_Interpretor& di, Standard_Integer argc, const char ** a
} }
Handle(AIS_Shape) anAISShape = new AIS_Shape( theShape ); Handle(AIS_Shape) anAISShape = new AIS_Shape( theShape );
myAISContext->Display( anAISShape, Standard_True ); myAISContext->Display( anAISShape, Standard_True );
Standard_DISABLE_DEPRECATION_WARNINGS
myAISContext->OpenLocalContext(); myAISContext->OpenLocalContext();
myAISContext->ActivateStandardMode(TopAbs_COMPOUND); myAISContext->ActivateStandardMode(TopAbs_COMPOUND);
Standard_ENABLE_DEPRECATION_WARNINGS
// myAISContext->ActivateStandardMode(TopAbs_SOLID); // myAISContext->ActivateStandardMode(TopAbs_SOLID);
// di.Eval("vfit"); // di.Eval("vfit");
// cout << "vfini" << endl; // cout << "vfini" << endl;
@ -340,8 +347,11 @@ static Standard_Integer BUC60574(Draw_Interpretor& di, Standard_Integer /*n*/, c
TopLoc_Location aLoc(aTrsf); TopLoc_Location aLoc(aTrsf);
myAISContext->SetLocation(atri,aLoc); myAISContext->SetLocation(atri,aLoc);
myAISContext->Display(atri,0,-1,Standard_True, Standard_True); myAISContext->Display(atri,0,-1,Standard_True, Standard_True);
myAISContext->OpenLocalContext(Standard_False,
Standard_True,Standard_False,Standard_False); Standard_DISABLE_DEPRECATION_WARNINGS
myAISContext->OpenLocalContext(Standard_False, Standard_True, Standard_False, Standard_False);
Standard_ENABLE_DEPRECATION_WARNINGS
myAISContext->Load(atri,3,Standard_True); myAISContext->Load(atri,3,Standard_True);
return 0; return 0;
@ -357,39 +367,6 @@ static Standard_Integer BUC60574(Draw_Interpretor& di, Standard_Integer /*n*/, c
#include <V3d_View.hxx> #include <V3d_View.hxx>
#include <gce_MakePln.hxx> #include <gce_MakePln.hxx>
static Standard_Integer BUC60699(Draw_Interpretor& di, Standard_Integer /*n*/, const char ** a)
{
Handle(AIS_InteractiveContext) myAISContext = ViewerTest::GetAISContext();
if(myAISContext.IsNull()) {
di << "use 'vinit' command before " << a[0] << "\n";
return -1;
}
TopoDS_Solid B1 = BRepPrimAPI_MakeBox (1,1,1).Solid();
TopAbs_ShapeEnum theType = B1.ShapeType();
if ( theType == TopAbs_SOLID ) {
di << "It is a solid." << "\n";
} else {
di << "It is not solid." << "\n";
}
myAISContext->Display(new AIS_Shape(B1));
myAISContext->OpenLocalContext();
TopAbs_ShapeEnum amode = TopAbs_SOLID;
myAISContext->ActivateStandardMode(amode);
di.Eval("vfit");
di.Eval("QAMoveTo 200 200");
di.Eval("QASelect 200 200");
myAISContext->InitSelected() ;
if ( myAISContext->MoreSelected() ) {
if (myAISContext->HasSelectedShape() ) {
di << "has selected shape : OK" << "\n";
} else {
di << "has selected shape : bugged - Faulty " << "\n";
}
}
return 0;
}
#define DEFAULT_COLOR Quantity_NOC_GOLDENROD #define DEFAULT_COLOR Quantity_NOC_GOLDENROD
//======================================================================= //=======================================================================
@ -494,39 +471,6 @@ switch (argc){
return 0; return 0;
} }
static Standard_Integer BUC60726 (Draw_Interpretor& di,Standard_Integer argc, const char ** argv )
{
Handle(AIS_InteractiveContext) myAISContext = ViewerTest::GetAISContext();
if(myAISContext.IsNull()) {
di << "use 'vinit' command before " << argv[0] << "\n";
return -1;
}
if(argc != 2) {
di << "Usage : " << argv[0] << " 0/1\n";
}
if(Draw::Atoi(argv[1]) == 0) {
myAISContext->CloseAllContexts();
BRepPrimAPI_MakeBox B(gp_Pnt(-400.,-400.,-100.),200.,150.,100.);
Handle(AIS_Shape) aBox = new AIS_Shape(B.Shape());
myAISContext->Display(aBox);
} else if(Draw::Atoi(argv[1]) == 1) {
myAISContext->CloseAllContexts();
myAISContext->OpenLocalContext();
myAISContext->ActivateStandardMode(TopAbs_EDGE);
} else if(Draw::Atoi(argv[1]) == 2) {
myAISContext->CloseAllContexts();
myAISContext->OpenLocalContext();
myAISContext->ActivateStandardMode(TopAbs_FACE);
} else {
di << "Usage : " << argv[0] << " 0/1\n";
return -1;
}
return 0;
}
#include <BRepBndLib.hxx> #include <BRepBndLib.hxx>
#include <Bnd_HArray1OfBox.hxx> #include <Bnd_HArray1OfBox.hxx>
@ -1780,11 +1724,9 @@ void QABugs::Commands_3(Draw_Interpretor& theCommands) {
theCommands.Add("PRO19626","ksection resultat shell1 shell2 NbPntMax Toler3d Toler2d",__FILE__,ksection,group); theCommands.Add("PRO19626","ksection resultat shell1 shell2 NbPntMax Toler3d Toler2d",__FILE__,ksection,group);
theCommands.Add("BUC60574","BUC60574 ",__FILE__,BUC60574,group); theCommands.Add("BUC60574","BUC60574 ",__FILE__,BUC60574,group);
theCommands.Add("BUC60699","BUC60699 ",__FILE__,BUC60699,group);
theCommands.Add("GER61351","GER61351 name/object name/r g b/object r g b",__FILE__,setcolor,group); theCommands.Add("GER61351","GER61351 name/object name/r g b/object r g b",__FILE__,setcolor,group);
theCommands.Add("setcolor","setcolor name/object name/r g b/object r g b",__FILE__,setcolor,group); theCommands.Add("setcolor","setcolor name/object name/r g b/object r g b",__FILE__,setcolor,group);
theCommands.Add("BUC60726","BUC60726 0/1",__FILE__,BUC60726,group);
theCommands.Add("BUC60729","BUC60729",__FILE__,BUC60729,group); theCommands.Add("BUC60729","BUC60729",__FILE__,BUC60729,group);
theCommands.Add("BUC60724","BUC60724",__FILE__,BUC60724,group); theCommands.Add("BUC60724","BUC60724",__FILE__,BUC60724,group);
theCommands.Add("BUC60727","BUC60727",__FILE__,BUC60727,group); theCommands.Add("BUC60727","BUC60727",__FILE__,BUC60727,group);

131
src/ViewerTest/ViewerTest.cxx
View File

@ -174,6 +174,22 @@ Standard_Boolean ViewerTest::ParseOnOff (Standard_CString theArg,
return Standard_False; return Standard_False;
} }
//=======================================================================
//function : GetSelectedShapes
//purpose :
//=======================================================================
void ViewerTest::GetSelectedShapes (TopTools_ListOfShape& theSelectedShapes)
{
for (GetAISContext()->InitSelected(); GetAISContext()->MoreSelected(); GetAISContext()->NextSelected())
{
TopoDS_Shape aShape = GetAISContext()->SelectedShape();
if (!aShape.IsNull())
{
theSelectedShapes.Append (aShape);
}
}
}
//======================================================================= //=======================================================================
//function : ParseLineType //function : ParseLineType
//purpose : //purpose :
@ -526,8 +542,6 @@ Handle(AIS_Shape) GetAISShapeFromName(const char* name)
void ViewerTest::Clear() void ViewerTest::Clear()
{ {
if ( !a3DView().IsNull() ) { if ( !a3DView().IsNull() ) {
if (TheAISContext()->HasOpenedContext())
TheAISContext()->CloseLocalContext();
ViewerTest_DoubleMapIteratorOfDoubleMapOfInteractiveAndName it(GetMapOfAIS()); ViewerTest_DoubleMapIteratorOfDoubleMapOfInteractiveAndName it(GetMapOfAIS());
while ( it.More() ) { while ( it.More() ) {
cout << "Remove " << it.Key2() << endl; cout << "Remove " << it.Key2() << endl;
@ -546,12 +560,15 @@ void ViewerTest::Clear()
//purpose : Activate a selection mode, vertex, edge, wire ..., in a local //purpose : Activate a selection mode, vertex, edge, wire ..., in a local
// Context // Context
//============================================================================== //==============================================================================
Standard_DISABLE_DEPRECATION_WARNINGS
void ViewerTest::StandardModeActivation(const Standard_Integer mode ) void ViewerTest::StandardModeActivation(const Standard_Integer mode )
{ {
Handle(AIS_InteractiveContext) aContext = ViewerTest::GetAISContext(); Handle(AIS_InteractiveContext) aContext = ViewerTest::GetAISContext();
if(mode==0) { if(mode==0) {
if (TheAISContext()->HasOpenedContext()) if (TheAISContext()->HasOpenedContext())
{
aContext->CloseLocalContext(); aContext->CloseLocalContext();
}
} else { } else {
if(!aContext->HasOpenedContext()) { if(!aContext->HasOpenedContext()) {
@ -560,14 +577,16 @@ void ViewerTest::StandardModeActivation(const Standard_Integer mode )
// Open a local Context in order to be able to select subshape from // Open a local Context in order to be able to select subshape from
// the selected shape if any or for all if there is no selection // the selected shape if any or for all if there is no selection
if (!aContext->FirstSelectedObject().IsNull()){ if (!aContext->FirstSelectedObject().IsNull()){
aContext->OpenLocalContext(Standard_False); aContext->OpenLocalContext(Standard_False);
for(aContext->InitSelected();aContext->MoreSelected();aContext->NextSelected()){ for(aContext->InitSelected();aContext->MoreSelected();aContext->NextSelected()){
aContext->Load( aContext->SelectedInteractive(),-1,Standard_True); aContext->Load( aContext->SelectedInteractive(),-1,Standard_True);
} }
} }
else else
aContext->OpenLocalContext(); {
aContext->OpenLocalContext();
}
} }
const char *cmode="???"; const char *cmode="???";
@ -585,19 +604,20 @@ void ViewerTest::StandardModeActivation(const Standard_Integer mode )
} }
if(theactivatedmodes.Contains(mode)) if(theactivatedmodes.Contains(mode))
{ // Desactivate { // Desactivate
aContext->DeactivateStandardMode(AIS_Shape::SelectionType(mode)); aContext->DeactivateStandardMode(AIS_Shape::SelectionType(mode));
theactivatedmodes.Remove(mode); theactivatedmodes.Remove(mode);
cout<<"Mode "<< cmode <<" OFF"<<endl; cout<<"Mode "<< cmode <<" OFF"<<endl;
} }
else else
{ // Activate { // Activate
aContext->ActivateStandardMode(AIS_Shape::SelectionType(mode)); aContext->ActivateStandardMode(AIS_Shape::SelectionType(mode));
theactivatedmodes.Add(mode); theactivatedmodes.Add(mode);
cout<<"Mode "<< cmode << " ON" << endl; cout<<"Mode "<< cmode << " ON" << endl;
} }
} }
} }
Standard_ENABLE_DEPRECATION_WARNINGS
//============================================================================== //==============================================================================
//function : CopyIsoAspect //function : CopyIsoAspect
@ -1462,10 +1482,6 @@ static int VSetInteriorStyle (Draw_Interpretor& theDI,
return 1; return 1;
} }
if (aCtx->HasOpenedContext())
{
aCtx->CloseLocalContext();
}
for (ViewTest_PrsIter anIter (aName); anIter.More(); anIter.Next()) for (ViewTest_PrsIter anIter (aName); anIter.More(); anIter.Next())
{ {
const Handle(AIS_InteractiveObject)& anIO = anIter.Current(); const Handle(AIS_InteractiveObject)& anIO = anIter.Current();
@ -2237,11 +2253,6 @@ static Standard_Integer VAspects (Draw_Interpretor& /*theDI*/,
isFirst = Standard_False; isFirst = Standard_False;
} }
if (aCtx->HasOpenedContext())
{
aCtx->CloseLocalContext();
}
// special case for -defaults parameter. // special case for -defaults parameter.
// all changed values will be set to DefaultDrawer. // all changed values will be set to DefaultDrawer.
if (isDefaults) if (isDefaults)
@ -2553,10 +2564,12 @@ static int VDonly2 (Draw_Interpretor& ,
return 1; return 1;
} }
Standard_DISABLE_DEPRECATION_WARNINGS
if (aCtx->HasOpenedContext()) if (aCtx->HasOpenedContext())
{ {
aCtx->CloseLocalContext(); aCtx->CloseLocalContext();
} }
Standard_ENABLE_DEPRECATION_WARNINGS
Standard_Integer anArgIter = 1; Standard_Integer anArgIter = 1;
for (; anArgIter < theArgNb; ++anArgIter) for (; anArgIter < theArgNb; ++anArgIter)
@ -2678,6 +2691,7 @@ int VRemove (Draw_Interpretor& theDI,
return 1; return 1;
} }
Standard_DISABLE_DEPRECATION_WARNINGS
if (toRemoveLocal && !aCtx->HasOpenedContext()) if (toRemoveLocal && !aCtx->HasOpenedContext())
{ {
std::cerr << "Error: local selection context is not open.\n"; std::cerr << "Error: local selection context is not open.\n";
@ -2687,6 +2701,7 @@ int VRemove (Draw_Interpretor& theDI,
{ {
aCtx->CloseAllContexts (Standard_False); aCtx->CloseAllContexts (Standard_False);
} }
Standard_ENABLE_DEPRECATION_WARNINGS
NCollection_List<TCollection_AsciiString> anIONameList; NCollection_List<TCollection_AsciiString> anIONameList;
if (toRemoveAll) if (toRemoveAll)
@ -2754,11 +2769,13 @@ int VRemove (Draw_Interpretor& theDI,
// Close local context if it is empty // Close local context if it is empty
TColStd_MapOfTransient aLocalIO; TColStd_MapOfTransient aLocalIO;
Standard_DISABLE_DEPRECATION_WARNINGS
if (aCtx->HasOpenedContext() if (aCtx->HasOpenedContext()
&& !aCtx->LocalContext()->DisplayedObjects (aLocalIO)) && !aCtx->LocalContext()->DisplayedObjects (aLocalIO))
{ {
aCtx->CloseAllContexts (Standard_False); aCtx->CloseAllContexts (Standard_False);
} }
Standard_ENABLE_DEPRECATION_WARNINGS
return 0; return 0;
} }
@ -2816,6 +2833,7 @@ int VErase (Draw_Interpretor& theDI,
return 1; return 1;
} }
Standard_DISABLE_DEPRECATION_WARNINGS
if (toEraseLocal && !aCtx->HasOpenedContext()) if (toEraseLocal && !aCtx->HasOpenedContext())
{ {
std::cerr << "Error: local selection context is not open.\n"; std::cerr << "Error: local selection context is not open.\n";
@ -2825,6 +2843,7 @@ int VErase (Draw_Interpretor& theDI,
{ {
aCtx->CloseAllContexts (Standard_False); aCtx->CloseAllContexts (Standard_False);
} }
Standard_ENABLE_DEPRECATION_WARNINGS
if (!aNamesOfEraseIO.IsEmpty()) if (!aNamesOfEraseIO.IsEmpty())
{ {
@ -2948,6 +2967,7 @@ static int VDisplayAll (Draw_Interpretor& ,
return 1; return 1;
} }
Standard_DISABLE_DEPRECATION_WARNINGS
if (toDisplayLocal && !aCtx->HasOpenedContext()) if (toDisplayLocal && !aCtx->HasOpenedContext())
{ {
std::cerr << "Error: local selection context is not open.\n"; std::cerr << "Error: local selection context is not open.\n";
@ -2957,6 +2977,7 @@ static int VDisplayAll (Draw_Interpretor& ,
{ {
aCtx->CloseLocalContext (Standard_False); aCtx->CloseLocalContext (Standard_False);
} }
Standard_ENABLE_DEPRECATION_WARNINGS
for (ViewerTest_DoubleMapIteratorOfDoubleMapOfInteractiveAndName anIter (GetMapOfAIS()); for (ViewerTest_DoubleMapIteratorOfDoubleMapOfInteractiveAndName anIter (GetMapOfAIS());
anIter.More(); anIter.Next()) anIter.More(); anIter.Next())
@ -3799,6 +3820,7 @@ static int VDisplay2 (Draw_Interpretor& theDI,
} }
// Prepare context for display // Prepare context for display
Standard_DISABLE_DEPRECATION_WARNINGS
if (toDisplayLocal && !aCtx->HasOpenedContext()) if (toDisplayLocal && !aCtx->HasOpenedContext())
{ {
aCtx->OpenLocalContext (Standard_False); aCtx->OpenLocalContext (Standard_False);
@ -3807,6 +3829,7 @@ static int VDisplay2 (Draw_Interpretor& theDI,
{ {
aCtx->CloseAllContexts (Standard_False); aCtx->CloseAllContexts (Standard_False);
} }
Standard_ENABLE_DEPRECATION_WARNINGS
// Display interactive objects // Display interactive objects
for (Standard_Integer anIter = 1; anIter <= aNamesOfDisplayIO.Length(); ++anIter) for (Standard_Integer anIter = 1; anIter <= aNamesOfDisplayIO.Length(); ++anIter)
@ -4008,9 +4031,6 @@ static int VUpdate (Draw_Interpretor& /*theDi*/, Standard_Integer theArgsNb, con
static int VPerf(Draw_Interpretor& di, Standard_Integer , const char** argv) { static int VPerf(Draw_Interpretor& di, Standard_Integer , const char** argv) {
OSD_Timer myTimer; OSD_Timer myTimer;
if (TheAISContext()->HasOpenedContext())
TheAISContext()->CloseLocalContext();
Standard_Real Step=4*M_PI/180; Standard_Real Step=4*M_PI/180;
Standard_Real Angle=0; Standard_Real Angle=0;
@ -4082,10 +4102,6 @@ static int VShading(Draw_Interpretor& ,Standard_Integer argc, const char** argv)
// Verifications // Verifications
const Standard_Boolean HaveToSet = (strcasecmp(argv[0],"vsetshading") == 0); const Standard_Boolean HaveToSet = (strcasecmp(argv[0],"vsetshading") == 0);
if (TheAISContext()->HasOpenedContext())
TheAISContext()->CloseLocalContext();
if (argc < 3) { if (argc < 3) {
myDevCoef = 0.0008; myDevCoef = 0.0008;
} else { } else {
@ -4151,15 +4167,20 @@ static int VActivatedMode (Draw_Interpretor& di, Standard_Integer argc, const ch
if (argc<2||argc>3) { di<<" Syntaxe error\n";return 1;} if (argc<2||argc>3) { di<<" Syntaxe error\n";return 1;}
ThereIsName = (argc == 3); ThereIsName = (argc == 3);
} }
else { else
{
Standard_DISABLE_DEPRECATION_WARNINGS
// vunsetam // vunsetam
if (argc>1) {di<<" Syntaxe error\n";return 1;} if (argc>1) {di<<" Syntaxe error\n";return 1;}
else { else {
di<<" R.A.Z de tous les modes de selecion\n"; di<<" R.A.Z de tous les modes de selecion\n";
di<<" Fermeture du Context local\n"; di<<" Fermeture du Context local\n";
if (TheAISContext()->HasOpenedContext()) if (TheAISContext()->HasOpenedContext())
{
TheAISContext()->CloseLocalContext(); TheAISContext()->CloseLocalContext();
}
} }
Standard_ENABLE_DEPRECATION_WARNINGS
} }
// IL n'y a aps de nom de shape passe en argument // IL n'y a aps de nom de shape passe en argument
@ -4192,7 +4213,9 @@ static int VActivatedMode (Draw_Interpretor& di, Standard_Integer argc, const ch
} }
} }
Standard_DISABLE_DEPRECATION_WARNINGS
TheAISContext()->OpenLocalContext(Standard_False); TheAISContext()->OpenLocalContext(Standard_False);
Standard_ENABLE_DEPRECATION_WARNINGS
ViewerTest_DoubleMapIteratorOfDoubleMapOfInteractiveAndName ViewerTest_DoubleMapIteratorOfDoubleMapOfInteractiveAndName
it (GetMapOfAIS()); it (GetMapOfAIS());
while(it.More()){ while(it.More()){
@ -4295,7 +4318,9 @@ static int VActivatedMode (Draw_Interpretor& di, Standard_Integer argc, const ch
} }
if( !TheAISContext()->HasOpenedContext() ) { if( !TheAISContext()->HasOpenedContext() ) {
Standard_DISABLE_DEPRECATION_WARNINGS
TheAISContext()->OpenLocalContext(Standard_False); TheAISContext()->OpenLocalContext(Standard_False);
Standard_ENABLE_DEPRECATION_WARNINGS
// On charge tous les objets de la map // On charge tous les objets de la map
ViewerTest_DoubleMapIteratorOfDoubleMapOfInteractiveAndName it (GetMapOfAIS()); ViewerTest_DoubleMapIteratorOfDoubleMapOfInteractiveAndName it (GetMapOfAIS());
while(it.More()){ while(it.More()){
@ -4496,7 +4521,9 @@ static Standard_Integer VState (Draw_Interpretor& theDI,
if (toPrintEntities) if (toPrintEntities)
{ {
theDI << "Detected entities:\n"; theDI << "Detected entities:\n";
Standard_DISABLE_DEPRECATION_WARNINGS
Handle(StdSelect_ViewerSelector3d) aSelector = aCtx->HasOpenedContext() ? aCtx->LocalSelector() : aCtx->MainSelector(); Handle(StdSelect_ViewerSelector3d) aSelector = aCtx->HasOpenedContext() ? aCtx->LocalSelector() : aCtx->MainSelector();
Standard_ENABLE_DEPRECATION_WARNINGS
SelectMgr_SelectingVolumeManager aMgr = aSelector->GetManager(); SelectMgr_SelectingVolumeManager aMgr = aSelector->GetManager();
for (Standard_Integer aPickIter = 1; aPickIter <= aSelector->NbPicked(); ++aPickIter) for (Standard_Integer aPickIter = 1; aPickIter <= aSelector->NbPicked(); ++aPickIter)
{ {
@ -4546,10 +4573,12 @@ static Standard_Integer VState (Draw_Interpretor& theDI,
} }
NCollection_Map<Handle(AIS_InteractiveObject)> aDetected; NCollection_Map<Handle(AIS_InteractiveObject)> aDetected;
Standard_DISABLE_DEPRECATION_WARNINGS
for (aCtx->InitDetected(); aCtx->MoreDetected(); aCtx->NextDetected()) for (aCtx->InitDetected(); aCtx->MoreDetected(); aCtx->NextDetected())
{ {
aDetected.Add (aCtx->DetectedCurrentObject()); aDetected.Add (aCtx->DetectedCurrentObject());
} }
Standard_ENABLE_DEPRECATION_WARNINGS
const Standard_Boolean toShowAll = (theArgNb >= 2 && *theArgVec[1] == '*'); const Standard_Boolean toShowAll = (theArgNb >= 2 && *theArgVec[1] == '*');
if (theArgNb >= 2 if (theArgNb >= 2
@ -4615,8 +4644,10 @@ static Standard_Integer VState (Draw_Interpretor& theDI,
theDI << "\n"; theDI << "\n";
} }
printLocalSelectionInfo (aCtx, theDI); printLocalSelectionInfo (aCtx, theDI);
Standard_DISABLE_DEPRECATION_WARNINGS
if (aCtx->HasOpenedContext()) if (aCtx->HasOpenedContext())
printLocalSelectionInfo (aCtx->LocalContext(), theDI); printLocalSelectionInfo (aCtx->LocalContext(), theDI);
Standard_ENABLE_DEPRECATION_WARNINGS
return 0; return 0;
} }
@ -4630,7 +4661,9 @@ Standard_Boolean ViewerTest::PickObjects(Handle(TColStd_HArray1OfTransient)& ar
const Standard_Integer MaxPick) const Standard_Integer MaxPick)
{ {
Handle(AIS_InteractiveObject) IO; Handle(AIS_InteractiveObject) IO;
Standard_DISABLE_DEPRECATION_WARNINGS
Standard_Integer curindex = (TheType == AIS_KOI_None) ? 0 : TheAISContext()->OpenLocalContext(); Standard_Integer curindex = (TheType == AIS_KOI_None) ? 0 : TheAISContext()->OpenLocalContext();
Standard_ENABLE_DEPRECATION_WARNINGS
// step 1: prepare the data // step 1: prepare the data
if(curindex !=0){ if(curindex !=0){
@ -4670,9 +4703,12 @@ Standard_Boolean ViewerTest::PickObjects(Handle(TColStd_HArray1OfTransient)& ar
arr->SetValue(i,IO2); arr->SetValue(i,IO2);
} }
Standard_DISABLE_DEPRECATION_WARNINGS
if(curindex>0) if (curindex > 0)
{
TheAISContext()->CloseLocalContext(curindex); TheAISContext()->CloseLocalContext(curindex);
}
Standard_ENABLE_DEPRECATION_WARNINGS
return Standard_True; return Standard_True;
} }
@ -4687,7 +4723,9 @@ Handle(AIS_InteractiveObject) ViewerTest::PickObject(const AIS_KindOfInteractive
const Standard_Integer MaxPick) const Standard_Integer MaxPick)
{ {
Handle(AIS_InteractiveObject) IO; Handle(AIS_InteractiveObject) IO;
Standard_DISABLE_DEPRECATION_WARNINGS
Standard_Integer curindex = (TheType == AIS_KOI_None) ? 0 : TheAISContext()->OpenLocalContext(); Standard_Integer curindex = (TheType == AIS_KOI_None) ? 0 : TheAISContext()->OpenLocalContext();
Standard_ENABLE_DEPRECATION_WARNINGS
// step 1: prepare the data // step 1: prepare the data
@ -4718,8 +4756,12 @@ Handle(AIS_InteractiveObject) ViewerTest::PickObject(const AIS_KindOfInteractive
IO = TheAISContext()->SelectedInteractive(); IO = TheAISContext()->SelectedInteractive();
} }
if(curindex!=0) Standard_DISABLE_DEPRECATION_WARNINGS
if (curindex != 0)
{
TheAISContext()->CloseLocalContext(curindex); TheAISContext()->CloseLocalContext(curindex);
}
Standard_ENABLE_DEPRECATION_WARNINGS
return IO; return IO;
} }
@ -4734,8 +4776,9 @@ TopoDS_Shape ViewerTest::PickShape(const TopAbs_ShapeEnum TheType,
{ {
// step 1: prepare the data // step 1: prepare the data
Standard_DISABLE_DEPRECATION_WARNINGS
Standard_Integer curindex = TheAISContext()->OpenLocalContext(); Standard_Integer curindex = TheAISContext()->OpenLocalContext();
Standard_ENABLE_DEPRECATION_WARNINGS
TopoDS_Shape result; TopoDS_Shape result;
if(TheType==TopAbs_SHAPE){ if(TheType==TopAbs_SHAPE){
@ -4745,8 +4788,9 @@ TopoDS_Shape ViewerTest::PickShape(const TopAbs_ShapeEnum TheType,
else{ else{
Handle(StdSelect_ShapeTypeFilter) TF = new StdSelect_ShapeTypeFilter(TheType); Handle(StdSelect_ShapeTypeFilter) TF = new StdSelect_ShapeTypeFilter(TheType);
TheAISContext()->AddFilter(TF); TheAISContext()->AddFilter(TF);
Standard_DISABLE_DEPRECATION_WARNINGS
TheAISContext()->ActivateStandardMode(TheType); TheAISContext()->ActivateStandardMode(TheType);
Standard_ENABLE_DEPRECATION_WARNINGS
} }
@ -4778,8 +4822,12 @@ TopoDS_Shape ViewerTest::PickShape(const TopAbs_ShapeEnum TheType,
} }
} }
if(curindex>0) Standard_DISABLE_DEPRECATION_WARNINGS
if (curindex > 0)
{
TheAISContext()->CloseLocalContext(curindex); TheAISContext()->CloseLocalContext(curindex);
}
Standard_ENABLE_DEPRECATION_WARNINGS
return result; return result;
} }
@ -4799,7 +4847,9 @@ Standard_Boolean ViewerTest::PickShapes (const TopAbs_ShapeEnum TheType,
cout<<" WARNING : Pick with Shift+ MB1 for Selection of more than 1 object\n"; cout<<" WARNING : Pick with Shift+ MB1 for Selection of more than 1 object\n";
// step 1: prepare the data // step 1: prepare the data
Standard_DISABLE_DEPRECATION_WARNINGS
Standard_Integer curindex = TheAISContext()->OpenLocalContext(); Standard_Integer curindex = TheAISContext()->OpenLocalContext();
Standard_ENABLE_DEPRECATION_WARNINGS
if(TheType==TopAbs_SHAPE){ if(TheType==TopAbs_SHAPE){
Handle(AIS_TypeFilter) F1 = new AIS_TypeFilter(AIS_KOI_Shape); Handle(AIS_TypeFilter) F1 = new AIS_TypeFilter(AIS_KOI_Shape);
TheAISContext()->AddFilter(F1); TheAISContext()->AddFilter(F1);
@ -4807,8 +4857,9 @@ Standard_Boolean ViewerTest::PickShapes (const TopAbs_ShapeEnum TheType,
else{ else{
Handle(StdSelect_ShapeTypeFilter) TF = new StdSelect_ShapeTypeFilter(TheType); Handle(StdSelect_ShapeTypeFilter) TF = new StdSelect_ShapeTypeFilter(TheType);
TheAISContext()->AddFilter(TF); TheAISContext()->AddFilter(TF);
Standard_DISABLE_DEPRECATION_WARNINGS
TheAISContext()->ActivateStandardMode(TheType); TheAISContext()->ActivateStandardMode(TheType);
Standard_ENABLE_DEPRECATION_WARNINGS
} }
// step 2 : wait for the selection... // step 2 : wait for the selection...
@ -4845,7 +4896,9 @@ Standard_Boolean ViewerTest::PickShapes (const TopAbs_ShapeEnum TheType,
} }
} }
Standard_DISABLE_DEPRECATION_WARNINGS
TheAISContext()->CloseLocalContext(curindex); TheAISContext()->CloseLocalContext(curindex);
Standard_ENABLE_DEPRECATION_WARNINGS
return Standard_True; return Standard_True;
} }
@ -5458,6 +5511,7 @@ static Standard_Integer VLoadSelection (Draw_Interpretor& /*theDi*/,
} }
// Prepare context // Prepare context
Standard_DISABLE_DEPRECATION_WARNINGS
if (isLocal && !aCtx->HasOpenedContext()) if (isLocal && !aCtx->HasOpenedContext())
{ {
aCtx->OpenLocalContext (Standard_False); aCtx->OpenLocalContext (Standard_False);
@ -5466,6 +5520,7 @@ static Standard_Integer VLoadSelection (Draw_Interpretor& /*theDi*/,
{ {
aCtx->CloseAllContexts (Standard_False); aCtx->CloseAllContexts (Standard_False);
} }
Standard_ENABLE_DEPRECATION_WARNINGS
// Load selection of interactive objects // Load selection of interactive objects
for (Standard_Integer anIter = 1; anIter <= aNamesOfIO.Length(); ++anIter) for (Standard_Integer anIter = 1; anIter <= aNamesOfIO.Length(); ++anIter)

5
src/ViewerTest/ViewerTest.hxx
View File

@ -25,6 +25,7 @@
#include <Standard_Boolean.hxx> #include <Standard_Boolean.hxx>
#include <TopAbs_ShapeEnum.hxx> #include <TopAbs_ShapeEnum.hxx>
#include <TopTools_HArray1OfShape.hxx> #include <TopTools_HArray1OfShape.hxx>
#include <TopTools_ListOfShape.hxx>
#include <AIS_KindOfInteractive.hxx> #include <AIS_KindOfInteractive.hxx>
#include <Aspect_TypeOfLine.hxx> #include <Aspect_TypeOfLine.hxx>
#include <TColStd_HArray1OfTransient.hxx> #include <TColStd_HArray1OfTransient.hxx>
@ -190,6 +191,10 @@ public:
Standard_EXPORT static Standard_Boolean ParseOnOff (Standard_CString theArg, Standard_EXPORT static Standard_Boolean ParseOnOff (Standard_CString theArg,
Standard_Boolean& theIsOn); Standard_Boolean& theIsOn);
//! Returns list of selected shapes.
Standard_EXPORT static void GetSelectedShapes (TopTools_ListOfShape& theShapes);
//! Parses line type argument. //! Parses line type argument.
//! Handles either enumeration (integer) value or string constant. //! Handles either enumeration (integer) value or string constant.
Standard_EXPORT static Standard_Boolean ParseLineType (Standard_CString theArg, Standard_EXPORT static Standard_Boolean ParseLineType (Standard_CString theArg,

1178
src/ViewerTest/ViewerTest_ObjectCommands.cxx
View File

File diff suppressed because it is too large Load Diff

2387
src/ViewerTest/ViewerTest_RelationCommands.cxx
View File

File diff suppressed because it is too large Load Diff

6
src/ViewerTest/ViewerTest_ViewerCommands.cxx
View File

@ -3411,11 +3411,10 @@ static int VExport(Draw_Interpretor& di, Standard_Integer argc, const char** arg
return 1; return 1;
} }
Standard_DISABLE_DEPRECATION_WARNINGS
try try
{ {
Standard_DISABLE_DEPRECATION_WARNINGS
if (!V3dView->Export (argv[1], anExpFormat)) if (!V3dView->Export (argv[1], anExpFormat))
Standard_ENABLE_DEPRECATION_WARNINGS
{ {
di << "Error: export of image to " << aFormatStr << " failed!\n"; di << "Error: export of image to " << aFormatStr << " failed!\n";
} }
@ -3425,6 +3424,7 @@ static int VExport(Draw_Interpretor& di, Standard_Integer argc, const char** arg
di << "Error: export of image to " << aFormatStr << " failed"; di << "Error: export of image to " << aFormatStr << " failed";
di << " (exception: " << Standard_Failure::Caught()->GetMessageString() << ")"; di << " (exception: " << Standard_Failure::Caught()->GetMessageString() << ")";
} }
Standard_ENABLE_DEPRECATION_WARNINGS
return 0; return 0;
} }
@ -6984,7 +6984,7 @@ static Standard_Integer VPurgeDisplay (Draw_Interpretor& di,
di << "use 'vinit' command before " << argv[0] << "\n"; di << "use 'vinit' command before " << argv[0] << "\n";
return 1; return 1;
} }
aContext->CloseAllContexts(Standard_False);
di << aContext->PurgeDisplay() << "\n"; di << aContext->PurgeDisplay() << "\n";
return 0; return 0;
} }

12
src/XSDRAWSTLVRML/XSDRAWSTLVRML.cxx
View File

@ -512,8 +512,12 @@ static Standard_Integer mdisplay
di << "The context is null\n"; di << "The context is null\n";
else else
{ {
if( aContext->HasOpenedContext() ) Standard_DISABLE_DEPRECATION_WARNINGS
if (aContext->HasOpenedContext())
{
aContext->CloseLocalContext(); aContext->CloseLocalContext();
}
Standard_ENABLE_DEPRECATION_WARNINGS
aContext->Display( aMesh ); aContext->Display( aMesh );
} }
@ -538,8 +542,12 @@ static Standard_Integer merase
di << "The context is null\n"; di << "The context is null\n";
else else
{ {
if( aContext->HasOpenedContext() ) Standard_DISABLE_DEPRECATION_WARNINGS
if (aContext->HasOpenedContext())
{
aContext->CloseLocalContext(); aContext->CloseLocalContext();
}
Standard_ENABLE_DEPRECATION_WARNINGS
aContext->Erase( aMesh ); aContext->Erase( aMesh );
} }

2
tests/v3d/dimensions/begin Normal file
View File

@ -0,0 +1,2 @@
set subgroup "dimensions"
vinit View1

21
tests/v3d/dimensions/concentric Normal file
View File

@ -0,0 +1,21 @@
puts "===================================================================="
puts "OCC28162: Draw Harness - eliminate usage of deprecated Local Context"
puts "Select two circled edges"
puts "===================================================================="
vclear
vinit
pcylinder c 15 30
vdisplay c
vfit
vselmode c 2 1
vselect 205 174
set shift 1
vselect 205 377 $shift
vrelation r -concentric
vdump $imagedir/${casename}.png

38
tests/v3d/dimensions/equaldistance Normal file
View File

@ -0,0 +1,38 @@
puts "===================================================================="
puts "OCC28162: Draw Harness - eliminate usage of deprecated Local Context"
puts "Select 4 edges or vertices"
puts "===================================================================="
vclear
vinit
box b 10 20 30
vdisplay b
vfit
set shift 1
# Create an equaldistance relation from 4 edges.
vselmode b 2 1
vselect 123 112
vselect 280 23 $shift
vselect 123 382 $shift
vselect 280 293 $shift
vrelation r4edges -equaldistance
vzoom 0.5
vdump $imagedir/${casename}_edges.png
# Create an equaldistance relation from 4 vertices.
vremove r4edges
vfit
vselect 0 0
vselmode b 2 0
vselmode b 1 1
vselect 75 0 335 140
vrelation r4vertices -equaldistance
vzoom 0.5
vdump $imagedir/${casename}_vertices.png

31
tests/v3d/dimensions/equalradius Normal file
View File

@ -0,0 +1,31 @@
puts "===================================================================="
puts "OCC28162: Draw Harness - eliminate usage of deprecated Local Context"
puts "Select 1 or 2 circled edges"
puts "===================================================================="
vclear
vinit
pcylinder c 15 30
vdisplay c
vfit
# Create relation from 1 selected circled edge.
vselmode c 2 1
vselect 205 174
vrelation r1 -equalradius
vdump $imagedir/${casename}_1.png
# Create relation from 2 selected circled edges.
vremove r1
vselect 205 377
set shift 1
vselect 205 174 $shift
vrelation r2 -equalradius
vdump $imagedir/${casename}_2.png

18
tests/v3d/dimensions/fix Normal file
View File

@ -0,0 +1,18 @@
puts "===================================================================="
puts "OCC28162: Draw Harness - eliminate usage of deprecated Local Context"
puts "Select 1 edge"
puts "===================================================================="
vclear
vinit
box b 10 20 30
vdisplay b
vfit
vselmode b 2 1
vselect 10 10 100 380
vrelation r -fix
vdump $imagedir/${casename}.png

37
tests/v3d/dimensions/identic Normal file
View File

@ -0,0 +1,37 @@
puts "===================================================================="
puts "OCC28162: Draw Harness - eliminate usage of deprecated Local Context"
puts "Select 2 edges or vertices"
puts "===================================================================="
vclear
vinit
box b 10 20 30
vdisplay b
vfit
set shift 1
# Create an identic relation from 2 edges.
#vremove rfaces
vselmode b 4 0
vselmode b 2 1
vselect 87 170
vselect 165 170 $shift
vrelation redgess -identic
vdump $imagedir/${casename}_edges.png
# Create an identic relation from 2 vertices.
vremove redges
vselmode b 2 0
vselmode b 1 1
vselect 160 130 170 140
vselect 240 0 250 10 $shift
vrelation rvertices -identic
vdump $imagedir/${casename}_vertices.png

22
tests/v3d/dimensions/offset Normal file
View File

@ -0,0 +1,22 @@
puts "===================================================================="
puts "OCC28162: Draw Harness - eliminate usage of deprecated Local Context"
puts "Select 2 faces"
puts "===================================================================="
vclear
vinit
box b -5 -10 -15 10 20 30
vdisplay b
vfit
set shift 1
vselmode b 4 1
vselect 100 200
vlocation b -rotate 0 0 0 0 0 1 180
vselect 100 200 $shift
vrelation r -offset
vdump $imagedir/${casename}.png

23
tests/v3d/dimensions/parallel Normal file
View File

@ -0,0 +1,23 @@
puts "===================================================================="
puts "OCC28162: Draw Harness - eliminate usage of deprecated Local Context"
puts "Select 2 edges"
puts "===================================================================="
vclear
vinit
box b -5 -10 -15 10 20 30
vdisplay b
vfit
set shift 1
# Create a parallel relation from 2 edges.
vselmode b 2 1
vselect 87 170
vselect 165 170 $shift
vrelation r -parallel
vzoom 0.5
vdump $imagedir/${casename}_edges.png

22
tests/v3d/dimensions/perpendicular Normal file
View File

@ -0,0 +1,22 @@
puts "===================================================================="
puts "OCC28162: Draw Harness - eliminate usage of deprecated Local Context"
puts "Select 2 edges"
puts "===================================================================="
vclear
vinit
box b -5 -10 -15 10 20 30
vdisplay b
vfit
set shift 1
# Create a perpendicular relation from 2 edges.
vselmode b 2 1
vselect 87 145
vselect 135 119 $shift
vrelation r -perpendicular
vdump $imagedir/${casename}_edges.png

41
tests/v3d/dimensions/symmetric Normal file
View File

@ -0,0 +1,41 @@
puts "===================================================================="
puts "OCC28162: Draw Harness - eliminate usage of deprecated Local Context"
puts "Select 3 edges or 1 edge and 2 vertices"
puts "===================================================================="
vclear
vinit
box b 10 20 30
vdisplay b
vfit
set shift 1
# Create a symmetric relation from 3 edges.
vselmode b 2 1
vselect 280 23
vselect 123 112 $shift
vselect 123 382 $shift
vrelation r3edges -symmetric
vdump $imagedir/${casename}_3edges.png
# Create a symmetric relation from edge and 2 vertices.
vremove r3edges
vselect 0 0
# Select an edge.
vselect 123 112
vselmode b 2 0
vselmode b 1 1
# Select 2 vertices.
vselect 230 0 325 55 $shift
vrelation redge2vertices -symmetric
vdump $imagedir/${casename}_edge_2vertices.png

4
tests/v3d/end
View File

@ -1,4 +1,4 @@
if { [info exists subgroup] && $subgroup != "motion" && $subgroup != "ivtk" } { if { [info exists subgroup] && $subgroup != "motion" && $subgroup != "ivtk" && $subgroup != "dimensions" } {
catch { vfit } catch { vfit }
} }
if { [info exists subgroup] && $subgroup == "raytrace" } { if { [info exists subgroup] && $subgroup == "raytrace" } {
@ -26,6 +26,8 @@ if { [info exists subgroup] && $subgroup == "raytrace" } {
puts $catch_result puts $catch_result
} }
} }
} elseif { [info exists subgroup] && $subgroup == "dimensions" } {
# skip these test cases.
} elseif { ![info exists subgroup] || $subgroup != "mesh" } { } elseif { ![info exists subgroup] || $subgroup != "mesh" } {
# dump final image for common visualization tests # dump final image for common visualization tests

1
tests/v3d/grids.list
View File

@ -17,3 +17,4 @@
018 point_cloud 018 point_cloud
019 manipulator 019 manipulator
020 anim 020 anim
021 dimensions