haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EDIT_TOOL::DragArcTrack Fix incorrect undo history when items are deleted 

Need to make sure we only apply one COMMIT operation per object before calling COMMIT::Push() or COMMIT::Revert()
This commit is contained in:
Roberto Fernandez Bautista 2021-01-06 01:40:23 +00:00 committed by Jon Evans
parent 2b5c1bae97
commit 6e7ae93cc8
8 changed files with 46 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libs/kimath/include/geometry/seg.h
View File

@ -3,6 +3,7 @@
*
* Copyright (C) 2013 CERN
* @author Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
* Copyright (C) 2021 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

1
libs/kimath/include/geometry/shape_circle.h
View File

@ -3,6 +3,7 @@
*
* Copyright (C) 2013 CERN
* @author Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
* Copyright (C) 2021 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

2
libs/kimath/include/trigo.h
View File

@ -1,7 +1,7 @@
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2018-2020 KiCad Developers, see AUTHORS.txt for contributors.
* Copyright (C) 2018-2021 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

1
libs/kimath/src/geometry/seg.cpp
View File

@ -3,6 +3,7 @@
*
* Copyright (C) 2013 CERN
* @author Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
* Copyright (C) 2021 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

2
libs/kimath/src/trigo.cpp
View File

@ -2,7 +2,7 @@
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2014 Jean-Pierre Charras, jp.charras at wanadoo.fr
* Copyright (C) 2014-2019 KiCad Developers, see AUTHORS.txt for contributors.
* Copyright (C) 2014-2021 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

71
pcbnew/tools/edit_tool.cpp
View File

@ -4,7 +4,7 @@
* Copyright (C) 2013-2017 CERN
* @author Maciej Suminski <maciej.suminski@cern.ch>
* @author Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
* Copyright (C) 2017-2020 KiCad Developers, see AUTHORS.txt for contributors.
* Copyright (C) 2017-2021 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
@ -295,7 +295,6 @@ int EDIT_TOOL::DragArcTrack( const TOOL_EVENT& aEvent )
Activate();
ARC* theArc = static_cast<ARC*>( selection.Front() );
m_commit->Modify( theArc );
KIGFX::VIEW_CONTROLS* controls = getViewControls();
@ -329,7 +328,6 @@ int EDIT_TOOL::DragArcTrack( const TOOL_EVENT& aEvent )
if( itemsOnAnchor.size() == 1 && itemsOnAnchor.front()->Type() == PCB_TRACE_T )
{
retval = static_cast<TRACK*>( itemsOnAnchor.front() );
m_commit->Modify( retval );
}
else
{
@ -349,6 +347,11 @@ int EDIT_TOOL::DragArcTrack( const TOOL_EVENT& aEvent )
TRACK* trackOnStart = getUniqueConnectedTrack( theArc->GetStart() );
TRACK* trackOnEnd = getUniqueConnectedTrack( theArc->GetEnd() );
// Make copies of items to be edited
ARC* theArcCopy = new ARC( *theArc );
TRACK* trackOnStartCopy = new TRACK( *trackOnStart );
TRACK* trackOnEndCopy = new TRACK( *trackOnEnd );
if( !trackOnStart->IsNew() )
{
tanStart.A = trackOnStart->GetStart();
@ -518,46 +521,50 @@ int EDIT_TOOL::DragArcTrack( const TOOL_EVENT& aEvent )
}
}
// Remove zero length tracks
if( theArc->GetStart() == theArc->GetEnd() )
m_commit->Remove( theArc );
auto cleanupTrack =
[&]( TRACK* aTrack )
// Ensure we only do one commit operation on each object
auto processTrack =
[&]( TRACK* aTrack, TRACK* aTrackCopy )
{
if( aTrack->IsNew() )
{
if( aTrack->IsNew() )
{
getView()->Remove( aTrack );
getView()->Remove( aTrack );
if( aTrack->GetStart() == aTrack->GetEnd() )
delete aTrack;
else
m_commit->Add( aTrack );
}
else if( aTrack->GetStart() == aTrack->GetEnd() )
if( aTrack->GetStart() == aTrack->GetEnd() )
{
m_commit->Remove( aTrack );
delete aTrack;
delete aTrackCopy;
aTrack = nullptr;
aTrackCopy = nullptr;
}
};
else
{
m_commit->Add( aTrack );
delete aTrackCopy;
aTrackCopy = nullptr;
}
}
else if( aTrack->GetStart() == aTrack->GetEnd() )
{
aTrack->SwapData( aTrackCopy ); //restore the original before notifying COMMIT
m_commit->Remove( aTrack );
delete aTrackCopy;
aTrackCopy = nullptr;
}
else
{
m_commit->Modified( aTrack, aTrackCopy );
}
};
cleanupTrack( trackOnStart );
cleanupTrack( trackOnEnd );
processTrack( trackOnStart, trackOnStartCopy );
processTrack( trackOnEnd, trackOnEndCopy );
processTrack( theArc, theArcCopy );
// Should we commit?
if( restore_state )
{
m_commit->Revert();
if( trackOnStart->IsNew() )
delete trackOnStart;
if( trackOnEnd->IsNew() )
delete trackOnEnd;
}
else
{
m_commit->Push( _( "Drag Arc Track" ) );
}
return 0;
}

2
pcbnew/tools/edit_tool.h
View File

@ -2,7 +2,7 @@
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2013-2020 CERN
* Copyright (C) 2013-2020 KiCad Developers, see AUTHORS.txt for contributors.
* Copyright (C) 2013-2021 KiCad Developers, see AUTHORS.txt for contributors.
* @author Maciej Suminski <maciej.suminski@cern.ch>
* @author Tomasz Wlostowski <tomasz.wlostowski@cern.ch>
*

2
qa/libs/kimath/geometry/test_segment.cpp
View File

@ -3,7 +3,7 @@
*
* Copyright (C) 2017 CERN
* @author Alejandro García Montoro <alejandro.garciamontoro@gmail.com>
* Copyright (C) 2019 KiCad Developers, see CHANGELOG.TXT for contributors.
* Copyright (C) 2019-2021 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