Commit ffd727ef authored by charras's avatar charras
Browse files

minor changes

parent 1f34ed05

3d-viewer/3d_canvas.cpp

+4 −2
Original line number Diff line number Diff line
@@ -493,11 +493,11 @@ void Pcb3D_GLCanvas::OnPaint( wxPaintEvent& event ) 
void Pcb3D_GLCanvas::OnSize( wxSizeEvent& event )

/**********************************************/

{

    int w, h;

    // set GL viewport (not called by wxGLCanvas::OnSize on all platforms...)

    // this is also necessary to update the context on some platforms

    wxGLCanvas::OnSize( event );



    // set GL viewport (not called by wxGLCanvas::OnSize on all platforms...)

    int w, h;

    GetClientSize( &w, &h );

#ifndef __WXMOTIF__

    if( GetContext() )
@@ -506,6 +506,8 @@ void Pcb3D_GLCanvas::OnSize( wxSizeEvent& event ) 
        SetCurrent();

        glViewport( 0, 0, (GLint) w, (GLint) h );

    }



    event.Skip();

}

3d-viewer/3d_draw.cpp

+5 −6
Original line number Diff line number Diff line
@@ -75,9 +75,7 @@ void Pcb3D_GLCanvas::Redraw( bool finish ) 
        glCallList( m_gllist );

    else

    {

        m_gllist = CreateDrawGL_List();



//		m_gllist = DisplayCubeforTest();	// Only for test

        CreateDrawGL_List();

    }



    glFlush();
@@ -93,7 +91,6 @@ GLuint Pcb3D_GLCanvas::CreateDrawGL_List() 
/* Create the draw list items

 */

{

    GLuint               gllist   = glGenLists( 1 );

    WinEDA_BasePcbFrame* pcbframe = m_Parent->m_Parent;

    BOARD*               pcb = pcbframe->m_Pcb;

    TRACK*               pt_piste;
@@ -101,6 +98,8 @@ GLuint Pcb3D_GLCanvas::CreateDrawGL_List() 


    wxBusyCursor         dummy;



    m_gllist = glGenLists( 1 );



    pcb->ComputeBoundaryBox();

    g_Parm_3D_Visu.m_BoardSettings = pcb->m_BoardSettings;

    g_Parm_3D_Visu.m_BoardSize  = pcb->m_BoundaryBox.GetSize();
@@ -134,7 +133,7 @@ GLuint Pcb3D_GLCanvas::CreateDrawGL_List() 
    g_Parm_3D_Visu.m_LayerZcoord[ECO1_N]    = zpos_cmp + zpos_cu;

    g_Parm_3D_Visu.m_LayerZcoord[ECO2_N]    = zpos_cmp + zpos_cu;



    glNewList( gllist, GL_COMPILE_AND_EXECUTE );

    glNewList( m_gllist, GL_COMPILE_AND_EXECUTE );



    glColorMaterial( GL_FRONT_AND_BACK, GL_AMBIENT_AND_DIFFUSE );
@@ -223,7 +222,7 @@ GLuint Pcb3D_GLCanvas::CreateDrawGL_List() 
    GLenum err = glGetError();

    if( err != GL_NO_ERROR )

        DisplayError( this, wxT( "Error in GL commands" ) );

    return gllist;

    return m_gllist;

}

3d-viewer/3d_frame.cpp

+1 −0
Original line number Diff line number Diff line
@@ -309,6 +309,7 @@ void WinEDA3D_DrawFrame::NewDisplay() 
/*****************************************/

{

    m_Canvas->ClearLists();

    m_Canvas->CreateDrawGL_List();

    m_Canvas->InitGL();

    m_Canvas->DisplayStatus();

    m_Canvas->Refresh( true );

cvpcb/dialog_display_options.cpp

+8 −5
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ bool WinEDA_FootprintDisplayOptionsFrame::Create( wxWindow* parent, wxWindowID i 
    m_IsShowPadFill = NULL;

    m_IsShowPadNum = NULL;

    BottomBoxSizer = NULL;

    m_CancelButton = NULL;

////@end WinEDA_FootprintDisplayOptionsFrame member initialisation



////@begin WinEDA_FootprintDisplayOptionsFrame creation
@@ -133,7 +134,7 @@ void WinEDA_FootprintDisplayOptionsFrame::CreateControls() 
	SetFont(*g_DialogFont);



////@begin WinEDA_FootprintDisplayOptionsFrame content construction

    // Generated by DialogBlocks, 27/10/2007 09:57:04 (unregistered)

    // Generated by DialogBlocks, 21/07/2008 15:12:47 (unregistered)



    WinEDA_FootprintDisplayOptionsFrame* itemDialog1 = this;
@@ -168,7 +169,7 @@ void WinEDA_FootprintDisplayOptionsFrame::CreateControls() 


    m_IsShowPadNum = new wxCheckBox( itemDialog1, PADNUM_OPT, _("Display Pad &Num"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );

    m_IsShowPadNum->SetValue(false);

    if (ShowToolTips())

    if (WinEDA_FootprintDisplayOptionsFrame::ShowToolTips())

        m_IsShowPadNum->SetToolTip(_("Display pad number"));

    ColumnBoxSizer->Add(m_IsShowPadNum, 1, wxGROW|wxALL, 5);
@@ -188,9 +189,9 @@ void WinEDA_FootprintDisplayOptionsFrame::CreateControls() 
    itemButton13->SetForegroundColour(wxColour(255, 0, 0));

    BottomBoxSizer->Add(itemButton13, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);



    wxButton* itemButton14 = new wxButton( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 );

    itemButton14->SetForegroundColour(wxColour(0, 0, 255));

    BottomBoxSizer->Add(itemButton14, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);

    m_CancelButton = new wxButton( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 );

    m_CancelButton->SetForegroundColour(wxColour(0, 0, 255));

    BottomBoxSizer->Add(m_CancelButton, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);



    wxButton* itemButton15 = new wxButton( itemDialog1, wxID_APPLY, _("&Apply"), wxDefaultPosition, wxDefaultSize, 0 );

    BottomBoxSizer->Add(itemButton15, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
@@ -201,6 +202,8 @@ void WinEDA_FootprintDisplayOptionsFrame::CreateControls() 
    m_IsShowPadFill->SetValidator( wxGenericValidator(& DisplayOpt.DisplayPadFill) );

    m_IsShowPadNum->SetValidator( wxGenericValidator(& DisplayOpt.DisplayPadNum) );

////@end WinEDA_FootprintDisplayOptionsFrame content construction



    m_CancelButton->SetFocus();     /* Necessary to use escape key as cancel under wxGRk */

}



/*!

cvpcb/dialog_display_options.h

+1 −0
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ public: 
    wxCheckBox* m_IsShowPadFill;

    wxCheckBox* m_IsShowPadNum;

    wxBoxSizer* BottomBoxSizer;

    wxButton* m_CancelButton;

////@end WinEDA_FootprintDisplayOptionsFrame member variables



	WinEDA_BasePcbFrame * m_Parent;