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

Improve/redesign ingredients #13

Merged
andrewlalis merged 13 commits from improve/redesignIngredients into development 2018-05-22 21:29:25 +00:00
Conversation 0 Commits 13 Files Changed 35 +4 -4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4ca4854a63 - Show all commits

2
gui/mainwindow.cpp
View File

@ -48,7 +48,7 @@ void MainWindow::setInstruction(Instruction instruction){
ui->instructionsTextEdit->setHtml(QString::fromStdString(instruction.getHTML()));
}
void MainWindow::setIngredients(vector<RecipeIngredient> ingredients){
void MainWindow::setIngredients(vector<Ingredient> ingredients){
this->ingredientModel.setIngredients(ingredients);
}

6
gui/mainwindow.h
View File

@ -6,7 +6,7 @@
#include <QAbstractListModel>
#include "model/recipe/recipe.h"
#include "model/recipe/ingredients/recipeingredientlistmodel.h"
#include "model/recipe/ingredients/ingredientlistmodel.h"
#include "gui/newrecipedialog.h"
#include "gui/openrecipedialog.h"
#include "utils/stringutils.h"
@ -41,14 +41,14 @@ public:
private:
Ui::MainWindow *ui;
RecipeDatabase *recipeDB;
RecipeIngredientListModel ingredientModel;
IngredientListModel ingredientModel;
TagListModel tagsListModel;
Recipe currentRecipe;
//Hidden manipulation methods.
void setRecipeName(string name);
void setInstruction(Instruction instruction);
void setIngredients(vector<RecipeIngredient> ingredients);
void setIngredients(vector<Ingredient> ingredients);
void setImage(QImage img);
void setPrepTime(QTime prepTime);
void setCookTime(QTime cookTime);