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

Better fix for OPENGL_GAL::DrawSegment() than initial commit 294dab. 

segments having a length <= 1 internal unit are not drawn  in opengl gal.
So these segments are drawn as circle.
This commit is contained in:
jean-pierre charras 2020-07-31 15:41:21 +02:00
parent 4cf5662ea1
commit 2d9b0b255b
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
common/gal/opengl/opengl_gal.cpp
View File

@ -639,8 +639,12 @@ void OPENGL_GAL::DrawLine( const VECTOR2D& aStartPoint, const VECTOR2D& aEndPoin
void OPENGL_GAL::DrawSegment( const VECTOR2D& aStartPoint, const VECTOR2D& aEndPoint, void OPENGL_GAL::DrawSegment( const VECTOR2D& aStartPoint, const VECTOR2D& aEndPoint,
double aWidth ) double aWidth )
{ {
// segments less than the radius are just a circle. VECTOR2D startEndVector = aEndPoint - aStartPoint;
if( ( aStartPoint - aEndPoint ).EuclideanNorm() < aWidth / 2.0 ) double lineLength = startEndVector.EuclideanNorm();
// segments having a length <= 1 are just a circle.
// Moreover trying to draw them as a segment does not work fine.
if( lineLength <= 1 )
{ {
DrawCircle( aStartPoint, aWidth/2 ); DrawCircle( aStartPoint, aWidth/2 );
return; return;
@ -655,10 +659,8 @@ void OPENGL_GAL::DrawSegment( const VECTOR2D& aStartPoint, const VECTOR2D& aEndP
} }
else else
{ {
auto startEndVector = aEndPoint - aStartPoint;
auto lineAngle = startEndVector.Angle(); auto lineAngle = startEndVector.Angle();
// Outlined tracks // Outlined tracks
double lineLength = startEndVector.EuclideanNorm();
SetLineWidth( 1.0 ); SetLineWidth( 1.0 );
currentManager->Color( strokeColor.r, strokeColor.g, strokeColor.b, strokeColor.a ); currentManager->Color( strokeColor.r, strokeColor.g, strokeColor.b, strokeColor.a );