Skip to content

K
kicad-source-mirror
Commit 396538e1 authored by jean-pierre charras's avatar jean-pierre charras
Browse files
Options

Eeschema: minor fixes: 

* make 2 bitmaps more visible.
* fix incorrect screen redraw when rotating a component.
* netlist : the pcbnew advanced format can be now stored (persistant option) in project config.
parent 2e29b4f1
Expand all Show whitespace changes
Inline Side-by-side
Showing with 667 additions and 410 deletions
bitmaps_png/cpp_26/export.cpp
View file @ 396538e1
This diff is collapsed.
bitmaps_png/cpp_26/hierarchy_nav.cpp
View file @ 396538e1
......@@ -8,53 +8,37 @@
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x06, 0x00, 0x00, 0x00, 0xa9, 0x4a, 0x4c,
0xce, 0x00, 0x00, 0x02, 0xd2, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xe5, 0x96, 0xdd, 0x72, 0xd2,
0x40, 0x14, 0x80, 0x3b, 0xe3, 0x8d, 0x4f, 0xe3, 0x43, 0x78, 0xa1, 0x3e, 0x86, 0x97, 0x3e, 0x80,
0x17, 0x5e, 0x32, 0x63, 0x91, 0xb6, 0xbc, 0x84, 0x57, 0xda, 0x06, 0x68, 0xbd, 0x72, 0x74, 0x1c,
0x9d, 0x29, 0x55, 0x28, 0x5a, 0xa0, 0x69, 0xa1, 0x26, 0x10, 0xda, 0xd2, 0x56, 0x7e, 0x16, 0x08,
0x6c, 0x48, 0x08, 0xff, 0xc7, 0x3d, 0x27, 0x24, 0x4a, 0xc1, 0xd6, 0x5a, 0xa7, 0x17, 0x9a, 0x99,
0x6f, 0x92, 0xdd, 0x3d, 0x7b, 0xbe, 0xdd, 0x65, 0xb3, 0x61, 0x01, 0x00, 0x16, 0x6e, 0x82, 0x85,
0x1b, 0x15, 0x49, 0x92, 0x74, 0x2b, 0xb0, 0xe2, 0x7f, 0x18, 0x58, 0x5e, 0x7c, 0xf4, 0x4b, 0x44,
0x3b, 0xc6, 0x5d, 0x4b, 0x14, 0x58, 0x09, 0xdc, 0x8b, 0x6e, 0x6d, 0x9a, 0xe5, 0x0b, 0xae, 0xf8,
0x76, 0xac, 0x13, 0x08, 0x3e, 0xbd, 0x7b, 0x5d, 0xd1, 0x83, 0x42, 0x41, 0x63, 0x70, 0xc1, 0x55,
0xab, 0xb1, 0x96, 0x14, 0x5e, 0xb5, 0x43, 0x91, 0x35, 0x13, 0x09, 0x47, 0x24, 0x87, 0x0d, 0xc9,
0x8c, 0x6c, 0x84, 0x5c, 0x2c, 0x64, 0x7d, 0x23, 0x6c, 0xad, 0xbf, 0x0a, 0xd3, 0xf3, 0xd2, 0xca,
0xb3, 0xc7, 0x57, 0x12, 0xfd, 0xc9, 0x35, 0x1e, 0x8f, 0x07, 0x81, 0xe0, 0xe2, 0xf3, 0xff, 0x50,
0x64, 0xdb, 0x36, 0x34, 0x9b, 0x4d, 0x68, 0xb5, 0x5a, 0x1e, 0xba, 0xae, 0x4f, 0x95, 0xe7, 0xd5,
0x61, 0xf9, 0x4a, 0xa2, 0x6c, 0x36, 0x0b, 0x99, 0x4c, 0x06, 0x72, 0x39, 0x15, 0x54, 0x55, 0x01,
0x45, 0xf9, 0x0a, 0xb1, 0x58, 0x8c, 0xea, 0x14, 0x45, 0x11, 0x75, 0x2a, 0xd5, 0xc5, 0xe3, 0x71,
0xd0, 0xb4, 0x3c, 0x88, 0x1c, 0x70, 0x78, 0x58, 0xa0, 0x98, 0x4b, 0x45, 0x46, 0xdb, 0xf0, 0x44,
0x9a, 0xa6, 0xe1, 0x6e, 0x03, 0xd3, 0x6c, 0x83, 0x61, 0x70, 0x31, 0x5a, 0x1d, 0x76, 0x77, 0xd3,
0xc0, 0x58, 0x15, 0x38, 0x6f, 0x41, 0x5b, 0xc4, 0xe2, 0x5d, 0x96, 0x65, 0xe8, 0xf5, 0xba, 0x30,
0x18, 0xf4, 0x61, 0x38, 0x1c, 0x8a, 0x98, 0xdd, 0xcb, 0x45, 0x91, 0xf5, 0xd0, 0x3f, 0x2c, 0x2a,
0x95, 0x4a, 0x90, 0x4a, 0xa5, 0x20, 0x9d, 0x4e, 0x7b, 0x6c, 0x46, 0xb7, 0xe0, 0xe3, 0x76, 0x12,
0x3e, 0x25, 0xd2, 0x0e, 0xdb, 0x29, 0x88, 0x46, 0xa3, 0xd4, 0x86, 0x02, 0x04, 0xcb, 0xbf, 0x21,
0x92, 0x30, 0x80, 0x18, 0x8d, 0x46, 0xe7, 0x18, 0x42, 0x4a, 0x3e, 0x00, 0xf9, 0xb8, 0x0b, 0xfb,
0x67, 0x63, 0x42, 0x2e, 0xf6, 0x21, 0x2d, 0x67, 0xa8, 0x7d, 0x3c, 0x1e, 0x51, 0x3f, 0x67, 0x46,
0xe3, 0xf9, 0x22, 0xad, 0x90, 0x67, 0x18, 0xbc, 0x2a, 0xbd, 0x80, 0xb0, 0x90, 0x89, 0xe3, 0xc5,
0x43, 0x9c, 0x83, 0x62, 0x59, 0x06, 0x44, 0x4a, 0xce, 0x42, 0xf6, 0xd4, 0x06, 0xa5, 0x3c, 0x22,
0x0e, 0xce, 0x7a, 0x42, 0xb4, 0x2f, 0x96, 0x6c, 0x40, 0xcb, 0x86, 0xe0, 0xec, 0x26, 0x03, 0x9b,
0x15, 0xe5, 0xb5, 0x1c, 0xc3, 0x20, 0x4c, 0xec, 0x24, 0xed, 0x43, 0xbf, 0xef, 0xd2, 0xf3, 0x48,
0xa6, 0xf7, 0x40, 0x56, 0x4f, 0x61, 0x3f, 0x5f, 0x21, 0xf6, 0xd4, 0x6f, 0x90, 0xf8, 0xfc, 0x85,
0x96, 0xb9, 0x5c, 0x46, 0xca, 0x90, 0x48, 0x24, 0x48, 0x2c, 0xf2, 0xcc, 0x8a, 0x72, 0x79, 0x95,
0x61, 0x72, 0x71, 0x60, 0x52, 0xc2, 0x5e, 0xaf, 0x47, 0x3f, 0x30, 0xd2, 0xed, 0x22, 0x36, 0xc1,
0x18, 0x83, 0x62, 0xf1, 0xd8, 0xe3, 0xe8, 0xe8, 0x88, 0x12, 0x9f, 0x9c, 0x14, 0x05, 0x27, 0x04,
0xbe, 0x57, 0x93, 0x81, 0xce, 0x11, 0xe5, 0x54, 0x86, 0x82, 0x50, 0x78, 0x6d, 0x92, 0xdc, 0x49,
0x6c, 0xdb, 0x9d, 0x29, 0x3a, 0x1d, 0xcb, 0x03, 0xcb, 0xb8, 0xf3, 0x70, 0xd7, 0xe1, 0x29, 0xe2,
0xf4, 0xe9, 0xd2, 0x06, 0x9a, 0x0c, 0x74, 0x56, 0xa4, 0xe6, 0x14, 0x86, 0x82, 0x37, 0x6f, 0x5f,
0x83, 0xf8, 0x1c, 0x38, 0x84, 0x5c, 0x5e, 0xce, 0xf0, 0xfe, 0xc3, 0x3b, 0xb0, 0x2c, 0xd3, 0xdb,
0xde, 0xae, 0x18, 0x41, 0xd1, 0x64, 0x15, 0x66, 0x45, 0x8a, 0xaa, 0x30, 0x77, 0x06, 0xee, 0x88,
0x31, 0x91, 0x65, 0xb5, 0xe9, 0x3d, 0x32, 0x4d, 0x83, 0x46, 0xff, 0x33, 0x58, 0x87, 0xef, 0x17,
0x2e, 0x5d, 0x32, 0x99, 0xf4, 0x88, 0xc7, 0x63, 0xae, 0x74, 0x9e, 0xe8, 0x2b, 0x73, 0x25, 0x8e,
0xc0, 0x24, 0x81, 0x93, 0x94, 0x53, 0x42, 0xc3, 0x68, 0x9d, 0x83, 0x53, 0x9b, 0x2b, 0xc5, 0x78,
0xec, 0xe7, 0xce, 0x4e, 0xdc, 0xe7, 0x88, 0x94, 0x03, 0xe6, 0xcc, 0x64, 0x5a, 0xe2, 0x0a, 0x38,
0x6f, 0x12, 0x78, 0x3a, 0x38, 0x38, 0xe5, 0x1f, 0xc2, 0x59, 0xd9, 0x8c, 0x68, 0x69, 0xc9, 0x7f,
0x7f, 0x67, 0x27, 0xd1, 0xd6, 0xf5, 0x06, 0x6f, 0xe8, 0x75, 0xde, 0x68, 0xd4, 0x88, 0x7a, 0x9d,
0xf1, 0x5a, 0xad, 0xca, 0x19, 0xab, 0xf0, 0x6a, 0x15, 0x29, 0xf3, 0x4a, 0xa5, 0xe4, 0x81, 0x65,
0x6c, 0xa3, 0x18, 0x81, 0x38, 0xae, 0x44, 0x1f, 0xec, 0x5b, 0xe7, 0x98, 0x4b, 0x1c, 0x55, 0xd6,
0x94, 0xc8, 0xe7, 0xf3, 0xdd, 0x16, 0xdf, 0xf6, 0x27, 0x81, 0x65, 0xbf, 0xef, 0x6f, 0x13, 0x0c,
0xfa, 0xef, 0xdc, 0xe8, 0xff, 0xba, 0xef, 0x49, 0x7f, 0xe3, 0x35, 0xe9, 0xea, 0x10, 0xae, 0x00,
0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
0xce, 0x00, 0x00, 0x01, 0xd3, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xd5, 0xd6, 0xcf, 0x2b, 0xc3,
0x71, 0x1c, 0xc7, 0x71, 0x27, 0x87, 0xd5, 0x8a, 0x91, 0x52, 0xe3, 0xb0, 0x70, 0x76, 0xf0, 0xa3,
0x4c, 0x7c, 0x37, 0x63, 0x58, 0x2b, 0xe3, 0xc2, 0xd5, 0x41, 0x2d, 0xea, 0xcb, 0x7c, 0xcb, 0x0e,
0xbe, 0x93, 0xc6, 0xac, 0xa9, 0x15, 0x89, 0x62, 0x73, 0xd9, 0xc6, 0x9a, 0x1f, 0x7d, 0x37, 0x3b,
0x88, 0x51, 0x84, 0xc6, 0xfc, 0x3e, 0xb8, 0x50, 0xfb, 0x03, 0x94, 0xf2, 0xe3, 0xfe, 0xb2, 0x2f,
0x25, 0xb4, 0x3e, 0xfb, 0xf6, 0xfd, 0xa2, 0x1c, 0x1e, 0xdf, 0xfa, 0x7e, 0x0f, 0x9f, 0x67, 0x7d,
0xbe, 0x9f, 0x6f, 0xef, 0x6f, 0x56, 0x8e, 0x31, 0x1b, 0x7f, 0x21, 0x8b, 0xbf, 0x1c, 0x9d, 0x1d,
0xe2, 0xfa, 0xe6, 0xea, 0x57, 0xf0, 0x6b, 0x7f, 0x84, 0xf8, 0x07, 0xc9, 0x64, 0xf2, 0x57, 0xf0,
0x6b, 0xbf, 0x85, 0x06, 0xad, 0x32, 0x8c, 0x8d, 0x29, 0x31, 0x3e, 0x5e, 0x9c, 0x41, 0x11, 0x22,
0x11, 0x9b, 0xf8, 0xd0, 0xf0, 0xb0, 0x0c, 0xee, 0xe9, 0x06, 0x78, 0x03, 0x03, 0x44, 0x2c, 0x2b,
0xc7, 0xda, 0x1a, 0x23, 0x2d, 0x14, 0xe0, 0x5c, 0x38, 0xb9, 0x7d, 0x21, 0xb2, 0x8d, 0xe4, 0x48,
0x0f, 0x2d, 0x71, 0x4e, 0x9c, 0xdd, 0x3d, 0x12, 0xfd, 0x48, 0xc8, 0x3d, 0x55, 0x8b, 0x45, 0x5f,
0x0f, 0x91, 0xe4, 0xad, 0xa3, 0x87, 0x64, 0x70, 0x4c, 0xa8, 0xe0, 0x74, 0x96, 0xbc, 0x61, 0xd9,
0x42, 0x58, 0xad, 0xf9, 0x1f, 0xf7, 0x9f, 0x45, 0xa3, 0xa3, 0xe2, 0x43, 0xdf, 0x8f, 0x37, 0xc3,
0x30, 0xd0, 0xe9, 0x74, 0x3f, 0x7f, 0xbc, 0x85, 0x86, 0x82, 0x2b, 0x17, 0x98, 0x9d, 0x4f, 0x08,
0xb2, 0x1c, 0xba, 0x14, 0x1f, 0xd2, 0x34, 0x47, 0x20, 0x2f, 0xf0, 0x0b, 0x52, 0xa3, 0xe1, 0xa4,
0x85, 0x6a, 0x9a, 0x36, 0x11, 0xde, 0xbf, 0x27, 0xa2, 0x0c, 0x5b, 0xa9, 0x50, 0x38, 0x73, 0xc8,
0x6c, 0x36, 0xa3, 0xaa, 0xba, 0x12, 0xed, 0x1d, 0xa6, 0x2f, 0x2a, 0xd4, 0x01, 0x68, 0x8d, 0x5b,
0x48, 0xdc, 0x3e, 0x13, 0x35, 0x77, 0xc4, 0x84, 0x85, 0x68, 0x9a, 0x46, 0x5d, 0x7d, 0x1d, 0x7c,
0x7e, 0xdf, 0x17, 0xea, 0x86, 0x55, 0x68, 0x0c, 0x9b, 0x88, 0xdf, 0x3c, 0x10, 0xe9, 0x4d, 0xdb,
0xd2, 0xb7, 0x4e, 0xe8, 0x3b, 0x52, 0x6b, 0xc3, 0xe2, 0x43, 0xf3, 0xde, 0x53, 0xd8, 0x27, 0x0e,
0x05, 0x99, 0x5b, 0x48, 0xfc, 0x83, 0xef, 0xe8, 0xbb, 0x23, 0x87, 0x17, 0x51, 0x3d, 0x9d, 0x11,
0xd7, 0xd8, 0x0b, 0x46, 0x55, 0x2e, 0x3e, 0x14, 0xeb, 0xb6, 0x63, 0x29, 0xaf, 0x15, 0xab, 0xf5,
0xfd, 0x44, 0xc1, 0x92, 0x4e, 0x78, 0x15, 0xda, 0xf4, 0x21, 0x8a, 0xa2, 0x60, 0xb3, 0xb1, 0x44,
0xa1, 0xb6, 0x01, 0x04, 0x4b, 0x3b, 0x71, 0x9c, 0x1a, 0x21, 0x24, 0x1b, 0x7d, 0x33, 0xe9, 0x43,
0x1c, 0xc7, 0xc1, 0x35, 0xe9, 0x4a, 0x4d, 0x5d, 0x3b, 0xd1, 0x8a, 0xc9, 0x82, 0x50, 0x59, 0x57,
0x6a, 0x84, 0x3c, 0x11, 0x45, 0x7b, 0xa7, 0xd3, 0x87, 0x84, 0xe2, 0xb7, 0x6e, 0x59, 0xd9, 0x86,
0x5d, 0x67, 0x88, 0x68, 0xbd, 0xd1, 0x02, 0x4f, 0xae, 0x46, 0x5a, 0xc8, 0x2f, 0xd7, 0x09, 0xe2,
0x51, 0x50, 0xe2, 0x7f, 0xb7, 0xae, 0xce, 0x4f, 0x71, 0x71, 0x12, 0xcf, 0xe8, 0x60, 0x6f, 0x07,
0x85, 0x2d, 0xb2, 0xf7, 0xd0, 0x5f, 0x78, 0x05, 0xf9, 0x52, 0x9b, 0x76, 0x43, 0xd6, 0x57, 0xf2,
0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
};
const BITMAP_OPAQUE hierarchy_nav_xpm[1] = {{ png, sizeof( png ), "hierarchy_nav_xpm" }};
......
bitmaps_png/sources/export.svg
View file @ 396538e1
This diff is collapsed.
bitmaps_png/sources/hierarchy_nav.svg
View file @ 396538e1
This diff is collapsed.
eeschema/eeschema_config.cpp
View file @ 396538e1
......@@ -285,11 +285,8 @@ PARAM_CFG_ARRAY& SCH_EDIT_FRAME::GetProjectFileParameters()
m_projectFileParams.push_back( new PARAM_CFG_LIBNAME_LIST( wxT( "LibName" ),
&m_componentLibFiles,
GROUPLIB ) );
m_projectFileParams.push_back( new PARAM_CFG_INT( wxT( "NetFmt" ),
&m_netListFormat,
NET_TYPE_PCBNEW,
NET_TYPE_PCBNEW,
NET_TYPE_CUSTOM_MAX ) );
m_projectFileParams.push_back( new PARAM_CFG_WXSTRING( wxT( "NetFmtName" ),
&m_netListFormat) );
// NOTE: Left as global until supporting code can be fixed.
m_projectFileParams.push_back( new PARAM_CFG_INT( wxT( "HPGLSpd" ),
......
eeschema/getpart.cpp
View file @ 396538e1
......@@ -299,15 +299,19 @@ void SCH_EDIT_FRAME::OrientComponent( COMPONENT_ORIENTATION_T aOrientation )
m_canvas->CrossHairOff( &dc );
if( component->GetFlags() )
component->Draw( m_canvas, &dc, wxPoint( 0, 0 ), g_XorMode, g_GhostColor );
component->Draw( m_canvas, &dc, wxPoint( 0, 0 ), g_XorMode );
else
{
component->SetFlags( IS_MOVED ); // do not redraw the component
m_canvas->RefreshDrawingRect( component->GetBoundingBox() );
component->ClearFlags( IS_MOVED );
}
component->SetOrientation( aOrientation );
/* Redraw the component in the new position. */
if( component->GetFlags() )
component->Draw( m_canvas, &dc, wxPoint( 0, 0 ), g_XorMode, g_GhostColor );
component->Draw( m_canvas, &dc, wxPoint( 0, 0 ), g_XorMode );
else
component->Draw( m_canvas, &dc, wxPoint( 0, 0 ), GR_DEFAULT_DRAWMODE );
......
eeschema/netlist_control.cpp
View file @ 396538e1
......@@ -117,17 +117,34 @@ NETLIST_PAGE_DIALOG::NETLIST_PAGE_DIALOG( wxNotebook* parent,
const wxString& title,
int id_NetType,
int idCheckBox,
int idCreateFile,
bool selected ) :
int idCreateFile ) :
wxPanel( parent, -1, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL | wxBORDER_SUNKEN )
{
m_IdNetType = id_NetType;
m_pageNetFmtName = title;
m_CommandStringCtrl = NULL;
m_TitleStringCtrl = NULL;
m_IsCurrentFormat = NULL;
m_AddSubPrefix = NULL;
m_ButtonCancel = NULL;
m_NetOption = NULL;
wxString netfmtName = ((NETLIST_DIALOG*)parent->GetParent())->m_NetFmtName;
int fmtOption = 0;
bool selected = m_pageNetFmtName == netfmtName;
// PCBNEW Format is a special type:
if( id_NetType == NET_TYPE_PCBNEW )
{
if( netfmtName.IsEmpty() )
selected = true;
if( netfmtName == wxT("PcbnewAdvanced" ) )
{
selected = true;
fmtOption = 1;
}
}
parent->AddPage( this, title, selected );
......@@ -162,6 +179,7 @@ NETLIST_PAGE_DIALOG::NETLIST_PAGE_DIALOG( wxNotebook* parent,
wxDefaultPosition, wxDefaultSize,
2, netlist_opt, 1,
wxRA_SPECIFY_COLS );
m_NetOption->SetSelection( fmtOption );
m_LeftBoxSizer->Add( m_NetOption, 0, wxGROW | wxALL, 5 );
}
......@@ -199,6 +217,19 @@ NETLIST_PAGE_DIALOG::NETLIST_PAGE_DIALOG( wxNotebook* parent,
}
}
const wxString NETLIST_PAGE_DIALOG::GetPageNetFmtName()
{
// PCBNEW Format is a special type:
if( m_IdNetType == NET_TYPE_PCBNEW )
{
if( m_NetOption->GetSelection() )
return wxT( "PcbnewAdvanced" );
else
return wxT( "Pcbnew" );
}
return m_pageNetFmtName;
}
NETLIST_DIALOG::NETLIST_DIALOG( SCH_EDIT_FRAME* parent ) :
wxDialog( parent, -1, _( "Netlist" ), wxDefaultPosition,
......@@ -207,6 +238,7 @@ NETLIST_DIALOG::NETLIST_DIALOG( SCH_EDIT_FRAME* parent ) :
int ii;
m_Parent = parent;
m_NetFmtName = m_Parent->GetNetListFormatName();
for( ii = 0; ii < PANELCUSTOMBASE + CUSTOMPANEL_COUNTMAX; ii++ )
{
......@@ -230,8 +262,7 @@ NETLIST_DIALOG::NETLIST_DIALOG( SCH_EDIT_FRAME* parent ) :
wxT( "Pcbnew" ),
NET_TYPE_PCBNEW,
ID_CURRENT_FORMAT_IS_DEFAULT,
ID_CREATE_NETLIST,
m_Parent->GetNetListFormat() == NET_TYPE_PCBNEW );
ID_CREATE_NETLIST );
// Add Panel FORMAT ORCADPCB2
m_PanelNetType[PANELORCADPCB2] =
......@@ -239,8 +270,7 @@ NETLIST_DIALOG::NETLIST_DIALOG( SCH_EDIT_FRAME* parent ) :
wxT( "OrcadPCB2" ),
NET_TYPE_ORCADPCB2,
ID_CURRENT_FORMAT_IS_DEFAULT,
ID_CREATE_NETLIST,
m_Parent->GetNetListFormat() == NET_TYPE_ORCADPCB2 );
ID_CREATE_NETLIST );
// Add Panel FORMAT CADSTAR
m_PanelNetType[PANELCADSTAR] =
......@@ -248,8 +278,7 @@ NETLIST_DIALOG::NETLIST_DIALOG( SCH_EDIT_FRAME* parent ) :
wxT( "CadStar" ),
NET_TYPE_CADSTAR,
ID_CURRENT_FORMAT_IS_DEFAULT,
ID_CREATE_NETLIST,
m_Parent->GetNetListFormat() == NET_TYPE_CADSTAR );
ID_CREATE_NETLIST );
// Add Panel spice
InstallPageSpice();
......@@ -268,17 +297,17 @@ void NETLIST_DIALOG::InstallPageSpice()
{
wxButton* Button;
NETLIST_PAGE_DIALOG* page;
wxString title = wxT( "Spice" );
page = m_PanelNetType[PANELSPICE] =
new NETLIST_PAGE_DIALOG( m_NoteBook,
wxT( "Spice" ),
title,
NET_TYPE_SPICE,
0, 0,
m_Parent->GetNetListFormat() == NET_TYPE_SPICE );
0, 0 );
page->m_IsCurrentFormat = new wxCheckBox( page, ID_CURRENT_FORMAT_IS_DEFAULT,
_( "Default format" ) );
page->m_IsCurrentFormat->SetValue( m_Parent->GetNetListFormat() == NET_TYPE_SPICE );
page->m_IsCurrentFormat->SetValue( m_NetFmtName == title );
page->m_LeftBoxSizer->Add( page->m_IsCurrentFormat, 1, wxGROW | wxALL, 5 );
page->m_AddSubPrefix = new wxCheckBox( page, ID_ADD_SUBCIRCUIT_PREFIX,
......@@ -327,7 +356,6 @@ void NETLIST_DIALOG::InstallPageSpice()
*/
void NETLIST_DIALOG::InstallCustomPages()
{
bool selected;
int ii, CustomCount;
wxString title, previoustitle, msg;
NETLIST_PAGE_DIALOG* CurrPage;
......@@ -342,8 +370,6 @@ void NETLIST_DIALOG::InstallCustomPages()
if( title.IsEmpty() && previoustitle.IsEmpty() )
break; // No more panel to install
selected = m_Parent->GetNetListFormat() == ( NET_TYPE_CUSTOM1 + ii );
/* Install the panel "Add Plugin" after
* the last initialized panel */
......@@ -356,8 +382,7 @@ void NETLIST_DIALOG::InstallCustomPages()
_( "Add Plugin" ),
NET_TYPE_CUSTOM1 + ii,
ID_CURRENT_FORMAT_IS_DEFAULT,
ID_SETUP_PLUGIN,
selected );
ID_SETUP_PLUGIN );
else /* Install a plugin panel */
CurrPage =
m_PanelNetType[PANELCUSTOMBASE + ii] =
......@@ -365,8 +390,7 @@ void NETLIST_DIALOG::InstallCustomPages()
title,
NET_TYPE_CUSTOM1 + ii,
ID_CURRENT_FORMAT_IS_DEFAULT,
ID_CREATE_NETLIST,
selected );
ID_CREATE_NETLIST );
msg = CUSTOM_NETLIST_COMMAND;
msg << ii + 1;
......@@ -469,7 +493,7 @@ void NETLIST_DIALOG::SelectNetlistType( wxCommandEvent& event )
if( CurrPage == NULL )
return;
m_Parent->SetNetListFormat( CurrPage->m_IdNetType );
m_Parent->SetNetListFormatName( CurrPage->GetPageNetFmtName() );
CurrPage->m_IsCurrentFormat->SetValue( true );
}
......@@ -496,7 +520,7 @@ void NETLIST_DIALOG::NetlistUpdateOpt()
int ii;
m_Parent->SetSimulatorCommand( m_PanelNetType[PANELSPICE]->m_CommandStringCtrl->GetValue() );
m_Parent->SetNetListFormat( NET_TYPE_PCBNEW );
m_Parent->SetNetListFormatName( wxEmptyString );
for( ii = 0; ii < PANELCUSTOMBASE + CUSTOMPANEL_COUNTMAX; ii++ )
{
......@@ -504,7 +528,7 @@ void NETLIST_DIALOG::NetlistUpdateOpt()
break;
if( m_PanelNetType[ii]->m_IsCurrentFormat->GetValue() == true )
m_Parent->SetNetListFormat( m_PanelNetType[ii]->m_IdNetType );
m_Parent->SetNetListFormatName( m_PanelNetType[ii]->GetPageNetFmtName() );
}
g_OptNetListUseNames = true; // Used for pspice, gnucap
......@@ -712,6 +736,7 @@ void NETLIST_DIALOG::WriteCurrentNetlistSetup( void )
if( CurrPage->m_TitleStringCtrl )
{
wxString title = CurrPage->m_TitleStringCtrl->GetValue();
CurrPage->SetPageNetFmtName( title );
if( msg != title ) // Title has changed, Update config
{
......
eeschema/netlist_control.h
View file @ 396538e1
......@@ -54,9 +54,11 @@ public:
wxBoxSizer* m_RightOptionsBoxSizer;
wxBoxSizer* m_LowBoxSizer;
wxRadioBox* m_NetOption;
private:
wxString m_pageNetFmtName;
public:
/** Contructor to create a setup page for one netlist format.
/** Constructor to create a setup page for one netlist format.
* Used in Netlist format Dialog box creation
* @param parent = wxNotebook * parent
* @param title = title (name) of the notebook page
......@@ -67,9 +69,19 @@ public:
* Only one page can be created with selected = true.
*/
NETLIST_PAGE_DIALOG( wxNotebook* parent, const wxString& title,
int id_NetType, int idCheckBox, int idCreateFile,
bool selected );
int id_NetType, int idCheckBox, int idCreateFile );
~NETLIST_PAGE_DIALOG() { };
/**
* function GetPageNetFmtName
* @return the name of the netlist format for this page
* This is usually the page label.
* For the pcbnew netlist, this is the page label when the "old" format is selected
* and "PcbnewAdvanced" when the advanced format is selected
*/
const wxString GetPageNetFmtName();
void SetPageNetFmtName( const wxString &aName ) { m_pageNetFmtName =aName; }
};
......@@ -93,7 +105,7 @@ enum TypeNetForm {
// Options for Spice netlist generation (OR'ed bits
enum netlistOptions {
NET_USE_NETNAMES = 1, // for Spice netlist : use netnames instead of numbers
NET_USE_X_PREFIX = 2, // for Spice netlist : change "U" and "IC" refernce prefix to "X"
NET_USE_X_PREFIX = 2, // for Spice netlist : change "U" and "IC" reference prefix to "X"
NET_PCBNEW_USE_NEW_FORMAT = 1, // For Pcbnew use the new format (S expression and SWEET)
};
......@@ -102,6 +114,7 @@ class NETLIST_DIALOG : public wxDialog
{
public:
SCH_EDIT_FRAME* m_Parent;
wxString m_NetFmtName;
wxNotebook* m_NoteBook;
NETLIST_PAGE_DIALOG* m_PanelNetType[4 + CUSTOMPANEL_COUNTMAX];
......
eeschema/sch_component.cpp
View file @ 396538e1
......@@ -1453,7 +1453,13 @@ EDA_RECT SCH_COMPONENT::GetBodyBoundingBox() const
EDA_RECT SCH_COMPONENT::GetBoundingBox() const
{
return GetBodyBoundingBox();
EDA_RECT bbox = GetBodyBoundingBox();
for( size_t i = 0; i < m_Fields.size(); i++ )
{
bbox.Merge( m_Fields[i].GetBoundingBox() );
}
return bbox;
}
......@@ -1850,9 +1856,9 @@ bool SCH_COMPONENT::doHitTest( const EDA_RECT& aRect, bool aContained, int aAccu
rect.Inflate( aAccuracy );
if( aContained )
return rect.Contains( GetBoundingBox() );
return rect.Contains( GetBodyBoundingBox() );
return rect.Intersects( GetBoundingBox() );
return rect.Intersects( GetBodyBoundingBox() );
}
......
eeschema/schframe.cpp
View file @ 396538e1
......@@ -623,9 +623,6 @@ void SCH_EDIT_FRAME::OnCreateNetlist( wxCommandEvent& event )
{
int i;
if( m_netListFormat < NET_TYPE_PCBNEW )
m_netListFormat = NET_TYPE_PCBNEW;
do
{
NETLIST_DIALOG* dlg = new NETLIST_DIALOG( this );
......
include/wxEeschemaStruct.h
View file @ 396538e1
......@@ -148,8 +148,8 @@ private:
/// Flag to indicate show hidden pins.
bool m_showAllPins;
/// The format to use when generating a net list.
int m_netListFormat;
/// The name of the format to use when generating a net list.
wxString m_netListFormat;
/// Add X prefix to componen referencess when generating spice net lists.
bool m_addReferencPrefix;
......@@ -206,9 +206,9 @@ public:
void SetShowAllPins( bool aEnable ) { m_showAllPins = aEnable; }
int GetNetListFormat() const { return m_netListFormat; }
const wxString GetNetListFormatName() const { return m_netListFormat; }
void SetNetListFormat( int aFormat ) { m_netListFormat = aFormat; }
void SetNetListFormatName( const wxString& aFormat ) { m_netListFormat = aFormat; }
bool GetAddReferencePrefix() const { return m_addReferencPrefix; }
......
pcbnew/dialogs/dialog_pad_properties_base.fbp
View file @ 396538e1
......@@ -318,7 +318,7 @@
<property name="growablerows"></property>
<property name="hgap">0</property>
<property name="minimum_size"></property>
<property name="name">fgSizer5</property>
<property name="name">fgSizerPadType</property>
<property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
<property name="permission">none</property>
<property name="rows">0</property>
......@@ -863,11 +863,11 @@
<object class="wxFlexGridSizer" expanded="1">
<property name="cols">3</property>
<property name="flexible_direction">wxBOTH</property>
<property name="growablecols"></property>
<property name="growablecols">1</property>
<property name="growablerows"></property>
<property name="hgap">0</property>
<property name="minimum_size"></property>
<property name="name">fgSizer6</property>
<property name="name">fgSizerShapeType</property>
<property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
<property name="permission">none</property>
<property name="rows">0</property>
......@@ -5420,7 +5420,7 @@
<property name="proportion">0</property>
<object class="wxStaticBoxSizer" expanded="0">
<property name="id">wxID_ANY</property>
<property name="label">Technical</property>
<property name="label">Technical Layers</property>
<property name="minimum_size"></property>
<property name="name">sbSizerTechlayers</property>
<property name="orient">wxVERTICAL</property>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment