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

Rename files and classes to match dialog name. 

Also a bit of formatting cleanup.
This commit is contained in:
Jeff Young 2022-12-11 18:14:54 +00:00
parent a57ca559aa
commit 65538ccad4
8 changed files with 86 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
eeschema/CMakeLists.txt
View File

@ -96,8 +96,8 @@ set( EESCHEMA_DLGS
dialogs/dialog_line_properties_base.cpp dialogs/dialog_line_properties_base.cpp
dialogs/dialog_migrate_buses.cpp dialogs/dialog_migrate_buses.cpp
dialogs/dialog_migrate_buses_base.cpp dialogs/dialog_migrate_buses_base.cpp
dialogs/dialog_netlist.cpp dialogs/dialog_export_netlist.cpp
dialogs/dialog_netlist_base.cpp dialogs/dialog_export_netlist_base.cpp
dialogs/dialog_pin_properties.cpp dialogs/dialog_pin_properties.cpp
dialogs/dialog_pin_properties_base.cpp dialogs/dialog_pin_properties_base.cpp
dialogs/dialog_plot_schematic.cpp dialogs/dialog_plot_schematic.cpp

122
eeschema/dialogs/dialog_netlist.cpp → eeschema/dialogs/dialog_export_netlist.cpp
View File

@ -3,7 +3,7 @@
* *
* Copyright (C) 2013-2017 Jean-Pierre Charras, jp.charras@wanadoo.fr * Copyright (C) 2013-2017 Jean-Pierre Charras, jp.charras@wanadoo.fr
* Copyright (C) 2013 Wayne Stambaugh <stambaughw@gmail.com> * Copyright (C) 2013 Wayne Stambaugh <stambaughw@gmail.com>
* Copyright (C) 1992-2021 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 1992-2022 KiCad Developers, see AUTHORS.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -38,9 +38,8 @@
#include <gestfich.h> #include <gestfich.h>
#include <widgets/wx_html_report_panel.h> #include <widgets/wx_html_report_panel.h>
#include <sch_edit_frame.h> #include <sch_edit_frame.h>
#include <general.h>
#include <netlist.h> #include <netlist.h>
#include <dialogs/dialog_netlist_base.h> #include <dialogs/dialog_export_netlist_base.h>
#include <wildcards_and_files_ext.h> #include <wildcards_and_files_ext.h>
#include <invoke_sch_dialog.h> #include <invoke_sch_dialog.h>
#include <netlist_exporters/netlist_exporter_spice.h> #include <netlist_exporters/netlist_exporter_spice.h>
@ -72,7 +71,7 @@ enum panel_netlist_index {
/* wxPanels for creating the NoteBook pages for each netlist format: */ /* wxPanels for creating the NoteBook pages for each netlist format: */
class NETLIST_PAGE_DIALOG : public wxPanel class EXPORT_NETLIST_PAGE : public wxPanel
{ {
public: public:
@ -85,9 +84,9 @@ public:
* @param title is the title of the notebook page. * @param title is the title of the notebook page.
* @param id_NetType is the netlist ID type. * @param id_NetType is the netlist ID type.
*/ */
NETLIST_PAGE_DIALOG( wxNotebook* aParent, const wxString& aTitle, EXPORT_NETLIST_PAGE( wxNotebook* aParent, const wxString& aTitle,
NETLIST_TYPE_ID aIdNetType, bool aCustom ); NETLIST_TYPE_ID aIdNetType, bool aCustom );
~NETLIST_PAGE_DIALOG() { }; ~EXPORT_NETLIST_PAGE() { };
/** /**
* @return the name of the netlist format for this page. * @return the name of the netlist format for this page.
@ -116,18 +115,15 @@ private:
/* Dialog frame for creating netlists */ /* Dialog frame for creating netlists */
class NETLIST_DIALOG : public NETLIST_DIALOG_BASE class DIALOG_EXPORT_NETLIST : public DIALOG_EXPORT_NETLIST_BASE
{ {
public: public:
NETLIST_DIALOG( SCH_EDIT_FRAME* parent ); DIALOG_EXPORT_NETLIST( SCH_EDIT_FRAME* parent );
~NETLIST_DIALOG() { }; ~DIALOG_EXPORT_NETLIST() { };
private: private:
friend class NETLIST_PAGE_DIALOG;
void InstallCustomPages(); void InstallCustomPages();
NETLIST_PAGE_DIALOG* AddOneCustomPage( const wxString & aTitle, EXPORT_NETLIST_PAGE* AddOneCustomPage( const wxString& aTitle, const wxString& aCommandString,
const wxString & aCommandString,
NETLIST_TYPE_ID aNetTypeId ); NETLIST_TYPE_ID aNetTypeId );
void InstallPageSpice(); void InstallPageSpice();
void InstallPageSpiceModel(); void InstallPageSpiceModel();
@ -180,14 +176,14 @@ private:
public: public:
SCH_EDIT_FRAME* m_Parent; SCH_EDIT_FRAME* m_Parent;
NETLIST_PAGE_DIALOG* m_PanelNetType[5 + CUSTOMPANEL_COUNTMAX]; EXPORT_NETLIST_PAGE* m_PanelNetType[5 + CUSTOMPANEL_COUNTMAX];
}; };
class NETLIST_DIALOG_ADD_GENERATOR : public NETLIST_DIALOG_ADD_GENERATOR_BASE class NETLIST_DIALOG_ADD_GENERATOR : public NETLIST_DIALOG_ADD_GENERATOR_BASE
{ {
public: public:
NETLIST_DIALOG_ADD_GENERATOR( NETLIST_DIALOG* parent ); NETLIST_DIALOG_ADD_GENERATOR( DIALOG_EXPORT_NETLIST* parent );
const wxString GetGeneratorTitle() { return m_textCtrlName->GetValue(); } const wxString GetGeneratorTitle() { return m_textCtrlName->GetValue(); }
const wxString GetGeneratorTCommandLine() { return m_textCtrlCommand->GetValue(); } const wxString GetGeneratorTCommandLine() { return m_textCtrlCommand->GetValue(); }
@ -200,7 +196,7 @@ private:
*/ */
void OnBrowseGenerators( wxCommandEvent& event ) override; void OnBrowseGenerators( wxCommandEvent& event ) override;
NETLIST_DIALOG* m_Parent; DIALOG_EXPORT_NETLIST* m_Parent;
}; };
@ -214,13 +210,13 @@ enum id_netlist {
}; };
BEGIN_EVENT_TABLE( NETLIST_DIALOG, NETLIST_DIALOG_BASE ) BEGIN_EVENT_TABLE( DIALOG_EXPORT_NETLIST, DIALOG_EXPORT_NETLIST_BASE )
EVT_BUTTON( ID_RUN_SIMULATOR, NETLIST_DIALOG::OnRunExternSpiceCommand ) EVT_BUTTON( ID_RUN_SIMULATOR, DIALOG_EXPORT_NETLIST::OnRunExternSpiceCommand )
EVT_UPDATE_UI( ID_RUN_SIMULATOR, NETLIST_DIALOG::OnRunSpiceButtUI ) EVT_UPDATE_UI( ID_RUN_SIMULATOR, DIALOG_EXPORT_NETLIST::OnRunSpiceButtUI )
END_EVENT_TABLE() END_EVENT_TABLE()
NETLIST_PAGE_DIALOG::NETLIST_PAGE_DIALOG( wxNotebook* aParent, const wxString& aTitle, EXPORT_NETLIST_PAGE::EXPORT_NETLIST_PAGE( wxNotebook* aParent, const wxString& aTitle,
NETLIST_TYPE_ID aIdNetType, bool aCustom ) : NETLIST_TYPE_ID aIdNetType, bool aCustom ) :
wxPanel( aParent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ) wxPanel( aParent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL )
{ {
@ -251,25 +247,25 @@ NETLIST_PAGE_DIALOG::NETLIST_PAGE_DIALOG( wxNotebook* aParent, const wxString& a
} }
NETLIST_DIALOG::NETLIST_DIALOG( SCH_EDIT_FRAME* parent ) : DIALOG_EXPORT_NETLIST::DIALOG_EXPORT_NETLIST( SCH_EDIT_FRAME* parent ) :
NETLIST_DIALOG_BASE( parent ) DIALOG_EXPORT_NETLIST_BASE( parent )
{ {
m_Parent = parent; m_Parent = parent;
SCHEMATIC_SETTINGS& settings = m_Parent->Schematic().Settings(); SCHEMATIC_SETTINGS& settings = m_Parent->Schematic().Settings();
for( NETLIST_PAGE_DIALOG*& page : m_PanelNetType) for( EXPORT_NETLIST_PAGE*& page : m_PanelNetType)
page = nullptr; page = nullptr;
// Add notebook pages: // Add notebook pages:
m_PanelNetType[PANELPCBNEW] = m_PanelNetType[PANELPCBNEW] = new EXPORT_NETLIST_PAGE( m_NoteBook, wxT( "KiCad" ),
new NETLIST_PAGE_DIALOG( m_NoteBook, wxT( "KiCad" ), NET_TYPE_PCBNEW, false ); NET_TYPE_PCBNEW, false );
m_PanelNetType[PANELORCADPCB2] = m_PanelNetType[PANELORCADPCB2] = new EXPORT_NETLIST_PAGE( m_NoteBook, wxT( "OrcadPCB2" ),
new NETLIST_PAGE_DIALOG( m_NoteBook, wxT( "OrcadPCB2" ), NET_TYPE_ORCADPCB2, false ); NET_TYPE_ORCADPCB2, false );
m_PanelNetType[PANELCADSTAR] = m_PanelNetType[PANELCADSTAR] = new EXPORT_NETLIST_PAGE( m_NoteBook, wxT( "CadStar" ),
new NETLIST_PAGE_DIALOG( m_NoteBook, wxT( "CadStar" ), NET_TYPE_CADSTAR, false ); NET_TYPE_CADSTAR, false );
InstallPageSpice(); InstallPageSpice();
InstallPageSpiceModel(); InstallPageSpiceModel();
@ -294,7 +290,7 @@ NETLIST_DIALOG::NETLIST_DIALOG( SCH_EDIT_FRAME* parent ) :
} }
void NETLIST_DIALOG::OnRunExternSpiceCommand( wxCommandEvent& event ) void DIALOG_EXPORT_NETLIST::OnRunExternSpiceCommand( wxCommandEvent& event )
{ {
// Run the external spice simulator command // Run the external spice simulator command
NetlistUpdateOpt(); NetlistUpdateOpt();
@ -331,22 +327,22 @@ void NETLIST_DIALOG::OnRunExternSpiceCommand( wxCommandEvent& event )
} }
void NETLIST_DIALOG::OnRunSpiceButtUI( wxUpdateUIEvent& aEvent ) void DIALOG_EXPORT_NETLIST::OnRunSpiceButtUI( wxUpdateUIEvent& aEvent )
{ {
bool disable = m_PanelNetType[PANELSPICE]->m_CommandStringCtrl->IsEmpty(); bool disable = m_PanelNetType[PANELSPICE]->m_CommandStringCtrl->IsEmpty();
aEvent.Enable( !disable ); aEvent.Enable( !disable );
} }
void NETLIST_DIALOG::InstallPageSpice() void DIALOG_EXPORT_NETLIST::InstallPageSpice()
{ {
NETLIST_PAGE_DIALOG* page = m_PanelNetType[PANELSPICE] = EXPORT_NETLIST_PAGE* page = m_PanelNetType[PANELSPICE] =
new NETLIST_PAGE_DIALOG( m_NoteBook, wxT( "Spice" ), NET_TYPE_SPICE, false ); new EXPORT_NETLIST_PAGE( m_NoteBook, wxT( "Spice" ), NET_TYPE_SPICE, false );
SCHEMATIC_SETTINGS& settings = m_Parent->Schematic().Settings(); SCHEMATIC_SETTINGS& settings = m_Parent->Schematic().Settings();
page->m_CurSheetAsRoot = new wxCheckBox( page, ID_CUR_SHEET_AS_ROOT, page->m_CurSheetAsRoot = new wxCheckBox( page, ID_CUR_SHEET_AS_ROOT,
_( "Use current sheet as root" ) ); _( "Use current sheet as root" ) );
page->m_CurSheetAsRoot->SetToolTip( _( "Export netlist only for the current sheet" ) ); page->m_CurSheetAsRoot->SetToolTip( _( "Export netlist only for the current sheet" ) );
page->m_CurSheetAsRoot->SetValue( settings.m_SpiceCurSheetAsRoot ); page->m_CurSheetAsRoot->SetValue( settings.m_SpiceCurSheetAsRoot );
page->m_LeftBoxSizer->Add( page->m_CurSheetAsRoot, 0, wxGROW | wxBOTTOM | wxRIGHT, 5 ); page->m_LeftBoxSizer->Add( page->m_CurSheetAsRoot, 0, wxGROW | wxBOTTOM | wxRIGHT, 5 );
@ -385,33 +381,31 @@ void NETLIST_DIALOG::InstallPageSpice()
} }
void NETLIST_DIALOG::InstallPageSpiceModel() void DIALOG_EXPORT_NETLIST::InstallPageSpiceModel()
{ {
NETLIST_PAGE_DIALOG* page = m_PanelNetType[PANELSPICEMODEL] = EXPORT_NETLIST_PAGE* page = m_PanelNetType[PANELSPICEMODEL] =
new NETLIST_PAGE_DIALOG( m_NoteBook, wxT( "Spice Model" ), NET_TYPE_SPICE_MODEL, false ); new EXPORT_NETLIST_PAGE( m_NoteBook, wxT( "Spice Model" ), NET_TYPE_SPICE_MODEL, false );
SCHEMATIC_SETTINGS& settings = m_Parent->Schematic().Settings(); SCHEMATIC_SETTINGS& settings = m_Parent->Schematic().Settings();
page->m_CurSheetAsRoot = new wxCheckBox( page, ID_CUR_SHEET_AS_ROOT, page->m_CurSheetAsRoot = new wxCheckBox( page, ID_CUR_SHEET_AS_ROOT,
_( "Use current sheet as root" ) ); _( "Use current sheet as root" ) );
page->m_CurSheetAsRoot->SetToolTip( _( "Export netlist only for the current sheet" ) ); page->m_CurSheetAsRoot->SetToolTip( _( "Export netlist only for the current sheet" ) );
page->m_CurSheetAsRoot->SetValue( settings.m_SpiceModelCurSheetAsRoot ); page->m_CurSheetAsRoot->SetValue( settings.m_SpiceModelCurSheetAsRoot );
page->m_LeftBoxSizer->Add( page->m_CurSheetAsRoot, 0, wxGROW | wxBOTTOM | wxRIGHT, 5 ); page->m_LeftBoxSizer->Add( page->m_CurSheetAsRoot, 0, wxGROW | wxBOTTOM | wxRIGHT, 5 );
} }
void NETLIST_DIALOG::InstallCustomPages() void DIALOG_EXPORT_NETLIST::InstallCustomPages()
{ {
NETLIST_PAGE_DIALOG* currPage; EXPORT_NETLIST_PAGE* currPage;
auto cfg = dynamic_cast<EESCHEMA_SETTINGS*>( Kiface().KifaceSettings() ); auto cfg = dynamic_cast<EESCHEMA_SETTINGS*>( Kiface().KifaceSettings() );
wxASSERT( cfg ); wxASSERT( cfg );
if( cfg ) if( cfg )
{ {
for( size_t i = 0; for( size_t i = 0; i < CUSTOMPANEL_COUNTMAX && i < cfg->m_NetlistPanel.plugins.size(); i++ )
i < CUSTOMPANEL_COUNTMAX && i < cfg->m_NetlistPanel.plugins.size();
i++ )
{ {
// pairs of (title, command) are stored // pairs of (title, command) are stored
wxString title = cfg->m_NetlistPanel.plugins[i].name; wxString title = cfg->m_NetlistPanel.plugins[i].name;
@ -430,11 +424,11 @@ void NETLIST_DIALOG::InstallCustomPages()
} }
NETLIST_PAGE_DIALOG* NETLIST_DIALOG::AddOneCustomPage( const wxString& aTitle, EXPORT_NETLIST_PAGE* DIALOG_EXPORT_NETLIST::AddOneCustomPage( const wxString& aTitle,
const wxString& aCommandString, const wxString& aCommandString,
NETLIST_TYPE_ID aNetTypeId ) NETLIST_TYPE_ID aNetTypeId )
{ {
NETLIST_PAGE_DIALOG* currPage = new NETLIST_PAGE_DIALOG( m_NoteBook, aTitle, aNetTypeId, true ); EXPORT_NETLIST_PAGE* currPage = new EXPORT_NETLIST_PAGE( m_NoteBook, aTitle, aNetTypeId, true );
currPage->m_LowBoxSizer->Add( new wxStaticText( currPage, -1, _( "Title:" ) ), 0, currPage->m_LowBoxSizer->Add( new wxStaticText( currPage, -1, _( "Title:" ) ), 0,
wxGROW | wxLEFT | wxRIGHT | wxTOP, 5 ); wxGROW | wxLEFT | wxRIGHT | wxTOP, 5 );
@ -460,13 +454,13 @@ NETLIST_PAGE_DIALOG* NETLIST_DIALOG::AddOneCustomPage( const wxString& aTitle,
} }
void NETLIST_DIALOG::OnNetlistTypeSelection( wxNotebookEvent& event ) void DIALOG_EXPORT_NETLIST::OnNetlistTypeSelection( wxNotebookEvent& event )
{ {
updateGeneratorButtons(); updateGeneratorButtons();
} }
void NETLIST_DIALOG::NetlistUpdateOpt() void DIALOG_EXPORT_NETLIST::NetlistUpdateOpt()
{ {
bool saveAllVoltages = m_PanelNetType[ PANELSPICE ]->m_SaveAllVoltages->IsChecked(); bool saveAllVoltages = m_PanelNetType[ PANELSPICE ]->m_SaveAllVoltages->IsChecked();
bool saveAllCurrents = m_PanelNetType[ PANELSPICE ]->m_SaveAllCurrents->IsChecked(); bool saveAllCurrents = m_PanelNetType[ PANELSPICE ]->m_SaveAllCurrents->IsChecked();
@ -485,7 +479,7 @@ void NETLIST_DIALOG::NetlistUpdateOpt()
} }
bool NETLIST_DIALOG::TransferDataFromWindow() bool DIALOG_EXPORT_NETLIST::TransferDataFromWindow()
{ {
wxFileName fn; wxFileName fn;
wxString fileWildcard; wxString fileWildcard;
@ -494,8 +488,8 @@ bool NETLIST_DIALOG::TransferDataFromWindow()
NetlistUpdateOpt(); NetlistUpdateOpt();
NETLIST_PAGE_DIALOG* currPage; EXPORT_NETLIST_PAGE* currPage;
currPage = (NETLIST_PAGE_DIALOG*) m_NoteBook->GetCurrentPage(); currPage = (EXPORT_NETLIST_PAGE*) m_NoteBook->GetCurrentPage();
unsigned netlist_opt = 0; unsigned netlist_opt = 0;
@ -512,15 +506,19 @@ bool NETLIST_DIALOG::TransferDataFromWindow()
if( currPage->m_SaveAllVoltages->GetValue() ) if( currPage->m_SaveAllVoltages->GetValue() )
netlist_opt |= NETLIST_EXPORTER_SPICE::OPTION_SAVE_ALL_VOLTAGES; netlist_opt |= NETLIST_EXPORTER_SPICE::OPTION_SAVE_ALL_VOLTAGES;
if( currPage->m_SaveAllCurrents->GetValue() ) if( currPage->m_SaveAllCurrents->GetValue() )
netlist_opt |= NETLIST_EXPORTER_SPICE::OPTION_SAVE_ALL_CURRENTS; netlist_opt |= NETLIST_EXPORTER_SPICE::OPTION_SAVE_ALL_CURRENTS;
if( currPage->m_CurSheetAsRoot->GetValue() ) if( currPage->m_CurSheetAsRoot->GetValue() )
netlist_opt |= NETLIST_EXPORTER_SPICE::OPTION_CUR_SHEET_AS_ROOT; netlist_opt |= NETLIST_EXPORTER_SPICE::OPTION_CUR_SHEET_AS_ROOT;
break; break;
case NET_TYPE_SPICE_MODEL: case NET_TYPE_SPICE_MODEL:
if( currPage->m_CurSheetAsRoot->GetValue() ) if( currPage->m_CurSheetAsRoot->GetValue() )
netlist_opt |= NETLIST_EXPORTER_SPICE::OPTION_CUR_SHEET_AS_ROOT; netlist_opt |= NETLIST_EXPORTER_SPICE::OPTION_CUR_SHEET_AS_ROOT;
break; break;
case NET_TYPE_CADSTAR: case NET_TYPE_CADSTAR:
@ -575,7 +573,7 @@ bool NETLIST_DIALOG::TransferDataFromWindow()
} }
bool NETLIST_DIALOG::FilenamePrms( NETLIST_TYPE_ID aType, wxString * aExt, wxString * aWildCard ) bool DIALOG_EXPORT_NETLIST::FilenamePrms( NETLIST_TYPE_ID aType, wxString * aExt, wxString * aWildCard )
{ {
wxString fileExt; wxString fileExt;
wxString fileWildcard; wxString fileWildcard;
@ -618,7 +616,7 @@ bool NETLIST_DIALOG::FilenamePrms( NETLIST_TYPE_ID aType, wxString * aExt, wxStr
} }
void NETLIST_DIALOG::WriteCurrentNetlistSetup() void DIALOG_EXPORT_NETLIST::WriteCurrentNetlistSetup()
{ {
NetlistUpdateOpt(); NetlistUpdateOpt();
@ -633,7 +631,7 @@ void NETLIST_DIALOG::WriteCurrentNetlistSetup()
// Update existing custom pages // Update existing custom pages
for( int ii = 0; ii < CUSTOMPANEL_COUNTMAX; ii++ ) for( int ii = 0; ii < CUSTOMPANEL_COUNTMAX; ii++ )
{ {
NETLIST_PAGE_DIALOG* currPage = m_PanelNetType[ii + PANELCUSTOMBASE]; EXPORT_NETLIST_PAGE* currPage = m_PanelNetType[ii + PANELCUSTOMBASE];
if( currPage == nullptr ) if( currPage == nullptr )
break; break;
@ -650,9 +648,9 @@ void NETLIST_DIALOG::WriteCurrentNetlistSetup()
} }
void NETLIST_DIALOG::OnDelGenerator( wxCommandEvent& event ) void DIALOG_EXPORT_NETLIST::OnDelGenerator( wxCommandEvent& event )
{ {
NETLIST_PAGE_DIALOG* currPage = (NETLIST_PAGE_DIALOG*) m_NoteBook->GetCurrentPage(); EXPORT_NETLIST_PAGE* currPage = (EXPORT_NETLIST_PAGE*) m_NoteBook->GetCurrentPage();
if( !currPage->IsCustom() ) if( !currPage->IsCustom() )
return; return;
@ -669,7 +667,7 @@ void NETLIST_DIALOG::OnDelGenerator( wxCommandEvent& event )
} }
void NETLIST_DIALOG::OnAddGenerator( wxCommandEvent& event ) void DIALOG_EXPORT_NETLIST::OnAddGenerator( wxCommandEvent& event )
{ {
NETLIST_DIALOG_ADD_GENERATOR dlg( this ); NETLIST_DIALOG_ADD_GENERATOR dlg( this );
@ -681,7 +679,7 @@ void NETLIST_DIALOG::OnAddGenerator( wxCommandEvent& event )
// Verify it does not exists // Verify it does not exists
int netTypeId = PANELCUSTOMBASE; // the first not used type id int netTypeId = PANELCUSTOMBASE; // the first not used type id
NETLIST_PAGE_DIALOG* currPage; EXPORT_NETLIST_PAGE* currPage;
for( int ii = 0; ii < CUSTOMPANEL_COUNTMAX; ii++ ) for( int ii = 0; ii < CUSTOMPANEL_COUNTMAX; ii++ )
{ {
@ -710,7 +708,7 @@ void NETLIST_DIALOG::OnAddGenerator( wxCommandEvent& event )
} }
NETLIST_DIALOG_ADD_GENERATOR::NETLIST_DIALOG_ADD_GENERATOR( NETLIST_DIALOG* parent ) : NETLIST_DIALOG_ADD_GENERATOR::NETLIST_DIALOG_ADD_GENERATOR( DIALOG_EXPORT_NETLIST* parent ) :
NETLIST_DIALOG_ADD_GENERATOR_BASE( parent ) NETLIST_DIALOG_ADD_GENERATOR_BASE( parent )
{ {
m_Parent = parent; m_Parent = parent;
@ -781,9 +779,9 @@ void NETLIST_DIALOG_ADD_GENERATOR::OnBrowseGenerators( wxCommandEvent& event )
} }
void NETLIST_DIALOG::updateGeneratorButtons() void DIALOG_EXPORT_NETLIST::updateGeneratorButtons()
{ {
NETLIST_PAGE_DIALOG* currPage = (NETLIST_PAGE_DIALOG*) m_NoteBook->GetCurrentPage(); EXPORT_NETLIST_PAGE* currPage = (EXPORT_NETLIST_PAGE*) m_NoteBook->GetCurrentPage();
if( currPage == nullptr ) if( currPage == nullptr )
return; return;
@ -794,7 +792,7 @@ void NETLIST_DIALOG::updateGeneratorButtons()
int InvokeDialogNetList( SCH_EDIT_FRAME* aCaller ) int InvokeDialogNetList( SCH_EDIT_FRAME* aCaller )
{ {
NETLIST_DIALOG dlg( aCaller ); DIALOG_EXPORT_NETLIST dlg( aCaller );
int ret = dlg.ShowModal(); int ret = dlg.ShowModal();
aCaller->SaveProjectSettings(); aCaller->SaveProjectSettings();

20
eeschema/dialogs/dialog_netlist_base.cpp → eeschema/dialogs/dialog_export_netlist_base.cpp
View File

@ -7,17 +7,17 @@
#include "widgets/wx_html_report_panel.h" #include "widgets/wx_html_report_panel.h"
#include "dialog_netlist_base.h" #include "dialog_export_netlist_base.h"
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
BEGIN_EVENT_TABLE( NETLIST_DIALOG_BASE, DIALOG_SHIM ) BEGIN_EVENT_TABLE( DIALOG_EXPORT_NETLIST_BASE, DIALOG_SHIM )
EVT_NOTEBOOK_PAGE_CHANGED( ID_CHANGE_NOTEBOOK_PAGE, NETLIST_DIALOG_BASE::_wxFB_OnNetlistTypeSelection ) EVT_NOTEBOOK_PAGE_CHANGED( ID_CHANGE_NOTEBOOK_PAGE, DIALOG_EXPORT_NETLIST_BASE::_wxFB_OnNetlistTypeSelection )
EVT_BUTTON( ID_ADD_PLUGIN, NETLIST_DIALOG_BASE::_wxFB_OnAddGenerator ) EVT_BUTTON( ID_ADD_PLUGIN, DIALOG_EXPORT_NETLIST_BASE::_wxFB_OnAddGenerator )
EVT_BUTTON( ID_DEL_PLUGIN, NETLIST_DIALOG_BASE::_wxFB_OnDelGenerator ) EVT_BUTTON( ID_DEL_PLUGIN, DIALOG_EXPORT_NETLIST_BASE::_wxFB_OnDelGenerator )
END_EVENT_TABLE() 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 ) DIALOG_EXPORT_NETLIST_BASE::DIALOG_EXPORT_NETLIST_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 ); this->SetSizeHints( wxDefaultSize, wxDefaultSize );
@ -31,18 +31,18 @@ NETLIST_DIALOG_BASE::NETLIST_DIALOG_BASE( wxWindow* parent, wxWindowID id, const
m_NoteBook->SetMinSize( wxSize( 540,-1 ) ); m_NoteBook->SetMinSize( wxSize( 540,-1 ) );
bUpperSizer->Add( m_NoteBook, 0, wxEXPAND | wxALL, 5 ); bUpperSizer->Add( m_NoteBook, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 10 );
wxBoxSizer* bSizerMsgPanel; wxBoxSizer* bSizerMsgPanel;
bSizerMsgPanel = new wxBoxSizer( wxVERTICAL ); bSizerMsgPanel = new wxBoxSizer( wxVERTICAL );
m_MessagesBox = new WX_HTML_REPORT_PANEL( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_MessagesBox = new WX_HTML_REPORT_PANEL( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
m_MessagesBox->SetMinSize( wxSize( 300,150 ) ); m_MessagesBox->SetMinSize( wxSize( 600,150 ) );
bSizerMsgPanel->Add( m_MessagesBox, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); bSizerMsgPanel->Add( m_MessagesBox, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
bUpperSizer->Add( bSizerMsgPanel, 1, wxEXPAND, 5 ); bUpperSizer->Add( bSizerMsgPanel, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
bMainSizer->Add( bUpperSizer, 1, wxEXPAND, 5 ); bMainSizer->Add( bUpperSizer, 1, wxEXPAND, 5 );
@ -75,7 +75,7 @@ NETLIST_DIALOG_BASE::NETLIST_DIALOG_BASE( wxWindow* parent, wxWindowID id, const
this->Centre( wxBOTH ); this->Centre( wxBOTH );
} }
NETLIST_DIALOG_BASE::~NETLIST_DIALOG_BASE() DIALOG_EXPORT_NETLIST_BASE::~DIALOG_EXPORT_NETLIST_BASE()
{ {
} }

14
eeschema/dialogs/dialog_netlist_base.fbp → eeschema/dialogs/dialog_export_netlist_base.fbp
View File

@ -11,13 +11,13 @@
<property name="embedded_files_path">res</property> <property name="embedded_files_path">res</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_netlist_base</property> <property name="file">dialog_export_netlist_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="image_path_wrapper_function_name"></property> <property name="image_path_wrapper_function_name"></property>
<property name="indent_with_spaces"></property> <property name="indent_with_spaces"></property>
<property name="internationalize">1</property> <property name="internationalize">1</property>
<property name="name">dialog_netlist_base</property> <property name="name">DIALOG_EXPORT_NETLIST_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>
@ -45,7 +45,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">NETLIST_DIALOG_BASE</property> <property name="name">DIALOG_EXPORT_NETLIST_BASE</property>
<property name="pos"></property> <property name="pos"></property>
<property name="size">-1,-1</property> <property name="size">-1,-1</property>
<property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property> <property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>
@ -71,8 +71,8 @@
<property name="orient">wxVERTICAL</property> <property name="orient">wxVERTICAL</property>
<property name="permission">none</property> <property name="permission">none</property>
<object class="sizeritem" expanded="0"> <object class="sizeritem" expanded="0">
<property name="border">5</property> <property name="border">10</property>
<property name="flag">wxEXPAND | wxALL</property> <property name="flag">wxEXPAND|wxTOP|wxRIGHT|wxLEFT</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxNotebook" expanded="0"> <object class="wxNotebook" expanded="0">
<property name="BottomDockable">1</property> <property name="BottomDockable">1</property>
@ -132,7 +132,7 @@
</object> </object>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="1">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxEXPAND</property> <property name="flag">wxEXPAND|wxTOP|wxRIGHT|wxLEFT</property>
<property name="proportion">1</property> <property name="proportion">1</property>
<object class="wxBoxSizer" expanded="1"> <object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property> <property name="minimum_size"></property>
@ -176,7 +176,7 @@
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="min_size"></property> <property name="min_size"></property>
<property name="minimize_button">0</property> <property name="minimize_button">0</property>
<property name="minimum_size">300,150</property> <property name="minimum_size">600,150</property>
<property name="moveable">1</property> <property name="moveable">1</property>
<property name="name">m_MessagesBox</property> <property name="name">m_MessagesBox</property>
<property name="pane_border">1</property> <property name="pane_border">1</property>

8
eeschema/dialogs/dialog_netlist_base.h → eeschema/dialogs/dialog_export_netlist_base.h
View File

@ -32,9 +32,9 @@ class WX_HTML_REPORT_PANEL;
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
/// Class NETLIST_DIALOG_BASE /// Class DIALOG_EXPORT_NETLIST_BASE
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
class NETLIST_DIALOG_BASE : public DIALOG_SHIM class DIALOG_EXPORT_NETLIST_BASE : public DIALOG_SHIM
{ {
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
private: private:
@ -70,9 +70,9 @@ class NETLIST_DIALOG_BASE : public DIALOG_SHIM
public: public:
NETLIST_DIALOG_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Export Netlist"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); DIALOG_EXPORT_NETLIST_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Export Netlist"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
~NETLIST_DIALOG_BASE(); ~DIALOG_EXPORT_NETLIST_BASE();
}; };

4
eeschema/invoke_sch_dialog.h
View File

@ -71,8 +71,8 @@ int InvokeDialogCreateBOM( SCH_EDIT_FRAME* aCaller );
/** /**
* Create and shows NETLIST_DIALOG and returns whatever * Create and shows DIALOG_EXPORT_NETLIST and returns whatever
* NETLIST_DIALOG::ShowModal() returns. * DIALOG_EXPORT_NETLIST::ShowModal() returns.
* *
* @param int - NET_PLUGIN_CHANGE means user added or deleted a plugin, * @param int - NET_PLUGIN_CHANGE means user added or deleted a plugin,
* wxID_OK, or wxID_CANCEL. * wxID_OK, or wxID_CANCEL.

0
pcbnew/dialogs/dialog_netlist.h → pcbnew/dialogs/dialog_export_netlist.h
View File

2
pcbnew/dialogs/dialog_netlist.cpp
View File

@ -35,7 +35,7 @@
#include <netlist_reader/pcb_netlist.h> #include <netlist_reader/pcb_netlist.h>
#include <netlist_reader/board_netlist_updater.h> #include <netlist_reader/board_netlist_updater.h>
#include <project/project_file.h> // LAST_PATH_TYPE #include <project/project_file.h> // LAST_PATH_TYPE
#include <dialog_netlist.h> #include <dialog_export_netlist.h>
#include <widgets/wx_html_report_panel.h> #include <widgets/wx_html_report_panel.h>
#include <wx/filedlg.h> #include <wx/filedlg.h>