Skip to content

Commit

Permalink
Mesh: fix many linter warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
@wwmayer
wwmayer committed Mar 11, 2024
1 parent 52fffaf commit 9140327
Show file tree
Hide file tree
Showing 32 changed files with 232 additions and 138 deletions.
64 changes: 44 additions & 20 deletions src/Mod/Mesh/App/MeshPyImp.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ struct MeshPropertyLock

private:
PropertyMeshKernel* prop;
FC_DISABLE_COPY_MOVE(MeshPropertyLock)
};

int MeshPy::PyInit(PyObject* args, PyObject*)
Expand Down Expand Up @@ -345,7 +346,7 @@ PyObject* MeshPy::write(PyObject* args, PyObject* kwds)

PyObject* MeshPy::writeInventor(PyObject* args)
{
float creaseangle = 0.0f;
float creaseangle = 0.0F;
if (!PyArg_ParseTuple(args, "|f", &creaseangle)) {
return nullptr;
}
Expand Down Expand Up @@ -374,7 +375,9 @@ PyObject* MeshPy::offset(PyObject* args)

PyObject* MeshPy::offsetSpecial(PyObject* args)
{
float Float {}, zmin {}, zmax {};
float Float {};
float zmin {};
float zmax {};
if (!PyArg_ParseTuple(args, "fff", &Float, &zmin, &zmax)) {
return nullptr;
}
Expand All @@ -392,7 +395,7 @@ PyObject* MeshPy::crossSections(PyObject* args)
{
PyObject* obj {};
PyObject* poly = Py_False;
float min_eps = 1.0e-2f;
float min_eps = 1.0e-2F;
if (!PyArg_ParseTuple(args, "O|fO!", &obj, &min_eps, &PyBool_Type, &poly)) {
return nullptr;
}
Expand Down Expand Up @@ -554,7 +557,7 @@ PyObject* MeshPy::section(PyObject* args, PyObject* kwds)
{
PyObject* pcObj {};
PyObject* connectLines = Py_True;
float fMinDist = 0.0001f;
float fMinDist = 0.0001F;

static const std::array<const char*, 4> keywords_section {"Mesh",
"ConnectLines",
Expand Down Expand Up @@ -601,7 +604,9 @@ PyObject* MeshPy::coarsen(PyObject* args)

PyObject* MeshPy::translate(PyObject* args)
{
float x {}, y {}, z {};
float x {};
float y {};
float z {};
if (!PyArg_ParseTuple(args, "fff", &x, &y, &z)) {
return nullptr;
}
Expand All @@ -619,7 +624,9 @@ PyObject* MeshPy::translate(PyObject* args)

PyObject* MeshPy::rotate(PyObject* args)
{
double x {}, y {}, z {};
double x {};
double y {};
double z {};
if (!PyArg_ParseTuple(args, "ddd", &x, &y, &z)) {
return nullptr;
}
Expand Down Expand Up @@ -677,7 +684,15 @@ PyObject* MeshPy::getEigenSystem(PyObject* args)

PyObject* MeshPy::addFacet(PyObject* args)
{
double x1 {}, y1 {}, z1 {}, x2 {}, y2 {}, z2 {}, x3 {}, y3 {}, z3 {};
double x1 {};
double y1 {};
double z1 {};
double x2 {};
double y2 {};
double z2 {};
double x3 {};
double y3 {};
double z3 {};
if (PyArg_ParseTuple(args, "ddddddddd", &x1, &y1, &z1, &x2, &y2, &z2, &x3, &y3, &z3)) {
getMeshObjectPtr()->addFacet(
MeshCore::MeshGeomFacet(Base::Vector3f((float)x1, (float)y1, (float)z1),
Expand All @@ -687,7 +702,9 @@ PyObject* MeshPy::addFacet(PyObject* args)
}

PyErr_Clear();
PyObject *v1 {}, *v2 {}, *v3 {};
PyObject* v1 {};
PyObject* v2 {};
PyObject* v3 {};
if (PyArg_ParseTuple(args,
"O!O!O!",
&(Base::VectorPy::Type),
Expand Down Expand Up @@ -908,7 +925,9 @@ PyObject* MeshPy::movePoint(PyObject* args)
Base::Vector3d vec;

do {
double x = 0.0, y = 0.0, z = 0.0;
double x = 0.0;
double y = 0.0;
double z = 0.0;
if (PyArg_ParseTuple(args, "kddd", &index, &x, &y, &z)) {
vec.Set(x, y, z);
break;
Expand Down Expand Up @@ -961,7 +980,7 @@ PyObject* MeshPy::addSegment(PyObject* args)
segment.reserve(list.size());
for (Py::Sequence::iterator it = list.begin(); it != list.end(); ++it) {
Py::Long value(*it);
Mesh::FacetIndex index = static_cast<unsigned long>(value);
Mesh::FacetIndex index = static_cast<Mesh::FacetIndex>(value);
if (index < numFacets) {
segment.push_back(index);
}
Expand Down Expand Up @@ -1371,13 +1390,13 @@ PyObject* MeshPy::fillupHoles(PyObject* args)
{
unsigned long len {};
int level = 0;
float max_area = 0.0f;
float max_area = 0.0F;
if (!PyArg_ParseTuple(args, "k|if", &len, &level, &max_area)) {
return nullptr;
}
try {
std::unique_ptr<MeshCore::AbstractPolygonTriangulator> tria;
if (max_area > 0.0f) {
if (max_area > 0.0F) {
tria = std::unique_ptr<MeshCore::AbstractPolygonTriangulator>(
new MeshCore::ConstraintDelaunayTriangulator(max_area));
}
Expand Down Expand Up @@ -1415,8 +1434,8 @@ PyObject* MeshPy::fixIndices(PyObject* args)

PyObject* MeshPy::fixCaps(PyObject* args)
{
float fMaxAngle = Base::toRadians<float>(150.0f);
float fSplitFactor = 0.25f;
float fMaxAngle = Base::toRadians<float>(150.0F);
float fSplitFactor = 0.25F;
if (!PyArg_ParseTuple(args, "|ff", &fMaxAngle, &fSplitFactor)) {
return nullptr;
}
Expand Down Expand Up @@ -1556,7 +1575,7 @@ PyObject* MeshPy::mergeFacets(PyObject* args)

PyObject* MeshPy::optimizeTopology(PyObject* args)
{
float fMaxAngle = -1.0f;
float fMaxAngle = -1.0F;
if (!PyArg_ParseTuple(
args,
"|f; specify the maximum allowed angle between the normals of two adjacent facets",
Expand Down Expand Up @@ -1607,7 +1626,8 @@ PyObject* MeshPy::splitEdges(PyObject* args)

PyObject* MeshPy::splitEdge(PyObject* args)
{
unsigned long facet {}, neighbour {};
unsigned long facet {};
unsigned long neighbour {};
PyObject* vertex {};
if (!PyArg_ParseTuple(args, "kkO!", &facet, &neighbour, &Base::VectorPy::Type, &vertex)) {
return nullptr;
Expand Down Expand Up @@ -1683,7 +1703,8 @@ PyObject* MeshPy::splitFacet(PyObject* args)

PyObject* MeshPy::swapEdge(PyObject* args)
{
unsigned long facet {}, neighbour {};
unsigned long facet {};
unsigned long neighbour {};
if (!PyArg_ParseTuple(args, "kk", &facet, &neighbour)) {
return nullptr;
}
Expand Down Expand Up @@ -1716,7 +1737,8 @@ PyObject* MeshPy::swapEdge(PyObject* args)

PyObject* MeshPy::collapseEdge(PyObject* args)
{
unsigned long facet {}, neighbour {};
unsigned long facet {};
unsigned long neighbour {};
if (!PyArg_ParseTuple(args, "kk", &facet, &neighbour)) {
return nullptr;
}
Expand Down Expand Up @@ -1960,7 +1982,8 @@ PyObject* MeshPy::trim(PyObject* args)

PyObject* MeshPy::trimByPlane(PyObject* args)
{
PyObject *base {}, *norm {};
PyObject* base {};
PyObject* norm {};
if (!PyArg_ParseTuple(args,
"O!O!",
&Base::VectorPy::Type,
Expand Down Expand Up @@ -2044,7 +2067,8 @@ PyObject* MeshPy::smooth(PyObject* args, PyObject* kwds)

PyObject* MeshPy::decimate(PyObject* args)
{
float fTol {}, fRed {};
float fTol {};
float fRed {};
if (PyArg_ParseTuple(args, "ff", &fTol, &fRed)) {
PY_TRY
{
Expand Down
11 changes: 5 additions & 6 deletions src/Mod/Mesh/Gui/DlgDecimating.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,8 @@ int DlgDecimating::targetNumberOfTriangles() const
if (ui->checkAbsoluteNumber->isChecked()) {
return ui->spinBoxReduction->value();
}
else {
return numberOfTriangles * (1.0 - reduction());
}

return int(numberOfTriangles * (1.0 - reduction()));
}

void DlgDecimating::setNumberOfTriangles(int num)
Expand All @@ -90,7 +89,7 @@ void DlgDecimating::onCheckAbsoluteNumberToggled(bool on)
ui->sliderReduction,
&QSlider::setValue);
ui->spinBoxReduction->setRange(1, numberOfTriangles);
ui->spinBoxReduction->setValue(numberOfTriangles * (1.0 - reduction()));
ui->spinBoxReduction->setValue(int(numberOfTriangles * (1.0 - reduction())));
ui->spinBoxReduction->setSuffix(QString());
ui->checkAbsoluteNumber->setText(
tr("Absolute number (Maximum: %1)").arg(numberOfTriangles));
Expand Down Expand Up @@ -159,8 +158,8 @@ bool TaskDecimating::accept()
Gui::WaitCursor wc;
Gui::Command::openCommand(QT_TRANSLATE_NOOP("Command", "Mesh Decimating"));

float tolerance = widget->tolerance();
float reduction = widget->reduction();
float tolerance = float(widget->tolerance());
float reduction = float(widget->reduction());
bool absolute = widget->isAbsoluteNumber();
int targetSize = 0;
if (absolute) {
Expand Down
2 changes: 2 additions & 0 deletions src/Mod/Mesh/Gui/DlgDecimating.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ class DlgDecimating: public QWidget
private:
int numberOfTriangles {0};
std::unique_ptr<Ui_DlgDecimating> ui;

Q_DISABLE_COPY_MOVE(DlgDecimating)
};

/**
Expand Down
35 changes: 14 additions & 21 deletions src/Mod/Mesh/Gui/DlgEvaluateMeshImp.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ class DlgEvaluateMeshImp::Private
bool enableFoldsCheck {false};
bool checkNonManfoldPoints {false};
bool strictlyDegenerated {true};
float epsilonDegenerated {0.0f};
float epsilonDegenerated {0.0F};
};

/* TRANSLATOR MeshGui::DlgEvaluateMeshImp */
Expand Down Expand Up @@ -129,7 +129,7 @@ DlgEvaluateMeshImp::DlgEvaluateMeshImp(QWidget* parent, Qt::WindowFlags fl)
d->enableFoldsCheck = hGrp->GetBool("EnableFoldsCheck", false);
d->strictlyDegenerated = hGrp->GetBool("StrictlyDegenerated", true);
if (d->strictlyDegenerated) {
d->epsilonDegenerated = 0.0f;
d->epsilonDegenerated = 0.0F;
}
else {
d->epsilonDegenerated = MeshCore::MeshDefinitions::_fMinPointDistanceP2;
Expand Down Expand Up @@ -350,8 +350,7 @@ void DlgEvaluateMeshImp::addViewProvider(const char* name,
removeViewProvider(name);

if (d->view) {
ViewProviderMeshDefects* vp =
static_cast<ViewProviderMeshDefects*>(Base::Type::createInstanceByName(name));
auto vp = static_cast<ViewProviderMeshDefects*>(Base::Type::createInstanceByName(name));
assert(vp->isDerivedFrom<Gui::ViewProvider>());
vp->attach(d->meshFeature);
d->view->getViewer()->addViewProvider(vp);
Expand All @@ -362,7 +361,7 @@ void DlgEvaluateMeshImp::addViewProvider(const char* name,

void DlgEvaluateMeshImp::removeViewProvider(const char* name)
{
std::map<std::string, ViewProviderMeshDefects*>::iterator it = d->vp.find(name);
auto it = d->vp.find(name);
if (it != d->vp.end()) {
if (d->view) {
d->view->getViewer()->removeViewProvider(it->second);
Expand Down Expand Up @@ -499,8 +498,7 @@ void DlgEvaluateMeshImp::onRefreshButtonClicked()

void DlgEvaluateMeshImp::onCheckOrientationButtonClicked()
{
std::map<std::string, ViewProviderMeshDefects*>::iterator it =
d->vp.find("MeshGui::ViewProviderMeshOrientation");
auto it = d->vp.find("MeshGui::ViewProviderMeshOrientation");
if (it != d->vp.end()) {
if (d->ui.checkOrientationButton->isChecked()) {
it->second->show();
Expand Down Expand Up @@ -692,8 +690,7 @@ void DlgEvaluateMeshImp::onRepairNonmanifoldsButtonClicked()

void DlgEvaluateMeshImp::onCheckIndicesButtonClicked()
{
std::map<std::string, ViewProviderMeshDefects*>::iterator it =
d->vp.find("MeshGui::ViewProviderMeshIndices");
auto it = d->vp.find("MeshGui::ViewProviderMeshIndices");
if (it != d->vp.end()) {
if (d->ui.checkIndicesButton->isChecked()) {
it->second->show();
Expand Down Expand Up @@ -785,8 +782,7 @@ void DlgEvaluateMeshImp::onRepairIndicesButtonClicked()

void DlgEvaluateMeshImp::onCheckDegenerationButtonClicked()
{
std::map<std::string, ViewProviderMeshDefects*>::iterator it =
d->vp.find("MeshGui::ViewProviderMeshDegenerations");
auto it = d->vp.find("MeshGui::ViewProviderMeshDegenerations");
if (it != d->vp.end()) {
if (d->ui.checkDegenerationButton->isChecked()) {
it->second->show();
Expand Down Expand Up @@ -856,8 +852,7 @@ void DlgEvaluateMeshImp::onRepairDegeneratedButtonClicked()

void DlgEvaluateMeshImp::onCheckDuplicatedFacesButtonClicked()
{
std::map<std::string, ViewProviderMeshDefects*>::iterator it =
d->vp.find("MeshGui::ViewProviderMeshDuplicatedFaces");
auto it = d->vp.find("MeshGui::ViewProviderMeshDuplicatedFaces");
if (it != d->vp.end()) {
if (d->ui.checkDuplicatedFacesButton->isChecked()) {
it->second->show();
Expand Down Expand Up @@ -928,8 +923,7 @@ void DlgEvaluateMeshImp::onRepairDuplicatedFacesButtonClicked()

void DlgEvaluateMeshImp::onCheckDuplicatedPointsButtonClicked()
{
std::map<std::string, ViewProviderMeshDefects*>::iterator it =
d->vp.find("MeshGui::ViewProviderMeshDuplicatedPoints");
auto it = d->vp.find("MeshGui::ViewProviderMeshDuplicatedPoints");
if (it != d->vp.end()) {
if (d->ui.checkDuplicatedPointsButton->isChecked()) {
it->second->show();
Expand Down Expand Up @@ -998,8 +992,7 @@ void DlgEvaluateMeshImp::onRepairDuplicatedPointsButtonClicked()

void DlgEvaluateMeshImp::onCheckSelfIntersectionButtonClicked()
{
std::map<std::string, ViewProviderMeshDefects*>::iterator it =
d->vp.find("MeshGui::ViewProviderMeshSelfIntersections");
auto it = d->vp.find("MeshGui::ViewProviderMeshSelfIntersections");
if (it != d->vp.end()) {
if (d->ui.checkSelfIntersectionButton->isChecked()) {
it->second->show();
Expand Down Expand Up @@ -1077,8 +1070,7 @@ void DlgEvaluateMeshImp::onRepairSelfIntersectionButtonClicked()

void DlgEvaluateMeshImp::onCheckFoldsButtonClicked()
{
std::map<std::string, ViewProviderMeshDefects*>::iterator it =
d->vp.find("MeshGui::ViewProviderMeshFolds");
auto it = d->vp.find("MeshGui::ViewProviderMeshFolds");
if (it != d->vp.end()) {
if (d->ui.checkFoldsButton->isChecked()) {
it->second->show();
Expand Down Expand Up @@ -1309,7 +1301,7 @@ void DlgEvaluateMeshImp::onButtonBoxClicked(QAbstractButton* button)
d->showFoldsFunction(d->enableFoldsCheck);
d->strictlyDegenerated = dlg.isDegeneratedFacetsChecked();
if (d->strictlyDegenerated) {
d->epsilonDegenerated = 0.0f;
d->epsilonDegenerated = 0.0F;
}
else {
d->epsilonDegenerated = MeshCore::MeshDefinitions::_fMinPointDistanceP2;
Expand Down Expand Up @@ -1397,8 +1389,9 @@ DockEvaluateMeshImp::~DockEvaluateMeshImp()
/**
* Destroys the dock window this object is embedded into without destroying itself.
*/
void DockEvaluateMeshImp::closeEvent(QCloseEvent*)
void DockEvaluateMeshImp::closeEvent(QCloseEvent* event)
{
Q_UNUSED(event)
// closes the dock window
Gui::DockWindowManager* pDockMgr = Gui::DockWindowManager::instance();
pDockMgr->removeDockWindow(scrollArea);
Expand Down
4 changes: 4 additions & 0 deletions src/Mod/Mesh/Gui/DlgEvaluateMeshImp.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,8 @@ class DlgEvaluateMeshImp: public QDialog, public App::DocumentObserver
private:
class Private;
Private* d;

Q_DISABLE_COPY_MOVE(DlgEvaluateMeshImp)
};

/**
Expand All @@ -165,6 +167,8 @@ class DockEvaluateMeshImp: public DlgEvaluateMeshImp // NOLINT
private:
QScrollArea* scrollArea;
static DockEvaluateMeshImp* _instance;

Q_DISABLE_COPY_MOVE(DockEvaluateMeshImp)
};

} // namespace MeshGui
Expand Down
2 changes: 2 additions & 0 deletions src/Mod/Mesh/Gui/DlgEvaluateSettings.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ class DlgEvaluateSettings: public QDialog

private:
Ui_DlgEvaluateSettings* ui;

Q_DISABLE_COPY_MOVE(DlgEvaluateSettings)
};

} // namespace MeshGui
Expand Down
Loading

0 comments on commit 9140327

Please sign in to comment.