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

Pcbnew+Gerbview: Fixed minor bugs and printing problems, and others minor... 

Pcbnew+Gerbview: Fixed minor bugs and printing problems, and others minor enhancements, from testing branch
parents e846be13 b471f8d7

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:

eeschema/dialog_print_using_printer_base.cpp

+74 −74
Original line number Diff line number Diff line
@@ -36,16 +36,16 @@ DIALOG_PRINT_USING_PRINTER_BASE::DIALOG_PRINT_USING_PRINTER_BASE( wxWindow* pare 
	bbuttonsSizer = new wxBoxSizer( wxVERTICAL );

	

	m_buttonPageSetup = new wxButton( this, wxID_ANY, _("Page Setup"), wxDefaultPosition, wxDefaultSize, 0 );

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

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

	

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

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

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

	

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

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

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

	

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

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

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

	

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

eeschema/dialog_print_using_printer_base.fbp

+415 −415
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ 
                        <property name="permission">none</property>

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

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

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

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

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

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

                                <property name="bg"></property>
@@ -253,7 +253,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>
@@ -305,7 +305,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>
@@ -357,7 +357,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.cpp

+38 −13
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ static double s_ScaleList[] = 


// static print data and page setup data, to remember settings during the session

static wxPrintData* g_PrintData;

static wxPageSetupDialogData* g_pageSetupData = (wxPageSetupDialogData*) NULL;



// Variables locales

static PRINT_PARAMETERS  s_Parameters;
@@ -58,9 +59,10 @@ public: 
private:

    void OnCloseWindow( wxCloseEvent& event );

    void OnInitDialog( wxInitDialogEvent& event );

    void OnPrintSetup( wxCommandEvent& event );

    void OnPageSetup( wxCommandEvent& event );

    void OnPrintPreview( wxCommandEvent& event );

    void OnPrintButtonClick( wxCommandEvent& event );

	void OnScaleSelectionClick( wxCommandEvent& event );



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

    void SetPrintParameters( );
@@ -130,8 +132,18 @@ void DIALOG_PRINT_USING_PRINTER::InitValues( ) 
    int      layer_max = NB_LAYERS;

    wxString msg;



    layer_max = 32;

    if( g_pageSetupData == NULL )

    {

        g_pageSetupData = new wxPageSetupDialogData;

        // Set initial page margins.

        // Margins are already set in Pcbnew, so we cans use 0

        g_pageSetupData->SetMarginTopLeft(wxPoint(0, 0));

        g_pageSetupData->SetMarginBottomRight(wxPoint(0, 0));

    }



    s_Parameters.m_PageSetupData = g_pageSetupData;



    layer_max = 32;

    /* Create layer list */

    int mask = 1, ii;

    for( ii = 0; ii < layer_max; ii++, mask <<= 1 )
@@ -199,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);
@@ -214,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);

}



/*************************************************/
@@ -325,25 +345,30 @@ 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::OnPrintSetup( wxCommandEvent& event )

void DIALOG_PRINT_USING_PRINTER::OnPageSetup( wxCommandEvent& event )

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



/* Open a dialog box for printer setup (printer options, page size ...)

 */

{

    wxPrintDialogData printDialogData( *g_PrintData );

    *g_pageSetupData = *g_PrintData;



    if( printDialogData.Ok() )

    {

        wxPrintDialog printerDialog( this, &printDialogData );



        printerDialog.ShowModal();

    wxPageSetupDialog pageSetupDialog(this, g_pageSetupData);

    pageSetupDialog.ShowModal();



        *g_PrintData = printerDialog.GetPrintDialogData().GetPrintData();

    }

    else

        DisplayError( this, _( "Printer Problem!" ) );

    (*g_PrintData) = pageSetupDialog.GetPageSetupDialogData().GetPrintData();

    (*g_pageSetupData) = pageSetupDialog.GetPageSetupDialogData();

}

gerbview/dialog_print_using_printer_base.cpp

+8 −6
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,7 +113,8 @@ 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_buttonOption->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnPrintSetup ), NULL, this );

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

	m_buttonQuit->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnButtonCancelClick ), NULL, this );
@@ -123,7 +124,8 @@ 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_buttonOption->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnPrintSetup ), NULL, this );

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

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