Loading bitmaps_png/cpp_26/pin_table.cpp +16 −23 Original line number Diff line number Diff line Loading @@ -8,29 +8,22 @@ 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, 0x53, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xed, 0x96, 0x31, 0x4b, 0xc3, 0x40, 0x14, 0xc7, 0xff, 0x54, 0x04, 0x33, 0x69, 0x05, 0xa5, 0x83, 0x83, 0xb8, 0x09, 0x99, 0xeb, 0x54, 0x1a, 0x45, 0x0a, 0x82, 0xa3, 0x7e, 0x86, 0x8a, 0x4b, 0x71, 0x71, 0x11, 0xaa, 0xe2, 0xa0, 0x43, 0x70, 0x71, 0x74, 0xe9, 0x28, 0x7e, 0x0a, 0xf1, 0x13, 0xc4, 0xcf, 0xe0, 0xe8, 0x66, 0x45, 0xa1, 0xb4, 0x3d, 0xef, 0x1f, 0xee, 0xe0, 0x88, 0x25, 0xbe, 0x23, 0x35, 0x3a, 0x18, 0xf8, 0x25, 0x8f, 0x24, 0xe4, 0x97, 0x7b, 0xf7, 0xde, 0x25, 0x50, 0x4a, 0xa1, 0x0c, 0xbe, 0x9c, 0xb8, 0x07, 0x66, 0x2e, 0x80, 0x75, 0xc2, 0x78, 0xea, 0xa2, 0x6b, 0x20, 0x38, 0x03, 0x62, 0x4d, 0x5f, 0xa3, 0x0c, 0x8c, 0x63, 0x5e, 0x9b, 0x8a, 0xc8, 0x48, 0x12, 0x47, 0x90, 0x25, 0x29, 0x2a, 0x4b, 0x77, 0x66, 0x24, 0xe9, 0x43, 0x6f, 0xeb, 0x75, 0x95, 0xf4, 0x7a, 0x29, 0x8c, 0x1d, 0x59, 0x5c, 0x48, 0xc4, 0x79, 0xb0, 0xe9, 0xe2, 0x83, 0x47, 0x83, 0x81, 0xb2, 0x1b, 0x63, 0x47, 0xf6, 0x76, 0x0e, 0x6c, 0xe9, 0x63, 0xe4, 0xc9, 0x4a, 0x2a, 0xe2, 0xa4, 0xdb, 0xb7, 0xe6, 0x28, 0xb2, 0x1b, 0xcf, 0xe5, 0xa4, 0x54, 0xc2, 0x8b, 0x66, 0xb9, 0x0c, 0xd1, 0xeb, 0x15, 0x30, 0x2f, 0x4e, 0xdd, 0x89, 0x66, 0x0d, 0x18, 0xad, 0x7a, 0xb0, 0x03, 0x74, 0x2e, 0x81, 0xaa, 0x57, 0x31, 0x1c, 0x02, 0x77, 0x00, 0x9a, 0x02, 0x3a, 0x9a, 0xa1, 0xa1, 0xe9, 0x55, 0xde, 0xc7, 0x41, 0xd0, 0xdf, 0x6e, 0x34, 0x1e, 0xa3, 0x28, 0x7a, 0xf8, 0x0e, 0x23, 0x9b, 0x2c, 0x72, 0x1b, 0xb6, 0x0b, 0xbc, 0x5b, 0x01, 0xe3, 0x76, 0xad, 0xf6, 0x2c, 0x95, 0x88, 0x44, 0x96, 0x39, 0x60, 0x73, 0x49, 0xdf, 0x44, 0x18, 0x4b, 0x05, 0x7f, 0x4f, 0x54, 0x4a, 0xea, 0x4a, 0x2b, 0x06, 0x49, 0x79, 0x73, 0x64, 0x85, 0x44, 0xd2, 0x86, 0x3d, 0xad, 0x54, 0x86, 0xfb, 0x61, 0xf8, 0xb4, 0x17, 0x86, 0x49, 0x1e, 0x6c, 0x52, 0xb7, 0x61, 0xff, 0xd7, 0x3a, 0x56, 0xe0, 0xc7, 0x2e, 0x70, 0xc4, 0x74, 0xe4, 0xb1, 0x01, 0xdc, 0x14, 0x5a, 0xeb, 0x5a, 0xc0, 0xd8, 0x99, 0x64, 0x29, 0x7e, 0xe5, 0x7d, 0xa0, 0x25, 0xb3, 0xfe, 0x92, 0xfc, 0x86, 0xe5, 0x97, 0xd4, 0x6d, 0x58, 0xae, 0xda, 0x8b, 0x40, 0x4b, 0xb8, 0x72, 0x67, 0x59, 0xf8, 0xbd, 0xdf, 0xad, 0x9f, 0xe6, 0x13, 0xee, 0x33, 0xf3, 0x74, 0xce, 0xbb, 0x6e, 0x19, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, 0xce, 0x00, 0x00, 0x00, 0xe7, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xd5, 0x56, 0x51, 0x0a, 0xc2, 0x30, 0x0c, 0xcd, 0xef, 0xce, 0x33, 0xbc, 0xd6, 0xce, 0x50, 0x65, 0x1e, 0x61, 0xf8, 0xe7, 0x97, 0x5f, 0x3b, 0x8a, 0x97, 0xf0, 0xd7, 0x9f, 0x81, 0x28, 0x08, 0x05, 0xb1, 0xf6, 0x95, 0x0e, 0xca, 0x64, 0x90, 0x34, 0x75, 0x6a, 0xe1, 0xb1, 0x34, 0x23, 0x7d, 0x7b, 0x59, 0x12, 0x4a, 0xce, 0x39, 0x5a, 0x02, 0xf4, 0x15, 0xa2, 0x0d, 0xd1, 0xca, 0x10, 0xf5, 0x1e, 0xa7, 0x88, 0x1e, 0xbe, 0xa2, 0x44, 0xfe, 0xd0, 0x66, 0x4d, 0xf4, 0xf0, 0x4f, 0x97, 0x22, 0xfa, 0x9a, 0x22, 0x44, 0xf8, 0x6a, 0x1c, 0xb8, 0xad, 0xaa, 0xe7, 0xb1, 0xeb, 0xdc, 0x7d, 0x18, 0x02, 0x60, 0xc3, 0x87, 0x77, 0x5a, 0x65, 0xa3, 0x1a, 0xa4, 0x2b, 0x1c, 0x3c, 0x5d, 0xf0, 0x45, 0x75, 0x7d, 0x09, 0x22, 0xfc, 0x8f, 0xa0, 0x62, 0xba, 0xe0, 0x8b, 0x44, 0x57, 0x8f, 0x4b, 0x06, 0xf6, 0x52, 0xa2, 0x5b, 0x26, 0xd1, 0x6e, 0xf9, 0xd4, 0x2d, 0x56, 0x0c, 0xdc, 0xf2, 0x6e, 0xdb, 0xf6, 0x6c, 0x8c, 0x71, 0x12, 0x20, 0x46, 0xdc, 0xb0, 0x08, 0xb4, 0xd6, 0x8a, 0x80, 0x18, 0xf1, 0x08, 0x1a, 0x89, 0x0e, 0x3e, 0x0c, 0x48, 0xed, 0xb9, 0xbd, 0x8a, 0x48, 0xad, 0x88, 0x9b, 0xba, 0xba, 0xae, 0x03, 0x52, 0x7b, 0x6e, 0xff, 0x46, 0xc4, 0x29, 0x06, 0xb5, 0x22, 0x6e, 0x79, 0xab, 0x15, 0x71, 0x1b, 0x56, 0xad, 0x88, 0x3d, 0xeb, 0x0a, 0x28, 0xe2, 0xcd, 0xba, 0x02, 0x8a, 0x44, 0xa9, 0xcb, 0x56, 0x24, 0x2d, 0x06, 0x55, 0x1f, 0xfd, 0xd4, 0xac, 0xfb, 0xbf, 0xeb, 0xd6, 0x27, 0xf1, 0x02, 0x5a, 0xe5, 0x2b, 0x21, 0xff, 0x90, 0x10, 0x58, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, }; const BITMAP_OPAQUE pin_table_xpm[1] = {{ png, sizeof( png ), "pin_table_xpm" }}; Loading bitmaps_png/sources/pin_table.svg +185 −138 Original line number Diff line number Diff line Loading @@ -7,24 +7,13 @@ 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="26" width="26" version="1.1" viewBox="0 0 26 26" id="svg2" version="1.1" width="26" height="26" inkscape:version="0.48.5 r10040" sodipodi:docname="pin_table.svg"> <metadata id="metadata87"> <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 /> </cc:Work> </rdf:RDF> </metadata> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" Loading @@ -36,160 +25,218 @@ inkscape:pageshadow="2" inkscape:window-width="1918" inkscape:window-height="1078" id="namedview85" id="namedview29" showgrid="true" inkscape:snap-grids="true" inkscape:zoom="22.961538" inkscape:cx="3.4405358" inkscape:cy="13" inkscape:window-x="1920" inkscape:zoom="32" inkscape:cx="20.363987" inkscape:cy="9.3807659" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="0" inkscape:current-layer="svg2"> <inkscape:grid type="xygrid" id="grid3832" empspacing="2" visible="true" enabled="true" snapvisiblegridlinesonly="true" /> id="grid3357" /> </sodipodi:namedview> <metadata id="metadata87"> <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> <defs id="defs4" /> <circle r="4" cy="7" cx="-6" transform="scale(-1,1)" id="path3003" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#800000;stroke-width:1.88976383;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> <path style="fill:none;stroke:#404040;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 8,11 c 12,0 12,0 12,0" id="path5327" inkscape:connector-curvature="0" /> <path style="fill:none;stroke:#404040;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 8,13 12,0" id="path5329" inkscape:connector-curvature="0" /> <path style="fill:none;stroke:#404040;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 8,15 12,0" id="path5331" inkscape:connector-curvature="0" /> <path style="fill:none;stroke:#404040;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 8,17 12,0" id="path5333" inkscape:connector-curvature="0" /> <path style="fill:none;stroke:#404040;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 8,19 12,0" id="path5335" inkscape:connector-curvature="0" /> <path style="fill:none;stroke:#404040;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 19,10 0,10" id="path5337" inkscape:connector-curvature="0" /> <path style="fill:none;stroke:#404040;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 17,10 0,10" id="path5339" inkscape:connector-curvature="0" /> <path style="fill:none;stroke:#404040;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 15,10 0,10" id="path5341" inkscape:connector-curvature="0" /> <path style="fill:none;stroke:#404040;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 13,10 0,10" id="path5343" inkscape:connector-curvature="0" /> <path style="fill:none;stroke:#404040;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 11,10 0,10" id="path5345" inkscape:connector-curvature="0" /> <path style="fill:none;stroke:#404040;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="M 9,10 9,20" id="path5347" inkscape:connector-curvature="0" /> id="path3771" d="M 11,7 24,7" style="fill:none;stroke:#800000;stroke-width:1.88976383;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <g id="g17" transform="matrix(2.4566,0,0,2.2316,-37.589,-61.022)"> <rect style="opacity:0.98999999000000005;fill:none;fill-opacity:1;stroke:#000000;stroke-width:2.50000000000000000;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="rect3768" style="fill-opacity:0" id="rect19" x="0" y="0" width="16" height="14" x="6" y="8" /> <path sodipodi:type="arc" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#800000;stroke-width:2.50000000000000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" id="path3003" sodipodi:cx="20" sodipodi:cy="13" sodipodi:rx="4" sodipodi:ry="4" d="m 24,13 a 4,4 0 1 1 -8,0 4,4 0 1 1 8,0 z" transform="matrix(-1,0,0,1,26,-6)" /> <path style="fill:none;stroke:#800000;stroke-width:2.50000000000000000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="M 11,7 24,7" id="path3771" inkscape:connector-curvature="0" /> height="16" /> </g> <g transform="matrix(2.4566,0,0,2.2316,-37.589,-61.022)" id="g17"> id="g47" transform="matrix(2.6586,0,0,2.1996,5.9761,-10.078)"> <rect style="fill-opacity:0" id="rect49" x="0" y="0" width="16" height="16" /> </g> <g transform="matrix(2.4482476,0,0,2.4295429,2.830298,-7.57155)" id="g69"> <rect height="16" width="16" y="0" x="0" id="rect19" id="rect71" style="fill-opacity:0" /> </g> <g transform="matrix(2.6586,0,0,2.1996,5.9761,-10.078)" id="g47"> transform="matrix(2.4482476,0,0,2.4295429,5.162342,-14.86007)" id="g73"> <rect height="16" width="16" y="0" x="0" id="rect49" id="rect75" style="fill-opacity:0" /> </g> <circle r="4" cy="19" cx="-6" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#800000;stroke-width:1.88976383;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="path3079" transform="scale(-1,1)" /> <path style="fill:none;stroke:#800000;stroke-width:1.88976383;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 11,19 13,0" id="path3081" /> <path style="fill:#f9f9f9;stroke:#808080;stroke-width:0.99121374;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" d="m 11.5,10.5 13,0 0,12 -13,0 z" id="rect3938" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" /> <g id="g69" transform="matrix(2.4482476,0,0,2.4295429,2.830298,-7.57155)"> <rect style="fill-opacity:0" id="rect71" x="0" y="0" width="16" height="16" /> style="stroke:#a40000;stroke-linecap:butt" id="use21207" transform="translate(0.029835,-1)"> <path style="fill:none;stroke:#a40000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 12.970165,13.5 2,0.007" id="path21217" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" /> <path id="path21219" d="m 15.970165,13.5 3,0" style="fill:none;stroke:#a40000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" /> <path style="fill:none;stroke:#a40000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 19.970165,13.5 2.989437,0.007" id="path21221" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" /> </g> <g id="g73" transform="matrix(2.4482476,0,0,2.4295429,5.162342,-14.86007)"> <rect style="fill-opacity:0" id="rect75" x="0" y="0" width="16" height="16" /> transform="translate(0.029835,0.99300137)" id="g4166" style="stroke:#a40000;stroke-linecap:butt"> <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" id="path4168" d="m 12.970165,13.5 2,0.007" style="fill:none;stroke:#333333;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" style="fill:none;stroke:#333333;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 15.970165,13.5 3,0" id="path4170" /> <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" id="path4172" d="m 19.970165,13.5 2.989437,0.007" style="fill:none;stroke:#333333;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> </g> <g style="stroke:#a40000;stroke-linecap:butt" id="g4198" transform="translate(0.029835,4.9930014)"> <path transform="matrix(-1,0,0,1,26,6)" d="m 24,13 a 4,4 0 1 1 -8,0 4,4 0 1 1 8,0 z" sodipodi:ry="4" sodipodi:rx="4" sodipodi:cy="13" sodipodi:cx="20" id="path3079" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#800000;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" sodipodi:type="arc" /> style="fill:none;stroke:#333333;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 12.970165,13.5 2,0.007" id="path4200" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" /> <path id="path4202" d="m 15.970165,13.5 3,0" style="fill:none;stroke:#333333;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" inkscape:connector-curvature="0" id="path3081" d="m 11,19 13,0" style="fill:none;stroke:#800000;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> sodipodi:nodetypes="cc" /> <path style="fill:none;stroke:#333333;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 19.970165,13.5 2.989437,0.007" id="path4204" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" /> </g> <g transform="translate(0.029835,2.9930014)" id="g4206" style="stroke:#a40000;stroke-linecap:butt"> <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" id="path4208" d="m 12.970165,13.5 2,0.007" style="fill:none;stroke:#333333;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" style="fill:none;stroke:#333333;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 15.970165,13.5 3,0" id="path4210" /> <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" id="path4212" d="m 19.970165,13.5 2.989437,0.007" style="fill:none;stroke:#333333;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> </g> <g transform="translate(0.029835,6.9930014)" id="g4214" style="stroke:#a40000;stroke-linecap:butt"> <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" id="path4216" d="m 12.970165,13.5 2,0.007" style="fill:none;stroke:#333333;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" style="fill:none;stroke:#333333;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 15.970165,13.5 3,0" id="path4218" /> <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" id="path4220" d="m 19.970165,13.5 2.989437,0.007" style="fill:none;stroke:#333333;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> </g> </svg> eeschema/dialogs/dialog_lib_edit_pin_table.cpp +24 −7 Original line number Diff line number Diff line Loading @@ -50,7 +50,8 @@ public: NONE = -1, PIN_NUMBER = 0, PIN_NAME = 1, PIN_TYPE = 2 PIN_TYPE = 2, PIN_POSITION = 3 }; private: Loading Loading @@ -160,10 +161,18 @@ DIALOG_LIB_EDIT_PIN_TABLE::DIALOG_LIB_EDIT_PIN_TABLE( wxWindow* parent, 100, wxAlignment( wxALIGN_LEFT | wxALIGN_TOP ), wxDATAVIEW_COL_RESIZABLE ); wxDataViewTextRenderer* rend3 = new wxDataViewTextRenderer( wxT( "string" ), wxDATAVIEW_CELL_INERT ); wxDataViewColumn* col3 = new wxDataViewColumn( _( "Position" ), rend3, DataViewModel::PIN_POSITION, 100, wxAlignment( wxALIGN_LEFT | wxALIGN_TOP ), wxDATAVIEW_COL_RESIZABLE ); m_Pins->AppendColumn( col0 ); m_Pins->SetExpanderColumn( col0 ); m_Pins->AppendColumn( col1 ); m_Pins->AppendColumn( col2 ); m_Pins->AppendColumn( col3 ); GetSizer()->SetSizeHints(this); Centre(); Loading Loading @@ -198,7 +207,7 @@ DIALOG_LIB_EDIT_PIN_TABLE::DataViewModel::DataViewModel( LIB_PART& aPart ) : unsigned int DIALOG_LIB_EDIT_PIN_TABLE::DataViewModel::GetColumnCount() const { return 3; return 4; } Loading Loading @@ -417,6 +426,7 @@ void DIALOG_LIB_EDIT_PIN_TABLE::DataViewModel::SetGroupingColumn( int aCol ) m_GroupingColumn = aCol; Cleared(); CalculateGrouping(); Refresh(); } Loading Loading @@ -455,8 +465,6 @@ void DIALOG_LIB_EDIT_PIN_TABLE::DataViewModel::Refresh() #ifdef REASSOCIATE_HACK m_Widget->AssociateModel( this ); #else Cleared(); std::queue<wxDataViewItem> todo; todo.push( wxDataViewItem() ); Loading Loading @@ -559,5 +567,14 @@ void DIALOG_LIB_EDIT_PIN_TABLE::DataViewModel::Pin::GetValue( wxVariant& aValue, case PIN_TYPE: aValue = m_Backing->GetTypeString(); break; case PIN_POSITION: { wxPoint position = m_Backing->GetPosition(); wxString value; value << "(" << position.x << "," << position.y << ")"; aValue = value; } break; } } Loading
bitmaps_png/cpp_26/pin_table.cpp +16 −23 Original line number Diff line number Diff line Loading @@ -8,29 +8,22 @@ 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, 0x53, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xed, 0x96, 0x31, 0x4b, 0xc3, 0x40, 0x14, 0xc7, 0xff, 0x54, 0x04, 0x33, 0x69, 0x05, 0xa5, 0x83, 0x83, 0xb8, 0x09, 0x99, 0xeb, 0x54, 0x1a, 0x45, 0x0a, 0x82, 0xa3, 0x7e, 0x86, 0x8a, 0x4b, 0x71, 0x71, 0x11, 0xaa, 0xe2, 0xa0, 0x43, 0x70, 0x71, 0x74, 0xe9, 0x28, 0x7e, 0x0a, 0xf1, 0x13, 0xc4, 0xcf, 0xe0, 0xe8, 0x66, 0x45, 0xa1, 0xb4, 0x3d, 0xef, 0x1f, 0xee, 0xe0, 0x88, 0x25, 0xbe, 0x23, 0x35, 0x3a, 0x18, 0xf8, 0x25, 0x8f, 0x24, 0xe4, 0x97, 0x7b, 0xf7, 0xde, 0x25, 0x50, 0x4a, 0xa1, 0x0c, 0xbe, 0x9c, 0xb8, 0x07, 0x66, 0x2e, 0x80, 0x75, 0xc2, 0x78, 0xea, 0xa2, 0x6b, 0x20, 0x38, 0x03, 0x62, 0x4d, 0x5f, 0xa3, 0x0c, 0x8c, 0x63, 0x5e, 0x9b, 0x8a, 0xc8, 0x48, 0x12, 0x47, 0x90, 0x25, 0x29, 0x2a, 0x4b, 0x77, 0x66, 0x24, 0xe9, 0x43, 0x6f, 0xeb, 0x75, 0x95, 0xf4, 0x7a, 0x29, 0x8c, 0x1d, 0x59, 0x5c, 0x48, 0xc4, 0x79, 0xb0, 0xe9, 0xe2, 0x83, 0x47, 0x83, 0x81, 0xb2, 0x1b, 0x63, 0x47, 0xf6, 0x76, 0x0e, 0x6c, 0xe9, 0x63, 0xe4, 0xc9, 0x4a, 0x2a, 0xe2, 0xa4, 0xdb, 0xb7, 0xe6, 0x28, 0xb2, 0x1b, 0xcf, 0xe5, 0xa4, 0x54, 0xc2, 0x8b, 0x66, 0xb9, 0x0c, 0xd1, 0xeb, 0x15, 0x30, 0x2f, 0x4e, 0xdd, 0x89, 0x66, 0x0d, 0x18, 0xad, 0x7a, 0xb0, 0x03, 0x74, 0x2e, 0x81, 0xaa, 0x57, 0x31, 0x1c, 0x02, 0x77, 0x00, 0x9a, 0x02, 0x3a, 0x9a, 0xa1, 0xa1, 0xe9, 0x55, 0xde, 0xc7, 0x41, 0xd0, 0xdf, 0x6e, 0x34, 0x1e, 0xa3, 0x28, 0x7a, 0xf8, 0x0e, 0x23, 0x9b, 0x2c, 0x72, 0x1b, 0xb6, 0x0b, 0xbc, 0x5b, 0x01, 0xe3, 0x76, 0xad, 0xf6, 0x2c, 0x95, 0x88, 0x44, 0x96, 0x39, 0x60, 0x73, 0x49, 0xdf, 0x44, 0x18, 0x4b, 0x05, 0x7f, 0x4f, 0x54, 0x4a, 0xea, 0x4a, 0x2b, 0x06, 0x49, 0x79, 0x73, 0x64, 0x85, 0x44, 0xd2, 0x86, 0x3d, 0xad, 0x54, 0x86, 0xfb, 0x61, 0xf8, 0xb4, 0x17, 0x86, 0x49, 0x1e, 0x6c, 0x52, 0xb7, 0x61, 0xff, 0xd7, 0x3a, 0x56, 0xe0, 0xc7, 0x2e, 0x70, 0xc4, 0x74, 0xe4, 0xb1, 0x01, 0xdc, 0x14, 0x5a, 0xeb, 0x5a, 0xc0, 0xd8, 0x99, 0x64, 0x29, 0x7e, 0xe5, 0x7d, 0xa0, 0x25, 0xb3, 0xfe, 0x92, 0xfc, 0x86, 0xe5, 0x97, 0xd4, 0x6d, 0x58, 0xae, 0xda, 0x8b, 0x40, 0x4b, 0xb8, 0x72, 0x67, 0x59, 0xf8, 0xbd, 0xdf, 0xad, 0x9f, 0xe6, 0x13, 0xee, 0x33, 0xf3, 0x74, 0xce, 0xbb, 0x6e, 0x19, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, 0xce, 0x00, 0x00, 0x00, 0xe7, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xd5, 0x56, 0x51, 0x0a, 0xc2, 0x30, 0x0c, 0xcd, 0xef, 0xce, 0x33, 0xbc, 0xd6, 0xce, 0x50, 0x65, 0x1e, 0x61, 0xf8, 0xe7, 0x97, 0x5f, 0x3b, 0x8a, 0x97, 0xf0, 0xd7, 0x9f, 0x81, 0x28, 0x08, 0x05, 0xb1, 0xf6, 0x95, 0x0e, 0xca, 0x64, 0x90, 0x34, 0x75, 0x6a, 0xe1, 0xb1, 0x34, 0x23, 0x7d, 0x7b, 0x59, 0x12, 0x4a, 0xce, 0x39, 0x5a, 0x02, 0xf4, 0x15, 0xa2, 0x0d, 0xd1, 0xca, 0x10, 0xf5, 0x1e, 0xa7, 0x88, 0x1e, 0xbe, 0xa2, 0x44, 0xfe, 0xd0, 0x66, 0x4d, 0xf4, 0xf0, 0x4f, 0x97, 0x22, 0xfa, 0x9a, 0x22, 0x44, 0xf8, 0x6a, 0x1c, 0xb8, 0xad, 0xaa, 0xe7, 0xb1, 0xeb, 0xdc, 0x7d, 0x18, 0x02, 0x60, 0xc3, 0x87, 0x77, 0x5a, 0x65, 0xa3, 0x1a, 0xa4, 0x2b, 0x1c, 0x3c, 0x5d, 0xf0, 0x45, 0x75, 0x7d, 0x09, 0x22, 0xfc, 0x8f, 0xa0, 0x62, 0xba, 0xe0, 0x8b, 0x44, 0x57, 0x8f, 0x4b, 0x06, 0xf6, 0x52, 0xa2, 0x5b, 0x26, 0xd1, 0x6e, 0xf9, 0xd4, 0x2d, 0x56, 0x0c, 0xdc, 0xf2, 0x6e, 0xdb, 0xf6, 0x6c, 0x8c, 0x71, 0x12, 0x20, 0x46, 0xdc, 0xb0, 0x08, 0xb4, 0xd6, 0x8a, 0x80, 0x18, 0xf1, 0x08, 0x1a, 0x89, 0x0e, 0x3e, 0x0c, 0x48, 0xed, 0xb9, 0xbd, 0x8a, 0x48, 0xad, 0x88, 0x9b, 0xba, 0xba, 0xae, 0x03, 0x52, 0x7b, 0x6e, 0xff, 0x46, 0xc4, 0x29, 0x06, 0xb5, 0x22, 0x6e, 0x79, 0xab, 0x15, 0x71, 0x1b, 0x56, 0xad, 0x88, 0x3d, 0xeb, 0x0a, 0x28, 0xe2, 0xcd, 0xba, 0x02, 0x8a, 0x44, 0xa9, 0xcb, 0x56, 0x24, 0x2d, 0x06, 0x55, 0x1f, 0xfd, 0xd4, 0xac, 0xfb, 0xbf, 0xeb, 0xd6, 0x27, 0xf1, 0x02, 0x5a, 0xe5, 0x2b, 0x21, 0xff, 0x90, 0x10, 0x58, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, }; const BITMAP_OPAQUE pin_table_xpm[1] = {{ png, sizeof( png ), "pin_table_xpm" }}; Loading
bitmaps_png/sources/pin_table.svg +185 −138 Original line number Diff line number Diff line Loading @@ -7,24 +7,13 @@ 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="26" width="26" version="1.1" viewBox="0 0 26 26" id="svg2" version="1.1" width="26" height="26" inkscape:version="0.48.5 r10040" sodipodi:docname="pin_table.svg"> <metadata id="metadata87"> <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 /> </cc:Work> </rdf:RDF> </metadata> <sodipodi:namedview pagecolor="#ffffff" bordercolor="#666666" Loading @@ -36,160 +25,218 @@ inkscape:pageshadow="2" inkscape:window-width="1918" inkscape:window-height="1078" id="namedview85" id="namedview29" showgrid="true" inkscape:snap-grids="true" inkscape:zoom="22.961538" inkscape:cx="3.4405358" inkscape:cy="13" inkscape:window-x="1920" inkscape:zoom="32" inkscape:cx="20.363987" inkscape:cy="9.3807659" inkscape:window-x="0" inkscape:window-y="0" inkscape:window-maximized="0" inkscape:current-layer="svg2"> <inkscape:grid type="xygrid" id="grid3832" empspacing="2" visible="true" enabled="true" snapvisiblegridlinesonly="true" /> id="grid3357" /> </sodipodi:namedview> <metadata id="metadata87"> <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> <defs id="defs4" /> <circle r="4" cy="7" cx="-6" transform="scale(-1,1)" id="path3003" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#800000;stroke-width:1.88976383;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> <path style="fill:none;stroke:#404040;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 8,11 c 12,0 12,0 12,0" id="path5327" inkscape:connector-curvature="0" /> <path style="fill:none;stroke:#404040;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 8,13 12,0" id="path5329" inkscape:connector-curvature="0" /> <path style="fill:none;stroke:#404040;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 8,15 12,0" id="path5331" inkscape:connector-curvature="0" /> <path style="fill:none;stroke:#404040;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 8,17 12,0" id="path5333" inkscape:connector-curvature="0" /> <path style="fill:none;stroke:#404040;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 8,19 12,0" id="path5335" inkscape:connector-curvature="0" /> <path style="fill:none;stroke:#404040;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 19,10 0,10" id="path5337" inkscape:connector-curvature="0" /> <path style="fill:none;stroke:#404040;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 17,10 0,10" id="path5339" inkscape:connector-curvature="0" /> <path style="fill:none;stroke:#404040;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 15,10 0,10" id="path5341" inkscape:connector-curvature="0" /> <path style="fill:none;stroke:#404040;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 13,10 0,10" id="path5343" inkscape:connector-curvature="0" /> <path style="fill:none;stroke:#404040;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="m 11,10 0,10" id="path5345" inkscape:connector-curvature="0" /> <path style="fill:none;stroke:#404040;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" d="M 9,10 9,20" id="path5347" inkscape:connector-curvature="0" /> id="path3771" d="M 11,7 24,7" style="fill:none;stroke:#800000;stroke-width:1.88976383;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <g id="g17" transform="matrix(2.4566,0,0,2.2316,-37.589,-61.022)"> <rect style="opacity:0.98999999000000005;fill:none;fill-opacity:1;stroke:#000000;stroke-width:2.50000000000000000;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" id="rect3768" style="fill-opacity:0" id="rect19" x="0" y="0" width="16" height="14" x="6" y="8" /> <path sodipodi:type="arc" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#800000;stroke-width:2.50000000000000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" id="path3003" sodipodi:cx="20" sodipodi:cy="13" sodipodi:rx="4" sodipodi:ry="4" d="m 24,13 a 4,4 0 1 1 -8,0 4,4 0 1 1 8,0 z" transform="matrix(-1,0,0,1,26,-6)" /> <path style="fill:none;stroke:#800000;stroke-width:2.50000000000000000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="M 11,7 24,7" id="path3771" inkscape:connector-curvature="0" /> height="16" /> </g> <g transform="matrix(2.4566,0,0,2.2316,-37.589,-61.022)" id="g17"> id="g47" transform="matrix(2.6586,0,0,2.1996,5.9761,-10.078)"> <rect style="fill-opacity:0" id="rect49" x="0" y="0" width="16" height="16" /> </g> <g transform="matrix(2.4482476,0,0,2.4295429,2.830298,-7.57155)" id="g69"> <rect height="16" width="16" y="0" x="0" id="rect19" id="rect71" style="fill-opacity:0" /> </g> <g transform="matrix(2.6586,0,0,2.1996,5.9761,-10.078)" id="g47"> transform="matrix(2.4482476,0,0,2.4295429,5.162342,-14.86007)" id="g73"> <rect height="16" width="16" y="0" x="0" id="rect49" id="rect75" style="fill-opacity:0" /> </g> <circle r="4" cy="19" cx="-6" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#800000;stroke-width:1.88976383;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="path3079" transform="scale(-1,1)" /> <path style="fill:none;stroke:#800000;stroke-width:1.88976383;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 11,19 13,0" id="path3081" /> <path style="fill:#f9f9f9;stroke:#808080;stroke-width:0.99121374;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:1" d="m 11.5,10.5 13,0 0,12 -13,0 z" id="rect3938" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc" /> <g id="g69" transform="matrix(2.4482476,0,0,2.4295429,2.830298,-7.57155)"> <rect style="fill-opacity:0" id="rect71" x="0" y="0" width="16" height="16" /> style="stroke:#a40000;stroke-linecap:butt" id="use21207" transform="translate(0.029835,-1)"> <path style="fill:none;stroke:#a40000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 12.970165,13.5 2,0.007" id="path21217" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" /> <path id="path21219" d="m 15.970165,13.5 3,0" style="fill:none;stroke:#a40000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" /> <path style="fill:none;stroke:#a40000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 19.970165,13.5 2.989437,0.007" id="path21221" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" /> </g> <g id="g73" transform="matrix(2.4482476,0,0,2.4295429,5.162342,-14.86007)"> <rect style="fill-opacity:0" id="rect75" x="0" y="0" width="16" height="16" /> transform="translate(0.029835,0.99300137)" id="g4166" style="stroke:#a40000;stroke-linecap:butt"> <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" id="path4168" d="m 12.970165,13.5 2,0.007" style="fill:none;stroke:#333333;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" style="fill:none;stroke:#333333;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 15.970165,13.5 3,0" id="path4170" /> <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" id="path4172" d="m 19.970165,13.5 2.989437,0.007" style="fill:none;stroke:#333333;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> </g> <g style="stroke:#a40000;stroke-linecap:butt" id="g4198" transform="translate(0.029835,4.9930014)"> <path transform="matrix(-1,0,0,1,26,6)" d="m 24,13 a 4,4 0 1 1 -8,0 4,4 0 1 1 8,0 z" sodipodi:ry="4" sodipodi:rx="4" sodipodi:cy="13" sodipodi:cx="20" id="path3079" style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#800000;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" sodipodi:type="arc" /> style="fill:none;stroke:#333333;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 12.970165,13.5 2,0.007" id="path4200" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" /> <path id="path4202" d="m 15.970165,13.5 3,0" style="fill:none;stroke:#333333;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" inkscape:connector-curvature="0" id="path3081" d="m 11,19 13,0" style="fill:none;stroke:#800000;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /> sodipodi:nodetypes="cc" /> <path style="fill:none;stroke:#333333;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 19.970165,13.5 2.989437,0.007" id="path4204" inkscape:connector-curvature="0" sodipodi:nodetypes="cc" /> </g> <g transform="translate(0.029835,2.9930014)" id="g4206" style="stroke:#a40000;stroke-linecap:butt"> <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" id="path4208" d="m 12.970165,13.5 2,0.007" style="fill:none;stroke:#333333;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" style="fill:none;stroke:#333333;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 15.970165,13.5 3,0" id="path4210" /> <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" id="path4212" d="m 19.970165,13.5 2.989437,0.007" style="fill:none;stroke:#333333;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> </g> <g transform="translate(0.029835,6.9930014)" id="g4214" style="stroke:#a40000;stroke-linecap:butt"> <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" id="path4216" d="m 12.970165,13.5 2,0.007" style="fill:none;stroke:#333333;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" style="fill:none;stroke:#333333;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="m 15.970165,13.5 3,0" id="path4218" /> <path sodipodi:nodetypes="cc" inkscape:connector-curvature="0" id="path4220" d="m 19.970165,13.5 2.989437,0.007" style="fill:none;stroke:#333333;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> </g> </svg>
eeschema/dialogs/dialog_lib_edit_pin_table.cpp +24 −7 Original line number Diff line number Diff line Loading @@ -50,7 +50,8 @@ public: NONE = -1, PIN_NUMBER = 0, PIN_NAME = 1, PIN_TYPE = 2 PIN_TYPE = 2, PIN_POSITION = 3 }; private: Loading Loading @@ -160,10 +161,18 @@ DIALOG_LIB_EDIT_PIN_TABLE::DIALOG_LIB_EDIT_PIN_TABLE( wxWindow* parent, 100, wxAlignment( wxALIGN_LEFT | wxALIGN_TOP ), wxDATAVIEW_COL_RESIZABLE ); wxDataViewTextRenderer* rend3 = new wxDataViewTextRenderer( wxT( "string" ), wxDATAVIEW_CELL_INERT ); wxDataViewColumn* col3 = new wxDataViewColumn( _( "Position" ), rend3, DataViewModel::PIN_POSITION, 100, wxAlignment( wxALIGN_LEFT | wxALIGN_TOP ), wxDATAVIEW_COL_RESIZABLE ); m_Pins->AppendColumn( col0 ); m_Pins->SetExpanderColumn( col0 ); m_Pins->AppendColumn( col1 ); m_Pins->AppendColumn( col2 ); m_Pins->AppendColumn( col3 ); GetSizer()->SetSizeHints(this); Centre(); Loading Loading @@ -198,7 +207,7 @@ DIALOG_LIB_EDIT_PIN_TABLE::DataViewModel::DataViewModel( LIB_PART& aPart ) : unsigned int DIALOG_LIB_EDIT_PIN_TABLE::DataViewModel::GetColumnCount() const { return 3; return 4; } Loading Loading @@ -417,6 +426,7 @@ void DIALOG_LIB_EDIT_PIN_TABLE::DataViewModel::SetGroupingColumn( int aCol ) m_GroupingColumn = aCol; Cleared(); CalculateGrouping(); Refresh(); } Loading Loading @@ -455,8 +465,6 @@ void DIALOG_LIB_EDIT_PIN_TABLE::DataViewModel::Refresh() #ifdef REASSOCIATE_HACK m_Widget->AssociateModel( this ); #else Cleared(); std::queue<wxDataViewItem> todo; todo.push( wxDataViewItem() ); Loading Loading @@ -559,5 +567,14 @@ void DIALOG_LIB_EDIT_PIN_TABLE::DataViewModel::Pin::GetValue( wxVariant& aValue, case PIN_TYPE: aValue = m_Backing->GetTypeString(); break; case PIN_POSITION: { wxPoint position = m_Backing->GetPosition(); wxString value; value << "(" << position.x << "," << position.y << ")"; aValue = value; } break; } }