Skip to content
Snippets Groups Projects
Commit 22e82fb1 authored by Wuttke, Joachim's avatar Wuttke, Joachim
Browse files

GUIDomainSampleVisitor: no camel case in local vars

parent 2c92b9db
No related branches found
No related tags found
1 merge request!226Annotations to GUIDomainSampleVisitor and other copy edits
Hide whitespace changes
Inline Side-by-side
GUI/Models/GUIDomainSampleVisitor.cpp
+ 15
− 15
View file @ 22e82fb1
...@@ -511,8 +511,8 @@ void GUIDomainSampleVisitor::visit(const RotationX* sample) ...@@ -511,8 +511,8 @@ void GUIDomainSampleVisitor::visit(const RotationX* sample)
ASSERT(parent); ASSERT(parent);
TransformationItem* transformation_item = parent->createTransformationItem(); TransformationItem* transformation_item = parent->createTransformationItem();
XRotationItem* rotationItem = transformation_item->setRotationType<XRotationItem>(); XRotationItem* rot_item = transformation_item->setRotationType<XRotationItem>();
rotationItem->setAngleValue(Units::rad2deg(sample->getAngle())); rot_item->setAngleValue(Units::rad2deg(sample->getAngle()));
m_levelToParentItem[depth()] = transformation_item; m_levelToParentItem[depth()] = transformation_item;
} }
...@@ -522,8 +522,8 @@ void GUIDomainSampleVisitor::visit(const RotationY* sample) ...@@ -522,8 +522,8 @@ void GUIDomainSampleVisitor::visit(const RotationY* sample)
ASSERT(parent); ASSERT(parent);
TransformationItem* transformation_item = parent->createTransformationItem(); TransformationItem* transformation_item = parent->createTransformationItem();
YRotationItem* rotationItem = transformation_item->setRotationType<YRotationItem>(); YRotationItem* rot_item = transformation_item->setRotationType<YRotationItem>();
rotationItem->setAngleValue(Units::rad2deg(sample->getAngle())); rot_item->setAngleValue(Units::rad2deg(sample->getAngle()));
m_levelToParentItem[depth()] = transformation_item; m_levelToParentItem[depth()] = transformation_item;
} }
...@@ -533,8 +533,8 @@ void GUIDomainSampleVisitor::visit(const RotationZ* sample) ...@@ -533,8 +533,8 @@ void GUIDomainSampleVisitor::visit(const RotationZ* sample)
ASSERT(parent); ASSERT(parent);
TransformationItem* transformation_item = parent->createTransformationItem(); TransformationItem* transformation_item = parent->createTransformationItem();
ZRotationItem* rotationItem = transformation_item->setRotationType<ZRotationItem>(); ZRotationItem* rot_item = transformation_item->setRotationType<ZRotationItem>();
rotationItem->setAngleValue(Units::rad2deg(sample->getAngle())); rot_item->setAngleValue(Units::rad2deg(sample->getAngle()));
m_levelToParentItem[depth()] = transformation_item; m_levelToParentItem[depth()] = transformation_item;
} }
...@@ -544,10 +544,10 @@ void GUIDomainSampleVisitor::visit(const RotationEuler* sample) ...@@ -544,10 +544,10 @@ void GUIDomainSampleVisitor::visit(const RotationEuler* sample)
ASSERT(parent); ASSERT(parent);
TransformationItem* transformation_item = parent->createTransformationItem(); TransformationItem* transformation_item = parent->createTransformationItem();
EulerRotationItem* rotationItem = transformation_item->setRotationType<EulerRotationItem>(); EulerRotationItem* rot_item = transformation_item->setRotationType<EulerRotationItem>();
rotationItem->setAlphaValue(Units::rad2deg(sample->getAlpha())); rot_item->setAlphaValue(Units::rad2deg(sample->getAlpha()));
rotationItem->setBetaValue(Units::rad2deg(sample->getBeta())); rot_item->setBetaValue(Units::rad2deg(sample->getBeta()));
rotationItem->setGammaValue(Units::rad2deg(sample->getGamma())); rot_item->setGammaValue(Units::rad2deg(sample->getGamma()));
m_levelToParentItem[depth()] = transformation_item; m_levelToParentItem[depth()] = transformation_item;
} }
...@@ -563,20 +563,20 @@ ExternalProperty GUIDomainSampleVisitor::createMaterialFromDomain(const Material ...@@ -563,20 +563,20 @@ ExternalProperty GUIDomainSampleVisitor::createMaterialFromDomain(const Material
return GUI::Model::MaterialItemUtils::materialProperty(*material); return GUI::Model::MaterialItemUtils::materialProperty(*material);
complex_t material_data = material->materialData(); complex_t material_data = material->materialData();
MaterialItem* materialItem(nullptr); MaterialItem* mat_item(nullptr);
if (material->typeID() == MATERIAL_TYPES::RefractiveMaterial) { 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()); material_data.imag());
} else if (material->typeID() == MATERIAL_TYPES::MaterialBySLD) { } 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()); material_data.imag());
} else { } else {
throw Error("GUI::Model::ObjectBuilder::createMaterialFromDomain() -> Error. " throw Error("GUI::Model::ObjectBuilder::createMaterialFromDomain() -> Error. "
"Unsupported material"); "Unsupported material");
} }
materialItem->setMagnetization(material->magnetization()); mat_item->setMagnetization(material->magnetization());
return GUI::Model::MaterialItemUtils::materialProperty(*materialItem); return GUI::Model::MaterialItemUtils::materialProperty(*mat_item);
} }
// Function CreateIParticle, used only by GUIDomainSampleVisitor::InsertIParticle // Function CreateIParticle, used only by GUIDomainSampleVisitor::InsertIParticle
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment