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

eeschema: problem when undelete after a change a label type solved (I hope)

This commit is contained in:
CHARRAS 2008-02-21 15:50:35 +00:00
parent 1d16eae096
commit 61454f0124
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
change_log.txt
View File

@ -14,8 +14,7 @@ email address.
- reference not copied in component copy. - reference not copied in component copy.
- incorrect redo when changing the chip name in component edition - incorrect redo when changing the chip name in component edition
bugs not fixed bugs not fixed:
- undo/redo problems when changing a text type between text, label, global label and hierarchical label
- incorrect annotation in complex hierarchy with multi parts per package (duplicates created). - incorrect annotation in complex hierarchy with multi parts per package (duplicates created).

7
eeschema/edit_label.cpp
View File

@ -396,7 +396,8 @@ void WinEDA_SchematicFrame::ConvertTextType( DrawTextStruct* Text,
GetScreen()->SetCurItem( NULL ); GetScreen()->SetCurItem( NULL );
g_ItemToRepeat = NULL; g_ItemToRepeat = NULL;
} }
GetScreen()->SetCurItem( newtext );
GetScreen()->SetCurItem( NULL );
SAFE_DELETE( g_ItemToUndoCopy ); SAFE_DELETE( g_ItemToUndoCopy );
@ -412,11 +413,15 @@ void WinEDA_SchematicFrame::ConvertTextType( DrawTextStruct* Text,
SaveCopyInUndoList( newtext, IS_NEW ); SaveCopyInUndoList( newtext, IS_NEW );
} }
else else
{
GetScreen()->SetCurItem( newtext );
newtext->m_Flags = IS_NEW; newtext->m_Flags = IS_NEW;
}
if( (flags & IS_MOVED) != 0 ) if( (flags & IS_MOVED) != 0 )
{ {
GetScreen()->SetCurItem( newtext );
StartMoveTexte( newtext, DC ); StartMoveTexte( newtext, DC );
} }