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

Finish grid-snapping impl.

This commit is contained in:
Jeff Young 2021-03-16 19:45:20 +00:00
parent 4e63aefaab
commit 30fdba4cbb
1 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
eeschema/tools/ee_point_editor.cpp
View File

@ -390,9 +390,13 @@ static void pinEditedCorner( int aEditedPointIndex, int minWidth, int minHeight,
VECTOR2I& botLeft, VECTOR2I& botRight, VECTOR2I& botLeft, VECTOR2I& botRight,
int aGridSize = 0 ) int aGridSize = 0 )
{ {
// A macro to keep a coordinate on the grid: auto alignToGrid =
#define MOVE_TO_GRID(z) { z.x = ( (z.x +1 ) / aGridSize ) * aGridSize;\ [&]( const VECTOR2I& aPoint ) -> VECTOR2I
z.y = ( (z.y +1 ) / aGridSize ) * aGridSize; } {
return VECTOR2I( KiROUND( aPoint.x / aGridSize ) * aGridSize,
KiROUND( aPoint.y / aGridSize ) * aGridSize );
};
switch( aEditedPointIndex ) switch( aEditedPointIndex )
{ {
case RECT_TOPLEFT: case RECT_TOPLEFT:
@ -401,10 +405,7 @@ static void pinEditedCorner( int aEditedPointIndex, int minWidth, int minHeight,
topLeft.y = std::min( topLeft.y, botRight.y - minHeight ); topLeft.y = std::min( topLeft.y, botRight.y - minHeight );
if( aGridSize > 1 ) // Keep point on specified grid size if( aGridSize > 1 ) // Keep point on specified grid size
{ topLeft = alignToGrid( topLeft );
topLeft.x = ( topLeft.x / aGridSize ) * aGridSize;
topLeft.y = ( topLeft.y / aGridSize ) * aGridSize;
}
// push edited point edges to adjacent corners // push edited point edges to adjacent corners
topRight.y = topLeft.y; topRight.y = topLeft.y;
@ -418,10 +419,7 @@ static void pinEditedCorner( int aEditedPointIndex, int minWidth, int minHeight,
topRight.y = std::min( topRight.y, botLeft.y - minHeight ); topRight.y = std::min( topRight.y, botLeft.y - minHeight );
if( aGridSize > 1 ) // Keep point on specified grid size if( aGridSize > 1 ) // Keep point on specified grid size
{ topRight = alignToGrid( topRight );
topRight.x = ( ( topRight.x+1 ) / aGridSize ) * aGridSize;
topRight.y = ( topRight.y / aGridSize ) * aGridSize;
}
// push edited point edges to adjacent corners // push edited point edges to adjacent corners
topLeft.y = topRight.y; topLeft.y = topRight.y;
@ -435,10 +433,7 @@ static void pinEditedCorner( int aEditedPointIndex, int minWidth, int minHeight,
botLeft.y = std::max( botLeft.y, topRight.y + minHeight ); botLeft.y = std::max( botLeft.y, topRight.y + minHeight );
if( aGridSize > 1 ) // Keep point on specified grid size if( aGridSize > 1 ) // Keep point on specified grid size
{ botLeft = alignToGrid( botLeft );
botLeft.x = ( botLeft.x / aGridSize ) * aGridSize;
botLeft.y = ( ( botLeft.y+1 ) / aGridSize ) * aGridSize;
}
// push edited point edges to adjacent corners // push edited point edges to adjacent corners
botRight.y = botLeft.y; botRight.y = botLeft.y;
@ -452,10 +447,7 @@ static void pinEditedCorner( int aEditedPointIndex, int minWidth, int minHeight,
botRight.y = std::max( botRight.y, topLeft.y + minHeight ); botRight.y = std::max( botRight.y, topLeft.y + minHeight );
if( aGridSize > 1 ) // Keep point on specified grid size if( aGridSize > 1 ) // Keep point on specified grid size
{ botRight = alignToGrid( botRight );
botRight.x = ( ( botRight.x+1 ) / aGridSize ) * aGridSize;
botRight.y = ( ( botRight.y+1 ) / aGridSize ) * aGridSize;
}
// push edited point edges to adjacent corners // push edited point edges to adjacent corners
botLeft.y = botRight.y; botLeft.y = botRight.y;