Commit 9039a0a5 authored by charras's avatar charras
Browse files

minor changes and cleanup

parent b2494d5b

common/msgpanel.cpp

+0 −4
Original line number Diff line number Diff line
@@ -9,9 +9,7 @@ 
#include "fctsys.h"



#include "wxstruct.h"

#include "gr_basic.h"

#include "common.h"

#include "macros.h"



/* table des evenements captes par un WinEDA_MsgPanel */

BEGIN_EVENT_TABLE( WinEDA_MsgPanel, wxPanel )
@@ -171,7 +169,6 @@ void WinEDA_MsgPanel::EraseMsgBox() 
   Refresh();

}





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

void WinEDA_MsgPanel::erase( wxDC* DC )

/*******************************************/
@@ -192,4 +189,3 @@ void WinEDA_MsgPanel::erase( wxDC* DC ) 


    DC->DrawRectangle( 0, 0, size.x, size.y );

}

eeschema/annotate_dialog.cpp

+5 −5
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ IMPLEMENT_DYNAMIC_CLASS( WinEDA_AnnotateFrame, wxDialog ) 
 */



BEGIN_EVENT_TABLE( WinEDA_AnnotateFrame, wxDialog )

    EVT_BUTTON( wxID_CLEAR, WinEDA_AnnotateFrame::OnClear )

    EVT_BUTTON( ID_CLEAR_ANNOTATION, WinEDA_AnnotateFrame::OnClearAnnotation )

    EVT_BUTTON( wxID_APPLY, WinEDA_AnnotateFrame::OnApply )

    EVT_BUTTON( wxID_CANCEL, WinEDA_AnnotateFrame::OnCancel )

END_EVENT_TABLE()
@@ -204,15 +204,15 @@ void WinEDA_AnnotateFrame::CreateControls() 


    /* Standard dialog buttons and sizer. */

    wxBoxSizer* sizerDialogButtons = new wxBoxSizer( wxHORIZONTAL );

    wxButton* btnClose = new wxButton( this, wxID_CANCEL );

    wxButton* btnClose = new wxButton( this, wxID_CANCEL, _("Close") );

    /* TODO: Check if there is any existing annotation and enable/disable

     *       the clear button accordingly.  Probably should also enable/

     *       disable new components radio button if all of the components

     *       are already annotated.  Some low level work on the DrawSheetPath

     *       class will need to be done to accomadate this.

     */

    m_btnClear = new wxButton( this, wxID_CLEAR );

    wxButton* btnApply = new wxButton( this, wxID_APPLY );

    m_btnClear = new wxButton( this, ID_CLEAR_ANNOTATION, _("Clear Annotation") );

    wxButton* btnApply = new wxButton( this, wxID_APPLY, _("Annotation") );

    sizerDialogButtons->Add( btnClose, flagsDialogButtonSpacing );

    sizerDialogButtons->Add( new wxBoxSizer( wxHORIZONTAL ),

                             wxSizerFlags( 1 ).Expand( ) );
@@ -256,7 +256,7 @@ wxIcon WinEDA_AnnotateFrame::GetIconResource( const wxString& name ) 
    return wxNullIcon;

}



void WinEDA_AnnotateFrame::OnClear( wxCommandEvent& event )

void WinEDA_AnnotateFrame::OnClearAnnotation( wxCommandEvent& event )

{

    int response;

eeschema/annotate_dialog.h

+3 −1
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ 
#define ID_RESET_ANNOTATION      10003

#define ID_SORT_BY_POSITION      10004

#define ID_SORT_BY_VALUE         10005

#define ID_CLEAR_ANNOTATION 	 10006





#define ANNOTATE_DIALOG_STYLE    wxDEFAULT_DIALOG_STYLE | MAYBE_RESIZE_BORDER

#define ANNOTATE_DIALOG_TITLE    _( "Annotate" )
@@ -101,7 +103,7 @@ public: 
private:

    void CloseDialog( void );



    void OnClear( wxCommandEvent& event );

    void OnClearAnnotation( wxCommandEvent& event );

    void OnApply( wxCommandEvent& event );

    void OnCancel( wxCommandEvent& event );

pcbnew/lay2plot.cpp

+11 −1
Original line number Diff line number Diff line
@@ -150,6 +150,16 @@ static void Plot_Module( WinEDA_DrawPanel* panel, wxDC* DC, 
    {

        if( (pt_pad->m_Masque_Layer & masklayer ) == 0 )

            continue;

		// Usually we draw pads in sketch mode on non copper layers:

		if ( (masklayer & ALL_CU_LAYERS) == 0 )

		{

			int tmp_fill = ((WinEDA_BasePcbFrame*)panel->m_Parent)->m_DisplayPadFill;

			// Switch in sketch mode

			((WinEDA_BasePcbFrame*)panel->m_Parent)->m_DisplayPadFill = 0;

			pt_pad->Draw( panel, DC, draw_mode );

			((WinEDA_BasePcbFrame*)panel->m_Parent)->m_DisplayPadFill = tmp_fill;

		}

		else	// on copper layer, draw pads accordint to current options

			pt_pad->Draw( panel, DC, draw_mode );

    }

polygon/PolyLine.h

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
#include "PolyLine2Kicad.h"





#include "freepcb_ids.h"

#include "freepcbDisplayList.h"

#include "math_for_graphics.h"