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

Symbol editor: fix an issue when editing LIB_RECTANGLE graphic items. 

The point editor expects rectangles with a height and width > 0.
Previously, this constraint did not exist,
so some LIB_RECTANGLE graphic items can create issues when trying to move a corner.
Now, the LIB_RECTANGLE graphic item is normalized before trying to move a corner.
This commit is contained in:
jean-pierre charras 2019-07-26 10:40:40 +02:00
parent 460b03372d
commit 6b031d9b9e
1 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
eeschema/tools/ee_point_editor.cpp
View File

@ -106,13 +106,20 @@ public:
case LIB_RECTANGLE_T: case LIB_RECTANGLE_T:
{ {
LIB_RECTANGLE* rect = (LIB_RECTANGLE*) aItem; LIB_RECTANGLE* rect = (LIB_RECTANGLE*) aItem;
wxPoint topLeft = rect->GetPosition(); // point editor works only with rectangles having width and height > 0
wxPoint botRight = rect->GetEnd(); // Some symbols can have rectangles with width or height < 0
// So normalize the size:
BOX2I dummy;
dummy.SetOrigin( mapCoords( rect->GetPosition() ) );
dummy.SetEnd( mapCoords( rect->GetEnd() ) );
dummy.Normalize();
VECTOR2I topLeft = dummy.GetPosition();
VECTOR2I botRight = dummy.GetEnd();
points->AddPoint( mapCoords( topLeft ) ); points->AddPoint( topLeft );
points->AddPoint( mapCoords( botRight.x, topLeft.y ) ); points->AddPoint( VECTOR2I( botRight.x, topLeft.y ) );
points->AddPoint( mapCoords( topLeft.x, botRight.y ) ); points->AddPoint( VECTOR2I( topLeft.x, botRight.y ) );
points->AddPoint( mapCoords( botRight ) ); points->AddPoint( botRight );
break; break;
} }
case SCH_SHEET_T: case SCH_SHEET_T:
@ -471,7 +478,6 @@ void EE_POINT_EDITOR::updateItem() const
case LIB_RECTANGLE_T: case LIB_RECTANGLE_T:
{ {
LIB_RECTANGLE* rect = (LIB_RECTANGLE*) item;
VECTOR2I topLeft = m_editPoints->Point( RECT_TOPLEFT ).GetPosition(); VECTOR2I topLeft = m_editPoints->Point( RECT_TOPLEFT ).GetPosition();
VECTOR2I topRight = m_editPoints->Point( RECT_TOPRIGHT ).GetPosition(); VECTOR2I topRight = m_editPoints->Point( RECT_TOPRIGHT ).GetPosition();
VECTOR2I botLeft = m_editPoints->Point( RECT_BOTLEFT ).GetPosition(); VECTOR2I botLeft = m_editPoints->Point( RECT_BOTLEFT ).GetPosition();
@ -480,6 +486,7 @@ void EE_POINT_EDITOR::updateItem() const
pinEditedCorner( getEditedPointIndex(), Mils2iu( 1 ), Mils2iu( 1 ), pinEditedCorner( getEditedPointIndex(), Mils2iu( 1 ), Mils2iu( 1 ),
topLeft, topRight, botLeft, botRight ); topLeft, topRight, botLeft, botRight );
LIB_RECTANGLE* rect = (LIB_RECTANGLE*) item;
rect->SetPosition( mapCoords( topLeft ) ); rect->SetPosition( mapCoords( topLeft ) );
rect->SetEnd( mapCoords( botRight ) ); rect->SetEnd( mapCoords( botRight ) );
break; break;
@ -640,13 +647,20 @@ void EE_POINT_EDITOR::updatePoints()
case LIB_RECTANGLE_T: case LIB_RECTANGLE_T:
{ {
LIB_RECTANGLE* rect = (LIB_RECTANGLE*) item; LIB_RECTANGLE* rect = (LIB_RECTANGLE*) item;
wxPoint topLeft = rect->GetPosition(); // point editor works only with rectangles having width and height > 0
wxPoint botRight = rect->GetEnd(); // Some symbols can have rectangles with width or height < 0
// So normalize the size:
BOX2I dummy;
dummy.SetOrigin( mapCoords( rect->GetPosition() ) );
dummy.SetEnd( mapCoords( rect->GetEnd() ) );
dummy.Normalize();
VECTOR2I topLeft = dummy.GetPosition();
VECTOR2I botRight = dummy.GetEnd();
m_editPoints->Point( RECT_TOPLEFT ).SetPosition( mapCoords( topLeft ) ); m_editPoints->Point( RECT_TOPLEFT ).SetPosition( topLeft );
m_editPoints->Point( RECT_TOPRIGHT ).SetPosition( mapCoords( botRight.x, topLeft.y ) ); m_editPoints->Point( RECT_TOPRIGHT ).SetPosition( VECTOR2I( botRight.x, topLeft.y ) );
m_editPoints->Point( RECT_BOTLEFT ).SetPosition( mapCoords( topLeft.x, botRight.y ) ); m_editPoints->Point( RECT_BOTLEFT ).SetPosition( VECTOR2I( topLeft.x, botRight.y ) );
m_editPoints->Point( RECT_BOTRIGHT ).SetPosition( mapCoords( botRight ) ); m_editPoints->Point( RECT_BOTRIGHT ).SetPosition( botRight );
break; break;
} }