Commit e0303a45 authored by Lorenzo Marcantonio's avatar Lorenzo Marcantonio
Browse files

- New typedef LAYER_MSK to encapsulate a layer bitmap

- Renamed ReturnMaskLayer to GetLayerMask (since it's a plain getter)
parent 1702ab3a
Loading
Loading
Loading
Loading
+1 −1
Original line number Original line Diff line number Diff line
@@ -320,7 +320,7 @@ void EDA_DRAW_FRAME::ToolOnRightClick( wxCommandEvent& event )
}
}




void EDA_DRAW_FRAME::PrintPage( wxDC* aDC,int aPrintMask, bool aPrintMirrorMode, void* aData )
void EDA_DRAW_FRAME::PrintPage( wxDC* aDC,LAYER_MSK aPrintMask, bool aPrintMirrorMode, void* aData )
{
{
    wxMessageBox( wxT("EDA_DRAW_FRAME::PrintPage() error") );
    wxMessageBox( wxT("EDA_DRAW_FRAME::PrintPage() error") );
}
}
+1 −1
Original line number Original line Diff line number Diff line
@@ -71,7 +71,7 @@ int GetLayerMask( int aLayerNumber )


/* Look up Table for conversion copper layer count -> general copper layer
/* Look up Table for conversion copper layer count -> general copper layer
 * mask: */
 * mask: */
int g_TabAllCopperLayerMask[NB_COPPER_LAYERS] = {
LAYER_MSK g_TabAllCopperLayerMask[NB_COPPER_LAYERS] = {
    0x0001, 0x8001, 0x8003, 0x8007,
    0x0001, 0x8001, 0x8003, 0x8007,
    0x800F, 0x801F, 0x803F, 0x807F,
    0x800F, 0x801F, 0x803F, 0x807F,
    0x80FF, 0x81FF, 0x83FF, 0x87FF,
    0x80FF, 0x81FF, 0x83FF, 0x87FF,
+1 −1
Original line number Original line Diff line number Diff line
@@ -144,7 +144,7 @@ void LIB_EDIT_FRAME::SVG_Print_Component( const wxString& FullFileName )
                                            plotBW, plotFrameRef );
                                            plotBW, plotFrameRef );
}
}


void LIB_EDIT_FRAME::PrintPage( wxDC* aDC, int aPrintMask, bool aPrintMirrorMode, void* aData)
void LIB_EDIT_FRAME::PrintPage( wxDC* aDC, LAYER_MSK aPrintMask, bool aPrintMirrorMode, void* aData)
{
{
    if( ! m_component )
    if( ! m_component )
        return;
        return;
+1 −1
Original line number Original line Diff line number Diff line
@@ -637,7 +637,7 @@ public:
     * @param aPrintMirrorMode = not used here (Set when printing in mirror mode)
     * @param aPrintMirrorMode = not used here (Set when printing in mirror mode)
     * @param aData = a pointer on an auxiliary data (not always used, NULL if not used)
     * @param aData = a pointer on an auxiliary data (not always used, NULL if not used)
     */
     */
    virtual void PrintPage( wxDC* aDC, int aPrintMask,
    virtual void PrintPage( wxDC* aDC, LAYER_MSK aPrintMask,
                            bool aPrintMirrorMode, void* aData = NULL );
                            bool aPrintMirrorMode, void* aData = NULL );


    /**
    /**
+2 −1
Original line number Original line Diff line number Diff line
@@ -848,7 +848,8 @@ void SCH_EDIT_FRAME::OnPrint( wxCommandEvent& event )
    }
    }
}
}


void SCH_EDIT_FRAME::PrintPage( wxDC* aDC, int aPrintMask, bool aPrintMirrorMode, void* aData )
void SCH_EDIT_FRAME::PrintPage( wxDC* aDC, LAYER_MSK aPrintMask, bool aPrintMirrorMode, 
                                void* aData )
{
{
    GetScreen()->Draw( m_canvas, aDC, GR_DEFAULT_DRAWMODE );
    GetScreen()->Draw( m_canvas, aDC, GR_DEFAULT_DRAWMODE );
    TraceWorkSheet( aDC, GetScreen(), GetDefaultLineThickness(), IU_PER_MILS,
    TraceWorkSheet( aDC, GetScreen(), GetDefaultLineThickness(), IU_PER_MILS,
Loading