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

Fix bug in SCH_SHEET copy constructor (size not copied, so copied hierarchical sheets have a 0 size), and a minor bug in block save.

This commit is contained in:
jean-pierre charras 2010-12-23 14:16:06 +01:00
parent 952f9f9b7e
commit 2faf429643
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eeschema/block.cpp
View File

@ -541,6 +541,8 @@ void SaveStructListForPaste( PICKED_ITEMS_LIST& aItemsList )
item.m_UndoRedoStatus = UR_DELETED; item.m_UndoRedoStatus = UR_DELETED;
for( unsigned ii = 0; ii < aItemsList.GetCount(); ii++ ) for( unsigned ii = 0; ii < aItemsList.GetCount(); ii++ )
{ {
// Clear m_Flag member of selected items:
aItemsList.GetPickedItem( ii )->m_Flags = 0;
/* Make a copy of the original picked item. */ /* Make a copy of the original picked item. */
SCH_ITEM* DrawStructCopy = DuplicateStruct( (SCH_ITEM*) aItemsList.GetPickedItem( ii ) ); SCH_ITEM* DrawStructCopy = DuplicateStruct( (SCH_ITEM*) aItemsList.GetPickedItem( ii ) );
DrawStructCopy->SetParent( NULL ); DrawStructCopy->SetParent( NULL );

2
eeschema/sch_sheet.cpp
View File

@ -45,6 +45,8 @@ SCH_SHEET::SCH_SHEET( const SCH_SHEET& aSheet ) :
SCH_ITEM( aSheet ) SCH_ITEM( aSheet )
{ {
m_Pos = aSheet.m_Pos; m_Pos = aSheet.m_Pos;
m_Size = aSheet.m_Size;
m_Layer = aSheet.m_Layer;
m_TimeStamp = aSheet.m_TimeStamp; m_TimeStamp = aSheet.m_TimeStamp;
m_SheetNameSize = aSheet.m_SheetNameSize; m_SheetNameSize = aSheet.m_SheetNameSize;
m_FileNameSize = aSheet.m_FileNameSize; m_FileNameSize = aSheet.m_FileNameSize;

4
version.txt
View File

@ -1,4 +1,4 @@
release version: release version:
2010 dec 22 (BZR testing 2676) 2010 dec 23 (BZR 2682)
files (.zip,.tgz): files (.zip,.tgz):
kicad-2010-12-22-testing kicad-2010-12-23