CAM: Remove hardcoded style for Tool Number, Fix TestPathToolBitSerializer
Fix issue with toolshapes Renamed fillet to radius Added Tool Type Filter to library Fix units so that they honor user preference Remove the QToolBox widget from the Shape Selector page and combine into a single page. Fix issue with PropertyBag so that CustomPropertyGroups as a string is converted to enum and enums are handled correctly. Update TestPathPropertyBag test for enum changes. Update TestPathToolBitListWidget Update TestPathToolLibrarySerializer to match new LinuxCNC output Fix LinuxCNC export too handle ALL tool types, use user preferences for units, and include all lcnc fields
This commit is contained in:
Billy
Binary file not shown.
BIN
src/Mod/CAM/Tools/Shape/radius.fcstd
Normal file
BIN
src/Mod/CAM/Tools/Shape/radius.fcstd
Normal file
Binary file not shown.
@@ -5,9 +5,9 @@
|
||||
viewBox="0 0 210 297"
|
||||
height="297mm"
|
||||
width="210mm"
|
||||
sodipodi:docname="fillet.svg"
|
||||
sodipodi:docname="radius.svg"
|
||||
xml:space="preserve"
|
||||
inkscape:version="1.4.2 (ebf0e940d0, 2025-05-08)"
|
||||
inkscape:version="1.3.2 (091e20e, 2023-11-25)"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:xlink="http://www.w3.org/1999/xlink"
|
||||
@@ -26,13 +26,13 @@
|
||||
inkscape:deskcolor="#d1d1d1"
|
||||
inkscape:document-units="mm"
|
||||
showgrid="false"
|
||||
inkscape:zoom="0.50398562"
|
||||
inkscape:cx="712.32191"
|
||||
inkscape:cy="915.70073"
|
||||
inkscape:window-width="2311"
|
||||
inkscape:window-height="1509"
|
||||
inkscape:window-x="1529"
|
||||
inkscape:window-y="377"
|
||||
inkscape:zoom="0.41628253"
|
||||
inkscape:cx="136.92624"
|
||||
inkscape:cy="599.35256"
|
||||
inkscape:window-width="1512"
|
||||
inkscape:window-height="916"
|
||||
inkscape:window-x="0"
|
||||
inkscape:window-y="38"
|
||||
inkscape:window-maximized="0"
|
||||
inkscape:current-layer="svg8" /><defs
|
||||
id="defs2"><linearGradient
|
||||
@@ -97,7 +97,11 @@
|
||||
refY="0"
|
||||
refX="0"
|
||||
id="marker4584"
|
||||
style="overflow:visible"><path
|
||||
style="overflow:visible"
|
||||
viewBox="0 0 12.70584107 9.5264135"
|
||||
markerWidth="12.70584106"
|
||||
markerHeight="9.5264135"
|
||||
preserveAspectRatio="xMidYMid"><path
|
||||
id="path4582"
|
||||
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
|
||||
d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
|
||||
@@ -128,7 +132,11 @@
|
||||
id="marker3948"
|
||||
refX="0"
|
||||
refY="0"
|
||||
orient="auto"><path
|
||||
orient="auto"
|
||||
viewBox="0 0 12.70584107 9.5264135"
|
||||
markerWidth="12.70584107"
|
||||
markerHeight="9.5264135"
|
||||
preserveAspectRatio="xMidYMid"><path
|
||||
transform="matrix(1.1,0,0,1.1,1.1,0)"
|
||||
d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
|
||||
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
|
||||
@@ -249,7 +257,11 @@
|
||||
refY="0"
|
||||
refX="0"
|
||||
id="marker4856"
|
||||
style="overflow:visible"><path
|
||||
style="overflow:visible"
|
||||
viewBox="0 0 17.77385393 10.15648796"
|
||||
markerWidth="17.77385393"
|
||||
markerHeight="10.15648796"
|
||||
preserveAspectRatio="xMidYMid"><path
|
||||
id="path4854"
|
||||
d="M 0,0 5,-5 -12.5,0 5,5 Z"
|
||||
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000003pt;stroke-opacity:1"
|
||||
@@ -329,7 +341,25 @@
|
||||
y1="117.03271"
|
||||
x2="136.77219"
|
||||
y2="117.03271"
|
||||
gradientUnits="userSpaceOnUse" /></defs><metadata
|
||||
gradientUnits="userSpaceOnUse" /><marker
|
||||
orient="auto"
|
||||
refY="0"
|
||||
refX="0"
|
||||
id="marker7593-1"
|
||||
style="overflow:visible"><path
|
||||
id="path7591-7"
|
||||
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
|
||||
d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
|
||||
transform="matrix(1.1,0,0,1.1,1.1,0)" /></marker><marker
|
||||
orient="auto"
|
||||
refY="0"
|
||||
refX="0"
|
||||
id="marker5072-2"
|
||||
style="overflow:visible"><path
|
||||
id="path5070-3"
|
||||
d="M 0,0 5,-5 -12.5,0 5,5 Z"
|
||||
style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1"
|
||||
transform="matrix(-0.8,0,0,-0.8,-10,0)" /></marker></defs><metadata
|
||||
id="metadata5"><rdf:RDF><cc:Work
|
||||
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><path
|
||||
@@ -362,7 +392,7 @@
|
||||
style="fill:none;stroke:#000000;stroke-width:0.743595;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
|
||||
id="path4542"
|
||||
d="M 77.321236,58.014043 H 133.53382"
|
||||
style="fill:none;stroke:#000000;stroke-width:0.682912;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker4186);marker-end:url(#marker4584)" /><path
|
||||
style="fill:none;stroke:#000000;stroke-width:0.65;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker4186);marker-end:url(#marker4584)" /><path
|
||||
id="path4548"
|
||||
d="M 41.274623,258.30918 H 166.88345"
|
||||
style="fill:none;stroke:#000000;stroke-width:0.721845;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker3948);marker-end:url(#marker4328)" /><text
|
||||
@@ -391,35 +421,46 @@
|
||||
id="path4538-8"
|
||||
d="M 38.74436,270.09124 V 164.05264"
|
||||
style="fill:none;stroke:#000000;stroke-width:0.743595;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
|
||||
id="path4538-8-9"
|
||||
d="m 93.265958,250.35549 0,-23.30956"
|
||||
style="fill:none;stroke:#000000;stroke-width:0.743595;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
sodipodi:nodetypes="cc" /><path
|
||||
id="path4538-8-9-3"
|
||||
d="M 114.22859,250.35549 V 227.04593"
|
||||
style="fill:none;stroke:#000000;stroke-width:0.743595;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
sodipodi:nodetypes="cc" /><path
|
||||
id="path4548-6"
|
||||
d="m 175.2226,160.40007 h 18.38097"
|
||||
style="fill:none;stroke:#000000;stroke-width:0.592962;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
|
||||
d="m 118.72725,223.34176 74.87632,0"
|
||||
style="fill:none;stroke:#000000;stroke-width:0.592962;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
sodipodi:nodetypes="cc" /><path
|
||||
id="path4548-6-8"
|
||||
d="m 132.26064,181.33547 39.1751,40.80318"
|
||||
style="fill:none;stroke:#000000;stroke-width:0.757536;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker4186)"
|
||||
d="m 132.26064,182.39381 39.1751,40.80318"
|
||||
style="fill:none;stroke:#000000;stroke-width:0.65;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker4186)"
|
||||
sodipodi:nodetypes="cc" /><path
|
||||
id="sesr3u8"
|
||||
d="M 184.26391,158.38661 V 136.96645"
|
||||
style="fill:none;stroke:#000000;stroke-width:0.66145833;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker7593);marker-end:url(#marker5072)" /><text
|
||||
d="m 184.26391,221.22509 0,-84.25864"
|
||||
style="fill:none;stroke:#000000;stroke-width:0.65;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker7593);marker-end:url(#marker4584)"
|
||||
sodipodi:nodetypes="cc" /><text
|
||||
transform="scale(0.97096033,1.0299082)"
|
||||
id="cutting_edge_height"
|
||||
y="123.2775"
|
||||
x="180.79047"
|
||||
y="180.48601"
|
||||
x="191.77032"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:28.2222px;line-height:1.25;font-family:'URW Bookman L';-inkscape-font-specification:'URW Bookman L, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.28362"
|
||||
xml:space="preserve"><tspan
|
||||
y="123.2775"
|
||||
x="180.79047"
|
||||
y="180.48601"
|
||||
x="191.77032"
|
||||
id="tspan7855"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:28.2222px;font-family:'URW Bookman L';-inkscape-font-specification:'URW Bookman L, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal">h</tspan></text><path
|
||||
id="path936"
|
||||
d="M 21.764217,82.083367 H 72.731009"
|
||||
style="fill:none;stroke:#000000;stroke-width:0.987384;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
|
||||
id="path938"
|
||||
d="m 19.64521,223.34176 h 83.99998"
|
||||
style="fill:none;stroke:#000000;stroke-width:0.757536;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><path
|
||||
d="m 21.764217,223.34176 66.827826,0"
|
||||
style="fill:none;stroke:#000000;stroke-width:0.757536;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
|
||||
sodipodi:nodetypes="cc" /><path
|
||||
id="path940"
|
||||
d="M 28.028504,219.65219 V 84.84232"
|
||||
style="fill:none;stroke:#000000;stroke-width:1.17078;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker7593);marker-end:url(#marker5072)" /><text
|
||||
style="fill:none;stroke:#000000;stroke-width:0.65;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker7593);marker-end:url(#marker4584)" /><text
|
||||
transform="scale(0.97096033,1.0299082)"
|
||||
id="length"
|
||||
y="153.26979"
|
||||
@@ -435,11 +476,25 @@
|
||||
style="fill:none;stroke:#000000;stroke-width:0.592962;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /><text
|
||||
transform="scale(0.97096033,1.0299082)"
|
||||
id="cutting_edge_height-7"
|
||||
y="217.33482"
|
||||
x="144.21545"
|
||||
y="195.87868"
|
||||
x="156.38969"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:28.2222px;line-height:1.25;font-family:'URW Bookman L';-inkscape-font-specification:'URW Bookman L, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.28362"
|
||||
xml:space="preserve"><tspan
|
||||
y="217.33482"
|
||||
x="144.21545"
|
||||
y="195.87868"
|
||||
x="156.38969"
|
||||
id="tspan7855-5"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:28.2222px;font-family:'URW Bookman L';-inkscape-font-specification:'URW Bookman L, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal">r</tspan></text></svg>
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:28.2222px;font-family:'URW Bookman L';-inkscape-font-specification:'URW Bookman L, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal">r</tspan></text><text
|
||||
transform="scale(0.97096033,1.0299082)"
|
||||
id="diameter-9"
|
||||
y="244.40749"
|
||||
x="70.96611"
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32.286px;line-height:1.25;font-family:'URW Bookman L';-inkscape-font-specification:'URW Bookman L, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:3.02681"
|
||||
xml:space="preserve"><tspan
|
||||
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:32.286px;font-family:'URW Bookman L';-inkscape-font-specification:'URW Bookman L, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:3.02681"
|
||||
y="244.40749"
|
||||
x="70.96611"
|
||||
id="tspan5690-9">d</tspan></text><path
|
||||
id="sesr3u8-6"
|
||||
d="m 112.39408,239.97586 -17.090908,0"
|
||||
style="fill:none;stroke:#000000;stroke-width:0.65;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-start:url(#marker3948);marker-end:url(#marker4584)"
|
||||
sodipodi:nodetypes="cc" /></svg>
|
||||
|
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 28 KiB |
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user