Fix occurrences of "edition" which should be "editing"
Fixes: lp:1778168 * https://bugs.launchpad.net/kicad/+bug/1778168 (cherry picked from commit bcb1220)
This commit is contained in:
parent
d5e88f574f
commit
49ea6e1670
|
@ -125,7 +125,7 @@ private:
|
|||
// called when texts controls which handle the image resolution
|
||||
// lose the focus, to ensure the right values are displayed
|
||||
// because the m_imageDPI are clipped to acceptable values, and
|
||||
// the text displayed could be differ during text edition
|
||||
// the text displayed could be differ during text editing
|
||||
// We are using ChangeValue here to avoid generating a wxEVT_TEXT event.
|
||||
void UpdateDPITextValueX( wxMouseEvent& event )
|
||||
{
|
||||
|
|
|
@ -606,8 +606,8 @@ bool SCH_EDIT_FRAME::OnHotKey( wxDC* aDC, int aHotKey, const wxPoint& aPosition,
|
|||
|
||||
// Fall through
|
||||
case HK_EDIT:
|
||||
// Edit schematic item. Do not allow sheet edition when mowing
|
||||
// Because a sheet edition can be complex.
|
||||
// Edit schematic item. Do not allow sheet editing when mowing because sheet editing
|
||||
// can be complex.
|
||||
if( itemInEdit && screen->GetCurItem()->Type() == SCH_SHEET_T )
|
||||
break;
|
||||
|
||||
|
|
|
@ -263,12 +263,11 @@ LIB_EDIT_FRAME::LIB_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent ) :
|
|||
ReCreateVToolbar();
|
||||
|
||||
// Ensure the current alias name is valid if a part is loaded
|
||||
// Sometimes it is not valid. This is the case
|
||||
// when a part value (the part lib name), or the alias list was modified
|
||||
// during a previous session and the modifications not saved in lib.
|
||||
// Reopen libedit in a new session gives a non valid m_aliasName
|
||||
// because the curr part is reloaded from the library (and this is the unmodified part)
|
||||
// and the old alias name (from the previous edition) can be invalid
|
||||
// Sometimes it is not valid. This is the case when a part value (the part lib name), or
|
||||
// the alias list was modified during a previous session and the modifications not saved
|
||||
// in lib. Reopen libedit in a new session gives a non valid m_aliasName because the curr
|
||||
// part is reloaded from the library (and this is the unmodified part) and the old alias
|
||||
// name (from the previous session) can be invalid
|
||||
LIB_PART* part = GetCurPart();
|
||||
|
||||
if( part == NULL )
|
||||
|
@ -1450,8 +1449,7 @@ void LIB_EDIT_FRAME::deleteItem( wxDC* aDC, LIB_ITEM* aItem )
|
|||
|
||||
part->RemoveDrawItem( (LIB_ITEM*) pin, m_canvas, aDC );
|
||||
|
||||
// when pin edition is synchronized, all pins of the same body style
|
||||
// are removed:
|
||||
// when pin editing is synchronized, all pins of the same body style are removed:
|
||||
if( SynchronizePins() )
|
||||
{
|
||||
int curr_convert = pin->GetConvert();
|
||||
|
|
|
@ -78,10 +78,10 @@ class LIB_EDIT_FRAME : public SCH_BASE_FRAME
|
|||
* Set to true to not synchronize pins at the same position when editing
|
||||
* symbols with multiple units or multiple body styles.
|
||||
* Therefore deleting, moving pins are made for all pins at the same location
|
||||
* When units are interchangeable, synchronizing edition of pins is usually
|
||||
* When units are interchangeable, synchronizing editing of pins is usually
|
||||
* the best way, because if units are interchangeable, it imply all similar
|
||||
* pins are on the same location.
|
||||
* When units are non interchangeable, do not synchronize edition of pins, because
|
||||
* When units are non interchangeable, do not synchronize editing of pins, because
|
||||
* each part is specific, and there are no similar pins between units.
|
||||
*
|
||||
* Setting this to false allows editing each pin per part or body style
|
||||
|
@ -213,7 +213,7 @@ public:
|
|||
void Process_Config( wxCommandEvent& event );
|
||||
|
||||
/**
|
||||
* Pin edition (add, delete, move...) can be synchronized between units
|
||||
* Pin editing (add, delete, move...) can be synchronized between units
|
||||
* when units are interchangeable because in this case similar pins are expected
|
||||
* at the same location
|
||||
* @return true if the edit pins separately option is false and the current symbol
|
||||
|
|
|
@ -61,7 +61,7 @@ class LIB_FIELD : public LIB_ITEM, public EDA_TEXT
|
|||
int m_id; ///< @see enum NumFieldType
|
||||
wxString m_name; ///< Name (not the field text value itself, that is .m_Text)
|
||||
|
||||
wxString m_savedText; ///< Temporary storage for the string when edition.
|
||||
wxString m_savedText; ///< Temporary storage for the string when editing.
|
||||
bool m_rotate; ///< Flag to indicate a rotation occurred while editing.
|
||||
bool m_updateText; ///< Flag to indicate text change occurred while editing.
|
||||
|
||||
|
|
|
@ -349,7 +349,7 @@ public:
|
|||
* @param aEnable = true marks all common pins for editing mode. False
|
||||
* clears the editing mode.
|
||||
* @param aEditPinByPin == true enables the edit pin by pin mode.
|
||||
* aEditPinByPin == false enables the pin edition coupling between pins at the same location
|
||||
* aEditPinByPin == false enables the pin edit coupling between pins at the same location
|
||||
* if aEnable == false, aEditPinByPin is not used
|
||||
*/
|
||||
void EnableEditMode( bool aEnable, bool aEditPinByPin = false );
|
||||
|
@ -464,7 +464,7 @@ public:
|
|||
|
||||
/**
|
||||
* move this and all linked pins to the new position
|
||||
* used in pin edition.
|
||||
* used in pin editing.
|
||||
* use SetPinPosition to set the position of this only
|
||||
* @param aPosition is the new position of this and linked pins
|
||||
*/
|
||||
|
|
|
@ -43,7 +43,7 @@
|
|||
*/
|
||||
class LIB_TEXT : public LIB_ITEM, public EDA_TEXT
|
||||
{
|
||||
wxString m_savedText; ///< Temporary storage for the string when edition.
|
||||
wxString m_savedText; ///< Temporary storage for the string when editing.
|
||||
bool m_rotate; ///< Flag to indicate a rotation occurred while editing.
|
||||
bool m_updateText; ///< Flag to indicate text change occurred while editing.
|
||||
|
||||
|
|
|
@ -279,7 +279,6 @@ bool LIB_EDIT_FRAME::OnRightClick( const wxPoint& aPosition, wxMenu* PopMenu )
|
|||
return true;
|
||||
}
|
||||
|
||||
// Add menu items for pin edition
|
||||
void AddMenusForPin( wxMenu* PopMenu, LIB_PIN* Pin, LIB_EDIT_FRAME* frame )
|
||||
{
|
||||
bool selected = Pin->IsSelected();
|
||||
|
|
|
@ -84,8 +84,7 @@ bool SCH_EDIT_FRAME::OnRightClick( const wxPoint& aPosition, wxMenu* PopMenu )
|
|||
AddMenusForBlock( PopMenu, this );
|
||||
PopMenu->AppendSeparator();
|
||||
|
||||
// If we have a block containing only one main element
|
||||
// we append its edition submenu
|
||||
// If we have a block containing only one main element we append its edit submenu
|
||||
if( item != NULL )
|
||||
{
|
||||
switch( item->Type() )
|
||||
|
|
|
@ -433,7 +433,7 @@ void LIB_EDIT_FRAME::CreateImagePins( LIB_PIN* aPin )
|
|||
int ii;
|
||||
LIB_PIN* newPin;
|
||||
|
||||
// if "synchronize pins edition" option is off, do not create any similar pin for other
|
||||
// if "synchronize pins editing" option is off, do not create any similar pin for other
|
||||
// units and/or shapes: each unit is edited regardless other units or body
|
||||
if( !SynchronizePins() )
|
||||
return;
|
||||
|
@ -443,7 +443,7 @@ void LIB_EDIT_FRAME::CreateImagePins( LIB_PIN* aPin )
|
|||
|
||||
// When units are interchangeable, all units are expected to have similar pins
|
||||
// at the same position
|
||||
// to facilitate pin edition, create pins for all other units for the current body style
|
||||
// to facilitate pin editing, create pins for all other units for the current body style
|
||||
// at the same position as aPin
|
||||
|
||||
for( ii = 1; ii <= aPin->GetParent()->GetUnitCount(); ii++ )
|
||||
|
|
|
@ -1314,7 +1314,7 @@ private:
|
|||
void PutDataInPreviousState( PICKED_ITEMS_LIST* aList, bool aRedoCommand );
|
||||
|
||||
/**
|
||||
* Redo the last edition.
|
||||
* Redo the last edit.
|
||||
*
|
||||
* - Save the current schematic in Undo list
|
||||
* - Get an old version of the schematic from Redo list
|
||||
|
@ -1324,7 +1324,7 @@ private:
|
|||
void GetSchematicFromRedoList( wxCommandEvent& event );
|
||||
|
||||
/**
|
||||
* Perform an undo the last edition.
|
||||
* Perform an undo the last edit.
|
||||
*
|
||||
* - Save the current schematic in Redo list
|
||||
* - Get an old version of the schematic from Undo list
|
||||
|
|
|
@ -709,7 +709,7 @@ void SCH_SCREEN::ClearAnnotation( SCH_SHEET_PATH* aSheetPath )
|
|||
|
||||
// Clear the modified component flag set by component->ClearAnnotation
|
||||
// because we do not use it here and we should not leave this flag set,
|
||||
// when an edition is finished:
|
||||
// when an editing is finished:
|
||||
component->ClearFlags();
|
||||
}
|
||||
}
|
||||
|
|
|
@ -103,7 +103,7 @@
|
|||
|
||||
/* Used if undo / redo command:
|
||||
* swap data between Item and its copy, pointed by its picked item link member
|
||||
* swapped data is data modified by edition, so not all values are swapped
|
||||
* swapped data is data modified by editing, so not all values are swapped
|
||||
*/
|
||||
|
||||
void SCH_EDIT_FRAME::SaveCopyInUndoList( SCH_ITEM* aItem,
|
||||
|
|
|
@ -206,7 +206,7 @@ public:
|
|||
bool m_TextItalic[ LAYER_CLASS_COUNT ];
|
||||
bool m_TextUpright[ LAYER_CLASS_COUNT ];
|
||||
|
||||
// Variables used in footprint edition (default value in item/footprint creation)
|
||||
// Variables used in footprint editing (default value in item/footprint creation)
|
||||
|
||||
wxString m_RefDefaultText; ///< Default ref text on fp creation
|
||||
// if empty, use footprint name as default
|
||||
|
|
|
@ -156,7 +156,7 @@ public:
|
|||
* Swap data between aItem and aImage.
|
||||
* aItem and aImage should have the same type
|
||||
* Used in undo redo command to swap values between an item and its copy
|
||||
* Only values like layer, size .. which are modified by edition are swapped,
|
||||
* Only values like layer, size .. which are modified by editing are swapped,
|
||||
* not the pointers like
|
||||
* Pnext and Pback because aItem is not changed in the linked list
|
||||
* @param aImage = the item image which contains data to swap
|
||||
|
|
|
@ -266,7 +266,7 @@ public:
|
|||
|
||||
/**
|
||||
* Function SetSelected
|
||||
* Toggles on/off the selected flag (used in edition functions
|
||||
* Toggles on/off the selected flag (used in editing functions)
|
||||
* @param aState = the flag value
|
||||
*/
|
||||
void SetSelected( bool aState )
|
||||
|
|
|
@ -387,13 +387,13 @@ public:
|
|||
*/
|
||||
void SaveCopyInUndoList();
|
||||
|
||||
/** Redo the last edition:
|
||||
/** Redo the last edit:
|
||||
* - Place the current edited layout in undo list
|
||||
* - Get the previous version of the current edited layput
|
||||
*/
|
||||
void GetLayoutFromRedoList( wxCommandEvent& event );
|
||||
|
||||
/** Undo the last edition:
|
||||
/** Undo the last edit:
|
||||
* - Place the current layout in Redo list
|
||||
* - Get the previous version of the current edited layout
|
||||
*/
|
||||
|
|
|
@ -83,7 +83,7 @@ void PL_EDITOR_FRAME::SaveCopyInUndoList()
|
|||
}
|
||||
|
||||
|
||||
/* Redo the last edition:
|
||||
/* Redo the last edit:
|
||||
* - Place the current edited layout in undo list
|
||||
* - Get previous version of the current edited layput
|
||||
*/
|
||||
|
@ -115,7 +115,7 @@ void PL_EDITOR_FRAME::GetLayoutFromRedoList( wxCommandEvent& event )
|
|||
}
|
||||
|
||||
|
||||
/* Undo the last edition:
|
||||
/* Undo the last edit:
|
||||
* - Place the current layout in Redo list
|
||||
* - Get previous version of the current edited layout
|
||||
*/
|
||||
|
|
|
@ -913,7 +913,7 @@ public:
|
|||
/**
|
||||
* Function SynchronizeNetsAndNetClasses
|
||||
* copies NETCLASS info to each NET, based on NET membership in a NETCLASS.
|
||||
* Must be called after a Design Rules edition, or after reading a netlist (or editing
|
||||
* Must be called after a Design Rules edit, or after reading a netlist (or editing
|
||||
* the list of nets) Also this function removes the non existing nets in netclasses
|
||||
* and add net nets in default netclass (this happens after reading a netlist)
|
||||
*/
|
||||
|
@ -1262,7 +1262,7 @@ public:
|
|||
* integrated circuits from the pads connected to this track to the
|
||||
* die (if any) (can be NULL).
|
||||
* @param aReorder true for reorder the interesting segments (useful for
|
||||
* track edition/deletion) in this case the flag BUSY is
|
||||
* track editing/deleting) in this case the flag BUSY is
|
||||
* set (the user is responsible of flag clearing). False
|
||||
* for no reorder : useful when we want just calculate the
|
||||
* track length in this case, flags are reset
|
||||
|
|
|
@ -741,7 +741,7 @@ private:
|
|||
timestamp_t m_LastEditTime;
|
||||
int m_arflag; ///< Use to trace ratsnest and auto routing.
|
||||
double m_Surface; ///< Bounding box area
|
||||
timestamp_t m_Link; ///< Temporary logical link used in edition
|
||||
timestamp_t m_Link; ///< Temporary logical link used during editing
|
||||
int m_CntRot90; ///< Horizontal automatic placement cost ( 0..10 ).
|
||||
int m_CntRot180; ///< Vertical automatic placement cost ( 0..10 ).
|
||||
|
||||
|
|
|
@ -123,8 +123,7 @@ public:
|
|||
void ExportTo( DRAWSEGMENT* aTarget );
|
||||
|
||||
/** Export the PAD_CS_PRIMITIVE parameters to a EDGE_MODULE
|
||||
* useful to convert a primitive shape to a EDGE_MODULE shape for edition
|
||||
* in footprint editor
|
||||
* useful to convert a primitive shape to a EDGE_MODULE shape for editing in footprint editor
|
||||
* @param aTarget is the EDGE_MODULE to initialize
|
||||
*/
|
||||
void ExportTo( EDGE_MODULE* aTarget );
|
||||
|
|
|
@ -121,7 +121,7 @@ bool TEXTE_MODULE::TextHitTest( const EDA_RECT& aRect, bool aContains, int aAccu
|
|||
|
||||
void TEXTE_MODULE::Rotate( const wxPoint& aRotCentre, double aAngle )
|
||||
{
|
||||
// Used in footprint edition
|
||||
// Used in footprint editing
|
||||
// Note also in module editor, m_Pos0 = m_Pos
|
||||
|
||||
wxPoint pt = GetTextPos();
|
||||
|
|
|
@ -106,7 +106,7 @@ public:
|
|||
|
||||
bool IsParentFlipped() const;
|
||||
|
||||
/// Mirror text position in footprint edition
|
||||
/// Mirror text position in footprint editing
|
||||
/// the text itself is not mirrored, and the layer not modified,
|
||||
/// only position is mirrored.
|
||||
/// (use Flip to change layer to its paired and mirror the text in fp editor).
|
||||
|
|
|
@ -657,7 +657,7 @@ bool DIALOG_FOOTPRINT_BOARD_EDITOR::TransferDataFromWindow()
|
|||
|
||||
m_footprint->CalculateBoundingBox();
|
||||
|
||||
// This is a simple edition, we must create an undo entry
|
||||
// This is a simple edit, we must create an undo entry
|
||||
if( m_footprint->GetFlags() == 0 )
|
||||
commit.Push( _( "Modify module properties" ) );
|
||||
|
||||
|
|
|
@ -300,7 +300,7 @@ void PCB_EDIT_FRAME::Process_Special_Functions( wxCommandEvent& event )
|
|||
break;
|
||||
|
||||
case ID_DRC_CONTROL:
|
||||
// Shows the DRC dialog in non modal mode, to allows board edition
|
||||
// Shows the DRC dialog in non modal mode, to allows board editing
|
||||
// with the DRC dialog opened and showing errors.
|
||||
m_drc->ShowDRCDialog();
|
||||
break;
|
||||
|
|
|
@ -45,10 +45,8 @@ static void Move_Texte_Pcb( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint& aP
|
|||
static void Abort_Edit_Pcb_Text( EDA_DRAW_PANEL* Panel, wxDC* DC );
|
||||
|
||||
|
||||
static TEXTE_PCB s_TextCopy( (BOARD_ITEM*) NULL ); /* copy of the edited text
|
||||
* (used to undo/redo/abort
|
||||
* a complex edition command
|
||||
*/
|
||||
static TEXTE_PCB s_TextCopy( (BOARD_ITEM*) NULL ); // copy of the edited text used to
|
||||
// undo/redo/abort a complex edit command
|
||||
|
||||
|
||||
/*
|
||||
|
|
|
@ -51,7 +51,7 @@ static void DeleteNullTrackSegments( BOARD* pcb, DLIST<TRACK>& aTrackList );
|
|||
static void EnsureEndTrackOnPad( D_PAD* Pad );
|
||||
|
||||
// A PICKED_ITEMS_LIST to store tracks which are modified/added/deleted
|
||||
// during a track edition:
|
||||
// during a track editing:
|
||||
static PICKED_ITEMS_LIST s_ItemsListPicker;
|
||||
|
||||
|
||||
|
|
|
@ -228,7 +228,7 @@ void PCB_EDIT_FRAME::Files_io_from_id( int id )
|
|||
{
|
||||
wxString msg;
|
||||
|
||||
// If an edition is in progress, stop it.
|
||||
// If an edit is in progress, stop it.
|
||||
// For something else than save, get rid of current tool.
|
||||
if( id == ID_SAVE_BOARD )
|
||||
m_canvas->EndMouseCapture( -1, m_canvas->GetDefaultCursor() );
|
||||
|
|
|
@ -64,6 +64,7 @@
|
|||
#include <dialogs/panel_modedit_display_options.h>
|
||||
#include <dialog_configure_paths.h>
|
||||
|
||||
#include <tools/position_relative_tool.h>
|
||||
#include "tools/selection_tool.h"
|
||||
#include "tools/edit_tool.h"
|
||||
#include "tools/drawing_tool.h"
|
||||
|
|
|
@ -272,7 +272,6 @@ public:
|
|||
/// Return the current library nickname.
|
||||
const wxString GetCurrentLib() const;
|
||||
|
||||
// Footprint edition
|
||||
void RemoveStruct( EDA_ITEM* Item );
|
||||
|
||||
/**
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
* Therefore they are defined by \#define, used inside menu constructors
|
||||
*/
|
||||
|
||||
#define HELP_UNDO _( "Undo last edition" )
|
||||
#define HELP_UNDO _( "Undo last edit" )
|
||||
#define HELP_REDO _( "Redo the last undo command" )
|
||||
#define HELP_FIND _( "Find components and text in current loaded board" )
|
||||
|
||||
|
|
|
@ -433,7 +433,6 @@ bool PCB_EDIT_FRAME::OnHotKey( wxDC* aDC, int aHotkeyCode, const wxPoint& aPosit
|
|||
OnHotkeyEditItem( HK_EDIT_MODULE_WITH_MODEDIT );
|
||||
break;
|
||||
|
||||
// Footprint edition:
|
||||
case HK_LOCK_UNLOCK_FOOTPRINT: // toggle module "MODULE_is_LOCKED" status:
|
||||
// get any module, locked or not locked and toggle its locked status
|
||||
if( !itemCurrentlyEdited )
|
||||
|
|
|
@ -517,7 +517,7 @@ void PCB_EDIT_FRAME::createPopupMenuForTracks( TRACK* Track, wxMenu* PopMenu )
|
|||
_( "Place Node" ), KiBitmap( checked_ok_xpm ) );
|
||||
return;
|
||||
}
|
||||
else // Edition in progress
|
||||
else // Edit in progress
|
||||
{
|
||||
if( flags & IS_NEW )
|
||||
{
|
||||
|
|
|
@ -98,7 +98,7 @@ public:
|
|||
const wxPoint& aTransformPoint = wxPoint( 0, 0 ) ) override;
|
||||
/**
|
||||
* Function RestoreCopyFromRedoList
|
||||
* Redo the last edition:
|
||||
* Redo the last edit:
|
||||
* - Save the current board in Undo list
|
||||
* - Get an old version of the board from Redo list
|
||||
* @return none
|
||||
|
@ -107,7 +107,7 @@ public:
|
|||
|
||||
/**
|
||||
* Function RestoreCopyFromUndoList
|
||||
* Undo the last edition:
|
||||
* Undo the last edit:
|
||||
* - Save the current board in Redo list
|
||||
* - Get an old version of the board from Undo list
|
||||
* @return none
|
||||
|
|
|
@ -1278,7 +1278,7 @@ void PCB_EDIT_FRAME::InstallFootprintPropertiesDialog( MODULE* Module, wxDC* DC
|
|||
/* retvalue =
|
||||
* FP_PRM_EDITOR_RETVALUE::PRM_EDITOR_ABORT if abort,
|
||||
* FP_PRM_EDITOR_RETVALUE::PRM_EDITOR_WANT_EXCHANGE_FP if exchange module,
|
||||
* FP_PRM_EDITOR_RETVALUE::PRM_EDITOR_EDIT_OK for normal edition
|
||||
* FP_PRM_EDITOR_RETVALUE::PRM_EDITOR_EDIT_OK for normal edit
|
||||
* FP_PRM_EDITOR_RETVALUE::PRM_EDITOR_WANT_MODEDIT for a goto editor command
|
||||
*/
|
||||
|
||||
|
|
|
@ -1080,7 +1080,7 @@ public:
|
|||
void Start_Move_DrawItem( DRAWSEGMENT* drawitem, wxDC* DC );
|
||||
void Place_DrawItem( DRAWSEGMENT* drawitem, wxDC* DC );
|
||||
|
||||
// Footprint edition (see also PCB_BASE_FRAME)
|
||||
// Footprint editing (see also PCB_BASE_FRAME)
|
||||
void InstallFootprintPropertiesDialog( MODULE* Module, wxDC* DC );
|
||||
|
||||
/**
|
||||
|
|
|
@ -294,7 +294,7 @@ void PCB_EDIT_FRAME::Change_Side_Module( MODULE* Module, wxDC* DC )
|
|||
|
||||
OnModify();
|
||||
|
||||
if( !Module->IsMoving() ) /* This is a simple flip, no other edition in progress */
|
||||
if( !Module->IsMoving() ) // This is a simple flip, no other edit in progress
|
||||
{
|
||||
|
||||
if( DC )
|
||||
|
@ -439,10 +439,9 @@ void PCB_BASE_FRAME::Rotate_Module( wxDC* DC, MODULE* module, double angle, bool
|
|||
|
||||
OnModify();
|
||||
|
||||
if( !module->IsMoving() ) /* This is a simple rotation, no other
|
||||
* edition in progress */
|
||||
if( !module->IsMoving() ) // This is a simple rotation, no other edit in progress
|
||||
{
|
||||
if( DC ) // Erase footprint to screen
|
||||
if( DC ) // Erase footprint to screen
|
||||
{
|
||||
module->SetFlags( DO_NOT_DRAW );
|
||||
m_canvas->RefreshDrawingRect( module->GetBoundingBox() );
|
||||
|
|
|
@ -53,11 +53,8 @@ static void ShowTargetShapeWhileMovingMouse( EDA_DRAW_PANEL* aPanel,
|
|||
// Local variables :
|
||||
static int MireDefaultSize = Millimeter2iu( 5 );
|
||||
|
||||
static PCB_TARGET s_TargetCopy( NULL ); /* Used to store "old" values of the
|
||||
* current item parameters before
|
||||
* edition (used in undo/redo or
|
||||
* cancel operations)
|
||||
*/
|
||||
static PCB_TARGET s_TargetCopy( NULL ); // Used to store "old" values of the current item
|
||||
// parameters before editing for undo/redo/cancel
|
||||
|
||||
/**********************************/
|
||||
/* class DIALOG_TARGET_PROPERTIES */
|
||||
|
@ -131,7 +128,7 @@ bool DIALOG_TARGET_PROPERTIES::TransferDataFromWindow()
|
|||
// Save old item in undo list, if is is not currently edited (will be later if so)
|
||||
bool pushCommit = ( m_Target->GetFlags() == 0 );
|
||||
|
||||
if( m_Target->GetFlags() != 0 ) // other edition in progress (MOVE, NEW ..)
|
||||
if( m_Target->GetFlags() != 0 ) // other edit in progress (MOVE, NEW ..)
|
||||
m_Target->SetFlags( IN_EDIT ); // set flag in edit to force
|
||||
// undo/redo/abort proper operation
|
||||
|
||||
|
|
|
@ -102,7 +102,7 @@ void FOOTPRINT_EDIT_FRAME::ReCreateHToolbar()
|
|||
|
||||
KiScaledSeparator( m_mainToolBar, this );
|
||||
m_mainToolBar->AddTool( wxID_UNDO, wxEmptyString, KiScaledBitmap( undo_xpm, this ),
|
||||
_( "Undo last edition" ) );
|
||||
_( "Undo last edit" ) );
|
||||
m_mainToolBar->AddTool( wxID_REDO, wxEmptyString, KiScaledBitmap( redo_xpm, this ),
|
||||
_( "Redo last undo command" ) );
|
||||
|
||||
|
|
|
@ -28,18 +28,17 @@
|
|||
|
||||
|
||||
/* These functions are relative to undo redo function, when zones are involved.
|
||||
* When a zone outline is modified (or created) this zone, or others zones on the same layer
|
||||
* and with the same netcode can change or can be deleted
|
||||
* This is due to the fact overlapping zones are merged
|
||||
* Also, when a zone outline is modified by adding a cutout area,
|
||||
* this zone can be converted to more than one area, if the outline is break to 2 or more outlines
|
||||
* and therefore new zones are created
|
||||
*
|
||||
* Due to the complexity of potential changes, and the fact there are only few zones
|
||||
* in a board, and a zone has only few segments outlines, the more easy way to
|
||||
* undo redo changes is to make a copy of all zones that can be changed
|
||||
* and see after zone edition or creation what zones that are really modified,
|
||||
* and ones they are modified (changes, deletion or addition)
|
||||
* When a zone outline is modified (or created) this zone, or others zones on the same layer
|
||||
* and with the same netcode can change or can be deleted due to the fact overlapping zones are
|
||||
* merged. Also, when a zone outline is modified by adding a cutout area, this zone can be
|
||||
* converted to more than one area, if the outline is break to 2 or more outlines and therefore
|
||||
* new zones are created
|
||||
*
|
||||
* Due to the complexity of potential changes, and the fact there are only few zones in a board,
|
||||
* and a zone has only few segments outlines, the more easy way to undo redo changes is to make
|
||||
* a copy of all zones that can be changed and see after zone editing or creation what zones that
|
||||
* are really modified, and ones they are modified (changes, deletion or addition)
|
||||
*/
|
||||
|
||||
#include <fctsys.h>
|
||||
|
@ -127,7 +126,7 @@ bool ZONE_CONTAINER::IsSame( const ZONE_CONTAINER& aZoneToCompare )
|
|||
* creates a copy of zones having a given netcode on a given layer,
|
||||
* and fill a pick list with pickers to handle these copies
|
||||
* the UndoRedo status is set to UR_CHANGED for all items in list
|
||||
* Later, UpdateCopyOfZonesList will change and update these pickers after a zone edition
|
||||
* Later, UpdateCopyOfZonesList will change and update these pickers after a zone editing
|
||||
* @param aPickList = the pick list
|
||||
* @param aPcb = the Board
|
||||
* @param aNetCode = the reference netcode. if aNetCode < 0 all netcodes are used
|
||||
|
@ -165,10 +164,9 @@ int SaveCopyOfZones( PICKED_ITEMS_LIST& aPickList, BOARD* aPcb, int aNetCode, LA
|
|||
|
||||
/**
|
||||
* Function UpdateCopyOfZonesList
|
||||
* check a pick list to remove zones identical to their copies
|
||||
* and set the type of operation in picker (UR_DELETED, UR_CHANGED)
|
||||
* if an item is deleted, the initial values are retrievered,
|
||||
* because they can have changed in edition
|
||||
* Check a pick list to remove zones identical to their copies and set the type of operation in
|
||||
* picker (UR_DELETED, UR_CHANGED). If an item is deleted, the initial values are retrievered,
|
||||
* because they can have changed during editing.
|
||||
* @param aPickList = the main pick list
|
||||
* @param aAuxiliaryList = the list of deleted or added (new created) items after calculations
|
||||
* @param aPcb = the Board
|
||||
|
|
|
@ -28,19 +28,18 @@
|
|||
|
||||
|
||||
/* These functions are relative to undo redo function, when zones are involved.
|
||||
* When a zone outline is modified (or created) this zone, or others zones on the same layer
|
||||
* and with the same netcode can change or can be deleted
|
||||
* This is due to the fact overlapping zones are merged
|
||||
* Also, when a zone outline is modified by adding a cutout area,
|
||||
* this zone can be converted to more than one area, if the outline is break to 2 or more outlines
|
||||
* and therefore new zones are created
|
||||
*
|
||||
* Due to the complexity of potential changes, and the fact there are only few zones
|
||||
* in a board, and a zone has only few segments outlines, the more easy way to
|
||||
* undo redo changes is to make a copy of all zones that can be changed
|
||||
* and see after zone edition or creation what zones that are really modified,
|
||||
* and ones they are modified (changes, deletion or addition)
|
||||
*/
|
||||
* When a zone outline is modified (or created) this zone, or others zones on the same layer
|
||||
* and with the same netcode can change or can be deleted due to the fact overlapping zones are
|
||||
* merged. Also, when a zone outline is modified by adding a cutout area, this zone can be
|
||||
* converted to more than one area, if the outline is break to 2 or more outlines and therefore
|
||||
* new zones are created
|
||||
*
|
||||
* Due to the complexity of potential changes, and the fact there are only few zones in a board,
|
||||
* and a zone has only few segments outlines, the more easy way to undo redo changes is to make
|
||||
* a copy of all zones that can be changed and see after zone editing or creation what zones that
|
||||
* are really modified, and ones they are modified (changes, deletion or addition)
|
||||
*/
|
||||
|
||||
#ifndef ZONES_FUNCTIONS_TO_UNDO_REDO_H
|
||||
#define ZONES_FUNCTIONS_TO_UNDO_REDO_H
|
||||
|
|
Loading…
Reference in New Issue