Eeschema: bug fix: incorrect behavior when changing(for a multiple parts per...

Eeschema: bug fix: incorrect behavior when changing(for a multiple parts per package component) the selected part (component not deselected)
Fix a minor compil warning in lib_polyline.cpp

CMakeLists.txt

@@ -56,8 +56,8 @@ else (KICAD_STABLE_VERSION )
         message( "Build testing (unstable) version of Kicad" )
     else (KICAD_TESTING_VERSION )
         message( "Please set to ON one option of KICAD_TESTING_VERSION or KICAD_STABLE_VERSION" )
-        message( "When calling cmake add option -DKICAD_STABLE_VERSION" )
-        message( "or add option -DKICAD_TESTING_VERSION " )
+        message( "When calling cmake add option -DKICAD_STABLE_VERSION=ON" )
+        message( "or add option -DKICAD_TESTING_VERSION=ON" )
         message( FATAL_ERROR "one option of KICAD_TESTING_VERSION or KICAD_STABLE_VERSION must be defined" )
     endif(KICAD_TESTING_VERSION )
 endif(KICAD_STABLE_VERSION )

eeschema/getpart.cpp

@@ -377,7 +377,8 @@ void SCH_EDIT_FRAME::OnSelectUnit( wxCommandEvent& aEvent )
     /* Update the unit number. */
     component->SetUnitSelection( GetSheet(), unit );
     component->SetUnit( unit );
-    component->SetFlags( flags );  // Restore m_Flag modified by SetUnit();
+    component->ClearFlags();
+    component->SetFlags( flags );   // Restore m_Flag modified by SetUnit()
 
     /* Redraw the component in the new position. */
     if( flags )

eeschema/lib_polyline.cpp

@@ -134,7 +134,7 @@ int LIB_POLYLINE::DoCompare( const LIB_DRAW_ITEM& aOther ) const
 {
     wxASSERT( aOther.Type() == LIB_POLYLINE_T );
 
-    const LIB_POLYLINE* tmp = ( LIB_POLYLINE* ) &aOther;
+    const LIB_POLYLINE* tmp = (LIB_POLYLINE*) &aOther;
 
     if( m_PolyPoints.size() != tmp->m_PolyPoints.size() )
         return m_PolyPoints.size() - tmp->m_PolyPoints.size();
@@ -204,10 +204,9 @@ void LIB_POLYLINE::DoPlot( PLOTTER* aPlotter, const wxPoint& aOffset, bool aFill
     for( i = 0; i < m_PolyPoints.size(); i++ )
     {
         wxPoint pos = m_PolyPoints[i];
-        pos =  aTransform.TransformCoordinate(pos ) + aOffset;
+        pos = aTransform.TransformCoordinate( pos ) + aOffset;
         Poly[i * 2]     = pos.x;
         Poly[i * 2 + 1] = pos.y;
-
     }
 
     if( aFill && m_Fill == FILLED_WITH_BG_BODYCOLOR )
@@ -292,15 +291,15 @@ void LIB_POLYLINE::drawGraphic( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint
 
     if( fill == FILLED_WITH_BG_BODYCOLOR )
         GRPoly( &aPanel->m_ClipBox, aDC, m_PolyPoints.size(),
-                Buf_Poly_Drawings, 1, GetPenSize( ),
+               Buf_Poly_Drawings, 1, GetPenSize(),
                (m_Flags & IS_MOVED) ? color : ReturnLayerColor( LAYER_DEVICE_BACKGROUND ),
                ReturnLayerColor( LAYER_DEVICE_BACKGROUND ) );
     else if( fill == FILLED_SHAPE  )
         GRPoly( &aPanel->m_ClipBox, aDC, m_PolyPoints.size(),
-                Buf_Poly_Drawings, 1, GetPenSize( ), color, color );
+                Buf_Poly_Drawings, 1, GetPenSize(), color, color );
     else
         GRPoly( &aPanel->m_ClipBox, aDC, m_PolyPoints.size(),
-                Buf_Poly_Drawings, 0, GetPenSize( ), color, color );
+                Buf_Poly_Drawings, 0, GetPenSize(), color, color );
 
     /* Set to one (1) to draw bounding box around polyline to validate
      * bounding box calculation. */
@@ -394,7 +393,7 @@ void LIB_POLYLINE::DisplayInfo( EDA_DRAW_FRAME* aFrame )
 
     msg = ReturnStringFromValue( g_UserUnit, m_Width, EESCHEMA_INTERNAL_UNIT, true );
 
-    aFrame->AppendMsgPanel(_( "Line width" ), msg, BLUE );
+    aFrame->AppendMsgPanel( _( "Line width" ), msg, BLUE );
 
     msg.Printf( wxT( "(%d, %d, %d, %d)" ), bBox.GetOrigin().x,
                 bBox.GetOrigin().y, bBox.GetEnd().x, bBox.GetEnd().y );
@@ -431,8 +430,7 @@ void LIB_POLYLINE::BeginEdit( int aEditMode, const wxPoint aPosition )
         wxPoint prevPoint = startPoint;
 
         // Find the right index of the point to be dragged
-        BOOST_FOREACH( wxPoint point, m_PolyPoints )
-        {
+        BOOST_FOREACH( wxPoint point, m_PolyPoints ) {
             int distancePoint = (aPosition - point).x * (aPosition - point).x +
                                 (aPosition - point).y * (aPosition - point).y;
 
@@ -443,6 +441,7 @@ void LIB_POLYLINE::BeginEdit( int aEditMode, const wxPoint aPosition )
                 m_ModifyIndex = index;
                 distanceMin   = distancePoint;
             }
+
             // check middle of an edge
             wxPoint offset = ( aPosition + aPosition - point - prevPoint );
             distancePoint = ( offset.x * offset.x + offset.y * offset.y ) / 4 + 1;
@@ -492,17 +491,19 @@ void LIB_POLYLINE::EndEdit( const wxPoint& aPosition, bool aAbort )
 {
     wxCHECK_RET( ( m_Flags & ( IS_NEW | IS_MOVED | IS_RESIZED ) ) != 0,
                 wxT( "Bad call to EndEdit().  LIB_POLYLINE is not being edited." ) );
+
     // do not include last point twice
     if( m_Flags == IS_NEW && 2 < m_PolyPoints.size() )
     {
         if( m_PolyPoints[ m_PolyPoints.size() - 2 ] == m_PolyPoints.back() )
             m_PolyPoints.pop_back();
     }
-    if( m_Flags == IS_RESIZED ) {
-        if( m_PolyPoints.size() > 2 // do not delete last two points... keep it alive
-            && ( m_ModifyIndex > 0
-                 && m_PolyPoints[ m_ModifyIndex ] == m_PolyPoints[ m_ModifyIndex - 1 ]
-                 || m_ModifyIndex < (int)m_PolyPoints.size() - 1
+    if( (m_Flags == IS_RESIZED) && (m_PolyPoints.size() > 2) ) // do not delete last two points... keep it alive
+    {
+        if( ( m_ModifyIndex > 0 && m_PolyPoints[ m_ModifyIndex ] ==
+              m_PolyPoints[ m_ModifyIndex - 1 ] )
+           ||
+           ( m_ModifyIndex < (int) m_PolyPoints.size() - 1
              && m_PolyPoints[ m_ModifyIndex ] == m_PolyPoints[ m_ModifyIndex + 1 ] ) )
         {
             m_PolyPoints.erase( m_PolyPoints.begin() + m_ModifyIndex ); // delete a point on this