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

Follow naming conventions.

This commit is contained in:
Jeff Young 2019-06-09 23:21:53 +01:00
parent 5e49517781
commit a568e70b99
16 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
common/eda_draw_frame.cpp
View File

@ -107,7 +107,7 @@ EDA_DRAW_FRAME::EDA_DRAW_FRAME( KIWAY* aKiway, wxWindow* aParent, FRAME_T aFrame
m_MsgFrameHeight = EDA_MSG_PANEL::GetRequiredHeight(); m_MsgFrameHeight = EDA_MSG_PANEL::GetRequiredHeight();
m_movingCursorWithKeyboard = false; m_movingCursorWithKeyboard = false;
m_zoomLevelCoeff = 1.0; m_zoomLevelCoeff = 1.0;
m_UserUnits = MILLIMETRES; m_userUnits = MILLIMETRES;
m_PolarCoords = false; m_PolarCoords = false;
m_auimgr.SetFlags(wxAUI_MGR_DEFAULT); m_auimgr.SetFlags(wxAUI_MGR_DEFAULT);
@ -339,7 +339,7 @@ void EDA_DRAW_FRAME::DisplayUnitsMsg()
{ {
wxString msg; wxString msg;
switch( m_UserUnits ) switch( m_userUnits )
{ {
case INCHES: msg = _( "Inches" ); break; case INCHES: msg = _( "Inches" ); break;
case MILLIMETRES: msg = _( "mm" ); break; case MILLIMETRES: msg = _( "mm" ); break;
@ -453,7 +453,7 @@ void EDA_DRAW_FRAME::SaveSettings( wxConfigBase* aCfg )
wxString baseCfgName = ConfigBaseName(); wxString baseCfgName = ConfigBaseName();
aCfg->Write( baseCfgName + UserUnitsEntryKeyword, (int) m_UserUnits ); aCfg->Write( baseCfgName + UserUnitsEntryKeyword, (int) m_userUnits );
aCfg->Write( baseCfgName + ShowGridEntryKeyword, IsGridVisible() ); aCfg->Write( baseCfgName + ShowGridEntryKeyword, IsGridVisible() );
aCfg->Write( baseCfgName + LastGridSizeIdKeyword, ( long ) m_LastGridSizeId ); aCfg->Write( baseCfgName + LastGridSizeIdKeyword, ( long ) m_LastGridSizeId );
aCfg->Write( baseCfgName + FirstRunShownKeyword, m_firstRunDialogSetting ); aCfg->Write( baseCfgName + FirstRunShownKeyword, m_firstRunDialogSetting );
@ -497,7 +497,7 @@ void EDA_DRAW_FRAME::SetMsgPanel( EDA_ITEM* aItem )
wxCHECK_RET( aItem, wxT( "Invalid EDA_ITEM pointer. Bad programmer." ) ); wxCHECK_RET( aItem, wxT( "Invalid EDA_ITEM pointer. Bad programmer." ) );
MSG_PANEL_ITEMS items; MSG_PANEL_ITEMS items;
aItem->GetMsgPanelInfo( m_UserUnits, items ); aItem->GetMsgPanelInfo( m_userUnits, items );
SetMsgPanel( items ); SetMsgPanel( items );
} }

2
common/hotkey_store.cpp
View File

@ -39,7 +39,7 @@ wxString HOTKEY_STORE::GetSectionName( TOOL_ACTION* aAction )
{ wxT( "common" ), _( "Common" ) }, { wxT( "common" ), _( "Common" ) },
{ wxT( "kicad" ), _( "Kicad Manager" ) }, { wxT( "kicad" ), _( "Kicad Manager" ) },
{ wxT( "eeschema" ), _( "Eeschema" ) }, { wxT( "eeschema" ), _( "Eeschema" ) },
{ wxT( "pcbnew" ), _( "PcbNew" ) }, { wxT( "pcbnew" ), _( "Pcbnew" ) },
{ wxT( "plEditor" ), _( "Page Layout Editor" ) } { wxT( "plEditor" ), _( "Page Layout Editor" ) }
}; };

2
cvpcb/display_footprints_frame.cpp
View File

@ -439,7 +439,7 @@ void DISPLAY_FOOTPRINTS_FRAME::UpdateMsgPanel()
MSG_PANEL_ITEMS items; MSG_PANEL_ITEMS items;
if( footprint ) if( footprint )
footprint->GetMsgPanelInfo( m_UserUnits, items ); footprint->GetMsgPanelInfo( m_userUnits, items );
SetMsgPanel( items ); SetMsgPanel( items );
} }

4
eeschema/connection_graph.h
View File

@ -158,7 +158,7 @@ public:
SCH_SHEET_PATH m_sheet; SCH_SHEET_PATH m_sheet;
// Needed for m_UserUnits for now; maybe refactor later // Needed for m_userUnits for now; maybe refactor later
SCH_EDIT_FRAME* m_frame; SCH_EDIT_FRAME* m_frame;
/// Cache for driver connection /// Cache for driver connection
@ -283,7 +283,7 @@ private:
std::mutex m_item_mutex; std::mutex m_item_mutex;
// Needed for m_UserUnits for now; maybe refactor later // Needed for m_userUnits for now; maybe refactor later
SCH_EDIT_FRAME* m_frame; SCH_EDIT_FRAME* m_frame;
/** /**

2
eeschema/edit_component_in_schematic.cpp
View File

@ -77,7 +77,7 @@ void SCH_EDIT_FRAME::EditComponentFieldText( SCH_FIELD* aField )
OnModify(); OnModify();
MSG_PANEL_ITEMS items; MSG_PANEL_ITEMS items;
component->GetMsgPanelInfo( m_UserUnits, items ); component->GetMsgPanelInfo( m_userUnits, items );
SetMsgPanel( items ); SetMsgPanel( items );
} }

2
eeschema/eeschema_config.cpp
View File

@ -353,7 +353,7 @@ PARAM_CFG_ARRAY& SCH_EDIT_FRAME::GetConfigurationSettings()
m_configSettings.push_back( new PARAM_CFG_BOOL( true, ShowPageLimitsEntry, m_configSettings.push_back( new PARAM_CFG_BOOL( true, ShowPageLimitsEntry,
&m_showPageLimits, true ) ); &m_showPageLimits, true ) );
m_configSettings.push_back( new PARAM_CFG_INT( true, UnitsEntry, m_configSettings.push_back( new PARAM_CFG_INT( true, UnitsEntry,
(int*)&m_UserUnits, MILLIMETRES ) ); (int*)&m_userUnits, MILLIMETRES ) );
m_configSettings.push_back( new PARAM_CFG_BOOL( true, PrintMonochromeEntry, m_configSettings.push_back( new PARAM_CFG_BOOL( true, PrintMonochromeEntry,
&m_printMonochrome, true ) ); &m_printMonochrome, true ) );

2
eeschema/tools/ee_inspection_tool.cpp
View File

@ -45,7 +45,7 @@
#include <project.h> #include <project.h>
#include <dialogs/dialog_display_info_HTML_base.h> #include <dialogs/dialog_display_info_HTML_base.h>
TOOL_ACTION EE_ACTIONS::runERC( "eeschame.InspectionTool.runERC", TOOL_ACTION EE_ACTIONS::runERC( "eeschema.InspectionTool.runERC",
AS_GLOBAL, 0, "", AS_GLOBAL, 0, "",
_( "Electrical Rules &Checker" ), _( "Perform electrical rules check" ), _( "Electrical Rules &Checker" ), _( "Perform electrical rules check" ),
erc_xpm ); erc_xpm );

18
eeschema/tools/lib_drawing_tools.cpp
View File

@ -46,43 +46,43 @@
#include <lib_rectangle.h> #include <lib_rectangle.h>
// Drawing tool actions // Drawing tool actions
TOOL_ACTION EE_ACTIONS::placeSymbolPin( "libedit.InteractiveDrawing.placeSymbolPin", TOOL_ACTION EE_ACTIONS::placeSymbolPin( "eeschema.SymbolDrawing.placeSymbolPin",
AS_GLOBAL, AS_GLOBAL,
'P', LEGACY_HK_NAME( "Create Pin" ), 'P', LEGACY_HK_NAME( "Create Pin" ),
_( "Add Pin" ), _( "Add a pin" ), _( "Add Pin" ), _( "Add a pin" ),
pin_xpm, AF_ACTIVATE ); pin_xpm, AF_ACTIVATE );
TOOL_ACTION EE_ACTIONS::placeSymbolText( "libedit.InteractiveDrawing.placeSymbolText", TOOL_ACTION EE_ACTIONS::placeSymbolText( "eeschema.SymbolDrawing.placeSymbolText",
AS_GLOBAL, 0, "", AS_GLOBAL, 0, "",
_( "Add Text" ), _( "Add a text item" ), _( "Add Text" ), _( "Add a text item" ),
text_xpm, AF_ACTIVATE ); text_xpm, AF_ACTIVATE );
TOOL_ACTION EE_ACTIONS::drawSymbolRectangle( "libedit.InteractiveDrawing.drawSymbolRectangle", TOOL_ACTION EE_ACTIONS::drawSymbolRectangle( "eeschema.SymbolDrawing.drawSymbolRectangle",
AS_GLOBAL, 0, "", AS_GLOBAL, 0, "",
_( "Add Rectangle" ), _( "Add a rectangle" ), _( "Add Rectangle" ), _( "Add a rectangle" ),
add_rectangle_xpm, AF_ACTIVATE ); add_rectangle_xpm, AF_ACTIVATE );
TOOL_ACTION EE_ACTIONS::drawSymbolCircle( "libedit.InteractiveDrawing.drawSymbolCircle", TOOL_ACTION EE_ACTIONS::drawSymbolCircle( "eeschema.SymbolDrawing.drawSymbolCircle",
AS_GLOBAL, 0, "", AS_GLOBAL, 0, "",
_( "Add Circle" ), _( "Add a circle" ), _( "Add Circle" ), _( "Add a circle" ),
add_circle_xpm, AF_ACTIVATE ); add_circle_xpm, AF_ACTIVATE );
TOOL_ACTION EE_ACTIONS::drawSymbolArc( "libedit.InteractiveDrawing.drawSymbolArc", TOOL_ACTION EE_ACTIONS::drawSymbolArc( "eeschema.SymbolDrawing.drawSymbolArc",
AS_GLOBAL, 0, "", AS_GLOBAL, 0, "",
_( "Add Arc" ), _( "Add an arc" ), _( "Add Arc" ), _( "Add an arc" ),
add_arc_xpm, AF_ACTIVATE ); add_arc_xpm, AF_ACTIVATE );
TOOL_ACTION EE_ACTIONS::drawSymbolLines( "libedit.InteractiveDrawing.drawSymbolLines", TOOL_ACTION EE_ACTIONS::drawSymbolLines( "eeschema.SymbolDrawing.drawSymbolLines",
AS_GLOBAL, 0, "", AS_GLOBAL, 0, "",
_( "Add Lines" ), _( "Add connected graphic lines" ), _( "Add Lines" ), _( "Add connected graphic lines" ),
add_graphical_segments_xpm, AF_ACTIVATE ); add_graphical_segments_xpm, AF_ACTIVATE );
TOOL_ACTION EE_ACTIONS::placeSymbolAnchor( "libedit.InteractiveDrawing.placeSymbolAnchor", TOOL_ACTION EE_ACTIONS::placeSymbolAnchor( "eeschema.SymbolDrawing.placeSymbolAnchor",
AS_GLOBAL, 0, "", AS_GLOBAL, 0, "",
_( "Move Symbol Anchor" ), _( "Specify a new location for the symbol anchor" ), _( "Move Symbol Anchor" ), _( "Specify a new location for the symbol anchor" ),
anchor_xpm, AF_ACTIVATE ); anchor_xpm, AF_ACTIVATE );
TOOL_ACTION EE_ACTIONS::finishDrawing( "libedit.InteractiveDrawing.finishDrawing", TOOL_ACTION EE_ACTIONS::finishDrawing( "eeschema.SymbolDrawing.finishDrawing",
AS_GLOBAL, 0, "", AS_GLOBAL, 0, "",
_( "Finish Drawing" ), _( "Finish drawing shape" ), _( "Finish Drawing" ), _( "Finish drawing shape" ),
checked_ok_xpm, AF_NONE ); checked_ok_xpm, AF_NONE );
@ -92,7 +92,7 @@ static void* g_lastPinWeakPtr;
LIB_DRAWING_TOOLS::LIB_DRAWING_TOOLS() : LIB_DRAWING_TOOLS::LIB_DRAWING_TOOLS() :
EE_TOOL_BASE<LIB_EDIT_FRAME>( "libedit.InteractiveDrawing" ) EE_TOOL_BASE<LIB_EDIT_FRAME>( "eeschema.SymbolDrawing" )
{ {
} }

4
eeschema/tools/lib_edit_tool.cpp
View File

@ -44,7 +44,7 @@
LIB_EDIT_TOOL::LIB_EDIT_TOOL() : LIB_EDIT_TOOL::LIB_EDIT_TOOL() :
EE_TOOL_BASE( "libedit.InteractiveEdit" ) EE_TOOL_BASE( "eeschema.SymbolEditTool" )
{ {
} }
@ -61,7 +61,7 @@ bool LIB_EDIT_TOOL::Init()
LIB_DRAWING_TOOLS* drawingTools = m_toolMgr->GetTool<LIB_DRAWING_TOOLS>(); LIB_DRAWING_TOOLS* drawingTools = m_toolMgr->GetTool<LIB_DRAWING_TOOLS>();
LIB_MOVE_TOOL* moveTool = m_toolMgr->GetTool<LIB_MOVE_TOOL>(); LIB_MOVE_TOOL* moveTool = m_toolMgr->GetTool<LIB_MOVE_TOOL>();
wxASSERT_MSG( drawingTools, "libedit.InteractiveDrawing tool is not available" ); wxASSERT_MSG( drawingTools, "eeschema.SymbolDrawing tool is not available" );
// //
// Add edit actions to the move tool menu // Add edit actions to the move tool menu

2
eeschema/tools/lib_move_tool.cpp
View File

@ -34,7 +34,7 @@
LIB_MOVE_TOOL::LIB_MOVE_TOOL() : LIB_MOVE_TOOL::LIB_MOVE_TOOL() :
EE_TOOL_BASE( "libedit.InteractiveMove" ), EE_TOOL_BASE( "eeschema.SymbolMoveTool" ),
m_moveInProgress( false ), m_moveInProgress( false ),
m_moveOffset( 0, 0 ) m_moveOffset( 0, 0 )
{ {

6
eeschema/tools/lib_pin_tool.cpp
View File

@ -33,17 +33,17 @@
#include "lib_pin_tool.h" #include "lib_pin_tool.h"
TOOL_ACTION EE_ACTIONS::pushPinLength( "libedit.PinEditing.pushPinLength", TOOL_ACTION EE_ACTIONS::pushPinLength( "eeschema.PinEditing.pushPinLength",
AS_GLOBAL, 0, "", AS_GLOBAL, 0, "",
_( "Push Pin Length" ), _( "Copy pin length to other pins in symbol" ), _( "Push Pin Length" ), _( "Copy pin length to other pins in symbol" ),
pin_size_to_xpm ); pin_size_to_xpm );
TOOL_ACTION EE_ACTIONS::pushPinNameSize( "libedit.PinEditing.pushPinNameSize", TOOL_ACTION EE_ACTIONS::pushPinNameSize( "eeschema.PinEditing.pushPinNameSize",
AS_GLOBAL, 0, "", AS_GLOBAL, 0, "",
_( "Push Pin Name Size" ), _( "Copy pin name size to other pins in symbol" ), _( "Push Pin Name Size" ), _( "Copy pin name size to other pins in symbol" ),
pin_size_to_xpm ); pin_size_to_xpm );
TOOL_ACTION EE_ACTIONS::pushPinNumSize( "libedit.PinEditing.pushPinNumSize", TOOL_ACTION EE_ACTIONS::pushPinNumSize( "eeschema.PinEditing.pushPinNumSize",
AS_GLOBAL, 0, "", AS_GLOBAL, 0, "",
_( "Push Pin Number Size" ), _( "Copy pin number size to other pins in symbol" ), _( "Push Pin Number Size" ), _( "Copy pin number size to other pins in symbol" ),
pin_size_to_xpm ); pin_size_to_xpm );

2
gerbview/locate.cpp
View File

@ -99,7 +99,7 @@ GERBER_DRAW_ITEM* GERBVIEW_FRAME::Locate( const wxPoint& aPosition, int aTypeloc
if( gerb_item ) if( gerb_item )
{ {
MSG_PANEL_ITEMS items; MSG_PANEL_ITEMS items;
gerb_item->GetMsgPanelInfo( m_UserUnits, items ); gerb_item->GetMsgPanelInfo( m_userUnits, items );
SetMsgPanel( items ); SetMsgPanel( items );
} }

6
include/eda_base_frame.h
View File

@ -134,7 +134,7 @@ protected:
wxString m_mruPath; // Most recently used path. wxString m_mruPath; // Most recently used path.
EDA_UNITS_T m_UserUnits; EDA_UNITS_T m_userUnits;
///> Default style flags used for wxAUI toolbars ///> Default style flags used for wxAUI toolbars
static constexpr int KICAD_AUI_TB_STYLE = wxAUI_TB_DEFAULT_STYLE | wxAUI_TB_PLAIN_BACKGROUND; static constexpr int KICAD_AUI_TB_STYLE = wxAUI_TB_DEFAULT_STYLE | wxAUI_TB_PLAIN_BACKGROUND;
@ -194,8 +194,8 @@ public:
/** /**
* Return the user units currently in use. * Return the user units currently in use.
*/ */
EDA_UNITS_T GetUserUnits() const { return m_UserUnits; } EDA_UNITS_T GetUserUnits() const { return m_userUnits; }
void SetUserUnits( EDA_UNITS_T aUnits ) { m_UserUnits = aUnits; } void SetUserUnits( EDA_UNITS_T aUnits ) { m_userUnits = aUnits; }
void ChangeUserUnits( EDA_UNITS_T aUnits ) void ChangeUserUnits( EDA_UNITS_T aUnits )
{ {

2
pagelayout_editor/pl_editor_frame.cpp
View File

@ -75,7 +75,7 @@ PL_EDITOR_FRAME::PL_EDITOR_FRAME( KIWAY* aKiway, wxWindow* aParent ) :
wxDefaultPosition, wxDefaultSize, wxDefaultPosition, wxDefaultSize,
KICAD_DEFAULT_DRAWFRAME_STYLE, PL_EDITOR_FRAME_NAME ) KICAD_DEFAULT_DRAWFRAME_STYLE, PL_EDITOR_FRAME_NAME )
{ {
m_UserUnits = MILLIMETRES; m_userUnits = MILLIMETRES;
m_zoomLevelCoeff = 290.0; // Adjusted to roughly displays zoom level = 1 m_zoomLevelCoeff = 290.0; // Adjusted to roughly displays zoom level = 1
// when the screen shows a 1:1 image // when the screen shows a 1:1 image
// obviously depends on the monitor, // obviously depends on the monitor,

2
pcbnew/footprint_wizard_frame.cpp
View File

@ -320,7 +320,7 @@ void FOOTPRINT_WIZARD_FRAME::UpdateMsgPanel()
{ {
MSG_PANEL_ITEMS items; MSG_PANEL_ITEMS items;
footprint->GetMsgPanelInfo( m_UserUnits, items ); footprint->GetMsgPanelInfo( m_userUnits, items );
SetMsgPanel( items ); SetMsgPanel( items );
} }
else else

6
pcbnew/pcb_base_frame.cpp
View File

@ -741,9 +741,9 @@ void PCB_BASE_FRAME::SaveSettings( wxConfigBase* aCfg )
wxString baseCfgName = GetName(); wxString baseCfgName = GetName();
aCfg->Write( baseCfgName + UserGridSizeXEntry, To_User_Unit( m_UserUnits, m_UserGridSize.x ) ); aCfg->Write( baseCfgName + UserGridSizeXEntry, To_User_Unit( m_userUnits, m_UserGridSize.x ) );
aCfg->Write( baseCfgName + UserGridSizeYEntry, To_User_Unit( m_UserUnits, m_UserGridSize.y ) ); aCfg->Write( baseCfgName + UserGridSizeYEntry, To_User_Unit( m_userUnits, m_UserGridSize.y ) );
aCfg->Write( baseCfgName + UserGridUnitsEntry, ( long )m_UserUnits ); aCfg->Write( baseCfgName + UserGridUnitsEntry, ( long )m_userUnits );
aCfg->Write( baseCfgName + DisplayPadFillEntry, m_DisplayOptions.m_DisplayPadFill ); aCfg->Write( baseCfgName + DisplayPadFillEntry, m_DisplayOptions.m_DisplayPadFill );
aCfg->Write( baseCfgName + DisplayViaFillEntry, m_DisplayOptions.m_DisplayViaFill ); aCfg->Write( baseCfgName + DisplayViaFillEntry, m_DisplayOptions.m_DisplayViaFill );
aCfg->Write( baseCfgName + DisplayPadNumberEntry, m_DisplayOptions.m_DisplayPadNum ); aCfg->Write( baseCfgName + DisplayPadNumberEntry, m_DisplayOptions.m_DisplayPadNum );