Pcbnew: added a priority level for zones: a zone with a hight priority can be...

Pcbnew: added a priority level for zones: a zone with a hight priority can be now inside an other low priority zone.
useful for complex zones.
fix in footprint copy.
minor enhancement in netlist/ Footprints Test.

pcbnew/board_items_to_polygon_shape_transform.cpp

@@ -8,6 +8,7 @@
 #include <vector>
 
 #include <fctsys.h>
+#include <polygons_defs.h>
 #include <pcbnew.h>
 #include <wxPcbStruct.h>
 #include <trigo.h>
@@ -17,6 +18,7 @@
 #include <class_track.h>
 #include <class_drawsegment.h>
 #include <class_pcb_text.h>
+#include <class_zone.h>
 
 
 /* Exported functions */
@@ -130,6 +132,90 @@ void TEXTE_PCB::TransformShapeWithClearanceToPolygon( std::vector <CPolyPt>& aCo
     aCornerBuffer.back().end_contour = true;
 }
 
+ /* Function TransformShapeWithClearanceToPolygon
+  * Convert the track shape to a closed polygon
+  * Used in filling zones calculations
+  * Circles (vias) and arcs (ends of tracks) are approximated by segments
+  * param aCornerBuffer = a buffer to store the polygon
+  * param aClearanceValue = the clearance around the pad
+  * param aCircleToSegmentsCount = the number of segments to approximate a circle
+  * param aCorrectionFactor = the correction to apply to circles radius to keep
+  * param aAddClearance = true to add a clearance area to the polygon
+  *                      false to create the outline polygon.
+  * clearance when the circle is approximated by segment bigger or equal
+  * to the real clearance value (usually near from 1.0)
+  */
+void ZONE_CONTAINER::TransformShapeWithClearanceToPolygon( std::vector <CPolyPt>& aCornerBuffer,
+                                                      int                    aClearanceValue,
+                                                      int                    aCircleToSegmentsCount,
+                                                      double                 aCorrectionFactor,
+                                                      bool                   aAddClearance )
+{
+
+    /* Creates the main polygon (i.e. the filled area using only one outline)
+     * and reserve a clearance margin around the outlines and holes
+     */
+    std::vector <CPolyPt> zoneOutines;
+    BuildFilledPolysListData( NULL, &zoneOutines );
+    int clearance = 0;
+    if( aAddClearance )
+    {
+        GetClearance();
+        if( aClearanceValue > clearance )
+            clearance = aClearanceValue;
+    }
+
+    // Calculate the polygon with clearance and holes
+    // holes are linked to the main outline, so only one polygon should be created.
+    KPolygonSet polyset_zone_solid_areas;
+    std::vector<KPolyPoint> cornerslist;
+    unsigned ic = 0;
+    unsigned corners_count = zoneOutines.size();
+    while( ic < corners_count )
+    {
+        cornerslist.clear();
+        KPolygon poly;
+        {
+            for( ; ic < corners_count; ic++ )
+            {
+                CPolyPt* corner = &zoneOutines[ic];
+                cornerslist.push_back( KPolyPoint( corner->x, corner->y ) );
+                if( corner->end_contour )
+                {
+                    ic++;
+                    break;
+                }
+            }
+
+            bpl::set_points( poly, cornerslist.begin(), cornerslist.end() );
+            polyset_zone_solid_areas.push_back( poly );
+        }
+    }
+
+    polyset_zone_solid_areas += clearance;
+
+    // Put the resultng polygon in buffer
+    for( unsigned ii = 0; ii < polyset_zone_solid_areas.size(); ii++ )
+    {
+        KPolygon& poly = polyset_zone_solid_areas[ii];
+        CPolyPt   corner( 0, 0, false );
+
+        for( unsigned jj = 0; jj < poly.size(); jj++ )
+        {
+            KPolyPoint point = *(poly.begin() + jj);
+            corner.x = point.x();
+            corner.y = point.y();
+            corner.end_contour = false;
+            aCornerBuffer.push_back( corner );
+        }
+
+        corner.end_contour = true;
+        aCornerBuffer.pop_back();
+        aCornerBuffer.push_back( corner );
+    }
+}
+
+
 
 /**
  * Function TransformShapeWithClearanceToPolygon

pcbnew/class_module.cpp

@@ -85,7 +85,9 @@ MODULE::MODULE( const MODULE& aModule ) :
 
     m_Pos = aModule.m_Pos;
     m_LibRef = aModule.m_LibRef;
+    m_Layer  = aModule.m_Layer;
     m_Attributs = aModule.m_Attributs;
+    m_ModuleStatus = aModule.m_ModuleStatus;
     m_Orient = aModule.m_Orient;
     m_BoundaryBox = aModule.m_BoundaryBox;
     m_PadNum = aModule.m_PadNum;
@@ -199,6 +201,7 @@ void MODULE::Copy( MODULE* aModule )
     m_Layer         = aModule->m_Layer;
     m_LibRef        = aModule->m_LibRef;
     m_Attributs     = aModule->m_Attributs;
+    m_ModuleStatus  = aModule->m_ModuleStatus;
     m_Orient        = aModule->m_Orient;
     m_BoundaryBox   = aModule->m_BoundaryBox;
     m_PadNum        = aModule->m_PadNum;

pcbnew/class_zone.cpp

@@ -55,6 +55,7 @@ ZONE_CONTAINER::ZONE_CONTAINER( BOARD* parent ) :
     m_CornerSelection = -1;
     m_IsFilled = false;                         // fill status : true when the zone is filled
     m_FillMode = 0;                             // How to fill areas: 0 = use filled polygons, != 0 fill with segments
+    m_priority = 0;
     smoothedPoly = NULL;
     cornerSmoothingType = ZONE_SETTING::SMOOTHING_NONE;
     cornerRadius = 0;
@@ -77,6 +78,7 @@ ZONE_CONTAINER::ZONE_CONTAINER( const ZONE_CONTAINER& aZone ) :
     m_ZoneClearance = aZone.m_ZoneClearance;     // clearance value
     m_ZoneMinThickness = aZone.m_ZoneMinThickness;
     m_FillMode = aZone.m_FillMode;               // Filling mode (segments/polygons)
+    m_priority = aZone.m_priority;
     m_ArcToSegmentsCount = aZone.m_ArcToSegmentsCount;
     m_PadOption = aZone.m_PadOption;
     m_ThermalReliefGap = aZone.m_ThermalReliefGap;
@@ -677,16 +679,21 @@ void ZONE_CONTAINER::DisplayInfo( EDA_DRAW_FRAME* frame )
         }
 
         frame->AppendMsgPanel( _( "NetName" ), msg, RED );
+#if 1
+        // Display net code : (useful in test or debug)
+        msg.Printf( wxT( "%d" ), GetNet() );
+        frame->AppendMsgPanel( _( "NetCode" ), msg, RED );
+#endif
+
+        // Display priority level
+        msg.Printf( wxT( "%d" ), GetPriority() );
+        frame->AppendMsgPanel( _( "Priority" ), msg, BLUE );
     }
     else
     {
         frame->AppendMsgPanel( _( "Non Copper Zone" ), wxEmptyString, RED );
     }
 
-    /* Display net code : (useful in test or debug) */
-    msg.Printf( wxT( "%d" ), GetNet() );
-    frame->AppendMsgPanel( _( "NetCode" ), msg, RED );
-
     msg = board->GetLayerName( m_Layer );
     frame->AppendMsgPanel( _( "Layer" ), msg, BROWN );
 

pcbnew/class_zone.h

@@ -124,6 +124,10 @@ private:
     CPolyLine*            smoothedPoly;         // Corner-smoothed version of m_Poly
     int                   cornerSmoothingType;
     unsigned int          cornerRadius;
+    // Priority: when a zone outline is inside and other zone, if its priority is highter
+    // the other zone priority, it will be created inside.
+    // if priorities are equal, a DRC erroc is set
+    unsigned              m_priority;
 
 public:
     ZONE_CONTAINER( BOARD* parent );
@@ -149,6 +153,18 @@ public:
     const wxPoint GetPosition() const;          // overload
     void SetPosition( const wxPoint& aPos );    // overload
 
+    /**
+     * Function SetPriority
+     * @param aPriority = the priority level
+     */
+    void SetPriority( unsigned aPriority ) { m_priority = aPriority; }
+
+    /**
+     * Function GetPriority
+     * @return the priority level of this zone
+     */
+    unsigned GetPriority() const { return m_priority; }
+
     /**
      * Function copy
      * copy useful data from the source.
@@ -305,11 +321,13 @@ public:
      * in order to have drawable (and plottable) filled polygons
      * drawable filled polygons are polygons without hole
      * @param aPcb: the current board (can be NULL for non copper zones)
+     * @param aCornerBuffer: A reference to a buffer to put polygon corners, or NULL
+     * if NULL (default), uses m_FilledPolysList and fill current zone.
      * @return number of polygons
      * This function does not add holes for pads and tracks but calls
      * AddClearanceAreasPolygonsToPolysList() to do that for copper layers
      */
-    int BuildFilledPolysListData( BOARD* aPcb );
+    int BuildFilledPolysListData( BOARD* aPcb, std::vector <CPolyPt>* aCornerBuffer = NULL );
 
     /**
      * Function AddClearanceAreasPolygonsToPolysList
@@ -484,7 +502,26 @@ public:
         return m_Poly->GetHatchStyle();
     }
 
-    /**
+     /**
+     * Function TransformShapeWithClearanceToPolygon
+     * Convert the track shape to a closed polygon
+     * Used in filling zones calculations
+     * Circles (vias) and arcs (ends of tracks) are approximated by segments
+     * @param aCornerBuffer = a buffer to store the polygon
+     * @param aClearanceValue = the clearance around the pad
+     * @param aCircleToSegmentsCount = the number of segments to approximate a circle
+     * @param aCorrectionFactor = the correction to apply to circles radius to keep
+     * @param aAddClearance = true to add a clearance area to the polygon
+     *                      false to create the outline polygon.
+     * clearance when the circle is approximated by segment bigger or equal
+     * to the real clearance value (usually near from 1.0)
+     */
+    void TransformShapeWithClearanceToPolygon( std::vector <CPolyPt>& aCornerBuffer,
+                                               int                    aClearanceValue,
+                                               int                    aCircleToSegmentsCount,
+                                               double                 aCorrectionFactor,
+                                               bool                   aAddClearance );
+   /**
      * Function IsSame
      * tests if 2 zones are equivalent:
      * 2 zones are equivalent if they have same parameters and same outlines

pcbnew/class_zone_setting.cpp

@@ -24,6 +24,7 @@
 
 ZONE_SETTING::ZONE_SETTING( void )
 {
+    m_ZonePriority = 0;
     m_FillMode = 0;                                                 // Mode for filling zone : 1 use segments, 0 use polygons
     m_ZoneClearance      = 200;                                     // Clearance value
     m_ZoneMinThickness   = 100;                                     // Min thickness value in filled areas
@@ -50,7 +51,8 @@ ZONE_SETTING::ZONE_SETTING( void )
  */
 void ZONE_SETTING::ImportSetting( const ZONE_CONTAINER& aSource )
 {
-    m_FillMode = aSource.m_FillMode;
+    m_ZonePriority = aSource.GetPriority();
+    m_FillMode     = aSource.m_FillMode;
     m_ZoneClearance      = aSource.m_ZoneClearance;
     m_ZoneMinThickness   = aSource.m_ZoneMinThickness;
     m_NetcodeSelection   = aSource.GetNet();
@@ -88,6 +90,7 @@ void ZONE_SETTING::ExportSetting( ZONE_CONTAINER& aTarget, bool aFullExport )
     aTarget.SetCornerRadius( cornerRadius );
     if( aFullExport )
     {
+        aTarget.SetPriority( m_ZonePriority );
         aTarget.SetNet( m_NetcodeSelection );
         aTarget.SetLayer( m_CurrentZone_Layer );
     }

pcbnew/class_zone_setting.h

@@ -30,6 +30,8 @@ public:
     // Mode for filling zone : 1 use segments, 0 use polygons
     int  m_FillMode;
 
+    int  m_ZonePriority;                    // Priority (0 ... N) of the zone
+
     int  m_ZoneClearance;                   // Clearance value
     int  m_ZoneMinThickness;                // Min thickness value in filled areas
     int  m_NetcodeSelection;                // Net code selection for the current zone

pcbnew/dialogs/dialog_copper_zones.cpp

@@ -119,6 +119,8 @@ void DIALOG_COPPER_ZONE::initDialog()
         m_CopperWidthValue->Enable( true );
     }
 
+    m_PriorityLevelCtrl->SetValue( m_Zone_Setting->m_ZonePriority );
+
     AddUnitSymbol( *m_AntipadSizeText, g_UserUnit );
     AddUnitSymbol( *m_CopperBridgeWidthText, g_UserUnit );
     PutValueInLocalUnits( *m_AntipadSizeValue,
@@ -323,6 +325,8 @@ bool DIALOG_COPPER_ZONE::AcceptOptions( bool aPromptForErrors, bool aUseExportab
     txtvalue = m_cornerSmoothingCtrl->GetValue();
     m_Zone_Setting->SetCornerRadius( ReturnValueFromString( g_UserUnit, txtvalue, m_Parent->GetInternalUnits() ) );
 
+    m_Zone_Setting->m_ZonePriority = m_PriorityLevelCtrl->GetValue();
+
     if( m_OrientEdgesOpt->GetSelection() == 0 )
         g_Zone_45_Only = false;
     else

pcbnew/dialogs/dialog_copper_zones_base.h

-///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Nov 18 2010)
-// http://www.wxformbuilder.org/
-//
-// PLEASE DO "NOT" EDIT THIS FILE!
-///////////////////////////////////////////////////////////////////////////
-
-#ifndef __dialog_copper_zones_base__
-#define __dialog_copper_zones_base__
-
-#include <wx/intl.h>
-
-#include <wx/string.h>
-#include <wx/stattext.h>
-#include <wx/gdicmn.h>
-#include <wx/font.h>
-#include <wx/colour.h>
-#include <wx/settings.h>
-#include <wx/sizer.h>
-#include <wx/listbox.h>
-#include <wx/choice.h>
-#include <wx/textctrl.h>
-#include <wx/button.h>
-#include <wx/statbox.h>
-#include <wx/dialog.h>
-
-///////////////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////////////////
-/// Class DIALOG_COPPER_ZONE_BASE
-///////////////////////////////////////////////////////////////////////////////
-class DIALOG_COPPER_ZONE_BASE : public wxDialog 
-{
-	DECLARE_EVENT_TABLE()
-	private:
-		
-		// Private event handlers
-		void _wxFB_OnClose( wxCloseEvent& event ){ OnClose( event ); }
-		void _wxFB_OnSize( wxSizeEvent& event ){ OnSize( event ); }
-		void _wxFB_OnNetSortingOptionSelected( wxCommandEvent& event ){ OnNetSortingOptionSelected( event ); }
-		void _wxFB_OnRunFiltersButtonClick( wxCommandEvent& event ){ OnRunFiltersButtonClick( event ); }
-		void _wxFB_OnCornerSmoothingModeChoice( wxCommandEvent& event ){ OnCornerSmoothingModeChoice( event ); }
-		void _wxFB_OnPadsInZoneClick( wxCommandEvent& event ){ OnPadsInZoneClick( event ); }
-		void _wxFB_ExportSetupToOtherCopperZones( wxCommandEvent& event ){ ExportSetupToOtherCopperZones( event ); }
-		void _wxFB_OnButtonOkClick( wxCommandEvent& event ){ OnButtonOkClick( event ); }
-		void _wxFB_OnButtonCancelClick( wxCommandEvent& event ){ OnButtonCancelClick( event ); }
-		
-	
-	protected:
-		enum
-		{
-			ID_DIALOG_COPPER_ZONE_BASE = 1000,
-			ID_NETNAME_SELECTION,
-			ID_M_NETDISPLAYOPTION,
-			ID_TEXTCTRL_NETNAMES_FILTER,
-			wxID_APPLY_FILTERS,
-			ID_CORNER_SMOOTHING,
-			ID_M_CORNERSMOOTHINGCTRL,
-			ID_M_PADINZONEOPT,
-			wxID_ANTIPAD_SIZE,
-			wxID_COPPER_BRIDGE_VALUE,
-			ID_M_FILLMODECTRL,
-			ID_M_ARCAPPROXIMATIONOPT,
-			ID_M_ORIENTEDGESOPT,
-			ID_M_OUTLINEAPPEARANCECTRL,
-			wxID_BUTTON_EXPORT,
-		};
-		
-		wxBoxSizer* m_MainBoxSizer;
-		wxBoxSizer* m_layerSizer;
-		wxStaticText* m_staticText17;
-		wxStaticText* m_staticText2;
-		wxListBox* m_ListNetNameSelection;
-		wxStaticText* m_staticText16;
-		wxChoice* m_NetDisplayOption;
-		wxStaticText* m_staticText5;
-		wxTextCtrl* m_DoNotShowNetNameFilter;
-		wxStaticText* m_staticText51;
-		wxTextCtrl* m_ShowNetNameFilter;
-		wxButton* m_buttonRunFilter;
-		wxStaticText* m_ClearanceValueTitle;
-		wxTextCtrl* m_ZoneClearanceCtrl;
-		wxStaticText* m_MinThicknessValueTitle;
-		wxTextCtrl* m_ZoneMinThicknessCtrl;
-		wxStaticText* m_staticText151;
-		wxChoice* m_cornerSmoothingChoice;
-		wxStaticText* m_cornerSmoothingTitle;
-		wxTextCtrl* m_cornerSmoothingCtrl;
-		wxStaticText* m_staticText13;
-		wxChoice* m_PadInZoneOpt;
-		wxStaticText* m_AntipadSizeText;
-		wxTextCtrl* m_AntipadSizeValue;
-		wxStaticText* m_CopperBridgeWidthText;
-		wxTextCtrl* m_CopperWidthValue;
-		wxStaticText* m_staticText11;
-		wxChoice* m_FillModeCtrl;
-		wxStaticText* m_staticText12;
-		wxChoice* m_ArcApproximationOpt;
-		wxStaticText* m_staticText14;
-		wxChoice* m_OrientEdgesOpt;
-		wxStaticText* m_staticText15;
-		wxChoice* m_OutlineAppearanceCtrl;
-		wxButton* m_ExportSetupButton;
-		wxButton* m_OkButton;
-		wxButton* m_ButtonCancel;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-		virtual void OnSize( wxSizeEvent& event ) { event.Skip(); }
-		virtual void OnNetSortingOptionSelected( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnRunFiltersButtonClick( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnCornerSmoothingModeChoice( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnPadsInZoneClick( wxCommandEvent& event ) { event.Skip(); }
-		virtual void ExportSetupToOtherCopperZones( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnButtonOkClick( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnButtonCancelClick( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		
-		DIALOG_COPPER_ZONE_BASE( wxWindow* parent, wxWindowID id = ID_DIALOG_COPPER_ZONE_BASE, const wxString& title = _("Zone Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 550,500 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
-		~DIALOG_COPPER_ZONE_BASE();
-	
-};
-
-#endif //__dialog_copper_zones_base__
+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version Jun 30 2011)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO "NOT" EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#ifndef __DIALOG_COPPER_ZONES_BASE_H__
+#define __DIALOG_COPPER_ZONES_BASE_H__
+
+#include <wx/artprov.h>
+#include <wx/xrc/xmlres.h>
+#include <wx/intl.h>
+#include <wx/string.h>
+#include <wx/stattext.h>
+#include <wx/gdicmn.h>
+#include <wx/font.h>
+#include <wx/colour.h>
+#include <wx/settings.h>
+#include <wx/sizer.h>
+#include <wx/listbox.h>
+#include <wx/choice.h>
+#include <wx/textctrl.h>
+#include <wx/button.h>
+#include <wx/statbox.h>
+#include <wx/spinctrl.h>
+#include <wx/dialog.h>
+
+///////////////////////////////////////////////////////////////////////////
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class DIALOG_COPPER_ZONE_BASE
+///////////////////////////////////////////////////////////////////////////////
+class DIALOG_COPPER_ZONE_BASE : public wxDialog 
+{
+	DECLARE_EVENT_TABLE()
+	private:
+		
+		// Private event handlers
+		void _wxFB_OnClose( wxCloseEvent& event ){ OnClose( event ); }
+		void _wxFB_OnSize( wxSizeEvent& event ){ OnSize( event ); }
+		void _wxFB_OnNetSortingOptionSelected( wxCommandEvent& event ){ OnNetSortingOptionSelected( event ); }
+		void _wxFB_OnRunFiltersButtonClick( wxCommandEvent& event ){ OnRunFiltersButtonClick( event ); }
+		void _wxFB_OnCornerSmoothingModeChoice( wxCommandEvent& event ){ OnCornerSmoothingModeChoice( event ); }
+		void _wxFB_OnPadsInZoneClick( wxCommandEvent& event ){ OnPadsInZoneClick( event ); }
+		void _wxFB_ExportSetupToOtherCopperZones( wxCommandEvent& event ){ ExportSetupToOtherCopperZones( event ); }
+		void _wxFB_OnButtonOkClick( wxCommandEvent& event ){ OnButtonOkClick( event ); }
+		void _wxFB_OnButtonCancelClick( wxCommandEvent& event ){ OnButtonCancelClick( event ); }
+		
+	
+	protected:
+		enum
+		{
+			ID_DIALOG_COPPER_ZONE_BASE = 1000,
+			ID_NETNAME_SELECTION,
+			ID_M_NETDISPLAYOPTION,
+			ID_TEXTCTRL_NETNAMES_FILTER,
+			wxID_APPLY_FILTERS,
+			ID_CORNER_SMOOTHING,
+			ID_M_CORNERSMOOTHINGCTRL,
+			ID_M_PADINZONEOPT,
+			wxID_ANTIPAD_SIZE,
+			wxID_COPPER_BRIDGE_VALUE,
+			ID_M_PRIORITYLEVELCTRL,
+			ID_M_FILLMODECTRL,
+			ID_M_ARCAPPROXIMATIONOPT,
+			ID_M_ORIENTEDGESOPT,
+			ID_M_OUTLINEAPPEARANCECTRL,
+			wxID_BUTTON_EXPORT,
+		};
+		
+		wxBoxSizer* m_MainBoxSizer;
+		wxBoxSizer* m_layerSizer;
+		wxStaticText* m_staticText17;
+		wxStaticText* m_staticText2;
+		wxListBox* m_ListNetNameSelection;
+		wxStaticText* m_staticText16;
+		wxChoice* m_NetDisplayOption;
+		wxStaticText* m_staticText5;
+		wxTextCtrl* m_DoNotShowNetNameFilter;
+		wxStaticText* m_staticText51;
+		wxTextCtrl* m_ShowNetNameFilter;
+		wxButton* m_buttonRunFilter;
+		wxStaticText* m_ClearanceValueTitle;
+		wxTextCtrl* m_ZoneClearanceCtrl;
+		wxStaticText* m_MinThicknessValueTitle;
+		wxTextCtrl* m_ZoneMinThicknessCtrl;
+		wxStaticText* m_staticText151;
+		wxChoice* m_cornerSmoothingChoice;
+		wxStaticText* m_cornerSmoothingTitle;
+		wxTextCtrl* m_cornerSmoothingCtrl;
+		wxStaticText* m_staticText13;
+		wxChoice* m_PadInZoneOpt;
+		wxStaticText* m_AntipadSizeText;
+		wxTextCtrl* m_AntipadSizeValue;
+		wxStaticText* m_CopperBridgeWidthText;
+		wxTextCtrl* m_CopperWidthValue;
+		wxStaticText* m_staticText171;
+		wxSpinCtrl* m_PriorityLevelCtrl;
+		wxStaticText* m_staticText11;
+		wxChoice* m_FillModeCtrl;
+		wxStaticText* m_staticText12;
+		wxChoice* m_ArcApproximationOpt;
+		wxStaticText* m_staticText14;
+		wxChoice* m_OrientEdgesOpt;
+		wxStaticText* m_staticText15;
+		wxChoice* m_OutlineAppearanceCtrl;
+		wxButton* m_ExportSetupButton;
+		wxButton* m_OkButton;
+		wxButton* m_ButtonCancel;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+		virtual void OnSize( wxSizeEvent& event ) { event.Skip(); }
+		virtual void OnNetSortingOptionSelected( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnRunFiltersButtonClick( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCornerSmoothingModeChoice( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnPadsInZoneClick( wxCommandEvent& event ) { event.Skip(); }
+		virtual void ExportSetupToOtherCopperZones( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnButtonOkClick( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnButtonCancelClick( wxCommandEvent& event ) { event.Skip(); }
+		
+	
+	public:
+		
+		DIALOG_COPPER_ZONE_BASE( wxWindow* parent, wxWindowID id = ID_DIALOG_COPPER_ZONE_BASE, const wxString& title = _("Zone Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 550,500 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
+		~DIALOG_COPPER_ZONE_BASE();
+	
+};
+
+#endif //__DIALOG_COPPER_ZONES_BASE_H__

pcbnew/item_io.cpp

@@ -258,6 +258,13 @@ bool ZONE_CONTAINER::Save( FILE* aFile ) const
     if( ret < 2 )
         return false;
 
+    if( GetPriority() > 0 )
+    {
+        ret = fprintf( aFile, "ZPriority %d\n", GetPriority() );
+        if( ret < 1 )
+            return false;
+    }
+
     // Save pad option and clearance
     switch( m_PadOption )
     {
@@ -1797,6 +1804,17 @@ int ZONE_CONTAINER::ReadDescr( LINE_READER* aReader )
             }
             /* Set hatch mode later, after reading outlines corners data */
         }
+
+        else if( strnicmp( Line, "ZPriority", 9 ) == 0 )
+        {
+            int tmp = 0;
+            text = Line + 9;
+            ret  = sscanf( text, "%d", &tmp );
+            if( ret < 1 )
+                return false;
+            SetPriority( tmp );
+        }
+
         else if( strnicmp( Line, "ZSmoothing", 10 ) == 0 )
         {
             int tempSmoothingType;

pcbnew/netlist.cpp

@@ -65,6 +65,7 @@
 #include <class_module.h>
 #include <pcbnew.h>
 #include <dialog_netlist.h>
+#include <html_messagebox.h>
 
 #include <netlist_reader.h>
 
@@ -528,8 +529,9 @@ MODULE* PCB_EDIT_FRAME::ListAndSelectModuleName( void )
 void PCB_EDIT_FRAME::Test_Duplicate_Missing_And_Extra_Footprints(
     const wxString& aNetlistFullFilename )
 {
-    int           nberr = 0;
-    wxArrayString list;     // The list of messages to display
+    #define ERR_CNT_MAX 100 // Max number of errors to output in dialog
+                            // to avoid a too long calculation time
+    wxString list;          // The messages to display
 
     if( GetBoard()->m_Modules == NULL )
     {
@@ -542,6 +544,7 @@ void PCB_EDIT_FRAME::Test_Duplicate_Missing_And_Extra_Footprints(
         return;
 
     SetLastNetListRead( aNetlistFullFilename );
+
     // Build the list of references of the net list modules.
     NETLIST_READER netList_Reader( this );
     netList_Reader.SetFilesnames( aNetlistFullFilename, wxEmptyString );
@@ -558,10 +561,10 @@ void PCB_EDIT_FRAME::Test_Duplicate_Missing_And_Extra_Footprints(
     }
 
     // Search for duplicate footprints.
-    list.Add( _( "Duplicates" ) );
+    list << wxT("<p><b>") << _( "Duplicates:" ) << wxT("</b></p>");
 
+    int err_cnt = 0;
     MODULE* module = GetBoard()->m_Modules;
-
     for( ; module != NULL; module = module->Next() )
     {
         MODULE* altmodule = module->Next();
@@ -571,18 +574,21 @@ void PCB_EDIT_FRAME::Test_Duplicate_Missing_And_Extra_Footprints(
             if( module->m_Reference->m_Text.CmpNoCase( altmodule->m_Reference->m_Text ) == 0 )
             {
                 if( module->m_Reference->m_Text.IsEmpty() )
-                    list.Add( wxT("<noref>") );
+                    list << wxT("<br>") << wxT("[noref)");
                 else
-                    list.Add( module->m_Reference->m_Text );
+                    list << wxT("<br>") << module->m_Reference->m_Text;
 
-                nberr++;
+                list << wxT("  (<i>") << module->m_Value->m_Text << wxT("</i>)");
+                err_cnt++;
                 break;
             }
         }
+        if( ERR_CNT_MAX < err_cnt )
+            break;
     }
 
     // Search for missing modules on board.
-    list.Add( _( "Missing:" ) );
+    list << wxT("<p><b>") <<  _( "Missing:" ) << wxT("</b></p>");
 
     for( unsigned ii = 0; ii < moduleInfoList.size(); ii++ )
     {
@@ -590,13 +596,16 @@ void PCB_EDIT_FRAME::Test_Duplicate_Missing_And_Extra_Footprints(
         module = GetBoard()->FindModuleByReference( mod_info->m_Reference );
         if( module == NULL )    // Module missing, not found in board
         {
-            list.Add( mod_info->m_Reference );
-            nberr++;
+            list << wxT("<br>") << mod_info->m_Reference;
+            list << wxT("  (<i>") << mod_info->m_Value << wxT("</i>)");
+            err_cnt++;
         }
+        if( ERR_CNT_MAX < err_cnt )
+            break;
     }
 
     // Search for modules found on board but not in net list.
-    list.Add( _( "Not in Netlist:" ) );
+    list << wxT("<p><b>") << _( "Not in Netlist:" ) << wxT("</b></p>");
 
     module = GetBoard()->m_Modules;
     for( ; module != NULL; module = module->Next() )
@@ -611,14 +620,25 @@ void PCB_EDIT_FRAME::Test_Duplicate_Missing_And_Extra_Footprints(
 
         if( ii == moduleInfoList.size() )   // Module not found in netlist
         {
-            list.Add( module->m_Reference->m_Text );
-            nberr++;
+            if( module->m_Reference->m_Text.IsEmpty() )
+                list << wxT("<br>") << wxT("[noref)");
+            else
+                list << wxT("<br>") << module->m_Reference->m_Text ;
+            list << wxT("  (<i>") << module->m_Value->m_Text << wxT("</i>)");
+            err_cnt++;
         }
+        if( ERR_CNT_MAX < err_cnt )
+            break;
+    }
+    if( ERR_CNT_MAX < err_cnt )
+    {
+        list << wxT("<p><b>")
+             << _( "Too many errors: some are skipped" )
+             << wxT("</b></p>");
     }
 
-    wxSingleChoiceDialog dlg( this, wxEmptyString, _( "Check Modules" ), list, NULL,
-                              wxCHOICEDLG_STYLE & ~wxCANCEL );
-
+    HTML_MESSAGE_BOX dlg( this, _( "Check Modules" ) );
+    dlg.AddHTML_Text(list);
     dlg.ShowModal();
 }
 

pcbnew/netlist_reader_kicad.cpp

@@ -62,6 +62,41 @@ public:
      */
     MODULE_INFO* ParseComp() throw( IO_ERROR, PARSE_ERROR );
 
+
+    /**
+     * Function ParseKicadFootprintFilterList
+     * Read the section "libparts" like:
+     * (libparts
+     *   (libpart (lib device) (part C)
+     *     (description "Condensateur non polarise")
+     *     (footprints
+     *       (fp SM*)
+     *       (fp C?)
+     *       (fp C1-1))
+     *     (fields
+     *       (field (name Reference) C)
+     *       (field (name Value) C))
+     *     (pins
+     *       (pin (num 1) (name ~) (type passive))
+     *       (pin (num 2) (name ~) (type passive))))
+     *
+     *  And add the strings giving the footprint filter (subsection footprints)
+     *  of the corresponding module info
+     *  <p>This section is used by CvPcb, and is not useful in Pcbnew,
+     *  therefore it it not always read </p>
+     */
+    bool ParseKicadFootprintFilterList() throw( IO_ERROR, PARSE_ERROR );
+
+    /**
+     * Function ParseNet
+     * Parses a section like
+     * (net (code 20) (name /PC-A0)
+     *  (node (ref BUS1) (pin 62))
+     *  (node (ref U3) (pin 3))
+     *  (node (ref U9) (pin M6)))
+     *
+     * and set the corresponfings pads netnames
+     */
     void ParseNet( BOARD * aBrd ) throw( IO_ERROR, PARSE_ERROR );
 
     /**
@@ -252,7 +287,7 @@ void NETLIST_READER_KICAD_PARSER::ParseNet( BOARD * aBrd )
         }
     }
 
-    // When there is onlu one item in net, clear pad netname
+    // When there is only one item in net, clear pad netname
     if( nodecount < 2 && pad )
         pad->SetNetname( wxEmptyString );
 }
@@ -333,3 +368,27 @@ MODULE_INFO* NETLIST_READER_KICAD_PARSER::ParseComp()
 
     return mod_info;
 }
+
+/* Read the section "libparts" like:
+ * (libparts
+ *   (libpart (lib device) (part C)
+ *     (description "Condensateur non polarise")
+ *     (footprints
+ *       (fp SM*)
+ *       (fp C?)
+ *       (fp C1-1))
+ *     (fields
+ *       (field (name Reference) C)
+ *       (field (name Value) C))
+ *     (pins
+ *       (pin (num 1) (name ~) (type passive))
+ *       (pin (num 2) (name ~) (type passive))))
+ *
+ *  And add the strings giving the footprint filter (subsection footprints)
+ *  of the corresponding module info
+ */
+bool NETLIST_READER_KICAD_PARSER::ParseKicadFootprintFilterList() throw( IO_ERROR, PARSE_ERROR )
+{
+    // TODO
+    return true;
+}

pcbnew/zone_filling_algorithm.cpp

@@ -27,13 +27,16 @@
  * in order to have drawable (and plottable) filled polygons
  * drawable filled polygons are polygons without hole
  * @param aPcb: the current board (can be NULL for non copper zones)
+ * @param aCornerBuffer: A reference to a buffer to put polygon corners, or NULL
+ * if NULL (default), uses m_FilledPolysList and fill current zone.
  * @return number of polygons
  * This function does not add holes for pads and tracks but calls
  * AddClearanceAreasPolygonsToPolysList() to do that for copper layers
  */
-int ZONE_CONTAINER::BuildFilledPolysListData( BOARD* aPcb )
+int ZONE_CONTAINER::BuildFilledPolysListData( BOARD* aPcb, std::vector <CPolyPt>* aCornerBuffer )
 {
-    m_FilledPolysList.clear();
+    if( aCornerBuffer == NULL )
+        m_FilledPolysList.clear();
 
     /* convert outlines + holes to outlines without holes (adding extra segments if necessary)
      * m_Poly data is expected normalized, i.e. NormalizeAreaOutlines was used after building
@@ -74,13 +77,24 @@ int ZONE_CONTAINER::BuildFilledPolysListData( BOARD* aPcb )
             corner.x = (int) smoothedPoly->GetKboolEngine()->GetPolygonXPoint();
             corner.y = (int) smoothedPoly->GetKboolEngine()->GetPolygonYPoint();
             corner.end_contour = false;
-            m_FilledPolysList.push_back( corner );
+            if( aCornerBuffer )
+                aCornerBuffer->push_back( corner );
+            else
+                m_FilledPolysList.push_back( corner );
             count++;
         }
 
         corner.end_contour = true;
-        m_FilledPolysList.pop_back();
-        m_FilledPolysList.push_back( corner );
+        if( aCornerBuffer )
+        {
+            aCornerBuffer->pop_back();
+            aCornerBuffer->push_back( corner );
+        }
+        else
+        {
+            m_FilledPolysList.pop_back();
+            m_FilledPolysList.push_back( corner );
+        }
         smoothedPoly->GetKboolEngine()->EndPolygonGet();
     }
 
@@ -89,12 +103,14 @@ int ZONE_CONTAINER::BuildFilledPolysListData( BOARD* aPcb )
     /* For copper layers, we now must add holes in the Polygon list.
      * holes are pads and tracks with their clearance area
      */
+    if( ! aCornerBuffer )
+    {
+        if( IsOnCopperLayer() )
+            AddClearanceAreasPolygonsToPolysList( aPcb );
 
-    if( IsOnCopperLayer() )
-        AddClearanceAreasPolygonsToPolysList( aPcb );
-
-    if ( m_FillMode )   // if fill mode uses segments, create them:
-        Fill_Zone_Areas_With_Segments( );
+        if ( m_FillMode )   // if fill mode uses segments, create them:
+            Fill_Zone_Areas_With_Segments( );
+    }
 
     return count;
 }

pcbnew/zones_convert_brd_items_to_polygons_with_Boost.cpp

@@ -329,7 +329,34 @@ void ZONE_CONTAINER::AddClearanceAreasPolygonsToPolysList( BOARD* aPcb )
         }
     }
 
-    // Remove thermal symbols
+    // Add zones outlines having an higher priority
+    for( int ii = 0; ii < GetBoard()->GetAreaCount(); ii++ )
+    {
+        ZONE_CONTAINER* zone = GetBoard()->GetArea( ii );
+        if( zone->GetLayer() != GetLayer() )
+            continue;
+
+        if( zone->GetPriority() <= GetPriority() )
+            continue;
+
+        // A highter priority zone is found: remove its area
+        item_boundingbox = zone->GetBoundingBox();
+        if( !item_boundingbox.Intersects( zone_boundingbox ) )
+            continue;
+
+        // Add the zone outline area.
+        // However if the zone has the same net as the current zone,
+        // do not add clearance.
+        // the zone will be connected to the current zone, but filled areas
+        // will use different parameters (clearnce, thermal shapes )
+        bool addclearance = GetNet() != zone->GetNet();
+        zone->TransformShapeWithClearanceToPolygon(
+                    cornerBufferPolysToSubstract,
+                    zone_clearance, s_CircleToSegmentsCount,
+                    s_Correction, addclearance );
+    }
+
+   // Remove thermal symbols
     if( m_PadOption == THERMAL_PAD )
     {
         for( MODULE* module = aPcb->m_Modules;  module;  module = module->Next() )

pcbnew/zones_functions_for_undo_redo.cpp

@@ -92,6 +92,9 @@ bool ZONE_CONTAINER::IsSame( const ZONE_CONTAINER& aZoneToCompare )
     if(  m_ThermalReliefCopperBridge != aZoneToCompare.m_ThermalReliefCopperBridge )
         return false;
 
+    if(  GetPriority() != aZoneToCompare.GetPriority() )
+        return false;
+
     // Compare outlines
     wxASSERT( m_Poly );                                      // m_Poly == NULL Should never happen
     wxASSERT( aZoneToCompare.m_Poly );

pcbnew/zones_test_and_combine_areas.cpp

@@ -454,6 +454,8 @@ int BOARD::CombineAllAreasInNet( PICKED_ITEMS_LIST* aDeletedList, int aNetCode,
 
             if( area2->GetNet() != aNetCode )
                 continue;
+            if( curr_area->GetPriority() != area2->GetPriority() )
+                continue;
 
             if( curr_area->GetLayer() == area2->GetLayer()
                 && curr_area->utility2 != -1 && area2->utility2 != -1 )
@@ -523,6 +525,9 @@ bool BOARD::TestAreaIntersections( ZONE_CONTAINER* area_to_test )
         if( area_to_test->GetLayer() != area2->GetLayer() )
             continue;
 
+        if( area_to_test->GetPriority() != area2->GetPriority() )
+            continue;
+
         CPolyLine* poly2 = area2->m_Poly;
 
         // test bounding rects
@@ -942,6 +947,10 @@ int BOARD::Test_Drc_Areas_Outlines_To_Areas_Outlines( ZONE_CONTAINER* aArea_To_E
             if( Area_Ref->GetNet() == Area_To_Test->GetNet() && Area_Ref->GetNet() >= 0 )
                 continue;
 
+            // test for different priorities
+            if( Area_Ref->GetPriority() != Area_To_Test->GetPriority() )
+                continue;
+
             // Examine a candidate zone: compare Area_To_Test to Area_Ref
 
             // Get clearance used in zone to zone test.  The policy used to
@@ -1139,6 +1148,10 @@ bool DRC::doEdgeZoneDrc( ZONE_CONTAINER* aArea, int aCornerIndex )
         if( ( aArea->GetNet() == Area_To_Test->GetNet() ) && (aArea->GetNet() >= 0) )
             continue;
 
+        // test for same priority
+        if( Area_To_Test->GetPriority() != aArea->GetPriority() )
+            continue;
+
         // test for ending line inside Area_To_Test
         int x = end.x;
         int y = end.y;