Browse Source
eeschema: Added: option to print ALL (more than 8) users fields in B.O.M.
eeschema: Added: option to print ALL (more than 8) users fields in B.O.M.
pcbnew: added 5 metric grids and fixed a very minor bug when creating drill map.pull/1/head
charras
17 years ago
18 changed files with 1669 additions and 535 deletions
-
10CHANGELOG.txt
-
39common/common.cpp
-
6common/zoom.cpp
-
1eeschema/CMakeLists.txt
-
29eeschema/build_BOM.cpp
-
382eeschema/dialog_build_BOM.cpp
-
157eeschema/dialog_build_BOM.h
-
159eeschema/dialog_build_BOM_base.cpp
-
1230eeschema/dialog_build_BOM_base.fbp
-
74eeschema/dialog_build_BOM_base.h
-
1eeschema/makefile.include
-
2eeschema/schframe.cpp
-
26include/common.h
-
9include/id.h
-
2pcbnew/basepcbframe.cpp
-
67pcbnew/classpcb.cpp
-
4pcbnew/gen_drill_report_files.cpp
-
6pcbnew/tool_pcb.cpp
@ -0,0 +1,159 @@ |
|||
///////////////////////////////////////////////////////////////////////////
|
|||
// C++ code generated with wxFormBuilder (version Apr 16 2008)
|
|||
// http://www.wxformbuilder.org/
|
|||
//
|
|||
// PLEASE DO "NOT" EDIT THIS FILE!
|
|||
///////////////////////////////////////////////////////////////////////////
|
|||
|
|||
#include "dialog_build_BOM_base.h"
|
|||
|
|||
///////////////////////////////////////////////////////////////////////////
|
|||
|
|||
DIALOG_BUILD_BOM_BASE::DIALOG_BUILD_BOM_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 ); |
|||
|
|||
wxBoxSizer* bMainSizer; |
|||
bMainSizer = new wxBoxSizer( wxHORIZONTAL ); |
|||
|
|||
wxStaticBoxSizer* sbOptionsSizer; |
|||
sbOptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Options:") ), wxVERTICAL ); |
|||
|
|||
wxStaticBoxSizer* sbListOptionsSizer; |
|||
sbListOptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("List items:") ), wxVERTICAL ); |
|||
|
|||
m_ListCmpbyRefItems = new wxCheckBox( this, wxID_ANY, _("Components by reference"), wxDefaultPosition, wxDefaultSize, 0 ); |
|||
|
|||
sbListOptionsSizer->Add( m_ListCmpbyRefItems, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); |
|||
|
|||
m_ListSubCmpItems = new wxCheckBox( this, wxID_ANY, _("Sub components (i.e. U2A, U2B ...)"), wxDefaultPosition, wxDefaultSize, 0 ); |
|||
|
|||
sbListOptionsSizer->Add( m_ListSubCmpItems, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); |
|||
|
|||
m_ListCmpbyValItems = new wxCheckBox( this, wxID_ANY, _("Components by value"), wxDefaultPosition, wxDefaultSize, 0 ); |
|||
|
|||
sbListOptionsSizer->Add( m_ListCmpbyValItems, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); |
|||
|
|||
m_GenListLabelsbyVal = new wxCheckBox( this, wxID_ANY, _("Hierachy pins by name"), wxDefaultPosition, wxDefaultSize, 0 ); |
|||
|
|||
sbListOptionsSizer->Add( m_GenListLabelsbyVal, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); |
|||
|
|||
m_GenListLabelsbySheet = new wxCheckBox( this, wxID_ANY, _("Hierachy pins by sheets"), wxDefaultPosition, wxDefaultSize, 0 ); |
|||
|
|||
sbListOptionsSizer->Add( m_GenListLabelsbySheet, 0, wxALL, 5 ); |
|||
|
|||
sbOptionsSizer->Add( sbListOptionsSizer, 0, wxEXPAND, 5 ); |
|||
|
|||
wxString m_OutputFormCtrlChoices[] = { _("List"), _("Text for spreadsheet import") }; |
|||
int m_OutputFormCtrlNChoices = sizeof( m_OutputFormCtrlChoices ) / sizeof( wxString ); |
|||
m_OutputFormCtrl = new wxRadioBox( this, ID_RADIOBOX_SELECT_FORMAT, _("Output format:"), wxDefaultPosition, wxDefaultSize, m_OutputFormCtrlNChoices, m_OutputFormCtrlChoices, 1, wxRA_SPECIFY_COLS ); |
|||
m_OutputFormCtrl->SetSelection( 0 ); |
|||
sbOptionsSizer->Add( m_OutputFormCtrl, 0, wxALL|wxEXPAND, 5 ); |
|||
|
|||
wxString m_OutputSeparatorCtrlChoices[] = { _("Tab"), _(";"), _(",") }; |
|||
int m_OutputSeparatorCtrlNChoices = sizeof( m_OutputSeparatorCtrlChoices ) / sizeof( wxString ); |
|||
m_OutputSeparatorCtrl = new wxRadioBox( this, wxID_ANY, _("Field separator for spreadsheet import:"), wxDefaultPosition, wxDefaultSize, m_OutputSeparatorCtrlNChoices, m_OutputSeparatorCtrlChoices, 1, wxRA_SPECIFY_COLS|wxRA_SPECIFY_ROWS ); |
|||
m_OutputSeparatorCtrl->SetSelection( 0 ); |
|||
sbOptionsSizer->Add( m_OutputSeparatorCtrl, 1, wxALL, 5 ); |
|||
|
|||
wxStaticBoxSizer* sbBrowseOptSizer; |
|||
sbBrowseOptSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Options:") ), wxVERTICAL ); |
|||
|
|||
m_GetListBrowser = new wxCheckBox( this, wxID_ANY, _("Launch list browser"), wxDefaultPosition, wxDefaultSize, 0 ); |
|||
|
|||
sbBrowseOptSizer->Add( m_GetListBrowser, 0, wxALL|wxEXPAND, 5 ); |
|||
|
|||
sbOptionsSizer->Add( sbBrowseOptSizer, 0, wxEXPAND, 5 ); |
|||
|
|||
bMainSizer->Add( sbOptionsSizer, 0, 0, 5 ); |
|||
|
|||
wxBoxSizer* bRightSizer; |
|||
bRightSizer = new wxBoxSizer( wxVERTICAL ); |
|||
|
|||
wxStaticBoxSizer* sbFieldsSelectionSizer; |
|||
sbFieldsSelectionSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Fields to add:") ), wxVERTICAL ); |
|||
|
|||
wxStaticBoxSizer* sbFixedFieldsSizer; |
|||
sbFixedFieldsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("System Fields:") ), wxVERTICAL ); |
|||
|
|||
m_AddFootprintField = new wxCheckBox( this, wxID_ANY, _("Footprint"), wxDefaultPosition, wxDefaultSize, 0 ); |
|||
|
|||
sbFixedFieldsSizer->Add( m_AddFootprintField, 0, wxALL|wxEXPAND, 5 ); |
|||
|
|||
sbFieldsSelectionSizer->Add( sbFixedFieldsSizer, 0, wxEXPAND, 5 ); |
|||
|
|||
wxStaticBoxSizer* sbUsersFiledsSizer; |
|||
sbUsersFiledsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Users Fields:") ), wxVERTICAL ); |
|||
|
|||
m_AddField1 = new wxCheckBox( this, wxID_ANY, _("Field 1"), wxDefaultPosition, wxDefaultSize, 0 ); |
|||
|
|||
sbUsersFiledsSizer->Add( m_AddField1, 0, wxEXPAND|wxALL, 5 ); |
|||
|
|||
m_AddField2 = new wxCheckBox( this, wxID_ANY, _("Field 2"), wxDefaultPosition, wxDefaultSize, 0 ); |
|||
|
|||
sbUsersFiledsSizer->Add( m_AddField2, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); |
|||
|
|||
m_AddField3 = new wxCheckBox( this, wxID_ANY, _("Field 3"), wxDefaultPosition, wxDefaultSize, 0 ); |
|||
|
|||
sbUsersFiledsSizer->Add( m_AddField3, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); |
|||
|
|||
m_AddField4 = new wxCheckBox( this, wxID_ANY, _("Field 4"), wxDefaultPosition, wxDefaultSize, 0 ); |
|||
|
|||
sbUsersFiledsSizer->Add( m_AddField4, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); |
|||
|
|||
m_AddField5 = new wxCheckBox( this, wxID_ANY, _("Field 5"), wxDefaultPosition, wxDefaultSize, 0 ); |
|||
|
|||
sbUsersFiledsSizer->Add( m_AddField5, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); |
|||
|
|||
m_AddField6 = new wxCheckBox( this, wxID_ANY, _("Field 6"), wxDefaultPosition, wxDefaultSize, 0 ); |
|||
|
|||
sbUsersFiledsSizer->Add( m_AddField6, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); |
|||
|
|||
m_AddField7 = new wxCheckBox( this, wxID_ANY, _("Field 7"), wxDefaultPosition, wxDefaultSize, 0 ); |
|||
|
|||
sbUsersFiledsSizer->Add( m_AddField7, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); |
|||
|
|||
m_AddField8 = new wxCheckBox( this, wxID_ANY, _("Field 8"), wxDefaultPosition, wxDefaultSize, 0 ); |
|||
|
|||
sbUsersFiledsSizer->Add( m_AddField8, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); |
|||
|
|||
m_AddAllFields = new wxCheckBox( this, wxID_ANY, _("All existing users fields"), wxDefaultPosition, wxDefaultSize, 0 ); |
|||
|
|||
sbUsersFiledsSizer->Add( m_AddAllFields, 0, wxALL, 5 ); |
|||
|
|||
sbFieldsSelectionSizer->Add( sbUsersFiledsSizer, 0, wxEXPAND, 5 ); |
|||
|
|||
bRightSizer->Add( sbFieldsSelectionSizer, 1, wxALIGN_CENTER_HORIZONTAL|wxBOTTOM, 5 ); |
|||
|
|||
|
|||
bRightSizer->Add( 10, 10, 0, 0, 5 ); |
|||
|
|||
m_buttonOK = new wxButton( this, wxID_OK, _("Ok"), wxDefaultPosition, wxDefaultSize, 0 ); |
|||
m_buttonOK->SetDefault(); |
|||
m_buttonOK->SetForegroundColour( wxColour( 170, 0, 0 ) ); |
|||
|
|||
bRightSizer->Add( m_buttonOK, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); |
|||
|
|||
m_buttonCANCEL = new wxButton( this, wxID_CANCEL, _("Close"), wxDefaultPosition, wxDefaultSize, 0 ); |
|||
m_buttonCANCEL->SetForegroundColour( wxColour( 11, 0, 202 ) ); |
|||
|
|||
bRightSizer->Add( m_buttonCANCEL, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_CENTER_HORIZONTAL, 5 ); |
|||
|
|||
bMainSizer->Add( bRightSizer, 1, wxRIGHT|wxLEFT, 5 ); |
|||
|
|||
this->SetSizer( bMainSizer ); |
|||
this->Layout(); |
|||
|
|||
// Connect Events
|
|||
m_OutputFormCtrl->Connect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DIALOG_BUILD_BOM_BASE::OnRadioboxSelectFormatSelected ), NULL, this ); |
|||
m_buttonOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_BUILD_BOM_BASE::OnOkClick ), NULL, this ); |
|||
m_buttonCANCEL->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_BUILD_BOM_BASE::OnCancelClick ), NULL, this ); |
|||
} |
|||
|
|||
DIALOG_BUILD_BOM_BASE::~DIALOG_BUILD_BOM_BASE() |
|||
{ |
|||
// Disconnect Events
|
|||
m_OutputFormCtrl->Disconnect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DIALOG_BUILD_BOM_BASE::OnRadioboxSelectFormatSelected ), NULL, this ); |
|||
m_buttonOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_BUILD_BOM_BASE::OnOkClick ), NULL, this ); |
|||
m_buttonCANCEL->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_BUILD_BOM_BASE::OnCancelClick ), NULL, this ); |
|||
} |
|||
1230
eeschema/dialog_build_BOM_base.fbp
File diff suppressed because it is too large
View File
File diff suppressed because it is too large
View File
@ -0,0 +1,74 @@ |
|||
/////////////////////////////////////////////////////////////////////////// |
|||
// C++ code generated with wxFormBuilder (version Apr 16 2008) |
|||
// http://www.wxformbuilder.org/ |
|||
// |
|||
// PLEASE DO "NOT" EDIT THIS FILE! |
|||
/////////////////////////////////////////////////////////////////////////// |
|||
|
|||
#ifndef __dialog_build_BOM_base__ |
|||
#define __dialog_build_BOM_base__ |
|||
|
|||
#include <wx/intl.h> |
|||
|
|||
#include <wx/string.h> |
|||
#include <wx/checkbox.h> |
|||
#include <wx/gdicmn.h> |
|||
#include <wx/font.h> |
|||
#include <wx/colour.h> |
|||
#include <wx/settings.h> |
|||
#include <wx/sizer.h> |
|||
#include <wx/statbox.h> |
|||
#include <wx/radiobox.h> |
|||
#include <wx/button.h> |
|||
#include <wx/dialog.h> |
|||
|
|||
/////////////////////////////////////////////////////////////////////////// |
|||
|
|||
/////////////////////////////////////////////////////////////////////////////// |
|||
/// Class DIALOG_BUILD_BOM_BASE |
|||
/////////////////////////////////////////////////////////////////////////////// |
|||
class DIALOG_BUILD_BOM_BASE : public wxDialog |
|||
{ |
|||
private: |
|||
|
|||
protected: |
|||
enum |
|||
{ |
|||
ID_RADIOBOX_SELECT_FORMAT = 1000, |
|||
}; |
|||
|
|||
wxCheckBox* m_ListCmpbyRefItems; |
|||
wxCheckBox* m_ListSubCmpItems; |
|||
wxCheckBox* m_ListCmpbyValItems; |
|||
wxCheckBox* m_GenListLabelsbyVal; |
|||
wxCheckBox* m_GenListLabelsbySheet; |
|||
wxRadioBox* m_OutputFormCtrl; |
|||
wxRadioBox* m_OutputSeparatorCtrl; |
|||
wxCheckBox* m_GetListBrowser; |
|||
wxCheckBox* m_AddFootprintField; |
|||
wxCheckBox* m_AddField1; |
|||
wxCheckBox* m_AddField2; |
|||
wxCheckBox* m_AddField3; |
|||
wxCheckBox* m_AddField4; |
|||
wxCheckBox* m_AddField5; |
|||
wxCheckBox* m_AddField6; |
|||
wxCheckBox* m_AddField7; |
|||
wxCheckBox* m_AddField8; |
|||
wxCheckBox* m_AddAllFields; |
|||
|
|||
wxButton* m_buttonOK; |
|||
wxButton* m_buttonCANCEL; |
|||
|
|||
// Virtual event handlers, overide them in your derived class |
|||
virtual void OnRadioboxSelectFormatSelected( wxCommandEvent& event ){ event.Skip(); } |
|||
virtual void OnOkClick( wxCommandEvent& event ){ event.Skip(); } |
|||
virtual void OnCancelClick( wxCommandEvent& event ){ event.Skip(); } |
|||
|
|||
|
|||
public: |
|||
DIALOG_BUILD_BOM_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("List of Material"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 415,382 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); |
|||
~DIALOG_BUILD_BOM_BASE(); |
|||
|
|||
}; |
|||
|
|||
#endif //__dialog_build_BOM_base__ |
|||
Write
Preview
Loading…
Cancel
Save
Reference in new issue