Merged the differential pair router & track length tuning tool.

bitmaps_png/CMakeLists.txt

@@ -569,6 +569,12 @@ set( BMAPS_BIG
     wizard_add_fplib_icon
     )
 
+set( BMAPS_OTHER
+    tune_diff_pair_length_legend
+    tune_diff_pair_skew_legend
+    tune_single_track_length_legend
+    )
+
 
 # @todo keep these in sync with .bzrignore
 set( TMP_DIR   "${CMAKE_CURRENT_SOURCE_DIR}/tmp" )
@@ -742,5 +748,10 @@ foreach( bmn ${BMAPS_BIG} )
     list( APPEND CPP_LIST cpp_48/${bmn}.cpp )
 endforeach()
 
+foreach( bmn ${BMAPS_OTHER} )
+    #message( "library add cpp_other/${bmn}.cpp" )
+    list( APPEND CPP_LIST cpp_other/${bmn}.cpp )
+endforeach()
+
 #add_library( bitmaps SHARED ${CPP_LIST} )
 add_library( bitmaps STATIC ${CPP_LIST} )

common/CMakeLists.txt

@@ -204,7 +204,8 @@ set( COMMON_SRCS
     wildcards_and_files_ext.cpp
     worksheet.cpp
     wxwineda.cpp
-    wxunittext.cpp
+    wx_unit_binder.cpp
+    wx_status_popup.cpp
     xnode.cpp
     zoom.cpp
     )

common/geometry/seg.cpp

@@ -60,6 +60,7 @@ bool SEG::PointCloserThan( const VECTOR2I& aP, int aDist ) const
 
         if( num > ( dist_sq + 100 ) )
             return false;
+
         else if( num < ( dist_sq - 100 ) )
             return true;
     }

common/view/view.cpp

@@ -564,7 +564,7 @@ struct VIEW::drawItem
     bool operator()( VIEW_ITEM* aItem )
     {
         // Conditions that have te be fulfilled for an item to be drawn
-        bool drawCondition = aItem->ViewIsVisible() &&
+        bool drawCondition = aItem->isRenderable() &&
                              aItem->ViewGetLOD( layer ) < view->m_scale;
         if( !drawCondition )
             return true;

common/view/view_item.cpp

@@ -29,17 +29,6 @@
 
 using namespace KIGFX;
 
-void VIEW_ITEM::ViewSetVisible( bool aIsVisible )
-{
-    // update only if the visibility has really changed
-    if( m_visible != aIsVisible )
-    {
-        m_visible = aIsVisible;
-        ViewUpdate( APPEARANCE );
-    }
-}
-
-
 void VIEW_ITEM::ViewRelease()
 {
     if( m_view && m_view->IsDynamic() )

common/wx_status_popup.cpp

+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2014-2015 CERN
+ * Author: Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you may find one here:
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * or you may search the http://www.gnu.org website for the version 2 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+/**
+ * Transient mouse following popup window implementation.
+ */
+
+#include <wx_status_popup.h>
+#include <wxPcbStruct.h>
+
+WX_STATUS_POPUP::WX_STATUS_POPUP( PCB_EDIT_FRAME* aParent ) :
+    wxPopupWindow( aParent )
+{
+    m_panel = new wxPanel( this, wxID_ANY );
+    m_panel->SetBackgroundColour( *wxLIGHT_GREY );
+
+    m_topSizer = new wxBoxSizer( wxVERTICAL );
+    m_panel->SetSizer( m_topSizer );
+}
+
+
+void WX_STATUS_POPUP::updateSize()
+{
+    m_topSizer->Fit( m_panel );
+    SetClientSize( m_panel->GetSize() );
+}
+
+
+WX_STATUS_POPUP::~WX_STATUS_POPUP()
+{
+}
+
+
+void WX_STATUS_POPUP::Popup( wxWindow* )
+{
+    Show( true );
+    Raise();
+}
+
+
+void WX_STATUS_POPUP::Move( const wxPoint& aWhere )
+{
+    SetPosition ( aWhere );
+}

common/wx_unit_binder.cpp

+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2014-2015 CERN
+ * Author: Maciej Suminski <maciej.suminski@cern.ch>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you may find one here:
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * or you may search the http://www.gnu.org website for the version 2 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#include <wx/stattext.h>
+#include <wx/sizer.h>
+#include <wx/textctrl.h>
+#include <limits>
+#include <base_units.h>
+#if wxCHECK_VERSION( 2, 9, 0 )
+#include <wx/valnum.h>
+#endif
+
+#include <boost/optional.hpp>
+
+#include "wx_unit_binder.h"
+
+WX_UNIT_BINDER::WX_UNIT_BINDER( wxWindow* aParent, wxTextCtrl* aTextInput, wxStaticText* aUnitLabel, wxSpinButton* aSpinButton )
+{
+    // Use the currently selected units
+    m_units = g_UserUnit;
+    m_textCtrl = aTextInput;
+    m_textCtrl->SetValue( wxT( "0" ) );
+    m_unitLabel = aUnitLabel;
+    m_unitLabel->SetLabel( GetAbbreviatedUnitsLabel( m_units ) );
+}
+
+
+WX_UNIT_BINDER::~WX_UNIT_BINDER()
+{
+}
+
+
+void WX_UNIT_BINDER::SetValue( int aValue )
+{
+    wxString s = StringFromValue( m_units, aValue, false );
+
+    m_textCtrl->SetValue( s );
+    
+    m_unitLabel->SetLabel( GetAbbreviatedUnitsLabel( m_units ) );
+}
+
+
+int WX_UNIT_BINDER::GetValue() const
+{
+    wxString s = m_textCtrl->GetValue();
+
+    return ValueFromString( m_units, s );
+}
+
+
+void WX_UNIT_BINDER::Enable( bool aEnable )
+{
+    m_textCtrl->Enable( aEnable );
+    m_unitLabel->Enable( aEnable );
+}
\ No newline at end of file

include/base_struct.h

@@ -146,6 +146,9 @@ public:
 #define HIGHLIGHTED    (1 << 25)   ///< item is drawn in normal colors, when the rest is darkened
 #define BRIGHTENED     (1 << 26)   ///< item is drawn with a bright contour
 
+#define DP_COUPLED     (1 << 27)   ///< item is coupled with another item making a differential pair
+                                  ///< (applies to segments only)
+
 #define EDA_ITEM_ALL_FLAGS -1
 
 typedef unsigned STATUS_FLAGS;

include/bitmaps.h

@@ -546,5 +546,8 @@ EXTERN_BITMAP( zoom_out_xpm )
 EXTERN_BITMAP( zoom_page_xpm )
 EXTERN_BITMAP( zoom_selection_xpm )
 EXTERN_BITMAP( zoom_xpm )
+EXTERN_BITMAP( tune_diff_pair_length_legend_xpm )
+EXTERN_BITMAP( tune_diff_pair_skew_legend_xpm )
+EXTERN_BITMAP( tune_single_track_length_legend_xpm )
 
 #endif  // BITMAPS_H_

include/class_collector.h

@@ -129,6 +129,23 @@ public:
         m_List.erase( m_List.begin() + aIndex );
     }
 
+    /**
+     * Function Remove
+     * removes the item aItem (if exists in the collector).
+     * @param aItem the item to be removed.
+     */
+    void Remove( const EDA_ITEM* aItem )
+    {
+        for( size_t i = 0;  i < m_List.size();  i++ )
+        {
+            if( m_List[i] == aItem )
+            {
+                m_List.erase( m_List.begin() + i);
+                return;
+            }
+        }
+    }
+
     /**
      * Function operator[int]
      * is used for read only access and returns the object at \a aIndex.
@@ -223,6 +240,22 @@ public:
         else
             return false;
     }
+    /**
+     * Function CountType
+     * counts the number of items matching aType
+     * @param aType type we are interested in
+     * @return number of occurences
+     */
+    int CountType( KICAD_T aType )
+    {
+        int cnt = 0;
+        for( size_t i = 0;  i < m_List.size();  i++ )
+        {
+            if( m_List[i]->Type() == aType )
+                cnt++;
+        }
+        return cnt;
+    }
 
     /**
      * Function Collect

include/gal/opengl/vertex_item.h

@@ -69,7 +69,7 @@ public:
 
     /**
      * Function GetVertices()
-     * areturn a pointer to the data used by the VERTEX_ITEM.
+     * Returns pointer to the data used by the VERTEX_ITEM.
      */
     VERTEX* GetVertices() const;
 

include/geometry/seg.h

@@ -206,6 +206,13 @@ public:
         return sqrt( SquaredDistance( aP ) );
     }
 
+    void CanonicalCoefs( ecoord& qA, ecoord& qB, ecoord& qC ) const
+    {
+        qA = A.y - B.y;
+        qB = B.x - A.x;
+        qC = -qA * A.x - qB * A.y;
+    }
+
     /**
      * Function Collinear()
      *
@@ -215,9 +222,8 @@ public:
      */
     bool Collinear( const SEG& aSeg ) const
     {
-        ecoord qa = A.y - B.y;
-        ecoord qb = B.x - A.x;
-        ecoord qc = -qa * A.x - qb * A.y;
+        ecoord qa, qb, qc;
+        CanonicalCoefs( qa, qb, qc );
 
         ecoord d1 = std::abs( aSeg.A.x * qa + aSeg.A.y * qb + qc );
         ecoord d2 = std::abs( aSeg.B.x * qa + aSeg.B.y * qb + qc );
@@ -225,6 +231,29 @@ public:
         return ( d1 <= 1 && d2 <= 1 );
     }
 
+    bool ApproxCollinear( const SEG& aSeg ) const
+    {
+        ecoord p, q, r;
+        CanonicalCoefs( p, q, r );
+
+        ecoord dist1 = ( p * aSeg.A.x + q * aSeg.A.y + r ) / sqrt( p * p + q * q );
+        ecoord dist2 = ( p * aSeg.B.x + q * aSeg.B.y + r ) / sqrt( p * p + q * q );
+
+        return std::abs( dist1 ) <= 1 && std::abs( dist2 ) <= 1;
+    }
+
+    bool ApproxParallel ( const SEG& aSeg ) const
+    {
+        ecoord p, q, r;
+        CanonicalCoefs( p, q, r );
+
+        ecoord dist1 = ( p * aSeg.A.x + q * aSeg.A.y + r ) / sqrt( p * p + q * q );
+        ecoord dist2 = ( p * aSeg.B.x + q * aSeg.B.y + r ) / sqrt( p * p + q * q );
+
+        return std::abs( dist1 - dist2 ) <= 1;
+    }
+
+
     bool Overlaps( const SEG& aSeg ) const
     {
         if( aSeg.A == aSeg.B ) // single point corner case
@@ -262,6 +291,8 @@ public:
         return ( A - B ).SquaredEuclideanNorm();
     }
 
+    ecoord TCoef( const VECTOR2I& aP ) const;
+
     /**
      * Function Index()
      *
@@ -277,7 +308,11 @@ public:
 
     bool PointCloserThan( const VECTOR2I& aP, int aDist ) const;
 
-//    friend std::ostream& operator<<( std::ostream& stream, const SEG& aSeg );
+    void Reverse()
+    {
+        std::swap( A, B );
+    }
+
 private:
     bool ccw( const VECTOR2I& aA, const VECTOR2I& aB, const VECTOR2I &aC ) const;
 
@@ -285,14 +320,21 @@ private:
     int m_index;
 };
 
-
 inline VECTOR2I SEG::LineProject( const VECTOR2I& aP ) const
 {
-    // fixme: numerical errors for large integers
-    assert( false );
-    return VECTOR2I( 0, 0 );
-}
+    VECTOR2I d = B - A;
+    ecoord l_squared = d.Dot( d );
+
+    if( l_squared == 0 )
+        return A;
+
+    ecoord t = d.Dot( aP - A );
 
+    int xp = rescale( t, (ecoord)d.x, l_squared );
+    int yp = rescale( t, (ecoord)d.y, l_squared );
+
+    return A + VECTOR2I( xp, yp );
+}
 
 inline int SEG::LineDistance( const VECTOR2I& aP, bool aDetermineSide ) const
 {
@@ -305,6 +347,11 @@ inline int SEG::LineDistance( const VECTOR2I& aP, bool aDetermineSide ) const
     return aDetermineSide ? dist : abs( dist );
 }
 
+inline SEG::ecoord SEG::TCoef( const VECTOR2I& aP ) const
+{
+    VECTOR2I d = B - A;
+    return d.Dot( aP - A);
+}
 
 inline const VECTOR2I SEG::NearestPoint( const VECTOR2I& aP ) const
 {
@@ -327,7 +374,6 @@ inline const VECTOR2I SEG::NearestPoint( const VECTOR2I& aP ) const
     return A + VECTOR2I( xp, yp );
 }
 
-
 inline std::ostream& operator<<( std::ostream& aStream, const SEG& aSeg )
 {
     aStream << "[ " << aSeg.A << " - " << aSeg.B << " ]";

include/math/box2.h

@@ -30,6 +30,7 @@
 #include <math/vector2d.h>
 #include <limits>
 
+#include <boost/optional.hpp>
 
 /**
  * Class BOX2
@@ -467,6 +468,8 @@ public:
 typedef BOX2<VECTOR2I>    BOX2I;
 typedef BOX2<VECTOR2D>    BOX2D;
 
+typedef boost::optional<BOX2I> OPT_BOX2I;
+
 // FIXME should be removed to avoid multiple typedefs for the same type
 typedef BOX2D             DBOX;
 

include/view/view_item.h

@@ -76,7 +76,16 @@ public:
         ALL         = 0xff
     };
 
-    VIEW_ITEM() : m_view( NULL ), m_visible( true ), m_requiredUpdate( ALL ),
+    /**
+     * Enum VIEW_VISIBILITY_FLAGS.
+     * Defines the visibility of the item (temporarily hidden, invisible, etc).
+     */
+    enum VIEW_VISIBILITY_FLAGS {
+        VISIBLE     = 0x01,     /// Item is visible (in general)
+        HIDDEN      = 0x02      /// Item is temporarily hidden (e.g. being used by a tool). Overrides VISIBLE flag.
+    };
+
+    VIEW_ITEM() : m_view( NULL ), m_flags( VISIBLE ), m_requiredUpdate( ALL ),
                   m_groups( NULL ), m_groupsSize( 0 ) {}
 
     /**
@@ -128,7 +137,39 @@ public:
      *
      * @param aIsVisible: whether the item is visible (on all layers), or not.
      */
-    void ViewSetVisible( bool aIsVisible = true );
+    void ViewSetVisible( bool aIsVisible = true )
+    {
+        bool cur_visible = m_flags & VISIBLE;
+
+        if( cur_visible != aIsVisible )
+        {
+            if( aIsVisible )
+                m_flags |= VISIBLE;
+            else
+                m_flags &= ~VISIBLE;
+
+            ViewUpdate( APPEARANCE | COLOR );
+        }
+    }
+
+    /**
+     * Function ViewHide()
+     * Temporarily hides the item in the view (e.g. for overlaying)
+     *
+     * @param aHide: whether the item is hidden (on all layers), or not.
+     */
+    void ViewHide( bool aHide = true )
+    {
+        if( !( m_flags & VISIBLE ) )
+            return;
+
+        if( aHide )
+            m_flags |= HIDDEN;
+        else
+            m_flags &= ~HIDDEN;
+
+        ViewUpdate( APPEARANCE );
+    }
 
     /**
      * Function ViewIsVisible()
@@ -139,7 +180,7 @@ public:
      */
     bool ViewIsVisible() const
     {
-        return m_visible;
+        return m_flags & VISIBLE;
     }
 
     /**
@@ -201,7 +242,7 @@ protected:
     }
 
     VIEW*   m_view;             ///< Current dynamic view the item is assigned to.
-    bool    m_visible;          ///< Are we visible in the current dynamic VIEW.
+    int     m_flags;             ///< Visibility flags
     int     m_requiredUpdate;   ///< Flag required for updating
 
     ///* Helper for storing cached items group ids
@@ -295,6 +336,15 @@ protected:
     {
         m_requiredUpdate = NONE;
     }
+
+    /**
+     * Function isRenderable()
+     * Returns if the item should be drawn or not.
+     */
+    bool isRenderable() const
+    {
+        return m_flags == VISIBLE;
+    }
 };
 } // namespace KIGFX
 

include/wxBasePcbFrame.h

@@ -658,6 +658,8 @@ public:
      */
     void SetFastGrid2();
 
+    void ClearSelection();
+
     DECLARE_EVENT_TABLE()
 };
 

include/wx_status_popup.h

+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2014-2015 CERN
+ * Author: Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you may find one here:
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * or you may search the http://www.gnu.org website for the version 2 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#ifndef __WX_STATUS_POPUP_H_
+#define __WX_STATUS_POPUP_H_
+
+
+#include <common.h>
+#include <wx/popupwin.h>
+
+class PCB_EDIT_FRAME;
+
+/**
+ * Class WX_STATUS_POPUP
+ *
+ * A tiny, headerless popup window used to display useful status (e.g. line length
+ * tuning info) next to the mouse cursor.
+ */
+
+class WX_STATUS_POPUP: public wxPopupWindow
+{
+public:
+    WX_STATUS_POPUP( PCB_EDIT_FRAME* aParent );
+    virtual ~WX_STATUS_POPUP();
+
+    virtual void Popup(wxWindow* aFocus = NULL);
+    virtual void Move( const wxPoint &aWhere );
+
+protected:
+
+    void updateSize();
+
+    wxPanel* m_panel;
+    wxBoxSizer* m_topSizer;
+};
+
+#endif /* __WX_STATUS_POPUP_H_*/

include/wx_unit_binder.h

+/*
+ * This program source code file is part of KiCad, a free EDA CAD application.
+ *
+ * Copyright (C) 2014-2015 CERN
+ * Author: Maciej Suminski <maciej.suminski@cern.ch>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, you may find one here:
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
+ * or you may search the http://www.gnu.org website for the version 2 license,
+ * or you may write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+#ifndef __WX_UNIT_BINDER_H_
+#define __WX_UNIT_BINDER_H_
+
+#include <common.h>
+#include <wx/spinbutt.h>
+
+class wxTextCtrl;
+class wxSpinButton;
+class wxStaticText;
+
+class WX_UNIT_BINDER
+{
+public:
+
+    /**
+     * Constructor.
+     * @param aParent is the parent window.
+     * @param aTextInput is the text input widget used to edit the given value.
+     * @param aUnitLabel is the units label displayed next to the text field.
+     * @param aSpinButton is an optional spin button (for adjusting the input value)
+     */
+    WX_UNIT_BINDER( wxWindow* aParent, wxTextCtrl* aTextInput, wxStaticText* aUnitLabel, wxSpinButton* aSpinButton = NULL );
+
+    virtual ~WX_UNIT_BINDER();
+
+    /**
+     * Function SetValue
+     * Sets new value (in Internal Units) for the text field, taking care of units conversion.
+     * @param aValue is the new value.
+     */
+    virtual void SetValue( int aValue );
+
+    /**
+     * Function GetValue
+     * Returns the current value in Internal Units.
+     */
+    virtual int GetValue() const;
+
+    /**
+     * Function Enable
+     * Enables/diasables the binded widgets
+     */
+    void Enable( bool aEnable );
+
+protected:
+
+    void onTextChanged( wxEvent& aEvent );
+
+    ///> Text input control.
+    wxTextCtrl*   m_textCtrl;
+
+    ///> Label showing currently used units.
+    wxStaticText* m_unitLabel;
+
+    ///> Currently used units.
+    EDA_UNITS_T   m_units;
+
+    ///> Step size (added/subtracted difference if spin buttons are used).
+    int m_step;
+    int m_min;
+    int m_max;
+
+    ///> Default value (or non-specified)
+    static const wxString DEFAULT_VALUE;
+};
+
+#endif /* __WX_UNIT_BINDER_H_ */

pcbnew/CMakeLists.txt

@@ -108,6 +108,10 @@ set( PCBNEW_DIALOGS
     dialogs/dialog_pns_settings_base.cpp
     dialogs/dialog_move_exact.cpp
     dialogs/dialog_move_exact_base.cpp
+    dialogs/dialog_pns_diff_pair_dimensions.cpp
+    dialogs/dialog_pns_diff_pair_dimensions_base.cpp
+    dialogs/dialog_pns_length_tuning_settings.cpp
+    dialogs/dialog_pns_length_tuning_settings_base.cpp
     dialogs/dialog_non_copper_zones_properties.cpp
     dialogs/dialog_non_copper_zones_properties_base.cpp
     dialogs/dialog_pad_properties.cpp
@@ -279,6 +283,8 @@ set( PCBNEW_CLASS_SRCS
     tools/module_tools.cpp
     tools/placement_tool.cpp
     tools/common_actions.cpp
+    tools/grid_helper.cpp
+    tools/tools_common.cpp
     )
 
 set( PCBNEW_SRCS ${PCBNEW_AUTOROUTER_SRCS} ${PCBNEW_CLASS_SRCS} ${PCBNEW_DIALOGS} )

pcbnew/board_undo_redo.cpp

@@ -387,7 +387,7 @@ void PCB_EDIT_FRAME::SaveCopyInUndoList( const PICKED_ITEMS_LIST& aItemsList,
         BOARD_ITEM* item    = (BOARD_ITEM*) commandToUndo->GetPickedItem( ii );
 
         // For texts belonging to modules, we need to save state of the parent module
-        if( item->Type() == PCB_MODULE_TEXT_T )
+        if( item->Type() == PCB_MODULE_TEXT_T  || item->Type() == PCB_PAD_T )
         {
             item = item->GetParent();
             wxASSERT( item->Type() == PCB_MODULE_T );

pcbnew/class_drawsegment.h

@@ -69,6 +69,11 @@ public:
     /// skip the linked list stuff, and parent
     const DRAWSEGMENT& operator = ( const DRAWSEGMENT& rhs );
 
+    static inline bool ClassOf( const EDA_ITEM* aItem )
+    {
+        return aItem && PCB_LINE_T == aItem->Type();
+    }
+
     void SetWidth( int aWidth )             { m_Width = aWidth; }
     int GetWidth() const                    { return m_Width; }
 

pcbnew/class_module.cpp

@@ -57,7 +57,7 @@ MODULE::MODULE( BOARD* parent ) :
     m_Attributs    = MOD_DEFAULT;
     m_Layer        = F_Cu;
     m_Orient       = 0;
-    m_ModuleStatus = 0;
+    m_ModuleStatus = MODULE_PADS_LOCKED;
     flag = 0;
     m_CntRot90 = m_CntRot180 = 0;
     m_Surface  = 0.0;
@@ -1241,3 +1241,20 @@ bool MODULE::IncrementReference( bool aFillSequenceGaps )
 
     return success;
 }
+
+
+double MODULE::PadCoverageRatio() const
+{
+    double padArea = 0.0;
+    double moduleArea = GetFootprintRect().GetArea();
+
+    for( D_PAD* pad = m_Pads; pad; pad = pad->Next() )
+        padArea += pad->GetBoundingBox().GetArea();
+
+    if( moduleArea == 0.0 )
+        return 1.0;
+
+    double ratio = padArea / moduleArea;
+
+    return std::min( ratio, 1.0 );
+}

pcbnew/class_module.h

@@ -232,6 +232,7 @@ public:
 #define MODULE_is_LOCKED    0x01        ///< module LOCKED: no autoplace allowed
 #define MODULE_is_PLACED    0x02        ///< In autoplace: module automatically placed
 #define MODULE_to_PLACE     0x04        ///< In autoplace: module waiting for autoplace
+#define MODULE_PADS_LOCKED  0x08        ///< In autoplace: module waiting for autoplace
 
 
     bool IsLocked() const
@@ -270,6 +271,16 @@ public:
             m_ModuleStatus &= ~MODULE_to_PLACE;
     }
 
+    bool PadsLocked() const { return ( m_ModuleStatus & MODULE_PADS_LOCKED ); }
+
+    void SetPadsLocked( bool aPadsLocked )
+    {
+        if( aPadsLocked )
+            m_ModuleStatus |= MODULE_PADS_LOCKED;
+        else
+            m_ModuleStatus &= ~MODULE_PADS_LOCKED;
+    }
+
     void SetLastEditTime( time_t aTime ) { m_LastEditTime = aTime; }
     void SetLastEditTime( ) { m_LastEditTime = time( NULL ); }
     time_t GetLastEditTime() const { return m_LastEditTime; }
@@ -606,6 +617,14 @@ public:
         m_initial_comments = aInitialComments;
     }
 
+    /**
+     * Function PadCoverageRatio
+     * Calculates the ratio of total area of the footprint pads to the area of the 
+     * footprint. Used by selection tool heuristics. 
+     * @return the ratio
+     */
+    double PadCoverageRatio() const;
+
     /// Return the initial comments block or NULL if none, without transfer of ownership.
     const wxArrayString* GetInitialComments() const { return m_initial_comments; }
 

pcbnew/class_pad.cpp

@@ -177,7 +177,6 @@ const EDA_RECT D_PAD::GetBoundingBox() const
         area.SetOrigin( m_Pos.x-dx, m_Pos.y-dy );
         area.SetSize( 2*dx, 2*dy );
         break;
-        break;
 
     case PAD_RECT:
         //Use two corners and track their rotation

pcbnew/class_pad.h

@@ -94,6 +94,11 @@ public:
                                     ///< used for edge board connectors
     static LSET UnplatedHoleMask(); ///< layer set for a mechanical unplated through hole pad
 
+    static inline bool ClassOf( const EDA_ITEM* aItem )
+    {
+        return aItem && PCB_PAD_T == aItem->Type();
+    }
+
     void Copy( D_PAD* source );
 
     D_PAD* Next() const       { return static_cast<D_PAD*>( Pnext ); }

pcbnew/class_pcb_text.h

@@ -49,6 +49,11 @@ public:
 
     ~TEXTE_PCB();
 
+    static inline bool ClassOf( const EDA_ITEM* aItem )
+    {
+        return aItem && PCB_TEXT_T == aItem->Type();
+    }
+
     virtual const wxPoint& GetPosition() const
     {
         return m_Pos;

pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp

@@ -313,12 +313,19 @@ void DIALOG_MODULE_BOARD_EDITOR::InitModeditProperties()
         break;
     }
 
-    m_AutoPlaceCtrl->SetSelection( (m_CurrentModule->IsLocked()) ? 1 : 0 );
+    if( m_CurrentModule->IsLocked() )
+        m_AutoPlaceCtrl->SetSelection( 2 );
+    else if( m_CurrentModule->PadsLocked() )
+        m_AutoPlaceCtrl->SetSelection( 1 );
+    else
+        m_AutoPlaceCtrl->SetSelection( 0 );
 
     m_AutoPlaceCtrl->SetItemToolTip( 0,
-                                    _( "Enable hotkey move commands and Auto Placement" ) );
+                                    _( "Component can be freely moved and auto placed. User can arbitrarily select and edit component's pads." ) );
     m_AutoPlaceCtrl->SetItemToolTip( 1,
-                                    _( "Disable hotkey move commands and Auto Placement" ) );
+                                    _( "Component can be freely moved and auto placed, but its pads cannot be selected or edited." ) );
+    m_AutoPlaceCtrl->SetItemToolTip( 2,
+                                    _( "Component is locked: it cannot be freely moved or auto placed." ) );
 
     m_CostRot90Ctrl->SetValue( m_CurrentModule->GetPlacementCost90() );
 
@@ -583,7 +590,8 @@ void DIALOG_MODULE_BOARD_EDITOR::OnOkClick( wxCommandEvent& event )
     modpos.x = ValueFromTextCtrl( *m_ModPositionX );
     modpos.y = ValueFromTextCtrl( *m_ModPositionY );
     m_CurrentModule->SetPosition( modpos );
-    m_CurrentModule->SetLocked( m_AutoPlaceCtrl->GetSelection() == 1 );
+    m_CurrentModule->SetLocked( m_AutoPlaceCtrl->GetSelection() == 2 );
+    m_CurrentModule->SetPadsLocked( m_AutoPlaceCtrl->GetSelection() == 1 );
 
     switch( m_AttributsCtrl->GetSelection() )
     {

pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp

@@ -143,10 +143,10 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare
 	m_AttributsCtrl->SetSelection( 0 );
 	bSizerAttrib->Add( m_AttributsCtrl, 1, wxALL|wxEXPAND, 5 );
 	
-	wxString m_AutoPlaceCtrlChoices[] = { _("Free"), _("Locked") };
+	wxString m_AutoPlaceCtrlChoices[] = { _("Free"), _("Lock pads"), _("Lock module") };
 	int m_AutoPlaceCtrlNChoices = sizeof( m_AutoPlaceCtrlChoices ) / sizeof( wxString );
 	m_AutoPlaceCtrl = new wxRadioBox( m_PanelProperties, wxID_ANY, _("Move and Place"), wxDefaultPosition, wxDefaultSize, m_AutoPlaceCtrlNChoices, m_AutoPlaceCtrlChoices, 1, wxRA_SPECIFY_COLS );
-	m_AutoPlaceCtrl->SetSelection( 0 );
+	m_AutoPlaceCtrl->SetSelection( 1 );
 	bSizerAttrib->Add( m_AutoPlaceCtrl, 1, wxALL|wxEXPAND, 5 );
 	
 	

pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.fbp

@@ -2260,7 +2260,7 @@
                                                             <property name="caption"></property>
                                                             <property name="caption_visible">1</property>
                                                             <property name="center_pane">0</property>
-                                                            <property name="choices">&quot;Free&quot; &quot;Locked&quot;</property>
+                                                            <property name="choices">&quot;Free&quot; &quot;Lock pads&quot; &quot;Lock module&quot;</property>
                                                             <property name="close_button">1</property>
                                                             <property name="context_help"></property>
                                                             <property name="context_menu">1</property>
@@ -2292,7 +2292,7 @@
                                                             <property name="pin_button">1</property>
                                                             <property name="pos"></property>
                                                             <property name="resize">Resizable</property>
-                                                            <property name="selection">0</property>
+                                                            <property name="selection">1</property>
                                                             <property name="show">1</property>
                                                             <property name="size"></property>
                                                             <property name="style">wxRA_SPECIFY_COLS</property>

pcbnew/dialogs/dialog_pns_diff_pair_dimensions.cpp

+/*
+ * KiRouter - a push-and-(sometimes-)shove PCB router
+ *
+ * Copyright (C) 2014-2015  CERN
+ * Author: Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * Push and Shove diff pair dimensions (gap) settings dialog.
+ */
+
+#include "dialog_pns_diff_pair_dimensions.h"
+#include <router/pns_sizes_settings.h>
+
+DIALOG_PNS_DIFF_PAIR_DIMENSIONS::DIALOG_PNS_DIFF_PAIR_DIMENSIONS( wxWindow* aParent, PNS_SIZES_SETTINGS& aSizes ) :
+    DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE( aParent ),
+    m_traceWidth( this, m_traceWidthText, m_traceWidthUnit ),
+    m_traceGap( this, m_traceGapText, m_traceGapUnit ),
+    m_viaGap( this, m_viaGapText, m_viaGapUnit ),
+    m_sizes( aSizes )
+{
+    m_traceWidth.SetValue( aSizes.DiffPairWidth() );
+    m_traceGap.SetValue( aSizes.DiffPairGap() );
+    m_viaGap.SetValue( aSizes.DiffPairViaGap() );
+    m_viaTraceGapEqual->SetValue( m_sizes.DiffPairViaGapSameAsTraceGap() );
+
+    updateCheckbox();
+}
+
+
+void DIALOG_PNS_DIFF_PAIR_DIMENSIONS::updateCheckbox()
+{
+    if( m_viaTraceGapEqual->GetValue() )
+    {
+        m_sizes.SetDiffPairViaGapSameAsTraceGap( true );
+        m_viaGapText->Disable();
+        m_viaGapLabel->Disable();
+        m_viaGapUnit->Disable();
+    } else {
+        m_sizes.SetDiffPairViaGapSameAsTraceGap( false );
+        m_viaGapText->Enable();
+        m_viaGapLabel->Enable();
+        m_viaGapUnit->Enable();
+    }
+}
+
+
+void DIALOG_PNS_DIFF_PAIR_DIMENSIONS::OnClose( wxCloseEvent& aEvent )
+{
+    // Do nothing, it is result of ESC pressing
+    EndModal( 0 );
+}
+
+
+void DIALOG_PNS_DIFF_PAIR_DIMENSIONS::OnOkClick( wxCommandEvent& aEvent )
+{
+    // Save widgets' values to settings
+    m_sizes.SetDiffPairGap ( m_traceGap.GetValue() );
+    m_sizes.SetDiffPairViaGap ( m_viaGap.GetValue() );
+    m_sizes.SetDiffPairWidth ( m_traceWidth.GetValue() );
+
+    // todo: verify against design rules
+    EndModal( 1 );
+}
+
+
+void DIALOG_PNS_DIFF_PAIR_DIMENSIONS::OnCancelClick( wxCommandEvent& aEvent )
+{
+    // Do nothing
+    EndModal( 0 );
+}
+
+
+void DIALOG_PNS_DIFF_PAIR_DIMENSIONS::OnViaTraceGapEqualCheck( wxCommandEvent& event )
+{
+    event.Skip();
+    updateCheckbox();
+}
+

pcbnew/dialogs/dialog_pns_diff_pair_dimensions.h

+/*
+ * KiRouter - a push-and-(sometimes-)shove PCB router
+ *
+ * Copyright (C) 2014-2015  CERN
+ * Author: Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.or/licenses/>.
+ */
+
+/**
+ * Push and Shove diff pair dimensions (gap) settings dialog.
+ */
+
+#ifndef __dialog_diff_pair_dimensions_settings__
+#define __dialog_diff_pair_dimensions_settings__
+
+#include <wx_unit_binder.h>
+
+#include "dialog_pns_diff_pair_dimensions_base.h"
+
+class PNS_SIZES_SETTINGS;
+
+class DIALOG_PNS_DIFF_PAIR_DIMENSIONS : public DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE
+{
+public:
+    DIALOG_PNS_DIFF_PAIR_DIMENSIONS( wxWindow* aParent, PNS_SIZES_SETTINGS& aSizes );
+
+    virtual void OnClose( wxCloseEvent& aEvent );
+    virtual void OnOkClick( wxCommandEvent& aEvent );
+    virtual void OnCancelClick( wxCommandEvent& aEvent );
+    virtual void OnViaTraceGapEqualCheck( wxCommandEvent& event );
+
+private:
+    void updateCheckbox();
+
+    WX_UNIT_BINDER m_traceWidth;
+    WX_UNIT_BINDER m_traceGap;
+    WX_UNIT_BINDER m_viaGap;
+
+    PNS_SIZES_SETTINGS& m_sizes;
+};
+
+#endif // __dialog_pns_settings__

pcbnew/dialogs/dialog_pns_diff_pair_dimensions_base.cpp

+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version Jun  6 2014)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO "NOT" EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#include "dialog_pns_diff_pair_dimensions_base.h"
+
+///////////////////////////////////////////////////////////////////////////
+
+DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE::DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style )
+{
+	this->SetSizeHints( wxSize( 400,-1 ), wxDefaultSize );
+	
+	wxBoxSizer* bSizer7;
+	bSizer7 = new wxBoxSizer( wxVERTICAL );
+	
+	wxFlexGridSizer* fgSizer1;
+	fgSizer1 = new wxFlexGridSizer( 0, 3, 0, 0 );
+	fgSizer1->AddGrowableCol( 1 );
+	fgSizer1->SetFlexibleDirection( wxBOTH );
+	fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	
+	m_traceWidthLabel = new wxStaticText( this, wxID_ANY, _("Width:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_traceWidthLabel->Wrap( -1 );
+	fgSizer1->Add( m_traceWidthLabel, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
+	
+	m_traceWidthText = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer1->Add( m_traceWidthText, 0, wxALL|wxEXPAND, 5 );
+	
+	m_traceWidthUnit = new wxStaticText( this, wxID_ANY, _("u"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_traceWidthUnit->Wrap( -1 );
+	fgSizer1->Add( m_traceWidthUnit, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_traceGapLabel = new wxStaticText( this, wxID_ANY, _("Trace gap:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_traceGapLabel->Wrap( -1 );
+	fgSizer1->Add( m_traceGapLabel, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
+	
+	m_traceGapText = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer1->Add( m_traceGapText, 0, wxALL|wxEXPAND, 5 );
+	
+	m_traceGapUnit = new wxStaticText( this, wxID_ANY, _("u"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_traceGapUnit->Wrap( -1 );
+	m_traceGapUnit->SetMaxSize( wxSize( 40,-1 ) );
+	
+	fgSizer1->Add( m_traceGapUnit, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_viaGapLabel = new wxStaticText( this, wxID_ANY, _("Via gap:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_viaGapLabel->Wrap( -1 );
+	m_viaGapLabel->Enable( false );
+	
+	fgSizer1->Add( m_viaGapLabel, 0, wxALL|wxALIGN_RIGHT|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_viaGapText = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	m_viaGapText->Enable( false );
+	
+	fgSizer1->Add( m_viaGapText, 0, wxALL|wxEXPAND, 5 );
+	
+	m_viaGapUnit = new wxStaticText( this, wxID_ANY, _("u"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_viaGapUnit->Wrap( -1 );
+	m_viaGapUnit->Enable( false );
+	m_viaGapUnit->SetMaxSize( wxSize( 40,-1 ) );
+	
+	fgSizer1->Add( m_viaGapUnit, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	
+	bSizer7->Add( fgSizer1, 0, wxEXPAND, 5 );
+	
+	m_viaTraceGapEqual = new wxCheckBox( this, wxID_ANY, _("Via gap same as trace gap"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_viaTraceGapEqual->SetValue(true); 
+	bSizer7->Add( m_viaTraceGapEqual, 0, wxALL|wxEXPAND, 5 );
+	
+	m_stdButtons = new wxStdDialogButtonSizer();
+	m_stdButtonsOK = new wxButton( this, wxID_OK );
+	m_stdButtons->AddButton( m_stdButtonsOK );
+	m_stdButtonsCancel = new wxButton( this, wxID_CANCEL );
+	m_stdButtons->AddButton( m_stdButtonsCancel );
+	m_stdButtons->Realize();
+	
+	bSizer7->Add( m_stdButtons, 0, wxEXPAND, 5 );
+	
+	
+	this->SetSizer( bSizer7 );
+	this->Layout();
+	
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE::OnClose ) );
+	m_viaTraceGapEqual->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE::onViaTraceGapEqualCheck ), NULL, this );
+	m_stdButtonsCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE::OnCancelClick ), NULL, this );
+	m_stdButtonsOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE::OnOkClick ), NULL, this );
+}
+
+DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE::~DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE()
+{
+	// Disconnect Events
+	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE::OnClose ) );
+	m_viaTraceGapEqual->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE::onViaTraceGapEqualCheck ), NULL, this );
+	m_stdButtonsCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE::OnCancelClick ), NULL, this );
+	m_stdButtonsOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE::OnOkClick ), NULL, this );
+	
+}

pcbnew/dialogs/dialog_pns_diff_pair_dimensions_base.h

+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version Jun  6 2014)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO "NOT" EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#ifndef __DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE_H__
+#define __DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE_H__
+
+#include <wx/artprov.h>
+#include <wx/xrc/xmlres.h>
+#include <wx/intl.h>
+class DIALOG_SHIM;
+
+#include "dialog_shim.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/textctrl.h>
+#include <wx/sizer.h>
+#include <wx/checkbox.h>
+#include <wx/button.h>
+#include <wx/dialog.h>
+
+///////////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE
+///////////////////////////////////////////////////////////////////////////////
+class DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE : public DIALOG_SHIM
+{
+	private:
+	
+	protected:
+		wxStaticText* m_traceWidthLabel;
+		wxTextCtrl* m_traceWidthText;
+		wxStaticText* m_traceWidthUnit;
+		wxStaticText* m_traceGapLabel;
+		wxTextCtrl* m_traceGapText;
+		wxStaticText* m_traceGapUnit;
+		wxStaticText* m_viaGapLabel;
+		wxTextCtrl* m_viaGapText;
+		wxStaticText* m_viaGapUnit;
+		wxCheckBox* m_viaTraceGapEqual;
+		wxStdDialogButtonSizer* m_stdButtons;
+		wxButton* m_stdButtonsOK;
+		wxButton* m_stdButtonsCancel;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+		virtual void onViaTraceGapEqualCheck( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnOkClick( wxCommandEvent& event ) { event.Skip(); }
+		
+	
+	public:
+		
+		DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Differential Pair Dimensions"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 400,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
+		~DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE();
+	
+};
+
+#endif //__DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE_H__

pcbnew/dialogs/dialog_pns_length_tuning_settings.cpp

+/*
+ * KiRouter - a push-and-(sometimes-)shove PCB router
+ *
+ * Copyright (C) 2014-2015  CERN
+ * Author: Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/**
+ * Length tuner settings dialog.
+ */
+
+#include "dialog_pns_length_tuning_settings.h"
+#include <router/pns_meander_placer.h>
+
+DIALOG_PNS_LENGTH_TUNING_SETTINGS::DIALOG_PNS_LENGTH_TUNING_SETTINGS( wxWindow* aParent, PNS_MEANDER_SETTINGS& aSettings, PNS_ROUTER_MODE aMode ) :
+    DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE( aParent ),
+    m_minAmpl( this, m_minAmplText, m_minAmplUnit ),
+    m_maxAmpl( this, m_maxAmplText, m_maxAmplUnit ),
+    m_spacing( this, m_spacingText, m_spacingUnit ),
+    m_targetLength( this, m_targetLengthText, m_targetLengthUnit ),
+    m_settings( aSettings ),
+    m_mode( aMode )
+{
+    m_miterStyle->Enable( false );
+    m_radiusText->Enable( aMode != PNS_MODE_TUNE_DIFF_PAIR );
+    //m_minAmpl.Enable ( aMode != PNS_MODE_TUNE_DIFF_PAIR_SKEW );
+
+    m_minAmpl.SetValue( m_settings.m_minAmplitude );
+    m_maxAmpl.SetValue( m_settings.m_maxAmplitude );
+
+    m_spacing.SetValue( m_settings.m_spacing );
+    m_radiusText->SetValue( wxString::Format( wxT( "%i" ), m_settings.m_cornerRadiusPercentage ) );
+
+    m_miterStyle->SetSelection( m_settings.m_cornerType == PNS_MEANDER_SETTINGS::ROUND ? 1 : 0 );
+
+    switch( aMode )
+    {
+        case PNS_MODE_TUNE_SINGLE:
+            SetTitle( _( "Single track length tuning" ) );
+            m_legend->SetBitmap( KiBitmap( tune_single_track_length_legend_xpm ) );
+            m_targetLength.SetValue( m_settings.m_targetLength );
+            break;
+
+        case PNS_MODE_TUNE_DIFF_PAIR:
+            SetTitle( _( "Differential pair length tuning" ) );
+            m_legend->SetBitmap( KiBitmap( tune_diff_pair_length_legend_xpm ) );
+            m_targetLength.SetValue( m_settings.m_targetLength );
+            break;
+
+        case PNS_MODE_TUNE_DIFF_PAIR_SKEW:
+            SetTitle( _( "Differential pair skew tuning" ) );
+            m_legend->SetBitmap( KiBitmap( tune_diff_pair_skew_legend_xpm ) );
+            m_targetLengthLabel->SetLabel( _( "Target skew: " ) );
+            m_targetLength.SetValue ( m_settings.m_targetSkew );
+            break;
+
+        default:
+            break;
+    }
+
+    m_stdButtonsOK->SetDefault();
+    m_targetLengthText->SetSelection( -1, -1 );
+    m_targetLengthText->SetFocus();
+}
+
+
+void DIALOG_PNS_LENGTH_TUNING_SETTINGS::OnClose( wxCloseEvent& aEvent )
+{
+    // Do nothing, it is result of ESC pressing
+    EndModal( 0 );
+}
+
+
+void DIALOG_PNS_LENGTH_TUNING_SETTINGS::OnOkClick( wxCommandEvent& aEvent )
+{
+    // fixme: use validators and TransferDataFromWindow
+    m_settings.m_minAmplitude = m_minAmpl.GetValue();
+    m_settings.m_maxAmplitude = m_maxAmpl.GetValue();
+    m_settings.m_spacing = m_spacing.GetValue();
+
+    m_settings.m_cornerRadiusPercentage = wxAtoi( m_radiusText->GetValue() );
+
+    if( m_mode == PNS_MODE_TUNE_DIFF_PAIR_SKEW )
+        m_settings.m_targetSkew = m_targetLength.GetValue();
+    else
+        m_settings.m_targetLength = m_targetLength.GetValue();
+
+    if( m_settings.m_maxAmplitude < m_settings.m_minAmplitude )
+        m_settings.m_maxAmplitude = m_settings.m_maxAmplitude;
+
+    m_settings.m_cornerType = m_miterStyle->GetSelection() ? PNS_MEANDER_SETTINGS::CHAMFER : PNS_MEANDER_SETTINGS::ROUND;
+
+    EndModal( 1 );
+}
+
+
+void DIALOG_PNS_LENGTH_TUNING_SETTINGS::OnCancelClick( wxCommandEvent& aEvent )
+{
+    // Do nothing
+    EndModal( 0 );
+}

pcbnew/dialogs/dialog_pns_length_tuning_settings.h

+/*
+ * KiRouter - a push-and-(sometimes-)shove PCB router
+ *
+ * Copyright (C) 2014  CERN
+ * Author: Maciej Suminski <maciej.suminski@cern.ch>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.or/licenses/>.
+ */
+
+/**
+ * Push and Shove router settings dialog.
+ */
+
+#ifndef __dialog_pns_length_tuning_settings__
+#define __dialog_pns_length_tuning_settings__
+
+#include "dialog_pns_length_tuning_settings_base.h"
+
+#include <wx_unit_binder.h>
+
+#include <router/pns_router.h>
+
+class PNS_MEANDER_SETTINGS;
+
+class DIALOG_PNS_LENGTH_TUNING_SETTINGS : public DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE
+{
+public:
+    DIALOG_PNS_LENGTH_TUNING_SETTINGS( wxWindow* aParent, PNS_MEANDER_SETTINGS& aSettings, PNS_ROUTER_MODE aMode );
+
+    virtual void OnClose( wxCloseEvent& aEvent );
+    virtual void OnOkClick( wxCommandEvent& aEvent );
+    virtual void OnCancelClick( wxCommandEvent& aEvent );
+
+private:
+    WX_UNIT_BINDER m_minAmpl;
+    WX_UNIT_BINDER m_maxAmpl;
+    WX_UNIT_BINDER m_spacing;
+    WX_UNIT_BINDER m_targetLength;
+
+    PNS_MEANDER_SETTINGS& m_settings;
+    PNS_ROUTER_MODE m_mode;
+};
+
+#endif // __dialog_pns_settings__

pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp

+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version Jun  6 2014)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO "NOT" EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#include "dialog_pns_length_tuning_settings_base.h"
+
+///////////////////////////////////////////////////////////////////////////
+
+DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE::DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style )
+{
+	this->SetSizeHints( wxSize( 345,668 ), wxDefaultSize );
+	
+	wxBoxSizer* bMainSizer;
+	bMainSizer = new wxBoxSizer( wxVERTICAL );
+	
+	wxStaticBoxSizer* sbSizer1;
+	sbSizer1 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Length/skew") ), wxVERTICAL );
+	
+	wxFlexGridSizer* fgSizer4;
+	fgSizer4 = new wxFlexGridSizer( 0, 2, 0, 0 );
+	fgSizer4->AddGrowableCol( 1 );
+	fgSizer4->SetFlexibleDirection( wxBOTH );
+	fgSizer4->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	
+	m_staticText4 = new wxStaticText( this, wxID_ANY, _("Tune from:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText4->Wrap( -1 );
+	fgSizer4->Add( m_staticText4, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	wxArrayString m_choicePathFromChoices;
+	m_choicePathFrom = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choicePathFromChoices, 0 );
+	m_choicePathFrom->SetSelection( 0 );
+	fgSizer4->Add( m_choicePathFrom, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_staticText15 = new wxStaticText( this, wxID_ANY, _("Tune to:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText15->Wrap( -1 );
+	fgSizer4->Add( m_staticText15, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	wxArrayString m_choice4Choices;
+	m_choice4 = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choice4Choices, 0 );
+	m_choice4->SetSelection( 0 );
+	fgSizer4->Add( m_choice4, 0, wxALL, 5 );
+	
+	m_staticText3 = new wxStaticText( this, wxID_ANY, _("Constraint:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText3->Wrap( -1 );
+	fgSizer4->Add( m_staticText3, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	wxString m_constraintSourceChoices[] = { _("from Design Rules"), _("manual") };
+	int m_constraintSourceNChoices = sizeof( m_constraintSourceChoices ) / sizeof( wxString );
+	m_constraintSource = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_constraintSourceNChoices, m_constraintSourceChoices, 0 );
+	m_constraintSource->SetSelection( 1 );
+	m_constraintSource->Enable( false );
+	
+	fgSizer4->Add( m_constraintSource, 1, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_targetLengthLabel = new wxStaticText( this, wxID_ANY, _("Target length:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_targetLengthLabel->Wrap( -1 );
+	fgSizer4->Add( m_targetLengthLabel, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	wxGridSizer* gSizer2;
+	gSizer2 = new wxGridSizer( 0, 2, 0, 0 );
+	
+	m_targetLengthText = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	gSizer2->Add( m_targetLengthText, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_targetLengthUnit = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_targetLengthUnit->Wrap( -1 );
+	gSizer2->Add( m_targetLengthUnit, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+	
+	
+	fgSizer4->Add( gSizer2, 1, wxEXPAND, 5 );
+	
+	
+	sbSizer1->Add( fgSizer4, 1, wxEXPAND, 5 );
+	
+	
+	bMainSizer->Add( sbSizer1, 0, wxEXPAND|wxALL, 5 );
+	
+	wxStaticBoxSizer* sbSizer2;
+	sbSizer2 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Meandering") ), wxVERTICAL );
+	
+	m_legend = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	sbSizer2->Add( m_legend, 1, wxALL|wxEXPAND, 5 );
+	
+	wxFlexGridSizer* fgSizer3;
+	fgSizer3 = new wxFlexGridSizer( 0, 3, 0, 0 );
+	fgSizer3->AddGrowableCol( 2 );
+	fgSizer3->SetFlexibleDirection( wxBOTH );
+	fgSizer3->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	
+	m_staticText9 = new wxStaticText( this, wxID_ANY, _("Min amplitude (Amin):"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText9->Wrap( -1 );
+	fgSizer3->Add( m_staticText9, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_minAmplText = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer3->Add( m_minAmplText, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_minAmplUnit = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_minAmplUnit->Wrap( -1 );
+	fgSizer3->Add( m_minAmplUnit, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	
+	m_staticText91 = new wxStaticText( this, wxID_ANY, _("Max amplitude (Amax):"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText91->Wrap( -1 );
+	fgSizer3->Add( m_staticText91, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_maxAmplText = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer3->Add( m_maxAmplText, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_maxAmplUnit = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_maxAmplUnit->Wrap( -1 );
+	fgSizer3->Add( m_maxAmplUnit, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	
+	m_staticText11 = new wxStaticText( this, wxID_ANY, _("Spacing (s):"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText11->Wrap( -1 );
+	fgSizer3->Add( m_staticText11, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_spacingText = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer3->Add( m_spacingText, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_spacingUnit = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_spacingUnit->Wrap( -1 );
+	fgSizer3->Add( m_spacingUnit, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	
+	m_staticText13 = new wxStaticText( this, wxID_ANY, _("Miter radius (r):"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText13->Wrap( -1 );
+	fgSizer3->Add( m_staticText13, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_radiusText = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer3->Add( m_radiusText, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_radiusUnit = new wxStaticText( this, wxID_ANY, _("%"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_radiusUnit->Wrap( -1 );
+	fgSizer3->Add( m_radiusUnit, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
+	
+	m_staticText14 = new wxStaticText( this, wxID_ANY, _("Miter style:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText14->Wrap( -1 );
+	m_staticText14->Enable( false );
+	
+	fgSizer3->Add( m_staticText14, 1, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	wxString m_miterStyleChoices[] = { _("45 degree"), _("arc") };
+	int m_miterStyleNChoices = sizeof( m_miterStyleChoices ) / sizeof( wxString );
+	m_miterStyle = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_miterStyleNChoices, m_miterStyleChoices, 0 );
+	m_miterStyle->SetSelection( 0 );
+	m_miterStyle->Enable( false );
+	
+	fgSizer3->Add( m_miterStyle, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	
+	
+	sbSizer2->Add( fgSizer3, 1, wxEXPAND, 5 );
+	
+	
+	bMainSizer->Add( sbSizer2, 1, wxALL|wxEXPAND, 5 );
+	
+	m_stdButtons = new wxStdDialogButtonSizer();
+	m_stdButtonsOK = new wxButton( this, wxID_OK );
+	m_stdButtons->AddButton( m_stdButtonsOK );
+	m_stdButtonsCancel = new wxButton( this, wxID_CANCEL );
+	m_stdButtons->AddButton( m_stdButtonsCancel );
+	m_stdButtons->Realize();
+	
+	bMainSizer->Add( m_stdButtons, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
+	
+	
+	this->SetSizer( bMainSizer );
+	this->Layout();
+	
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE::OnClose ) );
+	m_stdButtonsCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE::OnCancelClick ), NULL, this );
+	m_stdButtonsOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE::OnOkClick ), NULL, this );
+}
+
+DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE::~DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE()
+{
+	// Disconnect Events
+	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE::OnClose ) );
+	m_stdButtonsCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE::OnCancelClick ), NULL, this );
+	m_stdButtonsOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE::OnOkClick ), NULL, this );
+	
+}

pcbnew/dialogs/dialog_pns_length_tuning_settings_base.h

+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version Jun  6 2014)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO "NOT" EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#ifndef __DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE_H__
+#define __DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE_H__
+
+#include <wx/artprov.h>
+#include <wx/xrc/xmlres.h>
+#include <wx/intl.h>
+class DIALOG_SHIM;
+
+#include "dialog_shim.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/choice.h>
+#include <wx/textctrl.h>
+#include <wx/sizer.h>
+#include <wx/statbox.h>
+#include <wx/bitmap.h>
+#include <wx/image.h>
+#include <wx/icon.h>
+#include <wx/statbmp.h>
+#include <wx/button.h>
+#include <wx/dialog.h>
+
+///////////////////////////////////////////////////////////////////////////
+
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE
+///////////////////////////////////////////////////////////////////////////////
+class DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE : public DIALOG_SHIM
+{
+	private:
+	
+	protected:
+		wxStaticText* m_staticText4;
+		wxChoice* m_choicePathFrom;
+		wxStaticText* m_staticText15;
+		wxChoice* m_choice4;
+		wxStaticText* m_staticText3;
+		wxChoice* m_constraintSource;
+		wxStaticText* m_targetLengthLabel;
+		wxTextCtrl* m_targetLengthText;
+		wxStaticText* m_targetLengthUnit;
+		wxStaticBitmap* m_legend;
+		wxStaticText* m_staticText9;
+		wxTextCtrl* m_minAmplText;
+		wxStaticText* m_minAmplUnit;
+		wxStaticText* m_staticText91;
+		wxTextCtrl* m_maxAmplText;
+		wxStaticText* m_maxAmplUnit;
+		wxStaticText* m_staticText11;
+		wxTextCtrl* m_spacingText;
+		wxStaticText* m_spacingUnit;
+		wxStaticText* m_staticText13;
+		wxTextCtrl* m_radiusText;
+		wxStaticText* m_radiusUnit;
+		wxStaticText* m_staticText14;
+		wxChoice* m_miterStyle;
+		wxStdDialogButtonSizer* m_stdButtons;
+		wxButton* m_stdButtonsOK;
+		wxButton* m_stdButtonsCancel;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+		virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnOkClick( wxCommandEvent& event ) { event.Skip(); }
+		
+	
+	public:
+		
+		DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Trace length tuning"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 345,668 ), long style = wxDEFAULT_DIALOG_STYLE ); 
+		~DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE();
+	
+};
+
+#endif //__DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE_H__

pcbnew/dialogs/dialog_track_via_size.cpp

@@ -31,14 +31,19 @@
 
 DIALOG_TRACK_VIA_SIZE::DIALOG_TRACK_VIA_SIZE( wxWindow* aParent, BOARD_DESIGN_SETTINGS& aSettings ) :
     DIALOG_TRACK_VIA_SIZE_BASE( aParent ),
+    m_trackWidth( aParent, m_trackWidthText, m_trackWidthLabel ),
+    m_viaDiameter( aParent, m_viaDiameterText, m_viaDiameterLabel ),
+    m_viaDrill( aParent, m_viaDrillText, m_viaDrillLabel ),
     m_settings( aSettings )
 {
     // Load router settings to dialog fields
-    m_trackWidth->SetValue( To_User_Unit( m_trackWidth->GetUnits(), m_settings.GetCustomTrackWidth() ) );
-    m_viaDiameter->SetValue( To_User_Unit( m_viaDiameter->GetUnits(), m_settings.GetCustomViaSize() ) );
-    m_viaDrill->SetValue( To_User_Unit( m_viaDrill->GetUnits(), m_settings.GetCustomViaDrill() ) );
+    m_trackWidth.SetValue( m_settings.GetCustomTrackWidth() );
+    m_viaDiameter.SetValue( m_settings.GetCustomViaSize() );
+    m_viaDrill.SetValue( m_settings.GetCustomViaDrill() );
 
-    m_trackWidth->SetFocus();
+    m_trackWidthText->SetFocus();
+    m_trackWidthText->SetSelection( -1, -1 );
+    m_stdButtonsOK->SetDefault();
 
     // Pressing ENTER when any of the text input fields is active applies changes
     #if wxCHECK_VERSION( 3, 0, 0 )
@@ -46,7 +51,7 @@ DIALOG_TRACK_VIA_SIZE::DIALOG_TRACK_VIA_SIZE( wxWindow* aParent, BOARD_DESIGN_SE
     #else
         Connect( wxEVT_COMMAND_TEXT_ENTER, wxCommandEventHandler( DIALOG_TRACK_VIA_SIZE::onOkClick ), NULL, this );
     #endif
-    
+
     Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_TRACK_VIA_SIZE::onClose ) );
 }
 
@@ -54,11 +59,11 @@ DIALOG_TRACK_VIA_SIZE::DIALOG_TRACK_VIA_SIZE( wxWindow* aParent, BOARD_DESIGN_SE
 bool DIALOG_TRACK_VIA_SIZE::check()
 {
     // Wrong input
-    if( !m_trackWidth->GetValue() || !m_viaDiameter->GetValue() || !m_viaDrill->GetValue() )
+    if( m_trackWidth.GetValue() < 0 || m_viaDiameter.GetValue() < 0 || m_viaDrill.GetValue() < 0 )
         return false;
 
     // Via drill should be smaller than via diameter
-    if( m_viaDrill->GetValue() >= m_viaDiameter->GetValue() )
+    if( m_viaDrill.GetValue() >= m_viaDiameter.GetValue() )
         return false;
 
     return true;
@@ -76,15 +81,15 @@ void DIALOG_TRACK_VIA_SIZE::onOkClick( wxCommandEvent& aEvent )
     if( check() )
     {
         // Store dialog values to the router settings
-        m_settings.SetCustomTrackWidth( From_User_Unit( m_trackWidth->GetUnits(), *m_trackWidth->GetValue() ) );
-        m_settings.SetCustomViaSize( From_User_Unit( m_viaDiameter->GetUnits(), *m_viaDiameter->GetValue() ) );
-        m_settings.SetCustomViaDrill( From_User_Unit( m_viaDrill->GetUnits(), *m_viaDrill->GetValue() ) );
+        m_settings.SetCustomTrackWidth( m_trackWidth.GetValue() );
+        m_settings.SetCustomViaSize( m_viaDiameter.GetValue() );
+        m_settings.SetCustomViaDrill( m_viaDrill.GetValue() );
         EndModal( 1 );
     }
     else
     {
         DisplayError( GetParent(), _( "Settings are incorrect" ) );
-        m_trackWidth->SetFocus();
+        m_trackWidthText->SetFocus();
     }
 }
 

pcbnew/dialogs/dialog_track_via_size.h

@@ -25,6 +25,8 @@
 #ifndef __dialog_track_via_size__
 #define __dialog_track_via_size__
 
+#include <wx_unit_binder.h>
+
 #include "dialog_track_via_size_base.h"
 
 class BOARD_DESIGN_SETTINGS;
@@ -32,21 +34,25 @@ class BOARD_DESIGN_SETTINGS;
 /** Implementing DIALOG_TRACK_VIA_SIZE_BASE */
 class DIALOG_TRACK_VIA_SIZE : public DIALOG_TRACK_VIA_SIZE_BASE
 {
-	public:
-		/** Constructor */
-		DIALOG_TRACK_VIA_SIZE( wxWindow* aParent, BOARD_DESIGN_SETTINGS& aSettings );
+public:
+    /** Constructor */
+    DIALOG_TRACK_VIA_SIZE( wxWindow* aParent, BOARD_DESIGN_SETTINGS& aSettings );
+
+protected:
+    WX_UNIT_BINDER m_trackWidth;
+    WX_UNIT_BINDER m_viaDiameter;
+    WX_UNIT_BINDER m_viaDrill;
 
-    protected:
-		// Routings settings that are modified by the dialog.
-        BOARD_DESIGN_SETTINGS& m_settings;
+    // Routings settings that are modified by the dialog.
+    BOARD_DESIGN_SETTINGS& m_settings;
 
-        ///> Checks if values given in the dialog are sensible.
-        bool check();
+    ///> Checks if values given in the dialog are sensible.
+    bool check();
 
-        // Handlers for DIALOG_TRACK_VIA_SIZE_BASE events.
-        void onClose( wxCloseEvent& aEvent );
-        void onOkClick( wxCommandEvent& aEvent );
-        void onCancelClick( wxCommandEvent& aEvent );
+    // Handlers for DIALOG_TRACK_VIA_SIZE_BASE events.
+    void onClose( wxCloseEvent& aEvent );
+    void onOkClick( wxCommandEvent& aEvent );
+    void onCancelClick( wxCommandEvent& aEvent );
 };
 
 #endif // __dialog_track_via_size__

pcbnew/dialogs/dialog_track_via_size_base.cpp

@@ -16,14 +16,46 @@ DIALOG_TRACK_VIA_SIZE_BASE::DIALOG_TRACK_VIA_SIZE_BASE( wxWindow* parent, wxWind
 	wxBoxSizer* bSizes;
 	bSizes = new wxBoxSizer( wxVERTICAL );
 	
-	m_trackWidth = new WX_UNIT_TEXT( this, _("Track width:") );
-	bSizes->Add( m_trackWidth, 0, wxALL|wxEXPAND, 5 );
+	wxFlexGridSizer* fgSizer1;
+	fgSizer1 = new wxFlexGridSizer( 0, 3, 0, 0 );
+	fgSizer1->SetFlexibleDirection( wxBOTH );
+	fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 	
-	m_viaDiameter = new WX_UNIT_TEXT( this, _("Via diameter:") );
-	bSizes->Add( m_viaDiameter, 0, wxALL|wxEXPAND, 5 );
+	m_staticText3 = new wxStaticText( this, wxID_ANY, _("Track width:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText3->Wrap( -1 );
+	fgSizer1->Add( m_staticText3, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 	
-	m_viaDrill = new WX_UNIT_TEXT( this, _("Via drill:") );
-	bSizes->Add( m_viaDrill, 0, wxALL|wxEXPAND, 5 );
+	m_trackWidthText = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer1->Add( m_trackWidthText, 1, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+	
+	m_trackWidthLabel = new wxStaticText( this, wxID_ANY, _("inch"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_trackWidthLabel->Wrap( -1 );
+	fgSizer1->Add( m_trackWidthLabel, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_staticText5 = new wxStaticText( this, wxID_ANY, _("Via diameter:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText5->Wrap( -1 );
+	fgSizer1->Add( m_staticText5, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_viaDiameterText = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer1->Add( m_viaDiameterText, 1, wxALL|wxEXPAND, 5 );
+	
+	m_viaDiameterLabel = new wxStaticText( this, wxID_ANY, _("u"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_viaDiameterLabel->Wrap( -1 );
+	fgSizer1->Add( m_viaDiameterLabel, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_staticText7 = new wxStaticText( this, wxID_ANY, _("Via drill:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText7->Wrap( -1 );
+	fgSizer1->Add( m_staticText7, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	m_viaDrillText = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer1->Add( m_viaDrillText, 1, wxALL|wxEXPAND, 5 );
+	
+	m_viaDrillLabel = new wxStaticText( this, wxID_ANY, _("u"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_viaDrillLabel->Wrap( -1 );
+	fgSizer1->Add( m_viaDrillLabel, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	
+	
+	bSizes->Add( fgSizer1, 1, wxEXPAND|wxALL, 5 );
 	
 	m_stdButtons = new wxStdDialogButtonSizer();
 	m_stdButtonsOK = new wxButton( this, wxID_OK );

pcbnew/dialogs/dialog_track_via_size_base.h

@@ -11,12 +11,13 @@
 #include <wx/artprov.h>
 #include <wx/xrc/xmlres.h>
 #include <wx/intl.h>
-#include <wxunittext.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/string.h>
+#include <wx/textctrl.h>
 #include <wx/sizer.h>
 #include <wx/button.h>
 #include <wx/dialog.h>
@@ -32,9 +33,15 @@ class DIALOG_TRACK_VIA_SIZE_BASE : public wxDialog
 	private:
 	
 	protected:
-		WX_UNIT_TEXT* m_trackWidth;
-		WX_UNIT_TEXT* m_viaDiameter;
-		WX_UNIT_TEXT* m_viaDrill;
+		wxStaticText* m_staticText3;
+		wxTextCtrl* m_trackWidthText;
+		wxStaticText* m_trackWidthLabel;
+		wxStaticText* m_staticText5;
+		wxTextCtrl* m_viaDiameterText;
+		wxStaticText* m_viaDiameterLabel;
+		wxStaticText* m_staticText7;
+		wxTextCtrl* m_viaDrillText;
+		wxStaticText* m_viaDrillLabel;
 		wxStdDialogButtonSizer* m_stdButtons;
 		wxButton* m_stdButtonsOK;
 		wxButton* m_stdButtonsCancel;

pcbnew/loadcmp.cpp

@@ -28,6 +28,8 @@
  * @brief Footprints selection and loading functions.
  */
 
+#include <boost/bind.hpp>
+ 
 #include <fctsys.h>
 #include <class_drawpanel.h>
 #include <pcb_draw_panel_gal.h>
@@ -61,6 +63,10 @@ static void DisplayCmpDoc( wxString& aName, void* aData );
 
 static FOOTPRINT_LIST MList;
 
+static void clearModuleItemFlags( BOARD_ITEM* aItem )
+{
+    aItem->ClearFlags();
+}
 
 bool FOOTPRINT_EDIT_FRAME::Load_Module_From_BOARD( MODULE* aModule )
 {
@@ -92,9 +98,10 @@ bool FOOTPRINT_EDIT_FRAME::Load_Module_From_BOARD( MODULE* aModule )
 
     aModule = newModule;
 
-    GetBoard()->Add( newModule );
-
     newModule->ClearFlags();
+    newModule->RunOnChildren( boost::bind( &clearModuleItemFlags, _1 ) );
+
+    GetBoard()->Add( newModule );
 
     // Clear references to any net info, because the footprint editor
     // does know any thing about nets handled by the current edited board.

pcbnew/menubar_pcbframe.cpp

@@ -433,6 +433,49 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
                  _( "Set the origin point for the grid" ),
                  KiBitmap( grid_select_axis_xpm ) );
 
+    wxMenu* routeMenu = new wxMenu;
+  
+    AddMenuItem( routeMenu, ID_TRACK_BUTT,
+                 _( "Single Track" ),
+                 _( "Interactively route a single track" ),
+                 KiBitmap( add_tracks_xpm ) );
+
+    AddMenuItem( routeMenu, ID_DIFF_PAIR_BUTT,
+                 _( "Differential Pair" ),
+                 _( "Interactively route a differential pair" ),
+                 KiBitmap( add_tracks_xpm ) );
+
+    routeMenu->AppendSeparator();
+
+    AddMenuItem( routeMenu, ID_TUNE_SINGLE_TRACK_LEN_BUTT,
+                 _( "Tune Track Length" ),
+                 _( "Tune length of a single track" ),
+                 KiBitmap( add_tracks_xpm ) );
+
+    AddMenuItem( routeMenu, ID_TUNE_DIFF_PAIR_LEN_BUTT,
+                 _( "Tune Differential Pair Length" ),
+                 _( "Tune length of a differential pair" ),
+                 KiBitmap( add_tracks_xpm ) );
+
+    AddMenuItem( routeMenu, ID_TUNE_DIFF_PAIR_SKEW_BUTT,
+                 _( "Tune Differential Pair Skew/Phase" ),
+                 _( "Tune skew/phase of a differential pair" ),
+                 KiBitmap( add_tracks_xpm ) );
+
+/* Fixme: add icons & missing menu entries!
+    routeMenu->AppendSeparator();
+
+    AddMenuItem( routeMenu, ID_MENU_MITER_TRACES,
+                 _( "Miter traces..." ),
+                 _( "Miter trace corners with arcs" ),
+                 KiBitmap( grid_select_axis_xpm ) );
+
+    AddMenuItem( routeMenu, ID_MENU_ADD_TEARDROPS,
+                 _( "Teardrops..." ),
+                 _( "Add teardrops to pads/vias" ),
+                 KiBitmap( grid_select_axis_xpm ) );
+*/
+
     //----- Preferences and configuration menu------------------------------------
     wxMenu* configmenu = new wxMenu;
 
@@ -467,6 +510,11 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
                  _( "Select how items (pads, tracks texts ... ) are displayed" ),
                  KiBitmap( display_options_xpm ) );
 
+    AddMenuItem( configmenu, ID_MENU_INTERACTIVE_ROUTER_SETTINGS,
+                 _( "Interactive Routing" ),
+                 _( "Configure Interactive Routing." ),
+                 KiBitmap( add_tracks_xpm ) ); // fixme: icon
+
     //--- dimensions submenu ------------------------------------------------------
     wxMenu* dimensionsMenu = new wxMenu;
 
@@ -488,6 +536,11 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
                  _( "Adjust the global clearance between pads and the solder resist mask" ),
                  KiBitmap( pads_mask_layers_xpm ) );
 
+    AddMenuItem( dimensionsMenu, ID_MENU_DIFF_PAIR_DIMENSIONS,
+                 _( "Differential Pairs" ),
+                 _( "Define the global gap/width for differential pairs." ),
+                 KiBitmap( add_tracks_xpm ) ); // fixme: icon
+
     dimensionsMenu->AppendSeparator();
     AddMenuItem( dimensionsMenu, ID_CONFIG_SAVE,
                  _( "&Save" ), _( "Save dimension preferences" ),
@@ -592,6 +645,7 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
     menuBar->Append( editMenu, _( "&Edit" ) );
     menuBar->Append( viewMenu, _( "&View" ) );
     menuBar->Append( placeMenu, _( "&Place" ) );
+    menuBar->Append( routeMenu, _( "&Route" ) );
     menuBar->Append( configmenu, _( "P&references" ) );
     menuBar->Append( dimensionsMenu, _( "D&imensions" ) );
     menuBar->Append( toolsMenu, _( "&Tools" ) );

pcbnew/modedit.cpp

@@ -53,6 +53,7 @@
 #include <modview_frame.h>
 #include <collectors.h>
 #include <tool/tool_manager.h>
+#include <tools/common_actions.h>
 
 #include <dialog_edit_module_for_Modedit.h>
 #include <dialog_move_exact.h>
@@ -433,6 +434,8 @@ void FOOTPRINT_EDIT_FRAME::Process_Special_Functions( wxCommandEvent& event )
                 break;
             }
 
+            m_toolManager->RunAction( COMMON_ACTIONS::selectionClear, true );
+
             // Create the "new" module
             MODULE* newmodule = new MODULE( *module_in_edit );
             newmodule->SetParent( mainpcb );
@@ -485,6 +488,7 @@ void FOOTPRINT_EDIT_FRAME::Process_Special_Functions( wxCommandEvent& event )
                 RN_DATA* ratsnest = pcbframe->GetBoard()->GetRatsnest();
                 ratsnest->Update( newmodule );
                 ratsnest->Recalculate();
+                GetGalCanvas()->ForceRefresh();
             }
         }
         break;

pcbnew/pcbframe.cpp

@@ -68,15 +68,6 @@
 
 #include <tool/tool_manager.h>
 #include <tool/tool_dispatcher.h>
-
-#include <tools/selection_tool.h>
-#include <router/router_tool.h>
-#include <tools/edit_tool.h>
-#include <tools/drawing_tool.h>
-#include <tools/point_editor.h>
-#include <tools/pcbnew_control.h>
-#include <tools/pcb_editor_control.h>
-#include <tools/placement_tool.h>
 #include <tools/common_actions.h>
 
 #include <scripting/python_console_frame.h>
@@ -543,14 +534,8 @@ void PCB_EDIT_FRAME::setupTools()
     m_toolDispatcher = new TOOL_DISPATCHER( m_toolManager );
 
     // Register tools
-    m_toolManager->RegisterTool( new SELECTION_TOOL );
-    m_toolManager->RegisterTool( new ROUTER_TOOL );
-    m_toolManager->RegisterTool( new EDIT_TOOL );
-    m_toolManager->RegisterTool( new DRAWING_TOOL );
-    m_toolManager->RegisterTool( new POINT_EDITOR );
-    m_toolManager->RegisterTool( new PCBNEW_CONTROL );
-    m_toolManager->RegisterTool( new PCB_EDITOR_CONTROL );
-    m_toolManager->RegisterTool( new PLACEMENT_TOOL );
+    registerAllTools( m_toolManager );
+
     m_toolManager->ResetTools( TOOL_BASE::RUN );
 
     // Run the selection tool, it is supposed to be always active

pcbnew/pcbnew_id.h

@@ -39,6 +39,15 @@ enum pcbnew_ids
     ID_PCB_DELETE_ITEM_BUTT,
     ID_PCB_PLACE_OFFSET_COORD_BUTT,
     ID_PCB_PLACE_GRID_COORD_BUTT,
+    ID_DIFF_PAIR_BUTT,
+    ID_TUNE_SINGLE_TRACK_LEN_BUTT,
+    ID_TUNE_DIFF_PAIR_LEN_BUTT,
+    ID_TUNE_DIFF_PAIR_SKEW_BUTT,
+    ID_MENU_REMOVE_MEANDERS,
+    ID_MENU_MITER_TRACES,
+    ID_MENU_ADD_TEARDROPS,
+    ID_MENU_DIFF_PAIR_DIMENSIONS,
+    ID_MENU_INTERACTIVE_ROUTER_SETTINGS,
 
     ID_PCB_MASK_CLEARANCE,
     ID_PCB_LAYERS_SETUP,

pcbnew/router/CMakeLists.txt

@@ -13,12 +13,19 @@ set( PCBNEW_PNS_SRCS
     time_limit.cpp
 
     pns_algo_base.cpp
+    pns_diff_pair.cpp
+    pns_diff_pair_placer.cpp
+    pns_dp_meander_placer.cpp
     pns_dragger.cpp
     pns_item.cpp
     pns_itemset.cpp
     pns_line.cpp
     pns_line_placer.cpp
     pns_logger.cpp
+    pns_meander.cpp
+    pns_meander_placer.cpp
+    pns_meander_placer_base.cpp
+    pns_meander_skew_placer.cpp
     pns_node.cpp
     pns_optimizer.cpp
     pns_router.cpp
@@ -26,11 +33,15 @@ set( PCBNEW_PNS_SRCS
     pns_shove.cpp
     pns_sizes_settings.cpp
     pns_solid.cpp
+    pns_tool_base.cpp
+    pns_topology.cpp
+    pns_tune_status_popup.cpp
     pns_utils.cpp
     pns_via.cpp
     pns_walkaround.cpp
     router_preview_item.cpp
     router_tool.cpp
+    length_tuner_tool.cpp
 )
 
 add_library( pnsrouter STATIC ${PCBNEW_PNS_SRCS} )

pcbnew/router/length_tuner_tool.h

+/*
+ * KiRouter - a push-and-(sometimes-)shove PCB router
+ *
+ * Copyright (C) 2013-2015 CERN
+ * Author: Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
+ * Author: Maciej Suminski <maciej.suminski@cern.ch>
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __LENGTH_TUNER_TOOL_H
+#define __LENGTH_TUNER_TOOL_H
+
+#include "pns_tool_base.h"
+#include "pns_meander.h"
+
+class PNS_TUNE_STATUS_POPUP;
+
+class APIEXPORT LENGTH_TUNER_TOOL : public PNS_TOOL_BASE
+{
+public:
+    LENGTH_TUNER_TOOL();
+    ~LENGTH_TUNER_TOOL();
+
+    void Reset( RESET_REASON aReason );
+
+    int TuneSingleTrace( const TOOL_EVENT& aEvent );
+    int TuneDiffPair( const TOOL_EVENT& aEvent );
+    int TuneDiffPairSkew( const TOOL_EVENT& aEvent );
+    int ClearMeanders( const TOOL_EVENT& aEvent );
+
+private:
+    void performTuning( );
+    int mainLoop( PNS_ROUTER_MODE aMode );
+    void handleCommonEvents( const TOOL_EVENT& aEvent );
+
+    PNS_MEANDER_SETTINGS m_savedMeanderSettings;
+};
+
+#endif

pcbnew/router/pns_algo_base.cpp

@@ -23,10 +23,10 @@
 
 PNS_ROUTING_SETTINGS& PNS_ALGO_BASE::Settings() const
 {
-	return m_router->Settings();
+    return m_router->Settings();
 }
 
-PNS_LOGGER *PNS_ALGO_BASE::Logger() 
+PNS_LOGGER *PNS_ALGO_BASE::Logger()
 {
-	return NULL;
-}
\ No newline at end of file
+    return NULL;
+}

pcbnew/router/pns_item.h

@@ -36,7 +36,8 @@ class PNS_NODE;
 enum LineMarker {
     MK_HEAD         = ( 1 << 0 ),
     MK_VIOLATION    = ( 1 << 3 ),
-    MK_LOCKED       = ( 1 << 4 )
+    MK_LOCKED       = ( 1 << 4 ),
+    MK_DP_COUPLED   = ( 1 << 5 )
 };
 
 /**
@@ -58,6 +59,7 @@ public:
         JOINT   = 4,
         SEGMENT = 8,
         VIA     = 16,
+        DIFF_PAIR = 32,
         ANY     = 0xff
     };
 

pcbnew/router/pns_routing_settings.cpp

@@ -24,7 +24,7 @@
 PNS_ROUTING_SETTINGS::PNS_ROUTING_SETTINGS()
 {
     m_routingMode = RM_Walkaround;
-    m_optimizerEffort = OE_FULL;
+    m_optimizerEffort = OE_MEDIUM;
     m_removeLoops = true;
     m_smartPads = true;
     m_shoveVias = true;

pcbnew/router/pns_routing_settings.h

@@ -137,7 +137,6 @@ private:
     PNS_MODE m_routingMode;
     PNS_OPTIMIZATION_EFFORT m_optimizerEffort;
 
-
     int m_walkaroundIterationLimit;
     int m_shoveIterationLimit;
     TIME_LIMIT m_shoveTimeLimit;