Commit 1f3f11ca authored by jean-pierre charras's avatar jean-pierre charras
Browse files

Add margin values control in pl_editor, and remove margin definition from class PAGE_INFO.

parent 50743cf3

common/class_page_info.cpp

+0 −23
Original line number Diff line number Diff line
@@ -126,25 +126,6 @@ inline void PAGE_INFO::updatePortrait() 
}





void PAGE_INFO::setMargins()

{

    if( IsGOST() )

    {

        m_left_margin   = Mm2mils( 20 );    // 20mm

        m_right_margin  =                   // 5mm

        m_top_margin    =                   // 5mm

        m_bottom_margin = Mm2mils( 5 );     // 5mm

    }

    else

    {

        m_left_margin   =

        m_right_margin  =

        m_top_margin    =

        m_bottom_margin = Mm2mils( 10 );

    }

}





PAGE_INFO::PAGE_INFO( const wxSize& aSizeMils, const wxString& aType, wxPaperSize aPaperId ) :

    m_type( aType ),

    m_size( aSizeMils ),
@@ -152,8 +133,6 @@ PAGE_INFO::PAGE_INFO( const wxSize& aSizeMils, const wxString& aType, wxPaperSiz 
{

    updatePortrait();



    setMargins();



    // This constructor is protected, and only used by const PAGE_INFO's known

    // only to class implementation, so no further changes to "this" object are

    // expected.  Therefore we should also setMargin() again when copying this
@@ -222,8 +201,6 @@ bool PAGE_INFO::SetType( const wxString& aType, bool IsPortrait ) 
        updatePortrait();

    }



    setMargins();



    return rc;

}

common/common_plot_functions.cpp

+0 −11
Original line number Diff line number Diff line
@@ -77,15 +77,6 @@ void PlotWorkSheet( PLOTTER* plotter, const TITLE_BLOCK& aTitleBlock, 
    /* Note: Page sizes values are given in mils

     */

    double   iusPerMil = plotter->GetIUsPerDecimil() * 10.0;

    wxSize   pageSize = aPageInfo.GetSizeMils();  // in mils



    wxPoint LTmargin;

    LTmargin.x = aPageInfo.GetLeftMarginMils() * iusPerMil;

    LTmargin.y = aPageInfo.GetTopMarginMils()  * iusPerMil;



    wxPoint RBmargin;

    RBmargin.x = aPageInfo.GetRightMarginMils() * iusPerMil;

    RBmargin.y = aPageInfo.GetBottomMarginMils()  * iusPerMil;



    EDA_COLOR_T plotColor = plotter->GetColorMode() ? RED : BLACK;

    plotter->SetColor( plotColor );
@@ -96,10 +87,8 @@ void PlotWorkSheet( PLOTTER* plotter, const TITLE_BLOCK& aTitleBlock, 
    wxFileName fn( aFilename );



    // Prepare plot parameters

    drawList.SetMargins( LTmargin, RBmargin);

    drawList.SetPenSize(PLOTTER::DEFAULT_LINE_WIDTH );

    drawList.SetMilsToIUfactor( iusPerMil );

    drawList.SetPageSize( pageSize );

    drawList.SetSheetNumber( aSheetNumber );

    drawList.SetSheetCount( aNumberOfSheets );

    drawList.SetFileName( fn.GetFullName() );   // Print only the short filename

common/drawpanel.cpp

+5 −4
Original line number Diff line number Diff line
@@ -563,13 +563,14 @@ void EDA_DRAW_PANEL::ReDraw( wxDC* DC, bool erasebg ) 
        g_GhostColor = WHITE;

    }



    if( erasebg )

        EraseScreen( DC );



    GRResetPenAndBrush( DC );



    DC->SetBackground( *wxBLACK_BRUSH );

    DC->SetBackground( g_DrawBgColor == BLACK ? *wxBLACK_BRUSH : *wxWHITE_BRUSH );

    DC->SetBackgroundMode( wxSOLID );



    if( erasebg )

        EraseScreen( DC );



    GetParent()->RedrawActiveWindow( DC, erasebg );



    // Verfies that the clipping is working correctly.  If these two sets of numbers are

common/hotkeys_basic.cpp

+2 −2
Original line number Diff line number Diff line
@@ -682,7 +682,7 @@ void EDA_BASE_FRAME::ImportHotkeyConfigFromFile( struct EDA_HOTKEY_CONFIG* aDesc 
    wxString ext  = DEFAULT_HOTKEY_FILENAME_EXT;

    wxString mask = wxT( "*." ) + ext;

    wxString path = wxGetCwd();

    wxString filename;

    wxString filename = wxGetApp().GetAppName() + wxT( "." ) + ext;



    filename = EDA_FileSelector( _( "Read Hotkey Configuration File:" ),

                                 path,
@@ -710,7 +710,7 @@ void EDA_BASE_FRAME::ExportHotkeyConfigToFile( struct EDA_HOTKEY_CONFIG* aDescLi 
    wxString ext  = DEFAULT_HOTKEY_FILENAME_EXT;

    wxString mask = wxT( "*." ) + ext;

    wxString path = wxGetCwd();

    wxString filename;

    wxString filename = wxGetApp().GetAppName() + wxT( "." ) + ext;



    filename = EDA_FileSelector( _( "Write Hotkey Configuration File:" ),

                                 path,

common/page_layout/class_worksheet_dataitem.cpp

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ double WORKSHEET_DATAITEM::m_DefaultTextThickness = 0.0; 
bool WORKSHEET_DATAITEM::m_SpecialMode = false;

EDA_COLOR_T WORKSHEET_DATAITEM::m_Color = RED;              // the default color to draw items

EDA_COLOR_T WORKSHEET_DATAITEM::m_AltColor = RED;           // an alternate color to draw items

EDA_COLOR_T WORKSHEET_DATAITEM::m_SelectedColor = YELLOW;   // the color to draw selected items

EDA_COLOR_T WORKSHEET_DATAITEM::m_SelectedColor = BROWN;   // the color to draw selected items



// The constructor:

WORKSHEET_DATAITEM::WORKSHEET_DATAITEM( WS_ItemType aType )