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

Improve spelling.

Browse Source 
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

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

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