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

Grid in GAL takes into account grid offset.

This commit is contained in:
Maciej Suminski 2014-06-04 17:56:44 +02:00
parent 0d734e8841
commit 35e343597b
2 changed files with 30 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
common/gal/graphics_abstraction_layer.cpp
View File

@ -130,8 +130,11 @@ void GAL::DrawGrid()
// Draw the grid // Draw the grid
// For the drawing the start points, end points and increments have // For the drawing the start points, end points and increments have
// to be calculated in world coordinates // to be calculated in world coordinates
VECTOR2D worldStartPoint = screenWorldMatrix * VECTOR2D( 0.0, 0.0 ); gridOffset = VECTOR2D( (long) gridOrigin.x % (long) gridSize.x,
VECTOR2D worldEndPoint = screenWorldMatrix * VECTOR2D( screenSize ); (long) gridOrigin.y % (long) gridSize.y );
VECTOR2D worldStartPoint = screenWorldMatrix * VECTOR2D( 0.0, 0.0 );
VECTOR2D worldEndPoint = screenWorldMatrix * VECTOR2D( screenSize );
int gridScreenSizeDense = round( gridSize.x * worldScale ); int gridScreenSizeDense = round( gridSize.x * worldScale );
int gridScreenSizeCoarse = round( gridSize.x * static_cast<double>( gridTick ) * worldScale ); int gridScreenSizeCoarse = round( gridSize.x * static_cast<double>( gridTick ) * worldScale );
@ -144,20 +147,19 @@ void GAL::DrawGrid()
if( std::max( gridScreenSizeDense, gridScreenSizeCoarse ) > gridDrawThreshold ) if( std::max( gridScreenSizeDense, gridScreenSizeCoarse ) > gridDrawThreshold )
{ {
// Compute grid variables // Compute grid variables
int gridStartX = round( worldStartPoint.x / gridSize.x ); int gridStartX = round( worldStartPoint.x / gridSize.x );
int gridEndX = round( worldEndPoint.x / gridSize.x ); int gridEndX = round( worldEndPoint.x / gridSize.x );
int gridStartY = round( worldStartPoint.y / gridSize.y ); int gridStartY = round( worldStartPoint.y / gridSize.y );
int gridEndY = round( worldEndPoint.y / gridSize.y ); int gridEndY = round( worldEndPoint.y / gridSize.y );
// Swap the coordinates, if they have not the right order assert( gridEndX >= gridStartX );
SWAP( gridEndX, <, gridStartX ); assert( gridEndY >= gridStartY );
SWAP( gridEndY, <, gridStartY );
// Correct the index, else some lines are not correctly painted // Correct the index, else some lines are not correctly painted
gridStartX -= 1; gridStartX -= ( gridOrigin.x / gridSize.x ) + 1;
gridStartY -= 1; gridStartY -= ( gridOrigin.y / gridSize.y ) + 1;
gridEndX += 1; gridEndX += ( gridOrigin.x / gridSize.x ) + 1;
gridEndY += 1; gridEndY += ( gridOrigin.y / gridSize.y ) + 1;
// Draw the grid behind all other layers // Draw the grid behind all other layers
SetLayerDepth( depthRange.y * 0.75 ); SetLayerDepth( depthRange.y * 0.75 );
@ -169,6 +171,8 @@ void GAL::DrawGrid()
SetStrokeColor( gridColor ); SetStrokeColor( gridColor );
// Now draw the grid, every coarse grid line gets the double width // Now draw the grid, every coarse grid line gets the double width
// Vertical lines
for( int j = gridStartY; j < gridEndY; j += 1 ) for( int j = gridStartY; j < gridEndY; j += 1 )
{ {
if( j % gridTick == 0 && gridScreenSizeDense > gridDrawThreshold ) if( j % gridTick == 0 && gridScreenSizeDense > gridDrawThreshold )
@ -179,11 +183,12 @@ void GAL::DrawGrid()
if( ( j % gridTick == 0 && gridScreenSizeCoarse > gridDrawThreshold ) if( ( j % gridTick == 0 && gridScreenSizeCoarse > gridDrawThreshold )
|| gridScreenSizeDense > gridDrawThreshold ) || gridScreenSizeDense > gridDrawThreshold )
{ {
drawGridLine( VECTOR2D( gridStartX * gridSize.x, j * gridSize.y ), drawGridLine( VECTOR2D( gridStartX * gridSize.x, j * gridSize.y + gridOrigin.y ),
VECTOR2D( gridEndX * gridSize.x, j * gridSize.y ) ); VECTOR2D( gridEndX * gridSize.x, j * gridSize.y + gridOrigin.y ) );
} }
} }
// Horizontal lines
for( int i = gridStartX; i < gridEndX; i += 1 ) for( int i = gridStartX; i < gridEndX; i += 1 )
{ {
if( i % gridTick == 0 && gridScreenSizeDense > gridDrawThreshold ) if( i % gridTick == 0 && gridScreenSizeDense > gridDrawThreshold )
@ -194,8 +199,8 @@ void GAL::DrawGrid()
if( ( i % gridTick == 0 && gridScreenSizeCoarse > gridDrawThreshold ) if( ( i % gridTick == 0 && gridScreenSizeCoarse > gridDrawThreshold )
|| gridScreenSizeDense > gridDrawThreshold ) || gridScreenSizeDense > gridDrawThreshold )
{ {
drawGridLine( VECTOR2D( i * gridSize.x, gridStartY * gridSize.y ), drawGridLine( VECTOR2D( i * gridSize.x + gridOrigin.x, gridStartY * gridSize.y ),
VECTOR2D( i * gridSize.x, gridEndY * gridSize.y ) ); VECTOR2D( i * gridSize.x + gridOrigin.x, gridEndY * gridSize.y ) );
} }
} }
} }
@ -223,10 +228,10 @@ void GAL::DrawGrid()
if( tickX || tickY || gridScreenSizeDense > gridDrawThreshold ) if( tickX || tickY || gridScreenSizeDense > gridDrawThreshold )
{ {
double radius = ( tickX && tickY ) ? doubleMarker : marker; double radius = ( tickX && tickY ) ? doubleMarker : marker;
DrawRectangle( VECTOR2D( i * gridSize.x - radius, DrawRectangle( VECTOR2D( i * gridSize.x - radius + gridOrigin.x,
j * gridSize.y - radius ), j * gridSize.y - radius + gridOrigin.y ),
VECTOR2D( i * gridSize.x + radius, VECTOR2D( i * gridSize.x + radius + gridOrigin.x,
j * gridSize.y + radius ) ); j * gridSize.y + radius + gridOrigin.y ) );
} }
} }
} }
@ -237,10 +242,6 @@ void GAL::DrawGrid()
VECTOR2D GAL::GetGridPoint( const VECTOR2D& aPoint ) const VECTOR2D GAL::GetGridPoint( const VECTOR2D& aPoint ) const
{ {
VECTOR2D gridPoint; return VECTOR2D( round( ( aPoint.x - gridOffset.x ) / gridSize.x ) * gridSize.x + gridOffset.x,
round( ( aPoint.y - gridOffset.y ) / gridSize.y ) * gridSize.y + gridOffset.y );
gridPoint.x = round( aPoint.x / gridSize.x ) * gridSize.x;
gridPoint.y = round( aPoint.y / gridSize.y ) * gridSize.y;
return gridPoint;
} }

2
include/gal/graphics_abstraction_layer.h
View File

@ -853,6 +853,7 @@ protected:
GRID_STYLE gridStyle; ///< Grid display style GRID_STYLE gridStyle; ///< Grid display style
VECTOR2D gridSize; ///< The grid size VECTOR2D gridSize; ///< The grid size
VECTOR2D gridOrigin; ///< The grid origin VECTOR2D gridOrigin; ///< The grid origin
VECTOR2D gridOffset; ///< The grid offset to compensate cursor position
COLOR4D gridColor; ///< Color of the grid COLOR4D gridColor; ///< Color of the grid
int gridTick; ///< Every tick line gets the double width int gridTick; ///< Every tick line gets the double width
double gridLineWidth; ///< Line width of the grid double gridLineWidth; ///< Line width of the grid
@ -860,6 +861,7 @@ protected:
///< below which the grid is not drawn ///< below which the grid is not drawn
int gridOriginMarkerSize; ///< Grid origin indicator size (pixels) int gridOriginMarkerSize; ///< Grid origin indicator size (pixels)
// Cursor settings
bool isCursorEnabled; ///< Is the cursor enabled? bool isCursorEnabled; ///< Is the cursor enabled?
COLOR4D cursorColor; ///< Cursor color COLOR4D cursorColor; ///< Cursor color
unsigned int cursorSize; ///< Size of the cursor in pixels unsigned int cursorSize; ///< Size of the cursor in pixels