Miroirs/leocad
1
0
Fork 0
mirror of https://github.com/leozide/leocad synced 2024-11-17 07:47:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed used parts list not being sorted.

Browse source
This commit is contained in:
Leonardo Zide 2020-01-01 09:01:10 -08:00
parent 1f441907ee
commit c7c6a42f78
2 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
common/lc_partselectionwidget.cpp
View file

@ -155,7 +155,7 @@ void lcPartSelectionListModel::SetCategory(int CategoryIndex)
mParts.resize(SingleParts.GetSize()); mParts.resize(SingleParts.GetSize());
for (int PartIdx = 0; PartIdx < SingleParts.GetSize(); PartIdx++) for (int PartIdx = 0; PartIdx < SingleParts.GetSize(); PartIdx++)
mParts[PartIdx] = QPair<PieceInfo*, QPixmap>(SingleParts[PartIdx], QPixmap()); mParts[PartIdx] = std::pair<PieceInfo*, QPixmap>(SingleParts[PartIdx], QPixmap());
endResetModel(); endResetModel();
@ -178,9 +178,16 @@ void lcPartSelectionListModel::SetModelsCategory()
lcModel* Model = Models[ModelIdx]; lcModel* Model = Models[ModelIdx];
if (!Model->IncludesModel(ActiveModel)) if (!Model->IncludesModel(ActiveModel))
mParts.emplace_back(QPair<PieceInfo*, QPixmap>(Model->GetPieceInfo(), QPixmap())); mParts.emplace_back(std::pair<PieceInfo*, QPixmap>(Model->GetPieceInfo(), QPixmap()));
} }
auto lcPartSortFunc = [](const std::pair<PieceInfo*, QPixmap>& a, const std::pair<PieceInfo*, QPixmap>& b)
{
return strcmp(a.first->m_strDescription, b.first->m_strDescription) < 0;
};
std::sort(mParts.begin(), mParts.end(), lcPartSortFunc);
endResetModel(); endResetModel();
SetFilter(mFilter); SetFilter(mFilter);
@ -208,7 +215,7 @@ void lcPartSelectionListModel::SetPaletteCategory(int SetIndex)
mParts.reserve(PartsList.size()); mParts.reserve(PartsList.size());
for (PieceInfo* Favorite : PartsList) for (PieceInfo* Favorite : PartsList)
mParts.emplace_back(QPair<PieceInfo*, QPixmap>(Favorite, QPixmap())); mParts.emplace_back(std::pair<PieceInfo*, QPixmap>(Favorite, QPixmap()));
endResetModel(); endResetModel();
@ -228,7 +235,14 @@ void lcPartSelectionListModel::SetCurrentModelCategory()
ActiveModel->GetPartsList(gDefaultColor, true, PartsList); ActiveModel->GetPartsList(gDefaultColor, true, PartsList);
for (const auto& PartIt : PartsList) for (const auto& PartIt : PartsList)
mParts.emplace_back(QPair<PieceInfo*, QPixmap>((PieceInfo*)PartIt.first, QPixmap())); mParts.emplace_back(std::pair<PieceInfo*, QPixmap>((PieceInfo*)PartIt.first, QPixmap()));
auto lcPartSortFunc = [](const std::pair<PieceInfo*, QPixmap>& a, const std::pair<PieceInfo*, QPixmap>& b)
{
return strcmp(a.first->m_strDescription, b.first->m_strDescription) < 0;
};
std::sort(mParts.begin(), mParts.end(), lcPartSortFunc);
endResetModel(); endResetModel();

2
common/lc_partselectionwidget.h
View file

@ -121,7 +121,7 @@ protected:
void DrawPreview(int InfoIndex); void DrawPreview(int InfoIndex);
lcPartSelectionListView* mListView; lcPartSelectionListView* mListView;
std::vector<QPair<PieceInfo*, QPixmap>> mParts; std::vector<std::pair<PieceInfo*, QPixmap>> mParts;
std::vector<int> mRequestedPreviews; std::vector<int> mRequestedPreviews;
int mIconSize; int mIconSize;
bool mColorLocked; bool mColorLocked;