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

Make gerbview compilable and working (does not use now layers and layer masks from Pcbnew). 

Export to Pcbnew is broken, but it is a very rarely used feature. It will be fixed later.
parents 86276841 013296cb

common/copy_to_clipboard.cpp

+2 −1
Original line number Original line Diff line number Diff line
@@ -109,7 +109,8 @@ bool DrawPageOnClipboard( EDA_DRAW_FRAME* aFrame ) 
        dc.SetClippingRegion( DrawArea );

        dc.SetClippingRegion( DrawArea );

    }

    }





    aFrame->PrintPage( &dc, FULL_LAYERS, false );

    const LSET allLayersMask = LSET().set();

    aFrame->PrintPage( &dc, allLayersMask, false );

    screen->m_IsPrinting = false;

    screen->m_IsPrinting = false;

    aFrame->GetCanvas()->SetClipBox( tmp );

    aFrame->GetCanvas()->SetClipBox( tmp );

    wxMetafile* mf = dc.Close();

    wxMetafile* mf = dc.Close();

gerbview/block.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <gr_basic.h>

#include <gr_basic.h>





#include <gerbview.h>

#include <gerbview.h>

#include <gerbview_frame.h>

#include <class_gerber_draw_item.h>

#include <class_gerber_draw_item.h>





#include <wx/debug.h>

#include <wx/debug.h>

gerbview/class_DCodeSelectionbox.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include <wxstruct.h>

#include <wxstruct.h>

#include <class_drawpanel.h>

#include <class_drawpanel.h>

#include <gerbview.h>

#include <gerbview.h>

#include <dcode.h>





#include <class_DCodeSelectionbox.h>

#include <class_DCodeSelectionbox.h>

gerbview/class_GERBER.cpp

+1 −0
Original line number Original line Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <macros.h>

#include <macros.h>





#include <gerbview.h>

#include <gerbview.h>

#include <gerbview_frame.h>

#include <class_GERBER.h>

#include <class_GERBER.h>

gerbview/class_excellon.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -76,7 +76,7 @@ private: 
    excellon_state m_State;         // state of excellon file analysis

    excellon_state m_State;         // state of excellon file analysis

    bool           m_SlotOn;        // true during an oval driil definition

    bool           m_SlotOn;        // true during an oval driil definition





public: EXCELLON_IMAGE( GERBVIEW_FRAME* aParent, LAYER_NUM layer ) :

public: EXCELLON_IMAGE( GERBVIEW_FRAME* aParent, int layer ) :

        GERBER_IMAGE( aParent, layer )

        GERBER_IMAGE( aParent, layer )

    {

    {

        m_State  = READ_HEADER_STATE;

        m_State  = READ_HEADER_STATE;