Commit 2fe9a99b authored by Lorenzo Marcantonio's avatar Lorenzo Marcantonio Committed by jean-pierre charras
Browse files

Commit patch from Lorenzo Marcantonio about plot functions enhancement. 

Fix some warning compil issues.
Add zlib sources to avoid build issues under Windows (zlib not installed with mingw).
parents ebcb6d3b 684d98ec

CMakeLists.txt

+1 −0
Original line number Diff line number Diff line
@@ -257,6 +257,7 @@ set(INC_AFTER 


add_subdirectory(bitmaps_png)

add_subdirectory(common)

add_subdirectory(zlib)

add_subdirectory(3d-viewer)

add_subdirectory(cvpcb)

add_subdirectory(eeschema)

common/CMakeLists.txt

+2 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ include_directories( 
    ../3d-viewer

    ../pcbnew

    ../polygon

    ../zlib

    ${INC_AFTER}

    )
@@ -42,6 +43,7 @@ set(COMMON_SRCS 
    common_plot_functions.cpp

    common_plotHPGL_functions.cpp

    common_plotPS_functions.cpp

    common_plotPDF_functions.cpp

    common_plotGERBER_functions.cpp

    common_plotDXF_functions.cpp

    confirm.cpp

common/class_bitmap_base.cpp

+6 −6
Original line number Diff line number Diff line
@@ -252,8 +252,8 @@ void BITMAP_BASE::Rotate( bool aRotateCCW ) 




void BITMAP_BASE::PlotImage( PLOTTER*       aPlotter,

                             wxPoint  aPos,

                             int      aDefaultColor,

                             const wxPoint& aPos,

                             EDA_COLOR_T    aDefaultColor,

                             int            aDefaultPensize )

{

    if( m_image == NULL )
@@ -261,8 +261,8 @@ void BITMAP_BASE::PlotImage( PLOTTER* aPlotter, 


    // These 2 lines are useful only fot plotters that cannot plot a bitmap

    // and plot arectangle instead of.

    aPlotter->set_color( aDefaultColor );

    aPlotter->set_current_line_width( aDefaultPensize );

    aPlotter->SetColor( aDefaultColor );

    aPlotter->SetCurrentLineWidth( aDefaultPensize );



    aPlotter->PlotImage( *m_image, aPos, GetScalingFactor() );

}

common/class_plotter.cpp

+305 −216

File changed.

Preview size limit exceeded, changes collapsed.

common/common_plotDXF_functions.cpp

+480 −188

File changed.

Preview size limit exceeded, changes collapsed.