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

Fixed minor bugs and printing problems, and others minor enhancements

parent ac00eede

CHANGELOG.txt

+5 −0
Original line number Diff line number Diff line
@@ -4,6 +4,11 @@ KiCad ChangeLog 2010 
Please add newer entries at the top, list the date and your name with

email address.



2010-apr-22, UPDATE Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr>

================================================================================

++Pcbnew+Gerbview:

    Fixed minor problems in printing.



2010-apr-19, UPDATE Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr>

================================================================================

++Pcbnew:

gerbview/dialog_print_using_printer.cpp

+19 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ private: 
    void OnPageSetup( wxCommandEvent& event );

    void OnPrintPreview( wxCommandEvent& event );

    void OnPrintButtonClick( wxCommandEvent& event );

	void OnScaleSelectionClick( wxCommandEvent& event );



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

    void SetPrintParameters( );
@@ -210,6 +211,8 @@ void DIALOG_PRINT_USING_PRINTER::InitValues( ) 
    }



    m_ScaleOption->SetSelection( scale_idx );

    scale_idx = m_ScaleOption->GetSelection();

    s_Parameters.m_PrintScale =  s_ScaleList[scale_idx];

    m_Print_Mirror->SetValue(s_Parameters.m_PrintMirror);
@@ -225,6 +228,12 @@ void DIALOG_PRINT_USING_PRINTER::InitValues( ) 
    m_FineAdjustXscaleOpt->SetValue( msg );

    msg.Printf( wxT( "%f" ), s_Parameters.m_YScaleAdjust );

    m_FineAdjustYscaleOpt->SetValue( msg );



    bool enable = (s_Parameters.m_PrintScale == 1.0);

    if( m_FineAdjustXscaleOpt )

        m_FineAdjustXscaleOpt->Enable(enable);

    if( m_FineAdjustYscaleOpt )

        m_FineAdjustYscaleOpt->Enable(enable);

}



/*************************************************/
@@ -336,6 +345,16 @@ void DIALOG_PRINT_USING_PRINTER::SetPrintParameters( ) 
    g_pcb_plot_options.ScaleAdjX = s_Parameters.m_YScaleAdjust;

}



void DIALOG_PRINT_USING_PRINTER::OnScaleSelectionClick( wxCommandEvent& event )

{

    double scale = s_ScaleList[m_ScaleOption->GetSelection()];

    bool enable = (scale == 1.0);

    if( m_FineAdjustXscaleOpt )

        m_FineAdjustXscaleOpt->Enable(enable);

    if( m_FineAdjustYscaleOpt )

        m_FineAdjustYscaleOpt->Enable(enable);

}



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

void DIALOG_PRINT_USING_PRINTER::OnPageSetup( wxCommandEvent& event )

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

gerbview/dialog_print_using_printer_base.cpp

+6 −4
Original line number Diff line number Diff line
@@ -95,16 +95,16 @@ DIALOG_PRINT_USING_PRINTER_base::DIALOG_PRINT_USING_PRINTER_base( wxWindow* pare 
	b_buttonsSizer = new wxBoxSizer( wxVERTICAL );

	

	m_buttonOption = new wxButton( this, wxID_PRINT_OPTIONS, _("Page Options"), wxDefaultPosition, wxDefaultSize, 0 );

	b_buttonsSizer->Add( m_buttonOption, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );

	b_buttonsSizer->Add( m_buttonOption, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );

	

	m_buttonPreview = new wxButton( this, wxID_PREVIEW, _("Preview"), wxDefaultPosition, wxDefaultSize, 0 );

	b_buttonsSizer->Add( m_buttonPreview, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );

	b_buttonsSizer->Add( m_buttonPreview, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );

	

	m_buttonPrint = new wxButton( this, wxID_PRINT_ALL, _("Print"), wxDefaultPosition, wxDefaultSize, 0 );

	b_buttonsSizer->Add( m_buttonPrint, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );

	b_buttonsSizer->Add( m_buttonPrint, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );

	

	m_buttonQuit = new wxButton( this, wxID_CANCEL, _("Close"), wxDefaultPosition, wxDefaultSize, 0 );

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

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

	

	bMainSizer->Add( b_buttonsSizer, 0, wxALIGN_CENTER_VERTICAL, 5 );
@@ -113,6 +113,7 @@ DIALOG_PRINT_USING_PRINTER_base::DIALOG_PRINT_USING_PRINTER_base( wxWindow* pare 
	

	// Connect Events

	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnCloseWindow ) );

	m_ScaleOption->Connect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnScaleSelectionClick ), NULL, this );

	m_buttonOption->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnPageSetup ), NULL, this );

	m_buttonPreview->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnPrintPreview ), NULL, this );

	m_buttonPrint->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnPrintButtonClick ), NULL, this );
@@ -123,6 +124,7 @@ DIALOG_PRINT_USING_PRINTER_base::~DIALOG_PRINT_USING_PRINTER_base() 
{

	// Disconnect Events

	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnCloseWindow ) );

	m_ScaleOption->Disconnect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnScaleSelectionClick ), NULL, this );

	m_buttonOption->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnPageSetup ), NULL, this );

	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 );

gerbview/dialog_print_using_printer_base.fbp

+5 −5
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ 
                                <event name="OnMouseEvents"></event>

                                <event name="OnMouseWheel"></event>

                                <event name="OnPaint"></event>

                                <event name="OnRadioBox"></event>

                                <event name="OnRadioBox">OnScaleSelectionClick</event>

                                <event name="OnRightDClick"></event>

                                <event name="OnRightDown"></event>

                                <event name="OnRightUp"></event>
@@ -601,7 +601,7 @@ 
                        <property name="permission">none</property>

                        <object class="sizeritem" expanded="1">

                            <property name="border">5</property>

                            <property name="flag">wxALL|wxALIGN_CENTER_HORIZONTAL</property>

                            <property name="flag">wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND</property>

                            <property name="proportion">0</property>

                            <object class="wxButton" expanded="1">

                                <property name="bg"></property>
@@ -653,7 +653,7 @@ 
                        </object>

                        <object class="sizeritem" expanded="1">

                            <property name="border">5</property>

                            <property name="flag">wxALL|wxALIGN_CENTER_HORIZONTAL</property>

                            <property name="flag">wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND</property>

                            <property name="proportion">0</property>

                            <object class="wxButton" expanded="1">

                                <property name="bg"></property>
@@ -705,7 +705,7 @@ 
                        </object>

                        <object class="sizeritem" expanded="1">

                            <property name="border">5</property>

                            <property name="flag">wxALL|wxALIGN_CENTER_HORIZONTAL</property>

                            <property name="flag">wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND</property>

                            <property name="proportion">0</property>

                            <object class="wxButton" expanded="1">

                                <property name="bg"></property>
@@ -757,7 +757,7 @@ 
                        </object>

                        <object class="sizeritem" expanded="1">

                            <property name="border">5</property>

                            <property name="flag">wxALL|wxALIGN_CENTER_HORIZONTAL</property>

                            <property name="flag">wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND</property>

                            <property name="proportion">0</property>

                            <object class="wxButton" expanded="1">

                                <property name="bg"></property>

gerbview/dialog_print_using_printer_base.h

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ class DIALOG_PRINT_USING_PRINTER_base : public wxDialog 
		

		// Virtual event handlers, overide them in your derived class

		virtual void OnCloseWindow( wxCloseEvent& event ){ event.Skip(); }

		virtual void OnScaleSelectionClick( wxCommandEvent& event ){ event.Skip(); }

		virtual void OnPageSetup( wxCommandEvent& event ){ event.Skip(); }

		virtual void OnPrintPreview( wxCommandEvent& event ){ event.Skip(); }

		virtual void OnPrintButtonClick( wxCommandEvent& event ){ event.Skip(); }