diff --git a/GUI/Model/Group/ItemCatalog.cpp b/GUI/Model/Group/ItemCatalog.cpp index ecdc4f3610a7b03a4f8e42ca8d142dfb624675b5..3aa73386c54deffd57cd3c90e1b24fbdaca415a0 100644 --- a/GUI/Model/Group/ItemCatalog.cpp +++ b/GUI/Model/Group/ItemCatalog.cpp @@ -119,7 +119,7 @@ ItemCatalog::ItemCatalog() addItem<AnisoPyramidItem>("Anisotropic pyramid", ":/SampleDesignerToolbox/images/ff_AnisoPyramid_64x64.png", - "Pyramid with a rectangular base"); + "Truncated pyramid with a rectangular base"); addItem<BarGaussItem>("BarGauss", ":/SampleDesignerToolbox/images/ff_Box_64x64.png", "Rectangular cuboid"); @@ -130,14 +130,15 @@ ItemCatalog::ItemCatalog() addItem<BoxItem>("Box", ":/SampleDesignerToolbox/images/ff_Box_64x64.png", "Rectangular cuboid"); - addItem<ConeItem>("Cone", ":/SampleDesignerToolbox/images/ff_Cone_64x64.png", "Truncated cone"); + addItem<ConeItem>("Cone", ":/SampleDesignerToolbox/images/ff_Cone_64x64.png", + "Truncated cone with circular base"); addItem<Cone6Item>("Cone6", ":/SampleDesignerToolbox/images/ff_Cone6_64x64.png", "A truncated pyramid, based on a regular hexagon"); addItem<CuboctahedronItem>( "Cuboctahedron", ":/SampleDesignerToolbox/images/ff_Cuboctahedron_64x64.png", - "Combination of two pyramids of different heights, sharing a common face"); + "Compound of two truncated pyramids with a common square base and opposite orientations"); addItem<DodecahedronItem>( "Dodecahedron", ":/SampleDesignerToolbox/images/ff_Dodecahedron_64x64.png", "Dodecahedron"); @@ -152,9 +153,9 @@ ItemCatalog::ItemCatalog() addItem<FullSphereItem>("Full sphere", ":/SampleDesignerToolbox/images/ff_FullSphere_64x64.png", "Full sphere"); - addItem<FullSpheroidItem>("Full spheroid", - ":/SampleDesignerToolbox/images/ff_FullSpheroid_64x64.png", - "Ellipsoid of revolution"); + addItem<FullSpheroidItem>( + "Full spheroid", ":/SampleDesignerToolbox/images/ff_FullSpheroid_64x64.png", + "Full spheroid, generated by rotating an ellipse around the vertical axis"); addItem<HemiEllipsoidItem>("Hemi ellipsoid", ":/SampleDesignerToolbox/images/ff_HemiEllipsoid_64x64.png", diff --git a/GUI/Model/Sample/FormFactorItems.cpp b/GUI/Model/Sample/FormFactorItems.cpp index 7deca5ee1b51fa2c3fdba541a490199772776d03..37ad6aef13d8accbeedb3674aeb0e23857285d1f 100644 --- a/GUI/Model/Sample/FormFactorItems.cpp +++ b/GUI/Model/Sample/FormFactorItems.cpp @@ -21,7 +21,6 @@ AnisoPyramidItem::AnisoPyramidItem() : FormFactorItem(M_TYPE) { - setToolTip("A truncated pyramid with a rectangular base"); addProperty(P_LENGTH, 20.0)->setToolTip("Length of the rectangular base in nanometers"); addProperty(P_WIDTH, 16.0)->setToolTip("Width of the rectangular base in nanometers"); addProperty(P_HEIGHT, 13.0)->setToolTip("Height of pyramid in nanometers"); @@ -86,7 +85,6 @@ DoubleDescriptor AnisoPyramidItem::alpha() const BarGaussItem::BarGaussItem() : FormFactorItem(M_TYPE) { - setToolTip("Rectangular cuboid"); addProperty(P_LENGTH, 20.0)->setToolTip("Length of the base in nanometers"); addProperty(P_WIDTH, 16.0)->setToolTip("Width of the base in nanometers"); addProperty(P_HEIGHT, 13.0)->setToolTip("Height of the box in nanometers"); @@ -137,7 +135,6 @@ void BarGaussItem::setHeight(const double height) BarLorentzItem::BarLorentzItem() : FormFactorItem(M_TYPE) { - setToolTip("Rectangular cuboid"); addProperty(P_LENGTH, 20.0)->setToolTip("Length of the base in nanometers"); addProperty(P_WIDTH, 16.0)->setToolTip("Width of the base in nanometers"); addProperty(P_HEIGHT, 13.0)->setToolTip("Height of the box in nanometers"); @@ -188,7 +185,6 @@ void BarLorentzItem::setHeight(const double height) BoxItem::BoxItem() : FormFactorItem(M_TYPE) { - setToolTip("Rectangular cuboid"); addProperty(P_LENGTH, 20.0)->setToolTip("Length of the base in nanometers"); addProperty(P_WIDTH, 16.0)->setToolTip("Width of the base in nanometers"); addProperty(P_HEIGHT, 13.0)->setToolTip("Height of the box in nanometers"); @@ -239,7 +235,6 @@ void BoxItem::setHeight(const double height) ConeItem::ConeItem() : FormFactorItem(M_TYPE) { - setToolTip("Truncated cone with circular base"); addProperty(P_RADIUS, 10.0)->setToolTip("Radius of the base in nanometers"); addProperty(P_HEIGHT, 13.0)->setToolTip("Height of the cone in nanometers"); addProperty(P_ALPHA, 60.0) @@ -291,7 +286,6 @@ void ConeItem::setAlpha(const double alpha) Cone6Item::Cone6Item() : FormFactorItem(M_TYPE) { - setToolTip("A truncated pyramid, based on a regular hexagon"); addProperty(P_BASEEDGE, 10.0)->setToolTip("Edge of the regular hexagonal base in nanometers"); addProperty(P_HEIGHT, 13.0)->setToolTip("Height of a truncated pyramid in nanometers"); addProperty(P_ALPHA, 60.0)->setToolTip("Dihedral angle in degrees between base and facet"); @@ -342,8 +336,6 @@ void Cone6Item::setAlpha(const double alpha) CuboctahedronItem::CuboctahedronItem() : FormFactorItem(M_TYPE) { - setToolTip("Compound of two truncated pyramids with a common square base \n" - "and opposite orientations"); addProperty(P_LENGTH, 20.0)->setToolTip("Side length of the common square base in nanometers"); addProperty(P_HEIGHT, 13.0)->setToolTip("Height of the lower pyramid in nanometers"); addProperty(P_HEIGHT_RATIO, 0.7) @@ -410,7 +402,6 @@ void CuboctahedronItem::setAlpha(const double alpha) CylinderItem::CylinderItem() : FormFactorItem(M_TYPE) { - setToolTip("Cylinder with a circular base"); addProperty(P_RADIUS, 8.0)->setToolTip("Radius of the circular base in nanometers"); addProperty(P_HEIGHT, 16.0)->setToolTip("Height of the cylinder in nanometers"); } @@ -458,7 +449,6 @@ SessionItem* CylinderItem::heightItem() const DodecahedronItem::DodecahedronItem() : FormFactorItem(M_TYPE) { - setToolTip("Dodecahedron"); addProperty(P_EDGE, 10.0)->setToolTip("Length of the edge in nanometers"); } @@ -483,7 +473,6 @@ void DodecahedronItem::setEdge(const double edge) EllipsoidalCylinderItem::EllipsoidalCylinderItem() : FormFactorItem(M_TYPE) { - setToolTip("Cylinder with an ellipse cross section"); addProperty(P_RADIUS_X, 8.0) ->setToolTip("Radius of the ellipse base in the x-direction, in nanometers"); addProperty(P_RADIUS_Y, 13.0) @@ -536,7 +525,6 @@ void EllipsoidalCylinderItem::setHeight(const double height) FullSphereItem::FullSphereItem() : FormFactorItem(M_TYPE) { - setToolTip("Full sphere"); addProperty(P_RADIUS, 8.0)->setToolTip("Radius of the sphere in nanometers"); } @@ -566,7 +554,6 @@ SessionItem* FullSphereItem::radiusItem() const FullSpheroidItem::FullSpheroidItem() : FormFactorItem(M_TYPE) { - setToolTip("Full spheroid, generated by rotating an ellipse around the vertical axis"); addProperty(P_RADIUS, 10.0)->setToolTip("Radius of the circular cross section in nanometers"); addProperty(P_HEIGHT, 13.0)->setToolTip("Height of the full spheroid in nanometers"); } @@ -604,7 +591,6 @@ void FullSpheroidItem::setHeight(const double height) HemiEllipsoidItem::HemiEllipsoidItem() : FormFactorItem(M_TYPE) { - setToolTip("An horizontally oriented ellipsoid, truncated at the central plane"); addProperty(P_RADIUS_X, 10.0) ->setToolTip("Radius of the ellipse base in the x-direction, in nanometers"); addProperty(P_RADIUS_Y, 6.0) @@ -657,7 +643,6 @@ void HemiEllipsoidItem::setHeight(const double height) IcosahedronItem::IcosahedronItem() : FormFactorItem(M_TYPE) { - setToolTip("Icosahedron"); addProperty(P_EDGE, 10.0)->setToolTip("Length of the edge in nanometers"); } @@ -682,7 +667,6 @@ void IcosahedronItem::setEdge(const double edge) Prism3Item::Prism3Item() : FormFactorItem(M_TYPE) { - setToolTip("Prism with an equilaterial triangle base"); addProperty(P_BASEEDGE, 10.0)->setToolTip("Length of the base edge in nanometers"); addProperty(P_HEIGHT, 13.0)->setToolTip("Height in nanometers"); } @@ -720,7 +704,6 @@ void Prism3Item::setHeight(const double height) Prism6Item::Prism6Item() : FormFactorItem(M_TYPE) { - setToolTip("Prism with a regular hexagonal base"); addProperty(P_BASEEDGE, 5.0)->setToolTip("Length of the hexagonal base in nanometers"); addProperty(P_HEIGHT, 11.0)->setToolTip("Height in nanometers"); } @@ -758,7 +741,6 @@ void Prism6Item::setHeight(const double height) PyramidItem::PyramidItem() : FormFactorItem(M_TYPE) { - setToolTip("Truncated pyramid with a square base"); addProperty(P_BASEEDGE, 18.0)->setToolTip("Length of the square base in nanometers"); addProperty(P_HEIGHT, 13.0)->setToolTip("Height of the pyramid in nanometers"); addProperty(P_ALPHA, 60.0) @@ -810,7 +792,6 @@ void PyramidItem::setAlpha(const double alpha) CosineRippleBoxItem::CosineRippleBoxItem() : FormFactorItem(M_TYPE) { - setToolTip("Particle with a cosine profile and a rectangular base"); addProperty(P_LENGTH, 27.0)->setToolTip("Length of the rectangular base in nanometers"); addProperty(P_WIDTH, 20.0)->setToolTip("Width of the rectangular base in nanometers"); addProperty(P_HEIGHT, 14.0)->setToolTip("Height of the ripple in nanometers"); @@ -861,7 +842,6 @@ void CosineRippleBoxItem::setHeight(const double height) CosineRippleGaussItem::CosineRippleGaussItem() : FormFactorItem(M_TYPE) { - setToolTip("Particle with a cosine profile and a rectangular base"); addProperty(P_LENGTH, 27.0)->setToolTip("Length of the rectangular base in nanometers"); addProperty(P_WIDTH, 20.0)->setToolTip("Width of the rectangular base in nanometers"); addProperty(P_HEIGHT, 14.0)->setToolTip("Height of the ripple in nanometers"); @@ -912,7 +892,6 @@ void CosineRippleGaussItem::setHeight(const double height) CosineRippleLorentzItem::CosineRippleLorentzItem() : FormFactorItem(M_TYPE) { - setToolTip("Particle with a cosine profile and a rectangular base"); addProperty(P_LENGTH, 27.0)->setToolTip("Length of the rectangular base in nanometers"); addProperty(P_WIDTH, 20.0)->setToolTip("Width of the rectangular base in nanometers"); addProperty(P_HEIGHT, 14.0)->setToolTip("Height of the ripple in nanometers"); @@ -963,7 +942,6 @@ void CosineRippleLorentzItem::setHeight(const double height) SawtoothRippleBoxItem::SawtoothRippleBoxItem() : FormFactorItem(M_TYPE) { - setToolTip("Particle with an asymmetric triangle profile and a rectangular base"); addProperty(P_LENGTH, 36.0)->setToolTip("Length of the rectangular base in nanometers"); addProperty(P_WIDTH, 25.0)->setToolTip("Width of the rectangular base in nanometers"); addProperty(P_HEIGHT, 14.0)->setToolTip("Height of the ripple in nanometers"); @@ -1028,7 +1006,6 @@ void SawtoothRippleBoxItem::setAsymmetry(const double asymmetry) SawtoothRippleGaussItem::SawtoothRippleGaussItem() : FormFactorItem(M_TYPE) { - setToolTip("Particle with an asymmetric triangle profile and a rectangular base"); addProperty(P_LENGTH, 36.0)->setToolTip("Length of the rectangular base in nanometers"); addProperty(P_WIDTH, 25.0)->setToolTip("Width of the rectangular base in nanometers"); addProperty(P_HEIGHT, 14.0)->setToolTip("Height of the ripple in nanometers"); @@ -1094,7 +1071,6 @@ void SawtoothRippleGaussItem::setAsymmetry(const double asymmetry) SawtoothRippleLorentzItem::SawtoothRippleLorentzItem() : FormFactorItem(M_TYPE) { - setToolTip("Particle with an asymmetric triangle profile and a rectangular base"); addProperty(P_LENGTH, 36.0)->setToolTip("Length of the rectangular base in nanometers"); addProperty(P_WIDTH, 25.0)->setToolTip("Width of the rectangular base in nanometers"); addProperty(P_HEIGHT, 14.0)->setToolTip("Height of the ripple in nanometers"); @@ -1161,7 +1137,6 @@ void SawtoothRippleLorentzItem::setAsymmetry(const double asymmetry) TetrahedronItem::TetrahedronItem() : FormFactorItem(M_TYPE) { - setToolTip("A truncated tethrahedron"); addProperty(P_BASEEDGE, 15.0) ->setToolTip("Length of one edge of the equilateral triangular base in nanometers"); addProperty(P_HEIGHT, 6.0)->setToolTip("Height of the tetrahedron in nanometers"); @@ -1213,7 +1188,6 @@ void TetrahedronItem::setAlpha(const double alpha) TruncatedCubeItem::TruncatedCubeItem() : FormFactorItem(M_TYPE) { - setToolTip("A cube whose eight vertices have been removed"); addProperty(P_LENGTH, 15.0)->setToolTip("Length of the full cube's edge in nanometers"); addProperty(P_REMOVED_LENGTH, 6.0) ->setToolTip("Removed length from each edge of the cube in nanometers"); @@ -1252,7 +1226,6 @@ void TruncatedCubeItem::setRemovedLength(const double removed_length) TruncatedSphereItem::TruncatedSphereItem() : FormFactorItem(M_TYPE) { - setToolTip("Spherical dome"); addProperty(P_RADIUS, 5.0)->setToolTip("Radius of the truncated sphere in nanometers"); addProperty(P_HEIGHT, 7.0)->setToolTip("Height of the truncated sphere in nanometers"); addProperty(P_REMOVED_TOP, 0.0)->setToolTip("Height of the removed top cap in nanometers"); @@ -1303,7 +1276,6 @@ void TruncatedSphereItem::setRemovedTop(const double removed_top) TruncatedSpheroidItem::TruncatedSpheroidItem() : FormFactorItem(M_TYPE) { - setToolTip("Spheroidal dome"); addProperty(P_RADIUS, 7.5)->setToolTip("Radius of the truncated spheroid in nanometers"); addProperty(P_HEIGHT, 9.0)->setToolTip("Height of the truncated spheroid in nanometers"); addProperty(P_HFC, 1.2) diff --git a/GUI/Model/Sample/InterferenceItems.cpp b/GUI/Model/Sample/InterferenceItems.cpp index 34b430243321e68647746f554f7579dc3e14e8e3..9bf360c2a536ddba51ee1b37f37d807bcba5ffc7 100644 --- a/GUI/Model/Sample/InterferenceItems.cpp +++ b/GUI/Model/Sample/InterferenceItems.cpp @@ -43,7 +43,6 @@ InterferenceItem::InterferenceItem(const QString& modelType) : SessionItem(model Interference1DLatticeItem::Interference1DLatticeItem() : InterferenceItem(M_TYPE) { - setToolTip("Interference function of a 1D lattice"); addProperty(P_LENGTH, 20.0 * Units::nm)->setToolTip("Lattice length in nanometers"); addProperty(P_ROTATION_ANGLE, 0.0) ->setToolTip("Rotation of lattice with respect to x-axis of reference \n" @@ -148,8 +147,6 @@ void Interference2DAbstractLatticeItem::update_rotation_availability() Interference2DLatticeItem::Interference2DLatticeItem() : Interference2DAbstractLatticeItem(M_TYPE, false) { - setToolTip("Interference function of a 2D lattice"); - GroupInfo info; info.add<FTDecayFunction2DCauchyItem>(); info.add<FTDecayFunction2DGaussItem>(); @@ -183,7 +180,6 @@ SelectionDescriptor<FTDecayFunction2DItem*> Interference2DLatticeItem::decayFunc Interference2DParaCrystalItem::Interference2DParaCrystalItem() : Interference2DAbstractLatticeItem(M_TYPE, true) { - setToolTip("Interference function of a two-dimensional paracrystal"); latticeType().currentItem()->latticeRotationAngleItem()->setEnabled(false); addProperty(P_DAMPING_LENGTH, 0.0) @@ -312,7 +308,6 @@ void Interference2DParaCrystalItem::update_distribution_displaynames() InterferenceFinite2DLatticeItem::InterferenceFinite2DLatticeItem() : Interference2DAbstractLatticeItem(M_TYPE, false) { - setToolTip("Interference function of a finite 2D lattice"); addProperty(P_DOMAIN_SIZE_1, 100u)->setToolTip("Domain size 1 in number of unit cells"); addProperty(P_DOMAIN_SIZE_2, 100u)->setToolTip("Domain size 2 in number of unit cells"); } @@ -355,7 +350,6 @@ void InterferenceFinite2DLatticeItem::setDomainSize2(const unsigned int domain_s InterferenceHardDiskItem::InterferenceHardDiskItem() : InterferenceItem(M_TYPE) { - setToolTip("Interference function for hard disk Percus-Yevick"); addProperty(P_RADIUS, 5.0 * Units::nm)->setToolTip("Hard disk radius in nanometers"); addProperty(P_DENSITY, 0.002)->setToolTip("Particle density in particles per square nanometer"); } @@ -386,7 +380,6 @@ DoubleDescriptor InterferenceHardDiskItem::radius() const InterferenceRadialParaCrystalItem::InterferenceRadialParaCrystalItem() : InterferenceItem(M_TYPE) { - setToolTip("Interference function of a radial paracrystal"); addProperty(P_PEAK_DISTANCE, 20.0 * Units::nm) ->setToolTip("Average distance to the next neighbor in nanometers"); addProperty(P_DAMPING_LENGTH, 1000.0 * Units::nm) diff --git a/GUI/Model/Sample/MesoCrystalItem.cpp b/GUI/Model/Sample/MesoCrystalItem.cpp index 4c0f3a8d7042bd165e9a11fa5ed0b259ec2eb45d..5fae60641bddd3d35b88d8abc8ae1e85c8409387 100644 --- a/GUI/Model/Sample/MesoCrystalItem.cpp +++ b/GUI/Model/Sample/MesoCrystalItem.cpp @@ -49,8 +49,6 @@ const QString density_tooltip = MesoCrystalItem::MesoCrystalItem() : SessionItem(M_TYPE), ItemWithParticles(M_TYPE, abundance_tooltip, position_tooltip) { - setToolTip("A 3D crystal structure of nanoparticles"); - addGroupProperty(P_OUTER_SHAPE, formFactorGroupInfo()); addProperty<VectorItem>(P_VECTOR_A)->setToolTip(lattice_vector1_tooltip); diff --git a/GUI/Model/Sample/ParticleCompositionItem.cpp b/GUI/Model/Sample/ParticleCompositionItem.cpp index f64edccac492fa8c8df92d79a8998c318b72e2d3..5ce33a513fd4929952e2f436cc03a8db7fef07bb 100644 --- a/GUI/Model/Sample/ParticleCompositionItem.cpp +++ b/GUI/Model/Sample/ParticleCompositionItem.cpp @@ -37,8 +37,6 @@ const QString position_tooltip = "Relative position of the particle's reference ParticleCompositionItem::ParticleCompositionItem() : SessionItem(M_TYPE), ItemWithParticles(M_TYPE, abundance_tooltip, position_tooltip) { - setToolTip("Composition of particles with fixed positions"); - registerTag(T_PARTICLES, 0, -1, {ParticleItem::M_TYPE, ParticleCoreShellItem::M_TYPE, ParticleCompositionItem::M_TYPE, MesoCrystalItem::M_TYPE}); diff --git a/GUI/Model/Sample/ParticleCoreShellItem.cpp b/GUI/Model/Sample/ParticleCoreShellItem.cpp index 3ae2404cc7f23f4c774f066875ea52d7effa06b6..183d5c7955b231c69dbfbd2fbe8b1aa737aabaf4 100644 --- a/GUI/Model/Sample/ParticleCoreShellItem.cpp +++ b/GUI/Model/Sample/ParticleCoreShellItem.cpp @@ -36,8 +36,6 @@ const QString position_tooltip = "Relative position of the particle's reference ParticleCoreShellItem::ParticleCoreShellItem() : SessionItem(M_TYPE), ItemWithParticles(M_TYPE, abundance_tooltip, position_tooltip) { - setToolTip("A particle with a core/shell geometry"); - registerTag(T_CORE, 0, 1, {ParticleItem::M_TYPE}); registerTag(T_SHELL, 0, 1, {ParticleItem::M_TYPE}); }