Fix some Doxygen warnings.
Eeschema: cleaning code. Start work to enhance annotation algorithm. Already added an option to annotate using sheet number (sheet 1 uses numbers 100 to 199, sheet 2 uses 200 to 299..). Works fine if deleting existing annotation, but needs work to be used when the existing annotation is kept .
This commit is contained in:
jean-pierre charras
parent
d0105f1ba6
commit
e7d5770f42
|
|
@ -1,43 +1,38 @@
|
|||
/* XPM */
|
||||
#ifndef XPMMAIN
|
||||
extern const char *annotate_down_right_xpm[];
|
||||
|
||||
#else
|
||||
const char *annotate_down_right_xpm[] = {
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 16 16 1",
|
||||
"@ c #89B09C",
|
||||
"O c #DB8F8F",
|
||||
". c #D4B7B7",
|
||||
"# c #85A794",
|
||||
"& c #72CAA2",
|
||||
"% c #9EB5A9",
|
||||
"- c #59CD99",
|
||||
"o c #E48080",
|
||||
"+ c #DC9897",
|
||||
" c none",
|
||||
"X c #D6A1A0",
|
||||
": c #E46264",
|
||||
"= c #64F6B4",
|
||||
"$ c #B4BEBC",
|
||||
"; c #69E5A9",
|
||||
"* c #81B79F",
|
||||
"= c #9A524C",
|
||||
": c #405814",
|
||||
"O c #932722",
|
||||
". c #BAA7A6",
|
||||
"X c #549454",
|
||||
"+ c #7C210E",
|
||||
" c None",
|
||||
"$ c #8C0505",
|
||||
"- c #AE7879",
|
||||
"@ c #097409",
|
||||
"* c #867258",
|
||||
"& c #308430",
|
||||
"# c #783820",
|
||||
"; c #9E3838",
|
||||
"% c #403F04",
|
||||
"o c #7FA57F",
|
||||
/* pixels */
|
||||
" ",
|
||||
" ",
|
||||
" .X o. ",
|
||||
" .O +o. ",
|
||||
" .X O.X. ",
|
||||
" .O X. O. ",
|
||||
" @# $%%+. #% ",
|
||||
" && *=* $&&$",
|
||||
"@&-# %;*@ #;-@",
|
||||
" @@ .O% $ #@ ",
|
||||
" .X O. X. ",
|
||||
" .O O O. ",
|
||||
" .+O. X. ",
|
||||
" .: O. ",
|
||||
" $ ",
|
||||
" "
|
||||
" .X. oX ",
|
||||
"O+@#O .@@o ",
|
||||
"O$%$$ &@@o ",
|
||||
"*$$$= &@@@o ",
|
||||
".$$$. -#%&&@o ",
|
||||
" +$#.-;$$$+.X@o ",
|
||||
" *+*O$$$$$= X@o ",
|
||||
" o@X-=*:$$. X@o ",
|
||||
" o@X .@%$= $#@O;",
|
||||
" o@X &@$$. $$%$O",
|
||||
" o@X&@&$; =$$$-",
|
||||
" o@@@& -$$$ ",
|
||||
" X@@@. $$= ",
|
||||
" X@@o :+o ",
|
||||
" o@o X@o ",
|
||||
" o&. "
|
||||
};
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,43 +1,38 @@
|
|||
/* XPM */
|
||||
#ifndef XPMMAIN
|
||||
extern const char *annotate_right_down_xpm[];
|
||||
|
||||
#else
|
||||
const char *annotate_right_down_xpm[] = {
|
||||
/* columns rows colors const chars-per-pixel */
|
||||
/* columns rows colors chars-per-pixel */
|
||||
"16 16 16 1",
|
||||
"@ c #59CE99",
|
||||
"% c #D79E9C",
|
||||
"$ c #DC9393",
|
||||
"o c #FFB4B4",
|
||||
"* c #74CAA2",
|
||||
"X c #FFBDBD",
|
||||
". c #89AF9A",
|
||||
" c none",
|
||||
"- c #E46264",
|
||||
"# c #FFAAAC",
|
||||
"; c #64F6B4",
|
||||
"& c #84A794",
|
||||
"= c #69E5A9",
|
||||
": c #E08280",
|
||||
"O c #9BB5A5",
|
||||
"+ c #81B79F",
|
||||
"o c #A25451",
|
||||
"+ c #88A887",
|
||||
"* c #424004",
|
||||
"% c #308530",
|
||||
"@ c #8B0405",
|
||||
"# c #7C563C",
|
||||
" c None",
|
||||
"- c #B18B8C",
|
||||
"O c #BAA6A6",
|
||||
"X c #8E1C17",
|
||||
"$ c #549354",
|
||||
"; c #74381C",
|
||||
"& c #067205",
|
||||
". c #993F3B",
|
||||
"= c #748157",
|
||||
": c #AC7474",
|
||||
/* pixels */
|
||||
" . ",
|
||||
" XoooO+@Ooooo ",
|
||||
" #$%$&*=&%$%-X ",
|
||||
" X& X$ ",
|
||||
" X$o ",
|
||||
" $ ",
|
||||
" X O$o ",
|
||||
" O+=+ ",
|
||||
" O;@X ",
|
||||
" %.OX ",
|
||||
" %X ",
|
||||
" $o ",
|
||||
" $X X& ",
|
||||
" ::%$&*=.%$%$ ",
|
||||
" oooo.@@.oooo ",
|
||||
" . "
|
||||
" .XoO ",
|
||||
"+X@@@X#$$$$$$$+ ",
|
||||
"%&*@@@@&&&&&&&% ",
|
||||
"O#@@@X=+++$&&&O ",
|
||||
" X@.O O&&%O ",
|
||||
" O o@O+&&% ",
|
||||
" @@=&&$ ",
|
||||
" -@X&&= ",
|
||||
" o@**X@o ",
|
||||
" O@@@@@X- ",
|
||||
" +&@@@.- ",
|
||||
" +&&;oO X@.: ",
|
||||
"$&&&%%%%;@@@@;%+",
|
||||
"%&&&&&&&&*@@@@&%",
|
||||
" +++++++;@@@#++ ",
|
||||
" .X: "
|
||||
};
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -0,0 +1,169 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||
|
||||
<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"
|
||||
sodipodi:docname="annotate_X.svg"
|
||||
inkscape:version="0.47 r22583"
|
||||
sodipodi:version="0.32"
|
||||
id="svg2"
|
||||
height="16.000000px"
|
||||
width="16.000000px"
|
||||
inkscape:export-filename="F:\kicad-launchpad\testing\bitmaps\sources\annotate_X.png"
|
||||
inkscape:export-xdpi="90.000000"
|
||||
inkscape:export-ydpi="90.000000"
|
||||
version="1.1">
|
||||
<defs
|
||||
id="defs3">
|
||||
<inkscape:path-effect
|
||||
effect="skeletal"
|
||||
id="path-effect2834"
|
||||
is_visible="true"
|
||||
pattern="M 0,5 10,10 10,0 z"
|
||||
copytype="single_stretched"
|
||||
prop_scale="1"
|
||||
scale_y_rel="false"
|
||||
spacing="0"
|
||||
normal_offset="0"
|
||||
tang_offset="0"
|
||||
prop_units="false"
|
||||
vertical_pattern="false"
|
||||
fuse_tolerance="0" />
|
||||
<inkscape:perspective
|
||||
sodipodi:type="inkscape:persp3d"
|
||||
inkscape:vp_x="0 : 8 : 1"
|
||||
inkscape:vp_y="0 : 1000 : 0"
|
||||
inkscape:vp_z="16 : 8 : 1"
|
||||
inkscape:persp3d-origin="8 : 5.3333333 : 1"
|
||||
id="perspective29" />
|
||||
<linearGradient
|
||||
id="linearGradient10731">
|
||||
<stop
|
||||
id="stop10733"
|
||||
offset="0.00000000"
|
||||
style="stop-color:#8787ff;stop-opacity:1.0000000;" />
|
||||
<stop
|
||||
id="stop10735"
|
||||
offset="1.0000000"
|
||||
style="stop-color:#ffffff;stop-opacity:1.0000000;" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
gradientUnits="userSpaceOnUse"
|
||||
y2="12.266582"
|
||||
x2="6.0408001"
|
||||
y1="17.050747"
|
||||
x1="11.430959"
|
||||
gradientTransform="scale(1.224745,0.816497)"
|
||||
id="linearGradient10737"
|
||||
xlink:href="#linearGradient10731"
|
||||
inkscape:collect="always" />
|
||||
<linearGradient
|
||||
id="linearGradient2606">
|
||||
<stop
|
||||
style="stop-color:#ff7800;stop-opacity:1.0000000;"
|
||||
offset="0.00000000"
|
||||
id="stop2608" />
|
||||
<stop
|
||||
style="stop-color:#ffffff;stop-opacity:1.0000000;"
|
||||
offset="1.0000000"
|
||||
id="stop2610" />
|
||||
</linearGradient>
|
||||
<inkscape:perspective
|
||||
id="perspective4268"
|
||||
inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
|
||||
inkscape:vp_z="1 : 0.5 : 1"
|
||||
inkscape:vp_y="0 : 1000 : 0"
|
||||
inkscape:vp_x="0 : 0.5 : 1"
|
||||
sodipodi:type="inkscape:persp3d" />
|
||||
</defs>
|
||||
<sodipodi:namedview
|
||||
inkscape:window-y="-4"
|
||||
inkscape:window-x="-4"
|
||||
inkscape:window-height="968"
|
||||
inkscape:window-width="1280"
|
||||
inkscape:guide-bbox="true"
|
||||
showguides="true"
|
||||
inkscape:guide-points="true"
|
||||
gridtolerance="0.50000000px"
|
||||
inkscape:grid-points="true"
|
||||
inkscape:grid-bbox="true"
|
||||
showgrid="true"
|
||||
inkscape:current-layer="layer1"
|
||||
inkscape:document-units="px"
|
||||
inkscape:cy="8"
|
||||
inkscape:cx="2.8854733"
|
||||
inkscape:zoom="28.9375"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:pageopacity="0.0"
|
||||
borderopacity="1.0"
|
||||
bordercolor="#666666"
|
||||
pagecolor="#ffffff"
|
||||
id="base"
|
||||
inkscape:window-maximized="1">
|
||||
<inkscape:grid
|
||||
id="GridFromPre046Settings"
|
||||
type="xygrid"
|
||||
originx="0px"
|
||||
originy="0px"
|
||||
spacingx="0.50000000px"
|
||||
spacingy="0.50000000px"
|
||||
color="#0000ff"
|
||||
empcolor="#0000ff"
|
||||
opacity="0.2"
|
||||
empopacity="0.4"
|
||||
empspacing="2" />
|
||||
</sodipodi:namedview>
|
||||
<metadata
|
||||
id="metadata4">
|
||||
<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>
|
||||
<g
|
||||
id="layer1"
|
||||
inkscape:groupmode="layer"
|
||||
inkscape:label="Layer 1">
|
||||
<path
|
||||
style="fill:none;stroke:#007100;stroke-width:1.97381759;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
|
||||
d="M 2.6013377,1.2661359 2.5385809,14.170523 13.426862,1.3402729 l 0,13.8264601"
|
||||
id="path2838" />
|
||||
<path
|
||||
style="fill:none;stroke:#8c0000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
|
||||
d="M 5.0524871,6.8017199 9.9672796,5.3380844 7.9002122,10.258565"
|
||||
id="path4254" />
|
||||
<path
|
||||
style="fill:none;stroke:#8f0000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
|
||||
d="M 1.0314127,1.894766 2.4361783,6 4.2263917,1.970748"
|
||||
id="path4256" />
|
||||
<path
|
||||
style="fill:none;stroke:#8f0000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
|
||||
d="M 11.92745,8.924017 13.332216,13.029252 15.122429,9"
|
||||
id="path4256-1" />
|
||||
</g>
|
||||
<g
|
||||
inkscape:groupmode="layer"
|
||||
id="layer2"
|
||||
inkscape:label="fondo"
|
||||
sodipodi:insensitive="true">
|
||||
<rect
|
||||
style="fill:#ffffff;fill-opacity:0.00000000;stroke:none;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0.00000000;stroke-opacity:0.48858449"
|
||||
id="rect2277"
|
||||
width="16.000000"
|
||||
height="16.000000"
|
||||
x="0.00000000"
|
||||
y="0.00000000" />
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 5.5 KiB |
|
|
@ -0,0 +1,169 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||
|
||||
<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"
|
||||
sodipodi:docname="annotate_X.svg"
|
||||
inkscape:version="0.47 r22583"
|
||||
sodipodi:version="0.32"
|
||||
id="svg2"
|
||||
height="16.000000px"
|
||||
width="16.000000px"
|
||||
inkscape:export-filename="C:\Documents and Settings\inigo\Escritorio\iconos\Export.png"
|
||||
inkscape:export-xdpi="90.000000"
|
||||
inkscape:export-ydpi="90.000000"
|
||||
version="1.1">
|
||||
<defs
|
||||
id="defs3">
|
||||
<inkscape:path-effect
|
||||
effect="skeletal"
|
||||
id="path-effect2834"
|
||||
is_visible="true"
|
||||
pattern="M 0,5 10,10 10,0 z"
|
||||
copytype="single_stretched"
|
||||
prop_scale="1"
|
||||
scale_y_rel="false"
|
||||
spacing="0"
|
||||
normal_offset="0"
|
||||
tang_offset="0"
|
||||
prop_units="false"
|
||||
vertical_pattern="false"
|
||||
fuse_tolerance="0" />
|
||||
<inkscape:perspective
|
||||
sodipodi:type="inkscape:persp3d"
|
||||
inkscape:vp_x="0 : 8 : 1"
|
||||
inkscape:vp_y="0 : 1000 : 0"
|
||||
inkscape:vp_z="16 : 8 : 1"
|
||||
inkscape:persp3d-origin="8 : 5.3333333 : 1"
|
||||
id="perspective29" />
|
||||
<linearGradient
|
||||
id="linearGradient10731">
|
||||
<stop
|
||||
id="stop10733"
|
||||
offset="0.00000000"
|
||||
style="stop-color:#8787ff;stop-opacity:1.0000000;" />
|
||||
<stop
|
||||
id="stop10735"
|
||||
offset="1.0000000"
|
||||
style="stop-color:#ffffff;stop-opacity:1.0000000;" />
|
||||
</linearGradient>
|
||||
<linearGradient
|
||||
gradientUnits="userSpaceOnUse"
|
||||
y2="12.266582"
|
||||
x2="6.0408001"
|
||||
y1="17.050747"
|
||||
x1="11.430959"
|
||||
gradientTransform="scale(1.224745,0.816497)"
|
||||
id="linearGradient10737"
|
||||
xlink:href="#linearGradient10731"
|
||||
inkscape:collect="always" />
|
||||
<linearGradient
|
||||
id="linearGradient2606">
|
||||
<stop
|
||||
style="stop-color:#ff7800;stop-opacity:1.0000000;"
|
||||
offset="0.00000000"
|
||||
id="stop2608" />
|
||||
<stop
|
||||
style="stop-color:#ffffff;stop-opacity:1.0000000;"
|
||||
offset="1.0000000"
|
||||
id="stop2610" />
|
||||
</linearGradient>
|
||||
<inkscape:perspective
|
||||
id="perspective4268"
|
||||
inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
|
||||
inkscape:vp_z="1 : 0.5 : 1"
|
||||
inkscape:vp_y="0 : 1000 : 0"
|
||||
inkscape:vp_x="0 : 0.5 : 1"
|
||||
sodipodi:type="inkscape:persp3d" />
|
||||
</defs>
|
||||
<sodipodi:namedview
|
||||
inkscape:window-y="-4"
|
||||
inkscape:window-x="-4"
|
||||
inkscape:window-height="968"
|
||||
inkscape:window-width="1280"
|
||||
inkscape:guide-bbox="true"
|
||||
showguides="true"
|
||||
inkscape:guide-points="true"
|
||||
gridtolerance="0.50000000px"
|
||||
inkscape:grid-points="true"
|
||||
inkscape:grid-bbox="true"
|
||||
showgrid="true"
|
||||
inkscape:current-layer="layer1"
|
||||
inkscape:document-units="px"
|
||||
inkscape:cy="8"
|
||||
inkscape:cx="2.8854733"
|
||||
inkscape:zoom="28.9375"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:pageopacity="0.0"
|
||||
borderopacity="1.0"
|
||||
bordercolor="#666666"
|
||||
pagecolor="#ffffff"
|
||||
id="base"
|
||||
inkscape:window-maximized="1">
|
||||
<inkscape:grid
|
||||
id="GridFromPre046Settings"
|
||||
type="xygrid"
|
||||
originx="0px"
|
||||
originy="0px"
|
||||
spacingx="0.50000000px"
|
||||
spacingy="0.50000000px"
|
||||
color="#0000ff"
|
||||
empcolor="#0000ff"
|
||||
opacity="0.2"
|
||||
empopacity="0.4"
|
||||
empspacing="2" />
|
||||
</sodipodi:namedview>
|
||||
<metadata
|
||||
id="metadata4">
|
||||
<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>
|
||||
<g
|
||||
id="layer1"
|
||||
inkscape:groupmode="layer"
|
||||
inkscape:label="Layer 1">
|
||||
<path
|
||||
style="fill:none;stroke:#007100;stroke-width:1.97381759;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
|
||||
d="M 1.0324229,2.4530527 13.93681,2.3902959 1.1065595,13.278577 l 13.8264605,0"
|
||||
id="path2838" />
|
||||
<path
|
||||
style="fill:none;stroke:#8c0000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
|
||||
d="M 6.271378,5.8642645 4.8077422,10.779057 9.7282233,8.7119896"
|
||||
id="path4254" />
|
||||
<path
|
||||
style="fill:none;stroke:#8f0000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
|
||||
d="M 1.9240173,1.0195985 6.0292515,2.4243641 2,4.2145775"
|
||||
id="path4256" />
|
||||
<path
|
||||
style="fill:none;stroke:#8f0000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
|
||||
d="m 8.9496441,11.836293 4.1052349,1.404766 -4.0292523,1.790213"
|
||||
id="path4256-1" />
|
||||
</g>
|
||||
<g
|
||||
inkscape:groupmode="layer"
|
||||
id="layer2"
|
||||
inkscape:label="fondo"
|
||||
sodipodi:insensitive="true">
|
||||
<rect
|
||||
style="fill:#ffffff;fill-opacity:0.00000000;stroke:none;stroke-width:1.2500000;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:0.00000000;stroke-opacity:0.48858449"
|
||||
id="rect2277"
|
||||
width="16.000000"
|
||||
height="16.000000"
|
||||
x="0.00000000"
|
||||
y="0.00000000" />
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 5.5 KiB |
|
|
@ -680,7 +680,7 @@ bool WinEDA_App::SetLanguage( bool first_time )
|
|||
delete m_Locale;
|
||||
m_Locale = new wxLocale;
|
||||
|
||||
if( !m_Locale->Init( m_LanguageId ) )
|
||||
if( !m_Locale->Init( m_LanguageId, wxLOCALE_CONV_ENCODING ) )
|
||||
{
|
||||
wxLogDebug( wxT("This language is not supported by the system.") );
|
||||
|
||||
|
|
|
|||
|
|
@ -12,8 +12,8 @@ may choose to document this corresponding work in the CHANGELOG.txt file.
|
|||
/*
|
||||
* This program source code file is part of KICAD, a free EDA CAD application.
|
||||
*
|
||||
* Copyright (C) 1992-2010 <author>
|
||||
* Copyright (C) 1992-2010 Kicad Developers, see change_log.txt for contributors.
|
||||
* Copyright (C) 1992-2011 <author>
|
||||
* Copyright (C) 1992-2011 Kicad Developers, see change_log.txt for contributors.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
EESchema-LIBRARY Version 2.3 Date: 04/12/2010 17:36:18
|
||||
EESchema-LIBRARY Version 2.3 Date: 30/12/2010 18:27:52
|
||||
#
|
||||
# C
|
||||
#
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
EESchema Schematic File Version 2 date 04/12/2010 17:36:18
|
||||
EESchema Schematic File Version 2 date 30/12/2010 18:27:52
|
||||
LIBS:power
|
||||
LIBS:device
|
||||
LIBS:valves
|
||||
|
|
@ -24,12 +24,13 @@ LIBS:display
|
|||
LIBS:cypress
|
||||
LIBS:siliconi
|
||||
LIBS:contrib
|
||||
EELAYER 23 0
|
||||
LIBS:ecc83-pp_v2-cache
|
||||
EELAYER 25 0
|
||||
EELAYER END
|
||||
$Descr A4 11700 8267
|
||||
Sheet 1 1
|
||||
Title "ECC Push-Pull"
|
||||
Date "11 dec 2006"
|
||||
Date "30 dec 2010"
|
||||
Rev "0.1"
|
||||
Comp ""
|
||||
Comment1 ""
|
||||
|
|
@ -41,7 +42,6 @@ Wire Wire Line
|
|||
6050 4450 6150 4450
|
||||
Wire Wire Line
|
||||
5750 3850 5750 4050
|
||||
Connection ~ 4450 4500
|
||||
Wire Wire Line
|
||||
4450 5400 4450 4450
|
||||
Wire Wire Line
|
||||
|
|
@ -102,7 +102,7 @@ L ECC83 U1
|
|||
U 3 1 48B4F266
|
||||
P 9950 5700
|
||||
F 0 "U1" H 10080 6010 50 0000 C CNN
|
||||
F 1 "ECC81_83" H 10300 5400 50 0000 C CNN
|
||||
F 1 "ECC83" H 10300 5400 50 0000 C CNN
|
||||
F 2 "VALVE-NOVAL_P" H 10220 5300 50 0001 C CNN
|
||||
3 9950 5700
|
||||
1 0 0 -1
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@ set(EESCHEMA_SRCS
|
|||
cleanup.cpp
|
||||
cmp_library_keywords.cpp
|
||||
cmp_library_lexer.cpp
|
||||
component_references_lister.cpp
|
||||
controle.cpp
|
||||
cross-probing.cpp
|
||||
dangling_ends.cpp
|
||||
|
|
|
|||
|
|
@ -20,106 +20,11 @@
|
|||
#include "lib_pin.h"
|
||||
|
||||
|
||||
static void BreakReference( std::vector< SCH_REFERENCE >& aComponentsList );
|
||||
static void ReAnnotateComponents( std::vector< SCH_REFERENCE >& aComponentsList );
|
||||
static void ComputeReferenceNumber( std::vector< SCH_REFERENCE >& aComponentsList );
|
||||
int GetLastReferenceNumber( int aObjet, std::vector< SCH_REFERENCE >& aComponentsList );
|
||||
static int ExistUnit( int aObjet, int aUnit, std::vector< SCH_REFERENCE >& aComponentList );
|
||||
|
||||
|
||||
/* sort function to annotate items by their position.
|
||||
* Components are sorted
|
||||
* by reference
|
||||
* if same reference: by sheet
|
||||
* if same sheet, by X pos
|
||||
* if same X pos, by Y pos
|
||||
* if same Y pos, by time stamp
|
||||
*/
|
||||
static bool SortByXPosition( const SCH_REFERENCE& item1, const SCH_REFERENCE& item2 )
|
||||
{
|
||||
int ii = item1.CompareRef( item2 );
|
||||
|
||||
if( ii == 0 )
|
||||
ii = item1.m_SheetPath.Cmp( item2.m_SheetPath );
|
||||
if( ii == 0 )
|
||||
ii = item1.m_RootCmp->m_Pos.x - item2.m_RootCmp->m_Pos.x;
|
||||
if( ii == 0 )
|
||||
ii = item1.m_RootCmp->m_Pos.y - item2.m_RootCmp->m_Pos.y;
|
||||
if( ii == 0 )
|
||||
ii = item1.m_TimeStamp - item2.m_TimeStamp;
|
||||
|
||||
return ii < 0;
|
||||
}
|
||||
|
||||
|
||||
/* sort function to annotate items by their position.
|
||||
* Components are sorted
|
||||
* by reference
|
||||
* if same reference: by sheet
|
||||
* if same sheet, by Y pos
|
||||
* if same Y pos, by X pos
|
||||
* if same X pos, by time stamp
|
||||
*/
|
||||
static bool SortByYPosition( const SCH_REFERENCE& item1, const SCH_REFERENCE& item2 )
|
||||
{
|
||||
int ii = item1.CompareRef( item2 );
|
||||
|
||||
if( ii == 0 )
|
||||
ii = item1.m_SheetPath.Cmp( item2.m_SheetPath );
|
||||
if( ii == 0 )
|
||||
ii = item1.m_RootCmp->m_Pos.y - item2.m_RootCmp->m_Pos.y;
|
||||
if( ii == 0 )
|
||||
ii = item1.m_RootCmp->m_Pos.x - item2.m_RootCmp->m_Pos.x;
|
||||
if( ii == 0 )
|
||||
ii = item1.m_TimeStamp - item2.m_TimeStamp;
|
||||
|
||||
return ii < 0;
|
||||
}
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
* qsort function to annotate items by value
|
||||
* Components are sorted
|
||||
* by reference
|
||||
* if same reference: by value
|
||||
* if same value: by unit number
|
||||
* if same unit number, by sheet
|
||||
* if same sheet, by time stamp
|
||||
*****************************************************************************/
|
||||
static bool SortByValue( const SCH_REFERENCE& item1, const SCH_REFERENCE& item2 )
|
||||
{
|
||||
int ii = item1.CompareRef( item2 );
|
||||
|
||||
if( ii == 0 )
|
||||
ii = item1.CompareValue( item2 );
|
||||
if( ii == 0 )
|
||||
ii = item1.m_Unit - item2.m_Unit;
|
||||
if( ii == 0 )
|
||||
ii = item1.m_SheetPath.Cmp( item2.m_SheetPath );
|
||||
if( ii == 0 )
|
||||
ii = item1.m_RootCmp->m_Pos.x - item2.m_RootCmp->m_Pos.x;
|
||||
if( ii == 0 )
|
||||
ii = item1.m_RootCmp->m_Pos.y - item2.m_RootCmp->m_Pos.y;
|
||||
if( ii == 0 )
|
||||
ii = item1.m_TimeStamp - item2.m_TimeStamp;
|
||||
|
||||
return ii < 0;
|
||||
}
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
* qsort function to annotate items by value
|
||||
* Components are sorted by time stamp
|
||||
*****************************************************************************/
|
||||
static bool SortByTimeStamp( const SCH_REFERENCE& item1, const SCH_REFERENCE& item2 )
|
||||
{
|
||||
int ii = item1.m_SheetPath.Cmp( item2.m_SheetPath );
|
||||
|
||||
if( ii == 0 )
|
||||
ii = item1.m_TimeStamp - item2.m_TimeStamp;
|
||||
|
||||
return ii < 0;
|
||||
}
|
||||
static void BreakReference( SCH_REFERENCE_LIST& aComponentsList );
|
||||
static void ReAnnotateComponents( SCH_REFERENCE_LIST& aComponentsList );
|
||||
static void ComputeReferenceNumber( SCH_REFERENCE_LIST& aComponentsList, bool aUseSheetNum );
|
||||
static int GetLastReferenceNumber( int aObjet,SCH_REFERENCE_LIST& aComponentsList );
|
||||
static int ExistUnit( int aObjet, int aUnit, SCH_REFERENCE_LIST& aComponentList );
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -127,9 +32,8 @@ static bool SortByTimeStamp( const SCH_REFERENCE& item1, const SCH_REFERENCE& it
|
|||
* Remove current component annotations
|
||||
* @param aCurrentSheetOnly : if false: remove all annotations, else remove
|
||||
* annotation relative to the current sheet only
|
||||
* @param aRedraw : true to refresh display
|
||||
*/
|
||||
void SCH_EDIT_FRAME::DeleteAnnotation( bool aCurrentSheetOnly, bool aRedraw )
|
||||
void SCH_EDIT_FRAME::DeleteAnnotation( bool aCurrentSheetOnly )
|
||||
{
|
||||
if( aCurrentSheetOnly )
|
||||
{
|
||||
|
|
@ -145,9 +49,6 @@ void SCH_EDIT_FRAME::DeleteAnnotation( bool aCurrentSheetOnly, bool aRedraw )
|
|||
|
||||
// Update the references for the sheet that is currently being displayed.
|
||||
m_CurrentSheet->UpdateAllScreenReferences();
|
||||
|
||||
if( aRedraw )
|
||||
DrawPanel->Refresh( true );
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -171,13 +72,13 @@ void SCH_EDIT_FRAME::DeleteAnnotation( bool aCurrentSheetOnly, bool aRedraw )
|
|||
* stamps are used to handle annotation mainly in complex
|
||||
* hierarchies.
|
||||
*/
|
||||
void AnnotateComponents( SCH_EDIT_FRAME* parent,
|
||||
void SCH_EDIT_FRAME::AnnotateComponents(
|
||||
bool annotateSchematic,
|
||||
int sortOption,
|
||||
bool resetAnnotation,
|
||||
bool repairsTimestamps )
|
||||
{
|
||||
std::vector< SCH_REFERENCE > references;
|
||||
SCH_REFERENCE_LIST references;
|
||||
|
||||
wxBusyCursor dummy;
|
||||
|
||||
|
|
@ -203,13 +104,13 @@ void AnnotateComponents( SCH_EDIT_FRAME* parent,
|
|||
|
||||
// If it is an annotation for all the components, reset previous annotation.
|
||||
if( resetAnnotation )
|
||||
parent->DeleteAnnotation( !annotateSchematic, false );
|
||||
DeleteAnnotation( !annotateSchematic );
|
||||
|
||||
// Update the screen date.
|
||||
screens.SetDate( GenDate() );
|
||||
|
||||
// Set sheet number and total sheet counts.
|
||||
parent->SetSheetNumberAndCount();
|
||||
SetSheetNumberAndCount();
|
||||
|
||||
/* Build component list */
|
||||
if( annotateSchematic )
|
||||
|
|
@ -218,71 +119,66 @@ void AnnotateComponents( SCH_EDIT_FRAME* parent,
|
|||
}
|
||||
else
|
||||
{
|
||||
parent->GetSheet()->GetComponents( references );
|
||||
GetSheet()->GetComponents( references );
|
||||
}
|
||||
|
||||
/* Break full components reference in name (prefix) and number:
|
||||
* example: IC1 become IC, and 1 */
|
||||
BreakReference( references );
|
||||
|
||||
bool useSheetNum = false;
|
||||
switch( sortOption )
|
||||
{
|
||||
case 0:
|
||||
sort( references.begin(), references.end(), SortByXPosition );
|
||||
references.SortCmpByXCoordinate();
|
||||
break;
|
||||
|
||||
case 1:
|
||||
sort( references.begin(), references.end(), SortByYPosition );
|
||||
useSheetNum = true;
|
||||
references.SortCmpByXCoordinate();
|
||||
break;
|
||||
|
||||
case 2:
|
||||
sort( references.begin(), references.end(), SortByValue );
|
||||
references.SortCmpByYCoordinate();
|
||||
break;
|
||||
|
||||
case 3:
|
||||
useSheetNum = true;
|
||||
references.SortCmpByYCoordinate();
|
||||
break;
|
||||
|
||||
case 4:
|
||||
references.SortComponentsByRefAndValue();
|
||||
break;
|
||||
}
|
||||
|
||||
/* Recalculate reference numbers */
|
||||
ComputeReferenceNumber( references );
|
||||
ComputeReferenceNumber( references, useSheetNum );
|
||||
ReAnnotateComponents( references );
|
||||
|
||||
/* Final control (just in case ... )*/
|
||||
parent->CheckAnnotate( NULL, !annotateSchematic );
|
||||
parent->OnModify();
|
||||
parent->DrawPanel->Refresh( true );
|
||||
CheckAnnotate( NULL, !annotateSchematic );
|
||||
OnModify();
|
||||
DrawPanel->Refresh( true );
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Update the reference component for the schematic project (or the current sheet)
|
||||
*/
|
||||
static void ReAnnotateComponents( std::vector< SCH_REFERENCE >& aComponentList )
|
||||
static void ReAnnotateComponents( SCH_REFERENCE_LIST& aComponentList )
|
||||
{
|
||||
/* update the reference numbers */
|
||||
for( unsigned ii = 0; ii < aComponentList.size(); ii++ )
|
||||
for( unsigned ii = 0; ii < aComponentList.GetCount(); ii++ )
|
||||
{
|
||||
#if 0
|
||||
char* Text = aComponentList[ii].m_Reference;
|
||||
SCH_COMPONENT* component = aComponentList[ii].m_RootCmp;
|
||||
|
||||
if( aComponentList[ii].m_NumRef < 0 )
|
||||
strcat( Text, "?" );
|
||||
else
|
||||
sprintf( Text + strlen( Text ), "%d", aComponentList[ii].m_NumRef );
|
||||
|
||||
component->SetRef( &(aComponentList[ii].m_SheetPath), CONV_FROM_UTF8( Text ) );
|
||||
|
||||
component->SetUnit( aComponentList[ii].m_Unit );
|
||||
component->SetUnitSelection( &aComponentList[ii].m_SheetPath,
|
||||
aComponentList[ii].m_Unit );
|
||||
#else
|
||||
aComponentList[ii].Annotate();
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void BreakReference( std::vector< SCH_REFERENCE >& aComponentsList )
|
||||
void BreakReference( SCH_REFERENCE_LIST& aComponentsList )
|
||||
{
|
||||
for( unsigned ii = 0; ii < aComponentsList.size(); ii++ )
|
||||
for( unsigned ii = 0; ii < aComponentsList.GetCount(); ii++ )
|
||||
aComponentsList[ii].Split();
|
||||
}
|
||||
|
||||
|
|
@ -291,14 +187,14 @@ void BreakReference( std::vector< SCH_REFERENCE >& aComponentsList )
|
|||
* Compute the reference number for components without reference number
|
||||
* Compute .m_NumRef member
|
||||
*/
|
||||
static void ComputeReferenceNumber( std::vector< SCH_REFERENCE >& aComponentsList )
|
||||
static void ComputeReferenceNumber( SCH_REFERENCE_LIST& aComponentsList, bool aUseSheetNum )
|
||||
{
|
||||
int LastReferenceNumber, NumberOfUnits, Unit;
|
||||
|
||||
/* Components with an invisible reference (power...) always are
|
||||
* re-annotated. So set their .m_IsNew member to true
|
||||
*/
|
||||
for( unsigned ii = 0; ii < aComponentsList.size(); ii++ )
|
||||
for( unsigned ii = 0; ii < aComponentsList.GetCount(); ii++ )
|
||||
{
|
||||
if( aComponentsList[ii].GetRefStr()[0] == '#' )
|
||||
{
|
||||
|
|
@ -315,7 +211,7 @@ static void ComputeReferenceNumber( std::vector< SCH_REFERENCE >& aComponentsLis
|
|||
unsigned first = 0;
|
||||
/* calculate the last used number for this reference prefix: */
|
||||
LastReferenceNumber = GetLastReferenceNumber( first, aComponentsList );
|
||||
for( unsigned ii = 0; ii < aComponentsList.size(); ii++ )
|
||||
for( unsigned ii = 0; ii < aComponentsList.GetCount(); ii++ )
|
||||
{
|
||||
if( aComponentsList[ii].m_Flag )
|
||||
continue;
|
||||
|
|
@ -327,7 +223,13 @@ static void ComputeReferenceNumber( std::vector< SCH_REFERENCE >& aComponentsLis
|
|||
first = ii;
|
||||
LastReferenceNumber = GetLastReferenceNumber( ii, aComponentsList );
|
||||
}
|
||||
|
||||
// when using sheet number, ensure annot number >= sheet number* 100
|
||||
if( aUseSheetNum )
|
||||
{
|
||||
int min_num = aComponentsList[ii].m_SheetNum * 100;
|
||||
if( LastReferenceNumber < min_num )
|
||||
LastReferenceNumber = min_num;
|
||||
}
|
||||
/* Annotation of one part per package components (trivial case)*/
|
||||
if( aComponentsList[ii].m_Entry->GetPartCount() <= 1 )
|
||||
{
|
||||
|
|
@ -374,7 +276,7 @@ static void ComputeReferenceNumber( std::vector< SCH_REFERENCE >& aComponentsLis
|
|||
|
||||
/* Search a component to annotate ( same prefix, same value,
|
||||
* not annotated) */
|
||||
for( unsigned jj = ii + 1; jj < aComponentsList.size(); jj++ )
|
||||
for( unsigned jj = ii + 1; jj < aComponentsList.GetCount(); jj++ )
|
||||
{
|
||||
if( aComponentsList[jj].m_Flag ) // already tested
|
||||
continue;
|
||||
|
|
@ -414,11 +316,11 @@ static void ComputeReferenceNumber( std::vector< SCH_REFERENCE >& aComponentsLis
|
|||
* the search pattern)
|
||||
* @param aComponentsList = list of items
|
||||
*/
|
||||
int GetLastReferenceNumber( int aObjet, std::vector< SCH_REFERENCE >& aComponentsList )
|
||||
int GetLastReferenceNumber( int aObjet,SCH_REFERENCE_LIST& aComponentsList )
|
||||
{
|
||||
int LastNumber = 0;
|
||||
|
||||
for( unsigned ii = 0; ii < aComponentsList.size(); ii++ )
|
||||
for( unsigned ii = 0; ii < aComponentsList.GetCount(); ii++ )
|
||||
{
|
||||
/* New identifier. */
|
||||
if( aComponentsList[aObjet].CompareRef( aComponentsList[ii] ) != 0 )
|
||||
|
|
@ -442,13 +344,13 @@ int GetLastReferenceNumber( int aObjet, std::vector< SCH_REFERENCE >& aComponent
|
|||
* @param aComponentsList = list of items to examine
|
||||
* @return index in aComponentsList if found or -1 if not found
|
||||
*/
|
||||
static int ExistUnit( int aObjet, int Unit, std::vector< SCH_REFERENCE >& aComponentsList )
|
||||
static int ExistUnit( int aObjet, int Unit, SCH_REFERENCE_LIST& aComponentsList )
|
||||
{
|
||||
int NumRef;
|
||||
|
||||
NumRef = aComponentsList[aObjet].m_NumRef;
|
||||
|
||||
for( unsigned ii = 0; ii < aComponentsList.size(); ii++ )
|
||||
for( unsigned ii = 0; ii < aComponentsList.GetCount(); ii++ )
|
||||
{
|
||||
if( aObjet == (int) ii )
|
||||
// Do not compare with itself !
|
||||
|
|
@ -496,7 +398,7 @@ int SCH_EDIT_FRAME::CheckAnnotate( wxArrayString* aMessageList, bool aOneSheetOn
|
|||
/* build the screen list */
|
||||
SCH_SHEET_LIST SheetList;
|
||||
|
||||
std::vector< SCH_REFERENCE > ComponentsList;
|
||||
SCH_REFERENCE_LIST ComponentsList;
|
||||
|
||||
/* Build the list of components */
|
||||
if( !aOneSheetOnly )
|
||||
|
|
@ -504,7 +406,7 @@ int SCH_EDIT_FRAME::CheckAnnotate( wxArrayString* aMessageList, bool aOneSheetOn
|
|||
else
|
||||
GetSheet()->GetComponents( ComponentsList );
|
||||
|
||||
sort( ComponentsList.begin(), ComponentsList.end(), SortByValue );
|
||||
ComponentsList.SortComponentsByRefAndValue();
|
||||
|
||||
/* Break full components reference in name (prefix) and number: example:
|
||||
* IC1 become IC, and 1 */
|
||||
|
|
@ -512,7 +414,7 @@ int SCH_EDIT_FRAME::CheckAnnotate( wxArrayString* aMessageList, bool aOneSheetOn
|
|||
|
||||
/* count not yet annotated items */
|
||||
error = 0;
|
||||
int imax = ComponentsList.size() - 1;
|
||||
int imax = ComponentsList.GetCount() - 1;
|
||||
|
||||
for( int ii = 0; ii < imax; ii++ )
|
||||
{
|
||||
|
|
@ -681,7 +583,7 @@ int SCH_EDIT_FRAME::CheckAnnotate( wxArrayString* aMessageList, bool aOneSheetOn
|
|||
}
|
||||
|
||||
// count the duplicated time stamps
|
||||
sort( ComponentsList.begin(), ComponentsList.end(), SortByTimeStamp );
|
||||
ComponentsList.SortComponentsByTimeStamp();
|
||||
|
||||
for( int ii = 0; ( ii < imax ) && ( error < 4 ); ii++ )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: build_BOM.cpp
|
||||
// Purpose:
|
||||
// Author: jean-pierre Charras
|
||||
// License: GPL license
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
|
@ -14,27 +13,18 @@
|
|||
#include "kicad_string.h"
|
||||
|
||||
#include "general.h"
|
||||
#include "netlist.h"
|
||||
#include "protos.h"
|
||||
#include "sch_sheet.h"
|
||||
#include "sch_component.h"
|
||||
#include "template_fieldnames.h"
|
||||
#include "netlist.h"
|
||||
|
||||
|
||||
/**
|
||||
* @bug - Every instance of fprintf() and fputs() in this file fails to check
|
||||
* the return value for an error.
|
||||
/* Fill aList with labels
|
||||
*/
|
||||
|
||||
|
||||
/* Fill aList with Glabel info
|
||||
*/
|
||||
void GenListeGLabels( std::vector <LABEL_OBJECT>& aList )
|
||||
void GenListeGLabels( LABEL_OBJECT_LIST& aList )
|
||||
{
|
||||
// Build the sheet list
|
||||
SCH_SHEET_LIST sheetList;
|
||||
|
||||
LABEL_OBJECT lable;
|
||||
LABEL_OBJECT label;
|
||||
|
||||
for( SCH_SHEET_PATH* path = sheetList.GetFirst(); path; path = sheetList.GetNext() )
|
||||
{
|
||||
|
|
@ -46,22 +36,22 @@ void GenListeGLabels( std::vector <LABEL_OBJECT>& aList )
|
|||
{
|
||||
case SCH_HIERARCHICAL_LABEL_T:
|
||||
case SCH_GLOBAL_LABEL_T:
|
||||
lable.m_LabelType = schItem->Type();
|
||||
lable.m_SheetPath = *path;
|
||||
lable.m_Label = schItem;
|
||||
aList.push_back( lable );
|
||||
label.m_LabelType = schItem->Type();
|
||||
label.m_SheetPath = *path;
|
||||
label.m_Label = schItem;
|
||||
aList.push_back( label );
|
||||
break;
|
||||
|
||||
case SCH_SHEET_T:
|
||||
{
|
||||
SCH_SHEET* sheet = (SCH_SHEET*) schItem;
|
||||
|
||||
BOOST_FOREACH( SCH_SHEET_PIN sheetLabel, sheet->GetSheetPins() )
|
||||
BOOST_FOREACH( SCH_SHEET_PIN& sheetLabel, sheet->GetSheetPins() )
|
||||
{
|
||||
lable.m_LabelType = SCH_SHEET_LABEL_T;
|
||||
lable.m_SheetPath = *path;
|
||||
lable.m_Label = &sheetLabel;
|
||||
aList.push_back( lable );
|
||||
label.m_LabelType = SCH_SHEET_LABEL_T;
|
||||
label.m_SheetPath = *path;
|
||||
label.m_Label = &sheetLabel;
|
||||
aList.push_back( label );
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
|
@ -75,65 +65,6 @@ void GenListeGLabels( std::vector <LABEL_OBJECT>& aList )
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
/* Compare function for sort()
|
||||
* components are sorted
|
||||
* by value
|
||||
* if same value: by reference
|
||||
* if same reference: by unit number
|
||||
*/
|
||||
bool SortComponentsByValue( const SCH_REFERENCE& obj1, const SCH_REFERENCE& obj2 )
|
||||
{
|
||||
int ii;
|
||||
const wxString* Text1, * Text2;
|
||||
|
||||
Text1 = &( obj1.m_RootCmp->GetField( VALUE )->m_Text );
|
||||
Text2 = &( obj2.m_RootCmp->GetField( VALUE )->m_Text );
|
||||
ii = Text1->CmpNoCase( *Text2 );
|
||||
|
||||
if( ii == 0 )
|
||||
{
|
||||
ii = RefDesStringCompare( obj1.GetRef(), obj2.GetRef() );
|
||||
}
|
||||
|
||||
if( ii == 0 )
|
||||
{
|
||||
ii = obj1.m_Unit - obj2.m_Unit;
|
||||
}
|
||||
|
||||
return ii < 0;
|
||||
}
|
||||
|
||||
|
||||
/* compare function for sorting
|
||||
* components are sorted
|
||||
* by reference
|
||||
* if same reference: by value
|
||||
* if same value: by unit number
|
||||
*/
|
||||
bool SortComponentsByReference( const SCH_REFERENCE& obj1, const SCH_REFERENCE& obj2 )
|
||||
{
|
||||
int ii;
|
||||
const wxString* Text1, * Text2;
|
||||
|
||||
ii = RefDesStringCompare( obj1.GetRef(), obj2.GetRef() );
|
||||
|
||||
if( ii == 0 )
|
||||
{
|
||||
Text1 = &( obj1.m_RootCmp->GetField( VALUE )->m_Text );
|
||||
Text2 = &( obj2.m_RootCmp->GetField( VALUE )->m_Text );
|
||||
ii = Text1->CmpNoCase( *Text2 );
|
||||
}
|
||||
|
||||
if( ii == 0 )
|
||||
{
|
||||
ii = obj1.m_Unit - obj2.m_Unit;
|
||||
}
|
||||
|
||||
return ii < 0;
|
||||
}
|
||||
|
||||
|
||||
/* compare function for sorting labels
|
||||
* sort by
|
||||
* value
|
||||
|
|
@ -195,43 +126,10 @@ bool SortLabelsBySheet( const LABEL_OBJECT& obj1, const LABEL_OBJECT& obj2 )
|
|||
}
|
||||
|
||||
|
||||
/* Remove sub components from the list, when multiples parts per package are
|
||||
* found in this list
|
||||
* The component list **MUST** be sorted by reference and by unit number
|
||||
*/
|
||||
void DeleteSubCmp( std::vector< SCH_REFERENCE >& aList )
|
||||
int PrintListeGLabel( FILE* f, LABEL_OBJECT_LIST& aList )
|
||||
{
|
||||
SCH_COMPONENT* libItem;
|
||||
wxString oldName;
|
||||
wxString currName;
|
||||
|
||||
|
||||
for( unsigned ii = 0; ii < aList.size(); ii++ )
|
||||
{
|
||||
libItem = aList[ii].m_RootCmp;
|
||||
|
||||
if( libItem == NULL )
|
||||
continue;
|
||||
|
||||
currName = aList[ii].GetRef();
|
||||
|
||||
if( !oldName.IsEmpty() )
|
||||
{
|
||||
if( oldName == currName ) // currName is a subpart of oldName: remove it
|
||||
{
|
||||
aList.erase( aList.begin() + ii );
|
||||
ii--;
|
||||
}
|
||||
}
|
||||
oldName = currName;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
int PrintListeGLabel( FILE* f, std::vector <LABEL_OBJECT>& aList )
|
||||
{
|
||||
SCH_LABEL* DrawTextItem;
|
||||
SCH_SHEET_PIN* DrawSheetLabel;
|
||||
SCH_LABEL* label;
|
||||
SCH_SHEET_PIN* pinsheet;
|
||||
wxString msg, sheetpath;
|
||||
wxString labeltype;
|
||||
|
||||
|
|
@ -241,7 +139,7 @@ int PrintListeGLabel( FILE* f, std::vector <LABEL_OBJECT>& aList )
|
|||
{
|
||||
case SCH_HIERARCHICAL_LABEL_T:
|
||||
case SCH_GLOBAL_LABEL_T:
|
||||
DrawTextItem = (SCH_LABEL*)(aList[ii].m_Label);
|
||||
label = (SCH_LABEL*)(aList[ii].m_Label);
|
||||
|
||||
if( aList[ii].m_LabelType == SCH_HIERARCHICAL_LABEL_T )
|
||||
labeltype = wxT( "Hierarchical" );
|
||||
|
|
@ -250,19 +148,19 @@ int PrintListeGLabel( FILE* f, std::vector <LABEL_OBJECT>& aList )
|
|||
|
||||
sheetpath = aList[ii].m_SheetPath.PathHumanReadable();
|
||||
msg.Printf( _( "> %-28.28s %s (Sheet %s) pos: %3.3f, %3.3f\n" ),
|
||||
GetChars( DrawTextItem->m_Text ),
|
||||
GetChars( label->m_Text ),
|
||||
GetChars( labeltype ),
|
||||
GetChars( sheetpath ),
|
||||
(float) DrawTextItem->m_Pos.x / 1000,
|
||||
(float) DrawTextItem->m_Pos.y / 1000 );
|
||||
(float) label->m_Pos.x / 1000,
|
||||
(float) label->m_Pos.y / 1000 );
|
||||
|
||||
fputs( CONV_TO_UTF8( msg ), f );
|
||||
break;
|
||||
|
||||
case SCH_SHEET_LABEL_T:
|
||||
{
|
||||
DrawSheetLabel = (SCH_SHEET_PIN*) aList[ii].m_Label;
|
||||
int jj = DrawSheetLabel->m_Shape;
|
||||
pinsheet = (SCH_SHEET_PIN*) aList[ii].m_Label;
|
||||
int jj = pinsheet->m_Shape;
|
||||
|
||||
if( jj < 0 )
|
||||
jj = NET_TMAX;
|
||||
|
|
@ -273,11 +171,11 @@ int PrintListeGLabel( FILE* f, std::vector <LABEL_OBJECT>& aList )
|
|||
wxString labtype = CONV_FROM_UTF8( SheetLabelType[jj] );
|
||||
|
||||
msg.Printf( _( "> %-28.28s PinSheet %-7.7s (Sheet %s) pos: %3.3f, %3.3f\n" ),
|
||||
GetChars( DrawSheetLabel->m_Text ),
|
||||
GetChars( pinsheet->m_Text ),
|
||||
GetChars( labtype ),
|
||||
GetChars( aList[ii].m_SheetPath.PathHumanReadable() ),
|
||||
(float) DrawSheetLabel->m_Pos.x / 1000,
|
||||
(float) DrawSheetLabel->m_Pos.y / 1000 );
|
||||
(float) pinsheet->m_Pos.x / 1000,
|
||||
(float) pinsheet->m_Pos.y / 1000 );
|
||||
|
||||
fputs( CONV_TO_UTF8( msg ), f );
|
||||
}
|
||||
|
|
|
|||
|
|
@ -253,7 +253,7 @@ wxString LIB_COMPONENT::GetLibraryName()
|
|||
|
||||
|
||||
/**
|
||||
* Function IsMulti
|
||||
* Function ReturnSubReference
|
||||
* @return the sub reference for component having multiple parts per package.
|
||||
* The sub reference identify the part (or unit)
|
||||
* @param aUnit = the part identifier ( 1 to 26)
|
||||
|
|
|
|||
|
|
@ -545,7 +545,7 @@ public:
|
|||
bool IsMulti() { return m_unitCount > 1; }
|
||||
|
||||
/**
|
||||
* Function IsMulti
|
||||
* Function ReturnSubReference
|
||||
* @return the sub reference for component having multiple parts per package.
|
||||
* The sub reference identify the part (or unit)
|
||||
* @param aUnit = the part identifier ( 1 to max count)
|
||||
|
|
|
|||
|
|
@ -0,0 +1,328 @@
|
|||
/*
|
||||
* component_references_lister.cpp: creates a flat list of components.
|
||||
* Needed for annotation and BOM.
|
||||
*/
|
||||
|
||||
/*
|
||||
* This program source code file is part of KICAD, a free EDA CAD application.
|
||||
*
|
||||
* Copyright (C) 1992-2011 jean-pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr>
|
||||
* Copyright (C) 1992-2011 Wayne Stambaugh <stambaughw@verizon.net>
|
||||
* Copyright (C) 1992-2011 Kicad Developers, see change_log.txt for contributors.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation; either version 2
|
||||
* of the License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, you may find one here:
|
||||
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
|
||||
* or you may search the http://www.gnu.org website for the version 2 license,
|
||||
* or you may write to the Free Software Foundation, Inc.,
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
|
||||
#include <algorithm> // to use sort vector
|
||||
#include <vector>
|
||||
|
||||
#include "fctsys.h"
|
||||
#include "common.h"
|
||||
#include "kicad_string.h"
|
||||
#include "wxEeschemaStruct.h"
|
||||
#include "wxstruct.h"
|
||||
#include "netlist.h"
|
||||
#include "class_sch_screen.h"
|
||||
#include "sch_component.h"
|
||||
|
||||
|
||||
|
||||
/* sort function to annotate items from their position.
|
||||
* Components are sorted
|
||||
* by reference
|
||||
* if same reference: by sheet
|
||||
* if same sheet, by X pos
|
||||
* if same X pos, by Y pos
|
||||
* if same Y pos, by time stamp
|
||||
*/
|
||||
bool SCH_REFERENCE_LIST::sortBy_X_Position( const SCH_REFERENCE& item1,
|
||||
const SCH_REFERENCE& item2 )
|
||||
{
|
||||
int ii = item1.CompareRef( item2 );
|
||||
|
||||
if( ii == 0 )
|
||||
ii = item1.m_SheetNum - item2.m_SheetNum;
|
||||
if( ii == 0 )
|
||||
ii = item1.m_CmpPos.x - item2.m_CmpPos.x;
|
||||
if( ii == 0 )
|
||||
ii = item1.m_CmpPos.y - item2.m_CmpPos.y;
|
||||
if( ii == 0 )
|
||||
ii = item1.m_TimeStamp - item2.m_TimeStamp;
|
||||
|
||||
return ii < 0;
|
||||
}
|
||||
|
||||
|
||||
/* sort function to annotate items by their position.
|
||||
* Components are sorted
|
||||
* by reference
|
||||
* if same reference: by sheet
|
||||
* if same sheet, by Y pos
|
||||
* if same Y pos, by X pos
|
||||
* if same X pos, by time stamp
|
||||
*/
|
||||
bool SCH_REFERENCE_LIST::sortBy_Y_Position( const SCH_REFERENCE& item1,
|
||||
const SCH_REFERENCE& item2 )
|
||||
{
|
||||
int ii = item1.CompareRef( item2 );
|
||||
|
||||
if( ii == 0 )
|
||||
ii = item1.m_SheetNum - item2.m_SheetNum;
|
||||
if( ii == 0 )
|
||||
ii = item1.m_CmpPos.y - item2.m_CmpPos.y;
|
||||
if( ii == 0 )
|
||||
ii = item1.m_CmpPos.x - item2.m_CmpPos.x;
|
||||
if( ii == 0 )
|
||||
ii = item1.m_TimeStamp - item2.m_TimeStamp;
|
||||
|
||||
return ii < 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* sort function to annotate items by value
|
||||
* Components are sorted
|
||||
* by reference
|
||||
* if same reference: by value
|
||||
* if same value: by unit number
|
||||
* if same unit number, by sheet
|
||||
* if same sheet, by position X, and Y
|
||||
*/
|
||||
bool SCH_REFERENCE_LIST::sortByRefAndValue( const SCH_REFERENCE& item1, const SCH_REFERENCE& item2 )
|
||||
{
|
||||
int ii = item1.CompareRef( item2 );
|
||||
if( ii == 0 )
|
||||
ii = item1.CompareValue( item2 );
|
||||
if( ii == 0 )
|
||||
ii = item1.m_Unit - item2.m_Unit;
|
||||
if( ii == 0 )
|
||||
ii = item1.m_SheetNum - item2.m_SheetNum;
|
||||
if( ii == 0 )
|
||||
ii = item1.m_CmpPos.x - item2.m_CmpPos.x;
|
||||
if( ii == 0 )
|
||||
ii = item1.m_CmpPos.y - item2.m_CmpPos.y;
|
||||
if( ii == 0 )
|
||||
ii = item1.m_TimeStamp - item2.m_TimeStamp;
|
||||
|
||||
return ii < 0;
|
||||
}
|
||||
|
||||
/* sort function for for list by values
|
||||
* components are sorted
|
||||
* by value
|
||||
* if same value: by reference
|
||||
* if same reference: by unit number
|
||||
*/
|
||||
bool SCH_REFERENCE_LIST::sortComponentsByValueOnly( const SCH_REFERENCE& item1, const SCH_REFERENCE& item2 )
|
||||
{
|
||||
int ii;
|
||||
const wxString* Text1, * Text2;
|
||||
|
||||
Text1 = &( item1.m_RootCmp->GetField( VALUE )->m_Text );
|
||||
Text2 = &( item2.m_RootCmp->GetField( VALUE )->m_Text );
|
||||
ii = Text1->CmpNoCase( *Text2 );
|
||||
|
||||
if( ii == 0 )
|
||||
{
|
||||
ii = RefDesStringCompare( item1.GetRef(), item2.GetRef() );
|
||||
}
|
||||
|
||||
if( ii == 0 )
|
||||
{
|
||||
ii = item1.m_Unit - item2.m_Unit;
|
||||
}
|
||||
|
||||
return ii < 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Function sortComponentsByReferenceOnly
|
||||
* compare function for sorting in BOM creation.
|
||||
* components are sorted
|
||||
* by reference
|
||||
* if same reference: by value
|
||||
* if same value: by unit number
|
||||
*/
|
||||
bool SCH_REFERENCE_LIST::sortComponentsByReferenceOnly( const SCH_REFERENCE& item1,
|
||||
const SCH_REFERENCE& item2 )
|
||||
{
|
||||
int ii;
|
||||
const wxString* Text1, * Text2;
|
||||
|
||||
ii = RefDesStringCompare( item1.GetRef(), item2.GetRef() );
|
||||
|
||||
if( ii == 0 )
|
||||
{
|
||||
Text1 = &( item1.m_RootCmp->GetField( VALUE )->m_Text );
|
||||
Text2 = &( item2.m_RootCmp->GetField( VALUE )->m_Text );
|
||||
ii = Text1->CmpNoCase( *Text2 );
|
||||
}
|
||||
|
||||
if( ii == 0 )
|
||||
{
|
||||
ii = item1.m_Unit - item2.m_Unit;
|
||||
}
|
||||
|
||||
return ii < 0;
|
||||
}
|
||||
|
||||
|
||||
/*****************************************************************************
|
||||
* qsort function to annotate items by value
|
||||
* Components are sorted by time stamp
|
||||
*****************************************************************************/
|
||||
bool SCH_REFERENCE_LIST::sortByTimeStamp( const SCH_REFERENCE& item1,
|
||||
const SCH_REFERENCE& item2 )
|
||||
{
|
||||
int ii = item1.m_SheetPath.Cmp( item2.m_SheetPath );
|
||||
|
||||
if( ii == 0 )
|
||||
ii = item1.m_TimeStamp - item2.m_TimeStamp;
|
||||
|
||||
return ii < 0;
|
||||
}
|
||||
|
||||
|
||||
/* Remove sub components from the list, when multiples parts per package are
|
||||
* found in this list
|
||||
*/
|
||||
void SCH_REFERENCE_LIST::RemoveSubComponentsFromList( )
|
||||
{
|
||||
SCH_COMPONENT* libItem;
|
||||
wxString oldName;
|
||||
wxString currName;
|
||||
|
||||
// The component list **MUST** be sorted by reference and by unit number
|
||||
// in order to find all parts of a component
|
||||
SortComponentsByReferenceOnly();
|
||||
for( unsigned ii = 0; ii < componentFlatList.size(); ii++ )
|
||||
{
|
||||
libItem = componentFlatList[ii].m_RootCmp;
|
||||
if( libItem == NULL )
|
||||
continue;
|
||||
|
||||
currName = componentFlatList[ii].GetRef();
|
||||
|
||||
if( !oldName.IsEmpty() )
|
||||
{
|
||||
if( oldName == currName ) // currName is a subpart of oldName:
|
||||
// remove it
|
||||
{
|
||||
componentFlatList.erase( componentFlatList.begin() + ii );
|
||||
ii--;
|
||||
}
|
||||
}
|
||||
oldName = currName;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
SCH_REFERENCE::SCH_REFERENCE( SCH_COMPONENT* aComponent, LIB_COMPONENT* aLibComponent,
|
||||
SCH_SHEET_PATH& aSheetPath )
|
||||
{
|
||||
wxASSERT( aComponent != NULL && aLibComponent != NULL );
|
||||
|
||||
m_RootCmp = aComponent;
|
||||
m_Entry = aLibComponent;
|
||||
m_Unit = aComponent->GetUnitSelection( &aSheetPath );
|
||||
m_SheetPath = aSheetPath;
|
||||
m_IsNew = false;
|
||||
m_Flag = 0;
|
||||
m_TimeStamp = aComponent->m_TimeStamp;
|
||||
m_CmpPos = aComponent->m_Pos;
|
||||
m_SheetNum = 0;
|
||||
|
||||
if( aComponent->GetRef( &aSheetPath ).IsEmpty() )
|
||||
aComponent->SetRef( &aSheetPath, wxT( "DefRef?" ) );
|
||||
|
||||
SetRef( aComponent->GetRef( &aSheetPath ) );
|
||||
|
||||
m_NumRef = -1;
|
||||
|
||||
if( aComponent->GetField( VALUE )->GetText().IsEmpty() )
|
||||
aComponent->GetField( VALUE )->SetText( wxT( "~" ) );
|
||||
|
||||
m_Value = &aComponent->GetField( VALUE )->m_Text;
|
||||
}
|
||||
|
||||
|
||||
void SCH_REFERENCE::Annotate()
|
||||
{
|
||||
if( m_NumRef < 0 )
|
||||
m_Ref += wxChar( '?' );
|
||||
else
|
||||
m_Ref = CONV_TO_UTF8( GetRef() << m_NumRef );
|
||||
|
||||
m_RootCmp->SetRef( &m_SheetPath, CONV_FROM_UTF8( m_Ref.c_str() ) );
|
||||
m_RootCmp->SetUnit( m_Unit );
|
||||
m_RootCmp->SetUnitSelection( &m_SheetPath, m_Unit );
|
||||
}
|
||||
|
||||
|
||||
void SCH_REFERENCE::Split()
|
||||
{
|
||||
std::string refText = GetRefStr();
|
||||
|
||||
m_NumRef = -1;
|
||||
|
||||
int ll = refText.length() - 1;
|
||||
|
||||
if( refText[ll] == '?' )
|
||||
{
|
||||
m_IsNew = true;
|
||||
|
||||
if( !IsPartsLocked() )
|
||||
m_Unit = 0x7FFFFFFF;
|
||||
|
||||
refText.erase( ll ); // delete last char
|
||||
|
||||
SetRefStr( refText );
|
||||
}
|
||||
else if( isdigit( refText[ll] ) == 0 )
|
||||
{
|
||||
m_IsNew = true;
|
||||
|
||||
if( !IsPartsLocked() )
|
||||
m_Unit = 0x7FFFFFFF;
|
||||
}
|
||||
else
|
||||
{
|
||||
while( ll >= 0 )
|
||||
{
|
||||
if( (refText[ll] <= ' ' ) || isdigit( refText[ll] ) )
|
||||
ll--;
|
||||
else
|
||||
{
|
||||
if( isdigit( refText[ll + 1] ) )
|
||||
{
|
||||
// null terminated C string into cp
|
||||
const char* cp = refText.c_str() + ll + 1;
|
||||
|
||||
m_NumRef = atoi( cp );
|
||||
}
|
||||
|
||||
refText.erase( ll+1 ); // delete from ll+1 to end
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
SetRefStr( refText );
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -9,17 +9,12 @@
|
|||
#include "bitmaps.h"
|
||||
#include "common.h"
|
||||
#include "wxEeschemaStruct.h"
|
||||
#include "class_drawpanel.h"
|
||||
|
||||
#include "annotate_dialog.h"
|
||||
|
||||
#define KEY_ANNOTATE_SORT_OPTION wxT("AnnotateSortOption")
|
||||
|
||||
extern void AnnotateComponents( SCH_EDIT_FRAME* parent,
|
||||
bool annotateSchematic,
|
||||
int sortOption,
|
||||
bool resetAnnotation,
|
||||
bool repairsTimestamps );
|
||||
|
||||
|
||||
DIALOG_ANNOTATE::DIALOG_ANNOTATE( SCH_EDIT_FRAME* parent )
|
||||
: DIALOG_ANNOTATE_BASE( parent )
|
||||
|
|
@ -44,29 +39,35 @@ void DIALOG_ANNOTATE::InitValues()
|
|||
m_Config->Read(KEY_ANNOTATE_SORT_OPTION, &option, 0l);
|
||||
switch( option )
|
||||
{
|
||||
default:
|
||||
case 0:
|
||||
m_rbSortBy_X_Position->SetValue(1);
|
||||
break;
|
||||
|
||||
|
||||
case 1:
|
||||
m_rbSortBy_X_Position_and_useSheet->SetValue(1);
|
||||
break;
|
||||
|
||||
case 2:
|
||||
m_rbSortBy_Y_Position->SetValue(1);
|
||||
break;
|
||||
|
||||
|
||||
case 2:
|
||||
rbSortByValue->SetValue(1);
|
||||
case 3:
|
||||
m_rbSortBy_Y_Position_and_useSheet->SetValue(1);
|
||||
break;
|
||||
|
||||
default:
|
||||
case 4:
|
||||
rbSortByValue->SetValue(1);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
wxBitmap bitmap0(annotate_down_right_xpm);
|
||||
annotate_down_right_bitmap->SetBitmap(bitmap0);
|
||||
annotate_down_right_bitmap1->SetBitmap(bitmap0);
|
||||
wxBitmap bitmap1(annotate_right_down_xpm);
|
||||
annotate_right_down_bitmap->SetBitmap(bitmap1);
|
||||
annotate_right_down_bitmap1->SetBitmap(bitmap1);
|
||||
wxBitmap bitmap2(add_text_xpm);
|
||||
annotate_by_value_bitmap->SetBitmap(bitmap2);
|
||||
|
||||
|
|
@ -97,7 +98,9 @@ void DIALOG_ANNOTATE::OnApplyClick( wxCommandEvent& event )
|
|||
response = wxMessageBox( message, wxT( "" ), wxICON_EXCLAMATION | wxOK | wxCANCEL );
|
||||
if (response == wxCANCEL)
|
||||
return;
|
||||
AnnotateComponents( m_Parent, GetLevel(), GetSortOrder(), GetResetItems() , true );
|
||||
m_Parent->AnnotateComponents( GetLevel(), GetSortOrder(), GetResetItems() , true );
|
||||
m_Parent->DrawPanel->Refresh();
|
||||
|
||||
m_btnClear->Enable();
|
||||
}
|
||||
|
||||
|
|
@ -119,7 +122,9 @@ void DIALOG_ANNOTATE::OnClearAnnotationCmpClick( wxCommandEvent& event )
|
|||
wxICON_EXCLAMATION | wxOK | wxCANCEL );
|
||||
if (response == wxCANCEL)
|
||||
return;
|
||||
m_Parent->DeleteAnnotation( GetLevel() ? false : true, true );
|
||||
m_Parent->DeleteAnnotation( GetLevel() ? false : true );
|
||||
m_Parent->DrawPanel->Refresh();
|
||||
|
||||
m_btnClear->Enable(false);
|
||||
}
|
||||
|
||||
|
|
@ -157,14 +162,20 @@ int DIALOG_ANNOTATE::GetSortOrder( void )
|
|||
/****************************************/
|
||||
/**
|
||||
* @return 0 if annotation by X position,
|
||||
* 1 if annotation by Y position
|
||||
* 2 if annotation by value
|
||||
* 1 if annotation by X position and use sheet number,
|
||||
* 2 if annotation by Y position,
|
||||
* 3 if annotation by Y position and use sheet number,
|
||||
* 4 if annotation by value
|
||||
*/
|
||||
{
|
||||
if ( m_rbSortBy_X_Position->GetValue() )
|
||||
return 0;
|
||||
if ( m_rbSortBy_Y_Position->GetValue() )
|
||||
if ( m_rbSortBy_X_Position_and_useSheet->GetValue() )
|
||||
return 1;
|
||||
if ( m_rbSortBy_Y_Position->GetValue() )
|
||||
return 2;
|
||||
if ( m_rbSortBy_Y_Position_and_useSheet->GetValue() )
|
||||
return 3;
|
||||
return 4;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
///////////////////////////////////////////////////////////////////////////
|
||||
// C++ code generated with wxFormBuilder (version Apr 21 2008)
|
||||
// C++ code generated with wxFormBuilder (version Sep 8 2010)
|
||||
// http://www.wxformbuilder.org/
|
||||
//
|
||||
// PLEASE DO "NOT" EDIT THIS FILE!
|
||||
|
|
@ -60,7 +60,7 @@ DIALOG_ANNOTATE_BASE::DIALOG_ANNOTATE_BASE( wxWindow* parent, wxWindowID id, con
|
|||
wxBoxSizer* bSizerXpos;
|
||||
bSizerXpos = new wxBoxSizer( wxHORIZONTAL );
|
||||
|
||||
m_rbSortBy_X_Position = new wxRadioButton( this, ID_SORT_BY_X_POSITION, _("Sort Components by &X Position"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
|
||||
m_rbSortBy_X_Position = new wxRadioButton( this, ID_SORT_BY_X_POSITION, _("Sort components by &X position"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
|
||||
bSizerXpos->Add( m_rbSortBy_X_Position, 0, wxALL, 3 );
|
||||
|
||||
|
||||
|
|
@ -71,10 +71,24 @@ DIALOG_ANNOTATE_BASE::DIALOG_ANNOTATE_BASE( wxWindow* parent, wxWindowID id, con
|
|||
|
||||
b_orderOptSizer->Add( bSizerXpos, 0, wxEXPAND|wxRIGHT, 5 );
|
||||
|
||||
wxBoxSizer* bSizerXpos_and_use_sheet;
|
||||
bSizerXpos_and_use_sheet = new wxBoxSizer( wxHORIZONTAL );
|
||||
|
||||
m_rbSortBy_X_Position_and_useSheet = new wxRadioButton( this, wxID_ANY, _("Sort components by X position and use sheet &number"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
bSizerXpos_and_use_sheet->Add( m_rbSortBy_X_Position_and_useSheet, 0, wxALL, 3 );
|
||||
|
||||
|
||||
bSizerXpos_and_use_sheet->Add( 0, 0, 1, wxEXPAND, 5 );
|
||||
|
||||
annotate_down_right_bitmap1 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
|
||||
bSizerXpos_and_use_sheet->Add( annotate_down_right_bitmap1, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxRIGHT, 12 );
|
||||
|
||||
b_orderOptSizer->Add( bSizerXpos_and_use_sheet, 0, wxEXPAND|wxRIGHT, 5 );
|
||||
|
||||
wxBoxSizer* bSizerYpos;
|
||||
bSizerYpos = new wxBoxSizer( wxHORIZONTAL );
|
||||
|
||||
m_rbSortBy_Y_Position = new wxRadioButton( this, ID_SORT_BY_Y_POSITION, _("Sort Components by &Y Position"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
m_rbSortBy_Y_Position = new wxRadioButton( this, ID_SORT_BY_Y_POSITION, _("Sort components by &Y position"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
bSizerYpos->Add( m_rbSortBy_Y_Position, 0, wxALL, 3 );
|
||||
|
||||
|
||||
|
|
@ -85,10 +99,24 @@ DIALOG_ANNOTATE_BASE::DIALOG_ANNOTATE_BASE( wxWindow* parent, wxWindowID id, con
|
|||
|
||||
b_orderOptSizer->Add( bSizerYpos, 0, wxEXPAND|wxRIGHT, 5 );
|
||||
|
||||
wxBoxSizer* bSizerYpos_and_useSheet;
|
||||
bSizerYpos_and_useSheet = new wxBoxSizer( wxHORIZONTAL );
|
||||
|
||||
m_rbSortBy_Y_Position_and_useSheet = new wxRadioButton( this, wxID_ANY, _("Sort components by Y position and use &sheet number"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
bSizerYpos_and_useSheet->Add( m_rbSortBy_Y_Position_and_useSheet, 0, wxALL, 3 );
|
||||
|
||||
|
||||
bSizerYpos_and_useSheet->Add( 0, 0, 1, wxEXPAND, 5 );
|
||||
|
||||
annotate_right_down_bitmap1 = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
|
||||
bSizerYpos_and_useSheet->Add( annotate_right_down_bitmap1, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 12 );
|
||||
|
||||
b_orderOptSizer->Add( bSizerYpos_and_useSheet, 0, wxEXPAND|wxRIGHT, 5 );
|
||||
|
||||
wxBoxSizer* bSizerValuepos;
|
||||
bSizerValuepos = new wxBoxSizer( wxHORIZONTAL );
|
||||
|
||||
rbSortByValue = new wxRadioButton( this, ID_SORT_BY_VALUE, _("Sort Components by &Value"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
rbSortByValue = new wxRadioButton( this, ID_SORT_BY_VALUE, _("Sort components by &value"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||
bSizerValuepos->Add( rbSortByValue, 0, wxALL, 3 );
|
||||
|
||||
|
||||
|
|
@ -122,7 +150,6 @@ DIALOG_ANNOTATE_BASE::DIALOG_ANNOTATE_BASE( wxWindow* parent, wxWindowID id, con
|
|||
|
||||
this->SetSizer( bmainSizer );
|
||||
this->Layout();
|
||||
bmainSizer->Fit( this );
|
||||
|
||||
// Connect Events
|
||||
m_btnClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ANNOTATE_BASE::OnCancelClick ), NULL, this );
|
||||
|
|
@ -136,4 +163,5 @@ DIALOG_ANNOTATE_BASE::~DIALOG_ANNOTATE_BASE()
|
|||
m_btnClose->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ANNOTATE_BASE::OnCancelClick ), NULL, this );
|
||||
m_btnClear->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ANNOTATE_BASE::OnClearAnnotationCmpClick ), NULL, this );
|
||||
m_btnApply->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ANNOTATE_BASE::OnApplyClick ), NULL, this );
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,12 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
|
||||
<wxFormBuilder_Project>
|
||||
<FileVersion major="1" minor="9" />
|
||||
<FileVersion major="1" minor="10" />
|
||||
<object class="Project" expanded="1">
|
||||
<property name="class_decoration"></property>
|
||||
<property name="code_generation">C++</property>
|
||||
<property name="disconnect_events">1</property>
|
||||
<property name="disconnect_mode">source_name</property>
|
||||
<property name="disconnect_python_events">0</property>
|
||||
<property name="encoding">UTF-8</property>
|
||||
<property name="event_generation">connect</property>
|
||||
<property name="file">dialog_annotate_base</property>
|
||||
|
|
@ -16,13 +18,16 @@
|
|||
<property name="path">.</property>
|
||||
<property name="precompiled_header"></property>
|
||||
<property name="relative_path">1</property>
|
||||
<property name="skip_python_events">1</property>
|
||||
<property name="use_enum">0</property>
|
||||
<property name="use_microsoft_bom">0</property>
|
||||
<object class="Dialog" expanded="1">
|
||||
<property name="bg"></property>
|
||||
<property name="center"></property>
|
||||
<property name="context_help"></property>
|
||||
<property name="context_menu">1</property>
|
||||
<property name="enabled">1</property>
|
||||
<property name="event_handler">impl_virtual</property>
|
||||
<property name="extra_style"></property>
|
||||
<property name="fg"></property>
|
||||
<property name="font"></property>
|
||||
|
|
@ -32,11 +37,15 @@
|
|||
<property name="minimum_size"></property>
|
||||
<property name="name">DIALOG_ANNOTATE_BASE</property>
|
||||
<property name="pos"></property>
|
||||
<property name="size">-1,-1</property>
|
||||
<property name="size">432,376</property>
|
||||
<property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>
|
||||
<property name="subclass"></property>
|
||||
<property name="title">Annotate Schematic</property>
|
||||
<property name="tooltip"></property>
|
||||
<property name="validator_data_type"></property>
|
||||
<property name="validator_style">wxFILTER_NONE</property>
|
||||
<property name="validator_type">wxDefaultValidator</property>
|
||||
<property name="validator_variable"></property>
|
||||
<property name="window_extra_style"></property>
|
||||
<property name="window_name"></property>
|
||||
<property name="window_style"></property>
|
||||
|
|
@ -91,6 +100,7 @@
|
|||
<object class="wxStaticText" expanded="1">
|
||||
<property name="bg"></property>
|
||||
<property name="context_help"></property>
|
||||
<property name="context_menu">1</property>
|
||||
<property name="enabled">1</property>
|
||||
<property name="fg"></property>
|
||||
<property name="font">,90,92,-1,70,0</property>
|
||||
|
|
@ -106,6 +116,10 @@
|
|||
<property name="style"></property>
|
||||
<property name="subclass"></property>
|
||||
<property name="tooltip"></property>
|
||||
<property name="validator_data_type"></property>
|
||||
<property name="validator_style">wxFILTER_NONE</property>
|
||||
<property name="validator_type">wxDefaultValidator</property>
|
||||
<property name="validator_variable"></property>
|
||||
<property name="window_extra_style"></property>
|
||||
<property name="window_name"></property>
|
||||
<property name="window_style"></property>
|
||||
|
|
@ -151,6 +165,7 @@
|
|||
<object class="wxRadioButton" expanded="1">
|
||||
<property name="bg"></property>
|
||||
<property name="context_help"></property>
|
||||
<property name="context_menu">1</property>
|
||||
<property name="enabled">1</property>
|
||||
<property name="fg"></property>
|
||||
<property name="font"></property>
|
||||
|
|
@ -166,6 +181,10 @@
|
|||
<property name="style">wxRB_GROUP</property>
|
||||
<property name="subclass"></property>
|
||||
<property name="tooltip"></property>
|
||||
<property name="validator_data_type"></property>
|
||||
<property name="validator_style">wxFILTER_NONE</property>
|
||||
<property name="validator_type">wxDefaultValidator</property>
|
||||
<property name="validator_variable"></property>
|
||||
<property name="value">0</property>
|
||||
<property name="window_extra_style"></property>
|
||||
<property name="window_name"></property>
|
||||
|
|
@ -203,6 +222,7 @@
|
|||
<object class="wxRadioButton" expanded="1">
|
||||
<property name="bg"></property>
|
||||
<property name="context_help"></property>
|
||||
<property name="context_menu">1</property>
|
||||
<property name="enabled">1</property>
|
||||
<property name="fg"></property>
|
||||
<property name="font"></property>
|
||||
|
|
@ -218,6 +238,10 @@
|
|||
<property name="style"></property>
|
||||
<property name="subclass"></property>
|
||||
<property name="tooltip"></property>
|
||||
<property name="validator_data_type"></property>
|
||||
<property name="validator_style">wxFILTER_NONE</property>
|
||||
<property name="validator_type">wxDefaultValidator</property>
|
||||
<property name="validator_variable"></property>
|
||||
<property name="value">0</property>
|
||||
<property name="window_extra_style"></property>
|
||||
<property name="window_name"></property>
|
||||
|
|
@ -255,6 +279,7 @@
|
|||
<object class="wxStaticLine" expanded="1">
|
||||
<property name="bg"></property>
|
||||
<property name="context_help"></property>
|
||||
<property name="context_menu">1</property>
|
||||
<property name="enabled">1</property>
|
||||
<property name="fg"></property>
|
||||
<property name="font"></property>
|
||||
|
|
@ -269,6 +294,10 @@
|
|||
<property name="style">wxLI_HORIZONTAL</property>
|
||||
<property name="subclass"></property>
|
||||
<property name="tooltip"></property>
|
||||
<property name="validator_data_type"></property>
|
||||
<property name="validator_style">wxFILTER_NONE</property>
|
||||
<property name="validator_type">wxDefaultValidator</property>
|
||||
<property name="validator_variable"></property>
|
||||
<property name="window_extra_style"></property>
|
||||
<property name="window_name"></property>
|
||||
<property name="window_style"></property>
|
||||
|
|
@ -304,6 +333,7 @@
|
|||
<object class="wxRadioButton" expanded="1">
|
||||
<property name="bg"></property>
|
||||
<property name="context_help"></property>
|
||||
<property name="context_menu">1</property>
|
||||
<property name="enabled">1</property>
|
||||
<property name="fg"></property>
|
||||
<property name="font"></property>
|
||||
|
|
@ -319,6 +349,10 @@
|
|||
<property name="style">wxRB_GROUP</property>
|
||||
<property name="subclass"></property>
|
||||
<property name="tooltip"></property>
|
||||
<property name="validator_data_type"></property>
|
||||
<property name="validator_style">wxFILTER_NONE</property>
|
||||
<property name="validator_type">wxDefaultValidator</property>
|
||||
<property name="validator_variable"></property>
|
||||
<property name="value">0</property>
|
||||
<property name="window_extra_style"></property>
|
||||
<property name="window_name"></property>
|
||||
|
|
@ -356,6 +390,7 @@
|
|||
<object class="wxRadioButton" expanded="1">
|
||||
<property name="bg"></property>
|
||||
<property name="context_help"></property>
|
||||
<property name="context_menu">1</property>
|
||||
<property name="enabled">1</property>
|
||||
<property name="fg"></property>
|
||||
<property name="font"></property>
|
||||
|
|
@ -371,6 +406,10 @@
|
|||
<property name="style"></property>
|
||||
<property name="subclass"></property>
|
||||
<property name="tooltip"></property>
|
||||
<property name="validator_data_type"></property>
|
||||
<property name="validator_style">wxFILTER_NONE</property>
|
||||
<property name="validator_type">wxDefaultValidator</property>
|
||||
<property name="validator_variable"></property>
|
||||
<property name="value">0</property>
|
||||
<property name="window_extra_style"></property>
|
||||
<property name="window_name"></property>
|
||||
|
|
@ -410,6 +449,7 @@
|
|||
<object class="wxStaticLine" expanded="1">
|
||||
<property name="bg"></property>
|
||||
<property name="context_help"></property>
|
||||
<property name="context_menu">1</property>
|
||||
<property name="enabled">1</property>
|
||||
<property name="fg"></property>
|
||||
<property name="font"></property>
|
||||
|
|
@ -424,6 +464,10 @@
|
|||
<property name="style">wxLI_HORIZONTAL</property>
|
||||
<property name="subclass"></property>
|
||||
<property name="tooltip"></property>
|
||||
<property name="validator_data_type"></property>
|
||||
<property name="validator_style">wxFILTER_NONE</property>
|
||||
<property name="validator_type">wxDefaultValidator</property>
|
||||
<property name="validator_variable"></property>
|
||||
<property name="window_extra_style"></property>
|
||||
<property name="window_name"></property>
|
||||
<property name="window_style"></property>
|
||||
|
|
@ -459,6 +503,7 @@
|
|||
<object class="wxStaticText" expanded="1">
|
||||
<property name="bg"></property>
|
||||
<property name="context_help"></property>
|
||||
<property name="context_menu">1</property>
|
||||
<property name="enabled">1</property>
|
||||
<property name="fg"></property>
|
||||
<property name="font">,90,92,-1,70,0</property>
|
||||
|
|
@ -474,6 +519,10 @@
|
|||
<property name="style"></property>
|
||||
<property name="subclass"></property>
|
||||
<property name="tooltip"></property>
|
||||
<property name="validator_data_type"></property>
|
||||
<property name="validator_style">wxFILTER_NONE</property>
|
||||
<property name="validator_type">wxDefaultValidator</property>
|
||||
<property name="validator_variable"></property>
|
||||
<property name="window_extra_style"></property>
|
||||
<property name="window_name"></property>
|
||||
<property name="window_style"></property>
|
||||
|
|
@ -528,12 +577,13 @@
|
|||
<object class="wxRadioButton" expanded="1">
|
||||
<property name="bg"></property>
|
||||
<property name="context_help"></property>
|
||||
<property name="context_menu">1</property>
|
||||
<property name="enabled">1</property>
|
||||
<property name="fg"></property>
|
||||
<property name="font"></property>
|
||||
<property name="hidden">0</property>
|
||||
<property name="id">ID_SORT_BY_X_POSITION</property>
|
||||
<property name="label">Sort Components by &X Position</property>
|
||||
<property name="label">Sort components by &X position</property>
|
||||
<property name="maximum_size"></property>
|
||||
<property name="minimum_size"></property>
|
||||
<property name="name">m_rbSortBy_X_Position</property>
|
||||
|
|
@ -543,6 +593,10 @@
|
|||
<property name="style">wxRB_GROUP</property>
|
||||
<property name="subclass"></property>
|
||||
<property name="tooltip"></property>
|
||||
<property name="validator_data_type"></property>
|
||||
<property name="validator_style">wxFILTER_NONE</property>
|
||||
<property name="validator_type">wxDefaultValidator</property>
|
||||
<property name="validator_variable"></property>
|
||||
<property name="value">0</property>
|
||||
<property name="window_extra_style"></property>
|
||||
<property name="window_name"></property>
|
||||
|
|
@ -591,6 +645,7 @@
|
|||
<property name="bg"></property>
|
||||
<property name="bitmap">; Load From Resource</property>
|
||||
<property name="context_help"></property>
|
||||
<property name="context_menu">1</property>
|
||||
<property name="enabled">1</property>
|
||||
<property name="fg"></property>
|
||||
<property name="font"></property>
|
||||
|
|
@ -604,6 +659,142 @@
|
|||
<property name="size"></property>
|
||||
<property name="subclass"></property>
|
||||
<property name="tooltip"></property>
|
||||
<property name="validator_data_type"></property>
|
||||
<property name="validator_style">wxFILTER_NONE</property>
|
||||
<property name="validator_type">wxDefaultValidator</property>
|
||||
<property name="validator_variable"></property>
|
||||
<property name="window_extra_style"></property>
|
||||
<property name="window_name"></property>
|
||||
<property name="window_style"></property>
|
||||
<event name="OnChar"></event>
|
||||
<event name="OnEnterWindow"></event>
|
||||
<event name="OnEraseBackground"></event>
|
||||
<event name="OnKeyDown"></event>
|
||||
<event name="OnKeyUp"></event>
|
||||
<event name="OnKillFocus"></event>
|
||||
<event name="OnLeaveWindow"></event>
|
||||
<event name="OnLeftDClick"></event>
|
||||
<event name="OnLeftDown"></event>
|
||||
<event name="OnLeftUp"></event>
|
||||
<event name="OnMiddleDClick"></event>
|
||||
<event name="OnMiddleDown"></event>
|
||||
<event name="OnMiddleUp"></event>
|
||||
<event name="OnMotion"></event>
|
||||
<event name="OnMouseEvents"></event>
|
||||
<event name="OnMouseWheel"></event>
|
||||
<event name="OnPaint"></event>
|
||||
<event name="OnRightDClick"></event>
|
||||
<event name="OnRightDown"></event>
|
||||
<event name="OnRightUp"></event>
|
||||
<event name="OnSetFocus"></event>
|
||||
<event name="OnSize"></event>
|
||||
<event name="OnUpdateUI"></event>
|
||||
</object>
|
||||
</object>
|
||||
</object>
|
||||
</object>
|
||||
<object class="sizeritem" expanded="1">
|
||||
<property name="border">5</property>
|
||||
<property name="flag">wxEXPAND|wxRIGHT</property>
|
||||
<property name="proportion">0</property>
|
||||
<object class="wxBoxSizer" expanded="1">
|
||||
<property name="minimum_size"></property>
|
||||
<property name="name">bSizerXpos_and_use_sheet</property>
|
||||
<property name="orient">wxHORIZONTAL</property>
|
||||
<property name="permission">none</property>
|
||||
<object class="sizeritem" expanded="1">
|
||||
<property name="border">3</property>
|
||||
<property name="flag">wxALL</property>
|
||||
<property name="proportion">0</property>
|
||||
<object class="wxRadioButton" expanded="1">
|
||||
<property name="bg"></property>
|
||||
<property name="context_help"></property>
|
||||
<property name="context_menu">1</property>
|
||||
<property name="enabled">1</property>
|
||||
<property name="fg"></property>
|
||||
<property name="font"></property>
|
||||
<property name="hidden">0</property>
|
||||
<property name="id">wxID_ANY</property>
|
||||
<property name="label">Sort components by X position and use sheet &number</property>
|
||||
<property name="maximum_size"></property>
|
||||
<property name="minimum_size"></property>
|
||||
<property name="name">m_rbSortBy_X_Position_and_useSheet</property>
|
||||
<property name="permission">protected</property>
|
||||
<property name="pos"></property>
|
||||
<property name="size"></property>
|
||||
<property name="style"></property>
|
||||
<property name="subclass"></property>
|
||||
<property name="tooltip"></property>
|
||||
<property name="validator_data_type"></property>
|
||||
<property name="validator_style">wxFILTER_NONE</property>
|
||||
<property name="validator_type">wxDefaultValidator</property>
|
||||
<property name="validator_variable"></property>
|
||||
<property name="value">0</property>
|
||||
<property name="window_extra_style"></property>
|
||||
<property name="window_name"></property>
|
||||
<property name="window_style"></property>
|
||||
<event name="OnChar"></event>
|
||||
<event name="OnEnterWindow"></event>
|
||||
<event name="OnEraseBackground"></event>
|
||||
<event name="OnKeyDown"></event>
|
||||
<event name="OnKeyUp"></event>
|
||||
<event name="OnKillFocus"></event>
|
||||
<event name="OnLeaveWindow"></event>
|
||||
<event name="OnLeftDClick"></event>
|
||||
<event name="OnLeftDown"></event>
|
||||
<event name="OnLeftUp"></event>
|
||||
<event name="OnMiddleDClick"></event>
|
||||
<event name="OnMiddleDown"></event>
|
||||
<event name="OnMiddleUp"></event>
|
||||
<event name="OnMotion"></event>
|
||||
<event name="OnMouseEvents"></event>
|
||||
<event name="OnMouseWheel"></event>
|
||||
<event name="OnPaint"></event>
|
||||
<event name="OnRadioButton"></event>
|
||||
<event name="OnRightDClick"></event>
|
||||
<event name="OnRightDown"></event>
|
||||
<event name="OnRightUp"></event>
|
||||
<event name="OnSetFocus"></event>
|
||||
<event name="OnSize"></event>
|
||||
<event name="OnUpdateUI"></event>
|
||||
</object>
|
||||
</object>
|
||||
<object class="sizeritem" expanded="1">
|
||||
<property name="border">5</property>
|
||||
<property name="flag">wxEXPAND</property>
|
||||
<property name="proportion">1</property>
|
||||
<object class="spacer" expanded="1">
|
||||
<property name="height">0</property>
|
||||
<property name="permission">protected</property>
|
||||
<property name="width">0</property>
|
||||
</object>
|
||||
</object>
|
||||
<object class="sizeritem" expanded="1">
|
||||
<property name="border">12</property>
|
||||
<property name="flag">wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxRIGHT</property>
|
||||
<property name="proportion">0</property>
|
||||
<object class="wxStaticBitmap" expanded="1">
|
||||
<property name="bg"></property>
|
||||
<property name="bitmap">; Load From Resource</property>
|
||||
<property name="context_help"></property>
|
||||
<property name="context_menu">1</property>
|
||||
<property name="enabled">1</property>
|
||||
<property name="fg"></property>
|
||||
<property name="font"></property>
|
||||
<property name="hidden">0</property>
|
||||
<property name="id">wxID_ANY</property>
|
||||
<property name="maximum_size"></property>
|
||||
<property name="minimum_size"></property>
|
||||
<property name="name">annotate_down_right_bitmap1</property>
|
||||
<property name="permission">protected</property>
|
||||
<property name="pos"></property>
|
||||
<property name="size"></property>
|
||||
<property name="subclass"></property>
|
||||
<property name="tooltip"></property>
|
||||
<property name="validator_data_type"></property>
|
||||
<property name="validator_style">wxFILTER_NONE</property>
|
||||
<property name="validator_type">wxDefaultValidator</property>
|
||||
<property name="validator_variable"></property>
|
||||
<property name="window_extra_style"></property>
|
||||
<property name="window_name"></property>
|
||||
<property name="window_style"></property>
|
||||
|
|
@ -650,12 +841,13 @@
|
|||
<object class="wxRadioButton" expanded="1">
|
||||
<property name="bg"></property>
|
||||
<property name="context_help"></property>
|
||||
<property name="context_menu">1</property>
|
||||
<property name="enabled">1</property>
|
||||
<property name="fg"></property>
|
||||
<property name="font"></property>
|
||||
<property name="hidden">0</property>
|
||||
<property name="id">ID_SORT_BY_Y_POSITION</property>
|
||||
<property name="label">Sort Components by &Y Position</property>
|
||||
<property name="label">Sort components by &Y position</property>
|
||||
<property name="maximum_size"></property>
|
||||
<property name="minimum_size"></property>
|
||||
<property name="name">m_rbSortBy_Y_Position</property>
|
||||
|
|
@ -665,6 +857,10 @@
|
|||
<property name="style"></property>
|
||||
<property name="subclass"></property>
|
||||
<property name="tooltip"></property>
|
||||
<property name="validator_data_type"></property>
|
||||
<property name="validator_style">wxFILTER_NONE</property>
|
||||
<property name="validator_type">wxDefaultValidator</property>
|
||||
<property name="validator_variable"></property>
|
||||
<property name="value">0</property>
|
||||
<property name="window_extra_style"></property>
|
||||
<property name="window_name"></property>
|
||||
|
|
@ -713,6 +909,7 @@
|
|||
<property name="bg"></property>
|
||||
<property name="bitmap">; Load From Resource</property>
|
||||
<property name="context_help"></property>
|
||||
<property name="context_menu">1</property>
|
||||
<property name="enabled">1</property>
|
||||
<property name="fg"></property>
|
||||
<property name="font"></property>
|
||||
|
|
@ -726,6 +923,142 @@
|
|||
<property name="size"></property>
|
||||
<property name="subclass"></property>
|
||||
<property name="tooltip"></property>
|
||||
<property name="validator_data_type"></property>
|
||||
<property name="validator_style">wxFILTER_NONE</property>
|
||||
<property name="validator_type">wxDefaultValidator</property>
|
||||
<property name="validator_variable"></property>
|
||||
<property name="window_extra_style"></property>
|
||||
<property name="window_name"></property>
|
||||
<property name="window_style"></property>
|
||||
<event name="OnChar"></event>
|
||||
<event name="OnEnterWindow"></event>
|
||||
<event name="OnEraseBackground"></event>
|
||||
<event name="OnKeyDown"></event>
|
||||
<event name="OnKeyUp"></event>
|
||||
<event name="OnKillFocus"></event>
|
||||
<event name="OnLeaveWindow"></event>
|
||||
<event name="OnLeftDClick"></event>
|
||||
<event name="OnLeftDown"></event>
|
||||
<event name="OnLeftUp"></event>
|
||||
<event name="OnMiddleDClick"></event>
|
||||
<event name="OnMiddleDown"></event>
|
||||
<event name="OnMiddleUp"></event>
|
||||
<event name="OnMotion"></event>
|
||||
<event name="OnMouseEvents"></event>
|
||||
<event name="OnMouseWheel"></event>
|
||||
<event name="OnPaint"></event>
|
||||
<event name="OnRightDClick"></event>
|
||||
<event name="OnRightDown"></event>
|
||||
<event name="OnRightUp"></event>
|
||||
<event name="OnSetFocus"></event>
|
||||
<event name="OnSize"></event>
|
||||
<event name="OnUpdateUI"></event>
|
||||
</object>
|
||||
</object>
|
||||
</object>
|
||||
</object>
|
||||
<object class="sizeritem" expanded="1">
|
||||
<property name="border">5</property>
|
||||
<property name="flag">wxEXPAND|wxRIGHT</property>
|
||||
<property name="proportion">0</property>
|
||||
<object class="wxBoxSizer" expanded="1">
|
||||
<property name="minimum_size"></property>
|
||||
<property name="name">bSizerYpos_and_useSheet</property>
|
||||
<property name="orient">wxHORIZONTAL</property>
|
||||
<property name="permission">none</property>
|
||||
<object class="sizeritem" expanded="1">
|
||||
<property name="border">3</property>
|
||||
<property name="flag">wxALL</property>
|
||||
<property name="proportion">0</property>
|
||||
<object class="wxRadioButton" expanded="1">
|
||||
<property name="bg"></property>
|
||||
<property name="context_help"></property>
|
||||
<property name="context_menu">1</property>
|
||||
<property name="enabled">1</property>
|
||||
<property name="fg"></property>
|
||||
<property name="font"></property>
|
||||
<property name="hidden">0</property>
|
||||
<property name="id">wxID_ANY</property>
|
||||
<property name="label">Sort components by Y position and use &sheet number</property>
|
||||
<property name="maximum_size"></property>
|
||||
<property name="minimum_size"></property>
|
||||
<property name="name">m_rbSortBy_Y_Position_and_useSheet</property>
|
||||
<property name="permission">protected</property>
|
||||
<property name="pos"></property>
|
||||
<property name="size"></property>
|
||||
<property name="style"></property>
|
||||
<property name="subclass"></property>
|
||||
<property name="tooltip"></property>
|
||||
<property name="validator_data_type"></property>
|
||||
<property name="validator_style">wxFILTER_NONE</property>
|
||||
<property name="validator_type">wxDefaultValidator</property>
|
||||
<property name="validator_variable"></property>
|
||||
<property name="value">0</property>
|
||||
<property name="window_extra_style"></property>
|
||||
<property name="window_name"></property>
|
||||
<property name="window_style"></property>
|
||||
<event name="OnChar"></event>
|
||||
<event name="OnEnterWindow"></event>
|
||||
<event name="OnEraseBackground"></event>
|
||||
<event name="OnKeyDown"></event>
|
||||
<event name="OnKeyUp"></event>
|
||||
<event name="OnKillFocus"></event>
|
||||
<event name="OnLeaveWindow"></event>
|
||||
<event name="OnLeftDClick"></event>
|
||||
<event name="OnLeftDown"></event>
|
||||
<event name="OnLeftUp"></event>
|
||||
<event name="OnMiddleDClick"></event>
|
||||
<event name="OnMiddleDown"></event>
|
||||
<event name="OnMiddleUp"></event>
|
||||
<event name="OnMotion"></event>
|
||||
<event name="OnMouseEvents"></event>
|
||||
<event name="OnMouseWheel"></event>
|
||||
<event name="OnPaint"></event>
|
||||
<event name="OnRadioButton"></event>
|
||||
<event name="OnRightDClick"></event>
|
||||
<event name="OnRightDown"></event>
|
||||
<event name="OnRightUp"></event>
|
||||
<event name="OnSetFocus"></event>
|
||||
<event name="OnSize"></event>
|
||||
<event name="OnUpdateUI"></event>
|
||||
</object>
|
||||
</object>
|
||||
<object class="sizeritem" expanded="1">
|
||||
<property name="border">5</property>
|
||||
<property name="flag">wxEXPAND</property>
|
||||
<property name="proportion">1</property>
|
||||
<object class="spacer" expanded="1">
|
||||
<property name="height">0</property>
|
||||
<property name="permission">protected</property>
|
||||
<property name="width">0</property>
|
||||
</object>
|
||||
</object>
|
||||
<object class="sizeritem" expanded="1">
|
||||
<property name="border">12</property>
|
||||
<property name="flag">wxALIGN_CENTER_VERTICAL|wxRIGHT</property>
|
||||
<property name="proportion">0</property>
|
||||
<object class="wxStaticBitmap" expanded="1">
|
||||
<property name="bg"></property>
|
||||
<property name="bitmap">; Load From Resource</property>
|
||||
<property name="context_help"></property>
|
||||
<property name="context_menu">1</property>
|
||||
<property name="enabled">1</property>
|
||||
<property name="fg"></property>
|
||||
<property name="font"></property>
|
||||
<property name="hidden">0</property>
|
||||
<property name="id">wxID_ANY</property>
|
||||
<property name="maximum_size"></property>
|
||||
<property name="minimum_size"></property>
|
||||
<property name="name">annotate_right_down_bitmap1</property>
|
||||
<property name="permission">protected</property>
|
||||
<property name="pos"></property>
|
||||
<property name="size"></property>
|
||||
<property name="subclass"></property>
|
||||
<property name="tooltip"></property>
|
||||
<property name="validator_data_type"></property>
|
||||
<property name="validator_style">wxFILTER_NONE</property>
|
||||
<property name="validator_type">wxDefaultValidator</property>
|
||||
<property name="validator_variable"></property>
|
||||
<property name="window_extra_style"></property>
|
||||
<property name="window_name"></property>
|
||||
<property name="window_style"></property>
|
||||
|
|
@ -772,12 +1105,13 @@
|
|||
<object class="wxRadioButton" expanded="1">
|
||||
<property name="bg"></property>
|
||||
<property name="context_help"></property>
|
||||
<property name="context_menu">1</property>
|
||||
<property name="enabled">1</property>
|
||||
<property name="fg"></property>
|
||||
<property name="font"></property>
|
||||
<property name="hidden">0</property>
|
||||
<property name="id">ID_SORT_BY_VALUE</property>
|
||||
<property name="label">Sort Components by &Value</property>
|
||||
<property name="label">Sort components by &value</property>
|
||||
<property name="maximum_size"></property>
|
||||
<property name="minimum_size"></property>
|
||||
<property name="name">rbSortByValue</property>
|
||||
|
|
@ -787,6 +1121,10 @@
|
|||
<property name="style"></property>
|
||||
<property name="subclass"></property>
|
||||
<property name="tooltip"></property>
|
||||
<property name="validator_data_type"></property>
|
||||
<property name="validator_style">wxFILTER_NONE</property>
|
||||
<property name="validator_type">wxDefaultValidator</property>
|
||||
<property name="validator_variable"></property>
|
||||
<property name="value">0</property>
|
||||
<property name="window_extra_style"></property>
|
||||
<property name="window_name"></property>
|
||||
|
|
@ -835,6 +1173,7 @@
|
|||
<property name="bg"></property>
|
||||
<property name="bitmap">; Load From Resource</property>
|
||||
<property name="context_help"></property>
|
||||
<property name="context_menu">1</property>
|
||||
<property name="enabled">1</property>
|
||||
<property name="fg"></property>
|
||||
<property name="font"></property>
|
||||
|
|
@ -848,6 +1187,10 @@
|
|||
<property name="size"></property>
|
||||
<property name="subclass"></property>
|
||||
<property name="tooltip"></property>
|
||||
<property name="validator_data_type"></property>
|
||||
<property name="validator_style">wxFILTER_NONE</property>
|
||||
<property name="validator_type">wxDefaultValidator</property>
|
||||
<property name="validator_variable"></property>
|
||||
<property name="window_extra_style"></property>
|
||||
<property name="window_name"></property>
|
||||
<property name="window_style"></property>
|
||||
|
|
@ -887,6 +1230,7 @@
|
|||
<object class="wxStaticLine" expanded="1">
|
||||
<property name="bg"></property>
|
||||
<property name="context_help"></property>
|
||||
<property name="context_menu">1</property>
|
||||
<property name="enabled">1</property>
|
||||
<property name="fg"></property>
|
||||
<property name="font"></property>
|
||||
|
|
@ -901,6 +1245,10 @@
|
|||
<property name="style">wxLI_HORIZONTAL</property>
|
||||
<property name="subclass"></property>
|
||||
<property name="tooltip"></property>
|
||||
<property name="validator_data_type"></property>
|
||||
<property name="validator_style">wxFILTER_NONE</property>
|
||||
<property name="validator_type">wxDefaultValidator</property>
|
||||
<property name="validator_variable"></property>
|
||||
<property name="window_extra_style"></property>
|
||||
<property name="window_name"></property>
|
||||
<property name="window_style"></property>
|
||||
|
|
@ -945,6 +1293,7 @@
|
|||
<object class="wxButton" expanded="1">
|
||||
<property name="bg"></property>
|
||||
<property name="context_help"></property>
|
||||
<property name="context_menu">1</property>
|
||||
<property name="default">0</property>
|
||||
<property name="enabled">1</property>
|
||||
<property name="fg"></property>
|
||||
|
|
@ -961,6 +1310,10 @@
|
|||
<property name="style"></property>
|
||||
<property name="subclass"></property>
|
||||
<property name="tooltip"></property>
|
||||
<property name="validator_data_type"></property>
|
||||
<property name="validator_style">wxFILTER_NONE</property>
|
||||
<property name="validator_type">wxDefaultValidator</property>
|
||||
<property name="validator_variable"></property>
|
||||
<property name="window_extra_style"></property>
|
||||
<property name="window_name"></property>
|
||||
<property name="window_style"></property>
|
||||
|
|
@ -997,6 +1350,7 @@
|
|||
<object class="wxButton" expanded="1">
|
||||
<property name="bg"></property>
|
||||
<property name="context_help"></property>
|
||||
<property name="context_menu">1</property>
|
||||
<property name="default">0</property>
|
||||
<property name="enabled">1</property>
|
||||
<property name="fg"></property>
|
||||
|
|
@ -1013,6 +1367,10 @@
|
|||
<property name="style"></property>
|
||||
<property name="subclass"></property>
|
||||
<property name="tooltip"></property>
|
||||
<property name="validator_data_type"></property>
|
||||
<property name="validator_style">wxFILTER_NONE</property>
|
||||
<property name="validator_type">wxDefaultValidator</property>
|
||||
<property name="validator_variable"></property>
|
||||
<property name="window_extra_style"></property>
|
||||
<property name="window_name"></property>
|
||||
<property name="window_style"></property>
|
||||
|
|
@ -1049,6 +1407,7 @@
|
|||
<object class="wxButton" expanded="1">
|
||||
<property name="bg"></property>
|
||||
<property name="context_help"></property>
|
||||
<property name="context_menu">1</property>
|
||||
<property name="default">0</property>
|
||||
<property name="enabled">1</property>
|
||||
<property name="fg"></property>
|
||||
|
|
@ -1065,6 +1424,10 @@
|
|||
<property name="style"></property>
|
||||
<property name="subclass"></property>
|
||||
<property name="tooltip"></property>
|
||||
<property name="validator_data_type"></property>
|
||||
<property name="validator_style">wxFILTER_NONE</property>
|
||||
<property name="validator_type">wxDefaultValidator</property>
|
||||
<property name="validator_variable"></property>
|
||||
<property name="window_extra_style"></property>
|
||||
<property name="window_name"></property>
|
||||
<property name="window_style"></property>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
///////////////////////////////////////////////////////////////////////////
|
||||
// C++ code generated with wxFormBuilder (version Apr 21 2008)
|
||||
// C++ code generated with wxFormBuilder (version Sep 8 2010)
|
||||
// http://www.wxformbuilder.org/
|
||||
//
|
||||
// PLEASE DO "NOT" EDIT THIS FILE!
|
||||
|
|
@ -56,9 +56,15 @@ class DIALOG_ANNOTATE_BASE : public wxDialog
|
|||
wxRadioButton* m_rbSortBy_X_Position;
|
||||
|
||||
wxStaticBitmap* annotate_down_right_bitmap;
|
||||
wxRadioButton* m_rbSortBy_X_Position_and_useSheet;
|
||||
|
||||
wxStaticBitmap* annotate_down_right_bitmap1;
|
||||
wxRadioButton* m_rbSortBy_Y_Position;
|
||||
|
||||
wxStaticBitmap* annotate_right_down_bitmap;
|
||||
wxRadioButton* m_rbSortBy_Y_Position_and_useSheet;
|
||||
|
||||
wxStaticBitmap* annotate_right_down_bitmap1;
|
||||
wxRadioButton* rbSortByValue;
|
||||
|
||||
wxStaticBitmap* annotate_by_value_bitmap;
|
||||
|
|
@ -74,7 +80,8 @@ class DIALOG_ANNOTATE_BASE : public wxDialog
|
|||
|
||||
|
||||
public:
|
||||
DIALOG_ANNOTATE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Annotate Schematic"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
|
||||
|
||||
DIALOG_ANNOTATE_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Annotate Schematic"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 432,376 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );
|
||||
~DIALOG_ANNOTATE_BASE();
|
||||
|
||||
};
|
||||
|
|
|
|||
|
|
@ -30,6 +30,12 @@
|
|||
#include "protos.h"
|
||||
|
||||
|
||||
extern void GenListeGLabels( std::vector <LABEL_OBJECT>& aList );
|
||||
extern bool SortLabelsByValue( const LABEL_OBJECT& obj1, const LABEL_OBJECT& obj2 );
|
||||
extern bool SortLabelsBySheet( const LABEL_OBJECT& obj1, const LABEL_OBJECT& obj2 );
|
||||
extern int PrintListeGLabel( FILE* f, std::vector <LABEL_OBJECT>& aList );
|
||||
|
||||
|
||||
/* Local variables */
|
||||
static bool s_ListByRef = TRUE;
|
||||
static bool s_ListByValue = TRUE;
|
||||
|
|
@ -392,20 +398,17 @@ void DIALOG_BUILD_BOM::CreatePartsList( const wxString& aFullFileName, bool aInc
|
|||
return;
|
||||
}
|
||||
|
||||
std::vector <SCH_REFERENCE> cmplist;
|
||||
SCH_REFERENCE_LIST cmplist;
|
||||
SCH_SHEET_LIST sheetList; // uses a global
|
||||
|
||||
sheetList.GetComponents( cmplist, false );
|
||||
|
||||
// sort component list by ref and remove sub components
|
||||
if( !aIncludeSubComponents )
|
||||
{
|
||||
sort( cmplist.begin(), cmplist.end(), SortComponentsByReference );
|
||||
DeleteSubCmp( cmplist );
|
||||
}
|
||||
cmplist.RemoveSubComponentsFromList();
|
||||
|
||||
// sort component list by value
|
||||
sort( cmplist.begin(), cmplist.end(), SortComponentsByValue );
|
||||
cmplist.SortComponentsByValueOnly( );
|
||||
PrintComponentsListByPart( f, cmplist,aIncludeSubComponents );
|
||||
|
||||
fclose( f );
|
||||
|
|
@ -431,16 +434,16 @@ void DIALOG_BUILD_BOM::CreateExportList( const wxString& aFullFileName,
|
|||
return;
|
||||
}
|
||||
|
||||
std::vector <SCH_REFERENCE> cmplist;
|
||||
SCH_REFERENCE_LIST cmplist;
|
||||
SCH_SHEET_LIST sheetList; // uses a global
|
||||
|
||||
sheetList.GetComponents( cmplist, false );
|
||||
|
||||
// sort component list
|
||||
sort( cmplist.begin(), cmplist.end(), SortComponentsByReference );
|
||||
cmplist.SortComponentsByReferenceOnly( );
|
||||
|
||||
if( !aIncludeSubComponents )
|
||||
DeleteSubCmp( cmplist );
|
||||
cmplist.RemoveSubComponentsFromList();
|
||||
|
||||
// create the file
|
||||
PrintComponentsListByRef( f, cmplist, TRUE, aIncludeSubComponents );
|
||||
|
|
@ -469,12 +472,12 @@ void DIALOG_BUILD_BOM::GenereListeOfItems( const wxString& aFullFileName,
|
|||
return;
|
||||
}
|
||||
|
||||
std::vector <SCH_REFERENCE> cmplist;
|
||||
SCH_SHEET_LIST sheetList; // uses a global
|
||||
SCH_REFERENCE_LIST cmplist;
|
||||
SCH_SHEET_LIST sheetList;
|
||||
|
||||
sheetList.GetComponents( cmplist, false );
|
||||
|
||||
itemCount = cmplist.size();
|
||||
itemCount = cmplist.GetCount();
|
||||
|
||||
if( itemCount )
|
||||
{
|
||||
|
|
@ -486,17 +489,17 @@ void DIALOG_BUILD_BOM::GenereListeOfItems( const wxString& aFullFileName,
|
|||
fprintf( f, "%s >> Creation date: %s\n", CONV_TO_UTF8( Title ), Line );
|
||||
|
||||
// sort component list
|
||||
sort( cmplist.begin(), cmplist.end(), SortComponentsByReference );
|
||||
cmplist.SortComponentsByReferenceOnly();
|
||||
|
||||
if( !aIncludeSubComponents )
|
||||
DeleteSubCmp( cmplist );
|
||||
cmplist.RemoveSubComponentsFromList();
|
||||
|
||||
if( m_ListCmpbyRefItems->GetValue() )
|
||||
PrintComponentsListByRef( f, cmplist, false, aIncludeSubComponents );
|
||||
|
||||
if( m_ListCmpbyValItems->GetValue() )
|
||||
{
|
||||
sort( cmplist.begin(), cmplist.end(), SortComponentsByValue );
|
||||
cmplist.SortComponentsByValueOnly();
|
||||
PrintComponentsListByVal( f, cmplist, aIncludeSubComponents );
|
||||
}
|
||||
}
|
||||
|
|
@ -577,7 +580,7 @@ void DIALOG_BUILD_BOM::PrintFieldData( FILE* f, SCH_COMPONENT* DrawLibItem,
|
|||
/* Print the B.O.M sorted by reference
|
||||
*/
|
||||
int DIALOG_BUILD_BOM::PrintComponentsListByRef( FILE* f,
|
||||
std::vector <SCH_REFERENCE>& aList,
|
||||
SCH_REFERENCE_LIST& aList,
|
||||
bool CompactForm,
|
||||
bool aIncludeSubComponents )
|
||||
{
|
||||
|
|
@ -627,7 +630,7 @@ int DIALOG_BUILD_BOM::PrintComponentsListByRef( FILE* f,
|
|||
wxString subRef;
|
||||
|
||||
// Print list of items
|
||||
for( unsigned ii = 0; ii < aList.size(); ii++ )
|
||||
for( unsigned ii = 0; ii < aList.GetCount(); ii++ )
|
||||
{
|
||||
EDA_ITEM* item = aList[ii].m_RootCmp;
|
||||
|
||||
|
|
@ -678,27 +681,25 @@ int DIALOG_BUILD_BOM::PrintComponentsListByRef( FILE* f,
|
|||
if( aIncludeSubComponents )
|
||||
{
|
||||
msg = aList[ii].m_SheetPath.PathHumanReadable();
|
||||
BASE_SCREEN * screen = (BASE_SCREEN*) comp->GetParent();
|
||||
|
||||
if( screen )
|
||||
{
|
||||
if( CompactForm )
|
||||
{
|
||||
fprintf( f, "%c%s", s_ExportSeparatorSymbol, CONV_TO_UTF8( msg ) );
|
||||
|
||||
msg = m_Parent->GetXYSheetReferences( (BASE_SCREEN*) comp->GetParent(),
|
||||
comp->m_Pos );
|
||||
|
||||
msg = m_Parent->GetXYSheetReferences( screen, comp->m_Pos );
|
||||
fprintf( f, "%c%s)", s_ExportSeparatorSymbol,
|
||||
CONV_TO_UTF8( msg ) );
|
||||
}
|
||||
else
|
||||
{
|
||||
fprintf( f, " (Sheet %s)", CONV_TO_UTF8( msg ) );
|
||||
|
||||
msg = m_Parent->GetXYSheetReferences( (BASE_SCREEN*) comp->GetParent(),
|
||||
comp->m_Pos );
|
||||
|
||||
msg = m_Parent->GetXYSheetReferences( screen, comp->m_Pos );
|
||||
fprintf( f, " (loc %s)", CONV_TO_UTF8( msg ) );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
PrintFieldData( f, comp, CompactForm );
|
||||
|
||||
|
|
@ -726,7 +727,7 @@ int DIALOG_BUILD_BOM::PrintComponentsListByRef( FILE* f,
|
|||
* FIELD2 - manufacture part number
|
||||
* FIELD3 - distributor part number
|
||||
*/
|
||||
int DIALOG_BUILD_BOM::PrintComponentsListByPart( FILE* f, std::vector <SCH_REFERENCE>& aList,
|
||||
int DIALOG_BUILD_BOM::PrintComponentsListByPart( FILE* f, SCH_REFERENCE_LIST& aList,
|
||||
bool aIncludeSubComponents )
|
||||
{
|
||||
int qty = 0;
|
||||
|
|
@ -744,11 +745,11 @@ int DIALOG_BUILD_BOM::PrintComponentsListByPart( FILE* f, std::vector <SCH_REFER
|
|||
SCH_COMPONENT* nextCmp;
|
||||
SCH_COMPONENT dummyCmp; // A dummy component, to store fields
|
||||
|
||||
for( unsigned ii = 0; ii < aList.size(); ii++ )
|
||||
for( unsigned ii = 0; ii < aList.GetCount(); ii++ )
|
||||
{
|
||||
currCmp = (SCH_COMPONENT*) aList[ii].m_RootCmp;
|
||||
|
||||
if( ii < aList.size() -1 )
|
||||
if( ii < aList.GetCount() -1 )
|
||||
nextCmp = aList[ii+1].m_RootCmp;
|
||||
else
|
||||
nextCmp = NULL;
|
||||
|
|
@ -861,7 +862,7 @@ int DIALOG_BUILD_BOM::PrintComponentsListByPart( FILE* f, std::vector <SCH_REFER
|
|||
|
||||
|
||||
int DIALOG_BUILD_BOM::PrintComponentsListByVal( FILE* f,
|
||||
std::vector <SCH_REFERENCE>& aList,
|
||||
SCH_REFERENCE_LIST& aList,
|
||||
bool aIncludeSubComponents )
|
||||
{
|
||||
EDA_ITEM* schItem;
|
||||
|
|
@ -879,7 +880,7 @@ int DIALOG_BUILD_BOM::PrintComponentsListByVal( FILE* f,
|
|||
|
||||
fputs( CONV_TO_UTF8( msg ), f );
|
||||
|
||||
for( unsigned ii = 0; ii < aList.size(); ii++ )
|
||||
for( unsigned ii = 0; ii < aList.GetCount(); ii++ )
|
||||
{
|
||||
schItem = aList[ii].m_RootCmp;
|
||||
|
||||
|
|
@ -913,13 +914,16 @@ int DIALOG_BUILD_BOM::PrintComponentsListByVal( FILE* f,
|
|||
|
||||
// print the sheet path
|
||||
if( aIncludeSubComponents )
|
||||
{
|
||||
BASE_SCREEN * screen = (BASE_SCREEN*) DrawLibItem->GetParent();
|
||||
if( screen )
|
||||
{
|
||||
msg = aList[ii].m_SheetPath.PathHumanReadable();
|
||||
fprintf( f, " (Sheet %s)", CONV_TO_UTF8( msg ) );
|
||||
msg = m_Parent->GetXYSheetReferences( (BASE_SCREEN*) DrawLibItem->GetParent(),
|
||||
DrawLibItem->m_Pos );
|
||||
msg = m_Parent->GetXYSheetReferences( screen, DrawLibItem->m_Pos );
|
||||
fprintf( f, " (loc %s)", CONV_TO_UTF8( msg ) );
|
||||
}
|
||||
}
|
||||
|
||||
PrintFieldData( f, DrawLibItem );
|
||||
|
||||
|
|
|
|||
|
|
@ -46,13 +46,13 @@ private:
|
|||
*/
|
||||
void CreatePartsList( const wxString& aFullFileName, bool aIncludeSubComponents );
|
||||
|
||||
int PrintComponentsListByRef( FILE* f, std::vector <SCH_REFERENCE>& aList,
|
||||
int PrintComponentsListByRef( FILE* f, SCH_REFERENCE_LIST& aList,
|
||||
bool CompactForm, bool aIncludeSubComponents );
|
||||
|
||||
int PrintComponentsListByVal( FILE* f, std::vector <SCH_REFERENCE>& aList,
|
||||
int PrintComponentsListByVal( FILE* f, SCH_REFERENCE_LIST& aList,
|
||||
bool aIncludeSubComponents );
|
||||
|
||||
int PrintComponentsListByPart( FILE* f, std::vector <SCH_REFERENCE>& aList,
|
||||
int PrintComponentsListByPart( FILE* f, SCH_REFERENCE_LIST& aList,
|
||||
bool aIncludeSubComponents );
|
||||
|
||||
void PrintFieldData( FILE* f, SCH_COMPONENT* DrawLibItem, bool CompactForm = FALSE );
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@
|
|||
#include "sch_no_connect.h"
|
||||
#include "sch_text.h"
|
||||
#include "sch_sheet.h"
|
||||
|
||||
#include "algorithm"
|
||||
|
||||
#include <boost/foreach.hpp>
|
||||
|
|
@ -65,98 +64,6 @@ void dumpNetTable()
|
|||
#endif
|
||||
|
||||
|
||||
SCH_REFERENCE::SCH_REFERENCE( SCH_COMPONENT* aComponent, LIB_COMPONENT* aLibComponent,
|
||||
SCH_SHEET_PATH& aSheetPath )
|
||||
{
|
||||
wxASSERT( aComponent != NULL && aLibComponent != NULL );
|
||||
|
||||
m_RootCmp = aComponent;
|
||||
m_Entry = aLibComponent;
|
||||
m_Unit = aComponent->GetUnitSelection( &aSheetPath );
|
||||
m_SheetPath = aSheetPath;
|
||||
m_IsNew = false;
|
||||
m_Flag = 0;
|
||||
m_TimeStamp = aComponent->m_TimeStamp;
|
||||
|
||||
if( aComponent->GetRef( &aSheetPath ).IsEmpty() )
|
||||
aComponent->SetRef( &aSheetPath, wxT( "DefRef?" ) );
|
||||
|
||||
SetRef( aComponent->GetRef( &aSheetPath ) );
|
||||
|
||||
m_NumRef = -1;
|
||||
|
||||
if( aComponent->GetField( VALUE )->GetText().IsEmpty() )
|
||||
aComponent->GetField( VALUE )->SetText( wxT( "~" ) );
|
||||
|
||||
m_Value = &aComponent->GetField( VALUE )->m_Text;
|
||||
}
|
||||
|
||||
|
||||
void SCH_REFERENCE::Annotate()
|
||||
{
|
||||
if( m_NumRef < 0 )
|
||||
m_Ref += wxChar( '?' );
|
||||
else
|
||||
m_Ref = CONV_TO_UTF8( GetRef() << m_NumRef );
|
||||
|
||||
m_RootCmp->SetRef( &m_SheetPath, CONV_FROM_UTF8( m_Ref.c_str() ) );
|
||||
m_RootCmp->SetUnit( m_Unit );
|
||||
m_RootCmp->SetUnitSelection( &m_SheetPath, m_Unit );
|
||||
}
|
||||
|
||||
|
||||
void SCH_REFERENCE::Split()
|
||||
{
|
||||
std::string refText = GetRefStr();
|
||||
|
||||
m_NumRef = -1;
|
||||
|
||||
int ll = refText.length() - 1;
|
||||
|
||||
if( refText[ll] == '?' )
|
||||
{
|
||||
m_IsNew = true;
|
||||
|
||||
if( !IsPartsLocked() )
|
||||
m_Unit = 0x7FFFFFFF;
|
||||
|
||||
refText.erase( ll ); // delete last char
|
||||
|
||||
SetRefStr( refText );
|
||||
}
|
||||
else if( isdigit( refText[ll] ) == 0 )
|
||||
{
|
||||
m_IsNew = true;
|
||||
|
||||
if( !IsPartsLocked() )
|
||||
m_Unit = 0x7FFFFFFF;
|
||||
}
|
||||
else
|
||||
{
|
||||
while( ll >= 0 )
|
||||
{
|
||||
if( (refText[ll] <= ' ' ) || isdigit( refText[ll] ) )
|
||||
ll--;
|
||||
else
|
||||
{
|
||||
if( isdigit( refText[ll + 1] ) )
|
||||
{
|
||||
// null terminated C string into cp
|
||||
const char* cp = refText.c_str() + ll + 1;
|
||||
|
||||
m_NumRef = atoi( cp );
|
||||
}
|
||||
|
||||
refText.erase( ll+1 ); // delete from ll+1 to end
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
SetRefStr( refText );
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Routine to free memory used to calculate the netlist TabNetItems = pointer
|
||||
* to the main table (list items)
|
||||
|
|
|
|||
|
|
@ -2,6 +2,32 @@
|
|||
/* netlist.h */
|
||||
/***************/
|
||||
|
||||
/*
|
||||
* This program source code file is part of KICAD, a free EDA CAD application.
|
||||
*
|
||||
* Copyright (C) 1992-2011 jean-pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr>
|
||||
* Copyright (C) 1992-2011 Wayne Stambaugh <stambaughw@verizon.net>
|
||||
* Copyright (C) 1992-2011 Kicad Developers, see change_log.txt for contributors.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation; either version 2
|
||||
* of the License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, you may find one here:
|
||||
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
|
||||
* or you may search the http://www.gnu.org website for the version 2 license,
|
||||
* or you may write to the Free Software Foundation, Inc.,
|
||||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
||||
*/
|
||||
|
||||
|
||||
#ifndef _NETLIST_H_
|
||||
#define _NETLIST_H_
|
||||
|
||||
|
|
@ -22,7 +48,6 @@ class SCH_COMPONENT;
|
|||
/* Max pin number per component and footprint */
|
||||
#define MAXPIN 5000
|
||||
|
||||
|
||||
/**
|
||||
* Class SCH_REFERENCE
|
||||
* is used as a helper to define a component's reference designator in a schematic. This
|
||||
|
|
@ -43,7 +68,10 @@ public:
|
|||
LIB_COMPONENT* m_Entry; // the source component in library
|
||||
int m_Unit; /* Selected part (For multi parts per
|
||||
* package) depending on sheet path */
|
||||
wxPoint m_CmpPos; // The physical position of the component in schematic
|
||||
// used to annotate by Y ou Y position
|
||||
SCH_SHEET_PATH m_SheetPath; /* the sheet path for this component */
|
||||
int m_SheetNum; // the sheet num for this component
|
||||
unsigned long m_TimeStamp; /* unique identification number
|
||||
* depending on sheet path */
|
||||
bool m_IsNew; /* true for not yet annotated
|
||||
|
|
@ -66,6 +94,7 @@ public:
|
|||
m_Value = NULL;
|
||||
m_NumRef = 0;
|
||||
m_Flag = 0;
|
||||
m_SheetNum = 0;
|
||||
}
|
||||
|
||||
SCH_REFERENCE( SCH_COMPONENT* aComponent, LIB_COMPONENT* aLibComponent,
|
||||
|
|
@ -127,5 +156,225 @@ public:
|
|||
}
|
||||
};
|
||||
|
||||
/* object used in annotation to handle a list of components in schematic
|
||||
* because in a complex hierarchy, a component is used more than once,
|
||||
* and its reference is depending on the sheet path
|
||||
* for the same component, we must create a flat list of components
|
||||
* used in nelist generation, BOM generation and annotation
|
||||
*/
|
||||
|
||||
class SCH_REFERENCE_LIST
|
||||
{
|
||||
private:
|
||||
std::vector <SCH_REFERENCE> componentFlatList;
|
||||
|
||||
public:
|
||||
/** Constructor
|
||||
*/
|
||||
SCH_REFERENCE_LIST()
|
||||
{
|
||||
}
|
||||
|
||||
SCH_REFERENCE& operator[]( int aIndex )
|
||||
{
|
||||
return componentFlatList[ aIndex ];
|
||||
}
|
||||
|
||||
/**
|
||||
* Function GetCount
|
||||
* @return the number of items in the list
|
||||
*/
|
||||
unsigned GetCount()
|
||||
{
|
||||
return componentFlatList.size();
|
||||
}
|
||||
|
||||
/**
|
||||
* Function GetItem
|
||||
* @return the aIdx item
|
||||
*/
|
||||
SCH_REFERENCE& GetItem(int aIdx)
|
||||
{
|
||||
return componentFlatList[aIdx];
|
||||
}
|
||||
|
||||
/**
|
||||
* Function AddItem
|
||||
* Add a OBJ_CMP_TO_LIST object in aComponentsList for each component found
|
||||
* in sheet
|
||||
* @param aItem - a SCH_REFERENCE item to add
|
||||
*/
|
||||
void AddItem( SCH_REFERENCE& aItem )
|
||||
{
|
||||
componentFlatList.push_back( aItem);
|
||||
}
|
||||
|
||||
/**
|
||||
* Function RemoveSubComponentsFromList
|
||||
* Remove sub components from the list, when multiples parts per package are
|
||||
* found in this list.
|
||||
* Useful to create BOM, when a component must appear only once
|
||||
*/
|
||||
void RemoveSubComponentsFromList( );
|
||||
|
||||
/* Sort functions:
|
||||
* Sort functions are used to sort components for annotatioon or BOM generation.
|
||||
* Because sorting depend on we want to do, there are many sort functions.
|
||||
* Note:
|
||||
* When creating BOM, components are fully annotated.
|
||||
* references are somethink like U3, U5 or R4, R8
|
||||
* When annotating, some or all components are not annotated,
|
||||
* i.e. ref is only U or R, with no number.
|
||||
*/
|
||||
/**
|
||||
* Function SortCmpByXCoordinate
|
||||
* sort the flat list by X coordinates.
|
||||
* The list is always sorted first by ref and sheet
|
||||
*/
|
||||
void SortCmpByXCoordinate()
|
||||
{
|
||||
sort( componentFlatList.begin(), componentFlatList.end(), sortBy_X_Position );
|
||||
}
|
||||
|
||||
/**
|
||||
* Function SortCmpByYCoordinate
|
||||
* sort the flat list by Y coordinates.
|
||||
* The list is always sorted first by ref and sheet
|
||||
*/
|
||||
void SortCmpByYCoordinate()
|
||||
{
|
||||
sort( componentFlatList.begin(), componentFlatList.end(), sortBy_Y_Position );
|
||||
}
|
||||
|
||||
/**
|
||||
* Function SortComponentsByTimeStamp
|
||||
* sort the flat list by Time Stamp.
|
||||
* Useful to detect duplicate Time Stamps
|
||||
*/
|
||||
void SortComponentsByTimeStamp()
|
||||
{
|
||||
sort( componentFlatList.begin(), componentFlatList.end(), sortByTimeStamp );
|
||||
}
|
||||
|
||||
/**
|
||||
* Function SortComponentsByValue
|
||||
* sort the flat list by Value.
|
||||
* Values are sorted by numeric values, not by alpahbetic order
|
||||
* The list is always sorted first by ref
|
||||
*/
|
||||
void SortComponentsByRefAndValue()
|
||||
{
|
||||
sort( componentFlatList.begin(), componentFlatList.end(), sortByRefAndValue );
|
||||
}
|
||||
|
||||
/**
|
||||
* Function SortComponentsByReferenceOnly
|
||||
* sort the flat list by references
|
||||
* For BOM, sorted by reference
|
||||
*/
|
||||
void SortComponentsByReferenceOnly()
|
||||
{
|
||||
sort( componentFlatList.begin(), componentFlatList.end(), sortComponentsByReferenceOnly );
|
||||
}
|
||||
|
||||
/**
|
||||
* Function SortComponentsByValueOnly
|
||||
* sort the flat list by references
|
||||
* For BOM, sorted by values
|
||||
*/
|
||||
void SortComponentsByValueOnly()
|
||||
{
|
||||
sort( componentFlatList.begin(), componentFlatList.end(), sortComponentsByValueOnly );
|
||||
}
|
||||
|
||||
private:
|
||||
/* sort functions used to sort componentFlatList
|
||||
*/
|
||||
|
||||
/**
|
||||
* Function sortByRefAndValue
|
||||
* sort function to annotate items by value
|
||||
* Components are sorted
|
||||
* by reference (when used, referenc is only U ot R, with no number)
|
||||
* if same reference: by value
|
||||
* if same value: by unit number
|
||||
* if same unit number, by sheet
|
||||
* if same sheet, by position X, and Y
|
||||
* @param item1, item2 = SCH_REFERENCE items to compare
|
||||
*/
|
||||
static bool sortByRefAndValue( const SCH_REFERENCE& item1, const SCH_REFERENCE& item2 );
|
||||
/**
|
||||
* Function sortBy_X_Position
|
||||
* sort function to annotate items from their position.
|
||||
* Components are sorted
|
||||
* by reference (when used, referenc is only U ot R, with no number)
|
||||
* if same reference: by sheet
|
||||
* if same sheet, by X pos
|
||||
* if same X pos, by Y pos
|
||||
* if same Y pos, by time stamp
|
||||
* @param item1, item2 = SCH_REFERENCE items to compare
|
||||
*/
|
||||
static bool sortBy_X_Position( const SCH_REFERENCE& item1, const SCH_REFERENCE& item2 );
|
||||
|
||||
/**
|
||||
* Function sortBy_Y_Position
|
||||
* sort function to annotate items from their position.
|
||||
* Components are sorted
|
||||
* by reference (when used, referenc is only U ot R, with no number)
|
||||
* if same reference: by sheet
|
||||
* if same sheet, by Y pos
|
||||
* if same Y pos, by X pos
|
||||
* if same X pos, by time stamp
|
||||
* @param item1, item2 = SCH_REFERENCE items to compare
|
||||
*/
|
||||
static bool sortBy_Y_Position( const SCH_REFERENCE& item1, const SCH_REFERENCE& item2 );
|
||||
|
||||
static bool sortByTimeStamp( const SCH_REFERENCE& item1, const SCH_REFERENCE& item2 );
|
||||
|
||||
/**
|
||||
* Function sortComponentsByValueOnly
|
||||
* compare function for sorting in BOM creation.
|
||||
* components are sorted
|
||||
* by value
|
||||
* if same value: by reference
|
||||
* if same reference: by unit number
|
||||
* @param item1, item2 = SCH_REFERENCE items to compare
|
||||
*/
|
||||
|
||||
static bool sortComponentsByValueOnly( const SCH_REFERENCE& item1, const SCH_REFERENCE& item2 );
|
||||
/**
|
||||
* Function sortComponentsByReferenceOnly
|
||||
* compare function for sorting in BOM creation.
|
||||
* components are sorted
|
||||
* by reference
|
||||
* if same reference: by value (happens only for multi parts per package)
|
||||
* if same value: by unit number
|
||||
* @param item1, item2 = SCH_REFERENCE items to compare
|
||||
*/
|
||||
static bool sortComponentsByReferenceOnly( const SCH_REFERENCE& item1, const SCH_REFERENCE& item2 );
|
||||
};
|
||||
|
||||
/**
|
||||
* helper Class LABEL_OBJECT
|
||||
* is used in build BOM to handle the list of labels in schematic
|
||||
* because in a complex hierarchy, a label is used more than once,
|
||||
* and had more than one sheet path, so we must create a flat list of labels
|
||||
*/
|
||||
class LABEL_OBJECT
|
||||
{
|
||||
public:
|
||||
int m_LabelType;
|
||||
SCH_ITEM* m_Label;
|
||||
|
||||
//have to store it here since the object references will be duplicated.
|
||||
SCH_SHEET_PATH m_SheetPath; //composed of UIDs
|
||||
|
||||
public: LABEL_OBJECT()
|
||||
{
|
||||
m_Label = NULL;
|
||||
m_LabelType = 0;
|
||||
}
|
||||
};
|
||||
typedef std::vector <LABEL_OBJECT> LABEL_OBJECT_LIST;
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -65,40 +65,6 @@ bool LibItemInBox( int x1, int y1, int x2, int y2, SCH_COMPONENT* Draw
|
|||
void DeleteStruct( WinEDA_DrawPanel* panel, wxDC* DC, SCH_ITEM* DrawStruct );
|
||||
|
||||
|
||||
// build_BOM.cpp
|
||||
|
||||
/**
|
||||
* Class LABEL_OBJECT
|
||||
* is used in build BOM to handle the list of labels in schematic
|
||||
* because in a complex hierarchy, a label is used more than once,
|
||||
* and had more than one sheet path, so we must create a flat list of labels
|
||||
*/
|
||||
class LABEL_OBJECT
|
||||
{
|
||||
public:
|
||||
int m_LabelType;
|
||||
SCH_ITEM* m_Label;
|
||||
|
||||
//have to store it here since the object references will be duplicated.
|
||||
SCH_SHEET_PATH m_SheetPath; //composed of UIDs
|
||||
|
||||
public: LABEL_OBJECT()
|
||||
{
|
||||
m_Label = NULL;
|
||||
m_LabelType = 0;
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
void GenListeGLabels( std::vector <LABEL_OBJECT>& aList );
|
||||
bool SortComponentsByReference( const SCH_REFERENCE& obj1, const SCH_REFERENCE& obj2 );
|
||||
bool SortComponentsByValue( const SCH_REFERENCE& obj1, const SCH_REFERENCE& obj2 );
|
||||
bool SortLabelsByValue( const LABEL_OBJECT& obj1, const LABEL_OBJECT& obj2 );
|
||||
bool SortLabelsBySheet( const LABEL_OBJECT& obj1, const LABEL_OBJECT& obj2 );
|
||||
void DeleteSubCmp( std::vector< SCH_REFERENCE >& aList );
|
||||
int PrintListeGLabel( FILE* f, std::vector <LABEL_OBJECT>& aList );
|
||||
|
||||
|
||||
// operations_on_item_lists.cpp
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -861,6 +861,11 @@ void SCH_SHEET::DisplayInfo( WinEDA_DrawFrame* frame )
|
|||
frame->ClearMsgPanel();
|
||||
frame->AppendMsgPanel( _( "Sheet name" ), m_SheetName, CYAN );
|
||||
frame->AppendMsgPanel( _( "File name" ), m_FileName, BROWN );
|
||||
#if 0 // Set to 1 to display the sheet time stamp (mainly for test)
|
||||
wxString msg;
|
||||
msg.Printf(wxT("%.8X"), m_TimeStamp );
|
||||
frame->AppendMsgPanel( _( "Time Stamp" ), msg, BLUE );
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -313,9 +313,17 @@ void SCH_SHEET_PATH::AnnotatePowerSymbols( int* aReference )
|
|||
}
|
||||
|
||||
|
||||
void SCH_SHEET_PATH::GetComponents( std::vector< SCH_REFERENCE >& aReferences,
|
||||
void SCH_SHEET_PATH::GetComponents( SCH_REFERENCE_LIST& aReferences,
|
||||
bool aIncludePowerSymbols )
|
||||
{
|
||||
// Search to sheet path number:
|
||||
int sheetnumber = 1; // 1 = root
|
||||
SCH_SHEET_LIST sheetList;
|
||||
for( SCH_SHEET_PATH* path = sheetList.GetFirst(); path != NULL;
|
||||
path = sheetList.GetNext(), sheetnumber++ )
|
||||
if( Cmp(*path) == 0 )
|
||||
break;
|
||||
|
||||
for( SCH_ITEM* item = LastDrawList(); item != NULL; item = item->Next() )
|
||||
{
|
||||
if( item->Type() == SCH_COMPONENT_T )
|
||||
|
|
@ -333,7 +341,8 @@ void SCH_SHEET_PATH::GetComponents( std::vector< SCH_REFERENCE >& aReferences,
|
|||
continue;
|
||||
|
||||
SCH_REFERENCE reference = SCH_REFERENCE( component, entry, *this );
|
||||
aReferences.push_back( reference );
|
||||
reference.m_SheetNum = sheetnumber;
|
||||
aReferences.AddItem( reference );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -635,7 +644,7 @@ void SCH_SHEET_LIST::AnnotatePowerSymbols()
|
|||
}
|
||||
|
||||
|
||||
void SCH_SHEET_LIST::GetComponents( std::vector< SCH_REFERENCE >& aReferences,
|
||||
void SCH_SHEET_LIST::GetComponents( SCH_REFERENCE_LIST& aReferences,
|
||||
bool aIncludePowerSymbols )
|
||||
{
|
||||
for( SCH_SHEET_PATH* path = GetFirst(); path != NULL; path = GetNext() )
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ class SCH_SCREEN;
|
|||
class SCH_MARKER;
|
||||
class SCH_SHEET;
|
||||
class SCH_ITEM;
|
||||
class SCH_REFERENCE;
|
||||
class SCH_REFERENCE_LIST;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -202,7 +202,7 @@ public:
|
|||
* @param aReferences List of references to populate.
|
||||
* @param aIncludePowerSymbols Set to false to only get normal components.
|
||||
*/
|
||||
void GetComponents( std::vector< SCH_REFERENCE >& aReferences,
|
||||
void GetComponents( SCH_REFERENCE_LIST& aReferences,
|
||||
bool aIncludePowerSymbols = true );
|
||||
|
||||
/**
|
||||
|
|
@ -349,7 +349,7 @@ public:
|
|||
* @param aReferences List of references to populate.
|
||||
* @param aIncludePowerSymbols Set to false to only get normal components.
|
||||
*/
|
||||
void GetComponents( std::vector< SCH_REFERENCE >& aReferences,
|
||||
void GetComponents( SCH_REFERENCE_LIST& aReferences,
|
||||
bool aIncludePowerSymbols = true );
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -22,15 +22,15 @@ public:
|
|||
/**
|
||||
* Function ListSet
|
||||
* Add a list of items.
|
||||
* @param list = a string containing items. Items are separated by '\n'
|
||||
* @param aList = a string containing items. Items are separated by '\n'
|
||||
*/
|
||||
void ListSet(const wxString &list);
|
||||
void ListSet(const wxString &aList);
|
||||
/**
|
||||
* Function ListSet
|
||||
* Add a list of items.
|
||||
* @param list = a wxArrayString containing items.
|
||||
* @param aList = a wxArrayString containing items.
|
||||
*/
|
||||
void ListSet(const wxArrayString &list);
|
||||
void ListSet(const wxArrayString &aList);
|
||||
|
||||
void ListClear();
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -274,10 +274,37 @@ public:
|
|||
* @param aCurrentSheetOnly : if false: remove all annotations, else
|
||||
* remove annotation relative to the current
|
||||
* sheet only
|
||||
* @param aRedraw : true to refresh display
|
||||
*/
|
||||
void DeleteAnnotation( bool aCurrentSheetOnly, bool aRedraw );
|
||||
void DeleteAnnotation( bool aCurrentSheetOnly );
|
||||
|
||||
/**
|
||||
* Function AnnotateComponents:
|
||||
*
|
||||
* Compute the annotation of the components for the whole project, or the
|
||||
* current sheet only. All the components or the new ones only will be
|
||||
* annotated.
|
||||
* @param annotateSchematic : true = entire schematic annotation,
|
||||
* false = current sheet only
|
||||
* @param sortOption : 0 = annotate by sorting X position,
|
||||
* 1 = annotate by sorting X position,
|
||||
* and use sheet number to calculate annotation
|
||||
* 2 = annotate by sorting Y position,
|
||||
* 3 = annotate by sorting Y position,
|
||||
* and use sheet number to calculate annotation
|
||||
* 4 = annotate by sorting value
|
||||
* @param resetAnnotation : true = remove previous annotation
|
||||
* false = annotate new components only
|
||||
* @param repairsTimestamps : true = test for duplicate times stamps and
|
||||
* replace duplicated
|
||||
* Note: this option could change previous annotation, because time
|
||||
* stamps are used to handle annotation mainly in complex
|
||||
* hierarchies.
|
||||
* When the sheet number is used in annotation,
|
||||
* for each sheet annotation starts from sheet number * 100
|
||||
* ( the first sheet uses 100 to 199, the second 200 to 299 ... )
|
||||
*/
|
||||
void AnnotateComponents(bool annotateSchematic, int sortOption,
|
||||
bool resetAnnotation, bool repairsTimestamps );
|
||||
// Functions used for hierarchy handling
|
||||
void InstallPreviousSheet();
|
||||
void InstallNextScreen( SCH_SHEET* Sheet );
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ CPolyLine::~CPolyLine()
|
|||
* if more than one outside contour are found, extra CPolyLines will be created
|
||||
* because copper areas have only one outside contour
|
||||
* Therefore, if this results in new CPolyLines, return them as std::vector pa
|
||||
* @param aExtraPolys: pointer on a std::vector<CPolyLine*> to store extra CPolyLines
|
||||
* @param aExtraPolyList: pointer on a std::vector<CPolyLine*> to store extra CPolyLines
|
||||
* @param bRetainArcs == TRUE, try to retain arcs in polys
|
||||
* @return number of external contours, or -1 if error
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -224,7 +224,7 @@ public:
|
|||
* if more than one outside contour are found, extra CPolyLines will be created
|
||||
* because copper areas have only one outside contour
|
||||
* Therefore, if this results in new CPolyLines, return them as std::vector pa
|
||||
* @param aExtraPolys: pointer on a std::vector<CPolyLine*> to store extra CPolyLines
|
||||
* @param aExtraPolyList: pointer on a std::vector<CPolyLine*> to store extra CPolyLines
|
||||
* @param bRetainArcs == false, try to retain arcs in polys
|
||||
* @return number of external contours, or -1 if error
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/*! \file kbool/_dl_itr.cpp
|
||||
/*! \file _dl_itr.cpp
|
||||
\brief Double Linked list with Iterators on list
|
||||
\author Probably Klaas Holwerda
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/*! \file kbool/include/kbool/_dl_itr.h
|
||||
/*! \file _dl_itr.h
|
||||
\author Klaas Holwerda
|
||||
|
||||
Copyright: 2001-2004 (C) Klaas Holwerda
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/*! \file kbool/_lnk_itr.cpp
|
||||
/*! \file _lnk_itr.cpp
|
||||
\author Probably Klaas Holwerda
|
||||
|
||||
Copyright: 2001-2004 (C) Probably Klaas Holwerda
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/*! \file kbool/include/kbool/_lnk_itr.h
|
||||
/*! \file _lnk_itr.h
|
||||
\author Klaas Holwerda
|
||||
|
||||
Copyright: 2001-2004 (C) Klaas Holwerda
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/*! \file include/booleng.h
|
||||
/*! \file booleng.h
|
||||
\author Klaas Holwerda
|
||||
|
||||
Copyright: 2001-2004 (C) Klaas Holwerda
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/*! \file include/graph.h
|
||||
/*! \file graph.h
|
||||
\author Klaas Holwerda
|
||||
|
||||
Copyright: 2001-2004 (C) Klaas Holwerda
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/*! \file include/graphlst.h
|
||||
/*! \file graphlst.h
|
||||
\author Klaas Holwerda
|
||||
|
||||
Copyright: 2001-2004 (C) Klaas Holwerda
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/*! \file include/line.h
|
||||
/*! \file line.h
|
||||
\brief Mainy used for calculating crossings
|
||||
\author Klaas Holwerda
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/*! \file include/link.h
|
||||
/*! \file link.h
|
||||
\brief Part of a graph, connection between nodes (Header)
|
||||
\author Klaas Holwerda or Julian Smart
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/*! \file include/lpoint.h
|
||||
/*! \file lpoint.h
|
||||
\author Klaas Holwerda
|
||||
|
||||
Copyright: 2001-2004 (C) Klaas Holwerda
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/*! \file include/node.h
|
||||
/*! \file node.h
|
||||
\brief Holds a GDSII node structure (Header)
|
||||
\author Klaas Holwerda
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/*! \file include/record.h
|
||||
/*! \file record.h
|
||||
\author Klaas Holwerda
|
||||
|
||||
Copyright: 2001-2004 (C) Klaas Holwerda
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/*! \file include/scanbeam.h
|
||||
/*! \file scanbeam.h
|
||||
\author Klaas Holwerda
|
||||
|
||||
Copyright: 2001-2004 (C) Klaas Holwerda
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/*! \file kbool/include/kbool/statusb.h
|
||||
/*! \file statusb.h
|
||||
\author Probably Klaas Holwerda
|
||||
|
||||
Copyright: 2001-2004 (C) Probably Klaas Holwerda
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/*! \file kbool/include/kbool/valuesvc.h
|
||||
/*! \file valuesvc.h
|
||||
\author Probably Klaas Holwerda
|
||||
|
||||
Copyright: 2001-2004 (C) Probably Klaas Holwerda
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ using namespace std;
|
|||
* Function TestLineHit
|
||||
* test for hit on line segment i.e. a point within a given distance from segment
|
||||
* @param x, y = cursor coords
|
||||
* @param xi,yi and xf,yf = the end-points of the line segment
|
||||
* @param xi,yi,xf,yf = the end-points of the line segment
|
||||
* @param dist = maximum distance for hit
|
||||
* return true if dist < distance between the point and the segment
|
||||
*/
|
||||
|
|
@ -484,7 +484,7 @@ int FindLineSegmentIntersection( double a, double b, int xi, int yi, int xf, int
|
|||
return 1;
|
||||
}
|
||||
|
||||
/**
|
||||
/*
|
||||
* Function TestForIntersectionOfStraightLineSegments
|
||||
* Test for intersection of line segments
|
||||
* If lines are parallel, returns false
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ int GetClearanceBetweenSegments( int x1i, int y1i, int x1f, int y1f, int style1,
|
|||
* Function GetPointToLineSegmentDistance
|
||||
* Get distance between line segment and point
|
||||
* @param x,y = point
|
||||
* @param xi,yi and xf,yf = the end-points of the line segment
|
||||
* @param xi,yi, xf,yf = the end-points of the line segment
|
||||
* @return the distance
|
||||
*/
|
||||
double GetPointToLineSegmentDistance( int x, int y, int xi, int yi, int xf, int yf );
|
||||
|
|
|
|||
Loading…
Reference in New Issue