changes

3d-viewer/3d_canvas.cpp

@@ -24,6 +24,34 @@
 #include "bitmaps.h"
 
 
+// -----------------
+// helper function (from wxWidgets, opengl/cube.cpp sample
+// -----------------
+void CheckGLError()
+{
+    GLenum errLast = GL_NO_ERROR;
+
+    for ( ;; )
+    {
+        GLenum err = glGetError();
+        if ( err == GL_NO_ERROR )
+            return;
+
+        // normally the error is reset by the call to glGetError() but if
+        // glGetError() itself returns an error, we risk looping forever here
+        // so check that we get a different error than the last time
+        if ( err == errLast )
+        {
+            wxLogError(wxT("OpenGL error state couldn't be reset."));
+            return;
+        }
+
+        errLast = err;
+
+        wxLogError(wxT("OpenGL error %d"), err);
+    }
+}
+
 /*
  * Pcb3D_GLCanvas implementation
  */
@@ -519,7 +547,7 @@ void Pcb3D_GLCanvas::InitGL()
      {
          // Ratio width / height of the window display
          double ratio_HV = (double) size.x / size.y;
- 
+
          // Initialize Projection Matrix for Perspective View
          gluPerspective( 45.0 * g_Parm_3D_Visu.m_Zoom, ratio_HV, 1, 10 );
      }
@@ -538,6 +566,8 @@ void Pcb3D_GLCanvas::InitGL()
 
     // Setup light souces:
     SetLights();
+
+    CheckGLError();
 }
 
 
@@ -603,7 +633,7 @@ void Pcb3D_GLCanvas::TakeScreenshot( wxCommandEvent& event )
         GLint x;
         GLint y;
     } viewport;
-    
+
     // Build image from the 3D buffer
     wxWindowUpdateLocker noUpdates( this );
     glGetIntegerv( GL_VIEWPORT, (GLint*) &viewport );

3d-viewer/3d_draw.cpp

@@ -20,6 +20,8 @@
 #error Please set wxUSE_GLCANVAS to 1 in setup.h.
 #endif
 
+extern void CheckGLError();
+
 static void    Draw3D_FilledCircle( double posx, double posy, double rayon,
                                     double hole_rayon, double zpos );
 static void    Draw3D_FilledSegment( double startx, double starty,
@@ -348,9 +350,8 @@ GLuint Pcb3D_GLCanvas::CreateDrawGL_List()
     glEndList();
 
     /* Test for errors */
-    GLenum err = glGetError();
-    if( err != GL_NO_ERROR )
-        DisplayError( this, wxT( "Error in GL commands" ) );
+    CheckGLError();
+
     return m_gllist;
 }
 
@@ -786,8 +787,6 @@ void D_PAD::Draw3D( Pcb3D_GLCanvas* glcanvas )
         delta_cx, delta_cy,
         xc, yc;
     int     angle, delta_angle;
-    int     coord[4][2];
-    double  fcoord[8][2], f_hole_coord[8][2];
     double  scale;
     double  zpos;
     wxPoint shape_pos;
@@ -917,33 +916,18 @@ void D_PAD::Draw3D( Pcb3D_GLCanvas* glcanvas )
         break;
 
     case PAD_RECT:
-
     case PAD_TRAPEZOID:
     {
-        int ddx, ddy;
-        ddx = m_DeltaSize.x >> 1;
-        ddy = m_DeltaSize.y >> 1;
-
-        coord[0][0] = -dx - ddy;
-        coord[0][1] = +dy + ddx;
-
-        coord[1][0] = -dx + ddy;
-        coord[1][1] = -dy - ddx;
-
-        coord[2][0] = +dx - ddy;
-        coord[2][1] = -dy + ddx;
-
-        coord[3][0] = +dx + ddy;
-        coord[3][1] = +dy - ddx;
-
+        wxPoint  coord[5];
+        wxRealPoint  fcoord[8], f_hole_coord[8];
+        BuildPadPolygon( coord, wxSize(0,0), angle );
         for( ii = 0; ii < 4; ii++ )
         {
-            RotatePoint( &coord[ii][0], &coord[ii][1], angle );
-            coord[ii][0] += ux0;
-            coord[ii][1] += uy0;
+            coord[ii].x += ux0;
+            coord[ii].y += uy0;
             ll = ii * 2;
-            fcoord[ll][0] = coord[ii][0] *scale;
-            fcoord[ll][1] = coord[ii][1] *scale;
+            fcoord[ll].x = coord[ii].x *scale;
+            fcoord[ll].y = coord[ii].y *scale;
         }
 
         for( ii = 0; ii < 7; ii += 2 )
@@ -951,18 +935,17 @@ void D_PAD::Draw3D( Pcb3D_GLCanvas* glcanvas )
             ll = ii + 2;
             if( ll > 7 )
                 ll -= 8;
-            fcoord[ii + 1][0] = (fcoord[ii][0] + fcoord[ll][0]) / 2;
-            fcoord[ii + 1][1] = (fcoord[ii][1] + fcoord[ll][1]) / 2;
+            fcoord[ii + 1].x = (fcoord[ii].x + fcoord[ll].x) / 2;
+            fcoord[ii + 1].y = (fcoord[ii].y + fcoord[ll].y) / 2;
         }
 
         for( ii = 0; ii < 8; ii++ )
         {
-            f_hole_coord[ii][0] = -hole * 0.707;
-            f_hole_coord[ii][1] = hole * 0.707;
-            RotatePoint( &f_hole_coord[ii][0], &f_hole_coord[ii][1],
-                        angle - (ii * 450) );
-            f_hole_coord[ii][0] += drillx;
-            f_hole_coord[ii][1] += drilly;
+            f_hole_coord[ii].x = -hole * 0.707;
+            f_hole_coord[ii].y = hole * 0.707;
+            RotatePoint( &f_hole_coord[ii].x, &f_hole_coord[ii].y, angle - (ii * 450) );
+            f_hole_coord[ii].x += drillx;
+            f_hole_coord[ii].y += drilly;
         }
 
         for( layer = FIRST_COPPER_LAYER; layer <= LAST_COPPER_LAYER; layer++ )
@@ -991,12 +974,12 @@ void D_PAD::Draw3D( Pcb3D_GLCanvas* glcanvas )
             glBegin( GL_QUAD_STRIP );
             for( ii = 0; ii < 8; ii++ )
             {
-                glVertex3f( f_hole_coord[ii][0], -f_hole_coord[ii][1], zpos );
-                glVertex3f( fcoord[ii][0], -fcoord[ii][1], zpos );
+                glVertex3f( f_hole_coord[ii].x, -f_hole_coord[ii].y, zpos );
+                glVertex3f( fcoord[ii].x, -fcoord[ii].y, zpos );
             }
 
-            glVertex3f( f_hole_coord[0][0], -f_hole_coord[0][1], zpos );
-            glVertex3f( fcoord[0][0], -fcoord[0][1], zpos );
+            glVertex3f( f_hole_coord[0].x, -f_hole_coord[0].y, zpos );
+            glVertex3f( fcoord[0].x, -fcoord[0].y, zpos );
             glEnd();
         }
     }

3d-viewer/3d_toolbar.cpp

@@ -87,11 +87,11 @@ void WinEDA3D_DrawFrame::ReCreateHToolbar()
                          _( "Move up ^" ) );
 
     m_HToolBar->AddTool( ID_MOVE3D_DOWN, wxEmptyString, wxBitmap( down_xpm ),
-                         _( "Move down" ) );
-                         
+                         _( "Move down v" ) );
+
     m_HToolBar->AddSeparator();
     m_HToolBar->AddTool( ID_ORTHO, wxEmptyString, wxBitmap( ortho_xpm ),
-                         _( "Enable/Disable ortographic projection" ),
+                         _( "Enable/Disable orthographic projection" ),
                          wxITEM_CHECK );
 
     m_HToolBar->Realize();

AUTHORS.txt

-* Copyright (C) 1992-2009 Jean-Pierre Charras
-* Copyright (C) 1992-2009 Kicad Developers Team
+* Copyright (C) 1992-2010 Jean-Pierre Charras
+* Copyright (C) 1992-2010 Kicad Developers Team
 * under GNU General Public License (see copyright.txt)
 
-== Main Author
+== Main Authors
 Jean-Pierre Charras <jean-pierre.charras[at]gipsa-lab-dot-inpg-dot-fr>
-IUT1 GEII2
-Universite Joseph Fourier (U.J.F.)
-Saint Martin d'Hres (38402)
-Laboratiore GIPSA-Lab
-Saint Martin d'Hres
+Dick Hollenbeck <dick[at]softplc-dot-com>
+Wayne Stambaugh <stambaughw[at]verizon-dot-net>
 
 == Contributors
-Dick Hollenbeck <dick[at]softplc-dot-com>
 Hauptmech <hauptmech[at]gmail-dot-com>
 Jerry Jacobs <xor.gate.engineering[at]gmail-dot-com>
 Jonas Diemer <diemer[at]gmx-dot-de>
@@ -21,7 +17,6 @@ Marco Serantoni <marco.serantoni[at]gmail-dot-com>  (OSX maintener)
 Rok Markovic <rok[at]kanardia.eu>
 Tim Hanson <sideskate[at]gmail-dot-com>
 Vesa Solonen <vesa.solonen[at]hut-dot-fi>
-Wayne Stambaugh <stambaughw[at]verizon-dot-net>
 
 See also CHANGELOG.txt for contributors.
 

CHANGELOG.txt

@@ -4,7 +4,21 @@ KiCad ChangeLog 2010
 Please add newer entries at the top, list the date and your name with
 email address.
 
-2010-oct-15, UPDATE Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr>
+2010-nov-3 UPDATE Wayne Stambaugh <stambaughw@verizon.net>
+================================================================================
+++common
+  * Initial ground work for using Boost container for storing draw items
+    instead of internal linked list.
+++EESchema
+  * Move tests for dangling end code back into schematic objects.
+  * Add clear draw object state helper to SCH_SCREEN object.
+  * Add support for schematic objects to keep temporary list of connection
+    objects for dangling end and other connection related tests.
+  * Rearrange schematic label object code.
+  * Remove duplicate error message boxes when loading schematic items.
+
+
+2010-oct-28, UPDATE Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr>
 ================================================================================
 PolyLine.cpp:
     remove unused method CPolyLine::TestPointInsideContour() which was a duplicate of

bitmaps/CMakeLists.txt

@@ -161,6 +161,7 @@ set(BITMAP_SRCS
     icon_pcbnew.xpm
     icon_txt.xpm
     import3d.xpm
+    import_cmp_from_lib.xpm
     import_hierarchical_label.xpm
     Import_Module.xpm
     import.xpm

bitmaps/import_cmp_from_lib.xpm

+/* XPM */
+const char *import_cmp_from_lib_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 16 1",
+"O c #76787C",
+"$ c #979A9C",
+"= c #404440",
+"; c #ACB1B5",
+"# c #04BA04",
+"+ c #CACCCC",
+"o c #F5F6F7",
+". c #2E3031",
+"  c None",
+"* c #124912",
+"@ c #049304",
+"& c #505355",
+"X c #0C290C",
+"% c #046404",
+"- c #DADBDB",
+": c #83888C",
+/* pixels */
+"      .X        ",
+"     ooO        ",
+"    +o++.       ",
+" @#X$++.$       ",
+" %#@X$+X.&      ",
+" *##@%%%%=&.=.. ",
+" OX######%Oooo-.",
+"  $&*@@##%Ooo-; ",
+"  :;+:&%@&ooo+: ",
+"   O;+$*=-oo-;X ",
+"   =:$+.oooo+O  ",
+"    &O-+oooo;   ",
+"    X&++--o+:   ",
+"      .=O$$$    ",
+"         .XX    ",
+"                "
+};

common/CMakeLists.txt

@@ -20,6 +20,7 @@ set(COMMON_SRCS
     block_commande.cpp
     build_version.cpp
     class_colors_design_settings.cpp
+    class_layerchoicebox.cpp
     class_marker_base.cpp
     class_plotter.cpp
     class_undoredo_container.cpp

common/base_screen.cpp

@@ -542,6 +542,22 @@ PICKED_ITEMS_LIST* BASE_SCREEN::PopCommandFromRedoList( )
 }
 
 
+void BASE_SCREEN::AddItem( EDA_BaseStruct* aItem )
+{
+    wxCHECK_RET( aItem != NULL, wxT( "Attempt to add NULL item pointer to " ) + GetClass() +
+                 wxT( "item list" ) );
+    m_items.push_back( aItem );
+}
+
+
+void BASE_SCREEN::InsertItem( EDA_ITEMS::iterator aIter, EDA_BaseStruct* aItem )
+{
+    wxCHECK_RET( aItem != NULL, wxT( "Attempt to insert NULL item pointer to " ) + GetClass() +
+                 wxT( "item list" ) );
+    m_items.insert( aIter, aItem );
+}
+
+
 #if defined(DEBUG)
 /**
  * Function Show

common/basicframe.cpp

@@ -259,7 +259,7 @@ void WinEDA_BasicFrame::GetKicadHelp( wxCommandEvent& event )
     }
     else
     {
-        msg.Printf( _( "Help file %s not found" ), GetChars( wxGetApp().m_HelpFileName ) );
+        msg.Printf( _( "Help file %s not found." ), GetChars( wxGetApp().m_HelpFileName ) );
         DisplayError( this, msg );
     }
 

common/class_layerchoicebox.cpp

+#include "common.h"
+#include "pcbnew.h"
+#include "wxPcbStruct.h"
+#include "class_board_design_settings.h"
+#include "colors_selection.h"
+
+#include "bitmaps.h"
+#include "pcbnew_id.h"
+
+#include "hotkeys.h"
+#include "help_common_strings.h"
+
+#include <wx/ownerdrw.h>
+#include <wx/menuitem.h>
+#include <wx/bmpcbox.h>
+#include <wx/wx.h>
+
+#include "class_layerchoicebox.h"
+
+/* class to display a layer list.
+ *
+ */
+
+WinEDALayerChoiceBox::WinEDALayerChoiceBox( WinEDA_Toolbar* parent, wxWindowID id,
+                                            const wxPoint& pos, const wxSize& size,
+                                            int n, const wxString choices[] ) :
+    wxBitmapComboBox( parent, id, wxEmptyString, pos, size,
+                      n, choices, wxCB_READONLY )
+{
+    m_layerorder   = true;
+    m_layerhotkeys = true;
+    m_hotkeys      = NULL;
+
+    if( choices != NULL )
+        ResyncBitmapOnly();
+}
+
+
+WinEDALayerChoiceBox::WinEDALayerChoiceBox( WinEDA_Toolbar* parent, wxWindowID id,
+                                            const wxPoint& pos, const wxSize& size,
+                                            const wxArrayString& choices ) :
+    wxBitmapComboBox( parent, id, wxEmptyString, pos, size,
+                      choices, wxCB_READONLY )
+{
+    m_layerorder   = true;
+    m_layerhotkeys = true;
+    m_hotkeys      = NULL;
+
+    if( !choices.IsEmpty() )
+        ResyncBitmapOnly();
+}
+
+
+bool WinEDALayerChoiceBox::SetLayersOrdered( bool value )
+{
+    m_layerorder = value;
+    return m_layerorder;
+}
+
+
+bool WinEDALayerChoiceBox::SetLayersHotkeys( bool value )
+{
+    m_layerhotkeys = value;
+    return m_layerhotkeys;
+}
+
+
+// Get Current Item #
+int WinEDALayerChoiceBox::GetChoice()
+{
+    return GetSelection();
+}
+
+
+// Get Current Layer
+int WinEDALayerChoiceBox::GetLayerSelection()
+{
+    return (long) GetClientData( GetSelection() );
+}
+
+
+// Set Layer #
+int WinEDALayerChoiceBox::SetLayerSelection( int layer )
+{
+    int elements = GetCount();
+
+    for( int i = 0; i < elements; i++ )
+    {
+        if( GetClientData( i ) == (void*) layer )
+        {
+            if( GetSelection() != i )   // Element (i) is not selected
+            {
+                SetSelection( i );
+                return i;
+            }
+            else
+                return i;               //If element already selected; do nothing
+        }
+    }
+
+    // Not Found
+    SetSelection( -1 );
+    return -1;
+}
+
+
+// Reload the Layers
+void WinEDALayerChoiceBox::Resync()
+{
+    WinEDA_BasePcbFrame* pcbFrame = (WinEDA_BasePcbFrame*) GetParent()->GetParent();
+    BOARD* board = pcbFrame->GetBoard();
+
+    wxASSERT( board != NULL );
+
+    Clear();
+
+    static DECLARE_LAYERS_ORDER_LIST( layertranscode );
+    static DECLARE_LAYERS_HOTKEY( layerhk );
+
+    for( int i = 0; i < LAYER_COUNT; i++ )
+    {
+        wxBitmap   layerbmp( 14, 14 );
+        wxMemoryDC bmpDC;
+        wxBrush    brush;
+        wxString   layername;
+        int        layerid = i;
+
+        if( m_layerorder )
+            layerid = layertranscode[i];
+
+        if( !board->IsLayerEnabled( layerid ) )
+            continue;
+
+        // Prepare Bitmap
+        bmpDC.SelectObject( layerbmp );
+        brush.SetColour( MakeColour( board->GetLayerColor( layerid ) ) );
+        brush.SetStyle( wxSOLID );
+
+        bmpDC.SetBrush( brush );
+        bmpDC.DrawRectangle( 0, 0, layerbmp.GetWidth(), layerbmp.GetHeight() );
+        bmpDC.SetBrush( *wxTRANSPARENT_BRUSH );
+        bmpDC.SetPen( *wxBLACK_PEN );
+        bmpDC.DrawRectangle( 0, 0, layerbmp.GetWidth(), layerbmp.GetHeight() );
+
+        layername = board->GetLayerName( layerid );
+
+        if( m_layerhotkeys && m_hotkeys != NULL )
+            layername = AddHotkeyName( layername, m_hotkeys, layerhk[layerid], false );
+
+        Append( layername, layerbmp, (void*) layerid );
+    }
+}
+
+void WinEDALayerChoiceBox::ResyncBitmapOnly()
+{
+    WinEDA_BasePcbFrame* pcbFrame = (WinEDA_BasePcbFrame*) GetParent()->GetParent();
+    BOARD* board = pcbFrame->GetBoard();
+
+    int elements = GetCount();
+    for( int i = 0; i < elements; i++ )
+    {
+        wxBitmap   layerbmp( 14, 14 );
+        wxMemoryDC bmpDC;
+        wxBrush    brush;
+        wxString   layername;
+        int        layerid = i;
+
+        // Prepare Bitmap
+        bmpDC.SelectObject( layerbmp );
+        brush.SetColour( MakeColour( board->GetLayerColor( layerid ) ) );
+        brush.SetStyle( wxSOLID );
+
+        bmpDC.SetBrush( brush );
+        bmpDC.DrawRectangle( 0, 0, layerbmp.GetWidth(), layerbmp.GetHeight() );
+        bmpDC.SetBrush( *wxTRANSPARENT_BRUSH );
+        bmpDC.SetPen( *wxBLACK_PEN );
+        bmpDC.DrawRectangle( 0, 0, layerbmp.GetWidth(), layerbmp.GetHeight() );
+
+        SetItemBitmap(i, layerbmp); 
+    }
+}

common/drawframe.cpp

@@ -633,37 +633,43 @@ void WinEDA_DrawFrame::UpdateStatusBar()
     }
 
     /* The following sadly is an if eeschema/if pcbnew */
-    wxString formatter;
+    wxString absformatter;
+    wxString locformatter;
     switch( g_UserUnit )
     {
     case INCHES:
         if( m_InternalUnits == EESCHEMA_INTERNAL_UNIT )
         {
-            formatter = wxT( "X %.3f  Y %.3f" );
+            absformatter = wxT( "X %.3f  Y %.3f" );
+            locformatter = wxT( "dx %.3f  dy %.3f" );
         }
         else
         {
-            formatter = wxT( "X %.4f  Y %.4f" );
+            absformatter = wxT( "X %.4f  Y %.4f" );
+            locformatter = wxT( "dx %.4f  dy %.4f" );
         }
         break;
 
     case MILLIMETRES:
         if( m_InternalUnits == EESCHEMA_INTERNAL_UNIT )
         {
-            formatter = wxT( "X %.2f  Y %.2f" );
+            absformatter = wxT( "X %.2f  Y %.2f" );
+            locformatter = wxT( "dx %.2f  dy %.2f" );
         }
         else
         {
-            formatter = wxT( "X %.3f  Y %.3f" );
+            absformatter = wxT( "X %.3f  Y %.3f" );
+            locformatter = wxT( "dx %.3f  dy %.3f" );
         }
         break;
 
     case UNSCALED_UNITS:
-        formatter = wxT( "X %f  Y %f" );
+        absformatter = wxT( "X %f  Y %f" );
+        locformatter = wxT( "dx %f  dy %f" );
         break;
     }
 
-    Line.Printf( formatter, dXpos, dYpos );
+    Line.Printf( absformatter, dXpos, dYpos );
     SetStatusText( Line, 2 );
 
     /* Display relative coordinates:  */
@@ -678,7 +684,7 @@ void WinEDA_DrawFrame::UpdateStatusBar()
     }
 
     /* We already decided the formatter above */
-    Line.Printf( formatter, dXpos, dYpos );
+    Line.Printf( locformatter, dXpos, dYpos );
     SetStatusText( Line, 3 );
 }
 

common/dsnlexer.cpp

@@ -224,18 +224,18 @@ bool DSNLEXER::IsSymbol( int aTok )
 }
 
 
-void DSNLEXER::ThrowIOError( wxString aText, int charOffset ) throw (IOError)
+void DSNLEXER::ThrowIOError( wxString aText, int charOffset ) throw( IO_ERROR )
 {
     // append to aText, do not overwrite
     aText << wxT(" ") << _("in") << wxT(" \"") << CurSource()
           << wxT("\" ") << _("on line") << wxT(" ") << reader->LineNumber()
           << wxT(" ") << _("at offset") << wxT(" ") << charOffset;
 
-    throw IOError( aText );
+    throw IO_ERROR( aText );
 }
 
 
-void DSNLEXER::Expecting( int aTok ) throw( IOError )
+void DSNLEXER::Expecting( int aTok ) throw( IO_ERROR )
 {
     wxString    errText( _("Expecting") );
     errText << wxT(" ") << GetTokenString( aTok );
@@ -243,7 +243,7 @@ void DSNLEXER::Expecting( int aTok ) throw( IOError )
 }
 
 
-void DSNLEXER::Expecting( const wxString& text ) throw( IOError )
+void DSNLEXER::Expecting( const wxString& text ) throw( IO_ERROR )
 {
     wxString    errText( _("Expecting") );
     errText << wxT(" '") << text << wxT("'");
@@ -251,7 +251,7 @@ void DSNLEXER::Expecting( const wxString& text ) throw( IOError )
 }
 
 
-void DSNLEXER::Unexpected( int aTok ) throw( IOError )
+void DSNLEXER::Unexpected( int aTok ) throw( IO_ERROR )
 {
     wxString    errText( _("Unexpected") );
     errText << wxT(" ") << GetTokenString( aTok );
@@ -259,7 +259,7 @@ void DSNLEXER::Unexpected( int aTok ) throw( IOError )
 }
 
 
-void DSNLEXER::Unexpected( const wxString& text ) throw( IOError )
+void DSNLEXER::Unexpected( const wxString& text ) throw( IO_ERROR )
 {
     wxString    errText( _("Unexpected") );
     errText << wxT(" '") << text << wxT("'");
@@ -267,7 +267,7 @@ void DSNLEXER::Unexpected( const wxString& text ) throw( IOError )
 }
 
 
-void DSNLEXER::NeedLEFT() throw( IOError )
+void DSNLEXER::NeedLEFT() throw( IO_ERROR )
 {
     int tok = NextTok();
     if( tok != DSN_LEFT )
@@ -275,7 +275,7 @@ void DSNLEXER::NeedLEFT() throw( IOError )
 }
 
 
-void DSNLEXER::NeedRIGHT() throw( IOError )
+void DSNLEXER::NeedRIGHT() throw( IO_ERROR )
 {
     int tok = NextTok();
     if( tok != DSN_RIGHT )
@@ -283,7 +283,7 @@ void DSNLEXER::NeedRIGHT() throw( IOError )
 }
 
 
-int DSNLEXER::NeedSYMBOL() throw( IOError )
+int DSNLEXER::NeedSYMBOL() throw( IO_ERROR )
 {
     int tok = NextTok();
     if( !IsSymbol( tok ) )
@@ -292,7 +292,7 @@ int DSNLEXER::NeedSYMBOL() throw( IOError )
 }
 
 
-int DSNLEXER::NeedSYMBOLorNUMBER() throw( IOError )
+int DSNLEXER::NeedSYMBOLorNUMBER() throw( IO_ERROR )
 {
     int  tok = NextTok();
     if( !IsSymbol( tok ) && tok!=DSN_NUMBER )
@@ -312,7 +312,7 @@ static inline bool isSpace( int cc )
 }
 
 
-int DSNLEXER::NextTok() throw (IOError)
+int DSNLEXER::NextTok() throw( IO_ERROR )
 {
     char*   cur  = next;
     char*   head = cur;
@@ -1380,7 +1380,7 @@ class DSNTEST : public wxApp
     DSNLEXER*   lexer;
     int         nestLevel;
 
-    void        recursion() throw( IOError );
+    void        recursion() throw( IO_ERROR );
 
     void        indent()
     {
@@ -1485,7 +1485,7 @@ bool DSNTEST::OnInit()
         }
         printf("\n");
     }
-    catch( IOError ioe )
+    catch( IO_ERROR ioe )
     {
         fprintf( stderr, "%s\n", CONV_TO_UTF8( ioe.errorText ) );
     }
@@ -1494,7 +1494,7 @@ bool DSNTEST::OnInit()
 }
 
 
-void DSNTEST::recursion() throw(IOError)
+void DSNTEST::recursion() throw( IO_ERROR )
 {
     int         tok;
     const char* space = "";

common/edaappl.cpp

@@ -626,6 +626,18 @@ void WinEDA_App::GetSettings(bool aReopenLastUsedDirectory)
     }
 
     m_EDA_Config->Read( wxT( "BgColor" ), &g_DrawBgColor );
+
+    /* Load per-user search paths from settings file */
+    
+    wxString   upath;
+    int i = 1;
+    while( 1 ) 
+    { 
+        upath = m_EDA_CommonConfig->Read( wxString::Format( wxT( "LibraryPath%d" ), i ), wxT( "" ) );
+        if( upath.IsSameAs( wxT( "" ) ) ) break;
+        m_libSearchPaths.Add( upath );
+        i ++;
+    }
 }
 
 

common/richio.cpp

@@ -90,7 +90,7 @@ FILE_LINE_READER::FILE_LINE_READER( FILE* aFile, const wxString& aFileName, unsi
 }
 
 
-unsigned FILE_LINE_READER::ReadLine() throw (IOError)
+unsigned FILE_LINE_READER::ReadLine() throw( IO_ERROR )
 {
     length  = 0;
     line[0] = 0;
@@ -101,7 +101,7 @@ unsigned FILE_LINE_READER::ReadLine() throw (IOError)
         length += strlen( line + length );
 
         if( length == maxLineLength )
-            throw IOError( _("Line length exceeded") );
+            throw IO_ERROR( _("Line length exceeded") );
 
         // a normal line breaks here, once through while loop
         if( length+1 < capacity || line[length-1] == '\n' )
@@ -117,7 +117,7 @@ unsigned FILE_LINE_READER::ReadLine() throw (IOError)
 }
 
 
-unsigned STRING_LINE_READER::ReadLine() throw (IOError)
+unsigned STRING_LINE_READER::ReadLine() throw( IO_ERROR )
 {
     size_t  nlOffset = lines.find( '\n', ndx );
 
@@ -129,7 +129,7 @@ unsigned STRING_LINE_READER::ReadLine() throw (IOError)
     if( length )
     {
         if( length >= maxLineLength )
-            throw IOError( _("Line length exceeded") );
+            throw IO_ERROR( _("Line length exceeded") );
 
         if( length+1 > capacity )   // +1 for terminating nul
             expandCapacity( length+1 );
@@ -186,7 +186,7 @@ const char* OUTPUTFORMATTER::GetQuoteChar( const char* wrapee, const char* quote
 }
 
 
-int OUTPUTFORMATTER::vprint( const char* fmt,  va_list ap )  throw( IOError )
+int OUTPUTFORMATTER::vprint( const char* fmt,  va_list ap )  throw( IO_ERROR )
 {
     int ret = vsnprintf( &buffer[0], buffer.size(), fmt, ap );
     if( ret >= (int) buffer.size() )
@@ -202,7 +202,7 @@ int OUTPUTFORMATTER::vprint( const char* fmt,  va_list ap )  throw( IOError )
 }
 
 
-int OUTPUTFORMATTER::sprint( const char* fmt, ... )  throw( IOError )
+int OUTPUTFORMATTER::sprint( const char* fmt, ... )  throw( IO_ERROR )
 {
     va_list     args;
 
@@ -214,7 +214,7 @@ int OUTPUTFORMATTER::sprint( const char* fmt, ... )  throw( IOError )
 }
 
 
-int OUTPUTFORMATTER::Print( int nestLevel, const char* fmt, ... ) throw( IOError )
+int OUTPUTFORMATTER::Print( int nestLevel, const char* fmt, ... ) throw( IO_ERROR )
 {
 #define NESTWIDTH           2   ///< how many spaces per nestLevel
 
@@ -243,7 +243,7 @@ int OUTPUTFORMATTER::Print( int nestLevel, const char* fmt, ... ) throw( IOError
 }
 
 
-const char* OUTPUTFORMATTER::Quoted( std::string* aWrapee ) throw( IOError )
+const char* OUTPUTFORMATTER::Quoted( std::string* aWrapee ) throw( IO_ERROR )
 {
     // derived class's notion of what a quote character is
     char quote          = *GetQuoteChar( "(" );
@@ -268,7 +268,7 @@ const char* OUTPUTFORMATTER::Quoted( std::string* aWrapee ) throw( IOError )
             // a decision was made to make all S-expression strings be on a single
             // line.  You can embedd \n (human readable) in the text but not
             // '\n' which is 0x0a.
-            throw IOError( _( "S-expression string has newline" ) );
+            throw IO_ERROR( _( "S-expression string has newline" ) );
         }
     }
 
@@ -285,7 +285,7 @@ const char* OUTPUTFORMATTER::Quoted( std::string* aWrapee ) throw( IOError )
 
 //-----<STRING_FORMATTER>----------------------------------------------------
 
-void STRING_FORMATTER::write( const char* aOutBuf, int aCount ) throw( IOError )
+void STRING_FORMATTER::write( const char* aOutBuf, int aCount ) throw( IO_ERROR )
 {
     mystring.append( aOutBuf, aCount );
 }
@@ -314,7 +314,7 @@ const char* STREAM_OUTPUTFORMATTER::GetQuoteChar( const char* wrapee )
 }
 
 
-void STREAM_OUTPUTFORMATTER::write( const char* aOutBuf, int aCount ) throw( IOError )
+void STREAM_OUTPUTFORMATTER::write( const char* aOutBuf, int aCount ) throw( IO_ERROR )
 {
     int lastWrite;
 
@@ -326,7 +326,7 @@ void STREAM_OUTPUTFORMATTER::write( const char* aOutBuf, int aCount ) throw( IOE
 
         if( !os.IsOk() )
         {
-            throw IOError( _( "OUTPUTSTREAM_OUTPUTFORMATTER write error" ) );
+            throw IO_ERROR( _( "OUTPUTSTREAM_OUTPUTFORMATTER write error" ) );
         }
     }
 }

common/selcolor.cpp

@@ -74,13 +74,27 @@ WinEDA_SelColorFrame::WinEDA_SelColorFrame( wxWindow*      parent,
     GetSizer()->SetSizeHints( this );
 
     // Ensure the whole frame is visible, whenever the asked position.
+    // Moreover with a work station having dual monitors, the asked position can be relative to a monitor
+    // and this frame can be displayed on the other monitor, with an "out of screen" position.
     // Give also a small margin.
-    wxPoint endCornerPosition = GetPosition();
     int margin = 10;
+    wxPoint windowPosition = GetPosition();
+    if( framepos != wxDefaultPosition )
+    {
+        if( windowPosition.x < margin )
+            windowPosition.x = margin;
+        // Under MACOS, a vertical margin >= 20 is needed by the system menubar
+        int v_margin = MAX(20, margin);
+        if( windowPosition.y < v_margin )
+            windowPosition.y = v_margin;
+        if( windowPosition != framepos )
+            SetPosition(windowPosition);
+    }
+    wxPoint endCornerPosition = GetPosition();
     endCornerPosition.x += GetSize().x + margin;
     endCornerPosition.y += GetSize().y + margin;
 
-    wxPoint windowPosition = GetPosition();
+    windowPosition = GetPosition();
     wxRect freeScreenArea( wxGetClientDisplayRect( ) );
     if( freeScreenArea.GetRight() < endCornerPosition.x )
     {

common/wineda_toolbar.cpp

@@ -13,7 +13,7 @@
 WinEDA_Toolbar::WinEDA_Toolbar( id_toolbar type, wxWindow * parent,
                                 wxWindowID id, bool horizontal ):
     wxAuiToolBar( parent, id, wxDefaultPosition, wxDefaultSize,
-                  wxAUI_TB_DEFAULT_STYLE | wxAUI_TB_OVERFLOW | ( ( horizontal ) ?
+                  wxAUI_TB_DEFAULT_STYLE | ( ( horizontal ) ?
                                              wxAUI_TB_HORZ_LAYOUT :
                                              wxAUI_TB_VERTICAL ) )
 {

common/xnode.cpp

@@ -29,7 +29,7 @@
 typedef wxXmlProperty   XATTR;
 
 
-void XNODE::Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
+void XNODE::Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
 {
     switch( GetType() )
     {
@@ -48,7 +48,7 @@ void XNODE::Format( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
 }
 
 
-void XNODE::FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IOError )
+void XNODE::FormatContents( OUTPUTFORMATTER* out, int nestLevel ) throw( IO_ERROR )
 {
     std::string utf8;
 

cvpcb/class_DisplayFootprintsFrame.cpp

@@ -14,6 +14,7 @@
 #include "protos.h"
 #include "cvstruct.h"
 #include "class_DisplayFootprintsFrame.h"
+#include "cvpcb_id.h"
 
 /*
  * NOTE: There is something in 3d_viewer.h that causes a compiler error in

cvpcb/class_footprints_listbox.cpp

@@ -23,7 +23,7 @@ FOOTPRINTS_LISTBOX::FOOTPRINTS_LISTBOX( WinEDA_CvpcbFrame* parent,
 {
     m_UseFootprintFullList = true;
     m_ActiveFootprintList  = NULL;
-    SetActiveFootprintList( TRUE );
+    SetActiveFootprintList( true );
 }
 
 
@@ -61,8 +61,8 @@ wxString FOOTPRINTS_LISTBOX::GetSelectedFootprint()
     if( ii >= 0 )
     {
         wxString msg = (*m_ActiveFootprintList)[ii];
-        msg.Trim( TRUE );
-        msg.Trim( FALSE );
+        msg.Trim( true );
+        msg.Trim( false );
         FootprintName = msg.AfterFirst( wxChar( ' ' ) );
     }
 
@@ -121,11 +121,11 @@ void FOOTPRINTS_LISTBOX::SetFootprintFullList( FOOTPRINT_LIST& list )
         m_FullFootprintList.Add( msg );
     }
 
-    SetActiveFootprintList( TRUE );
+    SetActiveFootprintList( true );
 
     if( ( GetCount() == 0 )
        || ( OldSelection < 0 ) || ( OldSelection >= GetCount() ) )
-        SetSelection( 0, TRUE );
+        SetSelection( 0, true );
     Refresh();
 }
 
@@ -137,7 +137,7 @@ void FOOTPRINTS_LISTBOX::SetFootprintFilteredList( COMPONENT*      Component,
     wxString msg;
     unsigned jj;
     int      OldSelection = GetSelection();
-    bool     HasItem = FALSE;
+    bool     HasItem = false;
 
     m_FilteredFootprintList.Clear();
 
@@ -150,17 +150,17 @@ void FOOTPRINTS_LISTBOX::SetFootprintFilteredList( COMPONENT*      Component,
             msg.Printf( wxT( "%3d %s" ), m_FilteredFootprintList.GetCount() + 1,
                        footprint.m_Module.GetData() );
             m_FilteredFootprintList.Add( msg );
-            HasItem = TRUE;
+            HasItem = true;
         }
     }
 
     if( HasItem )
-        SetActiveFootprintList( FALSE );
+        SetActiveFootprintList( false );
     else
-        SetActiveFootprintList( TRUE );
+        SetActiveFootprintList( true );
 
     if( ( GetCount() == 0 ) || ( OldSelection >= GetCount() ) )
-        SetSelection( 0, TRUE );
+        SetSelection( 0, true );
 
     Refresh();
 }
@@ -189,49 +189,35 @@ void FOOTPRINTS_LISTBOX::SetActiveFootprintList( bool FullList, bool Redraw )
     {
         bool new_selection;
         if( FullList )
-            new_selection = TRUE;
+            new_selection = true;
         else
-            new_selection = FALSE;
+            new_selection = false;
         if( new_selection != old_selection )
-            SetSelection( 0, TRUE );
+            SetSelection( 0, true );
     }
 #endif
     if( FullList )
     {
-        m_UseFootprintFullList = TRUE;
+        m_UseFootprintFullList = true;
         m_ActiveFootprintList  = &m_FullFootprintList;
         SetItemCount( m_FullFootprintList.GetCount() );
     }
     else
     {
-        m_UseFootprintFullList = FALSE;
+        m_UseFootprintFullList = false;
         m_ActiveFootprintList  = &m_FilteredFootprintList;
         SetItemCount( m_FilteredFootprintList.GetCount() );
     }
 
     if( Redraw )
     {
-        if( !m_UseFootprintFullList
-           || ( m_UseFootprintFullList != old_selection ) )
+        if( !m_UseFootprintFullList || ( m_UseFootprintFullList != old_selection ) )
         {
             Refresh();
         }
     }
 
-    if( !m_UseFootprintFullList || ( m_UseFootprintFullList != old_selection ) )
-    {
-        GetParent()->SetStatusText( wxEmptyString, 0 );
-        GetParent()->SetStatusText( wxEmptyString, 1 );
-    }
-
-    wxString msg;
-    if( FullList )
-        msg.Printf( _( "Footprints (All): %d" ),
-                   m_ActiveFootprintList->GetCount() );
-    else
-        msg.Printf( _( "Footprints (filtered): %d" ),
-                   m_ActiveFootprintList->GetCount() );
-    GetParent()->SetStatusText( msg, 2 );
+    GetParent()->DisplayStatus();
 }
 
 
@@ -253,6 +239,7 @@ void FOOTPRINTS_LISTBOX::OnLeftClick( wxListEvent& event )
     wxString   FootprintName = GetSelectedFootprint();
 
     Module = GetModuleDescrByName( FootprintName, GetParent()->m_footprints );
+    wxASSERT(Module);
     if( GetParent()->DrawFrame )
     {
         GetParent()->CreateScreenCmp(); /* refresh general */

cvpcb/cvframe.cpp

@@ -16,6 +16,7 @@
 #include "cvstruct.h"
 #include "dialog_cvpcb_config.h"
 #include "class_DisplayFootprintsFrame.h"
+#include "cvpcb_id.h"
 
 #include "build_version.h"
 
@@ -115,7 +116,6 @@ WinEDA_CvpcbFrame::WinEDA_CvpcbFrame( const wxString& title,
     m_KeepCvpcbOpen         = false;
     m_undefinedComponentCnt = 0;
 
-
     /* Name of the document footprint list
      * usually located in share/modules/footprints_doc
      * this is of the responsibility to users to create this file
@@ -422,9 +422,7 @@ void WinEDA_CvpcbFrame::DelAssociations( wxCommandEvent& event )
         m_undefinedComponentCnt = m_components.size();
     }
 
-    Line.Printf( _( "Components: %d (free: %d)" ), m_components.size(),
-                 m_components.size() );
-    SetStatusText( Line, 1 );
+    DisplayStatus();
 }
 
 
@@ -557,6 +555,7 @@ void WinEDA_CvpcbFrame::OnSelectComponent( wxListEvent& event )
 
     m_FootprintList->SetFootprintFilteredList( &m_components[ selection ],
                                                m_footprints );
+    DisplayStatus();
 }
 
 
@@ -585,3 +584,30 @@ void WinEDA_CvpcbFrame::OnUpdateKeepOpenOnSave( wxUpdateUIEvent& event )
 {
     event.Check( m_KeepCvpcbOpen );
 }
+
+
+/** DisplayStatus()
+ * Displays info to the status line at bottom of the main frame
+ */
+void WinEDA_CvpcbFrame::DisplayStatus()
+{
+    wxString msg;
+    msg.Printf( _( "Components: %d (free: %d)" ),
+                 m_components.size(), m_undefinedComponentCnt );
+    SetStatusText( msg, 0 );
+
+    SetStatusText( wxEmptyString, 1 );
+
+    if( m_FootprintList )
+    {
+        if( m_FootprintList->m_UseFootprintFullList )
+            msg.Printf( _( "Footprints (All): %d" ),
+                       m_FootprintList->m_ActiveFootprintList->GetCount() );
+        else
+            msg.Printf( _( "Footprints (filtered): %d" ),
+                       m_FootprintList->m_ActiveFootprintList->GetCount() );
+    }
+    else
+        msg.Empty();
+    SetStatusText( msg, 2 );
+}

cvpcb/cvpcb_id.h

+/**
+ * @file cvpcb_id.h
+ */
+/*
+ * Command IDs for CvPcb.
+ *
+ * Please add IDs that are unique to the component library viewer here and
+ * not in the global id.h file.  This will prevent the entire project from
+ * being rebuilt when adding new commands to the component library viewer.
+ */
+
+// Generic IDs:
+#include "id.h"
+
+// specific IDs
+enum id_cvpcb_frm
+{
+    ID_CVPCB_QUIT = ID_END_LIST,
+    ID_CVPCB_READ_INPUT_NETLIST,
+    ID_CVPCB_SAVEQUITCVPCB,
+    ID_CVPCB_CREATE_CONFIGWINDOW,
+    ID_CVPCB_CREATE_SCREENCMP,
+    ID_CVPCB_GOTO_FIRSTNA,
+    ID_CVPCB_GOTO_PREVIOUSNA,
+    ID_CVPCB_DEL_ASSOCIATIONS,
+    ID_CVPCB_AUTO_ASSOCIE,
+    ID_CVPCB_COMPONENT_LIST,
+    ID_CVPCB_FOOTPRINT_LIST,
+    ID_CVPCB_CREATE_STUFF_FILE,
+    ID_CVPCB_SHOW3D_FRAME,
+    ID_CVPCB_FOOTPRINT_DISPLAY_FULL_LIST,
+    ID_CVPCB_FOOTPRINT_DISPLAY_FILTERED_LIST,
+    ID_CVPCB_CONFIG_KEEP_OPEN_ON_SAVE
+};

cvpcb/cvstruct.h

@@ -16,36 +16,6 @@ class COMPONENTS_LISTBOX;
 class DISPLAY_FOOTPRINTS_FRAME;
 
 
-#include "id.h"
-
-
-/**
- * Command IDs for the component library viewer.
- *
- * Please add IDs that are unique to the component library viewer here and
- * not in the global id.h file.  This will prevent the entire project from
- * being rebuilt when adding new commands to the component library viewer.
- */
-enum id_cvpcb_frm
-{
-    ID_CVPCB_QUIT = ID_END_LIST,
-    ID_CVPCB_READ_INPUT_NETLIST,
-    ID_CVPCB_SAVEQUITCVPCB,
-    ID_CVPCB_CREATE_CONFIGWINDOW,
-    ID_CVPCB_CREATE_SCREENCMP,
-    ID_CVPCB_GOTO_FIRSTNA,
-    ID_CVPCB_GOTO_PREVIOUSNA,
-    ID_CVPCB_DEL_ASSOCIATIONS,
-    ID_CVPCB_AUTO_ASSOCIE,
-    ID_CVPCB_COMPONENT_LIST,
-    ID_CVPCB_FOOTPRINT_LIST,
-    ID_CVPCB_CREATE_STUFF_FILE,
-    ID_CVPCB_SHOW3D_FRAME,
-    ID_CVPCB_FOOTPRINT_DISPLAY_FULL_LIST,
-    ID_CVPCB_FOOTPRINT_DISPLAY_FILTERED_LIST,
-    ID_CVPCB_CONFIG_KEEP_OPEN_ON_SAVE
-};
-
 
 /**
  * The CVPcb application main window.
@@ -120,6 +90,10 @@ public:
     void             SaveProjectFile( const wxString& fileName );
     virtual void     LoadSettings();
     virtual void     SaveSettings();
+    /** DisplayStatus()
+     * Displays info to the status line at bottom of the main frame
+     */
+    void             DisplayStatus();
 
     PARAM_CFG_ARRAY& GetProjectFileParameters( void );
 

cvpcb/init.cpp

@@ -24,7 +24,7 @@ void WinEDA_CvpcbFrame::SetNewPkg( const wxString& package )
     COMPONENT* Component;
     bool       isUndefined = false;
     int        NumCmp;
-    wxString   Line;
+    wxString   msg;
 
     if( m_components.empty() )
         return;
@@ -45,7 +45,7 @@ void WinEDA_CvpcbFrame::SetNewPkg( const wxString& package )
 
     Component->m_Module = package;
 
-    Line.Printf( CMP_FORMAT, NumCmp + 1,
+    msg.Printf( CMP_FORMAT, NumCmp + 1,
                  GetChars( Component->m_Reference ),
                  GetChars( Component->m_Value ),
                  GetChars( Component->m_Module ) );
@@ -54,7 +54,7 @@ void WinEDA_CvpcbFrame::SetNewPkg( const wxString& package )
     if( isUndefined )
         m_undefinedComponentCnt -= 1;
 
-    m_ListCmp->SetString( NumCmp, Line );
+    m_ListCmp->SetString( NumCmp, msg );
     m_ListCmp->SetSelection( NumCmp, FALSE );
 
     // We activate next component:
@@ -62,9 +62,7 @@ void WinEDA_CvpcbFrame::SetNewPkg( const wxString& package )
         NumCmp++;
     m_ListCmp->SetSelection( NumCmp, TRUE );
 
-    Line.Printf( _( "Components: %d (free: %d)" ),
-                 m_components.size(), m_undefinedComponentCnt );
-    SetStatusText( Line, 1 );
+    DisplayStatus();
 }
 
 
@@ -112,9 +110,7 @@ bool WinEDA_CvpcbFrame::ReadNetList()
     if( !m_components.empty() )
         m_ListCmp->SetSelection( 0, TRUE );
 
-    msg.Printf( _( "Components: %d (free: %d)" ), m_components.size(),
-                m_undefinedComponentCnt );
-    SetStatusText( msg, 1 );
+    DisplayStatus();
 
     /* Update the title of the main window. */
     SetTitle( wxGetApp().GetTitle() + wxT( " " ) + GetBuildVersion() +

cvpcb/listboxes.cpp

@@ -9,6 +9,7 @@
 #include "cvpcb.h"
 #include "protos.h"
 #include "cvstruct.h"
+#include "cvpcb_id.h"
 
 
 /******************************************************************************
@@ -122,7 +123,5 @@ void WinEDA_CvpcbFrame::BuildFOOTPRINTS_LISTBOX()
     }
 
     m_FootprintList->SetFootprintFullList( m_footprints );
-
-    msg.Printf( _( "Footprints: %d" ), m_FootprintList->GetCount() );
-    SetStatusText( msg, 2 );
+    DisplayStatus();
 }

cvpcb/menucfg.cpp

@@ -10,6 +10,7 @@
 
 #include "cvpcb.h"
 #include "cvstruct.h"
+#include "cvpcb_id.h"
 
 #include "bitmaps.h"
 

cvpcb/tool_cvpcb.cpp

@@ -11,6 +11,7 @@
 #include "cvpcb.h"
 #include "protos.h"
 #include "cvstruct.h"
+#include "cvpcb_id.h"
 
 
 void WinEDA_CvpcbFrame::ReCreateHToolbar()

eeschema/class_drawsheet.cpp

@@ -898,6 +898,70 @@ void SCH_SHEET::renumberLabels()
 }
 
 
+void SCH_SHEET::GetEndPoints( std::vector <DANGLING_END_ITEM>& aItemList )
+{
+    // Using BOOST_FOREACH here creates problems (bad pointer value to pinsheet).
+    // I do not know why.
+    for( unsigned ii = 0; ii < GetSheetPins().size(); ii++ )
+    {
+        SCH_SHEET_PIN &pinsheet = GetSheetPins()[ii];
+
+        wxCHECK2_MSG( pinsheet.Type() == DRAW_HIERARCHICAL_PIN_SHEET_STRUCT_TYPE, continue,
+                      wxT( "Invalid item in schematic sheet pin list.  Bad programmer!" ) );
+
+        pinsheet.GetEndPoints( aItemList );
+    }
+}
+
+
+bool SCH_SHEET::IsDanglingStateChanged( std::vector< DANGLING_END_ITEM >& aItemList )
+{
+    bool currentState = IsDangling();
+
+    BOOST_FOREACH( SCH_SHEET_PIN& pinsheet, GetSheetPins() )
+    {
+        pinsheet.IsDanglingStateChanged( aItemList );
+    }
+
+    return currentState != IsDangling();
+}
+
+
+bool SCH_SHEET::IsDangling() const
+{
+    // If any hierarchical label in the sheet is dangling, then the sheet is dangling.
+    for( size_t i = 0; i < GetSheetPins().size(); i++ )
+    {
+        if( GetSheetPins()[i].IsDangling() )
+            return true;
+    }
+
+    return false;
+}
+
+
+bool SCH_SHEET::IsSelectStateChanged( const wxRect& aRect )
+{
+    bool previousState = IsSelected();
+
+    EDA_Rect boundingBox = GetBoundingBox();
+
+    if( aRect.Intersects( boundingBox ) )
+        m_Flags |= SELECTED;
+    else
+        m_Flags &= ~SELECTED;
+
+    return previousState != IsSelected();
+}
+
+
+void SCH_SHEET::GetConnectionPoints( vector< wxPoint >& aPoints ) const
+{
+    for( size_t i = 0; i < GetSheetPins().size(); i++ )
+        aPoints.push_back( GetSheetPins()[i].m_Pos );
+}
+
+
 #if defined(DEBUG)
 
 void SCH_SHEET::Show( int nestLevel, std::ostream& os )

eeschema/class_drawsheet.h

@@ -23,7 +23,6 @@ extern SCH_SHEET* g_RootSheet;
  * the sheet, it corresponds to a hierarchical label.
  */
 
-//class SCH_SHEET_PIN : public SCH_ITEM, public EDA_TextStruct
 class SCH_SHEET_PIN : public SCH_HIERLABEL
 {
 private:
@@ -31,15 +30,15 @@ private:
                         ///< Sheet label numbering begins at 2.
                         ///< 0 is reserved for the sheet name.
                         ///< 1 is reserve for the sheet file name.
-    int m_Edge;                     /* For pin labels only: sheet edge (0 to 3) of the pin
-                                     * m_Edge define on which edge the pin is positionned:
-                                     *        0: pin on left side
-                                     *        1: pin on right side
-                                     *        2: pin on top side
-                                     *        3: pin on bottom side
-                                     *  for compatibility reasons, this does not follow same values as text
-                                     *  orientation.
-                                     */
+    int m_Edge;         /* For pin labels only: sheet edge (0 to 3) of the pin
+                         * m_Edge define on which edge the pin is positionned:
+                         *        0: pin on left side
+                         *        1: pin on right side
+                         *        2: pin on top side
+                         *        3: pin on bottom side
+                         *  for compatibility reasons, this does not follow same values as text
+                         *  orientation.
+                         */
 
 public:
     SCH_SHEET_PIN( SCH_SHEET* parent,
@@ -168,8 +167,9 @@ public:
      * @param aFindLocation - a wxPoint where to put the location of matched item. can be NULL.
      * @return True if this item matches the search criteria.
      */
-    virtual bool Matches( wxFindReplaceData& aSearchData,
-                          void* aAuxData, wxPoint * aFindLocation );
+    virtual bool Matches( wxFindReplaceData& aSearchData, void* aAuxData, wxPoint* aFindLocation );
+
+    virtual void GetEndPoints( std::vector <DANGLING_END_ITEM>& aItemList );
 };
 
 
@@ -251,6 +251,11 @@ public:
 
     SCH_SHEET_PIN_LIST& GetSheetPins() { return m_labels; }
 
+    SCH_SHEET_PIN_LIST& GetSheetPins() const
+    {
+        return const_cast< SCH_SHEET_PIN_LIST& >( m_labels );
+    }
+
     /**
      * Remove a sheet label from this sheet.
      *
@@ -412,7 +417,9 @@ public:
     virtual void Move( const wxPoint& aMoveVector )
     {
         m_Pos += aMoveVector;
-        BOOST_FOREACH( SCH_SHEET_PIN & label, m_labels ) {
+
+        BOOST_FOREACH( SCH_SHEET_PIN & label, m_labels )
+        {
             label.Move( aMoveVector );
         }
     }
@@ -437,8 +444,7 @@ public:
      *
      * @return True if this item matches the search criteria.
      */
-    virtual bool Matches( wxFindReplaceData& aSearchData,
-                          void* aAuxData, wxPoint * aFindLocation );
+    virtual bool Matches( wxFindReplaceData& aSearchData, void* aAuxData, wxPoint* aFindLocation );
 
     /**
      * Resize this sheet to aSize and adjust all of the labels accordingly.
@@ -457,6 +463,16 @@ public:
      */
     wxPoint GetFileNamePosition ();
 
+    virtual void GetEndPoints( std::vector <DANGLING_END_ITEM>& aItemList );
+
+    virtual bool IsDanglingStateChanged( std::vector< DANGLING_END_ITEM >& aItemList );
+
+    virtual bool IsDangling() const;
+
+    virtual bool IsSelectStateChanged( const wxRect& aRect );
+
+    virtual void GetConnectionPoints( vector< wxPoint >& aPoints ) const;
+
 #if defined(DEBUG)
 
     // comment inherited by Doxygen from Base_Struct

eeschema/class_hierarchical_PIN_sheet.cpp

@@ -340,6 +340,46 @@ void SCH_SHEET_PIN::Rotate( wxPoint rotationPoint )
 }
 
 
+/** Virtual Function SCH_SHEET_PIN::CreateGraphicShape
+ * calculates the graphic shape (a polygon) associated to the text
+ * @param aCorner_list = a buffer to fill with polygon corners coordinates
+ * @param aPos = Position of the shape
+ */
+void SCH_SHEET_PIN::CreateGraphicShape( std::vector <wxPoint>& aCorner_list,
+                                        const wxPoint&         aPos )
+{
+     /* This is the same icon shapes as SCH_HIERLABEL
+     * but the graphic icon is slightly different in 2 cases:
+     * for INPUT type the icon is the OUTPUT shape of SCH_HIERLABEL
+     * for OUTPUT type the icon is the INPUT shape of SCH_HIERLABEL
+     */
+    int tmp = m_Shape;
+    switch( m_Shape )
+    {
+    case NET_INPUT:
+        m_Shape = NET_OUTPUT;
+        break;
+
+    case NET_OUTPUT:
+        m_Shape = NET_INPUT;
+        break;
+
+    default:
+        break;
+    }
+    SCH_HIERLABEL::CreateGraphicShape( aCorner_list, aPos );
+    m_Shape = tmp;
+}
+
+
+void SCH_SHEET_PIN::GetEndPoints( std::vector <DANGLING_END_ITEM>& aItemList )
+{
+    DANGLING_END_ITEM item( SHEET_LABEL_END, this );
+    item.m_Pos  = m_Pos;
+    aItemList.push_back( item );
+}
+
+
 #if defined(DEBUG)
 void SCH_SHEET_PIN::Show( int nestLevel, std::ostream& os )
 {

eeschema/class_library.cpp

@@ -485,9 +485,8 @@ the current schematic." ),
         {
             versionMajor = (int) major;
             versionMinor = (int) minor;
-
-            wxLogDebug( wxT( "Component library <%s> is version %d.%d." ),
-                        GetChars( GetName() ), versionMajor, versionMinor );
+//            wxLogDebug( wxT( "Component library <%s> is version %d.%d." ),
+//                        GetChars( GetName() ), versionMajor, versionMinor );
         }
     }
 

eeschema/class_marker_sch.cpp

@@ -180,3 +180,16 @@ void SCH_MARKER::Mirror_Y( int aYaxis_position )
     m_Pos.x  = -m_Pos.x;
     m_Pos.x += aYaxis_position;
 }
+
+
+bool SCH_MARKER::IsSelectStateChanged( const wxRect& aRect )
+{
+    bool previousState = IsSelected();
+
+    if( aRect.Contains( m_Pos ) )
+        m_Flags |= SELECTED;
+    else
+        m_Flags &= ~SELECTED;
+
+    return previousState != IsSelected();
+}

eeschema/class_marker_sch.h

@@ -116,6 +116,8 @@ public:
      */
     void         DisplayInfo( WinEDA_DrawFrame* aFrame );
 
+    virtual bool IsSelectStateChanged( const wxRect& aRect );
+
 #if defined(DEBUG)
     void         Show( int nestLevel, std::ostream& os );
 

eeschema/class_sch_component.cpp

@@ -973,9 +973,9 @@ bool SCH_COMPONENT::Save( FILE* f ) const
         if( GetField( REFERENCE )->m_Text.IsEmpty() )
             strncpy( Name1, CONV_TO_UTF8( m_PrefixString ), sizeof( Name1 ) );
         else
-            strncpy( Name1, CONV_TO_UTF8( GetField( REFERENCE )->m_Text ),
-                    sizeof( Name1 ) );
+            strncpy( Name1, CONV_TO_UTF8( GetField( REFERENCE )->m_Text ), sizeof( Name1 ) );
     }
+
     for( ii = 0; ii < (int) strlen( Name1 ); ii++ )
     {
 #if defined(KICAD_GOST)
@@ -1284,3 +1284,77 @@ bool SCH_COMPONENT::Matches( wxFindReplaceData& aSearchData, void* aAuxData, wxP
 
     return false;
 }
+
+
+void SCH_COMPONENT::GetEndPoints( std::vector <DANGLING_END_ITEM>& aItemList )
+{
+    LIB_COMPONENT* Entry = CMP_LIBRARY::FindLibraryComponent( m_ChipName );
+
+    if( Entry == NULL )
+        return;
+
+    for( LIB_PIN* Pin = Entry->GetNextPin(); Pin != NULL; Pin = Entry->GetNextPin( Pin ) )
+    {
+        wxASSERT( Pin->Type() == COMPONENT_PIN_DRAW_TYPE );
+
+        if( Pin->GetUnit() && m_Multi && ( m_Multi != Pin->GetUnit() ) )
+            continue;
+
+        if( Pin->GetConvert() && m_Convert && ( m_Convert != Pin->GetConvert() ) )
+            continue;
+
+        DANGLING_END_ITEM item( PIN_END, Pin );
+        item.m_Pos = GetPinPhysicalPosition( Pin );
+        aItemList.push_back( item );
+    }
+}
+
+
+wxPoint SCH_COMPONENT::GetPinPhysicalPosition( LIB_PIN* Pin )
+{
+    wxCHECK_MSG( Pin != NULL && Pin->Type() == COMPONENT_PIN_DRAW_TYPE, wxPoint( 0, 0 ),
+                 wxT( "Cannot get physical position of pin." ) );
+
+    return m_Transform.TransformCoordinate( Pin->m_Pos ) + m_Pos;
+}
+
+
+bool SCH_COMPONENT::IsSelectStateChanged( const wxRect& aRect )
+{
+    bool previousState = IsSelected();
+
+    EDA_Rect boundingBox = GetBoundingBox();
+
+    if( aRect.Intersects( boundingBox ) )
+        m_Flags |= SELECTED;
+    else
+        m_Flags &= ~SELECTED;
+
+    return previousState != IsSelected();
+}
+
+
+void SCH_COMPONENT::GetConnectionPoints( vector< wxPoint >& aPoints ) const
+{
+    LIB_PIN* pin;
+    LIB_COMPONENT* component = CMP_LIBRARY::FindLibraryComponent( m_ChipName );
+
+    wxCHECK_RET( component != NULL,
+                 wxT( "Cannot add connection points to list.  Cannot find component <" ) +
+                 m_ChipName + wxT( "> in any of the loaded libraries." ) );
+
+    for( pin = component->GetNextPin( pin ); pin != NULL; pin = component->GetNextPin( pin ) )
+    {
+        wxCHECK_RET( pin->Type() == COMPONENT_PIN_DRAW_TYPE,
+                     wxT( "GetNextPin() did not return a pin object.  Bad programmer!" ) );
+
+        // Skip items not used for this part.
+        if( m_Multi && pin->GetUnit() && ( pin->GetUnit() != m_Multi ) )
+            continue;
+        if( m_Convert && pin->GetConvert() && ( pin->GetConvert() != m_Convert ) )
+            continue;
+
+        // Calculate the pin position relative to the component position and orientation.
+        aPoints.push_back( m_Transform.TransformCoordinate( pin->m_Pos ) + m_Pos );
+    }
+}

eeschema/class_sch_component.h

-/*****************************************************/
+/******************************************************/
 /* Definitions for the Component classes for EESchema */
-/*****************************************************/
+/******************************************************/
 
 #ifndef COMPONENT_CLASS_H
 #define COMPONENT_CLASS_H
@@ -85,8 +85,7 @@ private:
     void Init( const wxPoint& pos = wxPoint( 0, 0 ) );
 
 public:
-    SCH_COMPONENT( const wxPoint& pos = wxPoint( 0, 0 ),
-                   SCH_ITEM* aParent = NULL );
+    SCH_COMPONENT( const wxPoint& pos = wxPoint( 0, 0 ), SCH_ITEM* aParent = NULL );
 
     /**
      * Create schematic component from library component object.
@@ -122,6 +121,7 @@ public:
         return wxT( "SCH_COMPONENT" );
     }
 
+    TRANSFORM& GetTransform() const { return const_cast< TRANSFORM& >( m_Transform ); }
 
     /**
      * Function Save
@@ -312,8 +312,7 @@ public:
     int            GetUnitSelection( SCH_SHEET_PATH* aSheet );
 
     // Set the unit selection, for the given sheet path.
-    void           SetUnitSelection( SCH_SHEET_PATH* aSheet,
-                                     int             aUnitSelection );
+    void           SetUnitSelection( SCH_SHEET_PATH* aSheet, int aUnitSelection );
 
     /** Function GetPenSize
      * @return the size of the "pen" that be used to draw or plot this item
@@ -355,8 +354,15 @@ public:
      * @param aFindLocation - a wxPoint where to put the location of matched item. can be NULL.
      * @return True if this component reference or value field matches the search criteria.
      */
-    virtual bool Matches( wxFindReplaceData& aSearchData,
-                            void* aAuxData, wxPoint * aFindLocation );
+    virtual bool Matches( wxFindReplaceData& aSearchData, void* aAuxData, wxPoint* aFindLocation );
+
+    virtual void GetEndPoints( std::vector <DANGLING_END_ITEM>& aItemList );
+
+    wxPoint GetPinPhysicalPosition( LIB_PIN* Pin );
+
+    virtual bool IsSelectStateChanged( const wxRect& aRect );
+
+    virtual void GetConnectionPoints( vector< wxPoint >& aPoints ) const;
 
     #if defined(DEBUG)
 

eeschema/class_sch_screen.cpp

@@ -353,6 +353,13 @@ void SCH_SCREEN::ClearUndoORRedoList( UNDO_REDO_CONTAINER& aList, int aItemCount
 }
 
 
+void SCH_SCREEN::ClearDrawingState()
+{
+    for( SCH_ITEM* item = EEDrawList; item != NULL; item = item->Next() )
+        item->m_Flags = 0;
+}
+
+
 /******************************************************************/
 /* Class SCH_SCREENS to handle the list of screens in a hierarchy */
 /******************************************************************/

eeschema/class_schematic_items.cpp

@@ -167,12 +167,45 @@ void SCH_BUS_ENTRY::Rotate( wxPoint rotationPoint )
 }
 
 
+void SCH_BUS_ENTRY::GetEndPoints( std::vector< DANGLING_END_ITEM >& aItemList )
+{
+    DANGLING_END_ITEM item( ENTRY_END, this );
+    item.m_Pos = m_Pos;
+
+    DANGLING_END_ITEM item1( ENTRY_END, this );
+    item1.m_Pos = m_End();
+    aItemList.push_back( item );
+    aItemList.push_back( item1 );
+}
+
+
+bool SCH_BUS_ENTRY::IsSelectStateChanged( const wxRect& aRect )
+{
+    bool previousState = IsSelected();
+
+    // If either end of the bus entry is inside the selection rectangle, the entire
+    // bus entry is selected.  Bus entries have a fixed length and angle.
+    if( aRect.Contains( m_Pos ) || aRect.Contains( m_End() ) )
+        m_Flags |= SELECTED;
+    else
+        m_Flags &= ~SELECTED;
+
+    return previousState != IsSelected();
+}
+
+
+void SCH_BUS_ENTRY::GetConnectionPoints( vector< wxPoint >& aPoints ) const
+{
+    aPoints.push_back( m_Pos );
+    aPoints.push_back( m_End() );
+}
+
+
 /**********************/
 /* class SCH_JUNCTION */
 /**********************/
 
-SCH_JUNCTION::SCH_JUNCTION( const wxPoint& pos ) :
-    SCH_ITEM( NULL, DRAW_JUNCTION_STRUCT_TYPE )
+SCH_JUNCTION::SCH_JUNCTION( const wxPoint& pos ) : SCH_ITEM( NULL, DRAW_JUNCTION_STRUCT_TYPE )
 {
 #define DRAWJUNCTION_DIAMETER 32   /* Diameter of junction symbol between wires */
     m_Pos    = pos;
@@ -289,6 +322,33 @@ void SCH_JUNCTION::Rotate( wxPoint rotationPoint )
 }
 
 
+void SCH_JUNCTION::GetEndPoints( std::vector <DANGLING_END_ITEM>& aItemList )
+{
+    DANGLING_END_ITEM item( JUNCTION_END, this );
+    item.m_Pos = m_Pos;
+    aItemList.push_back( item );
+}
+
+
+bool SCH_JUNCTION::IsSelectStateChanged( const wxRect& aRect )
+{
+    bool previousState = IsSelected();
+
+    if( aRect.Contains( m_Pos ) )
+        m_Flags |= SELECTED;
+    else
+        m_Flags &= ~SELECTED;
+
+    return previousState != IsSelected();
+}
+
+
+void SCH_JUNCTION::GetConnectionPoints( vector< wxPoint >& aPoints ) const
+{
+    aPoints.push_back( m_Pos );
+}
+
+
 #if defined(DEBUG)
 void SCH_JUNCTION::Show( int nestLevel, std::ostream& os )
 {
@@ -306,8 +366,7 @@ void SCH_JUNCTION::Show( int nestLevel, std::ostream& os )
 /* class SCH_NO_CONNECT */
 /************************/
 
-SCH_NO_CONNECT::SCH_NO_CONNECT( const wxPoint& pos ) :
-    SCH_ITEM( NULL, DRAW_NOCONNECT_STRUCT_TYPE )
+SCH_NO_CONNECT::SCH_NO_CONNECT( const wxPoint& pos ) : SCH_ITEM( NULL, DRAW_NOCONNECT_STRUCT_TYPE )
 {
 #define DRAWNOCONNECT_SIZE 48       /* No symbol connection range. */
     m_Pos    = pos;
@@ -430,6 +489,25 @@ void SCH_NO_CONNECT::Rotate( wxPoint rotationPoint )
 }
 
 
+bool SCH_NO_CONNECT::IsSelectStateChanged( const wxRect& aRect )
+{
+    bool previousState = IsSelected();
+
+    if( aRect.Contains( m_Pos ) )
+        m_Flags |= SELECTED;
+    else
+        m_Flags &= ~SELECTED;
+
+    return previousState != IsSelected();
+}
+
+
+void SCH_NO_CONNECT::GetConnectionPoints( vector< wxPoint >& aPoints ) const
+{
+    aPoints.push_back( m_Pos );
+}
+
+
 /******************/
 /* Class SCH_LINE */
 /******************/
@@ -634,9 +712,7 @@ bool SCH_LINE::MergeOverlap( SCH_LINE* aLine )
     wxCHECK_MSG( aLine != NULL && aLine->Type() == DRAW_SEGMENT_STRUCT_TYPE, false,
                  wxT( "Cannot test line segment for overlap." ) );
 
-    if( this == aLine )
-        return false;
-    if( GetLayer() != aLine->GetLayer() )
+    if( this == aLine || GetLayer() != aLine->GetLayer() )
         return false;
 
     // Search for a common end, and modify coordinates to ensure RefSegm->m_End
@@ -646,7 +722,7 @@ bool SCH_LINE::MergeOverlap( SCH_LINE* aLine )
         if( m_End == aLine->m_End )
             return true;
 
-        EXCHG( m_Start, aLine->m_End );
+        EXCHG( m_Start, m_End );
     }
     else if( m_Start == aLine->m_End )
     {
@@ -658,8 +734,10 @@ bool SCH_LINE::MergeOverlap( SCH_LINE* aLine )
         EXCHG( aLine->m_Start, aLine->m_End );
     }
     else if( m_End != aLine->m_Start )
+    {
         // No common end point, segments cannot be merged.
         return false;
+    }
 
     /* Test alignment: */
     if( m_Start.y == m_End.y )       // Horizontal segment
@@ -693,12 +771,86 @@ bool SCH_LINE::MergeOverlap( SCH_LINE* aLine )
 }
 
 
-/***********************/
+void SCH_LINE::GetEndPoints( std::vector <DANGLING_END_ITEM>& aItemList )
+{
+    if( GetLayer() == LAYER_NOTES )
+        return;
+
+    if( ( GetLayer() == LAYER_BUS ) || ( GetLayer() == LAYER_WIRE ) )
+    {
+        DANGLING_END_ITEM item( (GetLayer() == LAYER_BUS) ? BUS_START_END : WIRE_START_END, this );
+        item.m_Pos = m_Start;
+        DANGLING_END_ITEM item1( (GetLayer() == LAYER_BUS) ? BUS_END_END : WIRE_END_END, this );
+        item1.m_Pos = m_End;
+
+        aItemList.push_back( item );
+        aItemList.push_back( item1 );
+    }
+}
+
+
+bool SCH_LINE::IsDanglingStateChanged( std::vector< DANGLING_END_ITEM >& aItemList )
+{
+    bool previousStartState = m_StartIsDangling;
+    bool previousEndState = m_EndIsDangling;
+
+    if( GetLayer() == LAYER_WIRE )
+    {
+        BOOST_FOREACH( DANGLING_END_ITEM item, aItemList )
+        {
+            if( item.m_Item == this )
+                continue;
+
+            if( m_Start == item.m_Pos )
+                m_StartIsDangling = false;
+
+            if( m_End == item.m_Pos )
+                m_EndIsDangling = false;
+
+            if( (m_StartIsDangling == false) && (m_EndIsDangling == false) )
+                break;
+        }
+    }
+    else if( GetLayer() == LAYER_BUS || GetLayer() == LAYER_NOTES )
+    {
+        // Lines on the notes layer and the bus layer cannot be tested for dangling ends.
+        previousStartState = previousEndState = m_StartIsDangling = m_EndIsDangling = false;
+    }
+
+    return ( previousStartState != m_StartIsDangling ) || ( previousEndState != m_EndIsDangling );
+}
+
+
+bool SCH_LINE::IsSelectStateChanged( const wxRect& aRect )
+{
+    bool previousState = IsSelected();
+
+    if( aRect.Contains( m_Start ) )
+        m_Flags |= STARTPOINT | SELECTED;
+    else
+        m_Flags &= ~( STARTPOINT | SELECTED );
+
+    if( aRect.Contains( m_End ) )
+        m_Flags |= ENDPOINT | SELECTED;
+    else
+        m_Flags &= ~( ENDPOINT | SELECTED );
+
+    return previousState != IsSelected();
+}
+
+
+void SCH_LINE::GetConnectionPoints( vector< wxPoint >& aPoints ) const
+{
+    aPoints.push_back( m_Start );
+    aPoints.push_back( m_End );
+}
+
+
+/**********************/
 /* Class SCH_POLYLINE */
-/***********************/
+/**********************/
 
-SCH_POLYLINE::SCH_POLYLINE( int layer ) :
-    SCH_ITEM( NULL, DRAW_POLYLINE_STRUCT_TYPE )
+SCH_POLYLINE::SCH_POLYLINE( int layer ) : SCH_ITEM( NULL, DRAW_POLYLINE_STRUCT_TYPE )
 {
     m_Width = 0;
 

eeschema/class_schematic_items.h

@@ -108,6 +108,16 @@ public:
      */
     bool MergeOverlap( SCH_LINE* aLine );
 
+    virtual void GetEndPoints( std::vector <DANGLING_END_ITEM>& aItemList );
+
+    virtual bool IsDanglingStateChanged( std::vector< DANGLING_END_ITEM >& aItemList );
+
+    virtual bool IsDangling() const { return m_StartIsDangling || m_EndIsDangling; }
+
+    virtual bool IsSelectStateChanged( const wxRect& aRect );
+
+    virtual void GetConnectionPoints( vector< wxPoint >& aPoints ) const;
+
 #if defined(DEBUG)
     void         Show( int nestLevel, std::ostream& os );
 
@@ -185,6 +195,10 @@ public:
     virtual void Mirror_Y( int aYaxis_position );
     virtual void Mirror_X( int aXaxis_position );
     virtual void Rotate( wxPoint rotationPoint );
+
+    virtual bool IsSelectStateChanged( const wxRect& aRect );
+
+    virtual void GetConnectionPoints( vector< wxPoint >& aPoints ) const;
 };
 
 
@@ -259,6 +273,12 @@ public:
     virtual void Mirror_Y( int aYaxis_position );
     virtual void Mirror_X( int aXaxis_position );
     virtual void Rotate( wxPoint rotationPoint );
+
+    virtual void GetEndPoints( std::vector <DANGLING_END_ITEM>& aItemList );
+
+    virtual bool IsSelectStateChanged( const wxRect& aRect );
+
+    virtual void GetConnectionPoints( vector< wxPoint >& aPoints ) const;
 };
 
 class SCH_POLYLINE : public SCH_ITEM
@@ -405,6 +425,12 @@ public:
     virtual void Mirror_X( int aXaxis_position );
     virtual void Rotate( wxPoint rotationPoint );
 
+    virtual void GetEndPoints( std::vector <DANGLING_END_ITEM>& aItemList );
+
+    virtual bool IsSelectStateChanged( const wxRect& aRect );
+
+    virtual void GetConnectionPoints( vector< wxPoint >& aPoints ) const;
+
 #if defined(DEBUG)
     void         Show( int nestLevel, std::ostream& os );
 

eeschema/class_text-label.h

@@ -167,8 +167,17 @@ public:
      * @param aFindLocation - a wxPoint where to put the location of matched item. can be NULL.
      * @return True if this schematic text item matches the search criteria.
      */
-    virtual bool Matches( wxFindReplaceData& aSearchData,
-                           void* aAuxData, wxPoint * aFindLocation );
+    virtual bool Matches( wxFindReplaceData& aSearchData, void* aAuxData, wxPoint* aFindLocation );
+
+    virtual void GetEndPoints( std::vector< DANGLING_END_ITEM >& aItemList );
+
+    virtual bool IsDanglingStateChanged( std::vector< DANGLING_END_ITEM >& aItemList );
+
+    virtual bool IsDangling() const { return m_IsDangling; }
+
+    virtual bool IsSelectStateChanged( const wxRect& aRect );
+
+    virtual void GetConnectionPoints( vector< wxPoint >& aPoints ) const;
 
 #if defined(DEBUG)
     void         Show( int nestLevel, std::ostream& os );

eeschema/dialog_edit_component_in_lib_base.cpp

 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Apr 16 2008)
+// C++ code generated with wxFormBuilder (version Sep  8 2010)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO "NOT" EDIT THIS FILE!
@@ -25,28 +25,24 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( wx
 	m_OptionsBoxSizer = new wxStaticBoxSizer( new wxStaticBox( m_PanelBasic, wxID_ANY, _("General :") ), wxVERTICAL );
 	
 	m_AsConvertButt = new wxCheckBox( m_PanelBasic, wxID_ANY, _("As Convert"), wxDefaultPosition, wxDefaultSize, 0 );
-	
 	m_AsConvertButt->SetToolTip( _("Check this option for components that have a De Morgan representation.\nThis is usual for gates.") );
 	
 	m_OptionsBoxSizer->Add( m_AsConvertButt, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
 	
 	m_ShowPinNumButt = new wxCheckBox( m_PanelBasic, wxID_ANY, _("Show Pin Num"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_ShowPinNumButt->SetValue(true);
-	
+	m_ShowPinNumButt->SetValue(true); 
 	m_ShowPinNumButt->SetToolTip( _("Show or hide pin numbers") );
 	
 	m_OptionsBoxSizer->Add( m_ShowPinNumButt, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
 	
 	m_ShowPinNameButt = new wxCheckBox( m_PanelBasic, wxID_ANY, _("Show Pin Name"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_ShowPinNameButt->SetValue(true);
-	
+	m_ShowPinNameButt->SetValue(true); 
 	m_ShowPinNameButt->SetToolTip( _("Show or hide pin names") );
 	
 	m_OptionsBoxSizer->Add( m_ShowPinNameButt, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
 	
 	m_PinsNameInsideButt = new wxCheckBox( m_PanelBasic, wxID_ANY, _("Pin Name Inside"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_PinsNameInsideButt->SetValue(true);
-	
+	m_PinsNameInsideButt->SetValue(true); 
 	m_PinsNameInsideButt->SetToolTip( _("Check this option to have pin names inside the body and pin number outside.\nIf not checked pins names and pins numbers are outside.") );
 	
 	m_OptionsBoxSizer->Add( m_PinsNameInsideButt, 0, wxALL, 5 );
@@ -93,13 +89,11 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( wx
 	bSizerBasicPanel->Add( m_staticline1, 0, wxEXPAND | wxALL, 5 );
 	
 	m_OptionPower = new wxCheckBox( m_PanelBasic, wxID_ANY, _("Power Symbol"), wxDefaultPosition, wxDefaultSize, 0 );
-	
 	m_OptionPower->SetToolTip( _("Check this option for power symbols.\nPower symbols have specific properties for Eeschema:\n- Value cannot be edited (to avoid mistakes) because this is the pin name that is important for a power symbol\n- Reference is updated automatically when a netlist is created (no need to run Annotate)") );
 	
 	bSizerBasicPanel->Add( m_OptionPower, 0, wxALL, 5 );
 	
 	m_OptionPartsLocked = new wxCheckBox( m_PanelBasic, wxID_ANY, _("Parts are locked"), wxDefaultPosition, wxDefaultSize, 0 );
-	
 	m_OptionPartsLocked->SetToolTip( _("Check this option if Eeschema cannot change parts selections inside a given package\nThis happens when parts are different in this package.\nWhen this option is not checked, Eeschema automatically choose the parts in packages to minimize packages count") );
 	
 	bSizerBasicPanel->Add( m_OptionPartsLocked, 0, wxALL, 5 );
@@ -123,7 +117,7 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( wx
 	
 	m_staticTextKeywords = new wxStaticText( m_PanelDoc, wxID_ANY, _("Keywords:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticTextKeywords->Wrap( -1 );
-	m_staticTextKeywords->SetToolTip( _("Enter key words that can be used to select this composant.\nKey words cannot have spaces and are separated by a space.") );
+	m_staticTextKeywords->SetToolTip( _("Enter key words that can be used to select this component.\nKey words cannot have spaces and are separated by a space.") );
 	
 	m_PanelDocBoxSizer->Add( m_staticTextKeywords, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
 	
@@ -266,4 +260,5 @@ DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::~DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE()
 	m_ButtonDeleteAllFootprintFilter->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::DeleteAllFootprintFilter ), NULL, this );
 	m_sdbSizer2Cancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::OnCancelClick ), NULL, this );
 	m_sdbSizer2OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE::OnOkClick ), NULL, this );
+	
 }