diff --git a/GUI/View/Setup/Data2DToolbar.cpp b/GUI/View/Setup/Data2DToolbar.cpp index 9bf18730a9abb1e9b2de6abb5d4161df652e2a98..d056adec553b23e5d8202a362a9d011ac6c330f0 100644 --- a/GUI/View/Setup/Data2DToolbar.cpp +++ b/GUI/View/Setup/Data2DToolbar.cpp @@ -56,14 +56,14 @@ Data2DToolbar::Data2DToolbar(bool mask_tools) //... Projection tools auto* horizontal_prjn_button = new QToolButton; - horizontal_prjn_button->setIcon(QIcon(":/images/mask/horizontalline.svg")); + horizontal_prjn_button->setIcon(QIcon(":/images/mask/horizontalprojection.svg")); horizontal_prjn_button->setToolTip("Create horizontal projection"); horizontal_prjn_button->setCheckable(true); m_activity_button_group->addButton(horizontal_prjn_button, Canvas2DMode::HORIZONTAL_PRJN); addWidget(horizontal_prjn_button); auto* vertical_prjn_button = new QToolButton; - vertical_prjn_button->setIcon(QIcon(":/images/mask/verticalline.svg")); + vertical_prjn_button->setIcon(QIcon(":/images/mask/verticalprojection.svg")); vertical_prjn_button->setToolTip("Create vertical projection"); vertical_prjn_button->setCheckable(true); m_activity_button_group->addButton(vertical_prjn_button, Canvas2DMode::VERTICAL_PRJN); @@ -112,14 +112,14 @@ Data2DToolbar::Data2DToolbar(bool mask_tools) addWidget(ellipse_button); auto* horizontal_mask_button = new QToolButton; - horizontal_mask_button->setIcon(QIcon(":/images/mask/horizontalline.svg")); + horizontal_mask_button->setIcon(QIcon(":/images/mask/horizontalmask.svg")); horizontal_mask_button->setToolTip("Create horizontal line mask"); horizontal_mask_button->setCheckable(true); m_activity_button_group->addButton(horizontal_mask_button, Canvas2DMode::HORIZONTAL_MASK); addWidget(horizontal_mask_button); auto* vertical_mask_button = new QToolButton; - vertical_mask_button->setIcon(QIcon(":/images/mask/verticalline.svg")); + vertical_mask_button->setIcon(QIcon(":/images/mask/verticalmask.svg")); vertical_mask_button->setToolTip("Create vertical line mask"); vertical_mask_button->setCheckable(true); m_activity_button_group->addButton(vertical_mask_button, Canvas2DMode::VERTICAL_MASK); diff --git a/GUI/gui.qrc b/GUI/gui.qrc index 5645944e438cacf35fa57086524e33482c907c55..85980855e0b688c485719968739fa65517bd7406 100644 --- a/GUI/gui.qrc +++ b/GUI/gui.qrc @@ -53,7 +53,8 @@ <file>images/mask/bringtofront.svg</file> <file>images/mask/ellipse.svg</file> <file>images/mask/hand.svg</file> - <file>images/mask/horizontalline.svg</file> + <file>images/mask/horizontalmask.svg</file> + <file>images/mask/horizontalprojection.svg</file> <file>images/mask/lightbulb.svg</file> <file>images/mask/maskall.svg</file> <file>images/mask/maskfalse.svg</file> @@ -65,7 +66,8 @@ <file>images/mask/save.svg</file> <file>images/mask/sendtoback.svg</file> <file>images/mask/toolpanel.svg</file> - <file>images/mask/verticalline.svg</file> + <file>images/mask/verticalmask.svg</file> + <file>images/mask/verticalprojection.svg</file> <file>images/menu-open.svg</file> <file>images/mode_script.png</file> <file>images/move_up_down.svg</file> diff --git a/GUI/images/mask/horizontalline.svg b/GUI/images/mask/horizontalmask.svg similarity index 100% rename from GUI/images/mask/horizontalline.svg rename to GUI/images/mask/horizontalmask.svg diff --git a/GUI/images/mask/horizontalprojection.svg b/GUI/images/mask/horizontalprojection.svg new file mode 100644 index 0000000000000000000000000000000000000000..3334f6e72c75c8fa0500815ab843ab893ff789f3 --- /dev/null +++ b/GUI/images/mask/horizontalprojection.svg @@ -0,0 +1,133 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + width="32" + height="32" + id="svg3955" + version="1.1" + inkscape:version="1.2.2 (b0a8486541, 2022-12-01)" + sodipodi:docname="horizontalmask (copy).svg" + 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" + 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/"> + <defs + id="defs3957"> + <linearGradient + id="linearGradient3776"> + <stop + style="stop-color:#d2d2d2;stop-opacity:1;" + offset="0" + id="stop3778" /> + <stop + style="stop-color:#d2d2d2;stop-opacity:1;" + offset="1" + id="stop3780" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3776" + id="linearGradient3782" + x1="16.976679" + y1="27.058661" + x2="14.04123" + y2="4.9938717" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.6721312,0,0,1.0862832,1010.056,-33.380666)" /> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="16" + inkscape:cx="10.34375" + inkscape:cy="24.0625" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="true" + inkscape:window-width="2560" + inkscape:window-height="1375" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:snap-global="false" + inkscape:showpageshadow="2" + inkscape:pagecheckerboard="0" + inkscape:deskcolor="#d1d1d1"> + <inkscape:grid + type="xygrid" + id="grid3963" + empspacing="5" + visible="true" + enabled="true" + snapvisiblegridlinesonly="true" /> + </sodipodi:namedview> + <metadata + id="metadata3960"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title /> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(0,-1020.3622)"> + <rect + style="fill:url(#linearGradient3782);fill-opacity:1;stroke:none" + id="rect3774" + width="4.9902625" + height="24.021755" + x="1033.453" + y="-28.009073" + ry="0.88227242" + transform="matrix(0,1,-1,0,0,0)" /> + <path + style="fill:none;stroke:#797979;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 28.008012,1035.8974 -23.967097,0" + id="path3002" + inkscape:connector-curvature="0" /> + <g + id="g4425-9" + transform="matrix(1,0,0,-1,3.9126767,1064.4734)"> + <path + style="fill:#838686;fill-opacity:1;stroke-width:0.229189" + id="path2-9-9" + d="m 13.086202,15.115127 h -1.849021 c -0.127648,0 -0.277442,-0.04951 -0.274019,0.452549 l 0.04289,6.291311 c 0.0034,0.502058 0.103479,0.528635 0.231127,0.528635 h 1.84902 c 0.127648,0 0.188236,0.03049 0.188236,-0.471571 v -6.272289 c 0,-0.502061 -0.06059,-0.528635 -0.188236,-0.528635" + sodipodi:nodetypes="csssssssc" /> + <path + style="fill:#838686;fill-opacity:1;stroke-width:0.0288277" + d="m 7.5723233,17.590595 c 3.1254197,-0.0263 6.0505957,0.0064 9.0345347,-0.01352 -1.609474,2.379211 -3.013245,4.327721 -4.517736,6.434156 C 10.58252,21.871958 9.0624674,19.740729 7.5723233,17.590595 Z" + id="path2304-2-4" + sodipodi:nodetypes="cccc" /> + </g> + <g + id="g4425" + transform="translate(3.9125149,1007.4484)"> + <path + style="fill:#838686;fill-opacity:1;stroke-width:0.229189" + id="path2-9" + d="m 13.086202,15.115127 h -1.849021 c -0.127648,0 -0.277442,-0.04951 -0.274019,0.452549 l 0.04289,6.291311 c 0.0034,0.502058 0.103479,0.528635 0.231127,0.528635 h 1.84902 c 0.127648,0 0.188236,0.03049 0.188236,-0.471571 v -6.272289 c 0,-0.502061 -0.06059,-0.528635 -0.188236,-0.528635" + sodipodi:nodetypes="csssssssc" /> + <path + style="fill:#838686;fill-opacity:1;stroke-width:0.0288277" + d="m 7.5723233,17.590595 c 3.1254197,-0.0263 6.0505957,0.0064 9.0345347,-0.01352 -1.609474,2.379211 -3.013245,4.327721 -4.517736,6.434156 C 10.58252,21.871958 9.0624674,19.740729 7.5723233,17.590595 Z" + id="path2304-2" + sodipodi:nodetypes="cccc" /> + </g> + </g> +</svg> diff --git a/GUI/images/mask/verticalline.svg b/GUI/images/mask/verticalmask.svg similarity index 100% rename from GUI/images/mask/verticalline.svg rename to GUI/images/mask/verticalmask.svg diff --git a/GUI/images/mask/verticalprojection.svg b/GUI/images/mask/verticalprojection.svg new file mode 100644 index 0000000000000000000000000000000000000000..64feefc3d003b225f76f8321c1fd9f9611a692e8 --- /dev/null +++ b/GUI/images/mask/verticalprojection.svg @@ -0,0 +1,137 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + width="32" + height="32" + id="svg3955" + version="1.1" + inkscape:version="1.2.2 (b0a8486541, 2022-12-01)" + sodipodi:docname="verticalprojection.svg" + 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" + 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/"> + <defs + id="defs3957"> + <linearGradient + id="linearGradient3776"> + <stop + style="stop-color:#d2d2d2;stop-opacity:1;" + offset="0" + id="stop3778" /> + <stop + style="stop-color:#d2d2d2;stop-opacity:1;" + offset="1" + id="stop3780" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3776" + id="linearGradient3782" + x1="16.976679" + y1="27.058661" + x2="14.04123" + y2="4.9938717" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.6721312,0,0,1.0862832,1010.056,-33.380666)" /> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="16" + inkscape:cx="10.40625" + inkscape:cy="24.0625" + inkscape:document-units="px" + inkscape:current-layer="g132" + showgrid="true" + inkscape:window-width="2560" + inkscape:window-height="1375" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:snap-global="false" + inkscape:showpageshadow="2" + inkscape:pagecheckerboard="0" + inkscape:deskcolor="#d1d1d1"> + <inkscape:grid + type="xygrid" + id="grid3963" + empspacing="5" + visible="true" + enabled="true" + snapvisiblegridlinesonly="true" /> + </sodipodi:namedview> + <metadata + id="metadata3960"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title /> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(0,-1020.3622)"> + <g + id="g132" + transform="rotate(90,15.998196,1035.9609)"> + <rect + style="fill:url(#linearGradient3782);fill-opacity:1;stroke:none" + id="rect3774" + width="4.9902625" + height="24.021755" + x="1033.453" + y="-28.009073" + ry="0.88227242" + transform="rotate(90)" /> + <path + style="fill:none;stroke:#797979;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="M 28.008012,1035.8974 H 4.040915" + id="path3002" + inkscape:connector-curvature="0" /> + <g + id="g4425-9" + transform="matrix(1,0,0,-1,3.9126767,1064.4734)"> + <path + style="fill:#838686;fill-opacity:1;stroke-width:0.229189" + id="path2-9-9" + d="m 13.086202,15.115127 h -1.849021 c -0.127648,0 -0.277442,-0.04951 -0.274019,0.452549 l 0.04289,6.291311 c 0.0034,0.502058 0.103479,0.528635 0.231127,0.528635 h 1.84902 c 0.127648,0 0.188236,0.03049 0.188236,-0.471571 v -6.272289 c 0,-0.502061 -0.06059,-0.528635 -0.188236,-0.528635" + sodipodi:nodetypes="csssssssc" /> + <path + style="fill:#838686;fill-opacity:1;stroke-width:0.0288277" + d="m 7.5723233,17.590595 c 3.1254197,-0.0263 6.0505957,0.0064 9.0345347,-0.01352 -1.609474,2.379211 -3.013245,4.327721 -4.517736,6.434156 C 10.58252,21.871958 9.0624674,19.740729 7.5723233,17.590595 Z" + id="path2304-2-4" + sodipodi:nodetypes="cccc" /> + </g> + <g + id="g4425" + transform="translate(3.9125149,1007.4484)"> + <path + style="fill:#838686;fill-opacity:1;stroke-width:0.229189" + id="path2-9" + d="m 13.086202,15.115127 h -1.849021 c -0.127648,0 -0.277442,-0.04951 -0.274019,0.452549 l 0.04289,6.291311 c 0.0034,0.502058 0.103479,0.528635 0.231127,0.528635 h 1.84902 c 0.127648,0 0.188236,0.03049 0.188236,-0.471571 v -6.272289 c 0,-0.502061 -0.06059,-0.528635 -0.188236,-0.528635" + sodipodi:nodetypes="csssssssc" /> + <path + style="fill:#838686;fill-opacity:1;stroke-width:0.0288277" + d="m 7.5723233,17.590595 c 3.1254197,-0.0263 6.0505957,0.0064 9.0345347,-0.01352 -1.609474,2.379211 -3.013245,4.327721 -4.517736,6.434156 C 10.58252,21.871958 9.0624674,19.740729 7.5723233,17.590595 Z" + id="path2304-2" + sodipodi:nodetypes="cccc" /> + </g> + </g> + </g> +</svg>