Mirrors
/
kicad
mirror of https://github.com/KiCad/kicad-source-mirror
3
0
Fork 0
Code Releases Activity
Browse Source

Exorcise some instances of "modedit".

6.0.7
Jeff Young 5 years ago
parent
b9cc9b0f74
commit
dff5173baf
22 changed files with 98 additions and 98 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      bitmap2component/bitmap2component.cpp
  2. 2
      eeschema/symbol_editor/symbol_edit_frame.cpp
  3. 6
      pcbnew/CMakeLists.txt
  4. 6
      pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.h
  5. 2
      pcbnew/dialogs/dialog_graphic_item_properties.cpp
  6. 14
      pcbnew/dialogs/panel_fp_editor_color_settings.cpp
  7. 20
      pcbnew/dialogs/panel_fp_editor_color_settings.h
  8. 27
      pcbnew/dialogs/panel_fp_editor_defaults.cpp
  9. 16
      pcbnew/dialogs/panel_fp_editor_defaults.h
  10. 18
      pcbnew/dialogs/panel_fp_editor_defaults_base.cpp
  11. 6
      pcbnew/dialogs/panel_fp_editor_defaults_base.fbp
  12. 8
      pcbnew/dialogs/panel_fp_editor_defaults_base.h
  13. 18
      pcbnew/footprint_edit_frame.cpp
  14. 2
      pcbnew/footprint_edit_frame.h
  15. 2
      pcbnew/fp_shape.cpp
  16. 5
      pcbnew/fp_text.cpp
  17. 4
      pcbnew/kicad_clipboard.cpp
  18. 2
      pcbnew/kicad_clipboard.h
  19. 4
      pcbnew/load_select_footprint.cpp
  20. 12
      pcbnew/pcb_edit_frame.cpp
  21. 2
      pcbnew/plugins/legacy/legacy_plugin.cpp
  22. 18
      pcbnew/tools/selection_tool.cpp

2
bitmap2component/bitmap2component.cpp
View File

@ -144,7 +144,7 @@ int BITMAPCONV_INFO::ConvertBitmap( potrace_bitmap_t* aPotrace_bitmap,
case PCBNEW_KICAD_MOD:
m_Format = PCBNEW_KICAD_MOD;
m_ScaleX = MM2NANOMETER * 25.4 / aDpi_X; // the conversion scale from PPI to UI
m_ScaleY = MM2NANOMETER * 25.4 / aDpi_Y; // Y axis is top to bottom in modedit
m_ScaleY = MM2NANOMETER * 25.4 / aDpi_Y; // Y axis is top to bottom in Footprint Editor
createOutputData( aModLayer );
break;

2
eeschema/symbol_editor/symbol_edit_frame.cpp
View File

@ -106,7 +106,7 @@ SYMBOL_EDIT_FRAME::SYMBOL_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent ) :
m_libMgr = nullptr;
m_unit = 1;
m_convert = 1;
m_AboutTitle = "LibEdit";
m_AboutTitle = _( "Symbol Editor" );
wxIcon icon;
icon.CopyFromBitmap( KiBitmap( icon_libedit_xpm ) );

6
pcbnew/CMakeLists.txt
View File

@ -151,9 +151,9 @@ set( PCBNEW_DIALOGS
dialogs/panel_edit_options_base.cpp
dialogs/panel_fp_lib_table.cpp
dialogs/panel_fp_lib_table_base.cpp
dialogs/panel_modedit_color_settings.cpp
dialogs/panel_modedit_defaults.cpp
dialogs/panel_modedit_defaults_base.cpp
dialogs/panel_fp_editor_color_settings.cpp
dialogs/panel_fp_editor_defaults.cpp
dialogs/panel_fp_editor_defaults_base.cpp
dialogs/panel_pcbnew_color_settings.cpp
dialogs/panel_pcbnew_display_origin.cpp
dialogs/panel_pcbnew_display_origin_base.cpp

6
pcbnew/dialogs/dialog_edit_footprint_for_fp_editor.h
View File

@ -22,8 +22,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef DIALOG_EDIT_FOOTPRINT_FOR_MODEDIT_H
#define DIALOG_EDIT_FOOTPRINT_FOR_MODEDIT_H
#ifndef DIALOG_EDIT_FOOTPRINT_FOR_FP_EDITOR_H
#define DIALOG_EDIT_FOOTPRINT_FOR_FP_EDITOR_H
#include <vector>
#include <text_mod_grid_table.h>
@ -96,4 +96,4 @@ private:
};
#endif // DIALOG_EDIT_FOOTPRINT_FOR_MODEDIT_H
#endif // DIALOG_EDIT_FOOTPRINT_FOR_FP_EDITOR_H

2
pcbnew/dialogs/dialog_graphic_item_properties.cpp
View File

@ -23,7 +23,7 @@
*/
/*
* Edit properties of Lines, Circles, Arcs and Polygons for PCBNew and ModEdit
* Edit properties of Lines, Circles, Arcs and Polygons for PCBNew and Footprint Editor
*/
#include <pcb_base_edit_frame.h>

14
pcbnew/dialogs/panel_modedit_color_settings.cpp → pcbnew/dialogs/panel_fp_editor_color_settings.cpp
View File

@ -25,13 +25,13 @@
#include <footprint_editor_settings.h>
#include <gal/gal_display_options.h>
#include <layers_id_colors_and_visibility.h>
#include <panel_modedit_color_settings.h>
#include <panel_fp_editor_color_settings.h>
#include <pgm_base.h>
#include <settings/settings_manager.h>
PANEL_MODEDIT_COLOR_SETTINGS::PANEL_MODEDIT_COLOR_SETTINGS( FOOTPRINT_EDIT_FRAME* aFrame,
wxWindow* aParent )
PANEL_FP_EDITOR_COLOR_SETTINGS::PANEL_FP_EDITOR_COLOR_SETTINGS( FOOTPRINT_EDIT_FRAME* aFrame,
wxWindow* aParent )
: PANEL_COLOR_SETTINGS( aParent ),
m_frame( aFrame ),
m_page( nullptr ),
@ -82,7 +82,7 @@ PANEL_MODEDIT_COLOR_SETTINGS::PANEL_MODEDIT_COLOR_SETTINGS( FOOTPRINT_EDIT_FRAME
}
PANEL_MODEDIT_COLOR_SETTINGS::~PANEL_MODEDIT_COLOR_SETTINGS()
PANEL_FP_EDITOR_COLOR_SETTINGS::~PANEL_FP_EDITOR_COLOR_SETTINGS()
{
delete m_currentSettings;
delete m_page;
@ -90,7 +90,7 @@ PANEL_MODEDIT_COLOR_SETTINGS::~PANEL_MODEDIT_COLOR_SETTINGS()
}
bool PANEL_MODEDIT_COLOR_SETTINGS::TransferDataFromWindow()
bool PANEL_FP_EDITOR_COLOR_SETTINGS::TransferDataFromWindow()
{
SETTINGS_MANAGER& settingsMgr = Pgm().GetSettingsManager();
FOOTPRINT_EDITOR_SETTINGS* settings = settingsMgr.GetAppSettings<FOOTPRINT_EDITOR_SETTINGS>();
@ -100,13 +100,13 @@ bool PANEL_MODEDIT_COLOR_SETTINGS::TransferDataFromWindow()
}
bool PANEL_MODEDIT_COLOR_SETTINGS::TransferDataToWindow()
bool PANEL_FP_EDITOR_COLOR_SETTINGS::TransferDataToWindow()
{
return true;
}
void PANEL_MODEDIT_COLOR_SETTINGS::createSwatches()
void PANEL_FP_EDITOR_COLOR_SETTINGS::createSwatches()
{
std::vector<GAL_LAYER_ID> galLayers;

20
pcbnew/dialogs/panel_modedit_color_settings.h → pcbnew/dialogs/panel_fp_editor_color_settings.h
View File

@ -18,8 +18,8 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef PANEL_MODEDIT_COLOR_SETTINGS_H_
#define PANEL_MODEDIT_COLOR_SETTINGS_H_
#ifndef PANEL_FP_EDITOR_COLOR_SETTINGS_H
#define PANEL_FP_EDITOR_COLOR_SETTINGS_H
#include <gal/color4d.h>
#include <layers_id_colors_and_visibility.h>
@ -35,12 +35,12 @@ namespace KIGFX
class WS_PROXY_VIEW_ITEM;
}
class PANEL_MODEDIT_COLOR_SETTINGS : public PANEL_COLOR_SETTINGS
class PANEL_FP_EDITOR_COLOR_SETTINGS : public PANEL_COLOR_SETTINGS
{
public:
PANEL_MODEDIT_COLOR_SETTINGS( FOOTPRINT_EDIT_FRAME* aFrame, wxWindow* aParent );
PANEL_FP_EDITOR_COLOR_SETTINGS( FOOTPRINT_EDIT_FRAME* aFrame, wxWindow* aParent );
~PANEL_MODEDIT_COLOR_SETTINGS() override;
~PANEL_FP_EDITOR_COLOR_SETTINGS() override;
protected:
bool TransferDataFromWindow() override;
@ -55,14 +55,12 @@ protected:
};
private:
FOOTPRINT_EDIT_FRAME* m_frame;
PAGE_INFO* m_page;
TITLE_BLOCK* m_titleBlock;
FOOTPRINT_EDIT_FRAME* m_frame;
PAGE_INFO* m_page;
TITLE_BLOCK* m_titleBlock;
void createSwatches();
};
#endif
#endif // PANEL_FP_EDITOR_COLOR_SETTINGS_H

27
pcbnew/dialogs/panel_modedit_defaults.cpp → pcbnew/dialogs/panel_fp_editor_defaults.cpp
View File

@ -27,7 +27,7 @@
#include <widgets/wx_grid.h>
#include <grid_tricks.h>
#include <panel_modedit_defaults.h>
#include <panel_fp_editor_defaults.h>
#include <grid_layer_box_helpers.h>
#include <bitmaps.h>
@ -167,11 +167,12 @@ enum
};
PANEL_MODEDIT_DEFAULTS::PANEL_MODEDIT_DEFAULTS( FOOTPRINT_EDIT_FRAME* aFrame, PAGED_DIALOG* aParent) :
PANEL_MODEDIT_DEFAULTS_BASE( aParent->GetTreebook() ),
PANEL_FP_EDITOR_DEFAULTS::PANEL_FP_EDITOR_DEFAULTS( FOOTPRINT_EDIT_FRAME* aFrame,
PAGED_DIALOG* aParent) :
PANEL_FP_EDITOR_DEFAULTS_BASE( aParent->GetTreebook() ),
m_brdSettings( aFrame->GetDesignSettings() ),
m_frame( aFrame ),
m_Parent( aParent )
m_parent( aParent )
{
m_textItemsGrid->SetDefaultRowSize( m_textItemsGrid->GetDefaultRowSize() + 4 );
m_layerClassesGrid->SetDefaultRowSize( m_layerClassesGrid->GetDefaultRowSize() + 4 );
@ -201,14 +202,14 @@ PANEL_MODEDIT_DEFAULTS::PANEL_MODEDIT_DEFAULTS( FOOTPRINT_EDIT_FRAME* aFrame, PA
}
PANEL_MODEDIT_DEFAULTS::~PANEL_MODEDIT_DEFAULTS()
PANEL_FP_EDITOR_DEFAULTS::~PANEL_FP_EDITOR_DEFAULTS()
{
// destroy GRID_TRICKS before m_layerClassesGrid.
m_layerClassesGrid->PopEventHandler( true );
}
bool PANEL_MODEDIT_DEFAULTS::TransferDataToWindow()
bool PANEL_FP_EDITOR_DEFAULTS::TransferDataToWindow()
{
wxColour disabledColour = wxSystemSettings::GetColour( wxSYS_COLOUR_BACKGROUND );
@ -274,7 +275,7 @@ bool PANEL_MODEDIT_DEFAULTS::TransferDataToWindow()
}
bool PANEL_MODEDIT_DEFAULTS::Show( bool aShow )
bool PANEL_FP_EDITOR_DEFAULTS::Show( bool aShow )
{
bool retVal = wxPanel::Show( aShow );
@ -297,14 +298,14 @@ bool PANEL_MODEDIT_DEFAULTS::Show( bool aShow )
}
int PANEL_MODEDIT_DEFAULTS::getGridValue( int aRow, int aCol )
int PANEL_FP_EDITOR_DEFAULTS::getGridValue( int aRow, int aCol )
{
return ValueFromString( m_frame->GetUserUnits(),
m_layerClassesGrid->GetCellValue( aRow, aCol ) );
}
bool PANEL_MODEDIT_DEFAULTS::validateData()
bool PANEL_FP_EDITOR_DEFAULTS::validateData()
{
if( !m_textItemsGrid->CommitPendingChanges() || !m_layerClassesGrid->CommitPendingChanges() )
return false;
@ -319,7 +320,7 @@ bool PANEL_MODEDIT_DEFAULTS::validateData()
{
wxString msg = _( "Text will not be readable with a thickness greater than\n"
"1/4 its width or height." );
m_Parent->SetError( msg, this, m_layerClassesGrid, row, COL_TEXT_THICKNESS );
m_parent->SetError( msg, this, m_layerClassesGrid, row, COL_TEXT_THICKNESS );
return false;
}
}
@ -328,7 +329,7 @@ bool PANEL_MODEDIT_DEFAULTS::validateData()
}
bool PANEL_MODEDIT_DEFAULTS::TransferDataFromWindow()
bool PANEL_FP_EDITOR_DEFAULTS::TransferDataFromWindow()
{
if( !validateData() )
return false;
@ -370,7 +371,7 @@ bool PANEL_MODEDIT_DEFAULTS::TransferDataFromWindow()
}
void PANEL_MODEDIT_DEFAULTS::OnAddTextItem( wxCommandEvent& event )
void PANEL_FP_EDITOR_DEFAULTS::OnAddTextItem( wxCommandEvent& event )
{
if( !m_textItemsGrid->CommitPendingChanges() || !m_layerClassesGrid->CommitPendingChanges() )
return;
@ -390,7 +391,7 @@ void PANEL_MODEDIT_DEFAULTS::OnAddTextItem( wxCommandEvent& event )
}
void PANEL_MODEDIT_DEFAULTS::OnDeleteTextItem( wxCommandEvent& event )
void PANEL_FP_EDITOR_DEFAULTS::OnDeleteTextItem( wxCommandEvent& event )
{
if( !m_textItemsGrid->CommitPendingChanges() || !m_layerClassesGrid->CommitPendingChanges() )
return;

16
pcbnew/dialogs/panel_modedit_defaults.h → pcbnew/dialogs/panel_fp_editor_defaults.h
View File

@ -17,26 +17,26 @@
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef KICAD_PANEL_MODEDIT_DEFAULTS_H
#define KICAD_PANEL_MODEDIT_DEFAULTS_H
#ifndef PANEL_FP_EDITOR_DEFAULTS_H
#define PANEL_FP_EDITOR_DEFAULTS_H
#include <panel_modedit_defaults_base.h>
#include <panel_fp_editor_defaults_base.h>
#include <board_design_settings.h>
#include <widgets/unit_binder.h>
class FOOTPRINT_EDIT_FRAME;
class PANEL_MODEDIT_DEFAULTS : public PANEL_MODEDIT_DEFAULTS_BASE
class PANEL_FP_EDITOR_DEFAULTS : public PANEL_FP_EDITOR_DEFAULTS_BASE
{
BOARD_DESIGN_SETTINGS m_brdSettings;
FOOTPRINT_EDIT_FRAME* m_frame;
PAGED_DIALOG* m_Parent;
PAGED_DIALOG* m_parent;
bool m_firstShow = true;
public:
PANEL_MODEDIT_DEFAULTS( FOOTPRINT_EDIT_FRAME* aFrame, PAGED_DIALOG* aParent );
~PANEL_MODEDIT_DEFAULTS() override;
PANEL_FP_EDITOR_DEFAULTS( FOOTPRINT_EDIT_FRAME* aFrame, PAGED_DIALOG* aParent );
~PANEL_FP_EDITOR_DEFAULTS() override;
private:
virtual void OnAddTextItem( wxCommandEvent& event ) override;
@ -55,5 +55,5 @@ private:
#endif //KICAD_PANEL_MODEDIT_DEFAULTS_H
#endif // PANEL_FP_EDITOR_DEFAULTS_H

18
pcbnew/dialogs/panel_modedit_defaults_base.cpp → pcbnew/dialogs/panel_fp_editor_defaults_base.cpp
View File

@ -7,11 +7,11 @@
#include "widgets/wx_grid.h"
#include "panel_modedit_defaults_base.h"
#include "panel_fp_editor_defaults_base.h"
///////////////////////////////////////////////////////////////////////////
PANEL_MODEDIT_DEFAULTS_BASE::PANEL_MODEDIT_DEFAULTS_BASE( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxPanel( parent, id, pos, size, style, name )
PANEL_FP_EDITOR_DEFAULTS_BASE::PANEL_FP_EDITOR_DEFAULTS_BASE( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxPanel( parent, id, pos, size, style, name )
{
wxBoxSizer* bSizerMain;
bSizerMain = new wxBoxSizer( wxVERTICAL );
@ -157,16 +157,16 @@ PANEL_MODEDIT_DEFAULTS_BASE::PANEL_MODEDIT_DEFAULTS_BASE( wxWindow* parent, wxWi
bSizerMain->Fit( this );
// Connect Events
m_textItemsGrid->Connect( wxEVT_SIZE, wxSizeEventHandler( PANEL_MODEDIT_DEFAULTS_BASE::OnGridSize ), NULL, this );
m_bpAdd->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_MODEDIT_DEFAULTS_BASE::OnAddTextItem ), NULL, this );
m_bpDelete->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_MODEDIT_DEFAULTS_BASE::OnDeleteTextItem ), NULL, this );
m_textItemsGrid->Connect( wxEVT_SIZE, wxSizeEventHandler( PANEL_FP_EDITOR_DEFAULTS_BASE::OnGridSize ), NULL, this );
m_bpAdd->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_FP_EDITOR_DEFAULTS_BASE::OnAddTextItem ), NULL, this );
m_bpDelete->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_FP_EDITOR_DEFAULTS_BASE::OnDeleteTextItem ), NULL, this );
}
PANEL_MODEDIT_DEFAULTS_BASE::~PANEL_MODEDIT_DEFAULTS_BASE()
PANEL_FP_EDITOR_DEFAULTS_BASE::~PANEL_FP_EDITOR_DEFAULTS_BASE()
{
// Disconnect Events
m_textItemsGrid->Disconnect( wxEVT_SIZE, wxSizeEventHandler( PANEL_MODEDIT_DEFAULTS_BASE::OnGridSize ), NULL, this );
m_bpAdd->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_MODEDIT_DEFAULTS_BASE::OnAddTextItem ), NULL, this );
m_bpDelete->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_MODEDIT_DEFAULTS_BASE::OnDeleteTextItem ), NULL, this );
m_textItemsGrid->Disconnect( wxEVT_SIZE, wxSizeEventHandler( PANEL_FP_EDITOR_DEFAULTS_BASE::OnGridSize ), NULL, this );
m_bpAdd->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_FP_EDITOR_DEFAULTS_BASE::OnAddTextItem ), NULL, this );
m_bpDelete->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_FP_EDITOR_DEFAULTS_BASE::OnDeleteTextItem ), NULL, this );
}

6
pcbnew/dialogs/panel_modedit_defaults_base.fbp → pcbnew/dialogs/panel_fp_editor_defaults_base.fbp
View File

@ -11,12 +11,12 @@
<property name="embedded_files_path">res</property>
<property name="encoding">UTF-8</property>
<property name="event_generation">connect</property>
<property name="file">panel_modedit_defaults_base</property>
<property name="file">panel_fp_editor_defaults_base</property>
<property name="first_id">1000</property>
<property name="help_provider">none</property>
<property name="indent_with_spaces"></property>
<property name="internationalize">1</property>
<property name="name">PanelModeditDefaults</property>
<property name="name">PanelFPEditorDefaults</property>
<property name="namespace"></property>
<property name="path">.</property>
<property name="precompiled_header"></property>
@ -41,7 +41,7 @@
<property name="id">wxID_ANY</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">PANEL_MODEDIT_DEFAULTS_BASE</property>
<property name="name">PANEL_FP_EDITOR_DEFAULTS_BASE</property>
<property name="pos"></property>
<property name="size">-1,-1</property>
<property name="subclass">; forward_declare</property>

8
pcbnew/dialogs/panel_modedit_defaults_base.h → pcbnew/dialogs/panel_fp_editor_defaults_base.h
View File

@ -32,9 +32,9 @@ class WX_GRID;
///////////////////////////////////////////////////////////////////////////////
/// Class PANEL_MODEDIT_DEFAULTS_BASE
/// Class PANEL_FP_EDITOR_DEFAULTS_BASE
///////////////////////////////////////////////////////////////////////////////
class PANEL_MODEDIT_DEFAULTS_BASE : public wxPanel
class PANEL_FP_EDITOR_DEFAULTS_BASE : public wxPanel
{
private:
@ -54,8 +54,8 @@ class PANEL_MODEDIT_DEFAULTS_BASE : public wxPanel
public:
PANEL_MODEDIT_DEFAULTS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString );
~PANEL_MODEDIT_DEFAULTS_BASE();
PANEL_FP_EDITOR_DEFAULTS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString );
~PANEL_FP_EDITOR_DEFAULTS_BASE();
};

18
pcbnew/footprint_edit_frame.cpp
View File

@ -36,8 +36,8 @@
#include <board.h>
#include <footprint.h>
#include <confirm.h>
#include <dialogs/panel_modedit_color_settings.h>
#include <dialogs/panel_modedit_defaults.h>
#include <dialogs/panel_fp_editor_color_settings.h>
#include <dialogs/panel_fp_editor_defaults.h>
#include <dialogs/panel_display_options.h>
#include <dialogs/panel_edit_options.h>
#include <footprint_edit_frame.h>
@ -115,7 +115,7 @@ FOOTPRINT_EDIT_FRAME::FOOTPRINT_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent,
{
m_showBorderAndTitleBlock = false; // true to show the frame references
m_canvasType = aBackend;
m_AboutTitle = "ModEdit";
m_AboutTitle = _( "Footprint Editor" );
m_selLayerBox = nullptr;
m_settings = nullptr;
@ -139,9 +139,9 @@ FOOTPRINT_EDIT_FRAME::FOOTPRINT_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent,
// This board will only be used to hold a footprint for editing
GetBoard()->SetBoardUse( BOARD_USE::FPHOLDER );
// In modedit, the default net clearance is not known (it depends on the actual board).
// So we do not show the default clearance, by setting it to 0.
// The footprint or pad specific clearance will be shown.
// In Footprint Editor, the default net clearance is not known (it depends on the actual
// board). So we do not show the default clearance, by setting it to 0. The footprint or
// pad specific clearance will be shown.
GetBoard()->GetDesignSettings().GetDefault()->SetClearance( 0 );
// Don't show the default board solder mask clearance in the footprint editor. Only the
@ -162,7 +162,7 @@ FOOTPRINT_EDIT_FRAME::FOOTPRINT_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent,
GetGalDisplayOptions().m_axesEnabled = true;
// In modedit, set the default paper size to A4 for plot/print
// In Footprint Editor, set the default paper size to A4 for plot/print
SetPageSettings( PAGE_INFO( PAGE_INFO::A4 ) );
SetScreen( new PCB_SCREEN( GetPageSettings().GetSizeIU() ) );
@ -876,9 +876,9 @@ void FOOTPRINT_EDIT_FRAME::InstallPreferences( PAGED_DIALOG* aParent,
book->AddPage( new wxPanel( book ), _( "Footprint Editor" ) );
book->AddSubPage( new PANEL_DISPLAY_OPTIONS( this, aParent ), _( "Display Options" ) );
book->AddSubPage( new PANEL_MODEDIT_COLOR_SETTINGS( this, book ), _( "Colors" ) );
book->AddSubPage( new PANEL_FP_EDITOR_COLOR_SETTINGS( this, book ), _( "Colors" ) );
book->AddSubPage( new PANEL_EDIT_OPTIONS( this, aParent ), _( "Editing Options" ) );
book->AddSubPage( new PANEL_MODEDIT_DEFAULTS( this, aParent ), _( "Default Values" ) );
book->AddSubPage( new PANEL_FP_EDITOR_DEFAULTS( this, aParent ), _( "Default Values" ) );
aHotkeysPanel->AddHotKeys( GetToolManager() );
}

2
pcbnew/footprint_edit_frame.h
View File

@ -284,7 +284,7 @@ public:
void AddFootprintToBoard( FOOTPRINT* aFootprint ) override;
/**
* Allows Modedit to install its preferences panel into the preferences dialog.
* Allows Footprint Editor to install its preferences panel into the preferences dialog.
*/
void InstallPreferences( PAGED_DIALOG* aParent, PANEL_HOTKEYS_EDITOR* aHotkeysPanel ) override;

2
pcbnew/fp_shape.cpp
View File

@ -175,7 +175,7 @@ void FP_SHAPE::Flip( const wxPoint& aCentre, bool aFlipLeftRight )
default:
case S_SEGMENT:
case S_CURVE:
// If Start0 and Start are equal (ie: ModEdit), then flip both sets around the
// If Start0 and Start are equal (ie: Footprint Editor), then flip both sets around the
// centre point.
if( m_start == m_Start0 )
pt = aCentre;

5
pcbnew/fp_text.cpp
View File

@ -170,9 +170,8 @@ bool FP_TEXT::IsParentFlipped() const
void FP_TEXT::Mirror( const wxPoint& aCentre, bool aMirrorAroundXAxis )
{
// Used in modedit, to transform the footprint
// the mirror is around the Y axis or X axis if aMirrorAroundXAxis = true
// the position is mirrored, but the text itself is not mirrored
if( aMirrorAroundXAxis )
SetTextY( ::MIRRORVAL( GetTextPos().y, aCentre.y ) );
else
@ -275,7 +274,7 @@ void FP_TEXT::GetMsgPanelInfo( EDA_DRAW_FRAME* aFrame, std::vector<MSG_PANEL_ITE
{
FOOTPRINT* parentFootprint = static_cast<FOOTPRINT*>( m_parent );
if( parentFootprint == NULL ) // Happens in modedit, and for new texts
if( parentFootprint == NULL ) // Happens in footprint editor, and for new texts
return;
wxString msg, Line;

4
pcbnew/kicad_clipboard.cpp
View File

@ -64,7 +64,7 @@ void CLIPBOARD_IO::SetBoard( BOARD* aBoard )
}
void CLIPBOARD_IO::SaveSelection( const PCBNEW_SELECTION& aSelected, bool isModEdit )
void CLIPBOARD_IO::SaveSelection( const PCBNEW_SELECTION& aSelected, bool isFootprintEditor )
{
VECTOR2I refPoint( 0, 0 );
@ -96,7 +96,7 @@ void CLIPBOARD_IO::SaveSelection( const PCBNEW_SELECTION& aSelected, bool isModE
Format( static_cast<BOARD_ITEM*>( &newFootprint ) );
}
else if( isModEdit )
else if( isFootprintEditor )
{
FOOTPRINT partialFootprint( m_board );

2
pcbnew/kicad_clipboard.h
View File

@ -58,7 +58,7 @@ public:
/* Writes all the settings of the BOARD* set by setBoard() and then adds all
* the BOARD_ITEM* found in selection formatted by PCB_IO to clipboard as a text
*/
void SaveSelection( const PCBNEW_SELECTION& selected, bool isModEdit );
void SaveSelection( const PCBNEW_SELECTION& selected, bool isFootprintEditor );
BOARD_ITEM* Parse();

4
pcbnew/load_select_footprint.cpp
View File

@ -125,12 +125,12 @@ bool FOOTPRINT_EDIT_FRAME::LoadFootprintFromBoard( FOOTPRINT* aFootprint )
newFootprint->SetPosition( wxPoint( 0, 0 ) ); // cursor in GAL may not be initialized at the moment
// Put it on FRONT layer,
// because this is the default in ModEdit, and in libs
// because this is the default in Footprint Editor, and in libs
if( newFootprint->GetLayer() != F_Cu )
newFootprint->Flip( newFootprint->GetPosition(), frame->Settings().m_FlipLeftRight );
// Put it in orientation 0,
// because this is the default orientation in ModEdit, and in libs
// because this is the default orientation in Footprint Editor, and in libs
newFootprint->SetOrientation( 0 );
Zoom_Automatique( false );

12
pcbnew/pcb_edit_frame.cpp
View File

@ -1527,11 +1527,13 @@ void PCB_EDIT_FRAME::ShowFootprintPropertiesDialog( FOOTPRINT* aFootprint )
DIALOG_FOOTPRINT_PROPERTIES* dlg = new DIALOG_FOOTPRINT_PROPERTIES( this, aFootprint );
int retvalue = dlg->ShowModal();
/* retvalue =
* FP_PROPS_UPDATE_FP if update footprint
* FP_PROPS_CHANGE_FP if change footprint
* PRM_EDITOR_WANT_MODEDIT for a goto editor command
* FP_PROPS_OK for normal edit
/*
* retvalue =
* FP_PROPS_UPDATE_FP to show Update Footprints dialog
* FP_PROPS_CHANGE_FP to show Chanage Footprints dialog
* FP_PROPS_OK for normal edit
* FP_PROPS_EDIT_BOARD_FP to load board footprint into Footprint Editor
* FP_PROPS_EDIT_LIBRARY_FP to load library footprint into Footprint Editor
*/
dlg->Close();

2
pcbnew/plugins/legacy/legacy_plugin.cpp
View File

@ -1328,7 +1328,7 @@ void LEGACY_PLUGIN::loadFOOTPRINT( FOOTPRINT* aFootprint )
else if( TESTLINE( ".SolderPasteRatio" ) )
{
double tmp = atof( line + SZ( ".SolderPasteRatio" ) );
// Due to a bug in dialog editor in Modedit, fixed in BZR version 3565
// Due to a bug in dialog editor in Footprint Editor, fixed in BZR version 3565
// this parameter can be broken.
// It should be >= -50% (no solder paste) and <= 0% (full area of the pad)

18
pcbnew/tools/selection_tool.cpp
View File

@ -1906,10 +1906,10 @@ bool SELECTION_TOOL::Selectable( const BOARD_ITEM* aItem, bool checkVisibilityOn
}
case PCB_FP_TEXT_T:
// Multiple selection is only allowed in modedit mode. In pcbnew, you have to select
// footprint subparts one by one, rather than with a drag selection. This is so you can
// pick up items under an (unlocked) footprint without also moving the footprint's
// sub-parts.
// Multiple selection is only allowed in footprint editor mode. In pcbnew, you have to
// select footprint subparts one by one, rather than with a drag selection. This is so
// you can pick up items under an (unlocked) footprint without also moving the
// footprint's sub-parts.
if( !m_isFootprintEditor && !checkVisibilityOnly )
{
if( m_multiple && !settings->GetHighContrast() )
@ -1922,7 +1922,7 @@ bool SELECTION_TOOL::Selectable( const BOARD_ITEM* aItem, bool checkVisibilityOn
break;
case PCB_FP_SHAPE_T:
// Module edge selections are only allowed in modedit mode.
// Footprint shape selections are only allowed in footprint editor mode.
if( !m_isFootprintEditor && !checkVisibilityOnly )
return false;
@ -1930,10 +1930,10 @@ bool SELECTION_TOOL::Selectable( const BOARD_ITEM* aItem, bool checkVisibilityOn
case PCB_PAD_T:
{
// Multiple selection is only allowed in modedit mode. In pcbnew, you have to select
// footprint subparts one by one, rather than with a drag selection. This is so you can
// pick up items under an (unlocked) footprint without also moving the footprint's
// sub-parts.
// Multiple selection is only allowed in footprint editor mode. In pcbnew, you have to
// select footprint subparts one by one, rather than with a drag selection. This is so
// you can pick up items under an (unlocked) footprint without also moving the
// footprint's sub-parts.
if( !m_isFootprintEditor && !checkVisibilityOnly )
{
if( m_multiple )

Write Preview
Loading…
Cancel
Save