Skip to content

K
kicad-source-mirror
Commit 3920946e authored by charras's avatar charras
Browse files
Options

fixed: in module editor: block copy hangs pcbnew

parent 739dbd6a
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 20 deletions
pcbnew/block_module_editor.cpp
View file @ 3920946e
...@@ -413,10 +413,10 @@ void CopyMarkedItems( MODULE* module, wxPoint offset ) ...@@ -413,10 +413,10 @@ void CopyMarkedItems( MODULE* module, wxPoint offset )
D_PAD* NewPad = new D_PAD( module ); D_PAD* NewPad = new D_PAD( module );
NewPad->Copy( pad ); NewPad->Copy( pad );
NewPad->m_Selected = IS_SELECTED; NewPad->m_Selected = IS_SELECTED;
module->m_Pads.PushBack( NewPad ); module->m_Pads.PushFront( NewPad );
} }
for( BOARD_ITEM* item = module->m_Drawings; item; item->Next() ) for( BOARD_ITEM* item = module->m_Drawings; item; item = item->Next() )
{ {
if( item->m_Selected == 0 ) if( item->m_Selected == 0 )
continue; continue;
...@@ -469,10 +469,8 @@ void MoveMarkedItems( MODULE* module, wxPoint offset ) ...@@ -469,10 +469,8 @@ void MoveMarkedItems( MODULE* module, wxPoint offset )
{ {
if( pad->m_Selected == 0 ) if( pad->m_Selected == 0 )
continue; continue;
pad->GetPosition().x += offset.x; pad->SetPosition( pad->GetPosition() + offset );
pad->GetPosition().y += offset.y; pad->m_Pos0 += offset;
pad->m_Pos0.x += offset.x;
pad->m_Pos0.y += offset.y;
} }
item = module->m_Drawings; item = module->m_Drawings;
...@@ -484,24 +482,16 @@ void MoveMarkedItems( MODULE* module, wxPoint offset ) ...@@ -484,24 +482,16 @@ void MoveMarkedItems( MODULE* module, wxPoint offset )
switch( item->Type() ) switch( item->Type() )
{ {
case TYPE_TEXTE_MODULE: case TYPE_TEXTE_MODULE:
( (TEXTE_MODULE*) item )->GetPosition().x += offset.x; ( (TEXTE_MODULE*) item )->m_Pos += offset;
( (TEXTE_MODULE*) item )->GetPosition().y += offset.y; ( (TEXTE_MODULE*) item )->m_Pos0 += offset;
( (TEXTE_MODULE*) item )->m_Pos0.x += offset.x;
( (TEXTE_MODULE*) item )->m_Pos0.y += offset.y;
break; break;
case TYPE_EDGE_MODULE: case TYPE_EDGE_MODULE:
( (EDGE_MODULE*) item )->m_Start.x += offset.x; ( (EDGE_MODULE*) item )->m_Start += offset;
( (EDGE_MODULE*) item )->m_Start.y += offset.y; ( (EDGE_MODULE*) item )->m_End += offset;
( (EDGE_MODULE*) item )->m_End.x += offset.x; ( (EDGE_MODULE*) item )->m_Start0 += offset;
( (EDGE_MODULE*) item )->m_End.y += offset.y; ( (EDGE_MODULE*) item )->m_End0 += offset;
( (EDGE_MODULE*) item )->m_Start0.x += offset.x;
( (EDGE_MODULE*) item )->m_Start0.y += offset.y;
( (EDGE_MODULE*) item )->m_End0.x += offset.x;
( (EDGE_MODULE*) item )->m_End0.y += offset.y;
break; break;
default: default:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment