DRC: added test pads to holes (pcbnew). Others minor changes

CHANGELOG.txt

@@ -5,6 +5,14 @@ Started 2007-June-11
 Please add newer entries at the top, list the date and your name with
 email address.
 
+2009-mar-16 UPDATE Jean-Pierre Charras <jean-pierre.charras@inpg.fr>
+================================================================================
+++pcbnew:
+    in DRC: added test pads to holes.
+
+++Al:
+    minor changes.
+
 
 2009-mar-16 UPDATE Jean-Pierre Charras <jean-pierre.charras@inpg.fr>
 ================================================================================

common/gestfich.cpp

@@ -198,7 +198,9 @@ wxString MakeFileName( const wxString& dir,
     {
         if( !wxIsAbsolutePath( shortname ) )
         {
-            if( !shortname.StartsWith( wxT( "./" ) ) && !shortname.StartsWith( wxT( "../" ) ) )
+            if( !shortname.StartsWith( wxT( "./" ) ) && !shortname.StartsWith( wxT( "../" ) )            // under unix
+                && !shortname.StartsWith( wxT( ".\\" ) ) && !shortname.StartsWith( wxT( "..\\" ) ))      // under Windows
+
             {   /* no absolute path in shortname, add dir to shortname */
                 fullfilename = dir;
             }

eeschema/dialog_edit_component_in_schematic.fbp

@@ -190,7 +190,7 @@
                                                 <property name="name">orientationRadioBox</property>
                                                 <property name="permission">protected</property>
                                                 <property name="pos"></property>
-                                                <property name="selection">3</property>
+                                                <property name="selection">0</property>
                                                 <property name="size"></property>
                                                 <property name="style">wxRA_SPECIFY_COLS</property>
                                                 <property name="subclass"></property>
@@ -255,7 +255,7 @@
                                                 <property name="name">mirrorRadioBox</property>
                                                 <property name="permission">protected</property>
                                                 <property name="pos"></property>
-                                                <property name="selection">2</property>
+                                                <property name="selection">0</property>
                                                 <property name="size"></property>
                                                 <property name="style">wxRA_SPECIFY_COLS</property>
                                                 <property name="subclass"></property>
@@ -872,7 +872,7 @@
                                                         <property name="name">m_StyleRadioBox</property>
                                                         <property name="permission">protected</property>
                                                         <property name="pos"></property>
-                                                        <property name="selection">3</property>
+                                                        <property name="selection">0</property>
                                                         <property name="size"></property>
                                                         <property name="style">wxRA_SPECIFY_COLS</property>
                                                         <property name="subclass"></property>

eeschema/dialog_edit_component_in_schematic_fbp.cpp

@@ -39,7 +39,7 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP(
 	wxString orientationRadioBoxChoices[] = { _("0"), _("+90"), _("180"), _("-90") };
 	int orientationRadioBoxNChoices = sizeof( orientationRadioBoxChoices ) / sizeof( wxString );
 	orientationRadioBox = new wxRadioBox( this, wxID_ANY, _("Orientation (Degrees)"), wxDefaultPosition, wxDefaultSize, orientationRadioBoxNChoices, orientationRadioBoxChoices, 1, wxRA_SPECIFY_COLS );
-	orientationRadioBox->SetSelection( 3 );
+	orientationRadioBox->SetSelection( 0 );
 	orientationRadioBox->SetToolTip( _("Select if the component is to be rotated when drawn") );
 	
 	orientationSizer->Add( orientationRadioBox, 1, wxALL, 8 );
@@ -52,7 +52,7 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP(
 	wxString mirrorRadioBoxChoices[] = { _("Normal"), _("Mirror ---"), _("Mirror |") };
 	int mirrorRadioBoxNChoices = sizeof( mirrorRadioBoxChoices ) / sizeof( wxString );
 	mirrorRadioBox = new wxRadioBox( this, wxID_ANY, _("Mirror"), wxDefaultPosition, wxDefaultSize, mirrorRadioBoxNChoices, mirrorRadioBoxChoices, 1, wxRA_SPECIFY_COLS );
-	mirrorRadioBox->SetSelection( 2 );
+	mirrorRadioBox->SetSelection( 0 );
 	mirrorRadioBox->SetToolTip( _("Pick the graphical transformation to be used when displaying the component, if any") );
 	
 	mirrorSizer->Add( mirrorRadioBox, 1, wxALL, 8 );
@@ -134,7 +134,7 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP(
 	wxString m_StyleRadioBoxChoices[] = { _("Normal"), _("Italic"), _("Bold"), _("Bold Italic") };
 	int m_StyleRadioBoxNChoices = sizeof( m_StyleRadioBoxChoices ) / sizeof( wxString );
 	m_StyleRadioBox = new wxRadioBox( this, wxID_ANY, _("Style:"), wxDefaultPosition, wxDefaultSize, m_StyleRadioBoxNChoices, m_StyleRadioBoxChoices, 1, wxRA_SPECIFY_COLS );
-	m_StyleRadioBox->SetSelection( 3 );
+	m_StyleRadioBox->SetSelection( 0 );
 	m_StyleRadioBox->SetToolTip( _("The style of the currently selected field's text in the schemati") );
 	
 	visibilitySizer->Add( m_StyleRadioBox, 1, wxBOTTOM|wxRIGHT|wxLEFT, 5 );

include/build_version.h

@@ -3,7 +3,7 @@
 #ifndef KICAD_BUILD_VERSION
 #define KICAD_BUILD_VERSION
 
-#define BUILD_VERSION wxT("(20090216-final)")
+#define BUILD_VERSION wxT("(20090332-unstable)")
 
 COMMON_GLOBL wxString g_BuildVersion
 #ifdef EDA_BASE

pcbnew/class_drc_item.cpp

@@ -73,6 +73,10 @@ wxString DRC_ITEM::GetErrorText() const
         return wxString( _("Copper areas intersect or are too close"));
     case DRCE_NON_EXISTANT_NET_FOR_ZONE_OUTLINE:
         return wxString( _("Copper area has a non existent net name"));
+    case DRCE_HOLE_NEAR_PAD:
+        return wxString( _("Hole near pad"));
+    case DRCE_HOLE_NEAR_TRACK:
+        return wxString( _("Hole near track"));
 
 
     default:

pcbnew/class_pad.h

@@ -11,9 +11,9 @@ class Pcb3D_GLCanvas;
 class D_PAD : public BOARD_CONNECTED_ITEM
 {
 private:
-    int m_NetCode;              // Net number for fast comparisons
-    wxString   m_Netname;       // Full net name like /mysheet/mysubsheet/vout used by eeschema
-    wxString   m_ShortNetname;  // short net name, like vout from /mysheet/mysubsheet/vout
+    int      m_NetCode;         // Net number for fast comparisons
+    wxString m_Netname;         // Full net name like /mysheet/mysubsheet/vout used by eeschema
+    wxString m_ShortNetname;    // short net name, like vout from /mysheet/mysubsheet/vout
 
 
 public:
@@ -27,17 +27,17 @@ public:
                                      */
     };
 
-    int      m_Masque_Layer;        // Bitwise layer :1= copper layer, 15= cmp,
+    int m_Masque_Layer;             // Bitwise layer :1= copper layer, 15= cmp,
                                     // 2..14 = internal layers
                                     // 16 .. 31 = technical layers
 
-    int     m_PadShape;             // Shape: PAD_CIRCLE, PAD_RECT, PAD_OVAL, PAD_TRAPEZOID
-    int     m_DrillShape;           // Shape PAD_CIRCLE, PAD_OVAL
+    int    m_PadShape;              // Shape: PAD_CIRCLE, PAD_RECT, PAD_OVAL, PAD_TRAPEZOID
+    int    m_DrillShape;            // Shape PAD_CIRCLE, PAD_OVAL
 
-    wxSize  m_Drill;                // Drill diam (drill shape = PAD_CIRCLE) or drill size(shape = OVAL)
+    wxSize m_Drill;                 // Drill diam (drill shape = PAD_CIRCLE) or drill size(shape = OVAL)
                                     // for drill shape = PAD_CIRCLE, drill diam = m_Drill.x
 
-    wxSize  m_Offset;   /* This parameter is usefull only for oblong pads (it can be used for other
+    wxSize m_Offset;    /* This parameter is usefull only for oblong pads (it can be used for other
                          * shapes, but without any interest).
                          * this is the offset between the pad hole and the pad shape (you must
                          * understand here pad shape = copper area around the hole)
@@ -61,15 +61,15 @@ public:
     int     m_Orient;               // in 1/10 degrees
 
 private:
-    int     m_SubRatsnest;           // variable used in rats nest computations
-                                    // handle subnet (block) number in ratsnet connection
+    int     m_SubRatsnest;              // variable used in rats nest computations
+                                        // handle subnet (block) number in ratsnet connection
 
 public:
     D_PAD( MODULE* parent );
     D_PAD( D_PAD* pad );
     ~D_PAD();
 
-    void            Copy( D_PAD* source );
+    void Copy( D_PAD* source );
 
     D_PAD* Next() { return (D_PAD*) Pnext; }
 
@@ -79,6 +79,7 @@ public:
      * @return const wxString * , a pointer to the full netname
      */
     wxString GetNetname() const { return m_Netname; }
+
     /**
      * Function GetShortNetname
      * @return const wxString * , a pointer to the short netname
@@ -89,13 +90,13 @@ public:
      * Function SetNetname
      * @param const wxString : the new netname
      */
-    void SetNetname( const wxString & aNetname );
+    void SetNetname( const wxString& aNetname );
 
     /**
      * Function GetShape
      * @return the shape of this pad.
      */
-    int GetShape( ) { return (m_PadShape & 0xFF); }
+    int GetShape() { return m_PadShape & 0xFF;  }
 
     /**
      * Function GetPosition
@@ -113,8 +114,9 @@ public:
         m_Pos = aPos;
     }
 
+
     /* Reading and writing data on files */
-    int             ReadDescr( FILE* File, int* LineNum = NULL );
+    int           ReadDescr( FILE* File, int* LineNum = NULL );
 
     /**
      * Function Save
@@ -122,21 +124,21 @@ public:
      * @param aFile The FILE to write to.
      * @return bool - true if success writing else false.
      */
-    bool            Save( FILE* aFile ) const;
+    bool          Save( FILE* aFile ) const;
 
 
     /* drawing functions */
-    void            Draw( WinEDA_DrawPanel* panel, wxDC* DC,
-                         int aDrawMode, const wxPoint& offset = ZeroOffset );
+    void          Draw( WinEDA_DrawPanel* panel, wxDC* DC,
+                        int aDrawMode, const wxPoint& offset = ZeroOffset );
 
-    void            Draw3D( Pcb3D_GLCanvas* glcanvas );
+    void          Draw3D( Pcb3D_GLCanvas* glcanvas );
 
     // others
-    void            SetPadName( const wxString& name );     // Change pad name
-    wxString        ReturnStringPadName();                  // Return pad name as string in a wxString
-    void            ReturnStringPadName( wxString& text );  // Return pad name as string in a buffer
-    void            ComputeRayon();                         // compute m_Rayon, rayon du cercle exinscrit
-    const wxPoint   ReturnShapePos();                       // retourne la position
+    void          SetPadName( const wxString& name );       // Change pad name
+    wxString      ReturnStringPadName();                    // Return pad name as string in a wxString
+    void          ReturnStringPadName( wxString& text );    // Return pad name as string in a buffer
+    void          ComputeRayon();                           // compute m_Rayon, rayon du cercle exinscrit
+    const wxPoint ReturnShapePos();                         // retourne la position
 
 
     /**
@@ -154,7 +156,7 @@ public:
      * Is virtual from EDA_BaseStruct.
      * @param frame A WinEDA_DrawFrame in which to print status information.
      */
-    void            Display_Infos( WinEDA_DrawFrame* frame );
+    void Display_Infos( WinEDA_DrawFrame* frame );
 
 
     /**
@@ -165,7 +167,7 @@ public:
      * @param aLayer The layer to test for.
      * @return bool - true if on given layer, else false.
      */
-    bool            IsOnLayer( int aLayer ) const;
+    bool IsOnLayer( int aLayer ) const;
 
 
     /**
@@ -174,7 +176,7 @@ public:
      * @param refPos A wxPoint to test
      * @return bool - true if a hit, else false
      */
-    bool            HitTest( const wxPoint& refPos );
+    bool HitTest( const wxPoint& refPos );
 
     /**
      * Function GetClass
@@ -192,7 +194,7 @@ public:
      * returns the bounding box of this pad
      * Mainly used to redraw the screen area occuped by the pad
      */
-    EDA_Rect GetBoundingBox();
+    EDA_Rect   GetBoundingBox();
 
     /**
      * Function Compare
@@ -202,7 +204,7 @@ public:
     static int Compare( const D_PAD* padref, const D_PAD* padcmp );
 
 
-#if defined (DEBUG)
+#if defined(DEBUG)
 
     /**
      * Function Show
@@ -216,4 +218,4 @@ public:
 #endif
 };
 
-typedef class D_PAD * LISTE_PAD;
+typedef class D_PAD* LISTE_PAD;

pcbnew/class_pad_draw_functions.cpp

@@ -362,8 +362,8 @@ void D_PAD::Draw( WinEDA_DrawPanel* panel, wxDC* DC, int draw_mode, const wxPoin
             }
             RotatePoint( &delta_cx, &delta_cy, angle );
 
-            GRFillCSegm( &panel->m_ClipBox, DC, ux0 + delta_cx, uy0 + delta_cy,
-                ux0 - delta_cx, uy0 - delta_cy,
+            GRFillCSegm( &panel->m_ClipBox, DC, cx0 + delta_cx, cy0 + delta_cy,
+                cx0 - delta_cx, cy0 - delta_cy,
                 rotdx, color );
             break;
 

pcbnew/drc_stuff.h

@@ -58,6 +58,8 @@
 #define COPPERAREA_INSIDE_COPPERAREA        22  ///< copper area outlines intersect
 #define COPPERAREA_CLOSE_TO_COPPERAREA      23  ///< copper area outlines are too close
 #define DRCE_NON_EXISTANT_NET_FOR_ZONE_OUTLINE  24  ///< copper area outline has an incorrect netcode due to a netname not found
+#define DRCE_HOLE_NEAR_PAD                  25  ///< hole too close to pad
+#define DRCE_HOLE_NEAR_TRACK                26  ///< hole too close to track
 
 /**
  * Class DRC_ITEM