f58fc0b952
This also removes the GROUP/UNGROUP-specific undo actions. This also fixes a bunch of undo bugs when duplicating group members, creating pins, etc. This also fixes some undo bugs when dividing wires etc. This also fixes some bugs with new sch items not being created within an entered group.
199 lines
5.3 KiB
C++
199 lines
5.3 KiB
C++
/*
|
|
* This program source code file is part of KiCad, a free EDA CAD application.
|
|
*
|
|
* Copyright 2016-2017 CERN
|
|
* Copyright The KiCad Developers, see AUTHORS.txt for contributors.
|
|
*
|
|
* @author Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
|
|
* @author Maciej Suminski <maciej.suminski@cern.ch>
|
|
*
|
|
* 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 <core/kicad_algo.h>
|
|
#include <commit.h>
|
|
#include <eda_item.h>
|
|
#include <eda_group.h>
|
|
#include <macros.h>
|
|
|
|
COMMIT::COMMIT()
|
|
{
|
|
}
|
|
|
|
|
|
COMMIT::~COMMIT()
|
|
{
|
|
for( COMMIT_LINE& ent : m_changes )
|
|
delete ent.m_copy;
|
|
}
|
|
|
|
|
|
COMMIT& COMMIT::Stage( EDA_ITEM* aItem, CHANGE_TYPE aChangeType, BASE_SCREEN* aScreen,
|
|
RECURSE_MODE aRecurse )
|
|
{
|
|
// CHT_MODIFY and CHT_DONE are not compatible
|
|
wxASSERT( ( aChangeType & ( CHT_MODIFY | CHT_DONE ) ) != ( CHT_MODIFY | CHT_DONE ) );
|
|
|
|
int flag = aChangeType & CHT_FLAGS;
|
|
|
|
switch( aChangeType & CHT_TYPE )
|
|
{
|
|
case CHT_ADD:
|
|
makeEntry( aItem, CHT_ADD | flag, nullptr, aScreen );
|
|
break;
|
|
|
|
case CHT_REMOVE:
|
|
wxASSERT( m_deletedItems.find( aItem ) == m_deletedItems.end() );
|
|
m_deletedItems.insert( aItem );
|
|
makeEntry( aItem, CHT_REMOVE | flag, makeImage( aItem ), aScreen );
|
|
|
|
if( EDA_GROUP* parentGroup = aItem->GetParentGroup() )
|
|
Modify( parentGroup->AsEdaItem(), aScreen );
|
|
|
|
break;
|
|
|
|
case CHT_MODIFY:
|
|
{
|
|
EDA_ITEM* parent = parentObject( aItem );
|
|
createModified( parent, makeImage( parent ), flag, aScreen );
|
|
break;
|
|
}
|
|
|
|
default:
|
|
wxFAIL;
|
|
}
|
|
|
|
return *this;
|
|
}
|
|
|
|
|
|
COMMIT& COMMIT::Stage( std::vector<EDA_ITEM*> &container, CHANGE_TYPE aChangeType,
|
|
BASE_SCREEN *aScreen )
|
|
{
|
|
for( EDA_ITEM* item : container )
|
|
Stage( item, aChangeType, aScreen);
|
|
|
|
return *this;
|
|
}
|
|
|
|
|
|
COMMIT& COMMIT::Stage( const PICKED_ITEMS_LIST &aItems, UNDO_REDO aModFlag, BASE_SCREEN *aScreen )
|
|
{
|
|
for( unsigned int i = 0; i < aItems.GetCount(); i++ )
|
|
{
|
|
UNDO_REDO change_type = aItems.GetPickedItemStatus( i );
|
|
EDA_ITEM* item = aItems.GetPickedItem( i );
|
|
|
|
if( change_type == UNDO_REDO::UNSPECIFIED )
|
|
change_type = aModFlag;
|
|
|
|
if( EDA_ITEM* copy = aItems.GetPickedItemLink( i ) )
|
|
{
|
|
assert( change_type == UNDO_REDO::CHANGED );
|
|
|
|
// There was already a copy created, so use it
|
|
Modified( item, copy, aScreen );
|
|
}
|
|
else
|
|
{
|
|
Stage( item, convert( change_type ), aScreen );
|
|
}
|
|
}
|
|
|
|
return *this;
|
|
}
|
|
|
|
|
|
int COMMIT::GetStatus( EDA_ITEM* aItem, BASE_SCREEN *aScreen )
|
|
{
|
|
COMMIT_LINE* entry = findEntry( parentObject( aItem ), aScreen );
|
|
|
|
return entry ? entry->m_type : 0;
|
|
}
|
|
|
|
|
|
COMMIT& COMMIT::createModified( EDA_ITEM* aItem, EDA_ITEM* aCopy, int aExtraFlags,
|
|
BASE_SCREEN* aScreen )
|
|
{
|
|
EDA_ITEM* parent = parentObject( aItem );
|
|
|
|
if( m_changedItems.find( parent ) != m_changedItems.end() )
|
|
{
|
|
delete aCopy;
|
|
return *this; // item has been already modified once
|
|
}
|
|
|
|
makeEntry( parent, CHT_MODIFY | aExtraFlags, aCopy, aScreen );
|
|
|
|
return *this;
|
|
}
|
|
|
|
|
|
void COMMIT::makeEntry( EDA_ITEM* aItem, CHANGE_TYPE aType, EDA_ITEM* aCopy, BASE_SCREEN *aScreen )
|
|
{
|
|
COMMIT_LINE ent;
|
|
|
|
ent.m_item = aItem;
|
|
ent.m_type = aType;
|
|
ent.m_copy = aCopy;
|
|
ent.m_screen = aScreen;
|
|
|
|
// N.B. Do not throw an assertion for multiple changed items. An item can be changed
|
|
// multiple times in a single commit such as when importing graphics and grouping them.
|
|
|
|
m_changedItems.insert( aItem );
|
|
m_changes.push_back( ent );
|
|
}
|
|
|
|
|
|
COMMIT::COMMIT_LINE* COMMIT::findEntry( EDA_ITEM* aItem, BASE_SCREEN *aScreen )
|
|
{
|
|
for( COMMIT_LINE& change : m_changes )
|
|
{
|
|
if( change.m_item == aItem && change.m_screen == aScreen )
|
|
return &change;
|
|
}
|
|
|
|
return nullptr;
|
|
}
|
|
|
|
|
|
CHANGE_TYPE COMMIT::convert( UNDO_REDO aType ) const
|
|
{
|
|
switch( aType )
|
|
{
|
|
case UNDO_REDO::NEWITEM: return CHT_ADD;
|
|
case UNDO_REDO::DELETED: return CHT_REMOVE;
|
|
case UNDO_REDO::CHANGED: return CHT_MODIFY;
|
|
default: wxASSERT( false ); return CHT_MODIFY;
|
|
}
|
|
}
|
|
|
|
|
|
UNDO_REDO COMMIT::convert( CHANGE_TYPE aType ) const
|
|
{
|
|
switch( aType )
|
|
{
|
|
case CHT_ADD: return UNDO_REDO::NEWITEM;
|
|
case CHT_REMOVE: return UNDO_REDO::DELETED;
|
|
case CHT_MODIFY: return UNDO_REDO::CHANGED;
|
|
default: wxASSERT( false ); return UNDO_REDO::CHANGED;
|
|
}
|
|
}
|
|
|