Commit 60140dfb authored by Dick Hollenbeck's avatar Dick Hollenbeck
Browse files

merge

parent 1e7495e6

include/gr_basic.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -88,6 +88,8 @@ typedef int wxPenStyle; 








extern GR_DRAWMODE g_XorMode;

extern GR_DRAWMODE g_XorMode;

extern EDA_COLOR_T g_DrawBgColor;











typedef enum {

typedef enum {

pcbnew/dialogs/dialog_SVG_print.cpp

+2 −14
Original line number Original line Diff line number Diff line
@@ -320,18 +320,6 @@ void DIALOG_SVG_PRINT::ExportSVGFile( bool aOnlyOneFile ) 
                    );

                    );

        }

        }





        wxFileName fn(boardFilename);

        BuildPlotFileName( &fn, outputDir.GetPath(), suffix, SVGFileExtension );



        if( m_PrintBoardEdgesCtrl->IsChecked() )

            m_printMaskLayer |= EDGE_LAYER;



        if( CreateSVGFile( fn.GetFullPath() ) )

            msg.Printf( _( "Plot: %s OK\n" ), GetChars( fn.GetFullPath() ) );

        else    // Error

            msg.Printf( _( "** Unable to create %s **\n" ), GetChars( fn.GetFullPath() ) );

        m_messagesBox->AppendText( msg );



        if( aOnlyOneFile )

        if( aOnlyOneFile )

            break;

            break;

    }

    }
@@ -378,9 +366,9 @@ bool DIALOG_SVG_PRINT::CreateSVGFile( const wxString& aFullFileName ) 
    }

    }





    LOCALE_IO    toggle;

    LOCALE_IO    toggle;



    SVG_PLOTTER* plotter = (SVG_PLOTTER*) StartPlotBoard( m_board,

    SVG_PLOTTER* plotter = (SVG_PLOTTER*) StartPlotBoard( m_board,

                                                          &plot_opts, aFullFileName,

                     &plot_opts, UNDEFINED_LAYER, aFullFileName, wxEmptyString );

                                                          wxEmptyString );





    if( plotter )

    if( plotter )

    {

    {

pcbnew/dialogs/dialog_plot.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -797,7 +797,7 @@ void DIALOG_PLOT::Plot( wxCommandEvent& event ) 
        LOCALE_IO toggle;

        LOCALE_IO toggle;





        BOARD*      board = m_parent->GetBoard();

        BOARD*      board = m_parent->GetBoard();

        PLOTTER*    plotter = StartPlotBoard( board, &m_plotOpts, fn.GetFullPath(), wxEmptyString );

        PLOTTER*    plotter = StartPlotBoard( board, &m_plotOpts, layer, fn.GetFullPath(), wxEmptyString );





        // Print diags in messages box:

        // Print diags in messages box:

        wxString msg;

        wxString msg;

pcbnew/exporters/export_gencad.cpp

+5 −0
Original line number Original line Diff line number Diff line
@@ -255,6 +255,9 @@ static double MapYTo( int aY ) 
/* Driver function: processing starts here */

/* Driver function: processing starts here */

void PCB_EDIT_FRAME::ExportToGenCAD( wxCommandEvent& aEvent )

void PCB_EDIT_FRAME::ExportToGenCAD( wxCommandEvent& aEvent )

{

{



#if 0   // working on this 30-Jun-14, not ready yet, failed the initial testing.



    wxFileName  fn = GetBoard()->GetFileName();

    wxFileName  fn = GetBoard()->GetFileName();

    FILE*       file;

    FILE*       file;
@@ -344,6 +347,8 @@ void PCB_EDIT_FRAME::ExportToGenCAD( wxCommandEvent& aEvent ) 
            module->SetFlag( 0 );

            module->SetFlag( 0 );

        }

        }

    }

    }

#endif



}

}

pcbnew/exporters/export_vrml.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -439,9 +439,9 @@ static void write_layers( MODEL_VRML& aModel, std::ofstream& output_file, BOARD* 
    aModel.plated_holes.Tesselate( NULL, true );

    aModel.plated_holes.Tesselate( NULL, true );

    write_triangle_bag( output_file, aModel.GetColor( VRML_COLOR_TIN ),

    write_triangle_bag( output_file, aModel.GetColor( VRML_COLOR_TIN ),

                        &aModel.plated_holes, false, false,

                        &aModel.plated_holes, false, false,

                        aModel.GetLayerZ( LAST_COPPER_LAYER )

                        aModel.GetLayerZ( F_Cu )

                        + Millimeter2iu( ART_OFFSET / 2.0 ) * aModel.scale,

                        + Millimeter2iu( ART_OFFSET / 2.0 ) * aModel.scale,

                        aModel.GetLayerZ( FIRST_COPPER_LAYER )

                        aModel.GetLayerZ( B_Cu )

                        - Millimeter2iu( ART_OFFSET / 2.0 ) * aModel.scale,

                        - Millimeter2iu( ART_OFFSET / 2.0 ) * aModel.scale,

                        aModel.precision );

                        aModel.precision );