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

Pcbnew: commit Lorenzo Marcantonio's patch for THT thermals (added loading/saving using S. expr). 

Fix incorrect import of smd pads from Gpcb.
Very minor change in dialog print.
parent 096f4a10

common/pcb.keywords

+1 −0
Original line number Diff line number Diff line
@@ -164,6 +164,7 @@ trace_clearance 
trapezoid

thru

thru_hole

thru_hole_only

tstamp

user

user_trace_width

eeschema/dialogs/dialog_print_using_printer.cpp

+11 −6
Original line number Diff line number Diff line
@@ -149,6 +149,14 @@ void DIALOG_PRINT_USING_PRINTER::OnInitDialog( wxInitDialogEvent& event ) 
    m_buttonPrint->SetDefault();

}



void DIALOG_PRINT_USING_PRINTER::GetPrintOptions()

{

    SCH_EDIT_FRAME* parent = GetParent();



    parent->SetPrintMonochrome( m_checkMonochrome->IsChecked() );

    parent->SetPrintSheetReference( m_checkReference->IsChecked() );

}





void DIALOG_PRINT_USING_PRINTER::OnCloseWindow( wxCloseEvent& event )

{
@@ -160,8 +168,7 @@ void DIALOG_PRINT_USING_PRINTER::OnCloseWindow( wxCloseEvent& event ) 
        parent->SetPrintDialogSize( GetSize() );

    }



    parent->SetPrintMonochrome( m_checkMonochrome->IsChecked() );

    parent->SetPrintSheetReference( m_checkReference->IsChecked() );

    GetPrintOptions();



    EndDialog( wxID_CANCEL );

}
@@ -187,8 +194,7 @@ void DIALOG_PRINT_USING_PRINTER::OnPrintPreview( wxCommandEvent& event ) 
{

    SCH_EDIT_FRAME* parent = GetParent();



    parent->SetPrintMonochrome( m_checkMonochrome->IsChecked() );

    parent->SetPrintSheetReference( m_checkReference->IsChecked() );

    GetPrintOptions();



    // Pass two printout objects: for preview, and possible printing.

    wxString        title   = _( "Preview" );
@@ -216,8 +222,7 @@ void DIALOG_PRINT_USING_PRINTER::OnPrintButtonClick( wxCommandEvent& event ) 
{

    SCH_EDIT_FRAME* parent = GetParent();



    parent->SetPrintMonochrome( m_checkMonochrome->IsChecked() );

    parent->SetPrintSheetReference( m_checkReference->IsChecked() );

    GetPrintOptions();



    wxPrintDialogData printDialogData( parent->GetPageSetupData().GetPrintData() );

    printDialogData.SetMaxPage( g_RootSheet->CountSheets() );

eeschema/dialogs/dialog_print_using_printer.h

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ private: 
    void OnPrintPreview( wxCommandEvent& event );

    void OnPrintButtonClick( wxCommandEvent& event );

    void OnButtonCancelClick( wxCommandEvent& event ){ Close(); }



    void GetPrintOptions();

};

eeschema/dialogs/dialog_print_using_printer_base.cpp

+14 −6
Original line number Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////

// C++ code generated with wxFormBuilder (version Apr 16 2008)

// C++ code generated with wxFormBuilder (version Mar 17 2012)

// http://www.wxformbuilder.org/

//

// PLEASE DO "NOT" EDIT THIS FILE!
@@ -19,16 +19,22 @@ DIALOG_PRINT_USING_PRINTER_BASE::DIALOG_PRINT_USING_PRINTER_BASE( wxWindow* pare 
	wxBoxSizer* bleftSizer;

	bleftSizer = new wxBoxSizer( wxVERTICAL );

	

	m_staticText1 = new wxStaticText( this, wxID_ANY, _("Print options:"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticText1->Wrap( -1 );

	m_staticText1->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );

	

	bleftSizer->Add( m_staticText1, 0, wxTOP|wxRIGHT, 5 );

	

	m_checkReference = new wxCheckBox( this, wxID_ANY, _("Print sheet &reference and title block"), wxDefaultPosition, wxDefaultSize, 0 );

	m_checkReference->SetValue(true); 

	

	m_checkReference->SetToolTip( _("Print (or not) the Frame references.") );

	

	bleftSizer->Add( m_checkReference, 0, wxALL, 5 );

	bleftSizer->Add( m_checkReference, 0, wxALL, 10 );

	

	m_checkMonochrome = new wxCheckBox( this, wxID_ANY, _("Print in &black and white only"), wxDefaultPosition, wxDefaultSize, 0 );

	m_checkMonochrome->SetValue(true); 

	bleftSizer->Add( m_checkMonochrome, 0, wxBOTTOM|wxRIGHT|wxLEFT, 10 );

	

	bleftSizer->Add( m_checkMonochrome, 0, wxALL, 5 );

	

	bMainSizer->Add( bleftSizer, 1, wxBOTTOM|wxEXPAND|wxLEFT|wxTOP, 12 );
@@ -47,11 +53,12 @@ DIALOG_PRINT_USING_PRINTER_BASE::DIALOG_PRINT_USING_PRINTER_BASE( wxWindow* pare 
	m_buttonQuit = new wxButton( this, wxID_CANCEL, _("Close"), wxDefaultPosition, wxDefaultSize, 0 );

	bbuttonsSizer->Add( m_buttonQuit, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );

	

	

	bMainSizer->Add( bbuttonsSizer, 0, wxALL, 12 );

	

	

	this->SetSizer( bMainSizer );

	this->Layout();

	bMainSizer->Fit( this );

	

	// Connect Events

	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PRINT_USING_PRINTER_BASE::OnCloseWindow ) );
@@ -71,4 +78,5 @@ DIALOG_PRINT_USING_PRINTER_BASE::~DIALOG_PRINT_USING_PRINTER_BASE() 
	m_buttonPreview->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_USING_PRINTER_BASE::OnPrintPreview ), NULL, this );

	m_buttonPrint->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_USING_PRINTER_BASE::OnPrintButtonClick ), NULL, this );

	m_buttonQuit->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_USING_PRINTER_BASE::OnButtonCancelClick ), NULL, this );

	

}