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

Pcbnew: more about keepout areas: remove keepout for pads option and add... 

Pcbnew: more about keepout areas: remove keepout for pads option and add keepout for copper zones option.
Export keepout to Specctra DSN file.
parent 018b0800

common/pcb.keywords

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ comment 
company

connect

connect_pads

copperpour

crossbar

date

descr

pcbnew/class_zone.cpp

+5 −5
Original line number Diff line number Diff line
@@ -58,10 +58,10 @@ ZONE_CONTAINER::ZONE_CONTAINER( BOARD* aBoard ) : 
    m_priority = 0;

    m_smoothedPoly = NULL;

    m_cornerSmoothingType = ZONE_SETTINGS::SMOOTHING_NONE;

    m_isKeepout = false;

    m_doNotAllowPads = true;                    // has meaning only if m_isKeepout == true

    m_doNotAllowVias = true;                    // has meaning only if m_isKeepout == true

    m_doNotAllowTracks = true;                  // has meaning only if m_isKeepout == true

    SetIsKeepout( false );

    SetDoNotAllowCopperPour( false );           // has meaning only if m_isKeepout == true

    SetDoNotAllowVias( true );                  // has meaning only if m_isKeepout == true

    SetDoNotAllowTracks( true );                // has meaning only if m_isKeepout == true

    m_cornerRadius = 0;

    utility    = 0;                             // flags used in polygon calculations

    utility2   = 0;                             // flags used in polygon calculations
@@ -92,7 +92,7 @@ ZONE_CONTAINER::ZONE_CONTAINER( const ZONE_CONTAINER& aZone ) : 
    m_FillSegmList = aZone.m_FillSegmList;



    m_isKeepout = aZone.m_isKeepout;

    m_doNotAllowPads = aZone.m_doNotAllowPads;

    m_doNotAllowCopperPour = aZone.m_doNotAllowCopperPour;

    m_doNotAllowVias = aZone.m_doNotAllowVias;

    m_doNotAllowTracks = aZone.m_doNotAllowTracks;

pcbnew/class_zone.h

+3 −3
Original line number Diff line number Diff line
@@ -539,12 +539,12 @@ public: 
     * Accessors to parameters used in Keepout zones:

     */

    bool GetIsKeepout() const { return m_isKeepout; }

    bool GetDoNotAllowPads() const { return m_doNotAllowPads; }

    bool GetDoNotAllowCopperPour() const { return m_doNotAllowCopperPour; }

    bool GetDoNotAllowVias() const { return m_doNotAllowVias; }

    bool GetDoNotAllowTracks() const { return m_doNotAllowTracks; }



    void SetIsKeepout( bool aEnable ) { m_isKeepout = aEnable; }

    void SetDoNotAllowPads( bool aEnable ) { m_doNotAllowPads = aEnable; }

    void SetDoNotAllowCopperPour( bool aEnable ) { m_doNotAllowCopperPour = aEnable; }

    void SetDoNotAllowVias( bool aEnable ) { m_doNotAllowVias = aEnable; }

    void SetDoNotAllowTracks( bool aEnable ) { m_doNotAllowTracks = aEnable; }
@@ -605,7 +605,7 @@ private: 
    /* For keepout zones only:

     * what is not allowed inside the keepout ( pads, tracks and vias )

     */

    bool                  m_doNotAllowPads;

    bool                  m_doNotAllowCopperPour;

    bool                  m_doNotAllowVias;

    bool                  m_doNotAllowTracks;

pcbnew/class_zone_settings.cpp

+3 −3
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ ZONE_SETTINGS::ZONE_SETTINGS() 
    m_cornerRadius = 0;



    SetIsKeepout( false );

    SetDoNotAllowPads( false );

    SetDoNotAllowCopperPour( false );

    SetDoNotAllowVias( true );

    SetDoNotAllowTracks( true );

}
@@ -86,7 +86,7 @@ ZONE_SETTINGS& ZONE_SETTINGS::operator << ( const ZONE_CONTAINER& aSource ) 
    m_cornerSmoothingType = aSource.GetCornerSmoothingType();

    m_cornerRadius = aSource.GetCornerRadius();

    m_isKeepout = aSource.GetIsKeepout();

    m_keepoutDoNotAllowPads = aSource.GetDoNotAllowPads();

    m_keepoutDoNotAllowCopperPour = aSource.GetDoNotAllowCopperPour();

    m_keepoutDoNotAllowVias = aSource.GetDoNotAllowVias();

    m_keepoutDoNotAllowTracks = aSource.GetDoNotAllowTracks();
@@ -107,7 +107,7 @@ void ZONE_SETTINGS::ExportSetting( ZONE_CONTAINER& aTarget, bool aFullExport ) c 
    aTarget.SetCornerSmoothingType( m_cornerSmoothingType );

    aTarget.SetCornerRadius( m_cornerRadius );

    aTarget.SetIsKeepout( GetIsKeepout() );

    aTarget.SetDoNotAllowPads( GetDoNotAllowPads() );

    aTarget.SetDoNotAllowCopperPour( GetDoNotAllowCopperPour() );

    aTarget.SetDoNotAllowVias( GetDoNotAllowVias() );

    aTarget.SetDoNotAllowTracks( GetDoNotAllowTracks() );

pcbnew/class_zone_settings.h

+3 −3
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ private: 
    /* For keepout zones only:

     * what is not allowed inside the keepout ( pads, tracks and vias )

     */

    bool m_keepoutDoNotAllowPads;

    bool m_keepoutDoNotAllowCopperPour;

    bool m_keepoutDoNotAllowVias;

    bool m_keepoutDoNotAllowTracks;
@@ -115,12 +115,12 @@ public: 
     * Accessors to parameters used in Keepout zones:

     */

    const bool GetIsKeepout() const { return m_isKeepout; }

    const bool GetDoNotAllowPads() const { return m_keepoutDoNotAllowPads; }

    const bool GetDoNotAllowCopperPour() const { return m_keepoutDoNotAllowCopperPour; }

    const bool GetDoNotAllowVias() const { return m_keepoutDoNotAllowVias; }

    const bool GetDoNotAllowTracks() const { return m_keepoutDoNotAllowTracks; }



    void SetIsKeepout( bool aEnable ) { m_isKeepout = aEnable; }

    void SetDoNotAllowPads( bool aEnable ) { m_keepoutDoNotAllowPads = aEnable; }

    void SetDoNotAllowCopperPour( bool aEnable ) { m_keepoutDoNotAllowCopperPour = aEnable; }

    void SetDoNotAllowVias( bool aEnable ) { m_keepoutDoNotAllowVias = aEnable; }

    void SetDoNotAllowTracks( bool aEnable ) { m_keepoutDoNotAllowTracks = aEnable; }

};