FEM: move to new style connect()

This commit is contained in:
wmayer
2023-01-15 19:50:46 +01:00
parent a122aa01a7
commit d4cb3aca0e
24 changed files with 216 additions and 230 deletions

View File

@@ -69,9 +69,9 @@ TaskCreateNodeSet::TaskCreateNodeSet(Fem::FemSetNodesObject* pcObject, QWidget*
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, &QToolButton::clicked, this, &TaskCreateNodeSet::Poly);
QObject::connect(ui->toolButton_Pick, &QToolButton::clicked, this, &TaskCreateNodeSet::Pick);
QObject::connect(ui->comboBox, qOverload<int>(&QComboBox::activated), this, &TaskCreateNodeSet::SwitchMethod);
// check if the Link to the FemMesh is defined
assert(pcObject->FemMesh.getValue<Fem::FemMeshObject*>());
@@ -121,8 +121,6 @@ void TaskCreateNodeSet::SwitchMethod(int Value)
}
}
void TaskCreateNodeSet::DefineNodesCallback(void* ud, SoEventCallback* n)
{
// show the wait cursor because this could take quite some time
@@ -183,9 +181,11 @@ 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')
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());
@@ -200,14 +200,14 @@ void TaskCreateNodeSet::onSelectionChanged(const Gui::SelectionChanges& msg)
std::set<long> tmp = pcObject->FemMesh.getValue<Fem::FemMeshObject*>()->FemMesh.getValue().getSurfaceNodes(elem, face);
tempSet.insert(tmp.begin(), tmp.end());
}
else
else {
tempSet = pcObject->FemMesh.getValue<Fem::FemMeshObject*>()->FemMesh.getValue().getSurfaceNodes(elem, face);
}
selectionMode = none;
Gui::Selection().rmvSelectionGate();
MeshViewProvider->setHighlightNodes(tempSet);
}
}