Skip to content

K
kicad-source-mirror
Commit fc2229df authored by jean-pierre charras's avatar jean-pierre charras
Browse files
Options

Eeschema: fix Bug #1376669 (graphics lost in aliased components) 

Cleaning 3 svg files (no icon change)
Very minor other changes.
parent 99f30c9d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 548 additions and 548 deletions
3d-viewer/3d_canvas.cpp
View file @ fc2229df
......@@ -52,35 +52,6 @@
#include <textures/text_silk.h>
#include <textures/text_pcb.h>
// -----------------
// helper function (from wxWidgets, opengl/cube.cpp sample
// -----------------
void CheckGLError(const char *aFileName, int aLineNumber)
{
GLenum errLast = GL_NO_ERROR;
for ( ; ; )
{
GLenum err = glGetError();
if ( err == GL_NO_ERROR )
return;
// normally the error is reset by the call to glGetError() but if
// glGetError() itself returns an error, we risk looping forever here
// so check that we get a different error than the last time
if ( err == errLast )
{
wxLogError(wxT("OpenGL error state couldn't be reset."));
return;
}
errLast = err;
wxLogError( wxT( "OpenGL error %d At: %s, line: %d" ), err,
GetChars( FROM_UTF8( aFileName ) ), aLineNumber );
}
}
/*
* EDA_3D_CANVAS implementation
......
3d-viewer/3d_draw_helper_functions.cpp
View file @ fc2229df
......@@ -42,6 +42,35 @@
#define TEXTURE_PCB_SCALE 5.0
// -----------------
// helper function (from wxWidgets, opengl/cube.cpp sample
// -----------------
void CheckGLError(const char *aFileName, int aLineNumber)
{
GLenum errLast = GL_NO_ERROR;
for ( ; ; )
{
GLenum err = glGetError();
if ( err == GL_NO_ERROR )
return;
// normally the error is reset by the call to glGetError() but if
// glGetError() itself returns an error, we risk looping forever here
// so check that we get a different error than the last time
if ( err == errLast )
{
wxLogError(wxT("OpenGL error state couldn't be reset."));
return;
}
errLast = err;
wxLogError( wxT( "OpenGL error %d At: %s, line: %d" ), err,
GetChars( FROM_UTF8( aFileName ) ), aLineNumber );
}
}
INFO3D_VISU& EDA_3D_CANVAS::GetPrm3DVisu() const
{
......
bitmaps_png/sources/cvpcb.svg
View file @ fc2229df
This diff is collapsed.
bitmaps_png/sources/find_replace.svg
View file @ fc2229df
......@@ -14,7 +14,7 @@
inkscape:export-xdpi="90.000000"
inkscape:export-filename="/home/steven/edit-find-48.png"
sodipodi:docname="find_replace.svg"
inkscape:version="0.48.2 r9819"
inkscape:version="0.48.4 r9939"
sodipodi:version="0.32"
id="svg249"
height="26"
......@@ -433,17 +433,17 @@
</linearGradient>
</defs>
<sodipodi:namedview
inkscape:window-y="26"
inkscape:window-x="0"
inkscape:window-height="969"
inkscape:window-width="1280"
inkscape:window-y="-4"
inkscape:window-x="-4"
inkscape:window-height="1033"
inkscape:window-width="1920"
inkscape:document-units="px"
inkscape:grid-bbox="true"
showgrid="true"
inkscape:current-layer="layer5"
inkscape:cy="13.454817"
inkscape:cx="70.249125"
inkscape:zoom="4"
inkscape:cy="12.529668"
inkscape:cx="12.810992"
inkscape:zoom="32.571824"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
borderopacity="0.25490196"
......@@ -470,7 +470,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
<dc:title />
<dc:subject>
<rdf:Bag>
<rdf:li>edit</rdf:li>
......@@ -704,82 +704,6 @@
inkscape:label="Magnifying Glass"
style="display:inline"
transform="translate(0,-22)">
<g
id="g3895"
transform="translate(-3.5870629,-0.56250016)">
<rect
style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970757;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:block;overflow:visible"
id="rect15686"
width="11.975437"
height="1"
x="33.024563"
y="27"
rx="0.082502544"
ry="0.065390877" />
<rect
style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970757;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:block;overflow:visible"
id="rect15732"
width="9"
height="1"
x="33"
y="35"
rx="0.062003829"
ry="0.065390877" />
<rect
style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970757;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:block;overflow:visible"
id="rect15744"
width="8"
height="1"
x="33"
y="41"
rx="0.055114511"
ry="0.065390877" />
<rect
style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970757;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:block;overflow:visible"
id="rect15686-1"
width="11.975437"
height="1"
x="33"
y="29"
rx="0.082502544"
ry="0.065390877" />
<rect
style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970757;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:block;overflow:visible"
id="rect15686-9"
width="11.975437"
height="1"
x="33.024563"
y="31"
rx="0.082502544"
ry="0.065390877" />
<rect
style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970757;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:block;overflow:visible"
id="rect15686-0"
width="11.975437"
height="1"
x="33"
y="33"
rx="0.082502544"
ry="0.065390877" />
<rect
style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970757;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:block;overflow:visible"
id="rect15686-5"
width="11.975437"
height="1"
x="33.024563"
y="37"
rx="0.082502544"
ry="0.065390877" />
<rect
style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970757;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:block;overflow:visible"
id="rect15686-03"
width="11.975437"
height="1"
x="33.024563"
y="39"
rx="0.082502544"
ry="0.065390877" />
</g>
<path
style="fill:none;stroke:#000000;stroke-width:0.5538497;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.01754384;display:inline"
d="m 6.2485326,26.884809 0,20.221684"
......
bitmaps_png/sources/orient.svg
View file @ fc2229df
This diff is collapsed.
eeschema/getpart.cpp
View file @ fc2229df
......@@ -208,6 +208,9 @@ SCH_COMPONENT* SCH_EDIT_FRAME::Load_Component( wxDC* aDC,
// alias exists because its root component was found
component->SetPartName( name );
// Be sure the link to the corresponding LIB_PART is OK:
component->Resolve( Prj().SchLibs() );
// Set the component value that can differ from component name in lib, for aliases
component->GetField( VALUE )->SetText( name );
......
pcbnew/scripting/plugins/FPC_(SMD_type)_footprintwizard.py
View file @ fc2229df
......@@ -131,15 +131,13 @@ class FPCFootprintWizard(FootprintWizardPlugin):
module.Add(outline)
# lower line
outline1 = EDGE_MODULE(module)
outline1.Copy(outline) #copy all settings from outline
outline1 = outline.Duplicate() #copy all settings from outline
posy = pad_height/2 + linewidth/2 + margin
outline1.SetStartEnd(wxPoint(xstart, posy), wxPoint( xend, posy))
module.Add(outline1)
# around left mechanical pad (the outline around right pad is mirrored/y axix)
outline2 = EDGE_MODULE(module) # vertical segment
outline2.Copy(outline)
outline2 = outline.Duplicate() # vertical segment
yend = pad_s0_pos.y + shl_height/2 + margin
outline2.SetStartEnd(wxPoint(xstart, posy), wxPoint( xstart, yend))
module.Add(outline2)
......@@ -148,8 +146,7 @@ class FPCFootprintWizard(FootprintWizardPlugin):
outline2_d.SetStartEnd(wxPoint(-xstart, posy), wxPoint( -xstart, yend))
module.Add(outline2_d)
outline3 = EDGE_MODULE(module) # horizontal segment below the pad
outline3.Copy(outline)
outline3 = outline.Duplicate() # horizontal segment below the pad
posy = yend
xend = pad_s0_pos.x - (shl_width/2 + linewidth + margin*2)
outline3.SetStartEnd(wxPoint(xstart, posy), wxPoint( xend, posy))
......@@ -159,37 +156,31 @@ class FPCFootprintWizard(FootprintWizardPlugin):
outline3_d.SetStartEnd(wxPoint(-xstart, posy), wxPoint( -xend, yend))
module.Add(outline3_d)
outline4 = EDGE_MODULE(module) # vertical segment at left of the pad
outline4.Copy(outline)
outline4 = outline.Duplicate() # vertical segment at left of the pad
xstart = xend
yend = posy - (shl_height + linewidth + margin*2)
outline4.SetStartEnd(wxPoint(xstart, posy), wxPoint( xend, yend))
module.Add(outline4)
outline4_d = EDGE_MODULE(module) # right pad side
outline4_d.Copy(outline4)
outline4_d = outline.Duplicate() # right pad side
outline4_d.SetStartEnd(wxPoint(-xstart, posy), wxPoint( -xend, yend))
module.Add(outline4_d)
outline5 = EDGE_MODULE(module) # horizontal segment above the pad
outline5.Copy(outline)
outline5 = outline.Duplicate() # horizontal segment above the pad
xstart = xend
xend = - pad_pitch*0.5-offsetX
posy = yend
outline5.SetStartEnd(wxPoint(xstart, posy), wxPoint( xend, yend))
module.Add(outline5)
outline5_d = EDGE_MODULE(module) # right pad side
outline5_d.Copy(outline5)
outline5_d = outline.Duplicate() # right pad side
outline5_d.SetStartEnd(wxPoint(-xstart, posy), wxPoint( -xend, yend))
module.Add(outline5_d)
outline6 = EDGE_MODULE(module) # vertical segment above the pad
outline6.Copy(outline)
outline6 = outline.Duplicate() # vertical segment above the pad
xstart = xend
yend = -pad_height/2 - linewidth/2 - margin
outline6.SetStartEnd(wxPoint(xstart, posy), wxPoint( xend, yend))
module.Add(outline6)
outline6_d = EDGE_MODULE(module) # right pad side
outline6_d.Copy(outline6)
outline6_d = outline.Duplicate() # right pad side
outline6_d.SetStartEnd(wxPoint(-xstart, posy), wxPoint( -xend, yend))
module.Add(outline6_d)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment