andrew
/
RecipeDB
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added variables to unit of measure.

This commit is contained in:
Andrew Lalis 2018-02-12 16:27:24 +01:00
parent 05a18d6a9a
commit 45db82f0d5
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
model/recipe/ingredients/ingredient.h
View File

@ -6,7 +6,8 @@
using namespace std;
/**
* @brief The Ingredient class represents an ingredient, which is classified by a food group, and has a name and an ID. An ingredient cannot be included on its own in a recipe, and must be paired with a Unit in a RecipeIngredient Object.
* @brief The Ingredient class represents an ingredient, which is classified by a food group, and has a name and an ID.
* An ingredient cannot be included on its own in a recipe, and must be paired with a Unit in a RecipeIngredient Object.
*/
class Ingredient

4
model/recipe/ingredients/recipeingredient.h
View File

@ -7,6 +7,10 @@
using namespace std;
/**
* @brief The RecipeIngredient class represents both an ingredient and a unit of measure, to be used in a recipe object.
*/
class RecipeIngredient : public Ingredient
{
public:

7
model/recipe/ingredients/unitofmeasure.h
View File

@ -14,9 +14,10 @@ class UnitOfMeasure
public:
UnitOfMeasure();
private:
string name;
string plural;
string abbreviation;
string name; //The name of the unit of measure.
string plural; //The plural name.
string abbreviation; //A short version of the unit.
float siBaseUnitEquivalent; //The ratio when compared to the base SI unit for this unit. For example: 1 cup = 237mL.
};
#endif // UNITOFMEASURE_H