Commit e6602b0c authored by lifekidyeaa's avatar lifekidyeaa
Browse files

fixed a logical bug in the creation of drill files.

parent bbb131b2

pcbnew/dialog_gendrill.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -73,7 +73,7 @@ WinEDA_DrillFrame::WinEDA_DrillFrame( WinEDA_PcbFrame* parent, wxWindowID id, 
    const wxString& caption, const wxPoint& pos, const wxSize& size, long style )

    const wxString& caption, const wxPoint& pos, const wxSize& size, long style )

{

{

    m_Parent = parent;

    m_Parent = parent;

    SetFont( *g_DialogFont );

    //SetFont( *g_DialogFont );





    SetReturnCode( 1 );

    SetReturnCode( 1 );

    Init();

    Init();

pcbnew/gendrill.cpp

+59 −59
Original line number Original line Diff line number Diff line
@@ -286,9 +286,8 @@ void WinEDA_DrillFrame::GenDrillFiles( wxCommandEvent& event ) 
    {

    {

        Build_Holes_List( m_Parent->m_Pcb, s_HoleListBuffer, s_ToolListBuffer,

        Build_Holes_List( m_Parent->m_Pcb, s_HoleListBuffer, s_ToolListBuffer,

                          layer1, layer2, gen_through_holes ? false : true );

                          layer1, layer2, gen_through_holes ? false : true );

        if( s_ToolListBuffer.size() == 0 )  // No holes !

        if( s_ToolListBuffer.size() > 0 ) //holes?

            continue;

		{



			FullFileName = m_Parent->m_CurrentScreen->m_FileName;

			FullFileName = m_Parent->m_CurrentScreen->m_FileName;

			layer_extend.Empty();

			layer_extend.Empty();

			if( !gen_through_holes )

			if( !gen_through_holes )
@@ -345,6 +344,7 @@ void WinEDA_DrillFrame::GenDrillFiles( wxCommandEvent& event ) 
	

	

			if(  !ExistsBuriedVias )

			if(  !ExistsBuriedVias )

				break;

				break;

		}

        if(  gen_through_holes )

        if(  gen_through_holes )

            layer2 = layer1 + 1;

            layer2 = layer1 + 1;

        else

        else

pcbnew/makefile.include

+2 −1
Original line number Original line Diff line number Diff line
@@ -116,7 +116,8 @@ OBJECTS= $(TARGET).o classpcb.o\ 
		modedit.o\

		modedit.o\

		export_gencad.o\

		export_gencad.o\

		hotkeys.o \

		hotkeys.o \

        collectors.o

        collectors.o \

		set_color.o