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

Fix build error and cleanup overzealous refactor changes

This commit is contained in:
Ian McInerney 2020-02-14 00:56:41 +00:00
parent 2017389f2d
commit 25b3cce474
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/gbr_metadata.cpp
View File

@ -519,7 +519,7 @@ std::string FormatStringToGerber( const wxString& aString )
} }
// Netname and Pan num fields cannot be empty in Gerber files // Netname and Pan num fields cannot be empty in Gerber files
// m_Normalized names must be used, if any // Normalized names must be used, if any
#define NO_NET_NAME wxT( "N/C" ) // net name of not connected pads (one pad net) (normalized) #define NO_NET_NAME wxT( "N/C" ) // net name of not connected pads (one pad net) (normalized)
#define NO_PAD_NAME wxT( "" ) // pad name of pads without pad name/number (not normalized) #define NO_PAD_NAME wxT( "" ) // pad name of pads without pad name/number (not normalized)

4
eeschema/symbol_tree_synchronizing_adapter.cpp
View File

@ -262,7 +262,7 @@ bool SYMBOL_TREE_SYNCHRONIZING_ADAPTER::GetAttr( wxDataViewItem const& aItem, un
#ifdef __WXGTK__ #ifdef __WXGTK__
// The native wxGTK+ impl ignores background colour, so set the text colour instead. // The native wxGTK+ impl ignores background colour, so set the text colour instead.
// This works reasonably well in dark themes, and quite poorly in light ones.... // This works reasonably well in dark themes, and quite poorly in light ones....
if( node->Name == m_libMgr->GetCurrentLib() ) if( node->m_Name == m_libMgr->GetCurrentLib() )
aAttr.SetColour( wxSystemSettings::GetColour( wxSYS_COLOUR_HIGHLIGHT ) ); aAttr.SetColour( wxSystemSettings::GetColour( wxSYS_COLOUR_HIGHLIGHT ) );
#else #else
// mark the current library with background color // mark the current library with background color
@ -284,7 +284,7 @@ bool SYMBOL_TREE_SYNCHRONIZING_ADAPTER::GetAttr( wxDataViewItem const& aItem, un
#ifdef __WXGTK__ #ifdef __WXGTK__
// The native wxGTK+ impl ignores background colour, so set the text colour instead. // The native wxGTK+ impl ignores background colour, so set the text colour instead.
// This works reasonably well in dark themes, and quite poorly in light ones.... // This works reasonably well in dark themes, and quite poorly in light ones....
if( node->LibId == m_libMgr->GetCurrentLibId() ) if( node->m_LibId == m_libMgr->GetCurrentLibId() )
aAttr.SetColour( wxSystemSettings::GetColour( wxSYS_COLOUR_HIGHLIGHT ) ); aAttr.SetColour( wxSystemSettings::GetColour( wxSYS_COLOUR_HIGHLIGHT ) );
#else #else
// mark the current part with background color // mark the current part with background color

4
include/env_paths.h
View File

@ -33,7 +33,7 @@
* @param aFilePath is the full file path (path and file name) to be normalized. * @param aFilePath is the full file path (path and file name) to be normalized.
* @param aEnvVars is an optional map of environmental variables to try substition with. * @param aEnvVars is an optional map of environmental variables to try substition with.
* @param aProject is an optional project, to normalize the file path to the project path. * @param aProject is an optional project, to normalize the file path to the project path.
* @return m_Normalized full file path (path and file name) if succeeded or empty string if the * @return Normalized full file path (path and file name) if succeeded or empty string if the
* path could not be normalized. * path could not be normalized.
*/ */
wxString NormalizePath( const wxFileName& aFilePath, const ENV_VAR_MAP* aEnvVars, wxString NormalizePath( const wxFileName& aFilePath, const ENV_VAR_MAP* aEnvVars,
@ -45,7 +45,7 @@ wxString NormalizePath( const wxFileName& aFilePath, const ENV_VAR_MAP* aEnvVars
* @param aFilePath is the full file path (path and file name) to be normalized. * @param aFilePath is the full file path (path and file name) to be normalized.
* @param aEnvVars is an optional map of environmental variables to try substition with. * @param aEnvVars is an optional map of environmental variables to try substition with.
* @param aProjectPath is an optional string to normalize the file path to the project path. * @param aProjectPath is an optional string to normalize the file path to the project path.
* @return m_Normalized full file path (path and file name) if succeeded or empty string if the * @return Normalized full file path (path and file name) if succeeded or empty string if the
* path could not be normalized. * path could not be normalized.
*/ */
wxString NormalizePath( wxString NormalizePath(

4
pcbnew/autorouter/ar_autoplacer.cpp
View File

@ -649,7 +649,7 @@ int AR_AUTOPLACER::getOptimalModulePlacement(MODULE* aModule)
fpBBox.SetOrigin( fpBBoxOrg + m_curPosition ); fpBBox.SetOrigin( fpBBoxOrg + m_curPosition );
min_cost = -1.0; min_cost = -1.0;
// m_frame->SetStatusText( wxT( "m_Score ??, pos ??" ) ); // m_frame->SetStatusText( wxT( "Score ??, pos ??" ) );
for( ; m_curPosition.x < xylimit.x; m_curPosition.x += m_matrix.m_GridRouting ) for( ; m_curPosition.x < xylimit.x; m_curPosition.x += m_matrix.m_GridRouting )
@ -675,7 +675,7 @@ int AR_AUTOPLACER::getOptimalModulePlacement(MODULE* aModule)
LastPosOK = m_curPosition; LastPosOK = m_curPosition;
min_cost = Score; min_cost = Score;
wxString msg; wxString msg;
/* msg.Printf( wxT( "m_Score %g, pos %s, %s" ), /* msg.Printf( wxT( "Score %g, pos %s, %s" ),
min_cost, min_cost,
GetChars( ::CoordinateToString( LastPosOK.x ) ), GetChars( ::CoordinateToString( LastPosOK.x ) ),
GetChars( ::CoordinateToString( LastPosOK.y ) ) ); GetChars( ::CoordinateToString( LastPosOK.y ) ) );