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

Application name capitalization fixes. 

* Correct all user strings and comments for the correct capitalization of
  application names according to JP.  They are KiCad, Pcbnew, CvPcb,
  Eeschema, and GerbView.
* Add a note the the user interface policy about the correct capitalization.
This commit is contained in:
Wayne Stambaugh 2011-09-30 14:15:37 -04:00
parent 611a5155fc
commit 4b853dedb4
265 changed files with 959 additions and 924 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Documentation/guidelines/UIpolicies.txt
View File

@ -1,13 +1,19 @@
** General UI Guidelines for KICAD Development ** General UI Guidelines for KiCad Development
Capitalization: Capitalization:
For any visible text used within Kicad, follow recommendations here: For any visible text used within KiCad, follow recommendations here:
http://library.gnome.org/devel/hig-book/2.20/design-text-labels.html.en#layout-capitalization http://library.gnome.org/devel/hig-book/2.20/design-text-labels.html.en#layout-capitalization
This applies to all Menus, Titles, Labels, Tooltips, Buttons, etc. This applies to all Menus, Titles, Labels, Tooltips, Buttons, etc.
The capitalization for the application names is KiCad, Eeschema, CvPcb,
GerbView, and Pcbnew. All strings that have application names that are
visible to the user should be capitalized this way. It's also a good
idea use this capitalization in source code comments as well to prevent
confusion of new contributors.
Dialogs: Dialogs:

9
common/base_struct.cpp
View File

@ -1,8 +1,7 @@
/**********************************/ /**
/* Basic classes for Kicad: */ * @file base_struct.cpp
/* EDA_ITEM */ * @brief Implementation of EDA_ITEM and EDA_TEXT base classes for KiCad.
/* EDA_TEXT */ */
/**********************************/
#include "fctsys.h" #include "fctsys.h"
#include "gr_basic.h" #include "gr_basic.h"

4
common/basicframe.cpp
View File

@ -261,7 +261,7 @@ void EDA_BASE_FRAME::GetKicadHelp( wxCommandEvent& event )
* or the the full specific doc * or the the full specific doc
* if event id is wxID_INDEX, we want the document for beginners. * if event id is wxID_INDEX, we want the document for beginners.
* else the specific doc file (its name is in wxGetApp().m_HelpFileName) * else the specific doc file (its name is in wxGetApp().m_HelpFileName)
* The document for beginners is the same for all kicad utilities * The document for beginners is the same for all KiCad utilities
*/ */
if( event.GetId() == wxID_INDEX ) if( event.GetId() == wxID_INDEX )
{ {
@ -318,7 +318,7 @@ void EDA_BASE_FRAME::GetKicadHelp( wxCommandEvent& event )
/* /*
* Function OnSelectPreferredEditor * Function OnSelectPreferredEditor
* Open a dialog to select the preferred editor that will be used in Kicad * Open a dialog to select the preferred editor that will be used in KiCad
* to edit or display files (reports ... ) * to edit or display files (reports ... )
* The full filename editor is saved in configuration (global params) * The full filename editor is saved in configuration (global params)
*/ */

4
common/bitmap.cpp
View File

@ -1,8 +1,8 @@
/* /*
* This program source code file is part of KICAD, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2011 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com> * Copyright (C) 2011 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
* Copyright (C) 2011 Kicad Developers, see change_log.txt for contributors. * Copyright (C) 2011 KiCad Developers, see change_log.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License

8
common/block_commande.cpp
View File

@ -1,7 +1,7 @@
/********************************************/ /**
/* Routines for managing on block commands. */ * @file block_commande.cpp
/* (Common section Eeschema / pcbnew ... */ * @brief Common routines for managing on block commands.
/********************************************/ */
#include "fctsys.h" #include "fctsys.h"
#include "gr_basic.h" #include "gr_basic.h"

2
common/build_version.cpp
View File

@ -1,4 +1,4 @@
/* Date for kicad build version */ /* Date for KiCad build version */
#include "fctsys.h" #include "fctsys.h"
#ifdef HAVE_SVN_VERSION #ifdef HAVE_SVN_VERSION

10
common/class_bitmap_base.cpp
View File

@ -1,12 +1,12 @@
/********************/ /**
/* sch_bitmap.cpp */ * @file sch_bitmap.cpp
/********************/ */
/* /*
* This program source code file is part of KICAD, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2011 jean-pierre.charras * Copyright (C) 2011 jean-pierre.charras
* Copyright (C) 2011 Kicad Developers, see change_log.txt for contributors. * Copyright (C) 2011 KiCad Developers, see change_log.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License

12
common/class_colors_design_settings.cpp
View File

@ -1,7 +1,7 @@
/****************************************************/ /**
/* class_colors_design_settings.cpp */ * @file class_colors_design_settings.cpp
/* handle colors used to draw all items or layers */ * @brief Handle colors used to draw all items or layers.
/****************************************************/ */
#include "fctsys.h" #include "fctsys.h"
#include "colors.h" #include "colors.h"
#include "macros.h" #include "macros.h"
@ -9,10 +9,10 @@
#include "class_colors_design_settings.h" #include "class_colors_design_settings.h"
/* Class for handle list of color settings for designs /* Class for handle list of color settings for designs
* in Eeschema, Pcbnew and gerbview * in Eeschema, Pcbnew and GerbView
*/ */
/* Initial colors values: optimized for pcbnew, but are also Ok for eeschema /* Initial colors values: optimized for Pcbnew, but are also Ok for Eeschema
* these values are superseded by config reading * these values are superseded by config reading
*/ */
static const int default_layer_color[LAYERSCOLORSBUFFERSIZE] = static const int default_layer_color[LAYERSCOLORSBUFFERSIZE] =

10
common/class_marker_base.cpp
View File

@ -1,7 +1,9 @@
/********************************************************************************** /**
* class MARKER_BASE; markers are used to show something (usually a drc/erc problem) * @file class_marker_base.cpp
* Markers in pcbnew and eeschema are derived from this basic class * @brief Implementation of MARKER_BASE class.
**********************************************************************************/ * Markers are used to show something (usually a drc/erc problem).
* Markers in Pcbnew and Eeschema are derived from this base class.
*/
/* file class_marker_base.cpp /* file class_marker_base.cpp
*/ */

4
common/class_undoredo_container.cpp
View File

@ -1,9 +1,9 @@
/* /*
* This program source code file is part of KICAD, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2009 jean-pierre.charras@gipsa-lab.inpg.fr * Copyright (C) 2009 jean-pierre.charras@gipsa-lab.inpg.fr
* Copyright (C) 2011 Wayne Stambaugh <stambaughw@verizon.net> * Copyright (C) 2011 Wayne Stambaugh <stambaughw@verizon.net>
* Copyright (C) 2009 Kicad Developers, see change_log.txt for contributors. * Copyright (C) 2009 KiCad Developers, see change_log.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License

22
common/common.cpp
View File

@ -62,13 +62,13 @@ const wxString PdfFileExtension( wxT( "pdf" ) );
const wxString MacrosFileExtension( wxT( "mcr" ) ); const wxString MacrosFileExtension( wxT( "mcr" ) );
/* Proper wxFileDialog wild card definitions. */ /* Proper wxFileDialog wild card definitions. */
const wxString ProjectFileWildcard( _( "Kicad project files (*.pro)|*.pro" ) ); const wxString ProjectFileWildcard( _( "KiCad project files (*.pro)|*.pro" ) );
const wxString SchematicFileWildcard( _( "Kicad schematic files (*.sch)|*.sch" ) ); const wxString SchematicFileWildcard( _( "KiCad schematic files (*.sch)|*.sch" ) );
const wxString NetlistFileWildcard( _( "Kicad netlist files (*.net)|*.net" ) ); const wxString NetlistFileWildcard( _( "KiCad netlist files (*.net)|*.net" ) );
const wxString GerberFileWildcard( _( "Gerber files (*.pho)|*.pho" ) ); const wxString GerberFileWildcard( _( "Gerber files (*.pho)|*.pho" ) );
const wxString PcbFileWildcard( _( "Kicad printed circuit board files (*.brd)|*.brd" ) ); const wxString PcbFileWildcard( _( "KiCad printed circuit board files (*.brd)|*.brd" ) );
const wxString PdfFileWildcard( _( "Portable document format files (*.pdf)|*.pdf" ) ); const wxString PdfFileWildcard( _( "Portable document format files (*.pdf)|*.pdf" ) );
const wxString MacrosFileWildcard( _( "Kicad recorded macros (*.mcr)|*.mcr" ) ); const wxString MacrosFileWildcard( _( "KiCad recorded macros (*.mcr)|*.mcr" ) );
const wxString AllFilesWildcard( _( "All files (*)|*" ) ); const wxString AllFilesWildcard( _( "All files (*)|*" ) );
@ -87,7 +87,7 @@ int g_GhostColor;
/* predefined colors used in kicad. /* predefined colors used in kicad.
* Please: if you change a value, remember these values are carefully chosen * Please: if you change a value, remember these values are carefully chosen
* to have good results in pcbnew, that uses the ORed value of basic colors * to have good results in Pcbnew, that uses the ORed value of basic colors
* when displaying superimposed objects * when displaying superimposed objects
* This list must have exactly NBCOLOR items * This list must have exactly NBCOLOR items
*/ */
@ -133,7 +133,7 @@ bool g_DisableFloatingPointLocalNotation = false;
/** /**
* Function SetLocaleTo_C_standard * Function SetLocaleTo_C_standard
* because kicad is internationalized, switch internalization to "C" standard * because KiCad is internationalized, switch internalization to "C" standard
* i.e. uses the . (dot) as separator in print/read float numbers * i.e. uses the . (dot) as separator in print/read float numbers
* (some countries (France, Germany ..) use , (comma) as separator) * (some countries (France, Germany ..) use , (comma) as separator)
* This function must be called before read or write ascii files using float * This function must be called before read or write ascii files using float
@ -141,7 +141,7 @@ bool g_DisableFloatingPointLocalNotation = false;
* reading or writing the file * reading or writing the file
* *
* This is wrapper to the C setlocale( LC_NUMERIC, "C" ) function, * This is wrapper to the C setlocale( LC_NUMERIC, "C" ) function,
* but could make more easier an optional use of locale in kicad * but could make more easier an optional use of locale in KiCad
*/ */
void SetLocaleTo_C_standard( void ) void SetLocaleTo_C_standard( void )
{ {
@ -151,13 +151,13 @@ void SetLocaleTo_C_standard( void )
/** /**
* Function SetLocaleTo_Default * Function SetLocaleTo_Default
* because kicad is internationalized, switch internalization to default * because KiCad is internationalized, switch internalization to default
* to use the default separator in print/read float numbers * to use the default separator in print/read float numbers
* (. (dot) but some countries (France, Germany ..) use , (comma) as separator) * (. (dot) but some countries (France, Germany ..) use , (comma) as separator)
* This function must be called after a call to SetLocaleTo_C_standard * This function must be called after a call to SetLocaleTo_C_standard
* *
* This is wrapper to the C setlocale( LC_NUMERIC, "" ) function, * This is wrapper to the C setlocale( LC_NUMERIC, "" ) function,
* but could make more easier an optional use of locale in kicad * but could make more easier an optional use of locale in KiCad
*/ */
void SetLocaleTo_Default( void ) void SetLocaleTo_Default( void )
{ {
@ -355,7 +355,7 @@ wxString ReturnStringFromValue( EDA_UNITS_T aUnit, int aValue, int aInternal_Uni
double value_to_print; double value_to_print;
value_to_print = To_User_Unit( aUnit, aValue, aInternal_Unit ); value_to_print = To_User_Unit( aUnit, aValue, aInternal_Unit );
/* Yet another 'if pcbnew' :( */ /* Yet another 'if Pcbnew' :( */
StringValue.Printf( ( aInternal_Unit > 1000 ) ? wxT( "%.4f" ) : StringValue.Printf( ( aInternal_Unit > 1000 ) ? wxT( "%.4f" ) :
wxT( "%.3f" ), wxT( "%.3f" ),
value_to_print ); value_to_print );

7
common/common_plotDXF_functions.cpp
View File

@ -1,6 +1,7 @@
/***********************************/ /**
/* Kicad: Common plot DXF Routines */ * @file common_plotDXF_functions.cpp
/***********************************/ * @brief KiCad: Common plot DXF Routines.
*/
#include "fctsys.h" #include "fctsys.h"
#include "gr_basic.h" #include "gr_basic.h"

7
common/common_plotHPGL_functions.cpp
View File

@ -1,6 +1,7 @@
/************************************/ /**
/* Kicad: Common plot HPGL Routines */ * @file common_plotHPGL_functions.cpp
/************************************/ * @brief KiCad: Common plot HPGL Routines
*/
#include "fctsys.h" #include "fctsys.h"
#include "gr_basic.h" #include "gr_basic.h"

7
common/common_plotPS_functions.cpp
View File

@ -1,6 +1,7 @@
/******************************************/ /**
/* Kicad: Common plot Postscript Routines */ * @file common_plotPS_functions.cpp
/******************************************/ * @brief Kicad: Common plot Postscript Routines
*/
#include "fctsys.h" #include "fctsys.h"
#include "trigo.h" #include "trigo.h"

9
common/common_plot_functions.cpp
View File

@ -1,6 +1,7 @@
/******************************************/ /**
/* Kicad: Common plot Postscript Routines */ * @file common_plot_functions.cpp
/******************************************/ * @brief Kicad: Common plot Postscript Routines
*/
#include "fctsys.h" #include "fctsys.h"
#include "gr_basic.h" #include "gr_basic.h"
@ -28,7 +29,7 @@ void EDA_DRAW_FRAME::PlotWorkSheet( PLOTTER* plotter, BASE_SCREEN* screen )
EDA_Colors color; EDA_Colors color;
/* Scale to convert dimension in 1/1000 in into internal units /* Scale to convert dimension in 1/1000 in into internal units
* (1/1000 inc for EESchema, 1/10000 for pcbnew. */ * (1/1000 inc for Eeschema, 1/10000 for Pcbnew. */
int conv_unit = screen->GetInternalUnits() / 1000; int conv_unit = screen->GetInternalUnits() / 1000;
wxString msg; wxString msg;
wxSize text_size; wxSize text_size;

2
common/copy_to_clipboard.cpp
View File

@ -37,7 +37,7 @@ void EDA_DRAW_FRAME::CopyToClipboard( wxCommandEvent& event )
/* copy the current page or block to the clipboard , /* copy the current page or block to the clipboard ,
* to export drawings to other applications (word processing ...) * to export drawings to other applications (word processing ...)
* This is not suitable for copy command within eeschema or pcbnew * This is not suitable for copy command within Eeschema or Pcbnew
*/ */
bool DrawPageOnClipboard( EDA_DRAW_FRAME* aFrame ) bool DrawPageOnClipboard( EDA_DRAW_FRAME* aFrame )
{ {

8
common/dialogs/dialog_page_settings.cpp
View File

@ -1,10 +1,10 @@
///////////////////////////////////////////////////////////////////////////// /**
// Name: dialog_page_settings.cpp * @file dialog_page_settings.cpp
///////////////////////////////////////////////////////////////////////////// */
/* The "Page Settings" dialog box created by this file (and setpage.h) /* The "Page Settings" dialog box created by this file (and setpage.h)
* contains seven checkboxes which *are* shown when that dialog box is * contains seven checkboxes which *are* shown when that dialog box is
* invoked in EESchema, but which are *not* shown when that dialog box is * invoked in Eeschema, but which are *not* shown when that dialog box is
* invoked in Pcbnew instead. * invoked in Pcbnew instead.
*/ */

4
common/dlist.cpp
View File

@ -1,8 +1,8 @@
/* /*
* This program source code file is part of KICAD, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2008 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com> * Copyright (C) 2008 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
* Copyright (C) 1992-2008 Kicad Developers, see change_log.txt for contributors. * Copyright (C) 1992-2008 KiCad Developers, see change_log.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License

2
common/drawframe.cpp
View File

@ -682,7 +682,7 @@ void EDA_DRAW_FRAME::UpdateStatusBar()
dYpos = RoundTo0( dYpos, (double)( m_InternalUnits / 10 ) ); dYpos = RoundTo0( dYpos, (double)( m_InternalUnits / 10 ) );
} }
/* The following sadly is an if eeschema/if pcbnew */ /* The following sadly is an if Eeschema/if Pcbnew */
wxString absformatter; wxString absformatter;
wxString locformatter; wxString locformatter;
switch( g_UserUnit ) switch( g_UserUnit )

2
common/drawpanel.cpp
View File

@ -807,7 +807,7 @@ void EDA_DRAW_PANEL::OnMouseWheel( wxMouseEvent& event )
void EDA_DRAW_PANEL::OnMouseEvent( wxMouseEvent& event ) void EDA_DRAW_PANEL::OnMouseEvent( wxMouseEvent& event )
{ {
/* Used to inhibit a response to a mouse left button release, after a double click /* Used to inhibit a response to a mouse left button release, after a double click
* (when releasing the left button at the end of the second click. Used in eeschema * (when releasing the left button at the end of the second click. Used in Eeschema
* to inhibit a mouse left release command when switching between hierarchical sheets * to inhibit a mouse left release command when switching between hierarchical sheets
* on a double click. * on a double click.
*/ */

2
common/drawtxt.cpp
View File

@ -103,7 +103,7 @@ int NegableTextLength( const wxString& aText )
/* Function GetHersheyShapeDescription /* Function GetHersheyShapeDescription
* return a pointer to the shape corresponding to unicode value AsciiCode * return a pointer to the shape corresponding to unicode value AsciiCode
* Note we use the same font for Bold and Normal texts * Note we use the same font for Bold and Normal texts
* because kicad handles a variable pen size to do that * because KiCad handles a variable pen size to do that
* that gives better results in XOR draw mode. * that gives better results in XOR draw mode.
*/ */
static const char* GetHersheyShapeDescription( int AsciiCode ) static const char* GetHersheyShapeDescription( int AsciiCode )

4
common/dsnlexer.cpp
View File

@ -1,9 +1,9 @@
/* /*
* This program source code file is part of KICAD, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2007-2008 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com> * Copyright (C) 2007-2008 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
* Copyright (C) 2007 Kicad Developers, see change_log.txt for contributors. * Copyright (C) 2007 KiCad Developers, see change_log.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License

4
common/eda_doc.cpp
View File

@ -52,14 +52,14 @@ static const wxFileTypeInfo EDAfallbacks[] =
wxFileTypeInfo( wxT( "text/html" ), wxFileTypeInfo( wxT( "text/html" ),
wxT( "wxhtml %s" ), wxT( "wxhtml %s" ),
wxT( "wxhtml %s" ), wxT( "wxhtml %s" ),
wxT( "html document (from Kicad)" ), wxT( "html document (from KiCad)" ),
wxT( "htm" ), wxT( "htm" ),
wxT( "html" ),wxNullPtr ), wxT( "html" ),wxNullPtr ),
wxFileTypeInfo( wxT( "application/sch" ), wxFileTypeInfo( wxT( "application/sch" ),
wxT( "eeschema %s" ), wxT( "eeschema %s" ),
wxT( "eeschema -p %s" ), wxT( "eeschema -p %s" ),
wxT( "sch document (from Kicad)" ), wxT( "sch document (from KiCad)" ),
wxT( "sch" ), wxT( "sch" ),
wxT( "SCH" ), wxNullPtr ), wxT( "SCH" ), wxNullPtr ),

16
common/edaappl.cpp
View File

@ -278,7 +278,7 @@ void EDA_APP::InitEDA_Appl( const wxString& aName, EDA_APP_T aId )
m_Id = aId; m_Id = aId;
m_Checker = new wxSingleInstanceChecker( aName.Lower() + wxT( "-" ) + wxGetUserId() ); m_Checker = new wxSingleInstanceChecker( aName.Lower() + wxT( "-" ) + wxGetUserId() );
/* Init kicad environment /* Init KiCad environment
* the environment variable KICAD (if exists) gives the kicad path: * the environment variable KICAD (if exists) gives the kicad path:
* something like set KICAD=d:\kicad * something like set KICAD=d:\kicad
*/ */
@ -303,7 +303,7 @@ void EDA_APP::InitEDA_Appl( const wxString& aName, EDA_APP_T aId )
#endif #endif
/* Init parameters for configuration */ /* Init parameters for configuration */
SetVendorName( wxT( "kicad" ) ); SetVendorName( wxT( "KiCad" ) );
SetAppName( aName.Lower() ); SetAppName( aName.Lower() );
SetTitle( aName ); SetTitle( aName );
m_EDA_Config = new wxConfig(); m_EDA_Config = new wxConfig();
@ -363,7 +363,7 @@ void EDA_APP::InitOnLineHelp()
wxHF_PRINT | wxHF_OPEN_FILES wxHF_PRINT | wxHF_OPEN_FILES
/*| wxHF_SEARCH */ ); /*| wxHF_SEARCH */ );
m_HtmlCtrl->UseConfig( m_EDA_CommonConfig ); m_HtmlCtrl->UseConfig( m_EDA_CommonConfig );
m_HtmlCtrl->SetTitleFormat( wxT( "Kicad Help" ) ); m_HtmlCtrl->SetTitleFormat( wxT( "KiCad Help" ) );
m_HtmlCtrl->AddBook( fullfilename ); m_HtmlCtrl->AddBook( fullfilename );
} }
@ -597,7 +597,7 @@ void EDA_APP::SetDefaultSearchPaths( void )
fn.RemoveLastDir(); // point to <kicad path> fn.RemoveLastDir(); // point to <kicad path>
} }
/* Add kicad template file path to search path list. */ /* Add KiCad template file path to search path list. */
fn.AppendDir( wxT( "template" ) ); fn.AppendDir( wxT( "template" ) );
if( fn.IsDirReadable() ) if( fn.IsDirReadable() )
@ -784,7 +784,7 @@ void EDA_APP::SetLanguagePath( void )
{ {
wxFileName fn( m_searchPaths[i], wxEmptyString ); wxFileName fn( m_searchPaths[i], wxEmptyString );
// Append path for Windows and unix kicad pack install // Append path for Windows and unix KiCad pack install
fn.AppendDir( wxT( "share" ) ); fn.AppendDir( wxT( "share" ) );
fn.AppendDir( wxT( "internat" ) ); fn.AppendDir( wxT( "internat" ) );
@ -897,7 +897,7 @@ wxString EDA_APP::GetHelpFile( void )
// Partially fixed, but must be enhanced // Partially fixed, but must be enhanced
// Create subdir tree for "standard" linux distributions, when kicad comes // Create subdir tree for "standard" linux distributions, when KiCad comes
// from a distribution files are in /usr/share/doc/kicad/help and binaries // from a distribution files are in /usr/share/doc/kicad/help and binaries
// in /usr/bin or /usr/local/bin // in /usr/bin or /usr/local/bin
subdirs.Add( wxT( "share" ) ); subdirs.Add( wxT( "share" ) );
@ -905,9 +905,9 @@ wxString EDA_APP::GetHelpFile( void )
subdirs.Add( wxT( "kicad" ) ); subdirs.Add( wxT( "kicad" ) );
subdirs.Add( _T( "help" ) ); subdirs.Add( _T( "help" ) );
// Create subdir tree for linux and Windows kicad pack. // Create subdir tree for linux and Windows KiCad pack.
// Note the pack form under linux is also useful if a user wants to // Note the pack form under linux is also useful if a user wants to
// install kicad to a server because there is only one path to mount // install KiCad to a server because there is only one path to mount
// or export (something like /usr/local/kicad). // or export (something like /usr/local/kicad).
// files are in <install dir>/kicad/doc/help // files are in <install dir>/kicad/doc/help
// (often /usr/local/kicad/kicad/doc/help) // (often /usr/local/kicad/kicad/doc/help)

4
common/filter_reader.cpp
View File

@ -1,9 +1,9 @@
/* /*
* This program source code file is part of KICAD, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2007-2010 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com> * Copyright (C) 2007-2010 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
* Copyright (C) 2007 Kicad Developers, see change_log.txt for contributors. * Copyright (C) 2007 KiCad Developers, see change_log.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License

2
common/footprint_info.cpp
View File

@ -83,7 +83,7 @@ bool FOOTPRINT_LIST::ReadFootprintFiles( wxArrayString & aFootprintsLibNames )
if( strnicmp( line, FOOTPRINT_LIBRARY_HEADER, FOOTPRINT_LIBRARY_HEADER_CNT ) != 0 ) if( strnicmp( line, FOOTPRINT_LIBRARY_HEADER, FOOTPRINT_LIBRARY_HEADER_CNT ) != 0 )
{ {
wxString msg; wxString msg;
msg.Printf( _( "<%s> is not a valid Kicad PCB footprint library." ), msg.Printf( _( "<%s> is not a valid KiCad PCB footprint library." ),
GetChars( libname ) ); GetChars( libname ) );
m_filesInvalid << msg << wxT("\n"); m_filesInvalid << msg << wxT("\n");
continue; continue;

48
common/gestfich.cpp
View File

@ -1,7 +1,7 @@
/******************************************/ /**
/* File: gestfich.cpp */ * @file gestfich.cpp
/* Purpose: Functions for file management */ * @brief Functions for file management
/******************************************/ */
// For compilers that support precompilation, includes "wx.h". // For compilers that support precompilation, includes "wx.h".
#include "fctsys.h" #include "fctsys.h"
@ -16,39 +16,39 @@
#include "wx/filename.h" #include "wx/filename.h"
/* List of default paths used to locate help files and kicad library files. /* List of default paths used to locate help files and KiCad library files.
* *
* Under windows, kicad search its files from the binary path file (first * Under windows, KiCad search its files from the binary path file (first
* argument when running "main") So for a standard install, default paths * argument when running "main") So for a standard install, default paths
* are not mandatory, but they exist, just in case. * are not mandatory, but they exist, just in case.
* kicad is often installed in c:/Program Files/kicad or c:/kicad (or d: or * KiCad is often installed in c:/Program Files/kicad or c:/kicad (or d: or
* e: ... ) and the directory "share" has no meaning under windows. * e: ... ) and the directory "share" has no meaning under windows.
* *
* Under linux, the problem is more complex. * Under linux, the problem is more complex.
* In fact there are 3 cases: * In fact there are 3 cases:
* 1 - When released in a distribution: * 1 - When released in a distribution:
* binaries are in /usr/bin, kicad libs in /usr/share/kicad/ and doc in * binaries are in /usr/bin, KiCad libs in /usr/share/kicad/ and doc in
* /usr/share/doc/kicad/ * /usr/share/doc/kicad/
* 2 - When compiled by an user: * 2 - When compiled by an user:
* binaries also can be in /usr/local/bin, kicad libs in * binaries also can be in /usr/local/bin, KiCad libs in
* /usr/local/share/kicad/ and doc in /usr/local/share/doc/kicad/ * /usr/local/share/kicad/ and doc in /usr/local/share/doc/kicad/
* 3 - When in an "universal tarball" or build for a server: * 3 - When in an "universal tarball" or build for a server:
* all files are in /usr/local/kicad * all files are in /usr/local/kicad
* This is mandatory when kicad is installed on a server (in a school for * This is mandatory when KiCad is installed on a server (in a school for
* instance) because one can export /usr/local/kicad and obviously the others * instance) because one can export /usr/local/kicad and obviously the others
* paths cannot be used (cannot be mounted by the client, because they are * paths cannot be used (cannot be mounted by the client, because they are
* already used). * already used).
* *
* in cases 1 and 2 kicad files cannot be found from the binary path. * in cases 1 and 2 KiCad files cannot be found from the binary path.
* in case 3 kicad files can be found from the binary path only if this is * in case 3 KiCad files can be found from the binary path only if this is
* a kicad binary file which is launched. * a KiCad binary file which is launched.
* But if an user creates a symbolic link to the actual binary file to run * But if an user creates a symbolic link to the actual binary file to run
* kicad, the binary path is not good and the defaults paths must be used * KiCad, the binary path is not good and the defaults paths must be used
* *
* Note: * Note:
* kicad uses first the bin path lo locate kicad tree. * KiCad uses first the bin path lo locate KiCad tree.
* if not found kicad uses the environment variable KICAD to find its files * if not found KiCad uses the environment variable KICAD to find its files
* and at last kicad uses the default paths. * and at last KiCad uses the default paths.
* So we can export (linux and windows) the variable KICAD: * So we can export (linux and windows) the variable KICAD:
* like export KICAD=/my_path/kicad if /my_path/kicad is not a default path * like export KICAD=/my_path/kicad if /my_path/kicad is not a default path
*/ */
@ -74,7 +74,7 @@ static wxString s_HelpPathList[] = {
}; };
// Path list for kicad data files // Path list for KiCad data files
static wxString s_KicadDataPathList[] = { static wxString s_KicadDataPathList[] = {
#ifdef __WINDOWS__ #ifdef __WINDOWS__
wxT( "c:/kicad/share/" ), wxT( "c:/kicad/share/" ),
@ -98,7 +98,7 @@ static wxString s_KicadDataPathList[] = {
wxT( "end_list" ) // End of list symbol, do not change wxT( "end_list" ) // End of list symbol, do not change
}; };
// Path list for kicad binary files // Path list for KiCad binary files
static wxString s_KicadBinaryPathList[] = { static wxString s_KicadBinaryPathList[] = {
#ifdef __WINDOWS__ #ifdef __WINDOWS__
wxT( "c:/kicad/bin/" ), wxT( "c:/kicad/bin/" ),
@ -378,7 +378,7 @@ wxString FindKicadHelpPath()
} }
/* Search the executable file shortname in kicad binary path /* Search the executable file shortname in KiCad binary path
* and return full file name if found or shortname * and return full file name if found or shortname
* kicad binary path is * kicad binary path is
* kicad/bin * kicad/bin
@ -394,7 +394,7 @@ wxString FindKicadFile( const wxString& shortname )
wxString FullFileName; wxString FullFileName;
/* Test the presence of the file in the directory shortname of /* Test the presence of the file in the directory shortname of
* the kicad binary path. * the KiCad binary path.
*/ */
FullFileName = wxGetApp().m_BinDir + shortname; FullFileName = wxGetApp().m_BinDir + shortname;
if( wxFileExists( FullFileName ) ) if( wxFileExists( FullFileName ) )
@ -452,7 +452,7 @@ int ExecuteFile( wxWindow* frame, const wxString& ExecFile,
} }
/* Return data path common kicad. /* Return data path common KiCad.
* If environment variable defined KiCAD (KiCAD = path to kicad) * If environment variable defined KiCAD (KiCAD = path to kicad)
* Returns <KICAD> /; * Returns <KICAD> /;
* Otherwise returns <path of binaries> / (if "kicad" is in the path name) * Otherwise returns <path of binaries> / (if "kicad" is in the path name)
@ -489,7 +489,7 @@ wxString ReturnKicadDatasPath()
data_path = tmp.BeforeLast( '/' ); // id cd ../ data_path = tmp.BeforeLast( '/' ); // id cd ../
data_path += UNIX_STRING_DIR_SEP; data_path += UNIX_STRING_DIR_SEP;
// Old versions of kicad use kicad/ as default for data // Old versions of KiCad use kicad/ as default for data
// and last versions kicad/share/ // and last versions kicad/share/
// So we search for kicad/share/ first // So we search for kicad/share/ first
wxString old_path = data_path; wxString old_path = data_path;
@ -504,7 +504,7 @@ wxString ReturnKicadDatasPath()
} }
} }
/* find kicad from default path list: /* find KiCad from default path list:
* /usr/local/kicad/ or c:/kicad/ * /usr/local/kicad/ or c:/kicad/
* (see s_KicadDataPathList) */ * (see s_KicadDataPathList) */
int ii = 0; int ii = 0;

4
common/gr_basic.cpp
View File

@ -26,14 +26,14 @@
* coordinates overflow 16 bits values: * coordinates overflow 16 bits values:
* http://trac.wxwidgets.org/ticket/10446 * http://trac.wxwidgets.org/ticket/10446
* Problems can be found under Windows **and** Linux (mainly when drawing arcs) * Problems can be found under Windows **and** Linux (mainly when drawing arcs)
* (mainly at low zoom values (2, 1 or 0.5), in pcbnew) * (mainly at low zoom values (2, 1 or 0.5), in Pcbnew)
* some of these problems could be now fixed in recent distributions. * some of these problems could be now fixed in recent distributions.
* *
* Currently (feb 2009) there are overflow problems when drawing solid (filled) * Currently (feb 2009) there are overflow problems when drawing solid (filled)
* polygons under linux without clipping * polygons under linux without clipping
* *
* So before removing clipping functions, be aware these bug (they are not in * So before removing clipping functions, be aware these bug (they are not in
* kicad or wxWidgets) are fixed by testing how are drawn complex lines arcs * KiCad or wxWidgets) are fixed by testing how are drawn complex lines arcs
* and solid polygons under Windows and Linux and remember users can have old * and solid polygons under Windows and Linux and remember users can have old
* versions with bugs * versions with bugs
*/ */

4
common/hotkeys_basic.cpp
View File

@ -1,8 +1,6 @@
/** /**
* @file hotkeys_basic.cpp * @file hotkeys_basic.cpp
*/ * @brief Some functions to handle hotkeys in KiCad
/* Some functions to handle hotkeys in kicad
*/ */
#include "fctsys.h" #include "fctsys.h"

4
common/newstroke_font.cpp
View File

@ -1,10 +1,10 @@
/* /*
* newstroke_font.cpp - definitions for automatically converted font * newstroke_font.cpp - definitions for automatically converted font
* *
* This program source code file is part of KICAD, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2010 vladimir uryvaev <vovanius@bk.ru> * Copyright (C) 2010 vladimir uryvaev <vovanius@bk.ru>
* Copyright (C) 1992-2010 Kicad Developers, see change_log.txt for contributors. * Copyright (C) 1992-2010 KiCad Developers, see change_log.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License

8
common/pcbcommon.cpp
View File

@ -1,8 +1,8 @@
/* /*
* This program source code file is part of KICAD, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2008 Wayne Stambaugh <stambaughw@verizon.net> * Copyright (C) 2008 Wayne Stambaugh <stambaughw@verizon.net>
* Copyright (C) 1992-2008 Kicad Developers, see change_log.txt for contributors. * Copyright (C) 1992-2008 KiCad Developers, see change_log.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -24,7 +24,7 @@
/* /*
* This file contains the global constants and variables used in the PCB * This file contains the global constants and variables used in the PCB
* applications PCBNEW, CvPcb, and GervView. The goal of this was to * applications Pcbnew, CvPcb, and GervView. The goal of this was to
* unobfuscate the original header file design that made it very difficult * unobfuscate the original header file design that made it very difficult
* to figure out where these variables lived. Ideally, they should be pushed * to figure out where these variables lived. Ideally, they should be pushed
* back into the application layer. * back into the application layer.
@ -83,7 +83,7 @@ wxString g_Shapes3DExtBuffer( wxT( "wrl" ) );
const wxString ModuleFileExtension( wxT( "mod" ) ); const wxString ModuleFileExtension( wxT( "mod" ) );
/* PCB file name wild card definitions. */ /* PCB file name wild card definitions. */
const wxString ModuleFileWildcard( _( "Kicad footprint library files (*.mod)|*.mod" ) ); const wxString ModuleFileWildcard( _( "KiCad footprint library files (*.mod)|*.mod" ) );
int g_CurrentVersionPCB = 1; int g_CurrentVersionPCB = 1;

4
common/projet_config.cpp
View File

@ -36,7 +36,7 @@ bool EDA_APP::ReCreatePrjConfig( const wxString& fileName,
m_ProjectConfig = NULL; m_ProjectConfig = NULL;
} }
/* Check the file name does not a kicad project extension. /* Check the file name does not a KiCad project extension.
* This allows the user to enter a filename without extension * This allows the user to enter a filename without extension
* or use an existing name to create te project file * or use an existing name to create te project file
*/ */
@ -67,7 +67,7 @@ bool EDA_APP::ReCreatePrjConfig( const wxString& fileName,
* project file. * project file.
* *
* TODO: Push the version test up the stack so that when one of the * TODO: Push the version test up the stack so that when one of the
* Kicad application version changes, the other applications * KiCad application version changes, the other applications
* settings do not get updated. Practically, this can go away. * settings do not get updated. Practically, this can go away.
* It isn't used anywhere as far as I know (WLS). * It isn't used anywhere as far as I know (WLS).
*/ */

4
common/richio.cpp
View File

@ -1,9 +1,9 @@
/* /*
* This program source code file is part of KICAD, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2007-2011 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com> * Copyright (C) 2007-2011 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
* Copyright (C) 2007 Kicad Developers, see change_log.txt for contributors. * Copyright (C) 2007 KiCad Developers, see change_log.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License

2
common/sch_item_struct.cpp
View File

@ -45,7 +45,7 @@ SCH_ITEM::SCH_ITEM( const SCH_ITEM& aItem ) :
SCH_ITEM::~SCH_ITEM() SCH_ITEM::~SCH_ITEM()
{ {
// Do not let the connections container go out of scope with any objects or they // Do not let the connections container go out of scope with any objects or they
// will be deleted by the container will cause the EESchema to crash. These objects // will be deleted by the container will cause the Eeschema to crash. These objects
// are owned by the sheet object container. // are owned by the sheet object container.
if( !m_connections.empty() ) if( !m_connections.empty() )
m_connections.clear(); m_connections.clear();

4
common/xnode.cpp
View File

@ -1,8 +1,8 @@
/* /*
* This program source code file is part of KICAD, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2010 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com> * Copyright (C) 2010 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
* Copyright (C) 1992-2010 Kicad Developers, see change_log.txt for contributors. * Copyright (C) 1992-2010 KiCad Developers, see change_log.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License

6
cvpcb/autosel.cpp
View File

@ -1,6 +1,6 @@
/**********************/ /**
/* CVPCB: autosel.cpp */ * @file autosel.cpp
/**********************/ */
/* Routines for automatic selection of modules. */ /* Routines for automatic selection of modules. */

11
cvpcb/class_DisplayFootprintsFrame.cpp
View File

@ -420,11 +420,12 @@ void DISPLAY_FOOTPRINTS_FRAME::Show3D_Frame( wxCommandEvent& event )
} }
/* Virtual function needed by the PCB_SCREEN class derived from BASE_SCREEN /**
* this is a virtual pure function in BASE_SCREEN * Virtual function needed by the PCB_SCREEN class derived from BASE_SCREEN
* do nothing in cvpcb * this is a virtual pure function in BASE_SCREEN
* could be removed later * do nothing in Cvpcb
*/ * could be removed later
*/
void PCB_SCREEN::ClearUndoORRedoList( UNDO_REDO_CONTAINER&, int ) void PCB_SCREEN::ClearUndoORRedoList( UNDO_REDO_CONTAINER&, int )
{ {
} }

4
cvpcb/class_DisplayFootprintsFrame.h
View File

@ -64,7 +64,7 @@ public:
void Show3D_Frame( wxCommandEvent& event ); void Show3D_Frame( wxCommandEvent& event );
/* SaveCopyInUndoList() virtual /* SaveCopyInUndoList() virtual
* currently: do nothing in cvpcb. * currently: do nothing in CvPcb.
* but but be defined because it is a pure virtual in PCB_BASE_FRAME * but but be defined because it is a pure virtual in PCB_BASE_FRAME
*/ */
virtual void SaveCopyInUndoList( BOARD_ITEM* aItemToCopy, virtual void SaveCopyInUndoList( BOARD_ITEM* aItemToCopy,
@ -87,7 +87,7 @@ public:
UNDO_REDO_T aTypeCommand, UNDO_REDO_T aTypeCommand,
const wxPoint& aTransformPoint = wxPoint( 0, 0 ) ) const wxPoint& aTransformPoint = wxPoint( 0, 0 ) )
{ {
// currently: do nothing in cvpcb. // currently: do nothing in CvPcb.
} }

2
cvpcb/cvframe.cpp
View File

@ -26,7 +26,7 @@
#define FRAME_MIN_SIZE_Y 300 #define FRAME_MIN_SIZE_Y 300
// option key to close cvpcb after saving files // option key to close CvPcb after saving files
static const wxString KeepCvpcbOpenEntry( wxT( "KeepCvpcbOpen" ) ); static const wxString KeepCvpcbOpenEntry( wxT( "KeepCvpcbOpen" ) );
static const wxString FootprintDocFileEntry( wxT( "footprints_doc_file" ) ); static const wxString FootprintDocFileEntry( wxT( "footprints_doc_file" ) );

10
cvpcb/cvpcb.cpp
View File

@ -1,6 +1,6 @@
/*******************/ /**
/* File: cvpcb.cpp */ * @file cvpcb.cpp
/*******************/ */
#include "fctsys.h" #include "fctsys.h"
#include "gr_basic.h" #include "gr_basic.h"
@ -28,8 +28,8 @@ const wxString RetroFileExtension( wxT( "stf" ) );
const wxString FootprintAliasFileExtension( wxT( "equ" ) ); const wxString FootprintAliasFileExtension( wxT( "equ" ) );
// Wildcard for schematic retroannotation (import footprint names in schematic): // Wildcard for schematic retroannotation (import footprint names in schematic):
const wxString RetroFileWildcard( _( "Kicad retroannotation files (*.stf)|*.stf" ) ); const wxString RetroFileWildcard( _( "KiCad retroannotation files (*.stf)|*.stf" ) );
const wxString FootprintAliasFileWildcard( _( "Kicad footprint alias files (*.equ)|*.equ" ) ); const wxString FootprintAliasFileWildcard( _( "KiCad footprint alias files (*.equ)|*.equ" ) );
const wxString titleLibLoadError( _( "Library Load Error" ) ); const wxString titleLibLoadError( _( "Library Load Error" ) );

2
cvpcb/init.cpp
View File

@ -74,7 +74,7 @@ bool CVPCB_MAINFRAME::ReadNetList()
if( error_level < 0 ) if( error_level < 0 )
{ {
msg.Printf( _( "File <%s> does not appear to be a valid Kicad net list file." ), msg.Printf( _( "File <%s> does not appear to be a valid KiCad net list file." ),
GetChars( m_NetlistFileName.GetFullPath() ) ); GetChars( m_NetlistFileName.GetFullPath() ) );
::wxMessageBox( msg, _( "File Error" ), wxOK | wxICON_ERROR, this ); ::wxMessageBox( msg, _( "File Error" ), wxOK | wxICON_ERROR, this );
m_NetlistFileName.Clear(); m_NetlistFileName.Clear();

2
cvpcb/loadcmp.cpp
View File

@ -76,7 +76,7 @@ found in the default search paths." ),
if( strnicmp( Line, FOOTPRINT_LIBRARY_HEADER, FOOTPRINT_LIBRARY_HEADER_CNT ) != 0 ) if( strnicmp( Line, FOOTPRINT_LIBRARY_HEADER, FOOTPRINT_LIBRARY_HEADER_CNT ) != 0 )
{ {
msg.Printf( _( "<%s> is not a valid Kicad PCB foot print library." ), msg.Printf( _( "<%s> is not a valid KiCad PCB foot print library." ),
GetChars( tmp ) ); GetChars( tmp ) );
wxMessageBox( msg, titleLibLoadError, wxOK | wxICON_ERROR, this ); wxMessageBox( msg, titleLibLoadError, wxOK | wxICON_ERROR, this );
fclose( file ); fclose( file );

4
cvpcb/menubar.cpp
View File

@ -1,6 +1,6 @@
/** /**
* @file cvpcb/menubar.cpp * @file cvpcb/menubar.cpp
* @brief (Re)Create the menubar for cvpcb * @brief (Re)Create the menubar for CvPcb
*/ */
#include "fctsys.h" #include "fctsys.h"
#include "appl_wxstruct.h" #include "appl_wxstruct.h"
@ -13,7 +13,7 @@
/** /**
* @brief (Re)Create the menubar for the cvpcb mainframe * @brief (Re)Create the menubar for the CvPcb mainframe
*/ */
void CVPCB_MAINFRAME::ReCreateMenuBar() void CVPCB_MAINFRAME::ReCreateMenuBar()
{ {

2
cvpcb/readschematicnetlist.cpp
View File

@ -136,7 +136,7 @@ int CVPCB_MAINFRAME::ReadSchematicNetlist()
return -3; return -3;
} }
SetStatusText( _( "Netlist Format: EESchema" ), 0 ); SetStatusText( _( "Netlist Format: Eeschema" ), 0 );
/* Read the netlist */ /* Read the netlist */

2
cvpcb/savecmp.cpp
View File

@ -79,7 +79,7 @@ bool CVPCB_MAINFRAME::LoadComponentFile( const wxString& aFileName )
/* Identification of the type of file CmpMod */ /* Identification of the type of file CmpMod */
if( fgets( Line, 79, source ) == 0 ) if( fgets( Line, 79, source ) == 0 )
{ {
msg.Printf( _( " <%s> does not appear to be a valid Kicad component library." ), msg.Printf( _( " <%s> does not appear to be a valid KiCad component library." ),
GetChars( fn.GetFullPath() ) ); GetChars( fn.GetFullPath() ) );
wxMessageBox( msg, titleComponentLibErr, wxOK | wxICON_ERROR ); wxMessageBox( msg, titleComponentLibErr, wxOK | wxICON_ERROR );
fclose( source ); fclose( source );

4
cvpcb/setvisu.cpp
View File

@ -135,8 +135,8 @@ void BOARD::Draw( EDA_DRAW_PANEL* aPanel, wxDC* aDC, int aDrawMode, const wxPoin
/* dummy_functions: /* dummy_functions:
* *
* These functions are used in some classes. * These functions are used in some classes.
* they are useful in pcbnew, but have no meaning or are never used * they are useful in Pcbnew, but have no meaning or are never used
* in cvpcb or gerbview. * in CvPcb or GerbView.
* but they must exist because they appear in some classes. * but they must exist because they appear in some classes.
* Do nothing in CvPcb. * Do nothing in CvPcb.
*/ */

2
cvpcb/tool_cvpcb.cpp
View File

@ -60,7 +60,7 @@ void CVPCB_MAINFRAME::ReCreateHToolbar()
m_HToolBar->AddTool( ID_CVPCB_CREATE_STUFF_FILE, wxEmptyString, m_HToolBar->AddTool( ID_CVPCB_CREATE_STUFF_FILE, wxEmptyString,
KiBitmap( export_footprint_names_xpm ), KiBitmap( export_footprint_names_xpm ),
_( "Create export file (component/footprint list, \ _( "Create export file (component/footprint list, \
used by eeschema to fill the footprint field of components)" ) ); used by Eeschema to fill the footprint field of components)" ) );
m_HToolBar->AddSeparator(); m_HToolBar->AddSeparator();
m_HToolBar->AddTool( ID_PCB_DISPLAY_FOOTPRINT_DOC, wxEmptyString, m_HToolBar->AddTool( ID_PCB_DISPLAY_FOOTPRINT_DOC, wxEmptyString,

2
cvpcb/writenetlistpcbnew.cpp
View File

@ -58,7 +58,7 @@ static void RemoveDuplicatePins( COMPONENT& component )
/** /**
* Create Kicad net list file. * Create KiCad net list file.
* *
* @todo: None of the printf() call return values are checked for failure, * @todo: None of the printf() call return values are checked for failure,
* a value less than zero. Check all printf() return values and * a value less than zero. Check all printf() return values and

10
eeschema/backanno.cpp
View File

@ -1,7 +1,7 @@
/**************************************************************** /**
* EESchema: backanno.cpp * @file backanno.cpp
* (functions for backannotating Footprint info * @brief Functions for backannotating footprint information.
****************************************************************/ */
#include "fctsys.h" #include "fctsys.h"
#include "confirm.h" #include "confirm.h"
@ -17,7 +17,7 @@
#include "netlist.h" #include "netlist.h"
const wxString BackAnnotateFileWildcard( wxT( "EESchema Back Annotation File (*.stf)|*.stf" ) ); const wxString BackAnnotateFileWildcard( wxT( "Eeschema Back Annotation File (*.stf)|*.stf" ) );
bool SCH_EDIT_FRAME::ProcessStuffFile( FILE* aFile, bool aSetFieldAttributeToVisible ) bool SCH_EDIT_FRAME::ProcessStuffFile( FILE* aFile, bool aSetFieldAttributeToVisible )

2
eeschema/block.cpp
View File

@ -285,7 +285,7 @@ bool SCH_EDIT_FRAME::HandleBlockEnd( wxDC* DC )
block->m_State = STATE_BLOCK_MOVE; block->m_State = STATE_BLOCK_MOVE;
break; break;
case BLOCK_FLIP: /* pcbnew only! */ case BLOCK_FLIP: /* Pcbnew only! */
break; break;
case BLOCK_ZOOM: /* Window Zoom */ case BLOCK_ZOOM: /* Window Zoom */

4
eeschema/class_drc_erc_item.cpp
View File

@ -1,7 +1,7 @@
/* /*
* This program source code file is part of KICAD, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2007 Kicad Developers, see change_log.txt for contributors. * Copyright (C) 2007 KiCad Developers, see change_log.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License

2
eeschema/class_libentry.h
View File

@ -56,7 +56,7 @@ class LIB_ALIAS : public EDA_ITEM
* @note - Do not delete the root component. The root component is actually shared by * @note - Do not delete the root component. The root component is actually shared by
* all of the aliases associated with it. The component pointer will be delete * all of the aliases associated with it. The component pointer will be delete
* in the destructor of the last alias that shares this component is deleted. * in the destructor of the last alias that shares this component is deleted.
* Deleting the root component will likely cause EESchema to crash. * Deleting the root component will likely cause Eeschema to crash.
*/ */
LIB_COMPONENT* root; LIB_COMPONENT* root;

2
eeschema/class_library.cpp
View File

@ -474,7 +474,7 @@ bool CMP_LIBRARY::Load( wxString& aErrorMsg )
#if 0 // Note for developers: #if 0 // Note for developers:
// Not sure this warning is very useful: old designs *must* be always loadable // Not sure this warning is very useful: old designs *must* be always loadable
wxLogWarning( wxT( "The component library <%s> header version \ wxLogWarning( wxT( "The component library <%s> header version \
number is invalid.\n\nIn future versions of EESchema this library may not \ number is invalid.\n\nIn future versions of Eeschema this library may not \
load correctly. To resolve this problem open the library in the library \ load correctly. To resolve this problem open the library in the library \
editor and save it. If this library is the project cache library, save \ editor and save it. If this library is the project cache library, save \
the current schematic." ), the current schematic." ),

4
eeschema/component_references_lister.cpp
View File

@ -4,11 +4,11 @@
*/ */
/* /*
* This program source code file is part of KICAD, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 1992-2011 jean-pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr> * Copyright (C) 1992-2011 jean-pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr>
* Copyright (C) 1992-2011 Wayne Stambaugh <stambaughw@verizon.net> * Copyright (C) 1992-2011 Wayne Stambaugh <stambaughw@verizon.net>
* Copyright (C) 1992-2011 Kicad Developers, see change_log.txt for contributors. * Copyright (C) 1992-2011 KiCad Developers, see change_log.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License

4
eeschema/controle.cpp
View File

@ -52,7 +52,7 @@ SCH_ITEM* SCH_EDIT_FRAME::LocateAndShowItem( const wxPoint& aPosition, const KIC
return NULL; return NULL;
} }
/* Cross probing to pcbnew if a pin or a component is found */ /* Cross probing to Pcbnew if a pin or a component is found */
switch( item->Type() ) switch( item->Type() )
{ {
case SCH_FIELD_T: case SCH_FIELD_T:
@ -84,7 +84,7 @@ SCH_ITEM* SCH_EDIT_FRAME::LocateAndShowItem( const wxPoint& aPosition, const KIC
AppendMsgPanel( LibItem->GetRef( GetSheet() ), AppendMsgPanel( LibItem->GetRef( GetSheet() ),
LibItem->GetField( VALUE )->m_Text, DARKCYAN ); LibItem->GetField( VALUE )->m_Text, DARKCYAN );
// Cross probing:2 - pin found, and send a locate pin command to pcbnew (highlight net) // Cross probing:2 - pin found, and send a locate pin command to Pcbnew (highlight net)
SendMessageToPCBNEW( Pin, LibItem ); SendMessageToPCBNEW( Pin, LibItem );
} }

24
eeschema/cross-probing.cpp
View File

@ -1,6 +1,6 @@
/*********************/ /**
/* cross-probing.cpp */ * @file eeschema/cross-probing.cpp
/*********************/ */
#include "fctsys.h" #include "fctsys.h"
#include "appl_wxstruct.h" #include "appl_wxstruct.h"
@ -16,22 +16,20 @@
#include "sch_component.h" #include "sch_component.h"
/***************************************************************/ /**
void RemoteCommand( const char* cmdline ) * Read a remote command sent by Pcbnew (via a socket connection) ,
/***************************************************************/ * so when user selects a module or pin in Pcbnew,
* Deschema shows that same component or pin.
/** Read a remote command sent by pcbnew (via a socket connection) ,
* so when user selects a module or pin in pcbnew,
* eeschema shows that same component or pin.
* The cursor is put on the item * The cursor is put on the item
* port KICAD_SCH_PORT_SERVICE_NUMBER (currently 4243) * port KICAD_SCH_PORT_SERVICE_NUMBER (currently 4243)
* @param cmdline = received command from pcbnew * @param cmdline = received command from Pcbnew
* commands are: * commands are:
* $PART: "reference" put cursor on component * $PART: "reference" put cursor on component
* $PART: "reference" $REF: "ref" put cursor on reference component * $PART: "reference" $REF: "ref" put cursor on reference component
* $PART: "reference" $VAL: "value" put cursor on value component * $PART: "reference" $VAL: "value" put cursor on value component
* $PART: "reference" $PAD: "pin name" put cursor on the component pin * $PART: "reference" $PAD: "pin name" put cursor on the component pin
*/ */
void RemoteCommand( const char* cmdline )
{ {
char line[1024]; char line[1024];
char* idcmd; char* idcmd;
@ -87,7 +85,7 @@ void RemoteCommand( const char* cmdline )
} }
/** Send a remote command to eeschema via a socket, /** Send a remote command to Eeschema via a socket,
* @param objectToSync = item to be located on board (footprint, pad or text) * @param objectToSync = item to be located on board (footprint, pad or text)
* @param LibItem = component in lib if objectToSync is a sub item of a component * @param LibItem = component in lib if objectToSync is a sub item of a component
* Commands are * Commands are
@ -102,7 +100,7 @@ void SCH_EDIT_FRAME::SendMessageToPCBNEW( EDA_ITEM* objectToSync, SCH_COMPONENT*
LIB_PIN* Pin = NULL; LIB_PIN* Pin = NULL;
char Line[1024]; char Line[1024];
/* Cross probing to pcbnew if a pin or a component is found */ /* Cross probing to Pcbnew if a pin or a component is found */
switch( objectToSync->Type() ) switch( objectToSync->Type() )
{ {
case SCH_FIELD_T: case SCH_FIELD_T:

6
eeschema/database.cpp
View File

@ -1,6 +1,6 @@
/****************************/ /**
/* EESchema - database.cpp */ * @file database.cpp
/****************************/ */
#include "fctsys.h" #include "fctsys.h"
#include "gr_basic.h" #include "gr_basic.h"

11
eeschema/dialogs/annotate_dialog.cpp
View File

@ -1,13 +1,10 @@
/* /**
* annotate_dialog.cpp * @file annotate_dialog.cpp
*/ * @brief Annotation dialog functions.
/*
* annotate_dialog.cpp
* Annotation dialog functions.
*/ */
/* /*
* This program source code file is part of KICAD, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 1992-2011 jean-pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr> * Copyright (C) 1992-2011 jean-pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr>
* Copyright (C) 1992-2011 Kicad Developers, see change_log.txt for contributors. * Copyright (C) 1992-2011 Kicad Developers, see change_log.txt for contributors.

2
eeschema/dialogs/dialog_build_BOM.cpp
View File

@ -218,7 +218,7 @@ void DIALOG_BUILD_BOM::SavePreferences()
// Determine current settings of "List items" and "Options" checkboxes // Determine current settings of "List items" and "Options" checkboxes
// (NOTE: These 6 settings are restored when the dialog box is next // (NOTE: These 6 settings are restored when the dialog box is next
// invoked, but are *not* still saved after EESchema is next shut down.) // invoked, but are *not* still saved after Eeschema is next shut down.)
s_ListByRef = m_ListCmpbyRefItems->GetValue(); s_ListByRef = m_ListCmpbyRefItems->GetValue();
s_ListWithSubCmponents = m_ListSubCmpItems->GetValue(); s_ListWithSubCmponents = m_ListSubCmpItems->GetValue();
s_ListByValue = m_ListCmpbyValItems->GetValue(); s_ListByValue = m_ListCmpbyValItems->GetValue();

2
eeschema/dialogs/dialog_color_config.cpp
View File

@ -1,5 +1,5 @@
/* Set up color Layers for EESchema /* Set up color Layers for Eeschema
*/ */
#include "fctsys.h" #include "fctsys.h"

2
eeschema/dialogs/dialog_eeschema_config.cpp
View File

@ -3,7 +3,7 @@
// Purpose: // Purpose:
// Author: jean-pierre Charras // Author: jean-pierre Charras
// Created: 17/02/2006 21:14:46 // Created: 17/02/2006 21:14:46
// Copyright: Kicad Team // Copyright: KiCad Team
// Licence: GPL // Licence: GPL
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////

4
eeschema/dialogs/dialog_plot_schematic_DXF.cpp
View File

@ -2,10 +2,10 @@
*/ */
/* /*
* This program source code file is part of KICAD, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 1992-2010 Lorenzo Marcantonio * Copyright (C) 1992-2010 Lorenzo Marcantonio
* Copyright (C) 1992-2010 Kicad Developers, see change_log.txt for contributors. * Copyright (C) 1992-2010 KiCad Developers, see change_log.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License

6
eeschema/dialogs/dialog_plot_schematic_HPGL.cpp
View File

@ -2,10 +2,10 @@
*/ */
/* /*
* This program source code file is part of KICAD, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 1992-2010 Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr * Copyright (C) 1992-2010 Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr
* Copyright (C) 1992-2010 Kicad Developers, see change_log.txt for contributors. * Copyright (C) 1992-2010 KiCad Developers, see change_log.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -327,7 +327,7 @@ void DIALOG_PLOT_SCHEMATIC_HPGL::Plot_Schematic_HPGL( bool aPlotAll, int HPGL_Sh
else else
PlotSheet = screen->m_CurrentSheetDesc; PlotSheet = screen->m_CurrentSheetDesc;
/* 10x because eeschema works in mils, not decimals */ /* 10x because Eeschema works in mils, not decimals */
double plot_scale = 10 * (double) PlotSheet->m_Size.x / (double) SheetSize.x; double plot_scale = 10 * (double) PlotSheet->m_Size.x / (double) SheetSize.x;
/* Calculate offsets */ /* Calculate offsets */

4
eeschema/dialogs/dialog_plot_schematic_PS.cpp
View File

@ -2,10 +2,10 @@
*/ */
/* /*
* This program source code file is part of KICAD, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 1992-2010 Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr * Copyright (C) 1992-2010 Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr
* Copyright (C) 1992-2010 Kicad Developers, see change_log.txt for contributors. * Copyright (C) 1992-2010 KiCad Developers, see change_log.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License

10
eeschema/edit_bitmap.cpp
View File

@ -1,12 +1,12 @@
/********************/ /**
/* edit_bitmap.cpp */ * @file edit_bitmap.cpp
/********************/ */
/* /*
* This program source code file is part of KICAD, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2011 jean-pierre.charras * Copyright (C) 2011 jean-pierre.charras
* Copyright (C) 2011 Kicad Developers, see change_log.txt for contributors. * Copyright (C) 2011 KiCad Developers, see change_log.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License

25
eeschema/eeschema.cpp
View File

@ -1,6 +1,6 @@
/***********************************/ /**
/* eeschema.cpp - module principal */ * @file eeschema.cpp
/***********************************/ */
#include "fctsys.h" #include "fctsys.h"
#include "appl_wxstruct.h" #include "appl_wxstruct.h"
@ -43,8 +43,8 @@ wxString g_NetCmpExtBuffer( wxT( "cmp" ) );
const wxString SymbolFileExtension( wxT( "sym" ) ); const wxString SymbolFileExtension( wxT( "sym" ) );
const wxString CompLibFileExtension( wxT( "lib" ) ); const wxString CompLibFileExtension( wxT( "lib" ) );
const wxString SymbolFileWildcard( wxT( "Kicad drawing symbol file (*.sym)|*.sym" ) ); const wxString SymbolFileWildcard( wxT( "KiCad drawing symbol file (*.sym)|*.sym" ) );
const wxString CompLibFileWildcard( wxT( "Kicad component library file (*.lib)|*.lib" ) ); const wxString CompLibFileWildcard( wxT( "KiCad component library file (*.lib)|*.lib" ) );
LayerStruct g_LayerDescr; /* layer colors. */ LayerStruct g_LayerDescr; /* layer colors. */
@ -53,7 +53,7 @@ bool g_EditPinByPinIsOn = false; /* true to do not synchronize pins
* same location */ * same location */
int g_DrawDefaultLineThickness = 6; /* Default line thickness in int g_DrawDefaultLineThickness = 6; /* Default line thickness in
* EESCHEMA units used to * Eeschema units used to
* draw/plot items having a * draw/plot items having a
* default thickness line value * default thickness line value
* (i.e. = 0 ). 0 = single pixel * (i.e. = 0 ). 0 = single pixel
@ -62,8 +62,8 @@ int g_DrawDefaultLineThickness = 6; /* Default line thickness in
// Color to draw selected items // Color to draw selected items
int g_ItemSelectetColor = BROWN; int g_ItemSelectetColor = BROWN;
// Color to draw items flagged invisible, in libedit (they are insisible // Color to draw items flagged invisible, in libedit (they are invisible
// in eeschema // in Eeschema
int g_InvisibleItemColor = DARKGRAY; int g_InvisibleItemColor = DARKGRAY;
TRANSFORM DefaultTransform = TRANSFORM( 1, 0, 0, -1 ); TRANSFORM DefaultTransform = TRANSFORM( 1, 0, 0, -1 );
@ -103,7 +103,7 @@ bool EDA_APP::OnInit()
wxFileName filename; wxFileName filename;
SCH_EDIT_FRAME* frame = NULL; SCH_EDIT_FRAME* frame = NULL;
InitEDA_Appl( wxT( "EESchema" ), APP_EESCHEMA_T ); InitEDA_Appl( wxT( "Eeschema" ), APP_EESCHEMA_T );
if( m_Checker && m_Checker->IsAnotherRunning() ) if( m_Checker && m_Checker->IsAnotherRunning() )
{ {
@ -114,7 +114,7 @@ bool EDA_APP::OnInit()
if( argc > 1 ) if( argc > 1 )
filename = argv[1]; filename = argv[1];
// Init EESchema // Init Eeschema
SeedLayers(); SeedLayers();
// read current setup and reopen last directory if no filename to open in // read current setup and reopen last directory if no filename to open in
@ -127,15 +127,14 @@ bool EDA_APP::OnInit()
ReadHotkeyConfig( wxT("SchematicFrame"), s_Eeschema_Hokeys_Descr ); ReadHotkeyConfig( wxT("SchematicFrame"), s_Eeschema_Hokeys_Descr );
// Create main frame (schematic frame) : // Create main frame (schematic frame) :
frame = new SCH_EDIT_FRAME( NULL, wxT( "EESchema" ), wxPoint( 0, 0 ), wxSize( 600, 400 ) ); frame = new SCH_EDIT_FRAME( NULL, wxT( "Eeschema" ), wxPoint( 0, 0 ), wxSize( 600, 400 ) );
SetTopWindow( frame ); SetTopWindow( frame );
frame->Show( true ); frame->Show( true );
if( CreateServer( frame, KICAD_SCH_PORT_SERVICE_NUMBER ) ) if( CreateServer( frame, KICAD_SCH_PORT_SERVICE_NUMBER ) )
{ {
// RemoteCommand is in controle.cpp and is called when PCBNEW // RemoteCommand is in controle.cpp and is called when Pcbnew sends Eeschema a command.
// sends EESCHEMA a command
SetupServerFunction( RemoteCommand ); SetupServerFunction( RemoteCommand );
} }

4
eeschema/eeschema_id.h
View File

@ -16,9 +16,9 @@
/** /**
* Command IDs for the schematic editor. * Command IDs for the schematic editor.
* *
* Please add IDs that are unique to the schematic editor (EESchema) here and * Please add IDs that are unique to the schematic editor (Eeschema) here and
* not in the global id.h file. This will prevent the entire project from * not in the global id.h file. This will prevent the entire project from
* being rebuilt when adding new command to EESchema. * being rebuilt when adding new command to Eeschema.
*/ */
enum id_eeschema_frm enum id_eeschema_frm

4
eeschema/erc.h
View File

@ -1,8 +1,8 @@
/* /*
* This program source code file is part of KICAD, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2009 Jea-Pierre.Charras, jaen-pierre.charras@gipsa-lab.inpg.com * Copyright (C) 2009 Jea-Pierre.Charras, jaen-pierre.charras@gipsa-lab.inpg.com
* Copyright (C) 2009 Kicad Developers, see change_log.txt for contributors. * Copyright (C) 2009 KiCad Developers, see change_log.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License

7
eeschema/find.cpp
View File

@ -1,6 +1,7 @@
/****************************************************************/ /**
/* EESchema: find.cpp (functions for searching a schematic item */ * @file eeschema/find.cpp
/****************************************************************/ * @brief Functions for searching for a schematic item.
*/
/* /*
* Search a text (text, value, reference) within a component or * Search a text (text, value, reference) within a component or

5
eeschema/general.h
View File

@ -152,7 +152,7 @@ extern bool g_EditPinByPinIsOn; /* True to prevent displacing
* pins, when they are at the * pins, when they are at the
* same position. */ * same position. */
extern int g_DrawDefaultLineThickness; /* Default line (in EESCHEMA extern int g_DrawDefaultLineThickness; /* Default line (in Eeschema
* units) thickness used to * units) thickness used to
* draw/plot items having a * draw/plot items having a
* default thickness line * default thickness line
@ -163,8 +163,7 @@ extern int g_DrawDefaultLineThickness; /* Default line (in EESCHEMA
// Color to draw selected items // Color to draw selected items
extern int g_ItemSelectetColor; extern int g_ItemSelectetColor;
// Color to draw items flagged invisible, in libedit (they are invisible in // Color to draw items flagged invisible, in libedit (they are invisible in Eeschema
// eeschema
extern int g_InvisibleItemColor; extern int g_InvisibleItemColor;
/* Global Variables */ /* Global Variables */

10
eeschema/hotkeys.cpp
View File

@ -1,6 +1,6 @@
/***************/ /**
/* hotkeys.cpp */ * @file eeschema/hotkeys.cpp
/***************/ */
#include "fctsys.h" #include "fctsys.h"
#include "eeschema_id.h" #include "eeschema_id.h"
@ -33,7 +33,7 @@
* by the user hotkey list file * by the user hotkey list file
* add the HkMyNewEntry pointer in the s_Schematic_Hotkey_List list or the * add the HkMyNewEntry pointer in the s_Schematic_Hotkey_List list or the
* s_LibEdit_Hotkey_List list or s_Common_Hotkey_List if the same command is * s_LibEdit_Hotkey_List list or s_Common_Hotkey_List if the same command is
* added both in eeschema and libedit) * added both in Eeschema and libedit)
* Add the new code in the switch in OnHotKey() function. * Add the new code in the switch in OnHotKey() function.
* when the variable itemInEdit is true, an item is currently edited. * when the variable itemInEdit is true, an item is currently edited.
* This can be useful if the new function cannot be executed while an item is * This can be useful if the new function cannot be executed while an item is
@ -218,7 +218,7 @@ EDA_HOTKEY* s_LibEdit_Hotkey_List[] =
NULL NULL
}; };
// list of sections and corresponding hotkey list for eeschema (used to create // list of sections and corresponding hotkey list for Eeschema (used to create
// an hotkey config file) // an hotkey config file)
struct EDA_HOTKEY_CONFIG s_Eeschema_Hokeys_Descr[] = struct EDA_HOTKEY_CONFIG s_Eeschema_Hokeys_Descr[] =
{ {

2
eeschema/hotkeys.h
View File

@ -45,7 +45,7 @@ enum hotkey_id_commnand {
HK_ADD_NOCONN_FLAG HK_ADD_NOCONN_FLAG
}; };
// List of hotkey descriptors for eeschema // List of hotkey descriptors for Eeschema
extern struct EDA_HOTKEY_CONFIG s_Eeschema_Hokeys_Descr[]; extern struct EDA_HOTKEY_CONFIG s_Eeschema_Hokeys_Descr[];
// List of hotkey descriptors for the schematic editor only // List of hotkey descriptors for the schematic editor only

9
eeschema/lib_circle.cpp
View File

@ -1,6 +1,7 @@
/*************************/ /**
/** class LIB_CIRCLE **/ * @file lib_circle.cpp
/*************************/ * @brief LIB_CIRCLE class definition
*/
#include "fctsys.h" #include "fctsys.h"
#include "gr_basic.h" #include "gr_basic.h"
@ -72,7 +73,7 @@ bool LIB_CIRCLE::Load( char* aLine, wxString& aErrorMsg )
/** /**
* Function HitTest * Function HitTest
* tests if the given wxPoint is within the bounds of this object. * tests if the given wxPoint is within the bounds of this object.
* @param aPosRef A wxPoint to test in eeschema space * @param aPosRef A wxPoint to test in Eeschema space
* @return - true if a hit, else false * @return - true if a hit, else false
*/ */
bool LIB_CIRCLE::HitTest( const wxPoint& aPosRef ) bool LIB_CIRCLE::HitTest( const wxPoint& aPosRef )

4
eeschema/lib_collectors.cpp
View File

@ -1,8 +1,8 @@
/* /*
* This program source code file is part of KICAD, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2011 Wayne Stambaugh <stambaughw@verizon.net> * Copyright (C) 2011 Wayne Stambaugh <stambaughw@verizon.net>
* Copyright (C) 2004-2011 Kicad Developers, see change_log.txt for contributors. * Copyright (C) 2004-2011 KiCad Developers, see change_log.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License

4
eeschema/lib_collectors.h
View File

@ -1,8 +1,8 @@
/* /*
* This program source code file is part of KICAD, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2011 Wayne Stambaugh <stambaughw@verizon.net> * Copyright (C) 2011 Wayne Stambaugh <stambaughw@verizon.net>
* Copyright (C) 2004-20011 Kicad Developers, see change_log.txt for contributors. * Copyright (C) 20011 KiCad Developers, see change_log.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License

2
eeschema/lib_draw_item.h
View File

@ -94,7 +94,7 @@ protected:
/** /**
* Shape identification for alternate body styles. Set 0 if the item * Shape identification for alternate body styles. Set 0 if the item
* is common to all body styles. This is commonly referred to as * is common to all body styles. This is commonly referred to as
* DeMorgan style and this is typically how it is used in Kicad. * DeMorgan style and this is typically how it is used in KiCad.
*/ */
int m_Convert; int m_Convert;

13
eeschema/lib_export.cpp
View File

@ -1,10 +1,7 @@
/*****************************/ /**
/* EESchema - lib_export.cpp */ * @file lib_export.cpp
/*****************************/ * @brief Eeschema library maintenance routines to backup modified libraries and
* create, edit, and delete components.
/* Library maintenance routines.
* Backup modified libraries.
* Create, edit, and delete components.
*/ */
#include "fctsys.h" #include "fctsys.h"
@ -135,7 +132,7 @@ void LIB_EDIT_FRAME::OnExportPart( wxCommandEvent& event )
{ {
msg = fn.GetFullPath() + _( " - OK" ); msg = fn.GetFullPath() + _( " - OK" );
DisplayInfoMessage( this, _( "This library will not be available \ DisplayInfoMessage( this, _( "This library will not be available \
until it is loaded by EESchema.\n\nModify the EESchema library configuration \ until it is loaded by Eeschema.\n\nModify the Eeschema library configuration \
if you want to include it as part of this project." ) ); if you want to include it as part of this project." ) );
} }
else else

2
eeschema/lib_text.h
View File

@ -71,7 +71,7 @@ public:
virtual bool HitTest( const wxPoint& aPosition ); virtual bool HitTest( const wxPoint& aPosition );
/** /**
* @param aPosition = a wxPoint to test, in eeschema coordinates * @param aPosition = a wxPoint to test, in Eeschema coordinates
* @param aThreshold = max distance to a segment * @param aThreshold = max distance to a segment
* @param aTransform = the transform matrix * @param aTransform = the transform matrix
* @return true if the point \a aPosition is near a segment * @return true if the point \a aPosition is near a segment

7
eeschema/libedit.cpp
View File

@ -1,6 +1,7 @@
/****************************/ /**
/* EESchema - libedit.cpp */ * @file libedit.cpp
/****************************/ * @brief Eeschema component library editor.
*/
#include "fctsys.h" #include "fctsys.h"
#include "gr_basic.h" #include "gr_basic.h"

8
eeschema/libedit_onleftclick.cpp
View File

@ -1,8 +1,6 @@
/*****************************************/ /**
/* EESchema - libedit_onleftclick.cpp */ * @file libedit_onleftclick.cpp
/*****************************************/ * @brief Eeschema library editor event handler for a mouse left button single or double click.
/* Library editor commands created by a mouse left button simple or double click
*/ */
#include "fctsys.h" #include "fctsys.h"

6
eeschema/libedit_plot_component.cpp
View File

@ -1,6 +1,6 @@
/*******************************************/ /**
/* EESchema - libedit_plot_component.cpp */ * @file libedit_plot_component.cpp
/*******************************************/ */
#include "fctsys.h" #include "fctsys.h"

7
eeschema/libeditframe.cpp
View File

@ -1,8 +1,7 @@
/** /**
* EESchema - libeditframe.cpp * @file libeditframe.cpp
* class LIB_EDIT_FRAME: the component editor frame * @brief LIB_EDIT_FRAME class is the component library editor frame.
* */
*/
#include "fctsys.h" #include "fctsys.h"
#include "appl_wxstruct.h" #include "appl_wxstruct.h"

23
eeschema/load_one_schematic_file.cpp
View File

@ -1,6 +1,7 @@
/****************************************/ /**
/* Module to load/save EESchema files. */ * @file load_one_schematic_file.cpp
/****************************************/ * @brief Code to load and save Eeschema files.
*/
#include "fctsys.h" #include "fctsys.h"
#include "confirm.h" #include "confirm.h"
@ -66,7 +67,7 @@ bool SCH_EDIT_FRAME::LoadOneEEFile( SCH_SCREEN* aScreen, const wxString& aFullFi
if( !reader.ReadLine() if( !reader.ReadLine()
|| strncmp( (char*)reader + 9, SCHEMATIC_HEAD_STRING, sizeof(SCHEMATIC_HEAD_STRING) - 1 ) != 0 ) || strncmp( (char*)reader + 9, SCHEMATIC_HEAD_STRING, sizeof(SCHEMATIC_HEAD_STRING) - 1 ) != 0 )
{ {
MsgDiag = aFullFileName + _( " is NOT an EESchema file!" ); MsgDiag = aFullFileName + _( " is NOT an Eeschema file!" );
DisplayError( this, MsgDiag ); DisplayError( this, MsgDiag );
return FALSE; return FALSE;
} }
@ -85,16 +86,16 @@ bool SCH_EDIT_FRAME::LoadOneEEFile( SCH_SCREEN* aScreen, const wxString& aFullFi
if( version > EESCHEMA_VERSION ) if( version > EESCHEMA_VERSION )
{ {
MsgDiag = aFullFileName + _( " was created by a more recent \ MsgDiag = aFullFileName + _( " was created by a more recent \
version of EESchema and may not load correctly. Please consider updating!" ); version of Eeschema and may not load correctly. Please consider updating!" );
DisplayInfoMessage( this, MsgDiag ); DisplayInfoMessage( this, MsgDiag );
} }
#if 0 #if 0
// Compile it if the new version is unreadable by previous eeschema versions // Compile it if the new version is unreadable by previous Eeschema versions
else if( version < EESCHEMA_VERSION ) else if( version < EESCHEMA_VERSION )
{ {
MsgDiag = aFullFileName + _( " was created by an older version of \ MsgDiag = aFullFileName + _( " was created by an older version of \
EESchema. It will be stored in the new file format when you save this file \ Eeschema. It will be stored in the new file format when you save this file \
again." ); again." );
DisplayInfoMessage( this, MsgDiag ); DisplayInfoMessage( this, MsgDiag );
@ -103,7 +104,7 @@ again." );
if( !reader.ReadLine() || strncmp( reader, "LIBS:", 5 ) != 0 ) if( !reader.ReadLine() || strncmp( reader, "LIBS:", 5 ) != 0 )
{ {
MsgDiag = aFullFileName + _( " is NOT an EESchema file!" ); MsgDiag = aFullFileName + _( " is NOT an Eeschema file!" );
DisplayError( this, MsgDiag ); DisplayError( this, MsgDiag );
return FALSE; return FALSE;
} }
@ -165,7 +166,7 @@ again." );
case 'T': // It is a text item. case 'T': // It is a text item.
if( sscanf( sline, "%s", Name1 ) != 1 ) if( sscanf( sline, "%s", Name1 ) != 1 )
{ {
MsgDiag.Printf( wxT( "EESchema file text load error at line %d" ), MsgDiag.Printf( wxT( "Eeschema file text load error at line %d" ),
reader.LineNumber() ); reader.LineNumber() );
itemLoaded = false; itemLoaded = false;
} }
@ -181,7 +182,7 @@ again." );
default: default:
itemLoaded = false; itemLoaded = false;
MsgDiag.Printf( wxT( "EESchema file undefined object at line %d, aborted" ), MsgDiag.Printf( wxT( "Eeschema file undefined object at line %d, aborted" ),
reader.LineNumber() ); reader.LineNumber() );
MsgDiag << wxT( "\n" ) << FROM_UTF8( line ); MsgDiag << wxT( "\n" ) << FROM_UTF8( line );
} }
@ -306,7 +307,7 @@ bool ReadSchemaDescr( LINE_READER* aLine, wxString& aMsgDiag, BASE_SCREEN* aScre
if( SheetFormatList[ii] == NULL ) if( SheetFormatList[ii] == NULL )
{ {
aMsgDiag.Printf( wxT( "EESchema file dimension definition error \ aMsgDiag.Printf( wxT( "Eeschema file dimension definition error \
line %d, \aAbort reading file.\n" ), line %d, \aAbort reading file.\n" ),
aLine->LineNumber() ); aLine->LineNumber() );
aMsgDiag << FROM_UTF8( line ); aMsgDiag << FROM_UTF8( line );

16
eeschema/menubar.cpp
View File

@ -164,7 +164,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
AddMenuItem( fileMenu, AddMenuItem( fileMenu,
wxID_EXIT, wxID_EXIT,
_( "&Quit" ), _( "&Quit" ),
_( "Quit EESchema" ), _( "Quit Eeschema" ),
KiBitmap( exit_xpm ) ); KiBitmap( exit_xpm ) );
// Menu Edit: // Menu Edit:
@ -399,7 +399,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
AddMenuItem( preferencesMenu, AddMenuItem( preferencesMenu,
wxID_PREFERENCES, wxID_PREFERENCES,
_( "&Options" ), _( "&Options" ),
_( "EESchema preferences" ), _( "Eeschema preferences" ),
KiBitmap( preference_xpm ) ); KiBitmap( preference_xpm ) );
#endif // __WXMAC__ #endif // __WXMAC__
@ -479,18 +479,18 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
// Separator // Separator
toolsMenu->AppendSeparator(); toolsMenu->AppendSeparator();
//Run CVPcb //Run CvPcb
AddMenuItem( toolsMenu, AddMenuItem( toolsMenu,
ID_TO_CVPCB, ID_TO_CVPCB,
_( "A&ssign Component Footprints" ), _( "A&ssign Component Footprints" ),
_( "Run CVPcb" ), _( "Run CvPcb" ),
KiBitmap( cvpcb_xpm ) ); KiBitmap( cvpcb_xpm ) );
// Run PCBNew // Run Pcbnew
AddMenuItem( toolsMenu, AddMenuItem( toolsMenu,
ID_TO_PCB, ID_TO_PCB,
_( "&Layout Printed Circuit Board" ), _( "&Layout Printed Circuit Board" ),
_( "Run PCBNew" ), _( "Run Pcbnew" ),
KiBitmap( pcbnew_xpm ) ); KiBitmap( pcbnew_xpm ) );
@ -516,8 +516,8 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
helpMenu->AppendSeparator(); helpMenu->AppendSeparator();
AddMenuItem( helpMenu, AddMenuItem( helpMenu,
wxID_ABOUT, wxID_ABOUT,
_( "&About EESchema" ), _( "&About Eeschema" ),
_( "About EESchema schematic designer" ), _( "About Eeschema schematic designer" ),
KiBitmap( info_xpm ) ); KiBitmap( info_xpm ) );
// Create the menubar and append all submenus // Create the menubar and append all submenus

8
eeschema/menubar_libedit.cpp
View File

@ -237,7 +237,7 @@ void LIB_EDIT_FRAME::ReCreateMenuBar()
AddMenuItem( helpMenu, AddMenuItem( helpMenu,
wxID_HELP, wxID_HELP,
_( "&Contents" ), _( "&Contents" ),
_( "Open the eeschema manual" ), _( "Open the Eeschema manual" ),
KiBitmap( online_help_xpm ) ); KiBitmap( online_help_xpm ) );
AddMenuItem( helpMenu, AddMenuItem( helpMenu,
wxID_INDEX, wxID_INDEX,
@ -245,12 +245,12 @@ void LIB_EDIT_FRAME::ReCreateMenuBar()
_( "Open the \"Getting Started in KiCad\" guide for beginners" ), _( "Open the \"Getting Started in KiCad\" guide for beginners" ),
KiBitmap( help_xpm ) ); KiBitmap( help_xpm ) );
// About EESchema // About Eeschema
helpMenu->AppendSeparator(); helpMenu->AppendSeparator();
AddMenuItem( helpMenu, AddMenuItem( helpMenu,
wxID_ABOUT, wxID_ABOUT,
_( "&About EESchema" ), _( "&About Eeschema" ),
_( "About EESchema schematic designer" ), _( "About Eeschema schematic designer" ),
KiBitmap( info_xpm ) ); KiBitmap( info_xpm ) );
// Create the menubar and append all submenus // Create the menubar and append all submenus

9
eeschema/netform.cpp
View File

@ -1,9 +1,9 @@
/* /*
* This program source code file is part of KICAD, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 1992-2009 jean-pierre.charras@gipsa-lab.inpg.fr * Copyright (C) 1992-2009 jean-pierre.charras@gipsa-lab.inpg.fr
* Copyright (C) 2010 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com> * Copyright (C) 2010 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
* Copyright (C) 1992-2010 Kicad Developers, see change_log.txt for contributors. * Copyright (C) 1992-2010 KiCad Developers, see change_log.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -658,8 +658,9 @@ XNODE* EXPORT_HELP::makeGenericDesignHeader()
xdesign->AddChild( node( wxT( "date" ), FROM_UTF8( date )) ); xdesign->AddChild( node( wxT( "date" ), FROM_UTF8( date )) );
// which eeschema tool // which Eeschema tool
xdesign->AddChild( node( wxT( "tool" ), wxGetApp().GetAppName() + wxChar(' ') + GetBuildVersion() ) ); xdesign->AddChild( node( wxT( "tool" ), wxGetApp().GetAppName() + wxChar(' ') +
GetBuildVersion() ) );
/* @todo might do a list of schematic pages /* @todo might do a list of schematic pages

10
eeschema/netlist.h
View File

@ -1,13 +1,13 @@
/***************/ /**
/* netlist.h */ * @file netlist.h
/***************/ */
/* /*
* This program source code file is part of KICAD, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 1992-2011 jean-pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr> * Copyright (C) 1992-2011 jean-pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr>
* Copyright (C) 1992-2011 Wayne Stambaugh <stambaughw@verizon.net> * Copyright (C) 1992-2011 Wayne Stambaugh <stambaughw@verizon.net>
* Copyright (C) 1992-2011 Kicad Developers, see change_log.txt for contributors. * Copyright (C) 1992-2011 KiCad Developers, see change_log.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License

11
eeschema/netlist_control.cpp
View File

@ -1,10 +1,11 @@
/**********************************/ /**
/* Dialog box for netlist outputs */ * @file netlist_control.cpp
/**********************************/ * @brief Dialog box for creating netlists.
*/
/* Functions relatives to the dialog creating the netlist for pcbnew. /* Functions relative to the dialog creating the netlist for Pcbnew.
* The dialog is a notebook with 4 fixed netlist format: * The dialog is a notebook with 4 fixed netlist format:
* PCBNEW ORCADPCB2 CADSTAR and SPICE * Pcbnew ORCADPCB2 CADSTAR and SPICE
* and up to CUSTOMPANEL_COUNTMAX (see netlist.h) user programmable format * and up to CUSTOMPANEL_COUNTMAX (see netlist.h) user programmable format
* calling an external converter with convert an intermediate format to the * calling an external converter with convert an intermediate format to the
* user specific format. * user specific format.

7
eeschema/pinedit.cpp
View File

@ -1,6 +1,7 @@
/***************************/ /**
/* EESchema - PinEdit.cpp */ * @file pinedit.cpp
/***************************/ * @brief Eeschema pin edit code.
*/
#include "fctsys.h" #include "fctsys.h"
#include "gr_basic.h" #include "gr_basic.h"

12
eeschema/sch_bitmap.cpp
View File

@ -1,12 +1,12 @@
/********************/ /**
/* sch_bitmap.cpp */ * @file sch_bitmap.cpp
/********************/ */
/* /*
* This program source code file is part of KICAD, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2011 jean-pierre.charras * Copyright (C) 2011 jean-pierre.charras
* Copyright (C) 2011 Kicad Developers, see change_log.txt for contributors. * Copyright (C) 2011 KiCad Developers, see change_log.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -152,7 +152,7 @@ bool SCH_BITMAP::Load( LINE_READER& aLine, wxString& aErrorMsg )
if( strnicmp( line, "$Bitmap", 7 ) != 0 ) if( strnicmp( line, "$Bitmap", 7 ) != 0 )
{ {
aErrorMsg.Printf( wxT( "EESchema file bitmap image load error at line %d, aborted" ), aErrorMsg.Printf( wxT( "Eeschema file bitmap image load error at line %d, aborted" ),
aLine.LineNumber() ); aLine.LineNumber() );
aErrorMsg << wxT( "\n" ) << FROM_UTF8( (char*) aLine ); aErrorMsg << wxT( "\n" ) << FROM_UTF8( (char*) aLine );
return false; return false;

4
eeschema/sch_bitmap.h
View File

@ -4,10 +4,10 @@
*/ */
/* /*
* This program source code file is part of KICAD, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2011 jean-pierre.charras * Copyright (C) 2011 jean-pierre.charras
* Copyright (C) 2011 Kicad Developers, see change_log.txt for contributors. * Copyright (C) 2011 KiCad Developers, see change_log.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License

2
eeschema/sch_bus_entry.cpp
View File

@ -93,7 +93,7 @@ bool SCH_BUS_ENTRY::Load( LINE_READER& aLine, wxString& aErrorMsg )
if( sscanf( line, "%s %s", Name1, Name2 ) != 2 ) if( sscanf( line, "%s %s", Name1, Name2 ) != 2 )
{ {
aErrorMsg.Printf( wxT( "EESchema file bus entry load error at line %d" ), aErrorMsg.Printf( wxT( "Eeschema file bus entry load error at line %d" ),
aLine.LineNumber() ); aLine.LineNumber() );
aErrorMsg << wxT( "\n" ) << FROM_UTF8( (char*) aLine ); aErrorMsg << wxT( "\n" ) << FROM_UTF8( (char*) aLine );
return false; return false;

8
eeschema/sch_collectors.cpp
View File

@ -1,8 +1,12 @@
/**
* @file sch_collectors.cpp
*/
/* /*
* This program source code file is part of KICAD, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2011 Wayne Stambaugh <stambaughw@verizon.net> * Copyright (C) 2011 Wayne Stambaugh <stambaughw@verizon.net>
* Copyright (C) 2004-2011 Kicad Developers, see change_log.txt for contributors. * Copyright (C) 2004-2011 KiCad Developers, see change_log.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License

8
eeschema/sch_collectors.h
View File

@ -1,8 +1,12 @@
/**
* @file sch_collectors.h
*/
/* /*
* This program source code file is part of KICAD, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2011 Wayne Stambaugh <stambaughw@verizon.net> * Copyright (C) 2011 Wayne Stambaugh <stambaughw@verizon.net>
* Copyright (C) 2004-20011 Kicad Developers, see change_log.txt for contributors. * Copyright (C) 20011 KiCad Developers, see change_log.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License

6
eeschema/sch_component.cpp
View File

@ -993,7 +993,7 @@ bool SCH_COMPONENT::Save( FILE* f ) const
/* If this is a complex hierarchy; save hierarchical references. /* If this is a complex hierarchy; save hierarchical references.
* but for simple hierarchies it is not necessary. * but for simple hierarchies it is not necessary.
* the reference inf is already saved * the reference inf is already saved
* this is useful for old eeschema version compatibility * this is useful for old Eeschema version compatibility
*/ */
if( m_PathsAndReferences.GetCount() > 1 ) if( m_PathsAndReferences.GetCount() > 1 )
{ {
@ -1089,7 +1089,7 @@ bool SCH_COMPONENT::Load( LINE_READER& aLine, wxString& aErrorMsg )
if( sscanf( &line[1], "%s %s", name1, name2 ) != 2 ) if( sscanf( &line[1], "%s %s", name1, name2 ) != 2 )
{ {
aErrorMsg.Printf( wxT( "EESchema Component descr error at line %d, aborted" ), aErrorMsg.Printf( wxT( "Eeschema component description error at line %d, aborted" ),
aLine.LineNumber() ); aLine.LineNumber() );
aErrorMsg << wxT( "\n" ) << FROM_UTF8( line ); aErrorMsg << wxT( "\n" ) << FROM_UTF8( line );
return false; return false;
@ -1239,7 +1239,7 @@ bool SCH_COMPONENT::Load( LINE_READER& aLine, wxString& aErrorMsg )
if( *ptcar != '"' ) if( *ptcar != '"' )
{ {
aErrorMsg.Printf( wxT( "EESchema file lib field F at line %d, aborted" ), aErrorMsg.Printf( wxT( "Eeschema file library field F at line %d, aborted" ),
aLine.LineNumber() ); aLine.LineNumber() );
return false; return false;
} }

7
eeschema/sch_component.h
View File

@ -1,6 +1,7 @@
/******************************************************/ /**
/* Definitions for the Component classes for EESchema */ * @file sch_component.h
/******************************************************/ * @brief Definition the SCH_COMPONENT class for Eeschema.
*/
#ifndef COMPONENT_CLASS_H #ifndef COMPONENT_CLASS_H
#define COMPONENT_CLASS_H #define COMPONENT_CLASS_H

7
eeschema/sch_field.h
View File

@ -1,6 +1,7 @@
/*************************************************************/ /**
/* Definitions for the component fields classes for EESchema */ * @file sch_field.h
/*************************************************************/ * @brief Definition of the SCH_FIELD class for Eeschema.
*/
#ifndef CLASS_SCH_FIELD_H #ifndef CLASS_SCH_FIELD_H
#define CLASS_SCH_FIELD_H #define CLASS_SCH_FIELD_H

2
eeschema/sch_junction.cpp
View File

@ -68,7 +68,7 @@ bool SCH_JUNCTION::Load( LINE_READER& aLine, wxString& aErrorMsg )
if( sscanf( line, "%s %d %d", name, &m_Pos.x, &m_Pos.y ) != 3 ) if( sscanf( line, "%s %d %d", name, &m_Pos.x, &m_Pos.y ) != 3 )
{ {
aErrorMsg.Printf( wxT( "EESchema file connection load error at line %d, aborted" ), aErrorMsg.Printf( wxT( "Eeschema file connection load error at line %d, aborted" ),
aLine.LineNumber() ); aLine.LineNumber() );
aErrorMsg << wxT( "\n" ) << FROM_UTF8( (char*) aLine ); aErrorMsg << wxT( "\n" ) << FROM_UTF8( (char*) aLine );
return false; return false;

4
eeschema/sch_line.cpp
View File

@ -154,7 +154,7 @@ bool SCH_LINE::Load( LINE_READER& aLine, wxString& aErrorMsg )
if( sscanf( line, "%s %s", Name1, Name2 ) != 2 ) if( sscanf( line, "%s %s", Name1, Name2 ) != 2 )
{ {
aErrorMsg.Printf( wxT( "EESchema file segment error at line %d, aborted" ), aErrorMsg.Printf( wxT( "Eeschema file segment error at line %d, aborted" ),
aLine.LineNumber() ); aLine.LineNumber() );
aErrorMsg << wxT( "\n" ) << FROM_UTF8( (char*) aLine ); aErrorMsg << wxT( "\n" ) << FROM_UTF8( (char*) aLine );
return false; return false;
@ -171,7 +171,7 @@ bool SCH_LINE::Load( LINE_READER& aLine, wxString& aErrorMsg )
if( !aLine.ReadLine() || sscanf( (char*) aLine, "%d %d %d %d ", if( !aLine.ReadLine() || sscanf( (char*) aLine, "%d %d %d %d ",
&m_Start.x, &m_Start.y, &m_End.x, &m_End.y ) != 4 ) &m_Start.x, &m_Start.y, &m_End.x, &m_End.y ) != 4 )
{ {
aErrorMsg.Printf( wxT( "EESchema file Segment struct error at line %d, aborted" ), aErrorMsg.Printf( wxT( "Eeschema file Segment struct error at line %d, aborted" ),
aLine.LineNumber() ); aLine.LineNumber() );
aErrorMsg << wxT( "\n" ) << FROM_UTF8( (char*) aLine ); aErrorMsg << wxT( "\n" ) << FROM_UTF8( (char*) aLine );
return false; return false;

2
eeschema/sch_no_connect.cpp
View File

@ -77,7 +77,7 @@ bool SCH_NO_CONNECT::Load( LINE_READER& aLine, wxString& aErrorMsg )
if( sscanf( line, "%s %d %d", name, &m_Pos.x, &m_Pos.y ) != 3 ) if( sscanf( line, "%s %d %d", name, &m_Pos.x, &m_Pos.y ) != 3 )
{ {
aErrorMsg.Printf( wxT( "EESchema file No Connect load error at line %d" ), aErrorMsg.Printf( wxT( "Eeschema file No Connect load error at line %d" ),
aLine.LineNumber() ); aLine.LineNumber() );
aErrorMsg << wxT( "\n" ) << FROM_UTF8( ((char*)aLine) ); aErrorMsg << wxT( "\n" ) << FROM_UTF8( ((char*)aLine) );
return false; return false;

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