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

rm old init fct 1/3

parent eeb74032
No related branches found
No related tags found
1 merge request!2003In GUI, remove option to switch beteen nm and angstrom, degrees and radians.
...@@ -37,12 +37,6 @@ void DoubleProperty::init(const QString& label, const QString& tooltip, double v ...@@ -37,12 +37,6 @@ void DoubleProperty::init(const QString& label, const QString& tooltip, double v
} }
void DoubleProperty::init(const QString& label, const QString& tooltip, double value,
const variant<QString, Unit>& unit, const QString& uidPrefix)
{
init(label, tooltip, value, unit, 3, RealLimits::nonnegative(), uidPrefix);
}
void DoubleProperty::init(const QString& label, const QString& tooltip, double value, void DoubleProperty::init(const QString& label, const QString& tooltip, double value,
const variant<QString, Unit>& unit, uint decimals, const variant<QString, Unit>& unit, uint decimals,
const RealLimits& limits, const QString& uidPrefix) const RealLimits& limits, const QString& uidPrefix)
......
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
//! also when serializing the link. Right now, this uid is a UUID. //! also when serializing the link. Right now, this uid is a UUID.
class DoubleProperty { class DoubleProperty {
private:
public: public:
void init(const QString& label, const QString& tooltip, double value, const QString& uidPrefix); void init(const QString& label, const QString& tooltip, double value, const QString& uidPrefix);
void init(const QString& label, const QString& tooltip, double value, uint decimals, void init(const QString& label, const QString& tooltip, double value, uint decimals,
...@@ -44,8 +45,6 @@ public: ...@@ -44,8 +45,6 @@ public:
void init(const QString& label, const QString& tooltip, double value, uint decimals, void init(const QString& label, const QString& tooltip, double value, uint decimals,
double step, const RealLimits& limits, const QString& uidPrefix); double step, const RealLimits& limits, const QString& uidPrefix);
void init(const QString& label, const QString& tooltip, double value,
const std::variant<QString, Unit>& unit, const QString& uidPrefix);
void init(const QString& label, const QString& tooltip, double value, void init(const QString& label, const QString& tooltip, double value,
const std::variant<QString, Unit>& unit, uint decimals, const RealLimits& limits, const std::variant<QString, Unit>& unit, uint decimals, const RealLimits& limits,
const QString& uidPrefix); const QString& uidPrefix);
......
...@@ -56,9 +56,9 @@ DetectorItem::DetectorItem() ...@@ -56,9 +56,9 @@ DetectorItem::DetectorItem()
m_xSize = 100; m_xSize = 100;
m_ySize = 100; m_ySize = 100;
m_width.init("Width (x-axis)", "Width of the detector", default_detector_width, "mm", m_width.init("Width (mm)", "Width of the detector", default_detector_width,
3 /* decimals */, RealLimits::positive(), "width"); 3 /* decimals */, RealLimits::positive(), "width");
m_height.init("Height (y-axis)", "Height of the detector", default_detector_height, "mm", m_height.init("Height (mm)", "Height of the detector", default_detector_height,
3 /* decimals */, RealLimits::positive(), "height"); 3 /* decimals */, RealLimits::positive(), "height");
m_normalVector.init( m_normalVector.init(
...@@ -71,11 +71,11 @@ DetectorItem::DetectorItem() ...@@ -71,11 +71,11 @@ DetectorItem::DetectorItem()
"directionVector"); "directionVector");
m_directionVector.setY(-1.0); m_directionVector.setY(-1.0);
m_u0.init("u0", "", default_detector_width / 2., "mm", 3 /* decimals */, m_u0.init("u0 (mm)", "", default_detector_width / 2., 3 /* decimals */,
RealLimits::limitless(), "u0"); RealLimits::limitless(), "u0");
m_v0.init("v0", "", 0.0, "mm", 3 /* decimals */, RealLimits::limitless(), "v0"); m_v0.init("v0 (mm)", "", 0.0, 3 /* decimals */, RealLimits::limitless(), "v0");
m_distance.init("Distance", "Distance from the sample origin to the detector plane", m_distance.init("Distance (mm)", "Distance from the sample origin to the detector plane",
default_detector_distance, "mm", "distance"); default_detector_distance, "distance");
m_detectorAlignment = ComboProperty::fromList(alignment_names_map.values(), m_detectorAlignment = ComboProperty::fromList(alignment_names_map.values(),
alignment_names_map.value(FlatDetector::T)); alignment_names_map.value(FlatDetector::T));
......
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