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

Replace tabs with spaces

This commit is contained in:
Marcus A. Romer 2021-04-04 08:48:02 +02:00 committed by Ian McInerney
parent a24bc34b66
commit 1632707d9b
18 changed files with 36 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -827,7 +827,7 @@ if( KICAD_SCRIPTING OR KICAD_SCRIPTING_MODULES )
set( PYTHON_DEST "${OSX_BUNDLE_BUILD_LIB_DIR}/${PYTHON_LIB_DIR}" set( PYTHON_DEST "${OSX_BUNDLE_BUILD_LIB_DIR}/${PYTHON_LIB_DIR}"
CACHE PATH "Python module install path." CACHE PATH "Python module install path."
) )
elseif( VCPKG_TOOLCHAIN ) elseif( VCPKG_TOOLCHAIN )
set( PYTHON_DEST "${CMAKE_INSTALL_PREFIX}/bin/Lib/site-packages" set( PYTHON_DEST "${CMAKE_INSTALL_PREFIX}/bin/Lib/site-packages"
CACHE PATH "Python module install path." CACHE PATH "Python module install path."
) )

2
CMakeModules/Findngspice.cmake
View File

@ -141,7 +141,7 @@ if( ${NGSPICE_INCLUDE_DIR} STREQUAL "NGSPICE_INCLUDE_DIR-NOTFOUND" OR ${NGSPICE_
endif() endif()
find_package_handle_standard_args( ngspice find_package_handle_standard_args( ngspice
REQUIRED_VARS NGSPICE_INCLUDE_DIR NGSPICE_LIBRARY NGSPICE_DLL ) REQUIRED_VARS NGSPICE_INCLUDE_DIR NGSPICE_LIBRARY NGSPICE_DLL )
mark_as_advanced( mark_as_advanced(
NGSPICE_INCLUDE_DIR NGSPICE_INCLUDE_DIR

6
CMakeModules/FindwxPython.cmake
View File

@ -45,9 +45,9 @@ if( VCPKG_TOOLCHAIN )
# python 3.8+ requires us to use python to add additiona load directories (PATH no longer supported) # python 3.8+ requires us to use python to add additiona load directories (PATH no longer supported)
# vcpkg does not copy all the dlls into the python folder so we need this for development # vcpkg does not copy all the dlls into the python folder so we need this for development
# as the wxpython modules need the wxwidgets library DLLs to load # as the wxpython modules need the wxwidgets library DLLs to load
set( _py_dll "import os;os.add_dll_directory(\"${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/bin\");os.add_dll_directory(\"${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/bin\");" ) set( _py_dll "import os;os.add_dll_directory(\"${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/bin\");os.add_dll_directory(\"${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug/bin\");" )
else() else()
set( _py_dll "" ) set( _py_dll "" )
endif() endif()
execute_process( COMMAND ${PYTHON_EXECUTABLE} -c "${_py_dll}${_py_site_path}${_py_cmd}" execute_process( COMMAND ${PYTHON_EXECUTABLE} -c "${_py_dll}${_py_site_path}${_py_cmd}"
@ -79,7 +79,7 @@ list( GET _WXPYTHON_VERSION_LIST 2 WXPYTHON_FLAVOR )
# Determine wxWidgets version used by wxPython/Phoenix # Determine wxWidgets version used by wxPython/Phoenix
if( WXPYTHON_FLAVOR MATCHES "phoenix" ) if( WXPYTHON_FLAVOR MATCHES "phoenix" )
# 4.0.1;gtk3;(phoenix) does not contain wxWidgets version, request it explicitly # 4.0.1;gtk3;(phoenix) does not contain wxWidgets version, request it explicitly
set( _py_cmd "import wx;print(wx.wxWidgets_version.split(' ')[1])") set( _py_cmd "import wx;print(wx.wxWidgets_version.split(' ')[1])")
execute_process( COMMAND ${PYTHON_EXECUTABLE} -c "${_py_dll}${_py_site_path}${_py_cmd}" execute_process( COMMAND ${PYTHON_EXECUTABLE} -c "${_py_dll}${_py_site_path}${_py_cmd}"
RESULT_VARIABLE WXPYTHON_WXVERSION_RESULT RESULT_VARIABLE WXPYTHON_WXVERSION_RESULT

6
CMakeModules/config.h.cmake
View File

@ -83,13 +83,13 @@
#define PYTHON_DEST "@PYTHON_DEST@" #define PYTHON_DEST "@PYTHON_DEST@"
/// Allows scripts install directory to be referenced by the program code. /// Allows scripts install directory to be referenced by the program code.
#define KICAD_DATA "@KICAD_DATA@" #define KICAD_DATA "@KICAD_DATA@"
// Plugins directory // Plugins directory
#define KICAD_PLUGINDIR "@CMAKE_INSTALL_FULL_LIBDIR@" #define KICAD_PLUGINDIR "@CMAKE_INSTALL_FULL_LIBDIR@"
/// ngspice version string detected by pkg-config when available. /// ngspice version string detected by pkg-config when available.
#cmakedefine NGSPICE_BUILD_VERSION "@NGSPICE_BUILD_VERSION@" #cmakedefine NGSPICE_BUILD_VERSION "@NGSPICE_BUILD_VERSION@"
/// When pkg-config config is not available for ngspice, use ngspice/config.h for version. /// When pkg-config config is not available for ngspice, use ngspice/config.h for version.
#cmakedefine NGSPICE_HAVE_CONFIG_H #cmakedefine NGSPICE_HAVE_CONFIG_H

10
CMakeSettings.json.sample
View File

@ -3,7 +3,7 @@
{ {
"BuildDir": "${workspaceRoot}\\build", "BuildDir": "${workspaceRoot}\\build",
"InstallDir": "${workspaceRoot}\\build\\install" "InstallDir": "${workspaceRoot}\\build\\install"
}, },
{ {
"environment": "vcpkg", "environment": "vcpkg",
"VcPkgDir": "D:/vcpkg/" "VcPkgDir": "D:/vcpkg/"
@ -76,11 +76,11 @@
"value": "OFF", "value": "OFF",
"type": "BOOL" "type": "BOOL"
}, },
{ {
"name": "KICAD_WIN32_DPI_AWARE", "name": "KICAD_WIN32_DPI_AWARE",
"value": "ON", "value": "ON",
"type": "BOOL" "type": "BOOL"
} }
], ],
"cmakeToolchain": "${env.VcPkgDir}/scripts/buildsystems/vcpkg.cmake" "cmakeToolchain": "${env.VcPkgDir}/scripts/buildsystems/vcpkg.cmake"
}, },
@ -140,11 +140,11 @@
"value": "OFF", "value": "OFF",
"type": "BOOL" "type": "BOOL"
}, },
{ {
"name": "KICAD_WIN32_DPI_AWARE", "name": "KICAD_WIN32_DPI_AWARE",
"value": "ON", "value": "ON",
"type": "BOOL" "type": "BOOL"
} }
], ],
"cmakeToolchain": "${env.VcPkgDir}/scripts/buildsystems/vcpkg.cmake" "cmakeToolchain": "${env.VcPkgDir}/scripts/buildsystems/vcpkg.cmake"
}, },

1
DoxygenLayout.xml
View File

@ -34,7 +34,6 @@
<tab type="globals" visible="yes" title="" intro=""/> <tab type="globals" visible="yes" title="" intro=""/>
</tab> </tab>
<tab type="examples" visible="yes" title="" intro=""/> <tab type="examples" visible="yes" title="" intro=""/>
<tab type="user" url="https://dev-docs.kicad.org" title="KiCad Dev Docs"/> <tab type="user" url="https://dev-docs.kicad.org" title="KiCad Dev Docs"/>
</navindex> </navindex>

6
eeschema/hierarch.cpp
View File

@ -138,8 +138,8 @@ HIERARCHY_NAVIG_DLG::HIERARCHY_NAVIG_DLG( SCH_EDIT_FRAME* aParent ) :
// Manage a simple click on a selection, if the selection changes // Manage a simple click on a selection, if the selection changes
Bind( wxEVT_TREE_SEL_CHANGED, &HIERARCHY_NAVIG_DLG::onSelectSheetPath, this ); Bind( wxEVT_TREE_SEL_CHANGED, &HIERARCHY_NAVIG_DLG::onSelectSheetPath, this );
// Connect close event for the dialog: // Connect close event for the dialog:
this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( HIERARCHY_NAVIG_DLG::OnCloseNav ) ); this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( HIERARCHY_NAVIG_DLG::OnCloseNav ) );
} }
@ -148,7 +148,7 @@ HIERARCHY_NAVIG_DLG::~HIERARCHY_NAVIG_DLG()
Unbind( wxEVT_TREE_ITEM_ACTIVATED, &HIERARCHY_NAVIG_DLG::onSelectSheetPath, this ); Unbind( wxEVT_TREE_ITEM_ACTIVATED, &HIERARCHY_NAVIG_DLG::onSelectSheetPath, this );
Unbind( wxEVT_TREE_SEL_CHANGED, &HIERARCHY_NAVIG_DLG::onSelectSheetPath, this ); Unbind( wxEVT_TREE_SEL_CHANGED, &HIERARCHY_NAVIG_DLG::onSelectSheetPath, this );
m_Tree->Disconnect( wxEVT_CHAR, wxKeyEventHandler( HIERARCHY_TREE::onChar ) ); m_Tree->Disconnect( wxEVT_CHAR, wxKeyEventHandler( HIERARCHY_TREE::onChar ) );
Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( HIERARCHY_NAVIG_DLG::OnCloseNav ) ); Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( HIERARCHY_NAVIG_DLG::OnCloseNav ) );
} }

6
eeschema/sch_text_help.md
View File

@ -86,9 +86,9 @@
<td><br></td> <td><br></td>
</tr> </tr>
<tr> <tr>
<td>&nbsp;<br><samp>{net1 net2 ...}</samp></td> <td>&nbsp;<br><samp>{net1 net2 ...}</samp></td>
<td></td> <td></td>
<td>&nbsp;<br><samp>net1, net2, ...</samp></td> <td>&nbsp;<br><samp>net1, net2, ...</samp></td>
</tr> </tr>
<tr> <tr>
<td>&nbsp;<br><samp>{SCL SDA}</samp></td> <td>&nbsp;<br><samp>{SCL SDA}</samp></td>

4
gerbview/excellon_image.h
View File

@ -229,7 +229,7 @@ private:
* The following table provides you with a list of commands which * The following table provides you with a list of commands which
* are the most used in a part program header. * are the most used in a part program header.
* COMMAND DESCRIPTION * COMMAND DESCRIPTION
* AFS Automatic Feeds and Speeds * AFS Automatic Feeds and Speeds
* ATC Automatic Tool Change * ATC Automatic Tool Change
* BLKD Delete all Blocks starting with a slash (/) * BLKD Delete all Blocks starting with a slash (/)
* CCW Clockwise or Counter-clockwise Routing * CCW Clockwise or Counter-clockwise Routing
@ -288,7 +288,7 @@ private:
* G01X#Y# Linear (Straight Line) Route Mode YX is the ending point * G01X#Y# Linear (Straight Line) Route Mode YX is the ending point
* G02X#Y#... Circular CW Mode. Radius value (A#) or Center position (I#J#) follows * G02X#Y#... Circular CW Mode. Radius value (A#) or Center position (I#J#) follows
* G03X#Y#... Circular CCW Mode. Radius value (A#) or Center position (I#J#) follows * G03X#Y#... Circular CCW Mode. Radius value (A#) or Center position (I#J#) follows
* G04 X# Variable Dwell * G04X# Variable Dwell
* G05 Drill Mode * G05 Drill Mode
* G07 Override current tool feed or speed * G07 Override current tool feed or speed
* G32X#Y#A# Routed Circle Canned Cycle * G32X#Y#A# Routed Circle Canned Cycle

6
helpers/gal_bitmap_font/png2struct.py
View File

@ -34,10 +34,10 @@ def convert(png_file):
img = r.read() img = r.read()
print(img); print(img);
if img[3].get("alpha") == True: if img[3].get("alpha") == True:
print('Detected alpha channel!'); print('Detected alpha channel!');
output = open(os.path.splitext(png_file)[0] + '_img.c', 'w') output = open(os.path.splitext(png_file)[0] + '_img.c', 'w')
width = img[0] width = img[0]
@ -60,7 +60,7 @@ static const struct {
for row in img[2]: for row in img[2]:
for p in row[3::4]: for p in row[3::4]:
output.write('%d,' % p) output.write('%d,' % p)
output.write('\n'); output.write('\n');
else: else:
for row in img[2]: for row in img[2]:
for p in row: for p in row:

2
include/build_version.h
View File

@ -71,4 +71,4 @@ wxString GetBuildDate();
*/ */
wxString GetVersionInfoData( const wxString& aTitle, bool aHtml = false, bool aBrief = false ); wxString GetVersionInfoData( const wxString& aTitle, bool aHtml = false, bool aBrief = false );
#endif // KICAD_BUILD_VERSION_H #endif // KICAD_BUILD_VERSION_H

4
include/gal/graphics_abstraction_layer.h
View File

@ -143,8 +143,8 @@ public:
* DrawArc() draws a "pie piece" when fill is turned on, and a thick stroke when fill is off. * DrawArc() draws a "pie piece" when fill is turned on, and a thick stroke when fill is off.
* DrawArcSegment() with fill *on* behaves like DrawArc() with fill *off*. * DrawArcSegment() with fill *on* behaves like DrawArc() with fill *off*.
* DrawArcSegment() with fill *off* draws the outline of what it would have drawn with fill on. * DrawArcSegment() with fill *off* draws the outline of what it would have drawn with fill on.
* *
* TODO: Unify Arc routines * TODO: Unify Arc routines
* *
* @param aCenterPoint is the center point of the arc. * @param aCenterPoint is the center point of the arc.
* @param aRadius is the arc radius. * @param aRadius is the arc radius.

2
include/gal/opengl/shader.h
View File

@ -43,7 +43,7 @@ class OPENGL_GAL;
/// Type definition for the shader /// Type definition for the shader
enum SHADER_TYPE enum SHADER_TYPE
{ {
SHADER_TYPE_VERTEX = GL_VERTEX_SHADER, ///< Vertex shader SHADER_TYPE_VERTEX = GL_VERTEX_SHADER, ///< Vertex shader
SHADER_TYPE_FRAGMENT = GL_FRAGMENT_SHADER, ///< Fragment shader SHADER_TYPE_FRAGMENT = GL_FRAGMENT_SHADER, ///< Fragment shader
SHADER_TYPE_GEOMETRY = GL_GEOMETRY_SHADER ///< Geometry shader SHADER_TYPE_GEOMETRY = GL_GEOMETRY_SHADER ///< Geometry shader
}; };

2
include/mail_type.h
View File

@ -49,7 +49,7 @@ enum MAIL_T
MAIL_SCH_REFRESH, // Tell the schematic editor to refresh the display. MAIL_SCH_REFRESH, // Tell the schematic editor to refresh the display.
MAIL_SCH_CLEAN_NETCLASSES, // Tell the schematic editor to clean stale nets out of MAIL_SCH_CLEAN_NETCLASSES, // Tell the schematic editor to clean stale nets out of
// the netclass membership lists // the netclass membership lists
MAIL_REANNOTATE, // Reannotate eeSchema MAIL_REANNOTATE, // Reannotate eeSchema
MAIL_LIB_EDIT, MAIL_LIB_EDIT,
MAIL_FP_EDIT MAIL_FP_EDIT
}; };

2
include/undo_redo_container.h
View File

@ -54,7 +54,7 @@ class BASE_SCREEN;
*/ */
enum class UNDO_REDO { enum class UNDO_REDO {
UNSPECIFIED = 0, // illegal UNSPECIFIED = 0, // illegal
NOP, // Undo/redo will ignore this entry. Only forces the start of a new stack NOP, // Undo/redo will ignore this entry. Only forces the start of a new stack
CHANGED, // params of items have a value changed: undo is made by exchange CHANGED, // params of items have a value changed: undo is made by exchange
// values with a copy of these values // values with a copy of these values
NEWITEM, // new item, undo by changing in deleted NEWITEM, // new item, undo by changing in deleted

2
include/widgets/mathplot.h
View File

@ -307,7 +307,7 @@ public:
const wxBrush& GetBrush() const { return m_brush; }; const wxBrush& GetBrush() const { return m_brush; };
/** Set layer brush /** Set layer brush
* @param brush brush, will be copied to internal class member */ * @param brush brush, will be copied to internal class member */
void SetBrush( wxBrush brush ) { m_brush = brush; }; void SetBrush( wxBrush brush ) { m_brush = brush; };
protected: protected:

6
libs/kimath/include/geometry/poly_grid_partition.h
View File

@ -391,7 +391,8 @@ private:
int yy = poly2gridY( py ); int yy = poly2gridY( py );
indices.insert( m_gridSize * yy + x ); indices.insert( m_gridSize * yy + x );
if( x > 0 )
if( x > 0 )
indices.insert( m_gridSize * yy + x - 1 ); indices.insert( m_gridSize * yy + x - 1 );
} }
@ -414,7 +415,8 @@ private:
int xx = poly2gridX( px ); int xx = poly2gridX( px );
indices.insert( m_gridSize * y + xx ); indices.insert( m_gridSize * y + xx );
if( y > 0 )
if( y > 0 )
indices.insert( m_gridSize * (y - 1) + xx ); indices.insert( m_gridSize * (y - 1) + xx );
} }
} }

2
utils/kicad2step/panel_kicad2step.h
View File

@ -60,7 +60,7 @@ public:
class PANEL_KICAD2STEP: public wxPanel class PANEL_KICAD2STEP: public wxPanel
{ {
public: public:
PANEL_KICAD2STEP( wxWindow* parent, wxWindowID id = wxID_ANY, PANEL_KICAD2STEP( wxWindow* parent, wxWindowID id = wxID_ANY,
const wxPoint& pos = wxDefaultPosition, const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxSize( 500,300 ), const wxSize& size = wxSize( 500,300 ),
long style = wxTAB_TRAVERSAL ); long style = wxTAB_TRAVERSAL );