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

Fix arc edit points ordering in schematic. 

Fixes https://gitlab.com/kicad/code/kicad/-/issues/18254
This commit is contained in:
Alex Shvartzkop 2024-06-22 06:16:56 +03:00
parent 0ed72fb47a
commit f6994702aa
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
eeschema/tools/ee_point_editor.cpp
View File

@ -115,9 +115,9 @@ public:
switch( shape->GetShape() ) switch( shape->GetShape() )
{ {
case SHAPE_T::ARC: case SHAPE_T::ARC:
points->AddPoint( shape->GetPosition() );
points->AddPoint( shape->GetStart() ); points->AddPoint( shape->GetStart() );
points->AddPoint( shape->GetEnd() ); points->AddPoint( shape->GetEnd() );
points->AddPoint( shape->GetPosition() );
break; break;
case SHAPE_T::CIRCLE: case SHAPE_T::CIRCLE:
@ -649,12 +649,7 @@ void EE_POINT_EDITOR::updateParentItem( bool aSnapToGrid ) const
switch( shape->GetShape() ) switch( shape->GetShape() )
{ {
case SHAPE_T::ARC: case SHAPE_T::ARC:
if( getEditedPointIndex() == ARC_CENTER ) if( getEditedPointIndex() == ARC_START )
{
shape->SetEditState( 4 );
shape->CalcEdit( m_editPoints->Point( ARC_CENTER ).GetPosition() );
}
else if( getEditedPointIndex() == ARC_START )
{ {
shape->SetEditState( 2 ); shape->SetEditState( 2 );
shape->CalcEdit( m_editPoints->Point( ARC_START ).GetPosition() ); shape->CalcEdit( m_editPoints->Point( ARC_START ).GetPosition() );
@ -664,6 +659,11 @@ void EE_POINT_EDITOR::updateParentItem( bool aSnapToGrid ) const
shape->SetEditState( 3 ); shape->SetEditState( 3 );
shape->CalcEdit( m_editPoints->Point( ARC_END ).GetPosition() ); shape->CalcEdit( m_editPoints->Point( ARC_END ).GetPosition() );
} }
else if( getEditedPointIndex() == ARC_CENTER )
{
shape->SetEditState( 4 );
shape->CalcEdit( m_editPoints->Point( ARC_CENTER ).GetPosition() );
}
break; break;
case SHAPE_T::CIRCLE: case SHAPE_T::CIRCLE:
@ -994,9 +994,9 @@ void EE_POINT_EDITOR::updatePoints()
switch( shape->GetShape() ) switch( shape->GetShape() )
{ {
case SHAPE_T::ARC: case SHAPE_T::ARC:
m_editPoints->Point( ARC_CENTER ).SetPosition( shape->GetPosition() );
m_editPoints->Point( ARC_START ).SetPosition( shape->GetStart() ); m_editPoints->Point( ARC_START ).SetPosition( shape->GetStart() );
m_editPoints->Point( ARC_END ).SetPosition( shape->GetEnd() ); m_editPoints->Point( ARC_END ).SetPosition( shape->GetEnd() );
m_editPoints->Point( ARC_CENTER ).SetPosition( shape->GetPosition() );
break; break;
case SHAPE_T::CIRCLE: case SHAPE_T::CIRCLE: