AllSpiceMirrors/kicad
7
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-04-14 13:09:35 +00:00
Files Issues Releases Activity

CvPcb: Code cleanup. Rename WinEDA_CvpcbFrame to CVPCB_MAINFRAME, according to coding style policy.

Browse Source 
Change in CvPcb: CvPcb does not use now .dcm files, only .mod files  to read modules keywords and doc
This commit is contained in:
jean-pierre charras 2011-02-05 17:15:48 +01:00
parent 0d8cb9b53c
commit 9370dd83de
36 changed files with 1364 additions and 1085 deletions

10
CHANGELOG.txt
View File

@ -4,6 +4,16 @@ KiCad ChangeLog 2010
Please add newer entries at the top, list the date and your name with
email address.
2011-Feb-05, UPDATE Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr>
================================================================================
CvPcb:
Code cleanup. Rename WinEDA_CvpcbFrame to CVPCB_MAINFRAME,
according to coding style policy.
Change in CvPcb:
CvPcb does not use now .dcm files, only .mod files,
to read modules keywords and doc
2011-Feb-2 UPDATE Dick Hollenbeck <dick@softplc.com>
================================================================================
++common:

1
bitmaps/CMakeLists.txt
View File

@ -187,6 +187,7 @@ set(BITMAP_SRCS
Lang_Es.xpm
Lang_Fr.xpm
Lang_Fi.xpm
Lang_Gr.xpm
Lang_Hu.xpm
Lang_It.xpm
Lang_Jp.xpm

38
bitmaps/Lang_Gr.xpm Normal file
View File

@ -0,0 +1,38 @@
/* XPM */
const char *lang_gr_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 16 16 1",
"= c none",
"& c #D6D8F8",
"O c #3939DC",
"+ c #0E12F2",
"# c #A8A6F7",
"o c #2826E4",
": c #B4B6FC",
"* c #8482F4",
"@ c #4745F8",
"- c #1C1EFC",
"; c #1D22FB",
"$ c #9C9AF4",
". c #CAC8FA",
" c #0402FC",
"% c #5456F4",
"X c #7A79F9",
/* pixels */
"================",
" .XoOOOOOoo++++",
" .X @#########$",
"%%&#%*##########",
"&&=&&* ",
" .X %.&&&&&&&&&",
" .X -@@@@@@@@@@",
"@@&$@@@@@@@@@@@@",
" ",
";--;-----------;",
"*XXXXXXXXXXXXXXX",
"&&&&&&&&&&&&&&&&",
" ",
"::::::::::::::::",
"================",
"================"
};

8
common/edaappl.cpp
View File

@ -148,6 +148,14 @@ static struct LANGUAGE_DESCR s_Language_List[] =
_( "German" )
},
/* Greek language */
{
wxLANGUAGE_GREEK,
ID_LANGUAGE_GREEK,
lang_gr_xpm,
_( "Greek" )
},
/* Slovenian language */
{
wxLANGUAGE_SLOVENIAN,

3
cvpcb/autosel.cpp
View File

@ -13,6 +13,7 @@
#include "cvpcb.h"
#include "protos.h"
#include "cvpcb_mainframe.h"
#include "cvstruct.h"
@ -68,7 +69,7 @@ char * ReadQuotedText(wxString & aTarget, char * aText)
* format of a line:
* 'cmp_ref' 'footprint_name'
*/
void WinEDA_CvpcbFrame::AssocieModule( wxCommandEvent& event )
void CVPCB_MAINFRAME::AssocieModule( wxCommandEvent& event )
{
FOOTPRINT_ALIAS_LIST aliases;
FOOTPRINT_ALIAS* alias;

10
cvpcb/cfg.cpp
View File

@ -9,7 +9,7 @@
#include "param_config.h"
#include "cvpcb.h"
#include "protos.h"
#include "cvstruct.h"
#include "cvpcb_mainframe.h"
#define GROUP wxT("/cvpcb")
@ -26,7 +26,7 @@
* to define local variables. The old method of statically building the array
* at compile time requiring global variable definitions.
*/
PARAM_CFG_ARRAY& WinEDA_CvpcbFrame::GetProjectFileParameters( void )
PARAM_CFG_ARRAY& CVPCB_MAINFRAME::GetProjectFileParameters( void )
{
if( !m_projectFileParams.empty() )
return m_projectFileParams;
@ -59,7 +59,7 @@ PARAM_CFG_ARRAY& WinEDA_CvpcbFrame::GetProjectFileParameters( void )
* The path of the executable must be in cvpcb.exe.
*
*/
void WinEDA_CvpcbFrame::LoadProjectFile( const wxString& FileName )
void CVPCB_MAINFRAME::LoadProjectFile( const wxString& FileName )
{
wxFileName fn = FileName;
@ -82,13 +82,13 @@ void WinEDA_CvpcbFrame::LoadProjectFile( const wxString& FileName )
}
void WinEDA_CvpcbFrame::Update_Config( wxCommandEvent& event )
void CVPCB_MAINFRAME::Update_Config( wxCommandEvent& event )
{
SaveProjectFile( m_NetlistFileName.GetFullPath() );
}
void WinEDA_CvpcbFrame::SaveProjectFile( const wxString& fileName )
void CVPCB_MAINFRAME::SaveProjectFile( const wxString& fileName )
{
wxFileName fn = fileName;

6
cvpcb/class_DisplayFootprintsFrame.cpp
View File

@ -12,7 +12,7 @@
#include "cvpcb.h"
#include "bitmaps.h"
#include "protos.h"
#include "cvstruct.h"
#include "cvpcb_mainframe.h"
#include "class_DisplayFootprintsFrame.h"
#include "cvpcb_id.h"
@ -46,7 +46,7 @@ END_EVENT_TABLE()
/* DISPLAY_FOOTPRINTS_FRAME: the frame to display the current focused footprint */
/***************************************************************************/
DISPLAY_FOOTPRINTS_FRAME::DISPLAY_FOOTPRINTS_FRAME( WinEDA_CvpcbFrame* father,
DISPLAY_FOOTPRINTS_FRAME::DISPLAY_FOOTPRINTS_FRAME( CVPCB_MAINFRAME* father,
const wxString& title,
const wxPoint& pos,
const wxSize& size, long style ) :
@ -129,7 +129,7 @@ DISPLAY_FOOTPRINTS_FRAME::~DISPLAY_FOOTPRINTS_FRAME()
delete GetScreen();
SetScreen( NULL );
( (WinEDA_CvpcbFrame*) wxGetApp().GetTopWindow() )->DrawFrame = NULL;
( (CVPCB_MAINFRAME*) wxGetApp().GetTopWindow() )->DrawFrame = NULL;
}
/* Called when the frame is closed

2
cvpcb/class_DisplayFootprintsFrame.h
View File

@ -10,7 +10,7 @@ class DISPLAY_FOOTPRINTS_FRAME : public WinEDA_BasePcbFrame
public:
public:
DISPLAY_FOOTPRINTS_FRAME( WinEDA_CvpcbFrame* father,
DISPLAY_FOOTPRINTS_FRAME( CVPCB_MAINFRAME* father,
const wxString& title,
const wxPoint& pos, const wxSize& size,
long style = KICAD_DEFAULT_DRAWFRAME_STYLE );

3
cvpcb/class_components_listbox.cpp
View File

@ -8,6 +8,7 @@
#include "cvpcb.h"
#include "protos.h"
#include "cvpcb_mainframe.h"
#include "cvstruct.h"
@ -15,7 +16,7 @@
/* ListBox handling the schematic components list */
/**************************************************/
COMPONENTS_LISTBOX::COMPONENTS_LISTBOX( WinEDA_CvpcbFrame* parent, wxWindowID id,
COMPONENTS_LISTBOX::COMPONENTS_LISTBOX( CVPCB_MAINFRAME* parent, wxWindowID id,
const wxPoint& loc, const wxSize& size,
int nbitems, wxString choice[] ) :
ITEMS_LISTBOX_BASE( parent, id, loc, size )

3
cvpcb/class_footprints_listbox.cpp
View File

@ -8,6 +8,7 @@
#include "cvpcb.h"
#include "protos.h"
#include "cvpcb_mainframe.h"
#include "cvstruct.h"
@ -15,7 +16,7 @@
/* ListBox handling the footprint list */
/***************************************/
FOOTPRINTS_LISTBOX::FOOTPRINTS_LISTBOX( WinEDA_CvpcbFrame* parent,
FOOTPRINTS_LISTBOX::FOOTPRINTS_LISTBOX( CVPCB_MAINFRAME* parent,
wxWindowID id, const wxPoint& loc,
const wxSize& size,
int nbitems, wxString choice[] ) :

111
cvpcb/cvframe.cpp
View File

@ -13,6 +13,7 @@
#include "cvpcb.h"
#include "protos.h"
#include "cvpcb_mainframe.h"
#include "cvstruct.h"
#include "dialog_cvpcb_config.h"
#include "class_DisplayFootprintsFrame.h"
@ -29,77 +30,77 @@ static const wxString KeepCvpcbOpenEntry( wxT( "KeepCvpcbOpen" ) );
static const wxString FootprintDocFileEntry( wxT( "footprints_doc_file" ) );
BEGIN_EVENT_TABLE( WinEDA_CvpcbFrame, EDA_BASE_FRAME )
EVT_MENU_RANGE( wxID_FILE1, wxID_FILE9, WinEDA_CvpcbFrame::LoadNetList )
BEGIN_EVENT_TABLE( CVPCB_MAINFRAME, EDA_BASE_FRAME )
EVT_MENU_RANGE( wxID_FILE1, wxID_FILE9, CVPCB_MAINFRAME::LoadNetList )
// Menu events
EVT_MENU( ID_LOAD_PROJECT,
WinEDA_CvpcbFrame::LoadNetList )
CVPCB_MAINFRAME::LoadNetList )
EVT_MENU( ID_SAVE_PROJECT,
WinEDA_CvpcbFrame::SaveQuitCvpcb )
CVPCB_MAINFRAME::SaveQuitCvpcb )
EVT_MENU( wxID_EXIT,
WinEDA_CvpcbFrame::OnQuit )
CVPCB_MAINFRAME::OnQuit )
EVT_MENU( ID_GENERAL_HELP,
WinEDA_CvpcbFrame::GetKicadHelp )
CVPCB_MAINFRAME::GetKicadHelp )
EVT_MENU( ID_KICAD_ABOUT,
WinEDA_CvpcbFrame::GetKicadAbout )
CVPCB_MAINFRAME::GetKicadAbout )
EVT_MENU( ID_CONFIG_REQ,
WinEDA_CvpcbFrame::ConfigCvpcb )
CVPCB_MAINFRAME::ConfigCvpcb )
EVT_MENU( ID_CONFIG_SAVE,
WinEDA_CvpcbFrame::Update_Config )
CVPCB_MAINFRAME::Update_Config )
EVT_MENU( ID_CVPCB_CONFIG_KEEP_OPEN_ON_SAVE,
WinEDA_CvpcbFrame::OnKeepOpenOnSave )
CVPCB_MAINFRAME::OnKeepOpenOnSave )
EVT_MENU_RANGE( ID_LANGUAGE_CHOICE,
ID_LANGUAGE_CHOICE_END,
WinEDA_CvpcbFrame::SetLanguage )
CVPCB_MAINFRAME::SetLanguage )
// Toolbar events
EVT_TOOL( ID_CVPCB_QUIT,
WinEDA_CvpcbFrame::OnQuit )
CVPCB_MAINFRAME::OnQuit )
EVT_TOOL( ID_CVPCB_READ_INPUT_NETLIST,
WinEDA_CvpcbFrame::LoadNetList )
CVPCB_MAINFRAME::LoadNetList )
EVT_TOOL( ID_CVPCB_SAVEQUITCVPCB,
WinEDA_CvpcbFrame::SaveQuitCvpcb )
CVPCB_MAINFRAME::SaveQuitCvpcb )
EVT_TOOL( ID_CVPCB_CREATE_CONFIGWINDOW,
WinEDA_CvpcbFrame::ConfigCvpcb )
CVPCB_MAINFRAME::ConfigCvpcb )
EVT_TOOL( ID_CVPCB_CREATE_SCREENCMP,
WinEDA_CvpcbFrame::DisplayModule )
CVPCB_MAINFRAME::DisplayModule )
EVT_TOOL( ID_CVPCB_GOTO_FIRSTNA,
WinEDA_CvpcbFrame::ToFirstNA )
CVPCB_MAINFRAME::ToFirstNA )
EVT_TOOL( ID_CVPCB_GOTO_PREVIOUSNA,
WinEDA_CvpcbFrame::ToPreviousNA )
CVPCB_MAINFRAME::ToPreviousNA )
EVT_TOOL( ID_CVPCB_DEL_ASSOCIATIONS,
WinEDA_CvpcbFrame::DelAssociations )
CVPCB_MAINFRAME::DelAssociations )
EVT_TOOL( ID_CVPCB_AUTO_ASSOCIE,
WinEDA_CvpcbFrame::AssocieModule )
CVPCB_MAINFRAME::AssocieModule )
EVT_TOOL( ID_CVPCB_CREATE_STUFF_FILE,
WinEDA_CvpcbFrame::WriteStuffList )
CVPCB_MAINFRAME::WriteStuffList )
EVT_TOOL( ID_PCB_DISPLAY_FOOTPRINT_DOC,
WinEDA_CvpcbFrame::DisplayDocFile )
CVPCB_MAINFRAME::DisplayDocFile )
EVT_TOOL( ID_CVPCB_FOOTPRINT_DISPLAY_FILTERED_LIST,
WinEDA_CvpcbFrame::OnSelectFilteringFootprint )
CVPCB_MAINFRAME::OnSelectFilteringFootprint )
EVT_TOOL( ID_CVPCB_FOOTPRINT_DISPLAY_FULL_LIST,
WinEDA_CvpcbFrame::OnSelectFilteringFootprint )
CVPCB_MAINFRAME::OnSelectFilteringFootprint )
// Frame events
EVT_CHAR( WinEDA_CvpcbFrame::OnChar )
EVT_CLOSE( WinEDA_CvpcbFrame::OnCloseWindow )
EVT_SIZE( WinEDA_CvpcbFrame::OnSize )
EVT_CHAR( CVPCB_MAINFRAME::OnChar )
EVT_CLOSE( CVPCB_MAINFRAME::OnCloseWindow )
EVT_SIZE( CVPCB_MAINFRAME::OnSize )
// List item events
EVT_LIST_ITEM_SELECTED( ID_CVPCB_FOOTPRINT_LIST,
WinEDA_CvpcbFrame::OnLeftClick )
CVPCB_MAINFRAME::OnLeftClick )
EVT_LIST_ITEM_ACTIVATED( ID_CVPCB_FOOTPRINT_LIST,
WinEDA_CvpcbFrame::OnLeftDClick )
CVPCB_MAINFRAME::OnLeftDClick )
EVT_LIST_ITEM_SELECTED( ID_CVPCB_COMPONENT_LIST,
WinEDA_CvpcbFrame::OnSelectComponent )
CVPCB_MAINFRAME::OnSelectComponent )
EVT_UPDATE_UI( ID_CVPCB_CONFIG_KEEP_OPEN_ON_SAVE,
WinEDA_CvpcbFrame::OnUpdateKeepOpenOnSave )
CVPCB_MAINFRAME::OnUpdateKeepOpenOnSave )
END_EVENT_TABLE()
WinEDA_CvpcbFrame::WinEDA_CvpcbFrame( const wxString& title, long style ) :
CVPCB_MAINFRAME::CVPCB_MAINFRAME( const wxString& title, long style ) :
EDA_BASE_FRAME( NULL, CVPCB_FRAME, title, wxDefaultPosition, wxDefaultSize, style )
{
m_FrameName = wxT( "CvpcbFrame" );
@ -184,7 +185,7 @@ WinEDA_CvpcbFrame::WinEDA_CvpcbFrame( const wxString& title, long style ) :
}
WinEDA_CvpcbFrame::~WinEDA_CvpcbFrame()
CVPCB_MAINFRAME::~CVPCB_MAINFRAME()
{
wxConfig* config = wxGetApp().m_EDA_Config;
@ -205,7 +206,7 @@ WinEDA_CvpcbFrame::~WinEDA_CvpcbFrame()
* Don't forget to call this base method from any derived classes or the
* settings will not get loaded.
*/
void WinEDA_CvpcbFrame::LoadSettings()
void CVPCB_MAINFRAME::LoadSettings()
{
wxASSERT( wxGetApp().m_EDA_Config != NULL );
@ -224,7 +225,7 @@ void WinEDA_CvpcbFrame::LoadSettings()
* Don't forget to call this base method from any derived classes or the
* settings will not get saved.
*/
void WinEDA_CvpcbFrame::SaveSettings()
void CVPCB_MAINFRAME::SaveSettings()
{
wxASSERT( wxGetApp().m_EDA_Config != NULL );
@ -236,19 +237,19 @@ void WinEDA_CvpcbFrame::SaveSettings()
}
void WinEDA_CvpcbFrame::OnSize( wxSizeEvent& event )
void CVPCB_MAINFRAME::OnSize( wxSizeEvent& event )
{
event.Skip();
}
void WinEDA_CvpcbFrame::OnQuit( wxCommandEvent& event )
void CVPCB_MAINFRAME::OnQuit( wxCommandEvent& event )
{
Close( TRUE );
}
void WinEDA_CvpcbFrame::OnCloseWindow( wxCloseEvent& Event )
void CVPCB_MAINFRAME::OnCloseWindow( wxCloseEvent& Event )
{
int diag;
@ -309,7 +310,7 @@ void WinEDA_CvpcbFrame::OnCloseWindow( wxCloseEvent& Event )
}
void WinEDA_CvpcbFrame::OnChar( wxKeyEvent& event )
void CVPCB_MAINFRAME::OnChar( wxKeyEvent& event )
{
switch( event.GetKeyCode() )
{
@ -330,7 +331,7 @@ void WinEDA_CvpcbFrame::OnChar( wxKeyEvent& event )
}
void WinEDA_CvpcbFrame::ToFirstNA( wxCommandEvent& event )
void CVPCB_MAINFRAME::ToFirstNA( wxCommandEvent& event )
{
int ii = 0;
int selection;
@ -357,7 +358,7 @@ void WinEDA_CvpcbFrame::ToFirstNA( wxCommandEvent& event )
}
void WinEDA_CvpcbFrame::ToPreviousNA( wxCommandEvent& event )
void CVPCB_MAINFRAME::ToPreviousNA( wxCommandEvent& event )
{
int ii;
int selection;
@ -384,7 +385,7 @@ void WinEDA_CvpcbFrame::ToPreviousNA( wxCommandEvent& event )
}
void WinEDA_CvpcbFrame::SaveQuitCvpcb( wxCommandEvent& event )
void CVPCB_MAINFRAME::SaveQuitCvpcb( wxCommandEvent& event )
{
if( SaveNetList( wxEmptyString ) > 0 )
{
@ -398,7 +399,7 @@ void WinEDA_CvpcbFrame::SaveQuitCvpcb( wxCommandEvent& event )
/* Removes all associations already made
*/
void WinEDA_CvpcbFrame::DelAssociations( wxCommandEvent& event )
void CVPCB_MAINFRAME::DelAssociations( wxCommandEvent& event )
{
wxString Line;
@ -424,7 +425,7 @@ void WinEDA_CvpcbFrame::DelAssociations( wxCommandEvent& event )
* Called when click on Load Netlist button or by file history menu entries
* Read a netlist selected by user
*/
void WinEDA_CvpcbFrame::LoadNetList( wxCommandEvent& event )
void CVPCB_MAINFRAME::LoadNetList( wxCommandEvent& event )
{
wxString oldPath;
wxFileName newFileName;
@ -474,7 +475,7 @@ void WinEDA_CvpcbFrame::LoadNetList( wxCommandEvent& event )
}
void WinEDA_CvpcbFrame::ConfigCvpcb( wxCommandEvent& event )
void CVPCB_MAINFRAME::ConfigCvpcb( wxCommandEvent& event )
{
DIALOG_CVPCB_CONFIG ConfigFrame( this );
@ -482,13 +483,13 @@ void WinEDA_CvpcbFrame::ConfigCvpcb( wxCommandEvent& event )
}
void WinEDA_CvpcbFrame::OnKeepOpenOnSave( wxCommandEvent& event )
void CVPCB_MAINFRAME::OnKeepOpenOnSave( wxCommandEvent& event )
{
m_KeepCvpcbOpen = event.IsChecked();
}
void WinEDA_CvpcbFrame::DisplayModule( wxCommandEvent& event )
void CVPCB_MAINFRAME::DisplayModule( wxCommandEvent& event )
{
CreateScreenCmp();
DrawFrame->AdjustScrollBars();
@ -499,32 +500,32 @@ void WinEDA_CvpcbFrame::DisplayModule( wxCommandEvent& event )
/** Vitual function SetLanguage
* called on a language menu selection
*/
void WinEDA_CvpcbFrame::SetLanguage( wxCommandEvent& event )
void CVPCB_MAINFRAME::SetLanguage( wxCommandEvent& event )
{
EDA_BASE_FRAME::SetLanguage( event );
}
void WinEDA_CvpcbFrame::DisplayDocFile( wxCommandEvent& event )
void CVPCB_MAINFRAME::DisplayDocFile( wxCommandEvent& event )
{
GetAssociatedDocument( this, m_DocModulesFileName,
&wxGetApp().GetLibraryPathList() );
}
void WinEDA_CvpcbFrame::OnLeftClick( wxListEvent& event )
void CVPCB_MAINFRAME::OnLeftClick( wxListEvent& event )
{
m_FootprintList->OnLeftClick( event );
}
void WinEDA_CvpcbFrame::OnLeftDClick( wxListEvent& event )
void CVPCB_MAINFRAME::OnLeftDClick( wxListEvent& event )
{
m_FootprintList->OnLeftDClick( event );
}
void WinEDA_CvpcbFrame::OnSelectComponent( wxListEvent& event )
void CVPCB_MAINFRAME::OnSelectComponent( wxListEvent& event )
{
int selection;
@ -555,7 +556,7 @@ void WinEDA_CvpcbFrame::OnSelectComponent( wxListEvent& event )
/* Select full/filtered footprint display on tool click
*/
void WinEDA_CvpcbFrame::OnSelectFilteringFootprint( wxCommandEvent& event )
void CVPCB_MAINFRAME::OnSelectFilteringFootprint( wxCommandEvent& event )
{
switch (event.GetId() )
{
@ -574,7 +575,7 @@ void WinEDA_CvpcbFrame::OnSelectFilteringFootprint( wxCommandEvent& event )
}
void WinEDA_CvpcbFrame::OnUpdateKeepOpenOnSave( wxUpdateUIEvent& event )
void CVPCB_MAINFRAME::OnUpdateKeepOpenOnSave( wxUpdateUIEvent& event )
{
event.Check( m_KeepCvpcbOpen );
}
@ -583,7 +584,7 @@ void WinEDA_CvpcbFrame::OnUpdateKeepOpenOnSave( wxUpdateUIEvent& event )
/** DisplayStatus()
* Displays info to the status line at bottom of the main frame
*/
void WinEDA_CvpcbFrame::DisplayStatus()
void CVPCB_MAINFRAME::DisplayStatus()
{
wxString msg;
msg.Printf( _( "Components: %d (free: %d)" ),

10
cvpcb/cvpcb.cpp
View File

@ -13,7 +13,7 @@
#include "zones.h"
#include "bitmaps.h"
#include "protos.h"
#include "cvstruct.h"
#include "cvpcb_mainframe.h"
#include "colors_selection.h"
#include "cvpcb_id.h"
@ -44,7 +44,7 @@ void WinEDA_App::MacOpenFile(const wxString &fileName)
{
wxFileName filename = fileName;
wxString oldPath;
WinEDA_CvpcbFrame * frame = ((WinEDA_CvpcbFrame*)GetTopWindow());
CVPCB_MAINFRAME * frame = ((CVPCB_MAINFRAME*)GetTopWindow());
if(!filename.FileExists())
return;
@ -94,7 +94,7 @@ bool WinEDA_App::OnInit()
wxFileName filename;
wxString message;
WinEDA_CvpcbFrame* frame = NULL;
CVPCB_MAINFRAME* frame = NULL;
InitEDA_Appl( wxT( "CvPCB" ), APP_TYPE_CVPCB );
@ -117,7 +117,7 @@ bool WinEDA_App::OnInit()
g_DrawBgColor = BLACK;
wxString Title = GetTitle() + wxT( " " ) + GetBuildVersion();
frame = new WinEDA_CvpcbFrame( Title );
frame = new CVPCB_MAINFRAME( Title );
// Show the frame
SetTopWindow( frame );
@ -137,7 +137,7 @@ bool WinEDA_App::OnInit()
}
}
LoadFootprintFiles( frame->m_ModuleLibNames, frame->m_footprints );
frame->LoadFootprintFiles();
frame->m_NetlistFileExtension = wxT( "net" );
frame->m_NetlistFileName.Clear();
frame->SetTitle( GetTitle() + wxT( " " ) + GetBuildVersion() +

116
cvpcb/cvpcb_mainframe.h Normal file
View File

@ -0,0 +1,116 @@
/**
* @file cvpcb_mainframe.h
*/
#ifndef _CVPCB_MAINFRAME_H_
#define _CVPCB_MAINFRAME_H_
#include "wx/listctrl.h"
#include <wx/filename.h>
#include "param_config.h"
#include "cvpcb.h"
/* Forward declarations of all top-level window classes. */
class FOOTPRINTS_LISTBOX;
class COMPONENTS_LISTBOX;
class DISPLAY_FOOTPRINTS_FRAME;
/**
* The CVPcb application main window.
*/
class CVPCB_MAINFRAME : public EDA_BASE_FRAME
{
public:
bool m_KeepCvpcbOpen;
FOOTPRINTS_LISTBOX* m_FootprintList;
COMPONENTS_LISTBOX* m_ListCmp;
DISPLAY_FOOTPRINTS_FRAME* DrawFrame;
WinEDA_Toolbar* m_HToolBar;
wxFileName m_NetlistFileName;
wxArrayString m_ModuleLibNames;
wxArrayString m_AliasLibNames;
wxString m_UserLibraryPath;
wxString m_NetlistFileExtension;
wxString m_DocModulesFileName;
FOOTPRINT_LIST m_footprints;
COMPONENT_LIST m_components;
protected:
int m_undefinedComponentCnt;
bool m_modified;
bool m_rightJustify;
bool m_isEESchemaNetlist;
PARAM_CFG_ARRAY m_projectFileParams;
public:
CVPCB_MAINFRAME( const wxString& title,
long style = KICAD_DEFAULT_DRAWFRAME_STYLE );
~CVPCB_MAINFRAME();
void OnLeftClick( wxListEvent& event );
void OnLeftDClick( wxListEvent& event );
void OnSelectComponent( wxListEvent& event );
void Update_Config( wxCommandEvent& event );
void OnQuit( wxCommandEvent& event );
void OnCloseWindow( wxCloseEvent& Event );
void OnSize( wxSizeEvent& SizeEvent );
void OnChar( wxKeyEvent& event );
void ReCreateHToolbar();
virtual void ReCreateMenuBar();
void SetLanguage( wxCommandEvent& event );
void ToFirstNA( wxCommandEvent& event );
void ToPreviousNA( wxCommandEvent& event );
void DelAssociations( wxCommandEvent& event );
void SaveQuitCvpcb( wxCommandEvent& event );
void LoadNetList( wxCommandEvent& event );
void ConfigCvpcb( wxCommandEvent& event );
void OnKeepOpenOnSave( wxCommandEvent& event );
void DisplayModule( wxCommandEvent& event );
void AssocieModule( wxCommandEvent& event );
void WriteStuffList( wxCommandEvent& event );
void DisplayDocFile( wxCommandEvent& event );
void OnSelectFilteringFootprint( wxCommandEvent& event );
void OnUpdateKeepOpenOnSave( wxUpdateUIEvent& event );
void SetNewPkg( const wxString& package );
void BuildCmpListBox();
void BuildFOOTPRINTS_LISTBOX();
void CreateScreenCmp();
int SaveNetList( const wxString& FullFileName );
int SaveComponentList( const wxString& FullFileName );
bool ReadNetList();
int ReadSchematicNetlist();
void LoadProjectFile( const wxString& FileName );
void SaveProjectFile( const wxString& fileName );
virtual void LoadSettings();
virtual void SaveSettings();
/** DisplayStatus()
* Displays info to the status line at bottom of the main frame
*/
void DisplayStatus();
/**
* Function LoadFootprintFiles
* Read the list of libraries (*.mod files) and generate the list of modules.
* for each module are stored
* the module name
* documentation string
* associated keywords
* m_ModuleLibNames is the list of library that must be read (loaded)
* fills m_footprints
* @return true if libraries are found, false otherwise.
*/
bool LoadFootprintFiles( );
PARAM_CFG_ARRAY& GetProjectFileParameters( void );
DECLARE_EVENT_TABLE()
};
#endif //#ifndef _CVPCB_MAINFRAME_H_

101
cvpcb/cvstruct.h
View File

@ -6,99 +6,10 @@
#define CVSTRUCT_H
#include "wx/listctrl.h"
#include <wx/filename.h>
#include "param_config.h"
#include "cvpcb.h"
/* Forward declarations of all top-level window classes. */
class FOOTPRINTS_LISTBOX;
class COMPONENTS_LISTBOX;
class DISPLAY_FOOTPRINTS_FRAME;
/**
* The CVPcb application main window.
*/
class WinEDA_CvpcbFrame : public EDA_BASE_FRAME
{
public:
bool m_KeepCvpcbOpen;
FOOTPRINTS_LISTBOX* m_FootprintList;
COMPONENTS_LISTBOX* m_ListCmp;
DISPLAY_FOOTPRINTS_FRAME* DrawFrame;
WinEDA_Toolbar* m_HToolBar;
wxFileName m_NetlistFileName;
wxArrayString m_ModuleLibNames;
wxArrayString m_AliasLibNames;
wxString m_UserLibraryPath;
wxString m_NetlistFileExtension;
wxString m_DocModulesFileName;
FOOTPRINT_LIST m_footprints;
COMPONENT_LIST m_components;
protected:
int m_undefinedComponentCnt;
bool m_modified;
bool m_rightJustify;
bool m_isEESchemaNetlist;
PARAM_CFG_ARRAY m_projectFileParams;
public:
WinEDA_CvpcbFrame( const wxString& title,
long style = KICAD_DEFAULT_DRAWFRAME_STYLE );
~WinEDA_CvpcbFrame();
void OnLeftClick( wxListEvent& event );
void OnLeftDClick( wxListEvent& event );
void OnSelectComponent( wxListEvent& event );
void Update_Config( wxCommandEvent& event );
void OnQuit( wxCommandEvent& event );
void OnCloseWindow( wxCloseEvent& Event );
void OnSize( wxSizeEvent& SizeEvent );
void OnChar( wxKeyEvent& event );
void ReCreateHToolbar();
virtual void ReCreateMenuBar();
void SetLanguage( wxCommandEvent& event );
void ToFirstNA( wxCommandEvent& event );
void ToPreviousNA( wxCommandEvent& event );
void DelAssociations( wxCommandEvent& event );
void SaveQuitCvpcb( wxCommandEvent& event );
void LoadNetList( wxCommandEvent& event );
void ConfigCvpcb( wxCommandEvent& event );
void OnKeepOpenOnSave( wxCommandEvent& event );
void DisplayModule( wxCommandEvent& event );
void AssocieModule( wxCommandEvent& event );
void WriteStuffList( wxCommandEvent& event );
void DisplayDocFile( wxCommandEvent& event );
void OnSelectFilteringFootprint( wxCommandEvent& event );
void OnUpdateKeepOpenOnSave( wxUpdateUIEvent& event );
void SetNewPkg( const wxString& package );
void BuildCmpListBox();
void BuildFOOTPRINTS_LISTBOX();
void CreateScreenCmp();
int SaveNetList( const wxString& FullFileName );
int SaveComponentList( const wxString& FullFileName );
bool ReadNetList();
int ReadSchematicNetlist();
void LoadProjectFile( const wxString& FileName );
void SaveProjectFile( const wxString& fileName );
virtual void LoadSettings();
virtual void SaveSettings();
/** DisplayStatus()
* Displays info to the status line at bottom of the main frame
*/
void DisplayStatus();
PARAM_CFG_ARRAY& GetProjectFileParameters( void );
DECLARE_EVENT_TABLE()
};
class CVPCB_MAINFRAME;
/*********************************************************************/
@ -107,7 +18,7 @@ public:
class ITEMS_LISTBOX_BASE : public wxListView
{
public:
ITEMS_LISTBOX_BASE( WinEDA_CvpcbFrame* aParent, wxWindowID aId,
ITEMS_LISTBOX_BASE( CVPCB_MAINFRAME* aParent, wxWindowID aId,
const wxPoint& aLocation, const wxSize& aSize );
~ITEMS_LISTBOX_BASE();
@ -115,7 +26,7 @@ public:
int GetSelection();
void OnSize( wxSizeEvent& event );
virtual WinEDA_CvpcbFrame* GetParent();
virtual CVPCB_MAINFRAME* GetParent();
};
/******************************************/
@ -132,7 +43,7 @@ public:
bool m_UseFootprintFullList;
public:
FOOTPRINTS_LISTBOX( WinEDA_CvpcbFrame* parent, wxWindowID id,
FOOTPRINTS_LISTBOX( CVPCB_MAINFRAME* parent, wxWindowID id,
const wxPoint& loc, const wxSize& size,
int nbitems, wxString choice[] );
~FOOTPRINTS_LISTBOX();
@ -165,11 +76,11 @@ class COMPONENTS_LISTBOX : public ITEMS_LISTBOX_BASE
{
public:
wxArrayString m_ComponentList;
WinEDA_CvpcbFrame* m_Parent;
CVPCB_MAINFRAME* m_Parent;
public:
COMPONENTS_LISTBOX( WinEDA_CvpcbFrame* parent, wxWindowID id,
COMPONENTS_LISTBOX( CVPCB_MAINFRAME* parent, wxWindowID id,
const wxPoint& loc, const wxSize& size,
int nbitems, wxString choice[] );

7
cvpcb/dialogs/dialog_cvpcb_config.cpp
View File

@ -12,14 +12,14 @@
#include "gestfich.h"
#include "cvpcb.h"
#include "cvstruct.h"
#include "cvpcb_mainframe.h"
#include "protos.h"
#include "dialog_cvpcb_config.h"
DIALOG_CVPCB_CONFIG::DIALOG_CVPCB_CONFIG( WinEDA_CvpcbFrame* parent ) :
DIALOG_CVPCB_CONFIG::DIALOG_CVPCB_CONFIG( CVPCB_MAINFRAME* parent ) :
DIALOG_CVPCB_CONFIG_FBP( parent )
{
wxString title;
@ -121,8 +121,7 @@ void DIALOG_CVPCB_CONFIG::OnOkClick( wxCommandEvent& event )
for( unsigned ii = 0; ii < m_ListEquiv->GetCount(); ii++ )
m_Parent->m_AliasLibNames.Add( m_ListEquiv->GetString( ii ) );
LoadFootprintFiles( m_Parent->m_ModuleLibNames,
m_Parent->m_footprints );
m_Parent->LoadFootprintFiles();
m_Parent->BuildFOOTPRINTS_LISTBOX();
}

4
cvpcb/dialogs/dialog_cvpcb_config.h
View File

@ -13,7 +13,7 @@
class DIALOG_CVPCB_CONFIG : public DIALOG_CVPCB_CONFIG_FBP
{
private:
WinEDA_CvpcbFrame* m_Parent;
CVPCB_MAINFRAME* m_Parent;
wxConfig * m_Config;
wxString m_UserLibDirBufferImg;
bool m_LibListChanged;
@ -36,7 +36,7 @@ private:
public:
DIALOG_CVPCB_CONFIG( WinEDA_CvpcbFrame* parent );
DIALOG_CVPCB_CONFIG( CVPCB_MAINFRAME* parent );
~DIALOG_CVPCB_CONFIG() {};
};

4
cvpcb/genequiv.cpp
View File

@ -10,10 +10,10 @@
#include "cvpcb.h"
#include "protos.h"
#include "cvstruct.h"
#include "cvpcb_mainframe.h"
void WinEDA_CvpcbFrame::WriteStuffList( wxCommandEvent& event )
void CVPCB_MAINFRAME::WriteStuffList( wxCommandEvent& event )
{
FILE* FileEquiv;
wxString Line;

9
cvpcb/init.cpp
View File

@ -11,6 +11,7 @@
#include "cvpcb.h"
#include "protos.h"
#include "cvpcb_mainframe.h"
#include "cvstruct.h"
#include "build_version.h"
@ -19,7 +20,7 @@
* Set the module to the selected component
* Selects the next component
*/
void WinEDA_CvpcbFrame::SetNewPkg( const wxString& package )
void CVPCB_MAINFRAME::SetNewPkg( const wxString& package )
{
COMPONENT* Component;
bool isUndefined = false;
@ -69,7 +70,7 @@ void WinEDA_CvpcbFrame::SetNewPkg( const wxString& package )
/*
* Read the netlist format and file components.
*/
bool WinEDA_CvpcbFrame::ReadNetList()
bool CVPCB_MAINFRAME::ReadNetList()
{
wxString msg;
int error_level;
@ -90,7 +91,7 @@ bool WinEDA_CvpcbFrame::ReadNetList()
return false;
LoadProjectFile( m_NetlistFileName.GetFullPath() );
LoadFootprintFiles( m_ModuleLibNames, m_footprints );
LoadFootprintFiles( );
BuildFOOTPRINTS_LISTBOX();
m_ListCmp->Clear();
@ -124,7 +125,7 @@ bool WinEDA_CvpcbFrame::ReadNetList()
* The full name of the netlist file must be in FFileName.
* The file name is deducted in cmp
*/
int WinEDA_CvpcbFrame::SaveNetList( const wxString& fileName )
int CVPCB_MAINFRAME::SaveNetList( const wxString& fileName )
{
wxFileName fn;

11
cvpcb/listboxes.cpp
View File

@ -8,6 +8,7 @@
#include "cvpcb.h"
#include "protos.h"
#include "cvpcb_mainframe.h"
#include "cvstruct.h"
#include "cvpcb_id.h"
@ -20,7 +21,7 @@
#define LISTB_STYLE wxSUNKEN_BORDER | wxLC_NO_HEADER | \
wxLC_SINGLE_SEL | wxLC_REPORT | wxLC_VIRTUAL
ITEMS_LISTBOX_BASE::ITEMS_LISTBOX_BASE( WinEDA_CvpcbFrame* aParent, wxWindowID aId,
ITEMS_LISTBOX_BASE::ITEMS_LISTBOX_BASE( CVPCB_MAINFRAME* aParent, wxWindowID aId,
const wxPoint& aLocation, const wxSize& aSize ) :
wxListView( aParent, aId, aLocation, aSize, LISTB_STYLE )
{
@ -57,16 +58,16 @@ int ITEMS_LISTBOX_BASE::GetSelection()
}
WinEDA_CvpcbFrame* ITEMS_LISTBOX_BASE::GetParent()
CVPCB_MAINFRAME* ITEMS_LISTBOX_BASE::GetParent()
{
return (WinEDA_CvpcbFrame*) wxListView::GetParent();
return (CVPCB_MAINFRAME*) wxListView::GetParent();
}
/*
* Create or update the schematic components list.
*/
void WinEDA_CvpcbFrame::BuildCmpListBox()
void CVPCB_MAINFRAME::BuildCmpListBox()
{
wxString msg;
wxSize size( 10, 10 );
@ -103,7 +104,7 @@ void WinEDA_CvpcbFrame::BuildCmpListBox()
/*
* Create or update the footprint list.
*/
void WinEDA_CvpcbFrame::BuildFOOTPRINTS_LISTBOX()
void CVPCB_MAINFRAME::BuildFOOTPRINTS_LISTBOX()
{
wxString msg;
wxSize size( 10, 10 );

252
cvpcb/listlib.cpp
View File

@ -1,240 +1,174 @@
/***************/
/* listlib.cpp */
/* m_footprintslib.cpp */
/**(************/
/*
* Functions to read footprint libraries and create the list of availlable footprints
* Functions to read footprint libraries and create the m_footprints of availlable footprints
* and their documentation (comments and keywords)
*/
#include "fctsys.h"
#include "wxstruct.h"
#include "common.h"
#include "confirm.h"
#include "kicad_string.h"
#include "gestfich.h"
#include "macros.h"
#include "appl_wxstruct.h"
#include "cvpcb.h"
#include "protos.h"
#include "cvstruct.h"
#include "richio.h"
#include "filter_reader.h"
#include "dialog_load_error.h"
/* MDC and MOD file strings */
static wxString s_files_not_found;
static wxString s_files_invalid;
static void ReadDocLib( const wxString& ModLibName, FOOTPRINT_LIST& list );
/**
* Read the list of libraries and generate a list modules.
*
/*
* Read the list of libraries (*.mod files) and generate a m_footprints of modules.
* for each module are stored
* the module name
* documentation string
* associated keywords
* Module description format:
* $MODULE c64acmd
* Li c64acmd DIN connector
* Cd Europe 96 Contact AC male right
* Kw PAD_CONN DIN
* $MODULE c64acmd First line of module description
* Li c64acmd DIN connector Library reference
* Cd Europe 96 AC male vertical documentation string
* Kw PAD_CONN DIN associated keywords
* ...... other data (pads, outlines ..)
* $Endmodule
*
*/
bool LoadFootprintFiles( const wxArrayString& libNames,
FOOTPRINT_LIST& list )
bool CVPCB_MAINFRAME::LoadFootprintFiles( )
{
FILE* file;
char buffer[1024];
wxFileName filename;
int end;
FOOTPRINT* ItemLib;
unsigned i;
wxString tmp, msg;
char* result;
wxString libname;
wxString files_not_found;
wxString files_invalid;
/* Check if footprint list is not empty */
if( !list.empty() )
list.clear();
/* Check if footprint m_footprints is not empty */
if( !m_footprints.empty() )
m_footprints.clear();
/* Check if there are footprint libraries in project file */
if( libNames.GetCount() == 0 )
if( m_ModuleLibNames.GetCount() == 0 )
{
wxMessageBox( _( "No PCB foot print libraries are listed in the current project file." ),
wxMessageBox( _( "No PCB foot print libraries are m_footprintsed in the current project file." ),
_( "Project File Error" ), wxOK | wxICON_ERROR );
return false;
}
/* Parse Libraries Listed */
for( i = 0; i < libNames.GetCount(); i++ )
for( unsigned ii = 0; ii < m_ModuleLibNames.GetCount(); ii++ )
{
filename = libNames[i];
filename = m_ModuleLibNames[ii];
filename.SetExt( ModuleFileExtension );
tmp = wxGetApp().FindLibraryPath( filename );
libname = wxGetApp().FindLibraryPath( filename );
if( !tmp )
if( libname.IsEmpty() )
{
s_files_not_found << filename.GetFullName() << wxT("\n");
files_not_found << filename.GetFullName() << wxT("\n");
continue;
}
/* Open library file */
file = wxFopen( tmp, wxT( "rt" ) );
file = wxFopen( libname, wxT( "rt" ) );
if( file == NULL )
{
s_files_invalid << tmp << _(" (file cannot be opened)") << wxT("\n");
files_invalid << libname << _(" (file cannot be opened)") << wxT("\n");
continue;
}
/* Check if library type is valid */
result = fgets( buffer, 32, file );
if( strncmp( buffer, ENTETE_LIBRAIRIE, L_ENTETE_LIB ) != 0 )
FILE_LINE_READER fileReader( file, libname );
FILTER_READER reader( fileReader );
/* Read header. */
reader.ReadLine();
char * Line = reader.Line();
StrPurge( Line );
if( strnicmp( Line, ENTETE_LIBRAIRIE, L_ENTETE_LIB ) != 0 )
{
s_files_invalid << tmp << _(" (Not a Kicad file)") << wxT("\n");
wxString msg;
msg.Printf( _( "<%s> is not a valid Kicad PCB footprint library." ),
GetChars( libname ) );
files_invalid << msg << wxT("\n");
fclose( file );
continue;
}
/* TODO: Read the number of components. */
fseek( file, 0, 0 );
end = 0;
while( !end && fgets( buffer, 255, file ) != NULL )
// Read library
bool end = false;
while( !end && reader.ReadLine() )
{
if( strnicmp( buffer, "$INDEX", 6 ) == 0 )
Line = reader.Line();
StrPurge( Line );
if( strnicmp( Line, "$EndLIBRARY", 11 ) == 0 )
{
while( fgets( buffer, 255, file ) != NULL )
end = true;
break;
}
if( strnicmp( Line, "$MODULE", 7 ) == 0 )
{
Line += 7;
FOOTPRINT* ItemLib = new FOOTPRINT();
ItemLib->m_Module = CONV_FROM_UTF8( StrPurge( Line ) );
ItemLib->m_LibName = libname;
m_footprints.push_back( ItemLib );
while( reader.ReadLine() )
{
if( strnicmp( buffer, "$EndINDEX", 6 ) == 0 )
{
end = 1;
Line = reader.Line();
StrPurge( Line );
if( strnicmp( Line, "$EndMODULE", 10 ) == 0 )
break;
int id = ((Line[0] & 0xFF) << 8) + (Line[1] & 0xFF);
switch( id )
{
/* KeyWords */
case (('K'<<8) + 'w'):
ItemLib->m_KeyWord = CONV_FROM_UTF8( StrPurge( Line + 3 ) );
break;
/* Doc */
case (('C'<<8) + 'd'):
ItemLib->m_Doc = CONV_FROM_UTF8( StrPurge( Line + 3 ) );
break;
}
ItemLib = new FOOTPRINT();
ItemLib->m_Module = CONV_FROM_UTF8( StrPurge( buffer ) );
ItemLib->m_LibName = tmp;
list.push_back( ItemLib );
}
if( !end )
{
s_files_invalid << tmp << _(" (Unexpected end of file)") << wxT("\n");
}
}
}
fclose( file );
ReadDocLib( tmp, list );
if( !end )
{
files_invalid << libname << _(" (Unexpected end of file)") << wxT("\n");
}
}
m_footprints.sort();
/* Display if there are mdc files not found */
if( !s_files_not_found.IsEmpty() || !s_files_invalid.IsEmpty() )
/* Display error messages, if any */
if( !files_not_found.IsEmpty() || !files_invalid.IsEmpty() )
{
DIALOG_LOAD_ERROR dialog(NULL);
if( !s_files_not_found.IsEmpty() )
if( !files_not_found.IsEmpty() )
{
wxString message = _("Some files could not be found!");
dialog.MessageSet(message);
dialog.ListSet(s_files_not_found);
s_files_not_found.Empty();
dialog.ListSet(files_not_found);
}
/* Display if there are mdc files invalid */
if( !s_files_invalid.IsEmpty() )
/* Display if there are invalid files */
if( !files_invalid.IsEmpty() )
{
dialog.MessageSet( _("Some files are invalid!"));
dialog.ListSet(s_files_invalid);
s_files_invalid.Empty();
dialog.ListSet(files_invalid);
}
dialog.ShowModal();
}
list.sort();
return true;
}
/**
* Read the file Doc combines a library ModLibName.
* Create the list of doc strings pointed to by list
* ModLibName = full file name of the library modules
*/
static void ReadDocLib( const wxString& ModLibName, FOOTPRINT_LIST& list )
{
FOOTPRINT* NewMod;
char Line[1024];
wxString ModuleName;
FILE* mdc_file;
wxFileName mdc_filename = ModLibName;
/* Set mdc filename extension */
mdc_filename.SetExt( wxT( "mdc" ) );
/* Check if mdc file exists and can be opened */
if( ( mdc_file = wxFopen( mdc_filename.GetFullPath(), wxT( "rt" ) ) ) == NULL )
{
s_files_not_found += mdc_filename.GetFullPath() + wxT("\n");
return;
}
/* Check if mdc file is valid */
GetLine( mdc_file, Line, NULL, sizeof(Line) - 1 );
if( strnicmp( Line, ENTETE_LIBDOC, L_ENTETE_LIB ) != 0 )
{
s_files_invalid += mdc_filename.GetFullPath() + wxT("\n");
return;
}
/* Read the mdc file */
while( GetLine( mdc_file, Line, NULL, sizeof(Line) - 1 ) )
{
NewMod = NULL;
if( Line[0] != '$' )
continue;
if( Line[1] == 'E' )
break;
if( Line[1] == 'M' )
{
/* Parse file line by line */
while( GetLine( mdc_file, Line, NULL, sizeof(Line) - 1 ) )
{
/* $EndMODULE */
if( Line[0] == '$' )
break;
switch( Line[0] )
{
/* LibName */
case 'L': /* LibName */
ModuleName = CONV_FROM_UTF8( StrPurge( Line + 3 ) );
BOOST_FOREACH( FOOTPRINT& footprint, list )
{
if( ModuleName == footprint.m_Module )
{
NewMod = &footprint;
break;
}
}
break;
/* KeyWords */
case 'K':
if( NewMod && (!NewMod->m_KeyWord) )
NewMod->m_KeyWord = CONV_FROM_UTF8( StrPurge( Line + 3 ) );
break;
/* Doc */
case 'C':
if( NewMod && ( !NewMod->m_Doc ) )
NewMod->m_Doc = CONV_FROM_UTF8( StrPurge( Line + 3 ) );
break;
}
}
} /* Parsed one module documentation */
} /* Parsed complete library documentation */
fclose( mdc_file );
}

4
cvpcb/loadcmp.cpp
View File

@ -13,7 +13,7 @@
#include "cvpcb.h"
#include "protos.h"
#include "cvstruct.h"
#include "cvpcb_mainframe.h"
#include "class_DisplayFootprintsFrame.h"
#include "richio.h"
#include "filter_reader.h"
@ -36,7 +36,7 @@ MODULE* DISPLAY_FOOTPRINTS_FRAME::Get_Module( const wxString& CmpName )
wxString tmp, msg;
wxFileName fn;
MODULE* Module = NULL;
WinEDA_CvpcbFrame* parent = ( WinEDA_CvpcbFrame* ) GetParent();
CVPCB_MAINFRAME* parent = ( CVPCB_MAINFRAME* ) GetParent();
for( ii = 0; ii < parent->m_ModuleLibNames.GetCount(); ii++ )
{

4
cvpcb/menubar.cpp
View File

@ -9,13 +9,13 @@
#include "gestfich.h"
#include "cvpcb.h"
#include "cvstruct.h"
#include "cvpcb_mainframe.h"
#include "cvpcb_id.h"
#include "bitmaps.h"
void WinEDA_CvpcbFrame::ReCreateMenuBar()
void CVPCB_MAINFRAME::ReCreateMenuBar()
{
wxMenuItem* item;
wxMenuBar* menuBar = GetMenuBar();

2
cvpcb/protos.h
View File

@ -10,8 +10,6 @@ extern int GenNetlistPcbnew( FILE* f, COMPONENT_LIST& list,
bool rightJustify = false );
extern bool LoadComponentFile( const wxString& fileName,
COMPONENT_LIST& list );
extern bool LoadFootprintFiles( const wxArrayString& libNames,
FOOTPRINT_LIST& list );
FOOTPRINT* GetModuleDescrByName( const wxString& FootprintName,
FOOTPRINT_LIST& list );

6
cvpcb/readschematicnetlist.cpp
View File

@ -3,8 +3,6 @@
/****************************/
/* Read a nelist type Eeschema or OrcadPCB2 and build the component list
* Manages the lines like :
* ( XXXXXX VALEUR|(pin1,pin2,...=newalim) ID VALEUR
*/
#include "fctsys.h"
@ -16,7 +14,7 @@
#include "cvpcb.h"
#include "protos.h"
#include "cvstruct.h"
#include "cvpcb_mainframe.h"
#include "richio.h"
@ -86,7 +84,7 @@ static int ReadFootprintFilterList( FILE_LINE_READER& aNetlistReader, COMPONENT_
* $endfootprintlist
* }
*/
int WinEDA_CvpcbFrame::ReadSchematicNetlist()
int CVPCB_MAINFRAME::ReadSchematicNetlist()
{
char alim[1024];
int idx, jj, k, l;

4
cvpcb/savecmp.cpp
View File

@ -13,7 +13,7 @@
#include "cvpcb.h"
#include "protos.h"
#include "cvstruct.h"
#include "cvpcb_mainframe.h"
#include "build_version.h"
@ -30,7 +30,7 @@ const wxString titleComponentLibErr( _( "Component Library Error" ) );
* @param NetlistFullFileName - Name of net list file to save.
* @returns - 1 if OK, 0 if error.
*/
int WinEDA_CvpcbFrame::SaveComponentList( const wxString& NetlistFullFileName )
int CVPCB_MAINFRAME::SaveComponentList( const wxString& NetlistFullFileName )
{
FILE* dest;
wxFileName fn( NetlistFullFileName );

Some files were not shown because too many files have changed in this diff Show More