Skip to content
Snippets Groups Projects

resolve a number of clang-tidy warnings

Merged resolve a number of clang-tidy warnings
ff74 into develop
Merged Wuttke, Joachim requested to merge ff74 into develop
Compare
and
33 files
+ 343
− 131
Compare changes
  • Side-by-side
  • Inline
Files
33
GUI/Model/From/FromDomain.cpp
+ 46
− 38
@@ -777,16 +777,16 @@ void GUI::Transform::FromDomain::setRotation(ItemWithParticles* item, const IRot
auto* transformationItem = item->createTransformationItem();
if (auto* r = dynamic_cast<const RotationX*>(rotation)) {
if (const auto* r = dynamic_cast<const RotationX*>(rotation)) {
auto* rotationItem = transformationItem->setRotationType<XRotationItem>();
rotationItem->angle().set(Units::rad2deg(r->getAngle()));
} else if (auto* r = dynamic_cast<const RotationY*>(rotation)) {
} else if (const auto* r = dynamic_cast<const RotationY*>(rotation)) {
auto* rotationItem = transformationItem->setRotationType<YRotationItem>();
rotationItem->angle().set(Units::rad2deg(r->getAngle()));
} else if (auto* r = dynamic_cast<const RotationZ*>(rotation)) {
} else if (const auto* r = dynamic_cast<const RotationZ*>(rotation)) {
auto* rotationItem = transformationItem->setRotationType<ZRotationItem>();
rotationItem->angle().set(Units::rad2deg(r->getAngle()));
} else if (auto* r = dynamic_cast<const RotationEuler*>(rotation)) {
} else if (const auto* r = dynamic_cast<const RotationEuler*>(rotation)) {
auto* rotationItem = transformationItem->setRotationType<EulerRotationItem>();
rotationItem->alpha().set(Units::rad2deg(r->getAlpha()));
rotationItem->beta().set(Units::rad2deg(r->getBeta()));
@@ -799,22 +799,22 @@ void GUI::Transform::FromDomain::setInterference(ParticleLayoutItem* layoutItem,
{
if (!interference)
layoutItem->removeInterference();
else if (auto* itf = dynamic_cast<const Interference1DLattice*>(interference)) {
else if (const auto* itf = dynamic_cast<const Interference1DLattice*>(interference)) {
auto* itfItem = layoutItem->createInterference<Interference1DLatticeItem>();
set1DLatticeItem(itfItem, *itf);
} else if (auto* itf = dynamic_cast<const Interference2DLattice*>(interference)) {
} else if (const auto* itf = dynamic_cast<const Interference2DLattice*>(interference)) {
auto* itfItem = layoutItem->createInterference<Interference2DLatticeItem>();
set2DLatticeItem(itfItem, *itf);
} else if (auto* itf = dynamic_cast<const Interference2DParaCrystal*>(interference)) {
} else if (const auto* itf = dynamic_cast<const Interference2DParaCrystal*>(interference)) {
auto* itfItem = layoutItem->createInterference<Interference2DParaCrystalItem>();
set2DParaCrystalItem(itfItem, *itf);
} else if (auto* itf = dynamic_cast<const InterferenceFinite2DLattice*>(interference)) {
} else if (const auto* itf = dynamic_cast<const InterferenceFinite2DLattice*>(interference)) {
auto* itfItem = layoutItem->createInterference<InterferenceFinite2DLatticeItem>();
setFinite2DLatticeItem(itfItem, *itf);
} else if (auto* itf = dynamic_cast<const InterferenceHardDisk*>(interference)) {
} else if (const auto* itf = dynamic_cast<const InterferenceHardDisk*>(interference)) {
auto* itfItem = layoutItem->createInterference<InterferenceHardDiskItem>();
setHardDiskItem(itfItem, *itf);
} else if (auto* itf = dynamic_cast<const InterferenceRadialParaCrystal*>(interference)) {
} else if (const auto* itf = dynamic_cast<const InterferenceRadialParaCrystal*>(interference)) {
auto* itfItem = layoutItem->createInterference<InterferenceRadialParaCrystalItem>();
setRadialParaCrystalItem(itfItem, *itf);
} else
@@ -824,132 +824,140 @@ void GUI::Transform::FromDomain::setInterference(ParticleLayoutItem* layoutItem,
void GUI::Transform::FromDomain::setFormFactor(std::variant<ParticleItem*, MesoCrystalItem*> parent,
const IFormFactor* iFormFactor)
{
if (auto* formFactor = dynamic_cast<const FormFactorAnisoPyramid*>(iFormFactor)) {
if (const auto* formFactor = dynamic_cast<const FormFactorAnisoPyramid*>(iFormFactor)) {
auto* formFactorItem = addFormFactorItem<AnisoPyramidItem>(parent);
formFactorItem->setLength(formFactor->getLength());
formFactorItem->setWidth(formFactor->getWidth());
formFactorItem->setHeight(formFactor->getHeight());
formFactorItem->setAlpha(Units::rad2deg(formFactor->getAlpha()));
} else if (auto* formFactor = dynamic_cast<const FormFactorBarGauss*>(iFormFactor)) {
} else if (const auto* formFactor = dynamic_cast<const FormFactorBarGauss*>(iFormFactor)) {
auto* formFactorItem = addFormFactorItem<BarGaussItem>(parent);
formFactorItem->setLength(formFactor->getLength());
formFactorItem->setWidth(formFactor->getWidth());
formFactorItem->setHeight(formFactor->getHeight());
} else if (auto* formFactor = dynamic_cast<const FormFactorBarLorentz*>(iFormFactor)) {
} else if (const auto* formFactor = dynamic_cast<const FormFactorBarLorentz*>(iFormFactor)) {
auto* formFactorItem = addFormFactorItem<BarLorentzItem>(parent);
formFactorItem->setLength(formFactor->getLength());
formFactorItem->setWidth(formFactor->getWidth());
formFactorItem->setHeight(formFactor->getHeight());
} else if (auto* formFactor = dynamic_cast<const FormFactorBox*>(iFormFactor)) {
} else if (const auto* formFactor = dynamic_cast<const FormFactorBox*>(iFormFactor)) {
auto* formFactorItem = addFormFactorItem<BoxItem>(parent);
formFactorItem->setLength(formFactor->getLength());
formFactorItem->setWidth(formFactor->getWidth());
formFactorItem->setHeight(formFactor->getHeight());
} else if (auto* formFactor = dynamic_cast<const FormFactorCone*>(iFormFactor)) {
} else if (const auto* formFactor = dynamic_cast<const FormFactorCone*>(iFormFactor)) {
auto* formFactorItem = addFormFactorItem<ConeItem>(parent);
formFactorItem->setRadius(formFactor->getRadius());
formFactorItem->setHeight(formFactor->getHeight());
formFactorItem->setAlpha(Units::rad2deg(formFactor->getAlpha()));
} else if (auto* formFactor = dynamic_cast<const FormFactorCone6*>(iFormFactor)) {
} else if (const auto* formFactor = dynamic_cast<const FormFactorCone6*>(iFormFactor)) {
auto* formFactorItem = addFormFactorItem<Cone6Item>(parent);
formFactorItem->setBaseEdge(formFactor->getBaseEdge());
formFactorItem->setHeight(formFactor->getHeight());
formFactorItem->setAlpha(Units::rad2deg(formFactor->getAlpha()));
} else if (auto* formFactor = dynamic_cast<const FormFactorCuboctahedron*>(iFormFactor)) {
} else if (const auto* formFactor = dynamic_cast<const FormFactorCuboctahedron*>(iFormFactor)) {
auto* formFactorItem = addFormFactorItem<CuboctahedronItem>(parent);
formFactorItem->setLength(formFactor->getLength());
formFactorItem->setHeight(formFactor->getHeight());
formFactorItem->setHeightRatio(formFactor->getHeightRatio());
formFactorItem->setAlpha(Units::rad2deg(formFactor->getAlpha()));
} else if (auto* formFactor = dynamic_cast<const FormFactorCylinder*>(iFormFactor)) {
} else if (const auto* formFactor = dynamic_cast<const FormFactorCylinder*>(iFormFactor)) {
auto* formFactorItem = addFormFactorItem<CylinderItem>(parent);
formFactorItem->setRadius(formFactor->getRadius());
formFactorItem->setHeight(formFactor->getHeight());
} else if (auto* formFactor = dynamic_cast<const FormFactorDodecahedron*>(iFormFactor)) {
} else if (const auto* formFactor = dynamic_cast<const FormFactorDodecahedron*>(iFormFactor)) {
auto* formFactorItem = addFormFactorItem<DodecahedronItem>(parent);
formFactorItem->setEdge(formFactor->getEdge());
} else if (auto* formFactor = dynamic_cast<const FormFactorEllipsoidalCylinder*>(iFormFactor)) {
} else if (const auto* formFactor =
dynamic_cast<const FormFactorEllipsoidalCylinder*>(iFormFactor)) {
auto* formFactorItem = addFormFactorItem<EllipsoidalCylinderItem>(parent);
formFactorItem->setRadiusX(formFactor->getRadiusX());
formFactorItem->setRadiusY(formFactor->getRadiusY());
formFactorItem->setHeight(formFactor->getHeight());
} else if (auto* formFactor = dynamic_cast<const FormFactorFullSphere*>(iFormFactor)) {
} else if (const auto* formFactor = dynamic_cast<const FormFactorFullSphere*>(iFormFactor)) {
auto* formFactorItem = addFormFactorItem<FullSphereItem>(parent);
formFactorItem->setRadius(formFactor->getRadius());
} else if (auto* formFactor = dynamic_cast<const FormFactorFullSpheroid*>(iFormFactor)) {
} else if (const auto* formFactor = dynamic_cast<const FormFactorFullSpheroid*>(iFormFactor)) {
auto* formFactorItem = addFormFactorItem<FullSpheroidItem>(parent);
formFactorItem->setRadius(formFactor->getRadius());
formFactorItem->setHeight(formFactor->getHeight());
} else if (auto* formFactor = dynamic_cast<const FormFactorIcosahedron*>(iFormFactor)) {
} else if (const auto* formFactor = dynamic_cast<const FormFactorIcosahedron*>(iFormFactor)) {
auto* formFactorItem = addFormFactorItem<IcosahedronItem>(parent);
formFactorItem->setEdge(formFactor->getEdge());
} else if (auto* formFactor = dynamic_cast<const FormFactorHemiEllipsoid*>(iFormFactor)) {
} else if (const auto* formFactor = dynamic_cast<const FormFactorHemiEllipsoid*>(iFormFactor)) {
auto* formFactorItem = addFormFactorItem<HemiEllipsoidItem>(parent);
formFactorItem->setRadiusX(formFactor->getRadiusX());
formFactorItem->setRadiusY(formFactor->getRadiusY());
formFactorItem->setHeight(formFactor->getHeight());
} else if (auto* formFactor = dynamic_cast<const FormFactorPrism3*>(iFormFactor)) {
} else if (const auto* formFactor = dynamic_cast<const FormFactorPrism3*>(iFormFactor)) {
auto* formFactorItem = addFormFactorItem<Prism3Item>(parent);
formFactorItem->setBaseEdge(formFactor->getBaseEdge());
formFactorItem->setHeight(formFactor->getHeight());
} else if (auto* formFactor = dynamic_cast<const FormFactorPrism6*>(iFormFactor)) {
} else if (const auto* formFactor = dynamic_cast<const FormFactorPrism6*>(iFormFactor)) {
auto* formFactorItem = addFormFactorItem<Prism6Item>(parent);
formFactorItem->setBaseEdge(formFactor->getBaseEdge());
formFactorItem->setHeight(formFactor->getHeight());
} else if (auto* formFactor = dynamic_cast<const FormFactorPyramid*>(iFormFactor)) {
} else if (const auto* formFactor = dynamic_cast<const FormFactorPyramid*>(iFormFactor)) {
auto* formFactorItem = addFormFactorItem<PyramidItem>(parent);
formFactorItem->setBaseEdge(formFactor->getBaseEdge());
formFactorItem->setHeight(formFactor->getHeight());
formFactorItem->setAlpha(Units::rad2deg(formFactor->getAlpha()));
} else if (auto* formFactor = dynamic_cast<const FormFactorCosineRippleBox*>(iFormFactor)) {
} else if (const auto* formFactor =
dynamic_cast<const FormFactorCosineRippleBox*>(iFormFactor)) {
auto* formFactorItem = addFormFactorItem<CosineRippleBoxItem>(parent);
formFactorItem->setLength(formFactor->getLength());
formFactorItem->setWidth(formFactor->getWidth());
formFactorItem->setHeight(formFactor->getHeight());
} else if (auto* formFactor = dynamic_cast<const FormFactorCosineRippleGauss*>(iFormFactor)) {
} else if (const auto* formFactor =
dynamic_cast<const FormFactorCosineRippleGauss*>(iFormFactor)) {
auto* formFactorItem = addFormFactorItem<CosineRippleGaussItem>(parent);
formFactorItem->setLength(formFactor->getLength());
formFactorItem->setWidth(formFactor->getWidth());
formFactorItem->setHeight(formFactor->getHeight());
} else if (auto* formFactor = dynamic_cast<const FormFactorCosineRippleLorentz*>(iFormFactor)) {
} else if (const auto* formFactor =
dynamic_cast<const FormFactorCosineRippleLorentz*>(iFormFactor)) {
auto* formFactorItem = addFormFactorItem<CosineRippleLorentzItem>(parent);
formFactorItem->setLength(formFactor->getLength());
formFactorItem->setWidth(formFactor->getWidth());
formFactorItem->setHeight(formFactor->getHeight());
} else if (auto* formFactor = dynamic_cast<const FormFactorSawtoothRippleBox*>(iFormFactor)) {
} else if (const auto* formFactor =
dynamic_cast<const FormFactorSawtoothRippleBox*>(iFormFactor)) {
auto* formFactorItem = addFormFactorItem<SawtoothRippleBoxItem>(parent);
formFactorItem->setLength(formFactor->getLength());
formFactorItem->setWidth(formFactor->getWidth());
formFactorItem->setHeight(formFactor->getHeight());
formFactorItem->setAsymmetry(formFactor->getAsymmetry());
} else if (auto* formFactor = dynamic_cast<const FormFactorSawtoothRippleGauss*>(iFormFactor)) {
} else if (const auto* formFactor =
dynamic_cast<const FormFactorSawtoothRippleGauss*>(iFormFactor)) {
auto* formFactorItem = addFormFactorItem<SawtoothRippleGaussItem>(parent);
formFactorItem->setLength(formFactor->getLength());
formFactorItem->setWidth(formFactor->getWidth());
formFactorItem->setHeight(formFactor->getHeight());
formFactorItem->setAsymmetry(formFactor->getAsymmetry());
} else if (auto* formFactor =
} else if (const auto* formFactor =
dynamic_cast<const FormFactorSawtoothRippleLorentz*>(iFormFactor)) {
auto* formFactorItem = addFormFactorItem<SawtoothRippleLorentzItem>(parent);
formFactorItem->setLength(formFactor->getLength());
formFactorItem->setWidth(formFactor->getWidth());
formFactorItem->setHeight(formFactor->getHeight());
formFactorItem->setAsymmetry(formFactor->getAsymmetry());
} else if (auto* formFactor = dynamic_cast<const FormFactorTetrahedron*>(iFormFactor)) {
} else if (const auto* formFactor = dynamic_cast<const FormFactorTetrahedron*>(iFormFactor)) {
auto* formFactorItem = addFormFactorItem<TetrahedronItem>(parent);
formFactorItem->setBaseEdge(formFactor->getBaseEdge());
formFactorItem->setHeight(formFactor->getHeight());
formFactorItem->setAlpha(Units::rad2deg(formFactor->getAlpha()));
} else if (auto* formFactor = dynamic_cast<const FormFactorTruncatedCube*>(iFormFactor)) {
} else if (const auto* formFactor = dynamic_cast<const FormFactorTruncatedCube*>(iFormFactor)) {
auto* formFactorItem = addFormFactorItem<TruncatedCubeItem>(parent);
formFactorItem->setLength(formFactor->getLength());
formFactorItem->setRemovedLength(formFactor->getRemovedLength());
} else if (auto* formFactor = dynamic_cast<const FormFactorTruncatedSphere*>(iFormFactor)) {
} else if (const auto* formFactor =
dynamic_cast<const FormFactorTruncatedSphere*>(iFormFactor)) {
auto* formFactorItem = addFormFactorItem<TruncatedSphereItem>(parent);
formFactorItem->setRadius(formFactor->getRadius());
formFactorItem->setHeight(formFactor->getHeight());
formFactorItem->setRemovedTop(formFactor->getRemovedTop());
} else if (auto* formFactor = dynamic_cast<const FormFactorTruncatedSpheroid*>(iFormFactor)) {
} else if (const auto* formFactor =
dynamic_cast<const FormFactorTruncatedSpheroid*>(iFormFactor)) {
auto* formFactorItem = addFormFactorItem<TruncatedSpheroidItem>(parent);
formFactorItem->setRadius(formFactor->getRadius());
formFactorItem->setHeight(formFactor->getHeight());
@@ -957,4 +965,4 @@ void GUI::Transform::FromDomain::setFormFactor(std::variant<ParticleItem*, MesoC
formFactorItem->setRemovedTop(formFactor->getRemovedTop());
} else
ASSERT(false);
}
\ No newline at end of file
}