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

pcbnew: erroneous extension when savin *.mdc files (saved as *..mdc)

This commit is contained in:
charras 2009-04-11 15:12:58 +00:00
parent f02980cdaf
commit cfc3d9194d
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
eeschema/viewlib_frame.cpp
View File

@ -116,7 +116,7 @@ WinEDA_ViewlibFrame::WinEDA_ViewlibFrame( wxWindow* father,
else else
{ {
g_CurrentViewLibraryName = Library->m_Name; g_CurrentViewLibraryName = Library->m_Name;
m_LibListSize.x = 0; m_LibListSize.x = 0;
} }
// Creates the component window display // Creates the component window display
@ -204,7 +204,7 @@ void WinEDA_ViewlibFrame::OnSashDrag( wxSashEvent& event )
// Now, we must recalculate the position and size of subwindows // Now, we must recalculate the position and size of subwindows
wxSizeEvent SizeEv; wxSizeEvent SizeEv;
OnSize( SizeEv ); OnSize( SizeEv );
// Ensure the panel is always redrawn (sometimes some garbage remains): // Ensure the panel is always redrawn (sometimes some garbage remains):
DrawPanel->Refresh(); DrawPanel->Refresh();
} }
@ -259,7 +259,7 @@ void WinEDA_ViewlibFrame::OnSize( wxSizeEvent& SizeEv )
m_CmpListWindow->SetPosition( wxPoint( m_LibListSize.x, 0 ) ); m_CmpListWindow->SetPosition( wxPoint( m_LibListSize.x, 0 ) );
m_CmpList->SetSize( m_CmpListWindow->GetClientSize() - wxSize(EXTRA_BORDER_SIZE*2,0) ); m_CmpList->SetSize( m_CmpListWindow->GetClientSize() - wxSize(EXTRA_BORDER_SIZE*2,0) );
} }
SizeEv.Skip(); SizeEv.Skip();
} }
@ -302,29 +302,25 @@ int WinEDA_ViewlibFrame::BestZoom()
void WinEDA_ViewlibFrame::ReCreateListLib() void WinEDA_ViewlibFrame::ReCreateListLib()
/******************************************/ /******************************************/
{ {
const wxChar** ListNames, ** names;
int ii; int ii;
LibraryStruct* Lib;
bool found = FALSE; bool found = FALSE;
if( m_LibList == NULL ) if( m_LibList == NULL )
return; return;
ListNames = GetLibNames();
m_LibList->Clear(); m_LibList->Clear();
for( names = ListNames, ii = 0; *names != NULL; names++, ii++ ) for( ii = 0, Lib = g_LibraryList; Lib != NULL; Lib = Lib->m_Pnext, ii++ )
{ {
m_LibList->Append( *names ); m_LibList->Append(Lib->m_Name);
if( g_CurrentViewLibraryName.Cmp( *names ) == 0 ) if( g_CurrentViewLibraryName.Cmp( Lib->m_Name ) == 0 )
{ {
m_LibList->SetSelection( ii, TRUE ); m_LibList->SetSelection( ii, TRUE );
found = TRUE; found = TRUE;
} }
} }
free( ListNames ); /* If not found, clear current library selection because it can be deleted after a config change
/* Clear current library because it can be deleted after a config change
*/ */
if( !found ) if( !found )
{ {
@ -444,7 +440,7 @@ void WinEDA_ViewlibFrame::LoadSettings( )
cfg->Read( LIBLIST_WIDTH_KEY, &m_LibListSize.x ); cfg->Read( LIBLIST_WIDTH_KEY, &m_LibListSize.x );
cfg->Read( CMPLIST_WIDTH_KEY, &m_CmpListSize.x ); cfg->Read( CMPLIST_WIDTH_KEY, &m_CmpListSize.x );
// set parameters to a resonnable value // set parameters to a resonnable value
if ( m_LibListSize.x > m_FrameSize.x/2 ) if ( m_LibListSize.x > m_FrameSize.x/2 )
m_LibListSize.x = m_FrameSize.x/2; m_LibListSize.x = m_FrameSize.x/2;

2
include/pcbstruct.h
View File

@ -13,7 +13,7 @@
#define ENTETE_LIBRAIRIE "PCBNEW-LibModule-V1" #define ENTETE_LIBRAIRIE "PCBNEW-LibModule-V1"
#define ENTETE_LIBDOC "PCBNEW-LibDoc----V1" #define ENTETE_LIBDOC "PCBNEW-LibDoc----V1"
#define L_ENTETE_LIB 18 #define L_ENTETE_LIB 18
#define EXT_DOC wxT( ".mdc" ) #define EXT_DOC wxT( "mdc" )
/* Bits indicateurs du membre .Status, pour pistes, modules... */ /* Bits indicateurs du membre .Status, pour pistes, modules... */