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

Coding style fixes

This commit is contained in:
jean-pierre charras 2017-01-03 18:04:35 +01:00
parent 66ee44cb1f
commit 1a464ab8c8
6 changed files with 31 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcbnew/footprint_wizard.cpp
View File

@ -244,7 +244,7 @@ void FOOTPRINT_WIZARD_FRAME::ParametersUpdated( wxGridEvent& event )
for( int prm_id = 0; prm_id < count; ++prm_id ) for( int prm_id = 0; prm_id < count; ++prm_id )
{ {
wxString value = m_parameterGrid->GetCellValue( prm_id, WIZ_COL_VALUE); wxString value = m_parameterGrid->GetCellValue( prm_id, WIZ_COL_VALUE );
if( prmValues[prm_id] != value ) if( prmValues[prm_id] != value )
{ {

29
pcbnew/footprint_wizard_frame.cpp
View File

@ -4,7 +4,7 @@
* Copyright (C) 2012-2015 Miguel Angel Ajo Pelayo <miguelangel@nbee.es> * Copyright (C) 2012-2015 Miguel Angel Ajo Pelayo <miguelangel@nbee.es>
* Copyright (C) 2012-2015 Jean-Pierre Charras, jp.charras at wanadoo.fr * Copyright (C) 2012-2015 Jean-Pierre Charras, jp.charras at wanadoo.fr
* Copyright (C) 2008-2015 Wayne Stambaugh <stambaughw@verizon.net> * Copyright (C) 2008-2015 Wayne Stambaugh <stambaughw@verizon.net>
* Copyright (C) 2004-2015 KiCad Developers, see change_log.txt for contributors. * Copyright (C) 2004-2017 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
@ -384,21 +384,20 @@ void FOOTPRINT_WIZARD_FRAME::ReCreateParameterList()
// Set the editor type of the // Set the editor type of the
// Boolean parameters can be displayed using a checkbox // Boolean parameters can be displayed using a checkbox
if ( units == WIZARD_PARAM_UNITS_BOOL ) if( units == WIZARD_PARAM_UNITS_BOOL )
{ {
wxGridCellBoolEditor *boolEditor = new wxGridCellBoolEditor; wxGridCellBoolEditor *boolEditor = new wxGridCellBoolEditor;
boolEditor->UseStringValues("True","False"); boolEditor->UseStringValues("True","False");
m_parameterGrid->SetCellEditor( i, WIZ_COL_VALUE, boolEditor ); m_parameterGrid->SetCellEditor( i, WIZ_COL_VALUE, boolEditor );
m_parameterGrid->SetCellRenderer( i, WIZ_COL_VALUE, new wxGridCellBoolRenderer ); m_parameterGrid->SetCellRenderer( i, WIZ_COL_VALUE, new wxGridCellBoolRenderer );
} }
// Parameters that can be selected from a list of multiple options // Parameters that can be selected from a list of multiple options
else if ( units.Contains( "," ) ) // Indicates list of available options else if( units.Contains( "," ) ) // Indicates list of available options
{ {
wxStringTokenizer tokenizer( units, "," ); wxStringTokenizer tokenizer( units, "," );
wxArrayString options; wxArrayString options;
while ( tokenizer.HasMoreTokens() ) while( tokenizer.HasMoreTokens() )
{ {
options.Add( tokenizer.GetNextToken() ); options.Add( tokenizer.GetNextToken() );
} }
@ -408,17 +407,17 @@ void FOOTPRINT_WIZARD_FRAME::ReCreateParameterList()
units = wxT( "" ); units = wxT( "" );
} }
// Integer parameters // Integer parameters
else if ( units == WIZARD_PARAM_UNITS_INTEGER ) else if( units == WIZARD_PARAM_UNITS_INTEGER )
{ {
m_parameterGrid->SetCellEditor( i, WIZ_COL_VALUE, new wxGridCellNumberEditor ); m_parameterGrid->SetCellEditor( i, WIZ_COL_VALUE, new wxGridCellNumberEditor );
} }
// Non-integer numerical parameters // Non-integer numerical parameters
else if ( ( units == WIZARD_PARAM_UNITS_MM ) || else if( ( units == WIZARD_PARAM_UNITS_MM ) ||
( units == WIZARD_PARAM_UNITS_MILS ) || ( units == WIZARD_PARAM_UNITS_MILS ) ||
( units == WIZARD_PARAM_UNITS_FLOAT ) || ( units == WIZARD_PARAM_UNITS_FLOAT ) ||
( units == WIZARD_PARAM_UNITS_RADIANS ) || ( units == WIZARD_PARAM_UNITS_RADIANS ) ||
( units == WIZARD_PARAM_UNITS_DEGREES ) || ( units == WIZARD_PARAM_UNITS_DEGREES ) ||
( units == WIZARD_PARAM_UNITS_PERCENT ) ) ( units == WIZARD_PARAM_UNITS_PERCENT ) )
{ {
m_parameterGrid->SetCellEditor( i, WIZ_COL_VALUE, new wxGridCellFloatEditor ); m_parameterGrid->SetCellEditor( i, WIZ_COL_VALUE, new wxGridCellFloatEditor );
@ -427,7 +426,6 @@ void FOOTPRINT_WIZARD_FRAME::ReCreateParameterList()
value.Replace( ".", wxNumberFormatter::GetDecimalSeparator() ); value.Replace( ".", wxNumberFormatter::GetDecimalSeparator() );
} }
// Set the 'Units' // Set the 'Units'
m_parameterGrid->SetCellValue( i, WIZ_COL_UNITS, units ); m_parameterGrid->SetCellValue( i, WIZ_COL_UNITS, units );
m_parameterGrid->SetReadOnly( i, WIZ_COL_UNITS ); m_parameterGrid->SetReadOnly( i, WIZ_COL_UNITS );
@ -439,14 +437,13 @@ void FOOTPRINT_WIZARD_FRAME::ReCreateParameterList()
} }
ResizeParamColumns(); ResizeParamColumns();
} }
void FOOTPRINT_WIZARD_FRAME::ResizeParamColumns() void FOOTPRINT_WIZARD_FRAME::ResizeParamColumns()
{ {
// Parameter grid is not yet configured // Parameter grid is not yet configured
if ( ( m_parameterGrid == NULL ) || ( m_parameterGrid->GetNumberCols() == 0 ) ) if( ( m_parameterGrid == NULL ) || ( m_parameterGrid->GetNumberCols() == 0 ) )
return; return;
// first auto-size the columns to ensure enough space around text // first auto-size the columns to ensure enough space around text
@ -458,7 +455,7 @@ void FOOTPRINT_WIZARD_FRAME::ResizeParamColumns()
m_parameterGrid->GetColSize( WIZ_COL_NAME ) - m_parameterGrid->GetColSize( WIZ_COL_NAME ) -
m_parameterGrid->GetColSize( WIZ_COL_UNITS ); m_parameterGrid->GetColSize( WIZ_COL_UNITS );
if ( width > m_parameterGrid->GetColMinimalAcceptableWidth() ) if( width > m_parameterGrid->GetColMinimalAcceptableWidth() )
{ {
m_parameterGrid->SetColSize( WIZ_COL_VALUE, width ); m_parameterGrid->SetColSize( WIZ_COL_VALUE, width );
} }

2
pcbnew/pcbnew.cpp
View File

@ -271,7 +271,7 @@ static bool scriptingSetup()
#endif #endif
if ( !pcbnewInitPythonScripting( TO_UTF8( PyScriptingPath() ) ) ) if( !pcbnewInitPythonScripting( TO_UTF8( PyScriptingPath() ) ) )
{ {
wxLogError( "pcbnewInitPythonScripting() failed." ); wxLogError( "pcbnewInitPythonScripting() failed." );
return false; return false;

24
pcbnew/swig/pcbnew_footprint_wizards.cpp
View File

@ -271,26 +271,26 @@ wxArrayString PYTHON_FOOTPRINT_WIZARD::GetParameterErrors( int aPage )
wxArrayString PYTHON_FOOTPRINT_WIZARD::GetParameterHints( int aPage ) wxArrayString PYTHON_FOOTPRINT_WIZARD::GetParameterHints( int aPage )
{ {
PyLOCK lock; PyLOCK lock;
PyObject* arglist = Py_BuildValue( "(i)", aPage ); PyObject* arglist = Py_BuildValue( "(i)", aPage );
wxArrayString ret = CallRetArrayStrMethod( "GetParameterHints", arglist ); wxArrayString ret = CallRetArrayStrMethod( "GetParameterHints", arglist );
Py_DECREF( arglist ); Py_DECREF( arglist );
return ret; return ret;
} }
wxArrayString PYTHON_FOOTPRINT_WIZARD::GetParameterDesignators( int aPage ) wxArrayString PYTHON_FOOTPRINT_WIZARD::GetParameterDesignators( int aPage )
{ {
PyLOCK lock; PyLOCK lock;
PyObject* arglist = Py_BuildValue( "(i)", aPage ); PyObject* arglist = Py_BuildValue( "(i)", aPage );
wxArrayString ret = CallRetArrayStrMethod( "GetParameterDesignators", arglist ); wxArrayString ret = CallRetArrayStrMethod( "GetParameterDesignators", arglist );
Py_DECREF( arglist ); Py_DECREF( arglist );
return ret; return ret;
} }
wxString PYTHON_FOOTPRINT_WIZARD::SetParameterValues( int aPage, wxArrayString& aValues ) wxString PYTHON_FOOTPRINT_WIZARD::SetParameterValues( int aPage, wxArrayString& aValues )
@ -319,9 +319,9 @@ wxString PYTHON_FOOTPRINT_WIZARD::SetParameterValues( int aPage, wxArrayString&
void PYTHON_FOOTPRINT_WIZARD::ResetParameters() void PYTHON_FOOTPRINT_WIZARD::ResetParameters()
{ {
PyLOCK lock; PyLOCK lock;
CallMethod( "ResetWizard", NULL ); CallMethod( "ResetWizard", NULL );
} }

6
pcbnew/swig/pcbnew_footprint_wizards.h
View File

@ -55,14 +55,14 @@ public:
wxArrayString GetParameterTypes( int aPage ) override; wxArrayString GetParameterTypes( int aPage ) override;
wxArrayString GetParameterValues( int aPage ) override; wxArrayString GetParameterValues( int aPage ) override;
wxArrayString GetParameterErrors( int aPage ) override; wxArrayString GetParameterErrors( int aPage ) override;
// must return an empty string or an error description // must return an empty string or an error description:
wxString SetParameterValues( int aPage, wxArrayString& aValues ) override; wxString SetParameterValues( int aPage, wxArrayString& aValues ) override;
MODULE* GetFootprint( wxString * aMessages ) override; MODULE* GetFootprint( wxString * aMessages ) override;
void* GetObject() override; void* GetObject() override;
wxArrayString GetParameterHints( int aPage ) override; wxArrayString GetParameterHints( int aPage ) override;
wxArrayString GetParameterDesignators( int aPage = 0) override; wxArrayString GetParameterDesignators( int aPage = 0) override;
void ResetParameters() override; void ResetParameters() override;
}; };