Skip to content

K
kicad-source-mirror
Commit 1f18ff28 authored by Dick Hollenbeck's avatar Dick Hollenbeck
Browse files
Options

merge from testing

parents 4eb80203 8d777fc6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 8571 additions and 8479 deletions
CHANGELOG.txt
View file @ 1f18ff28
...@@ -21,7 +21,7 @@ email address. ...@@ -21,7 +21,7 @@ email address.
2010-jul-27, UPDATE Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr> 2010-jul-27, UPDATE Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr>
================================================================================ ================================================================================
++all: ++all:
Updated boost to version 1.34 Updated boost to version 1.43
Added boost::polygon (experimental) Added boost::polygon (experimental)
++pcbnew: ++pcbnew:
Added experimental zone fill calculations with boost::polygon Added experimental zone fill calculations with boost::polygon
......
eeschema/dialog_edit_component_in_lib_base.fbp
View file @ 1f18ff28
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
<object class="notebookpage" expanded="1"> <object class="notebookpage" expanded="1">
<property name="bitmap"></property> <property name="bitmap"></property>
<property name="label">Options</property> <property name="label">Options</property>
<property name="select">1</property> <property name="select">0</property>
<object class="wxPanel" expanded="1"> <object class="wxPanel" expanded="1">
<property name="bg"></property> <property name="bg"></property>
<property name="context_help"></property> <property name="context_help"></property>
...@@ -851,7 +851,7 @@ ...@@ -851,7 +851,7 @@
<object class="notebookpage" expanded="1"> <object class="notebookpage" expanded="1">
<property name="bitmap"></property> <property name="bitmap"></property>
<property name="label">Description</property> <property name="label">Description</property>
<property name="select">0</property> <property name="select">1</property>
<object class="wxPanel" expanded="1"> <object class="wxPanel" expanded="1">
<property name="bg"></property> <property name="bg"></property>
<property name="context_help"></property> <property name="context_help"></property>
...@@ -1026,7 +1026,7 @@ ...@@ -1026,7 +1026,7 @@
<property name="size"></property> <property name="size"></property>
<property name="style"></property> <property name="style"></property>
<property name="subclass"></property> <property name="subclass"></property>
<property name="tooltip">Enter keys words that can be used to select this composant&#x0A;keys words cannot have spaces and are separated by a space</property> <property name="tooltip">Enter keys words that can be used to select this composant.&#x0A;Key words cannot have spaces and are separated by a space.</property>
<property name="window_extra_style"></property> <property name="window_extra_style"></property>
<property name="window_name"></property> <property name="window_name"></property>
<property name="window_style"></property> <property name="window_style"></property>
......
eeschema/dialog_edit_component_in_lib_base.h
View file @ 1f18ff28
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Apr 16 2008) // C++ code generated with wxFormBuilder (version Apr 16 2008)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO "NOT" EDIT THIS FILE! // PLEASE DO "NOT" EDIT THIS FILE!
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
#ifndef __dialog_edit_component_in_lib_base__ #ifndef __dialog_edit_component_in_lib_base__
#define __dialog_edit_component_in_lib_base__ #define __dialog_edit_component_in_lib_base__
#include <wx/intl.h> #include <wx/intl.h>
#include <wx/string.h> #include <wx/string.h>
#include <wx/checkbox.h> #include <wx/checkbox.h>
#include <wx/gdicmn.h> #include <wx/gdicmn.h>
#include <wx/font.h> #include <wx/font.h>
#include <wx/colour.h> #include <wx/colour.h>
#include <wx/settings.h> #include <wx/settings.h>
#include <wx/sizer.h> #include <wx/sizer.h>
#include <wx/statbox.h> #include <wx/statbox.h>
#include <wx/statline.h> #include <wx/statline.h>
#include <wx/stattext.h> #include <wx/stattext.h>
#include <wx/spinctrl.h> #include <wx/spinctrl.h>
#include <wx/panel.h> #include <wx/panel.h>
#include <wx/bitmap.h> #include <wx/bitmap.h>
#include <wx/image.h> #include <wx/image.h>
#include <wx/icon.h> #include <wx/icon.h>
#include <wx/textctrl.h> #include <wx/textctrl.h>
#include <wx/button.h> #include <wx/button.h>
#include <wx/listbox.h> #include <wx/listbox.h>
#include <wx/notebook.h> #include <wx/notebook.h>
#include <wx/dialog.h> #include <wx/dialog.h>
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
#define ID_LIBEDIT_NOTEBOOK 1000 #define ID_LIBEDIT_NOTEBOOK 1000
#define ID_COPY_DOC_TO_ALIAS 1001 #define ID_COPY_DOC_TO_ALIAS 1001
#define ID_BROWSE_DOC_FILES 1002 #define ID_BROWSE_DOC_FILES 1002
#define ID_ADD_ALIAS 1003 #define ID_ADD_ALIAS 1003
#define ID_DELETE_ONE_ALIAS 1004 #define ID_DELETE_ONE_ALIAS 1004
#define ID_DELETE_ALL_ALIAS 1005 #define ID_DELETE_ALL_ALIAS 1005
#define ID_ADD_FOOTPRINT_FILTER 1006 #define ID_ADD_FOOTPRINT_FILTER 1006
#define ID_DELETE_ONE_FOOTPRINT_FILTER 1007 #define ID_DELETE_ONE_FOOTPRINT_FILTER 1007
#define ID_DELETE_ALL_FOOTPRINT_FILTER 1008 #define ID_DELETE_ALL_FOOTPRINT_FILTER 1008
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
/// Class DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE /// Class DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
class DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE : public wxDialog class DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE : public wxDialog
{ {
private: private:
protected: protected:
wxNotebook* m_NoteBook; wxNotebook* m_NoteBook;
wxPanel* m_PanelBasic; wxPanel* m_PanelBasic;
wxCheckBox* m_AsConvertButt; wxCheckBox* m_AsConvertButt;
wxCheckBox* m_ShowPinNumButt; wxCheckBox* m_ShowPinNumButt;
wxCheckBox* m_ShowPinNameButt; wxCheckBox* m_ShowPinNameButt;
wxCheckBox* m_PinsNameInsideButt; wxCheckBox* m_PinsNameInsideButt;
wxStaticLine* m_staticline3; wxStaticLine* m_staticline3;
wxStaticText* m_staticTextNbUnits; wxStaticText* m_staticTextNbUnits;
wxSpinCtrl* m_SelNumberOfUnits; wxSpinCtrl* m_SelNumberOfUnits;
wxStaticText* m_staticTextskew; wxStaticText* m_staticTextskew;
wxSpinCtrl* m_SetSkew; wxSpinCtrl* m_SetSkew;
wxStaticLine* m_staticline1; wxStaticLine* m_staticline1;
wxCheckBox* m_OptionPower; wxCheckBox* m_OptionPower;
wxCheckBox* m_OptionPartsLocked; wxCheckBox* m_OptionPartsLocked;
wxPanel* m_PanelDoc; wxPanel* m_PanelDoc;
wxStaticText* m_staticTextDescription; wxStaticText* m_staticTextDescription;
wxTextCtrl* m_DocCtrl; wxTextCtrl* m_DocCtrl;
wxStaticText* m_staticTextKeywords; wxStaticText* m_staticTextKeywords;
wxTextCtrl* m_KeywordsCtrl; wxTextCtrl* m_KeywordsCtrl;
wxStaticText* m_staticTextDocFileName; wxStaticText* m_staticTextDocFileName;
wxTextCtrl* m_DocfileCtrl; wxTextCtrl* m_DocfileCtrl;
wxButton* m_ButtonCopyDoc; wxButton* m_ButtonCopyDoc;
wxButton* m_buttonBrowseDocFiles; wxButton* m_buttonBrowseDocFiles;
wxPanel* m_PanelAlias; wxPanel* m_PanelAlias;
wxStaticText* m_staticTextAlias; wxStaticText* m_staticTextAlias;
wxListBox* m_PartAliasListCtrl; wxListBox* m_PartAliasListCtrl;
wxButton* m_ButtonAddeAlias; wxButton* m_ButtonAddeAlias;
wxButton* m_ButtonDeleteOneAlias; wxButton* m_ButtonDeleteOneAlias;
wxButton* m_ButtonDeleteAllAlias; wxButton* m_ButtonDeleteAllAlias;
wxPanel* m_PanelFootprintFilter; wxPanel* m_PanelFootprintFilter;
wxStaticText* m_staticTextFootprints; wxStaticText* m_staticTextFootprints;
wxListBox* m_FootprintFilterListBox; wxListBox* m_FootprintFilterListBox;
wxButton* m_buttonAddFpF; wxButton* m_buttonAddFpF;
wxButton* m_ButtonDeleteOneFootprintFilter; wxButton* m_ButtonDeleteOneFootprintFilter;
wxButton* m_ButtonDeleteAllFootprintFilter; wxButton* m_ButtonDeleteAllFootprintFilter;
wxStdDialogButtonSizer* m_sdbSizer2; wxStdDialogButtonSizer* m_sdbSizer2;
wxButton* m_sdbSizer2OK; wxButton* m_sdbSizer2OK;
wxButton* m_sdbSizer2Cancel; wxButton* m_sdbSizer2Cancel;
// Virtual event handlers, overide them in your derived class // Virtual event handlers, overide them in your derived class
virtual void CopyDocToAlias( wxCommandEvent& event ){ event.Skip(); } virtual void CopyDocToAlias( wxCommandEvent& event ){ event.Skip(); }
virtual void BrowseAndSelectDocFile( wxCommandEvent& event ){ event.Skip(); } virtual void BrowseAndSelectDocFile( wxCommandEvent& event ){ event.Skip(); }
virtual void AddAliasOfPart( wxCommandEvent& event ){ event.Skip(); } virtual void AddAliasOfPart( wxCommandEvent& event ){ event.Skip(); }
virtual void DeleteAliasOfPart( wxCommandEvent& event ){ event.Skip(); } virtual void DeleteAliasOfPart( wxCommandEvent& event ){ event.Skip(); }
virtual void DeleteAllAliasOfPart( wxCommandEvent& event ){ event.Skip(); } virtual void DeleteAllAliasOfPart( wxCommandEvent& event ){ event.Skip(); }
virtual void AddFootprintFilter( wxCommandEvent& event ){ event.Skip(); } virtual void AddFootprintFilter( wxCommandEvent& event ){ event.Skip(); }
virtual void DeleteOneFootprintFilter( wxCommandEvent& event ){ event.Skip(); } virtual void DeleteOneFootprintFilter( wxCommandEvent& event ){ event.Skip(); }
virtual void DeleteAllFootprintFilter( wxCommandEvent& event ){ event.Skip(); } virtual void DeleteAllFootprintFilter( wxCommandEvent& event ){ event.Skip(); }
virtual void OnCancelClick( wxCommandEvent& event ){ event.Skip(); } virtual void OnCancelClick( wxCommandEvent& event ){ event.Skip(); }
virtual void OnOkClick( wxCommandEvent& event ){ event.Skip(); } virtual void OnOkClick( wxCommandEvent& event ){ event.Skip(); }
public: public:
DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( wxWindow* parent, wxWindowID id = ID_LIBEDIT_NOTEBOOK, const wxString& title = _("Lib Component Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 546,384 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE( wxWindow* parent, wxWindowID id = ID_LIBEDIT_NOTEBOOK, const wxString& title = _("Lib Component Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 546,384 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
~DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE(); ~DIALOG_EDIT_COMPONENT_IN_LIBRARY_BASE();
}; };
#endif //__dialog_edit_component_in_lib_base__ #endif //__dialog_edit_component_in_lib_base__
eeschema/dialog_eeschema_options_base.cpp
View file @ 1f18ff28
This diff is collapsed.
eeschema/dialog_eeschema_options_base.fbp
View file @ 1f18ff28
This diff is collapsed.
eeschema/dialog_eeschema_options_base.h
View file @ 1f18ff28
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Dec 21 2009) // C++ code generated with wxFormBuilder (version Apr 16 2008)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO "NOT" EDIT THIS FILE! // PLEASE DO "NOT" EDIT THIS FILE!
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
#ifndef __dialog_eeschema_options_base__ #ifndef __dialog_eeschema_options_base__
#define __dialog_eeschema_options_base__ #define __dialog_eeschema_options_base__
#include <wx/intl.h> #include <wx/intl.h>
#include <wx/string.h> #include <wx/string.h>
#include <wx/stattext.h> #include <wx/stattext.h>
#include <wx/gdicmn.h> #include <wx/gdicmn.h>
#include <wx/font.h> #include <wx/font.h>
#include <wx/colour.h> #include <wx/colour.h>
#include <wx/settings.h> #include <wx/settings.h>
#include <wx/choice.h> #include <wx/choice.h>
#include <wx/spinctrl.h> #include <wx/spinctrl.h>
#include <wx/sizer.h> #include <wx/sizer.h>
#include <wx/checkbox.h> #include <wx/checkbox.h>
#include <wx/panel.h> #include <wx/panel.h>
#include <wx/bitmap.h> #include <wx/bitmap.h>
#include <wx/image.h> #include <wx/image.h>
#include <wx/icon.h> #include <wx/icon.h>
#include <wx/textctrl.h> #include <wx/textctrl.h>
#include <wx/notebook.h> #include <wx/notebook.h>
#include <wx/button.h> #include <wx/button.h>
#include <wx/dialog.h> #include <wx/dialog.h>
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
/// Class DIALOG_EESCHEMA_OPTIONS_BASE /// Class DIALOG_EESCHEMA_OPTIONS_BASE
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
class DIALOG_EESCHEMA_OPTIONS_BASE : public wxDialog class DIALOG_EESCHEMA_OPTIONS_BASE : public wxDialog
{ {
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
private: private:
// Private event handlers // Private event handlers
void _wxFB_OnChooseUnits( wxCommandEvent& event ){ OnChooseUnits( event ); } void _wxFB_OnChooseUnits( wxCommandEvent& event ){ OnChooseUnits( event ); }
protected: protected:
wxNotebook* m_notebook1; wxNotebook* m_notebook1;
wxPanel* m_panel1; wxPanel* m_panel1;
wxStaticText* m_staticText2; wxStaticText* m_staticText2;
wxChoice* m_choiceUnits; wxChoice* m_choiceUnits;
wxStaticText* m_staticText3; wxStaticText* m_staticText3;
wxChoice* m_choiceGridSize; wxChoice* m_choiceGridSize;
wxStaticText* m_staticGridUnits; wxStaticText* m_staticGridUnits;
wxStaticText* m_staticText5; wxStaticText* m_staticText5;
wxSpinCtrl* m_spinLineWidth; wxSpinCtrl* m_spinLineWidth;
wxStaticText* m_staticLineWidthUnits; wxStaticText* m_staticLineWidthUnits;
wxStaticText* m_staticText7; wxStaticText* m_staticText7;
wxSpinCtrl* m_spinTextSize; wxSpinCtrl* m_spinTextSize;
wxStaticText* m_staticTextSizeUnits; wxStaticText* m_staticTextSizeUnits;
wxStaticText* m_staticText9; wxStaticText* m_staticText9;
wxSpinCtrl* m_spinRepeatHorizontal; wxSpinCtrl* m_spinRepeatHorizontal;
wxStaticText* m_staticRepeatXUnits; wxStaticText* m_staticRepeatXUnits;
wxStaticText* m_staticText12; wxStaticText* m_staticText12;
wxSpinCtrl* m_spinRepeatVertical; wxSpinCtrl* m_spinRepeatVertical;
wxStaticText* m_staticRepeatYUnits; wxStaticText* m_staticRepeatYUnits;
wxStaticText* m_staticText16; wxStaticText* m_staticText16;
wxSpinCtrl* m_spinRepeatLabel; wxSpinCtrl* m_spinRepeatLabel;
wxCheckBox* m_checkShowGrid; wxCheckBox* m_checkShowGrid;
wxCheckBox* m_checkShowHiddenPins; wxCheckBox* m_checkShowHiddenPins;
wxCheckBox* m_checkAutoPan; wxCheckBox* m_checkAutoPan;
wxCheckBox* m_checkHVOrientation; wxCheckBox* m_checkHVOrientation;
wxCheckBox* m_checkPageLimits; wxCheckBox* m_checkPageLimits;
wxPanel* m_panel2; wxPanel* m_panel2;
wxStaticText* m_staticText211; wxStaticText* m_staticText211;
wxStaticText* m_staticText15; wxStaticText* m_staticText15;
wxTextCtrl* m_fieldName1; wxTextCtrl* m_fieldName1;
wxStaticText* m_staticText161; wxStaticText* m_staticText161;
wxTextCtrl* m_fieldName2; wxTextCtrl* m_fieldName2;
wxStaticText* m_staticText17; wxStaticText* m_staticText17;
wxTextCtrl* m_fieldName3; wxTextCtrl* m_fieldName3;
wxStaticText* m_staticText18; wxStaticText* m_staticText18;
wxTextCtrl* m_fieldName4; wxTextCtrl* m_fieldName4;
wxStaticText* m_staticText19; wxStaticText* m_staticText19;
wxTextCtrl* m_fieldName5; wxTextCtrl* m_fieldName5;
wxStaticText* m_staticText20; wxStaticText* m_staticText20;
wxTextCtrl* m_fieldName6; wxTextCtrl* m_fieldName6;
wxStaticText* m_staticText21; wxStaticText* m_staticText21;
wxTextCtrl* m_fieldName7; wxTextCtrl* m_fieldName7;
wxStaticText* m_staticText22; wxStaticText* m_staticText22;
wxTextCtrl* m_fieldName8; wxTextCtrl* m_fieldName8;
wxStdDialogButtonSizer* m_sdbSizer1; wxStdDialogButtonSizer* m_sdbSizer1;
wxButton* m_sdbSizer1OK; wxButton* m_sdbSizer1OK;
wxButton* m_sdbSizer1Cancel; wxButton* m_sdbSizer1Cancel;
// Virtual event handlers, overide them in your derived class // Virtual event handlers, overide them in your derived class
virtual void OnChooseUnits( wxCommandEvent& event ) { event.Skip(); } virtual void OnChooseUnits( wxCommandEvent& event ){ event.Skip(); }
public: public:
DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Schematic Editor Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
DIALOG_EESCHEMA_OPTIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Schematic Editor Options"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); ~DIALOG_EESCHEMA_OPTIONS_BASE();
~DIALOG_EESCHEMA_OPTIONS_BASE();
};
};
#endif //__dialog_eeschema_options_base__
#endif //__dialog_eeschema_options_base__
eeschema/hotkeys.cpp
View file @ 1f18ff28
...@@ -429,7 +429,7 @@ void WinEDA_SchematicFrame::OnHotKey( wxDC* DC, int hotkey, ...@@ -429,7 +429,7 @@ void WinEDA_SchematicFrame::OnHotKey( wxDC* DC, int hotkey,
{ {
if( m_ID_current_state != ID_NOCONN_BUTT ) if( m_ID_current_state != ID_NOCONN_BUTT )
SetToolID( ID_NOCONN_BUTT, wxCURSOR_PENCIL, SetToolID( ID_NOCONN_BUTT, wxCURSOR_PENCIL,
_( "Add a no connected flag" ) ); _( "Add \"NoNonnect\" Flags" ) );
OnLeftClick( DC, MousePos ); OnLeftClick( DC, MousePos );
} }
break; break;
......
eeschema/menubar.cpp
View file @ 1f18ff28
...@@ -144,6 +144,7 @@ void WinEDA_SchematicFrame::ReCreateMenuBar() ...@@ -144,6 +144,7 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()
filesMenu->AppendSeparator(); filesMenu->AppendSeparator();
item = new wxMenuItem( filesMenu, wxID_EXIT, _( "&Quit" ), item = new wxMenuItem( filesMenu, wxID_EXIT, _( "&Quit" ),
_( "Quit EESchema" ) ); _( "Quit EESchema" ) );
item->SetBitmap( exit_xpm );
filesMenu->Append( item ); filesMenu->Append( item );
#endif /* !defined( __WXMAC__) */ #endif /* !defined( __WXMAC__) */
......
eeschema/menubar_libedit.cpp
View file @ 1f18ff28
...@@ -76,6 +76,7 @@ void WinEDA_LibeditFrame::ReCreateMenuBar() ...@@ -76,6 +76,7 @@ void WinEDA_LibeditFrame::ReCreateMenuBar()
filesMenu->AppendSeparator(); filesMenu->AppendSeparator();
item = new wxMenuItem( filesMenu, wxID_EXIT, _( "&Quit" ), item = new wxMenuItem( filesMenu, wxID_EXIT, _( "&Quit" ),
_( "Quit Library Editor" ) ); _( "Quit Library Editor" ) );
item->SetBitmap( exit_xpm );
filesMenu->Append( item ); filesMenu->Append( item );
#endif #endif
......
eeschema/read_from_file_schematic_items_descriptions.cpp
View file @ 1f18ff28
...@@ -703,16 +703,17 @@ int ReadPartDescr( wxWindow* frame, char* Line, FILE* f, wxString& aMsgDiag, ...@@ -703,16 +703,17 @@ int ReadPartDescr( wxWindow* frame, char* Line, FILE* f, wxString& aMsgDiag,
if( fieldNdx >= component->GetFieldCount() ) if( fieldNdx >= component->GetFieldCount() )
{ {
// add as many fields as needed so the m_FieldId's are // The first MANDATOR_FIELDS must be constructed within the SCH_COMPONENT
// contiguous, no gaps. // constructor.
while( fieldNdx >= component->GetFieldCount() ) wxASSERT( component->GetFieldCount() >= MANDATORY_FIELDS );
{
int newNdx = component->GetFieldCount();
SCH_FIELD field( wxPoint( 0, 0 ), newNdx, component, // Ignore the fieldNdx, it is not important anymore if within
fieldName ); // the user defined fields region (i.e. >= MANDATORY_FIELDS).
component->AddField( field );
} int newNdx = component->GetFieldCount(); // has this index after insertion
SCH_FIELD field( wxPoint( 0, 0 ), newNdx, component, fieldName );
component->AddField( field );
} }
else else
{ {
......
eeschema/template_fieldnames.h
View file @ 1f18ff28
...@@ -24,7 +24,9 @@ enum NumFieldType { ...@@ -24,7 +24,9 @@ enum NumFieldType {
FOOTPRINT, ///< Field Name Module PCB, i.e. "16DIP300" FOOTPRINT, ///< Field Name Module PCB, i.e. "16DIP300"
DATASHEET, ///< name of datasheet DATASHEET, ///< name of datasheet
MANDATORY_FIELDS, ///< the first 4 are mandatory or fixed, and instantiated in FIELD constructors /// The first 4 are mandatory, and must be instantiated in SCH_COMPONENT
/// and LIB_COMPONENT constructors
MANDATORY_FIELDS,
FIELD1 = MANDATORY_FIELDS, FIELD1 = MANDATORY_FIELDS,
FIELD2, FIELD2,
......
gerbview/gerberframe.cpp
View file @ 1f18ff28
...@@ -90,7 +90,7 @@ BEGIN_EVENT_TABLE( WinEDA_GerberFrame, WinEDA_BasePcbFrame ) ...@@ -90,7 +90,7 @@ BEGIN_EVENT_TABLE( WinEDA_GerberFrame, WinEDA_BasePcbFrame )
EVT_TOOL( wxID_COPY, WinEDA_GerberFrame::Process_Special_Functions ) EVT_TOOL( wxID_COPY, WinEDA_GerberFrame::Process_Special_Functions )
EVT_TOOL( wxID_PASTE, WinEDA_GerberFrame::Process_Special_Functions ) EVT_TOOL( wxID_PASTE, WinEDA_GerberFrame::Process_Special_Functions )
EVT_TOOL( wxID_UNDO, WinEDA_GerberFrame::Process_Special_Functions ) EVT_TOOL( wxID_UNDO, WinEDA_GerberFrame::Process_Special_Functions )
EVT_TOOL( ID_GEN_PRINT, WinEDA_GerberFrame::ToPrinter ) EVT_TOOL( wxID_PRINT, WinEDA_GerberFrame::ToPrinter )
EVT_TOOL( ID_FIND_ITEMS, WinEDA_GerberFrame::Process_Special_Functions ) EVT_TOOL( ID_FIND_ITEMS, WinEDA_GerberFrame::Process_Special_Functions )
EVT_KICAD_CHOICEBOX( ID_TOOLBARH_GERBVIEW_SELECT_LAYER, EVT_KICAD_CHOICEBOX( ID_TOOLBARH_GERBVIEW_SELECT_LAYER,
WinEDA_GerberFrame::Process_Special_Functions ) WinEDA_GerberFrame::Process_Special_Functions )
......
gerbview/tool_gerber.cpp
View file @ 1f18ff28
...@@ -68,7 +68,7 @@ void WinEDA_GerberFrame::ReCreateMenuBar( void ) ...@@ -68,7 +68,7 @@ void WinEDA_GerberFrame::ReCreateMenuBar( void )
filesMenu->AppendSeparator(); filesMenu->AppendSeparator();
filesMenu->Append( ID_GEN_PRINT, _( "P&rint" ), _( "Print gerber" ) ); filesMenu->Append( wxID_PRINT, _( "P&rint" ), _( "Print gerber" ) );
filesMenu->Append( ID_GEN_PLOT, _( "Plot" ), filesMenu->Append( ID_GEN_PLOT, _( "Plot" ),
_( "Plotting in various formats" ) ); _( "Plotting in various formats" ) );
...@@ -177,7 +177,7 @@ void WinEDA_GerberFrame::ReCreateHToolbar( void ) ...@@ -177,7 +177,7 @@ void WinEDA_GerberFrame::ReCreateHToolbar( void )
_( "Undelete" ) ); _( "Undelete" ) );
m_HToolBar->AddSeparator(); m_HToolBar->AddSeparator();
m_HToolBar->AddTool( ID_GEN_PRINT, wxEmptyString, m_HToolBar->AddTool( wxID_PRINT, wxEmptyString,
wxBitmap( print_button ), wxBitmap( print_button ),
_( "Print world" ) ); _( "Print world" ) );
......
include/id.h
View file @ 1f18ff28
...@@ -43,7 +43,6 @@ enum main_id ...@@ -43,7 +43,6 @@ enum main_id
ID_PREFERENCES_HOTKEY_SHOW_CURRENT_LIST, ID_PREFERENCES_HOTKEY_SHOW_CURRENT_LIST,
ID_PREFERENCES_HOTKEY_END, ID_PREFERENCES_HOTKEY_END,
ID_GEN_PRINT,
ID_GEN_PLOT, ID_GEN_PLOT,
ID_GEN_PLOT_PS, ID_GEN_PLOT_PS,
ID_GEN_PLOT_HPGL, ID_GEN_PLOT_HPGL,
...@@ -52,7 +51,6 @@ enum main_id ...@@ -52,7 +51,6 @@ enum main_id
ID_GEN_PLOT_DXF, ID_GEN_PLOT_DXF,
ID_GEN_COPY_SHEET_TO_CLIPBOARD, ID_GEN_COPY_SHEET_TO_CLIPBOARD,
ID_GEN_COPY_BLOCK_TO_CLIPBOARD, ID_GEN_COPY_BLOCK_TO_CLIPBOARD,
ID_GEN_UNUSED0,
ID_GEN_EXPORT_FILE, ID_GEN_EXPORT_FILE,
ID_GEN_EXPORT_SPECCTRA, ID_GEN_EXPORT_SPECCTRA,
......
include/wxPcbStruct.h
View file @ 1f18ff28
...@@ -1073,6 +1073,8 @@ public: ...@@ -1073,6 +1073,8 @@ public:
void InstallOptionsFrame( const wxPoint& pos ); void InstallOptionsFrame( const wxPoint& pos );
void OnCloseWindow( wxCloseEvent& Event ); void OnCloseWindow( wxCloseEvent& Event );
void CloseModuleEditor( wxCommandEvent& Event );
void Process_Special_Functions( wxCommandEvent& event ); void Process_Special_Functions( wxCommandEvent& event );
void RedrawActiveWindow( wxDC* DC, bool EraseBg ); void RedrawActiveWindow( wxDC* DC, bool EraseBg );
void ReCreateHToolbar(); void ReCreateHToolbar();
......
pcbnew/dialog_pad_properties_base.cpp
View file @ 1f18ff28
This diff is collapsed.
pcbnew/dialog_pad_properties_base.fbp
View file @ 1f18ff28
This diff is collapsed.
pcbnew/dialog_pad_properties_base.h
View file @ 1f18ff28
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Apr 16 2008) // C++ code generated with wxFormBuilder (version Apr 16 2008)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO "NOT" EDIT THIS FILE! // PLEASE DO "NOT" EDIT THIS FILE!
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
#ifndef __dialog_pad_properties_base__ #ifndef __dialog_pad_properties_base__
#define __dialog_pad_properties_base__ #define __dialog_pad_properties_base__
#include <wx/intl.h> #include <wx/intl.h>
#include <wx/string.h> #include <wx/string.h>
#include <wx/stattext.h> #include <wx/stattext.h>
#include <wx/gdicmn.h> #include <wx/gdicmn.h>
#include <wx/font.h> #include <wx/font.h>
#include <wx/colour.h> #include <wx/colour.h>
#include <wx/settings.h> #include <wx/settings.h>
#include <wx/textctrl.h> #include <wx/textctrl.h>
#include <wx/statline.h> #include <wx/statline.h>
#include <wx/sizer.h> #include <wx/sizer.h>
#include <wx/statbox.h> #include <wx/statbox.h>
#include <wx/radiobox.h> #include <wx/radiobox.h>
#include <wx/checkbox.h> #include <wx/checkbox.h>
#include <wx/button.h> #include <wx/button.h>
#include <wx/dialog.h> #include <wx/dialog.h>
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
/// Class DIALOG_PAD_PROPERTIES_BASE /// Class DIALOG_PAD_PROPERTIES_BASE
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
class DIALOG_PAD_PROPERTIES_BASE : public wxDialog class DIALOG_PAD_PROPERTIES_BASE : public wxDialog
{ {
private: private:
protected: protected:
enum enum
{ {
wxID_DIALOG_EDIT_PAD = 1000, wxID_DIALOG_EDIT_PAD = 1000,
wxID_PADNUMCTRL, wxID_PADNUMCTRL,
wxID_PADNETNAMECTRL, wxID_PADNETNAMECTRL,
ID_LISTBOX_SHAPE_PAD, ID_LISTBOX_SHAPE_PAD,
ID_RADIOBOX_DRILL_SHAPE, ID_RADIOBOX_DRILL_SHAPE,
ID_LISTBOX_ORIENT_PAD, ID_LISTBOX_ORIENT_PAD,
ID_LISTBOX_TYPE_PAD, ID_LISTBOX_TYPE_PAD,
}; };
wxStaticText* m_PadNumText; wxStaticText* m_PadNumText;
wxTextCtrl* m_PadNumCtrl; wxTextCtrl* m_PadNumCtrl;
wxStaticText* m_PadNameText; wxStaticText* m_PadNameText;
wxTextCtrl* m_PadNetNameCtrl; wxTextCtrl* m_PadNetNameCtrl;
wxStaticText* m_staticText4; wxStaticText* m_staticText4;
wxTextCtrl* m_PadPosition_X_Ctrl; wxTextCtrl* m_PadPosition_X_Ctrl;
wxStaticText* m_PadPosX_Unit; wxStaticText* m_PadPosX_Unit;
wxStaticText* m_staticText41; wxStaticText* m_staticText41;
wxTextCtrl* m_PadPosition_Y_Ctrl; wxTextCtrl* m_PadPosition_Y_Ctrl;
wxStaticText* m_PadPosY_Unit; wxStaticText* m_PadPosY_Unit;
wxStaticLine* m_staticline7; wxStaticLine* m_staticline7;
wxStaticLine* m_staticline8; wxStaticLine* m_staticline8;
wxStaticLine* m_staticline9; wxStaticLine* m_staticline9;
wxStaticText* m_textPadDrillX; wxStaticText* m_textPadDrillX;
wxTextCtrl* m_PadDrill_X_Ctrl; wxTextCtrl* m_PadDrill_X_Ctrl;
wxStaticText* m_PadDrill_X_Unit; wxStaticText* m_PadDrill_X_Unit;
wxStaticText* m_textPadDrillY; wxStaticText* m_textPadDrillY;
wxTextCtrl* m_PadDrill_Y_Ctrl; wxTextCtrl* m_PadDrill_Y_Ctrl;
wxStaticText* m_PadDrill_Y_Unit; wxStaticText* m_PadDrill_Y_Unit;
wxStaticLine* m_staticline4; wxStaticLine* m_staticline4;
wxStaticLine* m_staticline5; wxStaticLine* m_staticline5;
wxStaticLine* m_staticline6; wxStaticLine* m_staticline6;
wxStaticText* m_staticText12; wxStaticText* m_staticText12;
wxTextCtrl* m_ShapeSize_X_Ctrl; wxTextCtrl* m_ShapeSize_X_Ctrl;
wxStaticText* m_PadShapeSizeX_Unit; wxStaticText* m_PadShapeSizeX_Unit;
wxStaticText* m_staticText15; wxStaticText* m_staticText15;
wxTextCtrl* m_ShapeSize_Y_Ctrl; wxTextCtrl* m_ShapeSize_Y_Ctrl;
wxStaticText* m_PadShapeSizeY_Unit; wxStaticText* m_PadShapeSizeY_Unit;
wxStaticText* m_staticText17; wxStaticText* m_staticText17;
wxTextCtrl* m_ShapeOffset_X_Ctrl; wxTextCtrl* m_ShapeOffset_X_Ctrl;
wxStaticText* m_PadShapeOffsetX_Unit; wxStaticText* m_PadShapeOffsetX_Unit;
wxStaticText* m_staticText19; wxStaticText* m_staticText19;
wxTextCtrl* m_ShapeOffset_Y_Ctrl; wxTextCtrl* m_ShapeOffset_Y_Ctrl;
wxStaticText* m_PadShapeOffsetY_Unit; wxStaticText* m_PadShapeOffsetY_Unit;
wxStaticText* m_staticText21; wxStaticText* m_staticText21;
wxTextCtrl* m_ShapeDelta_X_Ctrl; wxTextCtrl* m_ShapeDelta_X_Ctrl;
wxStaticText* m_PadShapeDeltaX_Unit; wxStaticText* m_PadShapeDeltaX_Unit;
wxStaticText* m_staticText23; wxStaticText* m_staticText23;
wxTextCtrl* m_ShapeDelta_Y_Ctrl; wxTextCtrl* m_ShapeDelta_Y_Ctrl;
wxStaticText* m_PadShapeDeltaY_Unit; wxStaticText* m_PadShapeDeltaY_Unit;
wxBoxSizer* m_DrillShapeBoxSizer; wxBoxSizer* m_DrillShapeBoxSizer;
wxRadioBox* m_PadShape; wxRadioBox* m_PadShape;
wxRadioBox* m_DrillShapeCtrl; wxRadioBox* m_DrillShapeCtrl;
wxRadioBox* m_PadOrient; wxRadioBox* m_PadOrient;
wxStaticText* m_PadOrientText; wxStaticText* m_PadOrientText;
wxTextCtrl* m_PadOrientCtrl; wxTextCtrl* m_PadOrientCtrl;
wxStaticText* m_staticText20; wxStaticText* m_staticText20;
wxStaticText* m_staticTextNetClearance; wxStaticText* m_staticTextNetClearance;
wxTextCtrl* m_NetClearanceValueCtrl; wxTextCtrl* m_NetClearanceValueCtrl;
wxStaticText* m_NetClearanceUnits; wxStaticText* m_NetClearanceUnits;
wxStaticLine* m_staticline1; wxStaticLine* m_staticline1;
wxStaticLine* m_staticline2; wxStaticLine* m_staticline2;
wxStaticLine* m_staticline3; wxStaticLine* m_staticline3;
wxStaticText* m_MaskClearanceTitle; wxStaticText* m_MaskClearanceTitle;
wxTextCtrl* m_SolderMaskMarginCtrl; wxTextCtrl* m_SolderMaskMarginCtrl;
wxStaticText* m_SolderMaskMarginUnits; wxStaticText* m_SolderMaskMarginUnits;
wxStaticText* m_staticTextSolderPaste; wxStaticText* m_staticTextSolderPaste;
wxTextCtrl* m_SolderPasteMarginCtrl; wxTextCtrl* m_SolderPasteMarginCtrl;
wxStaticText* m_SolderPasteMarginUnits; wxStaticText* m_SolderPasteMarginUnits;
wxStaticText* m_staticTextRatio; wxStaticText* m_staticTextRatio;
wxTextCtrl* m_SolderPasteMarginRatioCtrl; wxTextCtrl* m_SolderPasteMarginRatioCtrl;
wxStaticText* m_SolderPasteRatioMarginUnits; wxStaticText* m_SolderPasteRatioMarginUnits;
wxRadioBox* m_PadType; wxRadioBox* m_PadType;
wxCheckBox* m_PadLayerCmp; wxCheckBox* m_PadLayerCmp;
wxCheckBox* m_PadLayerCu; wxCheckBox* m_PadLayerCu;
wxCheckBox* m_PadLayerAdhCmp; wxCheckBox* m_PadLayerAdhCmp;
wxCheckBox* m_PadLayerAdhCu; wxCheckBox* m_PadLayerAdhCu;
wxCheckBox* m_PadLayerPateCmp; wxCheckBox* m_PadLayerPateCmp;
wxCheckBox* m_PadLayerPateCu; wxCheckBox* m_PadLayerPateCu;
wxCheckBox* m_PadLayerSilkCmp; wxCheckBox* m_PadLayerSilkCmp;
wxCheckBox* m_PadLayerSilkCu; wxCheckBox* m_PadLayerSilkCu;
wxCheckBox* m_PadLayerMaskCmp; wxCheckBox* m_PadLayerMaskCmp;
wxCheckBox* m_PadLayerMaskCu; wxCheckBox* m_PadLayerMaskCu;
wxCheckBox* m_PadLayerDraft; wxCheckBox* m_PadLayerDraft;
wxCheckBox* m_PadLayerECO1; wxCheckBox* m_PadLayerECO1;
wxCheckBox* m_PadLayerECO2; wxCheckBox* m_PadLayerECO2;
wxStdDialogButtonSizer* m_sdbSizer1; wxStdDialogButtonSizer* m_sdbSizer1;
wxButton* m_sdbSizer1OK; wxButton* m_sdbSizer1OK;
wxButton* m_sdbSizer1Cancel; wxButton* m_sdbSizer1Cancel;
// Virtual event handlers, overide them in your derived class // Virtual event handlers, overide them in your derived class
virtual void OnPadShapeSelection( wxCommandEvent& event ){ event.Skip(); } virtual void OnPadShapeSelection( wxCommandEvent& event ){ event.Skip(); }
virtual void OnDrillShapeSelected( wxCommandEvent& event ){ event.Skip(); } virtual void OnDrillShapeSelected( wxCommandEvent& event ){ event.Skip(); }
virtual void PadOrientEvent( wxCommandEvent& event ){ event.Skip(); } virtual void PadOrientEvent( wxCommandEvent& event ){ event.Skip(); }
virtual void PadTypeSelected( wxCommandEvent& event ){ event.Skip(); } virtual void PadTypeSelected( wxCommandEvent& event ){ event.Skip(); }
virtual void OnCancelButtonClick( wxCommandEvent& event ){ event.Skip(); } virtual void OnCancelButtonClick( wxCommandEvent& event ){ event.Skip(); }
virtual void PadPropertiesAccept( wxCommandEvent& event ){ event.Skip(); } virtual void PadPropertiesAccept( wxCommandEvent& event ){ event.Skip(); }
public: public:
DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWindowID id = wxID_DIALOG_EDIT_PAD, const wxString& title = _("Pad Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 673,488 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxSUNKEN_BORDER ); DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWindowID id = wxID_DIALOG_EDIT_PAD, const wxString& title = _("Pad Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 673,488 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxSUNKEN_BORDER );
~DIALOG_PAD_PROPERTIES_BASE(); ~DIALOG_PAD_PROPERTIES_BASE();
}; };
#endif //__dialog_pad_properties_base__ #endif //__dialog_pad_properties_base__
pcbnew/menubar_modedit.cpp
View file @ 1f18ff28
This diff is collapsed.
pcbnew/menubar_pcbframe.cpp
View file @ 1f18ff28
...@@ -195,7 +195,7 @@ void WinEDA_PcbFrame::ReCreateMenuBar() ...@@ -195,7 +195,7 @@ void WinEDA_PcbFrame::ReCreateMenuBar()
filesMenu->AppendSeparator(); filesMenu->AppendSeparator();
/* Print */ /* Print */
item = new wxMenuItem( filesMenu, ID_GEN_PRINT, _( "&Print" ), item = new wxMenuItem( filesMenu, wxID_PRINT, _( "&Print" ),
_( "Print pcb board" ) ); _( "Print pcb board" ) );
item->SetBitmap( print_button ); item->SetBitmap( print_button );
filesMenu->Append( item ); filesMenu->Append( item );
...@@ -237,6 +237,7 @@ void WinEDA_PcbFrame::ReCreateMenuBar() ...@@ -237,6 +237,7 @@ void WinEDA_PcbFrame::ReCreateMenuBar()
filesMenu->AppendSeparator(); filesMenu->AppendSeparator();
item = new wxMenuItem( filesMenu, wxID_EXIT, _( "&Quit" ), item = new wxMenuItem( filesMenu, wxID_EXIT, _( "&Quit" ),
_( "Quit PCBNew" ) ); _( "Quit PCBNew" ) );
item->SetBitmap( exit_xpm );
filesMenu->Append( item ); filesMenu->Append( item );
#endif /* !defined( __WXMAC__ ) */ #endif /* !defined( __WXMAC__ ) */
......
pcbnew/modedit_onclick.cpp
View file @ 1f18ff28
...@@ -135,6 +135,9 @@ m_Flags != 0\nStruct @%p, type %d m_Flag %X" ), ...@@ -135,6 +135,9 @@ m_Flags != 0\nStruct @%p, type %d m_Flag %X" ),
case ID_MODEDIT_PLACE_ANCHOR: case ID_MODEDIT_PLACE_ANCHOR:
{ {
MODULE* module = GetBoard()->m_Modules; MODULE* module = GetBoard()->m_Modules;
if( module == NULL // No module loaded
|| (module->m_Flags != 0) )
break;
module->m_Flags = 0; module->m_Flags = 0;
SaveCopyInUndoList( module, UR_MODEDIT ); SaveCopyInUndoList( module, UR_MODEDIT );
Place_Ancre( module ); // set the new relatives internal Place_Ancre( module ); // set the new relatives internal
...@@ -145,7 +148,7 @@ m_Flags != 0\nStruct @%p, type %d m_Flag %X" ), ...@@ -145,7 +148,7 @@ m_Flags != 0\nStruct @%p, type %d m_Flag %X" ),
// Replace the module in position 0, to recalculate absolutes // Replace the module in position 0, to recalculate absolutes
// coordinates of items // coordinates of items
module->SetPosition( wxPoint( 0, 0 ) ); module->SetPosition( wxPoint( 0, 0 ) );
SetToolID( 0, wxCURSOR_ARROW, wxEmptyString ); SetToolID( 0, 0, wxEmptyString );
SetCurItem( NULL ); SetCurItem( NULL );
DrawPanel->Refresh(); DrawPanel->Refresh();
} }
...@@ -159,6 +162,8 @@ m_Flags != 0\nStruct @%p, type %d m_Flag %X" ), ...@@ -159,6 +162,8 @@ m_Flags != 0\nStruct @%p, type %d m_Flag %X" ),
break; break;
case ID_PCB_ADD_TEXT_BUTT: case ID_PCB_ADD_TEXT_BUTT:
if( GetBoard()->m_Modules == NULL )
break;
SaveCopyInUndoList( GetBoard()->m_Modules, UR_MODEDIT ); SaveCopyInUndoList( GetBoard()->m_Modules, UR_MODEDIT );
CreateTextModule( GetBoard()->m_Modules, DC ); CreateTextModule( GetBoard()->m_Modules, DC );
break; break;
...@@ -172,10 +177,9 @@ m_Flags != 0\nStruct @%p, type %d m_Flag %X" ), ...@@ -172,10 +177,9 @@ m_Flags != 0\nStruct @%p, type %d m_Flag %X" ),
break; break;
default: default:
DrawPanel->SetCursor( wxCURSOR_ARROW );
DisplayError( this, DisplayError( this,
wxT( "WinEDA_ModuleEditFrame::ProcessCommand error" ) ); wxT( "WinEDA_ModuleEditFrame::ProcessCommand error" ) );
m_ID_current_state = 0; SetToolID( 0, 0, wxEmptyString );
break; break;
} }
......
pcbnew/moduleframe.cpp
View file @ 1f18ff28
This diff is collapsed.
pcbnew/pcbframe.cpp
View file @ 1f18ff28
...@@ -166,7 +166,7 @@ BEGIN_EVENT_TABLE( WinEDA_PcbFrame, WinEDA_BasePcbFrame ) ...@@ -166,7 +166,7 @@ BEGIN_EVENT_TABLE( WinEDA_PcbFrame, WinEDA_BasePcbFrame )
EVT_TOOL( wxID_PASTE, WinEDA_PcbFrame::Process_Special_Functions ) EVT_TOOL( wxID_PASTE, WinEDA_PcbFrame::Process_Special_Functions )
EVT_TOOL( wxID_UNDO, WinEDA_PcbFrame::GetBoardFromUndoList ) EVT_TOOL( wxID_UNDO, WinEDA_PcbFrame::GetBoardFromUndoList )
EVT_TOOL( wxID_REDO, WinEDA_PcbFrame::GetBoardFromRedoList ) EVT_TOOL( wxID_REDO, WinEDA_PcbFrame::GetBoardFromRedoList )
EVT_TOOL( ID_GEN_PRINT, WinEDA_PcbFrame::ToPrinter ) EVT_TOOL( wxID_PRINT, WinEDA_PcbFrame::ToPrinter )
EVT_TOOL( ID_GEN_PLOT_SVG, WinEDA_DrawFrame::SVG_Print ) EVT_TOOL( ID_GEN_PLOT_SVG, WinEDA_DrawFrame::SVG_Print )
EVT_TOOL( ID_GEN_PLOT, WinEDA_PcbFrame::Process_Special_Functions ) EVT_TOOL( ID_GEN_PLOT, WinEDA_PcbFrame::Process_Special_Functions )
EVT_TOOL( ID_FIND_ITEMS, WinEDA_PcbFrame::Process_Special_Functions ) EVT_TOOL( ID_FIND_ITEMS, WinEDA_PcbFrame::Process_Special_Functions )
......
pcbnew/polygons_defs.h 0 → 100644
View file @ 1f18ff28
/*
* file polygons_defs.h
* definitions to use boost::polygon in Kicad
*/
#ifndef _POLYGONS_DEFS_H_
#define _POLYGONS_DEFS_H_
#ifdef USE_BOOST_POLYGON_LIBRARY
#include "boost/polygon/polygon.hpp"
// Define some types used here from boost::polygon
namespace bpl = boost::polygon; // bpl = boost polygon library
using namespace bpl::operators; // +, -, =, ...
typedef int coordinate_type;
typedef bpl::polygon_data<int> KPolygon;
typedef std::vector<KPolygon> KPolygonSet;
typedef bpl::point_data<int> KPolyPoint;
#endif // USE_BOOST_POLYGON_LIBRARY
#endif // #ifndef _POLYGONS_DEFS_H_
pcbnew/tool_modedit.cpp
View file @ 1f18ff28
...@@ -96,7 +96,7 @@ void WinEDA_ModuleEditFrame::ReCreateHToolbar() ...@@ -96,7 +96,7 @@ void WinEDA_ModuleEditFrame::ReCreateHToolbar()
_( "Module Properties" ) ); _( "Module Properties" ) );
m_HToolBar->AddSeparator(); m_HToolBar->AddSeparator();
m_HToolBar->AddTool( ID_GEN_PRINT, wxEmptyString, wxBitmap( print_button ), m_HToolBar->AddTool( wxID_PRINT, wxEmptyString, wxBitmap( print_button ),
_( "Print Module" ) ); _( "Print Module" ) );
m_HToolBar->AddSeparator(); m_HToolBar->AddSeparator();
...@@ -173,7 +173,8 @@ void WinEDA_ModuleEditFrame::ReCreateVToolbar() ...@@ -173,7 +173,8 @@ void WinEDA_ModuleEditFrame::ReCreateVToolbar()
m_VToolBar->AddSeparator(); m_VToolBar->AddSeparator();
m_VToolBar->AddTool( ID_MODEDIT_PLACE_ANCHOR, wxEmptyString, m_VToolBar->AddTool( ID_MODEDIT_PLACE_ANCHOR, wxEmptyString,
wxBitmap( anchor_xpm ), wxBitmap( anchor_xpm ),
_( "Place anchor" ), wxITEM_CHECK ); _( "Place the footprint module reference anchor" ),
wxITEM_CHECK );
m_VToolBar->AddSeparator(); m_VToolBar->AddSeparator();
m_VToolBar->AddTool( ID_MODEDIT_DELETE_ITEM_BUTT, wxEmptyString, m_VToolBar->AddTool( ID_MODEDIT_DELETE_ITEM_BUTT, wxEmptyString,
......
pcbnew/tool_pcb.cpp
View file @ 1f18ff28
...@@ -222,7 +222,7 @@ void WinEDA_PcbFrame::ReCreateHToolbar() ...@@ -222,7 +222,7 @@ void WinEDA_PcbFrame::ReCreateHToolbar()
HELP_REDO ); HELP_REDO );
m_HToolBar->AddSeparator(); m_HToolBar->AddSeparator();
m_HToolBar->AddTool( ID_GEN_PRINT, wxEmptyString, wxBitmap( print_button ), m_HToolBar->AddTool( wxID_PRINT, wxEmptyString, wxBitmap( print_button ),
_( "Print board" ) ); _( "Print board" ) );
m_HToolBar->AddTool( ID_GEN_PLOT, wxEmptyString, wxBitmap( plot_xpm ), m_HToolBar->AddTool( ID_GEN_PLOT, wxEmptyString, wxBitmap( plot_xpm ),
_( "Plot (HPGL, PostScript, or GERBER format)" ) ); _( "Plot (HPGL, PostScript, or GERBER format)" ) );
......
pcbnew/zones_convert_brd_items_to_polygons_with_Boost.cpp
View file @ 1f18ff28
...@@ -22,29 +22,18 @@ ...@@ -22,29 +22,18 @@
#include <math.h> #include <math.h>
#include <vector> #include <vector>
#include "boost/polygon/polygon.hpp"
#include "fctsys.h" #include "fctsys.h"
#include "polygons_defs.h"
#include "common.h" #include "common.h"
#include "pcbnew.h" #include "pcbnew.h"
#include "wxPcbStruct.h" #include "wxPcbStruct.h"
#include "trigo.h" #include "trigo.h"
#include "zones.h" #include "zones.h"
#include "PolyLine.h" #include "PolyLine.h"
#include "boost/polygon/polygon.hpp"
// Define some types used here from boost::polygon
namespace bpl = boost::polygon; // bpl = boost polygon library
using namespace bpl::operators; // +, -, =, ...
using namespace bpl;
typedef int coordinate_type;
typedef bpl::point_data<int> KPolyPoint;
typedef bpl::polygon_data<int> KPolygon;
typedef std::vector< KPolygon > KPolygonSet;
extern void Test_For_Copper_Island_And_Remove( BOARD* aPcb, extern void Test_For_Copper_Island_And_Remove( BOARD* aPcb,
ZONE_CONTAINER* aZone_container ); ZONE_CONTAINER* aZone_container );
......
uncrustify.cfg
View file @ 1f18ff28
...@@ -246,16 +246,16 @@ sp_after_type = force # ignore/add/remove/force ...@@ -246,16 +246,16 @@ sp_after_type = force # ignore/add/remove/force
# Add or remove space in 'template <' vs 'template<'. # Add or remove space in 'template <' vs 'template<'.
# If set to ignore, sp_before_angle is used. # If set to ignore, sp_before_angle is used.
sp_template_angle = ignore # ignore/add/remove/force sp_template_angle = force # ignore/add/remove/force
# Add or remove space before '<>' # Add or remove space before '<>'
sp_before_angle = ignore # ignore/add/remove/force sp_before_angle = ignore # ignore/add/remove/force
# Add or remove space inside '<' and '>' # Add or remove space inside '<' and '>'
sp_inside_angle = ignore # ignore/add/remove/force sp_inside_angle = remove # ignore/add/remove/force
# Add or remove space after '<>' # Add or remove space after '<>'
sp_after_angle = ignore # ignore/add/remove/force sp_after_angle = force # ignore/add/remove/force
# Add or remove space between '<>' and '(' as found in 'new List<byte>();' # Add or remove space between '<>' and '(' as found in 'new List<byte>();'
sp_angle_paren = ignore # ignore/add/remove/force sp_angle_paren = ignore # ignore/add/remove/force
......
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