Release of 2017-02-05 :

Addition:
into "Point 1/3" TAB :
	Projected Point(s)
into "Wire 1/2" TAB :
	Convex 2D Polygon
Update:
into "Modif." TAB:
	Translate
Tutorials (into Doc/Tutorials directory):
WF_Tuto_MODIF_TranslationBySegment.mp4
WF_Tuto_POINTS_ProjectedPoints.mp4
WF_Tuto_POINTS_RandomPoints.mp4
WF_Tuto_WIRE_2DConvexPolygon.mp4
WF_Tuto_WIRE_CreatePolygon.mp4
WF_Tuto_WIRE_Regression2D.mp4
This commit is contained in:
Rentlau 2017-02-05 21:00:56 +01:00
parent 6fdc93bc2f
commit 5ea60a1920
25 changed files with 4374 additions and 6414 deletions

Binary file not shown.

View File

@ -0,0 +1,123 @@
<?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"
width="64px"
height="64px"
id="svg2918"
sodipodi:version="0.32"
inkscape:version="0.91 r13725"
sodipodi:docname="WF_click.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
version="1.1">
<defs
id="defs2920">
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3144"
id="radialGradient3191"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736"
r="34.345188" />
<linearGradient
id="linearGradient3144">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop3146" />
<stop
style="stop-color:#ffffff;stop-opacity:0;"
offset="1"
id="stop3148" />
</linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3144"
id="radialGradient3183"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736"
r="34.345188" />
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 32 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="64 : 32 : 1"
inkscape:persp3d-origin="32 : 21.333333 : 1"
id="perspective2926" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3144"
id="radialGradient3075"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736"
r="34.345188" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="7.6104543"
inkscape:cx="4.2038293"
inkscape:cy="31.812827"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:document-units="px"
inkscape:grid-bbox="true"
inkscape:window-width="1366"
inkscape:window-height="702"
inkscape:window-x="0"
inkscape:window-y="1227"
inkscape:window-maximized="1" />
<metadata
id="metadata2923">
<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:label="Layer 1"
inkscape:groupmode="layer">
<g
id="g3177"
transform="matrix(-0.1459885,0.00366916,-0.00366916,-0.1459885,83.957793,125.97476)"
inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
inkscape:export-xdpi="7.2934141"
inkscape:export-ydpi="7.2934141" />
<path
sodipodi:nodetypes="ccccccccc"
inkscape:connector-curvature="0"
id="path5799-2"
d="M 27.865364,32.991184 23.4039,47.623682 5.1420292,8.6874001 C 5.594662,7.243395 4.3516376,5.5692254 7.7077253,5.6469608 L 49.544536,22.069334 36.201615,26.606419 58.322749,45.403425 c 0.434076,4.442433 0.118637,8.445519 -7.920612,9.999191 z"
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:54.21519089px;font-family:Arial;-inkscape-font-specification:Arial;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:3.29860783;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
</g>
</svg>

After

Width:  |  Height:  |  Size: 4.3 KiB

View File

@ -0,0 +1,619 @@
<?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"
width="64px"
height="64px"
id="svg2918"
sodipodi:version="0.32"
inkscape:version="0.91 r13725"
sodipodi:docname="WF_convexPolygon.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
version="1.1">
<defs
id="defs2920">
<linearGradient
id="linearGradient3144">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop3146" />
<stop
style="stop-color:#ffffff;stop-opacity:0;"
offset="1"
id="stop3148" />
</linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3144"
id="radialGradient3183"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736"
r="34.345188" />
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 32 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="64 : 32 : 1"
inkscape:persp3d-origin="32 : 21.333333 : 1"
id="perspective2926" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3144-6"
id="radialGradient4272"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736"
r="34.345188" />
<linearGradient
inkscape:collect="always"
id="linearGradient3144-6">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop3146-2" />
<stop
style="stop-color:#ffffff;stop-opacity:0;"
offset="1"
id="stop3148-5" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4135-3"
id="linearGradient4145-1"
x1="131.82286"
y1="101.22672"
x2="191.3165"
y2="101.22672"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
id="linearGradient4135-3">
<stop
style="stop-color:#0079ff;stop-opacity:1;"
offset="0"
id="stop4137-9" />
<stop
style="stop-color:#0079ff;stop-opacity:0;"
offset="1"
id="stop4139-2" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4135-3-5"
id="linearGradient4145-1-8"
x1="131.82286"
y1="101.22672"
x2="191.3165"
y2="101.22672"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
id="linearGradient4135-3-5">
<stop
style="stop-color:#0079ff;stop-opacity:1;"
offset="0"
id="stop4137-9-3" />
<stop
style="stop-color:#0079ff;stop-opacity:0;"
offset="1"
id="stop4139-2-7" />
</linearGradient>
<radialGradient
r="34.345188"
fy="672.79736"
fx="225.26402"
cy="672.79736"
cx="225.26402"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
gradientUnits="userSpaceOnUse"
id="radialGradient4558-0"
xlink:href="#linearGradient3144-6-2"
inkscape:collect="always" />
<linearGradient
inkscape:collect="always"
id="linearGradient3144-6-2">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop3146-2-4" />
<stop
style="stop-color:#ffffff;stop-opacity:0;"
offset="1"
id="stop3148-5-6" />
</linearGradient>
<radialGradient
r="34.345188"
fy="672.79736"
fx="225.26402"
cy="672.79736"
cx="225.26402"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
gradientUnits="userSpaceOnUse"
id="radialGradient4558-7"
xlink:href="#linearGradient3144-6-9"
inkscape:collect="always" />
<linearGradient
inkscape:collect="always"
id="linearGradient3144-6-9">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop3146-2-7" />
<stop
style="stop-color:#ffffff;stop-opacity:0;"
offset="1"
id="stop3148-5-7" />
</linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3144-9"
id="radialGradient3191"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736"
r="34.345188" />
<linearGradient
id="linearGradient3144-9">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop3146-7" />
<stop
style="stop-color:#ffffff;stop-opacity:0;"
offset="1"
id="stop3148-2" />
</linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3144-9-3"
id="radialGradient4852-4"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736"
r="34.345188" />
<linearGradient
id="linearGradient3144-9-3">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop3146-7-5" />
<stop
style="stop-color:#ffffff;stop-opacity:0;"
offset="1"
id="stop3148-2-7" />
</linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3144-9-4"
id="radialGradient4852-9"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736"
r="34.345188" />
<linearGradient
id="linearGradient3144-9-4">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop3146-7-7" />
<stop
style="stop-color:#ffffff;stop-opacity:0;"
offset="1"
id="stop3148-2-9" />
</linearGradient>
<radialGradient
r="34.345188"
fy="672.79736"
fx="225.26402"
cy="672.79736"
cx="225.26402"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
gradientUnits="userSpaceOnUse"
id="radialGradient3264-9"
xlink:href="#linearGradient3144"
inkscape:collect="always" />
<radialGradient
r="34.345188"
fy="672.79736"
fx="225.26402"
cy="672.79736"
cx="225.26402"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
gradientUnits="userSpaceOnUse"
id="radialGradient3264-9-6"
xlink:href="#linearGradient3144"
inkscape:collect="always" />
<radialGradient
r="34.345188"
fy="672.79736"
fx="225.26402"
cy="672.79736"
cx="225.26402"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
gradientUnits="userSpaceOnUse"
id="radialGradient3264-9-6-1"
xlink:href="#linearGradient3144"
inkscape:collect="always" />
<radialGradient
r="34.345188"
fy="672.79736"
fx="225.26402"
cy="672.79736"
cx="225.26402"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
gradientUnits="userSpaceOnUse"
id="radialGradient3264-9-6-1-1"
xlink:href="#linearGradient3144"
inkscape:collect="always" />
<radialGradient
r="34.345188"
fy="672.79736"
fx="225.26402"
cy="672.79736"
cx="225.26402"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
gradientUnits="userSpaceOnUse"
id="radialGradient3264-9-6-1-1-9"
xlink:href="#linearGradient3144"
inkscape:collect="always" />
<radialGradient
r="34.345188"
fy="672.79736"
fx="225.26402"
cy="672.79736"
cx="225.26402"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
gradientUnits="userSpaceOnUse"
id="radialGradient3264-9-6-1-1-9-8"
xlink:href="#linearGradient3144"
inkscape:collect="always" />
<radialGradient
r="34.345188"
fy="672.79736"
fx="225.26402"
cy="672.79736"
cx="225.26402"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
gradientUnits="userSpaceOnUse"
id="radialGradient3264-9-6-1-1-9-8-6"
xlink:href="#linearGradient3144"
inkscape:collect="always" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="7.6088565"
inkscape:cx="33.444373"
inkscape:cy="30.440063"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:document-units="px"
inkscape:grid-bbox="true"
inkscape:window-width="1366"
inkscape:window-height="702"
inkscape:window-x="0"
inkscape:window-y="27"
inkscape:window-maximized="1" />
<metadata
id="metadata2923">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<g
id="layer1"
inkscape:label="Layer 1"
inkscape:groupmode="layer">
<ellipse
ry="6.2593665"
rx="5.8838305"
cy="45.098446"
cx="12.998963"
id="path3968"
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:54.21519089px;font-family:Arial;-inkscape-font-specification:Arial;display:inline;overflow:visible;visibility:visible;fill:#555753;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.79201269;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
<ellipse
ry="6.2593665"
rx="5.8838305"
cy="60.551296"
cx="41.915024"
id="path3968-4"
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:54.21519089px;font-family:Arial;-inkscape-font-specification:Arial;display:inline;overflow:visible;visibility:visible;fill:#555753;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.79201269;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
<ellipse
ry="6.2593665"
rx="5.8838305"
cy="16.978237"
cx="29.910881"
id="path3968-4-0"
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:54.21519089px;font-family:Arial;-inkscape-font-specification:Arial;display:inline;overflow:visible;visibility:visible;fill:#555753;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.79201269;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
<ellipse
ry="6.2593665"
rx="5.8838305"
cy="23.941969"
cx="58.097412"
id="path3968-4-0-7"
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:54.21519089px;font-family:Arial;-inkscape-font-specification:Arial;display:inline;overflow:visible;visibility:visible;fill:#555753;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.79201269;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
<path
style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:0.58431373;fill-rule:nonzero;stroke:none;stroke-width:0.84700072;marker:none;enable-background:accumulate"
d="M 57.905786,19.105436 29.578034,12.560311 9.4255882,45.49815 37.837962,63.67851 40.480295,57.198698 17.086112,41.9762 31.690938,17.646862 57.053414,23.748653 Z"
id="path4425-9-8"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccccccc" />
<g
id="g3177"
transform="matrix(-0.1459885,0.00366916,-0.00366916,-0.1459885,83.957793,125.97476)"
inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
inkscape:export-xdpi="7.2934141"
inkscape:export-ydpi="7.2934141" />
<path
style="display:inline;overflow:visible;visibility:visible;fill:#ffa100;fill-opacity:1;fill-rule:nonzero;stroke:#665123;stroke-width:0.84700072;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
d="M 58.555579,11.316021 22.307841,5.7938518 4.8450848,37.848895 40.042117,59.66807 41.293589,54.194078 11.233991,36.399782 24.986028,10.157803 57.773488,15.36902 Z"
id="path4425-9"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccccccc" />
<g
id="g3177-3"
transform="matrix(-0.1459885,0.00366916,-0.00366916,-0.1459885,160.08538,105.57482)"
inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
inkscape:export-xdpi="7.2934141"
inkscape:export-ydpi="7.2934141" />
<g
id="g5734-5"
transform="translate(-14.861945,44.831094)">
<circle
transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,0,0)"
id="path3187-6-5-7-2-9-9"
style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:0.58431373;fill-rule:nonzero;stroke:none;stroke-width:5.79999971;marker:none;enable-background:accumulate"
cx="-54.289261"
cy="-16.205133"
r="7.0931091" />
<g
inkscape:export-ydpi="7.0721951"
inkscape:export-xdpi="7.0721951"
inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/line.png"
transform="matrix(-0.14037891,0.00375861,-0.00375861,-0.14037891,83.443368,103.46311)"
id="g3154-5-3-9">
<circle
style="fill:#0079ff;fill-opacity:1;stroke:#001833;stroke-width:5.80000019;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path2162-1-0-7"
cx="197.14285"
cy="655.2193"
r="48.57143" />
<ellipse
style="fill:url(#radialGradient3264-9);fill-opacity:1;stroke:none"
id="path3134-2-9-0"
transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
cx="225.26402"
cy="672.79736"
rx="34.345188"
ry="23.991123" />
</g>
</g>
<g
id="g5734-5-3"
transform="translate(-44.827027,25.163146)">
<circle
transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,0,0)"
id="path3187-6-5-7-2-9-9-7"
style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:0.58431373;fill-rule:nonzero;stroke:none;stroke-width:5.79999971;marker:none;enable-background:accumulate"
cx="-54.289261"
cy="-16.205133"
r="7.0931091" />
<g
inkscape:export-ydpi="7.0721951"
inkscape:export-xdpi="7.0721951"
inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/line.png"
transform="matrix(-0.14037891,0.00375861,-0.00375861,-0.14037891,83.443368,103.46311)"
id="g3154-5-3-9-9">
<circle
style="fill:#0079ff;fill-opacity:1;stroke:#001833;stroke-width:5.80000019;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path2162-1-0-7-4"
cx="197.14285"
cy="655.2193"
r="48.57143" />
<ellipse
style="fill:url(#radialGradient3264-9-6);fill-opacity:1;stroke:none"
id="path3134-2-9-0-4"
transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
cx="225.26402"
cy="672.79736"
rx="34.345188"
ry="23.991123" />
</g>
</g>
<g
id="g5734-5-3-5"
transform="translate(-30.895892,-3.6191024)">
<circle
transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,0,0)"
id="path3187-6-5-7-2-9-9-7-8"
style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:0.58431373;fill-rule:nonzero;stroke:none;stroke-width:5.79999971;marker:none;enable-background:accumulate"
cx="-54.289261"
cy="-16.205133"
r="7.0931091" />
<g
inkscape:export-ydpi="7.0721951"
inkscape:export-xdpi="7.0721951"
inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/line.png"
transform="matrix(-0.14037891,0.00375861,-0.00375861,-0.14037891,83.443368,103.46311)"
id="g3154-5-3-9-9-6">
<circle
style="fill:#0079ff;fill-opacity:1;stroke:#001833;stroke-width:5.80000019;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path2162-1-0-7-4-7"
cx="197.14285"
cy="655.2193"
r="48.57143" />
<ellipse
style="fill:url(#radialGradient3264-9-6-1);fill-opacity:1;stroke:none"
id="path3134-2-9-0-4-8"
transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
cx="225.26402"
cy="672.79736"
rx="34.345188"
ry="23.991123" />
</g>
</g>
<g
id="g5734-5-3-5-2"
transform="translate(3.2748139,0.19224543)">
<circle
transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,0,0)"
id="path3187-6-5-7-2-9-9-7-8-5"
style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:0.58431373;fill-rule:nonzero;stroke:none;stroke-width:5.79999971;marker:none;enable-background:accumulate"
cx="-54.289261"
cy="-16.205133"
r="7.0931091" />
<g
inkscape:export-ydpi="7.0721951"
inkscape:export-xdpi="7.0721951"
inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/line.png"
transform="matrix(-0.14037891,0.00375861,-0.00375861,-0.14037891,83.443368,103.46311)"
id="g3154-5-3-9-9-6-0">
<circle
style="fill:#0079ff;fill-opacity:1;stroke:#001833;stroke-width:5.80000019;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path2162-1-0-7-4-7-5"
cx="197.14285"
cy="655.2193"
r="48.57143" />
<ellipse
style="fill:url(#radialGradient3264-9-6-1-1);fill-opacity:1;stroke:none"
id="path3134-2-9-0-4-8-5"
transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
cx="225.26402"
cy="672.79736"
rx="34.345188"
ry="23.991123" />
</g>
</g>
<g
id="g5734-5-3-5-2-8"
transform="translate(-13.416262,11.494864)">
<circle
transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,0,0)"
id="path3187-6-5-7-2-9-9-7-8-5-8"
style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:0.58431373;fill-rule:nonzero;stroke:none;stroke-width:5.79999971;marker:none;enable-background:accumulate"
cx="-54.289261"
cy="-16.205133"
r="7.0931091" />
<g
inkscape:export-ydpi="7.0721951"
inkscape:export-xdpi="7.0721951"
inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/line.png"
transform="matrix(-0.14037891,0.00375861,-0.00375861,-0.14037891,83.443368,103.46311)"
id="g3154-5-3-9-9-6-0-4">
<circle
style="fill:#0079ff;fill-opacity:1;stroke:#001833;stroke-width:5.80000019;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path2162-1-0-7-4-7-5-2"
cx="197.14285"
cy="655.2193"
r="48.57143" />
<ellipse
style="fill:url(#radialGradient3264-9-6-1-1-9);fill-opacity:1;stroke:none"
id="path3134-2-9-0-4-8-5-8"
transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
cx="225.26402"
cy="672.79736"
rx="34.345188"
ry="23.991123" />
</g>
</g>
<g
id="g5734-5-3-5-2-8-4"
transform="translate(-26.558841,19.643263)">
<circle
transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,0,0)"
id="path3187-6-5-7-2-9-9-7-8-5-8-4"
style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:0.58431373;fill-rule:nonzero;stroke:none;stroke-width:5.79999971;marker:none;enable-background:accumulate"
cx="-54.289261"
cy="-16.205133"
r="7.0931091" />
<g
inkscape:export-ydpi="7.0721951"
inkscape:export-xdpi="7.0721951"
inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/line.png"
transform="matrix(-0.14037891,0.00375861,-0.00375861,-0.14037891,83.443368,103.46311)"
id="g3154-5-3-9-9-6-0-4-1">
<circle
style="fill:#0079ff;fill-opacity:1;stroke:#001833;stroke-width:5.80000019;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path2162-1-0-7-4-7-5-2-2"
cx="197.14285"
cy="655.2193"
r="48.57143" />
<ellipse
style="fill:url(#radialGradient3264-9-6-1-1-9-8);fill-opacity:1;stroke:none"
id="path3134-2-9-0-4-8-5-8-0"
transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
cx="225.26402"
cy="672.79736"
rx="34.345188"
ry="23.991123" />
</g>
</g>
<g
id="g5734-5-3-5-2-8-4-4"
transform="translate(-12.102003,28.974495)">
<circle
transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,0,0)"
id="path3187-6-5-7-2-9-9-7-8-5-8-4-8"
style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:0.58431373;fill-rule:nonzero;stroke:none;stroke-width:5.79999971;marker:none;enable-background:accumulate"
cx="-54.289261"
cy="-16.205133"
r="7.0931091" />
<g
inkscape:export-ydpi="7.0721951"
inkscape:export-xdpi="7.0721951"
inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/line.png"
transform="matrix(-0.14037891,0.00375861,-0.00375861,-0.14037891,83.443368,103.46311)"
id="g3154-5-3-9-9-6-0-4-1-9">
<circle
style="fill:#0079ff;fill-opacity:1;stroke:#001833;stroke-width:5.80000019;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path2162-1-0-7-4-7-5-2-2-5"
cx="197.14285"
cy="655.2193"
r="48.57143" />
<ellipse
style="fill:url(#radialGradient3264-9-6-1-1-9-8-6);fill-opacity:1;stroke:none"
id="path3134-2-9-0-4-8-5-8-0-5"
transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
cx="225.26402"
cy="672.79736"
rx="34.345188"
ry="23.991123" />
</g>
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 24 KiB

View File

@ -182,17 +182,6 @@
offset="1" offset="1"
id="stop3148-2" /> id="stop3148-2" />
</linearGradient> </linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3144-9"
id="radialGradient4852"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736"
r="34.345188" />
<radialGradient <radialGradient
inkscape:collect="always" inkscape:collect="always"
xlink:href="#linearGradient3144-9-3" xlink:href="#linearGradient3144-9-3"
@ -215,17 +204,6 @@
offset="1" offset="1"
id="stop3148-2-7" /> id="stop3148-2-7" />
</linearGradient> </linearGradient>
<radialGradient
r="34.345188"
fy="672.79736"
fx="225.26402"
cy="672.79736"
cx="225.26402"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
gradientUnits="userSpaceOnUse"
id="radialGradient4889"
xlink:href="#linearGradient3144-9-3"
inkscape:collect="always" />
<radialGradient <radialGradient
inkscape:collect="always" inkscape:collect="always"
xlink:href="#linearGradient3144-9-4" xlink:href="#linearGradient3144-9-4"
@ -256,20 +234,42 @@
cx="225.26402" cx="225.26402"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)" gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
gradientUnits="userSpaceOnUse" gradientUnits="userSpaceOnUse"
id="radialGradient4929" id="radialGradient3264-9"
xlink:href="#linearGradient3144-9-4" xlink:href="#linearGradient3144"
inkscape:collect="always" /> inkscape:collect="always" />
<radialGradient <radialGradient
inkscape:collect="always" r="34.345188"
xlink:href="#linearGradient3144"
id="radialGradient4852-6"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736" fy="672.79736"
r="34.345188" /> fx="225.26402"
cy="672.79736"
cx="225.26402"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
gradientUnits="userSpaceOnUse"
id="radialGradient3264-9-6"
xlink:href="#linearGradient3144"
inkscape:collect="always" />
<radialGradient
r="34.345188"
fy="672.79736"
fx="225.26402"
cy="672.79736"
cx="225.26402"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
gradientUnits="userSpaceOnUse"
id="radialGradient3264-9-6-1"
xlink:href="#linearGradient3144"
inkscape:collect="always" />
<radialGradient
r="34.345188"
fy="672.79736"
fx="225.26402"
cy="672.79736"
cx="225.26402"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
gradientUnits="userSpaceOnUse"
id="radialGradient3264-9-6-1-1"
xlink:href="#linearGradient3144"
inkscape:collect="always" />
</defs> </defs>
<sodipodi:namedview <sodipodi:namedview
id="base" id="base"
@ -278,17 +278,17 @@
borderopacity="1.0" borderopacity="1.0"
inkscape:pageopacity="0.0" inkscape:pageopacity="0.0"
inkscape:pageshadow="2" inkscape:pageshadow="2"
inkscape:zoom="15.078125" inkscape:zoom="7.6088565"
inkscape:cx="31.933679" inkscape:cx="33.444373"
inkscape:cy="23.941969" inkscape:cy="30.440063"
inkscape:current-layer="layer1" inkscape:current-layer="layer1"
showgrid="true" showgrid="true"
inkscape:document-units="px" inkscape:document-units="px"
inkscape:grid-bbox="true" inkscape:grid-bbox="true"
inkscape:window-width="1920" inkscape:window-width="1366"
inkscape:window-height="1161" inkscape:window-height="702"
inkscape:window-x="0" inkscape:window-x="0"
inkscape:window-y="0" inkscape:window-y="27"
inkscape:window-maximized="1" /> inkscape:window-maximized="1" />
<metadata <metadata
id="metadata2923"> id="metadata2923">
@ -298,7 +298,7 @@
<dc:format>image/svg+xml</dc:format> <dc:format>image/svg+xml</dc:format>
<dc:type <dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title> <dc:title />
</cc:Work> </cc:Work>
</rdf:RDF> </rdf:RDF>
</metadata> </metadata>
@ -347,7 +347,7 @@
inkscape:export-xdpi="7.2934141" inkscape:export-xdpi="7.2934141"
inkscape:export-ydpi="7.2934141" /> inkscape:export-ydpi="7.2934141" />
<path <path
style="display:inline;overflow:visible;visibility:visible;fill:#0079ff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.84700072;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" style="display:inline;overflow:visible;visibility:visible;fill:#ffa100;fill-opacity:1;fill-rule:nonzero;stroke:#665123;stroke-width:0.84700072;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
d="M 58.555579,11.316021 22.307841,5.7938518 4.8450848,37.848895 40.042117,59.66807 41.293589,54.194078 11.233991,36.399782 24.986028,10.157803 57.773488,15.36902 Z" d="M 58.555579,11.316021 22.307841,5.7938518 4.8450848,37.848895 40.042117,59.66807 41.293589,54.194078 11.233991,36.399782 24.986028,10.157803 57.773488,15.36902 Z"
id="path4425-9" id="path4425-9"
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
@ -359,88 +359,132 @@
inkscape:export-xdpi="7.2934141" inkscape:export-xdpi="7.2934141"
inkscape:export-ydpi="7.2934141" /> inkscape:export-ydpi="7.2934141" />
<g <g
id="g3185" id="g5734-5"
transform="matrix(-0.14592237,0.00572413,-0.00572413,-0.14592237,40.882773,131.25331)" transform="translate(-14.861945,44.831094)">
inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
inkscape:export-xdpi="7.2934141"
inkscape:export-ydpi="7.2934141">
<circle <circle
id="path3187" transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,0,0)"
style="display:inline;overflow:visible;visibility:visible;fill:#fcaf3e;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" id="path3187-6-5-7-2-9-9"
cx="197.14285" style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:0.58431373;fill-rule:nonzero;stroke:none;stroke-width:5.79999971;marker:none;enable-background:accumulate"
cy="655.2193" cx="-54.289261"
r="48.57143" /> cy="-16.205133"
<ellipse r="7.0931091" />
transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" <g
id="path3189" inkscape:export-ydpi="7.0721951"
style="fill:url(#radialGradient4852);fill-opacity:1;stroke:none" inkscape:export-xdpi="7.0721951"
cx="225.26402" inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/line.png"
cy="672.79736" transform="matrix(-0.14037891,0.00375861,-0.00375861,-0.14037891,83.443368,103.46311)"
rx="34.345188" id="g3154-5-3-9">
ry="23.991123" /> <circle
style="fill:#0079ff;fill-opacity:1;stroke:#001833;stroke-width:5.80000019;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path2162-1-0-7"
cx="197.14285"
cy="655.2193"
r="48.57143" />
<ellipse
style="fill:url(#radialGradient3264-9);fill-opacity:1;stroke:none"
id="path3134-2-9-0"
transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
cx="225.26402"
cy="672.79736"
rx="34.345188"
ry="23.991123" />
</g>
</g> </g>
<g <g
id="g3185-6" id="g5734-5-3"
transform="matrix(-0.14592237,0.00572413,-0.00572413,-0.14592237,91.042198,108.25459)" transform="translate(-44.827027,25.163146)">
inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
inkscape:export-xdpi="7.2934141"
inkscape:export-ydpi="7.2934141">
<circle <circle
id="path3187-2" transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,0,0)"
style="display:inline;overflow:visible;visibility:visible;fill:#fcaf3e;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" id="path3187-6-5-7-2-9-9-7"
cx="197.14285" style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:0.58431373;fill-rule:nonzero;stroke:none;stroke-width:5.79999971;marker:none;enable-background:accumulate"
cy="655.2193" cx="-54.289261"
r="48.57143" /> cy="-16.205133"
<ellipse r="7.0931091" />
transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" <g
id="path3189-5" inkscape:export-ydpi="7.0721951"
style="fill:url(#radialGradient4889);fill-opacity:1;stroke:none" inkscape:export-xdpi="7.0721951"
cx="225.26402" inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/line.png"
cy="672.79736" transform="matrix(-0.14037891,0.00375861,-0.00375861,-0.14037891,83.443368,103.46311)"
rx="34.345188" id="g3154-5-3-9-9">
ry="23.991123" /> <circle
style="fill:#0079ff;fill-opacity:1;stroke:#001833;stroke-width:5.80000019;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path2162-1-0-7-4"
cx="197.14285"
cy="655.2193"
r="48.57143" />
<ellipse
style="fill:url(#radialGradient3264-9-6);fill-opacity:1;stroke:none"
id="path3134-2-9-0-4"
transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
cx="225.26402"
cy="672.79736"
rx="34.345188"
ry="23.991123" />
</g>
</g> </g>
<g <g
id="g3185-66" id="g5734-5-3-5"
transform="matrix(-0.14592237,0.00572413,-0.00572413,-0.14592237,73.763959,150.60875)" transform="translate(-30.895892,-3.6191024)">
inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
inkscape:export-xdpi="7.2934141"
inkscape:export-ydpi="7.2934141">
<circle <circle
id="path3187-5" transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,0,0)"
style="display:inline;overflow:visible;visibility:visible;fill:#fcaf3e;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" id="path3187-6-5-7-2-9-9-7-8"
cx="197.14285" style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:0.58431373;fill-rule:nonzero;stroke:none;stroke-width:5.79999971;marker:none;enable-background:accumulate"
cy="655.2193" cx="-54.289261"
r="48.57143" /> cy="-16.205133"
<ellipse r="7.0931091" />
transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" <g
id="path3189-0" inkscape:export-ydpi="7.0721951"
style="fill:url(#radialGradient4929);fill-opacity:1;stroke:none" inkscape:export-xdpi="7.0721951"
cx="225.26402" inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/line.png"
cy="672.79736" transform="matrix(-0.14037891,0.00375861,-0.00375861,-0.14037891,83.443368,103.46311)"
rx="34.345188" id="g3154-5-3-9-9-6">
ry="23.991123" /> <circle
style="fill:#0079ff;fill-opacity:1;stroke:#001833;stroke-width:5.80000019;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path2162-1-0-7-4-7"
cx="197.14285"
cy="655.2193"
r="48.57143" />
<ellipse
style="fill:url(#radialGradient3264-9-6-1);fill-opacity:1;stroke:none"
id="path3134-2-9-0-4-8"
transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
cx="225.26402"
cy="672.79736"
rx="34.345188"
ry="23.991123" />
</g>
</g> </g>
<g <g
id="g3185-7" id="g5734-5-3-5-2"
transform="matrix(-0.14592237,0.00572413,-0.00572413,-0.14592237,55.133656,102.30859)" transform="translate(3.2748139,0.19224543)">
inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/circle.png"
inkscape:export-xdpi="7.2934141"
inkscape:export-ydpi="7.2934141">
<circle <circle
r="48.57143" transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,0,0)"
cy="655.2193" id="path3187-6-5-7-2-9-9-7-8-5"
cx="197.14285" style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:0.58431373;fill-rule:nonzero;stroke:none;stroke-width:5.79999971;marker:none;enable-background:accumulate"
id="path3187-0" cx="-54.289261"
style="display:inline;overflow:visible;visibility:visible;fill:#fcaf3e;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:5.79999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" /> cy="-16.205133"
<ellipse r="7.0931091" />
ry="23.991123" <g
rx="34.345188" inkscape:export-ydpi="7.0721951"
cy="672.79736" inkscape:export-xdpi="7.0721951"
cx="225.26402" inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/line.png"
transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" transform="matrix(-0.14037891,0.00375861,-0.00375861,-0.14037891,83.443368,103.46311)"
id="path3189-1" id="g3154-5-3-9-9-6-0">
style="fill:url(#radialGradient4852-6);fill-opacity:1;stroke:none" /> <circle
style="fill:#0079ff;fill-opacity:1;stroke:#001833;stroke-width:5.80000019;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path2162-1-0-7-4-7-5"
cx="197.14285"
cy="655.2193"
r="48.57143" />
<ellipse
style="fill:url(#radialGradient3264-9-6-1-1);fill-opacity:1;stroke:none"
id="path3134-2-9-0-4-8-5"
transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
cx="225.26402"
cy="672.79736"
rx="34.345188"
ry="23.991123" />
</g>
</g> </g>
</g> </g>
</svg> </svg>

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 18 KiB

View File

@ -992,17 +992,6 @@
id="radialGradient4570" id="radialGradient4570"
xlink:href="#linearGradient3362" xlink:href="#linearGradient3362"
inkscape:collect="always" /> inkscape:collect="always" />
<radialGradient
r="34.345188"
fy="672.79736"
fx="225.26402"
cy="672.79736"
cx="225.26402"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
gradientUnits="userSpaceOnUse"
id="radialGradient3264"
xlink:href="#linearGradient3144"
inkscape:collect="always" />
<radialGradient <radialGradient
r="34.345188" r="34.345188"
fy="672.79736" fy="672.79736"
@ -1047,6 +1036,72 @@
id="radialGradient3264-4" id="radialGradient3264-4"
xlink:href="#linearGradient3144" xlink:href="#linearGradient3144"
inkscape:collect="always" /> inkscape:collect="always" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3144"
id="radialGradient5582"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736"
r="34.345188" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3144"
id="radialGradient5582-5"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736"
r="34.345188" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3144"
id="radialGradient5582-5-8"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736"
r="34.345188" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3144"
id="radialGradient5582-5-8-7"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736"
r="34.345188" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3144"
id="radialGradient5582-5-8-1"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736"
r="34.345188" />
<radialGradient
r="34.345188"
fy="672.79736"
fx="225.26402"
cy="672.79736"
cx="225.26402"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
gradientUnits="userSpaceOnUse"
id="radialGradient3264-7-3"
xlink:href="#linearGradient3144"
inkscape:collect="always" />
</defs> </defs>
<sodipodi:namedview <sodipodi:namedview
id="base" id="base"
@ -1056,8 +1111,8 @@
inkscape:pageopacity="0.0" inkscape:pageopacity="0.0"
inkscape:pageshadow="2" inkscape:pageshadow="2"
inkscape:zoom="7.90625" inkscape:zoom="7.90625"
inkscape:cx="32" inkscape:cx="32.252964"
inkscape:cy="32" inkscape:cy="31.810277"
inkscape:current-layer="layer1" inkscape:current-layer="layer1"
showgrid="true" showgrid="true"
inkscape:document-units="px" inkscape:document-units="px"
@ -1075,7 +1130,7 @@
<dc:format>image/svg+xml</dc:format> <dc:format>image/svg+xml</dc:format>
<dc:type <dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title> <dc:title />
</cc:Work> </cc:Work>
</rdf:RDF> </rdf:RDF>
</metadata> </metadata>
@ -1084,11 +1139,11 @@
inkscape:label="Layer 1" inkscape:label="Layer 1"
inkscape:groupmode="layer"> inkscape:groupmode="layer">
<g <g
id="g5734" id="g5734-1-7"
transform="translate(-29.640304,1.0762083)"> transform="translate(-22.785725,1.8475032)">
<circle <circle
transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,0,0)" transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,0,0)"
id="path3187-6-5-7-2-9" id="path3187-6-5-7-2-9-3-6"
style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:0.58431373;fill-rule:nonzero;stroke:none;stroke-width:5.79999971;marker:none;enable-background:accumulate" style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:0.58431373;fill-rule:nonzero;stroke:none;stroke-width:5.79999971;marker:none;enable-background:accumulate"
cx="-54.289261" cx="-54.289261"
cy="-16.205133" cy="-16.205133"
@ -1098,16 +1153,16 @@
inkscape:export-xdpi="7.0721951" inkscape:export-xdpi="7.0721951"
inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/line.png" inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/line.png"
transform="matrix(-0.14037891,0.00375861,-0.00375861,-0.14037891,83.443368,103.46311)" transform="matrix(-0.14037891,0.00375861,-0.00375861,-0.14037891,83.443368,103.46311)"
id="g3154-5-3"> id="g3154-5-3-4-1">
<circle <circle
style="fill:#0079ff;fill-opacity:1;stroke:#001833;stroke-width:5.80000019;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" style="fill:#0079ff;fill-opacity:1;stroke:#001833;stroke-width:5.80000019;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="path2162-1-0" id="path2162-1-0-4-1"
cx="197.14285" cx="197.14285"
cy="655.2193" cy="655.2193"
r="48.57143" /> r="48.57143" />
<ellipse <ellipse
style="fill:url(#radialGradient3264);fill-opacity:1;stroke:none" style="fill:url(#radialGradient3264-7-3);fill-opacity:1;stroke:none"
id="path3134-2-9" id="path3134-2-9-3-1"
transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)" transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
cx="225.26402" cx="225.26402"
cy="672.79736" cy="672.79736"
@ -1243,5 +1298,159 @@
ry="23.991123" /> ry="23.991123" />
</g> </g>
</g> </g>
<g
id="g4325">
<circle
transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,0,0)"
id="path3187-6-5-7-2-9"
style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:0.58431373;fill-rule:nonzero;stroke:none;stroke-width:5.79999971;marker:none;enable-background:accumulate"
cx="-30.710905"
cy="-15.977517"
r="7.0931091" />
<g
id="g5578"
transform="matrix(0.62053126,0,0,1.1370902,41.575125,0.83996784)"
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:54.21519089px;font-family:Arial;-inkscape-font-specification:Arial;visibility:visible;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:2.19132471;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none">
<circle
r="18.571428"
transform="matrix(0.58699307,0,0,0.32171623,-48.705235,0.37476683)"
cy="34.571426"
cx="53.214287"
id="path3696-4"
style="display:inline;overflow:visible;visibility:visible;fill:#ffbf00;fill-opacity:1;fill-rule:evenodd;stroke:#7b5600;stroke-width:1.79201269;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
<ellipse
ry="23.991123"
rx="34.345188"
cy="672.79736"
cx="225.26402"
transform="matrix(-0.16409395,0.06015817,-0.11023662,-0.08954912,91.030266,56.104458)"
id="path3189"
style="fill:url(#radialGradient5582);fill-opacity:1;stroke:none" />
</g>
</g>
<g
transform="translate(11.219611,11.985285)"
id="g4325-4">
<circle
transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,0,0)"
id="path3187-6-5-7-2-9-1"
style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:0.58431373;fill-rule:nonzero;stroke:none;stroke-width:5.79999971;marker:none;enable-background:accumulate"
cx="-30.710905"
cy="-15.977517"
r="7.0931091" />
<g
id="g5578-3"
transform="matrix(0.62053126,0,0,1.1370902,41.575125,0.83996784)"
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:54.21519089px;font-family:Arial;-inkscape-font-specification:Arial;visibility:visible;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:2.19132471;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none">
<circle
r="18.571428"
transform="matrix(0.58699307,0,0,0.32171623,-48.705235,0.37476683)"
cy="34.571426"
cx="53.214287"
id="path3696-4-2"
style="display:inline;overflow:visible;visibility:visible;fill:#ffbf00;fill-opacity:1;fill-rule:evenodd;stroke:#7b5600;stroke-width:1.79201269;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
<ellipse
ry="23.991123"
rx="34.345188"
cy="672.79736"
cx="225.26402"
transform="matrix(-0.16409395,0.06015817,-0.11023662,-0.08954912,91.030266,56.104458)"
id="path3189-7"
style="fill:url(#radialGradient5582-5);fill-opacity:1;stroke:none" />
</g>
</g>
<g
transform="translate(-21.918729,22.736275)"
id="g4325-4-0">
<circle
transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,0,0)"
id="path3187-6-5-7-2-9-1-2"
style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:0.58431373;fill-rule:nonzero;stroke:none;stroke-width:5.79999971;marker:none;enable-background:accumulate"
cx="-30.710905"
cy="-15.977517"
r="7.0931091" />
<g
id="g5578-3-9"
transform="matrix(0.62053126,0,0,1.1370902,41.575125,0.83996784)"
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:54.21519089px;font-family:Arial;-inkscape-font-specification:Arial;visibility:visible;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:2.19132471;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none">
<circle
r="18.571428"
transform="matrix(0.58699307,0,0,0.32171623,-48.705235,0.37476683)"
cy="34.571426"
cx="53.214287"
id="path3696-4-2-5"
style="display:inline;overflow:visible;visibility:visible;fill:#ffbf00;fill-opacity:1;fill-rule:evenodd;stroke:#7b5600;stroke-width:1.79201269;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
<ellipse
ry="23.991123"
rx="34.345188"
cy="672.79736"
cx="225.26402"
transform="matrix(-0.16409395,0.06015817,-0.11023662,-0.08954912,91.030266,56.104458)"
id="path3189-7-8"
style="fill:url(#radialGradient5582-5-8);fill-opacity:1;stroke:none" />
</g>
</g>
<g
transform="translate(-7.1203101,35.258013)"
id="g4325-4-0-3">
<circle
transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,0,0)"
id="path3187-6-5-7-2-9-1-2-1"
style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:0.58431373;fill-rule:nonzero;stroke:none;stroke-width:5.79999971;marker:none;enable-background:accumulate"
cx="-30.710905"
cy="-15.977517"
r="7.0931091" />
<g
id="g5578-3-9-8"
transform="matrix(0.62053126,0,0,1.1370902,41.575125,0.83996784)"
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:54.21519089px;font-family:Arial;-inkscape-font-specification:Arial;visibility:visible;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:2.19132471;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none">
<circle
r="18.571428"
transform="matrix(0.58699307,0,0,0.32171623,-48.705235,0.37476683)"
cy="34.571426"
cx="53.214287"
id="path3696-4-2-5-4"
style="display:inline;overflow:visible;visibility:visible;fill:#ffbf00;fill-opacity:1;fill-rule:evenodd;stroke:#7b5600;stroke-width:1.79201269;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
<ellipse
ry="23.991123"
rx="34.345188"
cy="672.79736"
cx="225.26402"
transform="matrix(-0.16409395,0.06015817,-0.11023662,-0.08954912,91.030266,56.104458)"
id="path3189-7-8-2"
style="fill:url(#radialGradient5582-5-8-7);fill-opacity:1;stroke:none" />
</g>
</g>
<g
transform="translate(-22.045211,40.317302)"
id="g4325-4-0-6">
<circle
transform="matrix(-0.9992315,0.03919708,-0.03919708,-0.9992315,0,0)"
id="path3187-6-5-7-2-9-1-2-4"
style="display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:0.58431373;fill-rule:nonzero;stroke:none;stroke-width:5.79999971;marker:none;enable-background:accumulate"
cx="-30.710905"
cy="-15.977517"
r="7.0931091" />
<g
id="g5578-3-9-9"
transform="matrix(0.62053126,0,0,1.1370902,41.575125,0.83996784)"
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:54.21519089px;font-family:Arial;-inkscape-font-specification:Arial;visibility:visible;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:2.19132471;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none">
<circle
r="18.571428"
transform="matrix(0.58699307,0,0,0.32171623,-48.705235,0.37476683)"
cy="34.571426"
cx="53.214287"
id="path3696-4-2-5-6"
style="display:inline;overflow:visible;visibility:visible;fill:#ffbf00;fill-opacity:1;fill-rule:evenodd;stroke:#7b5600;stroke-width:1.79201269;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
<ellipse
ry="23.991123"
rx="34.345188"
cy="672.79736"
cx="225.26402"
transform="matrix(-0.16409395,0.06015817,-0.11023662,-0.08954912,91.030266,56.104458)"
id="path3189-7-8-9"
style="fill:url(#radialGradient5582-5-8-1);fill-opacity:1;stroke:none" />
</g>
</g>
</g> </g>
</svg> </svg>

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 50 KiB

View File

@ -0,0 +1,812 @@
<?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"
width="64px"
height="64px"
id="svg2816"
version="1.1"
inkscape:version="0.91 r13725"
sodipodi:docname="WF_projectedPoint.svg"
sodipodi:version="0.32"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
inkscape:export-filename="/home/yorik/PartDesign_Pocket.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
<defs
id="defs2818">
<linearGradient
id="linearGradient3669">
<stop
style="stop-color:#001ccc;stop-opacity:1;"
offset="0"
id="stop3671" />
<stop
style="stop-color:#00afff;stop-opacity:1;"
offset="1"
id="stop3673" />
</linearGradient>
<linearGradient
id="linearGradient3602">
<stop
style="stop-color:#ff2600;stop-opacity:1;"
offset="0"
id="stop3604" />
<stop
style="stop-color:#ff5f00;stop-opacity:1;"
offset="1"
id="stop3606" />
</linearGradient>
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 32 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="64 : 32 : 1"
inkscape:persp3d-origin="32 : 21.333333 : 1"
id="perspective2824" />
<inkscape:perspective
id="perspective3618"
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" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3602-7"
id="linearGradient3608-5"
x1="3.909091"
y1="14.363636"
x2="24.81818"
y2="14.363636"
gradientUnits="userSpaceOnUse" />
<linearGradient
id="linearGradient3602-7">
<stop
style="stop-color:#c51900;stop-opacity:1;"
offset="0"
id="stop3604-1" />
<stop
style="stop-color:#ff5f00;stop-opacity:1;"
offset="1"
id="stop3606-3" />
</linearGradient>
<inkscape:perspective
id="perspective3677"
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" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3602-5"
id="linearGradient3608-1"
x1="3.909091"
y1="14.363636"
x2="24.81818"
y2="14.363636"
gradientUnits="userSpaceOnUse" />
<linearGradient
id="linearGradient3602-5">
<stop
style="stop-color:#c51900;stop-opacity:1;"
offset="0"
id="stop3604-9" />
<stop
style="stop-color:#ff5f00;stop-opacity:1;"
offset="1"
id="stop3606-9" />
</linearGradient>
<linearGradient
y2="14.363636"
x2="24.81818"
y1="14.363636"
x1="3.909091"
gradientUnits="userSpaceOnUse"
id="linearGradient3686"
xlink:href="#linearGradient3602-5"
inkscape:collect="always" />
<inkscape:perspective
id="perspective3717"
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" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3602-58"
id="linearGradient3608-8"
x1="3.909091"
y1="14.363636"
x2="24.81818"
y2="14.363636"
gradientUnits="userSpaceOnUse" />
<linearGradient
id="linearGradient3602-58">
<stop
style="stop-color:#d82b1e;stop-opacity:1;"
offset="0"
id="stop3604-2" />
<stop
style="stop-color:#840000;stop-opacity:1;"
offset="1"
id="stop3606-2" />
</linearGradient>
<linearGradient
y2="14.363636"
x2="24.81818"
y1="14.363636"
x1="3.909091"
gradientUnits="userSpaceOnUse"
id="linearGradient3726"
xlink:href="#linearGradient3602-58"
inkscape:collect="always" />
<inkscape:perspective
id="perspective4410"
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" />
<inkscape:perspective
id="perspective4944"
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" />
<inkscape:perspective
id="perspective4966"
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" />
<inkscape:perspective
id="perspective5009"
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" />
<inkscape:perspective
id="perspective5165"
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" />
<inkscape:perspective
id="perspective7581"
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" />
<inkscape:perspective
id="perspective7606"
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" />
<inkscape:perspective
id="perspective7638"
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" />
<inkscape:perspective
id="perspective7660"
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" />
<inkscape:perspective
id="perspective7704"
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" />
<inkscape:perspective
id="perspective7730"
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" />
<inkscape:perspective
id="perspective7762"
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" />
<inkscape:perspective
id="perspective7783"
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" />
<inkscape:perspective
id="perspective7843"
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" />
<inkscape:perspective
id="perspective7881"
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" />
<inkscape:perspective
id="perspective7932"
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" />
<inkscape:perspective
id="perspective2866"
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" />
<inkscape:perspective
id="perspective2878"
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" />
<linearGradient
id="linearGradient3602-1">
<stop
style="stop-color:#ff2600;stop-opacity:1;"
offset="0"
id="stop3604-8" />
<stop
style="stop-color:#ff5f00;stop-opacity:1;"
offset="1"
id="stop3606-96" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3602-1"
id="linearGradient2875"
gradientUnits="userSpaceOnUse"
x1="3.909091"
y1="14.363636"
x2="24.81818"
y2="14.363636" />
<inkscape:perspective
id="perspective2885"
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" />
<linearGradient
id="linearGradient3602-1-5">
<stop
style="stop-color:#ff2600;stop-opacity:1;"
offset="0"
id="stop3604-8-3" />
<stop
style="stop-color:#ff5f00;stop-opacity:1;"
offset="1"
id="stop3606-96-8" />
</linearGradient>
<inkscape:perspective
id="perspective3720"
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" />
<linearGradient
id="linearGradient3602-1-8">
<stop
style="stop-color:#ff2600;stop-opacity:1;"
offset="0"
id="stop3604-8-5" />
<stop
style="stop-color:#ff5f00;stop-opacity:1;"
offset="1"
id="stop3606-96-2" />
</linearGradient>
<inkscape:perspective
id="perspective3822"
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" />
<inkscape:perspective
id="perspective3849"
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" />
<inkscape:perspective
id="perspective3879"
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" />
<inkscape:perspective
id="perspective2896"
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" />
<inkscape:perspective
id="perspective2925"
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" />
<inkscape:perspective
id="perspective2925-4"
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" />
<inkscape:perspective
id="perspective3726"
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" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3669"
id="linearGradient3675"
x1="81.451569"
y1="14.993487"
x2="3.0457773"
y2="17.729464"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.073092,0,0,1.5149249,-3.4880263,-14.297954)" />
<inkscape:perspective
id="perspective3689"
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" />
<linearGradient
id="linearGradient3669-2">
<stop
style="stop-color:#af7d00;stop-opacity:1;"
offset="0"
id="stop3671-7" />
<stop
style="stop-color:#ffed00;stop-opacity:1;"
offset="1"
id="stop3673-5" />
</linearGradient>
<linearGradient
gradientTransform="matrix(0.73872768,0,0,1.3536788,-2.25,-1.9999999)"
y2="1.8468192"
x2="48.259949"
y1="33.61211"
x1="34.290413"
gradientUnits="userSpaceOnUse"
id="linearGradient3698"
xlink:href="#linearGradient3669-2"
inkscape:collect="always" />
<inkscape:perspective
id="perspective3689-6"
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" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3669-22"
id="linearGradient3675-0"
x1="34.290413"
y1="33.61211"
x2="73.185463"
y2="31.368526"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.3536788,0,0,0.7441538,0,1.1950203)" />
<linearGradient
id="linearGradient3669-22">
<stop
style="stop-color:#af7d00;stop-opacity:1;"
offset="0"
id="stop3671-8" />
<stop
style="stop-color:#ffed00;stop-opacity:1;"
offset="1"
id="stop3673-4" />
</linearGradient>
<linearGradient
gradientTransform="matrix(0.73872768,0,0,1.3536788,-2.25,-1.9999999)"
y2="1.8468192"
x2="48.259949"
y1="33.61211"
x1="34.290413"
gradientUnits="userSpaceOnUse"
id="linearGradient3698-3"
xlink:href="#linearGradient3669-22"
inkscape:collect="always" />
<inkscape:perspective
id="perspective3689-1"
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" />
<linearGradient
id="linearGradient3669-0">
<stop
style="stop-color:#af7d00;stop-opacity:1;"
offset="0"
id="stop3671-9" />
<stop
style="stop-color:#ffed00;stop-opacity:1;"
offset="1"
id="stop3673-1" />
</linearGradient>
<linearGradient
gradientTransform="matrix(0.73872768,0,0,1.3536788,-2.25,-1.9999999)"
y2="1.8468192"
x2="48.259949"
y1="33.61211"
x1="34.290413"
gradientUnits="userSpaceOnUse"
id="linearGradient3698-9"
xlink:href="#linearGradient3669-0"
inkscape:collect="always" />
<radialGradient
r="34.345188"
fy="672.79736"
fx="225.26402"
cy="672.79736"
cx="225.26402"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
gradientUnits="userSpaceOnUse"
id="radialGradient4577"
xlink:href="#linearGradient3144"
inkscape:collect="always" />
<linearGradient
inkscape:collect="always"
id="linearGradient3144">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop3146" />
<stop
style="stop-color:#ffffff;stop-opacity:0;"
offset="1"
id="stop3148" />
</linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3144"
id="radialGradient5582"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736"
r="34.345188" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4135"
id="linearGradient4145"
x1="131.82286"
y1="101.22672"
x2="191.3165"
y2="101.22672"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
id="linearGradient4135">
<stop
style="stop-color:#0079ff;stop-opacity:1;"
offset="0"
id="stop4137" />
<stop
style="stop-color:#0079ff;stop-opacity:0;"
offset="1"
id="stop4139" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4135"
id="linearGradient5652"
gradientUnits="userSpaceOnUse"
x1="131.82286"
y1="101.22672"
x2="191.3165"
y2="101.22672" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient4135-0"
id="linearGradient5674-5"
gradientUnits="userSpaceOnUse"
x1="131.82286"
y1="101.22672"
x2="191.3165"
y2="101.22672" />
<linearGradient
inkscape:collect="always"
id="linearGradient4135-0">
<stop
style="stop-color:#0079ff;stop-opacity:1;"
offset="0"
id="stop4137-2" />
<stop
style="stop-color:#0079ff;stop-opacity:0;"
offset="1"
id="stop4139-4" />
</linearGradient>
<linearGradient
gradientTransform="matrix(0.73872768,0,0,1.3536788,-18.440975,-32.313429)"
y2="37.183754"
x2="13.421829"
y1="32.874828"
x1="98.042648"
gradientUnits="userSpaceOnUse"
id="linearGradient4017"
xlink:href="#linearGradient3669"
inkscape:collect="always" />
<linearGradient
gradientTransform="matrix(0.73872768,0,0,1.3536788,24.703726,-43.061219)"
y2="37.183754"
x2="13.421829"
y1="32.874828"
x1="98.042648"
gradientUnits="userSpaceOnUse"
id="linearGradient4017-6"
xlink:href="#linearGradient3669"
inkscape:collect="always" />
<linearGradient
gradientTransform="matrix(0.73872768,0,0,1.3536788,-9.0750444,3.6148984)"
y2="37.183754"
x2="13.421829"
y1="32.874828"
x1="98.042648"
gradientUnits="userSpaceOnUse"
id="linearGradient4017-6-0"
xlink:href="#linearGradient3669"
inkscape:collect="always" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3144"
id="radialGradient4272"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736"
r="34.345188" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3144"
id="radialGradient5582-8"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736"
r="34.345188" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3144"
id="radialGradient5582-3"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.6985294,0,202.82863)"
cx="225.26402"
cy="672.79736"
fx="225.26402"
fy="672.79736"
r="34.345188" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="6.5129668"
inkscape:cx="24.879924"
inkscape:cy="16.944636"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:document-units="px"
inkscape:grid-bbox="true"
inkscape:window-width="1265"
inkscape:window-height="1087"
inkscape:window-x="529"
inkscape:window-y="24"
inkscape:window-maximized="0" />
<metadata
id="metadata2821">
<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
inkscape:groupmode="layer"
id="layer4"
inkscape:label="Layer2">
<g
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:54.21519089px;font-family:Arial;-inkscape-font-specification:Arial;visibility:visible;fill:url(#linearGradient5674-5);fill-opacity:1;fill-rule:nonzero;stroke:#001833;stroke-width:2.19132471;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
transform="matrix(-0.03563458,0.35738558,-0.38486089,-0.0404254,80.653631,175.31488)"
id="g3618-3">
<path
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc"
id="rect3520-1"
d="M 131.8509,176.39728 244.39428,74.003665 c 5.58489,-0.0245 7.4488,3.170189 5.85178,5.863995 L 138.73758,182.21743 Z"
style="display:inline;overflow:visible;visibility:visible;fill:#0079f0;fill-opacity:1;fill-rule:evenodd;stroke:#001833;stroke-width:1.76347613;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.74117647;marker:none;enable-background:accumulate" />
</g>
</g>
<g
id="layer1"
inkscape:label="Layer 1"
inkscape:groupmode="layer">
<path
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc"
id="path2887-1-6-3"
d="M 33.449727,30.22585 1.5459003,49.073509 -3.3559227,16.669194 33.372795,-0.60715256 Z"
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:54.21519089px;font-family:Arial;-inkscape-font-specification:Arial;display:inline;overflow:visible;visibility:visible;opacity:0.40700001;fill:url(#linearGradient4017);fill-opacity:1;fill-rule:nonzero;stroke:#00064a;stroke-width:1.80387402;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
<path
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc"
id="path2887-1-6-3-4"
d="M 71.066992,45.733376 33.328651,30.495186 33.340104,-0.83434929 76.517495,-11.354943 Z"
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:54.21519089px;font-family:Arial;-inkscape-font-specification:Arial;display:inline;overflow:visible;visibility:visible;opacity:0.40700001;fill:url(#linearGradient4017-6);fill-opacity:1;fill-rule:nonzero;stroke:#00064a;stroke-width:1.80387402;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
<path
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc"
id="path2887-1-6-3-4-4"
d="M 70.913452,46.193995 10.911832,85.001836 1.4038126,49.373184 33.372794,29.947279 Z"
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:54.21519089px;font-family:Arial;-inkscape-font-specification:Arial;display:inline;overflow:visible;visibility:visible;opacity:0.40700001;fill:url(#linearGradient4017-6-0);fill-opacity:1;fill-rule:nonzero;stroke:#00064a;stroke-width:1.80387402;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
</g>
<g
inkscape:groupmode="layer"
id="layer3"
inkscape:label="Layer0">
<g
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:54.21519089px;font-family:Arial;-inkscape-font-specification:Arial;visibility:visible;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:2.19132471;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
transform="matrix(0.51710938,0,0,0.94757516,48.15418,44.93522)"
id="g5578">
<circle
style="display:inline;overflow:visible;visibility:visible;fill:#ffbf00;fill-opacity:1;fill-rule:evenodd;stroke:#7b5600;stroke-width:1.79201269;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
id="path3696-4"
cx="53.214287"
cy="34.571426"
transform="matrix(0.58699307,0,0,0.32171623,-48.705235,0.37476683)"
r="18.571428" />
<ellipse
style="fill:url(#radialGradient5582);fill-opacity:1;stroke:none"
id="path3189"
transform="matrix(-0.16409395,0.06015817,-0.11023662,-0.08954912,91.030266,56.104458)"
cx="225.26402"
cy="672.79736"
rx="34.345188"
ry="23.991123" />
</g>
<g
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:54.21519089px;font-family:Arial;-inkscape-font-specification:Arial;visibility:visible;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:2.19132471;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
transform="matrix(0.51710938,0,0,0.94757516,62.77224,7.3508928)"
id="g5578-8">
<circle
style="display:inline;overflow:visible;visibility:visible;fill:#ffbf00;fill-opacity:1;fill-rule:evenodd;stroke:#7b5600;stroke-width:1.79201269;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
id="path3696-4-4"
transform="matrix(0.58699307,0,0,0.32171623,-48.705235,0.37476683)"
cx="53.214287"
cy="34.571426"
r="18.571428" />
<ellipse
style="fill:url(#radialGradient5582-8);fill-opacity:1;stroke:none"
id="path3189-5"
transform="matrix(-0.16409395,0.06015817,-0.11023662,-0.08954912,91.030266,56.104458)"
cx="225.26402"
cy="672.79736"
rx="34.345188"
ry="23.991123" />
</g>
<g
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:54.21519089px;font-family:Arial;-inkscape-font-specification:Arial;visibility:visible;fill:#ff2600;fill-opacity:1;fill-rule:nonzero;stroke:#731200;stroke-width:2.19132471;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none"
transform="matrix(0.51710938,0,0,0.94757516,28.532852,9.1933705)"
id="g5578-7">
<circle
style="display:inline;overflow:visible;visibility:visible;fill:#ffbf00;fill-opacity:1;fill-rule:evenodd;stroke:#7b5600;stroke-width:1.79201269;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
id="path3696-4-9"
transform="matrix(0.58699307,0,0,0.32171623,-48.705235,0.37476683)"
cx="53.214287"
cy="34.571426"
r="18.571428" />
<ellipse
style="fill:url(#radialGradient5582-3);fill-opacity:1;stroke:none"
id="path3189-1"
transform="matrix(-0.16409395,0.06015817,-0.11023662,-0.08954912,91.030266,56.104458)"
cx="225.26402"
cy="672.79736"
rx="34.345188"
ry="23.991123" />
</g>
<path
inkscape:connector-curvature="0"
sodipodi:nodetypes="czcc"
id="path3677"
d="m 20.668102,20.76976 c 0,0 2.148341,1.291598 8.217222,5.054803 6.068883,3.763206 9.162169,5.84513 9.162169,5.84513 l 0.141781,0.368467"
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:54.21519089px;font-family:Arial;-inkscape-font-specification:Arial;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#00064a;stroke-width:2.09090662;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2.09090676, 2.09090676;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
<path
inkscape:connector-curvature="0"
sodipodi:nodetypes="czcc"
id="path3677-9"
d="m 52.774423,18.999455 c 0,0 -2.103735,1.473655 -8.046604,5.767307 -5.942869,4.293652 -8.971927,6.669033 -8.971927,6.669033 L 35.617055,31.8562"
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:54.21519089px;font-family:Arial;-inkscape-font-specification:Arial;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#00064a;stroke-width:2.21010447;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2.21010455, 2.21010455;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
<path
inkscape:connector-curvature="0"
sodipodi:nodetypes="cscc"
id="path3677-2"
d="m 38.311172,31.541361 c 0,0 0.151371,-6.691865 0.233149,0.448607 l 0.256857,22.427434 -0.01176,0.368467"
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:54.21519089px;font-family:Arial;-inkscape-font-specification:Arial;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#00064a;stroke-width:2.09090662;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2.09090676, 2.09090676;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
<g
id="g3154"
transform="matrix(-0.16207011,0.00433939,-0.00433939,-0.16207011,73.02564,136.01783)"
inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/line.png"
inkscape:export-xdpi="7.0721951"
inkscape:export-ydpi="7.0721951">
<circle
r="48.57143"
cy="655.2193"
cx="197.14285"
id="path2162"
style="fill:#0079ff;fill-opacity:1;stroke:#001833;stroke-width:5.80000019;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
<ellipse
ry="23.991123"
rx="34.345188"
cy="672.79736"
cx="225.26402"
transform="matrix(0.8513023,-0.5246754,0.5246754,0.8513023,-338.69692,214.19328)"
id="path3134"
style="fill:url(#radialGradient4272);fill-opacity:1;stroke:none;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
</g>
</g>
</svg>

After

Width:  |  Height:  |  Size: 31 KiB

View File

@ -45,8 +45,8 @@ global myTabName
myTabName = "Parametric Curves" myTabName = "Parametric Curves"
global myObjName global myObjName
myObjName = "ParametricCurves" myObjName = "ParametricCurves"
global myRelease global ParametricRelease
myRelease = "2016_11" ParametricRelease = "2017_01"
global f2 global f2
def f2(fa,fb,fx,fy,t,i): def f2(fa,fb,fx,fy,t,i):
pass pass
@ -788,37 +788,54 @@ class ParametricCurve2D(Parametric):
#msgBox = QtGui.QMessageBox() #msgBox = QtGui.QMessageBox()
import numpy as np import numpy as np
t=0.
fa = str(self.la.text()) fa = str(self.la.text())
fb = str(self.lb.text()) fb = str(self.lb.text())
t=0.
a=eval(fa) a=eval(fa)
b=eval(fb) b=eval(fb)
if hasattr(a, '__iter__') and hasattr(b, '__iter__'): def iterate():
for m_a in a: if hasattr(a, '__iter__') and hasattr(b, '__iter__'):
for m_b in b: for m_a in a:
for m_b in b:
if self.debug != 0:
print "a=" + str(m_a)
print "b=" + str(m_b)
self.draw_par_function(m_a, m_b)
elif hasattr(a, '__iter__') and not hasattr(b, '__iter__'):
for m_a in a:
if self.debug != 0: if self.debug != 0:
print "a=" + str(m_a) print "a=" + str(m_a)
print "b=" + str(b)
self.draw_par_function(m_a, b)
elif not hasattr(a, '__iter__') and hasattr(b, '__iter__'):
for m_b in b:
if self.debug != 0:
print "a=" + str(a)
print "b=" + str(m_b) print "b=" + str(m_b)
self.draw_par_function(m_a, m_b) self.draw_par_function(a, m_b)
elif hasattr(a, '__iter__') and not hasattr(b, '__iter__'): else:
for m_a in a:
if self.debug != 0:
print "a=" + str(m_a)
print "b=" + str(b)
self.draw_par_function(m_a, b)
elif not hasattr(a, '__iter__') and hasattr(b, '__iter__'):
for m_b in b:
if self.debug != 0: if self.debug != 0:
print "a=" + str(a) print "a=" + str(a)
print "b=" + str(m_b) print "b=" + str(b)
self.draw_par_function(a, m_b) self.draw_par_function(a, b)
oxs = eval(str(self.x_ref.text()))
oys = eval(str(self.y_ref.text()))
ozs = eval(str(self.z_ref.text()))
if hasattr(oxs, '__iter__'):
for m_ox, m_oy, m_oz in zip(oxs, oys, ozs):
self.ox = float(m_ox)
self.oy = float(m_oy)
self.oz = float(m_oz)
iterate()
else: else:
if self.debug != 0: self.ox = float(eval(str(self.x_ref.text())))
print "a=" + str(a) self.oy = float(eval(str(self.y_ref.text())))
print "b=" + str(b) self.oz = float(eval(str(self.z_ref.text())))
self.draw_par_function(a, b) iterate()
def draw_par_function(self,fa ,fb): def draw_par_function(self,fa ,fb):
@ -832,9 +849,7 @@ class ParametricCurve2D(Parametric):
intt = float(eval(str(self.ltstep.text()))) intt = float(eval(str(self.ltstep.text())))
#fz = float(eval(str(self.lz.text()))) #fz = float(eval(str(self.lz.text())))
ox = float(eval(str(self.x_ref.text()))) ox, oy, oz = self.ox, self.oy, self.oz
oy = float(eval(str(self.y_ref.text())))
oz = float(eval(str(self.z_ref.text())))
d = (tf + intt -t)/intt d = (tf + intt -t)/intt
dmax = int(d) dmax = int(d)
@ -848,9 +863,9 @@ class ParametricCurve2D(Parametric):
print "x=" + str(fx) print "x=" + str(fx)
print "y=" + str(fy) print "y=" + str(fy)
print "Ref Point :" print "Ref Point :"
print "ox=" + str(ox) print "x_ref=" + str(ox)
print "oy=" + str(oy) print "y_ref=" + str(oy)
print "oz=" + str(oz) print "z_ref=" + str(oz)
code = """ code = """
def f2(fa,fb,fx,fy,t,i,msgBox): def f2(fa,fb,fx,fy,t,i,msgBox):
@ -1261,6 +1276,7 @@ class ParametricCurve3D(Parametric):
print "x=" + str(fx) print "x=" + str(fx)
print "y=" + str(fy) print "y=" + str(fy)
print "z=" + str(fz) print "z=" + str(fz)
print "Ref Point :"
print "x_ref=" + str(ox) print "x_ref=" + str(ox)
print "y_ref=" + str(oy) print "y_ref=" + str(oy)
print "z_ref=" + str(oz) print "z_ref=" + str(oz)
@ -1960,6 +1976,8 @@ class SurfaceEvents(DefineAndConnectEvents):
} }
self.connections_for_return_pressed = {} self.connections_for_return_pressed = {}
########################################## ##########################################
class RegressionCurve2DEvents(DefineAndConnectEvents): class RegressionCurve2DEvents(DefineAndConnectEvents):
def __init__(self,ui): def __init__(self,ui):
@ -2110,6 +2128,16 @@ class ParametricTab():
self.ui.setupUi(self.m_dialog) self.ui.setupUi(self.m_dialog)
self.m_tab.setCurrentIndex(3) self.m_tab.setCurrentIndex(3)
#----------------------------------------------------------------
self.connections_for_button_clicked = {
"button_quit" : "quit_clicked",
}
for m_key, m_val in self.connections_for_button_clicked.items():
print_msg( "Connecting : " + str(m_key) + " and " + str(m_val) )
QtCore.QObject.connect(getattr(self.ui, str(m_key)),
QtCore.SIGNAL("clicked()"),getattr(self,str(m_val)))
# Create a Regression 2D Curve object and connect # Create a Regression 2D Curve object and connect
self.reg_events2D = RegressionCurve2DEvents(self.ui) self.reg_events2D = RegressionCurve2DEvents(self.ui)
# Create a Parametric 2D Curve object and connect # Create a Parametric 2D Curve object and connect
@ -2119,6 +2147,11 @@ class ParametricTab():
# Create a Surface object and connect # Create a Surface object and connect
self.surface = SurfaceEvents(self.ui) self.surface = SurfaceEvents(self.ui)
m_text=str(ParametricRelease)
self.ui.label_release.setText(QtGui.QApplication.translate("Form", m_text, None, QtGui.QApplication.UnicodeUTF8))
#----------------------------------------------------------------
if self.movable: if self.movable:
t=FreeCADGui.getMainWindow() t=FreeCADGui.getMainWindow()
wf = t.findChild(QtGui.QDockWidget, str(self.objname)) wf = t.findChild(QtGui.QDockWidget, str(self.objname))
@ -2131,10 +2164,14 @@ class ParametricTab():
wf.activateWindow() wf.activateWindow()
wf.raise_() wf.raise_()
QtCore.QObject.connect(self.ui.button_quit, QtCore.SIGNAL ('clicked()'), self.quit_clicked)
def quit_clicked(self): # quit def quit_clicked(self): # quit
print_msg( "quit_clicked !")
if self.movable: if self.movable:
self.dw.close() self.dw.close()
self.close()
print_msg( "Close done !") print_msg( "Close done !")
return return
else: else:

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'WF_ObjParCurve2DEditGui_2016.ui' # Form implementation generated from reading ui file 'WF_ObjParCurve2DEditGui_2016.ui'
# #
# Created: Fri Dec 30 15:42:17 2016 # Created: Thu Feb 2 19:33:38 2017
# by: PySide UI code generator 4.11.3 # by: PySide UI code generator 4.11.3
# #
# WARNING! All changes made in this file will be lost! # WARNING! All changes made in this file will be lost!

View File

@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'WF_ObjParCurve3DEditGui_2016.ui' # Form implementation generated from reading ui file 'WF_ObjParCurve3DEditGui_2016.ui'
# #
# Created: Fri Dec 30 15:42:28 2016 # Created: Thu Feb 2 19:33:38 2017
# by: PySide UI code generator 4.11.3 # by: PySide UI code generator 4.11.3
# #
# WARNING! All changes made in this file will be lost! # WARNING! All changes made in this file will be lost!

View File

@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'WF_ObjSurfaceEditGui_2016.ui' # Form implementation generated from reading ui file 'WF_ObjSurfaceEditGui_2016.ui'
# #
# Created: Fri Dec 30 15:42:38 2016 # Created: Thu Feb 2 19:33:38 2017
# by: PySide UI code generator 4.11.3 # by: PySide UI code generator 4.11.3
# #
# WARNING! All changes made in this file will be lost! # WARNING! All changes made in this file will be lost!

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,10 +1,15 @@
#!/bin/sh #!/bin/sh
m_list_of_ui=`ls -1 *.ui`
m_ui_file=$1 for m_ui in ${m_list_of_ui} ; do
#m_ui_file=$1
m_ui_file=${m_ui}
m_ui_base=`basename ${m_ui_file} .ui` m_ui_base=`basename ${m_ui_file} .ui`
pyuic4 ${m_ui_base}.ui > ${m_ui_base}.py pyuic4 ${m_ui_base}.ui > ${m_ui_base}.py
cat ${m_ui_base}.py | sed 's#Icons/#icons:#g ' | sed 's#PyQt4#PySide#g ' | sed 's#QtCore.QString.fromUtf8(#_fromUtf8(#g ' | sed 's#../icons:#icons:#g '>tmp.py cat ${m_ui_base}.py | sed 's#Icons/#icons:#g ' | sed 's#PyQt4#PySide#g ' | sed 's#QtCore.QString.fromUtf8(#_fromUtf8(#g ' | sed 's#../icons:#icons:#g '>tmp.py
mv tmp.py ${m_ui_base}.py mv tmp.py ${m_ui_base}.py
cp ${m_ui_base}.py ../${m_ui_base}.py cp ${m_ui_base}.py ../${m_ui_base}.py
done

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -229,17 +229,23 @@ class Translation():
self.dup_num = self.gui.ObjTrans_spin self.dup_num = self.gui.ObjTrans_spin
self.dup_deep = self.gui.ObjTrans_deepCopy self.dup_deep = self.gui.ObjTrans_deepCopy
self.slider = self.gui.ObjTrans_horizontalSlider
self.length_edit = self.gui.ObjTrans_lineEdit_length_seg
self.Edge_List = []
self.valid_start = { "Origin" : "origin", self.valid_start = { "Origin" : "origin",
"Base Obj." : "base", "Base Obj." : "base",
"Center Obj.(s)" : "center", "Center Obj.(s)" : "center",
"To select" : "select", "To select" : "select",
"To define" : "define", "From Segment" : "segment",
"Relative" : "relative", "To define" : "define",
"Relative" : "relative",
} }
self.visuObjects = [] self.visuObjects = []
self.internal = False
self.duplicate = False self.duplicate = False
self.deep = False self.deep = False
self.m_num_cpy = 1 self.m_num_cpy = 1
@ -250,8 +256,10 @@ class Translation():
self.dup_deep.setEnabled(False) self.dup_deep.setEnabled(False)
self.dup_deep.setChecked(False) self.dup_deep.setChecked(False)
self.enable(False) self.segment = False
self.enable(False)
self.setEnableSlider(False)
def enable(self, flag=True): def enable(self, flag=True):
""" Enable or not most of the buttons. """ Enable or not most of the buttons.
@ -267,7 +275,6 @@ class Translation():
self.but_reset.setEnabled(flag) self.but_reset.setEnabled(flag)
self.but_apply.setEnabled(flag) self.but_apply.setEnabled(flag)
def setEnabledStartInput(self, flag=True): def setEnabledStartInput(self, flag=True):
""" Enable or not the input boxes for start point. """ Enable or not the input boxes for start point.
""" """
@ -278,7 +285,6 @@ class Translation():
self.start_y.setEnabled(flag) self.start_y.setEnabled(flag)
self.start_z.setEnabled(flag) self.start_z.setEnabled(flag)
def setEnabledEndInput(self, flag=True): def setEnabledEndInput(self, flag=True):
""" Enable or not the input boxes for end point. """ Enable or not the input boxes for end point.
""" """
@ -289,6 +295,14 @@ class Translation():
self.end_y.setEnabled(flag) self.end_y.setEnabled(flag)
self.end_z.setEnabled(flag) self.end_z.setEnabled(flag)
def setEnableSlider(self, flag=True):
""" Enable or not the slider for segment selection.
"""
if self.msg != 0:
func.print_msg("Translation.setEnabledEndInput :")
self.slider.setEnabled(flag)
self.length_edit.setEnabled(flag)
def numberCopies(self,value): def numberCopies(self,value):
""" Respond to the change in number of part value from the spin box. """ Respond to the change in number of part value from the spin box.
@ -319,7 +333,6 @@ class Translation():
self.deep = flag self.deep = flag
def copyFlag(self, flag): def copyFlag(self, flag):
""" Respond to the change of duplicate flag. """ Respond to the change of duplicate flag.
""" """
@ -339,7 +352,6 @@ class Translation():
self.reset() self.reset()
self.preview() self.preview()
def selection(self): def selection(self):
""" Check if one object at least is selected. """ Check if one object at least is selected.
""" """
@ -606,25 +618,47 @@ class Translation():
if self.msg != 0: if self.msg != 0:
func.print_msg("Translation.select_start : Selection of Start point of translation by button !") func.print_msg("Translation.select_start : Selection of Start point of translation by button !")
error_msg = "Select one point !" error_msg = "Select one point or one segment !"
# Get the selected Objects # Get the selected Objects
SelectedObjects = func.get_SelectedObjects() SelectedObjects = func.get_SelectedObjects()
if SelectedObjects == None: if SelectedObjects == None:
func.printError_msg(error_msg) func.printError_msg(error_msg)
return return
Number_of_Points = SelectedObjects[0] Number_of_Points = SelectedObjects[0]
if Number_of_Points != 1: Number_of_Edges = SelectedObjects[1]
func.printError_msg(error_msg) if self.segment:
return error_msg = "Select one segment only !"
if Number_of_Edges != 1:
func.printError_msg(error_msg)
return
else:
self.Edge_List = SelectedObjects[4]
self.start = self.Edge_List[0].Vertexes[0].Point
self.m_num_end = Number_of_Edges
for m_i_end in range(Number_of_Edges):
self.end.append(self.Edge_List[m_i_end].Vertexes[-1].Point)
button_text = "Selected !"
self.but_start.setText(QtGui.QApplication.translate("Form", button_text, None, QtGui.QApplication.UnicodeUTF8))
self.print_start(self.start)
self.print_end(self.end[0])
self.set_percentage(100.0)
self.visu()
self.preview()
else: else:
Point_List = SelectedObjects[3] error_msg = "Select one point !"
self.start = Point_List[0].Point if Number_of_Points != 1:
button_text = "Selected !" func.printError_msg(error_msg)
self.but_start.setText(QtGui.QApplication.translate("Form", button_text, None, QtGui.QApplication.UnicodeUTF8)) return
self.print_start(self.start) else:
self.visu() Point_List = SelectedObjects[3]
self.preview() self.start = Point_List[0].Point
button_text = "Selected !"
self.but_start.setText(QtGui.QApplication.translate("Form", button_text, None, QtGui.QApplication.UnicodeUTF8))
self.print_start(self.start)
self.visu()
self.preview()
def reset_start_value(self): def reset_start_value(self):
@ -641,6 +675,9 @@ class Translation():
self.setEnabledStartInput(False) self.setEnabledStartInput(False)
self.print_start(self.origin) self.print_start(self.origin)
self.set_percentage(100.0)
self.setEnableSlider(False)
self.segment = False
def select_start_type(self, *argc): def select_start_type(self, *argc):
""" Start point of translation by combo box. """ Start point of translation by combo box.
@ -649,14 +686,30 @@ class Translation():
func.print_msg("Translation.select_start_type : Start point of translation by combo box !") func.print_msg("Translation.select_start_type : Start point of translation by combo box !")
self.reset_start_value() self.reset_start_value()
self.reset_end_value()
self.but_end.setEnabled(True)
self.comb_end.setEnabled(True)
if str(*argc) == "To select": if str(*argc) == "To select":
# Activate select button and wait for selection # Activate select button and wait for selection
self.but_start.setEnabled(True) self.but_start.setEnabled(True)
self.setEnableSlider(False)
self.start = None self.start = None
elif str(*argc) == "From Segment":
# Activate select button and wait for selection
self.but_start.setEnabled(True)
self.segment = True
self.setEnableSlider(True)
self.setEnabledStartInput(False)
self.setEnabledEndInput(False)
self.but_end.setEnabled(False)
self.comb_end.setEnabled(False)
self.start = None
elif str(*argc) == "To define": elif str(*argc) == "To define":
# Activate define input boxes and wait for entering values # Activate define input boxes and wait for entering values
self.setEnabledStartInput(True) self.setEnabledStartInput(True)
self.setEnableSlider(False)
self.start = App.Vector(0,0,0) self.start = App.Vector(0,0,0)
else: else:
button_text = "Select" button_text = "Select"
@ -756,6 +809,7 @@ class Translation():
if SelectedObjects == None: if SelectedObjects == None:
func.printError_msg(error_msg) func.printError_msg(error_msg)
return return
Number_of_Points = SelectedObjects[0] Number_of_Points = SelectedObjects[0]
self.m_num_end = Number_of_Points self.m_num_end = Number_of_Points
if Number_of_Points == 0: if Number_of_Points == 0:
@ -950,7 +1004,64 @@ class Translation():
self.comb_start.setCurrentIndex(3) self.comb_start.setCurrentIndex(3)
self.but_end.setEnabled(True) self.but_end.setEnabled(True)
def set_percentage(self, value = 100.0):
""" Put 100 into edit box and on slider.
"""
self.internal = True
self.slider.setValue(value)
self.length_edit.setText(str(value))
self.internal = False
def length_value_changed(self, value):
""" Respond to the change in value of a slider, update the text box
"""
# If the value was changed internally, ignore event.
if self.internal:
return
self.length_edit.setText(str(value))
self.length_value_entered()
def length_value_entered(self):
#if self.msg != 0:
#func.print_msg("angle_value_entered entered!")
try:
# First we check if a valid number have been entered
self.length = float(self.length_edit.text())
if self.length < -1000.0 or self.length > 1000.0 :
func.printError_msg("Length must be valid number in percentage [-1000,1000] !")
self.length_edit.setText(str(100.0))
self.length_value_entered()
# Update the slider by internal update
self.internal = True
self.slider.setValue(self.length)
self.internal = False
if self.segment:
self.start = self.origin
self.end = []
print "length = " +str(self.length)
Number_of_Edges = len(self.Edge_List)
m_id_start = int(0)
m_id_end = int(-1)
m_mult = 1
if self.length < 0.0 :
m_id_start = int(-1)
m_id_end = int(0)
m_mult = -1
self.start = self.Edge_List[0].Vertexes[m_id_start].Point
Vector_A = self.start
for m_i_end in range(Number_of_Edges):
Vector_B = self.Edge_List[m_i_end].Vertexes[m_id_end].Point
distance = Vector_B.sub(Vector_A).Length
distance = ( distance / 100.0 ) * self.length * m_mult
Vector_C = Vector_A.add(Vector_B.sub(Vector_A).normalize().multiply( distance ))
self.end.append(Vector_C)
self.visu()
# Update the view
self.preview()
except ValueError:
func.printError_msg("Length must be valid number in percentage !")
class Rotation(): class Rotation():
""" A rotation object """ A rotation object
@ -1425,7 +1536,7 @@ class RotationEvents(DefineAndConnectEvents):
def defineEvents(self): def defineEvents(self):
self.connections_for_slider_changed = { self.connections_for_slider_changed = {
"ObjRot_horizontalSlider" : "angle_value_changed", "ObjRot_horizontalSlider" : "angle_value_changed",
} }
self.connections_for_button_pressed = { self.connections_for_button_pressed = {
"ObjRot_button_select" : "initialize", "ObjRot_button_select" : "initialize",
@ -1435,13 +1546,13 @@ class RotationEvents(DefineAndConnectEvents):
"ObjRot_button_apply" : "application", "ObjRot_button_apply" : "application",
} }
self.connections_for_combobox_changed = { self.connections_for_combobox_changed = {
"ObjRot_comboBox_center" : "center_value", "ObjRot_comboBox_center" : "center_value",
"ObjRot_comboBox_axis" : "axis_value", "ObjRot_comboBox_axis" : "axis_value",
} }
self.connections_for_checkbox_toggled = {} self.connections_for_checkbox_toggled = {}
self.connections_for_spin_changed = {} self.connections_for_spin_changed = {}
self.connections_for_return_pressed = { self.connections_for_return_pressed = {
"ObjRot_lineEdit_angle" : "angle_value_entered", "ObjRot_lineEdit_angle" : "angle_value_entered",
} }
class TranslationEvents(DefineAndConnectEvents): class TranslationEvents(DefineAndConnectEvents):
@ -1452,7 +1563,9 @@ class TranslationEvents(DefineAndConnectEvents):
DefineAndConnectEvents.__init__(self, self.ui, self.trans) DefineAndConnectEvents.__init__(self, self.ui, self.trans)
def defineEvents(self): def defineEvents(self):
self.connections_for_slider_changed = {} self.connections_for_slider_changed = {
"ObjTrans_horizontalSlider" : "length_value_changed",
}
self.connections_for_button_pressed = { self.connections_for_button_pressed = {
"ObjTrans_button_select" : "initialize", "ObjTrans_button_select" : "initialize",
"ObjTrans_button_select_start" : "select_start", "ObjTrans_button_select_start" : "select_start",
@ -1469,15 +1582,18 @@ class TranslationEvents(DefineAndConnectEvents):
"ObjTrans_deepCopy" : "deepCopyFlag", "ObjTrans_deepCopy" : "deepCopyFlag",
} }
self.connections_for_spin_changed = { self.connections_for_spin_changed = {
"ObjTrans_spin" : "numberCopies", "ObjTrans_spin" : "numberCopies",
} }
self.connections_for_return_pressed = { self.connections_for_return_pressed = {
"ObjTrans_start_x" : "start_x_entered", "ObjTrans_start_x" : "start_x_entered",
"ObjTrans_start_y" : "start_y_entered", "ObjTrans_start_y" : "start_y_entered",
"ObjTrans_start_z" : "start_z_entered", "ObjTrans_start_z" : "start_z_entered",
"ObjTrans_end_x" : "end_x_entered", "ObjTrans_end_x" : "end_x_entered",
"ObjTrans_end_y" : "end_y_entered", "ObjTrans_end_y" : "end_y_entered",
"ObjTrans_end_z" : "end_z_entered", "ObjTrans_end_z" : "end_z_entered",
"ObjTrans_lineEdit_length_seg" : "length_value_entered",
} }
#################################################################################### ####################################################################################
@ -1550,6 +1666,26 @@ class ObjectRotationTab():
"ObjTrans_end_z" : "end_z_entered", "ObjTrans_end_z" : "end_z_entered",
} }
# self.connections_for_ObjRot_slider_changed = {
# "ObjRot_horizontalSlider" : "angle_value_changed",
# }
#
# self.connections_for_ObjRot_button_pressed = {
# "ObjRot_button_select" : "initialize",
# "ObjRot_button_select_center" : "select_center",
# "ObjRot_button_select_axis" : "select_axis",
# "ObjRot_button_reset" : "reset",
# "ObjRot_button_apply" : "application",
# }
#
# self.connections_for_ObjRot_combobox_changed = {
# "ObjRot_comboBox_center" : "center_value",
# "ObjRot_comboBox_axis" : "axis_value",
# }
#
# self.connections_for_ObjRot_return_pressed = {
# "ObjRot_lineEdit_angle" : "angle_value_entered",
# }
self.connections_for_button_clicked = { self.connections_for_button_clicked = {
"button_quit" : "quit_clicked", "button_quit" : "quit_clicked",
@ -1560,30 +1696,52 @@ class ObjectRotationTab():
QtCore.QObject.connect(getattr(self.ui, str(m_key)), QtCore.QObject.connect(getattr(self.ui, str(m_key)),
QtCore.SIGNAL("clicked()"),getattr(self,str(m_val))) QtCore.SIGNAL("clicked()"),getattr(self,str(m_val)))
# Connect to Rotation functions
# for m_key, m_val in self.connections_for_ObjRot_button_pressed.items():
# func.print_msg( "Connecting : " + str(getattr(self.ui, str(m_key))) + " and " + str(getattr(self.rot, str(m_val))) )
# QtCore.QObject.connect(getattr(self.ui, str(m_key)),
# QtCore.SIGNAL("pressed()"),getattr(self.rot, str(m_val)))
#
# for m_key, m_val in self.connections_for_ObjRot_combobox_changed.items():
# print_msg( "Connecting : " + str(getattr(self.ui, str(m_key))) + " and " + str(getattr(self.rot, str(m_val))) )
# QtCore.QObject.connect(getattr(self.ui, str(m_key)),
# QtCore.SIGNAL(_fromUtf8("currentIndexChanged(QString)")),getattr(self.rot, str(m_val)))
#
# for m_key, m_val in self.connections_for_ObjRot_slider_changed.items():
# func.print_msg( "Connecting : " + str(getattr(self.ui, str(m_key))) + " and " + str(getattr(self.rot, str(m_val))) )
# QtCore.QObject.connect(getattr(self.ui, str(m_key)),
# QtCore.SIGNAL("valueChanged(int)"),getattr(self.rot, str(m_val)))
#
# for m_key, m_val in self.connections_for_ObjRot_return_pressed.items():
# func.print_msg( "Connecting : " + str(getattr(self.ui, str(m_key))) + " and " + str(getattr(self.rot, str(m_val))) )
# QtCore.QObject.connect(getattr(self.ui, str(m_key)),
# QtCore.SIGNAL("returnPressed()"),getattr(self.rot, str(m_val)))
# Connect to Translation functions # Connect to Translation functions
for m_key, m_val in self.connections_for_ObjTrans_button_pressed.items(): for m_key, m_val in self.connections_for_ObjTrans_button_pressed.items():
#func.print_msg( "Connecting : " + str(getattr(self.ui, str(m_key))) + " and " + str(getattr(self.trans, str(m_val))) ) func.print_msg( "Connecting : " + str(getattr(self.ui, str(m_key))) + " and " + str(getattr(self.trans, str(m_val))) )
QtCore.QObject.connect(getattr(self.ui, str(m_key)), QtCore.QObject.connect(getattr(self.ui, str(m_key)),
QtCore.SIGNAL("pressed()"),getattr(self.trans, str(m_val))) QtCore.SIGNAL("pressed()"),getattr(self.trans, str(m_val)))
for m_key, m_val in self.connections_for_ObjTrans_combobox_changed.items(): for m_key, m_val in self.connections_for_ObjTrans_combobox_changed.items():
#func.print_msg( "Connecting : " + str(getattr(self.ui, str(m_key))) + " and " + str(getattr(self.trans, str(m_val))) ) func.print_msg( "Connecting : " + str(getattr(self.ui, str(m_key))) + " and " + str(getattr(self.trans, str(m_val))) )
QtCore.QObject.connect(getattr(self.ui, str(m_key)), QtCore.QObject.connect(getattr(self.ui, str(m_key)),
QtCore.SIGNAL(_fromUtf8("currentIndexChanged(QString)")),getattr(self.trans, str(m_val))) QtCore.SIGNAL(_fromUtf8("currentIndexChanged(QString)")),getattr(self.trans, str(m_val)))
for m_key, m_val in self.connections_for_ObjTrans_checkbox_toggled.items(): for m_key, m_val in self.connections_for_ObjTrans_checkbox_toggled.items():
#func.print_msg( "Connecting : " + str(getattr(self.ui, str(m_key))) + " and " + str(getattr(self.trans, str(m_val))) ) #print_msg( "Connecting : " + str(m_key) + " and " + str(m_val) )
func.print_msg( "Connecting : " + str(getattr(self.ui, str(m_key))) + " and " + str(getattr(self.trans, str(m_val))) )
QtCore.QObject.connect(getattr(self.ui, str(m_key)), QtCore.QObject.connect(getattr(self.ui, str(m_key)),
QtCore.SIGNAL(_fromUtf8("toggled(bool)")),getattr(self.trans, str(m_val))) QtCore.SIGNAL(_fromUtf8("toggled(bool)")),getattr(self.trans, str(m_val)))
for m_key, m_val in self.connections_for_ObjTrans_spin_changed.items(): for m_key, m_val in self.connections_for_ObjTrans_spin_changed.items():
#func.print_msg( "Connecting : " + str(getattr(self.ui, str(m_key))) + " and " + str(getattr(self.trans, str(m_val))) ) func.print_msg( "Connecting : " + str(getattr(self.ui, str(m_key))) + " and " + str(getattr(self.trans, str(m_val))) )
QtCore.QObject.connect(getattr(self.ui, str(m_key)), QtCore.QObject.connect(getattr(self.ui, str(m_key)),
QtCore.SIGNAL("valueChanged(int)"),getattr(self.trans, str(m_val))) QtCore.SIGNAL("valueChanged(int)"),getattr(self.trans, str(m_val)))
for m_key, m_val in self.connections_for_ObjTrans_return_pressed.items(): for m_key, m_val in self.connections_for_ObjTrans_return_pressed.items():
#func.print_msg( "Connecting : " + str(getattr(self.ui, str(m_key))) + " and " + str(getattr(self.trans, str(m_val))) ) func.print_msg( "Connecting : " + str(getattr(self.ui, str(m_key))) + " and " + str(getattr(self.trans, str(m_val))) )
QtCore.QObject.connect(getattr(self.ui, str(m_key)), QtCore.QObject.connect(getattr(self.ui, str(m_key)),
QtCore.SIGNAL("returnPressed()"),getattr(self.trans, str(m_val))) QtCore.SIGNAL("returnPressed()"),getattr(self.trans, str(m_val)))