Base: Add moment unit
This commit is contained in:
@@ -623,6 +623,9 @@ QString Unit::getTypeString() const
|
||||
if (*this == Unit::YoungsModulus) {
|
||||
return QString::fromLatin1("YoungsModulus");
|
||||
}
|
||||
if (*this == Unit::Moment) {
|
||||
return QString::fromLatin1("Moment");
|
||||
}
|
||||
|
||||
return {};
|
||||
}
|
||||
@@ -664,6 +667,7 @@ const Unit Unit::MagneticFieldStrength (-1,0,0,1);
|
||||
const Unit Unit::MagneticFlux (2,1,-2,-1);
|
||||
const Unit Unit::MagneticFluxDensity (0,1,-2,-1);
|
||||
const Unit Unit::Magnetization (-1,0,0,1);
|
||||
const Unit Unit::Moment (2, 1, -2);
|
||||
const Unit Unit::Pressure (-1,1,-2);
|
||||
const Unit Unit::Power (2, 1, -3);
|
||||
const Unit Unit::ShearModulus (-1,1,-2);
|
||||
|
||||
@@ -155,6 +155,7 @@ public:
|
||||
static const Unit Force;
|
||||
static const Unit Work;
|
||||
static const Unit Power;
|
||||
static const Unit Moment;
|
||||
|
||||
static const Unit SpecificEnergy;
|
||||
static const Unit ThermalConductivity;
|
||||
|
||||
@@ -272,6 +272,24 @@ UnitsSchemaInternal::schemaTranslate(const Quantity& quant, double& factor, QStr
|
||||
factor = 1e9;
|
||||
}
|
||||
}
|
||||
// else if (unit == Unit::Moment) {
|
||||
// if (UnitValue < 1e6) {
|
||||
// unitString = QString::fromLatin1("mNm");
|
||||
// factor = 1e3;
|
||||
// }
|
||||
// else if (UnitValue < 1e9) {
|
||||
// unitString = QString::fromLatin1("Nm");
|
||||
// factor = 1e6;
|
||||
// }
|
||||
// else if (UnitValue < 1e12) {
|
||||
// unitString = QString::fromLatin1("kNm");
|
||||
// factor = 1e9;
|
||||
// }
|
||||
// else {
|
||||
// unitString = QString::fromLatin1("MNm");
|
||||
// factor = 1e12;
|
||||
// }
|
||||
// }
|
||||
else if (unit == Unit::Power) {
|
||||
if (UnitValue < 1e6) {
|
||||
unitString = QString::fromLatin1("mW");
|
||||
|
||||
@@ -261,6 +261,24 @@ QString UnitsSchemaMKS::schemaTranslate(const Quantity& quant, double& factor, Q
|
||||
factor = 1e9;
|
||||
}
|
||||
}
|
||||
// else if (unit == Unit::Moment) {
|
||||
// if (UnitValue < 1e6) {
|
||||
// unitString = QString::fromLatin1("mNm");
|
||||
// factor = 1e3;
|
||||
// }
|
||||
// else if (UnitValue < 1e9) {
|
||||
// unitString = QString::fromLatin1("Nm");
|
||||
// factor = 1e6;
|
||||
// }
|
||||
// else if (UnitValue < 1e12) {
|
||||
// unitString = QString::fromLatin1("kNm");
|
||||
// factor = 1e9;
|
||||
// }
|
||||
// else {
|
||||
// unitString = QString::fromLatin1("MNm");
|
||||
// factor = 1e12;
|
||||
// }
|
||||
// }
|
||||
else if (unit == Unit::Power) {
|
||||
if (UnitValue < 1e6) {
|
||||
unitString = QString::fromLatin1("mW");
|
||||
|
||||
Reference in New Issue
Block a user