/////////////////////////////////////////////////////////////////////////////
// CSelectionDialog dialog
-CSelectionDialog::CSelectionDialog(CHLRDoc* aDoc,CWnd* pParent /*=NULL*/)
+CSelectionDialog::CSelectionDialog (CHLRDoc* aDoc,CWnd* pParent /*=NULL*/)
: CDialog(CSelectionDialog::IDD, pParent)
{
myDoc = aDoc;
- myDisplay = false;
+ myIsDisplayed = false;
//{{AFX_DATA_INIT(CSelectionDialog)
m_Algo = 0;
m_DisplayMode = 0;
m_NbIsos = 2;
m_DrawHiddenLine = TRUE;
- m_DegeneratedModeOn = TRUE;
+ m_HlrModeIsOn = TRUE;
//}}AFX_DATA_INIT
}
-void CSelectionDialog::DoDataExchange(CDataExchange* pDX)
+void CSelectionDialog::DoDataExchange (CDataExchange* pDX)
{
CDialog::DoDataExchange(pDX);
//{{AFX_DATA_MAP(CSelectionDialog)
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_DegeneratedMode, m_DegeneratedModeOn);
+ DDX_Check(pDX, IDC_HlrModeIsOn, m_HlrModeIsOn);
//}}AFX_DATA_MAP
}
BEGIN_MESSAGE_MAP(CSelectionDialog, CDialog)
//{{AFX_MSG_MAP(CSelectionDialog)
- ON_BN_CLICKED(ID_GetShape, OnGetShape)
+ ON_BN_CLICKED(ID_GetShape, OnGetSelectedShapes)
ON_BN_CLICKED(IDC_DisplayDefault, OnDisplayDefault)
ON_BN_CLICKED(IDC_VIsoParametrics, OnVIsoParametrics)
ON_BN_CLICKED(IDC_VApparentContour, OnVApparentContour)
ON_WM_RBUTTONUP()
ON_WM_MOUSEMOVE()
ON_BN_CLICKED(IDC_DrawHiddenLine, OnDrawHiddenLine)
- ON_BN_CLICKED(IDC_DegeneratedMode, OnDegeneratedMode)
+ ON_BN_CLICKED(IDC_HlrModeIsOn, OnHlrMode)
ON_WM_DRAWITEM()
ON_WM_PAINT()
//}}AFX_MSG_MAP
/////////////////////////////////////////////////////////////////////////////
// CSelectionDialog message handlers
-BOOL CSelectionDialog::OnInitDialog()
+BOOL CSelectionDialog::OnInitDialog()
{
CDialog::OnInitDialog();
- VERIFY(TopView.AutoLoad(IDC_TopView, this));
- VERIFY(BottomView.AutoLoad(IDC_BottomView, this)) ;
- VERIFY(LeftView .AutoLoad(IDC_LeftView , this)) ;
- VERIFY(RightView .AutoLoad(IDC_RightView , this)) ;
- VERIFY(FrontView .AutoLoad(IDC_FrontView , this)) ;
- VERIFY(BackView .AutoLoad(IDC_BackView , this)) ;
- VERIFY(AxoView .AutoLoad(IDC_AxoView , this)) ;
+ VERIFY(TopView.AutoLoad (IDC_TopView, this));
+ VERIFY(BottomView.AutoLoad (IDC_BottomView, this)) ;
+ VERIFY(LeftView .AutoLoad (IDC_LeftView , this)) ;
+ VERIFY(RightView .AutoLoad (IDC_RightView , this)) ;
+ VERIFY(FrontView .AutoLoad (IDC_FrontView , this)) ;
+ VERIFY(BackView .AutoLoad (IDC_BackView , this)) ;
+ VERIFY(AxoView .AutoLoad (IDC_AxoView , this)) ;
// get the View Window position to managed mouse move
CRect BoxRect,ViewRect;
- GetWindowRect(BoxRect);
- CWnd * TheViewerWindow = GetDlgItem(IDC_DUMMYBUTTON);
- TheViewerWindow->GetWindowRect(ViewRect);
+ GetWindowRect (BoxRect);
+ CWnd * TheViewerWindow = GetDlgItem (IDC_HlrDlgView);
+ TheViewerWindow->GetWindowRect (ViewRect);
myPosMinX = ViewRect.TopLeft().x - BoxRect.TopLeft().x;
- myPosMaxX = ViewRect.Width()+myPosMinX;
+ myPosMaxX = ViewRect.Width() + myPosMinX;
myPosMinY = ViewRect.TopLeft().y - BoxRect.TopLeft().y;
myPosMaxY = myPosMinY + ViewRect.Height();
- ShowHideButton(Standard_False);
- OnDisplay(true);
+ ShowHideButton (Standard_False);
+ OnDisplay (true);
- return TRUE; // return TRUE unless you set the focus to a control
+ // return TRUE unless you set the focus to a control
// EXCEPTION: OCX Property Pages should return FALSE
+ return TRUE;
}
-void CSelectionDialog::OnDisplay(bool isFit)
+void CSelectionDialog::OnDisplay (bool isFit)
{
- GetDlgItem(IDC_DUMMYBUTTON)->SetRedraw(true);
- if(!myDisplay) {
- Handle(Graphic3d_GraphicDriver) aGraphicDriver =
+ // GetDlgItem(IDC_HlrDlgView)->SetRedraw() wrapping of this method makes view blinking,
+ // but displaying of big models may be faster.
+ //GetDlgItem(IDC_HlrDlgView)->SetRedraw(true);
+ if (!myIsDisplayed)
+ {
+ Handle(Graphic3d_GraphicDriver) aGraphicDriver =
((CHLRApp*)AfxGetApp())->GetGraphicDriver();
- myActiveViewer = new V3d_Viewer(aGraphicDriver,(short *) "Visu3D");
+ myActiveViewer = new V3d_Viewer (aGraphicDriver);
myActiveViewer->SetDefaultLights();
myActiveViewer->SetLightOn();
myActiveView = myActiveViewer->CreateView();
- Handle(WNT_Window) aWNTWindow = new WNT_Window (GetDlgItem(IDC_DUMMYBUTTON)->GetSafeHwnd(),
+ Handle(WNT_Window) aWNTWindow = new WNT_Window (GetDlgItem (IDC_HlrDlgView)->GetSafeHwnd(),
Quantity_NOC_GRAY);
- myActiveView->SetComputedMode (m_HlrModeIsOn);
+ myActiveView->SetComputedMode (m_HlrModeIsOn != 0);
myActiveView->SetWindow(aWNTWindow);
- myInteractiveContext = new AIS_InteractiveContext(myActiveViewer);
+ myInteractiveContext = new AIS_InteractiveContext (myActiveViewer);
// TRIHEDRON
- Handle(Geom_Axis2Placement) aTrihedronAxis=new Geom_Axis2Placement(gp::XOY());
- myTrihedron=new AIS_Trihedron(aTrihedronAxis);
+ Handle(Geom_Axis2Placement) aTrihedronAxis = new Geom_Axis2Placement (gp::XOY());
+ myTrihedron = new AIS_Trihedron (aTrihedronAxis);
- myInteractiveContext->Display(myTrihedron);
+ myInteractiveContext->Display (myTrihedron, Standard_False);
+ myIsDisplayed = Standard_True;
}
- if(isFit) {
+ if(isFit)
+ {
myActiveView->ZFitAll();
myActiveView->FitAll();
}
+
myActiveView->Redraw();
- myDisplay = Standard_True;
- GetDlgItem(IDC_DUMMYBUTTON)->SetRedraw(false);
+ //GetDlgItem (IDC_HlrDlgView)->SetRedraw (false);
}
-void CSelectionDialog::SetTitle(CString & aTitle)
+void CSelectionDialog::SetTitle (const CString & aTitle)
{
- SetWindowText(aTitle);
+ SetWindowText (aTitle);
}
-void CSelectionDialog::OnGetShape()
+void CSelectionDialog::UpdateViews()
{
- UpdateData(true);
- myDoc->GetInteractiveContext2D()->RemoveAll();
- myDisplayableShape = new ISession2D_Shape( );
- UpdateProjector();
- myDisplayableShape->SetNbIsos(m_NbIsos);
+ // Clear HLR dialog view
+ myInteractiveContext->RemoveAll (Standard_False);
+ myInteractiveContext->Display (myTrihedron, Standard_False);
- myInteractiveContext->EraseAll(Standard_False);
- myInteractiveContext->Display(myTrihedron);
+ UpdateProjector();
+ // Display chosen shapes in the HLR dialog view.
Standard_Boolean OneOrMoreFound = Standard_False;
- for (myDoc->GetAISContext()->InitCurrent();
- myDoc->GetAISContext()->MoreCurrent ();
- myDoc->GetAISContext()->NextCurrent ())
+ for (myDoc->GetAISContext()->InitSelected();
+ myDoc->GetAISContext()->MoreSelected();
+ myDoc->GetAISContext()->NextSelected())
{
- Handle(AIS_Shape) anAISShape = Handle(AIS_Shape)::DownCast(myDoc->GetAISContext()->Current());
-
+ Handle(AIS_Shape) anAISShape = Handle(AIS_Shape)::DownCast (myDoc->GetAISContext()->SelectedInteractive());
if (!anAISShape.IsNull())
- {
- OneOrMoreFound = Standard_True;
- TopoDS_Shape aShape = anAISShape->Shape();
- myDisplayableShape->Add( aShape );
- myInteractiveContext->Display(anAISShape);
- }
+ {
+ OneOrMoreFound = Standard_True;
+ myInteractiveContext->Display (anAISShape, Standard_False);
+ }
}
+ myInteractiveContext->UpdateCurrentViewer();
+ // Apply HLR to chosen shapes and display result into the 2d view.
+ Apply();
+ // Update viewer
+ myDoc->FitAll2DViews (Standard_False);
+ // Check the selection: if no object : disable all possiblity.
+ ShowHideButton (OneOrMoreFound);
+ OnDisplay (true);
+}
- Standard_Integer DisplayMode = m_DisplayMode;
- if (m_Algo == 1) DisplayMode+=100;
- if (!m_DrawHiddenLine) DisplayMode+=1000;
+void CSelectionDialog::OnGetSelectedShapes()
+{
+ // Create new displayable shape.
+ myDisplayableShape = new ISession2D_Shape();
+ UpdateProjector();
+ myDisplayableShape->SetNbIsos (m_NbIsos);
- myDoc->GetInteractiveContext2D()->Display(myDisplayableShape, // object
- DisplayMode, // display mode
- DisplayMode, // selection mode
- Standard_True); // Redraw
+ // Clear HLR dialog view
+ myInteractiveContext->RemoveAll (Standard_False);
+ myInteractiveContext->Display (myTrihedron, Standard_False);
- myDoc->FitAll2DViews(Standard_False); // Update Viewer
+ Standard_Boolean OneOrMoreFound = Standard_False;
+ for (myDoc->GetAISContext()->InitSelected();
+ myDoc->GetAISContext()->MoreSelected();
+ myDoc->GetAISContext()->NextSelected())
+ {
+ Handle(AIS_Shape) anAISShape = Handle(AIS_Shape)::DownCast (myDoc->GetAISContext()->SelectedInteractive());
- // check the selection :
- // if no object : disable all possiblity!!
- ShowHideButton(OneOrMoreFound);
- OnDisplay(true);
+ if (!anAISShape.IsNull())
+ {
+ OneOrMoreFound = Standard_True;
+ TopoDS_Shape aShape = anAISShape->Shape();
+ myDisplayableShape->Add (aShape);
+ Handle(AIS_Shape) aSelectedShape = new AIS_Shape (aShape);
+ myInteractiveContext->Display (aSelectedShape, Standard_False);
+ }
+ }
+ myInteractiveContext->UpdateCurrentViewer();
+ // Apply HLR to chosen shapes and display result into the 2d view.
+ Apply();
+ // Update viewer
+ myDoc->FitAll2DViews (Standard_False);
+
+ // Check the selection: if no object : disable all possiblity.
+ ShowHideButton (OneOrMoreFound);
+ OnDisplay (true);
}
-void CSelectionDialog::Apply()
+void CSelectionDialog::Apply()
{
- SetCursor(AfxGetApp()->LoadStandardCursor(IDC_WAIT));
- myDoc->GetInteractiveContext2D()->RemoveAll();
- UpdateData(true);
+ SetCursor(AfxGetApp()->LoadStandardCursor (IDC_WAIT));
+ myDoc->GetInteractiveContext2D()->RemoveAll (Standard_False);
+ UpdateData (true);
- Standard_Integer DisplayMode = m_DisplayMode;
- if (m_Algo == 1) DisplayMode+=100;
+ Standard_Integer aDisplayMode = m_DisplayMode;
- if (!m_DrawHiddenLine) DisplayMode+=1000;
+ if (m_Algo == 1)
+ {
+ aDisplayMode += 100;
+ }
- myDoc->GetInteractiveContext2D()->Display(myDisplayableShape, // object
- DisplayMode,
- DisplayMode,
- Standard_True); // Redraw
+ if (!m_DrawHiddenLine)
+ {
+ aDisplayMode += 1000;
+ }
- SetCursor(AfxGetApp()->LoadStandardCursor(IDC_ARROW));
+ myDoc->GetInteractiveContext2D()->Display (myDisplayableShape, // object
+ aDisplayMode,
+ aDisplayMode,
+ Standard_True); // Redraw
+
+ SetCursor(AfxGetApp()->LoadStandardCursor (IDC_ARROW));
}
void CSelectionDialog::UpdateProjector()
{
- V3d_Coordinate DX,DY,DZ,XAt,YAt,ZAt, Vx,Vy,Vz ;
+ Standard_Real DX,DY,DZ,XAt,YAt,ZAt, Vx,Vy,Vz ;
myActiveView->Proj(DX,DY,DZ);
myActiveView->At(XAt,YAt,ZAt);
myActiveView->Up( Vx,Vy,Vz );
OnDisplay(false);
Standard_Boolean IsPerspective = (myActiveView->Type() == V3d_PERSPECTIVE);
- Quantity_Length aFocus = 1;
+ Standard_Real aFocus = 1;
Prs3d_Projector aPrs3dProjector(IsPerspective,aFocus,DX,DY,DZ,XAt,YAt,ZAt,Vx,Vy,Vz);
HLRAlgo_Projector aProjector = aPrs3dProjector.Projector();
if(m_Algo == 0)
{
- if (m_DisplayMode == 5) m_DisplayMode=0;
- if (m_DisplayMode == 10) m_DisplayMode=0;
+ if (m_DisplayMode == 5 || m_DisplayMode == 10)
+ {
+ m_DisplayMode=0;
+ }
GetDlgItem(IDC_VIsoParametrics)->EnableWindow(false);
GetDlgItem(IDC_HIsoParametrics)->EnableWindow(false);
void CSelectionDialog::OnLeftView()
{
- myActiveView->SetProj(V3d_Ypos);
+ myActiveView->SetProj(V3d_Xneg);
OnDisplay(true);
}
void CSelectionDialog::OnRightView()
{
- myActiveView->SetProj(V3d_Yneg);
+ myActiveView->SetProj(V3d_Xpos);
OnDisplay(true);
}
void CSelectionDialog::OnFrontView()
{
- myActiveView->SetProj(V3d_Xpos);
+ myActiveView->SetProj(V3d_Yneg);
OnDisplay(true);
}
void CSelectionDialog::OnBackView()
{
- myActiveView->SetProj(V3d_Xneg);
+ myActiveView->SetProj(V3d_Ypos);
OnDisplay(true);
}
if (!m_HlrModeIsOn)
{
- myActiveView->SetComputedMode (m_HlrModeIsOn);
+ myActiveView->SetComputedMode (m_HlrModeIsOn != 0);
+ myActiveView->Redraw();
}
else
{
SetCursor(AfxGetApp()->LoadStandardCursor(IDC_WAIT));
- myActiveView->SetComputedMode (m_HlrModeIsOn);
+ myActiveView->SetComputedMode (m_HlrModeIsOn != 0);
+ myActiveView->Redraw();
SetCursor(AfxGetApp()->LoadStandardCursor(IDC_ARROW));
}
OnDisplay(false);
}
SetCursor(AfxGetApp()->LoadStandardCursor(IDC_WAIT));
- // reset tyhe good HLR mode according to the strored one
+ // reset the good HLR mode according to the stored one
// --> dynamic rotation may have change it
- myActiveView->SetComputedMode (m_HlrModeIsOn);
+ if (m_HlrModeIsOn != 0)
+ {
+ myActiveView->SetComputedMode (true);
+ myActiveView->Redraw();
+ }
OnDisplay(false);
SetCursor(AfxGetApp()->LoadStandardCursor(IDC_ARROW));
}
void CSelectionDialog::OnPaint()
{
- CPaintDC dc(this); // device context for painting
OnDisplay(false);
}
projects / occt.git / blobdiff