From eb24cf26383cc2789bd80390445ffbaa56b3dbef Mon Sep 17 00:00:00 2001 From: Uwe Date: Sun, 26 Feb 2023 16:09:31 +0100 Subject: [PATCH] [Core] add missing velocity property - fixes compilation because declared in header but no code - also sort the properties to keep the overview --- src/App/PropertyUnits.cpp | 12 ++++ src/Base/Unit.cpp | 145 +++++++++++++++++++------------------- 2 files changed, 84 insertions(+), 73 deletions(-) diff --git a/src/App/PropertyUnits.cpp b/src/App/PropertyUnits.cpp index 6c98b70ff1..d44d4e5068 100644 --- a/src/App/PropertyUnits.cpp +++ b/src/App/PropertyUnits.cpp @@ -837,3 +837,15 @@ PropertyInverseVolume::PropertyInverseVolume() { setUnit(Base::Unit::InverseVolume); } + +//************************************************************************** +//************************************************************************** +// PropertyVelocity +//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + +TYPESYSTEM_SOURCE(App::PropertyVelocity, App::PropertyQuantity) + +PropertyVelocity::PropertyVelocity() +{ + setUnit(Base::Unit::Velocity); +} diff --git a/src/Base/Unit.cpp b/src/Base/Unit.cpp index 57a2a0b079..0a5d2b8c92 100644 --- a/src/Base/Unit.cpp +++ b/src/Base/Unit.cpp @@ -426,38 +426,58 @@ QString Unit::getString() const QString Unit::getTypeString() const { - if (*this == Unit::Length) - return QString::fromLatin1("Length"); - if (*this == Unit::Area) - return QString::fromLatin1("Area"); - if (*this == Unit::Volume) - return QString::fromLatin1("Volume"); - if (*this == Unit::Mass) - return QString::fromLatin1("Mass"); - if (*this == Unit::Angle) - return QString::fromLatin1("Angle"); - if(*this == Unit::AngleOfFriction ) - return QString::fromLatin1("AngleOfFriction"); - if(*this == Unit::Density) - return QString::fromLatin1("Density"); - if (*this == Unit::TimeSpan) - return QString::fromLatin1("TimeSpan"); - if (*this == Unit::Frequency) - return QString::fromLatin1("Frequency"); - if (*this == Unit::Velocity) - return QString::fromLatin1("Velocity"); if (*this == Unit::Acceleration) return QString::fromLatin1("Acceleration"); - if (*this == Unit::Temperature) - return QString::fromLatin1("Temperature"); + if (*this == Unit::AmountOfSubstance) + return QString::fromLatin1("AmountOfSubstance"); + if (*this == Unit::Angle) + return QString::fromLatin1("Angle"); + if (*this == Unit::AngleOfFriction) + return QString::fromLatin1("AngleOfFriction"); + if (*this == Unit::Area) + return QString::fromLatin1("Area"); if (*this == Unit::CurrentDensity) return QString::fromLatin1("CurrentDensity"); + if (*this == Unit::Density) + return QString::fromLatin1("Density"); + if (*this == Unit::DissipationRate) + return QString::fromLatin1("DissipationRate"); + if (*this == Unit::DynamicViscosity) + return QString::fromLatin1("DynamicViscosity"); + if (*this == Unit::ElectricalCapacitance) + return QString::fromLatin1("ElectricalCapacitance"); + if (*this == Unit::ElectricalConductance) + return QString::fromLatin1("ElectricalConductance"); + if (*this == Unit::ElectricalConductivity) + return QString::fromLatin1("ElectricalConductivity"); + if (*this == Unit::ElectricalInductance) + return QString::fromLatin1("ElectricalInductance"); + if (*this == Unit::ElectricalResistance) + return QString::fromLatin1("ElectricalResistance"); + if (*this == Unit::ElectricCharge) + return QString::fromLatin1("ElectricCharge"); if (*this == Unit::ElectricCurrent) return QString::fromLatin1("ElectricCurrent"); if (*this == Unit::ElectricPotential) return QString::fromLatin1("ElectricPotential"); - if (*this == Unit::ElectricCharge) - return QString::fromLatin1("ElectricCharge"); + if (*this == Unit::Frequency) + return QString::fromLatin1("Frequency"); + if (*this == Unit::Force) + return QString::fromLatin1("Force"); + if (*this == Unit::HeatFlux) + return QString::fromLatin1("HeatFlux"); + if (*this == Unit::InverseArea) + return QString::fromLatin1("InverseArea"); + if (*this == Unit::InverseLength) + return QString::fromLatin1("InverseLength"); + if (*this == Unit::InverseVolume) + return QString::fromLatin1("InverseVolume"); + if (*this == Unit::KinematicViscosity) + return QString::fromLatin1("KinematicViscosity"); + if (*this == Unit::Length) + return QString::fromLatin1("Length"); + if (*this == Unit::LuminousIntensity) + return QString::fromLatin1("LuminousIntensity"); if (*this == Unit::MagneticFieldStrength) return QString::fromLatin1("MagneticFieldStrength"); if (*this == Unit::MagneticFlux) @@ -466,73 +486,52 @@ QString Unit::getTypeString() const return QString::fromLatin1("MagneticFluxDensity"); if (*this == Unit::Magnetization) return QString::fromLatin1("Magnetization"); - if (*this == Unit::ElectricalCapacitance) - return QString::fromLatin1("ElectricalCapacitance"); - if (*this == Unit::ElectricalInductance) - return QString::fromLatin1("ElectricalInductance"); - if (*this == Unit::ElectricalConductance) - return QString::fromLatin1("ElectricalConductance"); - if (*this == Unit::ElectricalResistance) - return QString::fromLatin1("ElectricalResistance"); - if (*this == Unit::ElectricalConductivity) - return QString::fromLatin1("ElectricalConductivity"); - if (*this == Unit::AmountOfSubstance) - return QString::fromLatin1("AmountOfSubstance"); - if (*this == Unit::LuminousIntensity) - return QString::fromLatin1("LuminousIntensity"); + if (*this == Unit::Mass) + return QString::fromLatin1("Mass"); if (*this == Unit::Pressure) return QString::fromLatin1("Pressure"); - if(*this == Unit::ShearModulus) - return QString::fromLatin1("ShearModulus"); - if(*this == Unit::Stress) - return QString::fromLatin1("Stress"); - if(*this == Unit::UltimateTensileStrength ) - return QString::fromLatin1("UltimateTensileStrength"); - if(*this == Unit::YieldStrength) - return QString::fromLatin1("YieldStrength"); - if(*this == Unit::YoungsModulus) - return QString::fromLatin1("YoungsModulus"); - if(*this == Unit::Force) - return QString::fromLatin1("Force"); - if (*this == Unit::Work) - return QString::fromLatin1("Work"); if (*this == Unit::Power) return QString::fromLatin1("Power"); - if (*this == Unit::Stiffness) - return QString::fromLatin1("Stiffness"); + if (*this == Unit::ShearModulus) + return QString::fromLatin1("ShearModulus"); if (*this == Unit::SpecificEnergy) return QString::fromLatin1("SpecificEnergy"); + if (*this == Unit::SpecificHeat) + return QString::fromLatin1("SpecificHeat"); + if (*this == Unit::Stiffness) + return QString::fromLatin1("Stiffness"); + if (*this == Unit::Stress) + return QString::fromLatin1("Stress"); + if (*this == Unit::Temperature) + return QString::fromLatin1("Temperature"); if (*this == Unit::ThermalConductivity) return QString::fromLatin1("ThermalConductivity"); if (*this == Unit::ThermalExpansionCoefficient) return QString::fromLatin1("ThermalExpansionCoefficient"); - if (*this == Unit::VolumetricThermalExpansionCoefficient) - return QString::fromLatin1("VolumetricThermalExpansionCoefficient"); - if (*this == Unit::SpecificHeat) - return QString::fromLatin1("SpecificHeat"); if (*this == Unit::ThermalTransferCoefficient) return QString::fromLatin1("ThermalTransferCoefficient"); - if (*this == Unit::HeatFlux) - return QString::fromLatin1("HeatFlux"); - if (*this == Unit::DynamicViscosity) - return QString::fromLatin1("DynamicViscosity"); - if (*this == Unit::KinematicViscosity) - return QString::fromLatin1("KinematicViscosity"); + if (*this == Unit::TimeSpan) + return QString::fromLatin1("TimeSpan"); + if (*this == Unit::UltimateTensileStrength) + return QString::fromLatin1("UltimateTensileStrength"); if (*this == Unit::VacuumPermittivity) return QString::fromLatin1("VacuumPermittivity"); + if (*this == Unit::Velocity) + return QString::fromLatin1("Velocity"); + if (*this == Unit::Volume) + return QString::fromLatin1("Volume"); if (*this == Unit::VolumeFlowRate) return QString::fromLatin1("VolumeFlowRate"); - if (*this == Unit::DissipationRate) - return QString::fromLatin1("DissipationRate"); - if (*this == Unit::InverseLength) - return QString::fromLatin1("InverseLength"); - if (*this == Unit::InverseArea) - return QString::fromLatin1("InverseArea"); - if (*this == Unit::InverseVolume) - return QString::fromLatin1("InverseVolume"); + if (*this == Unit::VolumetricThermalExpansionCoefficient) + return QString::fromLatin1("VolumetricThermalExpansionCoefficient"); + if (*this == Unit::Work) + return QString::fromLatin1("Work"); + if (*this == Unit::YieldStrength) + return QString::fromLatin1("YieldStrength"); + if (*this == Unit::YoungsModulus) + return QString::fromLatin1("YoungsModulus"); return QString(); - } Unit Unit::Length(1);