Skip to content

K
kicad-source-mirror
Commit ea6102e1 authored by charras's avatar charras
Browse files
Options

renaming files created by wxFormBuilder to dialog_xxx_base according to an idea of Dick, in a mail.

parent 90b9850e
Show whitespace changes
Inline Side-by-side
Showing with 587 additions and 582 deletions
pcbnew/CMakeLists.txt
View file @ ea6102e1
...@@ -43,7 +43,7 @@ set(PCBNEW_SRCS ...@@ -43,7 +43,7 @@ set(PCBNEW_SRCS
cross-probing.cpp cross-probing.cpp
deltrack.cpp deltrack.cpp
dialog_copper_zones.cpp dialog_copper_zones.cpp
dialog_copper_zones_frame.cpp dialog_copper_zones_base.cpp
# dialog_display_options.cpp # dialog_display_options.cpp
# dialog_drc.cpp # dialog_drc.cpp
dialog_edit_mod_text.cpp dialog_edit_mod_text.cpp
...@@ -55,7 +55,7 @@ set(PCBNEW_SRCS ...@@ -55,7 +55,7 @@ set(PCBNEW_SRCS
# dialog_initpcb.cpp # dialog_initpcb.cpp
# dialog_netlist.cpp # dialog_netlist.cpp
zones_non_copper_type_functions.cpp zones_non_copper_type_functions.cpp
dialog_non_copper_zones_properties.cpp dialog_non_copper_zones_properties_base.cpp
# dialog_pad_edit.cpp # dialog_pad_edit.cpp
dialog_setup_libs.cpp dialog_setup_libs.cpp
dialog_orient_footprints.cpp dialog_orient_footprints.cpp
......
pcbnew/dialog_copper_zones.cpp
View file @ ea6102e1
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
/************************************************************************************************/ /************************************************************************************************/
dialog_copper_zone::dialog_copper_zone( WinEDA_PcbFrame* parent, ZONE_SETTING* zone_setting ) : dialog_copper_zone::dialog_copper_zone( WinEDA_PcbFrame* parent, ZONE_SETTING* zone_setting ) :
dialog_copper_zone_frame( parent ) dialog_copper_zone_base( parent )
/************************************************************************************************/ /************************************************************************************************/
{ {
m_Parent = parent; m_Parent = parent;
...@@ -311,8 +311,10 @@ bool dialog_copper_zone::AcceptOptions( bool aPromptForErrors, bool aUseExportab ...@@ -311,8 +311,10 @@ bool dialog_copper_zone::AcceptOptions( bool aPromptForErrors, bool aUseExportab
case 4: case 4:
m_Zone_Setting->m_GridFillValue = 0; m_Zone_Setting->m_GridFillValue = 0;
#if 0 // I hope this feature works fine ( JP Charras)
DisplayInfo( this, wxT( DisplayInfo( this, wxT(
"You are using No grid for filling zones\nThis is currently in development and for tests only.\n Do not use for production" ) ); "You are using No grid for filling zones\nThis is currently in development and for tests only.\n Do not use for production" ) );
#endif
break; break;
} }
......
pcbnew/dialog_copper_zones.h
View file @ ea6102e1
...@@ -3,11 +3,11 @@ ...@@ -3,11 +3,11 @@
#ifndef DIALOG_COPPER_ZONES #ifndef DIALOG_COPPER_ZONES
#define DIALOG_COPPER_ZONES #define DIALOG_COPPER_ZONES
#include "dialog_copper_zones_frame.h" #include "dialog_copper_zones_base.h"
/* here is the derivated class from dialog_copper_zone_frame created by wxFormBuilder /* here is the derivated class from dialog_copper_zone_frame created by wxFormBuilder
*/ */
class dialog_copper_zone: public dialog_copper_zone_frame class dialog_copper_zone: public dialog_copper_zone_base
{ {
public: public:
WinEDA_PcbFrame* m_Parent; WinEDA_PcbFrame* m_Parent;
......
pcbnew/dialog_copper_zones_frame.cpp → pcbnew/dialog_copper_zones_base.cpp
View file @ ea6102e1
...@@ -5,20 +5,20 @@ ...@@ -5,20 +5,20 @@
// PLEASE DO "NOT" EDIT THIS FILE! // PLEASE DO "NOT" EDIT THIS FILE!
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
#include "dialog_copper_zones_frame.h" #include "dialog_copper_zones_base.h"
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
BEGIN_EVENT_TABLE( dialog_copper_zone_frame, wxDialog ) BEGIN_EVENT_TABLE( dialog_copper_zone_base, wxDialog )
EVT_INIT_DIALOG( dialog_copper_zone_frame::_wxFB_OnInitDialog ) EVT_INIT_DIALOG( dialog_copper_zone_base::_wxFB_OnInitDialog )
EVT_RADIOBOX( wxID_PADS_IN_ZONE_OPTIONS, dialog_copper_zone_frame::_wxFB_OnPadsInZoneClick ) EVT_RADIOBOX( wxID_PADS_IN_ZONE_OPTIONS, dialog_copper_zone_base::_wxFB_OnPadsInZoneClick )
EVT_BUTTON( wxID_BUTTON_EXPORT, dialog_copper_zone_frame::_wxFB_ExportSetupToOtherCopperZones ) EVT_BUTTON( wxID_BUTTON_EXPORT, dialog_copper_zone_base::_wxFB_ExportSetupToOtherCopperZones )
EVT_BUTTON( wxID_OK, dialog_copper_zone_frame::_wxFB_OnButtonOkClick ) EVT_BUTTON( wxID_OK, dialog_copper_zone_base::_wxFB_OnButtonOkClick )
EVT_BUTTON( wxID_CANCEL, dialog_copper_zone_frame::_wxFB_OnButtonCancelClick ) EVT_BUTTON( wxID_CANCEL, dialog_copper_zone_base::_wxFB_OnButtonCancelClick )
EVT_RADIOBOX( ID_NET_SORTING_OPTION, dialog_copper_zone_frame::_wxFB_OnNetSortingOptionSelected ) EVT_RADIOBOX( ID_NET_SORTING_OPTION, dialog_copper_zone_base::_wxFB_OnNetSortingOptionSelected )
END_EVENT_TABLE() END_EVENT_TABLE()
dialog_copper_zone_frame::dialog_copper_zone_frame( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style ) dialog_copper_zone_base::dialog_copper_zone_base( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
{ {
this->SetSizeHints( wxDefaultSize, wxDefaultSize ); this->SetSizeHints( wxDefaultSize, wxDefaultSize );
...@@ -204,6 +204,6 @@ dialog_copper_zone_frame::dialog_copper_zone_frame( wxWindow* parent, wxWindowID ...@@ -204,6 +204,6 @@ dialog_copper_zone_frame::dialog_copper_zone_frame( wxWindow* parent, wxWindowID
this->Layout(); this->Layout();
} }
dialog_copper_zone_frame::~dialog_copper_zone_frame() dialog_copper_zone_base::~dialog_copper_zone_base()
{ {
} }
pcbnew/dialog_copper_zones_frame.fbp → pcbnew/dialog_copper_zones_base.fbp
View file @ ea6102e1
...@@ -7,11 +7,11 @@ ...@@ -7,11 +7,11 @@
<property name="disconnect_events">1</property> <property name="disconnect_events">1</property>
<property name="encoding">UTF-8</property> <property name="encoding">UTF-8</property>
<property name="event_generation">table</property> <property name="event_generation">table</property>
<property name="file">dialog_copper_zones_frame</property> <property name="file">dialog_copper_zones_base</property>
<property name="first_id">1000</property> <property name="first_id">1000</property>
<property name="help_provider">none</property> <property name="help_provider">none</property>
<property name="internationalize">1</property> <property name="internationalize">1</property>
<property name="name">dialog_copper_zones_frame</property> <property name="name">dialog_copper_zones_base</property>
<property name="namespace"></property> <property name="namespace"></property>
<property name="path">.</property> <property name="path">.</property>
<property name="precompiled_header"></property> <property name="precompiled_header"></property>
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="name">dialog_copper_zone_frame</property> <property name="name">dialog_copper_zone_base</property>
<property name="pos"></property> <property name="pos"></property>
<property name="size">545,493</property> <property name="size">545,493</property>
<property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property> <property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>
......
pcbnew/dialog_copper_zones_frame.h → pcbnew/dialog_copper_zones_base.h
View file @ ea6102e1
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
// PLEASE DO "NOT" EDIT THIS FILE! // PLEASE DO "NOT" EDIT THIS FILE!
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
#ifndef __dialog_copper_zones_frame__ #ifndef __dialog_copper_zones_base__
#define __dialog_copper_zones_frame__ #define __dialog_copper_zones_base__
#include <wx/intl.h> #include <wx/intl.h>
...@@ -28,9 +28,9 @@ ...@@ -28,9 +28,9 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
/// Class dialog_copper_zone_frame /// Class dialog_copper_zone_base
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
class dialog_copper_zone_frame : public wxDialog class dialog_copper_zone_base : public wxDialog
{ {
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
private: private:
...@@ -96,9 +96,9 @@ class dialog_copper_zone_frame : public wxDialog ...@@ -96,9 +96,9 @@ class dialog_copper_zone_frame : public wxDialog
public: public:
dialog_copper_zone_frame( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Fill Zones Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 545,493 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); dialog_copper_zone_base( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Fill Zones Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 545,493 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
~dialog_copper_zone_frame(); ~dialog_copper_zone_base();
}; };
#endif //__dialog_copper_zones_frame__ #endif //__dialog_copper_zones_base__
pcbnew/dialog_non_copper_zones_properties.cpp → pcbnew/dialog_non_copper_zones_properties_base.cpp
View file @ ea6102e1
...@@ -5,17 +5,17 @@ ...@@ -5,17 +5,17 @@
// PLEASE DO "NOT" EDIT THIS FILE! // PLEASE DO "NOT" EDIT THIS FILE!
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
#include "dialog_non_copper_zones_properties.h" #include "dialog_non_copper_zones_properties_base.h"
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
BEGIN_EVENT_TABLE( DialogNonCopperZonesProperties, wxDialog ) BEGIN_EVENT_TABLE( DialogNonCopperZonesPropertiesBase, wxDialog )
EVT_INIT_DIALOG( DialogNonCopperZonesProperties::_wxFB_InitDialog ) EVT_INIT_DIALOG( DialogNonCopperZonesPropertiesBase::_wxFB_InitDialog )
EVT_BUTTON( wxID_OK, DialogNonCopperZonesProperties::_wxFB_OnOkClick ) EVT_BUTTON( wxID_OK, DialogNonCopperZonesPropertiesBase::_wxFB_OnOkClick )
EVT_BUTTON( wxID_CANCEL, DialogNonCopperZonesProperties::_wxFB_OnCancelClick ) EVT_BUTTON( wxID_CANCEL, DialogNonCopperZonesPropertiesBase::_wxFB_OnCancelClick )
END_EVENT_TABLE() END_EVENT_TABLE()
DialogNonCopperZonesProperties::DialogNonCopperZonesProperties( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style ) DialogNonCopperZonesPropertiesBase::DialogNonCopperZonesPropertiesBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
{ {
this->SetSizeHints( wxDefaultSize, wxDefaultSize ); this->SetSizeHints( wxDefaultSize, wxDefaultSize );
...@@ -64,6 +64,6 @@ DialogNonCopperZonesProperties::DialogNonCopperZonesProperties( wxWindow* parent ...@@ -64,6 +64,6 @@ DialogNonCopperZonesProperties::DialogNonCopperZonesProperties( wxWindow* parent
this->Centre( wxBOTH ); this->Centre( wxBOTH );
} }
DialogNonCopperZonesProperties::~DialogNonCopperZonesProperties() DialogNonCopperZonesPropertiesBase::~DialogNonCopperZonesPropertiesBase()
{ {
} }
pcbnew/dialog_non_copper_zones_properties.fbp → pcbnew/dialog_non_copper_zones_properties_base.fbp
View file @ ea6102e1
...@@ -7,11 +7,11 @@ ...@@ -7,11 +7,11 @@
<property name="disconnect_events">1</property> <property name="disconnect_events">1</property>
<property name="encoding">UTF-8</property> <property name="encoding">UTF-8</property>
<property name="event_generation">table</property> <property name="event_generation">table</property>
<property name="file">dialog_non_copper_zones_properties</property> <property name="file">dialog_non_copper_zones_properties_base</property>
<property name="first_id">1000</property> <property name="first_id">1000</property>
<property name="help_provider">none</property> <property name="help_provider">none</property>
<property name="internationalize">1</property> <property name="internationalize">1</property>
<property name="name">dialog_non_copper_zones_properties</property> <property name="name">dialog_non_copper_zones_properties_base</property>
<property name="namespace"></property> <property name="namespace"></property>
<property name="path">.</property> <property name="path">.</property>
<property name="precompiled_header"></property> <property name="precompiled_header"></property>
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="name">DialogNonCopperZonesProperties</property> <property name="name">DialogNonCopperZonesPropertiesBase</property>
<property name="pos"></property> <property name="pos"></property>
<property name="size">366,221</property> <property name="size">366,221</property>
<property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property> <property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>
......
pcbnew/dialog_non_copper_zones_properties.h → pcbnew/dialog_non_copper_zones_properties_base.h
View file @ ea6102e1
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
// PLEASE DO "NOT" EDIT THIS FILE! // PLEASE DO "NOT" EDIT THIS FILE!
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
#ifndef __dialog_non_copper_zones_properties__ #ifndef __dialog_non_copper_zones_properties_base__
#define __dialog_non_copper_zones_properties__ #define __dialog_non_copper_zones_properties_base__
#include <wx/intl.h> #include <wx/intl.h>
...@@ -25,9 +25,9 @@ ...@@ -25,9 +25,9 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
/// Class DialogNonCopperZonesProperties /// Class DialogNonCopperZonesPropertiesBase
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
class DialogNonCopperZonesProperties : public wxDialog class DialogNonCopperZonesPropertiesBase : public wxDialog
{ {
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
private: private:
...@@ -53,9 +53,9 @@ class DialogNonCopperZonesProperties : public wxDialog ...@@ -53,9 +53,9 @@ class DialogNonCopperZonesProperties : public wxDialog
public: public:
DialogNonCopperZonesProperties( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Non copper zones properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 366,221 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxFULL_REPAINT_ON_RESIZE|wxSUNKEN_BORDER ); DialogNonCopperZonesPropertiesBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Non Copper Zones Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 366,221 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxFULL_REPAINT_ON_RESIZE|wxSUNKEN_BORDER );
~DialogNonCopperZonesProperties(); ~DialogNonCopperZonesPropertiesBase();
}; };
#endif //__dialog_non_copper_zones_properties__ #endif //__dialog_non_copper_zones_properties_base__
pcbnew/makefile.include
View file @ ea6102e1
...@@ -13,6 +13,10 @@ LIBVIEWER3D = ../3d-viewer/3d-viewer.a ...@@ -13,6 +13,10 @@ LIBVIEWER3D = ../3d-viewer/3d-viewer.a
ZONE_FILES = zones_by_polygon.o zones_test_and_combine_areas.o\ ZONE_FILES = zones_by_polygon.o zones_test_and_combine_areas.o\
zone_filling_algorithm.o\ zone_filling_algorithm.o\
dialog_copper_zones_base.o\
dialog_copper_zones.o\
dialog_non_copper_zones_properties_base.o\
zones_non_copper_type_functions.o\
zones_convert_brd_items_to_polygons.o\ zones_convert_brd_items_to_polygons.o\
zones_polygons_insulated_copper_islands.o zones_polygons_insulated_copper_islands.o
...@@ -23,10 +27,6 @@ OBJECTS= $(TARGET).o classpcb.o\ ...@@ -23,10 +27,6 @@ OBJECTS= $(TARGET).o classpcb.o\
$(SPECCTRA_TOOLS)\ $(SPECCTRA_TOOLS)\
lay2plot.o\ lay2plot.o\
dialog_freeroute_exchange.o\ dialog_freeroute_exchange.o\
dialog_copper_zones_frame.o\
dialog_copper_zones.o\
dialog_non_copper_zones_properties.o\
zones_non_copper_type_functions.o\
modedit_undo_redo.o\ modedit_undo_redo.o\
block_module_editor.o\ block_module_editor.o\
onrightclick.o\ onrightclick.o\
......
pcbnew/zones_convert_brd_items_to_polygons.cpp
View file @ ea6102e1
...@@ -60,11 +60,14 @@ double s_Correction; /* mult coeff used to enlarge rounded and oval pads (an ...@@ -60,11 +60,14 @@ double s_Correction; /* mult coeff used to enlarge rounded and oval pads (an
* BuildFilledPolysListData() call this function just after creating the * BuildFilledPolysListData() call this function just after creating the
* filled copper area polygon (without clearence areas * filled copper area polygon (without clearence areas
* to do that this function: * to do that this function:
* 1 - creates aBool_Engine,with option: holes are linked into outer contours by double overlapping segments * 1 - creates a Bool_Engine,with option: holes are linked to outer contours by double overlapping segments
* this means the created polygons have no holes (hole are linked to outer outline by double overlapped segments
* and are therefore compatible with draw functions (DC draw polygons and Gerber or PS outputs)
* 2 - Add the main outline (zone outline) in group A * 2 - Add the main outline (zone outline) in group A
* 3 - Add all non filled areas (pads, tracks) in group B * 3 - Add all non filled areas (pads, tracks) in group B
* 4 - calculates the polygon A - B * 4 - calculates the polygon A - B
* 5 - put resulting list of polygons (filled areas) in m_FilledPolysList * 5 - put resulting list of polygons (filled areas) in m_FilledPolysList
* 6 - Remove insulated copper islands
*/ */
void ZONE_CONTAINER::AddClearanceAreasPolygonsToPolysList( BOARD* aPcb ) void ZONE_CONTAINER::AddClearanceAreasPolygonsToPolysList( BOARD* aPcb )
{ {
......
pcbnew/zones_non_copper_type_functions.cpp
View file @ ea6102e1
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
#include "zones.h" #include "zones.h"
#include "dialog_non_copper_zones_properties.h" #include "dialog_non_copper_zones_properties_base.h"
/* Local functions */ /* Local functions */
...@@ -15,9 +15,9 @@ ...@@ -15,9 +15,9 @@
/* Class DialogNonCopperZonesEditor /* Class DialogNonCopperZonesEditor
* Dialog editor for non copper zones properties * Dialog editor for non copper zones properties
* Derived from DialogNonCopperZonesProperties, created by wxFormBuilder * Derived from DialogNonCopperZonesPropertiesBase, created by wxFormBuilder
*/ */
class DialogNonCopperZonesEditor : public DialogNonCopperZonesProperties class DialogNonCopperZonesEditor : public DialogNonCopperZonesPropertiesBase
{ {
private: private:
WinEDA_PcbFrame* m_Parent; WinEDA_PcbFrame* m_Parent;
...@@ -38,7 +38,7 @@ public: ...@@ -38,7 +38,7 @@ public:
/*******************************************************************************************/ /*******************************************************************************************/
DialogNonCopperZonesEditor::DialogNonCopperZonesEditor( WinEDA_PcbFrame* parent, DialogNonCopperZonesEditor::DialogNonCopperZonesEditor( WinEDA_PcbFrame* parent,
ZONE_CONTAINER* zone_container ) : ZONE_CONTAINER* zone_container ) :
DialogNonCopperZonesProperties( parent ) DialogNonCopperZonesPropertiesBase( parent )
/*******************************************************************************************/ /*******************************************************************************************/
{ {
m_Parent = parent; m_Parent = parent;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment