Merge lp:~azonenberg/kicad/advanced-feature-bugfixes into lp:kicad/product

[Andrew Zonenberg]

Fixes the following issues:
1) Pad properties dialog can trigger divide-by-zero when "0" is entered as the pad size
2) PNS router incorrectly detects collisions with blind/buried vias that don't actually intersect the active layer
3) PNS router silently converts blind/buried vias to through-board vias when shoved

[lp:~azonenberg/kicad/advanced-feature-bugfixes]

5028. By jean-pierre charras on 2014-07-28

Eeschema fixes: fix Bug #1348983 save cmp file crashes cvpcb when eeschema is opened (backannotation crashes). Happens only when some footprint names are not set (blank names).
Also fix incorrect backannotation when footprint names contain spaces (put spaces in names is always a bad idea)
* Fix minor Bug #1349058 Choose component dialog: Search field loses focus after entering a character and internationalize the dialog.
* Fix a subtle bug which prevent eeschema to read the project config file when launched from kicad manager, and when kicad.pro is not found.

5029. By Andrew Zonenberg on 2014-07-28

1) Pad properties dialog can trigger divide-by-zero when "0" is entered as the pad size
2) PNS router incorrectly detects collisions with blind/buried vias that don't actually intersect the active layer
3) PNS router silently converts blind/buried vias to through-board vias when shoved

=== modified file 'pcbnew/class_pad.cpp'
--- pcbnew/class_pad.cpp	2014-07-09 12:01:06 +0000
+++ pcbnew/class_pad.cpp	2014-07-27 19:08:20 +0000
@@ -965,6 +965,11 @@
     // Netnames will be shown only if zoom is appropriate
     if( IsNetnameLayer( aLayer ) )
     {
+        // Pad sizes can be zero briefly when someone is typing a number like "0.5" in the pad properties dialog.
+        // Fail gracefully if this happens.
+        if( (m_Size.x == 0) && (m_Size.y == 0) )
+            return UINT_MAX;
+
         return ( 100000000 / std::max( m_Size.x, m_Size.y ) );
     }
 

=== modified file 'pcbnew/router/pns_router.cpp'
--- pcbnew/router/pns_router.cpp	2014-07-09 14:57:01 +0000
+++ pcbnew/router/pns_router.cpp	2014-07-27 19:08:20 +0000
@@ -227,12 +227,15 @@
 
 PNS_ITEM* PNS_ROUTER::syncVia( VIA* aVia )
 {
+    LAYER_ID top, bottom;
+    aVia->LayerPair(&top, &bottom);
     PNS_VIA* v = new PNS_VIA(
             aVia->GetPosition(),
-            PNS_LAYERSET( 0, MAX_CU_LAYERS - 1 ),
+            PNS_LAYERSET( top, bottom ),
             aVia->GetWidth(),
             aVia->GetDrillValue(),
-            aVia->GetNetCode() );
+            aVia->GetNetCode(),
+            aVia->GetViaType() );
 
     v->SetParent( aVia );
 
@@ -759,8 +762,9 @@
             via_board->SetWidth( via->Diameter() );
             via_board->SetDrill( via->Drill() );
             via_board->SetNetCode( via->Net() );
-            via_board->SetLayerPair( ToLAYER_ID( m_settings.GetLayerTop() ),
-                                     ToLAYER_ID( m_settings.GetLayerBottom() ) );
+            via_board->SetViaType(via->ViaType());  //MUST be before SetLayerPair()
+            via_board->SetLayerPair( ToLAYER_ID( via->Layers().Start() ),
+                                     ToLAYER_ID( via->Layers().End() ) );
             newBI = via_board;
             break;
         }

=== modified file 'pcbnew/router/pns_via.cpp'
--- pcbnew/router/pns_via.cpp	2014-05-16 11:37:31 +0000
+++ pcbnew/router/pns_via.cpp	2014-07-27 19:08:20 +0000
@@ -91,6 +91,7 @@
     v->m_shape = SHAPE_CIRCLE( m_pos, m_diameter / 2 );
     v->m_rank = m_rank;
     v->m_marker = m_marker;
+    v->m_viaType = m_viaType;
 
     return v;
 }

=== modified file 'pcbnew/router/pns_via.h'
--- pcbnew/router/pns_via.h	2014-05-29 11:48:14 +0000
+++ pcbnew/router/pns_via.h	2014-07-27 19:08:20 +0000
@@ -24,6 +24,8 @@
 #include <geometry/shape_line_chain.h>
 #include <geometry/shape_circle.h>
 
+#include "../class_track.h"
+
 #include "pns_item.h"
 
 class PNS_NODE;
@@ -36,7 +38,7 @@
     {}
 
     PNS_VIA( const VECTOR2I& aPos, const PNS_LAYERSET& aLayers,
-             int aDiameter, int aDrill, int aNet = -1 ) :
+             int aDiameter, int aDrill, int aNet = -1, VIATYPE_T aViaType = VIA_THROUGH ) :
         PNS_ITEM( VIA )
     {
         SetNet( aNet );
@@ -45,6 +47,7 @@
         m_diameter = aDiameter;
         m_drill = aDrill;
         m_shape = SHAPE_CIRCLE( aPos, aDiameter / 2 );
+        m_viaType = aViaType;
     }
 
 
@@ -60,6 +63,7 @@
         m_rank = aB.m_rank;
         m_owner = aB.m_owner;
         m_drill = aB.m_drill;
+        m_viaType = aB.m_viaType;
     }
 
     const VECTOR2I& Pos() const
@@ -73,6 +77,16 @@
         m_shape.SetCenter( aPos );
     }
 
+    VIATYPE_T ViaType() const
+    {
+        return m_viaType;
+    }
+
+    void SetViaType(VIATYPE_T aViaType)
+    {
+        m_viaType = aViaType;
+    }
+
     int Diameter() const
     {
         return m_diameter;
@@ -124,6 +138,7 @@
     int m_drill;
     VECTOR2I m_pos;
     SHAPE_CIRCLE m_shape;
+    VIATYPE_T m_viaType;
 };
 
 #endif