Update .cpp icon files not updated in previous commit.

Fix minor issues.
Fic compil issue in dimension.cpp with wxMSW 2.8.12 (wxMSW 2.8.12 only).
parent b5368e36
......@@ -8,27 +8,34 @@
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, 0x01, 0x2f, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0xf8, 0xff, 0xff, 0x3f,
0x03, 0x3d, 0x30, 0xc3, 0xa8, 0x45, 0x43, 0xc7, 0x22, 0x20, 0x8b, 0x49, 0x41, 0xe1, 0x3f, 0x07,
0x3e, 0x0c, 0x52, 0x43, 0xb1, 0x45, 0xda, 0xda, 0xff, 0x3d, 0x74, 0x74, 0xfe, 0xff, 0xc7, 0x87,
0x81, 0x6a, 0x22, 0x28, 0xb6, 0x48, 0x53, 0xf3, 0x87, 0x17, 0x21, 0x8b, 0xb4, 0xb4, 0xbe, 0x45,
0x03, 0xbd, 0xce, 0x48, 0xb6, 0x45, 0x40, 0xc0, 0xa4, 0xa2, 0x72, 0x2d, 0x8c, 0x90, 0x45, 0x4a,
0x4a, 0x27, 0x0a, 0x80, 0x6a, 0xd9, 0x29, 0xb1, 0x88, 0x59, 0x4a, 0xaa, 0xcf, 0x40, 0x5e, 0x7e,
0x7d, 0x8f, 0xac, 0xec, 0xd2, 0x29, 0x30, 0xac, 0xa1, 0xf1, 0xe2, 0x3a, 0xb2, 0x45, 0x0a, 0x0a,
0x7b, 0xcb, 0x81, 0x6a, 0xb9, 0x28, 0xb2, 0x08, 0x88, 0xc5, 0x81, 0xd8, 0x05, 0x88, 0x03, 0x61,
0x58, 0x55, 0xf5, 0xda, 0x7e, 0x54, 0x8b, 0xf6, 0x50, 0x6c, 0x11, 0x13, 0x10, 0xf3, 0x02, 0xb1,
0x26, 0x10, 0x1b, 0x42, 0xb1, 0x89, 0xba, 0xfa, 0xdd, 0x9d, 0x54, 0xb5, 0x08, 0xc9, 0x32, 0x56,
0x20, 0x66, 0x83, 0x62, 0x5e, 0x4d, 0xcd, 0x17, 0x1b, 0xa8, 0x6e, 0x11, 0x86, 0x04, 0x30, 0xd2,
0x35, 0x35, 0x5f, 0xad, 0x1f, 0xb5, 0x68, 0xd4, 0x22, 0xac, 0x16, 0x69, 0x6a, 0xbe, 0x3e, 0xa0,
0xa5, 0xf5, 0xbd, 0x17, 0x58, 0xe6, 0x75, 0x10, 0x8b, 0xc9, 0xb2, 0x88, 0x1c, 0x0c, 0x2b, 0x1b,
0xe9, 0x61, 0x11, 0x27, 0x38, 0x8f, 0xe2, 0xb3, 0x48, 0x5d, 0xfd, 0xf1, 0x3c, 0x6d, 0xed, 0xaf,
0x2f, 0xb5, 0xb4, 0xbe, 0xbc, 0x02, 0x61, 0x6d, 0x6d, 0x10, 0xfe, 0xfa, 0x92, 0x78, 0xfc, 0xed,
0x05, 0xd0, 0x1c, 0x39, 0x70, 0x41, 0x80, 0xcf, 0x22, 0x20, 0x56, 0x07, 0x62, 0x1f, 0x20, 0x0e,
0x25, 0x13, 0x7b, 0x03, 0xb1, 0x12, 0xb8, 0xa4, 0xc1, 0x63, 0x11, 0xa8, 0x18, 0x52, 0x06, 0x62,
0x57, 0x20, 0xf6, 0x25, 0x13, 0x83, 0x0a, 0x69, 0x79, 0x42, 0x3e, 0x82, 0x15, 0xb4, 0x92, 0x40,
0x2c, 0x4b, 0x26, 0x06, 0xe9, 0xe5, 0xc6, 0x1b, 0x47, 0x50, 0xcb, 0x18, 0xa1, 0x55, 0x08, 0x25,
0x18, 0x9c, 0xea, 0x00, 0x61, 0xa6, 0xf6, 0x45, 0x7b, 0x71, 0x79, 0xd2, 0x00, 0x00, 0x00, 0x00,
0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
0xce, 0x00, 0x00, 0x01, 0x99, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xdd, 0xd4, 0x3b, 0x4f, 0xc2,
0x50, 0x14, 0xc0, 0xf1, 0x8b, 0x6d, 0xaf, 0xb7, 0x0f, 0xa8, 0x0d, 0xa9, 0x14, 0x84, 0xa6, 0x0a,
0x58, 0x92, 0x16, 0x34, 0x42, 0x48, 0xf0, 0x45, 0x51, 0x13, 0x1d, 0xdc, 0x0c, 0x1a, 0xdf, 0x88,
0x9f, 0xc2, 0xd1, 0xd5, 0xc5, 0xdd, 0xd9, 0x38, 0x39, 0xb9, 0xe8, 0x47, 0xd2, 0xc1, 0x0f, 0xe0,
0xe2, 0xf5, 0x54, 0x19, 0x0c, 0x4d, 0x2c, 0xd2, 0x8b, 0x83, 0xc3, 0x3f, 0x69, 0x93, 0xf6, 0xfc,
0xd2, 0xe4, 0xf6, 0x20, 0x4a, 0x29, 0xfa, 0x8b, 0xd0, 0xff, 0x86, 0xe0, 0x2e, 0x06, 0x8d, 0x79,
0x1e, 0xe5, 0x1d, 0x87, 0x62, 0xcb, 0xa2, 0xa4, 0xd1, 0xa0, 0x62, 0xa5, 0x42, 0x65, 0xdb, 0xa6,
0xf1, 0x6a, 0x95, 0xaa, 0x91, 0x21, 0x18, 0x6c, 0xb8, 0x2e, 0xa5, 0x61, 0x0d, 0x8b, 0xfd, 0x1a,
0x32, 0x8c, 0xbb, 0x49, 0xf8, 0xf4, 0xb1, 0x91, 0x43, 0x92, 0xe4, 0xd5, 0x00, 0x12, 0x47, 0x0e,
0x11, 0xe2, 0xb4, 0x00, 0x52, 0x22, 0x1d, 0x06, 0x45, 0xd9, 0xd3, 0x79, 0x3e, 0xb9, 0xce, 0x71,
0x62, 0x1b, 0x21, 0xbc, 0x0b, 0x43, 0x3b, 0x41, 0xc8, 0x5e, 0x8b, 0x0c, 0xf9, 0x03, 0xa0, 0x3a,
0xb4, 0x09, 0x6d, 0x61, 0xec, 0xec, 0x04, 0xa1, 0x7c, 0x8b, 0x05, 0xc4, 0x41, 0x09, 0x28, 0xe9,
0xa7, 0xaa, 0xdd, 0x99, 0x7e, 0x88, 0xe7, 0x2d, 0x2f, 0x32, 0xd4, 0xc3, 0x62, 0xfe, 0xa9, 0xf2,
0x33, 0xcd, 0x47, 0x2d, 0x08, 0x65, 0x9b, 0x4c, 0xa0, 0xef, 0x15, 0x8b, 0x4f, 0x89, 0x20, 0x64,
0xb0, 0x87, 0x4a, 0xa5, 0x87, 0x78, 0x10, 0xd2, 0x57, 0x99, 0x43, 0xba, 0x7e, 0xaf, 0x04, 0x21,
0x6d, 0x85, 0x39, 0x94, 0x4a, 0xdd, 0xca, 0xfd, 0x10, 0xfc, 0xab, 0xcb, 0xcc, 0xa1, 0x4c, 0xe6,
0x46, 0x0a, 0x42, 0xfc, 0x12, 0x73, 0x28, 0x97, 0xbb, 0x16, 0x83, 0x10, 0x5a, 0x64, 0x0e, 0x59,
0xd6, 0x25, 0xe9, 0x87, 0x1c, 0xe7, 0xed, 0xd5, 0x75, 0xdf, 0x5f, 0xe0, 0xfa, 0x79, 0x90, 0x0a,
0x05, 0x3a, 0x1e, 0x0a, 0x21, 0xd4, 0xc6, 0x83, 0xec, 0xbf, 0x9f, 0xd2, 0xb4, 0x2b, 0x15, 0x06,
0xf1, 0x21, 0x50, 0x55, 0x88, 0x0a, 0x61, 0x5c, 0xae, 0xc0, 0x20, 0x3d, 0x04, 0x42, 0x7c, 0x54,
0x88, 0xe3, 0xa6, 0xb6, 0x61, 0x4e, 0x21, 0x14, 0xd2, 0xf5, 0x8b, 0x79, 0x59, 0x6e, 0xee, 0x4b,
0x52, 0xfd, 0x9c, 0x90, 0x5a, 0x97, 0x90, 0x05, 0x68, 0xee, 0x8c, 0x90, 0x72, 0xc7, 0xdf, 0xee,
0x84, 0x94, 0x4e, 0x05, 0x61, 0xf6, 0x44, 0x10, 0xf2, 0xd0, 0xf4, 0x31, 0xc6, 0xe6, 0x11, 0xc6,
0x59, 0x28, 0x7d, 0xc8, 0x71, 0xa9, 0x03, 0x98, 0xe1, 0x43, 0x76, 0x18, 0xe4, 0x2f, 0xd9, 0x34,
0xd4, 0xea, 0xbd, 0x30, 0x4c, 0x1b, 0x50, 0x3e, 0x0c, 0xf2, 0x17, 0xac, 0x0c, 0x99, 0x9f, 0x0f,
0x0f, 0x97, 0x05, 0x4d, 0x84, 0x9f, 0xff, 0xaf, 0x4d, 0x2e, 0x44, 0x8c, 0xfb, 0x00, 0xc6, 0xc7,
0xfe, 0xbc, 0x5c, 0x83, 0xff, 0x17, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42,
0x60, 0x82,
};
const BITMAP_OPAQUE add_bus_xpm[1] = {{ png, sizeof( png ), "add_bus_xpm" }};
......
......@@ -8,33 +8,34 @@
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, 0x01, 0x8c, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xed, 0xd6, 0x4f, 0x4b, 0x54,
0x51, 0x18, 0x07, 0xe0, 0x67, 0x34, 0xff, 0x0e, 0x84, 0x81, 0x11, 0x08, 0x2e, 0x84, 0x08, 0x5c,
0xb8, 0x6d, 0x11, 0x95, 0x82, 0x30, 0xe8, 0x88, 0x09, 0x5a, 0x20, 0x89, 0xa1, 0x06, 0x45, 0x54,
0x8c, 0x8a, 0x41, 0x3a, 0xf7, 0x8a, 0x25, 0xb8, 0x14, 0x69, 0x13, 0xa1, 0x44, 0x0b, 0x25, 0x72,
0x15, 0xb6, 0x6a, 0xd3, 0xa6, 0xaf, 0xd0, 0xd6, 0x2f, 0xe1, 0x2a, 0x17, 0x35, 0x2e, 0x9c, 0x99,
0x66, 0x1a, 0xc7, 0x91, 0x1b, 0x77, 0x95, 0x8b, 0xdf, 0xe6, 0x70, 0xb9, 0xcf, 0x3d, 0xe7, 0xbe,
0xe7, 0x3d, 0x47, 0x2e, 0x97, 0x13, 0x25, 0x16, 0x24, 0xad, 0x68, 0x2b, 0xe6, 0x91, 0x86, 0x53,
0x9f, 0x8f, 0x0c, 0x85, 0x3e, 0x0b, 0xe5, 0x8a, 0x99, 0x37, 0x8e, 0x24, 0x1a, 0x91, 0x88, 0x0f,
0x4a, 0x5b, 0xc3, 0x20, 0xba, 0xd1, 0x18, 0x1f, 0xd4, 0x67, 0x13, 0x8f, 0x71, 0x03, 0xcd, 0xf1,
0x41, 0xbd, 0xde, 0xe3, 0x29, 0x6e, 0x9e, 0x43, 0xd5, 0x91, 0x40, 0x9f, 0xd0, 0x7e, 0x19, 0x34,
0xea, 0x4b, 0x1e, 0xba, 0xf5, 0xcf, 0x90, 0x39, 0x2d, 0x02, 0x1f, 0xca, 0x80, 0xd2, 0x4c, 0xfb,
0xae, 0x49, 0x1a, 0x97, 0x50, 0x17, 0x1d, 0x0a, 0xbd, 0xab, 0x8a, 0x14, 0x32, 0xe9, 0x2b, 0xfa,
0x71, 0x05, 0xf5, 0x65, 0x90, 0xac, 0xeb, 0x96, 0x6d, 0x08, 0x6d, 0x08, 0xbc, 0xa9, 0x92, 0xdd,
0x9a, 0xc8, 0x71, 0x7e, 0xeb, 0xb6, 0x8a, 0x11, 0xb4, 0x17, 0x36, 0x6f, 0xe1, 0x4b, 0xa7, 0xce,
0xf8, 0x92, 0xb3, 0x65, 0xc8, 0x2e, 0x9e, 0x94, 0x16, 0x46, 0x3c, 0xd0, 0x7d, 0xdf, 0x30, 0x8b,
0x71, 0x5c, 0x8c, 0x0f, 0x4a, 0xd9, 0xc6, 0x3c, 0x66, 0x70, 0x19, 0x89, 0x63, 0x68, 0xc5, 0x55,
0x59, 0xd3, 0x9e, 0xc9, 0x18, 0xb6, 0x65, 0xd0, 0x76, 0x45, 0xee, 0xd9, 0x13, 0xf8, 0x55, 0x13,
0xc9, 0x3a, 0xd4, 0xe1, 0x15, 0xe6, 0xf0, 0x00, 0x6d, 0xf8, 0x53, 0x75, 0x48, 0xe4, 0x07, 0x6f,
0x23, 0x75, 0x62, 0x26, 0xbc, 0xad, 0x09, 0x0d, 0xf8, 0x98, 0x9f, 0xcd, 0x73, 0xa4, 0x91, 0xac,
0x28, 0x6f, 0xd4, 0xa1, 0x05, 0xad, 0x55, 0xf3, 0x42, 0x46, 0xe0, 0xa0, 0x02, 0x58, 0xf2, 0x53,
0xaa, 0x88, 0xcc, 0x62, 0x12, 0x5d, 0xb8, 0x10, 0xa9, 0x33, 0x80, 0x29, 0x9d, 0x5e, 0xfa, 0xf1,
0xd7, 0x7f, 0xd9, 0x29, 0x99, 0xc9, 0x04, 0x7a, 0xd0, 0x5c, 0x58, 0xb5, 0x68, 0x2d, 0x08, 0xb2,
0xf6, 0x4e, 0xe8, 0x75, 0x19, 0xdc, 0x45, 0x27, 0x9a, 0x4a, 0x0f, 0xc0, 0x38, 0x9a, 0x6a, 0x2f,
0x5a, 0xcf, 0x8f, 0x89, 0xff, 0x09, 0x5a, 0x36, 0x6c, 0xd1, 0x82, 0x87, 0xd6, 0x8d, 0xf9, 0xa4,
0xcb, 0xeb, 0x58, 0x2e, 0x27, 0xf9, 0x32, 0x6f, 0xc0, 0x35, 0x0c, 0xe0, 0xce, 0x69, 0xd7, 0xad,
0x23, 0x96, 0x8b, 0x37, 0xe3, 0x40, 0xfd, 0x4b, 0xbe, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e,
0x44, 0xae, 0x42, 0x60, 0x82,
0xce, 0x00, 0x00, 0x01, 0x99, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xed, 0xd6, 0x3d, 0x6b, 0x93,
0x61, 0x14, 0xc6, 0xf1, 0x5f, 0x92, 0x2a, 0xf8, 0x82, 0x66, 0x69, 0x87, 0x80, 0x9b, 0x22, 0x3a,
0xd8, 0xa5, 0x31, 0x50, 0x5c, 0xda, 0xe6, 0x29, 0xa2, 0x81, 0xb4, 0x82, 0xe0, 0x60, 0xd3, 0x0a,
0x22, 0x18, 0x83, 0x08, 0x26, 0xa9, 0x4b, 0xc0, 0xc5, 0x59, 0x14, 0x37, 0x47, 0x3f, 0x80, 0xdf,
0x40, 0x27, 0x5d, 0xba, 0xf8, 0x45, 0x74, 0xd3, 0x1a, 0x4b, 0x73, 0x3b, 0xf8, 0x44, 0xa2, 0x0f,
0xb1, 0x4f, 0x52, 0x23, 0x08, 0x1d, 0xae, 0xe9, 0x7e, 0xf9, 0x73, 0x9f, 0x73, 0x9d, 0x73, 0x6e,
0x21, 0x04, 0xff, 0x42, 0xfb, 0x3b, 0xdc, 0x11, 0x7e, 0x8a, 0x3c, 0x8e, 0x21, 0x33, 0x69, 0xd0,
0x1d, 0x94, 0x71, 0x74, 0xd2, 0xa0, 0x36, 0xaa, 0x38, 0x7e, 0x00, 0x1a, 0x0e, 0x88, 0x9c, 0x11,
0x79, 0xe6, 0x9a, 0xe0, 0xb2, 0x60, 0x55, 0x30, 0xe7, 0x9d, 0x82, 0x06, 0x4e, 0xee, 0x1b, 0xe4,
0xb1, 0xac, 0x25, 0x6d, 0x91, 0x6d, 0x6b, 0x76, 0xd5, 0x05, 0x0f, 0x05, 0x75, 0xc1, 0x4d, 0x3d,
0x65, 0xdf, 0xcc, 0x7b, 0x2e, 0x2f, 0x8f, 0xec, 0xf8, 0xa0, 0x65, 0x2d, 0x15, 0x9f, 0x35, 0x07,
0x42, 0x36, 0xa8, 0xa6, 0xe0, 0xaa, 0xae, 0xa2, 0x57, 0x28, 0x20, 0x37, 0x32, 0x48, 0xd9, 0x39,
0x91, 0x6d, 0xad, 0x21, 0x90, 0xbe, 0xda, 0x82, 0xb2, 0x1d, 0x05, 0x9b, 0x98, 0xe9, 0xd7, 0xd5,
0x28, 0x79, 0x79, 0x69, 0x4d, 0xef, 0x8f, 0x90, 0xbe, 0xd6, 0xf5, 0x94, 0x6c, 0x61, 0xb1, 0x5f,
0x57, 0x49, 0xf7, 0x0c, 0xd3, 0x8a, 0xa0, 0x91, 0x62, 0x5f, 0x47, 0x70, 0x5f, 0xb0, 0xe8, 0x23,
0x6e, 0x63, 0x1a, 0x99, 0xf4, 0xa0, 0x65, 0x61, 0xcf, 0xb0, 0xfd, 0x1a, 0xbe, 0x5d, 0xd4, 0x71,
0x1a, 0x53, 0xe9, 0x41, 0xd5, 0x11, 0x5f, 0xb4, 0xe0, 0x13, 0xee, 0xe1, 0x02, 0x0e, 0xff, 0x00,
0x91, 0xc3, 0x29, 0xac, 0xc7, 0x8b, 0x49, 0x95, 0xbc, 0x57, 0x4b, 0x99, 0xa3, 0x0d, 0x3d, 0x25,
0x1f, 0x12, 0x2f, 0x8a, 0x61, 0x53, 0x38, 0x11, 0x77, 0xe1, 0xa4, 0x8a, 0xe6, 0x45, 0xbe, 0xa6,
0x76, 0xdd, 0x8c, 0x17, 0x89, 0x1c, 0xa5, 0x76, 0xde, 0x92, 0x8e, 0x8a, 0x2f, 0x43, 0x61, 0x2d,
0x41, 0x45, 0xd7, 0xac, 0x37, 0x78, 0x90, 0x70, 0x5d, 0x6a, 0xd0, 0x75, 0x39, 0x0b, 0x9e, 0x88,
0x74, 0xd5, 0xf4, 0x34, 0xe2, 0xcb, 0x1b, 0x82, 0x9a, 0x9e, 0xb2, 0x1d, 0xb3, 0xde, 0xca, 0x6a,
0xe2, 0xc6, 0x58, 0x75, 0x34, 0x10, 0xe2, 0x8c, 0x39, 0x17, 0x5d, 0xf2, 0xda, 0x4a, 0xec, 0xc6,
0xaa, 0xa0, 0x68, 0xcb, 0xb4, 0xa7, 0xb8, 0x8b, 0x2b, 0x63, 0x77, 0x86, 0x04, 0x8c, 0x23, 0xbf,
0x75, 0xef, 0x47, 0xb8, 0x85, 0xf3, 0x71, 0xae, 0xb3, 0x93, 0x1c, 0x13, 0xab, 0x7f, 0xa5, 0x7b,
0x1f, 0x4c, 0xd8, 0xff, 0x10, 0xc4, 0x21, 0x9c, 0xc5, 0xc6, 0x5e, 0xdf, 0xad, 0xef, 0xd9, 0x83,
0x86, 0x62, 0x6a, 0x21, 0xa9, 0xef, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42,
0x60, 0x82,
};
const BITMAP_OPAQUE add_junction_xpm[1] = {{ png, sizeof( png ), "add_junction_xpm" }};
......
......@@ -8,27 +8,26 @@
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, 0x01, 0x2b, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xed, 0xd5, 0xcd, 0x2a, 0x84,
0x51, 0x18, 0xc0, 0xf1, 0x1f, 0x1a, 0x24, 0x6c, 0xc4, 0x82, 0x0d, 0x3b, 0x6b, 0x2c, 0x7c, 0x8d,
0x89, 0x0d, 0xb2, 0xa5, 0x2c, 0xec, 0x50, 0xc6, 0xe4, 0x2b, 0x69, 0x18, 0xa6, 0xac, 0x6d, 0x94,
0x22, 0x5c, 0x85, 0xb0, 0x71, 0x09, 0xca, 0xc2, 0x02, 0x73, 0x15, 0xca, 0x1d, 0xbc, 0x16, 0x33,
0xde, 0x14, 0xf2, 0xbe, 0x34, 0xb3, 0x9a, 0xc5, 0x7f, 0x77, 0xea, 0xd7, 0xf3, 0xd4, 0x39, 0x47,
0x10, 0x04, 0x2a, 0x91, 0x2a, 0x54, 0x85, 0x2a, 0x0f, 0x39, 0xd4, 0xe1, 0xc0, 0x95, 0x7d, 0xd7,
0x72, 0x6e, 0x7e, 0x2d, 0x63, 0x00, 0x09, 0xd4, 0xc4, 0x85, 0xba, 0xe5, 0x05, 0x91, 0x9b, 0xb6,
0x81, 0x1e, 0x24, 0xca, 0x0b, 0x8d, 0x38, 0xc6, 0x20, 0x1a, 0xe3, 0x42, 0x4d, 0xb6, 0xcc, 0x9b,
0x72, 0x64, 0xdc, 0xb9, 0x71, 0x17, 0x5f, 0x5a, 0x72, 0x1f, 0x42, 0x43, 0x4e, 0x31, 0x1a, 0x1b,
0x2a, 0x6a, 0x12, 0xe8, 0x45, 0x1f, 0xfa, 0xbf, 0xb4, 0xec, 0x24, 0x84, 0x86, 0x9d, 0xfd, 0x07,
0xaa, 0x41, 0x3d, 0x1a, 0xbe, 0x2d, 0x2b, 0xf7, 0x69, 0x75, 0x7f, 0x87, 0x7e, 0x3d, 0x94, 0xb3,
0x13, 0x42, 0x49, 0xe7, 0x48, 0x96, 0x0b, 0xda, 0x0e, 0xa1, 0x31, 0x17, 0x18, 0x2b, 0x17, 0xb4,
0x55, 0x19, 0x68, 0xdf, 0x66, 0x08, 0xa5, 0x5c, 0x22, 0x55, 0x2e, 0x68, 0x3d, 0x84, 0xe6, 0xdc,
0x9a, 0xb4, 0x69, 0xcd, 0x94, 0xac, 0x89, 0x1f, 0xdb, 0x93, 0x44, 0xed, 0xc7, 0x0b, 0x12, 0x75,
0x75, 0x6b, 0xb1, 0x2e, 0x75, 0x5e, 0xe0, 0xc0, 0x2b, 0xba, 0x3e, 0x26, 0x8f, 0x0a, 0x65, 0x62,
0x43, 0xbb, 0xde, 0xb0, 0x80, 0x4e, 0xd4, 0x46, 0x85, 0xa6, 0x65, 0xdd, 0xc9, 0x78, 0x94, 0xf6,
0x64, 0xa5, 0x54, 0xda, 0xb3, 0xb4, 0x17, 0x69, 0x2f, 0x56, 0xc3, 0x0a, 0x32, 0x0a, 0x16, 0x3d,
0x60, 0xb9, 0x34, 0x55, 0x44, 0xa8, 0xb8, 0xeb, 0x76, 0xcc, 0x60, 0x36, 0x46, 0x33, 0x68, 0x8b,
0x0c, 0x95, 0xb0, 0x3a, 0xb4, 0xa0, 0x35, 0x46, 0xcd, 0xa8, 0xab, 0x7e, 0xe5, 0xff, 0xea, 0x1d,
0x5b, 0x90, 0x1a, 0x4b, 0xed, 0x97, 0x55, 0x8d, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44,
0xae, 0x42, 0x60, 0x82,
0xce, 0x00, 0x00, 0x01, 0x1c, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xed, 0xd6, 0xbb, 0x4a, 0xc3,
0x50, 0x00, 0x80, 0xe1, 0xaf, 0xa9, 0x31, 0xf5, 0x42, 0xad, 0xe0, 0x05, 0xa4, 0x82, 0xe8, 0x26,
0x08, 0x0a, 0x82, 0x6b, 0xf1, 0x01, 0x74, 0x72, 0x53, 0xb4, 0xa0, 0x5d, 0xd4, 0x82, 0x7b, 0x0b,
0x3e, 0xac, 0x83, 0xab, 0x9b, 0x94, 0xd6, 0x38, 0x18, 0x24, 0xd2, 0x0a, 0x49, 0x8c, 0x1d, 0xc4,
0xe1, 0xdf, 0x0e, 0x7c, 0x9c, 0xc3, 0xb9, 0x89, 0xe3, 0xd8, 0x34, 0xf2, 0x0f, 0x95, 0x02, 0xa1,
0x82, 0xc0, 0x99, 0xaa, 0x96, 0x19, 0x1d, 0xa1, 0x8e, 0xd0, 0x99, 0x59, 0x5d, 0x91, 0xae, 0xc8,
0x95, 0x1a, 0x2a, 0x85, 0x20, 0x7d, 0x4f, 0xfa, 0xe2, 0xcc, 0xb1, 0x84, 0xb0, 0x08, 0xf4, 0x9c,
0x13, 0x3a, 0xc6, 0x2a, 0x82, 0xdf, 0x86, 0xae, 0xb1, 0x85, 0xea, 0xef, 0x42, 0x81, 0x5b, 0x6c,
0xe7, 0x87, 0x1e, 0xd5, 0x9d, 0x5a, 0xb7, 0xe2, 0x44, 0xc3, 0x85, 0x7a, 0xd2, 0x82, 0x73, 0x4d,
0x37, 0x13, 0xa0, 0xbb, 0x42, 0x50, 0xb2, 0xe3, 0x02, 0x2c, 0x27, 0x6b, 0xbf, 0xf6, 0xd9, 0x9e,
0xed, 0x52, 0xa1, 0xd4, 0xf6, 0xfe, 0xda, 0xad, 0xc5, 0x31, 0x28, 0xfc, 0x21, 0x34, 0x71, 0xc0,
0x83, 0xb9, 0x09, 0xd0, 0x7d, 0xf9, 0xd0, 0xbd, 0xe8, 0x1b, 0x68, 0xa7, 0x5c, 0xa8, 0x23, 0x1c,
0x83, 0x22, 0xdd, 0xf2, 0xa1, 0x47, 0xc1, 0x54, 0xa0, 0xe4, 0x9c, 0x4d, 0x0d, 0x7a, 0xcb, 0x75,
0xa0, 0xd3, 0xb5, 0x35, 0xf2, 0x40, 0xc3, 0xc2, 0xd0, 0xa6, 0x0d, 0x04, 0x59, 0xa1, 0x41, 0x61,
0x88, 0x23, 0x44, 0x59, 0xa1, 0x17, 0x7d, 0xaf, 0x7a, 0x06, 0x7a, 0x86, 0xa9, 0x46, 0x7a, 0x46,
0xfa, 0x46, 0xc9, 0xf2, 0xa6, 0x8b, 0xf5, 0x0c, 0xd1, 0x42, 0x2d, 0xfb, 0x7b, 0xc2, 0x0c, 0x76,
0x71, 0x89, 0x4e, 0xc6, 0xda, 0xb9, 0x66, 0x94, 0xba, 0x0b, 0x57, 0xb1, 0x8f, 0xc3, 0x8c, 0x1d,
0xa0, 0x89, 0x6a, 0xbe, 0xe7, 0xf8, 0x63, 0x56, 0xf3, 0x39, 0x0b, 0x51, 0xf9, 0x7b, 0xbf, 0xa0,
0x77, 0x8b, 0xee, 0xb5, 0x1a, 0xc3, 0xc3, 0xe7, 0xe6, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e,
0x44, 0xae, 0x42, 0x60, 0x82,
};
const BITMAP_OPAQUE add_line_xpm[1] = {{ png, sizeof( png ), "add_line_xpm" }};
......
......@@ -8,34 +8,33 @@
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, 0x01, 0x9e, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xed, 0xd5, 0x3f, 0x6b, 0x53,
0x51, 0x18, 0xc7, 0xf1, 0xcf, 0xbd, 0x49, 0x6f, 0x68, 0xb5, 0x21, 0x6d, 0x2c, 0x34, 0x82, 0xba,
0x89, 0x93, 0x82, 0x4b, 0x8b, 0x82, 0xe0, 0x9f, 0x38, 0xab, 0x20, 0x4e, 0x2e, 0x16, 0x69, 0x75,
0xaa, 0x22, 0x0d, 0x49, 0xae, 0xb5, 0x83, 0x22, 0xbe, 0x04, 0x5f, 0x80, 0x83, 0xaf, 0x41, 0x7d,
0x11, 0x6e, 0x22, 0xe2, 0x24, 0x4e, 0x22, 0x6a, 0xd5, 0x4e, 0xf6, 0x3a, 0xe4, 0x18, 0x62, 0x2c,
0xf5, 0xde, 0x28, 0x0e, 0xd2, 0xe1, 0x3b, 0x9d, 0x03, 0x5f, 0x9e, 0xdf, 0x79, 0x9e, 0xe7, 0xc8,
0xb2, 0xcc, 0xbf, 0xc0, 0x8e, 0x68, 0x47, 0xf4, 0x9f, 0x8b, 0x10, 0x21, 0xc6, 0x18, 0x92, 0x1c,
0x94, 0x11, 0x17, 0x17, 0xa5, 0x16, 0xa5, 0x5e, 0xea, 0x7a, 0xa5, 0xe3, 0xf5, 0xb6, 0x2c, 0x6a,
0x61, 0x16, 0x13, 0x45, 0x64, 0xbd, 0x6a, 0xda, 0x52, 0xb7, 0x65, 0xb9, 0x58, 0xf6, 0x02, 0x4d,
0xec, 0x43, 0x52, 0x44, 0x14, 0x6b, 0x59, 0xcd, 0x2d, 0x4a, 0x6d, 0x9a, 0xb5, 0x86, 0x39, 0x54,
0x11, 0xe5, 0xaf, 0x88, 0x5d, 0x38, 0x82, 0x05, 0xdc, 0xc1, 0xdd, 0x21, 0xee, 0xb9, 0xec, 0x79,
0x5f, 0x76, 0xd6, 0x33, 0x9c, 0xc7, 0x5e, 0x94, 0x8b, 0x88, 0x92, 0x90, 0xfb, 0x51, 0x9c, 0xc4,
0xe9, 0x21, 0xce, 0x68, 0x0e, 0x54, 0xbd, 0xe4, 0x2d, 0xae, 0xe1, 0x10, 0x2a, 0x45, 0xba, 0x2e,
0x0e, 0xb2, 0x49, 0x4c, 0x61, 0x7a, 0x88, 0xba, 0x29, 0x07, 0x74, 0x7c, 0xe8, 0xc7, 0x37, 0xe3,
0x01, 0x8e, 0xe7, 0x8d, 0x6f, 0xb0, 0xb4, 0x1f, 0x2d, 0xbe, 0x15, 0x25, 0x8c, 0xbb, 0xe1, 0x71,
0xbf, 0xaa, 0xa6, 0xa7, 0x21, 0xbe, 0x46, 0x9e, 0xf8, 0x14, 0xe8, 0x9a, 0xb2, 0x05, 0x17, 0x07,
0xe2, 0x7b, 0x83, 0xa5, 0xbc, 0xf1, 0x15, 0x11, 0x45, 0x6a, 0x6a, 0x3a, 0xde, 0x07, 0xd9, 0xa6,
0x19, 0xf7, 0x71, 0x2c, 0xc4, 0x17, 0xff, 0xb5, 0x15, 0x84, 0x8a, 0x9b, 0x1e, 0x0d, 0x74, 0xdf,
0x13, 0x5c, 0xc0, 0xfe, 0x30, 0xc0, 0x95, 0x21, 0x92, 0x10, 0x7b, 0x54, 0x54, 0x54, 0x72, 0xc5,
0xb9, 0xbe, 0xa8, 0xeb, 0x9b, 0x8e, 0x0d, 0x5d, 0x9f, 0xa5, 0xd6, 0xa5, 0x3e, 0xfd, 0xc4, 0xa4,
0x83, 0xa8, 0x23, 0x29, 0x2a, 0x8a, 0x4c, 0xab, 0xea, 0x78, 0x97, 0x6b, 0xb8, 0xb9, 0x14, 0xe6,
0xb3, 0x5a, 0x7c, 0x0b, 0x93, 0x58, 0xf6, 0x50, 0xdb, 0x47, 0x2d, 0x5f, 0xac, 0xd8, 0xb0, 0xe2,
0xeb, 0x2f, 0xdc, 0xb2, 0x8e, 0x36, 0x4e, 0xa1, 0x3e, 0x8a, 0xa8, 0x84, 0x3d, 0x38, 0x81, 0xeb,
0x58, 0xc5, 0xda, 0x16, 0xa4, 0xb8, 0x1a, 0x56, 0x55, 0x6d, 0x14, 0x51, 0x14, 0x1e, 0xba, 0x81,
0xc3, 0x98, 0x0f, 0x9d, 0x37, 0xcc, 0x7c, 0x38, 0x6f, 0xa0, 0x32, 0xda, 0x27, 0xd6, 0x93, 0x8d,
0x61, 0x1c, 0xbb, 0xb7, 0x61, 0x22, 0xdc, 0x8b, 0xfe, 0xec, 0xd7, 0xec, 0x09, 0x7f, 0x4b, 0x96,
0x65, 0xbe, 0x03, 0x93, 0x9d, 0x7c, 0xd2, 0x5e, 0x47, 0x34, 0x04, 0x00, 0x00, 0x00, 0x00, 0x49,
0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
0xce, 0x00, 0x00, 0x01, 0x96, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xdd, 0xd6, 0x3d, 0x6b, 0xd4,
0x70, 0x1c, 0x07, 0xf0, 0x8f, 0xf7, 0xe0, 0x59, 0x9f, 0xea, 0xb5, 0xd7, 0x8a, 0x52, 0x0a, 0x1d,
0x44, 0x70, 0x13, 0x8a, 0x16, 0x41, 0xad, 0x22, 0x74, 0xaa, 0x82, 0x0e, 0x8a, 0x20, 0x1d, 0x44,
0x1c, 0x44, 0x6d, 0xb4, 0xc5, 0xf4, 0x9a, 0x60, 0xc0, 0xcd, 0xcd, 0xc9, 0x57, 0xe0, 0x1b, 0xf0,
0x05, 0x38, 0x76, 0x71, 0xec, 0x1b, 0x70, 0xf2, 0x0d, 0xb8, 0x54, 0x3d, 0x7b, 0x0e, 0x17, 0x82,
0xa9, 0x0f, 0x77, 0x49, 0x0f, 0x87, 0x0e, 0xdf, 0x90, 0xed, 0x93, 0x5f, 0xc8, 0xf7, 0x97, 0xbf,
0x6e, 0xb7, 0xeb, 0x7f, 0xc4, 0xde, 0x85, 0xb4, 0x1d, 0x97, 0x98, 0x94, 0x98, 0xb4, 0x66, 0x42,
0xa2, 0x25, 0xd1, 0xb2, 0x66, 0x5c, 0x62, 0x4c, 0x62, 0x4c, 0xa8, 0x29, 0x71, 0xcc, 0x0b, 0xa3,
0xa5, 0x20, 0x81, 0x11, 0xb1, 0x6e, 0xa1, 0x3c, 0x35, 0x85, 0x4a, 0x31, 0x68, 0xc5, 0xa1, 0xc2,
0xd0, 0x2d, 0xeb, 0x98, 0x1e, 0x14, 0xeb, 0x5d, 0x12, 0x87, 0x0b, 0x43, 0xf7, 0x7c, 0xc0, 0x02,
0xf6, 0x17, 0x81, 0x8e, 0x16, 0x86, 0x9e, 0xf8, 0x84, 0x25, 0x8c, 0x14, 0xfb, 0x18, 0xee, 0x9b,
0x70, 0xd2, 0x75, 0x4d, 0xa1, 0xa6, 0xf5, 0xdf, 0x32, 0x2e, 0xd2, 0xb6, 0x95, 0x41, 0x91, 0x8e,
0x86, 0x00, 0x2d, 0xec, 0x1b, 0x1c, 0xa2, 0x8a, 0xd3, 0xb8, 0x8a, 0x6b, 0x7f, 0x4c, 0xe0, 0x63,
0x6e, 0xaa, 0xb3, 0xde, 0xe0, 0x0c, 0xaa, 0x85, 0x7a, 0x94, 0x62, 0xf5, 0xbf, 0x26, 0xf4, 0x32,
0x07, 0xdd, 0xf4, 0x1e, 0x57, 0x50, 0x1f, 0x6a, 0x61, 0x45, 0xe6, 0x73, 0xd0, 0x43, 0x9b, 0xb8,
0x83, 0xc6, 0x70, 0xa1, 0xc4, 0x01, 0xb1, 0xaf, 0x19, 0x14, 0xfa, 0x82, 0x47, 0x38, 0x32, 0xf4,
0x15, 0x24, 0xb6, 0x91, 0x9b, 0x6a, 0xc6, 0x2b, 0xcc, 0xf4, 0xeb, 0x53, 0x71, 0x28, 0xf2, 0x3a,
0x07, 0x2d, 0x78, 0x87, 0x39, 0xd4, 0x86, 0x0b, 0xb5, 0x2d, 0xe6, 0xa0, 0x25, 0x1b, 0xb8, 0xd1,
0xaf, 0xb8, 0xc5, 0xa1, 0x50, 0x53, 0x6c, 0x3b, 0x83, 0x02, 0x9f, 0xf1, 0xa0, 0x5f, 0x71, 0xcb,
0xad, 0xfc, 0xc8, 0x66, 0x6e, 0xaa, 0xc8, 0x77, 0xb1, 0x6f, 0x69, 0x3a, 0x62, 0x3f, 0xb2, 0x87,
0x59, 0x74, 0x10, 0x95, 0xb2, 0xd0, 0xdb, 0x81, 0x57, 0x55, 0xdd, 0x1c, 0x4e, 0x94, 0x85, 0xee,
0x0e, 0x08, 0x6d, 0xe3, 0x31, 0xce, 0x95, 0x83, 0x12, 0x53, 0x62, 0x5b, 0xa2, 0x1d, 0xaf, 0x69,
0x67, 0x22, 0x1d, 0x04, 0x38, 0x5f, 0xfe, 0xd7, 0x4c, 0x03, 0xb7, 0xb1, 0x8c, 0x67, 0x59, 0x2a,
0x9e, 0xab, 0x59, 0x51, 0xb3, 0xaa, 0x61, 0x35, 0x9d, 0x68, 0x76, 0x37, 0x50, 0x15, 0xa7, 0x70,
0x01, 0x17, 0xd3, 0x5c, 0xfa, 0x25, 0x97, 0x31, 0x9f, 0xde, 0x4f, 0xef, 0xee, 0xc0, 0xd1, 0xc3,
0x6a, 0xff, 0x5c, 0xc4, 0xbd, 0x54, 0xf6, 0xde, 0x71, 0xeb, 0x27, 0x0d, 0x7b, 0xd6, 0x27, 0x8a,
0xa6, 0xc3, 0x5b, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
};
const BITMAP_OPAQUE add_tracks_xpm[1] = {{ png, sizeof( png ), "add_tracks_xpm" }};
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -8,16 +8,15 @@
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, 0x00, 0x83, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0xf8, 0xff, 0xff, 0x3f,
0x03, 0x3d, 0x30, 0xd1, 0x0a, 0x6b, 0xa7, 0xde, 0xfe, 0x46, 0x35, 0x8b, 0x80, 0x20, 0x13, 0x88,
0x1f, 0x81, 0x68, 0x74, 0xf1, 0xca, 0x89, 0x57, 0xfe, 0x61, 0x13, 0xc7, 0xa5, 0x1e, 0x5d, 0x1c,
0xdd, 0xa2, 0xc7, 0x40, 0x0c, 0x62, 0x3c, 0x46, 0x17, 0xaf, 0x9c, 0x70, 0x19, 0xab, 0x38, 0x2e,
0xf5, 0xe8, 0xe2, 0xe8, 0x16, 0xe5, 0x02, 0xf1, 0x13, 0x10, 0x8d, 0x2e, 0x0e, 0xf5, 0x51, 0x2e,
0xb1, 0xea, 0xd1, 0xc5, 0x07, 0x26, 0x8e, 0x86, 0x9f, 0x45, 0x34, 0x4f, 0x75, 0x20, 0xd7, 0x82,
0x30, 0xc8, 0x30, 0x50, 0xea, 0x02, 0xd1, 0x30, 0x31, 0x98, 0x38, 0x90, 0xc6, 0x2a, 0x8e, 0x4b,
0x3d, 0xb2, 0xf8, 0x68, 0xaa, 0x1b, 0x4d, 0x75, 0xa3, 0x65, 0xdd, 0x68, 0xaa, 0x1b, 0x4d, 0x75,
0xa3, 0xa9, 0x8e, 0x5a, 0x16, 0x51, 0x8a, 0x01, 0x87, 0xf4, 0xc3, 0xc4, 0xac, 0xee, 0xe0, 0x4c,
0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
0xce, 0x00, 0x00, 0x00, 0x6d, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0xf8, 0xff, 0xff, 0x3f,
0x03, 0x3d, 0x30, 0xd1, 0x0a, 0x1f, 0xd8, 0x39, 0xfc, 0xa7, 0x9a, 0x45, 0x40, 0x90, 0x09, 0xc4,
0x8f, 0x40, 0x34, 0xba, 0x38, 0xc8, 0x22, 0x6c, 0xe2, 0xb8, 0xd4, 0xa3, 0x8b, 0xa3, 0x5b, 0xf4,
0x18, 0x88, 0x41, 0x8c, 0xc7, 0xe8, 0xe2, 0x50, 0x8b, 0x1e, 0x13, 0xab, 0x1e, 0x5d, 0x1c, 0xdd,
0xa2, 0x5c, 0x20, 0x7e, 0x02, 0xa2, 0xd1, 0xc5, 0xa1, 0x16, 0xe5, 0x12, 0xab, 0x1e, 0x5d, 0x7c,
0x60, 0xe2, 0x68, 0xf8, 0x59, 0x44, 0xf3, 0x54, 0x07, 0x32, 0x84, 0x96, 0x78, 0x34, 0xd5, 0x8d,
0xa6, 0xba, 0xd1, 0xb2, 0x6e, 0x34, 0xd5, 0x8d, 0xa6, 0xba, 0xd1, 0x54, 0x47, 0x2d, 0x8b, 0x28,
0xc5, 0x00, 0x45, 0x82, 0xab, 0xc1, 0xba, 0x49, 0xf4, 0x4e, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45,
0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
};
const BITMAP_OPAQUE grid_select_axis_xpm[1] = {{ png, sizeof( png ), "grid_select_axis_xpm" }};
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -8,49 +8,60 @@
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, 0x95, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xed, 0x56, 0xcb, 0x8b, 0x52,
0x71, 0x14, 0xbe, 0x3e, 0x31, 0x45, 0x6c, 0x54, 0xf2, 0x95, 0x8f, 0x85, 0x08, 0x23, 0x88, 0x09,
0x95, 0x9a, 0x8a, 0xf8, 0xc0, 0x27, 0xbe, 0x73, 0x23, 0x48, 0xfb, 0x59, 0x05, 0x05, 0x6d, 0x5d,
0xb4, 0xa9, 0xb6, 0xb3, 0x69, 0x11, 0x04, 0x05, 0x6d, 0x06, 0xda, 0x05, 0x41, 0x14, 0xd1, 0x40,
0xab, 0xa2, 0xc5, 0x50, 0x33, 0x0c, 0x31, 0xa3, 0xe2, 0x18, 0xde, 0xab, 0xd6, 0x5f, 0x60, 0xdf,
0x91, 0xb9, 0x30, 0x89, 0x8f, 0xb1, 0xc1, 0x16, 0x31, 0xc2, 0x41, 0xf4, 0xf7, 0x3b, 0xbf, 0xef,
0x9c, 0xef, 0xfb, 0xce, 0xef, 0x5e, 0x66, 0x34, 0x1a, 0x31, 0xff, 0x22, 0x98, 0x73, 0xa0, 0x95,
0x02, 0x55, 0x2a, 0x95, 0xab, 0xe9, 0x74, 0xfa, 0x49, 0x2a, 0x95, 0xda, 0x4e, 0x26, 0x93, 0xbb,
0x88, 0x7d, 0xc4, 0xab, 0x42, 0xa1, 0xb0, 0x51, 0xad, 0x56, 0xed, 0x67, 0x06, 0x2a, 0x97, 0xcb,
0x97, 0x01, 0xb0, 0x15, 0x0c, 0x06, 0x3b, 0x5a, 0xad, 0x76, 0x28, 0x95, 0x4a, 0x39, 0x86, 0x61,
0x7a, 0x14, 0x0a, 0x85, 0xa2, 0x6f, 0xb5, 0x5a, 0x07, 0x91, 0x48, 0xa4, 0x99, 0xcd, 0x66, 0x6f,
0xff, 0x35, 0x50, 0xb1, 0x58, 0xbc, 0x92, 0x48, 0x24, 0xda, 0x3a, 0x9d, 0x6e, 0xc8, 0x1f, 0x4e,
0x21, 0x91, 0x48, 0x58, 0xa1, 0x50, 0xc8, 0xf2, 0xbf, 0x05, 0x02, 0x41, 0xcf, 0xed, 0x76, 0x77,
0x33, 0x99, 0xcc, 0x56, 0xbd, 0x5e, 0x57, 0x2c, 0x05, 0x84, 0x0a, 0xd7, 0x40, 0xd3, 0x2e, 0xaa,
0xe6, 0xf8, 0xea, 0x7d, 0x3e, 0x5f, 0x1b, 0x74, 0xed, 0xe1, 0xff, 0x8f, 0x88, 0x6f, 0xe1, 0x70,
0xf8, 0x40, 0xaf, 0xd7, 0xf7, 0x79, 0x40, 0x9b, 0xcd, 0xd6, 0x47, 0xf7, 0xcf, 0x4f, 0x0d, 0x84,
0x8f, 0x00, 0x09, 0xaf, 0x0d, 0x06, 0xc3, 0xf8, 0x10, 0xb3, 0xd9, 0xcc, 0xe2, 0xe0, 0x4f, 0xa5,
0x52, 0x29, 0x38, 0x49, 0x2b, 0xba, 0x78, 0xeb, 0x74, 0x3a, 0xbb, 0x3c, 0x18, 0xc0, 0xdb, 0xd8,
0xe7, 0xe0, 0xf7, 0x40, 0x43, 0x33, 0xf4, 0x2d, 0x4e, 0x05, 0xc2, 0xa2, 0xcb, 0xef, 0xf7, 0x37,
0x29, 0x51, 0xa5, 0x52, 0x0d, 0x00, 0xba, 0x33, 0x8b, 0x12, 0x18, 0x41, 0x84, 0xee, 0x5f, 0x18,
0x8d, 0xc6, 0x71, 0x51, 0x6a, 0xb5, 0x7a, 0x40, 0xe0, 0x88, 0x87, 0x28, 0x6e, 0x07, 0xdf, 0xc3,
0x5c, 0x2e, 0x77, 0x6f, 0x2a, 0x10, 0x16, 0xee, 0x5a, 0x2c, 0x96, 0xb1, 0x2e, 0xa1, 0x50, 0x88,
0x2a, 0x5c, 0x5f, 0xe0, 0x48, 0x2f, 0x28, 0x3d, 0x22, 0xad, 0x28, 0xc7, 0x6e, 0xb7, 0x73, 0xd0,
0xf5, 0xa7, 0x58, 0x2c, 0x66, 0xe3, 0xf1, 0xf8, 0x21, 0xb4, 0xbe, 0x38, 0x15, 0x08, 0x95, 0x7c,
0x90, 0xc9, 0x64, 0x1c, 0x09, 0x8e, 0x03, 0xbe, 0x4e, 0xae, 0x37, 0x1a, 0x0d, 0x21, 0x68, 0xbb,
0x86, 0x4e, 0x1f, 0x91, 0x56, 0x70, 0x64, 0x0b, 0xfa, 0x0c, 0x45, 0x22, 0x11, 0x7b, 0xd2, 0x34,
0xe8, 0x72, 0x80, 0xf5, 0xcd, 0x99, 0x1a, 0x61, 0x71, 0x8f, 0x36, 0x2a, 0x95, 0xca, 0x3e, 0x5c,
0xf7, 0x72, 0x0a, 0x5d, 0xd2, 0x7c, 0x3e, 0xbf, 0x89, 0x6a, 0x7f, 0x9d, 0xb4, 0xfb, 0x64, 0x44,
0xa3, 0xd1, 0x26, 0xe9, 0x38, 0x0f, 0x68, 0x9b, 0x0e, 0xa0, 0x0a, 0xc9, 0x04, 0xb3, 0x28, 0x03,
0xd8, 0xad, 0x58, 0x2c, 0xd6, 0x22, 0x47, 0x4e, 0x82, 0x68, 0x34, 0x9a, 0x21, 0xcd, 0xdf, 0x5c,
0xd7, 0xe1, 0xf0, 0xa7, 0x24, 0x2a, 0x25, 0xa0, 0xa3, 0x16, 0x34, 0xba, 0x34, 0x0b, 0x0c, 0x6b,
0x6e, 0x1a, 0x03, 0xd8, 0xfc, 0x8f, 0xce, 0x88, 0x4e, 0x32, 0xd5, 0x5c, 0x20, 0x98, 0xa1, 0xe6,
0x72, 0xb9, 0x7e, 0x50, 0x82, 0xc9, 0x64, 0x22, 0x17, 0x3d, 0x9b, 0x67, 0x86, 0x5a, 0xad, 0xb6,
0x06, 0xe7, 0xbd, 0xe1, 0x6d, 0x4e, 0x94, 0xa3, 0x9b, 0xf7, 0x0b, 0xe7, 0x88, 0xc4, 0x46, 0x95,
0x9f, 0xe5, 0x72, 0xf9, 0xb8, 0x4a, 0x8f, 0xc7, 0x73, 0xb4, 0x68, 0xea, 0xc9, 0xe6, 0xd8, 0xf3,
0x20, 0x10, 0x08, 0x74, 0xbc, 0x5e, 0x6f, 0x17, 0xda, 0x44, 0x4e, 0x75, 0x33, 0xa0, 0xed, 0x1b,
0x94, 0x04, 0xe7, 0xf5, 0x8e, 0x87, 0x96, 0x83, 0x1e, 0x87, 0x54, 0x00, 0xaa, 0xbd, 0x3f, 0x0b,
0x10, 0x6c, 0x14, 0x10, 0xef, 0x96, 0xba, 0xeb, 0x40, 0xc7, 0x1d, 0x5c, 0x98, 0x1d, 0xbe, 0x33,
0x0a, 0x32, 0x08, 0x74, 0xfb, 0x3e, 0x8f, 0x4a, 0xea, 0x6e, 0xe9, 0xdb, 0x1b, 0xc3, 0x76, 0x1d,
0x5d, 0xec, 0x3b, 0x1c, 0x0e, 0x8e, 0x9c, 0x74, 0x0c, 0x74, 0xb0, 0x92, 0xe7, 0x11, 0x4d, 0x36,
0x38, 0xbf, 0x09, 0xc0, 0xc7, 0x88, 0x2f, 0xa0, 0x95, 0xa5, 0x59, 0x5a, 0xf9, 0x13, 0x16, 0x20,
0x17, 0xc8, 0x30, 0xe7, 0xef, 0x0c, 0xff, 0x1f, 0xd0, 0x6f, 0x79, 0x32, 0x7d, 0x39, 0x4f, 0x3a,
0x0e, 0x83, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
0xce, 0x00, 0x00, 0x03, 0x3d, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xed, 0x96, 0xdd, 0x4b, 0x5a,
0x71, 0x18, 0xc7, 0x7d, 0x59, 0xa3, 0x2d, 0xad, 0xa4, 0xb1, 0x1b, 0x73, 0x7a, 0x93, 0x4c, 0xb6,
0x91, 0x12, 0x23, 0x96, 0x8c, 0x88, 0x6d, 0xe1, 0x4d, 0x84, 0x54, 0x17, 0xb2, 0xd6, 0x2e, 0x12,
0x1b, 0xd1, 0x5d, 0x14, 0xb5, 0x18, 0x41, 0xdd, 0x34, 0xbc, 0xd8, 0x76, 0x11, 0xc4, 0x06, 0x23,
0xa4, 0x8b, 0x4d, 0x58, 0x64, 0xb0, 0xbc, 0x08, 0xb1, 0x17, 0x2b, 0xed, 0x85, 0x6c, 0x99, 0x69,
0x6a, 0xa3, 0x4e, 0x6a, 0xf9, 0x76, 0xfc, 0x0f, 0xda, 0xf7, 0x27, 0x38, 0xa8, 0x3c, 0xda, 0x5e,
0xea, 0x66, 0xbb, 0x38, 0x17, 0x87, 0x73, 0x7e, 0xcf, 0xe7, 0x79, 0xf9, 0x3e, 0xdf, 0x73, 0x58,
0xc7, 0xc7, 0xc7, 0xac, 0xcb, 0xb8, 0x58, 0xff, 0x41, 0x17, 0x06, 0xf2, 0x7a, 0xbd, 0x37, 0xd6,
0xd6, 0xd6, 0x5e, 0xce, 0xcc, 0xcc, 0x7c, 0x99, 0x9d, 0x9d, 0xdd, 0xb4, 0xd9, 0x6c, 0xa1, 0xb9,
0xb9, 0x39, 0xc7, 0xea, 0xea, 0xea, 0xab, 0xed, 0xed, 0xed, 0x07, 0x56, 0xab, 0xf5, 0xca, 0x9f,
0x82, 0x38, 0x00, 0xe8, 0x00, 0xa0, 0x5a, 0x5a, 0x5a, 0x68, 0xb9, 0x5c, 0x9e, 0x28, 0x2a, 0x2a,
0x8a, 0xb2, 0x58, 0xac, 0x88, 0x48, 0x24, 0x8a, 0x37, 0x34, 0x34, 0xd0, 0x23, 0x23, 0x23, 0xd4,
0xe2, 0xe2, 0xa2, 0x75, 0x6f, 0x6f, 0x4f, 0xf0, 0x5b, 0x20, 0x8f, 0xc7, 0xc3, 0x5f, 0x58, 0x58,
0x70, 0x0c, 0x0e, 0x0e, 0x1e, 0x15, 0x17, 0x17, 0xa7, 0x82, 0x33, 0x5d, 0x6a, 0xb5, 0x3a, 0x8e,
0x2a, 0x51, 0xb8, 0xf7, 0xf6, 0x2f, 0x83, 0x90, 0xe5, 0xe7, 0xe6, 0xe6, 0xe6, 0x58, 0x3a, 0x98,
0x54, 0x2a, 0x8d, 0x77, 0x76, 0x76, 0x46, 0x49, 0x05, 0x06, 0x83, 0xe1, 0xa0, 0xad, 0xad, 0x2d,
0x21, 0x93, 0xc9, 0x12, 0xe9, 0xe7, 0xe5, 0xe5, 0xe5, 0x09, 0xb4, 0x90, 0xda, 0xd9, 0xd9, 0x91,
0x9d, 0x1b, 0xb4, 0xb2, 0xb2, 0xd2, 0x3a, 0x3c, 0x3c, 0x7c, 0x48, 0x02, 0xe4, 0xe7, 0xe7, 0x47,
0x7b, 0x7a, 0x7a, 0x22, 0xf3, 0xf3, 0xf3, 0x6e, 0xcc, 0x43, 0xb3, 0xb5, 0xb5, 0xa5, 0x20, 0x99,
0x6f, 0x6c, 0x6c, 0xb4, 0xa2, 0x8a, 0x4d, 0xad, 0x56, 0xfb, 0xb3, 0xda, 0x9a, 0x9a, 0x1a, 0x1a,
0x5d, 0x30, 0x65, 0x80, 0xb0, 0xcf, 0x80, 0xfc, 0x7e, 0xff, 0x4d, 0x8b, 0xc5, 0x72, 0x50, 0x58,
0x58, 0x98, 0x0a, 0x30, 0x30, 0x30, 0x10, 0x5d, 0x5e, 0x5e, 0x7e, 0x07, 0xc0, 0xd5, 0xd3, 0x01,
0x28, 0x8a, 0xba, 0x86, 0xc0, 0x63, 0x7d, 0x7d, 0x7d, 0xe1, 0x34, 0xcc, 0x64, 0x32, 0x05, 0x91,
0xd0, 0x3d, 0xf2, 0x3e, 0x12, 0x7a, 0x04, 0xd1, 0x7c, 0x74, 0xb9, 0x5c, 0xef, 0xcf, 0x80, 0x7c,
0x3e, 0x5f, 0x63, 0x57, 0x57, 0x57, 0xaa, 0x9a, 0xda, 0xda, 0xda, 0x04, 0x5a, 0x68, 0x33, 0x1a,
0x8d, 0xdc, 0x6c, 0x82, 0x41, 0xb5, 0x2e, 0x89, 0x44, 0x12, 0x27, 0x67, 0xaa, 0xab, 0xab, 0x69,
0x87, 0xc3, 0xe1, 0x87, 0x3a, 0x83, 0x7a, 0xbd, 0x3e, 0x3c, 0x31, 0x31, 0x91, 0x74, 0xbb, 0xdd,
0x4f, 0xce, 0x80, 0x70, 0xc8, 0x50, 0x55, 0x55, 0x45, 0x93, 0x43, 0x64, 0x16, 0x00, 0xdf, 0xc9,
0x36, 0x60, 0x04, 0xb9, 0xbb, 0xbe, 0xbe, 0x6e, 0x1c, 0x1a, 0x1a, 0x4a, 0xa6, 0xab, 0x52, 0x28,
0x14, 0x09, 0x0e, 0x87, 0x13, 0x29, 0x29, 0x29, 0x89, 0x21, 0x9e, 0x27, 0x63, 0xeb, 0xf0, 0x60,
0x97, 0xcc, 0x25, 0x2f, 0x2f, 0x2f, 0x8a, 0xb2, 0xf7, 0x33, 0x05, 0x47, 0x5b, 0xe4, 0xc8, 0xfa,
0x35, 0x66, 0xe4, 0x43, 0x32, 0x14, 0x64, 0x9e, 0x14, 0x08, 0x04, 0xb1, 0xd3, 0x6a, 0xec, 0xe8,
0xe8, 0x88, 0x38, 0x9d, 0xce, 0x17, 0x19, 0xc5, 0x00, 0x50, 0x88, 0xbc, 0x24, 0x14, 0x0a, 0x63,
0x50, 0x91, 0x3d, 0x13, 0x88, 0x2c, 0xe9, 0xd2, 0xd2, 0xd2, 0x91, 0x4a, 0xa5, 0x4a, 0x32, 0x49,
0x1e, 0x89, 0x46, 0x70, 0x7e, 0x1f, 0x49, 0xf1, 0x98, 0x40, 0xde, 0x82, 0x82, 0x02, 0x52, 0x11,
0x51, 0x5a, 0x80, 0xa9, 0x65, 0x81, 0x40, 0xe0, 0x16, 0x84, 0xf0, 0x4d, 0xa3, 0xd1, 0xc4, 0x33,
0x81, 0xea, 0xeb, 0xeb, 0x69, 0xcc, 0xf7, 0x0d, 0xa3, 0xbc, 0xe1, 0x02, 0x96, 0xb2, 0xb2, 0xb2,
0xd4, 0xe1, 0xe9, 0xe9, 0xe9, 0x10, 0x94, 0x23, 0x64, 0x82, 0x91, 0x6c, 0x01, 0xfb, 0xda, 0xdf,
0xdf, 0x7f, 0xc4, 0xe5, 0x72, 0x4f, 0x80, 0x26, 0x27, 0x27, 0x0f, 0x50, 0xb9, 0x84, 0x11, 0x44,
0xb2, 0xa8, 0xab, 0xab, 0x4b, 0x2d, 0x62, 0x53, 0x53, 0x53, 0x02, 0x81, 0x3e, 0xe4, 0xb0, 0x16,
0x0e, 0xce, 0xe8, 0x47, 0x47, 0x47, 0xc3, 0x7c, 0x3e, 0x3f, 0xb5, 0x12, 0x15, 0x15, 0x15, 0x34,
0x12, 0x36, 0x67, 0x5d, 0x58, 0xec, 0x91, 0xc8, 0x6c, 0x36, 0x53, 0x24, 0x43, 0xa2, 0x9c, 0xf1,
0xf1, 0xf1, 0x43, 0xe2, 0x77, 0xb9, 0x7c, 0x0c, 0xca, 0x7b, 0x3a, 0x35, 0x35, 0x15, 0x14, 0x8b,
0xc5, 0x71, 0x2c, 0x3b, 0xe9, 0xc4, 0xc3, 0x9c, 0xce, 0x60, 0xb7, 0xdb, 0xdf, 0xa6, 0x7b, 0xcf,
0xe3, 0xf1, 0x88, 0xed, 0x84, 0x51, 0xd9, 0x27, 0x48, 0x59, 0x0d, 0xb9, 0x97, 0x66, 0x71, 0xf9,
0xfb, 0xd8, 0x9f, 0x5d, 0xb2, 0x57, 0xe7, 0xb2, 0x20, 0xf2, 0x59, 0x40, 0xe0, 0xef, 0x4a, 0xa5,
0x32, 0xb5, 0x4f, 0x6c, 0x36, 0x9b, 0x2c, 0x62, 0xb2, 0xbb, 0xbb, 0xfb, 0x10, 0x2d, 0x09, 0xc3,
0x70, 0x95, 0x4c, 0x30, 0x58, 0x53, 0x29, 0xfc, 0xee, 0xf1, 0xb9, 0x4d, 0x15, 0xd9, 0x8b, 0x01,
0x73, 0xea, 0x74, 0xba, 0x13, 0xfb, 0x01, 0xbb, 0x09, 0x01, 0xa4, 0xfa, 0xab, 0x1f, 0xbe, 0x50,
0x28, 0x74, 0x1d, 0x83, 0x86, 0x03, 0x19, 0x83, 0xed, 0xed, 0xed, 0xd1, 0xca, 0xca, 0x4a, 0xba,
0xb7, 0xb7, 0x37, 0x06, 0x50, 0xe3, 0x85, 0x7c, 0x61, 0x21, 0x53, 0x29, 0x2a, 0x7c, 0x86, 0xfe,
0x8f, 0xc1, 0x0d, 0xfc, 0xb8, 0x7f, 0x7e, 0x29, 0xff, 0x0c, 0x39, 0x4c, 0xf6, 0x1f, 0xfa, 0x0b,
0xfa, 0x01, 0xc9, 0xf9, 0x18, 0xa7, 0x07, 0x84, 0xbf, 0x95, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45,
0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
};
const BITMAP_OPAQUE zoom_redraw_xpm[1] = {{ png, sizeof( png ), "zoom_redraw_xpm" }};
......
......@@ -95,10 +95,8 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC( wxWindow
wxToolTip::Enable( true );
if( GetSizer() )
{
GetSizer()->SetSizeHints( this );
}
GetSizer()->SetSizeHints( this );
Center();
stdDialogButtonSizerOK->SetDefault();
}
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -1059,12 +1059,31 @@ void TRACK::DisplayInfoBase( EDA_DRAW_FRAME* frame )
#if defined(DEBUG)
/* Display the flags */
// Display the flags
msg.Printf( wxT( "0x%08X" ), m_Flags );
frame->AppendMsgPanel( _( "Flags" ), msg, BLUE );
frame->AppendMsgPanel( wxT( "Flags" ), msg, BLUE );
#if 0
// Display start and end pointers:
msg.Printf( wxT( "%p" ), start );
frame->AppendMsgPanel( wxT( "start ptr" ), msg, BLUE );
msg.Printf( wxT( "%p" ), end );
frame->AppendMsgPanel( wxT( "end ptr" ), msg, BLUE );
// Display this ptr
msg.Printf( wxT( "%p" ), this );
frame->AppendMsgPanel( wxT( "this" ), msg, BLUE );
#endif
#if 0
// Display start and end positions:
msg.Printf( wxT( "%d %d" ), m_Start.x, m_Start.y );
frame->AppendMsgPanel( wxT( "Start pos" ), msg, BLUE );
msg.Printf( wxT( "%d %d" ), m_End.x, m_End.y );
frame->AppendMsgPanel( wxT( "End pos" ), msg, BLUE );
#endif
#endif // defined(DEBUG)
/* Display the State member */
msg = wxT( ". . " );
......@@ -1219,6 +1238,18 @@ TRACK* TRACK::GetVia( TRACK* aEndTrace, const wxPoint& aPosition, int aLayerMask
}
/*
* GetTrace is a helper function to locate a trace segment having an end point at aPosition
* on aLayerMask starting at aStartTrace and end at aEndTrace.
* The segments of track that are flagged as deleted or busy are ignored.
* To speed up the search, this search is made:
* first on the previous and next neightbour (NEIGHTBOUR_COUNT_MAX size)
* of this.
* After, only if no track found, on aStartTrace to aEndTrace
* Because tracks are grouped when entered in list, most of time the first search
* find the connection.
* The speedup is *very* large
*/
TRACK* TRACK::GetTrace( TRACK* aStartTrace, TRACK* aEndTrace, int aEndPoint )
{
const int NEIGHTBOUR_COUNT_MAX = 50;
......@@ -1239,6 +1270,7 @@ TRACK* TRACK::GetTrace( TRACK* aStartTrace, TRACK* aEndTrace, int aEndPoint )
previousSegment = nextSegment = this;
// Local search:
for( ii = 0; ii < NEIGHTBOUR_COUNT_MAX; ii++ )
{
if( (nextSegment == NULL) && (previousSegment == NULL) )
......
......@@ -10,8 +10,6 @@
#include "protos.h"
//#include <algorithm>
extern void Merge_SubNets_Connected_By_CopperAreas( BOARD* aPcb );
extern void Merge_SubNets_Connected_By_CopperAreas( BOARD* aPcb, int aNetcode );
......@@ -552,7 +550,7 @@ void PCB_BASE_FRAME::RecalculateAllTracksNetcode()
* the connection (if found) is between segments
* when a track has a net code and the other has a null net code, the null net code is changed
*/
#if 1
for( pt_trace = m_Pcb->m_Track; pt_trace != NULL; pt_trace = pt_trace->Next() )
{
if( pt_trace->start == NULL )
......@@ -564,8 +562,43 @@ void PCB_BASE_FRAME::RecalculateAllTracksNetcode()
{
pt_trace->end = pt_trace->GetTrace( m_Pcb->m_Track, NULL, END );
}
}
}
#else
for( pt_trace = m_Pcb->m_Track; pt_trace != NULL; pt_trace = pt_trace->Next() )
{
if( pt_trace->start != NULL )
continue;
TRACK * candidate = pt_trace->GetTrace( m_Pcb->m_Track, NULL, START );
if( candidate == NULL )
continue;
if( candidate->start == pt_trace || candidate->end == pt_trace )
{
candidate->SetState( BUSY, ON );
pt_trace->start = pt_trace->GetTrace( m_Pcb->m_Track, NULL, START );
candidate->SetState( BUSY, OFF );
}
else
pt_trace->start = candidate;
}
for( pt_trace = m_Pcb->m_Track; pt_trace != NULL; pt_trace = pt_trace->Next() )
{
if( pt_trace->end != NULL )
continue;
TRACK * candidate = pt_trace->GetTrace( m_Pcb->m_Track, NULL, END );
if( candidate == NULL )
continue;
if( candidate->start == pt_trace || candidate->end == pt_trace )
{
candidate->SetState( BUSY, ON );
pt_trace->end = pt_trace->GetTrace( m_Pcb->m_Track, NULL, END );
candidate->SetState( BUSY, OFF );
}
else
pt_trace->end = candidate;
}
#endif
/**********************************************************/
/* Propagate net codes from a segment to an other segment */
/**********************************************************/
......
......@@ -74,13 +74,13 @@ END_EVENT_TABLE()
DIMENSION_EDITOR_DIALOG::DIMENSION_EDITOR_DIALOG( PCB_EDIT_FRAME* aParent,
DIMENSION* aDimension, wxDC* aDC ) :
wxDialog( aParent, -1, _( "Dimension Properties" ) )
wxDialog( aParent, -1, wxString( _( "Dimension Properties" ) ) )
{
SetFocus();
wxButton* Button;
m_Parent = aParent;
m_DC = aDC;
Centre();
CurrentDimension = aDimension;
......@@ -143,6 +143,7 @@ DIMENSION_EDITOR_DIALOG::DIMENSION_EDITOR_DIALOG( PCB_EDIT_FRAME* aParent,
GetSizer()->Fit( this );
GetSizer()->SetSizeHints( this );
Centre();
}
......
......@@ -153,7 +153,7 @@ void AddSegmentToDragList( EDA_DRAW_PANEL* panel, wxDC* DC, int flag, TRACK* Tra
/* Build the list of tracks connected to the ref point
* Net codes must be OK.
* Net codes must be up to date, because only tracks having the right net code are tested.
* @param aRefPos = reference point of connection
*/
void Collect_TrackSegmentsToDrag( EDA_DRAW_PANEL* panel, wxDC* DC,
......@@ -165,7 +165,7 @@ void Collect_TrackSegmentsToDrag( EDA_DRAW_PANEL* panel, wxDC* DC,
for( ; track; track = track->Next() )
{
if( track->GetNet() != net_code ) // Bad net, not connected
if( track->GetNet() != net_code ) // not the same netcodenet code: all candidates tested
break;
if( ( LayerMask & track->ReturnMaskLayer() ) == 0 )
......
......@@ -31,16 +31,14 @@ class D_PAD;
/* TRPISTE.CPP */
/***************/
/* Routine trace of n consecutive segments in memory.
* Useful for mounting a track record for being the segments that
* Tracks are contiguous in memory
* Parameters:
* Pt_start_piste = starting address of the list of segments
* Nbsegment = number of segments was traced
* Mode_color = mode (GrXOR, Gror ..)
* CAUTION:
* The starting point of a track following MUST exist: may be
* Then put a 0 before calling a routine if the track is the last draw
/**
* Function DrawTraces
* Draws n consecutive track segments in list.
* Useful to show a track when it is a chain of segments
* (fir instance when creating a new track)
* @param aTrackList = First segment
* @param nbsegment = number of segments in list
* @param Mode_color = mode (GRXOR, GROR ..)
*/
void DrawTraces( EDA_DRAW_PANEL* panel,
wxDC* DC,
......
......@@ -12,16 +12,13 @@
#include "protos.h"
/**
* Draw a list of trace segmants.
*
* Parameters:
* Pt_start_trace = first segment in the list
* Nbsegment = number of segments traced
* Draw_mode = mode (GR_XOR, GR_OR ..)
* CAUTION:
* The starting point of a track following MUST exist: may be
* then put a 0 before calling a routine if the track is the last drawn.
/*
* Draws n consecutive track segments in list.
* Useful to show a track when it is a chain of segments
* (fir instance when creating a new track)
* param aTrackList = First segment
* param nbsegment = number of segments in list
* param Mode_color = mode (GRXOR, GROR ..)
*/
void DrawTraces( EDA_DRAW_PANEL* panel, wxDC* DC, TRACK* aTrackList, int nbsegment, int draw_mode )
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment