Commit 7080828f authored by jean-pierre charras's avatar jean-pierre charras
Browse files

More about worksheet code.

parent 26f2c04f

common/CMakeLists.txt

+7 −0
Original line number Original line Diff line number Diff line
@@ -26,6 +26,12 @@ set(COMMON_ABOUT_DLG_SRCS 
    dialogs/dialog_page_settings_base.cpp

    dialogs/dialog_page_settings_base.cpp

    )

    )





if(KICAD_GOST)

    set( TITLE_BLOCK_SHAPES title_block_shapes_gost )

else()

    set( TITLE_BLOCK_SHAPES title_block_shapes )

endif()



set(COMMON_SRCS

set(COMMON_SRCS

    ${COMMON_ABOUT_DLG_SRCS}

    ${COMMON_ABOUT_DLG_SRCS}

    base_struct.cpp

    base_struct.cpp
@@ -76,6 +82,7 @@ set(COMMON_SRCS 
    richio.cpp

    richio.cpp

    selcolor.cpp

    selcolor.cpp

    string.cpp

    string.cpp

    ${TITLE_BLOCK_SHAPES}.cpp

    trigo.cpp

    trigo.cpp

    wildcards_and_files_ext.cpp

    wildcards_and_files_ext.cpp

    worksheet.cpp

    worksheet.cpp

common/common_plot_functions.cpp

+5 −6
Original line number Original line Diff line number Diff line
@@ -90,17 +90,16 @@ void PlotWorkSheet( PLOTTER* plotter, const TITLE_BLOCK& aTitleBlock, 
    plotter->SetCurrentLineWidth( PLOTTER::DEFAULT_LINE_WIDTH );

    plotter->SetCurrentLineWidth( PLOTTER::DEFAULT_LINE_WIDTH );

    WS_DRAW_ITEM_LIST drawList;

    WS_DRAW_ITEM_LIST drawList;





    // Initialize plot parameters

    // Prepare plot parameters

    drawList.SetMargins( LTmargin, RBmargin);

    drawList.SetMargins( LTmargin, RBmargin);

    drawList.SetPenSize(PLOTTER::DEFAULT_LINE_WIDTH );

    drawList.SetPenSize(PLOTTER::DEFAULT_LINE_WIDTH );

    drawList.SetMilsToIUfactor( iusPerMil );

    drawList.SetMilsToIUfactor( iusPerMil );

    drawList.SetPageSize( pageSize );

    drawList.SetPageSize( pageSize );

    drawList.SetSheetNumber( aSheetNumber );

    drawList.SetSheetCount( aNumberOfSheets );





    drawList.BuildWorkSheetGraphicList(

    drawList.BuildWorkSheetGraphicList( aPageInfo.GetType(), aFilename,

                               aPageInfo.GetType(), aFilename,

                               aSheetDesc, aTitleBlock, plotColor, plotColor );

                               aSheetDesc,

                               aTitleBlock, aNumberOfSheets, aSheetNumber,

                               plotColor, plotColor );





    // Draw item list

    // Draw item list

    for( WS_DRAW_ITEM_BASE* item = drawList.GetFirst(); item;

    for( WS_DRAW_ITEM_BASE* item = drawList.GetFirst(); item;