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

More consistent naming.

This commit is contained in:
Jeff Young 2021-01-26 11:41:47 +00:00
parent b165ae6519
commit 5a5f96bd9f
10 changed files with 47 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pcbnew/CMakeLists.txt
View File

@ -161,10 +161,10 @@ set( PCBNEW_DIALOGS
dialogs/panel_pcbnew_color_settings.cpp
dialogs/panel_pcbnew_display_origin.cpp
dialogs/panel_pcbnew_display_origin_base.cpp
dialogs/panel_setup_constraints.cpp
dialogs/panel_setup_constraints_base.cpp
dialogs/panel_setup_mask_and_paste.cpp
dialogs/panel_setup_mask_and_paste_base.cpp
dialogs/panel_setup_feature_constraints.cpp
dialogs/panel_setup_feature_constraints_base.cpp
dialogs/panel_setup_layers.cpp
dialogs/panel_setup_layers_base.cpp
dialogs/panel_setup_rules.cpp

4
pcbnew/dialogs/dialog_board_setup.cpp
View File

@ -19,7 +19,7 @@
#include <pcb_edit_frame.h>
#include <panel_setup_layers.h>
#include <panel_setup_text_and_graphics.h>
#include <panel_setup_feature_constraints.h>
#include <panel_setup_constraints.h>
#include <dialogs/panel_setup_netclasses.h>
#include <panel_setup_tracks_and_vias.h>
#include <panel_setup_mask_and_paste.h>
@ -50,7 +50,7 @@ DIALOG_BOARD_SETUP::DIALOG_BOARD_SETUP( PCB_EDIT_FRAME* aFrame ) :
m_layers = new PANEL_SETUP_LAYERS( this, aFrame );
m_textAndGraphics = new PANEL_SETUP_TEXT_AND_GRAPHICS( this, aFrame );
m_constraints = new PANEL_SETUP_FEATURE_CONSTRAINTS( this, aFrame );
m_constraints = new PANEL_SETUP_CONSTRAINTS( this, aFrame );
m_rules = new PANEL_SETUP_RULES( this, aFrame );
m_tracksAndVias = new PANEL_SETUP_TRACKS_AND_VIAS( this, aFrame, m_constraints );
m_maskAndPaste = new PANEL_SETUP_MASK_AND_PASTE( this, aFrame );

4
pcbnew/dialogs/dialog_board_setup.h
View File

@ -24,7 +24,7 @@
#include <widgets/paged_dialog.h>
class PCB_EDIT_FRAME;
class PANEL_SETUP_FEATURE_CONSTRAINTS;
class PANEL_SETUP_CONSTRAINTS;
class PANEL_SETUP_LAYERS;
class PANEL_SETUP_TEXT_AND_GRAPHICS;
class PANEL_SETUP_NETCLASSES;
@ -47,7 +47,7 @@ protected:
PCB_EDIT_FRAME* m_frame;
PANEL_SETUP_FEATURE_CONSTRAINTS* m_constraints;
PANEL_SETUP_CONSTRAINTS* m_constraints;
PANEL_SETUP_LAYERS* m_layers;
PANEL_SETUP_TEXT_AND_GRAPHICS* m_textAndGraphics;
PANEL_SETUP_NETCLASSES* m_netclasses;

25
pcbnew/dialogs/panel_setup_feature_constraints.cpp → pcbnew/dialogs/panel_setup_constraints.cpp
View File

@ -22,20 +22,19 @@
*/
#include <board_design_settings.h>
#include <board.h> // for BOARD
#include <convert_to_biu.h> // for IU_PER_MM
#include <board.h>
#include <convert_to_biu.h>
#include <math/util.h>
#include <panel_setup_feature_constraints.h>
#include <panel_setup_feature_constraints_base.h> // for PANEL_SETUP_FEATUR...
#include <panel_setup_constraints.h>
#include <panel_setup_constraints_base.h>
#include <pcb_edit_frame.h>
#include <widgets/paged_dialog.h> // for PAGED_DIALOG
#include <widgets/paged_dialog.h>
#include <wx/treebook.h>
#include <bitmaps.h>
PANEL_SETUP_FEATURE_CONSTRAINTS::PANEL_SETUP_FEATURE_CONSTRAINTS( PAGED_DIALOG* aParent,
PCB_EDIT_FRAME* aFrame ) :
PANEL_SETUP_FEATURE_CONSTRAINTS_BASE( aParent->GetTreebook() ),
PANEL_SETUP_CONSTRAINTS::PANEL_SETUP_CONSTRAINTS( PAGED_DIALOG* aParent, PCB_EDIT_FRAME* aFrame ) :
PANEL_SETUP_CONSTRAINTS_BASE( aParent->GetTreebook() ),
m_minClearance( aFrame, m_clearanceTitle, m_clearanceCtrl, m_clearanceUnits, true ),
m_trackMinWidth( aFrame, m_TrackMinWidthTitle, m_TrackMinWidthCtrl, m_TrackMinWidthUnits, true ),
m_viaMinAnnulus( aFrame, m_ViaMinAnnulusTitle, m_ViaMinAnnulusCtrl, m_ViaMinAnnulusUnits, true ),
@ -58,7 +57,7 @@ PANEL_SETUP_FEATURE_CONSTRAINTS::PANEL_SETUP_FEATURE_CONSTRAINTS( PAGED_DIALOG*
}
bool PANEL_SETUP_FEATURE_CONSTRAINTS::TransferDataToWindow()
bool PANEL_SETUP_CONSTRAINTS::TransferDataToWindow()
{
wxString msg;
msg.Printf( m_stCircleToPolyWarning->GetLabel(),
@ -93,7 +92,7 @@ bool PANEL_SETUP_FEATURE_CONSTRAINTS::TransferDataToWindow()
}
bool PANEL_SETUP_FEATURE_CONSTRAINTS::TransferDataFromWindow()
bool PANEL_SETUP_CONSTRAINTS::TransferDataFromWindow()
{
if( !m_minClearance.Validate( 0, 10, EDA_UNITS::INCHES ) )
return false;
@ -150,7 +149,7 @@ bool PANEL_SETUP_FEATURE_CONSTRAINTS::TransferDataFromWindow()
}
bool PANEL_SETUP_FEATURE_CONSTRAINTS::Show( bool aShow )
bool PANEL_SETUP_CONSTRAINTS::Show( bool aShow )
{
bool retVal = wxPanel::Show( aShow );
@ -181,7 +180,7 @@ bool PANEL_SETUP_FEATURE_CONSTRAINTS::Show( bool aShow )
}
void PANEL_SETUP_FEATURE_CONSTRAINTS::ImportSettingsFrom( BOARD* aBoard )
void PANEL_SETUP_CONSTRAINTS::ImportSettingsFrom( BOARD* aBoard )
{
BOARD_DESIGN_SETTINGS* savedSettings = m_BrdSettings;
@ -192,7 +191,7 @@ void PANEL_SETUP_FEATURE_CONSTRAINTS::ImportSettingsFrom( BOARD* aBoard )
}
void PANEL_SETUP_FEATURE_CONSTRAINTS::onChangeOutlineOpt( wxCommandEvent& event )
void PANEL_SETUP_CONSTRAINTS::onChangeOutlineOpt( wxCommandEvent& event )
{
wxObject* item =event.GetEventObject();

14
pcbnew/dialogs/panel_setup_feature_constraints.h → pcbnew/dialogs/panel_setup_constraints.h
View File

@ -22,11 +22,11 @@
*/
#ifndef PANEL_SETUP_FEATURE_CONSTRAINTS_H
#define PANEL_SETUP_FEATURE_CONSTRAINTS_H
#ifndef PANEL_SETUP_CONSTRAINTS_H
#define PANEL_SETUP_CONSTRAINTS_H
#include <widgets/unit_binder.h>
#include <panel_setup_feature_constraints_base.h>
#include <panel_setup_constraints_base.h>
class BOARD;
class BOARD_DESIGN_SETTINGS;
@ -35,7 +35,7 @@ class PCB_EDIT_FRAME;
class wxCommandEvent;
class PANEL_SETUP_FEATURE_CONSTRAINTS : public PANEL_SETUP_FEATURE_CONSTRAINTS_BASE
class PANEL_SETUP_CONSTRAINTS : public PANEL_SETUP_CONSTRAINTS_BASE
{
private:
PCB_EDIT_FRAME* m_Frame;
@ -56,8 +56,8 @@ public:
UNIT_BINDER m_maxError;
public:
PANEL_SETUP_FEATURE_CONSTRAINTS( PAGED_DIALOG* aParent, PCB_EDIT_FRAME* aFrame );
~PANEL_SETUP_FEATURE_CONSTRAINTS( ) override { };
PANEL_SETUP_CONSTRAINTS( PAGED_DIALOG* aParent, PCB_EDIT_FRAME* aFrame );
~PANEL_SETUP_CONSTRAINTS( ) override { };
void ImportSettingsFrom( BOARD* aBoard );
@ -69,4 +69,4 @@ private:
void onChangeOutlineOpt( wxCommandEvent& event ) override;
};
#endif //PANEL_SETUP_FEATURE_CONSTRAINTS_H
#endif //PANEL_SETUP_CONSTRAINTS_H

14
pcbnew/dialogs/panel_setup_feature_constraints_base.cpp → pcbnew/dialogs/panel_setup_constraints_base.cpp
View File

@ -5,11 +5,11 @@
// PLEASE DO *NOT* EDIT THIS FILE!
///////////////////////////////////////////////////////////////////////////
#include "panel_setup_feature_constraints_base.h"
#include "panel_setup_constraints_base.h"
///////////////////////////////////////////////////////////////////////////
PANEL_SETUP_FEATURE_CONSTRAINTS_BASE::PANEL_SETUP_FEATURE_CONSTRAINTS_BASE( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxPanel( parent, id, pos, size, style, name )
PANEL_SETUP_CONSTRAINTS_BASE::PANEL_SETUP_CONSTRAINTS_BASE( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxPanel( parent, id, pos, size, style, name )
{
wxBoxSizer* bMainSizer;
bMainSizer = new wxBoxSizer( wxHORIZONTAL );
@ -409,14 +409,14 @@ PANEL_SETUP_FEATURE_CONSTRAINTS_BASE::PANEL_SETUP_FEATURE_CONSTRAINTS_BASE( wxWi
bMainSizer->Fit( this );
// Connect Events
m_rbOutlinePolygonBestQ->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( PANEL_SETUP_FEATURE_CONSTRAINTS_BASE::onChangeOutlineOpt ), NULL, this );
m_rbOutlinePolygonFastest->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( PANEL_SETUP_FEATURE_CONSTRAINTS_BASE::onChangeOutlineOpt ), NULL, this );
m_rbOutlinePolygonBestQ->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( PANEL_SETUP_CONSTRAINTS_BASE::onChangeOutlineOpt ), NULL, this );
m_rbOutlinePolygonFastest->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( PANEL_SETUP_CONSTRAINTS_BASE::onChangeOutlineOpt ), NULL, this );
}
PANEL_SETUP_FEATURE_CONSTRAINTS_BASE::~PANEL_SETUP_FEATURE_CONSTRAINTS_BASE()
PANEL_SETUP_CONSTRAINTS_BASE::~PANEL_SETUP_CONSTRAINTS_BASE()
{
// Disconnect Events
m_rbOutlinePolygonBestQ->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( PANEL_SETUP_FEATURE_CONSTRAINTS_BASE::onChangeOutlineOpt ), NULL, this );
m_rbOutlinePolygonFastest->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( PANEL_SETUP_FEATURE_CONSTRAINTS_BASE::onChangeOutlineOpt ), NULL, this );
m_rbOutlinePolygonBestQ->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( PANEL_SETUP_CONSTRAINTS_BASE::onChangeOutlineOpt ), NULL, this );
m_rbOutlinePolygonFastest->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( PANEL_SETUP_CONSTRAINTS_BASE::onChangeOutlineOpt ), NULL, this );
}

6
pcbnew/dialogs/panel_setup_feature_constraints_base.fbp → pcbnew/dialogs/panel_setup_constraints_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_setup_feature_constraints_base</property>
<property name="file">panel_setup_constraints_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">panel_setup_feature_constraints_base</property>
<property name="name">panel_setup_constraints_base</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_SETUP_FEATURE_CONSTRAINTS_BASE</property>
<property name="name">PANEL_SETUP_CONSTRAINTS_BASE</property>
<property name="pos"></property>
<property name="size">-1,-1</property>
<property name="subclass">; forward_declare</property>

8
pcbnew/dialogs/panel_setup_feature_constraints_base.h → pcbnew/dialogs/panel_setup_constraints_base.h
View File

@ -31,9 +31,9 @@
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
/// Class PANEL_SETUP_FEATURE_CONSTRAINTS_BASE
/// Class PANEL_SETUP_CONSTRAINTS_BASE
///////////////////////////////////////////////////////////////////////////////
class PANEL_SETUP_FEATURE_CONSTRAINTS_BASE : public wxPanel
class PANEL_SETUP_CONSTRAINTS_BASE : public wxPanel
{
private:
@ -123,8 +123,8 @@ class PANEL_SETUP_FEATURE_CONSTRAINTS_BASE : public wxPanel
public:
PANEL_SETUP_FEATURE_CONSTRAINTS_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_SETUP_FEATURE_CONSTRAINTS_BASE();
PANEL_SETUP_CONSTRAINTS_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_SETUP_CONSTRAINTS_BASE();
};

2
pcbnew/dialogs/panel_setup_tracks_and_vias.cpp
View File

@ -53,7 +53,7 @@ enum DIFF_VAR_GRID_COLUMNS
PANEL_SETUP_TRACKS_AND_VIAS::PANEL_SETUP_TRACKS_AND_VIAS( PAGED_DIALOG* aParent,
PCB_EDIT_FRAME* aFrame,
PANEL_SETUP_FEATURE_CONSTRAINTS* aConstraintsPanel ) :
PANEL_SETUP_CONSTRAINTS* aConstraintsPanel ) :
PANEL_SETUP_TRACKS_AND_VIAS_BASE( aParent->GetTreebook() )
{
m_Parent = aParent;

14
pcbnew/dialogs/panel_setup_tracks_and_vias.h
View File

@ -30,7 +30,7 @@
#include <widgets/paged_dialog.h>
#include <panel_setup_tracks_and_vias_base.h>
#include "panel_setup_feature_constraints.h"
#include "panel_setup_constraints.h"
class PCB_EDIT_FRAME;
class BOARD_DESIGN_SETTINGS;
@ -39,14 +39,14 @@ class BOARD_DESIGN_SETTINGS;
class PANEL_SETUP_TRACKS_AND_VIAS : public PANEL_SETUP_TRACKS_AND_VIAS_BASE
{
private:
PAGED_DIALOG* m_Parent;
PCB_EDIT_FRAME* m_Frame;
BOARD* m_Pcb;
BOARD_DESIGN_SETTINGS* m_BrdSettings;
PAGED_DIALOG* m_Parent;
PCB_EDIT_FRAME* m_Frame;
BOARD* m_Pcb;
BOARD_DESIGN_SETTINGS* m_BrdSettings;
// We must validate against the current m_BrdSettings as they may have been
// changed but not yet committed. Fetch them from the constraints panel.
PANEL_SETUP_FEATURE_CONSTRAINTS* m_ConstraintsPanel;
PANEL_SETUP_CONSTRAINTS* m_ConstraintsPanel;
bool validateData();
@ -64,7 +64,7 @@ protected:
public:
PANEL_SETUP_TRACKS_AND_VIAS( PAGED_DIALOG* aParent, PCB_EDIT_FRAME* aFrame,
PANEL_SETUP_FEATURE_CONSTRAINTS* aConstraintsPanel );
PANEL_SETUP_CONSTRAINTS* aConstraintsPanel );
~PANEL_SETUP_TRACKS_AND_VIAS() override;
bool TransferDataToWindow() override;