diff --git a/bitmaps_png/cpp_26/export.cpp b/bitmaps_png/cpp_26/export.cpp index a27e01b9bc..d8eaea8198 100644 --- a/bitmaps_png/cpp_26/export.cpp +++ b/bitmaps_png/cpp_26/export.cpp @@ -8,72 +8,65 @@ 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, 0x0f, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xb5, 0x96, 0x5d, 0x48, 0x1c, - 0x57, 0x14, 0xc7, 0xb7, 0x49, 0x4b, 0x9a, 0x86, 0x94, 0xa4, 0x49, 0x68, 0x48, 0x42, 0xa0, 0x69, - 0x0a, 0x09, 0x69, 0x9b, 0x10, 0x2c, 0x94, 0x42, 0x10, 0x51, 0xf1, 0xe3, 0xc1, 0x17, 0xf1, 0x45, - 0x88, 0x50, 0x7c, 0x48, 0x62, 0x08, 0x65, 0x83, 0x09, 0xdd, 0x80, 0x8f, 0x62, 0x7d, 0xb0, 0x88, - 0xa0, 0x58, 0x1f, 0x84, 0x68, 0x02, 0x46, 0x90, 0xee, 0x4b, 0x35, 0x89, 0x4b, 0x9a, 0x34, 0x71, - 0xb7, 0xae, 0x71, 0x77, 0xd5, 0xb8, 0x8a, 0xbb, 0x31, 0xda, 0x5d, 0xbf, 0x3f, 0xd6, 0x75, 0xc7, - 0x75, 0xfc, 0x3c, 0xfd, 0x9f, 0xdb, 0x99, 0x61, 0x9c, 0xcc, 0x9a, 0x06, 0x92, 0x0b, 0x3f, 0x58, - 0x98, 0x3b, 0xf7, 0x77, 0xcf, 0xb9, 0xe7, 0x9e, 0x59, 0x8b, 0xc5, 0x62, 0xd9, 0x09, 0xbe, 0x00, - 0x5f, 0xbe, 0x23, 0x0e, 0x13, 0x91, 0xc5, 0x08, 0x8f, 0xd3, 0x03, 0x03, 0x03, 0xe1, 0xa9, 0xa9, - 0x29, 0xc9, 0xc8, 0xa4, 0xca, 0xe4, 0xa4, 0x34, 0xc1, 0x4c, 0x4c, 0x08, 0xc6, 0x99, 0xf1, 0x71, - 0x69, 0x8c, 0x19, 0x1b, 0x93, 0xc2, 0x20, 0x14, 0x0e, 0x4b, 0xff, 0x84, 0xc2, 0x52, 0x6d, 0x6d, - 0xed, 0xef, 0x58, 0xf3, 0x63, 0x33, 0xd1, 0xd7, 0x91, 0x48, 0x44, 0x5e, 0x5c, 0x5c, 0x24, 0x3d, - 0x51, 0x95, 0x68, 0x94, 0x16, 0x98, 0x85, 0x05, 0x8a, 0x80, 0xf9, 0x48, 0x84, 0xe6, 0xe6, 0xe7, - 0x05, 0xb3, 0x73, 0x73, 0x34, 0x33, 0x3b, 0x4b, 0xd3, 0x33, 0x33, 0x04, 0x39, 0x61, 0x33, 0xd4, - 0xda, 0xd6, 0xe6, 0xc4, 0x9a, 0xbb, 0x4d, 0x45, 0x58, 0x48, 0x96, 0x24, 0x89, 0x98, 0x98, 0x9e, - 0x58, 0x8c, 0x16, 0x19, 0x83, 0x54, 0x2f, 0x64, 0xd1, 0x6f, 0x75, 0x75, 0x64, 0xbb, 0x75, 0x8b, - 0x3c, 0x5e, 0x2f, 0xb5, 0x6d, 0x27, 0xc2, 0x02, 0xf2, 0x52, 0x3c, 0x4e, 0x1a, 0x4b, 0x4b, 0x02, - 0x89, 0x31, 0x48, 0x59, 0xa8, 0x46, 0x38, 0x0f, 0xd1, 0xed, 0x86, 0x06, 0x72, 0xbb, 0xdd, 0xb4, - 0xbc, 0xbc, 0x4c, 0x25, 0x25, 0x25, 0x74, 0xe7, 0xee, 0x5d, 0x4f, 0x42, 0x11, 0x76, 0x2c, 0xf3, - 0x44, 0x3d, 0x71, 0x06, 0xd2, 0xb8, 0x22, 0xd6, 0xa4, 0x3a, 0x21, 0xce, 0x88, 0x9a, 0x9a, 0x9a, - 0x68, 0x73, 0x73, 0x93, 0x78, 0xf0, 0xf3, 0xc2, 0xc2, 0xc2, 0x68, 0x52, 0x52, 0xd2, 0x09, 0x53, - 0x11, 0x26, 0xc8, 0x2b, 0x2b, 0x2b, 0xa4, 0x22, 0x33, 0xb2, 0x2c, 0xd0, 0xc4, 0x3a, 0x21, 0x47, - 0xc8, 0x32, 0x4e, 0x5f, 0x55, 0x55, 0x95, 0x88, 0x4c, 0x1d, 0x28, 0x8e, 0x58, 0x46, 0x46, 0x86, - 0x33, 0x35, 0x35, 0xf5, 0x80, 0xa9, 0x68, 0x75, 0x75, 0x95, 0x8c, 0x68, 0x62, 0x16, 0x2a, 0x52, - 0x4d, 0xa8, 0x44, 0x17, 0x0e, 0x87, 0xe9, 0x97, 0xf2, 0x72, 0x31, 0x5f, 0x1d, 0xa1, 0x50, 0xc8, - 0x99, 0x96, 0x96, 0xf6, 0x34, 0x27, 0x27, 0x67, 0xef, 0x16, 0x11, 0x5e, 0x94, 0xd7, 0xd6, 0xd6, - 0xc8, 0x88, 0x51, 0x2a, 0x27, 0x90, 0xf5, 0xf6, 0xf6, 0x52, 0x4d, 0x4d, 0x8d, 0x96, 0x42, 0x1e, - 0xb8, 0x32, 0x8f, 0x11, 0xd9, 0xa3, 0xac, 0xac, 0xac, 0x5d, 0x5b, 0x44, 0xeb, 0xeb, 0xeb, 0xa4, - 0x62, 0x26, 0x65, 0x89, 0xdd, 0x6e, 0xa7, 0xc6, 0xc6, 0x46, 0xaa, 0xaf, 0xaf, 0xa7, 0x3a, 0x54, - 0x5a, 0x75, 0x75, 0xb5, 0x48, 0x5d, 0x45, 0x45, 0x05, 0x95, 0x96, 0x96, 0x52, 0x57, 0x57, 0x17, - 0xe9, 0x07, 0x8a, 0xe4, 0x4f, 0xc8, 0xec, 0x79, 0x79, 0x79, 0x3b, 0x85, 0x08, 0x3b, 0xdc, 0x22, - 0x32, 0x93, 0x72, 0x44, 0x7a, 0xb1, 0xfa, 0x7c, 0x63, 0x63, 0x83, 0xb6, 0x1b, 0xad, 0xad, 0xad, - 0x8f, 0x33, 0x33, 0x33, 0x7f, 0xd5, 0x44, 0xfc, 0x82, 0x11, 0xbd, 0x90, 0x45, 0xc6, 0x4d, 0x88, - 0x79, 0xba, 0x74, 0x99, 0x0d, 0xa4, 0xd6, 0x97, 0x9d, 0x9d, 0x6d, 0x17, 0x22, 0xe4, 0x5d, 0xe6, - 0xfc, 0xaa, 0x98, 0x09, 0x59, 0xd4, 0xd7, 0xd7, 0x47, 0x3e, 0x9f, 0x4f, 0xd0, 0xd3, 0xd3, 0x23, - 0xce, 0xa6, 0xbf, 0xbf, 0x9f, 0xcf, 0x83, 0xfc, 0x7e, 0xbf, 0x28, 0x0c, 0xfd, 0x40, 0xba, 0x07, - 0x73, 0x73, 0x73, 0x87, 0x90, 0xbe, 0x93, 0xa6, 0x22, 0x33, 0x29, 0xa7, 0x2b, 0x10, 0x08, 0x88, - 0x05, 0x59, 0xe0, 0xf1, 0x78, 0xc4, 0x99, 0xb8, 0x5c, 0x2e, 0x72, 0x38, 0x1c, 0x64, 0xb5, 0x5a, - 0x45, 0x91, 0xa8, 0x03, 0x05, 0x34, 0x92, 0x9f, 0x9f, 0x1f, 0x4c, 0x4f, 0x4f, 0x3f, 0xa7, 0x15, - 0x03, 0x8b, 0xcc, 0xc2, 0x36, 0xca, 0x8c, 0xe7, 0xc6, 0xd5, 0xc8, 0x45, 0x82, 0x46, 0x4a, 0x68, - 0xb6, 0xda, 0x7b, 0x98, 0x3b, 0x51, 0x50, 0x50, 0xf0, 0x02, 0x91, 0x5c, 0xd8, 0x52, 0xde, 0x31, - 0xdd, 0x3d, 0x52, 0x0f, 0x5a, 0x2d, 0xd5, 0x37, 0xc9, 0xda, 0xdb, 0xdb, 0xa9, 0xb3, 0xb3, 0x53, - 0x1f, 0xc9, 0x5a, 0x51, 0x51, 0xd1, 0xf3, 0x94, 0x94, 0x94, 0xec, 0xd7, 0x3e, 0x13, 0xa1, 0xb1, - 0xf1, 0xf8, 0xf4, 0xf4, 0x34, 0xe1, 0xd3, 0x40, 0x73, 0xe8, 0xc8, 0xdc, 0x3c, 0x79, 0xa7, 0xbc, - 0xe0, 0x76, 0x32, 0x9e, 0xc7, 0xe5, 0xae, 0xbf, 0x3f, 0x65, 0x65, 0x65, 0xd1, 0xe4, 0xe4, 0xe4, - 0x8b, 0x66, 0x2d, 0xe8, 0x93, 0x62, 0xdb, 0xcf, 0x0d, 0x2f, 0xfc, 0x03, 0x9b, 0x4f, 0x9e, 0xfc, - 0x85, 0x9c, 0xff, 0x2d, 0x0e, 0x77, 0x06, 0xad, 0x9f, 0x2f, 0xa5, 0x99, 0x4c, 0x15, 0xf1, 0x99, - 0x54, 0x56, 0x56, 0x8a, 0x79, 0x3c, 0x9a, 0xee, 0xdd, 0xe3, 0xfb, 0x14, 0x34, 0x6d, 0xaa, 0x8a, - 0xed, 0x80, 0xf5, 0xe6, 0xcd, 0x47, 0xf8, 0xc0, 0xd1, 0xcb, 0x97, 0xc3, 0xd4, 0xd1, 0xe1, 0x24, - 0xa7, 0xd3, 0x25, 0x22, 0xe4, 0x4e, 0xa0, 0xde, 0x15, 0x63, 0x54, 0x9c, 0x3a, 0x3e, 0x9b, 0x72, - 0xb4, 0xa0, 0x96, 0x96, 0x16, 0x6a, 0x6e, 0x6e, 0xa6, 0x76, 0x87, 0xc3, 0x99, 0x50, 0xa4, 0xc8, - 0x8e, 0x5e, 0x2b, 0x2e, 0x76, 0x73, 0xea, 0x78, 0xa1, 0x87, 0x0f, 0x1d, 0xd4, 0x8b, 0x72, 0xc6, - 0x47, 0x51, 0x2c, 0x98, 0x28, 0x2a, 0x7e, 0xc6, 0x1b, 0xea, 0xee, 0xee, 0x16, 0x9b, 0x72, 0xbc, - 0x49, 0xa4, 0xc8, 0xbe, 0xfa, 0xe9, 0xc6, 0x8d, 0x1e, 0x96, 0x79, 0xbd, 0x3e, 0xe2, 0x54, 0xf2, - 0x8e, 0xf9, 0xbc, 0x8c, 0x25, 0xaf, 0x17, 0xa9, 0xbd, 0x90, 0x1b, 0xef, 0xff, 0x12, 0x29, 0xb2, - 0x13, 0x57, 0xac, 0xd6, 0x8e, 0x57, 0x23, 0xa3, 0xd4, 0x76, 0xff, 0x01, 0x0d, 0x0f, 0xbf, 0x12, - 0x67, 0xa1, 0xaf, 0xc2, 0x44, 0x22, 0xf9, 0x6d, 0x44, 0x8a, 0xec, 0xf0, 0xd5, 0xeb, 0xd7, 0xff, - 0x70, 0x7b, 0xbc, 0x1b, 0xef, 0x55, 0xa4, 0xc8, 0xf6, 0xfd, 0x78, 0xe9, 0x72, 0xe5, 0x33, 0x57, - 0xe7, 0x48, 0xbf, 0xdf, 0x3f, 0x1a, 0x08, 0x04, 0x47, 0x83, 0xc1, 0xff, 0x40, 0x87, 0xd0, 0x18, - 0x1a, 0x1a, 0xd2, 0x18, 0x1c, 0x1c, 0x1c, 0xb5, 0xd9, 0x6c, 0x65, 0x78, 0xf7, 0xc3, 0xed, 0x8a, - 0x61, 0x07, 0xff, 0x4d, 0x02, 0x9f, 0x82, 0x83, 0xe0, 0x08, 0xe0, 0x1e, 0xf5, 0x1d, 0xf8, 0x01, - 0x24, 0x83, 0x54, 0x90, 0xa6, 0xc0, 0xbf, 0x53, 0xc0, 0x05, 0xf0, 0x3d, 0x38, 0x0f, 0xbe, 0x01, - 0xc7, 0xc1, 0x7e, 0xb0, 0x07, 0x7c, 0xc4, 0x0b, 0x1b, 0x45, 0x1f, 0x28, 0x0f, 0x78, 0xc2, 0x3e, - 0x70, 0x48, 0x91, 0x1d, 0x57, 0xfe, 0x18, 0x9e, 0x02, 0x67, 0xc0, 0xb7, 0xe0, 0x2c, 0x77, 0x14, - 0xbe, 0xec, 0x5c, 0x40, 0xca, 0x1f, 0xd0, 0x63, 0xe0, 0x73, 0xf0, 0x19, 0xd8, 0xab, 0x6c, 0x7a, - 0x87, 0xba, 0xfe, 0xbf, 0xf5, 0x3f, 0xf0, 0x2e, 0x64, 0x60, 0x78, 0x06, 0x00, 0x00, 0x00, 0x00, + 0xce, 0x00, 0x00, 0x03, 0x9f, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xb5, 0xd5, 0x7b, 0x4c, 0x53, + 0x57, 0x1c, 0x07, 0xf0, 0x3b, 0xe9, 0x7d, 0x34, 0xc6, 0xc5, 0x19, 0x75, 0x86, 0x18, 0x8c, 0x13, + 0xa7, 0x38, 0xa8, 0xd2, 0x56, 0xb9, 0x97, 0xd4, 0xf6, 0xb6, 0x10, 0x47, 0x70, 0x62, 0xf7, 0x72, + 0x9a, 0x0d, 0x0d, 0x2e, 0x95, 0x5b, 0x68, 0x79, 0x14, 0x79, 0x88, 0x2e, 0x2c, 0x12, 0x56, 0x11, + 0x19, 0x2e, 0x99, 0x61, 0xd2, 0x1a, 0x93, 0x86, 0x7f, 0x36, 0xfe, 0x51, 0x16, 0x08, 0x69, 0x78, + 0x88, 0xf2, 0xe8, 0x58, 0xed, 0x2d, 0xf8, 0x98, 0x6c, 0x4b, 0xb6, 0x2c, 0x8c, 0xa1, 0x49, 0xfd, + 0xc7, 0x2c, 0xcb, 0x96, 0xb0, 0xef, 0x4e, 0x6b, 0x87, 0xd3, 0xa8, 0x83, 0xa6, 0x34, 0xf9, 0x26, + 0xe7, 0x8f, 0x7b, 0xcf, 0xe7, 0x9e, 0x73, 0x7e, 0xe7, 0x57, 0x8a, 0xa2, 0xa8, 0x04, 0x92, 0xf5, + 0x24, 0x1b, 0xe2, 0x94, 0x35, 0x00, 0xa8, 0x27, 0x13, 0xfe, 0x6d, 0x69, 0x6f, 0x6f, 0xbf, 0xdd, + 0xdd, 0xdd, 0x3d, 0x1d, 0x6b, 0xba, 0xba, 0xba, 0xa6, 0x3b, 0x3a, 0x3a, 0x66, 0xc2, 0xe3, 0x92, + 0x92, 0x92, 0x76, 0x32, 0x27, 0xf7, 0x34, 0x28, 0xb5, 0xbf, 0xbf, 0x3f, 0x34, 0x3e, 0x3e, 0x8e, + 0x58, 0x22, 0xcb, 0x32, 0x1a, 0x1b, 0x1b, 0x51, 0x58, 0x21, 0x81, 0x7c, 0x30, 0xea, 0xeb, 0xeb, + 0xbf, 0x26, 0x73, 0x2a, 0xe3, 0x0e, 0xb5, 0xb4, 0xb4, 0xa0, 0xe0, 0x62, 0x21, 0x32, 0xbf, 0x30, + 0x41, 0xaa, 0xb6, 0xc2, 0x6e, 0xb7, 0xfb, 0xe2, 0x0e, 0x05, 0x83, 0x41, 0x94, 0x3a, 0x1d, 0x50, + 0x79, 0x32, 0xb1, 0xf5, 0x1c, 0x0f, 0x43, 0xf3, 0x2e, 0xec, 0xd9, 0x97, 0x77, 0x5f, 0xa7, 0xd3, + 0x65, 0xc7, 0x7d, 0x45, 0xad, 0xad, 0xad, 0x38, 0x7c, 0xd1, 0x1a, 0x81, 0xb6, 0x39, 0x79, 0x64, + 0xd6, 0x1a, 0x7e, 0x37, 0xe5, 0x98, 0x64, 0xa3, 0xd1, 0xa8, 0x89, 0x2b, 0x14, 0x08, 0x04, 0x50, + 0xf7, 0x71, 0x1d, 0xde, 0x76, 0x1f, 0x88, 0x40, 0xea, 0x5a, 0x1e, 0xda, 0x22, 0x7e, 0x52, 0xcc, + 0x32, 0xde, 0xd0, 0xeb, 0xf5, 0x29, 0x31, 0x41, 0x63, 0x63, 0x63, 0xf0, 0xf9, 0x7c, 0x18, 0x1d, + 0x1d, 0xc5, 0xc8, 0xc8, 0x08, 0x86, 0x87, 0x87, 0x31, 0x34, 0x34, 0x84, 0x9e, 0x9e, 0x1e, 0x58, + 0xcb, 0x8a, 0x90, 0xf5, 0x69, 0x6e, 0x04, 0xd2, 0xd8, 0x78, 0xec, 0xc8, 0xe7, 0x83, 0x7a, 0x51, + 0x3f, 0x99, 0x9e, 0x9e, 0xbe, 0x6e, 0x41, 0xd0, 0xd5, 0xc9, 0x21, 0x34, 0x5c, 0x69, 0x42, 0xed, + 0xa5, 0x3a, 0x54, 0x7f, 0x79, 0x02, 0x95, 0x9e, 0x63, 0x70, 0xb8, 0xaa, 0x50, 0x7a, 0xae, 0x02, + 0xb6, 0xe6, 0x52, 0x58, 0x3f, 0xb1, 0xe1, 0xc3, 0xa6, 0xc2, 0x39, 0x68, 0xfb, 0x21, 0x1e, 0xbc, + 0x59, 0xf8, 0x46, 0xa3, 0xd1, 0xdc, 0x54, 0xa9, 0x54, 0xab, 0xe7, 0x0d, 0x7d, 0x36, 0x75, 0x1e, + 0xc9, 0x0f, 0x04, 0xbc, 0x3a, 0x2d, 0x60, 0xd3, 0x1d, 0x01, 0x29, 0xdf, 0x0a, 0xd8, 0xd2, 0x27, + 0x20, 0xf5, 0x92, 0x80, 0x34, 0x8f, 0x30, 0x77, 0x46, 0xff, 0x85, 0x76, 0xbc, 0x49, 0x30, 0x13, + 0x7f, 0x4d, 0xad, 0x56, 0x77, 0x2f, 0x3a, 0x94, 0x91, 0x95, 0xe1, 0x23, 0xab, 0xf2, 0xce, 0x1b, + 0xea, 0xff, 0xfe, 0x0a, 0xea, 0x46, 0x9d, 0xa8, 0xea, 0xf9, 0x08, 0x15, 0x97, 0x6b, 0xe1, 0xf8, + 0xaa, 0x06, 0xa5, 0x9e, 0x4a, 0xd8, 0x5d, 0x0e, 0xd8, 0x3e, 0x2f, 0x83, 0xd4, 0x54, 0x8c, 0xc3, + 0xcd, 0x47, 0x1e, 0x83, 0x32, 0xcc, 0xbc, 0x4c, 0x90, 0x3b, 0x24, 0x49, 0xf3, 0x86, 0x26, 0x26, + 0x26, 0x22, 0x05, 0x30, 0x38, 0x38, 0x88, 0x81, 0x81, 0x01, 0x90, 0x77, 0xd0, 0xd7, 0xd7, 0x87, + 0xde, 0xde, 0x5e, 0x74, 0x76, 0x76, 0x42, 0xb2, 0x5b, 0xf1, 0xfa, 0xd9, 0xbc, 0x47, 0xc5, 0x70, + 0x90, 0xbf, 0x4d, 0x8a, 0xe1, 0x07, 0x82, 0x6c, 0x8e, 0x5b, 0x0b, 0x6a, 0x68, 0x68, 0xc0, 0x7b, + 0xee, 0xfc, 0x47, 0x5b, 0x57, 0xcc, 0xff, 0x24, 0x66, 0x8b, 0xb7, 0x44, 0x51, 0xd4, 0xc6, 0xed, + 0x1e, 0xb9, 0xdd, 0x6e, 0x58, 0xdc, 0xc5, 0x73, 0x67, 0x24, 0x1c, 0xd7, 0xff, 0x21, 0xe6, 0x18, + 0x03, 0x04, 0x11, 0xe3, 0xdc, 0x82, 0xca, 0xe7, 0x5a, 0x90, 0xee, 0x4c, 0x36, 0xde, 0x38, 0x90, + 0x17, 0x22, 0x17, 0xf5, 0xad, 0xa7, 0xb5, 0xa0, 0x14, 0xaf, 0xd7, 0x7b, 0x37, 0xd6, 0x15, 0x39, + 0x4f, 0x39, 0x91, 0xef, 0xb1, 0x20, 0xa3, 0xd5, 0x80, 0xc2, 0x63, 0x12, 0x24, 0x49, 0x0a, 0x3c, + 0xab, 0xa9, 0x2e, 0xb5, 0x48, 0x05, 0x17, 0x26, 0xbe, 0xbb, 0xfe, 0x57, 0x40, 0xf6, 0x47, 0xf6, + 0x7c, 0x21, 0x90, 0xdf, 0xef, 0xc7, 0xc9, 0xfa, 0x93, 0x90, 0x6a, 0x8a, 0xe0, 0x72, 0xb9, 0x9e, + 0xfd, 0x37, 0x11, 0xd5, 0x56, 0x96, 0x57, 0xda, 0xbc, 0x77, 0xef, 0xcd, 0xe0, 0xb7, 0x7b, 0x53, + 0xb8, 0x71, 0xf3, 0x61, 0xbb, 0x59, 0x48, 0x41, 0x84, 0x2b, 0x30, 0x3c, 0x7e, 0x2e, 0x14, 0xc5, + 0xd6, 0x1e, 0xad, 0x29, 0x1b, 0x09, 0x85, 0x42, 0x98, 0x9d, 0x9d, 0x45, 0x78, 0x75, 0xb1, 0x6c, + 0xe5, 0xff, 0x42, 0x51, 0x6c, 0x63, 0xf5, 0x71, 0x87, 0x1c, 0xc6, 0x7e, 0x9e, 0xfa, 0x31, 0x72, + 0xd8, 0x8b, 0x02, 0x45, 0xb1, 0x57, 0xca, 0xab, 0xec, 0x57, 0x7f, 0x9d, 0xf9, 0xe5, 0x6f, 0x59, + 0x0e, 0x2c, 0x1e, 0x14, 0xc5, 0xd6, 0xd8, 0x1c, 0xd6, 0xcb, 0xc1, 0x5b, 0xfe, 0x3f, 0x17, 0x15, + 0x8a, 0x62, 0xcb, 0xf7, 0xbf, 0xbf, 0xef, 0x74, 0x5b, 0x5b, 0x9b, 0x9f, 0x5c, 0xca, 0xeb, 0xf3, + 0x8d, 0xd9, 0x6c, 0x3e, 0x41, 0xde, 0x55, 0x3c, 0xaf, 0x18, 0x96, 0x50, 0x54, 0x22, 0x47, 0x51, + 0xdb, 0x5e, 0xa4, 0x69, 0xc3, 0x4a, 0x8e, 0xdb, 0x9d, 0x48, 0xd3, 0x7b, 0x93, 0x19, 0x26, 0x77, + 0x3b, 0xcb, 0xbe, 0x9b, 0xc9, 0x30, 0x07, 0x0d, 0x2c, 0x6b, 0xc9, 0x62, 0xd9, 0xa2, 0x6c, 0x96, + 0xb5, 0x92, 0x1c, 0x21, 0xe3, 0x02, 0x23, 0xc3, 0xec, 0xdf, 0x49, 0xd3, 0x79, 0xbc, 0x42, 0x61, + 0x52, 0x2b, 0x14, 0xda, 0xb4, 0x84, 0x04, 0x6d, 0x12, 0xc3, 0x68, 0x5f, 0xa2, 0xa8, 0xe4, 0xa5, + 0x14, 0xb5, 0x8a, 0x0e, 0x4f, 0xfc, 0x24, 0xf4, 0x02, 0xa9, 0x72, 0x3a, 0xfc, 0x00, 0xc3, 0xa8, + 0x97, 0xd3, 0xb4, 0x69, 0x15, 0xc7, 0xed, 0x4d, 0x64, 0x98, 0x0f, 0x92, 0x38, 0xce, 0xb2, 0x81, + 0x65, 0x4b, 0x36, 0x2b, 0x95, 0x47, 0x5f, 0xe3, 0xb8, 0x2a, 0x15, 0xc7, 0xd5, 0x6c, 0x55, 0x2a, + 0xab, 0x53, 0x59, 0xb6, 0x3c, 0x85, 0xe3, 0xa4, 0x8d, 0x0c, 0x73, 0x68, 0x3d, 0xcb, 0xbe, 0xb3, + 0x56, 0xa1, 0xc8, 0x79, 0x99, 0xa6, 0x75, 0x2b, 0x28, 0x2a, 0x6d, 0xd9, 0xc3, 0x8f, 0xa6, 0x96, + 0xfc, 0x3b, 0xff, 0x3f, 0xa9, 0xa3, 0xc3, 0x80, 0xb9, 0x3a, 0x7a, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, }; diff --git a/bitmaps_png/cpp_26/hierarchy_nav.cpp b/bitmaps_png/cpp_26/hierarchy_nav.cpp index 41436bb34a..899cc878bd 100644 --- a/bitmaps_png/cpp_26/hierarchy_nav.cpp +++ b/bitmaps_png/cpp_26/hierarchy_nav.cpp @@ -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" }}; diff --git a/bitmaps_png/sources/export.svg b/bitmaps_png/sources/export.svg index 9aaa672a91..6ca07ed9fa 100644 --- a/bitmaps_png/sources/export.svg +++ b/bitmaps_png/sources/export.svg @@ -13,7 +13,7 @@ version="1.1" viewBox="0 0 48 48" id="svg2" - inkscape:version="0.47 r22583" + inkscape:version="0.48.1 " sodipodi:docname="export.svg"> @@ -23,7 +23,7 @@ image/svg+xml - + @@ -37,14 +37,14 @@ inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-width="1280" - inkscape:window-height="949" + inkscape:window-height="968" id="namedview131" showgrid="false" - inkscape:zoom="4.9166667" - inkscape:cx="52.043263" - inkscape:cy="23.59322" - inkscape:window-x="0" - inkscape:window-y="25" + inkscape:zoom="15.902799" + inkscape:cx="14.345661" + inkscape:cy="26.023752" + inkscape:window-x="-4" + inkscape:window-y="-4" inkscape:window-maximized="1" inkscape:current-layer="svg2" /> + id="stop12-2" + style="stop-color:#c1b7df;stop-opacity:1;" /> + id="stop53-1" + style="stop-color:#e8f71e;stop-opacity:1;" /> + id="stop58-0" + style="stop-color:#23ff39;stop-opacity:1;" /> + id="stop7-2" + style="stop-color:#1212f7;stop-opacity:1;" /> + style="stop-color:#272727;stop-opacity:1;" /> + id="stop82-1" + style="stop-color:#60d7b7;stop-opacity:1;" /> + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + d="m 37.753181,0.7945687 c 0.817941,0 1.48312,0.6617169 1.48312,1.4754 V 42.843469 c 0,1.220524 -0.997769,2.2131 -2.22468,2.2131 H 15.071827 c -0.481643,0 -0.943635,-0.17963 -1.35001,-0.499423 -0.04746,-0.01955 -0.09529,-0.03947 -0.09529,-0.03947 C 13.59019,44.490753 9.1274819,40.797458 7.0418444,38.722676 5.0492727,36.741583 1.6247486,32.664315 1.2406205,32.206204 0.9032107,31.880878 0.6770349,31.306578 0.6770349,30.734861 V 2.2699687 c 0,-0.8136831 0.6651793,-1.4754 1.48312,-1.4754 H 37.755035 z" + id="path103-7" + style="opacity:0.1" + inkscape:connector-curvature="0" /> + + + + + + + + - - - - + + diff --git a/bitmaps_png/sources/hierarchy_nav.svg b/bitmaps_png/sources/hierarchy_nav.svg index b5786b041b..bfb0c31a8f 100644 --- a/bitmaps_png/sources/hierarchy_nav.svg +++ b/bitmaps_png/sources/hierarchy_nav.svg @@ -1,51 +1,292 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eeschema/eeschema_config.cpp b/eeschema/eeschema_config.cpp index 1b2e59e53c..1ce4b12561 100644 --- a/eeschema/eeschema_config.cpp +++ b/eeschema/eeschema_config.cpp @@ -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" ), diff --git a/eeschema/getpart.cpp b/eeschema/getpart.cpp index 1f16b3d621..d599f785d7 100644 --- a/eeschema/getpart.cpp +++ b/eeschema/getpart.cpp @@ -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 ); diff --git a/eeschema/netlist_control.cpp b/eeschema/netlist_control.cpp index c95244c35d..8a89a3d88e 100644 --- a/eeschema/netlist_control.cpp +++ b/eeschema/netlist_control.cpp @@ -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; @@ -462,14 +486,14 @@ void NETLIST_DIALOG::SelectNetlistType( wxCommandEvent& event ) for( ii = 0; ii < PANELCUSTOMBASE + CUSTOMPANEL_COUNTMAX; ii++ ) if( m_PanelNetType[ii] ) - m_PanelNetType[ii]->m_IsCurrentFormat->SetValue( false ); + m_PanelNetType[ii]->m_IsCurrentFormat->SetValue( false ); CurrPage = (NETLIST_PAGE_DIALOG*) m_NoteBook->GetCurrentPage(); 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 { diff --git a/eeschema/netlist_control.h b/eeschema/netlist_control.h index 2c5c2627f5..b5373e1d5c 100644 --- a/eeschema/netlist_control.h +++ b/eeschema/netlist_control.h @@ -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; } }; @@ -92,8 +104,8 @@ 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_NETNAMES = 1, // for Spice netlist : use netnames instead of numbers + 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]; diff --git a/eeschema/sch_component.cpp b/eeschema/sch_component.cpp index 46f186b60b..a8d7ff0d12 100644 --- a/eeschema/sch_component.cpp +++ b/eeschema/sch_component.cpp @@ -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() ); } diff --git a/eeschema/schframe.cpp b/eeschema/schframe.cpp index 6a660b7dc0..445c8b9ff7 100644 --- a/eeschema/schframe.cpp +++ b/eeschema/schframe.cpp @@ -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 ); diff --git a/include/wxEeschemaStruct.h b/include/wxEeschemaStruct.h index 5a18e53dd1..4413fb3709 100644 --- a/include/wxEeschemaStruct.h +++ b/include/wxEeschemaStruct.h @@ -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; } diff --git a/pcbnew/dialogs/dialog_pad_properties_base.cpp b/pcbnew/dialogs/dialog_pad_properties_base.cpp index 02f196d276..bb09e94654 100644 --- a/pcbnew/dialogs/dialog_pad_properties_base.cpp +++ b/pcbnew/dialogs/dialog_pad_properties_base.cpp @@ -24,184 +24,185 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind wxBoxSizer* m_LeftBoxSizer; m_LeftBoxSizer = new wxBoxSizer( wxVERTICAL ); - wxFlexGridSizer* fgSizer5; - fgSizer5 = new wxFlexGridSizer( 0, 2, 0, 0 ); - fgSizer5->AddGrowableCol( 1 ); - fgSizer5->SetFlexibleDirection( wxBOTH ); - fgSizer5->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + wxFlexGridSizer* fgSizerPadType; + fgSizerPadType = new wxFlexGridSizer( 0, 2, 0, 0 ); + fgSizerPadType->AddGrowableCol( 1 ); + fgSizerPadType->SetFlexibleDirection( wxBOTH ); + fgSizerPadType->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); m_PadNumText = new wxStaticText( m_panel2, wxID_ANY, _("Pad number:"), wxDefaultPosition, wxDefaultSize, 0 ); m_PadNumText->Wrap( -1 ); - fgSizer5->Add( m_PadNumText, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); + fgSizerPadType->Add( m_PadNumText, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); m_PadNumCtrl = new wxTextCtrl( m_panel2, wxID_PADNUMCTRL, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer5->Add( m_PadNumCtrl, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); + fgSizerPadType->Add( m_PadNumCtrl, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); m_PadNameText = new wxStaticText( m_panel2, wxID_ANY, _("Net name:"), wxDefaultPosition, wxDefaultSize, 0 ); m_PadNameText->Wrap( -1 ); - fgSizer5->Add( m_PadNameText, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); + fgSizerPadType->Add( m_PadNameText, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); m_PadNetNameCtrl = new wxTextCtrl( m_panel2, wxID_PADNETNAMECTRL, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer5->Add( m_PadNetNameCtrl, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + fgSizerPadType->Add( m_PadNetNameCtrl, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); m_staticText44 = new wxStaticText( m_panel2, wxID_ANY, _("Pad type:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText44->Wrap( -1 ); - fgSizer5->Add( m_staticText44, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + fgSizerPadType->Add( m_staticText44, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); wxString m_PadTypeChoices[] = { _("Through-hole"), _("SMD"), _("Connector"), _("NPTH, Mechanical") }; int m_PadTypeNChoices = sizeof( m_PadTypeChoices ) / sizeof( wxString ); m_PadType = new wxChoice( m_panel2, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_PadTypeNChoices, m_PadTypeChoices, 0 ); m_PadType->SetSelection( 0 ); - fgSizer5->Add( m_PadType, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + fgSizerPadType->Add( m_PadType, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - m_LeftBoxSizer->Add( fgSizer5, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); + m_LeftBoxSizer->Add( fgSizerPadType, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); - wxFlexGridSizer* fgSizer6; - fgSizer6 = new wxFlexGridSizer( 0, 3, 0, 0 ); - fgSizer6->SetFlexibleDirection( wxBOTH ); - fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + wxFlexGridSizer* fgSizerShapeType; + fgSizerShapeType = new wxFlexGridSizer( 0, 3, 0, 0 ); + fgSizerShapeType->AddGrowableCol( 1 ); + fgSizerShapeType->SetFlexibleDirection( wxBOTH ); + fgSizerShapeType->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); m_staticText4 = new wxStaticText( m_panel2, wxID_ANY, _("Position X:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText4->Wrap( -1 ); - fgSizer6->Add( m_staticText4, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT, 5 ); + fgSizerShapeType->Add( m_staticText4, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT, 5 ); m_PadPosition_X_Ctrl = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer6->Add( m_PadPosition_X_Ctrl, 0, wxTOP|wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerShapeType->Add( m_PadPosition_X_Ctrl, 0, wxTOP|wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); m_PadPosX_Unit = new wxStaticText( m_panel2, wxID_ANY, _("Inch"), wxDefaultPosition, wxDefaultSize, 0 ); m_PadPosX_Unit->Wrap( -1 ); - fgSizer6->Add( m_PadPosX_Unit, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT, 5 ); + fgSizerShapeType->Add( m_PadPosX_Unit, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT, 5 ); m_staticText41 = new wxStaticText( m_panel2, wxID_ANY, _("Position Y:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText41->Wrap( -1 ); - fgSizer6->Add( m_staticText41, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 ); + fgSizerShapeType->Add( m_staticText41, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 ); m_PadPosition_Y_Ctrl = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer6->Add( m_PadPosition_Y_Ctrl, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + fgSizerShapeType->Add( m_PadPosition_Y_Ctrl, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_PadPosY_Unit = new wxStaticText( m_panel2, wxID_ANY, _("Inch"), wxDefaultPosition, wxDefaultSize, 0 ); m_PadPosY_Unit->Wrap( -1 ); - fgSizer6->Add( m_PadPosY_Unit, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 ); + fgSizerShapeType->Add( m_PadPosY_Unit, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 ); m_staticText45 = new wxStaticText( m_panel2, wxID_ANY, _("Shape:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText45->Wrap( -1 ); - fgSizer6->Add( m_staticText45, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerShapeType->Add( m_staticText45, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 ); wxString m_PadShapeChoices[] = { _("Circular"), _("Oval"), _("Rectangular"), _("Trapezoidal") }; int m_PadShapeNChoices = sizeof( m_PadShapeChoices ) / sizeof( wxString ); m_PadShape = new wxChoice( m_panel2, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_PadShapeNChoices, m_PadShapeChoices, 0 ); m_PadShape->SetSelection( 0 ); - fgSizer6->Add( m_PadShape, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); + fgSizerShapeType->Add( m_PadShape, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); - fgSizer6->Add( 0, 0, 0, wxEXPAND, 5 ); + fgSizerShapeType->Add( 0, 0, 0, wxEXPAND, 5 ); m_staticText12 = new wxStaticText( m_panel2, wxID_ANY, _("Size X:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText12->Wrap( -1 ); - fgSizer6->Add( m_staticText12, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT, 5 ); + fgSizerShapeType->Add( m_staticText12, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT, 5 ); m_ShapeSize_X_Ctrl = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer6->Add( m_ShapeSize_X_Ctrl, 0, wxTOP|wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerShapeType->Add( m_ShapeSize_X_Ctrl, 0, wxTOP|wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); m_PadShapeSizeX_Unit = new wxStaticText( m_panel2, wxID_ANY, _("Inch"), wxDefaultPosition, wxDefaultSize, 0 ); m_PadShapeSizeX_Unit->Wrap( -1 ); - fgSizer6->Add( m_PadShapeSizeX_Unit, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT, 5 ); + fgSizerShapeType->Add( m_PadShapeSizeX_Unit, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT, 5 ); m_staticText15 = new wxStaticText( m_panel2, wxID_ANY, _("Size Y:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText15->Wrap( -1 ); - fgSizer6->Add( m_staticText15, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT, 5 ); + fgSizerShapeType->Add( m_staticText15, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT, 5 ); m_ShapeSize_Y_Ctrl = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer6->Add( m_ShapeSize_Y_Ctrl, 0, wxTOP|wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerShapeType->Add( m_ShapeSize_Y_Ctrl, 0, wxTOP|wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); m_PadShapeSizeY_Unit = new wxStaticText( m_panel2, wxID_ANY, _("Inch"), wxDefaultPosition, wxDefaultSize, 0 ); m_PadShapeSizeY_Unit->Wrap( -1 ); - fgSizer6->Add( m_PadShapeSizeY_Unit, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT, 5 ); + fgSizerShapeType->Add( m_PadShapeSizeY_Unit, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT, 5 ); m_staticText48 = new wxStaticText( m_panel2, wxID_ANY, _("Orientation:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText48->Wrap( -1 ); - fgSizer6->Add( m_staticText48, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT, 5 ); + fgSizerShapeType->Add( m_staticText48, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT, 5 ); wxString m_PadOrientChoices[] = { _("0"), _("90"), _("-90"), _("180"), _("Custom") }; int m_PadOrientNChoices = sizeof( m_PadOrientChoices ) / sizeof( wxString ); m_PadOrient = new wxChoice( m_panel2, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_PadOrientNChoices, m_PadOrientChoices, 0 ); m_PadOrient->SetSelection( 0 ); - fgSizer6->Add( m_PadOrient, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT, 5 ); + fgSizerShapeType->Add( m_PadOrient, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT|wxLEFT, 5 ); m_staticText491 = new wxStaticText( m_panel2, wxID_ANY, _("deg"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText491->Wrap( -1 ); - fgSizer6->Add( m_staticText491, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT, 5 ); + fgSizerShapeType->Add( m_staticText491, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT, 5 ); m_PadOrientText = new wxStaticText( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_PadOrientText->Wrap( -1 ); - fgSizer6->Add( m_PadOrientText, 0, wxTOP|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerShapeType->Add( m_PadOrientText, 0, wxTOP|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); m_PadOrientCtrl = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer6->Add( m_PadOrientCtrl, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerShapeType->Add( m_PadOrientCtrl, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); m_customOrientUnits = new wxStaticText( m_panel2, wxID_ANY, _("0.1 deg"), wxDefaultPosition, wxDefaultSize, 0 ); m_customOrientUnits->Wrap( -1 ); - fgSizer6->Add( m_customOrientUnits, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT, 5 ); + fgSizerShapeType->Add( m_customOrientUnits, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT, 5 ); m_staticText17 = new wxStaticText( m_panel2, wxID_ANY, _("Shape offset X:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText17->Wrap( -1 ); - fgSizer6->Add( m_staticText17, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT, 5 ); + fgSizerShapeType->Add( m_staticText17, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT, 5 ); m_ShapeOffset_X_Ctrl = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer6->Add( m_ShapeOffset_X_Ctrl, 0, wxTOP|wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerShapeType->Add( m_ShapeOffset_X_Ctrl, 0, wxTOP|wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); m_PadShapeOffsetX_Unit = new wxStaticText( m_panel2, wxID_ANY, _("Inch"), wxDefaultPosition, wxDefaultSize, 0 ); m_PadShapeOffsetX_Unit->Wrap( -1 ); - fgSizer6->Add( m_PadShapeOffsetX_Unit, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT, 5 ); + fgSizerShapeType->Add( m_PadShapeOffsetX_Unit, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT, 5 ); m_staticText19 = new wxStaticText( m_panel2, wxID_ANY, _("Shape offset Y:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText19->Wrap( -1 ); - fgSizer6->Add( m_staticText19, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT, 5 ); + fgSizerShapeType->Add( m_staticText19, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT, 5 ); m_ShapeOffset_Y_Ctrl = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer6->Add( m_ShapeOffset_Y_Ctrl, 0, wxTOP|wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerShapeType->Add( m_ShapeOffset_Y_Ctrl, 0, wxTOP|wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); m_PadShapeOffsetY_Unit = new wxStaticText( m_panel2, wxID_ANY, _("Inch"), wxDefaultPosition, wxDefaultSize, 0 ); m_PadShapeOffsetY_Unit->Wrap( -1 ); - fgSizer6->Add( m_PadShapeOffsetY_Unit, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT, 5 ); + fgSizerShapeType->Add( m_PadShapeOffsetY_Unit, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT, 5 ); m_staticText38 = new wxStaticText( m_panel2, wxID_ANY, _("Die length:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText38->Wrap( -1 ); m_staticText38->SetToolTip( _("Wire length from pad to die on chip ( used to calculate actual track length)") ); - fgSizer6->Add( m_staticText38, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT, 5 ); + fgSizerShapeType->Add( m_staticText38, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT, 5 ); m_LengthDieCtrl = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer6->Add( m_LengthDieCtrl, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); + fgSizerShapeType->Add( m_LengthDieCtrl, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); m_PadLengthDie_Unit = new wxStaticText( m_panel2, wxID_ANY, _("Inch"), wxDefaultPosition, wxDefaultSize, 0 ); m_PadLengthDie_Unit->Wrap( -1 ); - fgSizer6->Add( m_PadLengthDie_Unit, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT, 5 ); + fgSizerShapeType->Add( m_PadLengthDie_Unit, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT, 5 ); m_staticText21 = new wxStaticText( m_panel2, wxID_ANY, _("Trap. delta dim:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText21->Wrap( -1 ); - fgSizer6->Add( m_staticText21, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT, 5 ); + fgSizerShapeType->Add( m_staticText21, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT, 5 ); m_ShapeDelta_Ctrl = new wxTextCtrl( m_panel2, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer6->Add( m_ShapeDelta_Ctrl, 0, wxTOP|wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizerShapeType->Add( m_ShapeDelta_Ctrl, 0, wxTOP|wxRIGHT|wxLEFT|wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); m_PadShapeDelta_Unit = new wxStaticText( m_panel2, wxID_ANY, _("Inch"), wxDefaultPosition, wxDefaultSize, 0 ); m_PadShapeDelta_Unit->Wrap( -1 ); - fgSizer6->Add( m_PadShapeDelta_Unit, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT, 5 ); + fgSizerShapeType->Add( m_PadShapeDelta_Unit, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxRIGHT, 5 ); m_staticText23 = new wxStaticText( m_panel2, wxID_ANY, _("Trap. direction:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText23->Wrap( -1 ); - fgSizer6->Add( m_staticText23, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxTOP|wxLEFT, 5 ); + fgSizerShapeType->Add( m_staticText23, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxTOP|wxLEFT, 5 ); wxString m_trapDeltaDirChoiceChoices[] = { _("Horiz."), _("Vert.") }; int m_trapDeltaDirChoiceNChoices = sizeof( m_trapDeltaDirChoiceChoices ) / sizeof( wxString ); m_trapDeltaDirChoice = new wxChoice( m_panel2, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_trapDeltaDirChoiceNChoices, m_trapDeltaDirChoiceChoices, 0 ); m_trapDeltaDirChoice->SetSelection( 0 ); - fgSizer6->Add( m_trapDeltaDirChoice, 0, wxEXPAND|wxALL, 5 ); + fgSizerShapeType->Add( m_trapDeltaDirChoice, 0, wxEXPAND|wxALL, 5 ); - m_LeftBoxSizer->Add( fgSizer6, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); + m_LeftBoxSizer->Add( fgSizerShapeType, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); wxBoxSizer* bMiddleUpperSizer; bMiddleUpperSizer = new wxBoxSizer( wxHORIZONTAL ); @@ -333,7 +334,7 @@ DIALOG_PAD_PROPERTIES_BASE::DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWind m_LayersSizer->Add( bSizer11, 0, wxEXPAND, 5 ); wxStaticBoxSizer* sbSizerTechlayers; - sbSizerTechlayers = new wxStaticBoxSizer( new wxStaticBox( m_panel2, wxID_ANY, _("Technical") ), wxVERTICAL ); + sbSizerTechlayers = new wxStaticBoxSizer( new wxStaticBox( m_panel2, wxID_ANY, _("Technical Layers") ), wxVERTICAL ); m_PadLayerAdhCmp = new wxCheckBox( m_panel2, wxID_ANY, _("Adhesive Cmp"), wxDefaultPosition, wxDefaultSize, 0 ); sbSizerTechlayers->Add( m_PadLayerAdhCmp, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); diff --git a/pcbnew/dialogs/dialog_pad_properties_base.fbp b/pcbnew/dialogs/dialog_pad_properties_base.fbp index df88164010..5de2b17330 100644 --- a/pcbnew/dialogs/dialog_pad_properties_base.fbp +++ b/pcbnew/dialogs/dialog_pad_properties_base.fbp @@ -318,7 +318,7 @@ 0 - fgSizer5 + fgSizerPadType wxFLEX_GROWMODE_SPECIFIED none 0 @@ -863,11 +863,11 @@ 3 wxBOTH - + 1 0 - fgSizer6 + fgSizerShapeType wxFLEX_GROWMODE_SPECIFIED none 0 @@ -5420,7 +5420,7 @@ 0 wxID_ANY - Technical + Technical Layers sbSizerTechlayers wxVERTICAL