haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Libedit polyline bug fixes: 

* will not add zero-length segments when creating polylines;
* polyline vertex to edit is now being chosen correctly.
This commit is contained in:
Vovanium 2011-04-01 05:19:37 +04:00
parent 7e1fe2c242
commit 37d4ed97cf
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
eeschema/lib_polyline.cpp
View File

@ -440,7 +440,6 @@ void LIB_POLYLINE::BeginEdit( int aEditMode, const wxPoint aPosition )
m_initialPos = point; m_initialPos = point;
m_ModifyIndex = index; m_ModifyIndex = index;
distanceMin = distancePoint; distanceMin = distancePoint;
break;
} }
index++; index++;
@ -466,7 +465,9 @@ bool LIB_POLYLINE::ContinueEdit( const wxPoint aPosition )
if( m_Flags == IS_NEW ) if( m_Flags == IS_NEW )
{ {
m_PolyPoints.push_back( aPosition ); // do not add zero length segments
if( m_PolyPoints[m_PolyPoints.size() - 2] != m_PolyPoints.back() )
m_PolyPoints.push_back( aPosition );
return true; return true;
} }
@ -478,7 +479,12 @@ void LIB_POLYLINE::EndEdit( const wxPoint& aPosition, bool aAbort )
{ {
wxCHECK_RET( ( m_Flags & ( IS_NEW | IS_MOVED | IS_RESIZED ) ) != 0, wxCHECK_RET( ( m_Flags & ( IS_NEW | IS_MOVED | IS_RESIZED ) ) != 0,
wxT( "Bad call to EndEdit(). LIB_POLYLINE is not being edited." ) ); 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();
}
m_Flags = 0; m_Flags = 0;
SetEraseLastDrawItem( false ); SetEraseLastDrawItem( false );
} }