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

Restore trace strings in the tool stack 

This is a partial revert of d43eefbad5.
This commit is contained in:
Ian McInerney 2020-12-07 22:03:43 +00:00
parent 4d022795d1
commit 27fa3a422a
1 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
common/tool/tool_manager.cpp
View File

@ -490,7 +490,8 @@ void TOOL_MANAGER::ShutdownTool( TOOL_BASE* aTool )
if( st->cofunc ) if( st->cofunc )
{ {
wxLogTrace( kicadTraceToolStack, "TOOL_MANAGER shutting down tool %s", wxLogTrace( kicadTraceToolStack,
"TOOL_MANAGER::ShutdownTool - Shutting down tool %s",
st->theTool->GetName() ); st->theTool->GetName() );
setActiveState( st ); setActiveState( st );
@ -648,7 +649,8 @@ bool TOOL_MANAGER::dispatchInternal( const TOOL_EVENT& aEvent )
{ {
bool handled = false; bool handled = false;
wxLogTrace( kicadTraceToolStack, "TOOL_MANAGER dispatching %s", aEvent.Format() ); wxLogTrace( kicadTraceToolStack, "TOOL_MANAGER::dispatchInternal - received event: %s",
aEvent.Format() );
auto it = m_activeTools.begin(); auto it = m_activeTools.begin();
@ -682,9 +684,9 @@ bool TOOL_MANAGER::dispatchInternal( const TOOL_EVENT& aEvent )
st->pendingWait = false; st->pendingWait = false;
st->waitEvents.clear(); st->waitEvents.clear();
wxLogTrace( kicadTraceToolStack, "TOOL_MANAGER waking tool %s for event: %s", wxLogTrace( kicadTraceToolStack,
st->theTool->GetName(), "TOOL_MANAGER::dispatchInternal - Waking tool %s for event: %s",
aEvent.Format() ); st->theTool->GetName(), aEvent.Format() );
setActiveState( st ); setActiveState( st );
bool end = !st->cofunc->Resume(); bool end = !st->cofunc->Resume();
@ -698,9 +700,9 @@ bool TOOL_MANAGER::dispatchInternal( const TOOL_EVENT& aEvent )
// If the tool did not request the event be passed to other tools, we're done // If the tool did not request the event be passed to other tools, we're done
if( !st->wakeupEvent.PassEvent() ) if( !st->wakeupEvent.PassEvent() )
{ {
wxLogTrace( kicadTraceToolStack, "TOOL_MANAGER %s stopped passing event %s", wxLogTrace( kicadTraceToolStack,
st->theTool->GetName(), "TOOL_MANAGER::dispatchInternal - tool %s stopped passing event: %s",
aEvent.Format() ); st->theTool->GetName(), aEvent.Format() );
return true; return true;
} }
@ -742,9 +744,9 @@ bool TOOL_MANAGER::dispatchInternal( const TOOL_EVENT& aEvent )
// as the state changes, the transition table has to be set up again // as the state changes, the transition table has to be set up again
st->transitions.clear(); st->transitions.clear();
wxLogTrace( kicadTraceToolStack, "TOOL_MANAGER running tool %s for event %s", wxLogTrace( kicadTraceToolStack,
st->theTool->GetName(), "TOOL_MANAGER::dispatchInternal - Running tool %s for event: %s",
aEvent.Format() ); st->theTool->GetName(), aEvent.Format() );
// got match? Run the handler. // got match? Run the handler.
setActiveState( st ); setActiveState( st );
@ -768,10 +770,8 @@ bool TOOL_MANAGER::dispatchInternal( const TOOL_EVENT& aEvent )
break; // only the first tool gets the event break; // only the first tool gets the event
} }
if( handled ) wxLogTrace( kicadTraceToolStack, "TOOL_MANAGER::dispatchInternal - %s handle event: %s",
wxLogTrace( kicadTraceToolStack, "TOOL_MANAGER handled %s", aEvent.Format() ); ( handled ? "Did" : "Did not" ), aEvent.Format() );
else
wxLogTrace( kicadTraceToolStack, "TOOL_MANAGER didn't handle %s", aEvent.Format() );
return handled; return handled;
} }
@ -788,7 +788,9 @@ bool TOOL_MANAGER::DispatchHotKey( const TOOL_EVENT& aEvent )
bool TOOL_MANAGER::dispatchActivation( const TOOL_EVENT& aEvent ) bool TOOL_MANAGER::dispatchActivation( const TOOL_EVENT& aEvent )
{ {
wxLogTrace( kicadTraceToolStack, "TOOL_MANAGER::dispatchActivation - %s", aEvent.Format() ); wxLogTrace( kicadTraceToolStack, "TOOL_MANAGER::dispatchActivation - Received event: %s",
aEvent.Format() );
if( aEvent.IsActivate() ) if( aEvent.IsActivate() )
{ {
wxString cmdStr( *aEvent.GetCommandStr() ); wxString cmdStr( *aEvent.GetCommandStr() );
@ -797,9 +799,9 @@ bool TOOL_MANAGER::dispatchActivation( const TOOL_EVENT& aEvent )
if( tool != m_toolNameIndex.end() ) if( tool != m_toolNameIndex.end() )
{ {
wxLogTrace( kicadTraceToolStack, "TOOL_MANAGER running tool %s for event %s", wxLogTrace( kicadTraceToolStack,
tool->second->theTool->GetName(), "TOOL_MANAGER::dispatchActivation - Running tool %s for event: %s",
aEvent.Format() ); tool->second->theTool->GetName(), aEvent.Format() );
runTool( tool->second->theTool ); runTool( tool->second->theTool );
return true; return true;
@ -1136,10 +1138,8 @@ bool TOOL_MANAGER::processEvent( const TOOL_EVENT& aEvent )
} }
} }
if( handled ) wxLogTrace( kicadTraceToolStack, "TOOL_MANAGER::processEvent - %s handle event: %s",
wxLogTrace( kicadTraceToolStack, "TOOL_MANAGER handled %s", aEvent.Format() ); ( handled ? "Did" : "Did not" ), aEvent.Format() );
else
wxLogTrace( kicadTraceToolStack, "TOOL_MANAGER didn't handle %s", aEvent.Format() );
return handled; return handled;
} }