suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Quantity: Added -= and += operators.

Browse Source
This commit is contained in:
Eivind Kvedalen 2016-03-27 01:29:25 +01:00 committed by wmayer
parent 0e45008f9a
commit d6052a5a27
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/Base/Quantity.cpp
View File

@ -113,6 +113,17 @@ Quantity Quantity::operator +(const Quantity &p) const
throw Base::Exception("Quantity::operator +(): Unit mismatch in plus operation");
return Quantity(this->_Value + p._Value,this->_Unit);
}
Quantity& Quantity::operator +=(const Quantity &p)
{
if(this->_Unit != p._Unit)
throw Base::Exception("Quantity::operator +=(): Unit mismatch in plus operation");
_Value += p._Value;
return *this;
}
Quantity Quantity::operator -(const Quantity &p) const
{
if(this->_Unit != p._Unit)
@ -120,6 +131,16 @@ Quantity Quantity::operator -(const Quantity &p) const
return Quantity(this->_Value - p._Value,this->_Unit);
}
Quantity& Quantity::operator -=(const Quantity &p)
{
if(this->_Unit != p._Unit)
throw Base::Exception("Quantity::operator -=(): Unit mismatch in minus operation");
_Value -= p._Value;
return *this;
}
Quantity Quantity::operator -(void) const
{
return Quantity(-(this->_Value),this->_Unit);

2
src/Base/Quantity.h
View File

@ -53,7 +53,9 @@ public:
//@{
Quantity operator *(const Quantity &p) const;
Quantity operator +(const Quantity &p) const;
Quantity& operator +=(const Quantity &p);
Quantity operator -(const Quantity &p) const;
Quantity& operator -=(const Quantity &p);
Quantity operator -(void) const;
Quantity operator /(const Quantity &p) const;
bool operator ==(const Quantity&) const;