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

See my change_log.txt 2007-Sep-13 UPDATE

This commit is contained in:
dickelbeck 2007-09-13 11:55:46 +00:00
parent 0c77cf8085
commit 18d83b768c
141 changed files with 2866 additions and 2477 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
3d-viewer/3d_aux.cpp
View File

@ -113,7 +113,7 @@ GLfloat ax,ay,az,bx,by,bz,nx,ny,nz,r;
/**********************************************/
GLuint Pcb3D_GLCanvas::DisplayCubeforTest(void)
GLuint Pcb3D_GLCanvas::DisplayCubeforTest()
/**********************************************/
{
GLuint gllist = glGenLists( 1 );
@ -158,7 +158,7 @@ GLuint gllist = glGenLists( 1 );
/**********************/
/* Constructor */
Info_3D_Visu::Info_3D_Visu(void)
Info_3D_Visu::Info_3D_Visu()
{
int ii;
m_Beginx = m_Beginy = 0.0; /* position of mouse */
@ -170,7 +170,7 @@ int ii;
}
Info_3D_Visu::~Info_3D_Visu(void)
Info_3D_Visu::~Info_3D_Visu()
{
}
@ -216,13 +216,13 @@ wxStaticText * msgtitle;
GridSizer->Add(m_ZValueCtrl, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5);
}
WinEDA_VertexCtrl::~WinEDA_VertexCtrl(void)
WinEDA_VertexCtrl::~WinEDA_VertexCtrl()
{
}
/*******************************************/
S3D_Vertex WinEDA_VertexCtrl::GetValue(void)
S3D_Vertex WinEDA_VertexCtrl::GetValue()
/*******************************************/
/* Retourne (en unites internes) les coordonnes entrees (en unites utilisateur)
*/

8
3d-viewer/3d_class.cpp
View File

@ -17,7 +17,7 @@
/****************************/
S3D_Vertex::S3D_Vertex(void)
S3D_Vertex::S3D_Vertex()
/****************************/
{
x = y = z = 0.0;
@ -38,7 +38,7 @@ S3D_Material::S3D_Material( Struct3D_Master * father, const wxString & name ):
}
/***********************************/
void S3D_Material::SetMaterial(void)
void S3D_Material::SetMaterial()
/***********************************/
{
glColorMaterial(GL_FRONT_AND_BACK,GL_AMBIENT_AND_DIFFUSE);
@ -77,7 +77,7 @@ Struct3D_Master::Struct3D_Master(EDA_BaseStruct * StructFather):
/***************************************/
Struct3D_Master:: ~Struct3D_Master(void)
Struct3D_Master:: ~Struct3D_Master()
/***************************************/
{
Struct3D_Shape * next;
@ -110,7 +110,7 @@ Struct3D_Shape::Struct3D_Shape(EDA_BaseStruct * StructFather):
/***************************************/
Struct3D_Shape:: ~Struct3D_Shape(void)
Struct3D_Shape:: ~Struct3D_Shape()
/***************************************/
{
delete m_3D_Coord;

2
3d-viewer/3d_draw.cpp
View File

@ -72,7 +72,7 @@ void Pcb3D_GLCanvas::Redraw( bool finish )
}
/**********************************************/
GLuint Pcb3D_GLCanvas::CreateDrawGL_List(void)
GLuint Pcb3D_GLCanvas::CreateDrawGL_List()
/**********************************************/
/* Creation de la liste des elements a afficher
*/

10
3d-viewer/3d_frame.cpp
View File

@ -95,7 +95,7 @@ void WinEDA3D_DrawFrame::OnCloseWindow(wxCloseEvent & Event)
/******************************************/
void WinEDA3D_DrawFrame::GetSettings(void)
void WinEDA3D_DrawFrame::GetSettings()
/******************************************/
{
wxString text;
@ -122,7 +122,7 @@ wxConfig * Config = m_ParentAppl->m_EDA_Config; // Current config used by appl
}
/*******************************************/
void WinEDA3D_DrawFrame::SaveSettings(void)
void WinEDA3D_DrawFrame::SaveSettings()
/*******************************************/
{
wxString text;
@ -200,7 +200,7 @@ void WinEDA3D_DrawFrame::OnRightClick(const wxPoint& MousePos, wxMenu * PopMenu)
}
/************************************/
int WinEDA3D_DrawFrame::BestZoom(void)
int WinEDA3D_DrawFrame::BestZoom()
/************************************/
// Retourne le meilleur zoom
{
@ -288,7 +288,7 @@ void WinEDA3D_DrawFrame::Process_Special_Functions(wxCommandEvent& event)
/*****************************************/
void WinEDA3D_DrawFrame::NewDisplay(void)
void WinEDA3D_DrawFrame::NewDisplay()
/*****************************************/
{
m_Canvas->ClearLists();
@ -299,7 +299,7 @@ void WinEDA3D_DrawFrame::NewDisplay(void)
/******************************************/
void WinEDA3D_DrawFrame::Set3DBgColor(void)
void WinEDA3D_DrawFrame::Set3DBgColor()
/******************************************/
/* called to set the background color of the 3D scene
*/

2
3d-viewer/3d_read_mesh.cpp
View File

@ -19,7 +19,7 @@
/***********************************/
int Struct3D_Master:: ReadData(void)
int Struct3D_Master:: ReadData()
/************************************/
{
char line[1024], *text;

16
3d-viewer/3d_struct.h
View File

@ -21,7 +21,7 @@ class S3D_Color /* This is a 3D color (R, G, G) 3 floats range 0 to 1.0*/
public:
double m_Red, m_Green, m_Blue;
public:
S3D_Color(void)
S3D_Color()
{
m_Red = m_Green = m_Blue = 0;
}
@ -32,7 +32,7 @@ class S3D_Vertex /* This is a 3D coordinate (3 float numbers: x,y,z coordinates)
public:
double x, y, z;
public:
S3D_Vertex(void);
S3D_Vertex();
};
class S3D_Material: public EDA_BaseStruct /* openGL "material" data*/
@ -48,7 +48,7 @@ public:
public:
S3D_Material(Struct3D_Master * father, const wxString & name);
void SetMaterial(void);
void SetMaterial();
};
/*******************************************/
@ -67,10 +67,10 @@ public:
public:
Struct3D_Master(EDA_BaseStruct * StructFather);
~Struct3D_Master(void);
~Struct3D_Master();
void Copy(Struct3D_Master * pattern);
int ReadData(void);
int ReadData();
int ReadMaterial(FILE * file, int *LineNum);
int ReadChildren(FILE * file, int *LineNum);
int ReadShape(FILE * file, int *LineNum);
@ -94,7 +94,7 @@ public:
public:
Struct3D_Shape(EDA_BaseStruct * StructFather);
~Struct3D_Shape(void);
~Struct3D_Shape();
int ReadData(FILE * file, int *LineNum);
};
@ -123,9 +123,9 @@ public:
wxBoxSizer * BoxSizer,
int units, int internal_unit);
~WinEDA_VertexCtrl(void);
~WinEDA_VertexCtrl();
S3D_Vertex GetValue(void);
S3D_Vertex GetValue();
void SetValue(S3D_Vertex vertex);
void Enable(bool enbl);
void SetToolTip(const wxString & text);

36
3d-viewer/3d_viewer.h
View File

@ -61,8 +61,8 @@ public:
when scaled tey are between -1.0 and +1.0 */
float m_LayerZcoord[32];
public:
Info_3D_Visu(void);
~Info_3D_Visu(void);
Info_3D_Visu();
~Info_3D_Visu();
};
@ -78,9 +78,9 @@ private:
public:
Pcb3D_GLCanvas(WinEDA3D_DrawFrame *parent, const wxWindowID id = -1,
int* gl_attrib = NULL);
~Pcb3D_GLCanvas(void);
~Pcb3D_GLCanvas();
void ClearLists(void);
void ClearLists();
void OnPaint(wxPaintEvent& event);
void OnSize(wxSizeEvent& event);
@ -91,16 +91,16 @@ public:
void OnPopUpMenu(wxCommandEvent & event);
void TakeScreenshot(wxCommandEvent & event);
void SetView3D(int keycode);
void DisplayStatus(void);
void DisplayStatus();
void Redraw(bool finish = false);
GLuint DisplayCubeforTest(void);
GLuint DisplayCubeforTest();
void OnEnterWindow( wxMouseEvent& event );
void Render();
GLuint CreateDrawGL_List(void);
void InitGL(void);
void SetLights(void);
GLuint CreateDrawGL_List();
void InitGL();
void SetLights();
void Draw3D_Track(TRACK * track);
void Draw3D_Via(SEGVIA * via);
void Draw3D_DrawSegment(DRAWSEGMENT * segment);
@ -132,23 +132,23 @@ public:
void Exit3DFrame(wxCommandEvent& event);
void OnCloseWindow(wxCloseEvent & Event);
void ReCreateMenuBar(void);
void ReCreateHToolbar(void);
void ReCreateVToolbar(void);
void SetToolbars(void);
void GetSettings(void);
void SaveSettings(void);
void ReCreateMenuBar();
void ReCreateHToolbar();
void ReCreateVToolbar();
void SetToolbars();
void GetSettings();
void SaveSettings();
void OnLeftClick(wxDC * DC, const wxPoint& MousePos);
void OnRightClick(const wxPoint& MousePos, wxMenu * PopMenu);
void OnKeyEvent(wxKeyEvent& event);
int BestZoom(void); // Retourne le meilleur zoom
int BestZoom(); // Retourne le meilleur zoom
void RedrawActiveWindow(wxDC * DC, bool EraseBg);
void Process_Special_Functions(wxCommandEvent& event);
void Process_Zoom(wxCommandEvent& event);
void NewDisplay(void);
void Set3DBgColor(void);
void NewDisplay();
void Set3DBgColor();
DECLARE_EVENT_TABLE()
};

11
change_log.txt
View File

@ -4,6 +4,17 @@ Started 2007-June-11
Please add newer entries at the top, list the date and your name with
email address.
2007-Sep-13 UPDATE Dick Hollenbeck <dick@softplc.com>
================================================================================
+ kicad
* Inverted the logic associated with filters. Filters now enable a file
in the project manager. The default is to ignore all files.
* The filter for *.sch files is smarter, in that it looks to display only
top level *.sch files, rather than all *.sch files.
+ Others
More beautification
2007-sept-13 UPDATE Jean-Pierre Charras <jean-pierre.charras@inpg.fr>
================================================================================
+ all

8
common/basicframe.cpp
View File

@ -48,7 +48,7 @@ wxSize minsize;
}
/******************************************/
WinEDA_BasicFrame::~WinEDA_BasicFrame(void)
WinEDA_BasicFrame::~WinEDA_BasicFrame()
/******************************************/
{
if ( m_Parent->m_HtmlCtrl ) delete m_Parent->m_HtmlCtrl;
@ -56,7 +56,7 @@ WinEDA_BasicFrame::~WinEDA_BasicFrame(void)
}
/********************************************/
void WinEDA_BasicFrame::ReCreateMenuBar(void)
void WinEDA_BasicFrame::ReCreateMenuBar()
/********************************************/
// Virtual function
{
@ -64,7 +64,7 @@ void WinEDA_BasicFrame::ReCreateMenuBar(void)
/*********************************************/
void WinEDA_BasicFrame::GetSettings(void)
void WinEDA_BasicFrame::GetSettings()
/*********************************************/
{
wxString text;
@ -94,7 +94,7 @@ int Ypos_min;
/*****************************************/
void WinEDA_BasicFrame::SaveSettings(void)
void WinEDA_BasicFrame::SaveSettings()
/*****************************************/
{
wxString text;

2
common/common_plot_functions.cpp
View File

@ -27,7 +27,7 @@ int PlotOrientOptions, etat_plume;
static Ki_PageDescr * SheetPS;
/*************************/
void ForcePenReinit(void)
void ForcePenReinit()
/*************************/
/* set the flag g_CurrentPenWidth to -1 in order to force a pen width redefinition
for the next draw command

6
common/displlst.cpp
View File

@ -133,13 +133,13 @@ int ii;
}
WinEDAListBox:: ~WinEDAListBox(void)
WinEDAListBox:: ~WinEDAListBox()
{
}
/******************************************/
void WinEDAListBox::MoveMouseToOrigin(void)
void WinEDAListBox::MoveMouseToOrigin()
/******************************************/
{
int x, y, w, h;
@ -153,7 +153,7 @@ int orgy = m_List->GetRect().GetTop();
}
/*********************************************/
wxString WinEDAListBox::GetTextSelection(void)
wxString WinEDAListBox::GetTextSelection()
/*********************************************/
{
wxString text = m_List->GetStringSelection();

4
common/eda_doc.cpp
View File

@ -22,7 +22,7 @@
#include "common.h"
/*****************************************/
void WinEDA_App::ReadPdfBrowserInfos(void)
void WinEDA_App::ReadPdfBrowserInfos()
/*****************************************/
/* Read from Common config the Pdf browser choice
*/
@ -36,7 +36,7 @@ void WinEDA_App::ReadPdfBrowserInfos(void)
}
/*****************************************/
void WinEDA_App::WritePdfBrowserInfos(void)
void WinEDA_App::WritePdfBrowserInfos()
/*****************************************/
/* Write into Common config the Pdf browser choice
*/

14
common/edaappl.cpp
View File

@ -56,7 +56,7 @@
/* Constructeur de WinEDA_App */
/*****************************/
WinEDA_App::WinEDA_App(void)
WinEDA_App::WinEDA_App()
{
m_Checker = NULL;
m_MainFrame = NULL;
@ -84,7 +84,7 @@ WinEDA_App::WinEDA_App(void)
/* Destructeur de WinEDA_App */
/*****************************/
WinEDA_App::~WinEDA_App(void)
WinEDA_App::~WinEDA_App()
{
SaveSettings();
@ -166,7 +166,7 @@ bool succes = SetLanguage(TRUE);
/*****************************************/
void WinEDA_App::InitOnLineHelp(void)
void WinEDA_App::InitOnLineHelp()
/*****************************************/
/* Init On Line Help
*/
@ -187,7 +187,7 @@ wxString fullfilename = FindKicadHelpPath();
/*******************************/
bool WinEDA_App::SetBinDir(void)
bool WinEDA_App::SetBinDir()
/*******************************/
/*
Analyse la ligne de commande pour retrouver le chemin de l'executable
@ -236,7 +236,7 @@ int ii;
/*********************************/
void WinEDA_App::GetSettings(void)
void WinEDA_App::GetSettings()
/*********************************/
/* Lit les infos utiles sauvees lors de la derniere utilisation du logiciel
*/
@ -305,7 +305,7 @@ unsigned ii;
/**********************************/
void WinEDA_App::SaveSettings(void)
void WinEDA_App::SaveSettings()
/**********************************/
{
unsigned int ii;
@ -583,7 +583,7 @@ wxMenuItem * item;
}
int WinEDA_App::OnRun(void)
int WinEDA_App::OnRun()
/* Run init scripts */
{
#ifdef KICAD_PYTHON

2
common/edamenu.cpp
View File

@ -43,7 +43,7 @@ double value;
}
/**********************/
wxString GenDate(void)
wxString GenDate()
/**********************/
/* Retourne la chaine de caractere donnant la date */
{

2
common/get_component_dialog.cpp
View File

@ -46,7 +46,7 @@ public:
WinEDA_SelectCmp(WinEDA_DrawFrame *parent, const wxPoint& framepos,
wxArrayString & HistoryList, const wxString & Title,
bool show_extra_tool );
~WinEDA_SelectCmp(void) {};
~WinEDA_SelectCmp() {};
private:
void Accept(wxCommandEvent& event);

4
common/msgpanel.cpp
View File

@ -34,7 +34,7 @@ WinEDA_MsgPanel::WinEDA_MsgPanel(WinEDA_DrawFrame *parent, int id,
WinEDA_MsgPanel::~WinEDA_MsgPanel(void)
WinEDA_MsgPanel::~WinEDA_MsgPanel()
{
}
@ -110,7 +110,7 @@ wxClientDC dc(this);
}
/****************************************/
void WinEDA_MsgPanel::EraseMsgBox(void)
void WinEDA_MsgPanel::EraseMsgBox()
/****************************************/
/* Effacement de la fenetre d'affichage des messages de bas d'ecran
*/

2
common/pyhandler.cpp
View File

@ -55,7 +55,7 @@ static void RegisterCb( str objKey, object callback )
static void UnRegisterCb( str objKey, object callback )
{ PyHandler::GetInstance()->UnRegisterCallback( PyHandler::MakeStr(objKey), callback ); }
static void init_base_utils(void)
static void init_base_utils()
{
def ( "ChooseFile", &ChooseFile );
def ( "RegisterCallback", &RegisterCb );

2
common/selcolor.cpp
View File

@ -30,7 +30,7 @@ public:
// Constructor and destructor
WinEDA_SelColorFrame(wxWindow *parent,
const wxPoint& framepos, int OldColor);
~WinEDA_SelColorFrame(void) {};
~WinEDA_SelColorFrame() {};
private:
void OnCancel(wxCommandEvent& event);

2
common/string.cpp
View File

@ -96,7 +96,7 @@ struct tm * Date;
}
/*******************************/
wxString DateAndTime(void)
wxString DateAndTime()
/*******************************/
/* Retourne la chaine de caractere donnant date+heure */
{

2
common/svg_print.cpp
View File

@ -279,7 +279,7 @@ wxIcon WinEDA_PrintSVGFrame::GetIconResource( const wxString& name )
/******************************************************/
wxString WinEDA_PrintSVGFrame::ReturnFullFileName(void)
wxString WinEDA_PrintSVGFrame::ReturnFullFileName()
/******************************************************/
{
wxString name, ext;

2
common/svg_print.h
View File

@ -122,7 +122,7 @@ public:
void PrintSVGDoc(wxCommandEvent& event);
bool DrawPage(const wxString & FullFileName);
void SetPenWidth(wxSpinEvent& event);
wxString ReturnFullFileName(void);
wxString ReturnFullFileName();
////@begin WinEDA_PrintSVGFrame member variables
wxSpinCtrl* m_ButtPenWidth;

22
common/wxwineda.cpp
View File

@ -31,7 +31,7 @@ WinEDA_EnterText::WinEDA_EnterText(wxWindow *parent, const wxString &Title,
/****************************************/
wxString WinEDA_EnterText::GetValue(void)
wxString WinEDA_EnterText::GetValue()
/****************************************/
{
m_Modify = m_FrameText->IsModified();
@ -101,7 +101,7 @@ WinEDA_GraphicTextCtrl::WinEDA_GraphicTextCtrl(wxWindow *parent,
}
WinEDA_GraphicTextCtrl::~WinEDA_GraphicTextCtrl(void)
WinEDA_GraphicTextCtrl::~WinEDA_GraphicTextCtrl()
{
delete m_FrameText;
delete m_Title;
@ -126,13 +126,13 @@ void WinEDA_GraphicTextCtrl::SetValue(int value)
}
wxString WinEDA_GraphicTextCtrl::GetText(void)
wxString WinEDA_GraphicTextCtrl::GetText()
{
wxString text = m_FrameText->GetValue();
return text;
}
int WinEDA_GraphicTextCtrl::GetTextSize(void)
int WinEDA_GraphicTextCtrl::GetTextSize()
{
int textsize;
double dtmp;
@ -188,7 +188,7 @@ wxString text;
}
WinEDA_PositionCtrl::~WinEDA_PositionCtrl(void)
WinEDA_PositionCtrl::~WinEDA_PositionCtrl()
{
delete m_TextX;
delete m_TextY;
@ -197,7 +197,7 @@ WinEDA_PositionCtrl::~WinEDA_PositionCtrl(void)
}
/******************************************/
wxPoint WinEDA_PositionCtrl::GetValue(void)
wxPoint WinEDA_PositionCtrl::GetValue()
/******************************************/
/* Retourne (en unites internes) les coordonnes entrees (en unites utilisateur)
*/
@ -254,7 +254,7 @@ WinEDA_SizeCtrl::WinEDA_SizeCtrl(wxWindow *parent, const wxString & title,
}
/*************************************/
wxSize WinEDA_SizeCtrl::GetValue(void)
wxSize WinEDA_SizeCtrl::GetValue()
/*************************************/
{
wxPoint pos = WinEDA_PositionCtrl::GetValue();
@ -293,14 +293,14 @@ wxString stringvalue = ReturnStringFromValue(m_Units, m_Value,m_Internal_Unit);
BoxSizer->Add(m_ValueCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT|wxBOTTOM, 5);
}
WinEDA_ValueCtrl::~WinEDA_ValueCtrl(void)
WinEDA_ValueCtrl::~WinEDA_ValueCtrl()
{
delete m_ValueCtrl;
delete m_Text;
}
/***********************************/
int WinEDA_ValueCtrl::GetValue(void)
int WinEDA_ValueCtrl::GetValue()
/***********************************/
{
int coord;
@ -347,13 +347,13 @@ wxString label = title;
BoxSizer->Add(m_ValueCtrl, 0, wxGROW|wxLEFT|wxRIGHT|wxBOTTOM, 5);
}
WinEDA_DFloatValueCtrl::~WinEDA_DFloatValueCtrl(void)
WinEDA_DFloatValueCtrl::~WinEDA_DFloatValueCtrl()
{
delete m_ValueCtrl;
delete m_Text;
}
double WinEDA_DFloatValueCtrl::GetValue(void)
double WinEDA_DFloatValueCtrl::GetValue()
{
double coord = 0;

2
cvpcb/autosel.cpp
View File

@ -22,7 +22,7 @@ public:
wxString m_LibName;
wxString m_Library;
AUTOMODULE(void) { m_Type = 0; Pnext = NULL; }
AUTOMODULE() { m_Type = 0; Pnext = NULL; }
} ;

8
cvpcb/class_cvpcb.cpp
View File

@ -20,7 +20,7 @@
#include "cvpcb.h"
STORECMP::STORECMP(void)
STORECMP::STORECMP()
{
Pnext = Pback = NULL;
m_Type = STRUCT_COMPONENT;
@ -29,7 +29,7 @@ STORECMP::STORECMP(void)
m_Multi = 0;
}
STORECMP::~STORECMP(void)
STORECMP::~STORECMP()
{
STOREPIN * Pin, * NextPin;
@ -41,7 +41,7 @@ STOREPIN * Pin, * NextPin;
STOREMOD::STOREMOD(void)
STOREMOD::STOREMOD()
{
Pnext = Pback = NULL;
m_Type = STRUCT_MODULE;
@ -49,7 +49,7 @@ STOREMOD::STOREMOD(void)
}
STOREPIN::STOREPIN(void)
STOREPIN::STOREPIN()
{
m_Type = STRUCT_PIN; /* Type de la structure */
Pnext = NULL; /* Chainage avant */

2
cvpcb/cvframe.cpp
View File

@ -82,7 +82,7 @@ int dims[3] = { -1, -1, 250};
/******************************************/
WinEDA_CvpcbFrame::~WinEDA_CvpcbFrame(void)
WinEDA_CvpcbFrame::~WinEDA_CvpcbFrame()
/******************************************/
{
if( m_Parent->m_EDA_Config )

2
cvpcb/cvpcb.cpp
View File

@ -28,7 +28,7 @@ IMPLEMENT_APP(WinEDA_App)
/* Called to initialize the program */
/************************************/
bool WinEDA_App::OnInit(void)
bool WinEDA_App::OnInit()
{
wxString msg;
wxString currCWD = wxGetCwd();

8
cvpcb/cvpcb.h
View File

@ -40,7 +40,7 @@ public:
wxString m_PinName;
wxString m_Repere; /* utilise selon formats de netliste */
STOREPIN(void);
STOREPIN();
} ;
class STORECMP
@ -60,8 +60,8 @@ public:
wxArrayString m_FootprintFilter; /* List of allowed footprints (wildcart allowed
if void: no filtering */
STORECMP(void);
~STORECMP(void);
STORECMP();
~STORECMP();
} ;
class STOREMOD
@ -76,7 +76,7 @@ public:
wxString m_Doc; /* Doc associee */
wxString m_KeyWord; /* Mots cles associes */
STOREMOD(void);
STOREMOD();
};

52
cvpcb/cvstruct.h
View File

@ -40,7 +40,7 @@ private:
// Constructor and destructor
public:
WinEDA_CvpcbFrame(WinEDA_App * parent, const wxString & title);
~WinEDA_CvpcbFrame(void);
~WinEDA_CvpcbFrame();
void OnLeftClick(wxListEvent & event);
void OnLeftDClick(wxListEvent & event);
@ -51,8 +51,8 @@ public:
void OnCloseWindow(wxCloseEvent & Event);
void OnSize(wxSizeEvent& SizeEvent);
void OnChar(wxKeyEvent& event);
void ReCreateHToolbar(void);
virtual void ReCreateMenuBar(void);
void ReCreateHToolbar();
virtual void ReCreateMenuBar();
void SetLanguage(wxCommandEvent& event);
void AddFontSelectionMenu(wxMenu * main_menu);
void ProcessFontPreferences(wxCommandEvent& event);
@ -69,19 +69,19 @@ public:
void DisplayDocFile(wxCommandEvent & event);
void OnSelectFilteringFootprint(wxCommandEvent & event);
void SetNewPkg(const wxString & package);
void BuildCmpListBox(void);
void BuildFootprintListBox(void);
void CreateScreenCmp(void);
void CreateConfigWindow(void);
void BuildCmpListBox();
void BuildFootprintListBox();
void CreateScreenCmp();
void CreateConfigWindow();
int SaveNetList(const wxString & FullFileName);
int SaveComponentList(const wxString & FullFileName);
bool ReadInputNetList(const wxString & FullFileName);
void ReadNetListe(void);
int rdpcad(void);
int ReadSchematicNetlist(void);
void ReadNetListe();
int rdpcad();
int ReadSchematicNetlist();
int ReadFootprintFilterList( FILE * f);
int ReadViewlogicWirList(void);
int ReadViewlogicNetList(void);
int ReadViewlogicWirList();
int ReadViewlogicNetList();
DECLARE_EVENT_TABLE()
};
@ -100,9 +100,9 @@ public:
ListBoxBase(WinEDA_CvpcbFrame * parent, wxWindowID id,
const wxPoint& loc, const wxSize& size);
~ListBoxBase(void);
~ListBoxBase();
int GetSelection(void);
int GetSelection();
void OnSize(wxSizeEvent& event);
};
@ -123,17 +123,17 @@ public:
FootprintListBox(WinEDA_CvpcbFrame * parent,
wxWindowID id, const wxPoint& loc, const wxSize& size,
int nbitems, wxString choice[]);
~FootprintListBox(void);
~FootprintListBox();
int GetCount(void);
int GetCount();
void SetSelection(unsigned index, bool State = TRUE);
void SetString(unsigned linecount, const wxString & text);
void AppendLine(const wxString & text);
void SetFootprintFullList(void);
void SetFootprintFullList();
void SetFootprintFilteredList(STORECMP * Component);
void SetActiveFootprintList(bool FullList, bool Redraw = FALSE);
wxString GetSelectedFootprint(void);
wxString GetSelectedFootprint();
wxString OnGetItemText(long item, long column) const;
void OnLeftClick(wxListEvent & event);
void OnLeftDClick(wxListEvent & event);
@ -156,10 +156,10 @@ public:
const wxPoint& loc, const wxSize& size,
int nbitems, wxString choice[]);
~ListBoxCmp(void);
~ListBoxCmp();
void Clear(void);
int GetCount(void);
void Clear();
int GetCount();
wxString OnGetItemText(long item, long column) const;
void SetSelection(unsigned index, bool State = TRUE);
void SetString(unsigned linecount, const wxString & text);
@ -182,18 +182,18 @@ public:
const wxString & title,
const wxPoint& pos, const wxSize& size);
~WinEDA_DisplayFrame(void);
~WinEDA_DisplayFrame();
void OnCloseWindow(wxCloseEvent & Event);
void Process_Special_Functions(wxCommandEvent& event);
void RedrawActiveWindow(wxDC * DC, bool EraseBg);
void ReCreateHToolbar(void);
void ReCreateVToolbar(void);
void RecreateMenuBar(void);
void ReCreateHToolbar();
void ReCreateVToolbar();
void RecreateMenuBar();
void OnLeftClick(wxDC * DC, const wxPoint& MousePos);
void OnLeftDClick(wxDC * DC, const wxPoint& MousePos);
void OnRightClick(const wxPoint& MousePos, wxMenu * PopMenu);
void SetToolbars(void);
void SetToolbars();
void InstallOptionsDisplay(wxCommandEvent& event);
MODULE * Get_Module(const wxString & CmpName);

4
cvpcb/dialog_cvpcb_config.h
View File

@ -128,7 +128,7 @@ public:
/// Should we show tooltips?
static bool ShowToolTips();
void Update(void);
void Update();
void AcceptCfg(wxCommandEvent& event);
void SaveCfg(wxCommandEvent& event);
void ReadOldCfg(wxCommandEvent& event);
@ -137,7 +137,7 @@ public:
void EquDelFct(wxCommandEvent& event);
void EquAddFct(wxCommandEvent& event);
void ReturnNetFormat(wxCommandEvent& event);
void SetDialogDatas(void);
void SetDialogDatas();
////@begin KiConfigCvpcbFrame member variables

8
cvpcb/displayframe.cpp
View File

@ -64,7 +64,7 @@ WinEDA_DisplayFrame::WinEDA_DisplayFrame( wxWindow * father, WinEDA_App *parent,
/* Fonctions de base de WinEDA_DisplayFrame */
/*****************************************/
// Destructeur
WinEDA_DisplayFrame::~WinEDA_DisplayFrame(void)
WinEDA_DisplayFrame::~WinEDA_DisplayFrame()
{
if ( m_Pcb->m_Modules ) DeleteStructure( m_Pcb->m_Modules );
m_Pcb->m_Modules = NULL;
@ -93,14 +93,14 @@ wxSize size;
/************************************************/
void WinEDA_DisplayFrame::ReCreateVToolbar(void)
void WinEDA_DisplayFrame::ReCreateVToolbar()
/************************************************/
{
}
/************************************************/
void WinEDA_DisplayFrame::ReCreateHToolbar(void)
void WinEDA_DisplayFrame::ReCreateHToolbar()
/************************************************/
{
if ( m_HToolBar != NULL ) return;
@ -137,7 +137,7 @@ void WinEDA_DisplayFrame::ReCreateHToolbar(void)
/*******************************************/
void WinEDA_DisplayFrame::SetToolbars(void)
void WinEDA_DisplayFrame::SetToolbars()
/*******************************************/
{
}

2
cvpcb/genorcad.cpp
View File

@ -25,7 +25,7 @@ static void ChangePinNet( wxString & PinNet );
int NetNumCode; /* Nombre utilise pour cree des NetNames lors de
reaffectation de NetNames */
int genorcad(void)
int genorcad()
{
char Line[1024];
STOREPIN * Pin;

2
cvpcb/init.cpp
View File

@ -67,7 +67,7 @@ wxString Line;
}
/********************************************/
void WinEDA_CvpcbFrame::ReadNetListe(void)
void WinEDA_CvpcbFrame::ReadNetListe()
/*******************************************/
/* Lecture de la netliste selon format, ainsi que du fichier des composants
*/

22
cvpcb/listboxes.cpp
View File

@ -29,7 +29,7 @@ ListBoxBase::ListBoxBase(WinEDA_CvpcbFrame * parent,
ListBoxBase::~ListBoxBase(void)
ListBoxBase::~ListBoxBase()
{
}
@ -50,7 +50,7 @@ int width = 0;
/*********************************/
int ListBoxBase::GetSelection(void)
int ListBoxBase::GetSelection()
/*********************************/
// Return an index for the selected item
{
@ -72,13 +72,13 @@ FootprintListBox::FootprintListBox(WinEDA_CvpcbFrame * parent,
FootprintListBox::~FootprintListBox(void)
FootprintListBox::~FootprintListBox()
{
}
/**********************************/
int FootprintListBox::GetCount(void)
int FootprintListBox::GetCount()
/**********************************/
// Return number of items
{
@ -97,7 +97,7 @@ void FootprintListBox::SetString(unsigned linecount, const wxString & text)
}
/***************************************************/
wxString FootprintListBox::GetSelectedFootprint(void)
wxString FootprintListBox::GetSelectedFootprint()
/***************************************************/
// Return an index for the selected item
{
@ -165,7 +165,7 @@ ListBoxCmp::ListBoxCmp(WinEDA_CvpcbFrame * parent, wxWindowID id,
ListBoxCmp::~ListBoxCmp(void)
ListBoxCmp::~ListBoxCmp()
{
}
@ -181,7 +181,7 @@ BEGIN_EVENT_TABLE(ListBoxCmp, LIST_BOX_TYPE)
END_EVENT_TABLE()
/****************************/
void ListBoxCmp::Clear(void)
void ListBoxCmp::Clear()
/****************************/
// Reset ALL datas
{
@ -190,7 +190,7 @@ void ListBoxCmp::Clear(void)
}
/******************************/
int ListBoxCmp::GetCount(void)
int ListBoxCmp::GetCount()
/******************************/
// Return number of items
{
@ -243,7 +243,7 @@ void ListBoxCmp::SetSelection(unsigned index, bool State)
}
/********************************************/
void WinEDA_CvpcbFrame::BuildCmpListBox(void)
void WinEDA_CvpcbFrame::BuildCmpListBox()
/********************************************/
/* Construit la fenetre d'affichage de la liste des composant.
dimx et dimy sont les dimensions de la surface totale d'affichage
@ -283,7 +283,7 @@ wxSize size(10,10);
/*************************************************************/
void WinEDA_CvpcbFrame::BuildFootprintListBox(void)
void WinEDA_CvpcbFrame::BuildFootprintListBox()
/*************************************************************/
/* Construit la fenetre d'affichage de la liste des Modules.
dimx et dimy sont les dimensions de la surface totale d'affichage
@ -313,7 +313,7 @@ wxSize size(10,10);
/************************************************/
void FootprintListBox::SetFootprintFullList(void)
void FootprintListBox::SetFootprintFullList()
/************************************************/
{
STOREMOD * FootprintItem;

2
cvpcb/listlib.cpp
View File

@ -25,7 +25,7 @@ static STOREMOD * TriListeModules(STOREMOD * BaseListe, int nbitems);
/**/
/*********************/
int listlib(void)
int listlib()
/*********************/
/* Routine lisant la liste des librairies, et generant la liste chainee
des modules disponibles

4
cvpcb/memoire.cpp
View File

@ -11,7 +11,7 @@
/********************************/
void FreeMemoryModules(void)
void FreeMemoryModules()
/********************************/
/* Routine de liberation memoire de la liste des modules
@ -34,7 +34,7 @@ STOREMOD * Module, * NextMod;
}
/***********************************/
void FreeMemoryComponants(void)
void FreeMemoryComponants()
/***********************************/
/* Routine de liberation memoire de la liste des composants

6
cvpcb/menucfg.cpp
View File

@ -35,7 +35,7 @@
/***************************************************/
void WinEDA_CvpcbFrame::CreateConfigWindow(void)
void WinEDA_CvpcbFrame::CreateConfigWindow()
/***************************************************/
/* Creation de la fenetre de configuration de CVPCB */
{
@ -45,7 +45,7 @@ KiConfigCvpcbFrame * ConfigFrame = new KiConfigCvpcbFrame(this);
/*********************************************/
void KiConfigCvpcbFrame::SetDialogDatas(void)
void KiConfigCvpcbFrame::SetDialogDatas()
/*********************************************/
{
m_ListLibr->InsertItems(g_LibName_List,0);
@ -124,7 +124,7 @@ void KiConfigCvpcbFrame::AcceptCfg(wxCommandEvent& event)
}
/**********************************/
void KiConfigCvpcbFrame::Update(void)
void KiConfigCvpcbFrame::Update()
/**********************************/
{
wxString msg;

18
cvpcb/protos.h
View File

@ -8,9 +8,9 @@
class DESCR_EDGE;
int reaffect( char *ib, char *net) ;
int GenNetlistPcbnew(void) ;
int loadcmp(void) ;
int listlib(void) ;
int GenNetlistPcbnew() ;
int loadcmp() ;
int listlib() ;
STOREMOD * GetModuleDescrByName(const wxString & FootprintName);
/***********/
@ -41,12 +41,12 @@ void DeleteStructure( void * GenericStructure );
/**************/
/* MEMOIRE.CC */
/**************/
void FreeMemoryComponants(void);
void FreeMemoryComponants();
/* Routine de liberation memoire de la liste des composants
- remet a NULL BaseListeMod
- remet a 0 NbComp */
void FreeMemoryModules(void);
void FreeMemoryModules();
/* Routine de liberation memoire de la liste des modules
- remet a NULL g_BaseListePkg
- rement a 0 NbLib; */
@ -91,12 +91,12 @@ int CmpCompare( void * cmp1, void * cmp2); /* routine pour qsort()
/***************/
/* viewlogi.cc */
/***************/
int ReadViewlogicWirList(void);
int ReadViewlogicWirList();
/***************/
/* viewlnet.cc */
/***************/
int ReadViewlogicNetList(void);
int ReadViewlogicNetList();
/***************/
/* TRACEMOD.CC */
@ -117,8 +117,8 @@ void Display_1_Texte(WinEDA_DrawPanel * panel, wxDC * DC,
/**********/
/* COLORS */
/**********/
void BuildPensBrushes(void);
void FreePensBrushes(void);
void BuildPensBrushes();
void FreePensBrushes();
int GetNewColor(wxWindow * Frame, int OldColor = -1); /* Routine de selection d'une couleur */
/***********/

6
cvpcb/rdpcad.cpp
View File

@ -18,10 +18,10 @@ assure la reaffectation des alimentations selon le format :
#define SEPARATEUR '|'
/* routines locales : */
int pin(void) ;
int pin() ;
/***************************************/
int WinEDA_CvpcbFrame::rdpcad(void)
int WinEDA_CvpcbFrame::rdpcad()
/***************************************/
{
int i , j , k ,l ;
@ -146,7 +146,7 @@ for ( ;; )
/* pin() : analyse liste des pines */
/***********************************/
int pin(void)
int pin()
{
int i , j , k ;
char numpin[9] , net[9] ;

2
cvpcb/readschematicnetlist.cpp
View File

@ -23,7 +23,7 @@ static int pin_orcad(STORECMP * CurrentCmp);
/************************************************/
int WinEDA_CvpcbFrame::ReadSchematicNetlist(void)
int WinEDA_CvpcbFrame::ReadSchematicNetlist()
/************************************************/
{
int i , j , k ,l ;

2
cvpcb/savecmp.cpp
View File

@ -54,7 +54,7 @@ wxString Title = g_Main_Title + wxT(" ") + GetBuildVersion();
}
/****************/
int loadcmp(void)
int loadcmp()
/***************/
/* recupere la liste des associations composants/empreintes
*/

2
cvpcb/setvisu.cpp
View File

@ -14,7 +14,7 @@
#include "protos.h"
/*******************************************/
void WinEDA_CvpcbFrame::CreateScreenCmp(void)
void WinEDA_CvpcbFrame::CreateScreenCmp()
/*******************************************/
/* Creation de la fenetre d'affichage du composant
*/

4
cvpcb/tool_cvpcb.cpp
View File

@ -23,7 +23,7 @@
/*********************************************/
void WinEDA_CvpcbFrame::ReCreateHToolbar(void)
void WinEDA_CvpcbFrame::ReCreateHToolbar()
/*********************************************/
{
if ( m_HToolBar != NULL ) return;
@ -93,7 +93,7 @@ void WinEDA_CvpcbFrame::ReCreateHToolbar(void)
/*******************************************/
void WinEDA_CvpcbFrame::ReCreateMenuBar(void)
void WinEDA_CvpcbFrame::ReCreateMenuBar()
/*******************************************/
/* Creation des menus de la fenetre principale
*/

4
cvpcb/viewlnet.cpp
View File

@ -36,10 +36,10 @@ static int GenListeComposants(FILE * PkgFile);
/* Variables Locales */
/******************************/
/* int ReadViewlogicNet(void) */
/* int ReadViewlogicNet() */
/******************************/
int WinEDA_CvpcbFrame::ReadViewlogicNetList(void)
int WinEDA_CvpcbFrame::ReadViewlogicNetList()
{
int ii, LineNum;
char Line[1024], *Text;

2
cvpcb/viewlogi.cpp
View File

@ -33,7 +33,7 @@ STORECMP * BasePseudoCmp; /* Stockage des descriptions generales */
/************************************************/
int WinEDA_CvpcbFrame::ReadViewlogicWirList(void)
int WinEDA_CvpcbFrame::ReadViewlogicWirList()
/************************************************/
{
int ii, Type = 0, error, Header;

2
cvpcb/writenetlistpcbnew.cpp
View File

@ -27,7 +27,7 @@ int NetNumCode; /* Nombre utilise pour cree des NetNames lors de
/*************************/
int GenNetlistPcbnew(void)
int GenNetlistPcbnew()
/*************************/
{
#define NETLIST_HEAD_STRING "EESchema Netlist Version 1.1"

14
eeschema/component_class.cpp
View File

@ -32,7 +32,7 @@ DrawPartStruct::DrawPartStruct( KICAD_T struct_type, const wxPoint & pos):
}
/************************************/
DrawPartStruct::~DrawPartStruct(void)
DrawPartStruct::~DrawPartStruct()
/************************************/
{
}
@ -221,7 +221,7 @@ void EDA_SchComponentStruct::Place(WinEDA_DrawFrame * frame, wxDC * DC)
/***************************************************/
void EDA_SchComponentStruct::ClearAnnotation(void)
void EDA_SchComponentStruct::ClearAnnotation()
/***************************************************/
/* Suppress annotation ( i.i IC23 changed to IC? and part reset to 1)
*/
@ -241,7 +241,7 @@ EDA_LibComponentStruct *Entry;
}
/**************************************************************/
EDA_SchComponentStruct * EDA_SchComponentStruct::GenCopy(void)
EDA_SchComponentStruct * EDA_SchComponentStruct::GenCopy()
/**************************************************************/
{
EDA_SchComponentStruct * new_item = new EDA_SchComponentStruct( m_Pos );
@ -411,7 +411,7 @@ bool Transform = FALSE;
/****************************************************/
int EDA_SchComponentStruct::GetRotationMiroir(void)
int EDA_SchComponentStruct::GetRotationMiroir()
/****************************************************/
{
int type_rotate = CMP_ORIENT_0;
@ -500,7 +500,7 @@ PartTextStruct::PartTextStruct(const wxPoint & pos, const wxString & text):
}
/************************************/
PartTextStruct::~PartTextStruct(void)
PartTextStruct::~PartTextStruct()
/************************************/
{
}
@ -524,7 +524,7 @@ void PartTextStruct::PartTextCopy(PartTextStruct * target)
/*********************************/
bool PartTextStruct::IsVoid(void)
bool PartTextStruct::IsVoid()
/*********************************/
/* return True if The field is void, i.e.:
contains wxEmptyString or "~"
@ -536,7 +536,7 @@ bool PartTextStruct::IsVoid(void)
/********************************************/
EDA_Rect PartTextStruct::GetBoundaryBox(void)
EDA_Rect PartTextStruct::GetBoundaryBox()
/********************************************/
/* return
EDA_Rect contains the real (user coordinates) boundary box for a text field,

145
eeschema/component_class.h
View File

@ -1,6 +1,6 @@
/*****************************************************/
/* Definitions for the Component classes for EESchema */
/*****************************************************/
/*****************************************************/
/* Definitions for the Component classes for EESchema */
/*****************************************************/
#ifndef COMPONENT_CLASS_H
#define COMPONENT_CLASS_H
@ -14,110 +14,115 @@
/* Definition de la representation du composant */
#define NUMBER_OF_FIELDS 12 /* Nombre de champs de texte affectes au composant */
typedef enum
{
REFERENCE = 0, /* Champ Reference of part, i.e. "IC21" */
VALUE, /* Champ Value of part, i.e. "3.3K" */
FOOTPRINT, /* Champ Name Module PCB, i.e. "16DIP300" */
SHEET_FILENAME, /* Champ Name Schema component, i.e. "cnt16.sch" */
FIELD1,
FIELD2,
FIELD3,
FIELD4,
FIELD5,
FIELD6,
FIELD7,
FIELD8
#define NUMBER_OF_FIELDS 12 /* Nombre de champs de texte affectes au composant */
typedef enum {
REFERENCE = 0, /* Champ Reference of part, i.e. "IC21" */
VALUE, /* Champ Value of part, i.e. "3.3K" */
FOOTPRINT, /* Champ Name Module PCB, i.e. "16DIP300" */
SHEET_FILENAME, /* Champ Name Schema component, i.e. "cnt16.sch" */
FIELD1,
FIELD2,
FIELD3,
FIELD4,
FIELD5,
FIELD6,
FIELD7,
FIELD8
} NumFieldType;
/* Class to manage component fields.
component fields are texts attached to the component (not the graphic texts)
There are 2 major fields : Reference and Value
*/
class PartTextStruct: public EDA_BaseStruct, public EDA_TextStruct
* component fields are texts attached to the component (not the graphic texts)
* There are 2 major fields : Reference and Value
*/
class PartTextStruct : public EDA_BaseStruct, public EDA_TextStruct
{
public:
int m_Layer;
int m_FieldId;
wxString m_Name; /* Field name (ref, value,pcb, sheet, filed 1..
and for fields 1 to 8 the name is editable */
int m_FieldId;
wxString m_Name; /* Field name (ref, value,pcb, sheet, filed 1..
* and for fields 1 to 8 the name is editable */
public:
PartTextStruct(const wxPoint & pos = wxPoint(0,0), const wxString & text = wxEmptyString);
~PartTextStruct(void);
PartTextStruct( const wxPoint& pos = wxPoint( 0, 0 ), const wxString& text = wxEmptyString );
~PartTextStruct();
virtual wxString GetClass() const
{
return wxT("PartTextStruct");
return wxT( "PartTextStruct" );
}
void PartTextCopy(PartTextStruct * target);
void Place(WinEDA_DrawFrame * frame, wxDC * DC);
EDA_Rect GetBoundaryBox(void);
bool IsVoid();
void SwapData(PartTextStruct * copyitem);
void PartTextCopy( PartTextStruct* target );
void Place( WinEDA_DrawFrame* frame, wxDC* DC );
EDA_Rect GetBoundaryBox();
bool IsVoid();
void SwapData( PartTextStruct* copyitem );
};
/* the class DrawPartStruct describes a basic virtual component
Not used directly:
used classes are EDA_SchComponentStruct (the "classic" schematic component
and the Pseudo component DrawSheetStruct
*/
class DrawPartStruct: public EDA_BaseStruct
* Not used directly:
* used classes are EDA_SchComponentStruct (the "classic" schematic component
* and the Pseudo component DrawSheetStruct
*/
class DrawPartStruct : public EDA_BaseStruct
{
public:
int m_Layer;
wxString m_ChipName; /* Key to look for in the library, i.e. "74LS00". */
PartTextStruct m_Field[NUMBER_OF_FIELDS];
wxPoint m_Pos; /* Exact position of part. */
int m_Layer;
wxString m_ChipName; /* Key to look for in the library, i.e. "74LS00". */
PartTextStruct m_Field[NUMBER_OF_FIELDS];
wxPoint m_Pos; /* Exact position of part. */
public:
DrawPartStruct( KICAD_T struct_type, const wxPoint & pos);
~DrawPartStruct(void);
DrawPartStruct( KICAD_T struct_type, const wxPoint &pos );
~DrawPartStruct();
virtual wxString GetClass() const
{
return wxT("DrawPartStruct");
return wxT( "DrawPartStruct" );
}
};
/* the class EDA_SchComponentStruct describes a real component */
class EDA_SchComponentStruct: public DrawPartStruct
class EDA_SchComponentStruct : public DrawPartStruct
{
public:
int m_RefIdNumber; /* reference count: for U1, R2 .. it is the 1 or 2 value */
int m_Multi; /* In multi unit chip - which unit to draw. */
int m_FlagControlMulti;
int m_Convert; /* Gestion des mutiples representations (ex: conversion De Morgan) */
int m_Transform[2][2]; /* The rotation/mirror transformation matrix. */
bool * m_PinIsDangling; // liste des indicateurs de pin non connectee
int m_RefIdNumber; /* reference count: for U1, R2 .. it is the 1 or 2 value */
int m_Multi; /* In multi unit chip - which unit to draw. */
int m_FlagControlMulti;
int m_Convert; /* Gestion des mutiples representations (ex: conversion De Morgan) */
int m_Transform[2][2]; /* The rotation/mirror transformation matrix. */
bool* m_PinIsDangling; // liste des indicateurs de pin non connectee
public:
EDA_SchComponentStruct(const wxPoint & pos = wxPoint(0,0));
~EDA_SchComponentStruct(void){}
EDA_SchComponentStruct( const wxPoint& pos = wxPoint( 0, 0 ) );
~EDA_SchComponentStruct( void ) { }
virtual wxString GetClass() const
{
return wxT("EDA_SchComponentStruct");
return wxT( "EDA_SchComponentStruct" );
}
EDA_SchComponentStruct * GenCopy(void);
void SetRotationMiroir( int type );
int GetRotationMiroir(void);
wxPoint GetScreenCoord(const wxPoint & coord);
void Display_Infos(WinEDA_DrawFrame * frame);
void ClearAnnotation(void);
EDA_Rect GetBoundaryBox();
wxString ReturnFieldName(int FieldNumber);
virtual void Draw(WinEDA_DrawPanel * panel, wxDC * DC, const wxPoint & offset, int draw_mode, int Color = -1);
void SwapData(EDA_SchComponentStruct * copyitem);
virtual void Place(WinEDA_DrawFrame * frame, wxDC * DC);
EDA_SchComponentStruct* GenCopy( void );
void SetRotationMiroir( int type );
int GetRotationMiroir();
wxPoint GetScreenCoord( const wxPoint& coord );
void Display_Infos( WinEDA_DrawFrame* frame );
void ClearAnnotation();
EDA_Rect GetBoundaryBox();
wxString ReturnFieldName( int FieldNumber );
virtual void Draw( WinEDA_DrawPanel* panel,
wxDC* DC,
const wxPoint& offset,
int draw_mode,
int Color = -1 );
void SwapData( EDA_SchComponentStruct* copyitem );
virtual void Place( WinEDA_DrawFrame* frame, wxDC* DC );
};
#endif /* COMPONENT_CLASS_H */

4
eeschema/dialog_build_BOM.cpp
View File

@ -413,7 +413,7 @@ void WinEDA_Build_BOM_Frame::OnExitClick( wxCommandEvent& event )
}
/**********************************************************/
void WinEDA_Build_BOM_Frame::GenList(void)
void WinEDA_Build_BOM_Frame::GenList()
/**********************************************************/
{
#define EXT_LIST wxT(".lst")
@ -1142,7 +1142,7 @@ void WinEDA_Build_BOM_Frame::OnCloseWindow( wxCloseEvent& event )
}
/**************************************************/
void WinEDA_Build_BOM_Frame::SavePreferences(void)
void WinEDA_Build_BOM_Frame::SavePreferences()
/**************************************************/
{
s_Add_F1_state = m_AddField1->GetValue();

4
eeschema/dialog_build_BOM.h
View File

@ -114,7 +114,7 @@ public:
////@end WinEDA_Build_BOM_Frame event handler declarations
void GenList(void);
void GenList();
////@begin WinEDA_Build_BOM_Frame member function declarations
@ -129,7 +129,7 @@ public:
int PrintListeCmpByRef( FILE * f, EDA_BaseStruct ** List, int NbItems, bool CompactForm = FALSE );
int PrintListeCmpByVal( FILE *f, EDA_BaseStruct **List, int NbItems);
void PrintFieldData(FILE * f, EDA_SchComponentStruct * DrawLibItem, bool CompactForm = FALSE);
void SavePreferences(void);
void SavePreferences();
/// Should we show tooltips?

2
eeschema/dialog_create_component.h
View File

@ -91,7 +91,7 @@ public:
void CreateControls();
// others functions:
wxString ReturnCmpName(void)
wxString ReturnCmpName()
{
return m_CmpName->GetValue();
}

16
eeschema/dialog_edit_component_in_lib.h
View File

@ -119,10 +119,10 @@ public:
/// Should we show tooltips?
static bool ShowToolTips();
void InitBuffers(void);
void BuildPanelBasic(void);
void BuildPanelDoc(void);
void BuildPanelAlias(void);
void InitBuffers();
void BuildPanelBasic();
void BuildPanelDoc();
void BuildPanelAlias();
void BuildPanelEditField();
void PartPropertiesAccept(wxCommandEvent& event);
void OnQuit(wxCommandEvent& event);
@ -130,16 +130,16 @@ public:
void DeleteAliasOfPart(wxCommandEvent& event);
void AddAliasOfPart(wxCommandEvent& event);
bool ChangeNbUnitsPerPackage(int newUnit);
bool SetUnsetConvert(void);
bool SetUnsetConvert();
void CopyDocToAlias(wxCommandEvent& event);
void BrowseAndSelectDocFile(wxCommandEvent& event);
void SelectNewField(wxCommandEvent& event);
void CopyFieldDataToBuffer(LibDrawField * Field);
void CopyBufferToFieldData(LibDrawField * Field);
void CopyDataToPanelField(void);
void CopyPanelFieldToData(void);
void CopyDataToPanelField();
void CopyPanelFieldToData();
void BuildPanelFootprintFilter(void);
void BuildPanelFootprintFilter();
void DeleteAllFootprintFilter(wxCommandEvent& event);
void DeleteOneFootprintFilter(wxCommandEvent& event);
void AddFootprintFilter(wxCommandEvent& event);

10
eeschema/dialog_edit_component_in_schematic.h
View File

@ -111,13 +111,13 @@ public:
/// Should we show tooltips?
static bool ShowToolTips();
void InitBuffers(void);
void BuildPanelBasic(void);
void BuildPanelFields(void);
void InitBuffers();
void BuildPanelBasic();
void BuildPanelFields();
void ComponentPropertiesAccept(wxCommandEvent& event);
void SetInitCmp( wxCommandEvent& event );
void CopyDataToPanelField(void);
void CopyPanelFieldToData(void);
void CopyDataToPanelField();
void CopyPanelFieldToData();
void SelectNewField(wxCommandEvent& event);
////@begin WinEDA_ComponentPropertiesFrame member variables

4
eeschema/dialog_eeschema_config.cpp
View File

@ -303,7 +303,7 @@ void KiConfigEeschemaFrame::OnCloseWindow(wxCloseEvent & event)
/*********************************************/
void KiConfigEeschemaFrame::ChangeSetup(void)
void KiConfigEeschemaFrame::ChangeSetup()
/*********************************************/
{
g_UserLibDirBuffer = m_LibDirCtrl->GetValue();
@ -377,7 +377,7 @@ wxString FullLibName,ShortLibName, Mask;
/****************************************************/
void KiConfigEeschemaFrame::SetFormatsNetListes(void)
void KiConfigEeschemaFrame::SetFormatsNetListes()
/****************************************************/
/* Adjust the m_NetFormatBox current selection, according to the current netlist format*/

4
eeschema/dialog_eeschema_config.h
View File

@ -119,10 +119,10 @@ public:
/// Should we show tooltips?
static bool ShowToolTips();
void SetFormatsNetListes(void);
void SetFormatsNetListes();
void LibDelFct(wxCommandEvent& event);
void AddOrInsertLibrary(wxCommandEvent& event);
void ChangeSetup(void);
void ChangeSetup();
////@begin KiConfigEeschemaFrame member variables
wxRadioBox* m_NetFormatBox;

2
eeschema/dialog_erc.h
View File

@ -124,7 +124,7 @@ public:
void SelNewCmp(wxCommandEvent& event);
void ResetDefaultERCDiag(wxCommandEvent& event);
void ChangeErrorLevel(wxCommandEvent& event);
void ReBuildMatrixPanel(void);
void ReBuildMatrixPanel();
////@begin WinEDA_ErcFrame member variables
wxNotebook* m_NoteBook;

18
eeschema/edit_component_in_lib.cpp
View File

@ -126,7 +126,7 @@ int ii = Field->m_FieldId;
}
/*****************************************************/
void WinEDA_PartPropertiesFrame::InitBuffers(void)
void WinEDA_PartPropertiesFrame::InitBuffers()
/*****************************************************/
/* Init the buffers to a default value,
or to values from CurrentLibEntry if CurrentLibEntry != NULL
@ -182,7 +182,7 @@ int ii;
/*****************************************************/
void WinEDA_PartPropertiesFrame::BuildPanelAlias(void)
void WinEDA_PartPropertiesFrame::BuildPanelAlias()
/*****************************************************/
/* create the panel for component alias list editing
*/
@ -241,7 +241,7 @@ wxButton * Button;
/*****************************************************************/
void WinEDA_PartPropertiesFrame::BuildPanelFootprintFilter(void)
void WinEDA_PartPropertiesFrame::BuildPanelFootprintFilter()
/*****************************************************************/
/* create the panel for footprint filtering in cvpcb list
*/
@ -303,7 +303,7 @@ wxBoxSizer * PanelFpFilterBoxSizer = new wxBoxSizer(wxHORIZONTAL);
/*****************************************************/
void WinEDA_PartPropertiesFrame::BuildPanelDoc(void)
void WinEDA_PartPropertiesFrame::BuildPanelDoc()
/*****************************************************/
/* create the panel for component doc editing
*/
@ -343,7 +343,7 @@ wxString msg_text;
/*****************************************************/
void WinEDA_PartPropertiesFrame::BuildPanelBasic(void)
void WinEDA_PartPropertiesFrame::BuildPanelBasic()
/*****************************************************/
/* create the basic panel for component properties editing
*/
@ -402,7 +402,7 @@ void WinEDA_PartPropertiesFrame::BuildPanelBasic(void)
}
/*********************************************************/
void WinEDA_PartPropertiesFrame::BuildPanelEditField(void)
void WinEDA_PartPropertiesFrame::BuildPanelEditField()
/**********************************************************/
/* Create and build the panel managing the fields (REF, VALUE ...)
of the component
@ -483,7 +483,7 @@ wxString fieldnamelist[NUMBER_OF_FIELDS];
}
/****************************************************************/
void WinEDA_PartPropertiesFrame::CopyDataToPanelField(void)
void WinEDA_PartPropertiesFrame::CopyDataToPanelField()
/****************************************************************/
/* Set the values displayed on the panel field according to
the current field number
@ -520,7 +520,7 @@ int FieldId = m_CurrentFieldId;
}
/****************************************************************/
void WinEDA_PartPropertiesFrame::CopyPanelFieldToData(void)
void WinEDA_PartPropertiesFrame::CopyPanelFieldToData()
/****************************************************************/
/* Copy the values displayed on the panel field to the buffers according to
the current field number
@ -944,7 +944,7 @@ LibEDA_BaseStruct* DrawItem, * NextDrawItem;
/*****************************************************/
bool WinEDA_PartPropertiesFrame::SetUnsetConvert(void)
bool WinEDA_PartPropertiesFrame::SetUnsetConvert()
/*****************************************************/
/* crée ou efface (selon option AsConvert) les éléments
de la représentation convertie d'un composant

591
eeschema/eelayer.cpp
View File

@ -1,4 +1,4 @@
/* Set up color Layers */
/* Set up color Layers */
#include "fctsys.h"
#include "gr_basic.h"
@ -18,462 +18,467 @@
/* Fonctions locales: */
/* Macro utile : */
#define ADR(numlayer) &(g_LayerDescr.LayerColor[numlayer])
#define ADR( numlayer ) & (g_LayerDescr.LayerColor[numlayer])
#define BUTT_SIZE_X 30
#define BUTT_SIZE_Y 20
enum col_sel_id {
ID_COLOR_SETUP = 1800
ID_COLOR_SETUP = 1800
};
/**********************************/
/* Liste des menus de Menu_Layers */
/**********************************/
/**********************************/
/* Liste des menus de Menu_Layers */
/**********************************/
struct ColorButton
{
wxString m_Name;
int * m_Color;
int m_Id;
wxBitmapButton * m_Button;
int m_State;
{
wxString m_Name;
int* m_Color;
int m_Id;
wxBitmapButton* m_Button;
int m_State;
};
static ColorButton Msg_General=
static ColorButton Msg_General =
{
_("General"), /* Title */
NULL
_( "General" ), /* Title */
NULL
};
static ColorButton Msg_Sheets=
static ColorButton Msg_Sheets =
{
_("Sheets"), /* Title */
NULL
_( "Sheets" ), /* Title */
NULL
};
static ColorButton Layer_Wire_Item=
static ColorButton Layer_Wire_Item =
{
_("Wire"), /* Title */
ADR(LAYER_WIRE) /* adr du parametre optionnel */
_( "Wire" ), /* Title */
ADR( LAYER_WIRE ) /* adr du parametre optionnel */
};
static ColorButton Layer_Bus_Item=
static ColorButton Layer_Bus_Item =
{
_("Bus"), /* Title */
ADR(LAYER_BUS) /* adr du parametre optionnel */
_( "Bus" ), /* Title */
ADR( LAYER_BUS ) /* adr du parametre optionnel */
};
static ColorButton Layer_Jonction_Item=
static ColorButton Layer_Jonction_Item =
{
_("Junction"), /* Title */
ADR(LAYER_JUNCTION) /* adr du parametre optionnel */
_( "Junction" ), /* Title */
ADR( LAYER_JUNCTION ) /* adr du parametre optionnel */
};
static ColorButton Layer_LocalLabel_Item=
static ColorButton Layer_LocalLabel_Item =
{
_("Label"), /* Title */
ADR(LAYER_LOCLABEL) /* adr du parametre optionnel */
_( "Label" ), /* Title */
ADR( LAYER_LOCLABEL ) /* adr du parametre optionnel */
};
static ColorButton Layer_GlobLabel_Item=
static ColorButton Layer_GlobLabel_Item =
{
_("GlobLabel"), /* Title */
ADR(LAYER_GLOBLABEL) /* adr du parametre optionnel */
_( "GlobLabel" ), /* Title */
ADR( LAYER_GLOBLABEL ) /* adr du parametre optionnel */
};
static ColorButton Layer_PinNum_Item=
static ColorButton Layer_PinNum_Item =
{
_("PinNum"), /* Title */
ADR(LAYER_PINNUM) /* adr du parametre optionnel */
_( "PinNum" ), /* Title */
ADR( LAYER_PINNUM ) /* adr du parametre optionnel */
};
static ColorButton Layer_PinNam_Item=
static ColorButton Layer_PinNam_Item =
{
_("PinNam"), /* Title */
ADR(LAYER_PINNAM) /* adr du parametre optionnel */
_( "PinNam" ), /* Title */
ADR( LAYER_PINNAM ) /* adr du parametre optionnel */
};
static ColorButton Layer_Reference_Item=
static ColorButton Layer_Reference_Item =
{
_("Reference"), /* Title */
ADR(LAYER_REFERENCEPART) /* adr du parametre optionnel */
_( "Reference" ), /* Title */
ADR( LAYER_REFERENCEPART ) /* adr du parametre optionnel */
};
static ColorButton Layer_Value_Item=
static ColorButton Layer_Value_Item =
{
_("Value"), /* Title */
ADR(LAYER_VALUEPART) /* adr du parametre optionnel */
_( "Value" ), /* Title */
ADR( LAYER_VALUEPART ) /* adr du parametre optionnel */
};
static ColorButton Layer_Fields_Item=
static ColorButton Layer_Fields_Item =
{
_("Fields"), /* Title */
ADR(LAYER_FIELDS) /* adr du parametre optionnel */
_( "Fields" ), /* Title */
ADR( LAYER_FIELDS ) /* adr du parametre optionnel */
};
static ColorButton Layer_BodyDevice_Item=
static ColorButton Layer_BodyDevice_Item =
{
_("Body"), /* Title */
ADR(LAYER_DEVICE) /* adr du parametre optionnel */
_( "Body" ), /* Title */
ADR( LAYER_DEVICE ) /* adr du parametre optionnel */
};
static ColorButton Layer_BodyBackgroundDevice_Item=
static ColorButton Layer_BodyBackgroundDevice_Item =
{
_("Body Bg"), /* Title */
ADR(LAYER_DEVICE_BACKGROUND) /* adr du parametre optionnel */
_( "Body Bg" ), /* Title */
ADR( LAYER_DEVICE_BACKGROUND ) /* adr du parametre optionnel */
};
static ColorButton MsgDevice_Item=
static ColorButton MsgDevice_Item =
{
_("Device"), /* Title */
NULL
_( "Device" ), /* Title */
NULL
};
static ColorButton Layer_Notes_Item=
static ColorButton Layer_Notes_Item =
{
_("Notes"), /* Title */
ADR(LAYER_NOTES) /* adr du parametre optionnel */
_( "Notes" ), /* Title */
ADR( LAYER_NOTES ) /* adr du parametre optionnel */
};
static ColorButton Layer_NetNam_Item=
static ColorButton Layer_NetNam_Item =
{
_("Netname"), /* Title */
ADR(LAYER_NETNAM) /* adr du parametre optionnel */
_( "Netname" ), /* Title */
ADR( LAYER_NETNAM ) /* adr du parametre optionnel */
};
static ColorButton Layer_Pin_Item=
static ColorButton Layer_Pin_Item =
{
_("Pin"), /* Title */
ADR(LAYER_PIN) /* adr du parametre optionnel */
_( "Pin" ), /* Title */
ADR( LAYER_PIN ) /* adr du parametre optionnel */
};
static ColorButton Layer_Sheet_Item=
static ColorButton Layer_Sheet_Item =
{
_("Sheet"), /* Title */
ADR(LAYER_SHEET) /* adr du parametre optionnel */
_( "Sheet" ), /* Title */
ADR( LAYER_SHEET ) /* adr du parametre optionnel */
};
static ColorButton Layer_SheetName_Item=
static ColorButton Layer_SheetName_Item =
{
_("SheetName"), /* Title */
ADR(LAYER_SHEETNAME) /* adr du parametre optionnel */
_( "SheetName" ), /* Title */
ADR( LAYER_SHEETNAME ) /* adr du parametre optionnel */
};
static ColorButton Layer_SheetFileName_Item=
static ColorButton Layer_SheetFileName_Item =
{
_("Sheetfile"), /* Title */
ADR(LAYER_SHEETFILENAME) /* adr du parametre optionnel */
_( "Sheetfile" ), /* Title */
ADR( LAYER_SHEETFILENAME ) /* adr du parametre optionnel */
};
static ColorButton Layer_SheetLabel_Item=
static ColorButton Layer_SheetLabel_Item =
{
_("SheetLabel"), /* Title */
ADR(LAYER_SHEETLABEL) /* adr du parametre optionnel */
_( "SheetLabel" ), /* Title */
ADR( LAYER_SHEETLABEL ) /* adr du parametre optionnel */
};
static ColorButton Layer_NoConnect_Item=
static ColorButton Layer_NoConnect_Item =
{
_("NoConn"), /* Title */
ADR(LAYER_NOCONNECT) /* adr du parametre optionnel */
_( "NoConn" ), /* Title */
ADR( LAYER_NOCONNECT ) /* adr du parametre optionnel */
};
static ColorButton Msg_ErcMarck=
static ColorButton Msg_ErcMarck =
{
_("Erc Mark"), /* Title */
NULL
_( "Erc Mark" ), /* Title */
NULL
};
static ColorButton Layer_Erc_Warning_Item=
static ColorButton Layer_Erc_Warning_Item =
{
_("Erc Warning"), /* Title */
ADR(LAYER_ERC_WARN) /* adr du parametre optionnel */
_( "Erc Warning" ), /* Title */
ADR( LAYER_ERC_WARN ) /* adr du parametre optionnel */
};
static ColorButton Layer_Erc_Error_Item=
static ColorButton Layer_Erc_Error_Item =
{
_("Erc Error"), /* Title */
ADR(LAYER_ERC_ERR) /* adr du parametre optionnel */
_( "Erc Error" ), /* Title */
ADR( LAYER_ERC_ERR ) /* adr du parametre optionnel */
};
#define NB_BUTT 26
static ColorButton * laytool_list[NB_BUTT+1] = {
&Msg_General,
&Layer_Wire_Item,
&Layer_Bus_Item,
&Layer_Jonction_Item,
&Layer_LocalLabel_Item,
&Layer_GlobLabel_Item,
&Layer_NetNam_Item,
&Layer_Notes_Item,
&Layer_NoConnect_Item,
static ColorButton* laytool_list[NB_BUTT + 1] = {
&Msg_General,
&Layer_Wire_Item,
&Layer_Bus_Item,
&Layer_Jonction_Item,
&Layer_LocalLabel_Item,
&Layer_GlobLabel_Item,
&Layer_NetNam_Item,
&Layer_Notes_Item,
&Layer_NoConnect_Item,
&MsgDevice_Item,
&Layer_BodyDevice_Item,
&Layer_BodyBackgroundDevice_Item,
&Layer_Pin_Item,
&Layer_PinNum_Item,
&Layer_PinNam_Item,
&Layer_Reference_Item,
&Layer_Value_Item,
&Layer_Fields_Item,
&MsgDevice_Item,
&Layer_BodyDevice_Item,
&Layer_BodyBackgroundDevice_Item,
&Layer_Pin_Item,
&Layer_PinNum_Item,
&Layer_PinNam_Item,
&Layer_Reference_Item,
&Layer_Value_Item,
&Layer_Fields_Item,
&Msg_Sheets,
&Layer_Sheet_Item,
&Layer_SheetFileName_Item,
&Layer_SheetName_Item,
&Layer_SheetLabel_Item,
&Msg_Sheets,
&Layer_Sheet_Item,
&Layer_SheetFileName_Item,
&Layer_SheetName_Item,
&Layer_SheetLabel_Item,
&Msg_ErcMarck,
&Layer_Erc_Warning_Item,
&Layer_Erc_Error_Item,
&Msg_ErcMarck,
&Layer_Erc_Warning_Item,
&Layer_Erc_Error_Item,
NULL
NULL
};
/*************************************************************/
/* classe derivee pour la frame de Configuration des couleurs*/
/*************************************************************/
class WinEDA_SetColorsFrame: public wxDialog
class WinEDA_SetColorsFrame : public wxDialog
{
private:
WinEDA_DrawFrame *m_Parent;
wxRadioBox * m_SelBgColor;
WinEDA_DrawFrame* m_Parent;
wxRadioBox* m_SelBgColor;
public:
// Constructor and destructor
WinEDA_SetColorsFrame(WinEDA_DrawFrame *parent, const wxPoint& framepos);
~WinEDA_SetColorsFrame(void) {};
// Constructor and destructor
WinEDA_SetColorsFrame( WinEDA_DrawFrame * parent, const wxPoint &framepos );
~WinEDA_SetColorsFrame() { };
private:
void SetColor(wxCommandEvent& event);
void BgColorChoice(wxCommandEvent& event);
DECLARE_EVENT_TABLE()
void SetColor( wxCommandEvent& event );
void BgColorChoice( wxCommandEvent& event );
DECLARE_EVENT_TABLE()
};
/* Table des evenements pour WinEDA_SetColorsFrame */
BEGIN_EVENT_TABLE(WinEDA_SetColorsFrame, wxDialog)
EVT_RADIOBOX(ID_SEL_BG_COLOR, WinEDA_SetColorsFrame::BgColorChoice)
EVT_COMMAND_RANGE(ID_COLOR_SETUP, ID_COLOR_SETUP+26,
wxEVT_COMMAND_BUTTON_CLICKED,
WinEDA_SetColorsFrame::SetColor)
BEGIN_EVENT_TABLE( WinEDA_SetColorsFrame, wxDialog )
EVT_RADIOBOX( ID_SEL_BG_COLOR, WinEDA_SetColorsFrame::BgColorChoice )
EVT_COMMAND_RANGE( ID_COLOR_SETUP, ID_COLOR_SETUP + 26,
wxEVT_COMMAND_BUTTON_CLICKED,
WinEDA_SetColorsFrame::SetColor )
END_EVENT_TABLE()
/**************************************************************/
void DisplayColorSetupFrame(WinEDA_DrawFrame * parent,
const wxPoint & framepos)
void DisplayColorSetupFrame( WinEDA_DrawFrame* parent,
const wxPoint& framepos )
/**************************************************************/
{
WinEDA_SetColorsFrame * frame =
new WinEDA_SetColorsFrame(parent, framepos);
frame->ShowModal();
frame->Destroy();
WinEDA_SetColorsFrame* frame =
new WinEDA_SetColorsFrame( parent, framepos );
frame->ShowModal();
frame->Destroy();
}
/**********************************************************************/
WinEDA_SetColorsFrame::WinEDA_SetColorsFrame(WinEDA_DrawFrame *parent,
const wxPoint& framepos):
wxDialog(parent, -1, _("EESchema Preferences"), framepos,
wxSize(500, 270), DIALOG_STYLE)
WinEDA_SetColorsFrame::WinEDA_SetColorsFrame( WinEDA_DrawFrame* parent,
const wxPoint& framepos ) :
wxDialog( parent, -1, _( "EESchema Preferences" ), framepos,
wxSize( 500, 270 ), DIALOG_STYLE )
/**********************************************************************/
{
#define START_Y 15
wxBitmapButton * Button;
int ii, yy, butt_ID, buttcolor;
wxPoint pos;
int w = BUTT_SIZE_X, h = BUTT_SIZE_Y;
wxStaticText * text;
int right, bottom, line_height;
wxPoint bg_color_pos;
m_Parent = parent;
SetFont(*g_DialogFont);
wxBitmapButton* Button;
int ii, yy, butt_ID, buttcolor;
wxPoint pos;
int w = BUTT_SIZE_X, h = BUTT_SIZE_Y;
wxStaticText* text;
int right, bottom, line_height;
wxPoint bg_color_pos;
pos.x = 10; pos.y = START_Y;
right = pos.x; bottom = 0;
line_height = h;
for ( ii = 0; laytool_list[ii] != NULL; ii++ )
{
if( laytool_list[ii]->m_Color == NULL )
{
if( pos.y != START_Y )
{
pos.x = right + 10;
pos.y = START_Y;
bg_color_pos = pos;
}
wxString msg = wxGetTranslation(laytool_list[ii]->m_Name);
text = new wxStaticText( this, -1,
msg,
wxPoint( pos.x, pos.y ),
wxSize(-1, -1), 0 );
line_height = MAX(line_height, text->GetRect().GetHeight());
pos.y += line_height;
continue;
}
butt_ID = ID_COLOR_SETUP + ii;
laytool_list[ii]->m_Id = butt_ID;
wxMemoryDC iconDC;
wxBitmap ButtBitmap(w,h);
iconDC.SelectObject( ButtBitmap );
buttcolor = *laytool_list[ii]->m_Color;
wxBrush Brush;
iconDC.SelectObject( ButtBitmap );
iconDC.SetPen(*wxBLACK_PEN);
Brush.SetColour(
ColorRefs[buttcolor].m_Red,
ColorRefs[buttcolor].m_Green,
ColorRefs[buttcolor].m_Blue
);
Brush.SetStyle(wxSOLID);
m_Parent = parent;
SetFont( *g_DialogFont );
iconDC.SetBrush(Brush);
iconDC.DrawRectangle(0, 0, w, h);
pos.x = 10; pos.y = START_Y;
right = pos.x; bottom = 0;
line_height = h;
for( ii = 0; laytool_list[ii] != NULL; ii++ )
{
if( laytool_list[ii]->m_Color == NULL )
{
if( pos.y != START_Y )
{
pos.x = right + 10;
pos.y = START_Y;
bg_color_pos = pos;
}
wxString msg = wxGetTranslation( laytool_list[ii]->m_Name );
text = new wxStaticText( this, -1,
msg,
wxPoint ( pos.x, pos.y ),
wxSize( -1, -1 ), 0 );
Button = new wxBitmapButton( this, butt_ID,
ButtBitmap,
wxPoint( pos.x, pos.y - (h - line_height) / 2 ),
wxSize(w, h) );
laytool_list[ii]->m_Button = Button;
line_height = MAX( line_height, text->GetRect().GetHeight() );
pos.y += line_height;
continue;
}
butt_ID = ID_COLOR_SETUP + ii;
laytool_list[ii]->m_Id = butt_ID;
wxMemoryDC iconDC;
wxBitmap ButtBitmap( w, h );
wxString msg = wxGetTranslation(laytool_list[ii]->m_Name);
text = new wxStaticText( this, -1,
msg,
wxPoint(pos.x + 5 + w, pos.y ),
wxSize(-1, -1), 0 );
wxPoint lowpos;
lowpos.x = text->GetRect().GetRight();
lowpos.y = text->GetRect().GetBottom();
right = MAX(right, lowpos.x);
bottom = MAX(bottom, lowpos.y);
bg_color_pos.y = lowpos.y;
iconDC.SelectObject( ButtBitmap );
buttcolor = *laytool_list[ii]->m_Color;
wxBrush Brush;
iconDC.SelectObject( ButtBitmap );
iconDC.SetPen( *wxBLACK_PEN );
Brush.SetColour(
ColorRefs[buttcolor].m_Red,
ColorRefs[buttcolor].m_Green,
ColorRefs[buttcolor].m_Blue
);
Brush.SetStyle( wxSOLID );
yy = line_height + 5;
pos.y += yy;
}
iconDC.SetBrush( Brush );
iconDC.DrawRectangle( 0, 0, w, h );
bg_color_pos.x += 5; bg_color_pos.y += 25;
wxString bg_choice[2] = { _("White Background"), _("Black Background")};
m_SelBgColor = new wxRadioBox(this, ID_SEL_BG_COLOR,
_("Background Colour"), bg_color_pos,
wxDefaultSize, 2, bg_choice, 1, wxRA_SPECIFY_COLS);
m_SelBgColor->SetSelection( (g_DrawBgColor == BLACK) ? 1 : 0);
bottom = MAX(bottom, m_SelBgColor->GetRect().GetBottom());
right = MAX(right, m_SelBgColor->GetRect().GetRight());
Button = new wxBitmapButton( this, butt_ID,
ButtBitmap,
wxPoint ( pos.x, pos.y - (h - line_height) / 2 ),
wxSize (w, h) );
SetClientSize(wxSize(right+10, bottom+10));
laytool_list[ii]->m_Button = Button;
wxString msg = wxGetTranslation( laytool_list[ii]->m_Name );
text = new wxStaticText( this, -1,
msg,
wxPoint (pos.x + 5 + w, pos.y ),
wxSize( -1, -1 ), 0 );
wxPoint lowpos;
lowpos.x = text->GetRect().GetRight();
lowpos.y = text->GetRect().GetBottom();
right = MAX( right, lowpos.x );
bottom = MAX( bottom, lowpos.y );
bg_color_pos.y = lowpos.y;
yy = line_height + 5;
pos.y += yy;
}
bg_color_pos.x += 5; bg_color_pos.y += 25;
static const wxString bg_choice[2] = { _( "White Background" ), _( "Black Background" ) };
m_SelBgColor = new wxRadioBox( this, ID_SEL_BG_COLOR,
_( "Background Colour" ), bg_color_pos,
wxDefaultSize, 2, bg_choice, 1, wxRA_SPECIFY_COLS );
m_SelBgColor->SetSelection( (g_DrawBgColor == BLACK) ? 1 : 0 );
bottom = MAX( bottom, m_SelBgColor->GetRect().GetBottom() );
right = MAX( right, m_SelBgColor->GetRect().GetRight() );
SetClientSize( wxSize( right + 10, bottom + 10 ) );
}
/***************************************************************/
void WinEDA_SetColorsFrame::SetColor(wxCommandEvent& event)
void WinEDA_SetColorsFrame::SetColor( wxCommandEvent& event )
/***************************************************************/
{
int ii;
int id = event.GetId();
int color;
int w = BUTT_SIZE_X, h = BUTT_SIZE_Y;
int ii;
int id = event.GetId();
int color;
int w = BUTT_SIZE_X, h = BUTT_SIZE_Y;
color = DisplayColorFrame( this,
*laytool_list[id - ID_COLOR_SETUP]->m_Color );
if ( color < 0 )
return;
color = DisplayColorFrame( this,
*laytool_list[id - ID_COLOR_SETUP]->m_Color );
if( color < 0 )
return;
for ( ii = 0; laytool_list[ii] != NULL; ii++ )
{
if( laytool_list[ii]->m_Id != id )
continue;
for( ii = 0; laytool_list[ii] != NULL; ii++ )
{
if( laytool_list[ii]->m_Id != id )
continue;
if( *laytool_list[ii]->m_Color == color )
break;
if( *laytool_list[ii]->m_Color == color )
break;
*laytool_list[ii]->m_Color = color;
wxMemoryDC iconDC;
*laytool_list[ii]->m_Color = color;
wxMemoryDC iconDC;
wxBitmapButton * Button = laytool_list[ii]->m_Button;
wxBitmapButton* Button = laytool_list[ii]->m_Button;
wxBitmap ButtBitmap = Button->GetBitmapLabel();
iconDC.SelectObject( ButtBitmap );
int buttcolor = *laytool_list[ii]->m_Color;
wxBrush Brush;
iconDC.SelectObject( ButtBitmap );
iconDC.SetPen(*wxBLACK_PEN);
Brush.SetColour(
ColorRefs[buttcolor].m_Red,
ColorRefs[buttcolor].m_Green,
ColorRefs[buttcolor].m_Blue
);
Brush.SetStyle(wxSOLID);
wxBitmap ButtBitmap = Button->GetBitmapLabel();
iconDC.SelectObject( ButtBitmap );
int buttcolor = *laytool_list[ii]->m_Color;
wxBrush Brush;
iconDC.SelectObject( ButtBitmap );
iconDC.SetPen( *wxBLACK_PEN );
Brush.SetColour(
ColorRefs[buttcolor].m_Red,
ColorRefs[buttcolor].m_Green,
ColorRefs[buttcolor].m_Blue
);
Brush.SetStyle( wxSOLID );
iconDC.SetBrush(Brush);
iconDC.DrawRectangle(0,0, w, h);
Button->SetBitmapLabel(ButtBitmap);
if ( m_Parent->GetScreen() )
m_Parent->GetScreen()->SetRefreshReq();
}
Refresh(FALSE);
iconDC.SetBrush( Brush );
iconDC.DrawRectangle( 0, 0, w, h );
Button->SetBitmapLabel( ButtBitmap );
if( m_Parent->GetScreen() )
m_Parent->GetScreen()->SetRefreshReq();
}
Refresh( FALSE );
}
/***************************************************************/
void WinEDA_SetColorsFrame::BgColorChoice(wxCommandEvent& event)
void WinEDA_SetColorsFrame::BgColorChoice( wxCommandEvent& event )
/***************************************************************/
{
int color;
int color;
if ( m_SelBgColor->GetSelection() == 0 )
color = WHITE;
else
color = BLACK;
if( m_SelBgColor->GetSelection() == 0 )
color = WHITE;
else
color = BLACK;
if ( color != g_DrawBgColor )
{
g_DrawBgColor = color;
m_Parent->SetDrawBgColor(g_DrawBgColor);
m_Parent->ReDrawPanel();
}
if( color != g_DrawBgColor )
{
g_DrawBgColor = color;
m_Parent->SetDrawBgColor( g_DrawBgColor );
m_Parent->ReDrawPanel();
}
}
/*************************/
void SeedLayers(void)
void SeedLayers()
/*************************/
{
LayerStruct * LayerPointer = &g_LayerDescr;
int pt;
LayerStruct* LayerPointer = &g_LayerDescr;
int pt;
LayerPointer->CommonColor = WHITE;
LayerPointer->Flags = 0;
pt = 0;
LayerPointer->CurrentWidth = 1;
LayerPointer->CommonColor = WHITE;
LayerPointer->Flags = 0;
pt = 0;
LayerPointer->CurrentWidth = 1;
/* seed Up the Layer colours, set all user layers off */
for( pt = 0; pt < MAX_LAYERS; pt++ )
{
LayerPointer->LayerStatus[pt] = 0;
LayerPointer->LayerColor[pt] = DARKGRAY;
}
LayerPointer->NumberOfLayers = pt - 1;
/* Couleurs specifiques: Mise a jour par la lecture de la config */
/* seed Up the Layer colours, set all user layers off */
for( pt = 0; pt < MAX_LAYERS; pt++ )
{
LayerPointer->LayerStatus[pt] = 0;
LayerPointer->LayerColor[pt] = DARKGRAY;
}
LayerPointer->NumberOfLayers = pt - 1;
/* Couleurs specifiques: Mise a jour par la lecture de la config */
}
/*******************************/
int ReturnLayerColor(int Layer)
int ReturnLayerColor( int Layer )
/*******************************/
{
if( g_LayerDescr.Flags==0 )
return( g_LayerDescr.LayerColor[Layer] );
else
return( g_LayerDescr.CommonColor );
if( g_LayerDescr.Flags==0 )
return g_LayerDescr.LayerColor[Layer];
else
return g_LayerDescr.CommonColor;
}

6
eeschema/eestatus.cpp
View File

@ -52,7 +52,7 @@ public:
// Constructor and destructor
WinEDA_ConfigFrame(WinEDA_SchematicFrame *parent, const wxPoint& pos);
~WinEDA_ConfigFrame(void) {};
~WinEDA_ConfigFrame() {};
void OnCloseWindow(wxCloseEvent & event);
@ -62,7 +62,7 @@ public:
void LibDelFct(wxCommandEvent& event);
void AddOrInsertLibrary(wxCommandEvent& event);
void ReturnNetFormat(wxCommandEvent& event);
void ChangeSetup(void);
void ChangeSetup();
DECLARE_EVENT_TABLE()
@ -195,7 +195,7 @@ void WinEDA_ConfigFrame::OnCloseWindow(wxCloseEvent & event)
/*******************************************/
void WinEDA_ConfigFrame::ChangeSetup(void)
void WinEDA_ConfigFrame::ChangeSetup()
/*******************************************/
{
g_UserLibDirBuffer = LibDirCtrl->GetData();

2
eeschema/erc.cpp
View File

@ -159,7 +159,7 @@ void InstallErcFrame(WinEDA_SchematicFrame *parent, wxPoint & pos)
/*********************************************/
void WinEDA_ErcFrame::ReBuildMatrixPanel(void)
void WinEDA_ErcFrame::ReBuildMatrixPanel()
/*********************************************/
/* Build or rebuild the panel showing the ERC matrix
*/

28
eeschema/fieldedi.cpp
View File

@ -107,18 +107,18 @@ private:
public:
// Constructor and destructor
WinEDA_PartPropertiesFrame(WinEDA_LibeditFrame *parent, wxPoint& pos);
~WinEDA_PartPropertiesFrame(void)
~WinEDA_PartPropertiesFrame()
{
if( AliasListCopy ) AliasListCopy->FreeList();
};
private:
void PartPropertiesAccept(wxCommandEvent& event);
void DeleteAllAliasOfPart(void);
void DeleteAliasOfPart(void);
void AddAliasOfPart(void);
void DeleteAllAliasOfPart();
void DeleteAliasOfPart();
void AddAliasOfPart();
bool ChangeNbUnitsPerPackage(int newUnit);
bool SetUnsetConvert(void);
bool SetUnsetConvert();
DECLARE_EVENT_TABLE()
};
@ -566,10 +566,10 @@ bool recreateTB = FALSE;
/***************************************************************/
/* void WinEDA_PartPropertiesFrame::DeleteAllAliasOfPart(void) */
/* void WinEDA_PartPropertiesFrame::DeleteAllAliasOfPart() */
/***************************************************************/
void WinEDA_PartPropertiesFrame::DeleteAllAliasOfPart(void)
void WinEDA_PartPropertiesFrame::DeleteAllAliasOfPart()
{
if(CurrentLibEntry && AliasListCopy )
@ -585,10 +585,10 @@ void WinEDA_PartPropertiesFrame::DeleteAllAliasOfPart(void)
}
/*********************************************************/
/* void WinEDA_PartPropertiesFrame::AddAliasOfPart(void) */
/* void WinEDA_PartPropertiesFrame::AddAliasOfPart() */
/*********************************************************/
void WinEDA_PartPropertiesFrame::AddAliasOfPart(void)
void WinEDA_PartPropertiesFrame::AddAliasOfPart()
{
char Line[LINE_LEN];
int llen;
@ -623,10 +623,10 @@ ListOfAliasStruct * NewAlias;
}
/********************************/
/* void DeleteAliasOfPart(void) */
/* void DeleteAliasOfPart() */
/********************************/
void WinEDA_PartPropertiesFrame::DeleteAliasOfPart(void)
void WinEDA_PartPropertiesFrame::DeleteAliasOfPart()
{
ListOfAliasStruct * Alias;
wxString aliasname;
@ -745,7 +745,7 @@ LibDrawField *Field = (LibDrawField *)CurrentDrawItem;
}
/********************************/
/* static void PlaceField(void) */
/* static void PlaceField() */
/********************************/
void WinEDA_LibeditFrame::PlaceField(wxDC * DC, LibDrawField *Field)
@ -1046,12 +1046,12 @@ LibEDA_BaseStruct* DrawItem, * NextDrawItem;
/**********************************************************/
/* void WinEDA_PartPropertiesFrame::SetUnsetConvert(void) */
/* void WinEDA_PartPropertiesFrame::SetUnsetConvert() */
/**********************************************************/
/* crée ou efface (selon option AsConvert) les éléments
de la représentation convertie d'un composant
*/
bool WinEDA_PartPropertiesFrame::SetUnsetConvert(void)
bool WinEDA_PartPropertiesFrame::SetUnsetConvert()
{
int FlagDel = 0;
LibEDA_BaseStruct* DrawItem = NULL, * NextDrawItem;

2
eeschema/files-io.cpp
View File

@ -114,7 +114,7 @@ wxString LibArchiveFileName;
}
/************************/
int CountCmpNumber(void)
int CountCmpNumber()
/************************/
/* Routine retournant le nombre de composants dans le schema,
powers non comprises */

6
eeschema/genliste.cpp
View File

@ -71,10 +71,10 @@ public:
// Constructor and destructor
WinEDA_GenCmpListFrame(WinEDA_DrawFrame *parent, wxPoint& pos);
~WinEDA_GenCmpListFrame(void) {};
~WinEDA_GenCmpListFrame() {};
void GenList(wxCommandEvent& event);
void GenListUpdateOpt(void);
void GenListUpdateOpt();
void ToolsExit(wxCommandEvent& event);
DECLARE_EVENT_TABLE()
@ -151,7 +151,7 @@ wxPoint pos;
}
// Fonctions de positionnement des variables d'option
void WinEDA_GenCmpListFrame::GenListUpdateOpt(void)
void WinEDA_GenCmpListFrame::GenListUpdateOpt()
{
ItemsToList = 0;
if ( m_ListCmpbyRefItems->GetValue() ) ItemsToList |= LISTCMP_BY_REF;

8
eeschema/hierarch.cpp
View File

@ -51,7 +51,7 @@ private:
wxImageList *imageList;
public:
WinEDA_Tree(void) { }
WinEDA_Tree() { }
WinEDA_Tree(WinEDA_HierFrame *parent);
DECLARE_DYNAMIC_CLASS(WinEDA_Tree)
@ -93,7 +93,7 @@ public:
WinEDA_HierFrame(WinEDA_SchematicFrame *parent, wxDC * DC, const wxPoint& pos);
void BuildSheetList(EDA_BaseStruct * DrawStruct,
wxTreeItemId * previousmenu);
~WinEDA_HierFrame(void);
~WinEDA_HierFrame();
void OnSelect(wxTreeEvent& event);
@ -165,7 +165,7 @@ wxRect itemrect;
}
}
WinEDA_HierFrame::~WinEDA_HierFrame(void)
WinEDA_HierFrame::~WinEDA_HierFrame()
{
}
@ -267,7 +267,7 @@ DrawSheetStruct * Sheet;
/******************************************************/
void WinEDA_SchematicFrame::InstallPreviousScreen(void)
void WinEDA_SchematicFrame::InstallPreviousScreen()
/******************************************************/
/* Set the current screen to display the parent sheet of the current displayed sheet
*/

2
eeschema/lib_export.cpp
View File

@ -22,7 +22,7 @@
/*************************************************/
void WinEDA_LibeditFrame::ImportOnePart(void)
void WinEDA_LibeditFrame::ImportOnePart()
/*************************************************/
/* Routine de lecture de 1 description.
Le format est celui des librairies, mais on ne charge que 1 composant

14
eeschema/libedit.cpp
View File

@ -26,7 +26,7 @@
/**********************************************/
void WinEDA_LibeditFrame::DisplayLibInfos(void)
void WinEDA_LibeditFrame::DisplayLibInfos()
/**********************************************/
/* Affiche dans la zone messages la librairie , et le composant edite */
{
@ -60,7 +60,7 @@ wxChar UnitLetter[] = wxT("?ABCDEFGHIJKLMNOPQRSTUVWXYZ");
/**************************************************/
void WinEDA_LibeditFrame::SelectActiveLibrary(void)
void WinEDA_LibeditFrame::SelectActiveLibrary()
/**************************************************/
/* Routine to Select Current library
*/
@ -78,7 +78,7 @@ LibraryStruct *Lib;
/*************************************************/
/* Routine to Load one selected library content. */
/*************************************************/
bool WinEDA_LibeditFrame::LoadOneLibraryPart(void)
bool WinEDA_LibeditFrame::LoadOneLibraryPart()
{
int i;
wxString msg;
@ -216,7 +216,7 @@ void WinEDA_LibeditFrame::RedrawActiveWindow(wxDC * DC, bool EraseBg)
/*************************************************/
void WinEDA_LibeditFrame::SaveActiveLibrary(void)
void WinEDA_LibeditFrame::SaveActiveLibrary()
/*************************************************/
/* Sauvegarde en fichier la librairie pointee par CurrentLib
une sauvegarde en .bak de l'ancien fichier est egalement cree
@ -274,7 +274,7 @@ LibCmpEntry * CmpEntry;
}
/*********************************************/
void WinEDA_LibeditFrame::DeleteOnePart(void)
void WinEDA_LibeditFrame::DeleteOnePart()
/*********************************************/
/* Routine de suppression d'un composant dans la librairie courante
(effacement en memoire uniquement, le fichier n'est pas modifie)
@ -359,7 +359,7 @@ wxString msg;
/****************************************************/
void WinEDA_LibeditFrame::CreateNewLibraryPart(void)
void WinEDA_LibeditFrame::CreateNewLibraryPart()
/****************************************************/
/* Routine to create a new library component
If an old component is currently in edit, it is deleted.
@ -540,7 +540,7 @@ EDA_LibCmpAliasStruct * AliasEntry;
/***************************************************/
void WinEDA_LibeditFrame::SaveOnePartInMemory(void)
void WinEDA_LibeditFrame::SaveOnePartInMemory()
/***************************************************/
/* Routine de sauvegarde de la "partlib" courante dans la librairie courante
Sauvegarde en memoire uniquement, et PAS sur fichier

4
eeschema/libedit_undo_redo.cpp
View File

@ -39,7 +39,7 @@ EDA_LibComponentStruct * CopyItem;
}
/******************************************************/
void WinEDA_LibeditFrame::GetComponentFromRedoList(void)
void WinEDA_LibeditFrame::GetComponentFromRedoList()
/******************************************************/
/* Redo the last edition:
- Place the current edited library component in undo list
@ -59,7 +59,7 @@ void WinEDA_LibeditFrame::GetComponentFromRedoList(void)
}
/******************************************************/
void WinEDA_LibeditFrame::GetComponentFromUndoList(void)
void WinEDA_LibeditFrame::GetComponentFromUndoList()
/******************************************************/
/* Undo the last edition:
- Place the current edited library component in Redo list

18
eeschema/libedpart.cpp
View File

@ -99,14 +99,14 @@ private:
public:
// Constructor and destructor
WinEDA_PartPropertiesFrame(WinEDA_LibeditFrame *parent, wxPoint& pos);
~WinEDA_PartPropertiesFrame(void)
~WinEDA_PartPropertiesFrame()
{
};
private:
void BuildPanelBasic(void);
void BuildPanelDoc(void);
void BuildPanelAlias(void);
void BuildPanelBasic();
void BuildPanelDoc();
void BuildPanelAlias();
void BuildPanelEditField(int fieldId);
void PartPropertiesAccept(wxCommandEvent& event);
void OnQuit(wxCommandEvent& event);
@ -114,7 +114,7 @@ private:
void DeleteAliasOfPart(wxCommandEvent& event);
void AddAliasOfPart(wxCommandEvent& event);
bool ChangeNbUnitsPerPackage(int newUnit);
bool SetUnsetConvert(void);
bool SetUnsetConvert();
void CopyDocToAlias(wxCommandEvent& event);
void BrowseAndSelectDocFile(wxCommandEvent& event);
@ -254,7 +254,7 @@ int ii;
}
/*****************************************************/
void WinEDA_PartPropertiesFrame::BuildPanelAlias(void)
void WinEDA_PartPropertiesFrame::BuildPanelAlias()
/*****************************************************/
/* create the panel for component alias list editing
*/
@ -305,7 +305,7 @@ wxButton * Button;
/*****************************************************/
void WinEDA_PartPropertiesFrame::BuildPanelDoc(void)
void WinEDA_PartPropertiesFrame::BuildPanelDoc()
/*****************************************************/
/* create the panel for component doc editing
*/
@ -388,7 +388,7 @@ wxString msg_text;
/*****************************************************/
void WinEDA_PartPropertiesFrame::BuildPanelBasic(void)
void WinEDA_PartPropertiesFrame::BuildPanelBasic()
/*****************************************************/
/* create the basic panel for component properties editing
*/
@ -1033,7 +1033,7 @@ LibEDA_BaseStruct* DrawItem, * NextDrawItem;
/*****************************************************/
bool WinEDA_PartPropertiesFrame::SetUnsetConvert(void)
bool WinEDA_PartPropertiesFrame::SetUnsetConvert()
/*****************************************************/
/* crée ou efface (selon option AsConvert) les éléments
de la représentation convertie d'un composant

6
eeschema/libframe.cpp
View File

@ -82,7 +82,7 @@ WinEDA_LibeditFrame::WinEDA_LibeditFrame(wxWindow * father, WinEDA_App *parent,
}
/**********************************************/
WinEDA_LibeditFrame::~WinEDA_LibeditFrame(void)
WinEDA_LibeditFrame::~WinEDA_LibeditFrame()
/**********************************************/
{
m_Parent->LibeditFrame = NULL;
@ -124,7 +124,7 @@ LibraryStruct *Lib;
/******************************************/
void WinEDA_LibeditFrame::SetToolbars(void)
void WinEDA_LibeditFrame::SetToolbars()
/******************************************/
/* Enable or disable tools of the differents toolbars,
according to the current conditions or options
@ -233,7 +233,7 @@ void WinEDA_LibeditFrame::SetToolbars(void)
}
/**************************************/
int WinEDA_LibeditFrame::BestZoom(void)
int WinEDA_LibeditFrame::BestZoom()
/**************************************/
{
int dx, dy, ii,jj ;

2
eeschema/menubar.cpp
View File

@ -19,7 +19,7 @@
/************************************************/
void WinEDA_SchematicFrame::ReCreateMenuBar(void)
void WinEDA_SchematicFrame::ReCreateMenuBar()
/************************************************/
/* create or update the menubar for the schematic frame
*/

2
eeschema/netlist.cpp
View File

@ -75,7 +75,7 @@ int i;
}
/*****************************************************/
void * WinEDA_SchematicFrame::BuildNetListBase(void)
void * WinEDA_SchematicFrame::BuildNetListBase()
/*****************************************************/
/* Routine qui construit le tableau des elements connectes du projet
met a jour:

16
eeschema/netlist_control.cpp
View File

@ -55,7 +55,7 @@ public:
EDA_NoteBookPage(wxNotebook* parent, const wxString & title,
int id_NetType, int idCheckBox, int idCreateFile);
~EDA_NoteBookPage(void) {};
~EDA_NoteBookPage() {};
};
@ -141,14 +141,14 @@ public:
public:
// Constructor and destructor
WinEDA_NetlistFrame(WinEDA_SchematicFrame *parent, wxPoint& pos);
~WinEDA_NetlistFrame(void) {};
~WinEDA_NetlistFrame() {};
private:
void InstallCustomPages(void);
void InstallPageSpice(void);
void InstallCustomPages();
void InstallPageSpice();
void GenNetlist(wxCommandEvent& event);
void RunSimulator(wxCommandEvent& event);
void NetlistUpdateOpt(void);
void NetlistUpdateOpt();
void NetlistExit(wxCommandEvent& event);
void SelectNetlistType(wxCommandEvent& event);
void SetupPlugin(wxCommandEvent& event);
@ -238,7 +238,7 @@ int ii;
/*************************************************/
void WinEDA_NetlistFrame::InstallPageSpice(void)
void WinEDA_NetlistFrame::InstallPageSpice()
/*************************************************/
/* Create the spice page
*/
@ -278,7 +278,7 @@ wxString netlist_opt[2] = { _("Use Net Names"), _("Use Net Numbers") };
}
/*************************************************/
void WinEDA_NetlistFrame::InstallCustomPages(void)
void WinEDA_NetlistFrame::InstallCustomPages()
/*************************************************/
/* create the pages for custom netlist format selection:
*/
@ -376,7 +376,7 @@ EDA_NoteBookPage * CurrPage;
}
/***********************************************/
void WinEDA_NetlistFrame::NetlistUpdateOpt(void)
void WinEDA_NetlistFrame::NetlistUpdateOpt()
/***********************************************/
{
int ii;

2
eeschema/options.cpp
View File

@ -64,7 +64,7 @@ public:
// Constructor and destructor
WinEDA_SetOptionsFrame(WinEDA_DrawFrame *parent, const wxPoint& framepos);
~WinEDA_SetOptionsFrame(void) {};
~WinEDA_SetOptionsFrame() {};
private:
void Accept(wxCommandEvent& event);

2
eeschema/pinedit.cpp
View File

@ -107,7 +107,7 @@ wxString msg;
/*********************************************/
void WinEDA_LibeditFrame::InitEditOnePin(void)
void WinEDA_LibeditFrame::InitEditOnePin()
/*********************************************/
/* Routine d'installation du menu d'edition d'une pin
*/

2
eeschema/plothpgl.cpp
View File

@ -372,7 +372,7 @@ wxIcon WinEDA_PlotHPGLFrame::GetIconResource( const wxString& name )
/***************************************************/
void WinEDA_PlotHPGLFrame::SetPageOffsetValue(void)
void WinEDA_PlotHPGLFrame::SetPageOffsetValue()
/***************************************************/
{
wxString msg;

2
eeschema/plothpgl.h
View File

@ -134,7 +134,7 @@ public:
void Plot_1_Page_HPGL(const wxString & FullFileName,BASE_SCREEN * screen);
void Plot_Schematic_HPGL(int Select_PlotAll, int HPGL_SheetSize);
void ReturnSheetDims( BASE_SCREEN * screen, wxSize & SheetSize, wxPoint & SheetOffset);
void SetPageOffsetValue(void);
void SetPageOffsetValue();
////@begin WinEDA_PlotHPGLFrame member variables
wxRadioBox* m_SizeOption;

2
eeschema/plotps.cpp
View File

@ -303,7 +303,7 @@ void WinEDA_PlotPSFrame::OnCloseClick( wxCommandEvent& event )
/*****************************************/
void WinEDA_PlotPSFrame::InitOptVars(void)
void WinEDA_PlotPSFrame::InitOptVars()
/*****************************************/
{
Plot_Sheet_Ref = m_Plot_Sheet_Ref->GetValue();

2
eeschema/plotps.h
View File

@ -104,7 +104,7 @@ public:
wxIcon GetIconResource( const wxString& name );
////@end WinEDA_PlotPSFrame member function declarations
void InitOptVars(void);
void InitOptVars();
void CreatePSFile(int AllPages, int pagesize);
void PlotOneSheetPS(const wxString & FileName,
BASE_SCREEN * screen, Ki_PageDescr * sheet, int BBox[4], wxPoint plot_offset);

8
eeschema/protos.h
View File

@ -47,7 +47,7 @@ void InstallCmpeditFrame(WinEDA_SchematicFrame * parent, wxPoint & pos,
/* Functions common to all EELibs?.c modules: */
int LibraryEntryCompare(EDA_LibComponentStruct *LE1, EDA_LibComponentStruct *LE2);
int NumOfLibraries(void);
int NumOfLibraries();
EDA_LibComponentStruct *FindLibPart(const wxChar *Name, const wxString & LibName, int Alias);
void DrawingLibInGhost(WinEDA_DrawPanel * panel, wxDC * DC, EDA_LibComponentStruct *LibEntry,
@ -83,7 +83,7 @@ LibraryStruct * LoadLibraryName(WinEDA_DrawFrame * frame,
const wxString & FullLibName, const wxString & LibName);
void LoadLibraries(WinEDA_DrawFrame * frame);
void FreeCmpLibrary(wxWindow * frame, const wxString & LibName);
const wxChar **GetLibNames(void);
const wxChar **GetLibNames();
void SnapLibItemPoint(int OrigX, int OrigY, int *ClosestX, int *ClosestY,
EDA_SchComponentStruct *DrawLibItem);
@ -208,14 +208,14 @@ void RedrawOneStruct(WinEDA_DrawPanel * panel, wxDC * DC, EDA_BaseStruct *Struct
/**************/
/* EELAYER.CPP */
/**************/
void SeedLayers(void);
void SeedLayers();
int ReturnLayerColor(int Layer);
void DisplayColorSetupFrame(WinEDA_DrawFrame * parent, const wxPoint & pos);
/*************/
/* EELOAD.CPP */
/*************/
int CountCmpNumber(void);
int CountCmpNumber();
/***************/

6
eeschema/schframe.cpp
View File

@ -156,7 +156,7 @@ WinEDA_SchematicFrame:: WinEDA_SchematicFrame(wxWindow * father, WinEDA_App *par
/* Destructeur */
/***************/
WinEDA_SchematicFrame::~WinEDA_SchematicFrame(void)
WinEDA_SchematicFrame::~WinEDA_SchematicFrame()
{
m_Parent->SchematicFrame = NULL;
m_CurrentScreen = ScreenSch;
@ -228,7 +228,7 @@ SCH_SCREEN * screen;
/********************************************/
void WinEDA_SchematicFrame::SetToolbars(void)
void WinEDA_SchematicFrame::SetToolbars()
/********************************************/
/* Active ou desactive les tools du toolbar horizontal, en fonction des commandes
en cours
@ -283,7 +283,7 @@ en cours
}
/******************************************/
int WinEDA_SchematicFrame::BestZoom(void)
int WinEDA_SchematicFrame::BestZoom()
/******************************************/
{
int dx, dy, ii,jj ;

4
eeschema/tool_viewlib.cpp
View File

@ -24,7 +24,7 @@
#include "Lib_next.xpm"
/****************************************************/
void WinEDA_ViewlibFrame::ReCreateHToolbar(void)
void WinEDA_ViewlibFrame::ReCreateHToolbar()
/****************************************************/
{
int ii;
@ -145,7 +145,7 @@ bool asdeMorgan = FALSE, state;
/****************************************************/
void WinEDA_ViewlibFrame::ReCreateVToolbar(void)
void WinEDA_ViewlibFrame::ReCreateVToolbar()
/****************************************************/
{
}

8
eeschema/viewlib_frame.cpp
View File

@ -106,7 +106,7 @@ WinEDA_ViewlibFrame::WinEDA_ViewlibFrame(wxWindow * father, WinEDA_App *parent,
/* Destructeur */
/***************/
WinEDA_ViewlibFrame::~WinEDA_ViewlibFrame(void)
WinEDA_ViewlibFrame::~WinEDA_ViewlibFrame()
{
delete m_CurrentScreen;
m_Parent->ViewlibFrame = NULL;
@ -172,7 +172,7 @@ wxSize Vtoolbar_size;
/*******************************************/
int WinEDA_ViewlibFrame::BestZoom(void)
int WinEDA_ViewlibFrame::BestZoom()
/*******************************************/
{
int bestzoom, ii, jj;
@ -212,7 +212,7 @@ EDA_LibComponentStruct * CurrentLibEntry = NULL;
}
/***************************************************/
void WinEDA_ViewlibFrame::ReCreateListLib(void)
void WinEDA_ViewlibFrame::ReCreateListLib()
/***************************************************/
{
const wxChar ** ListNames, ** names;
@ -251,7 +251,7 @@ bool found = FALSE;
}
/***********************************************/
void WinEDA_ViewlibFrame::ReCreateListCmp(void)
void WinEDA_ViewlibFrame::ReCreateListCmp()
/***********************************************/
{
int ii;

4
eeschema/viewlibs.cpp
View File

@ -106,7 +106,7 @@ void WinEDA_ViewlibFrame::OnRightClick(const wxPoint& MousePos, wxMenu * PopMenu
/**********************************************/
void WinEDA_ViewlibFrame::DisplayLibInfos(void)
void WinEDA_ViewlibFrame::DisplayLibInfos()
/**********************************************/
/* Affiche en Ligne d'info la librairie en cours de visualisation */
{
@ -124,7 +124,7 @@ LibraryStruct * Lib;
/*****************************************/
/* Routine to Select Current library */
/*****************************************/
void WinEDA_ViewlibFrame::SelectCurrentLibrary(void)
void WinEDA_ViewlibFrame::SelectCurrentLibrary()
{
LibraryStruct * Lib;

2
eeschema/wxprint.h
View File

@ -53,7 +53,7 @@ class MyCanvas: public wxScrolledWindow
{
public:
MyCanvas(wxFrame *frame, const wxPoint& pos, const wxSize& size, long style = wxRETAINED);
~MyCanvas(void) ;
~MyCanvas() ;
virtual void OnDraw(wxDC& dc);
void OnEvent(wxMouseEvent& event);

2
gerbview/controle.cpp
View File

@ -21,7 +21,7 @@
/**********************************************************************/
EDA_BaseStruct * WinEDA_GerberFrame::GerberGeneralLocateAndDisplay(void)
EDA_BaseStruct * WinEDA_GerberFrame::GerberGeneralLocateAndDisplay()
/**********************************************************************/
{
return Locate(CURSEUR_OFF_GRILLE);

14
gerbview/dcode.cpp
View File

@ -80,7 +80,7 @@ int ii;
GERBER_Descr::~GERBER_Descr(void)
GERBER_Descr::~GERBER_Descr()
{
int ii;
@ -95,7 +95,7 @@ int ii;
}
/******************************************/
void GERBER_Descr::ResetDefaultValues(void)
void GERBER_Descr::ResetDefaultValues()
/******************************************/
{
m_Parent = NULL;
@ -135,7 +135,7 @@ void GERBER_Descr::ResetDefaultValues(void)
}
/********************************************/
int GERBER_Descr::ReturnUsedDcodeNumber(void)
int GERBER_Descr::ReturnUsedDcodeNumber()
/********************************************/
{
int ii, jj;
@ -155,7 +155,7 @@ int ii, jj;
/******************************/
void GERBER_Descr::InitToolTable(void)
void GERBER_Descr::InitToolTable()
/******************************/
/* Creation du tableau des MAX_TOOLS DCodes utilisables, si il n'existe pas,
et Init des DCodes à une valeur raisonnable
@ -188,11 +188,11 @@ D_CODE::D_CODE(int num_dcode)
Clear_D_CODE_Data();
}
D_CODE::~D_CODE(void)
D_CODE::~D_CODE()
{
}
void D_CODE::Clear_D_CODE_Data(void)
void D_CODE::Clear_D_CODE_Data()
{
m_Size.x = DEFAULT_SIZE;
m_Size.y = DEFAULT_SIZE;
@ -329,7 +329,7 @@ D_CODE ** ListeDCode;
/***************************************************/
void WinEDA_GerberFrame::CopyDCodesSizeToItems(void)
void WinEDA_GerberFrame::CopyDCodesSizeToItems()
/***************************************************/
/* Set Size Items (Lines, Flashes) from DCodes List
*/

6
gerbview/gerberframe.cpp
View File

@ -152,7 +152,7 @@ WinEDA_GerberFrame::WinEDA_GerberFrame(wxWindow * father, WinEDA_App *parent,
}
WinEDA_GerberFrame::~WinEDA_GerberFrame(void)
WinEDA_GerberFrame::~WinEDA_GerberFrame()
{
m_Parent->m_GerberFrame = NULL;
m_CurrentScreen = ScreenPcb;
@ -196,7 +196,7 @@ PCB_SCREEN * screen;
}
/*******************************************/
void WinEDA_GerberFrame::SetToolbars(void)
void WinEDA_GerberFrame::SetToolbars()
/*******************************************/
/* Active ou desactive les tools du toolbar horizontal, en fonction des commandes
en cours
@ -285,7 +285,7 @@ GERBER_Descr * Gerber_layer_descr = g_GERBER_Descr_List[layer];
}
/*************************************/
int WinEDA_GerberFrame::BestZoom(void)
int WinEDA_GerberFrame::BestZoom()
/*************************************/
{
int ii,jj ;

2
gerbview/gerbview.cpp
View File

@ -22,7 +22,7 @@ wxString g_Main_Title = wxT("GerbView");
IMPLEMENT_APP(WinEDA_App)
bool WinEDA_App::OnInit(void)
bool WinEDA_App::OnInit()
{
wxString FFileName;

12
gerbview/gerbview.h
View File

@ -143,11 +143,11 @@ public:
public:
GERBER_Descr(int layer);
~GERBER_Descr(void);
void Clear_GERBER_Descr(void);
int ReturnUsedDcodeNumber(void);
void ResetDefaultValues(void);
void InitToolTable(void);
~GERBER_Descr();
void Clear_GERBER_Descr();
int ReturnUsedDcodeNumber();
void ResetDefaultValues();
void InitToolTable();
// Routines utilisées en lecture de ficher gerber
wxPoint ReadXYCoord(char * &Text);
@ -180,7 +180,7 @@ public:
public:
D_CODE(int num_dcode);
~D_CODE();
void Clear_D_CODE_Data(void);
void Clear_D_CODE_Data();
};
eda_global wxChar *g_GERBER_Tool_Type[6]

4
gerbview/gerbview_config.cpp
View File

@ -74,7 +74,7 @@ wxString FullFileName;
/*****************************************************/
bool Read_Config(void)
bool Read_Config()
/*****************************************************/
/* lit la configuration, si elle n'a pas deja etee lue
1 - lit gerbview.cnf
@ -99,7 +99,7 @@ bool Read_Config(void)
/******************************************/
void WinEDA_GerberFrame::Update_config(void)
void WinEDA_GerberFrame::Update_config()
/******************************************/
/*
creation du fichier de config

4
gerbview/options.cpp
View File

@ -128,7 +128,7 @@ private:
// Constructor and destructor
public:
WinEDA_GerberGeneralOptionsFrame(WinEDA_BasePcbFrame *parent,const wxPoint& pos);
~WinEDA_GerberGeneralOptionsFrame(void) {};
~WinEDA_GerberGeneralOptionsFrame() {};
private:
void AcceptPcbOptions(wxCommandEvent& event);
@ -263,7 +263,7 @@ public:
// Constructor and destructor
WinEDA_LookFrame(WinEDA_BasePcbFrame *parent,const wxPoint& pos);
~WinEDA_LookFrame(void) {};
~WinEDA_LookFrame() {};
void AcceptPcbOptions(wxCommandEvent& event);
void OnQuit(wxCommandEvent & event);

2
gerbview/pcbtexte.cpp
View File

@ -94,7 +94,7 @@ void WinEDA_PcbFrame::StartMoveTextePcb(TEXTE_PCB * TextePcb, wxDC * DC)
}
/*****************************/
/* void Move_Texte_Pcb(void) */
/* void Move_Texte_Pcb() */
/*****************************/
/* Routine deplacant le texte PCB suivant le curseur de la souris */

4
gerbview/process_config.cpp
View File

@ -75,7 +75,7 @@ wxString FullFileName;
/*****************************************************/
bool Read_Config(void)
bool Read_Config()
/*****************************************************/
/* lit la configuration, si elle n'a pas deja etee lue
1 - lit gerbview.cnf
@ -100,7 +100,7 @@ bool Read_Config(void)
/******************************************/
void WinEDA_GerberFrame::Update_config(void)
void WinEDA_GerberFrame::Update_config()
/******************************************/
/*
creation du fichier de config

6
gerbview/protos.h
View File

@ -14,7 +14,7 @@ BOARD_ITEM* SaveItemEfface( BOARD_ITEM* PtItem, int nbitems );
/***********************/
/* gerbview_config.cpp */
/***********************/
bool Read_Config(void);
bool Read_Config();
bool Read_Hotkey_Config( WinEDA_DrawFrame * frame, bool verbose );
@ -69,8 +69,8 @@ void trace_1_contour_GERBER(int cX,int cY, int dimX,int dimY,
ses variations deltaX et deltaY et son orientation orient */
/* PLOTHPGL.CC */
void Init_Trace_HPGL(void);
void Fin_Trace_HPGL(void);
void Init_Trace_HPGL();
void Fin_Trace_HPGL();
void trace_1_segment_HPGL(int pos_X0,int pos_Y0,int pos_X1,int pos_Y1,
int hauteur);

2
gerbview/reglage.cpp
View File

@ -50,7 +50,7 @@ private:
// Constructor and destructor
public:
WinEDA_ConfigFrame(WinEDA_GerberFrame *parent,const wxPoint& pos);
~WinEDA_ConfigFrame(void) {};
~WinEDA_ConfigFrame() {};
private:
void SaveCfg(wxCommandEvent & event);

2
gerbview/select_layers_to_pcb.cpp
View File

@ -37,7 +37,7 @@ public:
// Constructor and destructor
WinEDA_SwapLayerFrame(WinEDA_GerberFrame *parent);
~WinEDA_SwapLayerFrame(void) {};
~WinEDA_SwapLayerFrame() {};
private:
void Sel_Layer(wxCommandEvent& event);

2
gerbview/set_color.cpp
View File

@ -61,7 +61,7 @@ public:
// Constructor and destructor
WinEDA_SetColorsFrame(WinEDA_DrawFrame *parent, const wxPoint& framepos);
~WinEDA_SetColorsFrame(void) {};
~WinEDA_SetColorsFrame() {};
private:
void SetColor(wxCommandEvent& event);

696
include/common.h
View File

@ -1,6 +1,6 @@
/****************************/
/* common.h */
/****************************/
/****************************/
/* common.h */
/****************************/
#ifndef COMMON_H
#define COMMON_H
@ -36,38 +36,37 @@ enum pseudokeys {
#define ESC 27
#ifdef __WINDOWS__
#define CVPCB_EXE wxT("cvpcb.exe")
#define PCBNEW_EXE wxT("pcbnew.exe")
#define EESCHEMA_EXE wxT("eeschema.exe")
#define GERBVIEW_EXE wxT("gerbview.exe")
#define CVPCB_EXE wxT( "cvpcb.exe" )
#define PCBNEW_EXE wxT( "pcbnew.exe" )
#define EESCHEMA_EXE wxT( "eeschema.exe" )
#define GERBVIEW_EXE wxT( "gerbview.exe" )
#else
#ifndef __WXMAC__
#define CVPCB_EXE wxT("cvpcb")
#define PCBNEW_EXE wxT("pcbnew")
#define EESCHEMA_EXE wxT("eeschema")
#define GERBVIEW_EXE wxT("gerbview")
#define CVPCB_EXE wxT( "cvpcb" )
#define PCBNEW_EXE wxT( "pcbnew" )
#define EESCHEMA_EXE wxT( "eeschema" )
#define GERBVIEW_EXE wxT( "gerbview" )
#endif
#ifdef __WXMAC__
#define CVPCB_EXE wxT("cvpcb.app")
#define PCBNEW_EXE wxT("pcbnew.app")
#define EESCHEMA_EXE wxT("eeschema.app")
#define GERBVIEW_EXE wxT("gerbview.app")
#define CVPCB_EXE wxT( "cvpcb.app" )
#define PCBNEW_EXE wxT( "pcbnew.app" )
#define EESCHEMA_EXE wxT( "eeschema.app" )
#define GERBVIEW_EXE wxT( "gerbview.app" )
#endif
#endif
/* Graphic Texts Orientation in 0.1 degree*/
#define TEXT_ORIENT_HORIZ 0
#define TEXT_ORIENT_VERT 900
#define TEXT_ORIENT_VERT 900
/* Affichage ou Effacement d'Item */
#define ON 1 /* Affichage */
#define OFF 0 /* Effacement */
/* unites d'affichage sur ecran et autres */
#define INCHES 0
#define INCHES 0
#define MILLIMETRE 1
#define CENTIMETRE 2
@ -86,206 +85,214 @@ enum paramcfg_id /* type du parametre dans la structure ParamConfig */
PARAM_COMMAND_ERASE
};
#define MAX_COLOR 0x8001F
#define MAX_COLOR 0x8001F
#define INT_MINVAL 0x80000000
#define INT_MAXVAL 0x7FFFFFFF
class PARAM_CFG_BASE
{
public:
const wxChar * m_Ident; /* Abreviation de reperage des debuts de lignes */
paramcfg_id m_Type; /* flag type des parametres */
const wxChar * m_Group; /* Nom du groupe (rubrique) de classement */
bool m_Setup; /* TRUE -> inscription en setup (registration base)*/
const wxChar* m_Ident; /* Abreviation de reperage des debuts de lignes */
paramcfg_id m_Type; /* flag type des parametres */
const wxChar* m_Group; /* Nom du groupe (rubrique) de classement */
bool m_Setup; /* TRUE -> inscription en setup (registration base)*/
public:
PARAM_CFG_BASE(const wxChar * ident, const paramcfg_id type, const wxChar * group = NULL);
~PARAM_CFG_BASE() {};
PARAM_CFG_BASE( const wxChar * ident, const paramcfg_id type, const wxChar * group = NULL );
~PARAM_CFG_BASE() { };
};
class PARAM_CFG_INT : public PARAM_CFG_BASE
class PARAM_CFG_INT : public PARAM_CFG_BASE
{
public:
int * m_Pt_param; /* pointeur sur le parametre a configurer */
int m_Min, m_Max; /* valeurs extremes du parametre */
int m_Default; /* valeur par defaut */
int* m_Pt_param; /* pointeur sur le parametre a configurer */
int m_Min, m_Max; /* valeurs extremes du parametre */
int m_Default; /* valeur par defaut */
public:
PARAM_CFG_INT(const wxChar * ident, int * ptparam,
int default_val = 0, int min = INT_MINVAL, int max = INT_MAXVAL,
const wxChar * group = NULL);
PARAM_CFG_INT(bool Insetup, const wxChar * ident, int * ptparam,
int default_val = 0, int min = INT_MINVAL, int max = INT_MAXVAL,
const wxChar * group = NULL);
PARAM_CFG_INT( const wxChar * ident, int* ptparam,
int default_val = 0, int min = INT_MINVAL, int max = INT_MAXVAL,
const wxChar * group = NULL );
PARAM_CFG_INT( bool Insetup, const wxChar * ident, int* ptparam,
int default_val = 0, int min = INT_MINVAL, int max = INT_MAXVAL,
const wxChar * group = NULL );
};
class PARAM_CFG_SETCOLOR : public PARAM_CFG_BASE
{
public:
int * m_Pt_param; /* pointeur sur le parametre a configurer */
int m_Default; /* valeur par defaut */
int* m_Pt_param; /* pointeur sur le parametre a configurer */
int m_Default; /* valeur par defaut */
public:
PARAM_CFG_SETCOLOR(const wxChar * ident, int * ptparam,
int default_val, const wxChar * group = NULL);
PARAM_CFG_SETCOLOR(bool Insetup, const wxChar * ident, int * ptparam,
int default_val, const wxChar * group = NULL);
PARAM_CFG_SETCOLOR( const wxChar * ident, int* ptparam,
int default_val, const wxChar * group = NULL );
PARAM_CFG_SETCOLOR( bool Insetup, const wxChar * ident, int* ptparam,
int default_val, const wxChar * group = NULL );
};
class PARAM_CFG_DOUBLE : public PARAM_CFG_BASE
class PARAM_CFG_DOUBLE : public PARAM_CFG_BASE
{
public:
double * m_Pt_param; /* pointeur sur le parametre a configurer */
double m_Default; /* valeur par defaut */
double m_Min, m_Max; /* valeurs extremes du parametre */
double* m_Pt_param; /* pointeur sur le parametre a configurer */
double m_Default; /* valeur par defaut */
double m_Min, m_Max; /* valeurs extremes du parametre */
public:
PARAM_CFG_DOUBLE(const wxChar * ident, double * ptparam,
double default_val = 0.0, double min = 0.0, double max = 10000.0,
const wxChar * group = NULL);
PARAM_CFG_DOUBLE(bool Insetup, const wxChar * ident, double * ptparam,
double default_val = 0.0, double min = 0.0, double max = 10000.0,
const wxChar * group = NULL);
PARAM_CFG_DOUBLE( const wxChar * ident, double* ptparam,
double default_val = 0.0, double min = 0.0, double max = 10000.0,
const wxChar * group = NULL );
PARAM_CFG_DOUBLE( bool Insetup, const wxChar * ident, double* ptparam,
double default_val = 0.0, double min = 0.0, double max = 10000.0,
const wxChar * group = NULL );
};
class PARAM_CFG_BOOL : public PARAM_CFG_BASE
class PARAM_CFG_BOOL : public PARAM_CFG_BASE
{
public:
bool * m_Pt_param; /* pointeur sur le parametre a configurer */
int m_Default; /* valeur par defaut */
bool* m_Pt_param; /* pointeur sur le parametre a configurer */
int m_Default; /* valeur par defaut */
public:
PARAM_CFG_BOOL(const wxChar * ident, bool * ptparam,
int default_val = FALSE,const wxChar * group = NULL);
PARAM_CFG_BOOL(bool Insetup, const wxChar * ident, bool * ptparam,
int default_val = FALSE,const wxChar * group = NULL);
PARAM_CFG_BOOL( const wxChar * ident, bool * ptparam,
int default_val = FALSE, const wxChar * group = NULL );
PARAM_CFG_BOOL( bool Insetup, const wxChar * ident, bool * ptparam,
int default_val = FALSE, const wxChar * group = NULL );
};
class PARAM_CFG_WXSTRING : public PARAM_CFG_BASE
class PARAM_CFG_WXSTRING : public PARAM_CFG_BASE
{
public:
wxString * m_Pt_param; /* pointeur sur le parametre a configurer */
wxString* m_Pt_param; /* pointeur sur le parametre a configurer */
public:
PARAM_CFG_WXSTRING(const wxChar * ident, wxString * ptparam, const wxChar * group = NULL);
PARAM_CFG_WXSTRING(bool Insetup, const wxChar * ident, wxString * ptparam, const wxChar * group = NULL);
PARAM_CFG_WXSTRING( const wxChar * ident, wxString * ptparam, const wxChar * group = NULL );
PARAM_CFG_WXSTRING( bool Insetup,
const wxChar * ident,
wxString * ptparam,
const wxChar * group = NULL );
};
class PARAM_CFG_LIBNAME_LIST : public PARAM_CFG_BASE
{
public:
wxArrayString * m_Pt_param; /* pointeur sur le parametre a configurer */
wxArrayString* m_Pt_param; /* pointeur sur le parametre a configurer */
public:
PARAM_CFG_LIBNAME_LIST(const wxChar * ident, wxArrayString * ptparam, const wxChar * group = NULL);
PARAM_CFG_LIBNAME_LIST( const wxChar * ident,
wxArrayString * ptparam,
const wxChar * group = NULL );
};
/***********************************/
/* Classe pour affichage de textes */
/***********************************/
class WinEDA_TextFrame: public wxDialog
/***********************************/
/* Classe pour affichage de textes */
/***********************************/
class WinEDA_TextFrame : public wxDialog
{
private:
wxWindow * m_Parent;
wxListBox * m_List;
wxWindow* m_Parent;
wxListBox* m_List;
public:
WinEDA_TextFrame(wxWindow * parent, const wxString & title);
void Append( const wxString & text);
WinEDA_TextFrame( wxWindow * parent, const wxString &title );
void Append( const wxString& text );
private:
void D_ClickOnList(wxCommandEvent& event);
void OnClose(wxCloseEvent& event);
void D_ClickOnList( wxCommandEvent& event );
void OnClose( wxCloseEvent& event );
DECLARE_EVENT_TABLE()
};
/* Gestion des feuilles de trac<61>:
*/
*/
class Ki_PageDescr
{
// All sizes are in 1/1000 inch
public:
wxSize m_Size ; /* page size in 1/1000 inch */
wxPoint m_Offset; /* plot offset in 1/1000 inch */
wxSize m_Size; /* page size in 1/1000 inch */
wxPoint m_Offset; /* plot offset in 1/1000 inch */
wxString m_Name;
int m_LeftMargin;
int m_RightMargin;
int m_TopMargin;
int m_BottomMargin;
int m_LeftMargin;
int m_RightMargin;
int m_TopMargin;
int m_BottomMargin;
public:
Ki_PageDescr(const wxSize & size, const wxPoint & offset, const wxString & name);
Ki_PageDescr( const wxSize &size, const wxPoint &offset, const wxString &name );
};
/* Standard page sizes in 1/1000 inch */
#if defined EDA_BASE
Ki_PageDescr g_Sheet_A4(wxSize(11700,8267), wxPoint(0,0), wxT("A4") );
Ki_PageDescr g_Sheet_A3(wxSize(16535,11700),wxPoint(0,0),wxT("A3") );
Ki_PageDescr g_Sheet_A2(wxSize(23400,16535),wxPoint(0,0),wxT("A2") );
Ki_PageDescr g_Sheet_A1(wxSize(33070,23400),wxPoint(0,0),wxT("A1") );
Ki_PageDescr g_Sheet_A0(wxSize(46800,33070),wxPoint(0,0),wxT("A0") );
Ki_PageDescr g_Sheet_A(wxSize(11000,8500),wxPoint(0,0),wxT("A") );
Ki_PageDescr g_Sheet_B(wxSize(17000,11000),wxPoint(0,0),wxT("B") );
Ki_PageDescr g_Sheet_C(wxSize(22000,17000),wxPoint(0,0),wxT("C") );
Ki_PageDescr g_Sheet_D(wxSize(34000,22000),wxPoint(0,0),wxT("D") );
Ki_PageDescr g_Sheet_E(wxSize(44000,34000),wxPoint(0,0),wxT("E") );
Ki_PageDescr g_Sheet_GERBER(wxSize(32000,32000),wxPoint(0,0),wxT("GERBER") );
Ki_PageDescr g_Sheet_user(wxSize(17000,11000),wxPoint(0,0),wxT("User") );
Ki_PageDescr g_Sheet_A4( wxSize( 11700, 8267 ), wxPoint( 0, 0 ), wxT( "A4" ) );
Ki_PageDescr g_Sheet_A3( wxSize( 16535, 11700 ), wxPoint( 0, 0 ), wxT( "A3" ) );
Ki_PageDescr g_Sheet_A2( wxSize( 23400, 16535 ), wxPoint( 0, 0 ), wxT( "A2" ) );
Ki_PageDescr g_Sheet_A1( wxSize( 33070, 23400 ), wxPoint( 0, 0 ), wxT( "A1" ) );
Ki_PageDescr g_Sheet_A0( wxSize( 46800, 33070 ), wxPoint( 0, 0 ), wxT( "A0" ) );
Ki_PageDescr g_Sheet_A( wxSize( 11000, 8500 ), wxPoint( 0, 0 ), wxT( "A" ) );
Ki_PageDescr g_Sheet_B( wxSize( 17000, 11000 ), wxPoint( 0, 0 ), wxT( "B" ) );
Ki_PageDescr g_Sheet_C( wxSize( 22000, 17000 ), wxPoint( 0, 0 ), wxT( "C" ) );
Ki_PageDescr g_Sheet_D( wxSize( 34000, 22000 ), wxPoint( 0, 0 ), wxT( "D" ) );
Ki_PageDescr g_Sheet_E( wxSize( 44000, 34000 ), wxPoint( 0, 0 ), wxT( "E" ) );
Ki_PageDescr g_Sheet_GERBER( wxSize( 32000, 32000 ), wxPoint( 0, 0 ), wxT( "GERBER" ) );
Ki_PageDescr g_Sheet_user( wxSize( 17000, 11000 ), wxPoint( 0, 0 ), wxT( "User" ) );
#else
extern Ki_PageDescr g_Sheet_A4 ;
extern Ki_PageDescr g_Sheet_A3 ;
extern Ki_PageDescr g_Sheet_A2 ;
extern Ki_PageDescr g_Sheet_A1 ;
extern Ki_PageDescr g_Sheet_A0 ;
extern Ki_PageDescr g_Sheet_A ;
extern Ki_PageDescr g_Sheet_B ;
extern Ki_PageDescr g_Sheet_C ;
extern Ki_PageDescr g_Sheet_D ;
extern Ki_PageDescr g_Sheet_E ;
extern Ki_PageDescr g_Sheet_GERBER ;
extern Ki_PageDescr g_Sheet_user ;
extern Ki_PageDescr g_Sheet_A4;
extern Ki_PageDescr g_Sheet_A3;
extern Ki_PageDescr g_Sheet_A2;
extern Ki_PageDescr g_Sheet_A1;
extern Ki_PageDescr g_Sheet_A0;
extern Ki_PageDescr g_Sheet_A;
extern Ki_PageDescr g_Sheet_B;
extern Ki_PageDescr g_Sheet_C;
extern Ki_PageDescr g_Sheet_D;
extern Ki_PageDescr g_Sheet_E;
extern Ki_PageDescr g_Sheet_GERBER;
extern Ki_PageDescr g_Sheet_user;
#endif
COMMON_GLOBL int g_LastKey; /* code de la derniere touche actionn<6E><6E> */
COMMON_GLOBL int g_LastKey; /* code de la derniere touche actionn<6E><6E> */
COMMON_GLOBL wxString g_ProductName
#ifdef EDA_BASE
= wxT("KiCad E.D.A. ")
= wxT( "KiCad E.D.A. " )
#endif
;
/* Gestion des librairies */
COMMON_GLOBL wxString g_RealLibDirBuffer; // Chemin reel des librairies de module
// = UserLibDirBuffer si non vide
// = chemin par defaut sinon
// = UserLibDirBuffer si non vide
// = chemin par defaut sinon
COMMON_GLOBL wxString g_UserLibDirBuffer; // Chemin des librairies de module donne par
// le file de config
// le file de config
/* variables globales generales */
COMMON_GLOBL int g_DebugLevel; // 0= Pas de debug */
COMMON_GLOBL int g_MouseOldButtons;
COMMON_GLOBL int g_KeyPressed;
// Font used by kicad.
// these font have a size which do not depend on default size system font
COMMON_GLOBL wxFont * g_StdFont; /* Standard font used for status display ,in message panel */
COMMON_GLOBL wxFont * g_DialogFont; /* Normal font used in dialog box */
COMMON_GLOBL wxFont * g_ItalicFont; /* Italic font used in dialog box */
COMMON_GLOBL wxFont * g_MsgFont; /* Italic font used in msg panel (lower window) */
COMMON_GLOBL wxFont * g_FixedFont; /* Affichage de Texte en fenetres de dialogue,
fonte a pas fixe)*/
COMMON_GLOBL int g_StdFontPointSize; /* taille de la fonte */
COMMON_GLOBL int g_DialogFontPointSize; /* taille de la fonte */
COMMON_GLOBL int g_FixedFontPointSize; /* taille de la fonte */
COMMON_GLOBL int g_MsgFontPointSize; /* taille de la fonte */
COMMON_GLOBL int g_FontMinPointSize; /* taille minimum des fontes */
COMMON_GLOBL wxFont* g_StdFont; /* Standard font used for status display ,in message panel */
COMMON_GLOBL wxFont* g_DialogFont; /* Normal font used in dialog box */
COMMON_GLOBL wxFont* g_ItalicFont; /* Italic font used in dialog box */
COMMON_GLOBL wxFont* g_MsgFont; /* Italic font used in msg panel (lower window) */
COMMON_GLOBL wxFont* g_FixedFont; /* Affichage de Texte en fenetres de dialogue,
* fonte a pas fixe)*/
COMMON_GLOBL int g_StdFontPointSize; /* taille de la fonte */
COMMON_GLOBL int g_DialogFontPointSize; /* taille de la fonte */
COMMON_GLOBL int g_FixedFontPointSize; /* taille de la fonte */
COMMON_GLOBL int g_MsgFontPointSize; /* taille de la fonte */
COMMON_GLOBL int g_FontMinPointSize; /* taille minimum des fontes */
COMMON_GLOBL bool g_IsPrinting; // TRUE si impression au lieu de trace a l'ecran
COMMON_GLOBL bool g_ShowPageLimits // TRUE to display the page limits
COMMON_GLOBL bool g_IsPrinting; // TRUE si impression au lieu de trace a l'ecran
COMMON_GLOBL bool g_ShowPageLimits // TRUE to display the page limits
#ifdef EDA_BASE
= TRUE
#endif
@ -294,27 +301,28 @@ COMMON_GLOBL bool g_ShowPageLimits // TRUE to display the page limits
/* Gloabl variables for project handling */
COMMON_GLOBL wxString g_Prj_Config_Filename_ext
#ifdef EDA_BASE
= wxT(".pro" )
= wxT( ".pro" )
#endif
;
COMMON_GLOBL wxFileConfig * g_Prj_Config; // Configuration locale, propre au projet
COMMON_GLOBL wxString g_Prj_Default_Config_FullFilename; // Nom (full file name) du file Configuration par defaut (kicad.pro)
COMMON_GLOBL wxString g_Prj_Config_LocalFilename; // Nom du file Configuration local (<curr projet>.pro)
COMMON_GLOBL wxFileConfig* g_Prj_Config; // Configuration locale, propre au projet
COMMON_GLOBL wxString g_Prj_Default_Config_FullFilename; // Nom (full file name) du file Configuration par defaut (kicad.pro)
COMMON_GLOBL wxString g_Prj_Config_LocalFilename; // Nom du file Configuration local (<curr projet>.pro)
// Handle the preferd editor for browsing report files:
COMMON_GLOBL wxString g_EditorName;
COMMON_GLOBL wxString g_EditorName;
// Gestion de la grille "utilisateur" (User Grid)
#ifdef EDA_BASE
wxRealPoint g_UserGrid(0.01, 0.01);
int g_UserGrid_Unit = INCHES;
wxRealPoint g_UserGrid( 0.01, 0.01 );
int g_UserGrid_Unit = INCHES;
#else
extern wxRealPoint g_UserGrid;
extern int g_UserGrid_Unit;
extern int g_UserGrid_Unit;
#endif
COMMON_GLOBL int g_UnitMetric; // display units mm = 1, inches = 0, cm = 2
COMMON_GLOBL int g_UnitMetric; // display units mm = 1, inches = 0, cm = 2
// shape selector for cursor screen
@ -326,13 +334,12 @@ COMMON_GLOBL int g_GhostColor;
/* Draw color for grid: */
COMMON_GLOBL int g_GridColor
#ifdef EDA_BASE
= DARKGRAY
= DARKGRAY
#endif
;
/* Current used screen: */
COMMON_GLOBL BASE_SCREEN * ActiveScreen;
COMMON_GLOBL BASE_SCREEN* ActiveScreen;
/**************************************/
@ -345,10 +352,11 @@ class WinEDA_DrawPanel;
/* COMMON.CPP */
wxString ReturnPcbLayerName(int layer_number, bool is_filename = FALSE);
wxString ReturnPcbLayerName( int layer_number, bool is_filename = FALSE );
/* Return the name of the layer number "layer_number".
if "is_filename" == TRUE, the name can be used for a file name
(not internatinalized, no space)*/
* if "is_filename" == TRUE, the name can be used for a file name
* (not internatinalized, no space)*/
/*********************/
@ -358,272 +366,304 @@ wxString ReturnPcbLayerName(int layer_number, bool is_filename = FALSE);
/**************/
/* DRAWTXT.CPP */
/**************/
void DrawGraphicText(WinEDA_DrawPanel * panel, wxDC * DC, const wxPoint & pos,
int mode_color, const wxString & Text,
int orient , const wxSize & char_size,
int h_justify, int v_justify, int width = 0);
void DrawGraphicText( WinEDA_DrawPanel* panel, wxDC* DC, const wxPoint& pos,
int mode_color, const wxString& Text,
int orient, const wxSize& char_size,
int h_justify, int v_justify, int width = 0 );
void PlotGraphicText(int format_plot, const wxPoint & Pos, int gcolor,
const wxString & Text,
int orient, const wxSize & Size, int h_justify, int v_justify);
void PlotGraphicText( int format_plot, const wxPoint& Pos, int gcolor,
const wxString& Text,
int orient, const wxSize& Size, int h_justify, int v_justify );
/***************/
/* CONFIRM.CPP */
/***************/
void DisplayError(wxWindow * parent, const wxString & msg, int displaytime = 0);
void DisplayInfo(wxWindow * parent, const wxString & msg, int displaytime = 0);
/* Routines d'affichage messages ( disparait au bout de displaytime 0.1 secondes) */
void DisplayError( wxWindow* parent, const wxString& msg, int displaytime = 0 );
void DisplayInfo( wxWindow* parent, const wxString& msg, int displaytime = 0 );
bool IsOK(wxWindow * parent, const wxString & msg) ;
/* Routine affichant la fenetre "CONFIRMATION"
Retourne 1 ou 0 selon reponse Yes / No */
/* Routines d'affichage messages ( disparait au bout de displaytime 0.1 secondes) */
int Get_Message(const wxString & titre, wxString & buffer, wxWindow * frame) ;
/* Fonction d'installation du menu de Dialogue
entree: titre = titre a afficher
entree/sortie :buffer : contient la reponse
si a l'appel buffer n'est pas vide, son contenu est aussi
affiche, mais disparait a la 1ere correction */
bool IsOK( wxWindow* parent, const wxString& msg );
/* Routine affichant la fenetre "CONFIRMATION"
* Retourne 1 ou 0 selon reponse Yes / No */
int Get_Message( const wxString& titre, wxString& buffer, wxWindow* frame );
/* Fonction d'installation du menu de Dialogue
* entree: titre = titre a afficher
* entree/sortie :buffer : contient la reponse
* si a l'appel buffer n'est pas vide, son contenu est aussi
* affiche, mais disparait a la 1ere correction */
/************************/
/* file GESTFICH.CPP */
/************************/
wxString GetEditorName(void); // Return the prefered editor name
void OpenPDF( const wxString & file );
void OpenFile( const wxString & file );
wxString GetEditorName(); // Return the prefered editor name
void OpenPDF( const wxString& file );
void OpenFile( const wxString& file );
bool EDA_DirectorySelector(const wxString & Title, /* Titre de la fenetre */
wxString & Path, /* Chemin par defaut */
int flag, /* reserve */
wxWindow * Frame, /* parent frame */
const wxPoint & Pos);
bool EDA_DirectorySelector( const wxString& Title, /* Titre de la fenetre */
wxString& Path, /* Chemin par defaut */
int flag, /* reserve */
wxWindow* Frame, /* parent frame */
const wxPoint& Pos );
wxString EDA_FileSelector(const wxString & Title, /* Window title */
const wxString & Path, /* default path */
const wxString & FileName, /* default filename */
const wxString & Ext, /* default extension */
const wxString & Mask, /* Display filename mask */
wxWindow * Frame, /* parent frame */
int flag, /* wxSAVE, wxOPEN ..*/
const bool keep_working_directory, /* true = do not change the C.W.D. */
const wxPoint & Pos = wxPoint(-1, -1)
);
wxString EDA_FileSelector( const wxString& Title, /* Window title */
const wxString& Path, /* default path */
const wxString& FileName, /* default filename */
const wxString& Ext, /* default extension */
const wxString& Mask, /* Display filename mask */
wxWindow* Frame, /* parent frame */
int flag, /* wxSAVE, wxOPEN ..*/
const bool keep_working_directory, /* true = do not change the C.W.D. */
const wxPoint& Pos = wxPoint( -1, -1 )
);
wxString MakeFileName( const wxString& dir,
const wxString& shortname, const wxString& ext );
wxString MakeFileName( const wxString & dir,
const wxString & shortname, const wxString & ext);
/* Calcule le nom complet d'un file d'apres les chaines
dir = prefixe (chemin)
shortname = nom avec ou sans chemin ou extension
ext = extension
* dir = prefixe (chemin)
* shortname = nom avec ou sans chemin ou extension
* ext = extension
*
* si la chaine name possede deja un chemin ou une extension, elles
* ne seront pas modifiees
*
* retourne la chaine calculee */
si la chaine name possede deja un chemin ou une extension, elles
ne seront pas modifiees
wxString MakeReducedFileName( const wxString& fullfilename,
const wxString& default_path,
const wxString& default_ext );
retourne la chaine calculee */
wxString MakeReducedFileName( const wxString & fullfilename,
const wxString & default_path,
const wxString & default_ext);
/* Calcule le nom "reduit" d'un file d'apres les chaines
fullfilename = nom complet
default_path = prefixe (chemin) par defaut
default_ext = extension par defaut
* fullfilename = nom complet
* default_path = prefixe (chemin) par defaut
* default_ext = extension par defaut
*
* retourne le nom reduit, c'est a dire:
* sans le chemin si le chemin est default_path
* avec ./ si si le chemin est le chemin courant
* sans l'extension si l'extension est default_ext
*
* Renvoie un chemin en notation unix ('/' en separateur de repertoire)
*/
retourne le nom reduit, c'est a dire:
sans le chemin si le chemin est default_path
avec ./ si si le chemin est le chemin courant
sans l'extension si l'extension est default_ext
WinEDAListBox* GetFileNames( char* Directory, char* Mask );
Renvoie un chemin en notation unix ('/' en separateur de repertoire)
*/
void ChangeFileNameExt( wxString& FullFileName, const wxString& NewExt );
WinEDAListBox * GetFileNames(char *Directory, char *Mask);
/* Change l'extension du "filename FullFileName" en NewExt.
* Retourne FullFileName */
void ChangeFileNameExt( wxString & FullFileName, const wxString & NewExt );
/* Change l'extension du "filename FullFileName" en NewExt.
Retourne FullFileName */
int ExecuteFile( wxWindow* frame, const wxString& ExecFile,
const wxString& param = wxEmptyString );
void AddDelimiterString( wxString& string );
int ExecuteFile(wxWindow * frame, const wxString & ExecFile,
const wxString & param = wxEmptyString);
void AddDelimiterString( wxString & string );
void SetRealLibraryPath( const wxString& shortlibname );/* met a jour
* le chemin des librairies RealLibDirBuffer (global)
* a partir de UserLibDirBuffer (global):
* Si UserLibDirBuffer non vide RealLibDirBuffer = UserLibDirBuffer.
* Sinon si variable d'environnement KICAD definie (KICAD = chemin pour kicad),
* UserLibDirBuffer = <KICAD>/shortlibname;
* Sinon UserLibDirBuffer = <Chemin des binaires>../shortlibname/
*/
wxString FindKicadHelpPath();
void SetRealLibraryPath(const wxString & shortlibname); /* met a jour
le chemin des librairies RealLibDirBuffer (global)
a partir de UserLibDirBuffer (global):
Si UserLibDirBuffer non vide RealLibDirBuffer = UserLibDirBuffer.
Sinon si variable d'environnement KICAD definie (KICAD = chemin pour kicad),
UserLibDirBuffer = <KICAD>/shortlibname;
Sinon UserLibDirBuffer = <Chemin des binaires>../shortlibname/
*/
wxString FindKicadHelpPath(void);
/* Find absolute path for kicad/help (or kicad/help/<language>) */
wxString ReturnKicadDatasPath(void);
/* Retourne le chemin des donnees communes de kicad. */
wxString ReturnKicadDatasPath();
/* Retourne le chemin des donnees communes de kicad. */
wxString FindKicadFile( const wxString& shortname );
wxString FindKicadFile(const wxString & shortname);
/* Search the executable file shortname in kicad binary path and return
full file name if found or shortname */
* full file name if found or shortname */
/*************/
/* STRING.CPP */
/*************/
char * strupper(char * Text);
char* strupper( char* Text );
int ReadDelimitedText(char * dest, char * source, int NbMaxChar );
/* lit et place dans dest la chaine de caractere trouvee dans source,
delimitee par " .
transfere NbMaxChar max
retourne le nombre de codes lus dans source
dest est termine par NULL */
int ReadDelimitedText( char* dest, char* source, int NbMaxChar );
char * GetLine(FILE *File, char *Line, int *LineNum = NULL, int SizeLine = 255);
/* Routine de lecture de 1 ligne utile
retourne la 1ere ligne utile lue.
elimine lignes vides et commentaires */
char * StrPurge(char * text);
/* Supprime les caracteres Space en debut de la ligne text
retourne un pointeur sur le 1er caractere non Space de text */
/* lit et place dans dest la chaine de caractere trouvee dans source,
* delimitee par " .
* transfere NbMaxChar max
* retourne le nombre de codes lus dans source
* dest est termine par NULL */
char * DateAndTime(char * line);
wxString DateAndTime(void);
/* Retourne la chaine de caractere donnant date+heure */
char* GetLine( FILE* File, char* Line, int* LineNum = NULL, int SizeLine = 255 );
int StrLenNumCmp(const wxChar *str1,const wxChar *str2, int NbMax);
/*
routine (compatible qsort() ) de comparaision pour classement alphab<EFBFBD>tique
Analogue a strncmp() mais les nombres sont compar<EFBFBD>s selon leur valeur num<EFBFBD>rique
et non pas par leur code ascii */
/* Routine de lecture de 1 ligne utile
* retourne la 1ere ligne utile lue.
* elimine lignes vides et commentaires */
char* StrPurge( char* text );
int StrNumICmp(const wxChar *str1,const wxChar *str2);
/* routine (compatible qsort() ) de comparaison pour classement alphab<61>tique,
avec lower case == upper case.
Analogue a stricmp() mais les nombres sont compar<EFBFBD>s selon leur valeur num<EFBFBD>rique
et non pas par leur code ascii */
/* Supprime les caracteres Space en debut de la ligne text
* retourne un pointeur sur le 1er caractere non Space de text */
int StrLenNumICmp(const wxChar *str1,const wxChar *str2, int NbMax);
/* routine (compatible qsort() ) de comparaison pour classement alphab<61>tique,
avec lower case == upper case.
Analogue a stricmp() mais les nombres sont compar<EFBFBD>s selon leur valeur num<EFBFBD>rique
et non pas par leur code ascii */
char* DateAndTime( char* line );
wxString DateAndTime();
bool WildCompareString(const wxString & pattern, const wxString & string_to_tst,
bool case_sensitive = TRUE);
/* compare 2 noms de composants, selon regles usuelles
( Jokers * , ? , autoris<EFBFBD>s).
la chaine de reference est "pattern"
si case_sensitive == TRUE (default), comparaison exacte
retourne TRUE si match FALSE si differences */
/* Retourne la chaine de caractere donnant date+heure */
char * to_point(char * Text);
/* convertit les , en . dans une chaine. utilis<69> pour compenser la fct printf
qui genere les flottants avec une virgule au lieu du point en mode international */
int StrLenNumCmp( const wxChar* str1, const wxChar* str2, int NbMax );
/*
* routine (compatible qsort() ) de comparaision pour classement alphab<EFBFBD>tique
* Analogue a strncmp() mais les nombres sont compar<EFBFBD>s selon leur valeur num<EFBFBD>rique
* et non pas par leur code ascii */
int StrNumICmp( const wxChar* str1, const wxChar* str2 );
/* routine (compatible qsort() ) de comparaison pour classement alphab<61>tique,
* avec lower case == upper case.
* Analogue a stricmp() mais les nombres sont compar<EFBFBD>s selon leur valeur num<EFBFBD>rique
* et non pas par leur code ascii */
int StrLenNumICmp( const wxChar* str1, const wxChar* str2, int NbMax );
/* routine (compatible qsort() ) de comparaison pour classement alphab<61>tique,
* avec lower case == upper case.
* Analogue a stricmp() mais les nombres sont compar<EFBFBD>s selon leur valeur num<EFBFBD>rique
* et non pas par leur code ascii */
bool WildCompareString( const wxString& pattern, const wxString& string_to_tst,
bool case_sensitive = TRUE );
/* compare 2 noms de composants, selon regles usuelles
* ( Jokers * , ? , autoris<EFBFBD>s).
* la chaine de reference est "pattern"
* si case_sensitive == TRUE (default), comparaison exacte
* retourne TRUE si match FALSE si differences */
char* to_point( char* Text );
/* convertit les , en . dans une chaine. utilis<69> pour compenser la fct printf
* qui genere les flottants avec une virgule au lieu du point en mode international */
/****************/
/* infospgm.cpp */
/****************/
void Print_Kicad_Infos(wxWindow * frame);
void Print_Kicad_Infos( wxWindow* frame );
/**************/
/* common.cpp */
/**************/
wxString GetBuildVersion(void); /* Return the build date */
wxString GetBuildVersion(); /* Return the build date */
void Affiche_1_Parametre( WinEDA_DrawFrame* frame,
int pos_X,
const wxString& texte_H,
const wxString& texte_L,
int color );
void Affiche_1_Parametre(WinEDA_DrawFrame * frame ,
int pos_X,const wxString& texte_H,const wxString& texte_L,int color);
/*
Routine d'affichage d'un parametre.
pos_X = cadrage horizontal
si pos_X < 0 : la position horizontale est la derniere
valeur demandee >= 0
texte_H = texte a afficher en ligne superieure.
si "", par d'affichage sur cette ligne
texte_L = texte a afficher en ligne inferieure.
si "", par d'affichage sur cette ligne
color = couleur d'affichage
*/
* Routine d'affichage d'un parametre.
* pos_X = cadrage horizontal
* si pos_X < 0 : la position horizontale est la derniere
* valeur demandee >= 0
* texte_H = texte a afficher en ligne superieure.
* si "", par d'affichage sur cette ligne
* texte_L = texte a afficher en ligne inferieure.
* si "", par d'affichage sur cette ligne
* color = couleur d'affichage
*/
void AfficheDoc(WinEDA_DrawFrame * frame, const wxString & Doc, const wxString & KeyW);
/* Routine d'affichage de la documentation associee a un composant */
void AfficheDoc( WinEDA_DrawFrame* frame, const wxString& Doc, const wxString& KeyW );
int GetTimeStamp(void);
/* Retoure une identification temporelle (Time stamp) differente a chaque appel */
int DisplayColorFrame(wxWindow * parent, int OldColor);
int GetCommandOptions(const int argc, const char **argv, const char * stringtst,
const char ** optarg, int * optind);
/* Routine d'affichage de la documentation associee a un composant */
int GetTimeStamp();
/* Retoure une identification temporelle (Time stamp) differente a chaque appel */
int DisplayColorFrame( wxWindow* parent, int OldColor );
int GetCommandOptions( const int argc, const char** argv, const char* stringtst,
const char** optarg, int* optind );
void valeur_param(int valeur,wxString & buf_texte);
void valeur_param( int valeur, wxString& buf_texte );
/* Retourne pour affichage la valeur d'un parametre, selon type d'unites choisies
entree : valeur en mils , buffer de texte
retourne en buffer : texte : valeur exprimee en pouces ou millimetres
suivie de " ou mm
*/
* entree : valeur en mils , buffer de texte
* retourne en buffer : texte : valeur exprimee en pouces ou millimetres
* suivie de " ou mm
*/
wxString ReturnUnitSymbol(int Units = g_UnitMetric);
int ReturnValueFromString(int Units, const wxString & TextValue, int Internal_Unit);
wxString ReturnStringFromValue(int Units, int Value, int Internal_Unit);
void AddUnitSymbol(wxStaticText & Stext, int Units = g_UnitMetric);
/* Add string " (mm):" or " ("):" to the static text Stext.
Used in dialog boxes for entering values depending on selected units */
void PutValueInLocalUnits(wxTextCtrl & TextCtr, int Value, int Internal_Unit);
/* Convert the number Value in a string according to the internal units
and the selected unit (g_UnitMetric) and put it in the wxTextCtrl TextCtrl */
int ReturnValueFromTextCtrl(const wxTextCtrl & TextCtr, int Internal_Unit);
/* Convert the Value in the wxTextCtrl TextCtrl in an integer,
according to the internal units and the selected unit (g_UnitMetric) */
wxString ReturnUnitSymbol( int Units = g_UnitMetric );
int ReturnValueFromString( int Units, const wxString& TextValue, int Internal_Unit );
wxString ReturnStringFromValue( int Units, int Value, int Internal_Unit );
void AddUnitSymbol( wxStaticText& Stext, int Units = g_UnitMetric );
double To_User_Unit(bool is_metric, int val,int internal_unit_value);
int From_User_Unit(bool is_metric, double val,int internal_unit_value);
wxString GenDate(void);
void MyFree (void * pt_mem);
void * MyZMalloc (size_t nb_octets);
void * MyMalloc (size_t nb_octets);
/* Add string " (mm):" or " ("):" to the static text Stext.
* Used in dialog boxes for entering values depending on selected units */
void PutValueInLocalUnits( wxTextCtrl& TextCtr, int Value, int Internal_Unit );
/* Convert the number Value in a string according to the internal units
* and the selected unit (g_UnitMetric) and put it in the wxTextCtrl TextCtrl */
int ReturnValueFromTextCtrl( const wxTextCtrl& TextCtr, int Internal_Unit );
/* Convert the Value in the wxTextCtrl TextCtrl in an integer,
* according to the internal units and the selected unit (g_UnitMetric) */
double To_User_Unit( bool is_metric, int val, int internal_unit_value );
int From_User_Unit( bool is_metric, double val, int internal_unit_value );
wxString GenDate();
void MyFree( void* pt_mem );
void* MyZMalloc( size_t nb_octets );
void* MyMalloc( size_t nb_octets );
/****************/
/* eda_doc.cpp */
/****************/
int KeyWordOk(const wxString & KeyList, const wxString & Database );
int KeyWordOk( const wxString& KeyList, const wxString& Database );
/* Recherche si dans le texte Database on retrouve tous les mots
cles donnes dans KeyList ( KeyList = suite de mots cles
separes par des espaces
Retourne:
0 si aucun mot cle trouv<EFBFBD>
1 si mot cle trouv<EFBFBD>
*/
bool GetAssociatedDocument(wxFrame * frame, const wxString & LibPath,
const wxString & DocName);
* cles donnes dans KeyList ( KeyList = suite de mots cles
* separes par des espaces
* Retourne:
* 0 si aucun mot cle trouv<EFBFBD>
* 1 si mot cle trouv<EFBFBD>
*/
bool GetAssociatedDocument( wxFrame* frame, const wxString& LibPath,
const wxString& DocName );
/****************************/
/* get_component_dialog.cpp */
/****************************/
wxString GetComponentName(WinEDA_DrawFrame * frame,
wxArrayString & HistoryList, const wxString & Title,
wxString(*AuxTool)(WinEDA_DrawFrame *parent) );
/* Dialog frame to choose a component name */
void AddHistoryComponentName(wxArrayString & HistoryList, const wxString & Name);
/* Add the string "Name" to the history list */
wxString GetComponentName( WinEDA_DrawFrame* frame,
wxArrayString& HistoryList, const wxString& Title,
wxString (* AuxTool)(WinEDA_DrawFrame* parent) );
/* Dialog frame to choose a component name */
void AddHistoryComponentName( wxArrayString& HistoryList, const wxString& Name );
/* Add the string "Name" to the history list */
/**********************/
/* block_commande.cpp */
/**********************/
void AbortBlockCurrentCommand(WinEDA_DrawPanel * Panel, wxDC * DC);
/* Cancel Current block operation. */
void InitBlockLocateDatas( WinEDA_DrawPanel * Panel,const wxPoint & startpos );
/* Init the initial values of a BlockLocate, before starting a block command */
void DrawAndSizingBlockOutlines(WinEDA_DrawPanel * panel, wxDC * DC, bool erase );
/* Redraw the outlines of the block which shows the search area for block commands
The first point of the rectangle showing the area is initialised
by InitBlockLocateDatas().
The other point of the rectangle is the mouse cursor */
void AbortBlockCurrentCommand( WinEDA_DrawPanel* Panel, wxDC* DC );
/* Cancel Current block operation. */
void InitBlockLocateDatas( WinEDA_DrawPanel* Panel, const wxPoint& startpos );
/* Init the initial values of a BlockLocate, before starting a block command */
void DrawAndSizingBlockOutlines( WinEDA_DrawPanel* panel, wxDC* DC, bool erase );
/* Redraw the outlines of the block which shows the search area for block commands
* The first point of the rectangle showing the area is initialised
* by InitBlockLocateDatas().
* The other point of the rectangle is the mouse cursor */
#endif // COMMON_H

44
include/fctsys.h
View File

@ -1,6 +1,6 @@
/********************/
/* includes systeme */
/********************/
/********************/
/* includes systeme */
/********************/
#ifndef FCTSYS_H
#define FCTSYS_H
@ -21,8 +21,8 @@
#ifdef __FreeBSD__
#include <stdlib.h>
#else
# ifndef __DARWIN__
# include <malloc.h> // MacOSX (DARWIN): malloc() and free() are in stdlib.h
#ifndef __DARWIN__
#include <malloc.h> // MacOSX (DARWIN): malloc() and free() are in stdlib.h
#endif
#endif
#include <time.h>
@ -38,43 +38,41 @@
#define M_PI 3.141592653
#endif
#define PCB_INTERNAL_UNIT 10000 // PCBNEW internal unit = 1/10000 inch
#define EESCHEMA_INTERNAL_UNIT 1000 // EESCHEMA internal unit = 1/1000 inch
#define PCB_INTERNAL_UNIT 10000 // PCBNEW internal unit = 1/10000 inch
#define EESCHEMA_INTERNAL_UNIT 1000 // EESCHEMA internal unit = 1/1000 inch
#include "wxstruct.h"
#include "gr_basic.h"
// Old wxWidget compatibility (prior to wxWidget 2.7):
#if ( (wxMAJOR_VERSION < 2) || ((wxMAJOR_VERSION == 2)&& (wxMINOR_VERSION < 7)) )
#define wxFD_OPEN wxOPEN
#define wxFD_SAVE wxSAVE
#if ( ( wxMAJOR_VERSION < 2) || ( ( wxMAJOR_VERSION == 2)&& (wxMINOR_VERSION < 7 ) ) )
#define wxFD_OPEN wxOPEN
#define wxFD_SAVE wxSAVE
#define wxFD_OVERWRITE_PROMPT wxOVERWRITE_PROMPT
#define WXK_PAGEUP WXK_PRIOR
#define WXK_PAGEDOWN WXK_NEXT
#define WXK_PAGEUP WXK_PRIOR
#define WXK_PAGEDOWN WXK_NEXT
#endif
#ifdef __UNIX__
#define stricmp strcasecmp
#define stricmp strcasecmp
#define strnicmp strncasecmp
#endif
#ifdef __WINDOWS__
#define DIR_SEP '\\'
#define STRING_DIR_SEP wxT("\\")
#define DIR_SEP '\\'
#define STRING_DIR_SEP wxT( "\\" )
#else
#define DIR_SEP '/'
#define STRING_DIR_SEP wxT("/")
#define DIR_SEP '/'
#define STRING_DIR_SEP wxT( "/" )
#endif
#define UNIX_STRING_DIR_SEP wxT("/")
#define WIN_STRING_DIR_SEP wxT("\\")
#define UNIX_STRING_DIR_SEP wxT( "/" )
#define WIN_STRING_DIR_SEP wxT( "\\" )
#ifndef TRUE
#define TRUE ((bool)1)
#define FALSE ((bool)0)
#define TRUE ((bool)1)
#define FALSE ((bool)0)
#endif
#endif /* FCTSYS_H */

4
include/gr_basic.h
View File

@ -125,8 +125,8 @@ void GRSFillCSegm(EDA_Rect * ClipBox, wxDC * DC,
int x1, int y1, int x2, int y2, int width, int Color);
void GRSetColor(int Color);
void GRSetDefaultPalette(void);
int GRGetColor(void);
void GRSetDefaultPalette();
int GRGetColor();
void GRPutPixel(EDA_Rect * ClipBox, wxDC * DC, int x, int y, int color);
void GRSPutPixel(EDA_Rect * ClipBox, wxDC * DC, int x, int y, int color);
int GRGetPixel(wxDC * DC, int x, int y);

2
include/plot_common.h
View File

@ -33,7 +33,7 @@ void UserToDeviceCoordinate(wxPoint & pos );
// modifie les coord pos.x et pos.y pour le trace selon l'orientation, l'echelle, les offsets de trace
void UserToDeviceSize(wxSize & size );
// modifie les dimension size.x et size.y pour le trace selon l'echelle
void ForcePenReinit(void);
void ForcePenReinit();
// set the flag g_CurrentPenWidth to -1 in order
// to force a pen width redefinition for the next draw command

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