suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.code.sf.net/p/free-cad/code

Browse Source
This commit is contained in:
wmayer 2014-01-16 14:04:52 +01:00
commit 0575915815
14 changed files with 1601 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Gui/Action.cpp
View File

@ -296,6 +296,7 @@ int ActionGroup::checkedAction() const
void ActionGroup::setCheckedAction(int i)
{
_group->actions()[i]->setChecked(true);
this->setIcon(_group->actions()[i]->icon());
}
/**

142
src/Gui/CommandView.cpp
View File

@ -31,6 +31,7 @@
# include <QFile>
# include <QMessageBox>
# include <QTextStream>
# include <boost/bind.hpp>
#endif
#include "Command.h"
@ -524,7 +525,22 @@ bool StdCmdToggleClipPlane::isActive(void)
#endif
}
DEF_STD_CMD_ACL(StdCmdDrawStyle);
//===========================================================================
// StdCmdDrawStyle
//===========================================================================
class StdCmdDrawStyle : public Gui::Command
{
public:
StdCmdDrawStyle();
virtual ~StdCmdDrawStyle(){}
virtual void languageChange();
virtual const char* className() const {return "StdCmdDrawStyle";}
void updateIcon(const Gui::MDIView* view);
protected:
virtual void activated(int iMsg);
virtual bool isActive(void);
virtual Gui::Action * createAction(void);
};
StdCmdDrawStyle::StdCmdDrawStyle()
: Command("Std_DrawStyle")
@ -533,7 +549,10 @@ StdCmdDrawStyle::StdCmdDrawStyle()
sMenuText = QT_TR_NOOP("Draw style");
sToolTipText = QT_TR_NOOP("Draw style");
sStatusTip = QT_TR_NOOP("Draw style");
sPixmap = "DrawStyleAsIs";
eType = Alter3DView;
this->getGuiApplication()->signalActivateView.connect(boost::bind(&StdCmdDrawStyle::updateIcon, this, _1));
}
Gui::Action * StdCmdDrawStyle::createAction(void)
@ -542,8 +561,24 @@ Gui::Action * StdCmdDrawStyle::createAction(void)
pcAction->setDropDownMenu(true);
applyCommandData(pcAction);
pcAction->addAction(QString());
pcAction->addAction(QString());
QAction* a0 = pcAction->addAction(QString());
a0->setCheckable(true);
a0->setIcon(BitmapFactory().pixmap("DrawStyleAsIs"));
a0->setChecked(true);
QAction* a1 = pcAction->addAction(QString());
a1->setCheckable(true);
a1->setIcon(BitmapFactory().pixmap("DrawStyleFlatLines"));
QAction* a2 = pcAction->addAction(QString());
a2->setCheckable(true);
a2->setIcon(BitmapFactory().pixmap("DrawStyleShaded"));
QAction* a3 = pcAction->addAction(QString());
a3->setCheckable(true);
a3->setIcon(BitmapFactory().pixmap("DrawStyleWireFrame"));
QAction* a4 = pcAction->addAction(QString());
a4->setCheckable(true);
a4->setIcon(BitmapFactory().pixmap("DrawStylePoints"));
pcAction->setIcon(a0->icon());
_pcAction = pcAction;
languageChange();
return pcAction;
@ -566,23 +601,106 @@ void StdCmdDrawStyle::languageChange()
QCoreApplication::CodecForTr));
a[1]->setText(QCoreApplication::translate(
"Std_DrawStyle", "Wireframe", 0,
"Std_DrawStyle", "Flat lines", 0,
QCoreApplication::CodecForTr));
a[1]->setToolTip(QCoreApplication::translate(
"Std_DrawStyle", "Flat lines mode", 0,
QCoreApplication::CodecForTr));
a[2]->setText(QCoreApplication::translate(
"Std_DrawStyle", "Shaded", 0,
QCoreApplication::CodecForTr));
a[2]->setToolTip(QCoreApplication::translate(
"Std_DrawStyle", "Shaded mode", 0,
QCoreApplication::CodecForTr));
a[3]->setText(QCoreApplication::translate(
"Std_DrawStyle", "Wireframe", 0,
QCoreApplication::CodecForTr));
a[3]->setToolTip(QCoreApplication::translate(
"Std_DrawStyle", "Wireframe mode", 0,
QCoreApplication::CodecForTr));
a[4]->setText(QCoreApplication::translate(
"Std_DrawStyle", "Points", 0,
QCoreApplication::CodecForTr));
a[4]->setToolTip(QCoreApplication::translate(
"Std_DrawStyle", "Points mode", 0,
QCoreApplication::CodecForTr));
}
void StdCmdDrawStyle::updateIcon(const MDIView *view)
{
const Gui::View3DInventor *view3d = dynamic_cast<const Gui::View3DInventor *>(view);
if (!view3d)
return;
Gui::View3DInventorViewer *viewer = view3d->getViewer();
if (!viewer)
return;
std::string mode(viewer->getOverrideMode());
Gui::ActionGroup *actionGroup = dynamic_cast<Gui::ActionGroup *>(_pcAction);
if (!actionGroup)
return;
if (mode == "Flat Lines")
{
actionGroup->setCheckedAction(1);
return;
}
if (mode == "Shaded")
{
actionGroup->setCheckedAction(2);
return;
}
if (mode == "Wireframe")
{
actionGroup->setCheckedAction(3);
return;
}
if (mode == "Point")
{
actionGroup->setCheckedAction(4);
return;
}
actionGroup->setCheckedAction(0);
}
void StdCmdDrawStyle::activated(int iMsg)
{
View3DInventor* view = qobject_cast<View3DInventor*>(getMainWindow()->activeWindow());
if (view) {
SoQtViewer::DrawStyle style = SoQtViewer::VIEW_AS_IS;
if (iMsg == 0)
style = SoQtViewer::VIEW_AS_IS;
else if (iMsg == 1)
style = SoQtViewer::VIEW_LINE;
view->getViewer()->setDrawStyle(SoQtViewer::STILL, style);
Gui::Document *doc = this->getActiveGuiDocument();
std::list<MDIView*> views = doc->getMDIViews();
std::list<MDIView*>::iterator viewIt;
bool oneChangedSignal(false);
for (viewIt = views.begin(); viewIt != views.end(); viewIt++)
{
View3DInventor* view = qobject_cast<View3DInventor*>(*viewIt);
if (view)
{
View3DInventorViewer* viewer;
viewer = view->getViewer();
if (viewer)
{
switch (iMsg)
{
case 1:
(oneChangedSignal) ? viewer->updateOverrideMode("Flat Lines") : viewer->setOverrideMode("Flat Lines");
break;
case 2:
(oneChangedSignal) ? viewer->updateOverrideMode("Shaded") : viewer->setOverrideMode("Shaded");
break;
case 3:
(oneChangedSignal) ? viewer->updateOverrideMode("Wireframe") : viewer->setOverrideMode("Wireframe");
break;
case 4:
(oneChangedSignal) ? viewer->updateOverrideMode("Point") : viewer->setOverrideMode("Point");
break;
default:
(oneChangedSignal) ? viewer->updateOverrideMode("As Is") : viewer->setOverrideMode("As Is");
break;
}
oneChangedSignal = true;
}
}
}
}

13
src/Gui/Document.cpp
View File

@ -893,6 +893,19 @@ void Document::createView(const char* sType)
{
View3DInventor* view3D = new View3DInventor(this, getMainWindow());
//get first view override mode and copy
std::list<MDIView*> theViews = this->getMDIViews();
std::list<MDIView*>::iterator viewIt;
for (viewIt = theViews.begin(); viewIt != theViews.end(); ++viewIt)
{
View3DInventor *tempView = dynamic_cast<View3DInventor *>(*viewIt);
if (!tempView)
continue;
std::string overrideMode = tempView->getViewer()->getOverrideMode();
view3D->getViewer()->setOverrideMode(overrideMode);
break;
}
// attach the viewprovider
std::map<const App::DocumentObject*,ViewProviderDocumentObject*>::const_iterator It1;
for (It1=d->_ViewProviderMap.begin();It1!=d->_ViewProviderMap.end();++It1)

281
src/Gui/Icons/DrawStyleAsIs.svg Normal file
View File

@ -0,0 +1,281 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<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:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="64px"
height="64px"
id="svg3057"
version="1.1"
inkscape:version="0.48.2 r9819"
sodipodi:docname="DrawStyleAsIs.svg">
<defs
id="defs3059">
<linearGradient
id="linearGradient3878">
<stop
style="stop-color:#000000;stop-opacity:0.58823532;"
offset="0"
id="stop3880" />
<stop
style="stop-color:#000000;stop-opacity:0.58823532;"
offset="1"
id="stop3882" />
</linearGradient>
<linearGradient
id="linearGradient3870">
<stop
style="stop-color:#000000;stop-opacity:0.19607843;"
offset="0"
id="stop3872" />
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="1"
id="stop3874" />
</linearGradient>
<linearGradient
id="linearGradient3858">
<stop
style="stop-color:#000000;stop-opacity:0.19607843;"
offset="0"
id="stop3868" />
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="1"
id="stop3862" />
</linearGradient>
<linearGradient
id="linearGradient3839">
<stop
style="stop-color:#01d6d6;stop-opacity:1;"
offset="0"
id="stop3841" />
<stop
style="stop-color:#01d6d6;stop-opacity:0;"
offset="1"
id="stop3843" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3839"
id="linearGradient3856"
gradientUnits="userSpaceOnUse"
x1="46.097534"
y1="44.755539"
x2="8.6358585"
y2="30.117304" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3858"
id="linearGradient3864"
x1="9.78771"
y1="39.660793"
x2="47.374119"
y2="39.660793"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3870"
id="linearGradient3876"
x1="9.923306"
y1="34.257634"
x2="46.865743"
y2="34.257634"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3878"
id="linearGradient3884"
x1="28.433661"
y1="48.904176"
x2="29.433661"
y2="48.904176"
gradientUnits="userSpaceOnUse" />
<filter
inkscape:collect="always"
id="filter3923"
x="-0.067962196"
width="1.1359244"
y="-0.12348061"
height="1.2469612">
<feGaussianBlur
inkscape:collect="always"
stdDeviation="0.65648284"
id="feGaussianBlur3925" />
</filter>
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="6.5498916"
inkscape:cx="7.5850652"
inkscape:cy="31.574028"
inkscape:current-layer="g3851"
showgrid="true"
inkscape:document-units="px"
inkscape:grid-bbox="true"
inkscape:window-width="1366"
inkscape:window-height="675"
inkscape:window-x="-3"
inkscape:window-y="-3"
inkscape:window-maximized="1" />
<metadata
id="metadata3062">
<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
id="layer1"
inkscape:label="Layer 1"
inkscape:groupmode="layer">
<g
id="g3851"
transform="matrix(1.1386579,0,0,1.1324894,-5.849948,-6.8720445)">
<path
style="fill:#2e3436;fill-opacity:1;stroke:none;filter:url(#filter3923)"
d="M 47.40625 43 L 47.53125 50.09375 L 27.21875 60.46875 C 34.023542 62.552592 44.746395 61.653655 52.71875 58.09375 C 61.701685 54.082589 63.767457 48.210076 57.34375 45 C 54.792 43.724831 51.272329 43.088322 47.40625 43 z M 24.0625 59.09375 C 24.307801 59.241484 24.535786 59.39297 24.8125 59.53125 C 25.286248 59.767993 25.807856 59.992541 26.34375 60.1875 L 24.0625 59.09375 z "
transform="matrix(0.8782269,0,0,0.88301047,5.1375817,6.0680873)"
id="path3905" />
<path
sodipodi:nodetypes="ccccccc"
inkscape:connector-curvature="0"
id="path3069"
d="m 10.28771,30.049753 0,20.651546 18.645951,8.805896 L 46.874119,50.288597 46.514695,29.135837 28.015877,19.814391 10.28771,30.049753"
style="fill:url(#linearGradient3856);fill-opacity:1;stroke:url(#linearGradient3864);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
sodipodi:nodetypes="ccc"
inkscape:connector-curvature="0"
id="path3847"
d="m 10.423306,29.854686 18.510355,9.345033 17.432082,-9.88417"
style="fill:none;stroke:url(#linearGradient3876);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path3849"
d="m 28.933661,38.840294 0,20.127765"
style="fill:none;stroke:url(#linearGradient3884);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
sodipodi:type="star"
style="fill:#2e3436;fill-opacity:1;stroke:none"
id="path3942"
sodipodi:sides="3"
sodipodi:cx="10.102518"
sodipodi:cy="10.755281"
sodipodi:r1="4.0049009"
sodipodi:r2="2.0024507"
sodipodi:arg1="3.1415927"
sodipodi:arg2="4.1887902"
inkscape:flatsided="false"
inkscape:rounded="0"
inkscape:randomized="0"
d="m 6.0976171,10.755281 3.0036756,-1.7341727 3.0036763,-1.7341727 0,3.4683454 -1e-6,3.468346 -3.0036753,-1.734172 z"
transform="matrix(0.36553731,-0.37809581,0.12087403,0.11356563,23.367583,39.331779)"
inkscape:transform-center-x="0.50359455" />
<path
style="fill:#d3d7cf;fill-opacity:1"
d="m 28.681168,35.607035 2.470046,-3.6326 1.993572,1.848501 -3.633103,2.55427 z"
id="path3950"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<rect
style="fill:#edd400;fill-opacity:1;stroke:none"
id="rect3952"
width="21.433565"
height="2.7342744"
x="-2.0361388"
y="44.624931"
transform="matrix(0.69506602,-0.71894591,0.72879602,0.68473087,0,0)" />
<rect
style="fill:#eeeeec;fill-opacity:1"
id="rect3954"
width="6.1783423"
height="2.7220571"
x="19.342279"
y="44.645061"
transform="matrix(0.69506602,-0.71894591,0.72879602,0.68473087,0,0)" />
<path
transform="matrix(0.45421614,-0.46982132,0.37387015,0.35126486,31.625542,28.275422)"
d="m 35.898886,7.1018548 c 0,0.2807279 -0.227575,0.5083028 -0.508303,0.5083028 -0.280728,0 -0.508303,-0.2275749 -0.508303,-0.5083028 0,-0.2807279 0.227575,-0.5083028 0.508303,-0.5083028 0.280728,0 0.508303,0.2275749 0.508303,0.5083028 z"
sodipodi:ry="0.50830281"
sodipodi:rx="0.50830281"
sodipodi:cy="7.1018548"
sodipodi:cx="35.390583"
id="path3958"
style="fill:#babdb6;fill-opacity:1"
sodipodi:type="arc" />
<path
sodipodi:type="arc"
style="fill:#babdb6;fill-opacity:1"
id="path3960"
sodipodi:cx="35.390583"
sodipodi:cy="7.1018548"
sodipodi:rx="0.50830281"
sodipodi:ry="0.50830281"
d="m 35.898886,7.1018548 c 0,0.2807279 -0.227575,0.5083028 -0.508303,0.5083028 -0.280728,0 -0.508303,-0.2275749 -0.508303,-0.5083028 0,-0.2807279 0.227575,-0.5083028 0.508303,-0.5083028 0.280728,0 0.508303,0.2275749 0.508303,0.5083028 z"
transform="matrix(0.45421614,-0.46982132,0.37387015,0.35126486,29.259029,30.72324)" />
<path
style="fill:#babdb6;stroke:#babdb6;stroke-width:0.23401879;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 46.508164,16.053283 1.966508,1.847607"
id="path3962"
inkscape:connector-curvature="0" />
<path
inkscape:connector-curvature="0"
id="path3964"
d="m 47.362418,15.16968 1.966507,1.847607"
style="fill:#babdb6;stroke:#babdb6;stroke-width:0.23401879;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
style="fill:#babdb6;stroke:#babdb6;stroke-width:0.23401879;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 48.886221,13.593525 1.966508,1.847607"
id="path3966"
inkscape:connector-curvature="0" />
<path
inkscape:connector-curvature="0"
id="path3968"
d="m 49.740474,12.709922 1.966508,1.847607"
style="fill:#babdb6;stroke:#babdb6;stroke-width:0.23401879;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<rect
style="fill:#c17d11;fill-opacity:1"
id="rect3970"
width="3.1888218"
height="2.6202981"
x="25.487404"
y="44.645061"
ry="0"
transform="matrix(0.69506602,-0.71894591,0.72879602,0.68473087,0,0)" />
<path
sodipodi:type="arc"
style="fill:none;stroke:#a40000;stroke-width:4.38513613;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
id="path3035"
sodipodi:cx="34.904408"
sodipodi:cy="36.200817"
sodipodi:rx="24.068943"
sodipodi:ry="24.068943"
d="m 58.973351,36.200817 c 0,13.29291 -10.776033,24.068943 -24.068943,24.068943 -13.292911,0 -24.068944,-10.776033 -24.068944,-24.068943 0,-13.29291 10.776033,-24.068943 24.068944,-24.068943 13.29291,0 24.068943,10.776033 24.068943,24.068943 z"
transform="matrix(0.96600219,0,0,0.96474718,-0.26616188,-0.34154047)" />
<path
style="fill:none;stroke:#a40000;stroke-width:5.00000001;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
d="M 11.368357,50.677707 54.177325,16.572637"
id="path3805"
inkscape:connector-curvature="0"
transform="matrix(0.8782269,0,0,0.88301047,5.1375817,6.0680873)" />
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

265
src/Gui/Icons/DrawStyleFlatLines.svg Normal file
View File

@ -0,0 +1,265 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<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:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="64px"
height="64px"
id="svg3057"
version="1.1"
inkscape:version="0.48.2 r9819"
sodipodi:docname="DrawStyleFlatLines.svg">
<defs
id="defs3059">
<linearGradient
id="linearGradient3878">
<stop
style="stop-color:#000000;stop-opacity:0.58823532;"
offset="0"
id="stop3880" />
<stop
style="stop-color:#000000;stop-opacity:0.58823532;"
offset="1"
id="stop3882" />
</linearGradient>
<linearGradient
id="linearGradient3870">
<stop
style="stop-color:#000000;stop-opacity:0.19607843;"
offset="0"
id="stop3872" />
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="1"
id="stop3874" />
</linearGradient>
<linearGradient
id="linearGradient3858">
<stop
style="stop-color:#000000;stop-opacity:0.19607843;"
offset="0"
id="stop3868" />
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="1"
id="stop3862" />
</linearGradient>
<linearGradient
id="linearGradient3839">
<stop
style="stop-color:#01d6d6;stop-opacity:1;"
offset="0"
id="stop3841" />
<stop
style="stop-color:#01d6d6;stop-opacity:0;"
offset="1"
id="stop3843" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3839"
id="linearGradient3856"
gradientUnits="userSpaceOnUse"
x1="46.097534"
y1="44.755539"
x2="8.6358585"
y2="30.117304" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3858"
id="linearGradient3864"
x1="9.78771"
y1="39.660793"
x2="47.374119"
y2="39.660793"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3870"
id="linearGradient3876"
x1="9.923306"
y1="34.257634"
x2="46.865743"
y2="34.257634"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3878"
id="linearGradient3884"
x1="28.433661"
y1="48.904176"
x2="29.433661"
y2="48.904176"
gradientUnits="userSpaceOnUse" />
<filter
inkscape:collect="always"
id="filter3923"
x="-0.067962196"
width="1.1359244"
y="-0.12348061"
height="1.2469612">
<feGaussianBlur
inkscape:collect="always"
stdDeviation="0.65648284"
id="feGaussianBlur3925" />
</filter>
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="6.9324351"
inkscape:cx="13.180892"
inkscape:cy="27.026414"
inkscape:current-layer="g3851"
showgrid="true"
inkscape:document-units="px"
inkscape:grid-bbox="true"
inkscape:window-width="1366"
inkscape:window-height="675"
inkscape:window-x="-3"
inkscape:window-y="-3"
inkscape:window-maximized="1" />
<metadata
id="metadata3062">
<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
id="layer1"
inkscape:label="Layer 1"
inkscape:groupmode="layer">
<g
id="g3851"
transform="matrix(1.1386579,0,0,1.1324894,-5.849948,-6.8720445)">
<path
style="fill:#2e3436;fill-opacity:1;stroke:none;filter:url(#filter3923)"
d="M 47.40625 43 L 47.53125 50.09375 L 27.21875 60.46875 C 34.023542 62.552592 44.746395 61.653655 52.71875 58.09375 C 61.701685 54.082589 63.767457 48.210076 57.34375 45 C 54.792 43.724831 51.272329 43.088322 47.40625 43 z M 24.0625 59.09375 C 24.307801 59.241484 24.535786 59.39297 24.8125 59.53125 C 25.286248 59.767993 25.807856 59.992541 26.34375 60.1875 L 24.0625 59.09375 z "
transform="matrix(0.8782269,0,0,0.88301047,5.1375817,6.0680873)"
id="path3905" />
<path
sodipodi:nodetypes="ccccccc"
inkscape:connector-curvature="0"
id="path3069"
d="m 10.28771,30.049753 0,20.651546 18.645951,8.805896 L 46.874119,50.288597 46.514695,29.135837 28.015877,19.814391 10.28771,30.049753"
style="fill:url(#linearGradient3856);fill-opacity:1;stroke:url(#linearGradient3864);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
sodipodi:nodetypes="ccc"
inkscape:connector-curvature="0"
id="path3847"
d="m 10.423306,29.854686 18.510355,9.345033 17.432082,-9.88417"
style="fill:none;stroke:url(#linearGradient3876);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path3849"
d="m 28.933661,38.840294 0,20.127765"
style="fill:none;stroke:url(#linearGradient3884);stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
sodipodi:type="star"
style="fill:#2e3436;fill-opacity:1;stroke:none"
id="path3942"
sodipodi:sides="3"
sodipodi:cx="10.102518"
sodipodi:cy="10.755281"
sodipodi:r1="4.0049009"
sodipodi:r2="2.0024507"
sodipodi:arg1="3.1415927"
sodipodi:arg2="4.1887902"
inkscape:flatsided="false"
inkscape:rounded="0"
inkscape:randomized="0"
d="m 6.0976171,10.755281 3.0036756,-1.7341727 3.0036763,-1.7341727 0,3.4683454 -1e-6,3.468346 -3.0036753,-1.734172 z"
transform="matrix(0.36553731,-0.37809581,0.12087403,0.11356563,23.367583,39.331779)"
inkscape:transform-center-x="0.50359455" />
<path
style="fill:#d3d7cf;fill-opacity:1"
d="m 28.681168,35.607035 2.470046,-3.6326 1.993572,1.848501 -3.633103,2.55427 z"
id="path3950"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<rect
style="fill:#edd400;fill-opacity:1;stroke:none"
id="rect3952"
width="21.433565"
height="2.7342744"
x="-2.0361388"
y="44.624931"
transform="matrix(0.69506602,-0.71894591,0.72879602,0.68473087,0,0)" />
<rect
style="fill:#eeeeec;fill-opacity:1"
id="rect3954"
width="6.1783423"
height="2.7220571"
x="19.342279"
y="44.645061"
transform="matrix(0.69506602,-0.71894591,0.72879602,0.68473087,0,0)" />
<path
transform="matrix(0.45421614,-0.46982132,0.37387015,0.35126486,31.625542,28.275422)"
d="m 35.898886,7.1018548 c 0,0.2807279 -0.227575,0.5083028 -0.508303,0.5083028 -0.280728,0 -0.508303,-0.2275749 -0.508303,-0.5083028 0,-0.2807279 0.227575,-0.5083028 0.508303,-0.5083028 0.280728,0 0.508303,0.2275749 0.508303,0.5083028 z"
sodipodi:ry="0.50830281"
sodipodi:rx="0.50830281"
sodipodi:cy="7.1018548"
sodipodi:cx="35.390583"
id="path3958"
style="fill:#babdb6;fill-opacity:1"
sodipodi:type="arc" />
<path
sodipodi:type="arc"
style="fill:#babdb6;fill-opacity:1"
id="path3960"
sodipodi:cx="35.390583"
sodipodi:cy="7.1018548"
sodipodi:rx="0.50830281"
sodipodi:ry="0.50830281"
d="m 35.898886,7.1018548 c 0,0.2807279 -0.227575,0.5083028 -0.508303,0.5083028 -0.280728,0 -0.508303,-0.2275749 -0.508303,-0.5083028 0,-0.2807279 0.227575,-0.5083028 0.508303,-0.5083028 0.280728,0 0.508303,0.2275749 0.508303,0.5083028 z"
transform="matrix(0.45421614,-0.46982132,0.37387015,0.35126486,29.259029,30.72324)" />
<path
style="fill:#babdb6;stroke:#babdb6;stroke-width:0.23401879;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 46.508164,16.053283 1.966508,1.847607"
id="path3962"
inkscape:connector-curvature="0" />
<path
inkscape:connector-curvature="0"
id="path3964"
d="m 47.362418,15.16968 1.966507,1.847607"
style="fill:#babdb6;stroke:#babdb6;stroke-width:0.23401879;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
style="fill:#babdb6;stroke:#babdb6;stroke-width:0.23401879;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 48.886221,13.593525 1.966508,1.847607"
id="path3966"
inkscape:connector-curvature="0" />
<path
inkscape:connector-curvature="0"
id="path3968"
d="m 49.740474,12.709922 1.966508,1.847607"
style="fill:#babdb6;stroke:#babdb6;stroke-width:0.23401879;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<rect
style="fill:#c17d11;fill-opacity:1"
id="rect3970"
width="3.1888218"
height="2.6202981"
x="25.487404"
y="44.645061"
ry="0"
transform="matrix(0.69506602,-0.71894591,0.72879602,0.68473087,0,0)" />
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 9.7 KiB

312
src/Gui/Icons/DrawStylePoints.svg Normal file
View File

@ -0,0 +1,312 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<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:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="64px"
height="64px"
id="svg3057"
version="1.1"
inkscape:version="0.48.2 r9819"
sodipodi:docname="DrawStyleWireFrame.svg">
<defs
id="defs3059">
<linearGradient
id="linearGradient3878">
<stop
style="stop-color:#000000;stop-opacity:0.58823532;"
offset="0"
id="stop3880" />
<stop
style="stop-color:#000000;stop-opacity:0.58823532;"
offset="1"
id="stop3882" />
</linearGradient>
<linearGradient
id="linearGradient3870">
<stop
style="stop-color:#000000;stop-opacity:0.19607843;"
offset="0"
id="stop3872" />
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="1"
id="stop3874" />
</linearGradient>
<linearGradient
id="linearGradient3858">
<stop
style="stop-color:#000000;stop-opacity:0.19607843;"
offset="0"
id="stop3868" />
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="1"
id="stop3862" />
</linearGradient>
<linearGradient
id="linearGradient3839">
<stop
style="stop-color:#73d216;stop-opacity:0;"
offset="0"
id="stop3841" />
<stop
style="stop-color:#73d216;stop-opacity:0;"
offset="1"
id="stop3843" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3839"
id="linearGradient3856"
gradientUnits="userSpaceOnUse"
x1="46.097534"
y1="44.755539"
x2="8.6358585"
y2="30.117304" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3858"
id="linearGradient3864"
x1="9.78771"
y1="39.660793"
x2="47.374119"
y2="39.660793"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3870"
id="linearGradient3876"
x1="9.923306"
y1="34.257634"
x2="46.865743"
y2="34.257634"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3878"
id="linearGradient3884"
x1="28.433661"
y1="48.904176"
x2="29.433661"
y2="48.904176"
gradientUnits="userSpaceOnUse" />
<filter
inkscape:collect="always"
id="filter3923"
x="-0.067962196"
width="1.1359244"
y="-0.12348061"
height="1.2469612">
<feGaussianBlur
inkscape:collect="always"
stdDeviation="0.65648284"
id="feGaussianBlur3925" />
</filter>
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="5.6296615"
inkscape:cx="7.5850652"
inkscape:cy="37.680999"
inkscape:current-layer="g3851"
showgrid="true"
inkscape:document-units="px"
inkscape:grid-bbox="true"
inkscape:window-width="1366"
inkscape:window-height="675"
inkscape:window-x="-3"
inkscape:window-y="-3"
inkscape:window-maximized="1" />
<metadata
id="metadata3062">
<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></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
id="layer1"
inkscape:label="Layer 1"
inkscape:groupmode="layer">
<g
id="g3851"
transform="matrix(1.1386579,0,0,1.1324894,-5.849948,-6.8720445)">
<path
sodipodi:type="star"
style="fill:#2e3436;fill-opacity:1;stroke:none"
id="path3942"
sodipodi:sides="3"
sodipodi:cx="10.102518"
sodipodi:cy="10.755281"
sodipodi:r1="4.0049009"
sodipodi:r2="2.0024507"
sodipodi:arg1="3.1415927"
sodipodi:arg2="4.1887902"
inkscape:flatsided="false"
inkscape:rounded="0"
inkscape:randomized="0"
d="m 6.0976171,10.755281 3.0036756,-1.7341727 3.0036763,-1.7341727 0,3.4683454 -1e-6,3.468346 -3.0036753,-1.734172 z"
transform="matrix(0.36553731,-0.37809581,0.12087403,0.11356563,23.367583,39.331779)"
inkscape:transform-center-x="0.50359455" />
<path
style="fill:#d3d7cf;fill-opacity:1"
d="m 28.681168,35.607035 2.470046,-3.6326 1.993572,1.848501 -3.633103,2.55427 z"
id="path3950"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<rect
style="fill:#edd400;fill-opacity:1;stroke:none"
id="rect3952"
width="21.433565"
height="2.7342744"
x="-2.0361388"
y="44.624931"
transform="matrix(0.69506602,-0.71894591,0.72879602,0.68473087,0,0)" />
<rect
style="fill:#eeeeec;fill-opacity:1"
id="rect3954"
width="6.1783423"
height="2.7220571"
x="19.342279"
y="44.645061"
transform="matrix(0.69506602,-0.71894591,0.72879602,0.68473087,0,0)" />
<path
transform="matrix(0.45421614,-0.46982132,0.37387015,0.35126486,31.625542,28.275422)"
d="m 35.898886,7.1018548 a 0.50830281,0.50830281 0 1 1 -1.016606,0 0.50830281,0.50830281 0 1 1 1.016606,0 z"
sodipodi:ry="0.50830281"
sodipodi:rx="0.50830281"
sodipodi:cy="7.1018548"
sodipodi:cx="35.390583"
id="path3958"
style="fill:#babdb6;fill-opacity:1"
sodipodi:type="arc" />
<path
sodipodi:type="arc"
style="fill:#babdb6;fill-opacity:1"
id="path3960"
sodipodi:cx="35.390583"
sodipodi:cy="7.1018548"
sodipodi:rx="0.50830281"
sodipodi:ry="0.50830281"
d="m 35.898886,7.1018548 a 0.50830281,0.50830281 0 1 1 -1.016606,0 0.50830281,0.50830281 0 1 1 1.016606,0 z"
transform="matrix(0.45421614,-0.46982132,0.37387015,0.35126486,29.259029,30.72324)" />
<path
style="fill:#babdb6;stroke:#babdb6;stroke-width:0.23401879;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 46.508164,16.053283 1.966508,1.847607"
id="path3962"
inkscape:connector-curvature="0" />
<path
inkscape:connector-curvature="0"
id="path3964"
d="m 47.362418,15.16968 1.966507,1.847607"
style="fill:#babdb6;stroke:#babdb6;stroke-width:0.23401879;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
style="fill:#babdb6;stroke:#babdb6;stroke-width:0.23401879;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 48.886221,13.593525 1.966508,1.847607"
id="path3966"
inkscape:connector-curvature="0" />
<path
inkscape:connector-curvature="0"
id="path3968"
d="m 49.740474,12.709922 1.966508,1.847607"
style="fill:#babdb6;stroke:#babdb6;stroke-width:0.23401879;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<rect
style="fill:#c17d11;fill-opacity:1"
id="rect3970"
width="3.1888218"
height="2.6202981"
x="25.487404"
y="44.645061"
ry="0"
transform="matrix(0.69506602,-0.71894591,0.72879602,0.68473087,0,0)" />
<path
sodipodi:type="arc"
style="fill-opacity:1;stroke:none"
id="path4616"
sodipodi:cx="7.2828536"
sodipodi:cy="27.585733"
sodipodi:rx="2.8420892"
sodipodi:ry="2.8420892"
d="m 10.124943,27.585733 a 2.8420892,2.8420892 0 1 1 -5.6841786,0 2.8420892,2.8420892 0 1 1 5.6841786,0 z"
transform="matrix(0.8782269,0,0,0.88301047,4.5135819,5.754388)" />
<path
transform="matrix(0.8782269,0,0,0.88301047,21.517576,-4.2839899)"
d="m 10.124943,27.585733 a 2.8420892,2.8420892 0 1 1 -5.6841786,0 2.8420892,2.8420892 0 1 1 5.6841786,0 z"
sodipodi:ry="2.8420892"
sodipodi:rx="2.8420892"
sodipodi:cy="27.585733"
sodipodi:cx="7.2828536"
id="path4618"
style="fill-opacity:1;stroke:none"
sodipodi:type="arc" />
<path
sodipodi:type="arc"
style="fill-opacity:1;stroke:none"
id="path4620"
sodipodi:cx="7.2828536"
sodipodi:cy="27.585733"
sodipodi:rx="2.8420892"
sodipodi:ry="2.8420892"
d="m 10.124943,27.585733 a 2.8420892,2.8420892 0 1 1 -5.6841786,0 2.8420892,2.8420892 0 1 1 5.6841786,0 z"
transform="matrix(0.8782269,0,0,0.88301047,39.76957,4.6564405)" />
<path
transform="matrix(0.8782269,0,0,0.88301047,22.453576,14.851668)"
d="m 10.124943,27.585733 a 2.8420892,2.8420892 0 1 1 -5.6841786,0 2.8420892,2.8420892 0 1 1 5.6841786,0 z"
sodipodi:ry="2.8420892"
sodipodi:rx="2.8420892"
sodipodi:cy="27.585733"
sodipodi:cx="7.2828536"
id="path4622"
style="fill-opacity:1;stroke:none"
sodipodi:type="arc" />
<path
sodipodi:type="arc"
style="fill-opacity:1;stroke:none"
id="path4624"
sodipodi:cx="7.2828536"
sodipodi:cy="27.585733"
sodipodi:rx="2.8420892"
sodipodi:ry="2.8420892"
d="m 10.124943,27.585733 a 2.8420892,2.8420892 0 1 1 -5.6841786,0 2.8420892,2.8420892 0 1 1 5.6841786,0 z"
transform="matrix(0.8782269,0,0,0.88301047,22.609576,34.614725)" />
<path
transform="matrix(0.8782269,0,0,0.88301047,40.23757,26.144844)"
d="m 10.124943,27.585733 a 2.8420892,2.8420892 0 1 1 -5.6841786,0 2.8420892,2.8420892 0 1 1 5.6841786,0 z"
sodipodi:ry="2.8420892"
sodipodi:rx="2.8420892"
sodipodi:cy="27.585733"
sodipodi:cx="7.2828536"
id="path4626"
style="fill-opacity:1;stroke:none"
sodipodi:type="arc" />
<path
sodipodi:type="arc"
style="fill-opacity:1;stroke:none"
id="path4628"
sodipodi:cx="7.2828536"
sodipodi:cy="27.585733"
sodipodi:rx="2.8420892"
sodipodi:ry="2.8420892"
d="m 10.124943,27.585733 a 2.8420892,2.8420892 0 1 1 -5.6841786,0 2.8420892,2.8420892 0 1 1 5.6841786,0 z"
transform="matrix(0.8782269,0,0,0.88301047,4.5135821,26.615393)" />
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

265
src/Gui/Icons/DrawStyleShaded.svg Normal file
View File

@ -0,0 +1,265 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<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:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="64px"
height="64px"
id="svg3057"
version="1.1"
inkscape:version="0.48.2 r9819"
sodipodi:docname="DrawStyleShaded.svg">
<defs
id="defs3059">
<linearGradient
id="linearGradient3878">
<stop
style="stop-color:#000000;stop-opacity:0.58823532;"
offset="0"
id="stop3880" />
<stop
style="stop-color:#000000;stop-opacity:0.58823532;"
offset="1"
id="stop3882" />
</linearGradient>
<linearGradient
id="linearGradient3870">
<stop
style="stop-color:#000000;stop-opacity:0.19607843;"
offset="0"
id="stop3872" />
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="1"
id="stop3874" />
</linearGradient>
<linearGradient
id="linearGradient3858">
<stop
style="stop-color:#000000;stop-opacity:0.19607843;"
offset="0"
id="stop3868" />
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="1"
id="stop3862" />
</linearGradient>
<linearGradient
id="linearGradient3839">
<stop
style="stop-color:#01d6d6;stop-opacity:1;"
offset="0"
id="stop3841" />
<stop
style="stop-color:#01d6d6;stop-opacity:0;"
offset="1"
id="stop3843" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3839"
id="linearGradient3856"
gradientUnits="userSpaceOnUse"
x1="46.097534"
y1="44.755539"
x2="8.6358585"
y2="30.117304" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3858"
id="linearGradient3864"
x1="9.78771"
y1="39.660793"
x2="47.374119"
y2="39.660793"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3870"
id="linearGradient3876"
x1="9.923306"
y1="34.257634"
x2="46.865743"
y2="34.257634"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3878"
id="linearGradient3884"
x1="28.433661"
y1="48.904176"
x2="29.433661"
y2="48.904176"
gradientUnits="userSpaceOnUse" />
<filter
inkscape:collect="always"
id="filter3923"
x="-0.067962196"
width="1.1359244"
y="-0.12348061"
height="1.2469612">
<feGaussianBlur
inkscape:collect="always"
stdDeviation="0.65648284"
id="feGaussianBlur3925" />
</filter>
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="5.6355193"
inkscape:cx="7.6204813"
inkscape:cy="34.132491"
inkscape:current-layer="g3851"
showgrid="true"
inkscape:document-units="px"
inkscape:grid-bbox="true"
inkscape:window-width="1366"
inkscape:window-height="675"
inkscape:window-x="-3"
inkscape:window-y="-3"
inkscape:window-maximized="1" />
<metadata
id="metadata3062">
<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
id="layer1"
inkscape:label="Layer 1"
inkscape:groupmode="layer">
<g
id="g3851"
transform="matrix(1.1386579,0,0,1.1324894,-5.849948,-6.8720445)">
<path
style="fill:#2e3436;fill-opacity:1;stroke:none;filter:url(#filter3923)"
d="M 47.40625 43 L 47.53125 50.09375 L 27.21875 60.46875 C 34.023542 62.552592 44.746395 61.653655 52.71875 58.09375 C 61.701685 54.082589 63.767457 48.210076 57.34375 45 C 54.792 43.724831 51.272329 43.088322 47.40625 43 z M 24.0625 59.09375 C 24.307801 59.241484 24.535786 59.39297 24.8125 59.53125 C 25.286248 59.767993 25.807856 59.992541 26.34375 60.1875 L 24.0625 59.09375 z "
transform="matrix(0.8782269,0,0,0.88301047,5.1375817,6.0680873)"
id="path3905" />
<path
sodipodi:nodetypes="ccccccc"
inkscape:connector-curvature="0"
id="path3069"
d="m 10.28771,30.049753 0,20.651546 18.645951,8.805896 L 46.874119,50.288597 46.514695,29.135837 28.015877,19.814391 10.28771,30.049753"
style="fill:url(#linearGradient3856);fill-opacity:1;stroke:url(#linearGradient3864);stroke-width:0.08806154;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
<path
sodipodi:nodetypes="ccc"
inkscape:connector-curvature="0"
id="path3847"
d="m 10.423306,29.854686 18.510355,9.345033 17.432082,-9.88417"
style="fill:none;stroke:url(#linearGradient3876);stroke-width:0.08806154;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
<path
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path3849"
d="m 28.933661,38.840294 0,20.127765"
style="fill:none;stroke:url(#linearGradient3884);stroke-width:0.08806154;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
<path
sodipodi:type="star"
style="fill:#2e3436;fill-opacity:1;stroke:none"
id="path3942"
sodipodi:sides="3"
sodipodi:cx="10.102518"
sodipodi:cy="10.755281"
sodipodi:r1="4.0049009"
sodipodi:r2="2.0024507"
sodipodi:arg1="3.1415927"
sodipodi:arg2="4.1887902"
inkscape:flatsided="false"
inkscape:rounded="0"
inkscape:randomized="0"
d="m 6.0976171,10.755281 3.0036756,-1.7341727 3.0036763,-1.7341727 0,3.4683454 -1e-6,3.468346 -3.0036753,-1.734172 z"
transform="matrix(0.36553731,-0.37809581,0.12087403,0.11356563,23.367583,39.331779)"
inkscape:transform-center-x="0.50359455" />
<path
style="fill:#d3d7cf;fill-opacity:1"
d="m 28.681168,35.607035 2.470046,-3.6326 1.993572,1.848501 -3.633103,2.55427 z"
id="path3950"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<rect
style="fill:#edd400;fill-opacity:1;stroke:none"
id="rect3952"
width="21.433565"
height="2.7342744"
x="-2.0361388"
y="44.624931"
transform="matrix(0.69506602,-0.71894591,0.72879602,0.68473087,0,0)" />
<rect
style="fill:#eeeeec;fill-opacity:1"
id="rect3954"
width="6.1783423"
height="2.7220571"
x="19.342279"
y="44.645061"
transform="matrix(0.69506602,-0.71894591,0.72879602,0.68473087,0,0)" />
<path
transform="matrix(0.45421614,-0.46982132,0.37387015,0.35126486,31.625542,28.275422)"
d="m 35.898886,7.1018548 c 0,0.2807279 -0.227575,0.5083028 -0.508303,0.5083028 -0.280728,0 -0.508303,-0.2275749 -0.508303,-0.5083028 0,-0.2807279 0.227575,-0.5083028 0.508303,-0.5083028 0.280728,0 0.508303,0.2275749 0.508303,0.5083028 z"
sodipodi:ry="0.50830281"
sodipodi:rx="0.50830281"
sodipodi:cy="7.1018548"
sodipodi:cx="35.390583"
id="path3958"
style="fill:#babdb6;fill-opacity:1"
sodipodi:type="arc" />
<path
sodipodi:type="arc"
style="fill:#babdb6;fill-opacity:1"
id="path3960"
sodipodi:cx="35.390583"
sodipodi:cy="7.1018548"
sodipodi:rx="0.50830281"
sodipodi:ry="0.50830281"
d="m 35.898886,7.1018548 c 0,0.2807279 -0.227575,0.5083028 -0.508303,0.5083028 -0.280728,0 -0.508303,-0.2275749 -0.508303,-0.5083028 0,-0.2807279 0.227575,-0.5083028 0.508303,-0.5083028 0.280728,0 0.508303,0.2275749 0.508303,0.5083028 z"
transform="matrix(0.45421614,-0.46982132,0.37387015,0.35126486,29.259029,30.72324)" />
<path
style="fill:#babdb6;stroke:#babdb6;stroke-width:0.23401879;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 46.508164,16.053283 1.966508,1.847607"
id="path3962"
inkscape:connector-curvature="0" />
<path
inkscape:connector-curvature="0"
id="path3964"
d="m 47.362418,15.16968 1.966507,1.847607"
style="fill:#babdb6;stroke:#babdb6;stroke-width:0.23401879;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
style="fill:#babdb6;stroke:#babdb6;stroke-width:0.23401879;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 48.886221,13.593525 1.966508,1.847607"
id="path3966"
inkscape:connector-curvature="0" />
<path
inkscape:connector-curvature="0"
id="path3968"
d="m 49.740474,12.709922 1.966508,1.847607"
style="fill:#babdb6;stroke:#babdb6;stroke-width:0.23401879;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<rect
style="fill:#c17d11;fill-opacity:1"
id="rect3970"
width="3.1888218"
height="2.6202981"
x="25.487404"
y="44.645061"
ry="0"
transform="matrix(0.69506602,-0.71894591,0.72879602,0.68473087,0,0)" />
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 9.8 KiB

260
src/Gui/Icons/DrawStyleWireFrame.svg Normal file
View File

@ -0,0 +1,260 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<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:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="64px"
height="64px"
id="svg3057"
version="1.1"
inkscape:version="0.48.2 r9819"
sodipodi:docname="DrawStyleWireFrame.svg">
<defs
id="defs3059">
<linearGradient
id="linearGradient3878">
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="0"
id="stop3880" />
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="1"
id="stop3882" />
</linearGradient>
<linearGradient
id="linearGradient3870">
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="0"
id="stop3872" />
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="1"
id="stop3874" />
</linearGradient>
<linearGradient
id="linearGradient3858">
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="0"
id="stop3868" />
<stop
style="stop-color:#000000;stop-opacity:1;"
offset="1"
id="stop3862" />
</linearGradient>
<linearGradient
id="linearGradient3839">
<stop
style="stop-color:#73d216;stop-opacity:0;"
offset="0"
id="stop3841" />
<stop
style="stop-color:#73d216;stop-opacity:0;"
offset="1"
id="stop3843" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3839"
id="linearGradient3856"
gradientUnits="userSpaceOnUse"
x1="46.097534"
y1="44.755539"
x2="8.6358585"
y2="30.117304" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3858"
id="linearGradient3864"
x1="9.78771"
y1="39.660793"
x2="47.374119"
y2="39.660793"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3870"
id="linearGradient3876"
x1="9.923306"
y1="34.257634"
x2="46.865743"
y2="34.257634"
gradientUnits="userSpaceOnUse" />
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3878"
id="linearGradient3884"
x1="28.433661"
y1="48.904176"
x2="29.433661"
y2="48.904176"
gradientUnits="userSpaceOnUse" />
<filter
inkscape:collect="always"
id="filter3923"
x="-0.067962196"
width="1.1359244"
y="-0.12348061"
height="1.2469612">
<feGaussianBlur
inkscape:collect="always"
stdDeviation="0.65648284"
id="feGaussianBlur3925" />
</filter>
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="4.0274215"
inkscape:cx="22.855381"
inkscape:cy="31.473553"
inkscape:current-layer="g3851"
showgrid="true"
inkscape:document-units="px"
inkscape:grid-bbox="true"
inkscape:window-width="1366"
inkscape:window-height="675"
inkscape:window-x="-3"
inkscape:window-y="-3"
inkscape:window-maximized="1" />
<metadata
id="metadata3062">
<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
id="layer1"
inkscape:label="Layer 1"
inkscape:groupmode="layer">
<g
id="g3851"
transform="matrix(1.1386579,0,0,1.1324894,-5.849948,-6.8720445)">
<path
sodipodi:nodetypes="ccccccc"
inkscape:connector-curvature="0"
id="path3069"
d="m 10.28771,30.049753 0,20.651546 18.645951,8.805896 L 46.874119,50.288597 46.514695,29.135837 28.015877,19.814391 10.28771,30.049753"
style="fill:url(#linearGradient3856);fill-opacity:1;stroke:url(#linearGradient3864);stroke-width:1.76123088;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
<path
sodipodi:nodetypes="ccc"
inkscape:connector-curvature="0"
id="path3847"
d="m 10.423306,29.854686 18.510355,9.345033 17.432082,-9.88417"
style="fill:none;stroke:url(#linearGradient3876);stroke-width:1.76123088;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
<path
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path3849"
d="m 28.933661,38.840294 0,20.127765"
style="fill:none;stroke:url(#linearGradient3884);stroke-width:1.76123088;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none" />
<path
sodipodi:type="star"
style="fill:#2e3436;fill-opacity:1;stroke:none"
id="path3942"
sodipodi:sides="3"
sodipodi:cx="10.102518"
sodipodi:cy="10.755281"
sodipodi:r1="4.0049009"
sodipodi:r2="2.0024507"
sodipodi:arg1="3.1415927"
sodipodi:arg2="4.1887902"
inkscape:flatsided="false"
inkscape:rounded="0"
inkscape:randomized="0"
d="m 6.0976171,10.755281 3.0036756,-1.7341727 3.0036763,-1.7341727 0,3.4683454 -1e-6,3.468346 -3.0036753,-1.734172 z"
transform="matrix(0.36553731,-0.37809581,0.12087403,0.11356563,23.367583,39.331779)"
inkscape:transform-center-x="0.50359455" />
<path
style="fill:#d3d7cf;fill-opacity:1"
d="m 28.681168,35.607035 2.470046,-3.6326 1.993572,1.848501 -3.633103,2.55427 z"
id="path3950"
inkscape:connector-curvature="0"
sodipodi:nodetypes="ccccc" />
<rect
style="fill:#edd400;fill-opacity:1;stroke:none"
id="rect3952"
width="21.433565"
height="2.7342744"
x="-2.0361388"
y="44.624931"
transform="matrix(0.69506602,-0.71894591,0.72879602,0.68473087,0,0)" />
<rect
style="fill:#eeeeec;fill-opacity:1"
id="rect3954"
width="6.1783423"
height="2.7220571"
x="19.342279"
y="44.645061"
transform="matrix(0.69506602,-0.71894591,0.72879602,0.68473087,0,0)" />
<path
transform="matrix(0.45421614,-0.46982132,0.37387015,0.35126486,31.625542,28.275422)"
d="m 35.898886,7.1018548 c 0,0.2807279 -0.227575,0.5083028 -0.508303,0.5083028 -0.280728,0 -0.508303,-0.2275749 -0.508303,-0.5083028 0,-0.2807279 0.227575,-0.5083028 0.508303,-0.5083028 0.280728,0 0.508303,0.2275749 0.508303,0.5083028 z"
sodipodi:ry="0.50830281"
sodipodi:rx="0.50830281"
sodipodi:cy="7.1018548"
sodipodi:cx="35.390583"
id="path3958"
style="fill:#babdb6;fill-opacity:1"
sodipodi:type="arc" />
<path
sodipodi:type="arc"
style="fill:#babdb6;fill-opacity:1"
id="path3960"
sodipodi:cx="35.390583"
sodipodi:cy="7.1018548"
sodipodi:rx="0.50830281"
sodipodi:ry="0.50830281"
d="m 35.898886,7.1018548 c 0,0.2807279 -0.227575,0.5083028 -0.508303,0.5083028 -0.280728,0 -0.508303,-0.2275749 -0.508303,-0.5083028 0,-0.2807279 0.227575,-0.5083028 0.508303,-0.5083028 0.280728,0 0.508303,0.2275749 0.508303,0.5083028 z"
transform="matrix(0.45421614,-0.46982132,0.37387015,0.35126486,29.259029,30.72324)" />
<path
style="fill:#babdb6;stroke:#babdb6;stroke-width:0.23401879;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 46.508164,16.053283 1.966508,1.847607"
id="path3962"
inkscape:connector-curvature="0" />
<path
inkscape:connector-curvature="0"
id="path3964"
d="m 47.362418,15.16968 1.966507,1.847607"
style="fill:#babdb6;stroke:#babdb6;stroke-width:0.23401879;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
style="fill:#babdb6;stroke:#babdb6;stroke-width:0.23401879;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 48.886221,13.593525 1.966508,1.847607"
id="path3966"
inkscape:connector-curvature="0" />
<path
inkscape:connector-curvature="0"
id="path3968"
d="m 49.740474,12.709922 1.966508,1.847607"
style="fill:#babdb6;stroke:#babdb6;stroke-width:0.23401879;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<rect
style="fill:#c17d11;fill-opacity:1"
id="rect3970"
width="3.1888218"
height="2.6202981"
x="25.487404"
y="44.645061"
ry="0"
transform="matrix(0.69506602,-0.71894591,0.72879602,0.68473087,0,0)" />
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 9.2 KiB

17
src/Gui/Icons/resource.qrc
View File

@ -95,11 +95,16 @@
<file>Part_Measure_Clear_All.svg</file>
<file>Part_Measure_Toggle_All.svg</file>
<file>spaceball_button.svg</file>
<file>SpNav-PanLR.svg</file>
<file>SpNav-PanUD.svg</file>
<file>SpNav-Roll.svg</file>
<file>SpNav-Spin.svg</file>
<file>SpNav-Tilt.svg</file>
<file>SpNav-Zoom.svg</file>
<file>SpNav-PanLR.png</file>
<file>SpNav-PanUD.png</file>
<file>SpNav-Roll.png</file>
<file>SpNav-Spin.png</file>
<file>SpNav-Tilt.png</file>
<file>SpNav-Zoom.png</file>
<file>DrawStyleAsIs.svg</file>
<file>DrawStyleFlatLines.svg</file>
<file>DrawStylePoints.svg</file>
<file>DrawStyleShaded.svg</file>
<file>DrawStyleWireFrame.svg</file>
</qresource>
</RCC>

25
src/Gui/View3DInventorViewer.cpp
View File

@ -141,9 +141,9 @@ SOQT_OBJECT_ABSTRACT_SOURCE(View3DInventorViewer);
// *************************************************************************
View3DInventorViewer::View3DInventorViewer (QWidget *parent, const char *name,
SbBool embed, Type type, SbBool build)
: inherited (parent, name, embed, type, build), editViewProvider(0), navigation(0),
framebuffer(0), editing(FALSE), redirected(FALSE), allowredir(FALSE),axisCross(0),axisGroup(0)
SbBool embed, Type type, SbBool build)
: inherited (parent, name, embed, type, build), editViewProvider(0),navigation(0),
editing(FALSE), redirected(FALSE), overrideMode("As Is")
{
Gui::Selection().Attach(this);
@ -360,6 +360,7 @@ void View3DInventorViewer::addViewProvider(ViewProvider* pcProvider)
SoSeparator* back = pcProvider->getBackRoot ();
if (back) backgroundroot->addChild(back);
pcProvider->setOverrideMode(this->getOverrideMode());
_ViewProviderSet.insert(pcProvider);
}
@ -412,6 +413,24 @@ SbBool View3DInventorViewer::isEditingViewProvider() const
return this->editViewProvider ? true : false;
}
/// display override mode
void View3DInventorViewer::setOverrideMode(const std::string &mode)
{
if (mode == overrideMode)
return;
overrideMode = mode;
for (std::set<ViewProvider*>::iterator it = _ViewProviderSet.begin(); it != _ViewProviderSet.end(); ++it)
(*it)->setOverrideMode(mode);
}
/// update override mode. doesn't affect providers
void View3DInventorViewer::updateOverrideMode(const std::string &mode)
{
if (mode == overrideMode)
return;
overrideMode = mode;
}
void View3DInventorViewer::clearBuffer(void * userdata, SoAction * action)
{
if (action->isOfType(SoGLRenderAction::getClassTypeId())) {

6
src/Gui/View3DInventorViewer.h
View File

@ -159,6 +159,10 @@ public:
SbBool isEditingViewProvider() const;
/// reset from edit mode
void resetEditingViewProvider();
/// display override mode
void setOverrideMode(const std::string &mode);
void updateOverrideMode(const std::string &mode);
std::string getOverrideMode() {return overrideMode;}
//@}
/** @name Making pictures */
@ -359,6 +363,8 @@ private:
SbBool redirected;
SbBool allowredir;
std::string overrideMode;
// friends
friend class NavigationStyle;
friend class GLPainter;

33
src/Gui/ViewProvider.cpp
View File

@ -61,7 +61,7 @@ using namespace Gui;
PROPERTY_SOURCE_ABSTRACT(Gui::ViewProvider, App::PropertyContainer)
ViewProvider::ViewProvider()
: pcAnnotation(0), pyViewObject(0), _iActualMode(-1), _iEditMode(-1), _updateData(true)
: pcAnnotation(0), pyViewObject(0), _iActualMode(-1), _iEditMode(-1), _updateData(true), viewOverrideMode(-1)
{
pcRoot = new SoSeparator();
pcRoot->ref();
@ -261,10 +261,10 @@ void ViewProvider::setDisplayMaskMode( const char* type )
{
std::map<std::string, int>::const_iterator it = _sDisplayMaskModes.find( type );
if (it != _sDisplayMaskModes.end())
pcModeSwitch->whichChild = it->second;
_iActualMode = it->second;
else
pcModeSwitch->whichChild = -1;
_iActualMode = pcModeSwitch->whichChild.getValue();
_iActualMode = -1;
setModeSwitch();
}
std::vector<std::string> ViewProvider::getDisplayMaskModes() const
@ -298,7 +298,7 @@ void ViewProvider::hide(void)
void ViewProvider::show(void)
{
pcModeSwitch->whichChild = _iActualMode;
setModeSwitch();
}
bool ViewProvider::isShow(void) const
@ -316,6 +316,29 @@ bool ViewProvider::isVisible() const
return isShow();
}
void ViewProvider::setOverrideMode(const std::string &mode)
{
if (mode == "As Is")
viewOverrideMode = -1;
else {
std::map<std::string, int>::const_iterator it = _sDisplayMaskModes.find(mode);
if (it == _sDisplayMaskModes.end())
return; //view style not supported
viewOverrideMode = (*it).second;
}
if (pcModeSwitch->whichChild.getValue() != -1)
setModeSwitch();
}
void ViewProvider::setModeSwitch()
{
if (viewOverrideMode == -1)
pcModeSwitch->whichChild = _iActualMode;
else
if (viewOverrideMode < pcModeSwitch->getNumChildren())
pcModeSwitch->whichChild = viewOverrideMode;
}
void ViewProvider::setDefaultMode(int val)
{
_iActualMode = val;

4
src/Gui/ViewProvider.h
View File

@ -192,6 +192,8 @@ public:
virtual bool isShow(void) const;
void setVisible(bool);
bool isVisible() const;
/// Overrides the display mode with mode.
void setOverrideMode(const std::string &mode);
//@}
@ -307,8 +309,10 @@ protected:
ViewProviderPy* pyViewObject;
private:
void setModeSwitch();
int _iActualMode;
int _iEditMode;
int viewOverrideMode;
std::string _sCurrentMode;
std::map<std::string, int> _sDisplayMaskModes;
bool _updateData;

7
src/Gui/Workbench.cpp
View File

@ -403,7 +403,7 @@ void StdWorkbench::setupContextMenu(const char* recipient, MenuItem* item) const
measure->setCommand("Measure");
*measure << "View_Measure_Toggle_All" << "View_Measure_Clear_All";
*item << "Std_ViewFitAll" << "Std_ViewFitSelection" << StdViews << measure
*item << "Std_ViewFitAll" << "Std_ViewFitSelection" << "Std_DrawStyle" << StdViews << measure
<< "Separator" << "Std_ViewDockUndockFullscreen";
if (Gui::Selection().countObjectsOfType(App::DocumentObject::getClassTypeId()) > 0 )
@ -482,7 +482,7 @@ MenuItem* StdWorkbench::setupMenuBar() const
MenuItem* view = new MenuItem( menuBar );
view->setCommand("&View");
*view << "Std_ViewCreate" << "Std_OrthographicCamera" << "Std_PerspectiveCamera" << "Separator"
<< stdviews << "Std_FreezeViews" << "Separator" << view3d << zoom
<< stdviews << "Std_FreezeViews" << "Std_DrawStyle" << "Separator" << view3d << zoom
<< "Std_ViewDockUndockFullscreen" << "Std_AxisCross" << "Std_ToggleClipPlane"
<< "Std_TextureMapping" << "Separator" << visu
<< "Std_ToggleVisibility" << "Std_ToggleNavigation"
@ -549,10 +549,9 @@ ToolBarItem* StdWorkbench::setupToolBars() const
// View
ToolBarItem* view = new ToolBarItem( root );
view->setCommand("View");
*view << "Std_ViewFitAll" << "Separator" << "Std_ViewAxo" << "Separator" << "Std_ViewFront"
*view << "Std_ViewFitAll" << "Std_DrawStyle" << "Separator" << "Std_ViewAxo" << "Separator" << "Std_ViewFront"
<< "Std_ViewTop" << "Std_ViewRight" << "Separator" << "Std_ViewRear" << "Std_ViewBottom"
<< "Std_ViewLeft" << "Separator" << "Std_MeasureDistance" ;
return root;
}