Commit e7d5770f authored by jean-pierre charras's avatar jean-pierre charras
Browse files

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 .
parent d0105f1b

bitmaps/annotate_down_right.xpm

+32 −37
Original line number Diff line number Diff line 
/* 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

bitmaps/annotate_right_down.xpm

+33 −38
Original line number Diff line number Diff line 
/* 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

bitmaps/sources/annotate_down_right.svg

0 → 100644
+169 −0
Original line number Diff line number Diff line 
<?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>

bitmaps/sources/annotate_right_down.svg

0 → 100644
+169 −0
Original line number Diff line number Diff line 
<?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>

common/edaappl.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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.") );