Commit 95388c6e authored by jean-pierre charras's avatar jean-pierre charras

eeschema: fix memory leakage.

Pcbnew: fix a minor issue.
Version update.
parent f53e8971
......@@ -57,7 +57,6 @@ set(COMMON_SRCS
msgpanel.cpp
netlist_keywords.cpp
newstroke_font.cpp
../pcbnew/class_drc_item.cpp
projet_config.cpp
richio.cpp
selcolor.cpp
......
......@@ -6,7 +6,7 @@
#endif
#ifndef KICAD_BUILD_VERSION
#define KICAD_BUILD_VERSION "(2011-05-31)"
#define KICAD_BUILD_VERSION "(2011-06-08)"
#endif
......
update=18/4/2006-09:31:05
last_client=pcbnew
update=09/06/2011 08:34:19
last_client=cvpcb
[general]
version=1
RootSch=pic_programmer.sch
BoardNm=pic_programmer.brd
[cvpcb]
version=1
NetITyp=0
NetIExt=.net
PkgIExt=.pkg
NetType=0
[cvpcb/libraries]
EquName1=devcms
[common]
NetDir=
[pcbnew]
......@@ -69,11 +61,17 @@ MaxLnkS=3
ShowRat=0
ShowMRa=1
[pcbnew/libraries]
LibName1=dip_sockets
LibName2=sockets
LibName3=connect
LibName4=discret
LibName5=pin_array
LibName6=divers
LibName7=libcms
LibName8=display
LibDir=
LibName1=supports
LibName2=connect
LibName3=discret
LibName4=pin_array
LibName5=divers
LibName6=libcms
LibName7=display
[cvpcb]
version=1
NetIExt=net
[cvpcb/libraries]
EquName1=devcms
......@@ -304,7 +304,7 @@ bool SCH_SHEET_PIN::Load( LINE_READER& aLine, wxString& aErrorMsg )
static const char delims[] = " \t";
// Read coordinates.
D( printf( "line: \"%s\"\n", line );)
// D( printf( "line: \"%s\"\n", line );)
cp = strtok( line, delims );
......
......@@ -352,12 +352,12 @@ void SCH_EDIT_FRAME::CreateScreens()
void SCH_EDIT_FRAME::SetUndoItem( const SCH_ITEM* aItem )
{
if( (aItem != NULL) && (m_undoItem != NULL) )
if( m_undoItem != NULL )
{
delete m_undoItem;
m_undoItem = NULL;
}
m_undoItem = NULL;
if( aItem )
m_undoItem = aItem->Clone();
......@@ -366,13 +366,16 @@ void SCH_EDIT_FRAME::SetUndoItem( const SCH_ITEM* aItem )
void SCH_EDIT_FRAME::SaveUndoItemInUndoList( SCH_ITEM* aItem )
{
wxCHECK_RET( aItem != NULL && m_undoItem != NULL && (aItem->Type() == m_undoItem->Type() ),
wxCHECK_RET( aItem != NULL,
wxT( "Cannot swap undo item structures. Bad programmer!." ) );
wxCHECK_RET( m_undoItem != NULL,
wxT( "Cannot swap undo item structures. Bad programmer!." ) );
wxCHECK_RET( aItem->Type() == m_undoItem->Type(),
wxT( "Cannot swap undo item structures. Bad programmer!." ) );
aItem->SwapData( m_undoItem );
SaveCopyInUndoList( aItem, UR_CHANGED );
aItem->SwapData( m_undoItem );
m_undoItem = NULL;
}
......
......@@ -91,7 +91,7 @@ public:
/**
* Function SwapDate
* swap the internal data structures \a aItem with the schematic item.
*
* Obviously, aItem must have the same type than me
* @param aItem The item to swap the data structures with.
*/
virtual void SwapData( SCH_ITEM* aItem );
......
......@@ -17,7 +17,7 @@
; General Product Description Definitions
!define PRODUCT_NAME "KiCad"
!define PRODUCT_VERSION "2011.05.31"
!define PRODUCT_VERSION "2011.06.08"
!define PRODUCT_WEB_SITE "http://iut-tice.ujf-grenoble.fr/kicad/"
!define SOURCEFORGE_WEB_SITE "http://kicad.sourceforge.net/"
!define COMPANY_NAME ""
......
......@@ -237,6 +237,7 @@ private:
*/
MARKER_PCB* fillMarker( int aErrorCode, const wxString& aMessage, MARKER_PCB* fillMe );
//-----<categorical group tests>-----------------------------------------
/**
......@@ -447,6 +448,15 @@ public:
* dialog, and optionally prints a report of such.
*/
void ListUnconnectedPads();
/**
* @return a pointer to the current marker (last created marker
*/
MARKER_PCB* GetCurrentMarker( )
{
return m_currentMarker;
}
};
......
......@@ -207,10 +207,11 @@ bool PCB_EDIT_FRAME::Other_Layer_Route( TRACK* aTrack, wxDC* DC )
Delete_Segment( DC, g_CurrentTrackSegment );
}
// use the form of SetCurItem() which does not write to the msg panel,
// SCREEN::SetCurItem(), so the DRC error remains on screen.
// PCB_EDIT_FRAME::SetCurItem() calls DisplayInfo().
GetScreen()->SetCurItem( g_CurrentTrackSegment );
SetCurItem( g_CurrentTrackSegment, false );
// Refresh DRC diag, erased by previous calls
if( m_drc->GetCurrentMarker() )
m_drc->GetCurrentMarker()->DisplayInfo( this );
return false;
}
......
release version:
2011 may 31
2011 june 08
files (.zip,.tgz):
kicad-2011-05-31
kicad-2011-06-08
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment