From 3759799d1e03b2da6a0dcd72273e4978880fc8f1 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Sat, 25 Apr 2020 15:20:54 +0200 Subject: [PATCH] Pcbnew, PANEL_SETUP_FEATURE_CONSTRAINTS: cosmetic enhancements: add a few icons. Fixes #4263 https://gitlab.com/kicad/code/kicad/issues/4263 --- bitmaps_png/CMakeLists.txt | 4 + .../cpp_26/edge_to_copper_clearance.cpp | 59 + bitmaps_png/cpp_26/hole_to_hole_clearance.cpp | 70 ++ bitmaps_png/cpp_26/via_diameter.cpp | 64 + bitmaps_png/cpp_26/via_hole_diameter.cpp | 67 + .../include/bitmaps_png/bitmaps_list.h | 4 + .../sources/edge_to_copper_clearance.svg | 169 +++ .../sources/hole_to_hole_clearance.svg | 154 +++ bitmaps_png/sources/via_diameter.svg | 137 +++ bitmaps_png/sources/via_hole_diameter.svg | 136 +++ .../panel_setup_feature_constraints.cpp | 14 + .../panel_setup_feature_constraints_base.cpp | 94 +- .../panel_setup_feature_constraints_base.fbp | 1085 +++++++++++++---- .../panel_setup_feature_constraints_base.h | 22 +- 14 files changed, 1839 insertions(+), 240 deletions(-) create mode 100644 bitmaps_png/cpp_26/edge_to_copper_clearance.cpp create mode 100644 bitmaps_png/cpp_26/hole_to_hole_clearance.cpp create mode 100644 bitmaps_png/cpp_26/via_diameter.cpp create mode 100644 bitmaps_png/cpp_26/via_hole_diameter.cpp create mode 100644 bitmaps_png/sources/edge_to_copper_clearance.svg create mode 100644 bitmaps_png/sources/hole_to_hole_clearance.svg create mode 100644 bitmaps_png/sources/via_diameter.svg create mode 100644 bitmaps_png/sources/via_hole_diameter.svg diff --git a/bitmaps_png/CMakeLists.txt b/bitmaps_png/CMakeLists.txt index 2106006d86..64f4d86279 100644 --- a/bitmaps_png/CMakeLists.txt +++ b/bitmaps_png/CMakeLists.txt @@ -211,6 +211,7 @@ set( BMAPS_MID edit_cmp_symb_links edit_text edit + edge_to_copper_clearance eeschema enter_sheet ercerr @@ -259,6 +260,7 @@ set( BMAPS_MID hierarchy_nav highlight_remove hotkeys + hole_to_hole_clearance html icon icon_cvpcb_small @@ -503,6 +505,8 @@ set( BMAPS_MID via_buried via_microvia via_sketch + via_diameter + via_hole_diameter warning width_track_via width_track diff --git a/bitmaps_png/cpp_26/edge_to_copper_clearance.cpp b/bitmaps_png/cpp_26/edge_to_copper_clearance.cpp new file mode 100644 index 0000000000..44fc76a1e6 --- /dev/null +++ b/bitmaps_png/cpp_26/edge_to_copper_clearance.cpp @@ -0,0 +1,59 @@ + +/* Do not modify this file, it was automatically generated by the + * PNG2cpp CMake script, using a *.png file as input. + */ + +#include + +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, 0x99, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xed, 0x96, 0x3b, 0x68, 0x53, + 0x51, 0x1c, 0xc6, 0xbf, 0xf8, 0x88, 0x6f, 0xa5, 0x93, 0x48, 0xc1, 0xa1, 0x56, 0x28, 0x96, 0x24, + 0xcd, 0x3d, 0xb7, 0x48, 0xc8, 0xe0, 0xd8, 0x49, 0xe8, 0x28, 0x05, 0x51, 0x41, 0x5a, 0x48, 0x7d, + 0x0d, 0x82, 0x8b, 0xd5, 0x4c, 0xb6, 0x18, 0xd2, 0xa6, 0x26, 0x37, 0xd5, 0x41, 0x1c, 0xaa, 0x82, + 0xd5, 0x46, 0x04, 0x8b, 0xa2, 0xa2, 0x4e, 0x11, 0xaa, 0x16, 0x2b, 0x28, 0x3e, 0x86, 0xda, 0xc6, + 0x47, 0xb0, 0xd2, 0xe6, 0x26, 0x31, 0xe8, 0x50, 0xaf, 0xdf, 0x69, 0x63, 0x1b, 0xdb, 0x46, 0x93, + 0xf4, 0xaa, 0x8b, 0x07, 0x3e, 0xce, 0xe3, 0x9e, 0x7c, 0x3f, 0xce, 0xe3, 0xff, 0xcf, 0x81, 0xd6, + 0x85, 0x7d, 0xa1, 0x30, 0x1e, 0xfd, 0x61, 0xb5, 0x21, 0x18, 0x46, 0x2f, 0x1b, 0x09, 0x2d, 0x8c, + 0x9e, 0xf9, 0x14, 0x0e, 0xe0, 0xda, 0xe9, 0xa3, 0x78, 0xac, 0x05, 0xd1, 0x9b, 0x6f, 0xce, 0xaf, + 0x44, 0xef, 0xb7, 0xd4, 0x93, 0x1f, 0xa0, 0x41, 0xe4, 0x29, 0x17, 0x00, 0xff, 0x79, 0xc0, 0xe8, + 0x06, 0xf6, 0xa0, 0x84, 0x12, 0xd2, 0x10, 0x29, 0x08, 0x44, 0x88, 0x26, 0x41, 0x94, 0xe7, 0x3f, + 0xc8, 0x14, 0x90, 0xd3, 0x99, 0x50, 0x15, 0x25, 0x75, 0x5c, 0x88, 0xb1, 0x75, 0xb2, 0xaf, 0x28, + 0x7a, 0x9d, 0x10, 0xc9, 0x7a, 0x21, 0xde, 0xaf, 0x5c, 0x30, 0xa8, 0xa6, 0x46, 0xdf, 0x3c, 0x65, + 0x9e, 0x7c, 0x49, 0xbd, 0x56, 0x55, 0xdd, 0x5b, 0x59, 0x69, 0x2c, 0x93, 0xf3, 0x84, 0xd0, 0xb7, + 0x2a, 0x4a, 0xf2, 0xac, 0x10, 0xa9, 0x98, 0xaa, 0x26, 0x6f, 0xb0, 0x7f, 0xd0, 0xe5, 0xca, 0x94, + 0x17, 0x0d, 0xaa, 0xab, 0x8a, 0xf6, 0xd3, 0xdc, 0xa0, 0xd9, 0x57, 0xd6, 0xef, 0xa8, 0x18, 0x35, + 0x96, 0xd5, 0x17, 0xf9, 0x2d, 0x2b, 0x9d, 0xa0, 0x0c, 0x81, 0xdf, 0xa8, 0x4c, 0xa0, 0x73, 0x79, + 0x5f, 0x51, 0xa0, 0xd6, 0xb5, 0xdb, 0x5a, 0x68, 0x70, 0x92, 0xab, 0x18, 0x20, 0x6c, 0x9c, 0x26, + 0x11, 0xa7, 0x53, 0xdf, 0x69, 0xb3, 0x25, 0xca, 0xe4, 0xaa, 0xb8, 0x85, 0x1b, 0x39, 0xd6, 0x42, + 0xd0, 0x73, 0x6e, 0xe3, 0x6d, 0xd6, 0xbb, 0xdc, 0xee, 0xd1, 0x35, 0xbf, 0x5d, 0x51, 0x0f, 0x60, + 0x25, 0xa0, 0x99, 0x8a, 0xcf, 0x3e, 0x23, 0x21, 0x3e, 0x6f, 0x50, 0xd5, 0x54, 0x13, 0xb7, 0xe7, + 0x92, 0xcb, 0x65, 0xac, 0x98, 0x1a, 0x4b, 0x1d, 0xa3, 0xf9, 0x61, 0x87, 0x23, 0x53, 0x5e, 0xd0, + 0x19, 0x11, 0xb0, 0x98, 0x41, 0xba, 0x9b, 0xc6, 0x43, 0x59, 0x80, 0x54, 0x3f, 0x65, 0x33, 0xe5, + 0xd6, 0x19, 0x80, 0xe5, 0x22, 0xb0, 0x9d, 0x19, 0x60, 0x30, 0x07, 0xf0, 0xac, 0xaa, 0x19, 0x57, + 0xe0, 0xc7, 0x03, 0x68, 0x58, 0x6d, 0x0a, 0x88, 0xa6, 0xd1, 0x1c, 0xc0, 0x2b, 0xaa, 0xc1, 0x0b, + 0x2c, 0x42, 0x3b, 0x57, 0xeb, 0x87, 0x01, 0x1f, 0xec, 0x0b, 0x07, 0x69, 0x78, 0x4a, 0xe3, 0x11, + 0xea, 0x0d, 0x57, 0xb4, 0xf7, 0x1e, 0xb0, 0x64, 0x7a, 0xa6, 0xa9, 0x20, 0xae, 0x48, 0x1e, 0xbe, + 0x3c, 0x9f, 0x39, 0x33, 0xcd, 0x06, 0xe5, 0x9d, 0xf9, 0xaf, 0x40, 0x76, 0x7b, 0x7c, 0x15, 0xaf, + 0x75, 0x03, 0xaf, 0xf2, 0x75, 0x2a, 0x2e, 0x84, 0xb1, 0x34, 0x9b, 0x19, 0xba, 0xd8, 0xbf, 0xcb, + 0x18, 0x3a, 0x54, 0x5b, 0x9b, 0xa8, 0x28, 0x19, 0xb4, 0xa9, 0xbe, 0xbb, 0x91, 0xc1, 0x7a, 0x87, + 0x66, 0x69, 0xc6, 0xcc, 0x00, 0x8d, 0x35, 0x06, 0xec, 0x7e, 0xa6, 0xa4, 0x46, 0xb6, 0x0f, 0x70, + 0xfc, 0x08, 0xc7, 0x3b, 0xd9, 0xbf, 0xcf, 0xfa, 0x03, 0xfb, 0x1f, 0x39, 0x7e, 0x2a, 0xa8, 0x59, + 0xae, 0x16, 0x05, 0x72, 0xb8, 0x87, 0x6e, 0xf1, 0xc7, 0x13, 0xcc, 0x0e, 0x9f, 0x08, 0x7c, 0xc8, + 0xec, 0x10, 0x61, 0xfb, 0x8c, 0x94, 0x04, 0xf0, 0x5b, 0x1b, 0x8d, 0xfd, 0xac, 0x2f, 0x53, 0x2f, + 0xa8, 0x51, 0x21, 0x12, 0xbe, 0xa2, 0x41, 0x72, 0xeb, 0x64, 0xa6, 0x66, 0x46, 0xd8, 0x21, 0x33, + 0x02, 0x8d, 0x64, 0x1a, 0xba, 0x39, 0x93, 0x2d, 0x92, 0x3e, 0xf6, 0x87, 0xe5, 0x16, 0x12, 0xee, + 0x66, 0x94, 0x58, 0x0a, 0xdf, 0x3a, 0x2f, 0xac, 0x84, 0x0c, 0xcf, 0x77, 0x19, 0x64, 0x7e, 0x73, + 0x3a, 0xd3, 0x8e, 0x99, 0xbf, 0x8d, 0xd4, 0x96, 0xea, 0x6a, 0xc3, 0x5a, 0xd8, 0x65, 0x08, 0x60, + 0x3d, 0x3a, 0x50, 0x31, 0x2d, 0x3f, 0xce, 0x4d, 0x42, 0xda, 0x11, 0x43, 0x2b, 0xca, 0xcc, 0xb9, + 0x75, 0x1d, 0x70, 0xd1, 0x74, 0x62, 0xd2, 0xf8, 0x67, 0xa5, 0xf9, 0x4d, 0x41, 0x89, 0x65, 0x36, + 0x28, 0xe1, 0xd3, 0xd0, 0xe7, 0x09, 0x62, 0xbc, 0x29, 0x88, 0x74, 0xae, 0xbc, 0x21, 0x44, 0x4b, + 0x79, 0x66, 0xcd, 0x79, 0x6e, 0x69, 0x1a, 0x3c, 0x7f, 0xe1, 0x01, 0x79, 0xe2, 0x3b, 0x8c, 0x68, + 0xa8, 0x83, 0x4d, 0x09, 0x41, 0x74, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, + 0x60, 0x82, +}; + +const BITMAP_OPAQUE edge_to_copper_clearance_xpm[1] = {{ png, sizeof( png ), "edge_to_copper_clearance_xpm" }}; + +//EOF diff --git a/bitmaps_png/cpp_26/hole_to_hole_clearance.cpp b/bitmaps_png/cpp_26/hole_to_hole_clearance.cpp new file mode 100644 index 0000000000..9973a4540b --- /dev/null +++ b/bitmaps_png/cpp_26/hole_to_hole_clearance.cpp @@ -0,0 +1,70 @@ + +/* Do not modify this file, it was automatically generated by the + * PNG2cpp CMake script, using a *.png file as input. + */ + +#include + +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, 0x54, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xad, 0x96, 0x5d, 0x48, 0x54, + 0x41, 0x18, 0x86, 0xe7, 0xac, 0xb5, 0x6a, 0x21, 0x75, 0x11, 0x65, 0x24, 0xa9, 0xb5, 0x69, 0xe6, + 0x56, 0xba, 0xb3, 0x6a, 0x92, 0x17, 0x6b, 0x64, 0x59, 0x68, 0x11, 0x69, 0x21, 0x46, 0x45, 0xd4, + 0x85, 0x52, 0x46, 0x78, 0x21, 0x69, 0x8a, 0x14, 0x84, 0x94, 0x3f, 0xbb, 0x26, 0xe5, 0xef, 0xae, + 0x7f, 0xbb, 0x9a, 0x44, 0x91, 0x5d, 0x08, 0x76, 0x53, 0xa6, 0x58, 0xf8, 0x13, 0x52, 0x11, 0x94, + 0x62, 0x04, 0x61, 0x98, 0x05, 0x25, 0x81, 0xa5, 0xf5, 0xf5, 0x1e, 0xdd, 0x5d, 0xcf, 0x31, 0x17, + 0xf5, 0xe8, 0xc0, 0xcb, 0x78, 0xc6, 0x33, 0xef, 0x33, 0xdf, 0x99, 0xef, 0x9b, 0x1d, 0xc6, 0x16, + 0xd9, 0x9a, 0x18, 0x73, 0xab, 0x60, 0x2c, 0xa1, 0x92, 0x31, 0x0b, 0xfa, 0x56, 0xf4, 0x0f, 0xd1, + 0x67, 0xa1, 0xf7, 0x55, 0x64, 0xa8, 0xd3, 0x51, 0x50, 0x62, 0x22, 0xb9, 0x49, 0xc7, 0xcc, 0x8c, + 0x6d, 0x83, 0xe9, 0x6b, 0x88, 0x66, 0xd1, 0x18, 0x94, 0x49, 0x8c, 0x09, 0x0b, 0x02, 0x71, 0x4e, + 0x56, 0xc0, 0x1a, 0x0c, 0x06, 0x5a, 0x26, 0x3e, 0x63, 0xc5, 0x1a, 0x18, 0x8d, 0xb8, 0x80, 0x38, + 0x85, 0xf7, 0xf2, 0x16, 0x04, 0x0a, 0x0e, 0x26, 0x75, 0x68, 0xe8, 0xf7, 0x16, 0xce, 0xfb, 0xba, + 0x35, 0x1a, 0x72, 0x87, 0xc9, 0x53, 0xa7, 0x99, 0x27, 0xa3, 0x9a, 0x04, 0x81, 0xac, 0x59, 0x02, + 0xd5, 0xa5, 0x09, 0x64, 0x0e, 0x94, 0xc1, 0xfe, 0x42, 0xbb, 0xe6, 0x09, 0xc9, 0x55, 0x73, 0x6e, + 0x4c, 0x87, 0x7e, 0x71, 0x5e, 0xfd, 0x6d, 0xf7, 0xce, 0x2f, 0xed, 0xa5, 0x2a, 0x8f, 0x29, 0xc8, + 0x72, 0x46, 0xd6, 0xeb, 0x2a, 0x6a, 0x6c, 0x94, 0xc8, 0xa6, 0x22, 0x0b, 0x17, 0xa4, 0xb0, 0xbb, + 0x73, 0x20, 0x72, 0x55, 0x7a, 0xbd, 0xf1, 0xa4, 0x4e, 0x67, 0x7c, 0x07, 0xc8, 0x20, 0x34, 0x16, + 0x15, 0x55, 0x1e, 0x70, 0x20, 0xa8, 0xab, 0xe7, 0xc8, 0x96, 0x16, 0x2a, 0x55, 0x79, 0x52, 0xb5, + 0x41, 0x90, 0x43, 0xec, 0xb2, 0x15, 0xa8, 0xa4, 0xa0, 0xe1, 0x39, 0xf6, 0xc5, 0x58, 0x09, 0x48, + 0x9d, 0x4e, 0x57, 0xd4, 0x0c, 0x75, 0x71, 0x6e, 0xb2, 0x8a, 0xe3, 0xe5, 0x2a, 0xf5, 0xcd, 0x24, + 0xbf, 0x1a, 0x8a, 0x0b, 0x78, 0x42, 0x95, 0x49, 0x5e, 0xb3, 0x82, 0x1a, 0x1b, 0x00, 0x12, 0xa6, + 0x3f, 0x9f, 0xcb, 0x48, 0x00, 0xb8, 0xc7, 0x79, 0xd9, 0x0a, 0x98, 0x57, 0xe8, 0x74, 0xa6, 0xc7, + 0x80, 0xf6, 0x70, 0x5e, 0xb8, 0x7d, 0x12, 0xc4, 0x58, 0x46, 0xb9, 0xe0, 0x46, 0xc9, 0x7e, 0x66, + 0x8a, 0x8f, 0x68, 0xa3, 0xda, 0xda, 0x55, 0xff, 0x47, 0x64, 0x94, 0x45, 0x34, 0xe2, 0x22, 0x95, + 0x4d, 0xc7, 0x60, 0xdc, 0x09, 0x48, 0x01, 0x80, 0x1d, 0x21, 0x21, 0xa6, 0xc3, 0x78, 0x7e, 0xe4, + 0xf8, 0x7f, 0x15, 0x63, 0x91, 0xa2, 0x41, 0x39, 0x13, 0xe8, 0x94, 0x7f, 0x09, 0xc5, 0xc7, 0xb6, + 0x03, 0xb6, 0x5a, 0x16, 0x8d, 0x25, 0x52, 0xb6, 0x47, 0xf7, 0x67, 0xc1, 0x90, 0x00, 0xd3, 0x5e, + 0xa8, 0x09, 0x7a, 0x09, 0x50, 0x1c, 0xe7, 0x05, 0xd1, 0xe1, 0xe1, 0x05, 0x01, 0xce, 0x37, 0x50, + 0x1b, 0x98, 0xfc, 0xc2, 0x09, 0xdb, 0x5c, 0x42, 0x47, 0x0d, 0x2d, 0x64, 0x43, 0x52, 0x58, 0x2f, + 0x0b, 0x64, 0x09, 0x11, 0x66, 0xa6, 0xb9, 0x61, 0x72, 0x62, 0x58, 0x18, 0x6d, 0xd2, 0xeb, 0x29, + 0x46, 0xfc, 0x5b, 0xaf, 0x37, 0x1d, 0x04, 0x60, 0x08, 0xd1, 0xf4, 0xa3, 0x7f, 0x06, 0xbd, 0xc5, + 0x98, 0x76, 0xe6, 0x72, 0x50, 0x1f, 0x5a, 0x18, 0xfc, 0x70, 0xc0, 0x0a, 0xdd, 0xfd, 0x5d, 0xd5, + 0xd2, 0x6d, 0x69, 0xd5, 0x6b, 0x50, 0x90, 0x9f, 0xd0, 0x27, 0xc3, 0x78, 0x00, 0xc6, 0x13, 0xc8, + 0xb6, 0x8f, 0x48, 0x80, 0xd3, 0x89, 0x89, 0x4d, 0x6e, 0xae, 0x92, 0x05, 0x7b, 0x15, 0x06, 0xe0, + 0xa0, 0x0b, 0xc0, 0x04, 0x74, 0x43, 0x3c, 0xa2, 0x64, 0x93, 0x10, 0x51, 0xa0, 0x5e, 0x3f, 0x2c, + 0x46, 0x32, 0xce, 0x79, 0x51, 0xb6, 0x58, 0x3b, 0xf3, 0xa9, 0x31, 0x0b, 0x63, 0x1e, 0x00, 0x9e, + 0x83, 0x1e, 0xc0, 0xb8, 0x1b, 0x6a, 0x83, 0xf2, 0xc5, 0x88, 0x5d, 0x4e, 0x8a, 0x0d, 0xec, 0xd9, + 0x11, 0x11, 0x32, 0xfa, 0xf5, 0x8c, 0x4f, 0x7e, 0x07, 0x5e, 0x6e, 0x82, 0xee, 0x40, 0xc7, 0x8b, + 0x19, 0x73, 0x67, 0x4b, 0xd5, 0xb0, 0xa2, 0x43, 0x30, 0x1d, 0x2a, 0x54, 0xfb, 0x52, 0xb4, 0xb6, + 0x9f, 0xd2, 0xd6, 0x5e, 0x94, 0x7e, 0x86, 0x0f, 0xce, 0x0d, 0x5d, 0x4c, 0x13, 0x57, 0x0d, 0xfd, + 0x71, 0x18, 0x17, 0xa9, 0x37, 0xd2, 0x1e, 0xed, 0x7b, 0x4a, 0xf1, 0xce, 0x94, 0xc2, 0x7e, 0x43, + 0x31, 0x8a, 0x21, 0x65, 0x8c, 0xad, 0x87, 0xc1, 0xa8, 0xc3, 0xb0, 0x6a, 0x0d, 0xa3, 0xba, 0x13, + 0xc8, 0xa4, 0x54, 0x6f, 0xda, 0x17, 0xf9, 0x86, 0x52, 0xfc, 0xb2, 0xa5, 0xb0, 0xcf, 0xa8, 0x21, + 0x2f, 0xa5, 0xd1, 0x5c, 0x75, 0x42, 0x36, 0x30, 0x6a, 0xa8, 0x64, 0x28, 0xba, 0x29, 0x99, 0xcd, + 0xeb, 0x68, 0xff, 0xde, 0x57, 0x74, 0x56, 0x93, 0xe7, 0x84, 0xe1, 0x13, 0x5f, 0x50, 0x0a, 0xea, + 0x74, 0x98, 0xd4, 0xa7, 0x4f, 0x43, 0x64, 0xb0, 0xa8, 0x3e, 0xba, 0xb6, 0x32, 0xd2, 0x01, 0x6b, + 0x56, 0x04, 0x92, 0xd6, 0x81, 0xed, 0xd6, 0xff, 0x20, 0x51, 0xb6, 0xeb, 0xb2, 0xfa, 0xe8, 0x52, + 0x1a, 0x51, 0xaf, 0xc3, 0xc4, 0x9a, 0x33, 0x3b, 0xa8, 0xfe, 0x92, 0x0c, 0xd4, 0xaa, 0x14, 0x54, + 0xec, 0x30, 0x31, 0x6b, 0x61, 0x6c, 0x93, 0x43, 0x1a, 0xea, 0x30, 0xee, 0x2f, 0xfb, 0x69, 0xce, + 0x51, 0x04, 0xb2, 0x5f, 0x30, 0x26, 0x9c, 0xb0, 0x60, 0x44, 0x76, 0x05, 0x80, 0x62, 0x44, 0x92, + 0x81, 0x67, 0x8d, 0x2c, 0x9a, 0x9f, 0x90, 0x8f, 0xe2, 0x14, 0x17, 0x57, 0x39, 0xd7, 0x25, 0xc3, + 0x9e, 0x71, 0xa9, 0x8b, 0x2a, 0x58, 0xfb, 0xb1, 0x9f, 0x0d, 0x8d, 0xbb, 0xba, 0x3a, 0x61, 0x31, + 0xe7, 0x97, 0xec, 0x18, 0x42, 0xf1, 0x6e, 0x85, 0x69, 0x91, 0xfd, 0x70, 0x1c, 0x80, 0xf9, 0x73, + 0xf1, 0xba, 0xa4, 0xf8, 0x32, 0x28, 0x69, 0xff, 0x00, 0x4a, 0x14, 0x4d, 0x6d, 0x77, 0x03, 0x62, + 0xca, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, +}; + +const BITMAP_OPAQUE hole_to_hole_clearance_xpm[1] = {{ png, sizeof( png ), "hole_to_hole_clearance_xpm" }}; + +//EOF diff --git a/bitmaps_png/cpp_26/via_diameter.cpp b/bitmaps_png/cpp_26/via_diameter.cpp new file mode 100644 index 0000000000..192232f81e --- /dev/null +++ b/bitmaps_png/cpp_26/via_diameter.cpp @@ -0,0 +1,64 @@ + +/* Do not modify this file, it was automatically generated by the + * PNG2cpp CMake script, using a *.png file as input. + */ + +#include + +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, 0xf3, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xb5, 0x96, 0x5d, 0x48, 0x53, + 0x51, 0x1c, 0xc0, 0x8f, 0x39, 0x72, 0x0c, 0xca, 0x0f, 0x92, 0x7a, 0x29, 0xad, 0x70, 0xd9, 0x44, + 0x19, 0x77, 0x86, 0x38, 0x2a, 0xec, 0x03, 0x2e, 0x22, 0xba, 0xcf, 0x7b, 0x1d, 0x52, 0x0f, 0x33, + 0x18, 0xe5, 0xb2, 0x14, 0x24, 0xdf, 0xc2, 0x9e, 0x7a, 0x29, 0xc4, 0xec, 0x03, 0xd4, 0x56, 0x8e, + 0x22, 0x02, 0x29, 0x1f, 0x4c, 0x30, 0x2c, 0xf3, 0xee, 0x2e, 0x4a, 0x4a, 0x02, 0xe9, 0x21, 0x72, + 0x46, 0xe5, 0x17, 0x84, 0x14, 0xa6, 0x42, 0xb6, 0x3c, 0xfd, 0xcf, 0xdc, 0xd9, 0xae, 0x1f, 0xb7, + 0xed, 0xd6, 0xfa, 0xc3, 0x8f, 0xb3, 0xbb, 0x73, 0xcf, 0xf9, 0xf1, 0x3f, 0xf7, 0xde, 0xff, 0x39, + 0x08, 0xfd, 0x8f, 0xb8, 0x89, 0xf6, 0xa0, 0xdb, 0x28, 0x00, 0xe0, 0x10, 0x9d, 0xe8, 0x62, 0xe8, + 0xff, 0xa2, 0xa2, 0x2b, 0x9b, 0xf5, 0xfa, 0xe6, 0x34, 0x8e, 0x7b, 0x9e, 0x61, 0xb3, 0xf9, 0x2e, + 0x27, 0x40, 0x32, 0x19, 0x91, 0x50, 0x48, 0x30, 0x4c, 0x8b, 0xc5, 0x60, 0x68, 0x79, 0x67, 0x36, + 0x3f, 0x3e, 0xc7, 0x71, 0xbe, 0xef, 0x76, 0xbb, 0x78, 0x20, 0xa1, 0x12, 0x2a, 0x22, 0xc1, 0xb2, + 0x0f, 0xee, 0xdb, 0xed, 0x02, 0x06, 0xd1, 0x12, 0xc7, 0x89, 0x43, 0x09, 0x95, 0x90, 0x65, 0x24, + 0x01, 0x93, 0xbf, 0xe4, 0x79, 0xdf, 0x22, 0xb4, 0x38, 0xcc, 0x1c, 0xcf, 0x0f, 0x1e, 0x8c, 0x5b, + 0xd2, 0x89, 0xb4, 0x30, 0xd9, 0x84, 0x8c, 0x64, 0x1a, 0x79, 0x90, 0x2e, 0x74, 0x1f, 0x3c, 0x97, + 0x5d, 0x30, 0xf9, 0x5d, 0x60, 0x1e, 0x08, 0x12, 0x99, 0xcd, 0x26, 0xbc, 0x21, 0x7d, 0x0e, 0xc7, + 0x40, 0x36, 0x5c, 0x3f, 0x2b, 0x29, 0x19, 0x50, 0xc1, 0xe5, 0x56, 0x60, 0x1f, 0xa0, 0x07, 0x32, + 0x14, 0x49, 0xa4, 0x11, 0x15, 0x0a, 0xa1, 0xec, 0xcc, 0xe6, 0x3e, 0x17, 0xb4, 0xa3, 0xc5, 0xc5, + 0x17, 0xbc, 0xd0, 0x3d, 0x0c, 0x60, 0x09, 0x41, 0xa4, 0x46, 0x43, 0xe8, 0x0c, 0x9a, 0x51, 0x24, + 0x59, 0x2d, 0x84, 0x17, 0x63, 0xc4, 0x6a, 0x1d, 0x08, 0xe6, 0xe5, 0x55, 0xbf, 0x5f, 0x25, 0x58, + 0xcb, 0x7e, 0xa0, 0x43, 0xa1, 0x64, 0xf9, 0x99, 0x89, 0x3b, 0xe0, 0xc5, 0x08, 0xe8, 0x74, 0x27, + 0xbe, 0x48, 0x27, 0x2c, 0x2c, 0x64, 0xb0, 0xcb, 0xe5, 0xc4, 0xd5, 0xd5, 0xc7, 0x71, 0x6e, 0xae, + 0x76, 0xa5, 0xcc, 0x08, 0xdc, 0x52, 0x20, 0x29, 0x2f, 0x7f, 0xa5, 0x81, 0xe5, 0x1a, 0x33, 0x18, + 0x1a, 0xba, 0xe9, 0x24, 0x99, 0x99, 0x5b, 0x70, 0x4f, 0x4f, 0x17, 0x9e, 0x9d, 0x9d, 0x5a, 0x41, + 0x47, 0xc7, 0x35, 0xac, 0xd1, 0x68, 0xa2, 0xb2, 0x53, 0xe8, 0x6b, 0x5c, 0x12, 0x12, 0x4d, 0x4d, + 0x78, 0x83, 0xc9, 0xd4, 0x63, 0x84, 0x9f, 0x33, 0x64, 0xb0, 0x4a, 0xa5, 0xc2, 0x82, 0xd0, 0xb7, + 0x46, 0x42, 0xf1, 0x7a, 0xdb, 0xa3, 0xa2, 0x8d, 0xe8, 0xad, 0xd2, 0xaf, 0xe2, 0x30, 0x1d, 0xcc, + 0x71, 0x56, 0x59, 0x09, 0x85, 0x61, 0xf4, 0xd2, 0x65, 0xdc, 0xae, 0x44, 0xe4, 0xa2, 0x03, 0x5b, + 0x5b, 0x2f, 0xc5, 0x14, 0xd5, 0xd5, 0xb9, 0xa5, 0xa2, 0x43, 0x4a, 0x44, 0xa7, 0xe9, 0xc0, 0xb6, + 0xb6, 0xd6, 0x98, 0xa2, 0xc6, 0xc6, 0x7a, 0xa9, 0x88, 0x55, 0x22, 0x32, 0xd1, 0x81, 0x6e, 0xb7, + 0x2b, 0xa6, 0x88, 0x65, 0x8f, 0x4a, 0x45, 0x7b, 0x95, 0x88, 0x52, 0x93, 0x10, 0x5a, 0x24, 0x03, + 0xd3, 0xd2, 0x52, 0x71, 0x20, 0x30, 0x22, 0x2b, 0xf1, 0xfb, 0xfb, 0x71, 0x72, 0x72, 0x32, 0x95, + 0x7c, 0x2a, 0x2d, 0xed, 0x4d, 0x89, 0xdb, 0x02, 0x15, 0x50, 0x6b, 0x41, 0x68, 0x5e, 0xfa, 0xfd, + 0xac, 0x27, 0x1b, 0x1e, 0xf6, 0xe3, 0xec, 0xec, 0xac, 0x48, 0x36, 0x0c, 0xd3, 0xd0, 0x45, 0xca, + 0x55, 0xdc, 0x92, 0x51, 0x84, 0x26, 0x5e, 0xc0, 0xc0, 0x6d, 0x92, 0x0f, 0x92, 0x64, 0x56, 0x5b, + 0x7b, 0x12, 0x7b, 0x3c, 0x37, 0x70, 0x7b, 0xfb, 0x55, 0xec, 0x74, 0x1e, 0xc3, 0x6a, 0x75, 0x4a, + 0xa4, 0x5f, 0xab, 0x75, 0x7c, 0x86, 0xd2, 0xf5, 0xb1, 0xb2, 0xd2, 0xbf, 0x3b, 0x6e, 0x09, 0x80, + 0x09, 0x8f, 0x56, 0xc9, 0xe4, 0xc8, 0xc9, 0x71, 0x7c, 0xb3, 0xd9, 0x9e, 0xfe, 0x32, 0x99, 0xfa, + 0x6a, 0x14, 0x4b, 0x28, 0x24, 0x33, 0x58, 0xc6, 0x05, 0x78, 0x66, 0x3f, 0xd7, 0x91, 0xcc, 0x15, + 0x14, 0xd4, 0xf4, 0x92, 0x4c, 0xcc, 0xe6, 0x27, 0x23, 0xb4, 0xea, 0xcb, 0x6e, 0x9c, 0x72, 0x92, + 0x30, 0xd3, 0x50, 0x55, 0x49, 0x59, 0x49, 0x27, 0xf5, 0x16, 0xa8, 0x07, 0xce, 0x02, 0x65, 0x65, + 0x65, 0xf7, 0x8c, 0x50, 0x17, 0x3f, 0x70, 0xdc, 0xe0, 0x4e, 0xab, 0xd5, 0x9f, 0x45, 0xab, 0x3e, + 0xb4, 0x0b, 0xd0, 0x82, 0x50, 0x38, 0xa2, 0x54, 0x22, 0x13, 0x38, 0xa9, 0xa2, 0x42, 0xdc, 0x44, + 0xaf, 0x78, 0x5e, 0xbc, 0x03, 0x92, 0x60, 0x78, 0xf3, 0x5c, 0x5a, 0x3e, 0x16, 0xf8, 0x5a, 0x42, + 0x9d, 0x30, 0xd9, 0xb8, 0x8c, 0x64, 0x72, 0x0c, 0xc1, 0xf6, 0xac, 0x20, 0x48, 0x66, 0xe1, 0xcd, + 0x93, 0x64, 0x85, 0x2d, 0x96, 0xfe, 0xf3, 0x55, 0x55, 0xbe, 0x74, 0x2a, 0x4a, 0x88, 0x64, 0x65, + 0x56, 0xe2, 0x0f, 0x96, 0xed, 0x7e, 0x48, 0x0e, 0x3c, 0xf9, 0xf9, 0xd7, 0x65, 0x45, 0x7f, 0x2d, + 0xa1, 0x59, 0xf1, 0xbc, 0xf0, 0x7a, 0xf9, 0x74, 0xd5, 0x6c, 0x25, 0x47, 0x39, 0x2a, 0x9a, 0x92, + 0x48, 0xc6, 0xff, 0x45, 0xf2, 0xa7, 0xf8, 0x0d, 0x25, 0x54, 0xce, 0xe7, 0xf2, 0x21, 0x0b, 0xfe, + 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, +}; + +const BITMAP_OPAQUE via_diameter_xpm[1] = {{ png, sizeof( png ), "via_diameter_xpm" }}; + +//EOF diff --git a/bitmaps_png/cpp_26/via_hole_diameter.cpp b/bitmaps_png/cpp_26/via_hole_diameter.cpp new file mode 100644 index 0000000000..837ad5e75a --- /dev/null +++ b/bitmaps_png/cpp_26/via_hole_diameter.cpp @@ -0,0 +1,67 @@ + +/* Do not modify this file, it was automatically generated by the + * PNG2cpp CMake script, using a *.png file as input. + */ + +#include + +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, 0x19, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xb5, 0x96, 0x5d, 0x48, 0x14, + 0x51, 0x14, 0xc7, 0x6f, 0x7b, 0x77, 0x9d, 0x9d, 0xcd, 0xaf, 0x4a, 0xcb, 0x8f, 0xb0, 0x87, 0x74, + 0x2d, 0x53, 0xfc, 0x58, 0x61, 0x0d, 0x74, 0x7d, 0x11, 0xdd, 0x55, 0x8c, 0xad, 0xe8, 0xa9, 0x1e, + 0x8a, 0xcc, 0x8c, 0x22, 0x2a, 0x22, 0xc8, 0x7a, 0x51, 0x28, 0xf3, 0x23, 0x45, 0x25, 0xfb, 0x32, + 0x51, 0x2c, 0x0a, 0x09, 0x8c, 0x8c, 0x5e, 0x83, 0x88, 0xde, 0x0c, 0x8c, 0x90, 0x24, 0x8b, 0x02, + 0x35, 0x89, 0x82, 0xe8, 0x41, 0x71, 0xc9, 0x3d, 0x9d, 0x33, 0x5f, 0xcd, 0xca, 0xae, 0xce, 0x98, + 0x1d, 0xf8, 0x33, 0xb3, 0xc3, 0xdc, 0xf3, 0xdb, 0xff, 0x99, 0x7b, 0xcf, 0xbd, 0x8c, 0xfd, 0x8f, + 0xb8, 0xc7, 0x32, 0x59, 0x3f, 0xfb, 0x88, 0x02, 0x49, 0x03, 0xac, 0x49, 0x7a, 0xee, 0x76, 0x77, + 0xc5, 0xe6, 0xe5, 0x75, 0xc4, 0xd3, 0xbd, 0xcf, 0x07, 0xe5, 0x5e, 0x2f, 0x3c, 0x63, 0x0c, 0xd6, + 0xfd, 0x03, 0x64, 0x46, 0x83, 0xa8, 0xa2, 0x28, 0x28, 0xe8, 0xdc, 0xeb, 0x72, 0x75, 0x4d, 0xe4, + 0xe7, 0x77, 0xa7, 0x20, 0xe4, 0x46, 0x45, 0x05, 0x04, 0x11, 0xe8, 0x5f, 0x33, 0x88, 0x0a, 0xa2, + 0x28, 0x2c, 0xec, 0x3e, 0xeb, 0xf1, 0x8c, 0x7e, 0x47, 0x10, 0xa0, 0x16, 0x51, 0xef, 0x4c, 0xb9, + 0x5a, 0x0e, 0x42, 0x65, 0x54, 0xca, 0xb5, 0x15, 0x5d, 0x34, 0x28, 0x10, 0x49, 0xa6, 0x5c, 0x0d, + 0x30, 0x27, 0x26, 0x9b, 0x8e, 0x00, 0x99, 0x65, 0x7d, 0x2c, 0x8b, 0x95, 0x95, 0x41, 0x1c, 0x26, + 0xfe, 0x8d, 0x0a, 0xe8, 0x41, 0x4b, 0x5c, 0x09, 0x4c, 0x70, 0x54, 0x33, 0x9b, 0xd8, 0x8e, 0x1a, + 0x42, 0x0d, 0xb2, 0x28, 0x47, 0x23, 0x5e, 0x8b, 0x0c, 0x41, 0xd4, 0xc0, 0x7f, 0x9e, 0x8f, 0x1a, + 0xc1, 0xc4, 0xe4, 0x62, 0x41, 0x07, 0x0b, 0x66, 0x65, 0xdf, 0x6c, 0xc3, 0x84, 0x5f, 0x50, 0x10, + 0xb7, 0xa9, 0x18, 0xec, 0xd1, 0xe9, 0x40, 0xf7, 0x9a, 0x32, 0x84, 0x05, 0xd6, 0x68, 0x59, 0x19, + 0xa2, 0x0f, 0x3d, 0xd0, 0xeb, 0x0d, 0xa2, 0xcb, 0x20, 0x14, 0x17, 0x8f, 0x63, 0x42, 0x07, 0x24, + 0x26, 0xfb, 0xa1, 0xbc, 0x7c, 0x5e, 0xba, 0x86, 0x80, 0x48, 0xeb, 0x51, 0x67, 0xb8, 0x31, 0xc8, + 0x52, 0x60, 0x89, 0x67, 0xe2, 0x2d, 0x81, 0xc8, 0x59, 0x46, 0xe6, 0x55, 0xfc, 0x66, 0x73, 0x50, + 0x5b, 0x77, 0x0a, 0x7a, 0xfb, 0x39, 0xf4, 0xdc, 0xe1, 0x70, 0xfa, 0x9c, 0x15, 0xb6, 0xa5, 0x0b, + 0xa1, 0x30, 0xd9, 0x99, 0x31, 0x88, 0x1c, 0xd1, 0x89, 0x38, 0xf8, 0x57, 0xec, 0x46, 0x37, 0xb8, + 0x8b, 0x5e, 0x21, 0x6c, 0x01, 0xae, 0x34, 0x9d, 0x84, 0x27, 0x23, 0x96, 0x10, 0x3d, 0x1e, 0xb6, + 0x40, 0x69, 0x99, 0x0e, 0xe6, 0x14, 0x02, 0x26, 0x20, 0x18, 0x56, 0xfb, 0x45, 0x1a, 0x98, 0x90, + 0xb4, 0x07, 0x21, 0x73, 0x61, 0x21, 0x7a, 0x58, 0xda, 0x76, 0x41, 0x5f, 0x4a, 0xb7, 0x71, 0x90, + 0x4d, 0x7c, 0x99, 0x90, 0x54, 0x2d, 0x7d, 0x93, 0xfa, 0xcb, 0x75, 0x11, 0x21, 0xaa, 0xa8, 0x8c, + 0x1a, 0x28, 0xca, 0xd1, 0x60, 0xc2, 0x91, 0x38, 0x95, 0x9a, 0x56, 0x0b, 0x99, 0x3b, 0x6b, 0x56, + 0x84, 0x90, 0x7a, 0x6e, 0x73, 0xbd, 0xa3, 0x41, 0x33, 0x8e, 0xbe, 0xd1, 0xa0, 0x2d, 0xa9, 0x76, + 0x43, 0xa0, 0xbb, 0x7d, 0x5c, 0x9a, 0x8d, 0xca, 0xd4, 0x1f, 0x32, 0x03, 0x7a, 0x43, 0x20, 0x2e, + 0x8a, 0xf0, 0xe0, 0x11, 0x5f, 0x11, 0x74, 0xfc, 0x44, 0x9d, 0x54, 0x66, 0x5a, 0x67, 0x38, 0xee, + 0xba, 0x19, 0x50, 0x9b, 0x5a, 0x8a, 0x23, 0x35, 0xb6, 0x65, 0x21, 0xd7, 0x5a, 0x6a, 0x70, 0xc2, + 0xcc, 0xc3, 0xe6, 0xe4, 0xfd, 0x72, 0xe9, 0xb8, 0xa3, 0xca, 0x30, 0xe7, 0x10, 0x17, 0xaa, 0x2c, + 0x0a, 0xc8, 0x1e, 0x23, 0x42, 0x6b, 0x87, 0x35, 0x22, 0xc4, 0xe7, 0x0b, 0x80, 0x73, 0x47, 0xb3, + 0xb4, 0xa8, 0xf1, 0xfd, 0xcf, 0x52, 0xbb, 0x32, 0x12, 0xd8, 0x66, 0x9d, 0x93, 0x8c, 0x4d, 0x1f, + 0xe4, 0x36, 0xed, 0x03, 0x13, 0xec, 0x30, 0x3a, 0xbb, 0xff, 0xf0, 0x6f, 0x19, 0xeb, 0x2f, 0x1d, + 0x93, 0x9c, 0x14, 0xed, 0x7e, 0x2d, 0x2d, 0x6a, 0xea, 0x20, 0xbb, 0xb2, 0x6f, 0xb5, 0x18, 0xea, + 0xf8, 0x2a, 0x04, 0x05, 0xe3, 0x28, 0xb7, 0x35, 0x64, 0x7d, 0x00, 0xb7, 0x8b, 0x90, 0x98, 0x62, + 0x07, 0x27, 0xce, 0x46, 0xb5, 0x1d, 0xd1, 0xa2, 0x96, 0x3b, 0x48, 0x50, 0xea, 0xf8, 0xd4, 0x88, + 0xe5, 0xae, 0x1f, 0x01, 0xa8, 0x87, 0xa8, 0x22, 0x18, 0x39, 0xb3, 0x2c, 0xe9, 0x6d, 0x34, 0xf5, + 0x69, 0x9d, 0x29, 0xbf, 0x7f, 0x96, 0x78, 0x26, 0xc7, 0xe4, 0xde, 0xa8, 0x75, 0x7d, 0x02, 0xbe, + 0x47, 0x1d, 0x08, 0x01, 0x86, 0x83, 0xe8, 0x34, 0x7b, 0x94, 0xf3, 0x6a, 0x16, 0x25, 0xb6, 0x62, + 0xd2, 0x51, 0xd4, 0x2c, 0xad, 0x33, 0xbc, 0xbe, 0xc0, 0xeb, 0x05, 0xc6, 0x62, 0x12, 0xa8, 0x37, + 0x2a, 0xc9, 0xb5, 0x6d, 0x06, 0x9f, 0x2d, 0x2a, 0x7b, 0xda, 0x73, 0x43, 0x90, 0x0f, 0xcc, 0x58, + 0xef, 0xc2, 0xe4, 0x4f, 0xc3, 0xec, 0x69, 0xbd, 0xa8, 0x0a, 0xe9, 0x05, 0x4c, 0x36, 0x15, 0x01, + 0x32, 0xf3, 0x89, 0xe1, 0xf6, 0x6c, 0x30, 0x2a, 0x2b, 0x21, 0x4f, 0xef, 0xaa, 0xb4, 0x74, 0xec, + 0x47, 0x6e, 0x6e, 0x7b, 0xaa, 0xf6, 0xc2, 0x5a, 0x40, 0xf4, 0xae, 0xb0, 0x5c, 0x01, 0x2c, 0x57, + 0xb3, 0xcb, 0xd5, 0x79, 0x9e, 0x0e, 0x3c, 0x39, 0x39, 0x3d, 0x1b, 0x22, 0x81, 0x56, 0x05, 0x51, + 0xf7, 0x31, 0x3a, 0x16, 0xd0, 0x19, 0x44, 0x3e, 0x5d, 0x75, 0xed, 0xa3, 0xa3, 0x9c, 0x0a, 0xfa, + 0xaa, 0x83, 0x4c, 0xad, 0x16, 0xa2, 0x86, 0xdf, 0x0f, 0xf1, 0xe1, 0x9e, 0xff, 0x01, 0x59, 0xd7, + 0xcd, 0xcd, 0x75, 0xc4, 0x40, 0x96, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, + 0x60, 0x82, +}; + +const BITMAP_OPAQUE via_hole_diameter_xpm[1] = {{ png, sizeof( png ), "via_hole_diameter_xpm" }}; + +//EOF diff --git a/bitmaps_png/include/bitmaps_png/bitmaps_list.h b/bitmaps_png/include/bitmaps_png/bitmaps_list.h index b9c6736528..b8133efe14 100644 --- a/bitmaps_png/include/bitmaps_png/bitmaps_list.h +++ b/bitmaps_png/include/bitmaps_png/bitmaps_list.h @@ -138,6 +138,7 @@ EXTERN_BITMAP( editor_xpm ) EXTERN_BITMAP( edit_text_xpm ) EXTERN_BITMAP( edit_cmp_symb_links_xpm ) EXTERN_BITMAP( edit_xpm ) +EXTERN_BITMAP( edge_to_copper_clearance_xpm ) EXTERN_BITMAP( eeschema_xpm ) EXTERN_BITMAP( enter_sheet_xpm ) EXTERN_BITMAP( erc_xpm ) @@ -187,6 +188,7 @@ EXTERN_BITMAP( hidden_pin_xpm ) EXTERN_BITMAP( hierarchy_nav_xpm ) EXTERN_BITMAP( highlight_remove_xpm ) EXTERN_BITMAP( hotkeys_xpm ) +EXTERN_BITMAP( hole_to_hole_clearance_xpm ) EXTERN_BITMAP( html_xpm ) EXTERN_BITMAP( icon_xpm ) EXTERN_BITMAP( icon_cvpcb_small_xpm ) @@ -475,6 +477,8 @@ EXTERN_BITMAP( via_xpm ) EXTERN_BITMAP( via_microvia_xpm ) EXTERN_BITMAP( via_buried_xpm ) EXTERN_BITMAP( via_sketch_xpm ) +EXTERN_BITMAP( via_diameter_xpm ) +EXTERN_BITMAP( via_hole_diameter_xpm ) EXTERN_BITMAP( viewlibs_icon_xpm ) EXTERN_BITMAP( warning_xpm ) EXTERN_BITMAP( width_track_via_xpm ) diff --git a/bitmaps_png/sources/edge_to_copper_clearance.svg b/bitmaps_png/sources/edge_to_copper_clearance.svg new file mode 100644 index 0000000000..6c7279c5d2 --- /dev/null +++ b/bitmaps_png/sources/edge_to_copper_clearance.svg @@ -0,0 +1,169 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bitmaps_png/sources/hole_to_hole_clearance.svg b/bitmaps_png/sources/hole_to_hole_clearance.svg new file mode 100644 index 0000000000..eb6a7abb72 --- /dev/null +++ b/bitmaps_png/sources/hole_to_hole_clearance.svg @@ -0,0 +1,154 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bitmaps_png/sources/via_diameter.svg b/bitmaps_png/sources/via_diameter.svg new file mode 100644 index 0000000000..34c12be9eb --- /dev/null +++ b/bitmaps_png/sources/via_diameter.svg @@ -0,0 +1,137 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bitmaps_png/sources/via_hole_diameter.svg b/bitmaps_png/sources/via_hole_diameter.svg new file mode 100644 index 0000000000..eabe33c3d2 --- /dev/null +++ b/bitmaps_png/sources/via_hole_diameter.svg @@ -0,0 +1,136 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pcbnew/dialogs/panel_setup_feature_constraints.cpp b/pcbnew/dialogs/panel_setup_feature_constraints.cpp index b636acec49..6af3981911 100644 --- a/pcbnew/dialogs/panel_setup_feature_constraints.cpp +++ b/pcbnew/dialogs/panel_setup_feature_constraints.cpp @@ -34,6 +34,8 @@ #include #include +#include + PANEL_SETUP_FEATURE_CONSTRAINTS::PANEL_SETUP_FEATURE_CONSTRAINTS( PAGED_DIALOG* aParent, PCB_EDIT_FRAME* aFrame ) : @@ -49,6 +51,18 @@ PANEL_SETUP_FEATURE_CONSTRAINTS::PANEL_SETUP_FEATURE_CONSTRAINTS( PAGED_DIALOG* { m_Frame = aFrame; m_BrdSettings = &m_Frame->GetBoard()->GetDesignSettings(); + + // Initialize bitmaps: + m_bitmapZoneFillOpt->SetBitmap( KiBitmap( show_zone_xpm ) ); + m_bitmapMinTrackWidth->SetBitmap( KiBitmap( width_track_xpm ) ); + m_bitmapMinViaDiameter->SetBitmap( KiBitmap( via_diameter_xpm ) ); + m_bitmapMinViaDrill->SetBitmap( KiBitmap( via_hole_diameter_xpm ) ); + m_bitmapMinuViaDiameter->SetBitmap( KiBitmap( via_diameter_xpm ) ); + m_bitmapMinuViaDrill->SetBitmap( KiBitmap( via_hole_diameter_xpm ) ); + m_bitmapMinHoleClearance->SetBitmap( KiBitmap( hole_to_hole_clearance_xpm ) ); + m_bitmapEdgeClearance->SetBitmap( KiBitmap( edge_to_copper_clearance_xpm ) ); + m_bitmapBlindBuried->SetBitmap( KiBitmap( via_buried_xpm ) ); + m_bitmap_uVia->SetBitmap( KiBitmap( via_microvia_xpm ) ); } diff --git a/pcbnew/dialogs/panel_setup_feature_constraints_base.cpp b/pcbnew/dialogs/panel_setup_feature_constraints_base.cpp index 793dd6d6eb..d05cb1c59c 100644 --- a/pcbnew/dialogs/panel_setup_feature_constraints_base.cpp +++ b/pcbnew/dialogs/panel_setup_feature_constraints_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version Jul 10 2019) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -17,11 +17,25 @@ PANEL_SETUP_FEATURE_CONSTRAINTS_BASE::PANEL_SETUP_FEATURE_CONSTRAINTS_BASE( wxWi wxBoxSizer* sbFeatureRules; sbFeatureRules = new wxBoxSizer( wxVERTICAL ); + wxFlexGridSizer* fgSizerViaOpt; + fgSizerViaOpt = new wxFlexGridSizer( 0, 2, 0, 0 ); + fgSizerViaOpt->SetFlexibleDirection( wxBOTH ); + fgSizerViaOpt->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + + m_bitmapBlindBuried = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); + fgSizerViaOpt->Add( m_bitmapBlindBuried, 0, wxALL, 5 ); + m_OptAllowBlindBuriedVias = new wxCheckBox( this, wxID_ANY, _("Allow blind/buried vias"), wxDefaultPosition, wxDefaultSize, 0 ); - sbFeatureRules->Add( m_OptAllowBlindBuriedVias, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); + fgSizerViaOpt->Add( m_OptAllowBlindBuriedVias, 0, wxTOP|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); + + m_bitmap_uVia = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); + fgSizerViaOpt->Add( m_bitmap_uVia, 0, wxALL, 5 ); m_OptAllowMicroVias = new wxCheckBox( this, wxID_ANY, _("Allow micro vias (uVias)"), wxDefaultPosition, wxDefaultSize, 0 ); - sbFeatureRules->Add( m_OptAllowMicroVias, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); + fgSizerViaOpt->Add( m_OptAllowMicroVias, 0, wxTOP|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); + + + sbFeatureRules->Add( fgSizerViaOpt, 0, wxEXPAND, 5 ); sbFeatureRules->Add( 0, 5, 0, wxEXPAND|wxTOP|wxBOTTOM, 5 ); @@ -75,17 +89,26 @@ PANEL_SETUP_FEATURE_CONSTRAINTS_BASE::PANEL_SETUP_FEATURE_CONSTRAINTS_BASE( wxWi m_stZoneFilledPolysOpt->Wrap( -1 ); m_stZoneFilledPolysOpt->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); - m_bSizerPolygonFillOption->Add( m_stZoneFilledPolysOpt, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); + m_bSizerPolygonFillOption->Add( m_stZoneFilledPolysOpt, 0, wxALL, 5 ); wxBoxSizer* bSizer5; - bSizer5 = new wxBoxSizer( wxVERTICAL ); + bSizer5 = new wxBoxSizer( wxHORIZONTAL ); + + m_bitmapZoneFillOpt = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); + bSizer5->Add( m_bitmapZoneFillOpt, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 ); + + wxBoxSizer* bSizerOutlinesOpts; + bSizerOutlinesOpts = new wxBoxSizer( wxVERTICAL ); m_cbOutlinePolygonBestQ = new wxCheckBox( this, wxID_ANY, _("Stroked outlines (legacy)"), wxDefaultPosition, wxDefaultSize, 0 ); - bSizer5->Add( m_cbOutlinePolygonBestQ, 0, wxALL, 4 ); + bSizerOutlinesOpts->Add( m_cbOutlinePolygonBestQ, 0, wxALL, 4 ); m_cbOutlinePolygonFastest = new wxCheckBox( this, wxID_ANY, _("Smoothed polygons (best performance)"), wxDefaultPosition, wxDefaultSize, 0 ); m_cbOutlinePolygonFastest->SetValue(true); - bSizer5->Add( m_cbOutlinePolygonFastest, 0, wxBOTTOM|wxRIGHT|wxLEFT, 4 ); + bSizerOutlinesOpts->Add( m_cbOutlinePolygonFastest, 0, wxALL, 4 ); + + + bSizer5->Add( bSizerOutlinesOpts, 1, wxEXPAND, 5 ); m_bSizerPolygonFillOption->Add( bSizer5, 1, wxEXPAND|wxLEFT, 15 ); @@ -103,11 +126,14 @@ PANEL_SETUP_FEATURE_CONSTRAINTS_BASE::PANEL_SETUP_FEATURE_CONSTRAINTS_BASE( wxWi sbFeatureConstraints = new wxBoxSizer( wxVERTICAL ); wxFlexGridSizer* fgFeatureConstraints; - fgFeatureConstraints = new wxFlexGridSizer( 0, 3, 2, 0 ); - fgFeatureConstraints->AddGrowableCol( 1 ); + fgFeatureConstraints = new wxFlexGridSizer( 0, 4, 2, 0 ); + fgFeatureConstraints->AddGrowableCol( 2 ); fgFeatureConstraints->SetFlexibleDirection( wxBOTH ); fgFeatureConstraints->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + m_bitmapMinTrackWidth = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); + fgFeatureConstraints->Add( m_bitmapMinTrackWidth, 0, wxALL, 5 ); + m_TrackMinWidthTitle = new wxStaticText( this, wxID_ANY, _("Minimum track width:"), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT ); m_TrackMinWidthTitle->Wrap( -1 ); fgFeatureConstraints->Add( m_TrackMinWidthTitle, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxBOTTOM, 5 ); @@ -115,38 +141,47 @@ PANEL_SETUP_FEATURE_CONSTRAINTS_BASE::PANEL_SETUP_FEATURE_CONSTRAINTS_BASE( wxWi m_TrackMinWidthCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_TrackMinWidthCtrl->SetMinSize( wxSize( 120,-1 ) ); - fgFeatureConstraints->Add( m_TrackMinWidthCtrl, 0, wxALIGN_LEFT|wxALIGN_TOP|wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + fgFeatureConstraints->Add( m_TrackMinWidthCtrl, 0, wxALIGN_LEFT|wxALIGN_TOP|wxEXPAND|wxALL, 5 ); m_TrackMinWidthUnits = new wxStaticText( this, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT ); m_TrackMinWidthUnits->Wrap( -1 ); fgFeatureConstraints->Add( m_TrackMinWidthUnits, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxBOTTOM, 5 ); - fgFeatureConstraints->Add( 0, 0, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 10 ); + fgFeatureConstraints->Add( 0, 0, 1, wxEXPAND|wxTOP, 5 ); - fgFeatureConstraints->Add( 0, 0, 1, wxEXPAND, 5 ); + fgFeatureConstraints->Add( 0, 0, 1, wxEXPAND|wxTOP, 5 ); - fgFeatureConstraints->Add( 0, 0, 1, wxALL|wxEXPAND, 5 ); + fgFeatureConstraints->Add( 0, 0, 1, wxEXPAND|wxTOP, 5 ); + + + fgFeatureConstraints->Add( 0, 0, 1, wxEXPAND|wxTOP, 5 ); + + m_bitmapMinViaDiameter = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); + fgFeatureConstraints->Add( m_bitmapMinViaDiameter, 0, wxALL, 5 ); m_ViaMinTitle = new wxStaticText( this, wxID_ANY, _("Minimum via diameter:"), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT ); m_ViaMinTitle->Wrap( -1 ); fgFeatureConstraints->Add( m_ViaMinTitle, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 ); m_SetViasMinSizeCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgFeatureConstraints->Add( m_SetViasMinSizeCtrl, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); + fgFeatureConstraints->Add( m_SetViasMinSizeCtrl, 0, wxEXPAND|wxALL, 5 ); m_ViaMinUnits = new wxStaticText( this, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT ); m_ViaMinUnits->Wrap( -1 ); fgFeatureConstraints->Add( m_ViaMinUnits, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 ); + m_bitmapMinViaDrill = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); + fgFeatureConstraints->Add( m_bitmapMinViaDrill, 0, wxALL, 5 ); + m_ViaMinDrillTitle = new wxStaticText( this, wxID_ANY, _("Minimum via drill:"), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT ); m_ViaMinDrillTitle->Wrap( -1 ); fgFeatureConstraints->Add( m_ViaMinDrillTitle, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 ); m_SetViasMinDrillCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgFeatureConstraints->Add( m_SetViasMinDrillCtrl, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + fgFeatureConstraints->Add( m_SetViasMinDrillCtrl, 0, wxEXPAND|wxALL, 5 ); m_ViaMinDrillUnits = new wxStaticText( this, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT ); m_ViaMinDrillUnits->Wrap( -1 ); @@ -161,23 +196,32 @@ PANEL_SETUP_FEATURE_CONSTRAINTS_BASE::PANEL_SETUP_FEATURE_CONSTRAINTS_BASE( wxWi fgFeatureConstraints->Add( 0, 0, 1, wxEXPAND|wxTOP, 5 ); + + fgFeatureConstraints->Add( 0, 0, 1, wxEXPAND|wxTOP, 5 ); + + m_bitmapMinuViaDiameter = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); + fgFeatureConstraints->Add( m_bitmapMinuViaDiameter, 0, wxALL, 5 ); + m_uviaMinSizeLabel = new wxStaticText( this, wxID_ANY, _("Minimum uVia diameter:"), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT ); m_uviaMinSizeLabel->Wrap( -1 ); fgFeatureConstraints->Add( m_uviaMinSizeLabel, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 ); m_uviaMinSizeCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgFeatureConstraints->Add( m_uviaMinSizeCtrl, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 ); + fgFeatureConstraints->Add( m_uviaMinSizeCtrl, 0, wxEXPAND|wxALL, 5 ); m_uviaMinSizeUnits = new wxStaticText( this, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT ); m_uviaMinSizeUnits->Wrap( -1 ); fgFeatureConstraints->Add( m_uviaMinSizeUnits, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 ); + m_bitmapMinuViaDrill = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); + fgFeatureConstraints->Add( m_bitmapMinuViaDrill, 0, wxALL, 5 ); + m_uviaMinDrillLabel = new wxStaticText( this, wxID_ANY, _("Minimum uVia drill:"), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT ); m_uviaMinDrillLabel->Wrap( -1 ); fgFeatureConstraints->Add( m_uviaMinDrillLabel, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT, 5 ); m_uviaMinDrillCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgFeatureConstraints->Add( m_uviaMinDrillCtrl, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); + fgFeatureConstraints->Add( m_uviaMinDrillCtrl, 0, wxEXPAND|wxALL, 5 ); m_uviaMinDrillUnits = new wxStaticText( this, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT ); m_uviaMinDrillUnits->Wrap( -1 ); @@ -192,7 +236,13 @@ PANEL_SETUP_FEATURE_CONSTRAINTS_BASE::PANEL_SETUP_FEATURE_CONSTRAINTS_BASE( wxWi fgFeatureConstraints->Add( 0, 0, 1, wxEXPAND, 5 ); - m_HoleToHoleTitle = new wxStaticText( this, wxID_ANY, _("Minimum hole to hole:"), wxDefaultPosition, wxDefaultSize, 0 ); + + fgFeatureConstraints->Add( 0, 0, 1, wxEXPAND|wxTOP, 5 ); + + m_bitmapMinHoleClearance = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); + fgFeatureConstraints->Add( m_bitmapMinHoleClearance, 0, wxALL, 5 ); + + m_HoleToHoleTitle = new wxStaticText( this, wxID_ANY, _("Hole to hole clearance:"), wxDefaultPosition, wxDefaultSize, 0 ); m_HoleToHoleTitle->Wrap( -1 ); fgFeatureConstraints->Add( m_HoleToHoleTitle, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxTOP, 5 ); @@ -212,9 +262,15 @@ PANEL_SETUP_FEATURE_CONSTRAINTS_BASE::PANEL_SETUP_FEATURE_CONSTRAINTS_BASE( wxWi fgFeatureConstraints->Add( 0, 0, 1, wxEXPAND, 5 ); + + fgFeatureConstraints->Add( 0, 0, 1, wxEXPAND|wxTOP, 5 ); + + m_bitmapEdgeClearance = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); + fgFeatureConstraints->Add( m_bitmapEdgeClearance, 0, wxALL, 5 ); + m_EdgeClearanceLabel = new wxStaticText( this, wxID_ANY, _("Copper edge clearance:"), wxDefaultPosition, wxDefaultSize, 0 ); m_EdgeClearanceLabel->Wrap( -1 ); - fgFeatureConstraints->Add( m_EdgeClearanceLabel, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 ); + fgFeatureConstraints->Add( m_EdgeClearanceLabel, 0, wxTOP|wxBOTTOM|wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 ); m_EdgeClearanceCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); fgFeatureConstraints->Add( m_EdgeClearanceCtrl, 0, wxALL|wxEXPAND, 5 ); diff --git a/pcbnew/dialogs/panel_setup_feature_constraints_base.fbp b/pcbnew/dialogs/panel_setup_feature_constraints_base.fbp index 76b1c55c3b..ba5f599830 100644 --- a/pcbnew/dialogs/panel_setup_feature_constraints_base.fbp +++ b/pcbnew/dialogs/panel_setup_feature_constraints_base.fbp @@ -14,6 +14,7 @@ panel_setup_feature_constraints_base 1000 none + 1 panel_setup_feature_constraints_base @@ -25,6 +26,7 @@ 1 1 UI + 0 1 0 @@ -63,132 +65,266 @@ sbFeatureRules wxVERTICAL none - + 5 - wxTOP|wxRIGHT|wxLEFT + wxEXPAND 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Allow blind/buried vias - - 0 - - - 0 + + 2 + wxBOTH + + + 0 - 1 - m_OptAllowBlindBuriedVias - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - wxTOP|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Allow micro vias (uVias) - - 0 - - - 0 - - 1 - m_OptAllowMicroVias - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - + fgSizerViaOpt + wxFLEX_GROWMODE_SPECIFIED + none + 0 + 0 + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_bitmapBlindBuried + 1 + + + protected + 1 + + Resizable + 1 + + ; ; forward_declare + 0 + + + + + + + + 5 + wxTOP|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Allow blind/buried vias + + 0 + + + 0 + + 1 + m_OptAllowBlindBuriedVias + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_bitmap_uVia + 1 + + + protected + 1 + + Resizable + 1 + + ; ; forward_declare + 0 + + + + + + + + 5 + wxTOP|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Allow micro vias (uVias) + + 0 + + + 0 + + 1 + m_OptAllowMicroVias + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + @@ -614,7 +750,7 @@ 5 - wxTOP|wxRIGHT|wxLEFT + wxALL 0 1 @@ -680,13 +816,13 @@ bSizer5 - wxVERTICAL + wxHORIZONTAL none - 4 - wxALL + 5 + wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT 0 - + 1 1 1 @@ -697,10 +833,10 @@ + 1 0 - 0 1 1 @@ -715,7 +851,6 @@ 0 0 wxID_ANY - Stroked outlines (legacy) 0 @@ -723,7 +858,7 @@ 0 1 - m_cbOutlinePolygonBestQ + m_bitmapZoneFillOpt 1 @@ -733,83 +868,153 @@ Resizable 1 - ; ; forward_declare 0 - - wxFILTER_NONE - wxDefaultValidator - - onChangeOutlineOpt - 4 - wxBOTTOM|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Smoothed polygons (best performance) - - 0 - - - 0 + 5 + wxEXPAND + 1 + - 1 - m_cbOutlinePolygonFastest - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - onChangeOutlineOpt + bSizerOutlinesOpts + wxVERTICAL + none + + 4 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Stroked outlines (legacy) + + 0 + + + 0 + + 1 + m_cbOutlinePolygonBestQ + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + onChangeOutlineOpt + + + + 4 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Smoothed polygons (best performance) + + 0 + + + 0 + + 1 + m_cbOutlinePolygonFastest + 1 + + + protected + 1 + + Resizable + 1 + + + ; ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + onChangeOutlineOpt + + @@ -842,9 +1047,9 @@ wxEXPAND|wxTOP|wxLEFT 1 - 3 + 4 wxBOTH - 1 + 2 0 @@ -853,6 +1058,64 @@ none 0 2 + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_bitmapMinTrackWidth + 1 + + + protected + 1 + + Resizable + 1 + + ; ; forward_declare + 0 + + + + + + 5 wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxBOTTOM @@ -916,7 +1179,7 @@ 5 - wxALIGN_LEFT|wxALIGN_TOP|wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + wxALIGN_LEFT|wxALIGN_TOP|wxEXPAND|wxALL 0 1 @@ -1039,36 +1302,104 @@ -1 - - 10 - wxEXPAND|wxTOP|wxRIGHT|wxLEFT + + 5 + wxEXPAND|wxTOP 1 - + 0 protected 0 - + 5 - wxEXPAND + wxEXPAND|wxTOP 1 - + 0 protected 0 - + 5 - wxALL|wxEXPAND + wxEXPAND|wxTOP 1 - + 0 protected 0 + + 5 + wxEXPAND|wxTOP + 1 + + 0 + protected + 0 + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_bitmapMinViaDiameter + 1 + + + protected + 1 + + Resizable + 1 + + ; ; forward_declare + 0 + + + + + + 5 wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT @@ -1132,7 +1463,7 @@ 5 - wxEXPAND|wxRIGHT|wxLEFT + wxEXPAND|wxALL 0 1 @@ -1255,6 +1586,64 @@ -1 + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_bitmapMinViaDrill + 1 + + + protected + 1 + + Resizable + 1 + + ; ; forward_declare + 0 + + + + + + 5 wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT @@ -1318,7 +1707,7 @@ 5 - wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + wxEXPAND|wxALL 0 1 @@ -1471,6 +1860,74 @@ 0 + + 5 + wxEXPAND|wxTOP + 1 + + 0 + protected + 0 + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_bitmapMinuViaDiameter + 1 + + + protected + 1 + + Resizable + 1 + + ; ; forward_declare + 0 + + + + + + 5 wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT @@ -1534,7 +1991,7 @@ 5 - wxEXPAND|wxTOP|wxRIGHT|wxLEFT + wxEXPAND|wxALL 0 1 @@ -1657,6 +2114,64 @@ -1 + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_bitmapMinuViaDrill + 1 + + + protected + 1 + + Resizable + 1 + + ; ; forward_declare + 0 + + + + + + 5 wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT @@ -1720,7 +2235,7 @@ 5 - wxEXPAND|wxRIGHT|wxLEFT + wxEXPAND|wxALL 0 1 @@ -1873,6 +2388,74 @@ 0 + + 5 + wxEXPAND|wxTOP + 1 + + 0 + protected + 0 + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_bitmapMinHoleClearance + 1 + + + protected + 1 + + Resizable + 1 + + ; ; forward_declare + 0 + + + + + + 5 wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxTOP @@ -1905,7 +2488,7 @@ 0 0 wxID_ANY - Minimum hole to hole: + Hole to hole clearance: 0 0 @@ -2091,7 +2674,75 @@ 5 - wxTOP|wxBOTTOM|wxRIGHT + wxEXPAND|wxTOP + 1 + + 0 + protected + 0 + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_bitmapEdgeClearance + 1 + + + protected + 1 + + Resizable + 1 + + ; ; forward_declare + 0 + + + + + + + + 5 + wxTOP|wxBOTTOM|wxRIGHT|wxALIGN_CENTER_VERTICAL 0 1 diff --git a/pcbnew/dialogs/panel_setup_feature_constraints_base.h b/pcbnew/dialogs/panel_setup_feature_constraints_base.h index 33f287d6d5..abe9520a75 100644 --- a/pcbnew/dialogs/panel_setup_feature_constraints_base.h +++ b/pcbnew/dialogs/panel_setup_feature_constraints_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version Jul 10 2019) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -10,17 +10,21 @@ #include #include #include -#include -#include +#include +#include +#include +#include #include #include #include #include +#include +#include +#include #include #include #include #include -#include #include /////////////////////////////////////////////////////////////////////////// @@ -33,7 +37,9 @@ class PANEL_SETUP_FEATURE_CONSTRAINTS_BASE : public wxPanel private: protected: + wxStaticBitmap* m_bitmapBlindBuried; wxCheckBox* m_OptAllowBlindBuriedVias; + wxStaticBitmap* m_bitmap_uVia; wxCheckBox* m_OptAllowMicroVias; wxStaticLine* m_staticline2; wxStaticText* m_stCircleToPolyOpt; @@ -43,26 +49,34 @@ class PANEL_SETUP_FEATURE_CONSTRAINTS_BASE : public wxPanel wxBoxSizer* m_bSizerPolygonFillOption; wxStaticLine* m_staticline1; wxStaticText* m_stZoneFilledPolysOpt; + wxStaticBitmap* m_bitmapZoneFillOpt; wxCheckBox* m_cbOutlinePolygonBestQ; wxCheckBox* m_cbOutlinePolygonFastest; + wxStaticBitmap* m_bitmapMinTrackWidth; wxStaticText* m_TrackMinWidthTitle; wxTextCtrl* m_TrackMinWidthCtrl; wxStaticText* m_TrackMinWidthUnits; + wxStaticBitmap* m_bitmapMinViaDiameter; wxStaticText* m_ViaMinTitle; wxTextCtrl* m_SetViasMinSizeCtrl; wxStaticText* m_ViaMinUnits; + wxStaticBitmap* m_bitmapMinViaDrill; wxStaticText* m_ViaMinDrillTitle; wxTextCtrl* m_SetViasMinDrillCtrl; wxStaticText* m_ViaMinDrillUnits; + wxStaticBitmap* m_bitmapMinuViaDiameter; wxStaticText* m_uviaMinSizeLabel; wxTextCtrl* m_uviaMinSizeCtrl; wxStaticText* m_uviaMinSizeUnits; + wxStaticBitmap* m_bitmapMinuViaDrill; wxStaticText* m_uviaMinDrillLabel; wxTextCtrl* m_uviaMinDrillCtrl; wxStaticText* m_uviaMinDrillUnits; + wxStaticBitmap* m_bitmapMinHoleClearance; wxStaticText* m_HoleToHoleTitle; wxTextCtrl* m_SetHoleToHoleCtrl; wxStaticText* m_HoleToHoleUnits; + wxStaticBitmap* m_bitmapEdgeClearance; wxStaticText* m_EdgeClearanceLabel; wxTextCtrl* m_EdgeClearanceCtrl; wxStaticText* m_EdgeClearanceUnits;