Commit 37d4ed97 authored by Vovanium's avatar Vovanium

Libedit polyline bug fixes:

* will not add zero-length segments when creating polylines;
* polyline vertex to edit is now being chosen correctly.
parent 7e1fe2c2
......@@ -440,7 +440,6 @@ void LIB_POLYLINE::BeginEdit( int aEditMode, const wxPoint aPosition )
m_initialPos = point;
m_ModifyIndex = index;
distanceMin = distancePoint;
break;
}
index++;
......@@ -466,6 +465,8 @@ bool LIB_POLYLINE::ContinueEdit( const wxPoint aPosition )
if( m_Flags == IS_NEW )
{
// do not add zero length segments
if( m_PolyPoints[m_PolyPoints.size() - 2] != m_PolyPoints.back() )
m_PolyPoints.push_back( aPosition );
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,
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;
SetEraseLastDrawItem( false );
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment