Eeschema: minor fixes:
* make 2 bitmaps more visible. * fix incorrect screen redraw when rotating a component. * netlist : the pcbnew advanced format can be now stored (persistant option) in project config.
This commit is contained in:
parent
2e29b4f152
commit
396538e176
|
@ -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,
|
||||
};
|
||||
|
||||
|
|
|
@ -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" }};
|
||||
|
|
|
@ -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">
|
||||
<metadata
|
||||
id="metadata133">
|
||||
|
@ -23,7 +23,7 @@
|
|||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||
<dc:title></dc:title>
|
||||
<dc:title />
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
|
@ -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" />
|
||||
<defs
|
||||
|
@ -302,7 +302,8 @@
|
|||
<stop
|
||||
stop-color="#00537d"
|
||||
offset="0"
|
||||
id="stop12-2" />
|
||||
id="stop12-2"
|
||||
style="stop-color:#c1b7df;stop-opacity:1;" />
|
||||
<stop
|
||||
stop-color="#186389"
|
||||
offset=".0151"
|
||||
|
@ -402,7 +403,8 @@
|
|||
<stop
|
||||
stop-color="#fff"
|
||||
offset="0"
|
||||
id="stop53-1" />
|
||||
id="stop53-1"
|
||||
style="stop-color:#e8f71e;stop-opacity:1;" />
|
||||
<stop
|
||||
stop-color="#555753"
|
||||
offset="1"
|
||||
|
@ -418,7 +420,8 @@
|
|||
<stop
|
||||
stop-color="#fff"
|
||||
offset="0"
|
||||
id="stop58-0" />
|
||||
id="stop58-0"
|
||||
style="stop-color:#23ff39;stop-opacity:1;" />
|
||||
<stop
|
||||
stop-color="#393b38"
|
||||
offset="1"
|
||||
|
@ -477,7 +480,8 @@
|
|||
r="63.911999">
|
||||
<stop
|
||||
offset="0"
|
||||
id="stop7-2" />
|
||||
id="stop7-2"
|
||||
style="stop-color:#1212f7;stop-opacity:1;" />
|
||||
<stop
|
||||
stop-opacity="0"
|
||||
offset="1"
|
||||
|
@ -495,7 +499,7 @@
|
|||
stop-color="#646464"
|
||||
offset="0"
|
||||
id="stop89"
|
||||
style="stop-color:#4e4e4e;stop-opacity:1;" />
|
||||
style="stop-color:#272727;stop-opacity:1;" />
|
||||
<stop
|
||||
stop-color="#7e7e7e"
|
||||
offset="0"
|
||||
|
@ -529,7 +533,8 @@
|
|||
<stop
|
||||
stop-color="#fff"
|
||||
offset="0"
|
||||
id="stop82-1" />
|
||||
id="stop82-1"
|
||||
style="stop-color:#60d7b7;stop-opacity:1;" />
|
||||
<stop
|
||||
stop-color="#fff"
|
||||
offset=".5"
|
||||
|
@ -580,141 +585,132 @@
|
|||
y1="47.403999"
|
||||
x2="4"
|
||||
y2="47.403999" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#k-7"
|
||||
id="linearGradient4075"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(0.39486557,0,0,0.40094471,18.078162,-1.517356)"
|
||||
x1="64.129997"
|
||||
y1="56.230999"
|
||||
x2="2.7471001"
|
||||
y2="56.230999" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#n-3"
|
||||
id="linearGradient4087"
|
||||
x1="19.595039"
|
||||
y1="18.522619"
|
||||
x2="46.445431"
|
||||
y2="18.522619"
|
||||
gradientUnits="userSpaceOnUse" />
|
||||
<radialGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#q-9"
|
||||
id="radialGradient3112"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(-0.37078,0,0,0.36885,43.685661,-0.6808313)"
|
||||
cx="102"
|
||||
cy="112.3"
|
||||
r="139.56" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#o-4"
|
||||
id="linearGradient3131"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
x1="96"
|
||||
y1="104"
|
||||
x2="88"
|
||||
y2="96"
|
||||
gradientTransform="matrix(-0.37078,0,0,0.36885,43.685661,-0.6808313)" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#n-3"
|
||||
id="linearGradient3134"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
x1="95"
|
||||
y1="103"
|
||||
x2="87.292999"
|
||||
y2="95.292999"
|
||||
gradientTransform="matrix(-0.37078,0,0,0.36885,43.685661,-0.6808313)" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#m-8"
|
||||
id="linearGradient3137"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
x1="95"
|
||||
y1="103"
|
||||
x2="86.586998"
|
||||
y2="94.586998"
|
||||
gradientTransform="matrix(-0.37078,0,0,0.36885,43.685661,-0.6808313)" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#l-9"
|
||||
id="linearGradient3140"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
x1="94.344002"
|
||||
y1="102.34"
|
||||
x2="86.536003"
|
||||
y2="94.537003"
|
||||
gradientTransform="matrix(-0.37078,0,0,0.36885,43.685661,-0.6808313)" />
|
||||
</defs>
|
||||
<g
|
||||
transform="matrix(0.36018,0,0,0.36249,-48.695995,-2.2897492)"
|
||||
id="g97">
|
||||
<g
|
||||
transform="translate(0,4)"
|
||||
id="g99">
|
||||
<path
|
||||
d="m 16,4 c -2.206,0 -4,1.794 -4,4 v 110 c 0,3.309 2.691,6 6,6 h 59.172 c 1.299,0 2.545,-0.487 3.641,-1.354 0.128,-0.053 0.257,-0.107 0.257,-0.107 0.098,-0.073 12.134,-10.086 17.759,-15.711 5.374,-5.371 14.61,-16.425 15.646,-17.667 0.91,-0.882 1.52,-2.439 1.52,-3.989 V 8 c 0,-2.206 -1.794,-4 -4,-4 h -96 z"
|
||||
id="path101"
|
||||
style="opacity:0.1" />
|
||||
<path
|
||||
d="m 16,5 c -1.654,0 -3,1.346 -3,3 v 110 c 0,2.757 2.243,5 5,5 h 59.172 c 1.189,0 2.282,-0.47 3.182,-1.229 0.042,-0.021 0.09,-0.014 0.129,-0.042 0.079,-0.06 12.017,-9.986 17.639,-15.608 5.312,-5.31 14.55,-16.358 15.585,-17.601 0.785,-0.764 1.294,-2.043 1.294,-3.349 V 8 c 0,-1.654 -1.346,-3 -3,-3 h -96 z"
|
||||
id="path103"
|
||||
style="opacity:0.15" />
|
||||
<path
|
||||
d="m 16,6 c -1.103,0 -2,0.897 -2,2 v 110 c 0,2.206 1.794,4 4,4 h 59.172 c 1.068,0 2.072,-0.416 2.828,-1.172 -0.035,0.036 -0.074,0.068 -0.114,0.099 0.076,-0.057 11.96,-9.944 17.528,-15.513 5.265,-5.264 14.49,-16.294 15.524,-17.534 0.65,-0.644 1.06,-1.65 1.06,-2.708 V 8 c 0,-1.103 -0.897,-2 -2,-2 h -96 z"
|
||||
id="path105"
|
||||
style="opacity:0.2" />
|
||||
<path
|
||||
d="m 16,7 c -0.552,0 -1,0.448 -1,1 v 110 c 0,1.654 1.346,3 3,3 h 59.172 c 0.801,0 1.555,-0.312 2.121,-0.879 0.052,-0.038 11.945,-9.945 17.414,-15.414 5.469,-5.469 15.376,-17.362 15.476,-17.481 0.51,-0.499 0.82,-1.253 0.82,-2.054 V 8 c 0,-0.552 -0.447,-1 -1,-1 h -96 z"
|
||||
id="path107"
|
||||
style="opacity:0.25" />
|
||||
</g>
|
||||
<path
|
||||
d="m 16,12 v 110 c 0,1.104 0.896,2 2,2 h 59.172 c 0.53,0 1.039,-0.211 1.414,-0.586 L 111.41,90.602 C 111.79,90.227 112,89.718 112,89.188 V 12.016 H 16 z"
|
||||
id="path109"
|
||||
style="fill:url(#p)" />
|
||||
<path
|
||||
d="m 18,13 c -0.551,0 -1,0.449 -1,1 v 108 c 0,0.552 0.449,1 1,1 h 59.172 c 0.263,0 0.521,-0.106 0.707,-0.293 L 110.71,89.867 C 110.89,89.68 111,89.423 111,89.16 V 13.988 c 0,-0.551 -0.448,-1 -1,-1 H 18 z"
|
||||
id="path111"
|
||||
style="fill:url(#q)" />
|
||||
<g
|
||||
transform="translate(0,4)"
|
||||
id="g113">
|
||||
<path
|
||||
d="M 111.41,86.586 C 111.66,86.336 93.035,93 88,93 c -1.654,0 -3,1.346 -3,3 0,5.035 -6.664,23.664 -6.414,23.414 l 32.828,-32.828 z"
|
||||
id="path115"
|
||||
style="opacity:0.1;fill:url(#j)" />
|
||||
<path
|
||||
d="M 111.41,86.586 C 111.79,86.211 97.444,94 88,94 c -1.103,0 -2,0.897 -2,2 0,9.444 -7.789,23.789 -7.414,23.414 l 32.828,-32.828 z"
|
||||
id="path117"
|
||||
style="opacity:0.1;fill:url(#k)" />
|
||||
<path
|
||||
d="M 111.41,86.586 C 111.65,86.347 97.807,95 88,95 c -0.553,0 -1,0.447 -1,1 0,9.807 -8.653,23.653 -8.414,23.414 l 32.828,-32.828 z"
|
||||
id="path119"
|
||||
style="opacity:0.1;fill:url(#l)" />
|
||||
<path
|
||||
d="m 78.586,119.41 c 0,0 11.914,-9.914 17.414,-15.414 5.5,-5.5 15.414,-17.414 15.414,-17.414 0,0 -13.164,9.414 -23.414,9.414 0,10.25 -9.414,23.414 -9.414,23.414 z"
|
||||
id="path121"
|
||||
style="fill:url(#m)" />
|
||||
</g>
|
||||
</g>
|
||||
<path
|
||||
d="m -6.9146949,45.129051 a 23.052,1.8806 0 1 1 -46.1030001,0 23.052,1.8806 0 1 1 46.1030001,0 z"
|
||||
id="path123"
|
||||
style="opacity:0.38140001;fill:url(#r)" />
|
||||
<g
|
||||
id="g3935"
|
||||
transform="matrix(1.1263099,0,0,1.1107396,-54.645319,-1.0686916)">
|
||||
<path
|
||||
d="m 15.366698,5.98206 c -0.339985,0.028015 -0.659057,0.1764485 -0.90045,0.4188681 l -2.88144,2.89824 c -0.52082,0.5242192 -0.564762,1.3596369 -0.10121,1.9360239 l 3.894626,4.89078 -12.854104,0 c -0.7956376,8.1e-5 -1.440648,0.648844 -1.44072,1.44912 l 0,4.34736 c 7.96e-5,0.800277 0.6450824,1.449048 1.44072,1.44912 l 12.854104,0 -3.894626,4.89078 c -0.463444,0.576388 -0.419754,1.411661 0.1013,1.935952 l 2.88144,2.89824 c 0.276002,0.277797 0.656356,0.43662 1.046755,0.430208 0.390399,-0.0064 0.757423,-0.177474 1.02428,-0.464153 l 11.52576,-12.31752 c 0.525899,-0.558853 0.525899,-1.433687 0,-1.99254 L 16.537373,6.4350187 C 16.236623,6.1122272 15.805487,5.9455784 15.366788,5.9821687 z M 15.4906,7.43118 27.01636,19.7487 15.4906,32.06622 l -2.88144,-2.89824 5.76288,-7.2456 -15.84792,0 0,-4.34736 15.84792,0 -5.76288,-7.2456 2.88144,-2.89824 z"
|
||||
id="path127"
|
||||
style="fill:url(#linearGradient3939);fill-opacity:1" />
|
||||
<path
|
||||
d="M 12.60916,29.16798 15.4906,32.06622 27.01636,19.7487 15.4906,7.43118 l -2.88144,2.89824 5.76288,7.2456 -15.84792,0 0,4.34736 15.84792,0 -5.76288,7.2456 z"
|
||||
id="path129"
|
||||
style="fill:url(#linearGradient3941)" />
|
||||
</g>
|
||||
<g
|
||||
transform="matrix(-0.37078,0,0,0.36885,43.685661,-2.1562313)"
|
||||
id="g99-9">
|
||||
<g
|
||||
transform="translate(0,4)"
|
||||
id="g101">
|
||||
<path
|
||||
d="m 16,4 c -2.206,0 -4,1.794 -4,4 v 110 c 0,3.309 2.691,6 6,6 h 59.172 c 1.299,0 2.545,-0.487 3.641,-1.354 0.128,-0.053 0.257,-0.107 0.257,-0.107 0.098,-0.073 12.134,-10.086 17.759,-15.711 5.374,-5.371 14.61,-16.425 15.646,-17.667 0.91,-0.882 1.52,-2.439 1.52,-3.989 V 8 c 0,-2.206 -1.794,-4 -4,-4 h -96 z"
|
||||
id="path103-7"
|
||||
style="opacity:0.1" />
|
||||
<path
|
||||
d="m 16,5 c -1.654,0 -3,1.346 -3,3 v 110 c 0,2.757 2.243,5 5,5 h 59.172 c 1.189,0 2.282,-0.47 3.182,-1.229 0.042,-0.021 0.09,-0.014 0.129,-0.042 0.079,-0.06 12.017,-9.986 17.639,-15.608 5.312,-5.31 14.55,-16.358 15.585,-17.601 0.785,-0.764 1.294,-2.043 1.294,-3.349 V 8 c 0,-1.654 -1.346,-3 -3,-3 h -96 z"
|
||||
id="path105-5"
|
||||
style="opacity:0.15" />
|
||||
<path
|
||||
d="m 16,6 c -1.103,0 -2,0.897 -2,2 v 110 c 0,2.206 1.794,4 4,4 h 59.172 c 1.068,0 2.072,-0.416 2.828,-1.172 -0.035,0.036 -0.074,0.068 -0.114,0.099 0.076,-0.057 11.96,-9.944 17.528,-15.513 5.265,-5.264 14.49,-16.294 15.524,-17.534 0.65,-0.644 1.06,-1.65 1.06,-2.708 V 8 c 0,-1.103 -0.897,-2 -2,-2 h -96 z"
|
||||
id="path107-3"
|
||||
style="opacity:0.2" />
|
||||
<path
|
||||
d="m 16,7 c -0.552,0 -1,0.448 -1,1 v 110 c 0,1.654 1.346,3 3,3 h 59.172 c 0.801,0 1.555,-0.312 2.121,-0.879 0.052,-0.038 11.945,-9.945 17.414,-15.414 5.469,-5.469 15.376,-17.362 15.476,-17.481 0.51,-0.499 0.82,-1.253 0.82,-2.054 V 8 c 0,-0.552 -0.447,-1 -1,-1 h -96 z"
|
||||
id="path109-8"
|
||||
style="opacity:0.25" />
|
||||
</g>
|
||||
<path
|
||||
d="m 16,12 v 110 c 0,1.104 0.896,2 2,2 h 59.172 c 0.53,0 1.039,-0.211 1.414,-0.586 L 111.41,90.602 C 111.79,90.227 112,89.718 112,89.188 V 12.016 H 16 z"
|
||||
id="path111-8"
|
||||
style="fill:url(#p-1)" />
|
||||
<path
|
||||
d="m 18,13 c -0.551,0 -1,0.449 -1,1 v 108 c 0,0.552 0.449,1 1,1 h 59.172 c 0.263,0 0.521,-0.106 0.707,-0.293 L 110.71,89.867 C 110.89,89.68 111,89.423 111,89.16 V 13.988 c 0,-0.551 -0.448,-1 -1,-1 H 18 z"
|
||||
id="path113"
|
||||
style="fill:url(#q-9)" />
|
||||
<g
|
||||
transform="translate(0,4)"
|
||||
id="g115">
|
||||
<path
|
||||
d="M 111.41,86.586 C 111.66,86.336 93.035,93 88,93 c -1.654,0 -3,1.346 -3,3 0,5.035 -6.664,23.664 -6.414,23.414 l 32.828,-32.828 z"
|
||||
id="path117-3"
|
||||
style="opacity:0.1;fill:url(#l-9)" />
|
||||
<path
|
||||
d="M 111.41,86.586 C 111.79,86.211 97.444,94 88,94 c -1.103,0 -2,0.897 -2,2 0,9.444 -7.789,23.789 -7.414,23.414 l 32.828,-32.828 z"
|
||||
id="path119-1"
|
||||
style="opacity:0.1;fill:url(#m-8)" />
|
||||
<path
|
||||
d="M 111.41,86.586 C 111.65,86.347 97.807,95 88,95 c -0.553,0 -1,0.447 -1,1 0,9.807 -8.653,23.653 -8.414,23.414 l 32.828,-32.828 z"
|
||||
id="path121-8"
|
||||
style="opacity:0.1;fill:url(#n-3)" />
|
||||
<path
|
||||
d="m 78.586,119.41 c 0,0 11.914,-9.914 17.414,-15.414 5.5,-5.5 15.414,-17.414 15.414,-17.414 0,0 -13.164,9.414 -23.414,9.414 0,10.25 -9.414,23.414 -9.414,23.414 z"
|
||||
id="path123-9"
|
||||
style="fill:url(#o-4)" />
|
||||
</g>
|
||||
</g>
|
||||
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" />
|
||||
<path
|
||||
d="m 37.753181,1.1634187 c 0.61327,0 1.11234,0.4964721 1.11234,1.10655 V 42.843469 c 0,1.016919 -0.83166,1.84425 -1.8539,1.84425 H 15.071827 c -0.440858,0 -0.84612,-0.17336 -1.179822,-0.453317 -0.01557,-0.0077 -0.03337,-0.0052 -0.04783,-0.01549 C 13.814883,44.196779 9.388511,40.535574 7.3039858,38.4619 5.3344025,36.503306 1.9091368,32.428251 1.5253795,31.969771 1.2343172,31.687969 1.0455902,31.21621 1.0455902,30.734492 V 2.2699687 c 0,-0.6100779 0.4990699,-1.10655 1.11234,-1.10655 H 37.75281 z"
|
||||
id="path105-5"
|
||||
style="opacity:0.15"
|
||||
inkscape:connector-curvature="0" />
|
||||
<path
|
||||
d="m 37.753181,1.5322687 c 0.40897,0 0.74156,0.3308585 0.74156,0.7377 V 42.843469 c 0,0.813683 -0.665179,1.4754 -1.48312,1.4754 H 15.071827 c -0.395993,0 -0.768256,-0.153442 -1.048566,-0.432292 0.01298,0.01328 0.02744,0.02508 0.04227,0.03652 -0.02818,-0.02103 -4.4345289,-3.667845 -6.4990319,-5.72197 C 5.6143414,36.259496 2.1938959,32.191081 1.8105094,31.733707 1.5695024,31.496167 1.4174826,31.125104 1.4174826,30.734861 V 2.2699687 c 0,-0.4068415 0.3325896,-0.7377 0.74156,-0.7377 H 37.753923 z"
|
||||
id="path107-3"
|
||||
style="opacity:0.2"
|
||||
inkscape:connector-curvature="0" />
|
||||
<path
|
||||
d="m 37.753181,1.9011187 c 0.204671,0 0.37078,0.1652448 0.37078,0.36885 V 42.843469 c 0,0.610078 -0.49907,1.10655 -1.11234,1.10655 H 15.071827 c -0.296995,0 -0.576563,-0.115081 -0.786425,-0.324219 C 14.266122,43.611783 9.8564354,39.957586 7.8286395,37.940346 5.8008437,35.923105 2.1275263,31.536372 2.0904483,31.492479 1.9013505,31.308423 1.7864087,31.03031 1.7864087,30.734861 V 2.2699687 c 0,-0.2036052 0.1657386,-0.36885 0.37078,-0.36885 H 37.752069 z"
|
||||
id="path109-8"
|
||||
style="opacity:0.25"
|
||||
inkscape:connector-curvature="0" />
|
||||
<path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:#d1d1d1;fill-opacity:1"
|
||||
id="path111-8"
|
||||
d="M 37.753181,2.2699687 V 42.843469 c 0,0.40721 -0.332219,0.7377 -0.74156,0.7377 H 15.071827 c -0.196514,0 -0.385241,-0.07783 -0.524283,-0.216146 L 2.3770612,31.262316 C 2.2361648,31.123998 2.158301,30.936253 2.158301,30.740763 V 2.2758703 h 35.59488 z" />
|
||||
<path
|
||||
d="m 2.3770612,31.256415 c -0.092695,-0.09221 6.8130825,2.365804 8.6799598,2.365804 0.61327,0 1.11234,0.496472 1.11234,1.10655 0,1.857159 2.470878,8.728466 2.378183,8.636254 L 2.3755781,31.256415 z"
|
||||
id="path117-3"
|
||||
style="opacity:0.1;fill:url(#linearGradient3140)"
|
||||
inkscape:connector-curvature="0" />
|
||||
<path
|
||||
d="m 2.3770612,31.256415 c -0.1408964,-0.138319 5.1783135,2.734654 8.6799598,2.734654 0.40897,0 0.74156,0.330858 0.74156,0.7377 0,3.483419 2.888005,8.774572 2.748963,8.636254 L 2.3755781,31.256415 z"
|
||||
id="path119-1"
|
||||
style="opacity:0.1;fill:url(#linearGradient3137)"
|
||||
inkscape:connector-curvature="0" />
|
||||
<path
|
||||
d="m 2.3770612,31.256415 c -0.088987,-0.08816 5.0437203,3.103504 8.6799598,3.103504 0.205041,0 0.37078,0.164876 0.37078,0.36885 0,3.617312 3.208359,8.724409 3.119743,8.636254 L 2.3755781,31.256415 z"
|
||||
id="path121-8"
|
||||
style="opacity:0.1;fill:url(#linearGradient3134)"
|
||||
inkscape:connector-curvature="0" />
|
||||
<path
|
||||
d="m 14.547544,43.363547 c 0,0 -4.417473,-3.656779 -6.456763,-5.685454 -2.03929,-2.028675 -5.7152029,-6.423154 -5.7152029,-6.423154 0,0 4.8809479,3.472354 8.6814429,3.472354 0,3.780713 3.490523,8.636254 3.490523,8.636254 z"
|
||||
id="path123-9"
|
||||
style="fill:url(#linearGradient3131)"
|
||||
inkscape:connector-curvature="0" />
|
||||
<path
|
||||
style="opacity:0.38140001;fill:url(#r-6)"
|
||||
d="m 48.136285,46.092969 a 23.73,1.9136 0 1 1 -47.45900492,0 23.73,1.9136 0 1 1 47.45900492,0 z"
|
||||
id="path125" />
|
||||
<g
|
||||
id="g3943"
|
||||
transform="matrix(1.0649592,0,0,1.0870129,-55.998428,-1.5767507)">
|
||||
<path
|
||||
id="path127-6"
|
||||
d="m 84.084009,34.480308 c -0.34999,-0.02852 -0.67845,-0.17965 -0.92694,-0.42646 l -2.966,-2.951 c -0.53652,-0.53372 -0.58138,-1.3843 -0.10419,-1.9711 l 4.0088,-4.9794 h -13.232 c -0.81905,-8.2e-5 -1.483,-0.6606 -1.4831,-1.4754 v -4.4262 c 8.1e-5,-0.81478 0.66406,-1.4753 1.4831,-1.4754 h 13.232 l -4.0088,-4.9794 c -0.477,-0.589 -0.432,-1.4397 0.104,-1.9735003 l 2.966,-2.9507 c 0.28412,-0.28283 0.67567,-0.44453 1.0776,-0.43801 0.40189,0.0065 0.77971,0.18069 1.0544,0.47257 L 97.15388,19.447308 c 0.54141,0.56898 0.54141,1.4597 0,2.0287 l -11.865001,12.541 c -0.30984,0.32865 -0.75364,0.49846 -1.205,0.46106 z m 0.128,-1.476 11.865001,-12.54 -11.865001,-12.5410003 -2.9662,2.9508003 5.9324,7.3769 h -16.314 v 4.4262 h 16.314 l -5.9324,7.3769 2.9662,2.9508 z"
|
||||
style="fill:url(#linearGradient3947)" />
|
||||
<path
|
||||
id="path129-4"
|
||||
d="m 81.246009,30.047308 2.966,2.951 11.865001,-12.541 -11.865001,-12.5410003 -2.966,2.9509003 5.9324,7.3769 h -16.314 v 4.4262 h 16.314 l -5.9324,7.3769 z"
|
||||
style="fill:url(#linearGradient3949)" />
|
||||
</g>
|
||||
<path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:url(#linearGradient4075)"
|
||||
d="m 33.736257,33.765801 c -0.372725,-0.031 -0.722522,-0.195282 -0.987153,-0.463568 l -3.158669,-3.207775 c -0.571372,-0.58016 -0.619146,-1.504752 -0.110958,-2.142611 l 4.269208,-5.412672 H 19.657145 C 18.78489,22.539086 18.07781,21.821094 18.077704,20.935396 V 16.12406 c 8.6e-5,-0.885677 0.707197,-1.60367 1.579441,-1.603779 h 14.09154 L 29.479477,9.1076085 C 28.971491,8.4673575 29.019414,7.542636 29.590232,6.9623882 l 3.158669,-3.207449 c 0.302577,-0.3074399 0.719561,-0.4832098 1.1476,-0.4761225 0.427997,0.00707 0.83036,0.1964123 1.122893,0.5136897 L 47.655136,17.424736 c 0.57658,0.618489 0.57658,1.586713 0,2.205223 L 35.019394,33.262188 c -0.329967,0.357247 -0.802596,0.541832 -1.283275,0.501178 z M 33.872572,32.16137 46.508314,18.530228 33.872572,4.8979985 30.71369,8.1055565 37.031454,16.124342 H 19.657709 v 4.811337 h 17.373745 l -6.317764,8.018785 3.158882,3.207558 z"
|
||||
id="path127-6" />
|
||||
<path
|
||||
inkscape:connector-curvature="0"
|
||||
style="fill:url(#linearGradient4087);fill-opacity:1"
|
||||
d="M 30.651021,28.947073 33.80969,32.154848 46.445432,18.522619 33.80969,4.8903894 30.651021,8.0980565 36.968785,16.116842 H 19.59504 v 4.811337 h 17.373745 l -6.317764,8.018785 z"
|
||||
id="path129-4" />
|
||||
</svg>
|
||||
|
|
Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 21 KiB |
|
@ -1,51 +1,292 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" height="48" width="48" version="1.0">
|
||||
<defs>
|
||||
<linearGradient id="d" y2="106.25" gradientUnits="userSpaceOnUse" x2="49.333" gradientTransform="matrix(.89893 0 0 .89893 30.497 4.8167)" y1="55.785" x1="49.333">
|
||||
<stop stop-color="#bfd9ff" offset="0"/>
|
||||
<stop stop-color="#bfd9ff" stop-opacity="0" offset="1"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="e" y2="54.974" spreadMethod="reflect" gradientUnits="userSpaceOnUse" x2="108.73" gradientTransform="matrix(.89893 0 0 .89893 8.9069 4.8167)" y1="54.974" x1="61.667">
|
||||
<stop stop-color="#eeeeec" offset="0"/>
|
||||
<stop stop-color="#eeeeec" stop-opacity="0" offset="1"/>
|
||||
</linearGradient>
|
||||
<radialGradient id="f" gradientUnits="userSpaceOnUse" cy="112.43" cx="47.953" gradientTransform="matrix(1.8808 -.011744 .0062284 .9975 -24.45 .47983)" r="49.688">
|
||||
<stop stop-color="#eeeeec" offset="0"/>
|
||||
<stop stop-color="#fff" offset="1"/>
|
||||
</radialGradient>
|
||||
</defs>
|
||||
<g transform="matrix(.40183 0 0 .40536 -2.3929 -1.3507)">
|
||||
<path stroke-linejoin="round" d="m16.235 17.52v94.998l100.41 0.0519v-88.4l-61.431 0.10996 0.07655-6.7597h-39.052z" stroke-dashoffset="4" stroke="#888a85" stroke-linecap="round" stroke-width="4.8249" fill="none"/>
|
||||
<path fill="url(#f)" d="m16.751 18.329v93.736l99.376-0.0523v-87.274l-61.014 0.06036 0.06958-6.4544-38.431-0.0157z"/>
|
||||
<rect height="19.256" width="64.77" y="44.606" x="41.876" fill="url(#e)"/>
|
||||
<path d="m40.756 44.898h66.229" stroke="#bbb" stroke-width="3.1463" fill="none"/>
|
||||
<rect height="16.63" width="21.882" y="64.154" x="63.466" fill="url(#d)"/>
|
||||
<path d="m41.998 44.023v19.548" stroke="#bbb" stroke-width="3.1463" fill="none"/>
|
||||
<path d="m64.483 44.023v36.47" stroke="#bbb" stroke-width="3.1463" fill="none"/>
|
||||
<path d="m85.415 44.023v52.808" stroke="#bbb" stroke-width="3.1463" fill="none"/>
|
||||
<path d="m40.756 64.091h66.229" stroke="#bbb" stroke-width="3.1463" fill="none"/>
|
||||
<path d="m84.52 96.744h22.465" stroke="#bbb" stroke-width="3.1463" fill="none"/>
|
||||
<path d="m62.93 80.903h44.056" stroke="#bbb" stroke-width="3.1463" fill="none"/>
|
||||
<path d="m105.48 44.023v52.808" stroke="#bbb" stroke-width="3.1463" fill="none"/>
|
||||
<path d="m27.031 52.775v40.554" stroke="#888a85" stroke-width="3.1463" fill="none"/>
|
||||
<path d="m28.21 74.571h22.465" stroke="#888a85" stroke-width="3.1463" fill="none"/>
|
||||
<path d="m28.21 91.674h45.514" stroke="#888a85" stroke-width="3.1463" fill="none"/>
|
||||
</g>
|
||||
<path fill-opacity=".75688" fill="#fff" d="m17.632 2.7214v-1.064 1.064z"/>
|
||||
<path fill-opacity=".75688" fill="#fff" d="m-86.143-177.98v-3.1071 3.1071z"/>
|
||||
<path fill-opacity=".75688" fill="#fff" d="m67.196-5.2262v-1.064 1.064z"/>
|
||||
<path fill-opacity=".75688" fill="#fff" d="m31.073 22.907v-0.581 0.581z"/>
|
||||
<rect opacity=".57787" height="0" width="1.1118" y="-85.651" x="21.123" fill="#fff"/>
|
||||
<rect opacity=".57787" height="0" width="1.1118" y="-116.26" x="-17.93" fill="#fff"/>
|
||||
<path fill-opacity=".75688" fill="#fff" d="m-194.63-197.66v-3.1071 3.1071z"/>
|
||||
<rect opacity=".57787" height="0" width="1.1118" y="-70.349" x="-258.62" fill="#fff"/>
|
||||
<path fill-opacity=".75688" fill="#fff" d="m-435.32-151.75v-3.1071 3.1071z"/>
|
||||
<path fill-opacity=".75688" fill="#fff" d="m-84.656-191.68v-3.1071 3.1071z"/>
|
||||
<path fill-opacity=".75688" fill="#fff" d="m-758.65-211.82v-3.1071 3.1071z"/>
|
||||
<path fill-opacity=".75688" fill="#fff" d="m-933.21-289.24v-3.1071 3.1071z"/>
|
||||
<path fill-opacity=".75688" fill="#fff" d="m-1066.1-385.55v-3.1071 3.1071z"/>
|
||||
<path fill-opacity=".75688" fill="#fff" d="m-791.91-312.45v-3.1071 3.1071z"/>
|
||||
<path fill-opacity=".75688" fill="#fff" d="m-894.89-230.29v-1.6974 1.6974z"/>
|
||||
<rect opacity=".57787" height="0" width="1.1118" y="-293.22" x="-958.8" fill="#fff"/>
|
||||
<rect opacity=".57787" height="0" width="1.1118" y="-323.82" x="-997.86" fill="#fff"/>
|
||||
<path fill-opacity=".75688" fill="#fff" d="m-1174.6-405.22v-3.1071 3.1071z"/>
|
||||
<?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:xlink="http://www.w3.org/1999/xlink"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
height="48"
|
||||
width="48"
|
||||
version="1.0"
|
||||
id="svg2"
|
||||
inkscape:version="0.48.1 "
|
||||
sodipodi:docname="hierarchy_nav.svg">
|
||||
<metadata
|
||||
id="metadata91">
|
||||
<rdf:RDF>
|
||||
<cc:Work
|
||||
rdf:about="">
|
||||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
<sodipodi:namedview
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1"
|
||||
objecttolerance="10"
|
||||
gridtolerance="10"
|
||||
guidetolerance="10"
|
||||
inkscape:pageopacity="0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:window-width="1280"
|
||||
inkscape:window-height="968"
|
||||
id="namedview89"
|
||||
showgrid="false"
|
||||
inkscape:zoom="15.088678"
|
||||
inkscape:cx="22.775066"
|
||||
inkscape:cy="22.437632"
|
||||
inkscape:window-x="-4"
|
||||
inkscape:window-y="-4"
|
||||
inkscape:window-maximized="1"
|
||||
inkscape:current-layer="svg2" />
|
||||
<defs
|
||||
id="defs4">
|
||||
<linearGradient
|
||||
id="d"
|
||||
y2="106.25"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
x2="49.333"
|
||||
gradientTransform="matrix(0.89893,0,0,0.89893,30.497,4.8167)"
|
||||
y1="55.785"
|
||||
x1="49.333">
|
||||
<stop
|
||||
stop-color="#bfd9ff"
|
||||
offset="0"
|
||||
id="stop7" />
|
||||
<stop
|
||||
stop-color="#bfd9ff"
|
||||
stop-opacity="0"
|
||||
offset="1"
|
||||
id="stop9" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
id="e"
|
||||
y2="54.974"
|
||||
spreadMethod="reflect"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
x2="108.73"
|
||||
gradientTransform="matrix(0.89893,0,0,0.89893,8.9069,4.8167)"
|
||||
y1="54.974"
|
||||
x1="61.667">
|
||||
<stop
|
||||
stop-color="#eeeeec"
|
||||
offset="0"
|
||||
id="stop12" />
|
||||
<stop
|
||||
stop-color="#eeeeec"
|
||||
stop-opacity="0"
|
||||
offset="1"
|
||||
id="stop14" />
|
||||
</linearGradient>
|
||||
<radialGradient
|
||||
id="f"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
cy="112.43"
|
||||
cx="47.953"
|
||||
gradientTransform="matrix(1.8808,-0.011744,0.0062284,0.9975,-24.45,0.47983)"
|
||||
r="49.688">
|
||||
<stop
|
||||
stop-color="#eeeeec"
|
||||
offset="0"
|
||||
id="stop17" />
|
||||
<stop
|
||||
stop-color="#fff"
|
||||
offset="1"
|
||||
id="stop19" />
|
||||
</radialGradient>
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#d"
|
||||
id="linearGradient3847"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(0.76218778,0,0,0.43012929,-26.635041,-21.323625)"
|
||||
x1="49.333"
|
||||
y1="55.785"
|
||||
x2="49.333"
|
||||
y2="106.25" />
|
||||
<radialGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#f"
|
||||
id="radialGradient3854"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(0.86334744,-0.00561939,0.00285904,0.47729408,-17.6905,-7.1554297)"
|
||||
cx="47.953"
|
||||
cy="112.43"
|
||||
r="49.688" />
|
||||
<linearGradient
|
||||
inkscape:collect="always"
|
||||
xlink:href="#d-7"
|
||||
id="linearGradient3847-1"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
gradientTransform="matrix(0.76218778,0,0,0.43012929,-27.03269,-19.681039)"
|
||||
x1="49.333"
|
||||
y1="55.785"
|
||||
x2="49.333"
|
||||
y2="106.25" />
|
||||
<linearGradient
|
||||
id="d-7"
|
||||
y2="106.25"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
x2="49.333"
|
||||
gradientTransform="matrix(0.89893,0,0,0.89893,30.497,4.8167)"
|
||||
y1="55.785"
|
||||
x1="49.333">
|
||||
<stop
|
||||
stop-color="#bfd9ff"
|
||||
offset="0"
|
||||
id="stop7-4" />
|
||||
<stop
|
||||
stop-color="#bfd9ff"
|
||||
stop-opacity="0"
|
||||
offset="1"
|
||||
id="stop9-0" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
y2="106.25"
|
||||
x2="49.333"
|
||||
y1="55.785"
|
||||
x1="49.333"
|
||||
gradientTransform="matrix(0.76218778,0,0,0.43012929,-7.6640124,-7.3671659)"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
id="linearGradient3877"
|
||||
xlink:href="#d-7"
|
||||
inkscape:collect="always" />
|
||||
<linearGradient
|
||||
y2="106.25"
|
||||
x2="49.333"
|
||||
y1="55.785"
|
||||
x1="49.333"
|
||||
gradientTransform="matrix(0.76218778,0,0,0.43012929,-8.0290314,-5.3595613)"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
id="linearGradient3877-4"
|
||||
xlink:href="#d-7-8"
|
||||
inkscape:collect="always" />
|
||||
<linearGradient
|
||||
id="d-7-8"
|
||||
y2="106.25"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
x2="49.333"
|
||||
gradientTransform="matrix(0.89893,0,0,0.89893,30.497,4.8167)"
|
||||
y1="55.785"
|
||||
x1="49.333">
|
||||
<stop
|
||||
stop-color="#bfd9ff"
|
||||
offset="0"
|
||||
id="stop7-4-8" />
|
||||
<stop
|
||||
stop-color="#bfd9ff"
|
||||
stop-opacity="0"
|
||||
offset="1"
|
||||
id="stop9-0-2" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
y2="106.25"
|
||||
x2="49.333"
|
||||
y1="55.785"
|
||||
x1="49.333"
|
||||
gradientTransform="matrix(0.76218778,0,0,0.43012929,0.00138586,6.7013661)"
|
||||
gradientUnits="userSpaceOnUse"
|
||||
id="linearGradient3911"
|
||||
xlink:href="#d-7-8"
|
||||
inkscape:collect="always" />
|
||||
</defs>
|
||||
<rect
|
||||
style="fill:#dfdfdf;fill-opacity:1;stroke:#104d06;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
|
||||
id="rect3030"
|
||||
width="46.04565"
|
||||
height="46.04565"
|
||||
x="0.97717398"
|
||||
y="0.97717553" />
|
||||
<path
|
||||
style="fill:none;stroke:#090909;stroke-width:2.25326276;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path47"
|
||||
d="M 9.4086086,14.947149 V 39.577497" />
|
||||
<path
|
||||
style="fill:none;stroke:#323331;stroke-width:2.17193031;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path49"
|
||||
d="M 8.8547504,25.421393 H 19.166905" />
|
||||
<path
|
||||
style="fill:none;stroke:#292a28;stroke-width:1.91258013;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
|
||||
inkscape:connector-curvature="0"
|
||||
id="path51"
|
||||
d="M 10.503246,38.722694 H 26.70401" />
|
||||
<path
|
||||
fill-opacity=".75688"
|
||||
fill="#fff"
|
||||
d="m17.632 2.7214v-1.064 1.064z"
|
||||
id="path53" />
|
||||
<path
|
||||
fill-opacity=".75688"
|
||||
fill="#fff"
|
||||
d="m67.196-5.2262v-1.064 1.064z"
|
||||
id="path57" />
|
||||
<rect
|
||||
opacity=".57787"
|
||||
height="0"
|
||||
width="1.1118"
|
||||
y="-85.651"
|
||||
x="21.123"
|
||||
fill="#fff"
|
||||
id="rect61" />
|
||||
<rect
|
||||
opacity=".57787"
|
||||
height="0"
|
||||
width="1.1118"
|
||||
y="-116.26"
|
||||
x="-17.93"
|
||||
fill="#fff"
|
||||
id="rect63" />
|
||||
<rect
|
||||
opacity=".57787"
|
||||
height="0"
|
||||
width="1.1118"
|
||||
y="-70.349"
|
||||
x="-258.62"
|
||||
fill="#fff"
|
||||
id="rect67" />
|
||||
<rect
|
||||
opacity=".57787"
|
||||
height="0"
|
||||
width="1.1118"
|
||||
y="-293.22"
|
||||
x="-958.8"
|
||||
fill="#fff"
|
||||
id="rect83" />
|
||||
<rect
|
||||
opacity=".57787"
|
||||
height="0"
|
||||
width="1.1118"
|
||||
y="-323.82"
|
||||
x="-997.86"
|
||||
fill="#fff"
|
||||
id="rect85" />
|
||||
<rect
|
||||
style="fill:url(#linearGradient3877);stroke:#0d16a4;stroke-width:2.718;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
|
||||
id="rect31-9"
|
||||
x="20.28985"
|
||||
y="21.025156"
|
||||
width="18.553381"
|
||||
height="7.9572935" />
|
||||
<rect
|
||||
style="fill:url(#linearGradient3911);stroke:#a40d44;stroke-width:2.71816969;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
|
||||
id="rect31-9-4"
|
||||
x="27.955248"
|
||||
y="35.093689"
|
||||
width="18.553381"
|
||||
height="7.9572935" />
|
||||
<rect
|
||||
style="fill:url(#linearGradient3847);stroke:#7c7c0a;stroke-width:2.71816969;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
|
||||
id="rect31"
|
||||
x="1.3188214"
|
||||
y="7.068697"
|
||||
width="18.553381"
|
||||
height="7.9572935" />
|
||||
</svg>
|
||||
|
|
Before Width: | Height: | Size: 3.8 KiB After Width: | Height: | Size: 7.9 KiB |
|
@ -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" ),
|
||||
|
|
|
@ -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 );
|
||||
|
||||
|
|
|
@ -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
|
||||
{
|
||||
|
|
|
@ -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];
|
||||
|
||||
|
|
|
@ -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() );
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -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 );
|
||||
|
|
|
@ -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; }
|
||||
|
||||
|
|
|
@ -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 );
|
||||
|
|
|
@ -318,7 +318,7 @@
|
|||
<property name="growablerows"></property>
|
||||
<property name="hgap">0</property>
|
||||
<property name="minimum_size"></property>
|
||||
<property name="name">fgSizer5</property>
|
||||
<property name="name">fgSizerPadType</property>
|
||||
<property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
|
||||
<property name="permission">none</property>
|
||||
<property name="rows">0</property>
|
||||
|
@ -863,11 +863,11 @@
|
|||
<object class="wxFlexGridSizer" expanded="1">
|
||||
<property name="cols">3</property>
|
||||
<property name="flexible_direction">wxBOTH</property>
|
||||
<property name="growablecols"></property>
|
||||
<property name="growablecols">1</property>
|
||||
<property name="growablerows"></property>
|
||||
<property name="hgap">0</property>
|
||||
<property name="minimum_size"></property>
|
||||
<property name="name">fgSizer6</property>
|
||||
<property name="name">fgSizerShapeType</property>
|
||||
<property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
|
||||
<property name="permission">none</property>
|
||||
<property name="rows">0</property>
|
||||
|
@ -5420,7 +5420,7 @@
|
|||
<property name="proportion">0</property>
|
||||
<object class="wxStaticBoxSizer" expanded="0">
|
||||
<property name="id">wxID_ANY</property>
|
||||
<property name="label">Technical</property>
|
||||
<property name="label">Technical Layers</property>
|
||||
<property name="minimum_size"></property>
|
||||
<property name="name">sbSizerTechlayers</property>
|
||||
<property name="orient">wxVERTICAL</property>
|
||||
|
|
Loading…
Reference in New Issue