Add a min width parameter to plot solder mask layers.

This commit is contained in:
jean-pierre charras 2012-11-05 21:20:34 +01:00
parent 31e58d87d4
commit 703293fa30
27 changed files with 1581 additions and 325 deletions

View File

@ -427,6 +427,7 @@ set( BMAPS_MID
ortho
pad_sketch
pad
pad_dimensions
pads_mask_layers
palette
part_properties

View File

@ -0,0 +1,84 @@
/* Do not modify this file, it was automatically generated by the
* PNG2cpp CMake script, using a *.png file as input.
*/
#include <bitmaps.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x06, 0x00, 0x00, 0x00, 0xa9, 0x4a, 0x4c,
0xce, 0x00, 0x00, 0x04, 0x35, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x9d, 0x95, 0x5d, 0x6c, 0x14,
0x55, 0x14, 0x80, 0xf7, 0xa7, 0xdd, 0xba, 0x3f, 0x33, 0x73, 0xa7, 0xdb, 0x9d, 0x69, 0xeb, 0x02,
0x16, 0x46, 0xda, 0x6d, 0x67, 0xfb, 0x60, 0x25, 0x14, 0xd1, 0x80, 0x82, 0x46, 0x48, 0x94, 0x46,
0x20, 0x60, 0x10, 0xf4, 0x41, 0x20, 0xfe, 0xbd, 0xc0, 0x83, 0x21, 0x15, 0x53, 0x51, 0xcc, 0x4a,
0xe5, 0xa1, 0x5a, 0x1f, 0xc0, 0x1f, 0x12, 0xb6, 0xc5, 0x62, 0xa4, 0xa0, 0x96, 0x16, 0x52, 0x69,
0x35, 0x8d, 0x60, 0x05, 0x62, 0xa2, 0xa6, 0x31, 0xb1, 0xf2, 0x02, 0xc1, 0x52, 0x35, 0xd2, 0x16,
0x28, 0xd9, 0x4e, 0xe7, 0x78, 0xee, 0xf6, 0x2e, 0xbd, 0xb3, 0x3b, 0xdb, 0xad, 0x4e, 0xf2, 0x3d,
0xec, 0xec, 0xb9, 0xe7, 0xbb, 0xf7, 0xdc, 0x3b, 0xe7, 0x3a, 0x00, 0xc0, 0x41, 0xd1, 0x75, 0xe8,
0x43, 0xda, 0x52, 0xbf, 0x53, 0xe0, 0x23, 0x23, 0x65, 0x36, 0xef, 0xe7, 0x23, 0xa5, 0xe9, 0xef,
0xa3, 0x51, 0x78, 0x19, 0xf3, 0xfc, 0x5a, 0x5d, 0x0d, 0x96, 0x31, 0x0e, 0x4e, 0x34, 0x84, 0x41,
0xdf, 0x73, 0x89, 0x6a, 0x90, 0x8f, 0x91, 0x5b, 0xc8, 0x22, 0x1b, 0x51, 0x05, 0x32, 0x81, 0x7c,
0x8e, 0xac, 0x40, 0x9c, 0x2c, 0x4f, 0x03, 0x02, 0x98, 0xab, 0x22, 0xab, 0x48, 0xd7, 0x8d, 0x1f,
0x70, 0xc0, 0x2e, 0xe4, 0x37, 0x04, 0x18, 0x63, 0xc8, 0x26, 0x8e, 0x67, 0x18, 0x9b, 0x91, 0x61,
0x2e, 0xee, 0x0f, 0x64, 0x7f, 0x24, 0x72, 0x3d, 0x96, 0x53, 0x54, 0x59, 0x39, 0xfa, 0x33, 0x06,
0x9f, 0x43, 0x4c, 0x2e, 0xc1, 0x28, 0xd2, 0x8a, 0xb4, 0x30, 0xe2, 0x8c, 0xc3, 0xc8, 0x5f, 0x5c,
0xdc, 0x24, 0xd2, 0xa7, 0x69, 0xbf, 0x1c, 0xcc, 0x29, 0x4a, 0x95, 0x0e, 0x9f, 0xbb, 0x91, 0x37,
0x90, 0xab, 0x2c, 0xc9, 0x02, 0x9b, 0xd2, 0xa9, 0x6c, 0x42, 0x97, 0x91, 0xd7, 0xe8, 0xef, 0x59,
0x97, 0x8e, 0xdf, 0x23, 0x96, 0x2c, 0x1f, 0x59, 0x8f, 0x3c, 0xc4, 0xbd, 0x73, 0x32, 0xee, 0x47,
0xd6, 0x21, 0x79, 0xfc, 0x98, 0xff, 0x25, 0xa2, 0xa8, 0xa7, 0x03, 0x8a, 0xd2, 0x43, 0xb6, 0x28,
0x3d, 0xf2, 0x07, 0xc8, 0x45, 0xe5, 0x0c, 0xe9, 0x0f, 0x9d, 0x92, 0x9b, 0x43, 0x5f, 0x90, 0x67,
0x7d, 0x7b, 0x7d, 0x25, 0x28, 0xf2, 0x20, 0xee, 0xff, 0x74, 0x18, 0xd2, 0x45, 0x6a, 0xaf, 0xbc,
0x51, 0xf9, 0x46, 0xfe, 0x5b, 0xe9, 0x95, 0x41, 0xed, 0x91, 0xa1, 0xe6, 0xa8, 0x0c, 0xd5, 0xc7,
0x08, 0xd0, 0xdf, 0x49, 0xba, 0xc9, 0xb0, 0xb4, 0x5f, 0xd8, 0x8a, 0x92, 0x62, 0xc4, 0x47, 0x85,
0xba, 0x6e, 0xce, 0x5e, 0xe4, 0xf8, 0xcc, 0xe1, 0x0e, 0xf5, 0xca, 0x6d, 0x34, 0xd9, 0xb2, 0x43,
0x04, 0x3a, 0x57, 0x0a, 0x70, 0x5d, 0x0d, 0x00, 0x04, 0xa6, 0xb8, 0x36, 0x47, 0x80, 0xd6, 0x3a,
0x11, 0xa2, 0x4c, 0x5a, 0x78, 0x48, 0x3c, 0x85, 0xeb, 0x8a, 0xa2, 0x28, 0x58, 0x55, 0x95, 0xd8,
0x33, 0x6b, 0x11, 0x96, 0xea, 0x75, 0x9a, 0xa0, 0x7e, 0x87, 0x04, 0x09, 0x32, 0x2d, 0x48, 0xe7,
0x9f, 0xe2, 0x00, 0x6c, 0xda, 0x37, 0x25, 0x13, 0x77, 0xfb, 0x3f, 0x45, 0xd1, 0xd2, 0x8a, 0x8a,
0xe1, 0x46, 0x2a, 0xd2, 0xf5, 0x44, 0x64, 0x46, 0x91, 0xda, 0x13, 0x5c, 0x8c, 0x03, 0x27, 0x36,
0xbf, 0x43, 0xb2, 0x0a, 0x78, 0xe8, 0x44, 0x1e, 0x3c, 0x4c, 0x20, 0xd4, 0x4d, 0x8c, 0x82, 0xa5,
0x9e, 0x7d, 0x9a, 0xf6, 0xe3, 0x27, 0x54, 0x14, 0x89, 0xfc, 0x59, 0x95, 0xda, 0x37, 0x5b, 0x11,
0x96, 0xac, 0xb7, 0xac, 0x4b, 0x4e, 0x96, 0x87, 0x4f, 0x38, 0xae, 0x14, 0x9a, 0x23, 0x6b, 0xd7,
0x4c, 0x8c, 0xae, 0x7a, 0xcc, 0x30, 0x88, 0x64, 0xf9, 0xaf, 0x7f, 0x91, 0x90, 0x5c, 0x15, 0x69,
0x12, 0x06, 0xe7, 0xcd, 0x3b, 0xd9, 0x41, 0x45, 0x9a, 0x76, 0xe1, 0xbe, 0xac, 0x22, 0x3d, 0x6a,
0xf6, 0xe3, 0x80, 0xb1, 0xad, 0x6f, 0x5a, 0x13, 0x8d, 0x94, 0x97, 0x19, 0x30, 0x34, 0x04, 0x77,
0x9e, 0x81, 0x01, 0xb8, 0xad, 0x16, 0x99, 0x7c, 0xcc, 0x03, 0x2d, 0x04, 0x8a, 0x8e, 0x93, 0x5b,
0xe1, 0x70, 0xeb, 0x59, 0x2a, 0x0a, 0x87, 0xe3, 0xcb, 0xf8, 0xa3, 0x6f, 0x15, 0xd5, 0xdc, 0xf8,
0x89, 0xce, 0xac, 0xe9, 0x39, 0xd1, 0x22, 0x32, 0xbb, 0xba, 0x20, 0xfd, 0x99, 0x8c, 0xc5, 0x2c,
0xa2, 0x97, 0x76, 0x4b, 0xc9, 0x55, 0x85, 0xcb, 0x0f, 0x0e, 0x50, 0x91, 0xaa, 0xbe, 0xf5, 0x04,
0x8a, 0xee, 0x4a, 0xad, 0x8a, 0x17, 0xf5, 0x45, 0x96, 0x5f, 0xea, 0xa3, 0xc1, 0x47, 0xea, 0xac,
0x65, 0x83, 0xc1, 0xc1, 0x0c, 0x11, 0xb4, 0xb7, 0x5b, 0x62, 0xf6, 0xbc, 0x32, 0x25, 0x92, 0x96,
0x2c, 0xbf, 0x58, 0x52, 0xd2, 0x78, 0xc2, 0xef, 0xaf, 0x7d, 0x14, 0x25, 0x42, 0x86, 0x88, 0x52,
0xda, 0x2d, 0xcf, 0xa5, 0xc1, 0x7b, 0x5f, 0xb4, 0x96, 0x6e, 0xbc, 0xf9, 0xfd, 0xc9, 0x74, 0xcf,
0xf8, 0xf6, 0x6d, 0x06, 0x1f, 0xb3, 0x25, 0x96, 0x3c, 0x7d, 0xa6, 0x53, 0x74, 0x7e, 0x85, 0xc9,
0x63, 0xc8, 0xc3, 0xec, 0x8a, 0x71, 0x65, 0x88, 0xa8, 0x1d, 0x83, 0xaf, 0x3e, 0xd5, 0x64, 0x3d,
0x71, 0x37, 0x54, 0xd9, 0x9c, 0xe8, 0xe8, 0x30, 0x93, 0x06, 0xc3, 0x80, 0x44, 0x73, 0xf3, 0xa4,
0x29, 0x4c, 0xaf, 0xda, 0x10, 0x03, 0x50, 0x79, 0x42, 0x86, 0x60, 0x8b, 0x34, 0x82, 0x39, 0xda,
0x91, 0xb7, 0x11, 0xba, 0x47, 0x52, 0x76, 0xd1, 0x19, 0x39, 0x4e, 0xbb, 0xc0, 0x85, 0x1a, 0x21,
0xe3, 0x28, 0x8f, 0x17, 0x17, 0x99, 0x89, 0x20, 0x31, 0xd3, 0xdf, 0xc7, 0xd7, 0x8a, 0x53, 0xdf,
0xd2, 0xab, 0xbe, 0x4b, 0x98, 0xe3, 0x28, 0x52, 0xcf, 0x7a, 0xa1, 0xcf, 0xb6, 0x74, 0xc9, 0x8f,
0xf5, 0x43, 0xbf, 0xaa, 0x7c, 0x4d, 0xae, 0x2d, 0x69, 0x25, 0x70, 0x33, 0x98, 0xfb, 0x3b, 0xba,
0x52, 0x26, 0x80, 0x76, 0x52, 0x86, 0xa2, 0x63, 0xe4, 0x26, 0x96, 0xad, 0x13, 0x13, 0x7f, 0x84,
0x3c, 0x8f, 0xdc, 0xcb, 0xfa, 0xa0, 0xbd, 0x88, 0xfe, 0x11, 0x3c, 0x42, 0xea, 0x68, 0xbd, 0x1f,
0x3f, 0x40, 0x60, 0x70, 0xa1, 0x90, 0x55, 0x72, 0x76, 0xb1, 0x90, 0xec, 0x7f, 0xd8, 0x6c, 0x4d,
0x4f, 0x6d, 0xfe, 0x77, 0x38, 0x96, 0x76, 0x87, 0x06, 0x76, 0xe3, 0x86, 0x68, 0xef, 0xcb, 0x38,
0xde, 0x69, 0xd7, 0x40, 0x5e, 0x30, 0x2e, 0xbd, 0xa0, 0x74, 0xcb, 0x63, 0x73, 0x4e, 0x13, 0xd8,
0xb5, 0x53, 0x82, 0xae, 0x15, 0x02, 0x5c, 0x9e, 0x2f, 0xc0, 0xef, 0x0b, 0x03, 0x70, 0x7c, 0xb5,
0x08, 0xdb, 0x1b, 0xa4, 0x64, 0xa3, 0x0d, 0x7d, 0x29, 0xdd, 0xf6, 0xae, 0xf2, 0x9c, 0x67, 0x25,
0x7b, 0x17, 0xd9, 0x40, 0xef, 0x2f, 0xfe, 0x68, 0xdb, 0x8a, 0x38, 0x99, 0xd7, 0xbb, 0xc1, 0x5b,
0x1b, 0x6c, 0x93, 0xce, 0xd3, 0xd5, 0xdd, 0xe9, 0xd8, 0xd3, 0x98, 0xa4, 0x31, 0x70, 0xc5, 0x5d,
0xe8, 0xec, 0x60, 0x37, 0x6e, 0x8c, 0x5d, 0xf1, 0x3a, 0x3b, 0xd6, 0x2e, 0xdb, 0x5e, 0x97, 0x45,
0x46, 0x37, 0xf3, 0x1e, 0xb7, 0xe6, 0x7e, 0xd2, 0xf7, 0xb4, 0xf7, 0x3d, 0xa9, 0xde, 0xff, 0xad,
0xb0, 0xc3, 0x77, 0xae, 0xe0, 0x11, 0x4f, 0xa7, 0x4b, 0x70, 0xd1, 0xe4, 0x07, 0xd8, 0x2a, 0x76,
0x22, 0xf4, 0x03, 0x2d, 0x47, 0x44, 0xfe, 0x7e, 0xca, 0x29, 0xe2, 0x64, 0x05, 0xac, 0xde, 0x74,
0xa6, 0x2b, 0x91, 0x8d, 0x6c, 0xb3, 0xb7, 0xb1, 0x15, 0xac, 0x46, 0x68, 0x5f, 0x2b, 0x65, 0x13,
0x73, 0xd9, 0xe6, 0x9a, 0x49, 0xc4, 0xef, 0x19, 0x2d, 0x25, 0xbd, 0x6f, 0x90, 0x30, 0xdb, 0x03,
0x0d, 0x99, 0xcb, 0x26, 0xe1, 0x67, 0x31, 0xce, 0xac, 0x79, 0x72, 0x89, 0xd2, 0x84, 0x2e, 0x96,
0x30, 0x9f, 0x91, 0x97, 0x2a, 0xd3, 0x4c, 0x12, 0xca, 0xbf, 0x3d, 0x4e, 0xfc, 0x16, 0xbb, 0x02,
0x66, 0x2a, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
};
const BITMAP_OPAQUE pad_dimensions_xpm[1] = {{ png, sizeof( png ), "pad_dimensions_xpm" }};
//EOF

View File

@ -0,0 +1,247 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
height="48"
width="48"
version="1.1"
id="svg3054"
inkscape:version="0.48.2 r9819"
sodipodi:docname="pad.svg">
<metadata
id="metadata3081">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="879"
inkscape:window-height="789"
id="namedview3079"
showgrid="false"
inkscape:zoom="4.9166667"
inkscape:cx="25.116"
inkscape:cy="26.510998"
inkscape:window-x="219"
inkscape:window-y="76"
inkscape:window-maximized="0"
inkscape:current-layer="svg3054" />
<defs
id="defs3056">
<filter
id="a"
height="1.2769"
width="1.2769"
color-interpolation-filters="sRGB"
y="-.13847"
x="-.13847">
<feGaussianBlur
stdDeviation="0.11539203"
id="feGaussianBlur3059" />
</filter>
<filter
color-interpolation-filters="sRGB"
inkscape:collect="always"
id="filter3879">
<feGaussianBlur
inkscape:collect="always"
stdDeviation="0.24369333"
id="feGaussianBlur3881" />
</filter>
<marker
id="h"
refY="0"
refX="0"
overflow="visible"
orient="auto"
style="overflow:visible">
<path
d="M 8.7186,4.0337 -2.2074,0.016 8.7186,-4.0017 c -1.7455,2.3721 -1.7354,5.6175 -6e-7,8.0354 z"
transform="scale(0.6,0.6)"
id="path10"
inkscape:connector-curvature="0"
style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round" />
</marker>
<marker
id="g"
refY="0"
refX="0"
overflow="visible"
orient="auto"
style="overflow:visible">
<path
d="M 8.7186,4.0337 -2.2074,0.016 8.7186,-4.0017 c -1.7455,2.3721 -1.7354,5.6175 -6e-7,8.0354 z"
transform="scale(-0.6,-0.6)"
id="path13"
inkscape:connector-curvature="0"
style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round" />
</marker>
<filter
color-interpolation-filters="sRGB"
inkscape:collect="always"
id="filter3879-1">
<feGaussianBlur
inkscape:collect="always"
stdDeviation="0.24369333"
id="feGaussianBlur3881-7" />
</filter>
<marker
id="h-4"
refY="0"
refX="0"
overflow="visible"
orient="auto"
style="overflow:visible">
<path
d="M 8.7186,4.0337 -2.2074,0.016 8.7186,-4.0017 c -1.7455,2.3721 -1.7354,5.6175 -6e-7,8.0354 z"
transform="scale(0.6,0.6)"
id="path10-0"
inkscape:connector-curvature="0"
style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round" />
</marker>
<marker
id="g-9"
refY="0"
refX="0"
overflow="visible"
orient="auto"
style="overflow:visible">
<path
d="M 8.7186,4.0337 -2.2074,0.016 8.7186,-4.0017 c -1.7455,2.3721 -1.7354,5.6175 -6e-7,8.0354 z"
transform="scale(-0.6,-0.6)"
id="path13-4"
inkscape:connector-curvature="0"
style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round" />
</marker>
<marker
id="marker4760"
refY="0"
refX="0"
overflow="visible"
orient="auto"
style="overflow:visible">
<path
d="M 8.7186,4.0337 -2.2074,0.016 8.7186,-4.0017 c -1.7455,2.3721 -1.7354,5.6175 -6e-7,8.0354 z"
transform="scale(0.6,0.6)"
id="path4762"
inkscape:connector-curvature="0"
style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round" />
</marker>
<marker
id="marker4764"
refY="0"
refX="0"
overflow="visible"
orient="auto"
style="overflow:visible">
<path
d="M 8.7186,4.0337 -2.2074,0.016 8.7186,-4.0017 c -1.7455,2.3721 -1.7354,5.6175 -6e-7,8.0354 z"
transform="scale(-0.6,-0.6)"
id="path4766"
inkscape:connector-curvature="0"
style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round" />
</marker>
</defs>
<g
transform="matrix(1.286,0,0,1.2826,58.06922,-14.528373)"
id="g3061">
<g
transform="matrix(11.8,0,0,11.536,-260.89,-12.073)"
id="g3063"
style="opacity:0.71875;filter:url(#a)">
<path
d="m -15.125,8.9375 a 0.90625,0.9375 0 1 1 -1.8125,0 0.90625,0.9375 0 1 1 1.8125,0 z"
transform="matrix(1.1034,0,-2.1667e-7,1.0667,37.69,-5.5333)"
id="path3065"
inkscape:connector-curvature="0"
style="fill-rule:evenodd" />
</g>
<path
d="m -15.125,8.9375 a 0.90625,0.9375 0 1 1 -1.8125,0 0.90625,0.9375 0 1 1 1.8125,0 z"
transform="matrix(9.1879,0,-1.8041e-6,8.7704,119.31,-46.412)"
id="path3067"
inkscape:connector-curvature="0"
style="fill:none;stroke:#16bf11;stroke-width:0.79392999" />
<g
transform="matrix(4.6582,0,0,4.6768,-121.15,13.266)"
id="g3069"
style="fill:#ffffff">
<path
d="m -15.125,8.9375 a 0.90625,0.9375 0 1 1 -1.8125,0 0.90625,0.9375 0 1 1 1.8125,0 z"
transform="matrix(1.1034,0,-2.1667e-7,1.0667,37.69,-5.5333)"
id="path3071"
inkscape:connector-curvature="0"
style="fill:#ffffff;fill-rule:evenodd" />
</g>
</g>
<g
transform="matrix(3.3534,0,0,2.4765,-1.5227797,14.344627)"
id="g3073">
<rect
height="16"
width="16"
y="0"
x="0"
id="rect3075"
style="fill-opacity:0" />
</g>
<path
d="m 30.69521,26.522581 a 8.707635,8.658066 0 0 1 -17.41527,0 8.707635,8.658066 0 1 1 17.41527,0 z"
id="path3077"
inkscape:connector-curvature="0"
style="fill:none;stroke:#ff0c0c;stroke-width:6.90841627;stroke-linejoin:round" />
<g
id="g4856"
transform="matrix(1,0,0,1.1269296,0,-3.477462)">
<path
d="M 8.3115104,8.2557245 36.075414,8.1934141"
id="path44"
style="fill:none;stroke:#000000;stroke-width:1.75850904px;marker-start:url(#h);marker-end:url(#g)"
inkscape:connector-curvature="0" />
<rect
height="24.035736"
width="3.0803609"
y="3.3610315"
x="3.8921013"
id="rect46"
style="fill:#2c2cff;fill-opacity:1" />
<rect
transform="scale(-1,1)"
height="23.291401"
width="3.0848782"
y="3.3610315"
x="-40.90612"
id="rect48"
style="fill:#2c2cff;fill-opacity:1" />
</g>
<g
id="g50"
transform="matrix(1.6262979,0,0,1.2104957,-29.057051,-8.38233)">
<rect
style="fill-opacity:0"
id="rect52"
x="0"
y="0"
width="16"
height="16" />
</g>
</svg>

After

Width:  |  Height:  |  Size: 7.4 KiB

View File

@ -119,6 +119,7 @@ pads
pad_drill
pad_size
pad_to_mask_clearance
solder_mask_min_width
pad_to_paste_clearance
pad_to_paste_clearance_ratio
page

View File

@ -351,6 +351,7 @@ EXTERN_BITMAP( opt_show_polygon_xpm )
EXTERN_BITMAP( orient_xpm )
EXTERN_BITMAP( pad_sketch_xpm )
EXTERN_BITMAP( pad_xpm )
EXTERN_BITMAP( pad_dimensions_xpm )
EXTERN_BITMAP( pads_mask_layers_xpm )
EXTERN_BITMAP( palette_xpm )
EXTERN_BITMAP( part_properties_xpm )

View File

@ -34,6 +34,9 @@ public:
// Global mask margins:
int m_SolderMaskMargin; ///< Solder mask margin
int m_SolderMaskMinWidth; ///< Solder mask min width
// 2 areas near than m_SolderMaskMinWidth
// are merged
int m_SolderPasteMargin; ///< Solder paste margin absolute value
double m_SolderPasteMarginRatio; ///< Solder pask margin ratio value of pad size
///< The final margin is the sum of these 2 values

View File

@ -25,6 +25,7 @@
#define DEFAULT_GR_MODULE_THICKNESS Millimeter2iu( 0.15 )
#define DEFAULT_SOLDERMASK_CLEARANCE Millimeter2iu( 0.1 )
#define DEFAULT_SOLDERMASK_MIN_WIDTH Millimeter2iu( 0.0 )
BOARD_DESIGN_SETTINGS::BOARD_DESIGN_SETTINGS() :
@ -63,7 +64,8 @@ BOARD_DESIGN_SETTINGS::BOARD_DESIGN_SETTINGS() :
m_MicroViasMinDrill = DMils2iu( 50 ); // micro vias (not vias) min drill diameter
// Global mask margins:
m_SolderMaskMargin = DEFAULT_SOLDERMASK_CLEARANCE; // Solder mask margin
m_SolderMaskMargin = DEFAULT_SOLDERMASK_CLEARANCE; // Solder mask margin
m_SolderMaskMinWidth = DEFAULT_SOLDERMASK_MIN_WIDTH; // Solder mask min width
m_SolderPasteMargin = 0; // Solder paste margin absolute value
m_SolderPasteMarginRatio = 0.0; // Solder pask margin ratio value of pad size
// The final margin is the sum of these 2 values
@ -120,6 +122,11 @@ void BOARD_DESIGN_SETTINGS::AppendConfigs( PARAM_CFG_ARRAY* aResult )
DEFAULT_SOLDERMASK_CLEARANCE, 0, Millimeter2iu( 1.0 ),
NULL, MM_PER_IU ) );
aResult->push_back( new PARAM_CFG_INT_WITH_SCALE( wxT( "SolderMaskMinWidth" ),
&m_SolderMaskMinWidth,
DEFAULT_SOLDERMASK_MIN_WIDTH, 0, Millimeter2iu( 0.5 ),
NULL, MM_PER_IU ) );
aResult->push_back( new PARAM_CFG_INT_WITH_SCALE( wxT( "DrawSegmentWidth" ),
&m_DrawSegmentWidth,
DEFAULT_GRAPHIC_THICKNESS,

View File

@ -43,38 +43,40 @@
DIALOG_PADS_MASK_CLEARANCE::DIALOG_PADS_MASK_CLEARANCE( PCB_EDIT_FRAME* aParent ) :
DIALOG_PADS_MASK_CLEARANCE_BASE( aParent )
{
m_Parent = aParent;
m_BrdSettings = m_Parent->GetBoard()->GetDesignSettings();
m_parent = aParent;
m_brdSettings = m_parent->GetBoard()->GetDesignSettings();
MyInit();
myInit();
m_sdbButtonsSizerOK->SetDefault();
GetSizer()->SetSizeHints( this );
Centre();
}
void DIALOG_PADS_MASK_CLEARANCE::MyInit()
void DIALOG_PADS_MASK_CLEARANCE::myInit()
{
SetFocus();
m_SolderMaskMarginUnits->SetLabel( GetUnitsLabel( g_UserUnit ) );
m_solderMaskMinWidthUnit->SetLabel( GetUnitsLabel( g_UserUnit ) );
m_SolderPasteMarginUnits->SetLabel( GetUnitsLabel( g_UserUnit ) );
PutValueInLocalUnits( *m_SolderMaskMarginCtrl, m_BrdSettings.m_SolderMaskMargin );
PutValueInLocalUnits( *m_SolderMaskMarginCtrl, m_brdSettings.m_SolderMaskMargin );
PutValueInLocalUnits( *m_SolderMaskMinWidthCtrl, m_brdSettings.m_SolderMaskMinWidth );
// These 2 parameters are usually < 0, so prepare entering a negative
// value, if current is 0
PutValueInLocalUnits( *m_SolderPasteMarginCtrl, m_BrdSettings.m_SolderPasteMargin );
PutValueInLocalUnits( *m_SolderPasteMarginCtrl, m_brdSettings.m_SolderPasteMargin );
if( m_BrdSettings.m_SolderPasteMargin == 0 )
if( m_brdSettings.m_SolderPasteMargin == 0 )
m_SolderPasteMarginCtrl->SetValue( wxT( "-" ) +
m_SolderPasteMarginCtrl->GetValue() );
wxString msg;
msg.Printf( wxT( "%f" ), m_BrdSettings.m_SolderPasteMarginRatio * 100.0 );
msg.Printf( wxT( "%f" ), m_brdSettings.m_SolderPasteMarginRatio * 100.0 );
// Sometimes Printf adds a sign if the value is small
if( m_BrdSettings.m_SolderPasteMarginRatio == 0.0 && msg[0] == '0' )
if( m_brdSettings.m_SolderPasteMarginRatio == 0.0 && msg[0] == '0' )
m_SolderPasteMarginRatioCtrl->SetValue( wxT( "-" ) + msg );
else
m_SolderPasteMarginRatioCtrl->SetValue( msg );
@ -83,9 +85,10 @@ void DIALOG_PADS_MASK_CLEARANCE::MyInit()
void DIALOG_PADS_MASK_CLEARANCE::OnButtonOkClick( wxCommandEvent& event )
{
m_BrdSettings.m_SolderMaskMargin = ReturnValueFromTextCtrl( *m_SolderMaskMarginCtrl );
m_brdSettings.m_SolderMaskMargin = ReturnValueFromTextCtrl( *m_SolderMaskMarginCtrl );
m_brdSettings.m_SolderMaskMinWidth = ReturnValueFromTextCtrl( *m_SolderMaskMinWidthCtrl );
m_BrdSettings.m_SolderPasteMargin = ReturnValueFromTextCtrl( *m_SolderPasteMarginCtrl );
m_brdSettings.m_SolderPasteMargin = ReturnValueFromTextCtrl( *m_SolderPasteMarginCtrl );
double dtmp = 0;
wxString msg = m_SolderPasteMarginRatioCtrl->GetValue();
@ -99,9 +102,11 @@ void DIALOG_PADS_MASK_CLEARANCE::OnButtonOkClick( wxCommandEvent& event )
if( dtmp > +100 )
dtmp = +100;
m_BrdSettings.m_SolderPasteMarginRatio = dtmp / 100;
m_brdSettings.m_SolderPasteMarginRatio = dtmp / 100;
m_Parent->GetBoard()->SetDesignSettings( m_BrdSettings );
m_parent->OnModify();
m_parent->GetBoard()->SetDesignSettings( m_brdSettings );
EndModal( 1 );
}

View File

@ -19,14 +19,14 @@
class DIALOG_PADS_MASK_CLEARANCE : public DIALOG_PADS_MASK_CLEARANCE_BASE
{
private:
PCB_EDIT_FRAME* m_Parent;
BOARD_DESIGN_SETTINGS m_BrdSettings;
PCB_EDIT_FRAME* m_parent;
BOARD_DESIGN_SETTINGS m_brdSettings;
public:
DIALOG_PADS_MASK_CLEARANCE( PCB_EDIT_FRAME* parent );
~DIALOG_PADS_MASK_CLEARANCE() {};
private:
void MyInit();
void myInit();
virtual void OnButtonOkClick( wxCommandEvent& event );
virtual void OnButtonCancelClick( wxCommandEvent& event );
};

View File

@ -27,7 +27,7 @@ DIALOG_PADS_MASK_CLEARANCE_BASE::DIALOG_PADS_MASK_CLEARANCE_BASE( wxWindow* pare
wxStaticBoxSizer* sbMiddleRightSizer;
sbMiddleRightSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Dimensions:") ), wxVERTICAL );
m_staticTextInfo = new wxStaticText( this, wxID_ANY, _("Note:\n- a positive value means a mask bigger than a pad\n- a negative value means a mask smaller than a pad\n"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextInfo = new wxStaticText( this, wxID_ANY, _("Note: For clearance values:\n- a positive value means a mask bigger than a pad\n- a negative value means a mask smaller than a pad\n"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextInfo->Wrap( -1 );
sbMiddleRightSizer->Add( m_staticTextInfo, 0, wxALIGN_CENTER_HORIZONTAL|wxRIGHT|wxLEFT, 5 );
@ -35,7 +35,7 @@ DIALOG_PADS_MASK_CLEARANCE_BASE::DIALOG_PADS_MASK_CLEARANCE_BASE( wxWindow* pare
sbMiddleRightSizer->Add( m_staticline1, 0, wxEXPAND | wxALL, 5 );
wxFlexGridSizer* fgGridSolderMaskSizer;
fgGridSolderMaskSizer = new wxFlexGridSizer( 2, 3, 0, 0 );
fgGridSolderMaskSizer = new wxFlexGridSizer( 4, 3, 0, 0 );
fgGridSolderMaskSizer->SetFlexibleDirection( wxBOTH );
fgGridSolderMaskSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
@ -46,11 +46,11 @@ DIALOG_PADS_MASK_CLEARANCE_BASE::DIALOG_PADS_MASK_CLEARANCE_BASE( wxWindow* pare
fgGridSolderMaskSizer->Add( m_MaskClearanceTitle, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
m_SolderMaskMarginCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
fgGridSolderMaskSizer->Add( m_SolderMaskMarginCtrl, 0, wxEXPAND|wxALL, 5 );
fgGridSolderMaskSizer->Add( m_SolderMaskMarginCtrl, 0, wxEXPAND|wxALL|wxALIGN_CENTER_VERTICAL, 5 );
m_SolderMaskMarginUnits = new wxStaticText( this, wxID_ANY, _("Inch"), wxDefaultPosition, wxDefaultSize, 0 );
m_SolderMaskMarginUnits->Wrap( -1 );
fgGridSolderMaskSizer->Add( m_SolderMaskMarginUnits, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 );
fgGridSolderMaskSizer->Add( m_SolderMaskMarginUnits, 0, wxTOP|wxBOTTOM|wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
m_staticTextSolderPaste = new wxStaticText( this, wxID_ANY, _("Solder paste clearance:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextSolderPaste->Wrap( -1 );
@ -59,11 +59,11 @@ DIALOG_PADS_MASK_CLEARANCE_BASE::DIALOG_PADS_MASK_CLEARANCE_BASE( wxWindow* pare
fgGridSolderMaskSizer->Add( m_staticTextSolderPaste, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
m_SolderPasteMarginCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
fgGridSolderMaskSizer->Add( m_SolderPasteMarginCtrl, 0, wxALL, 5 );
fgGridSolderMaskSizer->Add( m_SolderPasteMarginCtrl, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
m_SolderPasteMarginUnits = new wxStaticText( this, wxID_ANY, _("Inch"), wxDefaultPosition, wxDefaultSize, 0 );
m_SolderPasteMarginUnits->Wrap( -1 );
fgGridSolderMaskSizer->Add( m_SolderPasteMarginUnits, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 );
fgGridSolderMaskSizer->Add( m_SolderPasteMarginUnits, 0, wxTOP|wxBOTTOM|wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
m_staticTextRatio = new wxStaticText( this, wxID_ANY, _("Solder mask ratio clearance:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextRatio->Wrap( -1 );
@ -72,11 +72,33 @@ DIALOG_PADS_MASK_CLEARANCE_BASE::DIALOG_PADS_MASK_CLEARANCE_BASE( wxWindow* pare
fgGridSolderMaskSizer->Add( m_staticTextRatio, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
m_SolderPasteMarginRatioCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
fgGridSolderMaskSizer->Add( m_SolderPasteMarginRatioCtrl, 0, wxALL, 5 );
fgGridSolderMaskSizer->Add( m_SolderPasteMarginRatioCtrl, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
m_SolderPasteRatioMarginUnits = new wxStaticText( this, wxID_ANY, _("%"), wxDefaultPosition, wxDefaultSize, 0 );
m_SolderPasteRatioMarginUnits->Wrap( -1 );
fgGridSolderMaskSizer->Add( m_SolderPasteRatioMarginUnits, 0, wxTOP|wxBOTTOM|wxRIGHT, 5 );
fgGridSolderMaskSizer->Add( m_SolderPasteRatioMarginUnits, 0, wxTOP|wxBOTTOM|wxRIGHT|wxALIGN_CENTER_VERTICAL, 5 );
m_staticline3 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
fgGridSolderMaskSizer->Add( m_staticline3, 0, wxEXPAND | wxALL, 5 );
m_staticline4 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
fgGridSolderMaskSizer->Add( m_staticline4, 0, wxEXPAND | wxALL, 5 );
m_staticline5 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
fgGridSolderMaskSizer->Add( m_staticline5, 0, wxEXPAND | wxALL, 5 );
m_staticTextMinWidth = new wxStaticText( this, wxID_ANY, _("Solder mask min width:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticTextMinWidth->Wrap( -1 );
m_staticTextMinWidth->SetToolTip( _("Min dist between 2 pad areas.\nTwo pad areas nearer than this value will be merged during plotting.\nThis parameter is used only to plot solder mask layers.") );
fgGridSolderMaskSizer->Add( m_staticTextMinWidth, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
m_SolderMaskMinWidthCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
fgGridSolderMaskSizer->Add( m_SolderMaskMinWidthCtrl, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
m_solderMaskMinWidthUnit = new wxStaticText( this, wxID_ANY, _("Inch"), wxDefaultPosition, wxDefaultSize, 0 );
m_solderMaskMinWidthUnit->Wrap( -1 );
fgGridSolderMaskSizer->Add( m_solderMaskMinWidthUnit, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxRIGHT, 5 );
sbMiddleRightSizer->Add( fgGridSolderMaskSizer, 1, wxEXPAND, 5 );

View File

@ -42,7 +42,7 @@
<property name="minimum_size"></property>
<property name="name">DIALOG_PADS_MASK_CLEARANCE_BASE</property>
<property name="pos"></property>
<property name="size">361,253</property>
<property name="size">361,292</property>
<property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>
<property name="subclass">DIALOG_SHIM; dialog_shim.h</property>
<property name="title">Pads Mask Clearance</property>
@ -144,7 +144,7 @@
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Note:&#x0A;- a positive value means a mask bigger than a pad&#x0A;- a negative value means a mask smaller than a pad&#x0A;</property>
<property name="label">Note: For clearance values:&#x0A;- a positive value means a mask bigger than a pad&#x0A;- a negative value means a mask smaller than a pad&#x0A;</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
@ -290,7 +290,7 @@
<property name="name">fgGridSolderMaskSizer</property>
<property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
<property name="permission">none</property>
<property name="rows">2</property>
<property name="rows">4</property>
<property name="vgap">0</property>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
@ -377,7 +377,7 @@
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxEXPAND|wxALL</property>
<property name="flag">wxEXPAND|wxALL|wxALIGN_CENTER_VERTICAL</property>
<property name="proportion">0</property>
<object class="wxTextCtrl" expanded="1">
<property name="BottomDockable">1</property>
@ -468,7 +468,7 @@
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxTOP|wxBOTTOM|wxRIGHT</property>
<property name="flag">wxTOP|wxBOTTOM|wxRIGHT|wxALIGN_CENTER_VERTICAL</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="1">
<property name="BottomDockable">1</property>
@ -634,7 +634,7 @@
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL</property>
<property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property>
<property name="proportion">0</property>
<object class="wxTextCtrl" expanded="1">
<property name="BottomDockable">1</property>
@ -725,7 +725,7 @@
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxTOP|wxBOTTOM|wxRIGHT</property>
<property name="flag">wxTOP|wxBOTTOM|wxRIGHT|wxALIGN_CENTER_VERTICAL</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="1">
<property name="BottomDockable">1</property>
@ -891,7 +891,7 @@
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL</property>
<property name="flag">wxALL|wxALIGN_CENTER_VERTICAL</property>
<property name="proportion">0</property>
<object class="wxTextCtrl" expanded="1">
<property name="BottomDockable">1</property>
@ -982,7 +982,7 @@
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxTOP|wxBOTTOM|wxRIGHT</property>
<property name="flag">wxTOP|wxBOTTOM|wxRIGHT|wxALIGN_CENTER_VERTICAL</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="1">
<property name="BottomDockable">1</property>