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

Minor fix (minor bug #148296) and very minor change.

This commit is contained in:
jean-pierre charras 2015-08-09 17:04:49 +02:00
parent 11be2b2d3d
commit fa55c0f18e
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
eeschema/schedit.cpp
View File

@ -342,6 +342,9 @@ void SCH_EDIT_FRAME::Process_Special_Functions( wxCommandEvent& event )
break; break;
case ID_POPUP_DELETE_BLOCK: case ID_POPUP_DELETE_BLOCK:
if( screen->m_BlockLocate.GetCommand() != BLOCK_MOVE )
break;
m_canvas->MoveCursorToCrossHair(); m_canvas->MoveCursorToCrossHair();
screen->m_BlockLocate.SetCommand( BLOCK_DELETE ); screen->m_BlockLocate.SetCommand( BLOCK_DELETE );
screen->m_BlockLocate.SetMessageBlock( this ); screen->m_BlockLocate.SetMessageBlock( this );
@ -350,6 +353,9 @@ void SCH_EDIT_FRAME::Process_Special_Functions( wxCommandEvent& event )
break; break;
case ID_POPUP_COPY_BLOCK: case ID_POPUP_COPY_BLOCK:
if( screen->m_BlockLocate.GetCommand() != BLOCK_MOVE )
break;
m_canvas->MoveCursorToCrossHair(); m_canvas->MoveCursorToCrossHair();
screen->m_BlockLocate.SetCommand( BLOCK_COPY ); screen->m_BlockLocate.SetCommand( BLOCK_COPY );
screen->m_BlockLocate.SetMessageBlock( this ); screen->m_BlockLocate.SetMessageBlock( this );
@ -357,6 +363,9 @@ void SCH_EDIT_FRAME::Process_Special_Functions( wxCommandEvent& event )
break; break;
case ID_POPUP_DRAG_BLOCK: case ID_POPUP_DRAG_BLOCK:
if( screen->m_BlockLocate.GetCommand() != BLOCK_MOVE )
break;
m_canvas->MoveCursorToCrossHair(); m_canvas->MoveCursorToCrossHair();
screen->m_BlockLocate.SetCommand( BLOCK_DRAG ); screen->m_BlockLocate.SetCommand( BLOCK_DRAG );
screen->m_BlockLocate.SetMessageBlock( this ); screen->m_BlockLocate.SetMessageBlock( this );

8
pcb_calculator/tracks_width_versus_current.cpp
View File

@ -88,11 +88,6 @@ void PCB_CALCULATOR_FRAME::OnTWParametersChanged( wxCommandEvent& event )
case TW_MASTER_INT_WIDTH: case TW_MASTER_INT_WIDTH:
OnTWCalculateFromIntWidth( event ); OnTWCalculateFromIntWidth( event );
break; break;
default:
#ifdef DEBUG
assert( false );
#endif
break;
} }
} }
@ -105,6 +100,7 @@ void PCB_CALCULATOR_FRAME::OnTWCalculateFromCurrent( wxCommandEvent& event )
event.StopPropagation(); event.StopPropagation();
return; return;
} }
m_TWNested = true; m_TWNested = true;
// Update state. // Update state.
@ -190,6 +186,7 @@ void PCB_CALCULATOR_FRAME::OnTWCalculateFromIntWidth( wxCommandEvent& event )
event.StopPropagation(); event.StopPropagation();
return; return;
} }
m_TWNested = true; m_TWNested = true;
// Update state. // Update state.
@ -248,6 +245,7 @@ void PCB_CALCULATOR_FRAME::TWDisplayValues( double aCurrent, double aExtWidth,
msg.Printf( wxT( "%g" ), aExtWidth / extScale ); msg.Printf( wxT( "%g" ), aExtWidth / extScale );
m_ExtTrackWidthValue->SetValue( msg ); m_ExtTrackWidthValue->SetValue( msg );
} }
if( m_TWMode != TW_MASTER_INT_WIDTH ) if( m_TWMode != TW_MASTER_INT_WIDTH )
{ {
msg.Printf( wxT( "%g" ), aIntWidth / intScale ); msg.Printf( wxT( "%g" ), aIntWidth / intScale );