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

Formatting; include cleanup.

This commit is contained in:
Jeff Young 2024-05-12 23:56:59 +01:00
parent c8d1c1f1a4
commit 667fedd9a9
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
eeschema/sch_bus_entry.cpp
View File

@ -31,14 +31,12 @@
#include <sch_edit_frame.h> #include <sch_edit_frame.h>
#include <sch_junction.h> #include <sch_junction.h>
#include <sch_line.h> #include <sch_line.h>
#include <sch_label.h>
#include <project/net_settings.h> #include <project/net_settings.h>
#include <project/project_file.h> #include <project/project_file.h>
#include <settings/color_settings.h> #include <settings/color_settings.h>
#include <netclass.h> #include <netclass.h>
#include <trigo.h> #include <trigo.h>
#include <board_item.h> #include <board_item.h>
#include <advanced_config.h>
#include <connection_graph.h> #include <connection_graph.h>
#include "sch_painter.h" #include "sch_painter.h"
#include "plotters/plotter.h" #include "plotters/plotter.h"
@ -269,11 +267,12 @@ void SCH_BUS_ENTRY_BASE::Print( const SCH_RENDER_SETTINGS* aSettings, int aUnit,
const VECTOR2I& aOffset, bool aForceNoFill, bool aDimmed ) const VECTOR2I& aOffset, bool aForceNoFill, bool aDimmed )
{ {
wxDC* DC = aSettings->GetPrintDC(); wxDC* DC = aSettings->GetPrintDC();
COLOR4D color = ( GetBusEntryColor() == COLOR4D::UNSPECIFIED ) ? COLOR4D color = ( GetBusEntryColor() == COLOR4D::UNSPECIFIED )
aSettings->GetLayerColor( m_layer ) : GetBusEntryColor(); ? aSettings->GetLayerColor( m_layer )
: GetBusEntryColor();
VECTOR2I start = m_pos + aOffset; VECTOR2I start = m_pos + aOffset;
VECTOR2I end = GetEnd() + aOffset; VECTOR2I end = GetEnd() + aOffset;
int penWidth = ( GetPenWidth() == 0 ) ? aSettings->GetDefaultPenWidth() : GetPenWidth(); int penWidth = ( GetPenWidth() == 0 ) ? aSettings->GetDefaultPenWidth() : GetPenWidth();
if( GetLineStyle() <= LINE_STYLE::FIRST_TYPE ) if( GetLineStyle() <= LINE_STYLE::FIRST_TYPE )
{ {

10
eeschema/sch_symbol.cpp
View File

@ -26,12 +26,8 @@
#include <widgets/msgpanel.h> #include <widgets/msgpanel.h>
#include <bitmaps.h> #include <bitmaps.h>
#include <core/mirror.h> #include <core/mirror.h>
#include <sch_pin.h>
#include <sch_shape.h> #include <sch_shape.h>
#include <pgm_base.h> #include <pgm_base.h>
#include <sch_symbol.h>
#include <sch_sheet_path.h>
#include <schematic.h>
#include <sim/sim_model.h> #include <sim/sim_model.h>
#include <sim/spice_generator.h> #include <sim/spice_generator.h>
#include <sim/sim_lib_mgr.h> #include <sim/sim_lib_mgr.h>
@ -97,7 +93,7 @@ static LIB_SYMBOL* dummy()
SCH_SYMBOL::SCH_SYMBOL() : SCH_SYMBOL::SCH_SYMBOL() :
SYMBOL( nullptr, SCH_SYMBOL_T ) SYMBOL( nullptr, SCH_SYMBOL_T )
{ {
Init( VECTOR2I( 0, 0 ) ); Init( VECTOR2I( 0, 0 ) );
} }
@ -157,7 +153,7 @@ SCH_SYMBOL::SCH_SYMBOL( const LIB_SYMBOL& aSymbol, const SCH_SHEET_PATH* aSheet,
SCH_SYMBOL::SCH_SYMBOL( const SCH_SYMBOL& aSymbol ) : SCH_SYMBOL::SCH_SYMBOL( const SCH_SYMBOL& aSymbol ) :
SYMBOL( aSymbol ) SYMBOL( aSymbol )
{ {
m_parent = aSymbol.m_parent; m_parent = aSymbol.m_parent;
m_pos = aSymbol.m_pos; m_pos = aSymbol.m_pos;
@ -430,7 +426,7 @@ void SCH_SYMBOL::SetBodyStyle( int aBodyStyle )
{ {
m_bodyStyle = aBodyStyle; m_bodyStyle = aBodyStyle;
// The convert may have a different pin layout so the update the pin map. // The body style may have a different pin layout so the update the pin map.
UpdatePins(); UpdatePins();
} }
} }