Skip to content

K
kicad-source-mirror
Commit ffbbd64c authored by Joe Ferner's avatar Joe Ferner Committed by Dick Hollenbeck
Browse files
Options

Joe Ferner's merge

parents 5080d4cc aad54ec4
Hide whitespace changes
Inline Side-by-side
Showing with 254 additions and 41 deletions
bitmaps_png/CMakeLists.txt
View file @ ffbbd64c
...@@ -332,6 +332,7 @@ set( BMAPS_MID ...@@ -332,6 +332,7 @@ set( BMAPS_MID
module_filtered_list module_filtered_list
module_full_list module_full_list
module_options module_options
module_pin_filtered_list
module_ratsnest module_ratsnest
module module
modview_icon modview_icon
......
bitmaps_png/cpp_26/module_pin_filtered_list.cpp 0 → 100644
View file @ ffbbd64c
/* Do not modify this file, it was automatically generated by the
* PNG2cpp CMake script, using a *.png file as input.
*/
#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x06, 0x00, 0x00, 0x00, 0xa9, 0x4a, 0x4c,
0xce, 0x00, 0x00, 0x00, 0x04, 0x73, 0x42, 0x49, 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64,
0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x07, 0x7f, 0x00, 0x00, 0x07,
0x7f, 0x01, 0x78, 0x5e, 0xe4, 0x82, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f,
0x66, 0x74, 0x77, 0x61, 0x72, 0x65, 0x00, 0x77, 0x77, 0x77, 0x2e, 0x69, 0x6e, 0x6b, 0x73, 0x63,
0x61, 0x70, 0x65, 0x2e, 0x6f, 0x72, 0x67, 0x9b, 0xee, 0x3c, 0x1a, 0x00, 0x00, 0x04, 0xb2, 0x49,
0x44, 0x41, 0x54, 0x48, 0x89, 0xcd, 0x94, 0x7f, 0x4c, 0xd4, 0x65, 0x1c, 0xc7, 0x5f, 0xcf, 0xdd,
0xf7, 0x7b, 0x77, 0xf1, 0x63, 0xa0, 0x70, 0xa8, 0x0c, 0x54, 0x14, 0x0f, 0x06, 0x83, 0xe2, 0xb4,
0xdc, 0x95, 0x73, 0x3a, 0xb5, 0xb5, 0x65, 0x1b, 0x6b, 0xcb, 0xa9, 0xad, 0x04, 0x4d, 0x8c, 0xc2,
0x8d, 0xfe, 0xcb, 0x96, 0xeb, 0x8f, 0x36, 0x37, 0xff, 0x68, 0x68, 0xad, 0x52, 0x37, 0x37, 0x56,
0xce, 0x35, 0xa5, 0x55, 0x5b, 0x5a, 0x6d, 0xb4, 0xc0, 0x10, 0x31, 0xbb, 0x8b, 0x38, 0x9d, 0x1e,
0x72, 0x62, 0x8a, 0xc0, 0x09, 0x8a, 0x28, 0xdc, 0x71, 0xf0, 0xc5, 0x4f, 0x7f, 0x70, 0x87, 0x87,
0x82, 0xc2, 0xd6, 0x1f, 0xbd, 0xff, 0x7a, 0xde, 0xef, 0xe7, 0xf3, 0x79, 0xde, 0xcf, 0xf3, 0x7e,
0xbe, 0xdf, 0x47, 0x89, 0x08, 0xb1, 0x50, 0x4a, 0xcd, 0xd6, 0x75, 0xdd, 0x11, 0xe5, 0x23, 0x23,
0x23, 0xfd, 0x22, 0x72, 0x51, 0x29, 0x95, 0xa8, 0xeb, 0x7a, 0x7e, 0x4c, 0x5d, 0x30, 0x1c, 0x0e,
0xb7, 0x28, 0xa5, 0x2c, 0xba, 0xae, 0x3b, 0x63, 0x96, 0x30, 0x86, 0x87, 0x87, 0xff, 0xe4, 0x21,
0x68, 0x0f, 0x0b, 0x2f, 0x64, 0x9a, 0x76, 0x7f, 0xb2, 0xda, 0xa8, 0x8c, 0xf2, 0x2f, 0xfe, 0x32,
0x79, 0x81, 0xc2, 0xa5, 0xe9, 0xa6, 0x92, 0x8f, 0x57, 0x18, 0x9f, 0xce, 0xb6, 0x8d, 0xe9, 0xd5,
0xe7, 0xd5, 0x15, 0x60, 0xb1, 0xae, 0xeb, 0xce, 0x03, 0x2f, 0x1a, 0x67, 0xf2, 0x53, 0xc6, 0xf4,
0x1a, 0x9f, 0xba, 0xa5, 0x94, 0xca, 0x16, 0x91, 0x3b, 0x8f, 0x35, 0x02, 0x58, 0x9e, 0xfe, 0xe0,
0x94, 0xc7, 0x2f, 0x31, 0x14, 0x1d, 0x17, 0xcd, 0x11, 0xe6, 0xc6, 0x8f, 0x8d, 0x6b, 0xff, 0x79,
0xa0, 0xe7, 0xa7, 0x3c, 0xe8, 0xf1, 0xdc, 0x64, 0x64, 0xb2, 0x35, 0xb5, 0x48, 0x0c, 0x0a, 0xb0,
0x02, 0xb8, 0x32, 0x4c, 0xda, 0xd9, 0x5b, 0x09, 0xd4, 0x69, 0xab, 0x49, 0xbc, 0x7b, 0x19, 0xc1,
0xa7, 0x94, 0x52, 0xb6, 0xa2, 0x79, 0x26, 0xfd, 0xda, 0x80, 0xc6, 0xa1, 0x81, 0xd5, 0x30, 0x10,
0xc0, 0x84, 0x57, 0x29, 0xa5, 0x6c, 0x9a, 0xa6, 0x59, 0x06, 0x46, 0xe0, 0xc3, 0xab, 0xcf, 0x63,
0x66, 0x94, 0x94, 0xd1, 0x3f, 0x14, 0x60, 0x55, 0x4a, 0x45, 0xce, 0xce, 0xb0, 0x88, 0xdc, 0xd7,
0x00, 0x1c, 0x0e, 0xc7, 0xae, 0xa2, 0xa2, 0xa2, 0x77, 0x93, 0x92, 0x92, 0x46, 0x3b, 0x2f, 0x9c,
0x4e, 0xbe, 0x34, 0xd0, 0x87, 0x6b, 0xe3, 0x46, 0x7e, 0x3d, 0x7e, 0x10, 0x79, 0xaa, 0xb7, 0xb0,
0xac, 0xec, 0xd5, 0xd6, 0x80, 0xdf, 0x9b, 0x78, 0x35, 0x78, 0x81, 0xa7, 0x5f, 0x7a, 0x85, 0x33,
0xbf, 0xfd, 0x84, 0xa6, 0x5d, 0xcb, 0x2e, 0x2b, 0xdb, 0xd0, 0xda, 0xdd, 0xdd, 0x6d, 0xb9, 0x3d,
0x74, 0x12, 0x7b, 0xc1, 0x73, 0x0c, 0x85, 0x06, 0xe8, 0xbf, 0xd9, 0x62, 0xdf, 0xb2, 0x65, 0x83,
0xdb, 0x6a, 0xb5, 0xde, 0x37, 0x0c, 0x83, 0xc6, 0xc6, 0xc6, 0x93, 0xc0, 0xdb, 0x88, 0x08, 0x79,
0x79, 0x79, 0x7b, 0xda, 0xdb, 0xdb, 0x45, 0x44, 0x64, 0xdf, 0x47, 0xef, 0xc9, 0xfd, 0xf7, 0x91,
0xc6, 0x12, 0x5d, 0x6e, 0x57, 0x22, 0xfb, 0x4a, 0x97, 0x8b, 0x88, 0xc8, 0x37, 0x87, 0x3f, 0x93,
0xae, 0x9d, 0x88, 0x7b, 0x9b, 0x2e, 0x37, 0x2a, 0x90, 0x03, 0x5b, 0xf2, 0x45, 0x44, 0xa4, 0xa9,
0xa9, 0x49, 0x9a, 0xde, 0x54, 0x72, 0x71, 0x87, 0x26, 0x6d, 0xe5, 0x26, 0xa9, 0xde, 0x34, 0x4f,
0xfa, 0xfa, 0xfa, 0x44, 0x44, 0x24, 0x14, 0x0a, 0x49, 0x61, 0x61, 0xe1, 0x51, 0x11, 0x99, 0xfc,
0x8e, 0x14, 0xe0, 0x9a, 0x1b, 0x89, 0xba, 0x7f, 0xe2, 0x9c, 0xd3, 0x1e, 0xd1, 0xef, 0x4d, 0xd4,
0x73, 0x67, 0x19, 0x00, 0x34, 0xdc, 0x61, 0x52, 0x3c, 0x62, 0xb4, 0x6c, 0xc5, 0x1a, 0xf6, 0xff,
0x12, 0x18, 0xe7, 0xd6, 0xc5, 0xe9, 0x00, 0xe4, 0x3d, 0xf3, 0x2c, 0x47, 0xcf, 0x6f, 0xc2, 0x6c,
0x28, 0x00, 0x46, 0xd3, 0x13, 0x01, 0xc8, 0xc8, 0xc8, 0xe0, 0x48, 0xd2, 0x6b, 0x34, 0x19, 0x63,
0x4b, 0x0d, 0xa6, 0x99, 0x88, 0x8b, 0x8b, 0x7b, 0x74, 0xf3, 0x22, 0x82, 0xc3, 0xe1, 0xa8, 0x2a,
0x2f, 0x2f, 0xaf, 0xdc, 0xbe, 0x7d, 0x3b, 0x09, 0x09, 0x09, 0x93, 0x6f, 0x09, 0x18, 0x1c, 0x1c,
0xa4, 0xba, 0xba, 0x9a, 0xde, 0xde, 0xde, 0x29, 0x6b, 0x62, 0xa1, 0xeb, 0x3a, 0x35, 0x35, 0x35,
0x27, 0x3d, 0x1e, 0xcf, 0xcb, 0x5a, 0x44, 0x08, 0x2d, 0x58, 0xb0, 0x80, 0x8a, 0x8a, 0x0a, 0xaa,
0xab, 0xab, 0xa7, 0x6c, 0xac, 0xab, 0xab, 0xe3, 0xd8, 0xb1, 0x63, 0xd3, 0x32, 0x89, 0xc2, 0x66,
0xb3, 0xe5, 0x01, 0x98, 0xa2, 0x82, 0xd3, 0xe9, 0x24, 0x3f, 0x3f, 0x1f, 0x9f, 0xcf, 0x37, 0x65,
0x53, 0x30, 0x18, 0x9c, 0x91, 0x09, 0x80, 0x52, 0x4a, 0x9b, 0x60, 0xe4, 0xf3, 0xf9, 0x68, 0x6e,
0x6e, 0x26, 0x27, 0x27, 0x67, 0xc6, 0x8b, 0x4d, 0x07, 0x26, 0x00, 0xc3, 0x30, 0xac, 0x8d, 0x8d,
0x8d, 0x54, 0x55, 0x55, 0xcd, 0xa8, 0x79, 0xfe, 0xfc, 0xf9, 0x6c, 0xde, 0xfc, 0xfa, 0x38, 0xdf,
0xba, 0x75, 0x1b, 0x76, 0xbb, 0x7d, 0xd2, 0x5a, 0x0d, 0x40, 0xd3, 0xb4, 0x70, 0x69, 0x69, 0x29,
0x69, 0x69, 0x69, 0x88, 0x08, 0xe1, 0x70, 0x78, 0xbc, 0xc0, 0x6c, 0x36, 0xa3, 0xeb, 0x3a, 0x22,
0x82, 0x61, 0x18, 0x13, 0x9a, 0xed, 0x76, 0x3b, 0x56, 0xab, 0x75, 0x9c, 0x3b, 0x1c, 0x0e, 0x42,
0xa1, 0xd0, 0xd4, 0x46, 0xb1, 0xf8, 0x72, 0xef, 0x6e, 0xcc, 0xcd, 0x5f, 0x8d, 0xf3, 0xf3, 0x43,
0xf3, 0xf8, 0xec, 0xfb, 0xb3, 0x7c, 0x77, 0xf4, 0x30, 0xbf, 0x1f, 0xa9, 0x02, 0x52, 0x49, 0x4e,
0x4e, 0x26, 0x33, 0x73, 0x3e, 0x05, 0x05, 0x85, 0xd8, 0x6c, 0x36, 0x0a, 0x0a, 0x0a, 0x01, 0x48,
0x4d, 0x4d, 0x25, 0x2b, 0x6b, 0x11, 0xc1, 0x60, 0x10, 0xbf, 0xbf, 0xed, 0xf1, 0x46, 0x23, 0x43,
0x41, 0xde, 0xc9, 0xba, 0x3e, 0xce, 0xf7, 0x07, 0xc6, 0xfe, 0xa3, 0x91, 0xf0, 0x10, 0xcb, 0x92,
0xfb, 0xb9, 0x10, 0x4c, 0x25, 0x25, 0x25, 0x05, 0x97, 0xcb, 0xc5, 0x92, 0x25, 0x4b, 0x08, 0x06,
0x43, 0xb8, 0x5c, 0x2e, 0x00, 0xe2, 0xe2, 0xe2, 0x71, 0xb9, 0x5c, 0x04, 0x02, 0x81, 0x27, 0x1b,
0x01, 0x5c, 0xb9, 0x67, 0xe1, 0xf8, 0xdd, 0x22, 0xb2, 0xcd, 0x37, 0xc6, 0x9e, 0x89, 0x08, 0x42,
0x91, 0xe4, 0xfc, 0x7e, 0x3f, 0x7e, 0xbf, 0x9f, 0xb2, 0xb2, 0x1d, 0x34, 0x35, 0x9d, 0xa1, 0xa5,
0xa5, 0x05, 0x8b, 0xc5, 0x42, 0x6e, 0x6e, 0x2e, 0x87, 0x0e, 0x1d, 0x9c, 0x3a, 0xba, 0x70, 0x38,
0x7c, 0xaa, 0xb8, 0xb8, 0x78, 0xb9, 0xc9, 0x64, 0x12, 0xfd, 0xde, 0x35, 0x87, 0xc5, 0x39, 0x27,
0xf3, 0xad, 0x3d, 0x07, 0x39, 0xb0, 0x77, 0x17, 0x1d, 0x7f, 0xd7, 0xdf, 0x75, 0x3a, 0x9d, 0xe7,
0xd4, 0x60, 0x77, 0xc6, 0x9a, 0xec, 0xf8, 0x1c, 0x80, 0x85, 0x0b, 0xb3, 0x58, 0xb5, 0x6a, 0x15,
0x45, 0x45, 0x4e, 0x6c, 0x36, 0x1b, 0x4e, 0xe7, 0x52, 0xe2, 0xe3, 0xe3, 0x49, 0x48, 0x48, 0xa4,
0xa4, 0xa4, 0x94, 0x9e, 0x9e, 0x1e, 0x4e, 0x9c, 0xf8, 0x31, 0xea, 0x71, 0x13, 0x22, 0x5f, 0x5d,
0x5b, 0x5b, 0xdb, 0xcf, 0xcd, 0xcd, 0xcd, 0x6b, 0x3c, 0x1e, 0xcf, 0x5a, 0x3d, 0xdc, 0xf7, 0xed,
0x1b, 0x19, 0xd7, 0xa9, 0xf9, 0x60, 0x3d, 0xeb, 0x4d, 0x75, 0xc4, 0x13, 0xf2, 0x79, 0x3c, 0x9e,
0xb5, 0x6a, 0x20, 0xf0, 0xb9, 0x23, 0x71, 0xec, 0xa2, 0xfb, 0xfb, 0xef, 0xe0, 0xf5, 0xb6, 0x30,
0x3a, 0x3a, 0x8a, 0xc7, 0xe3, 0xc6, 0xeb, 0x6d, 0xa1, 0xa3, 0xa3, 0x83, 0xce, 0xce, 0x4e, 0xbc,
0xde, 0x96, 0x09, 0xb1, 0x69, 0x9a, 0x76, 0x7d, 0xca, 0xe8, 0x12, 0x2c, 0xb0, 0x63, 0x51, 0x07,
0x00, 0x5f, 0xc7, 0x64, 0x67, 0x8a, 0x0c, 0xfb, 0xfa, 0xfa, 0x70, 0xbb, 0xdd, 0x94, 0x96, 0x6e,
0xa5, 0xa1, 0xa1, 0x01, 0x00, 0x5d, 0xb7, 0x70, 0xf9, 0x72, 0x2b, 0x6e, 0xb7, 0x7b, 0xea, 0xe8,
0x62, 0x61, 0x88, 0xba, 0xb8, 0xb3, 0x56, 0x9d, 0x8a, 0xf2, 0xd6, 0xdb, 0xf4, 0x00, 0x18, 0xa3,
0xaa, 0xfd, 0x44, 0xbb, 0xde, 0x8e, 0x95, 0xac, 0xe8, 0x5c, 0x4f, 0x4f, 0x4f, 0xec, 0xce, 0xe9,
0xea, 0xea, 0x9a, 0xd4, 0x04, 0x22, 0x8f, 0xea, 0x74, 0xb1, 0x72, 0xe5, 0xca, 0x4a, 0xa5, 0xd4,
0xcc, 0xfe, 0x6a, 0xf8, 0xa1, 0xbe, 0xbe, 0xbe, 0xd8, 0xf4, 0xe4, 0xba, 0xff, 0x06, 0xff, 0x5b,
0xa3, 0x73, 0xc0, 0xf0, 0x4c, 0x1a, 0x44, 0xe4, 0x34, 0xcc, 0xf0, 0x8e, 0x00, 0xd6, 0xad, 0x5b,
0x97, 0x64, 0x18, 0xc6, 0xac, 0xe9, 0xd4, 0x9a, 0xcd, 0xe6, 0x50, 0x6d, 0x6d, 0x6d, 0x00, 0xe0,
0x5f, 0x6d, 0xdb, 0xe2, 0x7f, 0x13, 0xa4, 0x85, 0xd4, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e,
0x44, 0xae, 0x42, 0x60, 0x82,
};
const BITMAP_OPAQUE module_pin_filtered_list_xpm[1] = {{ png, sizeof( png ), "module_pin_filtered_list_xpm" }};
//EOF
bitmaps_png/sources/module_pin_filtered_list.svg 0 → 100644
View file @ ffbbd64c
<svg xmlns="http://www.w3.org/2000/svg" height="48" width="48" version="1.1" viewBox="0 0 48 48">
<g transform="matrix(-2.8288,0,0,-2.4916,-6.4559,36.786)">
<g stroke-linejoin="round">
<rect transform="rotate(90)" height="14.619" width="9.7086" stroke="#000" y="3.4905" x="1.904" stroke-width="0.4" fill="#fff"/>
<path d="m693.26 625.06a18.914 18.914 0 0 1 -37.828 0.11702" transform="matrix(0 .071482 -.071482 0 41.168 -41.24)" stroke="#030303" stroke-width="5.5958" fill="none"/>
</g>
<g stroke-linejoin="round" transform="translate(-.0375 -.15)" stroke="#030303">
<rect transform="rotate(90)" height="2.511" width="4.7176" y="13.332" x="-.31959" stroke-width="0.3" fill="#ff7800"/>
<rect transform="rotate(90)" height="2.511" width="4.7176" y="5.3636" x="-.31959" stroke-width="0.3" fill="#ff7800"/>
<path d="m654.65 737.28a9.5805 9.5805 0 1 1 -19.161 0 9.5805 9.5805 0 1 1 19.161 0z" transform="matrix(0 .071482 -.071482 0 46.083 -44.072)" stroke-width="4.1969" fill="#ffede0"/>
<rect transform="rotate(90)" height="2.511" width="4.7176" y="9.3478" x="-.31959" stroke-width="0.3" fill="#ff7800"/>
<path d="m654.65 737.28a9.5805 9.5805 0 1 1 -19.161 0 9.5805 9.5805 0 1 1 19.161 0z" transform="matrix(0 .071482 -.071482 0 42.08 -44.072)" stroke-width="4.1969" fill="#ffede0"/>
<path d="m654.65 737.28a9.5805 9.5805 0 1 1 -19.161 0 9.5805 9.5805 0 1 1 19.161 0z" transform="matrix(0 .071482 -.071482 0 38.077 -44.072)" stroke-width="4.1969" fill="#ffede0"/>
</g>
<g transform="translate(-.0375 9.6261)">
<rect stroke-linejoin="round" transform="rotate(90)" height="2.511" width="4.7176" stroke="#030303" y="13.332" x="-.31959" stroke-width="0.3" fill="#ff7800"/>
<rect stroke-linejoin="round" transform="rotate(90)" height="2.511" width="4.7176" stroke="#030303" y="5.3636" x="-.31959" stroke-width="0.3" fill="#ff7800"/>
<path stroke-linejoin="round" d="m654.65 737.28a9.5805 9.5805 0 1 1 -19.161 0 9.5805 9.5805 0 1 1 19.161 0z" transform="matrix(0 .071482 -.071482 0 46.083 -44.072)" stroke="#030303" stroke-width="4.1969" fill="#ffede0"/>
<rect stroke-linejoin="round" transform="rotate(90)" height="2.511" width="4.7176" stroke="#030303" y="9.3478" x="-.31959" stroke-width="0.3" fill="#ff7800"/>
<path stroke-linejoin="round" d="m654.65 737.28a9.5805 9.5805 0 1 1 -19.161 0 9.5805 9.5805 0 1 1 19.161 0z" transform="matrix(0 .071482 -.071482 0 42.08 -44.072)" stroke="#030303" stroke-width="4.1969" fill="#ffede0"/>
<g stroke-width="0.3">
<path stroke-linejoin="round" d="m654.65 737.28a9.5805 9.5805 0 1 1 -19.161 0 9.5805 9.5805 0 1 1 19.161 0z" transform="matrix(0 .071482 -.071482 0 38.077 -44.072)" stroke="#030303" stroke-width="4.1969" fill="#ffede0"/>
</g>
</g>
</g>
<rect ry="2.1184" height="31.004" width="24.273" y="15.396" x="21.327" fill="#3e3e3e"/>
<path d="m25.2 28h15" stroke="#f2f2f4" stroke-width="1.5" fill="none"/>
<path d="m25.2 33h15" stroke="#f2f2f4" stroke-width="1.5" fill="none"/>
<path d="m30 22.5l-1.5 16" stroke="#f2f2f4" stroke-width="1.5" fill="none"/>
<path d="m36.5 22.5l-1.5 16" stroke="#f2f2f4" stroke-width="1.5" fill="none"/>
</svg>
common/footprint_info.cpp
View file @ ffbbd64c
...@@ -117,6 +117,9 @@ bool FOOTPRINT_LIST::ReadFootprintFiles( wxArrayString & aFootprintsLibNames ) ...@@ -117,6 +117,9 @@ bool FOOTPRINT_LIST::ReadFootprintFiles( wxArrayString & aFootprintsLibNames )
if( strnicmp( line, "$EndMODULE", 10 ) == 0 ) if( strnicmp( line, "$EndMODULE", 10 ) == 0 )
break; break;
if( strnicmp( line, "$PAD", 4 ) == 0 )
ItemLib->m_padCount++;
int id = ((line[0] & 0xFF) << 8) + (line[1] & 0xFF); int id = ((line[0] & 0xFF) << 8) + (line[1] & 0xFF);
switch( id ) switch( id )
{ {
......
cvpcb/class_footprints_listbox.cpp
View file @ ffbbd64c
...@@ -56,7 +56,7 @@ void FOOTPRINTS_LISTBOX::SetString( unsigned linecount, const wxString& text ) ...@@ -56,7 +56,7 @@ void FOOTPRINTS_LISTBOX::SetString( unsigned linecount, const wxString& text )
wxString FOOTPRINTS_LISTBOX::GetSelectedFootprint() wxString FOOTPRINTS_LISTBOX::GetSelectedFootprint()
{ {
wxString FootprintName; wxString footprintName;
int ii = GetFirstSelected(); int ii = GetFirstSelected();
if( ii >= 0 ) if( ii >= 0 )
...@@ -64,10 +64,10 @@ wxString FOOTPRINTS_LISTBOX::GetSelectedFootprint() ...@@ -64,10 +64,10 @@ wxString FOOTPRINTS_LISTBOX::GetSelectedFootprint()
wxString msg = (*m_ActiveFootprintList)[ii]; wxString msg = (*m_ActiveFootprintList)[ii];
msg.Trim( true ); msg.Trim( true );
msg.Trim( false ); msg.Trim( false );
FootprintName = msg.AfterFirst( wxChar( ' ' ) ); footprintName = msg.AfterFirst( wxChar( ' ' ) );
} }
return FootprintName; return footprintName;
} }
...@@ -112,7 +112,7 @@ void FOOTPRINTS_LISTBOX::SetSelection( unsigned index, bool State ) ...@@ -112,7 +112,7 @@ void FOOTPRINTS_LISTBOX::SetSelection( unsigned index, bool State )
void FOOTPRINTS_LISTBOX::SetFootprintFullList( FOOTPRINT_LIST& list ) void FOOTPRINTS_LISTBOX::SetFootprintFullList( FOOTPRINT_LIST& list )
{ {
wxString msg; wxString msg;
int OldSelection = GetSelection(); int oldSelection = GetSelection();
m_FullFootprintList.Clear(); m_FullFootprintList.Clear();
...@@ -126,8 +126,7 @@ void FOOTPRINTS_LISTBOX::SetFootprintFullList( FOOTPRINT_LIST& list ) ...@@ -126,8 +126,7 @@ void FOOTPRINTS_LISTBOX::SetFootprintFullList( FOOTPRINT_LIST& list )
SetActiveFootprintList( true ); SetActiveFootprintList( true );
if( ( GetCount() == 0 ) if( GetCount() == 0 || oldSelection < 0 || oldSelection >= GetCount() )
|| ( OldSelection < 0 ) || ( OldSelection >= GetCount() ) )
SetSelection( 0, true ); SetSelection( 0, true );
Refresh(); Refresh();
} }
...@@ -139,7 +138,7 @@ void FOOTPRINTS_LISTBOX::SetFootprintFilteredList( COMPONENT_INFO* Component, ...@@ -139,7 +138,7 @@ void FOOTPRINTS_LISTBOX::SetFootprintFilteredList( COMPONENT_INFO* Component,
wxString msg; wxString msg;
unsigned jj; unsigned jj;
int OldSelection = GetSelection(); int OldSelection = GetSelection();
bool HasItem = false; bool hasItem = false;
m_FilteredFootprintList.Clear(); m_FilteredFootprintList.Clear();
...@@ -158,11 +157,11 @@ void FOOTPRINTS_LISTBOX::SetFootprintFilteredList( COMPONENT_INFO* Component, ...@@ -158,11 +157,11 @@ void FOOTPRINTS_LISTBOX::SetFootprintFilteredList( COMPONENT_INFO* Component,
msg.Printf( wxT( "%3d %s" ), m_FilteredFootprintList.GetCount() + 1, msg.Printf( wxT( "%3d %s" ), m_FilteredFootprintList.GetCount() + 1,
footprint.m_Module.GetData() ); footprint.m_Module.GetData() );
m_FilteredFootprintList.Add( msg ); m_FilteredFootprintList.Add( msg );
HasItem = true; hasItem = true;
} }
} }
if( HasItem ) if( hasItem )
SetActiveFootprintList( false ); SetActiveFootprintList( false );
else else
SetActiveFootprintList( true ); SetActiveFootprintList( true );
...@@ -173,6 +172,37 @@ void FOOTPRINTS_LISTBOX::SetFootprintFilteredList( COMPONENT_INFO* Component, ...@@ -173,6 +172,37 @@ void FOOTPRINTS_LISTBOX::SetFootprintFilteredList( COMPONENT_INFO* Component,
Refresh(); Refresh();
} }
void FOOTPRINTS_LISTBOX::SetFootprintFilteredByPinCount( COMPONENT_INFO* Component,
FOOTPRINT_LIST& list ) {
wxString msg;
int oldSelection = GetSelection();
bool hasItem = false;
m_FilteredFootprintList.Clear();
for( unsigned ii = 0; ii < list.GetCount(); ii++ )
{
FOOTPRINT_INFO& footprint = list.GetItem(ii);
if( Component->m_pinCount == footprint.m_padCount )
{
msg.Printf( wxT( "%3d %s" ), m_FilteredFootprintList.GetCount() + 1,
footprint.m_Module.GetData() );
m_FilteredFootprintList.Add( msg );
hasItem = true;
}
}
if( hasItem )
SetActiveFootprintList( false );
else
SetActiveFootprintList( true );
if( ( GetCount() == 0 ) || ( oldSelection >= GetCount() ) )
SetSelection( 0, true );
Refresh();
}
/** Set the footprint list. We can have 2 footprint list: /** Set the footprint list. We can have 2 footprint list:
* The full footprint list * The full footprint list
...@@ -244,9 +274,9 @@ void FOOTPRINTS_LISTBOX::OnLeftClick( wxListEvent& event ) ...@@ -244,9 +274,9 @@ void FOOTPRINTS_LISTBOX::OnLeftClick( wxListEvent& event )
/********************************************************/ /********************************************************/
{ {
FOOTPRINT_INFO* Module; FOOTPRINT_INFO* Module;
wxString FootprintName = GetSelectedFootprint(); wxString footprintName = GetSelectedFootprint();
Module = GetParent()->m_footprints.GetModuleInfo( FootprintName ); Module = GetParent()->m_footprints.GetModuleInfo( footprintName );
wxASSERT(Module); wxASSERT(Module);
if( GetParent()->m_DisplayFootprintFrame ) if( GetParent()->m_DisplayFootprintFrame )
{ {
...@@ -270,9 +300,9 @@ void FOOTPRINTS_LISTBOX::OnLeftClick( wxListEvent& event ) ...@@ -270,9 +300,9 @@ void FOOTPRINTS_LISTBOX::OnLeftClick( wxListEvent& event )
void FOOTPRINTS_LISTBOX::OnLeftDClick( wxListEvent& event ) void FOOTPRINTS_LISTBOX::OnLeftDClick( wxListEvent& event )
/******************************************************/ /******************************************************/
{ {
wxString FootprintName = GetSelectedFootprint(); wxString footprintName = GetSelectedFootprint();
GetParent()->SetNewPkg( FootprintName ); GetParent()->SetNewPkg( footprintName );
} }
...@@ -323,22 +353,24 @@ void FOOTPRINTS_LISTBOX::OnChar( wxKeyEvent& event ) ...@@ -323,22 +353,24 @@ void FOOTPRINTS_LISTBOX::OnChar( wxKeyEvent& event )
text.Trim(false); // Remove leading spaces in line text.Trim(false); // Remove leading spaces in line
unsigned jj = 0; unsigned jj = 0;
for( ; jj < text.Len(); jj++ ) for( ; jj < text.Len(); jj++ )
{ // skip line number {
// skip line number
if( text[jj] == ' ' ) if( text[jj] == ' ' )
break; break;
} }
for( ; jj < text.Len(); jj++ ) for( ; jj < text.Len(); jj++ )
{ // skip blanks { // skip blanks
if( text[jj] != ' ' ) if( text[jj] != ' ' )
break; break;
} }
int start_char = toupper(text[jj]);
if ( key == start_char ) int start_char = toupper( text[jj] );
if( key == start_char )
{ {
Focus( ii ); Focus( ii );
SetSelection( ii, true ); // Ensure visible SetSelection( ii, true ); // Ensure visible
break; break;
} }
} }
} }
cvpcb/cvframe.cpp
View file @ ffbbd64c
...@@ -84,6 +84,8 @@ BEGIN_EVENT_TABLE( CVPCB_MAINFRAME, EDA_BASE_FRAME ) ...@@ -84,6 +84,8 @@ BEGIN_EVENT_TABLE( CVPCB_MAINFRAME, EDA_BASE_FRAME )
EVT_TOOL( ID_PCB_DISPLAY_FOOTPRINT_DOC, CVPCB_MAINFRAME::DisplayDocFile ) EVT_TOOL( ID_PCB_DISPLAY_FOOTPRINT_DOC, CVPCB_MAINFRAME::DisplayDocFile )
EVT_TOOL( ID_CVPCB_FOOTPRINT_DISPLAY_FILTERED_LIST, EVT_TOOL( ID_CVPCB_FOOTPRINT_DISPLAY_FILTERED_LIST,
CVPCB_MAINFRAME::OnSelectFilteringFootprint ) CVPCB_MAINFRAME::OnSelectFilteringFootprint )
EVT_TOOL( ID_CVPCB_FOOTPRINT_DISPLAY_PIN_FILTERED_LIST,
CVPCB_MAINFRAME::OnSelectFilteringFootprint )
EVT_TOOL( ID_CVPCB_FOOTPRINT_DISPLAY_FULL_LIST, EVT_TOOL( ID_CVPCB_FOOTPRINT_DISPLAY_FULL_LIST,
CVPCB_MAINFRAME::OnSelectFilteringFootprint ) CVPCB_MAINFRAME::OnSelectFilteringFootprint )
...@@ -189,7 +191,15 @@ CVPCB_MAINFRAME::~CVPCB_MAINFRAME() ...@@ -189,7 +191,15 @@ CVPCB_MAINFRAME::~CVPCB_MAINFRAME()
if( config ) if( config )
{ {
int state = m_mainToolBar->GetToolToggled( ID_CVPCB_FOOTPRINT_DISPLAY_FILTERED_LIST ); int state = 0;
if( m_mainToolBar->GetToolToggled( ID_CVPCB_FOOTPRINT_DISPLAY_FILTERED_LIST ) )
{
state = 1;
}
else if( m_mainToolBar->GetToolToggled( ID_CVPCB_FOOTPRINT_DISPLAY_PIN_FILTERED_LIST ) )
{
state = 2;
}
config->Write( wxT( FILTERFOOTPRINTKEY ), state ); config->Write( wxT( FILTERFOOTPRINTKEY ), state );
} }
...@@ -506,7 +516,8 @@ void CVPCB_MAINFRAME::OnSelectComponent( wxListEvent& event ) ...@@ -506,7 +516,8 @@ void CVPCB_MAINFRAME::OnSelectComponent( wxListEvent& event )
#define SELECT_FULL_LIST true #define SELECT_FULL_LIST true
int selection = -1; int selection = -1;
if( !m_mainToolBar->GetToolToggled( ID_CVPCB_FOOTPRINT_DISPLAY_FILTERED_LIST ) ) if( !m_mainToolBar->GetToolToggled( ID_CVPCB_FOOTPRINT_DISPLAY_FILTERED_LIST )
&& !m_mainToolBar->GetToolToggled( ID_CVPCB_FOOTPRINT_DISPLAY_PIN_FILTERED_LIST ))
m_FootprintList->SetActiveFootprintList( SELECT_FULL_LIST, REDRAW_LIST ); m_FootprintList->SetActiveFootprintList( SELECT_FULL_LIST, REDRAW_LIST );
else else
...@@ -521,8 +532,18 @@ void CVPCB_MAINFRAME::OnSelectComponent( wxListEvent& event ) ...@@ -521,8 +532,18 @@ void CVPCB_MAINFRAME::OnSelectComponent( wxListEvent& event )
if( &m_components[ selection ] == NULL ) if( &m_components[ selection ] == NULL )
m_FootprintList->SetActiveFootprintList( SELECT_FULL_LIST, REDRAW_LIST ); m_FootprintList->SetActiveFootprintList( SELECT_FULL_LIST, REDRAW_LIST );
else else
m_FootprintList->SetFootprintFilteredList( &m_components[ selection ], {
m_footprints ); if( m_mainToolBar->GetToolToggled( ID_CVPCB_FOOTPRINT_DISPLAY_PIN_FILTERED_LIST ) )
{
m_FootprintList->SetFootprintFilteredByPinCount( &m_components[ selection ],
m_footprints );
}
else
{
m_FootprintList->SetFootprintFilteredList( &m_components[ selection ],
m_footprints );
}
}
} }
} }
...@@ -572,12 +593,19 @@ void CVPCB_MAINFRAME::OnSelectFilteringFootprint( wxCommandEvent& event ) ...@@ -572,12 +593,19 @@ void CVPCB_MAINFRAME::OnSelectFilteringFootprint( wxCommandEvent& event )
{ {
switch( event.GetId() ) switch( event.GetId() )
{ {
case ID_CVPCB_FOOTPRINT_DISPLAY_PIN_FILTERED_LIST:
m_mainToolBar->ToggleTool( ID_CVPCB_FOOTPRINT_DISPLAY_FULL_LIST, false );
m_mainToolBar->ToggleTool( ID_CVPCB_FOOTPRINT_DISPLAY_FILTERED_LIST, false );
break;
case ID_CVPCB_FOOTPRINT_DISPLAY_FILTERED_LIST: case ID_CVPCB_FOOTPRINT_DISPLAY_FILTERED_LIST:
m_mainToolBar->ToggleTool( ID_CVPCB_FOOTPRINT_DISPLAY_FULL_LIST, false ); m_mainToolBar->ToggleTool( ID_CVPCB_FOOTPRINT_DISPLAY_FULL_LIST, false );
m_mainToolBar->ToggleTool( ID_CVPCB_FOOTPRINT_DISPLAY_PIN_FILTERED_LIST, false );
break; break;
case ID_CVPCB_FOOTPRINT_DISPLAY_FULL_LIST: case ID_CVPCB_FOOTPRINT_DISPLAY_FULL_LIST:
m_mainToolBar->ToggleTool( ID_CVPCB_FOOTPRINT_DISPLAY_FILTERED_LIST, false ); m_mainToolBar->ToggleTool( ID_CVPCB_FOOTPRINT_DISPLAY_FILTERED_LIST, false );
m_mainToolBar->ToggleTool( ID_CVPCB_FOOTPRINT_DISPLAY_PIN_FILTERED_LIST, false );
break; break;
default: default:
......
cvpcb/cvpcb_id.h
View file @ ffbbd64c
...@@ -30,5 +30,6 @@ enum id_cvpcb_frm ...@@ -30,5 +30,6 @@ enum id_cvpcb_frm
ID_CVPCB_SHOW3D_FRAME, ID_CVPCB_SHOW3D_FRAME,
ID_CVPCB_FOOTPRINT_DISPLAY_FULL_LIST, ID_CVPCB_FOOTPRINT_DISPLAY_FULL_LIST,
ID_CVPCB_FOOTPRINT_DISPLAY_FILTERED_LIST, ID_CVPCB_FOOTPRINT_DISPLAY_FILTERED_LIST,
ID_CVPCB_FOOTPRINT_DISPLAY_PIN_FILTERED_LIST,
ID_CVPCB_CONFIG_KEEP_OPEN_ON_SAVE ID_CVPCB_CONFIG_KEEP_OPEN_ON_SAVE
}; };
cvpcb/cvstruct.h
View file @ ffbbd64c
...@@ -54,6 +54,8 @@ public: ...@@ -54,6 +54,8 @@ public:
void SetFootprintFullList( FOOTPRINT_LIST& list ); void SetFootprintFullList( FOOTPRINT_LIST& list );
void SetFootprintFilteredList( COMPONENT_INFO* Component, void SetFootprintFilteredList( COMPONENT_INFO* Component,
FOOTPRINT_LIST& list ); FOOTPRINT_LIST& list );
void SetFootprintFilteredByPinCount( COMPONENT_INFO* Component,
FOOTPRINT_LIST& list );
void SetActiveFootprintList( bool FullList, bool Redraw = false ); void SetActiveFootprintList( bool FullList, bool Redraw = false );
wxString GetSelectedFootprint(); wxString GetSelectedFootprint();
......
cvpcb/tool_cvpcb.cpp
View file @ ffbbd64c
...@@ -103,6 +103,13 @@ used by Eeschema to fill the footprint field of components)" ) ); ...@@ -103,6 +103,13 @@ used by Eeschema to fill the footprint field of components)" ) );
_( "Display the filtered footprint list for the current component" ), _( "Display the filtered footprint list for the current component" ),
wxEmptyString ); wxEmptyString );
m_mainToolBar->AddTool( ID_CVPCB_FOOTPRINT_DISPLAY_PIN_FILTERED_LIST,
KiBitmap( module_pin_filtered_list_xpm ),
wxNullBitmap,
true, NULL,
_( "Display the filtered footprint list by pin count for the current component" ),
wxEmptyString );
m_mainToolBar->AddTool( ID_CVPCB_FOOTPRINT_DISPLAY_FULL_LIST, m_mainToolBar->AddTool( ID_CVPCB_FOOTPRINT_DISPLAY_FULL_LIST,
KiBitmap( module_full_list_xpm ), KiBitmap( module_full_list_xpm ),
wxNullBitmap, true, NULL, wxNullBitmap, true, NULL,
...@@ -113,8 +120,9 @@ used by Eeschema to fill the footprint field of components)" ) ); ...@@ -113,8 +120,9 @@ used by Eeschema to fill the footprint field of components)" ) );
{ {
wxString key = wxT( FILTERFOOTPRINTKEY ); wxString key = wxT( FILTERFOOTPRINTKEY );
int opt = config->Read( key, (long) 1 ); int opt = config->Read( key, (long) 1 );
m_mainToolBar->ToggleTool( ID_CVPCB_FOOTPRINT_DISPLAY_FILTERED_LIST, opt ); m_mainToolBar->ToggleTool( ID_CVPCB_FOOTPRINT_DISPLAY_PIN_FILTERED_LIST, opt == 2 );
m_mainToolBar->ToggleTool( ID_CVPCB_FOOTPRINT_DISPLAY_FULL_LIST, !opt ); m_mainToolBar->ToggleTool( ID_CVPCB_FOOTPRINT_DISPLAY_FILTERED_LIST, opt == 1 );
m_mainToolBar->ToggleTool( ID_CVPCB_FOOTPRINT_DISPLAY_FULL_LIST, opt == 0 );
} }
// after adding the buttons to the toolbar, must call Realize() to reflect the changes // after adding the buttons to the toolbar, must call Realize() to reflect the changes
......
include/bitmaps.h
View file @ ffbbd64c
...@@ -294,6 +294,7 @@ EXTERN_BITMAP( mod_ratsnest_xpm ) ...@@ -294,6 +294,7 @@ EXTERN_BITMAP( mod_ratsnest_xpm )
EXTERN_BITMAP( module_check_xpm ) EXTERN_BITMAP( module_check_xpm )
EXTERN_BITMAP( module_edit_xpm ) EXTERN_BITMAP( module_edit_xpm )
EXTERN_BITMAP( module_filtered_list_xpm ) EXTERN_BITMAP( module_filtered_list_xpm )
EXTERN_BITMAP( module_pin_filtered_list_xpm )
EXTERN_BITMAP( module_full_list_xpm ) EXTERN_BITMAP( module_full_list_xpm )
EXTERN_BITMAP( module_options_xpm ) EXTERN_BITMAP( module_options_xpm )
EXTERN_BITMAP( module_ratsnest_xpm ) EXTERN_BITMAP( module_ratsnest_xpm )
......
include/footprint_info.h
View file @ ffbbd64c
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
* @file footprint_info.h * @file footprint_info.h
*/ */
#ifndef _FOOTPRINT_INFO_H_ #ifndef FOOTPRINT_INFO_H_
#define _FOOTPRINT_INFO_H_ #define FOOTPRINT_INFO_H_
#include <boost/ptr_container/ptr_vector.hpp> #include <boost/ptr_container/ptr_vector.hpp>
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
...@@ -11,22 +11,24 @@ ...@@ -11,22 +11,24 @@
#include <kicad_string.h> #include <kicad_string.h>
/* /*
* class FOOTPRINT_INFO is a helper class to handle the list of footprints * Class FOOTPRINT_INFO
* available in libraries * is a helper class to handle the list of footprints
* It stores footprint names, doc and keywords * available in libraries. It stores footprint names, doc and keywords
*/ */
class FOOTPRINT_INFO class FOOTPRINT_INFO
{ {
public: public:
wxString m_Module; /* Module name. */ wxString m_Module; ///< Module name.
wxString m_LibName; /* Name of the library containing this module. */ wxString m_LibName; ///< Name of the library containing this module.
int m_Num; /* Order number in the display list. */ int m_Num; ///< Order number in the display list.
wxString m_Doc; /* Footprint description. */ wxString m_Doc; ///< Footprint description.
wxString m_KeyWord; /* Footprint key words. */ wxString m_KeyWord; ///< Footprint key words.
int m_padCount; ///< Number of pads
FOOTPRINT_INFO() FOOTPRINT_INFO()
{ {
m_Num = 0; m_Num = 0;
m_padCount = 0;
} }
}; };
...@@ -102,10 +104,10 @@ public: ...@@ -102,10 +104,10 @@ public:
bool ReadFootprintFiles( wxArrayString & aFootprintsLibNames ); bool ReadFootprintFiles( wxArrayString & aFootprintsLibNames );
}; };
/* FOOTPRINT object list sort function. */ /// FOOTPRINT object list sort function.
inline bool operator<( const FOOTPRINT_INFO& item1, const FOOTPRINT_INFO& item2 ) inline bool operator<( const FOOTPRINT_INFO& item1, const FOOTPRINT_INFO& item2 )
{ {
return StrNumCmp( item1.m_Module, item2.m_Module, INT_MAX, true ) < 0; return StrNumCmp( item1.m_Module, item2.m_Module, INT_MAX, true ) < 0;
} }
#endif // _FOOTPRINT_INFO_H_ #endif // FOOTPRINT_INFO_H_
pcbnew/netlist_reader.h
View file @ ffbbd64c
...@@ -81,6 +81,7 @@ public: ...@@ -81,6 +81,7 @@ public:
wxString m_TimeStamp; // the schematic full time stamp found in netlist wxString m_TimeStamp; // the schematic full time stamp found in netlist
wxString m_Libpart; // the schematic libpart found in netlist wxString m_Libpart; // the schematic libpart found in netlist
wxArrayString m_FootprintFilter; // a footprint filters list found in old format netlist wxArrayString m_FootprintFilter; // a footprint filters list found in old format netlist
int m_pinCount; // the number of pins found in the netlist
public: COMPONENT_INFO( const wxString& libname, public: COMPONENT_INFO( const wxString& libname,
const wxString& cmpname, const wxString& cmpname,
...@@ -91,6 +92,7 @@ public: COMPONENT_INFO( const wxString& libname, ...@@ -91,6 +92,7 @@ public: COMPONENT_INFO( const wxString& libname,
m_Reference = cmpname; m_Reference = cmpname;
m_Value = value; m_Value = value;
m_TimeStamp = timestamp; m_TimeStamp = timestamp;
m_pinCount = 0;
} }
~COMPONENT_INFO() { }; ~COMPONENT_INFO() { };
...@@ -409,9 +411,10 @@ private: ...@@ -409,9 +411,10 @@ private:
* If true: component file *.cmp is used * If true: component file *.cmp is used
* If false: the netlist only is used * If false: the netlist only is used
* This flag is reset to false if the .cmp file is not found * This flag is reset to false if the .cmp file is not found
* @return a reference to the corresponding module on board (NULL if not found) * @return if aBuildList = true, a reference to the COMPONENT_INFO
* if aBuildList = false, a reference to the corresponding MODULE on board (NULL if not found)
*/ */
MODULE* ReadOldFmtNetlistModuleDescr( char* aText, bool aBuildList ); void* ReadOldFmtNetlistModuleDescr( char* aText, bool aBuildList );
/** /**
* Function loadNewModules * Function loadNewModules
......
pcbnew/netlist_reader_firstformat.cpp
View file @ ffbbd64c
...@@ -83,6 +83,7 @@ bool NETLIST_READER::ReadOldFmtdNetList( FILE* aFile ) ...@@ -83,6 +83,7 @@ bool NETLIST_READER::ReadOldFmtdNetList( FILE* aFile )
// netlineReader dtor will close aFile // netlineReader dtor will close aFile
FILE_LINE_READER netlineReader( aFile, m_netlistFullName ); FILE_LINE_READER netlineReader( aFile, m_netlistFullName );
COMPONENT_INFO *curComponent = NULL;
while( netlineReader.ReadLine() ) while( netlineReader.ReadLine() )
{ {
char* line = StrPurge( netlineReader.Line() ); char* line = StrPurge( netlineReader.Line() );
...@@ -116,12 +117,15 @@ bool NETLIST_READER::ReadOldFmtdNetList( FILE* aFile ) ...@@ -116,12 +117,15 @@ bool NETLIST_READER::ReadOldFmtdNetList( FILE* aFile )
if( state == 2 ) if( state == 2 )
{ {
ReadOldFmtNetlistModuleDescr( line, BUILDLIST ); curComponent = (COMPONENT_INFO*) ReadOldFmtNetlistModuleDescr( line, BUILDLIST );
continue; continue;
} }
if( state >= 3 ) // First pass: pad descriptions are not read here. if( state >= 3 ) // First pass: pad descriptions are not read here.
{ {
if( curComponent )
curComponent->m_pinCount++;
state--; state--;
} }
} }
...@@ -191,7 +195,7 @@ bool NETLIST_READER::ReadOldFmtdNetList( FILE* aFile ) ...@@ -191,7 +195,7 @@ bool NETLIST_READER::ReadOldFmtdNetList( FILE* aFile )
if( state == 2 ) if( state == 2 )
{ {
m_currModule = ReadOldFmtNetlistModuleDescr( line, READMODULE ); m_currModule = (MODULE*) ReadOldFmtNetlistModuleDescr( line, READMODULE );
continue; continue;
} }
...@@ -216,7 +220,7 @@ bool NETLIST_READER::ReadOldFmtdNetList( FILE* aFile ) ...@@ -216,7 +220,7 @@ bool NETLIST_READER::ReadOldFmtdNetList( FILE* aFile )
* (2 MODB_1) * (2 MODB_1)
* ) * )
*/ */
MODULE* NETLIST_READER::ReadOldFmtNetlistModuleDescr( char* aText, bool aBuildList ) void* NETLIST_READER::ReadOldFmtNetlistModuleDescr( char* aText, bool aBuildList )
{ {
char* text; char* text;
wxString timeStampPath; // the full time stamp read from netlist wxString timeStampPath; // the full time stamp read from netlist
...@@ -264,7 +268,7 @@ MODULE* NETLIST_READER::ReadOldFmtNetlistModuleDescr( char* aText, bool aBuildLi ...@@ -264,7 +268,7 @@ MODULE* NETLIST_READER::ReadOldFmtNetlistModuleDescr( char* aText, bool aBuildLi
COMPONENT_INFO* cmp_info = new COMPONENT_INFO( footprintName, cmpReference, COMPONENT_INFO* cmp_info = new COMPONENT_INFO( footprintName, cmpReference,
cmpValue, timeStampPath ); cmpValue, timeStampPath );
AddModuleInfo( cmp_info ); AddModuleInfo( cmp_info );
return NULL; return cmp_info;
} }
// search the module loaded on board // search the module loaded on board
......
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