Commit 0c9f1ef3 authored by Brian Sidebotham's avatar Brian Sidebotham
Browse files

Merge in tip changes

parents 4a15b358 bd52f006

bitmap2component/CMakeLists.txt

+0 −1
Original line number Original line Diff line number Diff line
@@ -2,7 +2,6 @@ 
include_directories(BEFORE ${INC_BEFORE})

include_directories(BEFORE ${INC_BEFORE})

include_directories(

include_directories(

    ../potrace

    ../potrace

    ../polygon/kbool/include

    ../common

    ../common

    ${INC_AFTER}

    ${INC_AFTER}

    )

    )

common/msgpanel.cpp

+0 −5
Original line number Original line Diff line number Diff line
@@ -28,11 +28,6 @@ 
 * @brief Message panel implementation file.

 * @brief Message panel implementation file.

 */

 */





#ifdef __GNUG__

#pragma implementation

#endif





#include <msgpanel.h>

#include <msgpanel.h>

cvpcb/cvframe.cpp

+4 −0
Original line number Original line Diff line number Diff line
@@ -493,6 +493,10 @@ void CVPCB_MAINFRAME::LoadNetList( wxCommandEvent& event ) 
    wxGetApp().GetLibraryPathList().Insert( newFileName.GetPath(), 0 );

    wxGetApp().GetLibraryPathList().Insert( newFileName.GetPath(), 0 );

    m_NetlistFileName = newFileName;

    m_NetlistFileName = newFileName;

    ReadNetListAndLinkFiles();

    ReadNetListAndLinkFiles();



    // OSX need it since some objects are "rebuild" just make aware AUI

    // Fixes #1258081

    m_auimgr.Update();

}

}

eeschema/class_libentry.cpp

+6 −5
Original line number Original line Diff line number Diff line
@@ -286,7 +286,7 @@ void LIB_COMPONENT::Draw( EDA_DRAW_PANEL* aPanel, wxDC* aDc, const wxPoint& aOff 
                          int aConvert, GR_DRAWMODE aDrawMode, EDA_COLOR_T aColor, const TRANSFORM& aTransform,

                          int aConvert, GR_DRAWMODE aDrawMode, EDA_COLOR_T aColor, const TRANSFORM& aTransform,

                          bool aShowPinText, bool aDrawFields, bool aOnlySelected )

                          bool aShowPinText, bool aDrawFields, bool aOnlySelected )

{

{

    BASE_SCREEN*   screen = aPanel->GetScreen();

    BASE_SCREEN*   screen = aPanel ? aPanel->GetScreen() : NULL;





    GRSetDrawMode( aDc, aDrawMode );

    GRSetDrawMode( aDc, aDrawMode );
@@ -296,7 +296,7 @@ void LIB_COMPONENT::Draw( EDA_DRAW_PANEL* aPanel, wxDC* aDc, const wxPoint& aOff 
     *   printing in black and white

     *   printing in black and white

     *   If the color is not the default color (aColor != -1 )

     *   If the color is not the default color (aColor != -1 )

     */

     */

    if( ! (screen->m_IsPrinting && GetGRForceBlackPenState())

    if( ! (screen && screen->m_IsPrinting && GetGRForceBlackPenState())

            && (aColor == UNSPECIFIED_COLOR) )

            && (aColor == UNSPECIFIED_COLOR) )

    {

    {

        BOOST_FOREACH( LIB_ITEM& drawItem, drawings )

        BOOST_FOREACH( LIB_ITEM& drawItem, drawings )
@@ -372,10 +372,11 @@ void LIB_COMPONENT::Draw( EDA_DRAW_PANEL* aPanel, wxDC* aDc, const wxPoint& aOff 
    // Enable this to draw the anchor of the component.

    // Enable this to draw the anchor of the component.

#if 0

#if 0

    int len = aDc->DeviceToLogicalXRel( 3 );

    int len = aDc->DeviceToLogicalXRel( 3 );

    EDA_RECT* const clipbox  = aPanel ? aPanel->GetClipBox() : NULL;





    GRLine( aPanel->GetClipBox(), aDc, aOffset.x, aOffset.y - len, aOffset.x,

    GRLine( clipbox, aDc, aOffset.x, aOffset.y - len, aOffset.x,

            aOffset.y + len, 0, aColor );

            aOffset.y + len, 0, aColor );

    GRLine( aPanel->GetClipBox(), aDc, aOffset.x - len, aOffset.y, aOffset.x + len,

    GRLine( clipbox, aDc, aOffset.x - len, aOffset.y, aOffset.x + len,

            aOffset.y, 0, aColor );

            aOffset.y, 0, aColor );

#endif

#endif
@@ -383,7 +384,7 @@ void LIB_COMPONENT::Draw( EDA_DRAW_PANEL* aPanel, wxDC* aDc, const wxPoint& aOff 
     * the bounding box calculations. */

     * the bounding box calculations. */

#if 0

#if 0

    EDA_RECT bBox = GetBoundingBox( aMulti, aConvert );

    EDA_RECT bBox = GetBoundingBox( aMulti, aConvert );

    GRRect( aPanel->GetClipBox(), aDc, bBox.GetOrigin().x, bBox.GetOrigin().y,

    GRRect( aPanel ? aPanel->GetClipBox() : NULL, aDc, bBox.GetOrigin().x, bBox.GetOrigin().y,

            bBox.GetEnd().x, bBox.GetEnd().y, 0, LIGHTMAGENTA );

            bBox.GetEnd().x, bBox.GetEnd().y, 0, LIGHTMAGENTA );

#endif

#endif

}

}

eeschema/class_libentry.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -403,7 +403,7 @@ public: 
    /**

    /**

     * Draw component.

     * Draw component.

     *

     *

     * @param aPanel - Window to draw on.

     * @param aPanel - Window to draw on. Can be NULL if not available.

     * @param aDc - Device context to draw on.

     * @param aDc - Device context to draw on.

     * @param aOffset - Position to component.

     * @param aOffset - Position to component.

     * @param aMulti - Component unit if multiple parts per component.

     * @param aMulti - Component unit if multiple parts per component.