Commit c3a3ac9d authored by Garth Corral's avatar Garth Corral
Browse files

Merge trunk @ 5278

parents 7edce2fa 32eb568e

CMakeModules/FindGLEW.cmake

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ IF (WIN32) 
      NAMES glew glew32 glew32s

      PATHS

      $ENV{GLEW_ROOT_PATH}/lib

      $ENV{GLEW_ROOT_PATH}/lib/Release/Win32

      ${OPENGL_LIBRARY_DIR}

    )

pcbnew/build_BOM_from_board.cpp

+6 −4
Original line number Diff line number Diff line
@@ -163,20 +163,22 @@ void PCB_EDIT_FRAME::RecreateBOMFileFromBoard( wxCommandEvent& aEvent ) 
        module = module->Next();

    }



    // Print list

    for( iter = list.begin(); iter != list.end(); iter++ )

    // Print list. Also delete temporary created objects.

    for( size_t ii = list.GetCount(); ii > 0; ii-- )

    {

        cmp* current = *iter;

        cmp* current = *list.begin();   // Because the first object will be removed

                                        // from list, all objects will be get here



        msg.Empty();



        msg << current->m_Id << wxT( ";\"" );

        msg << current->m_Ref << wxT( "\";\"" );

        msg << FROM_UTF8( current->m_fpid.Format().c_str() ) << wxT( "\";" );

        msg << FROM_UTF8( current->m_fpid.GetFootprintName().c_str() ) << wxT( "\";" );

        msg << current->m_CmpCount << wxT( ";\"" );

        msg << current->m_Val << wxT( "\";;;\n" );

        fprintf( fp_bom, "%s", TO_UTF8( msg ) );



        // We do not need this object, now: remove it from list and delete it

        list.DeleteObject( current );

        delete (current);

    }

pcbnew/class_board.cpp

+2 −0
Original line number Diff line number Diff line
@@ -2506,6 +2506,8 @@ void BOARD::ReplaceNetlist( NETLIST& aNetlist, bool aDeleteSinglePadNets, 
            pad->SetNetCode( NETINFO_LIST::UNCONNECTED );

    }



    m_ratsnest->ProcessBoard();



    // Last step: Some tests:

    // verify all pads found in netlist:

    // They should exist in footprints, otherwise the footprint is wrong

pcbnew/class_module.cpp

+6 −0
Original line number Diff line number Diff line
@@ -863,6 +863,12 @@ unsigned int MODULE::ViewGetLOD( int aLayer ) const 
        return 30;

}



const BOX2I MODULE::ViewBBox() const

{

    EDA_RECT fpRect = GetFootprintRect();



    return BOX2I( VECTOR2I( fpRect.GetOrigin() ), VECTOR2I( fpRect.GetSize() ) );

}



/* Test for validity of the name in a library of the footprint

 * ( no spaces, dir separators ... )

pcbnew/class_module.h

+3 −0
Original line number Diff line number Diff line
@@ -491,6 +491,9 @@ public: 
    /// @copydoc VIEW_ITEM::ViewGetLOD()

    virtual unsigned int ViewGetLOD( int aLayer ) const;



    /// @copydoc VIEW_ITEM::ViewBBox()

    virtual const BOX2I ViewBBox() const;



    /**

     * Function CopyNetlistSettings

     * copies the netlist settings to \a aModule.