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

Pcbnew: plot dialog: remove obscure and useless option about texts which are... 

Pcbnew: plot dialog: remove obscure and useless option about texts which are not value or reference.
cosmetic enhancement in dialog.
page layout: fix bug Bug #1320839 (canvas refresh countinously called when moving an item)
parent 4e9582c3

common/page_layout/class_worksheet_dataitem.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -249,7 +249,7 @@ const wxPoint WORKSHEET_DATAITEM::GetStartPosUi( int ii ) const 
{

{

    DPOINT pos = GetStartPos( ii );

    DPOINT pos = GetStartPos( ii );

    pos = pos * m_WSunits2Iu;

    pos = pos * m_WSunits2Iu;

    return wxPoint( int(pos.x), int(pos.y) );

    return wxPoint( KiROUND(pos.x), KiROUND(pos.y) );

}

}





const DPOINT WORKSHEET_DATAITEM::GetEndPos( int ii ) const

const DPOINT WORKSHEET_DATAITEM::GetEndPos( int ii ) const
@@ -285,7 +285,7 @@ const wxPoint WORKSHEET_DATAITEM::GetEndPosUi( int ii ) const 
{

{

    DPOINT pos = GetEndPos( ii );

    DPOINT pos = GetEndPos( ii );

    pos = pos * m_WSunits2Iu;

    pos = pos * m_WSunits2Iu;

    return wxPoint( int(pos.x), int(pos.y) );

    return wxPoint( KiROUND(pos.x), KiROUND(pos.y) );

}

}

gerbview/files.cpp

+5 −5
Original line number Original line Diff line number Diff line
@@ -5,7 +5,7 @@ 
/*

/*

 * This program source code file is part of KiCad, a free EDA CAD application.

 * This program source code file is part of KiCad, a free EDA CAD application.

 *

 *

 * Copyright (C) 2012 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com

 * Copyright (C) 2012 Jean-Pierre Charras, jp.charras at wanadoo.fr

 * Copyright (C) 2004-2012 KiCad Developers, see change_log.txt for contributors.

 * Copyright (C) 2004-2012 KiCad Developers, see change_log.txt for contributors.

 *

 *

 * This program is free software; you can redistribute it and/or

 * This program is free software; you can redistribute it and/or
@@ -184,8 +184,8 @@ bool GERBVIEW_FRAME::LoadGerberFiles( const wxString& aFullFileName ) 




            if( layer == NO_AVAILABLE_LAYERS )

            if( layer == NO_AVAILABLE_LAYERS )

            {

            {

                wxString msg = wxT( "No more empty layers are available.  The remaining gerber " );

                wxString msg = wxT( "No more empty available layers.\n"

                msg += wxT( "files will not be loaded." );

                                    "The remaining gerber files will not be loaded." );

                wxMessageBox( msg );

                wxMessageBox( msg );

                break;

                break;

            }

            }
@@ -266,8 +266,8 @@ bool GERBVIEW_FRAME::LoadExcellonFiles( const wxString& aFullFileName ) 




            if( layer == NO_AVAILABLE_LAYERS )

            if( layer == NO_AVAILABLE_LAYERS )

            {

            {

                wxString msg = wxT( "No more empty layers are available.  The remaining gerber " );

                wxString msg = wxT( "No more empty available layers.\n"

                msg += wxT( "files will not be loaded." );

                                    "The remaining gerber files will not be loaded." );

                wxMessageBox( msg );

                wxMessageBox( msg );

                break;

                break;

            }

            }

gerbview/gerbview.cpp

+0 −7
Original line number Original line Diff line number Diff line
@@ -84,13 +84,6 @@ static struct IFACE : public KIFACE_I 
        case FRAME_GERBER:

        case FRAME_GERBER:

            {

            {

                GERBVIEW_FRAME* frame = new GERBVIEW_FRAME( aKiway, aParent );

                GERBVIEW_FRAME* frame = new GERBVIEW_FRAME( aKiway, aParent );



                /* Is this really needed since at this point there is no open file?

                frame->Zoom_Automatique( true );        // Zoom fit in frame



                if so, why is the constructor not doing it?

                */



                return frame;

                return frame;

            }

            }

            break;

            break;

gerbview/gerbview_frame.cpp

+2 −0
Original line number Original line Diff line number Diff line
@@ -166,6 +166,8 @@ GERBVIEW_FRAME::GERBVIEW_FRAME( KIWAY* aKiway, wxWindow* aParent ): 
    ReFillLayerWidget();                // this is near end because contents establish size

    ReFillLayerWidget();                // this is near end because contents establish size

    m_LayersManager->ReFillRender();    // Update colors in Render after the config is read

    m_LayersManager->ReFillRender();    // Update colors in Render after the config is read

    m_auimgr.Update();

    m_auimgr.Update();



    Zoom_Automatique( true );           // Gives a default zoom value

}

}

kicad/mainframe.cpp

+3 −9
Original line number Original line Diff line number Diff line
@@ -305,18 +305,12 @@ void KICAD_MANAGER_FRAME::OnRunEeschema( wxCommandEvent& event ) 




void KICAD_MANAGER_FRAME::OnRunGerbview( wxCommandEvent& event )

void KICAD_MANAGER_FRAME::OnRunGerbview( wxCommandEvent& event )

{

{

    wxFileName fn( m_ProjectFileName );

    // Gerbview is called without any file to open, because we do not know



    // the list and the name of files to open (if any...).

    wxString path = wxT( "\"" );



    path += fn.GetPath( wxPATH_GET_SEPARATOR | wxPATH_GET_VOLUME ) + wxT( "\"" );



#if USE_KIFACE && 0

#if USE_KIFACE && 0





    // I cannot make sense of the fn.



#else

#else

    Execute( this, GERBVIEW_EXE, path );

    Execute( this, GERBVIEW_EXE, wxEmptyString );

#endif

#endif

}

}