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

Improve spelling. 

The groundwork here is thanks to kunda1.

Fixes: lp:1831510
* https://bugs.launchpad.net/kicad/+bug/1831510
This commit is contained in:
Jeff Young 2019-08-20 18:22:30 +01:00
parent baeb3689b5
commit a25368cc6b
63 changed files with 132 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
3d-viewer/3d_canvas/cinfo3d_visu.cpp
View File

@ -65,7 +65,7 @@ CINFO3D_VISU::CINFO3D_VISU() :
m_boardSize = wxSize();
m_boardCenter = SFVEC3F( 0.0f );
m_boardBoudingBox.Reset();
m_boardBoundingBox.Reset();
m_layers_container2D.clear();
m_layers_holes2D.clear();
@ -415,7 +415,7 @@ void CINFO3D_VISU::InitSettings( REPORTER *aStatusTextReporter )
boardMin.z = m_layerZcoordTop[B_Adhes];
boardMax.z = m_layerZcoordTop[F_Adhes];
m_boardBoudingBox = CBBOX( boardMin, boardMax );
m_boardBoundingBox = CBBOX( boardMin, boardMax );
#ifdef PRINT_STATISTICS_3D_VIEWER
unsigned stats_startCreateBoardPolyTime = GetRunningMicroSecs();

6
3d-viewer/3d_canvas/cinfo3d_visu.h
View File

@ -144,7 +144,7 @@ class CINFO3D_VISU
* @brief GetBBox3DU - Get the bbox of the pcb board
* @return the board bbox in 3d units
*/
const CBBOX &GetBBox3DU() const { return m_boardBoudingBox; }
const CBBOX &GetBBox3DU() const { return m_boardBoundingBox; }
/**
* @brief GetEpoxyThickness3DU - Get the current epoxy thickness
@ -541,8 +541,8 @@ private:
// Pcb board bounding boxes
/// 3d bouding box of the pcb board in 3d units
CBBOX m_boardBoudingBox;
/// 3d bounding box of the pcb board in 3d units
CBBOX m_boardBoundingBox;
/// It contains polygon contours for each layer
MAP_POLY m_layers_poly;

6
3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cobject2d.h
View File

@ -109,9 +109,9 @@ public:
float *aOutT,
SFVEC2F *aNormalOut ) const = 0;
/** Function IsBBoxInside
* @brief Tests if the bouding is out, intersects or is complety inside
* @param aBBox - The bounding box to test
/**
* Function IsBBoxInside
* @brief Tests if the bounding is out, intersects or is complety inside
* @return INTERSECTION_RESULT
*/
virtual INTERSECTION_RESULT IsBBoxInside( const CBBOX2D &aBBox ) const = 0;

2
3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cpolygon4pts2d.cpp
View File

@ -88,7 +88,7 @@ bool CPOLYGON4PTS2D::Intersects( const CBBOX2D &aBBox ) const
if( !m_bbox.Intersects( aBBox ) )
return false;
// Check if the bouding box complety have inside the small bouding box
// Check if the bounding box complety have inside the small bounding box
if( (aBBox.Max().x > m_bbox.Max().x) &&
(aBBox.Max().y > m_bbox.Max().x) &&
(aBBox.Min().x < m_bbox.Min().x) &&

2
CMakeModules/TokenList2DsnLexer.cmake
View File

@ -268,7 +268,7 @@ public:
/**
* Constructor ( LINE_READER* )
* intializes a lexer and prepares to read from @a aLineReader which
* initializes a lexer and prepares to read from @a aLineReader which
* is assumed ready, and may be in use by other DSNLEXERs also. No ownership
* is taken of @a aLineReader. This enables it to be used by other lexers also.
* The transition between grammars in such a case, must happen on a text

8
bitmap2component/bitmap2component.cpp
View File

@ -161,7 +161,7 @@ int BITMAPCONV_INFO::ConvertBitmap( potrace_bitmap_t* aPotrace_bitmap,
}
const char* BITMAPCONV_INFO::getBrdLayerName( BMP2CMP_MOD_LAYER aChoice )
const char* BITMAPCONV_INFO::getBoardLayerName( BMP2CMP_MOD_LAYER aChoice )
{
const char * layerName = "F.SilkS";
@ -270,7 +270,7 @@ void BITMAPCONV_INFO::outputDataEnd()
}
void BITMAPCONV_INFO::ouputOnePolygon( SHAPE_LINE_CHAIN & aPolygon, const char* aBrdLayerName )
void BITMAPCONV_INFO::outputOnePolygon( SHAPE_LINE_CHAIN & aPolygon, const char* aBrdLayerName )
{
// write one polygon to output file.
// coordinates are expected in target unit.
@ -403,7 +403,7 @@ void BITMAPCONV_INFO::createOutputData( BMP2CMP_MOD_LAYER aModLayer )
// The layer name has meaning only for .kicad_mod files.
// For these files the header creates 2 invisible texts: value and ref
// (needed but not usefull) on silk screen layer
outputDataHeader( getBrdLayerName( MOD_LYR_FSILKS ) );
outputDataHeader( getBoardLayerName( MOD_LYR_FSILKS ) );
bool main_outline = true;
@ -484,7 +484,7 @@ void BITMAPCONV_INFO::createOutputData( BMP2CMP_MOD_LAYER aModLayer )
for( int ii = 0; ii < polyset_areas.OutlineCount(); ii++ )
{
SHAPE_LINE_CHAIN& poly = polyset_areas.Outline( ii );
ouputOnePolygon(poly, getBrdLayerName( aModLayer ) );
outputOnePolygon( poly, getBoardLayerName( aModLayer ));
}
polyset_areas.RemoveAllContours();

6
bitmap2component/bitmap2component.h
View File

@ -99,14 +99,14 @@ private:
* @return the board layer name depending on the board layer selected
* @param aChoice = the choice (MOD_LYR_FSILKS to MOD_LYR_FINAL)
*/
const char * getBrdLayerName( BMP2CMP_MOD_LAYER aChoice );
const char * getBoardLayerName( BMP2CMP_MOD_LAYER aChoice );
/**
* Function ouputOnePolygon
* Function outputOnePolygon
* write one polygon to output file.
* Polygon coordinates are expected scaled by the polygon extraction function
*/
void ouputOnePolygon( SHAPE_LINE_CHAIN & aPolygon, const char* aBrdLayerName );
void outputOnePolygon( SHAPE_LINE_CHAIN & aPolygon, const char* aBrdLayerName );
};

55
common/confirm.cpp
View File

@ -22,18 +22,11 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
/**
* @file confirm.cpp
* @brief utilities to display some error, warning and info short messges
*/
#include <wx/stockitem.h>
#include <wx/richmsgdlg.h>
#include <confirm.h>
#include <bitmaps.h>
#include <html_messagebox.h>
#include <functional>
#include <unordered_map>
@ -124,11 +117,11 @@ wxString KIDIALOG::getCaption( KD_TYPE aType, const wxString& aCaption )
switch( aType )
{
case KD_NONE: /* fall through */
case KD_INFO: return _( "Message" );
case KD_QUESTION: return _( "Question" );
case KD_WARNING: return _( "Warning" );
case KD_ERROR: return _( "Error" );
case KD_NONE: /* fall through */
case KD_INFO: return _( "Message" );
case KD_QUESTION: return _( "Question" );
case KD_WARNING: return _( "Warning" );
case KD_ERROR: return _( "Error" );
}
return wxEmptyString;
@ -141,11 +134,11 @@ long KIDIALOG::getStyle( KD_TYPE aType )
switch( aType )
{
case KD_NONE: break;
case KD_INFO: style |= wxICON_INFORMATION; break;
case KD_QUESTION: style |= wxICON_QUESTION; break;
case KD_WARNING: style |= wxICON_WARNING; break;
case KD_ERROR: style |= wxICON_ERROR; break;
case KD_NONE: break;
case KD_INFO: style |= wxICON_INFORMATION; break;
case KD_QUESTION: style |= wxICON_QUESTION; break;
case KD_WARNING: style |= wxICON_WARNING; break;
case KD_ERROR: style |= wxICON_ERROR; break;
}
return style;
@ -240,33 +233,29 @@ int OKOrCancelDialog( wxWindow* aParent, const wxString& aWarning, const wxStrin
// DisplayError should be deprecated, use DisplayErrorMessage instead
void DisplayError( wxWindow* parent, const wxString& text, int displaytime )
void DisplayError( wxWindow* aParent, const wxString& aText, int aDisplayTime )
{
wxMessageDialog* dialog;
wxMessageDialog* dlg;
int icon = aDisplayTime > 0 ? wxICON_INFORMATION : wxICON_ERROR;
int icon = displaytime > 0 ? wxICON_INFORMATION : wxICON_ERROR;
dlg = new wxMessageDialog( aParent, aText, _( "Warning" ),
wxOK | wxCENTRE | wxRESIZE_BORDER | icon | wxSTAY_ON_TOP );
dialog = new wxMessageDialog( parent, text, _( "Warning" ),
wxOK | wxCENTRE | wxRESIZE_BORDER |
icon | wxSTAY_ON_TOP );
dialog->ShowModal();
dialog->Destroy();
dlg->ShowModal();
dlg->Destroy();
}
void DisplayErrorMessage( wxWindow* aParent, const wxString& aText, const wxString& aExtraInfo )
{
wxRichMessageDialog* dlg;
int icon = wxICON_ERROR;
dlg = new wxRichMessageDialog( aParent, aText, _( "Error" ),
wxOK | wxCENTRE | wxRESIZE_BORDER |
wxICON_ERROR | wxSTAY_ON_TOP );
wxOK | wxCENTRE | wxRESIZE_BORDER | icon | wxSTAY_ON_TOP );
if( !aExtraInfo.IsEmpty() )
{
dlg->ShowDetailedText( aExtraInfo );
}
dlg->ShowModal();
dlg->Destroy();
@ -276,15 +265,13 @@ void DisplayErrorMessage( wxWindow* aParent, const wxString& aText, const wxStri
void DisplayInfoMessage( wxWindow* aParent, const wxString& aMessage, const wxString& aExtraInfo )
{
wxRichMessageDialog* dlg;
int icon = wxICON_INFORMATION;
dlg = new wxRichMessageDialog( aParent, aMessage, _( "Info" ),
wxOK | wxCENTRE | wxRESIZE_BORDER |
wxICON_INFORMATION | wxSTAY_ON_TOP );
wxOK | wxCENTRE | wxRESIZE_BORDER | icon | wxSTAY_ON_TOP );
if( !aExtraInfo.IsEmpty() )
{
dlg->ShowDetailedText( aExtraInfo );
}
dlg->ShowModal();
dlg->Destroy();

2
common/dialog_about/AboutDialog_main.cpp
View File

@ -400,7 +400,7 @@ static void buildKicadAboutBanner( EDA_BASE_FRAME* aParent, ABOUT_APP_INFO& aInf
wxEmptyString,
OTHERS_IN_TRANSLATION ) );
// Programm credits for icons
// Program credits for icons
#define ICON_CONTRIBUTION _( "Icons by" )
aInfo.AddArtist( new CONTRIBUTOR( wxT( "Iñigo Zuluaga" ),
wxEmptyString,

2
common/dialogs/wx_html_report_panel.h
View File

@ -36,7 +36,7 @@
* dialogs in eeschema and pcbnew. Provides error filtering functionality
* and saving report files.
*
* The messages are reported throuth a REPORTER object
* The messages are reported through a REPORTER object
*/
class WX_HTML_REPORT_PANEL : public WX_HTML_REPORT_PANEL_BASE
{

4
common/gal/opengl/cached_container.cpp
View File

@ -172,8 +172,8 @@ void CACHED_CONTAINER::Delete( VERTEX_ITEM* aItem )
#endif
// This dynamic memory freeing optimize memory usage, but in fact can create
// out of memory issues because freeing and reallocation large chuncks of memory
// can create memory fragmentation and no room to reallocate large chuncks
// out of memory issues because freeing and reallocation large chunks of memory
// can create memory fragmentation and no room to reallocate large chunks
// after many free/reallocate cycles during a session using the same complex board
// So it can be disable.
// Currently: it is disable to avoid "out of memory" issues

2
common/gal/opengl/cached_container_gpu.cpp
View File

@ -44,7 +44,7 @@ CACHED_CONTAINER_GPU::CACHED_CONTAINER_GPU( unsigned int aSize ) :
wxString vendor( glGetString(GL_VENDOR) );
// workaround for intel GPU drivers: diable glCopyBuffer, causes crashes/freezes on certain driver versions
// workaround for intel GPU drivers: disable glCopyBuffer, causes crashes/freezes on certain driver versions
if( vendor.Contains ( "Intel ") )
{
wxLogDebug("Disabling glCopyBuffer() on intel GPU\n");

2
common/gal/opengl/opengl_gal.cpp
View File

@ -112,7 +112,7 @@ GLuint GL_BITMAP_CACHE::RequestBitmap( const BITMAP_BASE* aBitmap )
if ( it != m_bitmaps.end() )
{
// A bitmap is found in cache bitmap.
// Ensure the associated texture is still valide (can be destoyed somewhere)
// Ensure the associated texture is still valid (can be destroyed somewhere)
if( glIsTexture( it->second.id ) )
return it->second.id;

4
common/gbr_metadata.cpp
View File

@ -374,7 +374,7 @@ bool FormatNetAttribute( std::string& aPrintedText, std::string& aLastNetAttribu
}
// print a Gerber net attribute record.
// it is added to the object attributes dictionnary
// it is added to the object attributes dictionary
// On file, only modified or new attributes are printed.
if( aData == NULL )
return false;
@ -451,7 +451,7 @@ bool FormatNetAttribute( std::string& aPrintedText, std::string& aLastNetAttribu
{
// first, remove no more existing attributes.
// Because in Kicad the full attribute list is evaluated for each object,
// the entire dictionnary is cleared
// the entire dictionary is cleared
bool clearDict = false;
if( aLastNetAttributes.find( "TO.P," ) != std::string::npos )

2
common/kiway.cpp
View File

@ -117,7 +117,7 @@ const wxString KIWAY::dso_search_path( FACE_T aFaceId )
if( m_ctl & (KFCTL_STANDALONE | KFCTL_CPP_PROJECT_SUITE) )
{
// The 2 *.cpp program launchers: single_top.cpp and kicad.cpp expect
// the *.kiface's to reside in same diretory as their binaries do.
// the *.kiface's to reside in same directory as their binaries do.
// Not so for python launcher, identified by KFCTL_PY_PROJECT_SUITE
path = wxStandardPaths::Get().GetExecutablePath();
}

8
common/plotters/GERBER_plotter.cpp
View File

@ -112,7 +112,7 @@ void GERBER_PLOTTER::clearNetAttribute()
if( m_objectAttributesDictionnary.empty() ) // No net attribute or not X2 mode
return;
// Remove all net attributes from object attributes dictionnary
// Remove all net attributes from object attributes dictionary
if( m_useX2format )
fputs( "%TD*%\n", outputFile );
else
@ -131,7 +131,7 @@ void GERBER_PLOTTER::StartBlock( void* aData )
void GERBER_PLOTTER::EndBlock( void* aData )
{
// Remove all net attributes from object attributes dictionnary
// Remove all net attributes from object attributes dictionary
clearNetAttribute();
}
@ -139,7 +139,7 @@ void GERBER_PLOTTER::EndBlock( void* aData )
void GERBER_PLOTTER::formatNetAttribute( GBR_NETLIST_METADATA* aData )
{
// print a Gerber net attribute record.
// it is added to the object attributes dictionnary
// it is added to the object attributes dictionary
// On file, only modified or new attributes are printed.
if( aData == NULL )
return;
@ -187,7 +187,7 @@ bool GERBER_PLOTTER::StartPlot()
}
// Set coordinate format to 3.6 or 4.5 absolute, leading zero omitted
// the number of digits for the integer part of coordintes is needed
// the number of digits for the integer part of coordinates is needed
// in gerber format, but is not very important when omitting leading zeros
// It is fixed here to 3 (inch) or 4 (mm), but is not actually used
int leadingDigitCount = m_gerberUnitInch ? 3 : 4;

6
common/plotters/PDF_plotter.cpp
View File

@ -359,7 +359,7 @@ void PDF_PLOTTER::PlotImage( const wxImage & aImage, const wxPoint& aPos,
they kept the matrix stack to save restore environments. Also images
are always emitted at the origin with a size of 1x1 user units.
What we need to do is:
1) save the CTM end estabilish the new one
1) save the CTM end establish the new one
2) plot the image
3) restore the CTM
4) profit
@ -690,7 +690,7 @@ bool PDF_PLOTTER::EndPlot()
};
/* Declare the font resources. Since they're builtin fonts, no descriptors (yay!)
We'll need metrics anyway to do any aligment (these are in the shared with
We'll need metrics anyway to do any alignment (these are in the shared with
the postscript engine) */
for( int i = 0; i < 4; i++ )
{
@ -838,7 +838,7 @@ void PDF_PLOTTER::Text( const wxPoint& aPos,
const char *fontname = aItalic ? (aBold ? "/KicadFontBI" : "/KicadFontI")
: (aBold ? "/KicadFontB" : "/KicadFont");
// Compute the copious tranformation parameters of the Curent Transform Matrix
// Compute the copious transformation parameters of the Curent Transform Matrix
double ctm_a, ctm_b, ctm_c, ctm_d, ctm_e, ctm_f;
double wideningFactor, heightFactor;

4
common/plotters/PS_plotter.cpp
View File

@ -366,7 +366,7 @@ int PSLIKE_PLOTTER::returnPostscriptTextWidth( const wxString& aText, int aXSize
* Computes the x coordinates for the overlining in a string of text.
* Fills the passed vector with couples of (start, stop) values to be
* used in the text coordinate system (use computeTextParameters to
* obtain the parameters to estabilish such a system)
* obtain the parameters to establish such a system)
*/
void PSLIKE_PLOTTER::postscriptOverlinePositions( const wxString& aText, int aXSize,
bool aItalic, bool aBold,
@ -998,7 +998,7 @@ void PS_PLOTTER::Text( const wxPoint& aPos,
: (aBold ? "/KicadFont-Bold"
: "/KicadFont");
// Compute the copious tranformation parameters
// Compute the copious transformation parameters
double ctm_a, ctm_b, ctm_c, ctm_d, ctm_e, ctm_f;
double wideningFactor, heightFactor;
computeTextParameters( aPos, aText, aOrient, aSize, m_plotMirror, aH_justify,

2
common/widgets/mathplot.cpp
View File

@ -614,7 +614,7 @@ mpFXY::mpFXY( const wxString& name, int flags )
void mpFXY::UpdateViewBoundary( wxCoord xnew, wxCoord ynew )
{
// Keep track of how many points have been drawn and the bouding box
// Keep track of how many points have been drawn and the bounding box
maxDrawX = (xnew > maxDrawX) ? xnew : maxDrawX;
minDrawX = (xnew < minDrawX) ? xnew : minDrawX;
maxDrawY = (maxDrawY > ynew) ? maxDrawY : ynew;

2
eeschema/dialogs/dialog_lib_edit_pin.cpp
View File

@ -144,7 +144,7 @@ bool DIALOG_LIB_EDIT_PIN::TransferDataFromWindow()
/*
* Draw (on m_panelShowPin) the pin currently edited accroding to current settings in dialog
* Draw (on m_panelShowPin) the pin according to current settings in dialog
*/
void DIALOG_LIB_EDIT_PIN::OnPaintShowPanel( wxPaintEvent& event )
{

2
eeschema/dialogs/dialog_migrate_buses.cpp
View File

@ -27,7 +27,7 @@
/**
* Migrates buses using legacy multi-label joining behavior.
*
* In KiCad verions before 6.0, you were allowed to place multiple labels
* In KiCad versions before 6.0, you were allowed to place multiple labels
* on a given bus subgraph, and that would have the effect of making those
* bus descriptions equivalent according to the bus vector number.
*

4
eeschema/dialogs/dialog_plot_schematic.h
View File

@ -138,8 +138,8 @@ private:
/**
* Create a file name with an absolute path name
* @param aOutputDirectoryName the diretory name to plot,
* this can be a relative name of the current project diretory or an absolute directory name.
* @param aOutputDirectoryName the directory name to plot, this can be a relative name of the
* current project directory or an absolute directory name.
* @param aPlotFileName the name for the file to plot without a path
* @param aExtension the extension for the file to plot
* @param aReporter a point to a REPORTER object use to show messages (can be NULL)

2
eeschema/dialogs/dialog_spice_model.cpp
View File

@ -495,7 +495,7 @@ bool DIALOG_SPICE_MODEL::parsePowerSource( const wxString& aModel )
}
}
// Get the next token now, so if any of the branches catches an expection, try to
// Get the next token now, so if any of the branches catches an exception, try to
// process it in another branch
tkn = tokenizer.GetNextToken().Lower();
}

6
eeschema/dialogs/panel_sym_lib_table.cpp
View File

@ -461,9 +461,9 @@ void PANEL_SYM_LIB_TABLE::deleteRowHandler( wxCommandEvent& event )
int curCol = m_cur_grid->GetGridCursorCol();
// In a wxGrid, collect rows that have a selected cell, or are selected
// is not so easy: it depend on the way the selection was made.
// Here, we collect row selected by clicking on a row label, and
// row that contain a cell previously selected.
// It is not so easy: it depends on the way the selection was made.
// Here, we collect rows selected by clicking on a row label, and rows that contain
// previously-selected cells.
// If no candidate, just delete the row with the grid cursor.
wxArrayInt selectedRows = m_cur_grid->GetSelectedRows();
wxGridCellCoordsArray cells = m_cur_grid->GetSelectedCells();

2
eeschema/libedit/lib_edit_frame.h
View File

@ -309,7 +309,7 @@ private:
void SelectActiveLibrary( const wxString& aLibrary = wxEmptyString );
/**
* Dispaly a list of loaded libraries in the symbol library and allows the user to select
* Display a list of loaded libraries in the symbol library and allows the user to select
* a library.
*
* This list is sorted, with the library cache always at end of the list

2
eeschema/netlist_exporters/netlist_exporter_kicad.h
View File

@ -54,7 +54,7 @@ public:
* Function Format
* outputs this s-expression netlist into @a aOutputFormatter.
* @param aOutputFormatter is the destination of the serialization to text.
* @param aCtl is bit set composed by OR-ing together enum GNL bits, it allows ouputting
* @param aCtl is bit set composed by OR-ing together enum GNL bits, it allows outputting
* a subset of the full document model.
* @throw IO_ERROR if any problems.
*/

14
eeschema/netlist_object_list.cpp
View File

@ -23,21 +23,13 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
/**
* @file eeschema/netlist_object_list.cpp
*/
#include <netlist.h>
#include <netlist_object.h>
#include <class_library.h>
#include <lib_pin.h>
#include <sch_junction.h>
#include <sch_component.h>
#include <sch_line.h>
#include <sch_no_connect.h>
#include <sch_text.h>
#include <sch_sheet.h>
#include <sch_screen.h>
#include <algorithm>
#define IS_WIRE false
@ -395,15 +387,13 @@ void NETLIST_OBJECT_LIST::findBestNetNameForEachNet()
case NET_PINLABEL:
case NET_GLOBLABEL:
case NET_GLOBBUSLABELMEMBER:
// A candidate is found: select the better between the previous
// and this one
// A candidate is found: select the better between the previous and this one
if( candidate == NULL )
candidate = item;
else
{
if( evalLabelsPriority( item, candidate ) )
// item has a highter priority than candidate
// so update the best candidate
// item has a higher priority than candidate so update the best candidate
candidate = item;
}
break;

4
eeschema/plugins/python_scripts/kicad_netlist_reader.py
View File

@ -435,7 +435,7 @@ class netlist():
self._curr_element = None
# component blacklist regexs, made from exluded_* above.
# component blacklist regexs, made from excluded_* above.
self.excluded_references = []
self.excluded_values = []
self.excluded_footprints = []
@ -569,7 +569,7 @@ class netlist():
Omit those that should not, by consulting the blacklists:
excluded_values, excluded_refs, and excluded_footprints, which hold one
or more regular expressions. If any of the the regular expressions match
the corresponding field's value in a component, then the component is exluded.
the corresponding field's value in a component, then the component is excluded.
"""
# pre-compile all the regex expressions:

2
eeschema/plugins/xsl_scripts/bom_with_title_block_2_csv.xsl
View File

@ -3,7 +3,7 @@
Based on Stefan Helmert bom2csv.xsl
Note:
The project infomation (i.e title, company and revision) is taken from the root sheet.
The project information (i.e title, company and revision) is taken from the root sheet.
Arthur:
Ronald Sousa HashDefineElectronics.com

2
eeschema/sch_component.h
View File

@ -54,7 +54,7 @@ class SYMBOL_LIB_TABLE;
/// A container for several SCH_PIN items
typedef std::vector<SCH_PIN> SCH_PINS;
/// A map from the libary pin pointer to the SCH_PIN's index
/// A map from the library pin pointer to the SCH_PIN's index
typedef std::unordered_map<LIB_PIN*, unsigned> SCH_PIN_MAP;
/// A container for several SCH_FIELD items

2
eeschema/sch_connection.cpp
View File

@ -355,7 +355,7 @@ void SCH_CONNECTION::AppendDebugInfoToMsgPanel( MSG_PANEL_ITEMS& aList ) const
if( !ADVANCED_CFG::GetCfg().m_realTimeConnectivity || !CONNECTION_GRAPH::m_allowRealTime )
return;
// These messages are not flagged as translatable, because they are only debug messges
// These messages are not flagged as translatable, because they are only debug messages
wxString msg;
AppendInfoToMsgPanel( aList );

2
eeschema/sch_legacy_plugin.cpp
View File

@ -1987,7 +1987,7 @@ void SCH_LEGACY_PLUGIN::saveComponent( SCH_COMPONENT* aComponent )
// Fixed fields:
// Save mandatory fields even if they are blank,
// because the visibility, size and orientation are set from libary editor.
// because the visibility, size and orientation are set from library editor.
for( unsigned i = 0; i < MANDATORY_FIELDS; ++i )
saveField( aComponent->GetField( i ) );

2
eeschema/sch_reference_list.h
View File

@ -259,7 +259,7 @@ public:
/* Sort functions:
* Sort functions are used to sort components for annotation or BOM generation.
* Because sorting depend on we want to do, there are many sort functions.
* Because sorting depends on what we want to do, there are many sort functions.
* Note:
* When creating BOM, components are fully annotated.
* references are something like U3, U5 or R4, R8

2
eeschema/sim/spice_simulator.h
View File

@ -46,7 +46,7 @@ public:
///> Creates a simulator instance of particular type (currently only ngspice is handled)
static std::shared_ptr<SPICE_SIMULATOR> CreateInstance( const std::string& aName );
///> Intializes the simulator
///> Initializes the simulator
virtual void Init() = 0;
/*

4
eeschema/tools/ee_selection_tool.h
View File

@ -219,9 +219,7 @@ private:
/**
* Function selectionContains()
* Checks if the given point is placed within any of selected items' bounding box.
*
* @return True if the given point is contained in any of selected items' bouding box.
* @return True if the given point is contained in any of selected items' bounding box.
*/
bool selectionContains( const VECTOR2I& aPoint ) const;

2
eeschema/tools/sch_edit_tool.cpp
View File

@ -1198,7 +1198,7 @@ int SCH_EDIT_TOOL::Properties( const TOOL_EVENT& aEvent )
screensList.ClearAnnotationOfNewSheetPaths( initial_sheetpathList );
// Clear annotation of g_CurrentSheet itself, because its sheetpath
// is not a new path, but components managed by its sheet path must have
// their annotation cleared, becuase they are new:
// their annotation cleared, because they are new:
((SCH_SHEET*) item)->GetScreen()->ClearAnnotation( g_CurrentSheet );
}

2
eeschema/tools/sch_editor_control.cpp
View File

@ -761,7 +761,7 @@ int SCH_EDITOR_CONTROL::UpdateNetHighlighting( const TOOL_EVENT& aEvent )
itemsToRedraw.push_back( item );
}
// Be sure hightlight change will be redrawn
// Be sure highlight change will be redrawn
KIGFX::VIEW* view = getView();
for( auto redrawItem : itemsToRedraw )

2
eeschema/tools/sch_line_wire_bus_tool.cpp
View File

@ -645,7 +645,7 @@ int SCH_LINE_WIRE_BUS_TOOL::doDrawSegments( const std::string& aTool, int aType,
if( evt->GetCommandId().get() >= ID_POPUP_SCH_UNFOLD_BUS
&& evt->GetCommandId().get() <= ID_POPUP_SCH_UNFOLD_BUS_END )
{
wxASSERT_MSG( !aSegment, "Bus unfold event recieved when already drawing!" );
wxASSERT_MSG( !aSegment, "Bus unfold event received when already drawing!" );
aType = LAYER_WIRE;
wxString net = *evt->Parameter<wxString*>();

12
eeschema/transform.h
View File

@ -35,12 +35,12 @@
class EDA_RECT;
/**
* Class for tranforming drawing coordinates for a wxDC device context.
* Class for transforming drawing coordinates for a wxDC device context.
*
* This probably should be a base class with all pure methods and a derived class
* named WXDC_TRANFORM be created. Then in the future if some new device context
* is used, a new transform could be derived from the base class and all the drawable
* objects would have to do is provide overloaded draw methods to use the new transorm.
* This probably should be a base class with all pure virtual methods and a WXDC_TRANSFORM
* derived class. Then in the future if some new device context is used, a new transform could
* be derived from the base class and all the drawable objects would have to do is provide
* overloaded draw methods to use the new transorm.
*/
class TRANSFORM
{
@ -51,7 +51,7 @@ public:
int y2;
/**
* The default construct creates a tranform that draws object is the normal orientation.
* The default construct creates a transform that draws object is the normal orientation.
*/
TRANSFORM() : x1( 1 ), y1( 0 ), x2( 0 ), y2( -1 ) {}

2
gerbview/excellon_image.h
View File

@ -204,7 +204,7 @@ private:
* see http://www.excellon.com/manuals/program.htm
*/
/* coordintes units:
/* coordinates units:
* Coordinates are measured either in inch or metric (millimeters).
* Inch coordinates are in six digits (00.0000) with increments as small as 0.0001 (1/10,000).
* Metric coordinates can be measured in microns (thousandths of a millimeter)

2
gerbview/excellon_read_drill_file.cpp
View File

@ -236,7 +236,7 @@ static EXCELLON_CMD excellon_G_CmdList[] =
{ "G01", DRILL_G_LINEARMOVE, 1 }, // Linear (Straight Line) routing Mode
{ "G02", DRILL_G_CWMOVE, 1 }, // Circular CW Mode
{ "G03", DRILL_G_CCWMOVE, 1 }, // Circular CCW Mode
{ "G93", DRILL_G_ZERO_SET, 1 }, // Zero Set (XnnYmm and coordintes origin)
{ "G93", DRILL_G_ZERO_SET, 1 }, // Zero Set (XnnYmm and coordinates origin)
{ "", DRILL_G_UNKNOWN, 0 }, // last item in list
};

2
gerbview/gerber_file_image.h
View File

@ -159,7 +159,7 @@ public:
LAST_EXTRA_ARC_DATA_TYPE m_LastArcDataType; // Identifier for arc data type (IJ (center) or A## (radius))
FILE* m_Current_File; // Current file to read
int m_Selected_Tool; // For hightlight: current selected Dcode
int m_Selected_Tool; // For highlight: current selected Dcode
bool m_Has_DCode; // true = DCodes in file
// (false = no DCode -> separate DCode file
bool m_360Arc_enbl; // Enbl 360 deg circular interpolation

8
gerbview/rs274x.cpp
View File

@ -77,19 +77,19 @@ enum RS274X_PARAMETERS {
AP_DEFINITION = CODE( 'A', 'D' ),
AP_MACRO = CODE( 'A', 'M' ),
// X2 extention attribute commands
// X2 extension attribute commands
// Mainly are found standard attributes and user attributes
// standard attributes commands are:
// TF (file attribute) TO (net attribute)
// TA (aperture attribute) and TD (delete aperture attribute)
FILE_ATTRIBUTE = CODE( 'T', 'F' ),
// X2 extention Net attribute info
// X2 extension Net attribute info
// Net attribute options are:
// TO (net attribute data): TO.CN or TO.P TO.N or TO.C
NET_ATTRIBUTE = CODE( 'T', 'O' ),
// X2 extention Aperture attribute TA
// X2 extension Aperture attribute TA
APERTURE_ATTRIBUTE = CODE( 'T', 'A' ),
// TD (delete aperture/object attribute):
@ -100,7 +100,7 @@ enum RS274X_PARAMETERS {
// Layer specific parameters
// May be used singly or may be layer specfic
// theses parameters are at the beginning of the file or layer
// These parameters are at the beginning of the file or layer
// and reset some layer parameters (like interpolation)
KNOCKOUT = CODE( 'K', 'O' ), // Default: off
STEP_AND_REPEAT = CODE( 'S', 'R' ), // Default: A = 1, B = 1

2
include/bitmap_base.h
View File

@ -114,7 +114,7 @@ public:
/**
* Function GetScalingFactor
* @return the scaling factor from pixel size to actual draw size
* this scaling factor depend on m_pixelScaleFactor and m_scale
* this scaling factor depends on m_pixelScaleFactor and m_scale
* m_pixelScaleFactor gives the scaling factor between a pixel size and
* the internal schematic units
* m_scale is an user dependant value, and gives the "zoom" value

2
include/confirm.h
View File

@ -111,7 +111,7 @@ bool ConfirmRevertDialog( wxWindow* parent, const wxString& aMessage );
*
* @warning Setting \a displaytime does not work. Do not use it.
*/
void DisplayError( wxWindow* parent, const wxString& aMessage, int displaytime = 0 );
void DisplayError( wxWindow* aParent, const wxString& aText, int aDisplayTime = 0 );
/**
* Display an error message with \a aMessage

2
include/gr_text.h
View File

@ -23,7 +23,7 @@
*/
/**
* This file is part of the common libary
* This file is part of the common library
* @file drawtxt.h
* @see common.h
*/

2
include/painter.h
View File

@ -285,7 +285,7 @@ protected:
///< -1 means that there is no specific net, and whole active
///< layer is highlighted
bool m_highlightItems; ///< Highlight items with their HIGHLIGHT flags set
float m_highlightFactor; ///< Factor used for computing hightlight color
float m_highlightFactor; ///< Factor used for computing highlight color
float m_selectFactor; ///< Specifies how color of selected items is changed
float m_layerOpacity; ///< Determines opacity of all layers

6
include/plotter.h
View File

@ -1200,8 +1200,8 @@ protected:
void formatNetAttribute( GBR_NETLIST_METADATA* aData );
/**
* clear a Gerber net attribute record (clear object attribute dictionnary)
* and output the clear object attribute dictionnary command to gerber file
* clear a Gerber net attribute record (clear object attribute dictionary)
* and output the clear object attribute dictionary command to gerber file
*/
void clearNetAttribute();
@ -1216,7 +1216,7 @@ protected:
std::vector<APERTURE>::iterator getAperture( const wxSize& aSize,
APERTURE::APERTURE_TYPE aType, int aApertureAttribute );
// the attributes dictionnary created/modifed by %TO, attached the objects, when they are created
// the attributes dictionary created/modifed by %TO, attached the objects, when they are created
// by D01, D03 G36/G37 commands
// standard attributes are .P, .C and .N
// this is used by gerber readers when creating a new object. Cleared by %TD command

6
include/widgets/mathplot.h
View File

@ -536,7 +536,7 @@ public:
/** Layer plot handler.
* This implementation will plot the function in the visible area and
* put a label according to the aligment specified.
* put a label according to the alignment specified.
*/
virtual void Plot( wxDC& dc, mpWindow& w ) override;
@ -568,7 +568,7 @@ public:
/** Layer plot handler.
* This implementation will plot the function in the visible area and
* put a label according to the aligment specified.
* put a label according to the alignment specified.
*/
virtual void Plot( wxDC& dc, mpWindow& w ) override;
@ -661,7 +661,7 @@ public:
/** Layer plot handler.
* This implementation will plot the function in the visible area and
* put a label according to the aligment specified.
* put a label according to the alignment specified.
*/
virtual void Plot( wxDC& dc, mpWindow& w ) override;

6
kicad/files-io.cpp
View File

@ -133,7 +133,7 @@ void KICAD_MANAGER_FRAME::OnUnarchiveFiles( wxCommandEvent& event )
void KICAD_MANAGER_FRAME::OnArchiveFiles( wxCommandEvent& event )
{
// List of file extensions to save.
static const wxChar* extentionList[] = {
static const wxChar* extensionList[] = {
wxT( "*.pro" ),
wxT( "*.sch" ), wxT( "*.lib" ), wxT( "*.dcm" ), // Schematic related files
wxT( "*.cmp" ),
@ -196,8 +196,8 @@ void KICAD_MANAGER_FRAME::OnArchiveFiles( wxCommandEvent& event )
wxArrayString files;
for( unsigned ii = 0; ii < arrayDim( extentionList ); ii++ )
wxDir::GetAllFiles( currdirname, &files, extentionList[ii] );
for( unsigned ii = 0; ii < arrayDim( extensionList ); ii++ )
wxDir::GetAllFiles( currdirname, &files, extensionList[ii] );
files.Sort();

4
pagelayout_editor/tools/pl_selection_tool.h
View File

@ -184,9 +184,7 @@ private:
/**
* Function selectionContains()
* Checks if the given point is placed within any of selected items' bounding box.
*
* @return True if the given point is contained in any of selected items' bouding box.
* @return True if the given point is contained in any of selected items' bounding box.
*/
bool selectionContains( const VECTOR2I& aPoint ) const;

4
pcb_calculator/pcb_calculator.h
View File

@ -225,14 +225,14 @@ private:
/**
* Function OnTranslineAnalyse
* Run a new analyse for the current transline with current parameters
* and displays the electrical parmeters
* and displays the electrical parameters
*/
void OnTranslineAnalyse( wxCommandEvent& event ) override;
/**
* Function OnTranslineSynthetize
* Run a new synthezis for the current transline with current parameters
* and displays the geometrical parmeters
* and displays the geometrical parameters
*/
void OnTranslineSynthetize( wxCommandEvent& event ) override;

8
pcb_calculator/pcb_calculator_frame.cpp
View File

@ -47,7 +47,7 @@
#define KEYWORD_REGUL_LAST_PARAM wxT( "RegulLastParam" )
#define KEYWORD_DATAFILE_FILENAME wxT( "DataFilename" )
// extention of pcb_calculator data filename:
// extension of pcb_calculator data filename:
const wxString DataFileNameExt( wxT("pcbcalc") );
PCB_CALCULATOR_FRAME::PCB_CALCULATOR_FRAME( KIWAY* aKiway, wxWindow* aParent ) :
@ -283,7 +283,7 @@ void PCB_CALCULATOR_FRAME::SaveSettings( wxConfigBase* aCfg )
/**
* Function OnTranslineAnalyse
* Run a new analyse for the current transline with current parameters
* and displays the electrical parmeters
* and displays the electrical parameters
*/
void PCB_CALCULATOR_FRAME::OnTranslineAnalyse( wxCommandEvent& event )
{
@ -298,7 +298,7 @@ void PCB_CALCULATOR_FRAME::OnTranslineAnalyse( wxCommandEvent& event )
/**
* Function OnTranslineSynthetize
* Run a new synthezis for the current transline with current parameters
* and displays the geometrical parmeters
* and displays the geometrical parameters
*/
void PCB_CALCULATOR_FRAME::OnTranslineSynthetize( wxCommandEvent& event )
{
@ -328,7 +328,7 @@ void PCB_CALCULATOR_FRAME::OnPaintTranslinePanel( wxPaintEvent& event )
}
/* returns the full filename of the selected pcb_calculator data file
* the extention file is forced
* the extension file is forced
*/
const wxString PCB_CALCULATOR_FRAME::GetDataFilename()
{

2
pcb_calculator/transline/coplanar.cpp
View File

@ -152,7 +152,7 @@ void COPLANAR::calc()
double v = 0.43 - (0.86 - 0.54 * p) * p;
double G = exp( u * log( w / s ) + v );
// loss constant factors (computed only once for efficency sake)
// loss constant factors (computed only once for efficiency's sake)
double ac = 0;
if( t > 0 )
{

13
pcbnew/class_module.h
View File

@ -685,14 +685,11 @@ private:
int m_CntRot90; ///< Horizontal automatic placement cost ( 0..10 ).
int m_CntRot180; ///< Vertical automatic placement cost ( 0..10 ).
// Local tolerances. When zero, this means the corresponding netclass value
// is used. Usually theses local tolerances zero, in deference to the
// corresponding netclass values.
int m_LocalClearance;
int m_LocalSolderMaskMargin; ///< Solder mask margin
int m_LocalSolderPasteMargin; ///< Solder paste margin absolute value
double m_LocalSolderPasteMarginRatio; ///< Solder mask margin ratio
///< value of pad size
// Local tolerances. When zero, this means the corresponding netclass value is used.
int m_LocalClearance;
int m_LocalSolderMaskMargin; ///< Solder mask margin
int m_LocalSolderPasteMargin; ///< Solder paste margin absolute value
double m_LocalSolderPasteMarginRatio; ///< Solder mask margin ratio value of pad size
wxArrayString* m_initial_comments; ///< leading s-expression comments in the module,
///< lazily allocated only if needed for speed

6
pcbnew/dialogs/dialog_drc.cpp
View File

@ -180,7 +180,7 @@ void DIALOG_DRC_CONTROL::InitValues()
}
void DIALOG_DRC_CONTROL::SetDrcParmeters( )
void DIALOG_DRC_CONTROL::SetDRCParameters( )
{
m_BrdSettings.m_TrackMinWidth = m_trackMinWidth.GetValue();
m_BrdSettings.m_ViasMinSize = m_viaMinSize.GetValue();
@ -224,7 +224,7 @@ void DIALOG_DRC_CONTROL::OnStartdrcClick( wxCommandEvent& event )
reportName = makeValidFileNameReport();
}
SetDrcParmeters();
SetDRCParameters();
m_tester->m_doZonesTest = m_cbReportTracksToZonesErrors->GetValue();
m_tester->m_rptFilename = reportName;
m_tester->m_doCreateRptFile = make_report;
@ -293,7 +293,7 @@ void DIALOG_DRC_CONTROL::OnButtonBrowseRptFileClick( wxCommandEvent& )
void DIALOG_DRC_CONTROL::OnCancelClick( wxCommandEvent& event )
{
SetReturnCode( wxID_CANCEL );
SetDrcParmeters();
SetDRCParameters();
// The dialog can be modal or not modal.
// Leave the DRC caller destroy (or not) the dialog

2
pcbnew/dialogs/dialog_drc.h
View File

@ -89,7 +89,7 @@ private:
void DisplayDRCValues( );
void SetDrcParmeters( );
void SetDRCParameters( );
/// wxEVT_COMMAND_CHECKBOX_CLICKED event handler for ID_CHECKBOX_RPT_FILE
void OnReportCheckBoxClicked( wxCommandEvent& event ) override;

6
pcbnew/dialogs/panel_fp_lib_table.cpp
View File

@ -498,9 +498,9 @@ void PANEL_FP_LIB_TABLE::deleteRowHandler( wxCommandEvent& event )
int curCol = m_cur_grid->GetGridCursorCol();
// In a wxGrid, collect rows that have a selected cell, or are selected
// is not so easy: it depend on the way the selection was made.
// Here, we collect row selected by clicking on a row label, and
// row that contain a cell previously selected.
// It is not so easy: it depends on the way the selection was made.
// Here, we collect rows selected by clicking on a row label, and rows that contain any
// previously-selected cells.
// If no candidate, just delete the row with the grid cursor.
wxArrayInt selectedRows = m_cur_grid->GetSelectedRows();
wxGridCellCoordsArray cells = m_cur_grid->GetSelectedCells();

2
pcbnew/gpcb_plugin.cpp
View File

@ -406,7 +406,7 @@ MODULE* GPCB_FPL_CACHE::parseMODULE( LINE_READER* aLineReader )
// gEDA/pcb aligns top/left, not pcbnew's default, center/center.
// Compensate for this by shifting the insertion point instead of the
// aligment, because alignment isn't changeable in the GUI.
// alignment, because alignment isn't changeable in the GUI.
textPos.x = textPos.x + twsize * module->GetReference().Len() / 2;
textPos.y += thsize / 2;

2
pcbnew/pad_custom_shape_functions.cpp
View File

@ -375,7 +375,7 @@ bool D_PAD::MergePrimitivesAsPolygon( SHAPE_POLY_SET* aMergedPolygon )
if( !buildCustomPadPolygon( aMergedPolygon, maxError ) )
return false;
m_boundingRadius = -1; // The current bouding radius is no more valid.
m_boundingRadius = -1; // The current bounding radius is no longer valid.
return aMergedPolygon->OutlineCount() <= 1;
}

4
pcbnew/tools/selection_tool.h
View File

@ -311,9 +311,7 @@ private:
/**
* Function selectionContains()
* Checks if the given point is placed within any of selected items' bounding box.
*
* @return True if the given point is contained in any of selected items' bouding box.
* @return True if the given point is contained in any of selected items' bounding box.
*/
bool selectionContains( const VECTOR2I& aPoint ) const;

2
pcbnew/zone_filler.cpp
View File

@ -637,7 +637,7 @@ void ZONE_FILLER::buildCopperItemClearances( const ZONE_CONTAINER* aZone, SHAPE_
if( zone->GetIsKeepout() && !zone->GetDoNotAllowCopperPour() )
continue;
// A highter priority zone or keepout area is found: remove this area
// A higher priority zone or keepout area is found: remove this area
EDA_RECT item_boundingbox = zone->GetBoundingBox();
if( !item_boundingbox.Intersects( zone_boundingbox ) )

2
polygon/polygon_test_point_inside.cpp
View File

@ -42,7 +42,7 @@
* Because the starting point of a segment is also the ending point of the previous, only one must be used.
* And we do no use twice the same segment, so we do NOT use both starting and ending points of these 2 segments.
* So we must use only one ending point of each segment when calculating intersections
* but it cannot be always the starting or the ending point. This depend on relative position of 2 consectutive segments
* but it cannot be always the starting or the ending point. This depends on relative position of 2 consectutive segments
* Here, the ending point above the Y reference position is used
* and the ending point below or equal the Y reference position is NOT used
* Obviously, others cases are irrelevant because there is not intersection.