OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-29 14:00:49 +03:00
Code Activity

0024425: Improve usage ergonomics of new dimension presentations

Browse Source 
- 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.
This commit is contained in:
aba
2013-12-11 19:16:07 +04:00
committed by abv
parent e04db19958
commit 60bf98ae02
44 changed files with 5023 additions and 3212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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
{

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

@@ -9,6 +9,7 @@
#include "LengthParamsEdgesPage.h"
#include "AngleParamsVerticesPage.h"
#include "RadiusParamsPage.h"
#include "ParamsFacesPage.h"
#include <Standard_Macro.hxx>
#include <AIS_InteractiveContext.hxx>
#include <TColStd_ListIteratorOfListOfInteger.hxx>
@@ -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();
}

1
samples/mfc/standard/Common/DimensionDlg.h
View File

@@ -76,4 +76,5 @@ public:
afx_msg void OnBnClicked2dText();
afx_msg void OnBnClicked3dText();
afx_msg void OnBnClickedDimensionColor();
afx_msg void OnClose();
};

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

@@ -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());
}

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

@@ -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());

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

@@ -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 ());
}

120
samples/mfc/standard/Common/ParamsFacesPage.cpp Normal file
View File

@@ -0,0 +1,120 @@
// ParamsFacesPage.cpp : implementation file
//
#include "stdafx.h"
#include "ParamsFacesPage.h"
#include "DimensionDlg.h"
#include <AIS_InteractiveContext.hxx>
#include <AIS_LocalContext.hxx>
#include <AIS_LengthDimension.hxx>
#include <AIS_AngleDimension.hxx>
// 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);
}

31
samples/mfc/standard/Common/ParamsFacesPage.h Normal file
View File

@@ -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();
};

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

@@ -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());
}

7
samples/mfc/standard/Common/res/OCC_Resource.h
View File

@@ -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

18
samples/mfc/standard/Common/res/OCC_Resource.rc
View File

@@ -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

2
samples/mfc/standard/mfcsample/adm/win/vc10/mfcsample.vcxproj
View File

@@ -296,6 +296,7 @@
<ClCompile Include="..\..\..\..\Common\LengthParamsEdgesPage.cpp" />
<ClCompile Include="..\..\..\..\Common\LengthParamsVerticesPage.cpp" />
<ClCompile Include="..\..\..\..\Common\RadiusParamsPage.cpp" />
<ClCompile Include="..\..\..\..\Common\ParamsFacesPage.cpp" />
<ClCompile Include="..\..\..\src\mfcsample.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -739,6 +740,7 @@
<ClInclude Include="..\..\..\..\Common\OCC_BaseView.h" />
<ClInclude Include="..\..\..\..\Common\OCC_MainFrame.h" />
<ClInclude Include="..\..\..\..\Common\RadiusParamsPage.h" />
<ClInclude Include="..\..\..\..\Common\ParamsFacesPage.h" />
<ClInclude Include="..\..\..\..\Common\res\OCC_Resource.h" />
<ClInclude Include="..\..\..\..\Common\ResultDialog.h" />
<ClInclude Include="..\..\..\..\Common\ImportExport\SaveCSFDBDlg.h" />

6
samples/mfc/standard/mfcsample/adm/win/vc10/mfcsample.vcxproj.filters
View File

@@ -138,6 +138,9 @@
<ClCompile Include="..\..\..\..\Common\RadiusParamsPage.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\Common\ParamsFacesPage.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\..\..\Common\res\OCC_Resource.rc">
@@ -247,6 +250,9 @@
<ClInclude Include="..\..\..\..\Common\RadiusParamsPage.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\Common\ParamsFacesPage.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\..\Common\res\2dChildFrameTB.bmp">

2
samples/mfc/standard/mfcsample/adm/win/vc11/mfcsample.vcxproj
View File

@@ -300,6 +300,7 @@
<ClCompile Include="..\..\..\..\Common\LengthParamsEdgesPage.cpp" />
<ClCompile Include="..\..\..\..\Common\LengthParamsVerticesPage.cpp" />
<ClCompile Include="..\..\..\..\Common\RadiusParamsPage.cpp" />
<ClCompile Include="..\..\..\..\Common\ParamsFacesPage.cpp" />
<ClCompile Include="..\..\..\src\mfcsample.cpp">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Disabled</Optimization>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -743,6 +744,7 @@
<ClInclude Include="..\..\..\..\Common\OCC_BaseView.h" />
<ClInclude Include="..\..\..\..\Common\OCC_MainFrame.h" />
<ClInclude Include="..\..\..\..\Common\RadiusParamsPage.h" />
<ClInclude Include="..\..\..\..\Common\ParamsFacesPage.h" />
<ClInclude Include="..\..\..\..\Common\res\OCC_Resource.h" />
<ClInclude Include="..\..\..\..\Common\ResultDialog.h" />
<ClInclude Include="..\..\..\..\Common\ImportExport\SaveCSFDBDlg.h" />

6
samples/mfc/standard/mfcsample/adm/win/vc11/mfcsample.vcxproj.filters
View File

@@ -138,6 +138,9 @@
<ClCompile Include="..\..\..\..\Common\RadiusParamsPage.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\Common\ParamsFacesPage.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\..\..\Common\res\OCC_Resource.rc">
@@ -247,6 +250,9 @@
<ClInclude Include="..\..\..\..\Common\RadiusParamsPage.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\Common\ParamsFacesPage.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\..\Common\res\2dChildFrameTB.bmp">

8
samples/mfc/standard/mfcsample/adm/win/vc8/mfcsample.vcproj
View File

@@ -1172,6 +1172,10 @@
RelativePath="..\..\..\..\Common\RadiusParamsPage.cpp"
>
</File>
<File
RelativePath="..\..\..\..\Common\ParamsFacesPage.cpp"
>
</File>
<File
RelativePath="..\..\..\..\Common\ResultDialog.cpp"
>
@@ -1839,6 +1843,10 @@
RelativePath="..\..\..\..\Common\RadiusParamsPage.h"
>
</File>
<File
RelativePath="..\..\..\..\Common\ParamsFacesPage.h"
>
</File>
<File
RelativePath="..\..\..\..\Common\ResultDialog.h"
>

8
samples/mfc/standard/mfcsample/adm/win/vc9/mfcsample.vcproj
View File

@@ -465,6 +465,10 @@
RelativePath="..\..\..\..\Common\AngleParamsVerticesPage.cpp"
>
</File>
<File
RelativePath="..\..\..\..\Common\ParamsFacesPage.cpp"
>
</File>
<File
RelativePath="..\..\..\..\Common\DimensionDlg.cpp"
>
@@ -1772,6 +1776,10 @@
RelativePath="..\..\..\..\Common\LengthParamsEdgePage.h"
>
</File>
<File
RelativePath="..\..\..\..\Common\ParamsFacesPage.h"
>
</File>
<File
RelativePath="..\..\..\..\Common\LengthParamsEdgesPage.h"
>