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

Add ViewSelection and Jims Icon. Some fixes

Browse Source
This commit is contained in:
jriegel 2013-03-04 21:16:45 +01:00
parent 0ea6862601
commit b2d175edd3
11 changed files with 319 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Mod/Fem/Gui/Command.cpp
View File

@ -182,7 +182,7 @@ CmdFemDefineNodesSet::CmdFemDefineNodesSet()
sToolTipText = QT_TR_NOOP("Create node set by Poly");
sWhatsThis = "Create node set by Poly";
sStatusTip = QT_TR_NOOP("Create node set by Poly");
sPixmap = "Fem_FemMesh";
sPixmap = "Fem_FemMesh_createnodebypoly";
}
void CmdFemDefineNodesSet::activated(int iMsg)
@ -239,7 +239,7 @@ CmdFemCreateNodesSet::CmdFemCreateNodesSet()
sToolTipText = QT_TR_NOOP("Define/create a nodes set...");
sWhatsThis = sToolTipText;
sStatusTip = sToolTipText;
sPixmap = "Fem_FemMesh";
sPixmap = "Fem_FemMesh_createnodebypoly";
}

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

@ -1,6 +1,7 @@
<RCC>
<qresource>
<file>icons/Fem_FemMesh.svg</file>
<file>icons/Fem_FemMesh_createnodebypoly.svg</file>
<file>translations/Fem_af.qm</file>
<file>translations/Fem_de.qm</file>
<file>translations/Fem_fi.qm</file>

274
src/Mod/Fem/Gui/Resources/icons/Fem_FemMesh_createnodebypoly.svg Normal file
View File

@ -0,0 +1,274 @@
<?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="svg2860"
sodipodi:version="0.32"
inkscape:version="0.48.3.1 r9886"
sodipodi:docname="Fem_FemMesh_createnodebypoly.svg"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
version="1.1">
<defs
id="defs2862">
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3377"
id="radialGradient3692"
cx="45.883327"
cy="28.869568"
fx="45.883327"
fy="28.869568"
r="19.467436"
gradientUnits="userSpaceOnUse" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3377"
id="radialGradient3703"
gradientUnits="userSpaceOnUse"
cx="4.1100845"
cy="-151.3093"
fx="4.1100845"
fy="-151.3093"
r="19.467436"
gradientTransform="matrix(0.03092758,0.00729245,-0.01008312,0.04276724,98.446457,85.889801)" />
<linearGradient
id="linearGradient3377">
<stop
id="stop3379"
offset="0"
style="stop-color:#faff2b;stop-opacity:1;" />
<stop
id="stop3381"
offset="1"
style="stop-color:#ffaa00;stop-opacity:1;" />
</linearGradient>
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 32 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="64 : 32 : 1"
inkscape:persp3d-origin="32 : 21.333333 : 1"
id="perspective2868" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3377-8"
id="radialGradient3703-7"
gradientUnits="userSpaceOnUse"
cx="135.38333"
cy="97.369568"
fx="135.38333"
fy="97.369568"
r="19.467436"
gradientTransform="matrix(0.97435,0.2250379,-0.4623105,2.0016728,48.487554,-127.99883)" />
<linearGradient
id="linearGradient3377-8">
<stop
id="stop3379-0"
offset="0"
style="stop-color:#faff2b;stop-opacity:1;" />
<stop
id="stop3381-6"
offset="1"
style="stop-color:#ffaa00;stop-opacity:1;" />
</linearGradient>
<radialGradient
r="19.467436"
fy="97.369568"
fx="135.38333"
cy="97.369568"
cx="135.38333"
gradientTransform="matrix(1.4738064,0.34037651,-0.69929304,3.0275896,-134.18245,-299.93745)"
gradientUnits="userSpaceOnUse"
id="radialGradient3795"
xlink:href="#linearGradient3377-8"
inkscape:collect="always" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3377-6"
id="radialGradient3703-1"
gradientUnits="userSpaceOnUse"
cx="135.38333"
cy="97.369568"
fx="135.38333"
fy="97.369568"
r="19.467436"
gradientTransform="matrix(0.97435,0.2250379,-0.4623105,2.0016728,48.487554,-127.99883)" />
<linearGradient
id="linearGradient3377-6">
<stop
id="stop3379-06"
offset="0"
style="stop-color:#faff2b;stop-opacity:1;" />
<stop
id="stop3381-5"
offset="1"
style="stop-color:#ffaa00;stop-opacity:1;" />
</linearGradient>
<radialGradient
r="19.467436"
fy="97.369568"
fx="135.38333"
cy="97.369568"
cx="135.38333"
gradientTransform="matrix(1.4738064,0.34037651,-0.69929304,3.0275896,-140.61052,-323.99078)"
gradientUnits="userSpaceOnUse"
id="radialGradient3795-6"
xlink:href="#linearGradient3377-6"
inkscape:collect="always" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="12.359375"
inkscape:cx="32"
inkscape:cy="31.959545"
inkscape:current-layer="layer1"
showgrid="true"
inkscape:document-units="px"
inkscape:grid-bbox="true"
inkscape:window-width="1280"
inkscape:window-height="964"
inkscape:window-x="-2"
inkscape:window-y="-3"
inkscape:window-maximized="1" />
<metadata
id="metadata2865">
<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">
<path
style="fill:url(#radialGradient3795);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.32764792;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="M -0.07129012,19.926446 40.612842,27.317643 40.50401,63.987146 0.30856261,64.079776 z"
id="rect3520-7"
sodipodi:nodetypes="ccccc"
inkscape:connector-curvature="0" />
<path
style="fill:url(#radialGradient3795-6);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.32764792;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="M 38.614844,-0.41727756 64.086796,7.9609715 c 0,0 -0.111774,5.8263295 -0.206799,8.6302575 C 58.775209,19.864823 43.980752,26.691328 39.664201,29.004791 31.135651,27.933889 8.7986689,20.656718 -0.01679256,19.048426 0.24794225,16.500803 0.10079402,6.4714272 0.10079402,6.4714272 L 11.138676,-0.02574956 z"
id="rect3520-1"
sodipodi:nodetypes="cccccccc"
inkscape:connector-curvature="0" />
<g
id="g3618"
transform="matrix(1.5126047,0,0,1.5125297,-207.35401,-105.26217)">
<path
style="fill:url(#radialGradient3703);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.20000005;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="m 163.77648,88.813591 15.39079,-7.916481 0.3105,30.9914 -15.28828,0.007 z"
id="rect3520"
sodipodi:nodetypes="ccccc"
inkscape:connector-curvature="0" />
<path
style="fill:none;stroke:#7b5600;stroke-width:3.30563831;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="m 137.95978,81.79739 25.60359,7.143005 0.32198,22.317385 m 14.8934,-37.598433 -15.44299,-3.602933 m -19.67802,0.343112 -5.60198,2.827243"
id="rect3522"
sodipodi:nodetypes="ccccccc"
inkscape:connector-curvature="0" />
<path
style="fill:url(#radialGradient3692);fill-opacity:1;fill-rule:evenodd;stroke:#7b5600;stroke-width:3.30563831;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
d="m 163.60579,88.926422 15.15069,-8.67885"
id="path3536"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
</g>
<path
style="fill:none;stroke:#000000;stroke-width:1.51256716px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="m 13.110404,79.471866 c 0.09167,0 0.183347,0 0,0 z"
id="path2394"
inkscape:connector-curvature="0" />
<path
style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="M 2.1700333,63.896704 1.9795783,17.972805"
id="path2398"
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0" />
<path
style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 20.377345,23.426633 0.26158,40.521046"
id="path2400"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
<path
style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="M 33.847522,0.61059643 C 27.487419,4.1029195 6.4570337,15.297729 2.0122767,18.045778"
id="path2408"
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0" />
<path
style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="M 55.921679,3.8112896 C 48.994562,7.0129621 27.208088,19.524351 20.189122,23.598373"
id="path2412"
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0" />
<path
style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="M 63.899582,35.563153 C 56.21669,40.398678 50.734999,44.289359 40.751945,50.317624"
id="path2414"
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0" />
<path
style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="M 63.943606,52.306168 C 57.972698,56.515474 52.298829,60.735863 48.148635,64.042125"
id="path2416"
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0" />
<path
style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="M -0.25060426,38.194269 40.584342,50.355728"
id="path2424"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
<path
style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="M 26.680289,64.11787 0.24480163,56.656541"
id="path2426"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
<path
sodipodi:type="arc"
style="fill:#ff0900;fill-opacity:1;fill-rule:nonzero;stroke:#ff0900;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
id="path3033"
sodipodi:cx="32.885815"
sodipodi:cy="39.529411"
sodipodi:rx="4.0143385"
sodipodi:ry="2.435986"
d="m 36.900153,39.529411 a 4.0143385,2.435986 0 1 1 -8.028677,0 4.0143385,2.435986 0 1 1 8.028677,0 z"
transform="matrix(1.0663294,0.3691134,-0.3767504,1.0883919,-0.60642023,-10.536833)" />
<path
style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="M 4.4355879,4.1509581 58.123238,18.130346"
id="path3833"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
<path
style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="M 57.963093,63.990264 58.068412,18.145022"
id="path3852"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 12 KiB

8
src/Mod/Fem/Gui/TaskCreateNodeSet.cpp
View File

@ -55,7 +55,7 @@ using namespace FemGui;
using namespace Gui;
TaskCreateNodeSet::TaskCreateNodeSet(Fem::FemSetNodesObject *pcObject,QWidget *parent)
: TaskBox(Gui::BitmapFactory().pixmap("Fem_FemMesh"),
: TaskBox(Gui::BitmapFactory().pixmap("Fem_FemMesh_createnodebypoly"),
tr("Nodes set"),
true,
parent),
@ -133,11 +133,11 @@ void TaskCreateNodeSet::DefineNodesCallback(void * ud, SoEventCallback * n)
for (std::vector<SbVec2f>::const_iterator it = clPoly.begin(); it != clPoly.end(); ++it)
polygon.Add(Base::Vector2D((*it)[0],(*it)[1]));
taskBox->DefineNodes(polygon,proj);
taskBox->DefineNodes(polygon,proj,clip_inner);
}
void TaskCreateNodeSet::DefineNodes(const Base::Polygon2D &polygon,const Gui::ViewVolumeProjection &proj)
void TaskCreateNodeSet::DefineNodes(const Base::Polygon2D &polygon,const Gui::ViewVolumeProjection &proj,bool inner)
{
const SMESHDS_Mesh* data = const_cast<SMESH_Mesh*>(pcObject->FemMesh.getValue<Fem::FemMeshObject*>()->FemMesh.getValue().getSMesh())->GetMeshDS();
@ -151,7 +151,7 @@ void TaskCreateNodeSet::DefineNodes(const Base::Polygon2D &polygon,const Gui::Vi
const SMDS_MeshNode* aNode = aNodeIter->next();
Base::Vector3f vec(aNode->X(),aNode->Y(),aNode->Z());
pt2d = proj(vec);
if (polygon.Contains(Base::Vector2D(pt2d.x, pt2d.y)) == true)
if (polygon.Contains(Base::Vector2D(pt2d.x, pt2d.y)) == inner)
tempSet.insert(aNode->GetID());
}

2
src/Mod/Fem/Gui/TaskCreateNodeSet.h
View File

@ -68,7 +68,7 @@ private Q_SLOTS:
protected:
Fem::FemSetNodesObject *pcObject;
static void DefineNodesCallback(void * ud, SoEventCallback * n);
void DefineNodes(const Base::Polygon2D &polygon,const Gui::ViewVolumeProjection &proj);
void DefineNodes(const Base::Polygon2D &polygon,const Gui::ViewVolumeProjection &proj,bool);
private:

16
src/Mod/Fem/Gui/TaskDlgCreateNodeSet.cpp
View File

@ -33,6 +33,7 @@
#include <Gui/TaskView/TaskSelectLinkProperty.h>
#include <Gui/Application.h>
#include <Gui/Document.h>
#include <Gui/Command.h>
#include "ViewProviderFemMesh.h"
@ -75,10 +76,13 @@ bool TaskDlgCreateNodeSet::accept()
try {
FemSetNodesObject->Nodes.setValues(param->tempSet);
FemSetNodesObject->recompute();
Gui::Document* doc = Gui::Application::Instance->activeDocument();
if(doc)
doc->resetEdit();
//Gui::Document* doc = Gui::Application::Instance->activeDocument();
//if(doc)
// doc->resetEdit();
param->MeshViewProvider->resetHighlightNodes();
FemSetNodesObject->Label.setValue(name->name);
Gui::Command::doCommand(Gui::Command::Gui,"Gui.activeDocument().resetEdit()");
return true;
}
catch (const Base::Exception& e) {
@ -91,7 +95,13 @@ bool TaskDlgCreateNodeSet::accept()
bool TaskDlgCreateNodeSet::reject()
{
FemSetNodesObject->execute();
//Gui::Document* doc = Gui::Application::Instance->activeDocument();
//if(doc)
// doc->resetEdit();
param->MeshViewProvider->resetHighlightNodes();
Gui::Command::abortCommand();
Gui::Command::doCommand(Gui::Command::Gui,"Gui.activeDocument().resetEdit()");
return true;
}

54
src/Mod/Fem/Gui/TaskObjectName.cpp
View File

@ -44,7 +44,7 @@ using namespace FemGui;
using namespace Gui;
TaskObjectName::TaskObjectName(App::DocumentObject *pcObject,QWidget *parent)
: TaskBox(Gui::BitmapFactory().pixmap("Fem_FemMesh"),
: TaskBox(Gui::BitmapFactory().pixmap("Fem_FemMesh_createnodebypoly"),
tr("TaskObjectName"),
true,
parent),
@ -58,46 +58,22 @@ TaskObjectName::TaskObjectName(App::DocumentObject *pcObject,QWidget *parent)
this->groupLayout()->addWidget(proxy);
//QObject::connect(ui->pushButton_HideShow,SIGNAL(clicked()),this,SLOT(hideShow()));
//QObject::connect(ui->doubleSpinBoxSizing,SIGNAL(valueChanged (double)),this,SLOT(sizingValueChanged(double)));
//QObject::connect(ui->checkBoxOrientation,SIGNAL(toggled (bool)),this,SLOT(orientationToggled(bool)));
QObject::connect(ui->lineEdit_ObjectName,SIGNAL(textChanged (const QString&)),this,SLOT(TextChanged(const QString&)));
if(pcObject->Label.getValue() != "")
ui->lineEdit_ObjectName->setText(QString::fromUtf8(pcObject->Label.getValue()));
else
ui->lineEdit_ObjectName->setText(QString::fromAscii(pcObject->getNameInDocument()));
}
//void TaskObjectName::setHideShowObject(void)
//{
// HideShowObj = pcObject->Source.getValue();
//
// if(HideShowObj){
// QString ObjectName = QString::fromUtf8(HideShowObj->Label.getValue());
// ui->lineEdit_ObjectName->setText(ObjectName);
// }else{
// ui->lineEdit_ObjectName->setText(QString());
// }
//}
//
//void TaskObjectName::hideShow(void)
//{
// setHideShowObject();
//
// if(HideShowObj){
// Gui::Document* doc = Gui::Application::Instance->activeDocument();
// if(doc->getViewProvider(HideShowObj)->isVisible())
// doc->getViewProvider(HideShowObj)->setVisible(false);
// else
// doc->getViewProvider(HideShowObj)->setVisible(true);
// }
//}
//
//void TaskObjectName::sizingValueChanged(double Value)
//{
// pcObject->SegValue.setValue(Value);
//}
//
//void TaskObjectName::orientationToggled(bool Value)
//{
// pcObject->UseRotation.setValue(Value);
//}
//
void TaskObjectName::TextChanged ( const QString & text )
{
name =text.toUtf8();
//pcObject->Label.setValue(text.toUtf8());
}
TaskObjectName::~TaskObjectName()

8
src/Mod/Fem/Gui/TaskObjectName.h
View File

@ -52,11 +52,11 @@ public:
~TaskObjectName();
private Q_SLOTS:
//void hideShow(void);
//void sizingValueChanged(double Value);
//void orientationToggled(bool Value);
std::string name;
private Q_SLOTS:
void TextChanged ( const QString &);
protected:
App::DocumentObject *pcObject;

2
src/Mod/Fem/Gui/TaskObjectName.ui
View File

@ -19,7 +19,7 @@
<item>
<widget class="QLineEdit" name="lineEdit_ObjectName">
<property name="readOnly">
<bool>true</bool>
<bool>false</bool>
</property>
</widget>
</item>

3
src/Mod/Fem/Gui/ViewProviderFemMesh.cpp
View File

@ -248,6 +248,7 @@ void ViewProviderFemMesh::attach(App::DocumentObject *pcObj)
SoPointSet * pointset = new SoPointSet;
pcAnotRoot->addChild(pointset);
pcHighlight->addChild(pcFaces);
// flat
SoGroup* pcFlatRoot = new SoGroup();
@ -256,7 +257,7 @@ void ViewProviderFemMesh::attach(App::DocumentObject *pcObj)
pcFlatRoot->addChild(pShapeHints);
pcFlatRoot->addChild(pcShapeMaterial);
pcFlatRoot->addChild(pcMatBinding);
pcFlatRoot->addChild(pcFaces);
pcFlatRoot->addChild(pcHighlight);
pcFlatRoot->addChild(pcAnotRoot);
addDisplayMaskMode(pcFlatRoot, "Flat");

6
src/Mod/Fem/Gui/Workbench.cpp
View File

@ -56,8 +56,7 @@ Gui::ToolBarItem* Workbench::setupToolBars() const
Gui::ToolBarItem* fem = new Gui::ToolBarItem(root);
fem->setCommand("FEM");
*fem << "Fem_CreateFromShape"
<< "Fem_CreateNodesSet"
<< "Fem_DefineNodesSet";
<< "Fem_CreateNodesSet";
return root;
}
@ -69,8 +68,7 @@ Gui::MenuItem* Workbench::setupMenuBar() const
root->insertItem(item, fem);
fem->setCommand("&FEM");
*fem << "Fem_CreateFromShape"
<< "Fem_CreateNodesSet"
<< "Fem_DefineNodesSet";
<< "Fem_CreateNodesSet";
return root;
}