haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add Assembly pcbview to pcb_layer_widget

This commit is contained in:
Stefan 2020-05-22 20:40:53 +00:00 committed by Jon Evans
parent a6ec225f43
commit 7e6b2211e0
8 changed files with 364 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bitmaps_png/CMakeLists.txt
View File

@ -1,4 +1,3 @@
# This program source code file is part of KICAD, a free EDA CAD application.
#
# Copyright (C) 2011 SoftPLC Corporation, Dick Hollenbeck <dick@softplc.com>
@ -449,6 +448,7 @@ set( BMAPS_MID
select_w_layer
select_same_sheet
shape_3d
shape_3d_back
sheetset
simulator
sim_run

36
bitmaps_png/cpp_26/shape_3d_back.cpp Normal file
View File

@ -0,0 +1,36 @@
/* Do not modify this file, it was automatically generated by the
* PNG2cpp CMake script, using a *.png file as input.
*/
#include <bitmaps_png/bitmaps_list.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, 0x01, 0x35, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xed, 0x95, 0x4b, 0x6a, 0x84,
0x40, 0x10, 0x86, 0xbb, 0xf1, 0xd5, 0x6a, 0xe6, 0x02, 0x9e, 0x22, 0xe0, 0x05, 0x66, 0x93, 0x85,
0xa0, 0x73, 0x0c, 0xcf, 0x30, 0xbb, 0xcc, 0x36, 0x47, 0xf0, 0x04, 0xd9, 0x47, 0x21, 0x8b, 0x6c,
0x72, 0x80, 0x11, 0x72, 0x0a, 0x2f, 0x90, 0xa8, 0xed, 0x2b, 0xa6, 0xaa, 0xc1, 0x20, 0x3a, 0x84,
0x9e, 0xc5, 0x98, 0x49, 0xf0, 0x87, 0x9f, 0xbf, 0xc0, 0xc7, 0xd7, 0x65, 0x4b, 0x17, 0x25, 0x0b,
0x89, 0x4a, 0xde, 0xd7, 0xff, 0x70, 0x6f, 0x2f, 0xf3, 0x9e, 0xeb, 0x01, 0x45, 0x51, 0x74, 0x80,
0xb8, 0xa7, 0x94, 0x3e, 0x84, 0x61, 0xb8, 0x97, 0xbd, 0x36, 0x07, 0x1d, 0xc4, 0x8a, 0x2e, 0xbf,
0x47, 0xde, 0xa3, 0xf7, 0xcf, 0x40, 0x8b, 0x7d, 0xba, 0x5f, 0xfd, 0xeb, 0x82, 0x20, 0x78, 0x57,
0x14, 0xe5, 0x46, 0x55, 0x55, 0x02, 0x49, 0x86, 0xd4, 0x34, 0x4d, 0x24, 0xaa, 0xeb, 0x3a, 0xd2,
0x34, 0x8d, 0xc8, 0xb6, 0x6d, 0xc7, 0xf9, 0x11, 0xc7, 0xf1, 0x46, 0x16, 0xd4, 0x33, 0xc6, 0x88,
0x61, 0x18, 0x04, 0x73, 0x5a, 0xa3, 0x38, 0xe7, 0xc2, 0x55, 0x55, 0xcd, 0x6a, 0x00, 0x51, 0x29,
0x90, 0xeb, 0xba, 0x47, 0x58, 0xf9, 0x2d, 0x74, 0xa2, 0x98, 0xa6, 0x49, 0xd0, 0x96, 0x65, 0x91,
0xa1, 0x46, 0x95, 0x65, 0x29, 0x5c, 0x14, 0xc5, 0x77, 0x0d, 0x1d, 0x7e, 0x82, 0xde, 0xd2, 0x34,
0x75, 0xa5, 0x40, 0x8e, 0xe3, 0xdc, 0xc1, 0x67, 0x7a, 0x82, 0x87, 0x99, 0x6d, 0xdb, 0x64, 0x6a,
0x54, 0x9e, 0xe7, 0x33, 0xc3, 0x22, 0x38, 0xc0, 0x76, 0x59, 0x96, 0xbd, 0x9c, 0xd5, 0x11, 0x78,
0xd6, 0x11, 0x26, 0x6a, 0xe8, 0x64, 0xdc, 0x11, 0xec, 0xd1, 0x79, 0x1d, 0x2d, 0xb6, 0x47, 0x2b,
0x68, 0x05, 0xad, 0xa0, 0xbf, 0x05, 0x2a, 0xe1, 0xb8, 0x61, 0xa7, 0x20, 0x58, 0xa3, 0x4e, 0x01,
0xd0, 0x70, 0x14, 0x71, 0x00, 0x99, 0x52, 0x20, 0xdf, 0xf7, 0xb7, 0xba, 0xae, 0x3f, 0xc3, 0x51,
0xc7, 0x70, 0x16, 0x8d, 0x8d, 0x33, 0x09, 0x85, 0xb3, 0x08, 0xe7, 0xcf, 0xd8, 0x30, 0x8b, 0x78,
0x5d, 0xd7, 0x5e, 0x92, 0x24, 0xaf, 0xd3, 0x77, 0x7e, 0x01, 0xdf, 0x92, 0xca, 0x98, 0x1d, 0x78,
0x3f, 0xec, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
};
const BITMAP_OPAQUE shape_3d_back_xpm[1] = {{ png, sizeof( png ), "shape_3d_back_xpm" }};
//EOF

1
bitmaps_png/include/bitmaps_png/bitmaps_list.h
View File

@ -424,6 +424,7 @@ EXTERN_BITMAP( setcolor_solderpaste_xpm )
EXTERN_BITMAP( setcolor_copper_xpm )
EXTERN_BITMAP( setcolor_board_body_xpm )
EXTERN_BITMAP( shape_3d_xpm )
EXTERN_BITMAP( shape_3d_back_xpm )
EXTERN_BITMAP( show_dcodenumber_xpm )
EXTERN_BITMAP( show_footprint_xpm )
EXTERN_BITMAP( show_graphics_mode_xpm )

265
bitmaps_png/sources/shape_3d_back.svg Normal file
View File

@ -0,0 +1,265 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
height="26"
width="26"
version="1.1"
id="svg2"
inkscape:version="0.92.3 (2405546, 2018-03-11)"
sodipodi:docname="shape_3d_back.svg">
<metadata
id="metadata28">
<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="1920"
inkscape:window-height="1025"
id="namedview26"
showgrid="true"
inkscape:zoom="10.865385"
inkscape:cx="11.857396"
inkscape:cy="3.4649507"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg2">
<inkscape:grid
type="xygrid"
id="grid3005"
empspacing="2"
visible="true"
enabled="true"
snapvisiblegridlinesonly="true" />
</sodipodi:namedview>
<defs
id="defs4">
<linearGradient
id="linearGradient3840">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop3842" />
<stop
id="stop3844"
offset="0.09375"
style="stop-color:#4d4d4d;stop-opacity:1" />
<stop
id="stop3846"
offset="0.1875"
style="stop-color:#000000;stop-opacity:1" />
<stop
id="stop3848"
offset="0.28125"
style="stop-color:#4d4d4d;stop-opacity:1" />
<stop
id="stop3850"
offset="0.93556416"
style="stop-color:#4d4d4d;stop-opacity:1" />
<stop
style="stop-color:#999999;stop-opacity:1"
offset="1"
id="stop3852" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient3824">
<stop
style="stop-color:#ffffff;stop-opacity:0"
offset="0"
id="stop3826" />
<stop
id="stop3832"
offset="0.5"
style="stop-color:#ffffff;stop-opacity:1" />
<stop
style="stop-color:#ffffff;stop-opacity:0"
offset="1"
id="stop3828" />
</linearGradient>
<linearGradient
id="linearGradient3808"
inkscape:collect="always">
<stop
id="stop3810"
offset="0"
style="stop-color:#4d4d4d;stop-opacity:1" />
<stop
style="stop-color:#4d4d4d;stop-opacity:1"
offset="0.0625"
id="stop3812" />
<stop
style="stop-color:#1a1a1a;stop-opacity:1"
offset="0.1875"
id="stop3814" />
<stop
style="stop-color:#4d4d4d;stop-opacity:1"
offset="0.3125"
id="stop3816" />
<stop
style="stop-color:#4d4d4d;stop-opacity:1"
offset="0.93556416"
id="stop3818" />
<stop
id="stop3820"
offset="1"
style="stop-color:#4d4d4d;stop-opacity:1" />
</linearGradient>
<linearGradient
inkscape:collect="always"
id="linearGradient3784">
<stop
style="stop-color:#4d4d4d;stop-opacity:1"
offset="0"
id="stop3786" />
<stop
id="stop3798"
offset="0.0625"
style="stop-color:#4d4d4d;stop-opacity:1" />
<stop
id="stop3796"
offset="0.1875"
style="stop-color:#000000;stop-opacity:1" />
<stop
id="stop3794"
offset="0.3125"
style="stop-color:#4d4d4d;stop-opacity:1" />
<stop
id="stop3792"
offset="0.93556416"
style="stop-color:#4d4d4d;stop-opacity:1" />
<stop
style="stop-color:#999999;stop-opacity:1"
offset="1"
id="stop3788" />
</linearGradient>
<linearGradient
id="c"
y2="17.729"
gradientUnits="userSpaceOnUse"
x2="3.0458"
gradientTransform="translate(0,1.4775)"
y1="17.729"
x1="81.898003">
<stop
stop-color="#cc8000"
offset="0"
id="stop7" />
<stop
stop-color="#ffed00"
offset="1"
id="stop9" />
</linearGradient>
<linearGradient
id="d"
y2="1.8468"
gradientUnits="userSpaceOnUse"
x2="48.259998"
gradientTransform="matrix(1.3537,0,0,0.73873,0,1.4775)"
y1="33.612"
x1="34.290001">
<stop
stop-color="#af7d00"
offset="0"
id="stop12" />
<stop
stop-color="#ffed00"
offset="1"
id="stop14" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3784"
id="linearGradient3790"
x1="25.5"
y1="17.5"
x2="25.5"
y2="1.5"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,-1,0,27)" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3808"
id="linearGradient3806"
x1="0.5"
y1="17.5"
x2="0.5"
y2="1.5"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,-1,0,27)" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3824"
id="linearGradient3830"
x1="5.5"
y1="9.5"
x2="20.5"
y2="9.5"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,-1,0,27)" />
</defs>
<path
inkscape:connector-curvature="0"
id="path3836"
d="M 16.5,9 V 1"
style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
sodipodi:nodetypes="cc" />
<path
style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 9.5,9 V 1"
id="path3834"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
<path
style="fill:#49a749;fill-opacity:1;stroke:#008000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="m 27.5,7.5 h -29 v -3 h 29 z"
id="rect3811"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<path
style="fill:url(#linearGradient3790);fill-opacity:1;stroke:url(#linearGradient3806);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 5.5,9.5 V 11 l 1,1.5 -1,1.5 v 10.5 l 1,1 h 13 l 1,-1 V 14 l -1,-1.5 1,-1.5 V 9.5 Z"
id="path3782"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccccccccccc" />
<path
inkscape:connector-curvature="0"
id="path3822"
d="M 5.5,9.5 V 11 l 1,1.5 -1,1.5 v 10.5 l 1,1 h 13 l 1,-1 V 14 l -1,-1.5 1,-1.5 V 9.5 Z"
style="opacity:0.323741;fill:url(#linearGradient3830);fill-opacity:1;stroke:none"
sodipodi:nodetypes="ccccccccccccc" />
<path
style="fill:#999999;stroke:none"
d="M 8,4 9,3 h 1 l 1,1 z"
id="path3877"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<path
inkscape:connector-curvature="0"
id="path3879"
d="m 15,4 1,-1 h 1 l 1,1 z"
style="fill:#999999;stroke:none"
sodipodi:nodetypes="ccccc" />
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 7.7 KiB

24
common/lset.cpp
View File

@ -643,6 +643,30 @@ PCB_LAYER_ID LSET::ExtractLayer() const
}
LSET LSET::FrontAssembly()
{
static const PCB_LAYER_ID front_assembly[] = {
F_SilkS,
F_Mask,
};
static const LSET saved( front_assembly, arrayDim( front_assembly ) );
return saved;
}
LSET LSET::BackAssembly()
{
static const PCB_LAYER_ID back_assembly[] = {
B_SilkS,
B_Mask,
};
static const LSET saved( back_assembly, arrayDim( back_assembly ) );
return saved;
}
LSET LSET::InternalCuMask()
{
static const PCB_LAYER_ID cu_internals[] = {

14
include/layers_id_colors_and_visibility.h
View File

@ -506,6 +506,20 @@ public:
*/
static LSET InternalCuMask();
/**
* Function FrontAssembly()
* returns a complete set of all top assembly layers, which is all F_SilkS
* and F_Mask
*/
static LSET FrontAssembly();
/**
* Function BackAssembly()
* returns a complete set of all bottom assembly layers, which is all B_SilkS
* and B_Mask
*/
static LSET BackAssembly();
/**
* Function AllCuMask
* returns a mask holding the requested number of Cu PCB_LAYER_IDs.

20
pcbnew/pcb_layer_widget.cpp
View File

@ -180,6 +180,9 @@ void PCB_LAYER_WIDGET::AddRightClickMenuItems( wxMenu& menu )
menu.AppendSeparator();
AddMenuItem( &menu, ID_SHOW_ONLY_FRONT_ASSEMBLY, _( "Show Only Front Assembly Layers" ),
KiBitmap( shape_3d_xpm ) );
AddMenuItem( &menu, ID_SHOW_ONLY_FRONT, _( "Show Only Front Layers" ),
KiBitmap( show_all_front_layers_xpm ) );
@ -192,6 +195,9 @@ void PCB_LAYER_WIDGET::AddRightClickMenuItems( wxMenu& menu )
AddMenuItem( &menu, ID_SHOW_ONLY_BACK, _( "Show Only Back Layers" ),
KiBitmap( show_all_back_layers_xpm ) );
AddMenuItem( &menu, ID_SHOW_ONLY_BACK_ASSEMBLY, _( "Show Only Back Assembly Layers" ),
KiBitmap( shape_3d_back_xpm ) );
}
@ -254,6 +260,13 @@ void PCB_LAYER_WIDGET::onPopupSelection( wxCommandEvent& event )
layersToShow = LSET::AllNonCuMask();
break;
case ID_SHOW_ONLY_FRONT_ASSEMBLY:
// Include the edgecuts layer as well as the front assembly layers and hide the other layers
layersToShow = LSET::FrontAssembly().set( Edge_Cuts );
layersToHide = ~layersToShow;
myframe->SetActiveLayer( F_SilkS );
break;
case ID_SHOW_ONLY_FRONT:
// Include the edgecuts layer as well as the front layers and hide the other layers
layersToShow = LSET::FrontMask().set( Edge_Cuts );
@ -271,6 +284,13 @@ void PCB_LAYER_WIDGET::onPopupSelection( wxCommandEvent& event )
layersToShow = LSET::BackMask().set( Edge_Cuts );
layersToHide = ~layersToShow;
break;
case ID_SHOW_ONLY_BACK_ASSEMBLY:
// Include the edgecuts layer as well as the back assembly layers and hide the other layers
layersToShow = LSET::BackAssembly().set( Edge_Cuts );
layersToHide = ~layersToShow;
myframe->SetActiveLayer( B_SilkS );
break;
}
int rowCount = GetLayerRowCount();

4
pcbnew/pcb_layer_widget.h
View File

@ -124,7 +124,7 @@ protected:
// popup menu ids.
enum POPUP_ID
{
ID_SHOW_ALL_COPPER_LAYERS = LAYER_WIDGET::ID_LAST_VALUE,
ID_SHOW_ALL_COPPER_LAYERS = LAYER_WIDGET::ID_LAST_VALUE,
ID_HIDE_ALL_COPPER_LAYERS,
ID_HIDE_ALL_COPPER_LAYERS_BUT_ACTIVE,
ID_ALWAYS_HIDE_ALL_COPPER_LAYERS_BUT_ACTIVE,
@ -133,6 +133,8 @@ protected:
ID_SHOW_ONLY_FRONT,
ID_SHOW_ONLY_INNER,
ID_SHOW_ONLY_BACK,
ID_SHOW_ONLY_FRONT_ASSEMBLY,
ID_SHOW_ONLY_BACK_ASSEMBLY,
ID_HIDE_ALL_NON_COPPER,
ID_SHOW_ALL_NON_COPPER,
ID_LAST_VALUE