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

Assembly : Add icon for joint group.

Browse Source
This commit is contained in:
PaddleStroke
2024-03-05 14:33:27 +01:00
committed by Yorik van Havre
parent fa11eb93f4
commit f04360ae22
3 changed files with 346 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,6 +12,7 @@
<file>icons/Assembly_CreateJointTangent.svg</file>
<file>icons/Assembly_ExportASMT.svg</file>
<file>icons/Assembly_SolveAssembly.svg</file>
<file>icons/Assembly_JointGroup.svg</file>
<file>panels/TaskAssemblyCreateJoint.ui</file>
<file>panels/TaskAssemblyInsertLink.ui</file>
<file>preferences/Assembly.ui</file>

358
src/Mod/Assembly/Gui/Resources/icons/Assembly_Joint.svg → src/Mod/Assembly/Gui/Resources/icons/Assembly_JointGroup.svg
View File

@@ -1,13 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
width="64px"
height="64px"
id="svg2821"
sodipodi:version="0.32"
inkscape:version="1.3 (0e150ed6c4, 2023-07-21)"
sodipodi:docname="Assembly_Joint.svg"
inkscape:version="1.1-beta1 (77e7b44db3, 2021-03-28)"
sodipodi:docname="Assembly_JointGroup.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
version="1.1"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
@@ -175,6 +173,137 @@
x2="85"
y2="35"
spreadMethod="reflect" />
<linearGradient
id="linearGradient6715"
y2="609.51001"
gradientUnits="userSpaceOnUse"
x2="302.85999"
gradientTransform="matrix(2.7744,0,0,1.9697,-1892.2,-872.89)"
y1="366.64999"
x1="302.85999">
<stop
id="stop5050"
stop-opacity="0"
offset="0" />
<stop
id="stop5056"
offset=".5" />
<stop
id="stop5052"
stop-opacity="0"
offset="1" />
</linearGradient>
<radialGradient
id="radialGradient6717"
xlink:href="#linearGradient5060"
gradientUnits="userSpaceOnUse"
cy="486.64999"
cx="605.71002"
gradientTransform="matrix(2.7744,0,0,1.9697,-1891.6,-872.89)"
r="117.14" />
<linearGradient
id="linearGradient5060">
<stop
id="stop5062"
offset="0" />
<stop
id="stop5064"
stop-opacity="0"
offset="1" />
</linearGradient>
<radialGradient
id="radialGradient6719"
xlink:href="#linearGradient5060"
gradientUnits="userSpaceOnUse"
cy="486.64999"
cx="605.71002"
gradientTransform="matrix(-2.7744,0,0,1.9697,112.76,-872.89)"
r="117.14" />
<radialGradient
id="radialGradient238"
gradientUnits="userSpaceOnUse"
cy="37.518002"
cx="20.705999"
gradientTransform="matrix(1.055,-0.027345,0.1777,1.1909,-3.5722,-7.1253)"
r="30.905001">
<stop
id="stop1790"
stop-color="#202020"
offset="0" />
<stop
id="stop1791"
stop-color="#b9b9b9"
offset="1" />
</radialGradient>
<linearGradient
id="linearGradient3104"
y2="6.1803002"
gradientUnits="userSpaceOnUse"
x2="15.515"
y1="31.368"
x1="18.113001">
<stop
id="stop3098"
stop-color="#424242"
offset="0" />
<stop
id="stop3100"
stop-color="#777"
offset="1" />
</linearGradient>
<linearGradient
id="linearGradient491"
y2="66.834"
gradientUnits="userSpaceOnUse"
x2="9.8980999"
gradientTransform="matrix(1.5168,0,0,0.70898,-0.87957,-1.3182)"
y1="13.773"
x1="6.2298002">
<stop
id="stop3984"
stop-color="#fff"
stop-opacity=".87629"
offset="0" />
<stop
id="stop3985"
stop-color="#fffffe"
stop-opacity="0"
offset="1" />
</linearGradient>
<linearGradient
id="linearGradient9772"
y2="32.049999"
gradientUnits="userSpaceOnUse"
x2="22.065001"
y1="36.987999"
x1="22.176001">
<stop
id="stop9768"
stop-color="#6194cb"
offset="0" />
<stop
id="stop9770"
stop-color="#729fcf"
offset="1" />
</linearGradient>
<linearGradient
id="linearGradient322"
y2="46.688999"
gradientUnits="userSpaceOnUse"
x2="12.854"
gradientTransform="matrix(1.3175,0,0,0.81626,-0.87957,-1.3182)"
y1="32.567001"
x1="13.036">
<stop
id="stop320"
stop-color="#fff"
offset="0" />
<stop
id="stop321"
stop-color="#fff"
stop-opacity="0"
offset="1" />
</linearGradient>
</defs>
<sodipodi:namedview
id="base"
@@ -183,21 +312,24 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="10.193662"
inkscape:cx="34.482211"
inkscape:cy="20.993437"
inkscape:zoom="1.2742078"
inkscape:cx="354.33782"
inkscape:cy="-67.100518"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:document-units="px"
inkscape:grid-bbox="true"
inkscape:window-width="2560"
inkscape:window-height="1356"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-width="3840"
inkscape:window-height="1571"
inkscape:window-x="-9"
inkscape:window-y="-9"
inkscape:window-maximized="1"
inkscape:showpageshadow="2"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1">
inkscape:deskcolor="#d1d1d1"
objecttolerance="10.0"
gridtolerance="10.0"
guidetolerance="10.0">
<inkscape:grid
type="xygrid"
id="grid2992"
@@ -251,10 +383,208 @@
id="layer1"
inkscape:label="Layer 1"
inkscape:groupmode="layer">
<g
id="layer1-0"
transform="matrix(1.3847526,0,0,1.3847526,0.85083749,-0.78179856)">
<g
id="g6707"
transform="matrix(0.022624,0,0,0.020868,43.383,36.37)">
<rect
id="rect6709"
opacity="0.40206"
height="478.35999"
width="1339.6"
y="-150.7"
x="-1559.3"
fill="url(#linearGradient6715)"
style="fill:url(#linearGradient6715)" />
<path
id="path6711"
opacity="0.40206"
d="m -219.62,-150.68 v 478.33 c 142.88,0.9 345.4,-107.17 345.4,-239.2 0,-132.02 -159.44,-239.13 -345.4,-239.13 z"
fill="url(#radialGradient6717)"
style="fill:url(#radialGradient6717)" />
<path
id="path6713"
opacity="0.40206"
d="m -1559.3,-150.68 v 478.33 c -142.8,0.9 -345.4,-107.17 -345.4,-239.2 0,-132.02 159.5,-239.13 345.4,-239.13 z"
fill="url(#radialGradient6719)"
style="fill:url(#radialGradient6719)" />
</g>
<path
id="path216"
stroke-linejoin="round"
d="m 4.5218,38.687 c 0.0218,0.417 0.4599,0.833 0.8762,0.833 h 31.327 c 0.416,0 0.811,-0.416 0.789,-0.833 L 36.578,11.461 c -0.022,-0.417 -0.46,-0.833 -0.877,-0.833 h -13.27 c -0.486,0 -1.235,-0.316 -1.402,-1.1066 L 20.417,6.6284 C 20.262,5.8927 19.535,5.5905 19.119,5.5905 H 4.34 c -0.4162,0 -0.8107,0.4163 -0.7889,0.8326 l 0.9707,32.264 z"
stroke="url(#linearGradient3104)"
stroke-linecap="round"
fill="url(#radialGradient238)"
style="fill:url(#radialGradient238);stroke:url(#linearGradient3104)" />
<path
id="path9788"
opacity="0.11364"
stroke-linejoin="round"
d="m 5.2266,22.562 h 30.265"
stroke="#000000"
stroke-linecap="round"
fill="#729fcf" />
<path
id="path9784"
opacity="0.11364"
stroke-linejoin="round"
d="m 5.0422,18.562 h 30.447"
stroke="#000000"
stroke-linecap="round"
fill="#729fcf" />
<path
id="path9778"
opacity="0.11364"
stroke-linejoin="round"
d="m 4.9807,12.562 h 30.507"
stroke="#000000"
stroke-linecap="round"
fill="#729fcf" />
<path
id="path9798"
opacity="0.11364"
stroke-linejoin="round"
d="m 5.3862,32.562 h 30.109"
stroke="#000000"
stroke-linecap="round"
fill="#729fcf" />
<path
id="path9800"
opacity="0.11364"
stroke-linejoin="round"
d="m 5.5091,34.562 h 29.988"
stroke="#000000"
stroke-linecap="round"
fill="#729fcf" />
<path
id="path9782"
opacity="0.11364"
stroke-linejoin="round"
d="m 5.0422,16.562 h 30.447"
stroke="#000000"
stroke-linecap="round"
fill="#729fcf" />
<path
id="path9780"
opacity="0.11364"
stroke-linejoin="round"
d="m 5.0114,14.562 h 30.478"
stroke="#000000"
stroke-linecap="round"
fill="#729fcf" />
<path
id="path9776"
opacity="0.11364"
stroke-linejoin="round"
d="m 4.9221,10.562 h 15.281"
stroke="#000000"
stroke-linecap="round"
fill="#729fcf" />
<path
id="path9774"
opacity="0.11364"
stroke-linejoin="round"
d="m 4.8738,8.5625 h 14.783"
stroke="#000000"
stroke-linecap="round"
fill="#729fcf" />
<path
id="path9794"
opacity="0.11364"
stroke-linejoin="round"
d="m 5.3247,28.562 h 30.169"
stroke="#000000"
stroke-linecap="round"
fill="#729fcf" />
<path
id="path9792"
opacity="0.11364"
stroke-linejoin="round"
d="m 5.2881,26.562 h 30.205"
stroke="#000000"
stroke-linecap="round"
fill="#729fcf" />
<path
id="path9790"
opacity="0.11364"
stroke-linejoin="round"
d="m 5.2266,24.562 h 30.265"
stroke="#000000"
stroke-linecap="round"
fill="#729fcf" />
<path
id="path9786"
opacity="0.11364"
stroke-linejoin="round"
d="m 5.1959,20.562 h 30.296"
stroke="#000000"
stroke-linecap="round"
fill="#729fcf" />
<path
id="path9796"
opacity="0.11364"
stroke-linejoin="round"
d="m 5.3247,30.562 h 30.169"
stroke="#000000"
stroke-linecap="round"
fill="#729fcf" />
<path
id="path9802"
opacity="0.11364"
stroke-linejoin="round"
d="m 5.5091,36.562 h 29.988"
stroke="#000000"
stroke-linecap="round"
fill="#729fcf" />
<path
id="path219"
opacity="0.45143"
d="M 6.0683,38.864 C 6.0847,39.176 5.8874,39.384 5.5698,39.28 5.2521,39.176 5.033,38.968 5.0167,38.656 L 4.069,6.591 C 4.0526,6.2792 4.2341,6.0906 4.5464,6.0906 l 14.422,-0.0477 c 0.313,0 0.932,0.3005 1.133,1.3222 l 0.574,2.8159 c -0.427,-0.4656 -0.419,-0.48 -0.638,-1.1571 l -0.406,-1.2592 c -0.219,-0.7276 -0.698,-0.8319 -1.01,-0.8319 H 5.7334 c -0.3122,0 -0.5095,0.2082 -0.4931,0.5204 l 0.938,31.515 -0.1096,-0.104 z"
display="block"
fill="url(#linearGradient491)"
style="fill:url(#linearGradient491)" />
<g
id="g220"
fill-opacity="0.75706"
transform="matrix(1.0408,0,0.054493,1.0408,-8.6702,2.6706)"
fill="#ffffff">
<path
id="path221"
fill-opacity="0.50847"
fill="#ffffff"
d="M 42.417,8.5152 C 42.422,8.4181 42.289,8.2682 42.182,8.2682 L 29.151,8.2661 c 0,0 0.911,0.5879 2.201,0.5962 l 11.054,0.071 c 0.011,-0.2117 0.003,-0.256 0.011,-0.4181 z" />
</g>
<path
id="path233"
stroke-linejoin="round"
d="M 39.784,39.511 C 40.927,39.467 41.747,38.414 41.831,37.19 42.622,25.641 43.49,15.958 43.49,15.958 43.562,15.71 43.322,15.463 43.01,15.463 H 8.639 c -4e-4,0 -1.8507,21.867 -1.8507,21.867 -0.1145,0.982 -0.466,1.804 -1.5498,2.183 l 34.546,-0.002 z"
display="block"
stroke="#3465a4"
fill="url(#linearGradient9772)"
style="fill:url(#linearGradient9772)" />
<path
id="path304"
opacity="0.46591"
d="m 9.6202,16.464 32.791,0.065 -1.574,20.002 c -0.084,1.071 -0.45,1.428 -1.872,1.428 -1.872,0 -28.678,-0.032 -31.395,-0.032 0.2335,-0.321 0.3337,-0.989 0.335,-1.005 L 9.6204,16.464 Z"
stroke="url(#linearGradient322)"
stroke-linecap="round"
stroke-width="1px"
fill="none"
style="stroke:url(#linearGradient322)" />
<path
id="path323"
d="M 9.6202,16.223 8.4536,31.866 c 0,0 8.2964,-4.148 18.666,-4.148 10.3696,0 15.555,-11.495 15.555,-11.495 H 9.6196 Z"
fill-opacity="0.089286"
fill-rule="evenodd"
fill="#ffffff" />
</g>
<g
id="g2"
inkscape:label="Main"
transform="matrix(1.0416665,0,0,1.0416665,-1.3333273,-2.3320947)">
transform="matrix(0.52234622,0,0,0.52234622,19.840028,21.184948)">
<g
id="g1"
inkscape:label="Part"
@@ -286,7 +616,7 @@
ry="7.9999995" />
</g>
<path
d="m 44.724484,42.214865 0,8.096549 c 0,0 -1.084323,3.922162 -12.564831,3.922162 -11.480508,0 -11.750143,-3.922162 -11.750143,-3.922162 l 0,-7.8593"
d="m 44.724484,42.214865 v 8.096549 c 0,0 -1.084323,3.922162 -12.564831,3.922162 -11.480508,0 -11.750143,-3.922162 -11.750143,-3.922162 v -7.8593"
style="fill:#729fcf;fill-opacity:1;stroke:#fce94f;stroke-width:2.08333;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4.5;stroke-dashoffset:20.4;stroke-opacity:1"
id="path1-5"
transform="matrix(0.96000015,0,0,0.96000015,1.2799944,2.2388113)"
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 22 KiB

2
src/Mod/Assembly/Gui/ViewProviderJointGroup.cpp
View File

@@ -45,7 +45,7 @@ ViewProviderJointGroup::~ViewProviderJointGroup() = default;
QIcon ViewProviderJointGroup::getIcon() const
{
return Gui::BitmapFactory().pixmap("Assembly_CreateJointFixed.svg");
return Gui::BitmapFactory().pixmap("Assembly_JointGroup.svg");
}
// Make the joint group impossible to delete.