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

Cosmetic enhancements in dialogs and menus

This commit is contained in:
jean-pierre charras 2015-05-03 20:43:07 +02:00
parent 04ffd0a4ac
commit 425ddb92a7
20 changed files with 789 additions and 323 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bitmaps_png/CMakeLists.txt
View File

@ -535,6 +535,8 @@ set( BMAPS_MID
up up
use_3D_copper_thickness use_3D_copper_thickness
via via
via_buried
via_microvia
via_sketch via_sketch
warning warning
web_support web_support

87
bitmaps_png/cpp_26/via_buried.cpp Normal file
View File

@ -0,0 +1,87 @@
/* Do not modify this file, it was automatically generated by the
* PNG2cpp CMake script, using a *.png file as input.
*/
#include <bitmaps.h>
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, 0x04, 0x5f, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xbd, 0x56, 0x6d, 0x4c, 0x9b,
0x55, 0x14, 0xbe, 0xa5, 0xac, 0xb6, 0xb0, 0xda, 0x52, 0x3e, 0x0a, 0x5d, 0x81, 0x36, 0xa5, 0x40,
0x5d, 0x58, 0x09, 0xd8, 0xc9, 0x36, 0x42, 0x04, 0x01, 0xb7, 0xb4, 0x1d, 0x1f, 0x1d, 0x58, 0xa1,
0x50, 0x0a, 0x14, 0x68, 0x29, 0x13, 0xff, 0x40, 0xdc, 0xd4, 0x60, 0xe2, 0x0c, 0xfb, 0xc8, 0x66,
0x42, 0xa2, 0xce, 0x25, 0x9b, 0x66, 0xe8, 0xb2, 0xf9, 0xf1, 0x43, 0xff, 0xb8, 0x98, 0xf8, 0x4b,
0x13, 0xb3, 0x90, 0xfd, 0x72, 0x66, 0x59, 0xf4, 0x07, 0x46, 0xd4, 0x39, 0x32, 0x96, 0x30, 0x29,
0xeb, 0x94, 0xeb, 0x73, 0x9a, 0xf7, 0xad, 0x5d, 0x6d, 0x37, 0x9c, 0x64, 0x4d, 0x9e, 0xbc, 0xf7,
0x9e, 0x7b, 0xee, 0x7d, 0xce, 0x39, 0xf7, 0x9c, 0x73, 0xcb, 0x38, 0xe7, 0xec, 0x51, 0xe0, 0xbf,
0x29, 0x33, 0x26, 0x05, 0xd2, 0xe9, 0x2b, 0xcc, 0x25, 0xc0, 0x63, 0xc0, 0x26, 0x61, 0x4d, 0xf2,
0xbf, 0x88, 0xf0, 0x4b, 0x03, 0x32, 0x81, 0xea, 0xfc, 0xfc, 0xfc, 0x0e, 0x7c, 0x6d, 0x44, 0xe8,
0xf1, 0x78, 0x76, 0xaa, 0xd5, 0x6a, 0x2f, 0xc6, 0x4e, 0xa0, 0x06, 0xc8, 0x22, 0xdd, 0x87, 0x22,
0x22, 0x2b, 0x6b, 0x6b, 0x6b, 0xab, 0x7b, 0x7b, 0x7b, 0xbf, 0x0e, 0x06, 0x83, 0x2b, 0xfd, 0xfd,
0xfd, 0x3f, 0x42, 0xb6, 0xdb, 0x60, 0x30, 0xc8, 0x43, 0xa1, 0xd0, 0x0a, 0xb0, 0x36, 0x38, 0x38,
0xb8, 0x50, 0x5f, 0x5f, 0x7f, 0x12, 0x72, 0x32, 0x22, 0x27, 0x99, 0x67, 0x0f, 0x24, 0x0a, 0x04,
0x02, 0xf6, 0xd1, 0xd1, 0xd1, 0x65, 0x1c, 0xc8, 0x09, 0x18, 0x87, 0x15, 0x0a, 0x85, 0x7e, 0x64,
0x64, 0xc4, 0x80, 0x79, 0x4c, 0x4e, 0x68, 0x6a, 0x6a, 0x3a, 0x24, 0x84, 0x52, 0x92, 0xe8, 0xd9,
0x7d, 0x3d, 0x01, 0xe4, 0x03, 0x03, 0x03, 0x65, 0x64, 0x39, 0x08, 0xe7, 0xbd, 0x5e, 0x6f, 0x77,
0x57, 0x57, 0x57, 0xcc, 0xe2, 0xa9, 0xa9, 0xa9, 0x34, 0xac, 0x55, 0x80, 0xfc, 0x5d, 0xe0, 0x92,
0x4a, 0xa5, 0xca, 0x12, 0xee, 0x30, 0x0f, 0x30, 0x8b, 0x77, 0x79, 0x5f, 0xa2, 0x8e, 0x8e, 0x8e,
0x6a, 0x99, 0x4c, 0xd6, 0x4a, 0xf7, 0xe2, 0xf7, 0xfb, 0x1b, 0x9c, 0x4e, 0x67, 0x86, 0x68, 0xa9,
0x00, 0x49, 0x5c, 0x72, 0xa4, 0x81, 0x54, 0x46, 0x5f, 0x18, 0xd2, 0xd7, 0xd3, 0xd3, 0x73, 0x49,
0x2a, 0x95, 0x76, 0x63, 0x5e, 0x20, 0x1a, 0x25, 0x5a, 0xbe, 0x29, 0x1e, 0x76, 0xbb, 0x7d, 0x0b,
0xee, 0x63, 0x11, 0xde, 0xcc, 0x1b, 0x8d, 0xc6, 0x10, 0x64, 0x6a, 0x61, 0x4d, 0x01, 0x58, 0x80,
0x27, 0x91, 0x1b, 0x15, 0xe9, 0xe9, 0xd9, 0x8d, 0x18, 0xef, 0x05, 0xca, 0xe9, 0x9c, 0xf1, 0xf1,
0x71, 0x0a, 0x67, 0x84, 0xc2, 0x88, 0x33, 0x2e, 0x40, 0xf6, 0x2c, 0x19, 0x22, 0x12, 0x91, 0xbb,
0x0e, 0x61, 0x43, 0x14, 0x6d, 0x6d, 0x6d, 0xe7, 0x48, 0x19, 0x9e, 0x2c, 0x23, 0x1c, 0x93, 0x90,
0x91, 0x67, 0x2d, 0x99, 0x05, 0xc3, 0x67, 0x37, 0x17, 0x8c, 0x5e, 0xc1, 0xf8, 0xbc, 0x5c, 0xd5,
0xf0, 0xad, 0xda, 0x34, 0x73, 0x27, 0x53, 0xeb, 0xfd, 0x1e, 0x8e, 0xbc, 0x0a, 0x99, 0x8c, 0x0e,
0xc4, 0xbe, 0x83, 0xb4, 0x17, 0x86, 0x86, 0xe1, 0x55, 0x17, 0x85, 0x3f, 0x4a, 0xb4, 0xc2, 0xd8,
0xa7, 0xb7, 0x18, 0x5b, 0x58, 0x62, 0xec, 0x57, 0x11, 0x6f, 0x3a, 0x9d, 0xab, 0xa4, 0xfc, 0xe1,
0x8e, 0x1d, 0xe1, 0x45, 0xc6, 0xae, 0xdf, 0x84, 0xec, 0x9a, 0x54, 0x75, 0x3d, 0xaf, 0xe4, 0xed,
0xb5, 0xdc, 0x92, 0x77, 0xf8, 0x65, 0xa9, 0x32, 0xfc, 0xb2, 0xc6, 0x1e, 0xa1, 0x71, 0x5d, 0x56,
0xe3, 0x02, 0x22, 0x38, 0x43, 0xde, 0xd2, 0x81, 0x13, 0x13, 0x13, 0x4a, 0xec, 0xfd, 0x8b, 0xf6,
0x57, 0x55, 0x55, 0xf5, 0x09, 0x65, 0x21, 0x61, 0x11, 0xc6, 0xe6, 0xa2, 0x57, 0x15, 0x87, 0x03,
0x3e, 0x5f, 0x34, 0x8b, 0xbe, 0x2b, 0x2e, 0xbe, 0x47, 0xfe, 0xbb, 0xf4, 0x71, 0x3e, 0x27, 0x37,
0xc6, 0xe6, 0x37, 0xa4, 0x4a, 0xfe, 0x22, 0x63, 0x57, 0x25, 0xd2, 0x8c, 0x8f, 0x28, 0x9c, 0xe2,
0xfd, 0x22, 0x31, 0xde, 0x42, 0xd8, 0xa7, 0x91, 0xf2, 0x5b, 0x63, 0xa1, 0x4b, 0x46, 0x74, 0x5b,
0x2e, 0xe7, 0x57, 0x8a, 0x8a, 0x78, 0x58, 0x26, 0x8b, 0xc9, 0x56, 0x25, 0xe9, 0xfc, 0x63, 0xe5,
0x76, 0x1e, 0x91, 0x48, 0xef, 0xd1, 0xad, 0xd6, 0x8f, 0x2d, 0x2b, 0xf5, 0x93, 0x3f, 0xe3, 0xc0,
0x3d, 0x71, 0x25, 0xd1, 0xda, 0xdc, 0xdc, 0x7c, 0x44, 0xa7, 0xd3, 0x8d, 0x42, 0x6e, 0x8a, 0x26,
0x4f, 0x32, 0xa2, 0x64, 0x08, 0x6a, 0x7d, 0x3c, 0xcb, 0x7c, 0x8a, 0x5f, 0x50, 0x3e, 0x15, 0x93,
0x5d, 0x96, 0x1b, 0xa2, 0x32, 0x95, 0x61, 0x1a, 0x11, 0x66, 0xa5, 0x22, 0x11, 0xee, 0xe7, 0x1b,
0x8a, 0x88, 0xc3, 0xe1, 0x38, 0x0f, 0x79, 0x6e, 0x34, 0x74, 0x77, 0x19, 0xfb, 0xec, 0x0e, 0xee,
0x08, 0xf8, 0x45, 0xc4, 0x97, 0x56, 0xeb, 0xad, 0xa3, 0x2e, 0x57, 0xe4, 0x8b, 0x6d, 0xdb, 0xfe,
0x58, 0x66, 0xec, 0xc6, 0x2a, 0x64, 0x5f, 0x65, 0x94, 0x2d, 0xba, 0x75, 0xa1, 0xd5, 0x8b, 0xea,
0x4a, 0x3e, 0xa7, 0x2c, 0xe1, 0x9f, 0x64, 0xd5, 0xf0, 0xf9, 0x4c, 0x2d, 0x77, 0xe8, 0xf6, 0x5d,
0x53, 0xe4, 0xb4, 0x9f, 0x10, 0x6b, 0x06, 0x65, 0x21, 0x13, 0x3a, 0x06, 0xb7, 0xd9, 0x6c, 0xaf,
0x51, 0x01, 0xa7, 0xac, 0x23, 0xc4, 0x78, 0x86, 0x14, 0x7d, 0x3e, 0xdf, 0x55, 0x28, 0x52, 0xe6,
0x68, 0xc9, 0xaa, 0xa2, 0xba, 0x29, 0x7d, 0x59, 0xeb, 0x07, 0x3c, 0xbf, 0xea, 0x34, 0xd7, 0x94,
0x9e, 0xe2, 0x66, 0xc7, 0x2c, 0xd7, 0x98, 0x1d, 0xc7, 0xb1, 0x66, 0x17, 0xf7, 0xa2, 0x63, 0x38,
0x84, 0x4e, 0xb1, 0xa6, 0xd1, 0x68, 0xfe, 0x49, 0xef, 0x64, 0x44, 0x63, 0x63, 0x63, 0xdb, 0xa1,
0xf8, 0x27, 0x6d, 0x40, 0xac, 0xdf, 0x83, 0xf2, 0xd3, 0xb4, 0xa1, 0x70, 0xd7, 0x81, 0x28, 0xd1,
0x96, 0x9a, 0x33, 0x5c, 0x67, 0x3b, 0xc3, 0xcd, 0xf6, 0x59, 0x9e, 0x5d, 0xda, 0x72, 0x98, 0x88,
0x84, 0x7a, 0x4c, 0x47, 0x12, 0x3c, 0x03, 0x43, 0x7f, 0x1a, 0x1a, 0x1a, 0xfa, 0x1c, 0xf3, 0xcd,
0xb1, 0x82, 0x4d, 0xd5, 0x19, 0xa0, 0x7c, 0x88, 0x88, 0x86, 0x87, 0x87, 0x7f, 0x10, 0x5a, 0x4b,
0x5a, 0x8e, 0x65, 0x9f, 0x85, 0x88, 0xe2, 0x21, 0x10, 0xb5, 0x98, 0x4c, 0xa6, 0xc2, 0xca, 0xca,
0xca, 0x41, 0x8c, 0xeb, 0xda, 0xdb, 0xdb, 0xb3, 0xd1, 0x68, 0x35, 0xf1, 0xcd, 0x35, 0x25, 0x11,
0xb5, 0x14, 0x78, 0xf6, 0x4a, 0x67, 0x67, 0xa7, 0x8a, 0x48, 0xdc, 0x6e, 0xf7, 0x73, 0x6a, 0xad,
0xf9, 0x85, 0x44, 0x22, 0x4d, 0xe9, 0xde, 0xe3, 0x56, 0xab, 0xf5, 0x24, 0x3c, 0xf8, 0x0d, 0x61,
0x5b, 0xc2, 0xb3, 0x41, 0xb5, 0x93, 0x9d, 0xd8, 0xc1, 0xd7, 0xf5, 0x1e, 0xe1, 0x10, 0x2b, 0xbc,
0xbb, 0x1b, 0x08, 0x04, 0x57, 0x9e, 0x1f, 0x3c, 0xc8, 0xed, 0xde, 0x69, 0xbe, 0xb5, 0xed, 0x7d,
0x6e, 0x69, 0x9b, 0xe5, 0x03, 0xfe, 0xc0, 0xa2, 0xd8, 0xbd, 0x91, 0x6d, 0xb7, 0x5d, 0x2e, 0x57,
0x6b, 0xb2, 0x37, 0x69, 0x5d, 0x44, 0x08, 0x23, 0x5d, 0xf0, 0xcd, 0xd8, 0x53, 0x11, 0x1a, 0xe3,
0x96, 0xd6, 0xb3, 0x51, 0x8f, 0xfc, 0x43, 0xc1, 0x25, 0xa1, 0x5d, 0x5d, 0x44, 0x43, 0x2d, 0x4e,
0xf5, 0xca, 0xae, 0xfb, 0x19, 0x47, 0xc3, 0x54, 0x77, 0xfb, 0xf6, 0x7b, 0xf6, 0xf4, 0x1e, 0xe6,
0x2d, 0x7d, 0xaf, 0xc7, 0x42, 0x67, 0x6b, 0xf0, 0x9c, 0xab, 0xa8, 0xa8, 0x08, 0xa5, 0x7a, 0x59,
0x1f, 0xea, 0x3f, 0x43, 0xe1, 0xae, 0x97, 0x0a, 0xfe, 0x95, 0x0c, 0xe5, 0xed, 0x47, 0xe2, 0xd3,
0x7b, 0x43, 0x88, 0xf4, 0x3b, 0x27, 0xf3, 0x13, 0x89, 0x72, 0xca, 0x5d, 0x47, 0x1f, 0x15, 0xd1,
0x31, 0xfa, 0x73, 0xb2, 0xa1, 0x44, 0x28, 0xd8, 0xbc, 0x44, 0xa2, 0xdc, 0x27, 0xdc, 0x6f, 0x80,
0xa8, 0x79, 0x43, 0x89, 0x8c, 0x8d, 0xc7, 0xb2, 0x13, 0x89, 0x74, 0xb6, 0xfd, 0x41, 0x10, 0x95,
0x3c, 0x68, 0xef, 0xdf, 0xad, 0xa1, 0x40, 0x75, 0x04, 0xe6, 0x71, 0xd8, 0x00, 0x00, 0x00, 0x00,
0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
};
const BITMAP_OPAQUE via_buried_xpm[1] = {{ png, sizeof( png ), "via_buried_xpm" }};
//EOF

71
bitmaps_png/cpp_26/via_microvia.cpp Normal file
View File

@ -0,0 +1,71 @@
/* Do not modify this file, it was automatically generated by the
* PNG2cpp CMake script, using a *.png file as input.
*/
#include <bitmaps.h>
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, 0x03, 0x61, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0xf8, 0xff, 0xff, 0x3f,
0x03, 0x3d, 0x30, 0xc3, 0xc8, 0xb6, 0x08, 0x08, 0x18, 0x81, 0x98, 0x19, 0x88, 0x59, 0x81, 0x98,
0x0d, 0x88, 0xb9, 0x81, 0x98, 0x1d, 0xca, 0x67, 0x01, 0x62, 0x26, 0x8a, 0x2d, 0x82, 0x1a, 0x24,
0x00, 0xc4, 0xfa, 0x40, 0x6c, 0x07, 0xc4, 0xbe, 0x5a, 0x5c, 0x5c, 0xe9, 0x6c, 0xcc, 0xcc, 0x21,
0x40, 0xb6, 0x33, 0x10, 0x1b, 0x03, 0xb1, 0x14, 0xc8, 0x52, 0xb2, 0x2d, 0x82, 0xba, 0x5e, 0x8d,
0x87, 0x99, 0x39, 0xb4, 0x5c, 0x41, 0x61, 0xde, 0x54, 0x0d, 0x8d, 0x63, 0x0b, 0xb4, 0xb5, 0xdf,
0x2f, 0xd2, 0xd6, 0xfe, 0xbf, 0x50, 0x5b, 0xfb, 0xdb, 0x4c, 0x4d, 0xcd, 0x73, 0x4d, 0xca, 0xca,
0x2b, 0xe4, 0x39, 0x38, 0x92, 0x80, 0xea, 0x4c, 0xa0, 0x3e, 0x65, 0x24, 0xc9, 0x22, 0x20, 0xe0,
0x04, 0x62, 0x7b, 0x67, 0x21, 0xa1, 0xe2, 0xd9, 0x9a, 0x9a, 0xb7, 0x41, 0x86, 0xe3, 0xc2, 0x0b,
0xb4, 0xb4, 0x5e, 0xc5, 0x4a, 0x48, 0x34, 0x02, 0xd5, 0x7b, 0x01, 0xb1, 0x28, 0xb2, 0x65, 0xc4,
0x04, 0x97, 0x51, 0x9a, 0xb4, 0x74, 0x0f, 0xd0, 0xe5, 0xbf, 0x90, 0x0d, 0x9d, 0xa3, 0xab, 0xf3,
0xbf, 0xcd, 0x4c, 0xef, 0xfb, 0x34, 0x03, 0x1d, 0x0c, 0x0b, 0x9b, 0x94, 0x94, 0x16, 0x03, 0xf5,
0xb9, 0x82, 0x1c, 0x49, 0xd0, 0x22, 0x68, 0xc4, 0x4b, 0x19, 0xf0, 0xf0, 0x64, 0x02, 0x2d, 0xf9,
0x82, 0x64, 0xd0, 0x37, 0x20, 0x2e, 0x73, 0x0f, 0x30, 0x69, 0x30, 0x89, 0x30, 0xfb, 0x0f, 0xc2,
0x16, 0xe1, 0xa6, 0xef, 0x3a, 0xcd, 0x74, 0x5f, 0x23, 0xa9, 0xf9, 0x17, 0x2e, 0x26, 0x56, 0x0f,
0x8d, 0x4f, 0x16, 0xa8, 0x79, 0x60, 0x57, 0xb3, 0x63, 0xc1, 0x3c, 0xc0, 0xe4, 0xe5, 0x3b, 0x4d,
0x43, 0xe3, 0x12, 0x92, 0x01, 0x0f, 0xe6, 0xeb, 0xea, 0x6a, 0x80, 0x34, 0x9a, 0x85, 0x9b, 0xe9,
0xc3, 0x2c, 0x02, 0xe2, 0x3b, 0x45, 0x56, 0x86, 0x72, 0x40, 0xf9, 0x7d, 0x30, 0xb5, 0xf3, 0xb5,
0xb4, 0x5e, 0x48, 0x73, 0x70, 0xc4, 0x43, 0x13, 0x10, 0x23, 0xc3, 0x44, 0x06, 0x86, 0xf8, 0x36,
0x06, 0x86, 0x2a, 0x74, 0x0c, 0x74, 0x4e, 0x43, 0x39, 0x1f, 0xdf, 0x1e, 0x98, 0xc6, 0x69, 0x06,
0xba, 0x7f, 0xdd, 0x03, 0x4d, 0x57, 0x1a, 0xfb, 0x1a, 0x73, 0x81, 0x5d, 0xd8, 0xc0, 0xc0, 0x64,
0x1a, 0x61, 0x76, 0xdc, 0x24, 0xdc, 0xec, 0xbd, 0x69, 0x84, 0xa9, 0x15, 0x48, 0x6c, 0x99, 0x8e,
0x8e, 0x38, 0x50, 0x2d, 0xdc, 0x67, 0x65, 0xf2, 0xf2, 0xa0, 0x20, 0x54, 0x06, 0x25, 0x7b, 0x86,
0xaf, 0x0c, 0x0c, 0x0f, 0xc1, 0x21, 0x88, 0x05, 0x5f, 0x11, 0x11, 0x81, 0x87, 0x7b, 0x88, 0xab,
0xc1, 0x63, 0xb0, 0xeb, 0x23, 0xcd, 0x6e, 0x98, 0x44, 0x98, 0x18, 0xc2, 0x82, 0xd8, 0xc1, 0xc1,
0x81, 0x05, 0x39, 0xc8, 0xa7, 0x1a, 0xe9, 0x96, 0xc1, 0xf4, 0x4c, 0x50, 0x53, 0x3b, 0x0c, 0x4d,
0xf6, 0x2c, 0x78, 0x2d, 0x3a, 0x20, 0x2b, 0x0b, 0xb7, 0xc8, 0x36, 0xc0, 0xf8, 0x39, 0x2c, 0xa8,
0x4c, 0xc3, 0x4d, 0x83, 0xd0, 0xe3, 0xd4, 0x24, 0xc2, 0x74, 0x8a, 0x71, 0xa4, 0xd9, 0x55, 0xa0,
0x2f, 0xff, 0xce, 0xd6, 0x83, 0xe8, 0x99, 0xa7, 0xa9, 0xf9, 0x0a, 0x9a, 0xc7, 0x58, 0xf1, 0x5a,
0xb4, 0x55, 0x49, 0x09, 0x6e, 0x91, 0x59, 0xa8, 0xc9, 0x47, 0xa0, 0x25, 0x8f, 0x4c, 0x22, 0xcc,
0xd7, 0x9a, 0xc5, 0x99, 0x09, 0x63, 0x5a, 0x04, 0x92, 0x33, 0xfb, 0x65, 0x1e, 0x66, 0xbe, 0x12,
0x94, 0x22, 0xc1, 0x79, 0x4c, 0x4b, 0xeb, 0x2f, 0x37, 0x0b, 0x8b, 0x2b, 0x41, 0x8b, 0x8e, 0x4b,
0x49, 0xc1, 0x2d, 0x2a, 0x57, 0x57, 0x59, 0x82, 0x2b, 0x85, 0x9a, 0x44, 0x58, 0x38, 0xc0, 0x7d,
0x1b, 0x61, 0xf6, 0x63, 0x21, 0x54, 0xcf, 0x4c, 0x0d, 0x8d, 0x7b, 0xa0, 0xec, 0x01, 0x0e, 0xba,
0x2f, 0x0c, 0x0c, 0x67, 0x7e, 0x32, 0x30, 0xbc, 0x43, 0xc7, 0x3f, 0x18, 0x18, 0xde, 0x5f, 0x16,
0x14, 0xfc, 0x01, 0xb3, 0x68, 0x96, 0xa6, 0xe6, 0xd5, 0x55, 0xa1, 0xa1, 0xcc, 0x20, 0x83, 0x8d,
0x22, 0xcc, 0x6c, 0x8d, 0x23, 0x4d, 0x27, 0x18, 0x85, 0x9b, 0x5b, 0x80, 0xf9, 0x91, 0x66, 0x4e,
0xc0, 0xa0, 0x7b, 0x0a, 0xb2, 0xc8, 0xc7, 0xcf, 0xe4, 0x1e, 0x4c, 0x4f, 0xab, 0xb2, 0xf2, 0x6e,
0xa0, 0x25, 0x4a, 0xe0, 0xc4, 0x80, 0x27, 0x1f, 0xb1, 0xda, 0x09, 0x08, 0xc4, 0x83, 0xbc, 0x0f,
0x4f, 0xde, 0x5a, 0x5a, 0x95, 0xd6, 0x7e, 0xd6, 0xbc, 0xc6, 0x11, 0x66, 0xf7, 0x61, 0x09, 0x03,
0xa6, 0x5e, 0x37, 0xca, 0x46, 0xd0, 0x25, 0xc8, 0x64, 0xf3, 0x74, 0x03, 0x9d, 0x7f, 0x30, 0xf5,
0xc9, 0xd2, 0xd2, 0xbd, 0x40, 0x73, 0xf8, 0xc1, 0xc9, 0x9b, 0x40, 0x86, 0x15, 0xaf, 0x55, 0x52,
0x5a, 0x87, 0x94, 0x8f, 0x7e, 0xc5, 0xb8, 0x1b, 0x6d, 0x46, 0xca, 0x3f, 0x5f, 0x42, 0xa1, 0xbe,
0x5c, 0xa8, 0xa3, 0x13, 0x08, 0x94, 0x7f, 0x03, 0x53, 0xdb, 0xaf, 0xae, 0x7e, 0x16, 0xa8, 0x5f,
0x07, 0x9e, 0x61, 0x09, 0x15, 0x41, 0xc2, 0xac, 0xac, 0xa6, 0xd3, 0x81, 0x61, 0x0d, 0x33, 0x00,
0x14, 0xfe, 0xa5, 0xb6, 0xfa, 0x77, 0x7d, 0xfd, 0x8c, 0x2f, 0x58, 0x87, 0x9a, 0x3e, 0x68, 0x37,
0xd3, 0x6b, 0x06, 0x8a, 0x6f, 0x41, 0x2e, 0x82, 0x80, 0x99, 0xf5, 0x23, 0xb0, 0x44, 0x09, 0x05,
0xea, 0xe7, 0x20, 0xa9, 0x50, 0x75, 0x12, 0x12, 0x0a, 0x9d, 0xa6, 0xae, 0x7e, 0x17, 0x5f, 0x81,
0x0a, 0x2f, 0x03, 0x35, 0x35, 0x5f, 0x87, 0x8a, 0x89, 0x15, 0x01, 0xf5, 0x09, 0x13, 0x5d, 0xa8,
0x22, 0x57, 0x13, 0x22, 0xec, 0xec, 0xaa, 0xc0, 0x60, 0x5c, 0x0e, 0x8c, 0xb3, 0x3f, 0xb8, 0x2c,
0xe9, 0x50, 0x51, 0x39, 0xa8, 0xc5, 0xcb, 0x6b, 0x03, 0x54, 0xcf, 0x45, 0x72, 0x35, 0x81, 0x64,
0x19, 0x13, 0x10, 0xf3, 0xfa, 0x88, 0x89, 0xb9, 0x95, 0xc8, 0xcb, 0xb7, 0xb4, 0x2b, 0x2b, 0x6f,
0x99, 0xac, 0xae, 0x7e, 0xa3, 0x4b, 0x45, 0x65, 0x6f, 0x85, 0x82, 0x42, 0x5f, 0x84, 0xb8, 0x78,
0x38, 0x50, 0x5e, 0x0c, 0x16, 0x27, 0xd4, 0xae, 0xca, 0x39, 0xa1, 0x34, 0xac, 0x2a, 0x67, 0x1c,
0x6d, 0x05, 0x51, 0x1d, 0x03, 0x00, 0x45, 0x34, 0x8d, 0xac, 0x3d, 0x67, 0x8a, 0xf1, 0x00, 0x00,
0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
};
const BITMAP_OPAQUE via_microvia_xpm[1] = {{ png, sizeof( png ), "via_microvia_xpm" }};
//EOF

118
bitmaps_png/sources/via_buried.svg Normal file
View File

@ -0,0 +1,118 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
height="48"
width="48"
version="1.1"
id="svg2"
inkscape:version="0.48.4 r9939"
sodipodi:docname="via_buried.svg">
<metadata
id="metadata16">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs14">
<filter
inkscape:collect="always"
id="filter3808">
<feGaussianBlur
inkscape:collect="always"
stdDeviation="0.79203718"
id="feGaussianBlur3810" />
</filter>
</defs>
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1033"
id="namedview12"
showgrid="false"
inkscape:snap-grids="false"
inkscape:snap-to-guides="false"
inkscape:zoom="10.873341"
inkscape:cx="-19.296475"
inkscape:cy="18.719379"
inkscape:window-x="-4"
inkscape:window-y="-4"
inkscape:window-maximized="1"
inkscape:current-layer="svg2" />
<g
id="g3764"
transform="translate(59.04349,6.8976039)">
<rect
style="opacity:0.38671875;fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-opacity:1;filter:url(#filter3808)"
id="rect4-4"
x="-57.013744"
y="8.5595407"
width="29.813433"
height="8.7306871"
ry="2.3031542"
rx="0" />
<rect
style="opacity:0.38671875;fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-opacity:1;filter:url(#filter3808)"
id="rect6-8"
x="11.503523"
y="-123.2624"
width="30.819489"
height="8.5042381"
ry="2.243417"
rx="0"
transform="matrix(0,1,-1,0,-150.16292,-2.7838396)" />
<path
style="opacity:0.38671875;fill:none;stroke:#000000;stroke-width:4;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:8, 4;stroke-dashoffset:0;filter:url(#filter3808)"
inkscape:connector-curvature="0"
id="path8-1"
d="m -15.8481,13.195204 a 15.30449,14.862257 0 0 1 -30.60898,0 15.30449,14.862257 0 1 1 30.60898,0 z" />
<path
style="opacity:0.38671875;fill:#000000;stroke:#000000;stroke-width:3.44060159;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:3.44060159, 3.44060159;stroke-dashoffset:0;filter:url(#filter3808)"
inkscape:connector-curvature="0"
id="path10-0"
d="m -25.72992,13.088622 a 5.7326026,5.8850078 0 0 1 -11.4652,0 5.7326026,5.8850078 0 1 1 11.4652,0 z" />
</g>
<path
style="fill:none;stroke:#2750a5;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
d="m 25.989245,20.890398 0.07543,27.180597"
id="path3766"
inkscape:connector-curvature="0" />
<rect
rx="0"
ry="2.3031542"
height="8.7306871"
width="29.813433"
y="16.90716"
x="0.41774505"
id="rect4"
style="fill:#ff0000;fill-rule:evenodd" />
<path
d="m 41.583387,21.542825 a 15.304489,14.862256 0 1 1 -30.608977,0 15.304489,14.862256 0 1 1 30.608977,0 z"
id="path8"
inkscape:connector-curvature="0"
style="fill:none;stroke:#6c6c6c;stroke-width:4;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:8,4;stroke-dashoffset:0" />
<path
d="m 31.701569,21.436243 a 5.7326025,5.8850077 0 1 1 -11.465205,0 5.7326025,5.8850077 0 1 1 11.465205,0 z"
id="path10"
inkscape:connector-curvature="0"
style="fill:none;stroke:#11259b;stroke-width:3.44060159;stroke-miterlimit:4;stroke-dasharray:3.44060159,3.44060159;stroke-dashoffset:0;stroke-opacity:1" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 4.2 KiB

97
bitmaps_png/sources/via_microvia.svg Normal file
View File

@ -0,0 +1,97 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
height="26"
width="26"
version="1.1"
id="svg2"
inkscape:version="0.48.4 r9939"
sodipodi:docname="via_microvia.svg">
<metadata
id="metadata16">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs14">
<filter
inkscape:collect="always"
id="filter3808"
color-interpolation-filters="sRGB">
<feGaussianBlur
inkscape:collect="always"
stdDeviation="0.79203718"
id="feGaussianBlur3810" />
</filter>
</defs>
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1920"
inkscape:window-height="1033"
id="namedview12"
showgrid="false"
inkscape:snap-grids="false"
inkscape:snap-to-guides="false"
inkscape:zoom="18.083052"
inkscape:cx="2.8651129"
inkscape:cy="14.092202"
inkscape:window-x="-4"
inkscape:window-y="-4"
inkscape:window-maximized="1"
inkscape:current-layer="svg2" />
<rect
rx="0"
ry="2.3031542"
height="8.7306871"
width="29.813433"
y="11.34338"
x="93.149178"
id="rect4-4"
style="opacity:0.38671875;fill:#000000;fill-rule:evenodd;stroke:#000000;stroke-opacity:1;filter:url(#filter3808)"
transform="matrix(0.32916033,0,0,0.5784203,-29.973503,3.7304857)" />
<path
d="m 134.31482,15.979044 a 15.30449,14.862257 0 1 1 -30.60898,0 15.30449,14.862257 0 1 1 30.60898,0 z"
id="path8-1"
inkscape:connector-curvature="0"
style="opacity:0.38671875;fill:none;stroke:#000000;stroke-width:2.2720027;stroke-opacity:1;filter:url(#filter3808)"
transform="matrix(0.55897873,0,0,0.56826567,-50.880408,3.890002)" />
<rect
rx="0"
ry="1.3569629"
height="5.1439104"
width="9.5338955"
y="10.763303"
x="0.15463093"
id="rect4"
style="fill:#ff0000;fill-rule:evenodd" />
<path
d="m 22.535868,13.331969 a 6.9305552,6.9592077 0 0 1 -13.8611104,0 6.9305552,6.9592077 0 1 1 13.8611104,0 z"
id="path8"
inkscape:connector-curvature="0"
style="fill:none;stroke:#a22b2b;stroke-width:3.00612569;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
d="m 19.704199,13.293377 a 4.0641003,4.0542914 0 0 1 -8.128199,0 4.0641003,4.0542914 0 1 1 8.128199,0 z"
id="path10"
inkscape:connector-curvature="0"
style="fill:none;stroke:#345836;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:3,3;stroke-dashoffset:0" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 3.2 KiB

2
include/bitmaps.h
View File

@ -530,6 +530,8 @@ EXTERN_BITMAP( update_module_board_xpm )
EXTERN_BITMAP( up_xpm ) EXTERN_BITMAP( up_xpm )
EXTERN_BITMAP( use_3D_copper_thickness_xpm ) EXTERN_BITMAP( use_3D_copper_thickness_xpm )
EXTERN_BITMAP( via_xpm ) EXTERN_BITMAP( via_xpm )
EXTERN_BITMAP( via_microvia_xpm )
EXTERN_BITMAP( via_buried_xpm )
EXTERN_BITMAP( via_sketch_xpm ) EXTERN_BITMAP( via_sketch_xpm )
EXTERN_BITMAP( viewlibs_icon_xpm ) EXTERN_BITMAP( viewlibs_icon_xpm )
EXTERN_BITMAP( warning_xpm ) EXTERN_BITMAP( warning_xpm )

23
pcbnew/dialogs/dialog_pns_diff_pair_dimensions.cpp
View File

@ -38,6 +38,9 @@ DIALOG_PNS_DIFF_PAIR_DIMENSIONS::DIALOG_PNS_DIFF_PAIR_DIMENSIONS( wxWindow* aPar
m_viaTraceGapEqual->SetValue( m_sizes.DiffPairViaGapSameAsTraceGap() ); m_viaTraceGapEqual->SetValue( m_sizes.DiffPairViaGapSameAsTraceGap() );
updateCheckbox(); updateCheckbox();
GetSizer()->SetSizeHints(this);
Centre();
} }
@ -49,7 +52,9 @@ void DIALOG_PNS_DIFF_PAIR_DIMENSIONS::updateCheckbox()
m_viaGapText->Disable(); m_viaGapText->Disable();
m_viaGapLabel->Disable(); m_viaGapLabel->Disable();
m_viaGapUnit->Disable(); m_viaGapUnit->Disable();
} else { }
else
{
m_sizes.SetDiffPairViaGapSameAsTraceGap( false ); m_sizes.SetDiffPairViaGapSameAsTraceGap( false );
m_viaGapText->Enable(); m_viaGapText->Enable();
m_viaGapLabel->Enable(); m_viaGapLabel->Enable();
@ -58,13 +63,6 @@ void DIALOG_PNS_DIFF_PAIR_DIMENSIONS::updateCheckbox()
} }
void DIALOG_PNS_DIFF_PAIR_DIMENSIONS::OnClose( wxCloseEvent& aEvent )
{
// Do nothing, it is result of ESC pressing
EndModal( 0 );
}
void DIALOG_PNS_DIFF_PAIR_DIMENSIONS::OnOkClick( wxCommandEvent& aEvent ) void DIALOG_PNS_DIFF_PAIR_DIMENSIONS::OnOkClick( wxCommandEvent& aEvent )
{ {
// Save widgets' values to settings // Save widgets' values to settings
@ -73,14 +71,7 @@ void DIALOG_PNS_DIFF_PAIR_DIMENSIONS::OnOkClick( wxCommandEvent& aEvent )
m_sizes.SetDiffPairWidth ( m_traceWidth.GetValue() ); m_sizes.SetDiffPairWidth ( m_traceWidth.GetValue() );
// todo: verify against design rules // todo: verify against design rules
EndModal( 1 ); EndModal( wxID_OK );
}
void DIALOG_PNS_DIFF_PAIR_DIMENSIONS::OnCancelClick( wxCommandEvent& aEvent )
{
// Do nothing
EndModal( 0 );
} }

8
pcbnew/dialogs/dialog_pns_diff_pair_dimensions.h
View File

@ -36,14 +36,12 @@ class DIALOG_PNS_DIFF_PAIR_DIMENSIONS : public DIALOG_PNS_DIFF_PAIR_DIMENSIONS_B
public: public:
DIALOG_PNS_DIFF_PAIR_DIMENSIONS( wxWindow* aParent, PNS_SIZES_SETTINGS& aSizes ); DIALOG_PNS_DIFF_PAIR_DIMENSIONS( wxWindow* aParent, PNS_SIZES_SETTINGS& aSizes );
virtual void OnClose( wxCloseEvent& aEvent );
virtual void OnOkClick( wxCommandEvent& aEvent );
virtual void OnCancelClick( wxCommandEvent& aEvent );
virtual void OnViaTraceGapEqualCheck( wxCommandEvent& event );
private: private:
void updateCheckbox(); void updateCheckbox();
virtual void OnOkClick( wxCommandEvent& aEvent );
virtual void OnViaTraceGapEqualCheck( wxCommandEvent& event );
WX_UNIT_BINDER m_traceWidth; WX_UNIT_BINDER m_traceWidth;
WX_UNIT_BINDER m_traceGap; WX_UNIT_BINDER m_traceGap;
WX_UNIT_BINDER m_viaGap; WX_UNIT_BINDER m_viaGap;

13
pcbnew/dialogs/dialog_pns_diff_pair_dimensions_base.cpp
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Sep 11 2014) // C++ code generated with wxFormBuilder (version Jun 5 2014)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO "NOT" EDIT THIS FILE! // PLEASE DO "NOT" EDIT THIS FILE!
@ -65,11 +65,14 @@ DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE::DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE( wxWi
fgSizer1->Add( m_viaGapUnit, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); fgSizer1->Add( m_viaGapUnit, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
bSizer7->Add( fgSizer1, 0, wxEXPAND, 5 ); bSizer7->Add( fgSizer1, 0, wxEXPAND|wxALL, 5 );
m_viaTraceGapEqual = new wxCheckBox( this, wxID_ANY, _("Via gap same as trace gap"), wxDefaultPosition, wxDefaultSize, 0 ); m_viaTraceGapEqual = new wxCheckBox( this, wxID_ANY, _("Via gap same as trace gap"), wxDefaultPosition, wxDefaultSize, 0 );
m_viaTraceGapEqual->SetValue(true); m_viaTraceGapEqual->SetValue(true);
bSizer7->Add( m_viaTraceGapEqual, 0, wxALL|wxEXPAND, 5 ); bSizer7->Add( m_viaTraceGapEqual, 0, wxALL|wxEXPAND, 10 );
m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
bSizer7->Add( m_staticline1, 0, wxEXPAND | wxALL, 5 );
m_stdButtons = new wxStdDialogButtonSizer(); m_stdButtons = new wxStdDialogButtonSizer();
m_stdButtonsOK = new wxButton( this, wxID_OK ); m_stdButtonsOK = new wxButton( this, wxID_OK );
@ -78,14 +81,13 @@ DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE::DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE( wxWi
m_stdButtons->AddButton( m_stdButtonsCancel ); m_stdButtons->AddButton( m_stdButtonsCancel );
m_stdButtons->Realize(); m_stdButtons->Realize();
bSizer7->Add( m_stdButtons, 0, wxEXPAND, 5 ); bSizer7->Add( m_stdButtons, 0, wxEXPAND|wxALL, 5 );
this->SetSizer( bSizer7 ); this->SetSizer( bSizer7 );
this->Layout(); this->Layout();
// Connect Events // Connect Events
this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE::OnClose ) );
m_viaTraceGapEqual->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE::OnViaTraceGapEqualCheck ), NULL, this ); m_viaTraceGapEqual->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE::OnViaTraceGapEqualCheck ), NULL, this );
m_stdButtonsCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE::OnCancelClick ), NULL, this ); m_stdButtonsCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE::OnCancelClick ), NULL, this );
m_stdButtonsOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE::OnOkClick ), NULL, this ); m_stdButtonsOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE::OnOkClick ), NULL, this );
@ -94,7 +96,6 @@ DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE::DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE( wxWi
DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE::~DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE() DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE::~DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE()
{ {
// Disconnect Events // Disconnect Events
this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE::OnClose ) );
m_viaTraceGapEqual->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE::OnViaTraceGapEqualCheck ), NULL, this ); m_viaTraceGapEqual->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE::OnViaTraceGapEqualCheck ), NULL, this );
m_stdButtonsCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE::OnCancelClick ), NULL, this ); m_stdButtonsCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE::OnCancelClick ), NULL, this );
m_stdButtonsOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE::OnOkClick ), NULL, this ); m_stdButtonsOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE::OnOkClick ), NULL, this );

91
pcbnew/dialogs/dialog_pns_diff_pair_dimensions_base.fbp
View File

@ -44,7 +44,7 @@
<property name="minimum_size">400,-1</property> <property name="minimum_size">400,-1</property>
<property name="name">DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE</property> <property name="name">DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE</property>
<property name="pos"></property> <property name="pos"></property>
<property name="size">400,-1</property> <property name="size">400,216</property>
<property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property> <property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>
<property name="subclass">DIALOG_SHIM; dialog_shim.h</property> <property name="subclass">DIALOG_SHIM; dialog_shim.h</property>
<property name="title">Differential Pair Dimensions</property> <property name="title">Differential Pair Dimensions</property>
@ -61,7 +61,7 @@
<event name="OnAuiPaneRestore"></event> <event name="OnAuiPaneRestore"></event>
<event name="OnAuiRender"></event> <event name="OnAuiRender"></event>
<event name="OnChar"></event> <event name="OnChar"></event>
<event name="OnClose">OnClose</event> <event name="OnClose"></event>
<event name="OnEnterWindow"></event> <event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event> <event name="OnEraseBackground"></event>
<event name="OnHibernate"></event> <event name="OnHibernate"></event>
@ -95,7 +95,7 @@
<property name="permission">none</property> <property name="permission">none</property>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="1">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxEXPAND</property> <property name="flag">wxEXPAND|wxALL</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxFlexGridSizer" expanded="1"> <object class="wxFlexGridSizer" expanded="1">
<property name="cols">3</property> <property name="cols">3</property>
@ -883,7 +883,7 @@
</object> </object>
</object> </object>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="1">
<property name="border">5</property> <property name="border">10</property>
<property name="flag">wxALL|wxEXPAND</property> <property name="flag">wxALL|wxEXPAND</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxCheckBox" expanded="1"> <object class="wxCheckBox" expanded="1">
@ -972,7 +972,88 @@
</object> </object>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="1">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxEXPAND</property> <property name="flag">wxEXPAND | wxALL</property>
<property name="proportion">0</property>
<object class="wxStaticLine" 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="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_staticline1</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">wxLI_HORIZONTAL</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>
<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 class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxEXPAND|wxALL</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxStdDialogButtonSizer" expanded="1"> <object class="wxStdDialogButtonSizer" expanded="1">
<property name="Apply">0</property> <property name="Apply">0</property>

7
pcbnew/dialogs/dialog_pns_diff_pair_dimensions_base.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Sep 11 2014) // C++ code generated with wxFormBuilder (version Jun 5 2014)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO "NOT" EDIT THIS FILE! // PLEASE DO "NOT" EDIT THIS FILE!
@ -23,6 +23,7 @@ class DIALOG_SHIM;
#include <wx/textctrl.h> #include <wx/textctrl.h>
#include <wx/sizer.h> #include <wx/sizer.h>
#include <wx/checkbox.h> #include <wx/checkbox.h>
#include <wx/statline.h>
#include <wx/button.h> #include <wx/button.h>
#include <wx/dialog.h> #include <wx/dialog.h>
@ -47,12 +48,12 @@ class DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE : public DIALOG_SHIM
wxTextCtrl* m_viaGapText; wxTextCtrl* m_viaGapText;
wxStaticText* m_viaGapUnit; wxStaticText* m_viaGapUnit;
wxCheckBox* m_viaTraceGapEqual; wxCheckBox* m_viaTraceGapEqual;
wxStaticLine* m_staticline1;
wxStdDialogButtonSizer* m_stdButtons; wxStdDialogButtonSizer* m_stdButtons;
wxButton* m_stdButtonsOK; wxButton* m_stdButtonsOK;
wxButton* m_stdButtonsCancel; wxButton* m_stdButtonsCancel;
// Virtual event handlers, overide them in your derived class // Virtual event handlers, overide them in your derived class
virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
virtual void OnViaTraceGapEqualCheck( wxCommandEvent& event ) { event.Skip(); } virtual void OnViaTraceGapEqualCheck( wxCommandEvent& event ) { event.Skip(); }
virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); } virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); }
virtual void OnOkClick( wxCommandEvent& event ) { event.Skip(); } virtual void OnOkClick( wxCommandEvent& event ) { event.Skip(); }
@ -60,7 +61,7 @@ class DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE : public DIALOG_SHIM
public: public:
DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Differential Pair Dimensions"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 400,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Differential Pair Dimensions"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 400,216 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
~DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE(); ~DIALOG_PNS_DIFF_PAIR_DIMENSIONS_BASE();
}; };

17
pcbnew/dialogs/dialog_pns_length_tuning_settings.cpp
View File

@ -74,13 +74,9 @@ DIALOG_PNS_LENGTH_TUNING_SETTINGS::DIALOG_PNS_LENGTH_TUNING_SETTINGS( wxWindow*
m_stdButtonsOK->SetDefault(); m_stdButtonsOK->SetDefault();
m_targetLengthText->SetSelection( -1, -1 ); m_targetLengthText->SetSelection( -1, -1 );
m_targetLengthText->SetFocus(); m_targetLengthText->SetFocus();
}
GetSizer()->SetSizeHints(this);
void DIALOG_PNS_LENGTH_TUNING_SETTINGS::OnClose( wxCloseEvent& aEvent ) Centre();
{
// Do nothing, it is result of ESC pressing
EndModal( 0 );
} }
@ -103,12 +99,5 @@ void DIALOG_PNS_LENGTH_TUNING_SETTINGS::OnOkClick( wxCommandEvent& aEvent )
m_settings.m_cornerType = m_miterStyle->GetSelection() ? PNS_MEANDER_SETTINGS::CHAMFER : PNS_MEANDER_SETTINGS::ROUND; m_settings.m_cornerType = m_miterStyle->GetSelection() ? PNS_MEANDER_SETTINGS::CHAMFER : PNS_MEANDER_SETTINGS::ROUND;
EndModal( 1 ); EndModal( wxID_OK );
}
void DIALOG_PNS_LENGTH_TUNING_SETTINGS::OnCancelClick( wxCommandEvent& aEvent )
{
// Do nothing
EndModal( 0 );
} }

2
pcbnew/dialogs/dialog_pns_length_tuning_settings.h
View File

@ -38,9 +38,7 @@ class DIALOG_PNS_LENGTH_TUNING_SETTINGS : public DIALOG_PNS_LENGTH_TUNING_SETTIN
public: public:
DIALOG_PNS_LENGTH_TUNING_SETTINGS( wxWindow* aParent, PNS_MEANDER_SETTINGS& aSettings, PNS_ROUTER_MODE aMode ); DIALOG_PNS_LENGTH_TUNING_SETTINGS( wxWindow* aParent, PNS_MEANDER_SETTINGS& aSettings, PNS_ROUTER_MODE aMode );
virtual void OnClose( wxCloseEvent& aEvent );
virtual void OnOkClick( wxCommandEvent& aEvent ); virtual void OnOkClick( wxCommandEvent& aEvent );
virtual void OnCancelClick( wxCommandEvent& aEvent );
private: private:
WX_UNIT_BINDER m_minAmpl; WX_UNIT_BINDER m_minAmpl;

83
pcbnew/dialogs/dialog_pns_length_tuning_settings_base.cpp
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Jun 6 2014) // C++ code generated with wxFormBuilder (version Jun 5 2014)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO "NOT" EDIT THIS FILE! // PLEASE DO "NOT" EDIT THIS FILE!
@ -11,7 +11,7 @@
DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE::DIALOG_PNS_LENGTH_TUNING_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_PNS_LENGTH_TUNING_SETTINGS_BASE::DIALOG_PNS_LENGTH_TUNING_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( 345,668 ), wxDefaultSize ); this->SetSizeHints( wxSize( 400,-1 ), wxDefaultSize );
wxBoxSizer* bMainSizer; wxBoxSizer* bMainSizer;
bMainSizer = new wxBoxSizer( wxVERTICAL ); bMainSizer = new wxBoxSizer( wxVERTICAL );
@ -19,61 +19,64 @@ DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE::DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE(
wxStaticBoxSizer* sbSizer1; wxStaticBoxSizer* sbSizer1;
sbSizer1 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Length/skew") ), wxVERTICAL ); sbSizer1 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Length/skew") ), wxVERTICAL );
wxFlexGridSizer* fgSizer4; wxFlexGridSizer* fgSizerLenSkew;
fgSizer4 = new wxFlexGridSizer( 0, 2, 0, 0 ); fgSizerLenSkew = new wxFlexGridSizer( 0, 3, 0, 0 );
fgSizer4->AddGrowableCol( 1 ); fgSizerLenSkew->AddGrowableCol( 1 );
fgSizer4->SetFlexibleDirection( wxBOTH ); fgSizerLenSkew->SetFlexibleDirection( wxBOTH );
fgSizer4->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); fgSizerLenSkew->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
m_staticText4 = new wxStaticText( this, wxID_ANY, _("Tune from:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText4 = new wxStaticText( this, wxID_ANY, _("Tune from:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText4->Wrap( -1 ); m_staticText4->Wrap( -1 );
fgSizer4->Add( m_staticText4, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); fgSizerLenSkew->Add( m_staticText4, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
wxArrayString m_choicePathFromChoices; wxArrayString m_choicePathFromChoices;
m_choicePathFrom = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choicePathFromChoices, 0 ); m_choicePathFrom = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choicePathFromChoices, 0 );
m_choicePathFrom->SetSelection( 0 ); m_choicePathFrom->SetSelection( 0 );
fgSizer4->Add( m_choicePathFrom, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); fgSizerLenSkew->Add( m_choicePathFrom, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
fgSizerLenSkew->Add( 0, 0, 0, 0, 5 );
m_staticText15 = new wxStaticText( this, wxID_ANY, _("Tune to:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText15 = new wxStaticText( this, wxID_ANY, _("Tune to:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText15->Wrap( -1 ); m_staticText15->Wrap( -1 );
fgSizer4->Add( m_staticText15, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); fgSizerLenSkew->Add( m_staticText15, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
wxArrayString m_choice4Choices; wxArrayString m_choice4Choices;
m_choice4 = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choice4Choices, 0 ); m_choice4 = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choice4Choices, 0 );
m_choice4->SetSelection( 0 ); m_choice4->SetSelection( 0 );
fgSizer4->Add( m_choice4, 0, wxALL, 5 ); fgSizerLenSkew->Add( m_choice4, 0, wxALL|wxEXPAND, 5 );
fgSizerLenSkew->Add( 0, 0, 0, 0, 5 );
m_staticText3 = new wxStaticText( this, wxID_ANY, _("Constraint:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText3 = new wxStaticText( this, wxID_ANY, _("Constraint:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText3->Wrap( -1 ); m_staticText3->Wrap( -1 );
fgSizer4->Add( m_staticText3, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); fgSizerLenSkew->Add( m_staticText3, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
wxString m_constraintSourceChoices[] = { _("from Design Rules"), _("manual") }; wxString m_constraintSourceChoices[] = { _("From Design Rules"), _("Manual") };
int m_constraintSourceNChoices = sizeof( m_constraintSourceChoices ) / sizeof( wxString ); int m_constraintSourceNChoices = sizeof( m_constraintSourceChoices ) / sizeof( wxString );
m_constraintSource = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_constraintSourceNChoices, m_constraintSourceChoices, 0 ); m_constraintSource = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_constraintSourceNChoices, m_constraintSourceChoices, 0 );
m_constraintSource->SetSelection( 1 ); m_constraintSource->SetSelection( 1 );
m_constraintSource->Enable( false ); m_constraintSource->Enable( false );
fgSizer4->Add( m_constraintSource, 1, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); fgSizerLenSkew->Add( m_constraintSource, 1, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
fgSizerLenSkew->Add( 0, 0, 0, 0, 5 );
m_targetLengthLabel = new wxStaticText( this, wxID_ANY, _("Target length:"), wxDefaultPosition, wxDefaultSize, 0 ); m_targetLengthLabel = new wxStaticText( this, wxID_ANY, _("Target length:"), wxDefaultPosition, wxDefaultSize, 0 );
m_targetLengthLabel->Wrap( -1 ); m_targetLengthLabel->Wrap( -1 );
fgSizer4->Add( m_targetLengthLabel, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); fgSizerLenSkew->Add( m_targetLengthLabel, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
wxGridSizer* gSizer2;
gSizer2 = new wxGridSizer( 0, 2, 0, 0 );
m_targetLengthText = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_targetLengthText = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
gSizer2->Add( m_targetLengthText, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); fgSizerLenSkew->Add( m_targetLengthText, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
m_targetLengthUnit = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); m_targetLengthUnit = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 );
m_targetLengthUnit->Wrap( -1 ); m_targetLengthUnit->Wrap( -1 );
gSizer2->Add( m_targetLengthUnit, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); fgSizerLenSkew->Add( m_targetLengthUnit, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
fgSizer4->Add( gSizer2, 1, wxEXPAND, 5 ); sbSizer1->Add( fgSizerLenSkew, 1, wxEXPAND, 5 );
sbSizer1->Add( fgSizer4, 1, wxEXPAND, 5 );
bMainSizer->Add( sbSizer1, 0, wxEXPAND|wxALL, 5 ); bMainSizer->Add( sbSizer1, 0, wxEXPAND|wxALL, 5 );
@ -86,53 +89,53 @@ DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE::DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE(
wxFlexGridSizer* fgSizer3; wxFlexGridSizer* fgSizer3;
fgSizer3 = new wxFlexGridSizer( 0, 3, 0, 0 ); fgSizer3 = new wxFlexGridSizer( 0, 3, 0, 0 );
fgSizer3->AddGrowableCol( 2 ); fgSizer3->AddGrowableCol( 1 );
fgSizer3->SetFlexibleDirection( wxBOTH ); fgSizer3->SetFlexibleDirection( wxBOTH );
fgSizer3->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); fgSizer3->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
m_staticText9 = new wxStaticText( this, wxID_ANY, _("Min amplitude (Amin):"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText9 = new wxStaticText( this, wxID_ANY, _("Min amplitude (Amin):"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText9->Wrap( -1 ); m_staticText9->Wrap( -1 );
fgSizer3->Add( m_staticText9, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); fgSizer3->Add( m_staticText9, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
m_minAmplText = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_minAmplText = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
fgSizer3->Add( m_minAmplText, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); fgSizer3->Add( m_minAmplText, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
m_minAmplUnit = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); m_minAmplUnit = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 );
m_minAmplUnit->Wrap( -1 ); m_minAmplUnit->Wrap( -1 );
fgSizer3->Add( m_minAmplUnit, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 ); fgSizer3->Add( m_minAmplUnit, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
m_staticText91 = new wxStaticText( this, wxID_ANY, _("Max amplitude (Amax):"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText91 = new wxStaticText( this, wxID_ANY, _("Max amplitude (Amax):"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText91->Wrap( -1 ); m_staticText91->Wrap( -1 );
fgSizer3->Add( m_staticText91, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); fgSizer3->Add( m_staticText91, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
m_maxAmplText = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_maxAmplText = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
fgSizer3->Add( m_maxAmplText, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); fgSizer3->Add( m_maxAmplText, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
m_maxAmplUnit = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); m_maxAmplUnit = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 );
m_maxAmplUnit->Wrap( -1 ); m_maxAmplUnit->Wrap( -1 );
fgSizer3->Add( m_maxAmplUnit, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 ); fgSizer3->Add( m_maxAmplUnit, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
m_staticText11 = new wxStaticText( this, wxID_ANY, _("Spacing (s):"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText11 = new wxStaticText( this, wxID_ANY, _("Spacing (s):"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText11->Wrap( -1 ); m_staticText11->Wrap( -1 );
fgSizer3->Add( m_staticText11, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); fgSizer3->Add( m_staticText11, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
m_spacingText = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_spacingText = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
fgSizer3->Add( m_spacingText, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); fgSizer3->Add( m_spacingText, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
m_spacingUnit = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 ); m_spacingUnit = new wxStaticText( this, wxID_ANY, _("unit"), wxDefaultPosition, wxDefaultSize, 0 );
m_spacingUnit->Wrap( -1 ); m_spacingUnit->Wrap( -1 );
fgSizer3->Add( m_spacingUnit, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 ); fgSizer3->Add( m_spacingUnit, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
m_staticText13 = new wxStaticText( this, wxID_ANY, _("Miter radius (r):"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText13 = new wxStaticText( this, wxID_ANY, _("Miter radius (r):"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText13->Wrap( -1 ); m_staticText13->Wrap( -1 );
fgSizer3->Add( m_staticText13, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); fgSizer3->Add( m_staticText13, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
m_radiusText = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_radiusText = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
fgSizer3->Add( m_radiusText, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); fgSizer3->Add( m_radiusText, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
m_radiusUnit = new wxStaticText( this, wxID_ANY, _("%"), wxDefaultPosition, wxDefaultSize, 0 ); m_radiusUnit = new wxStaticText( this, wxID_ANY, _("%"), wxDefaultPosition, wxDefaultSize, 0 );
m_radiusUnit->Wrap( -1 ); m_radiusUnit->Wrap( -1 );
fgSizer3->Add( m_radiusUnit, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 ); fgSizer3->Add( m_radiusUnit, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 );
m_staticText14 = new wxStaticText( this, wxID_ANY, _("Miter style:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText14 = new wxStaticText( this, wxID_ANY, _("Miter style:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText14->Wrap( -1 ); m_staticText14->Wrap( -1 );
@ -161,23 +164,19 @@ DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE::DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE(
m_stdButtons->AddButton( m_stdButtonsCancel ); m_stdButtons->AddButton( m_stdButtonsCancel );
m_stdButtons->Realize(); m_stdButtons->Realize();
bMainSizer->Add( m_stdButtons, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 ); bMainSizer->Add( m_stdButtons, 0, wxEXPAND|wxALL, 5 );
this->SetSizer( bMainSizer ); this->SetSizer( bMainSizer );
this->Layout(); this->Layout();
// Connect Events // Connect Events
this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE::OnClose ) );
m_stdButtonsCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE::OnCancelClick ), NULL, this );
m_stdButtonsOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE::OnOkClick ), NULL, this ); m_stdButtonsOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE::OnOkClick ), NULL, this );
} }
DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE::~DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE() DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE::~DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE()
{ {
// Disconnect Events // Disconnect Events
this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE::OnClose ) );
m_stdButtonsCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE::OnCancelClick ), NULL, this );
m_stdButtonsOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE::OnOkClick ), NULL, this ); m_stdButtonsOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE::OnOkClick ), NULL, this );
} }

440
pcbnew/dialogs/dialog_pns_length_tuning_settings_base.fbp
View File

@ -41,11 +41,11 @@
<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">345,668</property> <property name="minimum_size">400,-1</property>
<property name="name">DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE</property> <property name="name">DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE</property>
<property name="pos"></property> <property name="pos"></property>
<property name="size">345,668</property> <property name="size">404,565</property>
<property name="style">wxDEFAULT_DIALOG_STYLE</property> <property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>
<property name="subclass">DIALOG_SHIM; dialog_shim.h</property> <property name="subclass">DIALOG_SHIM; dialog_shim.h</property>
<property name="title">Trace length tuning</property> <property name="title">Trace length tuning</property>
<property name="tooltip"></property> <property name="tooltip"></property>
@ -61,7 +61,7 @@
<event name="OnAuiPaneRestore"></event> <event name="OnAuiPaneRestore"></event>
<event name="OnAuiRender"></event> <event name="OnAuiRender"></event>
<event name="OnChar"></event> <event name="OnChar"></event>
<event name="OnClose">OnClose</event> <event name="OnClose"></event>
<event name="OnEnterWindow"></event> <event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event> <event name="OnEraseBackground"></event>
<event name="OnHibernate"></event> <event name="OnHibernate"></event>
@ -110,20 +110,20 @@
<property name="flag">wxEXPAND</property> <property name="flag">wxEXPAND</property>
<property name="proportion">1</property> <property name="proportion">1</property>
<object class="wxFlexGridSizer" expanded="1"> <object class="wxFlexGridSizer" expanded="1">
<property name="cols">2</property> <property name="cols">3</property>
<property name="flexible_direction">wxBOTH</property> <property name="flexible_direction">wxBOTH</property>
<property name="growablecols">1</property> <property name="growablecols">1</property>
<property name="growablerows"></property> <property name="growablerows"></property>
<property name="hgap">0</property> <property name="hgap">0</property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="name">fgSizer4</property> <property name="name">fgSizerLenSkew</property>
<property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property> <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
<property name="permission">none</property> <property name="permission">none</property>
<property name="rows">0</property> <property name="rows">0</property>
<property name="vgap">0</property> <property name="vgap">0</property>
<object class="sizeritem" expanded="0"> <object class="sizeritem" expanded="0">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property> <property name="flag">wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxStaticText" expanded="0"> <object class="wxStaticText" expanded="0">
<property name="BottomDockable">1</property> <property name="BottomDockable">1</property>
@ -206,7 +206,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|wxALIGN_CENTER_VERTICAL</property> <property name="flag">wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxChoice" expanded="1"> <object class="wxChoice" expanded="1">
<property name="BottomDockable">1</property> <property name="BottomDockable">1</property>
@ -294,7 +294,17 @@
</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|wxALIGN_CENTER_VERTICAL</property> <property name="flag"></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 class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|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>
@ -377,7 +387,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">wxALL|wxEXPAND</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxChoice" expanded="1"> <object class="wxChoice" expanded="1">
<property name="BottomDockable">1</property> <property name="BottomDockable">1</property>
@ -463,9 +473,19 @@
<event name="OnUpdateUI"></event> <event name="OnUpdateUI"></event>
</object> </object>
</object> </object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag"></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 class="sizeritem" expanded="0"> <object class="sizeritem" expanded="0">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property> <property name="flag">wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxStaticText" expanded="0"> <object class="wxStaticText" expanded="0">
<property name="BottomDockable">1</property> <property name="BottomDockable">1</property>
@ -548,7 +568,7 @@
</object> </object>
<object class="sizeritem" expanded="0"> <object class="sizeritem" expanded="0">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property> <property name="flag">wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND</property>
<property name="proportion">1</property> <property name="proportion">1</property>
<object class="wxChoice" expanded="0"> <object class="wxChoice" expanded="0">
<property name="BottomDockable">1</property> <property name="BottomDockable">1</property>
@ -564,7 +584,7 @@
<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="choices">&quot;from Design Rules&quot; &quot;manual&quot;</property> <property name="choices">&quot;From Design Rules&quot; &quot;Manual&quot;</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>
@ -634,9 +654,19 @@
<event name="OnUpdateUI"></event> <event name="OnUpdateUI"></event>
</object> </object>
</object> </object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag"></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 class="sizeritem" expanded="0"> <object class="sizeritem" expanded="0">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property> <property name="flag">wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxStaticText" expanded="0"> <object class="wxStaticText" expanded="0">
<property name="BottomDockable">1</property> <property name="BottomDockable">1</property>
@ -719,190 +749,176 @@
</object> </object>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="1">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxEXPAND</property> <property name="flag">wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND</property>
<property name="proportion">1</property> <property name="proportion">0</property>
<object class="wxGridSizer" expanded="1"> <object class="wxTextCtrl" expanded="1">
<property name="cols">2</property> <property name="BottomDockable">1</property>
<property name="hgap">0</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="minimum_size"></property>
<property name="name">gSizer2</property> <property name="moveable">1</property>
<property name="permission">none</property> <property name="name">m_targetLengthText</property>
<property name="rows">0</property> <property name="pane_border">1</property>
<property name="vgap">0</property> <property name="pane_position"></property>
<object class="sizeritem" expanded="1"> <property name="pane_size"></property>
<property name="border">5</property> <property name="permission">protected</property>
<property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property> <property name="pin_button">1</property>
<property name="proportion">0</property> <property name="pos"></property>
<object class="wxTextCtrl" expanded="1"> <property name="resize">Resizable</property>
<property name="BottomDockable">1</property> <property name="show">1</property>
<property name="LeftDockable">1</property> <property name="size"></property>
<property name="RightDockable">1</property> <property name="style"></property>
<property name="TopDockable">1</property> <property name="subclass"></property>
<property name="aui_layer"></property> <property name="toolbar_pane">0</property>
<property name="aui_name"></property> <property name="tooltip"></property>
<property name="aui_position"></property> <property name="validator_data_type"></property>
<property name="aui_row"></property> <property name="validator_style">wxFILTER_NONE</property>
<property name="best_size"></property> <property name="validator_type">wxDefaultValidator</property>
<property name="bg"></property> <property name="validator_variable"></property>
<property name="caption"></property> <property name="value"></property>
<property name="caption_visible">1</property> <property name="window_extra_style"></property>
<property name="center_pane">0</property> <property name="window_name"></property>
<property name="close_button">1</property> <property name="window_style"></property>
<property name="context_help"></property> <event name="OnChar"></event>
<property name="context_menu">1</property> <event name="OnEnterWindow"></event>
<property name="default_pane">0</property> <event name="OnEraseBackground"></event>
<property name="dock">Dock</property> <event name="OnKeyDown"></event>
<property name="dock_fixed">0</property> <event name="OnKeyUp"></event>
<property name="docking">Left</property> <event name="OnKillFocus"></event>
<property name="enabled">1</property> <event name="OnLeaveWindow"></event>
<property name="fg"></property> <event name="OnLeftDClick"></event>
<property name="floatable">1</property> <event name="OnLeftDown"></event>
<property name="font"></property> <event name="OnLeftUp"></event>
<property name="gripper">0</property> <event name="OnMiddleDClick"></event>
<property name="hidden">0</property> <event name="OnMiddleDown"></event>
<property name="id">wxID_ANY</property> <event name="OnMiddleUp"></event>
<property name="max_size"></property> <event name="OnMotion"></event>
<property name="maximize_button">0</property> <event name="OnMouseEvents"></event>
<property name="maximum_size"></property> <event name="OnMouseWheel"></event>
<property name="maxlength"></property> <event name="OnPaint"></event>
<property name="min_size"></property> <event name="OnRightDClick"></event>
<property name="minimize_button">0</property> <event name="OnRightDown"></event>
<property name="minimum_size"></property> <event name="OnRightUp"></event>
<property name="moveable">1</property> <event name="OnSetFocus"></event>
<property name="name">m_targetLengthText</property> <event name="OnSize"></event>
<property name="pane_border">1</property> <event name="OnText"></event>
<property name="pane_position"></property> <event name="OnTextEnter"></event>
<property name="pane_size"></property> <event name="OnTextMaxLen"></event>
<property name="permission">protected</property> <event name="OnTextURL"></event>
<property name="pin_button">1</property> <event name="OnUpdateUI"></event>
<property name="pos"></property> </object>
<property name="resize">Resizable</property> </object>
<property name="show">1</property> <object class="sizeritem" expanded="1">
<property name="size"></property> <property name="border">5</property>
<property name="style"></property> <property name="flag">wxALIGN_CENTER_VERTICAL|wxRIGHT</property>
<property name="subclass"></property> <property name="proportion">0</property>
<property name="toolbar_pane">0</property> <object class="wxStaticText" expanded="1">
<property name="tooltip"></property> <property name="BottomDockable">1</property>
<property name="validator_data_type"></property> <property name="LeftDockable">1</property>
<property name="validator_style">wxFILTER_NONE</property> <property name="RightDockable">1</property>
<property name="validator_type">wxDefaultValidator</property> <property name="TopDockable">1</property>
<property name="validator_variable"></property> <property name="aui_layer"></property>
<property name="value"></property> <property name="aui_name"></property>
<property name="window_extra_style"></property> <property name="aui_position"></property>
<property name="window_name"></property> <property name="aui_row"></property>
<property name="window_style"></property> <property name="best_size"></property>
<event name="OnChar"></event> <property name="bg"></property>
<event name="OnEnterWindow"></event> <property name="caption"></property>
<event name="OnEraseBackground"></event> <property name="caption_visible">1</property>
<event name="OnKeyDown"></event> <property name="center_pane">0</property>
<event name="OnKeyUp"></event> <property name="close_button">1</property>
<event name="OnKillFocus"></event> <property name="context_help"></property>
<event name="OnLeaveWindow"></event> <property name="context_menu">1</property>
<event name="OnLeftDClick"></event> <property name="default_pane">0</property>
<event name="OnLeftDown"></event> <property name="dock">Dock</property>
<event name="OnLeftUp"></event> <property name="dock_fixed">0</property>
<event name="OnMiddleDClick"></event> <property name="docking">Left</property>
<event name="OnMiddleDown"></event> <property name="enabled">1</property>
<event name="OnMiddleUp"></event> <property name="fg"></property>
<event name="OnMotion"></event> <property name="floatable">1</property>
<event name="OnMouseEvents"></event> <property name="font"></property>
<event name="OnMouseWheel"></event> <property name="gripper">0</property>
<event name="OnPaint"></event> <property name="hidden">0</property>
<event name="OnRightDClick"></event> <property name="id">wxID_ANY</property>
<event name="OnRightDown"></event> <property name="label">unit</property>
<event name="OnRightUp"></event> <property name="max_size"></property>
<event name="OnSetFocus"></event> <property name="maximize_button">0</property>
<event name="OnSize"></event> <property name="maximum_size"></property>
<event name="OnText"></event> <property name="min_size"></property>
<event name="OnTextEnter"></event> <property name="minimize_button">0</property>
<event name="OnTextMaxLen"></event> <property name="minimum_size"></property>
<event name="OnTextURL"></event> <property name="moveable">1</property>
<event name="OnUpdateUI"></event> <property name="name">m_targetLengthUnit</property>
</object> <property name="pane_border">1</property>
</object> <property name="pane_position"></property>
<object class="sizeritem" expanded="1"> <property name="pane_size"></property>
<property name="border">5</property> <property name="permission">protected</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property> <property name="pin_button">1</property>
<property name="proportion">0</property> <property name="pos"></property>
<object class="wxStaticText" expanded="1"> <property name="resize">Resizable</property>
<property name="BottomDockable">1</property> <property name="show">1</property>
<property name="LeftDockable">1</property> <property name="size"></property>
<property name="RightDockable">1</property> <property name="style"></property>
<property name="TopDockable">1</property> <property name="subclass"></property>
<property name="aui_layer"></property> <property name="toolbar_pane">0</property>
<property name="aui_name"></property> <property name="tooltip"></property>
<property name="aui_position"></property> <property name="window_extra_style"></property>
<property name="aui_row"></property> <property name="window_name"></property>
<property name="best_size"></property> <property name="window_style"></property>
<property name="bg"></property> <property name="wrap">-1</property>
<property name="caption"></property> <event name="OnChar"></event>
<property name="caption_visible">1</property> <event name="OnEnterWindow"></event>
<property name="center_pane">0</property> <event name="OnEraseBackground"></event>
<property name="close_button">1</property> <event name="OnKeyDown"></event>
<property name="context_help"></property> <event name="OnKeyUp"></event>
<property name="context_menu">1</property> <event name="OnKillFocus"></event>
<property name="default_pane">0</property> <event name="OnLeaveWindow"></event>
<property name="dock">Dock</property> <event name="OnLeftDClick"></event>
<property name="dock_fixed">0</property> <event name="OnLeftDown"></event>
<property name="docking">Left</property> <event name="OnLeftUp"></event>
<property name="enabled">1</property> <event name="OnMiddleDClick"></event>
<property name="fg"></property> <event name="OnMiddleDown"></event>
<property name="floatable">1</property> <event name="OnMiddleUp"></event>
<property name="font"></property> <event name="OnMotion"></event>
<property name="gripper">0</property> <event name="OnMouseEvents"></event>
<property name="hidden">0</property> <event name="OnMouseWheel"></event>
<property name="id">wxID_ANY</property> <event name="OnPaint"></event>
<property name="label">unit</property> <event name="OnRightDClick"></event>
<property name="max_size"></property> <event name="OnRightDown"></event>
<property name="maximize_button">0</property> <event name="OnRightUp"></event>
<property name="maximum_size"></property> <event name="OnSetFocus"></event>
<property name="min_size"></property> <event name="OnSize"></event>
<property name="minimize_button">0</property> <event name="OnUpdateUI"></event>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_targetLengthUnit</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>
<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>
</object> </object>
@ -1009,7 +1025,7 @@
<object class="wxFlexGridSizer" expanded="1"> <object class="wxFlexGridSizer" expanded="1">
<property name="cols">3</property> <property name="cols">3</property>
<property name="flexible_direction">wxBOTH</property> <property name="flexible_direction">wxBOTH</property>
<property name="growablecols">2</property> <property name="growablecols">1</property>
<property name="growablerows"></property> <property name="growablerows"></property>
<property name="hgap">0</property> <property name="hgap">0</property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
@ -1020,7 +1036,7 @@
<property name="vgap">0</property> <property name="vgap">0</property>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="1">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property> <property name="flag">wxALIGN_CENTER_VERTICAL|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>
@ -1103,7 +1119,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|wxALIGN_CENTER_VERTICAL</property> <property name="flag">wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxTextCtrl" expanded="1"> <object class="wxTextCtrl" expanded="1">
<property name="BottomDockable">1</property> <property name="BottomDockable">1</property>
@ -1194,7 +1210,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">wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT</property> <property name="flag">wxALIGN_CENTER_VERTICAL|wxRIGHT</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>
@ -1277,7 +1293,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|wxALIGN_CENTER_VERTICAL</property> <property name="flag">wxALIGN_CENTER_VERTICAL|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>
@ -1360,7 +1376,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|wxALIGN_CENTER_VERTICAL</property> <property name="flag">wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxTextCtrl" expanded="1"> <object class="wxTextCtrl" expanded="1">
<property name="BottomDockable">1</property> <property name="BottomDockable">1</property>
@ -1451,7 +1467,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">wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT</property> <property name="flag">wxALIGN_CENTER_VERTICAL|wxRIGHT</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>
@ -1534,7 +1550,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|wxALIGN_CENTER_VERTICAL</property> <property name="flag">wxALIGN_CENTER_VERTICAL|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>
@ -1617,7 +1633,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|wxALIGN_CENTER_VERTICAL</property> <property name="flag">wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxTextCtrl" expanded="1"> <object class="wxTextCtrl" expanded="1">
<property name="BottomDockable">1</property> <property name="BottomDockable">1</property>
@ -1708,7 +1724,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">wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT</property> <property name="flag">wxALIGN_CENTER_VERTICAL|wxRIGHT</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>
@ -1791,7 +1807,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|wxALIGN_CENTER_VERTICAL</property> <property name="flag">wxALIGN_CENTER_VERTICAL|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>
@ -1874,7 +1890,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|wxALIGN_CENTER_VERTICAL</property> <property name="flag">wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxTextCtrl" expanded="1"> <object class="wxTextCtrl" expanded="1">
<property name="BottomDockable">1</property> <property name="BottomDockable">1</property>
@ -1965,7 +1981,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">wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT</property> <property name="flag">wxALIGN_CENTER_VERTICAL|wxRIGHT</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>
@ -2223,7 +2239,7 @@
</object> </object>
<object class="sizeritem" expanded="0"> <object class="sizeritem" expanded="0">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxEXPAND|wxTOP|wxBOTTOM</property> <property name="flag">wxEXPAND|wxALL</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxStdDialogButtonSizer" expanded="0"> <object class="wxStdDialogButtonSizer" expanded="0">
<property name="Apply">0</property> <property name="Apply">0</property>
@ -2238,7 +2254,7 @@
<property name="name">m_stdButtons</property> <property name="name">m_stdButtons</property>
<property name="permission">protected</property> <property name="permission">protected</property>
<event name="OnApplyButtonClick"></event> <event name="OnApplyButtonClick"></event>
<event name="OnCancelButtonClick">OnCancelClick</event> <event name="OnCancelButtonClick"></event>
<event name="OnContextHelpButtonClick"></event> <event name="OnContextHelpButtonClick"></event>
<event name="OnHelpButtonClick"></event> <event name="OnHelpButtonClick"></event>
<event name="OnNoButtonClick"></event> <event name="OnNoButtonClick"></event>

6
pcbnew/dialogs/dialog_pns_length_tuning_settings_base.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Jun 6 2014) // C++ code generated with wxFormBuilder (version Jun 5 2014)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO "NOT" EDIT THIS FILE! // PLEASE DO "NOT" EDIT THIS FILE!
@ -71,14 +71,12 @@ class DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE : public DIALOG_SHIM
wxButton* m_stdButtonsCancel; wxButton* m_stdButtonsCancel;
// Virtual event handlers, overide them in your derived class // Virtual event handlers, overide them in your derived class
virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); }
virtual void OnOkClick( wxCommandEvent& event ) { event.Skip(); } virtual void OnOkClick( wxCommandEvent& event ) { event.Skip(); }
public: public:
DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Trace length tuning"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 345,668 ), long style = wxDEFAULT_DIALOG_STYLE ); DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Trace length tuning"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 404,565 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
~DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE(); ~DIALOG_PNS_LENGTH_TUNING_SETTINGS_BASE();
}; };

4
pcbnew/onrightclick.cpp
View File

@ -605,7 +605,7 @@ void PCB_EDIT_FRAME::createPopupMenuForTracks( TRACK* Track, wxMenu* PopMenu )
{ {
msg = AddHotkeyName( _( "Place Blind/Buried Via" ), msg = AddHotkeyName( _( "Place Blind/Buried Via" ),
g_Board_Editor_Hokeys_Descr, HK_ADD_BLIND_BURIED_VIA ); g_Board_Editor_Hokeys_Descr, HK_ADD_BLIND_BURIED_VIA );
AddMenuItem( PopMenu, ID_POPUP_PCB_PLACE_BLIND_BURIED_VIA, msg, KiBitmap( via_xpm ) ); AddMenuItem( PopMenu, ID_POPUP_PCB_PLACE_BLIND_BURIED_VIA, msg, KiBitmap( via_buried_xpm ) );
msg = AddHotkeyName( _( "Select Layer and Place Blind/Buried Via" ), msg = AddHotkeyName( _( "Select Layer and Place Blind/Buried Via" ),
g_Board_Editor_Hokeys_Descr, HK_SEL_LAYER_AND_ADD_BLIND_BURIED_VIA ); g_Board_Editor_Hokeys_Descr, HK_SEL_LAYER_AND_ADD_BLIND_BURIED_VIA );
@ -623,7 +623,7 @@ void PCB_EDIT_FRAME::createPopupMenuForTracks( TRACK* Track, wxMenu* PopMenu )
{ {
msg = AddHotkeyName( _( "Place Micro Via" ), g_Board_Editor_Hokeys_Descr, msg = AddHotkeyName( _( "Place Micro Via" ), g_Board_Editor_Hokeys_Descr,
HK_ADD_MICROVIA ); HK_ADD_MICROVIA );
PopMenu->Append( ID_POPUP_PCB_PLACE_MICROVIA, msg ); AddMenuItem( PopMenu, ID_POPUP_PCB_PLACE_MICROVIA, msg, KiBitmap( via_microvia_xpm ) );
} }
} }

2
pcbnew/router/pns_tool_base.cpp
View File

@ -58,7 +58,7 @@ using boost::optional;
TOOL_ACTION PNS_TOOL_BASE::ACT_RouterOptions( "pcbnew.InteractiveRouter.RouterOptions", TOOL_ACTION PNS_TOOL_BASE::ACT_RouterOptions( "pcbnew.InteractiveRouter.RouterOptions",
AS_CONTEXT, 'E', AS_CONTEXT, 'E',
_( "Routing Options..." ), _( "Routing Options..." ),
_( "Shows a dialog containing router options." ) ); _( "Shows a dialog containing router options." ), tools_xpm );
PNS_TOOL_BASE::PNS_TOOL_BASE( const std::string& aToolName ) : PNS_TOOL_BASE::PNS_TOOL_BASE( const std::string& aToolName ) :

1
pcbnew/router/pns_walkaround.h
View File

@ -45,6 +45,7 @@ public:
// Initialize other members, to avoid uninitialized variables. // Initialize other members, to avoid uninitialized variables.
m_recursiveBlockageCount = 0; m_recursiveBlockageCount = 0;
m_recursiveCollision[0] = m_recursiveCollision[1] = false;
m_iteration = 0; m_iteration = 0;
m_forceCw = false; m_forceCw = false;
} }

38
pcbnew/router/router_tool.cpp
View File

@ -64,23 +64,39 @@ static TOOL_ACTION ACT_AutoEndRoute( "pcbnew.InteractiveRouter.AutoEndRoute", AS
static TOOL_ACTION ACT_Drag( "pcbnew.InteractiveRouter.Drag", AS_CONTEXT, 'G', static TOOL_ACTION ACT_Drag( "pcbnew.InteractiveRouter.Drag", AS_CONTEXT, 'G',
_( "Drag Track/Via" ), _( "Drags a track or a via." ), drag_track_segment_xpm ); _( "Drag Track/Via" ), _( "Drags a track or a via." ), drag_track_segment_xpm );
static TOOL_ACTION ACT_PlaceThroughVia( "pcbnew.InteractiveRouter.PlaceVia", AS_CONTEXT, 'V', static TOOL_ACTION ACT_PlaceThroughVia( "pcbnew.InteractiveRouter.PlaceVia",
_( "Place Through Via" ), _( "Adds a through-hole via at the end of currently routed track." ), via_xpm ); AS_CONTEXT, 'V',
_( "Place Through Via" ),
_( "Adds a through-hole via at the end of currently routed track." ),
via_xpm );
static TOOL_ACTION ACT_PlaceBlindVia( "pcbnew.InteractiveRouter.PlaceBlindVia", AS_CONTEXT, 'Z', static TOOL_ACTION ACT_PlaceBlindVia( "pcbnew.InteractiveRouter.PlaceBlindVia",
_( "Place Blind/Buried Via" ), _( "Adds a blind or buried via at the end of currently routed track." ) ); AS_CONTEXT, 'Z',
_( "Place Blind/Buried Via" ),
_( "Adds a blind or buried via at the end of currently routed track."),
via_buried_xpm );
static TOOL_ACTION ACT_PlaceMicroVia( "pcbnew.InteractiveRouter.PlaceMicroVia", AS_CONTEXT, 'Q', static TOOL_ACTION ACT_PlaceMicroVia( "pcbnew.InteractiveRouter.PlaceMicroVia",
_( "Place Microvia" ), _( "Adds a microvia at the end of currently routed track." ) ); AS_CONTEXT, 'Q',
_( "Place Microvia" ), _( "Adds a microvia at the end of currently routed track." ),
via_microvia_xpm );
static TOOL_ACTION ACT_CustomTrackWidth( "pcbnew.InteractiveRouter.CustomTrackWidth", AS_CONTEXT, 'W', static TOOL_ACTION ACT_CustomTrackWidth( "pcbnew.InteractiveRouter.CustomTrackWidth",
_( "Custom Track Width" ), _( "Shows a dialog for changing the track width and via size." ) ); AS_CONTEXT, 'W',
_( "Custom Track Width" ),
_( "Shows a dialog for changing the track width and via size." ),
width_track_xpm );
static TOOL_ACTION ACT_SwitchPosture( "pcbnew.InteractiveRouter.SwitchPosture", AS_CONTEXT, '/', static TOOL_ACTION ACT_SwitchPosture( "pcbnew.InteractiveRouter.SwitchPosture", AS_CONTEXT, '/',
_( "Switch Track Posture" ), _( "Switches posture of the currenly routed track." ), change_entry_orient_xpm ); _( "Switch Track Posture" ),
_( "Switches posture of the currenly routed track." ),
change_entry_orient_xpm );
static TOOL_ACTION ACT_SetDpDimensions( "pcbnew.InteractiveRouter.SetDpDimensions", AS_CONTEXT, 'D', static TOOL_ACTION ACT_SetDpDimensions( "pcbnew.InteractiveRouter.SetDpDimensions",
_( "Differential Pair Dimensions..." ), _( "Sets the width and gap of the currently routed differential pair." ) ); AS_CONTEXT, 'D',
_( "Differential Pair Dimensions..." ),
_( "Sets the width and gap of the currently routed differential pair." ),
ps_diff_pair_tune_length_xpm );
ROUTER_TOOL::ROUTER_TOOL() : ROUTER_TOOL::ROUTER_TOOL() :