diff --git a/GUI/Model/Beam/FootprintItems.cpp b/GUI/Model/Beam/FootprintItems.cpp index 0d1614450faeb33acdcb0b62309e61c23ee089fe..9a1fbd59d0c5ec59ceaad97e1ae567b7f1cbbb1a 100644 --- a/GUI/Model/Beam/FootprintItems.cpp +++ b/GUI/Model/Beam/FootprintItems.cpp @@ -33,7 +33,7 @@ std::unique_ptr<IFootprint> FootprintNoneItem::createFootprint() const FootprintGaussianItem::FootprintGaussianItem(double value) { - m_gaussianFootprintValue.init("Width ratio ()", "The ratio of beam and sample full widths", + m_gaussianFootprintValue.init("Width ratio", "The ratio of beam and sample full widths", value, 3 /* decimals */, RealLimits::nonnegative(), "ratio"); } @@ -65,7 +65,7 @@ std::unique_ptr<IFootprint> FootprintGaussianItem::createFootprint() const FootprintSquareItem::FootprintSquareItem(double value) { - m_squareFootprintValue.init("Width ratio ()", "The ratio of beam and sample full widths", value, + m_squareFootprintValue.init("Width ratio", "The ratio of beam and sample full widths", value, 3 /* decimals */, RealLimits::nonnegative(), "ratio"); } diff --git a/GUI/Model/Beam/SourceItems.cpp b/GUI/Model/Beam/SourceItems.cpp index 5917bd28ac641a69d085a0bfe4aa5ad351f7af42..8deeb3858739d55e74d720135c808d6e3d1ed40a 100644 --- a/GUI/Model/Beam/SourceItems.cpp +++ b/GUI/Model/Beam/SourceItems.cpp @@ -50,7 +50,7 @@ const QString ExpandFootprintGroupbox("ExpandFootprintGroupbox"); SourceItem::SourceItem() { - m_intensity.init("Intensity ()", "Beam intensity in neutrons/photons per sec.", 1e8, + m_intensity.init("Intensity", "Beam intensity in neutrons/photons per sec.", 1e8, 3 /* decimals */, RealLimits::limited(0.0, 1e32), "intensity"); m_azimuthalAngleItem.reset(new BeamAzimuthalAngleItem()); diff --git a/GUI/Model/Descriptor/DistributionItems.cpp b/GUI/Model/Descriptor/DistributionItems.cpp index b1e3a1fc9787ef02ee631aa52b993e5e54a5d578..a5acef9410d7d93dc97f4e66e9c44cda84097f11 100644 --- a/GUI/Model/Descriptor/DistributionItems.cpp +++ b/GUI/Model/Descriptor/DistributionItems.cpp @@ -43,7 +43,7 @@ DistributionItem::DistributionItem() = default; void DistributionItem::initRelSamplingWidth() { - m_relSamplingWidth.init("Rel. sampling width ()", "", 2.0, "relSamplingWidth"); + m_relSamplingWidth.init("Rel. sampling width", "", 2.0, "relSamplingWidth"); } bool DistributionItem::hasRelSamplingWidth() const @@ -181,8 +181,8 @@ DoubleProperties DistributionNoneItem::distributionValues(bool withMean) DistributionGateItem::DistributionGateItem() { - m_minimum.init("Min ()", "", 0.0, 3 /* decimals */, RealLimits::limitless(), "min"); - m_maximum.init("Max ()", "", 1.0, 3 /* decimals */, RealLimits::limitless(), "max"); + m_minimum.init("Min", "", 0.0, 3 /* decimals */, RealLimits::limitless(), "min"); + m_maximum.init("Max", "", 1.0, 3 /* decimals */, RealLimits::limitless(), "max"); } void DistributionGateItem::setUnit(const variant<QString, Unit>& unit) @@ -272,7 +272,7 @@ DistributionLorentzItem::DistributionLorentzItem() { initRelSamplingWidth(); - m_hwhm.init("HWHM ()", "", 1.0, "hwhm"); + m_hwhm.init("HWHM", "", 1.0, "hwhm"); } void DistributionLorentzItem::setUnit(const variant<QString, Unit>& unit) @@ -353,7 +353,7 @@ DistributionGaussianItem::DistributionGaussianItem() { initRelSamplingWidth(); - m_standardDeviation.init("StdDev ()", "", 1.0, 3 /* decimals */, RealLimits::lowerLimited(0.0), + m_standardDeviation.init("StdDev", "", 1.0, 3 /* decimals */, RealLimits::lowerLimited(0.0), "stdDev"); } @@ -435,8 +435,8 @@ DistributionLogNormalItem::DistributionLogNormalItem() { initRelSamplingWidth(); - m_median.init("Median ()", "", 1.0, "median"); - m_scaleParameter.init("ScaleParameter ()", "", 1.0, 3 /* decimals */, + m_median.init("Median", "", 1.0, "median"); + m_scaleParameter.init("ScaleParameter", "", 1.0, 3 /* decimals */, RealLimits::lowerLimited(0.0), "scalePar"); } @@ -519,7 +519,7 @@ DoubleProperties DistributionLogNormalItem::distributionValues(bool /*withMean*/ DistributionCosineItem::DistributionCosineItem() : SymmetricResolutionItem(1.0) { - m_hwhm.init("HWHM ()", "", 1.0, 3 /* decimals */, RealLimits::lowerLimited(0.0), "hwhm"); + m_hwhm.init("HWHM", "", 1.0, 3 /* decimals */, RealLimits::lowerLimited(0.0), "hwhm"); } void DistributionCosineItem::setUnit(const variant<QString, Unit>& unit) @@ -596,10 +596,10 @@ DoubleProperties DistributionCosineItem::distributionValues(bool withMean) DistributionTrapezoidItem::DistributionTrapezoidItem() { - m_center.init("Center ()", "", 1.0, 3 /* decimals */, RealLimits::limitless(), "center"); - m_leftWidth.init("LeftWidth ()", "", 1.0, "left"); - m_middleWidth.init("MiddleWidth ()", "", 1.0, "middle"); - m_rightWidth.init("RightWidth ()", "", 1.0, "right"); + m_center.init("Center", "", 1.0, 3 /* decimals */, RealLimits::limitless(), "center"); + m_leftWidth.init("LeftWidth", "", 1.0, "left"); + m_middleWidth.init("MiddleWidth", "", 1.0, "middle"); + m_rightWidth.init("RightWidth", "", 1.0, "right"); } void DistributionTrapezoidItem::setUnit(const variant<QString, Unit>& unit) diff --git a/GUI/Model/Sample/FormFactorItems.cpp b/GUI/Model/Sample/FormFactorItems.cpp index 42f460f7f33169cce642b58eba0ffc85e4ecb8e5..ac561599b5c31bf60641c544f1ce785e0cfde993 100644 --- a/GUI/Model/Sample/FormFactorItems.cpp +++ b/GUI/Model/Sample/FormFactorItems.cpp @@ -311,7 +311,7 @@ Bipyramid4Item::Bipyramid4Item() m_base_height.init("Base height (nm)", "Height of the lower pyramid", 16.0, "base_height"); - m_heightRatio.init("Height ratio ()", "Ratio of heights of top to bottom pyramids", 0.7, 3, + m_heightRatio.init("Height ratio", "Ratio of heights of top to bottom pyramids", 0.7, 3, RealLimits::lowerLimited(0.0), "heightRatio"); m_alpha.init("Alpha (deg)", "Dihedral angle between base and facets", 70.0, 2, 0.1, diff --git a/GUI/Model/Sample/InterferenceItems.cpp b/GUI/Model/Sample/InterferenceItems.cpp index 7be1e840f7b3a7923d33efcaf467510f06701f36..e40cd87f30d1ce5e481424cbad81ccd3f8613185 100644 --- a/GUI/Model/Sample/InterferenceItems.cpp +++ b/GUI/Model/Sample/InterferenceItems.cpp @@ -521,7 +521,7 @@ InterferenceRadialParacrystalItem::InterferenceRadialParacrystalItem() 1000.0, "dampingLen"); m_domainSize.init("Domain size (nm)", "Size of coherence domain along the lattice main axis", 0.0, "size"); - m_kappa.init("SizeSpaceCoupling ()", + m_kappa.init("SizeSpaceCoupling", "Size spacing coupling parameter of the Size Spacing Correlation Approximation", 0.0, "kappa"); m_pdf.init("PDF", "One-dimensional probability distribution"); diff --git a/GUI/Model/Sample/ItemWithParticles.cpp b/GUI/Model/Sample/ItemWithParticles.cpp index 0ff7fda670375aaf92641c92b4fc56e64a7b5924..48030b5c14bdf04d53632651822e74d863c469b0 100644 --- a/GUI/Model/Sample/ItemWithParticles.cpp +++ b/GUI/Model/Sample/ItemWithParticles.cpp @@ -30,7 +30,7 @@ const QString Rotation("Rotation"); ItemWithParticles::ItemWithParticles(const QString& abundanceTooltip, const QString& positionTooltip) { - m_abundance.init("Abundance ()", abundanceTooltip, 1.0, 3 /* decimals */, + m_abundance.init("Abundance", abundanceTooltip, 1.0, 3 /* decimals */, RealLimits::limited(0.0, 1.0), "abundance"); m_position.init("Position offset (nm)", positionTooltip, "pos"); m_rotation.init("Rotation", ""); diff --git a/GUI/Model/Sample/MaterialItem.cpp b/GUI/Model/Sample/MaterialItem.cpp index c0a00491a9b8783a42355f4b554b107f695290ba..cd4e415799026a0523e94adf4f46eb711c48fef2 100644 --- a/GUI/Model/Sample/MaterialItem.cpp +++ b/GUI/Model/Sample/MaterialItem.cpp @@ -41,9 +41,9 @@ MaterialItem::MaterialItem() m_color = Qt::red; m_id = QUuid::createUuid().toString(); - m_delta.init("Delta ()", "Delta of refractive index (n = 1 - delta + i*beta)", 0.0, 3, + m_delta.init("Delta", "Delta of refractive index (n = 1 - delta + i*beta)", 0.0, 3, RealLimits::limitless(), "delta"); - m_beta.init("Beta ()", "Beta of refractive index (n = 1 - delta + i*beta)", 0.0, 3, + m_beta.init("Beta", "Beta of refractive index (n = 1 - delta + i*beta)", 0.0, 3, RealLimits::limitless(), "beta"); m_sldRe.init("SLD, real", "Real part SLD (SLD = real - i*imag) (Ã…^-2)", 0.0, diff --git a/GUI/Model/Sample/ProfileItems.cpp b/GUI/Model/Sample/ProfileItems.cpp index 9d0df4cbbea843c2e05815bab767a2a5feb8864f..b4a9ca583df0942605c4c5c772359458786378f1 100644 --- a/GUI/Model/Sample/ProfileItems.cpp +++ b/GUI/Model/Sample/ProfileItems.cpp @@ -99,7 +99,7 @@ std::unique_ptr<IProfile1D> Profile1DCosineItem::createProfile() const Profile1DVoigtItem::Profile1DVoigtItem() { - m_eta.init("Eta ()", "Parameter [0,1] to balance between Cauchy (eta=0.0) and Gauss (eta=1.0)", + m_eta.init("Eta", "Parameter [0,1] to balance between Cauchy (eta=0.0) and Gauss (eta=1.0)", 0.5, 3 /* decimals */, RealLimits::limited(0.0, 1.0), "eta"); } @@ -232,7 +232,7 @@ std::unique_ptr<IProfile2D> Profile2DConeItem::createProfile() const Profile2DVoigtItem::Profile2DVoigtItem() { - m_eta.init("Eta ()", "Parameter [0,1] to balance between Cauchy (eta=0.0) and Gauss (eta=1.0)", + m_eta.init("Eta", "Parameter [0,1] to balance between Cauchy (eta=0.0) and Gauss (eta=1.0)", 0.5, 3 /* decimals */, RealLimits::limited(0.0, 1.0), "eta"); }