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

Schematic Setup dialog. 

Includes:
- moving some of the project settings from the Preferences dialog
- ERC severites
- project-specific field-name templates

Fixes https://gitlab.com/kicad/code/kicad/issues/2145
This commit is contained in:
Jeff Young 2020-03-10 18:46:57 +00:00
parent b054e59a41
commit 437f888c25
51 changed files with 3500 additions and 2516 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pcbnew/dialogs/panel_setup_drc_severities.cpp → common/dialogs/panel_setup_severities.cpp
View File

@ -21,16 +21,17 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
#include <drc/drc.h>
#include <widgets/paged_dialog.h> #include <widgets/paged_dialog.h>
#include <widgets/ui_common.h> #include <widgets/ui_common.h>
#include "panel_setup_drc_severities.h" #include <drc_item.h>
#include "panel_setup_severities.h"
PANEL_SETUP_DRC_SEVERITIES::PANEL_SETUP_DRC_SEVERITIES( PAGED_DIALOG* aParent, PANEL_SETUP_SEVERITIES::PANEL_SETUP_SEVERITIES( PAGED_DIALOG* aParent,
PCB_EDIT_FRAME* aFrame ) : std::map<int, int>& aSeverities,
int aFirstErrorCode, int aLastErrorCode ) :
wxPanel( aParent->GetTreebook() ), wxPanel( aParent->GetTreebook() ),
m_brdSettings( aFrame->GetBoard()->GetDesignSettings() ) m_severities( aSeverities )
{ {
wxString severities[] = { _( "Error" ), _( "Warning" ), _( "Ignore" ) }; wxString severities[] = { _( "Error" ), _( "Warning" ), _( "Ignore" ) };
int baseID = 1000; int baseID = 1000;
@ -43,7 +44,7 @@ PANEL_SETUP_DRC_SEVERITIES::PANEL_SETUP_DRC_SEVERITIES( PAGED_DIALOG* aParent,
wxFlexGridSizer* gridSizer = new wxFlexGridSizer( 0, 2, 0, 5 ); wxFlexGridSizer* gridSizer = new wxFlexGridSizer( 0, 2, 0, 5 );
gridSizer->SetFlexibleDirection( wxBOTH ); gridSizer->SetFlexibleDirection( wxBOTH );
for( int errorCode = DRCE_FIRST; errorCode <= DRCE_LAST; ++errorCode ) for( int errorCode = aFirstErrorCode; errorCode <= aLastErrorCode; ++errorCode )
{ {
DRC_ITEM drcItem( errorCode, wxEmptyString ); DRC_ITEM drcItem( errorCode, wxEmptyString );
wxString msg = drcItem.GetErrorText(); wxString msg = drcItem.GetErrorText();
@ -87,9 +88,9 @@ PANEL_SETUP_DRC_SEVERITIES::PANEL_SETUP_DRC_SEVERITIES( PAGED_DIALOG* aParent,
} }
void PANEL_SETUP_DRC_SEVERITIES::ImportSettingsFrom( BOARD* aBoard ) void PANEL_SETUP_SEVERITIES::ImportSettingsFrom( std::map<int, int>& aSettings )
{ {
for( auto const& entry : aBoard->GetDesignSettings().m_DRCSeverities ) for( auto const& entry : aSettings )
{ {
if( m_buttonMap.count( entry.first ) ) if( m_buttonMap.count( entry.first ) )
{ {
@ -104,9 +105,9 @@ void PANEL_SETUP_DRC_SEVERITIES::ImportSettingsFrom( BOARD* aBoard )
} }
bool PANEL_SETUP_DRC_SEVERITIES::TransferDataToWindow() bool PANEL_SETUP_SEVERITIES::TransferDataToWindow()
{ {
for( auto const& entry : m_brdSettings.m_DRCSeverities ) for( auto const& entry : m_severities )
{ {
if( m_buttonMap.count( entry.first ) ) if( m_buttonMap.count( entry.first ) )
{ {
@ -123,7 +124,7 @@ bool PANEL_SETUP_DRC_SEVERITIES::TransferDataToWindow()
} }
bool PANEL_SETUP_DRC_SEVERITIES::TransferDataFromWindow() bool PANEL_SETUP_SEVERITIES::TransferDataFromWindow()
{ {
for( auto const& entry : m_buttonMap ) for( auto const& entry : m_buttonMap )
{ {
@ -136,7 +137,7 @@ bool PANEL_SETUP_DRC_SEVERITIES::TransferDataFromWindow()
else if( entry.second[2]->GetValue() ) else if( entry.second[2]->GetValue() )
severity = RPT_SEVERITY_IGNORE; severity = RPT_SEVERITY_IGNORE;
m_brdSettings.m_DRCSeverities[ entry.first ] = severity; m_severities[ entry.first ] = severity;
} }
return true; return true;

21
pcbnew/dialogs/panel_setup_drc_severities.h → common/dialogs/panel_setup_severities.h
View File

@ -22,35 +22,34 @@
*/ */
#ifndef KICAD_PANEL_SETUP_DRC_SEVERITIES_H #ifndef KICAD_PANEL_SETUP_SEVERITIES_H
#define KICAD_PANEL_SETUP_DRC_SEVERITIES_H #define KICAD_PANEL_SETUP_SEVERITIES_H
#include <map> #include <map>
#include <wx/panel.h> #include <wx/panel.h>
class BOARD;
class BOARD_DESIGN_SETTINGS;
class PAGED_DIALOG; class PAGED_DIALOG;
class PCB_EDIT_FRAME; class EDA_DRAW_FRAME;
class wxRadioBox; class wxRadioBox;
class PANEL_SETUP_DRC_SEVERITIES : public wxPanel class PANEL_SETUP_SEVERITIES : public wxPanel
{ {
private: private:
BOARD_DESIGN_SETTINGS& m_brdSettings; std::map<int, int>& m_severities;
std::map<int, wxRadioButton*[4]> m_buttonMap; // map from DRC error code to button group std::map<int, wxRadioButton*[4]> m_buttonMap; // map from DRC error code to button group
public: public:
PANEL_SETUP_DRC_SEVERITIES( PAGED_DIALOG* aParent, PCB_EDIT_FRAME* aFrame ); PANEL_SETUP_SEVERITIES( PAGED_DIALOG* aParent, std::map<int, int>& aSeverities,
~PANEL_SETUP_DRC_SEVERITIES( ) { }; int aFirstErrorCode, int aLastErrorCode );
~PANEL_SETUP_SEVERITIES( ) { };
void ImportSettingsFrom( BOARD* aBoard ); void ImportSettingsFrom( std::map<int, int>& aSettings );
private: private:
bool TransferDataToWindow() override; bool TransferDataToWindow() override;
bool TransferDataFromWindow() override; bool TransferDataFromWindow() override;
}; };
#endif //KICAD_PANEL_SETUP_DRC_SEVERITIES_H #endif //KICAD_PANEL_SETUP_SEVERITIES_H

3
common/eda_base_frame.cpp
View File

@ -680,6 +680,9 @@ void EDA_BASE_FRAME::OnPreferences( wxCommandEvent& event )
if( manager ) if( manager )
static_cast<EDA_BASE_FRAME*>( manager )->InstallPreferences( &dlg, hotkeysPanel ); static_cast<EDA_BASE_FRAME*>( manager )->InstallPreferences( &dlg, hotkeysPanel );
for( int i = 0; i < book->GetPageCount(); ++i )
book->GetPage( i )->Layout();
if( dlg.ShowModal() == wxID_OK ) if( dlg.ShowModal() == wxID_OK )
dlg.Kiway().CommonSettingsChanged( false ); dlg.Kiway().CommonSettingsChanged( false );
} }

6
eeschema/CMakeLists.txt
View File

@ -82,10 +82,13 @@ set( EESCHEMA_DLGS
dialogs/dialog_rescue_each.cpp dialogs/dialog_rescue_each.cpp
dialogs/dialog_rescue_each_base.cpp dialogs/dialog_rescue_each_base.cpp
dialogs/dialog_edit_sheet_pin.cpp dialogs/dialog_edit_sheet_pin.cpp
dialogs/dialog_sch_import_settings.cpp
dialogs/dialog_sch_import_settings_base.cpp
dialogs/dialog_sch_sheet_props.cpp dialogs/dialog_sch_sheet_props.cpp
dialogs/dialog_sch_sheet_props_base.cpp dialogs/dialog_sch_sheet_props_base.cpp
dialogs/dialog_schematic_find.cpp dialogs/dialog_schematic_find.cpp
dialogs/dialog_schematic_find_base.cpp dialogs/dialog_schematic_find_base.cpp
dialogs/dialog_schematic_setup.cpp
dialogs/dialog_set_grid.cpp dialogs/dialog_set_grid.cpp
dialogs/dialog_set_grid_base.cpp dialogs/dialog_set_grid_base.cpp
dialogs/dialog_symbol_remap.cpp dialogs/dialog_symbol_remap.cpp
@ -105,6 +108,8 @@ set( EESCHEMA_DLGS
dialogs/panel_libedit_settings_base.cpp dialogs/panel_libedit_settings_base.cpp
dialogs/panel_libedit_color_settings.cpp dialogs/panel_libedit_color_settings.cpp
dialogs/panel_libedit_color_settings_base.cpp dialogs/panel_libedit_color_settings_base.cpp
dialogs/panel_setup_formatting.cpp
dialogs/panel_setup_formatting_base.cpp
dialogs/panel_sym_lib_table.cpp dialogs/panel_sym_lib_table.cpp
dialogs/panel_sym_lib_table_base.cpp dialogs/panel_sym_lib_table_base.cpp
) )
@ -249,6 +254,7 @@ set( EESCHEMA_SRCS
set( EESCHEMA_COMMON_SRCS set( EESCHEMA_COMMON_SRCS
${CMAKE_SOURCE_DIR}/common/dialogs/dialog_page_settings.cpp ${CMAKE_SOURCE_DIR}/common/dialogs/dialog_page_settings.cpp
${CMAKE_SOURCE_DIR}/common/dialogs/panel_display_options.cpp ${CMAKE_SOURCE_DIR}/common/dialogs/panel_display_options.cpp
${CMAKE_SOURCE_DIR}/common/dialogs/panel_setup_severities.cpp
${CMAKE_SOURCE_DIR}/common/common.cpp ${CMAKE_SOURCE_DIR}/common/common.cpp
${CMAKE_SOURCE_DIR}/common/base_screen.cpp ${CMAKE_SOURCE_DIR}/common/base_screen.cpp
${CMAKE_SOURCE_DIR}/common/base_units.cpp ${CMAKE_SOURCE_DIR}/common/base_units.cpp

207
eeschema/connection_graph.cpp
View File

@ -41,6 +41,7 @@
#include <advanced_config.h> #include <advanced_config.h>
#include <connection_graph.h> #include <connection_graph.h>
#include <widgets/ui_common.h>
bool CONNECTION_SUBGRAPH::ResolveDrivers( bool aCreateMarkers ) bool CONNECTION_SUBGRAPH::ResolveDrivers( bool aCreateMarkers )
{ {
@ -1888,9 +1889,11 @@ std::vector<const CONNECTION_SUBGRAPH*> CONNECTION_GRAPH::GetBusesNeedingMigrati
} }
int CONNECTION_GRAPH::RunERC( const ERC_SETTINGS& aSettings, bool aCreateMarkers ) int CONNECTION_GRAPH::RunERC()
{ {
int error_count = 0; int error_count = 0;
ERC_SETTINGS& settings = m_frame->GetErcSettings();
for( auto&& subgraph : m_subgraphs ) for( auto&& subgraph : m_subgraphs )
{ {
@ -1908,29 +1911,29 @@ int CONNECTION_GRAPH::RunERC( const ERC_SETTINGS& aSettings, bool aCreateMarkers
* format due to their TestDanglingEnds() implementation. * format due to their TestDanglingEnds() implementation.
*/ */
if( aSettings.check_bus_driver_conflicts && if( settings.IsTestEnabled( ERCE_DRIVER_CONFLICT ) && !subgraph->ResolveDrivers() )
!subgraph->ResolveDrivers( aCreateMarkers ) )
error_count++; error_count++;
if( aSettings.check_bus_to_net_conflicts && if( settings.IsTestEnabled( ERCE_BUS_TO_NET_CONFLICT )
!ercCheckBusToNetConflicts( subgraph, aCreateMarkers ) ) && !ercCheckBusToNetConflicts( subgraph ) )
error_count++; error_count++;
if( aSettings.check_bus_entry_conflicts && if( settings.IsTestEnabled( ERCE_BUS_ENTRY_CONFLICT )
!ercCheckBusToBusEntryConflicts( subgraph, aCreateMarkers ) ) && !ercCheckBusToBusEntryConflicts( subgraph ) )
error_count++; error_count++;
if( aSettings.check_bus_to_bus_conflicts && if( settings.IsTestEnabled( ERCE_BUS_TO_BUS_CONFLICT )
!ercCheckBusToBusConflicts( subgraph, aCreateMarkers ) ) && !ercCheckBusToBusConflicts( subgraph ) )
error_count++; error_count++;
// The following checks are always performed since they don't currently // The following checks are always performed since they don't currently
// have an option exposed to the user // have an option exposed to the user
if( !ercCheckNoConnects( subgraph, aCreateMarkers ) ) if( !ercCheckNoConnects( subgraph ) )
error_count++; error_count++;
if( !ercCheckLabels( subgraph, aCreateMarkers, aSettings.check_unique_global_labels ) ) if( ( settings.IsTestEnabled( ERCE_LABEL_NOT_CONNECTED )
|| settings.IsTestEnabled( ERCE_GLOBLABEL ) ) && !ercCheckLabels( subgraph ) )
error_count++; error_count++;
} }
@ -1938,8 +1941,7 @@ int CONNECTION_GRAPH::RunERC( const ERC_SETTINGS& aSettings, bool aCreateMarkers
} }
bool CONNECTION_GRAPH::ercCheckBusToNetConflicts( const CONNECTION_SUBGRAPH* aSubgraph, bool CONNECTION_GRAPH::ercCheckBusToNetConflicts( const CONNECTION_SUBGRAPH* aSubgraph )
bool aCreateMarkers )
{ {
wxString msg; wxString msg;
auto sheet = aSubgraph->m_sheet; auto sheet = aSubgraph->m_sheet;
@ -1983,23 +1985,19 @@ bool CONNECTION_GRAPH::ercCheckBusToNetConflicts( const CONNECTION_SUBGRAPH* aSu
if( net_item && bus_item ) if( net_item && bus_item )
{ {
if( aCreateMarkers ) msg.Printf( _( "%s and %s are graphically connected but cannot electrically connect "
{ "because one is a bus and the other is a net." ),
msg.Printf( _( "%s and %s are graphically connected but cannot" bus_item->GetSelectMenuText( m_frame->GetUserUnits() ),
" electrically connect because one is a bus and" net_item->GetSelectMenuText( m_frame->GetUserUnits() ) );
" the other is a net." ),
bus_item->GetSelectMenuText( m_frame->GetUserUnits() ),
net_item->GetSelectMenuText( m_frame->GetUserUnits() ) );
auto marker = new SCH_MARKER(); auto marker = new SCH_MARKER();
marker->SetMarkerType( MARKER_BASE::MARKER_ERC ); marker->SetMarkerType( MARKER_BASE::MARKER_ERC );
marker->SetErrorLevel( MARKER_BASE::MARKER_SEVERITY_ERROR ); marker->SetErrorLevel( MARKER_BASE::MARKER_SEVERITY_ERROR );
marker->SetData( ERCE_BUS_TO_NET_CONFLICT, marker->SetData( ERCE_BUS_TO_NET_CONFLICT,
net_item->GetPosition(), msg, net_item->GetPosition(), msg,
bus_item->GetPosition() ); bus_item->GetPosition() );
screen->Append( marker ); screen->Append( marker );
}
return false; return false;
} }
@ -2008,8 +2006,7 @@ bool CONNECTION_GRAPH::ercCheckBusToNetConflicts( const CONNECTION_SUBGRAPH* aSu
} }
bool CONNECTION_GRAPH::ercCheckBusToBusConflicts( const CONNECTION_SUBGRAPH* aSubgraph, bool CONNECTION_GRAPH::ercCheckBusToBusConflicts( const CONNECTION_SUBGRAPH* aSubgraph )
bool aCreateMarkers )
{ {
wxString msg; wxString msg;
auto sheet = aSubgraph->m_sheet; auto sheet = aSubgraph->m_sheet;
@ -2064,22 +2061,18 @@ bool CONNECTION_GRAPH::ercCheckBusToBusConflicts( const CONNECTION_SUBGRAPH* aSu
if( !match ) if( !match )
{ {
if( aCreateMarkers ) msg.Printf( _( "%s and %s are graphically connected but do not share any bus members" ),
{ label->GetSelectMenuText( m_frame->GetUserUnits() ),
msg.Printf( _( "%s and %s are graphically connected but do " port->GetSelectMenuText( m_frame->GetUserUnits() ) );
"not share any bus members" ),
label->GetSelectMenuText( m_frame->GetUserUnits() ),
port->GetSelectMenuText( m_frame->GetUserUnits() ) );
auto marker = new SCH_MARKER(); auto marker = new SCH_MARKER();
marker->SetMarkerType( MARKER_BASE::MARKER_ERC ); marker->SetMarkerType( MARKER_BASE::MARKER_ERC );
marker->SetErrorLevel( MARKER_BASE::MARKER_SEVERITY_ERROR ); marker->SetErrorLevel( MARKER_BASE::MARKER_SEVERITY_ERROR );
marker->SetData( ERCE_BUS_TO_BUS_CONFLICT, marker->SetData( ERCE_BUS_TO_BUS_CONFLICT,
label->GetPosition(), msg, label->GetPosition(), msg,
port->GetPosition() ); port->GetPosition() );
screen->Append( marker ); screen->Append( marker );
}
return false; return false;
} }
@ -2089,8 +2082,7 @@ bool CONNECTION_GRAPH::ercCheckBusToBusConflicts( const CONNECTION_SUBGRAPH* aSu
} }
bool CONNECTION_GRAPH::ercCheckBusToBusEntryConflicts( const CONNECTION_SUBGRAPH* aSubgraph, bool CONNECTION_GRAPH::ercCheckBusToBusEntryConflicts( const CONNECTION_SUBGRAPH* aSubgraph )
bool aCreateMarkers )
{ {
wxString msg; wxString msg;
bool conflict = false; bool conflict = false;
@ -2156,23 +2148,20 @@ bool CONNECTION_GRAPH::ercCheckBusToBusEntryConflicts( const CONNECTION_SUBGRAPH
if( conflict ) if( conflict )
{ {
if( aCreateMarkers ) msg.Printf( _( "%s (%s) is connected to %s (%s) but is not a member of the bus" ),
{ bus_entry->GetSelectMenuText( m_frame->GetUserUnits() ),
msg.Printf( _( "%s (%s) is connected to %s (%s) but is not a member of the bus" ), bus_entry->Connection( sheet )->Name( true ),
bus_entry->GetSelectMenuText( m_frame->GetUserUnits() ), bus_wire->GetSelectMenuText( m_frame->GetUserUnits() ),
bus_entry->Connection( sheet )->Name( true ), bus_wire->Connection( sheet )->Name( true ) );
bus_wire->GetSelectMenuText( m_frame->GetUserUnits() ),
bus_wire->Connection( sheet )->Name( true ) );
auto marker = new SCH_MARKER(); auto marker = new SCH_MARKER();
marker->SetMarkerType( MARKER_BASE::MARKER_ERC ); marker->SetMarkerType( MARKER_BASE::MARKER_ERC );
marker->SetErrorLevel( MARKER_BASE::MARKER_SEVERITY_WARNING ); marker->SetErrorLevel( MARKER_BASE::MARKER_SEVERITY_WARNING );
marker->SetData( ERCE_BUS_ENTRY_CONFLICT, marker->SetData( ERCE_BUS_ENTRY_CONFLICT,
bus_entry->GetPosition(), msg, bus_entry->GetPosition(), msg,
bus_entry->GetPosition() ); bus_entry->GetPosition() );
screen->Append( marker ); screen->Append( marker );
}
return false; return false;
} }
@ -2182,8 +2171,7 @@ bool CONNECTION_GRAPH::ercCheckBusToBusEntryConflicts( const CONNECTION_SUBGRAPH
// TODO(JE) Check sheet pins here too? // TODO(JE) Check sheet pins here too?
bool CONNECTION_GRAPH::ercCheckNoConnects( const CONNECTION_SUBGRAPH* aSubgraph, bool CONNECTION_GRAPH::ercCheckNoConnects( const CONNECTION_SUBGRAPH* aSubgraph )
bool aCreateMarkers )
{ {
wxString msg; wxString msg;
auto sheet = aSubgraph->m_sheet; auto sheet = aSubgraph->m_sheet;
@ -2222,40 +2210,34 @@ bool CONNECTION_GRAPH::ercCheckNoConnects( const CONNECTION_SUBGRAPH* aSubgraph,
if( pin && has_invalid_items ) if( pin && has_invalid_items )
{ {
if( aCreateMarkers ) wxPoint pos = pin->GetTransformedPosition();
{
wxPoint pos = pin->GetTransformedPosition();
msg.Printf( _( "Pin %s of component %s has a no-connect marker but is connected" ), msg.Printf( _( "Pin %s of component %s has a no-connect marker but is connected" ),
pin->GetName(), pin->GetName(),
pin->GetParentComponent()->GetRef( &aSubgraph->m_sheet ) ); pin->GetParentComponent()->GetRef( &aSubgraph->m_sheet ) );
auto marker = new SCH_MARKER(); auto marker = new SCH_MARKER();
marker->SetMarkerType( MARKER_BASE::MARKER_ERC ); marker->SetMarkerType( MARKER_BASE::MARKER_ERC );
marker->SetErrorLevel( MARKER_BASE::MARKER_SEVERITY_WARNING ); marker->SetErrorLevel( MARKER_BASE::MARKER_SEVERITY_WARNING );
marker->SetData( ERCE_NOCONNECT_CONNECTED, pos, msg, pos ); marker->SetData( ERCE_NOCONNECT_CONNECTED, pos, msg, pos );
screen->Append( marker ); screen->Append( marker );
}
return false; return false;
} }
if( !has_other_items ) if( !has_other_items )
{ {
if( aCreateMarkers ) wxPoint pos = aSubgraph->m_no_connect->GetPosition();
{
wxPoint pos = aSubgraph->m_no_connect->GetPosition();
msg.Printf( _( "No-connect marker is not connected to anything" ) ); msg.Printf( _( "No-connect marker is not connected to anything" ) );
auto marker = new SCH_MARKER(); auto marker = new SCH_MARKER();
marker->SetMarkerType( MARKER_BASE::MARKER_ERC ); marker->SetMarkerType( MARKER_BASE::MARKER_ERC );
marker->SetErrorLevel( MARKER_BASE::MARKER_SEVERITY_WARNING ); marker->SetErrorLevel( MARKER_BASE::MARKER_SEVERITY_WARNING );
marker->SetData( ERCE_NOCONNECT_NOT_CONNECTED, pos, msg, pos ); marker->SetData( ERCE_NOCONNECT_NOT_CONNECTED, pos, msg, pos );
screen->Append( marker ); screen->Append( marker );
}
return false; return false;
} }
@ -2306,21 +2288,18 @@ bool CONNECTION_GRAPH::ercCheckNoConnects( const CONNECTION_SUBGRAPH* aSubgraph,
if( pin && !has_other_connections && pin->GetType() != ELECTRICAL_PINTYPE::PT_NC ) if( pin && !has_other_connections && pin->GetType() != ELECTRICAL_PINTYPE::PT_NC )
{ {
if( aCreateMarkers ) wxPoint pos = pin->GetTransformedPosition();
{
wxPoint pos = pin->GetTransformedPosition();
msg.Printf( _( "Pin %s of component %s is unconnected." ), msg.Printf( _( "Pin %s of component %s is unconnected." ),
pin->GetName(), pin->GetName(),
pin->GetParentComponent()->GetRef( &aSubgraph->m_sheet ) ); pin->GetParentComponent()->GetRef( &aSubgraph->m_sheet ) );
auto marker = new SCH_MARKER(); auto marker = new SCH_MARKER();
marker->SetMarkerType( MARKER_BASE::MARKER_ERC ); marker->SetMarkerType( MARKER_BASE::MARKER_ERC );
marker->SetErrorLevel( MARKER_BASE::MARKER_SEVERITY_WARNING ); marker->SetErrorLevel( MARKER_BASE::MARKER_SEVERITY_WARNING );
marker->SetData( ERCE_PIN_NOT_CONNECTED, pos, msg, pos ); marker->SetData( ERCE_PIN_NOT_CONNECTED, pos, msg, pos );
screen->Append( marker ); screen->Append( marker );
}
return false; return false;
} }
@ -2330,8 +2309,7 @@ bool CONNECTION_GRAPH::ercCheckNoConnects( const CONNECTION_SUBGRAPH* aSubgraph,
} }
bool CONNECTION_GRAPH::ercCheckLabels( const CONNECTION_SUBGRAPH* aSubgraph, bool CONNECTION_GRAPH::ercCheckLabels( const CONNECTION_SUBGRAPH* aSubgraph )
bool aCreateMarkers, bool aCheckGlobalLabels )
{ {
// Label connection rules: // Label connection rules:
// Local labels are flagged if they don't connect to any pins and don't have a no-connect // Local labels are flagged if they don't connect to any pins and don't have a no-connect
@ -2371,7 +2349,7 @@ bool CONNECTION_GRAPH::ercCheckLabels( const CONNECTION_SUBGRAPH* aSubgraph,
bool is_global = text->Type() == SCH_GLOBAL_LABEL_T; bool is_global = text->Type() == SCH_GLOBAL_LABEL_T;
// Global label check can be disabled independently // Global label check can be disabled independently
if( !aCheckGlobalLabels && is_global ) if( !m_frame->GetErcSettings().IsTestEnabled( ERCE_GLOBLABEL ) && is_global )
return true; return true;
wxString name = text->GetShownText(); wxString name = text->GetShownText();
@ -2409,25 +2387,22 @@ bool CONNECTION_GRAPH::ercCheckLabels( const CONNECTION_SUBGRAPH* aSubgraph,
if( !has_other_connections ) if( !has_other_connections )
{ {
if( aCreateMarkers ) SCH_SCREEN* screen = aSubgraph->m_sheet.LastScreen();
{ wxPoint pos = text->GetPosition();
SCH_SCREEN* screen = aSubgraph->m_sheet.LastScreen(); auto marker = new SCH_MARKER();
wxPoint pos = text->GetPosition();
auto marker = new SCH_MARKER();
wxString msg; wxString msg;
wxString prefix = is_global ? _( "Global label" ) : _( "Label" ); wxString prefix = is_global ? _( "Global label" ) : _( "Label" );
ERCE_T type = is_global ? ERCE_GLOBLABEL : ERCE_LABEL_NOT_CONNECTED; ERCE_T type = is_global ? ERCE_GLOBLABEL : ERCE_LABEL_NOT_CONNECTED;
msg.Printf( _( "%s %s is not connected anywhere else in the schematic." ), msg.Printf( _( "%s %s is not connected anywhere else in the schematic." ),
prefix, GetChars( text->ShortenedShownText() ) ); prefix, GetChars( text->ShortenedShownText() ) );
marker->SetMarkerType( MARKER_BASE::MARKER_ERC ); marker->SetMarkerType( MARKER_BASE::MARKER_ERC );
marker->SetErrorLevel( MARKER_BASE::MARKER_SEVERITY_WARNING ); marker->SetErrorLevel( MARKER_BASE::MARKER_SEVERITY_WARNING );
marker->SetData( type, pos, msg, pos ); marker->SetData( type, pos, msg, pos );
screen->Append( marker ); screen->Append( marker );
}
return false; return false;
} }

24
eeschema/connection_graph.h
View File

@ -254,11 +254,9 @@ public:
* *
* Precondition: graph is up-to-date * Precondition: graph is up-to-date
* *
* @param aSettings is used to control which tests to run
* @param aCreateMarkers controls whether error markers are created
* @return the number of errors found * @return the number of errors found
*/ */
int RunERC( const ERC_SETTINGS& aSettings, bool aCreateMarkers = true ); int RunERC();
const NET_MAP& GetNetMap() const { return m_net_code_to_subgraphs_map; } const NET_MAP& GetNetMap() const { return m_net_code_to_subgraphs_map; }
@ -404,11 +402,9 @@ private:
* For example, a net wire connected to a bus port/pin, or vice versa * For example, a net wire connected to a bus port/pin, or vice versa
* *
* @param aSubgraph is the subgraph to examine * @param aSubgraph is the subgraph to examine
* @param aCreateMarkers controls whether error markers are created
* @return true for no errors, false for errors * @return true for no errors, false for errors
*/ */
bool ercCheckBusToNetConflicts( const CONNECTION_SUBGRAPH* aSubgraph, bool ercCheckBusToNetConflicts( const CONNECTION_SUBGRAPH* aSubgraph );
bool aCreateMarkers );
/** /**
* Checks one subgraph for conflicting connections between two bus items * Checks one subgraph for conflicting connections between two bus items
@ -418,11 +414,9 @@ private:
* sheet pin * sheet pin
* *
* @param aSubgraph is the subgraph to examine * @param aSubgraph is the subgraph to examine
* @param aCreateMarkers controls whether error markers are created
* @return true for no errors, false for errors * @return true for no errors, false for errors
*/ */
bool ercCheckBusToBusConflicts( const CONNECTION_SUBGRAPH* aSubgraph, bool ercCheckBusToBusConflicts( const CONNECTION_SUBGRAPH* aSubgraph );
bool aCreateMarkers );
/** /**
* Checks one subgraph for conflicting bus entry to bus connections * Checks one subgraph for conflicting bus entry to bus connections
@ -434,11 +428,9 @@ private:
* "USB.DP" but someone might accidentally just enter "DP" * "USB.DP" but someone might accidentally just enter "DP"
* *
* @param aSubgraph is the subgraph to examine * @param aSubgraph is the subgraph to examine
* @param aCreateMarkers controls whether error markers are created
* @return true for no errors, false for errors * @return true for no errors, false for errors
*/ */
bool ercCheckBusToBusEntryConflicts( const CONNECTION_SUBGRAPH* aSubgraph, bool ercCheckBusToBusEntryConflicts( const CONNECTION_SUBGRAPH* aSubgraph );
bool aCreateMarkers );
/** /**
* Checks one subgraph for proper presence or absence of no-connect symbols * Checks one subgraph for proper presence or absence of no-connect symbols
@ -447,11 +439,9 @@ private:
* A pin without a no-connect symbol should have at least one connection * A pin without a no-connect symbol should have at least one connection
* *
* @param aSubgraph is the subgraph to examine * @param aSubgraph is the subgraph to examine
* @param aCreateMarkers controls whether error markers are created
* @return true for no errors, false for errors * @return true for no errors, false for errors
*/ */
bool ercCheckNoConnects( const CONNECTION_SUBGRAPH* aSubgraph, bool ercCheckNoConnects( const CONNECTION_SUBGRAPH* aSubgraph );
bool aCreateMarkers );
/** /**
* Checks one subgraph for proper connection of labels * Checks one subgraph for proper connection of labels
@ -459,12 +449,10 @@ private:
* Labels should be connected to something * Labels should be connected to something
* *
* @param aSubgraph is the subgraph to examine * @param aSubgraph is the subgraph to examine
* @param aCreateMarkers controls whether error markers are created
* @param aCheckGlobalLabels is true if global labels should be checked for loneliness * @param aCheckGlobalLabels is true if global labels should be checked for loneliness
* @return true for no errors, false for errors * @return true for no errors, false for errors
*/ */
bool ercCheckLabels( const CONNECTION_SUBGRAPH* aSubgraph, bool aCreateMarkers, bool ercCheckLabels( const CONNECTION_SUBGRAPH* aSubgraph );
bool aCheckGlobalLabels );
}; };

68
eeschema/dialogs/dialog_erc.cpp
View File

@ -67,8 +67,7 @@ END_EVENT_TABLE()
DIALOG_ERC::DIALOG_ERC( SCH_EDIT_FRAME* parent ) : DIALOG_ERC::DIALOG_ERC( SCH_EDIT_FRAME* parent ) :
DIALOG_ERC_BASE( parent, ID_DIALOG_ERC ), // parent looks for this ID explicitly DIALOG_ERC_BASE( parent, ID_DIALOG_ERC ), // parent looks for this ID explicitly
m_buttonList(), m_buttonList(),
m_initialized( false ), m_initialized( false )
m_settings()
{ {
m_parent = parent; m_parent = parent;
m_lastMarkerFound = nullptr; m_lastMarkerFound = nullptr;
@ -93,18 +92,6 @@ DIALOG_ERC::DIALOG_ERC( SCH_EDIT_FRAME* parent ) :
} }
DIALOG_ERC::~DIALOG_ERC()
{
transferControlsToSettings();
if( m_settings != m_parent->GetErcSettings() )
{
m_parent->UpdateErcSettings( m_settings );
m_parent->SaveProjectSettings();
}
}
void DIALOG_ERC::Init() void DIALOG_ERC::Init()
{ {
m_initialized = false; m_initialized = false;
@ -115,9 +102,6 @@ void DIALOG_ERC::Init()
button = NULL; button = NULL;
} }
m_settings = m_parent->GetErcSettings();
transferSettingsToControls();
SCH_SCREENS screens; SCH_SCREENS screens;
updateMarkerCounts( &screens ); updateMarkerCounts( &screens );
@ -136,30 +120,6 @@ void DIALOG_ERC::OnUpdateUI( wxUpdateUIEvent& event )
} }
void DIALOG_ERC::transferSettingsToControls()
{
m_WriteResultOpt->SetValue( m_settings.write_erc_file );
m_cbTestSimilarLabels->SetValue( m_settings.check_similar_labels );
m_cbTestUniqueGlbLabels->SetValue( m_settings.check_unique_global_labels );
m_cbCheckBusDriverConflicts->SetValue( m_settings.check_bus_driver_conflicts );
m_cbCheckBusEntries->SetValue( m_settings.check_bus_entry_conflicts );
m_cbCheckBusToBusConflicts->SetValue( m_settings.check_bus_to_bus_conflicts );
m_cbCheckBusToNetConflicts->SetValue( m_settings.check_bus_to_net_conflicts );
}
void DIALOG_ERC::transferControlsToSettings()
{
m_settings.write_erc_file = m_WriteResultOpt->GetValue();
m_settings.check_similar_labels = m_cbTestSimilarLabels->GetValue();
m_settings.check_unique_global_labels = m_cbTestUniqueGlbLabels->GetValue();
m_settings.check_bus_driver_conflicts = m_cbCheckBusDriverConflicts->GetValue();
m_settings.check_bus_entry_conflicts = m_cbCheckBusEntries->GetValue();
m_settings.check_bus_to_bus_conflicts = m_cbCheckBusToBusConflicts->GetValue();
m_settings.check_bus_to_net_conflicts = m_cbCheckBusToNetConflicts->GetValue();
}
void DIALOG_ERC::updateMarkerCounts( SCH_SCREENS *screens ) void DIALOG_ERC::updateMarkerCounts( SCH_SCREENS *screens )
{ {
int markers = screens->GetMarkerCount( MARKER_BASE::MARKER_ERC, int markers = screens->GetMarkerCount( MARKER_BASE::MARKER_ERC,
@ -455,8 +415,6 @@ void DIALOG_ERC::ResetDefaultERCDiag( wxCommandEvent& event )
{ {
memcpy( DiagErc, DefaultDiagErc, sizeof( DiagErc ) ); memcpy( DiagErc, DefaultDiagErc, sizeof( DiagErc ) );
ReBuildMatrixPanel(); ReBuildMatrixPanel();
m_settings.LoadDefaults();
transferSettingsToControls();
} }
@ -480,8 +438,6 @@ void DIALOG_ERC::TestErc( REPORTER& aReporter )
{ {
wxFileName fn; wxFileName fn;
transferControlsToSettings();
// Build the whole sheet list in hierarchy (sheet, not screen) // Build the whole sheet list in hierarchy (sheet, not screen)
SCH_SHEET_LIST sheets( g_RootSheet ); SCH_SHEET_LIST sheets( g_RootSheet );
sheets.AnnotatePowerSymbols(); sheets.AnnotatePowerSymbols();
@ -507,7 +463,7 @@ void DIALOG_ERC::TestErc( REPORTER& aReporter )
// The connection graph has a whole set of ERC checks it can run // The connection graph has a whole set of ERC checks it can run
m_parent->RecalculateConnections( NO_CLEANUP ); m_parent->RecalculateConnections( NO_CLEANUP );
g_ConnectionGraph->RunERC( m_settings ); g_ConnectionGraph->RunERC();
// Test is all units of each multiunit component have the same footprint assigned. // Test is all units of each multiunit component have the same footprint assigned.
TestMultiunitFootprints( sheets ); TestMultiunitFootprints( sheets );
@ -604,8 +560,11 @@ void DIALOG_ERC::TestErc( REPORTER& aReporter )
// Test similar labels (i;e. labels which are identical when // Test similar labels (i;e. labels which are identical when
// using case insensitive comparisons) // using case insensitive comparisons)
if( m_settings.check_similar_labels ) if( m_parent->GetErcSettings().IsTestEnabled( ERCE_SIMILAR_GLBL_LABELS )
|| m_parent->GetErcSettings().IsTestEnabled( ERCE_SIMILAR_LABELS ) )
{
objectsConnectedList->TestforSimilarLabels(); objectsConnectedList->TestforSimilarLabels();
}
// Displays global results: // Displays global results:
updateMarkerCounts( &screens ); updateMarkerCounts( &screens );
@ -623,21 +582,6 @@ void DIALOG_ERC::TestErc( REPORTER& aReporter )
// Display message // Display message
aReporter.ReportTail( _( "Finished" ), RPT_SEVERITY_INFO ); aReporter.ReportTail( _( "Finished" ), RPT_SEVERITY_INFO );
if( m_settings.write_erc_file )
{
fn = g_RootSheet->GetScreen()->GetFileName();
fn.SetExt( wxT( "erc" ) );
wxFileDialog dlg( this, _( "ERC File" ), fn.GetPath(), fn.GetFullName(),
ErcFileWildcard(), wxFD_SAVE );
if( dlg.ShowModal() == wxID_CANCEL )
return;
if( WriteDiagnosticERC( GetUserUnits(), dlg.GetPath() ) )
ExecuteFile( this, Pgm().GetEditorName(), QuoteFullPath( fn ) );
}
} }

8
eeschema/dialogs/dialog_erc.h
View File

@ -42,14 +42,12 @@ class DIALOG_ERC : public DIALOG_ERC_BASE
private: private:
SCH_EDIT_FRAME* m_parent; SCH_EDIT_FRAME* m_parent;
wxBitmapButton* m_buttonList[ELECTRICAL_PINTYPES_TOTAL][ELECTRICAL_PINTYPES_TOTAL]; wxBitmapButton* m_buttonList[ELECTRICAL_PINTYPES_TOTAL][ELECTRICAL_PINTYPES_TOTAL];
bool m_initialized; bool m_initialized;
const SCH_MARKER* m_lastMarkerFound; const SCH_MARKER* m_lastMarkerFound;
static bool m_diagErcTableInit; // go to true after DiagErc init static bool m_diagErcTableInit; // go to true after DiagErc init
ERC_SETTINGS m_settings;
public: public:
DIALOG_ERC( SCH_EDIT_FRAME* parent ); DIALOG_ERC( SCH_EDIT_FRAME* parent );
~DIALOG_ERC();
private: private:
void Init(); void Init();
@ -77,8 +75,6 @@ private:
void ReBuildMatrixPanel(); void ReBuildMatrixPanel();
void setDRCMatrixButtonState( wxBitmapButton *aButton, int aState ); void setDRCMatrixButtonState( wxBitmapButton *aButton, int aState );
void updateMarkerCounts( SCH_SCREENS *screens ); void updateMarkerCounts( SCH_SCREENS *screens );
void transferSettingsToControls();
void transferControlsToSettings();
}; };

140
eeschema/dialogs/dialog_erc_base.cpp
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Dec 30 2017) // C++ code generated with wxFormBuilder (version Oct 26 2018)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
@ -14,87 +14,81 @@
DIALOG_ERC_BASE::DIALOG_ERC_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_ERC_BASE::DIALOG_ERC_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 );
wxBoxSizer* bSizer1; wxBoxSizer* bSizer1;
bSizer1 = new wxBoxSizer( wxVERTICAL ); bSizer1 = new wxBoxSizer( wxVERTICAL );
m_NoteBook = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); m_NoteBook = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
m_PanelERC = new wxPanel( m_NoteBook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_PanelERC = new wxPanel( m_NoteBook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
wxBoxSizer* bercSizer; wxBoxSizer* bercSizer;
bercSizer = new wxBoxSizer( wxVERTICAL ); bercSizer = new wxBoxSizer( wxVERTICAL );
wxBoxSizer* bupperSizer; wxBoxSizer* bupperSizer;
bupperSizer = new wxBoxSizer( wxHORIZONTAL ); bupperSizer = new wxBoxSizer( wxHORIZONTAL );
wxStaticBoxSizer* sdiagSizer; wxStaticBoxSizer* sdiagSizer;
sdiagSizer = new wxStaticBoxSizer( new wxStaticBox( m_PanelERC, wxID_ANY, _("ERC Report:") ), wxVERTICAL ); sdiagSizer = new wxStaticBoxSizer( new wxStaticBox( m_PanelERC, wxID_ANY, _("ERC Report:") ), wxVERTICAL );
wxGridSizer* gSizeDiag; wxGridSizer* gSizeDiag;
gSizeDiag = new wxGridSizer( 3, 2, 5, 5 ); gSizeDiag = new wxGridSizer( 3, 2, 5, 5 );
m_ErcTotalErrorsText = new wxStaticText( sdiagSizer->GetStaticBox(), wxID_ANY, _("Total:"), wxDefaultPosition, wxDefaultSize, 0 ); m_ErcTotalErrorsText = new wxStaticText( sdiagSizer->GetStaticBox(), wxID_ANY, _("Total:"), wxDefaultPosition, wxDefaultSize, 0 );
m_ErcTotalErrorsText->Wrap( -1 ); m_ErcTotalErrorsText->Wrap( -1 );
gSizeDiag->Add( m_ErcTotalErrorsText, 1, wxALIGN_CENTER_VERTICAL, 5 ); gSizeDiag->Add( m_ErcTotalErrorsText, 1, wxALIGN_CENTER_VERTICAL, 5 );
m_TotalErrCount = new wxTextCtrl( sdiagSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY ); m_TotalErrCount = new wxTextCtrl( sdiagSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY );
gSizeDiag->Add( m_TotalErrCount, 0, wxALIGN_CENTER_VERTICAL, 5 ); gSizeDiag->Add( m_TotalErrCount, 0, wxALIGN_CENTER_VERTICAL, 5 );
m_WarnErcErrorsText = new wxStaticText( sdiagSizer->GetStaticBox(), wxID_ANY, _("Warnings:"), wxDefaultPosition, wxDefaultSize, 0 ); m_WarnErcErrorsText = new wxStaticText( sdiagSizer->GetStaticBox(), wxID_ANY, _("Warnings:"), wxDefaultPosition, wxDefaultSize, 0 );
m_WarnErcErrorsText->Wrap( -1 ); m_WarnErcErrorsText->Wrap( -1 );
gSizeDiag->Add( m_WarnErcErrorsText, 1, wxALIGN_CENTER_VERTICAL, 5 ); gSizeDiag->Add( m_WarnErcErrorsText, 1, wxALIGN_CENTER_VERTICAL, 5 );
m_LastWarningCount = new wxTextCtrl( sdiagSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY ); m_LastWarningCount = new wxTextCtrl( sdiagSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY );
gSizeDiag->Add( m_LastWarningCount, 0, wxALIGN_CENTER_VERTICAL, 5 ); gSizeDiag->Add( m_LastWarningCount, 0, wxALIGN_CENTER_VERTICAL, 5 );
m_LastErrCountText = new wxStaticText( sdiagSizer->GetStaticBox(), wxID_ANY, _("Errors:"), wxDefaultPosition, wxDefaultSize, 0 ); m_LastErrCountText = new wxStaticText( sdiagSizer->GetStaticBox(), wxID_ANY, _("Errors:"), wxDefaultPosition, wxDefaultSize, 0 );
m_LastErrCountText->Wrap( -1 ); m_LastErrCountText->Wrap( -1 );
gSizeDiag->Add( m_LastErrCountText, 1, wxALIGN_CENTER_VERTICAL, 5 ); gSizeDiag->Add( m_LastErrCountText, 1, wxALIGN_CENTER_VERTICAL, 5 );
m_LastErrCount = new wxTextCtrl( sdiagSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY ); m_LastErrCount = new wxTextCtrl( sdiagSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY );
gSizeDiag->Add( m_LastErrCount, 0, wxALIGN_CENTER_VERTICAL, 5 ); gSizeDiag->Add( m_LastErrCount, 0, wxALIGN_CENTER_VERTICAL, 5 );
sdiagSizer->Add( gSizeDiag, 0, wxALL|wxEXPAND, 5 ); sdiagSizer->Add( gSizeDiag, 0, wxALL|wxEXPAND, 5 );
m_staticline1 = new wxStaticLine( sdiagSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
sdiagSizer->Add( m_staticline1, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
m_WriteResultOpt = new wxCheckBox( sdiagSizer->GetStaticBox(), wxID_ANY, _("Create ERC file report"), wxDefaultPosition, wxDefaultSize, 0 );
sdiagSizer->Add( m_WriteResultOpt, 0, wxALL|wxBOTTOM|wxRIGHT|wxTOP, 5 );
bupperSizer->Add( sdiagSizer, 0, wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT, 5 ); bupperSizer->Add( sdiagSizer, 0, wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT, 5 );
wxBoxSizer* bSizerMessages; wxBoxSizer* bSizerMessages;
bSizerMessages = new wxBoxSizer( wxVERTICAL ); bSizerMessages = new wxBoxSizer( wxVERTICAL );
m_titleMessages = new wxStaticText( m_PanelERC, wxID_ANY, _("Messages:"), wxDefaultPosition, wxDefaultSize, 0 ); m_titleMessages = new wxStaticText( m_PanelERC, wxID_ANY, _("Messages:"), wxDefaultPosition, wxDefaultSize, 0 );
m_titleMessages->Wrap( -1 ); m_titleMessages->Wrap( -1 );
m_titleMessages->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); m_titleMessages->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
bSizerMessages->Add( m_titleMessages, 0, wxRIGHT|wxLEFT, 12 ); bSizerMessages->Add( m_titleMessages, 0, wxRIGHT|wxLEFT, 12 );
m_MessagesList = new wxTextCtrl( m_PanelERC, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY ); m_MessagesList = new wxTextCtrl( m_PanelERC, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY );
m_MessagesList->SetMinSize( wxSize( 180,-1 ) ); m_MessagesList->SetMinSize( wxSize( 180,-1 ) );
bSizerMessages->Add( m_MessagesList, 1, wxEXPAND|wxBOTTOM|wxLEFT, 5 ); bSizerMessages->Add( m_MessagesList, 1, wxEXPAND|wxBOTTOM|wxLEFT, 5 );
bupperSizer->Add( bSizerMessages, 1, wxBOTTOM|wxEXPAND|wxRIGHT|wxTOP, 3 ); bupperSizer->Add( bSizerMessages, 1, wxBOTTOM|wxEXPAND|wxRIGHT|wxTOP, 3 );
bercSizer->Add( bupperSizer, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 8 ); bercSizer->Add( bupperSizer, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 8 );
m_textMarkers = new wxStaticText( m_PanelERC, wxID_ANY, _("Error List:"), wxDefaultPosition, wxDefaultSize, 0 ); m_textMarkers = new wxStaticText( m_PanelERC, wxID_ANY, _("Error List:"), wxDefaultPosition, wxDefaultSize, 0 );
m_textMarkers->Wrap( -1 ); m_textMarkers->Wrap( -1 );
m_textMarkers->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); m_textMarkers->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) );
bercSizer->Add( m_textMarkers, 0, wxLEFT|wxRIGHT, 20 ); bercSizer->Add( m_textMarkers, 0, wxLEFT|wxRIGHT, 20 );
m_MarkersList = new ERC_HTML_LISTFRAME( m_PanelERC, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO|wxBORDER_SIMPLE ); m_MarkersList = new ERC_HTML_LISTFRAME( m_PanelERC, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO|wxBORDER_SIMPLE );
bercSizer->Add( m_MarkersList, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 8 ); bercSizer->Add( m_MarkersList, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 8 );
m_PanelERC->SetSizer( bercSizer ); m_PanelERC->SetSizer( bercSizer );
m_PanelERC->Layout(); m_PanelERC->Layout();
bercSizer->Fit( m_PanelERC ); bercSizer->Fit( m_PanelERC );
@ -102,86 +96,52 @@ DIALOG_ERC_BASE::DIALOG_ERC_BASE( wxWindow* parent, wxWindowID id, const wxStrin
m_PanelERCOptions = new wxPanel( m_NoteBook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_PanelERCOptions = new wxPanel( m_NoteBook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
wxBoxSizer* m_panelMatrixSizer; wxBoxSizer* m_panelMatrixSizer;
m_panelMatrixSizer = new wxBoxSizer( wxVERTICAL ); m_panelMatrixSizer = new wxBoxSizer( wxVERTICAL );
wxStaticBoxSizer* sbSizer2;
sbSizer2 = new wxStaticBoxSizer( new wxStaticBox( m_PanelERCOptions, wxID_ANY, _("Label to Label Connections") ), wxVERTICAL );
m_cbTestSimilarLabels = new wxCheckBox( sbSizer2->GetStaticBox(), wxID_ANY, _("Test similar labels"), wxDefaultPosition, wxDefaultSize, 0 );
m_cbTestSimilarLabels->SetToolTip( _("Similar labels are labels (inside a sheet) which differs only by upper/lower case") );
sbSizer2->Add( m_cbTestSimilarLabels, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
m_cbTestUniqueGlbLabels = new wxCheckBox( sbSizer2->GetStaticBox(), wxID_ANY, _("Test single instances of global labels"), wxDefaultPosition, wxDefaultSize, 0 );
m_cbTestUniqueGlbLabels->SetToolTip( _("Global labels are used to connect signals across the full hierarchy.\nThey are expected to be at least two labels with the same name.") );
sbSizer2->Add( m_cbTestUniqueGlbLabels, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 );
m_panelMatrixSizer->Add( sbSizer2, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
wxStaticBoxSizer* sbSizer3; wxStaticBoxSizer* sbSizer3;
sbSizer3 = new wxStaticBoxSizer( new wxStaticBox( m_PanelERCOptions, wxID_ANY, _("Pin to Pin Connections") ), wxVERTICAL ); sbSizer3 = new wxStaticBoxSizer( new wxStaticBox( m_PanelERCOptions, wxID_ANY, _("Pin to Pin Connections") ), wxVERTICAL );
m_matrixPanel = new wxPanel( sbSizer3->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_matrixPanel = new wxPanel( sbSizer3->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
sbSizer3->Add( m_matrixPanel, 1, wxEXPAND | wxALL, 5 ); sbSizer3->Add( m_matrixPanel, 1, wxEXPAND | wxALL, 5 );
m_panelMatrixSizer->Add( sbSizer3, 0, wxALL|wxEXPAND, 5 ); m_panelMatrixSizer->Add( sbSizer3, 0, wxALL|wxEXPAND, 5 );
wxStaticBoxSizer* sbSizer31;
sbSizer31 = new wxStaticBoxSizer( new wxStaticBox( m_PanelERCOptions, wxID_ANY, _("Bus Connections") ), wxVERTICAL );
m_cbCheckBusToNetConflicts = new wxCheckBox( sbSizer31->GetStaticBox(), wxID_ANY, _("Check that bus wires are not connected to hierarchical net pins and vice versa"), wxDefaultPosition, wxDefaultSize, 0 );
sbSizer31->Add( m_cbCheckBusToNetConflicts, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
m_cbCheckBusToBusConflicts = new wxCheckBox( sbSizer31->GetStaticBox(), wxID_ANY, _("Check that bus-to-bus connections have shared members"), wxDefaultPosition, wxDefaultSize, 0 );
sbSizer31->Add( m_cbCheckBusToBusConflicts, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
m_cbCheckBusEntries = new wxCheckBox( sbSizer31->GetStaticBox(), wxID_ANY, _("Check that nets are members of buses they graphically connect to"), wxDefaultPosition, wxDefaultSize, 0 );
sbSizer31->Add( m_cbCheckBusEntries, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
m_cbCheckBusDriverConflicts = new wxCheckBox( sbSizer31->GetStaticBox(), wxID_ANY, _("Check buses for conflicting drivers"), wxDefaultPosition, wxDefaultSize, 0 );
sbSizer31->Add( m_cbCheckBusDriverConflicts, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
m_panelMatrixSizer->Add( sbSizer31, 0, wxALL|wxEXPAND, 5 );
m_PanelERCOptions->SetSizer( m_panelMatrixSizer ); m_PanelERCOptions->SetSizer( m_panelMatrixSizer );
m_PanelERCOptions->Layout(); m_PanelERCOptions->Layout();
m_panelMatrixSizer->Fit( m_PanelERCOptions ); m_panelMatrixSizer->Fit( m_PanelERCOptions );
m_NoteBook->AddPage( m_PanelERCOptions, _("Options"), false ); m_NoteBook->AddPage( m_PanelERCOptions, _("Options"), false );
bSizer1->Add( m_NoteBook, 1, wxEXPAND | wxALL, 5 ); bSizer1->Add( m_NoteBook, 1, wxEXPAND | wxALL, 5 );
m_buttonsSizer = new wxBoxSizer( wxHORIZONTAL ); m_buttonsSizer = new wxBoxSizer( wxHORIZONTAL );
m_buttondelmarkers = new wxButton( this, ID_ERASE_DRC_MARKERS, _("Delete Markers"), wxDefaultPosition, wxDefaultSize, 0 ); m_buttondelmarkers = new wxButton( this, ID_ERASE_DRC_MARKERS, _("Delete Markers"), wxDefaultPosition, wxDefaultSize, 0 );
m_buttonsSizer->Add( m_buttondelmarkers, 0, wxALL|wxEXPAND, 5 ); m_buttonsSizer->Add( m_buttondelmarkers, 0, wxALL|wxEXPAND, 5 );
m_ResetOptButton = new wxButton( this, ID_RESET_MATRIX, _("Reset to Defaults"), wxDefaultPosition, wxDefaultSize, 0 ); m_ResetOptButton = new wxButton( this, ID_RESET_MATRIX, _("Reset to Defaults"), wxDefaultPosition, wxDefaultSize, 0 );
m_buttonsSizer->Add( m_ResetOptButton, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); m_buttonsSizer->Add( m_ResetOptButton, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
m_buttonsSizer->Add( 0, 0, 1, wxEXPAND, 5 ); m_buttonsSizer->Add( 0, 0, 1, wxEXPAND, 5 );
m_sdbSizer1 = new wxStdDialogButtonSizer(); m_sdbSizer1 = new wxStdDialogButtonSizer();
m_sdbSizer1OK = new wxButton( this, wxID_OK ); m_sdbSizer1OK = new wxButton( this, wxID_OK );
m_sdbSizer1->AddButton( m_sdbSizer1OK ); m_sdbSizer1->AddButton( m_sdbSizer1OK );
m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL );
m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); m_sdbSizer1->AddButton( m_sdbSizer1Cancel );
m_sdbSizer1->Realize(); m_sdbSizer1->Realize();
m_buttonsSizer->Add( m_sdbSizer1, 0, wxALL|wxEXPAND, 5 ); m_buttonsSizer->Add( m_sdbSizer1, 0, wxALL|wxEXPAND, 5 );
bSizer1->Add( m_buttonsSizer, 0, wxEXPAND|wxLEFT, 10 ); bSizer1->Add( m_buttonsSizer, 0, wxEXPAND|wxLEFT, 10 );
this->SetSizer( bSizer1 ); this->SetSizer( bSizer1 );
this->Layout(); this->Layout();
bSizer1->Fit( this ); bSizer1->Fit( this );
// Connect Events // Connect Events
this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_ERC_BASE::OnCloseErcDialog ) ); this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_ERC_BASE::OnCloseErcDialog ) );
m_NoteBook->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_ERC_BASE::OnUpdateUI ), NULL, this ); m_NoteBook->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_ERC_BASE::OnUpdateUI ), NULL, this );
@ -204,5 +164,5 @@ DIALOG_ERC_BASE::~DIALOG_ERC_BASE()
m_ResetOptButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ERC_BASE::OnResetMatrixClick ), NULL, this ); m_ResetOptButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ERC_BASE::OnResetMatrixClick ), NULL, this );
m_sdbSizer1Cancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ERC_BASE::OnButtonCloseClick ), NULL, this ); m_sdbSizer1Cancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ERC_BASE::OnButtonCloseClick ), NULL, this );
m_sdbSizer1OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ERC_BASE::OnErcCmpClick ), NULL, this ); m_sdbSizer1OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ERC_BASE::OnErcCmpClick ), NULL, this );
} }

1180
eeschema/dialogs/dialog_erc_base.fbp
View File

File diff suppressed because it is too large Load Diff

30
eeschema/dialogs/dialog_erc_base.h
View File

@ -1,12 +1,11 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Dec 30 2017) // C++ code generated with wxFormBuilder (version Oct 26 2018)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
#ifndef __DIALOG_ERC_BASE_H__ #pragma once
#define __DIALOG_ERC_BASE_H__
#include <wx/artprov.h> #include <wx/artprov.h>
#include <wx/xrc/xmlres.h> #include <wx/xrc/xmlres.h>
@ -22,8 +21,6 @@ class ERC_HTML_LISTFRAME;
#include <wx/settings.h> #include <wx/settings.h>
#include <wx/textctrl.h> #include <wx/textctrl.h>
#include <wx/sizer.h> #include <wx/sizer.h>
#include <wx/statline.h>
#include <wx/checkbox.h>
#include <wx/statbox.h> #include <wx/statbox.h>
#include <wx/html/htmlwin.h> #include <wx/html/htmlwin.h>
#include <wx/panel.h> #include <wx/panel.h>
@ -45,7 +42,7 @@ class ERC_HTML_LISTFRAME;
class DIALOG_ERC_BASE : public DIALOG_SHIM class DIALOG_ERC_BASE : public DIALOG_SHIM
{ {
private: private:
protected: protected:
wxNotebook* m_NoteBook; wxNotebook* m_NoteBook;
wxPanel* m_PanelERC; wxPanel* m_PanelERC;
@ -55,27 +52,19 @@ class DIALOG_ERC_BASE : public DIALOG_SHIM
wxTextCtrl* m_LastWarningCount; wxTextCtrl* m_LastWarningCount;
wxStaticText* m_LastErrCountText; wxStaticText* m_LastErrCountText;
wxTextCtrl* m_LastErrCount; wxTextCtrl* m_LastErrCount;
wxStaticLine* m_staticline1;
wxCheckBox* m_WriteResultOpt;
wxStaticText* m_titleMessages; wxStaticText* m_titleMessages;
wxTextCtrl* m_MessagesList; wxTextCtrl* m_MessagesList;
wxStaticText* m_textMarkers; wxStaticText* m_textMarkers;
ERC_HTML_LISTFRAME* m_MarkersList; ERC_HTML_LISTFRAME* m_MarkersList;
wxPanel* m_PanelERCOptions; wxPanel* m_PanelERCOptions;
wxCheckBox* m_cbTestSimilarLabels;
wxCheckBox* m_cbTestUniqueGlbLabels;
wxPanel* m_matrixPanel; wxPanel* m_matrixPanel;
wxCheckBox* m_cbCheckBusToNetConflicts;
wxCheckBox* m_cbCheckBusToBusConflicts;
wxCheckBox* m_cbCheckBusEntries;
wxCheckBox* m_cbCheckBusDriverConflicts;
wxBoxSizer* m_buttonsSizer; wxBoxSizer* m_buttonsSizer;
wxButton* m_buttondelmarkers; wxButton* m_buttondelmarkers;
wxButton* m_ResetOptButton; wxButton* m_ResetOptButton;
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 OnCloseErcDialog( wxCloseEvent& event ) { event.Skip(); } virtual void OnCloseErcDialog( wxCloseEvent& event ) { event.Skip(); }
virtual void OnUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); } virtual void OnUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); }
@ -85,13 +74,12 @@ class DIALOG_ERC_BASE : public DIALOG_SHIM
virtual void OnResetMatrixClick( wxCommandEvent& event ) { event.Skip(); } virtual void OnResetMatrixClick( wxCommandEvent& event ) { event.Skip(); }
virtual void OnButtonCloseClick( wxCommandEvent& event ) { event.Skip(); } virtual void OnButtonCloseClick( wxCommandEvent& event ) { event.Skip(); }
virtual void OnErcCmpClick( wxCommandEvent& event ) { event.Skip(); } virtual void OnErcCmpClick( wxCommandEvent& event ) { event.Skip(); }
public: public:
DIALOG_ERC_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Electrical Rules Checker"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); DIALOG_ERC_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Electrical Rules Checker"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
~DIALOG_ERC_BASE(); ~DIALOG_ERC_BASE();
}; };
#endif //__DIALOG_ERC_BASE_H__

85
eeschema/dialogs/dialog_sch_import_settings.cpp Normal file
View File

@ -0,0 +1,85 @@
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2020 KiCad Developers, see AUTHORS.txt for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, you may find one here:
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
* or you may search the http://www.gnu.org website for the version 2 license,
* or you may write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <bitmaps.h>
#include <sch_edit_frame.h>
#include <wildcards_and_files_ext.h>
#include <confirm.h>
#include <dialog_sch_import_settings.h>
wxString DIALOG_SCH_IMPORT_SETTINGS::m_filePath; // remember for session
DIALOG_SCH_IMPORT_SETTINGS::DIALOG_SCH_IMPORT_SETTINGS( wxWindow* aParent, SCH_EDIT_FRAME* aFrame ) :
DIALOG_SCH_IMPORT_SETTINGS_BASE( aParent ),
m_frame( aFrame )
{
m_browseButton->SetBitmap( KiBitmap( folder_xpm ) );
m_sdbSizer1OK->SetLabel( _( "Import Settings" ) );
m_buttonsSizer->Layout();
m_sdbSizer1OK->SetDefault();
}
bool DIALOG_SCH_IMPORT_SETTINGS::TransferDataToWindow()
{
m_filePathCtrl->SetValue( m_filePath );
return true;
}
void DIALOG_SCH_IMPORT_SETTINGS::OnBrowseClicked( wxCommandEvent& event )
{
wxFileName fn = g_RootSheet->GetFileName();
fn.SetExt( ProjectFileExtension );
wxFileDialog dlg( this, _( "Import Settings From" ), fn.GetPath(), fn.GetFullName(),
ProjectFileWildcard(), wxFD_OPEN | wxFD_FILE_MUST_EXIST | wxFD_CHANGE_DIR );
if( dlg.ShowModal() == wxID_OK )
m_filePathCtrl->SetValue( dlg.GetPath() );
}
bool DIALOG_SCH_IMPORT_SETTINGS::TransferDataFromWindow()
{
if( !wxFileExists( m_filePathCtrl->GetValue() ) )
{
DisplayError( this, wxString::Format( _( "File not found." ) ) );
m_filePathCtrl->SetFocus();
return false;
}
m_filePath = m_filePathCtrl->GetValue();
return true;
}
void DIALOG_SCH_IMPORT_SETTINGS::OnSelectAll( wxCommandEvent& event )
{
m_SeveritiesOpt->SetValue( true );
}

52
eeschema/dialogs/dialog_sch_import_settings.h Normal file
View File

@ -0,0 +1,52 @@
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2020 KiCad Developers, see AUTHORS.txt for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, you may find one here:
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
* or you may search the http://www.gnu.org website for the version 2 license,
* or you may write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#ifndef KICAD_DIALOG_SCH_IMPORT_SETTINGS_H
#define KICAD_DIALOG_SCH_IMPORT_SETTINGS_H
#include "dialog_sch_import_settings_base.h"
class SCH_EDIT_FRAME;
class DIALOG_SCH_IMPORT_SETTINGS : public DIALOG_SCH_IMPORT_SETTINGS_BASE
{
protected:
SCH_EDIT_FRAME* m_frame;
static wxString m_filePath;
public:
DIALOG_SCH_IMPORT_SETTINGS( wxWindow* aParent, SCH_EDIT_FRAME* aFrame );
void OnBrowseClicked( wxCommandEvent& event ) override;
void OnSelectAll( wxCommandEvent& event ) override;
bool TransferDataToWindow() override;
bool TransferDataFromWindow() override;
wxString GetFilePath() { return m_filePath; }
};
#endif //KICAD_DIALOG_SCH_IMPORT_SETTINGS_H

89
eeschema/dialogs/dialog_sch_import_settings_base.cpp Normal file
View File

@ -0,0 +1,89 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Oct 26 2018)
// http://www.wxformbuilder.org/
//
// PLEASE DO *NOT* EDIT THIS FILE!
///////////////////////////////////////////////////////////////////////////
#include "dialog_sch_import_settings_base.h"
///////////////////////////////////////////////////////////////////////////
DIALOG_SCH_IMPORT_SETTINGS_BASE::DIALOG_SCH_IMPORT_SETTINGS_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( wxSize( -1,-1 ), wxDefaultSize );
m_MainSizer = new wxBoxSizer( wxVERTICAL );
wxBoxSizer* bupperSizer;
bupperSizer = new wxBoxSizer( wxHORIZONTAL );
wxStaticText* importFromLabel;
importFromLabel = new wxStaticText( this, wxID_ANY, _("Import from:"), wxDefaultPosition, wxDefaultSize, 0 );
importFromLabel->Wrap( -1 );
bupperSizer->Add( importFromLabel, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
m_filePathCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
m_filePathCtrl->SetToolTip( _("Target directory for plot files. Can be absolute or relative to the board file location.") );
m_filePathCtrl->SetMinSize( wxSize( 300,-1 ) );
bupperSizer->Add( m_filePathCtrl, 1, wxEXPAND|wxTOP|wxBOTTOM, 5 );
m_browseButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
m_browseButton->SetMinSize( wxSize( 29,29 ) );
bupperSizer->Add( m_browseButton, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
m_MainSizer->Add( bupperSizer, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
wxBoxSizer* bmiddleSizer;
bmiddleSizer = new wxBoxSizer( wxVERTICAL );
wxStaticText* importLabel;
importLabel = new wxStaticText( this, wxID_ANY, _("Import:"), wxDefaultPosition, wxDefaultSize, 0 );
importLabel->Wrap( -1 );
bmiddleSizer->Add( importLabel, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 );
m_SeveritiesOpt = new wxCheckBox( this, wxID_ANY, _("Violation severities"), wxDefaultPosition, wxDefaultSize, 0 );
bmiddleSizer->Add( m_SeveritiesOpt, 0, wxRIGHT|wxLEFT, 5 );
m_MainSizer->Add( bmiddleSizer, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 10 );
m_buttonsSizer = new wxBoxSizer( wxHORIZONTAL );
m_selectAllButton = new wxButton( this, wxID_ANY, _("Select All"), wxDefaultPosition, wxDefaultSize, 0 );
m_buttonsSizer->Add( m_selectAllButton, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 10 );
m_sdbSizer1 = new wxStdDialogButtonSizer();
m_sdbSizer1OK = new wxButton( this, wxID_OK );
m_sdbSizer1->AddButton( m_sdbSizer1OK );
m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL );
m_sdbSizer1->AddButton( m_sdbSizer1Cancel );
m_sdbSizer1->Realize();
m_buttonsSizer->Add( m_sdbSizer1, 1, wxALL|wxEXPAND, 5 );
m_MainSizer->Add( m_buttonsSizer, 0, wxEXPAND, 5 );
this->SetSizer( m_MainSizer );
this->Layout();
m_MainSizer->Fit( this );
this->Centre( wxBOTH );
// Connect Events
m_browseButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SCH_IMPORT_SETTINGS_BASE::OnBrowseClicked ), NULL, this );
m_selectAllButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SCH_IMPORT_SETTINGS_BASE::OnSelectAll ), NULL, this );
}
DIALOG_SCH_IMPORT_SETTINGS_BASE::~DIALOG_SCH_IMPORT_SETTINGS_BASE()
{
// Disconnect Events
m_browseButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SCH_IMPORT_SETTINGS_BASE::OnBrowseClicked ), NULL, this );
m_selectAllButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SCH_IMPORT_SETTINGS_BASE::OnSelectAll ), NULL, this );
}

511
eeschema/dialogs/dialog_sch_import_settings_base.fbp Normal file
View File

@ -0,0 +1,511 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<wxFormBuilder_Project>
<FileVersion major="1" minor="15" />
<object class="Project" expanded="1">
<property name="class_decoration"></property>
<property name="code_generation">C++</property>
<property name="disconnect_events">1</property>
<property name="disconnect_mode">source_name</property>
<property name="disconnect_php_events">0</property>
<property name="disconnect_python_events">0</property>
<property name="embedded_files_path">res</property>
<property name="encoding">UTF-8</property>
<property name="event_generation">connect</property>
<property name="file">dialog_sch_import_settings_base</property>
<property name="first_id">1000</property>
<property name="help_provider">none</property>
<property name="indent_with_spaces"></property>
<property name="internationalize">1</property>
<property name="name">dialog_import_settings_base</property>
<property name="namespace"></property>
<property name="path">.</property>
<property name="precompiled_header"></property>
<property name="relative_path">1</property>
<property name="skip_lua_events">1</property>
<property name="skip_php_events">1</property>
<property name="skip_python_events">1</property>
<property name="ui_table">UI</property>
<property name="use_enum">1</property>
<property name="use_microsoft_bom">0</property>
<object class="Dialog" expanded="1">
<property name="aui_managed">0</property>
<property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
<property name="bg"></property>
<property name="center">wxBOTH</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="enabled">1</property>
<property name="event_handler">impl_virtual</property>
<property name="extra_style"></property>
<property name="fg"></property>
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="maximum_size"></property>
<property name="minimum_size">-1,-1</property>
<property name="name">DIALOG_SCH_IMPORT_SETTINGS_BASE</property>
<property name="pos"></property>
<property name="size">-1,-1</property>
<property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>
<property name="subclass">DIALOG_SHIM; dialog_shim.h</property>
<property name="title">Import Settings</property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property>
<property name="name">m_MainSizer</property>
<property name="orient">wxVERTICAL</property>
<property name="permission">protected</property>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxEXPAND|wxTOP|wxRIGHT|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property>
<property name="name">bupperSizer</property>
<property name="orient">wxHORIZONTAL</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="0">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Import from:</property>
<property name="markup">0</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">importFromLabel</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">none</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<property name="wrap">-1</property>
</object>
</object>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxEXPAND|wxTOP|wxBOTTOM</property>
<property name="proportion">1</property>
<object class="wxTextCtrl" expanded="0">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="maxlength">0</property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size">300,-1</property>
<property name="moveable">1</property>
<property name="name">m_filePathCtrl</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip">Target directory for plot files. Can be absolute or relative to the board file location.</property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="value"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxRIGHT</property>
<property name="proportion">0</property>
<object class="wxBitmapButton" expanded="1">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="bitmap"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="current"></property>
<property name="default">0</property>
<property name="default_pane">0</property>
<property name="disabled"></property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="focus"></property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Browse</property>
<property name="margins"></property>
<property name="markup">0</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size">29,29</property>
<property name="moveable">1</property>
<property name="name">m_browseButton</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="position"></property>
<property name="pressed"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass">; forward_declare</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnButtonClick">OnBrowseClicked</event>
</object>
</object>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">10</property>
<property name="flag">wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property>
<property name="name">bmiddleSizer</property>
<property name="orient">wxVERTICAL</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxTOP|wxBOTTOM|wxRIGHT</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="1">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Import:</property>
<property name="markup">0</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">importLabel</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">none</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass">; forward_declare</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<property name="wrap">-1</property>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxRIGHT|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxCheckBox" expanded="1">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="checked">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Violation severities</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_SeveritiesOpt</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">public</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass">; ; forward_declare</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
</object>
</object>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">0</property>
<object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property>
<property name="name">m_buttonsSizer</property>
<property name="orient">wxHORIZONTAL</property>
<property name="permission">protected</property>
<object class="sizeritem" expanded="1">
<property name="border">10</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxButton" expanded="1">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="bitmap"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="current"></property>
<property name="default">0</property>
<property name="default_pane">0</property>
<property name="disabled"></property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="focus"></property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Select All</property>
<property name="margins"></property>
<property name="markup">0</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_selectAllButton</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="position"></property>
<property name="pressed"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass">; forward_declare</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnButtonClick">OnSelectAll</event>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL|wxEXPAND</property>
<property name="proportion">1</property>
<object class="wxStdDialogButtonSizer" expanded="1">
<property name="Apply">0</property>
<property name="Cancel">1</property>
<property name="ContextHelp">0</property>
<property name="Help">0</property>
<property name="No">0</property>
<property name="OK">1</property>
<property name="Save">0</property>
<property name="Yes">0</property>
<property name="minimum_size"></property>
<property name="name">m_sdbSizer1</property>
<property name="permission">protected</property>
</object>
</object>
</object>
</object>
</object>
</object>
</object>
</wxFormBuilder_Project>

61
eeschema/dialogs/dialog_sch_import_settings_base.h Normal file
View File

@ -0,0 +1,61 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Oct 26 2018)
// http://www.wxformbuilder.org/
//
// PLEASE DO *NOT* EDIT THIS FILE!
///////////////////////////////////////////////////////////////////////////
#pragma once
#include <wx/artprov.h>
#include <wx/xrc/xmlres.h>
#include <wx/intl.h>
#include "dialog_shim.h"
#include <wx/string.h>
#include <wx/stattext.h>
#include <wx/gdicmn.h>
#include <wx/font.h>
#include <wx/colour.h>
#include <wx/settings.h>
#include <wx/textctrl.h>
#include <wx/bmpbuttn.h>
#include <wx/bitmap.h>
#include <wx/image.h>
#include <wx/icon.h>
#include <wx/button.h>
#include <wx/sizer.h>
#include <wx/checkbox.h>
#include <wx/dialog.h>
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
/// Class DIALOG_SCH_IMPORT_SETTINGS_BASE
///////////////////////////////////////////////////////////////////////////////
class DIALOG_SCH_IMPORT_SETTINGS_BASE : public DIALOG_SHIM
{
private:
protected:
wxBoxSizer* m_MainSizer;
wxTextCtrl* m_filePathCtrl;
wxBitmapButton* m_browseButton;
wxBoxSizer* m_buttonsSizer;
wxButton* m_selectAllButton;
wxStdDialogButtonSizer* m_sdbSizer1;
wxButton* m_sdbSizer1OK;
wxButton* m_sdbSizer1Cancel;
// Virtual event handlers, overide them in your derived class
virtual void OnBrowseClicked( wxCommandEvent& event ) { event.Skip(); }
virtual void OnSelectAll( wxCommandEvent& event ) { event.Skip(); }
public:
wxCheckBox* m_SeveritiesOpt;
DIALOG_SCH_IMPORT_SETTINGS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Import Settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
~DIALOG_SCH_IMPORT_SETTINGS_BASE();
};

112
eeschema/dialogs/dialog_schematic_setup.cpp Normal file
View File

@ -0,0 +1,112 @@
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2020 KiCad Developers, see AUTHORS.txt for contributors.
*
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation, either version 3 of the License, or (at your
* option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include <sch_edit_frame.h>
#include <kiface_i.h>
#include <dialog_sch_import_settings.h>
#include <panel_setup_severities.h>
#include <panel_setup_formatting.h>
#include "dialog_schematic_setup.h"
#include "panel_eeschema_template_fieldnames.h"
bool g_macHack;
DIALOG_SCHEMATIC_SETUP::DIALOG_SCHEMATIC_SETUP( SCH_EDIT_FRAME* aFrame ) :
PAGED_DIALOG( aFrame, _( "Schematic Setup" ),
_( "Import Settings from Another Project..." ) ),
m_frame( aFrame ),
m_severities( nullptr )
{
m_formatting = new PANEL_SETUP_FORMATTING( this, aFrame );
m_fieldNameTemplates = new PANEL_EESCHEMA_TEMPLATE_FIELDNAMES( aFrame, this, false );
m_severities = new PANEL_SETUP_SEVERITIES( this, aFrame->GetErcSettings().m_Severities,
ERCE_FIRST, ERCE_LAST );
/*
* WARNING: If you change page names you MUST update calls to DoShowSchematicSetupDialog().
*/
m_treebook->AddPage( new wxPanel( this ), _( "General" ) );
m_treebook->AddSubPage( m_formatting, _( "Formatting" ) );
m_treebook->AddSubPage( m_fieldNameTemplates, _( "Field Name Templates" ) );
m_treebook->AddPage( new wxPanel( this ), _( "Electrical Rules" ) );
m_treebook->AddSubPage( m_severities, _( "Violation Severity" ) );
// Connect Events
m_treebook->Connect( wxEVT_TREEBOOK_PAGE_CHANGED,
wxBookCtrlEventHandler( DIALOG_SCHEMATIC_SETUP::OnPageChange ), NULL, this );
FinishDialogSettings();
g_macHack = true;
}
DIALOG_SCHEMATIC_SETUP::~DIALOG_SCHEMATIC_SETUP()
{
m_treebook->Disconnect( wxEVT_TREEBOOK_PAGE_CHANGED,
wxBookCtrlEventHandler( DIALOG_SCHEMATIC_SETUP::OnPageChange ), NULL, this );
}
void DIALOG_SCHEMATIC_SETUP::OnPageChange( wxBookCtrlEvent& event )
{
#ifdef __WXMAC__
// Work around an OSX bug where the wxGrid children don't get placed correctly
if( g_macHack && m_treebook->GetPage( event.GetSelection() ) == m_fieldNameTemplates )
{
m_fieldNameTemplates->SetSize( wxSize( m_fieldNameTemplates->GetSize().x - 1,
m_fieldNameTemplates->GetSize().y ) );
wxPoint pos = m_fieldNameTemplates->GetPosition();
m_fieldNameTemplates->Move( pos.x + 6, pos.y + 6 );
g_macHack = false;
}
#endif
}
// Run Import Settings... action
void DIALOG_SCHEMATIC_SETUP::OnAuxiliaryAction( wxCommandEvent& event )
{
DIALOG_SCH_IMPORT_SETTINGS importDlg( this, m_frame );
if( importDlg.ShowModal() == wxID_CANCEL )
return;
wxConfigBase* cfg = new wxFileConfig( wxEmptyString, wxEmptyString, importDlg.GetFilePath() );
// We do not want expansion of env var values when reading our project config file
cfg->SetExpandEnvVars( false );
cfg->SetPath( wxCONFIG_PATH_SEPARATOR );
if( importDlg.m_SeveritiesOpt->GetValue() )
{
ERC_SETTINGS settings;
settings.LoadDefaults();
wxConfigLoadParams( cfg, settings.GetProjectFileParameters(), GROUP_SCH );
m_severities->ImportSettingsFrom( settings.m_Severities );
}
delete cfg;
}

52
eeschema/dialogs/dialog_schematic_setup.h Normal file
View File

@ -0,0 +1,52 @@
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2020 KiCad Developers, see AUTHORS.txt for contributors.
*
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation, either version 3 of the License, or (at your
* option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef KICAD_DIALOG_SCHEMATIC_SETUP_H
#define KICAD_DIALOG_SCHEMATIC_SETUP_H
#include <widgets/paged_dialog.h>
class SCH_EDIT_FRAME;
class PANEL_SETUP_SEVERITIES;
class PANEL_EESCHEMA_TEMPLATE_FIELDNAMES;
class PANEL_SETUP_FORMATTING;
class DIALOG_SCHEMATIC_SETUP : public PAGED_DIALOG
{
public:
DIALOG_SCHEMATIC_SETUP( SCH_EDIT_FRAME* aFrame );
~DIALOG_SCHEMATIC_SETUP();
protected:
void OnAuxiliaryAction( wxCommandEvent& event ) override;
SCH_EDIT_FRAME* m_frame;
PANEL_SETUP_FORMATTING* m_formatting;
PANEL_EESCHEMA_TEMPLATE_FIELDNAMES* m_fieldNameTemplates;
PANEL_SETUP_SEVERITIES* m_severities;
// event handlers
void OnPageChange( wxBookCtrlEvent& event );
};
#endif //KICAD_DIALOG_SCHEMATIC_SETUP_H

6
eeschema/dialogs/panel_eeschema_display_options_base.cpp
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version 3.9.0 Jan 23 2020) // C++ code generated with wxFormBuilder (version Oct 26 2018)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
@ -131,9 +131,9 @@ PANEL_EESCHEMA_DISPLAY_OPTIONS_BASE::PANEL_EESCHEMA_DISPLAY_OPTIONS_BASE( wxWind
sbSizer3->Add( fgSizer321, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 ); sbSizer3->Add( fgSizer321, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 );
m_highlightColorNote = new wxStaticText( sbSizer3->GetStaticBox(), wxID_ANY, _("Note:\nhighlight color can be edited in the \"Colors\" section."), wxDefaultPosition, wxDefaultSize, 0 ); m_highlightColorNote = new wxStaticText( sbSizer3->GetStaticBox(), wxID_ANY, _("(highlight color can be edited in the \"Colors\" page)"), wxDefaultPosition, wxDefaultSize, 0 );
m_highlightColorNote->Wrap( -1 ); m_highlightColorNote->Wrap( -1 );
sbSizer3->Add( m_highlightColorNote, 0, wxALL, 5 ); sbSizer3->Add( m_highlightColorNote, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
bRightColumn->Add( sbSizer3, 1, wxEXPAND|wxTOP, 5 ); bRightColumn->Add( sbSizer3, 1, wxEXPAND|wxTOP, 5 );

6
eeschema/dialogs/panel_eeschema_display_options_base.fbp
View File

@ -14,7 +14,6 @@
<property name="file">panel_eeschema_display_options_base</property> <property name="file">panel_eeschema_display_options_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="indent_with_spaces"></property> <property name="indent_with_spaces"></property>
<property name="internationalize">1</property> <property name="internationalize">1</property>
<property name="name">PanelEeschemaDisplayOptions</property> <property name="name">PanelEeschemaDisplayOptions</property>
@ -26,7 +25,6 @@
<property name="skip_php_events">1</property> <property name="skip_php_events">1</property>
<property name="skip_python_events">1</property> <property name="skip_python_events">1</property>
<property name="ui_table">UI</property> <property name="ui_table">UI</property>
<property name="use_array_enum">0</property>
<property name="use_enum">1</property> <property name="use_enum">1</property>
<property name="use_microsoft_bom">0</property> <property name="use_microsoft_bom">0</property>
<object class="Panel" expanded="1"> <object class="Panel" expanded="1">
@ -1357,7 +1355,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">wxALL</property> <property name="flag">wxBOTTOM|wxRIGHT|wxLEFT</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxStaticText" expanded="1"> <object class="wxStaticText" expanded="1">
<property name="BottomDockable">1</property> <property name="BottomDockable">1</property>
@ -1387,7 +1385,7 @@
<property name="gripper">0</property> <property name="gripper">0</property>
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="label">Note:&#x0A;highlight color can be edited in the &quot;Colors&quot; section.</property> <property name="label">(highlight color can be edited in the &quot;Colors&quot; page)</property>
<property name="markup">0</property> <property name="markup">0</property>
<property name="max_size"></property> <property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>

2
eeschema/dialogs/panel_eeschema_display_options_base.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version 3.9.0 Jan 23 2020) // C++ code generated with wxFormBuilder (version Oct 26 2018)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!

22
eeschema/dialogs/panel_eeschema_template_fieldnames.cpp
View File

@ -2,7 +2,7 @@
* This program source code file is part of KiCad, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2009 Wayne Stambaugh <stambaughw@verizon.net> * Copyright (C) 2009 Wayne Stambaugh <stambaughw@verizon.net>
* Copyright (C) 1992-2018 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 1992-2020 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
@ -23,7 +23,6 @@
*/ */
#include <fctsys.h> #include <fctsys.h>
#include <base_screen.h>
#include <widgets/wx_grid.h> #include <widgets/wx_grid.h>
#include <template_fieldnames.h> #include <template_fieldnames.h>
#include <grid_tricks.h> #include <grid_tricks.h>
@ -33,10 +32,17 @@
#include <panel_eeschema_template_fieldnames.h> #include <panel_eeschema_template_fieldnames.h>
PANEL_EESCHEMA_TEMPLATE_FIELDNAMES::PANEL_EESCHEMA_TEMPLATE_FIELDNAMES( SCH_EDIT_FRAME* aFrame, PANEL_EESCHEMA_TEMPLATE_FIELDNAMES::PANEL_EESCHEMA_TEMPLATE_FIELDNAMES( SCH_EDIT_FRAME* aFrame,
wxWindow* aWindow ) : wxWindow* aWindow,
bool aGlobal ) :
PANEL_EESCHEMA_TEMPLATE_FIELDNAMES_BASE( aWindow ), PANEL_EESCHEMA_TEMPLATE_FIELDNAMES_BASE( aWindow ),
m_frame( aFrame ) m_frame( aFrame ),
m_global( aGlobal )
{ {
wxString msg;
msg.Printf( m_title->GetLabel(), aGlobal ? _( "Global" ) : _( "Project" ) );
m_title->SetLabel( msg );
m_addFieldButton->SetBitmap( KiBitmap( small_plus_xpm ) ); m_addFieldButton->SetBitmap( KiBitmap( small_plus_xpm ) );
m_deleteFieldButton->SetBitmap( KiBitmap( trash_xpm ) ); m_deleteFieldButton->SetBitmap( KiBitmap( trash_xpm ) );
@ -55,7 +61,7 @@ PANEL_EESCHEMA_TEMPLATE_FIELDNAMES::~PANEL_EESCHEMA_TEMPLATE_FIELDNAMES()
bool PANEL_EESCHEMA_TEMPLATE_FIELDNAMES::TransferDataToWindow() bool PANEL_EESCHEMA_TEMPLATE_FIELDNAMES::TransferDataToWindow()
{ {
m_fields = m_frame->GetTemplateFieldNames(); m_fields = m_frame->GetTemplateFieldNames( m_global );
return TransferDataToGrid(); return TransferDataToGrid();
} }
@ -68,7 +74,7 @@ void PANEL_EESCHEMA_TEMPLATE_FIELDNAMES::OnAddButtonClick( wxCommandEvent& event
int row = m_grid->GetNumberRows(); int row = m_grid->GetNumberRows();
TransferDataFromGrid(); TransferDataFromGrid();
TEMPLATE_FIELDNAME newFieldname = TEMPLATE_FIELDNAME( "Fieldname" ); TEMPLATE_FIELDNAME newFieldname = TEMPLATE_FIELDNAME( _( "Untitled Field" ) );
newFieldname.m_Visible = false; newFieldname.m_Visible = false;
m_fields.insert( m_fields.end(), newFieldname ); m_fields.insert( m_fields.end(), newFieldname );
TransferDataToGrid(); TransferDataToGrid();
@ -152,10 +158,10 @@ bool PANEL_EESCHEMA_TEMPLATE_FIELDNAMES::TransferDataFromWindow()
if( !TransferDataFromGrid() ) if( !TransferDataFromGrid() )
return false; return false;
m_frame->DeleteAllTemplateFieldNames(); m_frame->DeleteAllTemplateFieldNames( m_global );
for( const TEMPLATE_FIELDNAME& field : m_fields ) for( const TEMPLATE_FIELDNAME& field : m_fields )
m_frame->AddTemplateFieldName( field ); m_frame->AddTemplateFieldName( field, m_global );
return true; return true;
} }

3
eeschema/dialogs/panel_eeschema_template_fieldnames.h
View File

@ -31,6 +31,7 @@ class PANEL_EESCHEMA_TEMPLATE_FIELDNAMES : public PANEL_EESCHEMA_TEMPLATE_FIELDN
protected: protected:
SCH_EDIT_FRAME* m_frame; SCH_EDIT_FRAME* m_frame;
TEMPLATE_FIELDNAMES m_fields; TEMPLATE_FIELDNAMES m_fields;
bool m_global; // Editing global (vs. project) fieldname templates
int m_checkboxColWidth; int m_checkboxColWidth;
@ -57,7 +58,7 @@ protected:
void OnDeleteButtonClick( wxCommandEvent& event ) override; void OnDeleteButtonClick( wxCommandEvent& event ) override;
public: public:
PANEL_EESCHEMA_TEMPLATE_FIELDNAMES( SCH_EDIT_FRAME* aFrame, wxWindow* aWindow ); PANEL_EESCHEMA_TEMPLATE_FIELDNAMES( SCH_EDIT_FRAME* aFrame, wxWindow* aWindow, bool aGlobal );
~PANEL_EESCHEMA_TEMPLATE_FIELDNAMES() override; ~PANEL_EESCHEMA_TEMPLATE_FIELDNAMES() override;
private: private:

66
eeschema/dialogs/panel_eeschema_template_fieldnames_base.cpp
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Aug 2 2018) // C++ code generated with wxFormBuilder (version Oct 26 2018)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
@ -15,19 +15,23 @@ PANEL_EESCHEMA_TEMPLATE_FIELDNAMES_BASE::PANEL_EESCHEMA_TEMPLATE_FIELDNAMES_BASE
{ {
wxBoxSizer* bPanelSizer; wxBoxSizer* bPanelSizer;
bPanelSizer = new wxBoxSizer( wxHORIZONTAL ); bPanelSizer = new wxBoxSizer( wxHORIZONTAL );
wxBoxSizer* bMargins; wxBoxSizer* bSizer4;
bMargins = new wxBoxSizer( wxVERTICAL ); bSizer4 = new wxBoxSizer( wxVERTICAL );
m_title = new wxStaticText( this, wxID_ANY, _("%s field name templates:"), wxDefaultPosition, wxDefaultSize, 0 );
m_title->Wrap( -1 );
bSizer4->Add( m_title, 0, wxTOP|wxBOTTOM, 5 );
m_grid = new WX_GRID( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 ); m_grid = new WX_GRID( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
// Grid // Grid
m_grid->CreateGrid( 0, 3 ); m_grid->CreateGrid( 0, 3 );
m_grid->EnableEditing( true ); m_grid->EnableEditing( true );
m_grid->EnableGridLines( true ); m_grid->EnableGridLines( true );
m_grid->EnableDragGridSize( false ); m_grid->EnableDragGridSize( false );
m_grid->SetMargins( 0, 0 ); m_grid->SetMargins( 0, 0 );
// Columns // Columns
m_grid->SetColSize( 0, 300 ); m_grid->SetColSize( 0, 300 );
m_grid->SetColSize( 1, 60 ); m_grid->SetColSize( 1, 60 );
@ -38,46 +42,48 @@ PANEL_EESCHEMA_TEMPLATE_FIELDNAMES_BASE::PANEL_EESCHEMA_TEMPLATE_FIELDNAMES_BASE
m_grid->SetColLabelValue( 0, _("Name") ); m_grid->SetColLabelValue( 0, _("Name") );
m_grid->SetColLabelValue( 1, _("Visible") ); m_grid->SetColLabelValue( 1, _("Visible") );
m_grid->SetColLabelValue( 2, _("URL") ); m_grid->SetColLabelValue( 2, _("URL") );
m_grid->SetColLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); m_grid->SetColLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER );
// Rows // Rows
m_grid->EnableDragRowSize( true ); m_grid->EnableDragRowSize( true );
m_grid->SetRowLabelSize( 0 ); m_grid->SetRowLabelSize( 0 );
m_grid->SetRowLabelAlignment( wxALIGN_CENTRE, wxALIGN_CENTRE ); m_grid->SetRowLabelAlignment( wxALIGN_CENTER, wxALIGN_CENTER );
// Label Appearance // Label Appearance
// Cell Defaults // Cell Defaults
m_grid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP ); m_grid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
bMargins->Add( m_grid, 1, wxEXPAND|wxTOP, 2 ); m_grid->SetMinSize( wxSize( -1,180 ) );
bSizer4->Add( m_grid, 1, wxEXPAND, 10 );
wxBoxSizer* bSizer10; wxBoxSizer* bSizer10;
bSizer10 = new wxBoxSizer( wxHORIZONTAL ); bSizer10 = new wxBoxSizer( wxHORIZONTAL );
m_addFieldButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); m_addFieldButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
m_addFieldButton->SetMinSize( wxSize( 29,29 ) ); m_addFieldButton->SetMinSize( wxSize( 29,29 ) );
bSizer10->Add( m_addFieldButton, 0, wxTOP|wxRIGHT, 5 ); bSizer10->Add( m_addFieldButton, 0, wxTOP|wxRIGHT, 5 );
bSizer10->Add( 0, 0, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); bSizer10->Add( 0, 0, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
m_deleteFieldButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); m_deleteFieldButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
m_deleteFieldButton->SetMinSize( wxSize( 29,29 ) ); m_deleteFieldButton->SetMinSize( wxSize( 29,29 ) );
bSizer10->Add( m_deleteFieldButton, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); bSizer10->Add( m_deleteFieldButton, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
bMargins->Add( bSizer10, 0, wxEXPAND, 5 ); bSizer4->Add( bSizer10, 0, wxEXPAND, 10 );
bPanelSizer->Add( bMargins, 1, wxEXPAND|wxRIGHT|wxLEFT, 10 ); bPanelSizer->Add( bSizer4, 1, wxEXPAND|wxRIGHT|wxLEFT, 10 );
this->SetSizer( bPanelSizer ); this->SetSizer( bPanelSizer );
this->Layout(); this->Layout();
bPanelSizer->Fit( this ); bPanelSizer->Fit( this );
// Connect Events // Connect Events
m_grid->Connect( wxEVT_SIZE, wxSizeEventHandler( PANEL_EESCHEMA_TEMPLATE_FIELDNAMES_BASE::OnSizeGrid ), NULL, this ); m_grid->Connect( wxEVT_SIZE, wxSizeEventHandler( PANEL_EESCHEMA_TEMPLATE_FIELDNAMES_BASE::OnSizeGrid ), NULL, this );
m_addFieldButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_EESCHEMA_TEMPLATE_FIELDNAMES_BASE::OnAddButtonClick ), NULL, this ); m_addFieldButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_EESCHEMA_TEMPLATE_FIELDNAMES_BASE::OnAddButtonClick ), NULL, this );
@ -90,5 +96,5 @@ PANEL_EESCHEMA_TEMPLATE_FIELDNAMES_BASE::~PANEL_EESCHEMA_TEMPLATE_FIELDNAMES_BAS
m_grid->Disconnect( wxEVT_SIZE, wxSizeEventHandler( PANEL_EESCHEMA_TEMPLATE_FIELDNAMES_BASE::OnSizeGrid ), NULL, this ); m_grid->Disconnect( wxEVT_SIZE, wxSizeEventHandler( PANEL_EESCHEMA_TEMPLATE_FIELDNAMES_BASE::OnSizeGrid ), NULL, this );
m_addFieldButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_EESCHEMA_TEMPLATE_FIELDNAMES_BASE::OnAddButtonClick ), NULL, this ); m_addFieldButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_EESCHEMA_TEMPLATE_FIELDNAMES_BASE::OnAddButtonClick ), NULL, this );
m_deleteFieldButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_EESCHEMA_TEMPLATE_FIELDNAMES_BASE::OnDeleteButtonClick ), NULL, this ); m_deleteFieldButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_EESCHEMA_TEMPLATE_FIELDNAMES_BASE::OnDeleteButtonClick ), NULL, this );
} }

873
eeschema/dialogs/panel_eeschema_template_fieldnames_base.fbp
View File

@ -1,485 +1,388 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<wxFormBuilder_Project> <wxFormBuilder_Project>
<FileVersion major="1" minor="14" /> <FileVersion major="1" minor="15" />
<object class="Project" expanded="1"> <object class="Project" expanded="1">
<property name="class_decoration"></property> <property name="class_decoration"></property>
<property name="code_generation">C++</property> <property name="code_generation">C++</property>
<property name="disconnect_events">1</property> <property name="disconnect_events">1</property>
<property name="disconnect_mode">source_name</property> <property name="disconnect_mode">source_name</property>
<property name="disconnect_php_events">0</property> <property name="disconnect_php_events">0</property>
<property name="disconnect_python_events">0</property> <property name="disconnect_python_events">0</property>
<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">connect</property> <property name="event_generation">connect</property>
<property name="file">panel_eeschema_template_fieldnames_base</property> <property name="file">panel_eeschema_template_fieldnames_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="indent_with_spaces"></property> <property name="indent_with_spaces"></property>
<property name="internationalize">1</property> <property name="internationalize">1</property>
<property name="name">PanelEeschemaTemplateFieldnames</property> <property name="name">PanelEeschemaTemplateFieldnames</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>
<property name="relative_path">1</property> <property name="relative_path">1</property>
<property name="skip_lua_events">1</property> <property name="skip_lua_events">1</property>
<property name="skip_php_events">1</property> <property name="skip_php_events">1</property>
<property name="skip_python_events">1</property> <property name="skip_python_events">1</property>
<property name="ui_table">UI</property> <property name="ui_table">UI</property>
<property name="use_enum">1</property> <property name="use_enum">1</property>
<property name="use_microsoft_bom">0</property> <property name="use_microsoft_bom">0</property>
<object class="Panel" expanded="1"> <object class="Panel" expanded="1">
<property name="aui_managed">0</property> <property name="aui_managed">0</property>
<property name="aui_manager_style">wxAUI_MGR_DEFAULT</property> <property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
<property name="bg"></property> <property name="bg"></property>
<property name="context_help"></property> <property name="context_help"></property>
<property name="context_menu">1</property> <property name="context_menu">1</property>
<property name="enabled">1</property> <property name="enabled">1</property>
<property name="event_handler">impl_virtual</property> <property name="event_handler">impl_virtual</property>
<property name="fg"></property> <property name="fg"></property>
<property name="font"></property> <property name="font"></property>
<property name="hidden">0</property> <property name="hidden">0</property>
<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">PANEL_EESCHEMA_TEMPLATE_FIELDNAMES_BASE</property> <property name="name">PANEL_EESCHEMA_TEMPLATE_FIELDNAMES_BASE</property>
<property name="pos"></property> <property name="pos"></property>
<property name="size">-1,-1</property> <property name="size">-1,-1</property>
<property name="subclass">; forward_declare</property> <property name="subclass">; forward_declare</property>
<property name="tooltip"></property> <property name="tooltip"></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">wxTAB_TRAVERSAL</property> <property name="window_style">wxTAB_TRAVERSAL</property>
<event name="OnAuiPaneActivated"></event> <object class="wxBoxSizer" expanded="1">
<event name="OnAuiPaneButton"></event> <property name="minimum_size"></property>
<event name="OnAuiPaneClose"></event> <property name="name">bPanelSizer</property>
<event name="OnAuiPaneMaximize"></event> <property name="orient">wxHORIZONTAL</property>
<event name="OnAuiPaneRestore"></event> <property name="permission">none</property>
<event name="OnAuiRender"></event> <object class="sizeritem" expanded="1">
<event name="OnAux1DClick"></event> <property name="border">10</property>
<event name="OnAux1Down"></event> <property name="flag">wxEXPAND|wxRIGHT|wxLEFT</property>
<event name="OnAux1Up"></event> <property name="proportion">1</property>
<event name="OnAux2DClick"></event> <object class="wxBoxSizer" expanded="1">
<event name="OnAux2Down"></event> <property name="minimum_size"></property>
<event name="OnAux2Up"></event> <property name="name">bSizer4</property>
<event name="OnChar"></event> <property name="orient">wxVERTICAL</property>
<event name="OnCharHook"></event> <property name="permission">none</property>
<event name="OnEnterWindow"></event> <object class="sizeritem" expanded="1">
<event name="OnEraseBackground"></event> <property name="border">5</property>
<event name="OnInitDialog"></event> <property name="flag">wxTOP|wxBOTTOM</property>
<event name="OnKeyDown"></event> <property name="proportion">0</property>
<event name="OnKeyUp"></event> <object class="wxStaticText" expanded="1">
<event name="OnKillFocus"></event> <property name="BottomDockable">1</property>
<event name="OnLeaveWindow"></event> <property name="LeftDockable">1</property>
<event name="OnLeftDClick"></event> <property name="RightDockable">1</property>
<event name="OnLeftDown"></event> <property name="TopDockable">1</property>
<event name="OnLeftUp"></event> <property name="aui_layer"></property>
<event name="OnMiddleDClick"></event> <property name="aui_name"></property>
<event name="OnMiddleDown"></event> <property name="aui_position"></property>
<event name="OnMiddleUp"></event> <property name="aui_row"></property>
<event name="OnMotion"></event> <property name="best_size"></property>
<event name="OnMouseEvents"></event> <property name="bg"></property>
<event name="OnMouseWheel"></event> <property name="caption"></property>
<event name="OnPaint"></event> <property name="caption_visible">1</property>
<event name="OnRightDClick"></event> <property name="center_pane">0</property>
<event name="OnRightDown"></event> <property name="close_button">1</property>
<event name="OnRightUp"></event> <property name="context_help"></property>
<event name="OnSetFocus"></event> <property name="context_menu">1</property>
<event name="OnSize"></event> <property name="default_pane">0</property>
<event name="OnUpdateUI"></event> <property name="dock">Dock</property>
<object class="wxBoxSizer" expanded="1"> <property name="dock_fixed">0</property>
<property name="minimum_size"></property> <property name="docking">Left</property>
<property name="name">bPanelSizer</property> <property name="enabled">1</property>
<property name="orient">wxHORIZONTAL</property> <property name="fg"></property>
<property name="permission">none</property> <property name="floatable">1</property>
<object class="sizeritem" expanded="1"> <property name="font"></property>
<property name="border">10</property> <property name="gripper">0</property>
<property name="flag">wxEXPAND|wxRIGHT|wxLEFT</property> <property name="hidden">0</property>
<property name="proportion">1</property> <property name="id">wxID_ANY</property>
<object class="wxBoxSizer" expanded="1"> <property name="label">%s field name templates:</property>
<property name="minimum_size"></property> <property name="markup">0</property>
<property name="name">bMargins</property> <property name="max_size"></property>
<property name="orient">wxVERTICAL</property> <property name="maximize_button">0</property>
<property name="permission">none</property> <property name="maximum_size"></property>
<object class="sizeritem" expanded="0"> <property name="min_size"></property>
<property name="border">2</property> <property name="minimize_button">0</property>
<property name="flag">wxEXPAND|wxTOP</property> <property name="minimum_size"></property>
<property name="proportion">1</property> <property name="moveable">1</property>
<object class="wxGrid" expanded="0"> <property name="name">m_title</property>
<property name="BottomDockable">1</property> <property name="pane_border">1</property>
<property name="LeftDockable">1</property> <property name="pane_position"></property>
<property name="RightDockable">1</property> <property name="pane_size"></property>
<property name="TopDockable">1</property> <property name="permission">protected</property>
<property name="aui_layer"></property> <property name="pin_button">1</property>
<property name="aui_name"></property> <property name="pos"></property>
<property name="aui_position"></property> <property name="resize">Resizable</property>
<property name="aui_row"></property> <property name="show">1</property>
<property name="autosize_cols">0</property> <property name="size"></property>
<property name="autosize_rows">0</property> <property name="style"></property>
<property name="best_size"></property> <property name="subclass">; ; forward_declare</property>
<property name="bg"></property> <property name="toolbar_pane">0</property>
<property name="caption"></property> <property name="tooltip"></property>
<property name="caption_visible">1</property> <property name="window_extra_style"></property>
<property name="cell_bg"></property> <property name="window_name"></property>
<property name="cell_font"></property> <property name="window_style"></property>
<property name="cell_horiz_alignment">wxALIGN_LEFT</property> <property name="wrap">-1</property>
<property name="cell_text"></property> </object>
<property name="cell_vert_alignment">wxALIGN_TOP</property> </object>
<property name="center_pane">0</property> <object class="sizeritem" expanded="0">
<property name="close_button">1</property> <property name="border">10</property>
<property name="col_label_horiz_alignment">wxALIGN_CENTRE</property> <property name="flag">wxEXPAND</property>
<property name="col_label_size">22</property> <property name="proportion">1</property>
<property name="col_label_values">&quot;Name&quot; &quot;Visible&quot; &quot;URL&quot;</property> <object class="wxGrid" expanded="0">
<property name="col_label_vert_alignment">wxALIGN_CENTRE</property> <property name="BottomDockable">1</property>
<property name="cols">3</property> <property name="LeftDockable">1</property>
<property name="column_sizes">300,60,60</property> <property name="RightDockable">1</property>
<property name="context_help"></property> <property name="TopDockable">1</property>
<property name="context_menu">1</property> <property name="aui_layer"></property>
<property name="default_pane">0</property> <property name="aui_name"></property>
<property name="dock">Dock</property> <property name="aui_position"></property>
<property name="dock_fixed">0</property> <property name="aui_row"></property>
<property name="docking">Left</property> <property name="autosize_cols">0</property>
<property name="drag_col_move">0</property> <property name="autosize_rows">0</property>
<property name="drag_col_size">1</property> <property name="best_size"></property>
<property name="drag_grid_size">0</property> <property name="bg"></property>
<property name="drag_row_size">1</property> <property name="caption"></property>
<property name="editing">1</property> <property name="caption_visible">1</property>
<property name="enabled">1</property> <property name="cell_bg"></property>
<property name="fg"></property> <property name="cell_font"></property>
<property name="floatable">1</property> <property name="cell_horiz_alignment">wxALIGN_LEFT</property>
<property name="font"></property> <property name="cell_text"></property>
<property name="grid_line_color"></property> <property name="cell_vert_alignment">wxALIGN_TOP</property>
<property name="grid_lines">1</property> <property name="center_pane">0</property>
<property name="gripper">0</property> <property name="close_button">1</property>
<property name="hidden">0</property> <property name="col_label_horiz_alignment">wxALIGN_CENTER</property>
<property name="id">wxID_ANY</property> <property name="col_label_size">22</property>
<property name="label_bg"></property> <property name="col_label_values">&quot;Name&quot; &quot;Visible&quot; &quot;URL&quot;</property>
<property name="label_font"></property> <property name="col_label_vert_alignment">wxALIGN_CENTER</property>
<property name="label_text"></property> <property name="cols">3</property>
<property name="margin_height">0</property> <property name="column_sizes">300,60,60</property>
<property name="margin_width">0</property> <property name="context_help"></property>
<property name="max_size"></property> <property name="context_menu">1</property>
<property name="maximize_button">0</property> <property name="default_pane">0</property>
<property name="maximum_size"></property> <property name="dock">Dock</property>
<property name="min_size"></property> <property name="dock_fixed">0</property>
<property name="minimize_button">0</property> <property name="docking">Left</property>
<property name="minimum_size"></property> <property name="drag_col_move">0</property>
<property name="moveable">1</property> <property name="drag_col_size">1</property>
<property name="name">m_grid</property> <property name="drag_grid_size">0</property>
<property name="pane_border">1</property> <property name="drag_row_size">1</property>
<property name="pane_position"></property> <property name="editing">1</property>
<property name="pane_size"></property> <property name="enabled">1</property>
<property name="permission">protected</property> <property name="fg"></property>
<property name="pin_button">1</property> <property name="floatable">1</property>
<property name="pos"></property> <property name="font"></property>
<property name="resize">Resizable</property> <property name="grid_line_color"></property>
<property name="row_label_horiz_alignment">wxALIGN_CENTRE</property> <property name="grid_lines">1</property>
<property name="row_label_size">0</property> <property name="gripper">0</property>
<property name="row_label_values"></property> <property name="hidden">0</property>
<property name="row_label_vert_alignment">wxALIGN_CENTRE</property> <property name="id">wxID_ANY</property>
<property name="row_sizes"></property> <property name="label_bg"></property>
<property name="rows">0</property> <property name="label_font"></property>
<property name="show">1</property> <property name="label_text"></property>
<property name="size"></property> <property name="margin_height">0</property>
<property name="subclass">WX_GRID; widgets/wx_grid.h; forward_declare</property> <property name="margin_width">0</property>
<property name="toolbar_pane">0</property> <property name="max_size"></property>
<property name="tooltip"></property> <property name="maximize_button">0</property>
<property name="window_extra_style"></property> <property name="maximum_size"></property>
<property name="window_name"></property> <property name="min_size">-1,-1</property>
<property name="window_style"></property> <property name="minimize_button">0</property>
<event name="OnAux1DClick"></event> <property name="minimum_size">-1,180</property>
<event name="OnAux1Down"></event> <property name="moveable">1</property>
<event name="OnAux1Up"></event> <property name="name">m_grid</property>
<event name="OnAux2DClick"></event> <property name="pane_border">1</property>
<event name="OnAux2Down"></event> <property name="pane_position"></property>
<event name="OnAux2Up"></event> <property name="pane_size"></property>
<event name="OnChar"></event> <property name="permission">protected</property>
<event name="OnCharHook"></event> <property name="pin_button">1</property>
<event name="OnEnterWindow"></event> <property name="pos"></property>
<event name="OnEraseBackground"></event> <property name="resize">Resizable</property>
<event name="OnGridCellChange"></event> <property name="row_label_horiz_alignment">wxALIGN_CENTER</property>
<event name="OnGridCellLeftClick"></event> <property name="row_label_size">0</property>
<event name="OnGridCellLeftDClick"></event> <property name="row_label_values"></property>
<event name="OnGridCellRightClick"></event> <property name="row_label_vert_alignment">wxALIGN_CENTER</property>
<event name="OnGridCellRightDClick"></event> <property name="row_sizes"></property>
<event name="OnGridCmdCellChange"></event> <property name="rows">0</property>
<event name="OnGridCmdCellLeftClick"></event> <property name="show">1</property>
<event name="OnGridCmdCellLeftDClick"></event> <property name="size"></property>
<event name="OnGridCmdCellRightClick"></event> <property name="subclass">WX_GRID; widgets/wx_grid.h; forward_declare</property>
<event name="OnGridCmdCellRightDClick"></event> <property name="toolbar_pane">0</property>
<event name="OnGridCmdColSize"></event> <property name="tooltip"></property>
<event name="OnGridCmdEditorCreated"></event> <property name="window_extra_style"></property>
<event name="OnGridCmdEditorHidden"></event> <property name="window_name"></property>
<event name="OnGridCmdEditorShown"></event> <property name="window_style"></property>
<event name="OnGridCmdLabelLeftClick"></event> <event name="OnSize">OnSizeGrid</event>
<event name="OnGridCmdLabelLeftDClick"></event> </object>
<event name="OnGridCmdLabelRightClick"></event> </object>
<event name="OnGridCmdLabelRightDClick"></event> <object class="sizeritem" expanded="1">
<event name="OnGridCmdRangeSelect"></event> <property name="border">10</property>
<event name="OnGridCmdRowSize"></event> <property name="flag">wxEXPAND</property>
<event name="OnGridCmdSelectCell"></event> <property name="proportion">0</property>
<event name="OnGridColSize"></event> <object class="wxBoxSizer" expanded="1">
<event name="OnGridEditorCreated"></event> <property name="minimum_size"></property>
<event name="OnGridEditorHidden"></event> <property name="name">bSizer10</property>
<event name="OnGridEditorShown"></event> <property name="orient">wxHORIZONTAL</property>
<event name="OnGridLabelLeftClick"></event> <property name="permission">none</property>
<event name="OnGridLabelLeftDClick"></event> <object class="sizeritem" expanded="1">
<event name="OnGridLabelRightClick"></event> <property name="border">5</property>
<event name="OnGridLabelRightDClick"></event> <property name="flag">wxTOP|wxRIGHT</property>
<event name="OnGridRangeSelect"></event> <property name="proportion">0</property>
<event name="OnGridRowSize"></event> <object class="wxBitmapButton" expanded="1">
<event name="OnGridSelectCell"></event> <property name="BottomDockable">1</property>
<event name="OnKeyDown"></event> <property name="LeftDockable">1</property>
<event name="OnKeyUp"></event> <property name="RightDockable">1</property>
<event name="OnKillFocus"></event> <property name="TopDockable">1</property>
<event name="OnLeaveWindow"></event> <property name="aui_layer"></property>
<event name="OnLeftDClick"></event> <property name="aui_name"></property>
<event name="OnLeftDown"></event> <property name="aui_position"></property>
<event name="OnLeftUp"></event> <property name="aui_row"></property>
<event name="OnMiddleDClick"></event> <property name="best_size"></property>
<event name="OnMiddleDown"></event> <property name="bg"></property>
<event name="OnMiddleUp"></event> <property name="bitmap"></property>
<event name="OnMotion"></event> <property name="caption"></property>
<event name="OnMouseEvents"></event> <property name="caption_visible">1</property>
<event name="OnMouseWheel"></event> <property name="center_pane">0</property>
<event name="OnPaint"></event> <property name="close_button">1</property>
<event name="OnRightDClick"></event> <property name="context_help"></property>
<event name="OnRightDown"></event> <property name="context_menu">1</property>
<event name="OnRightUp"></event> <property name="current"></property>
<event name="OnSetFocus"></event> <property name="default">0</property>
<event name="OnSize">OnSizeGrid</event> <property name="default_pane">0</property>
<event name="OnUpdateUI"></event> <property name="disabled"></property>
</object> <property name="dock">Dock</property>
</object> <property name="dock_fixed">0</property>
<object class="sizeritem" expanded="1"> <property name="docking">Left</property>
<property name="border">5</property> <property name="enabled">1</property>
<property name="flag">wxEXPAND</property> <property name="fg"></property>
<property name="proportion">0</property> <property name="floatable">1</property>
<object class="wxBoxSizer" expanded="1"> <property name="focus"></property>
<property name="minimum_size"></property> <property name="font"></property>
<property name="name">bSizer10</property> <property name="gripper">0</property>
<property name="orient">wxHORIZONTAL</property> <property name="hidden">0</property>
<property name="permission">none</property> <property name="id">wxID_ANY</property>
<object class="sizeritem" expanded="1"> <property name="label">Add Field</property>
<property name="border">5</property> <property name="margins"></property>
<property name="flag">wxTOP|wxRIGHT</property> <property name="markup">0</property>
<property name="proportion">0</property> <property name="max_size"></property>
<object class="wxBitmapButton" expanded="1"> <property name="maximize_button">0</property>
<property name="BottomDockable">1</property> <property name="maximum_size"></property>
<property name="LeftDockable">1</property> <property name="min_size"></property>
<property name="RightDockable">1</property> <property name="minimize_button">0</property>
<property name="TopDockable">1</property> <property name="minimum_size">29,29</property>
<property name="aui_layer"></property> <property name="moveable">1</property>
<property name="aui_name"></property> <property name="name">m_addFieldButton</property>
<property name="aui_position"></property> <property name="pane_border">1</property>
<property name="aui_row"></property> <property name="pane_position"></property>
<property name="best_size"></property> <property name="pane_size"></property>
<property name="bg"></property> <property name="permission">protected</property>
<property name="bitmap"></property> <property name="pin_button">1</property>
<property name="caption"></property> <property name="pos"></property>
<property name="caption_visible">1</property> <property name="position"></property>
<property name="center_pane">0</property> <property name="pressed"></property>
<property name="close_button">1</property> <property name="resize">Resizable</property>
<property name="context_help"></property> <property name="show">1</property>
<property name="context_menu">1</property> <property name="size"></property>
<property name="current"></property> <property name="style"></property>
<property name="default">0</property> <property name="subclass">; forward_declare</property>
<property name="default_pane">0</property> <property name="toolbar_pane">0</property>
<property name="disabled"></property> <property name="tooltip"></property>
<property name="dock">Dock</property> <property name="validator_data_type"></property>
<property name="dock_fixed">0</property> <property name="validator_style">wxFILTER_NONE</property>
<property name="docking">Left</property> <property name="validator_type">wxDefaultValidator</property>
<property name="enabled">1</property> <property name="validator_variable"></property>
<property name="fg"></property> <property name="window_extra_style"></property>
<property name="floatable">1</property> <property name="window_name"></property>
<property name="focus"></property> <property name="window_style"></property>
<property name="font"></property> <event name="OnButtonClick">OnAddButtonClick</event>
<property name="gripper">0</property> </object>
<property name="hidden">0</property> </object>
<property name="id">wxID_ANY</property> <object class="sizeritem" expanded="1">
<property name="label">Add Field</property> <property name="border">5</property>
<property name="margins"></property> <property name="flag">wxEXPAND|wxRIGHT|wxLEFT</property>
<property name="markup">0</property> <property name="proportion">0</property>
<property name="max_size"></property> <object class="spacer" expanded="1">
<property name="maximize_button">0</property> <property name="height">0</property>
<property name="maximum_size"></property> <property name="permission">protected</property>
<property name="min_size"></property> <property name="width">0</property>
<property name="minimize_button">0</property> </object>
<property name="minimum_size">29,29</property> </object>
<property name="moveable">1</property> <object class="sizeritem" expanded="1">
<property name="name">m_addFieldButton</property> <property name="border">5</property>
<property name="pane_border">1</property> <property name="flag">wxTOP|wxRIGHT|wxLEFT</property>
<property name="pane_position"></property> <property name="proportion">0</property>
<property name="pane_size"></property> <object class="wxBitmapButton" expanded="1">
<property name="permission">protected</property> <property name="BottomDockable">1</property>
<property name="pin_button">1</property> <property name="LeftDockable">1</property>
<property name="pos"></property> <property name="RightDockable">1</property>
<property name="position"></property> <property name="TopDockable">1</property>
<property name="pressed"></property> <property name="aui_layer"></property>
<property name="resize">Resizable</property> <property name="aui_name"></property>
<property name="show">1</property> <property name="aui_position"></property>
<property name="size"></property> <property name="aui_row"></property>
<property name="style"></property> <property name="best_size"></property>
<property name="subclass">; forward_declare</property> <property name="bg"></property>
<property name="toolbar_pane">0</property> <property name="bitmap"></property>
<property name="tooltip"></property> <property name="caption"></property>
<property name="validator_data_type"></property> <property name="caption_visible">1</property>
<property name="validator_style">wxFILTER_NONE</property> <property name="center_pane">0</property>
<property name="validator_type">wxDefaultValidator</property> <property name="close_button">1</property>
<property name="validator_variable"></property> <property name="context_help"></property>
<property name="window_extra_style"></property> <property name="context_menu">1</property>
<property name="window_name"></property> <property name="current"></property>
<property name="window_style"></property> <property name="default">0</property>
<event name="OnAux1DClick"></event> <property name="default_pane">0</property>
<event name="OnAux1Down"></event> <property name="disabled"></property>
<event name="OnAux1Up"></event> <property name="dock">Dock</property>
<event name="OnAux2DClick"></event> <property name="dock_fixed">0</property>
<event name="OnAux2Down"></event> <property name="docking">Left</property>
<event name="OnAux2Up"></event> <property name="enabled">1</property>
<event name="OnButtonClick">OnAddButtonClick</event> <property name="fg"></property>
<event name="OnChar"></event> <property name="floatable">1</property>
<event name="OnCharHook"></event> <property name="focus"></property>
<event name="OnEnterWindow"></event> <property name="font"></property>
<event name="OnEraseBackground"></event> <property name="gripper">0</property>
<event name="OnKeyDown"></event> <property name="hidden">0</property>
<event name="OnKeyUp"></event> <property name="id">wxID_ANY</property>
<event name="OnKillFocus"></event> <property name="label">Delete Field</property>
<event name="OnLeaveWindow"></event> <property name="margins"></property>
<event name="OnLeftDClick"></event> <property name="markup">0</property>
<event name="OnLeftDown"></event> <property name="max_size"></property>
<event name="OnLeftUp"></event> <property name="maximize_button">0</property>
<event name="OnMiddleDClick"></event> <property name="maximum_size"></property>
<event name="OnMiddleDown"></event> <property name="min_size"></property>
<event name="OnMiddleUp"></event> <property name="minimize_button">0</property>
<event name="OnMotion"></event> <property name="minimum_size">29,29</property>
<event name="OnMouseEvents"></event> <property name="moveable">1</property>
<event name="OnMouseWheel"></event> <property name="name">m_deleteFieldButton</property>
<event name="OnPaint"></event> <property name="pane_border">1</property>
<event name="OnRightDClick"></event> <property name="pane_position"></property>
<event name="OnRightDown"></event> <property name="pane_size"></property>
<event name="OnRightUp"></event> <property name="permission">protected</property>
<event name="OnSetFocus"></event> <property name="pin_button">1</property>
<event name="OnSize"></event> <property name="pos"></property>
<event name="OnUpdateUI"></event> <property name="position"></property>
</object> <property name="pressed"></property>
</object> <property name="resize">Resizable</property>
<object class="sizeritem" expanded="1"> <property name="show">1</property>
<property name="border">5</property> <property name="size"></property>
<property name="flag">wxEXPAND|wxRIGHT|wxLEFT</property> <property name="style"></property>
<property name="proportion">0</property> <property name="subclass">; forward_declare</property>
<object class="spacer" expanded="1"> <property name="toolbar_pane">0</property>
<property name="height">0</property> <property name="tooltip"></property>
<property name="permission">protected</property> <property name="validator_data_type"></property>
<property name="width">0</property> <property name="validator_style">wxFILTER_NONE</property>
</object> <property name="validator_type">wxDefaultValidator</property>
</object> <property name="validator_variable"></property>
<object class="sizeritem" expanded="1"> <property name="window_extra_style"></property>
<property name="border">5</property> <property name="window_name"></property>
<property name="flag">wxTOP|wxRIGHT|wxLEFT</property> <property name="window_style"></property>
<property name="proportion">0</property> <event name="OnButtonClick">OnDeleteButtonClick</event>
<object class="wxBitmapButton" expanded="1"> </object>
<property name="BottomDockable">1</property> </object>
<property name="LeftDockable">1</property> </object>
<property name="RightDockable">1</property> </object>
<property name="TopDockable">1</property> </object>
<property name="aui_layer"></property> </object>
<property name="aui_name"></property> </object>
<property name="aui_position"></property> </object>
<property name="aui_row"></property> </object>
<property name="best_size"></property> </wxFormBuilder_Project>
<property name="bg"></property>
<property name="bitmap"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="current"></property>
<property name="default">0</property>
<property name="default_pane">0</property>
<property name="disabled"></property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="focus"></property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Delete Field</property>
<property name="margins"></property>
<property name="markup">0</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size">29,29</property>
<property name="moveable">1</property>
<property name="name">m_deleteFieldButton</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="position"></property>
<property name="pressed"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass">; forward_declare</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnAux1DClick"></event>
<event name="OnAux1Down"></event>
<event name="OnAux1Up"></event>
<event name="OnAux2DClick"></event>
<event name="OnAux2Down"></event>
<event name="OnAux2Up"></event>
<event name="OnButtonClick">OnDeleteButtonClick</event>
<event name="OnChar"></event>
<event name="OnCharHook"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
</object>
</object>
</object>
</object>
</object>
</object>
</object>
</wxFormBuilder_Project>

30
eeschema/dialogs/panel_eeschema_template_fieldnames_base.h
View File

@ -1,24 +1,24 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Aug 2 2018) // C++ code generated with wxFormBuilder (version Oct 26 2018)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
#ifndef __PANEL_EESCHEMA_TEMPLATE_FIELDNAMES_BASE_H__ #pragma once
#define __PANEL_EESCHEMA_TEMPLATE_FIELDNAMES_BASE_H__
#include <wx/artprov.h> #include <wx/artprov.h>
#include <wx/xrc/xmlres.h> #include <wx/xrc/xmlres.h>
#include <wx/intl.h> #include <wx/intl.h>
class WX_GRID; class WX_GRID;
#include <wx/string.h>
#include <wx/stattext.h>
#include <wx/gdicmn.h>
#include <wx/font.h>
#include <wx/colour.h> #include <wx/colour.h>
#include <wx/settings.h> #include <wx/settings.h>
#include <wx/string.h>
#include <wx/font.h>
#include <wx/grid.h> #include <wx/grid.h>
#include <wx/gdicmn.h>
#include <wx/bmpbuttn.h> #include <wx/bmpbuttn.h>
#include <wx/bitmap.h> #include <wx/bitmap.h>
#include <wx/image.h> #include <wx/image.h>
@ -32,26 +32,26 @@ class WX_GRID;
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
/// Class PANEL_EESCHEMA_TEMPLATE_FIELDNAMES_BASE /// Class PANEL_EESCHEMA_TEMPLATE_FIELDNAMES_BASE
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
class PANEL_EESCHEMA_TEMPLATE_FIELDNAMES_BASE : public wxPanel class PANEL_EESCHEMA_TEMPLATE_FIELDNAMES_BASE : public wxPanel
{ {
private: private:
protected: protected:
wxStaticText* m_title;
WX_GRID* m_grid; WX_GRID* m_grid;
wxBitmapButton* m_addFieldButton; wxBitmapButton* m_addFieldButton;
wxBitmapButton* m_deleteFieldButton; wxBitmapButton* m_deleteFieldButton;
// Virtual event handlers, overide them in your derived class // Virtual event handlers, overide them in your derived class
virtual void OnSizeGrid( wxSizeEvent& event ) { event.Skip(); } virtual void OnSizeGrid( wxSizeEvent& event ) { event.Skip(); }
virtual void OnAddButtonClick( wxCommandEvent& event ) { event.Skip(); } virtual void OnAddButtonClick( wxCommandEvent& event ) { event.Skip(); }
virtual void OnDeleteButtonClick( wxCommandEvent& event ) { event.Skip(); } virtual void OnDeleteButtonClick( wxCommandEvent& event ) { event.Skip(); }
public: public:
PANEL_EESCHEMA_TEMPLATE_FIELDNAMES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString ); PANEL_EESCHEMA_TEMPLATE_FIELDNAMES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString );
~PANEL_EESCHEMA_TEMPLATE_FIELDNAMES_BASE(); ~PANEL_EESCHEMA_TEMPLATE_FIELDNAMES_BASE();
}; };
#endif //__PANEL_EESCHEMA_TEMPLATE_FIELDNAMES_BASE_H__

117
eeschema/dialogs/panel_setup_formatting.cpp Normal file
View File

@ -0,0 +1,117 @@
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2020 KiCad Developers, see AUTHORS.txt for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, you may find one here:
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
* or you may search the http://www.gnu.org website for the version 2 license,
* or you may write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <fctsys.h>
#include <sch_edit_frame.h>
#include <class_libentry.h>
#include <panel_setup_formatting.h>
#include <sch_junction.h>
#include <gr_text.h>
PANEL_SETUP_FORMATTING::PANEL_SETUP_FORMATTING( wxWindow* aWindow, SCH_EDIT_FRAME* aFrame ) :
PANEL_SETUP_FORMATTING_BASE( aWindow ),
m_frame( aFrame ),
m_busWidth( aFrame, m_busWidthLabel, m_busWidthCtrl, m_busWidthUnits, true ),
m_wireWidth( aFrame, m_wireWidthLabel, m_wireWidthCtrl, m_wireWidthUnits, true ),
m_junctionSize( aFrame, m_jctSizeLabel, m_jctSizeCtrl, m_jctSizeUnits, true )
{
wxFont infoFont = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT );
infoFont.SetSymbolicSize( wxFONTSIZE_SMALL );
m_superSubHint->SetFont( infoFont );
}
bool PANEL_SETUP_FORMATTING::TransferDataToWindow()
{
// Reference style one of: "A" ".A" "-A" "_A" ".1" "-1" "_1"
int refStyleSelection;
switch( LIB_PART::GetSubpartIdSeparator() )
{
default:
case 0: refStyleSelection = 0; break;
case '.': refStyleSelection = LIB_PART::GetSubpartFirstId() == '1' ? 4 : 1; break;
case '-': refStyleSelection = LIB_PART::GetSubpartFirstId() == '1' ? 5 : 2; break;
case '_': refStyleSelection = LIB_PART::GetSubpartFirstId() == '1' ? 6 : 3; break;
}
m_choiceSeparatorRefId->SetSelection( refStyleSelection );
m_busWidth.SetUnits( EDA_UNITS::INCHES, true );
m_wireWidth.SetUnits( EDA_UNITS::INCHES, true );
m_junctionSize.SetUnits( EDA_UNITS::INCHES, true );
m_busWidth.SetValue( GetDefaultBusThickness() );
m_wireWidth.SetValue( GetDefaultWireThickness() );
m_junctionSize.SetValue( SCH_JUNCTION::GetSymbolSize() );
int superSubFlags = ENABLE_SUBSCRIPT_MARKUP | ENABLE_SUPERSCRIPT_MARKUP;
m_checkSuperSub->SetValue( GetTextMarkupFlags() & superSubFlags );
return true;
}
bool PANEL_SETUP_FORMATTING::TransferDataFromWindow()
{
// Reference style one of: "A" ".A" "-A" "_A" ".1" "-1" "_1"
int firstRefId, refSeparator;
switch( m_choiceSeparatorRefId->GetSelection() )
{
default:
case 0: firstRefId = 'A'; refSeparator = 0; break;
case 1: firstRefId = 'A'; refSeparator = '.'; break;
case 2: firstRefId = 'A'; refSeparator = '-'; break;
case 3: firstRefId = 'A'; refSeparator = '_'; break;
case 4: firstRefId = '1'; refSeparator = '.'; break;
case 5: firstRefId = '1'; refSeparator = '-'; break;
case 6: firstRefId = '1'; refSeparator = '_'; break;
}
if( refSeparator != LIB_PART::GetSubpartIdSeparator() ||
firstRefId != LIB_PART::GetSubpartFirstId() )
{
LIB_PART::SetSubpartIdNotation( refSeparator, firstRefId );
m_frame->SaveProjectSettings();
}
SetDefaultBusThickness( m_busWidth.GetValue() );
SetDefaultWireThickness( m_wireWidth.GetValue() );
SCH_JUNCTION::SetSymbolSize( m_junctionSize.GetValue() );
int superSubFlags = ENABLE_SUBSCRIPT_MARKUP | ENABLE_SUPERSCRIPT_MARKUP;
if( m_checkSuperSub->GetValue() )
SetTextMarkupFlags( GetTextMarkupFlags() | superSubFlags );
else
SetTextMarkupFlags( GetTextMarkupFlags() & ~superSubFlags );
m_frame->GetCanvas()->GetView()->MarkDirty();
m_frame->GetCanvas()->GetView()->UpdateAllItems( KIGFX::REPAINT );
m_frame->GetCanvas()->Refresh();
return true;
}

47
eeschema/dialogs/panel_setup_formatting.h Normal file
View File

@ -0,0 +1,47 @@
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2020 KiCad Developers, see AUTHORS.txt for contributors.
*
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation, either version 3 of the License, or (at your
* option) any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef KICAD_PANEL_SETUP_FORMATTING_H
#define KICAD_PANEL_SETUP_FORMATTING_H
#include <widgets/unit_binder.h>
#include "panel_setup_formatting_base.h"
class SCH_EDIT_FRAME;
class GAL_OPTIONS_PANEL;
class PANEL_SETUP_FORMATTING : public PANEL_SETUP_FORMATTING_BASE
{
SCH_EDIT_FRAME* m_frame;
UNIT_BINDER m_busWidth;
UNIT_BINDER m_wireWidth;
UNIT_BINDER m_junctionSize;
public:
PANEL_SETUP_FORMATTING( wxWindow* aWindow, SCH_EDIT_FRAME* aFrame );
private:
bool TransferDataToWindow() override;
bool TransferDataFromWindow() override;
};
#endif //KICAD_PANEL_SETUP_FORMATTING_H

125
eeschema/dialogs/panel_setup_formatting_base.cpp Normal file
View File

@ -0,0 +1,125 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Oct 26 2018)
// http://www.wxformbuilder.org/
//
// PLEASE DO *NOT* EDIT THIS FILE!
///////////////////////////////////////////////////////////////////////////
#include "panel_setup_formatting_base.h"
///////////////////////////////////////////////////////////////////////////
PANEL_SETUP_FORMATTING_BASE::PANEL_SETUP_FORMATTING_BASE( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxPanel( parent, id, pos, size, style, name )
{
wxBoxSizer* bPanelSizer;
bPanelSizer = new wxBoxSizer( wxHORIZONTAL );
wxBoxSizer* bLeftColumn;
bLeftColumn = new wxBoxSizer( wxVERTICAL );
wxStaticBoxSizer* sbSizer1;
sbSizer1 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Annotations") ), wxVERTICAL );
wxBoxSizer* bSizer6;
bSizer6 = new wxBoxSizer( wxHORIZONTAL );
m_staticText26 = new wxStaticText( sbSizer1->GetStaticBox(), wxID_ANY, _("Symbol unit notation:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText26->Wrap( -1 );
bSizer6->Add( m_staticText26, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
wxString m_choiceSeparatorRefIdChoices[] = { _("A"), _(".A"), _("-A"), _("_A"), _(".1"), _("-1"), _("_1") };
int m_choiceSeparatorRefIdNChoices = sizeof( m_choiceSeparatorRefIdChoices ) / sizeof( wxString );
m_choiceSeparatorRefId = new wxChoice( sbSizer1->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceSeparatorRefIdNChoices, m_choiceSeparatorRefIdChoices, 0 );
m_choiceSeparatorRefId->SetSelection( 0 );
bSizer6->Add( m_choiceSeparatorRefId, 1, wxEXPAND|wxRIGHT, 5 );
sbSizer1->Add( bSizer6, 0, wxEXPAND|wxBOTTOM|wxRIGHT, 5 );
bLeftColumn->Add( sbSizer1, 0, wxEXPAND|wxALL, 5 );
wxStaticBoxSizer* sbSizer4;
sbSizer4 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Text") ), wxVERTICAL );
m_checkSuperSub = new wxCheckBox( sbSizer4->GetStaticBox(), wxID_ANY, _("Enable superscript/subscript markup"), wxDefaultPosition, wxDefaultSize, 0 );
m_checkSuperSub->SetToolTip( _("Use '^' for superscript and '#' for subscript") );
sbSizer4->Add( m_checkSuperSub, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
m_superSubHint = new wxStaticText( sbSizer4->GetStaticBox(), wxID_ANY, _("(preceed superscript text with ^; subscript text with #)"), wxDefaultPosition, wxDefaultSize, 0 );
m_superSubHint->Wrap( -1 );
sbSizer4->Add( m_superSubHint, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
bLeftColumn->Add( sbSizer4, 1, wxEXPAND|wxALL, 5 );
wxStaticBoxSizer* sbSizer2;
sbSizer2 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Connections") ), wxVERTICAL );
wxFlexGridSizer* fgSizer32;
fgSizer32 = new wxFlexGridSizer( 0, 3, 3, 0 );
fgSizer32->AddGrowableCol( 1 );
fgSizer32->SetFlexibleDirection( wxBOTH );
fgSizer32->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
m_busWidthLabel = new wxStaticText( sbSizer2->GetStaticBox(), wxID_ANY, _("&Bus thickness:"), wxDefaultPosition, wxDefaultSize, 0 );
m_busWidthLabel->Wrap( -1 );
fgSizer32->Add( m_busWidthLabel, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
m_busWidthCtrl = new wxTextCtrl( sbSizer2->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_WRAP );
fgSizer32->Add( m_busWidthCtrl, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
m_busWidthUnits = new wxStaticText( sbSizer2->GetStaticBox(), wxID_ANY, _("mils"), wxDefaultPosition, wxDefaultSize, 0 );
m_busWidthUnits->Wrap( -1 );
fgSizer32->Add( m_busWidthUnits, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
m_wireWidthLabel = new wxStaticText( sbSizer2->GetStaticBox(), wxID_ANY, _("&Wire thickness:"), wxDefaultPosition, wxDefaultSize, 0 );
m_wireWidthLabel->Wrap( -1 );
fgSizer32->Add( m_wireWidthLabel, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
m_wireWidthCtrl = new wxTextCtrl( sbSizer2->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS|wxSP_WRAP );
fgSizer32->Add( m_wireWidthCtrl, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
m_wireWidthUnits = new wxStaticText( sbSizer2->GetStaticBox(), wxID_ANY, _("mils"), wxDefaultPosition, wxDefaultSize, 0 );
m_wireWidthUnits->Wrap( -1 );
fgSizer32->Add( m_wireWidthUnits, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
m_jctSizeLabel = new wxStaticText( sbSizer2->GetStaticBox(), wxID_ANY, _("Junction size:"), wxDefaultPosition, wxDefaultSize, 0 );
m_jctSizeLabel->Wrap( -1 );
fgSizer32->Add( m_jctSizeLabel, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
m_jctSizeCtrl = new wxTextCtrl( sbSizer2->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
fgSizer32->Add( m_jctSizeCtrl, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
m_jctSizeUnits = new wxStaticText( sbSizer2->GetStaticBox(), wxID_ANY, _("mils"), wxDefaultPosition, wxDefaultSize, 0 );
m_jctSizeUnits->Wrap( -1 );
fgSizer32->Add( m_jctSizeUnits, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
sbSizer2->Add( fgSizer32, 0, wxBOTTOM|wxRIGHT|wxEXPAND, 5 );
bLeftColumn->Add( sbSizer2, 0, wxEXPAND|wxALL, 5 );
bPanelSizer->Add( bLeftColumn, 1, wxTOP|wxLEFT, 10 );
wxBoxSizer* bRightColumn;
bRightColumn = new wxBoxSizer( wxVERTICAL );
bRightColumn->Add( 0, 0, 0, wxEXPAND, 5 );
bPanelSizer->Add( bRightColumn, 1, wxEXPAND, 5 );
this->SetSizer( bPanelSizer );
this->Layout();
bPanelSizer->Fit( this );
}
PANEL_SETUP_FORMATTING_BASE::~PANEL_SETUP_FORMATTING_BASE()
{
}

971
eeschema/dialogs/panel_setup_formatting_base.fbp Normal file
View File

@ -0,0 +1,971 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<wxFormBuilder_Project>
<FileVersion major="1" minor="15" />
<object class="Project" expanded="1">
<property name="class_decoration"></property>
<property name="code_generation">C++</property>
<property name="disconnect_events">1</property>
<property name="disconnect_mode">source_name</property>
<property name="disconnect_php_events">0</property>
<property name="disconnect_python_events">0</property>
<property name="embedded_files_path">res</property>
<property name="encoding">UTF-8</property>
<property name="event_generation">table</property>
<property name="file">panel_setup_formatting_base</property>
<property name="first_id">1000</property>
<property name="help_provider">none</property>
<property name="indent_with_spaces"></property>
<property name="internationalize">1</property>
<property name="name">PanelSetupFormatting</property>
<property name="namespace"></property>
<property name="path">.</property>
<property name="precompiled_header"></property>
<property name="relative_path">1</property>
<property name="skip_lua_events">1</property>
<property name="skip_php_events">1</property>
<property name="skip_python_events">1</property>
<property name="ui_table">UI</property>
<property name="use_enum">1</property>
<property name="use_microsoft_bom">0</property>
<object class="Panel" expanded="1">
<property name="aui_managed">0</property>
<property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
<property name="bg"></property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="enabled">1</property>
<property name="event_handler">impl_virtual</property>
<property name="fg"></property>
<property name="font"></property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="maximum_size"></property>
<property name="minimum_size"></property>
<property name="name">PANEL_SETUP_FORMATTING_BASE</property>
<property name="pos"></property>
<property name="size">-1,-1</property>
<property name="subclass">; forward_declare</property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style">wxTAB_TRAVERSAL</property>
<object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property>
<property name="name">bPanelSizer</property>
<property name="orient">wxHORIZONTAL</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="1">
<property name="border">10</property>
<property name="flag">wxTOP|wxLEFT</property>
<property name="proportion">1</property>
<object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property>
<property name="name">bLeftColumn</property>
<property name="orient">wxVERTICAL</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxEXPAND|wxALL</property>
<property name="proportion">0</property>
<object class="wxStaticBoxSizer" expanded="1">
<property name="id">wxID_ANY</property>
<property name="label">Annotations</property>
<property name="minimum_size"></property>
<property name="name">sbSizer1</property>
<property name="orient">wxVERTICAL</property>
<property name="parent">1</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxEXPAND|wxBOTTOM|wxRIGHT</property>
<property name="proportion">0</property>
<object class="wxBoxSizer" expanded="0">
<property name="minimum_size"></property>
<property name="name">bSizer6</property>
<property name="orient">wxHORIZONTAL</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="0">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Symbol unit notation:</property>
<property name="markup">0</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_staticText26</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<property name="wrap">-1</property>
</object>
</object>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxEXPAND|wxRIGHT</property>
<property name="proportion">1</property>
<object class="wxChoice" expanded="0">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="choices">&quot;A&quot; &quot;.A&quot; &quot;-A&quot; &quot;_A&quot; &quot;.1&quot; &quot;-1&quot; &quot;_1&quot;</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_choiceSeparatorRefId</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="selection">0</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
</object>
</object>
</object>
</object>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxEXPAND|wxALL</property>
<property name="proportion">1</property>
<object class="wxStaticBoxSizer" expanded="1">
<property name="id">wxID_ANY</property>
<property name="label">Text</property>
<property name="minimum_size"></property>
<property name="name">sbSizer4</property>
<property name="orient">wxVERTICAL</property>
<property name="parent">1</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxCheckBox" expanded="1">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="checked">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Enable superscript/subscript markup</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_checkSuperSub</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass">; ; forward_declare</property>
<property name="toolbar_pane">0</property>
<property name="tooltip">Use &apos;^&apos; for superscript and &apos;#&apos; for subscript</property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxBOTTOM|wxRIGHT|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="1">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">(preceed superscript text with ^; subscript text with #)</property>
<property name="markup">0</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_superSubHint</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass">; ; forward_declare</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<property name="wrap">-1</property>
</object>
</object>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxEXPAND|wxALL</property>
<property name="proportion">0</property>
<object class="wxStaticBoxSizer" expanded="1">
<property name="id">wxID_ANY</property>
<property name="label">Connections</property>
<property name="minimum_size"></property>
<property name="name">sbSizer2</property>
<property name="orient">wxVERTICAL</property>
<property name="parent">1</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxBOTTOM|wxRIGHT|wxEXPAND</property>
<property name="proportion">0</property>
<object class="wxFlexGridSizer" expanded="1">
<property name="cols">3</property>
<property name="flexible_direction">wxBOTH</property>
<property name="growablecols">1</property>
<property name="growablerows"></property>
<property name="hgap">0</property>
<property name="minimum_size">-1,-1</property>
<property name="name">fgSizer32</property>
<property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
<property name="permission">none</property>
<property name="rows">0</property>
<property name="vgap">3</property>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="0">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">&amp;Bus thickness:</property>
<property name="markup">0</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_busWidthLabel</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<property name="wrap">-1</property>
</object>
</object>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxEXPAND|wxALIGN_CENTER_VERTICAL</property>
<property name="proportion">0</property>
<object class="wxTextCtrl" expanded="0">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="maxlength"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_busWidthCtrl</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style">wxSP_ARROW_KEYS|wxSP_WRAP</property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="value"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
</object>
</object>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="0">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">mils</property>
<property name="markup">0</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_busWidthUnits</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<property name="wrap">-1</property>
</object>
</object>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="0">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">&amp;Wire thickness:</property>
<property name="markup">0</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_wireWidthLabel</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<property name="wrap">-1</property>
</object>
</object>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxEXPAND|wxALIGN_CENTER_VERTICAL</property>
<property name="proportion">0</property>
<object class="wxTextCtrl" expanded="0">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="maxlength"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_wireWidthCtrl</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style">wxSP_ARROW_KEYS|wxSP_WRAP</property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="value"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
</object>
</object>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="0">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">mils</property>
<property name="markup">0</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_wireWidthUnits</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<property name="wrap">-1</property>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="1">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Junction size:</property>
<property name="markup">0</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_jctSizeLabel</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass">; forward_declare</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<property name="wrap">-1</property>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxEXPAND</property>
<property name="proportion">0</property>
<object class="wxTextCtrl" expanded="1">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="maxlength"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_jctSizeCtrl</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass">; forward_declare</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="value"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="1">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">mils</property>
<property name="markup">0</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_jctSizeUnits</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass">; forward_declare</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<property name="wrap">-1</property>
</object>
</object>
</object>
</object>
</object>
</object>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">1</property>
<object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property>
<property name="name">bRightColumn</property>
<property name="orient">wxVERTICAL</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">0</property>
<object class="spacer" expanded="1">
<property name="height">0</property>
<property name="permission">protected</property>
<property name="width">0</property>
</object>
</object>
</object>
</object>
</object>
</object>
</object>
</wxFormBuilder_Project>

56
eeschema/dialogs/panel_setup_formatting_base.h Normal file
View File

@ -0,0 +1,56 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Oct 26 2018)
// http://www.wxformbuilder.org/
//
// PLEASE DO *NOT* EDIT THIS FILE!
///////////////////////////////////////////////////////////////////////////
#pragma once
#include <wx/artprov.h>
#include <wx/xrc/xmlres.h>
#include <wx/intl.h>
#include <wx/string.h>
#include <wx/stattext.h>
#include <wx/gdicmn.h>
#include <wx/font.h>
#include <wx/colour.h>
#include <wx/settings.h>
#include <wx/choice.h>
#include <wx/sizer.h>
#include <wx/statbox.h>
#include <wx/checkbox.h>
#include <wx/textctrl.h>
#include <wx/panel.h>
///////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
/// Class PANEL_SETUP_FORMATTING_BASE
///////////////////////////////////////////////////////////////////////////////
class PANEL_SETUP_FORMATTING_BASE : public wxPanel
{
private:
protected:
wxStaticText* m_staticText26;
wxChoice* m_choiceSeparatorRefId;
wxCheckBox* m_checkSuperSub;
wxStaticText* m_superSubHint;
wxStaticText* m_busWidthLabel;
wxTextCtrl* m_busWidthCtrl;
wxStaticText* m_busWidthUnits;
wxStaticText* m_wireWidthLabel;
wxTextCtrl* m_wireWidthCtrl;
wxStaticText* m_wireWidthUnits;
wxStaticText* m_jctSizeLabel;
wxTextCtrl* m_jctSizeCtrl;
wxStaticText* m_jctSizeUnits;
public:
PANEL_SETUP_FORMATTING_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString );
~PANEL_SETUP_FORMATTING_BASE();
};

220
eeschema/eeschema_config.cpp
View File

@ -51,6 +51,10 @@
//#include <widgets/widget_eeschema_color_config.h> //#include <widgets/widget_eeschema_color_config.h>
#include <wildcards_and_files_ext.h> #include <wildcards_and_files_ext.h>
#include <ws_data_model.h> #include <ws_data_model.h>
#include <widgets/ui_common.h>
#include <dialogs/dialog_schematic_setup.h>
#include "erc.h"
static int s_defaultBusThickness = Mils2iu( DEFAULTBUSTHICKNESS ); static int s_defaultBusThickness = Mils2iu( DEFAULTBUSTHICKNESS );
static int s_defaultWireThickness = Mils2iu( DEFAULTDRAWLINETHICKNESS ); static int s_defaultWireThickness = Mils2iu( DEFAULTDRAWLINETHICKNESS );
@ -61,6 +65,171 @@ static bool s_selectDrawChildren = true;
static bool s_selectFillShapes = false; static bool s_selectFillShapes = false;
static int s_selectThickness = Mils2iu( DEFAULTSELECTIONTHICKNESS ); static int s_selectThickness = Mils2iu( DEFAULTSELECTIONTHICKNESS );
#define FieldNameTemplatesKey wxT( "FieldNameTemplates" )
class PARAM_CFG_FIELDNAMES : public PARAM_CFG
{
protected:
TEMPLATES * m_Pt_param; ///< Pointer to the parameter value
public:
PARAM_CFG_FIELDNAMES( TEMPLATES * ptparam, const wxChar* group = nullptr ) :
PARAM_CFG( wxEmptyString, PARAM_SEVERITIES, group )
{
m_Pt_param = ptparam;
}
void ReadParam( wxConfigBase* aConfig ) const override
{
if( !m_Pt_param || !aConfig )
return;
wxString templateFieldNames = aConfig->Read( FieldNameTemplatesKey, wxEmptyString );
if( !templateFieldNames.IsEmpty() )
{
TEMPLATE_FIELDNAMES_LEXER lexer( TO_UTF8( templateFieldNames ) );
try
{
m_Pt_param->Parse( &lexer, false );
}
catch( const IO_ERROR& DBG( e ) )
{
// @todo show error msg
DBG( printf( "templatefieldnames parsing error: '%s'\n", TO_UTF8( e.What() ) ); )
}
}
}
void SaveParam( wxConfigBase* aConfig ) const override
{
if( !m_Pt_param || !aConfig )
return;
STRING_FORMATTER sf;
m_Pt_param->Format( &sf, 0, false );
wxString record = FROM_UTF8( sf.GetString().c_str() );
record.Replace( wxT("\n"), wxT(""), true ); // strip all newlines
record.Replace( wxT(" "), wxT(" "), true ); // double space to single
aConfig->Write( FieldNameTemplatesKey, record );
}
};
class PARAM_CFG_SEVERITIES : public PARAM_CFG
{
protected:
ERC_SETTINGS* m_Pt_param; ///< Pointer to the parameter value
public:
PARAM_CFG_SEVERITIES( ERC_SETTINGS* ptparam, const wxChar* group = nullptr ) :
PARAM_CFG( wxEmptyString, PARAM_SEVERITIES, group )
{
m_Pt_param = ptparam;
}
void ReadParam( wxConfigBase* aConfig ) const override
{
if( !m_Pt_param || !aConfig )
return;
wxString oldPath = aConfig->GetPath();
// Read legacy settings first so that modern settings will overwrite them
bool flag;
if( aConfig->Read( wxT( "ERC_TestSimilarLabels" ), &flag, true ) )
{
if( flag )
{
m_Pt_param->m_Severities[ ERCE_SIMILAR_GLBL_LABELS ] = RPT_SEVERITY_WARNING;
m_Pt_param->m_Severities[ ERCE_SIMILAR_LABELS ] = RPT_SEVERITY_WARNING;
}
else
{
m_Pt_param->m_Severities[ ERCE_SIMILAR_GLBL_LABELS ] = RPT_SEVERITY_IGNORE;
m_Pt_param->m_Severities[ ERCE_SIMILAR_LABELS ] = RPT_SEVERITY_IGNORE;
}
}
if( aConfig->Read( wxT( "ERC_CheckUniqueGlobalLabels" ), &flag, true ) )
{
if( flag )
m_Pt_param->m_Severities[ ERCE_GLOBLABEL ] = RPT_SEVERITY_WARNING;
else
m_Pt_param->m_Severities[ ERCE_GLOBLABEL ] = RPT_SEVERITY_IGNORE;
}
if( aConfig->Read( wxT( "ERC_CheckBusDriverConflicts" ), &flag, true ) )
{
if( flag )
m_Pt_param->m_Severities[ ERCE_DRIVER_CONFLICT ] = RPT_SEVERITY_WARNING;
else
m_Pt_param->m_Severities[ ERCE_DRIVER_CONFLICT ] = RPT_SEVERITY_IGNORE;
}
if( aConfig->Read( wxT( "ERC_CheckBusEntryConflicts" ), &flag, true ) )
{
if( flag )
m_Pt_param->m_Severities[ ERCE_BUS_ENTRY_CONFLICT ] = RPT_SEVERITY_WARNING;
else
m_Pt_param->m_Severities[ ERCE_BUS_ENTRY_CONFLICT ] = RPT_SEVERITY_IGNORE;
}
if( aConfig->Read( wxT( "ERC_CheckBusToBusConflicts" ), &flag, true ) )
{
if( flag )
m_Pt_param->m_Severities[ ERCE_BUS_TO_BUS_CONFLICT ] = RPT_SEVERITY_ERROR;
else
m_Pt_param->m_Severities[ ERCE_BUS_TO_BUS_CONFLICT ] = RPT_SEVERITY_IGNORE;
}
if( aConfig->Read( wxT( "ERC_CheckBusToNetConflicts" ), &flag, true ) )
{
if( flag )
m_Pt_param->m_Severities[ ERCE_BUS_TO_NET_CONFLICT ] = RPT_SEVERITY_ERROR;
else
m_Pt_param->m_Severities[ ERCE_BUS_TO_NET_CONFLICT ] = RPT_SEVERITY_IGNORE;
}
// TO DO: figure out what we're going to use as keys here so we can read/write these....
aConfig->SetPath( oldPath );
}
void SaveParam( wxConfigBase* aConfig ) const override
{
if( !m_Pt_param || !aConfig )
return;
wxString oldPath = aConfig->GetPath();
// TO DO: figure out what we're going to use as keys here so we can read/write these....
// TO DO: for now just write out the legacy ones so we don't lose them
// TO DO: remove this once the new scheme is in place
aConfig->Write( wxT( "ERC_TestSimilarLabels" ),
m_Pt_param->IsTestEnabled( ERCE_SIMILAR_GLBL_LABELS ) );
aConfig->Write( wxT( "ERC_CheckUniqueGlobalLabels" ),
m_Pt_param->IsTestEnabled( ERCE_GLOBLABEL ) );
aConfig->Write( wxT( "ERC_CheckBusDriverConflicts" ),
m_Pt_param->IsTestEnabled( ERCE_DRIVER_CONFLICT ) );
aConfig->Write( wxT( "ERC_CheckBusEntryConflicts" ),
m_Pt_param->IsTestEnabled( ERCE_BUS_ENTRY_CONFLICT ) );
aConfig->Write( wxT( "ERC_CheckBusToBusConflicts" ),
m_Pt_param->IsTestEnabled( ERCE_BUS_TO_BUS_CONFLICT ) );
aConfig->Write( wxT( "ERC_CheckBusToNetConflicts" ),
m_Pt_param->IsTestEnabled( ERCE_BUS_TO_NET_CONFLICT ) );
aConfig->SetPath( oldPath );
}
};
int GetDefaultBusThickness() int GetDefaultBusThickness()
{ {
return s_defaultBusThickness; return s_defaultBusThickness;
@ -180,7 +349,7 @@ void SCH_EDIT_FRAME::InstallPreferences( PAGED_DIALOG* aParent,
book->AddSubPage( new PANEL_EESCHEMA_DISPLAY_OPTIONS( this, book ), _( "Display Options" ) ); book->AddSubPage( new PANEL_EESCHEMA_DISPLAY_OPTIONS( this, book ), _( "Display Options" ) );
book->AddSubPage( new PANEL_EESCHEMA_SETTINGS( this, book ), _( "Editing Options" ) ); book->AddSubPage( new PANEL_EESCHEMA_SETTINGS( this, book ), _( "Editing Options" ) );
book->AddSubPage( new PANEL_EESCHEMA_COLOR_SETTINGS( this, book ), _( "Colors" ) ); book->AddSubPage( new PANEL_EESCHEMA_COLOR_SETTINGS( this, book ), _( "Colors" ) );
book->AddSubPage( new PANEL_EESCHEMA_TEMPLATE_FIELDNAMES( this, book ), book->AddSubPage( new PANEL_EESCHEMA_TEMPLATE_FIELDNAMES( this, book, true ),
_( "Field Name Templates" ) ); _( "Field Name Templates" ) );
aHotkeysPanel->AddHotKeys( GetToolManager() ); aHotkeysPanel->AddHotKeys( GetToolManager() );
@ -190,6 +359,9 @@ void SCH_EDIT_FRAME::InstallPreferences( PAGED_DIALOG* aParent,
std::vector<PARAM_CFG*>& SCH_EDIT_FRAME::GetProjectFileParameters() std::vector<PARAM_CFG*>& SCH_EDIT_FRAME::GetProjectFileParameters()
{ {
// JEY TODO: everything in here which has a GUI needs to move from Preferences to
// Schematic Setup Dialog...
if( !m_projectFileParams.empty() ) if( !m_projectFileParams.empty() )
return m_projectFileParams; return m_projectFileParams;
@ -214,26 +386,18 @@ std::vector<PARAM_CFG*>& SCH_EDIT_FRAME::GetProjectFileParameters()
params.push_back( new PARAM_CFG_INT( wxT( "LabSize" ), params.push_back( new PARAM_CFG_INT( wxT( "LabSize" ),
&s_defaultTextSize, DEFAULT_SIZE_TEXT, 5, 1000 ) ); &s_defaultTextSize, DEFAULT_SIZE_TEXT, 5, 1000 ) );
params.push_back( new PARAM_CFG_BOOL( wxT( "ERC_WriteFile" ), params.push_back( new PARAM_CFG_FIELDNAMES( &m_templateFieldNames ) );
&m_ercSettings.write_erc_file, false ) ); params.push_back( new PARAM_CFG_SEVERITIES( &m_ercSettings ) );
params.push_back( new PARAM_CFG_BOOL( wxT( "ERC_TestSimilarLabels" ), return params;
&m_ercSettings.check_similar_labels, true ) ); }
params.push_back( new PARAM_CFG_BOOL( wxT( "ERC_CheckUniqueGlobalLabels" ),
&m_ercSettings.check_unique_global_labels, true ) );
params.push_back( new PARAM_CFG_BOOL( wxT( "ERC_CheckBusDriverConflicts" ), std::vector<PARAM_CFG*> ERC_SETTINGS::GetProjectFileParameters()
&m_ercSettings.check_bus_driver_conflicts, true ) ); {
std::vector<PARAM_CFG*> params;
params.push_back( new PARAM_CFG_BOOL( wxT( "ERC_CheckBusEntryConflicts" ), params.push_back( new PARAM_CFG_SEVERITIES( this ) );
&m_ercSettings.check_bus_entry_conflicts, true ) );
params.push_back( new PARAM_CFG_BOOL( wxT( "ERC_CheckBusToBusConflicts" ),
&m_ercSettings.check_bus_to_bus_conflicts, true ) );
params.push_back( new PARAM_CFG_BOOL( wxT( "ERC_CheckBusToNetConflicts" ),
&m_ercSettings.check_bus_to_net_conflicts, true ) );
return params; return params;
} }
@ -268,6 +432,24 @@ bool SCH_EDIT_FRAME::LoadProjectFile()
} }
void SCH_EDIT_FRAME::DoShowSchematicSetupDialog( const wxString& aInitialPage,
const wxString& aInitialParentPage )
{
DIALOG_SCHEMATIC_SETUP dlg( this );
if( !aInitialPage.IsEmpty() )
dlg.SetInitialPage( aInitialPage, aInitialParentPage );
if( dlg.ShowQuasiModal() == wxID_OK )
{
SaveProjectSettings();
GetCanvas()->Refresh();
OnModify();
}
}
void SCH_EDIT_FRAME::SaveProjectSettings() void SCH_EDIT_FRAME::SaveProjectSettings()
{ {
PROJECT& prj = Prj(); PROJECT& prj = Prj();
@ -335,7 +517,7 @@ void SCH_EDIT_FRAME::LoadSettings( APP_SETTINGS_BASE* aCfg )
try try
{ {
m_templateFieldNames.Parse( &lexer ); m_templateFieldNames.Parse( &lexer, true );
} }
catch( const IO_ERROR& DBG( e ) ) catch( const IO_ERROR& DBG( e ) )
{ {
@ -399,7 +581,7 @@ void SCH_EDIT_FRAME::SaveSettings( APP_SETTINGS_BASE* aCfg )
// Save template fieldnames // Save template fieldnames
STRING_FORMATTER sf; STRING_FORMATTER sf;
m_templateFieldNames.Format( &sf, 0 ); m_templateFieldNames.Format( &sf, 0, true );
wxString record = FROM_UTF8( sf.GetString().c_str() ); wxString record = FROM_UTF8( sf.GetString().c_str() );
record.Replace( wxT("\n"), wxT(""), true ); // strip all newlines record.Replace( wxT("\n"), wxT(""), true ); // strip all newlines

4
eeschema/erc.h
View File

@ -52,7 +52,8 @@ extern const wxString CommentERC_V[];
enum ERCE_T enum ERCE_T
{ {
ERCE_UNSPECIFIED = 0, ERCE_UNSPECIFIED = 0,
ERCE_DUPLICATE_SHEET_NAME, // duplicate sheet names within a given sheet ERCE_FIRST,
ERCE_DUPLICATE_SHEET_NAME = ERCE_FIRST, // duplicate sheet names within a given sheet
ERCE_PIN_NOT_CONNECTED, // pin not connected and not no connect symbol ERCE_PIN_NOT_CONNECTED, // pin not connected and not no connect symbol
ERCE_PIN_NOT_DRIVEN, // pin connected to some others pins but no pin to drive it ERCE_PIN_NOT_DRIVEN, // pin connected to some others pins but no pin to drive it
ERCE_PIN_TO_PIN_WARNING, // pin connected to an other pin: warning level ERCE_PIN_TO_PIN_WARNING, // pin connected to an other pin: warning level
@ -72,6 +73,7 @@ enum ERCE_T
ERCE_BUS_TO_BUS_CONFLICT, // a connection between bus objects doesn't share at least one net ERCE_BUS_TO_BUS_CONFLICT, // a connection between bus objects doesn't share at least one net
ERCE_BUS_TO_NET_CONFLICT, // a bus wire is graphically connected to a net port/pin (or vice versa) ERCE_BUS_TO_NET_CONFLICT, // a bus wire is graphically connected to a net port/pin (or vice versa)
ERCE_GLOBLABEL, // a global label is unique ERCE_GLOBLABEL, // a global label is unique
ERCE_LAST = ERCE_GLOBLABEL
}; };
/* Minimal connection table */ /* Minimal connection table */

53
eeschema/erc_settings.h
View File

@ -21,6 +21,13 @@
#ifndef _ERC_SETTINGS_H #ifndef _ERC_SETTINGS_H
#define _ERC_SETTINGS_H #define _ERC_SETTINGS_H
#include <erc.h>
#include <widgets/ui_common.h>
class PARAM_CFG;
/** /**
* Container for ERC settings * Container for ERC settings
* *
@ -32,24 +39,18 @@ class ERC_SETTINGS
public: public:
void LoadDefaults() void LoadDefaults()
{ {
write_erc_file = false; m_Severities[ ERCE_SIMILAR_GLBL_LABELS ] = RPT_SEVERITY_WARNING;
check_similar_labels = true; m_Severities[ ERCE_SIMILAR_LABELS ] = RPT_SEVERITY_WARNING;
check_unique_global_labels = true; m_Severities[ ERCE_GLOBLABEL ] = RPT_SEVERITY_WARNING;
check_bus_driver_conflicts = true; m_Severities[ ERCE_DRIVER_CONFLICT ] = RPT_SEVERITY_WARNING;
check_bus_entry_conflicts = true; m_Severities[ ERCE_BUS_ENTRY_CONFLICT ] = RPT_SEVERITY_WARNING;
check_bus_to_bus_conflicts = true; m_Severities[ ERCE_BUS_TO_BUS_CONFLICT ] = RPT_SEVERITY_ERROR;
check_bus_to_net_conflicts = true; m_Severities[ ERCE_BUS_TO_NET_CONFLICT ] = RPT_SEVERITY_ERROR;
} }
bool operator==( const ERC_SETTINGS& other ) const bool operator==( const ERC_SETTINGS& other ) const
{ {
return ( other.write_erc_file == write_erc_file && return ( other.m_Severities == m_Severities );
other.check_similar_labels == check_similar_labels &&
other.check_unique_global_labels == check_unique_global_labels &&
other.check_bus_driver_conflicts == check_bus_driver_conflicts &&
other.check_bus_entry_conflicts == check_bus_entry_conflicts &&
other.check_bus_to_bus_conflicts == check_bus_to_bus_conflicts &&
other.check_bus_to_net_conflicts == check_bus_to_net_conflicts );
} }
bool operator!=( const ERC_SETTINGS& other ) const bool operator!=( const ERC_SETTINGS& other ) const
@ -57,26 +58,14 @@ public:
return !( other == *this ); return !( other == *this );
} }
/// If true, write ERC results to a file bool IsTestEnabled( int aErrorCode ) const
bool write_erc_file; {
return m_Severities.at( aErrorCode ) != RPT_SEVERITY_IGNORE;
}
/// If true, check each sheet for labels that differ only by letter case std::vector<PARAM_CFG*> GetProjectFileParameters();
bool check_similar_labels;
/// If true, check to ensure that each global label apperas more than once std::map<int, int> m_Severities;
bool check_unique_global_labels;
/// If true, check that buses don't have conflicting drivers
bool check_bus_driver_conflicts;
/// If true, check that wires connecting to buses actually exist in the bus
bool check_bus_entry_conflicts;
/// If true, check that bus-to-bus connections share at least one member
bool check_bus_to_bus_conflicts;
/// If true, check that bus wires don't graphically connect to net objects (or vice versa)
bool check_bus_to_net_conflicts;
}; };
#endif #endif

2
eeschema/libedit/lib_edit_frame.cpp
View File

@ -245,7 +245,7 @@ void LIB_EDIT_FRAME::LoadSettings( APP_SETTINGS_BASE* aCfg )
try try
{ {
m_templateFieldNames.Parse( &lexer ); m_templateFieldNames.Parse( &lexer, true );
} }
catch( const IO_ERROR& DBG( e ) ) catch( const IO_ERROR& DBG( e ) )
{ {

3
eeschema/menubar.cpp
View File

@ -112,6 +112,9 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
submenuExport->Add( EE_ACTIONS::exportNetlist ); submenuExport->Add( EE_ACTIONS::exportNetlist );
fileMenu->AddMenu( submenuExport, EE_CONDITIONS::ShowAlways ); fileMenu->AddMenu( submenuExport, EE_CONDITIONS::ShowAlways );
fileMenu->AddSeparator();
fileMenu->AddItem( EE_ACTIONS::schematicSetup, EE_CONDITIONS::ShowAlways );
fileMenu->AddSeparator(); fileMenu->AddSeparator();
fileMenu->AddItem( ACTIONS::pageSettings, EE_CONDITIONS::ShowAlways ); fileMenu->AddItem( ACTIONS::pageSettings, EE_CONDITIONS::ShowAlways );
fileMenu->AddItem( ACTIONS::print, EE_CONDITIONS::ShowAlways ); fileMenu->AddItem( ACTIONS::print, EE_CONDITIONS::ShowAlways );

12
eeschema/sch_base_frame.h
View File

@ -252,18 +252,26 @@ public:
/** /**
* Return a template field names list for read only access. * Return a template field names list for read only access.
*/ */
const TEMPLATE_FIELDNAMES& GetTemplateFieldNames() const const TEMPLATE_FIELDNAMES& GetTemplateFieldNames()
{ {
return m_templateFieldNames.GetTemplateFieldNames(); return m_templateFieldNames.GetTemplateFieldNames();
} }
/**
* Return a specific template field names list (global or project) for read only access.
*/
const TEMPLATE_FIELDNAMES& GetTemplateFieldNames( bool aGlobal )
{
return m_templateFieldNames.GetTemplateFieldNames( aGlobal );
}
/** /**
* Search for \a aName in the the template field name list. * Search for \a aName in the the template field name list.
* *
* @param aName A wxString object containing the field name to search for. * @param aName A wxString object containing the field name to search for.
* @return the template fieldname if found; NULL otherwise. * @return the template fieldname if found; NULL otherwise.
*/ */
const TEMPLATE_FIELDNAME* GetTemplateFieldName( const wxString& aName ) const const TEMPLATE_FIELDNAME* GetTemplateFieldName( const wxString& aName )
{ {
return m_templateFieldNames.GetFieldName( aName ); return m_templateFieldNames.GetFieldName( aName );
} }

18
eeschema/sch_edit_frame.h
View File

@ -266,9 +266,10 @@ public:
*/ */
bool LoadProjectFile(); bool LoadProjectFile();
const ERC_SETTINGS& GetErcSettings() { return m_ercSettings; } void DoShowSchematicSetupDialog( const wxString& aInitialPage = wxEmptyString,
const wxString& aInitialParentPage = wxEmptyString );
void UpdateErcSettings( const ERC_SETTINGS& aSettings ) { m_ercSettings = aSettings; } ERC_SETTINGS& GetErcSettings() { return m_ercSettings; }
/** /**
* Insert or append a wanted symbol field name into the field names template. * Insert or append a wanted symbol field name into the field names template.
@ -278,20 +279,19 @@ public:
* *
* @param aFieldName is a full description of the wanted field, and it must not match * @param aFieldName is a full description of the wanted field, and it must not match
* any of the default field names. * any of the default field names.
* @return int - the index within the config container at which aFieldName was * @param aGlobal indicates whether to add to the global or project table
* added, or -1 if the name is illegal because it matches a default field name.
*/ */
int AddTemplateFieldName( const TEMPLATE_FIELDNAME& aFieldName ) void AddTemplateFieldName( const TEMPLATE_FIELDNAME& aFieldName, bool aGlobal )
{ {
return m_templateFieldNames.AddTemplateFieldName( aFieldName ); m_templateFieldNames.AddTemplateFieldName( aFieldName, aGlobal );
} }
/** /**
* Remove all template field names. * Remove all global or project fieldname templates.
*/ */
void DeleteAllTemplateFieldNames() void DeleteAllTemplateFieldNames( bool aGlobal )
{ {
m_templateFieldNames.DeleteAllTemplateFieldNames(); m_templateFieldNames.DeleteAllFieldNameTemplates( aGlobal );
} }
void LoadSettings( APP_SETTINGS_BASE* aCfg ) override; void LoadSettings( APP_SETTINGS_BASE* aCfg ) override;

100
eeschema/template_fieldnames.cpp
View File

@ -2,7 +2,7 @@
* This program source code file is part of KiCad, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2010 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com> * Copyright (C) 2010 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
* Copyright (C) 2015 KiCad Developers, see CHANGELOG.TXT for contributors. * Copyright (C) 2015-2020 KiCad Developers, see CHANGELOG.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
@ -122,20 +122,22 @@ void TEMPLATE_FIELDNAME::Parse( TEMPLATE_FIELDNAMES_LEXER* in )
} }
void TEMPLATES::Format( OUTPUTFORMATTER* out, int nestLevel ) const void TEMPLATES::Format( OUTPUTFORMATTER* out, int nestLevel, bool aGlobal ) const
{ {
// We'll keep this general, and include the \n, even though the only known // We'll keep this general, and include the \n, even though the only known
// use at this time will not want the newlines or the indentation. // use at this time will not want the newlines or the indentation.
out->Print( nestLevel, "(templatefields" ); out->Print( nestLevel, "(templatefields" );
for( unsigned i=0; i<m_Fields.size(); ++i ) const TEMPLATE_FIELDNAMES& source = aGlobal ? m_globals : m_project;
m_Fields[i].Format( out, nestLevel+1 );
for( const TEMPLATE_FIELDNAME& temp : source )
temp.Format( out, nestLevel+1 );
out->Print( 0, ")\n" ); out->Print( 0, ")\n" );
} }
void TEMPLATES::Parse( TEMPLATE_FIELDNAMES_LEXER* in ) void TEMPLATES::Parse( TEMPLATE_FIELDNAMES_LEXER* in, bool aGlobal )
{ {
T tok; T tok;
@ -162,7 +164,7 @@ void TEMPLATES::Parse( TEMPLATE_FIELDNAMES_LEXER* in )
field.Parse( in ); field.Parse( in );
// add the field // add the field
AddTemplateFieldName( field ); AddTemplateFieldName( field, aGlobal );
} }
break; break;
@ -174,27 +176,50 @@ void TEMPLATES::Parse( TEMPLATE_FIELDNAMES_LEXER* in )
} }
int TEMPLATES::AddTemplateFieldName( const TEMPLATE_FIELDNAME& aFieldName ) void TEMPLATES::resolveTemplates()
{
m_resolved = m_project;
// Note: order N^2 algorithm. Would need changing if fieldname template sets ever
// get large.
for( const TEMPLATE_FIELDNAME& global : m_globals )
{
for( const TEMPLATE_FIELDNAME& project : m_project )
{
if( global.m_Name == project.m_Name )
continue;
}
m_resolved.push_back( global );
}
m_resolvedDirty = false;
}
void TEMPLATES::AddTemplateFieldName( const TEMPLATE_FIELDNAME& aFieldName, bool aGlobal )
{ {
// Ensure that the template fieldname does not match a fixed fieldname. // Ensure that the template fieldname does not match a fixed fieldname.
for( int i=0; i<MANDATORY_FIELDS; ++i ) for( int i=0; i<MANDATORY_FIELDS; ++i )
{ {
if( TEMPLATE_FIELDNAME::GetDefaultFieldName( i ) == aFieldName.m_Name ) if( TEMPLATE_FIELDNAME::GetDefaultFieldName( i ) == aFieldName.m_Name )
{ return;
return -1;
}
} }
TEMPLATE_FIELDNAMES& target = aGlobal ? m_globals : m_project;
// ensure uniqueness, overwrite any template fieldname by the same name. // ensure uniqueness, overwrite any template fieldname by the same name.
for( unsigned i=0; i<m_Fields.size(); ++i ) for( TEMPLATE_FIELDNAME& temp : target )
{ {
if( m_Fields[i].m_Name == aFieldName.m_Name ) if( temp.m_Name == aFieldName.m_Name )
{ {
// DBG( printf( "inserting template fieldname:'%s' at %d\n", // DBG( printf( "inserting template fieldname:'%s' at %d\n",
// TO_UTF8( aFieldName.m_Name ), i ); ) // TO_UTF8( aFieldName.m_Name ), i ); )
m_Fields[i] = aFieldName; temp = aFieldName;
return i; // return the container index m_resolvedDirty = true;
return;
} }
} }
@ -202,15 +227,52 @@ int TEMPLATES::AddTemplateFieldName( const TEMPLATE_FIELDNAME& aFieldName )
// the name is legal and not previously added to the config container, append // the name is legal and not previously added to the config container, append
// it and return its index within the container. // it and return its index within the container.
m_Fields.push_back( aFieldName ); target.push_back( aFieldName );
m_resolvedDirty = true;
return m_Fields.size() - 1; // return the index of insertion.
} }
const TEMPLATE_FIELDNAME* TEMPLATES::GetFieldName( const wxString& aName ) const void TEMPLATES::DeleteAllFieldNameTemplates( bool aGlobal )
{ {
for( const TEMPLATE_FIELDNAME& field : m_Fields ) if( aGlobal )
{
m_globals.clear();
m_resolved = m_project;
}
else
{
m_project.clear();
m_resolved = m_globals;
}
m_resolvedDirty = false;
}
const TEMPLATE_FIELDNAMES& TEMPLATES::GetTemplateFieldNames()
{
if( m_resolvedDirty )
resolveTemplates();
return m_resolved;
}
const TEMPLATE_FIELDNAMES& TEMPLATES::GetTemplateFieldNames( bool aGlobal )
{
if( aGlobal )
return m_globals;
else
return m_project;
}
const TEMPLATE_FIELDNAME* TEMPLATES::GetFieldName( const wxString& aName )
{
if( m_resolvedDirty )
resolveTemplates();
for( const TEMPLATE_FIELDNAME& field : m_resolved )
{ {
if( field.m_Name == aName ) if( field.m_Name == aName )
return &field; return &field;

65
eeschema/template_fieldnames.h
View File

@ -2,7 +2,7 @@
* This program source code file is part of KiCad, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2010 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com> * Copyright (C) 2010 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
* Copyright (C) 2014 KiCad Developers, see CHANGELOG.TXT for contributors. * Copyright (C) 2014-2020 KiCad Developers, see CHANGELOG.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
@ -70,28 +70,28 @@ enum NumFieldType {
*/ */
struct TEMPLATE_FIELDNAME struct TEMPLATE_FIELDNAME
{ {
wxString m_Name; ///< The field name wxString m_Name; // The field name
bool m_Visible; ///< If first appearance of the field's editor has as visible. bool m_Visible; // Field defaults to being visible in schematic.
bool m_URL; ///< If field should have a browse button bool m_URL; // If field should have a browse button
TEMPLATE_FIELDNAME() : TEMPLATE_FIELDNAME() :
m_Visible( false ), m_Visible( false ),
m_URL( false ) m_URL( false )
{ {
} }
TEMPLATE_FIELDNAME( const wxString& aName ) : TEMPLATE_FIELDNAME( const wxString& aName ) :
m_Name( aName ), m_Name( aName ),
m_Visible( false ), m_Visible( false ),
m_URL( false ) m_URL( false )
{ {
} }
TEMPLATE_FIELDNAME( const TEMPLATE_FIELDNAME& ref ) TEMPLATE_FIELDNAME( const TEMPLATE_FIELDNAME& ref )
{ {
m_Name = ref.m_Name; m_Name = ref.m_Name;
m_Visible = ref.m_Visible; m_Visible = ref.m_Visible;
m_URL = ref.m_URL; m_URL = ref.m_URL;
} }
/** /**
@ -130,21 +130,25 @@ typedef std::vector< TEMPLATE_FIELDNAME > TEMPLATE_FIELDNAMES;
class TEMPLATES class TEMPLATES
{ {
private: private:
TEMPLATE_FIELDNAMES m_Fields; TEMPLATE_FIELDNAMES m_globals;
TEMPLATE_FIELDNAMES m_project;
// Combined list. Project templates override global ones.
TEMPLATE_FIELDNAMES m_resolved;
bool m_resolvedDirty;
public: public:
/** /**
* Function Format * Function Format
* serializes this object out as text into the given OUTPUTFORMATTER. * serializes this object out as text into the given OUTPUTFORMATTER.
*/ */
void Format( OUTPUTFORMATTER* out, int nestLevel ) const ; void Format( OUTPUTFORMATTER* out, int nestLevel, bool aGlobal ) const ;
/** /**
* Function Parse * Function Parse
* fills this object from information in the input stream handled by TEMPLATE_FIELDNAMES_LEXER * fills this object from information in the input stream handled by TEMPLATE_FIELDNAMES_LEXER
*/ */
void Parse( TEMPLATE_FIELDNAMES_LEXER* in ); void Parse( TEMPLATE_FIELDNAMES_LEXER* in, bool aGlobal );
/** /**
@ -155,28 +159,27 @@ public:
* *
* @param aFieldName is a full description of the wanted field, and it must not match * @param aFieldName is a full description of the wanted field, and it must not match
* any of the default fieldnames. * any of the default fieldnames.
* @return int - the index within the config container at which aFieldName was * @param aGlobal indicates whether to add to the global or project table.
* added, or -1 if the name is illegal because it matches a default fieldname.
*/ */
int AddTemplateFieldName( const TEMPLATE_FIELDNAME& aFieldName ); void AddTemplateFieldName( const TEMPLATE_FIELDNAME& aFieldName, bool aGlobal );
/** /**
* Function DeleteAllTemplateFieldNames * Function DeleteAllFieldNameTemplates
* deletes the entire contents. * deletes the entire contents.
*/ */
void DeleteAllTemplateFieldNames() void DeleteAllFieldNameTemplates( bool aGlobal );
{
m_Fields.clear();
}
/** /**
* Function GetTemplateFieldName * Function GetTemplateFieldName
* returns a template fieldnames list for read only access. * returns a template fieldnames list for read only access.
*/ */
const TEMPLATE_FIELDNAMES& GetTemplateFieldNames() const const TEMPLATE_FIELDNAMES& GetTemplateFieldNames();
{
return m_Fields; /**
} * Function GetTemplateFieldName
* returns a specific list (global or project) for read only access.
*/
const TEMPLATE_FIELDNAMES& GetTemplateFieldNames( bool aGlobal );
/** /**
* Function GetFieldName * Function GetFieldName
@ -185,7 +188,11 @@ public:
* @param aName A wxString object containing the field name to search for. * @param aName A wxString object containing the field name to search for.
* @return the template fieldname if found; NULL otherwise. * @return the template fieldname if found; NULL otherwise.
*/ */
const TEMPLATE_FIELDNAME* GetFieldName( const wxString& aName ) const; const TEMPLATE_FIELDNAME* GetFieldName( const wxString& aName );
protected:
void resolveTemplates();
}; };
#endif // _TEMPLATE_FIELDNAME_H_ #endif // _TEMPLATE_FIELDNAME_H_

6
eeschema/tools/ee_actions.cpp
View File

@ -546,6 +546,12 @@ TOOL_ACTION EE_ACTIONS::annotate( "eeschema.EditorControl.annotate",
_( "Annotate Schematic..." ), _( "Fill in schematic symbol reference designators" ), _( "Annotate Schematic..." ), _( "Fill in schematic symbol reference designators" ),
annotate_xpm ); annotate_xpm );
TOOL_ACTION EE_ACTIONS::schematicSetup( "eeschema.EditorControl.schematicSetup",
AS_GLOBAL, 0, "",
_( "Schematic Setup..." ),
_( "Edit schematic setup including annotation styles and electrical rules" ),
options_generic_xpm );
TOOL_ACTION EE_ACTIONS::showBusManager( "eeschema.EditorControl.showBusManager", TOOL_ACTION EE_ACTIONS::showBusManager( "eeschema.EditorControl.showBusManager",
AS_GLOBAL, 0, "", AS_GLOBAL, 0, "",
_( "Bus Definitions..." ), _( "Manage bus definitions" ), _( "Bus Definitions..." ), _( "Manage bus definitions" ),

1
eeschema/tools/ee_actions.h
View File

@ -151,6 +151,7 @@ public:
static TOOL_ACTION updateFieldsFromLibrary; static TOOL_ACTION updateFieldsFromLibrary;
static TOOL_ACTION assignFootprints; static TOOL_ACTION assignFootprints;
static TOOL_ACTION showBusManager; static TOOL_ACTION showBusManager;
static TOOL_ACTION schematicSetup;
// Suite operations // Suite operations
static TOOL_ACTION editWithLibEdit; static TOOL_ACTION editWithLibEdit;

8
eeschema/tools/sch_editor_control.cpp
View File

@ -87,6 +87,13 @@ int SCH_EDITOR_CONTROL::SaveAs( const TOOL_EVENT& aEvent )
} }
int SCH_EDITOR_CONTROL::ShowSchematicSetup( const TOOL_EVENT& aEvent )
{
m_frame->DoShowSchematicSetupDialog();
return 0;
}
int SCH_EDITOR_CONTROL::PageSetup( const TOOL_EVENT& aEvent ) int SCH_EDITOR_CONTROL::PageSetup( const TOOL_EVENT& aEvent )
{ {
PICKED_ITEMS_LIST undoCmd; PICKED_ITEMS_LIST undoCmd;
@ -1401,6 +1408,7 @@ void SCH_EDITOR_CONTROL::setTransitions()
Go( &SCH_EDITOR_CONTROL::Open, ACTIONS::open.MakeEvent() ); Go( &SCH_EDITOR_CONTROL::Open, ACTIONS::open.MakeEvent() );
Go( &SCH_EDITOR_CONTROL::Save, ACTIONS::save.MakeEvent() ); Go( &SCH_EDITOR_CONTROL::Save, ACTIONS::save.MakeEvent() );
Go( &SCH_EDITOR_CONTROL::SaveAs, ACTIONS::saveAs.MakeEvent() ); Go( &SCH_EDITOR_CONTROL::SaveAs, ACTIONS::saveAs.MakeEvent() );
Go( &SCH_EDITOR_CONTROL::ShowSchematicSetup, EE_ACTIONS::schematicSetup.MakeEvent() );
Go( &SCH_EDITOR_CONTROL::PageSetup, ACTIONS::pageSettings.MakeEvent() ); Go( &SCH_EDITOR_CONTROL::PageSetup, ACTIONS::pageSettings.MakeEvent() );
Go( &SCH_EDITOR_CONTROL::Print, ACTIONS::print.MakeEvent() ); Go( &SCH_EDITOR_CONTROL::Print, ACTIONS::print.MakeEvent() );
Go( &SCH_EDITOR_CONTROL::Plot, ACTIONS::plot.MakeEvent() ); Go( &SCH_EDITOR_CONTROL::Plot, ACTIONS::plot.MakeEvent() );

1
eeschema/tools/sch_editor_control.h
View File

@ -52,6 +52,7 @@ public:
int Open( const TOOL_EVENT& aEvent ); int Open( const TOOL_EVENT& aEvent );
int Save( const TOOL_EVENT& aEvent ); int Save( const TOOL_EVENT& aEvent );
int SaveAs( const TOOL_EVENT& aEvent ); int SaveAs( const TOOL_EVENT& aEvent );
int ShowSchematicSetup( const TOOL_EVENT& aEvent );
int PageSetup( const TOOL_EVENT& aEvent ); int PageSetup( const TOOL_EVENT& aEvent );
int Print( const TOOL_EVENT& aEvent ); int Print( const TOOL_EVENT& aEvent );
int Plot( const TOOL_EVENT& aEvent ); int Plot( const TOOL_EVENT& aEvent );

2
pcbnew/CMakeLists.txt
View File

@ -168,7 +168,7 @@ set( PCBNEW_DIALOGS
dialogs/panel_setup_text_and_graphics_base.cpp dialogs/panel_setup_text_and_graphics_base.cpp
dialogs/panel_setup_tracks_and_vias.cpp dialogs/panel_setup_tracks_and_vias.cpp
dialogs/panel_setup_tracks_and_vias_base.cpp dialogs/panel_setup_tracks_and_vias_base.cpp
dialogs/panel_setup_drc_severities.cpp ../common/dialogs/panel_setup_severities.cpp
footprint_wizard.cpp footprint_wizard.cpp
footprint_wizard_frame.cpp footprint_wizard_frame.cpp
footprint_wizard_frame_functions.cpp footprint_wizard_frame_functions.cpp

31
pcbnew/dialogs/dialog_board_setup.cpp
View File

@ -25,10 +25,15 @@
#include <panel_setup_mask_and_paste.h> #include <panel_setup_mask_and_paste.h>
#include <../board_stackup_manager/panel_board_stackup.h> #include <../board_stackup_manager/panel_board_stackup.h>
#include <kiface_i.h> #include <kiface_i.h>
#include "dialog_import_settings.h" #include <drc/drc.h>
#include <dialog_import_settings.h>
#include <panel_setup_severities.h>
#include "dialog_board_setup.h" #include "dialog_board_setup.h"
#include "panel_setup_drc_severities.h"
bool g_macHack;
DIALOG_BOARD_SETUP::DIALOG_BOARD_SETUP( PCB_EDIT_FRAME* aFrame ) : DIALOG_BOARD_SETUP::DIALOG_BOARD_SETUP( PCB_EDIT_FRAME* aFrame ) :
PAGED_DIALOG( aFrame, _( "Board Setup" ), _( "Import Settings from Another Project..." ) ), PAGED_DIALOG( aFrame, _( "Board Setup" ), _( "Import Settings from Another Project..." ) ),
@ -41,7 +46,8 @@ DIALOG_BOARD_SETUP::DIALOG_BOARD_SETUP( PCB_EDIT_FRAME* aFrame ) :
m_tracksAndVias = new PANEL_SETUP_TRACKS_AND_VIAS( this, aFrame, m_constraints ); m_tracksAndVias = new PANEL_SETUP_TRACKS_AND_VIAS( this, aFrame, m_constraints );
m_maskAndPaste = new PANEL_SETUP_MASK_AND_PASTE( this, aFrame ); m_maskAndPaste = new PANEL_SETUP_MASK_AND_PASTE( this, aFrame );
m_physicalStackup = new PANEL_SETUP_BOARD_STACKUP( this, aFrame, m_layers ); m_physicalStackup = new PANEL_SETUP_BOARD_STACKUP( this, aFrame, m_layers );
m_drcSeverities = new PANEL_SETUP_DRC_SEVERITIES( this, aFrame ); m_severities = new PANEL_SETUP_SEVERITIES( this, aFrame->GetDesignSettings().m_DRCSeverities,
DRCE_FIRST, DRCE_LAST );
/* /*
* WARNING: If you change page names you MUST update calls to DoShowBoardSetupDialog(). * WARNING: If you change page names you MUST update calls to DoShowBoardSetupDialog().
@ -61,11 +67,14 @@ DIALOG_BOARD_SETUP::DIALOG_BOARD_SETUP( PCB_EDIT_FRAME* aFrame ) :
m_treebook->AddPage( new wxPanel( this ), _( "Design Rules" ) ); m_treebook->AddPage( new wxPanel( this ), _( "Design Rules" ) );
m_treebook->AddSubPage( m_constraints, _( "Constraints" ) ); m_treebook->AddSubPage( m_constraints, _( "Constraints" ) );
m_treebook->AddSubPage( m_netclasses, _( "Net Classes" ) ); m_treebook->AddSubPage( m_netclasses, _( "Net Classes" ) );
m_treebook->AddSubPage( m_drcSeverities, _( "Violation Severity" ) ); m_treebook->AddSubPage( m_severities, _( "Violation Severity" ) );
// Connect Events // Connect Events
m_treebook->Connect( wxEVT_TREEBOOK_PAGE_CHANGED, m_treebook->Connect( wxEVT_TREEBOOK_PAGE_CHANGED,
wxBookCtrlEventHandler( DIALOG_BOARD_SETUP::OnPageChange ), NULL, this ); wxBookCtrlEventHandler( DIALOG_BOARD_SETUP::OnPageChange ), NULL, this );
FinishDialogSettings();
g_macHack = true;
} }
@ -80,6 +89,17 @@ void DIALOG_BOARD_SETUP::OnPageChange( wxBookCtrlEvent& event )
{ {
if( event.GetSelection() == m_physicalStackupPage ) if( event.GetSelection() == m_physicalStackupPage )
m_physicalStackup->OnLayersOptionsChanged( m_layers->GetUILayerMask() ); m_physicalStackup->OnLayersOptionsChanged( m_layers->GetUILayerMask() );
#ifdef __WXMAC__
// Work around an OSX bug where the wxGrid children don't get placed correctly
if( g_macHack && m_treebook->GetPage( event.GetSelection() ) == m_tracksAndVias )
{
m_tracksAndVias->SetSize( wxSize( m_tracksAndVias->GetSize().x - 1,
m_tracksAndVias->GetSize().y + 2 ) );
g_macHack = false;
}
#endif
} }
@ -126,6 +146,9 @@ void DIALOG_BOARD_SETUP::OnAuxiliaryAction( wxCommandEvent& event )
if( importDlg.m_LayersOpt->GetValue() ) if( importDlg.m_LayersOpt->GetValue() )
m_physicalStackup->ImportSettingsFrom( dummyBoard ); m_physicalStackup->ImportSettingsFrom( dummyBoard );
if( importDlg.m_SeveritiesOpt->GetValue() )
m_severities->ImportSettingsFrom( dummyBoard->GetDesignSettings().m_DRCSeverities );
delete dummyBoard; delete dummyBoard;
delete cfg; delete cfg;
} }

4
pcbnew/dialogs/dialog_board_setup.h
View File

@ -31,7 +31,7 @@ class PANEL_SETUP_NETCLASSES;
class PANEL_SETUP_TRACKS_AND_VIAS; class PANEL_SETUP_TRACKS_AND_VIAS;
class PANEL_SETUP_MASK_AND_PASTE; class PANEL_SETUP_MASK_AND_PASTE;
class PANEL_SETUP_BOARD_STACKUP; class PANEL_SETUP_BOARD_STACKUP;
class PANEL_SETUP_DRC_SEVERITIES; class PANEL_SETUP_SEVERITIES;
class DIALOG_BOARD_SETUP : public PAGED_DIALOG class DIALOG_BOARD_SETUP : public PAGED_DIALOG
@ -52,7 +52,7 @@ protected:
PANEL_SETUP_TRACKS_AND_VIAS* m_tracksAndVias; PANEL_SETUP_TRACKS_AND_VIAS* m_tracksAndVias;
PANEL_SETUP_MASK_AND_PASTE* m_maskAndPaste; PANEL_SETUP_MASK_AND_PASTE* m_maskAndPaste;
PANEL_SETUP_BOARD_STACKUP* m_physicalStackup; PANEL_SETUP_BOARD_STACKUP* m_physicalStackup;
PANEL_SETUP_DRC_SEVERITIES* m_drcSeverities; PANEL_SETUP_SEVERITIES* m_severities;
// event handlers // event handlers
void OnPageChange( wxBookCtrlEvent& event ); void OnPageChange( wxBookCtrlEvent& event );

1
pcbnew/dialogs/dialog_import_settings.cpp
View File

@ -88,4 +88,5 @@ void DIALOG_IMPORT_SETTINGS::OnSelectAll( wxCommandEvent& event )
m_NetclassesOpt->SetValue( true ); m_NetclassesOpt->SetValue( true );
m_TracksAndViasOpt->SetValue( true ); m_TracksAndViasOpt->SetValue( true );
m_MaskAndPasteOpt->SetValue( true ); m_MaskAndPasteOpt->SetValue( true );
m_SeveritiesOpt->SetValue( true );
} }

69
pcbnew/dialogs/dialog_import_settings_base.cpp
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Dec 30 2017) // C++ code generated with wxFormBuilder (version Oct 26 2018)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
@ -12,84 +12,87 @@
DIALOG_IMPORT_SETTINGS_BASE::DIALOG_IMPORT_SETTINGS_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_IMPORT_SETTINGS_BASE::DIALOG_IMPORT_SETTINGS_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( wxSize( -1,-1 ), wxDefaultSize ); this->SetSizeHints( wxSize( -1,-1 ), wxDefaultSize );
m_MainSizer = new wxBoxSizer( wxVERTICAL ); m_MainSizer = new wxBoxSizer( wxVERTICAL );
wxBoxSizer* bupperSizer; wxBoxSizer* bupperSizer;
bupperSizer = new wxBoxSizer( wxHORIZONTAL ); bupperSizer = new wxBoxSizer( wxHORIZONTAL );
wxStaticText* importFromLabel; wxStaticText* importFromLabel;
importFromLabel = new wxStaticText( this, wxID_ANY, _("Import from:"), wxDefaultPosition, wxDefaultSize, 0 ); importFromLabel = new wxStaticText( this, wxID_ANY, _("Import from:"), wxDefaultPosition, wxDefaultSize, 0 );
importFromLabel->Wrap( -1 ); importFromLabel->Wrap( -1 );
bupperSizer->Add( importFromLabel, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); bupperSizer->Add( importFromLabel, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
m_filePathCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_filePathCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
m_filePathCtrl->SetToolTip( _("Target directory for plot files. Can be absolute or relative to the board file location.") ); m_filePathCtrl->SetToolTip( _("Target directory for plot files. Can be absolute or relative to the board file location.") );
m_filePathCtrl->SetMinSize( wxSize( 300,-1 ) ); m_filePathCtrl->SetMinSize( wxSize( 300,-1 ) );
bupperSizer->Add( m_filePathCtrl, 1, wxEXPAND|wxTOP|wxBOTTOM, 5 ); bupperSizer->Add( m_filePathCtrl, 1, wxEXPAND|wxTOP|wxBOTTOM, 5 );
m_browseButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW ); m_browseButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
m_browseButton->SetMinSize( wxSize( 29,29 ) ); m_browseButton->SetMinSize( wxSize( 29,29 ) );
bupperSizer->Add( m_browseButton, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); bupperSizer->Add( m_browseButton, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
m_MainSizer->Add( bupperSizer, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); m_MainSizer->Add( bupperSizer, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
wxBoxSizer* bmiddleSizer; wxBoxSizer* bmiddleSizer;
bmiddleSizer = new wxBoxSizer( wxVERTICAL ); bmiddleSizer = new wxBoxSizer( wxVERTICAL );
wxStaticText* importLabel; wxStaticText* importLabel;
importLabel = new wxStaticText( this, wxID_ANY, _("Import:"), wxDefaultPosition, wxDefaultSize, 0 ); importLabel = new wxStaticText( this, wxID_ANY, _("Import:"), wxDefaultPosition, wxDefaultSize, 0 );
importLabel->Wrap( -1 ); importLabel->Wrap( -1 );
bmiddleSizer->Add( importLabel, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 ); bmiddleSizer->Add( importLabel, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 );
m_LayersOpt = new wxCheckBox( this, wxID_ANY, _("Layers setup"), wxDefaultPosition, wxDefaultSize, 0 ); m_LayersOpt = new wxCheckBox( this, wxID_ANY, _("Layers setup"), wxDefaultPosition, wxDefaultSize, 0 );
bmiddleSizer->Add( m_LayersOpt, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); bmiddleSizer->Add( m_LayersOpt, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
m_TextAndGraphicsOpt = new wxCheckBox( this, wxID_ANY, _("Text && Graphics default properties"), wxDefaultPosition, wxDefaultSize, 0 ); m_TextAndGraphicsOpt = new wxCheckBox( this, wxID_ANY, _("Text && Graphics default properties"), wxDefaultPosition, wxDefaultSize, 0 );
bmiddleSizer->Add( m_TextAndGraphicsOpt, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); bmiddleSizer->Add( m_TextAndGraphicsOpt, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
m_ConstraintsOpt = new wxCheckBox( this, wxID_ANY, _("Design Rules"), wxDefaultPosition, wxDefaultSize, 0 ); m_ConstraintsOpt = new wxCheckBox( this, wxID_ANY, _("Design Rules"), wxDefaultPosition, wxDefaultSize, 0 );
bmiddleSizer->Add( m_ConstraintsOpt, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); bmiddleSizer->Add( m_ConstraintsOpt, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
m_NetclassesOpt = new wxCheckBox( this, wxID_ANY, _("Net Classes"), wxDefaultPosition, wxDefaultSize, 0 ); m_NetclassesOpt = new wxCheckBox( this, wxID_ANY, _("Net Classes"), wxDefaultPosition, wxDefaultSize, 0 );
bmiddleSizer->Add( m_NetclassesOpt, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); bmiddleSizer->Add( m_NetclassesOpt, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
m_TracksAndViasOpt = new wxCheckBox( this, wxID_ANY, _("Predefined Track and Via dimensions"), wxDefaultPosition, wxDefaultSize, 0 ); m_TracksAndViasOpt = new wxCheckBox( this, wxID_ANY, _("Predefined Track and Via dimensions"), wxDefaultPosition, wxDefaultSize, 0 );
bmiddleSizer->Add( m_TracksAndViasOpt, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); bmiddleSizer->Add( m_TracksAndViasOpt, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
m_MaskAndPasteOpt = new wxCheckBox( this, wxID_ANY, _("Solder Mask/Paste defaults"), wxDefaultPosition, wxDefaultSize, 0 ); m_MaskAndPasteOpt = new wxCheckBox( this, wxID_ANY, _("Solder Mask/Paste defaults"), wxDefaultPosition, wxDefaultSize, 0 );
bmiddleSizer->Add( m_MaskAndPasteOpt, 0, wxRIGHT|wxLEFT, 5 ); bmiddleSizer->Add( m_MaskAndPasteOpt, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
m_SeveritiesOpt = new wxCheckBox( this, wxID_ANY, _("Violation severities"), wxDefaultPosition, wxDefaultSize, 0 );
bmiddleSizer->Add( m_SeveritiesOpt, 0, wxRIGHT|wxLEFT, 5 );
m_MainSizer->Add( bmiddleSizer, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 10 ); m_MainSizer->Add( bmiddleSizer, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 10 );
m_buttonsSizer = new wxBoxSizer( wxHORIZONTAL ); m_buttonsSizer = new wxBoxSizer( wxHORIZONTAL );
m_selectAllButton = new wxButton( this, wxID_ANY, _("Select All"), wxDefaultPosition, wxDefaultSize, 0 ); m_selectAllButton = new wxButton( this, wxID_ANY, _("Select All"), wxDefaultPosition, wxDefaultSize, 0 );
m_buttonsSizer->Add( m_selectAllButton, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 10 ); m_buttonsSizer->Add( m_selectAllButton, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 10 );
m_sdbSizer1 = new wxStdDialogButtonSizer(); m_sdbSizer1 = new wxStdDialogButtonSizer();
m_sdbSizer1OK = new wxButton( this, wxID_OK ); m_sdbSizer1OK = new wxButton( this, wxID_OK );
m_sdbSizer1->AddButton( m_sdbSizer1OK ); m_sdbSizer1->AddButton( m_sdbSizer1OK );
m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL );
m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); m_sdbSizer1->AddButton( m_sdbSizer1Cancel );
m_sdbSizer1->Realize(); m_sdbSizer1->Realize();
m_buttonsSizer->Add( m_sdbSizer1, 1, wxALL|wxEXPAND, 5 ); m_buttonsSizer->Add( m_sdbSizer1, 1, wxALL|wxEXPAND, 5 );
m_MainSizer->Add( m_buttonsSizer, 0, wxEXPAND, 5 ); m_MainSizer->Add( m_buttonsSizer, 0, wxEXPAND, 5 );
this->SetSizer( m_MainSizer ); this->SetSizer( m_MainSizer );
this->Layout(); this->Layout();
m_MainSizer->Fit( this ); m_MainSizer->Fit( this );
this->Centre( wxBOTH ); this->Centre( wxBOTH );
// Connect Events // Connect Events
m_browseButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_IMPORT_SETTINGS_BASE::OnBrowseClicked ), NULL, this ); m_browseButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_IMPORT_SETTINGS_BASE::OnBrowseClicked ), NULL, this );
m_selectAllButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_IMPORT_SETTINGS_BASE::OnSelectAll ), NULL, this ); m_selectAllButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_IMPORT_SETTINGS_BASE::OnSelectAll ), NULL, this );
@ -100,5 +103,5 @@ DIALOG_IMPORT_SETTINGS_BASE::~DIALOG_IMPORT_SETTINGS_BASE()
// Disconnect Events // Disconnect Events
m_browseButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_IMPORT_SETTINGS_BASE::OnBrowseClicked ), NULL, this ); m_browseButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_IMPORT_SETTINGS_BASE::OnBrowseClicked ), NULL, this );
m_selectAllButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_IMPORT_SETTINGS_BASE::OnSelectAll ), NULL, this ); m_selectAllButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_IMPORT_SETTINGS_BASE::OnSelectAll ), NULL, this );
} }

395
pcbnew/dialogs/dialog_import_settings_base.fbp
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<wxFormBuilder_Project> <wxFormBuilder_Project>
<FileVersion major="1" minor="13" /> <FileVersion major="1" minor="15" />
<object class="Project" expanded="1"> <object class="Project" expanded="1">
<property name="class_decoration"></property> <property name="class_decoration"></property>
<property name="code_generation">C++</property> <property name="code_generation">C++</property>
@ -14,6 +14,7 @@
<property name="file">dialog_import_settings_base</property> <property name="file">dialog_import_settings_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="indent_with_spaces"></property>
<property name="internationalize">1</property> <property name="internationalize">1</property>
<property name="name">dialog_import_settings_base</property> <property name="name">dialog_import_settings_base</property>
<property name="namespace"></property> <property name="namespace"></property>
@ -52,42 +53,6 @@
<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>
<event name="OnActivate"></event>
<event name="OnActivateApp"></event>
<event name="OnAuiFindManager"></event>
<event name="OnAuiPaneButton"></event>
<event name="OnAuiPaneClose"></event>
<event name="OnAuiPaneMaximize"></event>
<event name="OnAuiPaneRestore"></event>
<event name="OnAuiRender"></event>
<event name="OnChar"></event>
<event name="OnClose"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnHibernate"></event>
<event name="OnIconize"></event>
<event name="OnIdle"></event>
<event name="OnInitDialog"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
<object class="wxBoxSizer" expanded="1"> <object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="name">m_MainSizer</property> <property name="name">m_MainSizer</property>
@ -135,6 +100,7 @@
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="label">Import from:</property> <property name="label">Import from:</property>
<property name="markup">0</property>
<property name="max_size"></property> <property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
@ -160,29 +126,6 @@
<property name="window_name"></property> <property name="window_name"></property>
<property name="window_style"></property> <property name="window_style"></property>
<property name="wrap">-1</property> <property name="wrap">-1</property>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object> </object>
</object> </object>
<object class="sizeritem" expanded="0"> <object class="sizeritem" expanded="0">
@ -247,33 +190,6 @@
<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>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnText"></event>
<event name="OnTextEnter"></event>
<event name="OnTextMaxLen"></event>
<event name="OnTextURL"></event>
<event name="OnUpdateUI"></event>
</object> </object>
</object> </object>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="1">
@ -298,6 +214,7 @@
<property name="close_button">1</property> <property name="close_button">1</property>
<property name="context_help"></property> <property name="context_help"></property>
<property name="context_menu">1</property> <property name="context_menu">1</property>
<property name="current"></property>
<property name="default">0</property> <property name="default">0</property>
<property name="default_pane">0</property> <property name="default_pane">0</property>
<property name="disabled"></property> <property name="disabled"></property>
@ -311,9 +228,10 @@
<property name="font"></property> <property name="font"></property>
<property name="gripper">0</property> <property name="gripper">0</property>
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="hover"></property>
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="label">Browse</property> <property name="label">Browse</property>
<property name="margins"></property>
<property name="markup">0</property>
<property name="max_size"></property> <property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
@ -328,11 +246,12 @@
<property name="permission">protected</property> <property name="permission">protected</property>
<property name="pin_button">1</property> <property name="pin_button">1</property>
<property name="pos"></property> <property name="pos"></property>
<property name="position"></property>
<property name="pressed"></property>
<property name="resize">Resizable</property> <property name="resize">Resizable</property>
<property name="selected"></property>
<property name="show">1</property> <property name="show">1</property>
<property name="size"></property> <property name="size"></property>
<property name="style">wxBU_AUTODRAW</property> <property name="style"></property>
<property name="subclass">; forward_declare</property> <property name="subclass">; forward_declare</property>
<property name="toolbar_pane">0</property> <property name="toolbar_pane">0</property>
<property name="tooltip"></property> <property name="tooltip"></property>
@ -344,29 +263,6 @@
<property name="window_name"></property> <property name="window_name"></property>
<property name="window_style"></property> <property name="window_style"></property>
<event name="OnButtonClick">OnBrowseClicked</event> <event name="OnButtonClick">OnBrowseClicked</event>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object> </object>
</object> </object>
</object> </object>
@ -413,6 +309,7 @@
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="label">Import:</property> <property name="label">Import:</property>
<property name="markup">0</property>
<property name="max_size"></property> <property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
@ -438,29 +335,6 @@
<property name="window_name"></property> <property name="window_name"></property>
<property name="window_style"></property> <property name="window_style"></property>
<property name="wrap">-1</property> <property name="wrap">-1</property>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object> </object>
</object> </object>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="1">
@ -525,30 +399,6 @@
<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>
<event name="OnChar"></event>
<event name="OnCheckBox"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object> </object>
</object> </object>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="1">
@ -613,30 +463,6 @@
<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>
<event name="OnChar"></event>
<event name="OnCheckBox"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object> </object>
</object> </object>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="1">
@ -701,30 +527,6 @@
<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>
<event name="OnChar"></event>
<event name="OnCheckBox"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object> </object>
</object> </object>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="1">
@ -789,30 +591,6 @@
<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>
<event name="OnChar"></event>
<event name="OnCheckBox"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object> </object>
</object> </object>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="1">
@ -877,35 +655,11 @@
<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>
<event name="OnChar"></event>
<event name="OnCheckBox"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object> </object>
</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">wxRIGHT|wxLEFT</property> <property name="flag">wxBOTTOM|wxRIGHT|wxLEFT</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxCheckBox" expanded="1"> <object class="wxCheckBox" expanded="1">
<property name="BottomDockable">1</property> <property name="BottomDockable">1</property>
@ -965,30 +719,70 @@
<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>
<event name="OnChar"></event> </object>
<event name="OnCheckBox"></event> </object>
<event name="OnEnterWindow"></event> <object class="sizeritem" expanded="1">
<event name="OnEraseBackground"></event> <property name="border">5</property>
<event name="OnKeyDown"></event> <property name="flag">wxRIGHT|wxLEFT</property>
<event name="OnKeyUp"></event> <property name="proportion">0</property>
<event name="OnKillFocus"></event> <object class="wxCheckBox" expanded="1">
<event name="OnLeaveWindow"></event> <property name="BottomDockable">1</property>
<event name="OnLeftDClick"></event> <property name="LeftDockable">1</property>
<event name="OnLeftDown"></event> <property name="RightDockable">1</property>
<event name="OnLeftUp"></event> <property name="TopDockable">1</property>
<event name="OnMiddleDClick"></event> <property name="aui_layer"></property>
<event name="OnMiddleDown"></event> <property name="aui_name"></property>
<event name="OnMiddleUp"></event> <property name="aui_position"></property>
<event name="OnMotion"></event> <property name="aui_row"></property>
<event name="OnMouseEvents"></event> <property name="best_size"></property>
<event name="OnMouseWheel"></event> <property name="bg"></property>
<event name="OnPaint"></event> <property name="caption"></property>
<event name="OnRightDClick"></event> <property name="caption_visible">1</property>
<event name="OnRightDown"></event> <property name="center_pane">0</property>
<event name="OnRightUp"></event> <property name="checked">0</property>
<event name="OnSetFocus"></event> <property name="close_button">1</property>
<event name="OnSize"></event> <property name="context_help"></property>
<event name="OnUpdateUI"></event> <property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Violation severities</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_SeveritiesOpt</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">public</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass">; ; forward_declare</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
</object> </object>
</object> </object>
</object> </object>
@ -1017,25 +811,31 @@
<property name="aui_row"></property> <property name="aui_row"></property>
<property name="best_size"></property> <property name="best_size"></property>
<property name="bg"></property> <property name="bg"></property>
<property name="bitmap"></property>
<property name="caption"></property> <property name="caption"></property>
<property name="caption_visible">1</property> <property name="caption_visible">1</property>
<property name="center_pane">0</property> <property name="center_pane">0</property>
<property name="close_button">1</property> <property name="close_button">1</property>
<property name="context_help"></property> <property name="context_help"></property>
<property name="context_menu">1</property> <property name="context_menu">1</property>
<property name="current"></property>
<property name="default">0</property> <property name="default">0</property>
<property name="default_pane">0</property> <property name="default_pane">0</property>
<property name="disabled"></property>
<property name="dock">Dock</property> <property name="dock">Dock</property>
<property name="dock_fixed">0</property> <property name="dock_fixed">0</property>
<property name="docking">Left</property> <property name="docking">Left</property>
<property name="enabled">1</property> <property name="enabled">1</property>
<property name="fg"></property> <property name="fg"></property>
<property name="floatable">1</property> <property name="floatable">1</property>
<property name="focus"></property>
<property name="font"></property> <property name="font"></property>
<property name="gripper">0</property> <property name="gripper">0</property>
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="label">Select All</property> <property name="label">Select All</property>
<property name="margins"></property>
<property name="markup">0</property>
<property name="max_size"></property> <property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
@ -1050,6 +850,8 @@
<property name="permission">protected</property> <property name="permission">protected</property>
<property name="pin_button">1</property> <property name="pin_button">1</property>
<property name="pos"></property> <property name="pos"></property>
<property name="position"></property>
<property name="pressed"></property>
<property name="resize">Resizable</property> <property name="resize">Resizable</property>
<property name="show">1</property> <property name="show">1</property>
<property name="size"></property> <property name="size"></property>
@ -1065,29 +867,6 @@
<property name="window_name"></property> <property name="window_name"></property>
<property name="window_style"></property> <property name="window_style"></property>
<event name="OnButtonClick">OnSelectAll</event> <event name="OnButtonClick">OnSelectAll</event>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object> </object>
</object> </object>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="1">
@ -1106,14 +885,6 @@
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="name">m_sdbSizer1</property> <property name="name">m_sdbSizer1</property>
<property name="permission">protected</property> <property name="permission">protected</property>
<event name="OnApplyButtonClick"></event>
<event name="OnCancelButtonClick"></event>
<event name="OnContextHelpButtonClick"></event>
<event name="OnHelpButtonClick"></event>
<event name="OnNoButtonClick"></event>
<event name="OnOKButtonClick"></event>
<event name="OnSaveButtonClick"></event>
<event name="OnYesButtonClick"></event>
</object> </object>
</object> </object>
</object> </object>

23
pcbnew/dialogs/dialog_import_settings_base.h
View File

@ -1,12 +1,11 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Dec 30 2017) // C++ code generated with wxFormBuilder (version Oct 26 2018)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO *NOT* EDIT THIS FILE! // PLEASE DO *NOT* EDIT THIS FILE!
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
#ifndef __DIALOG_IMPORT_SETTINGS_BASE_H__ #pragma once
#define __DIALOG_IMPORT_SETTINGS_BASE_H__
#include <wx/artprov.h> #include <wx/artprov.h>
#include <wx/xrc/xmlres.h> #include <wx/xrc/xmlres.h>
@ -19,10 +18,10 @@
#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/bmpbuttn.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/bmpbuttn.h>
#include <wx/button.h> #include <wx/button.h>
#include <wx/sizer.h> #include <wx/sizer.h>
#include <wx/checkbox.h> #include <wx/checkbox.h>
@ -36,7 +35,7 @@
class DIALOG_IMPORT_SETTINGS_BASE : public DIALOG_SHIM class DIALOG_IMPORT_SETTINGS_BASE : public DIALOG_SHIM
{ {
private: private:
protected: protected:
wxBoxSizer* m_MainSizer; wxBoxSizer* m_MainSizer;
wxTextCtrl* m_filePathCtrl; wxTextCtrl* m_filePathCtrl;
@ -46,12 +45,12 @@ class DIALOG_IMPORT_SETTINGS_BASE : public DIALOG_SHIM
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 OnBrowseClicked( wxCommandEvent& event ) { event.Skip(); } virtual void OnBrowseClicked( wxCommandEvent& event ) { event.Skip(); }
virtual void OnSelectAll( wxCommandEvent& event ) { event.Skip(); } virtual void OnSelectAll( wxCommandEvent& event ) { event.Skip(); }
public: public:
wxCheckBox* m_LayersOpt; wxCheckBox* m_LayersOpt;
wxCheckBox* m_TextAndGraphicsOpt; wxCheckBox* m_TextAndGraphicsOpt;
@ -59,10 +58,10 @@ class DIALOG_IMPORT_SETTINGS_BASE : public DIALOG_SHIM
wxCheckBox* m_NetclassesOpt; wxCheckBox* m_NetclassesOpt;
wxCheckBox* m_TracksAndViasOpt; wxCheckBox* m_TracksAndViasOpt;
wxCheckBox* m_MaskAndPasteOpt; wxCheckBox* m_MaskAndPasteOpt;
wxCheckBox* m_SeveritiesOpt;
DIALOG_IMPORT_SETTINGS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Import Settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
DIALOG_IMPORT_SETTINGS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Import Settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
~DIALOG_IMPORT_SETTINGS_BASE(); ~DIALOG_IMPORT_SETTINGS_BASE();
}; };
#endif //__DIALOG_IMPORT_SETTINGS_BASE_H__