OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-29 14:00:49 +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

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

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