OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-14 13:30:48 +03:00
Code 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
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,20 +63,12 @@ END_MESSAGE_MAP()
void CAngleParamsVerticesPage::OnBnClickedVertex1Btn()
{
// Open local context and choose the vertex for angle dimensions
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;
}
myAISContext->Activate (AIS_Shape::SelectionMode (TopAbs_VERTEX));
// 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
myAISContext->LocalContext()->InitSelected();
if (!myAISContext->LocalContext()->MoreSelected() ||
myAISContext->InitSelected();
if (!myAISContext->MoreSelected() ||
myAISContext->SelectedShape().ShapeType() != TopAbs_VERTEX)
{
AfxMessageBox (_T ("Choose the vertex and press the button again"),
@@ -84,8 +76,8 @@ void CAngleParamsVerticesPage::OnBnClickedVertex1Btn()
return;
}
myFirstVertex = TopoDS::Vertex (myAISContext->LocalContext()->SelectedShape());
myAISContext->LocalContext()->ClearSelected();
myFirstVertex = TopoDS::Vertex (myAISContext->SelectedShape());
myAISContext->ClearSelected();
}
//=======================================================================
@@ -95,17 +87,17 @@ void CAngleParamsVerticesPage::OnBnClickedVertex1Btn()
void CAngleParamsVerticesPage::OnBnClickedVertex2Btn()
{
myAISContext->LocalContext()->InitSelected();
if (!myAISContext->LocalContext()->MoreSelected() ||
myAISContext->InitSelected();
if (!myAISContext->MoreSelected() ||
myAISContext->SelectedShape().ShapeType() != TopAbs_VERTEX)
{
AfxMessageBox ( _T("Choose the vertex and press the button again"), MB_ICONINFORMATION | MB_OK);
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()
{
myAISContext->LocalContext()->InitSelected();
if (!myAISContext->LocalContext()->MoreSelected())
myAISContext->InitSelected();
if (!myAISContext->MoreSelected())
{
AfxMessageBox (_T ("Choose the vertex and press the button again"), MB_ICONINFORMATION | MB_OK);
return;
}
myThirdVertex = TopoDS::Vertex (myAISContext->LocalContext()->SelectedShape());
myAISContext->LocalContext()->ClearSelected();
myThirdVertex = TopoDS::Vertex (myAISContext->SelectedShape());
myAISContext->ClearSelected();
//Build dimension here
TopoDS_Edge anEdge12 = BRepBuilderAPI_MakeEdge (myFirstVertex, mySecondVertex);
@@ -159,8 +151,6 @@ void CAngleParamsVerticesPage::OnBnClickedVertex3Btn()
}
}
anAngleDim->SetDimensionAspect (anAspect);
myAISContext->CloseAllContexts();
myAISContext->Display (anAngleDim);
myAISContext->OpenLocalContext();
myAISContext->ActivateStandardMode (TopAbs_VERTEX);
myAISContext->Activate (AIS_Shape::SelectionMode (TopAbs_VERTEX));
}