@ -940,7 +940,14 @@ void SCH_EDIT_FRAME::OnDragItem( wxCommandEvent& aEvent )
SCH_SCREEN * screen = GetScreen ( ) ;
SCH_ITEM * item = screen - > GetCurItem ( ) ;
INSTALL_UNBUFFERED_DC ( dc , m_canvas ) ;
// The easiest way to handle a menu or a hot key drag command
// is to simulate a block drag command
//
// When a drag item is requested, some items use a BLOCK_DRAG_ITEM drag type
// an some items use a BLOCK_DRAG drag type (mainly a junction)
// a BLOCK_DRAG collects all items in a block (here a 2x2 rect centered on the cursor)
// and BLOCK_DRAG_ITEM drag only the selected item
BLOCK_COMMAND_T dragType = BLOCK_DRAG_ITEM ;
if ( item = = NULL )
{
@ -958,42 +965,43 @@ void SCH_EDIT_FRAME::OnDragItem( wxCommandEvent& aEvent )
// Exit if no item found at the current location or the item is already being edited.
if ( ( item = = NULL ) | | ( item - > GetFlags ( ) ! = 0 ) )
return ;
// When a junction or a node is found, a BLOCK_DRAG is better
if ( m_collectedItems . IsCorner ( ) | | m_collectedItems . IsNode ( false )
| | m_collectedItems . IsDraggableJunction ( ) )
dragType = BLOCK_DRAG ;
}
switch ( item - > Type ( ) )
{
case SCH_BUS_BUS_ENTRY_T :
case SCH_BUS_WIRE_ENTRY_T :
case SCH_LINE_T :
case SCH_JUNCTION_T :
if ( item - > GetLayer ( ) = = LAYER_BUS )
break ;
case SCH_BUS_BUS_ENTRY_T :
case SCH_BUS_WIRE_ENTRY_T :
case SCH_LINE_T :
case SCH_JUNCTION_T :
case SCH_COMPONENT_T :
case SCH_LABEL_T :
case SCH_GLOBAL_LABEL_T :
case SCH_HIERARCHICAL_LABEL_T :
case SCH_SHEET_T :
m_canvas - > MoveCursorToCrossHair ( ) ;
// Fall thru if item is not on bus layer.
case SCH_COMPONENT_T :
case SCH_LABEL_T :
case SCH_GLOBAL_LABEL_T :
case SCH_HIERARCHICAL_LABEL_T :
case SCH_SHEET_T :
m_canvas - > MoveCursorToCrossHair ( ) ;
if ( screen - > m_BlockLocate . GetState ( ) = = STATE_NO_BLOCK )
{
INSTALL_UNBUFFERED_DC ( dc , m_canvas ) ;
// The easiest way to handle a drag component or sheet command
// is to simulate a block drag command
if ( screen - > m_BlockLocate . GetState ( ) = = STATE_NO_BLOCK )
{
if ( ! HandleBlockBegin ( & dc , BLOCK_DRAG , GetCrossHairPosition ( ) ) )
break ;
if ( ! HandleBlockBegin ( & dc , dragType , GetCrossHairPosition ( ) ) )
break ;
// Give a non null size to the search block:
screen - > m_BlockLocate . Inflate ( 1 ) ;
HandleBlockEnd ( & dc ) ;
}
// Give a non null size to the search block:
screen - > m_BlockLocate . Inflate ( 1 ) ;
HandleBlockEnd ( & dc ) ;
}
break ;
break ;
default :
wxFAIL_MSG ( wxString : : Format ( wxT ( " Cannot drag schematic item type %s. " ) ,
GetChars ( item - > GetClass ( ) ) ) ) ;
default :
wxFAIL_MSG ( wxString : : Format ( wxT ( " Cannot drag schematic item type %s. " ) ,
GetChars ( item - > GetClass ( ) ) ) ) ;
}
}
jean-pierre charras
11 years ago