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

Use current cursorPos when creating sheet pins. 

Fixes https://gitlab.com/kicad/code/kicad/issues/13206
This commit is contained in:
Jeff Young 2022-12-19 12:27:34 +00:00
parent a3a2e2e5b1
commit ebcc1ac062
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
eeschema/tools/sch_drawing_tools.cpp
View File

@ -732,7 +732,7 @@ int SCH_DRAWING_TOOLS::SingleClickPlace( const TOOL_EVENT& aEvent )
return 0; return 0;
} }
previewItem = createSheetPin( sheet, label ); previewItem = createSheetPin( sheet, label, cursorPos );
} }
break; break;
@ -743,9 +743,8 @@ int SCH_DRAWING_TOOLS::SingleClickPlace( const TOOL_EVENT& aEvent )
m_toolMgr->RunAction( EE_ACTIONS::clearSelection, true ); m_toolMgr->RunAction( EE_ACTIONS::clearSelection, true );
cursorPos = static_cast<wxPoint>( aEvent.HasPosition() ? cursorPos = static_cast<wxPoint>( aEvent.HasPosition() ? aEvent.Position()
aEvent.Position() : : controls->GetMousePosition() );
controls->GetMousePosition() );
m_frame->PushTool( aEvent ); m_frame->PushTool( aEvent );
@ -1071,7 +1070,8 @@ SCH_HIERLABEL* SCH_DRAWING_TOOLS::importHierLabel( SCH_SHEET* aSheet )
} }
SCH_SHEET_PIN* SCH_DRAWING_TOOLS::createSheetPin( SCH_SHEET* aSheet, SCH_HIERLABEL* aLabel ) SCH_SHEET_PIN* SCH_DRAWING_TOOLS::createSheetPin( SCH_SHEET* aSheet, SCH_HIERLABEL* aLabel,
const VECTOR2I& aPosition )
{ {
SCHEMATIC_SETTINGS& settings = aSheet->Schematic()->Settings(); SCHEMATIC_SETTINGS& settings = aSheet->Schematic()->Settings();
wxString text; wxString text;
@ -1101,7 +1101,7 @@ SCH_SHEET_PIN* SCH_DRAWING_TOOLS::createSheetPin( SCH_SHEET* aSheet, SCH_HIERLAB
m_lastSheetPinType = sheetPin->GetShape(); m_lastSheetPinType = sheetPin->GetShape();
sheetPin->SetPosition( (VECTOR2I) getViewControls()->GetCursorPosition() ); sheetPin->SetPosition( aPosition );
return sheetPin; return sheetPin;
} }
@ -1360,7 +1360,7 @@ int SCH_DRAWING_TOOLS::TwoClickPlace( const TOOL_EVENT& aEvent )
} }
else else
{ {
item = createSheetPin( sheet, label ); item = createSheetPin( sheet, label, cursorPos );
if( item->Type() == SCH_SHEET_PIN_T ) if( item->Type() == SCH_SHEET_PIN_T )
{ {

3
eeschema/tools/sch_drawing_tools.h
View File

@ -66,7 +66,8 @@ private:
SCH_HIERLABEL* importHierLabel( SCH_SHEET* aSheet ); SCH_HIERLABEL* importHierLabel( SCH_SHEET* aSheet );
SCH_SHEET_PIN* createSheetPin( SCH_SHEET* aSheet, SCH_HIERLABEL* aLabel ); SCH_SHEET_PIN* createSheetPin( SCH_SHEET* aSheet, SCH_HIERLABEL* aLabel,
const VECTOR2I& aPosition );
void sizeSheet( SCH_SHEET* aSheet, const VECTOR2I& aPos ); void sizeSheet( SCH_SHEET* aSheet, const VECTOR2I& aPos );