Eeschema: fix Bug #1376669 (graphics lost in aliased components) (fc2229df) · Commits · Elphel / kicad-source-mirror

3d-viewer/3d_canvas.cpp

+0 −29

Original line number	Diff line number	Diff line
		@@ -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

+29 −0

Original line number	Diff line number	Diff line
		@@ -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

+9 −299

Original line number	Diff line number	Diff line
		@@ -12,8 +12,8 @@
		width="26"
		version="1.1"
		id="svg2985"
		inkscape:version="0.48.3.1 r9886"
		sodipodi:docname="2-icon_cvpcb.svg">
		inkscape:version="0.48.4 r9939"
		sodipodi:docname="cvpcb.svg">
		<metadata
		id="metadata3057">
		<rdf:RDF>
		@@ -35,15 +35,15 @@
		guidetolerance="10"
		inkscape:pageopacity="0"
		inkscape:pageshadow="2"
		inkscape:window-width="1600"
		inkscape:window-height="849"
		inkscape:window-width="1920"
		inkscape:window-height="1033"
		id="namedview3055"
		showgrid="true"
		inkscape:zoom="18.178537"
		inkscape:cx="5.5742284"
		inkscape:cy="8.1742878"
		inkscape:window-x="0"
		inkscape:window-y="29"
		inkscape:zoom="31.120863"
		inkscape:cx="13.368694"
		inkscape:cy="12.38952"
		inkscape:window-x="-4"
		inkscape:window-y="-4"
		inkscape:window-maximized="1"
		inkscape:current-layer="svg2985"
		inkscape:snap-to-guides="false"
		@@ -327,95 +327,6 @@
		cy="7.2679"
		r="38.159" />
		</defs>
		<g
		id="g3257"
		transform="matrix(0.5853476,0,0,0.53794398,-79.024171,23.848224)">
		<rect
		y="6.5"
		x="1"
		height="13.000002"
		width="24.000004"
		id="rect3926"
		style="fill:none;stroke:#333333;stroke-width:2;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
		<path
		sodipodi:nodetypes="cccc"
		inkscape:connector-curvature="0"
		id="path3928"
		d="m 1,11 3.5,0 0,4 -3.5,0"
		style="fill:none;stroke:#333333;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
		<rect
		ry="0.5"
		rx="0.5"
		y="0"
		x="2"
		height="4"
		width="4"
		id="rect3820"
		style="fill:#d45500;fill-opacity:1;stroke:none" />
		<rect
		style="fill:#d45500;fill-opacity:1;stroke:none"
		id="rect3822"
		width="4"
		height="4"
		x="20"
		y="0"
		rx="0.5"
		ry="0.5" />
		<rect
		ry="0.5"
		rx="0.5"
		y="0"
		x="14"
		height="4"
		width="4"
		id="rect3824"
		style="fill:#d45500;fill-opacity:1;stroke:none" />
		<rect
		style="fill:#d45500;fill-opacity:1;stroke:none"
		id="rect3826"
		width="4"
		height="4"
		x="8"
		y="0"
		rx="0.5"
		ry="0.5" />
		<rect
		style="fill:#d45500;fill-opacity:1;stroke:none"
		id="rect3828"
		width="4"
		height="4"
		x="2"
		y="22"
		rx="0.5"
		ry="0.5" />
		<rect
		ry="0.5"
		rx="0.5"
		y="22"
		x="20"
		height="4"
		width="4"
		id="rect3830"
		style="fill:#d45500;fill-opacity:1;stroke:none" />
		<rect
		style="fill:#d45500;fill-opacity:1;stroke:none"
		id="rect3832"
		width="4"
		height="4"
		x="14"
		y="22"
		rx="0.5"
		ry="0.5" />
		<rect
		ry="0.5"
		rx="0.5"
		y="22"
		x="8"
		height="4"
		width="4"
		id="rect3834"
		style="fill:#d45500;fill-opacity:1;stroke:none" />
		</g>
		<rect
		style="color:#000000;stroke:#000000;stroke-width:0.7119"
		height="0.72042"
		@@ -430,52 +341,6 @@
		transform="matrix(-0.84925,-0.56427,0.49404,-0.84925,120.46108,338.80818)"
		id="g29" />
		</g>
		<g
		id="g4286"
		transform="matrix(0.83930489,0,0,-0.86642568,-100.01845,25.177313)">
		<path
		style="fill:#fafafa;fill-opacity:1;stroke:#000000;stroke-width:1.0914079;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
		d="M 31,19.972938 31,4.9999998 43.834866,12.486469 z"
		id="path3921"
		inkscape:connector-curvature="0"
		sodipodi:nodetypes="cccc" />
		<path
		style="fill:#f0f0f0;fill-opacity:1;stroke:#000000;stroke-width:0.87312639;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
		d="m 32.944676,14.528233 3.500418,0"
		id="path3923"
		inkscape:connector-curvature="0"
		sodipodi:nodetypes="cc" />
		<path
		sodipodi:nodetypes="cc"
		inkscape:connector-curvature="0"
		id="path3925"
		d="m 32.944676,10.784999 3.500418,0"
		style="fill:#f0f0f0;fill-opacity:1;stroke:#000000;stroke-width:0.87312639;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
		<path
		style="fill:#f0f0f0;fill-opacity:1;stroke:#000000;stroke-width:1.0914079;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
		d="m 43.834866,12.486469 2.722546,0"
		id="path3927"
		inkscape:connector-curvature="0"
		sodipodi:nodetypes="cc" />
		<path
		style="fill:#f0f0f0;fill-opacity:1;stroke:#000000;stroke-width:1.0914079;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
		d="m 31,15.208821 -3.111483,0"
		id="path3929"
		inkscape:connector-curvature="0"
		sodipodi:nodetypes="cc" />
		<path
		style="fill:#f0f0f0;fill-opacity:1;stroke:#000000;stroke-width:1.0914079;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
		d="m 31,9.7641166 -3.111483,0"
		id="path3931"
		inkscape:connector-curvature="0"
		sodipodi:nodetypes="cc" />
		<path
		style="fill:#f0f0f0;fill-opacity:1;stroke:#000000;stroke-width:0.87312639;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
		d="m 34.694885,12.316322 0,-3.0626465"
		id="path3933"
		inkscape:connector-curvature="0"
		sodipodi:nodetypes="cc" />
		</g>
		<g
		id="g4556"
		transform="translate(22.055977,-2.8607621)">
		@@ -564,161 +429,6 @@
		inkscape:connector-curvature="0"
		sodipodi:nodetypes="cc" />
		</g>
		<rect
		style="opacity:0.8048782;fill:none;stroke:#f4972b;stroke-width:0.9672913;stroke-opacity:0.98431373"
		id="rect2962"
		width="25.049658"
		height="25.019873"
		x="-120.30598"
		y="1.3000178"
		ry="2.245373" />
		<rect
		style="fill:#f2f2f2;fill-opacity:1;stroke:none"
		id="rect3018"
		width="22.004204"
		height="22.076113"
		x="-118.78465"
		y="2.7732882"
		ry="1.0426829" />
		<g
		id="g3175"
		transform="matrix(0.90161012,0,0,0.90161012,-89.204276,-20.160903)">
		<g
		id="g3191-2"
		transform="matrix(0.85303943,0,0,0.85303943,-24.298581,21.410598)">
		<path
		sodipodi:nodetypes="cccc"
		inkscape:connector-curvature="0"
		id="path3921-4"
		d="m -6.7662586,5.5550885 0,16.0416675 12.0312503,-8.020834 z"
		style="fill:#fafafa;fill-opacity:1;stroke:#800000;stroke-width:1.09375;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
		<path
		sodipodi:nodetypes="cc"
		inkscape:connector-curvature="0"
		id="path3923-8"
		d="m -4.9433423,11.388422 3.28125,0"
		style="fill:#f0f0f0;fill-opacity:1;stroke:#800000;stroke-width:0.87500006;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
		<path
		style="fill:#f0f0f0;fill-opacity:1;stroke:#800000;stroke-width:0.87500006;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
		d="m -4.9433423,15.398839 3.28125,0"
		id="path3925-58"
		inkscape:connector-curvature="0"
		sodipodi:nodetypes="cc" />
		<path
		sodipodi:nodetypes="cc"
		inkscape:connector-curvature="0"
		id="path3927-5"
		d="m 5.2649917,13.575922 2.552083,0"
		style="fill:#f0f0f0;fill-opacity:1;stroke:#800000;stroke-width:1.09375;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
		<path
		sodipodi:nodetypes="cc"
		inkscape:connector-curvature="0"
		id="path3929-0"
		d="m -6.7662586,10.659256 -2.9166667,0"
		style="fill:#f0f0f0;fill-opacity:1;stroke:#800000;stroke-width:1.09375;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
		<path
		sodipodi:nodetypes="cc"
		inkscape:connector-curvature="0"
		id="path3931-0"
		d="m -6.7662586,16.492589 -2.9166667,0"
		style="fill:#f0f0f0;fill-opacity:1;stroke:#800000;stroke-width:1.09375;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
		<path
		sodipodi:nodetypes="cc"
		inkscape:connector-curvature="0"
		id="path3933-3"
		d="m -3.3027173,13.758214 0,3.28125"
		style="fill:#f0f0f0;fill-opacity:1;stroke:#800000;stroke-width:0.87500006;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
		</g>
		</g>
		<g
		id="g3257-4"
		transform="matrix(0.49663588,0,0,0.49663588,-109.56472,12.137037)">
		<rect
		y="6.5"
		x="1"
		height="13.000002"
		width="24.000004"
		id="rect3926-85"
		style="fill:none;stroke:#333333;stroke-width:2;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
		<path
		sodipodi:nodetypes="cccc"
		inkscape:connector-curvature="0"
		id="path3928-9"
		d="m 1,11 3.5,0 0,4 -3.5,0"
		style="fill:none;stroke:#333333;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
		<rect
		ry="0.5"
		rx="0.5"
		y="0"
		x="2"
		height="4"
		width="4"
		id="rect3820-5"
		style="fill:#d45500;fill-opacity:1;stroke:none" />
		<rect
		style="fill:#d45500;fill-opacity:1;stroke:none"
		id="rect3822-6"
		width="4"
		height="4"
		x="20"
		y="0"
		rx="0.5"
		ry="0.5" />
		<rect
		ry="0.5"
		rx="0.5"
		y="0"
		x="14"
		height="4"
		width="4"
		id="rect3824-4"
		style="fill:#d45500;fill-opacity:1;stroke:none" />
		<rect
		style="fill:#d45500;fill-opacity:1;stroke:none"
		id="rect3826-5"
		width="4"
		height="4"
		x="8"
		y="0"
		rx="0.5"
		ry="0.5" />
		<rect
		style="fill:#d45500;fill-opacity:1;stroke:none"
		id="rect3828-0"
		width="4"
		height="4"
		x="2"
		y="22"
		rx="0.5"
		ry="0.5" />
		<rect
		ry="0.5"
		rx="0.5"
		y="22"
		x="20"
		height="4"
		width="4"
		id="rect3830-78"
		style="fill:#d45500;fill-opacity:1;stroke:none" />
		<rect
		style="fill:#d45500;fill-opacity:1;stroke:none"
		id="rect3832-8"
		width="4"
		height="4"
		x="14"
		y="22"
		rx="0.5"
		ry="0.5" />
		<rect
		ry="0.5"
		rx="0.5"
		y="22"
		x="8"
		height="4"
		width="4"
		id="rect3834-4"
		style="fill:#d45500;fill-opacity:1;stroke:none" />
		</g>
		<g
		id="g4496"
		transform="translate(27.864274,2.0172665)">

bitmaps_png/sources/find_replace.svg

+9 −85

Original line number	Diff line number	Diff line
		@@ -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"

Admin message