0028162: Draw Harness - eliminate usage of deprecated Local Context

[occt.git] / samples / mfc / standard / Common / DimensionDlg.cpp

diff --git a/samples/mfc/standard/Common/DimensionDlg.cpp b/samples/mfc/standard/Common/DimensionDlg.cpp
index 9bd2022..e2a8c47 100644 (file)
--- a/samples/mfc/standard/Common/DimensionDlg.cpp
+++ b/samples/mfc/standard/Common/DimensionDlg.cpp
@@ -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();
 }