From 0f7645a7d2243326e3aed01edea0d74f4c0cf59a Mon Sep 17 00:00:00 2001
From: Mikhail Svechnikov <m.svechnikov@fz-juelich.de>
Date: Fri, 2 Dec 2022 12:55:41 +0100
Subject: [PATCH] VectorProperty: rnm setter --> setR3()
---
GUI/Model/Descriptor/VectorProperty.h | 2 +-
GUI/Model/Device/InstrumentItems.h | 4 ++--
GUI/Model/Device/RectangularDetectorItem.h | 4 ++--
GUI/Model/Sample/ItemWithParticles.h | 2 +-
GUI/Model/Sample/MaterialItem.cpp | 2 +-
GUI/Model/Sample/MesocrystalItem.h | 6 +++---
GUI/Model/Sample/MultiLayerItem.h | 2 +-
7 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/GUI/Model/Descriptor/VectorProperty.h b/GUI/Model/Descriptor/VectorProperty.h
index 770ce8a0a3a..314426548f2 100644
--- a/GUI/Model/Descriptor/VectorProperty.h
+++ b/GUI/Model/Descriptor/VectorProperty.h
@@ -43,7 +43,7 @@ public:
void setX(double _x) { m_x.setValue(_x); }
void setY(double _y) { m_y.setValue(_y); }
void setZ(double _z) { m_z.setValue(_z); }
- void set(const R3& d)
+ void setR3(const R3& d)
{
setX(d.x());
setY(d.y());
diff --git a/GUI/Model/Device/InstrumentItems.h b/GUI/Model/Device/InstrumentItems.h
index 61e95b16045..8851c321c68 100644
--- a/GUI/Model/Device/InstrumentItems.h
+++ b/GUI/Model/Device/InstrumentItems.h
@@ -90,11 +90,11 @@ public:
VectorProperty& polarization() { return m_polarization; }
const VectorProperty& polarization() const { return m_polarization; }
- void setPolarization(const R3& v) { m_polarization.set(v); }
+ void setPolarization(const R3& v) { m_polarization.setR3(v); }
VectorProperty& analyzerDirection() { return m_analyzerDirection; }
const VectorProperty& analyzerDirection() const { return m_analyzerDirection; }
- void setAnalyzerDirection(const R3& v) { m_analyzerDirection.set(v); }
+ void setAnalyzerDirection(const R3& v) { m_analyzerDirection.setR3(v); }
DoubleProperty& analyzerEfficiency() { return m_analyzerEfficiency; }
const DoubleProperty& analyzerEfficiency() const { return m_analyzerEfficiency; }
diff --git a/GUI/Model/Device/RectangularDetectorItem.h b/GUI/Model/Device/RectangularDetectorItem.h
index 2e0a94b9815..2c555d386eb 100644
--- a/GUI/Model/Device/RectangularDetectorItem.h
+++ b/GUI/Model/Device/RectangularDetectorItem.h
@@ -57,11 +57,11 @@ public:
VectorProperty& normalVector() { return m_normalVector; }
const VectorProperty& normalVector() const { return m_normalVector; }
- void setNormalVector(const R3& v) { m_normalVector.set(v); }
+ void setNormalVector(const R3& v) { m_normalVector.setR3(v); }
VectorProperty& directionVector() { return m_directionVector; }
const VectorProperty& directionVector() const { return m_directionVector; }
- void setDirectionVector(const R3& v) { m_directionVector.set(v); }
+ void setDirectionVector(const R3& v) { m_directionVector.setR3(v); }
DoubleProperty& u0() { return m_u0; }
const DoubleProperty& u0() const { return m_u0; }
diff --git a/GUI/Model/Sample/ItemWithParticles.h b/GUI/Model/Sample/ItemWithParticles.h
index 63e35ceb57e..1b4bdd3e5aa 100644
--- a/GUI/Model/Sample/ItemWithParticles.h
+++ b/GUI/Model/Sample/ItemWithParticles.h
@@ -34,7 +34,7 @@ public:
VectorProperty& position() { return m_position; }
const VectorProperty& position() const { return m_position; }
- void setPosition(const R3& position) { m_position.set(position); }
+ void setPosition(const R3& position) { m_position.setR3(position); }
//! Returns selection descriptor for rotation methods.
SelectionDescriptor<RotationItem*> rotation() { return m_rotation; }
diff --git a/GUI/Model/Sample/MaterialItem.cpp b/GUI/Model/Sample/MaterialItem.cpp
index 508bf7664e7..175d367b711 100644
--- a/GUI/Model/Sample/MaterialItem.cpp
+++ b/GUI/Model/Sample/MaterialItem.cpp
@@ -185,7 +185,7 @@ void MaterialItem::setColor(const QColor& color)
void MaterialItem::setMagnetization(const R3& magnetization)
{
if (m_magnetization.r3() != magnetization) {
- m_magnetization.set(magnetization);
+ m_magnetization.setR3(magnetization);
emit dataChanged();
}
}
diff --git a/GUI/Model/Sample/MesocrystalItem.h b/GUI/Model/Sample/MesocrystalItem.h
index a1268ce11df..44d448c5c6b 100644
--- a/GUI/Model/Sample/MesocrystalItem.h
+++ b/GUI/Model/Sample/MesocrystalItem.h
@@ -49,15 +49,15 @@ public:
VectorProperty& vectorA() { return m_vectorA; }
const VectorProperty& vectorA() const { return m_vectorA; }
- void setVectorA(const R3& v) { m_vectorA.set(v); }
+ void setVectorA(const R3& v) { m_vectorA.setR3(v); }
VectorProperty& vectorB() { return m_vectorB; }
const VectorProperty& vectorB() const { return m_vectorB; }
- void setVectorB(const R3& v) { m_vectorB.set(v); }
+ void setVectorB(const R3& v) { m_vectorB.setR3(v); }
VectorProperty& vectorC() { return m_vectorC; }
const VectorProperty& vectorC() const { return m_vectorC; }
- void setVectorC(const R3& v) { m_vectorC.set(v); }
+ void setVectorC(const R3& v) { m_vectorC.setR3(v); }
QVector<ItemWithParticles*> containedItemsWithParticles() const override;
diff --git a/GUI/Model/Sample/MultiLayerItem.h b/GUI/Model/Sample/MultiLayerItem.h
index c43a66b6c1f..b48252797cd 100644
--- a/GUI/Model/Sample/MultiLayerItem.h
+++ b/GUI/Model/Sample/MultiLayerItem.h
@@ -50,7 +50,7 @@ public:
VectorProperty& externalField() { return m_externalField; }
const VectorProperty& externalField() const { return m_externalField; }
- void setExternalField(const R3& r) { m_externalField.set(r); }
+ void setExternalField(const R3& r) { m_externalField.setR3(r); }
QVector<LayerItem*> layers() const;
--
GitLab