From 1093187c062b34cb503dd5c6931b5b356045201b Mon Sep 17 00:00:00 2001 From: vocx-fc Date: Tue, 29 Sep 2020 10:06:02 -0500 Subject: [PATCH] Surface: upgraded Surface icons The `Surface_Workbench` icon is the same as `Surface_Surface`, which is now an SVG and not XPM. The lines are thicker and the colors have been adjusted with a gradient, instead of being solid and plain looking. Also the following were updated: `BSplineSurface`, `BezierSurface`, `Cut`, `Filling`, `Sewing. The `BezierSurface`, `Cut`, and `Sewing` icons are not currently used in the workbench, but they were still updated in case a future command uses them. --- .../icons/Surface_BSplineSurface.svg | 2263 +++++++++- .../Resources/icons/Surface_BezierSurface.svg | 2319 +++++++++- .../Gui/Resources/icons/Surface_Cut.svg | 3781 ++++++++++++++++- .../Gui/Resources/icons/Surface_Filling.svg | 2031 ++++++++- .../Gui/Resources/icons/Surface_Sewing.svg | 1915 ++++++++- .../Gui/Resources/icons/Surface_Surface.svg | 1788 +++++++- .../Gui/Resources/icons/Surface_Workbench.svg | 1788 +++++++- 7 files changed, 14868 insertions(+), 1017 deletions(-) diff --git a/src/Mod/Surface/Gui/Resources/icons/Surface_BSplineSurface.svg b/src/Mod/Surface/Gui/Resources/icons/Surface_BSplineSurface.svg index 801a3e86924d..3e9b34bee475 100644 --- a/src/Mod/Surface/Gui/Resources/icons/Surface_BSplineSurface.svg +++ b/src/Mod/Surface/Gui/Resources/icons/Surface_BSplineSurface.svg @@ -1,6 +1,4 @@ - - + id="svg3364" + height="64px" + width="64px"> + Surface_BSplineSurface + style="stop-color:#71b2f8;stop-opacity:1;" /> + id="stop3818" /> + style="stop-color:#002795;stop-opacity:1;" /> + style="stop-color:#71b2f8;stop-opacity:1;" /> + id="stop3866" /> + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + gradientTransform="matrix(0.90855455,0,0,0.90802396,3.3799799,3.2426344)" + xlink:href="#linearGradient3767" + id="linearGradient2095" + x1="47" + y1="9" + x2="7" + y2="28" + gradientUnits="userSpaceOnUse" /> + + + + + + + + + + + + + + + + + + + + - @@ -253,55 +2113,128 @@ image/svg+xml - + Surface_BSplineSurface + 2017-04-17 + + + Nate Miller + + + + + CC-BY-SA 4.0 + + + + + FreeCAD + + + FreeCAD/src/Mod/Surface/Gui/Resources/icons/Surface_BSplineSurface.svg + http://www.freecadweb.org/wiki/index.php?title=Artwork + A purple curved surface that has a thick, red, highlighted edge. This edge has three vertices indicated as circles as if it was a multipoint spline. It is based on the 'Surface' icon. + + + [vocx] + + + + + + surface + curve + spline + points + + + + + + + + + + - + id="layer1"> + style="display:inline;opacity:1;fill:url(#linearGradient2095);fill-opacity:1;stroke:#4c4c4c;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 7.0141981,28.667305 17.008298,55 c 13.628318,-32.688862 29.073746,9.988264 39.9764,-21.792575 L 40.630716,8.6907782 C 32.969804,34.292364 20.713171,5.6052405 7.0141981,28.667305 Z" + id="path3820-1-9" /> + + style="fill:none;stroke:#c20800;stroke-width:3.99999976;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 17.008298,55 c 13.628318,-32.688862 29.073746,9.988264 39.9764,-21.792575" + id="path3764" /> + id="path1219" + d="m 17.008298,55 c 13.628318,-32.688862 29.073746,9.988264 39.9764,-21.792575" + style="fill:none;stroke:#f61515;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:none;stroke:#6744e5;stroke-width:1.99999988;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 13.37408,35.931497 C 28.01266,8.753657 40.262376,51.76934 47.647736,24.09952" + id="path2101" /> + + + + + + + + + + + + diff --git a/src/Mod/Surface/Gui/Resources/icons/Surface_BezierSurface.svg b/src/Mod/Surface/Gui/Resources/icons/Surface_BezierSurface.svg index 6c5c09397429..d6abc7b5177e 100644 --- a/src/Mod/Surface/Gui/Resources/icons/Surface_BezierSurface.svg +++ b/src/Mod/Surface/Gui/Resources/icons/Surface_BezierSurface.svg @@ -1,6 +1,4 @@ - - + version="1.1"> + Surface_BezierSurface - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - @@ -253,77 +2313,110 @@ image/svg+xml - + Surface_BezierSurface + + 2017-04-17 + + + Nate Miller + + + + + CC-BY-SA 4.0 + + + + + FreeCAD + + + FreeCAD/src/Mod/Surface/Gui/Resources/icons/Surface_BezierSurface.svg + http://www.freecadweb.org/wiki/index.php?title=Artwork + A purple curved surface, with one thick, red highlighted edge. The endpoints of this edge are marked with squares, which are tied to handles indicating control points for a bezier curve. It is based on the 'Surface' icon. + + + [vocx] + + + + + surface + curve + bezier + handles + + + + + + + + + + - + id="layer1"> + + id="path3820-1-9" + d="M 4.9999894,24.814685 14.994089,51.14738 c 13.628318,-32.688862 29.073746,9.988264 39.9764,-21.792575 L 38.616507,4.8381578 C 30.955595,30.439744 18.698962,1.7526201 4.9999894,24.814685 Z" + style="display:inline;opacity:1;fill:url(#linearGradient2095);fill-opacity:1;stroke:#4c4c4c;stroke-width:2;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + id="path3764" + d="m 14.994089,51.14738 c 13.628318,-32.688862 29.073746,9.988264 39.9764,-21.792575" + style="fill:none;stroke:#c20800;stroke-width:3.99999976;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + style="fill:none;stroke:#f61515;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 14.994089,51.14738 c 13.628318,-32.688862 29.073746,9.988264 39.9764,-21.792575" + id="path1219" /> + style="fill:none;stroke:#000000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 46.156854,55.257256 54.459556,32.078877" + id="path3867" /> - + - + cx="21.35487" + cy="29.082384" + r="4" /> + + + diff --git a/src/Mod/Surface/Gui/Resources/icons/Surface_Cut.svg b/src/Mod/Surface/Gui/Resources/icons/Surface_Cut.svg index 90073bf9df12..cee2cf4fce75 100644 --- a/src/Mod/Surface/Gui/Resources/icons/Surface_Cut.svg +++ b/src/Mod/Surface/Gui/Resources/icons/Surface_Cut.svg @@ -1,6 +1,4 @@ - - + id="svg3364" + height="64px" + width="64px"> + Surface_Cut + style="stop-color:#71b2f8;stop-opacity:1;" /> + id="stop3818" /> + style="stop-color:#002795;stop-opacity:1;" /> + style="stop-color:#71b2f8;stop-opacity:1;" /> + id="stop3866" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + gradientTransform="translate(84,-2)" + gradientUnits="userSpaceOnUse" + y2="28" + x2="7" + y1="9" + x1="47" + id="linearGradient2095" + xlink:href="#linearGradient3767" /> + + + + + + + + + + - @@ -253,35 +3690,87 @@ image/svg+xml - + Surface_Cut + + 2017-04-17 + + + Nate Miller + + + + + CC-BY-SA 4.0 + + + + + FreeCAD + + + FreeCAD/src/Mod/Surface/Gui/Resources/icons/Surface_Cut.svg + http://www.freecadweb.org/wiki/index.php?title=Artwork + A purple curved surface. A semi-transparent plane cuts the curve in two. The position of the cut is marked with a red thick edge on the curve. It is based on the 'Surface' icon. + + + [vocx] + + + + + surface + plane + cut + + + + + + + + + + - - - + id="layer1"> + + + + + + id="path1219" + d="M 11,42 C 26,10 42,54 51,23" + style="fill:none;stroke:#f61515;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + d="M 2,51.452471 V 21 L 59,2 V 30 L 58.028679,30.433598 52.58252,22.122469 51,23 C 51,25 48,33 42.514915,34.607502 37.02983,36.215004 30,29.688286 24,29.688286 16.685457,29.688286 11.427783,39.731916 9.4158397,44 L 11,48 Z" + style="opacity:0.6;fill:#f61515;fill-opacity:1;stroke:none" /> diff --git a/src/Mod/Surface/Gui/Resources/icons/Surface_Filling.svg b/src/Mod/Surface/Gui/Resources/icons/Surface_Filling.svg index 58fa99e0cef4..791cf3cff324 100644 --- a/src/Mod/Surface/Gui/Resources/icons/Surface_Filling.svg +++ b/src/Mod/Surface/Gui/Resources/icons/Surface_Filling.svg @@ -1,6 +1,4 @@ - - + id="svg3364" + height="64px" + width="64px"> + Surface_Filling + style="stop-color:#71b2f8;stop-opacity:1;" /> + id="stop3818" /> + style="stop-color:#002795;stop-opacity:1;" /> + style="stop-color:#71b2f8;stop-opacity:1;" /> + id="stop3866" /> + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + id="linearGradient3794"> + style="stop-color:#000000;stop-opacity:1;" /> + id="stop3798" + offset="1" + style="stop-color:#000000;stop-opacity:0;" /> + + + + style="stop-color:#957de7;stop-opacity:1" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - @@ -253,51 +1912,101 @@ image/svg+xml - + Surface_Filling + 2017-04-17 + + + Nate Miller + + + + + CC-BY-SA 4.0 + + + + + FreeCAD + + + http://www.freecadweb.org/wiki/index.php?title=Artwork + FreeCAD/src/Mod/Surface/Gui/Resources/icons/Surface_Filling.svg + A purple curved surface. Its four edges are thick and highlighted in red. It is based on the 'Surface' icon. + + + [vocx] + + + + + + surface + curve + edges + highlights + + + + + + + + + + - - - - - - - - - + style="display:inline" + id="layer1"> + + + + + + + + + + diff --git a/src/Mod/Surface/Gui/Resources/icons/Surface_Sewing.svg b/src/Mod/Surface/Gui/Resources/icons/Surface_Sewing.svg index 06a53a3ea51e..cf8e3b2e59be 100644 --- a/src/Mod/Surface/Gui/Resources/icons/Surface_Sewing.svg +++ b/src/Mod/Surface/Gui/Resources/icons/Surface_Sewing.svg @@ -1,6 +1,4 @@ - - + id="svg3364" + height="64px" + width="64px"> + Surface_Sewing + style="stop-color:#71b2f8;stop-opacity:1;" /> + id="stop3818" /> + style="stop-color:#002795;stop-opacity:1;" /> + style="stop-color:#71b2f8;stop-opacity:1;" /> + id="stop3866" /> + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + id="linearGradient3794"> + style="stop-color:#000000;stop-opacity:1;" /> + id="stop3798" + offset="1" + style="stop-color:#000000;stop-opacity:0;" /> + + + + style="stop-color:#957de7;stop-opacity:1" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - @@ -253,29 +1813,100 @@ image/svg+xml - + Surface_Sewing + + 2017-04-17 + + + Nate Miller + + + + + CC-BY-SA 4.0 + + + + + FreeCAD + + + FreeCAD/src/Mod/Surface/Gui/Resources/icons/Surface_Sewing.svg + http://www.freecadweb.org/wiki/index.php?title=Artwork + A purple curved surface, with black edges, and one edge passing through the middle, dividing the curve in two parts. Six straight lines cross the middle edge, indicating stitches. It is based on the 'Surface' icon. + + + [vocx] + + + + + surface + curve + edges + + + + + + + + + + - - - - - - + + + + + + + + + + + diff --git a/src/Mod/Surface/Gui/Resources/icons/Surface_Surface.svg b/src/Mod/Surface/Gui/Resources/icons/Surface_Surface.svg index 159fa8740eb8..a0f51cfc3f7c 100644 --- a/src/Mod/Surface/Gui/Resources/icons/Surface_Surface.svg +++ b/src/Mod/Surface/Gui/Resources/icons/Surface_Surface.svg @@ -1,6 +1,4 @@ - - + id="svg3364" + height="64px" + width="64px"> + Surface_Surface + style="stop-color:#71b2f8;stop-opacity:1;" /> + + id="stop3820" + offset="1" + style="stop-color:#71b2f8;stop-opacity:1;" /> + + + + id="stop3868" /> + + + id="linearGradient3593"> + style="stop-color:#c8e0f9;stop-opacity:1;" /> + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + gradientTransform="matrix(0.9829174,1.3240854,-1.2330051,0.8105158,-131.04134,-483.74563)" + cx="320.44025" + cy="113.23357" + fx="320.44025" + fy="113.23357" + r="19.571428" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + gradientUnits="userSpaceOnUse" + y2="28" + x2="6" + y1="7.6726208" + x1="47.5751" + id="linearGradient1131-1" + xlink:href="#linearGradient3767" + gradientTransform="translate(-69.715249,3.699456)" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - @@ -263,19 +1704,76 @@ image/svg+xml - + Surface_Surface + 2017-04-17 + + + Nate Miller + + + + + CC-BY-SA 4.0 + + + + + FreeCAD + + + FreeCAD/src/Mod/Surface/Gui/Resources/icons/Surface_Surface.svg + http://www.freecadweb.org/wiki/index.php?title=Artwork + A purple curved surface, with a linear gradient, and some highlights in light and dark purple. + + + + [vocx] + + + + + surface + curve + wave + + + + + + + + + + - - - + + + + + diff --git a/src/Mod/Surface/Gui/Resources/icons/Surface_Workbench.svg b/src/Mod/Surface/Gui/Resources/icons/Surface_Workbench.svg index 159fa8740eb8..35053ff75c80 100644 --- a/src/Mod/Surface/Gui/Resources/icons/Surface_Workbench.svg +++ b/src/Mod/Surface/Gui/Resources/icons/Surface_Workbench.svg @@ -1,6 +1,4 @@ - - + id="svg3364" + height="64px" + width="64px"> + Surface_Workbench + style="stop-color:#71b2f8;stop-opacity:1;" /> + + id="stop3820" + offset="1" + style="stop-color:#71b2f8;stop-opacity:1;" /> + + + + id="stop3868" /> + + + id="linearGradient3593"> + style="stop-color:#c8e0f9;stop-opacity:1;" /> + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + gradientTransform="matrix(0.9829174,1.3240854,-1.2330051,0.8105158,-131.04134,-483.74563)" + cx="320.44025" + cy="113.23357" + fx="320.44025" + fy="113.23357" + r="19.571428" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + gradientUnits="userSpaceOnUse" + y2="28" + x2="6" + y1="7.6726208" + x1="47.5751" + id="linearGradient1131-1" + xlink:href="#linearGradient3767" + gradientTransform="translate(-69.715249,3.699456)" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - @@ -263,19 +1704,76 @@ image/svg+xml - + Surface_Workbench + 2017-04-17 + + + Nate Miller + + + + + CC-BY-SA 4.0 + + + + + FreeCAD + + + FreeCAD/src/Mod/Surface/Gui/Resources/icons/Surface_Workbench.svg + http://www.freecadweb.org/wiki/index.php?title=Artwork + A purple curved surface, with a linear gradient, and some highlights in light and dark purple. It is based on the 'Surface' icon. + + + + [vocx] + + + + + surface + curve + wave + + + + + + + + + + - - - + + + + +