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

Formatting cleanup.

This commit is contained in:
Jeff Young 2022-05-02 22:31:17 +01:00
parent 67f352717e
commit babfb29c54
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
eeschema/tools/sch_drawing_tools.cpp
View File

@ -788,11 +788,10 @@ int SCH_DRAWING_TOOLS::SingleClickPlace( const TOOL_EVENT& aEvent )
} }
else if( evt->Category() == TC_COMMAND ) else if( evt->Category() == TC_COMMAND )
{ {
if( ( type == SCH_BUS_WIRE_ENTRY_T ) if( ( type == SCH_BUS_WIRE_ENTRY_T ) && ( evt->IsAction( &EE_ACTIONS::rotateCW )
&& ( evt->IsAction( &EE_ACTIONS::rotateCW ) || evt->IsAction( &EE_ACTIONS::rotateCCW )
|| evt->IsAction( &EE_ACTIONS::rotateCCW ) || evt->IsAction( &EE_ACTIONS::mirrorV )
|| evt->IsAction( &EE_ACTIONS::mirrorV ) || evt->IsAction( &EE_ACTIONS::mirrorH ) ) )
|| evt->IsAction( &EE_ACTIONS::mirrorH ) ) )
{ {
SCH_BUS_ENTRY_BASE* busItem = static_cast<SCH_BUS_ENTRY_BASE*>( previewItem ); SCH_BUS_ENTRY_BASE* busItem = static_cast<SCH_BUS_ENTRY_BASE*>( previewItem );
@ -1217,13 +1216,9 @@ int SCH_DRAWING_TOOLS::TwoClickPlace( const TOOL_EVENT& aEvent )
{ {
// no connected net label found -> open up the new label dialog // no connected net label found -> open up the new label dialog
if( isGlobalLabel ) if( isGlobalLabel )
{
item = createNewText( cursorPos, LAYER_GLOBLABEL ); item = createNewText( cursorPos, LAYER_GLOBLABEL );
}
else else
{
item = createNewText( cursorPos, LAYER_LOCLABEL ); item = createNewText( cursorPos, LAYER_LOCLABEL );
}
} }
else else
{ {
@ -1231,6 +1226,7 @@ int SCH_DRAWING_TOOLS::TwoClickPlace( const TOOL_EVENT& aEvent )
SCHEMATIC* schematic = getModel<SCHEMATIC>(); SCHEMATIC* schematic = getModel<SCHEMATIC>();
SCHEMATIC_SETTINGS& sch_settings = schematic->Settings(); SCHEMATIC_SETTINGS& sch_settings = schematic->Settings();
SCH_LABEL_BASE* labelItem = nullptr; SCH_LABEL_BASE* labelItem = nullptr;
if( isGlobalLabel ) if( isGlobalLabel )
{ {
labelItem = new SCH_GLOBALLABEL( cursorPos ); labelItem = new SCH_GLOBALLABEL( cursorPos );
@ -1247,8 +1243,8 @@ int SCH_DRAWING_TOOLS::TwoClickPlace( const TOOL_EVENT& aEvent )
labelItem->SetBold( m_lastTextBold ); labelItem->SetBold( m_lastTextBold );
labelItem->SetItalic( m_lastTextItalic ); labelItem->SetItalic( m_lastTextItalic );
labelItem->SetTextSpinStyle( m_lastTextOrientation ); labelItem->SetTextSpinStyle( m_lastTextOrientation );
labelItem->SetTextSize( labelItem->SetTextSize( wxSize( sch_settings.m_DefaultTextSize,
wxSize( sch_settings.m_DefaultTextSize, sch_settings.m_DefaultTextSize ) ); sch_settings.m_DefaultTextSize ) );
labelItem->SetFlags( IS_NEW | IS_MOVING ); labelItem->SetFlags( IS_NEW | IS_MOVING );
labelItem->SetText( netName ); labelItem->SetText( netName );
item = labelItem; item = labelItem;