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

Fixes to the context menu logic around wire/bus drawing.

This commit is contained in:
Jeff Young 2019-05-02 00:35:05 +01:00
parent 7273748c57
commit 4ca0f4da10
3 changed files with 42 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eeschema/tools/sch_drawing_tool.cpp
View File

@ -246,7 +246,7 @@ bool SCH_DRAWING_TOOL::Init()
auto drawingSegmentsCondition = [] ( const SELECTION& aSel ) {
SCH_ITEM* item = (SCH_ITEM*) aSel.Front();
return ( item && item->Type() == SCH_LINE_T && item->GetEditFlags() );
return ( item && item->Type() == SCH_LINE_T && item->IsNew() );
};
auto singleSheetCondition = SELECTION_CONDITIONS::Count( 1 )

45
eeschema/tools/sch_edit_tool.cpp
View File

@ -208,14 +208,24 @@ bool SCH_EDIT_TOOL::Init()
return ( m_frame->GetToolId() == ID_NO_TOOL_SELECTED );
};
auto orientatableCondition = [] ( const SELECTION& aSel ) {
auto orientatableCondition = [ this ] ( const SELECTION& aSel ) {
if( aSel.Empty() )
return false;
if( aSel.GetSize() > 1 )
return true;
SCH_ITEM* item = (SCH_ITEM*) aSel.Front();
switch( static_cast<EDA_ITEM*>( aSel.Front() )->Type() )
if( aSel.GetSize() > 1 )
{
// In general a group is orientatable, except when we're drawing wires/busses
if( m_frame->GetToolId() == ID_WIRE_BUTT || m_frame->GetToolId() == ID_BUS_BUTT )
{
if( item->Type() == SCH_LINE_T && item->IsNew() )
return false;
}
return true;
}
switch( item->Type() )
{
case SCH_MARKER_T:
case SCH_JUNCTION_T:
@ -314,16 +324,23 @@ bool SCH_EDIT_TOOL::Init()
};
auto wireTool = [ this ] ( const SELECTION& aSel ) {
return ( m_frame->GetToolId() == ID_WIRE_BUTT
|| m_frame->GetToolId() == ID_JUNCTION_BUTT );
return ( m_frame->GetToolId() == ID_WIRE_BUTT );
};
auto busTool = [ this ] ( const SELECTION& aSel ) {
return ( m_frame->GetToolId() == ID_BUS_BUTT
|| m_frame->GetToolId() == ID_JUNCTION_BUTT );
return ( m_frame->GetToolId() == ID_BUS_BUTT );
};
auto wireOrBusTool = wireTool || busTool;
auto junctionTool = [ this ] ( const SELECTION& aSel ) {
return ( m_frame->GetToolId() == ID_JUNCTION_BUTT );
};
auto idleCondition = [] ( const SELECTION& aSel ) {
SCH_ITEM* item = (SCH_ITEM*) aSel.Front();
return ( !item || !item->GetEditFlags() );
};
auto idleWireOrBusTool = ( wireTool || busTool || junctionTool ) && idleCondition;
auto wireSelectionCondition = SELECTION_CONDITIONS::MoreThan( 0 )
&& SELECTION_CONDITIONS::OnlyType( SCH_LINE_LOCATE_WIRE_T );
@ -331,8 +348,6 @@ bool SCH_EDIT_TOOL::Init()
auto busSelectionCondition = SELECTION_CONDITIONS::MoreThan( 0 )
&& SELECTION_CONDITIONS::OnlyType( SCH_LINE_LOCATE_BUS_T );
auto wireOrBusSelectionCondition = wireSelectionCondition || busSelectionCondition;
// Build the edit tool menu (shown when moving or dragging)
//
CONDITIONAL_MENU& ctxMenu = m_menu.GetMenu();
@ -383,10 +398,10 @@ bool SCH_EDIT_TOOL::Init()
drawingMenu.AddItem( SCH_ACTIONS::toHLabel, toHLabelCondition, 200 );
drawingMenu.AddItem( SCH_ACTIONS::toGLabel, toGLabelCondition, 200 );
drawingMenu.AddItem( SCH_ACTIONS::toText, toTextlCondition, 200 );
drawingMenu.AddItem( SCH_ACTIONS::selectNode, wireOrBusTool, 200 );
drawingMenu.AddItem( SCH_ACTIONS::selectConnection, wireOrBusTool, 200 );
drawingMenu.AddItem( SCH_ACTIONS::breakWire, wireTool, 200 );
drawingMenu.AddItem( SCH_ACTIONS::breakBus, busTool, 200 );
drawingMenu.AddItem( SCH_ACTIONS::selectNode, idleWireOrBusTool, 200 );
drawingMenu.AddItem( SCH_ACTIONS::selectConnection, idleWireOrBusTool, 200 );
drawingMenu.AddItem( SCH_ACTIONS::breakWire, idleWireOrBusTool, 200 );
drawingMenu.AddItem( SCH_ACTIONS::breakBus, idleWireOrBusTool, 200 );
// Add editing actions to the selection tool menu
//

13
eeschema/tools/sch_selection_tool.cpp
View File

@ -99,8 +99,17 @@ bool SCH_SELECTION_TOOL::Init()
m_frame = getEditFrame<SCH_BASE_FRAME>();
auto wireOrBusSelectionCondition = SELECTION_CONDITIONS::MoreThan( 0 )
&& SELECTION_CONDITIONS::OnlyTypes( wireOrBusTypes );
auto wireOrBusSelectionCondition = [] ( const SELECTION& aSel ) {
for( unsigned i = 0; i < aSel.GetSize(); ++i )
{
SCH_ITEM* item = (SCH_ITEM*) aSel.GetItem( i );
if( !item->IsType( wireOrBusTypes ) || item->IsNew() )
return false;
}
return aSel.GetSize() >= 1;
};
auto& ctxMenu = m_menu.GetMenu();