OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-05 18:16:23 +03:00
Code Packages Releases Activity

0023831: Ghosts appears in 2D viewer of HLR MFC sample

Browse Source 
2d view updating was corrected. ISession2D_Shape drawing was corrected.
Style changes
This commit is contained in:
aba 2013-03-29 17:39:13 +04:00 committed by bugmaster
parent 2c896b8f8a
commit 973191093d
3 changed files with 191 additions and 190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

279
samples/mfc/standard/08_HLR/src/SelectionDialog.cpp Executable file → Normal file
View File

@ -23,67 +23,67 @@ static char THIS_FILE[] = __FILE__;
// CSelectionDialog dialog // CSelectionDialog dialog
CSelectionDialog::CSelectionDialog(CHLRDoc* aDoc,CWnd* pParent /*=NULL*/) CSelectionDialog::CSelectionDialog(CHLRDoc* aDoc,CWnd* pParent /*=NULL*/)
: CDialog(CSelectionDialog::IDD, pParent) : CDialog(CSelectionDialog::IDD, pParent)
{ {
myDoc = aDoc; myDoc = aDoc;
myDisplay = false; myDisplay = false;
//{{AFX_DATA_INIT(CSelectionDialog) //{{AFX_DATA_INIT(CSelectionDialog)
m_Algo = 0; m_Algo = 0;
m_DisplayMode = 0; m_DisplayMode = 0;
m_NbIsos = 2; m_NbIsos = 2;
m_DrawHiddenLine = TRUE; m_DrawHiddenLine = TRUE;
m_HlrModeIsOn = FALSE; m_DegeneratedModeOn = TRUE;
//}}AFX_DATA_INIT //}}AFX_DATA_INIT
} }
void CSelectionDialog::DoDataExchange(CDataExchange* pDX) void CSelectionDialog::DoDataExchange(CDataExchange* pDX)
{ {
CDialog::DoDataExchange(pDX); CDialog::DoDataExchange(pDX);
//{{AFX_DATA_MAP(CSelectionDialog) //{{AFX_DATA_MAP(CSelectionDialog)
DDX_Radio(pDX, IDC_PolyAlgo, m_Algo); DDX_Radio(pDX, IDC_PolyAlgo, m_Algo);
DDX_Radio(pDX, IDC_DisplayDefault, m_DisplayMode); DDX_Radio(pDX, IDC_DisplayDefault, m_DisplayMode);
DDX_Text(pDX, IDC_EDIT_NBIsos, m_NbIsos); DDX_Text(pDX, IDC_EDIT_NBIsos, m_NbIsos);
DDX_Check(pDX, IDC_DrawHiddenLine, m_DrawHiddenLine); DDX_Check(pDX, IDC_DrawHiddenLine, m_DrawHiddenLine);
DDX_Check(pDX, IDC_HlrModeIsOn, m_HlrModeIsOn); DDX_Check(pDX, IDC_DegeneratedMode, m_DegeneratedModeOn);
//}}AFX_DATA_MAP //}}AFX_DATA_MAP
} }
BEGIN_MESSAGE_MAP(CSelectionDialog, CDialog) BEGIN_MESSAGE_MAP(CSelectionDialog, CDialog)
//{{AFX_MSG_MAP(CSelectionDialog) //{{AFX_MSG_MAP(CSelectionDialog)
ON_BN_CLICKED(ID_GetShape, OnGetShape) ON_BN_CLICKED(ID_GetShape, OnGetShape)
ON_BN_CLICKED(IDC_DisplayDefault, OnDisplayDefault) ON_BN_CLICKED(IDC_DisplayDefault, OnDisplayDefault)
ON_BN_CLICKED(IDC_VIsoParametrics, OnVIsoParametrics) ON_BN_CLICKED(IDC_VIsoParametrics, OnVIsoParametrics)
ON_BN_CLICKED(IDC_VApparentContour, OnVApparentContour) ON_BN_CLICKED(IDC_VApparentContour, OnVApparentContour)
ON_BN_CLICKED(IDC_VSewingEdges, OnVSewingEdges) ON_BN_CLICKED(IDC_VSewingEdges, OnVSewingEdges)
ON_BN_CLICKED(IDC_VsharpEdges, OnVsharpEdges) ON_BN_CLICKED(IDC_VsharpEdges, OnVsharpEdges)
ON_BN_CLICKED(IDC_VsmoothEdges, OnVsmoothEdges) ON_BN_CLICKED(IDC_VsmoothEdges, OnVsmoothEdges)
ON_BN_CLICKED(IDC_HsharpEdges, OnHsharpEdges) ON_BN_CLICKED(IDC_HsharpEdges, OnHsharpEdges)
ON_BN_CLICKED(IDC_HsmoothEdges, OnHsmoothEdges) ON_BN_CLICKED(IDC_HsmoothEdges, OnHsmoothEdges)
ON_BN_CLICKED(IDC_HSewingEdges, OnHSewingEdges) ON_BN_CLICKED(IDC_HSewingEdges, OnHSewingEdges)
ON_BN_CLICKED(IDC_HIsoParametrics, OnHIsoParametrics) ON_BN_CLICKED(IDC_HIsoParametrics, OnHIsoParametrics)
ON_BN_CLICKED(IDC_HApparentContour, OnHApparentContour) ON_BN_CLICKED(IDC_HApparentContour, OnHApparentContour)
ON_EN_CHANGE(IDC_EDIT_NBIsos, OnChangeEDITNBIsos) ON_EN_CHANGE(IDC_EDIT_NBIsos, OnChangeEDITNBIsos)
ON_BN_CLICKED(IDC_Algo, OnAlgo) ON_BN_CLICKED(IDC_Algo, OnAlgo)
ON_BN_CLICKED(IDC_PolyAlgo, OnPolyAlgo) ON_BN_CLICKED(IDC_PolyAlgo, OnPolyAlgo)
ON_BN_CLICKED(ID_Update2D, OnUpdate2D) ON_BN_CLICKED(ID_Update2D, OnUpdate2D)
ON_BN_CLICKED(IDC_TopView, OnTopView) ON_BN_CLICKED(IDC_TopView, OnTopView)
ON_BN_CLICKED(IDC_BottomView, OnBottomView) ON_BN_CLICKED(IDC_BottomView, OnBottomView)
ON_BN_CLICKED(IDC_LeftView, OnLeftView) ON_BN_CLICKED(IDC_LeftView, OnLeftView)
ON_BN_CLICKED(IDC_RightView, OnRightView) ON_BN_CLICKED(IDC_RightView, OnRightView)
ON_BN_CLICKED(IDC_FrontView, OnFrontView) ON_BN_CLICKED(IDC_FrontView, OnFrontView)
ON_BN_CLICKED(IDC_BackView, OnBackView) ON_BN_CLICKED(IDC_BackView, OnBackView)
ON_BN_CLICKED(IDC_AxoView, OnAxoView) ON_BN_CLICKED(IDC_AxoView, OnAxoView)
ON_WM_LBUTTONDOWN() ON_WM_LBUTTONDOWN()
ON_WM_LBUTTONUP() ON_WM_LBUTTONUP()
ON_WM_RBUTTONDOWN() ON_WM_RBUTTONDOWN()
ON_WM_RBUTTONUP() ON_WM_RBUTTONUP()
ON_WM_MOUSEMOVE() ON_WM_MOUSEMOVE()
ON_BN_CLICKED(IDC_DrawHiddenLine, OnDrawHiddenLine) ON_BN_CLICKED(IDC_DrawHiddenLine, OnDrawHiddenLine)
ON_BN_CLICKED(IDC_HlrModeIsOn, OnHlrMode) ON_BN_CLICKED(IDC_DegeneratedMode, OnDegeneratedMode)
ON_WM_DRAWITEM() ON_WM_DRAWITEM()
ON_WM_PAINT() ON_WM_PAINT()
//}}AFX_MSG_MAP //}}AFX_MSG_MAP
END_MESSAGE_MAP() END_MESSAGE_MAP()
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
@ -91,39 +91,39 @@ END_MESSAGE_MAP()
BOOL CSelectionDialog::OnInitDialog() BOOL CSelectionDialog::OnInitDialog()
{ {
CDialog::OnInitDialog(); CDialog::OnInitDialog();
VERIFY(TopView.AutoLoad(IDC_TopView, this)); VERIFY(TopView.AutoLoad(IDC_TopView, this));
VERIFY(BottomView.AutoLoad(IDC_BottomView, this)) ; VERIFY(BottomView.AutoLoad(IDC_BottomView, this)) ;
VERIFY(LeftView .AutoLoad(IDC_LeftView , this)) ; VERIFY(LeftView .AutoLoad(IDC_LeftView , this)) ;
VERIFY(RightView .AutoLoad(IDC_RightView , this)) ; VERIFY(RightView .AutoLoad(IDC_RightView , this)) ;
VERIFY(FrontView .AutoLoad(IDC_FrontView , this)) ; VERIFY(FrontView .AutoLoad(IDC_FrontView , this)) ;
VERIFY(BackView .AutoLoad(IDC_BackView , this)) ; VERIFY(BackView .AutoLoad(IDC_BackView , this)) ;
VERIFY(AxoView .AutoLoad(IDC_AxoView , this)) ; VERIFY(AxoView .AutoLoad(IDC_AxoView , this)) ;
// get the View Window position to managed mouse move // get the View Window position to managed mouse move
CRect BoxRect,ViewRect; CRect BoxRect,ViewRect;
GetWindowRect(BoxRect); GetWindowRect(BoxRect);
CWnd * TheViewerWindow = GetDlgItem(IDC_DUMMYBUTTON); CWnd * TheViewerWindow = GetDlgItem(IDC_DUMMYBUTTON);
TheViewerWindow->GetWindowRect(ViewRect); TheViewerWindow->GetWindowRect(ViewRect);
myPosMinX = ViewRect.TopLeft().x - BoxRect.TopLeft().x; myPosMinX = ViewRect.TopLeft().x - BoxRect.TopLeft().x;
myPosMaxX = ViewRect.Width()+myPosMinX; myPosMaxX = ViewRect.Width()+myPosMinX;
myPosMinY = ViewRect.TopLeft().y - BoxRect.TopLeft().y; myPosMinY = ViewRect.TopLeft().y - BoxRect.TopLeft().y;
myPosMaxY = myPosMinY + ViewRect.Height(); myPosMaxY = myPosMinY + ViewRect.Height();
ShowHideButton(Standard_False); ShowHideButton(Standard_False);
OnDisplay(true); OnDisplay(true);
return TRUE; // return TRUE unless you set the focus to a control return TRUE; // return TRUE unless you set the focus to a control
// EXCEPTION: OCX Property Pages should return FALSE // EXCEPTION: OCX Property Pages should return FALSE
} }
void CSelectionDialog::OnDisplay(bool isFit) void CSelectionDialog::OnDisplay(bool isFit)
{ {
GetDlgItem(IDC_DUMMYBUTTON)->SetRedraw(true); GetDlgItem(IDC_DUMMYBUTTON)->SetRedraw(true);
if (!myDisplay) if(!myDisplay) {
{ Handle(Graphic3d_GraphicDriver) aGraphicDriver =
Handle(Graphic3d_GraphicDriver) aGraphicDriver = ((CHLRApp*)AfxGetApp())->GetGraphicDriver(); ((CHLRApp*)AfxGetApp())->GetGraphicDriver();
myActiveViewer = new V3d_Viewer(aGraphicDriver,(short *) "Visu3D"); myActiveViewer = new V3d_Viewer(aGraphicDriver,(short *) "Visu3D");
myActiveViewer->SetDefaultLights(); myActiveViewer->SetDefaultLights();
@ -142,15 +142,14 @@ void CSelectionDialog::OnDisplay(bool isFit)
myTrihedron=new AIS_Trihedron(aTrihedronAxis); myTrihedron=new AIS_Trihedron(aTrihedronAxis);
myInteractiveContext->Display(myTrihedron); myInteractiveContext->Display(myTrihedron);
} }
if (isFit) if(isFit) {
{ myActiveView->ZFitAll();
myActiveView->ZFitAll(); myActiveView->FitAll();
myActiveView->FitAll(); }
} myActiveView->Redraw();
myActiveView->Redraw(); myDisplay = Standard_True;
myDisplay = Standard_True; GetDlgItem(IDC_DUMMYBUTTON)->SetRedraw(false);
GetDlgItem(IDC_DUMMYBUTTON)->SetRedraw(false);
} }
@ -162,7 +161,7 @@ void CSelectionDialog::SetTitle(CString & aTitle)
void CSelectionDialog::OnGetShape() void CSelectionDialog::OnGetShape()
{ {
UpdateData(true); UpdateData(true);
myDoc->GetInteractiveContext2D()->EraseAll(); myDoc->GetInteractiveContext2D()->RemoveAll();
myDisplayableShape = new ISession2D_Shape( ); myDisplayableShape = new ISession2D_Shape( );
UpdateProjector(); UpdateProjector();
myDisplayableShape->SetNbIsos(m_NbIsos); myDisplayableShape->SetNbIsos(m_NbIsos);
@ -182,9 +181,9 @@ void CSelectionDialog::OnGetShape()
OneOrMoreFound = Standard_True; OneOrMoreFound = Standard_True;
TopoDS_Shape aShape = anAISShape->Shape(); TopoDS_Shape aShape = anAISShape->Shape();
myDisplayableShape->Add( aShape ); myDisplayableShape->Add( aShape );
myInteractiveContext->Display(anAISShape); myInteractiveContext->Display(anAISShape);
} }
} }
Standard_Integer DisplayMode = m_DisplayMode; Standard_Integer DisplayMode = m_DisplayMode;
if (m_Algo == 1) DisplayMode+=100; if (m_Algo == 1) DisplayMode+=100;
@ -193,11 +192,10 @@ void CSelectionDialog::OnGetShape()
myDoc->GetInteractiveContext2D()->Display(myDisplayableShape, // object myDoc->GetInteractiveContext2D()->Display(myDisplayableShape, // object
DisplayMode, // display mode DisplayMode, // display mode
DisplayMode, // selection mode DisplayMode, // selection mode
Standard_True); // Redraw Standard_True); // Redraw
myDoc->FitAll2DViews(Standard_False); // Update Viewer myDoc->FitAll2DViews(Standard_False); // Update Viewer
// check the selection : // check the selection :
// if no object : disable all possiblity!! // if no object : disable all possiblity!!
ShowHideButton(OneOrMoreFound); ShowHideButton(OneOrMoreFound);
@ -207,7 +205,7 @@ void CSelectionDialog::OnGetShape()
void CSelectionDialog::Apply() void CSelectionDialog::Apply()
{ {
SetCursor(AfxGetApp()->LoadStandardCursor(IDC_WAIT)); SetCursor(AfxGetApp()->LoadStandardCursor(IDC_WAIT));
myDoc->GetInteractiveContext2D()->EraseAll(/*Standard_False*/); myDoc->GetInteractiveContext2D()->RemoveAll();
UpdateData(true); UpdateData(true);
Standard_Integer DisplayMode = m_DisplayMode; Standard_Integer DisplayMode = m_DisplayMode;
@ -225,64 +223,64 @@ void CSelectionDialog::Apply()
void CSelectionDialog::UpdateProjector() void CSelectionDialog::UpdateProjector()
{ {
V3d_Coordinate DX,DY,DZ,XAt,YAt,ZAt, Vx,Vy,Vz ; V3d_Coordinate DX,DY,DZ,XAt,YAt,ZAt, Vx,Vy,Vz ;
myActiveView->Proj(DX,DY,DZ); myActiveView->Proj(DX,DY,DZ);
myActiveView->At(XAt,YAt,ZAt); myActiveView->At(XAt,YAt,ZAt);
myActiveView->Up( Vx,Vy,Vz ); myActiveView->Up( Vx,Vy,Vz );
OnDisplay(false); OnDisplay(false);
Standard_Boolean IsPerspective = (myActiveView->Type() == V3d_PERSPECTIVE); Standard_Boolean IsPerspective = (myActiveView->Type() == V3d_PERSPECTIVE);
Quantity_Length aFocus = 1; Quantity_Length aFocus = 1;
Prs3d_Projector aPrs3dProjector(IsPerspective,aFocus,DX,DY,DZ,XAt,YAt,ZAt,Vx,Vy,Vz); Prs3d_Projector aPrs3dProjector(IsPerspective,aFocus,DX,DY,DZ,XAt,YAt,ZAt,Vx,Vy,Vz);
HLRAlgo_Projector aProjector = aPrs3dProjector.Projector(); HLRAlgo_Projector aProjector = aPrs3dProjector.Projector();
if (myDisplayableShape.IsNull()) return; if (myDisplayableShape.IsNull()) return;
myDisplayableShape->SetProjector(aProjector); myDisplayableShape->SetProjector(aProjector);
} }
void CSelectionDialog::ShowHideButton(Standard_Boolean EnableButton) void CSelectionDialog::ShowHideButton(Standard_Boolean EnableButton)
{ {
UpdateData(true); UpdateData(true);
GetDlgItem(ID_Update2D )->EnableWindow(EnableButton); GetDlgItem(ID_Update2D )->EnableWindow(EnableButton);
GetDlgItem(IDC_DisplayDefault )->EnableWindow(EnableButton); GetDlgItem(IDC_DisplayDefault )->EnableWindow(EnableButton);
GetDlgItem(IDC_PolyAlgo )->EnableWindow(EnableButton); GetDlgItem(IDC_PolyAlgo )->EnableWindow(EnableButton);
GetDlgItem(IDC_Algo )->EnableWindow(EnableButton); GetDlgItem(IDC_Algo )->EnableWindow(EnableButton);
GetDlgItem(IDC_VsharpEdges )->EnableWindow(EnableButton); GetDlgItem(IDC_VsharpEdges )->EnableWindow(EnableButton);
GetDlgItem(IDC_VsmoothEdges )->EnableWindow(EnableButton); GetDlgItem(IDC_VsmoothEdges )->EnableWindow(EnableButton);
GetDlgItem(IDC_VSewingEdges )->EnableWindow(EnableButton); GetDlgItem(IDC_VSewingEdges )->EnableWindow(EnableButton);
GetDlgItem(IDC_VApparentContour )->EnableWindow(EnableButton); GetDlgItem(IDC_VApparentContour )->EnableWindow(EnableButton);
GetDlgItem(IDC_VIsoParametrics )->EnableWindow(EnableButton); GetDlgItem(IDC_VIsoParametrics )->EnableWindow(EnableButton);
GetDlgItem(IDC_DrawHiddenLine )->EnableWindow(EnableButton); GetDlgItem(IDC_DrawHiddenLine )->EnableWindow(EnableButton);
GetDlgItem(IDC_HsmoothEdges )->EnableWindow(EnableButton && m_DrawHiddenLine); GetDlgItem(IDC_HsmoothEdges )->EnableWindow(EnableButton && m_DrawHiddenLine);
GetDlgItem(IDC_HSewingEdges )->EnableWindow(EnableButton && m_DrawHiddenLine); GetDlgItem(IDC_HSewingEdges )->EnableWindow(EnableButton && m_DrawHiddenLine);
GetDlgItem(IDC_HApparentContour )->EnableWindow(EnableButton && m_DrawHiddenLine); GetDlgItem(IDC_HApparentContour )->EnableWindow(EnableButton && m_DrawHiddenLine);
GetDlgItem(IDC_HsharpEdges )->EnableWindow(EnableButton && m_DrawHiddenLine); GetDlgItem(IDC_HsharpEdges )->EnableWindow(EnableButton && m_DrawHiddenLine);
GetDlgItem(IDC_HIsoParametrics )->EnableWindow(EnableButton && m_DrawHiddenLine); GetDlgItem(IDC_HIsoParametrics )->EnableWindow(EnableButton && m_DrawHiddenLine);
GetDlgItem(IDC_EDIT_NBIsos )->EnableWindow(EnableButton); GetDlgItem(IDC_EDIT_NBIsos )->EnableWindow(EnableButton);
GetDlgItem(IDC_STATIC_NbIsos )->EnableWindow(EnableButton); GetDlgItem(IDC_STATIC_NbIsos )->EnableWindow(EnableButton);
if(m_Algo == 0) if(m_Algo == 0)
{ {
if (m_DisplayMode == 5) m_DisplayMode=0; if (m_DisplayMode == 5) m_DisplayMode=0;
if (m_DisplayMode == 10) m_DisplayMode=0; if (m_DisplayMode == 10) m_DisplayMode=0;
GetDlgItem(IDC_VIsoParametrics)->EnableWindow(false); GetDlgItem(IDC_VIsoParametrics)->EnableWindow(false);
GetDlgItem(IDC_HIsoParametrics)->EnableWindow(false); GetDlgItem(IDC_HIsoParametrics)->EnableWindow(false);
GetDlgItem(IDC_STATIC_NbIsos) ->EnableWindow(false); GetDlgItem(IDC_STATIC_NbIsos) ->EnableWindow(false);
GetDlgItem(IDC_EDIT_NBIsos) ->EnableWindow(false); GetDlgItem(IDC_EDIT_NBIsos) ->EnableWindow(false);
} }
else else
{ {
GetDlgItem(IDC_VIsoParametrics)->EnableWindow(true); GetDlgItem(IDC_VIsoParametrics)->EnableWindow(true);
GetDlgItem(IDC_HIsoParametrics)->EnableWindow(m_DrawHiddenLine); GetDlgItem(IDC_HIsoParametrics)->EnableWindow(m_DrawHiddenLine);
GetDlgItem(IDC_STATIC_NbIsos) ->EnableWindow(true); GetDlgItem(IDC_STATIC_NbIsos) ->EnableWindow(true);
GetDlgItem(IDC_EDIT_NBIsos) ->EnableWindow(true); GetDlgItem(IDC_EDIT_NBIsos) ->EnableWindow(true);
} }
UpdateData(false); UpdateData(false);
} }
void CSelectionDialog::OnDisplayDefault() void CSelectionDialog::OnDisplayDefault()
@ -343,7 +341,8 @@ void CSelectionDialog::OnUpdate2D()
SetCursor(AfxGetApp()->LoadStandardCursor(IDC_WAIT)); SetCursor(AfxGetApp()->LoadStandardCursor(IDC_WAIT));
myDoc->ActivateFrame(RUNTIME_CLASS(OCC_2dView),SW_NORMAL); myDoc->ActivateFrame(RUNTIME_CLASS(OCC_2dView),SW_NORMAL);
UpdateProjector(); UpdateProjector();
Apply(); Apply();
myDoc->FitAll2DViews(Standard_False);
SetCursor(AfxGetApp()->LoadStandardCursor(IDC_ARROW)); SetCursor(AfxGetApp()->LoadStandardCursor(IDC_ARROW));
} }

100
samples/mfc/standard/Common/ISession2D/ISession2D_Shape.cpp
View File

@ -64,23 +64,25 @@ void ISession2D_Shape::BuildPolyAlgo()
myPolyAlgo->Update(); myPolyAlgo->Update();
} }
void ISession2D_Shape::Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager, void ISession2D_Shape::Compute(const Handle(PrsMgr_PresentationManager3d)& thePresentationManager,
const Handle(Prs3d_Presentation)& aPresentation, const Handle(Prs3d_Presentation)& thePresentation,
const Standard_Integer aMode) const Standard_Integer theMode)
{ {
Standard_Integer TheMode = aMode;
Standard_Integer aMode = theMode;
Standard_Boolean DrawHiddenLine= Standard_True; Standard_Boolean DrawHiddenLine= Standard_True;
if (TheMode >= 1000) thePresentation->Clear();
if (aMode >= 1000)
{ {
DrawHiddenLine = Standard_False; DrawHiddenLine = Standard_False;
TheMode -= 1000; aMode -= 1000;
} }
Standard_Boolean UsePolyAlgo= Standard_True; Standard_Boolean UsePolyAlgo= Standard_True;
if (TheMode >= 100) if (aMode >= 100)
{ {
UsePolyAlgo = Standard_False; UsePolyAlgo = Standard_False;
TheMode -= 100; aMode -= 100;
} }
TopoDS_Shape VCompound; TopoDS_Shape VCompound;
TopoDS_Shape Rg1LineVCompound; TopoDS_Shape Rg1LineVCompound;
@ -132,35 +134,35 @@ void ISession2D_Shape::Compute(const Handle(PrsMgr_PresentationManager3d)& aPres
Handle(Prs3d_LineAspect) aLineAspect = new Prs3d_LineAspect(Quantity_NOC_WHITE, Handle(Prs3d_LineAspect) aLineAspect = new Prs3d_LineAspect(Quantity_NOC_WHITE,
Aspect_TOL_SOLID,1); Aspect_TOL_SOLID,1);
switch(TheMode) switch(aMode)
{ {
case (1): case (1):
{ {
DrawCompound(aPresentation, VCompound, aLineAspectHighlighted); DrawCompound(thePresentation, VCompound, aLineAspectHighlighted);
break; break;
} }
case (2): case (2):
{ {
DrawCompound(aPresentation, Rg1LineVCompound, aLineAspectHighlighted); DrawCompound(thePresentation, Rg1LineVCompound, aLineAspectHighlighted);
break; break;
} }
case (3): case (3):
{ {
DrawCompound(aPresentation, RgNLineVCompound, aLineAspectHighlighted); DrawCompound(thePresentation, RgNLineVCompound, aLineAspectHighlighted);
break; break;
} }
case (4): case (4):
{ {
DrawCompound(aPresentation, OutLineVCompound, aLineAspectHighlighted); DrawCompound(thePresentation, OutLineVCompound, aLineAspectHighlighted);
break; break;
} }
default: default:
{ {
DrawCompound(aPresentation,VCompound, aLineAspect); DrawCompound(thePresentation,VCompound, aLineAspect);
DrawCompound(aPresentation,Rg1LineVCompound, aLineAspect); DrawCompound(thePresentation,Rg1LineVCompound, aLineAspect);
DrawCompound(aPresentation,RgNLineVCompound, aLineAspect); DrawCompound(thePresentation,RgNLineVCompound, aLineAspect);
DrawCompound(aPresentation,OutLineVCompound, aLineAspect); DrawCompound(thePresentation,OutLineVCompound, aLineAspect);
} }
} }
@ -171,34 +173,34 @@ void ISession2D_Shape::Compute(const Handle(PrsMgr_PresentationManager3d)& aPres
Handle(Prs3d_LineAspect) aLineAspect = new Prs3d_LineAspect(Quantity_NOC_BLUE1, Handle(Prs3d_LineAspect) aLineAspect = new Prs3d_LineAspect(Quantity_NOC_BLUE1,
Aspect_TOL_DOTDASH,1); Aspect_TOL_DOTDASH,1);
switch(TheMode) switch(aMode)
{ {
case (6): case (6):
{ {
DrawCompound(aPresentation, HCompound, aLineAspectHighlighted); DrawCompound(thePresentation, HCompound, aLineAspectHighlighted);
break; break;
} }
case (7): case (7):
{ {
DrawCompound(aPresentation, Rg1LineHCompound, aLineAspectHighlighted); DrawCompound(thePresentation, Rg1LineHCompound, aLineAspectHighlighted);
break; break;
} }
case (8): case (8):
{ {
DrawCompound(aPresentation, RgNLineHCompound, aLineAspectHighlighted); DrawCompound(thePresentation, RgNLineHCompound, aLineAspectHighlighted);
break; break;
} }
case (9): case (9):
{ {
DrawCompound(aPresentation, OutLineHCompound, aLineAspectHighlighted); DrawCompound(thePresentation, OutLineHCompound, aLineAspectHighlighted);
break; break;
} }
default: default:
{ {
DrawCompound(aPresentation, HCompound, aLineAspect); DrawCompound(thePresentation, HCompound, aLineAspect);
DrawCompound(aPresentation, Rg1LineHCompound, aLineAspect); DrawCompound(thePresentation, Rg1LineHCompound, aLineAspect);
DrawCompound(aPresentation, RgNLineHCompound, aLineAspect); DrawCompound(thePresentation, RgNLineHCompound, aLineAspect);
DrawCompound(aPresentation, OutLineHCompound, aLineAspect); DrawCompound(thePresentation, OutLineHCompound, aLineAspect);
} }
} }
} }
@ -210,40 +212,40 @@ void ISession2D_Shape::Compute(const Handle(PrsMgr_PresentationManager3d)& aPres
Handle(Prs3d_LineAspect) aLineAspect = new Prs3d_LineAspect(Quantity_NOC_WHITE, Handle(Prs3d_LineAspect) aLineAspect = new Prs3d_LineAspect(Quantity_NOC_WHITE,
Aspect_TOL_SOLID,1); Aspect_TOL_SOLID,1);
switch (TheMode) switch (aMode)
{ {
case (1): case (1):
{ {
DrawCompound(aPresentation, VCompound, aLineAspectHighlighted); DrawCompound(thePresentation, VCompound, aLineAspectHighlighted);
break; break;
} }
case (2): case (2):
{ {
DrawCompound(aPresentation, Rg1LineVCompound, aLineAspectHighlighted); DrawCompound(thePresentation, Rg1LineVCompound, aLineAspectHighlighted);
break; break;
} }
case (3): case (3):
{ {
DrawCompound(aPresentation, RgNLineVCompound, aLineAspectHighlighted); DrawCompound(thePresentation, RgNLineVCompound, aLineAspectHighlighted);
break; break;
} }
case (4): case (4):
{ {
DrawCompound(aPresentation, OutLineVCompound, aLineAspectHighlighted); DrawCompound(thePresentation, OutLineVCompound, aLineAspectHighlighted);
break; break;
} }
case (5): case (5):
{ {
DrawCompound(aPresentation, IsoLineVCompound, aLineAspectHighlighted); DrawCompound(thePresentation, IsoLineVCompound, aLineAspectHighlighted);
break; break;
} }
default: default:
{ {
DrawCompound(aPresentation, VCompound, aLineAspect); DrawCompound(thePresentation, VCompound, aLineAspect);
DrawCompound(aPresentation, Rg1LineVCompound, aLineAspect); DrawCompound(thePresentation, Rg1LineVCompound, aLineAspect);
DrawCompound(aPresentation, RgNLineVCompound, aLineAspect); DrawCompound(thePresentation, RgNLineVCompound, aLineAspect);
DrawCompound(aPresentation, OutLineVCompound, aLineAspect); DrawCompound(thePresentation, OutLineVCompound, aLineAspect);
DrawCompound(aPresentation, IsoLineVCompound , aLineAspect); DrawCompound(thePresentation, IsoLineVCompound , aLineAspect);
} }
} }
@ -254,40 +256,40 @@ void ISession2D_Shape::Compute(const Handle(PrsMgr_PresentationManager3d)& aPres
Handle(Prs3d_LineAspect) aLineAspect = new Prs3d_LineAspect(Quantity_NOC_ALICEBLUE, Handle(Prs3d_LineAspect) aLineAspect = new Prs3d_LineAspect(Quantity_NOC_ALICEBLUE,
Aspect_TOL_DOT,1); Aspect_TOL_DOT,1);
switch(TheMode) switch(aMode)
{ {
case (6): case (6):
{ {
DrawCompound(aPresentation, HCompound, aLineAspectHighlighted); DrawCompound(thePresentation, HCompound, aLineAspectHighlighted);
break; break;
} }
case (7): case (7):
{ {
DrawCompound(aPresentation, Rg1LineHCompound, aLineAspectHighlighted); DrawCompound(thePresentation, Rg1LineHCompound, aLineAspectHighlighted);
break; break;
} }
case (8): case (8):
{ {
DrawCompound(aPresentation, RgNLineHCompound, aLineAspectHighlighted); DrawCompound(thePresentation, RgNLineHCompound, aLineAspectHighlighted);
break; break;
} }
case (9): case (9):
{ {
DrawCompound(aPresentation, OutLineHCompound, aLineAspectHighlighted); DrawCompound(thePresentation, OutLineHCompound, aLineAspectHighlighted);
break; break;
} }
case (10): case (10):
{ {
DrawCompound(aPresentation, IsoLineHCompound, aLineAspectHighlighted); DrawCompound(thePresentation, IsoLineHCompound, aLineAspectHighlighted);
break; break;
} }
default: default:
{ {
DrawCompound(aPresentation, HCompound, aLineAspect); DrawCompound(thePresentation, HCompound, aLineAspect);
DrawCompound(aPresentation, Rg1LineHCompound, aLineAspect); DrawCompound(thePresentation, Rg1LineHCompound, aLineAspect);
DrawCompound(aPresentation, RgNLineHCompound, aLineAspect); DrawCompound(thePresentation, RgNLineHCompound, aLineAspect);
DrawCompound(aPresentation, OutLineHCompound, aLineAspect); DrawCompound(thePresentation, OutLineHCompound, aLineAspect);
DrawCompound(aPresentation, IsoLineHCompound, aLineAspect); DrawCompound(thePresentation, IsoLineHCompound, aLineAspect);
} }
} }
} }

2
samples/mfc/standard/Common/ISession2D/ISession2D_Shape.h
View File

@ -52,7 +52,7 @@ void BuildPolyAlgo();
void DrawCompound(const Handle(Prs3d_Presentation)& thePresentation,const TopoDS_Shape& theCompound, const Handle(Prs3d_LineAspect) theAspect); void DrawCompound(const Handle(Prs3d_Presentation)& thePresentation,const TopoDS_Shape& theCompound, const Handle(Prs3d_LineAspect) theAspect);
Standard_EXPORT virtual void Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,const Handle(Prs3d_Presentation)& aPresentation,const Standard_Integer aMode = 0) ; Standard_EXPORT virtual void Compute(const Handle(PrsMgr_PresentationManager3d)& thePresentationManager,const Handle(Prs3d_Presentation)& thePresentation,const Standard_Integer theMode = 0) ;
virtual void ComputeSelection(const Handle(SelectMgr_Selection)& aSelection,const Standard_Integer aMode) ; virtual void ComputeSelection(const Handle(SelectMgr_Selection)& aSelection,const Standard_Integer aMode) ;