From 60bf98ae02fbd90f174ee2561ed8bb8ccab34e21 Mon Sep 17 00:00:00 2001 From: aba Date: Wed, 11 Dec 2013 19:16:07 +0400 Subject: [PATCH] 0024425: Improve usage ergonomics of new dimension presentations - Added format for value string. - Construction and validness. - Revise modification of properties and update of presentations. - Units moved to Drawer; code revisions. - Length and angle initialization was changed. Type of geometry filed was added to AIS_Dimension. - Method for test case bugs/vis/buc60915 was corrected. Description of the dimension classes was corrected. - Fixed initialization of angle and length. --- .../Common/AngleParamsVerticesPage.cpp | 8 +- samples/mfc/standard/Common/DimensionDlg.cpp | 88 +- samples/mfc/standard/Common/DimensionDlg.h | 1 + .../standard/Common/LengthParamsEdgePage.cpp | 4 +- .../standard/Common/LengthParamsEdgesPage.cpp | 12 +- .../Common/LengthParamsVerticesPage.cpp | 4 +- .../mfc/standard/Common/ParamsFacesPage.cpp | 120 ++ samples/mfc/standard/Common/ParamsFacesPage.h | 31 + .../mfc/standard/Common/RadiusParamsPage.cpp | 10 +- .../mfc/standard/Common/res/OCC_Resource.h | 7 +- .../mfc/standard/Common/res/OCC_Resource.rc | 18 + .../mfcsample/adm/win/vc10/mfcsample.vcxproj | 2 + .../adm/win/vc10/mfcsample.vcxproj.filters | 6 + .../mfcsample/adm/win/vc11/mfcsample.vcxproj | 2 + .../adm/win/vc11/mfcsample.vcxproj.filters | 6 + .../mfcsample/adm/win/vc8/mfcsample.vcproj | 8 + .../mfcsample/adm/win/vc9/mfcsample.vcproj | 8 + src/AIS/AIS.cdl | 261 +-- src/AIS/AIS.cxx | 1702 +++++++++-------- src/AIS/AIS_AngleDimension.cxx | 1341 +++++++------ src/AIS/AIS_AngleDimension.hxx | 327 +++- src/AIS/AIS_DiameterDimension.cxx | 345 +++- src/AIS/AIS_DiameterDimension.hxx | 166 +- src/AIS/AIS_Dimension.cxx | 775 +++----- src/AIS/AIS_Dimension.hxx | 521 +++-- src/AIS/AIS_Drawer.cdl | 62 +- src/AIS/AIS_Drawer.cxx | 126 +- src/AIS/AIS_Drawer.lxx | 6 +- src/AIS/AIS_LengthDimension.cxx | 1031 +++++----- src/AIS/AIS_LengthDimension.hxx | 248 ++- src/AIS/AIS_RadiusDimension.cxx | 246 ++- src/AIS/AIS_RadiusDimension.hxx | 141 +- src/Prs3d/FILES | 2 + src/Prs3d/Prs3d.cdl | 1 + src/Prs3d/Prs3d_DimensionAspect.cdl | 37 +- src/Prs3d/Prs3d_DimensionAspect.cxx | 62 +- src/Prs3d/Prs3d_DimensionUnits.cxx | 38 + src/Prs3d/Prs3d_DimensionUnits.hxx | 61 + src/Prs3d/Prs3d_Drawer.cdl | 147 +- src/Prs3d/Prs3d_Drawer.cxx | 160 +- src/QABugs/QABugs_16.cxx | 2 +- src/QABugs/QABugs_17.cxx | 27 +- src/TPrsStd/TPrsStd_ConstraintTools.cxx | 59 +- .../ViewerTest_RelationCommands.cxx | 6 +- 44 files changed, 5023 insertions(+), 3212 deletions(-) create mode 100644 samples/mfc/standard/Common/ParamsFacesPage.cpp create mode 100644 samples/mfc/standard/Common/ParamsFacesPage.h create mode 100644 src/Prs3d/Prs3d_DimensionUnits.cxx create mode 100644 src/Prs3d/Prs3d_DimensionUnits.hxx diff --git a/samples/mfc/standard/Common/AngleParamsVerticesPage.cpp b/samples/mfc/standard/Common/AngleParamsVerticesPage.cpp index 62f6c30ec9..9767f58b5c 100644 --- a/samples/mfc/standard/Common/AngleParamsVerticesPage.cpp +++ b/samples/mfc/standard/Common/AngleParamsVerticesPage.cpp @@ -142,13 +142,13 @@ void CAngleParamsVerticesPage::OnBnClickedVertex3Btn() anAspect->TextAspect()->SetHeight (aDimDlg->GetFontHeight()); anAspect->MakeTextShaded (aDimDlg->IsText3dShaded()); anAspect->SetCommonColor (aDimDlg->GetDimensionColor()); - anAngleDim->MakeUnitsDisplayed (aDimDlg->IsUnitsDisplayed()); - if (anAngleDim->IsUnitsDisplayed()) + anAngleDim->DimensionAspect()->MakeUnitsDisplayed (aDimDlg->IsUnitsDisplayed()); + if (aDimDlg->IsUnitsDisplayed()) { anAngleDim->SetDisplayUnits (aDimDlg->GetUnits()); - if ((anAngleDim->DisplayUnits().IsEqual (TCollection_AsciiString ("deg")))) + if ((anAngleDim->GetDisplayUnits().IsEqual (TCollection_AsciiString ("deg")))) { - anAngleDim->MakeUnitsDisplayed (Standard_False); + anAngleDim->DimensionAspect()->MakeUnitsDisplayed (Standard_False); } else { diff --git a/samples/mfc/standard/Common/DimensionDlg.cpp b/samples/mfc/standard/Common/DimensionDlg.cpp index 2179bf6f32..872dcf96aa 100644 --- a/samples/mfc/standard/Common/DimensionDlg.cpp +++ b/samples/mfc/standard/Common/DimensionDlg.cpp @@ -9,6 +9,7 @@ #include "LengthParamsEdgesPage.h" #include "AngleParamsVerticesPage.h" #include "RadiusParamsPage.h" +#include "ParamsFacesPage.h" #include #include #include @@ -30,6 +31,7 @@ BEGIN_MESSAGE_MAP(CDimensionDlg, CDialog) ON_BN_CLICKED(IDC_2DText, &CDimensionDlg::OnBnClicked2dText) ON_BN_CLICKED(IDC_3DText, &CDimensionDlg::OnBnClicked3dText) ON_BN_CLICKED(IDC_DimensionColor, &CDimensionDlg::OnBnClickedDimensionColor) + ON_WM_CLOSE() END_MESSAGE_MAP() //======================================================================= @@ -171,6 +173,8 @@ void CDimensionDlg::CreateLengthParamsTab() myLengthParams->InsertItem (1, &aTabItem); aTabItem.pszText = "Parallel edges"; myLengthParams->InsertItem (2, &aTabItem); + aTabItem.pszText = "Parallel faces"; + myLengthParams->InsertItem (3, &aTabItem); CLengthParamsEdgePage *aPage1 = new CLengthParamsEdgePage (myAISContext); aTabItem.mask = TCIF_PARAM; @@ -186,6 +190,7 @@ void CDimensionDlg::CreateLengthParamsTab() myLengthParams->SetItem (1, &aTabItem); VERIFY (aPage2->Create (CLengthParamsVerticesPage::IDD,myLengthParams)); aPage2->SetWindowPos (NULL,10,30,0,0,SWP_NOSIZE | SWP_NOZORDER); + aPage2->ShowWindow (SW_HIDE); CLengthParamsEdgesPage *aPage3 = new CLengthParamsEdgesPage (myAISContext); aTabItem.mask = TCIF_PARAM; @@ -193,6 +198,15 @@ void CDimensionDlg::CreateLengthParamsTab() myLengthParams->SetItem (2, &aTabItem); VERIFY (aPage3->Create (CLengthParamsEdgesPage::IDD,myLengthParams)); aPage3->SetWindowPos (NULL,10,30,0,0,SWP_NOSIZE | SWP_NOZORDER); + aPage3->ShowWindow (SW_HIDE); + + CParamsFacesPage *aPage4 = new CParamsFacesPage (myAISContext); + aTabItem.mask = TCIF_PARAM; + aTabItem.lParam = (LPARAM)aPage4; + myLengthParams->SetItem (3, &aTabItem); + VERIFY (aPage4->Create (CParamsFacesPage::IDD,myLengthParams)); + aPage4->SetWindowPos (NULL,10,30,0,0,SWP_NOSIZE | SWP_NOZORDER); + aPage4->ShowWindow (SW_HIDE); } //======================================================================= @@ -208,6 +222,8 @@ void CDimensionDlg::CreateAngleParamsTab() myAngleParams->InsertItem (0, &aTabItem); aTabItem.pszText = "Three vertices"; myAngleParams->InsertItem (1, &aTabItem); + aTabItem.pszText = "Two faces"; + myAngleParams->InsertItem (2, &aTabItem); CLengthParamsEdgesPage *aPage1 = new CLengthParamsEdgesPage (myAISContext, true); aTabItem.mask = TCIF_PARAM; @@ -223,6 +239,15 @@ void CDimensionDlg::CreateAngleParamsTab() myAngleParams->SetItem (1, &aTabItem); VERIFY (aPage2->Create (CAngleParamsVerticesPage::IDD,myAngleParams)); aPage2->SetWindowPos (NULL,10,30,0,0,SWP_NOSIZE | SWP_NOZORDER); + aPage2->ShowWindow (SW_HIDE); + + CParamsFacesPage *aPage3 = new CParamsFacesPage (myAISContext, true); + aTabItem.mask = TCIF_PARAM; + aTabItem.lParam = (LPARAM)aPage3; + myAngleParams->SetItem (2, &aTabItem); + VERIFY (aPage3->Create (CParamsFacesPage::IDD,myAngleParams)); + aPage3->SetWindowPos (NULL,10,30,0,0,SWP_NOSIZE | SWP_NOZORDER); + aPage3->ShowWindow (SW_HIDE); } //======================================================================= @@ -275,7 +300,22 @@ void CDimensionDlg::UpdateStandardModeForAngle() int aTabNum = ((CTabCtrl*) GetDlgItem (IDC_AngleTab))->GetCurSel(); myAISContext->CloseAllContexts(); myAISContext->OpenLocalContext(); - myAISContext->ActivateStandardMode (aTabNum == 1 ? TopAbs_VERTEX : TopAbs_EDGE); + TopAbs_ShapeEnum aMode; + + if (aTabNum == 1) + { + aMode = TopAbs_VERTEX; + } + else if (aTabNum == 2) + { + aMode = TopAbs_FACE; + } + else + { + aMode = TopAbs_EDGE; + } + + myAISContext->ActivateStandardMode (aMode); } //======================================================================= @@ -288,7 +328,21 @@ void CDimensionDlg::UpdateStandardModeForLength() int aTabNum = ((CTabCtrl*) GetDlgItem (IDC_LengthTab))->GetCurSel(); myAISContext->CloseAllContexts(); myAISContext->OpenLocalContext(); - myAISContext->ActivateStandardMode (aTabNum == 1 ? TopAbs_VERTEX : TopAbs_EDGE); + TopAbs_ShapeEnum aMode; + + if (aTabNum == 1) + { + aMode = TopAbs_VERTEX; + } + else if (aTabNum == 3) + { + aMode = TopAbs_FACE; + } + else + { + aMode = TopAbs_EDGE; + } + myAISContext->ActivateStandardMode (aMode); } //======================================================================= @@ -500,11 +554,12 @@ void CDimensionDlg::OnDestroy() { myAISContext->CloseAllContexts(); } - // Destroy length tab CWnd *aWnd; TC_ITEM anItem; anItem.mask = TCIF_PARAM; - for (int i = 2; i >= 0; --i) + + // Destroy length tab + for (int i = 3; i >= 0; --i) { ((CTabCtrl*) GetDlgItem (IDC_LengthTab))->GetItem (i, &anItem); ASSERT (anItem.lParam); @@ -513,7 +568,7 @@ void CDimensionDlg::OnDestroy() delete aWnd; } // Destroy angle tab - for (int i = 1; i >= 0; --i) + for (int i = 2; i >= 0; --i) { ((CTabCtrl*) GetDlgItem (IDC_AngleTab))->GetItem (i, &anItem); ASSERT(anItem.lParam); @@ -522,6 +577,20 @@ void CDimensionDlg::OnDestroy() delete aWnd; } + // Destroy radius tab + ((CTabCtrl*) GetDlgItem (IDC_RadiusTab))->GetItem (0, &anItem); + ASSERT(anItem.lParam); + aWnd = (CWnd*) anItem.lParam; + aWnd->DestroyWindow(); + delete aWnd; + + // Destroy diameter tab + ((CTabCtrl*) GetDlgItem (IDC_DiameterTab))->GetItem (0, &anItem); + ASSERT(anItem.lParam); + aWnd = (CWnd*) anItem.lParam; + aWnd->DestroyWindow(); + delete aWnd; + CDialog::OnDestroy(); } @@ -684,3 +753,12 @@ const Quantity_Color CDimensionDlg::GetDimensionColor() const { return myDimensionColor; } + +void CDimensionDlg::OnClose() +{ + if (myAISContext->HasOpenedContext()) + { + myAISContext->CloseAllContexts(); + } + CDialog::OnClose(); +} diff --git a/samples/mfc/standard/Common/DimensionDlg.h b/samples/mfc/standard/Common/DimensionDlg.h index 5a5e4796bf..2e01419a73 100644 --- a/samples/mfc/standard/Common/DimensionDlg.h +++ b/samples/mfc/standard/Common/DimensionDlg.h @@ -76,4 +76,5 @@ public: afx_msg void OnBnClicked2dText(); afx_msg void OnBnClicked3dText(); afx_msg void OnBnClickedDimensionColor(); + afx_msg void OnClose(); }; diff --git a/samples/mfc/standard/Common/LengthParamsEdgePage.cpp b/samples/mfc/standard/Common/LengthParamsEdgePage.cpp index 1fac26fa15..a29426c93d 100644 --- a/samples/mfc/standard/Common/LengthParamsEdgePage.cpp +++ b/samples/mfc/standard/Common/LengthParamsEdgePage.cpp @@ -96,8 +96,8 @@ void CLengthParamsEdgePage::OnBnClickedChooseEdgeBtn() anAspect->TextAspect()->SetHeight (aDimDlg->GetFontHeight()); anAspect->MakeTextShaded (aDimDlg->IsText3dShaded()); anAspect->SetCommonColor (aDimDlg->GetDimensionColor()); - aLenDim->MakeUnitsDisplayed (aDimDlg->IsUnitsDisplayed()); - if (aLenDim->IsUnitsDisplayed()) + aLenDim->DimensionAspect()->MakeUnitsDisplayed (aDimDlg->IsUnitsDisplayed()); + if (aDimDlg->IsUnitsDisplayed()) { aLenDim->SetDisplayUnits (aDimDlg->GetUnits()); } diff --git a/samples/mfc/standard/Common/LengthParamsEdgesPage.cpp b/samples/mfc/standard/Common/LengthParamsEdgesPage.cpp index 1c126b0adb..6865b042cf 100644 --- a/samples/mfc/standard/Common/LengthParamsEdgesPage.cpp +++ b/samples/mfc/standard/Common/LengthParamsEdgesPage.cpp @@ -127,13 +127,13 @@ void CLengthParamsEdgesPage::OnBnClickedEdge2Btn() // Build an angle dimension between two non-parallel edges Handle(AIS_AngleDimension) anAngleDim = new AIS_AngleDimension (myFirstEdge, mySecondEdge); anAngleDim->SetDimensionAspect (anAspect); - anAngleDim->MakeUnitsDisplayed (aDimDlg->IsUnitsDisplayed()); - if (anAngleDim->IsUnitsDisplayed()) + anAngleDim->DimensionAspect()->MakeUnitsDisplayed (aDimDlg->IsUnitsDisplayed()); + if (aDimDlg->IsUnitsDisplayed()) { anAngleDim->SetDisplayUnits (aDimDlg->GetUnits ()); - if ((anAngleDim->DisplayUnits().IsEqual (TCollection_AsciiString ("deg")))) + if ((anAngleDim->GetDisplayUnits().IsEqual (TCollection_AsciiString ("deg")))) { - anAngleDim->MakeUnitsDisplayed (Standard_False); + anAngleDim->DimensionAspect()->MakeUnitsDisplayed (Standard_False); } else { @@ -148,8 +148,8 @@ void CLengthParamsEdgesPage::OnBnClickedEdge2Btn() { Handle(AIS_LengthDimension) aLenDim = new AIS_LengthDimension (myFirstEdge, mySecondEdge, aPlane->Pln()); aLenDim->SetDimensionAspect (anAspect); - aLenDim->MakeUnitsDisplayed (aDimDlg->IsUnitsDisplayed()); - if (aLenDim->IsUnitsDisplayed()) + aLenDim->DimensionAspect()->MakeUnitsDisplayed (aDimDlg->IsUnitsDisplayed()); + if (aDimDlg->IsUnitsDisplayed()) { aLenDim->SetFlyout (aDimDlg->GetFlyout()); aLenDim->SetDisplayUnits (aDimDlg->GetUnits()); diff --git a/samples/mfc/standard/Common/LengthParamsVerticesPage.cpp b/samples/mfc/standard/Common/LengthParamsVerticesPage.cpp index ca51dd758a..2cea959a70 100644 --- a/samples/mfc/standard/Common/LengthParamsVerticesPage.cpp +++ b/samples/mfc/standard/Common/LengthParamsVerticesPage.cpp @@ -117,8 +117,8 @@ void CLengthParamsVerticesPage::OnBnClickedVertex2Btn() anAspect->MakeText3d (aDimDlg->GetTextType()); anAspect->TextAspect()->SetHeight (aDimDlg->GetFontHeight()); anAspect->MakeTextShaded (aDimDlg->IsText3dShaded()); - aLenDim->MakeUnitsDisplayed (aDimDlg->IsUnitsDisplayed()); - if (aLenDim->IsUnitsDisplayed ()) + aLenDim->DimensionAspect()->MakeUnitsDisplayed (aDimDlg->IsUnitsDisplayed()); + if (aDimDlg->IsUnitsDisplayed()) { aLenDim->SetDisplayUnits (aDimDlg->GetUnits ()); } diff --git a/samples/mfc/standard/Common/ParamsFacesPage.cpp b/samples/mfc/standard/Common/ParamsFacesPage.cpp new file mode 100644 index 0000000000..c22e582218 --- /dev/null +++ b/samples/mfc/standard/Common/ParamsFacesPage.cpp @@ -0,0 +1,120 @@ +// ParamsFacesPage.cpp : implementation file +// + +#include "stdafx.h" +#include "ParamsFacesPage.h" +#include "DimensionDlg.h" +#include +#include +#include +#include + +// CParamsFacesPage dialog + +IMPLEMENT_DYNAMIC(CParamsFacesPage, CDialog) + +CParamsFacesPage::CParamsFacesPage (Handle(AIS_InteractiveContext) theAISContext, + bool isAngleDimension /*= false*/, + CWnd* pParent /*=NULL*/) + : CDialog(CParamsFacesPage::IDD, pParent), + myAISContext (theAISContext), + myIsAngleDimension (isAngleDimension) +{ +} + +CParamsFacesPage::~CParamsFacesPage() +{ +} + +void CParamsFacesPage::DoDataExchange(CDataExchange* pDX) +{ + CDialog::DoDataExchange(pDX); +} + + +BEGIN_MESSAGE_MAP(CParamsFacesPage, CDialog) + ON_BN_CLICKED(IDC_FacesBtn1, &CParamsFacesPage::OnBnClickedFacesbtn1) + ON_BN_CLICKED(IDC_FacesBtn2, &CParamsFacesPage::OnBnClickedFacesbtn2) +END_MESSAGE_MAP() + + +// CParamsFacesPage message handlers + +void CParamsFacesPage::OnBnClickedFacesbtn1() +{ + // Check if face is selected + myAISContext->LocalContext()->InitSelected(); + if (!myAISContext->LocalContext()->MoreSelected()) + { + AfxMessageBox(_T("Choose the face and press the button again"), + MB_ICONINFORMATION | MB_OK); + return; + } + + myFirstFace = TopoDS::Face (myAISContext->LocalContext()->SelectedShape()); + myAISContext->LocalContext()->ClearSelected(); +} + +void CParamsFacesPage::OnBnClickedFacesbtn2() +{ + // Check if face is selected + myAISContext->LocalContext()->InitSelected(); + if (!myAISContext->LocalContext()->MoreSelected()) + { + AfxMessageBox(_T("Choose the face and press the button again"), + MB_ICONINFORMATION | MB_OK); + return; + } + + mySecondFace = TopoDS::Face (myAISContext->LocalContext()->SelectedShape()); + myAISContext->LocalContext()->ClearSelected(); + + CDimensionDlg *aDimDlg = (CDimensionDlg*)(GetParentOwner()); + + myAISContext->CloseAllContexts(); + + Handle(Prs3d_DimensionAspect) anAspect = new Prs3d_DimensionAspect(); + anAspect->MakeArrows3d (Standard_False); + anAspect->MakeText3d (aDimDlg->GetTextType()); + anAspect->TextAspect()->SetHeight (aDimDlg->GetFontHeight()); + anAspect->MakeTextShaded (aDimDlg->IsText3dShaded()); + anAspect->SetCommonColor (aDimDlg->GetDimensionColor()); + if (myIsAngleDimension) + { + // Build an angle dimension between two non-parallel edges + Handle(AIS_AngleDimension) anAngleDim = new AIS_AngleDimension (myFirstFace, mySecondFace); + anAngleDim->SetDimensionAspect (anAspect); + anAngleDim->DimensionAspect()->MakeUnitsDisplayed (aDimDlg->IsUnitsDisplayed()); + if (aDimDlg->IsUnitsDisplayed()) + { + anAngleDim->SetDisplayUnits (aDimDlg->GetUnits ()); + if ((anAngleDim->GetDisplayUnits().IsEqual (TCollection_AsciiString ("deg")))) + { + anAngleDim->DimensionAspect()->MakeUnitsDisplayed (Standard_False); + } + else + { + anAngleDim->SetDisplaySpecialSymbol (AIS_DSS_No); + } + } + + anAngleDim->SetFlyout (aDimDlg->GetFlyout()); + myAISContext->Display (anAngleDim); + } + else + { + Handle(AIS_LengthDimension) aLenDim = new AIS_LengthDimension (myFirstFace, mySecondFace); + aLenDim->SetDimensionAspect (anAspect); + aLenDim->DimensionAspect()->MakeUnitsDisplayed (aDimDlg->IsUnitsDisplayed()); + if (aLenDim->DimensionAspect()->IsUnitsDisplayed()) + { + aLenDim->SetFlyout (aDimDlg->GetFlyout()); + aLenDim->SetDisplayUnits (aDimDlg->GetUnits()); + } + + myAISContext->Display (aLenDim); + } + + myAISContext->OpenLocalContext(); + myAISContext->ActivateStandardMode (TopAbs_FACE); +} diff --git a/samples/mfc/standard/Common/ParamsFacesPage.h b/samples/mfc/standard/Common/ParamsFacesPage.h new file mode 100644 index 0000000000..0ce2282ed8 --- /dev/null +++ b/samples/mfc/standard/Common/ParamsFacesPage.h @@ -0,0 +1,31 @@ +#pragma once + +#include "res\OCC_Resource.h" +// CParamsFacesPage dialog + +class CParamsFacesPage : public CDialog +{ + DECLARE_DYNAMIC(CParamsFacesPage) +private: + Handle(AIS_InteractiveContext) myAISContext; + bool myIsAngleDimension; + TopoDS_Face myFirstFace; + TopoDS_Face mySecondFace; +public: + CParamsFacesPage (Handle(AIS_InteractiveContext) theAISContext, + bool isAngleDimension = false, + CWnd* pParent = NULL); // standard constructor + + virtual ~CParamsFacesPage(); + + // Dialog Data + enum { IDD = IDD_ParamsFacesPage }; + +protected: + virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support + + DECLARE_MESSAGE_MAP() +public: + afx_msg void OnBnClickedFacesbtn1(); + afx_msg void OnBnClickedFacesbtn2(); +}; diff --git a/samples/mfc/standard/Common/RadiusParamsPage.cpp b/samples/mfc/standard/Common/RadiusParamsPage.cpp index c810a164d1..d8b03f1c93 100644 --- a/samples/mfc/standard/Common/RadiusParamsPage.cpp +++ b/samples/mfc/standard/Common/RadiusParamsPage.cpp @@ -98,14 +98,12 @@ void CRadiusParamsPage::OnBnClickedObjectBtn() Handle(AIS_Dimension) aDim; if (myIsDiameterDimension) { - aDim = isAttachPoint ? new AIS_DiameterDimension (aCircle, ElCLib::Value ((aFirstPar + aLastPar) / 2.0, aCircle)) - : new AIS_DiameterDimension (aCircle); + aDim = new AIS_DiameterDimension (aCircle); Handle(AIS_DiameterDimension)::DownCast(aDim)->SetFlyout (aDimDlg->GetFlyout()); } else { - aDim = isAttachPoint ? new AIS_RadiusDimension (aCircle, ElCLib::Value ((aFirstPar + aLastPar) / 2.0, aCircle)) - : new AIS_RadiusDimension (aCircle); + aDim = new AIS_RadiusDimension (aCircle); Handle(AIS_RadiusDimension)::DownCast(aDim)->SetFlyout (aDimDlg->GetFlyout()); } @@ -115,8 +113,8 @@ void CRadiusParamsPage::OnBnClickedObjectBtn() anAspect->TextAspect()->SetHeight (aDimDlg->GetFontHeight()); anAspect->MakeTextShaded (aDimDlg->IsText3dShaded()); anAspect->SetCommonColor (aDimDlg->GetDimensionColor()); - aDim->MakeUnitsDisplayed (aDimDlg->IsUnitsDisplayed()); - if (aDim->IsUnitsDisplayed()) + aDim->DimensionAspect()->MakeUnitsDisplayed (aDimDlg->IsUnitsDisplayed()); + if (aDimDlg->IsUnitsDisplayed()) { aDim->SetDisplayUnits (aDimDlg->GetUnits()); } diff --git a/samples/mfc/standard/Common/res/OCC_Resource.h b/samples/mfc/standard/Common/res/OCC_Resource.h index 3e31ed78b0..3575ca33f9 100755 --- a/samples/mfc/standard/Common/res/OCC_Resource.h +++ b/samples/mfc/standard/Common/res/OCC_Resource.h @@ -2,6 +2,7 @@ // Microsoft Visual C++ generated include file. // Used by OCC_Resource.rc // +#define IDD_ParamsFacesPage 101 #define IDR_POPUP 116 #define IDD_Dimension 119 #define IDD_LengthParamsEdgePage 122 @@ -61,6 +62,10 @@ #define IDC_TextDisplayMode 1047 #define IDC_TextDisplayModeStatic 1048 #define IDC_DimensionColor 1049 +#define IDC_FacesSt1 1052 +#define IDC_FacesSt2 1053 +#define IDC_FacesBtn1 1054 +#define IDC_FacesBtn2 1055 #define ID_WINDOW_NEW3D 1151 #define ID_OBJECT_DISPLAYALL 1201 #define ID_OBJECT_MATERIAL 1205 @@ -176,7 +181,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 131 #define _APS_NEXT_COMMAND_VALUE 40038 -#define _APS_NEXT_CONTROL_VALUE 1052 +#define _APS_NEXT_CONTROL_VALUE 1055 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif diff --git a/samples/mfc/standard/Common/res/OCC_Resource.rc b/samples/mfc/standard/Common/res/OCC_Resource.rc index 3cb627ebbe..f138f535f9 100755 --- a/samples/mfc/standard/Common/res/OCC_Resource.rc +++ b/samples/mfc/standard/Common/res/OCC_Resource.rc @@ -281,6 +281,16 @@ BEGIN CONTROL "",IDC_Flyout,"msctls_trackbar32",TBS_TOP | TBS_TOOLTIPS | WS_TABSTOP,73,112,100,20 END +IDD_ParamsFacesPage DIALOGEX 0, 0, 134, 73 +STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + LTEXT "Face1",IDC_FacesSt1,18,14,20,8 + LTEXT "Face2",IDC_FacesSt2,18,35,20,8 + PUSHBUTTON "Click to set up selected face",IDC_FacesBtn1,63,7,52,24,BS_MULTILINE + PUSHBUTTON "Click to set up selected face",IDC_FacesBtn2,64,39,51,24,BS_MULTILINE +END + ///////////////////////////////////////////////////////////////////////////// // @@ -475,6 +485,14 @@ BEGIN BOTTOMMARGIN, 336 HORZGUIDE, 336 END + + IDD_ParamsFacesPage, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 127 + TOPMARGIN, 7 + BOTTOMMARGIN, 66 + END END #endif // APSTUDIO_INVOKED diff --git a/samples/mfc/standard/mfcsample/adm/win/vc10/mfcsample.vcxproj b/samples/mfc/standard/mfcsample/adm/win/vc10/mfcsample.vcxproj index 853b50358d..2d7a9270c2 100644 --- a/samples/mfc/standard/mfcsample/adm/win/vc10/mfcsample.vcxproj +++ b/samples/mfc/standard/mfcsample/adm/win/vc10/mfcsample.vcxproj @@ -296,6 +296,7 @@ + Disabled %(AdditionalIncludeDirectories) @@ -739,6 +740,7 @@ + diff --git a/samples/mfc/standard/mfcsample/adm/win/vc10/mfcsample.vcxproj.filters b/samples/mfc/standard/mfcsample/adm/win/vc10/mfcsample.vcxproj.filters index 2163d8af40..65bb538630 100644 --- a/samples/mfc/standard/mfcsample/adm/win/vc10/mfcsample.vcxproj.filters +++ b/samples/mfc/standard/mfcsample/adm/win/vc10/mfcsample.vcxproj.filters @@ -138,6 +138,9 @@ Source Files + + Source Files + @@ -247,6 +250,9 @@ Header Files + + Header Files + diff --git a/samples/mfc/standard/mfcsample/adm/win/vc11/mfcsample.vcxproj b/samples/mfc/standard/mfcsample/adm/win/vc11/mfcsample.vcxproj index f6c613fd91..5e3ab7c8a0 100644 --- a/samples/mfc/standard/mfcsample/adm/win/vc11/mfcsample.vcxproj +++ b/samples/mfc/standard/mfcsample/adm/win/vc11/mfcsample.vcxproj @@ -300,6 +300,7 @@ + Disabled %(AdditionalIncludeDirectories) @@ -743,6 +744,7 @@ + diff --git a/samples/mfc/standard/mfcsample/adm/win/vc11/mfcsample.vcxproj.filters b/samples/mfc/standard/mfcsample/adm/win/vc11/mfcsample.vcxproj.filters index 2163d8af40..65bb538630 100644 --- a/samples/mfc/standard/mfcsample/adm/win/vc11/mfcsample.vcxproj.filters +++ b/samples/mfc/standard/mfcsample/adm/win/vc11/mfcsample.vcxproj.filters @@ -138,6 +138,9 @@ Source Files + + Source Files + @@ -247,6 +250,9 @@ Header Files + + Header Files + diff --git a/samples/mfc/standard/mfcsample/adm/win/vc8/mfcsample.vcproj b/samples/mfc/standard/mfcsample/adm/win/vc8/mfcsample.vcproj index 0731b3c9fe..b4c98d263c 100644 --- a/samples/mfc/standard/mfcsample/adm/win/vc8/mfcsample.vcproj +++ b/samples/mfc/standard/mfcsample/adm/win/vc8/mfcsample.vcproj @@ -1172,6 +1172,10 @@ RelativePath="..\..\..\..\Common\RadiusParamsPage.cpp" > + + @@ -1839,6 +1843,10 @@ RelativePath="..\..\..\..\Common\RadiusParamsPage.h" > + + diff --git a/samples/mfc/standard/mfcsample/adm/win/vc9/mfcsample.vcproj b/samples/mfc/standard/mfcsample/adm/win/vc9/mfcsample.vcproj index 52bae8826a..344cc6ae56 100644 --- a/samples/mfc/standard/mfcsample/adm/win/vc9/mfcsample.vcproj +++ b/samples/mfc/standard/mfcsample/adm/win/vc9/mfcsample.vcproj @@ -465,6 +465,10 @@ RelativePath="..\..\..\..\Common\AngleParamsVerticesPage.cpp" > + + @@ -1772,6 +1776,10 @@ RelativePath="..\..\..\..\Common\LengthParamsEdgePage.h" > + + diff --git a/src/AIS/AIS.cdl b/src/AIS/AIS.cdl index 31bfd964a5..1fc8025053 100755 --- a/src/AIS/AIS.cdl +++ b/src/AIS/AIS.cdl @@ -464,29 +464,56 @@ is ---Purpose: -- Returns the nearest point in a shape. This is used by -- several classes in calculation of dimensions. - + + Nearest (theLine : Lin from gp; + thePoint : Pnt from gp) + returns Pnt from gp; + ---Purpose: + -- @return the nearest point on the line. + + Nearest (theCurve : Curve from Geom; + thePoint : Pnt from gp; + theFirstPoint : Pnt from gp; + theLastPoint : Pnt from gp; + theNearestPoint : out Pnt from gp) + returns Boolean from Standard; + ---Purpose: + -- For the given point finds nearest point on the curve, + -- @return TRUE if found point is belongs to the curve + -- and FALSE otherwise. + Farest( aShape : Shape from TopoDS; aPoint : Pnt from gp ) returns Pnt from gp; - ComputeGeometry(anEdge : Edge from TopoDS; - aCurve : out Curve from Geom; - FirstPnt : out Pnt from gp; - LastPnt : out Pnt from gp) + ComputeGeometry (theEdge : Edge from TopoDS; + theCurve : out Curve from Geom; + theFirstPnt : out Pnt from gp; + theLastPnt : out Pnt from gp) ---Purpose: Used by 2d Relation only -- Computes the 3d geometry of in the current WorkingPlane -- and the extremities if any - -- Return TRUE if ok + -- Return TRUE if ok. returns Boolean from Standard; - - ComputeGeometry(anEdge : Edge from TopoDS; - aCurve : out Curve from Geom; - FirstPnt : out Pnt from gp; - LastPnt : out Pnt from gp; - extCurve : out Curve from Geom; - isinfinite: out Boolean from Standard; - isOnPlane : out Boolean from Standard; - aPlane : Plane from Geom) + + ComputeGeometry (theEdge : Edge from TopoDS; + theCurve : out Curve from Geom; + theFirstPnt : out Pnt from gp; + theLastPnt : out Pnt from gp; + theIsInfinite : out Boolean from Standard) + ---Purpose: Used by dimensions only. + -- Computes the 3d geometry of . + -- Return TRUE if ok. + returns Boolean from Standard; + + ComputeGeometry (theEdge : Edge from TopoDS; + theCurve : out Curve from Geom; + theFirstPnt : out Pnt from gp; + theLastPnt : out Pnt from gp; + theExtCurve : out Curve from Geom; + theIsInfinite : out Boolean from Standard; + theIsOnPlane : out Boolean from Standard; + thePlane : Plane from Geom) ---Purpose: Used by 2d Relation only -- Computes the 3d geometry of in the current WorkingPlane -- and the extremities if any. @@ -494,39 +521,51 @@ is -- the not projected curve associated to . -- If is infinite, = true and the 2 -- parameters and have no signification. - -- Return TRUE if ok + -- Return TRUE if ok. returns Boolean from Standard; - - ComputeGeometry (anEdge1 : Edge from TopoDS; - anEdge2 : Edge from TopoDS; - aCurve1 : out Curve from Geom; - aCurve2 : out Curve from Geom; - FirstPnt1 : out Pnt from gp; - LastPnt1 : out Pnt from gp; - FirstPnt2 : out Pnt from gp; - LastPnt2 : out Pnt from gp; - aPlane : Plane from Geom) + + ComputeGeometry (theFirstEdge : Edge from TopoDS; + theSecondEdge : Edge from TopoDS; + theFirstCurve : out Curve from Geom; + theSecondCurve : out Curve from Geom; + theFirstPnt1 : out Pnt from gp; + theLastPnt1 : out Pnt from gp; + theFirstPnt2 : out Pnt from gp; + theLastPnt2 : out Pnt from gp; + thePlane : Plane from Geom) ---Purpose: Used by 2d Relation only -- Computes the 3d geometry of in the current WorkingPlane -- and the extremities if any - -- Return TRUE if ok + -- Return TRUE if ok. returns Boolean from Standard; + ComputeGeometry (theFirstEdge : Edge from TopoDS; + theSecondEdge : Edge from TopoDS; + theFirstCurve : out Curve from Geom; + theSecondCurve : out Curve from Geom; + theFirstPnt1 : out Pnt from gp; + theLastPnt1 : out Pnt from gp; + theFirstPnt2 : out Pnt from gp; + theLastPnt2 : out Pnt from gp; + theIsinfinite1 : out Boolean from Standard; + theIsinfinite2 : out Boolean from Standard) + ---Purpose: Used by dimensions only.Computes the 3d geometry + -- of and and checks if they are infinite. + returns Boolean from Standard; - ComputeGeometry (anEdge1 : Edge from TopoDS; - anEdge2 : Edge from TopoDS; - indexExt : out Integer from Standard; - aCurve1 : out Curve from Geom; - aCurve2 : out Curve from Geom; - FirstPnt1 : out Pnt from gp; - LastPnt1 : out Pnt from gp; - FirstPnt2 : out Pnt from gp; - LastPnt2 : out Pnt from gp; - ExtCurve : out Curve from Geom; - isinfinite1 : out Boolean from Standard; - isinfinite2 : out Boolean from Standard; - aPlane : Plane from Geom) - + ComputeGeometry (theFirstEdge : Edge from TopoDS; + theSecondEdge : Edge from TopoDS; + theExtIndex : out Integer from Standard; + theFirstCurve : out Curve from Geom; + theSecondCurve : out Curve from Geom; + theFirstPnt1 : out Pnt from gp; + theLastPnt1 : out Pnt from gp; + theFirstPnt2 : out Pnt from gp; + theLastPnt2 : out Pnt from gp; + theExtCurve : out Curve from Geom; + theIsinfinite1 : out Boolean from Standard; + theIsinfinite2 : out Boolean from Standard; + thePlane : Plane from Geom) ---Purpose: Used by 2d Relation only Computes the 3d geometry -- of and in the current Plane and the -- extremities if any. Return in ExtCurve the 3d curve @@ -538,102 +577,78 @@ is -- significant. Return TRUE if ok returns Boolean from Standard; - ComputeGeomCurve (aCurve : in out Curve from Geom; - first1 : Real from Standard; - last1 : Real from Standard; - FirstPnt1 : out Pnt from gp; - LastPnt1 : out Pnt from gp; - aPlane : Plane from Geom; - isOnPlane: out Boolean from Standard) - + ComputeGeomCurve (aCurve : in out Curve from Geom; + first1 : Real from Standard; + last1 : Real from Standard; + FirstPnt1 : out Pnt from gp; + LastPnt1 : out Pnt from gp; + aPlane : Plane from Geom; + isOnPlane: out Boolean from Standard) ---Purpose: Checks if aCurve belongs to aPlane; if not, projects aCurve in aPlane -- and returns aCurve; -- Return TRUE if ok returns Boolean from Standard; - ComputeGeometry(aVertex : Vertex from TopoDS; - point : out Pnt from gp; - aPlane : Plane from Geom; - isOnPlane: out Boolean from Standard) + ComputeGeometry (aVertex : Vertex from TopoDS; + point : out Pnt from gp; + aPlane : Plane from Geom; + isOnPlane: out Boolean from Standard) returns Boolean from Standard; - - GetPlaneFromFace( aFace : Face from TopoDS; - aPlane : out Pln from gp; - aSurf : out Surface from Geom; - aSurfType : out KindOfSurface from AIS; - Offset : out Real from Standard ) + GetPlaneFromFace (aFace : Face from TopoDS; + aPlane : out Pln from gp; + aSurf : out Surface from Geom; + aSurfType : out KindOfSurface from AIS; + Offset : out Real from Standard) returns Boolean from Standard; ---Purpose: Tryes to get Plane from Face. Returns Surface of Face -- in aSurf. Returns Standard_True and Plane of Face in -- aPlane in following cases: -- Face is Plane, Offset of Plane, -- Extrusion of Line and Offset of Extrusion of Line - -- Returns pure type of Surface which can be: - -- Plane, Cylinder, Cone, Sphere, Torus, - -- SurfaceOfRevolution, SurfaceOfExtrusion + -- Returns pure type of Surface which can be: + -- Plane, Cylinder, Cone, Sphere, Torus, + -- SurfaceOfRevolution, SurfaceOfExtrusion - InitFaceLength( aFace : Face from TopoDS; - aPlane : out Pln from gp; - aSurface : out Surface from Geom; - aSurfaceType : out KindOfSurface from AIS; - anOffset : out Real from Standard ); - - ComputeLengthBetweenPlanarFaces( FirstFace : Face from TopoDS; - SecondFace : Face from TopoDS; - Plane1 : Pln from gp; - Plane2 : Pln from gp; - Value : out Real from Standard; - FirstAttach : out Pnt from gp ; - SecondAttach : out Pnt from gp ; - DirAttach : out Dir from gp ; - AutomaticPos : Boolean from Standard; - Position : in out Pnt from gp); - - ComputeLengthBetweenCurvilinearFaces( FirstFace : Face from TopoDS; - SecondFace : Face from TopoDS; - FirstSurf : in out Surface from Geom; - SecondSurf : in out Surface from Geom; - AutomaticPos : Boolean from Standard; - Value : out Real from Standard; - Position : out Pnt from gp; - FirstAttach : out Pnt from gp; - SecondAttach : out Pnt from gp; - DirAttach : out Dir from gp ); - - ComputeAngleBetweenPlanarFaces( FirstFace : Face from TopoDS; - SecondFace : Face from TopoDS; - Surf2 : Surface from Geom; - Axis : Ax1 from gp; - Value : Real from Standard; - AutomaticPos : Boolean from Standard; - Position : out Pnt from gp; - Center : out Pnt from gp; - FirstAttach : out Pnt from gp; - SecondAttach : out Pnt from gp; - FirstDir : out Dir from gp; - SecondDir : out Dir from gp); - ---Purpose: Computes geometric parameters for planar faces for - -- Angular dimensions - - ComputeAngleBetweenCurvilinearFaces( FirstFace : Face from TopoDS; - SecondFace : Face from TopoDS; - FirstSurf : Surface from Geom; - SecondSurf : Surface from Geom; - FirstSurfType : KindOfSurface from AIS; - SecondSurfType : KindOfSurface from AIS; - Axis : Ax1 from gp; - Value : Real from Standard; - AutomaticPos : Boolean from Standard; - Position : out Pnt from gp; - Center : out Pnt from gp; - FirstAttach : out Pnt from gp; - SecondAttach : out Pnt from gp; - FirstDir : out Dir from gp; - SecondDir : out Dir from gp; - Plane : out Plane from Geom ); - ---Purpose: Computes geometric parameters for curvilinear faces for - -- Angular dimensions + InitFaceLength (aFace : Face from TopoDS; + aPlane : out Pln from gp; + aSurface : out Surface from Geom; + aSurfaceType : out KindOfSurface from AIS; + anOffset : out Real from Standard ); + + InitLengthBetweenCurvilinearFaces (theFirstFace : Face from TopoDS; + theSecondFace : Face from TopoDS; + theFirstSurf : in out Surface from Geom; + theSecondSurf : in out Surface from Geom; + theFirstAttach : out Pnt from gp; + theSecondAttach : out Pnt from gp; + theDirOnPlane : out Dir from gp); + ---Purpose: Finds attachment points on two curvilinear faces for length dimension. + -- @param thePlaneDir [in] the direction on the dimension plane to + -- compute the plane automatically. It will not be taken into account if + -- plane is defined by user. + + InitAngleBetweenPlanarFaces (theFirstFace : Face from TopoDS; + theSecondFace : Face from TopoDS; + theCenter : out Pnt from gp; + theFirstAttach : out Pnt from gp; + theSecondAttach : out Pnt from gp; + theIsFirstPointSet : Boolean from Standard = Standard_False) + returns Boolean from Standard; + ---Purpose: Finds three points for the angle dimension between + -- two planes. + + InitAngleBetweenCurvilinearFaces (theFirstFace : Face from TopoDS; + theSecondFace : Face from TopoDS; + theFirstSurfType : KindOfSurface from AIS; + theSecondSurfType : KindOfSurface from AIS; + theCenter : out Pnt from gp; + theFirstAttach : out Pnt from gp; + theSecondAttach : out Pnt from gp; + theIsFirstPointSet : Boolean from Standard = Standard_False) + returns Boolean from Standard; + ---Purpose: Finds three points for the angle dimension between + -- two curvilinear surfaces. ProjectPointOnPlane( aPoint : Pnt from gp; aPlane : Pln from gp ) returns Pnt from gp; diff --git a/src/AIS/AIS.cxx b/src/AIS/AIS.cxx index 68b04f44c6..ee8186d67a 100755 --- a/src/AIS/AIS.cxx +++ b/src/AIS/AIS.cxx @@ -32,14 +32,19 @@ #include #include #include +#include #include #include #include #include +#include +#include #include #include +#include +#include #include #include #include @@ -58,6 +63,15 @@ #include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include @@ -69,16 +83,6 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include const Standard_Real SquareTolerance = Precision::SquareConfusion(); @@ -86,7 +90,6 @@ const Standard_Real SquareTolerance = Precision::SquareConfusion(); //function : Nearest //purpose : //======================================================================= - gp_Pnt AIS::Nearest(const TopoDS_Shape& ashape, const gp_Pnt& apoint) { Standard_Real dist2 = RealLast(); @@ -108,11 +111,48 @@ gp_Pnt AIS::Nearest(const TopoDS_Shape& ashape, const gp_Pnt& apoint) return result; } +//======================================================================= +//function : Nearest +//purpose : For finds the nearest point on . +//======================================================================= +gp_Pnt AIS::Nearest (const gp_Lin& theLine, const gp_Pnt& thePoint) +{ + Handle(Geom_Line) aLine = new Geom_Line (theLine); + + GeomAPI_ProjectPointOnCurve aPointProj (thePoint, aLine); + return aPointProj.Point (1); +} + +//======================================================================= +//function : Nearest +//purpose : For the given point finds nearest point on the curve, +// return TRUE if found point is belongs to curve +// and FALSE otherwise. +//======================================================================= +Standard_Boolean AIS::Nearest (const Handle(Geom_Curve)& theCurve, + const gp_Pnt& thePoint, + const gp_Pnt& theFirstPoint, + const gp_Pnt& theLastPoint, + gp_Pnt& theNearestPoint) +{ + GeomAPI_ProjectPointOnCurve aPointProj (thePoint, theCurve); + theNearestPoint = theCurve->Value (aPointProj.LowerDistanceParameter()); + + Standard_Real aLength = theFirstPoint.Distance (theLastPoint); + + if (theNearestPoint.Distance (theFirstPoint) > aLength + || theNearestPoint.Distance (theLastPoint) >aLength) + { + return Standard_False; + } + + return Standard_True; +} + //======================================================================= //function : Farest //purpose : //======================================================================= - gp_Pnt AIS::Farest( const TopoDS_Shape& aShape, const gp_Pnt& aPoint ) { Standard_Real MaxDist2 = 0.0e0, curdist2; @@ -135,56 +175,102 @@ gp_Pnt AIS::Farest( const TopoDS_Shape& aShape, const gp_Pnt& aPoint ) //======================================================================= //function : ComputeGeometry -//purpose : for line, circle, ellipse +//purpose : for line, circle, ellipse. //======================================================================= - -Standard_Boolean AIS::ComputeGeometry(const TopoDS_Edge& anEdge, - Handle(Geom_Curve)& aCurve, - gp_Pnt& FirstPnt, - gp_Pnt& LastPnt) +Standard_Boolean AIS::ComputeGeometry (const TopoDS_Edge& theEdge, + Handle(Geom_Curve)& theCurve, + gp_Pnt& theFirstPnt, + gp_Pnt& theLastPnt) { - TopLoc_Location loc_edge; - Standard_Real first,last; - aCurve = BRep_Tool::Curve(anEdge,loc_edge,first,last); - if (aCurve.IsNull()) return Standard_False; - if (!loc_edge.IsIdentity()) { -//#ifndef DEB - Handle(Geom_Geometry) aGeomGeometry = aCurve->Transformed(loc_edge.Transformation()); - aCurve = (Handle(Geom_Curve)&) aGeomGeometry ; -//#else -// aCurve = (Handle(Geom_Curve)&) aCurve->Transformed(loc_edge.Transformation()); -//#endif - } - if (aCurve->IsInstance(STANDARD_TYPE(Geom_TrimmedCurve))) { - aCurve = ((Handle(Geom_TrimmedCurve)&) aCurve)->BasisCurve(); + TopLoc_Location anEdgeLoc; + Standard_Real aFirst, aLast; + theCurve = BRep_Tool::Curve (theEdge, anEdgeLoc, aFirst, aLast); + if (theCurve.IsNull()) + { + return Standard_False; } - if (aCurve->IsInstance(STANDARD_TYPE(Geom_Line))) { - // CLE - // const Handle(Geom_Line)& line = (Handle(Geom_Line)&) aCurve; - Handle(Geom_Line) line = (Handle(Geom_Line)&) aCurve; - // ENDCLE + if (!anEdgeLoc.IsIdentity()) + { + Handle(Geom_Geometry) aGeometry = theCurve->Transformed (anEdgeLoc.Transformation()); + theCurve = (Handle(Geom_Curve)&) aGeometry; + } - FirstPnt = ElCLib::Value(first,line->Lin()); - LastPnt = ElCLib::Value(last,line->Lin()); + if (theCurve->IsInstance (STANDARD_TYPE (Geom_TrimmedCurve))) + { + theCurve = ((Handle(Geom_TrimmedCurve)&) theCurve)->BasisCurve(); } - else if (aCurve->IsInstance(STANDARD_TYPE(Geom_Circle))) { - // CLE - // const Handle(Geom_Circle)& circ = (Handle(Geom_Circle)&) aCurve; - Handle(Geom_Circle) circ = (Handle(Geom_Circle)&) aCurve; - // ENDCLE - FirstPnt = ElCLib::Value(first,circ->Circ()); - LastPnt = ElCLib::Value(last,circ->Circ()); + + if (theCurve->IsInstance (STANDARD_TYPE (Geom_Line))) + { + Handle(Geom_Line) aLine = (Handle(Geom_Line)&) theCurve; + theFirstPnt = ElCLib::Value (aFirst, aLine->Lin()); + theLastPnt = ElCLib::Value (aLast, aLine->Lin()); } - else if (aCurve->IsInstance(STANDARD_TYPE(Geom_Ellipse))) { - // CLE - // const Handle(Geom_Ellipse)& elips = (Handle(Geom_Ellipse)&) aCurve; - Handle(Geom_Ellipse) elips = (Handle(Geom_Ellipse)&) aCurve; - // ENDCLE - FirstPnt = ElCLib::Value(first, elips->Elips()); - LastPnt = ElCLib::Value(last, elips->Elips()); + else if (theCurve->IsInstance (STANDARD_TYPE (Geom_Circle))) + { + Handle(Geom_Circle) aCirc = (Handle(Geom_Circle)&) theCurve; + + theFirstPnt = ElCLib::Value (aFirst, aCirc->Circ()); + theLastPnt = ElCLib::Value (aLast, aCirc->Circ()); } - else return Standard_False; + else if (theCurve->IsInstance (STANDARD_TYPE (Geom_Ellipse))) + { + Handle(Geom_Ellipse) anEllipse = (Handle(Geom_Ellipse)&) theCurve; + theFirstPnt = ElCLib::Value (aFirst, anEllipse->Elips()); + theLastPnt = ElCLib::Value (aLast, anEllipse->Elips()); + } + else + { + return Standard_False; + } + + return Standard_True; +} + +//======================================================================= +//function : ComputeGeometry +//purpose : for line, circle, ellipse. +//======================================================================= +Standard_Boolean AIS::ComputeGeometry (const TopoDS_Edge& theEdge, + Handle(Geom_Curve)& theCurve, + gp_Pnt& theFirstPnt, + gp_Pnt& theLastPnt, + Standard_Boolean& theIsInfinite) +{ + Standard_Real aFirst, aLast; + + BRepAdaptor_Curve anAdaptor (theEdge); + + theCurve = Handle(Geom_Curve)::DownCast + (anAdaptor.Curve().Curve()->Transformed (anAdaptor.Trsf())); + + if (theCurve.IsNull()) + { + return Standard_False; + } + + aFirst = anAdaptor.FirstParameter(); + aLast = anAdaptor.LastParameter(); + + theIsInfinite = (Precision::IsInfinite (aFirst) || Precision::IsInfinite (aLast)); + + if (theCurve->IsInstance (STANDARD_TYPE (Geom_TrimmedCurve))) + { + theCurve = ((Handle(Geom_TrimmedCurve)&) theCurve)->BasisCurve(); + } + + if (!theIsInfinite) + { + theFirstPnt = theCurve->Value (aFirst); + theLastPnt = theCurve->Value (aLast); + } + else + { + theFirstPnt = gp::Origin(); + theLastPnt = gp::Origin(); + } + return Standard_True; } @@ -193,89 +279,95 @@ Standard_Boolean AIS::ComputeGeometry(const TopoDS_Edge& anEdge, //purpose : //======================================================================= -Standard_Boolean AIS::ComputeGeometry(const TopoDS_Edge& anEdge, - Handle(Geom_Curve)& aCurve, - gp_Pnt& FirstPnt, - gp_Pnt& LastPnt, - Handle(Geom_Curve)& extCurve, - Standard_Boolean& isInfinite, - Standard_Boolean& isOnPlane, - const Handle(Geom_Plane)& aPlane) +Standard_Boolean AIS::ComputeGeometry (const TopoDS_Edge& theEdge, + Handle(Geom_Curve)& theCurve, + gp_Pnt& theFirstPnt, + gp_Pnt& theLastPnt, + Handle(Geom_Curve)& theExtCurve, + Standard_Boolean& theIsInfinite, + Standard_Boolean& theIsOnPlane, + const Handle(Geom_Plane)& thePlane) { - if (aPlane.IsNull()) return Standard_False; - - Standard_Real first,last; - BRepAdaptor_Curve brepCurv(anEdge); - aCurve = Handle(Geom_Curve)::DownCast(brepCurv.Curve().Curve()->Transformed(brepCurv.Trsf())); - first = brepCurv.FirstParameter(); - last = brepCurv.LastParameter(); - - if (aCurve.IsNull()) return Standard_False; - - extCurve = aCurve; - isInfinite = (Precision::IsInfinite(first) || Precision::IsInfinite(last)); - - // Checks that the projcurve is not in the plane - isOnPlane = Standard_True; - if (extCurve->IsInstance(STANDARD_TYPE(Geom_TrimmedCurve))) { - extCurve = ((Handle(Geom_TrimmedCurve)&) extCurve)->BasisCurve(); + if (thePlane.IsNull()) + { + return Standard_False; } - if ( extCurve->IsInstance(STANDARD_TYPE(Geom_Line)) ) { - // CLE - // const Handle(Geom_Line) & gl = (Handle(Geom_Line)&) extCurve; - Handle(Geom_Line) gl = (Handle(Geom_Line)&) extCurve; - // ENDCLE - isOnPlane = aPlane->Pln().Contains( gl->Lin(), Precision::Confusion(), Precision::Angular() ); - } - else if (extCurve->IsInstance(STANDARD_TYPE(Geom_Circle)) ) { - // CLE - // const Handle(Geom_Circle) & gc = (Handle(Geom_Circle)&) extCurve; - Handle(Geom_Circle) gc = (Handle(Geom_Circle)&) extCurve; - // ENDCLE - gp_Ax3 ax(gc->Position()); - isOnPlane = ax.IsCoplanar(aPlane->Pln().Position(), - Precision::Confusion(), - Precision::Angular()); - } - if ( isOnPlane ) { - extCurve.Nullify(); + Standard_Real aFirst, aLast; + BRepAdaptor_Curve aCurveAdaptor (theEdge); + theCurve = Handle(Geom_Curve)::DownCast (aCurveAdaptor.Curve().Curve()->Transformed (aCurveAdaptor.Trsf())); + aFirst = aCurveAdaptor.FirstParameter(); + aLast = aCurveAdaptor.LastParameter(); + + if (theCurve.IsNull()) + { + return Standard_False; } -//#ifndef DEB - Handle(Geom_Curve) aGeomCurve = GeomProjLib::ProjectOnPlane(aCurve,aPlane,aPlane->Pln().Axis().Direction(),Standard_False); - aCurve = aGeomCurve ; -//#else -// aCurve = (Handle(Geom_Curve)&) GeomProjLib::ProjectOnPlane(aCurve,aPlane,aPlane->Pln().Axis().Direction(),Standard_False); -//#endif - - if (aCurve->IsInstance(STANDARD_TYPE(Geom_Line))) { - // CLE - // const Handle(Geom_Line)& line = (Handle(Geom_Line)&) aCurve; - Handle(Geom_Line) line = (Handle(Geom_Line)&) aCurve; - // EDNCLE - if (!isInfinite) { - FirstPnt = ElCLib::Value(first,line->Lin()); - LastPnt = ElCLib::Value(last,line->Lin()); - } + theExtCurve = theCurve; + theIsInfinite = (Precision::IsInfinite (aFirst) || Precision::IsInfinite (aLast)); + + // Checks that the projected curve is not in the plane. + theIsOnPlane = Standard_True; + if (theExtCurve->IsInstance (STANDARD_TYPE (Geom_TrimmedCurve))) + { + theExtCurve = ((Handle(Geom_TrimmedCurve)&) theExtCurve)->BasisCurve(); } - else if (aCurve->IsInstance(STANDARD_TYPE(Geom_Circle))) { - // CLE - // const Handle(Geom_Circle)& circ = (Handle(Geom_Circle)&) aCurve; - Handle(Geom_Circle) circ = (Handle(Geom_Circle)&) aCurve; - // ENDCLE - FirstPnt = ElCLib::Value(first,circ->Circ()); - LastPnt = ElCLib::Value(last,circ->Circ()); + + if (theExtCurve->IsInstance (STANDARD_TYPE (Geom_Line))) + { + Handle(Geom_Line) aLine = (Handle(Geom_Line)&) theExtCurve; + theIsOnPlane = thePlane->Pln().Contains (aLine->Lin(), + Precision::Confusion(), + Precision::Angular()); } - // jfa 10/10/2000 - else if (aCurve->IsInstance(STANDARD_TYPE(Geom_Ellipse))) + else if (theExtCurve->IsInstance (STANDARD_TYPE (Geom_Circle))) + { + Handle(Geom_Circle) aCircle = (Handle(Geom_Circle)&) theExtCurve; + + gp_Ax3 aCircPos (aCircle->Position()); + theIsOnPlane = aCircPos.IsCoplanar (thePlane->Pln().Position(), + Precision::Confusion(), + Precision::Angular()); + } + + if (theIsOnPlane) + { + theExtCurve.Nullify(); + } + + theCurve = GeomProjLib::ProjectOnPlane (theCurve, thePlane, + thePlane->Pln().Axis().Direction(), + Standard_False); + + if (theCurve->IsInstance (STANDARD_TYPE (Geom_Line))) + { + Handle(Geom_Line) aLine = (Handle(Geom_Line)&) theCurve; + if (!theIsInfinite) { - Handle(Geom_Ellipse) ell = (Handle(Geom_Ellipse)&) aCurve; - FirstPnt = ElCLib::Value(first,ell->Elips()); - LastPnt = ElCLib::Value(last,ell->Elips()); + theFirstPnt = ElCLib::Value (aFirst, aLine->Lin()); + theLastPnt = ElCLib::Value (aLast, aLine->Lin()); } - // jfa 10/10/2000 end - else return Standard_False; + } + else if (theCurve->IsInstance (STANDARD_TYPE (Geom_Circle))) + { + Handle(Geom_Circle) aCirc = (Handle(Geom_Circle)&) theCurve; + + theFirstPnt = ElCLib::Value (aFirst, aCirc->Circ()); + theLastPnt = ElCLib::Value (aLast, aCirc->Circ()); + } + else if (theCurve->IsInstance (STANDARD_TYPE (Geom_Ellipse))) + { + Handle(Geom_Ellipse) anEllipse = (Handle(Geom_Ellipse)&) theCurve; + + theFirstPnt = ElCLib::Value (aFirst, anEllipse->Elips()); + theLastPnt = ElCLib::Value (aLast, anEllipse->Elips()); + } + else + { + return Standard_False; + } + return Standard_True; } @@ -283,104 +375,183 @@ Standard_Boolean AIS::ComputeGeometry(const TopoDS_Edge& anEdge, //function : ComputeGeometry //purpose : //======================================================================= - -Standard_Boolean AIS::ComputeGeometry(const TopoDS_Edge& anEdge1, - const TopoDS_Edge& anEdge2, - Handle(Geom_Curve)& aCurve1, - Handle(Geom_Curve)& aCurve2, - gp_Pnt& FirstPnt1, - gp_Pnt& LastPnt1, - gp_Pnt& FirstPnt2, - gp_Pnt& LastPnt2, - const Handle(Geom_Plane)& aPlane) +Standard_Boolean AIS::ComputeGeometry (const TopoDS_Edge& theFirstEdge, + const TopoDS_Edge& theSecondEdge, + Handle(Geom_Curve)& theFirstCurve, + Handle(Geom_Curve)& theSecondCurve, + gp_Pnt& theFirstPnt1, + gp_Pnt& theLastPnt1, + gp_Pnt& theFirstPnt2, + gp_Pnt& theLastPnt2, + const Handle(Geom_Plane)& thePlane) { - if (aPlane.IsNull()) return Standard_False; + if (thePlane.IsNull()) + { + return Standard_False; + } - TopLoc_Location loc_edge1,loc_edge2; - Standard_Real first1,last1,first2,last2; + TopLoc_Location aFirstEdgeLoc, aSecondEdgeLoc; + Standard_Real aFirst1, aLast1, aFirst2, aLast2; - aCurve1 = BRep_Tool::Curve(anEdge1,loc_edge1,first1,last1); - aCurve2 = BRep_Tool::Curve(anEdge2,loc_edge2,first2,last2); + theFirstCurve = BRep_Tool::Curve (theFirstEdge, aFirstEdgeLoc, aFirst1, aLast1); + theSecondCurve = BRep_Tool::Curve (theSecondEdge, aSecondEdgeLoc, aFirst2, aLast2); - if (aCurve1.IsNull()) return Standard_False; - if (aCurve2.IsNull()) return Standard_False; + if (theFirstCurve.IsNull()) + { + return Standard_False; + } + + if (theSecondCurve.IsNull()) + { + return Standard_False; + } - if (!loc_edge1.IsIdentity()) { -//#ifndef DEB - Handle(Geom_Geometry) aGeomGeometry = aCurve1->Transformed(loc_edge1.Transformation()); - aCurve1 = (Handle(Geom_Curve)&) aGeomGeometry ; -//#else -// aCurve1 = (Handle(Geom_Curve)&) aCurve1->Transformed(loc_edge1.Transformation()); -//#endif + if (!aFirstEdgeLoc.IsIdentity()) + { + Handle(Geom_Geometry) aGeomGeometry = theFirstCurve->Transformed (aFirstEdgeLoc.Transformation()); + theFirstCurve = (Handle(Geom_Curve)&) aGeomGeometry; } - if (!loc_edge2.IsIdentity()) { -//#ifndef DEB - Handle(Geom_Geometry) aGeomGeometry = aCurve2->Transformed(loc_edge2.Transformation()); - aCurve2 = (Handle(Geom_Curve)&) aGeomGeometry ; -//#else -// aCurve2 = (Handle(Geom_Curve)&) aCurve2->Transformed(loc_edge2.Transformation()); -//#endif + + if (!aSecondEdgeLoc.IsIdentity()) + { + Handle(Geom_Geometry) aGeomGeometry = theSecondCurve->Transformed (aSecondEdgeLoc.Transformation()); + theSecondCurve = (Handle(Geom_Curve)&) aGeomGeometry; } -//#ifndef DEB - Handle(Geom_Curve) aGeomCurve = GeomProjLib::ProjectOnPlane(aCurve1,aPlane,aPlane->Pln().Axis().Direction(),Standard_False); - aCurve1 = aGeomCurve ; -//#else -// aCurve1 = (Handle(Geom_Curve)&) GeomProjLib::ProjectOnPlane(aCurve1,aPlane,aPlane->Pln().Axis().Direction(),Standard_False); -//#endif -//#ifndef DEB - aGeomCurve = GeomProjLib::ProjectOnPlane(aCurve2,aPlane,aPlane->Pln().Axis().Direction(),Standard_False); - aCurve2 = aGeomCurve; -//#else -// aCurve2 = (Handle(Geom_Curve)&) GeomProjLib::ProjectOnPlane(aCurve2,aPlane,aPlane->Pln().Axis().Direction(),Standard_False); -//#endif + theFirstCurve = GeomProjLib::ProjectOnPlane (theFirstCurve, thePlane, + thePlane->Pln().Axis().Direction(), + Standard_False); - if (aCurve1->IsInstance(STANDARD_TYPE(Geom_TrimmedCurve))) { - aCurve1 = ((Handle(Geom_TrimmedCurve)&) aCurve1)->BasisCurve(); + + theSecondCurve = GeomProjLib::ProjectOnPlane (theSecondCurve, thePlane, + thePlane->Pln().Axis().Direction(), + Standard_False); + + + if (theFirstCurve->IsInstance (STANDARD_TYPE(Geom_TrimmedCurve))) + { + theFirstCurve = ((Handle(Geom_TrimmedCurve)&) theFirstCurve)->BasisCurve(); } - if (aCurve2->IsInstance(STANDARD_TYPE(Geom_TrimmedCurve))) { - aCurve2 = ((Handle(Geom_TrimmedCurve)&) aCurve2)->BasisCurve(); + + if (theSecondCurve->IsInstance (STANDARD_TYPE (Geom_TrimmedCurve))) + { + theSecondCurve = ((Handle(Geom_TrimmedCurve)&) theSecondCurve)->BasisCurve(); } - if (aCurve1->IsInstance(STANDARD_TYPE(Geom_Line))) { - // CLE - // const Handle(Geom_Line)& line = (Handle(Geom_Line)&) aCurve1; - Handle(Geom_Line) line = (Handle(Geom_Line)&) aCurve1; - // ENDCLE - FirstPnt1 = ElCLib::Value(first1,line->Lin()); - LastPnt1 = ElCLib::Value(last1,line->Lin()); - } - else if (aCurve1->IsInstance(STANDARD_TYPE(Geom_Circle))) { - // CLE - // const Handle(Geom_Circle)& circ = (Handle(Geom_Circle)&) aCurve1; - Handle(Geom_Circle) circ = (Handle(Geom_Circle)&) aCurve1; - // ENDCLE - FirstPnt1 = ElCLib::Value(first1,circ->Circ()); - LastPnt1 = ElCLib::Value(last1,circ->Circ()); - } - else return Standard_False; + if (theFirstCurve->IsInstance(STANDARD_TYPE(Geom_Line))) + { + Handle(Geom_Line) aLine = (Handle(Geom_Line)&) theFirstCurve; - if (aCurve2->IsInstance(STANDARD_TYPE(Geom_Line))) { - // CLE - // const Handle(Geom_Line)& line = (Handle(Geom_Line)&) aCurve2; - Handle(Geom_Line) line = (Handle(Geom_Line)&) aCurve2; - // ENDCLE - FirstPnt2 = ElCLib::Value(first2,line->Lin()); - LastPnt2 = ElCLib::Value(last2,line->Lin()); + theFirstPnt1 = ElCLib::Value (aFirst1, aLine->Lin()); + theLastPnt1 = ElCLib::Value (aLast1, aLine->Lin()); } - else if (aCurve2->IsInstance(STANDARD_TYPE(Geom_Circle))) { - // CLE - // const Handle(Geom_Circle)& circ = (Handle(Geom_Circle)&) aCurve2; - Handle(Geom_Circle) circ = (Handle(Geom_Circle)&) aCurve2; - // ENDCLE - FirstPnt2 = ElCLib::Value(first2,circ->Circ()); - LastPnt2 = ElCLib::Value(last2,circ->Circ()); + else if (theFirstCurve->IsInstance(STANDARD_TYPE(Geom_Circle))) + { + Handle(Geom_Circle) aCirc = (Handle(Geom_Circle)&) theFirstCurve; + + theFirstPnt1 = ElCLib::Value (aFirst1, aCirc->Circ()); + theLastPnt1 = ElCLib::Value (aLast1, aCirc->Circ()); + } + else + { + return Standard_False; + } + + if (theSecondCurve->IsInstance (STANDARD_TYPE (Geom_Line))) +{ + Handle(Geom_Line) aLine = (Handle(Geom_Line)&) theSecondCurve; + + theFirstPnt2 = ElCLib::Value (aFirst2, aLine->Lin()); + theLastPnt2 = ElCLib::Value (aLast2, aLine->Lin()); + } + else if (theSecondCurve->IsInstance (STANDARD_TYPE (Geom_Circle))) + { + Handle(Geom_Circle) aCirc = (Handle(Geom_Circle)&) theSecondCurve; + + theFirstPnt2 = ElCLib::Value (aFirst2, aCirc->Circ()); + theLastPnt2 = ElCLib::Value (aLast2, aCirc->Circ()); + } + else + { + return Standard_False; } - else return Standard_False; return Standard_True; } +//======================================================================= +//function : ComputeGeometry +//purpose : Computes the geometry of the 2 edges. +//======================================================================= +Standard_Boolean AIS::ComputeGeometry (const TopoDS_Edge& theFirstEdge, + const TopoDS_Edge& theSecondEdge, + Handle(Geom_Curve)& theFirstCurve, + Handle(Geom_Curve)& theSecondCurve, + gp_Pnt& theFirstPnt1, + gp_Pnt& theLastPnt1, + gp_Pnt& theFirstPnt2, + gp_Pnt& theLastPnt2, + Standard_Boolean& theIsInfinite1, + Standard_Boolean& theIsInfinite2) +{ + theIsInfinite1 = theIsInfinite2 = Standard_False; + + if (!AIS::ComputeGeometry (theFirstEdge, theFirstCurve,theFirstPnt1, theLastPnt1, theIsInfinite1)) + { + return Standard_False; + } + + if (!AIS::ComputeGeometry (theSecondEdge, theSecondCurve,theFirstPnt2, theLastPnt2, theIsInfinite2)) + { + return Standard_False; + } + + if (theIsInfinite1 || theIsInfinite2) + { + if (theFirstCurve->DynamicType() == theSecondCurve->DynamicType()) + { + gp_Lin aLin1 = ((Handle(Geom_Line)&) theFirstCurve)->Lin(); + gp_Lin aLin2 = ((Handle(Geom_Line)&) theSecondCurve)->Lin(); + + if (theIsInfinite1) + { + theFirstPnt1 = ElCLib::Value (ElCLib::Parameter (aLin2, theFirstPnt2), aLin1); + theLastPnt1 = ElCLib::Value (ElCLib::Parameter (aLin2, theLastPnt2), aLin1); + } + else if (theIsInfinite2) + { + theFirstPnt2 = ElCLib::Value (ElCLib::Parameter (aLin1, theFirstPnt1), aLin2); + theLastPnt2 = ElCLib::Value (ElCLib::Parameter (aLin1, theLastPnt1), aLin2); + } + } + else + { + if (theIsInfinite1 && !theIsInfinite2) + { + GeomAPI_ProjectPointOnCurve aProjector (theFirstPnt2, theFirstCurve); + theFirstPnt1 = theFirstCurve->Value (aProjector.LowerDistanceParameter ()); + + aProjector.Init (theLastPnt2, theFirstCurve); + theLastPnt1 = theFirstCurve->Value (aProjector.LowerDistanceParameter ()); + } + else if (!theIsInfinite1 && theIsInfinite2) + { + GeomAPI_ProjectPointOnCurve aProjector (theFirstPnt1, theSecondCurve); + theFirstPnt2 = theSecondCurve->Value (aProjector.LowerDistanceParameter ()); + + aProjector.Init (theLastPnt1, theSecondCurve); + theLastPnt2 = theSecondCurve->Value (aProjector.LowerDistanceParameter ()); + } + else + { + return Standard_False; + } + } + } + + return Standard_True; +} + //======================================================================= //function : ComputeGeometry //purpose : Computes the geometry of the 2 edges in the current wp @@ -396,160 +567,183 @@ Standard_Boolean AIS::ComputeGeometry(const TopoDS_Edge& anEdge1, // if none of the two edges is in the current wp , // it returns Standard_False //======================================================================= - -Standard_Boolean AIS::ComputeGeometry (const TopoDS_Edge& anEdge1, - const TopoDS_Edge& anEdge2, - Standard_Integer& indexExt, - Handle(Geom_Curve)& aCurve1, - Handle(Geom_Curve)& aCurve2, - gp_Pnt& FirstPnt1, - gp_Pnt& LastPnt1, - gp_Pnt& FirstPnt2, - gp_Pnt& LastPnt2, - Handle(Geom_Curve)& extCurve, - Standard_Boolean& isInfinite1, - Standard_Boolean& isInfinite2, - const Handle(Geom_Plane)& aPlane) +Standard_Boolean AIS::ComputeGeometry (const TopoDS_Edge& theFirstEdge, + const TopoDS_Edge& theSecondEdge, + Standard_Integer& theExtIndex, + Handle(Geom_Curve)& theFirstCurve, + Handle(Geom_Curve)& theSecondCurve, + gp_Pnt& theFirstPnt1, + gp_Pnt& theLastPnt1, + gp_Pnt& theFirstPnt2, + gp_Pnt& theLastPnt2, + Handle(Geom_Curve)& theExtCurve, + Standard_Boolean& theIsInfinite1, + Standard_Boolean& theIsInfinite2, + const Handle(Geom_Plane)& thePlane) { - if (aPlane.IsNull()) return Standard_False; - extCurve.Nullify(); - indexExt = 0; - - Standard_Real first1,last1,first2,last2; - isInfinite1 = isInfinite2 = Standard_False; - - BRepAdaptor_Curve brepCurv1(anEdge1); - BRepAdaptor_Curve brepCurv2(anEdge2); - aCurve1 = Handle(Geom_Curve)::DownCast(brepCurv1.Curve().Curve()->Transformed(brepCurv1.Trsf())); - aCurve2 = Handle(Geom_Curve)::DownCast(brepCurv2.Curve().Curve()->Transformed(brepCurv2.Trsf())); - if (aCurve1->IsInstance(STANDARD_TYPE(Geom_TrimmedCurve))) { - aCurve1 = ((Handle(Geom_TrimmedCurve)&) aCurve1)->BasisCurve(); - } - if (aCurve2->IsInstance(STANDARD_TYPE(Geom_TrimmedCurve))) { - aCurve2 = ((Handle(Geom_TrimmedCurve)&) aCurve2)->BasisCurve(); - } - - first1 = brepCurv1.FirstParameter(); - last1 = brepCurv1.LastParameter(); - first2 = brepCurv2.FirstParameter(); - last2 = brepCurv2.LastParameter(); - - if (aCurve1.IsNull()) return Standard_False; - if (aCurve2.IsNull()) return Standard_False; - - Handle(Geom_Curve) aSov1 = aCurve1; - Handle(Geom_Curve) aSov2 = aCurve2; - - // Checks that the projcurve is not in the plane - Standard_Boolean isOnPlanC1,isOnPlanC2; - if ((!ComputeGeomCurve(aCurve1,first1,last1,FirstPnt1,LastPnt1,aPlane,isOnPlanC1)) - || (!ComputeGeomCurve(aCurve2,first2,last2,FirstPnt2,LastPnt2,aPlane,isOnPlanC2))) + if (thePlane.IsNull()) + { return Standard_False; - - if (Precision::IsInfinite(first1) || Precision::IsInfinite(last1)) { - isInfinite1 = Standard_True; - indexExt = 1; } - if (Precision::IsInfinite(first2) || Precision::IsInfinite(last2)) { - isInfinite2 = Standard_True; - indexExt = 2; - } - if (isInfinite1 && isInfinite2) indexExt = 0; //New - if (isInfinite1 || isInfinite2) { - if (aCurve1->DynamicType() == aCurve2->DynamicType()) { - // CLE - // const gp_Lin& lin1 = ((Handle(Geom_Line)&) aCurve1)->Lin(); - // const gp_Lin& lin2 = ((Handle(Geom_Line)&) aCurve2)->Lin(); - gp_Lin lin1 = ((Handle(Geom_Line)&) aCurve1)->Lin(); - gp_Lin lin2 = ((Handle(Geom_Line)&) aCurve2)->Lin(); - // ENDCLE - if (indexExt == 1) { - FirstPnt1 = ElCLib::Value(ElCLib::Parameter(lin2,FirstPnt2),lin1); - LastPnt1 = ElCLib::Value(ElCLib::Parameter(lin2,LastPnt2),lin1); + theExtCurve.Nullify(); + theExtIndex = 0; + + Standard_Real aFirst1, aLast1, aFirst2, aLast2; + theIsInfinite1 = theIsInfinite2 = Standard_False; + + BRepAdaptor_Curve aFirstAdaptor (theFirstEdge); + BRepAdaptor_Curve aSecondAdaptor (theSecondEdge); + + theFirstCurve = Handle(Geom_Curve)::DownCast + (aFirstAdaptor.Curve().Curve()->Transformed (aFirstAdaptor.Trsf())); + theSecondCurve = Handle(Geom_Curve)::DownCast + (aSecondAdaptor.Curve().Curve()->Transformed (aSecondAdaptor.Trsf())); + + if (theFirstCurve->IsInstance (STANDARD_TYPE (Geom_TrimmedCurve))) + { + theFirstCurve = ((Handle(Geom_TrimmedCurve)&) theFirstCurve)->BasisCurve(); + } + if (theSecondCurve->IsInstance (STANDARD_TYPE (Geom_TrimmedCurve))) + { + theSecondCurve = ((Handle(Geom_TrimmedCurve)&) theSecondCurve)->BasisCurve(); + } + + aFirst1 = aFirstAdaptor.FirstParameter(); + aLast1 = aFirstAdaptor.LastParameter(); + + aFirst2 = aSecondAdaptor.FirstParameter(); + aLast2 = aSecondAdaptor.LastParameter(); + + if (theFirstCurve.IsNull() || theSecondCurve.IsNull()) + { + return Standard_False; + } + + Handle(Geom_Curve) aFirstSaved = theFirstCurve; + Handle(Geom_Curve) aSecondSaved = theSecondCurve; + + // Checks that the projected curve is not in the plane + Standard_Boolean isFirstOnPlane,isSecondOnPlane; + + if ((!ComputeGeomCurve (theFirstCurve, aFirst1, aLast1, theFirstPnt1, theLastPnt1, thePlane, isFirstOnPlane)) + || (!ComputeGeomCurve( theSecondCurve, aFirst2, aLast2, theFirstPnt2, theLastPnt2, thePlane,isSecondOnPlane))) + { + return Standard_False; + } + + if (Precision::IsInfinite (aFirst1) || Precision::IsInfinite (aLast1)) + { + theIsInfinite1 = Standard_True; + theExtIndex = 1; + } + if (Precision::IsInfinite (aFirst2) || Precision::IsInfinite (aLast2)) + { + theIsInfinite2 = Standard_True; + theExtIndex = 2; + } + if (theIsInfinite1 && theIsInfinite2) + { + theExtIndex = 0; + } + + if (theIsInfinite1 || theIsInfinite2) + { + if (theFirstCurve->DynamicType() == theSecondCurve->DynamicType()) + { + gp_Lin aLin1 = ((Handle(Geom_Line)&) theFirstCurve)->Lin(); + gp_Lin aLin2 = ((Handle(Geom_Line)&) theSecondCurve)->Lin(); + + if (theExtIndex == 1) + { + theFirstPnt1 = ElCLib::Value (ElCLib::Parameter (aLin2, theFirstPnt2), aLin1); + theLastPnt1 = ElCLib::Value (ElCLib::Parameter (aLin2, theLastPnt2), aLin1); } - else if (indexExt == 2) { - FirstPnt2 = ElCLib::Value(ElCLib::Parameter(lin1,FirstPnt1),lin2); - LastPnt2 = ElCLib::Value(ElCLib::Parameter(lin1,LastPnt1),lin2); + else if (theExtIndex == 2) + { + theFirstPnt2 = ElCLib::Value (ElCLib::Parameter (aLin1, theFirstPnt1), aLin2); + theLastPnt2 = ElCLib::Value (ElCLib::Parameter (aLin1, theLastPnt1), aLin2); } } } - if (isOnPlanC1 && isOnPlanC2) return Standard_True; - - if (!isOnPlanC1 && isOnPlanC2) {// curve 2 only in the plane - indexExt = 1; - extCurve = aSov1; + if (isFirstOnPlane && isSecondOnPlane) + { + return Standard_True; } - else if (isOnPlanC1 && !isOnPlanC2) {// curve 1 only in the plane - indexExt = 2; - extCurve = aSov2; + + if (!isFirstOnPlane && isSecondOnPlane) + {// curve 2 only in the plane + theExtIndex = 1; + theExtCurve = aFirstSaved; + } + else if (isFirstOnPlane && !isSecondOnPlane) + {// curve 1 only in the plane + theExtIndex = 2; + theExtCurve = aSecondSaved; } else + { return Standard_False; - + } + return Standard_True; } - -// it is patch! - //======================================================================= //function : ComputeGeomCurve //purpose : Checks if aCurve belongs to aPlane; if not, projects aCurve in aPlane // and returns aCurveproj; // Return TRUE if ok //======================================================================= - -Standard_Boolean AIS::ComputeGeomCurve(Handle(Geom_Curve)& aCurve, - const Standard_Real first1, - const Standard_Real last1, - gp_Pnt& FirstPnt1, - gp_Pnt& LastPnt1, - const Handle(Geom_Plane)& aPlane, - Standard_Boolean& isOnPlane) +Standard_Boolean AIS::ComputeGeomCurve (Handle(Geom_Curve)& aCurve, + const Standard_Real first1, + const Standard_Real last1, + gp_Pnt& FirstPnt1, + gp_Pnt& LastPnt1, + const Handle(Geom_Plane)& aPlane, + Standard_Boolean& isOnPlane) { isOnPlane = Standard_True; - const Standard_Integer NodeNumber = 20; Standard_Real Delta = (last1 - first1) / (NodeNumber - 1); if (Delta <= Precision::PConfusion()) + { Delta = last1 - first1; - gp_Pnt CurPnt(0.0,0.0,0.0); + } + + gp_Pnt CurPnt(0.0, 0.0, 0.0); Standard_Real CurPar = first1; for (Standard_Integer i = 1; i <= NodeNumber; i++) + { + CurPnt = aCurve->Value( CurPar ); + if (aPlane->Pln().SquareDistance( CurPnt ) > SquareTolerance) { - CurPnt = aCurve->Value( CurPar ); - if (aPlane->Pln().SquareDistance( CurPnt ) > SquareTolerance) - { - isOnPlane = Standard_False; - break; - } - CurPar += Delta; + isOnPlane = Standard_False; + break; } - - if (! Precision::IsInfinite(first1) && ! Precision::IsInfinite(last1)) + CurPar += Delta; + } + + if (!Precision::IsInfinite(first1) && !Precision::IsInfinite(last1)) + { + FirstPnt1 = aCurve->Value (first1); + LastPnt1 = aCurve->Value (last1); + } + + if (!isOnPlane) + { + Handle(Geom_Curve) aGeomCurve = GeomProjLib::ProjectOnPlane (aCurve, + aPlane, + aPlane->Pln().Axis().Direction(), + Standard_False); + aCurve = aGeomCurve; + if (aCurve->IsInstance(STANDARD_TYPE(Geom_TrimmedCurve))) { - FirstPnt1 = aCurve->Value( first1 ); - LastPnt1 = aCurve->Value( last1 ); - } - if (!isOnPlane) { -//#ifndef DEB - Handle( Geom_Curve ) aGeomCurve = GeomProjLib::ProjectOnPlane( aCurve, - aPlane, - aPlane->Pln().Axis().Direction(), - Standard_False); - aCurve = aGeomCurve ; -//#else -// aCurve = (Handle( Geom_Curve )&) GeomProjLib::ProjectOnPlane( aCurve, -// aPlane, -// aPlane->Pln().Axis().Direction(), -// Standard_False); -//#endif - if (aCurve->IsInstance(STANDARD_TYPE(Geom_TrimmedCurve))) { aCurve = ((Handle(Geom_TrimmedCurve)&) aCurve)->BasisCurve(); } - if (! Precision::IsInfinite(first1) && ! Precision::IsInfinite(last1)) { + if (! Precision::IsInfinite(first1) && ! Precision::IsInfinite(last1)) + { FirstPnt1 = AIS::ProjectPointOnPlane( FirstPnt1, aPlane->Pln() ); LastPnt1 = AIS::ProjectPointOnPlane( LastPnt1, aPlane->Pln() ); } @@ -557,7 +751,6 @@ Standard_Boolean AIS::ComputeGeomCurve(Handle(Geom_Curve)& aCurve, return Standard_True; } - //======================================================================= //function : ComputeGeometry //purpose : computes the point corresponding to the vertex @@ -565,7 +758,6 @@ Standard_Boolean AIS::ComputeGeomCurve(Handle(Geom_Curve)& aCurve, // , = true. // is the projected vertex in the plane. //======================================================================= - Standard_Boolean AIS::ComputeGeometry(const TopoDS_Vertex& aVertex, gp_Pnt& point, const Handle(Geom_Plane)& aPlane, @@ -584,26 +776,24 @@ Standard_Boolean AIS::ComputeGeometry(const TopoDS_Vertex& aVertex, //purpose : // Returns type of surface which can be Plane or OtherSurface //======================================================================= - -Standard_Boolean AIS::GetPlaneFromFace( const TopoDS_Face& aFace, +Standard_Boolean AIS::GetPlaneFromFace(const TopoDS_Face& aFace, gp_Pln & aPlane, Handle( Geom_Surface )& aSurf, AIS_KindOfSurface & aSurfType, - Standard_Real & Offset ) + Standard_Real & Offset) { Standard_Boolean Result = Standard_False; BRepAdaptor_Surface surf1( aFace ); Handle( Adaptor3d_HSurface ) surf2; - //gp_Vec OffsetVec( 1.0e0, 0.0e0, 0.0e0 ); Standard_Boolean isOffset = Standard_False; if (surf1.GetType() == GeomAbs_OffsetSurface) - { - // Extracting Basis Surface - surf2 = surf1.BasisSurface(); - isOffset = Standard_True; - } + { + // Extracting Basis Surface + surf2 = surf1.BasisSurface(); + isOffset = Standard_True; + } else surf2 = new BRepAdaptor_HSurface( surf1 ); @@ -612,81 +802,71 @@ Standard_Boolean AIS::GetPlaneFromFace( const TopoDS_Face& aFace, aSurf = Handle( Geom_Surface )::DownCast( aSurf->Transformed( surf1.Trsf() ) ); if (surf2->GetType() == GeomAbs_Plane) + { + aPlane = surf2->Plane(); + aSurfType = AIS_KOS_Plane; + Offset = 0.; + Result = Standard_True; + } + + else if (surf2->GetType() == GeomAbs_SurfaceOfExtrusion) + { + Handle( Adaptor3d_HCurve ) BasisCurve = surf2->BasisCurve(); + gp_Dir ExtrusionDir = surf2->Direction(); + if (BasisCurve->GetType() == GeomAbs_Line) { - aPlane = surf2->Plane(); + gp_Lin BasisLine = BasisCurve->Line(); + gp_Dir LineDir = BasisLine.Direction(); + gp_Pnt LinePos = BasisLine.Location(); + gp_Pln thePlane( LinePos, LineDir ^ ExtrusionDir); + aPlane = thePlane; aSurfType = AIS_KOS_Plane; Offset = 0.; Result = Standard_True; } - - else if (surf2->GetType() == GeomAbs_SurfaceOfExtrusion) - { - Handle( Adaptor3d_HCurve ) BasisCurve = surf2->BasisCurve(); - gp_Dir ExtrusionDir = surf2->Direction(); - if (BasisCurve->GetType() == GeomAbs_Line) - { - gp_Lin BasisLine = BasisCurve->Line(); - gp_Dir LineDir = BasisLine.Direction(); - gp_Pnt LinePos = BasisLine.Location(); - gp_Pln thePlane( LinePos, LineDir ^ ExtrusionDir); - aPlane = thePlane; - aSurfType = AIS_KOS_Plane; - Offset = 0.; - Result = Standard_True; - } - } + } if (Result == Standard_True && isOffset) - { - aSurf = (Handle( Geom_OffsetSurface )::DownCast( aSurf ))->Surface(); - aPlane = (Handle( Geom_Plane )::DownCast( aSurf ))->Pln(); - /* - Handle( Geom_OffsetSurface ) OffsetSurf = Handle( Geom_OffsetSurface )::DownCast( aSurf ); - gp_Pnt PointOnPlane; - gp_Vec D1u, D1v; - OffsetSurf->D1( 0, 0, PointOnPlane, D1u, D1v ); - D1u.Normalize(); - D1v.Normalize(); - OffsetVec = D1u ^ D1v; - aPlane.Translate( OffsetValue * OffsetVec ); - */ - Offset = 0.0e0; - } + { + aSurf = (Handle( Geom_OffsetSurface )::DownCast( aSurf ))->Surface(); + aPlane = (Handle( Geom_Plane )::DownCast( aSurf ))->Pln(); + Offset = 0.0e0; + } if (Result == Standard_False) + { + if (isOffset) { - if (isOffset) - { - Handle( Standard_Type ) TheType = aSurf->DynamicType(); - if (TheType == STANDARD_TYPE(Geom_CylindricalSurface) || - TheType == STANDARD_TYPE(Geom_ConicalSurface) || - TheType == STANDARD_TYPE(Geom_SphericalSurface) || - TheType == STANDARD_TYPE(Geom_ToroidalSurface)) - { - aSurf = (Handle( Geom_OffsetSurface )::DownCast( aSurf ))->Surface(); - Offset = 0.0e0; - } - else - { - Offset = (Handle( Geom_OffsetSurface )::DownCast( aSurf ))->Offset(); - aSurf = (Handle( Geom_OffsetSurface )::DownCast( aSurf ))->BasisSurface(); - } - } Handle( Standard_Type ) TheType = aSurf->DynamicType(); - if (TheType == STANDARD_TYPE(Geom_CylindricalSurface)) - aSurfType = AIS_KOS_Cylinder; - else if (TheType == STANDARD_TYPE(Geom_ConicalSurface)) - aSurfType = AIS_KOS_Cone; - else if (TheType == STANDARD_TYPE(Geom_SphericalSurface)) - aSurfType = AIS_KOS_Sphere; - else if (TheType == STANDARD_TYPE(Geom_ToroidalSurface)) - aSurfType = AIS_KOS_Torus; - else if (TheType == STANDARD_TYPE(Geom_SurfaceOfRevolution)) - aSurfType = AIS_KOS_Revolution; - else if (TheType == STANDARD_TYPE(Geom_SurfaceOfLinearExtrusion)) - aSurfType = AIS_KOS_Extrusion; + if (TheType == STANDARD_TYPE(Geom_CylindricalSurface) || + TheType == STANDARD_TYPE(Geom_ConicalSurface) || + TheType == STANDARD_TYPE(Geom_SphericalSurface) || + TheType == STANDARD_TYPE(Geom_ToroidalSurface)) + { + aSurf = (Handle( Geom_OffsetSurface )::DownCast( aSurf ))->Surface(); + Offset = 0.0e0; + } else - aSurfType = AIS_KOS_OtherSurface; + { + Offset = (Handle( Geom_OffsetSurface )::DownCast( aSurf ))->Offset(); + aSurf = (Handle( Geom_OffsetSurface )::DownCast( aSurf ))->BasisSurface(); + } } + Handle( Standard_Type ) TheType = aSurf->DynamicType(); + if (TheType == STANDARD_TYPE(Geom_CylindricalSurface)) + aSurfType = AIS_KOS_Cylinder; + else if (TheType == STANDARD_TYPE(Geom_ConicalSurface)) + aSurfType = AIS_KOS_Cone; + else if (TheType == STANDARD_TYPE(Geom_SphericalSurface)) + aSurfType = AIS_KOS_Sphere; + else if (TheType == STANDARD_TYPE(Geom_ToroidalSurface)) + aSurfType = AIS_KOS_Torus; + else if (TheType == STANDARD_TYPE(Geom_SurfaceOfRevolution)) + aSurfType = AIS_KOS_Revolution; + else if (TheType == STANDARD_TYPE(Geom_SurfaceOfLinearExtrusion)) + aSurfType = AIS_KOS_Extrusion; + else + aSurfType = AIS_KOS_OtherSurface; + } return Result; } @@ -719,17 +899,15 @@ gp_Pnt AIS::ProjectPointOnLine( const gp_Pnt & aPoint, const gp_Lin & aLine ) return Result; } - //======================================================================= //function : InitFaceLength //purpose : //======================================================================= - -void AIS::InitFaceLength( const TopoDS_Face& aFace, - gp_Pln & aPlane, - Handle(Geom_Surface) & aSurface, - AIS_KindOfSurface & aSurfaceType, - Standard_Real & anOffset) +void AIS::InitFaceLength (const TopoDS_Face& aFace, + gp_Pln & aPlane, + Handle(Geom_Surface) & aSurface, + AIS_KindOfSurface & aSurfaceType, + Standard_Real & anOffset) { AIS::GetPlaneFromFace( aFace, aPlane, aSurface, aSurfaceType, anOffset ); @@ -742,449 +920,321 @@ void AIS::InitFaceLength( const TopoDS_Face& aFace, } //======================================================================= -//function : ComputeLengthBetweenPlanarFaces +//function : InitAngleBetweenPlanarFaces //purpose : //======================================================================= - -void AIS::ComputeLengthBetweenPlanarFaces( const TopoDS_Face & FirstFace, - const TopoDS_Face & SecondFace, - const gp_Pln & Plane1, - const gp_Pln & Plane2, - Standard_Real & Value, - gp_Pnt & FirstAttach, - gp_Pnt & SecondAttach, - gp_Dir & DirAttach, - const Standard_Boolean AutomaticPos, - gp_Pnt & Position ) +Standard_Boolean AIS::InitAngleBetweenPlanarFaces (const TopoDS_Face& theFirstFace, + const TopoDS_Face& theSecondFace, + gp_Pnt & theCenter, + gp_Pnt & theFirstAttach, + gp_Pnt & theSecondAttach, + const Standard_Boolean theIsFirstPointSet) { - TopExp_Explorer aExp( FirstFace, TopAbs_VERTEX ); - // case of infinite planes. SMO. - if (!aExp.More()) - FirstAttach = Plane1.Location(); - else - FirstAttach = BRep_Tool::Pnt( TopoDS::Vertex( aExp.Current() ) ); - SecondAttach = AIS::ProjectPointOnPlane( FirstAttach, Plane2 ); + Handle(Geom_Plane) aFirstPlane = Handle(Geom_Plane)::DownCast (BRep_Tool::Surface (theFirstFace)); + Handle(Geom_Plane) aSecondPlane = Handle(Geom_Plane)::DownCast (BRep_Tool::Surface (theSecondFace)); - Value = FirstAttach.Distance( SecondAttach ); + GeomAPI_IntSS aPlaneIntersector (aFirstPlane, aSecondPlane, Precision::Confusion()); - gp_Dir LengthDir = Plane1.Axis().Direction(); - /* - if (Value > Precision::Confusion()) - LengthDir = gp_Dir( gp_Vec( FirstAttach, SecondAttach ) ); - */ - DirAttach = Plane1.Position().XDirection(); + // Fails if two planes haven't only one intersection line. + if (!aPlaneIntersector.IsDone()) + { + return Standard_False; + } - if (AutomaticPos) - Position.SetXYZ((FirstAttach.XYZ() + SecondAttach.XYZ())/2.0e0) ; - - else // position is given + if (aPlaneIntersector.NbLines() != 1) + { + return Standard_False; + } + + // Get intersect line. + Handle(Geom_Curve) anIntersectCurve = aPlaneIntersector.Line (1); + + Handle(Geom_Line) anIntersectLine = Handle(Geom_Line)::DownCast (anIntersectCurve); + + if (anIntersectLine.IsNull()) + { + return Standard_False; + } + + gp_Lin anIntersectLin = anIntersectLine->Lin(); + + gp_Pnt aFirstCenter, aSecondCenter; + Standard_Real anU1Min, anU1Max, aV1Min, aV1Max; + Standard_Real anU2Min, anU2Max, aV2Min, aV2Max; + + BRepTools::UVBounds (theFirstFace, anU1Min, anU1Max, aV1Min, aV1Max); + BRepTools::UVBounds (theSecondFace, anU2Min, anU2Max, aV2Min, aV2Max); + + // Get first and second attach. + if (theIsFirstPointSet) + { + GeomAPI_ProjectPointOnSurf aProjector (theFirstAttach, aFirstPlane); + if (!aProjector.IsDone()) { - FirstAttach = AIS::Nearest( FirstFace, Position ); - SecondAttach = AIS::ProjectPointOnPlane( FirstAttach, Plane2 ); + return Standard_False; } - Quantity_Parameter U, V ; - ElSLib::Parameters( Plane2, SecondAttach, U, V ); - BRepTopAdaptor_FClass2d aClassifier( SecondFace, Precision::Confusion() ); - TopAbs_State State = aClassifier.Perform( gp_Pnt2d( U, V ), Standard_False ); - if (State == TopAbs_OUT || State == TopAbs_UNKNOWN) - { - SecondAttach = AIS::Nearest( SecondFace, Position ); - if (Value > Precision::Confusion()) - { - gp_Vec aVector = gp_Vec( FirstAttach, SecondAttach ) ^ LengthDir; - if (aVector.SquareMagnitude() > SquareTolerance) - DirAttach = aVector ^ LengthDir; - } - else - { - gp_Vec DirVec( FirstAttach, SecondAttach ); - if (DirVec.SquareMagnitude() > SquareTolerance) - DirAttach = gp_Dir( DirVec ); - } - } - if (!AutomaticPos) - { - gp_Pln PlaneOfDim( FirstAttach, DirAttach ^ LengthDir ); - Position = AIS::ProjectPointOnPlane( Position, PlaneOfDim ); - } + aFirstCenter = aProjector.Point (1); + } + else + { + aFirstCenter = aFirstPlane->Value ((anU1Min + anU1Max) * 0.5, (aV1Min + aV1Max) * 0.5); + } + + aSecondCenter = aSecondPlane->Value ((anU2Min + anU2Max) * 0.5, (aV2Min + aV2Max) * 0.5); + + GeomAPI_ProjectPointOnCurve aProj (aFirstCenter, anIntersectCurve); + theCenter = aProj.NearestPoint(); + + gp_Vec aFirstNormal = anIntersectLin.Direction() ^ aFirstPlane->Pln().Axis().Direction(); + if (aFirstNormal * gp_Vec (theCenter, aFirstCenter) < 0.0) + { + aFirstNormal.Reverse(); + } + theFirstAttach = theCenter.Translated (aFirstNormal); + + gp_Vec aSecondNormal = anIntersectLin.Direction() ^ aSecondPlane->Pln().Axis().Direction(); + if (aSecondNormal * gp_Vec (theCenter, aSecondCenter) < 0.0) + { + aSecondNormal.Reverse(); + } + theSecondAttach = theCenter.Translated (aSecondNormal); + + return Standard_True; } - -// Purpose: Return the point from wich is the more distant -// from -static gp_Pnt FindFarPoint (const gp_Ax1 & anAxis, - const TopoDS_Face & aFace ) +//======================================================================= +//function : InitAngleBetweenCurvilinearFaces +//purpose : +//======================================================================= +Standard_Boolean AIS::InitAngleBetweenCurvilinearFaces (const TopoDS_Face& theFirstFace, + const TopoDS_Face& theSecondFace, + const AIS_KindOfSurface theFirstSurfType, + const AIS_KindOfSurface theSecondSurfType, + gp_Pnt& theCenter, + gp_Pnt& theFirstAttach, + gp_Pnt& theSecondAttach, + const Standard_Boolean theIsFirstPointSet) { - gp_Pnt ResPnt(0.0,0.0,0.0); - Standard_Real MaxDist = 0.e0, curdist2; + Handle(Geom_Surface) aFirstSurf = BRep_Tool::Surface (theFirstFace); + Handle(Geom_Surface) aSecondSurf = BRep_Tool::Surface (theSecondFace); - gp_Lin Line (anAxis); + // Find intersection curve between two surfaces. + GeomAPI_IntSS aSurfaceIntersector (aFirstSurf, aSecondSurf, Precision::Confusion()); - TopExp_Explorer Explo (aFace, TopAbs_VERTEX); + // Fails if two planes haven't only one intersection line. + if (!aSurfaceIntersector.IsDone()) + { + return Standard_False; + } - if (!Explo.More()) { - // Case of infinite planes (no Vertex, no edge) - gp_Pln plane; - Handle( Geom_Surface ) aSurf; - AIS_KindOfSurface KOS; - Standard_Real offset; - AIS::GetPlaneFromFace (aFace,plane,aSurf,KOS,offset ); - gp_Pnt aPoint = plane.Location(); - MaxDist = Line.SquareDistance (aPoint); - if (MaxDist <= SquareTolerance) { - MaxDist = 100; - gp_Dir DMove = plane.Axis().Direction()^anAxis.Direction(); - gp_Vec VMove (DMove.XYZ()*100); - ResPnt = aPoint.Translated (VMove); + if (aSurfaceIntersector.NbLines() != 1) + { + return Standard_False; + } + + // Get intersect line. + Handle(Geom_Curve) anIntersectCurve = aSurfaceIntersector.Line (1); + + Handle(Geom_Line) aFirstLine, aSecondLine; + Standard_Real aFirstU = 0.0; + Standard_Real aFirstV = 0.0; + + if (theIsFirstPointSet) + { + GeomAPI_ProjectPointOnSurf aProjector (theFirstAttach, aFirstSurf); + if (!aProjector.IsDone()) + { + return Standard_False; + } + + theFirstAttach = aProjector.Point (1); + } + else + { + theFirstAttach = aFirstSurf->Value (aFirstU, aFirstV); + } + + aFirstLine = Handle(Geom_Line)::DownCast (aFirstSurf->UIso (aFirstU)); + + if (theSecondSurfType == AIS_KOS_Cylinder) + { + Handle(Geom_CylindricalSurface) aCylinder = Handle(Geom_CylindricalSurface)::DownCast (aSecondSurf); + + Standard_Real aSecondU = aCylinder->Cylinder().XAxis().Direction().Angle( + gce_MakeDir (ProjectPointOnLine (theFirstAttach, + gp_Lin (aCylinder->Cylinder().Axis())), + theFirstAttach)); + + aSecondLine = Handle(Geom_Line)::DownCast (aCylinder->UIso (aSecondU)); + } + else if (theSecondSurfType == AIS_KOS_Cone) + { + Handle(Geom_ConicalSurface) aCone = Handle(Geom_ConicalSurface)::DownCast (aSecondSurf); + + gp_Dir anXdirection = aCone->Cone().XAxis().Direction(); + + gp_Dir aToFirstAttach = gce_MakeDir (ProjectPointOnLine (theFirstAttach, + gp_Lin (aCone->Cone().Axis())), + theFirstAttach); + + Standard_Real aSecondU = anXdirection.Angle (aToFirstAttach); + + // Check sign + if (!anXdirection.IsEqual (aToFirstAttach, Precision::Angular()) && + !anXdirection.IsOpposite (aToFirstAttach, Precision::Angular()) && + (anXdirection ^ aToFirstAttach) * aCone->Cone().Axis().Direction() < 0.0) + { + aSecondU = 2*M_PI - aSecondU; + } + aSecondLine = Handle( Geom_Line )::DownCast (aCone->UIso(aSecondU)); + } + else + { + return Standard_False; + } + + // If angle can be computed between two lines. + if (!(aFirstLine->Lin().Direction().IsEqual (aSecondLine->Lin().Direction(), Precision::Angular() )) && + !(aFirstLine->Lin().Direction().IsOpposite (aSecondLine->Lin().Direction(), Precision::Angular()))) + { + GeomAPI_ExtremaCurveCurve anIntersector (aFirstLine, aSecondLine); + anIntersector.Points (1, theCenter, theCenter); + + // Move theFirstAttach on aFirstLine if it is on theCenter. + if (theCenter.SquareDistance(theFirstAttach ) <= SquareTolerance) + { + gp_Vec aDir (aFirstLine->Lin().Direction()); + theFirstAttach = theCenter.Translated (aDir); + + // theFirstAttach should be on theFirstSurf. + Standard_Real anU, aV; + if (theFirstSurfType == AIS_KOS_Cylinder) + { + ElSLib::Parameters ((Handle(Geom_CylindricalSurface)::DownCast (aFirstSurf))->Cylinder(), + theFirstAttach, anU, aV); + + theFirstAttach = ElSLib::Value (aFirstU, aV, + (Handle( Geom_CylindricalSurface )::DownCast (aFirstSurf))->Cylinder() ); + } + else if (theFirstSurfType == AIS_KOS_Cone) + { + ElSLib::Parameters ((Handle(Geom_ConicalSurface)::DownCast (aFirstSurf))->Cone(), + theFirstAttach, anU, aV); + theFirstAttach = ElSLib::Value (aFirstU, aV, + (Handle(Geom_ConicalSurface)::DownCast (aFirstSurf))->Cone()); + } + else + { + return Standard_False; + } + } + + // Find theSecondAttach + GeomAPI_ProjectPointOnSurf aProjector (theFirstAttach, aSecondSurf); + if (!aProjector.IsDone()) + { + return Standard_False; + } + Quantity_Parameter anU, aV; + aProjector.LowerDistanceParameters (anU, aV); + theSecondAttach = aSecondSurf->Value (anU, aV); + } + else // aFirstLine and aSecondLine are coincident + { + gp_Vec aDir (aFirstLine->Lin().Direction()); + theFirstAttach = theCenter.Translated (aDir); + theSecondAttach = theCenter.Translated (-aDir); + } + return Standard_True; +} + +//======================================================================= +//function : ComputeLengthBetweenCurvilinearFaces +//purpose : +//======================================================================= +void AIS::InitLengthBetweenCurvilinearFaces (const TopoDS_Face& theFirstFace, + const TopoDS_Face& theSecondFace, + Handle(Geom_Surface)& theFirstSurf, + Handle(Geom_Surface)& theSecondSurf, + gp_Pnt& theFirstAttach, + gp_Pnt& theSecondAttach, + gp_Dir& theDirOnPlane) +{ + GeomAPI_ProjectPointOnSurf aProjector; + Quantity_Parameter aPU, aPV; + + TopExp_Explorer anExplorer (theFirstFace, TopAbs_VERTEX); + + theFirstAttach = BRep_Tool::Pnt (TopoDS::Vertex (anExplorer.Current())); + aProjector.Init (theFirstAttach, theFirstSurf); + + theFirstAttach = aProjector.NearestPoint(); + aProjector.LowerDistanceParameters (aPU, aPV); + + gp_Vec aD1U, aD1V; + theFirstSurf->D1 (aPU, aPV, theFirstAttach, aD1U, aD1V); + + if (aD1U.SquareMagnitude() <= SquareTolerance || aD1V.SquareMagnitude() <= SquareTolerance) + { + theFirstAttach = AIS::Farest (theFirstFace, theFirstAttach); + aProjector.Init (theFirstAttach, theFirstSurf); + aProjector.LowerDistanceParameters (aPU, aPV); + theFirstSurf->D1 (aPU, aPV, theFirstAttach, aD1U, aD1V); + } + + aD1U.Normalize(); + aD1V.Normalize(); + + theDirOnPlane = gp_Dir (aD1U); + + gp_Dir aFirstSurfN = gp_Dir (aD1U ^ aD1V); + + aProjector.Init (theFirstAttach, theSecondSurf); + + Standard_Integer aBestPointIndex = 0; + Quantity_Length aMinDist = RealLast(); + gp_Dir aLocalDir; + + for (Standard_Integer aPointIt = 1; aPointIt <= aProjector.NbPoints(); aPointIt++) + { + aProjector.Parameters (aPointIt, aPU, aPV); + + theSecondSurf->D1 (aPU, aPV, theSecondAttach, aD1U, aD1V); + + aLocalDir = aD1U.SquareMagnitude() <= SquareTolerance || aD1V.SquareMagnitude() <= SquareTolerance + ? gp_Dir (gp_Vec (theFirstAttach, aProjector.Point (aPointIt))) + : gp_Dir (aD1U ^ aD1V); + + if (aFirstSurfN.IsParallel (aLocalDir, Precision::Angular()) && aProjector.Distance (aPointIt) < aMinDist) + { + aBestPointIndex = aPointIt; + aMinDist = aProjector.Distance (aPointIt); } } - for (; Explo.More(); Explo.Next()) - { - // CLE - // const TopoDS_Vertex & aVertex = TopoDS::Vertex( Explo.Current() ); - TopoDS_Vertex aVertex = TopoDS::Vertex( Explo.Current() ); - // ENDCLE - gp_Pnt aPoint = BRep_Tool::Pnt( aVertex ); - curdist2 = Line.SquareDistance( aPoint ); - if (curdist2 > MaxDist) - { - MaxDist = curdist2; - ResPnt = aPoint; - } - } - - if (MaxDist <= SquareTolerance) - { - const Standard_Integer NodeNumber = 20; - Explo.Init( aFace, TopAbs_EDGE ); - for (; Explo.More(); Explo.Next()) - { - // CLE - // const TopoDS_Edge & anEdge = TopoDS::Edge( Explo.Current() ); - TopoDS_Edge anEdge = TopoDS::Edge( Explo.Current() ); - // ENDCLE - BRepAdaptor_Curve aCurve( anEdge ); - Standard_Real FirstPar = aCurve.FirstParameter(); - Standard_Real LastPar = aCurve.LastParameter(); - Standard_Real Delta = (LastPar - FirstPar) / (NodeNumber - 1); - for (Standard_Integer i = 0; i < NodeNumber; i++) - { - gp_Pnt aPoint(0.0,0.0,0.0); - aCurve.D0( FirstPar, aPoint ); - curdist2 = Line.SquareDistance( aPoint ); - if (curdist2 > MaxDist) - { - MaxDist = curdist2; - ResPnt = aPoint; - } - FirstPar += Delta; - } - if (MaxDist > SquareTolerance) break; - } - } - if (MaxDist <= SquareTolerance) - Standard_ConstructionError::Raise("AIS:: problem attach point") ; - return ResPnt; -} - -void AIS::ComputeAngleBetweenPlanarFaces( const TopoDS_Face & FirstFace, - const TopoDS_Face & SecondFace, - const Handle( Geom_Surface )& Surf2, - const gp_Ax1 & Axis, - const Standard_Real Value, - const Standard_Boolean AutomaticPos, - gp_Pnt & Position, - gp_Pnt & Center, - gp_Pnt & FirstAttach, - gp_Pnt & SecondAttach, - gp_Dir & FirstDir, - gp_Dir & SecondDir ) -{ - FirstAttach = FindFarPoint( Axis, FirstFace ); - Center = AIS::ProjectPointOnLine( FirstAttach, gp_Lin( Axis ) ); - gp_Dir aDir1( gp_Vec( Center, FirstAttach ) ); - FirstDir = aDir1; - SecondAttach = FirstAttach.Rotated( Axis, Value ); - gp_Dir aDir2( gp_Vec( Center, SecondAttach ) ); - SecondDir = aDir2; - - GeomAPI_ProjectPointOnSurf aProjPnt( SecondAttach, - Surf2 ) ; - //SecondAttach = aProjPnt.Point(1) ; - Quantity_Parameter U,V ; - aProjPnt.Parameters(1,U,V) ; - BRepTopAdaptor_FClass2d aClassifier(SecondFace, - Precision::Confusion()); - if (aClassifier.Perform(gp_Pnt2d(U,V),Standard_False) == TopAbs_OUT || - aClassifier.Perform(gp_Pnt2d(U,V),Standard_False) == TopAbs_UNKNOWN) - SecondAttach = FindFarPoint( Axis, SecondFace ); - - if (AutomaticPos) - Position = FirstAttach.Rotated( Axis, Value*0.5 ); + if (aBestPointIndex == 0) + { + theSecondAttach = theFirstAttach; + } else - { - gp_Pln PlaneOfDim( Center, Axis.Direction() ); - Position = AIS::ProjectPointOnPlane( Position, PlaneOfDim ); - } -} - - -void AIS::ComputeAngleBetweenCurvilinearFaces( const TopoDS_Face & FirstFace, - const TopoDS_Face & SecondFace, - const Handle( Geom_Surface )& FirstSurf, - const Handle( Geom_Surface )& SecondSurf, - const AIS_KindOfSurface FirstSurfType, - const AIS_KindOfSurface SecondSurfType, - const gp_Ax1 & Axis, - const Standard_Real Value, - const Standard_Boolean AutomaticPos, - gp_Pnt & Position, - gp_Pnt & Center, - gp_Pnt & FirstAttach, - gp_Pnt & SecondAttach, - gp_Dir & FirstDir, - gp_Dir & SecondDir, - Handle( Geom_Plane ) & Plane ) -{ - // - // even if it is not AutomaticPosition do not assume the Automatic - // case has saved the values in the AIS_AngleDimension class : this - // is not always the case - // - gp_Pnt SavedPosition = Position ; - FirstAttach = FindFarPoint( Axis, FirstFace ); - Plane = new Geom_Plane( Axis.Location(), - gp_Dir( gp_Vec( Axis.Location(), FirstAttach ) ^ - gp_Vec( Axis.Direction() ) ) ); - - Handle( Geom_Line ) FirstLine, SecondLine; - Standard_Real FirstU, FirstV; - if (FirstSurfType == AIS_KOS_Cylinder) - ElSLib::Parameters( Handle( Geom_CylindricalSurface )::DownCast( FirstSurf )->Cylinder(), - FirstAttach, - FirstU, FirstV ); - else // it is Cone - ElSLib::Parameters( Handle( Geom_ConicalSurface )::DownCast( FirstSurf )->Cone(), - FirstAttach, - FirstU, FirstV ); - FirstLine = Handle( Geom_Line )::DownCast( FirstSurf->UIso( FirstU ) ); - - if (SecondSurfType == AIS_KOS_Cylinder) - { - Handle( Geom_CylindricalSurface ) Cylinder2 = - Handle( Geom_CylindricalSurface )::DownCast( SecondSurf ); - Standard_Real SecondU = Cylinder2->Cylinder().XAxis().Direction().Angle( - gp_Dir( gp_Vec( ProjectPointOnLine( FirstAttach, gp_Lin( Cylinder2->Cylinder().Axis() ) ), - FirstAttach ) ) ); - - SecondLine = Handle( Geom_Line )::DownCast( Cylinder2->UIso( SecondU ) ); - } - - else // it is Cone - { - Handle( Geom_ConicalSurface ) Cone2 = Handle( Geom_ConicalSurface )::DownCast( SecondSurf ); - gp_Dir Xdirection = Cone2->Cone().XAxis().Direction() ; - gp_Dir ToFirstAttach = gp_Dir( gp_Vec( - ProjectPointOnLine( FirstAttach, gp_Lin( Cone2->Cone().Axis() )), - FirstAttach ) ); - - Standard_Real SecondU = Xdirection.Angle( ToFirstAttach ); - // check sign - if (! Xdirection.IsEqual( ToFirstAttach, Precision::Angular() ) && - ! Xdirection.IsOpposite( ToFirstAttach, Precision::Angular() ) && - (Xdirection ^ ToFirstAttach) * Cone2->Cone().Axis().Direction() < 0.0e0) - SecondU = 2*M_PI - SecondU ; - - SecondLine = Handle( Geom_Line )::DownCast( Cone2->UIso( SecondU ) ); - - } - if (! (FirstLine->Lin().Direction().IsEqual( SecondLine->Lin().Direction(), Precision::Angular() )) && - ! (FirstLine->Lin().Direction().IsOpposite( SecondLine->Lin().Direction(), Precision::Angular() ))) - { - GeomAPI_ExtremaCurveCurve Intersection( FirstLine, SecondLine ); - Intersection.Points( 1, Center, Center ); - - if (Center.SquareDistance( FirstAttach ) <= SquareTolerance) - { - FirstAttach = AIS::Farest( FirstFace, Center ); - Standard_Real U, V; - if (FirstSurfType == AIS_KOS_Cylinder) - { - ElSLib::Parameters ( (Handle( Geom_CylindricalSurface )::DownCast( FirstSurf ))->Cylinder(), - FirstAttach, - U, V ); - FirstAttach = ElSLib::Value( FirstU, V, - (Handle( Geom_CylindricalSurface )::DownCast( FirstSurf )) - ->Cylinder() ); - } - else // it is Cone - { - ElSLib::Parameters ( (Handle( Geom_ConicalSurface )::DownCast( FirstSurf ))->Cone(), - FirstAttach, - U, V ); - FirstAttach = ElSLib::Value( FirstU, V, - (Handle( Geom_ConicalSurface )::DownCast( FirstSurf )) - ->Cone() ); - } - } - gp_Vec FirstVec( Center, FirstAttach ); - FirstDir = gp_Dir( FirstVec ); - - gp_Ax1 AxisOfRotation( Center, Plane->Pln().Axis().Direction() ); - SecondAttach = FirstAttach.Rotated( AxisOfRotation, Value ); - if (! SecondLine->Lin().Contains( SecondAttach, Precision::Confusion() )) - { - AxisOfRotation.Reverse(); - SecondAttach = FirstAttach.Rotated( AxisOfRotation, Value ); - } - - Position = FirstAttach.Rotated( AxisOfRotation, Value/2 ); + { + theSecondAttach = aProjector.Point (aBestPointIndex); + aProjector.Parameters (aBestPointIndex, aPU, aPV); - gp_Vec SecondVec( Center, SecondAttach ); - SecondDir = gp_Dir( SecondVec ); - - } - else // FirstLine and SecondLine are coincident - { - Position = SecondAttach = FirstAttach; - FirstDir = FirstLine->Lin().Direction(); - SecondDir = FirstDir; - Center = Position.Translated( gp_Vec( -FirstDir ) ); - //Position.Translate( gp_Vec( FirstDir ) ); - } - - GeomAPI_ProjectPointOnSurf aProjPnt( SecondAttach, SecondSurf ) ; - Quantity_Parameter U, V; - aProjPnt.LowerDistanceParameters( U, V ) ; - BRepTopAdaptor_FClass2d aClassifier2( SecondFace, Precision::Confusion()); - TopAbs_State State = aClassifier2.Perform( gp_Pnt2d( U, V ), Standard_True ); - if (State == TopAbs_OUT || State == TopAbs_UNKNOWN) - { - Standard_Real MinDist2 = RealLast(); - Standard_Real curdist2; - gp_Pnt curpnt(0.0,0.0,0.0); - gp_Pnt Result(0.0,0.0,0.0); - TopExp_Explorer Explo( SecondFace, TopAbs_VERTEX ); - for (; Explo.More(); Explo.Next()) - { - curpnt = BRep_Tool::Pnt( TopoDS::Vertex( Explo.Current() ) ); - curdist2 = SecondAttach.SquareDistance( curpnt ) ; - if (curpnt.SquareDistance( Center ) > SquareTolerance && curdist2 < MinDist2) - { - Result = curpnt; - MinDist2 = curdist2; - } - } - SecondAttach = Result; - } + // Now there is projection of FirstAttach onto SecondSurf in aProjector + BRepTopAdaptor_FClass2d aClassifier (theSecondFace, Precision::Confusion()); - if (! AutomaticPos) - { // protection in case this is created using the manual position - - - Position = AIS::ProjectPointOnPlane( SavedPosition, Plane->Pln() ); + TopAbs_State aState = + aClassifier.Perform (gp_Pnt2d (aPU, aPV), theSecondSurf->IsUPeriodic() || theSecondSurf->IsVPeriodic()); + + if (aState == TopAbs_OUT || aState == TopAbs_UNKNOWN) + { + theSecondAttach = AIS::Nearest (theSecondFace, theSecondAttach); } + } } - -void AIS::ComputeLengthBetweenCurvilinearFaces( const TopoDS_Face & FirstFace, - const TopoDS_Face & SecondFace, - Handle( Geom_Surface )& FirstSurf, - Handle( Geom_Surface )& SecondSurf, - const Standard_Boolean AutomaticPos, - Standard_Real & Value, - gp_Pnt & Position, - gp_Pnt & FirstAttach, - gp_Pnt & SecondAttach, - gp_Dir & DirAttach ) -{ - GeomAPI_ProjectPointOnSurf aProjector; - Quantity_Parameter U, V; - TopAbs_State State = TopAbs_UNKNOWN; - if (AutomaticPos) - { - TopExp_Explorer Explo( FirstFace, TopAbs_VERTEX ); - FirstAttach = BRep_Tool::Pnt( TopoDS::Vertex( Explo.Current() ) ); - aProjector.Init(FirstAttach , FirstSurf ); - FirstAttach = aProjector.NearestPoint(); - aProjector.LowerDistanceParameters( U, V ); - } - else // posiiton is given - { - aProjector.Init( Position, FirstSurf ); - FirstAttach = aProjector.NearestPoint(); - - aProjector.LowerDistanceParameters( U, V ); - BRepTopAdaptor_FClass2d aClassifier( FirstFace, Precision::Confusion() ); - State = aClassifier.Perform( gp_Pnt2d( U, V ), ( (FirstSurf->IsUPeriodic() || FirstSurf->IsVPeriodic())? - Standard_True - : Standard_False ) ); - if (State == TopAbs_OUT || State == TopAbs_UNKNOWN) - { - FirstAttach = AIS::Nearest( FirstFace, Position ); - aProjector.Init( FirstAttach, FirstSurf ); - aProjector.LowerDistanceParameters( U, V ); - } - } - - gp_Vec D1U, D1V; - FirstSurf->D1( U, V, FirstAttach, D1U, D1V ); - if (D1U.SquareMagnitude() <= SquareTolerance || D1V.SquareMagnitude() <= SquareTolerance) - { - FirstAttach = AIS::Farest( FirstFace, FirstAttach ); - aProjector.Init( FirstAttach, FirstSurf ); - aProjector.LowerDistanceParameters( U, V ); - FirstSurf->D1( U, V, FirstAttach, D1U, D1V ); - } - D1U.Normalize(); - D1V.Normalize(); - DirAttach = gp_Dir( D1U ^ D1V ); - - aProjector.Init( FirstAttach, SecondSurf ); - Standard_Integer Index = 0; - Quantity_Length MinDist = RealLast(); - gp_Dir LocalDir; - for (Standard_Integer i = 1; i <= aProjector.NbPoints(); i++) - { - aProjector.Parameters( i, U, V ); - - SecondSurf->D1( U, V, SecondAttach, D1U, D1V ); - if (D1U.SquareMagnitude() <= SquareTolerance || D1V.SquareMagnitude() <= SquareTolerance) - LocalDir = gp_Dir( gp_Vec( FirstAttach, aProjector.Point( i ) ) ); - else - LocalDir = gp_Dir( D1U ^ D1V ); - if (DirAttach.IsParallel( LocalDir, Precision::Angular() ) && aProjector.Distance( i ) < MinDist) - { - Index = i; - MinDist = aProjector.Distance( i ); - } - } -if (Index == 0) { - SecondAttach = FirstAttach; -} else { - SecondAttach = aProjector.Point( Index ); - aProjector.Parameters( Index, U, V ); - - Value = FirstAttach.Distance( SecondAttach ); - if (Value > Precision::Confusion()) - DirAttach = gp_Dir( gp_Vec( FirstAttach, SecondAttach ) ); - - if (AutomaticPos) - Position.SetXYZ( (FirstAttach.XYZ() + SecondAttach.XYZ()) / 2 ); - else if (State == TopAbs_OUT || State == TopAbs_UNKNOWN) - Position = AIS::ProjectPointOnLine( Position, gp_Lin( FirstAttach, DirAttach ) ); - - // Now there is projection of FirstAttach onto SecondSurf in aProjector - BRepTopAdaptor_FClass2d aClassifier( SecondFace, Precision::Confusion() ); - State = aClassifier.Perform( gp_Pnt2d( U, V ), ( (SecondSurf->IsUPeriodic() || SecondSurf->IsVPeriodic())? - Standard_True - : Standard_False ) ); - if (State == TopAbs_OUT || State == TopAbs_UNKNOWN) - SecondAttach = AIS::Nearest( SecondFace, SecondAttach ); -} -} gp_Pnt AIS::TranslatePointToBound( const gp_Pnt & aPoint, const gp_Dir & aDir, const Bnd_Box & aBndBox ) { if (aBndBox.IsOut( aPoint )) diff --git a/src/AIS/AIS_AngleDimension.cxx b/src/AIS/AIS_AngleDimension.cxx index c18b5f49e8..a274ef41fe 100755 --- a/src/AIS/AIS_AngleDimension.cxx +++ b/src/AIS/AIS_AngleDimension.cxx @@ -25,16 +25,19 @@ #include #include #include +#include +#include #include +#include +#include #include +#include +#include #include #include -#include #include -#include -#include -#include #include +#include #include #include #include @@ -42,13 +45,10 @@ #include #include #include -#include -#include #include #include #include #include -#include #include #include #include @@ -65,542 +65,263 @@ namespace static const Standard_Real THE_3D_TEXT_MARGIN = 0.1; }; -//======================================================================= -//function : init -//purpose : Private constructor for default initialization -//======================================================================= -void AIS_AngleDimension::init() -{ - // Default values of units - UnitsAPI::SetLocalSystem (UnitsAPI_SI); - SetUnitsQuantity ("PLANE ANGLE"); - SetModelUnits ("rad"); - SetDisplayUnits ("deg"); - SetSpecialSymbol (THE_DEGREE_SYMBOL); - SetDisplaySpecialSymbol (AIS_DSS_After); - SetFlyout (15.0); - SetKindOfDimension (AIS_KOD_PLANEANGLE); - MakeUnitsDisplayed (Standard_False); -} - //======================================================================= //function : Constructor -//purpose : Two edges dimension +//purpose : //======================================================================= AIS_AngleDimension::AIS_AngleDimension (const TopoDS_Edge& theFirstEdge, const TopoDS_Edge& theSecondEdge) -: AIS_Dimension(), - myIsFlyoutLines (Standard_True) +: AIS_Dimension (AIS_KOD_PLANEANGLE) { - init(); - myShapesNumber = 2; - myFirstShape = theFirstEdge; - mySecondShape = theSecondEdge; + Init(); + SetMeasuredGeometry (theFirstEdge, theSecondEdge); } //======================================================================= //function : Constructor -//purpose : Two edges dimension -// is used in case of Angle=PI -//======================================================================= -AIS_AngleDimension::AIS_AngleDimension (const TopoDS_Edge& theFirstEdge, - const TopoDS_Edge& theSecondEdge, - const gp_Pln& thePlane) -: AIS_Dimension(), - myIsFlyoutLines (Standard_True) -{ - init(); - myShapesNumber = 2; - myFirstShape = theFirstEdge; - mySecondShape = theSecondEdge; - SetWorkingPlane (thePlane); -} - -//======================================================================= -//function : Constructor -//purpose : Three points dimension +//purpose : //======================================================================= AIS_AngleDimension::AIS_AngleDimension (const gp_Pnt& theFirstPoint, const gp_Pnt& theSecondPoint, const gp_Pnt& theThirdPoint) -: AIS_Dimension(), - myIsFlyoutLines (Standard_True) +: AIS_Dimension (AIS_KOD_PLANEANGLE) { - init(); - myIsInitialized = Standard_True; - myFirstPoint = theFirstPoint; - myCenter = theSecondPoint; - mySecondPoint = theThirdPoint; - myShapesNumber = 3; + Init(); + SetMeasuredGeometry (theFirstPoint, theSecondPoint, theThirdPoint); } //======================================================================= //function : Constructor -//purpose : Cone dimension +//purpose : +//======================================================================= +AIS_AngleDimension::AIS_AngleDimension (const TopoDS_Vertex& theFirstVertex, + const TopoDS_Vertex& theSecondVertex, + const TopoDS_Vertex& theThirdVertex) +: AIS_Dimension (AIS_KOD_PLANEANGLE) +{ + Init(); + SetMeasuredGeometry (theFirstVertex, theSecondVertex, theThirdVertex); +} + +//======================================================================= +//function : Constructor +//purpose : //======================================================================= AIS_AngleDimension::AIS_AngleDimension (const TopoDS_Face& theCone) -: AIS_Dimension(), - myIsFlyoutLines (Standard_True) +: AIS_Dimension (AIS_KOD_PLANEANGLE) { - init(); - myIsInitialized = Standard_False; - myFirstShape = theCone; - myShapesNumber = 1; + Init(); + SetMeasuredGeometry (theCone); } //======================================================================= //function : Constructor -//purpose : Two faces dimension +//purpose : +//======================================================================= +AIS_AngleDimension::AIS_AngleDimension (const TopoDS_Face& theFirstFace, + const TopoDS_Face& theSecondFace) +: AIS_Dimension (AIS_KOD_PLANEANGLE) +{ + Init(); + SetMeasuredGeometry (theFirstFace, theSecondFace); +} + +//======================================================================= +//function : Constructor +//purpose : //======================================================================= AIS_AngleDimension::AIS_AngleDimension (const TopoDS_Face& theFirstFace, const TopoDS_Face& theSecondFace, - const gp_Ax1& theAxis) -: AIS_Dimension(), - myIsFlyoutLines (Standard_True) + const gp_Pnt& thePoint) +: AIS_Dimension (AIS_KOD_PLANEANGLE) { - init(); - myIsInitialized = Standard_False; - myFirstShape = theFirstFace; - mySecondShape = theSecondFace; - myShapesNumber = 2; - gp_Pln aPlane; - aPlane.SetAxis (theAxis); - SetWorkingPlane (aPlane); + Init(); + SetMeasuredGeometry (theFirstFace, theSecondFace, thePoint); } //======================================================================= -//function : SetFirstShape +//function : SetMeasuredGeometry //purpose : //======================================================================= -void AIS_AngleDimension::SetFirstShape (const TopoDS_Shape& theShape, - const Standard_Boolean isSingleShape /*= Standard_False*/) +void AIS_AngleDimension::SetMeasuredGeometry (const TopoDS_Edge& theFirstEdge, + const TopoDS_Edge& theSecondEdge) { - AIS_Dimension::SetFirstShape (theShape); - if (isSingleShape) - myShapesNumber = 1; + gp_Pln aComputedPlane; + + myFirstShape = theFirstEdge; + mySecondShape = theSecondEdge; + myThirdShape = TopoDS_Shape(); + myGeometryType = GeometryType_Edges; + myIsValid = InitTwoEdgesAngle (aComputedPlane); + + if (myIsValid && !myIsPlaneCustom) + { + myPlane = aComputedPlane; + } + + myIsValid &= CheckPlane (myPlane); + + SetToUpdate(); } //======================================================================= -//function : aboveInBelowCone -//purpose : Returns 1 if center is above of center; -// 0 if center is between and -// centers; -// -1 if center is below center. -//======================================================================= -Standard_Integer AIS_AngleDimension::aboveInBelowCone (const gp_Circ &theCMax, - const gp_Circ &theCMin, - const gp_Circ &theC) -{ - const Standard_Real aD = theCMax.Location().Distance (theCMin.Location()); - const Standard_Real aD1 = theCMax.Location().Distance (theC.Location()); - const Standard_Real aD2 = theCMin.Location().Distance (theC.Location()); - - if (aD >= aD1 && aD >= aD2) return 0; - if (aD < aD2 && aD1 < aD2) return -1; - if (aD < aD1 && aD2 < aD1) return 1; - return 0; -} - -//======================================================================= -//function : initConeAngle -//purpose : initialization of the cone angle -//======================================================================= -Standard_Boolean AIS_AngleDimension::initConeAngle (const TopoDS_Face& theCone) -{ - if (theCone.IsNull ()) - return Standard_False; - - gp_Pln aPln; - gp_Cone aCone; - gp_Circ aCircle; - // A surface from the Face - Handle(Geom_Surface) aSurf; - Handle(Geom_OffsetSurface) aOffsetSurf; - Handle(Geom_ConicalSurface) aConicalSurf; - Handle(Geom_SurfaceOfRevolution) aRevSurf; - Handle(Geom_Line) aLine; - BRepAdaptor_Surface aConeAdaptor (theCone); - TopoDS_Face aFace; - AIS_KindOfSurface aSurfType; - Standard_Real anOffset = 0.; - Handle(Standard_Type) aType; - - Standard_Real aMaxV = aConeAdaptor.FirstVParameter(); - Standard_Real aMinV = aConeAdaptor.LastVParameter(); - - AIS::GetPlaneFromFace(theCone, aPln, aSurf, aSurfType, anOffset); - - if (aSurfType == AIS_KOS_Revolution) - { - // Surface of revolution - aRevSurf = Handle(Geom_SurfaceOfRevolution)::DownCast(aSurf); - gp_Lin aLin (aRevSurf->Axis()); - Handle(Geom_Curve) aBasisCurve = aRevSurf->BasisCurve(); - //Must be a part of line (basis curve should be linear) - if (aBasisCurve ->DynamicType() != STANDARD_TYPE(Geom_Line)) - return Standard_False; - - gp_Pnt aFirst1 = aConeAdaptor.Value (0., aMinV); - gp_Pnt aLast1 = aConeAdaptor.Value (0., aMaxV); - gp_Vec aVec1 (aFirst1, aLast1); - - //Projection on - gp_Pnt aFirst2 = ElCLib::Value (ElCLib::Parameter (aLin, aFirst1), aLin); - // Projection on - gp_Pnt aLast2 = ElCLib::Value (ElCLib::Parameter (aLin, aLast1), aLin); - - gp_Vec aVec2 (aFirst2, aLast2); - - // Check if two parts of revolution are parallel (it's a cylinder) or normal (it's a circle). - if (aVec1.IsParallel (aVec2, Precision::Angular()) - || aVec1.IsNormal (aVec2,Precision::Angular())) - return Standard_False; - - gce_MakeCone aMkCone (aRevSurf->Axis(), aFirst1, aLast1); - aCone = aMkCone.Value(); - myCenter = aCone.Apex(); - } - else - { - aType = aSurf->DynamicType(); - if (aType == STANDARD_TYPE(Geom_OffsetSurface) || anOffset > 0.01) - { - // Offset surface - aOffsetSurf = new Geom_OffsetSurface (aSurf, anOffset); - aSurf = aOffsetSurf->Surface(); - BRepBuilderAPI_MakeFace aMkFace(aSurf, Precision::Confusion()); - aMkFace.Build(); - if (!aMkFace.IsDone()) - return Standard_False; - aConeAdaptor.Initialize (aMkFace.Face()); - } - aCone = aConeAdaptor.Cone(); - aConicalSurf = Handle(Geom_ConicalSurface)::DownCast (aSurf); - myCenter = aConicalSurf->Apex(); - } - - // A circle where the angle is drawn - Handle(Geom_Curve) aCurve; - Standard_Real aMidV = ( aMinV + aMaxV ) / 2.5; - aCurve = aSurf->VIso (aMidV); - aCircle = Handle(Geom_Circle)::DownCast (aCurve)->Circ(); - - aCurve = aSurf->VIso(aMaxV); - gp_Circ aCircVmax = Handle(Geom_Circle)::DownCast(aCurve)->Circ(); - aCurve = aSurf->VIso(aMinV); - gp_Circ aCircVmin = Handle(Geom_Circle)::DownCast(aCurve)->Circ(); - - - if (aCircVmax.Radius() < aCircVmin.Radius()) - { - gp_Circ aTmpCirc = aCircVmax; - aCircVmax = aCircVmin; - aCircVmin = aTmpCirc; - } - - myFirstPoint = ElCLib::Value (0, aCircle); - mySecondPoint = ElCLib::Value (M_PI, aCircle); - return Standard_True; -} - -//======================================================================= -//function : initTwoFacesAngle -//purpose : initialization of angle dimension between two faces -//======================================================================= -Standard_Boolean AIS_AngleDimension::initTwoFacesAngle () -{ - TopoDS_Face aFirstFace = TopoDS::Face (myFirstShape); - TopoDS_Face aSecondFace = TopoDS::Face (mySecondShape); - gp_Dir aFirstDir, aSecondDir; - gp_Pln aFirstPlane, aSecondPlane; - gp_Pnt aTextPos; - Handle(Geom_Surface) aFirstBasisSurf, aSecondBasisSurf; - AIS_KindOfSurface aFirstSurfType, aSecondSurfType; - Standard_Real aFirstOffset, aSecondOffset; - - AIS::GetPlaneFromFace (aFirstFace, aFirstPlane, - aFirstBasisSurf,aFirstSurfType,aFirstOffset); - AIS::GetPlaneFromFace (aSecondFace, aSecondPlane, - aSecondBasisSurf, aSecondSurfType, aSecondOffset); - - if (aFirstSurfType == AIS_KOS_Plane) - { - //Planar faces angle - AIS::ComputeAngleBetweenPlanarFaces (aFirstFace, - aSecondFace, - aSecondBasisSurf, - GetWorkingPlane().Axis(), - myValue, - Standard_True, - aTextPos, - myCenter, - myFirstPoint, - mySecondPoint, - aFirstDir, - aSecondDir); - } - else - { - // Curvilinear faces angle - Handle(Geom_Plane) aPlane = new Geom_Plane (GetWorkingPlane()); - AIS::ComputeAngleBetweenCurvilinearFaces (aFirstFace, - aSecondFace, - aFirstBasisSurf, - aSecondBasisSurf, - aFirstSurfType, - aSecondSurfType, - GetWorkingPlane().Axis(), - myValue, - Standard_True, - aTextPos, - myCenter, - myFirstPoint, - mySecondPoint, - aFirstDir, - aSecondDir, - aPlane); - SetWorkingPlane (aPlane->Pln()); - } - return Standard_True; -} - -//======================================================================= -//function : countDefaultPlane +//function : SetMeasuredGeometry //purpose : //======================================================================= -void AIS_AngleDimension::countDefaultPlane () +void AIS_AngleDimension::SetMeasuredGeometry (const gp_Pnt& theFirstPoint, + const gp_Pnt& theSecondPoint, + const gp_Pnt& theThirdPoint) { - if (!myIsInitialized) - return; - // Compute normal of the default plane. - gp_Vec aVec1(myCenter, myFirstPoint), - aVec2(myCenter, mySecondPoint); - myDefaultPlane = gp_Pln(myCenter, aVec1^aVec2); - // Set computed value to - ResetWorkingPlane (); + myFirstPoint = theFirstPoint; + myCenterPoint = theSecondPoint; + mySecondPoint = theThirdPoint; + myFirstShape = BRepLib_MakeVertex (myFirstPoint); + mySecondShape = BRepLib_MakeVertex (myCenterPoint); + myThirdShape = BRepLib_MakeVertex (mySecondPoint); + myGeometryType = GeometryType_Points; + myIsValid = IsValidPoints (myFirstPoint, myCenterPoint, mySecondPoint); + + if (myIsValid && !myIsPlaneCustom) + { + ComputePlane(); + } + + myIsValid &= CheckPlane (myPlane); + + SetToUpdate(); } //======================================================================= -//function : computeValue +//function : SetMeasuredGeometry //purpose : //======================================================================= -void AIS_AngleDimension::computeValue () +void AIS_AngleDimension::SetMeasuredGeometry (const TopoDS_Vertex& theFirstVertex, + const TopoDS_Vertex& theSecondVertex, + const TopoDS_Vertex& theThirdVertex) { - gp_Vec aVec1 (myCenter, myFirstPoint), - aVec2 (myCenter, mySecondPoint); - myValue = aVec1.Angle (aVec2); - // To model units - AIS_Dimension::computeValue(); + myFirstShape = theFirstVertex; + mySecondShape = theSecondVertex; + myThirdShape = theThirdVertex; + myFirstPoint = BRep_Tool::Pnt (theFirstVertex); + myCenterPoint = BRep_Tool::Pnt (theSecondVertex); + mySecondPoint = BRep_Tool::Pnt (theThirdVertex); + myGeometryType = GeometryType_Points; + myIsValid = IsValidPoints (myFirstPoint, myCenterPoint, mySecondPoint); + + if (myIsValid && !myIsPlaneCustom) + { + ComputePlane(); + } + + myIsValid &= CheckPlane (myPlane); + + SetToUpdate(); } //======================================================================= -//function : initTwoEdgesAngle -//purpose : Fill gp_Pnt fields for further presentation computation -// If intersection between two edges doesn't exist -// is set to false +//function : SetMeasuredGeometry +//purpose : //======================================================================= -Standard_Boolean AIS_AngleDimension::initTwoEdgesAngle () +void AIS_AngleDimension::SetMeasuredGeometry (const TopoDS_Face& theCone) { - // Data initialization - TopoDS_Edge aFirstEdge = TopoDS::Edge (myFirstShape); - TopoDS_Edge aSecondEdge = TopoDS::Edge (mySecondShape); - BRepAdaptor_Curve aMakeFirstLine (aFirstEdge); - BRepAdaptor_Curve aMakeSecondLine (aSecondEdge); + myFirstShape = theCone; + mySecondShape = TopoDS_Shape(); + myThirdShape = TopoDS_Shape(); + myGeometryType = GeometryType_Face; + myIsValid = InitConeAngle(); - if (aMakeFirstLine.GetType() != GeomAbs_Line || aMakeSecondLine.GetType() != GeomAbs_Line) + if (myIsValid && !myIsPlaneCustom) { - return Standard_False; + ComputePlane(); } - Handle(Geom_Line) aFirstLine = new Geom_Line (aMakeFirstLine.Line()); - Handle(Geom_Line) aSecondLine = new Geom_Line (aMakeSecondLine.Line()); + myIsValid &= CheckPlane (myPlane); - gp_Lin aFirstLin = aFirstLine->Lin (); - gp_Lin aSecondLin = aSecondLine->Lin (); - gp_Lin2d aFirstLin2d, aSecondLin2d; - Standard_Boolean isParallelLines = aFirstLin.Direction().IsParallel (aSecondLin.Direction(), Precision::Angular()); - Standard_Boolean isSameLines = isParallelLines && aFirstLin.Distance (aSecondLin.Location()) <= Precision::Confusion(); - // In case where we can't compute plane automatically - if ((isParallelLines || isSameLines) && !myIsWorkingPlaneCustom) - { - return Standard_False; - } - - gp_Pln aPlane; - - /// PART 1 is for automatic plane computation from two edges if it is possible - // Build plane - if (!myIsWorkingPlaneCustom) - { - gp_Pnt aPoint = aFirstLine->Value (0.); - gp_Dir aNormal = isParallelLines - ? gp_Vec(aSecondLin.Normal (aPoint).Direction()) ^ gp_Vec (aSecondLin.Direction()) - : gp_Vec (aFirstLin.Direction()) ^ gp_Vec (aSecondLin.Direction()); - aPlane = gp_Pln (aPoint, aNormal); - resetWorkingPlane (aPlane); - } - else - { - aPlane = GetWorkingPlane(); - } - - // Compute geometry for this plane and edges - Standard_Boolean isInfinite1,isInfinite2; - gp_Pnt aFirstPoint1, aLastPoint1, aFirstPoint2, aLastPoint2; - Standard_Integer anExtIndex = -1; - Handle(Geom_Curve) anExtCurve; - Handle(Geom_Plane) aGeomPlane = new Geom_Plane (aPlane); - if (!AIS::ComputeGeometry (aFirstEdge, aSecondEdge, - anExtIndex, - aFirstLine, aSecondLine, - aFirstPoint1, aLastPoint1, - aFirstPoint2, aLastPoint2, - anExtCurve, - isInfinite1, isInfinite2, - aGeomPlane)) - { - return Standard_False; - } - - // Check if both edges are on this plane - if (!anExtCurve.IsNull()) - { - if (anExtIndex == 1) // First curve is out of the plane - { - // Project curve on the plane - if (myIsWorkingPlaneCustom) - { - aFirstLin2d = ProjLib::Project (aPlane, aFirstLin); - aFirstLin = ElCLib::To3d (aPlane.Position().Ax2(), aFirstLin2d); - } - else - { - aFirstLin.Translate (gp_Vec (aFirstLin.Location(), aSecondLin.Location())); - } - - aFirstLine = new Geom_Line (aFirstLin); - } - else if (anExtIndex == 2) // Second curve is out of the plane - { - if (myIsWorkingPlaneCustom) - { - aSecondLin2d = ProjLib::Project (aPlane, aSecondLin); - aSecondLin = ElCLib::To3d (aPlane.Position().Ax2(), aSecondLin2d); - } - else - { - aSecondLin.Translate (gp_Vec (aSecondLin.Location(), aFirstLin.Location())); - } - - aSecondLine = new Geom_Line (aSecondLin); - } - } - - /// PART 2 is for dimension computation using the working plane - - if (aFirstLin.Direction ().IsParallel (aSecondLin.Direction (), Precision::Angular ())) - { - // Parallel lines - isSameLines = aFirstLin.Distance(aSecondLin.Location()) <= Precision::Confusion(); - if (!isSameLines) - return Standard_False; - - myFirstPoint = aFirstLin.Location(); - mySecondPoint = ElCLib::Value (ElCLib::Parameter (aFirstLin, myFirstPoint), aSecondLin); - if (mySecondPoint.Distance (mySecondPoint) <= Precision::Confusion ()) - mySecondPoint.Translate (gp_Vec (aSecondLin.Direction ())*Abs(GetFlyout())); - myCenter.SetXYZ( (myFirstPoint.XYZ() + mySecondPoint.XYZ()) / 2. ); - } - else - { - // Find intersection - aFirstLin2d = ProjLib::Project (aPlane, aFirstLin); - aSecondLin2d = ProjLib::Project (aPlane, aSecondLin); - - IntAna2d_AnaIntersection anInt2d (aFirstLin2d, aSecondLin2d); - gp_Pnt2d anIntersectPoint; - if (!anInt2d.IsDone() || anInt2d.IsEmpty()) - { - return Standard_False; - } - - anIntersectPoint = gp_Pnt2d (anInt2d.Point(1).Value()); - myCenter = ElCLib::To3d(aPlane.Position().Ax2(), anIntersectPoint); - - if (isInfinite1 || isInfinite2) - { - myFirstPoint = myCenter.Translated (gp_Vec (aFirstLin.Direction())*Abs (GetFlyout())); - mySecondPoint = myCenter.Translated (gp_Vec (aSecondLin.Direction())*Abs (GetFlyout())); - return Standard_True; - } - - // | - // | <- dimension should be here - // *---- - myFirstPoint = myCenter.Distance (aFirstPoint1) > myCenter.Distance (aLastPoint1) ? aFirstPoint1 : aLastPoint1; - mySecondPoint = myCenter.Distance (aFirstPoint2) > myCenter.Distance (aLastPoint2) ? aFirstPoint2 : aLastPoint2; - } - return Standard_True; + SetToUpdate(); } //======================================================================= -//function: getCenterOnArc +//function : SetMeasuredGeometry +//purpose : +//======================================================================= +void AIS_AngleDimension::SetMeasuredGeometry (const TopoDS_Face& theFirstFace, + const TopoDS_Face& theSecondFace) +{ + myFirstShape = theFirstFace; + mySecondShape = theSecondFace; + myThirdShape = TopoDS_Shape(); + myGeometryType = GeometryType_Faces; + myIsValid = InitTwoFacesAngle(); + + if (myIsValid && !myIsPlaneCustom) + { + ComputePlane(); + } + + myIsValid &= CheckPlane (myPlane); + + SetToUpdate(); +} + +//======================================================================= +//function : SetMeasuredGeometry +//purpose : +//======================================================================= +void AIS_AngleDimension::SetMeasuredGeometry (const TopoDS_Face& theFirstFace, + const TopoDS_Face& theSecondFace, + const gp_Pnt& thePoint) +{ + myFirstShape = theFirstFace; + mySecondShape = theSecondFace; + myThirdShape = TopoDS_Shape(); + myGeometryType = GeometryType_Faces; + myIsValid = InitTwoFacesAngle (thePoint); + + if (myIsValid && !myIsPlaneCustom) + { + ComputePlane(); + } + + myIsValid &= CheckPlane (myPlane); + + SetToUpdate(); +} + +//======================================================================= +//function : Init +//purpose : +//======================================================================= +void AIS_AngleDimension::Init() +{ + SetSpecialSymbol (THE_DEGREE_SYMBOL); + SetDisplaySpecialSymbol (AIS_DSS_After); + SetFlyout (15.0); +} + +//======================================================================= +//function: GetCenterOnArc //purpose : //======================================================================= -gp_Pnt AIS_AngleDimension::getCenterOnArc (const gp_Pnt& theFirstAttach, - const gp_Pnt& theSecondAttach) -{ - gp_Pnt2d aCenter2d = ProjLib::Project (GetWorkingPlane(), myCenter), - aFirstAttach2d = ProjLib::Project (GetWorkingPlane(), theFirstAttach), - aSecondAttach2d = ProjLib::Project (GetWorkingPlane(), theSecondAttach); - gp_Lin2d anAttachLine2d = gce_MakeLin2d (aFirstAttach2d, aSecondAttach2d); - - // Getting text center - gp_Pnt2d aTextCenterPnt = ElCLib::Value ((ElCLib::Parameter (anAttachLine2d, aFirstAttach2d) + ElCLib::Parameter (anAttachLine2d, aSecondAttach2d)) / 2., anAttachLine2d); - gp_Lin2d aCenterToTextCenterLin = gce_MakeLin2d (aCenter2d, aTextCenterPnt); - - // Drawing circle - Standard_Real aRadius = theFirstAttach.Distance (myCenter); - gp_Circ2d aCircle (gp_Ax22d (aCenter2d, gp_Dir2d (1, 0)), aRadius); - - // Getting text position in the center of arc - IntAna2d_AnaIntersection anInt2d (aCenterToTextCenterLin, aCircle); - gp_Pnt2d aTextCenterOnArc2d; - if (anInt2d.IsDone()) - if (!anInt2d.IsEmpty()) - aTextCenterOnArc2d = gp_Pnt2d (anInt2d.Point (1).Value()); - gp_Pnt aCenterOnArc = ElCLib::To3d (GetWorkingPlane().Position().Ax2(), aTextCenterOnArc2d); - return aCenterOnArc; -} - -//======================================================================= -//function: drawArcWithText -//purpose : -//======================================================================= -void AIS_AngleDimension::drawArcWithText (const Handle(Prs3d_Presentation)& thePresentation, - const gp_Pnt& theFirstAttach, - const gp_Pnt& theSecondAttach, - const TCollection_ExtendedString& theText, - const Standard_Real theTextWidth, - const Standard_Integer theMode, - const Standard_Integer theLabelPosition) +gp_Pnt AIS_AngleDimension::GetCenterOnArc (const gp_Pnt& theFirstAttach, + const gp_Pnt& theSecondAttach, + const gp_Pnt& theCenter) { // construct plane where the circle and the arc are located - gce_MakePln aConstructPlane (theFirstAttach, theSecondAttach, myCenter); + gce_MakePln aConstructPlane (theFirstAttach, theSecondAttach, theCenter); if (!aConstructPlane.IsDone()) { - return; + return gp::Origin(); } gp_Pln aPlane = aConstructPlane.Value(); - Standard_Real aRadius = theFirstAttach.Distance (myCenter); + Standard_Real aRadius = theFirstAttach.Distance (theCenter); // construct circle forming the arc - gce_MakeCirc aConstructCircle (myCenter, aPlane, aRadius); + gce_MakeCirc aConstructCircle (theCenter, aPlane, aRadius); if (!aConstructCircle.IsDone()) { - return; + return gp::Origin(); } gp_Circ aCircle = aConstructCircle.Value(); @@ -608,62 +329,16 @@ void AIS_AngleDimension::drawArcWithText (const Handle(Prs3d_Presentation)& theP // compute angle parameters of arc end-points on circle Standard_Real aParamBeg = ElCLib::Parameter (aCircle, theFirstAttach); Standard_Real aParamEnd = ElCLib::Parameter (aCircle, theSecondAttach); - ElCLib::AdjustPeriodic (aParamBeg, aParamEnd, - Precision::PConfusion(), - aParamBeg, aParamEnd); + ElCLib::AdjustPeriodic (0.0, M_PI * 2, Precision::PConfusion(), aParamBeg, aParamEnd); - // middle point of arc parameter on circle - Standard_Real aParamMid = (aParamBeg + aParamEnd) * 0.5; - - // add text graphical primitives - if (theMode == ComputeMode_All || theMode == ComputeMode_Text) - { - gp_Pnt aTextPos = ElCLib::Value (aParamMid, aCircle); - gp_Dir aTextDir = IsTextReversed() - ? gce_MakeDir (theSecondAttach, theFirstAttach) - : gce_MakeDir (theFirstAttach, theSecondAttach); - - // Drawing text - drawText (thePresentation, - aTextPos, - aTextDir, - theText, - theLabelPosition); - } - - if (theMode != ComputeMode_All && theMode != ComputeMode_Line) - { - return; - } - - Handle(Prs3d_DimensionAspect) aDimensionAspect = myDrawer->DimensionAspect(); - - Standard_Boolean isLineBreak = aDimensionAspect->TextVerticalPosition() == Prs3d_DTVP_Center - && aDimensionAspect->IsText3d(); - - if (isLineBreak) - { - // compute gap for label as parameteric size of sector on circle segment - Standard_Real aSectorOnCircle = theTextWidth / aRadius; - - gp_Pnt aTextPntBeg = ElCLib::Value (aParamMid - aSectorOnCircle * 0.5, aCircle); - gp_Pnt aTextPntEnd = ElCLib::Value (aParamMid + aSectorOnCircle * 0.5, aCircle); - - // Drawing arcs - drawArc (thePresentation, theFirstAttach, aTextPntBeg, myCenter, aRadius, theMode); - drawArc (thePresentation, theSecondAttach, aTextPntEnd, myCenter, aRadius, theMode); - } - else - { - drawArc (thePresentation, theFirstAttach, theSecondAttach, myCenter, aRadius, theMode); - } + return ElCLib::Value ((aParamBeg + aParamEnd) * 0.5, aCircle); } //======================================================================= -//function : drawArc +//function : DrawArc //purpose : draws the arc between two attach points //======================================================================= -void AIS_AngleDimension::drawArc (const Handle(Prs3d_Presentation)& thePresentation, +void AIS_AngleDimension::DrawArc (const Handle(Prs3d_Presentation)& thePresentation, const gp_Pnt& theFirstAttach, const gp_Pnt& theSecondAttach, const gp_Pnt& theCenter, @@ -741,6 +416,180 @@ void AIS_AngleDimension::drawArc (const Handle(Prs3d_Presentation)& thePresentat } } +//======================================================================= +//function: DrawArcWithText +//purpose : +//======================================================================= +void AIS_AngleDimension::DrawArcWithText (const Handle(Prs3d_Presentation)& thePresentation, + const gp_Pnt& theFirstAttach, + const gp_Pnt& theSecondAttach, + const gp_Pnt& theCenter, + const TCollection_ExtendedString& theText, + const Standard_Real theTextWidth, + const Standard_Integer theMode, + const Standard_Integer theLabelPosition) +{ + // construct plane where the circle and the arc are located + gce_MakePln aConstructPlane (theFirstAttach, theSecondAttach, theCenter); + if (!aConstructPlane.IsDone()) + { + return; + } + + gp_Pln aPlane = aConstructPlane.Value(); + + Standard_Real aRadius = theFirstAttach.Distance (myCenterPoint); + + // construct circle forming the arc + gce_MakeCirc aConstructCircle (theCenter, aPlane, aRadius); + if (!aConstructCircle.IsDone()) + { + return; + } + + gp_Circ aCircle = aConstructCircle.Value(); + + // compute angle parameters of arc end-points on circle + Standard_Real aParamBeg = ElCLib::Parameter (aCircle, theFirstAttach); + Standard_Real aParamEnd = ElCLib::Parameter (aCircle, theSecondAttach); + ElCLib::AdjustPeriodic (0.0, M_PI * 2, Precision::PConfusion(), aParamBeg, aParamEnd); + + // middle point of arc parameter on circle + Standard_Real aParamMid = (aParamBeg + aParamEnd) * 0.5; + + // add text graphical primitives + if (theMode == ComputeMode_All || theMode == ComputeMode_Text) + { + gp_Pnt aTextPos = ElCLib::Value (aParamMid, aCircle); + gp_Dir aTextDir = gce_MakeDir (theFirstAttach, theSecondAttach); + + // Drawing text + DrawText (thePresentation, + aTextPos, + aTextDir, + theText, + theLabelPosition); + } + + if (theMode != ComputeMode_All && theMode != ComputeMode_Line) + { + return; + } + + Handle(Prs3d_DimensionAspect) aDimensionAspect = myDrawer->DimensionAspect(); + + Standard_Boolean isLineBreak = aDimensionAspect->TextVerticalPosition() == Prs3d_DTVP_Center + && aDimensionAspect->IsText3d(); + + if (isLineBreak) + { + // compute gap for label as parameteric size of sector on circle segment + Standard_Real aSectorOnCircle = theTextWidth / aRadius; + + gp_Pnt aTextPntBeg = ElCLib::Value (aParamMid - aSectorOnCircle * 0.5, aCircle); + gp_Pnt aTextPntEnd = ElCLib::Value (aParamMid + aSectorOnCircle * 0.5, aCircle); + + // Drawing arcs + DrawArc (thePresentation, theFirstAttach, aTextPntBeg, theCenter, aRadius, theMode); + DrawArc (thePresentation, theSecondAttach, aTextPntEnd, theCenter, aRadius, theMode); + } + else + { + DrawArc (thePresentation, theFirstAttach, theSecondAttach, theCenter, aRadius, theMode); + } +} + +//======================================================================= +//function : CheckPlane +//purpose : +//======================================================================= +Standard_Boolean AIS_AngleDimension::CheckPlane (const gp_Pln& thePlane)const +{ + if (!thePlane.Contains (myFirstPoint, Precision::Confusion()) && + !thePlane.Contains (mySecondPoint, Precision::Confusion()) && + !thePlane.Contains (myCenterPoint, Precision::Confusion())) + { + return Standard_False; + } + + return Standard_True; +} + +//======================================================================= +//function : ComputePlane +//purpose : +//======================================================================= +void AIS_AngleDimension::ComputePlane() +{ + if (!IsValid()) + { + return; + } + + gp_Vec aFirstVec = gp_Vec (myCenterPoint, myFirstPoint).Normalized(); + gp_Vec aSecondVec = gp_Vec (myCenterPoint, mySecondPoint).Normalized(); + gp_Vec aDirectionN = aSecondVec.Crossed (aFirstVec).Normalized(); + gp_Vec aDirectionY = (aFirstVec + aSecondVec).Normalized(); + gp_Vec aDirectionX = aDirectionY.Crossed (aDirectionN).Normalized(); + + myPlane = gp_Pln (gp_Ax3 (myCenterPoint, gp_Dir (aDirectionN), gp_Dir (aDirectionX))); +} + +//======================================================================= +//function : GetModelUnits +//purpose : +//======================================================================= +const TCollection_AsciiString& AIS_AngleDimension::GetModelUnits() const +{ + return myDrawer->DimAngleModelUnits(); +} + +//======================================================================= +//function : GetDisplayUnits +//purpose : +//======================================================================= +const TCollection_AsciiString& AIS_AngleDimension::GetDisplayUnits() const +{ + return myDrawer->DimAngleDisplayUnits(); +} + +//======================================================================= +//function : SetModelUnits +//purpose : +//======================================================================= +void AIS_AngleDimension::SetModelUnits (const TCollection_AsciiString& theUnits) +{ + myDrawer->SetDimAngleModelUnits (theUnits); +} + +//======================================================================= +//function : SetDisplayUnits +//purpose : +//======================================================================= +void AIS_AngleDimension::SetDisplayUnits (const TCollection_AsciiString& theUnits) +{ + myDrawer->SetDimAngleDisplayUnits (theUnits); +} + +//======================================================================= +//function : ComputeValue +//purpose : +//======================================================================= +Standard_Real AIS_AngleDimension::ComputeValue() const +{ + if (!IsValid()) + { + return 0.0; + } + + gp_Vec aVec1 (myCenterPoint, myFirstPoint); + gp_Vec aVec2 (myCenterPoint, mySecondPoint); + + Standard_Real anAngle = aVec2.AngleWithRef (aVec1, GetPlane().Axis().Direction()); + + return anAngle > 0.0 ? anAngle : (2.0 * M_PI - anAngle); +} + //======================================================================= //function : Compute //purpose : Having three gp_Pnt points compute presentation @@ -751,69 +600,31 @@ void AIS_AngleDimension::Compute (const Handle(PrsMgr_PresentationManager3d)& /* { thePresentation->Clear(); mySelectionGeom.Clear (theMode); - Handle(SelectMgr_EntityOwner) anEmptyOwner; - if (!myIsInitialized) + if (!IsValid()) { - if (myShapesNumber == 1) - { - myIsInitialized = initConeAngle (TopoDS::Face (myFirstShape)); - } - else if (myShapesNumber == 2) - { - switch (myFirstShape.ShapeType()) - { - case TopAbs_FACE: - { - myIsInitialized = initTwoFacesAngle (); - } - break; - case TopAbs_EDGE: - { - myIsInitialized = initTwoEdgesAngle (); - } - break; - default: - return; - } - } - else - return; - } - - // If initialization failed - if (!myIsInitialized) return; + } // Parameters for presentation Handle(Prs3d_DimensionAspect) aDimensionAspect = myDrawer->DimensionAspect(); - Prs3d_Root::CurrentGroup(thePresentation)->SetPrimitivesAspect(aDimensionAspect->LineAspect()->Aspect()); + Prs3d_Root::CurrentGroup(thePresentation)->SetPrimitivesAspect (aDimensionAspect->LineAspect()->Aspect()); Quantity_Length anArrowLength = aDimensionAspect->ArrowAspect()->Length(); - if (!myIsValueCustom) - { - computeValue(); - } - - TCollection_ExtendedString aValueString; - Standard_Real aTextLength; - getTextWidthAndString (aTextLength, aValueString); + // prepare label string and compute its geometrical width + Standard_Real aLabelWidth; + TCollection_ExtendedString aLabelString = GetValueString (aLabelWidth); // add margins to label width if (aDimensionAspect->IsText3d()) { - aTextLength += aDimensionAspect->TextAspect()->Height() * THE_3D_TEXT_MARGIN * 2.0; + aLabelWidth += aDimensionAspect->TextAspect()->Height() * THE_3D_TEXT_MARGIN * 2.0; } - if (!myIsWorkingPlaneCustom) - { - countDefaultPlane(); - } - - gp_Pnt aFirstAttach = myCenter.Translated (gp_Vec(myCenter, myFirstPoint).Normalized() * GetFlyout()); - gp_Pnt aSecondAttach = myCenter.Translated (gp_Vec(myCenter, mySecondPoint).Normalized() * GetFlyout()); + gp_Pnt aFirstAttach = myCenterPoint.Translated (gp_Vec(myCenterPoint, myFirstPoint).Normalized() * GetFlyout()); + gp_Pnt aSecondAttach = myCenterPoint.Translated (gp_Vec(myCenterPoint, mySecondPoint).Normalized() * GetFlyout()); // Handle user-defined and automatic arrow placement bool isArrowsExternal = false; @@ -833,16 +644,16 @@ void AIS_AngleDimension::Compute (const Handle(PrsMgr_PresentationManager3d)& /* Standard_Real anArrowsWidth = (anArrowLength + anArrowMargin) * 2.0; - isArrowsExternal = aDimensionWidth < aTextLength + anArrowsWidth; + isArrowsExternal = aDimensionWidth < aLabelWidth + anArrowsWidth; break; } } //Arrows positions and directions - gp_Vec aWPDir = gp_Vec (GetWorkingPlane().Axis().Direction()); + gp_Vec aWPDir = gp_Vec (GetPlane().Axis().Direction()); - gp_Dir aFirstExtensionDir = gp_Vec (myCenter, aFirstAttach) ^ aWPDir; - gp_Dir aSecondExtensionDir = gp_Vec (myCenter, aSecondAttach)^ aWPDir.Reversed(); + gp_Dir aFirstExtensionDir = aWPDir ^ gp_Vec (myCenterPoint, aFirstAttach); + gp_Dir aSecondExtensionDir = aWPDir.Reversed() ^ gp_Vec (myCenterPoint, aSecondAttach); gp_Vec aFirstArrowVec = gp_Vec (aFirstExtensionDir) * anArrowLength; gp_Vec aSecondArrowVec = gp_Vec (aSecondExtensionDir) * anArrowLength; @@ -876,7 +687,7 @@ void AIS_AngleDimension::Compute (const Handle(PrsMgr_PresentationManager3d)& /* gp_Vec anAttachVector (aFirstAttach, aSecondAttach); Standard_Real aDimensionWidth = anAttachVector.Magnitude(); Standard_Real anArrowsWidth = anArrowLength * 2.0; - Standard_Real aContentWidth = isArrowsExternal ? aTextLength : aTextLength + anArrowsWidth; + Standard_Real aContentWidth = isArrowsExternal ? aLabelWidth : aLabelWidth + anArrowsWidth; aLabelPosition |= aDimensionWidth < aContentWidth ? LabelPosition_Left : LabelPosition_HCenter; break; @@ -907,11 +718,12 @@ void AIS_AngleDimension::Compute (const Handle(PrsMgr_PresentationManager3d)& /* if (isLineBreak) { - drawArcWithText (thePresentation, + DrawArcWithText (thePresentation, aFirstAttach, aSecondAttach, - aValueString, - aTextLength, + myCenterPoint, + aLabelString, + aLabelWidth, theMode, aLabelPosition); break; @@ -920,23 +732,23 @@ void AIS_AngleDimension::Compute (const Handle(PrsMgr_PresentationManager3d)& /* // compute text primitives if (theMode == ComputeMode_All || theMode == ComputeMode_Text) { - gp_Vec aDimensionDir (aFirstArrowEnd, aSecondArrowBegin); - gp_Pnt aTextPos = getCenterOnArc (aFirstArrowEnd, aSecondArrowBegin); - gp_Dir aTextDir = myIsTextReversed ? aDimensionDir.Reversed() : aDimensionDir; + gp_Vec aDimensionDir (aFirstAttach, aSecondAttach); + gp_Pnt aTextPos = GetCenterOnArc (aFirstAttach, aSecondAttach, myCenterPoint); + gp_Dir aTextDir = aDimensionDir; - drawText (thePresentation, + DrawText (thePresentation, aTextPos, aTextDir, - aValueString, + aLabelString, aLabelPosition); } if (theMode == ComputeMode_All || theMode == ComputeMode_Line) { - drawArc (thePresentation, + DrawArc (thePresentation, isArrowsExternal ? aFirstAttach : aFirstArrowEnd, isArrowsExternal ? aSecondAttach : aSecondArrowEnd, - myCenter, + myCenterPoint, Abs (GetFlyout()), theMode); } @@ -945,12 +757,12 @@ void AIS_AngleDimension::Compute (const Handle(PrsMgr_PresentationManager3d)& /* case LabelPosition_Left : { - drawExtension (thePresentation, + DrawExtension (thePresentation, anExtensionSize, isArrowsExternal ? aFirstArrowEnd : aFirstAttach, aFirstExtensionDir, - aValueString, - aTextLength, + aLabelString, + aLabelWidth, theMode, aLabelPosition); } @@ -958,12 +770,12 @@ void AIS_AngleDimension::Compute (const Handle(PrsMgr_PresentationManager3d)& /* case LabelPosition_Right : { - drawExtension (thePresentation, + DrawExtension (thePresentation, anExtensionSize, isArrowsExternal ? aSecondArrowEnd : aSecondAttach, aSecondExtensionDir, - aValueString, - aTextLength, + aLabelString, + aLabelWidth, theMode, aLabelPosition); } @@ -975,10 +787,10 @@ void AIS_AngleDimension::Compute (const Handle(PrsMgr_PresentationManager3d)& /* { Prs3d_Root::NewGroup (thePresentation); - drawArc (thePresentation, + DrawArc (thePresentation, isArrowsExternal ? aFirstAttach : aFirstArrowEnd, isArrowsExternal ? aSecondAttach : aSecondArrowEnd, - myCenter, + myCenterPoint, Abs(GetFlyout ()), theMode); } @@ -988,8 +800,8 @@ void AIS_AngleDimension::Compute (const Handle(PrsMgr_PresentationManager3d)& /* { Prs3d_Root::NewGroup (thePresentation); - drawArrow (thePresentation, aFirstArrowBegin, gp_Dir (aFirstArrowVec)); - drawArrow (thePresentation, aSecondArrowBegin, gp_Dir (aSecondArrowVec)); + DrawArrow (thePresentation, aFirstArrowBegin, gp_Dir (aFirstArrowVec)); + DrawArrow (thePresentation, aSecondArrowBegin, gp_Dir (aSecondArrowVec)); } if ((theMode == ComputeMode_All || theMode == ComputeMode_Line) && isArrowsExternal) @@ -998,7 +810,7 @@ void AIS_AngleDimension::Compute (const Handle(PrsMgr_PresentationManager3d)& /* if (aHPosition != LabelPosition_Left) { - drawExtension (thePresentation, + DrawExtension (thePresentation, anExtensionSize, aFirstArrowEnd, aFirstExtensionDir, @@ -1010,7 +822,7 @@ void AIS_AngleDimension::Compute (const Handle(PrsMgr_PresentationManager3d)& /* if (aHPosition != LabelPosition_Right) { - drawExtension (thePresentation, + DrawExtension (thePresentation, anExtensionSize, aSecondArrowEnd, aSecondExtensionDir, @@ -1022,14 +834,14 @@ void AIS_AngleDimension::Compute (const Handle(PrsMgr_PresentationManager3d)& /* } // flyouts - if (theMode == ComputeMode_All && myIsFlyoutLines) + if (theMode == ComputeMode_All) { Prs3d_Root::NewGroup (thePresentation); Handle(Graphic3d_ArrayOfSegments) aPrimSegments = new Graphic3d_ArrayOfSegments (4); - aPrimSegments->AddVertex (myCenter); + aPrimSegments->AddVertex (myCenterPoint); aPrimSegments->AddVertex (aFirstAttach); - aPrimSegments->AddVertex (myCenter); + aPrimSegments->AddVertex (myCenterPoint); aPrimSegments->AddVertex (aSecondAttach); Handle(Graphic3d_AspectLine3d) aFlyoutStyle = myDrawer->DimensionAspect()->LineAspect()->Aspect(); @@ -1037,27 +849,342 @@ void AIS_AngleDimension::Compute (const Handle(PrsMgr_PresentationManager3d)& /* Prs3d_Root::CurrentGroup (thePresentation)->AddPrimitiveArray (aPrimSegments); } - setComputed (Standard_True); + myIsComputed = Standard_True; } //======================================================================= -//function : computeFlyoutSelection +//function : ComputeFlyoutSelection //purpose : computes selection for flyouts //======================================================================= -void AIS_AngleDimension::computeFlyoutSelection (const Handle(SelectMgr_Selection)& theSelection, +void AIS_AngleDimension::ComputeFlyoutSelection (const Handle(SelectMgr_Selection)& theSelection, const Handle(SelectMgr_EntityOwner)& theOwner) { - if (!myIsFlyoutLines) - { - return; - } - - gp_Pnt aFirstAttach = myCenter.Translated (gp_Vec (myCenter, myFirstPoint).Normalized() * GetFlyout()); - gp_Pnt aSecondAttach = myCenter.Translated (gp_Vec (myCenter, mySecondPoint).Normalized() * GetFlyout()); + gp_Pnt aFirstAttach = myCenterPoint.Translated (gp_Vec (myCenterPoint, myFirstPoint).Normalized() * GetFlyout()); + gp_Pnt aSecondAttach = myCenterPoint.Translated (gp_Vec (myCenterPoint, mySecondPoint).Normalized() * GetFlyout()); Handle(Select3D_SensitiveGroup) aSensitiveEntity = new Select3D_SensitiveGroup (theOwner); - aSensitiveEntity->Add (new Select3D_SensitiveSegment (theOwner, myCenter, aFirstAttach)); - aSensitiveEntity->Add (new Select3D_SensitiveSegment (theOwner, myCenter, aSecondAttach)); + aSensitiveEntity->Add (new Select3D_SensitiveSegment (theOwner, myCenterPoint, aFirstAttach)); + aSensitiveEntity->Add (new Select3D_SensitiveSegment (theOwner, myCenterPoint, aSecondAttach)); theSelection->Add (aSensitiveEntity); } + +//======================================================================= +//function : InitTwoEdgesAngle +//purpose : +//======================================================================= +Standard_Boolean AIS_AngleDimension::InitTwoEdgesAngle (gp_Pln& theComputedPlane) +{ + TopoDS_Edge aFirstEdge = TopoDS::Edge (myFirstShape); + TopoDS_Edge aSecondEdge = TopoDS::Edge (mySecondShape); + + BRepAdaptor_Curve aMakeFirstLine (aFirstEdge); + BRepAdaptor_Curve aMakeSecondLine (aSecondEdge); + + if (aMakeFirstLine.GetType() != GeomAbs_Line || aMakeSecondLine.GetType() != GeomAbs_Line) + { + return Standard_False; + } + + Handle(Geom_Line) aFirstLine = new Geom_Line (aMakeFirstLine.Line()); + Handle(Geom_Line) aSecondLine = new Geom_Line (aMakeSecondLine.Line()); + + gp_Lin aFirstLin = aFirstLine->Lin(); + gp_Lin aSecondLin = aSecondLine->Lin(); + + Standard_Boolean isParallelLines = Abs (aFirstLin.Angle (aSecondLin) - M_PI) <= Precision::Angular(); + + gp_Pnt aPoint = aFirstLine->Value (0.0); + gp_Dir aNormal = isParallelLines + ? gp_Vec (aSecondLin.Normal (aPoint).Direction()) ^ gp_Vec (aSecondLin.Direction()) + : gp_Vec (aFirstLin.Direction()) ^ gp_Vec (aSecondLin.Direction()); + + theComputedPlane = gp_Pln (aPoint, aNormal); + + // Compute geometry for this plane and edges + Standard_Boolean isInfinite1,isInfinite2; + gp_Pnt aFirstPoint1, aLastPoint1, aFirstPoint2, aLastPoint2; + gp_Lin2d aFirstLin2d, aSecondLin2d; + + if (!AIS::ComputeGeometry (aFirstEdge, aSecondEdge, + aFirstLine, aSecondLine, + aFirstPoint1, aLastPoint1, + aFirstPoint2, aLastPoint2, + isInfinite1, isInfinite2)) + { + return Standard_False; + } + + if (aFirstLin.Direction().IsParallel (aSecondLin.Direction(), Precision::Angular())) + { + myFirstPoint = aFirstLin.Location(); + mySecondPoint = ElCLib::Value (ElCLib::Parameter (aFirstLin, myFirstPoint), aSecondLin); + + if (mySecondPoint.Distance (myFirstPoint) <= Precision::Confusion()) + { + mySecondPoint.Translate (gp_Vec (aSecondLin.Direction()) * Abs (GetFlyout())); + } + + myCenterPoint.SetXYZ ((myFirstPoint.XYZ() + mySecondPoint.XYZ()) / 2.0); + } + else + { + // Find intersection + gp_Lin2d aFirstLin2d = ProjLib::Project (theComputedPlane, aFirstLin); + gp_Lin2d aSecondLin2d = ProjLib::Project (theComputedPlane, aSecondLin); + + IntAna2d_AnaIntersection anInt2d (aFirstLin2d, aSecondLin2d); + gp_Pnt2d anIntersectPoint; + if (!anInt2d.IsDone() || anInt2d.IsEmpty()) + { + return Standard_False; + } + + anIntersectPoint = gp_Pnt2d (anInt2d.Point(1).Value()); + myCenterPoint = ElCLib::To3d (theComputedPlane.Position().Ax2(), anIntersectPoint); + + if (isInfinite1 || isInfinite2) + { + myFirstPoint = myCenterPoint.Translated (gp_Vec (aFirstLin.Direction()) * Abs (GetFlyout())); + mySecondPoint = myCenterPoint.Translated (gp_Vec (aSecondLin.Direction()) * Abs (GetFlyout())); + + return IsValidPoints (myFirstPoint, myCenterPoint, mySecondPoint); + } + + // | + // | <- dimension should be here + // *---- + myFirstPoint = myCenterPoint.Distance (aFirstPoint1) > myCenterPoint.Distance (aLastPoint1) + ? aFirstPoint1 + : aLastPoint1; + + mySecondPoint = myCenterPoint.Distance (aFirstPoint2) > myCenterPoint.Distance (aLastPoint2) + ? aFirstPoint2 + : aLastPoint2; + } + + return IsValidPoints (myFirstPoint, myCenterPoint, mySecondPoint); +} + +//======================================================================= +//function : InitTwoFacesAngle +//purpose : initialization of angle dimension between two faces +//======================================================================= +Standard_Boolean AIS_AngleDimension::InitTwoFacesAngle() +{ + TopoDS_Face aFirstFace = TopoDS::Face (myFirstShape); + TopoDS_Face aSecondFace = TopoDS::Face (mySecondShape); + + gp_Dir aFirstDir, aSecondDir; + gp_Pln aFirstPlane, aSecondPlane; + Handle(Geom_Surface) aFirstBasisSurf, aSecondBasisSurf; + AIS_KindOfSurface aFirstSurfType, aSecondSurfType; + Standard_Real aFirstOffset, aSecondOffset; + + AIS::GetPlaneFromFace (aFirstFace, aFirstPlane, + aFirstBasisSurf,aFirstSurfType,aFirstOffset); + + AIS::GetPlaneFromFace (aSecondFace, aSecondPlane, + aSecondBasisSurf, aSecondSurfType, aSecondOffset); + + if (aFirstSurfType == AIS_KOS_Plane && aSecondSurfType == AIS_KOS_Plane) + { + //Planar faces angle + Handle(Geom_Plane) aFirstPlane = Handle(Geom_Plane)::DownCast (aFirstBasisSurf); + Handle(Geom_Plane) aSecondPlane = Handle(Geom_Plane)::DownCast (aSecondBasisSurf); + return AIS::InitAngleBetweenPlanarFaces (aFirstFace, + aSecondFace, + myCenterPoint, + myFirstPoint, + mySecondPoint) + && IsValidPoints (myFirstPoint, + myCenterPoint, + mySecondPoint); + } + else + { + // Curvilinear faces angle + return AIS::InitAngleBetweenCurvilinearFaces (aFirstFace, + aSecondFace, + aFirstSurfType, + aSecondSurfType, + myCenterPoint, + myFirstPoint, + mySecondPoint) + && IsValidPoints (myFirstPoint, + myCenterPoint, + mySecondPoint); + } +} + +//======================================================================= +//function : InitTwoFacesAngle +//purpose : initialization of angle dimension between two faces +//======================================================================= +Standard_Boolean AIS_AngleDimension::InitTwoFacesAngle (const gp_Pnt thePointOnFirstFace) +{ + TopoDS_Face aFirstFace = TopoDS::Face (myFirstShape); + TopoDS_Face aSecondFace = TopoDS::Face (mySecondShape); + + gp_Dir aFirstDir, aSecondDir; + gp_Pln aFirstPlane, aSecondPlane; + Handle(Geom_Surface) aFirstBasisSurf, aSecondBasisSurf; + AIS_KindOfSurface aFirstSurfType, aSecondSurfType; + Standard_Real aFirstOffset, aSecondOffset; + + AIS::GetPlaneFromFace (aFirstFace, aFirstPlane, + aFirstBasisSurf,aFirstSurfType,aFirstOffset); + + AIS::GetPlaneFromFace (aSecondFace, aSecondPlane, + aSecondBasisSurf, aSecondSurfType, aSecondOffset); + + myFirstPoint = thePointOnFirstFace; + if (aFirstSurfType == AIS_KOS_Plane && aSecondSurfType == AIS_KOS_Plane) + { + //Planar faces angle + Handle(Geom_Plane) aFirstPlane = Handle(Geom_Plane)::DownCast (aFirstBasisSurf); + Handle(Geom_Plane) aSecondPlane = Handle(Geom_Plane)::DownCast (aSecondBasisSurf); + return AIS::InitAngleBetweenPlanarFaces (aFirstFace, + aSecondFace, + myCenterPoint, + myFirstPoint, + mySecondPoint, + Standard_True) + && IsValidPoints (myFirstPoint, + myCenterPoint, + mySecondPoint); + } + else + { + // Curvilinear faces angle + return AIS::InitAngleBetweenCurvilinearFaces (aFirstFace, + aSecondFace, + aFirstSurfType, + aSecondSurfType, + myCenterPoint, + myFirstPoint, + mySecondPoint, + Standard_True) + && IsValidPoints (myFirstPoint, + myCenterPoint, + mySecondPoint); + } +} + +//======================================================================= +//function : InitConeAngle +//purpose : initialization of the cone angle +//======================================================================= +Standard_Boolean AIS_AngleDimension::InitConeAngle() +{ + if (myFirstShape.IsNull()) + { + return Standard_False; + } + + TopoDS_Face aConeShape = TopoDS::Face (myFirstShape); + gp_Pln aPln; + gp_Cone aCone; + gp_Circ aCircle; + // A surface from the Face + Handle(Geom_Surface) aSurf; + Handle(Geom_OffsetSurface) aOffsetSurf; + Handle(Geom_ConicalSurface) aConicalSurf; + Handle(Geom_SurfaceOfRevolution) aRevSurf; + Handle(Geom_Line) aLine; + BRepAdaptor_Surface aConeAdaptor (aConeShape); + TopoDS_Face aFace; + AIS_KindOfSurface aSurfType; + Standard_Real anOffset = 0.; + Handle(Standard_Type) aType; + + Standard_Real aMaxV = aConeAdaptor.FirstVParameter(); + Standard_Real aMinV = aConeAdaptor.LastVParameter(); + + AIS::GetPlaneFromFace (aConeShape, aPln, aSurf, aSurfType, anOffset); + + if (aSurfType == AIS_KOS_Revolution) + { + // Surface of revolution + aRevSurf = Handle(Geom_SurfaceOfRevolution)::DownCast(aSurf); + gp_Lin aLin (aRevSurf->Axis()); + Handle(Geom_Curve) aBasisCurve = aRevSurf->BasisCurve(); + //Must be a part of line (basis curve should be linear) + if (aBasisCurve ->DynamicType() != STANDARD_TYPE(Geom_Line)) + return Standard_False; + + gp_Pnt aFirst1 = aConeAdaptor.Value (0., aMinV); + gp_Pnt aLast1 = aConeAdaptor.Value (0., aMaxV); + gp_Vec aVec1 (aFirst1, aLast1); + + //Projection on + gp_Pnt aFirst2 = ElCLib::Value (ElCLib::Parameter (aLin, aFirst1), aLin); + // Projection on + gp_Pnt aLast2 = ElCLib::Value (ElCLib::Parameter (aLin, aLast1), aLin); + + gp_Vec aVec2 (aFirst2, aLast2); + + // Check if two parts of revolution are parallel (it's a cylinder) or normal (it's a circle). + if (aVec1.IsParallel (aVec2, Precision::Angular()) + || aVec1.IsNormal (aVec2,Precision::Angular())) + return Standard_False; + + gce_MakeCone aMkCone (aRevSurf->Axis(), aFirst1, aLast1); + aCone = aMkCone.Value(); + myCenterPoint = aCone.Apex(); + } + else + { + aType = aSurf->DynamicType(); + if (aType == STANDARD_TYPE(Geom_OffsetSurface) || anOffset > 0.01) + { + // Offset surface + aOffsetSurf = new Geom_OffsetSurface (aSurf, anOffset); + aSurf = aOffsetSurf->Surface(); + BRepBuilderAPI_MakeFace aMkFace(aSurf, Precision::Confusion()); + aMkFace.Build(); + if (!aMkFace.IsDone()) + return Standard_False; + aConeAdaptor.Initialize (aMkFace.Face()); + } + aCone = aConeAdaptor.Cone(); + aConicalSurf = Handle(Geom_ConicalSurface)::DownCast (aSurf); + myCenterPoint = aConicalSurf->Apex(); + } + + // A circle where the angle is drawn + Handle(Geom_Curve) aCurve; + Standard_Real aMidV = ( aMinV + aMaxV ) / 2.5; + aCurve = aSurf->VIso (aMidV); + aCircle = Handle(Geom_Circle)::DownCast (aCurve)->Circ(); + + aCurve = aSurf->VIso(aMaxV); + gp_Circ aCircVmax = Handle(Geom_Circle)::DownCast(aCurve)->Circ(); + aCurve = aSurf->VIso(aMinV); + gp_Circ aCircVmin = Handle(Geom_Circle)::DownCast(aCurve)->Circ(); + + if (aCircVmax.Radius() < aCircVmin.Radius()) + { + gp_Circ aTmpCirc = aCircVmax; + aCircVmax = aCircVmin; + aCircVmin = aTmpCirc; + } + + myFirstPoint = ElCLib::Value (0, aCircle); + mySecondPoint = ElCLib::Value (M_PI, aCircle); + return Standard_True; +} + +//======================================================================= +//function : IsValidPoints +//purpose : +//======================================================================= +Standard_Boolean AIS_AngleDimension::IsValidPoints (const gp_Pnt& theFirstPoint, + const gp_Pnt& theCenterPoint, + const gp_Pnt& theSecondPoint) const +{ + return theFirstPoint.Distance (theCenterPoint) > Precision::Confusion() + && theSecondPoint.Distance (theCenterPoint) > Precision::Confusion() + && gp_Vec (theCenterPoint, theFirstPoint).Angle ( + gp_Vec (theCenterPoint, theSecondPoint)) > Precision::Angular(); +} diff --git a/src/AIS/AIS_AngleDimension.hxx b/src/AIS/AIS_AngleDimension.hxx index 3c9d702dcb..7b77c5b65f 100644 --- a/src/AIS/AIS_AngleDimension.hxx +++ b/src/AIS/AIS_AngleDimension.hxx @@ -16,12 +16,6 @@ // purpose or non-infringement. Please see the License for the specific terms // and conditions governing the rights and limitations under the License. -//! A framework to define display of angles.
-//! These displays are particularly useful in viewing draft prisms.
-//! The angle displayed may define an intersection
-//! can be between two edges or two faces of a shape
-//! or a plane. The display consists of arrows and text.
- #ifndef _AIS_AngleDimension_HeaderFile #define _AIS_AngleDimension_HeaderFile @@ -42,45 +36,170 @@ #include #include #include +#include DEFINE_STANDARD_HANDLE (AIS_AngleDimension, AIS_Dimension) +//! Angle dimension. Can be constructed: +//! - on two intersected edges. +//! - on three points or vertices. +//! - on conical face. +//! - between two intersected faces. +//! +//! In case of three points or two intersected edges the dimension plane +//! (on which dimension presentation is built) can be computed uniquely +//! as through three defined points can be built only one plane. +//! Therefore, if user-defined plane differs from this one, the dimension can't be built. +//! +//! In cases of two planes automatical plane by default is built on point of the +//! origin of parametrical space of the first face (the basis surface) so, that +//! the working plane and two faces intersection forms minimal angle between the faces. +//! User can define the other point which the dimension plane should pass through +//! using the appropriate constructor. This point can lay on the one of the faces or not. +//! Also user can define his own plane but it should pass through the three points +//! computed on the geometry initialization step (when the constructor or SetMeasuredGeometry() method +//! is called). +//! +//! In case of the conical face the center point of the angle is the apex of the conical surface. +//! The attachment points are points of the first and the last parameter of the basis circle of the cone. +//! class AIS_AngleDimension : public AIS_Dimension { public: - //! Constructs angle dimension between two edges - //! with automatic working plane computing - //! if it is possible. In case of PI angle please - //! set custom working plane or use constructor with 3 parameters. - Standard_EXPORT AIS_AngleDimension (const TopoDS_Edge& theFirstEdge, - const TopoDS_Edge& theSecondEdge); - //! Constructs the angle display object defined by the
- //! two edges and custom working plane. - //! ATTENTION :In case if the working plane is custom and one edge is out of the - //! working plane it tries to project this edge line on the plane. - //! To avoid this case you can reset the working plane - //! using method. - Standard_EXPORT AIS_AngleDimension (const TopoDS_Edge& theFirstEdge, - const TopoDS_Edge& theSecondEdge, - const gp_Pln& thePlane); + //! Constructs minimum angle dimension between two linear edges (where possible). + //! These two edges should be intersected by each other. Otherwise the geometry is not valid. + //! @param theFirstEdge [in] the first edge. + //! @param theSecondEdge [in] the second edge. + Standard_EXPORT AIS_AngleDimension (const TopoDS_Edge& theFirstEdge, + const TopoDS_Edge& theSecondEdge); //! Constructs the angle display object defined by three points. - Standard_EXPORT AIS_AngleDimension (const gp_Pnt& theFirstPoint, - const gp_Pnt& theSecondPoint, - const gp_Pnt& theThirdPoint); + //! @param theFirstPoint [in] the first point (point on first angle flyout). + //! @param theSecondPoint [in] the center point of angle dimension. + //! @param theThirdPoint [in] the second point (point on second angle flyout). + Standard_EXPORT AIS_AngleDimension (const gp_Pnt& theFirstPoint, + const gp_Pnt& theSecondPoint, + const gp_Pnt& theThirdPoint); - //! Angle of cone - Standard_EXPORT AIS_AngleDimension (const TopoDS_Face& theCone); + //! Constructs the angle display object defined by three vertices. + //! @param theFirstVertex [in] the first vertex (vertex for first angle flyout). + //! @param theSecondVertex [in] the center vertex of angle dimension. + //! @param theThirdPoint [in] the second vertex (vertex for second angle flyout). + Standard_EXPORT AIS_AngleDimension (const TopoDS_Vertex& theFirstVertex, + const TopoDS_Vertex& theSecondVertex, + const TopoDS_Vertex& theThirdVertex); - //! TwoPlanarFaceAngle dimension - Standard_EXPORT AIS_AngleDimension (const TopoDS_Face& theFirstFace, - const TopoDS_Face& theSecondFace, - const gp_Ax1& theAxis); + //! Constructs angle dimension for the cone face. + //! @param theCone [in] the conical face. + Standard_EXPORT AIS_AngleDimension (const TopoDS_Face& theCone); - //! Sets first shape - Standard_EXPORT void SetFirstShape (const TopoDS_Shape& theShape, - const Standard_Boolean isSingleShape = Standard_False); + //! Constructs angle dimension between two planar faces. + //! @param theFirstFace [in] the first face. + //! @param theSecondFace [in] the second face. + Standard_EXPORT AIS_AngleDimension (const TopoDS_Face& theFirstFace, + const TopoDS_Face& theSecondFace); + + //! Constructs angle dimension between two planar faces. + //! @param theFirstFace [in] the first face. + //! @param theSecondFace [in] the second face. + //! @param thePoint [in] the point which the dimension plane should pass through. + //! This point can lay on the one of the faces or not. + Standard_EXPORT AIS_AngleDimension (const TopoDS_Face& theFirstFace, + const TopoDS_Face& theSecondFace, + const gp_Pnt& thePoint); + +public: + + //! @return first point forming the angle. + const gp_Pnt& FirstPoint() const + { + return myFirstPoint; + } + + //! @return second point forming the angle. + const gp_Pnt& SecondPoint() const + { + return mySecondPoint; + } + + //! @return center point forming the angle. + const gp_Pnt& CenterPoint() const + { + return myCenterPoint; + } + + //! @return first argument shape. + const TopoDS_Shape& FirstShape() const + { + return myFirstShape; + } + + //! @return second argument shape. + const TopoDS_Shape& SecondShape() const + { + return mySecondShape; + } + + //! @return third argument shape. + const TopoDS_Shape& ThirdShape() const + { + return myThirdShape; + } + +public: + + //! Measures minimum angle dimension between two linear edges. + //! These two edges should be intersected by each other. Otherwise the geometry is not valid. + //! @param theFirstEdge [in] the first edge. + //! @param theSecondEdge [in] the second edge. + Standard_EXPORT void SetMeasuredGeometry (const TopoDS_Edge& theFirstEdge, + const TopoDS_Edge& theSecondEdge); + + //! Measures angle defined by three points. + //! @param theFirstPoint [in] the first point (point on first angle flyout). + //! @param theSecondPoint [in] the center point of angle dimension. + //! @param theThirdPoint [in] the second point (point on second angle flyout). + Standard_EXPORT void SetMeasuredGeometry (const gp_Pnt& theFirstPoint, + const gp_Pnt& theSecondPoint, + const gp_Pnt& theThridPoint); + + //! Measures angle defined by three vertices. + //! @param theFirstVertex [in] the first vertex (vertex for first angle flyout). + //! @param theSecondVertex [in] the center vertex of angle dimension. + //! @param theThirdPoint [in] the second vertex (vertex for second angle flyout). + Standard_EXPORT void SetMeasuredGeometry (const TopoDS_Vertex& theFirstVertex, + const TopoDS_Vertex& theSecondVertex, + const TopoDS_Vertex& theThirdVertex); + + //! Measures angle of conical face. + //! @param theCone [in] the shape to measure. + Standard_EXPORT void SetMeasuredGeometry (const TopoDS_Face& theCone); + + //! Measures angle between two planar faces. + //! @param theFirstFace [in] the first face. + //! @param theSecondFace [in] the second face.. + Standard_EXPORT void SetMeasuredGeometry (const TopoDS_Face& theFirstFace, + const TopoDS_Face& theSecondFace); + + //! Measures angle between two planar faces. + //! @param theFirstFace [in] the first face. + //! @param theSecondFace [in] the second face. + //! @param thePoint [in] the point which the dimension plane should pass through. + //! This point can lay on the one of the faces or not. + Standard_EXPORT void SetMeasuredGeometry (const TopoDS_Face& theFirstFace, + const TopoDS_Face& theSecondFace, + const gp_Pnt& thePoint); + + //! @return the display units string. + Standard_EXPORT virtual const TCollection_AsciiString& GetDisplayUnits () const; + + //! @return the model units string. + Standard_EXPORT virtual const TCollection_AsciiString& GetModelUnits () const; + + Standard_EXPORT virtual void SetDisplayUnits (const TCollection_AsciiString& theUnits); + + Standard_EXPORT virtual void SetModelUnits (const TCollection_AsciiString& theUnits); public: @@ -88,63 +207,111 @@ public: protected: - //! Computes dimension value in display units - Standard_EXPORT virtual void computeValue(); + //! Initialization of fields that is common to all constructors. + Standard_EXPORT void Init(); - Standard_EXPORT void init(); - - Standard_EXPORT gp_Pnt getCenterOnArc (const gp_Pnt& theFirstAttach, - const gp_Pnt& theSecondAttach); - - Standard_EXPORT void drawArc (const Handle(Prs3d_Presentation)& thePresentation, - const gp_Pnt& theFirstAttach, - const gp_Pnt& theSecondAttach, - const gp_Pnt& theCenter, - const Standard_Real theRadius, - const Standard_Integer theMode); - - Standard_EXPORT void drawArcWithText (const Handle(Prs3d_Presentation)& thePresentation, - const gp_Pnt& theFirstAttach, + //! @param theFirstAttach [in] the first attachment point. + //! @param theSecondAttach [in] the second attachment point. + //! @param theCenter [in] the center point (center point of the angle). + //! @return the center of the dimension arc (the main dimension line in case of angle). + Standard_EXPORT gp_Pnt GetCenterOnArc (const gp_Pnt& theFirstAttach, const gp_Pnt& theSecondAttach, - const TCollection_ExtendedString& theText, - const Standard_Real theTextWidth, - const Standard_Integer theMode, - const Standard_Integer theLabelPosition); + const gp_Pnt& theCenter); + + //! Draws main dimension line (arc). + //! @param thePresentation [in] the dimension presentation. + //! @param theFirstAttach [in] the first attachment point. + //! @param theSecondAttach [in] the second attachment point. + //! @param theCenter [in] the center point (center point of the angle). + //! @param theRadius [in] the radius of the dimension arc. + //! @param theMode [in] the display mode. + Standard_EXPORT void DrawArc (const Handle(Prs3d_Presentation)& thePresentation, + const gp_Pnt& theFirstAttach, + const gp_Pnt& theSecondAttach, + const gp_Pnt& theCenter, + const Standard_Real theRadius, + const Standard_Integer theMode); + + //! Draws main dimension line (arc) with text. + //! @param thePresentation [in] the dimension presentation. + //! @param theFirstAttach [in] the first attachment point. + //! @param theSecondAttach [in] the second attachment point. + //! @param theCenter [in] the center point (center point of the angle). + //! @param theText [in] the text label string. + //! @param theTextWidth [in] the text label width. + //! @param theMode [in] the display mode. + //! @param theLabelPosition [in] the text label vertical and horizontal positioning option + //! respectively to the main dimension line. + Standard_EXPORT void DrawArcWithText (const Handle(Prs3d_Presentation)& thePresentation, + const gp_Pnt& theFirstAttach, + const gp_Pnt& theSecondAttach, + const gp_Pnt& theCenter, + const TCollection_ExtendedString& theText, + const Standard_Real theTextWidth, + const Standard_Integer theMode, + const Standard_Integer theLabelPosition); + +protected: + + Standard_EXPORT virtual void ComputePlane(); + + //! Checks if the plane includes three angle points to build dimension. + Standard_EXPORT virtual Standard_Boolean CheckPlane (const gp_Pln& thePlane) const; + + Standard_EXPORT virtual Standard_Real ComputeValue() const; Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePM, const Handle(Prs3d_Presentation)& thePresentation, const Standard_Integer theMode = 0); - Standard_EXPORT Standard_Boolean initConeAngle (const TopoDS_Face& theCone); - - Standard_EXPORT Standard_Boolean initTwoFacesAngle(); - - Standard_EXPORT Standard_Boolean initTwoEdgesAngle(); - - //! Auxiliary method to get position of the angle dimension - //! if the cone is trimmed - //! Returns 1 if center is above of center; - //! 0 if center is between and centers; - //! -1 if center is below center. - Standard_EXPORT Standard_Integer aboveInBelowCone (const gp_Circ &theCMax, - const gp_Circ &theCMin, - const gp_Circ &theC); - - //! Fills default plane object if it is possible to count plane automatically. - Standard_EXPORT virtual void countDefaultPlane (); - - //! Fills sensitive entity for flyouts and adds it to the selection - Standard_EXPORT virtual void computeFlyoutSelection (const Handle(SelectMgr_Selection)& theSelection, - const Handle(SelectMgr_EntityOwner)& theOwner); + Standard_EXPORT virtual void ComputeFlyoutSelection (const Handle(SelectMgr_Selection)& theSelection, + const Handle(SelectMgr_EntityOwner)& theOwner); protected: - //! Shows if there is necessarily to draw extensions on angle dimension - //! It is set to the true value if the attachment point are out of the edges. - Standard_Boolean myIsFlyoutLines; + //! Init angular dimension to measure angle between two linear edges. + //! @return TRUE if the angular dimension can be constructured + //! for the passed edges. + Standard_EXPORT Standard_Boolean InitTwoEdgesAngle (gp_Pln& theComputedPlane); - //! The center of dimension arc - gp_Pnt myCenter; + //! Init angular dimension to measure angle between two planar faces. + //! there is no user-defined poisitoning. So attach points are set + //! according to faces geometry (in origin of the first face basis surface). + //! @return TRUE if the angular dimension can be constructed + //! for the passed faces. + Standard_EXPORT Standard_Boolean InitTwoFacesAngle(); + + //! Init angular dimension to measure angle between two planar faces. + //! @param thePointOnFirstFace [in] the point which the dimension plane should pass through. + //! This point can lay on the one of the faces or not. + //! It will be projected on the first face and this point will be set + //! as the first point attach point. + //! It defines some kind of dimension positioning over the faces. + //! @return TRUE if the angular dimension can be constructed + //! for the passed faces. + Standard_EXPORT Standard_Boolean InitTwoFacesAngle (const gp_Pnt thePointOnFirstFace); + + //! Init angular dimension to measure cone face. + //! @return TRUE if the angular dimension can be constructed + //! for the passed cone. + Standard_EXPORT Standard_Boolean InitConeAngle(); + + //! Check that the points forming angle are valid. + //! @return TRUE if the points met the following requirements: + //! The (P1, Center), (P2, Center) can be built. + //! The angle between the vectors > Precision::Angular(). + Standard_EXPORT Standard_Boolean IsValidPoints (const gp_Pnt& theFirstPoint, + const gp_Pnt& theCenterPoint, + const gp_Pnt& theSecondPoint) const; + +private: + + gp_Pnt myFirstPoint; + gp_Pnt mySecondPoint; + gp_Pnt myCenterPoint; + TopoDS_Shape myFirstShape; + TopoDS_Shape mySecondShape; + TopoDS_Shape myThirdShape; }; -#endif +#endif // _AIS_AngleDimension_HeaderFile diff --git a/src/AIS/AIS_DiameterDimension.cxx b/src/AIS/AIS_DiameterDimension.cxx index e420737eaf..8330025fb5 100755 --- a/src/AIS/AIS_DiameterDimension.cxx +++ b/src/AIS/AIS_DiameterDimension.cxx @@ -19,17 +19,18 @@ // and conditions governing the rights and limitations under the License. #include -#include -#include -#include -#include -#include -#include -#include -#include -IMPLEMENT_STANDARD_HANDLE(AIS_DiameterDimension, AIS_Dimension) -IMPLEMENT_STANDARD_RTTIEXT(AIS_DiameterDimension, AIS_Dimension) +#include +#include +#include +#include +#include +#include +#include +#include + +IMPLEMENT_STANDARD_HANDLE (AIS_DiameterDimension, AIS_Dimension) +IMPLEMENT_STANDARD_RTTIEXT (AIS_DiameterDimension, AIS_Dimension) namespace { @@ -40,69 +41,251 @@ namespace //function : Constructor //purpose : //======================================================================= - -AIS_DiameterDimension::AIS_DiameterDimension(const gp_Circ& theCircle) -: AIS_Dimension(), - myCircle (theCircle) +AIS_DiameterDimension::AIS_DiameterDimension (const gp_Circ& theCircle) +: AIS_Dimension (AIS_KOD_DIAMETER) { - SetKindOfDimension(AIS_KOD_DIAMETER); - myIsInitialized = Standard_True; + SetMeasuredGeometry (theCircle); SetSpecialSymbol (THE_DIAMETER_SYMBOL); SetDisplaySpecialSymbol (AIS_DSS_Before); SetFlyout (0.0); - // Count attach points - myFirstPoint = ElCLib::Value (0, myCircle); - mySecondPoint = myFirstPoint.Translated (gp_Vec(myFirstPoint, theCircle.Location())*2); } //======================================================================= //function : Constructor //purpose : //======================================================================= - -AIS_DiameterDimension::AIS_DiameterDimension(const gp_Circ& theCircle, const gp_Pnt& theAttachPoint) -: AIS_Dimension(), - myCircle (theCircle) +AIS_DiameterDimension::AIS_DiameterDimension (const gp_Circ& theCircle, + const gp_Pln& thePlane) +: AIS_Dimension (AIS_KOD_DIAMETER) { - SetKindOfDimension (AIS_KOD_DIAMETER); + SetCustomPlane (thePlane); + SetMeasuredGeometry (theCircle); SetSpecialSymbol (THE_DIAMETER_SYMBOL); SetDisplaySpecialSymbol (AIS_DSS_Before); SetFlyout (0.0); - myFirstPoint = theAttachPoint; - // Count the second point - if (Abs(myFirstPoint.Distance (theCircle.Location()) - theCircle.Radius()) < Precision::Confusion()) - { - mySecondPoint = myFirstPoint.Translated(gp_Vec(myFirstPoint, theCircle.Location())*2); - } - else - { - myFirstPoint = ElCLib::Value(0, myCircle); - mySecondPoint = myFirstPoint.Translated(gp_Vec(myFirstPoint, theCircle.Location())*2); - } - myIsInitialized = Standard_True; } //======================================================================= //function : Constructor -//purpose : Universal constructor for diameter dimension of shape +//purpose : //======================================================================= - AIS_DiameterDimension::AIS_DiameterDimension (const TopoDS_Shape& theShape) -: AIS_Dimension () +: AIS_Dimension (AIS_KOD_DIAMETER) { - SetKindOfDimension (AIS_KOD_DIAMETER); + SetMeasuredGeometry (theShape); SetSpecialSymbol (THE_DIAMETER_SYMBOL); SetDisplaySpecialSymbol (AIS_DSS_Before); SetFlyout (0.0); - myFirstShape = theShape; - myIsInitialized = Standard_False; +} + +//======================================================================= +//function : Constructor +//purpose : +//======================================================================= +AIS_DiameterDimension::AIS_DiameterDimension (const TopoDS_Shape& theShape, + const gp_Pln& thePlane) +: AIS_Dimension (AIS_KOD_DIAMETER) +{ + SetCustomPlane (thePlane); + SetMeasuredGeometry (theShape); + SetSpecialSymbol (THE_DIAMETER_SYMBOL); + SetDisplaySpecialSymbol (AIS_DSS_Before); + SetFlyout (0.0); +} + +//======================================================================= +//function : AnchorPoint +//purpose : +//======================================================================= +gp_Pnt AIS_DiameterDimension::AnchorPoint() +{ + if (!IsValid()) + { + return gp::Origin(); + } + + return myAnchorPoint; +} + +//======================================================================= +//function : SetMeasuredGeometry +//purpose : +//======================================================================= +void AIS_DiameterDimension::SetMeasuredGeometry (const gp_Circ& theCircle) +{ + myCircle = theCircle; + myGeometryType = GeometryType_Edge; + myShape = BRepLib_MakeEdge (theCircle); + myAnchorPoint = gp::Origin(); + myIsValid = IsValidCircle (myCircle); + + if (myIsValid && myIsPlaneCustom) + { + ComputeAnchorPoint(); + } + else if (!myIsPlaneCustom) + { + ComputePlane(); + myAnchorPoint = ElCLib::Value (0.0, myCircle); + } + + myIsValid &= CheckPlane (myPlane); + + SetToUpdate(); +} + +//======================================================================= +//function : SetMeasuredGeometry +//purpose : +//======================================================================= +void AIS_DiameterDimension::SetMeasuredGeometry (const TopoDS_Shape& theShape) +{ + gp_Pnt aDummyPnt (gp::Origin()); + Standard_Boolean isClosed = Standard_False; + + myGeometryType = GeometryType_UndefShapes; + myShape = theShape; + myAnchorPoint = gp::Origin(); + myIsValid = InitCircularDimension (theShape, myCircle, aDummyPnt, isClosed) + && IsValidCircle (myCircle) + && isClosed; + + if (myIsValid && myIsPlaneCustom) + { + ComputeAnchorPoint(); + } + else if (!myIsPlaneCustom) + { + ComputePlane(); + myAnchorPoint = ElCLib::Value (0.0, myCircle); + } + + myIsValid &= CheckPlane (myPlane); + + SetToUpdate(); +} + +//======================================================================= +//function : CheckPlane +//purpose : +//======================================================================= +Standard_Boolean AIS_DiameterDimension::CheckPlane (const gp_Pln& thePlane) const +{ + // Check if the circle center point belongs to plane. + if (!thePlane.Contains (myCircle.Location(), Precision::Confusion())) + { + return Standard_False; + } + + return Standard_True; +} + +//======================================================================= +//function : ComputePlane +//purpose : +//======================================================================= +void AIS_DiameterDimension::ComputePlane() +{ + if (!IsValid()) + { + return; + } + + myPlane = gp_Pln (gp_Ax3 (myCircle.Position())); +} + +//======================================================================= +//function : ComputeAnchorPoint +//purpose : +//======================================================================= +void AIS_DiameterDimension::ComputeAnchorPoint() +{ + // Anchor point is an intersection of dimension plane and circle. + Handle(Geom_Circle) aCircle = new Geom_Circle (myCircle); + Handle(Geom_Plane) aPlane = new Geom_Plane (myPlane); + GeomAPI_IntCS anIntersector (aCircle, aPlane); + if (!anIntersector.IsDone()) + { + myIsValid = Standard_False; + return; + } + + // The circle lays on the plane. + if (anIntersector.NbPoints() != 2) + { + myAnchorPoint = ElCLib::Value (0.0, myCircle); + myIsValid = Standard_True; + return; + } + + gp_Pnt aFirstPoint = anIntersector.Point (1); + gp_Pnt aSecondPoint = anIntersector.Point (2); + + // Choose one of two intersection points that stands with + // positive direction of flyout. + // An anchor point is supposed to be the left attachment point. + gp_Dir aFirstDir = gce_MakeDir (aFirstPoint, myCircle.Location()); + gp_Dir aDir = myPlane.Axis().Direction() ^ aFirstDir; + myAnchorPoint = (gp_Vec (aDir) * gp_Vec(myCircle.Position().Direction()) > 0.0) + ? aFirstPoint + : aSecondPoint; + +} + +//======================================================================= +//function : GetModelUnits +//purpose : +//======================================================================= +const TCollection_AsciiString& AIS_DiameterDimension::GetModelUnits() const +{ + return myDrawer->DimLengthModelUnits(); +} + +//======================================================================= +//function : GetDisplayUnits +//purpose : +//======================================================================= +const TCollection_AsciiString& AIS_DiameterDimension::GetDisplayUnits() const +{ + return myDrawer->DimLengthDisplayUnits(); +} + +//======================================================================= +//function : SetModelUnits +//purpose : +//======================================================================= +void AIS_DiameterDimension::SetModelUnits (const TCollection_AsciiString& theUnits) +{ + myDrawer->SetDimLengthModelUnits (theUnits); +} + +//======================================================================= +//function : SetDisplayUnits +//purpose : +//======================================================================= +void AIS_DiameterDimension::SetDisplayUnits (const TCollection_AsciiString& theUnits) +{ + myDrawer->SetDimLengthDisplayUnits (theUnits); +} + +//======================================================================= +//function : ComputeValue +//purpose : +//======================================================================= +Standard_Real AIS_DiameterDimension::ComputeValue() const +{ + if (!IsValid()) + { + return 0.0; + } + + return myCircle.Radius() * 2.0; } //======================================================================= //function : Compute //purpose : //======================================================================= - void AIS_DiameterDimension::Compute (const Handle(PrsMgr_PresentationManager3d)& /*thePM*/, const Handle(Prs3d_Presentation)& thePresentation, const Standard_Integer theMode) @@ -110,48 +293,72 @@ void AIS_DiameterDimension::Compute (const Handle(PrsMgr_PresentationManager3d)& thePresentation->Clear(); mySelectionGeom.Clear (theMode); - Handle(Prs3d_DimensionAspect) aDimensionAspect = myDrawer->DimensionAspect(); - Prs3d_Root::CurrentGroup (thePresentation)->SetPrimitivesAspect (aDimensionAspect->LineAspect()->Aspect()); - - if (!myIsInitialized) + if (!IsValid()) { - if (!initCircularDimension (myFirstShape, myCircle, - myFirstPoint, mySecondPoint)) - return; - else - myIsInitialized = Standard_True; + return; } - if (!myIsWorkingPlaneCustom) + gp_Pnt aFirstPnt (gp::Origin()); + gp_Pnt aSecondPnt (gp::Origin()); + ComputeSidePoints (myCircle, GetPlane(), aFirstPnt, aSecondPnt); + + DrawLinearDimension (thePresentation, theMode, aFirstPnt, aSecondPnt); +} + +//======================================================================= +//function : ComputeFlyoutSelection +//purpose : +//======================================================================= +void AIS_DiameterDimension::ComputeFlyoutSelection (const Handle(SelectMgr_Selection)& theSelection, + const Handle(SelectMgr_EntityOwner)& theEntityOwner) +{ + if (!IsValid()) { - countDefaultPlane(); + return; } - drawLinearDimension (thePresentation, theMode); + gp_Pnt aFirstPnt (gp::Origin()); + gp_Pnt aSecondPnt (gp::Origin()); + ComputeSidePoints (myCircle, GetPlane(), aFirstPnt, aSecondPnt); + + ComputeLinearFlyouts (theSelection, theEntityOwner, aFirstPnt, aSecondPnt); } //======================================================================= -//function : computeValue +//function : ComputeSidePoints //purpose : //======================================================================= - -void AIS_DiameterDimension::computeValue () +void AIS_DiameterDimension::ComputeSidePoints (const gp_Circ& /*theCircle*/, + const gp_Pln& /*thePlane*/, + gp_Pnt& theFirstPnt, + gp_Pnt& theSecondPnt) { - myValue = myFirstPoint.Distance (mySecondPoint); - AIS_Dimension::computeValue(); + theFirstPnt = AnchorPoint(); + + gp_Vec aRadiusVector (myCircle.Location(), theFirstPnt); + theSecondPnt = myCircle.Location().Translated (-aRadiusVector); } //======================================================================= -//function : countDefaultPlane +//function : IsValidCircle //purpose : //======================================================================= - -void AIS_DiameterDimension::countDefaultPlane () +Standard_Boolean AIS_DiameterDimension::IsValidCircle (const gp_Circ& theCircle) const { - // Compute normal of the default plane. - //gp_Vec aVec1(mySecondPoint, myFirstPoint), - // aVec2(mySecondPoint, ElCLib::Value(M_PI_2, myCircle)); - myDefaultPlane = gp_Pln(gp_Ax3(myCircle.Position())); - // Set computed value to - ResetWorkingPlane (); + return (theCircle.Radius() * 2.0) > Precision::Confusion(); +} + +//======================================================================= +//function : IsValidAnchor +//purpose : +//======================================================================= +Standard_Boolean AIS_DiameterDimension::IsValidAnchor (const gp_Circ& theCircle, + const gp_Pnt& theAnchor) const +{ + gp_Pln aCirclePlane (theCircle.Location(), theCircle.Axis().Direction()); + Standard_Real anAnchorDist = theAnchor.Distance (theCircle.Location()); + Standard_Real aRadius = myCircle.Radius(); + + return Abs (anAnchorDist - aRadius) > Precision::Confusion() + && aCirclePlane.Contains (theAnchor, Precision::Confusion()); } diff --git a/src/AIS/AIS_DiameterDimension.hxx b/src/AIS/AIS_DiameterDimension.hxx index efc186a977..dad8dc40b1 100644 --- a/src/AIS/AIS_DiameterDimension.hxx +++ b/src/AIS/AIS_DiameterDimension.hxx @@ -15,6 +15,7 @@ // limitation, any warranties of merchantability, fitness for a particular // purpose or non-infringement. Please see the License for the specific terms // and conditions governing the rights and limitations under the License. + #ifndef _AIS_DiameterDimension_HeaderFile #define _AIS_DiameterDimension_HeaderFile @@ -26,48 +27,159 @@ #include #include -DEFINE_STANDARD_HANDLE(AIS_DiameterDimension,AIS_Dimension) +DEFINE_STANDARD_HANDLE (AIS_DiameterDimension, AIS_Dimension) -//! A framework to display diameter dimensions.
-//! A diameter is displayed with arrows and text. The
-//! text gives the length of the diameter.
-//! The algorithm takes a length along a face and
-//! analyzes it as an arc. It then reconstructs the circle
-//! corresponding to the arc and calculates the
-//! diameter of this circle. This diameter serves as a
-//! relational reference in 3d presentations of the surface.
+//! Diameter dimension. Can be constructued: +//! - On generic circle. +//! - On generic circle with user-defined anchor point on that circle +//! (dimension plane is oriented to follow the anchor point). +//! - On generic circle in the specified plane. +//! - On generic shape containing geometry that can be measured +//! by diameter dimension: circle wire, circular face, etc. +//! The anchor point is the location of the left attachement point of +//! dimension on the circle. +//! The anchor point computation is processed after dimension plane setting +//! so that positive flyout direction stands with normal of the circle and +//! the normal of the plane. +//! If the plane is user-defined the anchor point was computed as intersection +//! of the plane and the basis circle. Among two intersection points +//! the one is selected so that positive flyout direction vector and +//! the circle normal on the one side form the circle plane. +//! (corner between positive flyout directio nand the circle normal is acute.) +//! If the plane is computed automatically (by default it is the circle plane), +//! the anchor point is the zero parameter point of the circle. +//! +//! The dimension is considered as invalid if the user-defined plane +//! does not include th enachor point and th ecircle center, +//! if the diameter of the circle is less than Precision::Confusion(). +//! In case if the dimension is built on the arbitrary shape, it can be considered +//! as invalid if the shape does not contain circle geometry. +//! class AIS_DiameterDimension : public AIS_Dimension { public: - //! Constructs a diameter display object defined by the
- //! circle - Standard_EXPORT AIS_DiameterDimension(const gp_Circ& theCircle); - //! Constructor that allows to set a attach point
- //! on the circle where to attach dimension - Standard_EXPORT AIS_DiameterDimension (const gp_Circ& theCircle, - const gp_Pnt& theAttachPoint); + //! Construct diameter dimension for the circle. + //! @param theCircle [in] the circle to measure. + Standard_EXPORT AIS_DiameterDimension (const gp_Circ& theCircle); - Standard_EXPORT AIS_DiameterDimension (const TopoDS_Shape& theShape); + //! Construct diameter dimension for the circle and orient it correspondingly + //! to the passed plane. + //! @param theCircle [in] the circle to measure. + //! @param thePlane [in] the plane defining preferred orientation + //! for dimension. + Standard_EXPORT AIS_DiameterDimension (const gp_Circ& theCircle, + const gp_Pln& thePlane); + + //! Construct diameter on the passed shape, if applicable. + //! @param theShape [in] the shape to measure. + Standard_EXPORT AIS_DiameterDimension (const TopoDS_Shape& theShape); + + //! Construct diameter on the passed shape, if applicable - and + //! define the preferred plane to orient the dimension. + //! @param theShape [in] the shape to measure. + //! @param thePlane [in] the plane defining preferred orientation + //! for dimension. + Standard_EXPORT AIS_DiameterDimension (const TopoDS_Shape& theShape, + const gp_Pln& thePlane); + +public: + + //! @return measured geometry circle. + const gp_Circ& Circle() const + { + return myCircle; + } + + //! @return anchor point on circle for diameter dimension. + Standard_EXPORT gp_Pnt AnchorPoint(); + + //! @return the measured shape. + const TopoDS_Shape& Shape() const + { + return myShape; + } + +public: + + //! Measure diameter of the circle. + //! The actual dimension plane is used for determining anchor points + //! on the circle to attach the dimension lines to. + //! The dimension will become invalid if the diameter of the circle + //! is less than Precision::Confusion(). + //! @param theCircle [in] the circle to measure. + Standard_EXPORT void SetMeasuredGeometry (const gp_Circ& theCircle); + + //! Measure diameter on the passed shape, if applicable. + //! The dimension will become invalid if the passed shape is not + //! measurable or if measured diameter value is less than Precision::Confusion(). + //! @param theShape [in] the shape to measure. + Standard_EXPORT void SetMeasuredGeometry (const TopoDS_Shape& theShape); + + //! @return the display units string. + Standard_EXPORT virtual const TCollection_AsciiString& GetDisplayUnits () const; + + //! @return the model units string. + Standard_EXPORT virtual const TCollection_AsciiString& GetModelUnits () const; + + Standard_EXPORT virtual void SetDisplayUnits (const TCollection_AsciiString& theUnits); + + Standard_EXPORT virtual void SetModelUnits (const TCollection_AsciiString& theUnits); + +public: DEFINE_STANDARD_RTTI(AIS_DiameterDimension) protected: - Standard_EXPORT virtual void computeValue(); + //! Override this method to change logic of anchor point computation. + //! Computes anchor point. Its computation is based on the current + //! dimension plane. Therfore, anchor point is an intersection of plane + //! and circle. + //! ATTENTION! + //! 1) The plane should be set or computed before. + //! 2) The plane should inclide th ecircle center to be valid. + Standard_EXPORT virtual void ComputeAnchorPoint(); - //! Fills default plane object if it is possible to count plane automatically. - Standard_EXPORT virtual void countDefaultPlane(); + Standard_EXPORT virtual void ComputePlane(); -private: + //! Checks if the center of the circle is on the plane. + Standard_EXPORT virtual Standard_Boolean CheckPlane (const gp_Pln& thePlane) const; - virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePresentationManager, - const Handle(Prs3d_Presentation)& thePresentation, - const Standard_Integer theMode = 0); + Standard_EXPORT virtual Standard_Real ComputeValue() const; + + Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePresentationManager, + const Handle(Prs3d_Presentation)& thePresentation, + const Standard_Integer theMode = 0); + + Standard_EXPORT virtual void ComputeFlyoutSelection (const Handle(SelectMgr_Selection)& theSelection, + const Handle(SelectMgr_EntityOwner)& theEntityOwner); + +protected: + + //! Compute points on the circle sides for the specified dimension plane. + //! Program error exception is raised if the dimension plane "x" direction + //! is orthogonal to plane (the "impossible" case). The passed dimension plane + //! is the one specially computed to locate dimension presentation in circle. + //! @param theCircle [in] the circle. + //! @param thePlane [in] the dimension presentation plane computed. + //! @param theFirstPnt [out] the first point. + //! @param theSecondPnt [out] the second point. + Standard_EXPORT void ComputeSidePoints (const gp_Circ& theCircle, + const gp_Pln& thePlane, + gp_Pnt& theFirstPnt, + gp_Pnt& theSecondPnt); + + Standard_EXPORT Standard_Boolean IsValidCircle (const gp_Circ& theCircle) const; + + Standard_EXPORT Standard_Boolean IsValidAnchor (const gp_Circ& theCircle, + const gp_Pnt& thePnt) const; -// Fields private: - gp_Circ myCircle; + gp_Circ myCircle; + gp_Pnt myAnchorPoint; + TopoDS_Shape myShape; }; -#endif + +#endif // _AIS_DiameterDimension_HeaderFile diff --git a/src/AIS/AIS_Dimension.cxx b/src/AIS/AIS_Dimension.cxx index c0639ee806..ec5c3a8398 100644 --- a/src/AIS/AIS_Dimension.cxx +++ b/src/AIS/AIS_Dimension.cxx @@ -1,4 +1,6 @@ -// Copyright (c) 1999-2013 OPEN CASCADE SAS +// Created on: 2013-11-11 +// Created by: Anastasia BORISOVA +// Copyright (c) 2013 OPEN CASCADE SAS // // The content of this file is subject to the Open CASCADE Technology Public // License Version 6.5 (the "License"). You may not use the content of this file @@ -19,11 +21,11 @@ #include #include -#include #include #include #include #include +#include #include #include #include @@ -70,6 +72,7 @@ #include #include #include +#include IMPLEMENT_STANDARD_HANDLE(AIS_Dimension, AIS_InteractiveObject) IMPLEMENT_STANDARD_RTTIEXT(AIS_Dimension, AIS_InteractiveObject) @@ -79,6 +82,7 @@ namespace // default text strings static const Standard_Utf32Char THE_FILL_CHARACTER ('0'); static const TCollection_ExtendedString THE_EMPTY_LABEL; + static const TCollection_AsciiString THE_UNDEFINED_UNITS; // default text margin and resolution static const Standard_Real THE_3D_TEXT_MARGIN = 0.1; @@ -93,190 +97,202 @@ namespace //function : Constructor //purpose : //======================================================================= -AIS_Dimension::AIS_Dimension() +AIS_Dimension::AIS_Dimension (const AIS_KindOfDimension theType) : AIS_InteractiveObject(), - myDefaultPlane (gp_Pln (gp::XOY())), - myIsWorkingPlaneCustom (Standard_False), - myValue (0.0), + myCustomValue (0.0), myIsValueCustom (Standard_False), - myUnitsQuantity (TCollection_AsciiString("LENGTH")), - myToDisplayUnits (Standard_False), mySpecialSymbol (' '), myDisplaySpecialSymbol (AIS_DSS_No), - myIsTextReversed (Standard_False), - myIsInitialized (Standard_False), + myGeometryType (GeometryType_UndefShapes), + myIsPlaneCustom (Standard_False), myFlyout (0.0), - myKindOfDimension (AIS_KOD_NONE) -{ - ResetWorkingPlane(); - // Units default settings - UnitsAPI::SetLocalSystem (UnitsAPI_SI); - myModelUnits = Units::DictionaryOfUnits()->ActiveUnit (myUnitsQuantity.ToCString()); - myDisplayUnits = Units::DictionaryOfUnits()->ActiveUnit (myUnitsQuantity.ToCString()); -} - -//======================================================================= -//function : AcceptDisplayMode -//purpose : Checks if display mode is allowed to display object. -//======================================================================= -Standard_Boolean AIS_Dimension::AcceptDisplayMode (const Standard_Integer theMode) const -{ - return theMode == ComputeMode_All; -} - -//======================================================================= -//function : computeValue -//purpose : Computes dimension value in display units. -//======================================================================= -void AIS_Dimension::computeValue() -{ - UnitsAPI::SetCurrentUnit (myUnitsQuantity.ToCString(), myModelUnits.ToCString()); - myValue = UnitsAPI::CurrentFromLS (myValue, myUnitsQuantity.ToCString()); - myValue = valueToDisplayUnits(); -} - -//======================================================================= -//function : countDefaultPlane -//purpose : -//======================================================================= -void AIS_Dimension::countDefaultPlane() + myIsValid (Standard_False), + myKindOfDimension (theType) { } -//======================================================================= -//function : GetWorkingPlane -//purpose : -//======================================================================= -const gp_Pln& AIS_Dimension::GetWorkingPlane() const -{ - return myWorkingPlane; -} - -//======================================================================= -//function : SetWorkingPlane -//purpose : -//======================================================================= -void AIS_Dimension::SetWorkingPlane (const gp_Pln& thePlane) -{ - myWorkingPlane = thePlane; - myIsWorkingPlaneCustom = Standard_True; -} - -//======================================================================= -//function : ResetWorkingPlane -//purpose : Set default value of working plane -//======================================================================= -void AIS_Dimension::ResetWorkingPlane() -{ - myWorkingPlane = myDefaultPlane; - myIsWorkingPlaneCustom = Standard_False; -} - -//======================================================================= -//function : resetWorkingPlane -//purpose : Set default value of working plane -// Only for internal use. -//======================================================================= -void AIS_Dimension::resetWorkingPlane (const gp_Pln& theNewDefaultPlane) -{ - myDefaultPlane = theNewDefaultPlane; - ResetWorkingPlane(); -} - -//======================================================================= -//function : valueInDisplayUnits -//purpose : -//======================================================================= -Standard_Real AIS_Dimension::valueToDisplayUnits() -{ - return UnitsAPI::AnyToAny (myValue, - myModelUnits.ToCString(), - myDisplayUnits.ToCString()); -} - -//======================================================================= -//function : KindOfDimension -//purpose : -//======================================================================= -AIS_KindOfDimension AIS_Dimension::KindOfDimension() const -{ - return myKindOfDimension; -} - -//======================================================================= -//function : SetKindOfDimension -//purpose : -//======================================================================= -void AIS_Dimension::SetKindOfDimension (const AIS_KindOfDimension theKindOfDimension) -{ - myKindOfDimension = theKindOfDimension; -} - -//======================================================================= -//function : GetValue -//purpose : -//======================================================================= -Standard_Real AIS_Dimension::GetValue() const - { - return myValue; - } - //======================================================================= //function : SetCustomValue //purpose : //======================================================================= void AIS_Dimension::SetCustomValue (const Standard_Real theValue) { - myValue = theValue; + if (myIsValueCustom && myCustomValue == theValue) + { + return; + } + myIsValueCustom = Standard_True; + + myCustomValue = theValue; + + SetToUpdate(); } //======================================================================= -//function : SetFirstShape +//function : GetPlane //purpose : //======================================================================= -void AIS_Dimension::SetFirstShape (const TopoDS_Shape& theShape) +const gp_Pln& AIS_Dimension::GetPlane() const { - myFirstShape = theShape; - myIsInitialized = Standard_False; - resetGeom(); + return myPlane; } //======================================================================= -//function : SetSecondShape +//function : GetGeometryType //purpose : //======================================================================= -void AIS_Dimension::SetSecondShape (const TopoDS_Shape& theShape) +const Standard_Integer AIS_Dimension::GetGeometryType () const { - mySecondShape = theShape; - myIsInitialized = Standard_False; - resetGeom(); + return myGeometryType; } //======================================================================= -//function : getTextWidthAndString +//function : SetUserPlane //purpose : //======================================================================= -void AIS_Dimension::getTextWidthAndString (Quantity_Length& theWidth, - TCollection_ExtendedString& theString) const +void AIS_Dimension::SetCustomPlane (const gp_Pln& thePlane) { - char aValueSimpleStr[25]; - sprintf (aValueSimpleStr, "%g", GetValue()); - theString = TCollection_ExtendedString (aValueSimpleStr); + myPlane = thePlane; + myIsPlaneCustom = Standard_True; - if (IsUnitsDisplayed()) + // Check validity if geometry has been set already. + if (myIsValid) { - theString += " "; - theString += TCollection_ExtendedString (myDisplayUnits); + myIsValid &= CheckPlane (myPlane); + SetToUpdate(); + } +} + +//======================================================================= +//function : SetDimensionAspect +//purpose : +//======================================================================= +void AIS_Dimension::SetDimensionAspect (const Handle(Prs3d_DimensionAspect)& theDimensionAspect) +{ + myDrawer->SetDimensionAspect (theDimensionAspect); + + SetToUpdate(); +} + +//======================================================================= +//function : SetDisplaySpecialSymbol +//purpose : +//======================================================================= +void AIS_Dimension::SetDisplaySpecialSymbol (const AIS_DisplaySpecialSymbol theDisplaySpecSymbol) +{ + if (myDisplaySpecialSymbol == theDisplaySpecSymbol) + { + return; } - if (myDisplaySpecialSymbol == AIS_DSS_Before) + myDisplaySpecialSymbol = theDisplaySpecSymbol; + + SetToUpdate(); +} + +//======================================================================= +//function : SetSpecialSymbol +//purpose : +//======================================================================= +void AIS_Dimension::SetSpecialSymbol (const Standard_ExtCharacter theSpecialSymbol) +{ + if (mySpecialSymbol == theSpecialSymbol) { - theString = TCollection_ExtendedString (mySpecialSymbol) + theString; + return; } - else if (myDisplaySpecialSymbol == AIS_DSS_After) + + mySpecialSymbol = theSpecialSymbol; + + SetToUpdate(); +} + +//======================================================================= +//function : SetSelToleranceForText2d +//purpose : +//======================================================================= +void AIS_Dimension::SetSelToleranceForText2d (const Standard_Real theTol) +{ + if (mySelToleranceForText2d == theTol) { - theString += TCollection_ExtendedString (mySpecialSymbol); + return; + } + + mySelToleranceForText2d = theTol; + + SetToUpdate(); +} + +//======================================================================= +//function : SetFlyout +//purpose : +//======================================================================= +void AIS_Dimension::SetFlyout (const Standard_Real theFlyout) +{ + if (myFlyout == theFlyout) + { + return; + } + + myFlyout = theFlyout; + + SetToUpdate(); +} + +//======================================================================= +//function : GetDisplayUnits +//purpose : +//======================================================================= +const TCollection_AsciiString& AIS_Dimension::GetDisplayUnits() const +{ + return THE_UNDEFINED_UNITS; +} + +//======================================================================= +//function : GetModelUnits +//purpose : +//======================================================================= +const TCollection_AsciiString& AIS_Dimension::GetModelUnits() const +{ + return THE_UNDEFINED_UNITS; +} + +//======================================================================= +//function : ValueToDisplayUnits +//purpose : +//======================================================================= +Standard_Real AIS_Dimension::ValueToDisplayUnits() const +{ + return UnitsAPI::AnyToAny (GetValue(), + GetModelUnits().ToCString(), + GetDisplayUnits().ToCString()); +} + +//======================================================================= +//function : GetValueString +//purpose : +//======================================================================= +TCollection_ExtendedString AIS_Dimension::GetValueString (Standard_Real& theWidth) const +{ + // format value string using "sprintf" + TCollection_AsciiString aFormatStr = myDrawer->DimensionAspect()->ValueStringFormat(); + + char aFmtBuffer[256]; + sprintf (aFmtBuffer, aFormatStr.ToCString(), ValueToDisplayUnits()); + TCollection_ExtendedString aValueStr = TCollection_ExtendedString (aFmtBuffer); + + // add units to values string + if (myDrawer->DimensionAspect()->IsUnitsDisplayed()) + { + aValueStr += " "; + aValueStr += TCollection_ExtendedString (GetDisplayUnits()); + } + + switch (myDisplaySpecialSymbol) + { + case AIS_DSS_Before : aValueStr.Insert (1, mySpecialSymbol); break; + case AIS_DSS_After : aValueStr.Insert (aValueStr.Length() + 1, mySpecialSymbol); break; + case AIS_DSS_No : break; } // Get text style parameters @@ -288,7 +304,7 @@ void AIS_Dimension::getTextWidthAndString (Quantity_Length& theWidth, Font_FontAspect aFontAspect = myDrawer->DimensionAspect()->TextAspect()->Aspect()->GetTextFontAspect(); Standard_Real aFontHeight = myDrawer->DimensionAspect()->TextAspect()->Height(); - NCollection_Utf8String anUTFString = (Standard_Utf16Char* )theString.ToExtString(); + NCollection_Utf8String anUTFString = (Standard_Utf16Char* )aValueStr.ToExtString(); theWidth = 0.0; @@ -307,7 +323,7 @@ void AIS_Dimension::getTextWidthAndString (Quantity_Length& theWidth, else { // Text width for 1:1 scale 2D case - Handle(Font_FTFont) aFont = new Font_FTFont (); + Handle(Font_FTFont) aFont = new Font_FTFont(); aFont->Init (aFontName, aFontAspect, (const unsigned int)aFontHeight, THE_2D_TEXT_RESOLUTION); for (NCollection_Utf8Iter anIter = anUTFString.Iterator(); *anIter != 0; ) @@ -317,13 +333,15 @@ void AIS_Dimension::getTextWidthAndString (Quantity_Length& theWidth, theWidth += (Standard_Real) aFont->AdvanceX (aCurrChar, aNextChar); } } + + return aValueStr; } //======================================================================= -//function : drawArrow +//function : DrawArrow //purpose : //======================================================================= -void AIS_Dimension::drawArrow (const Handle(Prs3d_Presentation)& thePresentation, +void AIS_Dimension::DrawArrow (const Handle(Prs3d_Presentation)& thePresentation, const gp_Pnt& theLocation, const gp_Dir& theDirection) { @@ -344,7 +362,7 @@ void AIS_Dimension::drawArrow (const Handle(Prs3d_Presentation)& thePresentation { gp_Pnt aLeftPoint (gp::Origin()); gp_Pnt aRightPoint (gp::Origin()); - const gp_Dir& aPlane = myWorkingPlane.Axis().Direction(); + const gp_Dir& aPlane = GetPlane().Axis().Direction(); PointsForArrow (theLocation, theDirection, aPlane, aLength, anAngle, aLeftPoint, aRightPoint); @@ -378,10 +396,10 @@ void AIS_Dimension::drawArrow (const Handle(Prs3d_Presentation)& thePresentation } //======================================================================= -//function : drawText +//function : DrawText //purpose : //======================================================================= -void AIS_Dimension::drawText (const Handle(Prs3d_Presentation)& thePresentation, +void AIS_Dimension::DrawText (const Handle(Prs3d_Presentation)& thePresentation, const gp_Pnt& theTextPos, const gp_Dir& theTextDir, const TCollection_ExtendedString& theText, @@ -458,7 +476,7 @@ void AIS_Dimension::drawText (const Handle(Prs3d_Presentation)& thePresentation, aTextShape.Move (anOffsetTrsf); // transform text to myWorkingPlane coordinate system - gp_Ax3 aTextCoordSystem (theTextPos, myWorkingPlane.Axis().Direction(), aTextDir); + gp_Ax3 aTextCoordSystem (theTextPos, GetPlane().Axis().Direction(), aTextDir); gp_Trsf aTextPlaneTrsf; aTextPlaneTrsf.SetTransformation (aTextCoordSystem, gp_Ax3 (gp::XOY())); aTextShape.Move (aTextPlaneTrsf); @@ -472,7 +490,7 @@ void AIS_Dimension::drawText (const Handle(Prs3d_Presentation)& thePresentation, aCenterOfLabel.Transform (aCenterOffsetTrsf); aCenterOfLabel.Transform (aTextPlaneTrsf); - gp_Ax2 aFlippingAxes (aCenterOfLabel, myWorkingPlane.Axis().Direction(), aTextDir); + gp_Ax2 aFlippingAxes (aCenterOfLabel, GetPlane().Axis().Direction(), aTextDir); Prs3d_Root::CurrentGroup (thePresentation)->SetFlippingOptions (Standard_True, aFlippingAxes); // draw text @@ -522,10 +540,10 @@ void AIS_Dimension::drawText (const Handle(Prs3d_Presentation)& thePresentation, } //======================================================================= -//function : drawExtension +//function : DrawExtension //purpose : //======================================================================= -void AIS_Dimension::drawExtension (const Handle(Prs3d_Presentation)& thePresentation, +void AIS_Dimension::DrawExtension (const Handle(Prs3d_Presentation)& thePresentation, const Standard_Real theExtensionSize, const gp_Pnt& theExtensionStart, const gp_Dir& theExtensionDir, @@ -538,14 +556,13 @@ void AIS_Dimension::drawExtension (const Handle(Prs3d_Presentation)& thePresenta gp_Lin anExtensionLine (theExtensionStart, theExtensionDir); Standard_Boolean hasLabel = theLabelString.Length() > 0; - if (hasLabel && (theMode == ComputeMode_All || theMode == ComputeMode_Text)) { // compute text primitives; get its model width gp_Pnt aTextPos = ElCLib::Value (theExtensionSize, anExtensionLine); - gp_Dir aTextDir = myIsTextReversed ? -theExtensionDir : theExtensionDir; + gp_Dir aTextDir = theExtensionDir; - drawText (thePresentation, + DrawText (thePresentation, aTextPos, aTextDir, theLabelString, @@ -590,71 +607,46 @@ void AIS_Dimension::drawExtension (const Handle(Prs3d_Presentation)& thePresenta } //======================================================================= -//function : SetDimensionAspect +//function : DrawLinearDimension //purpose : //======================================================================= -void AIS_Dimension::SetDimensionAspect (const Handle(Prs3d_DimensionAspect)& theDimensionAspect) -{ - myDrawer->SetDimensionAspect (theDimensionAspect); -} - -//======================================================================= -//function : DimensionAspect -//purpose : -//======================================================================= -Handle(Prs3d_DimensionAspect) AIS_Dimension::DimensionAspect() const -{ - return myDrawer->DimensionAspect(); -} - -//======================================================================= -//function : drawLinearDimension -//purpose : -//======================================================================= -void AIS_Dimension::drawLinearDimension (const Handle(Prs3d_Presentation)& thePresentation, +void AIS_Dimension::DrawLinearDimension (const Handle(Prs3d_Presentation)& thePresentation, const Standard_Integer theMode, - const Standard_Boolean isOneSideDimension/* = Standard_False*/) + const gp_Pnt& theFirstPoint, + const gp_Pnt& theSecondPoint, + const Standard_Boolean theIsOneSide) { - // don not build any dimension for equal points - if (myFirstPoint.IsEqual (mySecondPoint, Precision::Confusion())) + // do not build any dimension for equal points + if (theFirstPoint.IsEqual (theSecondPoint, Precision::Confusion())) { - setComputed (Standard_False); - return; + Standard_ProgramError::Raise ("Can not build presentation for equal points."); } // compute dimension line points - gp_Ax1 aWorkingPlaneNormal = GetWorkingPlane().Axis(); - gp_Dir aTargetPointsVector = gce_MakeDir (myFirstPoint, mySecondPoint); + gp_Ax1 aPlaneNormal = GetPlane().Axis(); + gp_Dir aTargetPointsVector = gce_MakeDir (theFirstPoint, theSecondPoint); // compute flyout direction vector - gp_Dir aFlyoutVector = aWorkingPlaneNormal.Direction() ^ aTargetPointsVector; + gp_Dir aFlyoutVector = aPlaneNormal.Direction() ^ aTargetPointsVector; // create lines for layouts - gp_Lin aLine1 (myFirstPoint, aFlyoutVector); - gp_Lin aLine2 (mySecondPoint, aFlyoutVector); + gp_Lin aLine1 (theFirstPoint, aFlyoutVector); + gp_Lin aLine2 (theSecondPoint, aFlyoutVector); // Get flyout end points - gp_Pnt aLineBegPoint = ElCLib::Value (ElCLib::Parameter (aLine1, myFirstPoint) + GetFlyout(), aLine1); - gp_Pnt aLineEndPoint = ElCLib::Value (ElCLib::Parameter (aLine2, mySecondPoint) + GetFlyout(), aLine2); + gp_Pnt aLineBegPoint = ElCLib::Value (ElCLib::Parameter (aLine1, theFirstPoint) + GetFlyout(), aLine1); + gp_Pnt aLineEndPoint = ElCLib::Value (ElCLib::Parameter (aLine2, theSecondPoint) + GetFlyout(), aLine2); Handle(Prs3d_DimensionAspect) aDimensionAspect = myDrawer->DimensionAspect(); - Handle(SelectMgr_EntityOwner) anEmptyOwner; gp_Lin aDimensionLine = gce_MakeLin (aLineBegPoint, aLineEndPoint); // For extensions we need to know arrow size, text size and extension size: get it from aspect Quantity_Length anArrowLength = aDimensionAspect->ArrowAspect()->Length(); Standard_Real anExtensionSize = aDimensionAspect->ExtensionSize(); - - if (!myIsValueCustom) - { - computeValue(); - } - // prepare label string and compute its geometrical width Standard_Real aLabelWidth; - TCollection_ExtendedString aLabelString; - getTextWidthAndString (aLabelWidth, aLabelString); + TCollection_ExtendedString aLabelString = GetValueString (aLabelWidth); // add margins to cut dimension lines for 3d text if (aDimensionAspect->IsText3d()) @@ -676,7 +668,7 @@ void AIS_Dimension::drawLinearDimension (const Handle(Prs3d_Presentation)& thePr : 0.0; Standard_Real aDimensionWidth = aLineBegPoint.Distance (aLineEndPoint); - Standard_Real anArrowsWidth = isOneSideDimension + Standard_Real anArrowsWidth = theIsOneSide ? anArrowLength + anArrowMargin : (anArrowLength + anArrowMargin) * 2.0; @@ -708,9 +700,9 @@ void AIS_Dimension::drawLinearDimension (const Handle(Prs3d_Presentation)& thePr aSecondArrowEnd = aLineEndPoint.Translated (-gp_Vec (aSecondArrowDir).Scaled (anArrowLength)); gp_Pnt aCenterLineBegin = isArrowsExternal - ? aLineBegPoint : aFirstArrowEnd; + ? aLineBegPoint : aFirstArrowEnd; - gp_Pnt aCenterLineEnd = isArrowsExternal || isOneSideDimension + gp_Pnt aCenterLineEnd = isArrowsExternal || theIsOneSide ? aLineEndPoint : aSecondArrowEnd; Standard_Integer aLabelPosition = LabelPosition_None; @@ -724,7 +716,7 @@ void AIS_Dimension::drawLinearDimension (const Handle(Prs3d_Presentation)& thePr case Prs3d_DTHP_Fit: { Standard_Real aDimensionWidth = aLineBegPoint.Distance (aLineEndPoint); - Standard_Real anArrowsWidth = isOneSideDimension ? anArrowLength : 2.0 * anArrowLength; + Standard_Real anArrowsWidth = theIsOneSide ? anArrowLength : 2.0 * anArrowLength; Standard_Real aContentWidth = isArrowsExternal ? aLabelWidth : aLabelWidth + anArrowsWidth; aLabelPosition |= aDimensionWidth < aContentWidth ? LabelPosition_Left : LabelPosition_HCenter; @@ -751,14 +743,12 @@ void AIS_Dimension::drawLinearDimension (const Handle(Prs3d_Presentation)& thePr Prs3d_Root::NewGroup (thePresentation); gp_Pnt aTextPos = (aCenterLineBegin.XYZ() + aCenterLineEnd.XYZ()) * 0.5; - gp_Dir aTextDir = myIsTextReversed - ? -aDimensionLine.Direction() - : aDimensionLine.Direction(); + gp_Dir aTextDir = aDimensionLine.Direction(); // add text primitives if (theMode == ComputeMode_All || theMode == ComputeMode_Text) { - drawText (thePresentation, + DrawText (thePresentation, aTextPos, aTextDir, aLabelString, @@ -829,10 +819,10 @@ void AIS_Dimension::drawLinearDimension (const Handle(Prs3d_Presentation)& thePr // add arrows to presentation Prs3d_Root::NewGroup (thePresentation); - drawArrow (thePresentation, aFirstArrowBegin, aFirstArrowDir); - if (!isOneSideDimension) + DrawArrow (thePresentation, aFirstArrowBegin, aFirstArrowDir); + if (!theIsOneSide) { - drawArrow (thePresentation, aSecondArrowBegin, aSecondArrowDir); + DrawArrow (thePresentation, aSecondArrowBegin, aSecondArrowDir); } if (!isArrowsExternal) @@ -843,12 +833,12 @@ void AIS_Dimension::drawLinearDimension (const Handle(Prs3d_Presentation)& thePr // add arrow extension lines to presentation Prs3d_Root::NewGroup (thePresentation); - drawExtension (thePresentation, anExtensionSize, + DrawExtension (thePresentation, anExtensionSize, aFirstArrowEnd, aFirstExtensionDir, THE_EMPTY_LABEL, 0.0, theMode, LabelPosition_None); - if (!isOneSideDimension) + if (!theIsOneSide) { - drawExtension (thePresentation, anExtensionSize, + DrawExtension (thePresentation, anExtensionSize, aSecondArrowEnd, aSecondExtensionDir, THE_EMPTY_LABEL, 0.0, theMode, LabelPosition_None); } @@ -866,8 +856,10 @@ void AIS_Dimension::drawLinearDimension (const Handle(Prs3d_Presentation)& thePr Prs3d_Root::NewGroup (thePresentation); // Left extension with the text - drawExtension (thePresentation, anExtensionSize, - isArrowsExternal ? aFirstArrowEnd : aFirstArrowBegin, + DrawExtension (thePresentation, anExtensionSize, + isArrowsExternal + ? aFirstArrowEnd + : aFirstArrowBegin, aFirstExtensionDir, aLabelString, aLabelWidth, @@ -896,13 +888,13 @@ void AIS_Dimension::drawLinearDimension (const Handle(Prs3d_Presentation)& thePr // add arrows to presentation Prs3d_Root::NewGroup (thePresentation); - drawArrow (thePresentation, aFirstArrowBegin, aFirstArrowDir); - if (!isOneSideDimension) + DrawArrow (thePresentation, aFirstArrowBegin, aFirstArrowDir); + if (!theIsOneSide) { - drawArrow (thePresentation, aSecondArrowBegin, aSecondArrowDir); + DrawArrow (thePresentation, aSecondArrowBegin, aSecondArrowDir); } - if (!isArrowsExternal || isOneSideDimension) + if (!isArrowsExternal || theIsOneSide) { break; } @@ -910,7 +902,7 @@ void AIS_Dimension::drawLinearDimension (const Handle(Prs3d_Presentation)& thePr // add extension lines for external arrows Prs3d_Root::NewGroup (thePresentation); - drawExtension (thePresentation, anExtensionSize, + DrawExtension (thePresentation, anExtensionSize, aSecondArrowEnd, aSecondExtensionDir, THE_EMPTY_LABEL, 0.0, theMode, LabelPosition_None); } @@ -927,8 +919,10 @@ void AIS_Dimension::drawLinearDimension (const Handle(Prs3d_Presentation)& thePr Prs3d_Root::NewGroup (thePresentation); // Right extension with text - drawExtension (thePresentation, anExtensionSize, - isArrowsExternal ? aSecondArrowEnd : aSecondArrowBegin, + DrawExtension (thePresentation, anExtensionSize, + isArrowsExternal + ? aSecondArrowEnd + : aSecondArrowBegin, aSecondExtensionDir, aLabelString, aLabelWidth, theMode, @@ -954,13 +948,13 @@ void AIS_Dimension::drawLinearDimension (const Handle(Prs3d_Presentation)& thePr // add arrows to presentation Prs3d_Root::NewGroup (thePresentation); - drawArrow (thePresentation, aSecondArrowBegin, aSecondArrowDir); - if (!isOneSideDimension) + DrawArrow (thePresentation, aSecondArrowBegin, aSecondArrowDir); + if (!theIsOneSide) { - drawArrow (thePresentation, aFirstArrowBegin, aFirstArrowDir); + DrawArrow (thePresentation, aFirstArrowBegin, aFirstArrowDir); } - if (!isArrowsExternal || isOneSideDimension) + if (!isArrowsExternal || theIsOneSide) { break; } @@ -968,7 +962,7 @@ void AIS_Dimension::drawLinearDimension (const Handle(Prs3d_Presentation)& thePr // add extension lines for external arrows Prs3d_Root::NewGroup (thePresentation); - drawExtension (thePresentation, anExtensionSize, + DrawExtension (thePresentation, anExtensionSize, aFirstArrowEnd, aFirstExtensionDir, THE_EMPTY_LABEL, 0.0, theMode, LabelPosition_None); } @@ -983,10 +977,10 @@ void AIS_Dimension::drawLinearDimension (const Handle(Prs3d_Presentation)& thePr Prs3d_Root::NewGroup (thePresentation); Handle(Graphic3d_ArrayOfSegments) aPrimSegments = new Graphic3d_ArrayOfSegments(4); - aPrimSegments->AddVertex (myFirstPoint); + aPrimSegments->AddVertex (theFirstPoint); aPrimSegments->AddVertex (aLineBegPoint); - aPrimSegments->AddVertex (mySecondPoint); + aPrimSegments->AddVertex (theSecondPoint); aPrimSegments->AddVertex (aLineEndPoint); Handle(Prs3d_DimensionAspect) aDimensionAspect = myDrawer->DimensionAspect(); @@ -994,44 +988,48 @@ void AIS_Dimension::drawLinearDimension (const Handle(Prs3d_Presentation)& thePr Prs3d_Root::CurrentGroup (thePresentation)->AddPrimitiveArray (aPrimSegments); } - setComputed (Standard_True); + myIsComputed = Standard_True; } //======================================================================= -//function : SetFirstPoint -//purpose : -//======================================================================= -void AIS_Dimension::SetFirstPoint (const gp_Pnt& thePoint) -{ - myFirstPoint = thePoint; -} - -//======================================================================= -//function : SetSecondPoint -//purpose : -//======================================================================= -void AIS_Dimension::SetSecondPoint (const gp_Pnt& thePoint) -{ - mySecondPoint = thePoint; -} - -//======================================================================= -//function : Type +//function : ComputeLinearFlyouts //purpose : //======================================================================= -AIS_KindOfInteractive AIS_Dimension::Type() const +void AIS_Dimension::ComputeLinearFlyouts (const Handle(SelectMgr_Selection)& theSelection, + const Handle(SelectMgr_EntityOwner)& theOwner, + const gp_Pnt& theFirstPoint, + const gp_Pnt& theSecondPoint) { - return AIS_KOI_Relation; + // count flyout direction + gp_Ax1 aPlaneNormal = GetPlane().Axis(); + gp_Dir aTargetPointsVector = gce_MakeDir (theFirstPoint, theSecondPoint); + + // count a flyout direction vector. + gp_Dir aFlyoutVector = aPlaneNormal.Direction() ^ aTargetPointsVector; + + // create lines for layouts + gp_Lin aLine1 (theFirstPoint, aFlyoutVector); + gp_Lin aLine2 (theSecondPoint, aFlyoutVector); + + // get flyout end points + gp_Pnt aFlyoutEnd1 = ElCLib::Value (ElCLib::Parameter (aLine1, theFirstPoint) + GetFlyout(), aLine1); + gp_Pnt aFlyoutEnd2 = ElCLib::Value (ElCLib::Parameter (aLine2, theSecondPoint) + GetFlyout(), aLine2); + + // fill sensitive entity for flyouts + Handle(Select3D_SensitiveGroup) aSensitiveEntity = new Select3D_SensitiveGroup (theOwner); + aSensitiveEntity->Add (new Select3D_SensitiveSegment (theOwner, theFirstPoint, aFlyoutEnd1)); + aSensitiveEntity->Add (new Select3D_SensitiveSegment (theOwner, theSecondPoint, aFlyoutEnd2)); + theSelection->Add (aSensitiveEntity); } //======================================================================= -//function : circleFromPlanarFace +//function : CircleFromPlanarFace //purpose : if possible computes circle from planar face //======================================================================= -Standard_Boolean AIS_Dimension::circleFromPlanarFace (const TopoDS_Face& theFace, +Standard_Boolean AIS_Dimension::CircleFromPlanarFace (const TopoDS_Face& theFace, Handle(Geom_Curve)& theCurve, - gp_Pnt & theFirstPoint, - gp_Pnt & theLastPoint) + gp_Pnt& theFirstPoint, + gp_Pnt& theLastPoint) { TopExp_Explorer anIt (theFace, TopAbs_EDGE); for ( ; anIt.More(); anIt.Next()) @@ -1049,13 +1047,13 @@ Standard_Boolean AIS_Dimension::circleFromPlanarFace (const TopoDS_Face& theFace } //======================================================================= -//function : initCircularDimension -//purpose : if it's possible computes circle from planar face +//function : InitCircularDimension +//purpose : //======================================================================= -Standard_Boolean AIS_Dimension::initCircularDimension (const TopoDS_Shape& theShape, +Standard_Boolean AIS_Dimension::InitCircularDimension (const TopoDS_Shape& theShape, gp_Circ& theCircle, gp_Pnt& theMiddleArcPoint, - gp_Pnt& theOppositeDiameterPoint) + Standard_Boolean& theIsClosed) { gp_Pln aPln; Handle(Geom_Surface) aBasisSurf; @@ -1064,8 +1062,8 @@ Standard_Boolean AIS_Dimension::initCircularDimension (const TopoDS_Shape& theSh Standard_Real anOffset = 0.0; Standard_Real aFirstParam = 0.0; Standard_Real aLastParam = 0.0; - Standard_Boolean isAnArc = Standard_False; + // discover circular geometry if (theShape.ShapeType() == TopAbs_FACE) { AIS::GetPlaneFromFace (TopoDS::Face (theShape), aPln, aBasisSurf, aSurfType, anOffset); @@ -1073,14 +1071,12 @@ Standard_Boolean AIS_Dimension::initCircularDimension (const TopoDS_Shape& theSh if (aSurfType == AIS_KOS_Plane) { Handle(Geom_Curve) aCurve; - if (!circleFromPlanarFace (TopoDS::Face (theShape), aCurve, aFirstPoint, aLastPoint)) + if (!CircleFromPlanarFace (TopoDS::Face (theShape), aCurve, aFirstPoint, aLastPoint)) { - Standard_ConstructionError::Raise ("AIS_Dimension:: Curve is not a circle or is Null") ; return Standard_False; } theCircle = Handle(Geom_Circle)::DownCast (aCurve)->Circ(); - isAnArc = !(aFirstPoint.IsEqual (aLastPoint, Precision::Confusion())); } else { @@ -1092,7 +1088,7 @@ Standard_Boolean AIS_Dimension::initCircularDimension (const TopoDS_Shape& theSh Standard_Real aLastV = aSurf1.LastVParameter(); Standard_Real aMidU = (aFirstU + aLastU) * 0.5; Standard_Real aMidV = (aFirstV + aLastV) * 0.5; - aSurf1.D0(aMidU, aMidV, aCurPos); + aSurf1.D0 (aMidU, aMidV, aCurPos); Handle (Adaptor3d_HCurve) aBasisCurve; Standard_Boolean isExpectedType = Standard_False; if (aSurfType == AIS_KOS_Cylinder) @@ -1121,9 +1117,9 @@ Standard_Boolean AIS_Dimension::initCircularDimension (const TopoDS_Shape& theSh if (!isExpectedType) { - Standard_ConstructionError::Raise ("AIS_Dimension:: Unexpected type of surface") ; return Standard_False; } + Handle(Geom_Curve) aCurve; aCurve = aBasisSurf->VIso(aMidV); if (aCurve->DynamicType() == STANDARD_TYPE (Geom_Circle)) @@ -1172,261 +1168,46 @@ Standard_Boolean AIS_Dimension::initCircularDimension (const TopoDS_Shape& theSh } else // Unexpected type of shape { - Standard_ConstructionError::Raise ("AIS_Dimension:: Unexpected type of shape"); return Standard_False; } + BRepAdaptor_Curve anAdaptedCurve (anEdge); if (!anAdaptedCurve.GetType() == GeomAbs_Circle) { return Standard_False; } - theCircle = anAdaptedCurve.Circle(); + + theCircle = anAdaptedCurve.Circle(); aFirstPoint = anAdaptedCurve.Value (anAdaptedCurve.FirstParameter()); - aLastPoint = anAdaptedCurve.Value (anAdaptedCurve.LastParameter()); + aLastPoint = anAdaptedCurve.Value (anAdaptedCurve.LastParameter()); } - // Get and values from - isAnArc = !(aFirstPoint.IsEqual (aLastPoint, Precision::Confusion())); + + theIsClosed = aFirstPoint.IsEqual (aLastPoint, Precision::Confusion()); + gp_Pnt aCenter = theCircle.Location(); - if (!isAnArc) + + if (theIsClosed) // Circle { - // Circle gp_Dir anXDir = theCircle.XAxis().Direction(); theMiddleArcPoint = aCenter.Translated (gp_Vec (anXDir) * theCircle.Radius()); - theOppositeDiameterPoint = aCenter.Translated (-gp_Vec (anXDir) * theCircle.Radius()); } - else + else // Arc { - // Arc aFirstParam = ElCLib::Parameter (theCircle, aFirstPoint); aLastParam = ElCLib::Parameter (theCircle, aLastPoint); if (aFirstParam > aLastParam) { aFirstParam -= 2.0 * M_PI; } + Standard_Real aParCurPos = (aFirstParam + aLastParam) * 0.5; gp_Vec aVec = gp_Vec (aCenter, ElCLib::Value (aParCurPos, theCircle)).Normalized () * theCircle.Radius (); theMiddleArcPoint = aCenter.Translated (aVec); - theOppositeDiameterPoint = aCenter.Translated (-aVec); } return Standard_True; } -//======================================================================= -//function : SetDisplaySpecialSymbol -//purpose : specifies dimension special symbol display options -//======================================================================= -void AIS_Dimension::SetDisplaySpecialSymbol (const AIS_DisplaySpecialSymbol theDisplaySpecSymbol) -{ - myDisplaySpecialSymbol = theDisplaySpecSymbol; -} - -//======================================================================= -//function : DisplaySpecialSymbol -//purpose : shows dimension special symbol display options -//======================================================================= -AIS_DisplaySpecialSymbol AIS_Dimension::DisplaySpecialSymbol() const -{ - return myDisplaySpecialSymbol; -} - -//======================================================================= -//function : SetSpecialSymbol -//purpose : specifies special symbol -//======================================================================= -void AIS_Dimension::SetSpecialSymbol (const Standard_ExtCharacter theSpecialSymbol) -{ - mySpecialSymbol = theSpecialSymbol; -} - -//======================================================================= -//function : SpecialSymbol -//purpose : returns special symbol -//======================================================================= -Standard_ExtCharacter AIS_Dimension::SpecialSymbol() const -{ - return mySpecialSymbol; -} - -//======================================================================= -//function : IsUnitsDisplayed -//purpose : shows if Units are to be displayed along with dimension value -//======================================================================= -Standard_Boolean AIS_Dimension::IsUnitsDisplayed() const -{ - return myToDisplayUnits; -} - -//======================================================================= -//function : MakeUnitsDisplayed -//purpose : sets to display units along with the dimension value or no -//======================================================================= -void AIS_Dimension::MakeUnitsDisplayed (const Standard_Boolean toDisplayUnits) -{ - myToDisplayUnits = toDisplayUnits; -} - -//======================================================================= -//function : MakeUnitsDisplayed -//purpose : returns the current type of units -//======================================================================= -TCollection_AsciiString AIS_Dimension::UnitsQuantity() const -{ - return myUnitsQuantity; -} - -//======================================================================= -//function : SetUnitsQuantity -//purpose : sets the current type of units -//======================================================================= -void AIS_Dimension::SetUnitsQuantity (const TCollection_AsciiString& theUnitsQuantity) -{ - myUnitsQuantity = theUnitsQuantity; -} - -//======================================================================= -//function : ModelUnits -//purpose : returns the current model units -//======================================================================= -TCollection_AsciiString AIS_Dimension::ModelUnits() const -{ - return myModelUnits; -} - -//======================================================================= -//function : SetModelUnits -//purpose : sets the current model units -//======================================================================= -void AIS_Dimension::SetModelUnits (const TCollection_AsciiString& theUnits) -{ - myModelUnits = theUnits; -} - -//======================================================================= -//function : DisplayUnits -//purpose : returns the current display units -//======================================================================= -TCollection_AsciiString AIS_Dimension::DisplayUnits() const -{ - return myDisplayUnits; -} - -//======================================================================= -//function : SetDisplayUnits -//purpose : sets the current display units -//======================================================================= -void AIS_Dimension::SetDisplayUnits (const TCollection_AsciiString& theUnits) -{ - myDisplayUnits = theUnits; -} - -//======================================================================= -//function : isComputed -//purpose : -//======================================================================= -Standard_Boolean AIS_Dimension::isComputed() const -{ - return myIsComputed; -} - -//======================================================================= -//function : setComputed -//purpose : -//======================================================================= -void AIS_Dimension::setComputed (Standard_Boolean isComputed) -{ - myIsComputed = isComputed; -} - -//======================================================================= -//function : resetGeom -//purpose : -//======================================================================= -void AIS_Dimension::resetGeom() -{ - mySelectionGeom.Clear (ComputeMode_All); -} - -//======================================================================= -//function : IsTextReversed -//purpose : -//======================================================================= -Standard_Boolean AIS_Dimension::IsTextReversed() const -{ - return myIsTextReversed; -} - -//======================================================================= -//function : MakeTextReversed -//purpose : -//======================================================================= -void AIS_Dimension::MakeTextReversed (const Standard_Boolean isTextReversed) -{ - myIsTextReversed = isTextReversed; -} - -//======================================================================= -//function : SetSelToleranceForText2d -//purpose : -//======================================================================= -void AIS_Dimension::SetSelToleranceForText2d (const Standard_Real theTol) -{ - mySelToleranceForText2d = theTol; -} - -//======================================================================= -//function : SelToleranceForText2d -//purpose : -//======================================================================= -Standard_Real AIS_Dimension::SelToleranceForText2d() const -{ - return mySelToleranceForText2d; -} - -//======================================================================= -//function : SetFlyout -//purpose : -//======================================================================= -void AIS_Dimension::SetFlyout (const Standard_Real theFlyout) -{ - if (myFlyout == theFlyout) - { - return; - } - - myFlyout = theFlyout; - SetToUpdate(); -} - -//======================================================================= -//function : computeFlyoutSelection -//purpose : computes selection for flyouts -//======================================================================= -void AIS_Dimension::computeFlyoutSelection (const Handle(SelectMgr_Selection)& theSelection, - const Handle(SelectMgr_EntityOwner)& theOwner) -{ - //Count flyout direction - gp_Ax1 aWorkingPlaneNormal = GetWorkingPlane().Axis(); - gp_Dir aTargetPointsVector = gce_MakeDir (myFirstPoint, mySecondPoint); - - // Count a flyout direction vector. - gp_Dir aFlyoutVector = aWorkingPlaneNormal.Direction() ^ aTargetPointsVector; - - // Create lines for layouts - gp_Lin aLine1 (myFirstPoint, aFlyoutVector); - gp_Lin aLine2 (mySecondPoint, aFlyoutVector); - - // Get flyout end points - gp_Pnt aFlyoutEnd1 = ElCLib::Value (ElCLib::Parameter (aLine1, myFirstPoint) + GetFlyout(), aLine1); - gp_Pnt aFlyoutEnd2 = ElCLib::Value (ElCLib::Parameter (aLine2, mySecondPoint) + GetFlyout(), aLine2); - - // Fill sensitive entity for flyouts - Handle(Select3D_SensitiveGroup) aSensitiveEntity = new Select3D_SensitiveGroup (theOwner); - aSensitiveEntity->Add (new Select3D_SensitiveSegment (theOwner, myFirstPoint, aFlyoutEnd1)); - aSensitiveEntity->Add (new Select3D_SensitiveSegment (theOwner, mySecondPoint, aFlyoutEnd2)); - theSelection->Add (aSensitiveEntity); -} - //======================================================================= //function : ComputeSelection //purpose : @@ -1434,7 +1215,7 @@ void AIS_Dimension::computeFlyoutSelection (const Handle(SelectMgr_Selection)& t void AIS_Dimension::ComputeSelection (const Handle(SelectMgr_Selection)& theSelection, const Standard_Integer theMode) { - if (!isComputed()) + if (!myIsComputed) { return; } @@ -1488,7 +1269,7 @@ void AIS_Dimension::ComputeSelection (const Handle(SelectMgr_Selection)& theSele gp_Pnt aSidePnt1 (gp::Origin()); gp_Pnt aSidePnt2 (gp::Origin()); - const gp_Dir& aPlane = myWorkingPlane.Axis().Direction(); + const gp_Dir& aPlane = GetPlane().Axis().Direction(); const gp_Pnt& aPeak = anArrow->Position; const gp_Dir& aDir = anArrow->Direction; @@ -1519,7 +1300,7 @@ void AIS_Dimension::ComputeSelection (const Handle(SelectMgr_Selection)& theSele Handle(Select3D_SensitiveEntity) aTextSensitive; gp_Ax2 aTextAxes (mySelectionGeom.TextPos, - myWorkingPlane.Axis().Direction(), + GetPlane().Axis().Direction(), mySelectionGeom.TextDir); if (myDrawer->DimensionAspect()->IsText3d()) @@ -1555,7 +1336,7 @@ void AIS_Dimension::ComputeSelection (const Handle(SelectMgr_Selection)& theSele // callback for flyout sensitive calculation if (aSelectionMode == AIS_DSM_All) { - computeFlyoutSelection (theSelection, aSensitiveOwner); + ComputeFlyoutSelection (theSelection, aSensitiveOwner); } } diff --git a/src/AIS/AIS_Dimension.hxx b/src/AIS/AIS_Dimension.hxx index 361814e105..6eacf5eee4 100644 --- a/src/AIS/AIS_Dimension.hxx +++ b/src/AIS/AIS_Dimension.hxx @@ -1,5 +1,6 @@ -// Copyright (c) 1998-1999 Matra Datavision -// Copyright (c) 1999-2013 OPEN CASCADE SAS +// Created on: 2013-11-11 +// Created by: Anastasia BORISOVA +// Copyright (c) 2013 OPEN CASCADE SAS // // The content of this file is subject to the Open CASCADE Technology Public // License Version 6.5 (the "License"). You may not use the content of this file @@ -16,8 +17,8 @@ // purpose or non-infringement. Please see the License for the specific terms // and conditions governing the rights and limitations under the License. -#ifndef _AIS_Dimension_Headerfile -#define _AIS_Dimension_Headerfile +#ifndef _AIS_Dimension_HeaderFile +#define _AIS_Dimension_HeaderFile #include #include @@ -26,11 +27,12 @@ #include #include #include -#include +#include #include #include #include #include +#include #include #include #include @@ -46,12 +48,121 @@ DEFINE_STANDARD_HANDLE(AIS_Dimension, AIS_InteractiveObject) +//! AIS_Dimension is a base class for 2D presentations of linear (length, diameter, radius) +//! and angular dimensions. +//! +//! The dimensions provide measurement of quantities, such as lengths or plane angles. +//! The measurement of dimension "value" is done in model space "as is". +//! These "value" are said to be represented in "model units", which can be specified by user. +//! During the display the measured value converted from "model units" to "display units". +//! The display and model units are stored in common Prs3d_Drawer (drawer of the context) +//! to share it between all dimensions. +//! The specified by user units are stored in the dimension's drawer. +//! +//! As a drawing, the dimension is composed from the following components: +//! - Attachement (binding) points. The points where the dimension lines attaches to, for +//! length dimensions the distances are measured between these points. +//! - Main dimension line. The which extends from the attachement points in "up" direction, +//! and which contains text label on it with value string. +//! - Flyouts. The lines connecting the attachement points with main dimension line. +//! - Extension. The lines used to extend the main dimension line in the cases when text +//! or arrows do not fit into the main dimension line due to their size. +//! - Arrows. +//! +//! 
+//!  Linear dimensions:
+//!
+//!  extension
+//!   line                                     arrow
+//!       -->|------- main dimension line -------|<--
+//!          |                                   |
+//!          |flyout                       flyout|
+//!          |                                   |
+//!          +-----------------------------------+
+//! attachement                                attachement
+//!  point                                       point
+//!
+//!  Angular dimensions:
+//!
+//!                  extension
+//!                     line
+//!                        -->|+++++
+//!                     arrow |     +++
+//!                           |        90(deg) - main dimension line
+//!                    flyout |         +++
+//!                           |           +
+//!                           o---flyout---
+//!                         center         ^ 
+//!                         point          | extension
+//!                                          line
+//!
+//! +//! Being a 2D drawings, the dimensions are created on imaginary plane, called "dimension plane", +//! which can be thought of as reference system of axes (X,Y,N) for constructing the presentation. +//! +//! The role of axes of the dimension plane is to guide you through the encapsualted automations +//! of presentation building to help you understand how is the presentation will look and how it +//! will be oriented in model space during construction. +//! +//! Orientation of dimension line in model space relatively to the base shapes is defined +//! with the flyouts. Flyouts specify length of flyout lines and their orientation relatively +//! to the attachment points on the working plane. +//! For linear dimensions: +//! Direction of flyouts is specified with direction of main dimension line +//! (vector from the first attachment to the second attachment) and the normal of the dimension plane. +//! Positive direction of flyouts is defined by vector multiplication: AttachVector * PlaneNormal. +//! For angular dimensions: +//! Flyouts are defined by vectors from the center point to the attachment points. +//! These vectors directions are supposed to be the positive directions of flyouts. +//! Negative flyouts directions means that these vectors should be reversed +//! (and dimension will be built out of the angle constructed with center and two attach points). +//! +//! The dimension plane can be constructed automatically by application (where possible, +//! it depends on the measured geometry). +//! It can be also set by user. However, if the user-defined plane does not fit the +//! geometry of the dimension (attach points do not belong to it), the dimension could not +//! be built. +//! If it is not possible to compute automatic plane (for example, in case of length between +//! two points) the user is supposed to specify the custom plane. +//! +//! Since the dimensions feature automated construction procedures from an arbitrary shapes, +//! the interfaces to check the validness are also implemented. Once the measured geometry is +//! specified, the one can inquire the validness status by calling "IsValid()" method. If the result +//! is TRUE, then all of public parameters should be pre-computed and ready. The presentation +//! should be also computable. Otherwise, the parameters may return invalid values. In this case, +//! the presentation will not be computed and displayed. +//! +//! The dimension support two local selection modes: main dimension line selection and text label +//! selection. These modes can be used to develop interactive modification of dimension presentations. +//! The component hilighting in these selection modes is provided by AIS_DimensionOwner class. +//! Please note that selection is unavailable until the presentation is computed. +//! +//! The specific drawing attributes are controlled through Prs3d_DimensionAspect. The one can change +//! color, arrows, text and arrow style and specify positioning of value label by setting corresponding +//! values to the aspect. +//! class AIS_Dimension : public AIS_InteractiveObject { protected: - // Specifies supported at base level horizontal and vertical - // label positions for drawing extension lines and centered text. + //! Geometry type defines type of shapes on which the dimension is to be built. + //! Some type of geometry allows automatical plane computing and + //! can be built without user-defined plane + //! Another types can't be built without user-defined plane. + enum GeometryType + { + GeometryType_UndefShapes, + GeometryType_Edge, + GeometryType_Face, + GeometryType_Points, + GeometryType_Edges, + GeometryType_Faces, + GeometryType_EdgeFace, + GeometryType_EdgeVertex + }; + + //! Specifies supported at base level horizontal and vertical + //! label positions for drawing extension lines and centered text. enum LabelPosition { LabelPosition_None = 0x00, @@ -59,12 +170,12 @@ protected: LabelPosition_Left = 0x01, LabelPosition_Right = 0x02, LabelPosition_HCenter = 0x04, - LabelPosition_HMask = LabelPosition_Left | LabelPosition_Right | LabelPosition_HCenter, + LabelPosition_HMask = LabelPosition_Left | LabelPosition_Right | LabelPosition_HCenter, LabelPosition_Above = 0x10, LabelPosition_Below = 0x20, LabelPosition_VCenter = 0x40, - LabelPosition_VMask = LabelPosition_Above | LabelPosition_Below | LabelPosition_VCenter + LabelPosition_VMask = LabelPosition_Above | LabelPosition_Below | LabelPosition_VCenter }; public: @@ -81,158 +192,174 @@ public: public: - //! Constructor with default parameters values - Standard_EXPORT AIS_Dimension(); + //! Constructor with default parameters values. + //! @param theType [in] the type of dimension. + Standard_EXPORT AIS_Dimension (const AIS_KindOfDimension theType); - //! Gets dimension value - Standard_EXPORT Standard_Real GetValue() const; + //! Gets dimension measurement value. If the value to display is not + //! specified by user, then the dimension object is responsible to + //! compute it on its own in model space coordinates. + //! @return the dimension value (in model units) which is used + //! during display of the presentation. + Standard_Real GetValue() const + { + return myIsValueCustom ? myCustomValue : ComputeValue(); + } - //! Sets dimension value - //! Attention! This method is used ONLY to set custom value. - //! To set value internally, use . - Standard_EXPORT void SetCustomValue (const Standard_Real theValue); + //! Sets user-defined dimension value. + //! The user-defined dimension value is specified in model space, + //! and affect by unit conversion during the display. + //! @param theValue [in] the user-defined value to display. + Standard_EXPORT void SetCustomValue (const Standard_Real theValue); - //! Gets working plane. - Standard_EXPORT const gp_Pln& GetWorkingPlane() const; + //! Get the dimension plane in which the 2D dimension presentation is computed. + //! By default, if plane is not defined by user, it is computed automatically + //! after dimension geometry is computed. + //! If computed dimension geometry (points) can't be placed on the user-defined + //! plane, dimension geometry was set as unvalid (validity flag is set to false) + //! and dimension presentation wil not be computed. + //! If user-defined plane allow geometry placement on it, it will be used for + //! computing of the dimension presentation. + //! @return dimension plane used for presentation computing. + Standard_EXPORT const gp_Pln& GetPlane() const; - //! Sets working plane. - Standard_EXPORT void SetWorkingPlane (const gp_Pln& thePlane); + //! Geometry type defines type of shapes on which the dimension is to be built. + //! @return type of geometry on which the dimension will be built. + Standard_EXPORT const Standard_Integer GetGeometryType () const; - Standard_EXPORT void SetFirstPoint (const gp_Pnt& thePoint); + //! Sets user-defined plane where the 2D dimension presentation will be placed. + //! Checks validity of this plane if geometry has been set already. + //! Validity of the plane is checked according to the geometry set + //! and has different criteria for different kinds of dimensions. + Standard_EXPORT virtual void SetCustomPlane (const gp_Pln& thePlane); - Standard_EXPORT void SetSecondPoint (const gp_Pnt& thePoint); + //! Unsets user-defined plane. Therefore the plane for dimension will be + //! computed automatically. + Standard_EXPORT void UnsetCustomPlane() { myIsPlaneCustom = Standard_False; } - Standard_EXPORT void SetFirstShape (const TopoDS_Shape& theFirstShape); - - Standard_EXPORT void SetSecondShape (const TopoDS_Shape& theSecondShape); +public: //! Gets the dimension aspect from AIS object drawer. //! Dimension aspect contains aspects of line, text and arrows for dimension presentation. - Standard_EXPORT Handle(Prs3d_DimensionAspect) DimensionAspect() const; + Handle(Prs3d_DimensionAspect) DimensionAspect() const + { + return myDrawer->DimensionAspect(); + } - //! Sets new length aspect in the interactive object drawer. - Standard_EXPORT void SetDimensionAspect (const Handle(Prs3d_DimensionAspect)& theDimensionAspect); + //! Sets new dimension aspect for the interactive object drawer. + //! The dimension aspect provides dynamic properties which are generally + //! used during computation of dimension presentations. + Standard_EXPORT void SetDimensionAspect (const Handle(Prs3d_DimensionAspect)& theDimensionAspect); - //! Returns the kind of dimension - Standard_EXPORT AIS_KindOfDimension KindOfDimension() const; + //! @return the kind of dimension. + AIS_KindOfDimension KindOfDimension() const + { + return myKindOfDimension; + } - //! Returns the kind of interactive - Standard_EXPORT virtual AIS_KindOfInteractive Type() const; - - //! Sets the kind of dimension - Standard_EXPORT virtual void SetKindOfDimension (const AIS_KindOfDimension theKindOfDimension); + //! @return the kind of interactive. + virtual AIS_KindOfInteractive Type() const + { + return AIS_KOI_Relation; + } //! Returns true if the class of objects accepts the display mode theMode. - //! The interactive context can have a default mode of - //! representation for the set of Interactive Objects. This - //! mode may not be accepted by object - Standard_EXPORT virtual Standard_Boolean AcceptDisplayMode (const Standard_Integer theMode) const; + //! The interactive context can have a default mode of representation for + //! the set of Interactive Objects. This mode may not be accepted by object. + virtual Standard_Boolean AcceptDisplayMode (const Standard_Integer theMode) const + { + return theMode == ComputeMode_All; + } - // Selection computing if it is needed here - Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& theSelection, - const Standard_Integer theMode); +public: - //! Reset working plane to default. - Standard_EXPORT void ResetWorkingPlane(); + //! @return dimension special symbol display options. + AIS_DisplaySpecialSymbol DisplaySpecialSymbol() const + { + return myDisplaySpecialSymbol; + } - //! specifies dimension special symbol display options - Standard_EXPORT void SetDisplaySpecialSymbol (const AIS_DisplaySpecialSymbol theDisplaySpecSymbol); + //! Specifies whether to display special symbol or not. + Standard_EXPORT void SetDisplaySpecialSymbol (const AIS_DisplaySpecialSymbol theDisplaySpecSymbol); - //! shows dimension special symbol display options - Standard_EXPORT AIS_DisplaySpecialSymbol DisplaySpecialSymbol() const; + //! @return special symbol. + Standard_ExtCharacter SpecialSymbol() const + { + return mySpecialSymbol; + } - //! specifies special symbol - Standard_EXPORT void SetSpecialSymbol (const Standard_ExtCharacter theSpecialSymbol); + //! Specifies special symbol. + Standard_EXPORT void SetSpecialSymbol (const Standard_ExtCharacter theSpecialSymbol); - //! returns special symbol - Standard_EXPORT Standard_ExtCharacter SpecialSymbol() const; + Standard_EXPORT virtual const TCollection_AsciiString& GetDisplayUnits() const; - //! shows if Units are to be displayed along with dimension value - Standard_EXPORT Standard_Boolean IsUnitsDisplayed() const; + Standard_EXPORT virtual const TCollection_AsciiString& GetModelUnits() const; - //! sets to display units along with the dimension value or no - Standard_EXPORT void MakeUnitsDisplayed (const Standard_Boolean toDisplayUnits); + Standard_EXPORT virtual void SetDisplayUnits (const TCollection_AsciiString& /*theUnits*/) { } - //! returns the current type of units - Standard_EXPORT TCollection_AsciiString UnitsQuantity() const; + Standard_EXPORT virtual void SetModelUnits (const TCollection_AsciiString& /*theUnits*/) { } - //! sets the current type of units - Standard_EXPORT void SetUnitsQuantity (const TCollection_AsciiString& theUnitsQuantity); +public: - //! returns the current model units - Standard_EXPORT TCollection_AsciiString ModelUnits() const; - - //! sets the current model units - Standard_EXPORT void SetModelUnits (const TCollection_AsciiString& theUnits); - - //! returns the current display units - Standard_EXPORT TCollection_AsciiString DisplayUnits() const; - - //! sets the current display units - Standard_EXPORT void SetDisplayUnits (const TCollection_AsciiString& theUnits); - - //! Important! Only for 3d text
- //! 3d text is oriented relative to the attachment points order
- //! By default, text direction vector is oriented from the first attachment point
- //! to the second one. This method checks if text direction is to be default or
- //! should be reversed. - Standard_EXPORT Standard_Boolean IsTextReversed() const; - - //! Important! Only for 3d text - //! 3d text is oriented relative to the attachment points order
- //! By default, text direction vector is oriented from the first attachment point
- //! to the second one. This method sets value that shows if text direction
- //! should be reversed or not. - Standard_EXPORT void MakeTextReversed (const Standard_Boolean isTextReversed); + //! Returns selection tolerance for text2d: + //! For 2d text selection detection sensitive point with tolerance is used + //! Important! Only for 2d text. + Standard_Real SelToleranceForText2d() const + { + return mySelToleranceForText2d; + } //! Sets selection tolerance for text2d: //! For 2d text selection detection sensitive point with tolerance is used //! to change this tolerance use this method - //! Important! Only for 2d text - Standard_EXPORT void SetSelToleranceForText2d (const Standard_Real theTol); + //! Important! Only for 2d text. + Standard_EXPORT void SetSelToleranceForText2d (const Standard_Real theTol); - //! Returns selection tolerance for text2d: - //! For 2d text selection detection sensitive point with tolerance is used - //! Important! Only for 2d text - Standard_EXPORT Standard_Real SelToleranceForText2d() const; - - //! Sets flyout size for dimension. - Standard_EXPORT void SetFlyout (const Standard_Real theFlyout); - - //! @return flyout size for dimension. + //! @return flyout value for dimension. Standard_Real GetFlyout() const { return myFlyout; } + //! Sets flyout value for dimension. + Standard_EXPORT void SetFlyout (const Standard_Real theFlyout); + + //! Check that the input geometry for dimension is valid and the + //! presentation can be succesfully computed. + //! @return TRUE if dimension geometry is ok. + Standard_Boolean IsValid() const + { + return myIsValid; + } + public: DEFINE_STANDARD_RTTI(AIS_Dimension) protected: - Standard_EXPORT void getTextWidthAndString (Quantity_Length& theWidth, - TCollection_ExtendedString& theString) const; + Standard_EXPORT Standard_Real ValueToDisplayUnits() const; - Standard_EXPORT Standard_Real valueToDisplayUnits(); - - //! Reset working plane to default. - Standard_EXPORT void resetWorkingPlane (const gp_Pln& theNewDefaultPlane); - - //! Count default plane - Standard_EXPORT virtual void countDefaultPlane(); - - //! Computes dimension value in display units - Standard_EXPORT virtual void computeValue(); + //! Get formatted value string and its model space width. + //! @param theWidth [out] the model space with of the string. + //! @return formatted dimension value string. + Standard_EXPORT TCollection_ExtendedString GetValueString (Standard_Real& theWidth) const; //! Performs drawing of 2d or 3d arrows on the working plane - Standard_EXPORT void drawArrow (const Handle(Prs3d_Presentation)& thePresentation, + //! @param theLocation [in] the location of the arrow tip. + //! @param theDirection [in] the direction from the tip to the bottom of the arrow. + Standard_EXPORT void DrawArrow (const Handle(Prs3d_Presentation)& thePresentation, const gp_Pnt& theLocation, const gp_Dir& theDirection); //! Performs drawing of 2d or 3d text on the working plane + //! @param theTextPos [in] the position of the text label. + //! @param theTestDir [in] the direction of the text label. + //! @param theText [in] the text label string. + //! @param theLabelPosition [in] the text label vertical and horizontal positioning option + //! respectively to the main dimension line. //! @return text width relative to the dimension working plane. For 2d text this value will be zero. - Standard_EXPORT void drawText (const Handle(Prs3d_Presentation)& thePresentation, + Standard_EXPORT void DrawText (const Handle(Prs3d_Presentation)& thePresentation, const gp_Pnt& theTextPos, const gp_Dir& theTextDir, const TCollection_ExtendedString& theText, @@ -247,7 +374,7 @@ protected: //! @param theLabelWidth [in] the geometrical width computed for value string. //! @param theMode [in] the display mode. //! @param theLabelPosition [in] position flags for the text label. - Standard_EXPORT void drawExtension (const Handle(Prs3d_Presentation)& thePresentation, + Standard_EXPORT void DrawExtension (const Handle(Prs3d_Presentation)& thePresentation, const Standard_Real theExtensionSize, const gp_Pnt& theExtensionStart, const gp_Dir& theExtensionDir, @@ -256,32 +383,81 @@ protected: const Standard_Integer theMode, const Standard_Integer theLabelPosition); - //! Performs computing of linear dimension (for length, diameter, radius and so on) - Standard_EXPORT void drawLinearDimension (const Handle(Prs3d_Presentation)& thePresentation, + //! Performs computing of linear dimension (for length, diameter, radius and so on). + //! Please note that this method uses base dimension properties, like working plane + //! flyout length, drawer attributes. + //! @param thePresentation [in] the presentation to fill with primitives. + //! @param theMode [in] the presentation compute mode. + //! @param theFirstPoint [in] the first attach point of linear dimension. + //! @param theSecondPoint [in] the second attach point of linear dimension. + //! @param theIsOneSide [in] specifies whether the dimension has only one flyout line. + Standard_EXPORT void DrawLinearDimension (const Handle(Prs3d_Presentation)& thePresentation, const Standard_Integer theMode, - const Standard_Boolean isOneSideDimension = Standard_False); + const gp_Pnt& theFirstPoint, + const gp_Pnt& theSecondPoint, + const Standard_Boolean theIsOneSide = Standard_False); - //! If it's possible computes circle from planar face - Standard_EXPORT Standard_Boolean circleFromPlanarFace (const TopoDS_Face& theFace, + //! Compute selection sensitives for linear dimension flyout lines (length, diameter, radius). + //! Please note that this method uses base dimension properties: working plane and flyout length. + //! @param theSelection [in] the selection structure to fill with selection primitives. + //! @param theOwner [in] the selection entity owner. + //! @param theFirstPoint [in] the first attach point of linear dimension. + //! @param theSecondPoint [in] the second attach point of linear dimension. + Standard_EXPORT void ComputeLinearFlyouts (const Handle(SelectMgr_Selection)& theSelection, + const Handle(SelectMgr_EntityOwner)& theOwner, + const gp_Pnt& theFirstPoint, + const gp_Pnt& theSecondPoint); + + //! If it is possible extracts circle from planar face. + //! @param theFace [in] the planar face. + //! @param theCurve [out] the circular curve. + //! @param theFirstPoint [out] the point of the first parameter of the circlular curve. + //! @param theSecondPoint [out] the point of the last parameter of the circlular curve. + //! @return TRUE in case of successful circle extraction. + Standard_EXPORT Standard_Boolean CircleFromPlanarFace (const TopoDS_Face& theFace, Handle(Geom_Curve)& theCurve, - gp_Pnt & theFirstPoint, - gp_Pnt & theLastPoint); + gp_Pnt& theFirstPoint, + gp_Pnt& theLastPoint); - //! Performs initialization of circle and points from given shape - //! (for radius, diameter and so on) - Standard_EXPORT Standard_Boolean initCircularDimension (const TopoDS_Shape& theShape, - gp_Circ& theCircle, - gp_Pnt& theMiddleArcPoint, - gp_Pnt& theOppositeDiameterPoint); - Standard_EXPORT Standard_Boolean isComputed() const; + //! Performs initialization of circle and middle arc point from the passed + //! shape which is assumed to contain circular geometry. + //! @param theShape [in] the shape to explore. + //! @param theCircle [out] the circle geometry. + //! @param theMiddleArcPoint [out] the middle point of the arc. + //! @param theIsClosed [out] returns TRUE if the geometry is closed circle. + //! @return TRUE if the the circle is successfully got from the input shape. + Standard_EXPORT Standard_Boolean InitCircularDimension (const TopoDS_Shape& theShape, + gp_Circ& theCircle, + gp_Pnt& theMiddleArcPoint, + Standard_Boolean& theIsClosed); - Standard_EXPORT void setComputed (Standard_Boolean isComputed); +protected: //! @name Behavior to implement - Standard_EXPORT void resetGeom(); + //! Override this method to compute automatically dimension plane + //! in which the dimension presentation is built. + virtual void ComputePlane() { } - //! Fills sensitive entity for flyouts and adds it to the selection. - Standard_EXPORT virtual void computeFlyoutSelection (const Handle(SelectMgr_Selection)& theSelection, - const Handle(SelectMgr_EntityOwner)& theOwner); + //! Override this method to check if user-defined plane + //! is valid for the dimension geometry. + //! @param thePlane [in] the working plane for positioning every + //! dimension in the application. + //! @return true is the plane is suitable for building dimension + //! with computed dimension geometry. + virtual Standard_Boolean CheckPlane (const gp_Pln& /*thePlane*/) const { return Standard_True; } + + //! Override this method to computed value of dimension. + //! @return value from the measured geometry. + virtual Standard_Real ComputeValue() const + { + return 0.0; + } + + //! Override this method to compute selection primitives for + //! flyout lines (if the dimension provides it). + //! This callback is a only a part of base selection + //! computation routine. + virtual void ComputeFlyoutSelection (const Handle(SelectMgr_Selection)&, + const Handle(SelectMgr_EntityOwner)&) {} //! Produce points for triangular arrow face. //! @param thePeakPnt [in] the arrow peak position. @@ -300,41 +476,11 @@ protected: gp_Pnt& theSidePnt1, gp_Pnt& theSidePnt2); -protected: //! @name Working plane properties - - //! Dimension default plane - gp_Pln myDefaultPlane; - - //! Shows if working plane is set custom - Standard_Boolean myIsWorkingPlaneCustom; - -protected: //! @name Value properties - - //! Dimension value which is displayed with dimension lines - Standard_Real myValue; - - //! Shows if the value is set by user and is no need to count it automatically - Standard_Boolean myIsValueCustom; - -protected: // !@name Units properties - - //! The quantity of units for the value computation - TCollection_AsciiString myUnitsQuantity; - - //! Units of the model - TCollection_AsciiString myModelUnits; - - //! Units in which the displayed value will be converted - TCollection_AsciiString myDisplayUnits; - - //! Determines if units is to be displayed along with the value - Standard_Boolean myToDisplayUnits; - - //! Special symbol for some kind of dimensions (for diameter, radius and so on) - Standard_ExtCharacter mySpecialSymbol; - - //! Special symbol display options - AIS_DisplaySpecialSymbol myDisplaySpecialSymbol; + //! Base procedure of computing selection (based on selection geometry data). + //! @param theSelection [in] the selection structure to will with primitives. + //! @param theMode [in] the selection mode. + Standard_EXPORT virtual void ComputeSelection (const Handle(SelectMgr_Selection)& theSelection, + const Standard_Integer theMode); protected: //! @name Selection geometry @@ -403,43 +549,28 @@ protected: //! @name Selection geometry Standard_Real mySelToleranceForText2d; //!< Sensitive point tolerance for 2d text selection. Standard_Boolean myIsComputed; //!< Shows if the presentation and selection was computed. -protected: +protected: //! @name Value properties - //! Shows if text is inverted - Standard_Boolean myIsTextReversed; + Standard_Real myCustomValue; //!< Value of the dimension (computed or user-defined). + Standard_Boolean myIsValueCustom; //!< Is user-defined value. - //! Points that are base for dimension. - //! My first point of dimension attach (belongs to shape for which dimension is computed) - gp_Pnt myFirstPoint; +protected: //! @name Units properties - //! My second point of dimension attach (belongs to shape for which dimension is computed) - gp_Pnt mySecondPoint; + Standard_ExtCharacter mySpecialSymbol; //!< Special symbol. + AIS_DisplaySpecialSymbol myDisplaySpecialSymbol; //!< Special symbol display options. - //! Shows if attach points are initialized correctly - Standard_Boolean myIsInitialized; +protected: //! @name Geometrical properties - //! First shape (can be vertex, edge or face) - TopoDS_Shape myFirstShape; + GeometryType myGeometryType; //!< defines type of shapes on which the dimension is to be built. - //! Second shape (can be vertex, edge or face) - TopoDS_Shape mySecondShape; - - //! Number of shapes - Standard_Integer myShapesNumber; - - //! Defines flyout lines and direction - //! Flyout direction in the working plane. - //! Can be negative, or positive and is defined by the sign of myFlyout value. - //! The direction vector is counting using the working plane. - //! myFlyout value defined the size of flyout. - Standard_Real myFlyout; + gp_Pln myPlane; //!< Plane where dimension will be built (computed or user defined). + Standard_Boolean myIsPlaneCustom; //!< Is plane defined by user (otherwise it will be computed automatically). + Standard_Real myFlyout; //!< Flyout distance. + Standard_Boolean myIsValid; //!< Is dimension geometry properly defined. private: - //! Type of dimension AIS_KindOfDimension myKindOfDimension; - - //! Dimension working plane, is equal to if it can be computed automatically. - gp_Pln myWorkingPlane; }; -#endif + +#endif // _AIS_Dimension_HeaderFile diff --git a/src/AIS/AIS_Drawer.cdl b/src/AIS/AIS_Drawer.cdl index 0a947c49ef..2a85663d8d 100755 --- a/src/AIS/AIS_Drawer.cdl +++ b/src/AIS/AIS_Drawer.cdl @@ -64,7 +64,10 @@ uses NameOfColor from Quantity, PlaneAngle from Quantity, Length from Quantity, - TypeOfHLR from Prs3d + DimensionUnits from Prs3d, + AsciiString from TCollection, + TypeOfHLR from Prs3d, + Ax2 from gp is Create returns mutable Drawer from AIS; @@ -542,16 +545,42 @@ is -- Attributes for the presentation of a dimensions. -- - DimensionAspect(me:mutable) returns mutable DimensionAspect from Prs3d + DimensionAspect (me : mutable) returns mutable DimensionAspect from Prs3d is redefined static; ---Purpose: Returns a link with Prs3d_Drawer_DimensionAspect, --- which provides settings for the appearance of dimensions. - is redefined static; + -- which provides settings for the appearance of dimensions. + + HasDimensionAspect (me) returns Boolean from Standard is static; + ---C++: inline + -- Purpose: Returns true if the Drawer has a dimension aspect setting active. + + SetDimLengthModelUnits (me: mutable; theUnits : AsciiString from TCollection) is redefined static; + ---Purpose: Sets dimension length model units for computing of dimension presentation. + + SetDimAngleModelUnits (me: mutable; theUnits : AsciiString from TCollection) is redefined static; + ---Purpose: Sets dimension angle model units for computing of dimension presentation. + + DimAngleModelUnits (me) returns AsciiString from TCollection is redefined static; + ---Purpose: Returns angle model units for the dimension presentation. + ---C++: return const & + + DimLengthModelUnits (me) returns AsciiString from TCollection is redefined static; + ---Purpose: Returns length model units for the dimension presentation. + ---C++: return const & + + SetDimLengthDisplayUnits (me: mutable; theUnits : AsciiString from TCollection) is redefined static; + ---Purpose: Sets length units in which value for dimension presentation is displayed. + + SetDimAngleDisplayUnits (me: mutable; theUnits : AsciiString from TCollection) is redefined static; + ---Purpose: Sets angle units in which value for dimension presentation is displayed. + + DimLengthDisplayUnits (me) returns AsciiString from TCollection is redefined static; + ---Purpose: Returns length units in which dimension presentation is displayed. + ---C++: return const & + + DimAngleDisplayUnits (me) returns AsciiString from TCollection is redefined static; + ---Purpose: Returns angle units in which dimension presentation is displayed. + ---C++: return const & - HasDimensionAspect (me) returns Boolean from Standard - ---C++: inline - ---Purpose: Returns true if the Drawer has a dimension aspect setting active. - is static; - -- Attributes for the sections SectionAspect (me:mutable) returns mutable LineAspect from Prs3d @@ -593,25 +622,32 @@ is -- for Interactive Objects. fields + myLink : Drawer from Prs3d; hasLocalAttributes : Boolean from Standard; - + myhasOwnDeviationCoefficient : Boolean from Standard; myOwnDeviationCoefficient : Real from Standard; myPreviousDeviationCoefficient : Real from Standard; - + myhasOwnHLRDeviationCoefficient : Boolean from Standard; myOwnHLRDeviationCoefficient : Real from Standard; myPreviousHLRDeviationCoefficient: Real from Standard; - + myhasOwnDeviationAngle : Boolean from Standard; myOwnDeviationAngle : Real from Standard; myPreviousDeviationAngle : Real from Standard; - + myhasOwnHLRDeviationAngle : Boolean from Standard; myOwnHLRDeviationAngle : Real from Standard; myPreviousHLRDeviationAngle : Real from Standard; myHasOwnFaceBoundaryDraw : Boolean from Standard; + + myHasOwnDimLengthModelUnits : Boolean from Standard; + myHasOwnDimLengthDisplayUnits : Boolean from Standard; + myHasOwnDimAngleModelUnits : Boolean from Standard; + myHasOwnDimAngleDisplayUnits : Boolean from Standard; + end Drawer; diff --git a/src/AIS/AIS_Drawer.cxx b/src/AIS/AIS_Drawer.cxx index 6404e505a4..709f99635d 100755 --- a/src/AIS/AIS_Drawer.cxx +++ b/src/AIS/AIS_Drawer.cxx @@ -19,21 +19,24 @@ #include #include -AIS_Drawer::AIS_Drawer(): -myLink(new Prs3d_Drawer()), -hasLocalAttributes(Standard_False), -myhasOwnDeviationCoefficient(Standard_False), -myPreviousDeviationCoefficient(0.1), -myhasOwnHLRDeviationCoefficient (Standard_False), -myhasOwnDeviationAngle (Standard_False), -myhasOwnHLRDeviationAngle (Standard_False), -myHasOwnFaceBoundaryDraw (Standard_False) +// ======================================================================= +// function : AIS_Drawer +// purpose : +// ======================================================================= +AIS_Drawer::AIS_Drawer() +: myLink (new Prs3d_Drawer()), + hasLocalAttributes (Standard_False), + myhasOwnDeviationCoefficient (Standard_False), + myPreviousDeviationCoefficient (0.1), + myhasOwnHLRDeviationCoefficient (Standard_False), + myhasOwnDeviationAngle (Standard_False), + myhasOwnHLRDeviationAngle (Standard_False), + myHasOwnFaceBoundaryDraw (Standard_False) { - SetMaximalParameterValue(500000.); - myLink->SetMaximalParameterValue(500000.); + SetMaximalParameterValue (500000.0); + myLink->SetMaximalParameterValue (500000.0); SetTypeOfHLR (Prs3d_TOH_NotSet); -} - +} Aspect_TypeOfDeflection AIS_Drawer::TypeOfDeflection () const { @@ -216,8 +219,97 @@ Handle (Prs3d_DatumAspect) AIS_Drawer::DatumAspect () Handle (Prs3d_PlaneAspect) AIS_Drawer::PlaneAspect () {return myPlaneAspect.IsNull() ? myLink->PlaneAspect (): myPlaneAspect;} -Handle (Prs3d_DimensionAspect) AIS_Drawer::DimensionAspect () -{return myDimensionAspect.IsNull()? myLink->DimensionAspect () : myDimensionAspect ;} +// ======================================================================= +// function : DimensionAspect +// purpose : +// ======================================================================= +Handle (Prs3d_DimensionAspect) AIS_Drawer::DimensionAspect() +{ + return myDimensionAspect.IsNull()? myLink->DimensionAspect () : myDimensionAspect; +} + +// ======================================================================= +// function : DimAngleModelUnits +// purpose : +// ======================================================================= +const TCollection_AsciiString& AIS_Drawer::DimAngleModelUnits() const +{ + return myHasOwnDimAngleModelUnits + ? Prs3d_Drawer::DimAngleModelUnits() + : myLink->DimAngleModelUnits(); +} + +// ======================================================================= +// function : DimensionModelUnits +// purpose : +// ======================================================================= +const TCollection_AsciiString& AIS_Drawer::DimLengthModelUnits() const +{ + return myHasOwnDimLengthModelUnits + ? Prs3d_Drawer::DimLengthModelUnits() + : myLink->DimLengthModelUnits(); +} +// ======================================================================= +// function : SetDimLengthModelUnits +// purpose : +// ======================================================================= +void AIS_Drawer::SetDimLengthModelUnits (const TCollection_AsciiString& theUnits) +{ + myHasOwnDimLengthModelUnits = Standard_True; + Prs3d_Drawer::SetDimLengthDisplayUnits (theUnits); +} + +// ======================================================================= +// function : SetDimAngleModelUnits +// purpose : +// ======================================================================= +void AIS_Drawer::SetDimAngleModelUnits (const TCollection_AsciiString& theUnits) +{ + myHasOwnDimAngleModelUnits = Standard_True; + Prs3d_Drawer::SetDimAngleDisplayUnits (theUnits); +} + +// ======================================================================= +// function : DimAngleDisplayUnits +// purpose : +// ======================================================================= +const TCollection_AsciiString& AIS_Drawer::DimAngleDisplayUnits() const +{ + return myHasOwnDimAngleDisplayUnits + ? Prs3d_Drawer::DimAngleDisplayUnits() + : myLink->DimAngleDisplayUnits(); +} + +// ======================================================================= +// function : DimLengthDisplayUnits +// purpose : +// ======================================================================= +const TCollection_AsciiString& AIS_Drawer::DimLengthDisplayUnits() const +{ + return myHasOwnDimLengthDisplayUnits + ? Prs3d_Drawer::DimLengthDisplayUnits() + : myLink->DimLengthDisplayUnits(); +} + +// ======================================================================= +// function : SetDimLengthDisplayUnits +// purpose : +// ======================================================================= +void AIS_Drawer::SetDimLengthDisplayUnits (const TCollection_AsciiString& theUnits) +{ + myHasOwnDimLengthDisplayUnits = Standard_True; + Prs3d_Drawer::SetDimLengthDisplayUnits (theUnits); +} + +// ======================================================================= +// function : SetDimAngleDisplayUnits +// purpose : +// ======================================================================= +void AIS_Drawer::SetDimAngleDisplayUnits (const TCollection_AsciiString& theUnits) +{ + myHasOwnDimAngleDisplayUnits = Standard_True; + Prs3d_Drawer::SetDimAngleDisplayUnits (theUnits); +} Handle (Prs3d_LineAspect) AIS_Drawer::SectionAspect () {return mySectionAspect.IsNull()? myLink->SectionAspect (): mySectionAspect;} @@ -256,6 +348,10 @@ void AIS_Drawer::ClearLocalAttributes() if (!myFaceBoundaryAspect.IsNull()) myFaceBoundaryAspect.Nullify(); myHasOwnFaceBoundaryDraw = Standard_False; + myHasOwnDimLengthModelUnits = Standard_False; + myHasOwnDimLengthDisplayUnits = Standard_False; + myHasOwnDimAngleModelUnits = Standard_False; + myHasOwnDimAngleDisplayUnits = Standard_False; hasLocalAttributes = Standard_False; diff --git a/src/AIS/AIS_Drawer.lxx b/src/AIS/AIS_Drawer.lxx index e488ce27e7..445d0811b3 100755 --- a/src/AIS/AIS_Drawer.lxx +++ b/src/AIS/AIS_Drawer.lxx @@ -104,5 +104,7 @@ inline Prs3d_TypeOfHLR AIS_Drawer::TypeOfHLR ( ) const return (myTypeOfHLR == Prs3d_TOH_NotSet) ? myLink->TypeOfHLR() : myTypeOfHLR; } -inline Standard_Boolean AIS_Drawer::HasDimensionAspect () const -{ return !myDimensionAspect.IsNull();} +inline Standard_Boolean AIS_Drawer::HasDimensionAspect() const +{ + return !myDimensionAspect.IsNull(); +} diff --git a/src/AIS/AIS_LengthDimension.cxx b/src/AIS/AIS_LengthDimension.cxx index 5705829a0c..6bb7a9ac62 100755 --- a/src/AIS/AIS_LengthDimension.cxx +++ b/src/AIS/AIS_LengthDimension.cxx @@ -23,17 +23,18 @@ #include #include #include -#include #include #include +#include #include #include -#include #include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include @@ -42,22 +43,13 @@ IMPLEMENT_STANDARD_RTTIEXT(AIS_LengthDimension, AIS_Dimension) //======================================================================= //function : Constructor -//purpose : Dimension between two points +//purpose : Dimension between two faces //======================================================================= - -AIS_LengthDimension::AIS_LengthDimension (const gp_Pnt& theFirstPoint, - const gp_Pnt& theSecondPoint, - const gp_Pln& theDimensionPlane) -: AIS_Dimension() +AIS_LengthDimension::AIS_LengthDimension (const TopoDS_Face& theFirstFace, + const TopoDS_Face& theSecondFace) +: AIS_Dimension (AIS_KOD_LENGTH) { - myIsInitialized = Standard_True; - myFirstPoint = theFirstPoint; - mySecondPoint = theSecondPoint; - myFirstShape = BRepLib_MakeVertex (myFirstPoint); - mySecondShape = BRepLib_MakeVertex (mySecondPoint); - myShapesNumber = 2; - SetKindOfDimension (AIS_KOD_LENGTH); - SetWorkingPlane (theDimensionPlane); + SetMeasuredGeometry (theFirstFace, theSecondFace); SetFlyout (15.0); } @@ -65,18 +57,38 @@ AIS_LengthDimension::AIS_LengthDimension (const gp_Pnt& theFirstPoint, //function : Constructor //purpose : Dimension between two shape //======================================================================= +AIS_LengthDimension::AIS_LengthDimension (const TopoDS_Face& theFace, + const TopoDS_Edge& theEdge) +: AIS_Dimension (AIS_KOD_LENGTH) +{ + SetMeasuredGeometry (theFace, theEdge); + SetFlyout (15.0); +} +//======================================================================= +//function : Constructor +//purpose : Dimension between two points +//======================================================================= +AIS_LengthDimension::AIS_LengthDimension (const gp_Pnt& theFirstPoint, + const gp_Pnt& theSecondPoint, + const gp_Pln& thePlane) +: AIS_Dimension (AIS_KOD_LENGTH) +{ + SetMeasuredGeometry (theFirstPoint, theSecondPoint, thePlane); + SetFlyout (15.0); +} + +//======================================================================= +//function : Constructor +//purpose : Dimension between two shape +//======================================================================= AIS_LengthDimension::AIS_LengthDimension (const TopoDS_Shape& theFirstShape, const TopoDS_Shape& theSecondShape, - const gp_Pln& theWorkingPlane) -: AIS_Dimension() + const gp_Pln& thePlane) +: AIS_Dimension (AIS_KOD_LENGTH) { - myIsInitialized = Standard_False; - myFirstShape = theFirstShape; - mySecondShape = theSecondShape; - myShapesNumber = 2; - SetKindOfDimension (AIS_KOD_LENGTH); - SetWorkingPlane (theWorkingPlane); + SetCustomPlane (thePlane); + SetMeasuredShapes (theFirstShape, theSecondShape); SetFlyout (15.0); } @@ -84,412 +96,179 @@ AIS_LengthDimension::AIS_LengthDimension (const TopoDS_Shape& theFirstShape, //function : Constructor //purpose : Dimension of one edge //======================================================================= - AIS_LengthDimension::AIS_LengthDimension (const TopoDS_Edge& theEdge, - const gp_Pln& theWorkingPlane) -: AIS_Dimension() + const gp_Pln& thePlane) +: AIS_Dimension (AIS_KOD_LENGTH) { - myIsInitialized = Standard_False; - myFirstShape = theEdge; - myShapesNumber = 1; - SetKindOfDimension (AIS_KOD_LENGTH); - SetWorkingPlane (theWorkingPlane); + SetMeasuredGeometry (theEdge, thePlane); SetFlyout (15.0); } //======================================================================= -//function : Constructor -//purpose : Dimension between two faces -//======================================================================= - -AIS_LengthDimension::AIS_LengthDimension (const TopoDS_Face& theFirstFace, - const TopoDS_Face& theSecondFace) -: AIS_Dimension() -{ - myIsInitialized = Standard_False; - myFirstShape = theFirstFace; - mySecondShape = theSecondFace; - myShapesNumber = 2; - SetKindOfDimension (AIS_KOD_LENGTH); - SetFlyout (15.0); -} - -//======================================================================= -//function : Constructor -//purpose : Dimension between two shape -//======================================================================= - -AIS_LengthDimension::AIS_LengthDimension (const TopoDS_Face& theFace, - const TopoDS_Edge& theEdge) -: AIS_Dimension() -{ - myIsInitialized = Standard_False; - myFirstShape = theFace; - mySecondShape = theEdge; - myShapesNumber = 2; - SetKindOfDimension (AIS_KOD_LENGTH); - SetFlyout (15.0); -} - -//======================================================================= -//function : initTwoEdgesLength -//purpose : Initialization of dimanesion between two linear edges -//======================================================================= - -Standard_Boolean AIS_LengthDimension::initTwoEdgesLength (const TopoDS_Edge & theFirstEdge, - const TopoDS_Edge& theSecondEdge, - gp_Dir& theDirAttach) -{ - Standard_Integer anExtShapeIndex = 0; - BRepAdaptor_Curve aFirstCurveAdapt (theFirstEdge); - if (aFirstCurveAdapt.GetType() != GeomAbs_Line) - return Standard_False; - BRepAdaptor_Curve aSecondCurveAdapt (theSecondEdge); - if (aSecondCurveAdapt.GetType() != GeomAbs_Line) - return Standard_False; - Handle(Geom_Curve) aFirstCurve, aSecondCurve; - gp_Pnt aPoint11,aPoint12,aPoint21,aPoint22; - Standard_Boolean isFirstInfinite (Standard_False), - isSecondInfinite (Standard_False); - Handle(Geom_Curve) anExtCurve; - - if (!AIS::ComputeGeometry (theFirstEdge, theSecondEdge,anExtShapeIndex, - aFirstCurve, aSecondCurve, aPoint11, aPoint12, - aPoint21, aPoint22, anExtCurve, isFirstInfinite, - isSecondInfinite, new Geom_Plane(GetWorkingPlane()))) - return Standard_False; - - const Handle(Geom_Line)& aGeomLine1 = (Handle(Geom_Line)&) aFirstCurve; - const Handle(Geom_Line)& aGeomLine2 = (Handle(Geom_Line)&) aSecondCurve; - const gp_Lin& aLin1 = aGeomLine1->Lin(); - const gp_Lin& aLin2 = aGeomLine2->Lin(); - - myValue = aLin1.Distance (aLin2); - theDirAttach = aLin1.Direction(); - - gp_Pnt aCurPos; - if (!isFirstInfinite) - { - gp_Pnt aPoint2 = ElCLib::Value(ElCLib::Parameter (aLin2, aPoint11), aLin2); - aCurPos.SetXYZ((aPoint11.XYZ() + aPoint2.XYZ()) / 2.); - } - else if (!isSecondInfinite) - { - gp_Pnt aPoint2 = ElCLib::Value (ElCLib::Parameter (aLin1, aPoint21), aLin1); - aCurPos.SetXYZ ((aPoint21.XYZ() + aPoint2.XYZ()) / 2.); - } - else - aCurPos.SetXYZ((aLin1.Location().XYZ() + aLin2.Location().XYZ()) / 2.); - - // Offset to avoid confusion Edge and Dimension - gp_Vec anOffset(theDirAttach); - anOffset = anOffset * myDrawer->DimensionAspect()->ArrowAspect()->Length()*(-10.); - aCurPos.Translate (anOffset); - - // Find attachment points - if (!isFirstInfinite) - { - if (aCurPos.Distance (aPoint11) > aCurPos.Distance (aPoint12)) - myFirstPoint = aPoint12; - else - myFirstPoint = aPoint11; - } - else - myFirstPoint = ElCLib::Value (ElCLib::Parameter (aLin1, aCurPos), aLin1); - - if (!isSecondInfinite) - { - if (aCurPos.Distance (aPoint21) > aCurPos.Distance (aPoint22)) - mySecondPoint = aPoint22; - else - mySecondPoint = aPoint21; - } - else - mySecondPoint = ElCLib::Value (ElCLib::Parameter (aLin2, aCurPos), aLin2); - - return Standard_True; -} - -//======================================================================= -//function : initEdgeVertexLength -//purpose : for first edge and second vertex shapes -//======================================================================= - -Standard_Boolean AIS_LengthDimension::initEdgeVertexLength (const TopoDS_Edge & theEdge, - const TopoDS_Vertex & theVertex, - gp_Dir & theDirAttach, - Standard_Boolean isInfinite) -{ - gp_Pnt anEdgePoint1,anEdgePoint2; - Handle(Geom_Curve) aCurve; - Handle(Geom_Curve) anExtCurve; - Standard_Boolean isEdgeOnPlane, isVertexOnPlane; - if (!AIS::ComputeGeometry(theEdge,aCurve,anEdgePoint1,anEdgePoint2, - anExtCurve,isInfinite,isEdgeOnPlane, new Geom_Plane (GetWorkingPlane()))) - return Standard_False; - AIS::ComputeGeometry (theVertex, myFirstPoint, new Geom_Plane(GetWorkingPlane()), isVertexOnPlane); - - const Handle(Geom_Line)& aGeomLine = (Handle(Geom_Line)&) aCurve; - const gp_Lin& aLin = aGeomLine->Lin(); - - myValue = aLin.Distance( myFirstPoint); - theDirAttach = aLin.Direction(); - - gp_Pnt aPoint = ElCLib::Value(ElCLib::Parameter(aLin,myFirstPoint),aLin); - gp_Pnt aCurPos((myFirstPoint.XYZ() + aPoint.XYZ())/2.); - - if (!isInfinite) - { - if (aCurPos.Distance (anEdgePoint1) > aCurPos.Distance (anEdgePoint2)) - mySecondPoint = anEdgePoint2; - else - mySecondPoint = anEdgePoint1; - } - else - mySecondPoint = ElCLib::Value (ElCLib::Parameter (aLin, aCurPos), aLin); - return Standard_True; -} - -//======================================================================= -//function : initEdgeVertexLength +//function : SetMeasuredGeometry //purpose : //======================================================================= - -Standard_Boolean AIS_LengthDimension::initEdgeFaceLength (const TopoDS_Edge& theEdge, - const TopoDS_Face& theFace, - gp_Dir& theDirAttach) +void AIS_LengthDimension::SetMeasuredGeometry (const gp_Pnt& theFirstPoint, + const gp_Pnt& theSecondPoint, + const gp_Pln& thePlane) { - // The first attachment point is from the reference . - // Find the second attachment point which belongs to the reference face - // Iterate over the edges of the face and find the point . - // It is the closest point according to . - TopoDS_Vertex aVertex1, aVertex2; - TopExp::Vertices (theEdge, aVertex1, aVertex2); - myFirstPoint = BRep_Tool::Pnt (aVertex1); - gp_Pnt aPoint = BRep_Tool::Pnt (aVertex2); - gp_Pnt2d aFacePoint1uv, aFacePoint2uv; - Standard_Real aDist1 = RealLast (); - Standard_Real aDist2 = RealLast (); + myFirstPoint = theFirstPoint; + mySecondPoint = theSecondPoint; + myFirstShape = BRepLib_MakeVertex (myFirstPoint); + mySecondShape = BRepLib_MakeVertex (mySecondPoint); + myGeometryType = GeometryType_Points; + SetCustomPlane (thePlane); + myIsValid = IsValidPoints (theFirstPoint, theSecondPoint) && CheckPlane (myPlane); - TopExp_Explorer anIt (theFace, TopAbs_EDGE); - for (; anIt.More (); anIt.Next ()) + SetToUpdate(); +} + +//======================================================================= +//function : SetMeasuredGeometry +//purpose : +//======================================================================= +void AIS_LengthDimension::SetMeasuredGeometry (const TopoDS_Edge& theEdge, + const gp_Pln& thePlane) +{ + myFirstShape = theEdge; + mySecondShape = TopoDS_Shape(); + myGeometryType = GeometryType_Edge; + SetCustomPlane (thePlane); + myIsValid = InitOneShapePoints (myFirstShape) && CheckPlane (myPlane); + + SetToUpdate(); +} + +//======================================================================= +//function : SetMeasuredGeometry +//purpose : +//======================================================================= +void AIS_LengthDimension::SetMeasuredGeometry (const TopoDS_Face& theFirstFace, + const TopoDS_Face& theSecondFace) +{ + SetMeasuredShapes (theFirstFace, theSecondFace); +} + +//======================================================================= +//function : SetMeasuredGeometry +//purpose : +//======================================================================= +void AIS_LengthDimension::SetMeasuredGeometry (const TopoDS_Face& theFace, + const TopoDS_Edge& theEdge) +{ + SetMeasuredShapes (theFace, theEdge); +} + +//======================================================================= +//function : SetMeasuredShapes +//purpose : +//======================================================================= +void AIS_LengthDimension::SetMeasuredShapes (const TopoDS_Shape& theFirstShape, + const TopoDS_Shape& theSecondShape) +{ + gp_Pln aComputedPlane; + Standard_Boolean isPlaneReturned = Standard_False; + myFirstShape = theFirstShape; + mySecondShape = theSecondShape; + myIsValid = InitTwoShapesPoints (myFirstShape, mySecondShape, aComputedPlane, isPlaneReturned); + + if (myIsValid && !myIsPlaneCustom) { - const TopoDS_Edge aFaceEdge = TopoDS::Edge(anIt.Current ()); - if (aFaceEdge == theEdge) - return Standard_False; - TopExp::Vertices (aFaceEdge, aVertex1, aVertex2); - gp_Pnt aFacePoint1c = BRep_Tool::Pnt (aVertex1); - gp_Pnt aFacePoint2c = BRep_Tool::Pnt (aVertex2); - Standard_Real aDistc1 = myFirstPoint.SquareDistance (aFacePoint1c); - Standard_Real aDistc2 = myFirstPoint.SquareDistance (aFacePoint2c); - if (aDistc1 <= aDistc2) + if (isPlaneReturned) { - if (aDistc1 <= aDist1) - { - aDistc2 = aPoint.SquareDistance (aFacePoint2c); - if (aDistc2 <= aDist2) - { - mySecondPoint = aFacePoint1c; - aDist1 = aDistc1; - aDist2 = aDistc2; - BRep_Tool::UVPoints (aFaceEdge, theFace, aFacePoint1uv, aFacePoint2uv); - } - } + myPlane = aComputedPlane; } else { - if (aDistc2 <= aDist1) - { - aDistc1 = aPoint.SquareDistance (aFacePoint1c); - if (aDistc1 <= aDist2) - { - mySecondPoint = aFacePoint2c; - aDist1 = aDistc2; - aDist2 = aDistc1; - BRep_Tool::UVPoints (aFaceEdge, theFace, aFacePoint2uv, aFacePoint1uv); - } - } + myIsValid = Standard_False; } } - gp_Vec anOffsetDirection (0.0, 0.0, 0.0); + myIsValid &= CheckPlane (myPlane); - //The offset direction is the normal to the face at the point FP1 - BRepGProp_Face aGFace; - aGFace.Load (theFace); - aGFace.Normal (aFacePoint1uv.X(), aFacePoint1uv.Y(), aPoint, anOffsetDirection); - - if (anOffsetDirection.Magnitude () > Precision::Confusion ()) - { - theDirAttach = gp_Dir (anOffsetDirection); - } - else theDirAttach = gp::DZ (); - - gp_Vec aVector (theDirAttach); - aVector.Multiply (1.5 * myValue); - - return Standard_True; + SetToUpdate(); } //======================================================================= -//function : initTwoShapesPoints -//purpose : Initialization of two points where dimension layouts -// will be attached +//function : CheckPlane +//purpose : //======================================================================= - -Standard_Boolean AIS_LengthDimension::initTwoShapesPoints (const TopoDS_Shape& theFirstShape, - const TopoDS_Shape& theSecondShape) +Standard_Boolean AIS_LengthDimension::CheckPlane (const gp_Pln& thePlane) const { - gp_Dir aDirAttach; - Standard_Boolean isInfinite = Standard_False; - Standard_Boolean isSuccess = Standard_False; - switch (theFirstShape.ShapeType()) + if (!thePlane.Contains (myFirstPoint, Precision::Confusion()) && + !thePlane.Contains (mySecondPoint, Precision::Confusion())) { - case TopAbs_FACE: - { - // Initialization for face - gp_Pln aFirstPlane; - Handle(Geom_Surface) aFirstSurface; - AIS_KindOfSurface aFirstSurfKind; - Standard_Real aFirstOffset; - TopoDS_Face aFirstFace = TopoDS::Face (theFirstShape); - AIS::InitFaceLength (TopoDS::Face (theFirstShape), aFirstPlane, - aFirstSurface,aFirstSurfKind, aFirstOffset); - - if (theSecondShape.ShapeType () == TopAbs_FACE) - { - // Initialization for face - gp_Pln aSecondPlane; - Handle(Geom_Surface) aSecondSurface; - AIS_KindOfSurface aSecondSurfKind; - Standard_Real aSecondOffset; - TopoDS_Face aSecondFace = TopoDS::Face (theSecondShape); - AIS::InitFaceLength (aSecondFace, aSecondPlane, - aSecondSurface, aSecondSurfKind, aSecondOffset); - if (aFirstSurfKind == AIS_KOS_Plane) - { - TopExp_Explorer anExplorer (theFirstShape, TopAbs_VERTEX); - // In case of infinite planes - if (!anExplorer.More()) - myFirstPoint = aFirstPlane.Location(); - else myFirstPoint = BRep_Tool::Pnt (TopoDS::Vertex (anExplorer.Current())); - mySecondPoint = AIS::ProjectPointOnPlane (myFirstPoint, aSecondPlane); - - gp_Dir aLengthDir = aFirstPlane.Axis().Direction(); - gp_Dir aDirAttach = aFirstPlane.Position().XDirection(); - Quantity_Parameter anU, aV; - ElSLib::Parameters (aSecondPlane, mySecondPoint, anU, aV); - BRepTopAdaptor_FClass2d aClassifier (aSecondFace, Precision::Confusion()); - TopAbs_State aState = aClassifier.Perform (gp_Pnt2d (anU, aV), Standard_False); - if (aState == TopAbs_OUT || aState == TopAbs_UNKNOWN) - { - mySecondPoint = AIS::Nearest(aSecondFace, myFirstPoint); - if (myFirstPoint.Distance(mySecondPoint) > Precision::Confusion()) - { - gp_Vec aVec = gp_Vec(myFirstPoint, mySecondPoint) ^ aLengthDir; - if (aVec.SquareMagnitude() > Precision::SquareConfusion()) - aDirAttach = aVec ^ aLengthDir; - } - } - isSuccess = Standard_True; - } - else // curvilinear faces - { - AIS::ComputeLengthBetweenCurvilinearFaces (aFirstFace, aSecondFace, aFirstSurface, - aSecondSurface, Standard_True, myValue, - mySelectionGeom.TextPos, myFirstPoint, - mySecondPoint, aDirAttach); - isSuccess = Standard_True; - } - } - else if (theFirstShape.ShapeType() == TopAbs_EDGE) - { - isSuccess = initEdgeFaceLength (TopoDS::Edge (theFirstShape), - TopoDS::Face (theSecondShape), - aDirAttach); - } - if (!myIsWorkingPlaneCustom) - resetWorkingPlane(gp_Pln(myFirstPoint, aDirAttach)); - } - break; - case TopAbs_EDGE: - { - if (theSecondShape.ShapeType() == TopAbs_VERTEX) - { - return initEdgeVertexLength (TopoDS::Edge(theFirstShape), - TopoDS::Vertex(theSecondShape), - aDirAttach, isInfinite); - } - else if (theSecondShape.ShapeType() == TopAbs_EDGE) - { - return initTwoEdgesLength (TopoDS::Edge(theFirstShape), - TopoDS::Edge(theSecondShape), - aDirAttach); - } - } - break; - case TopAbs_VERTEX: - { - if (theSecondShape.ShapeType() == TopAbs_VERTEX) - { - myFirstPoint = BRep_Tool::Pnt (TopoDS::Vertex (theFirstShape)); - mySecondPoint = BRep_Tool::Pnt (TopoDS::Vertex (theSecondShape)); - isSuccess = Standard_True; - } - else if (theSecondShape.ShapeType() == TopAbs_EDGE) - { - return initEdgeVertexLength (TopoDS::Edge(theSecondShape), - TopoDS::Vertex(theFirstShape), - aDirAttach, isInfinite); - } - } - break; - case TopAbs_COMPOUND: - case TopAbs_COMPSOLID: - case TopAbs_SOLID: - case TopAbs_SHELL: - case TopAbs_WIRE: - case TopAbs_SHAPE: - // nothing to do for these kinds - break; - } - return isSuccess; -} - -//======================================================================= -//function : initOneShapePoints -//purpose : Initialization of two points where dimension layouts -// will be attached -// Attention: 1) can be only the edge in currect implementation -// 2) No length for infinite edge -//======================================================================= - -Standard_Boolean AIS_LengthDimension::initOneShapePoints (const TopoDS_Shape& theShape) -{ - if (theShape.ShapeType() == TopAbs_EDGE) - { - TopoDS_Edge anEdge = TopoDS::Edge (theShape); - BRepAdaptor_Curve aBrepCurve(anEdge); - Standard_Real aFirst = aBrepCurve.FirstParameter(), - aLast = aBrepCurve.LastParameter(); - Standard_Boolean isInfinite = (Precision::IsInfinite (aFirst) - || Precision::IsInfinite (aLast)); - if (isInfinite) - return Standard_False; - - myFirstPoint = aBrepCurve.Value (aBrepCurve.FirstParameter()); - mySecondPoint = aBrepCurve.Value (aBrepCurve.LastParameter()); - } - else // Some other kinds of shapes return Standard_False; + } + return Standard_True; } +//======================================================================= +//function : ComputePlane +//purpose : +//======================================================================= +gp_Pln AIS_LengthDimension::ComputePlane (const gp_Dir& theAttachDir) const +{ + if (!IsValidPoints (myFirstPoint, mySecondPoint)) + { + return gp_Pln(); + } + + gp_Pnt aThirdPoint (myFirstPoint.Translated (gp_Vec(theAttachDir))); + gce_MakePln aPlaneConstrustor (myFirstPoint, mySecondPoint, aThirdPoint); + return aPlaneConstrustor.Value(); +} + +//======================================================================= +//function : GetModelUnits +//purpose : +//======================================================================= +const TCollection_AsciiString& AIS_LengthDimension::GetModelUnits() const +{ + return myDrawer->DimLengthModelUnits(); +} + +//======================================================================= +//function : GetDisplayUnits +//purpose : +//======================================================================= +const TCollection_AsciiString& AIS_LengthDimension::GetDisplayUnits() const +{ + return myDrawer->DimLengthDisplayUnits(); +} + +//======================================================================= +//function : SetModelUnits +//purpose : +//======================================================================= +void AIS_LengthDimension::SetModelUnits (const TCollection_AsciiString& theUnits) +{ + myDrawer->SetDimLengthModelUnits (theUnits); +} + +//======================================================================= +//function : SetDisplayUnits +//purpose : +//======================================================================= +void AIS_LengthDimension::SetDisplayUnits (const TCollection_AsciiString& theUnits) +{ + myDrawer->SetDimLengthDisplayUnits (theUnits); +} + +//======================================================================= +//function : ComputeValue +//purpose : +//======================================================================= +Standard_Real AIS_LengthDimension::ComputeValue() const +{ + return IsValid() ? myFirstPoint.Distance (mySecondPoint) : 0.0; +} + //======================================================================= //function : Compute //purpose : //======================================================================= - void AIS_LengthDimension::Compute (const Handle(PrsMgr_PresentationManager3d)& /*thePM*/, const Handle(Prs3d_Presentation)& thePresentation, const Standard_Integer theMode) @@ -497,39 +276,439 @@ void AIS_LengthDimension::Compute (const Handle(PrsMgr_PresentationManager3d)& / thePresentation->Clear(); mySelectionGeom.Clear (theMode); - // Initialization of points, if they are not set - if (!myIsInitialized) - { - if (myShapesNumber == 1) - { - myIsInitialized = initOneShapePoints (myFirstShape); - } - else if (myShapesNumber == 2) - { - myIsInitialized = initTwoShapesPoints (myFirstShape, mySecondShape); - } - else - { - return; - } - } - - // If initialization failed - if (!myIsInitialized) + if (!IsValid()) { return; } - drawLinearDimension (thePresentation, theMode); + DrawLinearDimension (thePresentation, theMode, myFirstPoint, mySecondPoint); } //======================================================================= -//function : ComputeValue +//function : ComputeFlyoutSelection //purpose : //======================================================================= - -void AIS_LengthDimension::computeValue() +void AIS_LengthDimension::ComputeFlyoutSelection (const Handle(SelectMgr_Selection)& theSelection, + const Handle(SelectMgr_EntityOwner)& theEntityOwner) { - myValue = myFirstPoint.Distance (mySecondPoint); - AIS_Dimension::computeValue (); + if (!IsValid()) + { + return; + } + + ComputeLinearFlyouts (theSelection, theEntityOwner, myFirstPoint, mySecondPoint); +} + +//======================================================================= +//function : IsValidPoints +//purpose : +//======================================================================= +Standard_Boolean AIS_LengthDimension::IsValidPoints (const gp_Pnt& theFirstPoint, + const gp_Pnt& theSecondPoint) const +{ + return theFirstPoint.Distance (theSecondPoint) > Precision::Confusion(); +} + +//======================================================================= +//function : InitTwoEdgesLength +//purpose : Initialization of dimension between two linear edges +//======================================================================= +Standard_Boolean AIS_LengthDimension::InitTwoEdgesLength (const TopoDS_Edge& theFirstEdge, + const TopoDS_Edge& theSecondEdge, + gp_Dir& theDirAttach) +{ + BRepAdaptor_Curve aFirstCurveAdapt (theFirstEdge); + if (aFirstCurveAdapt.GetType() != GeomAbs_Line) + { + return Standard_False; + } + + BRepAdaptor_Curve aSecondCurveAdapt (theSecondEdge); + if (aSecondCurveAdapt.GetType() != GeomAbs_Line) + { + return Standard_False; + } + + Handle(Geom_Curve) aFirstCurve; + Handle(Geom_Curve) aSecondCurve; + + gp_Pnt aPoint11 (gp::Origin()); + gp_Pnt aPoint12 (gp::Origin()); + gp_Pnt aPoint21 (gp::Origin()); + gp_Pnt aPoint22 (gp::Origin()); + Standard_Boolean isFirstInfinite = Standard_False; + Standard_Boolean isSecondInfinite = Standard_False; + + if (!AIS::ComputeGeometry (theFirstEdge, theSecondEdge, + aFirstCurve, aSecondCurve, + aPoint11, aPoint12, + aPoint21, aPoint22, + isFirstInfinite, + isSecondInfinite)) + { + return Standard_False; + } + + const Handle(Geom_Line) aFirstLine = Handle(Geom_Line)::DownCast (aFirstCurve); + const Handle(Geom_Line) aSecondLine = Handle(Geom_Line)::DownCast (aSecondCurve); + + if (!aFirstLine->Lin().Direction().IsParallel (aSecondLine->Lin().Direction(),Precision::Angular())) + { + return Standard_False; + } + + theDirAttach = aFirstLine->Lin().Direction(); + + gp_Pnt aPoint; + + if (!isFirstInfinite) + { + if (AIS::Nearest (aSecondCurve, aPoint11, aPoint21, aPoint22, aPoint)) + { + myFirstPoint = aPoint11; + mySecondPoint = aPoint; + return IsValidPoints (myFirstPoint, mySecondPoint); + } + else if (AIS::Nearest (aSecondCurve, aPoint12, aPoint21, aPoint22, aPoint)) + { + myFirstPoint = aPoint12; + mySecondPoint = aPoint; + return IsValidPoints (myFirstPoint, mySecondPoint); + } + } + + if (!isSecondInfinite) + { + if (AIS::Nearest (aFirstCurve, aPoint21, aPoint11, aPoint12, aPoint)) + { + myFirstPoint = aPoint; + mySecondPoint = aPoint21; + return IsValidPoints (myFirstPoint, mySecondPoint); + } + if (AIS::Nearest (aFirstCurve, aPoint22, aPoint11, aPoint12, aPoint)) + { + myFirstPoint = aPoint; + mySecondPoint = aPoint22; + return IsValidPoints (myFirstPoint, mySecondPoint); + } + } + + GeomAPI_ExtremaCurveCurve anExtrema (aFirstCurve, aSecondCurve); + anExtrema.NearestPoints (myFirstPoint, mySecondPoint); + return IsValidPoints (myFirstPoint, mySecondPoint); +} + +//======================================================================= +//function : InitEdgeVertexLength +//purpose : for first edge and second vertex shapes +//======================================================================= +Standard_Boolean AIS_LengthDimension::InitEdgeVertexLength (const TopoDS_Edge& theEdge, + const TopoDS_Vertex& theVertex, + gp_Dir& theEdgeDir, + Standard_Boolean isInfinite) +{ + gp_Pnt anEdgePoint1 (gp::Origin()); + gp_Pnt anEdgePoint2 (gp::Origin()); + Handle(Geom_Curve) aCurve; + + if (!AIS::ComputeGeometry (theEdge, aCurve, anEdgePoint1, anEdgePoint2, isInfinite)) + { + return Standard_False; + } + + myFirstPoint = BRep_Tool::Pnt (theVertex); + + const Handle(Geom_Line)& aGeomLine = (Handle(Geom_Line)&) aCurve; + const gp_Lin& aLin = aGeomLine->Lin(); + + // Get direction of edge to build plane automatically. + theEdgeDir = aLin.Direction(); + + mySecondPoint = AIS::Nearest (aLin, myFirstPoint); + + return IsValidPoints (myFirstPoint, mySecondPoint); +} + +//======================================================================= +//function : InitEdgeFaceLength +//purpose : +//======================================================================= +Standard_Boolean AIS_LengthDimension::InitEdgeFaceLength (const TopoDS_Edge& theEdge, + const TopoDS_Face& theFace, + gp_Dir& theEdgeDir) +{ + Handle(Geom_Curve) aCurve; + gp_Pnt aFirstPoint, aSecondPoint; + Standard_Boolean isInfinite = Standard_False; + + if (!AIS::ComputeGeometry (theEdge, aCurve, aFirstPoint, aSecondPoint, isInfinite)) + { + return Standard_False; + } + theEdgeDir = gce_MakeDir (aFirstPoint, aSecondPoint); + gp_Pln aPlane; + Handle(Geom_Surface) aSurface; + AIS_KindOfSurface aSurfType; + Standard_Real anOffset; + + if (!AIS::GetPlaneFromFace (theFace, aPlane, aSurface, aSurfType, anOffset)) + { + return Standard_False; + } + + GeomAPI_ExtremaCurveSurface aDistAdaptor (aCurve, aSurface); + + aDistAdaptor.NearestPoints (myFirstPoint, mySecondPoint); + + return IsValidPoints (myFirstPoint, mySecondPoint); +} + +//======================================================================= +//function : InitTwoShapesPoints +//purpose : Initialization of two points where dimension layouts +// will be attached +//======================================================================= +Standard_Boolean AIS_LengthDimension::InitTwoShapesPoints (const TopoDS_Shape& theFirstShape, + const TopoDS_Shape& theSecondShape, + gp_Pln& theComputedPlane, + Standard_Boolean& theIsPlaneComputed) +{ + theIsPlaneComputed = Standard_False; + gp_Dir aDirAttach; + Standard_Boolean isInfinite = Standard_False; + Standard_Boolean isSuccess = Standard_False; + switch (theFirstShape.ShapeType()) + { + case TopAbs_FACE: + { + // Initialization for face + gp_Pln aFirstPlane; + Handle(Geom_Surface) aFirstSurface; + AIS_KindOfSurface aFirstSurfKind; + Standard_Real aFirstOffset; + + TopoDS_Face aFirstFace = TopoDS::Face (theFirstShape); + + AIS::InitFaceLength (TopoDS::Face (theFirstShape), + aFirstPlane, + aFirstSurface, + aFirstSurfKind, + aFirstOffset); + + if (theSecondShape.ShapeType() == TopAbs_FACE) + { + // Initialization for face + myGeometryType = GeometryType_Faces; + gp_Pln aSecondPlane; + Handle(Geom_Surface) aSecondSurface; + AIS_KindOfSurface aSecondSurfKind; + Standard_Real aSecondOffset; + + TopoDS_Face aSecondFace = TopoDS::Face (theSecondShape); + + AIS::InitFaceLength (aSecondFace, + aSecondPlane, + aSecondSurface, + aSecondSurfKind, + aSecondOffset); + + if (aFirstSurfKind == AIS_KOS_Plane) + { + if (!aFirstPlane.Axis().Direction().IsParallel (aSecondPlane.Axis().Direction(), Precision::Angular())) + { + return Standard_False; + } + + TopExp_Explorer anExplorer (theFirstShape, TopAbs_VERTEX); + + // In case of infinite planes + if (!anExplorer.More()) + { + myFirstPoint = aFirstPlane.Location(); + } + else + { + myFirstPoint = BRep_Tool::Pnt (TopoDS::Vertex (anExplorer.Current())); + } + + mySecondPoint = AIS::ProjectPointOnPlane (myFirstPoint, aSecondPlane); + + Quantity_Parameter anU, aV; + ElSLib::Parameters (aSecondPlane, mySecondPoint, anU, aV); + + BRepTopAdaptor_FClass2d aClassifier (aSecondFace, Precision::Confusion()); + TopAbs_State aState = aClassifier.Perform (gp_Pnt2d (anU, aV), Standard_False); + + if (aState == TopAbs_OUT || aState == TopAbs_UNKNOWN) + { + mySecondPoint = AIS::Nearest (aSecondFace, myFirstPoint); + } + + isSuccess = IsValidPoints (myFirstPoint, mySecondPoint); + if (isSuccess) + { + theComputedPlane = ComputePlane (aFirstPlane.Position().XDirection()); + theIsPlaneComputed = Standard_True; + } + } + else // curvilinear faces + { + Standard_Real aU1Min, aV1Min, aU1Max, aV1Max; + Standard_Real aU2Min, aV2Min, aU2Max, aV2Max; + BRepTools::UVBounds (aFirstFace, aU1Min, aU1Max, aV1Min, aV1Max); + BRepTools::UVBounds (aSecondFace, aU2Min, aU2Max, aV2Min, aV2Max); + + GeomAPI_ExtremaSurfaceSurface anExtrema (aFirstSurface, aSecondSurface, + aU1Min, aU1Max, aV1Min, aV1Max, + aU2Min, aU2Max, aV2Min, aV2Max); + + Standard_Real aU1, aV1, aU2, aV2; + anExtrema.LowerDistanceParameters (aU1, aV1, aU2, aV2); + myFirstPoint = BRep_Tool::Surface (aFirstFace)->Value (aU1, aV1); + mySecondPoint = BRep_Tool::Surface (aSecondFace)->Value (aU2, aV2); + + // Adjust automatic plane + gp_Ax2 aLocalAxes (myFirstPoint, gce_MakeDir (myFirstPoint, mySecondPoint)); + aDirAttach = gce_MakeDir (aLocalAxes.XDirection ()); + + // Check points + isSuccess = IsValidPoints (myFirstPoint, mySecondPoint); + if (isSuccess) + { + theComputedPlane = ComputePlane (aDirAttach); + theIsPlaneComputed = Standard_True; + } + } + + return isSuccess && IsValidPoints (myFirstPoint, mySecondPoint); + } + else if (theFirstShape.ShapeType() == TopAbs_EDGE) + { + myGeometryType = GeometryType_EdgeFace; + isSuccess = InitEdgeFaceLength (TopoDS::Edge (theFirstShape), + TopoDS::Face (theSecondShape), + aDirAttach); + + if (isSuccess) + { + theComputedPlane = ComputePlane (aDirAttach); + theIsPlaneComputed = Standard_True; + } + + return isSuccess; + } + } + break; + + case TopAbs_EDGE: + { + if (theSecondShape.ShapeType() == TopAbs_VERTEX) + { + myGeometryType = GeometryType_EdgeVertex; + isSuccess = InitEdgeVertexLength (TopoDS::Edge (theFirstShape), + TopoDS::Vertex (theSecondShape), + aDirAttach, + isInfinite); + + if (isSuccess) + { + theComputedPlane = ComputePlane (aDirAttach); + theIsPlaneComputed = Standard_True; + } + + return isSuccess; + } + else if (theSecondShape.ShapeType() == TopAbs_EDGE) + { + myGeometryType = GeometryType_Edges; + isSuccess = InitTwoEdgesLength (TopoDS::Edge (theFirstShape), + TopoDS::Edge (theSecondShape), + aDirAttach); + + if (isSuccess) + { + theComputedPlane = ComputePlane (aDirAttach); + theIsPlaneComputed = Standard_True; + } + + return isSuccess; + } + } + break; + + case TopAbs_VERTEX: + { + if (theSecondShape.ShapeType() == TopAbs_VERTEX) + { + myGeometryType = GeometryType_Points; + myFirstPoint = BRep_Tool::Pnt (TopoDS::Vertex (theFirstShape)); + mySecondPoint = BRep_Tool::Pnt (TopoDS::Vertex (theSecondShape)); + + return IsValidPoints (myFirstPoint, mySecondPoint); + } + else if (theSecondShape.ShapeType() == TopAbs_EDGE) + { + myGeometryType = GeometryType_EdgeVertex; + Standard_Boolean isSuccess = InitEdgeVertexLength (TopoDS::Edge(theSecondShape), + TopoDS::Vertex(theFirstShape), + aDirAttach, + isInfinite); + if (isSuccess) + { + theComputedPlane = ComputePlane (aDirAttach); + theIsPlaneComputed = Standard_True; + } + + return isSuccess; + } + } + break; + + case TopAbs_COMPOUND: + case TopAbs_COMPSOLID: + case TopAbs_SOLID: + case TopAbs_SHELL: + case TopAbs_WIRE: + case TopAbs_SHAPE: + break; + } + + return Standard_False; +} + +//======================================================================= +//function : InitOneShapePoints +//purpose : Initialization of two points where dimension layouts +// will be attached +// Attention: 1) can be only the edge in currect implementation +// 2) No length for infinite edge +//======================================================================= +Standard_Boolean AIS_LengthDimension::InitOneShapePoints (const TopoDS_Shape& theShape) +{ + if (theShape.ShapeType() != TopAbs_EDGE) + { + return Standard_False; + } + + TopoDS_Edge anEdge = TopoDS::Edge (theShape); + + BRepAdaptor_Curve aBrepCurve(anEdge); + Standard_Real aFirst = aBrepCurve.FirstParameter(); + Standard_Real aLast = aBrepCurve.LastParameter(); + + if (aBrepCurve.GetType() != GeomAbs_Line) + { + return Standard_False; + } + + Standard_Boolean isInfinite = (Precision::IsInfinite (aFirst) || Precision::IsInfinite (aLast)); + if (isInfinite) + { + return Standard_False; + } + + myFirstPoint = aBrepCurve.Value (aBrepCurve.FirstParameter()); + mySecondPoint = aBrepCurve.Value (aBrepCurve.LastParameter()); + + return IsValidPoints (myFirstPoint, mySecondPoint); } diff --git a/src/AIS/AIS_LengthDimension.hxx b/src/AIS/AIS_LengthDimension.hxx index 4988572af2..81140540a6 100644 --- a/src/AIS/AIS_LengthDimension.hxx +++ b/src/AIS/AIS_LengthDimension.hxx @@ -58,69 +58,217 @@ class Handle(Standard_Type); class Handle(AIS_Relation); class AIS_LengthDimension; -DEFINE_STANDARD_HANDLE(AIS_LengthDimension,AIS_Dimension) +DEFINE_STANDARD_HANDLE (AIS_LengthDimension, AIS_Dimension) -//! A dimension to display lengths.
-//! These can be lengths along a face or edge, or
-//! between two faces or two edges. +//! Length dimension. Can be constructued: +//! - Between two generic points. +//! - Between two vertices. +//! - Between two faces. +//! - Between two parallel edges. +//! - Between face and edge. +//! +//! In case of two points (vertices) or one linear edge the user-defined plane +//! that includes this geometry is necessary to be set. +//! +//! In case of face-edge, edge-vertex or face-face lengthes the automatic plane +//! computing is allowed. For this plane the third point is found on the +//! edge or on the face. +//! +//! Please note that if the inappropriate geometry is defined +//! or the distance between measured points is less than +//! Precision::Confusion(), the dimension is invalid and its +//! presentation can not be computed. class AIS_LengthDimension : public AIS_Dimension { public: - Standard_EXPORT AIS_LengthDimension (const gp_Pnt& theFirstPoint, - const gp_Pnt& theSecondPoint, - const gp_Pln& theDimensionPlane); - - //! Constructs a length dimension between two shapes(vertices, edges, shapes) with custom working plane - Standard_EXPORT AIS_LengthDimension (const TopoDS_Shape& theFirstShape, - const TopoDS_Shape& theSecondShape, - const gp_Pln& theWorkingPlane); - - Standard_EXPORT AIS_LengthDimension (const TopoDS_Edge& theEdge, - const gp_Pln& theWorkingPlane); - - Standard_EXPORT AIS_LengthDimension (const TopoDS_Face& theFirstFace, - const TopoDS_Face& theSecondFace); - + //! Construct length dimension between face and edge. + //! Here dimension can be built without user-defined plane. + //! @param theFace [in] the face (first shape). + //! @param theEdge [in] the edge (second shape). Standard_EXPORT AIS_LengthDimension (const TopoDS_Face& theFace, const TopoDS_Edge& theEdge); +public: + + //! Construct length dimension between two faces. + //! @param theFirstFace [in] the first face (first shape). + //! @param theSecondFace [in] the second face (second shape). + Standard_EXPORT AIS_LengthDimension (const TopoDS_Face& theFirstFace, + const TopoDS_Face& theSecondFace); + + //! Construct length dimension between two points in + //! the specified plane. + //! @param theFirstPoint [in] the first point. + //! @param theSecondPoint [in] the second point. + //! @param thePlane [in] the plane to orient dimension. + Standard_EXPORT AIS_LengthDimension (const gp_Pnt& theFirstPoint, + const gp_Pnt& theSecondPoint, + const gp_Pln& thePlane); + + //! Construct length dimension between two arbitrary shapes in + //! the specified plane. + //! @param theFirstShape [in] the first shape. + //! @param theSecondShape [in] the second shape. + //! @param thePlane [in] the plane to orient dimension. + Standard_EXPORT AIS_LengthDimension (const TopoDS_Shape& theFirstShape, + const TopoDS_Shape& theSecondShape, + const gp_Pln& thePlane); + + //! Construct length dimension of linear edge. + //! @param theEdge [in] the edge to measure. + //! @param thePlane [in] the plane to orient dimension. + Standard_EXPORT AIS_LengthDimension (const TopoDS_Edge& theEdge, + const gp_Pln& thePlane); + +public: + + //! @return first attachement point. + const gp_Pnt& FirstPoint() const + { + return myFirstPoint; + } + + //! @return second attachement point. + const gp_Pnt& SecondPoint() const + { + return mySecondPoint; + } + + //! @return first attachement shape. + const TopoDS_Shape& FirstShape() const + { + return myFirstShape; + } + + //! @return second attachement shape. + const TopoDS_Shape& SecondShape() const + { + return mySecondShape; + } + +public: + + //! Measure distance between two points. + //! The dimension will become invalid if the new distance between + //! attachement points is less than Precision::Confusion(). + //! @param theFirstPoint [in] the first point. + //! @param theSecondPoint [in] the second point. + //! @param thePlane [in] the user-defined plane + Standard_EXPORT void SetMeasuredGeometry (const gp_Pnt& theFirstPoint, + const gp_Pnt& theSecondPoint, + const gp_Pln& thePlane); + + //! Measure length of edge. + //! The dimension will become invalid if the new length of edge + //! is less than Precision::Confusion(). + //! @param theEdge [in] the edge to measure. + //! @param thePlane [in] the user-defined plane + Standard_EXPORT void SetMeasuredGeometry (const TopoDS_Edge& theEdge, + const gp_Pln& thePlane); + + //! Measure distance between two faces. + //! The dimension will become invalid if the distance can not + //! be measured or it is less than Precision::Confusion(). + //! @param theFirstFace [in] the first face (first shape). + //! @param theSecondFace [in] the second face (second shape). + Standard_EXPORT void SetMeasuredGeometry (const TopoDS_Face& theFirstFace, + const TopoDS_Face& theSecondFace); + + //! Measure distance between face and edge. + //! The dimension will become invalid if the distance can not + //! be measured or it is less than Precision::Confusion(). + //! @param theFace [in] the face (first shape). + //! @param theEdge [in] the edge (second shape). + Standard_EXPORT void SetMeasuredGeometry (const TopoDS_Face& theFace, + const TopoDS_Edge& theEdge); + + //! Measure distance between generic pair of shapes (edges, vertices, length), + //! where measuring is applicable. + //! @param theFirstShape [in] the first shape. + //! @param theSecondShape [in] the second shape. + Standard_EXPORT void SetMeasuredShapes (const TopoDS_Shape& theFirstShape, + const TopoDS_Shape& theSecondShape); + + //! @return the display units string. + Standard_EXPORT virtual const TCollection_AsciiString& GetDisplayUnits () const; + + //! @return the model units string. + Standard_EXPORT virtual const TCollection_AsciiString& GetModelUnits () const; + + Standard_EXPORT virtual void SetDisplayUnits (const TCollection_AsciiString& theUnits); + + Standard_EXPORT virtual void SetModelUnits (const TCollection_AsciiString& theUnits); + public: DEFINE_STANDARD_RTTI(AIS_LengthDimension) +protected: + + //! Checks if the plane includes first and second points to build dimension. + Standard_EXPORT virtual Standard_Boolean CheckPlane (const gp_Pln& thePlane) const; + + Standard_EXPORT virtual gp_Pln ComputePlane(const gp_Dir& theAttachDir) const; + + Standard_EXPORT Standard_Real ComputeValue() const; + + Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePresentationManager, + const Handle(Prs3d_Presentation)& thePresentation, + const Standard_Integer theMode = 0); + + Standard_EXPORT virtual void ComputeFlyoutSelection (const Handle(SelectMgr_Selection)& theSelection, + const Handle(SelectMgr_EntityOwner)& theEntityOwner); + +protected: + + //! Checks that distance between two points is valid. + //! @param theFirstPoint [in] the first point. + //! @param theSecondPoint [in] the second point. + Standard_EXPORT Standard_Boolean IsValidPoints (const gp_Pnt& theFirstPoint, + const gp_Pnt& theSecondPoint) const; + + Standard_EXPORT Standard_Boolean InitTwoEdgesLength (const TopoDS_Edge & theFirstEdge, + const TopoDS_Edge& theSecondEdge, + gp_Dir& theEdgeDir); + + //! Auxiliary method for InitTwoShapesPoints() + //! in case of the distance between edge and vertex. + //! Finds the point on the edge that is the closest one to . + //! @param theEdgeDir [out] is the direction on the edge to build + //! automatical plane. + Standard_EXPORT Standard_Boolean InitEdgeVertexLength (const TopoDS_Edge& theEdge, + const TopoDS_Vertex& theVertex, + gp_Dir& theEdgeDir, + Standard_Boolean isInfinite); + + //! Auxiliary method for InitTwoShapesPoints() + //! in case of the distance between face and edge. + //! The first attachment point is first parameter point from . + //! Find the second attachment point which belongs to + //! Iterate over the edges of the face and find the closest point according + //! to finded point on edge. + //! @param theEdgeDir [out] is the direction on the edge to build + //! automatical plane. + Standard_EXPORT Standard_Boolean InitEdgeFaceLength (const TopoDS_Edge& theEdge, + const TopoDS_Face& theFace, + gp_Dir& theEdgeDir); + + //! Initialization of two attach points in case of two owner shapes. + Standard_EXPORT Standard_Boolean InitTwoShapesPoints (const TopoDS_Shape& theFirstShape, + const TopoDS_Shape& theSecondShape, + gp_Pln& theComputedPlane, + Standard_Boolean& theIsPlaneComputed); + + //! Initialization of two attach points in case of one owner shape. + Standard_EXPORT Standard_Boolean InitOneShapePoints (const TopoDS_Shape& theShape); + private: - Standard_Boolean initTwoEdgesLength (const TopoDS_Edge & theFirstEdge, - const TopoDS_Edge& theSecondEdge, - gp_Dir& theDirAttach); - - //! Auxiliary method for - //! in case of the distance between edge and vertex - Standard_Boolean initEdgeVertexLength (const TopoDS_Edge & theEdge, - const TopoDS_Vertex & theVertex, - gp_Dir & theDirAttach, - Standard_Boolean isInfinite); - - //! Auxiliary method for - //! in case of the distance between face and edge - Standard_Boolean initEdgeFaceLength (const TopoDS_Edge& theEdge, - const TopoDS_Face& theFace, - gp_Dir& theDirAttach); - - //! Initialization of two attach points in case of two owner shapes - Standard_Boolean initTwoShapesPoints (const TopoDS_Shape& theFirstShape, - const TopoDS_Shape& theSecondShape); - - //! Initialization of two attach points in case of one owner shape - Standard_Boolean initOneShapePoints (const TopoDS_Shape& theShape); - - //! Compute length in display units. - virtual void computeValue(); - - virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePresentationManager, - const Handle(Prs3d_Presentation)& thePresentation, - const Standard_Integer theMode = 0) ; + gp_Pnt myFirstPoint; + gp_Pnt mySecondPoint; + TopoDS_Shape myFirstShape; + TopoDS_Shape mySecondShape; }; -#endif +#endif // _AIS_LengthDimension_HeaderFile diff --git a/src/AIS/AIS_RadiusDimension.cxx b/src/AIS/AIS_RadiusDimension.cxx index b54771c711..18267d57c7 100755 --- a/src/AIS/AIS_RadiusDimension.cxx +++ b/src/AIS/AIS_RadiusDimension.cxx @@ -21,32 +21,28 @@ #include #include -#include +#include #include #include -#include -#include -#include -#include -IMPLEMENT_STANDARD_HANDLE(AIS_RadiusDimension, AIS_Dimension) -IMPLEMENT_STANDARD_RTTIEXT(AIS_RadiusDimension, AIS_Dimension) +IMPLEMENT_STANDARD_HANDLE (AIS_RadiusDimension, AIS_Dimension) +IMPLEMENT_STANDARD_RTTIEXT (AIS_RadiusDimension, AIS_Dimension) + +namespace +{ + static const Standard_ExtCharacter THE_RADIUS_SYMBOL ('R'); +}; //======================================================================= //function : Constructor //purpose : //======================================================================= - AIS_RadiusDimension::AIS_RadiusDimension (const gp_Circ& theCircle) -: AIS_Dimension(), - myCircle (theCircle) +: AIS_Dimension (AIS_KOD_RADIUS) { - myFirstPoint = ElCLib::Value(0, myCircle); - mySecondPoint = theCircle.Location(); - myIsInitialized = Standard_True; - SetSpecialSymbol ('R'); + SetMeasuredGeometry (theCircle); + SetSpecialSymbol (THE_RADIUS_SYMBOL); SetDisplaySpecialSymbol (AIS_DSS_Before); - SetKindOfDimension (AIS_KOD_RADIUS); SetFlyout (0.0); } @@ -54,18 +50,13 @@ AIS_RadiusDimension::AIS_RadiusDimension (const gp_Circ& theCircle) //function : Constructor //purpose : //======================================================================= - AIS_RadiusDimension::AIS_RadiusDimension (const gp_Circ& theCircle, const gp_Pnt& theAttachPoint) -: AIS_Dimension(), - myCircle (theCircle) +: AIS_Dimension (AIS_KOD_RADIUS) { - myFirstPoint = theAttachPoint; - mySecondPoint = theCircle.Location(); - myIsInitialized = Standard_True; - SetSpecialSymbol ('R'); + SetMeasuredGeometry (theCircle, theAttachPoint); + SetSpecialSymbol (THE_RADIUS_SYMBOL); SetDisplaySpecialSymbol (AIS_DSS_Before); - SetKindOfDimension (AIS_KOD_RADIUS); SetFlyout (0.0); } @@ -73,23 +64,170 @@ AIS_RadiusDimension::AIS_RadiusDimension (const gp_Circ& theCircle, //function : Constructor //purpose : //======================================================================= - AIS_RadiusDimension::AIS_RadiusDimension (const TopoDS_Shape& theShape) -: AIS_Dimension () +: AIS_Dimension (AIS_KOD_RADIUS) { - myFirstShape = theShape; - myIsInitialized = Standard_False; - SetSpecialSymbol ('R'); + SetMeasuredGeometry (theShape); + SetSpecialSymbol (THE_RADIUS_SYMBOL); SetDisplaySpecialSymbol (AIS_DSS_Before); - SetKindOfDimension (AIS_KOD_RADIUS); SetFlyout (0.0); } +//======================================================================= +//function : SetMeasuredGeometry +//purpose : +//======================================================================= +void AIS_RadiusDimension::SetMeasuredGeometry (const gp_Circ& theCircle) +{ + myCircle = theCircle; + myGeometryType = GeometryType_Edge; + myShape = BRepLib_MakeEdge (theCircle); + myAnchorPoint = ElCLib::Value (0, myCircle); + myIsValid = IsValidCircle (myCircle); + + if (myIsValid) + { + ComputePlane(); + } + + myIsValid &= CheckPlane (myPlane); + + SetToUpdate(); +} + +//======================================================================= +//function : SetMeasuredGeometry +//purpose : +//======================================================================= +void AIS_RadiusDimension::SetMeasuredGeometry (const gp_Circ& theCircle, + const gp_Pnt& theAnchorPoint) +{ + myCircle = theCircle; + myGeometryType = GeometryType_Edge; + myShape = BRepLib_MakeEdge (theCircle); + myAnchorPoint = theAnchorPoint; + myIsValid = IsValidCircle (myCircle) && IsValidAnchor (myCircle, theAnchorPoint); + + if (myIsValid) + { + ComputePlane(); + } + + myIsValid &= CheckPlane (myPlane); + + SetToUpdate(); +} + +//======================================================================= +//function : SetMeasuredGeometry +//purpose : +//======================================================================= +void AIS_RadiusDimension::SetMeasuredGeometry (const TopoDS_Shape& theShape) +{ + Standard_Boolean isClosed = Standard_False; + myShape = theShape; + myGeometryType = GeometryType_UndefShapes; + myIsValid = InitCircularDimension (theShape, myCircle, myAnchorPoint, isClosed) + && IsValidCircle (myCircle); + + if (myIsValid) + { + ComputePlane(); + } + + myIsValid &= CheckPlane (myPlane); + + SetToUpdate(); +} + +//======================================================================= +//function : CheckPlane +//purpose : +//======================================================================= +Standard_Boolean AIS_RadiusDimension::CheckPlane (const gp_Pln& thePlane) const +{ + // Check if anchor point and circle center point belong to plane. + if (!thePlane.Contains (myAnchorPoint, Precision::Confusion()) && + !thePlane.Contains (myCircle.Location(), Precision::Confusion())) + { + return Standard_False; + } + + return Standard_True; +} + +//======================================================================= +//function : ComputePlane +//purpose : +//======================================================================= +void AIS_RadiusDimension::ComputePlane() +{ + if (!IsValid()) + { + return; + } + + gp_Dir aDimensionX = gce_MakeDir (myAnchorPoint, myCircle.Location()); + + myPlane = gp_Pln (gp_Ax3 (myCircle.Location(), + myCircle.Axis().Direction(), + aDimensionX)); +} + +//======================================================================= +//function : GetModelUnits +//purpose : +//======================================================================= +const TCollection_AsciiString& AIS_RadiusDimension::GetModelUnits() const +{ + return myDrawer->DimLengthModelUnits(); +} + +//======================================================================= +//function : GetDisplayUnits +//purpose : +//======================================================================= +const TCollection_AsciiString& AIS_RadiusDimension::GetDisplayUnits() const +{ + return myDrawer->DimLengthDisplayUnits(); +} + +//======================================================================= +//function : SetModelUnits +//purpose : +//======================================================================= +void AIS_RadiusDimension::SetModelUnits (const TCollection_AsciiString& theUnits) +{ + myDrawer->SetDimLengthModelUnits (theUnits); +} + +//======================================================================= +//function : SetDisplayUnits +//purpose : +//======================================================================= +void AIS_RadiusDimension::SetDisplayUnits (const TCollection_AsciiString& theUnits) +{ + myDrawer->SetDimLengthDisplayUnits(theUnits); +} + +//======================================================================= +//function : ComputeValue +//purpose : +//======================================================================= +Standard_Real AIS_RadiusDimension::ComputeValue() const +{ + if (!IsValid()) + { + return 0.0; + } + + return myCircle.Radius(); +} + //======================================================================= //function : Compute //purpose : //======================================================================= - void AIS_RadiusDimension::Compute (const Handle(PrsMgr_PresentationManager3d)& /*thePM*/, const Handle(Prs3d_Presentation)& thePresentation, const Standard_Integer theMode) @@ -97,52 +235,34 @@ void AIS_RadiusDimension::Compute (const Handle(PrsMgr_PresentationManager3d)& / thePresentation->Clear(); mySelectionGeom.Clear (theMode); - Handle(Prs3d_DimensionAspect) aDimensionAspect = myDrawer->DimensionAspect(); - Prs3d_Root::CurrentGroup (thePresentation)->SetPrimitivesAspect (aDimensionAspect->LineAspect()->Aspect()); - - if (!myIsInitialized) + if (!IsValid()) { - gp_Pnt aLastPoint; - if (!initCircularDimension (myFirstShape, myCircle, - myFirstPoint, aLastPoint)) - return; - else - { - mySecondPoint = myCircle.Location(); - myIsInitialized = Standard_True; - } + return; } - if (!myIsWorkingPlaneCustom) - { - countDefaultPlane(); - } - - drawLinearDimension (thePresentation, theMode, Standard_True); + DrawLinearDimension (thePresentation, theMode, myAnchorPoint, myCircle.Location(), Standard_True); } //======================================================================= -//function : computeValue +//function : IsValidCircle //purpose : //======================================================================= - -void AIS_RadiusDimension::computeValue () +Standard_Boolean AIS_RadiusDimension::IsValidCircle (const gp_Circ& theCircle) const { - myValue = myFirstPoint.Distance (mySecondPoint); - AIS_Dimension::computeValue (); + return theCircle.Radius() > Precision::Confusion(); } //======================================================================= -//function : countDefaultPlane +//function : IsValidAnchor //purpose : //======================================================================= - -void AIS_RadiusDimension::countDefaultPlane () +Standard_Boolean AIS_RadiusDimension::IsValidAnchor (const gp_Circ& theCircle, + const gp_Pnt& theAnchor) const { - // Compute normal of the default plane. - gp_Vec aVec1(mySecondPoint, myFirstPoint), - aVec2(mySecondPoint, ElCLib::Value(M_PI_2, myCircle)); - myDefaultPlane = gp_Pln(myCircle.Location(), aVec1^aVec2); - // Set computed value to - ResetWorkingPlane (); + gp_Pln aCirclePlane (theCircle.Location(), theCircle.Axis().Direction()); + Standard_Real anAnchorDist = theAnchor.Distance (theCircle.Location()); + Standard_Real aRadius = myCircle.Radius(); + + return Abs (anAnchorDist - aRadius) > Precision::Confusion() + && aCirclePlane.Contains (theAnchor, Precision::Confusion()); } diff --git a/src/AIS/AIS_RadiusDimension.hxx b/src/AIS/AIS_RadiusDimension.hxx index 8d8cf67038..4dadcb23af 100644 --- a/src/AIS/AIS_RadiusDimension.hxx +++ b/src/AIS/AIS_RadiusDimension.hxx @@ -16,63 +16,134 @@ // purpose or non-infringement. Please see the License for the specific terms // and conditions governing the rights and limitations under the License. -//! A framework to define display of radii.
-//! These displays serve as relational references in 3D
-//! presentations of surfaces, and are particularly useful
-//! in viewing fillets. The display consists of arrows and
-//! text giving the length of a radius. This display is
-//! recalculated if the applicative owner shape changes
-//! in dimension, and the text gives the modified length.
-//! The algorithm analyzes a length along a face as an
-//! arc. It then reconstructs the circle corresponding to
-//! the arc and calculates the radius of this circle.
- #ifndef _AIS_RadiusDimension_HeaderFile #define _AIS_RadiusDimension_HeaderFile #include #include -#include #include -#include +#include #include #include -#include -DEFINE_STANDARD_HANDLE(AIS_RadiusDimension,AIS_Dimension) +DEFINE_STANDARD_HANDLE (AIS_RadiusDimension,AIS_Dimension) +//! Radius dimension. Can be constructued: +//! - On generic circle. +//! - On generic circle with user-defined anchor point on that circle. +//! - On generic shape containing geometry that can be measured +//! by diameter dimension: circle wire, arc, circular face, etc. +//! The anchor point is the location of left attachement point of +//! dimension on the circle. It can be user-specified, or computed as +//! middle point on the arc. The radius dimension always lies in the +//! plane of the measured circle. The dimension is considered as +//! invalid if the user-specified anchor point is not lying on the circle, +//! if the radius of the circle is less than Precision::Confusion(). +//! In case if the dimension is built on the arbitrary shape, +//! it can be considered as invalid if the shape does not contain +//! circle geometry. class AIS_RadiusDimension : public AIS_Dimension { public: - Standard_EXPORT AIS_RadiusDimension (const gp_Circ& theCircle); + //! Create radius dimension for the circle geometry. + //! @param theCircle [in] the circle to measure. + Standard_EXPORT AIS_RadiusDimension (const gp_Circ& theCircle); - Standard_EXPORT AIS_RadiusDimension (const gp_Circ& theCircle, - const gp_Pnt& theAttachPoint); + //! Create radius dimension for the circle geometry and define its + //! orientation by location of the first point on that circle. + //! @param theCircle [in] the circle to measure. + //! @param theAnchorPoint [in] the point to define the position + //! of the dimension attachement on the circle. + Standard_EXPORT AIS_RadiusDimension (const gp_Circ& theCircle, + const gp_Pnt& theAnchorPoint); - //! Constructs the radius display object defined by the
- //! shape aShape, the dimension aVal, and the text aText. - Standard_EXPORT AIS_RadiusDimension (const TopoDS_Shape& aShape); + //! Create radius dimension for the arbitrary shape (if possible). + //! @param theShape [in] the shape to measure. + Standard_EXPORT AIS_RadiusDimension (const TopoDS_Shape& theShape); - DEFINE_STANDARD_RTTI(AIS_RadiusDimension) +public: + + //! @return measured geometry circle. + const gp_Circ& Circle() const + { + return myCircle; + } + + //! @return anchor point on circle for radius dimension. + const gp_Pnt& AnchorPoint() const + { + return myAnchorPoint; + } + + //! @return the measured shape. + const TopoDS_Shape& Shape() const + { + return myShape; + } + +public: + + //! Measure radius of the circle. + //! The dimension will become invalid if the radius of the circle + //! is less than Precision::Confusion(). + //! @param theCircle [in] the circle to measure. + Standard_EXPORT void SetMeasuredGeometry (const gp_Circ& theCircle); + + //! Measure radius of the circle and orient the dimension so + //! the dimension lines attaches to anchor point on the circle. + //! The dimension will become invalid if the radiuss of the circle + //! is less than Precision::Confusion(). + //! @param theCircle [in] the circle to measure. + //! @param theAnchorPoint [in] the point to attach the dimension lines. + Standard_EXPORT void SetMeasuredGeometry (const gp_Circ& theCircle, + const gp_Pnt& theAnchorPoint); + + //! Measure radius on the passed shape, if applicable. + //! The dimension will become invalid if the passed shape is not + //! measurable or if measured diameter value is less than Precision::Confusion(). + //! @param theShape [in] the shape to measure. + Standard_EXPORT void SetMeasuredGeometry (const TopoDS_Shape& theShape); + + //! @return the display units string. + Standard_EXPORT virtual const TCollection_AsciiString& GetDisplayUnits () const; + + //! @return the model units string. + Standard_EXPORT virtual const TCollection_AsciiString& GetModelUnits () const; + + Standard_EXPORT virtual void SetDisplayUnits (const TCollection_AsciiString& theUnits); + + Standard_EXPORT virtual void SetModelUnits (const TCollection_AsciiString& theUnits); + +public: + + DEFINE_STANDARD_RTTI (AIS_RadiusDimension) protected: - //! Computes dimension value in display units - Standard_EXPORT virtual void computeValue (); + Standard_EXPORT virtual void ComputePlane(); - //! Fills default plane object if it is possible to count plane automatically. - Standard_EXPORT virtual void countDefaultPlane (); + //! Checks if anchor point and the center of the circle are on the plane. + Standard_EXPORT virtual Standard_Boolean CheckPlane (const gp_Pln& thePlane) const; + + Standard_EXPORT virtual Standard_Real ComputeValue() const; + + Standard_EXPORT virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePresentationManager, + const Handle(Prs3d_Presentation)& thePresentation, + const Standard_Integer theMode = 0); + +protected: + + Standard_EXPORT Standard_Boolean IsValidCircle (const gp_Circ& theCircle) const; + + Standard_EXPORT Standard_Boolean IsValidAnchor (const gp_Circ& theCircle, + const gp_Pnt& thePnt) const; private: - virtual void Compute (const Handle(PrsMgr_PresentationManager3d)& thePresentationManager, - const Handle(Prs3d_Presentation)& thePresentation, - const Standard_Integer theMode = 0); - -// Fields -private: - - gp_Circ myCircle; + gp_Circ myCircle; + gp_Pnt myAnchorPoint; + TopoDS_Shape myShape; }; -#endif + +#endif // _AIS_RadiusDimension_HeaderFile diff --git a/src/Prs3d/FILES b/src/Prs3d/FILES index 4ac2bf0632..823cf13642 100755 --- a/src/Prs3d/FILES +++ b/src/Prs3d/FILES @@ -3,3 +3,5 @@ Prs3d_NListOfSequenceOfPnt.hxx Prs3d_Point.hxx Prs3d_WFShape.hxx Prs3d_WFShape.cxx +Prs3d_DimensionUnits.hxx +Prs3d_DimensionUnits.cxx diff --git a/src/Prs3d/Prs3d.cdl b/src/Prs3d/Prs3d.cdl index 424a15ab99..70524508d1 100755 --- a/src/Prs3d/Prs3d.cdl +++ b/src/Prs3d/Prs3d.cdl @@ -119,6 +119,7 @@ is class PlaneAspect; class DimensionAspect; class DatumAspect; + imported DimensionUnits; class Drawer; ---Purpose: qualifies how the presentation algorithms compute diff --git a/src/Prs3d/Prs3d_DimensionAspect.cdl b/src/Prs3d/Prs3d_DimensionAspect.cdl index 778b2fc14c..d00ffb8291 100644 --- a/src/Prs3d/Prs3d_DimensionAspect.cdl +++ b/src/Prs3d/Prs3d_DimensionAspect.cdl @@ -18,8 +18,9 @@ class DimensionAspect from Prs3d inherits BasicAspect from Prs3d - ---Purpose: defines the attributes when drawing a Length Presentation. -uses + ---Purpose: defines the attributes when drawing a Length Presentation. + +uses DimensionTextHorizontalPosition from Prs3d, DimensionTextVerticalPosition from Prs3d, DimensionArrowOrientation from Prs3d, @@ -31,7 +32,8 @@ uses Color from Quantity, TypeOfLine from Aspect, PlaneAngle from Quantity, - TypeOfLine from Aspect + TypeOfLine from Aspect, + AsciiString from TCollection is Create returns mutable DimensionAspect from Prs3d; @@ -64,8 +66,15 @@ is IsArrows3d(me) returns Boolean from Standard; --- Purpose: Gets type of arrows. - MakeArrows3d (me:mutable; isArrows3d: Boolean from Standard); - ---Purpose: Sets type of arrows. + MakeArrows3d (me : mutable; isArrows3d: Boolean from Standard); + ---Purpose: Sets type of arrows. + + IsUnitsDisplayed (me) returns Boolean from Standard; + ---Purpose: Shows if Units are to be displayed along with dimension value. + + MakeUnitsDisplayed (me : mutable; theIsDisplayed : Boolean from Standard); + ---Purpose: Specifies whether the units string should be displayed + -- along with value label or not. SetArrowOrientation(me: mutable; theArrowOrient: DimensionArrowOrientation from Prs3d); --- Purpose: Sets orientation of arrows (external or internal). @@ -95,15 +104,21 @@ is SetCommonColor(me:mutable; theColor: Color from Quantity) is static; ---Purpose: Sets the same color for all parts of dimension: lines, arrows and text. - SetExtensionSize (me : mutable; theSize : Real from Standard) is static; + SetExtensionSize (me : mutable; theSize : Real from Standard); ---Purpose: Sets extension size. ExtensionSize (me) returns Real from Standard; ---Purpose: Returns extension size. + SetValueStringFormat (me : mutable; theFormat : AsciiString from TCollection); + ---Purpose: Sets "sprintf"-syntax format for formatting dimension value labels. + + ValueStringFormat (me) returns AsciiString from TCollection; + ---Purpose: Returns format. + fields - myLineAspect: LineAspect from Prs3d; + myLineAspect : LineAspect from Prs3d; ---Purpose: Text style. The size for 3d (or 2d) text is also inside here. myTextAspect: TextAspect from Prs3d; @@ -129,4 +144,12 @@ fields ---Purpose: Size of arrow extensions. -- The length of arrow tails if arrows are located outside dimension line. + myValueStringFormat : AsciiString from TCollection; + ---Purpose: "sprintf"-syntax format for formatting dimension value labels. + -- Default is "%g". + + myToDisplayUnits : Boolean from Standard; + ---Purpose: Defines if the units need to be displayed. + -- Default is FALSE. + end DimensionAspect from Prs3d; diff --git a/src/Prs3d/Prs3d_DimensionAspect.cxx b/src/Prs3d/Prs3d_DimensionAspect.cxx index 69a79f6e99..7aa44f458d 100644 --- a/src/Prs3d/Prs3d_DimensionAspect.cxx +++ b/src/Prs3d/Prs3d_DimensionAspect.cxx @@ -50,7 +50,9 @@ Prs3d_DimensionAspect::Prs3d_DimensionAspect() myArrowAspect->SetColor (Quantity_NOC_LAWNGREEN); myArrowAspect->SetAngle (M_PI * 20.0 / 180.0); myArrowAspect->SetLength (6.0); - myExtensionSize = 6.0; + myExtensionSize = 6.0; + myValueStringFormat = "%g"; + myToDisplayUnits = Standard_False; } //======================================================================= @@ -58,7 +60,6 @@ Prs3d_DimensionAspect::Prs3d_DimensionAspect() //purpose : Sets the same color for all parts of dimension: // lines, arrows and text. //======================================================================= - void Prs3d_DimensionAspect::SetCommonColor (const Quantity_Color& theColor) { myLineAspect->SetColor (theColor); @@ -70,7 +71,6 @@ void Prs3d_DimensionAspect::SetCommonColor (const Quantity_Color& theColor) //function : LineAspect //purpose : //======================================================================= - Handle(Prs3d_LineAspect) Prs3d_DimensionAspect::LineAspect () const { return myLineAspect; @@ -80,7 +80,6 @@ Handle(Prs3d_LineAspect) Prs3d_DimensionAspect::LineAspect () const //function : SetLineAspect //purpose : //======================================================================= - void Prs3d_DimensionAspect::SetLineAspect(const Handle(Prs3d_LineAspect)& theAspect) { myLineAspect = theAspect; @@ -90,7 +89,6 @@ void Prs3d_DimensionAspect::SetLineAspect(const Handle(Prs3d_LineAspect)& theAsp //function : TextAspect //purpose : //======================================================================= - Handle(Prs3d_TextAspect) Prs3d_DimensionAspect::TextAspect () const { return myTextAspect; @@ -100,7 +98,6 @@ Handle(Prs3d_TextAspect) Prs3d_DimensionAspect::TextAspect () const //function : SetTextAspect //purpose : //======================================================================= - void Prs3d_DimensionAspect::SetTextAspect (const Handle(Prs3d_TextAspect)& theAspect) { myTextAspect = theAspect; @@ -110,12 +107,11 @@ void Prs3d_DimensionAspect::SetTextAspect (const Handle(Prs3d_TextAspect)& theAs //function : MakeArrows3D //purpose : //======================================================================= - void Prs3d_DimensionAspect::MakeArrows3d (const Standard_Boolean isArrows3d) { myIsArrows3d = isArrows3d; } - + //======================================================================= //function : IsArrows3D //purpose : @@ -129,12 +125,11 @@ Standard_Boolean Prs3d_DimensionAspect::IsArrows3d () const //function : MakeText3D //purpose : //======================================================================= - void Prs3d_DimensionAspect::MakeText3d (const Standard_Boolean isText3d) { myIsText3d = isText3d; } - + //======================================================================= //function : IsText3D //purpose : @@ -144,6 +139,24 @@ Standard_Boolean Prs3d_DimensionAspect::IsText3d () const return myIsText3d; } +//======================================================================= +//function : IsUnitsDisplayed +//purpose : +//======================================================================= +Standard_Boolean Prs3d_DimensionAspect::IsUnitsDisplayed () const +{ + return myToDisplayUnits; +} + +//======================================================================= +//function : MakeUnitsDisplayed +//purpose : +//======================================================================= +void Prs3d_DimensionAspect::MakeUnitsDisplayed (const Standard_Boolean theIsDisplayed) +{ + myToDisplayUnits = theIsDisplayed; +} + //======================================================================= //function : IsTextShaded //purpose : @@ -157,7 +170,6 @@ Standard_Boolean Prs3d_DimensionAspect::IsTextShaded () const //function : MakeTextShaded //purpose : //======================================================================= - void Prs3d_DimensionAspect::MakeTextShaded (const Standard_Boolean isTextShaded) { myIsTextShaded = isTextShaded; @@ -167,7 +179,6 @@ void Prs3d_DimensionAspect::MakeTextShaded (const Standard_Boolean isTextShaded) //function : SetArrowOrientation //purpose : //======================================================================= - void Prs3d_DimensionAspect::SetArrowOrientation (const Prs3d_DimensionArrowOrientation theArrowOrient) { myArrowOrientation = theArrowOrient; @@ -177,7 +188,6 @@ void Prs3d_DimensionAspect::SetArrowOrientation (const Prs3d_DimensionArrowOrien //function : GetArrowOrientation //purpose : //======================================================================= - Prs3d_DimensionArrowOrientation Prs3d_DimensionAspect::ArrowOrientation() const { return myArrowOrientation; @@ -187,7 +197,6 @@ Prs3d_DimensionArrowOrientation Prs3d_DimensionAspect::ArrowOrientation() const //function : SetTextVerticalPosition //purpose : //======================================================================= - void Prs3d_DimensionAspect::SetTextVerticalPosition (const Prs3d_DimensionTextVerticalPosition thePosition) { myTextVPosition = thePosition; @@ -197,7 +206,6 @@ void Prs3d_DimensionAspect::SetTextVerticalPosition (const Prs3d_DimensionTextVe //function : TextVerticalPosition //purpose : //======================================================================= - Prs3d_DimensionTextVerticalPosition Prs3d_DimensionAspect::TextVerticalPosition() const { return myTextVPosition; @@ -207,7 +215,6 @@ Prs3d_DimensionTextVerticalPosition Prs3d_DimensionAspect::TextVerticalPosition( //function : SetTextHorizontalPosition //purpose : //======================================================================= - void Prs3d_DimensionAspect::SetTextHorizontalPosition (const Prs3d_DimensionTextHorizontalPosition thePosition) { myTextHPosition = thePosition; @@ -217,7 +224,6 @@ void Prs3d_DimensionAspect::SetTextHorizontalPosition (const Prs3d_DimensionText //function : TextHorizontalPosition //purpose : //======================================================================= - Prs3d_DimensionTextHorizontalPosition Prs3d_DimensionAspect::TextHorizontalPosition() const { return myTextHPosition; @@ -227,7 +233,6 @@ Prs3d_DimensionTextHorizontalPosition Prs3d_DimensionAspect::TextHorizontalPosit //function : ArrowAspect //purpose : //======================================================================= - Handle(Prs3d_ArrowAspect) Prs3d_DimensionAspect::ArrowAspect () const { return myArrowAspect; @@ -237,7 +242,6 @@ Handle(Prs3d_ArrowAspect) Prs3d_DimensionAspect::ArrowAspect () const //function : SetArrowAspect //purpose : //======================================================================= - void Prs3d_DimensionAspect::SetArrowAspect (const Handle(Prs3d_ArrowAspect)& theAspect) { myArrowAspect = theAspect; @@ -247,7 +251,6 @@ void Prs3d_DimensionAspect::SetArrowAspect (const Handle(Prs3d_ArrowAspect)& the //function : SetExtensioSize //purpose : //======================================================================= - void Prs3d_DimensionAspect::SetExtensionSize (const Standard_Real theSize) { myExtensionSize = theSize; @@ -257,8 +260,25 @@ void Prs3d_DimensionAspect::SetExtensionSize (const Standard_Real theSize) //function : ExtensionSize //purpose : //======================================================================= - Standard_Real Prs3d_DimensionAspect::ExtensionSize() const { return myExtensionSize; } + +//======================================================================= +//function : SetValueStringFormat +//purpose : +//======================================================================= +void Prs3d_DimensionAspect::SetValueStringFormat (const TCollection_AsciiString& theFormat) +{ + myValueStringFormat = theFormat; +} + +//======================================================================= +//function : ValueStringFormat +//purpose : +//======================================================================= +TCollection_AsciiString Prs3d_DimensionAspect::ValueStringFormat() const +{ + return myValueStringFormat; +} diff --git a/src/Prs3d/Prs3d_DimensionUnits.cxx b/src/Prs3d/Prs3d_DimensionUnits.cxx new file mode 100644 index 0000000000..74824582de --- /dev/null +++ b/src/Prs3d/Prs3d_DimensionUnits.cxx @@ -0,0 +1,38 @@ +// Created on: 2013-11-11 +// Created by: Anastasia BORISOVA +// Copyright (c) 2013 OPEN CASCADE SAS +// +// The content of this file is subject to the Open CASCADE Technology Public +// License Version 6.5 (the "License"). You may not use the content of this file +// except in compliance with the License. Please obtain a copy of the License +// at http://www.opencascade.org and read it completely before using this file. +// +// The Initial Developer of the Original Code is Open CASCADE S.A.S., having its +// main offices at: 1, place des Freres Montgolfier, 78280 Guyancourt, France. +// +// The Original Code and all software distributed under the License is +// distributed on an "AS IS" basis, without warranty of any kind, and the +// Initial Developer hereby disclaims all such warranties, including without +// limitation, any warranties of merchantability, fitness for a particular +// purpose or non-infringement. Please see the License for the specific terms +// and conditions governing the rights and limitations under the License. + +#include + +//======================================================================= +//function : SetLengthUnits +//purpose : +//======================================================================= +void Prs3d_DimensionUnits::SetLengthUnits (const TCollection_AsciiString& theUnits) +{ + myLengthUnits = theUnits; +} + +//======================================================================= +//function : SetAngleUnits +//purpose : +//======================================================================= +void Prs3d_DimensionUnits::SetAngleUnits (const TCollection_AsciiString& theUnits) +{ + myAngleUnits = theUnits; +} diff --git a/src/Prs3d/Prs3d_DimensionUnits.hxx b/src/Prs3d/Prs3d_DimensionUnits.hxx new file mode 100644 index 0000000000..d8f04a310a --- /dev/null +++ b/src/Prs3d/Prs3d_DimensionUnits.hxx @@ -0,0 +1,61 @@ +// Created on: 2013-11-11 +// Created by: Anastasia BORISOVA +// Copyright (c) 2013 OPEN CASCADE SAS +// +// The content of this file is subject to the Open CASCADE Technology Public +// License Version 6.5 (the "License"). You may not use the content of this file +// except in compliance with the License. Please obtain a copy of the License +// at http://www.opencascade.org and read it completely before using this file. +// +// The Initial Developer of the Original Code is Open CASCADE S.A.S., having its +// main offices at: 1, place des Freres Montgolfier, 78280 Guyancourt, France. +// +// The Original Code and all software distributed under the License is +// distributed on an "AS IS" basis, without warranty of any kind, and the +// Initial Developer hereby disclaims all such warranties, including without +// limitation, any warranties of merchantability, fitness for a particular +// purpose or non-infringement. Please see the License for the specific terms +// and conditions governing the rights and limitations under the License. + +#ifndef _Prs3d_DimensionUnits_Header +#define _Prs3d_DimensionUnits_Header + +#include + +//! This class provides units for two dimension groups: +//! - lengthes (length, radius, diameter) +//! - angles +class Prs3d_DimensionUnits +{ +public: + + //! Default constructor. Sets meters as default length units + //! and radians as default angle units. + Prs3d_DimensionUnits() + : myLengthUnits ("m"), + myAngleUnits ("rad") + {} + + Prs3d_DimensionUnits (const Prs3d_DimensionUnits& theUnits) + : myLengthUnits (theUnits.GetLengthUnits()), + myAngleUnits (theUnits.GetAngleUnits()) + {} + + //! Sets angle units + Standard_EXPORT void SetAngleUnits (const TCollection_AsciiString& theUnits); + + //! @return angle units + const TCollection_AsciiString& GetAngleUnits() const { return myAngleUnits; } + + //! Sets length units + Standard_EXPORT void SetLengthUnits (const TCollection_AsciiString& theUnits); + + //! @return length units + const TCollection_AsciiString& GetLengthUnits() const { return myLengthUnits; } + +private: + + TCollection_AsciiString myLengthUnits; + TCollection_AsciiString myAngleUnits; +}; +#endif diff --git a/src/Prs3d/Prs3d_Drawer.cdl b/src/Prs3d/Prs3d_Drawer.cdl index 82cfeb369e..a170096d91 100755 --- a/src/Prs3d/Prs3d_Drawer.cdl +++ b/src/Prs3d/Prs3d_Drawer.cdl @@ -46,7 +46,10 @@ uses NameOfColor from Quantity, PlaneAngle from Quantity, Length from Quantity, - TypeOfHLR from Prs3d + TypeOfHLR from Prs3d, + DimensionUnits from Prs3d, + AsciiString from TCollection, + Ax2 from gp is Create returns mutable Drawer from Prs3d; @@ -472,27 +475,51 @@ is is virtual; ---Purpose: Sets the modality anAspect for the display of datums. - DimensionAspect(me:mutable) returns mutable DimensionAspect from Prs3d - ---Purpose: Returns settings for the appearance of dimensions. - is virtual; + DimensionAspect(me:mutable) returns mutable DimensionAspect from Prs3d is virtual; + ---Purpose: Returns settings for the appearance of dimensions. - SetDimensionAspect(me:mutable; theAspect: DimensionAspect from Prs3d) - is virtual; - ---Purpose: Sets the modality anAspect for display of dimensions. + SetDimensionAspect(me:mutable; theAspect: DimensionAspect from Prs3d) is virtual; + ---Purpose: Sets the settings for the appearance of dimensions. - SectionAspect (me:mutable) returns mutable LineAspect from Prs3d - ---Purpose: The LineAspect for the wire can be edited. - -- The default values are: - -- Color: Quantity_NOC_ORANGE - -- Type of line: Aspect_TOL_SOLID - -- Width: 1. - -- These attributes are used by the algorithm Prs3d_WFShape - is virtual; + SetDimLengthModelUnits (me: mutable; theUnits : AsciiString from TCollection) is virtual; + ---Purpose: Sets dimension length model units for computing of dimension presentation. + + SetDimAngleModelUnits (me: mutable; theUnits : AsciiString from TCollection) is virtual; + ---Purpose: Sets dimension angle model units for computing of dimension presentation. + + DimLengthModelUnits (me) returns AsciiString from TCollection is virtual; + ---Purpose: Returns length model units for the dimension presentation. + ---C++: return const & + + DimAngleModelUnits (me) returns AsciiString from TCollection is virtual; + ---Purpose: Returns angle model units for the dimension presentation. + ---C++: return const & + + SetDimLengthDisplayUnits (me: mutable; theUnits : AsciiString from TCollection) is virtual; + ---Purpose: Sets length units in which value for dimension presentation is displayed. + + SetDimAngleDisplayUnits (me: mutable; theUnits : AsciiString from TCollection) is virtual; + ---Purpose: Sets angle units in which value for dimension presentation is displayed. + + DimLengthDisplayUnits (me) returns AsciiString from TCollection is virtual; + ---Purpose: Returns length units in which dimension presentation is displayed. + ---C++: return const & + + DimAngleDisplayUnits (me) returns AsciiString from TCollection is virtual; + ---Purpose: Returns angle units in which dimension presentation is displayed. + ---C++: return const & + + SectionAspect (me : mutable) returns mutable LineAspect from Prs3d is virtual; + ---Purpose: The LineAspect for the wire can be edited. + -- The default values are: + -- Color: Quantity_NOC_ORANGE + -- Type of line: Aspect_TOL_SOLID + -- Width: 1. + -- These attributes are used by the algorithm Prs3d_WFShape. + + SetSectionAspect (me : mutable; theAspect: LineAspect from Prs3d) is virtual; + ---Purpose: Sets the parameter theAspect for display attributes of sections. - SetSectionAspect(me:mutable;anAspect: LineAspect from Prs3d) - is virtual; - ---Purpose: Sets the parameter anAspect for display attributes of sections. - SetFaceBoundaryDraw (me : mutable; theIsEnabled : Boolean from Standard) is virtual; @@ -515,43 +542,49 @@ is ---Purpose: Returns line aspect of face boundaries. fields - myUIsoAspect: IsoAspect from Prs3d is protected; - myVIsoAspect: IsoAspect from Prs3d is protected; - myNbPoints : Integer from Standard is protected; - myIsoOnPlane: Boolean from Standard is protected; - myFreeBoundaryAspect: LineAspect from Prs3d is protected; - myFreeBoundaryDraw: Boolean from Standard is protected; - myUnFreeBoundaryAspect: LineAspect from Prs3d is protected; - myUnFreeBoundaryDraw: Boolean from Standard is protected; - myWireAspect: LineAspect from Prs3d is protected; - myWireDraw: Boolean from Standard is protected; - myLineAspect: LineAspect from Prs3d is protected; - myTextAspect: TextAspect from Prs3d is protected; - myShadingAspect: ShadingAspect from Prs3d is protected; - myShadingAspectGlobal: Boolean from Standard is protected; - myChordialDeviation: Length from Quantity is protected; - myTypeOfDeflection: TypeOfDeflection from Aspect is protected; - myMaximalParameterValue: Real from Standard is protected; - - myDeviationCoefficient: Real from Standard is protected; - myHLRDeviationCoefficient: Real from Standard is protected; - myDeviationAngle: Real from Standard is protected; - myHLRAngle: Real from Standard is protected; - - myPointAspect: PointAspect from Prs3d is protected; - myPlaneAspect: PlaneAspect from Prs3d is protected; - myArrowAspect: ArrowAspect from Prs3d is protected; - myLineDrawArrow: Boolean from Standard is protected; - myDrawHiddenLine: Boolean from Standard is protected; - myHiddenLineAspect: LineAspect from Prs3d is protected; - mySeenLineAspect: LineAspect from Prs3d is protected; - myVectorAspect: LineAspect from Prs3d is protected; - myDatumAspect: DatumAspect from Prs3d is protected; - myDatumScale: Real from Standard is protected; - myDimensionAspect: DimensionAspect from Prs3d is protected; - mySectionAspect: LineAspect from Prs3d is protected; - myFaceBoundaryDraw : Boolean from Standard is protected; - myFaceBoundaryAspect : LineAspect from Prs3d is protected; - myTypeOfHLR : TypeOfHLR from Prs3d is protected; + myUIsoAspect: IsoAspect from Prs3d is protected; + myVIsoAspect: IsoAspect from Prs3d is protected; + myNbPoints : Integer from Standard is protected; + myIsoOnPlane: Boolean from Standard is protected; + myFreeBoundaryAspect: LineAspect from Prs3d is protected; + myFreeBoundaryDraw: Boolean from Standard is protected; + myUnFreeBoundaryAspect: LineAspect from Prs3d is protected; + myUnFreeBoundaryDraw: Boolean from Standard is protected; + myWireAspect: LineAspect from Prs3d is protected; + myWireDraw: Boolean from Standard is protected; + myLineAspect: LineAspect from Prs3d is protected; + myTextAspect: TextAspect from Prs3d is protected; + myShadingAspect: ShadingAspect from Prs3d is protected; + myShadingAspectGlobal: Boolean from Standard is protected; + myChordialDeviation: Length from Quantity is protected; + myTypeOfDeflection: TypeOfDeflection from Aspect is protected; + myMaximalParameterValue: Real from Standard is protected; + + myDeviationCoefficient: Real from Standard is protected; + myHLRDeviationCoefficient: Real from Standard is protected; + + myDeviationAngle: Real from Standard is protected; + myHLRAngle: Real from Standard is protected; + + myPointAspect: PointAspect from Prs3d is protected; + myPlaneAspect: PlaneAspect from Prs3d is protected; + myArrowAspect: ArrowAspect from Prs3d is protected; + myLineDrawArrow: Boolean from Standard is protected; + myDrawHiddenLine: Boolean from Standard is protected; + myHiddenLineAspect: LineAspect from Prs3d is protected; + mySeenLineAspect: LineAspect from Prs3d is protected; + myVectorAspect: LineAspect from Prs3d is protected; + myDatumAspect: DatumAspect from Prs3d is protected; + myDatumScale: Real from Standard is protected; + + myDimensionAspect : DimensionAspect from Prs3d is protected; + myDimensionModelUnits : DimensionUnits from Prs3d is protected; + myDimensionDisplayUnits : DimensionUnits from Prs3d is protected; + + mySectionAspect : LineAspect from Prs3d is protected; + myFaceBoundaryDraw : Boolean from Standard is protected; + myFaceBoundaryAspect : LineAspect from Prs3d is protected; + myTypeOfHLR : TypeOfHLR from Prs3d is protected; + end Drawer; diff --git a/src/Prs3d/Prs3d_Drawer.cxx b/src/Prs3d/Prs3d_Drawer.cxx index a8de0c4a68..b20e7e69cf 100755 --- a/src/Prs3d/Prs3d_Drawer.cxx +++ b/src/Prs3d/Prs3d_Drawer.cxx @@ -16,31 +16,37 @@ // purpose or non-infringement. Please see the License for the specific terms // and conditions governing the rights and limitations under the License. -#define BUC60488 //GG_10/10/99 Set correctly all fields - #include -Prs3d_Drawer::Prs3d_Drawer(): myNbPoints(30),myIsoOnPlane(Standard_False), - myFreeBoundaryDraw(Standard_True), - myUnFreeBoundaryDraw(Standard_True), - myWireDraw(Standard_True), -#ifdef BUC60488 - myShadingAspect( new Prs3d_ShadingAspect()), -#endif - myShadingAspectGlobal(Standard_True), - myChordialDeviation(0.0001), - myTypeOfDeflection(Aspect_TOD_RELATIVE), - myMaximalParameterValue(500000.), - myDeviationCoefficient(0.001), - myHLRDeviationCoefficient(0.02), - myDeviationAngle(12*M_PI/180), - myHLRAngle(20*M_PI/180), - myLineDrawArrow(Standard_False), - myDrawHiddenLine(Standard_False), - myFaceBoundaryDraw(Standard_False), - myTypeOfHLR(Prs3d_TOH_PolyAlgo) +// ======================================================================= +// function : Prs3d_Drawer +// purpose : +// ======================================================================= +Prs3d_Drawer::Prs3d_Drawer() +: myNbPoints (30), + myIsoOnPlane (Standard_False), + myFreeBoundaryDraw (Standard_True), + myUnFreeBoundaryDraw (Standard_True), + myWireDraw (Standard_True), + myShadingAspect (new Prs3d_ShadingAspect()), + myShadingAspectGlobal (Standard_True), + myChordialDeviation (0.0001), + myTypeOfDeflection (Aspect_TOD_RELATIVE), + myMaximalParameterValue (500000.), + myDeviationCoefficient (0.001), + myHLRDeviationCoefficient (0.02), + myDeviationAngle (12.0 * M_PI / 180.0), + myHLRAngle (20.0 * M_PI / 180.0), + myLineDrawArrow (Standard_False), + myDrawHiddenLine (Standard_False), + myFaceBoundaryDraw (Standard_False), + myTypeOfHLR (Prs3d_TOH_PolyAlgo) { -} + myDimensionModelUnits.SetLengthUnits ("m"); + myDimensionModelUnits.SetAngleUnits ("rad"); + myDimensionDisplayUnits.SetLengthUnits ("m"); + myDimensionDisplayUnits.SetAngleUnits ("deg"); +} void Prs3d_Drawer::SetTypeOfDeflection(const Aspect_TypeOfDeflection aTypeOfDeflection){ @@ -397,30 +403,122 @@ void Prs3d_Drawer::SetPlaneAspect ( const Handle(Prs3d_PlaneAspect)& anAspect) { myPlaneAspect = anAspect; } -Handle (Prs3d_DimensionAspect) Prs3d_Drawer::DimensionAspect () +// ======================================================================= +// function : DimensionAspect +// purpose : +// ======================================================================= +Handle(Prs3d_DimensionAspect) Prs3d_Drawer::DimensionAspect() { if (myDimensionAspect.IsNull()) + { myDimensionAspect = new Prs3d_DimensionAspect; + } return myDimensionAspect; } -void Prs3d_Drawer::SetDimensionAspect ( const Handle(Prs3d_DimensionAspect)& theAspect) +// ======================================================================= +// function : SetDimensionAspect +// purpose : +// ======================================================================= +void Prs3d_Drawer::SetDimensionAspect (const Handle(Prs3d_DimensionAspect)& theAspect) { - myDimensionAspect = theAspect; + myDimensionAspect = theAspect; } +// ======================================================================= +// function : SetDimLengthModelUnits +// purpose : +// ======================================================================= +void Prs3d_Drawer::SetDimLengthModelUnits (const TCollection_AsciiString& theUnits) +{ + myDimensionModelUnits.SetLengthUnits (theUnits); +} -Handle (Prs3d_LineAspect) Prs3d_Drawer::SectionAspect () { +// ======================================================================= +// function : SetDimAngleModelUnits +// purpose : +// ======================================================================= +void Prs3d_Drawer::SetDimAngleModelUnits (const TCollection_AsciiString& theUnits) +{ + myDimensionModelUnits.SetAngleUnits (theUnits); +} + +// ======================================================================= +// function : DimLengthModelUnits +// purpose : +// ======================================================================= +const TCollection_AsciiString& Prs3d_Drawer::DimLengthModelUnits() const +{ + return myDimensionModelUnits.GetLengthUnits(); +} + +// ======================================================================= +// function : DimAngleModelUnits +// purpose : +// ======================================================================= +const TCollection_AsciiString& Prs3d_Drawer::DimAngleModelUnits() const +{ + return myDimensionModelUnits.GetAngleUnits(); +} + +// ======================================================================= +// function : SetDimLengthDisplayUnits +// purpose : +// ======================================================================= +void Prs3d_Drawer::SetDimLengthDisplayUnits (const TCollection_AsciiString& theUnits) +{ + myDimensionDisplayUnits.SetLengthUnits (theUnits); +} + +// ======================================================================= +// function : SetDimAngleDisplayUnits +// purpose : +// ======================================================================= +void Prs3d_Drawer::SetDimAngleDisplayUnits (const TCollection_AsciiString& theUnits) +{ + myDimensionDisplayUnits.SetAngleUnits (theUnits); +} + +// ======================================================================= +// function : DimLengthDisplayUnits +// purpose : +// ======================================================================= +const TCollection_AsciiString& Prs3d_Drawer::DimLengthDisplayUnits() const +{ + return myDimensionDisplayUnits.GetLengthUnits(); +} + +// ======================================================================= +// function : DimAngleDisplayUnits +// purpose : +// ======================================================================= +const TCollection_AsciiString& Prs3d_Drawer::DimAngleDisplayUnits() const +{ + return myDimensionDisplayUnits.GetAngleUnits(); +} + +// ======================================================================= +// function : SectionAspect +// purpose : +// ======================================================================= +Handle (Prs3d_LineAspect) Prs3d_Drawer::SectionAspect() +{ if (mySectionAspect.IsNull()) - mySectionAspect = new Prs3d_LineAspect - (Quantity_NOC_ORANGE,Aspect_TOL_SOLID,1.); + { + mySectionAspect = new Prs3d_LineAspect (Quantity_NOC_ORANGE, Aspect_TOL_SOLID, 1.0); + } return mySectionAspect; } -void Prs3d_Drawer::SetSectionAspect ( const Handle(Prs3d_LineAspect)& anAspect) { - mySectionAspect = anAspect; +// ======================================================================= +// function : SetSectionAspect +// purpose : +// ======================================================================= +void Prs3d_Drawer::SetSectionAspect (const Handle(Prs3d_LineAspect)& theAspect) +{ + mySectionAspect = theAspect; } // ======================================================================= @@ -469,7 +567,6 @@ Handle_Prs3d_LineAspect Prs3d_Drawer::FaceBoundaryAspect () // function : SetTypeOfHLR // purpose : set type of HLR algorithm // ======================================================================= - void Prs3d_Drawer::SetTypeOfHLR ( const Prs3d_TypeOfHLR theTypeOfHLR) { myTypeOfHLR = theTypeOfHLR; @@ -479,7 +576,6 @@ void Prs3d_Drawer::SetTypeOfHLR ( const Prs3d_TypeOfHLR theTypeOfHLR) // function : TypeOfHLR // purpose : gets type of HLR algorithm // ======================================================================= - Prs3d_TypeOfHLR Prs3d_Drawer::TypeOfHLR ( ) const { return myTypeOfHLR; diff --git a/src/QABugs/QABugs_16.cxx b/src/QABugs/QABugs_16.cxx index 9a84cf4be7..51a6f1bd72 100755 --- a/src/QABugs/QABugs_16.cxx +++ b/src/QABugs/QABugs_16.cxx @@ -254,7 +254,7 @@ static Standard_Integer BUC60972 (Draw_Interpretor& di, Standard_Integer argc, c //di << ExtString_aText << " " << Draw::Atof(argv[4]) << "\n"; di << argv[5] << " " << Draw::Atof(argv[4]) << "\n"; - Handle(AIS_AngleDimension) aDim = new AIS_AngleDimension(aFirst, aSecond, aPlane->Pln()); + Handle(AIS_AngleDimension) aDim = new AIS_AngleDimension(aFirst, aSecond); aContext->Display(aDim); return 0; diff --git a/src/QABugs/QABugs_17.cxx b/src/QABugs/QABugs_17.cxx index 3d0eaee1ea..685eb9637a 100755 --- a/src/QABugs/QABugs_17.cxx +++ b/src/QABugs/QABugs_17.cxx @@ -292,15 +292,20 @@ static Standard_Integer BUC60818(Draw_Interpretor& di, Standard_Integer argc, c return 0; } -static Standard_Integer BUC60915_1(Draw_Interpretor& di, Standard_Integer argc, const char ** /*argv*/) +static Standard_Integer BUC60915_1(Draw_Interpretor& di, Standard_Integer argc, const char ** argv) { if (argc > 1) { di<<"Function don't has parameters"<<"\n"; return 1; } - Handle(AIS_InteractiveContext) context= ViewerTest_Tool::MakeContext ("buc60915"); - ViewerTest_Tool::InitViewerTest (context); + if(ViewerTest::GetAISContext().IsNull()) + { + di << "View was not created. Use 'vinit' command before " + << argv[0] << "\n"; + return 1; + } + Handle(AIS_InteractiveContext) context = ViewerTest::GetAISContext(); //The following dimesion code has problems regarding arrow_size. The desired effect is not produced. /***************************************/ @@ -325,20 +330,29 @@ static Standard_Integer BUC60915_1(Draw_Interpretor& di, Standard_Integer argc, gp_Pnt plnpt(0, 0, 0); gp_Dir plndir(0, 0, 1); Handle(Geom_Plane) pln = new Geom_Plane(plnpt,plndir); + Handle(Prs3d_DimensionAspect) anAspect = new Prs3d_DimensionAspect(); + anAspect->MakeArrows3d (Standard_True); + anAspect->ArrowAspect()->SetAngle (M_PI/180.0 * 10.0); /***************************************/ //dimension "L 502.51" /***************************************/ Handle(AIS_LengthDimension) len = new AIS_LengthDimension(V2, V3, pln->Pln()); + anAspect->ArrowAspect()->SetLength (30.0); + len->SetDimensionAspect (anAspect); context->Display(len); /***************************************/ //dimension "L 90" /***************************************/ - Handle(AIS_LengthDimension) len1 = new AIS_LengthDimension(V4, V7, pln->Pln()); + Handle(AIS_LengthDimension) len1 = new AIS_LengthDimension(V7, V4, pln->Pln()); + len1->SetDimensionAspect (anAspect); + len1->SetFlyout (30.0); + anAspect->ArrowAspect()->SetLength (100.0); context->Display(len1); /***************************************/ //dimension "L 150" /***************************************/ Handle(AIS_LengthDimension) len2 = new AIS_LengthDimension(V1, V2, pln->Pln()); + len2->SetDimensionAspect (anAspect); context->Display(len2); /***************************************/ //dimension "R 88.58" @@ -346,6 +360,7 @@ static Standard_Integer BUC60915_1(Draw_Interpretor& di, Standard_Integer argc, gp_Circ cir = gp_Circ(gp_Ax2(gp_Pnt(191.09, -88.58, 0), gp_Dir(0, 0, 1)), 88.58); TopoDS_Edge E1 = BRepBuilderAPI_MakeEdge(cir,gp_Pnt(191.09,0,0.),gp_Pnt(191.09,-177.16,0.) ); Handle(AIS_RadiusDimension) dim1 = new AIS_RadiusDimension(E1); + dim1->SetDimensionAspect (anAspect); context->Display(dim1); /***************************************/ //dimension "R 43.80" @@ -353,6 +368,8 @@ static Standard_Integer BUC60915_1(Draw_Interpretor& di, Standard_Integer argc, gp_Circ cir1 = gp_Circ(gp_Ax2(gp_Pnt(191.09, -88.58, 0), gp_Dir(0, 0, 1)), 43.80); TopoDS_Edge E_cir1 = BRepBuilderAPI_MakeEdge(cir1); dim1 = new AIS_RadiusDimension(E_cir1); + anAspect->ArrowAspect()->SetLength (60.0); + dim1->SetDimensionAspect (anAspect); context->Display(dim1); /***************************************/ //dimension "R 17.86" @@ -360,6 +377,8 @@ static Standard_Integer BUC60915_1(Draw_Interpretor& di, Standard_Integer argc, gp_Circ cir2 = gp_Circ(gp_Ax2(gp_Pnt(566.11, -88.58, 0), gp_Dir(0, 0, -1)), 17.86); TopoDS_Edge E_cir2 = BRepBuilderAPI_MakeEdge(cir2); dim1 = new AIS_RadiusDimension(E_cir2); + anAspect->ArrowAspect()->SetLength (40.0); + dim1->SetDimensionAspect (anAspect); context->Display(dim1); return 0; diff --git a/src/TPrsStd/TPrsStd_ConstraintTools.cxx b/src/TPrsStd/TPrsStd_ConstraintTools.cxx index 843afc3f98..d850d4020c 100755 --- a/src/TPrsStd/TPrsStd_ConstraintTools.cxx +++ b/src/TPrsStd/TPrsStd_ConstraintTools.cxx @@ -385,20 +385,20 @@ void TPrsStd_ConstraintTools::ComputeDistance (const Handle(TDataXtd_Constraint) if( SaveDrw ) ais->SetAttributes(aDrawer); } else { - if (isface) { - ais->SetFirstShape (GetFace(shape1)); - ais->SetSecondShape (GetFace(shape2)); + if (isface) + { + ais->SetMeasuredGeometry (GetFace(shape1), GetFace(shape2)); } - else { - ais->SetFirstShape (shape1); - ais->SetSecondShape (shape2); + else + { + ais->SetMeasuredShapes (shape1, shape2); } if (is2vertices) { //addition 3 gp_Pnt P1 = BRep_Tool::Pnt( TopoDS::Vertex(shape1) ); gp_Pnt P2 = BRep_Tool::Pnt( TopoDS::Vertex(shape2) ); gp_Pnt P3(P1.Y()-1., P2.X()+1., 0.); GC_MakePlane mkPlane(P1, P2, P3); - ais->SetWorkingPlane( mkPlane.Value()->Pln() ); + ais->SetCustomPlane( mkPlane.Value()->Pln() ); } ais->SetCustomValue (val1); @@ -406,7 +406,7 @@ void TPrsStd_ConstraintTools::ComputeDistance (const Handle(TDataXtd_Constraint) if (is_planar) { - ais->SetWorkingPlane (aplane->Pln()); + ais->SetCustomPlane (aplane->Pln()); } anAIS = ais; } @@ -772,7 +772,7 @@ void TPrsStd_ConstraintTools::ComputeAngleForOneFace (const Handle(TDataXtd_Cons ais = new AIS_AngleDimension (face); } else { - ais->SetFirstShape(TopoDS::Face( shape ), Standard_True); + ais->SetMeasuredGeometry(TopoDS::Face( shape )); } } else { @@ -1001,20 +1001,17 @@ void TPrsStd_ConstraintTools::ComputeAngle (const Handle(TDataXtd_Constraint)& a GetGoodShape(shape1); GetGoodShape(shape2); ais = new AIS_AngleDimension (TopoDS::Edge(shape1), - TopoDS::Edge(shape2), - ((Handle(Geom_Plane)&) ageom3)->Pln()); + TopoDS::Edge(shape2)); } } else { if (isCurvilinear) { ais = new AIS_AngleDimension (TopoDS::Face(shape1), - TopoDS::Face(shape2), - ((Handle(Geom_Line)&) ageom3)->Position()); + TopoDS::Face(shape2)); } else if (isface) { ais = new AIS_AngleDimension (TopoDS::Face(shape1), - TopoDS::Face(shape2), - ((Handle(Geom_Line)&) ageom3)->Position()); + TopoDS::Face(shape2)); } } } @@ -1024,15 +1021,14 @@ void TPrsStd_ConstraintTools::ComputeAngle (const Handle(TDataXtd_Constraint)& a GetGoodShape(shape1); GetGoodShape(shape2); } - ais->SetFirstShape(shape1); - ais->SetSecondShape(shape2); + ais->SetMeasuredGeometry (TopoDS::Face (shape1), TopoDS::Face (shape2)); if (isplan) - ais->SetWorkingPlane (((Handle(Geom_Plane)&) ageom3)->Pln()); + ais->SetCustomPlane (((Handle(Geom_Plane)&) ageom3)->Pln()); else if (!isCurvilinear) { gp_Pln aPlane; aPlane.SetAxis (((Handle(Geom_Line)&) ageom3)->Position()); - ais->SetWorkingPlane (aPlane); + ais->SetCustomPlane (aPlane); } } anAIS = ais; @@ -1165,7 +1161,7 @@ void TPrsStd_ConstraintTools::ComputeRadius (const Handle(TDataXtd_Constraint)& ais = new AIS_RadiusDimension (shape1); } else { - ais->SetFirstShape(shape1); + ais->SetMeasuredGeometry(shape1); } } else ais = new AIS_RadiusDimension (shape1); @@ -1181,7 +1177,7 @@ void TPrsStd_ConstraintTools::ComputeRadius (const Handle(TDataXtd_Constraint)& NullifyAIS(anAIS); return; } - ais->SetWorkingPlane(aplane->Pln()); + ais->SetCustomPlane(aplane->Pln()); } anAIS = ais; } @@ -1626,7 +1622,7 @@ void TPrsStd_ConstraintTools::ComputeDiameter(const Handle(TDataXtd_Constraint)& ais = new AIS_DiameterDimension (shape1); } else { - ais->SetFirstShape(shape1); + ais->SetMeasuredGeometry(shape1); } } else ais = new AIS_DiameterDimension (shape1); @@ -1642,7 +1638,7 @@ void TPrsStd_ConstraintTools::ComputeDiameter(const Handle(TDataXtd_Constraint)& NullifyAIS(anAIS); return; } - //ais->SetWorkingPlane(aplane); + //ais->SetCustomPlane(aplane); } anAIS = ais; } @@ -1780,13 +1776,12 @@ void TPrsStd_ConstraintTools::ComputeOffset (const Handle(TDataXtd_Constraint)& } else { - ais->SetFirstShape(S1); - ais->SetSecondShape(S2); + ais->SetMeasuredShapes (S1, S2); ais->SetCustomValue(val1); } if (is_planar) - ais->SetWorkingPlane (aplane->Pln()); + ais->SetCustomPlane (aplane->Pln()); anAIS = ais; return; } @@ -1818,11 +1813,10 @@ void TPrsStd_ConstraintTools::ComputeOffset (const Handle(TDataXtd_Constraint)& ais = new AIS_LengthDimension (S1,S2,aplane->Pln()); } else { - ais->SetFirstShape(S1); - ais->SetSecondShape(S2); + ais->SetMeasuredShapes (S1, S2); ais->SetCustomValue(val1); - ais->SetWorkingPlane (aplane->Pln()); + ais->SetCustomPlane (aplane->Pln()); } anAIS = ais; return; @@ -1891,10 +1885,9 @@ void TPrsStd_ConstraintTools::ComputeOffset (const Handle(TDataXtd_Constraint)& ais = new AIS_LengthDimension (S1,S2,aplane->Pln()); } else { - ais->SetFirstShape (S1); - ais->SetSecondShape (S2); + ais->SetMeasuredShapes (S1, S2); ais->SetCustomValue (val1); - ais->SetWorkingPlane (aplane->Pln ()); + ais->SetCustomPlane (aplane->Pln ()); } anAIS = ais; return; @@ -2150,7 +2143,7 @@ void TPrsStd_ConstraintTools::ComputeRound(const Handle(TDataXtd_Constraint)& aC ais = new AIS_RadiusDimension(shape1); } else { - ais->SetFirstShape(shape1); + ais->SetMeasuredGeometry(shape1); } } } diff --git a/src/ViewerTest/ViewerTest_RelationCommands.cxx b/src/ViewerTest/ViewerTest_RelationCommands.cxx index 8b470704ff..7c445b6f51 100755 --- a/src/ViewerTest/ViewerTest_RelationCommands.cxx +++ b/src/ViewerTest/ViewerTest_RelationCommands.cxx @@ -616,7 +616,7 @@ static int VAngleDimBuilder(Draw_Interpretor& di, Standard_Integer argc, const c TheAISContext()->CloseLocalContext(myCurrentIndex); // Construction de l'AIS dimension - Handle (AIS_AngleDimension) myAISDim= new AIS_AngleDimension (TopoDS::Edge(ShapeA) ,TopoDS::Edge(ShapeB) ,theGeomPlane->Pln()); + Handle (AIS_AngleDimension) myAISDim= new AIS_AngleDimension (TopoDS::Edge(ShapeA) ,TopoDS::Edge(ShapeB)); GetMapOfAIS().Bind (myAISDim,argv[1]); TheAISContext()->Display(myAISDim ); @@ -1534,10 +1534,10 @@ static int VLenghtDimension(Draw_Interpretor& di, Standard_Integer argc, const c TopoDS_Vertex Va,Vc; TopExp::Vertices(EdFromA,Va,Vc); gp_Pnt A=BRep_Tool::Pnt(Va); + #ifdef DEB - gp_Pnt C= + gp_Pnt C = BRep_Tool::Pnt(Vc); #endif - BRep_Tool::Pnt(Vc); // On projette le point B sur la Face car il // n'existe pas de constructeurs AIS_LD PointFace