2019-05-04 13:02:05 +00:00
|
|
|
/*
|
|
|
|
* This program source code file is part of KiCad, a free EDA CAD application.
|
|
|
|
*
|
2019-08-14 08:28:07 +00:00
|
|
|
* Copyright (C) 2019 CERN
|
2019-05-04 13:02:05 +00:00
|
|
|
* 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>
|
2020-09-09 17:08:24 +00:00
|
|
|
#include <tools/ee_grid_helper.h>
|
2019-05-10 17:19:48 +00:00
|
|
|
#include <tools/ee_selection_tool.h>
|
2019-06-16 13:42:40 +00:00
|
|
|
#include <tools/sch_line_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>
|
2020-10-14 01:06:53 +00:00
|
|
|
#include <eda_item.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_line.h>
|
|
|
|
#include <sch_edit_frame.h>
|
|
|
|
#include <eeschema_id.h>
|
2020-04-12 23:09:17 +00:00
|
|
|
#include <pgm_base.h>
|
|
|
|
#include <settings/settings_manager.h>
|
2019-05-04 13:02:05 +00:00
|
|
|
#include "sch_move_tool.h"
|
|
|
|
|
|
|
|
|
|
|
|
// 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 ),
|
2019-07-18 01:21:36 +00:00
|
|
|
m_isDragOperation( false ),
|
2019-05-04 13:02:05 +00:00
|
|
|
m_moveOffset( 0, 0 )
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
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
|
|
|
|
2020-12-27 12:36:11 +00:00
|
|
|
auto moveCondition =
|
|
|
|
[]( const SELECTION& aSel )
|
|
|
|
{
|
|
|
|
if( aSel.Empty() )
|
|
|
|
return false;
|
2019-05-04 13:02:05 +00:00
|
|
|
|
2020-12-27 12:36:11 +00:00
|
|
|
if( SCH_LINE_WIRE_BUS_TOOL::IsDrawingLineWireOrBus( aSel ) )
|
|
|
|
return false;
|
2019-05-04 13:02:05 +00:00
|
|
|
|
2020-12-27 12:36:11 +00:00
|
|
|
return true;
|
|
|
|
};
|
2019-05-04 13:02:05 +00:00
|
|
|
|
|
|
|
// 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 );
|
2020-09-17 19:26:54 +00:00
|
|
|
selToolMenu.AddItem( EE_ACTIONS::alignToGrid, moveCondition, 150 );
|
2019-05-04 13:02:05 +00:00
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2020-09-17 19:26:54 +00:00
|
|
|
static 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
|
|
|
|
};
|
|
|
|
|
|
|
|
|
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 )
|
|
|
|
{
|
2020-12-02 23:17:56 +00:00
|
|
|
EESCHEMA_SETTINGS* cfg = Pgm().GetSettingsManager().GetAppSettings<EESCHEMA_SETTINGS>();
|
2019-05-04 13:02:05 +00:00
|
|
|
KIGFX::VIEW_CONTROLS* controls = getViewControls();
|
2020-12-02 23:17:56 +00:00
|
|
|
EE_GRID_HELPER grid( m_toolMgr );
|
2019-05-04 13:02:05 +00:00
|
|
|
|
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 ) )
|
2020-04-12 23:09:17 +00:00
|
|
|
m_isDragOperation = !cfg->m_Input.drag_is_move;
|
2019-05-31 18:23:49 +00:00
|
|
|
else
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if( m_moveInProgress )
|
|
|
|
{
|
2019-07-18 01:21:36 +00:00
|
|
|
auto sel = m_selectionTool->GetSelection().Front();
|
|
|
|
|
|
|
|
if( sel && !sel->IsNew() )
|
2019-05-31 18:23:49 +00:00
|
|
|
{
|
|
|
|
// 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 );
|
2019-06-11 14:17:24 +00:00
|
|
|
m_anchorPos = m_cursor - m_moveOffset;
|
2019-05-31 18:23:49 +00:00
|
|
|
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.
|
2019-06-11 14:17:24 +00:00
|
|
|
m_toolMgr->RunAction( EE_ACTIONS::restartMove );
|
2019-05-31 18:23:49 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
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
|
|
|
|
2019-10-19 03:15:29 +00:00
|
|
|
// Keep an original copy of the starting points for cleanup after the move
|
|
|
|
std::vector<DANGLING_END_ITEM> internalPoints;
|
|
|
|
|
2019-05-04 13:02:05 +00:00
|
|
|
Activate();
|
|
|
|
controls->ShowCursor( true );
|
|
|
|
|
2020-10-18 10:29:08 +00:00
|
|
|
std::string tool = aEvent.GetCommandStr().get();
|
|
|
|
m_frame->PushTool( tool );
|
|
|
|
|
|
|
|
if( selection.Empty() )
|
|
|
|
{
|
|
|
|
// Note that it's important to go through push/pop even when the selection is empty.
|
|
|
|
// This keeps other tools from having to special-case an empty move.
|
|
|
|
m_frame->PopTool( tool );
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2019-06-17 13:43:22 +00:00
|
|
|
bool restore_state = false;
|
|
|
|
bool chain_commands = false;
|
|
|
|
TOOL_EVENT* evt = const_cast<TOOL_EVENT*>( &aEvent );
|
|
|
|
VECTOR2I prevPos;
|
2020-12-03 15:10:23 +00:00
|
|
|
int snapLayer = UNDEFINED_LAYER;
|
2019-05-04 13:02:05 +00:00
|
|
|
|
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
|
|
|
|
{
|
2020-10-08 00:50:28 +00:00
|
|
|
m_frame->GetCanvas()->SetCurrentCursor( KICURSOR::MOVING );
|
2020-12-02 23:17:56 +00:00
|
|
|
grid.SetSnap( !evt->Modifier( MD_SHIFT ) );
|
|
|
|
grid.SetUseGrid( !evt->Modifier( MD_ALT ) );
|
|
|
|
|
|
|
|
if( evt->IsAction( &EE_ACTIONS::moveActivate )
|
|
|
|
|| evt->IsAction( &EE_ACTIONS::restartMove )
|
|
|
|
|| evt->IsAction( &EE_ACTIONS::move )
|
|
|
|
|| evt->IsAction( &EE_ACTIONS::drag )
|
|
|
|
|| evt->IsMotion()
|
|
|
|
|| evt->IsDrag( BUT_LEFT )
|
2019-07-04 20:56:21 +00:00
|
|
|
|| evt->IsAction( &ACTIONS::refreshPreview ) )
|
2019-05-04 13:02:05 +00:00
|
|
|
{
|
|
|
|
if( !m_moveInProgress ) // Prepare to start moving/dragging
|
|
|
|
{
|
2019-06-11 20:17:05 +00:00
|
|
|
SCH_ITEM* sch_item = (SCH_ITEM*) selection.Front();
|
2019-07-18 01:21:36 +00:00
|
|
|
bool appendUndo = sch_item && sch_item->IsNew();
|
2020-01-10 17:22:23 +00:00
|
|
|
bool placingNewItems = sch_item && sch_item->IsNew();
|
2019-05-18 12:52:03 +00:00
|
|
|
|
2019-05-04 13:02:05 +00:00
|
|
|
//------------------------------------------------------------------------
|
|
|
|
// Setup a drag or a move
|
|
|
|
//
|
2019-08-31 19:20:44 +00:00
|
|
|
m_dragAdditions.clear();
|
2020-05-06 10:53:56 +00:00
|
|
|
m_specialCaseLabels.clear();
|
2019-10-19 03:15:29 +00:00
|
|
|
internalPoints.clear();
|
2019-08-31 19:20:44 +00:00
|
|
|
|
2020-10-12 09:32:51 +00:00
|
|
|
for( SCH_ITEM* it : m_frame->GetScreen()->Items() )
|
2019-05-04 13:02:05 +00:00
|
|
|
{
|
2019-06-25 23:39:58 +00:00
|
|
|
it->ClearFlags( TEMP_SELECTED );
|
2019-08-29 21:00:38 +00:00
|
|
|
|
2019-06-11 20:17:05 +00:00
|
|
|
if( !it->IsSelected() )
|
2019-08-29 21:00:38 +00:00
|
|
|
it->ClearFlags( STARTPOINT | ENDPOINT );
|
2019-06-13 18:57:11 +00:00
|
|
|
|
|
|
|
if( !selection.IsHover() && it->IsSelected() )
|
|
|
|
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.
|
|
|
|
//
|
2020-10-12 09:32:51 +00:00
|
|
|
for( EDA_ITEM* edaItem : selection )
|
2019-05-04 13:02:05 +00:00
|
|
|
{
|
2020-10-12 09:32:51 +00:00
|
|
|
SCH_ITEM* item = static_cast<SCH_ITEM*>( edaItem );
|
2020-09-11 16:31:38 +00:00
|
|
|
std::vector<wxPoint> connections;
|
2019-06-11 20:17:05 +00:00
|
|
|
|
2020-09-11 16:31:38 +00:00
|
|
|
if( item->Type() == SCH_LINE_T )
|
|
|
|
static_cast<SCH_LINE*>( item )->GetSelectedPoints( connections );
|
|
|
|
else
|
2020-10-12 09:32:51 +00:00
|
|
|
connections = item->GetConnectionPoints();
|
2019-05-04 13:02:05 +00:00
|
|
|
|
2020-09-11 16:31:38 +00:00
|
|
|
for( wxPoint point : connections )
|
2020-10-12 09:32:51 +00:00
|
|
|
getConnectedDragItems( 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
|
|
|
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 )
|
|
|
|
{
|
2020-12-03 15:10:23 +00:00
|
|
|
if( static_cast<SCH_ITEM*>( item )->IsConnectable() )
|
|
|
|
{
|
|
|
|
if( snapLayer == LAYER_GRAPHICS )
|
|
|
|
snapLayer = LAYER_ANY;
|
|
|
|
else
|
|
|
|
snapLayer = LAYER_CONNECTABLE;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if( snapLayer == LAYER_CONNECTABLE )
|
|
|
|
snapLayer = LAYER_ANY;
|
|
|
|
else
|
|
|
|
snapLayer = LAYER_GRAPHICS;
|
|
|
|
}
|
|
|
|
|
2019-05-07 19:06:46 +00:00
|
|
|
if( item->IsNew() )
|
2019-05-04 13:02:05 +00:00
|
|
|
{
|
2019-12-24 22:12:16 +00:00
|
|
|
if( item->HasFlag( TEMP_SELECTED ) && m_isDragOperation )
|
2019-05-07 19:06:46 +00:00
|
|
|
{
|
|
|
|
// Item was added in getConnectedDragItems
|
2020-08-26 18:04:32 +00:00
|
|
|
saveCopyInUndoList( (SCH_ITEM*) item, UNDO_REDO::NEWITEM, appendUndo );
|
2019-05-07 19:06:46 +00:00
|
|
|
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
|
|
|
|
{
|
2020-08-26 18:04:32 +00:00
|
|
|
saveCopyInUndoList( (SCH_ITEM*) item, UNDO_REDO::CHANGED, appendUndo );
|
2019-05-04 17:17:56 +00:00
|
|
|
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();
|
|
|
|
|
2019-06-11 14:17:24 +00:00
|
|
|
if( evt->IsAction( &EE_ACTIONS::restartMove ) )
|
|
|
|
{
|
|
|
|
wxASSERT_MSG( m_anchorPos, "Should be already set from previous cmd" );
|
|
|
|
}
|
2019-12-28 00:29:41 +00:00
|
|
|
else if( placingNewItems )
|
2019-05-04 13:02:05 +00:00
|
|
|
{
|
2019-05-31 18:23:49 +00:00
|
|
|
m_anchorPos = selection.GetReferencePoint();
|
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;
|
|
|
|
|
2020-04-19 16:04:14 +00:00
|
|
|
moveItem( item, delta );
|
2020-10-30 15:15:20 +00:00
|
|
|
updateItem( item, false );
|
2019-05-04 13:02:05 +00:00
|
|
|
}
|
|
|
|
|
2019-05-31 18:23:49 +00:00
|
|
|
m_anchorPos = m_cursor;
|
2019-05-04 13:02:05 +00:00
|
|
|
}
|
2019-06-11 14:17:24 +00:00
|
|
|
// 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)
|
2020-09-09 17:08:24 +00:00
|
|
|
else if( selection.Size() == 1 && !sch_item->IsMovableFromAnchorPoint() )
|
2019-05-04 13:02:05 +00:00
|
|
|
{
|
2020-09-09 17:08:24 +00:00
|
|
|
m_cursor = getViewControls()->GetCursorPosition( true );
|
|
|
|
m_anchorPos = m_cursor;
|
2019-05-04 13:02:05 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2020-09-18 00:16:08 +00:00
|
|
|
if( m_frame->GetMoveWarpsCursor() )
|
|
|
|
{
|
|
|
|
// User wants to warp the mouse
|
2020-12-03 15:10:23 +00:00
|
|
|
m_cursor = grid.BestDragOrigin( m_cursor, snapLayer, selection );
|
2020-09-18 00:16:08 +00:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// User does not want to warp the mouse
|
|
|
|
m_cursor = getViewControls()->GetCursorPosition( true );
|
|
|
|
}
|
2019-05-04 13:02:05 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
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
|
|
|
|
//
|
2020-12-02 23:17:56 +00:00
|
|
|
m_cursor = grid.BestSnapAnchor( controls->GetCursorPosition( false ),
|
2020-12-03 15:10:23 +00:00
|
|
|
snapLayer, selection );
|
2020-12-02 23:17:56 +00:00
|
|
|
|
2019-05-04 13:02:05 +00:00
|
|
|
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;
|
|
|
|
|
2020-04-19 16:04:14 +00:00
|
|
|
moveItem( item, delta );
|
2020-10-30 15:15:20 +00:00
|
|
|
updateItem( item, false );
|
2019-05-04 13:02:05 +00:00
|
|
|
}
|
|
|
|
|
2020-08-15 18:38:01 +00:00
|
|
|
m_toolMgr->PostEvent( EVENTS::SelectedItemsMoved );
|
2019-05-04 13:02:05 +00:00
|
|
|
}
|
|
|
|
//------------------------------------------------------------------------
|
|
|
|
// Handle cancel
|
|
|
|
//
|
2021-01-25 17:39:37 +00:00
|
|
|
else if( evt->IsCancelInteractive() || evt->IsActivate() )
|
2019-05-04 13:02:05 +00:00
|
|
|
{
|
2021-01-25 17:39:37 +00:00
|
|
|
if( m_moveInProgress && evt->IsCancelInteractive() )
|
2020-08-25 11:53:39 +00:00
|
|
|
evt->SetPassEvent( false );
|
2021-01-25 17:39:37 +00:00
|
|
|
|
|
|
|
if( m_moveInProgress )
|
2019-05-04 13:02:05 +00:00
|
|
|
restore_state = true;
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
//------------------------------------------------------------------------
|
|
|
|
// Handle TOOL_ACTION special cases
|
|
|
|
//
|
|
|
|
else if( evt->Action() == TA_UNDO_REDO_PRE )
|
|
|
|
{
|
|
|
|
unselect = true;
|
|
|
|
break;
|
|
|
|
}
|
2020-09-18 15:44:01 +00:00
|
|
|
else if( evt->IsAction( &ACTIONS::doDelete ) )
|
2019-05-04 13:02:05 +00:00
|
|
|
{
|
2020-09-18 15:44:01 +00:00
|
|
|
// Exit on a remove operation; there is no further processing for removed items.
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
else if( evt->IsAction( &ACTIONS::duplicate ) )
|
|
|
|
{
|
|
|
|
if( selection.Front()->IsNew() )
|
2019-05-04 13:02:05 +00:00
|
|
|
{
|
2020-09-18 15:44:01 +00:00
|
|
|
// 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;
|
2019-05-04 13:02:05 +00:00
|
|
|
}
|
|
|
|
|
2020-09-18 15:44:01 +00:00
|
|
|
// 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_CHOICE_MENU_CHOICE )
|
|
|
|
{
|
|
|
|
if( evt->GetCommandId().get() >= ID_POPUP_SCH_SELECT_UNIT_CMP
|
|
|
|
&& evt->GetCommandId().get() <= ID_POPUP_SCH_SELECT_UNIT_CMP_MAX )
|
2019-05-04 13:02:05 +00:00
|
|
|
{
|
2020-09-18 15:44:01 +00:00
|
|
|
SCH_COMPONENT* component = dynamic_cast<SCH_COMPONENT*>( selection.Front() );
|
|
|
|
int unit = evt->GetCommandId().get() - ID_POPUP_SCH_SELECT_UNIT_CMP;
|
2019-05-04 13:02:05 +00:00
|
|
|
|
2020-09-18 15:44:01 +00:00
|
|
|
if( component )
|
|
|
|
{
|
|
|
|
m_frame->SelectUnit( component, unit );
|
|
|
|
m_toolMgr->RunAction( 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
|
|
|
|
//
|
2020-12-14 22:03:17 +00:00
|
|
|
else if( evt->IsMouseUp( BUT_LEFT )
|
|
|
|
|| evt->IsClick( BUT_LEFT )
|
|
|
|
|| evt->IsDblClick( BUT_LEFT ) )
|
2019-05-04 13:02:05 +00:00
|
|
|
{
|
|
|
|
break; // Finish
|
|
|
|
}
|
2019-07-26 18:16:44 +00:00
|
|
|
else
|
|
|
|
evt->SetPassEvent();
|
2019-05-04 13:02:05 +00:00
|
|
|
|
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->SetAutoPan( false );
|
|
|
|
|
|
|
|
if( !chain_commands )
|
|
|
|
m_moveOffset = { 0, 0 };
|
|
|
|
|
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 )
|
|
|
|
{
|
2019-06-25 23:39:58 +00:00
|
|
|
m_selectionTool->RemoveItemsFromSel( &m_dragAdditions, QUIET_MODE );
|
2019-05-04 13:02:05 +00:00
|
|
|
m_frame->RollbackSchematicFromUndo();
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2020-10-30 15:15:20 +00:00
|
|
|
// One last update after exiting loop (for slower stuff, such as updating SCREEN's RTree).
|
2020-12-27 12:36:11 +00:00
|
|
|
for( EDA_ITEM* item : selection )
|
2020-10-30 15:15:20 +00:00
|
|
|
updateItem( item, true );
|
2019-06-25 23:39:58 +00:00
|
|
|
|
2020-12-27 13:16:16 +00:00
|
|
|
EE_SELECTION selectionCopy( selection );
|
|
|
|
m_selectionTool->RemoveItemsFromSel( &m_dragAdditions, QUIET_MODE );
|
|
|
|
|
2019-10-19 03:15:29 +00:00
|
|
|
// If we move items away from a junction, we _may_ want to add a junction there
|
|
|
|
// to denote the state.
|
2020-12-27 12:36:11 +00:00
|
|
|
for( const DANGLING_END_ITEM& it : internalPoints )
|
2019-10-19 03:15:29 +00:00
|
|
|
{
|
|
|
|
if( m_frame->GetScreen()->IsJunctionNeeded( it.GetPosition(), true ) )
|
2020-07-13 11:21:40 +00:00
|
|
|
m_frame->AddJunction( m_frame->GetScreen(), it.GetPosition(), true, false );
|
2019-10-19 03:15:29 +00:00
|
|
|
}
|
|
|
|
|
2020-12-27 13:16:16 +00:00
|
|
|
m_toolMgr->RunAction( EE_ACTIONS::addNeededJunctions, true, &selectionCopy );
|
2019-10-19 03:15:29 +00:00
|
|
|
|
2019-05-11 10:06:28 +00:00
|
|
|
m_frame->SchematicCleanUp();
|
2019-05-04 13:02:05 +00:00
|
|
|
m_frame->TestDanglingEnds();
|
2019-05-16 21:27:03 +00:00
|
|
|
|
2019-05-04 13:02:05 +00:00
|
|
|
m_frame->OnModify();
|
|
|
|
}
|
|
|
|
|
2019-08-29 21:00:38 +00:00
|
|
|
if( unselect )
|
|
|
|
m_toolMgr->RunAction( EE_ACTIONS::clearSelection, true );
|
|
|
|
else
|
2019-08-31 19:20:44 +00:00
|
|
|
m_selectionTool->RebuildSelection(); // Schematic cleanup might have merged lines, etc.
|
2019-08-29 21:00:38 +00:00
|
|
|
|
2019-05-18 12:52:03 +00:00
|
|
|
m_dragAdditions.clear();
|
2019-06-15 00:29:42 +00:00
|
|
|
m_moveInProgress = false;
|
2019-07-15 12:15:58 +00:00
|
|
|
m_frame->PopTool( tool );
|
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
|
|
|
{
|
2020-10-12 09:32:51 +00:00
|
|
|
EE_RTREE& items = m_frame->GetScreen()->Items();
|
|
|
|
EE_RTREE::EE_TYPE itemsOverlapping = items.Overlapping( aOriginalItem->GetBoundingBox() );
|
2020-10-13 12:52:15 +00:00
|
|
|
bool ptHasUnselectedJunction = false;
|
2020-10-12 09:32:51 +00:00
|
|
|
|
|
|
|
for( SCH_ITEM* item : itemsOverlapping )
|
|
|
|
{
|
2020-10-13 12:52:15 +00:00
|
|
|
if( item->Type() == SCH_JUNCTION_T && item->IsConnected( aPoint ) && !item->IsSelected() )
|
2020-10-12 09:32:51 +00:00
|
|
|
{
|
2020-10-13 12:52:15 +00:00
|
|
|
ptHasUnselectedJunction = true;
|
2020-10-12 09:32:51 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2020-09-11 16:31:38 +00:00
|
|
|
|
2020-10-12 09:32:51 +00:00
|
|
|
for( SCH_ITEM *test : itemsOverlapping )
|
2019-05-04 13:02:05 +00:00
|
|
|
{
|
2020-09-17 19:26:54 +00:00
|
|
|
if( test == aOriginalItem || test->IsSelected() || !test->CanConnect( aOriginalItem ) )
|
2019-05-04 13:02:05 +00:00
|
|
|
continue;
|
|
|
|
|
2019-11-17 18:55:27 +00:00
|
|
|
KICAD_T testType = test->Type();
|
|
|
|
|
|
|
|
switch( testType )
|
2019-05-04 13:02:05 +00:00
|
|
|
{
|
|
|
|
case SCH_LINE_T:
|
|
|
|
{
|
2020-10-13 12:52:15 +00:00
|
|
|
// Select the connected end of wires/bus connections that don't have an unselected
|
|
|
|
// junction isolating them from the drag
|
|
|
|
if( ptHasUnselectedJunction )
|
2020-10-12 09:32:51 +00:00
|
|
|
break;
|
|
|
|
|
2019-06-25 23:39:58 +00:00
|
|
|
SCH_LINE* testLine = static_cast<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-08-31 19:20:44 +00:00
|
|
|
if( !testLine->HasFlag( TEMP_SELECTED ) )
|
2019-05-07 11:00:24 +00:00
|
|
|
aList.push_back( testLine );
|
2019-05-04 13:02:05 +00:00
|
|
|
|
2019-08-31 19:20:44 +00:00
|
|
|
testLine->SetFlags( STARTPOINT | TEMP_SELECTED );
|
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-08-31 19:20:44 +00:00
|
|
|
if( !testLine->HasFlag( TEMP_SELECTED ) )
|
2019-05-07 11:00:24 +00:00
|
|
|
aList.push_back( testLine );
|
2019-05-04 13:02:05 +00:00
|
|
|
|
2019-08-31 19:20:44 +00:00
|
|
|
testLine->SetFlags( ENDPOINT | TEMP_SELECTED );
|
2019-05-04 13:02:05 +00:00
|
|
|
}
|
2020-05-06 19:35:46 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
break;
|
|
|
|
}
|
2020-05-06 10:53:56 +00:00
|
|
|
|
|
|
|
// Since only one end is going to move, the movement vector of any labels attached
|
|
|
|
// to it is scaled by the proportion of the line length the label is from the moving
|
|
|
|
// end.
|
2020-10-12 09:32:51 +00:00
|
|
|
for( SCH_ITEM* item : itemsOverlapping )
|
2020-05-06 10:53:56 +00:00
|
|
|
{
|
2020-10-12 09:32:51 +00:00
|
|
|
if( item->Type() == SCH_LABEL_T )
|
2020-05-06 10:53:56 +00:00
|
|
|
{
|
|
|
|
SCH_TEXT* label = static_cast<SCH_TEXT*>( item );
|
|
|
|
|
2020-10-12 09:32:51 +00:00
|
|
|
if( label->IsSelected() )
|
|
|
|
continue; // These will be moved on their own because they're selected
|
|
|
|
|
|
|
|
if( label->CanConnect( testLine )
|
|
|
|
&& testLine->HitTest( label->GetPosition(), 1 ) )
|
|
|
|
{
|
|
|
|
if( !label->HasFlag( TEMP_SELECTED ) )
|
|
|
|
aList.push_back( label );
|
2020-05-06 10:53:56 +00:00
|
|
|
|
2020-10-12 09:32:51 +00:00
|
|
|
SPECIAL_CASE_LABEL_INFO info;
|
|
|
|
info.attachedLine = testLine;
|
|
|
|
info.originalLabelPos = label->GetPosition();
|
|
|
|
m_specialCaseLabels[label] = info;
|
|
|
|
}
|
2020-05-06 10:53:56 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
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:
|
2020-10-12 09:32:51 +00:00
|
|
|
case SCH_JUNCTION_T:
|
2019-05-07 11:00:24 +00:00
|
|
|
if( test->IsConnected( aPoint ) )
|
|
|
|
{
|
2020-10-12 09:32:51 +00:00
|
|
|
// Add a new wire between the component or junction and the selected item so
|
|
|
|
// the selected item can be dragged.
|
2021-01-23 16:45:36 +00:00
|
|
|
SCH_LINE* newWire = nullptr;
|
|
|
|
|
|
|
|
if( test->GetLayer() == LAYER_BUS_JUNCTION )
|
|
|
|
newWire = new SCH_LINE( aPoint, LAYER_BUS );
|
|
|
|
else
|
|
|
|
newWire = new SCH_LINE( aPoint, LAYER_WIRE );
|
|
|
|
|
2019-05-31 20:52:07 +00:00
|
|
|
newWire->SetFlags( IS_NEW );
|
|
|
|
m_frame->AddToScreen( newWire, m_frame->GetScreen() );
|
|
|
|
|
2019-08-31 19:20:44 +00:00
|
|
|
newWire->SetFlags( TEMP_SELECTED | STARTPOINT );
|
2019-05-31 20:52:07 +00:00
|
|
|
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:
|
2020-10-12 09:32:51 +00:00
|
|
|
// Select no-connects that are connected to items being moved.
|
2019-08-31 19:20:44 +00:00
|
|
|
if( !test->HasFlag( TEMP_SELECTED ) && test->IsConnected( aPoint ) )
|
2019-08-29 21:00:38 +00:00
|
|
|
{
|
2019-05-31 20:52:07 +00:00
|
|
|
aList.push_back( test );
|
2019-08-31 19:20:44 +00:00
|
|
|
test->SetFlags( TEMP_SELECTED );
|
2019-08-29 21:00:38 +00:00
|
|
|
}
|
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:
|
2019-08-31 19:20:44 +00:00
|
|
|
// Performance optimization:
|
|
|
|
if( test->HasFlag( TEMP_SELECTED ) )
|
|
|
|
break;
|
|
|
|
|
2019-05-04 13:02:05 +00:00
|
|
|
// Select labels and bus entries that are connected to a wire being moved.
|
2019-08-31 19:20:44 +00:00
|
|
|
if( aOriginalItem->Type() == SCH_LINE_T )
|
2019-05-04 13:02:05 +00:00
|
|
|
{
|
2020-09-08 13:27:13 +00:00
|
|
|
std::vector<wxPoint> connections = test->GetConnectionPoints();
|
2019-05-04 13:02:05 +00:00
|
|
|
|
|
|
|
for( wxPoint& point : connections )
|
|
|
|
{
|
2020-04-19 16:04:14 +00:00
|
|
|
if( aOriginalItem->HitTest( point, 1 ) )
|
2019-08-29 21:00:38 +00:00
|
|
|
{
|
2019-08-31 19:20:44 +00:00
|
|
|
test->SetFlags( TEMP_SELECTED );
|
2019-05-04 13:02:05 +00:00
|
|
|
aList.push_back( test );
|
2019-11-17 18:55:27 +00:00
|
|
|
|
|
|
|
// A bus entry needs its wire & label as well
|
|
|
|
if( testType == SCH_BUS_WIRE_ENTRY_T || testType == SCH_BUS_BUS_ENTRY_T )
|
|
|
|
{
|
2020-09-08 13:27:13 +00:00
|
|
|
std::vector<wxPoint> ends = test->GetConnectionPoints();
|
2019-11-17 18:55:27 +00:00
|
|
|
wxPoint otherEnd;
|
|
|
|
|
|
|
|
if( ends[0] == point )
|
|
|
|
otherEnd = ends[1];
|
|
|
|
else
|
|
|
|
otherEnd = ends[0];
|
|
|
|
|
2020-09-17 19:26:54 +00:00
|
|
|
getConnectedDragItems( test, otherEnd, aList );
|
2019-11-17 18:55:27 +00:00
|
|
|
}
|
2019-08-29 21:00:38 +00:00
|
|
|
break;
|
|
|
|
}
|
2019-05-04 13:02:05 +00:00
|
|
|
}
|
|
|
|
}
|
2019-11-17 18:55:27 +00:00
|
|
|
|
2019-05-04 13:02:05 +00:00
|
|
|
break;
|
2019-05-07 11:00:24 +00:00
|
|
|
|
|
|
|
default:
|
|
|
|
break;
|
2019-05-04 13:02:05 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2020-04-19 16:04:14 +00:00
|
|
|
void SCH_MOVE_TOOL::moveItem( EDA_ITEM* aItem, const VECTOR2I& aDelta )
|
2019-05-04 13:02:05 +00:00
|
|
|
{
|
|
|
|
switch( aItem->Type() )
|
|
|
|
{
|
|
|
|
case SCH_LINE_T:
|
2020-04-19 16:04:14 +00:00
|
|
|
{
|
|
|
|
SCH_LINE* line = static_cast<SCH_LINE*>( aItem );
|
|
|
|
|
2019-08-27 12:12:34 +00:00
|
|
|
if( aItem->HasFlag( STARTPOINT ) )
|
2020-04-19 16:04:14 +00:00
|
|
|
line->MoveStart( (wxPoint) aDelta );
|
2019-05-04 13:02:05 +00:00
|
|
|
|
2019-08-27 12:12:34 +00:00
|
|
|
if( aItem->HasFlag( ENDPOINT ) )
|
2020-04-19 16:04:14 +00:00
|
|
|
line->MoveEnd( (wxPoint) aDelta );
|
2019-05-04 13:02:05 +00:00
|
|
|
|
2020-04-19 16:04:14 +00:00
|
|
|
}
|
2019-05-04 13:02:05 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case SCH_PIN_T:
|
|
|
|
case SCH_FIELD_T:
|
2019-05-06 15:58:53 +00:00
|
|
|
{
|
2020-03-06 20:02:58 +00:00
|
|
|
SCH_ITEM* parent = (SCH_ITEM*) aItem->GetParent();
|
|
|
|
wxPoint delta( aDelta );
|
2019-05-04 13:02:05 +00:00
|
|
|
|
2020-03-06 20:02:58 +00:00
|
|
|
if( parent && parent->Type() == SCH_COMPONENT_T )
|
|
|
|
{
|
|
|
|
SCH_COMPONENT* component = (SCH_COMPONENT*) aItem->GetParent();
|
|
|
|
TRANSFORM transform = component->GetTransform().InverseTransform();
|
|
|
|
|
|
|
|
delta = transform.TransformCoordinate( delta );
|
|
|
|
}
|
|
|
|
|
|
|
|
static_cast<SCH_ITEM*>( aItem )->Move( delta );
|
2019-10-01 14:31:25 +00:00
|
|
|
|
|
|
|
// If we're moving a field with respect to its parent then it's no longer auto-placed
|
2020-04-01 07:34:44 +00:00
|
|
|
if( aItem->Type() == SCH_FIELD_T && parent && !parent->IsSelected() )
|
2020-03-06 20:02:58 +00:00
|
|
|
parent->ClearFieldsAutoplaced();
|
2019-10-01 14:31:25 +00:00
|
|
|
|
2019-05-06 15:58:53 +00:00
|
|
|
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;
|
|
|
|
}
|
2020-05-06 10:53:56 +00:00
|
|
|
case SCH_LABEL_T:
|
|
|
|
{
|
|
|
|
SCH_TEXT* label = static_cast<SCH_TEXT*>( aItem );
|
|
|
|
|
|
|
|
if( m_specialCaseLabels.count( label ) )
|
2020-05-07 17:59:06 +00:00
|
|
|
{
|
|
|
|
SPECIAL_CASE_LABEL_INFO info = m_specialCaseLabels[ label ];
|
|
|
|
SEG currentLine( info.attachedLine->GetStartPoint(), info.attachedLine->GetEndPoint() );
|
|
|
|
label->SetPosition( (wxPoint) currentLine.NearestPoint( info.originalLabelPos ) );
|
|
|
|
}
|
2020-05-06 10:53:56 +00:00
|
|
|
else
|
2020-12-27 12:36:11 +00:00
|
|
|
{
|
2020-05-06 10:53:56 +00:00
|
|
|
label->Move( (wxPoint) aDelta );
|
2020-12-27 12:36:11 +00:00
|
|
|
}
|
2020-05-06 10:53:56 +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;
|
|
|
|
}
|
|
|
|
|
2019-08-29 22:55:25 +00:00
|
|
|
getView()->Hide( aItem, false );
|
2019-05-04 13:02:05 +00:00
|
|
|
aItem->SetFlags( IS_MOVED );
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2020-09-17 19:26:54 +00:00
|
|
|
int SCH_MOVE_TOOL::AlignElements( const TOOL_EVENT& aEvent )
|
|
|
|
{
|
|
|
|
EE_GRID_HELPER grid( m_toolMgr);
|
|
|
|
EE_SELECTION& selection = m_selectionTool->RequestSelection( movableItems );
|
|
|
|
bool append_undo = false;
|
|
|
|
|
2020-11-06 12:20:52 +00:00
|
|
|
for( SCH_ITEM* it : m_frame->GetScreen()->Items() )
|
|
|
|
{
|
|
|
|
if( !it->IsSelected() )
|
|
|
|
it->ClearFlags( STARTPOINT | ENDPOINT );
|
|
|
|
|
|
|
|
if( !selection.IsHover() && it->IsSelected() )
|
|
|
|
it->SetFlags( STARTPOINT | ENDPOINT );
|
|
|
|
|
|
|
|
it->SetStoredPos( it->GetPosition() );
|
|
|
|
|
|
|
|
if( it->Type() == SCH_SHEET_T )
|
|
|
|
{
|
|
|
|
for( SCH_SHEET_PIN* pin : static_cast<SCH_SHEET*>( it )->GetPins() )
|
|
|
|
pin->SetStoredPos( pin->GetPosition() );
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-09-17 19:26:54 +00:00
|
|
|
for( EDA_ITEM* item : selection )
|
|
|
|
{
|
|
|
|
if( item->Type() == SCH_LINE_T )
|
|
|
|
{
|
|
|
|
SCH_LINE* line = static_cast<SCH_LINE*>( item );
|
|
|
|
std::vector<int> flags{ STARTPOINT, ENDPOINT };
|
|
|
|
std::vector<wxPoint> pts{ line->GetStartPoint(), line->GetEndPoint() };
|
|
|
|
|
|
|
|
for( int ii = 0; ii < 2; ++ii )
|
|
|
|
{
|
|
|
|
EDA_ITEMS drag_items{ item };
|
|
|
|
line->ClearFlags();
|
|
|
|
line->SetFlags( flags[ii] );
|
|
|
|
getConnectedDragItems( line, pts[ii], drag_items );
|
|
|
|
std::set<EDA_ITEM*> unique_items( drag_items.begin(), drag_items.end() );
|
|
|
|
|
|
|
|
VECTOR2I gridpt = grid.AlignGrid( pts[ii] ) - pts[ii];
|
|
|
|
|
|
|
|
if( gridpt != VECTOR2I( 0, 0 ) )
|
|
|
|
{
|
2021-01-03 22:39:24 +00:00
|
|
|
for( EDA_ITEM* dragItem : unique_items )
|
2020-09-17 19:26:54 +00:00
|
|
|
{
|
2021-01-03 22:39:24 +00:00
|
|
|
if( dragItem->GetParent() && dragItem->GetParent()->IsSelected() )
|
2020-09-17 19:26:54 +00:00
|
|
|
continue;
|
|
|
|
|
2021-01-03 22:39:24 +00:00
|
|
|
saveCopyInUndoList( dragItem, UNDO_REDO::CHANGED, append_undo );
|
2020-09-17 19:26:54 +00:00
|
|
|
append_undo = true;
|
|
|
|
|
2021-01-03 22:39:24 +00:00
|
|
|
moveItem( dragItem, gridpt );
|
|
|
|
updateItem( dragItem, true );
|
2020-09-17 19:26:54 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2021-01-03 22:39:24 +00:00
|
|
|
else if( item->Type() == SCH_FIELD_T )
|
|
|
|
{
|
|
|
|
VECTOR2I gridpt = grid.AlignGrid( item->GetPosition() ) - item->GetPosition();
|
|
|
|
|
|
|
|
if( gridpt != VECTOR2I( 0, 0 ) )
|
|
|
|
{
|
|
|
|
saveCopyInUndoList( item, UNDO_REDO::CHANGED, append_undo );
|
|
|
|
append_undo = true;
|
|
|
|
|
|
|
|
moveItem( item, gridpt );
|
|
|
|
updateItem( item, true );
|
|
|
|
}
|
|
|
|
}
|
2020-09-17 19:26:54 +00:00
|
|
|
else
|
|
|
|
{
|
|
|
|
std::vector<wxPoint> connections;
|
|
|
|
EDA_ITEMS drag_items{ item };
|
|
|
|
connections = static_cast<SCH_ITEM*>( item )->GetConnectionPoints();
|
|
|
|
|
2020-11-06 12:20:52 +00:00
|
|
|
for( const wxPoint& point : connections )
|
2020-09-17 19:26:54 +00:00
|
|
|
getConnectedDragItems( static_cast<SCH_ITEM*>( item ), point, drag_items );
|
|
|
|
|
|
|
|
std::map<VECTOR2I, int> shifts;
|
|
|
|
VECTOR2I most_common( 0, 0 );
|
|
|
|
int max_count = 0;
|
|
|
|
|
2020-11-06 12:20:52 +00:00
|
|
|
for( const wxPoint& conn : connections )
|
2020-09-17 19:26:54 +00:00
|
|
|
{
|
|
|
|
VECTOR2I gridpt = grid.AlignGrid( conn ) - conn;
|
|
|
|
|
|
|
|
shifts[gridpt]++;
|
|
|
|
|
|
|
|
if( shifts[gridpt] > max_count )
|
|
|
|
{
|
|
|
|
most_common = gridpt;
|
|
|
|
max_count = shifts[most_common];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if( most_common != VECTOR2I( 0, 0 ) )
|
|
|
|
{
|
2021-01-03 22:39:24 +00:00
|
|
|
for( EDA_ITEM* dragItem : drag_items )
|
2020-09-17 19:26:54 +00:00
|
|
|
{
|
2021-01-03 22:39:24 +00:00
|
|
|
if( dragItem->GetParent() && dragItem->GetParent()->IsSelected() )
|
2020-09-17 19:26:54 +00:00
|
|
|
continue;
|
|
|
|
|
2021-01-03 22:39:24 +00:00
|
|
|
saveCopyInUndoList( dragItem, UNDO_REDO::CHANGED, append_undo );
|
2020-09-17 19:26:54 +00:00
|
|
|
append_undo = true;
|
|
|
|
|
2021-01-03 22:39:24 +00:00
|
|
|
moveItem( dragItem, most_common );
|
|
|
|
updateItem( dragItem, true );
|
2020-09-17 19:26:54 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
m_toolMgr->PostEvent( EVENTS::SelectedItemsMoved );
|
|
|
|
m_toolMgr->RunAction( EE_ACTIONS::addNeededJunctions, true, &selection );
|
|
|
|
|
|
|
|
m_frame->SchematicCleanUp();
|
|
|
|
m_frame->TestDanglingEnds();
|
|
|
|
|
|
|
|
m_frame->OnModify();
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2019-05-04 13:02:05 +00:00
|
|
|
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() );
|
2020-09-17 19:26:54 +00:00
|
|
|
Go( &SCH_MOVE_TOOL::AlignElements, EE_ACTIONS::alignToGrid.MakeEvent() );
|
2019-05-04 13:02:05 +00:00
|
|
|
}
|