Commit 9e6ed2b7 authored by jean-pierre charras's avatar jean-pierre charras
Browse files

Eeschema plot: fix Bug #1391538 (eeschema PS/PDF export, objects have wrong Z-order )

parent 1188cd43

eeschema/class_libentry.cpp

+22 −2
Original line number Original line Diff line number Diff line
@@ -413,9 +413,11 @@ void LIB_PART::Plot( PLOTTER* aPlotter, int aUnit, int aConvert, 
    aPlotter->SetColor( GetLayerColor( LAYER_DEVICE ) );

    aPlotter->SetColor( GetLayerColor( LAYER_DEVICE ) );

    bool fill = aPlotter->GetColorMode();

    bool fill = aPlotter->GetColorMode();





    // draw background for filled items using background option

    // Solid lines will be drawn after the background

    BOOST_FOREACH( LIB_ITEM& item, drawings )

    BOOST_FOREACH( LIB_ITEM& item, drawings )

    {

    {

        // Lib Fields not are plotted here, because this plot function

        // Lib Fields are not plotted here, because this plot function

        // is used to plot schematic items, which have they own fields

        // is used to plot schematic items, which have they own fields

        if( item.Type() == LIB_FIELD_T )

        if( item.Type() == LIB_FIELD_T )

            continue;

            continue;
@@ -426,6 +428,24 @@ void LIB_PART::Plot( PLOTTER* aPlotter, int aUnit, int aConvert, 
        if( aConvert && item.m_Convert && ( item.m_Convert != aConvert ) )

        if( aConvert && item.m_Convert && ( item.m_Convert != aConvert ) )

            continue;

            continue;





        if( item.m_Fill == FILLED_WITH_BG_BODYCOLOR )

            item.Plot( aPlotter, aOffset, fill, aTransform );

    }



    // Not filled items and filled shapes are now plotted

    // (plot only items which are not already plotted)

    BOOST_FOREACH( LIB_ITEM& item, drawings )

    {

        if( item.Type() == LIB_FIELD_T )

            continue;



        if( aUnit && item.m_Unit && ( item.m_Unit != aUnit ) )

            continue;



        if( aConvert && item.m_Convert && ( item.m_Convert != aConvert ) )

            continue;



        if( item.m_Fill != FILLED_WITH_BG_BODYCOLOR )

            item.Plot( aPlotter, aOffset, fill, aTransform );

            item.Plot( aPlotter, aOffset, fill, aTransform );

    }

    }

}

}