Length Tuner: Allow single meander when it fits on its own

This commit is contained in:
Roberto Fernandez Bautista 2021-09-28 18:30:27 +01:00
parent 71156368c9
commit 2e120528c8
1 changed files with 24 additions and 17 deletions

View File

@ -71,6 +71,25 @@ void MEANDERED_LINE::MeanderSegment( const SEG& aBase, bool aSide, int aBaseInde
bool fail = false; bool fail = false;
double remaining = base_len - ( m_last - aBase.A ).EuclideanNorm(); double remaining = base_len - ( m_last - aBase.A ).EuclideanNorm();
auto addSingleIfFits = [&]()
{
fail = true;
for( int i = 0; i < 2; i++ )
{
bool checkSide = ( i == 0 ) ? side : !side;
if( m.Fit( MT_SINGLE, aBase, m_last, checkSide ) )
{
AddMeander( new MEANDER_SHAPE( m ) );
fail = false;
started = false;
side = !checkSide;
break;
}
}
};
if( remaining < Settings( ).m_step ) if( remaining < Settings( ).m_step )
break; break;
@ -93,23 +112,7 @@ void MEANDERED_LINE::MeanderSegment( const SEG& aBase, bool aSide, int aBaseInde
} }
if( !turning ) if( !turning )
{ addSingleIfFits();
fail = true;
for( int i = 0; i < 2; i++ )
{
bool checkSide = ( i == 0 ) ? side : !side;
if( m.Fit( MT_SINGLE, aBase, m_last, checkSide ) )
{
AddMeander( new MEANDER_SHAPE( m ) );
fail = false;
started = false;
side = !checkSide;
break;
}
}
}
} }
else else
{ {
@ -142,6 +145,10 @@ void MEANDERED_LINE::MeanderSegment( const SEG& aBase, bool aSide, int aBaseInde
break; break;
} }
else if( !turning && remaining > thr * 2.0 )
{
addSingleIfFits();
}
else else
{ {
fail = true; fail = true;