kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

fix typo

Browse Source
This commit is contained in:
wmayer
2018-03-11 18:34:18 +01:00
parent c78a02e782
commit 7480544967
7 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/App/Expression.cpp
View File

@@ -988,7 +988,7 @@ Expression * FunctionExpression::eval() const
((s.ElectricCurrent % 2) == 0) &&
((s.ThermodynamicTemperature % 2) == 0) &&
((s.AmountOfSubstance % 2) == 0) &&
((s.LuminoseIntensity % 2) == 0) &&
((s.LuminousIntensity % 2) == 0) &&
((s.Angle % 2) == 0))
throw ExpressionError("All dimensions must be even to compute the square root.");
@@ -998,7 +998,7 @@ Expression * FunctionExpression::eval() const
s.ElectricCurrent / 2,
s.ThermodynamicTemperature / 2,
s.AmountOfSubstance / 2,
s.LuminoseIntensity / 2,
s.LuminousIntensity / 2,
s.Angle);
break;
}

2
src/App/FreeCADInit.py
View File

@@ -308,7 +308,7 @@ App.Units.Temperature = App.Units.Unit(0,0,0,0,1)
App.Units.ElectricCurrent = App.Units.Unit(0,0,0,1)
App.Units.ElectricPotential = App.Units.Unit(2,1,-3,-1)
App.Units.AmountOfSubstance = App.Units.Unit(0,0,0,0,0,1)
App.Units.LuminoseIntensity = App.Units.Unit(0,0,0,0,0,0,1)
App.Units.LuminousIntensity = App.Units.Unit(0,0,0,0,0,0,1)
App.Units.Stress = App.Units.Unit(-1,1,-2)
App.Units.Pressure = App.Units.Unit(-1,1,-2)

56
src/Base/Unit.cpp
View File

@@ -33,7 +33,7 @@
using namespace Base;
static inline void checkRange(const char * op, int length, int mass, int time, int electricCurrent,
int thermodynamicTemperature, int amountOfSubstance, int luminoseIntensity, int angle,
int thermodynamicTemperature, int amountOfSubstance, int luminousIntensity, int angle,
int density)
{
if ( ( length >= (1 << (UnitSignatureLengthBits - 1)) ) ||
@@ -42,7 +42,7 @@ static inline void checkRange(const char * op, int length, int mass, int time, i
( electricCurrent >= (1 << (UnitSignatureElectricCurrentBits - 1)) ) ||
( thermodynamicTemperature >= (1 << (UnitSignatureThermodynamicTemperatureBits - 1)) ) ||
( amountOfSubstance >= (1 << (UnitSignatureAmountOfSubstanceBits - 1)) ) ||
( luminoseIntensity >= (1 << (UnitSignatureLuminoseIntensityBits - 1)) ) ||
( luminousIntensity >= (1 << (UnitSignatureLuminousIntensityBits - 1)) ) ||
( angle >= (1 << (UnitSignatureAngleBits - 1)) ) ||
( density >= (1 << (UnitSignatureDensityBits - 1)) ) )
throw Base::OverflowError((std::string("Unit overflow in ") + std::string(op)).c_str());
@@ -52,7 +52,7 @@ static inline void checkRange(const char * op, int length, int mass, int time, i
( electricCurrent < -(1 << (UnitSignatureElectricCurrentBits - 1)) ) ||
( thermodynamicTemperature < -(1 << (UnitSignatureThermodynamicTemperatureBits - 1)) ) ||
( amountOfSubstance < -(1 << (UnitSignatureAmountOfSubstanceBits - 1)) ) ||
( luminoseIntensity < -(1 << (UnitSignatureLuminoseIntensityBits - 1)) ) ||
( luminousIntensity < -(1 << (UnitSignatureLuminousIntensityBits - 1)) ) ||
( angle < -(1 << (UnitSignatureAngleBits - 1)) ) ||
( density < -(1 << (UnitSignatureDensityBits - 1)) ) )
throw Base::OverflowError((std::string("Unit underflow in ") + std::string(op)).c_str());
@@ -64,7 +64,7 @@ Unit::Unit(int8_t Length,
int8_t ElectricCurrent,
int8_t ThermodynamicTemperature,
int8_t AmountOfSubstance,
int8_t LuminoseIntensity,
int8_t LuminousIntensity,
int8_t Angle,
int8_t Density)
{
@@ -75,7 +75,7 @@ Unit::Unit(int8_t Length,
(int32_t)ElectricCurrent,
(int32_t)ThermodynamicTemperature,
(int32_t)AmountOfSubstance,
(int32_t)LuminoseIntensity,
(int32_t)LuminousIntensity,
(int32_t)Angle,
(int32_t)Density);
@@ -85,7 +85,7 @@ Unit::Unit(int8_t Length,
Sig.ElectricCurrent = ElectricCurrent;
Sig.ThermodynamicTemperature = ThermodynamicTemperature;
Sig.AmountOfSubstance = AmountOfSubstance;
Sig.LuminoseIntensity = LuminoseIntensity;
Sig.LuminousIntensity = LuminousIntensity;
Sig.Angle = Angle;
Sig.Density = Density;
}
@@ -99,7 +99,7 @@ Unit::Unit()
Sig.ElectricCurrent = 0;
Sig.ThermodynamicTemperature = 0;
Sig.AmountOfSubstance = 0;
Sig.LuminoseIntensity = 0;
Sig.LuminousIntensity = 0;
Sig.Angle = 0;
Sig.Density = 0;
}
@@ -121,7 +121,7 @@ Unit::Unit(const QString& expr)
Sig.ElectricCurrent = 0;
Sig.ThermodynamicTemperature = 0;
Sig.AmountOfSubstance = 0;
Sig.LuminoseIntensity = 0;
Sig.LuminousIntensity = 0;
Sig.Angle = 0;
Sig.Density = 0;
}
@@ -136,7 +136,7 @@ Unit Unit::pow(signed char exp) const
(int32_t)Sig.ElectricCurrent * (int32_t)exp,
(int32_t)Sig.ThermodynamicTemperature * (int32_t)exp,
(int32_t)Sig.AmountOfSubstance * (int32_t)exp,
(int32_t)Sig.LuminoseIntensity * (int32_t)exp,
(int32_t)Sig.LuminousIntensity * (int32_t)exp,
(int32_t)Sig.Angle * (int32_t)exp,
(int32_t)Sig.Density * (int32_t)exp);
@@ -147,7 +147,7 @@ Unit Unit::pow(signed char exp) const
result.Sig.ElectricCurrent = Sig.ElectricCurrent * exp;
result.Sig.ThermodynamicTemperature = Sig.ThermodynamicTemperature * exp;
result.Sig.AmountOfSubstance = Sig.AmountOfSubstance * exp;
result.Sig.LuminoseIntensity = Sig.LuminoseIntensity * exp;
result.Sig.LuminousIntensity = Sig.LuminousIntensity * exp;
result.Sig.Angle = Sig.Angle * exp;
result.Sig.Density = Sig.Density * exp;
@@ -162,7 +162,7 @@ bool Unit::isEmpty(void)const
&& (this->Sig.ElectricCurrent == 0)
&& (this->Sig.ThermodynamicTemperature == 0)
&& (this->Sig.AmountOfSubstance == 0)
&& (this->Sig.LuminoseIntensity == 0)
&& (this->Sig.LuminousIntensity == 0)
&& (this->Sig.Angle == 0)
&& (this->Sig.Density == 0);
}
@@ -175,7 +175,7 @@ bool Unit::operator ==(const Unit& that) const
&& (this->Sig.ElectricCurrent == that.Sig.ElectricCurrent)
&& (this->Sig.ThermodynamicTemperature == that.Sig.ThermodynamicTemperature)
&& (this->Sig.AmountOfSubstance == that.Sig.AmountOfSubstance)
&& (this->Sig.LuminoseIntensity == that.Sig.LuminoseIntensity)
&& (this->Sig.LuminousIntensity == that.Sig.LuminousIntensity)
&& (this->Sig.Angle == that.Sig.Angle)
&& (this->Sig.Density == that.Sig.Density);
}
@@ -190,7 +190,7 @@ Unit Unit::operator *(const Unit &right) const
(int32_t)Sig.ElectricCurrent + (int32_t)right.Sig.ElectricCurrent,
(int32_t)Sig.ThermodynamicTemperature + (int32_t)right.Sig.ThermodynamicTemperature,
(int32_t)Sig.AmountOfSubstance + (int32_t)right.Sig.AmountOfSubstance,
(int32_t)Sig.LuminoseIntensity + (int32_t)right.Sig.LuminoseIntensity,
(int32_t)Sig.LuminousIntensity + (int32_t)right.Sig.LuminousIntensity,
(int32_t)Sig.Angle + (int32_t)right.Sig.Angle,
(int32_t)Sig.Density + (int32_t)right.Sig.Density);
@@ -201,7 +201,7 @@ Unit Unit::operator *(const Unit &right) const
result.Sig.ElectricCurrent = Sig.ElectricCurrent + right.Sig.ElectricCurrent;
result.Sig.ThermodynamicTemperature = Sig.ThermodynamicTemperature + right.Sig.ThermodynamicTemperature;
result.Sig.AmountOfSubstance = Sig.AmountOfSubstance + right.Sig.AmountOfSubstance;
result.Sig.LuminoseIntensity = Sig.LuminoseIntensity + right.Sig.LuminoseIntensity;
result.Sig.LuminousIntensity = Sig.LuminousIntensity + right.Sig.LuminousIntensity;
result.Sig.Angle = Sig.Angle + right.Sig.Angle;
result.Sig.Density = Sig.Density + right.Sig.Density;
@@ -217,7 +217,7 @@ Unit Unit::operator /(const Unit &right) const
(int32_t)Sig.ElectricCurrent - (int32_t)right.Sig.ElectricCurrent,
(int32_t)Sig.ThermodynamicTemperature - (int32_t)right.Sig.ThermodynamicTemperature,
(int32_t)Sig.AmountOfSubstance - (int32_t)right.Sig.AmountOfSubstance,
(int32_t)Sig.LuminoseIntensity - (int32_t)right.Sig.LuminoseIntensity,
(int32_t)Sig.LuminousIntensity - (int32_t)right.Sig.LuminousIntensity,
(int32_t)Sig.Angle - (int32_t)right.Sig.Angle,
(int32_t)Sig.Density - (int32_t)right.Sig.Density);
@@ -228,7 +228,7 @@ Unit Unit::operator /(const Unit &right) const
result.Sig.ElectricCurrent = Sig.ElectricCurrent - right.Sig.ElectricCurrent;
result.Sig.ThermodynamicTemperature = Sig.ThermodynamicTemperature - right.Sig.ThermodynamicTemperature;
result.Sig.AmountOfSubstance = Sig.AmountOfSubstance - right.Sig.AmountOfSubstance;
result.Sig.LuminoseIntensity = Sig.LuminoseIntensity - right.Sig.LuminoseIntensity;
result.Sig.LuminousIntensity = Sig.LuminousIntensity - right.Sig.LuminousIntensity;
result.Sig.Angle = Sig.Angle - right.Sig.Angle;
result.Sig.Density = Sig.Density - right.Sig.Density;
@@ -243,7 +243,7 @@ Unit& Unit::operator = (const Unit &New)
Sig.ElectricCurrent = New.Sig.ElectricCurrent;
Sig.ThermodynamicTemperature = New.Sig.ThermodynamicTemperature;
Sig.AmountOfSubstance = New.Sig.AmountOfSubstance;
Sig.LuminoseIntensity = New.Sig.LuminoseIntensity;
Sig.LuminousIntensity = New.Sig.LuminousIntensity;
Sig.Angle = New.Sig.Angle;
Sig.Density = New.Sig.Density;
@@ -263,7 +263,7 @@ QString Unit::getString(void) const
Sig.ElectricCurrent > 0 ||
Sig.ThermodynamicTemperature> 0 ||
Sig.AmountOfSubstance > 0 ||
Sig.LuminoseIntensity > 0 ||
Sig.LuminousIntensity > 0 ||
Sig.Angle > 0 ||
Sig.Density > 0 ){
@@ -319,13 +319,13 @@ QString Unit::getString(void) const
ret << "^" << Sig.AmountOfSubstance;
}
if (Sig.LuminoseIntensity > 0) {
if (Sig.LuminousIntensity > 0) {
if (mult)
ret<<'*';
mult = true;
ret << "cd";
if (Sig.LuminoseIntensity > 1)
ret << "^" << Sig.LuminoseIntensity;
if (Sig.LuminousIntensity > 1)
ret << "^" << Sig.LuminousIntensity;
}
if (Sig.Angle > 0) {
@@ -356,7 +356,7 @@ QString Unit::getString(void) const
Sig.ElectricCurrent < 0 ||
Sig.ThermodynamicTemperature< 0 ||
Sig.AmountOfSubstance < 0 ||
Sig.LuminoseIntensity < 0 ||
Sig.LuminousIntensity < 0 ||
Sig.Angle < 0 ||
Sig.Density < 0 ){
ret << "/";
@@ -368,7 +368,7 @@ QString Unit::getString(void) const
nnom += Sig.ElectricCurrent<0?1:0;
nnom += Sig.ThermodynamicTemperature<0?1:0;
nnom += Sig.AmountOfSubstance<0?1:0;
nnom += Sig.LuminoseIntensity<0?1:0;
nnom += Sig.LuminousIntensity<0?1:0;
nnom += Sig.Angle<0?1:0;
nnom += Sig.Density<0?1:0;
@@ -428,13 +428,13 @@ QString Unit::getString(void) const
ret << "^" << abs(Sig.AmountOfSubstance);
}
if (Sig.LuminoseIntensity < 0) {
if (Sig.LuminousIntensity < 0) {
if (mult)
ret<<'*';
mult = true;
ret << "cd";
if (Sig.LuminoseIntensity < -1)
ret << "^" << abs(Sig.LuminoseIntensity);
if (Sig.LuminousIntensity < -1)
ret << "^" << abs(Sig.LuminousIntensity);
}
if (Sig.Angle < 0) {
@@ -477,7 +477,7 @@ QString Unit::getTypeString(void) const
if(*this == Unit::ElectricCurrent ) return QString::fromLatin1("ElectricCurrent"); else
if(*this == Unit::ElectricPotential ) return QString::fromLatin1("ElectricPotential"); else
if(*this == Unit::AmountOfSubstance ) return QString::fromLatin1("AmountOfSubstance"); else
if(*this == Unit::LuminoseIntensity ) return QString::fromLatin1("LuminoseIntensity"); else
if(*this == Unit::LuminousIntensity ) return QString::fromLatin1("LuminousIntensity"); else
if(*this == Unit::Pressure ) return QString::fromLatin1("Pressure"); else
if(*this == Unit::Force ) return QString::fromLatin1("Force"); else
if(*this == Unit::Work ) return QString::fromLatin1("Work"); else
@@ -510,7 +510,7 @@ Unit Unit::Temperature(0,0,0,0,1);
Unit Unit::ElectricCurrent(0,0,0,1);
Unit Unit::ElectricPotential(2,1,-3,-1);
Unit Unit::AmountOfSubstance(0,0,0,0,0,1);
Unit Unit::LuminoseIntensity(0,0,0,0,0,0,1);
Unit Unit::LuminousIntensity(0,0,0,0,0,0,1);
Unit Unit::Stress (-1,1,-2); // kg/m*s^2 or N/m^2 or PSI
Unit Unit::Pressure(-1,1,-2); // kg/m*s^2 or N/m^2 or PSI

8
src/Base/Unit.h
View File

@@ -40,7 +40,7 @@ namespace Base {
#define UnitSignatureElectricCurrentBits 4
#define UnitSignatureThermodynamicTemperatureBits 4
#define UnitSignatureAmountOfSubstanceBits 4
#define UnitSignatureLuminoseIntensityBits 4
#define UnitSignatureLuminousIntensityBits 4
#define UnitSignatureAngleBits 4
#define UnitSignatureDensityBits 4
@@ -51,7 +51,7 @@ struct UnitSignature{
int32_t ElectricCurrent:UnitSignatureElectricCurrentBits;
int32_t ThermodynamicTemperature:UnitSignatureThermodynamicTemperatureBits;
int32_t AmountOfSubstance:UnitSignatureAmountOfSubstanceBits;
int32_t LuminoseIntensity:UnitSignatureLuminoseIntensityBits;
int32_t LuminousIntensity:UnitSignatureLuminousIntensityBits;
int32_t Angle:UnitSignatureAngleBits;
int32_t Density:UnitSignatureDensityBits;
};
@@ -62,7 +62,7 @@ class BaseExport Unit
{
public:
/// default constructor
Unit(int8_t Length,int8_t Mass=0,int8_t Time=0,int8_t ElectricCurrent=0,int8_t ThermodynamicTemperature=0,int8_t AmountOfSubstance=0,int8_t LuminoseIntensity=0,int8_t Angle=0, int8_t Density=0);
Unit(int8_t Length,int8_t Mass=0,int8_t Time=0,int8_t ElectricCurrent=0,int8_t ThermodynamicTemperature=0,int8_t AmountOfSubstance=0,int8_t LuminousIntensity=0,int8_t Angle=0, int8_t Density=0);
Unit(void);
Unit(const Unit&);
Unit(const QString& expr);
@@ -109,7 +109,7 @@ public:
static Unit ElectricCurrent;
static Unit ElectricPotential;
static Unit AmountOfSubstance;
static Unit LuminoseIntensity;
static Unit LuminousIntensity;
static Unit Stress;
static Unit Pressure;

12
src/Base/UnitPyImp.cpp
View File

@@ -17,13 +17,13 @@ std::string UnitPy::representation(void) const
std::stringstream ret;
ret << "Unit: ";
ret << getUnitPtr()->getString().toUtf8().constData() << " (";
ret << Sig.Length << ",";
ret << Sig.Mass << ",";
ret << Sig.Time << ",";
ret << Sig.ElectricCurrent << ",";
ret << Sig.Length << ",";
ret << Sig.Mass << ",";
ret << Sig.Time << ",";
ret << Sig.ElectricCurrent << ",";
ret << Sig.ThermodynamicTemperature << ",";
ret << Sig.AmountOfSubstance << ",";
ret << Sig.LuminoseIntensity << ",";
ret << Sig.AmountOfSubstance << ",";
ret << Sig.LuminousIntensity << ",";
ret << Sig.Angle << ")";
std::string type = getUnitPtr()->getTypeString().toUtf8().constData();
if(! type.empty())

2
src/Gui/DlgUnitsCalculatorImp.cpp
View File

@@ -69,7 +69,7 @@ DlgUnitsCalculator::DlgUnitsCalculator( QWidget* parent, Qt::WindowFlags fl )
<< Base::Unit::Area << Base::Unit::Volume << Base::Unit::TimeSpan << Base::Unit::Velocity
<< Base::Unit::Acceleration << Base::Unit::Temperature
<< Base::Unit::ElectricCurrent << Base::Unit::ElectricPotential
<< Base::Unit::AmountOfSubstance << Base::Unit::LuminoseIntensity << Base::Unit::Stress
<< Base::Unit::AmountOfSubstance << Base::Unit::LuminousIntensity << Base::Unit::Stress
<< Base::Unit::Pressure << Base::Unit::Force << Base::Unit::Work << Base::Unit::Power
<< Base::Unit::ThermalConductivity << Base::Unit::ThermalExpansionCoefficient
<< Base::Unit::SpecificHeat << Base::Unit::ThermalTransferCoefficient <<Base::Unit::HeatFlux;

4
src/Mod/Spreadsheet/Gui/SheetModel.cpp
View File

@@ -98,7 +98,7 @@ static std::string getUnitString(const Base::Unit & unit)
appendUnit(sig.ElectricCurrent, true, "A", numerator);
appendUnit(sig.ThermodynamicTemperature, true, "K", numerator);
appendUnit(sig.AmountOfSubstance, true, "mol", numerator);
appendUnit(sig.LuminoseIntensity, true, "cd", numerator);
appendUnit(sig.LuminousIntensity, true, "cd", numerator);
appendUnit(sig.Angle, true, "deg", numerator);
// Denominator
@@ -108,7 +108,7 @@ static std::string getUnitString(const Base::Unit & unit)
appendUnit(sig.ElectricCurrent, false, "A", denominator);
appendUnit(sig.ThermodynamicTemperature, false, "K", denominator);
appendUnit(sig.AmountOfSubstance, false, "mol", denominator);
appendUnit(sig.LuminoseIntensity, false, "cd", denominator);
appendUnit(sig.LuminousIntensity, false, "cd", denominator);
appendUnit(sig.Angle, false, "deg", denominator);
std::string unitStr;