electron-rare/kicad-source-mirror
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Naming conventions and file order.

Browse Source
This commit is contained in:
Jeff Young
2021-01-26 23:17:30 +00:00
parent 79f94c096e
commit 0dd65d9cd1
10 changed files with 142 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
eeschema/lib_rectangle.cpp
+7 -7
View File
@@ -38,7 +38,7 @@
LIB_RECTANGLE::LIB_RECTANGLE( LIB_PART* aParent ) : LIB_ITEM( LIB_RECTANGLE_T, aParent )
{
m_Width = 0;
m_Fill = FILL_TYPE::NO_FILL;
m_fill = FILL_TYPE::NO_FILL;
m_isFillable = true;
}
@@ -129,13 +129,13 @@ void LIB_RECTANGLE::Plot( PLOTTER* aPlotter, const wxPoint& aOffset, bool aFill,
wxPoint pos = aTransform.TransformCoordinate( m_Pos ) + aOffset;
wxPoint end = aTransform.TransformCoordinate( m_End ) + aOffset;
if( aFill && m_Fill == FILL_TYPE::FILLED_WITH_BG_BODYCOLOR )
if( aFill && m_fill == FILL_TYPE::FILLED_WITH_BG_BODYCOLOR )
{
aPlotter->SetColor( aPlotter->RenderSettings()->GetLayerColor( LAYER_DEVICE_BACKGROUND ) );
aPlotter->Rect( pos, end, FILL_TYPE::FILLED_WITH_BG_BODYCOLOR, 0 );
}
bool already_filled = m_Fill == FILL_TYPE::FILLED_WITH_BG_BODYCOLOR;
bool already_filled = m_fill == FILL_TYPE::FILLED_WITH_BG_BODYCOLOR;
int pen_size = GetPenWidth();
if( !already_filled || pen_size > 0 )
@@ -143,7 +143,7 @@ void LIB_RECTANGLE::Plot( PLOTTER* aPlotter, const wxPoint& aOffset, bool aFill,
pen_size = std::max( pen_size, aPlotter->RenderSettings()->GetMinPenWidth() );
aPlotter->SetColor( aPlotter->RenderSettings()->GetLayerColor( LAYER_DEVICE ) );
aPlotter->Rect( pos, end, already_filled ? FILL_TYPE::NO_FILL : m_Fill, pen_size );
aPlotter->Rect( pos, end, already_filled ? FILL_TYPE::NO_FILL : m_fill, pen_size );
}
}
@@ -164,7 +164,7 @@ void LIB_RECTANGLE::print( const RENDER_SETTINGS* aSettings, const wxPoint& aOff
bool forceNoFill = static_cast<bool>( aData );
int penWidth = GetPenWidth();
if( forceNoFill && m_Fill != FILL_TYPE::NO_FILL && penWidth == 0 )
if( forceNoFill && m_fill != FILL_TYPE::NO_FILL && penWidth == 0 )
return;
wxDC* DC = aSettings->GetPrintDC();
@@ -172,14 +172,14 @@ void LIB_RECTANGLE::print( const RENDER_SETTINGS* aSettings, const wxPoint& aOff
wxPoint pt1 = aTransform.TransformCoordinate( m_Pos ) + aOffset;
wxPoint pt2 = aTransform.TransformCoordinate( m_End ) + aOffset;
if( forceNoFill || m_Fill == FILL_TYPE::NO_FILL )
if( forceNoFill || m_fill == FILL_TYPE::NO_FILL )
{
penWidth = std::max( penWidth, aSettings->GetDefaultPenWidth() );
GRRect( nullptr, DC, pt1.x, pt1.y, pt2.x, pt2.y, penWidth, color );
}
else
{
if( m_Fill == FILL_TYPE::FILLED_WITH_BG_BODYCOLOR )
if( m_fill == FILL_TYPE::FILLED_WITH_BG_BODYCOLOR )
color = aSettings->GetLayerColor( LAYER_DEVICE_BACKGROUND );
GRFilledRect( nullptr, DC, pt1.x, pt1.y, pt2.x, pt2.y, penWidth, color, color );