mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-04-04 18:06:22 +03:00
0023831: Ghosts appears in 2D viewer of HLR MFC sample
2d view updating was corrected. ISession2D_Shape drawing was corrected. Style changes
This commit is contained in:
aba
bugmaster
parent
2c896b8f8a
commit
973191093d
23
samples/mfc/standard/08_HLR/src/SelectionDialog.cpp
Executable file → Normal file
23
samples/mfc/standard/08_HLR/src/SelectionDialog.cpp
Executable file → Normal file
@ -23,7 +23,7 @@ static char THIS_FILE[] = __FILE__;
|
||||
// CSelectionDialog dialog
|
||||
|
||||
CSelectionDialog::CSelectionDialog(CHLRDoc* aDoc,CWnd* pParent /*=NULL*/)
|
||||
: CDialog(CSelectionDialog::IDD, pParent)
|
||||
: CDialog(CSelectionDialog::IDD, pParent)
|
||||
{
|
||||
myDoc = aDoc;
|
||||
myDisplay = false;
|
||||
@ -32,7 +32,7 @@ CSelectionDialog::CSelectionDialog(CHLRDoc* aDoc,CWnd* pParent /*=NULL*/)
|
||||
m_DisplayMode = 0;
|
||||
m_NbIsos = 2;
|
||||
m_DrawHiddenLine = TRUE;
|
||||
m_HlrModeIsOn = FALSE;
|
||||
m_DegeneratedModeOn = TRUE;
|
||||
//}}AFX_DATA_INIT
|
||||
}
|
||||
|
||||
@ -44,7 +44,7 @@ void CSelectionDialog::DoDataExchange(CDataExchange* pDX)
|
||||
DDX_Radio(pDX, IDC_DisplayDefault, m_DisplayMode);
|
||||
DDX_Text(pDX, IDC_EDIT_NBIsos, m_NbIsos);
|
||||
DDX_Check(pDX, IDC_DrawHiddenLine, m_DrawHiddenLine);
|
||||
DDX_Check(pDX, IDC_HlrModeIsOn, m_HlrModeIsOn);
|
||||
DDX_Check(pDX, IDC_DegeneratedMode, m_DegeneratedModeOn);
|
||||
//}}AFX_DATA_MAP
|
||||
}
|
||||
|
||||
@ -80,7 +80,7 @@ BEGIN_MESSAGE_MAP(CSelectionDialog, CDialog)
|
||||
ON_WM_RBUTTONUP()
|
||||
ON_WM_MOUSEMOVE()
|
||||
ON_BN_CLICKED(IDC_DrawHiddenLine, OnDrawHiddenLine)
|
||||
ON_BN_CLICKED(IDC_HlrModeIsOn, OnHlrMode)
|
||||
ON_BN_CLICKED(IDC_DegeneratedMode, OnDegeneratedMode)
|
||||
ON_WM_DRAWITEM()
|
||||
ON_WM_PAINT()
|
||||
//}}AFX_MSG_MAP
|
||||
@ -121,9 +121,9 @@ BOOL CSelectionDialog::OnInitDialog()
|
||||
void CSelectionDialog::OnDisplay(bool isFit)
|
||||
{
|
||||
GetDlgItem(IDC_DUMMYBUTTON)->SetRedraw(true);
|
||||
if (!myDisplay)
|
||||
{
|
||||
Handle(Graphic3d_GraphicDriver) aGraphicDriver = ((CHLRApp*)AfxGetApp())->GetGraphicDriver();
|
||||
if(!myDisplay) {
|
||||
Handle(Graphic3d_GraphicDriver) aGraphicDriver =
|
||||
((CHLRApp*)AfxGetApp())->GetGraphicDriver();
|
||||
|
||||
myActiveViewer = new V3d_Viewer(aGraphicDriver,(short *) "Visu3D");
|
||||
myActiveViewer->SetDefaultLights();
|
||||
@ -143,8 +143,7 @@ void CSelectionDialog::OnDisplay(bool isFit)
|
||||
|
||||
myInteractiveContext->Display(myTrihedron);
|
||||
}
|
||||
if (isFit)
|
||||
{
|
||||
if(isFit) {
|
||||
myActiveView->ZFitAll();
|
||||
myActiveView->FitAll();
|
||||
}
|
||||
@ -162,7 +161,7 @@ void CSelectionDialog::SetTitle(CString & aTitle)
|
||||
void CSelectionDialog::OnGetShape()
|
||||
{
|
||||
UpdateData(true);
|
||||
myDoc->GetInteractiveContext2D()->EraseAll();
|
||||
myDoc->GetInteractiveContext2D()->RemoveAll();
|
||||
myDisplayableShape = new ISession2D_Shape( );
|
||||
UpdateProjector();
|
||||
myDisplayableShape->SetNbIsos(m_NbIsos);
|
||||
@ -197,7 +196,6 @@ void CSelectionDialog::OnGetShape()
|
||||
|
||||
myDoc->FitAll2DViews(Standard_False); // Update Viewer
|
||||
|
||||
|
||||
// check the selection :
|
||||
// if no object : disable all possiblity!!
|
||||
ShowHideButton(OneOrMoreFound);
|
||||
@ -207,7 +205,7 @@ void CSelectionDialog::OnGetShape()
|
||||
void CSelectionDialog::Apply()
|
||||
{
|
||||
SetCursor(AfxGetApp()->LoadStandardCursor(IDC_WAIT));
|
||||
myDoc->GetInteractiveContext2D()->EraseAll(/*Standard_False*/);
|
||||
myDoc->GetInteractiveContext2D()->RemoveAll();
|
||||
UpdateData(true);
|
||||
|
||||
Standard_Integer DisplayMode = m_DisplayMode;
|
||||
@ -344,6 +342,7 @@ void CSelectionDialog::OnUpdate2D()
|
||||
myDoc->ActivateFrame(RUNTIME_CLASS(OCC_2dView),SW_NORMAL);
|
||||
UpdateProjector();
|
||||
Apply();
|
||||
myDoc->FitAll2DViews(Standard_False);
|
||||
SetCursor(AfxGetApp()->LoadStandardCursor(IDC_ARROW));
|
||||
}
|
||||
|
||||
|
||||
@ -64,23 +64,25 @@ void ISession2D_Shape::BuildPolyAlgo()
|
||||
myPolyAlgo->Update();
|
||||
}
|
||||
|
||||
void ISession2D_Shape::Compute(const Handle(PrsMgr_PresentationManager3d)& aPresentationManager,
|
||||
const Handle(Prs3d_Presentation)& aPresentation,
|
||||
const Standard_Integer aMode)
|
||||
void ISession2D_Shape::Compute(const Handle(PrsMgr_PresentationManager3d)& thePresentationManager,
|
||||
const Handle(Prs3d_Presentation)& thePresentation,
|
||||
const Standard_Integer theMode)
|
||||
{
|
||||
Standard_Integer TheMode = aMode;
|
||||
|
||||
Standard_Integer aMode = theMode;
|
||||
Standard_Boolean DrawHiddenLine= Standard_True;
|
||||
if (TheMode >= 1000)
|
||||
thePresentation->Clear();
|
||||
if (aMode >= 1000)
|
||||
{
|
||||
DrawHiddenLine = Standard_False;
|
||||
TheMode -= 1000;
|
||||
aMode -= 1000;
|
||||
}
|
||||
|
||||
Standard_Boolean UsePolyAlgo= Standard_True;
|
||||
if (TheMode >= 100)
|
||||
if (aMode >= 100)
|
||||
{
|
||||
UsePolyAlgo = Standard_False;
|
||||
TheMode -= 100;
|
||||
aMode -= 100;
|
||||
}
|
||||
TopoDS_Shape VCompound;
|
||||
TopoDS_Shape Rg1LineVCompound;
|
||||
@ -133,34 +135,34 @@ void ISession2D_Shape::Compute(const Handle(PrsMgr_PresentationManager3d)& aPres
|
||||
Aspect_TOL_SOLID,1);
|
||||
|
||||
|
||||
switch(TheMode)
|
||||
switch(aMode)
|
||||
{
|
||||
case (1):
|
||||
{
|
||||
DrawCompound(aPresentation, VCompound, aLineAspectHighlighted);
|
||||
DrawCompound(thePresentation, VCompound, aLineAspectHighlighted);
|
||||
break;
|
||||
}
|
||||
case (2):
|
||||
{
|
||||
DrawCompound(aPresentation, Rg1LineVCompound, aLineAspectHighlighted);
|
||||
DrawCompound(thePresentation, Rg1LineVCompound, aLineAspectHighlighted);
|
||||
break;
|
||||
}
|
||||
case (3):
|
||||
{
|
||||
DrawCompound(aPresentation, RgNLineVCompound, aLineAspectHighlighted);
|
||||
DrawCompound(thePresentation, RgNLineVCompound, aLineAspectHighlighted);
|
||||
break;
|
||||
}
|
||||
case (4):
|
||||
{
|
||||
DrawCompound(aPresentation, OutLineVCompound, aLineAspectHighlighted);
|
||||
DrawCompound(thePresentation, OutLineVCompound, aLineAspectHighlighted);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
{
|
||||
DrawCompound(aPresentation,VCompound, aLineAspect);
|
||||
DrawCompound(aPresentation,Rg1LineVCompound, aLineAspect);
|
||||
DrawCompound(aPresentation,RgNLineVCompound, aLineAspect);
|
||||
DrawCompound(aPresentation,OutLineVCompound, aLineAspect);
|
||||
DrawCompound(thePresentation,VCompound, aLineAspect);
|
||||
DrawCompound(thePresentation,Rg1LineVCompound, aLineAspect);
|
||||
DrawCompound(thePresentation,RgNLineVCompound, 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,
|
||||
Aspect_TOL_DOTDASH,1);
|
||||
|
||||
switch(TheMode)
|
||||
switch(aMode)
|
||||
{
|
||||
case (6):
|
||||
{
|
||||
DrawCompound(aPresentation, HCompound, aLineAspectHighlighted);
|
||||
DrawCompound(thePresentation, HCompound, aLineAspectHighlighted);
|
||||
break;
|
||||
}
|
||||
case (7):
|
||||
{
|
||||
DrawCompound(aPresentation, Rg1LineHCompound, aLineAspectHighlighted);
|
||||
DrawCompound(thePresentation, Rg1LineHCompound, aLineAspectHighlighted);
|
||||
break;
|
||||
}
|
||||
case (8):
|
||||
{
|
||||
DrawCompound(aPresentation, RgNLineHCompound, aLineAspectHighlighted);
|
||||
DrawCompound(thePresentation, RgNLineHCompound, aLineAspectHighlighted);
|
||||
break;
|
||||
}
|
||||
case (9):
|
||||
{
|
||||
DrawCompound(aPresentation, OutLineHCompound, aLineAspectHighlighted);
|
||||
DrawCompound(thePresentation, OutLineHCompound, aLineAspectHighlighted);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
{
|
||||
DrawCompound(aPresentation, HCompound, aLineAspect);
|
||||
DrawCompound(aPresentation, Rg1LineHCompound, aLineAspect);
|
||||
DrawCompound(aPresentation, RgNLineHCompound, aLineAspect);
|
||||
DrawCompound(aPresentation, OutLineHCompound, aLineAspect);
|
||||
DrawCompound(thePresentation, HCompound, aLineAspect);
|
||||
DrawCompound(thePresentation, Rg1LineHCompound, aLineAspect);
|
||||
DrawCompound(thePresentation, RgNLineHCompound, 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,
|
||||
Aspect_TOL_SOLID,1);
|
||||
|
||||
switch (TheMode)
|
||||
switch (aMode)
|
||||
{
|
||||
case (1):
|
||||
{
|
||||
DrawCompound(aPresentation, VCompound, aLineAspectHighlighted);
|
||||
DrawCompound(thePresentation, VCompound, aLineAspectHighlighted);
|
||||
break;
|
||||
}
|
||||
case (2):
|
||||
{
|
||||
DrawCompound(aPresentation, Rg1LineVCompound, aLineAspectHighlighted);
|
||||
DrawCompound(thePresentation, Rg1LineVCompound, aLineAspectHighlighted);
|
||||
break;
|
||||
}
|
||||
case (3):
|
||||
{
|
||||
DrawCompound(aPresentation, RgNLineVCompound, aLineAspectHighlighted);
|
||||
DrawCompound(thePresentation, RgNLineVCompound, aLineAspectHighlighted);
|
||||
break;
|
||||
}
|
||||
case (4):
|
||||
{
|
||||
DrawCompound(aPresentation, OutLineVCompound, aLineAspectHighlighted);
|
||||
DrawCompound(thePresentation, OutLineVCompound, aLineAspectHighlighted);
|
||||
break;
|
||||
}
|
||||
case (5):
|
||||
{
|
||||
DrawCompound(aPresentation, IsoLineVCompound, aLineAspectHighlighted);
|
||||
DrawCompound(thePresentation, IsoLineVCompound, aLineAspectHighlighted);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
{
|
||||
DrawCompound(aPresentation, VCompound, aLineAspect);
|
||||
DrawCompound(aPresentation, Rg1LineVCompound, aLineAspect);
|
||||
DrawCompound(aPresentation, RgNLineVCompound, aLineAspect);
|
||||
DrawCompound(aPresentation, OutLineVCompound, aLineAspect);
|
||||
DrawCompound(aPresentation, IsoLineVCompound , aLineAspect);
|
||||
DrawCompound(thePresentation, VCompound, aLineAspect);
|
||||
DrawCompound(thePresentation, Rg1LineVCompound, aLineAspect);
|
||||
DrawCompound(thePresentation, RgNLineVCompound, aLineAspect);
|
||||
DrawCompound(thePresentation, OutLineVCompound, 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,
|
||||
Aspect_TOL_DOT,1);
|
||||
|
||||
switch(TheMode)
|
||||
switch(aMode)
|
||||
{
|
||||
case (6):
|
||||
{
|
||||
DrawCompound(aPresentation, HCompound, aLineAspectHighlighted);
|
||||
DrawCompound(thePresentation, HCompound, aLineAspectHighlighted);
|
||||
break;
|
||||
}
|
||||
case (7):
|
||||
{
|
||||
DrawCompound(aPresentation, Rg1LineHCompound, aLineAspectHighlighted);
|
||||
DrawCompound(thePresentation, Rg1LineHCompound, aLineAspectHighlighted);
|
||||
break;
|
||||
}
|
||||
case (8):
|
||||
{
|
||||
DrawCompound(aPresentation, RgNLineHCompound, aLineAspectHighlighted);
|
||||
DrawCompound(thePresentation, RgNLineHCompound, aLineAspectHighlighted);
|
||||
break;
|
||||
}
|
||||
case (9):
|
||||
{
|
||||
DrawCompound(aPresentation, OutLineHCompound, aLineAspectHighlighted);
|
||||
DrawCompound(thePresentation, OutLineHCompound, aLineAspectHighlighted);
|
||||
break;
|
||||
}
|
||||
case (10):
|
||||
{
|
||||
DrawCompound(aPresentation, IsoLineHCompound, aLineAspectHighlighted);
|
||||
DrawCompound(thePresentation, IsoLineHCompound, aLineAspectHighlighted);
|
||||
break;
|
||||
}
|
||||
default:
|
||||
{
|
||||
DrawCompound(aPresentation, HCompound, aLineAspect);
|
||||
DrawCompound(aPresentation, Rg1LineHCompound, aLineAspect);
|
||||
DrawCompound(aPresentation, RgNLineHCompound, aLineAspect);
|
||||
DrawCompound(aPresentation, OutLineHCompound, aLineAspect);
|
||||
DrawCompound(aPresentation, IsoLineHCompound, aLineAspect);
|
||||
DrawCompound(thePresentation, HCompound, aLineAspect);
|
||||
DrawCompound(thePresentation, Rg1LineHCompound, aLineAspect);
|
||||
DrawCompound(thePresentation, RgNLineHCompound, aLineAspect);
|
||||
DrawCompound(thePresentation, OutLineHCompound, aLineAspect);
|
||||
DrawCompound(thePresentation, IsoLineHCompound, aLineAspect);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -52,7 +52,7 @@ void BuildPolyAlgo();
|
||||
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) ;
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user