Skip to content

Commit

Permalink
Coding style fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@jp-charras
jp-charras committed Jan 3, 2017
1 parent 66ee44c commit 1a464ab
Show file tree
Hide file tree
Showing 6 changed files with 31 additions and 34 deletions.
2 changes: 1 addition & 1 deletion pcbnew/footprint_wizard.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ void FOOTPRINT_WIZARD_FRAME::ParametersUpdated( wxGridEvent& event )

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 )
{
Expand Down
29 changes: 13 additions & 16 deletions pcbnew/footprint_wizard_frame.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Copyright (C) 2012-2015 Miguel Angel Ajo Pelayo <[email protected]>
* Copyright (C) 2012-2015 Jean-Pierre Charras, jp.charras at wanadoo.fr
* Copyright (C) 2008-2015 Wayne Stambaugh <[email protected]>
* 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
* modify it under the terms of the GNU General Public License
Expand Down Expand Up @@ -384,21 +384,20 @@ void FOOTPRINT_WIZARD_FRAME::ReCreateParameterList()
// Set the editor type of the

// Boolean parameters can be displayed using a checkbox
if ( units == WIZARD_PARAM_UNITS_BOOL )
if( units == WIZARD_PARAM_UNITS_BOOL )
{
wxGridCellBoolEditor *boolEditor = new wxGridCellBoolEditor;
boolEditor->UseStringValues("True","False");
m_parameterGrid->SetCellEditor( i, WIZ_COL_VALUE, boolEditor );

m_parameterGrid->SetCellRenderer( i, WIZ_COL_VALUE, new wxGridCellBoolRenderer );
}
// 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, "," );
wxArrayString options;

while ( tokenizer.HasMoreTokens() )
while( tokenizer.HasMoreTokens() )
{
options.Add( tokenizer.GetNextToken() );
}
Expand All @@ -408,17 +407,17 @@ void FOOTPRINT_WIZARD_FRAME::ReCreateParameterList()
units = wxT( "" );
}
// 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 );
}
// Non-integer numerical parameters
else if ( ( units == WIZARD_PARAM_UNITS_MM ) ||
( units == WIZARD_PARAM_UNITS_MILS ) ||
( units == WIZARD_PARAM_UNITS_FLOAT ) ||
( units == WIZARD_PARAM_UNITS_RADIANS ) ||
( units == WIZARD_PARAM_UNITS_DEGREES ) ||
( units == WIZARD_PARAM_UNITS_PERCENT ) )
else if( ( units == WIZARD_PARAM_UNITS_MM ) ||
( units == WIZARD_PARAM_UNITS_MILS ) ||
( units == WIZARD_PARAM_UNITS_FLOAT ) ||
( units == WIZARD_PARAM_UNITS_RADIANS ) ||
( units == WIZARD_PARAM_UNITS_DEGREES ) ||
( units == WIZARD_PARAM_UNITS_PERCENT ) )
{
m_parameterGrid->SetCellEditor( i, WIZ_COL_VALUE, new wxGridCellFloatEditor );

Expand All @@ -427,7 +426,6 @@ void FOOTPRINT_WIZARD_FRAME::ReCreateParameterList()
value.Replace( ".", wxNumberFormatter::GetDecimalSeparator() );
}


// Set the 'Units'
m_parameterGrid->SetCellValue( i, WIZ_COL_UNITS, units );
m_parameterGrid->SetReadOnly( i, WIZ_COL_UNITS );
Expand All @@ -439,14 +437,13 @@ void FOOTPRINT_WIZARD_FRAME::ReCreateParameterList()
}

ResizeParamColumns();

}

void FOOTPRINT_WIZARD_FRAME::ResizeParamColumns()
{

// Parameter grid is not yet configured
if ( ( m_parameterGrid == NULL ) || ( m_parameterGrid->GetNumberCols() == 0 ) )
if( ( m_parameterGrid == NULL ) || ( m_parameterGrid->GetNumberCols() == 0 ) )
return;

// first auto-size the columns to ensure enough space around text
Expand All @@ -458,7 +455,7 @@ void FOOTPRINT_WIZARD_FRAME::ResizeParamColumns()
m_parameterGrid->GetColSize( WIZ_COL_NAME ) -
m_parameterGrid->GetColSize( WIZ_COL_UNITS );

if ( width > m_parameterGrid->GetColMinimalAcceptableWidth() )
if( width > m_parameterGrid->GetColMinimalAcceptableWidth() )
{
m_parameterGrid->SetColSize( WIZ_COL_VALUE, width );
}
Expand Down
2 changes: 1 addition & 1 deletion pcbnew/pcbnew.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ static bool scriptingSetup()

#endif

if ( !pcbnewInitPythonScripting( TO_UTF8( PyScriptingPath() ) ) )
if( !pcbnewInitPythonScripting( TO_UTF8( PyScriptingPath() ) ) )
{
wxLogError( "pcbnewInitPythonScripting() failed." );
return false;
Expand Down
2 changes: 1 addition & 1 deletion pcbnew/python/plugins/FPC_wizard.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ def BuildThisFootprint(self):

# set SMD attribute
self.module.SetAttributes(pcbnew.MOD_CMS)

# vertical segment at left of the pad
xstart = xend
yend = posy - (shl_height + linewidth + margin*2)
Expand Down
24 changes: 12 additions & 12 deletions pcbnew/swig/pcbnew_footprint_wizards.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -271,26 +271,26 @@ wxArrayString PYTHON_FOOTPRINT_WIZARD::GetParameterErrors( int aPage )

wxArrayString PYTHON_FOOTPRINT_WIZARD::GetParameterHints( int aPage )
{
PyLOCK lock;
PyLOCK lock;

PyObject* arglist = Py_BuildValue( "(i)", aPage );
wxArrayString ret = CallRetArrayStrMethod( "GetParameterHints", arglist );
PyObject* arglist = Py_BuildValue( "(i)", aPage );
wxArrayString ret = CallRetArrayStrMethod( "GetParameterHints", arglist );

Py_DECREF( arglist );
Py_DECREF( arglist );

return ret;
return ret;
}

wxArrayString PYTHON_FOOTPRINT_WIZARD::GetParameterDesignators( int aPage )
{
PyLOCK lock;
PyLOCK lock;

PyObject* arglist = Py_BuildValue( "(i)", aPage );
wxArrayString ret = CallRetArrayStrMethod( "GetParameterDesignators", arglist );
PyObject* arglist = Py_BuildValue( "(i)", aPage );
wxArrayString ret = CallRetArrayStrMethod( "GetParameterDesignators", arglist );

Py_DECREF( arglist );
Py_DECREF( arglist );

return ret;
return ret;
}

wxString PYTHON_FOOTPRINT_WIZARD::SetParameterValues( int aPage, wxArrayString& aValues )
Expand Down Expand Up @@ -319,9 +319,9 @@ wxString PYTHON_FOOTPRINT_WIZARD::SetParameterValues( int aPage, wxArrayString&

void PYTHON_FOOTPRINT_WIZARD::ResetParameters()
{
PyLOCK lock;
PyLOCK lock;

CallMethod( "ResetWizard", NULL );
CallMethod( "ResetWizard", NULL );
}


Expand Down
6 changes: 3 additions & 3 deletions pcbnew/swig/pcbnew_footprint_wizards.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,14 @@ class PYTHON_FOOTPRINT_WIZARD : public FOOTPRINT_WIZARD
wxArrayString GetParameterTypes( int aPage ) override;
wxArrayString GetParameterValues( 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;
MODULE* GetFootprint( wxString * aMessages ) override;
void* GetObject() override;
wxArrayString GetParameterHints( int aPage ) override;
wxArrayString GetParameterDesignators( int aPage = 0) override;
wxArrayString GetParameterDesignators( int aPage = 0) override;

void ResetParameters() override;
void ResetParameters() override;
};


Expand Down

0 comments on commit 1a464ab

Please sign in to comment.