Commit c41752fd authored by Dick Hollenbeck's avatar Dick Hollenbeck
Browse files

Load BOARD project settings before loading BOARD in case BOARD has 

any configuration overrides.

Call SetDesignSettings() in PCB_BASE_FRAME::ReadSetup().
parent 75d2dc73

pcbnew/dialogs/dialog_mask_clearance.cpp

+20 −21
Original line number Diff line number Diff line
@@ -17,15 +17,15 @@ 
#include <dialog_mask_clearance.h>



/**

 *  DIALOG_PADS_MASK_CLEARANCE_BASE, derived from DIALOG_PADS_MASK_CLEARANCE_BASE_BASE

 *  @see dialog_dialog_mask_clearance_base.h and dialog_mask_clearance.cpp,

 *  automatically created by wxFormBuilder

 * Class DIALOG_PADS_MASK_CLEARANCE

 * is derived from DIALOG_PADS_MASK_CLEARANCE_BASE.

 * @see dialog_dialog_mask_clearance_base.h and dialog_mask_clearance_base.cpp,

 * which are maintained by wxFormBuilder

 */



DIALOG_PADS_MASK_CLEARANCE::DIALOG_PADS_MASK_CLEARANCE( PCB_EDIT_FRAME* parent ) :

    DIALOG_PADS_MASK_CLEARANCE_BASE( parent )

DIALOG_PADS_MASK_CLEARANCE::DIALOG_PADS_MASK_CLEARANCE( PCB_EDIT_FRAME* aParent ) :

    DIALOG_PADS_MASK_CLEARANCE_BASE( aParent )

{

    m_Parent = parent;

    m_Parent = aParent;

    m_BrdSettings = m_Parent->GetBoard()->GetDesignSettings();



    MyInit();
@@ -52,22 +52,23 @@ void DIALOG_PADS_MASK_CLEARANCE::MyInit() 
    PutValueInLocalUnits( *m_SolderPasteMarginCtrl,

                          m_BrdSettings.m_SolderPasteMargin,

                          Internal_Unit );



    if(  m_BrdSettings.m_SolderPasteMargin == 0 )

        m_SolderPasteMarginCtrl->SetValue( wxT( "-" ) +

                                           m_SolderPasteMarginCtrl->GetValue() );



    wxString msg;

    msg.Printf( wxT( "%f" ), m_BrdSettings.m_SolderPasteMarginRatio * 100.0 );

    if(  m_BrdSettings.m_SolderPasteMarginRatio == 0.0 &&

        msg[0] == '0')  // Sometimes Printf add a sign if the value is small



    // Sometimes Printf adds a sign if the value is small

    if(  m_BrdSettings.m_SolderPasteMarginRatio == 0.0 && msg[0] == '0' )

        m_SolderPasteMarginRatioCtrl->SetValue( wxT( "-" ) + msg );

    else

        m_SolderPasteMarginRatioCtrl->SetValue( msg );

}





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

void DIALOG_PADS_MASK_CLEARANCE::OnButtonOkClick( wxCommandEvent& event )

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

{

    m_BrdSettings.m_SolderMaskMargin =

        ReturnValueFromTextCtrl( *m_SolderMaskMarginCtrl, m_Parent->GetInternalUnits() );
@@ -77,11 +78,13 @@ void DIALOG_PADS_MASK_CLEARANCE::OnButtonOkClick( wxCommandEvent& event ) 


    double      dtmp    = 0;

    wxString    msg     = m_SolderPasteMarginRatioCtrl->GetValue();



    msg.ToDouble( &dtmp );



    // A margin ratio de -50% means no paste on a pad, the ratio must be >= 50 %

    if( dtmp < -50 )

        dtmp = -50;



    if( dtmp > +100 )

        dtmp = +100;
@@ -93,10 +96,6 @@ void DIALOG_PADS_MASK_CLEARANCE::OnButtonOkClick( wxCommandEvent& event ) 
}





/*!

 * wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CANCEL

 */



void DIALOG_PADS_MASK_CLEARANCE::OnButtonCancelClick( wxCommandEvent& event )

{

    EndModal( 0 );

pcbnew/files.cpp

+6 −6
Original line number Diff line number Diff line
@@ -258,8 +258,10 @@ this file again." ) ); 
        m_DisplayPadFill = DisplayOpt.DisplayPadFill;

        m_DisplayViaFill = DisplayOpt.DisplayViaFill;



        ReadPcbFile( &reader, false );

        // load project settings before BOARD, in case BOARD file has overrides.

        LoadProjectSettings( GetScreen()->GetFileName() );



        ReadPcbFile( &reader, false );

    }



#else
@@ -272,6 +274,9 @@ this file again." ) ); 
        m_DisplayModEdge = DisplayOpt.DisplayModEdge;

        m_DisplayPadFill = DisplayOpt.DisplayPadFill;

        m_DisplayViaFill = DisplayOpt.DisplayViaFill;



        // load project settings before BOARD, in case BOARD file has overrides.

        LoadProjectSettings( GetScreen()->GetFileName() );

    }

    else

    {
@@ -306,11 +311,6 @@ this file again." ) ); 
        wxMessageBox( msg, _( "Open Board File" ), wxOK | wxICON_ERROR );

    }



    if( !aAppend )

    {

        LoadProjectSettings( GetScreen()->GetFileName() );

    }



    if( loadedBoard )

    {

        // we should not ask PLUGINs to do these items:

pcbnew/ioascii.cpp

+2 −0
Original line number Diff line number Diff line
@@ -382,6 +382,8 @@ int PCB_BASE_FRAME::ReadSetup( LINE_READER* aReader ) 
            //        projects.

            GetBoard()->m_NetClasses.GetDefault()->SetParams();



            GetBoard()->SetDesignSettings( bds );



            GetBoard()->SetZoneSettings( zoneInfo );



            return 0;

pcbnew/pcbnew_config.cpp

+19 −19
Original line number Diff line number Diff line
@@ -123,10 +123,10 @@ void PCB_EDIT_FRAME::Process_Config( wxCommandEvent& event ) 
            }



            LoadProjectSettings( dlg.GetPath() );

        break;

        }

        break;



   /* Hotkey IDs */

    // Hotkey IDs

    case ID_PREFERENCES_HOTKEY_EXPORT_CONFIG:

        ExportHotkeyConfigToFile( g_Board_Editor_Hokeys_Descr );

        break;
@@ -144,7 +144,7 @@ void PCB_EDIT_FRAME::Process_Config( wxCommandEvent& event ) 
        DisplayHotkeyList( this, g_Board_Editor_Hokeys_Descr );

        break;



   /* Macros IDs*/

    // Macros IDs

    case ID_PREFRENCES_MACROS_SAVE:

        SaveMacros();

        break;