kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

PD(hole taskpanel): Include depth on diagram

Browse Source 
feat(PD): hole diagram add include depth
refactor(PD): hole taskpanel: images add background
This commit is contained in:
Alfredo Monclus
2025-01-22 23:19:12 -03:00
committed by Chris Hennes
parent be3ce13a7c
commit de7a237a8a
15 changed files with 745 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Mod/PartDesign/Gui/Resources/PartDesign.qrc
View File

@@ -57,9 +57,13 @@
<file>icons/PartDesign_Thickness.svg</file>
<file>icons/PartDesignWorkbench.svg</file>
<file>images/hole_counterbore_angled.svg</file>
<file>images/hole_counterbore_angled_included.svg</file>
<file>images/hole_counterdrill_angled.svg</file>
<file>images/hole_counterdrill_angled_included.svg</file>
<file>images/hole_countersink_angled.svg</file>
<file>images/hole_countersink_angled_included.svg</file>
<file>images/hole_none_angled.svg</file>
<file>images/hole_none_angled_included.svg</file>
<file>images/hole_counterbore_flat.svg</file>
<file>images/hole_counterdrill_flat.svg</file>
<file>images/hole_countersink_flat.svg</file>

135
src/Mod/PartDesign/Gui/Resources/images/hole_counterbore_angled.svg
View File

@@ -21,24 +21,24 @@
xmlns:cc="http://creativecommons.org/ns#"
xmlns:dc="http://purl.org/dc/elements/1.1/"><sodipodi:namedview
id="namedview7"
pagecolor="#2f2f2f"
pagecolor="#2d2d2d"
bordercolor="#000000"
borderopacity="0.25"
inkscape:showpageshadow="2"
inkscape:pageopacity="0"
inkscape:pageopacity="1"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
inkscape:document-units="px"
showgrid="false"
inkscape:zoom="2.4373738"
inkscape:cx="-43.899709"
inkscape:cy="76.311643"
inkscape:zoom="3.4166667"
inkscape:cx="45.073171"
inkscape:cy="90"
inkscape:window-width="1600"
inkscape:window-height="824"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="g3619"
inkscape:current-layer="g1241"
showguides="true"><sodipodi:guide
position="-4.1420245,94.999913"
orientation="1,0"
@@ -55,72 +55,67 @@
transform="translate(-101.48917,-143.06709)"><g
id="g1241"
transform="translate(-0.18870399,0.37210001)"><g
id="g3619"
transform="matrix(3.3979922,0,0,3.779528,-225.68321,-396.88302)"
id="g1399"
transform="translate(4.4762314e-6,7.512192e-5)"
style="stroke-width:0.558085;stroke-dasharray:none"><path
style="fill:none;stroke:#999999;stroke-width:0.558085;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 96.618607,144.94329 11.674273,-7.9e-4 v 2.31582"
id="path476"
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 114.8787,268.17673 -7.20083,39.51826 h -5"
id="path472"
sodipodi:nodetypes="ccc" /><path
id="path578"
style="fill:none;stroke:#999999;stroke-width:0.558085;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 98.105312,165.1846 h -1.486705 m 2.971206,-15.21501 h -1.484501 v 3.43776 11.77725"
sodipodi:nodetypes="cccccc" /><path
style="fill:none;stroke:#999999;stroke-width:0.558085;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 112.77462,180.46499 h 8.22936 v -30.36167 h -4.06934"
id="path580"
sodipodi:nodetypes="cccc" /><path
style="fill:none;stroke:#999999;stroke-width:0.558085;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 105.83611,182.18333 v 1.72125 h 4.91358 v -1.72125"
id="path584"
sodipodi:nodetypes="cccc" /><path
style="fill:none;stroke:#ffffff;stroke-width:0.558085;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:0.558085, 2.23234;stroke-dashoffset:0;stop-color:#000000"
d="m 102.13905,150.10329 h 13.01161"
id="path786" /><path
style="fill:none;stroke:#999999;stroke-width:0.558085;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 101.23086,149.29842 v -2.0401 h 14.12404 v 2.0401"
id="path506"
sodipodi:nodetypes="cccc" /><path
style="font-variation-settings:normal;fill:none;fill-opacity:1;stroke:#999999;stroke-width:0.558085;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
d="m 98.105312,156.0532 1.484501,-1.1e-4"
id="path1853"
sodipodi:nodetypes="cc" /><path
style="fill:none;stroke:#ffffff;stroke-width:0.558085;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 115.65414,150.06205 -0.007,5.99104 -4.89863,3e-5 v 24.26373 l -2.45611,2.07652 -2.45613,-2.07652 v -24.2638 l -4.91225,4e-5 v -5.74104"
id="path455"
sodipodi:nodetypes="ccccccccc" /><path
style="fill:none;stroke:#999999;stroke-width:0.55808458;stroke-linecap:round;stroke-linejoin:round;stop-color:#000000;stroke-dasharray:none"
d="m 121.00398,158.56062 h 1.17716"
id="path582-6"
sodipodi:nodetypes="cc" /><path
style="fill:none;stroke:#999999;stroke-width:0.558085;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 108.2929,183.90458 v 2.18208 h 14.26387"
id="path586-7"
sodipodi:nodetypes="ccc" /><g
id="g1399"
transform="matrix(0.29429143,0,0,0.2645833,66.416637,105.00864)"><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 114.8787,268.17673 -7.20083,39.51826 h -5"
id="path472"
sodipodi:nodetypes="ccc" /><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 111.18088,264.17674 17.22369,17.22361"
id="path642" /><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 174.68621,264.1767 -17.22369,17.22361"
id="path642-3" /><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
id="path1314"
sodipodi:type="arc"
sodipodi:cx="142.29521"
sodipodi:cy="292.68314"
sodipodi:rx="41.997044"
sodipodi:ry="32.843685"
sodipodi:start="4.0142573"
sodipodi:end="5.4105207"
sodipodi:arc-type="arc"
d="m 115.30003,267.52341 a 41.997044,32.843685 0 0 1 53.99036,0"
sodipodi:open="true" /></g></g><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 111.18088,264.17674 17.22369,17.22361"
id="path642" /><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 174.68621,264.1767 -17.22369,17.22361"
id="path642-3" /><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
id="path1314"
sodipodi:type="arc"
sodipodi:cx="142.29521"
sodipodi:cy="292.68314"
sodipodi:rx="41.997044"
sodipodi:ry="32.843685"
sodipodi:start="4.0142573"
sodipodi:end="5.4105207"
sodipodi:arc-type="arc"
d="m 115.30003,267.52341 a 41.997044,32.843685 0 0 1 53.99036,0"
sodipodi:open="true" /></g><path
style="fill:#4d4d4d;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="M 166.29184,169.93124 V 192.924 l -15.65249,1.2e-4 v 91.70544 l -8.34584,7.84827 -8.34591,-7.84827 v -91.70571 l -15.64914,1.5e-4 v -22.99276"
id="path455"
sodipodi:nodetypes="ccccccccc" /><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 102.62606,150.9342 39.66909,-0.003 v 8.7527"
id="path476"
sodipodi:nodetypes="ccc" /><path
id="path578"
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 107.67787,227.4368 h -5.05181 m 10.09614,-57.50556 h -5.04433 v 12.99311 44.51245"
sodipodi:nodetypes="cccccc" /><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 157.52407,285.18946 h 27.9633 V 170.43668 h -13.82759"
id="path580"
sodipodi:nodetypes="cccc" /><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 133.94707,291.68398 v 6.50551 h 16.6963 v -6.50551"
id="path584"
sodipodi:nodetypes="cccc" /><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 118.29846,167.39454 v -7.71062 h 47.99338 v 7.71062"
id="path506"
sodipodi:nodetypes="cccc" /><path
style="font-variation-settings:normal;fill:none;fill-opacity:1;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
d="m 107.67787,192.92442 5.04433,-4.2e-4"
id="path1853"
sodipodi:nodetypes="cc" /><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 185.48737,182.40127 h 3.99998"
id="path582-6"
sodipodi:nodetypes="cc" /><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 142.29522,298.18949 v 8.24723 h 48.46852"
id="path586-7"
sodipodi:nodetypes="ccc" /><path
style="fill:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:2, 8.00001;stroke-dashoffset:0;stop-color:#000000"
d="m 125.63827,142.69499 v 180"
id="path4446" /></g></g><metadata
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.0 KiB

After

Width:  |  Height:  |  Size: 6.4 KiB

129
src/Mod/PartDesign/Gui/Resources/images/hole_counterbore_angled_included.svg Normal file
View File

@@ -0,0 +1,129 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
width="90"
height="180"
viewBox="0 0 90 180"
version="1.1"
id="svg5"
xml:space="preserve"
inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
sodipodi:docname="hole_counterbore_angled_included.svg"
inkscape:export-filename="hole_counterbore.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:dc="http://purl.org/dc/elements/1.1/"><sodipodi:namedview
id="namedview7"
pagecolor="#2d2d2d"
bordercolor="#000000"
borderopacity="0.25"
inkscape:showpageshadow="2"
inkscape:pageopacity="1"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
inkscape:document-units="px"
showgrid="false"
inkscape:zoom="6.8939342"
inkscape:cx="17.189024"
inkscape:cy="101.90118"
inkscape:window-width="1600"
inkscape:window-height="824"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="g3619"
showguides="true"><sodipodi:guide
position="-4.1420245,94.999913"
orientation="1,0"
id="guide1501"
inkscape:locked="false" /><sodipodi:guide
position="100.89495,80.036612"
orientation="1,0"
id="guide1530"
inkscape:locked="false" /><sodipodi:guide
position="40.615647,30.217161"
orientation="0,-1"
id="guide956"
inkscape:locked="false" /></sodipodi:namedview><defs
id="defs2" /><g
inkscape:label="Capa 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-101.48917,-143.06709)"><g
id="g1241"
transform="translate(-0.18870399,0.37210001)"><g
id="g3619"
transform="matrix(3.3979922,0,0,3.779528,-225.68321,-396.88302)"
style="stroke-width:0.558085;stroke-dasharray:none"><g
id="g1399"
transform="matrix(0.29429143,0,0,0.2645833,66.416637,105.00864)"><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 114.8787,268.17673 -7.20083,39.51826 h -5"
id="path472"
sodipodi:nodetypes="ccc" /><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 111.18088,264.17674 17.22369,17.22361"
id="path642" /><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 174.68621,264.1767 -17.22369,17.22361"
id="path642-3" /><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
id="path1314"
sodipodi:type="arc"
sodipodi:cx="142.29521"
sodipodi:cy="292.68314"
sodipodi:rx="41.997044"
sodipodi:ry="32.843685"
sodipodi:start="4.0142573"
sodipodi:end="5.4105207"
sodipodi:arc-type="arc"
d="m 115.30003,267.52341 a 41.997044,32.843685 0 0 1 53.99036,0"
sodipodi:open="true" /></g><path
style="fill:#4d4d4d;stroke:#ffffff;stroke-width:0.558085;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 115.3549,149.96959 v 6.0835 l -4.60639,3e-5 v 24.26373 l -2.45611,2.07652 -2.45613,-2.07652 v -24.2638 l -4.60541,4e-5 v -6.0835"
id="path455"
sodipodi:nodetypes="ccccccccc" /><path
style="fill:none;stroke:#999999;stroke-width:0.558085;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 96.618607,144.94329 11.674273,-7.9e-4 v 2.31582"
id="path476"
sodipodi:nodetypes="ccc" /><path
id="path578"
style="fill:none;stroke:#999999;stroke-width:0.558085;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 98.105312,165.1846 h -1.486705 m 2.971206,-15.21501 h -1.484501 v 3.43776 11.77725"
sodipodi:nodetypes="cccccc" /><path
style="fill:none;stroke:#999999;stroke-width:0.558085;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 112.77462,182.39337 h 8.22936 v -32.29005 h -4.06934"
id="path580"
sodipodi:nodetypes="cccc" /><path
style="fill:none;stroke:#999999;stroke-width:0.558085;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 105.83611,182.18333 v 1.72125 h 4.91358 v -1.72125"
id="path584"
sodipodi:nodetypes="cccc" /><path
style="fill:none;stroke:#999999;stroke-width:0.558085;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 101.23086,149.29842 v -2.0401 h 14.12404 v 2.0401"
id="path506"
sodipodi:nodetypes="cccc" /><path
style="font-variation-settings:normal;fill:none;fill-opacity:1;stroke:#999999;stroke-width:0.558085;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
d="m 98.105312,156.0532 1.484501,-1.1e-4"
id="path1853"
sodipodi:nodetypes="cc" /><path
style="fill:none;stroke:#999999;stroke-width:0.558085;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 121.00398,153.26895 h 1.17716"
id="path582-6"
sodipodi:nodetypes="cc" /><path
style="fill:none;stroke:#999999;stroke-width:0.558085;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 108.2929,183.90458 v 2.18208 h 14.26387"
id="path586-7"
sodipodi:nodetypes="ccc" /></g><path
style="fill:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:2, 8.00001;stroke-dashoffset:0;stop-color:#000000"
d="m 125.63827,142.69499 v 180"
id="path4446" /></g></g><metadata
id="metadata199"><rdf:RDF><cc:Work
rdf:about=""><dc:creator><cc:Agent><dc:title>Alfredo Monclus</dc:title></cc:Agent></dc:creator><dc:rights><cc:Agent><dc:title>FreeCAD LGPL2+</dc:title></cc:Agent></dc:rights><dc:publisher><cc:Agent><dc:title>FreeCAD</dc:title></cc:Agent></dc:publisher></cc:Work></rdf:RDF></metadata></svg>
Side by Side

After

Width:  |  Height:  |  Size: 6.9 KiB

34
src/Mod/PartDesign/Gui/Resources/images/hole_counterbore_flat.svg
View File

@@ -18,18 +18,18 @@
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"><sodipodi:namedview
id="namedview7"
pagecolor="#2f2f2f"
pagecolor="#2d2d2d"
bordercolor="#000000"
borderopacity="0.25"
inkscape:showpageshadow="2"
inkscape:pageopacity="0"
inkscape:pageopacity="1"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
inkscape:document-units="px"
showgrid="false"
inkscape:zoom="3.4469671"
inkscape:cx="37.714314"
inkscape:cy="85.582482"
inkscape:cx="41.34069"
inkscape:cy="95.591281"
inkscape:window-width="1600"
inkscape:window-height="824"
inkscape:window-x="0"
@@ -44,6 +44,10 @@
position="100.89495,80.036612"
orientation="1,0"
id="guide1530"
inkscape:locked="false" /><sodipodi:guide
position="54.898011,36.450878"
orientation="0,-1"
id="guide548"
inkscape:locked="false" /></sodipodi:namedview><defs
id="defs2" /><g
inkscape:label="Capa 1"
@@ -61,7 +65,7 @@
sodipodi:nodetypes="ccc" /><path
id="path578"
style="fill:none;stroke:#999999;stroke-width:0.558085;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 98.105312,165.1846 h -1.486705 m 2.971206,-15.21501 h -1.484501 v 3.43776 11.77725"
d="m 98.105312,165.1846 h -1.486705 m 2.971206,-15.21501 h -1.484501 v 0 15.21501"
sodipodi:nodetypes="cccccc" /><path
style="fill:none;stroke:#999999;stroke-width:0.558085;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 112.77462,180.46486 8.22936,1.3e-4 v -30.36167 h -4.06934"
@@ -71,9 +75,6 @@
d="m 105.83611,182.18333 v 1.72125 h 4.91358 v -1.72125"
id="path584"
sodipodi:nodetypes="cccc" /><path
style="fill:none;stroke:#ffffff;stroke-width:0.558085;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:0.558085, 2.23234;stroke-dashoffset:0;stop-color:#000000"
d="m 102.13905,150.10329 h 13.01161"
id="path786" /><path
style="fill:none;stroke:#999999;stroke-width:0.558085;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 101.23086,149.29842 v -2.0401 h 14.12404 v 2.0401"
id="path506"
@@ -82,18 +83,21 @@
d="m 98.105312,156.0532 1.484501,-1.1e-4"
id="path1853"
sodipodi:nodetypes="cc" /><path
style="fill:none;stroke:#ffffff;stroke-width:0.558085;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 115.65414,150.06205 -0.007,5.99104 -4.89863,3e-5 v 24.41174 h -4.91224 v -24.41181 l -4.91225,4e-5 v -5.74104"
id="path455"
sodipodi:nodetypes="cccccccc" /><path
style="fill:none;stroke:#999999;stroke-width:0.55808458;stroke-linecap:round;stroke-linejoin:round;stop-color:#000000;stroke-dasharray:none"
d="m 121.00398,158.56062 h 1.17716"
style="fill:none;stroke:#999999;stroke-width:0.558085;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 121.00398,153.26895 h 1.17716"
id="path582-6"
sodipodi:nodetypes="cc" /><path
style="fill:none;stroke:#999999;stroke-width:0.55808458;stroke-linecap:round;stroke-linejoin:round;stop-color:#000000;stroke-dasharray:none"
d="m 108.2929,183.90458 v 2.18208 h 14.26387"
id="path586-7"
sodipodi:nodetypes="ccc" /></g><path
sodipodi:nodetypes="ccc" /><g
id="g463"
transform="matrix(0.29429143,0,0,0.26600608,66.416639,104.76584)"
style="stroke-width:0.55659"><path
style="fill:#4d4d4d;stroke:#ffffff;stroke-width:1.99464;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="M 166.29184,169.93124 V 192.924 l -15.65249,1.2e-4 v 91.70544 H 133.9476 v -91.70571 l -15.64914,1.5e-4 v -22.99276"
id="path455-3"
sodipodi:nodetypes="cccccccc" /></g></g><path
style="fill:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:2, 8.00001;stroke-dashoffset:0;stop-color:#000000"
d="m 125.63827,142.69499 v 180"
id="path4446" /></g></g></svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.1 KiB

After

Width:  |  Height:  |  Size: 5.1 KiB

69
src/Mod/PartDesign/Gui/Resources/images/hole_counterdrill_angled.svg
View File

@@ -21,18 +21,18 @@
xmlns:cc="http://creativecommons.org/ns#"
xmlns:dc="http://purl.org/dc/elements/1.1/"><sodipodi:namedview
id="namedview7"
pagecolor="#2f2f2f"
pagecolor="#2d2d2d"
bordercolor="#000000"
borderopacity="0.25"
inkscape:showpageshadow="2"
inkscape:pageopacity="0"
inkscape:pageopacity="1"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
inkscape:document-units="px"
showgrid="false"
inkscape:zoom="4.8747476"
inkscape:cx="-5.7438871"
inkscape:cy="131.69913"
inkscape:cx="29.129713"
inkscape:cy="61.439078"
inkscape:window-width="1600"
inkscape:window-height="824"
inkscape:window-x="0"
@@ -54,7 +54,34 @@
id="layer1"
transform="translate(-101.48917,-143.06709)"><g
id="g1241"
transform="translate(-0.18870399,0.37210001)"><path
transform="translate(-0.18870399,0.37210001)"><g
id="g1399"><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 114.8787,268.17673 -7.20083,39.51826 h -5"
id="path472"
sodipodi:nodetypes="ccc" /><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stop-color:#000000;stroke-dasharray:none"
d="m 111.18088,264.17674 17.22369,17.22361"
id="path642" /><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stop-color:#000000;stroke-dasharray:none"
d="m 174.68621,264.1767 -17.22369,17.22361"
id="path642-3" /><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
id="path1314"
sodipodi:type="arc"
sodipodi:cx="142.29521"
sodipodi:cy="292.68314"
sodipodi:rx="41.997044"
sodipodi:ry="32.843685"
sodipodi:start="4.0142573"
sodipodi:end="5.4105207"
sodipodi:arc-type="arc"
d="m 115.30003,267.52341 a 41.997044,32.843685 0 0 1 53.99036,0"
sodipodi:open="true" /></g><path
style="fill:#4d4d4d;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 166.29184,169.93124 v 13.75269 l -15.65249,17.50579 v 83.99925 l -8.34584,7.28886 -8.34591,-7.28886 v -83.99952 l -15.64914,-17.50552 v -13.75269"
id="path455"
sodipodi:nodetypes="ccccccccc" /><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 102.67787,150.9342 39.61728,-0.003 v 8.7527"
id="path476"
@@ -79,9 +106,6 @@
d="m 142.29522,298.18949 v 22.5055 h 47.99338"
id="path586"
sodipodi:nodetypes="ccc" /><path
style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:2, 8.00001;stroke-dashoffset:0;stop-color:#000000"
d="m 121.38449,170.43657 h 44.21334"
id="path786" /><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 118.29846,167.39454 v -7.71062 h 47.99338 v 7.71062"
id="path506"
@@ -94,35 +118,8 @@
d="m 107.67787,182.92435 h 5.04433"
id="path1853"
sodipodi:nodetypes="cc" /><path
style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 167.30866,170.2807 -0.0238,13.40323 -16.64551,17.50579 v 83.99925 l -8.34584,7.28886 -8.34591,-7.28886 v -83.99952 l -16.69179,-17.50552 v -12.45835"
id="path455"
sodipodi:nodetypes="ccccccccc" /><path
style="fill:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:2, 8.00001;stroke-dashoffset:0;stop-color:#000000"
d="m 125.63827,142.69499 v 180"
id="path4446" /><g
id="g1399"><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 114.8787,268.17673 -7.20083,39.51826 h -5"
id="path472"
sodipodi:nodetypes="ccc" /><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stop-color:#000000;stroke-dasharray:none"
d="m 111.18088,264.17674 17.22369,17.22361"
id="path642" /><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stop-color:#000000;stroke-dasharray:none"
d="m 174.68621,264.1767 -17.22369,17.22361"
id="path642-3" /><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
id="path1314"
sodipodi:type="arc"
sodipodi:cx="142.29521"
sodipodi:cy="292.68314"
sodipodi:rx="41.997044"
sodipodi:ry="32.843685"
sodipodi:start="4.0142573"
sodipodi:end="5.4105207"
sodipodi:arc-type="arc"
d="m 115.30003,267.52341 a 41.997044,32.843685 0 0 1 53.99036,0"
sodipodi:open="true" /></g></g></g><metadata
id="path4446" /></g></g><metadata
id="metadata1382"><rdf:RDF><cc:Work
rdf:about=""><dc:creator><cc:Agent><dc:title>Alfredo Monclus</dc:title></cc:Agent></dc:creator><dc:rights><cc:Agent><dc:title>FreeCAD LGPL2+</dc:title></cc:Agent></dc:rights><dc:publisher><cc:Agent><dc:title>FreeCAD</dc:title></cc:Agent></dc:publisher></cc:Work></rdf:RDF></metadata></svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.9 KiB

After

Width:  |  Height:  |  Size: 6.7 KiB

129
src/Mod/PartDesign/Gui/Resources/images/hole_counterdrill_angled_included.svg Normal file
View File

@@ -0,0 +1,129 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
width="90"
height="180"
viewBox="0 0 90 180"
version="1.1"
id="svg5"
xml:space="preserve"
inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
sodipodi:docname="hole_counterdrill_angled_included.svg"
inkscape:export-filename="hole_counterbore.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:dc="http://purl.org/dc/elements/1.1/"><sodipodi:namedview
id="namedview7"
pagecolor="#2d2d2d"
bordercolor="#000000"
borderopacity="0.25"
inkscape:showpageshadow="2"
inkscape:pageopacity="1"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
inkscape:document-units="px"
showgrid="false"
inkscape:zoom="13.787868"
inkscape:cx="22.519798"
inkscape:cy="134.86494"
inkscape:window-width="1600"
inkscape:window-height="824"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="g1241"
showguides="true"><sodipodi:guide
position="-4.1420245,94.999913"
orientation="1,0"
id="guide1501"
inkscape:locked="false" /><sodipodi:guide
position="100.89495,80.036612"
orientation="1,0"
id="guide1530"
inkscape:locked="false" /><sodipodi:guide
position="40.615636,30.21716"
orientation="0,-1"
id="guide874"
inkscape:locked="false" /></sodipodi:namedview><defs
id="defs2" /><g
inkscape:label="Capa 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-101.48917,-143.06709)"><g
id="g1241"
transform="translate(-0.18870399,0.37210001)"><g
id="g1399"><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 114.8787,268.17673 -7.20083,39.51826 h -5"
id="path472"
sodipodi:nodetypes="ccc" /><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stop-color:#000000;stroke-dasharray:none"
d="m 111.18088,264.17674 17.22369,17.22361"
id="path642" /><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stop-color:#000000;stroke-dasharray:none"
d="m 174.68621,264.1767 -17.22369,17.22361"
id="path642-3" /><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
id="path1314"
sodipodi:type="arc"
sodipodi:cx="142.29521"
sodipodi:cy="292.68314"
sodipodi:rx="41.997044"
sodipodi:ry="32.843685"
sodipodi:start="4.0142573"
sodipodi:end="5.4105207"
sodipodi:arc-type="arc"
d="m 115.30003,267.52341 a 41.997044,32.843685 0 0 1 53.99036,0"
sodipodi:open="true" /></g><path
style="fill:#4d4d4d;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 166.29184,169.93124 v 13.75269 l -15.65249,17.50579 v 83.99925 l -8.34584,7.28886 -8.34591,-7.28886 v -83.99952 l -15.64914,-17.50552 v -13.75269"
id="path455"
sodipodi:nodetypes="ccccccccc" /><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 102.67787,150.9342 39.61728,-0.003 v 8.7527"
id="path476"
sodipodi:nodetypes="ccc" /><path
id="path578"
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 107.67787,227.4368 h -5 m 10.04433,-57.50556 h -5.04433 v 12.99311 44.51245"
sodipodi:nodetypes="cccccc" /><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 157.52407,292.47734 27.9633,4.9e-4 0,-122.04115 h -3.8276"
id="path580"
sodipodi:nodetypes="cccc" /><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 186.30041,242.4001 h 3.98819"
id="path582"
sodipodi:nodetypes="cc" /><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 133.94707,291.68398 v 6.50551 h 16.6963 v -6.50551"
id="path584"
sodipodi:nodetypes="cccc" /><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 142.29522,298.18949 v 22.5055 h 47.99338"
id="path586"
sodipodi:nodetypes="ccc" /><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 118.29846,167.39454 v -7.71062 h 47.99338 v 7.71062"
id="path506"
sodipodi:nodetypes="cccc" /><path
style="font-variation-settings:normal;fill:none;fill-opacity:1;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
d="m 170.62493,179.6839 9.88143,-15.57868 h 9.78224"
id="path454"
sodipodi:nodetypes="ccc" /><path
style="font-variation-settings:normal;fill:none;fill-opacity:1;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
d="m 107.67787,182.92435 h 5.04433"
id="path1853"
sodipodi:nodetypes="cc" /><path
style="fill:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:2, 8.00001;stroke-dashoffset:0;stop-color:#000000"
d="m 125.63827,142.69499 v 180"
id="path4446" /></g></g><metadata
id="metadata1382"><rdf:RDF><cc:Work
rdf:about=""><dc:creator><cc:Agent><dc:title>Alfredo Monclus</dc:title></cc:Agent></dc:creator><dc:rights><cc:Agent><dc:title>FreeCAD LGPL2+</dc:title></cc:Agent></dc:rights><dc:publisher><cc:Agent><dc:title>FreeCAD</dc:title></cc:Agent></dc:publisher></cc:Work></rdf:RDF></metadata></svg>
Side by Side

After

Width:  |  Height:  |  Size: 6.8 KiB

21
src/Mod/PartDesign/Gui/Resources/images/hole_counterdrill_flat.svg
View File

@@ -21,18 +21,18 @@
xmlns:cc="http://creativecommons.org/ns#"
xmlns:dc="http://purl.org/dc/elements/1.1/"><sodipodi:namedview
id="namedview7"
pagecolor="#2f2f2f"
pagecolor="#2d2d2d"
bordercolor="#000000"
borderopacity="0.25"
inkscape:showpageshadow="2"
inkscape:pageopacity="0"
inkscape:pageopacity="1"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
inkscape:document-units="px"
showgrid="false"
inkscape:zoom="2.4373738"
inkscape:cx="10.256941"
inkscape:cy="78.363032"
inkscape:zoom="3.4469671"
inkscape:cx="57.151691"
inkscape:cy="78.764894"
inkscape:window-width="1600"
inkscape:window-height="824"
inkscape:window-x="0"
@@ -55,6 +55,10 @@
transform="translate(-101.48917,-143.06709)"><g
id="g1241"
transform="translate(-0.18870399,0.37210001)"><path
style="fill:#4d4d4d;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 166.29184,169.93124 v 13.75269 l -15.65249,17.50579 v 83.99925 H 133.9476 v -83.99952 l -15.64914,-17.50552 v -13.75269"
id="path455"
sodipodi:nodetypes="cccccccc" /><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 102.62606,150.9342 39.66909,-0.003 v 8.7527"
id="path476"
@@ -79,9 +83,6 @@
d="m 142.29522,298.18949 v 22.5055 h 47.99338"
id="path586"
sodipodi:nodetypes="ccc" /><path
style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:2, 8.00001;stroke-dashoffset:0;stop-color:#000000"
d="m 121.38449,170.43657 h 44.21334"
id="path786" /><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 118.29846,167.39454 v -7.71062 h 47.99338 v 7.71062"
id="path506"
@@ -94,10 +95,6 @@
d="m 107.67787,182.92435 h 5.04433"
id="path1853"
sodipodi:nodetypes="cc" /><path
style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 167.30866,170.2807 -0.0238,13.40323 -16.64551,17.50579 v 83.99925 H 133.9476 v -83.99952 l -16.69179,-17.50552 v -12.45835"
id="path455"
sodipodi:nodetypes="cccccccc" /><path
style="fill:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:2, 8.00001;stroke-dashoffset:0;stop-color:#000000"
d="m 125.63827,142.69499 v 180"
id="path4446" /></g></g><metadata
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.6 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

23
src/Mod/PartDesign/Gui/Resources/images/hole_countersink_angled.svg
View File

@@ -21,18 +21,18 @@
xmlns:cc="http://creativecommons.org/ns#"
xmlns:dc="http://purl.org/dc/elements/1.1/"><sodipodi:namedview
id="namedview7"
pagecolor="#2f2f2f"
pagecolor="#2d2d2d"
bordercolor="#000000"
borderopacity="0.25"
inkscape:showpageshadow="2"
inkscape:pageopacity="0"
inkscape:pageopacity="1"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
inkscape:document-units="px"
showgrid="false"
inkscape:zoom="3.4469671"
inkscape:cx="46.997838"
inkscape:cy="71.076977"
inkscape:cx="53.815425"
inkscape:cy="108.93635"
inkscape:window-width="1600"
inkscape:window-height="824"
inkscape:window-x="0"
@@ -87,22 +87,15 @@
d="m 142.29522,298.18949 v 22.5055 h 47.99338"
id="path586"
sodipodi:nodetypes="ccc" /><path
style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:2, 8.00001;stroke-dashoffset:0;stop-color:#000000"
d="m 121.38449,170.43657 h 44.21334"
id="path786" /><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 118.29846,167.39454 v -7.71062 h 47.99338 v 7.71062"
id="path506"
sodipodi:nodetypes="cccc" /><path
style="font-variation-settings:normal;fill:none;fill-opacity:1;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
d="m 169.33578,167.3723 1.73873,-3.26708 h 19.21409"
id="path454"
sodipodi:nodetypes="ccc" /><path
style="font-variation-settings:normal;fill:none;fill-opacity:1;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
d="m 107.67787,187.98608 h 5.044"
id="path1853"
sodipodi:nodetypes="cc" /><path
style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
style="fill:#4d4d4d;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 167.28486,171.22599 -16.64551,16.76082 v 97.20216 l -8.34584,7.84827 -8.34591,-7.84827 v -97.20289 l -16.69179,-16.76009"
id="path455"
sodipodi:nodetypes="ccccccc" /><path
@@ -132,6 +125,10 @@
sodipodi:end="5.4105207"
sodipodi:arc-type="arc"
d="m 115.30003,267.52341 a 41.997044,32.843685 0 0 1 53.99036,0"
sodipodi:open="true" /></g></g></g><metadata
sodipodi:open="true" /></g><path
style="font-variation-settings:normal;fill:none;fill-opacity:1;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
d="m 171.15735,167.3723 3.28302,-3.26708 h 15.84823"
id="path454-6"
sodipodi:nodetypes="ccc" /></g></g><metadata
id="metadata1354"><rdf:RDF><cc:Work
rdf:about=""><dc:creator><cc:Agent><dc:title>Alfredo Monclus</dc:title></cc:Agent></dc:creator><dc:rights><cc:Agent><dc:title>FreeCAD LGPL2+</dc:title></cc:Agent></dc:rights><dc:publisher><cc:Agent><dc:title>FreeCAD</dc:title></cc:Agent></dc:publisher></cc:Work></rdf:RDF></metadata></svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.2 KiB

After

Width:  |  Height:  |  Size: 7.0 KiB

138
src/Mod/PartDesign/Gui/Resources/images/hole_countersink_angled_included.svg Normal file
View File

@@ -0,0 +1,138 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
width="90"
height="180"
viewBox="0 0 90 180"
version="1.1"
id="svg5"
xml:space="preserve"
inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
sodipodi:docname="hole_countersink_angled_included.svg"
inkscape:export-filename="hole_counterbore.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:dc="http://purl.org/dc/elements/1.1/"><sodipodi:namedview
id="namedview7"
pagecolor="#2d2d2d"
bordercolor="#000000"
borderopacity="0.25"
inkscape:showpageshadow="2"
inkscape:pageopacity="1"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
inkscape:document-units="px"
showgrid="false"
inkscape:zoom="2.4373738"
inkscape:cx="40.412349"
inkscape:cy="81.440114"
inkscape:window-width="1600"
inkscape:window-height="824"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="g1241"
showguides="true"><sodipodi:guide
position="-4.1420245,94.999913"
orientation="1,0"
id="guide1501"
inkscape:locked="false" /><sodipodi:guide
position="100.89495,80.036612"
orientation="1,0"
id="guide1530"
inkscape:locked="false" /><sodipodi:guide
position="64.613966,155.30045"
orientation="0,-1"
id="guide7482"
inkscape:locked="false" /><sodipodi:guide
position="32.269726,134.70891"
orientation="0,-1"
id="guide466"
inkscape:locked="false" /><sodipodi:guide
position="40.615636,29.65775"
orientation="0,-1"
id="guide676"
inkscape:locked="false" /></sodipodi:namedview><defs
id="defs2" /><g
inkscape:label="Capa 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-101.48917,-143.06709)"><g
id="g1241"
transform="translate(-0.18870399,0.37210001)"><g
id="g1399"
transform="translate(3.99e-6,6.3499137e-5)"><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 114.8787,268.17673 -7.20083,39.51826 h -5"
id="path472"
sodipodi:nodetypes="ccc" /><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 111.18088,264.17674 17.22369,17.22361"
id="path642" /><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 174.68621,264.1767 -17.22369,17.22361"
id="path642-3" /><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
id="path1314"
sodipodi:type="arc"
sodipodi:cx="142.29521"
sodipodi:cy="292.68314"
sodipodi:rx="41.997044"
sodipodi:ry="32.843685"
sodipodi:start="4.0142573"
sodipodi:end="5.4105207"
sodipodi:arc-type="arc"
d="m 115.30003,267.52341 a 41.997044,32.843685 0 0 1 53.99036,0"
sodipodi:open="true" /></g><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 102.62606,150.9342 39.66909,-0.003 v 8.7527"
id="path476"
sodipodi:nodetypes="ccc" /><path
id="path578"
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 107.67787,227.4368 h -5.05181 m 10.09581,-57.50556 h -5.044 v 12.99311 44.51245"
sodipodi:nodetypes="cccccc" /><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 157.52407,293.03724 27.9633,4.9e-4 0,-122.60105 h -3.8276"
id="path580"
sodipodi:nodetypes="cccc" /><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 186.30041,242.4001 h 3.98819"
id="path582"
sodipodi:nodetypes="cc" /><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 133.94707,291.68398 v 6.50551 h 16.6963 v -6.50551"
id="path584"
sodipodi:nodetypes="cccc" /><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 142.29522,298.18949 v 22.5055 h 47.99338"
id="path586"
sodipodi:nodetypes="ccc" /><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 118.29846,167.39454 v -7.71062 h 47.99338 v 7.71062"
id="path506"
sodipodi:nodetypes="cccc" /><path
style="font-variation-settings:normal;fill:none;fill-opacity:1;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
d="m 107.67787,187.98608 h 5.044"
id="path1853"
sodipodi:nodetypes="cc" /><path
style="fill:#4d4d4d;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 167.28486,171.22599 -16.64551,16.76082 v 97.20216 l -8.34584,7.84827 -8.34591,-7.84827 v -97.20289 l -16.69179,-16.76009"
id="path455"
sodipodi:nodetypes="ccccccc" /><path
style="fill:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:2, 8.00001;stroke-dashoffset:0;stop-color:#000000"
d="m 125.63827,142.69499 v 180"
id="path4446" /><path
style="font-variation-settings:normal;fill:none;fill-opacity:1;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
d="m 171.15735,167.3723 3.28302,-3.26708 h 15.84823"
id="path454-3"
sodipodi:nodetypes="ccc" /></g></g><metadata
id="metadata1354"><rdf:RDF><cc:Work
rdf:about=""><dc:creator><cc:Agent><dc:title>Alfredo Monclus</dc:title></cc:Agent></dc:creator><dc:rights><cc:Agent><dc:title>FreeCAD LGPL2+</dc:title></cc:Agent></dc:rights><dc:publisher><cc:Agent><dc:title>FreeCAD</dc:title></cc:Agent></dc:publisher></cc:Work></rdf:RDF></metadata></svg>
Side by Side

After

Width:  |  Height:  |  Size: 7.1 KiB

29
src/Mod/PartDesign/Gui/Resources/images/hole_countersink_flat.svg
View File

@@ -21,18 +21,18 @@
xmlns:cc="http://creativecommons.org/ns#"
xmlns:dc="http://purl.org/dc/elements/1.1/"><sodipodi:namedview
id="namedview7"
pagecolor="#2f2f2f"
pagecolor="#2d2d2d"
bordercolor="#000000"
borderopacity="0.25"
inkscape:showpageshadow="2"
inkscape:pageopacity="0"
inkscape:pageopacity="1"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
inkscape:document-units="px"
showgrid="false"
inkscape:zoom="3.3777778"
inkscape:cx="45"
inkscape:cy="90"
inkscape:cx="34.194079"
inkscape:cy="86.595394"
inkscape:window-width="1600"
inkscape:window-height="824"
inkscape:window-x="0"
@@ -63,6 +63,13 @@
transform="translate(-101.48917,-143.06709)"><g
id="g1241"
transform="translate(-0.18870399,0.37210001)"><path
style="fill:#4d4d4d;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 167.28486,171.22599 -16.64551,16.76082 v 97.20218 H 133.9476 v -97.20291 l -16.69179,-16.76009"
id="path455"
sodipodi:nodetypes="cccccc" /><path
style="fill:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:2, 8.00001;stroke-dashoffset:0;stop-color:#000000"
d="m 125.63827,142.69499 v 180"
id="path4446" /><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 102.62606,150.9342 39.66909,-0.003 v 8.7527"
id="path476"
@@ -87,27 +94,17 @@
d="m 142.29522,298.18949 v 22.5055 h 47.99338"
id="path586"
sodipodi:nodetypes="ccc" /><path
style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:2, 8.00001;stroke-dashoffset:0;stop-color:#000000"
d="m 121.38449,170.43657 h 44.21334"
id="path786" /><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 118.29846,167.39454 v -7.71062 h 47.99338 v 7.71062"
id="path506"
sodipodi:nodetypes="cccc" /><path
style="font-variation-settings:normal;fill:none;fill-opacity:1;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
d="m 169.33578,167.3723 1.73873,-3.26708 h 19.21409"
d="m 171.15735,167.3723 3.28302,-3.26708 h 15.84823"
id="path454"
sodipodi:nodetypes="ccc" /><path
style="font-variation-settings:normal;fill:none;fill-opacity:1;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;stop-color:#000000"
d="m 107.67787,187.98608 h 5.044"
id="path1853"
sodipodi:nodetypes="cc" /><path
style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 167.28486,171.22599 -16.64551,16.76082 v 97.20218 H 133.9476 v -97.20291 l -16.69179,-16.76009"
id="path455"
sodipodi:nodetypes="cccccc" /><path
style="fill:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:2, 8.00001;stroke-dashoffset:0;stop-color:#000000"
d="m 125.63827,142.69499 v 180"
id="path4446" /></g></g><metadata
sodipodi:nodetypes="cc" /></g></g><metadata
id="metadata1354"><rdf:RDF><cc:Work
rdf:about=""><dc:creator><cc:Agent><dc:title>Alfredo Monclus</dc:title></cc:Agent></dc:creator><dc:rights><cc:Agent><dc:title>FreeCAD LGPL2+</dc:title></cc:Agent></dc:rights><dc:publisher><cc:Agent><dc:title>FreeCAD</dc:title></cc:Agent></dc:publisher></cc:Work></rdf:RDF></metadata></svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.8 KiB

After

Width:  |  Height:  |  Size: 5.6 KiB

60
src/Mod/PartDesign/Gui/Resources/images/hole_none_angled.svg
View File

@@ -21,18 +21,18 @@
xmlns:cc="http://creativecommons.org/ns#"
xmlns:dc="http://purl.org/dc/elements/1.1/"><sodipodi:namedview
id="namedview7"
pagecolor="#2f2f2f"
pagecolor="#2d2d2d"
bordercolor="#000000"
borderopacity="0.25"
inkscape:showpageshadow="2"
inkscape:pageopacity="0"
inkscape:pageopacity="1"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
inkscape:document-units="px"
showgrid="false"
inkscape:zoom="3.4469671"
inkscape:cx="-1.8857157"
inkscape:cy="25.8198"
inkscape:zoom="4.8747476"
inkscape:cx="21.437007"
inkscape:cy="68.003521"
inkscape:window-width="1600"
inkscape:window-height="824"
inkscape:window-x="0"
@@ -54,30 +54,7 @@
id="layer1"
transform="translate(-101.48916,-210.06711)"><g
id="g1241"
transform="translate(-0.18870399,0.37210001)"><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 157.52407,285.18897 27.9633,4.9e-4 v -73.99945 h -27.9633"
id="path580"
sodipodi:nodetypes="cccc" /><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 133.94707,291.68398 v 6.50551 h 16.6963 v -6.50551"
id="path584"
sodipodi:nodetypes="cccc" /><path
style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 150.63936,211.48814 v 73.70083 l -8.34584,7.84827 -8.34591,-7.84827 v -73.7011"
id="path455"
sodipodi:nodetypes="ccccc" /><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 185.48737,242.13966 h 3.99998"
id="path582-6"
sodipodi:nodetypes="cc" /><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 142.29522,298.18949 v 12.24722 h 48.46852"
id="path586-7"
sodipodi:nodetypes="ccc" /><path
style="fill:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stop-color:#000000"
d="M 101.67786,321.69505 V 209.69501"
id="path830" /><g
transform="translate(-0.18870399,0.37210001)"><g
id="g1399"
transform="translate(1.5e-5,6e-5)"><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
@@ -101,6 +78,29 @@
sodipodi:end="5.4105207"
sodipodi:arc-type="arc"
d="m 115.30003,267.52341 a 41.997044,32.843685 0 0 1 53.99036,0"
sodipodi:open="true" /></g></g></g><metadata
sodipodi:open="true" /></g><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 157.52407,285.18897 27.9633,4.9e-4 v -73.99945 h -27.9633"
id="path580"
sodipodi:nodetypes="cccc" /><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 133.94707,291.68398 v 6.50551 h 16.6963 v -6.50551"
id="path584"
sodipodi:nodetypes="cccc" /><path
style="fill:#4d4d4d;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 150.63936,211.19001 v 73.99896 l -8.34584,7.84827 -8.34591,-7.84827 v -73.99896"
id="path455"
sodipodi:nodetypes="ccccc" /><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 185.48737,242.13966 h 3.99998"
id="path582-6"
sodipodi:nodetypes="cc" /><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 142.29522,298.18949 v 12.24722 h 48.46852"
id="path586-7"
sodipodi:nodetypes="ccc" /><path
style="fill:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stop-color:#000000"
d="M 101.67786,321.69505 V 209.69501"
id="path830" /></g></g><metadata
id="metadata1310"><rdf:RDF><cc:Work
rdf:about=""><dc:creator><cc:Agent><dc:title>Alfredo Monclus</dc:title></cc:Agent></dc:creator><dc:rights><cc:Agent><dc:title>FreeCAD LGPL2+</dc:title></cc:Agent></dc:rights><dc:publisher><cc:Agent><dc:title>FreeCAD</dc:title></cc:Agent></dc:publisher></cc:Work></rdf:RDF></metadata></svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.1 KiB

After

Width:  |  Height:  |  Size: 5.1 KiB

110
src/Mod/PartDesign/Gui/Resources/images/hole_none_angled_included.svg Normal file
View File

@@ -0,0 +1,110 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
width="90.034058"
height="112.00004"
viewBox="0 0 90.034058 112.00004"
version="1.1"
id="svg5"
xml:space="preserve"
inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
sodipodi:docname="hole_none_angled_included.svg"
inkscape:export-filename="hole_counterbore.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:dc="http://purl.org/dc/elements/1.1/"><sodipodi:namedview
id="namedview7"
pagecolor="#2d2d2d"
bordercolor="#000000"
borderopacity="0.25"
inkscape:showpageshadow="2"
inkscape:pageopacity="1"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
inkscape:document-units="px"
showgrid="false"
inkscape:zoom="3.4469671"
inkscape:cx="15.520891"
inkscape:cy="46.562672"
inkscape:window-width="1600"
inkscape:window-height="824"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="g1241"
showguides="true"><sodipodi:guide
position="-4.1420233,93.999969"
orientation="1,0"
id="guide1501"
inkscape:locked="false" /><sodipodi:guide
position="100.89496,79.036667"
orientation="1,0"
id="guide1530"
inkscape:locked="false" /><sodipodi:guide
position="40.615656,28.657809"
orientation="0,-1"
id="guide918"
inkscape:locked="false" /></sodipodi:namedview><defs
id="defs2" /><g
inkscape:label="Capa 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-101.48916,-210.06711)"><g
id="g1241"
transform="translate(-0.18870399,0.37210001)"><g
id="g1399"
transform="translate(1.5e-5,6e-5)"><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 114.8787,268.17673 -7.20083,39.51826 h -5"
id="path472"
sodipodi:nodetypes="ccc" /><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 111.18088,264.17674 17.22369,17.22361"
id="path642" /><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 174.68621,264.1767 -17.22369,17.22361"
id="path642-3" /><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
id="path1314"
sodipodi:type="arc"
sodipodi:cx="142.29521"
sodipodi:cy="292.68314"
sodipodi:rx="41.997044"
sodipodi:ry="32.843685"
sodipodi:start="4.0142573"
sodipodi:end="5.4105207"
sodipodi:arc-type="arc"
d="m 115.30003,267.52341 a 41.997044,32.843685 0 0 1 53.99036,0"
sodipodi:open="true" /></g><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 157.52407,293.03724 27.9633,4.9e-4 v -81.84772 h -27.9633"
id="path580"
sodipodi:nodetypes="cccc" /><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 133.94707,291.68398 v 6.50551 h 16.6963 v -6.50551"
id="path584"
sodipodi:nodetypes="cccc" /><path
style="fill:#4d4d4d;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 150.63936,211.19001 v 73.99896 l -8.34584,7.84827 -8.34591,-7.84827 v -73.99896"
id="path455"
sodipodi:nodetypes="ccccc" /><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 185.48737,242.13966 h 3.99998"
id="path582-6"
sodipodi:nodetypes="cc" /><path
style="fill:none;stroke:#999999;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 142.29522,298.18949 v 12.24722 h 48.46852"
id="path586-7"
sodipodi:nodetypes="ccc" /><path
style="fill:#000000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stop-color:#000000"
d="M 101.67786,321.69505 V 209.69501"
id="path830" /></g></g><metadata
id="metadata1310"><rdf:RDF><cc:Work
rdf:about=""><dc:creator><cc:Agent><dc:title>Alfredo Monclus</dc:title></cc:Agent></dc:creator><dc:rights><cc:Agent><dc:title>FreeCAD LGPL2+</dc:title></cc:Agent></dc:rights><dc:publisher><cc:Agent><dc:title>FreeCAD</dc:title></cc:Agent></dc:publisher></cc:Work></rdf:RDF></metadata></svg>
Side by Side

After

Width:  |  Height:  |  Size: 5.3 KiB

10
src/Mod/PartDesign/Gui/Resources/images/hole_none_flat.svg
View File

@@ -21,18 +21,18 @@
xmlns:cc="http://creativecommons.org/ns#"
xmlns:dc="http://purl.org/dc/elements/1.1/"><sodipodi:namedview
id="namedview7"
pagecolor="#2f2f2f"
pagecolor="#2d2d2d"
bordercolor="#000000"
borderopacity="0.25"
inkscape:showpageshadow="2"
inkscape:pageopacity="0"
inkscape:pageopacity="1"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
inkscape:document-units="px"
showgrid="false"
inkscape:zoom="3.4469671"
inkscape:cx="-36.408819"
inkscape:cy="55.120921"
inkscape:cx="-50.769269"
inkscape:cy="46.997838"
inkscape:window-width="1600"
inkscape:window-height="824"
inkscape:window-x="0"
@@ -63,7 +63,7 @@
d="m 133.94707,291.68398 v 6.50551 h 16.6963 v -6.50551"
id="path584"
sodipodi:nodetypes="cccc" /><path
style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
style="fill:#4d4d4d;stroke:#ffffff;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-dasharray:none;stop-color:#000000"
d="m 150.63936,211.48814 v 73.70083 h -16.69175 v -73.7011"
id="path455"
sodipodi:nodetypes="cccc" /><path
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

144
src/Mod/PartDesign/Gui/TaskHoleParameters.cpp
View File

@@ -122,14 +122,6 @@ TaskHoleParameters::TaskHoleParameters(ViewProviderHole* HoleView, QWidget* pare
}
ui->HoleCutType->setCurrentIndex(pcHole->HoleCutType.getValue());
bool isNotCut = pcHole->HoleCutType.getValue() == 0L;
ui->labelHoleCutDiameter->setHidden(isNotCut);
ui->labelHoleCutDepth->setHidden(isNotCut);
ui->labelHoleCutCountersinkAngle->setHidden(isNotCut);
ui->HoleCutDiameter->setHidden(isNotCut);
ui->HoleCutDepth->setHidden(isNotCut);
ui->HoleCutCountersinkAngle->setHidden(isNotCut);
ui->HoleCutCustomValues->setChecked(pcHole->HoleCutCustomValues.getValue());
ui->HoleCutCustomValues->setHidden(
pcHole->HoleCutType.getValue() < 5
@@ -191,7 +183,7 @@ TaskHoleParameters::TaskHoleParameters(ViewProviderHole* HoleView, QWidget* pare
std::string(pcHole->ThreadDepthType.getValueAsString()) == "Dimension"
);
setCutPixmap();
setCutDiagram();
// clang-format off
connect(ui->Threaded, &QCheckBox::clicked,
@@ -334,7 +326,7 @@ void TaskHoleParameters::threadDepthChanged(double value)
{
if (auto hole = getObject<PartDesign::Hole>()) {
hole->ThreadDepth.setValue(value);
setCutPixmap();
setCutDiagram();
recomputeFeature();
}
}
@@ -398,57 +390,28 @@ void TaskHoleParameters::holeCutTypeChanged(int index)
// the type is a countersink and thus if HoleCutCountersinkAngle can be enabled
std::string HoleCutTypeString = hole->HoleCutType.getValueAsString();
bool isNotCut = HoleCutTypeString == "None";
ui->labelHoleCutDiameter->setHidden(isNotCut);
ui->labelHoleCutDepth->setHidden(isNotCut);
ui->labelHoleCutCountersinkAngle->setHidden(isNotCut);
ui->HoleCutDiameter->setHidden(isNotCut);
ui->HoleCutDepth->setHidden(isNotCut);
ui->HoleCutCountersinkAngle->setHidden(isNotCut);
if (HoleCutTypeString == "None" || HoleCutTypeString == "Counterbore"
|| HoleCutTypeString == "Countersink" || HoleCutTypeString == "Counterdrill") {
if (
HoleCutTypeString == "None"
|| HoleCutTypeString == "Counterbore"
|| HoleCutTypeString == "Countersink"
|| HoleCutTypeString == "Counterdrill"
) {
ui->HoleCutCustomValues->setVisible(false);
if (HoleCutTypeString == "None") {
ui->HoleCutDiameter->setEnabled(false);
ui->HoleCutDepth->setEnabled(false);
ui->labelHoleCutCountersinkAngle->setVisible(false);
ui->HoleCutCountersinkAngle->setVisible(false);
}
if (HoleCutTypeString == "Counterbore") {
ui->labelHoleCutCountersinkAngle->setVisible(false);
ui->HoleCutCountersinkAngle->setVisible(false);
}
if (HoleCutTypeString == "Countersink") {
ui->labelHoleCutCountersinkAngle->setVisible(true);
ui->HoleCutCountersinkAngle->setVisible(true);
}
}
else { // screw definition
// we can have the case that we have no normed values
// in this case HoleCutCustomValues is read-only AND true
if (ui->HoleCutCustomValues->isChecked()) {
ui->HoleCutDiameter->setEnabled(true);
ui->HoleCutDepth->setEnabled(true);
if (!hole->HoleCutCountersinkAngle.isReadOnly()) {
ui->HoleCutCountersinkAngle->setVisible(true);
ui->labelHoleCutCountersinkAngle->setVisible(true);
ui->HoleCutCountersinkAngle->setEnabled(true);
}
}
else {
ui->HoleCutCustomValues->setVisible(true);
ui->HoleCutDiameter->setEnabled(false);
ui->HoleCutDepth->setEnabled(false);
ui->HoleCutCountersinkAngle->setEnabled(false);
ui->labelHoleCutCountersinkAngle->setVisible(true);
ui->HoleCutCountersinkAngle->setVisible(true);
}
bool isCustom = ui->HoleCutCustomValues->isChecked();
ui->HoleCutDiameter->setEnabled(isCustom);
ui->HoleCutDepth->setEnabled(isCustom);
ui->HoleCutCountersinkAngle->setEnabled(
isCustom && !hole->HoleCutCountersinkAngle.isReadOnly()
);
}
setCutPixmap();
setCutDiagram();
}
void TaskHoleParameters::setCutPixmap()
void TaskHoleParameters::setCutDiagram()
{
auto hole = getObject<PartDesign::Hole>();
const std::string holeCutTypeString = hole->HoleCutType.getValueAsString();
@@ -465,54 +428,46 @@ void TaskHoleParameters::setCutPixmap()
holeCutTypeString == "Counterbore"
|| hole->isDynamicCounterbore(threadTypeString, holeCutTypeString)
);
bool isCounterdrill = (
holeCutTypeString == "Counterdrill"
);
bool isCounterdrill = (holeCutTypeString == "Counterdrill");
bool includeAngle = hole->DrillForDepth.getValue();
bool isNotCut = holeCutTypeString == "None";
ui->labelHoleCutDiameter->setHidden(isNotCut);
ui->labelHoleCutDepth->setHidden(isNotCut);
ui->HoleCutDiameter->setHidden(isNotCut);
ui->HoleCutDepth->setHidden(isNotCut);
std::string baseFileName;
if (isCounterbore) {
if (isAngled) {
ui->cutDiagram->setPixmap(
QPixmap(QString::fromUtf8(":/images/hole_counterbore_angled.svg"))
);
} else {
ui->cutDiagram->setPixmap(
QPixmap(QString::fromUtf8(":/images/hole_counterbore_flat.svg"))
);
}
baseFileName = "hole_counterbore";
ui->HoleCutCountersinkAngle->setVisible(false);
ui->labelHoleCutCountersinkAngle->setVisible(false);
}
else if (isCountersink) {
if (isAngled) {
ui->cutDiagram->setPixmap(
QPixmap(QString::fromUtf8(":/images/hole_countersink_angled.svg"))
);
} else {
ui->cutDiagram->setPixmap(
QPixmap(QString::fromUtf8(":/images/hole_countersink_flat.svg"))
);
}
baseFileName = "hole_countersink";
ui->HoleCutCountersinkAngle->setVisible(true);
ui->labelHoleCutCountersinkAngle->setVisible(true);
}
else if (isCounterdrill) {
if (isAngled) {
ui->cutDiagram->setPixmap(
QPixmap(QString::fromUtf8(":/images/hole_counterdrill_angled.svg"))
);
} else {
ui->cutDiagram->setPixmap(
QPixmap(QString::fromUtf8(":/images/hole_counterdrill_flat.svg"))
);
}
baseFileName = "hole_counterdrill";
ui->HoleCutCountersinkAngle->setVisible(true);
ui->labelHoleCutCountersinkAngle->setVisible(true);
}
else {
if (isAngled) {
ui->cutDiagram->setPixmap(
QPixmap(QString::fromUtf8(":/images/hole_none_angled.svg"))
);
} else {
ui->cutDiagram->setPixmap(
QPixmap(QString::fromUtf8(":/images/hole_none_flat.svg"))
);
}
baseFileName = "hole_none";
ui->HoleCutCountersinkAngle->setVisible(false);
ui->labelHoleCutCountersinkAngle->setVisible(false);
}
if (isAngled) {
baseFileName += includeAngle ? "_angled_included" : "_angled";
} else {
baseFileName += "_flat";
}
ui->cutDiagram->setPixmap(
QPixmap(QString::fromUtf8((":images/" + baseFileName + ".svg").c_str()))
);
}
void TaskHoleParameters::holeCutCustomValuesChanged()
@@ -599,7 +554,7 @@ void TaskHoleParameters::depthChanged(int index)
ui->DrillPointAngled->setEnabled(DepthisDimension);
ui->DrillPointAngle->setEnabled(DepthisDimension);
ui->DrillForDepth->setEnabled(DepthisDimension);
setCutPixmap();
setCutDiagram();
}
void TaskHoleParameters::depthValueChanged(double value)
@@ -617,7 +572,7 @@ void TaskHoleParameters::drillPointChanged()
hole->DrillPoint.setValue(angled);
ui->DrillPointAngle->setEnabled(angled);
ui->DrillForDepth->setEnabled(angled);
setCutPixmap();
setCutDiagram();
recomputeFeature();
}
}
@@ -636,6 +591,7 @@ void TaskHoleParameters::drillForDepthChanged()
hole->DrillForDepth.setValue(ui->DrillForDepth->isChecked());
recomputeFeature();
}
setCutDiagram();
}
void TaskHoleParameters::taperedChanged()

2
src/Mod/PartDesign/Gui/TaskHoleParameters.h
View File

@@ -108,7 +108,7 @@ private Q_SLOTS:
void updateViewChanged(bool isChecked);
void threadDepthTypeChanged(int index);
void threadDepthChanged(double value);
void setCutPixmap();
void setCutDiagram();
private:
class Observer : public App::DocumentObserver {