From 5916688f35e51d96d300e1364e4ba3575f6900af Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Fri, 30 Dec 2011 13:29:54 +0100 Subject: [PATCH] Pcbnew: Fix error message in Module Editor after a global pad change. Minor other enhancements and code cleaning. --- bitmaps_png/cpp_26/edit_comp_footprint.cpp | 158 +-- common/dialog_about/AboutDialog_main.cpp | 77 +- include/wxBasePcbFrame.h | 21 +- include/wxPcbStruct.h | 10 + .../dialog_global_pads_edition_base.cpp | 154 ++- .../dialog_global_pads_edition_base.fbp | 942 ++++++++++++------ .../dialogs/dialog_global_pads_edition_base.h | 117 +-- pcbnew/edit.cpp | 2 +- pcbnew/globaleditpad.cpp | 187 +++- pcbnew/modedit.cpp | 3 +- pcbnew/module_editor_frame.h | 9 + 11 files changed, 1069 insertions(+), 611 deletions(-) diff --git a/bitmaps_png/cpp_26/edit_comp_footprint.cpp b/bitmaps_png/cpp_26/edit_comp_footprint.cpp index a641ad0ea4..e50f15a99a 100644 --- a/bitmaps_png/cpp_26/edit_comp_footprint.cpp +++ b/bitmaps_png/cpp_26/edit_comp_footprint.cpp @@ -8,71 +8,99 @@ static const unsigned char png[] = { 0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x06, 0x00, 0x00, 0x00, 0xa9, 0x4a, 0x4c, - 0xce, 0x00, 0x00, 0x03, 0xeb, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xdd, 0x96, 0x7d, 0x48, 0x55, - 0x67, 0x1c, 0xc7, 0xd5, 0xab, 0x76, 0xaf, 0xca, 0xe5, 0xaa, 0x88, 0x77, 0xd0, 0x1d, 0x8d, 0xa9, - 0xac, 0x92, 0xa6, 0x8c, 0x5d, 0xdc, 0x44, 0x41, 0x26, 0x75, 0xb9, 0x21, 0x16, 0x5e, 0xf7, 0x67, - 0x98, 0x25, 0xe6, 0x40, 0x8d, 0x88, 0xad, 0xfd, 0xd3, 0x36, 0x9a, 0xd0, 0x98, 0x8a, 0xe4, 0x0b, - 0xf8, 0x72, 0xaf, 0xfe, 0x21, 0xb1, 0xc9, 0xfe, 0x18, 0x23, 0x29, 0x8a, 0xcd, 0x4c, 0x88, 0xb2, - 0xa8, 0x90, 0x5e, 0xb4, 0xae, 0x7a, 0xb2, 0xd9, 0xbc, 0x29, 0x66, 0x4e, 0x26, 0xb1, 0xdc, 0x77, - 0xdf, 0xdf, 0xf1, 0x39, 0xe9, 0xa2, 0x7b, 0x77, 0x61, 0xb0, 0xa0, 0x03, 0x1f, 0xce, 0xf3, 0x72, - 0xce, 0xef, 0x73, 0x9e, 0xe7, 0xf9, 0x3d, 0xe7, 0x9c, 0x08, 0x00, 0x11, 0xff, 0x07, 0x11, 0xaf, - 0x44, 0xc4, 0x23, 0x8d, 0xa4, 0x87, 0xba, 0xa1, 0xb3, 0xb3, 0xb3, 0xcd, 0xeb, 0xf5, 0x6e, 0x6f, - 0x6f, 0x6f, 0x7f, 0x93, 0xe5, 0x1e, 0x9e, 0xdf, 0x66, 0xbd, 0x40, 0xca, 0x42, 0x47, 0x47, 0xc7, - 0xa1, 0x70, 0x44, 0x2e, 0xf2, 0x34, 0x21, 0x21, 0xa1, 0x89, 0x67, 0x4b, 0x10, 0xd1, 0x02, 0x39, - 0xc8, 0x80, 0x59, 0x3c, 0x83, 0xe4, 0xac, 0x17, 0x11, 0x3f, 0xfb, 0xbe, 0x09, 0x47, 0x84, 0xc8, - 0xc8, 0x48, 0x50, 0xb6, 0x60, 0xb1, 0x58, 0x4a, 0xc2, 0x11, 0x35, 0x36, 0x36, 0x5a, 0xba, 0xbb, - 0xbb, 0xed, 0x02, 0xeb, 0xdf, 0xb3, 0xef, 0x97, 0xb0, 0x44, 0x67, 0xcf, 0x9e, 0x43, 0x51, 0x51, - 0xb1, 0x34, 0xc0, 0x66, 0xb3, 0x5d, 0xe6, 0xf9, 0xad, 0x50, 0x22, 0x96, 0x0f, 0xa8, 0xb2, 0x30, - 0x23, 0x7d, 0x61, 0x89, 0xfc, 0x7e, 0x0d, 0xcb, 0xcb, 0x40, 0x7f, 0xff, 0xcf, 0xc8, 0xcc, 0x7c, - 0x17, 0xd1, 0xd1, 0xd1, 0xcf, 0x28, 0xac, 0x67, 0xdf, 0x06, 0x06, 0xf9, 0x96, 0xc1, 0x02, 0x5d, - 0x5d, 0x5d, 0x93, 0x64, 0xa8, 0xb7, 0xb7, 0xd7, 0x6a, 0x88, 0xb8, 0x5e, 0xef, 0xb0, 0x2d, 0x29, - 0xe4, 0x1a, 0xf1, 0xd8, 0x47, 0x4e, 0x88, 0xe8, 0xee, 0x5d, 0x0d, 0x4b, 0x4b, 0xc0, 0x93, 0x27, - 0xc0, 0xdc, 0xdc, 0x0a, 0x1a, 0x1a, 0x3a, 0x90, 0x92, 0x92, 0x8a, 0xf8, 0xf8, 0xf8, 0xb9, 0xb8, - 0xb8, 0xb8, 0x9d, 0x0c, 0xbc, 0x9b, 0x01, 0xf7, 0x73, 0xaa, 0xcc, 0x72, 0xaf, 0xcf, 0xe7, 0xdb, - 0x22, 0xb2, 0xb0, 0xb2, 0xce, 0xe1, 0x70, 0xb4, 0xd8, 0xed, 0xf6, 0x01, 0x11, 0xdd, 0xb9, 0xa3, - 0x61, 0x71, 0x11, 0x98, 0x9f, 0x07, 0x66, 0x67, 0x81, 0x99, 0x19, 0x60, 0x74, 0x74, 0x11, 0x55, - 0x55, 0x9f, 0x21, 0x36, 0x76, 0x03, 0x12, 0x13, 0x13, 0x2f, 0xf0, 0x3a, 0x87, 0x7a, 0xc0, 0x28, - 0xe2, 0x94, 0xd1, 0x86, 0x25, 0xe2, 0x13, 0x79, 0x6b, 0x6a, 0x6a, 0x96, 0x44, 0x74, 0xeb, 0x96, - 0x86, 0xc7, 0x8f, 0xd7, 0x24, 0xd3, 0xd3, 0xc0, 0xfd, 0xfb, 0xc0, 0xc4, 0x04, 0x30, 0x30, 0x30, - 0x81, 0x1d, 0x3b, 0x3c, 0x32, 0x9d, 0x7f, 0x32, 0x59, 0xbe, 0xe3, 0xf5, 0x53, 0x51, 0x51, 0x51, - 0x62, 0x9c, 0x27, 0xd5, 0xe1, 0xee, 0x23, 0x7d, 0x8d, 0x46, 0x46, 0x34, 0x4e, 0x19, 0x10, 0x08, - 0xac, 0x4a, 0xa6, 0xa6, 0x80, 0xc9, 0x49, 0xe0, 0xde, 0x3d, 0x19, 0x19, 0xf8, 0x20, 0x80, 0xd7, - 0x7b, 0x9e, 0xa3, 0x33, 0xa3, 0xac, 0x6c, 0x3f, 0xd7, 0xf4, 0x77, 0x1c, 0x39, 0xd2, 0x80, 0x98, - 0x98, 0x98, 0x95, 0xec, 0xec, 0xec, 0x7e, 0xc6, 0x38, 0xa8, 0x48, 0x0c, 0x29, 0xba, 0x7e, 0x5d, - 0xd3, 0x25, 0x0f, 0x1f, 0xae, 0x49, 0xfc, 0x7e, 0x60, 0x6c, 0x6c, 0x55, 0x32, 0x32, 0x02, 0x0c, - 0x0e, 0xce, 0x73, 0x54, 0xb1, 0x68, 0x6a, 0xea, 0xd1, 0xe5, 0x27, 0x4f, 0xde, 0xd0, 0xb3, 0x34, - 0x39, 0x39, 0x19, 0x5c, 0xc7, 0xdf, 0x28, 0x9d, 0x28, 0x2e, 0x2e, 0x2e, 0xe4, 0xfa, 0xa5, 0x04, - 0x15, 0x5d, 0xbb, 0xa6, 0xe9, 0x92, 0x07, 0x0f, 0x00, 0x4d, 0x5b, 0x93, 0xdc, 0xbe, 0xbd, 0x2a, - 0xf1, 0x7a, 0x07, 0xb1, 0x79, 0xf3, 0x7b, 0xe0, 0xd4, 0xc1, 0x6a, 0xb5, 0xc1, 0xed, 0xde, 0xc3, - 0x64, 0x71, 0x20, 0x23, 0x23, 0x43, 0x4f, 0x71, 0x26, 0xca, 0x53, 0x23, 0xdd, 0x59, 0x3e, 0xfe, - 0x62, 0xd6, 0x65, 0xcb, 0x1c, 0x8b, 0xe8, 0xca, 0x15, 0xed, 0xb9, 0x64, 0x7c, 0x1c, 0xcc, 0xc2, - 0x55, 0xc9, 0xe9, 0xd3, 0xe3, 0x28, 0x2c, 0x2c, 0x91, 0xf5, 0xe1, 0x3e, 0x2b, 0x42, 0x4b, 0x4b, - 0x0b, 0xaa, 0xab, 0xab, 0x91, 0x9b, 0x9b, 0x8b, 0xf2, 0xf2, 0x72, 0xb4, 0xb6, 0xb6, 0x1a, 0xc1, - 0x77, 0x19, 0x1b, 0x98, 0x6d, 0x09, 0xff, 0x10, 0xf1, 0x6d, 0xf0, 0x03, 0x19, 0x16, 0xd1, 0xa5, - 0x4b, 0x9a, 0xbe, 0xf8, 0x86, 0x64, 0x78, 0x78, 0x81, 0x6b, 0x71, 0x98, 0x6b, 0x10, 0xcb, 0x7d, - 0x95, 0x89, 0xba, 0xba, 0x3a, 0x63, 0x73, 0xce, 0x31, 0x89, 0x2a, 0x18, 0xb8, 0x92, 0xe5, 0xcb, - 0xb2, 0xaf, 0x78, 0xde, 0x13, 0x32, 0x19, 0x78, 0xc1, 0x8f, 0xb5, 0xb5, 0xb5, 0xfa, 0x3c, 0x5f, - 0xbc, 0xa8, 0xe9, 0x19, 0x36, 0x3a, 0xfa, 0x0c, 0x47, 0x8f, 0xb6, 0x31, 0x9d, 0x53, 0x90, 0x94, - 0x94, 0xc4, 0xf4, 0xae, 0x32, 0x04, 0x7f, 0x91, 0xf6, 0x60, 0x9b, 0x33, 0xa4, 0x88, 0x37, 0x65, - 0xe6, 0xe5, 0xe5, 0x7d, 0x2a, 0xa2, 0xa1, 0x21, 0x0d, 0x3e, 0xdf, 0x19, 0xa4, 0xa5, 0x6d, 0x85, - 0xc9, 0x64, 0x82, 0xcb, 0xe5, 0xd2, 0xa7, 0x49, 0x49, 0xae, 0xf2, 0x5a, 0xe7, 0x7f, 0xfd, 0x4c, - 0xe8, 0xc9, 0x90, 0x95, 0x95, 0xa3, 0x8f, 0x2c, 0x3d, 0x3d, 0x1d, 0x05, 0x05, 0x05, 0xfa, 0x7a, - 0xb8, 0xdd, 0xee, 0xe5, 0xca, 0xca, 0xca, 0x63, 0xdc, 0x33, 0x9f, 0xb3, 0x2f, 0x87, 0xd8, 0xc9, - 0x97, 0x64, 0x23, 0x29, 0x54, 0xe5, 0x4f, 0x54, 0x1c, 0xb9, 0xe6, 0x6b, 0x72, 0x8c, 0x24, 0x07, - 0x15, 0x59, 0xad, 0xd6, 0x95, 0x8a, 0x8a, 0x0a, 0xd4, 0xd7, 0xd7, 0xeb, 0x99, 0x94, 0x9a, 0x9a, - 0x1a, 0x90, 0x76, 0x52, 0x42, 0x16, 0xd4, 0x1e, 0xc9, 0x52, 0x6d, 0x79, 0x64, 0xda, 0xe9, 0x74, - 0xc2, 0x6c, 0x36, 0x1b, 0xf5, 0x53, 0xe4, 0x3c, 0xf9, 0x83, 0xd4, 0xbd, 0x4c, 0xf4, 0x11, 0x69, - 0x6c, 0x6e, 0x6e, 0x0e, 0xc8, 0x34, 0x71, 0xa1, 0x6f, 0x90, 0x0f, 0xd9, 0x76, 0x48, 0x82, 0x91, - 0x38, 0x25, 0x92, 0xa4, 0xf9, 0x49, 0x89, 0x76, 0x7a, 0x3c, 0x1e, 0xc8, 0xc1, 0x29, 0x95, 0x7a, - 0x99, 0x8a, 0xb5, 0x89, 0xcc, 0x12, 0x4f, 0xd0, 0x4f, 0x39, 0x25, 0x63, 0xa4, 0xa6, 0xaf, 0xaf, - 0xcf, 0x24, 0xbb, 0x5b, 0xbd, 0x5e, 0xf6, 0xa9, 0x00, 0x6d, 0xa4, 0x67, 0xbd, 0xa8, 0xb4, 0xb4, - 0x54, 0x17, 0xf1, 0x03, 0xa8, 0x8b, 0xc8, 0x36, 0xa2, 0x91, 0x8f, 0x43, 0xfe, 0x33, 0x30, 0xff, - 0x6d, 0xeb, 0x46, 0xd9, 0x40, 0x6e, 0x12, 0xd3, 0x0b, 0xa3, 0x37, 0xa6, 0x2e, 0x9f, 0x3c, 0xca, - 0xcf, 0xcf, 0x97, 0x37, 0x82, 0xd4, 0xdf, 0x27, 0xbf, 0x2a, 0xce, 0x90, 0xbd, 0xff, 0xfa, 0x73, - 0x22, 0xc1, 0xc9, 0x57, 0xe4, 0x83, 0x97, 0xf4, 0xbd, 0x41, 0x8e, 0xcb, 0x5b, 0x5c, 0x46, 0xa5, - 0xca, 0xb5, 0xaa, 0xef, 0x0b, 0x55, 0x17, 0x5c, 0xaf, 0xee, 0x2f, 0xe8, 0xb5, 0x10, 0xfd, 0x0d, - 0x8e, 0x6c, 0x36, 0x10, 0x82, 0x7b, 0x72, 0x9e, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, - 0xae, 0x42, 0x60, 0x82, + 0xce, 0x00, 0x00, 0x05, 0xb3, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x95, 0x95, 0x0b, 0x50, 0x94, + 0x55, 0x18, 0x86, 0x77, 0x17, 0x84, 0x00, 0x05, 0x86, 0x11, 0x46, 0x45, 0x26, 0x6a, 0x61, 0x59, + 0xd9, 0x25, 0x04, 0x1a, 0x64, 0x42, 0x44, 0x86, 0xb4, 0x30, 0x11, 0xd1, 0x40, 0x31, 0x40, 0x12, + 0x52, 0x23, 0x44, 0x62, 0x17, 0xc5, 0x40, 0xd4, 0x48, 0x97, 0x55, 0x76, 0x81, 0xcd, 0x40, 0x2e, + 0x11, 0xc1, 0xb8, 0x6d, 0xca, 0xa0, 0x0d, 0x59, 0x69, 0x84, 0x66, 0x52, 0x22, 0x9a, 0x78, 0x49, + 0x40, 0x50, 0x14, 0x51, 0x2e, 0x81, 0x72, 0x19, 0xc0, 0xfb, 0xdb, 0x39, 0xff, 0x5e, 0x00, 0x05, + 0xa5, 0x7f, 0xe6, 0x9d, 0xf3, 0x9f, 0xf7, 0x9c, 0xfd, 0x9e, 0xb3, 0xdf, 0xf9, 0xce, 0xf9, 0x59, + 0x00, 0x58, 0xe4, 0x89, 0x27, 0x5a, 0x4e, 0xdf, 0xc7, 0x52, 0x41, 0x41, 0x81, 0x7b, 0x7e, 0x7e, + 0xfe, 0xfd, 0xbc, 0xbc, 0x3c, 0x1e, 0x79, 0x17, 0x93, 0xf7, 0x76, 0xea, 0x93, 0xf6, 0x00, 0xf5, + 0x35, 0x63, 0xfb, 0xb6, 0x6f, 0xdf, 0xce, 0x19, 0x2f, 0x06, 0x4b, 0x03, 0xca, 0x24, 0x82, 0x99, + 0x99, 0x59, 0x0d, 0x69, 0xed, 0x9e, 0x9d, 0x44, 0x02, 0x79, 0x10, 0x21, 0x37, 0x37, 0x97, 0x4f, + 0xda, 0x44, 0xa2, 0x1e, 0xcd, 0x02, 0x5c, 0x88, 0xde, 0xa5, 0x22, 0xde, 0x5d, 0xd2, 0xc6, 0xbc, + 0x14, 0x44, 0x20, 0xb0, 0xb6, 0xb6, 0x86, 0x9e, 0x9e, 0xde, 0x13, 0x53, 0x53, 0x53, 0x0a, 0x36, + 0x9a, 0x00, 0xc8, 0x9f, 0xbc, 0xc7, 0x69, 0xd4, 0x47, 0xfa, 0x61, 0x2f, 0x05, 0xf1, 0xf9, 0x7c, + 0xf4, 0xf6, 0x0e, 0x20, 0x39, 0x79, 0x1b, 0x8c, 0x8d, 0x8d, 0xa9, 0xba, 0x0d, 0x0c, 0x0c, 0x96, + 0x6a, 0x40, 0x6e, 0x14, 0x44, 0x02, 0x2d, 0x25, 0x6d, 0x16, 0x51, 0xa7, 0xc6, 0x3f, 0x4c, 0x01, + 0x24, 0x6d, 0xb5, 0x14, 0x36, 0x1e, 0xe4, 0x39, 0xd0, 0x83, 0x07, 0xc0, 0xc0, 0x00, 0x50, 0x5f, + 0xdf, 0x8a, 0x95, 0x2b, 0xc3, 0xc1, 0x66, 0xb3, 0x61, 0x6e, 0x6e, 0x5e, 0x45, 0xc6, 0x6d, 0x49, + 0xb0, 0xcd, 0x14, 0x46, 0xd4, 0x4d, 0xfe, 0xd9, 0xdc, 0x11, 0xa0, 0x5f, 0x5e, 0x04, 0xd0, 0x81, + 0xc8, 0xd3, 0x4e, 0x54, 0xe9, 0xe0, 0xc0, 0xc7, 0xe0, 0x20, 0xd0, 0xd7, 0x07, 0xdc, 0xbb, 0x07, + 0x74, 0x75, 0x01, 0x47, 0x8f, 0xd6, 0xc0, 0xdd, 0x7d, 0x2e, 0xf4, 0xf5, 0xf5, 0x1f, 0x93, 0xd4, + 0x4a, 0x37, 0x6c, 0xd8, 0x60, 0x29, 0x97, 0xcb, 0x75, 0x29, 0x2d, 0x2e, 0x2e, 0x36, 0xa1, 0x9a, + 0x10, 0x28, 0x28, 0x28, 0xa8, 0xd2, 0xd1, 0xd1, 0xb1, 0x99, 0x82, 0xfa, 0xfb, 0x81, 0x9e, 0x1e, + 0x35, 0xa4, 0xa3, 0x03, 0xb8, 0x73, 0x07, 0x68, 0x69, 0x01, 0xb2, 0xb3, 0x0f, 0x62, 0xe6, 0xcc, + 0xd7, 0x60, 0x62, 0x62, 0xd2, 0x49, 0xf6, 0xd0, 0x8f, 0x2c, 0xcc, 0x90, 0x68, 0x05, 0xd1, 0x1e, + 0x22, 0xd7, 0x09, 0x81, 0x48, 0x4a, 0xe4, 0x2e, 0x2e, 0x2e, 0x17, 0x79, 0x3c, 0x3e, 0x03, 0xe9, + 0xee, 0x1e, 0x86, 0xdc, 0xba, 0x05, 0xdc, 0xb8, 0x01, 0x34, 0x35, 0x01, 0x97, 0x2e, 0xdd, 0x87, + 0x48, 0x24, 0xc5, 0xe4, 0xc9, 0xa6, 0xe0, 0x70, 0x38, 0xfd, 0x33, 0x66, 0xcc, 0xc0, 0xc2, 0x85, + 0xef, 0x61, 0xd2, 0x24, 0x03, 0x58, 0x58, 0x58, 0xa4, 0xbc, 0x14, 0xa4, 0xdd, 0x23, 0x0a, 0xa2, + 0x90, 0x4e, 0xb2, 0xcd, 0x6d, 0x6d, 0xc3, 0x90, 0x6b, 0xd7, 0x80, 0x86, 0x06, 0xe0, 0xca, 0x15, + 0x0a, 0x03, 0x24, 0x92, 0xfd, 0x14, 0x84, 0x0b, 0x17, 0x5a, 0x70, 0xfd, 0x3a, 0x10, 0x13, 0xf3, + 0x05, 0x8c, 0x8c, 0x8c, 0x60, 0x69, 0x69, 0xd9, 0x41, 0xe2, 0x9c, 0x26, 0x3a, 0xf4, 0x42, 0x90, + 0xbd, 0x3d, 0x5f, 0x07, 0x69, 0x6d, 0x05, 0x6e, 0xde, 0x54, 0x43, 0xae, 0x5e, 0x05, 0xea, 0xea, + 0xd4, 0x90, 0xda, 0x5a, 0x20, 0x3e, 0x5e, 0x4e, 0x7f, 0x80, 0x9c, 0x9c, 0x32, 0x54, 0x57, 0x0f, + 0xc1, 0xc7, 0x27, 0x18, 0xd3, 0xa7, 0x4f, 0xc7, 0xb2, 0x65, 0xcb, 0x9e, 0xce, 0x9b, 0x37, 0xef, + 0x9c, 0x8f, 0x8f, 0xcf, 0x89, 0xcc, 0xcc, 0xcc, 0x2f, 0x23, 0x23, 0x23, 0xdd, 0xc7, 0x05, 0xb5, + 0xb7, 0x0f, 0x43, 0xe8, 0x6a, 0xb5, 0x90, 0xcb, 0x97, 0x01, 0xa5, 0xb2, 0x06, 0xce, 0xce, 0x9e, + 0xf4, 0x50, 0x93, 0xd6, 0x99, 0x16, 0x08, 0x0c, 0x0d, 0x8d, 0x68, 0xda, 0x90, 0x90, 0x90, 0x40, + 0xab, 0x11, 0x0a, 0x99, 0xb4, 0xab, 0x24, 0x7d, 0xd3, 0x63, 0xaa, 0xac, 0x20, 0xdb, 0x1e, 0x12, + 0xf7, 0xd5, 0x91, 0x55, 0x97, 0x4f, 0x54, 0x66, 0x67, 0xc7, 0xc7, 0xed, 0xdb, 0xea, 0xcd, 0xa7, + 0x90, 0xc6, 0x46, 0x5a, 0xe6, 0x40, 0x65, 0x65, 0x2b, 0xfc, 0xfd, 0xc3, 0xe9, 0x41, 0x86, 0xaf, + 0xaf, 0x2f, 0x14, 0x0a, 0x05, 0x13, 0x54, 0xb6, 0x7b, 0xd7, 0x7d, 0x91, 0x48, 0x44, 0x0f, 0x31, + 0x34, 0x65, 0x5f, 0x1d, 0x22, 0xe4, 0x28, 0x06, 0x44, 0x2c, 0xd4, 0x44, 0x19, 0xe1, 0x54, 0x18, + 0xbb, 0x9f, 0x1e, 0x0b, 0x1d, 0xc8, 0xc6, 0xc6, 0xe6, 0xb8, 0x95, 0x95, 0xd5, 0x39, 0x0a, 0xa2, + 0x90, 0xe6, 0x66, 0x35, 0xa4, 0xb6, 0x76, 0x90, 0xe4, 0x7f, 0x07, 0xc9, 0xbf, 0x09, 0xb8, 0x5c, + 0x2e, 0x52, 0x52, 0x52, 0x98, 0x80, 0x79, 0xb9, 0x39, 0x4f, 0xc5, 0x62, 0xf1, 0xc5, 0x8d, 0xde, + 0x53, 0x5b, 0xf7, 0x8a, 0x43, 0xf0, 0x4d, 0x4e, 0x26, 0xd2, 0xc2, 0xe6, 0x0c, 0x79, 0x7b, 0x7b, + 0x7f, 0xbf, 0xd4, 0xc5, 0xf2, 0x6a, 0xf6, 0x1a, 0x37, 0x9c, 0xad, 0xf8, 0x01, 0xe9, 0x4b, 0xac, + 0x9e, 0xb8, 0xba, 0xba, 0x96, 0x7b, 0x79, 0x79, 0xa9, 0xdc, 0xdc, 0xdc, 0x4a, 0xe8, 0xa1, 0x6b, + 0x20, 0xb9, 0xed, 0xa3, 0x20, 0x35, 0xe4, 0x29, 0xd2, 0xd3, 0xf7, 0x63, 0xda, 0x34, 0x1b, 0x52, + 0x61, 0x93, 0x11, 0x11, 0x11, 0x01, 0x52, 0x99, 0x0c, 0x44, 0x99, 0x2e, 0x86, 0x32, 0x71, 0x09, + 0xe8, 0xa3, 0x4a, 0x7a, 0x1f, 0xa7, 0x3f, 0xb6, 0x44, 0x69, 0x94, 0x3d, 0xbe, 0x8b, 0xb4, 0x67, + 0xbc, 0xa2, 0x5d, 0xb1, 0xa8, 0xff, 0xc4, 0x04, 0xca, 0x28, 0x47, 0xfc, 0x16, 0x31, 0x85, 0xc4, + 0x6b, 0x66, 0x7c, 0x99, 0x4c, 0xd6, 0xae, 0xdb, 0x23, 0x2e, 0x97, 0x8f, 0xd2, 0xd2, 0xbf, 0x48, + 0xfe, 0xe7, 0x30, 0x37, 0x02, 0x59, 0x21, 0xb2, 0xb2, 0xb2, 0xd4, 0x69, 0xd9, 0x2b, 0x43, 0x4b, + 0xea, 0x1b, 0x40, 0x22, 0x0b, 0x2a, 0xd1, 0xdb, 0x3a, 0x10, 0xed, 0x33, 0xde, 0x08, 0x90, 0xd6, + 0x3b, 0xfd, 0xd1, 0x38, 0x20, 0x3d, 0x3d, 0x7d, 0x06, 0x60, 0x6b, 0x6b, 0x8b, 0xa4, 0xa4, 0x24, + 0x06, 0x90, 0xb2, 0x33, 0x03, 0xac, 0xd7, 0x83, 0x18, 0xb1, 0xb9, 0xc1, 0x30, 0x15, 0x84, 0x60, + 0x41, 0xb0, 0x08, 0xff, 0xde, 0xed, 0x43, 0xd5, 0xaf, 0xe5, 0x58, 0x1d, 0xb5, 0x91, 0x19, 0xcb, + 0x90, 0x4a, 0xf0, 0x6d, 0xd9, 0x09, 0xdd, 0x5c, 0x7d, 0xbb, 0x60, 0x98, 0x09, 0x43, 0x10, 0x97, + 0x5a, 0x88, 0x07, 0x0f, 0x1f, 0x8d, 0x06, 0x91, 0xb3, 0xd1, 0x1b, 0x1a, 0x1a, 0xaa, 0x4b, 0x53, + 0x5a, 0x5a, 0x5a, 0xc3, 0xea, 0xb5, 0x71, 0xcc, 0x0f, 0xe3, 0x52, 0x8b, 0x70, 0xe0, 0xc8, 0x9f, + 0xd8, 0xf9, 0x55, 0x19, 0x8c, 0x05, 0xa1, 0x08, 0x5c, 0xbf, 0x87, 0x59, 0xe9, 0x3e, 0xe5, 0x31, + 0x66, 0xbc, 0xae, 0xa9, 0x55, 0x07, 0x92, 0x15, 0x94, 0x43, 0xf5, 0x63, 0x15, 0x42, 0xe3, 0x15, + 0x4c, 0xff, 0xd0, 0xb1, 0x33, 0xa3, 0x40, 0x0b, 0xa2, 0xa3, 0xa3, 0x7d, 0x34, 0xd5, 0x73, 0x83, + 0xde, 0xd2, 0x42, 0xa1, 0x50, 0x7c, 0xf4, 0xc4, 0x19, 0x66, 0x72, 0xc9, 0xa1, 0x93, 0xd0, 0x3e, + 0x09, 0x92, 0x12, 0xc6, 0x6b, 0xeb, 0xbc, 0x37, 0x26, 0xe8, 0xef, 0x7f, 0xae, 0x33, 0xf3, 0x6e, + 0xb5, 0x75, 0x31, 0xfd, 0xad, 0x72, 0xd5, 0x30, 0x88, 0xaa, 0xb0, 0xb0, 0xd0, 0x91, 0x40, 0x76, + 0x92, 0x72, 0x35, 0xa6, 0x7d, 0x81, 0x40, 0x90, 0x90, 0x96, 0x91, 0xfb, 0x1c, 0x48, 0x1b, 0xf0, + 0x8f, 0x9a, 0xba, 0x31, 0x41, 0xeb, 0x92, 0xf2, 0x20, 0x96, 0x14, 0xe3, 0xcd, 0x80, 0x44, 0xa6, + 0xff, 0xf3, 0xef, 0xe7, 0x47, 0x83, 0x9e, 0x15, 0xf9, 0x6c, 0x6c, 0xc9, 0xc8, 0x2e, 0x7a, 0x0e, + 0x94, 0xaf, 0xaa, 0x60, 0xbc, 0xea, 0xda, 0xc6, 0x31, 0x41, 0x3c, 0xdf, 0x58, 0x06, 0xe2, 0x1b, + 0xfa, 0x39, 0x0a, 0x0f, 0x56, 0x8e, 0x2e, 0x86, 0xb1, 0x34, 0x32, 0x75, 0xb1, 0xb1, 0x9b, 0xa1, + 0x92, 0x89, 0x19, 0x2d, 0x58, 0x1e, 0x03, 0x43, 0xfe, 0x2a, 0x94, 0x2b, 0x0b, 0x10, 0xb5, 0x66, + 0x1d, 0x33, 0xbe, 0x3b, 0x65, 0x93, 0x0e, 0x94, 0xb6, 0x25, 0x96, 0x99, 0x57, 0x24, 0xf9, 0x94, + 0x7c, 0x0d, 0xfa, 0xff, 0x1f, 0xc8, 0xc9, 0x7d, 0x31, 0x62, 0xdf, 0x99, 0x8d, 0x80, 0xb9, 0x9e, + 0x60, 0x93, 0x7e, 0xb2, 0x4c, 0xc5, 0x94, 0xf7, 0xbe, 0xe0, 0xd7, 0x99, 0x71, 0xf9, 0x4a, 0xe1, + 0xf0, 0x1e, 0xad, 0x37, 0x1f, 0xbf, 0xbc, 0xc7, 0x03, 0x1d, 0x3f, 0x75, 0x16, 0x5e, 0x2b, 0xb6, + 0xc2, 0xc1, 0xcd, 0x1f, 0xb3, 0x5c, 0x17, 0xc1, 0xc3, 0x63, 0x21, 0xd6, 0x2e, 0x5f, 0x44, 0xbe, + 0xc2, 0x83, 0xd8, 0x9f, 0x18, 0x88, 0x6d, 0x81, 0xb3, 0xc1, 0x73, 0x5d, 0x8c, 0xcc, 0x90, 0x59, + 0x28, 0xaf, 0x38, 0x03, 0x87, 0xb7, 0x56, 0xe1, 0x60, 0xf8, 0x4c, 0xe4, 0xaf, 0xf3, 0xc0, 0x91, + 0x70, 0x73, 0x72, 0x85, 0xd5, 0x63, 0x68, 0x68, 0x08, 0x52, 0xa9, 0xb4, 0x63, 0x5c, 0x10, 0x8f, + 0xc7, 0x9b, 0xe5, 0xe1, 0xe1, 0x91, 0x41, 0xf5, 0x99, 0xd7, 0x2b, 0xed, 0x92, 0xe8, 0x40, 0xa4, + 0x46, 0xf9, 0x21, 0x79, 0xbe, 0x71, 0x0b, 0xf5, 0x36, 0x7a, 0x4e, 0x69, 0x94, 0x47, 0x79, 0x63, + 0xef, 0xd6, 0x68, 0xec, 0x98, 0x6f, 0xd8, 0x4b, 0xbd, 0x00, 0x67, 0x8b, 0xf3, 0xf9, 0x1f, 0x3a, + 0xe1, 0x70, 0x5e, 0x1a, 0x14, 0x01, 0x53, 0x1f, 0x39, 0x39, 0x39, 0x7d, 0x4d, 0x7d, 0x72, 0x05, + 0x49, 0x58, 0x13, 0xf9, 0x3a, 0xee, 0xf2, 0x66, 0x57, 0xf7, 0xc7, 0xb3, 0x40, 0x2f, 0x4c, 0xa9, + 0x0f, 0xbb, 0x82, 0x7a, 0x29, 0x9e, 0xec, 0xd2, 0x87, 0x9b, 0x58, 0xb8, 0x1b, 0xc7, 0x42, 0x9e, + 0x1f, 0xbb, 0x91, 0x7a, 0xf4, 0x52, 0xa5, 0x69, 0xeb, 0x88, 0x65, 0xa1, 0xea, 0xd9, 0x4b, 0x75, + 0x22, 0xa0, 0x15, 0x8e, 0x7a, 0x27, 0x69, 0x30, 0xaa, 0x55, 0x02, 0xf6, 0x4f, 0xd4, 0xfb, 0x40, + 0xc0, 0x51, 0x6a, 0xbd, 0x30, 0x21, 0xa7, 0x96, 0x7a, 0x7e, 0x5c, 0x8e, 0x54, 0xeb, 0x89, 0xdc, + 0xd9, 0x4d, 0x04, 0x64, 0xad, 0x8d, 0xf1, 0x1f, 0x68, 0xa0, 0x70, 0x72, 0xd7, 0xc5, 0x8a, 0x11, + 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, }; const BITMAP_OPAQUE edit_comp_footprint_xpm[1] = {{ png, sizeof( png ), "edit_comp_footprint_xpm" }}; diff --git a/common/dialog_about/AboutDialog_main.cpp b/common/dialog_about/AboutDialog_main.cpp index 1ea8e353f1..5f1512fb86 100644 --- a/common/dialog_about/AboutDialog_main.cpp +++ b/common/dialog_about/AboutDialog_main.cpp @@ -205,72 +205,79 @@ static void InitKiCadAboutNew( AboutAppInfo& info ) /* The developers */ info.AddDeveloper( new Contributor( wxT( "Jean-Pierre Charras" ), - wxT( "jean-pierre.charras@gipsa-lab.inpg.fr" ) ) ); + wxT( "jean-pierre.charras@gipsa-lab.inpg.fr" ) ) ); info.AddDeveloper( new Contributor( wxT( "Dick Hollenbeck" ), wxT( "dick@softplc.com" ) ) ); info.AddDeveloper( new Contributor( wxT( "Hauptmech" ), wxT( "hauptmech@gmail.com" ) ) ); info.AddDeveloper( new Contributor( wxT( "Jerry Jacobs" ), - wxT( "xor.gate.engineering@gmail.com" ) ) ); + wxT( "xor.gate.engineering@gmail.com" ) ) ); info.AddDeveloper( new Contributor( wxT( "Jonas Diemer" ), wxT( "diemer@gmx.de" ) ) ); info.AddDeveloper( new Contributor( wxT( "KBool Library" ), - wxT( "http://boolean.klaasholwerda.nl/bool.html" ) ) ); + wxT( "http://boolean.klaasholwerda.nl/bool.html" ) ) ); info.AddDeveloper( new Contributor( wxT( "Lorenzo Marcantonio" ), wxT( "lomarcan@tin.it" ) ) ); - info.AddDeveloper( new Contributor( wxT( "Marco Serantoni" ), wxT( "marco.serantoni@gmail.com" ) ) ); + info.AddDeveloper( new Contributor( wxT( "Marco Serantoni" ), + wxT( "marco.serantoni@gmail.com" ) ) ); info.AddDeveloper( new Contributor( wxT( "Marco Mattila" ), wxT( "marcom99@gmail.com" ) ) ); info.AddDeveloper( new Contributor( wxT( "Rafael Sokolowski" ), - wxT( "rafael.sokolowski@web.de" ) ) ); + wxT( "rafael.sokolowski@web.de" ) ) ); info.AddDeveloper( new Contributor( wxT( "Rok Markovic" ), wxT( "rok@kanardia.eu" ) ) ); info.AddDeveloper( new Contributor( wxT( "Tim Hanson" ), wxT( "sideskate@gmail.com" ) ) ); info.AddDeveloper( new Contributor( wxT( "Vesa Solonen" ), wxT( "vesa.solonen@hut.fi" ) ) ); - info.AddDeveloper( new Contributor( wxT( "Wayne Stambaugh" ), wxT( "stambaughw@verizon.net" ) ) ); + info.AddDeveloper( new Contributor( wxT( "Wayne Stambaugh" ), + wxT( "stambaughw@verizon.net" ) ) ); /* The document writers */ info.AddDocWriter( new Contributor( wxT( "Jean-Pierre Charras" ), - wxT( "jean-pierre.charras@gipsa-lab.inpg.fr" ) ) ); - info.AddDocWriter( new Contributor( wxT( "Igor Plyatov" ), wxT( "plyatov@gmail.com" ) ) ); + wxT( "jean-pierre.charras@gipsa-lab.inpg.fr" ) ) ); + info.AddDocWriter( new Contributor( wxT( "Igor Plyatov" ), + wxT( "plyatov@gmail.com" ) ) ); + info.AddDocWriter( new Contributor( wxT( "Fabrizio Tappero" ), + wxT( "fabrizio.tappero@gmail.com" ) ) ); /* The translators * As category the language to which the translation was done is used * and as icon the national flag of the corresponding country. */ info.AddTranslator( new Contributor( wxT( "Martin Kratoška" ), wxT( "martin@ok1rr.com" ), - wxT( "Czech (CZ)" ), KiBitmapNew( lang_cs_xpm ) ) ); + wxT( "Czech (CZ)" ), KiBitmapNew( lang_cs_xpm ) ) ); info.AddTranslator( new Contributor( wxT( "Jerry Jacobs" ), - wxT( "xor.gate.engineering@gmail.com" ), wxT( "Dutch (NL)" ), - KiBitmapNew( lang_nl_xpm ) ) ); + wxT( "xor.gate.engineering@gmail.com" ), wxT( "Dutch (NL)" ), + KiBitmapNew( lang_nl_xpm ) ) ); info.AddTranslator( new Contributor( wxT( "Vesa Solonen" ), wxT( "vesa.solonen@hut.fi" ), - wxT( "Finnish (FI)" ), KiBitmapNew( lang_fi_xpm ) ) ); + wxT( "Finnish (FI)" ), KiBitmapNew( lang_fi_xpm ) ) ); info.AddTranslator( new Contributor( wxT( "Jean-Pierre Charras" ), - wxT( "jean-pierre.charras@gipsa-lab.inpg.fr" ), - wxT( "French (FR)" ), KiBitmapNew( lang_fr_xpm ) ) ); + wxT( "jean-pierre.charras@gipsa-lab.inpg.fr" ), + wxT( "French (FR)" ), KiBitmapNew( lang_fr_xpm ) ) ); info.AddTranslator( new Contributor( wxT( "Mateusz Skowroński" ), wxT( "skowri@gmail.com" ), - wxT( "Polish (PL)" ), KiBitmapNew( lang_pl_xpm ) ) ); + wxT( "Polish (PL)" ), KiBitmapNew( lang_pl_xpm ) ) ); info.AddTranslator( new Contributor( wxT( "Renie Marquet" ), wxT( "reniemarquet@uol.com.br" ), - wxT( "Portuguese (PT)" ), KiBitmapNew( lang_pt_xpm ) ) ); + wxT( "Portuguese (PT)" ), KiBitmapNew( lang_pt_xpm ) ) ); info.AddTranslator( new Contributor( wxT( "Igor Plyatov" ), wxT( "plyatov@gmail.com" ), - wxT( "Russian (RU)" ), KiBitmapNew( lang_ru_xpm ) ) ); + wxT( "Russian (RU)" ), KiBitmapNew( lang_ru_xpm ) ) ); info.AddTranslator( new Contributor( wxT( "Andrey Fedorushkov" ), wxT( "" ), - wxT( "Russian (RU)" ), KiBitmapNew( lang_ru_xpm ) ) ); + wxT( "Russian (RU)" ), KiBitmapNew( lang_ru_xpm ) ) ); info.AddTranslator( new Contributor( wxT( "Pedro Martin del Valle" ), wxT( "pkicad@yahoo.es" ), - wxT( "Spanish (ES)" ), KiBitmapNew( lang_es_xpm ) ) ); + wxT( "Spanish (ES)" ), KiBitmapNew( lang_es_xpm ) ) ); info.AddTranslator( new Contributor( wxT( "Iñigo Zuluaga" ), wxT( "inigo_zuluaga@yahoo.es" ), - wxT( "Spanish (ES)" ), KiBitmapNew( lang_es_xpm ) ) ); + wxT( "Spanish (ES)" ), KiBitmapNew( lang_es_xpm ) ) ); info.AddTranslator( new Contributor( wxT( "Rafael Sokolowski" ), - wxT( "rafael.sokolowski@web.de" ), wxT( "German (DE)" ), - KiBitmapNew( lang_de_xpm ) ) ); + wxT( "rafael.sokolowski@web.de" ), wxT( "German (DE)" ), + KiBitmapNew( lang_de_xpm ) ) ); info.AddTranslator( new Contributor( wxT( "Kenta Yonekura" ), - wxT( "midpika@hotmail.com" ), wxT( "Japanese (JA)" ), - KiBitmapNew( lang_jp_xpm ) ) ); + wxT( "midpika@hotmail.com" ), wxT( "Japanese (JA)" ), + KiBitmapNew( lang_jp_xpm ) ) ); info.AddTranslator( new Contributor( wxT( "Manolis Stefanis, Athanasios Vlastos and Milonas Kostas" ), - wxT( "milonas.ko@gmail.com" ), wxT( "Greek (el_GR)" ), - KiBitmapNew( lang_gr_xpm ) ) ); + wxT( "milonas.ko@gmail.com" ), wxT( "Greek (el_GR)" ), + KiBitmapNew( lang_gr_xpm ) ) ); info.AddTranslator( new Contributor( wxT( "Massimo Cioce" ), - wxT( "ciocemax@alice.it" ), wxT( "Italian (IT)" ), - KiBitmapNew( lang_it_xpm ) ) ); + wxT( "ciocemax@alice.it" ), wxT( "Italian (IT)" ), + KiBitmapNew( lang_it_xpm ) ) ); info.AddTranslator( new Contributor( wxT( "Evgeniy Ivanov" ), - wxT( "evgeniy_p_ivanov@yahoo.ca" ), wxT( "Bulgarian (BG)" ), - KiBitmapNew( lang_bg_xpm ) ) ); + wxT( "evgeniy_p_ivanov@yahoo.ca" ), wxT( "Bulgarian (BG)" ), + KiBitmapNew( lang_bg_xpm ) ) ); - /* TODO: are these all russian translators, placed them here now, or else align them below other language maintainer with mail adress */ + // TODO: are these all russian translators, + // placed them here now, + // or else align them below other language maintainer with mail adress info.AddTranslator( new Contributor( wxT( "Remy Halvick" ), wxEmptyString, wxT( "Others" ) ) ); info.AddTranslator( new Contributor( wxT( "David Briscoe" ), wxEmptyString, wxT( "Others" ) ) ); info.AddTranslator( new Contributor( wxT( "Dominique Laigle" ), wxEmptyString, wxT( "Others" ) ) ); @@ -278,13 +285,13 @@ static void InitKiCadAboutNew( AboutAppInfo& info ) /* Programm credits for icons */ info.AddArtist( new Contributor( wxT( "Iñigo Zuluagaz" ), wxT( "inigo_zuluaga@yahoo.es" ), - wxT( "Icons by" ), KiBitmapNew( edit_module_xpm ) ) ); + wxT( "Icons by" ), KiBitmapNew( edit_module_xpm ) ) ); info.AddArtist( new Contributor( wxT( "Fabrizio Tappero" ), wxT( "fabrizio.tappero@gmail.com" ), - wxT( "New icons by" ), KiBitmapNew( edit_module_xpm ) ) ); + wxT( "New icons by" ), KiBitmapNew( edit_module_xpm ) ) ); info.AddArtist( new Contributor( wxT( "Renie Marquet" ), wxT( "reniemarquet@uol.com.br" ), - wxT( "3D modules by" ), KiBitmapNew( three_d_xpm ) ) ); + wxT( "3D modules by" ), KiBitmapNew( three_d_xpm ) ) ); info.AddArtist( new Contributor( wxT( "Christophe Boschat" ), wxT( "nox454@hotmail.fr" ), - wxT( "3D modules by" ), KiBitmapNew( three_d_xpm ) ) ); + wxT( "3D modules by" ), KiBitmapNew( three_d_xpm ) ) ); } diff --git a/include/wxBasePcbFrame.h b/include/wxBasePcbFrame.h index 282de446a8..e0ccdb8aeb 100644 --- a/include/wxBasePcbFrame.h +++ b/include/wxBasePcbFrame.h @@ -325,7 +325,26 @@ public: void PlacePad( D_PAD* Pad, wxDC* DC ); void Export_Pad_Settings( D_PAD* aPad ); void Import_Pad_Settings( D_PAD* aPad, bool aDraw ); - void Global_Import_Pad_Settings( D_PAD* aPad, bool aDraw ); + + /** + * Function GlobalChange_PadSettings + * Function to change pad caracteristics for the given footprint + * or all footprints which look like the given footprint + * @param aPad is the pattern. The given footprint is the parent of this pad + * @param aSameFootprints: if true, make changes on all identical footprints + * @param aPadShapeFilter: if true, make changes only on pads having the same shape as aPad + * @param aPadOrientFilter: if true, make changes only on pads having the same orientation as aPad + * @param aPadLayerFilter: if true, make changes only on pads having the same layers as aPad + * @param aRedraw: if true: redraws the footprint + * @param aSaveForUndo: if true: create an entry in the Undo/Redo list + * (usually: true in Schematic editor, false in Module editor) + */ + void GlobalChange_PadSettings( D_PAD* aPad, + bool aSameFootprints, + bool aPadShapeFilter, + bool aPadOrientFilter, + bool aPadLayerFilter, + bool aRedraw, bool aSaveForUndo ); // loading footprints diff --git a/include/wxPcbStruct.h b/include/wxPcbStruct.h index 261942cc4c..fe54718b26 100644 --- a/include/wxPcbStruct.h +++ b/include/wxPcbStruct.h @@ -877,6 +877,16 @@ public: void InstallModuleOptionsFrame( MODULE* Module, wxDC* DC ); void StartMove_Module( MODULE* module, wxDC* DC ); + /** + * Function DlgGlobalChange_PadSettings + * Function to change pad caracteristics for the given footprint + * or all footprints which look like the given footprint + * Options are set by the opened dialog. + * @param aPad is the pattern. The given footprint is the parent of this pad + * @param aRedraw: if true: redraws the footprint + */ + void DlgGlobalChange_PadSettings( D_PAD* aPad, bool aRedraw ); + /** * Function Delete Module * Remove a footprint from m_Modules linked list and put it in undelete buffer diff --git a/pcbnew/dialogs/dialog_global_pads_edition_base.cpp b/pcbnew/dialogs/dialog_global_pads_edition_base.cpp index 5f9467ce77..a98f780fdb 100644 --- a/pcbnew/dialogs/dialog_global_pads_edition_base.cpp +++ b/pcbnew/dialogs/dialog_global_pads_edition_base.cpp @@ -1,78 +1,76 @@ -/////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 16 2008) -// http://www.wxformbuilder.org/ -// -// PLEASE DO "NOT" EDIT THIS FILE! -/////////////////////////////////////////////////////////////////////////// - -#include "dialog_global_pads_edition_base.h" - -/////////////////////////////////////////////////////////////////////////// - -DIALOG_GLOBAL_PADS_EDITION_BASE::DIALOG_GLOBAL_PADS_EDITION_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style ) -{ - this->SetSizeHints( wxDefaultSize, wxDefaultSize ); - - wxBoxSizer* bMainSizer; - bMainSizer = new wxBoxSizer( wxHORIZONTAL ); - - wxBoxSizer* bLeftSizer; - bLeftSizer = new wxBoxSizer( wxVERTICAL ); - - wxStaticBoxSizer* sbSizer1; - sbSizer1 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Pad Filter :") ), wxVERTICAL ); - - m_Pad_Shape_Filter_CB = new wxCheckBox( this, wxID_ANY, _("Do not modify pads having a different shape"), wxDefaultPosition, wxDefaultSize, 0 ); - - sbSizer1->Add( m_Pad_Shape_Filter_CB, 0, wxALL, 5 ); - - m_Pad_Layer_Filter_CB = new wxCheckBox( this, wxID_ANY, _("Do not modify pads having different layers"), wxDefaultPosition, wxDefaultSize, 0 ); - - sbSizer1->Add( m_Pad_Layer_Filter_CB, 0, wxALL, 5 ); - - m_Pad_Orient_Filter_CB = new wxCheckBox( this, wxID_ANY, _("Do not modify pads having a different orientation"), wxDefaultPosition, wxDefaultSize, 0 ); - - sbSizer1->Add( m_Pad_Orient_Filter_CB, 0, wxALL, 5 ); - - bLeftSizer->Add( sbSizer1, 1, wxEXPAND, 5 ); - - bMainSizer->Add( bLeftSizer, 1, wxEXPAND, 5 ); - - wxBoxSizer* bRightSizer; - bRightSizer = new wxBoxSizer( wxVERTICAL ); - - m_buttonPadEditor = new wxButton( this, ID_CHANGE_GET_PAD_SETTINGS, _("Pad Editor"), wxDefaultPosition, wxDefaultSize, 0 ); - bRightSizer->Add( m_buttonPadEditor, 0, wxALL|wxEXPAND, 5 ); - - - bRightSizer->Add( 10, 10, 0, 0, 5 ); - - m_button2 = new wxButton( this, ID_CHANGE_CURRENT_MODULE, _("Change Pads on Module"), wxDefaultPosition, wxDefaultSize, 0 ); - bRightSizer->Add( m_button2, 0, wxALL|wxEXPAND, 5 ); - - m_button3 = new wxButton( this, ID_CHANGE_ID_MODULES, _("Change Pads on Same Modules"), wxDefaultPosition, wxDefaultSize, 0 ); - bRightSizer->Add( m_button3, 0, wxALL|wxEXPAND, 5 ); - - m_button4 = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); - bRightSizer->Add( m_button4, 0, wxALL|wxEXPAND, 5 ); - - bMainSizer->Add( bRightSizer, 0, wxEXPAND, 5 ); - - this->SetSizer( bMainSizer ); - this->Layout(); - - // Connect Events - m_buttonPadEditor->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_PADS_EDITION_BASE::InstallPadEditor ), NULL, this ); - m_button2->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_PADS_EDITION_BASE::PadPropertiesAccept ), NULL, this ); - m_button3->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_PADS_EDITION_BASE::PadPropertiesAccept ), NULL, this ); - m_button4->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_PADS_EDITION_BASE::OnCancelClick ), NULL, this ); -} - -DIALOG_GLOBAL_PADS_EDITION_BASE::~DIALOG_GLOBAL_PADS_EDITION_BASE() -{ - // Disconnect Events - m_buttonPadEditor->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_PADS_EDITION_BASE::InstallPadEditor ), NULL, this ); - m_button2->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_PADS_EDITION_BASE::PadPropertiesAccept ), NULL, this ); - m_button3->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_PADS_EDITION_BASE::PadPropertiesAccept ), NULL, this ); - m_button4->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_PADS_EDITION_BASE::OnCancelClick ), NULL, this ); -} +/////////////////////////////////////////////////////////////////////////// +// C++ code generated with wxFormBuilder (version Jun 30 2011) +// http://www.wxformbuilder.org/ +// +// PLEASE DO "NOT" EDIT THIS FILE! +/////////////////////////////////////////////////////////////////////////// + +#include "dialog_global_pads_edition_base.h" + +/////////////////////////////////////////////////////////////////////////// + +DIALOG_GLOBAL_PADS_EDITION_BASE::DIALOG_GLOBAL_PADS_EDITION_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style ) +{ + this->SetSizeHints( wxDefaultSize, wxDefaultSize ); + + wxBoxSizer* bMainSizer; + bMainSizer = new wxBoxSizer( wxHORIZONTAL ); + + wxBoxSizer* bLeftSizer; + bLeftSizer = new wxBoxSizer( wxVERTICAL ); + + wxStaticBoxSizer* sbSizer1; + sbSizer1 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Pad Filter :") ), wxVERTICAL ); + + m_Pad_Shape_Filter_CB = new wxCheckBox( this, wxID_ANY, _("Do not modify pads having a different shape"), wxDefaultPosition, wxDefaultSize, 0 ); + sbSizer1->Add( m_Pad_Shape_Filter_CB, 0, wxALL, 5 ); + + m_Pad_Layer_Filter_CB = new wxCheckBox( this, wxID_ANY, _("Do not modify pads having different layers"), wxDefaultPosition, wxDefaultSize, 0 ); + sbSizer1->Add( m_Pad_Layer_Filter_CB, 0, wxALL, 5 ); + + m_Pad_Orient_Filter_CB = new wxCheckBox( this, wxID_ANY, _("Do not modify pads having a different orientation"), wxDefaultPosition, wxDefaultSize, 0 ); + sbSizer1->Add( m_Pad_Orient_Filter_CB, 0, wxALL, 5 ); + + bLeftSizer->Add( sbSizer1, 1, wxEXPAND, 5 ); + + bMainSizer->Add( bLeftSizer, 1, wxEXPAND, 5 ); + + wxBoxSizer* bRightSizer; + bRightSizer = new wxBoxSizer( wxVERTICAL ); + + m_buttonPadEditor = new wxButton( this, ID_CHANGE_GET_PAD_SETTINGS, _("Pad Editor"), wxDefaultPosition, wxDefaultSize, 0 ); + bRightSizer->Add( m_buttonPadEditor, 0, wxALL|wxEXPAND, 5 ); + + + bRightSizer->Add( 10, 10, 0, 0, 5 ); + + m_buttonChangeModule = new wxButton( this, ID_CHANGE_CURRENT_MODULE, _("Change Pads on Module"), wxDefaultPosition, wxDefaultSize, 0 ); + bRightSizer->Add( m_buttonChangeModule, 0, wxALL|wxEXPAND, 5 ); + + m_buttonIdModules = new wxButton( this, ID_CHANGE_ID_MODULES, _("Change Pads on Same Modules"), wxDefaultPosition, wxDefaultSize, 0 ); + bRightSizer->Add( m_buttonIdModules, 0, wxALL|wxEXPAND, 5 ); + + m_buttonCancel = new wxButton( this, wxID_ANY, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 ); + bRightSizer->Add( m_buttonCancel, 0, wxALL|wxEXPAND, 5 ); + + bMainSizer->Add( bRightSizer, 0, wxEXPAND, 5 ); + + this->SetSizer( bMainSizer ); + this->Layout(); + + // Connect Events + m_buttonPadEditor->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_PADS_EDITION_BASE::InstallPadEditor ), NULL, this ); + m_buttonChangeModule->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_PADS_EDITION_BASE::PadPropertiesAccept ), NULL, this ); + m_buttonIdModules->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_PADS_EDITION_BASE::PadPropertiesAccept ), NULL, this ); + m_buttonCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_PADS_EDITION_BASE::OnCancelClick ), NULL, this ); +} + +DIALOG_GLOBAL_PADS_EDITION_BASE::~DIALOG_GLOBAL_PADS_EDITION_BASE() +{ + // Disconnect Events + m_buttonPadEditor->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_PADS_EDITION_BASE::InstallPadEditor ), NULL, this ); + m_buttonChangeModule->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_PADS_EDITION_BASE::PadPropertiesAccept ), NULL, this ); + m_buttonIdModules->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_PADS_EDITION_BASE::PadPropertiesAccept ), NULL, this ); + m_buttonCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_GLOBAL_PADS_EDITION_BASE::OnCancelClick ), NULL, this ); + +} diff --git a/pcbnew/dialogs/dialog_global_pads_edition_base.fbp b/pcbnew/dialogs/dialog_global_pads_edition_base.fbp index 17ae2af460..f2a40819b7 100644 --- a/pcbnew/dialogs/dialog_global_pads_edition_base.fbp +++ b/pcbnew/dialogs/dialog_global_pads_edition_base.fbp @@ -2,76 +2,124 @@ - + C++ 1 + source_name + 0 + res UTF-8 connect dialog_global_pads_edition_base 1000 none - 0 + 1 dialog_global_pads_edition - + . - + 1 + 1 0 0 - - - + 1 + 1 + 1 + 1 + 0 + + + + + 1 + + 0 + 1 + + 1 + 0 + Dock + 0 + Left 1 - - - + impl_virtual + + + 1 + + 0 0 wxID_ANY - - + + + 0 + + + 0 + + 1 DIALOG_GLOBAL_PADS_EDITION_BASE - + 1 + + + 1 + + + Resizable + + 1 482,165 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - + Global Pads Edition - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + bMainSizer wxHORIZONTAL none @@ -80,7 +128,7 @@ wxEXPAND 1 - + bLeftSizer wxVERTICAL none @@ -91,61 +139,97 @@ wxID_ANY Pad Filter : - + sbSizer1 wxVERTICAL none - + 5 wxALL 0 - + 1 + 1 + 1 + 1 + + + + + 1 + 0 0 - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Do not modify pads having a different shape - - + + + 0 + + + 0 + + 1 m_Pad_Shape_Filter_CB + 1 + + protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + + + Resizable + + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -153,51 +237,87 @@ wxALL 0 - + 1 + 1 + 1 + 1 + + + + + 1 + 0 0 - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Do not modify pads having different layers - - + + + 0 + + + 0 + + 1 m_Pad_Layer_Filter_CB + 1 + + protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + + + Resizable + + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -205,51 +325,87 @@ wxALL 0 - + 1 + 1 + 1 + 1 + + + + + 1 + 0 0 - + 1 + + 1 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 wxID_ANY Do not modify pads having a different orientation - - + + + 0 + + + 0 + + 1 m_Pad_Orient_Filter_CB + 1 + + protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + 1 + + + Resizable + + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -261,7 +417,7 @@ wxEXPAND 0 - + bRightSizer wxVERTICAL none @@ -270,56 +426,92 @@ wxALL|wxEXPAND 0 - - + 1 + 1 + 1 + 1 + + + + + 1 + 0 + 1 + + 1 0 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_CHANGE_GET_PAD_SETTINGS Pad Editor - - + + + 0 + + + 0 + + 1 m_buttonPadEditor + 1 + + protected - - - - - - - - + 1 + + + Resizable + + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + InstallPadEditor - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + 5 - + 0 10 @@ -332,51 +524,87 @@ wxALL|wxEXPAND 0 - - + 1 + 1 + 1 + 1 + + + + + 1 + 0 + 1 + + 1 0 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_CHANGE_CURRENT_MODULE Change Pads on Module - - - m_button2 + + + 0 + + + 0 + + 1 + m_buttonChangeModule + 1 + + protected - - - - - - - - + 1 + + + Resizable + + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + PadPropertiesAccept - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -384,51 +612,87 @@ wxALL|wxEXPAND 0 - - + 1 + 1 + 1 + 1 + + + + + 1 + 0 + 1 + + 1 0 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 ID_CHANGE_ID_MODULES Change Pads on Same Modules - - - m_button3 - protected - - - - - - - - + + + 0 + + + 0 + + 1 + m_buttonIdModules + 1 + + + public + 1 + + + Resizable + + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + PadPropertiesAccept - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -436,51 +700,87 @@ wxALL|wxEXPAND 0 - - + 1 + 1 + 1 + 1 + + + + + 1 + 0 + 1 + + 1 0 + 0 + Dock + 0 + Left 1 - - + + 1 + + 0 0 - wxID_CANCEL + wxID_ANY Cancel - - - m_button4 + + + 0 + + + 0 + + 1 + m_buttonCancel + 1 + + protected - - - - - - - - + 1 + + + Resizable + + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + OnCancelClick - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pcbnew/dialogs/dialog_global_pads_edition_base.h b/pcbnew/dialogs/dialog_global_pads_edition_base.h index 4bdf636b96..30f144ce85 100644 --- a/pcbnew/dialogs/dialog_global_pads_edition_base.h +++ b/pcbnew/dialogs/dialog_global_pads_edition_base.h @@ -1,57 +1,60 @@ -/////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 16 2008) -// http://www.wxformbuilder.org/ -// -// PLEASE DO "NOT" EDIT THIS FILE! -/////////////////////////////////////////////////////////////////////////// - -#ifndef __dialog_global_pads_edition_base__ -#define __dialog_global_pads_edition_base__ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/////////////////////////////////////////////////////////////////////////// - -#define ID_CHANGE_GET_PAD_SETTINGS 1000 -#define ID_CHANGE_CURRENT_MODULE 1001 -#define ID_CHANGE_ID_MODULES 1002 - -/////////////////////////////////////////////////////////////////////////////// -/// Class DIALOG_GLOBAL_PADS_EDITION_BASE -/////////////////////////////////////////////////////////////////////////////// -class DIALOG_GLOBAL_PADS_EDITION_BASE : public wxDialog -{ - private: - - protected: - wxCheckBox* m_Pad_Shape_Filter_CB; - wxCheckBox* m_Pad_Layer_Filter_CB; - wxCheckBox* m_Pad_Orient_Filter_CB; - wxButton* m_buttonPadEditor; - - wxButton* m_button2; - wxButton* m_button3; - wxButton* m_button4; - - // Virtual event handlers, overide them in your derived class - virtual void InstallPadEditor( wxCommandEvent& event ){ event.Skip(); } - virtual void PadPropertiesAccept( wxCommandEvent& event ){ event.Skip(); } - virtual void OnCancelClick( wxCommandEvent& event ){ event.Skip(); } - - - public: - DIALOG_GLOBAL_PADS_EDITION_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _( "Global Pads Edition" ), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 482,165 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); - ~DIALOG_GLOBAL_PADS_EDITION_BASE(); - -}; - -#endif //__dialog_global_pads_edition_base__ +/////////////////////////////////////////////////////////////////////////// +// C++ code generated with wxFormBuilder (version Jun 30 2011) +// http://www.wxformbuilder.org/ +// +// PLEASE DO "NOT" EDIT THIS FILE! +/////////////////////////////////////////////////////////////////////////// + +#ifndef __DIALOG_GLOBAL_PADS_EDITION_BASE_H__ +#define __DIALOG_GLOBAL_PADS_EDITION_BASE_H__ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/////////////////////////////////////////////////////////////////////////// + +#define ID_CHANGE_GET_PAD_SETTINGS 1000 +#define ID_CHANGE_CURRENT_MODULE 1001 +#define ID_CHANGE_ID_MODULES 1002 + +/////////////////////////////////////////////////////////////////////////////// +/// Class DIALOG_GLOBAL_PADS_EDITION_BASE +/////////////////////////////////////////////////////////////////////////////// +class DIALOG_GLOBAL_PADS_EDITION_BASE : public wxDialog +{ + private: + + protected: + wxCheckBox* m_Pad_Shape_Filter_CB; + wxCheckBox* m_Pad_Layer_Filter_CB; + wxCheckBox* m_Pad_Orient_Filter_CB; + wxButton* m_buttonPadEditor; + wxButton* m_buttonChangeModule; + wxButton* m_buttonCancel; + + // Virtual event handlers, overide them in your derived class + virtual void InstallPadEditor( wxCommandEvent& event ) { event.Skip(); } + virtual void PadPropertiesAccept( wxCommandEvent& event ) { event.Skip(); } + virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); } + + + public: + wxButton* m_buttonIdModules; + + DIALOG_GLOBAL_PADS_EDITION_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Global Pads Edition"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 482,165 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + ~DIALOG_GLOBAL_PADS_EDITION_BASE(); + +}; + +#endif //__DIALOG_GLOBAL_PADS_EDITION_BASE_H__ diff --git a/pcbnew/edit.cpp b/pcbnew/edit.cpp index 86587d380a..93c1af13b6 100644 --- a/pcbnew/edit.cpp +++ b/pcbnew/edit.cpp @@ -813,7 +813,7 @@ void PCB_EDIT_FRAME::Process_Special_Functions( wxCommandEvent& event ) case ID_POPUP_PCB_GLOBAL_IMPORT_PAD_SETTINGS: m_canvas->MoveCursorToCrossHair(); - Global_Import_Pad_Settings( (D_PAD*) GetCurItem(), true ); + DlgGlobalChange_PadSettings( (D_PAD*) GetCurItem(), true ); break; case ID_POPUP_PCB_EXPORT_PAD_SETTINGS: diff --git a/pcbnew/globaleditpad.cpp b/pcbnew/globaleditpad.cpp index 6eec000c31..7e784ed272 100644 --- a/pcbnew/globaleditpad.cpp +++ b/pcbnew/globaleditpad.cpp @@ -6,8 +6,9 @@ #include "common.h" #include "class_drawpanel.h" #include "confirm.h" -#include "wxBasePcbFrame.h" +#include "wxPcbStruct.h" #include "pcbcommon.h" +#include "module_editor_frame.h" #include "class_board.h" #include "class_module.h" @@ -105,24 +106,22 @@ void DIALOG_GLOBAL_PADS_EDITION::PadPropertiesAccept( wxCommandEvent& event ) } -/** - * Function Global_Import_Pad_Settings +/* + * PCB_EDIT_FRAME::Function DlgGlobalChange_PadSettings * Function to change pad caracteristics for the given footprint * or alls footprints which look like the given footprint - * @param aPad pad to use as pattern. The given footprint is the parent of - * this pad - * @param aDraw: if true: redraws the footprint + * Options are set by the opened dialog. + * aPad is the pattern. The given footprint is the parent of this pad + * aRedraw: if true: redraws the footprint */ -void PCB_BASE_FRAME::Global_Import_Pad_Settings( D_PAD* aPad, bool aDraw ) +void PCB_EDIT_FRAME::DlgGlobalChange_PadSettings( D_PAD* aPad, bool aRedraw ) { - MODULE* Module_Ref, * Module; int diag; - bool edit_Same_Modules = false; if( aPad == NULL ) aPad = &g_Pad_Master; - Module = (MODULE*) aPad->GetParent(); + MODULE* Module = (MODULE*) aPad->GetParent(); if( Module == NULL ) { @@ -140,88 +139,172 @@ void PCB_BASE_FRAME::Global_Import_Pad_Settings( D_PAD* aPad, bool aDraw ) if( diag == -1 ) return; + bool edit_Same_Modules = false; if( diag == 1 ) edit_Same_Modules = true; + GlobalChange_PadSettings( aPad,edit_Same_Modules, + DIALOG_GLOBAL_PADS_EDITION::m_Pad_Shape_Filter, + DIALOG_GLOBAL_PADS_EDITION::m_Pad_Orient_Filter, + DIALOG_GLOBAL_PADS_EDITION::m_Pad_Layer_Filter, + aRedraw, true ); +} + +/* + * FOOTPRINT_EDIT_FRAME::Function DlgGlobalChange_PadSettings + * Function to change pad caracteristics for the given footprint + * or alls footprints which look like the given footprint + * Options are set by the opened dialog. + * aPad is the pattern. The given footprint is the parent of this pad + */ +void FOOTPRINT_EDIT_FRAME::DlgGlobalChange_PadSettings( D_PAD* aPad ) +{ + int diag; + + if( aPad == NULL ) + aPad = &g_Pad_Master; + + MODULE* Module = (MODULE*) aPad->GetParent(); + + if( Module == NULL ) + { + DisplayError( this, wxT( "Global_Import_Pad_Settings() Error: NULL module" ) ); + return; + } + + Module->DisplayInfo( this ); + + DIALOG_GLOBAL_PADS_EDITION* dlg = new DIALOG_GLOBAL_PADS_EDITION( this, aPad ); + dlg->m_buttonIdModules->Enable( false ); + + diag = dlg->ShowModal(); + dlg->Destroy(); + + if( diag == -1 ) + return; + + bool edit_Same_Modules = false; + if( diag == 1 ) + edit_Same_Modules = true; + + GlobalChange_PadSettings( aPad,edit_Same_Modules, + DIALOG_GLOBAL_PADS_EDITION::m_Pad_Shape_Filter, + DIALOG_GLOBAL_PADS_EDITION::m_Pad_Orient_Filter, + DIALOG_GLOBAL_PADS_EDITION::m_Pad_Layer_Filter, + true, false ); +} + +/* + * Function GlobalChange_PadSettings + * Function to change pad caracteristics for the given footprint + * or alls footprints which look like the given footprint + * aPad is the pattern. The given footprint is the parent of this pad + * aSameFootprints: if true, make changes on all identical footprints + * aPadShapeFilter: if true, make changes only on pads having the same shape as aPad + * aPadOrientFilter: if true, make changes only on pads having the same orientation as aPad + * aPadLayerFilter: if true, make changes only on pads having the same layers as aPad + * aRedraw: if true: redraws the footprint + * aSaveForUndo: if true: create an entry in the Undo/Redo list + * (usually: true in Schematic editor, false in Module editor) + */ +void PCB_BASE_FRAME::GlobalChange_PadSettings( D_PAD* aPad, + bool aSameFootprints, + bool aPadShapeFilter, + bool aPadOrientFilter, + bool aPadLayerFilter, + bool aRedraw, bool aSaveForUndo ) +{ + if( aPad == NULL ) + aPad = &g_Pad_Master; + + MODULE* Module = (MODULE*) aPad->GetParent(); + + if( Module == NULL ) + { + DisplayError( this, wxT( "Global_Import_Pad_Settings() Error: NULL module" ) ); + return; + } + /* Search and copy the name of library reference. */ - Module_Ref = Module; + MODULE* Module_Ref = Module; int pad_orient = aPad->m_Orient - Module_Ref->m_Orient; // Prepare an undo list: - PICKED_ITEMS_LIST itemsList; - Module = (MODULE*) m_Pcb->m_Modules; - for( ; Module != NULL; Module = Module->Next() ) + if( aSaveForUndo ) { - if( !edit_Same_Modules && (Module != Module_Ref) ) - continue; - - if( Module->m_LibRef != Module_Ref->m_LibRef ) - continue; - - bool saveMe = false; - D_PAD* pt_pad = (D_PAD*) Module->m_Pads; - - for( ; pt_pad != NULL; pt_pad = pt_pad->Next() ) + PICKED_ITEMS_LIST itemsList; + Module = (MODULE*) m_Pcb->m_Modules; + for( ; Module != NULL; Module = Module->Next() ) { - /* Filters changes prohibited. */ - if( DIALOG_GLOBAL_PADS_EDITION::m_Pad_Shape_Filter - && ( pt_pad->m_PadShape != aPad->m_PadShape ) ) + if( !aSameFootprints && (Module != Module_Ref) ) continue; - if( DIALOG_GLOBAL_PADS_EDITION::m_Pad_Orient_Filter - && ( (pt_pad->m_Orient - Module->m_Orient) != pad_orient ) ) + if( Module->m_LibRef != Module_Ref->m_LibRef ) continue; - if( DIALOG_GLOBAL_PADS_EDITION::m_Pad_Layer_Filter - && ( pt_pad->m_layerMask != aPad->m_layerMask ) ) - continue; + bool saveMe = false; + D_PAD* pt_pad = (D_PAD*) Module->m_Pads; - saveMe = true; + for( ; pt_pad != NULL; pt_pad = pt_pad->Next() ) + { + /* Filters changes prohibited. */ + if( aPadShapeFilter && ( pt_pad->m_PadShape != aPad->m_PadShape ) ) + continue; + + int currpad_orient = pt_pad->m_Orient - Module->m_Orient; + if( aPadOrientFilter && ( currpad_orient != pad_orient ) ) + continue; + + if( aPadLayerFilter + && ( pt_pad->m_layerMask != aPad->m_layerMask ) ) + continue; + + saveMe = true; + } + + if( saveMe ) + { + ITEM_PICKER itemWrapper( Module, UR_CHANGED ); + itemWrapper.m_PickedItemType = Module->Type(); + itemsList.PushItem( itemWrapper ); + } } - if( saveMe ) - { - ITEM_PICKER itemWrapper( Module, UR_CHANGED ); - itemWrapper.m_PickedItemType = Module->Type(); - itemsList.PushItem( itemWrapper ); - } + SaveCopyInUndoList( itemsList, UR_CHANGED ); } - SaveCopyInUndoList( itemsList, UR_CHANGED ); - /* Update the current module and same others modules if requested. */ - Module = (MODULE*) m_Pcb->m_Modules; + Module = m_Pcb->m_Modules; for( ; Module != NULL; Module = Module->Next() ) { - if( !edit_Same_Modules && (Module != Module_Ref) ) + if( !aSameFootprints && (Module != Module_Ref) ) continue; if( Module->m_LibRef != Module_Ref->m_LibRef ) continue; /* Erase module on screen */ - if( aDraw ) + if( aRedraw ) { Module->SetFlags( DO_NOT_DRAW ); m_canvas->RefreshDrawingRect( Module->GetBoundingBox() ); Module->ClearFlags( DO_NOT_DRAW ); } - D_PAD* pt_pad = (D_PAD*) Module->m_Pads; + D_PAD* pt_pad = Module->m_Pads; for( ; pt_pad != NULL; pt_pad = pt_pad->Next() ) { - /* Filters changes prohibited. */ - if( DIALOG_GLOBAL_PADS_EDITION::m_Pad_Shape_Filter - && ( pt_pad->m_PadShape != aPad->m_PadShape ) ) + // Filters changes prohibited. + if( aPadShapeFilter && ( pt_pad->m_PadShape != aPad->m_PadShape ) ) continue; - if( DIALOG_GLOBAL_PADS_EDITION::m_Pad_Orient_Filter + if( aPadOrientFilter && ( (pt_pad->m_Orient - Module->m_Orient) != pad_orient ) ) continue; - if( DIALOG_GLOBAL_PADS_EDITION::m_Pad_Layer_Filter ) + if( aPadLayerFilter ) { if( pt_pad->m_layerMask != aPad->m_layerMask ) continue; @@ -229,7 +312,7 @@ void PCB_BASE_FRAME::Global_Import_Pad_Settings( D_PAD* aPad, bool aDraw ) m_Pcb->m_Status_Pcb &= ~( LISTE_RATSNEST_ITEM_OK | CONNEXION_OK); } - /* Change characteristics.: */ + // Change characteristics: pt_pad->m_Attribut = aPad->m_Attribut; pt_pad->m_PadShape = aPad->m_PadShape; @@ -278,7 +361,7 @@ void PCB_BASE_FRAME::Global_Import_Pad_Settings( D_PAD* aPad, bool aDraw ) Module->CalculateBoundingBox(); - if( aDraw ) + if( aRedraw ) m_canvas->RefreshDrawingRect( Module->GetBoundingBox() ); } diff --git a/pcbnew/modedit.cpp b/pcbnew/modedit.cpp index 0fc5420fc7..b1cdd0d782 100644 --- a/pcbnew/modedit.cpp +++ b/pcbnew/modedit.cpp @@ -512,7 +512,8 @@ void FOOTPRINT_EDIT_FRAME::Process_Special_Functions( wxCommandEvent& event ) case ID_POPUP_PCB_GLOBAL_IMPORT_PAD_SETTINGS: SaveCopyInUndoList( GetBoard()->m_Modules, UR_MODEDIT ); - Global_Import_Pad_Settings( (D_PAD*) GetScreen()->GetCurItem(), true ); + // Calls the global change dialog: + DlgGlobalChange_PadSettings( (D_PAD*) GetScreen()->GetCurItem() ); m_canvas->MoveCursorToCrossHair(); break; diff --git a/pcbnew/module_editor_frame.h b/pcbnew/module_editor_frame.h index a34d5170e7..40ecf52b92 100644 --- a/pcbnew/module_editor_frame.h +++ b/pcbnew/module_editor_frame.h @@ -334,6 +334,15 @@ public: /* Function to place a graphic item type EDGE_MODULE currently moved */ void Place_EdgeMod( EDGE_MODULE* drawitem ); + /** + * Function DlgGlobalChange_PadSettings + * Function to change pad caracteristics for the given footprint + * or all footprints which look like the given footprint + * Options are set by the opened dialog. + * @param aPad is the pattern. The given footprint is the parent of this pad + */ + void DlgGlobalChange_PadSettings( D_PAD* aPad ); + // handlers for libraries: void Delete_Module_In_Library( const wxString& libname );