electron-rare/leocad
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Instructions Dialog mockup.

Browse Source
This commit is contained in:
Leonardo Zide
2020-05-31 18:46:36 -07:00
parent a23921826d
commit 44fa79ecb6
12 changed files with 144 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/lc_model.cpp
+5 -5
View File
@@ -1695,9 +1695,9 @@ void lcModel::SaveStepImages(const QString& BaseName, bool AddStepSuffix, bool Z
}
}
std::vector<std::pair<lcModel*, lcStep>> lcModel::GetPageLayouts(std::vector<const lcModel*>& AddedModels)
std::vector<lcInstructionsPageLayout> lcModel::GetPageLayouts(std::vector<const lcModel*>& AddedModels)
{
std::vector<std::pair<lcModel*, lcStep>> PageLayouts;
std::vector<lcInstructionsPageLayout> PageLayouts;
if (std::find(AddedModels.begin(), AddedModels.end(), this) != AddedModels.end())
return PageLayouts;
@@ -1716,7 +1716,7 @@ std::vector<std::pair<lcModel*, lcStep>> lcModel::GetPageLayouts(std::vector<con
{
while (StepIt.first > CurrentStep)
{
PageLayouts.emplace_back(std::make_pair(this, CurrentStep));
PageLayouts.emplace_back(lcInstructionsPageLayout{ this, CurrentStep });
CurrentStep++;
}
@@ -1725,12 +1725,12 @@ std::vector<std::pair<lcModel*, lcStep>> lcModel::GetPageLayouts(std::vector<con
if (Piece->mPieceInfo->IsModel())
{
lcModel* SubModel = Piece->mPieceInfo->GetModel();
std::vector<std::pair<lcModel*, lcStep>> SubModelLayouts = SubModel->GetPageLayouts(AddedModels);
std::vector<lcInstructionsPageLayout> SubModelLayouts = SubModel->GetPageLayouts(AddedModels);
PageLayouts.insert(PageLayouts.end(), std::make_move_iterator(SubModelLayouts.begin()), std::make_move_iterator(SubModelLayouts.end()));
}
}
PageLayouts.emplace_back(std::make_pair(this, CurrentStep));
PageLayouts.emplace_back(lcInstructionsPageLayout{ this, CurrentStep });
CurrentStep++;
}