#279 fix milling icon.

This commit is contained in:
supermerill 2020-06-10 23:42:39 +02:00 committed by supermerill
parent 4bebe0b43a
commit 653aa22757
3 changed files with 120 additions and 0 deletions

117
resources/icons/milling.svg Normal file
View File

@ -0,0 +1,117 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
sodipodi:docname="milling.svg"
xml:space="preserve"
enable-background="new 0 0 16 16"
viewBox="0 0 16 16"
y="0px"
x="0px"
id="Layer_1"
version="1.0"><metadata
id="metadata20"><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><defs
id="defs18" /><sodipodi:namedview
inkscape:current-layer="Layer_1"
inkscape:window-maximized="1"
inkscape:window-y="-8"
inkscape:window-x="-8"
inkscape:cy="1.1875806"
inkscape:cx="22.500844"
inkscape:zoom="22.627417"
showgrid="false"
id="namedview16"
inkscape:window-height="1137"
inkscape:window-width="1920"
inkscape:pageshadow="2"
inkscape:pageopacity="0"
guidetolerance="10"
gridtolerance="10"
objecttolerance="10"
borderopacity="1"
bordercolor="#666666"
pagecolor="#ffffff" />
<path
sodipodi:nodetypes="ccccccc"
id="path52"
d="m 5.9812166,8.0405131 h 1.8614276 1.8614277 c 0,2.4527769 0,4.9055529 0,7.3583299 H 7.8426442 5.9812166 c 0,-2.452777 0,-4.905553 0,-7.3583299 z"
style="fill:#ed6b21;fill-opacity:1;stroke:none;stroke-width:0.0243276;stroke-opacity:1" /><path
sodipodi:nodetypes="cc"
id="path877"
d="M 5.4598917,14.945083 10.308157,13.116958"
style="fill:none;fill-opacity:1;stroke:#ed8f21;stroke-width:1.10094px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /><path
style="fill:none;fill-opacity:1;stroke:#ed8f21;stroke-width:1.10094px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 5.4001056,12.793084 10.24837,10.964959"
id="path877-4"
sodipodi:nodetypes="cc" /><path
style="fill:none;fill-opacity:1;stroke:#ed8f21;stroke-width:1.10094px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 5.34329,10.535271 10.191555,8.7071467"
id="path877-7"
sodipodi:nodetypes="cc" /><g
transform="matrix(0.80060859,0,0,0.80060859,1.4861858,1.2980841)"
id="extruder_x2B_funnel">
<rect
x="1"
y="1"
display="none"
fill="#808080"
width="14"
height="6"
id="rect22" />
<polygon
display="none"
fill="#808080"
points="11,7 5,7 5,8 8,10 11,8 "
id="polygon26" />
<g
id="g30">
<path
sodipodi:nodetypes="ccscccssscccss"
fill="#808080"
d="M 14,2 V 6 C 13.135218,6.6244211 10.714859,8.3536126 8.0412851,8.3548646 5.2726825,8.356161 2.7133111,6.389468 2,6 V 2 H 14 M 14,1 H 2 C 1.45,1 1,1.45 1,2 V 6 C 2.0571492,7.6283205 6.0091875,9.175597 7.9977579,9.239386 10.321702,9.0449928 13.89612,7.8376478 15,6 V 2 C 15,1.45 14.55,1 14,1 Z"
id="path28" />
</g>
</g><g
id="extruder_x2B_funnel-3"
transform="matrix(-1.1321815,0,0,-0.80060859,17.123705,3.7011227)"><rect
id="rect22-6"
height="6"
width="14"
fill="#808080"
display="none"
y="1"
x="1" /><polygon
id="polygon26-7"
points="8,10 11,8 11,7 5,7 5,8 "
fill="#808080"
display="none" /><g
id="g30-1" /></g><g
id="extruder_x2B_funnel-2"
transform="matrix(-1.0964627,0,0,-0.80060859,16.702161,3.6999099)"><rect
id="rect22-3"
height="6"
width="14"
fill="#808080"
display="none"
y="1"
x="1" /><polygon
id="polygon26-2"
points="11,7 5,7 5,8 8,10 11,8 "
fill="#808080"
display="none" /><g
id="g30-2"><path
sodipodi:nodetypes="csssscccccc"
transform="matrix(-0.91202373,0,0,-1.2490498,15.232767,4.6213717)"
d="M 0.25585938,0.02552058 V 2.0996094 c 0,0.4403347 0.49264863,0.7988281 1.09570312,0.7988281 H 14.509766 c 0.603054,0 1.095703,-0.3584934 1.095703,-0.7988281 V 0.02525825 l -1.095703,9.838e-5 0,2.07425277 H 1.3515625 V 0.02532383 Z"
style="stroke-width:0.93693;fill:#808080;fill-opacity:1"
id="path28-4" /></g></g></svg>

After

Width:  |  Height:  |  Size: 4.2 KiB

View File

@ -50,6 +50,7 @@ std::string toString(OptionCategory opt) {
case pad: return "Pad";
case padSupp: return "Pad and Support";
case wipe: return "Wipe Options";
case milling: return "milling";
}
return "error";
}

View File

@ -106,6 +106,8 @@ void fill_CATEGORY_ICON(std::map<OptionCategory, wxBitmap> &CATEGORY_ICON)
CATEGORY_ICON[OptionCategory::support] = create_scaled_bitmap("support"/*"sla_supports"*/);
CATEGORY_ICON[OptionCategory::pad] = create_scaled_bitmap("pad");
CATEGORY_ICON[OptionCategory::hollowing] = create_scaled_bitmap("hollowing");
//others
CATEGORY_ICON[OptionCategory::milling] = create_scaled_bitmap("milling");
}
ObjectList::ObjectList(wxWindow* parent) :