Skip to content
Snippets Groups Projects
Commit 0f7645a7 authored by Mikhail Svechnikov's avatar Mikhail Svechnikov
Browse files

VectorProperty: rnm setter --> setR3()

parent 75053913
No related branches found
No related tags found
1 merge request!1164GUI: macros for members definition are removed
Pipeline #81987 passed
......@@ -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());
......
......@@ -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; }
......
......@@ -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; }
......
......@@ -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; }
......
......@@ -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();
}
}
......
......@@ -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;
......
......@@ -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;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment