From 22e82fb1ff380f603298eeeb8bffea17b0583ee5 Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (o)" <j.wuttke@fz-juelich.de>
Date: Mon, 26 Jul 2021 19:03:10 +0200
Subject: [PATCH] GUIDomainSampleVisitor: no camel case in local vars
---
GUI/Models/GUIDomainSampleVisitor.cpp | 30 +++++++++++++--------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/GUI/Models/GUIDomainSampleVisitor.cpp b/GUI/Models/GUIDomainSampleVisitor.cpp
index 2ce56c9192b..df0daf1df7e 100644
--- a/GUI/Models/GUIDomainSampleVisitor.cpp
+++ b/GUI/Models/GUIDomainSampleVisitor.cpp
@@ -511,8 +511,8 @@ void GUIDomainSampleVisitor::visit(const RotationX* sample)
ASSERT(parent);
TransformationItem* transformation_item = parent->createTransformationItem();
- XRotationItem* rotationItem = transformation_item->setRotationType<XRotationItem>();
- rotationItem->setAngleValue(Units::rad2deg(sample->getAngle()));
+ XRotationItem* rot_item = transformation_item->setRotationType<XRotationItem>();
+ rot_item->setAngleValue(Units::rad2deg(sample->getAngle()));
m_levelToParentItem[depth()] = transformation_item;
}
@@ -522,8 +522,8 @@ void GUIDomainSampleVisitor::visit(const RotationY* sample)
ASSERT(parent);
TransformationItem* transformation_item = parent->createTransformationItem();
- YRotationItem* rotationItem = transformation_item->setRotationType<YRotationItem>();
- rotationItem->setAngleValue(Units::rad2deg(sample->getAngle()));
+ YRotationItem* rot_item = transformation_item->setRotationType<YRotationItem>();
+ rot_item->setAngleValue(Units::rad2deg(sample->getAngle()));
m_levelToParentItem[depth()] = transformation_item;
}
@@ -533,8 +533,8 @@ void GUIDomainSampleVisitor::visit(const RotationZ* sample)
ASSERT(parent);
TransformationItem* transformation_item = parent->createTransformationItem();
- ZRotationItem* rotationItem = transformation_item->setRotationType<ZRotationItem>();
- rotationItem->setAngleValue(Units::rad2deg(sample->getAngle()));
+ ZRotationItem* rot_item = transformation_item->setRotationType<ZRotationItem>();
+ rot_item->setAngleValue(Units::rad2deg(sample->getAngle()));
m_levelToParentItem[depth()] = transformation_item;
}
@@ -544,10 +544,10 @@ void GUIDomainSampleVisitor::visit(const RotationEuler* sample)
ASSERT(parent);
TransformationItem* transformation_item = parent->createTransformationItem();
- EulerRotationItem* rotationItem = transformation_item->setRotationType<EulerRotationItem>();
- rotationItem->setAlphaValue(Units::rad2deg(sample->getAlpha()));
- rotationItem->setBetaValue(Units::rad2deg(sample->getBeta()));
- rotationItem->setGammaValue(Units::rad2deg(sample->getGamma()));
+ EulerRotationItem* rot_item = transformation_item->setRotationType<EulerRotationItem>();
+ rot_item->setAlphaValue(Units::rad2deg(sample->getAlpha()));
+ rot_item->setBetaValue(Units::rad2deg(sample->getBeta()));
+ rot_item->setGammaValue(Units::rad2deg(sample->getGamma()));
m_levelToParentItem[depth()] = transformation_item;
}
@@ -563,20 +563,20 @@ ExternalProperty GUIDomainSampleVisitor::createMaterialFromDomain(const Material
return GUI::Model::MaterialItemUtils::materialProperty(*material);
complex_t material_data = material->materialData();
- MaterialItem* materialItem(nullptr);
+ MaterialItem* mat_item(nullptr);
if (material->typeID() == MATERIAL_TYPES::RefractiveMaterial) {
- materialItem = m_materialModel->addRefractiveMaterial(materialName, material_data.real(),
+ mat_item = m_materialModel->addRefractiveMaterial(materialName, material_data.real(),
material_data.imag());
} else if (material->typeID() == MATERIAL_TYPES::MaterialBySLD) {
- materialItem = m_materialModel->addSLDMaterial(materialName, material_data.real(),
+ mat_item = m_materialModel->addSLDMaterial(materialName, material_data.real(),
material_data.imag());
} else {
throw Error("GUI::Model::ObjectBuilder::createMaterialFromDomain() -> Error. "
"Unsupported material");
}
- materialItem->setMagnetization(material->magnetization());
- return GUI::Model::MaterialItemUtils::materialProperty(*materialItem);
+ mat_item->setMagnetization(material->magnetization());
+ return GUI::Model::MaterialItemUtils::materialProperty(*mat_item);
}
// Function CreateIParticle, used only by GUIDomainSampleVisitor::InsertIParticle
--
GitLab