suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sketcher Enhancement: Merge sketches : Art by Jim

Browse Source
This commit is contained in:
Abdullah Tahiri 2014-11-17 14:18:27 +01:00 committed by wmayer
parent 0f72bc68ba
commit fe3beb89fd
3 changed files with 353 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Mod/Sketcher/Gui/Command.cpp
View File

@ -509,6 +509,7 @@ CmdSketcherMergeSketchs::CmdSketcherMergeSketchs()
sWhatsThis = "Sketcher_MergeSketches";
sStatusTip = sToolTipText;
eType = 0;
sPixmap = "Sketcher_Merge_Sketch";
}
void CmdSketcherMergeSketchs::activated(int iMsg)

1
src/Mod/Sketcher/Gui/Resources/Sketcher.qrc
View File

@ -65,6 +65,7 @@
<file>icons/Sketcher_External.svg</file>
<file>icons/Sketcher_LeaveSketch.svg</file>
<file>icons/Sketcher_MapSketch.svg</file>
<file>icons/Sketcher_Merge_Sketch.svg</file>
<file>icons/Sketcher_NewSketch.svg</file>
<file>icons/Sketcher_ProfilesHexagon1.svg</file>
<file>icons/Sketcher_SelectConflictingConstraints.svg</file>

351
src/Mod/Sketcher/Gui/Resources/icons/Sketcher_Merge_Sketch.svg Normal file
View File

@ -0,0 +1,351 @@
<?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="svg5821"
sodipodi:version="0.32"
inkscape:version="0.48.4 r9939"
sodipodi:docname="Sketcher_Merge_Sketch.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
version="1.1"
inkscape:export-filename="/media/data/Yorik/FreeCAD/icons/Sketcher.png"
inkscape:export-xdpi="45"
inkscape:export-ydpi="45">
<defs
id="defs5823">
<linearGradient
inkscape:collect="always"
id="linearGradient6349">
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="0"
id="stop6351" />
<stop
style="stop-color:#000000;stop-opacity:0;"
offset="1"
id="stop6353" />
</linearGradient>
<linearGradient
id="linearGradient3377">
<stop
style="stop-color:#0019a3;stop-opacity:1;"
offset="0"
id="stop3379" />
<stop
style="stop-color:#0069ff;stop-opacity:1;"
offset="1"
id="stop3381" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3377"
id="linearGradient3383"
x1="901.1875"
y1="1190.875"
x2="1267.9062"
y2="1190.875"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(-1,0,0,1,2199.356,0)" />
<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="perspective5829" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient6349"
id="radialGradient6355"
cx="1103.6399"
cy="1424.4465"
fx="1103.6399"
fy="1424.4465"
r="194.40614"
gradientTransform="matrix(-1.4307499,-1.3605156e-7,-1.202713e-8,0.1264801,2674.7488,1244.2826)"
gradientUnits="userSpaceOnUse" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="12.328125"
inkscape:cx="21.642937"
inkscape:cy="32"
inkscape:current-layer="g3360"
showgrid="true"
inkscape:document-units="px"
inkscape:grid-bbox="true"
inkscape:window-width="1680"
inkscape:window-height="995"
inkscape:window-x="-2"
inkscape:window-y="-3"
inkscape:window-maximized="1" />
<metadata
id="metadata5826">
<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">
<g
id="g3360"
inkscape:export-filename="/home/yorik/Documents/Lab/Draft/icons/draft.png"
inkscape:export-xdpi="3.2478156"
inkscape:export-ydpi="3.2478156"
transform="matrix(0.1367863,0,0,0.1367863,-119.15519,-134.86962)">
<g
id="g3765">
<rect
y="1316.9672"
x="1010.6287"
height="119.62317"
width="139.40201"
id="rect3860"
style="color:#000000;fill:none;stroke:#ff1e00;stroke-width:14.85358047;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
<path
transform="matrix(3.8144828,0,0,3.6149859,1026.5802,1189.457)"
d="m 48.363636,33.272728 a 18.181818,18.181818 0 1 1 -36.363636,0 18.181818,18.181818 0 1 1 36.363636,0 z"
sodipodi:ry="18.181818"
sodipodi:rx="18.181818"
sodipodi:cy="33.272728"
sodipodi:cx="30.181818"
id="path3862"
style="color:#000000;fill:none;stroke:#ff1e00;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
sodipodi:type="arc" />
<path
inkscape:transform-center-y="-0.61637387"
transform="matrix(2.1664228,0,0,2.2386861,1076.2945,1314.2871)"
d="m -9.7544817,24.207562 -6.9727923,-0.142368 -6.972792,0.142367 3.60969,-5.967431 3.363102,-6.109799 3.363102,6.109799 z"
inkscape:randomized="0"
inkscape:rounded="0"
inkscape:flatsided="false"
sodipodi:arg2="1.5707963"
sodipodi:arg1="0.52359878"
sodipodi:r2="3.8833756"
sodipodi:r1="8.051487"
sodipodi:cy="20.181818"
sodipodi:cx="-16.727274"
sodipodi:sides="3"
id="path3888"
style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2.63483143;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
sodipodi:type="star" />
<path
inkscape:transform-center-y="4.5061953"
transform="matrix(2.1664228,0,0,-2.2386861,1076.2945,1434.9197)"
d="m -9.7544817,24.207562 -6.9727923,-0.142368 -6.972792,0.142367 3.60969,-5.967431 3.363102,-6.109799 3.363102,6.109799 z"
inkscape:randomized="0"
inkscape:rounded="0"
inkscape:flatsided="false"
sodipodi:arg2="1.5707963"
sodipodi:arg1="0.52359878"
sodipodi:r2="3.8833756"
sodipodi:r1="8.051487"
sodipodi:cy="20.181818"
sodipodi:cx="-16.727274"
sodipodi:sides="3"
id="path3888-9"
style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2.63483143;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
sodipodi:type="star" />
<path
inkscape:transform-center-x="1.9947136"
inkscape:transform-center-y="-3.0423375"
transform="matrix(1.7423908,-1.2200925,1.4037856,1.8005101,1121.2232,1222.3125)"
d="m -9.7544817,24.207562 -6.9727923,-0.142368 -6.972792,0.142367 3.60969,-5.967431 3.363102,-6.109799 3.363102,6.109799 z"
inkscape:randomized="0"
inkscape:rounded="0"
inkscape:flatsided="false"
sodipodi:arg2="1.5707963"
sodipodi:arg1="0.52359878"
sodipodi:r2="3.8833756"
sodipodi:r1="8.051487"
sodipodi:cy="20.181818"
sodipodi:cx="-16.727274"
sodipodi:sides="3"
id="path3888-97"
style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2.63483143;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
sodipodi:type="star" />
</g>
<g
id="g3772"
transform="matrix(0.81534896,0,0,0.80276295,66.651485,5.5090201)">
<rect
style="color:#000000;fill:none;stroke:#ff1e00;stroke-width:14.85358047;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="rect3774"
width="139.40201"
height="119.62317"
x="1010.6287"
y="1316.9672" />
<path
sodipodi:type="arc"
style="color:#000000;fill:none;stroke:#ff1e00;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="path3776"
sodipodi:cx="30.181818"
sodipodi:cy="33.272728"
sodipodi:rx="18.181818"
sodipodi:ry="18.181818"
d="m 48.363636,33.272728 c 0,10.041541 -8.140277,18.181818 -18.181818,18.181818 C 20.140277,51.454546 12,43.314269 12,33.272728 12,23.231187 20.140277,15.09091 30.181818,15.09091 c 10.041541,0 18.181818,8.140277 18.181818,18.181818 z"
transform="matrix(3.8144828,0,0,3.6149859,1026.5802,1189.457)" />
<path
sodipodi:type="star"
style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2.63483143;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="path3778"
sodipodi:sides="3"
sodipodi:cx="-16.727274"
sodipodi:cy="20.181818"
sodipodi:r1="8.051487"
sodipodi:r2="3.8833756"
sodipodi:arg1="0.52359878"
sodipodi:arg2="1.5707963"
inkscape:flatsided="false"
inkscape:rounded="0"
inkscape:randomized="0"
d="m -9.7544817,24.207562 -6.9727923,-0.142368 -6.972792,0.142367 3.60969,-5.967431 3.363102,-6.109799 3.363102,6.109799 z"
transform="matrix(2.1664228,0,0,2.2386861,1076.2945,1314.2871)"
inkscape:transform-center-y="-0.61637387" />
<path
sodipodi:type="star"
style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2.63483143;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="path3780"
sodipodi:sides="3"
sodipodi:cx="-16.727274"
sodipodi:cy="20.181818"
sodipodi:r1="8.051487"
sodipodi:r2="3.8833756"
sodipodi:arg1="0.52359878"
sodipodi:arg2="1.5707963"
inkscape:flatsided="false"
inkscape:rounded="0"
inkscape:randomized="0"
d="m -9.7544817,24.207562 -6.9727923,-0.142368 -6.972792,0.142367 3.60969,-5.967431 3.363102,-6.109799 3.363102,6.109799 z"
transform="matrix(2.1664228,0,0,-2.2386861,1076.2945,1434.9197)"
inkscape:transform-center-y="4.5061953" />
<path
sodipodi:type="star"
style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2.63483143;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
id="path3782"
sodipodi:sides="3"
sodipodi:cx="-16.727274"
sodipodi:cy="20.181818"
sodipodi:r1="8.051487"
sodipodi:r2="3.8833756"
sodipodi:arg1="0.52359878"
sodipodi:arg2="1.5707963"
inkscape:flatsided="false"
inkscape:rounded="0"
inkscape:randomized="0"
d="m -9.7544817,24.207562 -6.9727923,-0.142368 -6.972792,0.142367 3.60969,-5.967431 3.363102,-6.109799 3.363102,6.109799 z"
transform="matrix(1.7423908,-1.2200925,1.4037856,1.8005101,1121.2232,1222.3125)"
inkscape:transform-center-y="-3.0423375"
inkscape:transform-center-x="1.9947136" />
</g>
<g
transform="matrix(0.84841984,0,0,0.83711094,293.21029,-38.155576)"
id="g3784">
<rect
y="1316.9672"
x="1010.6287"
height="119.62317"
width="139.40201"
id="rect3786"
style="color:#000000;fill:none;stroke:#ff1e00;stroke-width:14.85358047;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
<path
transform="matrix(3.8144828,0,0,3.6149859,1026.5802,1189.457)"
d="m 48.363636,33.272728 c 0,10.041541 -8.140277,18.181818 -18.181818,18.181818 C 20.140277,51.454546 12,43.314269 12,33.272728 12,23.231187 20.140277,15.09091 30.181818,15.09091 c 10.041541,0 18.181818,8.140277 18.181818,18.181818 z"
sodipodi:ry="18.181818"
sodipodi:rx="18.181818"
sodipodi:cy="33.272728"
sodipodi:cx="30.181818"
id="path3788"
style="color:#000000;fill:none;stroke:#ff1e00;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
sodipodi:type="arc" />
<path
inkscape:transform-center-y="-0.61637387"
transform="matrix(2.1664228,0,0,2.2386861,1076.2945,1314.2871)"
d="m -9.7544817,24.207562 -6.9727923,-0.142368 -6.972792,0.142367 3.60969,-5.967431 3.363102,-6.109799 3.363102,6.109799 z"
inkscape:randomized="0"
inkscape:rounded="0"
inkscape:flatsided="false"
sodipodi:arg2="1.5707963"
sodipodi:arg1="0.52359878"
sodipodi:r2="3.8833756"
sodipodi:r1="8.051487"
sodipodi:cy="20.181818"
sodipodi:cx="-16.727274"
sodipodi:sides="3"
id="path3790"
style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2.63483143;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
sodipodi:type="star" />
<path
inkscape:transform-center-y="4.5061953"
transform="matrix(2.1664228,0,0,-2.2386861,1076.2945,1434.9197)"
d="m -9.7544817,24.207562 -6.9727923,-0.142368 -6.972792,0.142367 3.60969,-5.967431 3.363102,-6.109799 3.363102,6.109799 z"
inkscape:randomized="0"
inkscape:rounded="0"
inkscape:flatsided="false"
sodipodi:arg2="1.5707963"
sodipodi:arg1="0.52359878"
sodipodi:r2="3.8833756"
sodipodi:r1="8.051487"
sodipodi:cy="20.181818"
sodipodi:cx="-16.727274"
sodipodi:sides="3"
id="path3792"
style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2.63483143;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
sodipodi:type="star" />
<path
inkscape:transform-center-x="1.9947136"
inkscape:transform-center-y="-3.0423375"
transform="matrix(1.7423908,-1.2200925,1.4037856,1.8005101,1121.2232,1222.3125)"
d="m -9.7544817,24.207562 -6.9727923,-0.142368 -6.972792,0.142367 3.60969,-5.967431 3.363102,-6.109799 3.363102,6.109799 z"
inkscape:randomized="0"
inkscape:rounded="0"
inkscape:flatsided="false"
sodipodi:arg2="1.5707963"
sodipodi:arg1="0.52359878"
sodipodi:r2="3.8833756"
sodipodi:r1="8.051487"
sodipodi:cy="20.181818"
sodipodi:cx="-16.727274"
sodipodi:sides="3"
id="path3794"
style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:2.63483143;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
sodipodi:type="star" />
</g>
<path
style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:7.31067371px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 892.45299,1187.6104 c -4.7057,36.7263 14.13938,76.0492 72.34694,95.4743 l -7.11609,17.1972 43.28956,-18.3833 -16.60419,-37.9525 -8.89513,18.3833 c -42.9544,-11.6634 -55.69162,-27.2559 -56.92875,-75.905 z"
id="path3796"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccc" />
<path
sodipodi:nodetypes="cccccccc"
inkscape:connector-curvature="0"
id="path3798"
d="m 1295.9024,1182.7467 c -1.0435,29.8776 10.796,63.977 -34.3644,88.1214 l -10.9973,-15.0146 -6.7821,46.5395 41.055,5.5296 -11.0865,-17.1511 c 46.6273,-27.9935 55.3853,-56.9439 48.1787,-108.2411 z"
style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:7.31067371px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 17 KiB