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

Eeschema: do not draw dangling symbol (circle) for PIN_NC pin types. These pins are never connected, so a dangling symbol makes no sense. 

Fix also a fex minor coding style issues.
This commit is contained in:
jean-pierre charras 2019-03-17 20:50:18 +01:00
parent 761d7fd438
commit af0cb68c1b
2 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
eeschema/sch_painter.cpp
View File

@ -223,7 +223,7 @@ bool SCH_PAINTER::isUnitAndConversionShown( const LIB_ITEM* aItem )
void SCH_PAINTER::draw( LIB_PART *aComp, int aLayer, bool aDrawFields, int aUnit, int aConvert,
std::vector<bool>* danglingPinFlags )
std::vector<bool>* aDanglingPinFlags )
{
if( !aUnit )
aUnit = m_schSettings.m_ShowUnit;
@ -249,8 +249,8 @@ void SCH_PAINTER::draw( LIB_PART *aComp, int aLayer, bool aDrawFields, int aUnit
auto pin = static_cast<LIB_PIN*>( &item );
bool dangling = true;
if( danglingPinFlags && pinIndex < danglingPinFlags->size() )
dangling = (*danglingPinFlags)[ pinIndex ];
if( aDanglingPinFlags && pinIndex < aDanglingPinFlags->size() )
dangling = (*aDanglingPinFlags)[ pinIndex ];
draw( pin, aLayer, dangling, aComp->IsMoving() );
pinIndex++;
@ -506,7 +506,7 @@ static void drawPinDanglingSymbol( GAL* aGal, const VECTOR2I& aPos, const COLOR4
}
void SCH_PAINTER::draw( LIB_PIN *aPin, int aLayer, bool isDangling, bool isMoving )
void SCH_PAINTER::draw( LIB_PIN *aPin, int aLayer, bool aIsDangling, bool isMoving )
{
if( aLayer != LAYER_DEVICE )
return;
@ -529,7 +529,7 @@ void SCH_PAINTER::draw( LIB_PIN *aPin, int aLayer, bool isDangling, bool isMovin
}
else
{
if( isDangling && aPin->IsPowerConnection() )
if( aIsDangling && aPin->IsPowerConnection() )
drawPinDanglingSymbol( m_gal, pos, color );
return;
@ -649,9 +649,11 @@ void SCH_PAINTER::draw( LIB_PIN *aPin, int aLayer, bool isDangling, bool isMovin
pos + VECTOR2D( 1, 1 ) * TARGET_PIN_RADIUS );
m_gal->DrawLine( pos + VECTOR2D( 1, -1 ) * TARGET_PIN_RADIUS ,
pos + VECTOR2D( -1, 1 ) * TARGET_PIN_RADIUS );
aIsDangling = false; // PIN_NC pin type is always not connected and dangling.
}
if( isDangling && ( aPin->IsVisible() || aPin->IsPowerConnection() ) )
if( aIsDangling && ( aPin->IsVisible() || aPin->IsPowerConnection() ) )
drawPinDanglingSymbol( m_gal, pos, color );
// Draw the labels

53
eeschema/sch_painter.h
View File

@ -1,7 +1,7 @@
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2014 CERN
* Copyright (C) 2019 CERN
* @author Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
*
* This program is free software; you can redistribute it and/or
@ -131,32 +131,31 @@ public:
}
private:
void draw( LIB_RECTANGLE *, int );
void draw( LIB_PIN *, int, bool isDangling = true, bool isMoving = false );
void draw( LIB_CIRCLE *, int );
void draw( LIB_ITEM *, int );
void draw( LIB_PART *, int, bool aDrawFields = true, int aUnit = 0, int aConvert = 0,
std::vector<bool>* danglingPinFlags = nullptr );
void draw( LIB_ALIAS *, int );
void draw( LIB_ARC *, int );
void draw( LIB_POLYLINE *, int );
void draw( LIB_FIELD *, int );
void draw( LIB_TEXT *, int );
void draw( LIB_BEZIER *, int );
void draw( SCH_COMPONENT *, int );
void draw( SCH_JUNCTION *, int );
void draw( SCH_FIELD *, int );
void draw( SCH_TEXT *, int );
void draw( SCH_LABEL *, int );
void draw( SCH_HIERLABEL *, int );
void draw( SCH_GLOBALLABEL *, int );
void draw( SCH_SHEET *, int );
void draw( SCH_SHEET_PIN *, int );
void draw( SCH_NO_CONNECT *, int );
void draw( SCH_MARKER *, int );
void draw( SCH_BITMAP *, int );
void draw( SCH_LINE *, int );
void draw( SCH_BUS_ENTRY_BASE *aEntry, int aLayer );
void draw( LIB_RECTANGLE* aRect, int aLayer );
void draw( LIB_PIN* aPin, int aLayer, bool aIsDangling = true, bool isMoving = false );
void draw( LIB_CIRCLE* aCircle, int aLayer );
void draw( LIB_ITEM *, int aLayer );
void draw( LIB_PART* aComp, int, bool aDrawFields = true, int aUnit = 0, int aConvert = 0,
std::vector<bool>* aDanglingPinFlags = nullptr );
void draw( LIB_ALIAS* aAlias, int aLayer );
void draw( LIB_ARC* aArc, int aLayer );
void draw( LIB_POLYLINE* aLine, int aLayer );
void draw( LIB_FIELD* aField, int aLayer );
void draw( LIB_TEXT* aText, int aLayer );
void draw( LIB_BEZIER* aCurve, int aLayer );
void draw( SCH_COMPONENT* aComp, int aLayer );
void draw( SCH_JUNCTION* aJct, int aLayer );
void draw( SCH_FIELD* aField, int aLayer );
void draw( SCH_TEXT* aText, int aLayer );
void draw( SCH_LABEL* aLabel, int aLayer );
void draw( SCH_HIERLABEL* aLabel, int aLayer );
void draw( SCH_GLOBALLABEL* aLabel, int aLayer );
void draw( SCH_SHEET* aSheet, int aLayer );
void draw( SCH_NO_CONNECT* aNC, int aLayer );
void draw( SCH_MARKER* aMarker, int aLayer );
void draw( SCH_BITMAP* aBitmap, int aLayer );
void draw( SCH_LINE* aLine, int aLayer );
void draw( SCH_BUS_ENTRY_BASE* aEntry, int aLayer );
bool isUnitAndConversionShown( const LIB_ITEM* aItem );