[skip CI] [FEM] some style changes by MSVC

- to avoid annoying unnecessary diffs while working on the FEM module
This commit is contained in:
Uwe
2022-03-25 18:55:33 +01:00
parent f88c95d743
commit b186269f54
18 changed files with 363 additions and 380 deletions

View File

@@ -59,13 +59,13 @@ using namespace FemGui;
using namespace Gui;
TaskCreateNodeSet::TaskCreateNodeSet(Fem::FemSetNodesObject *pcObject,QWidget *parent)
TaskCreateNodeSet::TaskCreateNodeSet(Fem::FemSetNodesObject* pcObject, QWidget* parent)
: TaskBox(Gui::BitmapFactory().pixmap("FEM_CreateNodesSet"),
tr("Nodes set"),
true,
parent),
pcObject(pcObject),
selectionMode(none)
tr("Nodes set"),
true,
parent),
pcObject(pcObject),
selectionMode(none)
{
// we need a separate container widget to add all controls to
proxy = new QWidget(this);
@@ -75,13 +75,13 @@ TaskCreateNodeSet::TaskCreateNodeSet(Fem::FemSetNodesObject *pcObject,QWidget *p
this->groupLayout()->addWidget(proxy);
QObject::connect(ui->toolButton_Poly,SIGNAL(clicked()),this,SLOT(Poly()));
QObject::connect(ui->toolButton_Pick,SIGNAL(clicked()),this,SLOT(Pick()));
QObject::connect(ui->comboBox,SIGNAL(activated (int)),this,SLOT(SwitchMethod(int)));
QObject::connect(ui->toolButton_Poly, SIGNAL(clicked()), this, SLOT(Poly()));
QObject::connect(ui->toolButton_Pick, SIGNAL(clicked()), this, SLOT(Pick()));
QObject::connect(ui->comboBox, SIGNAL(activated(int)), this, SLOT(SwitchMethod(int)));
// check if the Link to the FemMesh is defined
assert(pcObject->FemMesh.getValue<Fem::FemMeshObject*>());
MeshViewProvider = dynamic_cast<ViewProviderFemMesh*>(Gui::Application::Instance->getViewProvider( pcObject->FemMesh.getValue<Fem::FemMeshObject*>()));
MeshViewProvider = dynamic_cast<ViewProviderFemMesh*>(Gui::Application::Instance->getViewProvider(pcObject->FemMesh.getValue<Fem::FemMeshObject*>()));
assert(MeshViewProvider);
tempSet = pcObject->Nodes.getValues();
@@ -100,13 +100,13 @@ void TaskCreateNodeSet::Poly(void)
Gui::View3DInventorViewer* viewer = ((Gui::View3DInventor*)view)->getViewer();
viewer->setEditing(true);
viewer->startSelection(Gui::View3DInventorViewer::Clip);
viewer->addEventCallback(SoMouseButtonEvent::getClassTypeId(), DefineNodesCallback,this);
viewer->addEventCallback(SoMouseButtonEvent::getClassTypeId(), DefineNodesCallback, this);
}
}
void TaskCreateNodeSet::Pick(void)
{
if (selectionMode == none){
if (selectionMode == none) {
selectionMode = PickElement;
Gui::Selection().clearSelection();
Gui::Selection().addSelectionGate(new FemSelectionGate(FemSelectionGate::Element));
@@ -115,11 +115,12 @@ void TaskCreateNodeSet::Pick(void)
void TaskCreateNodeSet::SwitchMethod(int Value)
{
if(Value == 1){
if (Value == 1) {
ui->groupBox_AngleSearch->setEnabled(true);
ui->toolButton_Pick->setEnabled(true);
ui->toolButton_Poly->setEnabled(false);
}else{
}
else {
ui->groupBox_AngleSearch->setEnabled(false);
ui->toolButton_Pick->setEnabled(false);
ui->toolButton_Poly->setEnabled(true);
@@ -128,18 +129,18 @@ void TaskCreateNodeSet::SwitchMethod(int Value)
void TaskCreateNodeSet::DefineNodesCallback(void * ud, SoEventCallback * n)
void TaskCreateNodeSet::DefineNodesCallback(void* ud, SoEventCallback* n)
{
// show the wait cursor because this could take quite some time
Gui::WaitCursor wc;
TaskCreateNodeSet *taskBox = static_cast<TaskCreateNodeSet *>(ud);
TaskCreateNodeSet* taskBox = static_cast<TaskCreateNodeSet*>(ud);
// When this callback function is invoked we must in either case leave the edit mode
Gui::View3DInventorViewer* view = reinterpret_cast<Gui::View3DInventorViewer*>(n->getUserData());
Gui::View3DInventorViewer* view = reinterpret_cast<Gui::View3DInventorViewer*>(n->getUserData());
view->setEditing(false);
view->removeEventCallback(SoMouseButtonEvent::getClassTypeId(), DefineNodesCallback,ud);
view->removeEventCallback(SoMouseButtonEvent::getClassTypeId(), DefineNodesCallback, ud);
n->setHandled();
Gui::SelectionRole role;
@@ -154,24 +155,24 @@ void TaskCreateNodeSet::DefineNodesCallback(void * ud, SoEventCallback * n)
Gui::ViewVolumeProjection proj(vv);
Base::Polygon2d polygon;
for (std::vector<SbVec2f>::const_iterator it = clPoly.begin(); it != clPoly.end(); ++it)
polygon.Add(Base::Vector2d((*it)[0],(*it)[1]));
polygon.Add(Base::Vector2d((*it)[0], (*it)[1]));
taskBox->DefineNodes(polygon,proj,role == Gui::SelectionRole::Inner ? true : false);
taskBox->DefineNodes(polygon, proj, role == Gui::SelectionRole::Inner ? true : false);
}
void TaskCreateNodeSet::DefineNodes(const Base::Polygon2d &polygon,const Gui::ViewVolumeProjection &proj,bool inner)
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();
SMDS_NodeIteratorPtr aNodeIter = data->nodesIterator();
Base::Vector3f pt2d;
if(! ui->checkBox_Add->isChecked())
if (!ui->checkBox_Add->isChecked())
tempSet.clear();
while (aNodeIter->more()) {
const SMDS_MeshNode* aNode = aNodeIter->next();
Base::Vector3f vec(aNode->X(),aNode->Y(),aNode->Z());
Base::Vector3f vec(aNode->X(), aNode->Y(), aNode->Z());
pt2d = proj(vec);
if (polygon.Contains(Base::Vector2d(pt2d.x, pt2d.y)) == inner)
tempSet.insert(aNode->GetID());
@@ -187,25 +188,26 @@ void TaskCreateNodeSet::onSelectionChanged(const Gui::SelectionChanges& msg)
if (msg.Type == Gui::SelectionChanges::AddSelection) {
std::string subName(msg.pSubName);
unsigned int i=0;
for(;i<subName.size();i++)
if(msg.pSubName[i]=='F')
unsigned int i = 0;
for (; i < subName.size(); i++)
if (msg.pSubName[i] == 'F')
break;
int elem = atoi(subName.substr(4).c_str());
int face = atoi(subName.substr(i+1).c_str() );
int face = atoi(subName.substr(i + 1).c_str());
tempSet.clear();
tempSet.clear();
Base::Console().Message("Picked Element:%i Face:%i\n",elem,face);
Base::Console().Message("Picked Element:%i Face:%i\n", elem, face);
if(! ui->checkBox_Add->isChecked()){
std::set<long> tmp = pcObject->FemMesh.getValue<Fem::FemMeshObject*>()->FemMesh.getValue().getSurfaceNodes(elem,face);
tempSet.insert(tmp.begin(),tmp.end());
}else
tempSet = pcObject->FemMesh.getValue<Fem::FemMeshObject*>()->FemMesh.getValue().getSurfaceNodes(elem,face);
if (!ui->checkBox_Add->isChecked()) {
std::set<long> tmp = pcObject->FemMesh.getValue<Fem::FemMeshObject*>()->FemMesh.getValue().getSurfaceNodes(elem, face);
tempSet.insert(tmp.begin(), tmp.end());
}
else
tempSet = pcObject->FemMesh.getValue<Fem::FemMeshObject*>()->FemMesh.getValue().getSurfaceNodes(elem, face);
selectionMode = none;
Gui::Selection().rmvSelectionGate();
@@ -222,5 +224,4 @@ TaskCreateNodeSet::~TaskCreateNodeSet()
Gui::Selection().rmvSelectionGate();
}
#include "moc_TaskCreateNodeSet.cpp"