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

Fixups for a9ae86ee 

Correcting a couple mistakes and clarifying rounding
This commit is contained in:
Seth Hillbrand 2024-05-31 17:31:50 -07:00
parent 382477c622
commit e8c96a8a20
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/eda_shape.cpp
View File

@ -1532,7 +1532,7 @@ void EDA_SHAPE::calcEdit( const VECTOR2I& aPosition )
// Let 'l' be the length of the chord and 'm' the middle point of the chord // Let 'l' be the length of the chord and 'm' the middle point of the chord
double l = m_start.Distance( m_end ); double l = m_start.Distance( m_end );
VECTOR2D m = ( m_start + m_end ) / 2; VECTOR2D m = ( m_start + m_end ) / 2;
double sqRadDiff = ( radius * radius ) - 0.25; double sqRadDiff = ( radius * radius ) - ( l * l ) / 4.0;
// Calculate 'd', the vector from the chord midpoint to the center // Calculate 'd', the vector from the chord midpoint to the center
VECTOR2D d; VECTOR2D d;

6
libs/kimath/include/math/vector2d.h
View File

@ -272,7 +272,13 @@ T VECTOR2<T>::EuclideanNorm() const
{ {
// 45° are common in KiCad, so we can optimize the calculation // 45° are common in KiCad, so we can optimize the calculation
if( std::abs( x ) == std::abs( y ) ) if( std::abs( x ) == std::abs( y ) )
{
if( std::is_integral<T>::value )
return KiROUND<double, T>( std::abs( x ) * M_SQRT2 );
return static_cast<T>( std::abs( x ) * M_SQRT2 ); return static_cast<T>( std::abs( x ) * M_SQRT2 );
}
if( x == 0 ) if( x == 0 )
return static_cast<T>( std::abs( y ) ); return static_cast<T>( std::abs( y ) );
if( y == 0 ) if( y == 0 )

2
pcbnew/tools/pcb_point_editor.cpp
View File

@ -1473,7 +1473,7 @@ void PCB_POINT_EDITOR::updateItem( BOARD_COMMIT* aCommit )
case PAD_SHAPE::CIRCLE: case PAD_SHAPE::CIRCLE:
{ {
VECTOR2I end = m_editPoints->Point( 0 ).GetPosition(); VECTOR2I end = m_editPoints->Point( 0 ).GetPosition();
int diameter = ( end - pad->GetPosition() ).SquaredEuclideanNorm(); int diameter = 2 * ( end - pad->GetPosition() ).EuclideanNorm();
pad->SetSize( VECTOR2I( diameter, diameter ) ); pad->SetSize( VECTOR2I( diameter, diameter ) );
break; break;