2019-05-04 13:02:05 +00:00
|
|
|
/*
|
|
|
|
* This program source code file is part of KiCad, a free EDA CAD application.
|
|
|
|
*
|
|
|
|
* Copyright (C) 2019 KiCad Developers, see AUTHORS.txt for contributors.
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU General Public License
|
|
|
|
* as published by the Free Software Foundation; either version 2
|
|
|
|
* of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, you may find one here:
|
|
|
|
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
|
|
|
|
* or you may search the http://www.gnu.org website for the version 2 license,
|
|
|
|
* or you may write to the Free Software Foundation, Inc.,
|
|
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <tool/tool_manager.h>
|
2019-05-10 17:19:48 +00:00
|
|
|
#include <tools/ee_selection_tool.h>
|
2019-05-05 14:16:29 +00:00
|
|
|
#include <tools/sch_wire_bus_tool.h>
|
2019-05-10 17:19:48 +00:00
|
|
|
#include <ee_actions.h>
|
2019-05-04 13:02:05 +00:00
|
|
|
#include <bitmaps.h>
|
|
|
|
#include <base_struct.h>
|
2019-05-10 19:57:24 +00:00
|
|
|
#include <sch_item.h>
|
2019-05-04 13:02:05 +00:00
|
|
|
#include <sch_component.h>
|
|
|
|
#include <sch_sheet.h>
|
|
|
|
#include <sch_view.h>
|
|
|
|
#include <sch_line.h>
|
|
|
|
#include <sch_edit_frame.h>
|
|
|
|
#include <eeschema_id.h>
|
|
|
|
#include "sch_move_tool.h"
|
|
|
|
|
|
|
|
|
2019-05-10 17:19:48 +00:00
|
|
|
TOOL_ACTION EE_ACTIONS::move( "eeschema.InteractiveEdit.move",
|
2019-06-09 21:57:23 +00:00
|
|
|
AS_GLOBAL,
|
|
|
|
'M', LEGACY_HK_NAME( "Move Item" ),
|
2019-05-04 13:02:05 +00:00
|
|
|
_( "Move" ), _( "Moves the selected item(s)" ), move_xpm, AF_ACTIVATE );
|
|
|
|
|
2019-05-10 17:19:48 +00:00
|
|
|
TOOL_ACTION EE_ACTIONS::drag( "eeschema.InteractiveEdit.drag",
|
2019-06-09 21:57:23 +00:00
|
|
|
AS_GLOBAL,
|
|
|
|
'G', LEGACY_HK_NAME( "Drag Item" ),
|
2019-05-04 13:02:05 +00:00
|
|
|
_( "Drag" ), _( "Drags the selected item(s)" ), move_xpm, AF_ACTIVATE );
|
|
|
|
|
2019-05-20 18:51:24 +00:00
|
|
|
TOOL_ACTION EE_ACTIONS::moveActivate( "eeschema.InteractiveMove",
|
2019-06-09 21:57:23 +00:00
|
|
|
AS_GLOBAL, 0, "",
|
2019-05-20 18:51:24 +00:00
|
|
|
_( "Move Activate" ), "", move_xpm, AF_ACTIVATE );
|
|
|
|
|
2019-05-04 13:02:05 +00:00
|
|
|
|
|
|
|
// For adding to or removing from selections
|
|
|
|
#define QUIET_MODE true
|
|
|
|
|
|
|
|
|
|
|
|
SCH_MOVE_TOOL::SCH_MOVE_TOOL() :
|
2019-05-12 11:49:58 +00:00
|
|
|
EE_TOOL_BASE<SCH_EDIT_FRAME>( "eeschema.InteractiveMove" ),
|
2019-05-04 13:02:05 +00:00
|
|
|
m_moveInProgress( false ),
|
|
|
|
m_moveOffset( 0, 0 )
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
SCH_MOVE_TOOL::~SCH_MOVE_TOOL()
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
bool SCH_MOVE_TOOL::Init()
|
|
|
|
{
|
2019-05-12 11:49:58 +00:00
|
|
|
EE_TOOL_BASE::Init();
|
2019-05-04 13:02:05 +00:00
|
|
|
|
|
|
|
auto moveCondition = [] ( const SELECTION& aSel ) {
|
|
|
|
if( aSel.Empty() )
|
|
|
|
return false;
|
|
|
|
|
2019-05-05 14:16:29 +00:00
|
|
|
if( SCH_WIRE_BUS_TOOL::IsDrawingLineWireOrBus( aSel ) )
|
2019-05-04 13:02:05 +00:00
|
|
|
return false;
|
|
|
|
|
|
|
|
return true;
|
|
|
|
};
|
|
|
|
|
|
|
|
//
|
|
|
|
// Add move actions to the selection tool menu
|
|
|
|
//
|
|
|
|
CONDITIONAL_MENU& selToolMenu = m_selectionTool->GetToolMenu().GetMenu();
|
|
|
|
|
2019-05-10 17:19:48 +00:00
|
|
|
selToolMenu.AddItem( EE_ACTIONS::move, moveCondition, 150 );
|
|
|
|
selToolMenu.AddItem( EE_ACTIONS::drag, moveCondition, 150 );
|
2019-05-04 13:02:05 +00:00
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2019-05-20 18:51:24 +00:00
|
|
|
|
|
|
|
/* TODO - Tom/Jeff
|
|
|
|
- add preferences option "Move origin: always cursor / item origin"
|
|
|
|
- add preferences option "Default drag action: drag items / move"
|
|
|
|
- add preferences option "Drag always selects"
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
2019-05-04 13:02:05 +00:00
|
|
|
int SCH_MOVE_TOOL::Main( const TOOL_EVENT& aEvent )
|
|
|
|
{
|
|
|
|
const KICAD_T movableItems[] =
|
|
|
|
{
|
|
|
|
SCH_MARKER_T,
|
|
|
|
SCH_JUNCTION_T,
|
|
|
|
SCH_NO_CONNECT_T,
|
|
|
|
SCH_BUS_BUS_ENTRY_T,
|
|
|
|
SCH_BUS_WIRE_ENTRY_T,
|
|
|
|
SCH_LINE_T,
|
|
|
|
SCH_BITMAP_T,
|
|
|
|
SCH_TEXT_T,
|
|
|
|
SCH_LABEL_T,
|
|
|
|
SCH_GLOBAL_LABEL_T,
|
|
|
|
SCH_HIER_LABEL_T,
|
|
|
|
SCH_FIELD_T,
|
|
|
|
SCH_COMPONENT_T,
|
|
|
|
SCH_SHEET_PIN_T,
|
|
|
|
SCH_SHEET_T,
|
|
|
|
EOT
|
|
|
|
};
|
|
|
|
|
|
|
|
KIGFX::VIEW_CONTROLS* controls = getViewControls();
|
|
|
|
controls->SetSnapping( true );
|
|
|
|
VECTOR2I originalCursorPos = controls->GetCursorPosition();
|
|
|
|
|
2019-05-31 18:23:49 +00:00
|
|
|
m_anchorPos.reset();
|
|
|
|
|
|
|
|
if( aEvent.IsAction( &EE_ACTIONS::move ) )
|
|
|
|
m_isDragOperation = false;
|
|
|
|
else if( aEvent.IsAction( &EE_ACTIONS::drag ) )
|
|
|
|
m_isDragOperation = true;
|
|
|
|
else if( aEvent.IsAction( &EE_ACTIONS::moveActivate ) )
|
|
|
|
m_isDragOperation = !m_frame->GetDragActionIsMove();
|
|
|
|
else
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if( m_isDragOperation )
|
|
|
|
m_frame->SetToolID( ID_SCH_DRAG, wxCURSOR_DEFAULT, _( "Drag Items" ) );
|
|
|
|
else
|
|
|
|
m_frame->SetToolID( ID_SCH_MOVE, wxCURSOR_DEFAULT, _( "Move Items" ) );
|
|
|
|
|
|
|
|
if( m_moveInProgress )
|
|
|
|
{
|
|
|
|
if( !m_selectionTool->GetSelection().Front()->IsNew() )
|
|
|
|
{
|
|
|
|
// User must have switched from move to drag or vice-versa. Reset the selected
|
|
|
|
// items so we can start again with the current m_isDragOperation.
|
|
|
|
m_frame->RollbackSchematicFromUndo();
|
|
|
|
m_selectionTool->RemoveItemsFromSel( &m_dragAdditions, QUIET_MODE );
|
|
|
|
m_moveInProgress = false;
|
|
|
|
controls->SetAutoPan( false );
|
|
|
|
|
|
|
|
// And give it a kick so it doesn't have to wait for the first mouse movement to
|
|
|
|
// refresh.
|
|
|
|
m_toolMgr->RunAction( EE_ACTIONS::refreshPreview );
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
2019-05-20 15:42:49 +00:00
|
|
|
|
2019-05-04 13:02:05 +00:00
|
|
|
// Be sure that there is at least one item that we can move. If there's no selection try
|
|
|
|
// looking for the stuff under mouse cursor (i.e. Kicad old-style hover selection).
|
2019-06-08 21:48:22 +00:00
|
|
|
EE_SELECTION& selection = m_selectionTool->RequestSelection( movableItems );
|
|
|
|
bool unselect = selection.IsHover();
|
2019-05-04 13:02:05 +00:00
|
|
|
|
|
|
|
if( selection.Empty() )
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
Activate();
|
|
|
|
controls->ShowCursor( true );
|
|
|
|
|
|
|
|
bool restore_state = false;
|
|
|
|
bool chain_commands = false;
|
|
|
|
OPT_TOOL_EVENT evt = aEvent;
|
|
|
|
VECTOR2I prevPos;
|
|
|
|
|
2019-05-20 15:42:49 +00:00
|
|
|
m_cursor = controls->GetCursorPosition();
|
|
|
|
|
2019-05-04 13:02:05 +00:00
|
|
|
// Main loop: keep receiving events
|
|
|
|
do
|
|
|
|
{
|
|
|
|
controls->SetSnapping( !evt->Modifier( MD_ALT ) );
|
|
|
|
|
2019-05-31 19:19:35 +00:00
|
|
|
if( evt->IsAction( &EE_ACTIONS::moveActivate )
|
2019-05-20 18:51:24 +00:00
|
|
|
|| evt->IsAction( &EE_ACTIONS::move ) || evt->IsAction( &EE_ACTIONS::drag )
|
2019-05-04 13:02:05 +00:00
|
|
|
|| evt->IsMotion() || evt->IsDrag( BUT_LEFT )
|
2019-05-10 17:19:48 +00:00
|
|
|
|| evt->IsAction( &EE_ACTIONS::refreshPreview ) )
|
2019-05-04 13:02:05 +00:00
|
|
|
{
|
|
|
|
if( !m_moveInProgress ) // Prepare to start moving/dragging
|
|
|
|
{
|
2019-05-18 12:52:03 +00:00
|
|
|
bool appendUndo = selection.Front()->IsNew();
|
|
|
|
|
2019-05-04 13:02:05 +00:00
|
|
|
//------------------------------------------------------------------------
|
|
|
|
// Setup a drag or a move
|
|
|
|
//
|
|
|
|
for( SCH_ITEM* it = m_frame->GetScreen()->GetDrawItems(); it; it = it->Next() )
|
|
|
|
{
|
2019-05-31 20:52:07 +00:00
|
|
|
it->ClearFlags( STARTPOINT | ENDPOINT | SELECTEDNODE );
|
|
|
|
|
2019-05-04 13:02:05 +00:00
|
|
|
if( it->IsSelected() )
|
2019-05-31 20:52:07 +00:00
|
|
|
it->SetFlags( STARTPOINT | ENDPOINT );
|
2019-05-04 13:02:05 +00:00
|
|
|
}
|
|
|
|
|
2019-05-31 18:23:49 +00:00
|
|
|
if( m_isDragOperation )
|
2019-05-04 13:02:05 +00:00
|
|
|
{
|
2019-05-31 18:23:49 +00:00
|
|
|
// Add connections to the selection for a drag.
|
|
|
|
//
|
2019-05-04 13:02:05 +00:00
|
|
|
for( EDA_ITEM* item : selection )
|
|
|
|
{
|
|
|
|
if( static_cast<SCH_ITEM*>( item )->IsConnectable() )
|
|
|
|
{
|
|
|
|
std::vector<wxPoint> connections;
|
|
|
|
static_cast<SCH_ITEM*>( item )->GetConnectionPoints( connections );
|
|
|
|
|
|
|
|
for( wxPoint point : connections )
|
2019-05-18 12:52:03 +00:00
|
|
|
getConnectedDragItems( (SCH_ITEM*) item, point, m_dragAdditions );
|
2019-05-04 13:02:05 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-05-18 12:52:03 +00:00
|
|
|
m_selectionTool->AddItemsToSel( &m_dragAdditions, QUIET_MODE );
|
2019-05-04 13:02:05 +00:00
|
|
|
}
|
2019-05-31 18:23:49 +00:00
|
|
|
else
|
2019-05-04 13:02:05 +00:00
|
|
|
{
|
2019-05-31 18:23:49 +00:00
|
|
|
// Mark the edges of the block with dangling flags for a move.
|
|
|
|
//
|
2019-05-04 13:02:05 +00:00
|
|
|
std::vector<DANGLING_END_ITEM> internalPoints;
|
|
|
|
|
|
|
|
for( EDA_ITEM* item : selection )
|
|
|
|
static_cast<SCH_ITEM*>( item )->GetEndPoints( internalPoints );
|
|
|
|
|
|
|
|
for( EDA_ITEM* item : selection )
|
|
|
|
static_cast<SCH_ITEM*>( item )->UpdateDanglingState( internalPoints );
|
|
|
|
}
|
|
|
|
|
|
|
|
// Generic setup
|
|
|
|
//
|
|
|
|
for( EDA_ITEM* item : selection )
|
|
|
|
{
|
2019-05-07 19:06:46 +00:00
|
|
|
if( item->IsNew() )
|
2019-05-04 13:02:05 +00:00
|
|
|
{
|
2019-05-31 18:23:49 +00:00
|
|
|
if( ( item->GetFlags() & SELECTEDNODE ) != 0 && m_isDragOperation )
|
2019-05-07 19:06:46 +00:00
|
|
|
{
|
|
|
|
// Item was added in getConnectedDragItems
|
|
|
|
saveCopyInUndoList( (SCH_ITEM*) item, UR_NEW, appendUndo );
|
|
|
|
appendUndo = true;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// Item was added in a previous command (and saved to undo by
|
|
|
|
// that command)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if( item->GetParent() && item->GetParent()->IsSelected() )
|
|
|
|
{
|
|
|
|
// Item will be (or has been) saved to undo by parent
|
2019-05-04 13:02:05 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2019-05-04 17:17:56 +00:00
|
|
|
saveCopyInUndoList( (SCH_ITEM*) item, UR_CHANGED, appendUndo );
|
|
|
|
appendUndo = true;
|
2019-05-04 13:02:05 +00:00
|
|
|
}
|
|
|
|
|
2019-05-17 16:45:27 +00:00
|
|
|
SCH_ITEM* schItem = (SCH_ITEM*) item;
|
|
|
|
schItem->SetStoredPos( schItem->GetPosition() );
|
2019-05-04 13:02:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Set up the starting position and move/drag offset
|
|
|
|
//
|
|
|
|
m_cursor = controls->GetCursorPosition();
|
|
|
|
|
|
|
|
if( selection.HasReferencePoint() )
|
|
|
|
{
|
2019-05-31 18:23:49 +00:00
|
|
|
m_anchorPos = selection.GetReferencePoint();
|
|
|
|
|
2019-05-20 15:42:49 +00:00
|
|
|
if( m_frame->GetMoveWarpsCursor() )
|
|
|
|
{
|
2019-05-31 18:23:49 +00:00
|
|
|
getViewControls()->WarpCursor( *m_anchorPos );
|
|
|
|
m_cursor = *m_anchorPos;
|
2019-05-20 15:42:49 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-05-31 18:23:49 +00:00
|
|
|
if( m_anchorPos )
|
2019-05-20 15:42:49 +00:00
|
|
|
{
|
2019-05-31 18:23:49 +00:00
|
|
|
VECTOR2I delta = m_cursor - (*m_anchorPos);
|
2019-05-04 13:02:05 +00:00
|
|
|
|
|
|
|
// Drag items to the current cursor position
|
2019-05-06 15:30:29 +00:00
|
|
|
for( EDA_ITEM* item : selection )
|
2019-05-04 13:02:05 +00:00
|
|
|
{
|
|
|
|
// Don't double move pins, fields, etc.
|
|
|
|
if( item->GetParent() && item->GetParent()->IsSelected() )
|
|
|
|
continue;
|
|
|
|
|
2019-05-31 18:23:49 +00:00
|
|
|
moveItem( item, delta, m_isDragOperation );
|
2019-05-04 13:02:05 +00:00
|
|
|
updateView( item );
|
|
|
|
}
|
|
|
|
|
2019-05-31 18:23:49 +00:00
|
|
|
m_anchorPos = m_cursor;
|
2019-05-04 13:02:05 +00:00
|
|
|
}
|
|
|
|
else if( selection.Size() == 1 )
|
|
|
|
{
|
|
|
|
// Set the current cursor position to the first dragged item origin,
|
|
|
|
// so the movement vector can be computed later
|
|
|
|
updateModificationPoint( selection );
|
|
|
|
m_cursor = originalCursorPos;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
updateModificationPoint( selection );
|
|
|
|
}
|
|
|
|
|
|
|
|
controls->SetCursorPosition( m_cursor, false );
|
2019-05-08 18:56:03 +00:00
|
|
|
m_toolMgr->PostEvent( EVENTS::SelectedItemsModified );
|
2019-05-04 13:02:05 +00:00
|
|
|
|
|
|
|
prevPos = m_cursor;
|
|
|
|
controls->SetAutoPan( true );
|
|
|
|
m_moveInProgress = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
//------------------------------------------------------------------------
|
|
|
|
// Follow the mouse
|
|
|
|
//
|
|
|
|
m_cursor = controls->GetCursorPosition();
|
|
|
|
VECTOR2I delta( m_cursor - prevPos );
|
2019-05-31 18:23:49 +00:00
|
|
|
m_anchorPos = m_cursor;
|
2019-05-04 13:02:05 +00:00
|
|
|
|
|
|
|
m_moveOffset += delta;
|
|
|
|
prevPos = m_cursor;
|
|
|
|
|
|
|
|
for( EDA_ITEM* item : selection )
|
|
|
|
{
|
|
|
|
// Don't double move pins, fields, etc.
|
|
|
|
if( item->GetParent() && item->GetParent()->IsSelected() )
|
|
|
|
continue;
|
|
|
|
|
2019-05-06 15:30:29 +00:00
|
|
|
moveItem( item, delta, m_frame->GetToolId() == ID_SCH_DRAG );
|
2019-05-04 13:02:05 +00:00
|
|
|
updateView( item );
|
|
|
|
}
|
|
|
|
|
2019-05-08 18:56:03 +00:00
|
|
|
m_toolMgr->PostEvent( EVENTS::SelectedItemsModified );
|
2019-05-04 13:02:05 +00:00
|
|
|
m_frame->UpdateMsgPanel();
|
|
|
|
}
|
|
|
|
//------------------------------------------------------------------------
|
|
|
|
// Handle cancel
|
|
|
|
//
|
|
|
|
else if( TOOL_EVT_UTILS::IsCancelInteractive( evt.get() ) )
|
|
|
|
{
|
|
|
|
if( m_moveInProgress )
|
|
|
|
restore_state = true;
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
//------------------------------------------------------------------------
|
|
|
|
// Handle TOOL_ACTION special cases
|
|
|
|
//
|
|
|
|
else if( evt->Action() == TA_UNDO_REDO_PRE )
|
|
|
|
{
|
|
|
|
unselect = true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
else if( evt->Category() == TC_COMMAND )
|
|
|
|
{
|
2019-05-10 17:19:48 +00:00
|
|
|
if( evt->IsAction( &EE_ACTIONS::doDelete ) )
|
2019-05-04 13:02:05 +00:00
|
|
|
{
|
|
|
|
// Exit on a remove operation; there is no further processing for removed items.
|
|
|
|
break;
|
|
|
|
}
|
2019-05-27 10:40:52 +00:00
|
|
|
else if( evt->IsAction( &ACTIONS::duplicate ) )
|
2019-05-04 13:02:05 +00:00
|
|
|
{
|
|
|
|
if( selection.Front()->IsNew() )
|
|
|
|
{
|
|
|
|
// This doesn't really make sense; we'll just end up dragging a stack of
|
|
|
|
// objects so Duplicate() is going to ignore this and we'll just carry on.
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Move original back and exit. The duplicate will run in its own loop.
|
|
|
|
restore_state = true;
|
|
|
|
unselect = false;
|
|
|
|
chain_commands = true;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
else if( evt->Action() == TA_CONTEXT_MENU_CHOICE )
|
|
|
|
{
|
|
|
|
if( evt->GetCommandId().get() >= ID_POPUP_SCH_SELECT_UNIT_CMP
|
|
|
|
&& evt->GetCommandId().get() <= ID_POPUP_SCH_SELECT_UNIT_CMP_MAX )
|
|
|
|
{
|
|
|
|
SCH_COMPONENT* component = dynamic_cast<SCH_COMPONENT*>( selection.Front() );
|
|
|
|
int unit = evt->GetCommandId().get() - ID_POPUP_SCH_SELECT_UNIT_CMP;
|
|
|
|
|
|
|
|
if( component )
|
|
|
|
{
|
|
|
|
m_frame->SelectUnit( component, unit );
|
2019-05-10 17:19:48 +00:00
|
|
|
m_toolMgr->RunAction( EE_ACTIONS::refreshPreview );
|
2019-05-04 13:02:05 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
//------------------------------------------------------------------------
|
|
|
|
// Handle context menu
|
|
|
|
//
|
|
|
|
else if( evt->IsClick( BUT_RIGHT ) )
|
|
|
|
{
|
2019-05-19 21:04:04 +00:00
|
|
|
m_menu.ShowContextMenu( m_selectionTool->GetSelection() );
|
2019-05-04 13:02:05 +00:00
|
|
|
}
|
|
|
|
//------------------------------------------------------------------------
|
|
|
|
// Handle drop
|
|
|
|
//
|
|
|
|
else if( evt->IsMouseUp( BUT_LEFT ) || evt->IsClick( BUT_LEFT ) )
|
|
|
|
{
|
|
|
|
break; // Finish
|
|
|
|
}
|
|
|
|
|
2019-05-31 17:45:43 +00:00
|
|
|
controls->SetAutoPan( m_moveInProgress );
|
|
|
|
|
2019-05-04 13:02:05 +00:00
|
|
|
} while( ( evt = Wait() ) ); //Should be assignment not equality test
|
|
|
|
|
|
|
|
controls->ForceCursorPosition( false );
|
|
|
|
controls->ShowCursor( false );
|
|
|
|
controls->SetSnapping( false );
|
|
|
|
controls->SetAutoPan( false );
|
|
|
|
|
|
|
|
if( !chain_commands )
|
|
|
|
m_moveOffset = { 0, 0 };
|
|
|
|
|
|
|
|
m_moveInProgress = false;
|
|
|
|
m_frame->SetNoToolSelected();
|
2019-05-31 18:23:49 +00:00
|
|
|
m_anchorPos.reset();
|
2019-05-04 13:02:05 +00:00
|
|
|
|
2019-05-16 21:27:03 +00:00
|
|
|
for( EDA_ITEM* item : selection )
|
2019-05-11 10:06:28 +00:00
|
|
|
item->ClearEditFlags();
|
2019-05-04 13:02:05 +00:00
|
|
|
|
|
|
|
if( restore_state )
|
|
|
|
{
|
|
|
|
m_frame->RollbackSchematicFromUndo();
|
2019-05-31 19:19:35 +00:00
|
|
|
|
2019-05-20 15:42:49 +00:00
|
|
|
if( unselect )
|
|
|
|
m_toolMgr->RunAction( EE_ACTIONS::clearSelection, true );
|
|
|
|
else
|
|
|
|
m_toolMgr->ProcessEvent( EVENTS::SelectedEvent );
|
2019-05-04 13:02:05 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2019-05-11 10:06:28 +00:00
|
|
|
addJunctionsIfNeeded( selection );
|
|
|
|
m_frame->SchematicCleanUp();
|
2019-05-04 13:02:05 +00:00
|
|
|
m_frame->TestDanglingEnds();
|
2019-05-16 21:27:03 +00:00
|
|
|
|
|
|
|
if( unselect )
|
|
|
|
m_toolMgr->RunAction( EE_ACTIONS::clearSelection, true );
|
|
|
|
else
|
2019-05-18 12:52:03 +00:00
|
|
|
m_selectionTool->RemoveItemsFromSel( &m_dragAdditions, QUIET_MODE );
|
2019-05-16 21:27:03 +00:00
|
|
|
|
2019-05-04 13:02:05 +00:00
|
|
|
m_frame->OnModify();
|
|
|
|
}
|
|
|
|
|
2019-05-18 12:52:03 +00:00
|
|
|
m_dragAdditions.clear();
|
|
|
|
|
2019-05-04 13:02:05 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2019-05-07 11:00:24 +00:00
|
|
|
void SCH_MOVE_TOOL::getConnectedDragItems( SCH_ITEM* aOriginalItem, wxPoint aPoint,
|
|
|
|
EDA_ITEMS& aList )
|
2019-05-04 13:02:05 +00:00
|
|
|
{
|
|
|
|
for( SCH_ITEM* test = m_frame->GetScreen()->GetDrawItems(); test; test = test->Next() )
|
|
|
|
{
|
2019-05-07 11:00:24 +00:00
|
|
|
if( test->IsSelected() || !test->IsConnectable() || !test->CanConnect( aOriginalItem ) )
|
2019-05-04 13:02:05 +00:00
|
|
|
continue;
|
|
|
|
|
|
|
|
switch( test->Type() )
|
|
|
|
{
|
|
|
|
case SCH_LINE_T:
|
|
|
|
{
|
2019-05-07 19:06:46 +00:00
|
|
|
// Select the connected end of wires/bus connections.
|
2019-05-07 11:00:24 +00:00
|
|
|
SCH_LINE* testLine = (SCH_LINE*) test;
|
2019-05-04 13:02:05 +00:00
|
|
|
|
2019-05-07 11:00:24 +00:00
|
|
|
if( testLine->GetStartPoint() == aPoint )
|
2019-05-04 13:02:05 +00:00
|
|
|
{
|
2019-05-07 11:00:24 +00:00
|
|
|
if( !( testLine->GetFlags() & SELECTEDNODE ) )
|
|
|
|
aList.push_back( testLine );
|
2019-05-04 13:02:05 +00:00
|
|
|
|
2019-05-07 11:00:24 +00:00
|
|
|
testLine->SetFlags( STARTPOINT | SELECTEDNODE );
|
2019-05-04 13:02:05 +00:00
|
|
|
}
|
2019-05-07 11:00:24 +00:00
|
|
|
else if( testLine->GetEndPoint() == aPoint )
|
2019-05-04 13:02:05 +00:00
|
|
|
{
|
2019-05-07 11:00:24 +00:00
|
|
|
if( !( testLine->GetFlags() & SELECTEDNODE ) )
|
|
|
|
aList.push_back( testLine );
|
2019-05-04 13:02:05 +00:00
|
|
|
|
2019-05-07 11:00:24 +00:00
|
|
|
testLine->SetFlags( ENDPOINT | SELECTEDNODE );
|
2019-05-04 13:02:05 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case SCH_SHEET_T:
|
|
|
|
// Dragging a sheet just because it's connected to something else feels a bit like
|
|
|
|
// the tail wagging the dog, but this could be moved down to the next case.
|
|
|
|
break;
|
|
|
|
|
|
|
|
case SCH_COMPONENT_T:
|
2019-05-07 11:00:24 +00:00
|
|
|
if( test->IsConnected( aPoint ) )
|
|
|
|
{
|
2019-05-31 20:52:07 +00:00
|
|
|
// Add a new wire between the component and the selected item so the selected
|
|
|
|
// item can be dragged.
|
|
|
|
SCH_LINE* newWire = new SCH_LINE( aPoint, LAYER_WIRE );
|
|
|
|
newWire->SetFlags( IS_NEW );
|
|
|
|
m_frame->AddToScreen( newWire, m_frame->GetScreen() );
|
|
|
|
|
|
|
|
newWire->SetFlags( SELECTEDNODE | STARTPOINT );
|
|
|
|
aList.push_back( newWire );
|
|
|
|
}
|
|
|
|
break;
|
2019-05-07 19:06:46 +00:00
|
|
|
|
2019-05-31 20:52:07 +00:00
|
|
|
case SCH_NO_CONNECT_T:
|
|
|
|
case SCH_JUNCTION_T:
|
|
|
|
// Select no-connects and junctions that are connected to items being moved.
|
|
|
|
if( test->IsConnected( aPoint ) )
|
|
|
|
aList.push_back( test );
|
2019-05-04 13:02:05 +00:00
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
case SCH_LABEL_T:
|
|
|
|
case SCH_GLOBAL_LABEL_T:
|
|
|
|
case SCH_HIER_LABEL_T:
|
|
|
|
case SCH_BUS_WIRE_ENTRY_T:
|
|
|
|
case SCH_BUS_BUS_ENTRY_T:
|
|
|
|
// Select labels and bus entries that are connected to a wire being moved.
|
2019-05-07 11:00:24 +00:00
|
|
|
if( aOriginalItem->Type() == SCH_LINE_T )
|
2019-05-04 13:02:05 +00:00
|
|
|
{
|
|
|
|
std::vector<wxPoint> connections;
|
|
|
|
test->GetConnectionPoints( connections );
|
|
|
|
|
|
|
|
for( wxPoint& point : connections )
|
|
|
|
{
|
2019-05-07 11:00:24 +00:00
|
|
|
if( aOriginalItem->HitTest( point ) )
|
2019-05-04 13:02:05 +00:00
|
|
|
aList.push_back( test );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
2019-05-07 11:00:24 +00:00
|
|
|
|
|
|
|
default:
|
|
|
|
break;
|
2019-05-04 13:02:05 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2019-06-08 21:48:22 +00:00
|
|
|
void SCH_MOVE_TOOL::addJunctionsIfNeeded( EE_SELECTION& aSelection )
|
2019-05-04 17:17:56 +00:00
|
|
|
{
|
|
|
|
std::vector< wxPoint > pts;
|
|
|
|
std::vector< wxPoint > connections;
|
|
|
|
|
|
|
|
m_frame->GetSchematicConnections( connections );
|
|
|
|
|
|
|
|
for( unsigned ii = 0; ii < aSelection.GetSize(); ii++ )
|
|
|
|
{
|
|
|
|
SCH_ITEM* item = static_cast<SCH_ITEM*>( aSelection.GetItem( ii ) );
|
|
|
|
std::vector< wxPoint > new_pts;
|
|
|
|
|
|
|
|
if( !item->IsConnectable() )
|
|
|
|
continue;
|
|
|
|
|
|
|
|
item->GetConnectionPoints( new_pts );
|
|
|
|
pts.insert( pts.end(), new_pts.begin(), new_pts.end() );
|
|
|
|
|
|
|
|
// If the item is a line, we also add any connection points from the rest of the schematic
|
|
|
|
// that terminate on the line after it is moved.
|
|
|
|
if( item->Type() == SCH_LINE_T )
|
|
|
|
{
|
|
|
|
SCH_LINE* line = (SCH_LINE*) item;
|
|
|
|
for( auto i : connections )
|
2019-05-31 18:23:49 +00:00
|
|
|
{
|
2019-05-04 17:17:56 +00:00
|
|
|
if( IsPointOnSegment( line->GetStartPoint(), line->GetEndPoint(), i ) )
|
|
|
|
pts.push_back( i );
|
2019-05-31 18:23:49 +00:00
|
|
|
}
|
2019-05-04 17:17:56 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// Clean up any wires that short non-wire connections in the list
|
|
|
|
for( auto point = new_pts.begin(); point != new_pts.end(); point++ )
|
|
|
|
{
|
|
|
|
for( auto second_point = point + 1; second_point != new_pts.end(); second_point++ )
|
2019-05-11 10:06:28 +00:00
|
|
|
m_frame->TrimWire( *point, *second_point );
|
2019-05-04 17:17:56 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// We always have some overlapping connection points. Drop duplicates here
|
|
|
|
std::sort( pts.begin(), pts.end(), []( const wxPoint& a, const wxPoint& b ) -> bool
|
|
|
|
{ return a.x < b.x || (a.x == b.x && a.y < b.y); } );
|
|
|
|
|
|
|
|
pts.erase( unique( pts.begin(), pts.end() ), pts.end() );
|
|
|
|
|
|
|
|
for( auto point : pts )
|
|
|
|
{
|
|
|
|
if( m_frame->GetScreen()->IsJunctionNeeded( point, true ) )
|
2019-05-12 17:03:17 +00:00
|
|
|
m_frame->AddJunction( point, true, false );
|
2019-05-04 17:17:56 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2019-05-06 15:30:29 +00:00
|
|
|
void SCH_MOVE_TOOL::moveItem( EDA_ITEM* aItem, VECTOR2I aDelta, bool isDrag )
|
2019-05-04 13:02:05 +00:00
|
|
|
{
|
|
|
|
switch( aItem->Type() )
|
|
|
|
{
|
|
|
|
case SCH_LINE_T:
|
|
|
|
if( aItem->GetFlags() & STARTPOINT )
|
|
|
|
static_cast<SCH_LINE*>( aItem )->MoveStart( (wxPoint) aDelta );
|
|
|
|
|
|
|
|
if( aItem->GetFlags() & ENDPOINT )
|
|
|
|
static_cast<SCH_LINE*>( aItem )->MoveEnd( (wxPoint) aDelta );
|
|
|
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
case SCH_PIN_T:
|
|
|
|
case SCH_FIELD_T:
|
2019-05-06 15:58:53 +00:00
|
|
|
{
|
|
|
|
SCH_COMPONENT* component = (SCH_COMPONENT*) aItem->GetParent();
|
|
|
|
TRANSFORM transform = component->GetTransform().InverseTransform();
|
|
|
|
wxPoint transformedDelta = transform.TransformCoordinate( (wxPoint) aDelta );
|
2019-05-04 13:02:05 +00:00
|
|
|
|
2019-05-06 15:58:53 +00:00
|
|
|
static_cast<SCH_ITEM*>( aItem )->Move( transformedDelta );
|
|
|
|
break;
|
|
|
|
}
|
2019-05-16 21:27:03 +00:00
|
|
|
case SCH_SHEET_PIN_T:
|
|
|
|
{
|
|
|
|
SCH_SHEET_PIN* pin = (SCH_SHEET_PIN*) aItem;
|
2019-05-17 16:45:27 +00:00
|
|
|
pin->SetStoredPos( pin->GetStoredPos() + (wxPoint) aDelta );
|
|
|
|
pin->ConstrainOnEdge( pin->GetStoredPos() );
|
2019-05-16 21:27:03 +00:00
|
|
|
break;
|
|
|
|
}
|
2019-05-04 13:02:05 +00:00
|
|
|
default:
|
2019-05-06 15:30:29 +00:00
|
|
|
static_cast<SCH_ITEM*>( aItem )->Move( (wxPoint) aDelta );
|
2019-05-04 13:02:05 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
aItem->SetFlags( IS_MOVED );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2019-06-08 21:48:22 +00:00
|
|
|
bool SCH_MOVE_TOOL::updateModificationPoint( EE_SELECTION& aSelection )
|
2019-05-04 13:02:05 +00:00
|
|
|
{
|
|
|
|
if( m_moveInProgress && aSelection.HasReferencePoint() )
|
|
|
|
return false;
|
|
|
|
|
|
|
|
// When there is only one item selected, the reference point is its position...
|
|
|
|
if( aSelection.Size() == 1 )
|
|
|
|
{
|
|
|
|
SCH_ITEM* item = static_cast<SCH_ITEM*>( aSelection.Front() );
|
|
|
|
|
|
|
|
// For some items, moving the cursor to anchor is not good (for instance large
|
|
|
|
// hierarchical sheets or components can have the anchor outside the view)
|
|
|
|
if( item->IsMovableFromAnchorPoint() )
|
|
|
|
{
|
2019-05-31 18:23:49 +00:00
|
|
|
m_anchorPos = item->GetPosition();
|
2019-05-04 13:02:05 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// ...otherwise modify items with regard to the grid-snapped cursor position
|
|
|
|
m_cursor = getViewControls()->GetCursorPosition( true );
|
2019-05-31 18:23:49 +00:00
|
|
|
m_anchorPos = m_cursor;
|
2019-05-04 13:02:05 +00:00
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
void SCH_MOVE_TOOL::setTransitions()
|
|
|
|
{
|
2019-05-15 11:02:30 +00:00
|
|
|
Go( &SCH_MOVE_TOOL::Main, EE_ACTIONS::moveActivate.MakeEvent() );
|
2019-05-10 17:19:48 +00:00
|
|
|
Go( &SCH_MOVE_TOOL::Main, EE_ACTIONS::move.MakeEvent() );
|
|
|
|
Go( &SCH_MOVE_TOOL::Main, EE_ACTIONS::drag.MakeEvent() );
|
2019-05-04 13:02:05 +00:00
|
|
|
}
|