realAscot/kicad-source
1
0
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-09-14 02:03:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Formatting & naming conventions.

Browse Source
This commit is contained in:
Jeff Young 2025-05-29 10:12:15 +01:00
parent 9601db4c97
commit 7679d6d96d
9 changed files with 46 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
eeschema/CMakeLists.txt
View File

@ -280,8 +280,8 @@ set( EESCHEMA_WIDGETS
widgets/panel_sch_selection_filter_base.cpp
widgets/panel_sch_selection_filter.cpp
widgets/panel_symbol_chooser.cpp
widgets/pin_shape_combobox.cpp
widgets/pin_type_combobox.cpp
widgets/pinshape_combobox.cpp
widgets/pintype_combobox.cpp
widgets/symbol_diff_widget.cpp
widgets/sch_design_block_pane.cpp
widgets/sch_design_block_preview_widget.cpp

4
eeschema/dialogs/dialog_pin_properties.h
View File

@ -28,8 +28,8 @@
#include <wx/bmpcbox.h>
#include <wx/dcclient.h>
#include <pin_shape_combobox.h>
#include <pin_type_combobox.h>
#include <pinshape_combobox.h>
#include <pintype_combobox.h>
#include <dialog_pin_properties_base.h>
#include <widgets/unit_binder.h>

8
eeschema/dialogs/dialog_pin_properties_base.cpp
View File

@ -5,8 +5,8 @@
// PLEASE DO *NOT* EDIT THIS FILE!
///////////////////////////////////////////////////////////////////////////
#include "pin_shape_combobox.h"
#include "pin_type_combobox.h"
#include "pinshape_combobox.h"
#include "pintype_combobox.h"
#include "widgets/std_bitmap_button.h"
#include "widgets/wx_grid.h"
#include "widgets/wx_infobar.h"
@ -100,14 +100,14 @@ DIALOG_PIN_PROPERTIES_BASE::DIALOG_PIN_PROPERTIES_BASE( wxWindow* parent, wxWind
gbSizer1->Add( m_staticTextEType, wxGBPosition( 2, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 );
m_choiceElectricalType = new PinTypeComboBox( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_DROPDOWN|wxCB_READONLY );
m_choiceElectricalType = new PINTYPE_COMBOBOX( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_DROPDOWN|wxCB_READONLY );
gbSizer1->Add( m_choiceElectricalType, wxGBPosition( 2, 1 ), wxGBSpan( 1, 2 ), wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
m_staticTextGstyle = new wxStaticText( this, wxID_ANY, _("Graphic style:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextGstyle->Wrap( -1 );
gbSizer1->Add( m_staticTextGstyle, wxGBPosition( 3, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 );
m_choiceStyle = new PinShapeComboBox( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_DROPDOWN|wxCB_READONLY );
m_choiceStyle = new PINSHAPE_COMBOBOX( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, wxCB_DROPDOWN|wxCB_READONLY );
gbSizer1->Add( m_choiceStyle, wxGBPosition( 3, 1 ), wxGBSpan( 1, 2 ), wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
m_staticTextOrient = new wxStaticText( this, wxID_ANY, _("Orientation:"), wxDefaultPosition, wxDefaultSize, 0 );

4
eeschema/dialogs/dialog_pin_properties_base.fbp
View File

@ -1217,7 +1217,7 @@
<property name="show">1</property>
<property name="size"></property>
<property name="style">wxCB_DROPDOWN|wxCB_READONLY</property>
<property name="subclass">PinTypeComboBox; pin_type_combobox.h</property>
<property name="subclass">PINTYPE_COMBOBOX; pintype_combobox.h; forward_declare</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
@ -1352,7 +1352,7 @@
<property name="show">1</property>
<property name="size"></property>
<property name="style">wxCB_DROPDOWN|wxCB_READONLY</property>
<property name="subclass">PinShapeComboBox; pin_shape_combobox.h</property>
<property name="subclass">PINSHAPE_COMBOBOX; pinshape_combobox.h; forward_declare</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>

8
eeschema/dialogs/dialog_pin_properties_base.h
View File

@ -10,8 +10,8 @@
#include <wx/artprov.h>
#include <wx/xrc/xmlres.h>
#include <wx/intl.h>
class PinShapeComboBox;
class PinTypeComboBox;
class PINSHAPE_COMBOBOX;
class PINTYPE_COMBOBOX;
class STD_BITMAP_BUTTON;
class WX_GRID;
class WX_INFOBAR;
@ -66,9 +66,9 @@ class DIALOG_PIN_PROPERTIES_BASE : public DIALOG_SHIM
wxStaticText* m_numberSizeLabel;
wxTextCtrl* m_numberSizeCtrl;
wxStaticText* m_staticTextEType;
PinTypeComboBox* m_choiceElectricalType;
PINTYPE_COMBOBOX* m_choiceElectricalType;
wxStaticText* m_staticTextGstyle;
PinShapeComboBox* m_choiceStyle;
PINSHAPE_COMBOBOX* m_choiceStyle;
wxStaticText* m_staticTextOrient;
wxBitmapComboBox* m_choiceOrientation;
wxStaticText* m_posXUnits;

27
eeschema/widgets/pin_shape_combobox.cpp → eeschema/widgets/pinshape_combobox.cpp
View File

@ -22,27 +22,16 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
/**
* @file pin_shape_combobox.cpp
* @brief ComboBox widget for pin shape
*/
#include "pin_shape_combobox.h"
#include "pinshape_combobox.h"
#include <bitmaps.h>
#include <sch_pin.h>
PinShapeComboBox::PinShapeComboBox( wxWindow* parent,
wxWindowID id,
const wxString& value,
const wxPoint& pos,
const wxSize& size,
int n,
const wxString choices[],
long style,
const wxValidator& validator,
const wxString& name ) :
wxBitmapComboBox( parent, id, value, pos, size, n, choices, style, validator, name )
PINSHAPE_COMBOBOX::PINSHAPE_COMBOBOX( wxWindow* parent, wxWindowID id, const wxString& value,
const wxPoint& pos, const wxSize& size, int n,
const wxString choices[], long style,
const wxValidator& validator, const wxString& name ) :
wxBitmapComboBox( parent, id, value, pos, size, n, choices, style, validator, name )
{
for( unsigned ii = 0; ii < GRAPHIC_PINSHAPES_TOTAL; ++ii )
{
@ -59,13 +48,13 @@ PinShapeComboBox::PinShapeComboBox( wxWindow* parent,
}
GRAPHIC_PINSHAPE PinShapeComboBox::GetPinShapeSelection()
GRAPHIC_PINSHAPE PINSHAPE_COMBOBOX::GetPinShapeSelection()
{
return static_cast<GRAPHIC_PINSHAPE>( GetSelection() );
}
void PinShapeComboBox::SetSelection( GRAPHIC_PINSHAPE aShape )
void PINSHAPE_COMBOBOX::SetSelection( GRAPHIC_PINSHAPE aShape )
{
wxBitmapComboBox::SetSelection( static_cast<int>( aShape ) );
}

29
eeschema/widgets/pin_type_combobox.h → eeschema/widgets/pinshape_combobox.h
View File

@ -22,33 +22,20 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
/**
* @file pin_type_combobox.h
* @brief ComboBox widget for pin type
*/
#include <wx/bmpcbox.h>
#include <pin_type.h>
class PinTypeComboBox : public wxBitmapComboBox
class PINSHAPE_COMBOBOX : public wxBitmapComboBox
{
public:
/// @todo C++11: replace with forwarder
PINSHAPE_COMBOBOX( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& value = wxEmptyString,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
int n = 0, const wxString choices[] = nullptr, long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxBitmapComboBoxNameStr );
PinTypeComboBox( wxWindow* parent,
wxWindowID id = wxID_ANY,
const wxString& value = wxEmptyString,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
int n = 0,
const wxString choices[] = nullptr,
long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxBitmapComboBoxNameStr );
ELECTRICAL_PINTYPE GetPinTypeSelection();
void SetSelection( ELECTRICAL_PINTYPE aType );
GRAPHIC_PINSHAPE GetPinShapeSelection();
void SetSelection( GRAPHIC_PINSHAPE aShape );
private:
// fixes hidden overloaded virtual function warnings

27
eeschema/widgets/pin_type_combobox.cpp → eeschema/widgets/pintype_combobox.cpp
View File

@ -22,27 +22,16 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
/**
* @file pin_type_combobox.cpp
* @brief ComboBox widget for pin type
*/
#include "pin_type_combobox.h"
#include "pintype_combobox.h"
#include <bitmaps.h>
#include <sch_pin.h>
PinTypeComboBox::PinTypeComboBox( wxWindow* parent,
wxWindowID id,
const wxString& value,
const wxPoint& pos,
const wxSize& size,
int n,
const wxString choices[],
long style,
const wxValidator& validator,
const wxString& name ) :
wxBitmapComboBox( parent, id, value, pos, size, n, choices, style, validator, name )
PINTYPE_COMBOBOX::PINTYPE_COMBOBOX( wxWindow* parent, wxWindowID id, const wxString& value,
const wxPoint& pos, const wxSize& size, int n,
const wxString choices[], long style,
const wxValidator& validator, const wxString& name ) :
wxBitmapComboBox( parent, id, value, pos, size, n, choices, style, validator, name )
{
for( unsigned ii = 0; ii < ELECTRICAL_PINTYPES_TOTAL; ++ii )
{
@ -59,13 +48,13 @@ PinTypeComboBox::PinTypeComboBox( wxWindow* parent,
}
ELECTRICAL_PINTYPE PinTypeComboBox::GetPinTypeSelection()
ELECTRICAL_PINTYPE PINTYPE_COMBOBOX::GetPinTypeSelection()
{
return static_cast<ELECTRICAL_PINTYPE>( GetSelection() );
}
void PinTypeComboBox::SetSelection( ELECTRICAL_PINTYPE aType )
void PINTYPE_COMBOBOX::SetSelection( ELECTRICAL_PINTYPE aType )
{
wxBitmapComboBox::SetSelection( static_cast<int>( aType ) );
}

26
eeschema/widgets/pin_shape_combobox.h → eeschema/widgets/pintype_combobox.h
View File

@ -22,32 +22,22 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
/**
* @file pin_shape_combobox.h
* @brief ComboBox widget for pin shape
*/
#include <wx/bmpcbox.h>
#include <pin_type.h>
class PinShapeComboBox : public wxBitmapComboBox
class PINTYPE_COMBOBOX : public wxBitmapComboBox
{
public:
/// @todo C++11: replace with forwarder
PinShapeComboBox( wxWindow* parent,
wxWindowID id = wxID_ANY,
const wxString& value = wxEmptyString,
const wxPoint& pos = wxDefaultPosition,
const wxSize& size = wxDefaultSize,
int n = 0,
const wxString choices[] = nullptr,
long style = 0,
PINTYPE_COMBOBOX( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& value = wxEmptyString,
const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
int n = 0, const wxString choices[] = nullptr, long style = 0,
const wxValidator& validator = wxDefaultValidator,
const wxString& name = wxBitmapComboBoxNameStr );
GRAPHIC_PINSHAPE GetPinShapeSelection();
void SetSelection( GRAPHIC_PINSHAPE aShape );
ELECTRICAL_PINTYPE GetPinTypeSelection();
void SetSelection( ELECTRICAL_PINTYPE aType );
private:
// fixes hidden overloaded virtual function warnings