Commit 161068b1 authored by stambaughw's avatar stambaughw
Browse files

Minor bug and compiler warning fixes. 

* Applied sheet reference plotting patch from Lorenzo.
* Fixed bug in Pcbnew plot dialog, ignore user scaling when controls are disabled.
parent fd0e99bb

common/common_plot_functions.cpp

+2 −1
Original line number Diff line number Diff line
@@ -236,7 +236,8 @@ void WinEDA_DrawFrame::PlotWorkSheet( int format_plot, BASE_SCREEN* screen ) 
    gypas = ( yg - ref.y) / ipas;

    for( ii = ref.y + gypas, jj = 0; ipas > 0; ii += gypas, jj++, ipas-- )

    {

        msg.Empty(); msg << jj;

        msg.Empty();

        msg.Append('A' + jj);

        if( ii < yg - PAS_REF / 2 )

        {

            pos.x = ref.x * conv_unit; pos.y = ii * conv_unit;

common/wxwineda.cpp

+8 −6
Original line number Diff line number Diff line
@@ -410,8 +410,10 @@ void WinEDA_ValueCtrl::Enable( bool enbl ) 
/***************************************************************/

/* Classe pour afficher et editer une valeur en double flottant*/

/***************************************************************/

WinEDA_DFloatValueCtrl::WinEDA_DFloatValueCtrl( wxWindow* parent, const wxString& title,

                                                double value, wxBoxSizer* BoxSizer )

WinEDA_DFloatValueCtrl::WinEDA_DFloatValueCtrl( wxWindow* parent,

                                                const wxString& title,

                                                double value,

                                                wxBoxSizer* BoxSizer )

{

    wxString buffer;

    wxString label = title;

cvpcb/loadcmp.cpp

+2 −1
Original line number Diff line number Diff line
@@ -47,7 +47,8 @@ MODULE* WinEDA_DisplayFrame::Get_Module( const wxString& CmpName ) 


        if( !tmp )

        {

            msg.Printf( _( "PCB foot print library file <%s> could not be found in the default search paths." ),

            msg.Printf( _( "PCB foot print library file <%s> could not be \

found in the default search paths." ),

                        fn.GetFullName().c_str() );

            wxMessageBox( msg, titleLibLoadError, wxOK | wxICON_ERROR, this );

            continue;

gerbview/export_to_pcbnew.cpp

+3 −3
Original line number Diff line number Diff line
@@ -173,9 +173,9 @@ static int SavePcbFormatAscii( WinEDA_GerberFrame* frame, FILE* aFile, 
                double b = atan2( track->m_End.y-cy, track->m_End.x-cx );



                drawitem->m_Shape = S_ARC;

                drawitem->m_Angle = fmod( (a-b)/M_PI*1800.0+3600.0, 3600.0 );

                drawitem->m_Start.x = cx;

                drawitem->m_Start.y = cy;

                drawitem->m_Angle = (int)fmod( (a-b)/M_PI*1800.0+3600.0, 3600.0 );

                drawitem->m_Start.x = (int)cx;

                drawitem->m_Start.y = (int)cy;

            }



            pcb->Add( drawitem );

pcbnew/autoplac.cpp

+2 −1
Original line number Diff line number Diff line
@@ -327,7 +327,8 @@ void WinEDA_PcbFrame::DrawInfoPlace( wxDC* DC ) 
 */

{

    int color, ii, jj;

    int ox, oy, top_state, bottom_state;

    int ox, oy;

    BoardCell top_state, bottom_state;



    GRSetDrawMode( DC, GR_COPY );

    for( ii = 0; ii < Nrows; ii++ )