Browse Source
3D-viewer: code cleanup.
3D-viewer: code cleanup.
Eeschema: annotate and netlist dialogs: enhancements. Minor coding policy fixes and changes.pull/1/head
jean-pierre charras
13 years ago
26 changed files with 4215 additions and 837 deletions
-
163d-viewer/3d_aux.cpp
-
363d-viewer/3d_class.cpp
-
7033d-viewer/3d_draw.cpp
-
23d-viewer/3d_frame.cpp
-
603d-viewer/3d_read_mesh.cpp
-
533d-viewer/3d_struct.h
-
433d-viewer/3d_viewer.h
-
623d-viewer/info3d_visu.h
-
43eeschema/CMakeLists.txt
-
8eeschema/controle.cpp
-
44eeschema/dialogs/annotate_dialog.cpp
-
11eeschema/dialogs/annotate_dialog.h
-
61eeschema/dialogs/dialog_annotate_base.cpp
-
1116eeschema/dialogs/dialog_annotate_base.fbp
-
26eeschema/dialogs/dialog_annotate_base.h
-
148eeschema/dialogs/dialog_netlist_base.cpp
-
1622eeschema/dialogs/dialog_netlist_base.fbp
-
122eeschema/dialogs/dialog_netlist_base.h
-
4eeschema/eeschema_id.h
-
620eeschema/netlist_control.cpp
-
158eeschema/netlist_control.h
-
34pcbnew/board_items_to_polygon_shape_transform.cpp
-
10pcbnew/controle.cpp
-
15pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp
-
33pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp
-
2pcbnew/dialogs/dialog_export_3Dfiles_base.fbp
703
3d-viewer/3d_draw.cpp
File diff suppressed because it is too large
View File
File diff suppressed because it is too large
View File
1116
eeschema/dialogs/dialog_annotate_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,148 @@ |
|||
///////////////////////////////////////////////////////////////////////////
|
|||
// C++ code generated with wxFormBuilder (version Apr 10 2012)
|
|||
// http://www.wxformbuilder.org/
|
|||
//
|
|||
// PLEASE DO "NOT" EDIT THIS FILE!
|
|||
///////////////////////////////////////////////////////////////////////////
|
|||
|
|||
#include "dialog_netlist_base.h"
|
|||
|
|||
///////////////////////////////////////////////////////////////////////////
|
|||
|
|||
BEGIN_EVENT_TABLE( NETLIST_DIALOG_BASE, DIALOG_SHIM ) |
|||
EVT_NOTEBOOK_PAGE_CHANGED( ID_CHANGE_NOTEBOOK_PAGE, NETLIST_DIALOG_BASE::_wxFB_OnNetlistTypeSelection ) |
|||
EVT_BUTTON( ID_CREATE_NETLIST, NETLIST_DIALOG_BASE::_wxFB_GenNetlist ) |
|||
EVT_BUTTON( wxID_CANCEL, NETLIST_DIALOG_BASE::_wxFB_OnCancelClick ) |
|||
EVT_BUTTON( ID_ADD_PLUGIN, NETLIST_DIALOG_BASE::_wxFB_OnAddPlugin ) |
|||
EVT_BUTTON( ID_DEL_PLUGIN, NETLIST_DIALOG_BASE::_wxFB_OnDelPlugin ) |
|||
END_EVENT_TABLE() |
|||
|
|||
NETLIST_DIALOG_BASE::NETLIST_DIALOG_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style ) |
|||
{ |
|||
this->SetSizeHints( wxDefaultSize, wxDefaultSize ); |
|||
|
|||
wxBoxSizer* bMainSizer; |
|||
bMainSizer = new wxBoxSizer( wxVERTICAL ); |
|||
|
|||
wxBoxSizer* bUpperSizer; |
|||
bUpperSizer = new wxBoxSizer( wxHORIZONTAL ); |
|||
|
|||
wxBoxSizer* bRightSizer; |
|||
bRightSizer = new wxBoxSizer( wxVERTICAL ); |
|||
|
|||
m_NoteBook = new wxNotebook( this, ID_CHANGE_NOTEBOOK_PAGE, wxDefaultPosition, wxDefaultSize, 0 ); |
|||
|
|||
bRightSizer->Add( m_NoteBook, 1, wxEXPAND | wxALL, 5 ); |
|||
|
|||
|
|||
bUpperSizer->Add( bRightSizer, 1, wxEXPAND, 5 ); |
|||
|
|||
wxBoxSizer* bLeftSizer; |
|||
bLeftSizer = new wxBoxSizer( wxVERTICAL ); |
|||
|
|||
|
|||
bLeftSizer->Add( 0, 0, 0, wxTOP, 15 ); |
|||
|
|||
m_buttonNetlist = new wxButton( this, ID_CREATE_NETLIST, _("Netlist"), wxDefaultPosition, wxDefaultSize, 0 ); |
|||
bLeftSizer->Add( m_buttonNetlist, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); |
|||
|
|||
m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); |
|||
bLeftSizer->Add( m_buttonCancel, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); |
|||
|
|||
m_buttonAddPlugin = new wxButton( this, ID_ADD_PLUGIN, _("Add Plugin"), wxDefaultPosition, wxDefaultSize, 0 ); |
|||
bLeftSizer->Add( m_buttonAddPlugin, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); |
|||
|
|||
m_buttonDelPlugin = new wxButton( this, ID_DEL_PLUGIN, _("Remove Plugin"), wxDefaultPosition, wxDefaultSize, 0 ); |
|||
bLeftSizer->Add( m_buttonDelPlugin, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 ); |
|||
|
|||
m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); |
|||
bLeftSizer->Add( m_staticline1, 0, wxEXPAND | wxALL, 5 ); |
|||
|
|||
m_cbUseDefaultNetlistName = new wxCheckBox( this, wxID_ANY, _("Use default netname"), wxDefaultPosition, wxDefaultSize, 0 ); |
|||
bLeftSizer->Add( m_cbUseDefaultNetlistName, 0, wxALL, 5 ); |
|||
|
|||
|
|||
bUpperSizer->Add( bLeftSizer, 0, wxEXPAND, 5 ); |
|||
|
|||
|
|||
bMainSizer->Add( bUpperSizer, 1, wxEXPAND, 5 ); |
|||
|
|||
m_staticTextDefaultFN = new wxStaticText( this, wxID_ANY, _("Default Netlist Filename:"), wxDefaultPosition, wxDefaultSize, 0 ); |
|||
m_staticTextDefaultFN->Wrap( -1 ); |
|||
bMainSizer->Add( m_staticTextDefaultFN, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); |
|||
|
|||
m_textCtrlDefaultFileName = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY ); |
|||
bMainSizer->Add( m_textCtrlDefaultFileName, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); |
|||
|
|||
|
|||
this->SetSizer( bMainSizer ); |
|||
this->Layout(); |
|||
|
|||
this->Centre( wxBOTH ); |
|||
} |
|||
|
|||
NETLIST_DIALOG_BASE::~NETLIST_DIALOG_BASE() |
|||
{ |
|||
} |
|||
|
|||
BEGIN_EVENT_TABLE( NETLIST_DIALOG_ADD_PLUGIN_BASE, DIALOG_SHIM ) |
|||
EVT_BUTTON( wxID_OK, NETLIST_DIALOG_ADD_PLUGIN_BASE::_wxFB_OnOKClick ) |
|||
EVT_BUTTON( wxID_CANCEL, NETLIST_DIALOG_ADD_PLUGIN_BASE::_wxFB_OnCancelClick ) |
|||
EVT_BUTTON( wxID_BROWSE_PLUGINS, NETLIST_DIALOG_ADD_PLUGIN_BASE::_wxFB_OnBrowsePlugins ) |
|||
END_EVENT_TABLE() |
|||
|
|||
NETLIST_DIALOG_ADD_PLUGIN_BASE::NETLIST_DIALOG_ADD_PLUGIN_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style ) |
|||
{ |
|||
this->SetSizeHints( wxDefaultSize, wxDefaultSize ); |
|||
|
|||
wxBoxSizer* bSizerMain; |
|||
bSizerMain = new wxBoxSizer( wxHORIZONTAL ); |
|||
|
|||
wxBoxSizer* bSizerLeft; |
|||
bSizerLeft = new wxBoxSizer( wxVERTICAL ); |
|||
|
|||
m_staticTextCmd = new wxStaticText( this, wxID_ANY, _("Netlist command:"), wxDefaultPosition, wxDefaultSize, 0 ); |
|||
m_staticTextCmd->Wrap( -1 ); |
|||
bSizerLeft->Add( m_staticTextCmd, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); |
|||
|
|||
m_textCtrlCommand = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); |
|||
m_textCtrlCommand->SetMinSize( wxSize( 300,-1 ) ); |
|||
|
|||
bSizerLeft->Add( m_textCtrlCommand, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); |
|||
|
|||
m_staticTextName = new wxStaticText( this, wxID_ANY, _("Name:"), wxDefaultPosition, wxDefaultSize, 0 ); |
|||
m_staticTextName->Wrap( -1 ); |
|||
bSizerLeft->Add( m_staticTextName, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); |
|||
|
|||
m_textCtrlName = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); |
|||
bSizerLeft->Add( m_textCtrlName, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); |
|||
|
|||
|
|||
bSizerMain->Add( bSizerLeft, 1, wxEXPAND, 5 ); |
|||
|
|||
wxBoxSizer* bSizerRight; |
|||
bSizerRight = new wxBoxSizer( wxVERTICAL ); |
|||
|
|||
m_buttonOK = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxDefaultSize, 0 ); |
|||
m_buttonOK->SetDefault(); |
|||
bSizerRight->Add( m_buttonOK, 0, wxALL|wxEXPAND, 5 ); |
|||
|
|||
m_buttonCancel = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); |
|||
bSizerRight->Add( m_buttonCancel, 0, wxALL|wxEXPAND, 5 ); |
|||
|
|||
m_buttonPlugin = new wxButton( this, wxID_BROWSE_PLUGINS, _("Browse Plugins"), wxDefaultPosition, wxDefaultSize, 0 ); |
|||
bSizerRight->Add( m_buttonPlugin, 0, wxALL|wxEXPAND, 5 ); |
|||
|
|||
|
|||
bSizerMain->Add( bSizerRight, 0, wxEXPAND, 5 ); |
|||
|
|||
|
|||
this->SetSizer( bSizerMain ); |
|||
this->Layout(); |
|||
|
|||
this->Centre( wxBOTH ); |
|||
} |
|||
|
|||
NETLIST_DIALOG_ADD_PLUGIN_BASE::~NETLIST_DIALOG_ADD_PLUGIN_BASE() |
|||
{ |
|||
} |
|||
1622
eeschema/dialogs/dialog_netlist_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,122 @@ |
|||
/////////////////////////////////////////////////////////////////////////// |
|||
// C++ code generated with wxFormBuilder (version Apr 10 2012) |
|||
// http://www.wxformbuilder.org/ |
|||
// |
|||
// PLEASE DO "NOT" EDIT THIS FILE! |
|||
/////////////////////////////////////////////////////////////////////////// |
|||
|
|||
#ifndef __DIALOG_NETLIST_BASE_H__ |
|||
#define __DIALOG_NETLIST_BASE_H__ |
|||
|
|||
#include <wx/artprov.h> |
|||
#include <wx/xrc/xmlres.h> |
|||
#include <wx/intl.h> |
|||
#include "dialog_shim.h" |
|||
#include <wx/gdicmn.h> |
|||
#include <wx/notebook.h> |
|||
#include <wx/font.h> |
|||
#include <wx/colour.h> |
|||
#include <wx/settings.h> |
|||
#include <wx/string.h> |
|||
#include <wx/sizer.h> |
|||
#include <wx/button.h> |
|||
#include <wx/statline.h> |
|||
#include <wx/checkbox.h> |
|||
#include <wx/stattext.h> |
|||
#include <wx/textctrl.h> |
|||
#include <wx/dialog.h> |
|||
|
|||
/////////////////////////////////////////////////////////////////////////// |
|||
|
|||
/////////////////////////////////////////////////////////////////////////////// |
|||
/// Class NETLIST_DIALOG_BASE |
|||
/////////////////////////////////////////////////////////////////////////////// |
|||
class NETLIST_DIALOG_BASE : public DIALOG_SHIM |
|||
{ |
|||
DECLARE_EVENT_TABLE() |
|||
private: |
|||
|
|||
// Private event handlers |
|||
void _wxFB_OnNetlistTypeSelection( wxNotebookEvent& event ){ OnNetlistTypeSelection( event ); } |
|||
void _wxFB_GenNetlist( wxCommandEvent& event ){ GenNetlist( event ); } |
|||
void _wxFB_OnCancelClick( wxCommandEvent& event ){ OnCancelClick( event ); } |
|||
void _wxFB_OnAddPlugin( wxCommandEvent& event ){ OnAddPlugin( event ); } |
|||
void _wxFB_OnDelPlugin( wxCommandEvent& event ){ OnDelPlugin( event ); } |
|||
|
|||
|
|||
protected: |
|||
enum |
|||
{ |
|||
ID_CHANGE_NOTEBOOK_PAGE = 1000, |
|||
ID_CREATE_NETLIST, |
|||
ID_ADD_PLUGIN, |
|||
ID_DEL_PLUGIN |
|||
}; |
|||
|
|||
wxNotebook* m_NoteBook; |
|||
wxButton* m_buttonNetlist; |
|||
wxButton* m_buttonCancel; |
|||
wxButton* m_buttonAddPlugin; |
|||
wxButton* m_buttonDelPlugin; |
|||
wxStaticLine* m_staticline1; |
|||
wxCheckBox* m_cbUseDefaultNetlistName; |
|||
wxStaticText* m_staticTextDefaultFN; |
|||
wxTextCtrl* m_textCtrlDefaultFileName; |
|||
|
|||
// Virtual event handlers, overide them in your derived class |
|||
virtual void OnNetlistTypeSelection( wxNotebookEvent& event ) { event.Skip(); } |
|||
virtual void GenNetlist( wxCommandEvent& event ) { event.Skip(); } |
|||
virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); } |
|||
virtual void OnAddPlugin( wxCommandEvent& event ) { event.Skip(); } |
|||
virtual void OnDelPlugin( wxCommandEvent& event ) { event.Skip(); } |
|||
|
|||
|
|||
public: |
|||
|
|||
NETLIST_DIALOG_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Netlist"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 404,334 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); |
|||
~NETLIST_DIALOG_BASE(); |
|||
|
|||
}; |
|||
|
|||
/////////////////////////////////////////////////////////////////////////////// |
|||
/// Class NETLIST_DIALOG_ADD_PLUGIN_BASE |
|||
/////////////////////////////////////////////////////////////////////////////// |
|||
class NETLIST_DIALOG_ADD_PLUGIN_BASE : public DIALOG_SHIM |
|||
{ |
|||
DECLARE_EVENT_TABLE() |
|||
private: |
|||
|
|||
// Private event handlers |
|||
void _wxFB_OnOKClick( wxCommandEvent& event ){ OnOKClick( event ); } |
|||
void _wxFB_OnCancelClick( wxCommandEvent& event ){ OnCancelClick( event ); } |
|||
void _wxFB_OnBrowsePlugins( wxCommandEvent& event ){ OnBrowsePlugins( event ); } |
|||
|
|||
|
|||
protected: |
|||
enum |
|||
{ |
|||
wxID_BROWSE_PLUGINS = 1000 |
|||
}; |
|||
|
|||
wxStaticText* m_staticTextCmd; |
|||
wxTextCtrl* m_textCtrlCommand; |
|||
wxStaticText* m_staticTextName; |
|||
wxTextCtrl* m_textCtrlName; |
|||
wxButton* m_buttonOK; |
|||
wxButton* m_buttonCancel; |
|||
wxButton* m_buttonPlugin; |
|||
|
|||
// Virtual event handlers, overide them in your derived class |
|||
virtual void OnOKClick( wxCommandEvent& event ) { event.Skip(); } |
|||
virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); } |
|||
virtual void OnBrowsePlugins( wxCommandEvent& event ) { event.Skip(); } |
|||
|
|||
|
|||
public: |
|||
|
|||
NETLIST_DIALOG_ADD_PLUGIN_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Plugins:"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 312,144 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); |
|||
~NETLIST_DIALOG_ADD_PLUGIN_BASE(); |
|||
|
|||
}; |
|||
|
|||
#endif //__DIALOG_NETLIST_BASE_H__ |
|||
Write
Preview
Loading…
Cancel
Save
Reference in new issue