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

Added possibility to cancel a tool that is not on the top of the tool stack.

This commit is contained in:
Maciej Suminski 2013-09-24 15:47:07 +02:00
parent 171857a7a8
commit 96d162c907
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
common/tool/tool_manager.cpp
View File

@ -78,6 +78,16 @@ struct TOOL_MANAGER::TOOL_STATE
/// List of possible transitions (ie. association of events and functions that are executed /// List of possible transitions (ie. association of events and functions that are executed
/// upon the event reception /// upon the event reception
std::vector<TRANSITION> transitions; std::vector<TRANSITION> transitions;
bool operator==( const TOOL_MANAGER::TOOL_STATE& aRhs ) const
{
return ( aRhs.theTool == this->theTool );
}
bool operator!=( const TOOL_MANAGER::TOOL_STATE& aRhs ) const
{
return ( aRhs.theTool != this->theTool );
}
}; };
@ -262,7 +272,7 @@ void TOOL_MANAGER::dispatchInternal( TOOL_EVENT& aEvent )
st->wakeupEvent = aEvent; st->wakeupEvent = aEvent;
st->pendingWait = false; st->pendingWait = false;
st->waitEvents.clear(); st->waitEvents.clear();
if( !st->cofunc->Resume() ) if( st->cofunc && !st->cofunc->Resume() )
{ {
// The couroutine has finished // The couroutine has finished
finishTool( st ); finishTool( st );
@ -327,12 +337,20 @@ bool TOOL_MANAGER::dispatchActivation( TOOL_EVENT& aEvent )
void TOOL_MANAGER::finishTool( TOOL_STATE* aState ) void TOOL_MANAGER::finishTool( TOOL_STATE* aState )
{ {
wxASSERT( m_activeTools.front() == aState->theTool->GetId() ); // Find the tool to be deactivated
std::deque<TOOL_ID>::iterator it, it_end;
for( it = m_activeTools.begin(), it_end = m_activeTools.end(); it != it_end; ++it )
{
if( aState == m_toolIdIndex[*it] )
break;
}
if( it != m_activeTools.end() )
m_activeTools.erase( it );
else
wxLogWarning( wxT( "Tried to finish not active tool" ) );
// Deactivate the most recent tool and remove it from the active tools queue
aState->idle = true; aState->idle = true;
m_activeTools.erase( m_activeTools.begin() );
delete aState->cofunc; delete aState->cofunc;
aState->cofunc = NULL; aState->cofunc = NULL;
} }