realAscot/kicad-source
1
0
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-09-14 02:03:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Symbol editor: increment action auto-detects the field to increment

Browse Source
This commit is contained in:
John Beard 2024-10-20 19:00:52 +08:00
parent 9c9542deea
commit 8b6e82c6e2
2 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
eeschema/tools/ee_actions.h
View File

@ -311,10 +311,4 @@ public:
// Drag and drop
static TOOL_ACTION ddAppendFile;
enum PIN_INCREMENT
{
NUMBER = 0,
NAME,
};
};

59
eeschema/tools/symbol_editor_edit_tool.cpp
View File

@ -33,6 +33,7 @@
#include <clipboard.h>
#include <ee_actions.h>
#include <increment.h>
#include <pin_layout_cache.h>
#include <string_utils.h>
#include <symbol_edit_frame.h>
#include <sch_commit.h>
@ -1104,6 +1105,8 @@ int SYMBOL_EDITOR_EDIT_TOOL::Increment( const TOOL_EVENT& aEvent )
if( !allSameType )
return 0;
const VECTOR2I mousePosition = getViewControls()->GetMousePosition();
SCH_COMMIT commit( m_frame );
for( EDA_ITEM* item : selection )
@ -1112,35 +1115,39 @@ int SYMBOL_EDITOR_EDIT_TOOL::Increment( const TOOL_EVENT& aEvent )
{
case SCH_PIN_T:
{
SCH_PIN& pin = static_cast<SCH_PIN&>( *item );
// This is is a bit annoying, as it severely limits the number of scroll
// actions. It would be better if we could figure out which field the user
// wanted to increment from the cursor position. Then we could use the
// index to choose, say, to increment different bits of the pin.
switch( incParam.Index )
// Primary increment: name or number of the pin
if( incParam.Index == 0 )
{
case EE_ACTIONS::PIN_INCREMENT::NUMBER:
{
wxString nextNumber = pin.GetNumber();
IncrementString( nextNumber, incParam.Delta );
SCH_PIN& pin = static_cast<SCH_PIN&>( *item );
PIN_LAYOUT_CACHE& layout = pin.GetLayoutCache();
commit.Modify( &pin );
pin.SetNumber( nextNumber );
break;
}
case EE_ACTIONS::PIN_INCREMENT::NAME:
{
wxString nextName = pin.GetName();
IncrementString( nextName, incParam.Delta );
bool found = false;
OPT_BOX2I bbox = layout.GetPinNumberBBox();
commit.Modify( &pin );
pin.SetName( nextName );
break;
}
default:
// Only handle number and name for now
break;
if( bbox && bbox->Contains( mousePosition ) )
{
wxString nextNumber = pin.GetNumber();
IncrementString( nextNumber, incParam.Delta );
commit.Modify( &pin );
pin.SetNumber( nextNumber );
found = true;
}
if( !found )
{
bbox = layout.GetPinNameBBox();
if( bbox && bbox->Contains( mousePosition ) )
{
wxString nextName = pin.GetName();
IncrementString( nextName, incParam.Delta );
commit.Modify( &pin );
pin.SetName( nextName );
found = true;
}
}
}
break;
}